nuke obsolete kernel stuff
authorFelix Fietkau <nbd@openwrt.org>
Sat, 14 Mar 2009 15:52:42 +0000 (15:52 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Sat, 14 Mar 2009 15:52:42 +0000 (15:52 +0000)
SVN-Revision: 14875

705 files changed:
target/linux/adm5120/patches-2.6.26/001-adm5120.patch [deleted file]
target/linux/adm5120/patches-2.6.26/002-adm5120_flash.patch [deleted file]
target/linux/adm5120/patches-2.6.26/003-adm5120_switch.patch [deleted file]
target/linux/adm5120/patches-2.6.26/005-adm5120_usb.patch [deleted file]
target/linux/adm5120/patches-2.6.26/007-adm5120_pci.patch [deleted file]
target/linux/adm5120/patches-2.6.26/009-adm5120_leds_switch_trigger.patch [deleted file]
target/linux/adm5120/patches-2.6.26/101-cfi_fixup_macronix_bootloc.patch [deleted file]
target/linux/adm5120/patches-2.6.26/102-jedec_pmc_39lvxxx_chips.patch [deleted file]
target/linux/adm5120/patches-2.6.26/103-mtd_trxsplit.patch [deleted file]
target/linux/adm5120/patches-2.6.26/120-rb153_cf_driver.patch [deleted file]
target/linux/adm5120/patches-2.6.26/140-cmdline_hack.patch [deleted file]
target/linux/adm5120/patches-2.6.26/200-amba_pl010_hacks.patch [deleted file]
target/linux/adm5120/patches-2.6.26/201-amba_bus_hacks.patch [deleted file]
target/linux/adm5120/patches-2.6.26/202-pci_disable_common_quirks.patch [deleted file]
target/linux/adm5120/patches-2.6.26/203-gpio_leds_brightness.patch [deleted file]
target/linux/adm5120/patches-2.6.26/310-adm5120_wdt.patch [deleted file]
target/linux/ar7/config-2.6.23 [deleted file]
target/linux/ar7/config-2.6.24 [deleted file]
target/linux/ar7/config-2.6.25 [deleted file]
target/linux/ar7/patches-2.6.23/100-board_support.patch [deleted file]
target/linux/ar7/patches-2.6.23/110-flash.patch [deleted file]
target/linux/ar7/patches-2.6.23/120-gpio_chrdev.patch [deleted file]
target/linux/ar7/patches-2.6.23/130-vlynq.patch [deleted file]
target/linux/ar7/patches-2.6.23/140-watchdog.patch [deleted file]
target/linux/ar7/patches-2.6.23/200-ethernet_driver.patch [deleted file]
target/linux/ar7/patches-2.6.23/210-phy_fixed.patch [deleted file]
target/linux/ar7/patches-2.6.23/500-serial_kludge.patch [deleted file]
target/linux/ar7/patches-2.6.24/100-board_support.patch [deleted file]
target/linux/ar7/patches-2.6.24/110-flash.patch [deleted file]
target/linux/ar7/patches-2.6.24/120-gpio_chrdev.patch [deleted file]
target/linux/ar7/patches-2.6.24/130-vlynq.patch [deleted file]
target/linux/ar7/patches-2.6.24/140-cpmac_fix.patch [deleted file]
target/linux/ar7/patches-2.6.24/150-cpmac_up_and_running.diff [deleted file]
target/linux/ar7/patches-2.6.24/160-cpmac-rx-ring-use-eoq.diff [deleted file]
target/linux/ar7/patches-2.6.24/170-cpmac_eth_fix.patch [deleted file]
target/linux/ar7/patches-2.6.24/500-serial_kludge.patch [deleted file]
target/linux/ar7/patches-2.6.24/900-temporary_cpmac_hack.diff [deleted file]
target/linux/ar7/patches-2.6.25/100-board_support.patch [deleted file]
target/linux/ar7/patches-2.6.25/110-flash.patch [deleted file]
target/linux/ar7/patches-2.6.25/120-gpio_chrdev.patch [deleted file]
target/linux/ar7/patches-2.6.25/130-vlynq.patch [deleted file]
target/linux/ar7/patches-2.6.25/140-cpmac_fix.patch [deleted file]
target/linux/ar7/patches-2.6.25/150-cpmac_not_broken.patch [deleted file]
target/linux/ar7/patches-2.6.25/150-cpmac_up_and_running.diff [deleted file]
target/linux/ar7/patches-2.6.25/160-cpmac-rx-ring-use-eoq.diff [deleted file]
target/linux/ar7/patches-2.6.25/170-cpmac_eth_fix.patch [deleted file]
target/linux/ar7/patches-2.6.25/200-mtd_fixes.patch [deleted file]
target/linux/ar7/patches-2.6.25/500-serial_kludge.patch [deleted file]
target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff [deleted file]
target/linux/at91/config-2.6.21 [deleted file]
target/linux/at91/patches-2.6.21/000-at91patches.patch [deleted file]
target/linux/at91/patches-2.6.21/001-vlink-machine.patch [deleted file]
target/linux/at91/patches-2.6.21/002-led-driver.patch [deleted file]
target/linux/at91/patches-2.6.21/003-gpio-driver.patch [deleted file]
target/linux/at91/patches-2.6.21/006-change-gpios.patch [deleted file]
target/linux/at91/patches-2.6.21/007-mtd-partition.patch [deleted file]
target/linux/at91/patches-2.6.21/008-fdl-serial.patch [deleted file]
target/linux/at91/patches-2.6.21/009-fdl-uartinit.patch [deleted file]
target/linux/at91/patches-2.6.21/010-dm9161a-phyfix.patch [deleted file]
target/linux/at91/patches-2.6.21/011-vlink-resetfix.patch [deleted file]
target/linux/at91/patches-2.6.21/012-at91-mmcfix.patch [deleted file]
target/linux/at91/patches-2.6.21/013-at91-mmc1wire.patch [deleted file]
target/linux/at91/patches-2.6.21/014-initpartition.patch [deleted file]
target/linux/at91/patches-2.6.21/015-simenable.patch [deleted file]
target/linux/at91/patches-2.6.21/016-v1-15-detect.patch [deleted file]
target/linux/au1000/au1500/config-2.6.23 [deleted file]
target/linux/au1000/au1500/config-2.6.24 [deleted file]
target/linux/au1000/au1500/config-2.6.25 [deleted file]
target/linux/au1000/patches/001-au1000_gpio_kconfig.patch [deleted file]
target/linux/au1000/patches/002-sys_btn_gpio.patch [deleted file]
target/linux/au1000/patches/005-au1000_eth_link_beat.patch [deleted file]
target/linux/au1000/patches/012-mtx1_cmdline.patch [deleted file]
target/linux/au1000/patches/013-openwrt_rootfs.patch [deleted file]
target/linux/au1000/patches/014-au1000_eth_ioctl.patch [deleted file]
target/linux/au1000/patches/015-pci-resource.patch [deleted file]
target/linux/au1000/patches/016-net-irq.patch [deleted file]
target/linux/au1000/patches/017-gpio-dir.patch [deleted file]
target/linux/rb532/config-2.6.23 [deleted file]
target/linux/rb532/files-2.6.23/arch/mips/pci/fixup-rb500.c [deleted file]
target/linux/rb532/files-2.6.23/arch/mips/pci/ops-rc32434.c [deleted file]
target/linux/rb532/files-2.6.23/arch/mips/pci/pci-rc32434.c [deleted file]
target/linux/rb532/files-2.6.23/arch/mips/rb500/Makefile [deleted file]
target/linux/rb532/files-2.6.23/arch/mips/rb500/devices.c [deleted file]
target/linux/rb532/files-2.6.23/arch/mips/rb500/gpio.c [deleted file]
target/linux/rb532/files-2.6.23/arch/mips/rb500/irq.c [deleted file]
target/linux/rb532/files-2.6.23/arch/mips/rb500/prom.c [deleted file]
target/linux/rb532/files-2.6.23/arch/mips/rb500/serial.c [deleted file]
target/linux/rb532/files-2.6.23/arch/mips/rb500/setup.c [deleted file]
target/linux/rb532/files-2.6.23/arch/mips/rb500/time.c [deleted file]
target/linux/rb532/files-2.6.23/drivers/block/rb500/Makefile [deleted file]
target/linux/rb532/files-2.6.23/drivers/block/rb500/ata.c [deleted file]
target/linux/rb532/files-2.6.23/drivers/block/rb500/ata.h [deleted file]
target/linux/rb532/files-2.6.23/drivers/block/rb500/bdev.c [deleted file]
target/linux/rb532/files-2.6.23/drivers/char/watchdog/rc32434_wdt.c [deleted file]
target/linux/rb532/files-2.6.23/drivers/leds/leds-rb500.c [deleted file]
target/linux/rb532/files-2.6.23/drivers/net/korina.c [deleted file]
target/linux/rb532/files-2.6.23/drivers/net/rc32434_eth.h [deleted file]
target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/ddr.h [deleted file]
target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/dma.h [deleted file]
target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/dma_v.h [deleted file]
target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/eth.h [deleted file]
target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/eth_v.h [deleted file]
target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/gpio.h [deleted file]
target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/integ.h [deleted file]
target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/irq.h [deleted file]
target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/pci.h [deleted file]
target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/rb.h [deleted file]
target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/rc32434.h [deleted file]
target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/war.h [deleted file]
target/linux/rb532/patches-2.6.23/100-rb5xx_support.patch [deleted file]
target/linux/rb532/patches-2.6.23/110-korina_ethernet.patch [deleted file]
target/linux/rb532/patches-2.6.23/120-cf.patch [deleted file]
target/linux/rb532/patches-2.6.23/140-cmdline_hack.patch [deleted file]
target/linux/rb532/patches-2.6.23/200-bridge_resource_hack.patch [deleted file]
target/linux/rb532/patches-2.6.23/220-serial_fix.patch [deleted file]
target/linux/rb532/patches-2.6.23/240-via_rhine_performance.patch [deleted file]
target/linux/rb532/patches-2.6.23/510-rb500_led.patch [deleted file]
target/linux/rb532/patches-2.6.23/520-rc32434_wdt.patch [deleted file]
target/linux/s3c24xx/config-2.6.24 [deleted file]
target/linux/s3c24xx/config-2.6.26 [deleted file]
target/linux/s3c24xx/patches-2.6.24/1001-explicitly-link-notes-section.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1002-gta01-no_nand_partitions.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1003-neo1973-soc-include-fix.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1004-asoc-neo1973_wm8753-power.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1005-asoc-core-suspend_resume.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1006-fix-i2c-s3c2410-resume-race.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1007-resume-timers-wq.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1008-wm8753-rout2-inv.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1009-s3c2410-bbt.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1010-gta01-pcf50606.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1011-gta01-core.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1012-gta01-jbt6k74.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1013-gta01-inputdevice.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1014-gta01-power_control.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1015-s3c2410-pwm.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1016-gta01-vibrator.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1017-gta01-backlight.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1018-s3c2410_touchscreen.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1019-s3c2410_ts-gta01.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1020-i2c-permit_invalid_addrs.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1021-g_ether-highpower.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1022-g_ether-vendor_product.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1023-s3c_mci.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1024-s3c_mci-gta01.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1025-qt2410-s3c_mci-pdata.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1026-s3c24xx-nand-largepage.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1027-s3c2410_udc-2440_dual_packet-workaround.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1028-hxd8-core.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1029-hxd8-tsl256x.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1030-s3c2442b-cpuid.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1031-pcf50633.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1032-pcf50633-suspend-hacks.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1033-smedia-glamo.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1034-glamo-mmc.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1035-gta02-core.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1036-gta02-power_control.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1037-gta02-sound.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1038-lis302dl.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1039-gta02-leds.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1040-gta02-acc.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1041-pcf506xx.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1042-gta02-bt-fixes.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1043-openmoko-logo.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1044-config-nr-tty-devices.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1045-pm-debug_less_verbose.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1046-s3c2410_serial-nodebug.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1047-input-nots-mousedev.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1048-s3c2440-nand-disable-hwecc.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1049-qt2410-cs8900.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1050-s3c2410-qt2410-buttons.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1051-fail-unless-uimage.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1052-montour-audio.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1053-introduce-fiq-basis.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1054-introduce-fiq-use-timer3-as-source.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1055-introduce-fiq-migrate-vibrator-gta02-only.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1056-fiq-hdq.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1057-bq27000-battery-driver.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1058-fix-EVIOCGRAB-semantics.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1059-iis-suspend.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1060-s3c24xx-pcm-suspend.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1061-s3c2410-usb-switch.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1062-pnp_fixes.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1063-atheros_2_0_function.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1064-atheros_2_0_hcd.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1065-atheros_2_0_sdio_stack.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1066-fix-hwecc-2410.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1067-fix-pcf50606-LOWBAT-kill-init.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1068-fix-pcf50633-LOWBAT-kill-init.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1069-gta01-dehang-printk.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1070-kexec-atags.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1071-suspend-prelim1.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1072-gta02-sound-bandaid.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1073-glamo-cmdqueue-bandaid.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1074-local-add-defconfig.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1075-local-build-scripts.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1076-local-build-new-dfu-vid.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1077-local-update-defconfig-for-2.6-dev.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1078-local-config-add-vfat-nls-to-kern.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1079-local-config-add-bluetooth-monolithic.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1080-local-config-wlan-config-changes.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1081-local-config-defconfig-motion-sensor-gpio.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1082-local-config-pmu.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1083-local-config-ext2.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1084-contrib-fix-chgstate-array-bloat.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1085-bugfix-deglitch-gpio-output-enable.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1086-clean-snip-gpio-reinit.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1087-introduce-fiq-hdq.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1088-introduce-bq27000-battery-driver.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1089-debug-suspend-dump-gpio-states-add-GPA.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1090-fix-s3c2410_timer_setup-resume-BUG.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1091-config-add-alsa.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1092-fix-glamo-mci-defeat-ops-during-suspend.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1093-fix-lcm-reinit-post-resume.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1094-fix-glamo-mci-fake-reset-opcode-in-suspend.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1095-use-gpio-control-leds.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1096-fix-gpio-led-patch-still-pwm-t3.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1097-introduce-usb-host-power-control.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1098-fix-charging-deassert-host-power-1a-detect.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1099-add-pcf50633-06-RTC_AIE-ioctl.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1100-fix-lis302dl-suspend-gpio.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1101-fix-suspend-gps-tx-level.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1102-Do-not-send-low-level-debugging-to-the-modem.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1103-add-gta02-pcb-revision-detect.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1104-debug-glamo-dump-regs.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1105-add-pcb-rev-sysfs.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1106-Simplify-the-code-there-is-no-need-for-a-branch.-Th.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1107-Remove-dead-code.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1108-Fix-the-FIXME-store-the-GPIO-value-for-now.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1109-Convert-the-driver-to-the-generic-GPIO-framework.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1110-Add-GPIO-IRQ-for-the-s3c2410-and-add-irq_to_gpio.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1111-This-is-gta02-and-not-gta01.-Do-not-call-the-vibrato.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1112-Fix-spelling.-flaoting-floating.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1113-Fix-the-firing-of-Jack-Interrupts-after-resume-whe.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1114-Enable-GPS-only-if-it-was-powered-on-before-suspendi.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1115-fix-wlan-disable.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1116-defconfig-audio.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1117-audio-tickless-timeout.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1118-fix-gsm-download-irq-balance-issue.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1119-add-modules-defconfig.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1120-fix-glamofb-cmdqueue-timeout.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1121-fix-usb-ethernet-mwester.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1122-fix-glamofb-cmd-mode-locking.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1123-fix-jack-debounce.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1124-OpenMoko-Openmoko.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1125-fix-gta01-spi-resume-patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1126-Remove-not-needed-ifdef-as-machine_is_-is-always-de.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1127--leds-We-would-enable-PWM-for-all-four-timers-disa.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1128--led-Misc-fixes-in-the-driver-code.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1129--neo-bluetooth-GTA01_GPIO_MODEM_RST-GTA02_GPIO_M.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1130--neo-Every-access-to-GPIO-bank-B-has-to-go-through.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1131-fix-jack-interrupt-debounce-loss-window.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1132-fix-gta01-pmu-irq-edge-lost-on-resume.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1133-gta01-fix-jbt-platform-missing-members.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1134-gta01-fix-resume-redo-par.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1135-gta01-gps-power-state-resume-preserve.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1136-This-fixes-the-exit-function-so-that-the-module-can.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1137-This-adds-some-debug-messages-to-the-Neo1937-sound-d.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1138-From-cc08b5986dfd8d971ee46ce7045fb7863f99a92a-Mon-Se.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1139-clean-sdio-hcd-suspend.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1140-Stop-GTA01-MMC-Debugging-messages.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1141-fix-KEY_PHONE-up-down-inversion.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1142-s3c24xx-pwm-platform-driver.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1143-fix-wep-needs-keys-before-ap.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1144-config-add-back-MMC_UNSAFE_RESUME.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1145-fix-suspend-backlight-timing-pm-debug.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1146-quench-glamofb-err-lock-and-mmc-debug.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1147-add-force-backlight-up-on-resume.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1148-fix-backlight-disable-on-zero-intensity.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1149-Re-PATCH-6-7-fix-suppress-cpu-suspend-save-restor.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1150-Explain-why-we-want-SECOND-to-kick.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1151--pcf50633-Print-less-debugging-messages.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1152--pcf50633-Add-exported-symbol-to-the-header-file.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1153--pcf50633-Assume-that-all-gta02-s-have-a-battery-wi.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1154--pcf50633-Disable-debugging-statements-as-the-drive.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1155--power-Use-the-bq27000-battery-to-provide-charging.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1156-Disable-low-level-debugging-make-the-s3c24xx-PM-deb.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1157-clean-remove-build-noise.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1158-minor-problem-with-LCD.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1159-Fixup-hang-on-resume-caused-by-the-s3c2410-touch-scr.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1160-fix-motion-sensor-corruption.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1161-add-resume-reason-sysfs.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1162-fix-reduce-wake-reasons-in-pcf50633.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1163-Fix-possible-null-pointer-dereference-in-s3c24xx_i2c.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1164-Make-ar6k-not-print-soooo-much-to-my-console.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1165-Remove-GTA01-PM-debug.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1166-Subject-PATCH-a6k-Everyone-calls-SET_NET_DEV-an.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1167-add-gta01-resume-sysfs.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1168-introduce-samsung-camera-unit-driver.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1169-uplevel-samsung-camera-unit.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1170-introduce-charging-led-behaviour.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1171-introduce-resume-dependency.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1172-introduce-pcf50633-resume-dependency-list.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1173-add-use-pcf50633-resume-callback-jbt6k74.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1174-fix-remove-unused-model-name-bq27000.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1175-Subject-PATCH-Build-fixes.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1176-Subject-PATCH-Hardware-glamo-fb-cursor-some-clea.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1177-The-following-is-a-minor-cleanup-of-backlight-resume.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1178-debug-codec-register-setting-sysfs.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1179-fix-pcf50633-suspend-resume-onehit-i2c-other-meddlin.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1180-fix-glamo-mci-relationship-with-pcf50633-suspend-res.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1181-fix-jbt6k74-force-reset-suspend.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1182-ASoC-Don-t-block-system-resume.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1183-fix-glamo-mci-power-setting-timeout-waiting-for-pcf5.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1184-fix-glamo-mci-resume-dependency-on-pcf50633.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1185-fix-pcf50633-interrupt-work-enforce-wait-on-resume-c.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1186-fix-pcf50633-rtc-i2c-bulk-autoincrement-simplify.pat.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1187-fix-pcf50633-use-i2c-bulk-autoincrement.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1188-fix-pcf50633-usb-curlim-workqueue-migration.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1189-change-lcm-keep-power-faster-resume.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1190-fix-gta02-mach-remove-gta01-lcd-reset.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1191-add-remote-install-sdcard-script.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1192-fix-pcf50633-require-resume-level-3-for-irq-work.pat.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1193-fix-pcf50633-add-back-gratuitous-isr-work-call-in-re.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1194-cosmetic-checkpatch-complaints.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1195-fix-pcf50633-kill-white-splash-of-death-on-suspend.p.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1196-fix-allow-core-1v3-to-go-down.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1197-debug-i2c-s3c2410-dump-stack-on-suspended-tranfer.pa.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1198-fix-pcf50633-suspend-state-as-enum.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1199-fix-pcf50633-disable-irq-from-suspend-until-resume.p.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1200-debug-backtrace-not-choke-on-null-dev_blah.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1201-fix-pcf50633-really-defer-backlight-on-resume.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1202-fix-pcf50633-platform-backlight-resume-ramp-setting.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1203-fix-pcf50633-migrate-gta02-peripherals-out.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1204-fix-pcf50633-use-pcf-not-data-in-probe-for-context.p.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1205-workaround-s3c24xx-i2s-stop-live-stream-stall-on-res.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1206-Subject-PATCH-a6k-Everyone-calls-SET_NET_DEV-an.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1207-Subject-PATCH-glamo-Don-t-disable-hwcursor-for-b.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1208-introduce-panic-blink-led-not-using-userspace-omfg.p.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1209-touchscreen-meddling.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1210-fix-touchscreen-meddling-divde.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1211-fix-lis302dl-resume-and-init-reload-boot-coefficient.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1212-fix-gsm-resume-problems.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1213-clean-gsm-flow-control.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1214-introduce-resume-exception-capture.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1215-From-119f4e02ba81cffe4dbc88d8ff667048ad28d925-Mon-Se.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1216-From-ae3f72fc608fcd0a98a980a335ac4dc7ad95b221-Mon-Se.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1217-From-683ef8067815f6ba0ede73fa71973823726213a3-Mon-Se.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1218-From-000450f1ad2c713d2345a872fdf44f5dd3702e1b-Mon-Se.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1219-From-5718bde77ed1a75e0fd2cdf5e099e66121d10c0a-Mon-Se.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1220-From-c221bb27c8e22daa451e26353140777223d397d2-Mon-Se.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1221-change-remove-kernel-charging-led-drive.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1222-add-ar6k-wake-interrupt.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1223-Remove-some-bits-of-nspy-GSM-flow-control-patches.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1224-commit-5f42e24d361cd83178fe8da9d68efbf41a011483.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1225-From-cede5c6c9b06ecbb0f7f2df7b7070092b87ddaf8-Mon-Se.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1226-From-3a32be40f78404d5f1185f0b3d6b5632381cb33f-Mon-Se.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1227-fix-pcf50633-mask-second-on-resume.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1228-fix-aux-key-level-by-gtaxx.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1229-add-pcf50633-allow-force-charger-type.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1230-fix-no-uart-leak-when-gps-off.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1231-fix-glamo-suspend-resume-dram-and-engines.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1232-change-backlight-level-not-forced-up-on-resume.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1233-introduce-BANKCON-meddling-sysfs.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1234-sdio-use-interruptible-sleep-in-kthread-main-loops.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1235-fix-force-sdcard-clk-off-when-idle.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1236-add-limit-sdcard-clk-cmdline.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1237-defconfig-enable-ext2-ext3-gtaxx.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1238-fix-scard-stop-on-resume.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1239-debug-move-dev-info-to-dbg.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1240-debug-add-glamo-drive-strength-module-param.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1241-fix-pcf50633-move-charger-enable-decision-to-pcf5063.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1242-fix-bq27000-charger-state-tracking.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1243-fix-glamo-mci-set-default-drive-level-0.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1244-fix-pcf50633-remove-charger-curlim-and-enable-apis-f.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1245-fix-pcf50633-only-do-platform-callback-once-per-even.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1246-fix-glamo-mci-possible-timeout-overflow.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1247-fix-glamo-mci-ensure-more-than-74-clocks-after-power.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1248-fix-allow-full-sd-voltage-range-selection.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1249-fix-glamo-mci-dont-filter-voltage-change.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1250-add-glamo-mci-slower-clocking-dynamic-switching.patc.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1251-use-gta02-glamo-mci-sd-dynamic-clock.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1252-fix-add-missing-include.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1253-config-usb-over-ethernet-module.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1254-fix-pcf50633-usbrem-charging-led.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1255-add-build-git-head-info.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1256-add-buildkeep-hash-named-copy.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1257-fix-build-hash-name-no-colon-separator.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1258-add-build-makerecovery.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1259-From-fa269b44512a03523b164c3cebc20312748c524b-Mon-Se.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1260-config-remove-evbug-module.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1261-config-add-udf-support.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1262-gta0x-add-minimal-GSM-flowcontrol.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1263-commit-830ea3d0c27c0c750b7bf1b56c002ee7943f3edc.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1264-silence-serial-console-gta01.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1265-gta01-pcf50606-disable-irq-from-suspend-until-resume.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1266-fix-suspend-backlight-timing-gta01.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1267-gta01-uart-fifo-trigger-sooner.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1268-checkpatch-fixes.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1269-add-includes-from-checkpatch-fixes.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1270-fix-no-discharging.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1271-always-call-resume-dependencies.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1272-clean-remove-suspend-dependencies-syslog.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1273-clean-checkpatch-gsm-resume-dep.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1274-mach-gta02-spell-fixes.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1275-lis302dl-allow-unloading-module.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1276-lis302dl-add-wakeup-defs.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1277-From-98d97ee93af676f7d6d0bf55aaae17e11304598a-Mon-Se.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1278-From-ca800f8b234299c56530e56018c031957c5c7ffb-Mon-Se.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1279-From-5ee1ee9e1c8a652b0f9cde72ad5e547db87d4d67-Mon-Se.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1280-interface-for-configuring-freefall-wakeup-interrupts.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1281-checkpatch-accel-fixes.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1282-From-Andrzej-Zaborowski-balrogg-gmail.com.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1283-gta02-accel-isr-fix-more.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1284-fix-one-mmc-race.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1285-fix-glamo-idleclock-around-suspend.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1286-fix-glamo-crank-memory-to-90MHz.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1287-soft_tap.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1288-newline_after_disconnect_msg.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1289-ar6k-essid-one-and-32.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1290-Subject-PATCH-rework-to-make-USBINS-USBREM-exclus.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1291-gta03-pca9632.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1292-fix-glamo-mci-slow-clock-until-first-bulk.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1293-fix-build-with-no-CONFIG_MMC.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1294-revert-fix-build-with-no-config_mmc-glamo-resume-cal.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1295-This-patch-adds-a-framebuffer-notifier-in-order-to-d.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1296-config-remove-gta01-wm8752-from-gta02-defconfig.patc.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1297-glamo_fb-Cosmetic-cleanup.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1298-glamo_fb-sync-comment-with-code.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1299-glamo_fb-Implement-screen-blanking.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1300-fix-gcc-4.3-false-modulo-optimization.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1301-clean-move-defconfigs-stable.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1302-fix-defconfig-path.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1303-fix-lid302dl-bitbang-all-the-way-baby.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1304--Acceleration-threshold-configuration-lis302dl-con.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1305-suppress-onkey-events-on-resume-Was-Re-Where-ar.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1306--lis302dl-refactor-and-cleanup.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1307--lis302dl-threshold-configuration-in-mg.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1308--lis302dl-configure-duration.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1309--lis302dl-open-floodgates-on-zero-threshold.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1310--lis302dl-wakeup-configuration.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1311-config-enable-oprofile-gta01-gta02.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1312-GTA02-Improve-NAND-timings.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1313-S3C24xx-NAND-allow-for-faster-timings.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1314-palliate_touch_screen_jitter.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1315-config-allow-gta02-usb-hiddev.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1316-jffs2-choke-gc-thread.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1317-fix-gta02-defconfig-uplevel.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1318-config-enable-storing-config-in-kernel.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1319-config-enable-ikconfig-proc.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1320--ARM-S3C24xx-Add-preliminary-E-TEN-glofiish-M800-s.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1321-fix-s3c2410-usb-controller-mode-change-always-EINVAL.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1322-fix-gta01-s3c-mci-stop-clock-when-idle.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1323-GTA01-use-slow-SD-clock-when-gps-on.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1324-gta01-battery-driver.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1325-fix-missing-new-files-glofiish.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1326-change-gta01-battery-driver-name.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1327-jbt6k74_no_deep_sleep.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.24/1328-.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/0100-revert-openwrt-patches-921-922-923.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/0500-call-preinit-instead-of-init.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1001-explicitly-link-notes-section.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1002-gta01-no_nand_partitions.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1003-fix-i2c-s3c2410-resume-race.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1004-resume-timers-wq.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1005-s3c2410-bbt.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1006-gta01-pcf50606.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1007-gta01-core.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1008-gta01-jbt6k74.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1009-gta01-inputdevice.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1010-gta01-power_control.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1011-s3c2410-pwm.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1012-gta01-vibrator.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1013-gta01-backlight.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1014-s3c2410_touchscreen.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1015-s3c2410_ts-gta01.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1016-i2c-permit_invalid_addrs.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1017-g_ether-highpower.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1018-g_ether-vendor_product.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1019-s3c_mci.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1020-s3c_mci-gta01.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1021-s3c24xx-nand-largepage.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1022-s3c2410_udc-2440_dual_packet-workaround.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1023-s3c2442b-cpuid.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1024-pcf50633.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1025-pcf50633-suspend-hacks.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1026-smedia-glamo.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1027-glamo-mmc.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1028-gta02-core.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1029-gta02-power_control.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1030-gta02-sound.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1031-lis302dl.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1032-gta02-leds.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1033-gta02-acc.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1034-pcf506xx.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1035-gta02-bt-fixes.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1036-openmoko-logo.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1037-config-nr-tty-devices.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1038-pm-debug_less_verbose.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1039-s3c2410_serial-nodebug.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1040-input-nots-mousedev.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1041-s3c2440-nand-disable-hwecc.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1042-qt2410-cs8900.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1043-s3c2410-qt2410-buttons.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1044-fail-unless-uimage.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1045-introduce-fiq-basis.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1046-introduce-fiq-use-timer3-as-source.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1047-introduce-fiq-migrate-vibrator-gta02-only.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1048-fiq-hdq.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1049-bq27000-battery-driver.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1050-fix-EVIOCGRAB-semantics.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1051-s3c2410-usb-switch.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1052-pnp_fixes.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1053-atheros_2_0_function.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1054-atheros_2_0_hcd.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1055-atheros_2_0_sdio_stack.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1056-fix-hwecc-2410.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1057-fix-pcf50606-LOWBAT-kill-init.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1058-fix-pcf50633-LOWBAT-kill-init.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1059-gta01-dehang-printk.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1060-suspend-prelim1.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1061-gta02-sound-bandaid.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1062-glamo-cmdqueue-bandaid.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1063-fix-wm8753-DBG.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1064-local-add-defconfig.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1065-local-build-scripts.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1066-local-build-new-dfu-vid.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1067-local-update-defconfig-for-2.6-dev.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1068-local-config-add-vfat-nls-to-kern.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1069-local-config-add-bluetooth-monolithic.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1070-local-config-wlan-config-changes.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1071-local-config-defconfig-motion-sensor-gpio.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1072-local-config-pmu.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1073-local-config-ext2.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1074-contrib-fix-chgstate-array-bloat.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1075-bugfix-deglitch-gpio-output-enable.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1076-clean-snip-gpio-reinit.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1077-introduce-fiq-hdq.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1078-introduce-bq27000-battery-driver.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1079-debug-suspend-dump-gpio-states-add-GPA.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1080-fix-s3c2410_timer_setup-resume-BUG.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1081-config-add-alsa.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1082-fix-glamo-mci-defeat-ops-during-suspend.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1083-fix-lcm-reinit-post-resume.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1084-fix-glamo-mci-fake-reset-opcode-in-suspend.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1085-use-gpio-control-leds.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1086-fix-gpio-led-patch-still-pwm-t3.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1087-introduce-usb-host-power-control.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1088-fix-charging-deassert-host-power-1a-detect.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1089-add-pcf50633-06-RTC_AIE-ioctl.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1090-fix-lis302dl-suspend-gpio.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1091-fix-suspend-gps-tx-level.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1092-Do-not-send-low-level-debugging-to-the-modem.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1093-add-gta02-pcb-revision-detect.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1094-debug-glamo-dump-regs.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1095-add-pcb-rev-sysfs.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1096-Simplify-the-code-there-is-no-need-for-a-branch.-Th.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1097-Remove-dead-code.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1098-Fix-the-FIXME-store-the-GPIO-value-for-now.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1099-Convert-the-driver-to-the-generic-GPIO-framework.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1100-Add-GPIO-IRQ-for-the-s3c2410-and-add-irq_to_gpio.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1101-This-is-gta02-and-not-gta01.-Do-not-call-the-vibrato.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1102-Fix-spelling.-flaoting-floating.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1103-Fix-the-firing-of-Jack-Interrupts-after-resume-whe.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1104-Enable-GPS-only-if-it-was-powered-on-before-suspendi.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1105-fix-wlan-disable.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1106-defconfig-audio.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1107-fix-gsm-download-irq-balance-issue.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1108-fix-glamofb-cmdqueue-timeout.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1109-fix-glamofb-cmd-mode-locking.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1110-debug-glamo-add-lcd-regs-to-dump.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1111-fix-jack-debounce.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1112-OpenMoko-Openmoko.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1113-Remove-not-needed-ifdef-as-machine_is_-is-always-de.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1114--leds-We-would-enable-PWM-for-all-four-timers-disa.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1115--led-Misc-fixes-in-the-driver-code.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1116--neo-bluetooth-GTA01_GPIO_MODEM_RST-GTA02_GPIO_M.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1117--neo-Every-access-to-GPIO-bank-B-has-to-go-through.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1118-fix-jack-interrupt-debounce-loss-window.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1119-fix-gta01-spi-resume-patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1120-fix-gta01-pmu-irq-edge-lost-on-resume.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1121-add-defconfig-2.6.25.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1122-tracking-2.6.25-input_dev-cdev-union-removed.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1123-tracking-2.6.25-struct-bus-type-loses-devices-member.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1124-tracking-2.6.25-upstream-s3c2410_gpio_irq2pin.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1125-tracking-2.6.25-deprecated-includefile-wm8753.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1126-tracking-2.6.25-changed-s3c2410_dma_request-reurn.pa.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1127-gta01-gps-power-state-resume-preserve.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1128-gta01-fix-jbt-platform-missing-members.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1129-gta01-fix-resume-redo-par.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1130-From-cc08b5986dfd8d971ee46ce7045fb7863f99a92a-Mon-Se.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1131-clean-sdio-hcd-suspend.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1132-config-update-2.6.21-rc1.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1133-tracking-2.6.26-rc1-remove-input-dev-private-member.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1134-tracking-2.6.26-rc1-remove-dupe-s3c2410_nand_update_.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1135-tracking-2.6.26-rc1-sdio-pnp-changes.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1136-fix-KEY_PHONE-up-down-inversion.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1137-s3c24xx-pwm-platform-driver.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1138-fix-suspend-backlight-timing-pm-debug.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1139-fix-wep-needs-keys-before-ap.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1140-Fixup-hang-on-resume-caused-by-the-s3c2410-touch-scr.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1141-fix-motion-sensor-corruption.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1142-add-resume-reason-sysfs.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1143-fix-reduce-wake-reasons-in-pcf50633.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1144-add-gta01-resume-sysfs.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1145-introduce-samsung-camera-unit-driver.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1146-uplevel-samsung-camera-unit.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1147-fix-remove-unused-model-name-bq27000.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1148-Fix-possible-null-pointer-dereference-in-s3c24xx_i2c.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1149-Make-ar6k-not-print-soooo-much-to-my-console.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1150-Subject-PATCH-Build-fixes.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1151-Subject-PATCH-Hardware-glamo-fb-cursor-some-clea.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1152-Subject-config-defconfig-2.6.26.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1153-introduce-charging-led-behaviour.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1154-introduce-resume-dependency.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1155-introduce-pcf50633-resume-dependency-list.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1156-add-use-pcf50633-resume-callback-jbt6k74.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1157-The-following-is-a-minor-cleanup-of-backlight-resume.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1158-debug-codec-register-setting-sysfs.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1159-fix-pcf50633-suspend-resume-onehit-i2c-other-meddlin.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1160-fix-glamo-mci-relationship-with-pcf50633-suspend-res.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1161-fix-jbt6k74-force-reset-suspend.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1162-fix-glamo-mci-power-setting-timeout-waiting-for-pcf5.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1163-fix-glamo-mci-resume-dependency-on-pcf50633.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1164-fix-pcf50633-interrupt-work-enforce-wait-on-resume-c.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1165-fix-pcf50633-rtc-i2c-bulk-autoincrement-simplify.pat.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1166-fix-pcf50633-use-i2c-bulk-autoincrement.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1167-fix-pcf50633-usb-curlim-workqueue-migration.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1168-change-lcm-keep-power-faster-resume.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1169-fix-gta02-mach-remove-gta01-lcd-reset.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1170-add-remote-install-sdcard-script.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1171-fix-pcf50633-require-resume-level-3-for-irq-work.pat.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1172-fix-pcf50633-add-back-gratuitous-isr-work-call-in-re.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1173-fix-pcf50633-kill-white-splash-of-death-on-suspend.p.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1174-fix-allow-core-1v3-to-go-down.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1175-debug-i2c-s3c2410-dump-stack-on-suspended-tranfer.pa.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1176-fix-pcf50633-suspend-state-as-enum.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1177-fix-pcf50633-disable-irq-from-suspend-until-resume.p.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1178-debug-backtrace-not-choke-on-null-dev_blah.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1179-fix-pcf50633-really-defer-backlight-on-resume.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1180-fix-glamo-suspend-resume-dram-and-engines.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1181-fix-pcf50633-platform-backlight-resume-ramp-setting.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1182-fix-pcf50633-migrate-gta02-peripherals-out.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1183-fix-pcf50633-use-pcf-not-data-in-probe-for-context.p.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1184-workaround-s3c24xx-i2s-stop-live-stream-stall-on-res.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1185-Subject-PATCH-a6k-Everyone-calls-SET_NET_DEV-an.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1186-Subject-PATCH-glamo-Don-t-disable-hwcursor-for-b.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1187-introduce-panic-blink-led-not-using-userspace-omfg.p.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1188-touchscreen-meddling.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1189-fix-touchscreen-meddling-divde.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1190-fix-lis302dl-resume-and-init-reload-boot-coefficient.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1191-fix-gsm-resume-problems.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1192-introduce-resume-exception-capture.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1193-tracking-defconfig-2.6.26-rc7.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1194-tracking-2.6.26-rc7-repeat-cdev-removal-pcf50633.pat.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1195-From-119f4e02ba81cffe4dbc88d8ff667048ad28d925-Mon-Se.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1196-From-ae3f72fc608fcd0a98a980a335ac4dc7ad95b221-Mon-Se.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1197-From-683ef8067815f6ba0ede73fa71973823726213a3-Mon-Se.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1198-From-000450f1ad2c713d2345a872fdf44f5dd3702e1b-Mon-Se.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1199-From-5718bde77ed1a75e0fd2cdf5e099e66121d10c0a-Mon-Se.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1200-From-c221bb27c8e22daa451e26353140777223d397d2-Mon-Se.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1201-change-remove-kernel-charging-led-drive.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1202-add-ar6k-wake-interrupt.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1203-Remove-some-bits-of-nspy-GSM-flow-control-patches.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1204-commit-5f42e24d361cd83178fe8da9d68efbf41a011483.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1205-From-cede5c6c9b06ecbb0f7f2df7b7070092b87ddaf8-Mon-Se.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1206-From-3a32be40f78404d5f1185f0b3d6b5632381cb33f-Mon-Se.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1207-fix-pcf50633-mask-second-on-resume.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1208-fix-aux-key-level-by-gtaxx.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1209-add-pcf50633-allow-force-charger-type.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1210-fix-no-uart-leak-when-gps-off.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1211-change-backlight-level-not-forced-up-on-resume.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1212-introduce-BANKCON-meddling-sysfs.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1213-sdio-use-interruptible-sleep-in-kthread-main-loops.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1214-fix-force-sdcard-clk-off-when-idle.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1215-add-limit-sdcard-clk-cmdline.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1216-fix-scard-stop-on-resume.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1217-debug-move-dev-info-to-dbg.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1218-debug-add-glamo-drive-strength-module-param.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1219-fix-bq27000-charger-state-tracking.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1220-fix-glamo-mci-set-default-drive-level-0.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1221-fix-pcf50633-remove-charger-curlim-and-enable-apis-f.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1222-fix-pcf50633-only-do-platform-callback-once-per-even.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1223-fix-glamo-mci-possible-timeout-overflow.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1224-fix-glamo-mci-ensure-more-than-74-clocks-after-power.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1225-fix-pcf50633-bd-undef.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1226-fix-wm8753-DBG.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1227-fix-s3c2410-serial-fwd-ref.patch.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1228-fix-allow-full-sd-voltage-range-selection.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1229-fix-glamo-mci-dont-filter-voltage-change.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1230-add-glamo-mci-slower-clocking-dynamic-switching.patc.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1231-use-gta02-glamo-mci-sd-dynamic-clock.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1232-0003-a6k-sdio-Use-pnp_alloc_dev-to-properly-initiali.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1233-device-model-Allow-the-creation-of-symlinks-on-sys.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1234-pcf50606-fix-gllin-compat-link.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1235-fix-add-missing-include.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1236-config-kill-mtd-debug.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1237-fix-glamo-turbo-host-interface.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1238-fix-glamo-crank-memory-to-90MHz.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1239-fix-hdq-probe.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1240-gta0x-add-minimal-GSM-flowcontrol.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1241-commit-830ea3d0c27c0c750b7bf1b56c002ee7943f3edc.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1242-silence-serial-console-gta01.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1243-gta01-pcf50606-disable-irq-from-suspend-until-resume.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1244-fix-suspend-backlight-timing-gta01.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1245-gta01-uart-fifo-trigger-sooner.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1246-checkpatch-fixes.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1247-add-includes-from-checkpatch-fixes.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1248-fix-pcf50633-usbrem-charging-led.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1249-fix-no-discharging.patch.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1250-One-of-the-error-paths-on-s3cmci_probe-was-doing-t.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1251-My-GTA01-2.6.26-kernel-was-crashing-within-mmc_power.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1252-The-driver-should-be-checking-for-a-negative-error-c.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1253-mmc_detect_change-takes-jiffies-not-msecs.-Conver.patch [deleted file]
target/linux/s3c24xx/patches-2.6.26/1254-config-2.6.26-add-s3c-mmc.patch.patch [deleted file]
target/linux/x86/config-2.6.27 [deleted file]

diff --git a/target/linux/adm5120/patches-2.6.26/001-adm5120.patch b/target/linux/adm5120/patches-2.6.26/001-adm5120.patch
deleted file mode 100644 (file)
index ffebf85..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -18,6 +18,22 @@ choice
-       prompt "System type"
-       default SGI_IP22
-+config ADM5120
-+      bool "Infineon/ADMtek ADM5120 SoC based machines"
-+      select CEVT_R4K
-+      select CSRC_R4K
-+      select SYS_HAS_CPU_MIPS32_R1
-+      select SYS_HAS_EARLY_PRINTK
-+      select DMA_NONCOHERENT
-+      select IRQ_CPU
-+      select SYS_SUPPORTS_LITTLE_ENDIAN
-+      select SYS_SUPPORTS_BIG_ENDIAN
-+      select SYS_SUPPORTS_32BIT_KERNEL
-+      select GENERIC_GPIO
-+      select HAVE_GPIO_LIB
-+      select SWAP_IO_SPACE if CPU_BIG_ENDIAN
-+      select MIPS_MACHINE
-+
- config MACH_ALCHEMY
-       bool "Alchemy processor based machines"
-@@ -687,6 +702,7 @@ config WR_PPMC
- endchoice
-+source "arch/mips/adm5120/Kconfig"
- source "arch/mips/au1000/Kconfig"
- source "arch/mips/basler/excite/Kconfig"
- source "arch/mips/jazz/Kconfig"
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -174,6 +174,21 @@ cflags-$(CONFIG_MACH_JAZZ)        += -Iinclude/
- load-$(CONFIG_MACH_JAZZ)      += 0xffffffff80080000
- #
-+# Infineon/ADMtek ADM5120
-+#
-+libs-$(CONFIG_ADM5120)                        += arch/mips/adm5120/prom/
-+core-$(CONFIG_ADM5120)                        += arch/mips/adm5120/common/
-+core-$(CONFIG_ADM5120_OEM_CELLVISION) += arch/mips/adm5120/cellvision/
-+core-$(CONFIG_ADM5120_OEM_COMPEX)     += arch/mips/adm5120/compex/
-+core-$(CONFIG_ADM5120_OEM_EDIMAX)     += arch/mips/adm5120/edimax/
-+core-$(CONFIG_ADM5120_OEM_INFINEON)   += arch/mips/adm5120/infineon/
-+core-$(CONFIG_ADM5120_OEM_MIKROTIK)   += arch/mips/adm5120/mikrotik/
-+core-$(CONFIG_ADM5120_OEM_MOTOROLA)   += arch/mips/adm5120/motorola/
-+core-$(CONFIG_ADM5120_OEM_ZYXEL)      += arch/mips/adm5120/zyxel/
-+cflags-$(CONFIG_ADM5120)              += -Iinclude/asm-mips/mach-adm5120
-+load-$(CONFIG_ADM5120)                        += 0xffffffff80001000
-+
-+#
- # Common Alchemy Au1x00 stuff
- #
- core-$(CONFIG_SOC_AU1X00)     += arch/mips/au1000/common/
diff --git a/target/linux/adm5120/patches-2.6.26/002-adm5120_flash.patch b/target/linux/adm5120/patches-2.6.26/002-adm5120_flash.patch
deleted file mode 100644 (file)
index d7535ae..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/drivers/mtd/maps/Kconfig
-+++ b/drivers/mtd/maps/Kconfig
-@@ -586,5 +586,9 @@ config MTD_PLATRAM
-         This selection automatically selects the map_ram driver.
-+config MTD_ADM5120
-+      tristate "Map driver for ADM5120 based boards"
-+      depends on ADM5120
-+
- endmenu
---- a/drivers/mtd/maps/Makefile
-+++ b/drivers/mtd/maps/Makefile
-@@ -44,6 +44,7 @@ obj-$(CONFIG_MTD_DBOX2)              += dbox2-flash.
- obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
- obj-$(CONFIG_MTD_PCI)         += pci.o
- obj-$(CONFIG_MTD_ALCHEMY)       += alchemy-flash.o
-+obj-$(CONFIG_MTD_ADM5120)             += adm5120-flash.o
- obj-$(CONFIG_MTD_AUTCPU12)    += autcpu12-nvram.o
- obj-$(CONFIG_MTD_EDB7312)     += edb7312.o
- obj-$(CONFIG_MTD_IMPA7)               += impa7.o
diff --git a/target/linux/adm5120/patches-2.6.26/003-adm5120_switch.patch b/target/linux/adm5120/patches-2.6.26/003-adm5120_switch.patch
deleted file mode 100644 (file)
index ac0c5e3..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -613,6 +613,10 @@ config MIPS_AU1X00_ENET
-         If you have an Alchemy Semi AU1X00 based system
-         say Y.  Otherwise, say N.
-+config ADM5120_ENET
-+      tristate "ADM5120 Ethernet switch support"
-+      depends on ADM5120
-+
- config SGI_IOC3_ETH
-       bool "SGI IOC3 Ethernet"
-       depends on PCI && SGI_IP27
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -186,6 +186,7 @@ obj-$(CONFIG_SC92031) += sc92031.o
- # This is also a 82596 and should probably be merged
- obj-$(CONFIG_LP486E) += lp486e.o
-+obj-$(CONFIG_ADM5120_ENET) += adm5120sw.o
- obj-$(CONFIG_ETH16I) += eth16i.o
- obj-$(CONFIG_ZORRO8390) += zorro8390.o
- obj-$(CONFIG_HPLANCE) += hplance.o 7990.o
diff --git a/target/linux/adm5120/patches-2.6.26/005-adm5120_usb.patch b/target/linux/adm5120/patches-2.6.26/005-adm5120_usb.patch
deleted file mode 100644 (file)
index 751af5a..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/drivers/usb/host/Kconfig
-+++ b/drivers/usb/host/Kconfig
-@@ -4,6 +4,10 @@
- comment "USB Host Controller Drivers"
-       depends on USB
-+config USB_ADM5120_HCD
-+      tristate "ADM5120 HCD support (EXPERIMENTAL)"
-+      depends on USB && ADM5120 && EXPERIMENTAL
-+
- config USB_C67X00_HCD
-       tristate "Cypress C67x00 HCD support"
-       depends on USB
---- a/drivers/usb/host/Makefile
-+++ b/drivers/usb/host/Makefile
-@@ -10,6 +10,7 @@ isp1760-objs := isp1760-hcd.o isp1760-if
- obj-$(CONFIG_PCI)             += pci-quirks.o
-+obj-$(CONFIG_USB_ADM5120_HCD) += adm5120-hcd.o
- obj-$(CONFIG_USB_EHCI_HCD)    += ehci-hcd.o
- obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o
- obj-$(CONFIG_USB_OHCI_HCD)    += ohci-hcd.o
---- a/drivers/usb/Makefile
-+++ b/drivers/usb/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_USB_UHCI_HCD)   += host/
- obj-$(CONFIG_USB_SL811_HCD)   += host/
- obj-$(CONFIG_USB_U132_HCD)    += host/
- obj-$(CONFIG_USB_R8A66597_HCD)        += host/
-+obj-$(CONFIG_USB_ADM5120_HCD)         += host/
- obj-$(CONFIG_USB_C67X00_HCD)  += c67x00/
diff --git a/target/linux/adm5120/patches-2.6.26/007-adm5120_pci.patch b/target/linux/adm5120/patches-2.6.26/007-adm5120_pci.patch
deleted file mode 100644 (file)
index 3df0f06..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/arch/mips/pci/Makefile
-+++ b/arch/mips/pci/Makefile
-@@ -48,3 +48,4 @@ obj-$(CONFIG_TOSHIBA_RBTX4938)       += fixup-
- obj-$(CONFIG_VICTOR_MPC30X)   += fixup-mpc30x.o
- obj-$(CONFIG_ZAO_CAPCELLA)    += fixup-capcella.o
- obj-$(CONFIG_WR_PPMC)         += fixup-wrppmc.o
-+obj-$(CONFIG_ADM5120)         += pci-adm5120.o
---- a/include/linux/pci_ids.h
-+++ b/include/linux/pci_ids.h
-@@ -1707,6 +1707,9 @@
- #define PCI_VENDOR_ID_ESDGMBH         0x12fe
- #define PCI_DEVICE_ID_ESDGMBH_CPCIASIO4 0x0111
-+#define PCI_VENDOR_ID_ADMTEK          0x1317
-+#define PCI_DEVICE_ID_ADMTEK_ADM5120  0x5120
-+
- #define PCI_VENDOR_ID_SIIG            0x131f
- #define PCI_SUBVENDOR_ID_SIIG         0x131f
- #define PCI_DEVICE_ID_SIIG_1S_10x_550 0x1000
diff --git a/target/linux/adm5120/patches-2.6.26/009-adm5120_leds_switch_trigger.patch b/target/linux/adm5120/patches-2.6.26/009-adm5120_leds_switch_trigger.patch
deleted file mode 100644 (file)
index 1e3385d..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -207,4 +207,12 @@ config LEDS_TRIGGER_NETDEV
-         This allows LEDs to be controlled by network device activity.
-         If unsure, say Y.
-+config LEDS_TRIGGER_ADM5120_SWITCH
-+      tristate "LED ADM5120 Switch Port Status Trigger"
-+      depends on LEDS_TRIGGERS && ADM5120
-+      help
-+        This allows LEDs to be controlled by the port states of
-+        the ADM5120 built-in Ethernet Switch
-+        If unsure, say N.
-+
- endif # NEW_LEDS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -30,3 +30,4 @@ obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += 
- obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
- obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o
- obj-$(CONFIG_LEDS_TRIGGER_NETDEV)      += ledtrig-netdev.o
-+obj-$(CONFIG_LEDS_TRIGGER_ADM5120_SWITCH) += ledtrig-adm5120-switch.o
diff --git a/target/linux/adm5120/patches-2.6.26/101-cfi_fixup_macronix_bootloc.patch b/target/linux/adm5120/patches-2.6.26/101-cfi_fixup_macronix_bootloc.patch
deleted file mode 100644 (file)
index 65b34ac..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -47,12 +47,19 @@
- #define MANUFACTURER_AMD      0x0001
- #define MANUFACTURER_ATMEL    0x001F
- #define MANUFACTURER_SST      0x00BF
-+#define MANUFACTURER_MACRONIX 0x00C2
- #define SST49LF004B           0x0060
- #define SST49LF040B           0x0050
- #define SST49LF008A           0x005a
- #define AT49BV6416            0x00d6
- #define MANUFACTURER_SAMSUNG  0x00ec
-+/* Macronix */
-+#define MX29LV160B    0x2249  /* MX29LV160 Bottom-boot chip */
-+#define MX29LV160T    0x22C4  /* MX29LV160 Top-boot chip */
-+#define MX29LV320B    0x22A8  /* MX29LV320 Bottom-boot chip */
-+#define MX29LV320T    0x22A7  /* MX29LV320 Top-boot chip */
-+
- static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
- static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
- static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
-@@ -243,6 +250,41 @@ static void fixup_s29gl032n_sectors(stru
-       }
- }
-+#ifdef CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC
-+/*
-+ * Some Macronix chips has no/bad bootblock information in the CFI table
-+ */
-+static void fixup_macronix_bootloc(struct mtd_info *mtd, void* param)
-+{
-+      struct map_info *map = mtd->priv;
-+      struct cfi_private *cfi = map->fldrv_priv;
-+      struct cfi_pri_amdstd *extp = cfi->cmdset_priv;
-+      __u8 t;
-+
-+      switch (cfi->id) {
-+      /* TODO: put affected chip ids here */
-+      case MX29LV160B:
-+      case MX29LV320B:
-+              t = 2;  /* Bottom boot */
-+              break;
-+      case MX29LV160T:
-+      case MX29LV320T:
-+              t = 3;  /* Top boot */
-+              break;
-+      default:
-+              return;
-+      }
-+
-+      if (extp->TopBottom == t)
-+              /* boot location detected by the CFI layer is correct */
-+              return;
-+
-+      extp->TopBottom = t;
-+      printk("%s: Macronix chip detected, id:0x%04X, boot location forced "
-+              "to %s\n", map->name, cfi->id, (t == 2) ? "bottom" : "top");
-+}
-+#endif /* CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC */
-+
- static struct cfi_fixup cfi_fixup_table[] = {
-       { CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },
- #ifdef AMD_BOOTLOC_BUG
-@@ -278,6 +320,9 @@ static struct cfi_fixup fixup_table[] = 
-        */
-       { CFI_MFR_ANY, CFI_ID_ANY, fixup_use_erase_chip, NULL },
-       { CFI_MFR_ATMEL, AT49BV6416, fixup_use_atmel_lock, NULL },
-+#ifdef CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC
-+      { MANUFACTURER_MACRONIX, CFI_ID_ANY, fixup_macronix_bootloc, NULL, },
-+#endif
-       { 0, 0, NULL, NULL }
- };
---- a/drivers/mtd/chips/Kconfig
-+++ b/drivers/mtd/chips/Kconfig
-@@ -196,6 +196,14 @@ config MTD_CFI_AMDSTD
-         provides support for one of those command sets, used on chips
-         including the AMD Am29LV320.
-+config MTD_CFI_FIXUP_MACRONIX_BOOTLOC
-+      bool "Fix boot-block location for Macronix flash chips"
-+      depends on MTD_CFI_AMDSTD
-+      help
-+        Some Macronix flash chips have no/wrong boot-block location in the
-+        CFI table, and the driver may detect the type incorrectly. Select
-+        this if your board has such chip.
-+
- config MTD_CFI_STAA
-       tristate "Support for ST (Advanced Architecture) flash chips"
-       depends on MTD_GEN_PROBE
diff --git a/target/linux/adm5120/patches-2.6.26/102-jedec_pmc_39lvxxx_chips.patch b/target/linux/adm5120/patches-2.6.26/102-jedec_pmc_39lvxxx_chips.patch
deleted file mode 100644 (file)
index e84c44f..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/drivers/mtd/chips/jedec_probe.c
-+++ b/drivers/mtd/chips/jedec_probe.c
-@@ -121,6 +121,10 @@
- #define UPD29F064115  0x221C
- /* PMC */
-+#define PM39LV512     0x001B
-+#define PM39LV010     0x001C
-+#define PM39LV020     0x003D
-+#define PM39LV040     0x003E
- #define PM49FL002     0x006D
- #define PM49FL004     0x006E
- #define PM49FL008     0x006A
-@@ -1173,6 +1177,54 @@ static const struct amd_flash_info jedec
-                       ERASEINFO(0x02000,2),
-                       ERASEINFO(0x04000,1),
-               }
-+        }, {
-+              .mfr_id         = MANUFACTURER_PMC,
-+              .dev_id         = PM39LV512,
-+              .name           = "PMC Pm39LV512",
-+              .devtypes       = CFI_DEVICETYPE_X8,
-+              .uaddr          = MTD_UADDR_0x0555_0x02AA,
-+              .dev_size       = SIZE_64KiB,
-+              .cmd_set        = P_ID_AMD_STD,
-+              .nr_regions     = 1,
-+              .regions        = {
-+                      ERASEINFO(0x01000,16),
-+              }
-+        }, {
-+              .mfr_id         = MANUFACTURER_PMC,
-+              .dev_id         = PM39LV010,
-+              .name           = "PMC Pm39LV010",
-+              .devtypes       = CFI_DEVICETYPE_X8,
-+              .uaddr          = MTD_UADDR_0x0555_0x02AA,
-+              .dev_size       = SIZE_128KiB,
-+              .cmd_set        = P_ID_AMD_STD,
-+              .nr_regions     = 1,
-+              .regions        = {
-+                      ERASEINFO(0x01000,32),
-+              }
-+        }, {
-+              .mfr_id         = MANUFACTURER_PMC,
-+              .dev_id         = PM39LV020,
-+              .name           = "PMC Pm39LV020",
-+              .devtypes       = CFI_DEVICETYPE_X8,
-+              .uaddr          = MTD_UADDR_0x0555_0x02AA,
-+              .dev_size       = SIZE_256KiB,
-+              .cmd_set        = P_ID_AMD_STD,
-+              .nr_regions     = 1,
-+              .regions        = {
-+                      ERASEINFO(0x01000,64),
-+              }
-+        }, {
-+              .mfr_id         = MANUFACTURER_PMC,
-+              .dev_id         = PM39LV040,
-+              .name           = "PMC Pm39LV040",
-+              .devtypes       = CFI_DEVICETYPE_X8,
-+              .uaddr          = MTD_UADDR_0x0555_0x02AA,
-+              .dev_size       = SIZE_512KiB,
-+              .cmd_set        = P_ID_AMD_STD,
-+              .nr_regions     = 1,
-+              .regions        = {
-+                      ERASEINFO(0x01000,128),
-+              }
-       }, {
-               .mfr_id         = MANUFACTURER_PMC,
-               .dev_id         = PM49FL002,
diff --git a/target/linux/adm5120/patches-2.6.26/103-mtd_trxsplit.patch b/target/linux/adm5120/patches-2.6.26/103-mtd_trxsplit.patch
deleted file mode 100644 (file)
index e4c8690..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -57,6 +57,11 @@ config MTD_ROOTFS_SPLIT
-       depends on MTD_PARTITIONS
-       default y
-+config MTD_TRXSPLIT
-+      bool "Automatically find and split TRX partitions"
-+      depends on MTD_PARTITIONS
-+      default n
-+
- config MTD_REDBOOT_PARTS
-       tristate "RedBoot partition table parsing"
-       depends on MTD_PARTITIONS
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -8,6 +8,7 @@ mtd-y                          := mtdcore.o mtdsuper.o
- mtd-$(CONFIG_MTD_PARTITIONS)  += mtdpart.o
- obj-$(CONFIG_MTD_CONCAT)      += mtdconcat.o
-+obj-$(CONFIG_MTD_TRXSPLIT)    += trxsplit.o
- obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
- obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
- obj-$(CONFIG_MTD_AFS_PARTS)   += afs.o
diff --git a/target/linux/adm5120/patches-2.6.26/120-rb153_cf_driver.patch b/target/linux/adm5120/patches-2.6.26/120-rb153_cf_driver.patch
deleted file mode 100644 (file)
index e100181..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/drivers/ata/Makefile
-+++ b/drivers/ata/Makefile
-@@ -72,6 +72,7 @@ obj-$(CONFIG_PATA_BF54X)     += pata_bf54x.o
- obj-$(CONFIG_PATA_PLATFORM)   += pata_platform.o
- obj-$(CONFIG_PATA_OF_PLATFORM)        += pata_of_platform.o
- obj-$(CONFIG_PATA_ICSIDE)     += pata_icside.o
-+obj-$(CONFIG_PATA_RB153_CF)   += pata_rb153_cf.o
- # Should be last but two libata driver
- obj-$(CONFIG_PATA_ACPI)               += pata_acpi.o
- # Should be last but one libata driver
---- a/drivers/ata/Kconfig
-+++ b/drivers/ata/Kconfig
-@@ -566,6 +566,15 @@ config PATA_RADISYS
-         If unsure, say N.
-+config PATA_RB153_CF
-+      tristate "RouterBOARD 153 Compact Flash support"
-+      depends on ADM5120_MACH_RB_153
-+      help
-+        This option enables support for a Compact Flash connected on
-+        the RouterBOARD 153.
-+
-+        If unsure, say N.
-+
- config PATA_RB532
-       tristate "RouterBoard 532 PATA CompactFlash support"
-       depends on MIKROTIK_RB532
diff --git a/target/linux/adm5120/patches-2.6.26/140-cmdline_hack.patch b/target/linux/adm5120/patches-2.6.26/140-cmdline_hack.patch
deleted file mode 100644 (file)
index 1ced3f6..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/arch/mips/kernel/head.S
-+++ b/arch/mips/kernel/head.S
-@@ -126,7 +126,12 @@
-       /*
-        * Reserved space for exception handlers.
-        * Necessary for machines which link their kernels at KSEG0.
-+       * Use as temporary storage for the kernel command line, so that it
-+       * can be updated easily without having to relink the kernel.
-        */
-+
-+EXPORT(_image_cmdline)
-+      .ascii "CMDLINE:"
-       .fill   0x400
- #endif
diff --git a/target/linux/adm5120/patches-2.6.26/200-amba_pl010_hacks.patch b/target/linux/adm5120/patches-2.6.26/200-amba_pl010_hacks.patch
deleted file mode 100644 (file)
index 18fbc69..0000000
+++ /dev/null
@@ -1,378 +0,0 @@
---- a/drivers/serial/amba-pl010.c
-+++ b/drivers/serial/amba-pl010.c
-@@ -52,11 +52,10 @@
- #include <asm/io.h>
--#define UART_NR               8
--
- #define SERIAL_AMBA_MAJOR     204
- #define SERIAL_AMBA_MINOR     16
--#define SERIAL_AMBA_NR                UART_NR
-+#define SERIAL_AMBA_NR                CONFIG_SERIAL_AMBA_PL010_NUMPORTS
-+#define SERIAL_AMBA_NAME      CONFIG_SERIAL_AMBA_PL010_PORTNAME
- #define AMBA_ISR_PASS_LIMIT   256
-@@ -82,9 +81,9 @@ static void pl010_stop_tx(struct uart_po
-       struct uart_amba_port *uap = (struct uart_amba_port *)port;
-       unsigned int cr;
--      cr = readb(uap->port.membase + UART010_CR);
-+      cr = __raw_readl(uap->port.membase + UART010_CR);
-       cr &= ~UART010_CR_TIE;
--      writel(cr, uap->port.membase + UART010_CR);
-+      __raw_writel(cr, uap->port.membase + UART010_CR);
- }
- static void pl010_start_tx(struct uart_port *port)
-@@ -92,9 +91,9 @@ static void pl010_start_tx(struct uart_p
-       struct uart_amba_port *uap = (struct uart_amba_port *)port;
-       unsigned int cr;
--      cr = readb(uap->port.membase + UART010_CR);
-+      cr = __raw_readl(uap->port.membase + UART010_CR);
-       cr |= UART010_CR_TIE;
--      writel(cr, uap->port.membase + UART010_CR);
-+      __raw_writel(cr, uap->port.membase + UART010_CR);
- }
- static void pl010_stop_rx(struct uart_port *port)
-@@ -102,9 +101,9 @@ static void pl010_stop_rx(struct uart_po
-       struct uart_amba_port *uap = (struct uart_amba_port *)port;
-       unsigned int cr;
--      cr = readb(uap->port.membase + UART010_CR);
-+      cr = __raw_readl(uap->port.membase + UART010_CR);
-       cr &= ~(UART010_CR_RIE | UART010_CR_RTIE);
--      writel(cr, uap->port.membase + UART010_CR);
-+      __raw_writel(cr, uap->port.membase + UART010_CR);
- }
- static void pl010_enable_ms(struct uart_port *port)
-@@ -112,9 +111,9 @@ static void pl010_enable_ms(struct uart_
-       struct uart_amba_port *uap = (struct uart_amba_port *)port;
-       unsigned int cr;
--      cr = readb(uap->port.membase + UART010_CR);
-+      cr = __raw_readl(uap->port.membase + UART010_CR);
-       cr |= UART010_CR_MSIE;
--      writel(cr, uap->port.membase + UART010_CR);
-+      __raw_writel(cr, uap->port.membase + UART010_CR);
- }
- static void pl010_rx_chars(struct uart_amba_port *uap)
-@@ -122,9 +121,9 @@ static void pl010_rx_chars(struct uart_a
-       struct tty_struct *tty = uap->port.info->tty;
-       unsigned int status, ch, flag, rsr, max_count = 256;
--      status = readb(uap->port.membase + UART01x_FR);
-+      status = __raw_readl(uap->port.membase + UART01x_FR);
-       while (UART_RX_DATA(status) && max_count--) {
--              ch = readb(uap->port.membase + UART01x_DR);
-+              ch = __raw_readl(uap->port.membase + UART01x_DR);
-               flag = TTY_NORMAL;
-               uap->port.icount.rx++;
-@@ -133,9 +132,9 @@ static void pl010_rx_chars(struct uart_a
-                * Note that the error handling code is
-                * out of the main execution path
-                */
--              rsr = readb(uap->port.membase + UART01x_RSR) | UART_DUMMY_RSR_RX;
-+              rsr = __raw_readl(uap->port.membase + UART01x_RSR) | UART_DUMMY_RSR_RX;
-               if (unlikely(rsr & UART01x_RSR_ANY)) {
--                      writel(0, uap->port.membase + UART01x_ECR);
-+                      __raw_writel(0, uap->port.membase + UART01x_ECR);
-                       if (rsr & UART01x_RSR_BE) {
-                               rsr &= ~(UART01x_RSR_FE | UART01x_RSR_PE);
-@@ -165,7 +164,7 @@ static void pl010_rx_chars(struct uart_a
-               uart_insert_char(&uap->port, rsr, UART01x_RSR_OE, ch, flag);
-       ignore_char:
--              status = readb(uap->port.membase + UART01x_FR);
-+              status = __raw_readl(uap->port.membase + UART01x_FR);
-       }
-       spin_unlock(&uap->port.lock);
-       tty_flip_buffer_push(tty);
-@@ -178,7 +177,7 @@ static void pl010_tx_chars(struct uart_a
-       int count;
-       if (uap->port.x_char) {
--              writel(uap->port.x_char, uap->port.membase + UART01x_DR);
-+              __raw_writel(uap->port.x_char, uap->port.membase + UART01x_DR);
-               uap->port.icount.tx++;
-               uap->port.x_char = 0;
-               return;
-@@ -190,7 +189,7 @@ static void pl010_tx_chars(struct uart_a
-       count = uap->port.fifosize >> 1;
-       do {
--              writel(xmit->buf[xmit->tail], uap->port.membase + UART01x_DR);
-+              __raw_writel(xmit->buf[xmit->tail], uap->port.membase + UART01x_DR);
-               xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
-               uap->port.icount.tx++;
-               if (uart_circ_empty(xmit))
-@@ -208,9 +207,9 @@ static void pl010_modem_status(struct ua
- {
-       unsigned int status, delta;
--      writel(0, uap->port.membase + UART010_ICR);
-+      __raw_writel(0, uap->port.membase + UART010_ICR);
--      status = readb(uap->port.membase + UART01x_FR) & UART01x_FR_MODEM_ANY;
-+      status = __raw_readl(uap->port.membase + UART01x_FR) & UART01x_FR_MODEM_ANY;
-       delta = status ^ uap->old_status;
-       uap->old_status = status;
-@@ -238,7 +237,7 @@ static irqreturn_t pl010_int(int irq, vo
-       spin_lock(&uap->port.lock);
--      status = readb(uap->port.membase + UART010_IIR);
-+      status = __raw_readl(uap->port.membase + UART010_IIR);
-       if (status) {
-               do {
-                       if (status & (UART010_IIR_RTIS | UART010_IIR_RIS))
-@@ -251,7 +250,7 @@ static irqreturn_t pl010_int(int irq, vo
-                       if (pass_counter-- == 0)
-                               break;
--                      status = readb(uap->port.membase + UART010_IIR);
-+                      status = __raw_readl(uap->port.membase + UART010_IIR);
-               } while (status & (UART010_IIR_RTIS | UART010_IIR_RIS |
-                                  UART010_IIR_TIS));
-               handled = 1;
-@@ -265,7 +264,7 @@ static irqreturn_t pl010_int(int irq, vo
- static unsigned int pl010_tx_empty(struct uart_port *port)
- {
-       struct uart_amba_port *uap = (struct uart_amba_port *)port;
--      unsigned int status = readb(uap->port.membase + UART01x_FR);
-+      unsigned int status = __raw_readl(uap->port.membase + UART01x_FR);
-       return status & UART01x_FR_BUSY ? 0 : TIOCSER_TEMT;
- }
-@@ -275,7 +274,7 @@ static unsigned int pl010_get_mctrl(stru
-       unsigned int result = 0;
-       unsigned int status;
--      status = readb(uap->port.membase + UART01x_FR);
-+      status = __raw_readl(uap->port.membase + UART01x_FR);
-       if (status & UART01x_FR_DCD)
-               result |= TIOCM_CAR;
-       if (status & UART01x_FR_DSR)
-@@ -301,12 +300,12 @@ static void pl010_break_ctl(struct uart_
-       unsigned int lcr_h;
-       spin_lock_irqsave(&uap->port.lock, flags);
--      lcr_h = readb(uap->port.membase + UART010_LCRH);
-+      lcr_h = __raw_readl(uap->port.membase + UART010_LCRH);
-       if (break_state == -1)
-               lcr_h |= UART01x_LCRH_BRK;
-       else
-               lcr_h &= ~UART01x_LCRH_BRK;
--      writel(lcr_h, uap->port.membase + UART010_LCRH);
-+      __raw_writel(lcr_h, uap->port.membase + UART010_LCRH);
-       spin_unlock_irqrestore(&uap->port.lock, flags);
- }
-@@ -334,12 +333,12 @@ static int pl010_startup(struct uart_por
-       /*
-        * initialise the old status of the modem signals
-        */
--      uap->old_status = readb(uap->port.membase + UART01x_FR) & UART01x_FR_MODEM_ANY;
-+      uap->old_status = __raw_readl(uap->port.membase + UART01x_FR) & UART01x_FR_MODEM_ANY;
-       /*
-        * Finally, enable interrupts
-        */
--      writel(UART01x_CR_UARTEN | UART010_CR_RIE | UART010_CR_RTIE,
-+      __raw_writel(UART01x_CR_UARTEN | UART010_CR_RIE | UART010_CR_RTIE,
-              uap->port.membase + UART010_CR);
-       return 0;
-@@ -362,10 +361,10 @@ static void pl010_shutdown(struct uart_p
-       /*
-        * disable all interrupts, disable the port
-        */
--      writel(0, uap->port.membase + UART010_CR);
-+      __raw_writel(0, uap->port.membase + UART010_CR);
-       /* disable break condition and fifos */
--      writel(readb(uap->port.membase + UART010_LCRH) &
-+      __raw_writel(__raw_readl(uap->port.membase + UART010_LCRH) &
-               ~(UART01x_LCRH_BRK | UART01x_LCRH_FEN),
-              uap->port.membase + UART010_LCRH);
-@@ -387,7 +386,7 @@ pl010_set_termios(struct uart_port *port
-       /*
-        * Ask the core to calculate the divisor for us.
-        */
--      baud = uart_get_baud_rate(port, termios, old, 0, uap->port.uartclk/16); 
-+      baud = uart_get_baud_rate(port, termios, old, 0, uap->port.uartclk/16);
-       quot = uart_get_divisor(port, baud);
-       switch (termios->c_cflag & CSIZE) {
-@@ -450,25 +449,25 @@ pl010_set_termios(struct uart_port *port
-               uap->port.ignore_status_mask |= UART_DUMMY_RSR_RX;
-       /* first, disable everything */
--      old_cr = readb(uap->port.membase + UART010_CR) & ~UART010_CR_MSIE;
-+      old_cr = __raw_readl(uap->port.membase + UART010_CR) & ~UART010_CR_MSIE;
-       if (UART_ENABLE_MS(port, termios->c_cflag))
-               old_cr |= UART010_CR_MSIE;
--      writel(0, uap->port.membase + UART010_CR);
-+      __raw_writel(0, uap->port.membase + UART010_CR);
-       /* Set baud rate */
-       quot -= 1;
--      writel((quot & 0xf00) >> 8, uap->port.membase + UART010_LCRM);
--      writel(quot & 0xff, uap->port.membase + UART010_LCRL);
-+      __raw_writel((quot & 0xf00) >> 8, uap->port.membase + UART010_LCRM);
-+      __raw_writel(quot & 0xff, uap->port.membase + UART010_LCRL);
-       /*
-        * ----------v----------v----------v----------v-----
-        * NOTE: MUST BE WRITTEN AFTER UARTLCR_M & UARTLCR_L
-        * ----------^----------^----------^----------^-----
-        */
--      writel(lcr_h, uap->port.membase + UART010_LCRH);
--      writel(old_cr, uap->port.membase + UART010_CR);
-+      __raw_writel(lcr_h, uap->port.membase + UART010_LCRH);
-+      __raw_writel(old_cr, uap->port.membase + UART010_CR);
-       spin_unlock_irqrestore(&uap->port.lock, flags);
- }
-@@ -540,7 +539,7 @@ static struct uart_ops amba_pl010_pops =
-       .verify_port    = pl010_verify_port,
- };
--static struct uart_amba_port *amba_ports[UART_NR];
-+static struct uart_amba_port *amba_ports[SERIAL_AMBA_NR];
- #ifdef CONFIG_SERIAL_AMBA_PL010_CONSOLE
-@@ -550,10 +549,10 @@ static void pl010_console_putchar(struct
-       unsigned int status;
-       do {
--              status = readb(uap->port.membase + UART01x_FR);
-+              status = __raw_readl(uap->port.membase + UART01x_FR);
-               barrier();
-       } while (!UART_TX_READY(status));
--      writel(ch, uap->port.membase + UART01x_DR);
-+      __raw_writel(ch, uap->port.membase + UART01x_DR);
- }
- static void
-@@ -567,8 +566,8 @@ pl010_console_write(struct console *co, 
-       /*
-        *      First save the CR then disable the interrupts
-        */
--      old_cr = readb(uap->port.membase + UART010_CR);
--      writel(UART01x_CR_UARTEN, uap->port.membase + UART010_CR);
-+      old_cr = __raw_readl(uap->port.membase + UART010_CR);
-+      __raw_writel(UART01x_CR_UARTEN, uap->port.membase + UART010_CR);
-       uart_console_write(&uap->port, s, count, pl010_console_putchar);
-@@ -577,10 +576,10 @@ pl010_console_write(struct console *co, 
-        *      and restore the TCR
-        */
-       do {
--              status = readb(uap->port.membase + UART01x_FR);
-+              status = __raw_readl(uap->port.membase + UART01x_FR);
-               barrier();
-       } while (status & UART01x_FR_BUSY);
--      writel(old_cr, uap->port.membase + UART010_CR);
-+      __raw_writel(old_cr, uap->port.membase + UART010_CR);
-       clk_disable(uap->clk);
- }
-@@ -589,9 +588,9 @@ static void __init
- pl010_console_get_options(struct uart_amba_port *uap, int *baud,
-                            int *parity, int *bits)
- {
--      if (readb(uap->port.membase + UART010_CR) & UART01x_CR_UARTEN) {
-+      if (__raw_readl(uap->port.membase + UART010_CR) & UART01x_CR_UARTEN) {
-               unsigned int lcr_h, quot;
--              lcr_h = readb(uap->port.membase + UART010_LCRH);
-+              lcr_h = __raw_readl(uap->port.membase + UART010_LCRH);
-               *parity = 'n';
-               if (lcr_h & UART01x_LCRH_PEN) {
-@@ -606,8 +605,8 @@ pl010_console_get_options(struct uart_am
-               else
-                       *bits = 8;
--              quot = readb(uap->port.membase + UART010_LCRL) |
--                     readb(uap->port.membase + UART010_LCRM) << 8;
-+              quot = __raw_readl(uap->port.membase + UART010_LCRL) |
-+                     __raw_readl(uap->port.membase + UART010_LCRM) << 8;
-               *baud = uap->port.uartclk / (16 * (quot + 1));
-       }
- }
-@@ -625,7 +624,7 @@ static int __init pl010_console_setup(st
-        * if so, search for the first available port that does have
-        * console support.
-        */
--      if (co->index >= UART_NR)
-+      if (co->index >= SERIAL_AMBA_NR)
-               co->index = 0;
-       uap = amba_ports[co->index];
-       if (!uap)
-@@ -643,7 +642,7 @@ static int __init pl010_console_setup(st
- static struct uart_driver amba_reg;
- static struct console amba_console = {
--      .name           = "ttyAM",
-+      .name           = SERIAL_AMBA_NAME,
-       .write          = pl010_console_write,
-       .device         = uart_console_device,
-       .setup          = pl010_console_setup,
-@@ -659,11 +658,11 @@ static struct console amba_console = {
- static struct uart_driver amba_reg = {
-       .owner                  = THIS_MODULE,
--      .driver_name            = "ttyAM",
--      .dev_name               = "ttyAM",
-+      .driver_name            = SERIAL_AMBA_NAME,
-+      .dev_name               = SERIAL_AMBA_NAME,
-       .major                  = SERIAL_AMBA_MAJOR,
-       .minor                  = SERIAL_AMBA_MINOR,
--      .nr                     = UART_NR,
-+      .nr                     = SERIAL_AMBA_NR,
-       .cons                   = AMBA_CONSOLE,
- };
---- a/drivers/serial/Kconfig
-+++ b/drivers/serial/Kconfig
-@@ -287,10 +287,25 @@ config SERIAL_AMBA_PL010
-       help
-         This selects the ARM(R) AMBA(R) PrimeCell PL010 UART.  If you have
-         an Integrator/AP or Integrator/PP2 platform, or if you have a
--        Cirrus Logic EP93xx CPU, say Y or M here.
-+        Cirrus Logic EP93xx CPU or an Infineon ADM5120 SOC, say Y or M here.
-         If unsure, say N.
-+config SERIAL_AMBA_PL010_NUMPORTS
-+      int "Maximum number of AMBA PL010 serial ports"
-+      depends on SERIAL_AMBA_PL010
-+      default "8"
-+      ---help---
-+        Set this to the number of serial ports you want the AMBA PL010 driver
-+        to support.
-+
-+config SERIAL_AMBA_PL010_PORTNAME
-+      string "Name of the AMBA PL010 serial ports"
-+      depends on SERIAL_AMBA_PL010
-+      default "ttyAM"
-+      ---help---
-+        ::: To be written :::
-+
- config SERIAL_AMBA_PL010_CONSOLE
-       bool "Support for console on AMBA serial port"
-       depends on SERIAL_AMBA_PL010=y
diff --git a/target/linux/adm5120/patches-2.6.26/201-amba_bus_hacks.patch b/target/linux/adm5120/patches-2.6.26/201-amba_bus_hacks.patch
deleted file mode 100644 (file)
index 299f216..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/drivers/amba/bus.c
-+++ b/drivers/amba/bus.c
-@@ -17,6 +17,10 @@
- #include <asm/io.h>
- #include <asm/sizes.h>
-+#ifndef NO_IRQ
-+#define NO_IRQ                (-1)
-+#endif
-+
- #define to_amba_device(d)     container_of(d, struct amba_device, dev)
- #define to_amba_driver(d)     container_of(d, struct amba_driver, drv)
diff --git a/target/linux/adm5120/patches-2.6.26/202-pci_disable_common_quirks.patch b/target/linux/adm5120/patches-2.6.26/202-pci_disable_common_quirks.patch
deleted file mode 100644 (file)
index b13a779..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/drivers/pci/Kconfig
-+++ b/drivers/pci/Kconfig
-@@ -42,6 +42,12 @@ config PCI_DEBUG
-         When in doubt, say N.
-+config PCI_DISABLE_COMMON_QUIRKS
-+      bool "PCI disable common quirks"
-+      depends on PCI
-+      help
-+        If you don't know what to do here, say N.
-+
- config HT_IRQ
-       bool "Interrupts on hypertransport devices"
-       default y
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -24,6 +24,7 @@
- #include <linux/kallsyms.h>
- #include "pci.h"
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- /* The Mellanox Tavor device gives false positive parity errors
-  * Mark this device with a broken_parity_status, to allow
-  * PCI scanning code to "skip" this now blacklisted device.
-@@ -1495,6 +1496,7 @@ static void __devinit fixup_rev1_53c810(
-       }
- }
- DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
- static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end)
- {
-@@ -1561,6 +1563,7 @@ void pci_fixup_device(enum pci_fixup_pas
- }
- EXPORT_SYMBOL(pci_fixup_device);
-+#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
- /* Enable 1k I/O space granularity on the Intel P64H2 */
- static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
- {
-@@ -1934,3 +1937,4 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AT
-                       quirk_msi_intx_disable_bug);
- #endif /* CONFIG_PCI_MSI */
-+#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
diff --git a/target/linux/adm5120/patches-2.6.26/203-gpio_leds_brightness.patch b/target/linux/adm5120/patches-2.6.26/203-gpio_leds_brightness.patch
deleted file mode 100644 (file)
index bb94fd0..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/drivers/leds/leds-gpio.c
-+++ b/drivers/leds/leds-gpio.c
-@@ -43,13 +43,17 @@ static void gpio_led_set(struct led_clas
-               container_of(led_cdev, struct gpio_led_data, cdev);
-       int level;
--      if (value == LED_OFF)
--              level = 0;
--      else
--              level = 1;
--
--      if (led_dat->active_low)
--              level = !level;
-+      switch (value) {
-+      case LED_OFF:
-+              level = led_dat->active_low ? 1 : 0;
-+              break;
-+      case LED_FULL:
-+              level = led_dat->active_low ? 0 : 1;
-+              break;
-+      default:
-+              level = value;
-+              break;
-+      }
-       /* Setting GPIOs with I2C/etc requires a task context, and we don't
-        * seem to have a reliable way to know if we're already in one; so
diff --git a/target/linux/adm5120/patches-2.6.26/310-adm5120_wdt.patch b/target/linux/adm5120/patches-2.6.26/310-adm5120_wdt.patch
deleted file mode 100644 (file)
index f6822ec..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/drivers/watchdog/Kconfig
-+++ b/drivers/watchdog/Kconfig
-@@ -632,6 +632,18 @@ config SBC_EPX_C3_WATCHDOG
- # MIPS Architecture
-+config ADM5120_WDT
-+      tristate "Infineon ADM5120 SoC hardware watchdog"
-+      depends on WATCHDOG && ADM5120
-+      help
-+        This is a driver for hardware watchdog integrated in Infineon
-+        ADM5120 SoC. This watchdog simply watches your kernel to make sure
-+        it doesn't freeze, and if it does, it reboots your computer after a
-+        certain amount of time.
-+
-+        To compile this driver as a module, choose M here: the module will be
-+        called adm5120_wdt.
-+
- config INDYDOG
-       tristate "Indy/I2 Hardware Watchdog"
-       depends on SGI_HAS_INDYDOG
---- a/drivers/watchdog/Makefile
-+++ b/drivers/watchdog/Makefile
-@@ -91,6 +91,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc
- # M68KNOMMU Architecture
- # MIPS Architecture
-+obj-$(CONFIG_ADM5120_WDT) += adm5120_wdt.o
- obj-$(CONFIG_INDYDOG) += indydog.o
- obj-$(CONFIG_WDT_MTX1)        += mtx-1_wdt.o
- obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
diff --git a/target/linux/ar7/config-2.6.23 b/target/linux/ar7/config-2.6.23
deleted file mode 100644 (file)
index 00c5170..0000000
+++ /dev/null
@@ -1,190 +0,0 @@
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-CONFIG_AR7=y
-CONFIG_AR7_GPIO=y
-CONFIG_AR7_WDT=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ATM_DRIVERS=y
-CONFIG_BASE_SMALL=0
-CONFIG_BITREVERSE=y
-CONFIG_BOOT_ELF32=y
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_BT is not set
-CONFIG_CMDLINE="init=/etc/preinit rootfstype=squashfs,jffs2,"
-CONFIG_CPMAC=y
-# CONFIG_CPU_BIG_ENDIAN is not set
-CONFIG_CPU_HAS_LLSC=y
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_CPU_LITTLE_ENDIAN=y
-# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
-CONFIG_CPU_MIPS32_R1=y
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-CONFIG_CPU_MIPSR1=y
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_VR41XX is not set
-# CONFIG_DM9000 is not set
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_FIXED_MII_100_FDX=y
-# CONFIG_FIXED_MII_10_FDX is not set
-CONFIG_FIXED_PHY=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HID_SUPPORT=n
-CONFIG_HW_HAS_PCI=y
-CONFIG_HW_RANDOM=y
-# CONFIG_I2C is not set
-# CONFIG_IDE is not set
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_IRQ_CPU=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-# CONFIG_LEMOTE_FULONG is not set
-# CONFIG_MACH_ALCHEMY is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_VR41XX is not set
-CONFIG_MIPS=y
-# CONFIG_MIPS_ATLAS is not set
-# CONFIG_MIPS_COBALT is not set
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-# CONFIG_MIPS_MALTA is not set
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_SEAD is not set
-# CONFIG_MIPS_SIM is not set
-CONFIG_MTD=y
-# CONFIG_MTD_ABSENT is not set
-CONFIG_MTD_AR7_PARTS=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_CFI=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_CFI_STAA=y
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_ONENAND is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PHRAM is not set
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-CONFIG_MTD_PHYSMAP_LEN=0
-CONFIG_MTD_PHYSMAP_START=0x10000000
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEVICES_MULTIQUEUE is not set
-CONFIG_NET_ACT_POLICE=y
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_NF_CT_PROTO_GRE is not set
-# CONFIG_NF_NAT_PROTO_GRE is not set
-CONFIG_NO_EXCEPT_FILL=y
-# CONFIG_NO_IOPORT is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PCI is not set
-CONFIG_PHYLIB=y
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_RTC is not set
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_WAIT_SCAN is not set
-# CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SPARSEMEM_STATIC is not set
-CONFIG_SWAP_IO_SPACE=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_HAS_EARLY_PRINTK=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
-CONFIG_SYS_SUPPORTS_KGDB=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-# CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_TOSHIBA_RBTX4927 is not set
-# CONFIG_TOSHIBA_RBTX4938 is not set
-CONFIG_TRAD_SIGNALS=y
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-# CONFIG_USB_ARCH_HAS_HCD is not set
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-# CONFIG_USER_NS is not set
-# CONFIG_VGASTATE is not set
-CONFIG_VLYNQ=y
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/ar7/config-2.6.24 b/target/linux/ar7/config-2.6.24
deleted file mode 100644 (file)
index edc8b2b..0000000
+++ /dev/null
@@ -1,198 +0,0 @@
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-CONFIG_AR7=y
-CONFIG_AR7_GPIO=y
-CONFIG_AR7_WDT=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUPPORTS_OPROFILE=y
-CONFIG_ATM_DRIVERS=y
-CONFIG_BASE_SMALL=0
-# CONFIG_BCM47XX is not set
-CONFIG_BITREVERSE=y
-CONFIG_BOOT_ELF32=y
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_BT is not set
-CONFIG_CEVT_R4K=y
-CONFIG_CMDLINE="init=/etc/preinit rootfstype=squashfs,jffs2,"
-CONFIG_CPMAC=y
-# CONFIG_CPU_BIG_ENDIAN is not set
-CONFIG_CPU_HAS_LLSC=y
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_CPU_LITTLE_ENDIAN=y
-# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
-CONFIG_CPU_MIPS32_R1=y
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-CONFIG_CPU_MIPSR1=y
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_VR41XX is not set
-CONFIG_CSRC_R4K=y
-# CONFIG_DM9000 is not set
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_FIXED_PHY=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HW_RANDOM=y
-# CONFIG_I2C is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IDE is not set
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_IRQ_CPU=y
-CONFIG_KALLSYMS=y
-# CONFIG_LEDS_ALIX is not set
-CONFIG_LEDS_GPIO=y
-# CONFIG_LEMOTE_FULONG is not set
-# CONFIG_MACH_ALCHEMY is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_MDIO_BITBANG is not set
-CONFIG_MIPS=y
-# CONFIG_MIPS_ATLAS is not set
-# CONFIG_MIPS_COBALT is not set
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-# CONFIG_MIPS_MALTA is not set
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_SEAD is not set
-# CONFIG_MIPS_SIM is not set
-CONFIG_MTD=y
-# CONFIG_MTD_ABSENT is not set
-CONFIG_MTD_AR7_PARTS=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_CFI=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_CFI_STAA=y
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_ONENAND is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PHRAM is not set
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-CONFIG_MTD_PHYSMAP_LEN=0
-CONFIG_MTD_PHYSMAP_START=0x10000000
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_SLRAM is not set
-CONFIG_NO_EXCEPT_FILL=y
-# CONFIG_NO_IOPORT is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
-CONFIG_PHYLIB=y
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_RTC is not set
-CONFIG_RTC_LIB=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_WAIT_SCAN is not set
-# CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SLAB is not set
-CONFIG_SLABINFO=y
-CONFIG_SLUB=y
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-CONFIG_SSB_POSSIBLE=y
-CONFIG_SWAP_IO_SPACE=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_HAS_EARLY_PRINTK=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
-CONFIG_SYS_SUPPORTS_KGDB=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-CONFIG_TICK_ONESHOT=y
-# CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_TOSHIBA_RBTX4927 is not set
-# CONFIG_TOSHIBA_RBTX4938 is not set
-CONFIG_TRAD_SIGNALS=y
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-# CONFIG_USB_ARCH_HAS_HCD is not set
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-# CONFIG_USER_NS is not set
-# CONFIG_VGASTATE is not set
-CONFIG_VLYNQ=y
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/ar7/config-2.6.25 b/target/linux/ar7/config-2.6.25
deleted file mode 100644 (file)
index f43e31a..0000000
+++ /dev/null
@@ -1,214 +0,0 @@
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-CONFIG_AR7=y
-CONFIG_AR7_GPIO=y
-CONFIG_AR7_WDT=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUPPORTS_OPROFILE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ATM_DRIVERS=y
-CONFIG_BASE_SMALL=0
-# CONFIG_BCM47XX is not set
-CONFIG_BITREVERSE=y
-CONFIG_BOOT_ELF32=y
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_BT is not set
-CONFIG_CEVT_R4K=y
-CONFIG_CLASSIC_RCU=y
-CONFIG_CMDLINE="init=/etc/preinit rootfstype=squashfs,jffs2,"
-CONFIG_CPMAC=y
-# CONFIG_CPU_BIG_ENDIAN is not set
-CONFIG_CPU_HAS_LLSC=y
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_CPU_LITTLE_ENDIAN=y
-# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
-CONFIG_CPU_MIPS32_R1=y
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-CONFIG_CPU_MIPSR1=y
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_VR41XX is not set
-# CONFIG_CRYPTO_AEAD is not set
-# CONFIG_CRYPTO_AUTHENC is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-CONFIG_CSRC_R4K=y
-# CONFIG_DM9000 is not set
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_FIXED_PHY=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAVE_IDE=y
-# CONFIG_HAVE_KPROBES is not set
-# CONFIG_HAVE_KRETPROBES is not set
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HW_RANDOM=y
-# CONFIG_I2C is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IDE is not set
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_IRQ_CPU=y
-# CONFIG_ISDN is not set
-CONFIG_KALLSYMS=y
-# CONFIG_LEDS_ALIX is not set
-CONFIG_LEDS_GPIO=y
-# CONFIG_LEMOTE_FULONG is not set
-# CONFIG_LZO_COMPRESS is not set
-# CONFIG_LZO_DECOMPRESS is not set
-# CONFIG_MACH_ALCHEMY is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_VR41XX is not set
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MEMSTICK is not set
-CONFIG_MIPS=y
-# CONFIG_MIPS_ATLAS is not set
-# CONFIG_MIPS_COBALT is not set
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-# CONFIG_MIPS_MALTA is not set
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_SEAD is not set
-# CONFIG_MIPS_SIM is not set
-CONFIG_MTD=y
-# CONFIG_MTD_ABSENT is not set
-CONFIG_MTD_AR7_PARTS=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_CFI=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_CFI_STAA=y
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_ONENAND is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PHRAM is not set
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-CONFIG_MTD_PHYSMAP_LEN=0
-CONFIG_MTD_PHYSMAP_START=0x10000000
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_SLRAM is not set
-CONFIG_NO_EXCEPT_FILL=y
-# CONFIG_NO_IOPORT is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
-CONFIG_PHYLIB=y
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_RTC is not set
-CONFIG_RTC_LIB=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI is not set
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP28 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SLAB is not set
-CONFIG_SLABINFO=y
-CONFIG_SLUB=y
-# CONFIG_SLUB_DEBUG is not set
-# CONFIG_SLUB_STATS is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SOUND is not set
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-CONFIG_SSB_POSSIBLE=y
-CONFIG_SWAP_IO_SPACE=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_HAS_EARLY_PRINTK=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
-CONFIG_SYS_SUPPORTS_KGDB=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-CONFIG_TICK_ONESHOT=y
-# CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_TOSHIBA_RBTX4927 is not set
-# CONFIG_TOSHIBA_RBTX4938 is not set
-CONFIG_TRAD_SIGNALS=y
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_VGASTATE is not set
-# CONFIG_VIDEO_DEV is not set
-CONFIG_VLYNQ=y
-# CONFIG_W1 is not set
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/ar7/patches-2.6.23/100-board_support.patch b/target/linux/ar7/patches-2.6.23/100-board_support.patch
deleted file mode 100644 (file)
index 681a1a9..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-Index: linux-2.6.23.17/arch/mips/Kconfig
-===================================================================
---- linux-2.6.23.17.orig/arch/mips/Kconfig
-+++ linux-2.6.23.17/arch/mips/Kconfig
-@@ -15,6 +15,22 @@ choice
-       prompt "System type"
-       default SGI_IP22
-+config AR7
-+      bool "Texas Instruments AR7"
-+      select BOOT_ELF32
-+      select DMA_NONCOHERENT
-+      select IRQ_CPU
-+      select NO_EXCEPT_FILL
-+      select SWAP_IO_SPACE
-+      select SYS_HAS_CPU_MIPS32_R1
-+      select SYS_HAS_EARLY_PRINTK
-+      select SYS_SUPPORTS_32BIT_KERNEL
-+      select SYS_SUPPORTS_KGDB
-+      select SYS_SUPPORTS_LITTLE_ENDIAN
-+      select SYS_SUPPORTS_BIG_ENDIAN
-+      select GENERIC_GPIO
-+      select GENERIC_HARDIRQS_NO__DO_IRQ
-+
- config MACH_ALCHEMY
-       bool "Alchemy processor based machines"
-Index: linux-2.6.23.17/arch/mips/kernel/traps.c
-===================================================================
---- linux-2.6.23.17.orig/arch/mips/kernel/traps.c
-+++ linux-2.6.23.17/arch/mips/kernel/traps.c
-@@ -1075,10 +1075,23 @@ void *set_except_vector(int n, void *add
-       exception_handlers[n] = handler;
-       if (n == 0 && cpu_has_divec) {
--              *(volatile u32 *)(ebase + 0x200) = 0x08000000 |
--                                               (0x03ffffff & (handler >> 2));
--              flush_icache_range(ebase + 0x200, ebase + 0x204);
--      }
-+              if ((handler ^ (ebase + 4)) & 0xfc000000) {
-+                      /* lui k0, 0x0000 */
-+                      *(u32 *)(ebase + 0x200) = 0x3c1a0000 | (handler >> 16);
-+                      /* ori k0, 0x0000 */
-+                      *(u32 *)(ebase + 0x204) =
-+                                      0x375a0000 | (handler & 0xffff);
-+                      /* jr k0 */
-+                      *(u32 *)(ebase + 0x208) = 0x03400008;
-+                      /* nop */
-+                      *(u32 *)(ebase + 0x20C) = 0x00000000;
-+                      flush_icache_range(ebase + 0x200, ebase + 0x210);
-+              } else {
-+                      *(volatile u32 *)(ebase + 0x200) =
-+                              0x08000000 | (0x03ffffff & (handler >> 2));
-+                      flush_icache_range(ebase + 0x200, ebase + 0x204);
-+              }
-+      }
-       return (void *)old_handler;
- }
-Index: linux-2.6.23.17/arch/mips/Makefile
-===================================================================
---- linux-2.6.23.17.orig/arch/mips/Makefile
-+++ linux-2.6.23.17/arch/mips/Makefile
-@@ -161,6 +161,13 @@ libs-$(CONFIG_SIBYTE_CFE) += arch/mips/s
- #
- #
-+# Texas Instruments AR7
-+#
-+core-$(CONFIG_AR7)            += arch/mips/ar7/
-+cflags-$(CONFIG_AR7)          += -Iinclude/asm-mips/ar7
-+load-$(CONFIG_AR7)            += 0xffffffff94100000
-+
-+#
- # Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
- #
- core-$(CONFIG_MACH_JAZZ)      += arch/mips/jazz/
-Index: linux-2.6.23.17/include/asm-mips/page.h
-===================================================================
---- linux-2.6.23.17.orig/include/asm-mips/page.h
-+++ linux-2.6.23.17/include/asm-mips/page.h
-@@ -184,8 +184,10 @@ typedef struct { unsigned long pgprot; }
- #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
-                                VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
--#define UNCAC_ADDR(addr)      ((addr) - PAGE_OFFSET + UNCAC_BASE)
--#define CAC_ADDR(addr)                ((addr) - UNCAC_BASE + PAGE_OFFSET)
-+#define UNCAC_ADDR(addr)      ((addr) - PAGE_OFFSET + UNCAC_BASE +    \
-+                               PHYS_OFFSET)
-+#define CAC_ADDR(addr)                ((addr) - UNCAC_BASE + PAGE_OFFSET -    \
-+                               PHYS_OFFSET)
- #include <asm-generic/memory_model.h>
- #include <asm-generic/page.h>
diff --git a/target/linux/ar7/patches-2.6.23/110-flash.patch b/target/linux/ar7/patches-2.6.23/110-flash.patch
deleted file mode 100644 (file)
index fa60108..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: linux-2.6.23.17/drivers/mtd/Kconfig
-===================================================================
---- linux-2.6.23.17.orig/drivers/mtd/Kconfig
-+++ linux-2.6.23.17/drivers/mtd/Kconfig
-@@ -160,6 +160,12 @@ config MTD_AFS_PARTS
-         for your particular device. It won't happen automatically. The
-         'armflash' map driver (CONFIG_MTD_ARMFLASH) does this, for example.
-+config MTD_AR7_PARTS
-+      tristate "TI AR7 partitioning support"
-+      depends on MTD_PARTITIONS
-+      ---help---
-+        TI AR7 partitioning support
-+
- comment "User Modules And Translation Layers"
- config MTD_CHAR
-Index: linux-2.6.23.17/drivers/mtd/Makefile
-===================================================================
---- linux-2.6.23.17.orig/drivers/mtd/Makefile
-+++ linux-2.6.23.17/drivers/mtd/Makefile
-@@ -11,6 +11,7 @@ obj-$(CONFIG_MTD_CONCAT)     += mtdconcat.o
- obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
- obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
- obj-$(CONFIG_MTD_AFS_PARTS)   += afs.o
-+obj-$(CONFIG_MTD_AR7_PARTS)   += ar7part.o
- # 'Users' - code which presents functionality to userspace.
- obj-$(CONFIG_MTD_CHAR)                += mtdchar.o
-Index: linux-2.6.23.17/drivers/mtd/maps/physmap.c
-===================================================================
---- linux-2.6.23.17.orig/drivers/mtd/maps/physmap.c
-+++ linux-2.6.23.17/drivers/mtd/maps/physmap.c
-@@ -74,7 +74,8 @@ static int physmap_flash_remove(struct p
- static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
- #ifdef CONFIG_MTD_PARTITIONS
--static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
-+static const char *part_probe_types[] = {"cmdlinepart", "RedBoot",
-+                                      "ar7part", NULL };
- #endif
- static int physmap_flash_probe(struct platform_device *dev)
diff --git a/target/linux/ar7/patches-2.6.23/120-gpio_chrdev.patch b/target/linux/ar7/patches-2.6.23/120-gpio_chrdev.patch
deleted file mode 100644 (file)
index a61f3e0..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: linux-2.6.23.17/drivers/char/Kconfig
-===================================================================
---- linux-2.6.23.17.orig/drivers/char/Kconfig
-+++ linux-2.6.23.17/drivers/char/Kconfig
-@@ -928,6 +928,15 @@ config MWAVE
-         To compile this driver as a module, choose M here: the
-         module will be called mwave.
-+config AR7_GPIO
-+      tristate "TI AR7 GPIO Support"
-+      depends on AR7
-+      help
-+        Give userspace access to the GPIO pins on the Texas Instruments AR7 
-+        processors.
-+
-+        If compiled as a module, it will be called ar7_gpio.
-+
- config SCx200_GPIO
-       tristate "NatSemi SCx200 GPIO Support"
-       depends on SCx200
-Index: linux-2.6.23.17/drivers/char/Makefile
-===================================================================
---- linux-2.6.23.17.orig/drivers/char/Makefile
-+++ linux-2.6.23.17/drivers/char/Makefile
-@@ -89,6 +89,7 @@ obj-$(CONFIG_COBALT_LCD)     += lcd.o
- obj-$(CONFIG_PPDEV)           += ppdev.o
- obj-$(CONFIG_NWBUTTON)                += nwbutton.o
- obj-$(CONFIG_NWFLASH)         += nwflash.o
-+obj-$(CONFIG_AR7_GPIO)                += ar7_gpio.o
- obj-$(CONFIG_SCx200_GPIO)     += scx200_gpio.o
- obj-$(CONFIG_PC8736x_GPIO)    += pc8736x_gpio.o
- obj-$(CONFIG_NSC_GPIO)                += nsc_gpio.o
diff --git a/target/linux/ar7/patches-2.6.23/130-vlynq.patch b/target/linux/ar7/patches-2.6.23/130-vlynq.patch
deleted file mode 100644 (file)
index 8f7e94b..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: linux-2.6.23.17/drivers/Kconfig
-===================================================================
---- linux-2.6.23.17.orig/drivers/Kconfig
-+++ linux-2.6.23.17/drivers/Kconfig
-@@ -93,4 +93,6 @@ source "drivers/kvm/Kconfig"
- source "drivers/uio/Kconfig"
- source "drivers/lguest/Kconfig"
-+
-+source "drivers/vlynq/Kconfig"
- endmenu
-Index: linux-2.6.23.17/drivers/Makefile
-===================================================================
---- linux-2.6.23.17.orig/drivers/Makefile
-+++ linux-2.6.23.17/drivers/Makefile
-@@ -89,4 +89,5 @@ obj-$(CONFIG_DMA_ENGINE)     += dma/
- obj-$(CONFIG_HID)             += hid/
- obj-$(CONFIG_PPC_PS3)         += ps3/
- obj-$(CONFIG_OF)              += of/
-+obj-$(CONFIG_VLYNQ)           += vlynq/
- obj-$(CONFIG_GPIO_DEVICE)     += gpio/
diff --git a/target/linux/ar7/patches-2.6.23/140-watchdog.patch b/target/linux/ar7/patches-2.6.23/140-watchdog.patch
deleted file mode 100644 (file)
index 09a8ad5..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: linux-2.6.23.17/drivers/char/watchdog/Kconfig
-===================================================================
---- linux-2.6.23.17.orig/drivers/char/watchdog/Kconfig
-+++ linux-2.6.23.17/drivers/char/watchdog/Kconfig
-@@ -583,6 +583,12 @@ config SBC_EPX_C3_WATCHDOG
- # MIPS Architecture
-+config AR7_WDT
-+      tristate "TI AR7 Watchdog Timer"
-+      depends on WATCHDOG && AR7
-+      help
-+        Hardware driver for the TI AR7 Watchdog Timer.
-+
- config INDYDOG
-       tristate "Indy/I2 Hardware Watchdog"
-       depends on SGI_IP22
-Index: linux-2.6.23.17/drivers/char/watchdog/Makefile
-===================================================================
---- linux-2.6.23.17.orig/drivers/char/watchdog/Makefile
-+++ linux-2.6.23.17/drivers/char/watchdog/Makefile
-@@ -87,6 +87,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc
- # M68KNOMMU Architecture
- # MIPS Architecture
-+obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
- obj-$(CONFIG_INDYDOG) += indydog.o
- obj-$(CONFIG_WDT_MTX1)        += mtx-1_wdt.o
- obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
diff --git a/target/linux/ar7/patches-2.6.23/200-ethernet_driver.patch b/target/linux/ar7/patches-2.6.23/200-ethernet_driver.patch
deleted file mode 100644 (file)
index 0f13204..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: linux-2.6.23.17/drivers/net/Kconfig
-===================================================================
---- linux-2.6.23.17.orig/drivers/net/Kconfig
-+++ linux-2.6.23.17/drivers/net/Kconfig
-@@ -1965,6 +1965,15 @@ config SC92031
-         To compile this driver as a module, choose M here: the module
-         will be called sc92031.  This is recommended.
-+config CPMAC
-+      tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
-+      depends on NET_ETHERNET && EXPERIMENTAL && AR7
-+      select PHYLIB
-+      select FIXED_PHY
-+      select FIXED_MII_100_FDX
-+      help
-+        TI AR7 CPMAC Ethernet support
-+
- config NET_POCKET
-       bool "Pocket and portable adapters"
-       depends on PARPORT
-Index: linux-2.6.23.17/drivers/net/Makefile
-===================================================================
---- linux-2.6.23.17.orig/drivers/net/Makefile
-+++ linux-2.6.23.17/drivers/net/Makefile
-@@ -156,6 +156,7 @@ obj-$(CONFIG_8139CP) += 8139cp.o
- obj-$(CONFIG_8139TOO) += 8139too.o
- obj-$(CONFIG_ZNET) += znet.o
- obj-$(CONFIG_LAN_SAA9730) += saa9730.o
-+obj-$(CONFIG_CPMAC) += cpmac.o
- obj-$(CONFIG_DEPCA) += depca.o
- obj-$(CONFIG_EWRK3) += ewrk3.o
- obj-$(CONFIG_ATP) += atp.o
diff --git a/target/linux/ar7/patches-2.6.23/210-phy_fixed.patch b/target/linux/ar7/patches-2.6.23/210-phy_fixed.patch
deleted file mode 100644 (file)
index 2404078..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-Index: linux-2.6.23.17/drivers/net/phy/fixed.c
-===================================================================
---- linux-2.6.23.17.orig/drivers/net/phy/fixed.c
-+++ linux-2.6.23.17/drivers/net/phy/fixed.c
-@@ -189,6 +189,19 @@ static struct phy_driver fixed_mdio_driv
-       .driver         = { .owner = THIS_MODULE,},
- };
-+static void fixed_mdio_release (struct device * dev)
-+{
-+      struct phy_device *phydev = container_of(dev, struct phy_device, dev);
-+      struct mii_bus *bus = phydev->bus;
-+      struct fixed_info *fixed = bus->priv;
-+
-+      kfree(phydev);
-+      kfree(bus->dev);
-+      kfree(bus);
-+      kfree(fixed->regs);
-+      kfree(fixed);
-+}
-+
- /*-----------------------------------------------------------------------------
-  *  This func is used to create all the necessary stuff, bind
-  * the fixed phy driver and register all it on the mdio_bus_type.
-@@ -224,6 +237,12 @@ static int fixed_mdio_register_device(in
-       }
-       fixed->regs = kzalloc(MII_REGS_NUM*sizeof(int), GFP_KERNEL);
-+      if (NULL == fixed->regs) {
-+              kfree(dev);
-+              kfree(new_bus);
-+              kfree(fixed);
-+              return -ENOMEM;
-+      }
-       fixed->regs_num = MII_REGS_NUM;
-       fixed->phy_status.speed = speed;
-       fixed->phy_status.duplex = duplex;
-@@ -252,8 +271,11 @@ static int fixed_mdio_register_device(in
-       fixed->phydev = phydev;
-       if(NULL == phydev) {
--              err = -ENOMEM;
--              goto device_create_fail;
-+              kfree(dev);
-+              kfree(new_bus);
-+              kfree(fixed->regs);
-+              kfree(fixed);
-+              return -ENOMEM;
-       }
-       phydev->irq = PHY_IGNORE_INTERRUPT;
-@@ -265,8 +287,33 @@ static int fixed_mdio_register_device(in
-       else
-               snprintf(phydev->dev.bus_id, BUS_ID_SIZE,
-                               "fixed@%d:%d", speed, duplex);
-+
-       phydev->bus = new_bus;
-+#if 1
-+      phydev->dev.driver = &fixed_mdio_driver.driver;
-+      phydev->dev.release = fixed_mdio_release;
-+
-+      err = phydev->dev.driver->probe(&phydev->dev);
-+      if(err < 0) {
-+              printk(KERN_ERR "Phy %s: problems with fixed driver\n",
-+                      phydev->dev.bus_id);
-+              kfree(phydev);
-+              kfree(dev);
-+              kfree(new_bus);
-+              kfree(fixed->regs);
-+              kfree(fixed);
-+              return err;
-+      }
-+
-+      err = device_register(&phydev->dev);
-+      if(err) {
-+              printk(KERN_ERR "Phy %s failed to register\n",
-+                              phydev->dev.bus_id);
-+      }
-+
-+      return 0;
-+#else
-       err = device_register(&phydev->dev);
-       if(err) {
-               printk(KERN_ERR "Phy %s failed to register\n",
-@@ -303,6 +350,7 @@ device_create_fail:
-       kfree(fixed);
-       return err;
-+#endif
- }
- #endif
diff --git a/target/linux/ar7/patches-2.6.23/500-serial_kludge.patch b/target/linux/ar7/patches-2.6.23/500-serial_kludge.patch
deleted file mode 100644 (file)
index f695d2a..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: linux-2.6.23.17/drivers/serial/8250.c
-===================================================================
---- linux-2.6.23.17.orig/drivers/serial/8250.c
-+++ linux-2.6.23.17/drivers/serial/8250.c
-@@ -267,6 +267,13 @@ static const struct serial8250_config ua
-               .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
-               .flags          = UART_CAP_FIFO,
-       },
-+      [PORT_AR7] = {
-+              .name           = "TI-AR7",
-+              .fifo_size      = 16,
-+              .tx_loadsz      = 16,
-+              .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_00,
-+              .flags          = UART_CAP_FIFO | UART_CAP_AFE,
-+      },
- };
- #if defined (CONFIG_SERIAL_8250_AU1X00)
-@@ -2455,7 +2462,11 @@ static void serial8250_console_putchar(s
- {
-       struct uart_8250_port *up = (struct uart_8250_port *)port;
-+#ifdef CONFIG_AR7
-+      wait_for_xmitr(up, BOTH_EMPTY);
-+#else
-       wait_for_xmitr(up, UART_LSR_THRE);
-+#endif
-       serial_out(up, UART_TX, ch);
- }
-Index: linux-2.6.23.17/include/linux/serial_core.h
-===================================================================
---- linux-2.6.23.17.orig/include/linux/serial_core.h
-+++ linux-2.6.23.17/include/linux/serial_core.h
-@@ -40,6 +40,7 @@
- #define PORT_NS16550A 14
- #define PORT_XSCALE   15
- #define PORT_RM9000   16      /* PMC-Sierra RM9xxx internal UART */
-+#define PORT_AR7      16
- #define PORT_MAX_8250 16      /* max port ID */
- /*
-Index: linux-2.6.23.17/include/linux/serialP.h
-===================================================================
---- linux-2.6.23.17.orig/include/linux/serialP.h
-+++ linux-2.6.23.17/include/linux/serialP.h
-@@ -135,6 +135,10 @@ struct rs_multiport_struct {
-  * the interrupt line _up_ instead of down, so if we register the IRQ
-  * while the UART is in that state, we die in an IRQ storm. */
- #define ALPHA_KLUDGE_MCR (UART_MCR_OUT2)
-+#elif defined(CONFIG_AR7)
-+/* This is how it is set up by bootloader... */
-+#define ALPHA_KLUDGE_MCR (UART_MCR_OUT2 | UART_MCR_OUT1 \
-+                      | UART_MCR_RTS | UART_MCR_DTR)
- #else
- #define ALPHA_KLUDGE_MCR 0
- #endif
diff --git a/target/linux/ar7/patches-2.6.24/100-board_support.patch b/target/linux/ar7/patches-2.6.24/100-board_support.patch
deleted file mode 100644 (file)
index 744371e..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-Index: linux-2.6.24.7/arch/mips/Kconfig
-===================================================================
---- linux-2.6.24.7.orig/arch/mips/Kconfig
-+++ linux-2.6.24.7/arch/mips/Kconfig
-@@ -16,6 +16,24 @@ choice
-       prompt "System type"
-       default SGI_IP22
-+config AR7
-+      bool "Texas Instruments AR7"
-+      select BOOT_ELF32
-+      select DMA_NONCOHERENT
-+      select CEVT_R4K
-+      select CSRC_R4K
-+      select IRQ_CPU
-+      select NO_EXCEPT_FILL
-+      select SWAP_IO_SPACE
-+      select SYS_HAS_CPU_MIPS32_R1
-+      select SYS_HAS_EARLY_PRINTK
-+      select SYS_SUPPORTS_32BIT_KERNEL
-+      select SYS_SUPPORTS_KGDB
-+      select SYS_SUPPORTS_LITTLE_ENDIAN
-+      select SYS_SUPPORTS_BIG_ENDIAN
-+      select GENERIC_GPIO
-+      select GENERIC_HARDIRQS_NO__DO_IRQ
-+
- config MACH_ALCHEMY
-       bool "Alchemy processor based machines"
-Index: linux-2.6.24.7/arch/mips/kernel/traps.c
-===================================================================
---- linux-2.6.24.7.orig/arch/mips/kernel/traps.c
-+++ linux-2.6.24.7/arch/mips/kernel/traps.c
-@@ -1093,9 +1093,22 @@ void *set_except_vector(int n, void *add
-       exception_handlers[n] = handler;
-       if (n == 0 && cpu_has_divec) {
--              *(u32 *)(ebase + 0x200) = 0x08000000 |
--                                        (0x03ffffff & (handler >> 2));
--              flush_icache_range(ebase + 0x200, ebase + 0x204);
-+              if ((handler ^ (ebase + 4)) & 0xfc000000) {
-+                      /* lui k0, 0x0000 */
-+                      *(u32 *)(ebase + 0x200) = 0x3c1a0000 | (handler >> 16);
-+                      /* ori k0, 0x0000 */
-+                      *(u32 *)(ebase + 0x204) =
-+                                      0x375a0000 | (handler & 0xffff);
-+                      /* jr k0 */
-+                      *(u32 *)(ebase + 0x208) = 0x03400008;
-+                      /* nop */
-+                      *(u32 *)(ebase + 0x20C) = 0x00000000;
-+                      flush_icache_range(ebase + 0x200, ebase + 0x210);
-+              } else {
-+                      *(u32 *)(ebase + 0x200) =
-+                              0x08000000 | (0x03ffffff & (handler >> 2));
-+                      flush_icache_range(ebase + 0x200, ebase + 0x204);
-+              }
-       }
-       return (void *)old_handler;
- }
-Index: linux-2.6.24.7/arch/mips/Makefile
-===================================================================
---- linux-2.6.24.7.orig/arch/mips/Makefile
-+++ linux-2.6.24.7/arch/mips/Makefile
-@@ -159,6 +159,13 @@ libs-$(CONFIG_SIBYTE_CFE) += arch/mips/s
- #
- #
-+# Texas Instruments AR7
-+#
-+core-$(CONFIG_AR7)            += arch/mips/ar7/
-+cflags-$(CONFIG_AR7)          += -Iinclude/asm-mips/ar7
-+load-$(CONFIG_AR7)            += 0xffffffff94100000
-+
-+#
- # Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
- #
- core-$(CONFIG_MACH_JAZZ)      += arch/mips/jazz/
-Index: linux-2.6.24.7/include/asm-mips/page.h
-===================================================================
---- linux-2.6.24.7.orig/include/asm-mips/page.h
-+++ linux-2.6.24.7/include/asm-mips/page.h
-@@ -184,8 +184,10 @@ typedef struct { unsigned long pgprot; }
- #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
-                                VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
--#define UNCAC_ADDR(addr)      ((addr) - PAGE_OFFSET + UNCAC_BASE)
--#define CAC_ADDR(addr)                ((addr) - UNCAC_BASE + PAGE_OFFSET)
-+#define UNCAC_ADDR(addr)      ((addr) - PAGE_OFFSET + UNCAC_BASE +    \
-+                               PHYS_OFFSET)
-+#define CAC_ADDR(addr)                ((addr) - UNCAC_BASE + PAGE_OFFSET -    \
-+                               PHYS_OFFSET)
- #include <asm-generic/memory_model.h>
- #include <asm-generic/page.h>
diff --git a/target/linux/ar7/patches-2.6.24/110-flash.patch b/target/linux/ar7/patches-2.6.24/110-flash.patch
deleted file mode 100644 (file)
index 7a31368..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: linux-2.6.24.7/drivers/mtd/Kconfig
-===================================================================
---- linux-2.6.24.7.orig/drivers/mtd/Kconfig
-+++ linux-2.6.24.7/drivers/mtd/Kconfig
-@@ -160,6 +160,12 @@ config MTD_AFS_PARTS
-         for your particular device. It won't happen automatically. The
-         'armflash' map driver (CONFIG_MTD_ARMFLASH) does this, for example.
-+config MTD_AR7_PARTS
-+      tristate "TI AR7 partitioning support"
-+      depends on MTD_PARTITIONS
-+      ---help---
-+        TI AR7 partitioning support
-+
- comment "User Modules And Translation Layers"
- config MTD_CHAR
-Index: linux-2.6.24.7/drivers/mtd/Makefile
-===================================================================
---- linux-2.6.24.7.orig/drivers/mtd/Makefile
-+++ linux-2.6.24.7/drivers/mtd/Makefile
-@@ -11,6 +11,7 @@ obj-$(CONFIG_MTD_CONCAT)     += mtdconcat.o
- obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
- obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
- obj-$(CONFIG_MTD_AFS_PARTS)   += afs.o
-+obj-$(CONFIG_MTD_AR7_PARTS)   += ar7part.o
- # 'Users' - code which presents functionality to userspace.
- obj-$(CONFIG_MTD_CHAR)                += mtdchar.o
-Index: linux-2.6.24.7/drivers/mtd/maps/physmap.c
-===================================================================
---- linux-2.6.24.7.orig/drivers/mtd/maps/physmap.c
-+++ linux-2.6.24.7/drivers/mtd/maps/physmap.c
-@@ -74,7 +74,8 @@ static int physmap_flash_remove(struct p
- static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
- #ifdef CONFIG_MTD_PARTITIONS
--static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
-+static const char *part_probe_types[] = {"cmdlinepart", "RedBoot",
-+                                      "ar7part", NULL };
- #endif
- static int physmap_flash_probe(struct platform_device *dev)
diff --git a/target/linux/ar7/patches-2.6.24/120-gpio_chrdev.patch b/target/linux/ar7/patches-2.6.24/120-gpio_chrdev.patch
deleted file mode 100644 (file)
index 27db92a..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: linux-2.6.24.7/drivers/char/Kconfig
-===================================================================
---- linux-2.6.24.7.orig/drivers/char/Kconfig
-+++ linux-2.6.24.7/drivers/char/Kconfig
-@@ -904,6 +904,15 @@ config MWAVE
-         To compile this driver as a module, choose M here: the
-         module will be called mwave.
-+config AR7_GPIO
-+      tristate "TI AR7 GPIO Support"
-+      depends on AR7
-+      help
-+        Give userspace access to the GPIO pins on the Texas Instruments AR7 
-+        processors.
-+
-+        If compiled as a module, it will be called ar7_gpio.
-+
- config SCx200_GPIO
-       tristate "NatSemi SCx200 GPIO Support"
-       depends on SCx200
-Index: linux-2.6.24.7/drivers/char/Makefile
-===================================================================
---- linux-2.6.24.7.orig/drivers/char/Makefile
-+++ linux-2.6.24.7/drivers/char/Makefile
-@@ -89,6 +89,7 @@ obj-$(CONFIG_COBALT_LCD)     += lcd.o
- obj-$(CONFIG_PPDEV)           += ppdev.o
- obj-$(CONFIG_NWBUTTON)                += nwbutton.o
- obj-$(CONFIG_NWFLASH)         += nwflash.o
-+obj-$(CONFIG_AR7_GPIO)                += ar7_gpio.o
- obj-$(CONFIG_SCx200_GPIO)     += scx200_gpio.o
- obj-$(CONFIG_PC8736x_GPIO)    += pc8736x_gpio.o
- obj-$(CONFIG_NSC_GPIO)                += nsc_gpio.o
diff --git a/target/linux/ar7/patches-2.6.24/130-vlynq.patch b/target/linux/ar7/patches-2.6.24/130-vlynq.patch
deleted file mode 100644 (file)
index f4154ab..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: linux-2.6.24.7/drivers/Kconfig
-===================================================================
---- linux-2.6.24.7.orig/drivers/Kconfig
-+++ linux-2.6.24.7/drivers/Kconfig
-@@ -96,5 +96,7 @@ source "drivers/kvm/Kconfig"
- source "drivers/uio/Kconfig"
-+source "drivers/vlynq/Kconfig"
-+
- source "drivers/virtio/Kconfig"
- endmenu
-Index: linux-2.6.24.7/drivers/Makefile
-===================================================================
---- linux-2.6.24.7.orig/drivers/Makefile
-+++ linux-2.6.24.7/drivers/Makefile
-@@ -89,6 +89,7 @@ obj-$(CONFIG_DCA)            += dca/
- obj-$(CONFIG_HID)             += hid/
- obj-$(CONFIG_PPC_PS3)         += ps3/
- obj-$(CONFIG_OF)              += of/
-+obj-$(CONFIG_VLYNQ)           += vlynq/
- obj-$(CONFIG_SSB)             += ssb/
- obj-$(CONFIG_VIRTIO)          += virtio/
- obj-$(CONFIG_GPIO_DEVICE)     += gpio/
diff --git a/target/linux/ar7/patches-2.6.24/140-cpmac_fix.patch b/target/linux/ar7/patches-2.6.24/140-cpmac_fix.patch
deleted file mode 100644 (file)
index 7658932..0000000
+++ /dev/null
@@ -1,268 +0,0 @@
-Index: linux-2.6.24.7/drivers/net/cpmac.c
-===================================================================
---- linux-2.6.24.7.orig/drivers/net/cpmac.c
-+++ linux-2.6.24.7/drivers/net/cpmac.c
-@@ -38,6 +38,7 @@
- #include <linux/platform_device.h>
- #include <linux/dma-mapping.h>
- #include <asm/gpio.h>
-+#include <asm/atomic.h>
- MODULE_AUTHOR("Eugene Konev <ejka@imfi.kspu.ru>");
- MODULE_DESCRIPTION("TI AR7 ethernet driver (CPMAC)");
-@@ -207,6 +208,7 @@ struct cpmac_priv {
-       struct work_struct reset_work;
-       struct platform_device *pdev;
-       struct napi_struct napi;
-+      atomic_t reset_pending;
- };
- static irqreturn_t cpmac_irq(int, void *);
-@@ -455,6 +457,9 @@ static int cpmac_start_xmit(struct sk_bu
-       struct cpmac_desc *desc;
-       struct cpmac_priv *priv = netdev_priv(dev);
-+      if (unlikely(atomic_read(&priv->reset_pending)))
-+              return NETDEV_TX_BUSY;
-+
-       if (unlikely(skb_padto(skb, ETH_ZLEN)))
-               return NETDEV_TX_OK;
-@@ -634,14 +639,14 @@ static void cpmac_clear_tx(struct net_de
-               priv->desc_ring[i].dataflags = 0;
-               if (priv->desc_ring[i].skb) {
-                       dev_kfree_skb_any(priv->desc_ring[i].skb);
--                      if (netif_subqueue_stopped(dev, i))
--                          netif_wake_subqueue(dev, i);
-+                      priv->desc_ring[i].skb = NULL;
-               }
-       }
- }
- static void cpmac_hw_error(struct work_struct *work)
- {
-+      int i;
-       struct cpmac_priv *priv =
-               container_of(work, struct cpmac_priv, reset_work);
-@@ -650,8 +655,47 @@ static void cpmac_hw_error(struct work_s
-       spin_unlock(&priv->rx_lock);
-       cpmac_clear_tx(priv->dev);
-       cpmac_hw_start(priv->dev);
--      napi_enable(&priv->napi);
--      netif_start_queue(priv->dev);
-+      barrier();
-+      atomic_dec(&priv->reset_pending);
-+      
-+      for (i = 0; i < CPMAC_QUEUES; i++) {
-+              netif_wake_subqueue(priv->dev, i);
-+      }
-+      netif_wake_queue(priv->dev);
-+      cpmac_write(priv->regs, CPMAC_MAC_INT_ENABLE, 3);
-+}
-+
-+static void cpmac_check_status(struct net_device *dev)
-+{
-+      struct cpmac_priv *priv = netdev_priv(dev);
-+
-+      u32 macstatus = cpmac_read(priv->regs, CPMAC_MAC_STATUS);
-+      int rx_channel = (macstatus >> 8) & 7;
-+      int rx_code = (macstatus >> 12) & 15;
-+      int tx_channel = (macstatus >> 16) & 7;
-+      int tx_code = (macstatus >> 20) & 15;
-+
-+      if (rx_code || tx_code) {
-+              if (netif_msg_drv(priv) && net_ratelimit()) {
-+                      /* Can't find any documentation on what these error codes actually are.
-+                       * So just log them and hope..
-+                       */
-+                      if (rx_code)
-+                              printk(KERN_WARNING "%s: host error %d on rx channel %d (macstatus %08x), resetting\n",
-+                                     dev->name, rx_code, rx_channel, macstatus);
-+                      if (tx_code)
-+                              printk(KERN_WARNING "%s: host error %d on tx channel %d (macstatus %08x), resetting\n",
-+                                     dev->name, tx_code, tx_channel, macstatus);
-+              }
-+              
-+              netif_stop_queue(dev);
-+              cpmac_hw_stop(dev);
-+              if (schedule_work(&priv->reset_work))
-+                      atomic_inc(&priv->reset_pending);
-+              if (unlikely(netif_msg_hw(priv)))
-+                      cpmac_dump_regs(dev);
-+      }
-+      cpmac_write(priv->regs, CPMAC_MAC_INT_CLEAR, 0xff);
- }
- static irqreturn_t cpmac_irq(int irq, void *dev_id)
-@@ -661,9 +705,6 @@ static irqreturn_t cpmac_irq(int irq, vo
-       int queue;
-       u32 status;
--      if (!dev)
--              return IRQ_NONE;
--
-       priv = netdev_priv(dev);
-       status = cpmac_read(priv->regs, CPMAC_MAC_INT_VECTOR);
-@@ -685,49 +726,33 @@ static irqreturn_t cpmac_irq(int irq, vo
-       cpmac_write(priv->regs, CPMAC_MAC_EOI_VECTOR, 0);
--      if (unlikely(status & (MAC_INT_HOST | MAC_INT_STATUS))) {
--              if (netif_msg_drv(priv) && net_ratelimit())
--                      printk(KERN_ERR "%s: hw error, resetting...\n",
--                             dev->name);
--              netif_stop_queue(dev);
--              napi_disable(&priv->napi);
--              cpmac_hw_stop(dev);
--              schedule_work(&priv->reset_work);
--              if (unlikely(netif_msg_hw(priv)))
--                      cpmac_dump_regs(dev);
--      }
-+      if (unlikely(status & (MAC_INT_HOST | MAC_INT_STATUS)))
-+              cpmac_check_status(dev);
-       return IRQ_HANDLED;
- }
- static void cpmac_tx_timeout(struct net_device *dev)
- {
--      struct cpmac_priv *priv = netdev_priv(dev);
-       int i;
-+      struct cpmac_priv *priv = netdev_priv(dev);
-       spin_lock(&priv->lock);
-       dev->stats.tx_errors++;
-       spin_unlock(&priv->lock);
-       if (netif_msg_tx_err(priv) && net_ratelimit())
-               printk(KERN_WARNING "%s: transmit timeout\n", dev->name);
--      /* 
--       * FIXME: waking up random queue is not the best thing to
--       * do... on the other hand why we got here at all?
--       */
--#ifdef CONFIG_NETDEVICES_MULTIQUEUE
--      for (i = 0; i < CPMAC_QUEUES; i++)
--              if (priv->desc_ring[i].skb) {
--                      priv->desc_ring[i].dataflags = 0;
--                      dev_kfree_skb_any(priv->desc_ring[i].skb);
--                      netif_wake_subqueue(dev, i);
--                      break;
--              }
--#else
--      priv->desc_ring[0].dataflags = 0;
--      if (priv->desc_ring[0].skb)
--              dev_kfree_skb_any(priv->desc_ring[0].skb);
--      netif_wake_queue(dev);
--#endif
-+
-+      atomic_inc(&priv->reset_pending);
-+      barrier();
-+      cpmac_clear_tx(dev);
-+      barrier();
-+      atomic_dec(&priv->reset_pending);
-+
-+      netif_wake_queue(priv->dev);
-+      for (i = 0; i < CPMAC_QUEUES; i++) {
-+              netif_wake_subqueue(dev, i);
-+      }
- }
- static int cpmac_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-@@ -848,15 +873,6 @@ static void cpmac_adjust_link(struct net
-       spin_unlock(&priv->lock);
- }
--static int cpmac_link_update(struct net_device *dev,
--                           struct fixed_phy_status *status)
--{
--      status->link = 1;
--      status->speed = 100;
--      status->duplex = 1;
--      return 0;
--}
--
- static int cpmac_open(struct net_device *dev)
- {
-       int i, size, res;
-@@ -923,6 +939,7 @@ static int cpmac_open(struct net_device 
-               goto fail_irq;
-       }
-+      atomic_set(&priv->reset_pending, 0);
-       INIT_WORK(&priv->reset_work, cpmac_hw_error);
-       cpmac_hw_start(dev);
-@@ -999,11 +1016,11 @@ static int external_switch;
- static int __devinit cpmac_probe(struct platform_device *pdev)
- {
-       int rc, phy_id, i;
-+      int mdio_bus_id = cpmac_mii.id;
-       struct resource *mem;
-       struct cpmac_priv *priv;
-       struct net_device *dev;
-       struct plat_cpmac_data *pdata;
--      struct fixed_info *fixed_phy;
-       DECLARE_MAC_BUF(mac);
-       pdata = pdev->dev.platform_data;
-@@ -1017,9 +1034,23 @@ static int __devinit cpmac_probe(struct 
-       }
-       if (phy_id == PHY_MAX_ADDR) {
--              if (external_switch || dumb_switch)
-+              if (external_switch || dumb_switch) {
-+                      struct fixed_phy_status status = {};
-+
-+                      mdio_bus_id = 0;
-+
-+                      /*
-+                       * FIXME: this should be in the platform code!
-+                       * Since there is not platform code at all (that is,
-+                       * no mainline users of that driver), place it here
-+                       * for now.
-+                       */
-                       phy_id = 0;
--              else {
-+                      status.link = 1;
-+                      status.duplex = 1;
-+                      status.speed = 100;
-+                      fixed_phy_add(PHY_POLL, phy_id, &status);
-+              } else {
-                       printk(KERN_ERR "cpmac: no PHY present\n");
-                       return -ENODEV;
-               }
-@@ -1063,32 +1094,8 @@ static int __devinit cpmac_probe(struct 
-       priv->msg_enable = netif_msg_init(debug_level, 0xff);
-       memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr));
--      if (phy_id == 31) {
--              snprintf(priv->phy_name, BUS_ID_SIZE, PHY_ID_FMT, cpmac_mii.id,
--                       phy_id);
--      } else {
--              /* Let's try to get a free fixed phy... */
--              for (i = 0; i < MAX_PHY_AMNT; i++) {
--                      fixed_phy = fixed_mdio_get_phydev(i);
--                      if (!fixed_phy)
--                              continue;
--                      if (!fixed_phy->phydev->attached_dev) {
--                              strncpy(priv->phy_name,
--                                      fixed_phy->phydev->dev.bus_id,
--                                      BUS_ID_SIZE);
--                              fixed_mdio_set_link_update(fixed_phy->phydev,
--                                                         &cpmac_link_update);
--                              goto phy_found;
--                      }
--              }
--              if (netif_msg_drv(priv))
--                      printk(KERN_ERR "%s: Could not find fixed PHY\n",
--                             dev->name);
--              rc = -ENODEV;
--              goto fail;
--      }
-+      snprintf(priv->phy_name, BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id);
--phy_found:
-       priv->phy = phy_connect(dev, priv->phy_name, &cpmac_adjust_link, 0,
-                               PHY_INTERFACE_MODE_MII);
-       if (IS_ERR(priv->phy)) {
diff --git a/target/linux/ar7/patches-2.6.24/150-cpmac_up_and_running.diff b/target/linux/ar7/patches-2.6.24/150-cpmac_up_and_running.diff
deleted file mode 100644 (file)
index c2fb478..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-From 0daaa095cefd9d7091a7ccce2ff89f1ff4feae7a Mon Sep 17 00:00:00 2001
-From: Anton Vorontsov <avorontsov@ru.mvista.com>
-Date: Wed, 5 Mar 2008 14:52:26 +0300
-Subject: [PATCH] AR7/cpmac: convert to new fixed phy infrastructure, now for real
-
-This patch converts platform code to register fixed phys early.
-cpmac driver modified to blindly accept fixed phy id (that is equal
-to platform device id).
-
-Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
----
- arch/mips/ar7/platform.c |   17 +++++++++++++++++
- drivers/net/cpmac.c      |   19 +++----------------
- 2 files changed, 20 insertions(+), 16 deletions(-)
-
-Index: linux-2.6.24.7/arch/mips/ar7/platform.c
-===================================================================
---- linux-2.6.24.7.orig/arch/mips/ar7/platform.c
-+++ linux-2.6.24.7/arch/mips/ar7/platform.c
-@@ -33,6 +33,8 @@
- #include <linux/vlynq.h>
- #include <linux/leds.h>
- #include <linux/string.h>
-+#include <linux/phy.h>
-+#include <linux/phy_fixed.h>
- #include <asm/addrspace.h>
- #include <asm/ar7/ar7.h>
-@@ -205,6 +207,13 @@ static struct physmap_flash_data physmap
-       .width = 2,
- };
-+/* lets assume this is suitable for both high and low cpmacs links */
-+static struct fixed_phy_status fixed_phy_status __initdata = {
-+      .link = 1,
-+      .speed = 100,
-+      .duplex = 1,
-+};
-+
- static struct plat_cpmac_data cpmac_low_data = {
-       .reset_bit = 17,
-       .power_bit = 20,
-@@ -506,6 +515,10 @@ static int __init ar7_register_devices(v
-       }
-       if (ar7_has_high_cpmac()) {
-+              res = fixed_phy_add(PHY_POLL, cpmac_high.id, &fixed_phy_status);
-+              if (res && res != -ENODEV)
-+                      return res;
-+
-               cpmac_get_mac(1, cpmac_high_data.dev_addr);
-               res = platform_device_register(&cpmac_high);
-               if (res)
-@@ -514,6 +527,10 @@ static int __init ar7_register_devices(v
-               cpmac_low_data.phy_mask = 0xffffffff;
-       }
-+      res = fixed_phy_add(PHY_POLL, cpmac_low.id, &fixed_phy_status);
-+      if (res && res != -ENODEV)
-+              return res;
-+
-       cpmac_get_mac(0, cpmac_low_data.dev_addr);
-       res = platform_device_register(&cpmac_low);
-       if (res)
-Index: linux-2.6.24.7/drivers/net/cpmac.c
-===================================================================
---- linux-2.6.24.7.orig/drivers/net/cpmac.c
-+++ linux-2.6.24.7/drivers/net/cpmac.c
-@@ -1035,23 +1035,10 @@ static int __devinit cpmac_probe(struct 
-       if (phy_id == PHY_MAX_ADDR) {
-               if (external_switch || dumb_switch) {
--                      struct fixed_phy_status status = {};
--
--                      mdio_bus_id = 0;
--
--                      /*
--                       * FIXME: this should be in the platform code!
--                       * Since there is not platform code at all (that is,
--                       * no mainline users of that driver), place it here
--                       * for now.
--                       */
--                      phy_id = 0;
--                      status.link = 1;
--                      status.duplex = 1;
--                      status.speed = 100;
--                      fixed_phy_add(PHY_POLL, phy_id, &status);
-+                      mdio_bus_id = 0; /* fixed phys bus */
-+                      phy_id = pdev->id;
-               } else {
--                      printk(KERN_ERR "cpmac: no PHY present\n");
-+                      dev_err(&pdev->dev, "no PHY present\n");
-                       return -ENODEV;
-               }
-       }
diff --git a/target/linux/ar7/patches-2.6.24/160-cpmac-rx-ring-use-eoq.diff b/target/linux/ar7/patches-2.6.24/160-cpmac-rx-ring-use-eoq.diff
deleted file mode 100644 (file)
index 2fb71cd..0000000
+++ /dev/null
@@ -1,180 +0,0 @@
-Index: linux-2.6.24.7/drivers/net/cpmac.c
-===================================================================
---- linux-2.6.24.7.orig/drivers/net/cpmac.c
-+++ linux-2.6.24.7/drivers/net/cpmac.c
-@@ -187,6 +187,7 @@ struct cpmac_desc {
- #define CPMAC_EOQ                     0x1000
-       struct sk_buff *skb;
-       struct cpmac_desc *next;
-+      struct cpmac_desc *prev;
-       dma_addr_t mapping;
-       dma_addr_t data_mapping;
- };
-@@ -242,6 +243,16 @@ static void cpmac_dump_desc(struct net_d
-       printk("\n");
- }
-+static void cpmac_dump_all_desc(struct net_device *dev)
-+{
-+        struct cpmac_priv *priv = netdev_priv(dev);
-+        struct cpmac_desc *dump = priv->rx_head;
-+        do {
-+                cpmac_dump_desc(dev, dump);
-+                dump = dump->next;
-+        } while (dump != priv->rx_head);
-+}
-+
- static void cpmac_dump_skb(struct net_device *dev, struct sk_buff *skb)
- {
-       int i;
-@@ -413,21 +424,40 @@ static struct sk_buff *cpmac_rx_one(stru
- static int cpmac_poll(struct napi_struct *napi, int budget)
- {
-       struct sk_buff *skb;
--      struct cpmac_desc *desc;
--      int received = 0;
-+      struct cpmac_desc *desc, *restart;
-       struct cpmac_priv *priv = container_of(napi, struct cpmac_priv, napi);
-+      int received = 0, processed = 0;
-       spin_lock(&priv->rx_lock);
-       if (unlikely(!priv->rx_head)) {
-               if (netif_msg_rx_err(priv) && net_ratelimit())
-                       printk(KERN_WARNING "%s: rx: polling, but no queue\n",
-                              priv->dev->name);
-+              spin_unlock(&priv->rx_lock);
-               netif_rx_complete(priv->dev, napi);
-               return 0;
-       }
-       desc = priv->rx_head;
-+      restart = NULL;
-       while (((desc->dataflags & CPMAC_OWN) == 0) && (received < budget)) {
-+              processed++;
-+              
-+              if ((desc->dataflags & CPMAC_EOQ) != 0) {
-+                      /* The last update to eoq->hw_next didn't happen soon enough, and the
-+                      * receiver stopped here. Remember this descriptor so we can restart
-+                      * the receiver after freeing some space.
-+                      */
-+                      if (unlikely(restart)) {
-+                              if (netif_msg_rx_err(priv))
-+                                      printk(KERN_ERR "%s: poll found a duplicate EOQ: %p and %p\n",
-+                                              priv->dev->name, restart, desc);
-+                              goto fatal_error;
-+                      }
-+                      
-+                      restart = desc->next;
-+              }
-+
-               skb = cpmac_rx_one(priv, desc);
-               if (likely(skb)) {
-                       netif_receive_skb(skb);
-@@ -436,19 +466,81 @@ static int cpmac_poll(struct napi_struct
-               desc = desc->next;
-       }
-+      if (desc != priv->rx_head) {
-+              /* We freed some buffers, but not the whole ring, add what we did free to the rx list */ 
-+              desc->prev->hw_next = (u32)0;
-+              priv->rx_head->prev->hw_next = priv->rx_head->mapping;
-+      }
-+
-+      /* Optimization: If we did not actually process an EOQ (perhaps because of 
-+      * quota limits), check to see if the tail of the queue has EOQ set. We
-+      * should immediately restart in that case so that the receiver can restart
-+      * and run in parallel with more packet processing. This lets us handle slightly
-+      * larger bursts before running out of ring space (assuming dev->weight < ring_size)
-+      */
-+      if (!restart &&
-+           (priv->rx_head->prev->dataflags & (CPMAC_OWN|CPMAC_EOQ)) == CPMAC_EOQ &&
-+           (priv->rx_head->dataflags & CPMAC_OWN) != 0) {
-+              /* reset EOQ so the poll loop (above) doesn't try to restart this when it
-+              * eventually gets to this descriptor.
-+              */
-+              priv->rx_head->prev->dataflags &= ~CPMAC_EOQ;
-+              restart = priv->rx_head;
-+      }
-+
-+      if (restart) {
-+              priv->dev->stats.rx_errors++;
-+              priv->dev->stats.rx_fifo_errors++;
-+              if (netif_msg_rx_err(priv) && net_ratelimit())
-+                      printk(KERN_WARNING "%s: rx dma ring overrun\n", priv->dev->name);
-+
-+              if (unlikely((restart->dataflags & CPMAC_OWN) == 0)) {
-+                      if (netif_msg_drv(priv))
-+                              printk(KERN_ERR "%s: cpmac_poll is trying to restart rx from a descriptor that's not free: %p\n",
-+                                      priv->dev->name, restart);
-+                              goto fatal_error;
-+              }
-+
-+              cpmac_write(priv->regs, CPMAC_RX_PTR(0), restart->mapping);
-+      }
-+
-       priv->rx_head = desc;
-       spin_unlock(&priv->rx_lock);
-       if (unlikely(netif_msg_rx_status(priv)))
-               printk(KERN_DEBUG "%s: poll processed %d packets\n",
-                      priv->dev->name, received);
--      if (desc->dataflags & CPMAC_OWN) {
-+      if (processed == 0) {
-+              /* we ran out of packets to read, revert to interrupt-driven mode */ 
-               netif_rx_complete(priv->dev, napi);
--              cpmac_write(priv->regs, CPMAC_RX_PTR(0), (u32)desc->mapping);
-               cpmac_write(priv->regs, CPMAC_RX_INT_ENABLE, 1);
-               return 0;
-       }
-       return 1;
-+
-+fatal_error:
-+      /* Something went horribly wrong. Reset hardware to try to recover rather than wedging. */ 
-+      
-+      if (netif_msg_drv(priv)) {
-+              printk(KERN_ERR "%s: cpmac_poll is confused. Resetting hardware\n", priv->dev->name);
-+              cpmac_dump_all_desc(priv->dev);
-+              printk(KERN_DEBUG "%s: RX_PTR(0)=0x%08x RX_ACK(0)=0x%08x\n",
-+                      priv->dev->name,
-+                      cpmac_read(priv->regs, CPMAC_RX_PTR(0)),
-+                      cpmac_read(priv->regs, CPMAC_RX_ACK(0)));
-+      }
-+
-+      spin_unlock(&priv->rx_lock);
-+      netif_rx_complete(priv->dev, napi);
-+      netif_stop_queue(priv->dev);
-+      napi_disable(&priv->napi);
-+      
-+      atomic_inc(&priv->reset_pending);
-+      cpmac_hw_stop(priv->dev);
-+      if (!schedule_work(&priv->reset_work))
-+              atomic_dec(&priv->reset_pending);
-+      return 0;
-+ 
- }
- static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
-@@ -625,8 +717,10 @@ static void cpmac_clear_rx(struct net_de
-                       desc->dataflags = CPMAC_OWN;
-                       dev->stats.rx_dropped++;
-               }
-+              desc->hw_next = desc->next->mapping;
-               desc = desc->next;
-       }
-+      priv->rx_head->prev->hw_next = 0;
- }
- static void cpmac_clear_tx(struct net_device *dev)
-@@ -928,9 +1022,12 @@ static int cpmac_open(struct net_device 
-               desc->buflen = CPMAC_SKB_SIZE;
-               desc->dataflags = CPMAC_OWN;
-               desc->next = &priv->rx_head[(i + 1) % priv->ring_size];
-+              desc->next->prev = desc;
-               desc->hw_next = (u32)desc->next->mapping;
-       }
-+      priv->rx_head->prev->hw_next = (u32)0;
-+
-       if ((res = request_irq(dev->irq, cpmac_irq, IRQF_SHARED,
-                              dev->name, dev))) {
-               if (netif_msg_drv(priv))
diff --git a/target/linux/ar7/patches-2.6.24/170-cpmac_eth_fix.patch b/target/linux/ar7/patches-2.6.24/170-cpmac_eth_fix.patch
deleted file mode 100644 (file)
index bebd453..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: linux-2.6.24.7/drivers/net/cpmac.c
-===================================================================
---- linux-2.6.24.7.orig/drivers/net/cpmac.c
-+++ linux-2.6.24.7/drivers/net/cpmac.c
-@@ -1178,9 +1178,7 @@ static int __devinit cpmac_probe(struct 
-       priv->msg_enable = netif_msg_init(debug_level, 0xff);
-       memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr));
--      snprintf(priv->phy_name, BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id);
--
--      priv->phy = phy_connect(dev, priv->phy_name, &cpmac_adjust_link, 0,
-+      priv->phy = phy_connect(dev, cpmac_mii.phy_map[phy_id]->dev.bus_id, &cpmac_adjust_link, 0,
-                               PHY_INTERFACE_MODE_MII);
-       if (IS_ERR(priv->phy)) {
-               if (netif_msg_drv(priv))
diff --git a/target/linux/ar7/patches-2.6.24/500-serial_kludge.patch b/target/linux/ar7/patches-2.6.24/500-serial_kludge.patch
deleted file mode 100644 (file)
index a66bc8a..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: linux-2.6.24.7/drivers/serial/8250.c
-===================================================================
---- linux-2.6.24.7.orig/drivers/serial/8250.c
-+++ linux-2.6.24.7/drivers/serial/8250.c
-@@ -267,6 +267,13 @@ static const struct serial8250_config ua
-               .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
-               .flags          = UART_CAP_FIFO,
-       },
-+      [PORT_AR7] = {
-+              .name           = "TI-AR7",
-+              .fifo_size      = 16,
-+              .tx_loadsz      = 16,
-+              .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_00,
-+              .flags          = UART_CAP_FIFO | UART_CAP_AFE,
-+      },
- };
- #if defined (CONFIG_SERIAL_8250_AU1X00)
-@@ -2453,7 +2460,11 @@ static void serial8250_console_putchar(s
- {
-       struct uart_8250_port *up = (struct uart_8250_port *)port;
-+#ifdef CONFIG_AR7
-+      wait_for_xmitr(up, BOTH_EMPTY);
-+#else
-       wait_for_xmitr(up, UART_LSR_THRE);
-+#endif
-       serial_out(up, UART_TX, ch);
- }
-Index: linux-2.6.24.7/include/linux/serial_core.h
-===================================================================
---- linux-2.6.24.7.orig/include/linux/serial_core.h
-+++ linux-2.6.24.7/include/linux/serial_core.h
-@@ -40,7 +40,8 @@
- #define PORT_NS16550A 14
- #define PORT_XSCALE   15
- #define PORT_RM9000   16      /* PMC-Sierra RM9xxx internal UART */
--#define PORT_MAX_8250 16      /* max port ID */
-+#define PORT_AR7      17
-+#define PORT_MAX_8250 17      /* max port ID */
- /*
-  * ARM specific type numbers.  These are not currently guaranteed
diff --git a/target/linux/ar7/patches-2.6.24/900-temporary_cpmac_hack.diff b/target/linux/ar7/patches-2.6.24/900-temporary_cpmac_hack.diff
deleted file mode 100644 (file)
index dfd1a67..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: linux-2.6.24.7/drivers/net/cpmac.c
-===================================================================
---- linux-2.6.24.7.orig/drivers/net/cpmac.c
-+++ linux-2.6.24.7/drivers/net/cpmac.c
-@@ -936,7 +936,8 @@ static void cpmac_adjust_link(struct net
-       int new_state = 0;
-       spin_lock(&priv->lock);
--      if (priv->phy->link) {
-+      if (1 /* priv->phy->link */ ) {
-+              netif_carrier_on(dev);
-               netif_start_queue(dev);
-               if (priv->phy->duplex != priv->oldduplex) {
-                       new_state = 1;
-@@ -948,11 +949,11 @@ static void cpmac_adjust_link(struct net
-                       priv->oldspeed = priv->phy->speed;
-               }
--              if (!priv->oldlink) {
-+              /*if (!priv->oldlink) {
-                       new_state = 1;
--                      priv->oldlink = 1;
-+                      priv->oldlink = 1;*/
-                       netif_schedule(dev);
--              }
-+              /*}*/
-       } else if (priv->oldlink) {
-               netif_stop_queue(dev);
-               new_state = 1;
diff --git a/target/linux/ar7/patches-2.6.25/100-board_support.patch b/target/linux/ar7/patches-2.6.25/100-board_support.patch
deleted file mode 100644 (file)
index 658a80e..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -18,6 +18,24 @@
-       prompt "System type"
-       default SGI_IP22
-+config AR7
-+      bool "Texas Instruments AR7"
-+      select BOOT_ELF32
-+      select DMA_NONCOHERENT
-+      select CEVT_R4K
-+      select CSRC_R4K
-+      select IRQ_CPU
-+      select NO_EXCEPT_FILL
-+      select SWAP_IO_SPACE
-+      select SYS_HAS_CPU_MIPS32_R1
-+      select SYS_HAS_EARLY_PRINTK
-+      select SYS_SUPPORTS_32BIT_KERNEL
-+      select SYS_SUPPORTS_KGDB
-+      select SYS_SUPPORTS_LITTLE_ENDIAN
-+      select SYS_SUPPORTS_BIG_ENDIAN
-+      select GENERIC_GPIO
-+      select GENERIC_HARDIRQS_NO__DO_IRQ
-+
- config MACH_ALCHEMY
-       bool "Alchemy processor based machines"
---- a/arch/mips/kernel/traps.c
-+++ b/arch/mips/kernel/traps.c
-@@ -1112,9 +1112,22 @@
-       exception_handlers[n] = handler;
-       if (n == 0 && cpu_has_divec) {
--              *(u32 *)(ebase + 0x200) = 0x08000000 |
--                                        (0x03ffffff & (handler >> 2));
--              flush_icache_range(ebase + 0x200, ebase + 0x204);
-+              if ((handler ^ (ebase + 4)) & 0xfc000000) {
-+                      /* lui k0, 0x0000 */
-+                      *(u32 *)(ebase + 0x200) = 0x3c1a0000 | (handler >> 16);
-+                      /* ori k0, 0x0000 */
-+                      *(u32 *)(ebase + 0x204) =
-+                                      0x375a0000 | (handler & 0xffff);
-+                      /* jr k0 */
-+                      *(u32 *)(ebase + 0x208) = 0x03400008;
-+                      /* nop */
-+                      *(u32 *)(ebase + 0x20C) = 0x00000000;
-+                      flush_icache_range(ebase + 0x200, ebase + 0x210);
-+              } else {
-+                      *(u32 *)(ebase + 0x200) =
-+                              0x08000000 | (0x03ffffff & (handler >> 2));
-+                      flush_icache_range(ebase + 0x200, ebase + 0x204);
-+              }
-       }
-       return (void *)old_handler;
- }
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -167,6 +167,13 @@
- #
- #
-+# Texas Instruments AR7
-+#
-+core-$(CONFIG_AR7)            += arch/mips/ar7/
-+cflags-$(CONFIG_AR7)          += -Iinclude/asm-mips/ar7
-+load-$(CONFIG_AR7)            += 0xffffffff94100000
-+
-+#
- # Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
- #
- core-$(CONFIG_MACH_JAZZ)      += arch/mips/jazz/
---- a/include/asm-mips/page.h
-+++ b/include/asm-mips/page.h
-@@ -182,8 +182,10 @@
- #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
-                                VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
--#define UNCAC_ADDR(addr)      ((addr) - PAGE_OFFSET + UNCAC_BASE)
--#define CAC_ADDR(addr)                ((addr) - UNCAC_BASE + PAGE_OFFSET)
-+#define UNCAC_ADDR(addr)      ((addr) - PAGE_OFFSET + UNCAC_BASE +    \
-+                               PHYS_OFFSET)
-+#define CAC_ADDR(addr)                ((addr) - UNCAC_BASE + PAGE_OFFSET -    \
-+                               PHYS_OFFSET)
- #include <asm-generic/memory_model.h>
- #include <asm-generic/page.h>
diff --git a/target/linux/ar7/patches-2.6.25/110-flash.patch b/target/linux/ar7/patches-2.6.25/110-flash.patch
deleted file mode 100644 (file)
index 5f6b8f1..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -168,6 +168,12 @@
-         the partition map from the children of the flash node,
-         as described in Documentation/powerpc/booting-without-of.txt.
-+config MTD_AR7_PARTS
-+      tristate "TI AR7 partitioning support"
-+      depends on MTD_PARTITIONS
-+      ---help---
-+        TI AR7 partitioning support
-+
- comment "User Modules And Translation Layers"
- config MTD_CHAR
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -12,6 +12,7 @@
- obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
- obj-$(CONFIG_MTD_AFS_PARTS)   += afs.o
- obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o
-+obj-$(CONFIG_MTD_AR7_PARTS)   += ar7part.o
- # 'Users' - code which presents functionality to userspace.
- obj-$(CONFIG_MTD_CHAR)                += mtdchar.o
---- a/drivers/mtd/maps/physmap.c
-+++ b/drivers/mtd/maps/physmap.c
-@@ -87,7 +87,8 @@
- static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
- #ifdef CONFIG_MTD_PARTITIONS
--static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
-+static const char *part_probe_types[] = {"cmdlinepart", "RedBoot",
-+                                      "ar7part", NULL };
- #endif
- static int physmap_flash_probe(struct platform_device *dev)
diff --git a/target/linux/ar7/patches-2.6.25/120-gpio_chrdev.patch b/target/linux/ar7/patches-2.6.25/120-gpio_chrdev.patch
deleted file mode 100644 (file)
index cd5d744..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -913,6 +913,15 @@
-         To compile this driver as a module, choose M here: the
-         module will be called mwave.
-+config AR7_GPIO
-+      tristate "TI AR7 GPIO Support"
-+      depends on AR7
-+      help
-+        Give userspace access to the GPIO pins on the Texas Instruments AR7 
-+        processors.
-+
-+        If compiled as a module, it will be called ar7_gpio.
-+
- config SCx200_GPIO
-       tristate "NatSemi SCx200 GPIO Support"
-       depends on SCx200
---- a/drivers/char/Makefile
-+++ b/drivers/char/Makefile
-@@ -90,6 +90,7 @@
- obj-$(CONFIG_PPDEV)           += ppdev.o
- obj-$(CONFIG_NWBUTTON)                += nwbutton.o
- obj-$(CONFIG_NWFLASH)         += nwflash.o
-+obj-$(CONFIG_AR7_GPIO)                += ar7_gpio.o
- obj-$(CONFIG_SCx200_GPIO)     += scx200_gpio.o
- obj-$(CONFIG_PC8736x_GPIO)    += pc8736x_gpio.o
- obj-$(CONFIG_NSC_GPIO)                += nsc_gpio.o
diff --git a/target/linux/ar7/patches-2.6.25/130-vlynq.patch b/target/linux/ar7/patches-2.6.25/130-vlynq.patch
deleted file mode 100644 (file)
index f925258..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -97,4 +97,6 @@
- source "drivers/auxdisplay/Kconfig"
- source "drivers/uio/Kconfig"
-+
-+source "drivers/vlynq/Kconfig"
- endmenu
---- a/drivers/Makefile
-+++ b/drivers/Makefile
-@@ -91,5 +91,6 @@
- obj-$(CONFIG_HID)             += hid/
- obj-$(CONFIG_PPC_PS3)         += ps3/
- obj-$(CONFIG_OF)              += of/
-+obj-$(CONFIG_VLYNQ)           += vlynq/
- obj-$(CONFIG_SSB)             += ssb/
- obj-$(CONFIG_VIRTIO)          += virtio/
diff --git a/target/linux/ar7/patches-2.6.25/140-cpmac_fix.patch b/target/linux/ar7/patches-2.6.25/140-cpmac_fix.patch
deleted file mode 100644 (file)
index f6f29eb..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
---- a/drivers/net/cpmac.c
-+++ b/drivers/net/cpmac.c
-@@ -38,6 +38,7 @@
- #include <linux/platform_device.h>
- #include <linux/dma-mapping.h>
- #include <asm/gpio.h>
-+#include <asm/atomic.h>
- MODULE_AUTHOR("Eugene Konev <ejka@imfi.kspu.ru>");
- MODULE_DESCRIPTION("TI AR7 ethernet driver (CPMAC)");
-@@ -207,6 +208,7 @@
-       struct work_struct reset_work;
-       struct platform_device *pdev;
-       struct napi_struct napi;
-+      atomic_t reset_pending;
- };
- static irqreturn_t cpmac_irq(int, void *);
-@@ -455,6 +457,9 @@
-       struct cpmac_desc *desc;
-       struct cpmac_priv *priv = netdev_priv(dev);
-+      if (unlikely(atomic_read(&priv->reset_pending)))
-+              return NETDEV_TX_BUSY;
-+
-       if (unlikely(skb_padto(skb, ETH_ZLEN)))
-               return NETDEV_TX_OK;
-@@ -634,14 +639,14 @@
-               priv->desc_ring[i].dataflags = 0;
-               if (priv->desc_ring[i].skb) {
-                       dev_kfree_skb_any(priv->desc_ring[i].skb);
--                      if (netif_subqueue_stopped(dev, i))
--                          netif_wake_subqueue(dev, i);
-+                      priv->desc_ring[i].skb = NULL;
-               }
-       }
- }
- static void cpmac_hw_error(struct work_struct *work)
- {
-+      int i;
-       struct cpmac_priv *priv =
-               container_of(work, struct cpmac_priv, reset_work);
-@@ -650,8 +655,47 @@
-       spin_unlock(&priv->rx_lock);
-       cpmac_clear_tx(priv->dev);
-       cpmac_hw_start(priv->dev);
--      napi_enable(&priv->napi);
--      netif_start_queue(priv->dev);
-+      barrier();
-+      atomic_dec(&priv->reset_pending);
-+      
-+      for (i = 0; i < CPMAC_QUEUES; i++) {
-+              netif_wake_subqueue(priv->dev, i);
-+      }
-+      netif_wake_queue(priv->dev);
-+      cpmac_write(priv->regs, CPMAC_MAC_INT_ENABLE, 3);
-+}
-+
-+static void cpmac_check_status(struct net_device *dev)
-+{
-+      struct cpmac_priv *priv = netdev_priv(dev);
-+
-+      u32 macstatus = cpmac_read(priv->regs, CPMAC_MAC_STATUS);
-+      int rx_channel = (macstatus >> 8) & 7;
-+      int rx_code = (macstatus >> 12) & 15;
-+      int tx_channel = (macstatus >> 16) & 7;
-+      int tx_code = (macstatus >> 20) & 15;
-+
-+      if (rx_code || tx_code) {
-+              if (netif_msg_drv(priv) && net_ratelimit()) {
-+                      /* Can't find any documentation on what these error codes actually are.
-+                       * So just log them and hope..
-+                       */
-+                      if (rx_code)
-+                              printk(KERN_WARNING "%s: host error %d on rx channel %d (macstatus %08x), resetting\n",
-+                                     dev->name, rx_code, rx_channel, macstatus);
-+                      if (tx_code)
-+                              printk(KERN_WARNING "%s: host error %d on tx channel %d (macstatus %08x), resetting\n",
-+                                     dev->name, tx_code, tx_channel, macstatus);
-+              }
-+              
-+              netif_stop_queue(dev);
-+              cpmac_hw_stop(dev);
-+              if (schedule_work(&priv->reset_work))
-+                      atomic_inc(&priv->reset_pending);
-+              if (unlikely(netif_msg_hw(priv)))
-+                      cpmac_dump_regs(dev);
-+      }
-+      cpmac_write(priv->regs, CPMAC_MAC_INT_CLEAR, 0xff);
- }
- static irqreturn_t cpmac_irq(int irq, void *dev_id)
-@@ -682,49 +726,33 @@
-       cpmac_write(priv->regs, CPMAC_MAC_EOI_VECTOR, 0);
--      if (unlikely(status & (MAC_INT_HOST | MAC_INT_STATUS))) {
--              if (netif_msg_drv(priv) && net_ratelimit())
--                      printk(KERN_ERR "%s: hw error, resetting...\n",
--                             dev->name);
--              netif_stop_queue(dev);
--              napi_disable(&priv->napi);
--              cpmac_hw_stop(dev);
--              schedule_work(&priv->reset_work);
--              if (unlikely(netif_msg_hw(priv)))
--                      cpmac_dump_regs(dev);
--      }
-+      if (unlikely(status & (MAC_INT_HOST | MAC_INT_STATUS)))
-+              cpmac_check_status(dev);
-       return IRQ_HANDLED;
- }
- static void cpmac_tx_timeout(struct net_device *dev)
- {
--      struct cpmac_priv *priv = netdev_priv(dev);
-       int i;
-+      struct cpmac_priv *priv = netdev_priv(dev);
-       spin_lock(&priv->lock);
-       dev->stats.tx_errors++;
-       spin_unlock(&priv->lock);
-       if (netif_msg_tx_err(priv) && net_ratelimit())
-               printk(KERN_WARNING "%s: transmit timeout\n", dev->name);
--      /* 
--       * FIXME: waking up random queue is not the best thing to
--       * do... on the other hand why we got here at all?
--       */
--#ifdef CONFIG_NETDEVICES_MULTIQUEUE
--      for (i = 0; i < CPMAC_QUEUES; i++)
--              if (priv->desc_ring[i].skb) {
--                      priv->desc_ring[i].dataflags = 0;
--                      dev_kfree_skb_any(priv->desc_ring[i].skb);
--                      netif_wake_subqueue(dev, i);
--                      break;
--              }
--#else
--      priv->desc_ring[0].dataflags = 0;
--      if (priv->desc_ring[0].skb)
--              dev_kfree_skb_any(priv->desc_ring[0].skb);
--      netif_wake_queue(dev);
--#endif
-+
-+      atomic_inc(&priv->reset_pending);
-+      barrier();
-+      cpmac_clear_tx(dev);
-+      barrier();
-+      atomic_dec(&priv->reset_pending);
-+
-+      netif_wake_queue(priv->dev);
-+      for (i = 0; i < CPMAC_QUEUES; i++) {
-+              netif_wake_subqueue(dev, i);
-+      }
- }
- static int cpmac_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
-@@ -911,6 +939,7 @@
-               goto fail_irq;
-       }
-+      atomic_set(&priv->reset_pending, 0);
-       INIT_WORK(&priv->reset_work, cpmac_hw_error);
-       cpmac_hw_start(dev);
diff --git a/target/linux/ar7/patches-2.6.25/150-cpmac_not_broken.patch b/target/linux/ar7/patches-2.6.25/150-cpmac_not_broken.patch
deleted file mode 100644 (file)
index 6444cac..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -1874,7 +1874,7 @@
- config CPMAC
-       tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
--      depends on NET_ETHERNET && EXPERIMENTAL && AR7 && BROKEN
-+      depends on NET_ETHERNET && EXPERIMENTAL && AR7
-       select PHYLIB
-       help
-         TI AR7 CPMAC Ethernet support
diff --git a/target/linux/ar7/patches-2.6.25/150-cpmac_up_and_running.diff b/target/linux/ar7/patches-2.6.25/150-cpmac_up_and_running.diff
deleted file mode 100644 (file)
index f0f153b..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-From 0daaa095cefd9d7091a7ccce2ff89f1ff4feae7a Mon Sep 17 00:00:00 2001
-From: Anton Vorontsov <avorontsov@ru.mvista.com>
-Date: Wed, 5 Mar 2008 14:52:26 +0300
-Subject: [PATCH] AR7/cpmac: convert to new fixed phy infrastructure, now for real
-
-This patch converts platform code to register fixed phys early.
-cpmac driver modified to blindly accept fixed phy id (that is equal
-to platform device id).
-
-Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
----
- arch/mips/ar7/platform.c |   17 +++++++++++++++++
- drivers/net/cpmac.c      |   19 +++----------------
- 2 files changed, 20 insertions(+), 16 deletions(-)
-
---- a/arch/mips/ar7/platform.c
-+++ b/arch/mips/ar7/platform.c
-@@ -33,6 +33,8 @@
- #include <linux/vlynq.h>
- #include <linux/leds.h>
- #include <linux/string.h>
-+#include <linux/phy.h>
-+#include <linux/phy_fixed.h>
- #include <asm/addrspace.h>
- #include <asm/ar7/ar7.h>
-@@ -205,6 +207,13 @@
-       .width = 2,
- };
-+/* lets assume this is suitable for both high and low cpmacs links */
-+static struct fixed_phy_status fixed_phy_status __initdata = {
-+      .link = 1,
-+      .speed = 100,
-+      .duplex = 1,
-+};
-+
- static struct plat_cpmac_data cpmac_low_data = {
-       .reset_bit = 17,
-       .power_bit = 20,
-@@ -506,6 +515,10 @@
-       }
-       if (ar7_has_high_cpmac()) {
-+              res = fixed_phy_add(PHY_POLL, cpmac_high.id, &fixed_phy_status);
-+              if (res && res != -ENODEV)
-+                      return res;
-+
-               cpmac_get_mac(1, cpmac_high_data.dev_addr);
-               res = platform_device_register(&cpmac_high);
-               if (res)
-@@ -514,6 +527,10 @@
-               cpmac_low_data.phy_mask = 0xffffffff;
-       }
-+      res = fixed_phy_add(PHY_POLL, cpmac_low.id, &fixed_phy_status);
-+      if (res && res != -ENODEV)
-+              return res;
-+
-       cpmac_get_mac(0, cpmac_low_data.dev_addr);
-       res = platform_device_register(&cpmac_low);
-       if (res)
---- a/drivers/net/cpmac.c
-+++ b/drivers/net/cpmac.c
-@@ -1035,23 +1035,10 @@
-       if (phy_id == PHY_MAX_ADDR) {
-               if (external_switch || dumb_switch) {
--                      struct fixed_phy_status status = {};
--
--                      mdio_bus_id = 0;
--
--                      /*
--                       * FIXME: this should be in the platform code!
--                       * Since there is not platform code at all (that is,
--                       * no mainline users of that driver), place it here
--                       * for now.
--                       */
--                      phy_id = 0;
--                      status.link = 1;
--                      status.duplex = 1;
--                      status.speed = 100;
--                      fixed_phy_add(PHY_POLL, phy_id, &status);
-+                      mdio_bus_id = 0; /* fixed phys bus */
-+                      phy_id = pdev->id;
-               } else {
--                      printk(KERN_ERR "cpmac: no PHY present\n");
-+                      dev_err(&pdev->dev, "no PHY present\n");
-                       return -ENODEV;
-               }
-       }
diff --git a/target/linux/ar7/patches-2.6.25/160-cpmac-rx-ring-use-eoq.diff b/target/linux/ar7/patches-2.6.25/160-cpmac-rx-ring-use-eoq.diff
deleted file mode 100644 (file)
index 24d70e7..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
---- a/drivers/net/cpmac.c
-+++ b/drivers/net/cpmac.c
-@@ -187,6 +187,7 @@
- #define CPMAC_EOQ                     0x1000
-       struct sk_buff *skb;
-       struct cpmac_desc *next;
-+      struct cpmac_desc *prev;
-       dma_addr_t mapping;
-       dma_addr_t data_mapping;
- };
-@@ -242,6 +243,16 @@
-       printk("\n");
- }
-+static void cpmac_dump_all_desc(struct net_device *dev)
-+{
-+        struct cpmac_priv *priv = netdev_priv(dev);
-+        struct cpmac_desc *dump = priv->rx_head;
-+        do {
-+                cpmac_dump_desc(dev, dump);
-+                dump = dump->next;
-+        } while (dump != priv->rx_head);
-+}
-+
- static void cpmac_dump_skb(struct net_device *dev, struct sk_buff *skb)
- {
-       int i;
-@@ -413,21 +424,40 @@
- static int cpmac_poll(struct napi_struct *napi, int budget)
- {
-       struct sk_buff *skb;
--      struct cpmac_desc *desc;
--      int received = 0;
-+      struct cpmac_desc *desc, *restart;
-       struct cpmac_priv *priv = container_of(napi, struct cpmac_priv, napi);
-+      int received = 0, processed = 0;
-       spin_lock(&priv->rx_lock);
-       if (unlikely(!priv->rx_head)) {
-               if (netif_msg_rx_err(priv) && net_ratelimit())
-                       printk(KERN_WARNING "%s: rx: polling, but no queue\n",
-                              priv->dev->name);
-+              spin_unlock(&priv->rx_lock);
-               netif_rx_complete(priv->dev, napi);
-               return 0;
-       }
-       desc = priv->rx_head;
-+      restart = NULL;
-       while (((desc->dataflags & CPMAC_OWN) == 0) && (received < budget)) {
-+              processed++;
-+              
-+              if ((desc->dataflags & CPMAC_EOQ) != 0) {
-+                      /* The last update to eoq->hw_next didn't happen soon enough, and the
-+                      * receiver stopped here. Remember this descriptor so we can restart
-+                      * the receiver after freeing some space.
-+                      */
-+                      if (unlikely(restart)) {
-+                              if (netif_msg_rx_err(priv))
-+                                      printk(KERN_ERR "%s: poll found a duplicate EOQ: %p and %p\n",
-+                                              priv->dev->name, restart, desc);
-+                              goto fatal_error;
-+                      }
-+                      
-+                      restart = desc->next;
-+              }
-+
-               skb = cpmac_rx_one(priv, desc);
-               if (likely(skb)) {
-                       netif_receive_skb(skb);
-@@ -436,19 +466,81 @@
-               desc = desc->next;
-       }
-+      if (desc != priv->rx_head) {
-+              /* We freed some buffers, but not the whole ring, add what we did free to the rx list */ 
-+              desc->prev->hw_next = (u32)0;
-+              priv->rx_head->prev->hw_next = priv->rx_head->mapping;
-+      }
-+
-+      /* Optimization: If we did not actually process an EOQ (perhaps because of 
-+      * quota limits), check to see if the tail of the queue has EOQ set. We
-+      * should immediately restart in that case so that the receiver can restart
-+      * and run in parallel with more packet processing. This lets us handle slightly
-+      * larger bursts before running out of ring space (assuming dev->weight < ring_size)
-+      */
-+      if (!restart &&
-+           (priv->rx_head->prev->dataflags & (CPMAC_OWN|CPMAC_EOQ)) == CPMAC_EOQ &&
-+           (priv->rx_head->dataflags & CPMAC_OWN) != 0) {
-+              /* reset EOQ so the poll loop (above) doesn't try to restart this when it
-+              * eventually gets to this descriptor.
-+              */
-+              priv->rx_head->prev->dataflags &= ~CPMAC_EOQ;
-+              restart = priv->rx_head;
-+      }
-+
-+      if (restart) {
-+              priv->dev->stats.rx_errors++;
-+              priv->dev->stats.rx_fifo_errors++;
-+              if (netif_msg_rx_err(priv) && net_ratelimit())
-+                      printk(KERN_WARNING "%s: rx dma ring overrun\n", priv->dev->name);
-+
-+              if (unlikely((restart->dataflags & CPMAC_OWN) == 0)) {
-+                      if (netif_msg_drv(priv))
-+                              printk(KERN_ERR "%s: cpmac_poll is trying to restart rx from a descriptor that's not free: %p\n",
-+                                      priv->dev->name, restart);
-+                              goto fatal_error;
-+              }
-+
-+              cpmac_write(priv->regs, CPMAC_RX_PTR(0), restart->mapping);
-+      }
-+
-       priv->rx_head = desc;
-       spin_unlock(&priv->rx_lock);
-       if (unlikely(netif_msg_rx_status(priv)))
-               printk(KERN_DEBUG "%s: poll processed %d packets\n",
-                      priv->dev->name, received);
--      if (desc->dataflags & CPMAC_OWN) {
-+      if (processed == 0) {
-+              /* we ran out of packets to read, revert to interrupt-driven mode */ 
-               netif_rx_complete(priv->dev, napi);
--              cpmac_write(priv->regs, CPMAC_RX_PTR(0), (u32)desc->mapping);
-               cpmac_write(priv->regs, CPMAC_RX_INT_ENABLE, 1);
-               return 0;
-       }
-       return 1;
-+
-+fatal_error:
-+      /* Something went horribly wrong. Reset hardware to try to recover rather than wedging. */ 
-+      
-+      if (netif_msg_drv(priv)) {
-+              printk(KERN_ERR "%s: cpmac_poll is confused. Resetting hardware\n", priv->dev->name);
-+              cpmac_dump_all_desc(priv->dev);
-+              printk(KERN_DEBUG "%s: RX_PTR(0)=0x%08x RX_ACK(0)=0x%08x\n",
-+                      priv->dev->name,
-+                      cpmac_read(priv->regs, CPMAC_RX_PTR(0)),
-+                      cpmac_read(priv->regs, CPMAC_RX_ACK(0)));
-+      }
-+
-+      spin_unlock(&priv->rx_lock);
-+      netif_rx_complete(priv->dev, napi);
-+      netif_stop_queue(priv->dev);
-+      napi_disable(&priv->napi);
-+      
-+      atomic_inc(&priv->reset_pending);
-+      cpmac_hw_stop(priv->dev);
-+      if (!schedule_work(&priv->reset_work))
-+              atomic_dec(&priv->reset_pending);
-+      return 0;
-+ 
- }
- static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
-@@ -625,8 +717,10 @@
-                       desc->dataflags = CPMAC_OWN;
-                       dev->stats.rx_dropped++;
-               }
-+              desc->hw_next = desc->next->mapping;
-               desc = desc->next;
-       }
-+      priv->rx_head->prev->hw_next = 0;
- }
- static void cpmac_clear_tx(struct net_device *dev)
-@@ -928,9 +1022,12 @@
-               desc->buflen = CPMAC_SKB_SIZE;
-               desc->dataflags = CPMAC_OWN;
-               desc->next = &priv->rx_head[(i + 1) % priv->ring_size];
-+              desc->next->prev = desc;
-               desc->hw_next = (u32)desc->next->mapping;
-       }
-+      priv->rx_head->prev->hw_next = (u32)0;
-+
-       if ((res = request_irq(dev->irq, cpmac_irq, IRQF_SHARED,
-                              dev->name, dev))) {
-               if (netif_msg_drv(priv))
diff --git a/target/linux/ar7/patches-2.6.25/170-cpmac_eth_fix.patch b/target/linux/ar7/patches-2.6.25/170-cpmac_eth_fix.patch
deleted file mode 100644 (file)
index 0942b1c..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/drivers/net/cpmac.c
-+++ b/drivers/net/cpmac.c
-@@ -1178,9 +1178,7 @@
-       priv->msg_enable = netif_msg_init(debug_level, 0xff);
-       memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr));
--      snprintf(priv->phy_name, BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id);
--
--      priv->phy = phy_connect(dev, priv->phy_name, &cpmac_adjust_link, 0,
-+      priv->phy = phy_connect(dev, cpmac_mii.phy_map[phy_id]->dev.bus_id, &cpmac_adjust_link, 0,
-                               PHY_INTERFACE_MODE_MII);
-       if (IS_ERR(priv->phy)) {
-               if (netif_msg_drv(priv))
diff --git a/target/linux/ar7/patches-2.6.25/200-mtd_fixes.patch b/target/linux/ar7/patches-2.6.25/200-mtd_fixes.patch
deleted file mode 100644 (file)
index 850a643..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/drivers/mtd/ar7part.c
-+++ b/drivers/mtd/ar7part.c
-@@ -34,6 +34,10 @@
- #define LOADER_MAGIC1 le32_to_cpu(0xfeedfa42)
- #define LOADER_MAGIC2 le32_to_cpu(0xfeed1281)
-+#ifndef SQUASHFS_MAGIC
-+#define SQUASHFS_MAGIC        0x73717368
-+#endif
-+
- struct ar7_bin_rec {
-       unsigned int checksum;
-       unsigned int length;
-@@ -47,7 +51,8 @@
-                                unsigned long origin)
- {
-       struct ar7_bin_rec header;
--      unsigned int offset, len;
-+      unsigned int offset;
-+      size_t len;
-       unsigned int pre_size = master->erasesize, post_size = 0;
-       unsigned int root_offset = ROOT_OFFSET;
-@@ -66,7 +71,7 @@
-       do { /* Try 10 blocks starting from master->erasesize */
-               offset = pre_size;
-               master->read(master, offset,
--                      sizeof(header), &len, (u8 *)&header);
-+                           sizeof(header), &len, (uint8_t *)&header);
-               if (!strncmp((char *)&header, "TIENV0.8", 8))
-                       ar7_parts[1].offset = pre_size;
-               if (header.checksum == LOADER_MAGIC1)
-@@ -88,7 +93,7 @@
-               while (header.length) {
-                       offset += sizeof(header) + header.length;
-                       master->read(master, offset, sizeof(header),
--                                   &len, (u8 *)&header);
-+                                   &len, (uint8_t *)&header);
-               }
-               root_offset = offset + sizeof(header) + 4;
-               break;
-@@ -96,10 +101,10 @@
-               while (header.length) {
-                       offset += sizeof(header) + header.length;
-                       master->read(master, offset, sizeof(header),
--                                   &len, (u8 *)&header);
-+                                   &len, (uint8_t *)&header);
-               }
-               root_offset = offset + sizeof(header) + 4 + 0xff;
--              root_offset &= ~(u32)0xff;
-+              root_offset &= ~(uint32_t)0xff;
-               break;
-       default:
-               printk(KERN_WARNING "Unknown magic: %08x\n", header.checksum);
diff --git a/target/linux/ar7/patches-2.6.25/500-serial_kludge.patch b/target/linux/ar7/patches-2.6.25/500-serial_kludge.patch
deleted file mode 100644 (file)
index 26b4b3e..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/drivers/serial/8250.c
-+++ b/drivers/serial/8250.c
-@@ -267,6 +267,13 @@
-               .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
-               .flags          = UART_CAP_FIFO,
-       },
-+      [PORT_AR7] = {
-+              .name           = "TI-AR7",
-+              .fifo_size      = 16,
-+              .tx_loadsz      = 16,
-+              .fcr            = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_00,
-+              .flags          = UART_CAP_FIFO | UART_CAP_AFE,
-+      },
- };
- #if defined (CONFIG_SERIAL_8250_AU1X00)
-@@ -2457,7 +2464,11 @@
- {
-       struct uart_8250_port *up = (struct uart_8250_port *)port;
-+#ifdef CONFIG_AR7
-+      wait_for_xmitr(up, BOTH_EMPTY);
-+#else
-       wait_for_xmitr(up, UART_LSR_THRE);
-+#endif
-       serial_out(up, UART_TX, ch);
- }
---- a/include/linux/serial_core.h
-+++ b/include/linux/serial_core.h
-@@ -40,7 +40,8 @@
- #define PORT_NS16550A 14
- #define PORT_XSCALE   15
- #define PORT_RM9000   16      /* PMC-Sierra RM9xxx internal UART */
--#define PORT_MAX_8250 16      /* max port ID */
-+#define PORT_AR7      17
-+#define PORT_MAX_8250 17      /* max port ID */
- /*
-  * ARM specific type numbers.  These are not currently guaranteed
diff --git a/target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff b/target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff
deleted file mode 100644 (file)
index 7da22cd..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/drivers/net/cpmac.c
-+++ b/drivers/net/cpmac.c
-@@ -936,7 +936,8 @@
-       int new_state = 0;
-       spin_lock(&priv->lock);
--      if (priv->phy->link) {
-+      if (1 /* priv->phy->link */) {
-+              netif_carrier_on(dev);
-               netif_start_queue(dev);
-               if (priv->phy->duplex != priv->oldduplex) {
-                       new_state = 1;
-@@ -948,11 +949,11 @@
-                       priv->oldspeed = priv->phy->speed;
-               }
--              if (!priv->oldlink) {
-+              /*if (!priv->oldlink) {
-                       new_state = 1;
--                      priv->oldlink = 1;
-+                      priv->oldlink = 1;*/
-                       netif_schedule(dev);
--              }
-+              /*}*/
-       } else if (priv->oldlink) {
-               netif_stop_queue(dev);
-               new_state = 1;
diff --git a/target/linux/at91/config-2.6.21 b/target/linux/at91/config-2.6.21
deleted file mode 100644 (file)
index dc402dc..0000000
+++ /dev/null
@@ -1,299 +0,0 @@
-# CONFIG_AEABI is not set
-CONFIG_ALIGNMENT_TRAP=y
-# CONFIG_ARCH_AAEC2000 is not set
-CONFIG_ARCH_AT91=y
-CONFIG_ARCH_AT91RM9200=y
-# CONFIG_ARCH_AT91RM9200DK is not set
-# CONFIG_ARCH_AT91SAM9260 is not set
-# CONFIG_ARCH_AT91SAM9261 is not set
-# CONFIG_ARCH_AT91SAM9263 is not set
-# CONFIG_ARCH_AT91SAM9RL is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_CLPS7500 is not set
-# CONFIG_ARCH_CO285 is not set
-# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_VERSATILE is not set
-CONFIG_ARM=y
-CONFIG_ARM_AT91_ETHER=y
-CONFIG_ARM_THUMB=y
-# CONFIG_ARPD is not set
-# CONFIG_ARTHUR is not set
-# CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set
-CONFIG_AT91_SPI=y
-# CONFIG_AT91_SPIDEV is not set
-CONFIG_AT91_VLIO=y
-# CONFIG_ATMEL_TCLIB is not set
-# CONFIG_ATM_DUMMY is not set
-# CONFIG_ATM_TCP is not set
-CONFIG_BASE_SMALL=0
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BITREVERSE=y
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-# CONFIG_BONDING is not set
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_BT is not set
-# CONFIG_CIFS_STATS is not set
-# CONFIG_CLS_U32_MARK is not set
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_CONFIGFS_FS is not set
-CONFIG_CPU_32=y
-CONFIG_CPU_32v4T=y
-CONFIG_CPU_ABRT_EV4T=y
-CONFIG_CPU_ARM920T=y
-CONFIG_CPU_CACHE_V4WT=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_COPY_V4WB=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-# CONFIG_CPU_ICACHE_DISABLE is not set
-CONFIG_CPU_TLB_V4WBI=y
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_BLKCIPHER is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_CBC is not set
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_DES is not set
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HMAC=y
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_CRYPTO_MD5 is not set
-# CONFIG_CRYPTO_NULL is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_SHA256 is not set
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TEST is not set
-# CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-# CONFIG_CRYPTO_WP512 is not set
-CONFIG_DAVICOM_PHY=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_USER is not set
-# CONFIG_DM9000 is not set
-CONFIG_DUMMY_CONSOLE=y
-# CONFIG_FIXED_PHY is not set
-# CONFIG_FPE_FASTFPE is not set
-CONFIG_FPE_NWFPE=y
-# CONFIG_FPE_NWFPE_XP is not set
-CONFIG_FRAME_POINTER=y
-CONFIG_FS_POSIX_ACL=y
-# CONFIG_FW_LOADER is not set
-CONFIG_GENERIC_GPIO=y
-# CONFIG_GENERIC_TIME is not set
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HID=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-# CONFIG_I2C is not set
-# CONFIG_IEEE80211 is not set
-# CONFIG_IKCONFIG is not set
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INPUT=y
-# CONFIG_INPUT_EVDEV is not set
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_IP6_NF_MATCH_FRAG is not set
-# CONFIG_IP6_NF_MATCH_HL is not set
-# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
-# CONFIG_IP6_NF_MATCH_OPTS is not set
-# CONFIG_IP6_NF_MATCH_RT is not set
-# CONFIG_IP6_NF_RAW is not set
-# CONFIG_IP6_NF_TARGET_HL is not set
-# CONFIG_IP6_NF_TARGET_LOG is not set
-# CONFIG_IP_DCCP is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
-# CONFIG_IP_NF_TARGET_LOG is not set
-# CONFIG_IP_NF_TARGET_NETMAP is not set
-# CONFIG_IP_NF_TARGET_SAME is not set
-# CONFIG_IP_ROUTE_VERBOSE is not set
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_LEDS=y
-CONFIG_LEDS_CPU=y
-CONFIG_LEDS_TIMER=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=32
-# CONFIG_LIBCRC32C is not set
-# CONFIG_LLC2 is not set
-# CONFIG_MACH_AT91RM9200EK is not set
-# CONFIG_MACH_ATEB9200 is not set
-# CONFIG_MACH_CARMEVA is not set
-# CONFIG_MACH_CHUB is not set
-# CONFIG_MACH_CSB337 is not set
-# CONFIG_MACH_CSB637 is not set
-# CONFIG_MACH_KAFA is not set
-# CONFIG_MACH_KB9200 is not set
-# CONFIG_MACH_ONEARM is not set
-CONFIG_MACH_VLINK=y
-# CONFIG_MMC is not set
-# CONFIG_MMC_AT91 is not set
-# CONFIG_MMC_BLOCK is not set
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MTD=y
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_AFS_PARTS is not set
-CONFIG_MTD_AT91_DATAFLASH=y
-CONFIG_MTD_AT91_PARTS=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_BLOCK2MTD is not set
-# CONFIG_MTD_CFI is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_CMDLINE_PARTS=y
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
-# CONFIG_MTD_ONENAND is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ROOTFS_ROOT_DEV is not set
-# CONFIG_MTD_ROOTFS_SPLIT is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_NET_EMATCH is not set
-# CONFIG_NET_IPGRE_BROADCAST is not set
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_RADIO is not set
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_NET_SCH_NETEM is not set
-# CONFIG_NEW_LEDS is not set
-# CONFIG_NO_IDLE_HZ is not set
-# CONFIG_NO_IOPORT is not set
-# CONFIG_NVRAM is not set
-# CONFIG_OUTER_CACHE is not set
-CONFIG_PHYLIB=y
-# CONFIG_PNPACPI is not set
-# CONFIG_PPPOATM is not set
-# CONFIG_PPP_MULTILINK is not set
-# CONFIG_PPP_SYNC_TTY is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_RTC_LIB=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_ATMEL=y
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-# CONFIG_SERIAL_ATMEL_TTYAT is not set
-CONFIG_SERIO=y
-# CONFIG_SERIO_LIBPS2 is not set
-CONFIG_SERIO_RAW=y
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SMC91X is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_SOUND is not set
-# CONFIG_SPARSEMEM_STATIC is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4096
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_UID16=y
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-# CONFIG_USB_ATM is not set
-# CONFIG_USB_CATC is not set
-# CONFIG_USB_GTCO is not set
-# CONFIG_USB_KAWETH is not set
-CONFIG_USB_MON=y
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-# CONFIG_USB_OHCI_HCD is not set
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_SERIAL_EDGEPORT is not set
-# CONFIG_USB_SERIAL_EDGEPORT_TI is not set
-# CONFIG_USB_SERIAL_FUNSOFT is not set
-# CONFIG_USB_SERIAL_GARMIN is not set
-# CONFIG_USB_SERIAL_IPAQ is not set
-# CONFIG_USB_SERIAL_IPW is not set
-# CONFIG_USB_SERIAL_IR is not set
-# CONFIG_USB_SERIAL_KEYSPAN is not set
-# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set
-# CONFIG_USB_SERIAL_KLSI is not set
-# CONFIG_USB_SERIAL_KOBIL_SCT is not set
-# CONFIG_USB_SERIAL_MCT_U232 is not set
-# CONFIG_USB_SERIAL_OMNINET is not set
-# CONFIG_USB_SERIAL_SAFE is not set
-# CONFIG_USB_SERIAL_VISOR is not set
-# CONFIG_USB_STORAGE_ALAUDA is not set
-# CONFIG_USB_STORAGE_DATAFAB is not set
-# CONFIG_USB_STORAGE_DPCM is not set
-# CONFIG_USB_STORAGE_FREECOM is not set
-# CONFIG_USB_STORAGE_JUMPSHOT is not set
-# CONFIG_USB_STORAGE_KARMA is not set
-# CONFIG_USB_STORAGE_SDDR09 is not set
-# CONFIG_USB_STORAGE_SDDR55 is not set
-# CONFIG_USB_STORAGE_USBAT is not set
-# CONFIG_USB_USBNET is not set
-# CONFIG_USB_USBNET_MII is not set
-# CONFIG_USB_YEALINK is not set
-CONFIG_VECTORS_BASE=0xffff0000
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-# CONFIG_WATCHDOG is not set
-# CONFIG_XIP_KERNEL is not set
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_ZBOOT_ROM_TEXT=0x0
diff --git a/target/linux/at91/patches-2.6.21/000-at91patches.patch b/target/linux/at91/patches-2.6.21/000-at91patches.patch
deleted file mode 100644 (file)
index 09cdcf7..0000000
+++ /dev/null
@@ -1,10403 +0,0 @@
-Index: linux-2.6.21.7/arch/arm/boot/compressed/head-at91rm9200.S
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/boot/compressed/head-at91rm9200.S
-+++ linux-2.6.21.7/arch/arm/boot/compressed/head-at91rm9200.S
-@@ -67,6 +67,12 @@
-               cmp     r7, r3
-               beq     99f
-+              @ Promwad Chub : 1181
-+              mov     r3,     #(MACH_TYPE_CHUB & 0xff)
-+              orr     r3, r3, #(MACH_TYPE_CHUB & 0xff00)
-+              cmp     r7, r3
-+              beq     99f
-+
-               @ Unknown board, use the AT91RM9200DK board
-               @ mov   r7, #MACH_TYPE_AT91RM9200
-               mov     r7,     #(MACH_TYPE_AT91RM9200DK & 0xff)
-Index: linux-2.6.21.7/arch/arm/mach-at91/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/Kconfig
-+++ linux-2.6.21.7/arch/arm/mach-at91/Kconfig
-@@ -17,6 +17,9 @@ config ARCH_AT91SAM9261
- config ARCH_AT91SAM9263
-       bool "AT91SAM9263"
-+config ARCH_AT91SAM9RL
-+      bool "AT91SAM9RL"
-+
- endchoice
- # ----------------------------------------------------------
-@@ -87,6 +90,12 @@ config MACH_KAFA
-       help
-         Select this if you are using Sperry-Sun's KAFA board.
-+config MACH_CHUB
-+      bool "Promwad Chub board"
-+      depends on ARCH_AT91RM9200
-+      help
-+        Select this if you are using Promwad's Chub board.
-+
- endif
- # ----------------------------------------------------------
-@@ -111,6 +120,13 @@ config MACH_AT91SAM9260EK
-         Select this if you are using Atmel's AT91SAM9260-EK or AT91SAM9XE Evaluation Kit
-         <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3933>
-+config MACH_CAM60
-+      bool "KwikByte CAM60 board"
-+      depends on ARCH_AT91SAM9260
-+      help
-+        Select this if you are using KwikByte's CAM60 board based on the Atmel AT91SAM9260.
-+        <http://www.kwikbyte.com>
-+
- endif
- # ----------------------------------------------------------
-@@ -145,6 +161,20 @@ endif
- # ----------------------------------------------------------
-+if ARCH_AT91SAM9RL
-+
-+comment "AT91SAM9RL Board Type"
-+
-+config MACH_AT91SAM9RLEK
-+      bool "Atmel AT91SAM9RL-EK Evaluation Kit"
-+      depends on ARCH_AT91SAM9RL
-+      help
-+        Select this if you are using Atmel's AT91SAM9RL-EK Evaluation Kit.
-+
-+endif
-+
-+# ----------------------------------------------------------
-+
- comment "AT91 Board Options"
- config MTD_AT91_DATAFLASH_CARD
-@@ -160,6 +190,20 @@ config MTD_NAND_AT91_BUSWIDTH_16
-         On AT91SAM926x boards both types of NAND flash can be present
-         (8 and 16 bit data bus width).
-+config CSB300_WAKE_SW0
-+      bool "CSB300 SW0 irq0 wakeup"
-+      depends on MACH_CSB337 && PM
-+      help
-+        If you have a CSB300 connected to your CSB337, this lets
-+        SW0 serve as a wakeup button.  It uses IRQ0.
-+
-+config CSB300_WAKE_SW1
-+      bool "CSB300 SW1 gpio wakeup"
-+      depends on MACH_CSB337 && PM
-+      help
-+        If you have a CSB300 connected to your CSB337, this lets
-+        SW1 serve as a wakeup button.  It uses GPIO.
-+
- # ----------------------------------------------------------
- comment "AT91 Feature Selections"
-@@ -170,6 +214,20 @@ config AT91_PROGRAMMABLE_CLOCKS
-         Select this if you need to program one or more of the PCK0..PCK3
-         programmable clock outputs.
-+config ATMEL_TCLIB
-+      bool "Timer/Counter Library"
-+      help
-+        Select this if you want a library to allocate the Timer/Counter
-+        blocks found on many Atmel processors.  This facilitates using
-+        these modules despite processor differences.
-+
-+config AT91_SLOW_CLOCK
-+      bool "Suspend-to-RAM uses slow clock mode (EXPERIMENTAL)"
-+      depends on PM && EXPERIMENTAL
-+      help
-+        Select this if you wish to put the CPU into slow clock mode
-+        while in the "Suspend to RAM" state, to save more power.
-+
- endmenu
- endif
-Index: linux-2.6.21.7/arch/arm/mach-at91/Makefile
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/Makefile
-+++ linux-2.6.21.7/arch/arm/mach-at91/Makefile
-@@ -8,12 +8,15 @@ obj-n                :=
- obj-          :=
- obj-$(CONFIG_PM)              += pm.o
-+obj-$(CONFIG_AT91_SLOW_CLOCK) += pm_slowclock.o
-+obj-$(CONFIG_ATMEL_TCLIB)     += tclib.o
- # CPU-specific support
- obj-$(CONFIG_ARCH_AT91RM9200) += at91rm9200.o at91rm9200_time.o at91rm9200_devices.o
- obj-$(CONFIG_ARCH_AT91SAM9260)        += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o
- obj-$(CONFIG_ARCH_AT91SAM9261)        += at91sam9261.o at91sam926x_time.o at91sam9261_devices.o
- obj-$(CONFIG_ARCH_AT91SAM9263)        += at91sam9263.o at91sam926x_time.o at91sam9263_devices.o
-+obj-$(CONFIG_ARCH_AT91SAM9RL) += at91sam9rl.o at91sam926x_time.o at91sam9rl_devices.o
- # AT91RM9200 board-specific support
- obj-$(CONFIG_MACH_ONEARM)     += board-1arm.o
-@@ -25,9 +28,11 @@ obj-$(CONFIG_MACH_CARMEVA)  += board-carm
- obj-$(CONFIG_MACH_KB9200)     += board-kb9202.o
- obj-$(CONFIG_MACH_ATEB9200)   += board-eb9200.o
- obj-$(CONFIG_MACH_KAFA)               += board-kafa.o
-+obj-$(CONFIG_MACH_CHUB)               += board-chub.o
- # AT91SAM9260 board-specific support
- obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o
-+obj-$(CONFIG_MACH_CAM60)      += board-cam60.o
- # AT91SAM9261 board-specific support
- obj-$(CONFIG_MACH_AT91SAM9261EK) += board-sam9261ek.o
-@@ -35,9 +40,13 @@ obj-$(CONFIG_MACH_AT91SAM9261EK) += boar
- # AT91SAM9263 board-specific support
- obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o
-+# AT91SAM9RL board-specific support
-+obj-$(CONFIG_MACH_AT91SAM9RLEK)       += board-sam9rlek.o
-+
- # LEDs support
- led-$(CONFIG_ARCH_AT91RM9200DK)       += leds.o
- led-$(CONFIG_MACH_AT91RM9200EK)       += leds.o
-+led-$(CONFIG_MACH_AT91SAM9261EK)+= leds.o
- led-$(CONFIG_MACH_CSB337)     += leds.o
- led-$(CONFIG_MACH_CSB637)     += leds.o
- led-$(CONFIG_MACH_KB9200)     += leds.o
-@@ -45,7 +54,7 @@ led-$(CONFIG_MACH_KAFA)              += leds.o
- obj-$(CONFIG_LEDS) += $(led-y)
- # VGA support
--#obj-$(CONFIG_FB_S1D13XXX)    += ics1523.o
-+obj-$(CONFIG_FB_S1D13XXX)     += ics1523.o
- ifeq ($(CONFIG_PM_DEBUG),y)
-Index: linux-2.6.21.7/arch/arm/mach-at91/at91rm9200.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/at91rm9200.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/at91rm9200.c
-@@ -117,6 +117,21 @@ static struct clk pioD_clk = {
-       .pmc_mask       = 1 << AT91RM9200_ID_PIOD,
-       .type           = CLK_TYPE_PERIPHERAL,
- };
-+static struct clk ssc0_clk = {
-+      .name           = "ssc0_clk",
-+      .pmc_mask       = 1 << AT91RM9200_ID_SSC0,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk ssc1_clk = {
-+      .name           = "ssc1_clk",
-+      .pmc_mask       = 1 << AT91RM9200_ID_SSC1,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk ssc2_clk = {
-+      .name           = "ssc2_clk",
-+      .pmc_mask       = 1 << AT91RM9200_ID_SSC2,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
- static struct clk tc0_clk = {
-       .name           = "tc0_clk",
-       .pmc_mask       = 1 << AT91RM9200_ID_TC0,
-@@ -161,7 +176,9 @@ static struct clk *periph_clocks[] __ini
-       &udc_clk,
-       &twi_clk,
-       &spi_clk,
--      // ssc 0 .. ssc2
-+      &ssc0_clk,
-+      &ssc1_clk,
-+      &ssc2_clk,
-       &tc0_clk,
-       &tc1_clk,
-       &tc2_clk,
-@@ -250,6 +267,33 @@ static void at91rm9200_reset(void)
- /* --------------------------------------------------------------------
-+ *  Timer/Counter library initialization
-+ * -------------------------------------------------------------------- */
-+#ifdef CONFIG_ATMEL_TCLIB
-+
-+#include "tclib.h"
-+
-+static struct atmel_tcblock at91rm9200_tcblocks[] = {
-+      [0] = {
-+              .physaddr       = AT91RM9200_BASE_TCB0,
-+              .irq            = { AT91RM9200_ID_TC0, AT91RM9200_ID_TC1, AT91RM9200_ID_TC2 },
-+              .clk            = { &tc0_clk, &tc1_clk, &tc2_clk },
-+      },
-+      [1] = {
-+              .physaddr       = AT91RM9200_BASE_TCB1,
-+              .irq            = { AT91RM9200_ID_TC3, AT91RM9200_ID_TC4, AT91RM9200_ID_TC5 },
-+              .clk            = { &tc3_clk, &tc4_clk, &tc5_clk },
-+      },
-+};
-+
-+#define at91rm9200_tc_init()  atmel_tc_init(at91rm9200_tcblocks, ARRAY_SIZE(at91rm9200_tcblocks))
-+
-+#else
-+#define at91rm9200_tc_init()  do {} while(0)
-+#endif
-+
-+
-+/* --------------------------------------------------------------------
-  *  AT91RM9200 processor initialization
-  * -------------------------------------------------------------------- */
- void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks)
-@@ -271,6 +315,9 @@ void __init at91rm9200_initialize(unsign
-       /* Initialize GPIO subsystem */
-       at91_gpio_init(at91rm9200_gpio, banks);
-+
-+      /* Initialize the Timer/Counter blocks */
-+      at91rm9200_tc_init();
- }
-@@ -284,28 +331,28 @@ void __init at91rm9200_initialize(unsign
- static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = {
-       7,      /* Advanced Interrupt Controller (FIQ) */
-       7,      /* System Peripherals */
--      0,      /* Parallel IO Controller A */
--      0,      /* Parallel IO Controller B */
--      0,      /* Parallel IO Controller C */
--      0,      /* Parallel IO Controller D */
--      6,      /* USART 0 */
--      6,      /* USART 1 */
--      6,      /* USART 2 */
--      6,      /* USART 3 */
-+      1,      /* Parallel IO Controller A */
-+      1,      /* Parallel IO Controller B */
-+      1,      /* Parallel IO Controller C */
-+      1,      /* Parallel IO Controller D */
-+      5,      /* USART 0 */
-+      5,      /* USART 1 */
-+      5,      /* USART 2 */
-+      5,      /* USART 3 */
-       0,      /* Multimedia Card Interface */
--      4,      /* USB Device Port */
--      0,      /* Two-Wire Interface */
--      6,      /* Serial Peripheral Interface */
--      5,      /* Serial Synchronous Controller 0 */
--      5,      /* Serial Synchronous Controller 1 */
--      5,      /* Serial Synchronous Controller 2 */
-+      2,      /* USB Device Port */
-+      6,      /* Two-Wire Interface */
-+      5,      /* Serial Peripheral Interface */
-+      4,      /* Serial Synchronous Controller 0 */
-+      4,      /* Serial Synchronous Controller 1 */
-+      4,      /* Serial Synchronous Controller 2 */
-       0,      /* Timer Counter 0 */
-       0,      /* Timer Counter 1 */
-       0,      /* Timer Counter 2 */
-       0,      /* Timer Counter 3 */
-       0,      /* Timer Counter 4 */
-       0,      /* Timer Counter 5 */
--      3,      /* USB Host port */
-+      2,      /* USB Host port */
-       3,      /* Ethernet MAC */
-       0,      /* Advanced Interrupt Controller (IRQ0) */
-       0,      /* Advanced Interrupt Controller (IRQ1) */
-Index: linux-2.6.21.7/arch/arm/mach-at91/at91rm9200_devices.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/at91rm9200_devices.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/at91rm9200_devices.c
-@@ -480,7 +480,18 @@ void __init at91_add_device_i2c(void) {}
-  *  SPI
-  * -------------------------------------------------------------------- */
--#if defined(CONFIG_SPI_AT91) || defined(CONFIG_SPI_AT91_MODULE) || defined(CONFIG_AT91_SPI) || defined(CONFIG_AT91_SPI_MODULE)
-+#if defined(CONFIG_AT91_SPI) || defined(CONFIG_AT91_SPI_MODULE)               /* legacy SPI driver */
-+#define SPI_DEVNAME   "at91_spi"
-+
-+#elif defined(CONFIG_SPI_AT91) || defined(CONFIG_SPI_AT91_MODULE)     /* SPI bitbanging driver */
-+#define SPI_DEVNAME   "at91_spi"
-+
-+#elif defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE)   /* new SPI driver */
-+#define SPI_DEVNAME   "atmel_spi"
-+
-+#endif
-+
-+#ifdef SPI_DEVNAME
- static u64 spi_dmamask = 0xffffffffUL;
- static struct resource spi_resources[] = {
-@@ -497,7 +508,7 @@ static struct resource spi_resources[] =
- };
- static struct platform_device at91rm9200_spi_device = {
--      .name           = "at91_spi",
-+      .name           = SPI_DEVNAME,
-       .id             = 0,
-       .dev            = {
-                               .dma_mask               = &spi_dmamask,
-@@ -606,6 +617,32 @@ void __init at91_init_leds(u8 cpu_led, u
- #endif
-+#if defined(CONFIG_NEW_LEDS)
-+
-+static struct platform_device at91_leds = {
-+      .name           = "at91_leds",
-+      .id             = -1,
-+};
-+
-+void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr)
-+{
-+      if (!nr)
-+              return;
-+
-+      at91_leds.dev.platform_data = leds;
-+
-+      for ( ; nr; nr--, leds++) {
-+              leds->index = nr;       /* first record stores number of leds */
-+              at91_set_gpio_output(leds->gpio, (leds->flags & 1) == 0);
-+      }
-+
-+      platform_device_register(&at91_leds);
-+}
-+#else
-+void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr) {}
-+#endif
-+
-+
- /* --------------------------------------------------------------------
-  *  UART
-  * -------------------------------------------------------------------- */
-Index: linux-2.6.21.7/arch/arm/mach-at91/at91sam9260.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/at91sam9260.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/at91sam9260.c
-@@ -119,6 +119,11 @@ static struct clk spi1_clk = {
-       .pmc_mask       = 1 << AT91SAM9260_ID_SPI1,
-       .type           = CLK_TYPE_PERIPHERAL,
- };
-+static struct clk ssc_clk = {
-+      .name           = "ssc_clk",
-+      .pmc_mask       = 1 << AT91SAM9260_ID_SSC,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
- static struct clk tc0_clk = {
-       .name           = "tc0_clk",
-       .pmc_mask       = 1 << AT91SAM9260_ID_TC0,
-@@ -193,7 +198,7 @@ static struct clk *periph_clocks[] __ini
-       &twi_clk,
-       &spi0_clk,
-       &spi1_clk,
--      // ssc
-+      &ssc_clk,
-       &tc0_clk,
-       &tc1_clk,
-       &tc2_clk,
-@@ -264,6 +269,33 @@ static void at91sam9260_reset(void)
- /* --------------------------------------------------------------------
-+ *  Timer/Counter library initialization
-+ * -------------------------------------------------------------------- */
-+#ifdef CONFIG_ATMEL_TCLIB
-+
-+#include "tclib.h"
-+
-+static struct atmel_tcblock at91sam9260_tcblocks[] = {
-+      [0] = {
-+              .physaddr       = AT91SAM9260_BASE_TCB0,
-+              .irq            = { AT91SAM9260_ID_TC0, AT91SAM9260_ID_TC1, AT91SAM9260_ID_TC2 },
-+              .clk            = { &tc0_clk, &tc1_clk, &tc2_clk },
-+      },
-+      [1] = {
-+              .physaddr       = AT91SAM9260_BASE_TCB1,
-+              .irq            = { AT91SAM9260_ID_TC3, AT91SAM9260_ID_TC4, AT91SAM9260_ID_TC5 },
-+              .clk            = { &tc3_clk, &tc4_clk, &tc5_clk },
-+      },
-+};
-+
-+#define at91sam9260_tc_init() atmel_tc_init(at91sam9260_tcblocks, ARRAY_SIZE(at91sam9260_tcblocks))
-+
-+#else
-+#define at91sam9260_tc_init() do {} while(0)
-+#endif
-+
-+
-+/* --------------------------------------------------------------------
-  *  AT91SAM9260 processor initialization
-  * -------------------------------------------------------------------- */
-@@ -310,6 +342,9 @@ void __init at91sam9260_initialize(unsig
-       /* Register GPIO subsystem */
-       at91_gpio_init(at91sam9260_gpio, 3);
-+
-+      /* Initialize the Timer/Counter blocks */
-+      at91sam9260_tc_init();
- }
- /* --------------------------------------------------------------------
-@@ -322,30 +357,30 @@ void __init at91sam9260_initialize(unsig
- static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = {
-       7,      /* Advanced Interrupt Controller */
-       7,      /* System Peripherals */
--      0,      /* Parallel IO Controller A */
--      0,      /* Parallel IO Controller B */
--      0,      /* Parallel IO Controller C */
-+      1,      /* Parallel IO Controller A */
-+      1,      /* Parallel IO Controller B */
-+      1,      /* Parallel IO Controller C */
-       0,      /* Analog-to-Digital Converter */
--      6,      /* USART 0 */
--      6,      /* USART 1 */
--      6,      /* USART 2 */
-+      5,      /* USART 0 */
-+      5,      /* USART 1 */
-+      5,      /* USART 2 */
-       0,      /* Multimedia Card Interface */
--      4,      /* USB Device Port */
--      0,      /* Two-Wire Interface */
--      6,      /* Serial Peripheral Interface 0 */
--      6,      /* Serial Peripheral Interface 1 */
-+      2,      /* USB Device Port */
-+      6,      /* Two-Wire Interface */
-+      5,      /* Serial Peripheral Interface 0 */
-+      5,      /* Serial Peripheral Interface 1 */
-       5,      /* Serial Synchronous Controller */
-       0,
-       0,
-       0,      /* Timer Counter 0 */
-       0,      /* Timer Counter 1 */
-       0,      /* Timer Counter 2 */
--      3,      /* USB Host port */
-+      2,      /* USB Host port */
-       3,      /* Ethernet */
-       0,      /* Image Sensor Interface */
--      6,      /* USART 3 */
--      6,      /* USART 4 */
--      6,      /* USART 5 */
-+      5,      /* USART 3 */
-+      5,      /* USART 4 */
-+      5,      /* USART 5 */
-       0,      /* Timer Counter 3 */
-       0,      /* Timer Counter 4 */
-       0,      /* Timer Counter 5 */
-Index: linux-2.6.21.7/arch/arm/mach-at91/at91sam9260_devices.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/at91sam9260_devices.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/at91sam9260_devices.c
-@@ -527,6 +527,32 @@ void __init at91_init_leds(u8 cpu_led, u
- #endif
-+#if defined(CONFIG_NEW_LEDS)
-+
-+static struct platform_device at91_leds = {
-+      .name           = "at91_leds",
-+      .id             = -1,
-+};
-+
-+void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr)
-+{
-+      if (!nr)
-+              return;
-+
-+      at91_leds.dev.platform_data = leds;
-+
-+      for ( ; nr; nr--, leds++) {
-+              leds->index = nr;       /* first record stores number of leds */
-+              at91_set_gpio_output(leds->gpio, (leds->flags & 1) == 0);
-+      }
-+
-+      platform_device_register(&at91_leds);
-+}
-+#else
-+void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr) {}
-+#endif
-+
-+
- /* --------------------------------------------------------------------
-  *  UART
-  * -------------------------------------------------------------------- */
-Index: linux-2.6.21.7/arch/arm/mach-at91/at91sam9261.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/at91sam9261.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/at91sam9261.c
-@@ -97,6 +97,21 @@ static struct clk spi1_clk = {
-       .pmc_mask       = 1 << AT91SAM9261_ID_SPI1,
-       .type           = CLK_TYPE_PERIPHERAL,
- };
-+static struct clk ssc0_clk = {
-+      .name           = "ssc0_clk",
-+      .pmc_mask       = 1 << AT91SAM9261_ID_SSC0,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk ssc1_clk = {
-+      .name           = "ssc1_clk",
-+      .pmc_mask       = 1 << AT91SAM9261_ID_SSC1,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk ssc2_clk = {
-+      .name           = "ssc2_clk",
-+      .pmc_mask       = 1 << AT91SAM9261_ID_SSC2,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
- static struct clk tc0_clk = {
-       .name           = "tc0_clk",
-       .pmc_mask       = 1 << AT91SAM9261_ID_TC0,
-@@ -135,7 +150,9 @@ static struct clk *periph_clocks[] __ini
-       &twi_clk,
-       &spi0_clk,
-       &spi1_clk,
--      // ssc 0 .. ssc2
-+      &ssc0_clk,
-+      &ssc1_clk,
-+      &ssc2_clk,
-       &tc0_clk,
-       &tc1_clk,
-       &tc2_clk,
-@@ -230,6 +247,28 @@ static void at91sam9261_reset(void)
- /* --------------------------------------------------------------------
-+ *  Timer/Counter library initialization
-+ * -------------------------------------------------------------------- */
-+#ifdef CONFIG_ATMEL_TCLIB
-+
-+#include "tclib.h"
-+
-+static struct atmel_tcblock at91sam9261_tcblocks[] = {
-+      [0] = {
-+              .physaddr       = AT91SAM9261_BASE_TCB0,
-+              .irq            = { AT91SAM9261_ID_TC0, AT91SAM9261_ID_TC1, AT91SAM9261_ID_TC2 },
-+              .clk            = { &tc0_clk, &tc1_clk, &tc2_clk },
-+      }
-+};
-+
-+#define at91sam9261_tc_init() atmel_tc_init(at91sam9261_tcblocks, ARRAY_SIZE(at91sam9261_tcblocks))
-+
-+#else
-+#define at91sam9261_tc_init() do {} while(0)
-+#endif
-+
-+
-+/* --------------------------------------------------------------------
-  *  AT91SAM9261 processor initialization
-  * -------------------------------------------------------------------- */
-@@ -250,6 +289,9 @@ void __init at91sam9261_initialize(unsig
-       /* Register GPIO subsystem */
-       at91_gpio_init(at91sam9261_gpio, 3);
-+
-+      /* Initialize the Timer/Counter blocks */
-+      at91sam9261_tc_init();
- }
- /* --------------------------------------------------------------------
-@@ -262,25 +304,25 @@ void __init at91sam9261_initialize(unsig
- static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = {
-       7,      /* Advanced Interrupt Controller */
-       7,      /* System Peripherals */
--      0,      /* Parallel IO Controller A */
--      0,      /* Parallel IO Controller B */
--      0,      /* Parallel IO Controller C */
--      0,
--      6,      /* USART 0 */
--      6,      /* USART 1 */
--      6,      /* USART 2 */
-+      1,      /* Parallel IO Controller A */
-+      1,      /* Parallel IO Controller B */
-+      1,      /* Parallel IO Controller C */
-+      0,
-+      5,      /* USART 0 */
-+      5,      /* USART 1 */
-+      5,      /* USART 2 */
-       0,      /* Multimedia Card Interface */
--      4,      /* USB Device Port */
--      0,      /* Two-Wire Interface */
--      6,      /* Serial Peripheral Interface 0 */
--      6,      /* Serial Peripheral Interface 1 */
--      5,      /* Serial Synchronous Controller 0 */
--      5,      /* Serial Synchronous Controller 1 */
--      5,      /* Serial Synchronous Controller 2 */
-+      2,      /* USB Device Port */
-+      6,      /* Two-Wire Interface */
-+      5,      /* Serial Peripheral Interface 0 */
-+      5,      /* Serial Peripheral Interface 1 */
-+      4,      /* Serial Synchronous Controller 0 */
-+      4,      /* Serial Synchronous Controller 1 */
-+      4,      /* Serial Synchronous Controller 2 */
-       0,      /* Timer Counter 0 */
-       0,      /* Timer Counter 1 */
-       0,      /* Timer Counter 2 */
--      3,      /* USB Host port */
-+      2,      /* USB Host port */
-       3,      /* LCD Controller */
-       0,
-       0,
-Index: linux-2.6.21.7/arch/arm/mach-at91/at91sam9261_devices.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/at91sam9261_devices.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/at91sam9261_devices.c
-@@ -14,6 +14,9 @@
- #include <asm/mach/map.h>
- #include <linux/platform_device.h>
-+#include <linux/fb.h>
-+
-+#include <video/atmel_lcdc.h>
- #include <asm/arch/board.h>
- #include <asm/arch/gpio.h>
-@@ -430,9 +433,9 @@ void __init at91_add_device_spi(struct s
-  *  LCD Controller
-  * -------------------------------------------------------------------- */
--#if defined(CONFIG_FB_AT91) || defined(CONFIG_FB_AT91_MODULE)
-+#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)
- static u64 lcdc_dmamask = 0xffffffffUL;
--static struct at91fb_info lcdc_data;
-+static struct atmel_lcdfb_info lcdc_data;
- static struct resource lcdc_resources[] = {
-       [0] = {
-@@ -455,7 +458,7 @@ static struct resource lcdc_resources[] 
- };
- static struct platform_device at91_lcdc_device = {
--      .name           = "at91-fb",
-+      .name           = "atmel_lcdfb",
-       .id             = 0,
-       .dev            = {
-                               .dma_mask               = &lcdc_dmamask,
-@@ -466,7 +469,7 @@ static struct platform_device at91_lcdc_
-       .num_resources  = ARRAY_SIZE(lcdc_resources),
- };
--void __init at91_add_device_lcdc(struct at91fb_info *data)
-+void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
- {
-       if (!data) {
-               return;
-@@ -499,7 +502,7 @@ void __init at91_add_device_lcdc(struct 
-       platform_device_register(&at91_lcdc_device);
- }
- #else
--void __init at91_add_device_lcdc(struct at91fb_info *data) {}
-+void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {}
- #endif
-@@ -525,6 +528,32 @@ void __init at91_init_leds(u8 cpu_led, u
- #endif
-+#if defined(CONFIG_NEW_LEDS)
-+
-+static struct platform_device at91_leds = {
-+      .name           = "at91_leds",
-+      .id             = -1,
-+};
-+
-+void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr)
-+{
-+      if (!nr)
-+              return;
-+
-+      at91_leds.dev.platform_data = leds;
-+
-+      for ( ; nr; nr--, leds++) {
-+              leds->index = nr;       /* first record stores number of leds */
-+              at91_set_gpio_output(leds->gpio, (leds->flags & 1) == 0);
-+      }
-+
-+      platform_device_register(&at91_leds);
-+}
-+#else
-+void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr) {}
-+#endif
-+
-+
- /* --------------------------------------------------------------------
-  *  UART
-  * -------------------------------------------------------------------- */
-Index: linux-2.6.21.7/arch/arm/mach-at91/at91sam9263.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/at91sam9263.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/at91sam9263.c
-@@ -87,6 +87,11 @@ static struct clk mmc1_clk = {
-       .pmc_mask       = 1 << AT91SAM9263_ID_MCI1,
-       .type           = CLK_TYPE_PERIPHERAL,
- };
-+static struct clk can_clk = {
-+      .name           = "can_clk",
-+      .pmc_mask       = 1 << AT91SAM9263_ID_CAN,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
- static struct clk twi_clk = {
-       .name           = "twi_clk",
-       .pmc_mask       = 1 << AT91SAM9263_ID_TWI,
-@@ -102,16 +107,46 @@ static struct clk spi1_clk = {
-       .pmc_mask       = 1 << AT91SAM9263_ID_SPI1,
-       .type           = CLK_TYPE_PERIPHERAL,
- };
-+static struct clk ssc0_clk = {
-+      .name           = "ssc0_clk",
-+      .pmc_mask       = 1 << AT91SAM9263_ID_SSC0,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk ssc1_clk = {
-+      .name           = "ssc1_clk",
-+      .pmc_mask       = 1 << AT91SAM9263_ID_SSC1,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk ac97_clk = {
-+      .name           = "ac97_clk",
-+      .pmc_mask       = 1 << AT91SAM9263_ID_AC97C,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
- static struct clk tcb_clk = {
-       .name           = "tcb_clk",
-       .pmc_mask       = 1 << AT91SAM9263_ID_TCB,
-       .type           = CLK_TYPE_PERIPHERAL,
- };
-+static struct clk pwmc_clk = {
-+      .name           = "pwmc_clk",
-+      .pmc_mask       = 1 << AT91SAM9263_ID_PWMC,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
- static struct clk macb_clk = {
-       .name           = "macb_clk",
-       .pmc_mask       = 1 << AT91SAM9263_ID_EMAC,
-       .type           = CLK_TYPE_PERIPHERAL,
- };
-+static struct clk dma_clk = {
-+      .name           = "dma_clk",
-+      .pmc_mask       = 1 << AT91SAM9263_ID_DMA,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk twodge_clk = {
-+      .name           = "2dge_clk",
-+      .pmc_mask       = 1 << AT91SAM9263_ID_2DGE,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
- static struct clk udc_clk = {
-       .name           = "udc_clk",
-       .pmc_mask       = 1 << AT91SAM9263_ID_UDP,
-@@ -142,20 +177,21 @@ static struct clk *periph_clocks[] __ini
-       &usart2_clk,
-       &mmc0_clk,
-       &mmc1_clk,
--      // can
-+      &can_clk,
-       &twi_clk,
-       &spi0_clk,
-       &spi1_clk,
--      // ssc0 .. ssc1
--      // ac97
-+      &ssc0_clk,
-+      &ssc1_clk,
-+      &ac97_clk,
-       &tcb_clk,
--      // pwmc
-+      &pwmc_clk,
-       &macb_clk,
--      // 2dge
-+      &twodge_clk,
-       &udc_clk,
-       &isi_clk,
-       &lcdc_clk,
--      // dma
-+      &dma_clk,
-       &ohci_clk,
-       // irq0 .. irq1
- };
-@@ -237,6 +273,28 @@ static void at91sam9263_reset(void)
- /* --------------------------------------------------------------------
-+ *  Timer/Counter library initialization
-+ * -------------------------------------------------------------------- */
-+#ifdef CONFIG_ATMEL_TCLIB
-+
-+#include "tclib.h"
-+
-+static struct atmel_tcblock at91sam9263_tcblocks[] = {
-+      [0] = {
-+              .physaddr       = AT91SAM9263_BASE_TCB0,
-+              .irq            = { AT91SAM9263_ID_TCB, AT91SAM9263_ID_TCB, AT91SAM9263_ID_TCB },
-+              .clk            = { &tcb_clk, &tcb_clk, &tcb_clk },
-+      }
-+};
-+
-+#define at91sam9263_tc_init() atmel_tc_init(at91sam9263_tcblocks, ARRAY_SIZE(at91sam9263_tcblocks))
-+
-+#else
-+#define at91sam9263_tc_init() do {} while(0)
-+#endif
-+
-+
-+/* --------------------------------------------------------------------
-  *  AT91SAM9263 processor initialization
-  * -------------------------------------------------------------------- */
-@@ -256,6 +314,9 @@ void __init at91sam9263_initialize(unsig
-       /* Register GPIO subsystem */
-       at91_gpio_init(at91sam9263_gpio, 5);
-+
-+      /* Initialize the Timer/Counter blocks */
-+      at91sam9263_tc_init();
- }
- /* --------------------------------------------------------------------
-@@ -268,34 +329,34 @@ void __init at91sam9263_initialize(unsig
- static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = {
-       7,      /* Advanced Interrupt Controller (FIQ) */
-       7,      /* System Peripherals */
--      0,      /* Parallel IO Controller A */
--      0,      /* Parallel IO Controller B */
--      0,      /* Parallel IO Controller C, D and E */
-+      1,      /* Parallel IO Controller A */
-+      1,      /* Parallel IO Controller B */
-+      1,      /* Parallel IO Controller C, D and E */
-       0,
-       0,
--      6,      /* USART 0 */
--      6,      /* USART 1 */
--      6,      /* USART 2 */
-+      5,      /* USART 0 */
-+      5,      /* USART 1 */
-+      5,      /* USART 2 */
-       0,      /* Multimedia Card Interface 0 */
-       0,      /* Multimedia Card Interface 1 */
--      4,      /* CAN */
--      0,      /* Two-Wire Interface */
--      6,      /* Serial Peripheral Interface 0 */
--      6,      /* Serial Peripheral Interface 1 */
--      5,      /* Serial Synchronous Controller 0 */
--      5,      /* Serial Synchronous Controller 1 */
--      6,      /* AC97 Controller */
-+      3,      /* CAN */
-+      6,      /* Two-Wire Interface */
-+      5,      /* Serial Peripheral Interface 0 */
-+      5,      /* Serial Peripheral Interface 1 */
-+      4,      /* Serial Synchronous Controller 0 */
-+      4,      /* Serial Synchronous Controller 1 */
-+      5,      /* AC97 Controller */
-       0,      /* Timer Counter 0, 1 and 2 */
-       0,      /* Pulse Width Modulation Controller */
-       3,      /* Ethernet */
-       0,
-       0,      /* 2D Graphic Engine */
--      3,      /* USB Device Port */
-+      2,      /* USB Device Port */
-       0,      /* Image Sensor Interface */
-       3,      /* LDC Controller */
-       0,      /* DMA Controller */
-       0,
--      3,      /* USB Host port */
-+      2,      /* USB Host port */
-       0,      /* Advanced Interrupt Controller (IRQ0) */
-       0,      /* Advanced Interrupt Controller (IRQ1) */
- };
-Index: linux-2.6.21.7/arch/arm/mach-at91/at91sam9263_devices.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/at91sam9263_devices.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/at91sam9263_devices.c
-@@ -13,6 +13,9 @@
- #include <asm/mach/map.h>
- #include <linux/platform_device.h>
-+#include <linux/fb.h>
-+
-+#include <video/atmel_lcdc.h>
- #include <asm/arch/board.h>
- #include <asm/arch/gpio.h>
-@@ -573,6 +576,180 @@ void __init at91_add_device_spi(struct s
- /* --------------------------------------------------------------------
-+ *  AC97
-+ * -------------------------------------------------------------------- */
-+
-+#if defined(CONFIG_SND_AT91_AC97) || defined(CONFIG_SND_AT91_AC97_MODULE)
-+static u64 ac97_dmamask = 0xffffffffUL;
-+static struct atmel_ac97_data ac97_data;
-+
-+static struct resource ac97_resources[] = {
-+      [0] = {
-+              .start  = AT91SAM9263_BASE_AC97C,
-+              .end    = AT91SAM9263_BASE_AC97C + SZ_16K - 1,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      [1] = {
-+              .start  = AT91SAM9263_ID_AC97C,
-+              .end    = AT91SAM9263_ID_AC97C,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct platform_device at91sam9263_ac97_device = {
-+      .name           = "ac97c",
-+      .id             = 1,
-+      .dev            = {
-+                              .dma_mask               = &ac97_dmamask,
-+                              .coherent_dma_mask      = 0xffffffff,
-+                              .platform_data          = &ac97_data,
-+      },
-+      .resource       = ac97_resources,
-+      .num_resources  = ARRAY_SIZE(ac97_resources),
-+};
-+
-+void __init at91_add_device_ac97(struct atmel_ac97_data *data)
-+{
-+      if (!data)
-+              return;
-+
-+      at91_set_A_periph(AT91_PIN_PB0, 0);     /* AC97FS */
-+      at91_set_A_periph(AT91_PIN_PB1, 0);     /* AC97CK */
-+      at91_set_A_periph(AT91_PIN_PB2, 0);     /* AC97TX */
-+      at91_set_A_periph(AT91_PIN_PB3, 0);     /* AC97RX */
-+
-+      /* reset */
-+      if (data->reset_pin)
-+              at91_set_gpio_output(data->reset_pin, 0);
-+
-+      ac97_data = *ek_data;
-+      platform_device_register(&at91sam9263_ac97_device);
-+}
-+#else
-+void __init at91_add_device_ac97(struct atmel_ac97_data *data) {}
-+#endif
-+
-+
-+/* --------------------------------------------------------------------
-+ *  Image Sensor Interface
-+ * -------------------------------------------------------------------- */
-+
-+#if defined(CONFIG_VIDEO_AT91_ISI) || defined(CONFIG_VIDEO_AT91_ISI_MODULE)
-+
-+struct resource isi_resources[] = {
-+      [0] = {
-+              .start  = AT91SAM9263_BASE_ISI,
-+              .end    = AT91SAM9263_BASE_ISI + SZ_16K - 1,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      [1] = {
-+              .start  = AT91SAM9263_ID_ISI,
-+              .end    = AT91SAM9263_ID_ISI,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct platform_device at91sam9263_isi_device = {
-+      .name           = "at91_isi",
-+      .id             = -1,
-+      .resource       = isi_resources,
-+      .num_resources  = ARRAY_SIZE(isi_resources),
-+};
-+
-+void __init at91_add_device_isi(void)
-+{
-+      at91_set_A_periph(AT91_PIN_PE0, 0);     /* ISI_D0 */
-+      at91_set_A_periph(AT91_PIN_PE1, 0);     /* ISI_D1 */
-+      at91_set_A_periph(AT91_PIN_PE2, 0);     /* ISI_D2 */
-+      at91_set_A_periph(AT91_PIN_PE3, 0);     /* ISI_D3 */
-+      at91_set_A_periph(AT91_PIN_PE4, 0);     /* ISI_D4 */
-+      at91_set_A_periph(AT91_PIN_PE5, 0);     /* ISI_D5 */
-+      at91_set_A_periph(AT91_PIN_PE6, 0);     /* ISI_D6 */
-+      at91_set_A_periph(AT91_PIN_PE7, 0);     /* ISI_D7 */
-+      at91_set_A_periph(AT91_PIN_PE8, 0);     /* ISI_PCK */
-+      at91_set_A_periph(AT91_PIN_PE9, 0);     /* ISI_HSYNC */
-+      at91_set_A_periph(AT91_PIN_PE10, 0);    /* ISI_VSYNC */
-+      at91_set_B_periph(AT91_PIN_PE11, 0);    /* ISI_MCK (PCK3) */
-+      at91_set_B_periph(AT91_PIN_PE12, 0);    /* ISI_PD8 */
-+      at91_set_B_periph(AT91_PIN_PE13, 0);    /* ISI_PD9 */
-+      at91_set_B_periph(AT91_PIN_PE14, 0);    /* ISI_PD10 */
-+      at91_set_B_periph(AT91_PIN_PE15, 0);    /* ISI_PD11 */
-+}
-+#else
-+void __init at91_add_device_isi(void) {}
-+#endif
-+
-+
-+/* --------------------------------------------------------------------
-+ *  LCD Controller
-+ * -------------------------------------------------------------------- */
-+
-+#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)
-+static u64 lcdc_dmamask = 0xffffffffUL;
-+static struct atmel_lcdfb_info lcdc_data;
-+
-+static struct resource lcdc_resources[] = {
-+      [0] = {
-+              .start  = AT91SAM9263_LCDC_BASE,
-+              .end    = AT91SAM9263_LCDC_BASE + SZ_4K - 1,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      [1] = {
-+              .start  = AT91SAM9263_ID_LCDC,
-+              .end    = AT91SAM9263_ID_LCDC,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct platform_device at91_lcdc_device = {
-+      .name           = "atmel_lcdfb",
-+      .id             = 0,
-+      .dev            = {
-+                              .dma_mask               = &lcdc_dmamask,
-+                              .coherent_dma_mask      = 0xffffffff,
-+                              .platform_data          = &lcdc_data,
-+      },
-+      .resource       = lcdc_resources,
-+      .num_resources  = ARRAY_SIZE(lcdc_resources),
-+};
-+
-+void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
-+{
-+      if (!data)
-+              return;
-+
-+      at91_set_A_periph(AT91_PIN_PC1, 0);     /* LCDHSYNC */
-+      at91_set_A_periph(AT91_PIN_PC2, 0);     /* LCDDOTCK */
-+      at91_set_A_periph(AT91_PIN_PC3, 0);     /* LCDDEN */
-+      at91_set_B_periph(AT91_PIN_PB9, 0);     /* LCDCC */
-+      at91_set_A_periph(AT91_PIN_PC6, 0);     /* LCDD2 */
-+      at91_set_A_periph(AT91_PIN_PC7, 0);     /* LCDD3 */
-+      at91_set_A_periph(AT91_PIN_PC8, 0);     /* LCDD4 */
-+      at91_set_A_periph(AT91_PIN_PC9, 0);     /* LCDD5 */
-+      at91_set_A_periph(AT91_PIN_PC10, 0);    /* LCDD6 */
-+      at91_set_A_periph(AT91_PIN_PC11, 0);    /* LCDD7 */
-+      at91_set_A_periph(AT91_PIN_PC14, 0);    /* LCDD10 */
-+      at91_set_A_periph(AT91_PIN_PC15, 0);    /* LCDD11 */
-+      at91_set_A_periph(AT91_PIN_PC16, 0);    /* LCDD12 */
-+      at91_set_B_periph(AT91_PIN_PC12, 0);    /* LCDD13 */
-+      at91_set_A_periph(AT91_PIN_PC18, 0);    /* LCDD14 */
-+      at91_set_A_periph(AT91_PIN_PC19, 0);    /* LCDD15 */
-+      at91_set_A_periph(AT91_PIN_PC22, 0);    /* LCDD18 */
-+      at91_set_A_periph(AT91_PIN_PC23, 0);    /* LCDD19 */
-+      at91_set_A_periph(AT91_PIN_PC24, 0);    /* LCDD20 */
-+      at91_set_B_periph(AT91_PIN_PC17, 0);    /* LCDD21 */
-+      at91_set_A_periph(AT91_PIN_PC26, 0);    /* LCDD22 */
-+      at91_set_A_periph(AT91_PIN_PC27, 0);    /* LCDD23 */
-+
-+      lcdc_data = *data;
-+      platform_device_register(&at91_lcdc_device);
-+}
-+#else
-+void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {}
-+#endif
-+
-+
-+/* --------------------------------------------------------------------
-  *  LEDs
-  * -------------------------------------------------------------------- */
-@@ -594,6 +771,32 @@ void __init at91_init_leds(u8 cpu_led, u
- #endif
-+#if defined(CONFIG_NEW_LEDS)
-+
-+static struct platform_device at91_leds = {
-+      .name           = "at91_leds",
-+      .id             = -1,
-+};
-+
-+void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr)
-+{
-+      if (!nr)
-+              return;
-+
-+      at91_leds.dev.platform_data = leds;
-+
-+      for ( ; nr; nr--, leds++) {
-+              leds->index = nr;       /* first record stores number of leds */
-+              at91_set_gpio_output(leds->gpio, (leds->flags & 1) == 0);
-+      }
-+
-+      platform_device_register(&at91_leds);
-+}
-+#else
-+void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr) {}
-+#endif
-+
-+
- /* --------------------------------------------------------------------
-  *  UART
-  * -------------------------------------------------------------------- */
-Index: linux-2.6.21.7/arch/arm/mach-at91/at91sam9rl.c
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/arch/arm/mach-at91/at91sam9rl.c
-@@ -0,0 +1,366 @@
-+/*
-+ * arch/arm/mach-at91/at91sam9rl.c
-+ *
-+ *  Copyright (C) 2005 SAN People
-+ *  Copyright (C) 2007 Atmel Corporation
-+ *
-+ * 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/module.h>
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/map.h>
-+#include <asm/arch/cpu.h>
-+#include <asm/arch/at91sam9rl.h>
-+#include <asm/arch/at91_pmc.h>
-+#include <asm/arch/at91_rstc.h>
-+
-+#include "generic.h"
-+#include "clock.h"
-+
-+static struct map_desc at91sam9rl_io_desc[] __initdata = {
-+      {
-+              .virtual        = AT91_VA_BASE_SYS,
-+              .pfn            = __phys_to_pfn(AT91_BASE_SYS),
-+              .length         = SZ_16K,
-+              .type           = MT_DEVICE,
-+      },
-+};
-+
-+static struct map_desc at91sam9rl_sram_desc[] __initdata = {
-+      {
-+              .pfn            = __phys_to_pfn(AT91SAM9RL_SRAM_BASE),
-+              .type           = MT_DEVICE,
-+      }
-+};
-+
-+/* --------------------------------------------------------------------
-+ *  Clocks
-+ * -------------------------------------------------------------------- */
-+
-+/*
-+ * The peripheral clocks.
-+ */
-+static struct clk pioA_clk = {
-+      .name           = "pioA_clk",
-+      .pmc_mask       = 1 << AT91SAM9RL_ID_PIOA,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk pioB_clk = {
-+      .name           = "pioB_clk",
-+      .pmc_mask       = 1 << AT91SAM9RL_ID_PIOB,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk pioC_clk = {
-+      .name           = "pioC_clk",
-+      .pmc_mask       = 1 << AT91SAM9RL_ID_PIOC,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk pioD_clk = {
-+      .name           = "pioD_clk",
-+      .pmc_mask       = 1 << AT91SAM9RL_ID_PIOD,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk usart0_clk = {
-+      .name           = "usart0_clk",
-+      .pmc_mask       = 1 << AT91SAM9RL_ID_US0,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk usart1_clk = {
-+      .name           = "usart1_clk",
-+      .pmc_mask       = 1 << AT91SAM9RL_ID_US1,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk usart2_clk = {
-+      .name           = "usart2_clk",
-+      .pmc_mask       = 1 << AT91SAM9RL_ID_US2,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk usart3_clk = {
-+      .name           = "usart3_clk",
-+      .pmc_mask       = 1 << AT91SAM9RL_ID_US3,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk mmc_clk = {
-+      .name           = "mci_clk",
-+      .pmc_mask       = 1 << AT91SAM9RL_ID_MCI,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk twi0_clk = {
-+      .name           = "twi0_clk",
-+      .pmc_mask       = 1 << AT91SAM9RL_ID_TWI0,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk twi1_clk = {
-+      .name           = "twi1_clk",
-+      .pmc_mask       = 1 << AT91SAM9RL_ID_TWI1,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk spi_clk = {
-+      .name           = "spi_clk",
-+      .pmc_mask       = 1 << AT91SAM9RL_ID_SPI,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk ssc0_clk = {
-+      .name           = "ssc0_clk",
-+      .pmc_mask       = 1 << AT91SAM9RL_ID_SSC0,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk ssc1_clk = {
-+      .name           = "ssc1_clk",
-+      .pmc_mask       = 1 << AT91SAM9RL_ID_SSC1,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk tc0_clk = {
-+      .name           = "tc0_clk",
-+      .pmc_mask       = 1 << AT91SAM9RL_ID_TC0,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk tc1_clk = {
-+      .name           = "tc1_clk",
-+      .pmc_mask       = 1 << AT91SAM9RL_ID_TC1,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk tc2_clk = {
-+      .name           = "tc2_clk",
-+      .pmc_mask       = 1 << AT91SAM9RL_ID_TC2,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk pwmc_clk = {
-+      .name           = "pwmc_clk",
-+      .pmc_mask       = 1 << AT91SAM9RL_ID_PWMC,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk tsc_clk = {
-+      .name           = "tsc_clk",
-+      .pmc_mask       = 1 << AT91SAM9RL_ID_TSC,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk dma_clk = {
-+      .name           = "dma_clk",
-+      .pmc_mask       = 1 << AT91SAM9RL_ID_DMA,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk udphs_clk = {
-+      .name           = "udphs_clk",
-+      .pmc_mask       = 1 << AT91SAM9RL_ID_UDPHS,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk lcdc_clk = {
-+      .name           = "lcdc_clk",
-+      .pmc_mask       = 1 << AT91SAM9RL_ID_LCDC,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+static struct clk ac97_clk = {
-+      .name           = "ac97_clk",
-+      .pmc_mask       = 1 << AT91SAM9RL_ID_AC97C,
-+      .type           = CLK_TYPE_PERIPHERAL,
-+};
-+
-+static struct clk *periph_clocks[] __initdata = {
-+      &pioA_clk,
-+      &pioB_clk,
-+      &pioC_clk,
-+      &pioD_clk,
-+      &usart0_clk,
-+      &usart1_clk,
-+      &usart2_clk,
-+      &usart3_clk,
-+      &mmc_clk,
-+      &twi0_clk,
-+      &twi1_clk,
-+      &spi_clk,
-+      &ssc0_clk,
-+      &ssc1_clk,
-+      &tc0_clk,
-+      &tc1_clk,
-+      &tc2_clk,
-+      &pwmc_clk,
-+      &tsc_clk,
-+      &dma_clk,
-+      &udphs_clk,
-+      &lcdc_clk,
-+      &ac97_clk,
-+      // irq0
-+};
-+
-+/*
-+ * The two programmable clocks.
-+ * You must configure pin multiplexing to bring these signals out.
-+ */
-+static struct clk pck0 = {
-+      .name           = "pck0",
-+      .pmc_mask       = AT91_PMC_PCK0,
-+      .type           = CLK_TYPE_PROGRAMMABLE,
-+      .id             = 0,
-+};
-+static struct clk pck1 = {
-+      .name           = "pck1",
-+      .pmc_mask       = AT91_PMC_PCK1,
-+      .type           = CLK_TYPE_PROGRAMMABLE,
-+      .id             = 1,
-+};
-+
-+static void __init at91sam9rl_register_clocks(void)
-+{
-+      int i;
-+
-+      for (i = 0; i < ARRAY_SIZE(periph_clocks); i++)
-+              clk_register(periph_clocks[i]);
-+
-+      clk_register(&pck0);
-+      clk_register(&pck1);
-+}
-+
-+/* --------------------------------------------------------------------
-+ *  GPIO
-+ * -------------------------------------------------------------------- */
-+
-+static struct at91_gpio_bank at91sam9rl_gpio[] = {
-+      {
-+              .id             = AT91SAM9RL_ID_PIOA,
-+              .offset         = AT91_PIOA,
-+              .clock          = &pioA_clk,
-+      }, {
-+              .id             = AT91SAM9RL_ID_PIOB,
-+              .offset         = AT91_PIOB,
-+              .clock          = &pioB_clk,
-+      }, {
-+              .id             = AT91SAM9RL_ID_PIOC,
-+              .offset         = AT91_PIOC,
-+              .clock          = &pioC_clk,
-+      }, {
-+              .id             = AT91SAM9RL_ID_PIOD,
-+              .offset         = AT91_PIOD,
-+              .clock          = &pioD_clk,
-+      }
-+};
-+
-+static void at91sam9rl_reset(void)
-+{
-+      at91_sys_write(AT91_RSTC_CR, AT91_RSTC_KEY | AT91_RSTC_PROCRST | AT91_RSTC_PERRST);
-+}
-+
-+
-+/* --------------------------------------------------------------------
-+ *  Timer/Counter library initialization
-+ * -------------------------------------------------------------------- */
-+#ifdef CONFIG_ATMEL_TCLIB
-+
-+#include "tclib.h"
-+
-+static struct atmel_tcblock at91sam9rl_tcblocks[] = {
-+      [0] = {
-+              .physaddr       = AT91SAM9RL_BASE_TCB0,
-+              .irq            = { AT91SAM9RL_ID_TC0, AT91SAM9RL_ID_TC1, AT91SAM9RL_ID_TC2 },
-+              .clk            = { &tc0_clk, &tc1_clk, &tc2_clk },
-+      }
-+};
-+
-+#define at91sam9rl_tc_init()  atmel_tc_init(at91sam9rl_tcblocks, ARRAY_SIZE(at91sam9rl_tcblocks))
-+
-+#else
-+#define at91sam9rl_tc_init()  do {} while(0)
-+#endif
-+
-+
-+/* --------------------------------------------------------------------
-+ *  AT91SAM9RL processor initialization
-+ * -------------------------------------------------------------------- */
-+
-+void __init at91sam9rl_initialize(unsigned long main_clock)
-+{
-+      unsigned long cidr, sram_size;
-+
-+      /* Map peripherals */
-+      iotable_init(at91sam9rl_io_desc, ARRAY_SIZE(at91sam9rl_io_desc));
-+
-+      cidr = at91_sys_read(AT91_DBGU_CIDR);
-+
-+      switch (cidr & AT91_CIDR_SRAMSIZ) {
-+              case AT91_CIDR_SRAMSIZ_32K:
-+                      sram_size = 2 * SZ_16K;
-+                      break;
-+              case AT91_CIDR_SRAMSIZ_16K:
-+              default:
-+                      sram_size = SZ_16K;
-+      }
-+
-+      at91sam9rl_sram_desc->virtual = AT91_IO_VIRT_BASE - sram_size;
-+      at91sam9rl_sram_desc->length = sram_size;
-+
-+      /* Map SRAM */
-+      iotable_init(at91sam9rl_sram_desc, ARRAY_SIZE(at91sam9rl_sram_desc));
-+
-+      at91_arch_reset = at91sam9rl_reset;
-+      at91_extern_irq = (1 << AT91SAM9RL_ID_IRQ0);
-+
-+      /* Init clock subsystem */
-+      at91_clock_init(main_clock);
-+
-+      /* Register the processor-specific clocks */
-+      at91sam9rl_register_clocks();
-+
-+      /* Register GPIO subsystem */
-+      at91_gpio_init(at91sam9rl_gpio, 4);
-+      
-+      /* Initialize the Timer/Counter blocks */
-+      at91sam9rl_tc_init();
-+}
-+
-+/* --------------------------------------------------------------------
-+ *  Interrupt initialization
-+ * -------------------------------------------------------------------- */
-+
-+/*
-+ * The default interrupt priority levels (0 = lowest, 7 = highest).
-+ */
-+static unsigned int at91sam9rl_default_irq_priority[NR_AIC_IRQS] __initdata = {
-+      7,      /* Advanced Interrupt Controller */
-+      7,      /* System Peripherals */
-+      1,      /* Parallel IO Controller A */
-+      1,      /* Parallel IO Controller B */
-+      1,      /* Parallel IO Controller C */
-+      1,      /* Parallel IO Controller D */
-+      5,      /* USART 0 */
-+      5,      /* USART 1 */
-+      5,      /* USART 2 */
-+      5,      /* USART 3 */
-+      0,      /* Multimedia Card Interface */
-+      6,      /* Two-Wire Interface 0 */
-+      6,      /* Two-Wire Interface 1 */
-+      5,      /* Serial Peripheral Interface */
-+      4,      /* Serial Synchronous Controller 0 */
-+      4,      /* Serial Synchronous Controller 1 */
-+      0,      /* Timer Counter 0 */
-+      0,      /* Timer Counter 1 */
-+      0,      /* Timer Counter 2 */
-+      0,
-+      0,      /* Touch Screen Controller */
-+      0,      /* DMA Controller */
-+      2,      /* USB Device High speed port */
-+      2,      /* LCD Controller */
-+      6,      /* AC97 Controller */
-+      0,
-+      0,
-+      0,
-+      0,
-+      0,
-+      0,
-+      0,      /* Advanced Interrupt Controller */
-+};
-+
-+void __init at91sam9rl_init_interrupts(unsigned int priority[NR_AIC_IRQS])
-+{
-+      if (!priority)
-+              priority = at91sam9rl_default_irq_priority;
-+
-+      /* Initialize the AIC interrupt controller */
-+      at91_aic_init(priority);
-+
-+      /* Enable GPIO interrupts */
-+      at91_gpio_irq_setup();
-+}
-Index: linux-2.6.21.7/arch/arm/mach-at91/at91sam9rl_devices.c
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/arch/arm/mach-at91/at91sam9rl_devices.c
-@@ -0,0 +1,660 @@
-+/*
-+ *  Copyright (C) 2007 Atmel Corporation
-+ *
-+ * 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/mach/arch.h>
-+#include <asm/mach/map.h>
-+
-+#include <linux/platform_device.h>
-+#include <linux/fb.h>
-+
-+#include <video/atmel_lcdc.h>
-+
-+#include <asm/arch/board.h>
-+#include <asm/arch/gpio.h>
-+#include <asm/arch/at91sam9rl.h>
-+#include <asm/arch/at91sam9rl_matrix.h>
-+#include <asm/arch/at91sam926x_mc.h>
-+
-+#include "generic.h"
-+
-+#define SZ_512        0x00000200
-+#define SZ_256        0x00000100
-+#define SZ_16 0x00000010
-+
-+
-+/* --------------------------------------------------------------------
-+ *  MMC / SD
-+ * -------------------------------------------------------------------- */
-+
-+#if defined(CONFIG_MMC_AT91) || defined(CONFIG_MMC_AT91_MODULE)
-+static u64 mmc_dmamask = 0xffffffffUL;
-+static struct at91_mmc_data mmc_data;
-+
-+static struct resource mmc_resources[] = {
-+      [0] = {
-+              .start  = AT91SAM9RL_BASE_MCI,
-+              .end    = AT91SAM9RL_BASE_MCI + SZ_16K - 1,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      [1] = {
-+              .start  = AT91SAM9RL_ID_MCI,
-+              .end    = AT91SAM9RL_ID_MCI,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct platform_device at91sam9rl_mmc_device = {
-+      .name           = "at91_mci",
-+      .id             = -1,
-+      .dev            = {
-+                              .dma_mask               = &mmc_dmamask,
-+                              .coherent_dma_mask      = 0xffffffff,
-+                              .platform_data          = &mmc_data,
-+      },
-+      .resource       = mmc_resources,
-+      .num_resources  = ARRAY_SIZE(mmc_resources),
-+};
-+
-+void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)
-+{
-+      if (!data)
-+              return;
-+
-+      /* input/irq */
-+      if (data->det_pin) {
-+              at91_set_gpio_input(data->det_pin, 1);
-+              at91_set_deglitch(data->det_pin, 1);
-+      }
-+      if (data->wp_pin)
-+              at91_set_gpio_input(data->wp_pin, 1);
-+      if (data->vcc_pin)
-+              at91_set_gpio_output(data->vcc_pin, 0);
-+
-+      /* CLK */
-+      at91_set_A_periph(AT91_PIN_PA2, 0);
-+
-+      /* CMD */
-+      at91_set_A_periph(AT91_PIN_PA1, 1);
-+
-+      /* DAT0, maybe DAT1..DAT3 */
-+      at91_set_A_periph(AT91_PIN_PA0, 1);
-+      if (data->wire4) {
-+              at91_set_A_periph(AT91_PIN_PA3, 1);
-+              at91_set_A_periph(AT91_PIN_PA4, 1);
-+              at91_set_A_periph(AT91_PIN_PA5, 1);
-+      }
-+
-+      mmc_data = *data;
-+      platform_device_register(&at91sam9rl_mmc_device);
-+}
-+#else
-+void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {}
-+#endif
-+
-+
-+/* --------------------------------------------------------------------
-+ *  NAND / SmartMedia
-+ * -------------------------------------------------------------------- */
-+
-+#if defined(CONFIG_MTD_NAND_AT91) || defined(CONFIG_MTD_NAND_AT91_MODULE)
-+static struct at91_nand_data nand_data;
-+
-+#define NAND_BASE     AT91_CHIPSELECT_3
-+
-+static struct resource nand_resources[] = {
-+      {
-+              .start  = NAND_BASE,
-+              .end    = NAND_BASE + SZ_256M - 1,
-+              .flags  = IORESOURCE_MEM,
-+      }
-+};
-+
-+static struct platform_device at91_nand_device = {
-+      .name           = "at91_nand",
-+      .id             = -1,
-+      .dev            = {
-+                              .platform_data  = &nand_data,
-+      },
-+      .resource       = nand_resources,
-+      .num_resources  = ARRAY_SIZE(nand_resources),
-+};
-+
-+void __init at91_add_device_nand(struct at91_nand_data *data)
-+{
-+      unsigned long csa;
-+
-+      if (!data)
-+              return;
-+
-+      csa = at91_sys_read(AT91_MATRIX_EBICSA);
-+      at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA);
-+
-+      /* set the bus interface characteristics */
-+      at91_sys_write(AT91_SMC_SETUP(3), AT91_SMC_NWESETUP_(0) | AT91_SMC_NCS_WRSETUP_(0)
-+                      | AT91_SMC_NRDSETUP_(0) | AT91_SMC_NCS_RDSETUP_(0));
-+
-+      at91_sys_write(AT91_SMC_PULSE(3), AT91_SMC_NWEPULSE_(2) | AT91_SMC_NCS_WRPULSE_(5)
-+                      | AT91_SMC_NRDPULSE_(2) | AT91_SMC_NCS_RDPULSE_(5));
-+
-+      at91_sys_write(AT91_SMC_CYCLE(3), AT91_SMC_NWECYCLE_(7) | AT91_SMC_NRDCYCLE_(7));
-+
-+      at91_sys_write(AT91_SMC_MODE(3), AT91_SMC_DBW_8 | AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_TDF_(1));
-+
-+      /* enable pin */
-+      if (data->enable_pin)
-+              at91_set_gpio_output(data->enable_pin, 1);
-+
-+      /* ready/busy pin */
-+      if (data->rdy_pin)
-+              at91_set_gpio_input(data->rdy_pin, 1);
-+
-+      /* card detect pin */
-+      if (data->det_pin)
-+              at91_set_gpio_input(data->det_pin, 1);
-+
-+      at91_set_A_periph(AT91_PIN_PB4, 0);             /* NANDOE */
-+      at91_set_A_periph(AT91_PIN_PB5, 0);             /* NANDWE */
-+
-+      nand_data = *data;
-+      platform_device_register(&at91_nand_device);
-+}
-+
-+#else
-+void __init at91_add_device_nand(struct at91_nand_data *data) {}
-+#endif
-+
-+
-+/* --------------------------------------------------------------------
-+ *  TWI (i2c)
-+ * -------------------------------------------------------------------- */
-+
-+#if defined(CONFIG_I2C_AT91) || defined(CONFIG_I2C_AT91_MODULE)
-+
-+static struct resource twi_resources[] = {
-+      [0] = {
-+              .start  = AT91SAM9RL_BASE_TWI0,
-+              .end    = AT91SAM9RL_BASE_TWI0 + SZ_16K - 1,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      [1] = {
-+              .start  = AT91SAM9RL_ID_TWI0,
-+              .end    = AT91SAM9RL_ID_TWI0,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct platform_device at91sam9rl_twi_device = {
-+      .name           = "at91_i2c",
-+      .id             = -1,
-+      .resource       = twi_resources,
-+      .num_resources  = ARRAY_SIZE(twi_resources),
-+};
-+
-+void __init at91_add_device_i2c(void)
-+{
-+      /* pins used for TWI interface */
-+      at91_set_A_periph(AT91_PIN_PA23, 0);            /* TWD */
-+      at91_set_multi_drive(AT91_PIN_PA23, 1);
-+
-+      at91_set_A_periph(AT91_PIN_PA24, 0);            /* TWCK */
-+      at91_set_multi_drive(AT91_PIN_PA24, 1);
-+
-+      platform_device_register(&at91sam9rl_twi_device);
-+}
-+#else
-+void __init at91_add_device_i2c(void) {}
-+#endif
-+
-+
-+/* --------------------------------------------------------------------
-+ *  SPI
-+ * -------------------------------------------------------------------- */
-+
-+#if defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE)
-+static u64 spi_dmamask = 0xffffffffUL;
-+
-+static struct resource spi_resources[] = {
-+      [0] = {
-+              .start  = AT91SAM9RL_BASE_SPI,
-+              .end    = AT91SAM9RL_BASE_SPI + SZ_16K - 1,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      [1] = {
-+              .start  = AT91SAM9RL_ID_SPI,
-+              .end    = AT91SAM9RL_ID_SPI,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct platform_device at91sam9rl_spi_device = {
-+      .name           = "atmel_spi",
-+      .id             = 0,
-+      .dev            = {
-+                              .dma_mask               = &spi_dmamask,
-+                              .coherent_dma_mask      = 0xffffffff,
-+      },
-+      .resource       = spi_resources,
-+      .num_resources  = ARRAY_SIZE(spi_resources),
-+};
-+
-+static const unsigned spi_standard_cs[4] = { AT91_PIN_PA28, AT91_PIN_PB7, AT91_PIN_PD8, AT91_PIN_PD9 };
-+
-+
-+void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
-+{
-+      int i;
-+      unsigned long cs_pin;
-+
-+      at91_set_A_periph(AT91_PIN_PA25, 0);    /* MISO */
-+      at91_set_A_periph(AT91_PIN_PA26, 0);    /* MOSI */
-+      at91_set_A_periph(AT91_PIN_PA27, 0);    /* SPCK */
-+
-+      /* Enable SPI chip-selects */
-+      for (i = 0; i < nr_devices; i++) {
-+              if (devices[i].controller_data)
-+                      cs_pin = (unsigned long) devices[i].controller_data;
-+              else
-+                      cs_pin = spi_standard_cs[devices[i].chip_select];
-+
-+              /* enable chip-select pin */
-+              at91_set_gpio_output(cs_pin, 1);
-+
-+              /* pass chip-select pin to driver */
-+              devices[i].controller_data = (void *) cs_pin;
-+      }
-+
-+      spi_register_board_info(devices, nr_devices);
-+      platform_device_register(&at91sam9rl_spi_device);
-+}
-+#else
-+void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices) {}
-+#endif
-+
-+
-+/* --------------------------------------------------------------------
-+ *  LCD Controller
-+ * -------------------------------------------------------------------- */
-+
-+#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)
-+static u64 lcdc_dmamask = 0xffffffffUL;
-+static struct atmel_lcdfb_info lcdc_data;
-+
-+static struct resource lcdc_resources[] = {
-+      [0] = {
-+              .start  = AT91SAM9RL_LCDC_BASE,
-+              .end    = AT91SAM9RL_LCDC_BASE + SZ_4K - 1,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      [1] = {
-+              .start  = AT91SAM9RL_ID_LCDC,
-+              .end    = AT91SAM9RL_ID_LCDC,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+#if defined(CONFIG_FB_INTSRAM)
-+      [2] = {
-+              .start  = AT91SAM9RL_SRAM_BASE,
-+              .end    = AT91SAM9RL_SRAM_BASE + AT91SAM9RL_SRAM_SIZE - 1,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+#endif
-+};
-+
-+static struct platform_device at91_lcdc_device = {
-+      .name           = "atmel_lcdfb",
-+      .id             = 0,
-+      .dev            = {
-+                              .dma_mask               = &lcdc_dmamask,
-+                              .coherent_dma_mask      = 0xffffffff,
-+                              .platform_data          = &lcdc_data,
-+      },
-+      .resource       = lcdc_resources,
-+      .num_resources  = ARRAY_SIZE(lcdc_resources),
-+};
-+
-+void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
-+{
-+      if (!data) {
-+              return;
-+      }
-+
-+#warning "Check this"
-+      at91_set_B_periph(AT91_PIN_PC5, 0);     /* LCDHSYNC */
-+      at91_set_B_periph(AT91_PIN_PC6, 0);     /* LCDDOTCK */
-+      at91_set_B_periph(AT91_PIN_PC7, 0);     /* LCDDEN */
-+      at91_set_B_periph(AT91_PIN_PC3, 0);     /* LCDCC */
-+      at91_set_B_periph(AT91_PIN_PC9, 0);     /* LCDD3 */
-+      at91_set_B_periph(AT91_PIN_PC10, 0);    /* LCDD4 */
-+      at91_set_B_periph(AT91_PIN_PC11, 0);    /* LCDD5 */
-+      at91_set_B_periph(AT91_PIN_PC12, 0);    /* LCDD6 */
-+      at91_set_B_periph(AT91_PIN_PC13, 0);    /* LCDD7 */
-+      at91_set_B_periph(AT91_PIN_PC15, 0);    /* LCDD11 */
-+      at91_set_B_periph(AT91_PIN_PC16, 0);    /* LCDD12 */
-+      at91_set_B_periph(AT91_PIN_PC17, 0);    /* LCDD13 */
-+      at91_set_B_periph(AT91_PIN_PC18, 0);    /* LCDD14 */
-+      at91_set_B_periph(AT91_PIN_PC19, 0);    /* LCDD15 */
-+      at91_set_B_periph(AT91_PIN_PC20, 0);    /* LCDD18 */
-+      at91_set_B_periph(AT91_PIN_PC21, 0);    /* LCDD19 */
-+      at91_set_B_periph(AT91_PIN_PC22, 0);    /* LCDD20 */
-+      at91_set_B_periph(AT91_PIN_PC23, 0);    /* LCDD21 */
-+      at91_set_B_periph(AT91_PIN_PC24, 0);    /* LCDD22 */
-+      at91_set_B_periph(AT91_PIN_PC25, 0);    /* LCDD23 */
-+
-+      lcdc_data = *data;
-+      platform_device_register(&at91_lcdc_device);
-+}
-+#else
-+void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {}
-+#endif
-+
-+
-+/* --------------------------------------------------------------------
-+ *  LEDs
-+ * -------------------------------------------------------------------- */
-+
-+#if defined(CONFIG_LEDS)
-+u8 at91_leds_cpu;
-+u8 at91_leds_timer;
-+
-+void __init at91_init_leds(u8 cpu_led, u8 timer_led)
-+{
-+      /* Enable GPIO to access the LEDs */
-+      at91_set_gpio_output(cpu_led, 1);
-+      at91_set_gpio_output(timer_led, 1);
-+
-+      at91_leds_cpu   = cpu_led;
-+      at91_leds_timer = timer_led;
-+}
-+#else
-+void __init at91_init_leds(u8 cpu_led, u8 timer_led) {}
-+#endif
-+
-+
-+#if defined(CONFIG_NEW_LEDS)
-+
-+static struct platform_device at91_leds = {
-+      .name           = "at91_leds",
-+      .id             = -1,
-+};
-+
-+void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr)
-+{
-+      if (!nr)
-+              return;
-+
-+      at91_leds.dev.platform_data = leds;
-+
-+      for ( ; nr; nr--, leds++) {
-+              leds->index = nr;       /* first record stores number of leds */
-+              at91_set_gpio_output(leds->gpio, (leds->flags & 1) == 0);
-+      }
-+
-+      platform_device_register(&at91_leds);
-+}
-+#else
-+void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr) {}
-+#endif
-+
-+
-+/* --------------------------------------------------------------------
-+ *  UART
-+ * -------------------------------------------------------------------- */
-+
-+#if defined(CONFIG_SERIAL_ATMEL)
-+static struct resource dbgu_resources[] = {
-+      [0] = {
-+              .start  = AT91_VA_BASE_SYS + AT91_DBGU,
-+              .end    = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      [1] = {
-+              .start  = AT91_ID_SYS,
-+              .end    = AT91_ID_SYS,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct atmel_uart_data dbgu_data = {
-+      .use_dma_tx     = 0,
-+      .use_dma_rx     = 0,            /* DBGU not capable of receive DMA */
-+      .regs           = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),
-+};
-+
-+static struct platform_device at91sam9rl_dbgu_device = {
-+      .name           = "atmel_usart",
-+      .id             = 0,
-+      .dev            = {
-+                              .platform_data  = &dbgu_data,
-+                              .coherent_dma_mask = 0xffffffff,
-+      },
-+      .resource       = dbgu_resources,
-+      .num_resources  = ARRAY_SIZE(dbgu_resources),
-+};
-+
-+static inline void configure_dbgu_pins(void)
-+{
-+      at91_set_A_periph(AT91_PIN_PA21, 0);            /* DRXD */
-+      at91_set_A_periph(AT91_PIN_PA22, 1);            /* DTXD */
-+}
-+
-+static struct resource uart0_resources[] = {
-+      [0] = {
-+              .start  = AT91SAM9RL_BASE_US0,
-+              .end    = AT91SAM9RL_BASE_US0 + SZ_16K - 1,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      [1] = {
-+              .start  = AT91SAM9RL_ID_US0,
-+              .end    = AT91SAM9RL_ID_US0,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct atmel_uart_data uart0_data = {
-+      .use_dma_tx     = 1,
-+      .use_dma_rx     = 1,
-+};
-+
-+static struct platform_device at91sam9rl_uart0_device = {
-+      .name           = "atmel_usart",
-+      .id             = 1,
-+      .dev            = {
-+                              .platform_data  = &uart0_data,
-+                              .coherent_dma_mask = 0xffffffff,
-+      },
-+      .resource       = uart0_resources,
-+      .num_resources  = ARRAY_SIZE(uart0_resources),
-+};
-+
-+static inline void configure_usart0_pins(void)
-+{
-+      at91_set_A_periph(AT91_PIN_PA6, 1);             /* TXD0 */
-+      at91_set_A_periph(AT91_PIN_PA7, 0);             /* RXD0 */
-+      at91_set_A_periph(AT91_PIN_PA9, 0);             /* RTS0 */
-+      at91_set_A_periph(AT91_PIN_PA10, 0);            /* CTS0 */
-+}
-+
-+static struct resource uart1_resources[] = {
-+      [0] = {
-+              .start  = AT91SAM9RL_BASE_US1,
-+              .end    = AT91SAM9RL_BASE_US1 + SZ_16K - 1,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      [1] = {
-+              .start  = AT91SAM9RL_ID_US1,
-+              .end    = AT91SAM9RL_ID_US1,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct atmel_uart_data uart1_data = {
-+      .use_dma_tx     = 1,
-+      .use_dma_rx     = 1,
-+};
-+
-+static struct platform_device at91sam9rl_uart1_device = {
-+      .name           = "atmel_usart",
-+      .id             = 2,
-+      .dev            = {
-+                              .platform_data  = &uart1_data,
-+                              .coherent_dma_mask = 0xffffffff,
-+      },
-+      .resource       = uart1_resources,
-+      .num_resources  = ARRAY_SIZE(uart1_resources),
-+};
-+
-+static inline void configure_usart1_pins(void)
-+{
-+      at91_set_A_periph(AT91_PIN_PA11, 1);            /* TXD1 */
-+      at91_set_A_periph(AT91_PIN_PA12, 0);            /* RXD1 */
-+}
-+
-+static struct resource uart2_resources[] = {
-+      [0] = {
-+              .start  = AT91SAM9RL_BASE_US2,
-+              .end    = AT91SAM9RL_BASE_US2 + SZ_16K - 1,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      [1] = {
-+              .start  = AT91SAM9RL_ID_US2,
-+              .end    = AT91SAM9RL_ID_US2,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct atmel_uart_data uart2_data = {
-+      .use_dma_tx     = 1,
-+      .use_dma_rx     = 1,
-+};
-+
-+static struct platform_device at91sam9rl_uart2_device = {
-+      .name           = "atmel_usart",
-+      .id             = 3,
-+      .dev            = {
-+                              .platform_data  = &uart2_data,
-+                              .coherent_dma_mask = 0xffffffff,
-+      },
-+      .resource       = uart2_resources,
-+      .num_resources  = ARRAY_SIZE(uart2_resources),
-+};
-+
-+static inline void configure_usart2_pins(void)
-+{
-+      at91_set_A_periph(AT91_PIN_PA13, 1);            /* TXD2 */
-+      at91_set_A_periph(AT91_PIN_PA14, 0);            /* RXD2 */
-+}
-+
-+static struct resource uart3_resources[] = {
-+      [0] = {
-+              .start  = AT91SAM9RL_BASE_US3,
-+              .end    = AT91SAM9RL_BASE_US3 + SZ_16K - 1,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      [1] = {
-+              .start  = AT91SAM9RL_ID_US3,
-+              .end    = AT91SAM9RL_ID_US3,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct atmel_uart_data uart3_data = {
-+      .use_dma_tx     = 1,
-+      .use_dma_rx     = 1,
-+};
-+
-+static struct platform_device at91sam9rl_uart3_device = {
-+      .name           = "atmel_usart",
-+      .id             = 4,
-+      .dev            = {
-+                              .platform_data  = &uart3_data,
-+                              .coherent_dma_mask = 0xffffffff,
-+      },
-+      .resource       = uart3_resources,
-+      .num_resources  = ARRAY_SIZE(uart3_resources),
-+};
-+
-+static inline void configure_usart3_pins(void)
-+{
-+      at91_set_A_periph(AT91_PIN_PB0, 1);             /* TXD3 */
-+      at91_set_A_periph(AT91_PIN_PB1, 0);             /* RXD3 */
-+}
-+
-+struct platform_device *at91_uarts[ATMEL_MAX_UART];   /* the UARTs to use */
-+struct platform_device *atmel_default_console_device; /* the serial console device */
-+
-+void __init at91_init_serial(struct at91_uart_config *config)
-+{
-+      int i;
-+
-+      /* Fill in list of supported UARTs */
-+      for (i = 0; i < config->nr_tty; i++) {
-+              switch (config->tty_map[i]) {
-+                      case 0:
-+                              configure_usart0_pins();
-+                              at91_uarts[i] = &at91sam9rl_uart0_device;
-+                              at91_clock_associate("usart0_clk", &at91sam9rl_uart0_device.dev, "usart");
-+                              break;
-+                      case 1:
-+                              configure_usart1_pins();
-+                              at91_uarts[i] = &at91sam9rl_uart1_device;
-+                              at91_clock_associate("usart1_clk", &at91sam9rl_uart1_device.dev, "usart");
-+                              break;
-+                      case 2:
-+                              configure_usart2_pins();
-+                              at91_uarts[i] = &at91sam9rl_uart2_device;
-+                              at91_clock_associate("usart2_clk", &at91sam9rl_uart2_device.dev, "usart");
-+                              break;
-+                      case 3:
-+                              configure_usart3_pins();
-+                              at91_uarts[i] = &at91sam9rl_uart3_device;
-+                              at91_clock_associate("usart3_clk", &at91sam9rl_uart3_device.dev, "usart");
-+                              break;
-+                      case 4:
-+                              configure_dbgu_pins();
-+                              at91_uarts[i] = &at91sam9rl_dbgu_device;
-+                              at91_clock_associate("mck", &at91sam9rl_dbgu_device.dev, "usart");
-+                              break;
-+                      default:
-+                              continue;
-+              }
-+              at91_uarts[i]->id = i;          /* update ID number to mapped ID */
-+      }
-+
-+      /* Set serial console device */
-+      if (config->console_tty < ATMEL_MAX_UART)
-+              atmel_default_console_device = at91_uarts[config->console_tty];
-+      if (!atmel_default_console_device)
-+              printk(KERN_INFO "AT91: No default serial console defined.\n");
-+}
-+
-+void __init at91_add_device_serial(void)
-+{
-+      int i;
-+
-+      for (i = 0; i < ATMEL_MAX_UART; i++) {
-+              if (at91_uarts[i])
-+                      platform_device_register(at91_uarts[i]);
-+      }
-+}
-+#else
-+void __init at91_init_serial(struct at91_uart_config *config) {}
-+void __init at91_add_device_serial(void) {}
-+#endif
-+
-+
-+/* -------------------------------------------------------------------- */
-+
-+/*
-+ * These devices are always present and don't need any board-specific
-+ * setup.
-+ */
-+static int __init at91_add_standard_devices(void)
-+{
-+      return 0;
-+}
-+
-+arch_initcall(at91_add_standard_devices);
-Index: linux-2.6.21.7/arch/arm/mach-at91/board-cam60.c
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/arch/arm/mach-at91/board-cam60.c
-@@ -0,0 +1,148 @@
-+/*
-+ * KwikByte CAM60
-+ *
-+ * based on board-sam9260ek.c
-+ *   Copyright (C) 2005 SAN People
-+ *   Copyright (C) 2006 Atmel
-+ *
-+ * 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/types.h>
-+#include <linux/init.h>
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/flash.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/setup.h>
-+#include <asm/mach-types.h>
-+#include <asm/irq.h>
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/map.h>
-+#include <asm/mach/irq.h>
-+
-+#include <asm/arch/board.h>
-+#include <asm/arch/gpio.h>
-+#include <asm/arch/at91sam926x_mc.h>
-+
-+#include "generic.h"
-+
-+
-+/*
-+ * Serial port configuration.
-+ *    0 .. 5 = USART0 .. USART5
-+ *    6      = DBGU
-+ */
-+static struct at91_uart_config __initdata cam60_uart_config = {
-+      .console_tty    = 0,                            /* ttyS0 */
-+      .nr_tty         = 1,
-+      .tty_map        = { 6, -1, -1, -1, -1, -1, -1 } /* ttyS0, ..., ttyS6 */
-+};
-+
-+static void __init cam60_map_io(void)
-+{
-+      /* Initialize processor: 10 MHz crystal */
-+      at91sam9260_initialize(10000000);
-+
-+      /* Setup the serial ports and console */
-+      at91_init_serial(&cam60_uart_config);
-+}
-+
-+static void __init cam60_init_irq(void)
-+{
-+      at91sam9260_init_interrupts(NULL);
-+}
-+
-+
-+/*
-+ * SPI devices.
-+ */
-+#if defined(CONFIG_MTD_DATAFLASH)
-+static struct mtd_partition __initdata cam60_spi_partitions[] = {
-+      {
-+              .name   = "BOOT1",
-+              .offset = 0,
-+              .size   = 4 * 1056,
-+      },
-+      {
-+              .name   = "BOOT2",
-+              .offset = MTDPART_OFS_NXTBLK,
-+              .size   = 256 * 1056,
-+      },
-+      {
-+              .name   = "kernel",
-+              .offset = MTDPART_OFS_NXTBLK,
-+              .size   = 2222 * 1056,
-+      },
-+      {
-+              .name   = "file system",
-+              .offset = MTDPART_OFS_NXTBLK,
-+              .size   = MTDPART_SIZ_FULL,
-+      },
-+};
-+
-+static struct flash_platform_data __initdata cam60_spi_flash_platform_data = {
-+      .name           = "spi_flash",
-+      .parts          = cam60_spi_partitions,
-+      .nr_parts       = ARRAY_SIZE(cam60_spi_partitions)
-+};
-+#endif
-+
-+static struct spi_board_info cam60_spi_devices[] = {
-+#if defined(CONFIG_MTD_DATAFLASH)
-+      {       /* DataFlash chip */
-+              .modalias       = "mtd_dataflash",
-+              .chip_select    = 0,
-+              .max_speed_hz   = 15 * 1000 * 1000,
-+              .bus_num        = 0,
-+              .platform_data  = &cam60_spi_flash_platform_data
-+      },
-+#endif
-+};
-+
-+
-+/*
-+ * MACB Ethernet device
-+ */
-+static struct __initdata at91_eth_data cam60_macb_data = {
-+      .phy_irq_pin    = AT91_PIN_PB5,
-+      .is_rmii        = 0,
-+};
-+
-+
-+static void __init cam60_board_init(void)
-+{
-+      /* Serial */
-+      at91_add_device_serial();
-+      /* SPI */
-+      at91_add_device_spi(cam60_spi_devices, ARRAY_SIZE(cam60_spi_devices));
-+      /* Ethernet */
-+      at91_add_device_eth(&cam60_macb_data);
-+}
-+
-+MACHINE_START(CAM60, "KwikByte CAM60")
-+      /* Maintainer: KwikByte */
-+      .phys_io        = AT91_BASE_SYS,
-+      .io_pg_offst    = (AT91_VA_BASE_SYS >> 18) & 0xfffc,
-+      .boot_params    = AT91_SDRAM_BASE + 0x100,
-+      .timer          = &at91sam926x_timer,
-+      .map_io         = cam60_map_io,
-+      .init_irq       = cam60_init_irq,
-+      .init_machine   = cam60_board_init,
-+MACHINE_END
-Index: linux-2.6.21.7/arch/arm/mach-at91/board-chub.c
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/arch/arm/mach-at91/board-chub.c
-@@ -0,0 +1,132 @@
-+/*
-+ * linux/arch/arm/mach-at91/board-chub.c
-+ *
-+ *  Copyright (C) 2005 SAN People, adapted for Promwad Chub board
-+ *  by Kuten Ivan
-+ *
-+ * 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/types.h>
-+#include <linux/init.h>
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/setup.h>
-+#include <asm/mach-types.h>
-+#include <asm/irq.h>
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/map.h>
-+#include <asm/mach/irq.h>
-+
-+#include <asm/arch/board.h>
-+#include <asm/arch/gpio.h>
-+
-+#include "generic.h"
-+
-+/*
-+ * Serial port configuration.
-+ *    0 .. 3 = USART0 .. USART3
-+ *    4      = DBGU
-+ */
-+static struct at91_uart_config __initdata chub_uart_config = {
-+      .console_tty    = 0,                            /* ttyS0 */
-+      .nr_tty         = 5,
-+      .tty_map        = { 4, 0, 1, 2, 3 }             /* ttyS0, ..., ttyS4 */
-+};
-+
-+static void __init chub_init_irq(void)
-+{
-+      at91rm9200_init_interrupts(NULL);
-+}
-+
-+static void __init chub_map_io(void)
-+{
-+      /* Initialize clocks: 18.432 MHz crystal */
-+      at91rm9200_initialize(18432000, AT91RM9200_PQFP);
-+
-+      /* Setup the serial ports and console */
-+      at91_init_serial(&chub_uart_config);
-+}
-+
-+static struct at91_eth_data __initdata chub_eth_data = {
-+      .phy_irq_pin    = AT91_PIN_PB29,
-+      .is_rmii        = 0,
-+};
-+
-+static struct mtd_partition __initdata chub_nand_partition[] = {
-+      {
-+              .name   = "NAND Partition 1",
-+              .offset = 0,
-+              .size   = MTDPART_SIZ_FULL,
-+      },
-+};
-+
-+static struct mtd_partition *nand_partitions(int size, int *num_partitions)
-+{
-+      *num_partitions = ARRAY_SIZE(chub_nand_partition);
-+      return chub_nand_partition;
-+}
-+
-+static struct at91_nand_data __initdata chub_nand_data = {
-+      .ale            = 22,
-+      .cle            = 21,
-+      .enable_pin     = AT91_PIN_PA27,
-+      .partition_info = nand_partitions,
-+};
-+
-+static struct spi_board_info chub_spi_devices[] = {
-+      {       /* DataFlash chip */
-+              .modalias       = "mtd_dataflash",
-+              .chip_select    = 0,
-+              .max_speed_hz   = 15 * 1000 * 1000,
-+      },
-+};
-+
-+static void __init chub_board_init(void)
-+{
-+      /* Serial */
-+      at91_add_device_serial();
-+      /* I2C */
-+      at91_add_device_i2c();
-+      /* Ethernet */
-+      at91_add_device_eth(&chub_eth_data);
-+      /* SPI */
-+      at91_add_device_spi(chub_spi_devices, ARRAY_SIZE(chub_spi_devices));
-+      /* NAND Flash */
-+      at91_add_device_nand(&chub_nand_data);
-+      /* Disable write protect for NAND */
-+      at91_set_gpio_output(AT91_PIN_PB7, 1);
-+      /* Power enable for 3x RS-232 and 1x RS-485 */
-+      at91_set_gpio_output(AT91_PIN_PB9, 1);
-+      /* Disable write protect for FRAM */
-+      at91_set_gpio_output(AT91_PIN_PA21, 1);
-+      /* Disable write protect for Dataflash */
-+      at91_set_gpio_output(AT91_PIN_PA19, 1);
-+}
-+
-+MACHINE_START(CHUB, "Promwad Chub")
-+      /* Maintainer: Ivan Kuten AT Promwad DOT com */
-+      .phys_io        = AT91_BASE_SYS,
-+      .io_pg_offst    = (AT91_VA_BASE_SYS >> 18) & 0xfffc,
-+      .boot_params    = AT91_SDRAM_BASE + 0x100,
-+      .timer          = &at91rm9200_timer,
-+      .map_io         = chub_map_io,
-+      .init_irq       = chub_init_irq,
-+      .init_machine   = chub_board_init,
-+MACHINE_END
-Index: linux-2.6.21.7/arch/arm/mach-at91/board-csb337.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/board-csb337.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/board-csb337.c
-@@ -24,6 +24,7 @@
- #include <linux/module.h>
- #include <linux/platform_device.h>
- #include <linux/spi/spi.h>
-+#include <linux/interrupt.h>
- #include <linux/mtd/physmap.h>
- #include <asm/hardware.h>
-@@ -59,6 +60,7 @@ static void __init csb337_map_io(void)
-       /* Setup the LEDs */
-       at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1);
-+      at91_set_gpio_output(AT91_PIN_PB2, 1);          /* third (unused) LED */
-       /* Setup the serial ports and console */
-       at91_init_serial(&csb337_uart_config);
-@@ -149,6 +151,55 @@ static struct platform_device csb_flash 
-       .num_resources  = ARRAY_SIZE(csb_flash_resources),
- };
-+static struct at91_gpio_led csb337_leds[] = {
-+      {
-+              .name           = "led0",
-+              .gpio           = AT91_PIN_PB0,
-+              .trigger        = "heartbeat",
-+      },
-+      {
-+              .name           = "led1",
-+              .gpio           = AT91_PIN_PB1,
-+              .trigger        = "timer",
-+      },
-+      {
-+              .name           = "led2",
-+              .gpio           = AT91_PIN_PB2,
-+      }
-+};
-+
-+#if defined(CONFIG_CSB300_WAKE_SW0) || defined(CONFIG_CSB300_WAKE_SW1)
-+static irqreturn_t switch_irq_handler(int irq, void *context)
-+{
-+      return IRQ_HANDLED;
-+}
-+
-+static inline void __init switch_irq_setup(int irq, char *name, unsigned long mode)
-+{
-+      int res;
-+
-+      res = request_irq(irq, switch_irq_handler, IRQF_SAMPLE_RANDOM | mode, name, NULL);
-+      if (res == 0)
-+              enable_irq_wake(irq);
-+}
-+
-+static void __init csb300_switches(void)
-+{
-+#ifdef CONFIG_CSB300_WAKE_SW0
-+      at91_set_A_periph(AT91_PIN_PB29, 1);            /* IRQ0 */
-+      switch_irq_setup(AT91RM9200_ID_IRQ0, "csb300_sw0", IRQF_TRIGGER_FALLING);
-+#endif
-+#ifdef CONFIG_CSB300_WAKE_SW1
-+      at91_set_gpio_input(AT91_PIN_PB28, 1);
-+      at91_set_deglitch(AT91_PIN_PB28, 1);
-+      switch_irq_setup(AT91_PIN_PB28, "csb300_sw1", IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING);
-+#endif
-+      /* there's also SW2 at PA21, GPIO or TIOA2 */
-+}
-+#else
-+static void __init csb300_switches(void) {}
-+#endif
-+
- static void __init csb337_board_init(void)
- {
-       /* Serial */
-@@ -168,8 +219,12 @@ static void __init csb337_board_init(voi
-       at91_add_device_spi(csb337_spi_devices, ARRAY_SIZE(csb337_spi_devices));
-       /* MMC */
-       at91_add_device_mmc(0, &csb337_mmc_data);
-+      /* LEDS */
-+      at91_gpio_leds(csb337_leds, ARRAY_SIZE(csb337_leds));
-       /* NOR flash */
-       platform_device_register(&csb_flash);
-+      /* Switches on CSB300 */
-+      csb300_switches();
- }
- MACHINE_START(CSB337, "Cogent CSB337")
-Index: linux-2.6.21.7/arch/arm/mach-at91/board-dk.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/board-dk.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/board-dk.c
-@@ -73,6 +73,185 @@ static void __init dk_init_irq(void)
-       at91rm9200_init_interrupts(NULL);
- }
-+#if defined(CONFIG_FB_S1D13XXX) || defined(CONFIG_FB_S1D13XXX_MODULE)
-+#include <video/s1d13xxxfb.h>
-+#include <asm/arch/ics1523.h>
-+
-+/* EPSON S1D13806 FB */
-+#define AT91_FB_REG_BASE      0x30000000L
-+#define AT91_FB_REG_SIZE      0x200
-+#define AT91_FB_VMEM_BASE     0x30200000L
-+#define AT91_FB_VMEM_SIZE     0x140000L
-+
-+static void __init dk_init_video(void)
-+{
-+      /* NWAIT Signal */
-+      at91_set_A_periph(AT91_PIN_PC6, 0);
-+
-+      /* Initialization of the Static Memory Controller for Chip Select 2 */
-+      at91_sys_write(AT91_SMC_CSR(2), AT91_SMC_DBW_16                 /* 16 bit */
-+                              | AT91_SMC_WSEN | AT91_SMC_NWS_(4)      /* wait states */
-+                              | AT91_SMC_TDF_(1)                      /* float time */
-+      );
-+
-+      at91_ics1523_init();
-+}
-+
-+/* CRT:    (active)   640x480 60Hz (PCLK=CLKI=25.175MHz)
-+   Memory: Embedded SDRAM (MCLK=CLKI3=50.000MHz) (BUSCLK=60.000MHz) */
-+static const struct s1d13xxxfb_regval dk_s1dfb_initregs[] = {
-+      {S1DREG_MISC,                   0x00},  /* Enable Memory/Register select bit */
-+      {S1DREG_COM_DISP_MODE,          0x00},  /* disable display output */
-+      {S1DREG_GPIO_CNF0,              0x00},
-+      {S1DREG_GPIO_CNF1,              0x00},
-+      {S1DREG_GPIO_CTL0,              0x08},
-+      {S1DREG_GPIO_CTL1,              0x00},
-+      {S1DREG_CLK_CNF,                0x01},  /* no divide, MCLK source is CLKI3 0x02*/
-+      {S1DREG_LCD_CLK_CNF,            0x00},
-+      {S1DREG_CRT_CLK_CNF,            0x00},
-+      {S1DREG_MPLUG_CLK_CNF,          0x00},
-+      {S1DREG_CPU2MEM_WST_SEL,        0x01},  /* 2*period(MCLK) - 4ns > period(BCLK) */
-+      {S1DREG_SDRAM_REF_RATE,         0x03},  /* 32768 <= MCLK <= 50000 (MHz) */
-+      {S1DREG_SDRAM_TC0,              0x00},  /* MCLK source freq (MHz): */
-+      {S1DREG_SDRAM_TC1,              0x01},  /* 42 <= MCLK <= 50 */
-+      {S1DREG_MEM_CNF,                0x80},  /* SDRAM Initialization - needed before mem access */
-+      {S1DREG_PANEL_TYPE,             0x25},  /* std TFT 16bit, 8bit SCP format 2, single passive LCD */
-+      {S1DREG_MOD_RATE,               0x00},  /* toggle every FPFRAME */
-+      {S1DREG_LCD_DISP_HWIDTH,        0x4F},  /* 680 pix */
-+      {S1DREG_LCD_NDISP_HPER,         0x12},  /* 152 pix */
-+      {S1DREG_TFT_FPLINE_START,       0x01},  /* 13 pix */
-+      {S1DREG_TFT_FPLINE_PWIDTH,      0x0B},  /* 96 pix */
-+      {S1DREG_LCD_DISP_VHEIGHT0,      0xDF},
-+      {S1DREG_LCD_DISP_VHEIGHT1,      0x01},  /* 480 lines */
-+      {S1DREG_LCD_NDISP_VPER,         0x2C},  /* 44 lines */
-+      {S1DREG_TFT_FPFRAME_START,      0x0A},  /* 10 lines */
-+      {S1DREG_TFT_FPFRAME_PWIDTH,     0x01},  /* 2 lines */
-+      {S1DREG_LCD_DISP_MODE,          0x05},  /* 16 bpp */
-+      {S1DREG_LCD_MISC,               0x00},  /* dithering enabled, dual panel buffer enabled */
-+      {S1DREG_LCD_DISP_START0,        0x00},
-+      {S1DREG_LCD_DISP_START1,        0xC8},
-+      {S1DREG_LCD_DISP_START2,        0x00},
-+      {S1DREG_LCD_MEM_OFF0,           0x80},
-+      {S1DREG_LCD_MEM_OFF1,           0x02},
-+      {S1DREG_LCD_PIX_PAN,            0x00},
-+      {S1DREG_LCD_DISP_FIFO_HTC,      0x3B},
-+      {S1DREG_LCD_DISP_FIFO_LTC,      0x3C},
-+      {S1DREG_CRT_DISP_HWIDTH,        0x4F},  /* 680 pix */
-+      {S1DREG_CRT_NDISP_HPER,         0x13},  /* 160 pix */
-+      {S1DREG_CRT_HRTC_START,         0x01},  /* 13 pix */
-+      {S1DREG_CRT_HRTC_PWIDTH,        0x0B},  /* 96 pix */
-+      {S1DREG_CRT_DISP_VHEIGHT0,      0xDF},
-+      {S1DREG_CRT_DISP_VHEIGHT1,      0x01},  /* 480 lines */
-+      {S1DREG_CRT_NDISP_VPER,         0x2B},  /* 44 lines */
-+      {S1DREG_CRT_VRTC_START,         0x09},  /* 10 lines */
-+      {S1DREG_CRT_VRTC_PWIDTH,        0x01},  /* 2 lines */
-+      {S1DREG_TV_OUT_CTL,             0x10},
-+      {S1DREG_CRT_DISP_MODE,          0x05},  /* 16 bpp */
-+      {S1DREG_CRT_DISP_START0,        0x00},
-+      {S1DREG_CRT_DISP_START1,        0x00},
-+      {S1DREG_CRT_DISP_START2,        0x00},
-+      {S1DREG_CRT_MEM_OFF0,           0x80},
-+      {S1DREG_CRT_MEM_OFF1,           0x02},
-+      {S1DREG_CRT_PIX_PAN,            0x00},
-+      {S1DREG_CRT_DISP_FIFO_HTC,      0x3B},
-+      {S1DREG_CRT_DISP_FIFO_LTC,      0x3C},
-+      {S1DREG_LCD_CUR_CTL,            0x00},  /* inactive */
-+      {S1DREG_LCD_CUR_START,          0x01},
-+      {S1DREG_LCD_CUR_XPOS0,          0x00},
-+      {S1DREG_LCD_CUR_XPOS1,          0x00},
-+      {S1DREG_LCD_CUR_YPOS0,          0x00},
-+      {S1DREG_LCD_CUR_YPOS1,          0x00},
-+      {S1DREG_LCD_CUR_BCTL0,          0x00},
-+      {S1DREG_LCD_CUR_GCTL0,          0x00},
-+      {S1DREG_LCD_CUR_RCTL0,          0x00},
-+      {S1DREG_LCD_CUR_BCTL1,          0x1F},
-+      {S1DREG_LCD_CUR_GCTL1,          0x3F},
-+      {S1DREG_LCD_CUR_RCTL1,          0x1F},
-+      {S1DREG_LCD_CUR_FIFO_HTC,       0x00},
-+      {S1DREG_CRT_CUR_CTL,            0x00},  /* inactive */
-+      {S1DREG_CRT_CUR_START,          0x01},
-+      {S1DREG_CRT_CUR_XPOS0,          0x00},
-+      {S1DREG_CRT_CUR_XPOS1,          0x00},
-+      {S1DREG_CRT_CUR_YPOS0,          0x00},
-+      {S1DREG_CRT_CUR_YPOS1,          0x00},
-+      {S1DREG_CRT_CUR_BCTL0,          0x00},
-+      {S1DREG_CRT_CUR_GCTL0,          0x00},
-+      {S1DREG_CRT_CUR_RCTL0,          0x00},
-+      {S1DREG_CRT_CUR_BCTL1,          0x1F},
-+      {S1DREG_CRT_CUR_GCTL1,          0x3F},
-+      {S1DREG_CRT_CUR_RCTL1,          0x1F},
-+      {S1DREG_CRT_CUR_FIFO_HTC,       0x00},
-+      {S1DREG_BBLT_CTL0,              0x00},
-+      {S1DREG_BBLT_CTL0,              0x00},
-+      {S1DREG_BBLT_CC_EXP,            0x00},
-+      {S1DREG_BBLT_OP,                0x00},
-+      {S1DREG_BBLT_SRC_START0,        0x00},
-+      {S1DREG_BBLT_SRC_START1,        0x00},
-+      {S1DREG_BBLT_SRC_START2,        0x00},
-+      {S1DREG_BBLT_DST_START0,        0x00},
-+      {S1DREG_BBLT_DST_START1,        0x00},
-+      {S1DREG_BBLT_DST_START2,        0x00},
-+      {S1DREG_BBLT_MEM_OFF0,          0x00},
-+      {S1DREG_BBLT_MEM_OFF1,          0x00},
-+      {S1DREG_BBLT_WIDTH0,            0x00},
-+      {S1DREG_BBLT_WIDTH1,            0x00},
-+      {S1DREG_BBLT_HEIGHT0,           0x00},
-+      {S1DREG_BBLT_HEIGHT1,           0x00},
-+      {S1DREG_BBLT_BGC0,              0x00},
-+      {S1DREG_BBLT_BGC1,              0x00},
-+      {S1DREG_BBLT_FGC0,              0x00},
-+      {S1DREG_BBLT_FGC1,              0x00},
-+      {S1DREG_LKUP_MODE,              0x00},  /* LCD LUT r | LCD and CRT/TV LUT w */
-+      {S1DREG_LKUP_ADDR,              0x00},
-+      {S1DREG_PS_CNF,                 0x00},  /* Power Save disable */
-+      {S1DREG_PS_STATUS,              0x02},  /* LCD Panel down, mem up */
-+      {S1DREG_CPU2MEM_WDOGT,          0x00},
-+      {S1DREG_COM_DISP_MODE,          0x02},  /* enable CRT display output */
-+};
-+
-+static struct s1d13xxxfb_pdata dk_s1dfb_pdata = {
-+      .initregs               = dk_s1dfb_initregs,
-+      .initregssize           = ARRAY_SIZE(dk_s1dfb_initregs),
-+      .platform_init_video    = dk_init_video,
-+};
-+
-+static u64 s1dfb_dmamask = 0xffffffffUL;
-+
-+static struct resource dk_s1dfb_resource[] = {
-+      [0] = { /* video mem */
-+              .name   = "s1d13806 memory",
-+              .start  = AT91_FB_VMEM_BASE,
-+              .end    = AT91_FB_VMEM_BASE + AT91_FB_VMEM_SIZE -1,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      [1] = { /* video registers */
-+              .name   = "s1d13806 registers",
-+              .start  = AT91_FB_REG_BASE,
-+              .end    = AT91_FB_REG_BASE + AT91_FB_REG_SIZE -1,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+};
-+
-+static struct platform_device dk_s1dfb_device = {
-+      .name           = "s1d13806fb",
-+      .id             = -1,
-+      .dev            = {
-+                      .dma_mask               = &s1dfb_dmamask,
-+                      .coherent_dma_mask      = 0xffffffff,
-+                      .platform_data          = &dk_s1dfb_pdata,
-+      },
-+      .resource       = dk_s1dfb_resource,
-+      .num_resources  = ARRAY_SIZE(dk_s1dfb_resource),
-+};
-+
-+static void __init dk_add_device_video(void)
-+{
-+      platform_device_register(&dk_s1dfb_device);
-+}
-+#else
-+static void __init dk_add_device_video(void) {}
-+#endif
-+
- static struct at91_eth_data __initdata dk_eth_data = {
-       .phy_irq_pin    = AT91_PIN_PC4,
-       .is_rmii        = 1,
-@@ -151,7 +330,7 @@ static struct at91_nand_data __initdata 
- #define DK_FLASH_SIZE 0x200000
- static struct physmap_flash_data dk_flash_data = {
--      .width  = 2,
-+      .width          = 2,
- };
- static struct resource dk_flash_resource = {
-@@ -170,6 +349,13 @@ static struct platform_device dk_flash =
-       .num_resources  = 1,
- };
-+static struct at91_gpio_led dk_leds[] = {
-+      {
-+              .name           = "led0",
-+              .gpio           = AT91_PIN_PB2,
-+              .trigger        = "timer",
-+      }
-+};
- static void __init dk_board_init(void)
- {
-@@ -200,8 +386,10 @@ static void __init dk_board_init(void)
-       at91_add_device_nand(&dk_nand_data);
-       /* NOR Flash */
-       platform_device_register(&dk_flash);
-+      /* LEDs */
-+      at91_gpio_leds(dk_leds, ARRAY_SIZE(dk_leds));
-       /* VGA */
--//    dk_add_device_video();
-+      dk_add_device_video();
- }
- MACHINE_START(AT91RM9200DK, "Atmel AT91RM9200-DK")
-Index: linux-2.6.21.7/arch/arm/mach-at91/board-ek.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/board-ek.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/board-ek.c
-@@ -73,6 +73,187 @@ static void __init ek_init_irq(void)
-       at91rm9200_init_interrupts(NULL);
- }
-+#if defined(CONFIG_FB_S1D13XXX) || defined(CONFIG_FB_S1D13XXX_MODULE)
-+#include <video/s1d13xxxfb.h>
-+#include <asm/arch/ics1523.h>
-+
-+/* EPSON S1D13806 FB */
-+#define AT91_FB_REG_BASE      0x40000000L
-+#define       AT91_FB_REG_SIZE        0x200
-+#define AT91_FB_VMEM_BASE     0x40200000L
-+#define AT91_FB_VMEM_SIZE     0x140000L
-+
-+static void __init ek_init_video(void)
-+{
-+      /* NWAIT Signal */
-+      at91_set_A_periph(AT91_PIN_PC6, 0);
-+
-+      /* Initialization of the Static Memory Controller for Chip Select 3 */
-+      at91_sys_write(AT91_SMC_CSR(3), AT91_SMC_DBW_16                 /* 16 bit */
-+                              | AT91_SMC_WSEN | AT91_SMC_NWS_(5)      /* wait states */
-+                              | AT91_SMC_TDF_(1)                      /* float time */
-+      );
-+
-+      at91_ics1523_init();
-+}
-+
-+/* CRT:    (active)   640x480 60Hz (PCLK=CLKI=25.175MHz)
-+   Memory: Embedded SDRAM (MCLK=CLKI3=50.000MHz) (BUSCLK=60.000MHz) */
-+static const struct s1d13xxxfb_regval ek_s1dfb_initregs[] = {
-+      {S1DREG_MISC,                   0x00},  /* Enable Memory/Register select bit */
-+      {S1DREG_COM_DISP_MODE,          0x00},  /* disable display output */
-+      {S1DREG_GPIO_CNF0,              0xFF},  // 0x00
-+      {S1DREG_GPIO_CNF1,              0x1F},  // 0x08
-+      {S1DREG_GPIO_CTL0,              0x00},
-+      {S1DREG_GPIO_CTL1,              0x00},
-+      {S1DREG_CLK_CNF,                0x01},  /* no divide, MCLK source is CLKI3 0x02*/
-+      {S1DREG_LCD_CLK_CNF,            0x00},
-+      {S1DREG_CRT_CLK_CNF,            0x00},
-+      {S1DREG_MPLUG_CLK_CNF,          0x00},
-+      {S1DREG_CPU2MEM_WST_SEL,        0x01},  /* 2*period(MCLK) - 4ns > period(BCLK) */
-+      {S1DREG_SDRAM_REF_RATE,         0x03},  /* 32768 <= MCLK <= 50000 (MHz) */
-+      {S1DREG_SDRAM_TC0,              0x00},  /* MCLK source freq (MHz): */
-+      {S1DREG_SDRAM_TC1,              0x01},  /* 42 <= MCLK <= 50 */
-+      {S1DREG_MEM_CNF,                0x80},  /* SDRAM Initialization - needed before mem access */
-+      {S1DREG_PANEL_TYPE,             0x25},  /* std TFT 16bit, 8bit SCP format 2, single passive LCD */
-+      {S1DREG_MOD_RATE,               0x00},  /* toggle every FPFRAME */
-+      {S1DREG_LCD_DISP_HWIDTH,        0x4F},  /* 680 pix */
-+      {S1DREG_LCD_NDISP_HPER,         0x12},  /* 152 pix */
-+      {S1DREG_TFT_FPLINE_START,       0x01},  /* 13 pix */
-+      {S1DREG_TFT_FPLINE_PWIDTH,      0x0B},  /* 96 pix */
-+      {S1DREG_LCD_DISP_VHEIGHT0,      0xDF},
-+      {S1DREG_LCD_DISP_VHEIGHT1,      0x01},  /* 480 lines */
-+      {S1DREG_LCD_NDISP_VPER,         0x2C},  /* 44 lines */
-+      {S1DREG_TFT_FPFRAME_START,      0x0A},  /* 10 lines */
-+      {S1DREG_TFT_FPFRAME_PWIDTH,     0x01},  /* 2 lines */
-+      {S1DREG_LCD_DISP_MODE,          0x05},  /* 16 bpp */
-+      {S1DREG_LCD_MISC,               0x00},  /* dithering enabled, dual panel buffer enabled */
-+      {S1DREG_LCD_DISP_START0,        0x00},
-+      {S1DREG_LCD_DISP_START1,        0xC8},
-+      {S1DREG_LCD_DISP_START2,        0x00},
-+      {S1DREG_LCD_MEM_OFF0,           0x80},
-+      {S1DREG_LCD_MEM_OFF1,           0x02},
-+      {S1DREG_LCD_PIX_PAN,            0x00},
-+      {S1DREG_LCD_DISP_FIFO_HTC,      0x3B},
-+      {S1DREG_LCD_DISP_FIFO_LTC,      0x3C},
-+      {S1DREG_CRT_DISP_HWIDTH,        0x4F},  /* 680 pix */
-+      {S1DREG_CRT_NDISP_HPER,         0x13},  /* 160 pix */
-+      {S1DREG_CRT_HRTC_START,         0x01},  /* 13 pix */
-+      {S1DREG_CRT_HRTC_PWIDTH,        0x0B},  /* 96 pix */
-+      {S1DREG_CRT_DISP_VHEIGHT0,      0xDF},
-+      {S1DREG_CRT_DISP_VHEIGHT1,      0x01},  /* 480 lines */
-+      {S1DREG_CRT_NDISP_VPER,         0x2B},  /* 44 lines */
-+      {S1DREG_CRT_VRTC_START,         0x09},  /* 10 lines */
-+      {S1DREG_CRT_VRTC_PWIDTH,        0x01},  /* 2 lines */
-+      {S1DREG_TV_OUT_CTL,             0x10},
-+      {0x005E,                        0x9F},
-+      {0x005F,                        0x00},
-+      {S1DREG_CRT_DISP_MODE,          0x05},  /* 16 bpp */
-+      {S1DREG_CRT_DISP_START0,        0x00},
-+      {S1DREG_CRT_DISP_START1,        0x00},
-+      {S1DREG_CRT_DISP_START2,        0x00},
-+      {S1DREG_CRT_MEM_OFF0,           0x80},
-+      {S1DREG_CRT_MEM_OFF1,           0x02},
-+      {S1DREG_CRT_PIX_PAN,            0x00},
-+      {S1DREG_CRT_DISP_FIFO_HTC,      0x3B},
-+      {S1DREG_CRT_DISP_FIFO_LTC,      0x3C},
-+      {S1DREG_LCD_CUR_CTL,            0x00},  /* inactive */
-+      {S1DREG_LCD_CUR_START,          0x01},
-+      {S1DREG_LCD_CUR_XPOS0,          0x00},
-+      {S1DREG_LCD_CUR_XPOS1,          0x00},
-+      {S1DREG_LCD_CUR_YPOS0,          0x00},
-+      {S1DREG_LCD_CUR_YPOS1,          0x00},
-+      {S1DREG_LCD_CUR_BCTL0,          0x00},
-+      {S1DREG_LCD_CUR_GCTL0,          0x00},
-+      {S1DREG_LCD_CUR_RCTL0,          0x00},
-+      {S1DREG_LCD_CUR_BCTL1,          0x1F},
-+      {S1DREG_LCD_CUR_GCTL1,          0x3F},
-+      {S1DREG_LCD_CUR_RCTL1,          0x1F},
-+      {S1DREG_LCD_CUR_FIFO_HTC,       0x00},
-+      {S1DREG_CRT_CUR_CTL,            0x00},  /* inactive */
-+      {S1DREG_CRT_CUR_START,          0x01},
-+      {S1DREG_CRT_CUR_XPOS0,          0x00},
-+      {S1DREG_CRT_CUR_XPOS1,          0x00},
-+      {S1DREG_CRT_CUR_YPOS0,          0x00},
-+      {S1DREG_CRT_CUR_YPOS1,          0x00},
-+      {S1DREG_CRT_CUR_BCTL0,          0x00},
-+      {S1DREG_CRT_CUR_GCTL0,          0x00},
-+      {S1DREG_CRT_CUR_RCTL0,          0x00},
-+      {S1DREG_CRT_CUR_BCTL1,          0x1F},
-+      {S1DREG_CRT_CUR_GCTL1,          0x3F},
-+      {S1DREG_CRT_CUR_RCTL1,          0x1F},
-+      {S1DREG_CRT_CUR_FIFO_HTC,       0x00},
-+      {S1DREG_BBLT_CTL0,              0x00},
-+      {S1DREG_BBLT_CTL0,              0x00},
-+      {S1DREG_BBLT_CC_EXP,            0x00},
-+      {S1DREG_BBLT_OP,                0x00},
-+      {S1DREG_BBLT_SRC_START0,        0x00},
-+      {S1DREG_BBLT_SRC_START1,        0x00},
-+      {S1DREG_BBLT_SRC_START2,        0x00},
-+      {S1DREG_BBLT_DST_START0,        0x00},
-+      {S1DREG_BBLT_DST_START1,        0x00},
-+      {S1DREG_BBLT_DST_START2,        0x00},
-+      {S1DREG_BBLT_MEM_OFF0,          0x00},
-+      {S1DREG_BBLT_MEM_OFF1,          0x00},
-+      {S1DREG_BBLT_WIDTH0,            0x00},
-+      {S1DREG_BBLT_WIDTH1,            0x00},
-+      {S1DREG_BBLT_HEIGHT0,           0x00},
-+      {S1DREG_BBLT_HEIGHT1,           0x00},
-+      {S1DREG_BBLT_BGC0,              0x00},
-+      {S1DREG_BBLT_BGC1,              0x00},
-+      {S1DREG_BBLT_FGC0,              0x00},
-+      {S1DREG_BBLT_FGC1,              0x00},
-+      {S1DREG_LKUP_MODE,              0x00},  /* LCD LUT r | LCD and CRT/TV LUT w */
-+      {S1DREG_LKUP_ADDR,              0x00},
-+      {S1DREG_PS_CNF,                 0x10},  /* Power Save disable */
-+      {S1DREG_PS_STATUS,              0x02},  /* LCD Panel down, mem up */
-+      {S1DREG_CPU2MEM_WDOGT,          0x00},
-+      {S1DREG_COM_DISP_MODE,          0x02},  /* enable CRT display output */
-+};
-+
-+static struct s1d13xxxfb_pdata ek_s1dfb_pdata = {
-+      .initregs               = ek_s1dfb_initregs,
-+      .initregssize           = ARRAY_SIZE(ek_s1dfb_initregs),
-+      .platform_init_video    = ek_init_video,
-+};
-+
-+static u64 s1dfb_dmamask = 0xffffffffUL;
-+
-+static struct resource ek_s1dfb_resource[] = {
-+      [0] = { /* video mem */
-+              .name   = "s1d13806 memory",
-+              .start  = AT91_FB_VMEM_BASE,
-+              .end    = AT91_FB_VMEM_BASE + AT91_FB_VMEM_SIZE -1,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      [1] = { /* video registers */
-+              .name   = "s1d13806 registers",
-+              .start  = AT91_FB_REG_BASE,
-+              .end    = AT91_FB_REG_BASE + AT91_FB_REG_SIZE -1,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+};
-+
-+static struct platform_device ek_s1dfb_device = {
-+      .name           = "s1d13806fb",
-+      .id             = -1,
-+      .dev            = {
-+                      .dma_mask               = &s1dfb_dmamask,
-+                      .coherent_dma_mask      = 0xffffffff,
-+                      .platform_data          = &ek_s1dfb_pdata,
-+      },
-+      .resource       = ek_s1dfb_resource,
-+      .num_resources  = ARRAY_SIZE(ek_s1dfb_resource),
-+};
-+
-+static void __init ek_add_device_video(void)
-+{
-+      platform_device_register(&ek_s1dfb_device);
-+}
-+#else
-+static void __init ek_add_device_video(void) {}
-+#endif
-+
- static struct at91_eth_data __initdata ek_eth_data = {
-       .phy_irq_pin    = AT91_PIN_PC4,
-       .is_rmii        = 1,
-@@ -113,7 +294,7 @@ static struct spi_board_info ek_spi_devi
- #define EK_FLASH_SIZE 0x200000
- static struct physmap_flash_data ek_flash_data = {
--      .width  = 2,
-+      .width          = 2,
- };
- static struct resource ek_flash_resource = {
-@@ -132,6 +313,18 @@ static struct platform_device ek_flash =
-       .num_resources  = 1,
- };
-+static struct at91_gpio_led ek_leds[] = {
-+      {
-+              .name           = "led0",
-+              .gpio           = AT91_PIN_PB1,
-+              .trigger        = "heartbeat",
-+      },
-+      {
-+              .name           = "led1",
-+              .gpio           = AT91_PIN_PB2,
-+              .trigger        = "timer",
-+      }
-+};
- static void __init ek_board_init(void)
- {
-@@ -158,8 +351,10 @@ static void __init ek_board_init(void)
- #endif
-       /* NOR Flash */
-       platform_device_register(&ek_flash);
-+      /* LEDs */
-+      at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
-       /* VGA */
--//    ek_add_device_video();
-+      ek_add_device_video();
- }
- MACHINE_START(AT91RM9200EK, "Atmel AT91RM9200-EK")
-Index: linux-2.6.21.7/arch/arm/mach-at91/board-kb9202.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/board-kb9202.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/board-kb9202.c
-@@ -37,6 +37,8 @@
- #include <asm/arch/board.h>
- #include <asm/arch/gpio.h>
-+#include <asm/arch/at91rm9200_mc.h>
-+
- #include "generic.h"
-@@ -111,6 +113,48 @@ static struct at91_nand_data __initdata 
-       .partition_info = nand_partitions,
- };
-+
-+#if defined(CONFIG_FB_S1D15605)
-+#warning "Rather pass reset pin via platform_data"
-+static struct resource kb9202_lcd_resources[] = {
-+      [0] = {
-+              .start  = AT91_CHIPSELECT_2,
-+              .end    = AT91_CHIPSELECT_2 + 0x200FF,
-+              .flags  = IORESOURCE_MEM
-+      },
-+      [1] = { /* reset pin */
-+              .start  = AT91_PIN_PC22,
-+              .end    = AT91_PIN_PC22,
-+              .flags  = IORESOURCE_MEM
-+      },
-+};
-+
-+static struct platform_device kb9202_lcd_device = {
-+      .name           = "s1d15605fb",
-+      .id             = 0,
-+      .num_resources  = ARRAY_SIZE(kb9202_lcd_resources),
-+      .resource       = kb9202_lcd_resources,
-+};
-+
-+static void __init kb9202_add_device_lcd(void)
-+{
-+      /* In case the boot loader did not set the chip select mode and timing */
-+      at91_sys_write(AT91_SMC_CSR(2),
-+              AT91_SMC_WSEN | AT91_SMC_NWS_(18) | AT91_SMC_TDF_(1) | AT91_SMC_DBW_8 |
-+              AT91_SMC_RWSETUP_(1) | AT91_SMC_RWHOLD_(1));
-+
-+      /* Backlight pin = output, off */
-+      at91_set_gpio_output(AT91_PIN_PC23, 0);
-+
-+      /* Reset pin = output, in reset */
-+      at91_set_gpio_output(AT91_PIN_PC22, 0);
-+
-+      platform_device_register(&kb9202_lcd_device);
-+}
-+#else
-+static void __init kb9202_add_device_lcd(void) {}
-+#endif
-+
- static void __init kb9202_board_init(void)
- {
-       /* Serial */
-@@ -129,6 +173,8 @@ static void __init kb9202_board_init(voi
-       at91_add_device_spi(NULL, 0);
-       /* NAND */
-       at91_add_device_nand(&kb9202_nand_data);
-+      /* LCD  */
-+      kb9202_add_device_lcd();
- }
- MACHINE_START(KB9200, "KB920x")
-Index: linux-2.6.21.7/arch/arm/mach-at91/board-sam9260ek.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/board-sam9260ek.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/board-sam9260ek.c
-@@ -104,9 +104,9 @@ static struct spi_board_info ek_spi_devi
-       },
- #endif
- #endif
--#if defined(CONFIG_SND_AT73C213)
-+#if defined(CONFIG_SND_AT73C213) || defined(CONFIG_SND_AT73C213_MODULE)
-       {       /* AT73C213 DAC */
--              .modalias       = "snd_at73c213",
-+              .modalias       = "at73c213",
-               .chip_select    = 0,
-               .max_speed_hz   = 10 * 1000 * 1000,
-               .bus_num        = 1,
-@@ -118,7 +118,7 @@ static struct spi_board_info ek_spi_devi
- /*
-  * MACB Ethernet device
-  */
--static struct __initdata at91_eth_data ek_macb_data = {
-+static struct at91_eth_data __initdata ek_macb_data = {
-       .phy_irq_pin    = AT91_PIN_PA7,
-       .is_rmii        = 1,
- };
-@@ -188,6 +188,8 @@ static void __init ek_board_init(void)
-       at91_add_device_eth(&ek_macb_data);
-       /* MMC */
-       at91_add_device_mmc(0, &ek_mmc_data);
-+      /* I2C */
-+      at91_add_device_i2c();
- }
- MACHINE_START(AT91SAM9260EK, "Atmel AT91SAM9260-EK")
-Index: linux-2.6.21.7/arch/arm/mach-at91/board-sam9261ek.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/board-sam9261ek.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/board-sam9261ek.c
-@@ -25,7 +25,11 @@
- #include <linux/module.h>
- #include <linux/platform_device.h>
- #include <linux/spi/spi.h>
-+#include <linux/spi/ads7846.h>
- #include <linux/dm9000.h>
-+#include <linux/fb.h>
-+
-+#include <video/atmel_lcdc.h>
- #include <asm/hardware.h>
- #include <asm/setup.h>
-@@ -59,6 +63,9 @@ static void __init ek_map_io(void)
-       /* Initialize processor: 18.432 MHz crystal */
-       at91sam9261_initialize(18432000);
-+      /* Setup the LEDs */
-+      at91_init_leds(AT91_PIN_PA13, AT91_PIN_PA14);
-+
-       /* Setup the serial ports and console */
-       at91_init_serial(&ek_uart_config);
- }
-@@ -195,6 +202,41 @@ static struct at91_nand_data __initdata 
- };
- /*
-+ * ADS7846 Touchscreen
-+ */
-+#if defined(CONFIG_TOUCHSCREEN_ADS7846) || defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
-+
-+static int ads7843_pendown_state(void)
-+{
-+      return !at91_get_gpio_value(AT91_PIN_PC2);      /* Touchscreen PENIRQ */
-+}
-+
-+static struct ads7846_platform_data ads_info = {
-+      .model                  = 7843,
-+      .x_min                  = 150,
-+      .x_max                  = 3830,
-+      .y_min                  = 190,
-+      .y_max                  = 3830,
-+      .vref_delay_usecs       = 100,
-+      .x_plate_ohms           = 450,
-+      .y_plate_ohms           = 250,
-+      .pressure_max           = 15000,
-+      .debounce_max           = 1,
-+      .debounce_rep           = 0,
-+      .debounce_tol           = (~0),
-+      .get_pendown_state      = ads7843_pendown_state,
-+};
-+
-+static void __init ek_add_device_ts(void)
-+{
-+      at91_set_B_periph(AT91_PIN_PC2, 1);     /* External IRQ0, with pullup */
-+      at91_set_gpio_input(AT91_PIN_PA11, 1);  /* Touchscreen BUSY signal */
-+}
-+#else
-+static void __init ek_add_device_ts(void) {}
-+#endif
-+
-+/*
-  * SPI devices
-  */
- static struct spi_board_info ek_spi_devices[] = {
-@@ -204,6 +246,17 @@ static struct spi_board_info ek_spi_devi
-               .max_speed_hz   = 15 * 1000 * 1000,
-               .bus_num        = 0,
-       },
-+#if defined(CONFIG_TOUCHSCREEN_ADS7846) || defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
-+      {
-+              .modalias       = "ads7846",
-+              .chip_select    = 2,
-+              .max_speed_hz   = 125000 * 26,  /* (max sample rate @ 3V) * (cmd + data + overhead) */
-+              .bus_num        = 0,
-+              .platform_data  = &ads_info,
-+              .irq            = AT91SAM9261_ID_IRQ0,
-+              .controller_data = AT91_PIN_PA28,       /* CS pin */
-+      },
-+#endif
- #if defined(CONFIG_MTD_AT91_DATAFLASH_CARD)
-       {       /* DataFlash card - jumper (J12) configurable to CS3 or CS0 */
-               .modalias       = "mtd_dataflash",
-@@ -211,9 +264,9 @@ static struct spi_board_info ek_spi_devi
-               .max_speed_hz   = 15 * 1000 * 1000,
-               .bus_num        = 0,
-       },
--#elif defined(CONFIG_SND_AT73C213)
-+#elif defined(CONFIG_SND_AT73C213) || defined(CONFIG_SND_AT73C213_MODULE)
-       {       /* AT73C213 DAC */
--              .modalias       = "snd_at73c213",
-+              .modalias       = "at73c213",
-               .chip_select    = 3,
-               .max_speed_hz   = 10 * 1000 * 1000,
-               .bus_num        = 0,
-@@ -222,6 +275,65 @@ static struct spi_board_info ek_spi_devi
- };
-+/*
-+ * LCD Controller
-+ */
-+#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)
-+static struct fb_videomode at91_tft_vga_modes[] = {
-+      {
-+              .name           = "TX09D50VM1CCA @ 60",
-+              .refresh        = 60,
-+              .xres           = 240,          .yres           = 320,
-+              .pixclock       = KHZ2PICOS(4965),
-+
-+              .left_margin    = 1,            .right_margin   = 33,
-+              .upper_margin   = 1,            .lower_margin   = 0,
-+              .hsync_len      = 5,            .vsync_len      = 1,
-+
-+              .sync           = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-+              .vmode          = FB_VMODE_NONINTERLACED,
-+      },
-+};
-+
-+static struct fb_monspecs at91fb_default_monspecs = {
-+      .manufacturer   = "HIT",
-+      .monitor        = "TX09D50VM1CCA",
-+
-+      .modedb         = at91_tft_vga_modes,
-+      .modedb_len     = ARRAY_SIZE(at91_tft_vga_modes),
-+      .hfmin          = 15000,
-+      .hfmax          = 64000,
-+      .vfmin          = 50,
-+      .vfmax          = 150,
-+};
-+
-+#define AT91SAM9261_DEFAULT_LCDCON2   (ATMEL_LCDC_MEMOR_LITTLE \
-+                                      | ATMEL_LCDC_DISTYPE_TFT    \
-+                                      | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE)
-+
-+static void at91_lcdc_power_control(int on)
-+{
-+      if (on)
-+              at91_set_gpio_value(AT91_PIN_PA12, 0);  /* power up */
-+      else
-+              at91_set_gpio_value(AT91_PIN_PA12, 1);  /* power down */
-+}
-+
-+/* Driver datas */
-+static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
-+      .default_bpp                    = 16,
-+      .default_dmacon                 = ATMEL_LCDC_DMAEN,
-+      .default_lcdcon2                = AT91SAM9261_DEFAULT_LCDCON2,
-+      .default_monspecs               = &at91fb_default_monspecs,
-+      .atmel_lcdfb_power_control      = at91_lcdc_power_control,
-+      .guard_time                     = 1,
-+};
-+
-+#else
-+static struct atmel_lcdfb_info __initdata ek_lcdc_data;
-+#endif
-+
-+
- static void __init ek_board_init(void)
- {
-       /* Serial */
-@@ -241,10 +353,14 @@ static void __init ek_board_init(void)
- #if defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE)
-       /* SPI */
-       at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices));
-+      /* Touchscreen */
-+      ek_add_device_ts();
- #else
-       /* MMC */
-       at91_add_device_mmc(0, &ek_mmc_data);
- #endif
-+      /* LCD Controller */
-+      at91_add_device_lcdc(&ek_lcdc_data);
- }
- MACHINE_START(AT91SAM9261EK, "Atmel AT91SAM9261-EK")
-Index: linux-2.6.21.7/arch/arm/mach-at91/board-sam9263ek.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/board-sam9263ek.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/board-sam9263ek.c
-@@ -25,6 +25,10 @@
- #include <linux/module.h>
- #include <linux/platform_device.h>
- #include <linux/spi/spi.h>
-+#include <linux/spi/ads7846.h>
-+#include <linux/fb.h>
-+
-+#include <video/atmel_lcdc.h>
- #include <asm/hardware.h>
- #include <asm/setup.h>
-@@ -86,6 +90,40 @@ static struct at91_udc_data __initdata e
- /*
-+ * ADS7846 Touchscreen
-+ */
-+#if defined(CONFIG_TOUCHSCREEN_ADS7846) || defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
-+static int ads7843_pendown_state(void)
-+{
-+      return !at91_get_gpio_value(AT91_PIN_PA15);     /* Touchscreen PENIRQ */
-+}
-+
-+static struct ads7846_platform_data ads_info = {
-+      .model                  = 7843,
-+      .x_min                  = 150,
-+      .x_max                  = 3830,
-+      .y_min                  = 190,
-+      .y_max                  = 3830,
-+      .vref_delay_usecs       = 100,
-+      .x_plate_ohms           = 450,
-+      .y_plate_ohms           = 250,
-+      .pressure_max           = 15000,
-+      .debounce_max           = 1,
-+      .debounce_rep           = 0,
-+      .debounce_tol           = (~0),
-+      .get_pendown_state      = ads7843_pendown_state,
-+};
-+
-+static void __init ek_add_device_ts(void)
-+{
-+      at91_set_B_periph(AT91_PIN_PA15, 1);    /* External IRQ1, with pullup */
-+      at91_set_gpio_input(AT91_PIN_PA31, 1);  /* Touchscreen BUSY signal */
-+}
-+#else
-+static void __init ek_add_device_ts(void) {}
-+#endif
-+
-+/*
-  * SPI devices.
-  */
- static struct spi_board_info ek_spi_devices[] = {
-@@ -97,6 +135,16 @@ static struct spi_board_info ek_spi_devi
-               .bus_num        = 0,
-       },
- #endif
-+#if defined(CONFIG_TOUCHSCREEN_ADS7846) || defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
-+      {
-+              .modalias       = "ads7846",
-+              .chip_select    = 3,
-+              .max_speed_hz   = 125000 * 26,  /* (max sample rate @ 3V) * (cmd + data + overhead) */
-+              .bus_num        = 0,
-+              .platform_data  = &ads_info,
-+              .irq            = AT91SAM9263_ID_IRQ1,
-+      },
-+#endif
- };
-@@ -112,6 +160,14 @@ static struct at91_mmc_data __initdata e
- /*
-+ * MACB Ethernet device
-+ */
-+static struct at91_eth_data __initdata ek_macb_data = {
-+      .is_rmii        = 1,
-+};
-+
-+
-+/*
-  * NAND flash
-  */
- static struct mtd_partition __initdata ek_nand_partition[] = {
-@@ -148,6 +204,73 @@ static struct at91_nand_data __initdata 
- };
-+/*
-+ * LCD Controller
-+ */
-+#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)
-+static struct fb_videomode at91_tft_vga_modes[] = {
-+      {
-+              .name           = "TX09D50VM1CCA @ 60",
-+              .refresh        = 60,
-+              .xres           = 240,          .yres           = 320,
-+              .pixclock       = KHZ2PICOS(4965),
-+
-+              .left_margin    = 1,            .right_margin   = 33,
-+              .upper_margin   = 1,            .lower_margin   = 0,
-+              .hsync_len      = 5,            .vsync_len      = 1,
-+
-+              .sync           = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-+              .vmode          = FB_VMODE_NONINTERLACED,
-+      },
-+};
-+
-+static struct fb_monspecs at91fb_default_monspecs = {
-+      .manufacturer   = "HIT",
-+      .monitor        = "TX09D70VM1CCA",
-+
-+      .modedb         = at91_tft_vga_modes,
-+      .modedb_len     = ARRAY_SIZE(at91_tft_vga_modes),
-+      .hfmin          = 15000,
-+      .hfmax          = 64000,
-+      .vfmin          = 50,
-+      .vfmax          = 150,
-+};
-+
-+#define AT91SAM9263_DEFAULT_LCDCON2   (ATMEL_LCDC_MEMOR_LITTLE \
-+                                      | ATMEL_LCDC_DISTYPE_TFT    \
-+                                      | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE)
-+
-+static void at91_lcdc_power_control(int on)
-+{
-+      if (on)
-+              at91_set_gpio_value(AT91_PIN_PD12, 0);  /* power up */
-+      else
-+              at91_set_gpio_value(AT91_PIN_PD12, 1);  /* power down */
-+}
-+
-+/* Driver datas */
-+static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
-+      .default_bpp                    = 16,
-+      .default_dmacon                 = ATMEL_LCDC_DMAEN,
-+      .default_lcdcon2                = AT91SAM9263_DEFAULT_LCDCON2,
-+      .default_monspecs               = &at91fb_default_monspecs,
-+      .atmel_lcdfb_power_control      = at91_lcdc_power_control,
-+      .guard_time                     = 1,
-+};
-+
-+#else
-+static struct atmel_lcdfb_info __initdata ek_lcdc_data;
-+#endif
-+
-+
-+/*
-+ * AC97
-+ */
-+static struct atmel_ac97_data ek_ac97_data = {
-+      .reset_pin      = AT91_PIN_PA13,
-+};
-+
-+
- static void __init ek_board_init(void)
- {
-       /* Serial */
-@@ -157,11 +280,22 @@ static void __init ek_board_init(void)
-       /* USB Device */
-       at91_add_device_udc(&ek_udc_data);
-       /* SPI */
-+      at91_set_gpio_output(AT91_PIN_PE20, 1);         /* select spi0 clock */
-       at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices));
-+      /* Touchscreen */
-+      ek_add_device_ts();
-       /* MMC */
-       at91_add_device_mmc(1, &ek_mmc_data);
-+      /* Ethernet */
-+      at91_add_device_eth(&ek_macb_data);
-       /* NAND */
-       at91_add_device_nand(&ek_nand_data);
-+      /* I2C */
-+      at91_add_device_i2c();
-+      /* LCD Controller */
-+      at91_add_device_lcdc(&ek_lcdc_data);
-+      /* AC97 */
-+      at91_add_device_ac97(&ek_ac97_data);
- }
- MACHINE_START(AT91SAM9263EK, "Atmel AT91SAM9263-EK")
-Index: linux-2.6.21.7/arch/arm/mach-at91/board-sam9rlek.c
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/arch/arm/mach-at91/board-sam9rlek.c
-@@ -0,0 +1,204 @@
-+/*
-+ *  Copyright (C) 2005 SAN People
-+ *  Copyright (C) 2007 Atmel Corporation
-+ *
-+ * 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/types.h>
-+#include <linux/init.h>
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/fb.h>
-+#include <linux/clk.h>
-+
-+#include <video/atmel_lcdc.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/setup.h>
-+#include <asm/mach-types.h>
-+#include <asm/irq.h>
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/map.h>
-+#include <asm/mach/irq.h>
-+
-+#include <asm/arch/board.h>
-+#include <asm/arch/gpio.h>
-+#include <asm/arch/at91sam926x_mc.h>
-+
-+#include "generic.h"
-+
-+
-+/*
-+ * Serial port configuration.
-+ *    0 .. 3 = USART0 .. USART3
-+ *    4      = DBGU
-+ */
-+static struct at91_uart_config __initdata ek_uart_config = {
-+      .console_tty    = 0,                            /* ttyS0 */
-+      .nr_tty         = 2,
-+      .tty_map        = { 4, 0, -1, -1, -1 }          /* ttyS0, ..., ttyS4 */
-+};
-+
-+static void __init ek_map_io(void)
-+{
-+      /* Initialize processor: 12.000 MHz crystal */
-+      at91sam9rl_initialize(12000000);
-+
-+      /* Setup the serial ports and console */
-+      at91_init_serial(&ek_uart_config);
-+}
-+
-+static void __init ek_init_irq(void)
-+{
-+      at91sam9rl_init_interrupts(NULL);
-+}
-+
-+
-+/*
-+ * MCI (SD/MMC)
-+ */
-+static struct at91_mmc_data __initdata ek_mmc_data = {
-+      .wire4          = 1,
-+      .det_pin        = AT91_PIN_PA15,
-+//    .wp_pin         = ... not connected
-+//    .vcc_pin        = ... not connected
-+};
-+
-+
-+/*
-+ * NAND flash
-+ */
-+static struct mtd_partition __initdata ek_nand_partition[] = {
-+      {
-+              .name   = "Partition 1",
-+              .offset = 0,
-+              .size   = 256 * 1024,
-+      },
-+      {
-+              .name   = "Partition 2",
-+              .offset = 256 * 1024 ,
-+              .size   = MTDPART_SIZ_FULL,
-+      },
-+};
-+
-+static struct mtd_partition *nand_partitions(int size, int *num_partitions)
-+{
-+      *num_partitions = ARRAY_SIZE(ek_nand_partition);
-+      return ek_nand_partition;
-+}
-+
-+static struct at91_nand_data __initdata ek_nand_data = {
-+      .ale            = 21,
-+      .cle            = 22,
-+//    .det_pin        = ... not connected
-+      .rdy_pin        = AT91_PIN_PD17,
-+      .enable_pin     = AT91_PIN_PB6,
-+      .partition_info = nand_partitions,
-+      .bus_width_16   = 0,
-+};
-+
-+
-+/*
-+ * SPI devices
-+ */
-+static struct spi_board_info ek_spi_devices[] = {
-+      {       /* DataFlash chip */
-+              .modalias       = "mtd_dataflash",
-+              .chip_select    = 0,
-+              .max_speed_hz   = 15 * 1000 * 1000,
-+              .bus_num        = 0,
-+      },
-+};
-+
-+
-+/*
-+ * LCD Controller
-+ */
-+#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)
-+static struct fb_videomode at91_tft_vga_modes[] = {
-+      {
-+              .name           = "TX09D50VM1CCA @ 60",
-+              .refresh        = 60,
-+              .xres           = 240,          .yres           = 320,
-+              .pixclock       = KHZ2PICOS(4965),
-+
-+              .left_margin    = 1,            .right_margin   = 33,
-+              .upper_margin   = 1,            .lower_margin   = 0,
-+              .hsync_len      = 5,            .vsync_len      = 1,
-+
-+              .sync           = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-+              .vmode          = FB_VMODE_NONINTERLACED,
-+      },
-+};
-+
-+static struct fb_monspecs at91fb_default_monspecs = {
-+      .manufacturer   = "HIT",
-+      .monitor        = "TX09D50VM1CCA",
-+
-+      .modedb         = at91_tft_vga_modes,
-+      .modedb_len     = ARRAY_SIZE(at91_tft_vga_modes),
-+      .hfmin          = 15000,
-+      .hfmax          = 64000,
-+      .vfmin          = 50,
-+      .vfmax          = 150,
-+};
-+
-+#define AT91SAM9RL_DEFAULT_LCDCON2    (ATMEL_LCDC_MEMOR_LITTLE \
-+                                      | ATMEL_LCDC_DISTYPE_TFT \
-+                                      | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE)
-+
-+static void at91_lcdc_power_control(int on)
-+{
-+      if (on)
-+              at91_set_gpio_value(AT91_PIN_PA30, 0);  /* power up */
-+      else
-+              at91_set_gpio_value(AT91_PIN_PA30, 1);  /* power down */
-+}
-+
-+/* Driver datas */
-+static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
-+      .default_bpp                    = 16,
-+      .default_dmacon                 = ATMEL_LCDC_DMAEN,
-+      .default_lcdcon2                = AT91SAM9RL_DEFAULT_LCDCON2,
-+      .default_monspecs               = &at91fb_default_monspecs,
-+      .atmel_lcdfb_power_control      = at91_lcdc_power_control,
-+      .guard_time                     = 1,
-+};
-+
-+#else
-+static struct atmel_lcdfb_info __initdata ek_lcdc_data;
-+#endif
-+
-+
-+static void __init ek_board_init(void)
-+{
-+      /* Serial */
-+      at91_add_device_serial();
-+      /* I2C */
-+      at91_add_device_i2c();
-+      /* NAND */
-+      at91_add_device_nand(&ek_nand_data);
-+      /* SPI */
-+      at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices));
-+      /* MMC */
-+      at91_add_device_mmc(0, &ek_mmc_data);
-+      /* LCD Controller */
-+      at91_add_device_lcdc(&ek_lcdc_data);
-+}
-+
-+MACHINE_START(AT91SAM9RLEK, "Atmel AT91SAM9RL-EK")
-+      /* Maintainer: Atmel */
-+      .phys_io        = AT91_BASE_SYS,
-+      .io_pg_offst    = (AT91_VA_BASE_SYS >> 18) & 0xfffc,
-+      .boot_params    = AT91_SDRAM_BASE + 0x100,
-+      .timer          = &at91sam926x_timer,
-+      .map_io         = ek_map_io,
-+      .init_irq       = ek_init_irq,
-+      .init_machine   = ek_board_init,
-+MACHINE_END
-Index: linux-2.6.21.7/arch/arm/mach-at91/clock.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/clock.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/clock.c
-@@ -32,6 +32,7 @@
- #include <asm/arch/cpu.h>
- #include "clock.h"
-+#include "generic.h"
- /*
-@@ -254,6 +255,23 @@ EXPORT_SYMBOL(clk_get_rate);
- /*------------------------------------------------------------------------*/
-+#ifdef CONFIG_PM
-+
-+int clk_must_disable(struct clk *clk)
-+{
-+      if (!at91_suspend_entering_slow_clock())
-+              return 0;
-+
-+      while (clk->parent)
-+              clk = clk->parent;
-+      return clk != &clk32k;
-+}
-+EXPORT_SYMBOL(clk_must_disable);
-+
-+#endif
-+
-+/*------------------------------------------------------------------------*/
-+
- #ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
- /*
-@@ -375,6 +393,7 @@ static int at91_clk_show(struct seq_file
-       seq_printf(s, "PLLB = %8x\n", at91_sys_read(AT91_CKGR_PLLBR));
-       seq_printf(s, "MCKR = %8x\n", at91_sys_read(AT91_PMC_MCKR));
-+#warning "Hard-coded PCK"
-       for (i = 0; i < 4; i++)
-               seq_printf(s, "PCK%d = %8x\n", i, at91_sys_read(AT91_PMC_PCKR(i)));
-       seq_printf(s, "SR   = %8x\n", sr = at91_sys_read(AT91_PMC_SR));
-Index: linux-2.6.21.7/arch/arm/mach-at91/generic.h
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/generic.h
-+++ linux-2.6.21.7/arch/arm/mach-at91/generic.h
-@@ -13,12 +13,14 @@ extern void __init at91rm9200_initialize
- extern void __init at91sam9260_initialize(unsigned long main_clock);
- extern void __init at91sam9261_initialize(unsigned long main_clock);
- extern void __init at91sam9263_initialize(unsigned long main_clock);
-+extern void __init at91sam9rl_initialize(unsigned long main_clock);
-  /* Interrupts */
- extern void __init at91rm9200_init_interrupts(unsigned int priority[]);
- extern void __init at91sam9260_init_interrupts(unsigned int priority[]);
- extern void __init at91sam9261_init_interrupts(unsigned int priority[]);
- extern void __init at91sam9263_init_interrupts(unsigned int priority[]);
-+extern void __init at91sam9rl_init_interrupts(unsigned int priority[]);
- extern void __init at91_aic_init(unsigned int priority[]);
-  /* Timer */
-@@ -34,6 +36,7 @@ extern void __init at91_clock_associate(
-  /* Power Management */
- extern void at91_irq_suspend(void);
- extern void at91_irq_resume(void);
-+extern int at91_suspend_entering_slow_clock(void);
-  /* GPIO */
- #define AT91RM9200_PQFP               3       /* AT91RM9200 PQFP package has 3 banks */
-Index: linux-2.6.21.7/arch/arm/mach-at91/ics1523.c
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/arch/arm/mach-at91/ics1523.c
-@@ -0,0 +1,207 @@
-+/*
-+ * arch/arm/mach-at91rm9200/ics1523.c
-+ *
-+ *  Copyright (C) 2003 ATMEL Rousset
-+ *
-+ * 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/hardware.h>
-+#include <asm/io.h>
-+
-+#include <linux/clk.h>
-+#include <linux/delay.h>
-+#include <linux/err.h>
-+#include <linux/init.h>
-+
-+#include <asm/arch/ics1523.h>
-+#include <asm/arch/at91_twi.h>
-+#include <asm/arch/gpio.h>
-+
-+/* TWI Errors */
-+#define       AT91_TWI_ERROR  (AT91_TWI_NACK | AT91_TWI_UNRE | AT91_TWI_OVRE)
-+
-+
-+static void __iomem *twi_base;
-+
-+#define at91_twi_read(reg)            __raw_readl(twi_base + (reg))
-+#define at91_twi_write(reg, val)      __raw_writel((val), twi_base + (reg))
-+
-+
-+/* -----------------------------------------------------------------------------
-+ * Initialization of TWI CLOCK
-+ * ----------------------------------------------------------------------------- */
-+
-+static void at91_ics1523_SetTwiClock(unsigned int mck_khz)
-+{
-+      int sclock;
-+
-+      /* Here, CKDIV = 1 and CHDIV = CLDIV  ==> CLDIV = CHDIV = 1/4*((Fmclk/FTWI) -6) */
-+      sclock = (10*mck_khz / ICS_TRANSFER_RATE);
-+      if (sclock % 10 >= 5)
-+              sclock = (sclock /10) - 5;
-+      else
-+              sclock = (sclock /10)- 6;
-+      sclock = (sclock + (4 - sclock %4)) >> 2;       /* div 4 */
-+
-+      at91_twi_write(AT91_TWI_CWGR, 0x00010000 | sclock | (sclock << 8));
-+}
-+
-+/* -----------------------------------------------------------------------------
-+ * Read a byte with TWI Interface from the Clock Generator ICS1523
-+ * ----------------------------------------------------------------------------- */
-+
-+static int at91_ics1523_ReadByte(unsigned char reg_address, unsigned char *data_in)
-+{
-+      int Status, nb_trial;
-+
-+      at91_twi_write(AT91_TWI_MMR, AT91_TWI_MREAD | AT91_TWI_IADRSZ_1 | ((ICS_ADDR << 16) & AT91_TWI_DADR));
-+      at91_twi_write(AT91_TWI_IADR, reg_address);
-+      at91_twi_write(AT91_TWI_CR, AT91_TWI_START | AT91_TWI_STOP);
-+
-+      /* Program temporizing period (300us) */
-+      udelay(300);
-+
-+      /* Wait TXcomplete ... */
-+      nb_trial = 0;
-+      Status = at91_twi_read(AT91_TWI_SR);
-+      while (!(Status & AT91_TWI_TXCOMP) && (nb_trial < 10)) {
-+              nb_trial++;
-+              Status = at91_twi_read(AT91_TWI_SR);
-+      }
-+
-+      if (Status & AT91_TWI_TXCOMP) {
-+              *data_in = (unsigned char) at91_twi_read(AT91_TWI_RHR);
-+              return ICS1523_ACCESS_OK;
-+      }
-+      else
-+              return ICS1523_ACCESS_ERROR;
-+}
-+
-+/* -----------------------------------------------------------------------------
-+ * Write a byte with TWI Interface to the Clock Generator ICS1523
-+ * ----------------------------------------------------------------------------- */
-+
-+static int at91_ics1523_WriteByte(unsigned char reg_address, unsigned char data_out)
-+{
-+      int Status, nb_trial;
-+
-+      at91_twi_write(AT91_TWI_MMR, AT91_TWI_IADRSZ_1 | ((ICS_ADDR << 16) & AT91_TWI_DADR));
-+      at91_twi_write(AT91_TWI_IADR, reg_address);
-+      at91_twi_write(AT91_TWI_THR, data_out);
-+      at91_twi_write(AT91_TWI_CR, AT91_TWI_START | AT91_TWI_STOP);
-+
-+      /* Program temporizing period (300us) */
-+      udelay(300);
-+
-+      nb_trial = 0;
-+      Status = at91_twi_read(AT91_TWI_SR);
-+      while (!(Status & AT91_TWI_TXCOMP) && (nb_trial < 10)) {
-+              nb_trial++;
-+              if (Status & AT91_TWI_ERROR) {
-+                      /* If Underrun OR NACK - Start again */
-+                      at91_twi_write(AT91_TWI_CR, AT91_TWI_START | AT91_TWI_STOP);
-+
-+                      /*  Program temporizing period (300us) */
-+                      udelay(300);
-+              }
-+              Status = at91_twi_read(AT91_TWI_SR);
-+      };
-+
-+      if (Status & AT91_TWI_TXCOMP)
-+              return ICS1523_ACCESS_OK;
-+      else
-+              return ICS1523_ACCESS_ERROR;
-+}
-+
-+/* -----------------------------------------------------------------------------
-+ * Initialization of the Clock Generator ICS1523
-+ * ----------------------------------------------------------------------------- */
-+
-+int at91_ics1523_init(void)
-+{
-+      int             nb_trial;
-+      int             ack = ICS1523_ACCESS_OK;
-+      unsigned int    status = 0xffffffff;
-+      struct clk      *twi_clk;
-+
-+      /* Map in TWI peripheral */
-+      twi_base = ioremap(AT91RM9200_BASE_TWI, SZ_16K);
-+      if (!twi_base)
-+              return -ENOMEM;
-+
-+      /* pins used for TWI interface */
-+      at91_set_A_periph(AT91_PIN_PA25, 0);            /* TWD */
-+      at91_set_multi_drive(AT91_PIN_PA25, 1);
-+      at91_set_A_periph(AT91_PIN_PA26, 0);            /* TWCK */
-+      at91_set_multi_drive(AT91_PIN_PA26, 1);
-+
-+      /* Enable the TWI clock */
-+      twi_clk = clk_get(NULL, "twi_clk");
-+      if (IS_ERR(twi_clk))
-+              return ICS1523_ACCESS_ERROR;
-+      clk_enable(twi_clk);
-+
-+      /* Disable interrupts */
-+      at91_twi_write(AT91_TWI_IDR, -1);
-+
-+      /* Reset peripheral */
-+      at91_twi_write(AT91_TWI_CR, AT91_TWI_SWRST);
-+
-+      /* Set Master mode */
-+      at91_twi_write(AT91_TWI_CR, AT91_TWI_MSEN);
-+
-+      /* Set TWI Clock Waveform Generator Register */
-+      at91_ics1523_SetTwiClock(60000);     /* MCK in KHz = 60000 KHz */
-+
-+      /* ICS1523 Initialisation */
-+      ack |= at91_ics1523_WriteByte ((unsigned char) ICS_ICR, (unsigned char) 0);
-+      ack |= at91_ics1523_WriteByte ((unsigned char) ICS_OE, (unsigned char) (ICS_OEF | ICS_OET2 | ICS_OETCK));
-+      ack |= at91_ics1523_WriteByte ((unsigned char) ICS_OD, (unsigned char) (ICS_INSEL | 0x7F));
-+      ack |= at91_ics1523_WriteByte ((unsigned char) ICS_DPAO, (unsigned char) 0);
-+
-+      nb_trial = 0;
-+      do {
-+              nb_trial++;
-+              ack |= at91_ics1523_WriteByte ((unsigned char) ICS_ICR, (unsigned char) (ICS_ENDLS | ICS_ENPLS | ICS_PDEN /*| ICS_FUNCSEL*/));
-+              ack |= at91_ics1523_WriteByte ((unsigned char) ICS_LCR, (unsigned char) (ICS_PSD | ICS_PFD));
-+              ack |= at91_ics1523_WriteByte ((unsigned char) ICS_FD0, (unsigned char) 0x39) ; /* 0x7A */
-+              ack |= at91_ics1523_WriteByte ((unsigned char) ICS_FD1, (unsigned char) 0x00);
-+              ack |= at91_ics1523_WriteByte ((unsigned char) ICS_SWRST, (unsigned char) (ICS_PLLR));
-+
-+              /* Program 1ms temporizing period */
-+              mdelay(1);
-+
-+              at91_ics1523_ReadByte ((unsigned char) ICS_SR, (char *)&status);
-+      } while (!((unsigned int) status & (unsigned int) ICS_PLLLOCK) && (nb_trial < 10));
-+
-+      ack |= at91_ics1523_WriteByte ((unsigned char) ICS_DPAC, (unsigned char) 0x03) ; /* 0x01 */
-+      ack |= at91_ics1523_WriteByte ((unsigned char) ICS_SWRST, (unsigned char) (ICS_DPAR));
-+
-+      /* Program 1ms temporizing period */
-+      mdelay(1);
-+
-+      ack |= at91_ics1523_WriteByte ((unsigned char) ICS_DPAO, (unsigned char) 0x00);
-+
-+      /* Program 1ms temporizing period */
-+      mdelay(1);
-+      
-+      /* All done - cleanup */
-+      iounmap(twi_base);
-+      clk_disable(twi_clk);
-+      clk_put(twi_clk);
-+
-+      return ack;
-+}
-Index: linux-2.6.21.7/arch/arm/mach-at91/pm.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/pm.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/pm.c
-@@ -63,6 +63,7 @@ static int at91_pm_prepare(suspend_state
-  * Verify that all the clocks are correct before entering
-  * slow-clock mode.
-  */
-+#warning "SAM9260 only has 3 programmable clocks."
- static int at91_pm_verify_clocks(void)
- {
-       unsigned long scsr;
-@@ -104,20 +105,15 @@ static int at91_pm_verify_clocks(void)
- }
- /*
-- * Call this from platform driver suspend() to see how deeply to suspend.
-+ * This is called from clk_must_disable(), to see how deeply to suspend.
-  * For example, some controllers (like OHCI) need one of the PLL clocks
-  * in order to act as a wakeup source, and those are not available when
-  * going into slow clock mode.
-- *
-- * REVISIT: generalize as clk_will_be_available(clk)?  Other platforms have
-- * the very same problem (but not using at91 main_clk), and it'd be better
-- * to add one generic API rather than lots of platform-specific ones.
-  */
- int at91_suspend_entering_slow_clock(void)
- {
-       return (target_state == PM_SUSPEND_MEM);
- }
--EXPORT_SYMBOL(at91_suspend_entering_slow_clock);
- static void (*slow_clock)(void);
-@@ -207,16 +203,23 @@ static struct pm_ops at91_pm_ops ={
-       .enter          = at91_pm_enter,
- };
-+#ifdef CONFIG_AT91_SLOW_CLOCK
-+extern void at91rm9200_slow_clock(void);
-+extern u32 at91rm9200_slow_clock_sz;
-+#endif
-+
- static int __init at91_pm_init(void)
- {
--      printk("AT91: Power Management\n");
--
--#ifdef CONFIG_AT91_PM_SLOW_CLOCK
--      /* REVISIT allocations of SRAM should be dynamically managed.
-+#ifdef CONFIG_AT91_SLOW_CLOCK
-+      /*
-+       * REVISIT allocations of SRAM should be dynamically managed.
-        * FIQ handlers and other components will want SRAM/TCM too...
-        */
--      slow_clock = (void *) (AT91_VA_BASE_SRAM + (3 * SZ_4K));
-+      slow_clock = (void *) (AT91_IO_VIRT_BASE - AT91RM9200_SRAM_SIZE + (3 * SZ_4K));
-       memcpy(slow_clock, at91rm9200_slow_clock, at91rm9200_slow_clock_sz);
-+      printk("AT91: Power Management (with slow clock mode)\n");
-+#else
-+      printk("AT91: Power Management\n");
- #endif
-       /* Disable SDRAM low-power mode.  Cannot be used with self-refresh. */
-Index: linux-2.6.21.7/arch/arm/mach-at91/pm_slowclock.S
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/arch/arm/mach-at91/pm_slowclock.S
-@@ -0,0 +1,172 @@
-+/*
-+ * arch/arm/mach-at91/pm_slow_clock.S
-+ *
-+ *  Copyright (C) 2006 Savin Zlobec
-+ *
-+ * 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/linkage.h>
-+#include <asm/hardware.h>
-+#include <asm/arch/at91_pmc.h>
-+#include <asm/arch/at91rm9200_mc.h>
-+
-+#define MCKRDY_TIMEOUT                1000
-+#define MOSCRDY_TIMEOUT       1000
-+#define PLLALOCK_TIMEOUT      1000
-+
-+      .macro wait_mckrdy
-+      mov     r2, #MCKRDY_TIMEOUT
-+1:    sub     r2, r2, #1
-+      cmp     r2, #0
-+      beq     2f
-+      ldr     r3, [r1, #AT91_PMC_SR]
-+      tst     r3, #AT91_PMC_MCKRDY
-+      beq     1b
-+2:
-+      .endm
-+
-+      .macro wait_moscrdy
-+      mov     r2, #MOSCRDY_TIMEOUT
-+1:    sub     r2, r2, #1
-+      cmp     r2, #0
-+      beq     2f
-+      ldr     r3, [r1, #AT91_PMC_SR]
-+      tst     r3, #AT91_PMC_MOSCS
-+      beq     1b
-+2:
-+      .endm
-+
-+      .macro wait_pllalock
-+      mov     r2, #PLLALOCK_TIMEOUT
-+1:    sub     r2, r2, #1
-+      cmp     r2, #0
-+      beq     2f
-+      ldr     r3, [r1, #AT91_PMC_SR]
-+      tst     r3, #AT91_PMC_LOCKA
-+      beq     1b
-+2:
-+      .endm
-+
-+      .macro wait_plladis
-+      mov     r2, #PLLALOCK_TIMEOUT
-+1:    sub     r2, r2, #1
-+      cmp     r2, #0
-+      beq     2f
-+      ldr     r3, [r1, #AT91_PMC_SR]
-+      tst     r3, #AT91_PMC_LOCKA
-+      bne     1b
-+2:
-+      .endm
-+
-+      .text
-+
-+ENTRY(at91rm9200_slow_clock)
-+
-+      ldr     r1, .at91_va_base_sys
-+
-+      /* Put SDRAM in self refresh mode */
-+
-+      b       1f
-+      .align  5
-+1:    mcr     p15, 0, r0, c7, c10, 4
-+      mov     r2, #1
-+      str     r2, [r1, #AT91_SDRAMC_SRR]
-+
-+      /* Save Master clock setting */
-+
-+      ldr     r2, [r1, #AT91_PMC_MCKR]
-+      str     r2, .saved_mckr
-+
-+      /*
-+       * Set the Master clock source to slow clock
-+       *
-+       * First set the CSS field, wait for MCKRDY
-+       * and than set the PRES and MDIV fields.
-+       *
-+       * See eratta #2[78] for details.
-+       */
-+
-+      bic     r2, r2, #3
-+      str     r2, [r1, #AT91_PMC_MCKR]
-+
-+      wait_mckrdy
-+
-+      mov     r2, #0
-+      str     r2, [r1, #AT91_PMC_MCKR]
-+
-+      /* Save PLLA setting and disable it */
-+
-+      ldr     r2, [r1, #AT91_CKGR_PLLAR]
-+      str     r2, .saved_pllar
-+
-+      mov     r2, #0
-+      str     r2, [r1, #AT91_CKGR_PLLAR]
-+
-+      wait_plladis
-+
-+      /* Turn off the main oscillator */
-+
-+      ldr     r2, [r1, #AT91_CKGR_MOR]
-+      bic     r2, r2, #AT91_PMC_MOSCEN
-+      str     r2, [r1, #AT91_CKGR_MOR]
-+
-+      /* Wait for interrupt */
-+
-+      mcr     p15, 0, r0, c7, c0, 4
-+
-+      /* Turn on the main oscillator */
-+
-+      ldr     r2, [r1, #AT91_CKGR_MOR]
-+      orr     r2, r2, #AT91_PMC_MOSCEN
-+      str     r2, [r1, #AT91_CKGR_MOR]
-+
-+      wait_moscrdy
-+
-+      /* Restore PLLA setting */
-+
-+      ldr     r2, .saved_pllar
-+      str     r2, [r1, #AT91_CKGR_PLLAR]
-+
-+      wait_pllalock
-+
-+      /*
-+       * Restore master clock setting
-+       *
-+       * First set PRES if it was not 0,
-+       * than set CSS and MDIV fields.
-+       * After every change wait for
-+       * MCKRDY.
-+       *
-+       * See eratta #2[78] for details.
-+       */
-+
-+      ldr     r2, .saved_mckr
-+      tst     r2, #0x1C
-+      beq     2f
-+      and     r2, r2, #0x1C
-+      str     r2, [r1, #AT91_PMC_MCKR]
-+
-+      wait_mckrdy
-+
-+2:    ldr     r2, .saved_mckr
-+      str     r2, [r1, #AT91_PMC_MCKR]
-+
-+      wait_mckrdy
-+
-+      mov     pc, lr
-+
-+.saved_mckr:
-+      .word 0
-+
-+.saved_pllar:
-+      .word 0
-+
-+.at91_va_base_sys:
-+      .word AT91_VA_BASE_SYS
-+
-+ENTRY(at91rm9200_slow_clock_sz)
-+      .word .-at91rm9200_slow_clock
-Index: linux-2.6.21.7/arch/arm/mach-at91/tclib.c
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/arch/arm/mach-at91/tclib.c
-@@ -0,0 +1,17 @@
-+#include <linux/clk.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+
-+#include "tclib.h"
-+
-+static struct atmel_tcblock *blocks;
-+static int nblocks;
-+
-+/*
-+ * Called from the processor-specific init to register the TC Blocks.
-+ */
-+void __init atmel_tc_init(struct atmel_tcblock *tcblocks, int n)
-+{
-+      blocks = tcblocks;
-+      nblocks = n;
-+}
-Index: linux-2.6.21.7/arch/arm/mach-at91/tclib.h
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/arch/arm/mach-at91/tclib.h
-@@ -0,0 +1,11 @@
-+
-+#define TC_PER_TCB    3
-+
-+struct atmel_tcblock {
-+      u32             physaddr;
-+      void __iomem    *ioaddr;
-+      struct clk      *clk[TC_PER_TCB];
-+      int             irq[TC_PER_TCB];
-+};
-+
-+extern void __init atmel_tc_init(struct atmel_tcblock *tcblocks, int n);
-Index: linux-2.6.21.7/arch/arm/mm/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mm/Kconfig
-+++ linux-2.6.21.7/arch/arm/mm/Kconfig
-@@ -171,8 +171,8 @@ config CPU_ARM925T
- # ARM926T
- config CPU_ARM926T
-       bool "Support ARM926T processor"
--      depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || MACH_REALVIEW_EB || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_NS9XXX
--      default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_NS9XXX
-+      depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || MACH_REALVIEW_EB || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_NS9XXX
-+      default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP16XX || ARCH_PNX4008 || ARCH_NETX || CPU_S3C2412 || ARCH_AT91SAM9260 || ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_NS9XXX
-       select CPU_32v5
-       select CPU_ABRT_EV5TJ
-       select CPU_CACHE_VIVT
-Index: linux-2.6.21.7/arch/arm/tools/mach-types
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/tools/mach-types
-+++ linux-2.6.21.7/arch/arm/tools/mach-types
-@@ -1335,3 +1335,32 @@ at91sam9rlek            MACH_AT91SAM9RLEK       AT91SAM9
- comtech_router                MACH_COMTECH_ROUTER     COMTECH_ROUTER          1327
- sbc2410x              MACH_SBC2410X           SBC2410X                1328
- at4x0bd                       MACH_AT4X0BD            AT4X0BD                 1329
-+cbifr                 MACH_CBIFR              CBIFR                   1330
-+arcom_quantum         MACH_ARCOM_QUANTUM      ARCOM_QUANTUM           1331
-+matrix520             MACH_MATRIX520          MATRIX520               1332
-+matrix510             MACH_MATRIX510          MATRIX510               1333
-+matrix500             MACH_MATRIX500          MATRIX500               1334
-+m501                  MACH_M501               M501                    1335
-+aaeon1270             MACH_AAEON1270          AAEON1270               1336
-+matrix500ev           MACH_MATRIX500EV        MATRIX500EV             1337
-+pac500                        MACH_PAC500             PAC500                  1338
-+pnx8181                       MACH_PNX8181            PNX8181                 1339
-+colibri320            MACH_COLIBRI320         COLIBRI320              1340
-+aztoolbb              MACH_AZTOOLBB           AZTOOLBB                1341
-+aztoolg2              MACH_AZTOOLG2           AZTOOLG2                1342
-+dvlhost                       MACH_DVLHOST            DVLHOST                 1343
-+zir9200                       MACH_ZIR9200            ZIR9200                 1344
-+zir9260                       MACH_ZIR9260            ZIR9260                 1345
-+cocopah                       MACH_COCOPAH            COCOPAH                 1346
-+nds                   MACH_NDS                NDS                     1347
-+rosencrantz           MACH_ROSENCRANTZ        ROSENCRANTZ             1348
-+fttx_odsc             MACH_FTTX_ODSC          FTTX_ODSC               1349
-+classe_r6904          MACH_CLASSE_R6904       CLASSE_R6904            1350
-+cam60                 MACH_CAM60              CAM60                   1351
-+mxc30031ads           MACH_MXC30031ADS        MXC30031ADS             1352
-+datacall              MACH_DATACALL           DATACALL                1353
-+at91eb01              MACH_AT91EB01           AT91EB01                1354
-+rty                   MACH_RTY                RTY                     1355
-+dwl2100                       MACH_DWL2100            DWL2100                 1356
-+vinsi                 MACH_VINSI              VINSI                   1357
-+db88f5281             MACH_DB88F5281          DB88F5281               1358
-Index: linux-2.6.21.7/drivers/char/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/drivers/char/Kconfig
-+++ linux-2.6.21.7/drivers/char/Kconfig
-@@ -1071,5 +1071,21 @@ config TELCLOCK
-         /sys/devices/platform/telco_clock, with a number of files for
-         controlling the behavior of this hardware.
-+config AT91_SPI
-+      bool "SPI driver (legacy) for AT91RM9200 processors"
-+      depends on ARCH_AT91RM9200
-+      default y
-+      help
-+        The SPI driver gives access to this serial bus on the AT91RM9200
-+        processor.
-+
-+config AT91_SPIDEV
-+      bool "SPI device interface (legacy) for AT91RM9200 processors"
-+      depends on ARCH_AT91RM9200 && AT91_SPI
-+      default n
-+      help
-+        The SPI driver gives user mode access to this serial
-+        bus on the AT91RM9200 processor.
-+
- endmenu
-Index: linux-2.6.21.7/drivers/char/Makefile
-===================================================================
---- linux-2.6.21.7.orig/drivers/char/Makefile
-+++ linux-2.6.21.7/drivers/char/Makefile
-@@ -93,6 +93,8 @@ obj-$(CONFIG_CS5535_GPIO)    += cs5535_gpio
- obj-$(CONFIG_GPIO_VR41XX)     += vr41xx_giu.o
- obj-$(CONFIG_TANBAC_TB0219)   += tb0219.o
- obj-$(CONFIG_TELCLOCK)                += tlclk.o
-+obj-$(CONFIG_AT91_SPI)                += at91_spi.o
-+obj-$(CONFIG_AT91_SPIDEV)     += at91_spidev.o
- obj-$(CONFIG_WATCHDOG)                += watchdog/
- obj-$(CONFIG_MWAVE)           += mwave/
-Index: linux-2.6.21.7/drivers/char/at91_spi.c
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/drivers/char/at91_spi.c
-@@ -0,0 +1,336 @@
-+/*
-+ * Serial Peripheral Interface (SPI) driver for the Atmel AT91RM9200 (Thunder)
-+ *
-+ *  Copyright (C) SAN People (Pty) Ltd
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/module.h>
-+#include <linux/sched.h>
-+#include <linux/completion.h>
-+#include <linux/interrupt.h>
-+#include <linux/clk.h>
-+#include <linux/platform_device.h>
-+#include <linux/atmel_pdc.h>
-+#include <asm/io.h>
-+#include <asm/semaphore.h>
-+
-+#include <asm/arch/at91_spi.h>
-+#include <asm/arch/board.h>
-+#include <asm/arch/spi.h>
-+
-+#undef DEBUG_SPI
-+
-+static struct spi_local spi_dev[NR_SPI_DEVICES];      /* state of the SPI devices */
-+static int spi_enabled = 0;
-+static struct semaphore spi_lock;                     /* protect access to SPI bus */
-+static int current_device = -1;                               /* currently selected SPI device */
-+static struct clk *spi_clk;                           /* SPI clock */
-+static void __iomem *spi_base;                                /* SPI peripheral base-address */
-+
-+DECLARE_COMPLETION(transfer_complete);
-+
-+
-+#define at91_spi_read(reg)            __raw_readl(spi_base + (reg))
-+#define at91_spi_write(reg, val)      __raw_writel((val), spi_base + (reg))
-+
-+
-+/* ......................................................................... */
-+
-+/*
-+ * Access and enable the SPI bus.
-+ * This MUST be called before any transfers are performed.
-+ */
-+void spi_access_bus(short device)
-+{
-+      /* Ensure that requested device is valid */
-+      if ((device < 0) || (device >= NR_SPI_DEVICES))
-+              panic("at91_spi: spi_access_bus called with invalid device");
-+
-+      if (spi_enabled == 0) {
-+              clk_enable(spi_clk);                            /* Enable Peripheral clock */
-+              at91_spi_write(AT91_SPI_CR, AT91_SPI_SPIEN);    /* Enable SPI */
-+#ifdef DEBUG_SPI
-+              printk("SPI on\n");
-+#endif
-+      }
-+      spi_enabled++;
-+
-+      /* Lock the SPI bus */
-+      down(&spi_lock);
-+      current_device = device;
-+
-+      /* Configure SPI bus for device */
-+      at91_spi_write(AT91_SPI_MR, AT91_SPI_MSTR | AT91_SPI_MODFDIS | (spi_dev[device].pcs << 16));
-+}
-+
-+/*
-+ * Relinquish control of the SPI bus.
-+ */
-+void spi_release_bus(short device)
-+{
-+      if (device != current_device)
-+              panic("at91_spi: spi_release called with invalid device");
-+
-+      /* Release the SPI bus */
-+      current_device = -1;
-+      up(&spi_lock);
-+
-+      spi_enabled--;
-+      if (spi_enabled == 0) {
-+              at91_spi_write(AT91_SPI_CR, AT91_SPI_SPIDIS);   /* Disable SPI */
-+              clk_disable(spi_clk);                           /* Disable Peripheral clock */
-+#ifdef DEBUG_SPI
-+              printk("SPI off\n");
-+#endif
-+      }
-+}
-+
-+/*
-+ * Perform a data transfer over the SPI bus
-+ */
-+int spi_transfer(struct spi_transfer_list* list)
-+{
-+      struct spi_local *device = (struct spi_local *) &spi_dev[current_device];
-+      int tx_size;
-+
-+      if (!list)
-+              panic("at91_spi: spi_transfer called with NULL transfer list");
-+      if (current_device == -1)
-+              panic("at91_spi: spi_transfer called without acquiring bus");
-+
-+#ifdef DEBUG_SPI
-+      printk("SPI transfer start [%i]\n", list->nr_transfers);
-+#endif
-+
-+      /* If we are in 16-bit mode, we need to modify what we pass to the PDC */
-+      tx_size = (at91_spi_read(AT91_SPI_CSR(current_device)) & AT91_SPI_BITS_16) ? 2 : 1;
-+
-+      /* Store transfer list */
-+      device->xfers = list;
-+      list->curr = 0;
-+
-+      /* Assume there must be at least one transfer */
-+      device->tx = dma_map_single(NULL, list->tx[0], list->txlen[0], DMA_TO_DEVICE);
-+      device->rx = dma_map_single(NULL, list->rx[0], list->rxlen[0], DMA_FROM_DEVICE);
-+
-+      /* Program PDC registers */
-+      at91_spi_write(ATMEL_PDC_TPR, device->tx);
-+      at91_spi_write(ATMEL_PDC_RPR, device->rx);
-+      at91_spi_write(ATMEL_PDC_TCR, list->txlen[0] / tx_size);
-+      at91_spi_write(ATMEL_PDC_RCR, list->rxlen[0] / tx_size);
-+
-+      /* Is there a second transfer? */
-+      if (list->nr_transfers > 1) {
-+              device->txnext = dma_map_single(NULL, list->tx[1], list->txlen[1], DMA_TO_DEVICE);
-+              device->rxnext = dma_map_single(NULL, list->rx[1], list->rxlen[1], DMA_FROM_DEVICE);
-+
-+              /* Program Next PDC registers */
-+              at91_spi_write(ATMEL_PDC_TNPR, device->txnext);
-+              at91_spi_write(ATMEL_PDC_RNPR, device->rxnext);
-+              at91_spi_write(ATMEL_PDC_TNCR, list->txlen[1] / tx_size);
-+              at91_spi_write(ATMEL_PDC_RNCR, list->rxlen[1] / tx_size);
-+      }
-+      else {
-+              device->txnext = 0;
-+              device->rxnext = 0;
-+              at91_spi_write(ATMEL_PDC_TNCR, 0);
-+              at91_spi_write(ATMEL_PDC_RNCR, 0);
-+      }
-+
-+      // TODO: If we are doing consecutive transfers (at high speed, or
-+      //   small buffers), then it might be worth modifying the 'Delay between
-+      //   Consecutive Transfers' in the CSR registers.
-+      //   This is an issue if we cannot chain the next buffer fast enough
-+      //   in the interrupt handler.
-+
-+      /* Enable transmitter and receiver */
-+      at91_spi_write(ATMEL_PDC_PTCR, ATMEL_PDC_RXTEN | ATMEL_PDC_TXTEN);
-+
-+      at91_spi_write(AT91_SPI_IER, AT91_SPI_ENDRX);           /* enable buffer complete interrupt */
-+      wait_for_completion(&transfer_complete);
-+
-+#ifdef DEBUG_SPI
-+      printk("SPI transfer end\n");
-+#endif
-+
-+      return 0;
-+}
-+
-+/* ......................................................................... */
-+
-+/*
-+ * Handle interrupts from the SPI controller.
-+ */
-+static irqreturn_t at91spi_interrupt(int irq, void *dev_id)
-+{
-+      unsigned int status;
-+      struct spi_local *device = (struct spi_local *) &spi_dev[current_device];
-+      struct spi_transfer_list *list = device->xfers;
-+
-+#ifdef DEBUG_SPI
-+      printk("SPI interrupt %i\n", current_device);
-+#endif
-+
-+      if (!list)
-+              panic("at91_spi: spi_interrupt with a NULL transfer list");
-+
-+              status = at91_spi_read(AT91_SPI_SR) & at91_spi_read(AT91_SPI_IMR);      /* read status */
-+
-+      dma_unmap_single(NULL, device->tx, list->txlen[list->curr], DMA_TO_DEVICE);
-+      dma_unmap_single(NULL, device->rx, list->rxlen[list->curr], DMA_FROM_DEVICE);
-+
-+      device->tx = device->txnext;    /* move next transfer to current transfer */
-+      device->rx = device->rxnext;
-+
-+      list->curr = list->curr + 1;
-+      if (list->curr == list->nr_transfers) {         /* all transfers complete */
-+              at91_spi_write(AT91_SPI_IDR, AT91_SPI_ENDRX);           /* disable interrupt */
-+
-+              /* Disable transmitter and receiver */
-+              at91_spi_write(ATMEL_PDC_PTCR, ATMEL_PDC_RXTDIS | ATMEL_PDC_TXTDIS);
-+
-+              device->xfers = NULL;
-+              complete(&transfer_complete);
-+      }
-+      else if (list->curr+1 == list->nr_transfers) {  /* no more next transfers */
-+              device->txnext = 0;
-+              device->rxnext = 0;
-+              at91_spi_write(ATMEL_PDC_TNCR, 0);
-+              at91_spi_write(ATMEL_PDC_RNCR, 0);
-+      }
-+      else {
-+              int i = (list->curr)+1;
-+
-+              /* If we are in 16-bit mode, we need to modify what we pass to the PDC */
-+              int tx_size = (at91_spi_read(AT91_SPI_CSR(current_device)) & AT91_SPI_BITS_16) ? 2 : 1;
-+
-+              device->txnext = dma_map_single(NULL, list->tx[i], list->txlen[i], DMA_TO_DEVICE);
-+              device->rxnext = dma_map_single(NULL, list->rx[i], list->rxlen[i], DMA_FROM_DEVICE);
-+              at91_spi_write(ATMEL_PDC_TNPR, device->txnext);
-+              at91_spi_write(ATMEL_PDC_RNPR, device->rxnext);
-+              at91_spi_write(ATMEL_PDC_TNCR, list->txlen[i] / tx_size);
-+              at91_spi_write(ATMEL_PDC_RNCR, list->rxlen[i] / tx_size);
-+      }
-+      return IRQ_HANDLED;
-+}
-+
-+/* ......................................................................... */
-+
-+/*
-+ * Initialize the SPI controller
-+ */
-+static int __init at91spi_probe(struct platform_device *pdev)
-+{
-+      int i;
-+      unsigned long scbr;
-+      struct resource *res;
-+
-+      init_MUTEX(&spi_lock);
-+
-+      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+      if (!res)
-+              return -ENXIO;
-+
-+      if (!request_mem_region(res->start, res->end - res->start + 1, "at91_spi"))
-+              return -EBUSY;
-+
-+      spi_base = ioremap(res->start, res->end - res->start + 1);
-+      if (!spi_base) {
-+              release_mem_region(res->start, res->end - res->start + 1);
-+              return -ENOMEM;
-+      }
-+
-+      spi_clk = clk_get(NULL, "spi_clk");
-+      if (IS_ERR(spi_clk)) {
-+              printk(KERN_ERR "at91_spi: no clock defined\n");
-+              iounmap(spi_base);
-+              release_mem_region(res->start, res->end - res->start + 1);
-+              return -ENODEV;
-+      }
-+
-+      at91_spi_write(AT91_SPI_CR, AT91_SPI_SWRST);    /* software reset of SPI controller */
-+
-+      /*
-+       * Calculate the correct SPI baud-rate divisor.
-+       */
-+      scbr = clk_get_rate(spi_clk) / (2 * DEFAULT_SPI_CLK);
-+      scbr = scbr + 1;                /* round up */
-+
-+      printk(KERN_INFO "at91_spi: Baud rate set to %ld\n", clk_get_rate(spi_clk) / (2 * scbr));
-+
-+      /* Set Chip Select registers to good defaults */
-+      for (i = 0; i < 4; i++) {
-+              at91_spi_write(AT91_SPI_CSR(i), AT91_SPI_CPOL | AT91_SPI_BITS_8 | (16 << 16) | (scbr << 8));
-+      }
-+
-+      at91_spi_write(ATMEL_PDC_PTCR, ATMEL_PDC_RXTDIS | ATMEL_PDC_TXTDIS);
-+
-+      memset(&spi_dev, 0, sizeof(spi_dev));
-+      spi_dev[0].pcs = 0xE;
-+      spi_dev[1].pcs = 0xD;
-+      spi_dev[2].pcs = 0xB;
-+      spi_dev[3].pcs = 0x7;
-+
-+      if (request_irq(AT91RM9200_ID_SPI, at91spi_interrupt, 0, "spi", NULL)) {
-+              clk_put(spi_clk);
-+              iounmap(spi_base);
-+              release_mem_region(res->start, res->end - res->start + 1);
-+              return -EBUSY;
-+      }
-+
-+      at91_spi_write(AT91_SPI_CR, AT91_SPI_SPIEN);            /* Enable SPI */
-+
-+      return 0;
-+}
-+
-+static int __devexit at91spi_remove(struct platform_device *pdev)
-+{
-+      struct resource *res;
-+
-+      at91_spi_write(AT91_SPI_CR, AT91_SPI_SPIDIS);           /* Disable SPI */
-+      clk_put(spi_clk);
-+
-+      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+      iounmap(spi_base);
-+      release_mem_region(res->start, res->end - res->start + 1);
-+
-+      free_irq(AT91RM9200_ID_SPI, 0);
-+      return 0;
-+}
-+
-+static struct platform_driver at91spi_driver = {
-+      .probe          = at91spi_probe,
-+      .remove         = __devexit_p(at91spi_remove),
-+      .driver         = {
-+              .name   = "at91_spi",
-+              .owner  = THIS_MODULE,
-+      },
-+};
-+
-+static int __init at91spi_init(void)
-+{
-+      return platform_driver_register(&at91spi_driver);
-+}
-+
-+static void __exit at91spi_exit(void)
-+{
-+      platform_driver_unregister(&at91spi_driver);
-+}
-+
-+EXPORT_SYMBOL(spi_access_bus);
-+EXPORT_SYMBOL(spi_release_bus);
-+EXPORT_SYMBOL(spi_transfer);
-+
-+module_init(at91spi_init);
-+module_exit(at91spi_exit);
-+
-+MODULE_LICENSE("GPL")
-+MODULE_AUTHOR("Andrew Victor")
-+MODULE_DESCRIPTION("SPI driver for Atmel AT91RM9200")
-Index: linux-2.6.21.7/drivers/char/at91_spidev.c
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/drivers/char/at91_spidev.c
-@@ -0,0 +1,236 @@
-+/*
-+ * User-space interface to the SPI bus on Atmel AT91RM9200
-+ *
-+ *  Copyright (C) 2003 SAN People (Pty) Ltd
-+ *
-+ * Based on SPI driver by Rick Bronson
-+ *
-+ * 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 <linux/init.h>
-+#include <linux/slab.h>
-+#include <linux/highmem.h>
-+#include <linux/pagemap.h>
-+#include <asm/arch/spi.h>
-+
-+#ifdef CONFIG_DEVFS_FS
-+#include <linux/devfs_fs_kernel.h>
-+#endif
-+
-+
-+#undef DEBUG_SPIDEV
-+
-+/* ......................................................................... */
-+
-+/*
-+ * Read or Write to SPI bus.
-+ */
-+static ssize_t spidev_rd_wr(struct file *file, char *buf, size_t count, loff_t *offset)
-+{
-+      unsigned int spi_device = (unsigned int) file->private_data;
-+
-+      struct mm_struct * mm;
-+      struct page ** maplist;
-+      struct spi_transfer_list* list;
-+      int    pgcount;
-+
-+      unsigned int ofs, pagelen;
-+      int res, i, err;
-+
-+      if (!count) {
-+              return 0;
-+      }
-+
-+      list = kmalloc(sizeof(struct spi_transfer_list), GFP_KERNEL);
-+      if (!list) {
-+              return -ENOMEM;
-+      }
-+
-+      mm = current->mm;
-+
-+      pgcount = ((unsigned long)buf+count+PAGE_SIZE-1)/PAGE_SIZE - (unsigned long)buf/PAGE_SIZE;
-+
-+      if (pgcount >= MAX_SPI_TRANSFERS) {
-+              kfree(list);
-+              return -EFBIG;
-+      }
-+
-+      maplist = kmalloc (pgcount * sizeof (struct page *), GFP_KERNEL);
-+
-+      if (!maplist) {
-+              kfree(list);
-+              return -ENOMEM;
-+      }
-+      flush_cache_all();
-+      down_read(&mm->mmap_sem);
-+      err= get_user_pages(current, mm, (unsigned long)buf, pgcount, 1, 0, maplist, NULL);
-+      up_read(&mm->mmap_sem);
-+
-+      if (err < 0) {
-+              kfree(list);
-+              kfree(maplist);
-+              return err;
-+      }
-+      pgcount = err;
-+
-+#ifdef DEBUG_SPIDEV
-+      printk("spidev_rd_rw: %i %i\n", count, pgcount);
-+#endif
-+
-+      /* Set default return value = transfer length */
-+      res = count;
-+
-+      /*
-+       * At this point, the virtual area buf[0] .. buf[count-1] will have
-+       * corresponding pages mapped in the physical memory and locked until
-+       * we unmap the kiobuf.  The pages cannot be swapped out or moved
-+       * around.
-+       */
-+      ofs = (unsigned long) buf & (PAGE_SIZE -1);
-+      pagelen = PAGE_SIZE - ofs;
-+      if (count < pagelen)
-+              pagelen = count;
-+
-+      for (i = 0; i < pgcount; i++) {
-+              flush_dcache_page(maplist[i]);
-+
-+              list->tx[i] = list->rx[i] = page_address(maplist[i]) + ofs;
-+              list->txlen[i] = list->rxlen[i] = pagelen;
-+
-+#ifdef DEBUG_SPIDEV
-+              printk("  %i: %x  (%i)\n", i, list->tx[i], list->txlen[i]);
-+#endif
-+
-+              ofs = 0;        /* all subsequent transfers start at beginning of a page */
-+              count = count - pagelen;
-+              pagelen = (count < PAGE_SIZE) ? count : PAGE_SIZE;
-+      }
-+      list->nr_transfers = pgcount;
-+
-+      /* Perform transfer on SPI bus */
-+      spi_access_bus(spi_device);
-+      spi_transfer(list);
-+      spi_release_bus(spi_device);
-+
-+      while (pgcount--) {
-+              page_cache_release (maplist[pgcount]);
-+      }
-+      flush_cache_all();
-+
-+      kfree(maplist);
-+      kfree(list);
-+
-+      return res;
-+}
-+
-+static int spidev_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
-+{
-+      int spi_device = MINOR(inode->i_rdev);
-+
-+      if (spi_device >= NR_SPI_DEVICES)
-+              return -ENODEV;
-+
-+      // TODO: This interface can be used to configure the SPI bus.
-+      // Configurable options could include: Speed, Clock Polarity, Clock Phase
-+
-+      switch(cmd) {
-+              default:
-+                      return -ENOIOCTLCMD;
-+      }
-+}
-+
-+/*
-+ * Open the SPI device
-+ */
-+static int spidev_open(struct inode *inode, struct file *file)
-+{
-+      unsigned int spi_device = MINOR(inode->i_rdev);
-+
-+      if (spi_device >= NR_SPI_DEVICES)
-+              return -ENODEV;
-+
-+      /*
-+       * 'private_data' is actually a pointer, but we overload it with the
-+       * value we want to store.
-+       */
-+      file->private_data = (void *)spi_device;
-+
-+      return 0;
-+}
-+
-+/*
-+ * Close the SPI device
-+ */
-+static int spidev_close(struct inode *inode, struct file *file)
-+{
-+      return 0;
-+}
-+
-+/* ......................................................................... */
-+
-+static struct file_operations spidev_fops = {
-+      .owner          = THIS_MODULE,
-+      .llseek         = no_llseek,
-+      .read           = spidev_rd_wr,
-+      .write          = (int (*) (struct file *file, const char *buf, size_t count, loff_t *offset))spidev_rd_wr,
-+      .ioctl          = spidev_ioctl,
-+      .open           = spidev_open,
-+      .release        = spidev_close,
-+};
-+
-+/*
-+ * Install the SPI /dev interface driver
-+ */
-+static int __init at91_spidev_init(void)
-+{
-+#ifdef CONFIG_DEVFS_FS
-+      int i;
-+#endif
-+
-+      if (register_chrdev(SPI_MAJOR, "spi", &spidev_fops)) {
-+              printk(KERN_ERR "at91_spidev: Unable to get major %d for SPI bus\n", SPI_MAJOR);
-+              return -EIO;
-+      }
-+
-+#ifdef CONFIG_DEVFS_FS
-+      devfs_mk_dir("spi");
-+      for (i = 0; i < NR_SPI_DEVICES; i++) {
-+              devfs_mk_cdev(MKDEV(SPI_MAJOR, i), S_IFCHR | S_IRUSR | S_IWUSR, "spi/%d",i);
-+      }
-+#endif
-+      printk(KERN_INFO "AT91 SPI driver loaded\n");
-+
-+      return 0;
-+}
-+
-+/*
-+ * Remove the SPI /dev interface driver
-+ */
-+static void __exit at91_spidev_exit(void)
-+{
-+#ifdef CONFIG_DEVFS_FS
-+      int i;
-+      for (i = 0; i < NR_SPI_DEVICES; i++) {
-+              devfs_remove("spi/%d", i);
-+      }
-+
-+      devfs_remove("spi");
-+#endif
-+
-+      if (unregister_chrdev(SPI_MAJOR, "spi")) {
-+              printk(KERN_ERR "at91_spidev: Unable to release major %d for SPI bus\n", SPI_MAJOR);
-+              return;
-+      }
-+}
-+
-+module_init(at91_spidev_init);
-+module_exit(at91_spidev_exit);
-+
-+MODULE_LICENSE("GPL")
-+MODULE_AUTHOR("Andrew Victor")
-+MODULE_DESCRIPTION("SPI /dev interface for Atmel AT91RM9200")
-Index: linux-2.6.21.7/drivers/i2c/busses/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/drivers/i2c/busses/Kconfig
-+++ linux-2.6.21.7/drivers/i2c/busses/Kconfig
-@@ -81,6 +81,14 @@ config I2C_AT91
-         This supports the use of the I2C interface on Atmel AT91
-         processors.
-+config I2C_AT91_CLOCKRATE
-+      prompt "Atmel AT91 I2C/TWI clock-rate"
-+      depends on I2C_AT91
-+      int
-+      default 100000
-+      help
-+        Set the AT91 I2C/TWI clock-rate.
-+
- config I2C_AU1550
-       tristate "Au1550/Au1200 SMBus interface"
-       depends on I2C && (SOC_AU1550 || SOC_AU1200)
-@@ -545,6 +553,14 @@ config I2C_VOODOO3
-         This driver can also be built as a module.  If so, the module
-         will be called i2c-voodoo3.
-+config I2C_PCA
-+      tristate "PCA9564"
-+      depends on I2C
-+      select I2C_ALGOPCA
-+      help
-+        This driver support the Philips PCA 9564 Parallel bus to I2C
-+        bus controller.
-+
- config I2C_PCA_ISA
-       tristate "PCA9564 on an ISA bus"
-       depends on I2C
-Index: linux-2.6.21.7/drivers/i2c/busses/Makefile
-===================================================================
---- linux-2.6.21.7.orig/drivers/i2c/busses/Makefile
-+++ linux-2.6.21.7/drivers/i2c/busses/Makefile
-@@ -28,6 +28,7 @@ obj-$(CONFIG_I2C_OMAP)               += i2c-omap.o
- obj-$(CONFIG_I2C_PARPORT)     += i2c-parport.o
- obj-$(CONFIG_I2C_PARPORT_LIGHT)       += i2c-parport-light.o
- obj-$(CONFIG_I2C_PASEMI)      += i2c-pasemi.o
-+obj-$(CONFIG_I2C_PCA)         += i2c-pca.o
- obj-$(CONFIG_I2C_PCA_ISA)     += i2c-pca-isa.o
- obj-$(CONFIG_I2C_PIIX4)               += i2c-piix4.o
- obj-$(CONFIG_I2C_PNX)         += i2c-pnx.o
-Index: linux-2.6.21.7/drivers/i2c/busses/i2c-at91.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/i2c/busses/i2c-at91.c
-+++ linux-2.6.21.7/drivers/i2c/busses/i2c-at91.c
-@@ -31,8 +31,11 @@
- #include <asm/arch/board.h>
- #include <asm/arch/cpu.h>
--#define TWI_CLOCK             100000          /* Hz. max 400 Kbits/sec */
-+/* Clockrate is configurable - max 400 Kbits/sec */
-+static unsigned int clockrate = CONFIG_I2C_AT91_CLOCKRATE;
-+module_param(clockrate, uint, 0);
-+MODULE_PARM_DESC(clockrate, "The TWI clockrate");
- static struct clk *twi_clk;
- static void __iomem *twi_base;
-@@ -53,7 +56,7 @@ static void __devinit at91_twi_hwinit(vo
-       at91_twi_write(AT91_TWI_CR, AT91_TWI_MSEN);     /* Set Master mode */
-       /* Calcuate clock dividers */
--      cdiv = (clk_get_rate(twi_clk) / (2 * TWI_CLOCK)) - 3;
-+      cdiv = (clk_get_rate(twi_clk) / (2 * clockrate)) - 3;
-       cdiv = cdiv + 1;        /* round up */
-       ckdiv = 0;
-       while (cdiv > 255) {
-@@ -61,11 +64,12 @@ static void __devinit at91_twi_hwinit(vo
-               cdiv = cdiv >> 1;
-       }
--      if (cpu_is_at91rm9200()) {                      /* AT91RM9200 Errata #22 */
--              if (ckdiv > 5) {
--                      printk(KERN_ERR "AT91 I2C: Invalid TWI_CLOCK value!\n");
--                      ckdiv = 5;
--              }
-+      if (cpu_is_at91rm9200() && (ckdiv > 5)) {       /* AT91RM9200 Errata #22 */
-+              printk(KERN_ERR "AT91 I2C: Invalid TWI clockrate!\n");
-+              ckdiv = 5;
-+      } else if (ckdiv > 7) {
-+              printk(KERN_ERR "AT91 I2C: Invalid TWI clockrate!\n");
-+              ckdiv = 7;
-       }
-       at91_twi_write(AT91_TWI_CWGR, (ckdiv << 16) | (cdiv << 8) | cdiv);
-Index: linux-2.6.21.7/drivers/i2c/busses/i2c-pca.c
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/drivers/i2c/busses/i2c-pca.c
-@@ -0,0 +1,213 @@
-+/*
-+ *  Platform driver for PCA9564 I2C bus controller.
-+ *
-+ *  (C) 2006 Andrew Victor
-+ *
-+ *  Based on i2c-pca-isa.c driver for PCA9564 on ISA boards
-+ *    Copyright (C) 2004 Arcom Control Systems
-+ *
-+ *  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/kernel.h>
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/delay.h>
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <linux/wait.h>
-+#include <linux/platform_device.h>
-+
-+#include <linux/i2c.h>
-+#include <linux/i2c-algo-pca.h>
-+
-+#include <asm/io.h>
-+
-+#include "../algos/i2c-algo-pca.h"
-+
-+#define PCA_OWN_ADDRESS               0x55    /* our address for slave mode */
-+#define PCA_CLOCK             I2C_PCA_CON_59kHz
-+
-+//#define REG_SHIFT           2
-+#define REG_SHIFT             0
-+
-+//#define DEBUG_IO
-+
-+#define PCA_IO_SIZE 4
-+
-+static void __iomem *base_addr;
-+static int irq;
-+static wait_queue_head_t pca_wait;
-+
-+static int pca_getown(struct i2c_algo_pca_data *adap)
-+{
-+      return PCA_OWN_ADDRESS;
-+}
-+
-+static int pca_getclock(struct i2c_algo_pca_data *adap)
-+{
-+      return PCA_CLOCK;
-+}
-+
-+static void pca_writebyte(struct i2c_algo_pca_data *adap, int reg, int val)
-+{
-+#ifdef DEBUG_IO
-+      static char *names[] = { "T/O", "DAT", "ADR", "CON" };
-+      printk("*** write %s at %#lx <= %#04x\n", names[reg], (unsigned long) base_addr+reg, val);
-+#endif
-+      udelay(1);
-+      outb(val, base_addr + (reg << REG_SHIFT));
-+}
-+
-+static int pca_readbyte(struct i2c_algo_pca_data *adap, int reg)
-+{
-+      int res;
-+
-+      udelay(1);
-+      res = inb(base_addr + (reg << REG_SHIFT));
-+#ifdef DEBUG_IO
-+      {
-+              static char *names[] = { "STA", "DAT", "ADR", "CON" };
-+              printk("*** read  %s => %#04x\n", names[reg], res);
-+      }
-+#endif
-+      return res;
-+}
-+
-+static int pca_waitforinterrupt(struct i2c_algo_pca_data *adap)
-+{
-+      int ret = 0;
-+
-+      if (irq > -1) {
-+              ret = wait_event_interruptible(pca_wait,
-+                              pca_readbyte(adap, I2C_PCA_CON) & I2C_PCA_CON_SI);
-+      } else {
-+              while ((pca_readbyte(adap, I2C_PCA_CON) & I2C_PCA_CON_SI) == 0)
-+                      udelay(100);
-+      }
-+      return ret;
-+}
-+
-+static irqreturn_t pca_handler(int this_irq, void *dev_id)
-+{
-+      wake_up_interruptible(&pca_wait);
-+      return IRQ_HANDLED;
-+}
-+
-+static struct i2c_algo_pca_data pca_i2c_data = {
-+      .get_own                = pca_getown,
-+      .get_clock              = pca_getclock,
-+      .write_byte             = pca_writebyte,
-+      .read_byte              = pca_readbyte,
-+      .wait_for_interrupt     = pca_waitforinterrupt,
-+};
-+
-+static struct i2c_adapter pca_i2c_ops = {
-+      .owner          = THIS_MODULE,
-+      .id             = I2C_HW_A_PLAT,
-+      .algo_data      = &pca_i2c_data,
-+      .name           = "PCA9564",
-+      .class          = I2C_CLASS_HWMON,
-+};
-+
-+static int __devinit pca_i2c_probe(struct platform_device *pdev)
-+{
-+      struct resource *res;
-+
-+      init_waitqueue_head(&pca_wait);
-+
-+      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+      if (!res)
-+              return -ENODEV;
-+
-+      if (!request_mem_region(res->start, PCA_IO_SIZE, "PCA9564"))
-+              return -ENXIO;
-+
-+      base_addr = ioremap(res->start, PCA_IO_SIZE);
-+      if (base_addr == NULL)
-+              goto out_region;
-+
-+      irq = platform_get_irq(pdev, 0);
-+      if (irq > -1) {
-+              if (request_irq(irq, pca_handler, 0, "pca9564", NULL) < 0) {
-+                      printk(KERN_ERR "i2c-pca: Request irq%d failed\n", irq);
-+                      goto out_remap;
-+              }
-+      }
-+
-+      /* set up the driverfs linkage to our parent device */
-+      pca_i2c_ops.dev.parent = &pdev->dev;
-+
-+      if (i2c_pca_add_bus(&pca_i2c_ops) < 0) {
-+              printk(KERN_ERR "i2c-pca: Failed to add i2c bus\n");
-+              goto out_irq;
-+      }
-+
-+      return 0;
-+
-+ out_irq:
-+      if (irq > -1)
-+              free_irq(irq, &pca_i2c_ops);
-+
-+ out_remap:
-+      iounmap(base_addr);
-+
-+ out_region:
-+      release_mem_region(res->start, PCA_IO_SIZE);
-+      return -ENODEV;
-+}
-+
-+static int __devexit pca_i2c_remove(struct platform_device *pdev)
-+{
-+      struct resource *res;
-+
-+      i2c_del_adapter(&pca_i2c_ops);
-+
-+      if (irq > 0)
-+              free_irq(irq, NULL);
-+
-+      iounmap(base_addr);
-+
-+      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+      release_mem_region(res->start, PCA_IO_SIZE);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver pca_i2c_driver = {
-+      .probe          = pca_i2c_probe,
-+      .remove         = __devexit_p(pca_i2c_remove),
-+      .driver         = {
-+              .name   = "pca9564",
-+              .owner  = THIS_MODULE,
-+      },
-+};
-+
-+static int __init pca_i2c_init(void)
-+{
-+      return platform_driver_register(&pca_i2c_driver);
-+}
-+
-+static void __exit pca_i2c_exit(void)
-+{
-+      platform_driver_unregister(&pca_i2c_driver);
-+}
-+
-+module_init(pca_i2c_init);
-+module_exit(pca_i2c_exit);
-+
-+MODULE_AUTHOR("Andrew Victor");
-+MODULE_DESCRIPTION("PCA9564 platform driver");
-+MODULE_LICENSE("GPL");
-Index: linux-2.6.21.7/drivers/input/touchscreen/ads7846.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/input/touchscreen/ads7846.c
-+++ linux-2.6.21.7/drivers/input/touchscreen/ads7846.c
-@@ -39,7 +39,8 @@
- /*
-  * This code has been heavily tested on a Nokia 770, and lightly
-  * tested on other ads7846 devices (OSK/Mistral, Lubbock).
-- * Support for ads7843 and ads7845 has only been stubbed in.
-+ * Support for ads7843 tested on Atmel at91sam926x-EK.
-+ * Support for ads7845 has only been stubbed in.
-  *
-  * IRQ handling needs a workaround because of a shortcoming in handling
-  * edge triggered IRQs on some platforms like the OMAP1/2. These
-@@ -246,18 +247,16 @@ static int ads7846_read12_ser(struct dev
-       /* REVISIT:  take a few more samples, and compare ... */
--      /* maybe off internal vREF */
--      if (use_internal) {
--              req->ref_off = REF_OFF;
--              req->xfer[4].tx_buf = &req->ref_off;
--              req->xfer[4].len = 1;
--              spi_message_add_tail(&req->xfer[4], &req->msg);
--
--              req->xfer[5].rx_buf = &req->scratch;
--              req->xfer[5].len = 2;
--              CS_CHANGE(req->xfer[5]);
--              spi_message_add_tail(&req->xfer[5], &req->msg);
--      }
-+      /* converter in low power mode & enable PENIRQ */
-+      req->ref_off = PWRDOWN;
-+      req->xfer[4].tx_buf = &req->ref_off;
-+      req->xfer[4].len = 1;
-+      spi_message_add_tail(&req->xfer[4], &req->msg);
-+
-+      req->xfer[5].rx_buf = &req->scratch;
-+      req->xfer[5].len = 2;
-+      CS_CHANGE(req->xfer[5]);
-+      spi_message_add_tail(&req->xfer[5], &req->msg);
-       ts->irq_disabled = 1;
-       disable_irq(spi->irq);
-@@ -536,6 +535,9 @@ static void ads7846_rx(void *ads)
-       } else
-               Rt = 0;
-+      if (ts->model == 7843)
-+              Rt = ts->pressure_max / 2;
-+
-       /* Sample found inconsistent by debouncing or pressure is beyond
-        * the maximum. Don't report it to user space, repeat at least
-        * once more the measurement
-Index: linux-2.6.21.7/drivers/leds/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/drivers/leds/Kconfig
-+++ linux-2.6.21.7/drivers/leds/Kconfig
-@@ -76,6 +76,13 @@ config LEDS_NET48XX
-         This option enables support for the Soekris net4801 and net4826 error
-         LED.
-+config LEDS_AT91
-+      tristate "LED support using AT91 GPIOs"
-+      depends on LEDS_CLASS && ARCH_AT91 && !LEDS
-+      help
-+        This option enables support for LEDs connected to GPIO lines
-+        on AT91-based boards.
-+
- config LEDS_WRAP
-       tristate "LED Support for the WRAP series LEDs"
-       depends on LEDS_CLASS && SCx200_GPIO
-Index: linux-2.6.21.7/drivers/leds/Makefile
-===================================================================
---- linux-2.6.21.7.orig/drivers/leds/Makefile
-+++ linux-2.6.21.7/drivers/leds/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_LEDS_NET48XX)           += leds-net4
- obj-$(CONFIG_LEDS_WRAP)                       += leds-wrap.o
- obj-$(CONFIG_LEDS_H1940)              += leds-h1940.o
- obj-$(CONFIG_LEDS_COBALT)             += leds-cobalt.o
-+obj-$(CONFIG_LEDS_AT91)                       += leds-at91.o
- # LED Triggers
- obj-$(CONFIG_LEDS_TRIGGER_TIMER)      += ledtrig-timer.o
-Index: linux-2.6.21.7/drivers/leds/leds-at91.c
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/drivers/leds/leds-at91.c
-@@ -0,0 +1,140 @@
-+/*
-+ * AT91 GPIO based LED driver
-+ *
-+ * Copyright (C) 2006 David Brownell
-+ *
-+ * 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/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/leds.h>
-+
-+#include <asm/arch/board.h>
-+#include <asm/arch/gpio.h>
-+
-+static LIST_HEAD(at91_led_list);      /* list of AT91 LEDs */
-+
-+struct at91_led {
-+      struct led_classdev     cdev;
-+      struct list_head        list;
-+      struct at91_gpio_led    *led_data;
-+};
-+
-+/*
-+ * Change the state of the LED.
-+ */
-+static void at91_led_set(struct led_classdev *cdev, enum led_brightness value)
-+{
-+      struct at91_led *led = container_of(cdev, struct at91_led, cdev);
-+      short           active = (value == LED_OFF);
-+
-+      if (led->led_data->flags & 1)   /* active high/low? */
-+              active = !active;
-+      at91_set_gpio_value(led->led_data->gpio, active);
-+}
-+
-+static int __devexit at91_led_remove(struct platform_device *pdev)
-+{
-+      struct at91_led         *led;
-+
-+      list_for_each_entry (led, &at91_led_list, list)
-+              led_classdev_unregister(&led->cdev);
-+
-+#warning "Free allocated memory"
-+      // TODO: Free memory.   kfree(led);
-+
-+      return 0;
-+}
-+
-+static int __init at91_led_probe(struct platform_device *pdev)
-+{
-+      int                     status = 0;
-+      struct at91_gpio_led    *pdata = pdev->dev.platform_data;
-+      unsigned                nr_leds;
-+      struct at91_led         *led;
-+
-+      if (!pdata)
-+              return -ENODEV;
-+
-+      nr_leds = pdata->index;         /* first index stores number of LEDs */
-+
-+      while (nr_leds--) {
-+              led = kzalloc(sizeof(struct at91_led), GFP_KERNEL);
-+              if (!led) {
-+                      dev_err(&pdev->dev, "No memory for device\n");
-+                      status = -ENOMEM;
-+                      goto cleanup;
-+              }
-+              led->led_data = pdata;
-+              led->cdev.name = pdata->name;
-+              led->cdev.brightness_set = at91_led_set,
-+              led->cdev.default_trigger = pdata->trigger;
-+
-+              status = led_classdev_register(&pdev->dev, &led->cdev);
-+              if (status < 0) {
-+                      dev_err(&pdev->dev, "led_classdev_register failed - %d\n", status);
-+cleanup:
-+                      at91_led_remove(pdev);
-+                      break;
-+              }
-+              list_add(&led->list, &at91_led_list);
-+              pdata++;
-+      }
-+      return status;
-+}
-+
-+#ifdef CONFIG_PM
-+static int at91_led_suspend(struct platform_device *dev, pm_message_t state)
-+{
-+      struct at91_led *led;
-+
-+      list_for_each_entry (led, &at91_led_list, list)
-+              led_classdev_suspend(&led->cdev);
-+
-+      return 0;
-+}
-+
-+static int at91_led_resume(struct platform_device *dev)
-+{
-+      struct at91_led *led;
-+
-+      list_for_each_entry (led, &at91_led_list, list)
-+              led_classdev_resume(&led->cdev);
-+
-+      return 0;
-+}
-+#else
-+#define       at91_led_suspend        NULL
-+#define       at91_led_resume         NULL
-+#endif
-+
-+static struct platform_driver at91_led_driver = {
-+      .probe          = at91_led_probe,
-+      .remove         = __devexit_p(at91_led_remove),
-+      .suspend        = at91_led_suspend,
-+      .resume         = at91_led_resume,
-+      .driver         = {
-+              .name   = "at91_leds",
-+              .owner  = THIS_MODULE,
-+      },
-+};
-+
-+static int __init at91_led_init(void)
-+{
-+      return platform_driver_register(&at91_led_driver);
-+}
-+module_init(at91_led_init);
-+
-+static void __exit at91_led_exit(void)
-+{
-+      platform_driver_unregister(&at91_led_driver);
-+}
-+module_exit(at91_led_exit);
-+
-+MODULE_DESCRIPTION("AT91 GPIO LED driver");
-+MODULE_AUTHOR("David Brownell");
-+MODULE_LICENSE("GPL");
-Index: linux-2.6.21.7/drivers/mmc/at91_mci.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/mmc/at91_mci.c
-+++ linux-2.6.21.7/drivers/mmc/at91_mci.c
-@@ -86,7 +86,7 @@
- #define AT91_MCI_ERRORS       (AT91_MCI_RINDE | AT91_MCI_RDIRE | AT91_MCI_RCRCE       \
-               | AT91_MCI_RENDE | AT91_MCI_RTOE | AT91_MCI_DCRCE               \
--              | AT91_MCI_DTOE | AT91_MCI_OVRE | AT91_MCI_UNRE)                        
-+              | AT91_MCI_DTOE | AT91_MCI_OVRE | AT91_MCI_UNRE)
- #define at91_mci_read(host, reg)      __raw_readl((host)->baseaddr + (reg))
- #define at91_mci_write(host, reg, val)        __raw_writel((val), (host)->baseaddr + (reg))
-@@ -561,9 +561,7 @@ static void at91mci_completed_command(st
-       pr_debug("Status = %08X [%08X %08X %08X %08X]\n",
-                status, cmd->resp[0], cmd->resp[1], cmd->resp[2], cmd->resp[3]);
--      if (status & (AT91_MCI_RINDE | AT91_MCI_RDIRE | AT91_MCI_RCRCE |
--                      AT91_MCI_RENDE | AT91_MCI_RTOE | AT91_MCI_DCRCE |
--                      AT91_MCI_DTOE | AT91_MCI_OVRE | AT91_MCI_UNRE)) {
-+      if (status & AT91_MCI_ERRORS) {
-               if ((status & AT91_MCI_RCRCE) &&
-                       ((cmd->opcode == MMC_SEND_OP_COND) || (cmd->opcode == SD_APP_OP_COND))) {
-                       cmd->error = MMC_ERR_NONE;
-@@ -665,15 +663,15 @@ static irqreturn_t at91_mci_irq(int irq,
-       int_status = at91_mci_read(host, AT91_MCI_SR);
-       int_mask = at91_mci_read(host, AT91_MCI_IMR);
--      
-+
-       pr_debug("MCI irq: status = %08X, %08X, %08X\n", int_status, int_mask,
-               int_status & int_mask);
--      
-+
-       int_status = int_status & int_mask;
-       if (int_status & AT91_MCI_ERRORS) {
-               completed = 1;
--              
-+
-               if (int_status & AT91_MCI_UNRE)
-                       pr_debug("MMC: Underrun error\n");
-               if (int_status & AT91_MCI_OVRE)
-@@ -821,7 +819,7 @@ static int __init at91_mci_probe(struct 
-       mmc->f_min = 375000;
-       mmc->f_max = 25000000;
-       mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
--      mmc->caps = MMC_CAP_BYTEBLOCK;
-+      mmc->caps = MMC_CAP_BYTEBLOCK | MMC_CAP_MULTIWRITE;
-       mmc->max_blk_size = 4095;
-       mmc->max_blk_count = mmc->max_req_size;
-@@ -895,6 +893,8 @@ static int __init at91_mci_probe(struct 
-       mmc_add_host(mmc);
-+      device_init_wakeup(&pdev->dev, 1);
-+
-       /*
-        * monitor card insertion/removal if we can
-        */
-@@ -924,6 +924,8 @@ static int __exit at91_mci_remove(struct
-       host = mmc_priv(mmc);
-+      device_init_wakeup(&pdev->dev, 0);
-+
-       if (host->present != -1) {
-               free_irq(host->board->det_pin, host);
-               cancel_delayed_work(&host->mmc->detect);
-@@ -951,8 +953,12 @@ static int __exit at91_mci_remove(struct
- static int at91_mci_suspend(struct platform_device *pdev, pm_message_t state)
- {
-       struct mmc_host *mmc = platform_get_drvdata(pdev);
-+      struct at91mci_host *host = mmc_priv(mmc);
-       int ret = 0;
-+      if (device_may_wakeup(&pdev->dev))
-+              enable_irq_wake(host->board->det_pin);
-+
-       if (mmc)
-               ret = mmc_suspend_host(mmc, state);
-@@ -962,8 +968,12 @@ static int at91_mci_suspend(struct platf
- static int at91_mci_resume(struct platform_device *pdev)
- {
-       struct mmc_host *mmc = platform_get_drvdata(pdev);
-+      struct at91mci_host *host = mmc_priv(mmc);
-       int ret = 0;
-+      if (device_may_wakeup(&pdev->dev))
-+              disable_irq_wake(host->board->det_pin);
-+
-       if (mmc)
-               ret = mmc_resume_host(mmc);
-Index: linux-2.6.21.7/drivers/mtd/devices/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/drivers/mtd/devices/Kconfig
-+++ linux-2.6.21.7/drivers/mtd/devices/Kconfig
-@@ -267,5 +267,11 @@ config MTD_DOCPROBE_55AA
-         LinuxBIOS or if you need to recover a DiskOnChip Millennium on which
-         you have managed to wipe the first block.
--endmenu
-+config MTD_AT91_DATAFLASH
-+      tristate "AT91RM9200 DataFlash AT45DBxxx (legacy driver)"
-+      depends on MTD && ARCH_AT91RM9200 && AT91_SPI
-+      help
-+        This enables access to the DataFlash (AT45DBxxx) on the AT91RM9200.
-+        If you have such a board, say 'Y'.
-+endmenu
-Index: linux-2.6.21.7/drivers/mtd/devices/Makefile
-===================================================================
---- linux-2.6.21.7.orig/drivers/mtd/devices/Makefile
-+++ linux-2.6.21.7/drivers/mtd/devices/Makefile
-@@ -17,3 +17,4 @@ obj-$(CONFIG_MTD_LART)               += lart.o
- obj-$(CONFIG_MTD_BLOCK2MTD)   += block2mtd.o
- obj-$(CONFIG_MTD_DATAFLASH)   += mtd_dataflash.o
- obj-$(CONFIG_MTD_M25P80)      += m25p80.o
-+obj-$(CONFIG_MTD_AT91_DATAFLASH)+= at91_dataflash.o
-Index: linux-2.6.21.7/drivers/mtd/devices/at91_dataflash.c
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/drivers/mtd/devices/at91_dataflash.c
-@@ -0,0 +1,667 @@
-+/*
-+ * Atmel DataFlash driver for Atmel AT91RM9200 (Thunder)
-+ *
-+ *  Copyright (C) SAN People (Pty) Ltd
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+*/
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/slab.h>
-+#include <linux/pci.h>
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
-+
-+#include <asm/arch/spi.h>
-+
-+#undef DEBUG_DATAFLASH
-+
-+#define DATAFLASH_MAX_DEVICES 4       /* max number of dataflash devices */
-+#undef        DATAFLASH_ALWAYS_ADD_DEVICE     /* always add whole device when using partitions? */
-+
-+#define OP_READ_CONTINUOUS    0xE8
-+#define OP_READ_PAGE          0xD2
-+#define OP_READ_BUFFER1               0xD4
-+#define OP_READ_BUFFER2               0xD6
-+#define OP_READ_STATUS                0xD7
-+
-+#define OP_ERASE_PAGE         0x81
-+#define OP_ERASE_BLOCK                0x50
-+
-+#define OP_TRANSFER_BUF1      0x53
-+#define OP_TRANSFER_BUF2      0x55
-+#define OP_COMPARE_BUF1               0x60
-+#define OP_COMPARE_BUF2               0x61
-+
-+#define OP_PROGRAM_VIA_BUF1   0x82
-+#define OP_PROGRAM_VIA_BUF2   0x85
-+
-+struct dataflash_local
-+{
-+      int spi;                        /* SPI chip-select number */
-+
-+      unsigned int page_size;         /* number of bytes per page */
-+      unsigned short page_offset;     /* page offset in flash address */
-+};
-+
-+
-+/* Detected DataFlash devices */
-+static struct mtd_info* mtd_devices[DATAFLASH_MAX_DEVICES];
-+static int nr_devices = 0;
-+
-+/* ......................................................................... */
-+
-+#ifdef CONFIG_MTD_PARTITIONS
-+
-+static struct mtd_partition static_partitions_2M[] =
-+{
-+      {
-+              .name           = "bootloader",
-+              .offset         = 0,
-+              .size           = 1 * 32 * 8 * 528,     /* 1st sector = 32 blocks * 8 pages * 528 bytes */
-+              .mask_flags     = MTD_WRITEABLE,        /* read-only */
-+      },
-+      {
-+              .name           = "kernel",
-+              .offset         = MTDPART_OFS_NXTBLK,
-+              .size           = 6 * 32 * 8 * 528,     /* 6 sectors */
-+      },
-+      {
-+              .name           = "filesystem",
-+              .offset         = MTDPART_OFS_NXTBLK,
-+              .size           = MTDPART_SIZ_FULL,     /* rest = 9 sectors */
-+      }
-+};
-+
-+static struct mtd_partition static_partitions_4M[] =
-+{
-+      {
-+              .name           = "bootloader",
-+              .offset         = 0,
-+              .size           = 1 * 64 * 8 * 528,     /* 1st sector = 64 blocks * 8 pages * 528 bytes */
-+              .mask_flags     = MTD_WRITEABLE,        /* read-only */
-+      },
-+      {
-+              .name           = "kernel",
-+              .offset         = MTDPART_OFS_NXTBLK,
-+              .size           = 4 * 64 * 8 * 528,     /* 4 sectors */
-+      },
-+      {
-+              .name           = "filesystem",
-+              .offset         = MTDPART_OFS_NXTBLK,
-+              .size           = MTDPART_SIZ_FULL,     /* rest = 11 sectors */
-+      }
-+};
-+
-+#if defined(CONFIG_MACH_KAFA)
-+static struct mtd_partition static_partitions_8M[] =
-+{
-+      {
-+              name:           "romboot",
-+              offset:         0,
-+              size:           16 * 1056,      /* 160 Kb */
-+              mask_flags:     MTD_WRITEABLE,          /* read-only */
-+      },
-+      {
-+              name:           "uboot",
-+              offset:         MTDPART_OFS_APPEND, /* Sperry, NXTBLK is broken */
-+              size:           128 * 1056,             /* 1 MB */
-+      },
-+      {
-+              name:           "kernel",
-+              offset:         MTDPART_OFS_APPEND, /* Sperry, NXTBLK is broken */
-+              size:           1024 * 1056,            /* 1 MB */
-+      },
-+      {
-+              name:           "filesystem",
-+              offset:         MTDPART_OFS_APPEND, /* Sperry, NXTBLK is broken */
-+              size:           MTDPART_SIZ_FULL,
-+      }
-+};
-+
-+#elif defined(CONFIG_MACH_MULTMDP)
-+
-+static struct mtd_partition static_partitions_8M[] =
-+{
-+      {
-+              .name           = "bootloader",
-+              .offset         = 0,
-+              .size           = 12 * 1056,            /* 1st sector = 32 blocks * 8 pages * 1056 bytes */
-+              .mask_flags     = MTD_WRITEABLE,        /* read-only */
-+      },
-+      {
-+              .name           = "configuration",
-+              .offset         = MTDPART_OFS_NXTBLK,
-+              .size           = 20 * 1056,
-+      },
-+      {
-+              .name           = "kernel",
-+              .offset         = MTDPART_OFS_NXTBLK,
-+              .size           = 1520 * 1056,
-+      },
-+      {
-+              .name           = "filesystem",
-+              .offset         = MTDPART_OFS_NXTBLK,
-+              .size           = MTDPART_SIZ_FULL,
-+      }
-+};
-+
-+#else
-+
-+static struct mtd_partition static_partitions_8M[] =
-+{
-+      {
-+              .name           = "bootloader",
-+              .offset         = 0,
-+              .size           = 1 * 32 * 8 * 1056,    /* 1st sector = 32 blocks * 8 pages * 1056 bytes */
-+              .mask_flags     = MTD_WRITEABLE,        /* read-only */
-+      },
-+      {
-+              .name           = "kernel",
-+              .offset         = MTDPART_OFS_NXTBLK,
-+              .size           = 5 * 32 * 8 * 1056,    /* 5 sectors */
-+      },
-+      {
-+              .name           = "filesystem",
-+              .offset         = MTDPART_OFS_NXTBLK,
-+              .size           = MTDPART_SIZ_FULL,     /* rest = 26 sectors */
-+      }
-+};
-+#endif
-+
-+static const char *part_probes[] = { "cmdlinepart", NULL, };
-+
-+#endif
-+
-+/* ......................................................................... */
-+
-+/* Allocate a single SPI transfer descriptor.  We're assuming that if multiple
-+   SPI transfers occur at the same time, spi_access_bus() will serialize them.
-+   If this is not valid, then either (i) each dataflash 'priv' structure
-+   needs it's own transfer descriptor, (ii) we lock this one, or (iii) use
-+   another mechanism.   */
-+static struct spi_transfer_list* spi_transfer_desc;
-+
-+/*
-+ * Perform a SPI transfer to access the DataFlash device.
-+ */
-+static int do_spi_transfer(int nr, char* tx, int tx_len, char* rx, int rx_len,
-+              char* txnext, int txnext_len, char* rxnext, int rxnext_len)
-+{
-+      struct spi_transfer_list* list = spi_transfer_desc;
-+
-+      list->tx[0] = tx;       list->txlen[0] = tx_len;
-+      list->rx[0] = rx;       list->rxlen[0] = rx_len;
-+
-+      list->tx[1] = txnext;   list->txlen[1] = txnext_len;
-+      list->rx[1] = rxnext;   list->rxlen[1] = rxnext_len;
-+
-+      list->nr_transfers = nr;
-+
-+      return spi_transfer(list);
-+}
-+
-+/* ......................................................................... */
-+
-+/*
-+ * Poll the DataFlash device until it is READY.
-+ */
-+static void at91_dataflash_waitready(void)
-+{
-+      char* command = kmalloc(2, GFP_KERNEL);
-+
-+      if (!command)
-+              return;
-+
-+      do {
-+              command[0] = OP_READ_STATUS;
-+              command[1] = 0;
-+
-+              do_spi_transfer(1, command, 2, command, 2, NULL, 0, NULL, 0);
-+      } while ((command[1] & 0x80) == 0);
-+
-+      kfree(command);
-+}
-+
-+/*
-+ * Return the status of the DataFlash device.
-+ */
-+static unsigned short at91_dataflash_status(void)
-+{
-+      unsigned short status;
-+      char* command = kmalloc(2, GFP_KERNEL);
-+
-+      if (!command)
-+              return 0;
-+
-+      command[0] = OP_READ_STATUS;
-+      command[1] = 0;
-+
-+      do_spi_transfer(1, command, 2, command, 2, NULL, 0, NULL, 0);
-+      status = command[1];
-+
-+      kfree(command);
-+      return status;
-+}
-+
-+/* ......................................................................... */
-+
-+/*
-+ * Erase blocks of flash.
-+ */
-+static int at91_dataflash_erase(struct mtd_info *mtd, struct erase_info *instr)
-+{
-+      struct dataflash_local *priv = (struct dataflash_local *) mtd->priv;
-+      unsigned int pageaddr;
-+      char* command;
-+
-+#ifdef DEBUG_DATAFLASH
-+      printk("dataflash_erase: addr=%i len=%i\n", instr->addr, instr->len);
-+#endif
-+
-+      /* Sanity checks */
-+      if (instr->addr + instr->len > mtd->size)
-+              return -EINVAL;
-+      if ((instr->len % mtd->erasesize != 0) || (instr->len % priv->page_size != 0))
-+              return -EINVAL;
-+      if ((instr->addr % priv->page_size) != 0)
-+              return -EINVAL;
-+
-+      command = kmalloc(4, GFP_KERNEL);
-+      if (!command)
-+              return -ENOMEM;
-+
-+      while (instr->len > 0) {
-+              /* Calculate flash page address */
-+              pageaddr = (instr->addr / priv->page_size) << priv->page_offset;
-+
-+              command[0] = OP_ERASE_PAGE;
-+              command[1] = (pageaddr & 0x00FF0000) >> 16;
-+              command[2] = (pageaddr & 0x0000FF00) >> 8;
-+              command[3] = 0;
-+#ifdef DEBUG_DATAFLASH
-+              printk("ERASE: (%x) %x %x %x [%i]\n", command[0], command[1], command[2], command[3], pageaddr);
-+#endif
-+
-+              /* Send command to SPI device */
-+              spi_access_bus(priv->spi);
-+              do_spi_transfer(1, command, 4, command, 4, NULL, 0, NULL, 0);
-+
-+              at91_dataflash_waitready();             /* poll status until ready */
-+              spi_release_bus(priv->spi);
-+
-+              instr->addr += priv->page_size;         /* next page */
-+              instr->len -= priv->page_size;
-+      }
-+
-+      kfree(command);
-+
-+      /* Inform MTD subsystem that erase is complete */
-+      instr->state = MTD_ERASE_DONE;
-+      if (instr->callback)
-+              instr->callback(instr);
-+
-+      return 0;
-+}
-+
-+/*
-+ * Read from the DataFlash device.
-+ *   from   : Start offset in flash device
-+ *   len    : Amount to read
-+ *   retlen : About of data actually read
-+ *   buf    : Buffer containing the data
-+ */
-+static int at91_dataflash_read(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf)
-+{
-+      struct dataflash_local *priv = (struct dataflash_local *) mtd->priv;
-+      unsigned int addr;
-+      char* command;
-+
-+#ifdef DEBUG_DATAFLASH
-+      printk("dataflash_read: %lli .. %lli\n", from, from+len);
-+#endif
-+
-+      *retlen = 0;
-+
-+      /* Sanity checks */
-+      if (!len)
-+              return 0;
-+      if (from + len > mtd->size)
-+              return -EINVAL;
-+
-+      /* Calculate flash page/byte address */
-+      addr = (((unsigned)from / priv->page_size) << priv->page_offset) + ((unsigned)from % priv->page_size);
-+
-+      command = kmalloc(8, GFP_KERNEL);
-+      if (!command)
-+              return -ENOMEM;
-+
-+      command[0] = OP_READ_CONTINUOUS;
-+      command[1] = (addr & 0x00FF0000) >> 16;
-+      command[2] = (addr & 0x0000FF00) >> 8;
-+      command[3] = (addr & 0x000000FF);
-+#ifdef DEBUG_DATAFLASH
-+      printk("READ: (%x) %x %x %x\n", command[0], command[1], command[2], command[3]);
-+#endif
-+
-+      /* Send command to SPI device */
-+      spi_access_bus(priv->spi);
-+      do_spi_transfer(2, command, 8, command, 8, buf, len, buf, len);
-+      spi_release_bus(priv->spi);
-+
-+      *retlen = len;
-+      kfree(command);
-+      return 0;
-+}
-+
-+/*
-+ * Write to the DataFlash device.
-+ *   to     : Start offset in flash device
-+ *   len    : Amount to write
-+ *   retlen : Amount of data actually written
-+ *   buf    : Buffer containing the data
-+ */
-+static int at91_dataflash_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf)
-+{
-+      struct dataflash_local *priv = (struct dataflash_local *) mtd->priv;
-+      unsigned int pageaddr, addr, offset, writelen;
-+      size_t remaining;
-+      u_char *writebuf;
-+      unsigned short status;
-+      int res = 0;
-+      char* command;
-+      char* tmpbuf = NULL;
-+
-+#ifdef DEBUG_DATAFLASH
-+      printk("dataflash_write: %lli .. %lli\n", to, to+len);
-+#endif
-+
-+      *retlen = 0;
-+
-+      /* Sanity checks */
-+      if (!len)
-+              return 0;
-+      if (to + len > mtd->size)
-+              return -EINVAL;
-+
-+      command = kmalloc(4, GFP_KERNEL);
-+      if (!command)
-+              return -ENOMEM;
-+
-+      pageaddr = ((unsigned)to / priv->page_size);
-+      offset = ((unsigned)to % priv->page_size);
-+      if (offset + len > priv->page_size)
-+              writelen = priv->page_size - offset;
-+      else
-+              writelen = len;
-+      writebuf = (u_char *)buf;
-+      remaining = len;
-+
-+      /* Allocate temporary buffer */
-+      tmpbuf = kmalloc(priv->page_size, GFP_KERNEL);
-+      if (!tmpbuf) {
-+              kfree(command);
-+              return -ENOMEM;
-+      }
-+
-+      /* Gain access to the SPI bus */
-+      spi_access_bus(priv->spi);
-+
-+      while (remaining > 0) {
-+#ifdef DEBUG_DATAFLASH
-+              printk("write @ %i:%i len=%i\n", pageaddr, offset, writelen);
-+#endif
-+
-+              /* (1) Transfer to Buffer1 */
-+              if (writelen != priv->page_size) {
-+                      addr = pageaddr << priv->page_offset;
-+                      command[0] = OP_TRANSFER_BUF1;
-+                      command[1] = (addr & 0x00FF0000) >> 16;
-+                      command[2] = (addr & 0x0000FF00) >> 8;
-+                      command[3] = 0;
-+#ifdef DEBUG_DATAFLASH
-+                      printk("TRANSFER: (%x) %x %x %x\n", command[0], command[1], command[2], command[3]);
-+#endif
-+                      do_spi_transfer(1, command, 4, command, 4, NULL, 0, NULL, 0);
-+                      at91_dataflash_waitready();
-+              }
-+
-+              /* (2) Program via Buffer1 */
-+              addr = (pageaddr << priv->page_offset) + offset;
-+              command[0] = OP_PROGRAM_VIA_BUF1;
-+              command[1] = (addr & 0x00FF0000) >> 16;
-+              command[2] = (addr & 0x0000FF00) >> 8;
-+              command[3] = (addr & 0x000000FF);
-+#ifdef DEBUG_DATAFLASH
-+              printk("PROGRAM: (%x) %x %x %x\n", command[0], command[1], command[2], command[3]);
-+#endif
-+              do_spi_transfer(2, command, 4, command, 4, writebuf, writelen, tmpbuf, writelen);
-+              at91_dataflash_waitready();
-+
-+              /* (3) Compare to Buffer1 */
-+              addr = pageaddr << priv->page_offset;
-+              command[0] = OP_COMPARE_BUF1;
-+              command[1] = (addr & 0x00FF0000) >> 16;
-+              command[2] = (addr & 0x0000FF00) >> 8;
-+              command[3] = 0;
-+#ifdef DEBUG_DATAFLASH
-+              printk("COMPARE: (%x) %x %x %x\n", command[0], command[1], command[2], command[3]);
-+#endif
-+              do_spi_transfer(1, command, 4, command, 4, NULL, 0, NULL, 0);
-+              at91_dataflash_waitready();
-+
-+              /* Get result of the compare operation */
-+              status = at91_dataflash_status();
-+              if ((status & 0x40) == 1) {
-+                      printk("at91_dataflash: Write error on page %i\n", pageaddr);
-+                      remaining = 0;
-+                      res = -EIO;
-+              }
-+
-+              remaining = remaining - writelen;
-+              pageaddr++;
-+              offset = 0;
-+              writebuf += writelen;
-+              *retlen += writelen;
-+
-+              if (remaining > priv->page_size)
-+                      writelen = priv->page_size;
-+              else
-+                      writelen = remaining;
-+      }
-+
-+      /* Release SPI bus */
-+      spi_release_bus(priv->spi);
-+
-+      kfree(tmpbuf);
-+      kfree(command);
-+      return res;
-+}
-+
-+/* ......................................................................... */
-+
-+/*
-+ * Initialize and register DataFlash device with MTD subsystem.
-+ */
-+static int __init add_dataflash(int channel, char *name, int IDsize,
-+              int nr_pages, int pagesize, int pageoffset)
-+{
-+      struct mtd_info *device;
-+      struct dataflash_local *priv;
-+#ifdef CONFIG_MTD_PARTITIONS
-+      struct mtd_partition *mtd_parts = 0;
-+      int mtd_parts_nr = 0;
-+#endif
-+
-+      if (nr_devices >= DATAFLASH_MAX_DEVICES) {
-+              printk(KERN_ERR "at91_dataflash: Too many devices detected\n");
-+              return 0;
-+      }
-+
-+      device = kmalloc(sizeof(struct mtd_info) + strlen(name) + 8, GFP_KERNEL);
-+      if (!device)
-+              return -ENOMEM;
-+      memset(device, 0, sizeof(struct mtd_info));
-+
-+      device->name = (char *)&device[1];
-+      sprintf(device->name, "%s.spi%d", name, channel);
-+      device->size = nr_pages * pagesize;
-+      device->erasesize = pagesize;
-+      device->writesize = pagesize;
-+      device->owner = THIS_MODULE;
-+      device->type = MTD_DATAFLASH;
-+      device->flags = MTD_WRITEABLE;
-+      device->erase = at91_dataflash_erase;
-+      device->read = at91_dataflash_read;
-+      device->write = at91_dataflash_write;
-+
-+      priv = (struct dataflash_local *) kmalloc(sizeof(struct dataflash_local), GFP_KERNEL);
-+      if (!priv) {
-+              kfree(device);
-+              return -ENOMEM;
-+      }
-+      memset(priv, 0, sizeof(struct dataflash_local));
-+
-+      priv->spi = channel;
-+      priv->page_size = pagesize;
-+      priv->page_offset = pageoffset;
-+      device->priv = priv;
-+
-+      mtd_devices[nr_devices] = device;
-+      nr_devices++;
-+      printk("at91_dataflash: %s detected [spi%i] (%i bytes)\n", name, channel, device->size);
-+
-+#ifdef CONFIG_MTD_PARTITIONS
-+#ifdef CONFIG_MTD_CMDLINE_PARTS
-+      mtd_parts_nr = parse_mtd_partitions(device, part_probes, &mtd_parts, 0);
-+#endif
-+      if (mtd_parts_nr <= 0) {
-+              switch (IDsize) {
-+                      case SZ_2M:
-+                              mtd_parts = static_partitions_2M;
-+                              mtd_parts_nr = ARRAY_SIZE(static_partitions_2M);
-+                              break;
-+                      case SZ_4M:
-+                              mtd_parts = static_partitions_4M;
-+                              mtd_parts_nr = ARRAY_SIZE(static_partitions_4M);
-+                              break;
-+                      case SZ_8M:
-+                              mtd_parts = static_partitions_8M;
-+                              mtd_parts_nr = ARRAY_SIZE(static_partitions_8M);
-+                              break;
-+              }
-+      }
-+
-+      if (mtd_parts_nr > 0) {
-+#ifdef DATAFLASH_ALWAYS_ADD_DEVICE
-+              add_mtd_device(device);
-+#endif
-+              return add_mtd_partitions(device, mtd_parts, mtd_parts_nr);
-+      }
-+#endif
-+      return add_mtd_device(device);          /* add whole device */
-+}
-+
-+/*
-+ * Detect and initialize DataFlash device connected to specified SPI channel.
-+ *
-+ *   Device            Density         ID code                 Nr Pages        Page Size       Page offset
-+ *   AT45DB011B        1Mbit   (128K)  xx0011xx (0x0c)         512             264             9
-+ *   AT45DB021B        2Mbit   (256K)  xx0101xx (0x14)         1025            264             9
-+ *   AT45DB041B        4Mbit   (512K)  xx0111xx (0x1c)         2048            264             9
-+ *   AT45DB081B        8Mbit   (1M)    xx1001xx (0x24)         4096            264             9
-+ *   AT45DB0161B       16Mbit  (2M)    xx1011xx (0x2c)         4096            528             10
-+ *   AT45DB0321B       32Mbit  (4M)    xx1101xx (0x34)         8192            528             10
-+ *   AT45DB0642        64Mbit  (8M)    xx1111xx (0x3c)         8192            1056            11
-+ *   AT45DB1282        128Mbit (16M)   xx0100xx (0x10)         16384           1056            11
-+ */
-+static int __init at91_dataflash_detect(int channel)
-+{
-+      int res = 0;
-+      unsigned short status;
-+
-+      spi_access_bus(channel);
-+      status = at91_dataflash_status();
-+      spi_release_bus(channel);
-+      if (status != 0xff) {                   /* no dataflash device there */
-+              switch (status & 0x3c) {
-+                      case 0x0c:      /* 0 0 1 1 */
-+                              res = add_dataflash(channel, "AT45DB011B", SZ_128K, 512, 264, 9);
-+                              break;
-+                      case 0x14:      /* 0 1 0 1 */
-+                              res = add_dataflash(channel, "AT45DB021B", SZ_256K, 1025, 264, 9);
-+                              break;
-+                      case 0x1c:      /* 0 1 1 1 */
-+                              res = add_dataflash(channel, "AT45DB041B", SZ_512K, 2048, 264, 9);
-+                              break;
-+                      case 0x24:      /* 1 0 0 1 */
-+                              res = add_dataflash(channel, "AT45DB081B", SZ_1M, 4096, 264, 9);
-+                              break;
-+                      case 0x2c:      /* 1 0 1 1 */
-+                              res = add_dataflash(channel, "AT45DB161B", SZ_2M, 4096, 528, 10);
-+                              break;
-+                      case 0x34:      /* 1 1 0 1 */
-+                              res = add_dataflash(channel, "AT45DB321B", SZ_4M, 8192, 528, 10);
-+                              break;
-+                      case 0x3c:      /* 1 1 1 1 */
-+                              res = add_dataflash(channel, "AT45DB642", SZ_8M, 8192, 1056, 11);
-+                              break;
-+// Currently unsupported since Atmel removed the "Main Memory Program via Buffer" commands.
-+//                    case 0x10:      /* 0 1 0 0 */
-+//                            res = add_dataflash(channel, "AT45DB1282", SZ_16M, 16384, 1056, 11);
-+//                            break;
-+                      default:
-+                              printk(KERN_ERR "at91_dataflash: Unknown device (%x)\n", status & 0x3c);
-+              }
-+      }
-+
-+      return res;
-+}
-+
-+static int __init at91_dataflash_init(void)
-+{
-+      spi_transfer_desc = kmalloc(sizeof(struct spi_transfer_list), GFP_KERNEL);
-+      if (!spi_transfer_desc)
-+              return -ENOMEM;
-+
-+      /* DataFlash (SPI chip select 0) */
-+      at91_dataflash_detect(0);
-+
-+#ifdef CONFIG_MTD_AT91_DATAFLASH_CARD
-+      /* DataFlash card (SPI chip select 3) */
-+      at91_dataflash_detect(3);
-+#endif
-+
-+      return 0;
-+}
-+
-+static void __exit at91_dataflash_exit(void)
-+{
-+      int i;
-+
-+      for (i = 0; i < DATAFLASH_MAX_DEVICES; i++) {
-+              if (mtd_devices[i]) {
-+#ifdef CONFIG_MTD_PARTITIONS
-+                      del_mtd_partitions(mtd_devices[i]);
-+#else
-+                      del_mtd_device(mtd_devices[i]);
-+#endif
-+                      kfree(mtd_devices[i]->priv);
-+                      kfree(mtd_devices[i]);
-+              }
-+      }
-+      nr_devices = 0;
-+      kfree(spi_transfer_desc);
-+}
-+
-+
-+module_init(at91_dataflash_init);
-+module_exit(at91_dataflash_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Andrew Victor");
-+MODULE_DESCRIPTION("DataFlash driver for Atmel AT91RM9200");
-Index: linux-2.6.21.7/drivers/mtd/nand/at91_nand.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/mtd/nand/at91_nand.c
-+++ linux-2.6.21.7/drivers/mtd/nand/at91_nand.c
-@@ -82,6 +82,10 @@ static void at91_nand_disable(struct at9
-               at91_set_gpio_value(host->board->enable_pin, 1);
- }
-+#ifdef CONFIG_MTD_PARTITIONS
-+const char *part_probes[] = { "cmdlinepart", NULL };
-+#endif
-+
- /*
-  * Probe for the NAND device.
-  */
-@@ -151,6 +155,12 @@ static int __init at91_nand_probe(struct
- #ifdef CONFIG_MTD_PARTITIONS
-       if (host->board->partition_info)
-               partitions = host->board->partition_info(mtd->size, &num_partitions);
-+#ifdef CONFIG_MTD_CMDLINE_PARTS
-+      else {
-+              mtd->name = "at91_nand";
-+              num_partitions = parse_mtd_partitions(mtd, part_probes, &partitions, 0);
-+      }
-+#endif
-       if ((!partitions) || (num_partitions == 0)) {
-               printk(KERN_ERR "at91_nand: No parititions defined, or unsupported device.\n");
-Index: linux-2.6.21.7/drivers/net/arm/at91_ether.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/net/arm/at91_ether.c
-+++ linux-2.6.21.7/drivers/net/arm/at91_ether.c
-@@ -225,6 +225,16 @@ static irqreturn_t at91ether_phy_interru
-               if (!(phy & ((1 << 2) | 1)))
-                       goto done;
-       }
-+      else if (lp->phy_type == MII_T78Q21x3_ID) {                     /* ack interrupt in Teridian PHY */
-+              read_phy(lp->phy_address, MII_T78Q21INT_REG, &phy);
-+              if (!(phy & ((1 << 2) | 1)))
-+                      goto done;
-+      }
-+      else if (lp->phy_type == MII_DP83848_ID) {
-+              read_phy(lp->phy_address, MII_DPPHYSTS_REG, &phy);      /* ack interrupt in DP83848 PHY */
-+              if (!(phy & (1 << 7)))
-+                      goto done;
-+      }
-       update_linkspeed(dev, 0);
-@@ -280,6 +290,19 @@ static void enable_phyirq(struct net_dev
-               dsintr = (1 << 10) | ( 1 << 8);
-               write_phy(lp->phy_address, MII_TPISTATUS, dsintr);
-       }
-+      else if (lp->phy_type == MII_T78Q21x3_ID) {     /* for Teridian PHY */
-+              read_phy(lp->phy_address, MII_T78Q21INT_REG, &dsintr);
-+              dsintr = dsintr | 0x500;                /* set bits 8, 10 */
-+              write_phy(lp->phy_address, MII_T78Q21INT_REG, dsintr);
-+      }
-+      else if (lp->phy_type == MII_DP83848_ID) {      /* National Semiconductor DP83848 PHY */
-+              read_phy(lp->phy_address, MII_DPMISR_REG, &dsintr);
-+              dsintr = dsintr | 0x3c;                 /* set bits 2..5 */
-+              write_phy(lp->phy_address, MII_DPMISR_REG, dsintr);
-+              read_phy(lp->phy_address, MII_DPMICR_REG, &dsintr);
-+              dsintr = dsintr | 0x3;                  /* set bits 0,1 */
-+              write_phy(lp->phy_address, MII_DPMICR_REG, dsintr);
-+      }
-       disable_mdi();
-       spin_unlock_irq(&lp->lock);
-@@ -323,6 +346,19 @@ static void disable_phyirq(struct net_de
-               dsintr = ~((1 << 10) | (1 << 8));
-               write_phy(lp->phy_address, MII_TPISTATUS, dsintr);
-       }
-+      else if (lp->phy_type == MII_T78Q21x3_ID) {     /* for Teridian PHY */
-+              read_phy(lp->phy_address, MII_T78Q21INT_REG, &dsintr);
-+              dsintr = dsintr & ~0x500;                       /* clear bits 8, 10 */
-+              write_phy(lp->phy_address, MII_T78Q21INT_REG, dsintr);
-+      }
-+      else if (lp->phy_type == MII_DP83848_ID) {      /* National Semiconductor DP83848 PHY */
-+              read_phy(lp->phy_address, MII_DPMICR_REG, &dsintr);
-+              dsintr = dsintr & ~0x3;                         /* clear bits 0, 1 */
-+              write_phy(lp->phy_address, MII_DPMICR_REG, dsintr);
-+              read_phy(lp->phy_address, MII_DPMISR_REG, &dsintr);
-+              dsintr = dsintr & ~0x3c;                        /* clear bits 2..5 */
-+              write_phy(lp->phy_address, MII_DPMISR_REG, dsintr);
-+      }
-       disable_mdi();
-       spin_unlock_irq(&lp->lock);
-@@ -535,8 +571,8 @@ static void at91ether_sethashtable(struc
-               mc_filter[bitnr >> 5] |= 1 << (bitnr & 31);
-       }
--      at91_emac_write(AT91_EMAC_HSH, mc_filter[0]);
--      at91_emac_write(AT91_EMAC_HSL, mc_filter[1]);
-+      at91_emac_write(AT91_EMAC_HSL, mc_filter[0]);
-+      at91_emac_write(AT91_EMAC_HSH, mc_filter[1]);
- }
- /*
-@@ -943,14 +979,22 @@ static int __init at91ether_setup(unsign
-       struct net_device *dev;
-       struct at91_private *lp;
-       unsigned int val;
--      int res;
-+      struct resource *res;
-+      int ret;
-       dev = alloc_etherdev(sizeof(struct at91_private));
-       if (!dev)
-               return -ENOMEM;
--      dev->base_addr = AT91_VA_BASE_EMAC;
--      dev->irq = AT91RM9200_ID_EMAC;
-+      /* Get I/O base address and IRQ */
-+      res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+      if (!res) {
-+              free_netdev(dev);
-+              return -ENODEV;
-+      }
-+      dev->base_addr = res->start;
-+      dev->irq = platform_get_irq(pdev, 0);
-+
-       SET_MODULE_OWNER(dev);
-       /* Install the interrupt handler */
-@@ -1023,12 +1067,12 @@ static int __init at91ether_setup(unsign
-       lp->phy_address = phy_address;  /* MDI address of PHY */
-       /* Register the network interface */
--      res = register_netdev(dev);
--      if (res) {
-+      ret = register_netdev(dev);
-+      if (ret) {
-               free_irq(dev->irq, dev);
-               free_netdev(dev);
-               dma_free_coherent(NULL, sizeof(struct recv_desc_bufs), lp->dlist, (dma_addr_t)lp->dlist_phys);
--              return res;
-+              return ret;
-       }
-       /* Determine current link speed */
-@@ -1063,10 +1107,16 @@ static int __init at91ether_setup(unsign
-               printk(KERN_INFO "%s: Broadcom BCM5221 PHY\n", dev->name);
-       else if (phy_type == MII_DP83847_ID)
-               printk(KERN_INFO "%s: National Semiconductor DP83847 PHY\n", dev->name);
-+      else if (phy_type == MII_DP83848_ID)
-+              printk(KERN_INFO "%s: National Semiconductor DP83848 PHY\n", dev->name);
-       else if (phy_type == MII_AC101L_ID)
-               printk(KERN_INFO "%s: Altima AC101L PHY\n", dev->name);
-       else if (phy_type == MII_KS8721_ID)
-               printk(KERN_INFO "%s: Micrel KS8721 PHY\n", dev->name);
-+      else if (phy_type == MII_T78Q21x3_ID)
-+              printk(KERN_INFO "%s: Teridian 78Q21x3 PHY\n", dev->name);
-+      else if (phy_type == MII_LAN83C185_ID)
-+              printk(KERN_INFO "%s: SMSC LAN83C185 PHY\n", dev->name);
-       return 0;
- }
-@@ -1104,8 +1154,11 @@ static int __init at91ether_probe(struct
-                       case MII_RTL8201_ID:            /* Realtek RTL8201: PHY_ID1 = 0, PHY_ID2 = 0x8201 */
-                       case MII_BCM5221_ID:            /* Broadcom BCM5221: PHY_ID1 = 0x40, PHY_ID2 = 0x61e0 */
-                       case MII_DP83847_ID:            /* National Semiconductor DP83847:  */
-+                      case MII_DP83848_ID:            /* National Semiconductor DP83848:  */
-                       case MII_AC101L_ID:             /* Altima AC101L: PHY_ID1 = 0x22, PHY_ID2 = 0x5520 */
-                       case MII_KS8721_ID:             /* Micrel KS8721: PHY_ID1 = 0x22, PHY_ID2 = 0x1610 */
-+                      case MII_T78Q21x3_ID:           /* Teridian 78Q21x3: PHY_ID1 = 0x0E, PHY_ID2 = 7237 */
-+                      case MII_LAN83C185_ID:          /* SMSC LAN83C185: PHY_ID1 = 0x0007, PHY_ID2 = 0xC0A1 */
-                               detected = at91ether_setup(phy_id, phy_address, pdev, ether_clk);
-                               break;
-               }
-Index: linux-2.6.21.7/drivers/net/arm/at91_ether.h
-===================================================================
---- linux-2.6.21.7.orig/drivers/net/arm/at91_ether.h
-+++ linux-2.6.21.7/drivers/net/arm/at91_ether.h
-@@ -17,39 +17,46 @@
- /* Davicom 9161 PHY */
--#define MII_DM9161_ID 0x0181b880
--#define MII_DM9161A_ID        0x0181b8a0
--
--/* Davicom specific registers */
--#define MII_DSCR_REG  16
--#define MII_DSCSR_REG 17
--#define MII_DSINTR_REG        21
-+#define MII_DM9161_ID         0x0181b880
-+#define MII_DM9161A_ID                0x0181b8a0
-+#define MII_DSCR_REG          16
-+#define MII_DSCSR_REG         17
-+#define MII_DSINTR_REG                21
- /* Intel LXT971A PHY */
--#define MII_LXT971A_ID        0x001378E0
--
--/* Intel specific registers */
--#define MII_ISINTE_REG        18
--#define MII_ISINTS_REG        19
--#define MII_LEDCTRL_REG       20
-+#define MII_LXT971A_ID                0x001378E0
-+#define MII_ISINTE_REG                18
-+#define MII_ISINTS_REG                19
-+#define MII_LEDCTRL_REG               20
- /* Realtek RTL8201 PHY */
--#define MII_RTL8201_ID        0x00008200
-+#define MII_RTL8201_ID                0x00008200
- /* Broadcom BCM5221 PHY */
--#define MII_BCM5221_ID        0x004061e0
--
--/* Broadcom specific registers */
--#define MII_BCMINTR_REG       26
-+#define MII_BCM5221_ID                0x004061e0
-+#define MII_BCMINTR_REG               26
- /* National Semiconductor DP83847 */
--#define MII_DP83847_ID        0x20005c30
-+#define MII_DP83847_ID                0x20005c30
-+
-+/* National Semiconductor DP83848 */
-+#define MII_DP83848_ID                0x20005c90
-+#define MII_DPPHYSTS_REG      16
-+#define MII_DPMICR_REG                17
-+#define MII_DPMISR_REG                18
- /* Altima AC101L PHY */
--#define MII_AC101L_ID 0x00225520
-+#define MII_AC101L_ID         0x00225520
- /* Micrel KS8721 PHY */
--#define MII_KS8721_ID 0x00221610
-+#define MII_KS8721_ID         0x00221610
-+
-+/* Teridian 78Q2123/78Q2133 */
-+#define MII_T78Q21x3_ID               0x000e7230
-+#define MII_T78Q21INT_REG     17
-+
-+/* SMSC LAN83C185 */
-+#define MII_LAN83C185_ID      0x0007C0A0
- /* ........................................................................ */
-Index: linux-2.6.21.7/drivers/pcmcia/at91_cf.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/pcmcia/at91_cf.c
-+++ linux-2.6.21.7/drivers/pcmcia/at91_cf.c
-@@ -332,20 +332,27 @@ static int at91_cf_suspend(struct platfo
-       struct at91_cf_data     *board = cf->board;
-       pcmcia_socket_dev_suspend(&pdev->dev, mesg);
-+
-       if (device_may_wakeup(&pdev->dev)) {
-               enable_irq_wake(board->det_pin);
-               if (board->irq_pin)
-                       enable_irq_wake(board->irq_pin);
--      } else {
--              disable_irq_wake(board->det_pin);
--              if (board->irq_pin)
--                      disable_irq_wake(board->irq_pin);
-       }
-+
-       return 0;
- }
- static int at91_cf_resume(struct platform_device *pdev)
- {
-+      struct at91_cf_socket   *cf = platform_get_drvdata(pdev);
-+      struct at91_cf_data     *board = cf->board;
-+
-+      if (device_may_wakeup(&pdev->dev)) {
-+              disable_irq_wake(board->det_pin);
-+              if (board->irq_pin)
-+                      disable_irq_wake(board->irq_pin);
-+      }
-+
-       pcmcia_socket_dev_resume(&pdev->dev);
-       return 0;
- }
-@@ -360,7 +367,6 @@ static struct platform_driver at91_cf_dr
-               .name           = (char *) driver_name,
-               .owner          = THIS_MODULE,
-       },
--      .probe          = at91_cf_probe,
-       .remove         = __exit_p(at91_cf_remove),
-       .suspend        = at91_cf_suspend,
-       .resume         = at91_cf_resume,
-@@ -370,7 +376,7 @@ static struct platform_driver at91_cf_dr
- static int __init at91_cf_init(void)
- {
--      return platform_driver_register(&at91_cf_driver);
-+      return platform_driver_probe(&at91_cf_driver, at91_cf_probe);
- }
- module_init(at91_cf_init);
-Index: linux-2.6.21.7/drivers/serial/atmel_serial.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/serial/atmel_serial.c
-+++ linux-2.6.21.7/drivers/serial/atmel_serial.c
-@@ -7,6 +7,8 @@
-  *  Based on drivers/char/serial_sa1100.c, by Deep Blue Solutions Ltd.
-  *  Based on drivers/char/serial.c, by Linus Torvalds, Theodore Ts'o.
-  *
-+ *  DMA support added by Chip Coldwell.
-+ *
-  * 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
-@@ -33,6 +35,7 @@
- #include <linux/sysrq.h>
- #include <linux/tty_flip.h>
- #include <linux/platform_device.h>
-+#include <linux/dma-mapping.h>
- #include <linux/atmel_pdc.h>
- #include <asm/io.h>
-@@ -47,6 +50,11 @@
- #include "atmel_serial.h"
-+#define SUPPORT_PDC
-+#define PDC_BUFFER_SIZE               (L1_CACHE_BYTES << 3)
-+#warning "Revisit"
-+#define PDC_RX_TIMEOUT                (3 * 10)                /* 3 bytes */
-+
- #if defined(CONFIG_SERIAL_ATMEL_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ)
- #define SUPPORT_SYSRQ
- #endif
-@@ -107,6 +115,13 @@
- static int (*atmel_open_hook)(struct uart_port *);
- static void (*atmel_close_hook)(struct uart_port *);
-+struct atmel_dma_buffer {
-+      unsigned char   *buf;
-+      dma_addr_t      dma_addr;
-+      size_t          dma_size;
-+      unsigned int    ofs;
-+};
-+
- /*
-  * We wrap our port structure around the generic uart_port.
-  */
-@@ -114,10 +129,20 @@ struct atmel_uart_port {
-       struct uart_port        uart;           /* uart */
-       struct clk              *clk;           /* uart clock */
-       unsigned short          suspended;      /* is port suspended? */
-+
-+      short                   use_dma_rx;     /* enable PDC receiver */
-+      short                   pdc_rx_idx;     /* current PDC RX buffer */
-+      struct atmel_dma_buffer pdc_rx[2];      /* PDC receier */
-+
-+      short                   use_dma_tx;     /* enable PDC transmitter */
-+      struct atmel_dma_buffer pdc_tx;         /* PDC transmitter */
- };
- static struct atmel_uart_port atmel_ports[ATMEL_MAX_UART];
-+#define PDC_RX_BUF(port)      &(port)->pdc_rx[(port)->pdc_rx_idx]
-+#define PDC_RX_SWITCH(port)   (port)->pdc_rx_idx = !(port)->pdc_rx_idx
-+
- #ifdef SUPPORT_SYSRQ
- static struct console atmel_console;
- #endif
-@@ -205,7 +230,12 @@ static void atmel_stop_tx(struct uart_po
- {
-       struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
--      UART_PUT_IDR(port, ATMEL_US_TXRDY);
-+      if (atmel_port->use_dma_tx) {
-+              UART_PUT_PTCR(port, ATMEL_PDC_TXTDIS);          /* disable PDC transmit */
-+              UART_PUT_IDR(port, ATMEL_US_ENDTX | ATMEL_US_TXBUFE);
-+      }
-+      else
-+              UART_PUT_IDR(port, ATMEL_US_TXRDY);
- }
- /*
-@@ -215,7 +245,17 @@ static void atmel_start_tx(struct uart_p
- {
-       struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
--      UART_PUT_IER(port, ATMEL_US_TXRDY);
-+      if (atmel_port->use_dma_tx) {
-+              if (UART_GET_PTSR(port) & ATMEL_PDC_TXTEN)
-+                      /* The transmitter is already running.  Yes, we
-+                         really need this.*/
-+                      return;
-+
-+              UART_PUT_IER(port, ATMEL_US_ENDTX | ATMEL_US_TXBUFE);
-+              UART_PUT_PTCR(port, ATMEL_PDC_TXTEN);           /* re-enable PDC transmit */
-+      }
-+      else
-+              UART_PUT_IER(port, ATMEL_US_TXRDY);
- }
- /*
-@@ -225,7 +265,12 @@ static void atmel_stop_rx(struct uart_po
- {
-       struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
--      UART_PUT_IDR(port, ATMEL_US_RXRDY);
-+      if (atmel_port->use_dma_rx) {
-+              UART_PUT_PTCR(port, ATMEL_PDC_RXTDIS);          /* disable PDC receive */
-+              UART_PUT_IDR(port, ATMEL_US_ENDRX | ATMEL_US_TIMEOUT);
-+      }
-+      else
-+              UART_PUT_IDR(port, ATMEL_US_RXRDY);
- }
- /*
-@@ -248,6 +293,134 @@ static void atmel_break_ctl(struct uart_
- }
- /*
-+ * Receive data via the PDC.  A buffer has been fulled.
-+ */
-+static void atmel_pdc_endrx(struct uart_port *port)
-+{
-+      struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
-+      struct tty_struct *tty = port->info->tty;
-+      struct atmel_dma_buffer *pdc = PDC_RX_BUF(atmel_port);
-+      unsigned int count;
-+
-+      count = pdc->dma_size - pdc->ofs;
-+      if (likely(count > 0)) {
-+              dma_sync_single_for_cpu(port->dev, pdc->dma_addr, pdc->dma_size, DMA_FROM_DEVICE);
-+              tty_insert_flip_string(tty, pdc->buf + pdc->ofs, count);
-+              tty_flip_buffer_push(tty);
-+
-+              port->icount.rx += count;
-+      }
-+
-+      /* Set this buffer as the next receive buffer */
-+      pdc->ofs = 0;
-+      UART_PUT_RNPR(port, pdc->dma_addr);
-+      UART_PUT_RNCR(port, pdc->dma_size);
-+
-+      /* Switch to next buffer */
-+      PDC_RX_SWITCH(atmel_port);              /* next PDC buffer */
-+}
-+
-+/*
-+ * Receive data via the PDC.  At least one byte was received, but the
-+ * buffer was not full when the inter-character timeout expired.
-+ */
-+static void atmel_pdc_timeout(struct uart_port *port)
-+{
-+      struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
-+      struct tty_struct *tty = port->info->tty;
-+      struct atmel_dma_buffer *pdc = PDC_RX_BUF(atmel_port);
-+      /* unsigned */ int ofs, count;
-+
-+      ofs = UART_GET_RPR(port) - pdc->dma_addr;       /* current DMA adress */
-+      count = ofs - pdc->ofs;
-+
-+      if (likely(count > 0)) {
-+              dma_sync_single_for_cpu(port->dev, pdc->dma_addr, pdc->dma_size, DMA_FROM_DEVICE);
-+              tty_insert_flip_string(tty, pdc->buf + pdc->ofs, count);
-+              tty_flip_buffer_push(tty);
-+
-+              pdc->ofs = ofs;
-+              port->icount.rx += count;
-+      }
-+
-+      /* reset the UART timeout */
-+      UART_PUT_CR(port, ATMEL_US_STTTO);
-+}
-+
-+/*
-+ * Deal with parity, framing and overrun errors.
-+ */
-+static void atmel_pdc_rxerr(struct uart_port *port, unsigned int status)
-+{
-+      /* clear error */
-+      UART_PUT_CR(port, ATMEL_US_RSTSTA);
-+
-+      if (status & ATMEL_US_RXBRK) {
-+              status &= ~(ATMEL_US_PARE | ATMEL_US_FRAME);    /* ignore side-effect */
-+              port->icount.brk++;
-+      }
-+      if (status & ATMEL_US_PARE)
-+              port->icount.parity++;
-+      if (status & ATMEL_US_FRAME)
-+              port->icount.frame++;
-+      if (status & ATMEL_US_OVRE)
-+              port->icount.overrun++;
-+}
-+
-+/*
-+ * A transmission via the PDC is complete.
-+ */
-+static void atmel_pdc_endtx(struct uart_port *port)
-+{
-+      struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
-+      struct circ_buf *xmit = &port->info->xmit;
-+      struct atmel_dma_buffer *pdc = &atmel_port->pdc_tx;
-+
-+      xmit->tail += pdc->ofs;
-+      if (xmit->tail >= SERIAL_XMIT_SIZE)
-+              xmit->tail -= SERIAL_XMIT_SIZE;
-+
-+      port->icount.tx += pdc->ofs;
-+      pdc->ofs = 0;
-+
-+      if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
-+              uart_write_wakeup(port);
-+}
-+
-+/*
-+ * The PDC transmitter is idle, so either start the next transfer or
-+ * disable the transmitter.
-+ */
-+static void atmel_pdc_txbufe(struct uart_port *port)
-+{
-+      struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
-+      struct circ_buf *xmit = &port->info->xmit;
-+      struct atmel_dma_buffer *pdc = &atmel_port->pdc_tx;
-+      int count;
-+
-+      if (!uart_circ_empty(xmit)) {
-+              /* more to transmit - setup next transfer */
-+              UART_PUT_PTCR(port, ATMEL_PDC_TXTDIS);                  /* disable PDC transmit */
-+              dma_sync_single_for_device(port->dev, pdc->dma_addr, pdc->dma_size, DMA_TO_DEVICE);
-+
-+              if (xmit->tail < xmit->head)
-+                      count = xmit->head - xmit->tail;
-+              else
-+                      count = SERIAL_XMIT_SIZE - xmit->tail;
-+              pdc->ofs = count;
-+
-+              UART_PUT_TPR(port, pdc->dma_addr + xmit->tail);
-+              UART_PUT_TCR(port, count);
-+              UART_PUT_PTCR(port, ATMEL_PDC_TXTEN);                   /* re-enable PDC transmit */
-+      }
-+      else {
-+              /* nothing left to transmit - disable the transmitter */
-+              UART_PUT_PTCR(port, ATMEL_PDC_TXTDIS);                  /* disable PDC transmit */
-+              UART_PUT_IDR(port, ATMEL_US_ENDTX | ATMEL_US_TXBUFE);
-+      }
-+}
-+
-+/*
-  * Characters received (called from interrupt handler)
-  */
- static void atmel_rx_chars(struct uart_port *port)
-@@ -349,6 +522,14 @@ static irqreturn_t atmel_interrupt(int i
-       status = UART_GET_CSR(port);
-       pending = status & UART_GET_IMR(port);
-       while (pending) {
-+              /* PDC receive */
-+              if (pending & ATMEL_US_ENDRX)
-+                      atmel_pdc_endrx(port);
-+              if (pending & ATMEL_US_TIMEOUT)
-+                      atmel_pdc_timeout(port);
-+              if (atmel_port->use_dma_rx && pending & (ATMEL_US_RXBRK | ATMEL_US_OVRE | ATMEL_US_FRAME | ATMEL_US_PARE))
-+                      atmel_pdc_rxerr(port, pending);
-+
-               /* Interrupt receive */
-               if (pending & ATMEL_US_RXRDY)
-                       atmel_rx_chars(port);
-@@ -363,6 +544,12 @@ static irqreturn_t atmel_interrupt(int i
-               if (pending & (ATMEL_US_RIIC | ATMEL_US_DSRIC | ATMEL_US_DCDIC | ATMEL_US_CTSIC))
-                       wake_up_interruptible(&port->info->delta_msr_wait);
-+              /* PDC transmit */
-+              if (pending & ATMEL_US_ENDTX)
-+                      atmel_pdc_endtx(port);
-+              if (pending & ATMEL_US_TXBUFE)
-+                      atmel_pdc_txbufe(port);
-+
-               /* Interrupt transmit */
-               if (pending & ATMEL_US_TXRDY)
-                       atmel_tx_chars(port);
-@@ -401,6 +588,47 @@ static int atmel_startup(struct uart_por
-       }
-       /*
-+       * Initialize DMA (if necessary)
-+       */
-+      if (atmel_port->use_dma_rx) {
-+              int i;
-+
-+              for (i = 0; i < 2; i++) {
-+                      struct atmel_dma_buffer *pdc = &atmel_port->pdc_rx[i];
-+
-+                      pdc->buf = kmalloc(PDC_BUFFER_SIZE, GFP_KERNEL);
-+                      if (pdc->buf == NULL) {
-+                              if (i != 0) {
-+                                      dma_unmap_single(port->dev, atmel_port->pdc_rx[0].dma_addr, PDC_BUFFER_SIZE, DMA_FROM_DEVICE);
-+                                      kfree(atmel_port->pdc_rx[0].buf);
-+                              }
-+                              free_irq(port->irq, port);
-+                              return -ENOMEM;
-+                      }
-+                      pdc->dma_addr = dma_map_single(port->dev, pdc->buf, PDC_BUFFER_SIZE, DMA_FROM_DEVICE);
-+                      pdc->dma_size = PDC_BUFFER_SIZE;
-+                      pdc->ofs = 0;
-+              }
-+
-+              atmel_port->pdc_rx_idx = 0;
-+
-+              UART_PUT_RPR(port, atmel_port->pdc_rx[0].dma_addr);
-+              UART_PUT_RCR(port, PDC_BUFFER_SIZE);
-+
-+              UART_PUT_RNPR(port, atmel_port->pdc_rx[1].dma_addr);
-+              UART_PUT_RNCR(port, PDC_BUFFER_SIZE);
-+      }
-+      if (atmel_port->use_dma_tx) {
-+              struct atmel_dma_buffer *pdc = &atmel_port->pdc_tx;
-+              struct circ_buf *xmit = &port->info->xmit;
-+
-+              pdc->buf = xmit->buf;
-+              pdc->dma_addr = dma_map_single(port->dev, pdc->buf, SERIAL_XMIT_SIZE, DMA_TO_DEVICE);
-+              pdc->dma_size = SERIAL_XMIT_SIZE;
-+              pdc->ofs = 0;
-+      }
-+
-+      /*
-        * If there is a specific "open" function (to register
-        * control line interrupts)
-        */
-@@ -418,7 +646,15 @@ static int atmel_startup(struct uart_por
-       UART_PUT_CR(port, ATMEL_US_RSTSTA | ATMEL_US_RSTRX);
-       UART_PUT_CR(port, ATMEL_US_TXEN | ATMEL_US_RXEN);               /* enable xmit & rcvr */
--      UART_PUT_IER(port, ATMEL_US_RXRDY);             /* enable receive only */
-+      if (atmel_port->use_dma_rx) {
-+              UART_PUT_RTOR(port, PDC_RX_TIMEOUT);            /* set UART timeout */
-+              UART_PUT_CR(port, ATMEL_US_STTTO);
-+
-+              UART_PUT_IER(port, ATMEL_US_ENDRX | ATMEL_US_TIMEOUT);
-+              UART_PUT_PTCR(port, ATMEL_PDC_RXTEN);           /* enable PDC controller */
-+      }
-+      else
-+              UART_PUT_IER(port, ATMEL_US_RXRDY);             /* enable receive only */
-       return 0;
- }
-@@ -431,6 +667,31 @@ static void atmel_shutdown(struct uart_p
-       struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
-       /*
-+       * Ensure everything is stopped.
-+       */
-+      atmel_stop_rx(port);
-+      atmel_stop_tx(port);
-+
-+      /*
-+       * Shut-down the DMA.
-+       */
-+      if (atmel_port->use_dma_rx) {
-+              int i;
-+
-+              for (i = 0; i < 2; i++) {
-+                      struct atmel_dma_buffer *pdc = &atmel_port->pdc_rx[i];
-+
-+                      dma_unmap_single(port->dev, pdc->dma_addr, pdc->dma_size, DMA_FROM_DEVICE);
-+                      kfree(pdc->buf);
-+              }
-+      }
-+      if (atmel_port->use_dma_tx) {
-+              struct atmel_dma_buffer *pdc = &atmel_port->pdc_tx;
-+
-+              dma_unmap_single(port->dev, pdc->dma_addr, pdc->dma_size, DMA_TO_DEVICE);
-+      }
-+
-+      /*
-        * Disable all interrupts, port and break condition.
-        */
-       UART_PUT_CR(port, ATMEL_US_RSTSTA);
-@@ -481,14 +742,20 @@ static void atmel_serial_pm(struct uart_
-  */
- static void atmel_set_termios(struct uart_port *port, struct ktermios * termios, struct ktermios * old)
- {
-+      struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
-       unsigned long flags;
-       unsigned int mode, imr, quot, baud;
-+      /* Get current mode register */
-+      mode = UART_GET_MR(port) & ~(ATMEL_US_USCLKS | ATMEL_US_CHRL | ATMEL_US_NBSTOP | ATMEL_US_PAR);
-+
-       baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16);
-       quot = uart_get_divisor(port, baud);
--      /* Get current mode register */
--      mode = UART_GET_MR(port) & ~(ATMEL_US_CHRL | ATMEL_US_NBSTOP | ATMEL_US_PAR);
-+      if (quot > 65535) {     /* BRGR is 16-bit, so switch to slower clock */
-+              quot /= 8;
-+              mode |= ATMEL_US_USCLKS_MCK_DIV8;
-+      }
-       /* byte size */
-       switch (termios->c_cflag & CSIZE) {
-@@ -534,6 +801,9 @@ static void atmel_set_termios(struct uar
-       if (termios->c_iflag & (BRKINT | PARMRK))
-               port->read_status_mask |= ATMEL_US_RXBRK;
-+      if (atmel_port->use_dma_rx)     /* need to enable error interrupts */
-+              UART_PUT_IER(port, port->read_status_mask);
-+
-       /*
-        * Characters to ignore
-        */
-@@ -712,6 +982,13 @@ static void __devinit atmel_init_port(st
-               clk_enable(atmel_port->clk);
-               port->uartclk = clk_get_rate(atmel_port->clk);
-       }
-+
-+#ifdef SUPPORT_PDC
-+      atmel_port->use_dma_rx = data->use_dma_rx;
-+      atmel_port->use_dma_tx = data->use_dma_tx;
-+      if (atmel_port->use_dma_tx)
-+              port->fifosize = PDC_BUFFER_SIZE;
-+#endif
- }
- /*
-@@ -888,7 +1165,8 @@ static int atmel_serial_suspend(struct p
-       struct uart_port *port = platform_get_drvdata(pdev);
-       struct atmel_uart_port *atmel_port = (struct atmel_uart_port *) port;
--      if (device_may_wakeup(&pdev->dev) && !at91_suspend_entering_slow_clock())
-+      if (device_may_wakeup(&pdev->dev)
-+                      && !clk_must_disable(atmel_port->clk))
-               enable_irq_wake(port->irq);
-       else {
-               uart_suspend_port(&atmel_uart, port);
-Index: linux-2.6.21.7/drivers/serial/atmel_serial.h
-===================================================================
---- linux-2.6.21.7.orig/drivers/serial/atmel_serial.h
-+++ linux-2.6.21.7/drivers/serial/atmel_serial.h
-@@ -46,6 +46,9 @@
- #define                       ATMEL_US_USMODE_ISO7816_T1      6
- #define                       ATMEL_US_USMODE_IRDA            8
- #define               ATMEL_US_USCLKS         (3   <<  4)             /* Clock Selection */
-+#define                       ATMEL_US_USCLKS_MCK             (0 <<  4)
-+#define                       ATMEL_US_USCLKS_MCK_DIV8        (1 <<  4)
-+#define                       ATMEL_US_USCLKS_SCK             (3 <<  4)
- #define               ATMEL_US_CHRL           (3   <<  6)             /* Character Length */
- #define                       ATMEL_US_CHRL_5                 (0 <<  6)
- #define                       ATMEL_US_CHRL_6                 (1 <<  6)
-Index: linux-2.6.21.7/drivers/spi/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/drivers/spi/Kconfig
-+++ linux-2.6.21.7/drivers/spi/Kconfig
-@@ -54,6 +54,7 @@ comment "SPI Master Controller Drivers"
- config SPI_ATMEL
-       tristate "Atmel SPI Controller"
-       depends on (ARCH_AT91 || AVR32) && SPI_MASTER
-+      select SPI_AT91_MANUAL_CS if ARCH_AT91RM9200
-       help
-         This selects a driver for the Atmel SPI Controller, present on
-         many AT32 (AVR32) and AT91 (ARM) chips.
-@@ -82,6 +83,24 @@ config SPI_BUTTERFLY
-         inexpensive battery powered microcontroller evaluation board.
-         This same cable can be used to flash new firmware.
-+config SPI_AT91
-+      tristate "AT91RM9200 Bitbang SPI Master"
-+      depends on SPI_MASTER && ARCH_AT91RM9200 && !SPI_ATMEL && EXPERIMENTAL
-+      select SPI_BITBANG
-+      select SPI_AT91_MANUAL_CS
-+      help
-+        This is dumb PIO bitbanging driver for the Atmel AT91RM9200.
-+        The SPI_ATMEL driver will be its replacement, using the native
-+        SPI hardware and its DMA controller.
-+
-+config SPI_AT91_MANUAL_CS
-+      bool
-+      depends on ARCH_AT91RM9200
-+      help
-+        Works around an AT91RM9200 problem whereby the SPI chip-select
-+        will be wrongly disabled.  The workaround uses those pins as
-+        GPIOs instead of letting the SPI controller manage them.
-+
- config SPI_IMX
-       tristate "Freescale iMX SPI controller"
-       depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
-Index: linux-2.6.21.7/drivers/spi/Makefile
-===================================================================
---- linux-2.6.21.7.orig/drivers/spi/Makefile
-+++ linux-2.6.21.7/drivers/spi/Makefile
-@@ -20,6 +20,7 @@ obj-$(CONFIG_SPI_OMAP_UWIRE)         += omap_uw
- obj-$(CONFIG_SPI_MPC83xx)             += spi_mpc83xx.o
- obj-$(CONFIG_SPI_S3C24XX_GPIO)                += spi_s3c24xx_gpio.o
- obj-$(CONFIG_SPI_S3C24XX)             += spi_s3c24xx.o
-+obj-$(CONFIG_SPI_AT91)                        += spi_at91_bitbang.o
- #     ... add above this line ...
- # SPI protocol drivers (device/link on bus)
-Index: linux-2.6.21.7/drivers/spi/spi_at91_bitbang.c
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/drivers/spi/spi_at91_bitbang.c
-@@ -0,0 +1,207 @@
-+/*
-+ * at91_spi.c - at91 SPI driver (BOOTSTRAP/BITBANG VERSION)
-+ *
-+ * Copyright (C) 2006 David Brownell
-+ *
-+ * 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/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+
-+#include <linux/spi/spi.h>
-+#include <linux/spi/spi_bitbang.h>
-+
-+#include <asm/arch/gpio.h>
-+
-+
-+/*
-+ * FIXME this bitbanging version is just to help bootstrap systems until
-+ * there's a native SPI+IRQ+DMA controller driver ... such a driver should
-+ * be a drop-in replacement for this one, and much faster.
-+ *
-+ * remember:
-+ *
-+ *    - other at91 parts (like at91sam9) have multiple controllers
-+ *      and different pin muxing; this version is at91rm9200 specfic.
-+ *
-+ *    - at91sam9261 SPI0 pins are directly muxed with MMC/SD pins.
-+ *
-+ *    - rm9200 spi chipselects drop wrongly, so the native driver
-+ *      will need to use gpios much like this does.
-+ *
-+ *    - real hardware only allows 8..16 bits per word, while this
-+ *      bitbanger allows 1..32 (incompatible superset).
-+ *
-+ *    - this disregards clock parameters.  with inlined gpio calls,
-+ *      gcc 3.4.4 produces about 1.5 mbit/sec, more than 2x faster
-+ *      than using the subroutined veresion from txrx_word().
-+ *
-+ *    - suspend/resume and <linux/clk.h> support is missing ...
-+ */
-+
-+#define       spi_miso_bit    AT91_PIN_PA0
-+#define       spi_mosi_bit    AT91_PIN_PA1
-+#define       spi_sck_bit     AT91_PIN_PA2
-+
-+struct at91_spi {
-+      struct spi_bitbang      bitbang;
-+      struct platform_device  *pdev;
-+};
-+
-+/*----------------------------------------------------------------------*/
-+
-+static inline void setsck(struct spi_device *spi, int is_on)
-+{
-+      at91_set_gpio_value(spi_sck_bit, is_on);
-+}
-+
-+static inline void setmosi(struct spi_device *spi, int is_on)
-+{
-+      at91_set_gpio_value(spi_mosi_bit, is_on);
-+}
-+
-+static inline int getmiso(struct spi_device *spi)
-+{
-+      return at91_get_gpio_value(spi_miso_bit);
-+}
-+
-+static void at91_spi_chipselect(struct spi_device *spi, int is_active)
-+{
-+      unsigned long cs = (unsigned long) spi->controller_data;
-+
-+      /* set default clock polarity */
-+      if (is_active)
-+              setsck(spi, spi->mode & SPI_CPOL);
-+
-+      /* only support active-low (default) */
-+      at91_set_gpio_value(cs, !is_active);
-+}
-+
-+/*
-+ * NOTE:  this is "as fast as we can"; it should be a function of
-+ * the device clock ...
-+ */
-+#define       spidelay(X)     do{} while(0)
-+
-+#define       EXPAND_BITBANG_TXRX
-+#include <linux/spi/spi_bitbang.h>
-+
-+static u32 at91_spi_txrx_word_mode0(struct spi_device *spi,
-+              unsigned nsecs, u32 word, u8 bits)
-+{
-+      return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, 8);
-+}
-+
-+static u32 at91_spi_txrx_word_mode1(struct spi_device *spi,
-+              unsigned nsecs, u32 word, u8 bits)
-+{
-+      return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, 8);
-+}
-+
-+static u32 at91_spi_txrx_word_mode2(struct spi_device *spi,
-+              unsigned nsecs, u32 word, u8 bits)
-+{
-+      return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, 8);
-+}
-+
-+static u32 at91_spi_txrx_word_mode3(struct spi_device *spi,
-+              unsigned nsecs, u32 word, u8 bits)
-+{
-+      return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, 8);
-+}
-+
-+/*----------------------------------------------------------------------*/
-+
-+static int __init at91_spi_probe(struct platform_device *pdev)
-+{
-+      int                     status;
-+      struct spi_master       *master;
-+      struct at91_spi         *at91_spi;
-+
-+      if (pdev->id != 0)      /* SPI0 bus */
-+              return -EINVAL;
-+
-+      master = spi_alloc_master(&pdev->dev, sizeof *at91_spi);
-+      if (!master)
-+              return -ENOMEM;
-+
-+      at91_spi = spi_master_get_devdata(master);
-+      at91_spi->pdev = pdev;
-+      platform_set_drvdata(pdev, at91_spi);
-+
-+      /* SPI and bitbang hookup */
-+      master->bus_num = 0;
-+      master->num_chipselect = 4;
-+
-+      at91_spi->bitbang.master = spi_master_get(master);
-+      at91_spi->bitbang.chipselect = at91_spi_chipselect;
-+      at91_spi->bitbang.txrx_word[SPI_MODE_0] = at91_spi_txrx_word_mode0;
-+      at91_spi->bitbang.txrx_word[SPI_MODE_1] = at91_spi_txrx_word_mode1;
-+      at91_spi->bitbang.txrx_word[SPI_MODE_2] = at91_spi_txrx_word_mode2;
-+      at91_spi->bitbang.txrx_word[SPI_MODE_3] = at91_spi_txrx_word_mode3;
-+
-+      status = spi_bitbang_start(&at91_spi->bitbang);
-+      if (status < 0)
-+              (void) spi_master_put(at91_spi->bitbang.master);
-+
-+      return status;
-+}
-+
-+static int __exit at91_spi_remove(struct platform_device *pdev)
-+{
-+      struct at91_spi *at91_spi = platform_get_drvdata(pdev);
-+      int status;
-+
-+      /* stop() unregisters child devices too */
-+      status = spi_bitbang_stop(&at91_spi->bitbang);
-+      (void) spi_master_put(at91_spi->bitbang.master);
-+
-+      platform_set_drvdata(pdev, NULL);
-+      return status;
-+}
-+
-+static struct platform_driver at91_spi_driver = {
-+      .probe          = at91_spi_probe,
-+      .remove         = __exit_p(at91_spi_remove),
-+      .driver         = {
-+              .name   = "at91_spi",
-+              .owner  = THIS_MODULE,
-+      },
-+};
-+
-+static int __init at91_spi_init(void)
-+{
-+      at91_set_gpio_output(spi_sck_bit, 0);
-+      at91_set_gpio_output(spi_mosi_bit, 0);
-+      at91_set_gpio_input(spi_miso_bit, 1 /* pullup */);
-+
-+      /* register driver */
-+      return platform_driver_register(&at91_spi_driver);
-+}
-+
-+static void __exit at91_spi_exit(void)
-+{
-+      platform_driver_unregister(&at91_spi_driver);
-+}
-+
-+device_initcall(at91_spi_init);
-+module_exit(at91_spi_exit);
-+
-+MODULE_ALIAS("at91_spi.0");
-+
-+MODULE_DESCRIPTION("AT91 SPI support (BOOTSTRAP/BITBANG VERSION)");
-+MODULE_AUTHOR("David Brownell");
-+MODULE_LICENSE("GPL");
-Index: linux-2.6.21.7/drivers/usb/gadget/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/drivers/usb/gadget/Kconfig
-+++ linux-2.6.21.7/drivers/usb/gadget/Kconfig
-@@ -189,7 +189,7 @@ config USB_OTG
- config USB_GADGET_AT91
-       boolean "AT91 USB Device Port"
--      depends on ARCH_AT91
-+      depends on ARCH_AT91 && !ARCH_AT91SAM9RL
-       select USB_GADGET_SELECTED
-       help
-          Many Atmel AT91 processors (such as the AT91RM2000) have a
-Index: linux-2.6.21.7/drivers/usb/gadget/at91_udc.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/usb/gadget/at91_udc.c
-+++ linux-2.6.21.7/drivers/usb/gadget/at91_udc.c
-@@ -1804,7 +1804,7 @@ static int at91udc_suspend(struct platfo
-        */
-       if ((!udc->suspended && udc->addr)
-                       || !wake
--                      || at91_suspend_entering_slow_clock()) {
-+                      || clk_must_disable(udc->fclk)) {
-               pullup(udc, 0);
-               wake = 0;
-       } else
-Index: linux-2.6.21.7/drivers/usb/host/ohci-at91.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/usb/host/ohci-at91.c
-+++ linux-2.6.21.7/drivers/usb/host/ohci-at91.c
-@@ -299,7 +299,7 @@ ohci_hcd_at91_drv_suspend(struct platfor
-        *
-        * REVISIT: some boards will be able to turn VBUS off...
-        */
--      if (at91_suspend_entering_slow_clock()) {
-+      if (clk_must_disable(fclk)) {
-               ohci_usb_reset (ohci);
-               at91_stop_clock();
-       }
-Index: linux-2.6.21.7/drivers/video/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/drivers/video/Kconfig
-+++ linux-2.6.21.7/drivers/video/Kconfig
-@@ -663,6 +663,17 @@ config FB_EPSON1355
-         framebuffer.  Product specs at
-         <http://www.erd.epson.com/vdc/html/products.htm>.
-+config FB_S1D15605
-+      tristate "Epson S1D15605 framebuffer support"
-+      depends on FB
-+      default m if MACH_KB9200
-+      select FB_CFB_FILLRECT
-+      select FB_CFB_COPYAREA
-+      select FB_CFB_IMAGEBLIT
-+      help
-+        Build in support for the S1D15605 Epson Research 128x64
-+        LCD controller as a framebuffer.
-+
- config FB_S1D13XXX
-       tristate "Epson S1D13XXX framebuffer support"
-       depends on FB
-@@ -674,6 +685,22 @@ config FB_S1D13XXX
-         working with S1D13806). Product specs at
-         <http://www.erd.epson.com/vdc/html/legacy_13xxx.htm>
-+config FB_ATMEL
-+      tristate "AT91/AT32 LCD Controller support"
-+      depends on FB && (ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || AVR32)
-+      select FB_CFB_FILLRECT
-+      select FB_CFB_COPYAREA
-+      select FB_CFB_IMAGEBLIT
-+      help
-+        This enables support for the AT91/AT32 LCD Controller.
-+
-+config FB_INTSRAM
-+      bool "Frame Buffer in internal SRAM"
-+      depends on FB_ATMEL && ARCH_AT91SAM9261
-+      help
-+        Say Y if you want to map Frame Buffer in internal SRAM. Say N if you want
-+        to let frame buffer in external SDRAM.
-+
- config FB_NVIDIA
-       tristate "nVidia Framebuffer Support"
-       depends on FB && PCI
-Index: linux-2.6.21.7/drivers/video/Makefile
-===================================================================
---- linux-2.6.21.7.orig/drivers/video/Makefile
-+++ linux-2.6.21.7/drivers/video/Makefile
-@@ -75,6 +75,8 @@ obj-$(CONFIG_FB_G364)             += g36
- obj-$(CONFIG_FB_SA1100)           += sa1100fb.o
- obj-$(CONFIG_FB_HIT)              += hitfb.o
- obj-$(CONFIG_FB_EPSON1355)      += epson1355fb.o
-+obj-$(CONFIG_FB_S1D15605)       += s1d15605fb.o
-+obj-$(CONFIG_FB_ATMEL)            += atmel_lcdfb.o
- obj-$(CONFIG_FB_PVR2)             += pvr2fb.o
- obj-$(CONFIG_FB_VOODOO1)          += sstfb.o
- obj-$(CONFIG_FB_ARMCLCD)        += amba-clcd.o
-Index: linux-2.6.21.7/drivers/video/atmel_lcdfb.c
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/drivers/video/atmel_lcdfb.c
-@@ -0,0 +1,752 @@
-+/*
-+ *  Driver for AT91/AT32 LCD Controller
-+ *
-+ *  Copyright (C) 2007 Atmel Corporation
-+ *
-+ * 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/platform_device.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/interrupt.h>
-+#include <linux/clk.h>
-+#include <linux/fb.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+
-+#include <asm/arch/board.h>
-+#include <asm/arch/cpu.h>
-+#include <asm/arch/gpio.h>
-+
-+#include <video/atmel_lcdc.h>
-+
-+#define lcdc_readl(sinfo, reg)                __raw_readl((sinfo)->mmio+(reg))
-+#define lcdc_writel(sinfo, reg, val)  __raw_writel((val), (sinfo)->mmio+(reg))
-+
-+/* configurable parameters */
-+#define ATMEL_LCDC_CVAL_DEFAULT               0xc8
-+#define ATMEL_LCDC_DMA_BURST_LEN      8
-+
-+#if defined(CONFIG_ARCH_AT91SAM9263)
-+#define ATMEL_LCDC_FIFO_SIZE          2048
-+#else
-+#define ATMEL_LCDC_FIFO_SIZE          512
-+#endif
-+
-+#if defined(CONFIG_ARCH_AT91)
-+#define       ATMEL_LCDFB_FBINFO_DEFAULT      FBINFO_DEFAULT
-+
-+static inline void atmel_lcdfb_update_dma2d(struct atmel_lcdfb_info *sinfo,
-+                                      struct fb_var_screeninfo *var)
-+{
-+
-+}
-+#elif defined(CONFIG_AVR32)
-+#define       ATMEL_LCDFB_FBINFO_DEFAULT      (FBINFO_DEFAULT \
-+                                      | FBINFO_PARTIAL_PAN_OK \
-+                                      | FBINFO_HWACCEL_XPAN \
-+                                      | FBINFO_HWACCEL_YPAN)
-+
-+static void atmel_lcdfb_update_dma2d(struct atmel_lcdfb_info *sinfo,
-+                                   struct fb_var_screeninfo *var)
-+{
-+      u32 dma2dcfg;
-+      u32 pixeloff;
-+
-+      pixeloff = (var->xoffset * var->bits_per_pixel) & 0x1f;
-+
-+      dma2dcfg = ((var->xres_virtual - var->xres) * var->bits_per_pixel) / 8;
-+      dma2dcfg |= pixeloff << ATMEL_LCDC_PIXELOFF_OFFSET;
-+      lcdc_writel(sinfo, ATMEL_LCDC_DMA2DCFG, dma2dcfg);
-+
-+      /* Update configuration */
-+      lcdc_writel(sinfo, ATMEL_LCDC_DMACON,
-+                  lcdc_readl(sinfo, ATMEL_LCDC_DMACON)
-+                  | ATMEL_LCDC_DMAUPDT);
-+}
-+#endif
-+
-+
-+static struct fb_fix_screeninfo atmel_lcdfb_fix __initdata = {
-+      .type           = FB_TYPE_PACKED_PIXELS,
-+      .visual         = FB_VISUAL_TRUECOLOR,
-+      .xpanstep       = 0,
-+      .ypanstep       = 0,
-+      .ywrapstep      = 0,
-+      .accel          = FB_ACCEL_NONE,
-+};
-+
-+
-+static void atmel_lcdfb_update_dma(struct fb_info *info,
-+                             struct fb_var_screeninfo *var)
-+{
-+      struct atmel_lcdfb_info *sinfo = info->par;
-+      struct fb_fix_screeninfo *fix = &info->fix;
-+      unsigned long dma_addr;
-+
-+      dma_addr = (fix->smem_start + var->yoffset * fix->line_length
-+                  + var->xoffset * var->bits_per_pixel / 8);
-+
-+      dma_addr &= ~3UL;
-+
-+      /* Set framebuffer DMA base address and pixel offset */
-+      lcdc_writel(sinfo, ATMEL_LCDC_DMABADDR1, dma_addr);
-+
-+      atmel_lcdfb_update_dma2d(sinfo, var);
-+}
-+
-+static inline void atmel_lcdfb_free_video_memory(struct atmel_lcdfb_info *sinfo)
-+{
-+      struct fb_info *info = sinfo->info;
-+
-+      dma_free_writecombine(info->device, info->fix.smem_len,
-+                              info->screen_base, info->fix.smem_start);
-+}
-+
-+/**
-+ *    atmel_lcdfb_alloc_video_memory - Allocate framebuffer memory
-+ *    @sinfo: the frame buffer to allocate memory for
-+ */
-+static int atmel_lcdfb_alloc_video_memory(struct atmel_lcdfb_info *sinfo)
-+{
-+      struct fb_info *info = sinfo->info;
-+      struct fb_var_screeninfo *var = &info->var;
-+
-+      info->fix.smem_len = (var->xres_virtual * var->yres_virtual
-+                          * ((var->bits_per_pixel + 7) / 8));
-+
-+      info->screen_base = dma_alloc_writecombine(info->device, info->fix.smem_len,
-+                                      (dma_addr_t *)&info->fix.smem_start, GFP_KERNEL);
-+
-+      if (!info->screen_base) {
-+              return -ENOMEM;
-+      }
-+
-+      return 0;
-+}
-+
-+/**
-+ *      atmel_lcdfb_check_var - Validates a var passed in.
-+ *      @var: frame buffer variable screen structure
-+ *      @info: frame buffer structure that represents a single frame buffer
-+ *
-+ *    Checks to see if the hardware supports the state requested by
-+ *    var passed in. This function does not alter the hardware
-+ *    state!!!  This means the data stored in struct fb_info and
-+ *    struct atmel_lcdfb_info do not change. This includes the var
-+ *    inside of struct fb_info.  Do NOT change these. This function
-+ *    can be called on its own if we intent to only test a mode and
-+ *    not actually set it. The stuff in modedb.c is a example of
-+ *    this. If the var passed in is slightly off by what the
-+ *    hardware can support then we alter the var PASSED in to what
-+ *    we can do. If the hardware doesn't support mode change a
-+ *    -EINVAL will be returned by the upper layers. You don't need
-+ *    to implement this function then. If you hardware doesn't
-+ *    support changing the resolution then this function is not
-+ *    needed. In this case the driver would just provide a var that
-+ *    represents the static state the screen is in.
-+ *
-+ *    Returns negative errno on error, or zero on success.
-+ */
-+static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var,
-+                           struct fb_info *info)
-+{
-+      struct device *dev = info->device;
-+      struct atmel_lcdfb_info *sinfo = info->par;
-+      unsigned long clk_value_khz;
-+
-+      clk_value_khz = clk_get_rate(sinfo->lcdc_clk) / 1000;
-+
-+      dev_dbg(dev, "%s:\n", __func__);
-+      dev_dbg(dev, "  resolution: %ux%u\n", var->xres, var->yres);
-+      dev_dbg(dev, "  pixclk:     %lu KHz\n", PICOS2KHZ(var->pixclock));
-+      dev_dbg(dev, "  bpp:        %u\n", var->bits_per_pixel);
-+      dev_dbg(dev, "  clk:        %lu KHz\n", clk_value_khz);
-+
-+      if ((PICOS2KHZ(var->pixclock) * var->bits_per_pixel / 8) > clk_value_khz) {
-+              dev_err(dev, "%lu KHz pixel clock is too fast\n", PICOS2KHZ(var->pixclock));
-+              return -EINVAL;
-+      }
-+
-+      /* Force same alignment for each line */
-+      var->xres = (var->xres + 3) & ~3UL;
-+      var->xres_virtual = (var->xres_virtual + 3) & ~3UL;
-+
-+      var->red.msb_right = var->green.msb_right = var->blue.msb_right = 0;
-+      var->transp.msb_right = 0;
-+      var->transp.offset = var->transp.length = 0;
-+      var->xoffset = var->yoffset = 0;
-+
-+      switch (var->bits_per_pixel) {
-+      case 2:
-+      case 4:
-+      case 8:
-+              var->red.offset = var->green.offset = var->blue.offset = 0;
-+              var->red.length = var->green.length = var->blue.length
-+                      = var->bits_per_pixel;
-+              break;
-+      case 15:
-+      case 16:
-+              var->red.offset = 0;
-+              var->green.offset = 5;
-+              var->blue.offset = 10;
-+              var->red.length = var->green.length = var->blue.length = 5;
-+              break;
-+      case 24:
-+      case 32:
-+              var->red.offset = 0;
-+              var->green.offset = 8;
-+              var->blue.offset = 16;
-+              var->red.length = var->green.length = var->blue.length = 8;
-+              break;
-+      default:
-+              dev_err(dev, "color depth %d not supported\n",
-+                                      var->bits_per_pixel);
-+              return -EINVAL;
-+      }
-+
-+      return 0;
-+}
-+
-+/**
-+ *      atmel_lcdfb_set_par - Alters the hardware state.
-+ *      @info: frame buffer structure that represents a single frame buffer
-+ *
-+ *    Using the fb_var_screeninfo in fb_info we set the resolution
-+ *    of the this particular framebuffer. This function alters the
-+ *    par AND the fb_fix_screeninfo stored in fb_info. It doesn't
-+ *    not alter var in fb_info since we are using that data. This
-+ *    means we depend on the data in var inside fb_info to be
-+ *    supported by the hardware.  atmel_lcdfb_check_var is always called
-+ *    before atmel_lcdfb_set_par to ensure this.  Again if you can't
-+ *    change the resolution you don't need this function.
-+ *
-+ */
-+static int atmel_lcdfb_set_par(struct fb_info *info)
-+{
-+      struct atmel_lcdfb_info *sinfo = info->par;
-+      unsigned long value;
-+      unsigned long clk_value_khz;
-+
-+      dev_dbg(info->device, "%s:\n", __func__);
-+      dev_dbg(info->device, "  * resolution: %ux%u (%ux%u virtual)\n",
-+               info->var.xres, info->var.yres,
-+               info->var.xres_virtual, info->var.yres_virtual);
-+
-+      /* Turn off the LCD controller and the DMA controller */
-+      lcdc_writel(sinfo, ATMEL_LCDC_PWRCON, sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET);
-+
-+      lcdc_writel(sinfo, ATMEL_LCDC_DMACON, 0);
-+
-+      if (info->var.bits_per_pixel <= 8)
-+              info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
-+      else
-+              info->fix.visual = FB_VISUAL_TRUECOLOR;
-+
-+      info->fix.line_length = info->var.xres_virtual * (info->var.bits_per_pixel / 8);
-+
-+      /* Re-initialize the DMA engine... */
-+      dev_dbg(info->device, "  * update DMA engine\n");
-+      atmel_lcdfb_update_dma(info, &info->var);
-+
-+      /* ...set frame size and burst length = 8 words (?) */
-+      value = (info->var.yres * info->var.xres * info->var.bits_per_pixel) / 32;
-+      value |= ((ATMEL_LCDC_DMA_BURST_LEN - 1) << ATMEL_LCDC_BLENGTH_OFFSET);
-+      lcdc_writel(sinfo, ATMEL_LCDC_DMAFRMCFG, value);
-+
-+      /* Now, the LCDC core... */
-+
-+      /* Set pixel clock */
-+      clk_value_khz = clk_get_rate(sinfo->lcdc_clk) / 1000;
-+
-+      value = clk_value_khz / PICOS2KHZ(info->var.pixclock);
-+
-+      if (clk_value_khz % PICOS2KHZ(info->var.pixclock))
-+              value++;
-+
-+      value = (value / 2) - 1;
-+
-+      if (value <= 0) {
-+              dev_notice(info->device, "Bypassing pixel clock divider\n");
-+              lcdc_writel(sinfo, ATMEL_LCDC_LCDCON1, ATMEL_LCDC_BYPASS);
-+      } else
-+              lcdc_writel(sinfo, ATMEL_LCDC_LCDCON1, value << ATMEL_LCDC_CLKVAL_OFFSET);
-+
-+      /* Initialize control register 2 */
-+      value = sinfo->default_lcdcon2;
-+
-+      if (!(info->var.sync & FB_SYNC_HOR_HIGH_ACT))
-+              value |= ATMEL_LCDC_INVLINE_INVERTED;
-+      if (!(info->var.sync & FB_SYNC_VERT_HIGH_ACT))
-+              value |= ATMEL_LCDC_INVFRAME_INVERTED;
-+
-+      switch (info->var.bits_per_pixel) {
-+              case 1: value |= ATMEL_LCDC_PIXELSIZE_1; break;
-+              case 2: value |= ATMEL_LCDC_PIXELSIZE_2; break;
-+              case 4: value |= ATMEL_LCDC_PIXELSIZE_4; break;
-+              case 8: value |= ATMEL_LCDC_PIXELSIZE_8; break;
-+              case 15: /* fall through */
-+              case 16: value |= ATMEL_LCDC_PIXELSIZE_16; break;
-+              case 24: value |= ATMEL_LCDC_PIXELSIZE_24; break;
-+              case 32: value |= ATMEL_LCDC_PIXELSIZE_32; break;
-+              default: BUG(); break;
-+      }
-+      dev_dbg(info->device, "  * LCDCON2 = %08lx\n", value);
-+      lcdc_writel(sinfo, ATMEL_LCDC_LCDCON2, value);
-+
-+      /* Vertical timing */
-+      value = (info->var.vsync_len - 1) << ATMEL_LCDC_VPW_OFFSET;
-+      value |= info->var.upper_margin << ATMEL_LCDC_VBP_OFFSET;
-+      value |= info->var.lower_margin;
-+      dev_dbg(info->device, "  * LCDTIM1 = %08lx\n", value);
-+      lcdc_writel(sinfo, ATMEL_LCDC_TIM1, value);
-+
-+      /* Horizontal timing */
-+      value = (info->var.right_margin - 1) << ATMEL_LCDC_HFP_OFFSET;
-+      value |= (info->var.hsync_len - 1) << ATMEL_LCDC_HPW_OFFSET;
-+      value |= (info->var.left_margin - 1);
-+      dev_dbg(info->device, "  * LCDTIM2 = %08lx\n", value);
-+      lcdc_writel(sinfo, ATMEL_LCDC_TIM2, value);
-+
-+      /* Display size */
-+      value = (info->var.xres - 1) << ATMEL_LCDC_HOZVAL_OFFSET;
-+      value |= info->var.yres - 1;
-+      lcdc_writel(sinfo, ATMEL_LCDC_LCDFRMCFG, value);
-+
-+      /* FIFO Threshold: Use formula from data sheet */
-+      value = ATMEL_LCDC_FIFO_SIZE - (2 * ATMEL_LCDC_DMA_BURST_LEN + 3);
-+      lcdc_writel(sinfo, ATMEL_LCDC_FIFO, value);
-+
-+      /* Toggle LCD_MODE every frame */
-+      lcdc_writel(sinfo, ATMEL_LCDC_MVAL, 0);
-+
-+      /* Disable all interrupts */
-+      lcdc_writel(sinfo, ATMEL_LCDC_IDR, ~0UL);
-+
-+      /* Set contrast */
-+      value = ATMEL_LCDC_PS_DIV8 | ATMEL_LCDC_POL_POSITIVE | ATMEL_LCDC_ENA_PWMENABLE;
-+      lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, value);
-+      lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_VAL, ATMEL_LCDC_CVAL_DEFAULT);
-+      /* ...wait for DMA engine to become idle... */
-+      while (lcdc_readl(sinfo, ATMEL_LCDC_DMACON) & ATMEL_LCDC_DMABUSY)
-+              msleep(10);
-+
-+      dev_dbg(info->device, "  * re-enable DMA engine\n");
-+      /* ...and enable it with updated configuration */
-+      lcdc_writel(sinfo, ATMEL_LCDC_DMACON, sinfo->default_dmacon);
-+
-+      dev_dbg(info->device, "  * re-enable LCDC core\n");
-+      lcdc_writel(sinfo, ATMEL_LCDC_PWRCON,
-+              (sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET) | ATMEL_LCDC_PWR);
-+
-+      dev_dbg(info->device, "  * DONE\n");
-+
-+      return 0;
-+}
-+
-+static inline unsigned int chan_to_field(unsigned int chan, const struct fb_bitfield *bf)
-+{
-+      chan &= 0xffff;
-+      chan >>= 16 - bf->length;
-+      return chan << bf->offset;
-+}
-+
-+/**
-+ *    atmel_lcdfb_setcolreg - Optional function. Sets a color register.
-+ *      @regno: Which register in the CLUT we are programming
-+ *      @red: The red value which can be up to 16 bits wide
-+ *    @green: The green value which can be up to 16 bits wide
-+ *    @blue:  The blue value which can be up to 16 bits wide.
-+ *    @transp: If supported the alpha value which can be up to 16 bits wide.
-+ *      @info: frame buffer info structure
-+ *
-+ *    Set a single color register. The values supplied have a 16 bit
-+ *    magnitude which needs to be scaled in this function for the hardware.
-+ *    Things to take into consideration are how many color registers, if
-+ *    any, are supported with the current color visual. With truecolor mode
-+ *    no color palettes are supported. Here a psuedo palette is created
-+ *    which we store the value in pseudo_palette in struct fb_info. For
-+ *    pseudocolor mode we have a limited color palette. To deal with this
-+ *    we can program what color is displayed for a particular pixel value.
-+ *    DirectColor is similar in that we can program each color field. If
-+ *    we have a static colormap we don't need to implement this function.
-+ *
-+ *    Returns negative errno on error, or zero on success. In an
-+ *    ideal world, this would have been the case, but as it turns
-+ *    out, the other drivers return 1 on failure, so that's what
-+ *    we're going to do.
-+ */
-+static int atmel_lcdfb_setcolreg(unsigned int regno, unsigned int red,
-+                           unsigned int green, unsigned int blue,
-+                           unsigned int transp, struct fb_info *info)
-+{
-+      struct atmel_lcdfb_info *sinfo = info->par;
-+      unsigned int val;
-+      u32 *pal;
-+      int ret = 1;
-+
-+      if (info->var.grayscale)
-+              red = green = blue = (19595 * red + 38470 * green
-+                                    + 7471 * blue) >> 16;
-+
-+      switch (info->fix.visual) {
-+      case FB_VISUAL_TRUECOLOR:
-+              if (regno < 16) {
-+                      pal = info->pseudo_palette;
-+
-+                      val  = chan_to_field(red, &info->var.red);
-+                      val |= chan_to_field(green, &info->var.green);
-+                      val |= chan_to_field(blue, &info->var.blue);
-+
-+                      pal[regno] = val;
-+                      ret = 0;
-+              }
-+              break;
-+
-+      case FB_VISUAL_PSEUDOCOLOR:
-+              if (regno < 256) {
-+                      val  = ((red   >> 11) & 0x001f);
-+                      val |= ((green >>  6) & 0x03e0);
-+                      val |= ((blue  >>  1) & 0x7c00);
-+
-+                      /*
-+                       * TODO: intensity bit. Maybe something like
-+                       *   ~(red[10] ^ green[10] ^ blue[10]) & 1
-+                       */
-+
-+                      lcdc_writel(sinfo, ATMEL_LCDC_LUT(regno), val);
-+                      ret = 0;
-+              }
-+              break;
-+      }
-+
-+      return ret;
-+}
-+
-+static int atmel_lcdfb_pan_display(struct fb_var_screeninfo *var,
-+                             struct fb_info *info)
-+{
-+      dev_dbg(info->device, "%s\n", __func__);
-+
-+      atmel_lcdfb_update_dma(info, var);
-+
-+      return 0;
-+}
-+
-+static struct fb_ops atmel_lcdfb_ops = {
-+      .owner          = THIS_MODULE,
-+      .fb_check_var   = atmel_lcdfb_check_var,
-+      .fb_set_par     = atmel_lcdfb_set_par,
-+      .fb_setcolreg   = atmel_lcdfb_setcolreg,
-+      .fb_pan_display = atmel_lcdfb_pan_display,
-+      .fb_fillrect    = cfb_fillrect,
-+      .fb_copyarea    = cfb_copyarea,
-+      .fb_imageblit   = cfb_imageblit,
-+};
-+
-+static irqreturn_t atmel_lcdfb_interrupt(int irq, void *dev_id)
-+{
-+      struct fb_info *info = dev_id;
-+      struct atmel_lcdfb_info *sinfo = info->par;
-+      u32 status;
-+
-+      status = lcdc_readl(sinfo, ATMEL_LCDC_ISR);
-+      lcdc_writel(sinfo, ATMEL_LCDC_IDR, status);
-+      return IRQ_HANDLED;
-+}
-+
-+static int __init atmel_lcdfb_init_fbinfo(struct atmel_lcdfb_info *sinfo)
-+{
-+      struct fb_info *info = sinfo->info;
-+      int ret = 0;
-+
-+      memset_io(info->screen_base, 0, info->fix.smem_len);
-+      info->var.activate |= FB_ACTIVATE_FORCE | FB_ACTIVATE_NOW;
-+
-+      dev_info(info->device,
-+             "%luKiB frame buffer at %08lx (mapped at %p)\n",
-+             (unsigned long)info->fix.smem_len / 1024,
-+             (unsigned long)info->fix.smem_start,
-+             info->screen_base);
-+
-+      /* Allocate colormap */
-+      ret = fb_alloc_cmap(&info->cmap, 256, 0);
-+      if (ret < 0)
-+              dev_err(info->device, "Alloc color map failed\n");
-+
-+      return ret;
-+}
-+
-+static void atmel_lcdfb_start_clock(struct atmel_lcdfb_info *sinfo)
-+{
-+      if (sinfo->bus_clk)
-+              clk_enable(sinfo->bus_clk);
-+      clk_enable(sinfo->lcdc_clk);
-+}
-+
-+static void atmel_lcdfb_stop_clock(struct atmel_lcdfb_info *sinfo)
-+{
-+      if (sinfo->bus_clk)
-+              clk_disable(sinfo->bus_clk);
-+      clk_disable(sinfo->lcdc_clk);
-+}
-+
-+
-+static int __init atmel_lcdfb_probe(struct platform_device *pdev)
-+{
-+      struct device *dev = &pdev->dev;
-+      struct fb_info *info;
-+      struct atmel_lcdfb_info *sinfo;
-+      struct atmel_lcdfb_info *pdata_sinfo;
-+      struct resource *regs = NULL;
-+      struct resource *map = NULL;
-+      int ret;
-+
-+      dev_dbg(dev, "%s BEGIN\n", __func__);
-+
-+      ret = -ENOMEM;
-+      info = framebuffer_alloc(sizeof(struct atmel_lcdfb_info), dev);
-+      if (!info) {
-+              dev_err(dev, "cannot allocate memory\n");
-+              goto out;
-+      }
-+
-+      sinfo = info->par;
-+
-+      if (dev->platform_data) {
-+              pdata_sinfo = (struct atmel_lcdfb_info *)dev->platform_data;
-+              sinfo->default_bpp = pdata_sinfo->default_bpp;
-+              sinfo->default_dmacon = pdata_sinfo->default_dmacon;
-+              sinfo->default_lcdcon2 = pdata_sinfo->default_lcdcon2;
-+              sinfo->default_monspecs = pdata_sinfo->default_monspecs;
-+              sinfo->atmel_lcdfb_power_control = pdata_sinfo->atmel_lcdfb_power_control;
-+              sinfo->guard_time = pdata_sinfo->guard_time;
-+      } else {
-+              dev_err(dev, "cannot get default configuration\n");
-+              goto free_info;
-+      }
-+      sinfo->info = info;
-+      sinfo->pdev = pdev;
-+
-+      strcpy(info->fix.id, sinfo->pdev->name);
-+      info->flags = ATMEL_LCDFB_FBINFO_DEFAULT;
-+      info->pseudo_palette = sinfo->pseudo_palette;
-+      info->fbops = &atmel_lcdfb_ops;
-+
-+      memcpy(&info->monspecs, sinfo->default_monspecs, sizeof(info->monspecs));
-+      info->fix = atmel_lcdfb_fix;
-+
-+      /* Enable LCDC Clocks */
-+      if (cpu_is_at91sam9261()) {
-+              sinfo->bus_clk = clk_get(dev, "hck1");
-+              if (IS_ERR(sinfo->bus_clk)) {
-+                      ret = PTR_ERR(sinfo->bus_clk);
-+                      goto free_info;
-+              }
-+      }
-+      sinfo->lcdc_clk = clk_get(dev, "lcdc_clk");
-+      if (IS_ERR(sinfo->lcdc_clk)) {
-+              ret = PTR_ERR(sinfo->lcdc_clk);
-+              goto put_bus_clk;
-+      }
-+      atmel_lcdfb_start_clock(sinfo);
-+
-+      ret = fb_find_mode(&info->var, info, NULL, info->monspecs.modedb,
-+                      info->monspecs.modedb_len, info->monspecs.modedb,
-+                      sinfo->default_bpp);
-+      if (!ret) {
-+              dev_err(dev, "no suitable video mode found\n");
-+              goto stop_clk;
-+      }
-+
-+
-+      regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+      if (!regs) {
-+              dev_err(dev, "resources unusable\n");
-+              ret = -ENXIO;
-+              goto stop_clk;
-+      }
-+
-+      sinfo->irq_base = platform_get_irq(pdev, 0);
-+      if (sinfo->irq_base < 0) {
-+              dev_err(dev, "unable to get irq\n");
-+              ret = sinfo->irq_base;
-+              goto stop_clk;
-+      }
-+
-+      /* Initialize video memory */
-+      map = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-+      if (map) {
-+              /* use a pre-allocated memory buffer */
-+              info->fix.smem_start = map->start;
-+              info->fix.smem_len = map->end - map->start + 1;
-+              if (!request_mem_region(info->fix.smem_start,
-+                                      info->fix.smem_len, pdev->name)) {
-+                      ret = -EBUSY;
-+                      goto stop_clk;
-+              }
-+
-+              info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len);
-+              if (!info->screen_base)
-+                      goto release_intmem;
-+      } else {
-+              /* alocate memory buffer */
-+              ret = atmel_lcdfb_alloc_video_memory(sinfo);
-+              if (ret < 0) {
-+                      dev_err(dev, "cannot allocate framebuffer: %d\n", ret);
-+                      goto stop_clk;
-+              }
-+      }
-+
-+      /* LCDC registers */
-+      info->fix.mmio_start = regs->start;
-+      info->fix.mmio_len = regs->end - regs->start + 1;
-+
-+      if (!request_mem_region(info->fix.mmio_start,
-+                              info->fix.mmio_len, pdev->name)) {
-+              ret = -EBUSY;
-+              goto free_fb;
-+      }
-+
-+      sinfo->mmio = ioremap(info->fix.mmio_start, info->fix.mmio_len);
-+      if (!sinfo->mmio) {
-+              dev_err(dev, "cannot map LCDC registers\n");
-+              goto release_mem;
-+      }
-+
-+      /* interrupt */
-+      ret = request_irq(sinfo->irq_base, atmel_lcdfb_interrupt, 0, pdev->name, info);
-+      if (ret) {
-+              dev_err(dev, "request_irq failed: %d\n", ret);
-+              goto unmap_mmio;
-+      }
-+
-+      ret = atmel_lcdfb_init_fbinfo(sinfo);
-+      if (ret < 0) {
-+              dev_err(dev, "init fbinfo failed: %d\n", ret);
-+              goto unregister_irqs;
-+      }
-+
-+      /*
-+       * This makes sure that our colour bitfield
-+       * descriptors are correctly initialised.
-+       */
-+      atmel_lcdfb_check_var(&info->var, info);
-+
-+      ret = fb_set_var(info, &info->var);
-+      if (ret) {
-+              dev_warn(dev, "unable to set display parameters\n");
-+              goto free_cmap;
-+      }
-+
-+      dev_set_drvdata(dev, info);
-+
-+      /*
-+       * Tell the world that we're ready to go
-+       */
-+      ret = register_framebuffer(info);
-+      if (ret < 0) {
-+              dev_err(dev, "failed to register framebuffer device: %d\n", ret);
-+              goto free_cmap;
-+      }
-+
-+      /* Power up the LCDC screen */
-+      if (sinfo->atmel_lcdfb_power_control)
-+              sinfo->atmel_lcdfb_power_control(1);
-+
-+      dev_info(dev, "fb%d: Atmel LCDC at 0x%08lx (mapped at %p), irq %lu\n",
-+                     info->node, info->fix.mmio_start, sinfo->mmio, sinfo->irq_base);
-+
-+      return 0;
-+
-+
-+free_cmap:
-+      fb_dealloc_cmap(&info->cmap);
-+unregister_irqs:
-+      free_irq(sinfo->irq_base, info);
-+unmap_mmio:
-+      iounmap(sinfo->mmio);
-+release_mem:
-+      release_mem_region(info->fix.mmio_start, info->fix.mmio_len);
-+free_fb:
-+      if (map)
-+              iounmap(info->screen_base);
-+      else
-+              atmel_lcdfb_free_video_memory(sinfo);
-+
-+release_intmem:
-+      if (map)
-+              release_mem_region(info->fix.smem_start, info->fix.smem_len);
-+stop_clk:
-+      atmel_lcdfb_stop_clock(sinfo);
-+      clk_put(sinfo->lcdc_clk);
-+put_bus_clk:
-+      if (sinfo->bus_clk)
-+              clk_put(sinfo->bus_clk);
-+free_info:
-+      framebuffer_release(info);
-+out:
-+      dev_dbg(dev, "%s FAILED\n", __func__);
-+      return ret;
-+}
-+
-+static int __exit atmel_lcdfb_remove(struct platform_device *pdev)
-+{
-+      struct device *dev = &pdev->dev;
-+      struct fb_info *info = dev_get_drvdata(dev);
-+      struct atmel_lcdfb_info *sinfo = info->par;
-+
-+      if (!sinfo)
-+              return 0;
-+
-+      if (sinfo->atmel_lcdfb_power_control)
-+              sinfo->atmel_lcdfb_power_control(0);
-+      unregister_framebuffer(info);
-+      atmel_lcdfb_stop_clock(sinfo);
-+      clk_put(sinfo->lcdc_clk);
-+      if (sinfo->bus_clk)
-+              clk_put(sinfo->bus_clk);
-+      fb_dealloc_cmap(&info->cmap);
-+      free_irq(sinfo->irq_base, info);
-+      iounmap(sinfo->mmio);
-+      release_mem_region(info->fix.mmio_start, info->fix.mmio_len);
-+      if (platform_get_resource(pdev, IORESOURCE_MEM, 1)) {
-+              iounmap(info->screen_base);
-+              release_mem_region(info->fix.smem_start, info->fix.smem_len);
-+      } else {
-+              atmel_lcdfb_free_video_memory(sinfo);
-+      }
-+
-+      dev_set_drvdata(dev, NULL);
-+      framebuffer_release(info);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver atmel_lcdfb_driver = {
-+      .remove         = __exit_p(atmel_lcdfb_remove),
-+      .driver         = {
-+              .name   = "atmel_lcdfb",
-+              .owner  = THIS_MODULE,
-+      },
-+};
-+
-+static int __init atmel_lcdfb_init(void)
-+{
-+      return platform_driver_probe(&atmel_lcdfb_driver, atmel_lcdfb_probe);
-+}
-+
-+static void __exit atmel_lcdfb_exit(void)
-+{
-+      platform_driver_unregister(&atmel_lcdfb_driver);
-+}
-+
-+module_init(atmel_lcdfb_init);
-+module_exit(atmel_lcdfb_exit);
-+
-+MODULE_DESCRIPTION("AT91/AT32 LCD Controller framebuffer driver");
-+MODULE_AUTHOR("Nicolas Ferre <nicolas.ferre@rfo.atmel.com>");
-+MODULE_LICENSE("GPL");
-Index: linux-2.6.21.7/drivers/video/backlight/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/drivers/video/backlight/Kconfig
-+++ linux-2.6.21.7/drivers/video/backlight/Kconfig
-@@ -63,3 +63,11 @@ config BACKLIGHT_PROGEAR
-       help
-         If you have a Frontpath ProGear say Y to enable the
-         backlight driver.
-+
-+config BACKLIGHT_KB920x
-+      tristate "KwikByte KB9202 Backlight Driver"
-+      depends on BACKLIGHT_CLASS_DEVICE && MACH_KB9200
-+      default y
-+      help
-+        If you have a KwikByte KB9202 board, say Y to enable the
-+        backlight driver.
-Index: linux-2.6.21.7/drivers/video/backlight/Makefile
-===================================================================
---- linux-2.6.21.7.orig/drivers/video/backlight/Makefile
-+++ linux-2.6.21.7/drivers/video/backlight/Makefile
-@@ -6,3 +6,4 @@ obj-$(CONFIG_BACKLIGHT_CORGI)  += corgi_b
- obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o
- obj-$(CONFIG_BACKLIGHT_LOCOMO)        += locomolcd.o
- obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
-+obj-$(CONFIG_BACKLIGHT_KB920x)        += kb920x_bl.o
-Index: linux-2.6.21.7/drivers/video/backlight/kb920x_bl.c
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/drivers/video/backlight/kb920x_bl.c
-@@ -0,0 +1,164 @@
-+/*
-+ * Backlight Driver for KB9202
-+ *
-+ * Copyright (c) 2006 KwikByte
-+ *
-+ * Based on Sharp's Corgi Backlight Driver
-+ *
-+ * 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/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/spinlock.h>
-+#include <linux/fb.h>
-+#include <linux/backlight.h>
-+
-+#include <asm/arch/gpio.h>
-+
-+/* The backlight is on(1)/off(0) */
-+#define       KB9202_DEFAULT_INTENSITY        1
-+#define       KB9202_MAX_INTENSITY            1
-+
-+static int kb9202bl_suspended;
-+static int current_intensity = 0;
-+static DEFINE_SPINLOCK(bl_lock);
-+
-+static int kb9202bl_set_intensity(struct backlight_device *bd)
-+{
-+      unsigned long flags;
-+      int intensity = bd->props.brightness;
-+
-+      if (bd->props.power != FB_BLANK_UNBLANK)
-+              intensity = 0;
-+      if (bd->props.fb_blank != FB_BLANK_UNBLANK)
-+              intensity = 0;
-+      if (kb9202bl_suspended)
-+              intensity = 0;
-+
-+      if ((!current_intensity) && (bd->props.power == FB_BLANK_UNBLANK))
-+              intensity = 1;
-+
-+      spin_lock_irqsave(&bl_lock, flags);
-+      if (intensity)
-+              gpio_set_value(AT91_PIN_PC23, 1);
-+      else
-+              gpio_set_value(AT91_PIN_PC23, 0);
-+      spin_unlock_irqrestore(&bl_lock, flags);
-+
-+      current_intensity = intensity;
-+
-+      return 0;
-+}
-+
-+static int kb9202bl_get_intensity(struct backlight_device *bd)
-+{
-+      return current_intensity;
-+}
-+
-+static struct backlight_ops kb9202bl_ops = {
-+      .get_brightness = kb9202bl_get_intensity,
-+      .update_status  = kb9202bl_set_intensity,
-+};
-+
-+static int __init kb9202bl_probe(struct platform_device *pdev)
-+{
-+      struct backlight_device *bd;
-+
-+      bd = backlight_device_register ("kb9202-bl", &pdev->dev, NULL, &kb9202bl_ops);
-+      if (IS_ERR(bd))
-+              return PTR_ERR(bd);
-+
-+      platform_set_drvdata(pdev, bd);
-+
-+      bd->props.max_brightness = KB9202_MAX_INTENSITY;
-+      bd->props.brightness = KB9202_DEFAULT_INTENSITY;
-+      (void) kb9202bl_set_intensity(bd);
-+
-+      return 0;
-+}
-+
-+static int kb9202bl_remove(struct platform_device *pdev)
-+{
-+      struct backlight_device *bd = platform_get_drvdata(pdev);
-+
-+      bd->props.brightness = 0;
-+      bd->props.power = 0;
-+      (void) kb9202bl_set_intensity(bd);
-+
-+      backlight_device_unregister(bd);
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int kb9202bl_suspend(struct platform_device *dev, pm_message_t state)
-+{
-+      struct backlight_device *bd = platform_get_drvdata(pdev);
-+
-+      kb9202bl_suspended = 1;
-+      (void) kb9202bl_set_intensity(bd);
-+      return 0;
-+}
-+
-+static int kb9202bl_resume(struct platform_device *dev)
-+{
-+      struct backlight_device *bd = platform_get_drvdata(pdev);
-+
-+      kb9202bl_suspended = 0;
-+      (void) kb9202bl_set_intensity(bd);
-+      return 0;
-+}
-+#else
-+#define kb9202bl_suspend      NULL
-+#define kb9202bl_resume               NULL
-+#endif
-+
-+static struct platform_driver kb9202bl_driver = {
-+      .probe          = kb9202bl_probe,
-+      .remove         = kb9202bl_remove,
-+      .suspend        = kb9202bl_suspend,
-+      .resume         = kb9202bl_resume,
-+      .driver         = {
-+              .name   = "kb9202-bl",
-+              .owner  = THIS_MODULE,
-+      },
-+};
-+
-+static struct platform_device *kb9202bl_device;
-+
-+static int __init kb9202bl_init(void)
-+{
-+      int ret;
-+
-+      ret = platform_driver_register(&kb9202bl_driver);
-+      if (!ret) {
-+              kb9202bl_device = platform_device_alloc("kb9202-bl", -1);
-+              if (!kb9202bl_device)
-+                      return -ENOMEM;
-+
-+              ret = platform_device_add(kb9202bl_device);
-+              if (ret) {
-+                      platform_device_put(kb9202bl_device);
-+                      platform_driver_unregister(&kb9202bl_driver);
-+              }
-+      }
-+      return ret;
-+}
-+
-+static void __exit kb9202bl_exit(void)
-+{
-+      platform_device_unregister(kb9202bl_device);
-+      platform_driver_unregister(&kb9202bl_driver);
-+}
-+
-+module_init(kb9202bl_init);
-+module_exit(kb9202bl_exit);
-+
-+MODULE_AUTHOR("KwikByte <kb9200_dev@kwikbyte.com>");
-+MODULE_DESCRIPTION("KB9202 Backlight Driver");
-+MODULE_LICENSE("GPL");
-Index: linux-2.6.21.7/drivers/video/s1d15605fb.c
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/drivers/video/s1d15605fb.c
-@@ -0,0 +1,659 @@
-+/*
-+ *  drivers/video/s1d15605.c
-+ *
-+ * Adapted from several sources including:
-+ * 1) Driver for AT91 LCD Controller
-+ *    Copyright (C) 2006 Atmel
-+ *
-+ * 2) Copyright (C) 2005 S. Kevin Hester
-+ *
-+ *   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 a basic framebuffer driver for the Optrex F-51320 128x64 mono LCD
-+ *   display.  This display uses a clone of the common Epson SED 1531 display
-+ *   controller.
-+ *
-+ *   I've heavily borrowed code from the vfb.c driver.
-+ *
-+ * 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
-+ */
-+
-+#ifdef DEBUG
-+#define MSG(string, args...) printk("s1d15605fb:" string, ##args)
-+#else
-+#define MSG(string, args...)
-+#endif
-+
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/interrupt.h>
-+#include <linux/clk.h>
-+#include <linux/fb.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+
-+#include <asm/uaccess.h>
-+
-+#include <asm/arch/board.h>
-+#include <asm/arch/gpio.h>
-+
-+#ifdef CONFIG_PMAC_BACKLIGHT
-+#include <asm/backlight.h>
-+#endif
-+
-+#define VIDEOWIDTH            128
-+#define VIDEOHEIGHT           64
-+#define VIDEODEPTH            1       /* bits/pixel */
-+#define VIDEOWIDTH_BYTES      ((VIDEOWIDTH * VIDEODEPTH) / 8)
-+
-+/* The number of bytes that actually go to the device */
-+#define ACTUALVIDEOMEMSIZE    (VIDEOWIDTH_BYTES * VIDEOHEIGHT)
-+#define VIDEOMEMSIZE          PAGE_SIZE
-+
-+static struct fb_var_screeninfo s1d15605_default __initdata = {
-+      .xres           = VIDEOWIDTH,
-+      .yres           = VIDEOHEIGHT,
-+      .xres_virtual   = VIDEOWIDTH,
-+      .yres_virtual   = VIDEOHEIGHT,
-+      .bits_per_pixel = VIDEODEPTH,
-+      .red            = { 0, 1, 0 },
-+      .green          = { 0, 1, 0 },
-+      .blue           = { 0, 1, 0 },
-+      .activate       = FB_ACTIVATE_NOW,
-+      .pixclock       = 20000,
-+      .vmode          = FB_VMODE_NONINTERLACED,
-+};
-+
-+static struct fb_fix_screeninfo s1d15605_fix __initdata = {
-+      .id             = "s1d15605",
-+      .type           = FB_TYPE_PACKED_PIXELS,
-+      .visual         = FB_VISUAL_MONO10,
-+      .xpanstep       = 0,
-+      .ypanstep       = 0,
-+      .ywrapstep      = 0,
-+      .accel          = FB_ACCEL_NONE,
-+};
-+
-+struct s1d15605fb_info {
-+      struct fb_info          *info;
-+      char                    *mmio;
-+      unsigned long           reset_pin;
-+      struct platform_device  *pdev;
-+};
-+
-+/*
-+ * LCD device interface
-+ */
-+#define       RESET_DISPLAY           0xE2
-+#define       LCD_BIAS_1_9            0xA2
-+#define       ADC_SELECT_REVERSE      0xA1
-+#define       COMMON_OUTPUT_NORMAL    0xC0
-+#define       V5_RESISTOR_RATIO       0x26
-+#define       ELECTRONIC_VOLUME_SET   0x81
-+#define       ELECTRONIC_VOLUME_INIT  0x20
-+#define       POWER_CONTROL_SET       0x28
-+#define       VOLTAGE_REGULATOR       0x02
-+#define       VOLTAGE_FOLLOWER        0x01
-+#define       BOOSTER_CIRCUIT         0x04
-+#define       DISPLAY_ON              0xAF
-+#define       START_LINE_SET          0x40
-+#define       PAGE_ADDRESS_SET        0xB0
-+#define       COLUMN_ADDRESS_HIGH     0x10
-+#define       COLUMN_ADDRESS_LOW      0x00
-+#define       RESISTOR_RATIO_START    0x20
-+
-+#define       NUM_OF_PAGES            8
-+#define       NUM_OF_COLUMNS          128
-+
-+#define       WRITE_COMMAND(x)        __raw_writeb((x), (sinfo)->mmio)
-+#define       READ_COMMAND            __raw_readb((sinfo)->mmio)
-+#define       WRITE_DATA(x)           __raw_writeb((x), (sinfo)->mmio + (0x10000))
-+#define       READ_DATA               __raw_readb((sinfo)->mmio + (0x10000))
-+
-+
-+/*
-+ *    s1d15605fb_resize_framebuffer
-+ *
-+ *    Free allocated space if different.  Allocate on new of changed.
-+ *    Returns -ENOMEM if the new framebuffer can not be allocated,
-+ *    zero on success.
-+ */
-+static int s1d15605fb_resize_framebuffer(struct s1d15605fb_info *sinfo)
-+{
-+      struct fb_info                  *info = sinfo->info;
-+      struct fb_fix_screeninfo        *fix = &info->fix;
-+      struct fb_var_screeninfo        *var = &info->var;
-+      unsigned int                    new_size;
-+      void                            *new_vaddr;
-+
-+      new_size = ((var->xres_virtual * var->yres_virtual * var->bits_per_pixel) / 8);
-+
-+      MSG("%s: x (%d) y (%d) bpp (%d): new size 0x%08x\n", __FUNCTION__,
-+              var->xres_virtual, var->yres_virtual, var->bits_per_pixel, new_size);
-+
-+      if (new_size == fix->smem_len)
-+              return 0;
-+
-+      if (fix->smem_len) {
-+              kfree(info->screen_base);
-+      }
-+
-+      new_vaddr = kmalloc(new_size, GFP_KERNEL);
-+
-+      if (!new_vaddr) {
-+              fix->smem_len = 0;
-+              return -ENOMEM;
-+      }
-+
-+      info->screen_base = new_vaddr;
-+      fix->smem_start = (unsigned)new_vaddr;
-+      fix->smem_len = new_size;
-+      fix->line_length = (var->xres_virtual * var->bits_per_pixel) / 8;
-+
-+      dev_info(info->device,
-+              "%luKiB frame buffer at %08lx (mapped at %p)\n",
-+              (unsigned long)info->fix.smem_len / 1024,
-+              (unsigned long)info->fix.smem_start,
-+              info->screen_base);
-+
-+      return 0;
-+}
-+
-+
-+/*
-+ * The s1d15605 seems to be divided into eight 128 pixel wide pages (from top to
-+ * bottom) each page seems to be eight pixels high, where these eight pixels are
-+ * one byte
-+ */
-+static void s1d15605_update(struct fb_info *info)
-+{
-+      struct s1d15605fb_info  *sinfo = info->par;
-+      int                     page, i, row, colmask;
-+      u8                      retVal, *rowPtr;
-+
-+      WRITE_COMMAND(START_LINE_SET);
-+      for (page = 0; page < NUM_OF_PAGES; ++page) {
-+              WRITE_COMMAND(PAGE_ADDRESS_SET + page);
-+              WRITE_COMMAND(COLUMN_ADDRESS_HIGH);
-+              WRITE_COMMAND(COLUMN_ADDRESS_LOW);
-+
-+              for (i = 0; i < NUM_OF_COLUMNS; ++i)
-+              {
-+                      /* point of opportunity: optimization */
-+                      colmask = (1 << (i & 0x7));
-+                      rowPtr = (u8*)(info->screen_base);
-+                      rowPtr += (VIDEOWIDTH_BYTES * 8 * page);
-+                      rowPtr += (i >> 3);
-+                      retVal = 0;
-+                      for (row = 0; row < 8; ++row)
-+                      {
-+                              retVal = (retVal >> 1) | (((*rowPtr) & colmask) ? 0x80 : 0);
-+                              rowPtr += VIDEOWIDTH_BYTES;
-+                      }
-+                      WRITE_DATA(retVal);
-+              }
-+      }
-+
-+      WRITE_COMMAND(DISPLAY_ON);
-+}
-+
-+
-+/*
-+ * Setting the video mode has been split into two parts.
-+ * First part, xxxfb_check_var, must not write anything
-+ * to hardware, it should only verify and adjust var.
-+ * This means it doesn't alter par but it does use hardware
-+ * data from it to check this var.
-+ */
-+static int s1d15605_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
-+{
-+      /*
-+       * Some very basic checks
-+       */
-+      if (!var->xres)
-+              var->xres = 1;
-+      if (!var->yres)
-+              var->yres = 1;
-+      if (var->xres > var->xres_virtual)
-+              var->xres_virtual = var->xres;
-+      if (var->yres > var->yres_virtual)
-+              var->yres_virtual = var->yres;
-+
-+      if(var->bits_per_pixel > VIDEODEPTH)
-+              return -EINVAL;
-+
-+      /*
-+       * Memory limit
-+       */
-+      if (((var->yres_virtual * var->bits_per_pixel * var->yres_virtual) >> 3) >
-+                      ACTUALVIDEOMEMSIZE)
-+              return -ENOMEM;
-+
-+      /*
-+       * Now that we checked it we alter var. The reason being is that the video
-+       * mode passed in might not work but slight changes to it might make it
-+       * work. This way we let the user know what is acceptable.
-+       */
-+      switch (var->bits_per_pixel) {
-+      case 1:
-+              var->red.offset = var->green.offset = var->blue.offset = 0;
-+              var->red.length = var->green.length = var->blue.length
-+                      = var->bits_per_pixel;
-+              break;
-+      default:
-+              return -EINVAL;
-+      }
-+
-+      var->xoffset = var->yoffset = 0;
-+      var->red.msb_right = var->green.msb_right = var->blue.msb_right =
-+              var->transp.msb_right = 0;
-+
-+      return 0;
-+}
-+
-+
-+/*
-+ * This routine actually sets the video mode. It's in here where we
-+ * the hardware state info->par and fix which can be affected by the
-+ * change in par. For this driver it doesn't do much.
-+ */
-+static int s1d15605_set_par(struct fb_info *info)
-+{
-+      int     ret;
-+
-+      MSG("%s:\n", __func__);
-+      MSG("  * resolution: %ux%u (%ux%u virtual)\n",
-+               info->var.xres, info->var.yres,
-+               info->var.xres_virtual, info->var.yres_virtual);
-+
-+      ret = s1d15605fb_resize_framebuffer(info->par);
-+
-+      info->fix.visual = FB_VISUAL_MONO10;
-+      return ret;
-+}
-+
-+
-+/*
-+ * Set a single color register. The values supplied are already
-+ * rounded down to the hardware's capabilities (according to the
-+ * entries in the var structure). Return != 0 for invalid regno.
-+ */
-+static int s1d15605_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
-+                      u_int transp, struct fb_info *info)
-+{
-+      if (regno > 1)  /* no. of hw registers - we only do mono now */
-+              return 1;
-+
-+      return 0;
-+}
-+
-+
-+/*
-+ * Currently, the routine will simply shut-off the backlight and prevent
-+ * updates/refreshes.  Modify according to application.
-+ *
-+ * 0 unblank, 1 blank, 2 no vsync, 3 no hsync, 4 off
-+ */
-+static int s1d15605_blank(int blank, struct fb_info *info)
-+{
-+#ifdef CONFIG_PMAC_BACKLIGHT
-+      if (blank)
-+              pmac_backlight->props.power = FB_BLANK_POWERDOWN;
-+      else
-+              pmac_backlight->props.power = FB_BLANK_UNBLANK;
-+      backlight_update_status(pmac_backlight);
-+#endif
-+      return 1;
-+}
-+
-+
-+/*
-+ * Pan or Wrap the Display
-+ *
-+ * This call looks only at xoffset, yoffset and the FB_VMODE_YWRAP flag
-+ */
-+/*
-+static int s1d15605_pan_display(struct fb_var_screeninfo *var,
-+                      struct fb_info *info)
-+{
-+      if (var->vmode & FB_VMODE_YWRAP) {
-+              if (var->yoffset < 0
-+                  || var->yoffset >= info->var.yres_virtual
-+                  || var->xoffset)
-+                      return -EINVAL;
-+      } else {
-+              if (var->xoffset + var->xres > info->var.xres_virtual ||
-+                  var->yoffset + var->yres > info->var.yres_virtual)
-+                      return -EINVAL;
-+      }
-+      info->var.xoffset = var->xoffset;
-+      info->var.yoffset = var->yoffset;
-+      if (var->vmode & FB_VMODE_YWRAP)
-+              info->var.vmode |= FB_VMODE_YWRAP;
-+      else
-+              info->var.vmode &= ~FB_VMODE_YWRAP;
-+      return 0;
-+}
-+*/
-+
-+
-+static void s1d15605_copyarea(struct fb_info *info, const struct fb_copyarea *region)
-+{
-+      cfb_copyarea(info, region);
-+      s1d15605_update(info);
-+}
-+
-+
-+static void s1d15605_fillrect (struct fb_info *info, const struct fb_fillrect *rect)
-+{
-+      cfb_fillrect(info, rect);
-+      s1d15605_update(info);
-+}
-+
-+
-+static void s1d15605_imageblit(struct fb_info *p, const struct fb_image *image)
-+{
-+      cfb_imageblit(p, image);
-+      s1d15605_update(p);
-+}
-+
-+
-+/*
-+ * Write the users data to our framebuffer, and then trigger a psuedo DMA
-+ */
-+static ssize_t s1d15605_write(struct file *file, const char *buf,
-+                      size_t count, loff_t *ppos)
-+{
-+      unsigned long p = *ppos;
-+      struct inode *inode = file->f_dentry->d_inode;
-+      int fbidx = iminor(inode);
-+      struct fb_info *info = registered_fb[fbidx];
-+      int err;
-+
-+      if (p > info->fix.smem_len)
-+              return -ENOSPC;
-+      if (count >= info->fix.smem_len)
-+              count = info->fix.smem_len;
-+      err = 0;
-+      if (count + p > info->fix.smem_len) {
-+              count = info->fix.smem_len - p;
-+              err = -ENOSPC;
-+      }
-+      if (count) {
-+              char *base_addr;
-+
-+              base_addr = info->screen_base;
-+              count -= copy_from_user(base_addr+p, buf, count);
-+              *ppos += count;
-+              err = -EFAULT;
-+      }
-+
-+      s1d15605_update(info);
-+
-+      if (count)
-+              return count;
-+
-+      return err;
-+}
-+
-+#ifdef        USE_PRIVATE_VMA_FXS
-+static void s1d15605_vma_open(struct vm_area_struct *vma)
-+{
-+      // FIXME - store stats in the device data via vm_private_data
-+}
-+
-+
-+static void s1d15605_vma_close(struct vm_area_struct *vma)
-+{
-+      // FIXME - store stats in the device data via vm_private_data
-+}
-+
-+
-+static struct page *s1d15605_vma_nopage(struct vm_area_struct *vma,
-+                              unsigned long address, int *type)
-+{
-+      struct page *page;
-+      struct fb_info *info = vma->vm_private_data;
-+
-+      page = virt_to_page(info->screen_base);
-+      get_page(page);
-+
-+      // FIXME - now someone has a link to our page, start periodically blitting
-+      // latest updates to the actual device.
-+
-+      return page;
-+}
-+
-+
-+static struct vm_operations_struct s1d15605_vm_ops = {
-+      .open   = s1d15605_vma_open,
-+      .close  = s1d15605_vma_close,
-+      .nopage = s1d15605_vma_nopage
-+};
-+
-+
-+/* We don't do much here - because we have special vm_ops */
-+static int s1d15605_mmap(struct fb_info *info, struct vm_area_struct *vma)
-+{
-+      vma->vm_ops = &s1d15605_vm_ops;
-+      vma->vm_flags |= VM_RESERVED;
-+      vma->vm_private_data = info;
-+      s1d15605_vma_open(vma);
-+
-+      return 0;
-+}
-+#endif /* USE_PRIVATE_VMA_FXS */
-+
-+
-+static struct fb_ops s1d15605fb_ops = {
-+      .owner          = THIS_MODULE,
-+      .fb_check_var   = s1d15605_check_var,
-+      .fb_set_par     = s1d15605_set_par,
-+      .fb_setcolreg   = s1d15605_setcolreg,
-+      .fb_blank       = s1d15605_blank,
-+//    .fb_pan_display = s1d15605_pan_display,
-+      .fb_fillrect    = s1d15605_fillrect,
-+      .fb_copyarea    = s1d15605_copyarea,
-+      .fb_imageblit   = s1d15605_imageblit,
-+      .fb_write       = s1d15605_write,
-+#ifdef        USE_PRIVATE_VMA_FXS
-+      .fb_mmap        = s1d15605_mmap,
-+#endif
-+};
-+
-+
-+static void s1d15605_device_init(struct s1d15605fb_info *sinfo) {
-+
-+      char    value;
-+
-+      /* release the reset line by reading the device - proto hardware */
-+      value = READ_COMMAND;
-+      value = READ_COMMAND;
-+
-+#ifdef CONFIG_MACH_KB9200
-+      /* new boards have dedicated reset line */
-+      gpio_set_value(sinfo->reset_pin, 1);
-+#endif
-+
-+      /* initialize the device within 5ms */
-+      WRITE_COMMAND(RESET_DISPLAY);
-+      WRITE_COMMAND(LCD_BIAS_1_9);
-+      WRITE_COMMAND(ADC_SELECT_REVERSE);
-+      WRITE_COMMAND(COMMON_OUTPUT_NORMAL);
-+      WRITE_COMMAND(V5_RESISTOR_RATIO);
-+      WRITE_COMMAND(ELECTRONIC_VOLUME_SET);
-+      WRITE_COMMAND(ELECTRONIC_VOLUME_INIT);
-+      WRITE_COMMAND(POWER_CONTROL_SET | VOLTAGE_REGULATOR | VOLTAGE_FOLLOWER | BOOSTER_CIRCUIT);
-+      WRITE_COMMAND(DISPLAY_ON);
-+
-+      WRITE_COMMAND(RESISTOR_RATIO_START + 4);
-+      WRITE_COMMAND(ELECTRONIC_VOLUME_SET);
-+      WRITE_COMMAND(0x33);
-+}
-+
-+
-+static int s1d15605fb_probe(struct platform_device *pdev)
-+{
-+      struct device *dev = &pdev->dev;
-+      struct fb_info *info;
-+      struct s1d15605fb_info *sinfo;
-+      int ret;
-+
-+      MSG("%s\n", __func__);
-+
-+      if (!(info = framebuffer_alloc(sizeof(struct s1d15605fb_info), dev))) {
-+              dev_err(dev, "Cannot allocate framebuffer struct\n");
-+              return -ENOMEM;
-+      }
-+
-+      sinfo = info->par;
-+      sinfo->info = info;
-+      sinfo->pdev = pdev;
-+
-+      if (pdev->num_resources < 2) {
-+              dev_err(dev, "Resources unusable\n");
-+              ret = -ENODEV;
-+              goto free_info;
-+      }
-+
-+      info->fbops = &s1d15605fb_ops;
-+      strcpy(info->fix.id, pdev->name);
-+
-+      info->fix.mmio_start = pdev->resource[0].start;
-+      info->fix.mmio_len = pdev->resource[0].end - pdev->resource[0].start + 1;
-+      sinfo->reset_pin = pdev->resource[1].start;
-+
-+      ret = s1d15605fb_resize_framebuffer(sinfo);
-+      if (ret < 0) {
-+              dev_err(dev, "Cannot resize framebuffer: %d\n", ret);
-+              goto free_fb;
-+      }
-+
-+      if (!request_mem_region(info->fix.mmio_start,
-+                              info->fix.mmio_len, pdev->name)) {
-+              ret = -EBUSY;
-+              goto free_fb;
-+      }
-+
-+      sinfo->mmio = ioremap(info->fix.mmio_start, info->fix.mmio_len);
-+      if (!sinfo->mmio) {
-+              dev_err(dev, "Cannot map LCD memory region\n");
-+              goto release_mem;
-+      }
-+
-+      s1d15605_device_init(sinfo);
-+
-+      ret = fb_find_mode(&info->var, info, NULL, NULL, 0, NULL, 1);
-+
-+      if (!ret || (ret == 4))
-+              info->var = s1d15605_default;
-+
-+      info->fix = s1d15605_fix;
-+      info->flags = FBINFO_FLAG_DEFAULT |
-+/*            FBINFO_HWACCEL_YPAN | */
-+              FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
-+
-+      ret = register_framebuffer(info);
-+      if (ret < 0) {
-+              dev_err(dev, "Failed to register framebuffer device: %d\n", ret);
-+              goto unmap_mmio;
-+      }
-+
-+      dev_set_drvdata(dev, info);
-+
-+      memset(info->screen_base, 0, info->fix.smem_len);
-+      info->var.activate |= FB_ACTIVATE_NOW;
-+      ret = fb_set_var(info, &info->var);
-+      if (ret) {
-+              dev_warn(dev, "Unable to set display parameters\n");
-+      }
-+
-+      info->var.activate &= ~(FB_ACTIVATE_FORCE | FB_ACTIVATE_NOW);
-+
-+      dev_dbg(dev, "%s SUCCESS\n", __func__);
-+
-+      dev_info(dev, "Driver $Revision: 1.1 $\n");
-+
-+      return 0;
-+
-+unmap_mmio:
-+      iounmap(sinfo->mmio);
-+release_mem:
-+      release_mem_region(info->fix.mmio_start, info->fix.mmio_len);
-+free_fb:
-+      kfree(info->screen_base);
-+
-+free_info:
-+      framebuffer_release(info);
-+
-+      dev_dbg(dev, "%s FAILED\n", __func__);
-+      return ret;
-+}
-+
-+
-+static int s1d15605fb_remove(struct platform_device *pdev)
-+{
-+      struct device *dev = &pdev->dev;
-+      struct fb_info *info = dev_get_drvdata(dev);
-+      struct s1d15605fb_info *sinfo = info->par;
-+
-+      if (!sinfo)
-+              return 0;
-+
-+      unregister_framebuffer(info);
-+
-+      iounmap(sinfo->mmio);
-+      release_mem_region(info->fix.mmio_start, info->fix.mmio_len);
-+
-+      kfree(info->screen_base);
-+
-+      dev_set_drvdata(dev, NULL);
-+      framebuffer_release(info);
-+      return 0;
-+}
-+
-+
-+static struct platform_driver s1d15605fb_driver = {
-+      .probe          = s1d15605fb_probe,
-+      .remove         = s1d15605fb_remove,
-+      .driver         = {
-+              .name   = "s1d15605fb",
-+              .owner  = THIS_MODULE,
-+      },
-+};
-+
-+
-+static int __init s1d15605fb_init(void)
-+{
-+      return platform_driver_register(&s1d15605fb_driver);
-+}
-+
-+
-+static void __exit s1d15605fb_exit(void)
-+{
-+      platform_driver_unregister(&s1d15605fb_driver);
-+}
-+
-+
-+module_init(s1d15605fb_init);
-+module_exit(s1d15605fb_exit);
-+
-+
-+MODULE_AUTHOR("KwikByte");
-+MODULE_DESCRIPTION("Epson S1D15605 LCD Controller framebuffer driver");
-+MODULE_LICENSE("GPL");
-Index: linux-2.6.21.7/include/asm-arm/arch-at91/at91_adc.h
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/include/asm-arm/arch-at91/at91_adc.h
-@@ -0,0 +1,61 @@
-+/*
-+ * include/asm-arm/arch-at91/at91_adc.h
-+ *
-+ * Copyright (C) SAN People
-+ *
-+ * Analog-to-Digital Converter (ADC) registers.
-+ * Based on AT91SAM9260 datasheet revision D.
-+ *
-+ * 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 AT91_ADC_H
-+#define AT91_ADC_H
-+
-+#define AT91_ADC_CR           0x00            /* Control Register */
-+#define               AT91_ADC_SWRST          (1 << 0)        /* Software Reset */
-+#define               AT91_ADC_START          (1 << 1)        /* Start Conversion */
-+
-+#define AT91_ADC_MR           0x04            /* Mode Register */
-+#define               AT91_ADC_TRGEN          (1 << 0)        /* Trigger Enable */
-+#define               AT91_ADC_TRGSEL         (7 << 1)        /* Trigger Selection */
-+#define                       AT91_ADC_TRGSEL_TC0             (0 << 1)
-+#define                       AT91_ADC_TRGSEL_TC1             (1 << 1)
-+#define                       AT91_ADC_TRGSEL_TC2             (2 << 1)
-+#define                       AT91_ADC_TRGSEL_EXTERNAL        (6 << 1)
-+#define               AT91_ADC_LOWRES         (1 << 4)        /* Low Resolution */
-+#define               AT91_ADC_SLEEP          (1 << 5)        /* Sleep Mode */
-+#define               AT91_ADC_PRESCAL        (0x3f << 8)     /* Prescalar Rate Selection */
-+#define                       AT91_ADC_PRESCAL_(x)    ((x) << 8)
-+#define               AT91_ADC_STARTUP        (0x1f << 16)    /* Startup Up Time */
-+#define                       AT91_ADC_STARTUP_(x)    ((x) << 16)
-+#define               AT91_ADC_SHTIM          (0xf  << 24)    /* Sample & Hold Time */
-+#define                       AT91_ADC_SHTIM_(x)      ((x) << 24)
-+
-+#define AT91_ADC_CHER         0x10            /* Channel Enable Register */
-+#define AT91_ADC_CHDR         0x14            /* Channel Disable Register */
-+#define AT91_ADC_CHSR         0x18            /* Channel Status Register */
-+#define               AT91_ADC_CH(n)          (1 << (n))      /* Channel Number */
-+
-+#define AT91_ADC_SR           0x1C            /* Status Register */
-+#define               AT91_ADC_EOC(n)         (1 << (n))      /* End of Conversion on Channel N */
-+#define               AT91_ADC_OVRE(n)        (1 << ((n) + 8))/* Overrun Error on Channel N */
-+#define               AT91_ADC_DRDY           (1 << 16)       /* Data Ready */
-+#define               AT91_ADC_GOVRE          (1 << 17)       /* General Overrun Error */
-+#define               AT91_ADC_ENDRX          (1 << 18)       /* End of RX Buffer */
-+#define               AT91_ADC_RXFUFF         (1 << 19)       /* RX Buffer Full */
-+
-+#define AT91_ADC_LCDR         0x20            /* Last Converted Data Register */
-+#define               AT91_ADC_LDATA          (0x3ff)
-+
-+#define AT91_ADC_IER          0x24            /* Interrupt Enable Register */
-+#define AT91_ADC_IDR          0x28            /* Interrupt Disable Register */
-+#define AT91_ADC_IMR          0x2C            /* Interrupt Mask Register */
-+
-+#define AT91_ADC_CHR(n)               (0x30 + ((n) * 4)       /* Channel Data Register N */
-+#define               AT91_ADC_DATA           (0x3ff)
-+
-+#endif
-Index: linux-2.6.21.7/include/asm-arm/arch-at91/at91_mci.h
-===================================================================
---- linux-2.6.21.7.orig/include/asm-arm/arch-at91/at91_mci.h
-+++ linux-2.6.21.7/include/asm-arm/arch-at91/at91_mci.h
-@@ -26,6 +26,9 @@
- #define AT91_MCI_MR           0x04            /* Mode Register */
- #define               AT91_MCI_CLKDIV         (0xff  <<  0)   /* Clock Divider */
- #define               AT91_MCI_PWSDIV         (7     <<  8)   /* Power Saving Divider */
-+#define               AT91_MCI_RDPROOF        (1     << 11)   /* Read Proof Enable [SAM926[03] only] */
-+#define               AT91_MCI_WRPROOF        (1     << 12)   /* Write Proof Enable [SAM926[03] only] */
-+#define               AT91_MCI_PDCFBYTE       (1     << 13)   /* PDC Force Byte Transfer [SAM926[03] only] */
- #define               AT91_MCI_PDCPADV        (1     << 14)   /* PDC Padding Value */
- #define               AT91_MCI_PDCMODE        (1     << 15)   /* PDC-orientated Mode */
- #define               AT91_MCI_BLKLEN         (0xfff << 18)   /* Data Block Length */
-Index: linux-2.6.21.7/include/asm-arm/arch-at91/at91_pmc.h
-===================================================================
---- linux-2.6.21.7.orig/include/asm-arm/arch-at91/at91_pmc.h
-+++ linux-2.6.21.7/include/asm-arm/arch-at91/at91_pmc.h
-@@ -37,7 +37,9 @@
- #define       AT91_PMC_PCDR           (AT91_PMC + 0x14)       /* Peripheral Clock Disable Register */
- #define       AT91_PMC_PCSR           (AT91_PMC + 0x18)       /* Peripheral Clock Status Register */
--#define       AT91_CKGR_MOR           (AT91_PMC + 0x20)       /* Main Oscillator Register */
-+#define AT91_CKGR_UCKR                (AT91_PMC + 0x1C)       /* UTMI Clock Register [SAM9RL only] */
-+
-+#define       AT91_CKGR_MOR           (AT91_PMC + 0x20)       /* Main Oscillator Register [not on SAM9RL] */
- #define               AT91_PMC_MOSCEN         (1    << 0)             /* Main Oscillator Enable */
- #define               AT91_PMC_OSCBYPASS      (1    << 1)             /* Oscillator Bypass [AT91SAM926x only] */
- #define               AT91_PMC_OSCOUNT        (0xff << 8)             /* Main Oscillator Start-up Time */
-Index: linux-2.6.21.7/include/asm-arm/arch-at91/at91rm9200.h
-===================================================================
---- linux-2.6.21.7.orig/include/asm-arm/arch-at91/at91rm9200.h
-+++ linux-2.6.21.7/include/asm-arm/arch-at91/at91rm9200.h
-@@ -107,185 +107,4 @@
- #define AT91RM9200_UHP_BASE   0x00300000      /* USB Host controller */
--#if 0
--/*
-- * PIO pin definitions (peripheral A/B multiplexing).
-- */
--#define AT91_PA0_MISO         (1 <<  0)       /* A: SPI Master-In Slave-Out */
--#define AT91_PA0_PCK3         (1 <<  0)       /* B: PMC Programmable Clock Output 3 */
--#define AT91_PA1_MOSI         (1 <<  1)       /* A: SPI Master-Out Slave-In */
--#define AT91_PA1_PCK0         (1 <<  1)       /* B: PMC Programmable Clock Output 0 */
--#define AT91_PA2_SPCK         (1 <<  2)       /* A: SPI Serial Clock */
--#define AT91_PA2_IRQ4         (1 <<  2)       /* B: External Interrupt 4 */
--#define AT91_PA3_NPCS0                (1 <<  3)       /* A: SPI Peripheral Chip Select 0 */
--#define AT91_PA3_IRQ5         (1 <<  3)       /* B: External Interrupt 5 */
--#define AT91_PA4_NPCS1                (1 <<  4)       /* A: SPI Peripheral Chip Select 1 */
--#define AT91_PA4_PCK1         (1 <<  4)       /* B: PMC Programmable Clock Output 1 */
--#define AT91_PA5_NPCS2                (1 <<  5)       /* A: SPI Peripheral Chip Select 2 */
--#define AT91_PA5_TXD3         (1 <<  5)       /* B: USART Transmit Data 3 */
--#define AT91_PA6_NPCS3                (1 <<  6)       /* A: SPI Peripheral Chip Select 3 */
--#define AT91_PA6_RXD3         (1 <<  6)       /* B: USART Receive Data 3 */
--#define AT91_PA7_ETXCK_EREFCK (1 <<  7)       /* A: Ethernet Reference Clock / Transmit Clock */
--#define AT91_PA7_PCK2         (1 <<  7)       /* B: PMC Programmable Clock Output 2 */
--#define AT91_PA8_ETXEN                (1 <<  8)       /* A: Ethernet Transmit Enable */
--#define AT91_PA8_MCCDB                (1 <<  8)       /* B: MMC Multimedia Card B Command */
--#define AT91_PA9_ETX0         (1 <<  9)       /* A: Ethernet Transmit Data 0 */
--#define AT91_PA9_MCDB0                (1 <<  9)       /* B: MMC Multimedia Card B Data 0 */
--#define AT91_PA10_ETX1                (1 << 10)       /* A: Ethernet Transmit Data 1 */
--#define AT91_PA10_MCDB1               (1 << 10)       /* B: MMC Multimedia Card B Data 1 */
--#define AT91_PA11_ECRS_ECRSDV (1 << 11)       /* A: Ethernet Carrier Sense / Data Valid */
--#define AT91_PA11_MCDB2               (1 << 11)       /* B: MMC Multimedia Card B Data 2 */
--#define AT91_PA12_ERX0                (1 << 12)       /* A: Ethernet Receive Data 0 */
--#define AT91_PA12_MCDB3               (1 << 12)       /* B: MMC Multimedia Card B Data 3 */
--#define AT91_PA13_ERX1                (1 << 13)       /* A: Ethernet Receive Data 1 */
--#define AT91_PA13_TCLK0               (1 << 13)       /* B: TC External Clock Input 0 */
--#define AT91_PA14_ERXER               (1 << 14)       /* A: Ethernet Receive Error */
--#define AT91_PA14_TCLK1               (1 << 14)       /* B: TC External Clock Input 1 */
--#define AT91_PA15_EMDC                (1 << 15)       /* A: Ethernet Management Data Clock */
--#define AT91_PA15_TCLK2               (1 << 15)       /* B: TC External Clock Input 2 */
--#define AT91_PA16_EMDIO               (1 << 16)       /* A: Ethernet Management Data I/O */
--#define AT91_PA16_IRQ6                (1 << 16)       /* B: External Interrupt 6 */
--#define AT91_PA17_TXD0                (1 << 17)       /* A: USART Transmit Data 0 */
--#define AT91_PA17_TIOA0               (1 << 17)       /* B: TC I/O Line A 0 */
--#define AT91_PA18_RXD0                (1 << 18)       /* A: USART Receive Data 0 */
--#define AT91_PA18_TIOB0               (1 << 18)       /* B: TC I/O Line B 0 */
--#define AT91_PA19_SCK0                (1 << 19)       /* A: USART Serial Clock 0 */
--#define AT91_PA19_TIOA1               (1 << 19)       /* B: TC I/O Line A 1 */
--#define AT91_PA20_CTS0                (1 << 20)       /* A: USART Clear To Send 0 */
--#define AT91_PA20_TIOB1               (1 << 20)       /* B: TC I/O Line B 1 */
--#define AT91_PA21_RTS0                (1 << 21)       /* A: USART Ready To Send 0 */
--#define AT91_PA21_TIOA2               (1 << 21)       /* B: TC I/O Line A 2 */
--#define AT91_PA22_RXD2                (1 << 22)       /* A: USART Receive Data 2 */
--#define AT91_PA22_TIOB2               (1 << 22)       /* B: TC I/O Line B 2 */
--#define AT91_PA23_TXD2                (1 << 23)       /* A: USART Transmit Data 2 */
--#define AT91_PA23_IRQ3                (1 << 23)       /* B: External Interrupt 3 */
--#define AT91_PA24_SCK2                (1 << 24)       /* A: USART Serial Clock 2 */
--#define AT91_PA24_PCK1                (1 << 24)       /* B: PMC Programmable Clock Output 1 */
--#define AT91_PA25_TWD         (1 << 25)       /* A: TWI Two-wire Serial Data */
--#define AT91_PA25_IRQ2                (1 << 25)       /* B: External Interrupt 2 */
--#define AT91_PA26_TWCK                (1 << 26)       /* A: TWI Two-wire Serial Clock */
--#define AT91_PA26_IRQ1                (1 << 26)       /* B: External Interrupt 1 */
--#define AT91_PA27_MCCK                (1 << 27)       /* A: MMC Multimedia Card Clock */
--#define AT91_PA27_TCLK3               (1 << 27)       /* B: TC External Clock Input 3 */
--#define AT91_PA28_MCCDA               (1 << 28)       /* A: MMC Multimedia Card A Command */
--#define AT91_PA28_TCLK4               (1 << 28)       /* B: TC External Clock Input 4 */
--#define AT91_PA29_MCDA0               (1 << 29)       /* A: MMC Multimedia Card A Data 0 */
--#define AT91_PA29_TCLK5               (1 << 29)       /* B: TC External Clock Input 5 */
--#define AT91_PA30_DRXD                (1 << 30)       /* A: DBGU Receive Data */
--#define AT91_PA30_CTS2                (1 << 30)       /* B: USART Clear To Send 2 */
--#define AT91_PA31_DTXD                (1 << 31)       /* A: DBGU Transmit Data */
--#define AT91_PA31_RTS2                (1 << 31)       /* B: USART Ready To Send 2 */
--
--#define AT91_PB0_TF0          (1 <<  0)       /* A: SSC Transmit Frame Sync 0 */
--#define AT91_PB0_RTS3         (1 <<  0)       /* B: USART Ready To Send 3 */
--#define AT91_PB1_TK0          (1 <<  1)       /* A: SSC Transmit Clock 0 */
--#define AT91_PB1_CTS3         (1 <<  1)       /* B: USART Clear To Send 3 */
--#define AT91_PB2_TD0          (1 <<  2)       /* A: SSC Transmit Data 0 */
--#define AT91_PB2_SCK3         (1 <<  2)       /* B: USART Serial Clock 3 */
--#define AT91_PB3_RD0          (1 <<  3)       /* A: SSC Receive Data 0 */
--#define AT91_PB3_MCDA1                (1 <<  3)       /* B: MMC Multimedia Card A Data 1 */
--#define AT91_PB4_RK0          (1 <<  4)       /* A: SSC Receive Clock 0 */
--#define AT91_PB4_MCDA2                (1 <<  4)       /* B: MMC Multimedia Card A Data 2 */
--#define AT91_PB5_RF0          (1 <<  5)       /* A: SSC Receive Frame Sync 0 */
--#define AT91_PB5_MCDA3                (1 <<  5)       /* B: MMC Multimedia Card A Data 3 */
--#define AT91_PB6_TF1          (1 <<  6)       /* A: SSC Transmit Frame Sync 1 */
--#define AT91_PB6_TIOA3                (1 <<  6)       /* B: TC I/O Line A 3 */
--#define AT91_PB7_TK1          (1 <<  7)       /* A: SSC Transmit Clock 1 */
--#define AT91_PB7_TIOB3                (1 <<  7)       /* B: TC I/O Line B 3 */
--#define AT91_PB8_TD1          (1 <<  8)       /* A: SSC Transmit Data 1 */
--#define AT91_PB8_TIOA4                (1 <<  8)       /* B: TC I/O Line A 4 */
--#define AT91_PB9_RD1          (1 <<  9)       /* A: SSC Receive Data 1 */
--#define AT91_PB9_TIOB4                (1 <<  9)       /* B: TC I/O Line B 4 */
--#define AT91_PB10_RK1         (1 << 10)       /* A: SSC Receive Clock 1 */
--#define AT91_PB10_TIOA5               (1 << 10)       /* B: TC I/O Line A 5 */
--#define AT91_PB11_RF1         (1 << 11)       /* A: SSC Receive Frame Sync 1 */
--#define AT91_PB11_TIOB5               (1 << 11)       /* B: TC I/O Line B 5 */
--#define AT91_PB12_TF2         (1 << 12)       /* A: SSC Transmit Frame Sync 2 */
--#define AT91_PB12_ETX2                (1 << 12)       /* B: Ethernet Transmit Data 2 */
--#define AT91_PB13_TK2         (1 << 13)       /* A: SSC Transmit Clock 3 */
--#define AT91_PB13_ETX3                (1 << 13)       /* B: Ethernet Transmit Data 3 */
--#define AT91_PB14_TD2         (1 << 14)       /* A: SSC Transmit Data 2 */
--#define AT91_PB14_ETXER               (1 << 14)       /* B: Ethernet Transmit Coding Error */
--#define AT91_PB15_RD2         (1 << 15)       /* A: SSC Receive Data 2 */
--#define AT91_PB15_ERX2                (1 << 15)       /* B: Ethernet Receive Data 2 */
--#define AT91_PB16_RK2         (1 << 16)       /* A: SSC Receive Clock 2 */
--#define AT91_PB16_ERX3                (1 << 16)       /* B: Ethernet Receive Data 3 */
--#define AT91_PB17_RF2         (1 << 17)       /* A: SSC Receive Frame Sync 2 */
--#define AT91_PB17_ERXDV               (1 << 17)       /* B: Ethernet Receive Data Valid */
--#define AT91_PB18_RI1         (1 << 18)       /* A: USART Ring Indicator 1 */
--#define AT91_PB18_ECOL                (1 << 18)       /* B: Ethernet Collision Detected */
--#define AT91_PB19_DTR1                (1 << 19)       /* A: USART Data Terminal Ready 1 */
--#define AT91_PB19_ERXCK               (1 << 19)       /* B: Ethernet Receive Clock */
--#define AT91_PB20_TXD1                (1 << 20)       /* A: USART Transmit Data 1 */
--#define AT91_PB21_RXD1                (1 << 21)       /* A: USART Receive Data 1 */
--#define AT91_PB22_SCK1                (1 << 22)       /* A: USART Serial Clock 1 */
--#define AT91_PB23_DCD1                (1 << 23)       /* A: USART Data Carrier Detect 1 */
--#define AT91_PB24_CTS1                (1 << 24)       /* A: USART Clear To Send 1 */
--#define AT91_PB25_DSR1                (1 << 25)       /* A: USART Data Set Ready 1 */
--#define AT91_PB25_EF100               (1 << 25)       /* B: Ethernet Force 100 Mbit */
--#define AT91_PB26_RTS1                (1 << 26)       /* A: USART Ready To Send 1 */
--#define AT91_PB27_PCK0                (1 << 27)       /* B: PMC Programmable Clock Output 0 */
--#define AT91_PB28_FIQ         (1 << 28)       /* A: Fast Interrupt */
--#define AT91_PB29_IRQ0                (1 << 29)       /* A: External Interrupt 0 */
--
--#define AT91_PC0_BFCK         (1 <<  0)       /* A: Burst Flash Clock */
--#define AT91_PC1_BFRDY_SMOE   (1 <<  1)       /* A: Burst Flash Ready / SmartMedia Output Enable */
--#define AT91_PC2_BFAVD                (1 <<  2)       /* A: Burst Flash Address Valid */
--#define AT91_PC3_BFBAA_SMWE   (1 <<  3)       /* A: Burst Flash Address Advance / SmartMedia Write Enable */
--#define AT91_PC4_BFOE         (1 <<  4)       /* A: Burst Flash Output Enable */
--#define AT91_PC5_BFWE         (1 <<  5)       /* A: Burst Flash Write Enable */
--#define AT91_PC6_NWAIT                (1 <<  6)       /* A: SMC Wait Signal */
--#define AT91_PC7_A23          (1 <<  7)       /* A: Address Bus 23 */
--#define AT91_PC8_A24          (1 <<  8)       /* A: Address Bus 24 */
--#define AT91_PC9_A25_CFRNW    (1 <<  9)       /* A: Address Bus 25 / Compact Flash Read Not Write */
--#define AT91_PC10_NCS4_CFCS   (1 << 10)       /* A: SMC Chip Select 4 / Compact Flash Chip Select */
--#define AT91_PC11_NCS5_CFCE1  (1 << 11)       /* A: SMC Chip Select 5 / Compact Flash Chip Enable 1 */
--#define AT91_PC12_NCS6_CFCE2  (1 << 12)       /* A: SMC Chip Select 6 / Compact Flash Chip Enable 2 */
--#define AT91_PC13_NCS7                (1 << 13)       /* A: Chip Select 7 */
--
--#define AT91_PD0_ETX0         (1 <<  0)       /* A: Ethernet Transmit Data 0 */
--#define AT91_PD1_ETX1         (1 <<  1)       /* A: Ethernet Transmit Data 1 */
--#define AT91_PD2_ETX2         (1 <<  2)       /* A: Ethernet Transmit Data 2 */
--#define AT91_PD3_ETX3         (1 <<  3)       /* A: Ethernet Transmit Data 3 */
--#define AT91_PD4_ETXEN                (1 <<  4)       /* A: Ethernet Transmit Enable */
--#define AT91_PD5_ETXER                (1 <<  5)       /* A: Ethernet Transmit Coding Error */
--#define AT91_PD6_DTXD         (1 <<  6)       /* A: DBGU Transmit Data */
--#define AT91_PD7_PCK0         (1 <<  7)       /* A: PMC Programmable Clock Output 0 */
--#define AT91_PD7_TSYNC                (1 <<  7)       /* B: ETM Trace Synchronization Signal */
--#define AT91_PD8_PCK1         (1 <<  8)       /* A: PMC Programmable Clock Output 1 */
--#define AT91_PD8_TCLK         (1 <<  8)       /* B: ETM Trace Clock */
--#define AT91_PD9_PCK2         (1 <<  9)       /* A: PMC Programmable Clock Output 2 */
--#define AT91_PD9_TPS0         (1 <<  9)       /* B: ETM Trace ARM Pipeline Status 0 */
--#define AT91_PD10_PCK3                (1 << 10)       /* A: PMC Programmable Clock Output 3 */
--#define AT91_PD10_TPS1                (1 << 10)       /* B: ETM Trace ARM Pipeline Status 1 */
--#define AT91_PD11_TPS2                (1 << 11)       /* B: ETM Trace ARM Pipeline Status 2 */
--#define AT91_PD12_TPK0                (1 << 12)       /* B: ETM Trace Packet Port 0 */
--#define AT91_PD13_TPK1                (1 << 13)       /* B: ETM Trace Packet Port 1 */
--#define AT91_PD14_TPK2                (1 << 14)       /* B: ETM Trace Packet Port 2 */
--#define AT91_PD15_TD0         (1 << 15)       /* A: SSC Transmit Data 0 */
--#define AT91_PD15_TPK3                (1 << 15)       /* B: ETM Trace Packet Port 3 */
--#define AT91_PD16_TD1         (1 << 16)       /* A: SSC Transmit Data 1 */
--#define AT91_PD16_TPK4                (1 << 16)       /* B: ETM Trace Packet Port 4 */
--#define AT91_PD17_TD2         (1 << 17)       /* A: SSC Transmit Data 2 */
--#define AT91_PD17_TPK5                (1 << 17)       /* B: ETM Trace Packet Port 5 */
--#define AT91_PD18_NPCS1               (1 << 18)       /* A: SPI Peripheral Chip Select 1 */
--#define AT91_PD18_TPK6                (1 << 18)       /* B: ETM Trace Packet Port 6 */
--#define AT91_PD19_NPCS2               (1 << 19)       /* A: SPI Peripheral Chip Select 2 */
--#define AT91_PD19_TPK7                (1 << 19)       /* B: ETM Trace Packet Port 7 */
--#define AT91_PD20_NPCS3               (1 << 20)       /* A: SPI Peripheral Chip Select 3 */
--#define AT91_PD20_TPK8                (1 << 20)       /* B: ETM Trace Packet Port 8 */
--#define AT91_PD21_RTS0                (1 << 21)       /* A: USART Ready To Send 0 */
--#define AT91_PD21_TPK9                (1 << 21)       /* B: ETM Trace Packet Port 9 */
--#define AT91_PD22_RTS1                (1 << 22)       /* A: USART Ready To Send 1 */
--#define AT91_PD22_TPK10               (1 << 22)       /* B: ETM Trace Packet Port 10 */
--#define AT91_PD23_RTS2                (1 << 23)       /* A: USART Ready To Send 2 */
--#define AT91_PD23_TPK11               (1 << 23)       /* B: ETM Trace Packet Port 11 */
--#define AT91_PD24_RTS3                (1 << 24)       /* A: USART Ready To Send 3 */
--#define AT91_PD24_TPK12               (1 << 24)       /* B: ETM Trace Packet Port 12 */
--#define AT91_PD25_DTR1                (1 << 25)       /* A: USART Data Terminal Ready 1 */
--#define AT91_PD25_TPK13               (1 << 25)       /* B: ETM Trace Packet Port 13 */
--#define AT91_PD26_TPK14               (1 << 26)       /* B: ETM Trace Packet Port 14 */
--#define AT91_PD27_TPK15               (1 << 27)       /* B: ETM Trace Packet Port 15 */
--#endif
--
- #endif
-Index: linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9260.h
-===================================================================
---- linux-2.6.21.7.orig/include/asm-arm/arch-at91/at91sam9260.h
-+++ linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9260.h
-@@ -117,13 +117,4 @@
- #define AT91SAM9XE_SRAM_BASE  0x00300000      /* Internal SRAM base address */
--#if 0
--/*
-- * PIO pin definitions (peripheral A/B multiplexing).
-- */
--
--// TODO: Add
--
--#endif
--
- #endif
-Index: linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9260_matrix.h
-===================================================================
---- linux-2.6.21.7.orig/include/asm-arm/arch-at91/at91sam9260_matrix.h
-+++ linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9260_matrix.h
-@@ -67,7 +67,7 @@
- #define               AT91_MATRIX_CS4A                (1 << 4)        /* Chip Select 4 Assignment */
- #define                       AT91_MATRIX_CS4A_SMC            (0 << 4)
- #define                       AT91_MATRIX_CS4A_SMC_CF1        (1 << 4)
--#define               AT91_MATRIX_CS5A                (1 << 5 )       /* Chip Select 5 Assignment */
-+#define               AT91_MATRIX_CS5A                (1 << 5)        /* Chip Select 5 Assignment */
- #define                       AT91_MATRIX_CS5A_SMC            (0 << 5)
- #define                       AT91_MATRIX_CS5A_SMC_CF2        (1 << 5)
- #define               AT91_MATRIX_DBPUC               (1 << 8)        /* Data Bus Pull-up Configuration */
-Index: linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9261.h
-===================================================================
---- linux-2.6.21.7.orig/include/asm-arm/arch-at91/at91sam9261.h
-+++ linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9261.h
-@@ -98,195 +98,4 @@
- #define AT91SAM9261_LCDC_BASE 0x00600000      /* LDC controller */
--#if 0
--/*
-- * PIO pin definitions (peripheral A/B multiplexing).
-- */
--#define AT91_PA0_SPI0_MISO    (1 <<  0)       /* A: SPI0 Master In Slave */
--#define AT91_PA0_MCDA0                (1 <<  0)       /* B: Multimedia Card A Data 0 */
--#define AT91_PA1_SPI0_MOSI    (1 <<  1)       /* A: SPI0 Master Out Slave */
--#define AT91_PA1_MCCDA                (1 <<  1)       /* B: Multimedia Card A Command */
--#define AT91_PA2_SPI0_SPCK    (1 <<  2)       /* A: SPI0 Serial Clock */
--#define AT91_PA2_MCCK         (1 <<  2)       /* B: Multimedia Card Clock */
--#define AT91_PA3_SPI0_NPCS0   (1 <<  3)       /* A: SPI0 Peripheral Chip Select 0 */
--#define AT91_PA4_SPI0_NPCS1   (1 <<  4)       /* A: SPI0 Peripheral Chip Select 1 */
--#define AT91_PA4_MCDA1                (1 <<  4)       /* B: Multimedia Card A Data 1 */
--#define AT91_PA5_SPI0_NPCS2   (1 <<  5)       /* A: SPI0 Peripheral Chip Select 2 */
--#define AT91_PA5_MCDA2                (1 <<  5)       /* B: Multimedia Card A Data 2 */
--#define AT91_PA6_SPI0_NPCS3   (1 <<  6)       /* A: SPI0 Peripheral Chip Select 3 */
--#define AT91_PA6_MCDA3                (1 <<  6)       /* B: Multimedia Card A Data 3 */
--#define AT91_PA7_TWD          (1 <<  7)       /* A: TWI Two-wire Serial Data */
--#define AT91_PA7_PCK0         (1 <<  7)       /* B: PMC Programmable clock Output 0 */
--#define AT91_PA8_TWCK         (1 <<  8)       /* A: TWI Two-wire Serial Clock */
--#define AT91_PA8_PCK1         (1 <<  8)       /* B: PMC Programmable clock Output 1 */
--#define AT91_PA9_DRXD         (1 <<  9)       /* A: DBGU Debug Receive Data */
--#define AT91_PA9_PCK2         (1 <<  9)       /* B: PMC Programmable clock Output 2 */
--#define AT91_PA10_DTXD                (1 << 10)       /* A: DBGU Debug Transmit Data */
--#define AT91_PA10_PCK3                (1 << 10)       /* B: PMC Programmable clock Output 3 */
--#define AT91_PA11_TSYNC               (1 << 11)       /* A: Trace Synchronization Signal */
--#define AT91_PA11_SCK1                (1 << 11)       /* B: USART1 Serial Clock */
--#define AT91_PA12_TCLK                (1 << 12)       /* A: Trace Clock */
--#define AT91_PA12_RTS1                (1 << 12)       /* B: USART1 Ready To Send */
--#define AT91_PA13_TPS0                (1 << 13)       /* A: Trace ARM Pipeline Status 0 */
--#define AT91_PA13_CTS1                (1 << 13)       /* B: USART1 Clear To Send */
--#define AT91_PA14_TPS1                (1 << 14)       /* A: Trace ARM Pipeline Status 1 */
--#define AT91_PA14_SCK2                (1 << 14)       /* B: USART2 Serial Clock */
--#define AT91_PA15_TPS2                (1 << 15)       /* A: Trace ARM Pipeline Status 2 */
--#define AT91_PA15_RTS2                (1 << 15)       /* B: USART2 Ready To Send */
--#define AT91_PA16_TPK0                (1 << 16)       /* A: Trace Packet Port 0 */
--#define AT91_PA16_CTS2                (1 << 16)       /* B: USART2 Clear To Send */
--#define AT91_PA17_TPK1                (1 << 17)       /* A: Trace Packet Port 1 */
--#define AT91_PA17_TF1         (1 << 17)       /* B: SSC1 Transmit Frame Sync */
--#define AT91_PA18_TPK2                (1 << 18)       /* A: Trace Packet Port 2 */
--#define AT91_PA18_TK1         (1 << 18)       /* B: SSC1 Transmit Clock */
--#define AT91_PA19_TPK3                (1 << 19)       /* A: Trace Packet Port 3 */
--#define AT91_PA19_TD1         (1 << 19)       /* B: SSC1 Transmit Data */
--#define AT91_PA20_TPK4                (1 << 20)       /* A: Trace Packet Port 4 */
--#define AT91_PA20_RD1         (1 << 20)       /* B: SSC1 Receive Data */
--#define AT91_PA21_TPK5                (1 << 21)       /* A: Trace Packet Port 5 */
--#define AT91_PA21_RK1         (1 << 21)       /* B: SSC1 Receive Clock */
--#define AT91_PA22_TPK6                (1 << 22)       /* A: Trace Packet Port 6 */
--#define AT91_PA22_RF1         (1 << 22)       /* B: SSC1 Receive Frame Sync */
--#define AT91_PA23_TPK7                (1 << 23)       /* A: Trace Packet Port 7 */
--#define AT91_PA23_RTS0                (1 << 23)       /* B: USART0 Ready To Send */
--#define AT91_PA24_TPK8                (1 << 24)       /* A: Trace Packet Port 8 */
--#define AT91_PA24_SPI1_NPCS1  (1 << 24)       /* B: SPI1 Peripheral Chip Select 1 */
--#define AT91_PA25_TPK9                (1 << 25)       /* A: Trace Packet Port 9 */
--#define AT91_PA25_SPI1_NPCS2  (1 << 25)       /* B: SPI1 Peripheral Chip Select 2 */
--#define AT91_PA26_TPK10               (1 << 26)       /* A: Trace Packet Port 10 */
--#define AT91_PA26_SPI1_NPCS3  (1 << 26)       /* B: SPI1 Peripheral Chip Select 3 */
--#define AT91_PA27_TPK11               (1 << 27)       /* A: Trace Packet Port 11 */
--#define AT91_PA27_SPI0_NPCS1  (1 << 27)       /* B: SPI0 Peripheral Chip Select 1 */
--#define AT91_PA28_TPK12               (1 << 28)       /* A: Trace Packet Port 12 */
--#define AT91_PA28_SPI0_NPCS2  (1 << 28)       /* B: SPI0 Peripheral Chip Select 2 */
--#define AT91_PA29_TPK13               (1 << 29)       /* A: Trace Packet Port 13 */
--#define AT91_PA29_SPI0_NPCS3  (1 << 29)       /* B: SPI0 Peripheral Chip Select 3 */
--#define AT91_PA30_TPK14               (1 << 30)       /* A: Trace Packet Port 14 */
--#define AT91_PA30_A23         (1 << 30)       /* B: Address Bus bit 23 */
--#define AT91_PA31_TPK15               (1 << 31)       /* A: Trace Packet Port 15 */
--#define AT91_PA31_A24         (1 << 31)       /* B: Address Bus bit 24 */
--
--#define AT91_PB0_LCDVSYNC     (1 <<  0)       /* A: LCD Vertical Synchronization */
--#define AT91_PB1_LCDHSYNC     (1 <<  1)       /* A: LCD Horizontal Synchronization */
--#define AT91_PB2_LCDDOTCK     (1 <<  2)       /* A: LCD Dot Clock */
--#define AT91_PB2_PCK0         (1 <<  2)       /* B: PMC Programmable clock Output 0 */
--#define AT91_PB3_LCDDEN               (1 <<  3)       /* A: LCD Data Enable */
--#define AT91_PB4_LCDCC                (1 <<  4)       /* A: LCD Contrast Control */
--#define AT91_PB4_LCDD2                (1 <<  4)       /* B: LCD Data Bus Bit 2 */
--#define AT91_PB5_LCDD0                (1 <<  5)       /* A: LCD Data Bus Bit 0 */
--#define AT91_PB5_LCDD3                (1 <<  5)       /* B: LCD Data Bus Bit 3 */
--#define AT91_PB6_LCDD1                (1 <<  6)       /* A: LCD Data Bus Bit 1 */
--#define AT91_PB6_LCDD4                (1 <<  6)       /* B: LCD Data Bus Bit 4 */
--#define AT91_PB7_LCDD2                (1 <<  7)       /* A: LCD Data Bus Bit 2 */
--#define AT91_PB7_LCDD5                (1 <<  7)       /* B: LCD Data Bus Bit 5 */
--#define AT91_PB8_LCDD3                (1 <<  8)       /* A: LCD Data Bus Bit 3 */
--#define AT91_PB8_LCDD6                (1 <<  8)       /* B: LCD Data Bus Bit 6 */
--#define AT91_PB9_LCDD4                (1 <<  9)       /* A: LCD Data Bus Bit 4 */
--#define AT91_PB9_LCDD7                (1 <<  9)       /* B: LCD Data Bus Bit 7 */
--#define AT91_PB10_LCDD5               (1 << 10)       /* A: LCD Data Bus Bit 5 */
--#define AT91_PB10_LCDD10      (1 << 10)       /* B: LCD Data Bus Bit 10 */
--#define AT91_PB11_LCDD6               (1 << 11)       /* A: LCD Data Bus Bit 6 */
--#define AT91_PB11_LCDD11      (1 << 11)       /* B: LCD Data Bus Bit 11 */
--#define AT91_PB12_LCDD7               (1 << 12)       /* A: LCD Data Bus Bit 7 */
--#define AT91_PB12_LCDD12      (1 << 12)       /* B: LCD Data Bus Bit 12 */
--#define AT91_PB13_LCDD8               (1 << 13)       /* A: LCD Data Bus Bit 8 */
--#define AT91_PB13_LCDD13      (1 << 13)       /* B: LCD Data Bus Bit 13 */
--#define AT91_PB14_LCDD9               (1 << 14)       /* A: LCD Data Bus Bit 9 */
--#define AT91_PB14_LCDD14      (1 << 14)       /* B: LCD Data Bus Bit 14 */
--#define AT91_PB15_LCDD10      (1 << 15)       /* A: LCD Data Bus Bit 10 */
--#define AT91_PB15_LCDD15      (1 << 15)       /* B: LCD Data Bus Bit 15 */
--#define AT91_PB16_LCDD11      (1 << 16)       /* A: LCD Data Bus Bit 11 */
--#define AT91_PB16_LCDD19      (1 << 16)       /* B: LCD Data Bus Bit 19 */
--#define AT91_PB17_LCDD12      (1 << 17)       /* A: LCD Data Bus Bit 12 */
--#define AT91_PB17_LCDD20      (1 << 17)       /* B: LCD Data Bus Bit 20 */
--#define AT91_PB18_LCDD13      (1 << 18)       /* A: LCD Data Bus Bit 13 */
--#define AT91_PB18_LCDD21      (1 << 18)       /* B: LCD Data Bus Bit 21 */
--#define AT91_PB19_LCDD14      (1 << 19)       /* A: LCD Data Bus Bit 14 */
--#define AT91_PB19_LCDD22      (1 << 19)       /* B: LCD Data Bus Bit 22 */
--#define AT91_PB20_LCDD15      (1 << 20)       /* A: LCD Data Bus Bit 15 */
--#define AT91_PB20_LCDD23      (1 << 20)       /* B: LCD Data Bus Bit 23 */
--#define AT91_PB21_TF0         (1 << 21)       /* A: SSC0 Transmit Frame Sync */
--#define AT91_PB21_LCDD16      (1 << 21)       /* B: LCD Data Bus Bit 16 */
--#define AT91_PB22_TK0         (1 << 22)       /* A: SSC0 Transmit Clock */
--#define AT91_PB22_LCDD17      (1 << 22)       /* B: LCD Data Bus Bit 17 */
--#define AT91_PB23_TD0         (1 << 23)       /* A: SSC0 Transmit Data */
--#define AT91_PB23_LCDD18      (1 << 23)       /* B: LCD Data Bus Bit 18 */
--#define AT91_PB24_RD0         (1 << 24)       /* A: SSC0 Receive Data */
--#define AT91_PB24_LCDD19      (1 << 24)       /* B: LCD Data Bus Bit 19 */
--#define AT91_PB25_RK0         (1 << 25)       /* A: SSC0 Receive Clock */
--#define AT91_PB25_LCDD20      (1 << 25)       /* B: LCD Data Bus Bit 20 */
--#define AT91_PB26_RF0         (1 << 26)       /* A: SSC0 Receive Frame Sync */
--#define AT91_PB26_LCDD21      (1 << 26)       /* B: LCD Data Bus Bit 21 */
--#define AT91_PB27_SPI1_NPCS1  (1 << 27)       /* A: SPI1 Peripheral Chip Select 1 */
--#define AT91_PB27_LCDD22      (1 << 27)       /* B: LCD Data Bus Bit 22 */
--#define AT91_PB28_SPI1_NPCS0  (1 << 28)       /* A: SPI1 Peripheral Chip Select 0 */
--#define AT91_PB28_LCDD23      (1 << 28)       /* B: LCD Data Bus Bit 23 */
--#define AT91_PB29_SPI1_SPCK   (1 << 29)       /* A: SPI1 Serial Clock */
--#define AT91_PB29_IRQ2                (1 << 29)       /* B: Interrupt input 2 */
--#define AT91_PB30_SPI1_MISO   (1 << 30)       /* A: SPI1 Master In Slave */
--#define AT91_PB30_IRQ1                (1 << 30)       /* B: Interrupt input 1 */
--#define AT91_PB31_SPI1_MOSI   (1 << 31)       /* A: SPI1 Master Out Slave */
--#define AT91_PB31_PCK2                (1 << 31)       /* B: PMC Programmable clock Output 2 */
--
--#define AT91_PC0_SMOE         (1 << 0)        /* A: SmartMedia Output Enable */
--#define AT91_PC0_NCS6         (1 << 0)        /* B: Chip Select 6 */
--#define AT91_PC1_SMWE         (1 << 1)        /* A: SmartMedia Write Enable */
--#define AT91_PC1_NCS7         (1 << 1)        /* B: Chip Select 7 */
--#define AT91_PC2_NWAIT                (1 << 2)        /* A: NWAIT */
--#define AT91_PC2_IRQ0         (1 << 2)        /* B: Interrupt input 0 */
--#define AT91_PC3_A25_CFRNW    (1 << 3)        /* A: Address Bus[25] / Compact Flash Read Not Write */
--#define AT91_PC4_NCS4_CFCS0   (1 << 4)        /* A: Chip Select 4 / CompactFlash Chip Select 0 */
--#define AT91_PC5_NCS5_CFCS1   (1 << 5)        /* A: Chip Select 5 / CompactFlash Chip Select 1 */
--#define AT91_PC6_CFCE1                (1 << 6)        /* A: CompactFlash Chip Enable 1 */
--#define AT91_PC7_CFCE2                (1 << 7)        /* A: CompactFlash Chip Enable 2 */
--#define AT91_PC8_TXD0         (1 << 8)        /* A: USART0 Transmit Data */
--#define AT91_PC8_PCK2         (1 << 8)        /* B: PMC Programmable clock Output 2 */
--#define AT91_PC9_RXD0         (1 << 9)        /* A: USART0 Receive Data */
--#define AT91_PC9_PCK3         (1 << 9)        /* B: PMC Programmable clock Output 3 */
--#define AT91_PC10_RTS0                (1 << 10)       /* A: USART0 Ready To Send */
--#define AT91_PC10_SCK0                (1 << 10)       /* B: USART0 Serial Clock */
--#define AT91_PC11_CTS0                (1 << 11)       /* A: USART0 Clear To Send */
--#define AT91_PC11_FIQ         (1 << 11)       /* B: AIC Fast Interrupt Input */
--#define AT91_PC12_TXD1                (1 << 12)       /* A: USART1 Transmit Data */
--#define AT91_PC12_NCS6                (1 << 12)       /* B: Chip Select 6 */
--#define AT91_PC13_RXD1                (1 << 13)       /* A: USART1 Receive Data */
--#define AT91_PC13_NCS7                (1 << 13)       /* B: Chip Select 7 */
--#define AT91_PC14_TXD2                (1 << 14)       /* A: USART2 Transmit Data */
--#define AT91_PC14_SPI1_NPCS2  (1 << 14)       /* B: SPI1 Peripheral Chip Select 2 */
--#define AT91_PC15_RXD2                (1 << 15)       /* A: USART2 Receive Data */
--#define AT91_PC15_SPI1_NPCS3  (1 << 15)       /* B: SPI1 Peripheral Chip Select 3 */
--#define AT91_PC16_D16         (1 << 16)       /* A: Data Bus [16] */
--#define AT91_PC16_TCLK0               (1 << 16)       /* B: Timer Counter 0 external clock input */
--#define AT91_PC17_D17         (1 << 17)       /* A: Data Bus [17] */
--#define AT91_PC17_TCLK1               (1 << 17)       /* B: Timer Counter 1 external clock input */
--#define AT91_PC18_D18         (1 << 18)       /* A: Data Bus [18] */
--#define AT91_PC18_TCLK2               (1 << 18)       /* B: Timer Counter 2 external clock input */
--#define AT91_PC19_D19         (1 << 19)       /* A: Data Bus [19] */
--#define AT91_PC19_TIOA0               (1 << 19)       /* B: Timer Counter 0 Multipurpose Timer I/O Pin A */
--#define AT91_PC20_D20         (1 << 20)       /* A: Data Bus [20] */
--#define AT91_PC20_TIOB0               (1 << 20)       /* B: Timer Counter 0 Multipurpose Timer I/O Pin B */
--#define AT91_PC21_D21         (1 << 21)       /* A: Data Bus [21] */
--#define AT91_PC21_TIOA1               (1 << 21)       /* B: Timer Counter 1 Multipurpose Timer I/O Pin A */
--#define AT91_PC22_D22         (1 << 22)       /* A: Data Bus [22] */
--#define AT91_PC22_TIOB1               (1 << 22)       /* B: Timer Counter 1 Multipurpose Timer I/O Pin B */
--#define AT91_PC23_D23         (1 << 23)       /* A: Data Bus [23] */
--#define AT91_PC23_TIOA2               (1 << 23)       /* B: Timer Counter 2 Multipurpose Timer I/O Pin A */
--#define AT91_PC24_D24         (1 << 24)       /* A: Data Bus [24] */
--#define AT91_PC24_TIOB2               (1 << 24)       /* B: Timer Counter 2 Multipurpose Timer I/O Pin B */
--#define AT91_PC25_D25         (1 << 25)       /* A: Data Bus [25] */
--#define AT91_PC25_TF2         (1 << 25)       /* B: SSC2 Transmit Frame Sync */
--#define AT91_PC26_D26         (1 << 26)       /* A: Data Bus [26] */
--#define AT91_PC26_TK2         (1 << 26)       /* B: SSC2 Transmit Clock */
--#define AT91_PC27_D27         (1 << 27)       /* A: Data Bus [27] */
--#define AT91_PC27_TD2         (1 << 27)       /* B: SSC2 Transmit Data */
--#define AT91_PC28_D28         (1 << 28)       /* A: Data Bus [28] */
--#define AT91_PC28_RD2         (1 << 28)       /* B: SSC2 Receive Data */
--#define AT91_PC29_D29         (1 << 29)       /* A: Data Bus [29] */
--#define AT91_PC29_RK2         (1 << 29)       /* B: SSC2 Receive Clock */
--#define AT91_PC30_D30         (1 << 30)       /* A: Data Bus [30] */
--#define AT91_PC30_RF2         (1 << 30)       /* B: SSC2 Receive Frame Sync */
--#define AT91_PC31_D31         (1 << 31)       /* A: Data Bus [31] */
--#define AT91_PC31_PCK1                (1 << 31)       /* B: PMC Programmable clock Output 1 */
--#endif
--
- #endif
-Index: linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9263.h
-===================================================================
---- linux-2.6.21.7.orig/include/asm-arm/arch-at91/at91sam9263.h
-+++ linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9263.h
-@@ -119,13 +119,5 @@
- #define AT91SAM9263_DMAC_BASE 0x00800000      /* DMA Controller */
- #define AT91SAM9263_UHP_BASE  0x00a00000      /* USB Host controller */
--#if 0
--/*
-- * PIO pin definitions (peripheral A/B multiplexing).
-- */
--
--// TODO: Add
--
--#endif
- #endif
-Index: linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9rl.h
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9rl.h
-@@ -0,0 +1,110 @@
-+/*
-+ * include/asm-arm/arch-at91/at91sam9260.h
-+ *
-+ *  Copyright (C) 2007 Atmel Corporation
-+ *
-+ * Common definitions.
-+ * Based on AT91SAM9RL datasheet revision A. (Preliminary)
-+ *
-+ * 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 AT91SAM9RL_H
-+#define AT91SAM9RL_H
-+
-+/*
-+ * Peripheral identifiers/interrupts.
-+ */
-+#define AT91_ID_FIQ           0       /* Advanced Interrupt Controller (FIQ) */
-+#define AT91_ID_SYS           1       /* System Controller */
-+#define AT91SAM9RL_ID_PIOA    2       /* Parallel IO Controller A */
-+#define AT91SAM9RL_ID_PIOB    3       /* Parallel IO Controller B */
-+#define AT91SAM9RL_ID_PIOC    4       /* Parallel IO Controller C */
-+#define AT91SAM9RL_ID_PIOD    5       /* Parallel IO Controller D */
-+#define AT91SAM9RL_ID_US0     6       /* USART 0 */
-+#define AT91SAM9RL_ID_US1     7       /* USART 1 */
-+#define AT91SAM9RL_ID_US2     8       /* USART 2 */
-+#define AT91SAM9RL_ID_US3     9       /* USART 3 */
-+#define AT91SAM9RL_ID_MCI     10      /* Multimedia Card Interface */
-+#define AT91SAM9RL_ID_TWI0    11      /* TWI 0 */
-+#define AT91SAM9RL_ID_TWI1    12      /* TWI 1 */
-+#define AT91SAM9RL_ID_SPI     13      /* Serial Peripheral Interface */
-+#define AT91SAM9RL_ID_SSC0    14      /* Serial Synchronous Controller 0 */
-+#define AT91SAM9RL_ID_SSC1    15      /* Serial Synchronous Controller 1 */
-+#define AT91SAM9RL_ID_TC0     16      /* Timer Counter 0 */
-+#define AT91SAM9RL_ID_TC1     17      /* Timer Counter 1 */
-+#define AT91SAM9RL_ID_TC2     18      /* Timer Counter 2 */
-+#define AT91SAM9RL_ID_PWMC    19      /* Pulse Width Modulation Controller */
-+#define AT91SAM9RL_ID_TSC     20      /* Touch Screen Controller */
-+#define AT91SAM9RL_ID_DMA     21      /* DMA Controller */
-+#define AT91SAM9RL_ID_UDPHS   22      /* USB Device HS */
-+#define AT91SAM9RL_ID_LCDC    23      /* LCD Controller */
-+#define AT91SAM9RL_ID_AC97C   24      /* AC97 Controller */
-+#define AT91SAM9RL_ID_IRQ0    31      /* Advanced Interrupt Controller (IRQ0) */
-+
-+
-+/*
-+ * User Peripheral physical base addresses.
-+ */
-+#define AT91SAM9RL_BASE_TCB0  0xfffa0000
-+#define AT91SAM9RL_BASE_TC0   0xfffa0000
-+#define AT91SAM9RL_BASE_TC1   0xfffa0040
-+#define AT91SAM9RL_BASE_TC2   0xfffa0080
-+#define AT91SAM9RL_BASE_MCI   0xfffa4000
-+#define AT91SAM9RL_BASE_TWI0  0xfffa8000
-+#define AT91SAM9RL_BASE_TWI1  0xfffac000
-+#define AT91SAM9RL_BASE_US0   0xfffb0000
-+#define AT91SAM9RL_BASE_US1   0xfffb4000
-+#define AT91SAM9RL_BASE_US2   0xfffb8000
-+#define AT91SAM9RL_BASE_US3   0xfffbc000
-+#define AT91SAM9RL_BASE_SSC0  0xfffc0000
-+#define AT91SAM9RL_BASE_SSC1  0xfffc4000
-+#define AT91SAM9RL_BASE_PWMC  0xfffc8000
-+#define AT91SAM9RL_BASE_SPI   0xfffcc000
-+#define AT91SAM9RL_BASE_TSC   0xfffd0000
-+#define AT91SAM9RL_BASE_UDPHS 0xfffd4000
-+#define AT91SAM9RL_BASE_AC97C 0xfffd8000
-+#define AT91_BASE_SYS         0xffffc000
-+
-+
-+/*
-+ * System Peripherals (offset from AT91_BASE_SYS)
-+ */
-+#define AT91_DMA      (0xffffe600 - AT91_BASE_SYS)
-+#define AT91_ECC      (0xffffe800 - AT91_BASE_SYS)
-+#define AT91_SDRAMC   (0xffffea00 - AT91_BASE_SYS)
-+#define AT91_SMC      (0xffffec00 - AT91_BASE_SYS)
-+#define AT91_MATRIX   (0xffffee00 - AT91_BASE_SYS)
-+#define AT91_CCFG     (0xffffef10 - AT91_BASE_SYS)
-+#define AT91_AIC      (0xfffff000 - AT91_BASE_SYS)
-+#define AT91_DBGU     (0xfffff200 - AT91_BASE_SYS)
-+#define AT91_PIOA     (0xfffff400 - AT91_BASE_SYS)
-+#define AT91_PIOB     (0xfffff600 - AT91_BASE_SYS)
-+#define AT91_PIOC     (0xfffff800 - AT91_BASE_SYS)
-+#define AT91_PIOD     (0xfffffa00 - AT91_BASE_SYS)
-+#define AT91_PMC      (0xfffffc00 - AT91_BASE_SYS)
-+#define AT91_RSTC     (0xfffffd00 - AT91_BASE_SYS)
-+#define AT91_SHDWC    (0xfffffd10 - AT91_BASE_SYS)
-+#define AT91_RTT      (0xfffffd20 - AT91_BASE_SYS)
-+#define AT91_PIT      (0xfffffd30 - AT91_BASE_SYS)
-+#define AT91_WDT      (0xfffffd40 - AT91_BASE_SYS)
-+#define AT91_SCKCR    (0xfffffd50 - AT91_BASE_SYS)
-+#define AT91_GPBR     (0xfffffd60 - AT91_BASE_SYS)
-+#define AT91_RTC      (0xfffffe00 - AT91_BASE_SYS)
-+
-+
-+/*
-+ * Internal Memory.
-+ */
-+#define AT91SAM9RL_SRAM_BASE  0x00300000      /* Internal SRAM base address */
-+#define AT91SAM9RL_SRAM_SIZE  SZ_16K          /* Internal SRAM size (16Kb) */
-+
-+#define AT91SAM9RL_ROM_BASE   0x00400000      /* Internal ROM base address */
-+#define AT91SAM9RL_ROM_SIZE   (2 * SZ_16K)    /* Internal ROM size (32Kb) */
-+
-+#define AT91SAM9RL_LCDC_BASE  0x00500000      /* LCD Controller */
-+#define AT91SAM9RL_UDPHS_BASE 0x00600000      /* USB Device HS controller */
-+
-+#endif
-Index: linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9rl_matrix.h
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/include/asm-arm/arch-at91/at91sam9rl_matrix.h
-@@ -0,0 +1,96 @@
-+/*
-+ * include/asm-arm/arch-at91/at91sam9rl_matrix.h
-+ *
-+ *  Copyright (C) 2007 Atmel Corporation
-+ *
-+ * Memory Controllers (MATRIX, EBI) - System peripherals registers.
-+ * Based on AT91SAM9RL datasheet revision A. (Preliminary)
-+ *
-+ * 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 AT91SAM9RL_MATRIX_H
-+#define AT91SAM9RL_MATRIX_H
-+
-+#define AT91_MATRIX_MCFG0     (AT91_MATRIX + 0x00)    /* Master Configuration Register 0 */
-+#define AT91_MATRIX_MCFG1     (AT91_MATRIX + 0x04)    /* Master Configuration Register 1 */
-+#define AT91_MATRIX_MCFG2     (AT91_MATRIX + 0x08)    /* Master Configuration Register 2 */
-+#define AT91_MATRIX_MCFG3     (AT91_MATRIX + 0x0C)    /* Master Configuration Register 3 */
-+#define AT91_MATRIX_MCFG4     (AT91_MATRIX + 0x10)    /* Master Configuration Register 4 */
-+#define AT91_MATRIX_MCFG5     (AT91_MATRIX + 0x14)    /* Master Configuration Register 5 */
-+#define               AT91_MATRIX_ULBT        (7 << 0)        /* Undefined Length Burst Type */
-+#define                       AT91_MATRIX_ULBT_INFINITE       (0 << 0)
-+#define                       AT91_MATRIX_ULBT_SINGLE         (1 << 0)
-+#define                       AT91_MATRIX_ULBT_FOUR           (2 << 0)
-+#define                       AT91_MATRIX_ULBT_EIGHT          (3 << 0)
-+#define                       AT91_MATRIX_ULBT_SIXTEEN        (4 << 0)
-+
-+#define AT91_MATRIX_SCFG0     (AT91_MATRIX + 0x40)    /* Slave Configuration Register 0 */
-+#define AT91_MATRIX_SCFG1     (AT91_MATRIX + 0x44)    /* Slave Configuration Register 1 */
-+#define AT91_MATRIX_SCFG2     (AT91_MATRIX + 0x48)    /* Slave Configuration Register 2 */
-+#define AT91_MATRIX_SCFG3     (AT91_MATRIX + 0x4C)    /* Slave Configuration Register 3 */
-+#define AT91_MATRIX_SCFG4     (AT91_MATRIX + 0x50)    /* Slave Configuration Register 4 */
-+#define AT91_MATRIX_SCFG5     (AT91_MATRIX + 0x54)    /* Slave Configuration Register 5 */
-+#define               AT91_MATRIX_SLOT_CYCLE          (0xff << 0)     /* Maximum Number of Allowed Cycles for a Burst */
-+#define               AT91_MATRIX_DEFMSTR_TYPE        (3    << 16)    /* Default Master Type */
-+#define                       AT91_MATRIX_DEFMSTR_TYPE_NONE   (0 << 16)
-+#define                       AT91_MATRIX_DEFMSTR_TYPE_LAST   (1 << 16)
-+#define                       AT91_MATRIX_DEFMSTR_TYPE_FIXED  (2 << 16)
-+#define               AT91_MATRIX_FIXED_DEFMSTR       (7    << 18)    /* Fixed Index of Default Master */
-+#define               AT91_MATRIX_ARBT                (3    << 24)    /* Arbitration Type */
-+#define                       AT91_MATRIX_ARBT_ROUND_ROBIN    (0 << 24)
-+#define                       AT91_MATRIX_ARBT_FIXED_PRIORITY (1 << 24)
-+
-+#define AT91_MATRIX_PRAS0     (AT91_MATRIX + 0x80)    /* Priority Register A for Slave 0 */
-+#define AT91_MATRIX_PRAS1     (AT91_MATRIX + 0x88)    /* Priority Register A for Slave 1 */
-+#define AT91_MATRIX_PRAS2     (AT91_MATRIX + 0x90)    /* Priority Register A for Slave 2 */
-+#define AT91_MATRIX_PRAS3     (AT91_MATRIX + 0x98)    /* Priority Register A for Slave 3 */
-+#define AT91_MATRIX_PRAS4     (AT91_MATRIX + 0xA0)    /* Priority Register A for Slave 4 */
-+#define AT91_MATRIX_PRAS5     (AT91_MATRIX + 0xA8)    /* Priority Register A for Slave 5 */
-+#define               AT91_MATRIX_M0PR                (3 << 0)        /* Master 0 Priority */
-+#define               AT91_MATRIX_M1PR                (3 << 4)        /* Master 1 Priority */
-+#define               AT91_MATRIX_M2PR                (3 << 8)        /* Master 2 Priority */
-+#define               AT91_MATRIX_M3PR                (3 << 12)       /* Master 3 Priority */
-+#define               AT91_MATRIX_M4PR                (3 << 16)       /* Master 4 Priority */
-+#define               AT91_MATRIX_M5PR                (3 << 20)       /* Master 5 Priority */
-+
-+#define AT91_MATRIX_MRCR      (AT91_MATRIX + 0x100)   /* Master Remap Control Register */
-+#define               AT91_MATRIX_RCB0                (1 << 0)        /* Remap Command for AHB Master 0 (ARM926EJ-S Instruction Master) */
-+#define               AT91_MATRIX_RCB1                (1 << 1)        /* Remap Command for AHB Master 1 (ARM926EJ-S Data Master) */
-+#define               AT91_MATRIX_RCB2                (1 << 2)
-+#define               AT91_MATRIX_RCB3                (1 << 3)
-+#define               AT91_MATRIX_RCB4                (1 << 4)
-+#define               AT91_MATRIX_RCB5                (1 << 5)
-+
-+#define AT91_MATRIX_TCMR      (AT91_MATRIX + 0x114)   /* TCM Configuration Register */
-+#define               AT91_MATRIX_ITCM_SIZE           (0xf << 0)      /* Size of ITCM enabled memory block */
-+#define                       AT91_MATRIX_ITCM_0              (0 << 0)
-+#define                       AT91_MATRIX_ITCM_16             (5 << 0)
-+#define                       AT91_MATRIX_ITCM_32             (6 << 0)
-+#define               AT91_MATRIX_DTCM_SIZE           (0xf << 4)      /* Size of DTCM enabled memory block */
-+#define                       AT91_MATRIX_DTCM_0              (0 << 4)
-+#define                       AT91_MATRIX_DTCM_16             (5 << 4)
-+#define                       AT91_MATRIX_DTCM_32             (6 << 4)
-+
-+#define AT91_MATRIX_EBICSA    (AT91_MATRIX + 0x120)   /* EBI0 Chip Select Assignment Register */
-+#define               AT91_MATRIX_CS1A                (1 << 1)        /* Chip Select 1 Assignment */
-+#define                       AT91_MATRIX_CS1A_SMC            (0 << 1)
-+#define                       AT91_MATRIX_CS1A_SDRAMC         (1 << 1)
-+#define               AT91_MATRIX_CS3A                (1 << 3)        /* Chip Select 3 Assignment */
-+#define                       AT91_MATRIX_CS3A_SMC            (0 << 3)
-+#define                       AT91_MATRIX_CS3A_SMC_SMARTMEDIA (1 << 3)
-+#define               AT91_MATRIX_CS4A                (1 << 4)        /* Chip Select 4 Assignment */
-+#define                       AT91_MATRIX_CS4A_SMC            (0 << 4)
-+#define                       AT91_MATRIX_CS4A_SMC_CF1        (1 << 4)
-+#define               AT91_MATRIX_CS5A                (1 << 5)        /* Chip Select 5 Assignment */
-+#define                       AT91_MATRIX_CS5A_SMC            (0 << 5)
-+#define                       AT91_MATRIX_CS5A_SMC_CF2        (1 << 5)
-+#define               AT91_MATRIX_DBPUC               (1 << 8)        /* Data Bus Pull-up Configuration */
-+#define               AT91_MATRIX_VDDIOMSEL           (1 << 16)       /* Memory voltage selection */
-+#define                       AT91_MATRIX_VDDIOMSEL_1_8V      (0 << 16)
-+#define                       AT91_MATRIX_VDDIOMSEL_3_3V      (1 << 16)
-+
-+
-+#endif
-Index: linux-2.6.21.7/include/asm-arm/arch-at91/board.h
-===================================================================
---- linux-2.6.21.7.orig/include/asm-arm/arch-at91/board.h
-+++ linux-2.6.21.7/include/asm-arm/arch-at91/board.h
-@@ -62,7 +62,7 @@ struct at91_mmc_data {
- };
- extern void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data);
-- /* Ethernet */
-+ /* Ethernet (EMAC & MACB) */
- struct at91_eth_data {
-       u8              phy_irq_pin;    /* PHY IRQ */
-       u8              is_rmii;        /* using RMII interface? */
-@@ -114,9 +114,31 @@ struct atmel_uart_data {
- };
- extern void __init at91_add_device_serial(void);
-+ /* LCD Controller */
-+struct atmel_lcdfb_info;
-+extern void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data);
-+
-+ /* AC97 */
-+struct atmel_ac97_data {
-+      u8              reset_pin;      /* reset */
-+};
-+extern void __init at91_add_device_ac97(struct atmel_ac97_data *data);
-+
-+ /* ISI */
-+extern void __init at91_add_device_isi(void);
-+
-  /* LEDs */
- extern u8 at91_leds_cpu;
- extern u8 at91_leds_timer;
- extern void __init at91_init_leds(u8 cpu_led, u8 timer_led);
-+struct at91_gpio_led {
-+      u8              index;          /* index of LED */
-+      char*           name;           /* name of LED */
-+      u8              gpio;           /* AT91_PIN_xx */
-+      u8              flags;          /* 1=active-high */
-+      char*           trigger;        /* default trigger */
-+};
-+extern void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr);
-+
- #endif
-Index: linux-2.6.21.7/include/asm-arm/arch-at91/cpu.h
-===================================================================
---- linux-2.6.21.7.orig/include/asm-arm/arch-at91/cpu.h
-+++ linux-2.6.21.7/include/asm-arm/arch-at91/cpu.h
-@@ -26,6 +26,8 @@
- #define ARCH_ID_AT91SAM9XE256 0x329a93a0
- #define ARCH_ID_AT91SAM9XE512 0x329aa3a0
-+#define ARCH_ID_AT91SAM9RL64  0x019b03a0
-+
- static inline unsigned long at91_cpu_identify(void)
- {
-       return (at91_sys_read(AT91_DBGU_CIDR) & ~AT91_CIDR_VERSION);
-@@ -68,4 +70,10 @@ static inline unsigned long at91_arch_id
- #define cpu_is_at91sam9263()  (0)
- #endif
-+#ifdef CONFIG_ARCH_AT91SAM9RL
-+#define cpu_is_at91sam9rl()   (at91_cpu_identify() == ARCH_ID_AT91SAM9RL64)
-+#else
-+#define cpu_is_at91sam9rl()   (0)
-+#endif
-+
- #endif
-Index: linux-2.6.21.7/include/asm-arm/arch-at91/hardware.h
-===================================================================
---- linux-2.6.21.7.orig/include/asm-arm/arch-at91/hardware.h
-+++ linux-2.6.21.7/include/asm-arm/arch-at91/hardware.h
-@@ -24,6 +24,8 @@
- #include <asm/arch/at91sam9261.h>
- #elif defined(CONFIG_ARCH_AT91SAM9263)
- #include <asm/arch/at91sam9263.h>
-+#elif defined(CONFIG_ARCH_AT91SAM9RL)
-+#include <asm/arch/at91sam9rl.h>
- #else
- #error "Unsupported AT91 processor"
- #endif
-@@ -69,22 +71,5 @@
- /* Clocks */
- #define AT91_SLOW_CLOCK               32768           /* slow clock */
--#ifndef __ASSEMBLY__
--#include <asm/io.h>
--
--static inline unsigned int at91_sys_read(unsigned int reg_offset)
--{
--      void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS;
--
--      return __raw_readl(addr + reg_offset);
--}
--
--static inline void at91_sys_write(unsigned int reg_offset, unsigned long value)
--{
--      void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS;
--
--      __raw_writel(value, addr + reg_offset);
--}
--#endif
- #endif
-Index: linux-2.6.21.7/include/asm-arm/arch-at91/ics1523.h
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/include/asm-arm/arch-at91/ics1523.h
-@@ -0,0 +1,154 @@
-+//*----------------------------------------------------------------------------
-+//*         ATMEL Microcontroller Software Support  -  ROUSSET  -
-+//*----------------------------------------------------------------------------
-+//* The software is delivered "AS IS" without warranty or condition of any
-+//* kind, either express, implied or statutory. This includes without
-+//* limitation any warranty or condition with respect to merchantability or
-+//* fitness for any particular purpose, or against the infringements of
-+//* intellectual property rights of others.
-+//*----------------------------------------------------------------------------
-+//* File Name           : ics1523.h
-+//* Object              : Clock Generator Prototyping File.
-+//*
-+//* 1.0 08/28/02 ED     : Creation
-+//* 1.2 13/01/03 FB           : Update on lib V3
-+//*----------------------------------------------------------------------------
-+
-+#ifndef ics1523_h
-+#define ics1523_h
-+
-+/*-------------------------------------------*/
-+/* ICS1523 TWI Serial Clock Definition       */
-+/*-------------------------------------------*/
-+
-+#define               ICS_MIN_CLOCK           100             /* Min Frequency Access Clock KHz */
-+#define               ICS_MAX_CLOCK           400             /* Max Frequency Access Clock KHz */
-+#define               ICS_TRANSFER_RATE       ICS_MAX_CLOCK   /* Transfer speed to apply */
-+
-+#define               ICS_WRITE_CLK_PNB       30              /* TWCK Clock Periods required to write */
-+#define               ICS_READ_CLK_PNB        40              /* TWCK Clock Periods required to read */
-+
-+/*-------------------------------------------*/
-+/* ICS1523 Write Operation Definition        */
-+/*-------------------------------------------*/
-+
-+#define               ICS1523_ACCESS_OK       0               /* OK */
-+#define               ICS1523_ACCESS_ERROR    -1              /* NOK */
-+
-+/*-------------------------------------------*/
-+/* ICS1523 Device Addresses Definition       */
-+/*-------------------------------------------*/
-+
-+#define               ICS_ADDR                0x26            /* Device Address */
-+
-+/*--------------------------------------------------*/
-+/* ICS1523 Registers Internal Addresses Definition  */
-+/*--------------------------------------------------*/
-+
-+#define               ICS_ICR                 0x0             /* Input Control Register */
-+#define               ICS_LCR                 0x1             /* Loop Control Register */
-+#define               ICS_FD0                 0x2             /* PLL FeedBack Divider LSBs */
-+#define               ICS_FD1                 0x3             /* PLL FeedBack Divider MSBs */
-+#define               ICS_DPAO                0x4             /* Dynamic Phase Aligner Offset */
-+#define               ICS_DPAC                0x5             /* Dynamic Phase Aligner Resolution */
-+#define               ICS_OE                  0x6             /* Output Enables Register */
-+#define               ICS_OD                  0x7             /* Osc Divider Register */
-+#define               ICS_SWRST               0x8             /* DPA & PLL Reset Register */
-+#define               ICS_VID                 0x10            /* Chip Version Register */
-+#define               ICS_RID                 0x11            /* Chip Revision Register */
-+#define               ICS_SR                  0x12            /* Status Register */
-+
-+/*------------------------------------------------------*/
-+/* ICS1523 Input Control Register Bits Definition       */
-+/*------------------------------------------------------*/
-+
-+#define               ICS_PDEN                0x1             /* Phase Detector Enable */
-+#define               ICS_PDPOL               0x2             /* Phase Detector Enable Polarity */
-+#define               ICS_REFPOL              0x4             /* External Reference Polarity */
-+#define               ICS_FBKPOL              0x8             /* External Feedback Polarity */
-+#define               ICS_FBKSEL              0x10            /* External Feedback Select */
-+#define               ICS_FUNCSEL             0x20            /* Function Out Select */
-+#define               ICS_ENPLS               0x40            /* Enable PLL Lock/Ref Status Output */
-+#define               ICS_ENDLS               0x80            /* Enable DPA Lock/Ref Status Output */
-+
-+/*-----------------------------------------------------*/
-+/* ICS1523 Loop Control Register Bits Definition       */
-+/*-----------------------------------------------------*/
-+
-+#define               ICS_PFD                 0x7             /* Phase Detector Gain */
-+#define               ICS_PSD                 0x30            /* Post-Scaler Divider */
-+
-+/*----------------------------------------------------*/
-+/* ICS1523 PLL FeedBack Divider LSBs Definition       */
-+/*----------------------------------------------------*/
-+
-+#define               ICS_FBDL                0xFF            /* PLL FeedBack Divider LSBs */
-+
-+/*----------------------------------------------------*/
-+/* ICS1523 PLL FeedBack Divider MSBs Definition       */
-+/*----------------------------------------------------*/
-+
-+#define               ICS_FBDM                0xF             /* PLL FeedBack Divider MSBs */
-+
-+/*------------------------------------------------------------*/
-+/* ICS1523 Dynamic Phase Aligner Offset Bits Definition       */
-+/*------------------------------------------------------------*/
-+
-+#define               ICS_DPAOS               0x2F            /* Dynamic Phase Aligner Offset */
-+#define               ICS_FILSEL              0x80            /* Loop Filter Select */
-+
-+/*----------------------------------------------------------------*/
-+/* ICS1523 Dynamic Phase Aligner Resolution Bits Definition       */
-+/*----------------------------------------------------------------*/
-+
-+#define               ICS_DPARES              0x3             /* Dynamic Phase Aligner Resolution */
-+#define               ICS_MMREV               0xFC            /* Metal Mask Revision Number */
-+
-+/*-------------------------------------------------------*/
-+/* ICS1523 Output Enables Register Bits Definition       */
-+/*-------------------------------------------------------*/
-+
-+#define               ICS_OEPCK               0x1             /* Output Enable for PECL PCLK Outputs */
-+#define               ICS_OETCK               0x2             /* Output Enable for STTL CLK Output */
-+#define               ICS_OEP2                0x4             /* Output Enable for PECL CLK/2 Outputs */
-+#define               ICS_OET2                0x8             /* Output Enable for STTL CLK/2 Output */
-+#define               ICS_OEF                 0x10            /* Output Enable for STTL FUNC Output */
-+#define               ICS_CLK2INV             0x20            /* CLK/2 Invert */
-+#define               ICS_OSCL                0xC0            /* SSTL Clock Scaler */
-+
-+/*----------------------------------------------------*/
-+/* ICS1523 Osc Divider Register Bits Definition       */
-+/*----------------------------------------------------*/
-+
-+#define               ICS_OSCDIV              0x7F            /* Oscillator Divider Modulus */
-+#define               ICS_INSEL               0x80            /* Input Select */
-+
-+/*---------------------------------------------------*/
-+/* ICS1523 DPA & PLL Reset Register Definition       */
-+/*---------------------------------------------------*/
-+
-+#define               ICS_DPAR                0x0A            /* DPA Reset Command */
-+#define               ICS_PLLR                0x50            /* PLL Reset Command */
-+
-+/*------------------------------------------------*/
-+/* ICS1523 Chip Version Register Definition       */
-+/*------------------------------------------------*/
-+
-+#define               ICS_CHIPV               0xFF            /* Chip Version */
-+
-+/*-------------------------------------------------*/
-+/* ICS1523 Chip Revision Register Definition       */
-+/*-------------------------------------------------*/
-+
-+#define               ICS_CHIPR               0xFF            /* Chip Revision */
-+
-+/*------------------------------------------*/
-+/* ICS1523 Status Register Definition       */
-+/*------------------------------------------*/
-+
-+#define               ICS_DPALOCK             0x1             /* DPA Lock Status */
-+#define               ICS_PLLLOCK             0x2             /* PLL Lock Status */
-+
-+int at91_ics1523_init(void);
-+
-+#endif /* ics1523_h */
-Index: linux-2.6.21.7/include/asm-arm/arch-at91/io.h
-===================================================================
---- linux-2.6.21.7.orig/include/asm-arm/arch-at91/io.h
-+++ linux-2.6.21.7/include/asm-arm/arch-at91/io.h
-@@ -29,4 +29,22 @@
- #define __mem_pci(a)          (a)
-+#ifndef __ASSEMBLY__
-+
-+static inline unsigned int at91_sys_read(unsigned int reg_offset)
-+{
-+      void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS;
-+
-+      return __raw_readl(addr + reg_offset);
-+}
-+
-+static inline void at91_sys_write(unsigned int reg_offset, unsigned long value)
-+{
-+      void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS;
-+
-+      __raw_writel(value, addr + reg_offset);
-+}
-+
-+#endif
-+
- #endif
-Index: linux-2.6.21.7/include/asm-arm/arch-at91/irqs.h
-===================================================================
---- linux-2.6.21.7.orig/include/asm-arm/arch-at91/irqs.h
-+++ linux-2.6.21.7/include/asm-arm/arch-at91/irqs.h
-@@ -21,6 +21,7 @@
- #ifndef __ASM_ARCH_IRQS_H
- #define __ASM_ARCH_IRQS_H
-+#include <asm/io.h>
- #include <asm/arch/at91_aic.h>
- #define NR_AIC_IRQS 32
-Index: linux-2.6.21.7/include/asm-arm/arch-at91/spi.h
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/include/asm-arm/arch-at91/spi.h
-@@ -0,0 +1,54 @@
-+/*
-+ * Serial Peripheral Interface (SPI) driver for the Atmel AT91RM9200
-+ *
-+ * (c) SAN People (Pty) Ltd
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License
-+ * as published by the Free Software Foundation; either version
-+ * 2 of the License, or (at your option) any later version.
-+ */
-+
-+#ifndef AT91_LEGACY_SPI_H
-+#define AT91_LEGACY_SPI_H
-+
-+#define SPI_MAJOR             153     /* registered device number */
-+
-+#define DEFAULT_SPI_CLK               6000000
-+
-+
-+/* Maximum number of buffers in a single SPI transfer.
-+ *  DataFlash uses maximum of 2
-+ *  spidev interface supports up to 8.
-+ */
-+#define MAX_SPI_TRANSFERS     8
-+#define NR_SPI_DEVICES                4       /* number of devices on SPI bus */
-+
-+/*
-+ * Describes the buffers for a SPI transfer.
-+ * A transmit & receive buffer must be specified for each transfer
-+ */
-+struct spi_transfer_list {
-+      void* tx[MAX_SPI_TRANSFERS];    /* transmit */
-+      int txlen[MAX_SPI_TRANSFERS];
-+      void* rx[MAX_SPI_TRANSFERS];    /* receive */
-+      int rxlen[MAX_SPI_TRANSFERS];
-+      int nr_transfers;               /* number of transfers */
-+      int curr;                       /* current transfer */
-+};
-+
-+struct spi_local {
-+      unsigned int pcs;               /* Peripheral Chip Select value */
-+
-+      struct spi_transfer_list *xfers;        /* current transfer list */
-+      dma_addr_t tx, rx;              /* DMA address for current transfer */
-+      dma_addr_t txnext, rxnext;      /* DMA address for next transfer */
-+};
-+
-+
-+/* Exported functions */
-+extern void spi_access_bus(short device);
-+extern void spi_release_bus(short device);
-+extern int spi_transfer(struct spi_transfer_list* list);
-+
-+#endif
-Index: linux-2.6.21.7/include/asm-arm/arch-at91/timex.h
-===================================================================
---- linux-2.6.21.7.orig/include/asm-arm/arch-at91/timex.h
-+++ linux-2.6.21.7/include/asm-arm/arch-at91/timex.h
-@@ -37,6 +37,11 @@
- #define AT91SAM9_MASTER_CLOCK 99959500
- #define CLOCK_TICK_RATE               (AT91SAM9_MASTER_CLOCK/16)
-+#elif defined(CONFIG_ARCH_AT91SAM9RL)
-+
-+#define AT91SAM9_MASTER_CLOCK 100000000
-+#define CLOCK_TICK_RATE               (AT91SAM9_MASTER_CLOCK/16)
-+
- #endif
- #endif
-Index: linux-2.6.21.7/include/asm-arm/arch-at91/uncompress.h
-===================================================================
---- linux-2.6.21.7.orig/include/asm-arm/arch-at91/uncompress.h
-+++ linux-2.6.21.7/include/asm-arm/arch-at91/uncompress.h
-@@ -21,7 +21,7 @@
- #ifndef __ASM_ARCH_UNCOMPRESS_H
- #define __ASM_ARCH_UNCOMPRESS_H
--#include <asm/hardware.h>
-+#include <asm/io.h>
- #include <asm/arch/at91_dbgu.h>
- /*
-Index: linux-2.6.21.7/include/linux/clk.h
-===================================================================
---- linux-2.6.21.7.orig/include/linux/clk.h
-+++ linux-2.6.21.7/include/linux/clk.h
-@@ -121,4 +121,24 @@ int clk_set_parent(struct clk *clk, stru
-  */
- struct clk *clk_get_parent(struct clk *clk);
-+/**
-+ * clk_must_disable - report whether a clock's users must disable it
-+ * @clk: one node in the clock tree
-+ *
-+ * This routine returns true only if the upcoming system state requires
-+ * disabling the specified clock.
-+ *
-+ * It's common for platform power states to constrain certain clocks (and
-+ * their descendants) to be unavailable, while other states allow that
-+ * clock to be active.  A platform's power states often include an "all on"
-+ * mode; system wide sleep states like "standby" or "suspend-to-RAM"; and
-+ * operating states which sacrifice functionality for lower power usage.
-+ *
-+ * The constraint value is commonly tested in device driver suspend(), to
-+ * leave clocks active if they are needed for features like wakeup events.
-+ * On platforms that support reduced functionality operating states, the
-+ * constraint may also need to be tested during resume() and probe() calls.
-+ */
-+int clk_must_disable(struct clk *clk);
-+
- #endif
-Index: linux-2.6.21.7/include/linux/i2c-id.h
-===================================================================
---- linux-2.6.21.7.orig/include/linux/i2c-id.h
-+++ linux-2.6.21.7/include/linux/i2c-id.h
-@@ -202,6 +202,7 @@
- /* --- PCA 9564 based algorithms */
- #define I2C_HW_A_ISA          0x1a0000 /* generic ISA Bus interface card */
-+#define I2C_HW_A_PLAT         0x1a0001 /* generic platform_bus interface */
- /* --- ACPI Embedded controller algorithms                              */
- #define I2C_HW_ACPI_EC          0x1f0000
-Index: linux-2.6.21.7/include/video/atmel_lcdc.h
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/include/video/atmel_lcdc.h
-@@ -0,0 +1,196 @@
-+/*
-+ *  Header file for AT91/AT32 LCD Controller
-+ *
-+ *  Data structure and register user interface
-+ *
-+ *  Copyright (C) 2007 Atmel Corporation
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+#ifndef __ATMEL_LCDC_H__
-+#define __ATMEL_LCDC_H__
-+
-+ /* LCD Controller info data structure */
-+struct atmel_lcdfb_info {
-+      spinlock_t              lock;
-+      struct fb_info          *info;
-+      void __iomem            *mmio;
-+      unsigned long           irq_base;
-+
-+      unsigned int            guard_time;
-+      struct platform_device  *pdev;
-+      struct clk              *bus_clk;
-+      struct clk              *lcdc_clk;
-+      unsigned int            default_bpp;
-+      unsigned int            default_lcdcon2;
-+      unsigned int            default_dmacon;
-+      void (*atmel_lcdfb_power_control)(int on);
-+      struct fb_monspecs      *default_monspecs;
-+      u32                     pseudo_palette[16];
-+};
-+
-+#define ATMEL_LCDC_DMABADDR1  0x00
-+#define ATMEL_LCDC_DMABADDR2  0x04
-+#define ATMEL_LCDC_DMAFRMPT1  0x08
-+#define ATMEL_LCDC_DMAFRMPT2  0x0c
-+#define ATMEL_LCDC_DMAFRMADD1 0x10
-+#define ATMEL_LCDC_DMAFRMADD2 0x14
-+
-+#define ATMEL_LCDC_DMAFRMCFG  0x18
-+#define       ATMEL_LCDC_FRSIZE       (0x7fffff <<  0)
-+#define       ATMEL_LCDC_BLENGTH_OFFSET       24
-+#define       ATMEL_LCDC_BLENGTH      (0x7f     << ATMEL_LCDC_BLENGTH_OFFSET)
-+
-+#define ATMEL_LCDC_DMACON     0x1c
-+#define       ATMEL_LCDC_DMAEN        (0x1 << 0)
-+#define       ATMEL_LCDC_DMARST       (0x1 << 1)
-+#define       ATMEL_LCDC_DMABUSY      (0x1 << 2)
-+#define               ATMEL_LCDC_DMAUPDT      (0x1 << 3)
-+#define               ATMEL_LCDC_DMA2DEN      (0x1 << 4)
-+
-+#define ATMEL_LCDC_DMA2DCFG   0x20
-+#define               ATMEL_LCDC_ADDRINC_OFFSET       0
-+#define               ATMEL_LCDC_ADDRINC              (0xffff)
-+#define               ATMEL_LCDC_PIXELOFF_OFFSET      24
-+#define               ATMEL_LCDC_PIXELOFF             (0x1f << 24)
-+
-+#define ATMEL_LCDC_LCDCON1    0x0800
-+#define       ATMEL_LCDC_BYPASS       (1     <<  0)
-+#define       ATMEL_LCDC_CLKVAL_OFFSET        12
-+#define       ATMEL_LCDC_CLKVAL       (0x1ff << ATMEL_LCDC_CLKVAL_OFFSET)
-+#define       ATMEL_LCDC_LINCNT       (0x7ff << 21)
-+
-+#define ATMEL_LCDC_LCDCON2    0x0804
-+#define       ATMEL_LCDC_DISTYPE      (3 << 0)
-+#define               ATMEL_LCDC_DISTYPE_STNMONO      (0 << 0)
-+#define               ATMEL_LCDC_DISTYPE_STNCOLOR     (1 << 0)
-+#define               ATMEL_LCDC_DISTYPE_TFT          (2 << 0)
-+#define       ATMEL_LCDC_SCANMOD      (1 << 2)
-+#define               ATMEL_LCDC_SCANMOD_SINGLE       (0 << 2)
-+#define               ATMEL_LCDC_SCANMOD_DUAL         (1 << 2)
-+#define       ATMEL_LCDC_IFWIDTH      (3 << 3)
-+#define               ATMEL_LCDC_IFWIDTH_4            (0 << 3)
-+#define               ATMEL_LCDC_IFWIDTH_8            (1 << 3)
-+#define               ATMEL_LCDC_IFWIDTH_16           (2 << 3)
-+#define       ATMEL_LCDC_PIXELSIZE    (7 << 5)
-+#define               ATMEL_LCDC_PIXELSIZE_1          (0 << 5)
-+#define               ATMEL_LCDC_PIXELSIZE_2          (1 << 5)
-+#define               ATMEL_LCDC_PIXELSIZE_4          (2 << 5)
-+#define               ATMEL_LCDC_PIXELSIZE_8          (3 << 5)
-+#define               ATMEL_LCDC_PIXELSIZE_16         (4 << 5)
-+#define               ATMEL_LCDC_PIXELSIZE_24         (5 << 5)
-+#define               ATMEL_LCDC_PIXELSIZE_32         (6 << 5)
-+#define       ATMEL_LCDC_INVVD        (1 << 8)
-+#define               ATMEL_LCDC_INVVD_NORMAL         (0 << 8)
-+#define               ATMEL_LCDC_INVVD_INVERTED       (1 << 8)
-+#define       ATMEL_LCDC_INVFRAME     (1 << 9 )
-+#define               ATMEL_LCDC_INVFRAME_NORMAL      (0 << 9)
-+#define               ATMEL_LCDC_INVFRAME_INVERTED    (1 << 9)
-+#define       ATMEL_LCDC_INVLINE      (1 << 10)
-+#define               ATMEL_LCDC_INVLINE_NORMAL       (0 << 10)
-+#define               ATMEL_LCDC_INVLINE_INVERTED     (1 << 10)
-+#define       ATMEL_LCDC_INVCLK       (1 << 11)
-+#define               ATMEL_LCDC_INVCLK_NORMAL        (0 << 11)
-+#define               ATMEL_LCDC_INVCLK_INVERTED      (1 << 11)
-+#define       ATMEL_LCDC_INVDVAL      (1 << 12)
-+#define               ATMEL_LCDC_INVDVAL_NORMAL       (0 << 12)
-+#define               ATMEL_LCDC_INVDVAL_INVERTED     (1 << 12)
-+#define       ATMEL_LCDC_CLKMOD       (1 << 15)
-+#define               ATMEL_LCDC_CLKMOD_ACTIVEDISPLAY (0 << 15)
-+#define               ATMEL_LCDC_CLKMOD_ALWAYSACTIVE  (1 << 15)
-+#define       ATMEL_LCDC_MEMOR        (1 << 31)
-+#define               ATMEL_LCDC_MEMOR_BIG            (0 << 31)
-+#define               ATMEL_LCDC_MEMOR_LITTLE         (1 << 31)
-+
-+#define ATMEL_LCDC_TIM1               0x0808
-+#define       ATMEL_LCDC_VFP          (0xff <<  0)
-+#define       ATMEL_LCDC_VBP_OFFSET           8
-+#define       ATMEL_LCDC_VBP          (0xff <<  ATMEL_LCDC_VBP_OFFSET)
-+#define       ATMEL_LCDC_VPW_OFFSET           16
-+#define       ATMEL_LCDC_VPW          (0x3f << ATMEL_LCDC_VPW_OFFSET)
-+#define       ATMEL_LCDC_VHDLY_OFFSET         24
-+#define       ATMEL_LCDC_VHDLY        (0xf  << ATMEL_LCDC_VHDLY_OFFSET)
-+
-+#define ATMEL_LCDC_TIM2               0x080c
-+#define       ATMEL_LCDC_HBP          (0xff  <<  0)
-+#define       ATMEL_LCDC_HPW_OFFSET           8
-+#define       ATMEL_LCDC_HPW          (0x3f  <<  ATMEL_LCDC_HPW_OFFSET)
-+#define       ATMEL_LCDC_HFP_OFFSET           21
-+#define       ATMEL_LCDC_HFP          (0x7ff << ATMEL_LCDC_HFP_OFFSET)
-+
-+#define ATMEL_LCDC_LCDFRMCFG  0x0810
-+#define       ATMEL_LCDC_LINEVAL      (0x7ff <<  0)
-+#define       ATMEL_LCDC_HOZVAL_OFFSET        21
-+#define       ATMEL_LCDC_HOZVAL       (0x7ff << ATMEL_LCDC_HOZVAL_OFFSET)
-+
-+#define ATMEL_LCDC_FIFO               0x0814
-+#define       ATMEL_LCDC_FIFOTH       (0xffff)
-+
-+#define ATMEL_LCDC_MVAL               0x0818
-+
-+#define ATMEL_LCDC_DP1_2      0x081c
-+#define ATMEL_LCDC_DP4_7      0x0820
-+#define ATMEL_LCDC_DP3_5      0x0824
-+#define ATMEL_LCDC_DP2_3      0x0828
-+#define ATMEL_LCDC_DP5_7      0x082c
-+#define ATMEL_LCDC_DP3_4      0x0830
-+#define ATMEL_LCDC_DP4_5      0x0834
-+#define ATMEL_LCDC_DP6_7      0x0838
-+#define       ATMEL_LCDC_DP1_2_VAL    (0xff)
-+#define       ATMEL_LCDC_DP4_7_VAL    (0xfffffff)
-+#define       ATMEL_LCDC_DP3_5_VAL    (0xfffff)
-+#define       ATMEL_LCDC_DP2_3_VAL    (0xfff)
-+#define       ATMEL_LCDC_DP5_7_VAL    (0xfffffff)
-+#define       ATMEL_LCDC_DP3_4_VAL    (0xffff)
-+#define       ATMEL_LCDC_DP4_5_VAL    (0xfffff)
-+#define       ATMEL_LCDC_DP6_7_VAL    (0xfffffff)
-+
-+#define ATMEL_LCDC_PWRCON     0x083c
-+#define       ATMEL_LCDC_PWR          (1    <<  0)
-+#define       ATMEL_LCDC_GUARDT_OFFSET        1
-+#define       ATMEL_LCDC_GUARDT       (0x7f <<  ATMEL_LCDC_GUARDT_OFFSET)
-+#define       ATMEL_LCDC_BUSY         (1    << 31)
-+
-+#define ATMEL_LCDC_CONTRAST_CTR       0x0840
-+#define       ATMEL_LCDC_PS           (3 << 0)
-+#define               ATMEL_LCDC_PS_DIV1              (0 << 0)
-+#define               ATMEL_LCDC_PS_DIV2              (1 << 0)
-+#define               ATMEL_LCDC_PS_DIV4              (2 << 0)
-+#define               ATMEL_LCDC_PS_DIV8              (3 << 0)
-+#define       ATMEL_LCDC_POL          (1 << 2)
-+#define               ATMEL_LCDC_POL_NEGATIVE         (0 << 2)
-+#define               ATMEL_LCDC_POL_POSITIVE         (1 << 2)
-+#define       ATMEL_LCDC_ENA          (1 << 3)
-+#define               ATMEL_LCDC_ENA_PWMDISABLE       (0 << 3)
-+#define               ATMEL_LCDC_ENA_PWMENABLE        (1 << 3)
-+
-+#define ATMEL_LCDC_CONTRAST_VAL       0x0844
-+#define       ATMEL_LCDC_CVAL (0xff)
-+
-+#define ATMEL_LCDC_IER                0x0848
-+#define ATMEL_LCDC_IDR                0x084c
-+#define ATMEL_LCDC_IMR                0x0850
-+#define ATMEL_LCDC_ISR                0x0854
-+#define ATMEL_LCDC_ICR                0x0858
-+#define       ATMEL_LCDC_LNI          (1 << 0)
-+#define       ATMEL_LCDC_LSTLNI       (1 << 1)
-+#define       ATMEL_LCDC_EOFI         (1 << 2)
-+#define       ATMEL_LCDC_UFLWI        (1 << 4)
-+#define       ATMEL_LCDC_OWRI         (1 << 5)
-+#define       ATMEL_LCDC_MERI         (1 << 6)
-+
-+#define ATMEL_LCDC_LUT(n)     (0x0c00 + ((n)*4))
-+
-+#endif /* __ATMEL_LCDC_H__ */
-Index: linux-2.6.21.7/sound/soc/at91/eti_b1_wm8731.c
-===================================================================
---- linux-2.6.21.7.orig/sound/soc/at91/eti_b1_wm8731.c
-+++ linux-2.6.21.7/sound/soc/at91/eti_b1_wm8731.c
-@@ -34,8 +34,7 @@
- #include <sound/soc.h>
- #include <sound/soc-dapm.h>
--#include <asm/arch/hardware.h>
--#include <asm/arch/at91_pio.h>
-+#include <asm/hardware.h>
- #include <asm/arch/gpio.h>
- #include "../codecs/wm8731.h"
-@@ -48,13 +47,6 @@
- #define       DBG(x...)
- #endif
--#define AT91_PIO_TF1  (1 << (AT91_PIN_PB6 - PIN_BASE) % 32)
--#define AT91_PIO_TK1  (1 << (AT91_PIN_PB7 - PIN_BASE) % 32)
--#define AT91_PIO_TD1  (1 << (AT91_PIN_PB8 - PIN_BASE) % 32)
--#define AT91_PIO_RD1  (1 << (AT91_PIN_PB9 - PIN_BASE) % 32)
--#define AT91_PIO_RK1  (1 << (AT91_PIN_PB10 - PIN_BASE) % 32)
--#define AT91_PIO_RF1  (1 << (AT91_PIN_PB11 - PIN_BASE) % 32)
--
- static struct clk *pck1_clk;
- static struct clk *pllb_clk;
-@@ -277,7 +269,6 @@ static struct platform_device *eti_b1_sn
- static int __init eti_b1_init(void)
- {
-       int ret;
--      u32 ssc_pio_lines;
-       struct at91_ssc_periph *ssc = eti_b1_dai.cpu_dai->private_data;
-       if (!request_mem_region(AT91RM9200_BASE_SSC1, SZ_16K, "soc-audio")) {
-@@ -311,19 +302,12 @@ static int __init eti_b1_init(void)
-               goto fail_io_unmap;
-       }
--      ssc_pio_lines = AT91_PIO_TF1 | AT91_PIO_TK1 | AT91_PIO_TD1
--                      | AT91_PIO_RD1 /* | AT91_PIO_RK1 */ | AT91_PIO_RF1;
--
--      /* Reset all PIO registers and assign lines to peripheral A */
--      at91_sys_write(AT91_PIOB + PIO_PDR,  ssc_pio_lines);
--      at91_sys_write(AT91_PIOB + PIO_ODR,  ssc_pio_lines);
--      at91_sys_write(AT91_PIOB + PIO_IFDR, ssc_pio_lines);
--      at91_sys_write(AT91_PIOB + PIO_CODR, ssc_pio_lines);
--      at91_sys_write(AT91_PIOB + PIO_IDR,  ssc_pio_lines);
--      at91_sys_write(AT91_PIOB + PIO_MDDR, ssc_pio_lines);
--      at91_sys_write(AT91_PIOB + PIO_PUDR, ssc_pio_lines);
--      at91_sys_write(AT91_PIOB + PIO_ASR,  ssc_pio_lines);
--      at91_sys_write(AT91_PIOB + PIO_OWDR, ssc_pio_lines);
-+      at91_set_A_periph(AT91_PIN_PB6, 0);     /* TF1 */
-+      at91_set_A_periph(AT91_PIN_PB7, 0);     /* TK1 */
-+      at91_set_A_periph(AT91_PIN_PB8, 0);     /* TD1 */
-+      at91_set_A_periph(AT91_PIN_PB9, 0);     /* RD1 */
-+/*    at91_set_A_periph(AT91_PIN_PB10, 0);*/  /* RK1 */       
-+      at91_set_A_periph(AT91_PIN_PB11, 0);    /* RF1 */
-       /*
-        * Set PCK1 parent to PLLB and its rate to 12 Mhz.
diff --git a/target/linux/at91/patches-2.6.21/001-vlink-machine.patch b/target/linux/at91/patches-2.6.21/001-vlink-machine.patch
deleted file mode 100644 (file)
index f40dbae..0000000
+++ /dev/null
@@ -1,219 +0,0 @@
-Index: linux-2.6.21.7/arch/arm/boot/compressed/head-at91rm9200.S
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/boot/compressed/head-at91rm9200.S
-+++ linux-2.6.21.7/arch/arm/boot/compressed/head-at91rm9200.S
-@@ -61,6 +61,12 @@
-               cmp     r7, r3
-               beq     99f
-+              @ FDL Versalink : 1053
-+              mov   r3, #(MACH_TYPE_VLINK & 0xff)
-+              orr r3, r3, #(MACH_TYPE_VLINK & 0xff00)
-+              cmp r7, r3
-+              beq 99f
-+
-               @ Ajeco 1ARM : 1075
-               mov     r3,     #(MACH_TYPE_ONEARM & 0xff)
-               orr     r3, r3, #(MACH_TYPE_ONEARM & 0xff00)
-Index: linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
-@@ -0,0 +1,160 @@
-+/*
-+ * linux/arch/arm/mach-at91/board-vlink.c
-+ *
-+ *  Copyright (C) 2005 SAN People
-+ *  Copyright (C) 2006,2007 Guthrie Consulting
-+ *
-+ *
-+ * 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/types.h>
-+#include <linux/init.h>
-+#include <linux/mm.h>
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/spi/spi.h>
-+#include <linux/mtd/physmap.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/setup.h>
-+#include <asm/mach-types.h>
-+#include <asm/irq.h>
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/map.h>
-+#include <asm/mach/irq.h>
-+
-+#include <asm/arch/board.h>
-+#include <asm/arch/gpio.h>
-+#include <asm/arch/at91rm9200_mc.h>
-+
-+#include "generic.h"
-+
-+
-+/*
-+ * Serial port configuration.
-+ *    0 .. 3 = USART0 .. USART3
-+ *    4      = DBGU
-+ */
-+static struct at91_uart_config __initdata vlink_uart_config = {
-+      .console_tty    = 0,                            /* ttyS0 */
-+      .nr_tty         = 5,
-+      .tty_map        = { 4, 1, 0, 3, 2 }             /* ttyS0, ..., ttyS4 */
-+};
-+
-+static void __init vlink_map_io(void)
-+{
-+      /* Initialize processor: 18.432 MHz crystal */
-+      at91rm9200_initialize(18432000, AT91RM9200_PQFP);
-+
-+      /* Setup the LEDs */
-+//    at91_init_leds(AT91_PIN_PB1, AT91_PIN_PB2);
-+
-+      /* Setup the serial ports and console */
-+      at91_init_serial(&vlink_uart_config);
-+}
-+
-+static void __init vlink_init_irq(void)
-+{
-+      at91rm9200_init_interrupts(NULL);
-+}
-+
-+static struct at91_eth_data __initdata vlink_eth_data = {
-+      .phy_irq_pin    = AT91_PIN_PC4,
-+      .is_rmii        = 1,
-+};
-+
-+static struct at91_usbh_data __initdata vlink_usbh_data = {
-+      .ports          = 1,
-+};
-+
-+static struct at91_udc_data __initdata vlink_udc_data = {
-+      .vbus_pin       = AT91_PIN_PD4,
-+      .pullup_pin     = AT91_PIN_PD5,
-+};
-+
-+static struct at91_mmc_data __initdata vlink_mmc_data = {
-+//    .det_pin        = AT91_PIN_PB27,
-+      .slot_b         = 0,
-+      .wire4          = 1,
-+//    .wp_pin         = AT91_PIN_PA17,
-+};
-+
-+static struct spi_board_info vlink_spi_devices[] = {
-+      {       /* DataFlash chip */
-+              .modalias       = "mtd_dataflash",
-+              .chip_select    = 0,
-+              .max_speed_hz   = 15 * 1000 * 1000,
-+      },
-+#ifdef CONFIG_MTD_AT91_DATAFLASH_CARD
-+      {       /* DataFlash card */
-+              .modalias       = "mtd_dataflash",
-+              .chip_select    = 3,
-+              .max_speed_hz   = 15 * 1000 * 1000,
-+      },
-+#endif
-+};
-+
-+static struct at91_gpio_led vlink_leds[] = {
-+      {
-+              .name           = "led0",
-+              .gpio           = AT91_PIN_PB1,
-+              .trigger        = "heartbeat",
-+      },
-+      {
-+              .name           = "led1",
-+              .gpio           = AT91_PIN_PB2,
-+              .trigger        = "timer",
-+      }
-+};
-+
-+static void __init vlink_board_init(void)
-+{
-+      /* Serial */
-+      at91_add_device_serial();
-+      /* Ethernet */
-+      at91_add_device_eth(&vlink_eth_data);
-+      /* USB Host */
-+      at91_add_device_usbh(&vlink_usbh_data);
-+      /* USB Device */
-+      at91_add_device_udc(&vlink_udc_data);
-+      at91_set_multi_drive(vlink_udc_data.pullup_pin, 1);     /* pullup_pin is connected to reset */
-+      /* I2C */
-+      at91_add_device_i2c();
-+      /* SPI */
-+      at91_add_device_spi(vlink_spi_devices, ARRAY_SIZE(vlink_spi_devices));
-+#ifdef CONFIG_MTD_AT91_DATAFLASH_CARD
-+      /* DataFlash card */
-+//    at91_set_gpio_output(AT91_PIN_PB22, 0);
-+#else
-+      /* MMC */
-+//    at91_set_gpio_output(AT91_PIN_PB22, 1); /* this MMC card slot can optionally use SPI signaling (CS3). */
-+      at91_add_device_mmc(0, &vlink_mmc_data);
-+#endif
-+      /* LEDs */
-+      at91_gpio_leds(vlink_leds, ARRAY_SIZE(vlink_leds));
-+}
-+
-+MACHINE_START(VLINK, "FDL VersaLink")
-+      /* Maintainer: Guthrie Consulting */
-+      .phys_io        = AT91_BASE_SYS,
-+      .io_pg_offst    = (AT91_VA_BASE_SYS >> 18) & 0xfffc,
-+      .boot_params    = AT91_SDRAM_BASE + 0x100,
-+      .timer          = &at91rm9200_timer,
-+      .map_io         = vlink_map_io,
-+      .init_irq       = vlink_init_irq,
-+      .init_machine   = vlink_board_init,
-+MACHINE_END
-Index: linux-2.6.21.7/arch/arm/mach-at91/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/Kconfig
-+++ linux-2.6.21.7/arch/arm/mach-at91/Kconfig
-@@ -96,6 +96,12 @@ config MACH_CHUB
-       help
-         Select this if you are using Promwad's Chub board.
-+config MACH_VLINK
-+      bool "Figment Design Labs VersaLink"
-+      depends on ARCH_AT91RM9200
-+      help
-+              Select this if you are using FDL's VersaLink board
-+
- endif
- # ----------------------------------------------------------
-Index: linux-2.6.21.7/arch/arm/mach-at91/Makefile
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/Makefile
-+++ linux-2.6.21.7/arch/arm/mach-at91/Makefile
-@@ -29,6 +29,7 @@ obj-$(CONFIG_MACH_KB9200)    += board-kb920
- obj-$(CONFIG_MACH_ATEB9200)   += board-eb9200.o
- obj-$(CONFIG_MACH_KAFA)               += board-kafa.o
- obj-$(CONFIG_MACH_CHUB)               += board-chub.o
-+obj-$(CONFIG_MACH_VLINK)      += board-vlink.o
- # AT91SAM9260 board-specific support
- obj-$(CONFIG_MACH_AT91SAM9260EK) += board-sam9260ek.o
-@@ -51,6 +52,7 @@ led-$(CONFIG_MACH_CSB337)    += leds.o
- led-$(CONFIG_MACH_CSB637)     += leds.o
- led-$(CONFIG_MACH_KB9200)     += leds.o
- led-$(CONFIG_MACH_KAFA)               += leds.o
-+led-$(CONFIG_MACH_VLINK)      += leds.o
- obj-$(CONFIG_LEDS) += $(led-y)
- # VGA support
diff --git a/target/linux/at91/patches-2.6.21/002-led-driver.patch b/target/linux/at91/patches-2.6.21/002-led-driver.patch
deleted file mode 100644 (file)
index f8e915d..0000000
+++ /dev/null
@@ -1,192 +0,0 @@
-Index: linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/board-vlink.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
-@@ -61,7 +61,7 @@ static void __init vlink_map_io(void)
-       at91rm9200_initialize(18432000, AT91RM9200_PQFP);
-       /* Setup the LEDs */
--//    at91_init_leds(AT91_PIN_PB1, AT91_PIN_PB2);
-+      at91_init_leds(AT91_PIN_PC14, AT91_PIN_PC15);
-       /* Setup the serial ports and console */
-       at91_init_serial(&vlink_uart_config);
-@@ -81,10 +81,12 @@ static struct at91_usbh_data __initdata 
-       .ports          = 1,
- };
-+/*
- static struct at91_udc_data __initdata vlink_udc_data = {
-       .vbus_pin       = AT91_PIN_PD4,
-       .pullup_pin     = AT91_PIN_PD5,
- };
-+*/
- static struct at91_mmc_data __initdata vlink_mmc_data = {
- //    .det_pin        = AT91_PIN_PB27,
-@@ -108,18 +110,19 @@ static struct spi_board_info vlink_spi_d
- #endif
- };
--static struct at91_gpio_led vlink_leds[] = {
-+/*static struct at91_gpio_led vlink_leds[] = {
-       {
-               .name           = "led0",
--              .gpio           = AT91_PIN_PB1,
-+              .gpio           = AT91_PIN_PC14,
-               .trigger        = "heartbeat",
-       },
-       {
-               .name           = "led1",
--              .gpio           = AT91_PIN_PB2,
-+              .gpio           = AT91_PIN_PC15,
-               .trigger        = "timer",
-       }
- };
-+*/
- static void __init vlink_board_init(void)
- {
-@@ -130,8 +133,8 @@ static void __init vlink_board_init(void
-       /* USB Host */
-       at91_add_device_usbh(&vlink_usbh_data);
-       /* USB Device */
--      at91_add_device_udc(&vlink_udc_data);
--      at91_set_multi_drive(vlink_udc_data.pullup_pin, 1);     /* pullup_pin is connected to reset */
-+//    at91_add_device_udc(&vlink_udc_data);
-+//    at91_set_multi_drive(vlink_udc_data.pullup_pin, 1);     /* pullup_pin is connected to reset */
-       /* I2C */
-       at91_add_device_i2c();
-       /* SPI */
-@@ -145,7 +148,7 @@ static void __init vlink_board_init(void
-       at91_add_device_mmc(0, &vlink_mmc_data);
- #endif
-       /* LEDs */
--      at91_gpio_leds(vlink_leds, ARRAY_SIZE(vlink_leds));
-+//    at91_gpio_leds(vlink_leds, ARRAY_SIZE(vlink_leds));
- }
- MACHINE_START(VLINK, "FDL VersaLink")
-Index: linux-2.6.21.7/arch/arm/mach-at91/Makefile
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/Makefile
-+++ linux-2.6.21.7/arch/arm/mach-at91/Makefile
-@@ -52,7 +52,7 @@ led-$(CONFIG_MACH_CSB337)    += leds.o
- led-$(CONFIG_MACH_CSB637)     += leds.o
- led-$(CONFIG_MACH_KB9200)     += leds.o
- led-$(CONFIG_MACH_KAFA)               += leds.o
--led-$(CONFIG_MACH_VLINK)      += leds.o
-+led-$(CONFIG_MACH_VLINK)      += vlink_leds.o
- obj-$(CONFIG_LEDS) += $(led-y)
- # VGA support
-Index: linux-2.6.21.7/arch/arm/mach-at91/vlink_leds.c
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/arch/arm/mach-at91/vlink_leds.c
-@@ -0,0 +1,105 @@
-+/*
-+ * LED driver for Atmel AT91-based boards.
-+ *
-+ *  Copyright (C) SAN People (Pty) Ltd
-+ *    Modified for FDL VersaLink Copyright (C) Guthrie Consulting
-+ *
-+ * 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/module.h>
-+#include <linux/init.h>
-+
-+#include <asm/mach-types.h>
-+#include <asm/leds.h>
-+#include <asm/arch/board.h>
-+#include <asm/arch/gpio.h>
-+
-+
-+static inline void at91_led_on(unsigned int led)
-+{
-+      at91_set_gpio_value(led, 0);
-+}
-+
-+static inline void at91_led_off(unsigned int led)
-+{
-+      at91_set_gpio_value(led, 1);
-+}
-+
-+static inline void at91_led_toggle(unsigned int led)
-+{
-+      unsigned long is_off = at91_get_gpio_value(led);
-+      if (is_off) {
-+              at91_led_on(led);
-+              at91_led_off(at91_leds_cpu);
-+              }
-+      else {
-+              at91_led_on(at91_leds_cpu);
-+              at91_led_off(led);
-+              }
-+}
-+
-+
-+/*
-+ * Handle LED events.
-+ */
-+
-+/*
-+ * VersaLink has a single bi-coloured LED which changes colour when the
-+ * polarity is reversed
-+ */
-+static void at91_leds_event(led_event_t evt)
-+{
-+      unsigned long flags;
-+
-+      local_irq_save(flags);
-+
-+      switch(evt) {
-+      case led_start:         /* System startup */
-+              at91_led_toggle(at91_leds_timer);
-+              break;
-+
-+      case led_stop:          /* System stop / suspend */
-+              at91_led_toggle(at91_leds_timer);
-+              break;
-+
-+#ifdef CONFIG_LEDS_TIMER
-+      case led_timer:         /* Every 50 timer ticks */
-+              at91_led_toggle(at91_leds_timer);
-+              break;
-+#endif
-+
-+#ifdef CONFIG_LEDS_CPU
-+      case led_idle_start:    /* Entering idle state */
-+              at91_led_toggle(at91_leds_timer);
-+              break;
-+
-+      case led_idle_end:      /* Exit idle state */
-+              at91_led_toggle(at91_leds_timer);
-+              break;
-+#endif
-+
-+      default:
-+              break;
-+      }
-+
-+      local_irq_restore(flags);
-+}
-+
-+
-+static int __init leds_init(void)
-+{
-+      if (!at91_leds_timer || !at91_leds_cpu)
-+              return -ENODEV;
-+
-+      leds_event = at91_leds_event;
-+
-+      leds_event(led_start);
-+      return 0;
-+}
-+
-+__initcall(leds_init);
diff --git a/target/linux/at91/patches-2.6.21/003-gpio-driver.patch b/target/linux/at91/patches-2.6.21/003-gpio-driver.patch
deleted file mode 100644 (file)
index b4ef42d..0000000
+++ /dev/null
@@ -1,363 +0,0 @@
-Index: linux-2.6.21.7/arch/arm/mach-at91/gpio.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/gpio.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/gpio.c
-@@ -27,6 +27,7 @@
- static struct at91_gpio_bank *gpio;
- static int gpio_banks;
-+static u32 pio_gpio_pin[4] = { 0, 0, 0, 0 };
- static inline void __iomem *pin_to_controller(unsigned pin)
-@@ -71,9 +72,13 @@ int __init_or_module at91_set_GPIO_perip
- {
-       void __iomem    *pio = pin_to_controller(pin);
-       unsigned        mask = pin_to_mask(pin);
-+      int bank = (pin - PIN_BASE) / 32;
-       if (!pio)
-               return -EINVAL;
-+
-+      pio_gpio_pin[bank] |= mask;
-+
-       __raw_writel(mask, pio + PIO_IDR);
-       __raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
-       __raw_writel(mask, pio + PIO_PER);
-@@ -130,10 +135,13 @@ int __init_or_module at91_set_gpio_input
- {
-       void __iomem    *pio = pin_to_controller(pin);
-       unsigned        mask = pin_to_mask(pin);
-+      int bank = (pin - PIN_BASE) / 32;
-       if (!pio)
-               return -EINVAL;
-+      pio_gpio_pin[bank] |= mask;
-+
-       __raw_writel(mask, pio + PIO_IDR);
-       __raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
-       __raw_writel(mask, pio + PIO_ODR);
-@@ -151,10 +159,13 @@ int __init_or_module at91_set_gpio_outpu
- {
-       void __iomem    *pio = pin_to_controller(pin);
-       unsigned        mask = pin_to_mask(pin);
-+      int bank = (pin - PIN_BASE) / 32;
-       if (!pio)
-               return -EINVAL;
-+      pio_gpio_pin[bank] |= mask;
-+
-       __raw_writel(mask, pio + PIO_IDR);
-       __raw_writel(mask, pio + PIO_PUDR);
-       __raw_writel(mask, pio + (value ? PIO_SODR : PIO_CODR));
-@@ -262,6 +273,18 @@ int at91_get_gpio_value(unsigned pin)
- }
- EXPORT_SYMBOL(at91_get_gpio_value);
-+int at91_is_pin_gpio(unsigned pin)
-+{
-+  void __iomem  *pio = pin_to_controller(pin);
-+  unsigned  mask = pin_to_mask(pin);
-+  int     bank = (pin - PIN_BASE) / 32;
-+
-+  if (!pio)
-+    return -EINVAL;
-+  return (pio_gpio_pin[bank] & mask) != 0;
-+}
-+EXPORT_SYMBOL(at91_is_pin_gpio);
-+
- /*--------------------------------------------------------------------------*/
- #ifdef CONFIG_PM
-Index: linux-2.6.21.7/drivers/char/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/drivers/char/Kconfig
-+++ linux-2.6.21.7/drivers/char/Kconfig
-@@ -1087,5 +1087,12 @@ config AT91_SPIDEV
-         The SPI driver gives user mode access to this serial
-         bus on the AT91RM9200 processor.
-+config AT91_VLIO
-+  tristate "Versalink LED and GPIO interface"
-+  depends on ARCH_AT91RM9200 && MACH_VLINK
-+  default n
-+  help
-+    Provides a handler GPIO's in userspace
-+
- endmenu
-Index: linux-2.6.21.7/drivers/char/Makefile
-===================================================================
---- linux-2.6.21.7.orig/drivers/char/Makefile
-+++ linux-2.6.21.7/drivers/char/Makefile
-@@ -95,6 +95,7 @@ obj-$(CONFIG_TANBAC_TB0219)  += tb0219.o
- obj-$(CONFIG_TELCLOCK)                += tlclk.o
- obj-$(CONFIG_AT91_SPI)                += at91_spi.o
- obj-$(CONFIG_AT91_SPIDEV)     += at91_spidev.o
-+obj-$(CONFIG_AT91_VLIO)  += vlink_giu.o
- obj-$(CONFIG_WATCHDOG)                += watchdog/
- obj-$(CONFIG_MWAVE)           += mwave/
-Index: linux-2.6.21.7/drivers/char/vlink_giu.c
-===================================================================
---- /dev/null
-+++ linux-2.6.21.7/drivers/char/vlink_giu.c
-@@ -0,0 +1,256 @@
-+/*
-+ *  Driver for FDL Versalink GPIO
-+ *
-+ *  Copyright (C) 2005 Guthrie Consulting
-+ *    Author: Hamish Guthrie <hamish@prodigi.ch>
-+ *
-+ *  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/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+
-+#include <linux/kernel.h>
-+#include <linux/slab.h>
-+#include <linux/fs.h>
-+#include <linux/errno.h>
-+#include <linux/init.h>
-+#include <linux/types.h>
-+#include <linux/proc_fs.h>
-+#include <linux/fcntl.h>
-+#include <linux/seq_file.h>
-+#include <linux/cdev.h>
-+#include <asm/arch/gpio.h>
-+#include <asm/uaccess.h>
-+
-+static int major;     /* default is dynamic major device number */
-+module_param(major, int, 0);
-+MODULE_PARM_DESC(major, "Major device number");
-+
-+#define VIO_NR_DEVS 96
-+
-+struct vio_dev {
-+      struct cdev cdev;
-+};
-+
-+struct vio_dev *vio_devices;
-+static struct class *vio_class;
-+
-+static ssize_t gpio_read(struct file *file, char __user *buf, size_t len,
-+                         loff_t *ppos)
-+{
-+      unsigned int pin;
-+      int retval;
-+      char value = '0';
-+
-+      pin = iminor(file->f_dentry->d_inode);
-+
-+      retval = at91_get_gpio_value(PIN_BASE + pin);
-+      if (retval < 0)
-+              return -EFAULT;
-+
-+      value = retval + 0x30;
-+      if (put_user(value, buf))
-+              return -EFAULT;
-+
-+      return 1;
-+}
-+
-+static ssize_t gpio_write(struct file *file, const char __user *data,
-+                          size_t len, loff_t *ppos)
-+{
-+      unsigned int pin;
-+      size_t i;
-+      char c;
-+      int retval = 0;
-+
-+      pin = iminor(file->f_dentry->d_inode);
-+
-+      for (i = 0; i < len; i++) {
-+              if (get_user(c, data + i))
-+                      return -EFAULT;
-+
-+              switch (c) {
-+              case '0':
-+              case '1':
-+                      retval = at91_set_gpio_value(PIN_BASE + pin, (int)c - 0x30);
-+                      if (retval < 0)
-+                              return -EFAULT;
-+                      break;
-+              default:
-+                      break;
-+              }
-+
-+              if (retval < 0)
-+                      break;
-+      }
-+
-+      return i;
-+}
-+
-+static int gpio_open(struct inode *inode, struct file *file)
-+{
-+      return nonseekable_open(inode, file);
-+}
-+
-+static int gpio_release(struct inode *inode, struct file *file)
-+{
-+      return 0;
-+}
-+
-+static struct file_operations vio_fops = {
-+      .owner          = THIS_MODULE,
-+      .read           = gpio_read,
-+      .write          = gpio_write,
-+      .open           = gpio_open,
-+      .release        = gpio_release,
-+};
-+
-+static void vio_setup_cdev(struct vio_dev *dev, int index)
-+{
-+      int err, devno = MKDEV(major, index);
-+
-+      cdev_init(&dev->cdev, &vio_fops);
-+      dev->cdev.owner = THIS_MODULE;
-+      dev->cdev.ops = &vio_fops;
-+      err = cdev_add (&dev->cdev, devno, 1);
-+      if (err)
-+              printk(KERN_NOTICE "vio: Error %d adding vio%d", err, index);
-+}
-+
-+static int vio_remove(struct platform_device *dev)
-+{
-+      int i;
-+      dev_t devno = MKDEV(major, 0);
-+
-+      if (vio_devices) {
-+              for(i=0; i<VIO_NR_DEVS; i++) {
-+                      int iodev = at91_is_pin_gpio(PIN_BASE + i);
-+                      if (iodev) {
-+                              cdev_del(&vio_devices[i].cdev);
-+                              class_device_destroy(vio_class, MKDEV(major, i));
-+                      }
-+              }
-+              kfree(vio_devices);
-+      }
-+
-+      class_destroy(vio_class);
-+      unregister_chrdev_region(devno, VIO_NR_DEVS);
-+
-+      platform_set_drvdata(dev, NULL);
-+
-+      return 0;
-+}
-+
-+static int vio_probe(struct platform_device *dev)
-+{
-+      int retval, i, j;
-+      dev_t vdev = 0;
-+
-+      if (major) {
-+              vdev = MKDEV(major, 0);
-+              retval = register_chrdev_region(vdev, VIO_NR_DEVS, "vio");
-+      } else {
-+              retval = alloc_chrdev_region(&vdev, 0, VIO_NR_DEVS, "vio");
-+              major = MAJOR(vdev);
-+      }
-+      if (retval < 0) {
-+              printk(KERN_WARNING "vio: can't get major %d\n", major);
-+              return retval;
-+      }
-+
-+      if (major == 0) {
-+              major = retval;
-+              printk(KERN_INFO "vio: major number %d\n", major);
-+      }
-+
-+      vio_class = class_create(THIS_MODULE, "vio");
-+
-+      if (IS_ERR(vio_class)) {
-+              printk(KERN_ERR "vio: Error creating vio class\n");
-+              vio_remove(dev);
-+              return PTR_ERR(vio_class);
-+      }
-+
-+      vio_devices = kmalloc(VIO_NR_DEVS * sizeof(struct vio_dev), GFP_KERNEL);
-+      if (!vio_devices) {
-+              retval = -ENOMEM;
-+              goto fail;
-+      }
-+      memset(vio_devices, 0, VIO_NR_DEVS * sizeof(struct vio_dev));
-+
-+      for (i=0; i<VIO_NR_DEVS/32; i++)
-+              for(j=0; j<32; j++) {
-+                      int iodev = at91_is_pin_gpio(PIN_BASE + i*32 + j);
-+                      if (iodev) {
-+                              vio_setup_cdev(&vio_devices[i*32 + j], i*32 + j);
-+                              class_device_create(vio_class, NULL, MKDEV(major, i*32 + j), NULL,
-+                                      "vio%c%d", i + 'A', j);
-+                      }
-+              }
-+
-+      platform_set_drvdata(dev, vio_devices);
-+
-+      return 0;
-+
-+fail:
-+      vio_remove(dev);
-+      return retval;
-+}
-+
-+static struct platform_device *vio_platform_device;
-+
-+static struct platform_driver vio_driver = {
-+      .probe          = vio_probe,
-+      .remove         = vio_remove,
-+      .driver         = {
-+              .name   = "vio",
-+              .owner  = THIS_MODULE,
-+      },
-+};
-+
-+static int __init vio_init(void)
-+{
-+      int retval;
-+
-+      vio_platform_device = platform_device_register_simple("vio", -1, NULL, 0);
-+      if (IS_ERR(vio_platform_device)) {
-+              printk(KERN_WARNING "vio: device registration failed\n");
-+              return PTR_ERR(vio_platform_device);
-+      }
-+
-+      retval = platform_driver_register(&vio_driver);
-+      if (retval < 0) {
-+              printk(KERN_WARNING "vio: driver registration failed\n");
-+              platform_device_unregister(vio_platform_device);
-+      }
-+      
-+      return retval;
-+}
-+
-+static void __exit vio_exit(void)
-+{
-+      platform_driver_unregister(&vio_driver);
-+      platform_device_unregister(vio_platform_device);
-+}
-+
-+module_init(vio_init);
-+module_exit(vio_exit);
-+
-+MODULE_AUTHOR("Hamish Guthrie <hamish@prodigi.ch>");
-+MODULE_DESCRIPTION("FDL Versalink GPIO Driver");
-+MODULE_LICENSE("GPL");
diff --git a/target/linux/at91/patches-2.6.21/006-change-gpios.patch b/target/linux/at91/patches-2.6.21/006-change-gpios.patch
deleted file mode 100644 (file)
index 97c71fe..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/board-vlink.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
-@@ -149,6 +149,33 @@ static void __init vlink_board_init(void
- #endif
-       /* LEDs */
- //    at91_gpio_leds(vlink_leds, ARRAY_SIZE(vlink_leds));
-+
-+/* Other LED's */
-+       at91_set_gpio_output(AT91_PIN_PC7, 1);  // LED FRONT AP1
-+       at91_set_gpio_output(AT91_PIN_PC8, 1);  // LED FRONT BP1
-+       at91_set_gpio_output(AT91_PIN_PB14, 1); // LED BACK AP1
-+       at91_set_gpio_output(AT91_PIN_PB15, 1); // LED BACK BP1
-+       at91_set_gpio_output(AT91_PIN_PB16, 1); // LED BACK AP2
-+       at91_set_gpio_output(AT91_PIN_PB17, 1); // LED BACK BP2
-+
-+/* SIM Cards */
-+       at91_set_gpio_output(AT91_PIN_PB9, 1);  // ENBSC3
-+       at91_set_gpio_output(AT91_PIN_PB10, 1); // ENBSC2
-+       at91_set_gpio_output(AT91_PIN_PB11, 1); // ENBSC1
-+
-+/* GSM Module Control */
-+       at91_set_gpio_output(AT91_PIN_PB12, 1); // GSMONOFF
-+
-+/* Test jig presence detection */
-+       at91_set_gpio_input(AT91_PIN_PB8, 1);   // JIGPRESENT
-+
-+/* Power indicator */
-+       at91_set_gpio_input(AT91_PIN_PB22, 1);  // PWR_IND
-+
-+/* USB Device control */
-+       at91_set_gpio_input(AT91_PIN_PB27, 1);  // UDB_CNX
-+       at91_set_gpio_output(AT91_PIN_PB28, 1); // UDB_PUP
-+
- }
- MACHINE_START(VLINK, "FDL VersaLink")
diff --git a/target/linux/at91/patches-2.6.21/007-mtd-partition.patch b/target/linux/at91/patches-2.6.21/007-mtd-partition.patch
deleted file mode 100644 (file)
index f97f45b..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: linux-2.6.21.7/drivers/mtd/devices/at91_dataflash.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/mtd/devices/at91_dataflash.c
-+++ linux-2.6.21.7/drivers/mtd/devices/at91_dataflash.c
-@@ -173,7 +173,7 @@ static struct mtd_partition static_parti
- };
- #endif
--static const char *part_probes[] = { "cmdlinepart", NULL, };
-+static const char *part_probes[] = { "cmdlinepart", "at91part", NULL, };
- #endif
-Index: linux-2.6.21.7/drivers/mtd/Kconfig
-===================================================================
---- linux-2.6.21.7.orig/drivers/mtd/Kconfig
-+++ linux-2.6.21.7/drivers/mtd/Kconfig
-@@ -162,6 +162,12 @@ config MTD_AFS_PARTS
-         for your particular device. It won't happen automatically. The
-         'armflash' map driver (CONFIG_MTD_ARMFLASH) does this, for example.
-+config MTD_AT91_PARTS
-+ tristate "Atmel AT91 partitioning support"
-+ depends on MTD_PARTITIONS && ARCH_AT91RM9200 && AT91_SPI
-+ ---help---
-+   Atmel AT91 partitioning support
-+
- comment "User Modules And Translation Layers"
-       depends on MTD
-Index: linux-2.6.21.7/drivers/mtd/Makefile
-===================================================================
---- linux-2.6.21.7.orig/drivers/mtd/Makefile
-+++ linux-2.6.21.7/drivers/mtd/Makefile
-@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_CONCAT)     += mtdconcat.o
- obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
- obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
- obj-$(CONFIG_MTD_AFS_PARTS)   += afs.o
-+obj-$(CONFIG_MTD_AT91_PARTS) += at91part.o
- # 'Users' - code which presents functionality to userspace.
- obj-$(CONFIG_MTD_CHAR)                += mtdchar.o
diff --git a/target/linux/at91/patches-2.6.21/008-fdl-serial.patch b/target/linux/at91/patches-2.6.21/008-fdl-serial.patch
deleted file mode 100644 (file)
index 1fc369d..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-Index: linux-2.6.21.7/drivers/serial/atmel_serial.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/serial/atmel_serial.c
-+++ linux-2.6.21.7/drivers/serial/atmel_serial.c
-@@ -174,7 +174,35 @@ static void atmel_set_mctrl(struct uart_
-                               at91_set_gpio_value(AT91_PIN_PA21, 0);
-                       else
-                               at91_set_gpio_value(AT91_PIN_PA21, 1);
-+
-+      /*
-+       * FDL VersaLink adds GPIOS to provide full modem control on
-+       * USART 0 - Drive DTR and RI pins manually
-+       */
-+      if (mctrl & TIOCM_DTR)
-+        at91_set_gpio_value(AT91_PIN_PB6, 0);
-+      else
-+        at91_set_gpio_value(AT91_PIN_PB6, 1);
-+      if (mctrl & TIOCM_RI)
-+        at91_set_gpio_value(AT91_PIN_PB7, 0);
-+      else
-+        at91_set_gpio_value(AT91_PIN_PB7, 1);
-               }
-+
-+    /*
-+     * FDL VersaLink adds GPIOS to provide full modem control on
-+     * USART 3 - Drive DTR and RI pins manually
-+     */
-+    if (port->mapbase == AT91RM9200_BASE_US3) {
-+      if (mctrl & TIOCM_DTR)
-+        at91_set_gpio_value(AT91_PIN_PB29, 0);
-+      else
-+        at91_set_gpio_value(AT91_PIN_PB29, 1);
-+      if (mctrl & TIOCM_RI)
-+        at91_set_gpio_value(AT91_PIN_PB2, 0);
-+      else
-+        at91_set_gpio_value(AT91_PIN_PB2, 1);
-+    }
-       }
- #endif
-@@ -211,8 +239,10 @@ static u_int atmel_get_mctrl(struct uart
-       /*
-        * The control signals are active low.
-        */
--      if (!(status & ATMEL_US_DCD))
--              ret |= TIOCM_CD;
-+
-+  if (!(port->mapbase == AT91RM9200_BASE_US0 || port->mapbase == AT91RM9200_BASE_US3))
-+              if (!(status & ATMEL_US_DCD))
-+                      ret |= TIOCM_CD;
-       if (!(status & ATMEL_US_CTS))
-               ret |= TIOCM_CTS;
-       if (!(status & ATMEL_US_DSR))
-@@ -220,6 +250,16 @@ static u_int atmel_get_mctrl(struct uart
-       if (!(status & ATMEL_US_RI))
-               ret |= TIOCM_RI;
-+  /*
-+   * Read the GPIO's for the FDL VersaLink special case
-+   */
-+  if (port->mapbase == AT91RM9200_BASE_US0)
-+    if (!(at91_get_gpio_value(AT91_PIN_PA19)))
-+      ret |= TIOCM_CD;
-+  if (port->mapbase == AT91RM9200_BASE_US3)
-+    if (!(at91_get_gpio_value(AT91_PIN_PA24)))
-+      ret |= TIOCM_CD;
-+
-       return ret;
- }
-@@ -511,6 +551,34 @@ static void atmel_tx_chars(struct uart_p
- }
- /*
-+ * USART0 DCD Interrupt handler
-+ */
-+
-+static irqreturn_t atmel_u0_DCD_interrupt(int irq, void *dev_id)
-+{
-+  struct uart_port *port = dev_id;
-+  int status = at91_get_gpio_value(irq);
-+
-+  uart_handle_dcd_change(port, !(status));
-+
-+  return IRQ_HANDLED;
-+}
-+
-+/*
-+ * USART3 DCD Interrupt handler
-+ */
-+
-+static irqreturn_t atmel_u3_DCD_interrupt(int irq, void *dev_id)
-+{
-+  struct uart_port *port = dev_id;
-+  int status = at91_get_gpio_value(irq);
-+
-+  uart_handle_dcd_change(port, !(status));
-+
-+  return IRQ_HANDLED;
-+}
-+
-+/*
-  * Interrupt handler
-  */
- static irqreturn_t atmel_interrupt(int irq, void *dev_id)
-@@ -587,6 +655,23 @@ static int atmel_startup(struct uart_por
-               return retval;
-       }
-+      if (port->mapbase == AT91RM9200_BASE_US0) {
-+              retval = request_irq(AT91_PIN_PA19, atmel_u0_DCD_interrupt, 0, "atmel_serial", port);
-+              if (retval) {
-+                      printk("atmel_serial: atmel_startup - Can't get u0DCD irq\n");
-+                      free_irq(port->irq, port);
-+                      return retval;
-+              }
-+      }
-+      if (port->mapbase == AT91RM9200_BASE_US3) {
-+              retval = request_irq(AT91_PIN_PA24, atmel_u3_DCD_interrupt, 0, "atmel_serial", port);
-+              if (retval) {
-+                      printk("atmel_serial: atmel_startup - Can't get u3DCD irq\n");
-+                      free_irq(port->irq, port);
-+                      return retval;
-+              }
-+      }
-+
-       /*
-        * Initialize DMA (if necessary)
-        */
-@@ -603,6 +688,10 @@ static int atmel_startup(struct uart_por
-                                       kfree(atmel_port->pdc_rx[0].buf);
-                               }
-                               free_irq(port->irq, port);
-+        if (port->mapbase == AT91RM9200_BASE_US0)
-+          free_irq(AT91_PIN_PA19, port);
-+        if (port->mapbase == AT91RM9200_BASE_US3)
-+          free_irq(AT91_PIN_PA24, port);
-                               return -ENOMEM;
-                       }
-                       pdc->dma_addr = dma_map_single(port->dev, pdc->buf, PDC_BUFFER_SIZE, DMA_FROM_DEVICE);
-@@ -636,6 +725,10 @@ static int atmel_startup(struct uart_por
-               retval = atmel_open_hook(port);
-               if (retval) {
-                       free_irq(port->irq, port);
-+      if (port->mapbase == AT91RM9200_BASE_US0)
-+        free_irq(AT91_PIN_PA19, port);
-+      if (port->mapbase == AT91RM9200_BASE_US3)
-+        free_irq(AT91_PIN_PA24, port);
-                       return retval;
-               }
-       }
-@@ -701,6 +794,10 @@ static void atmel_shutdown(struct uart_p
-        * Free the interrupt
-        */
-       free_irq(port->irq, port);
-+  if (port->mapbase == AT91RM9200_BASE_US0)
-+    free_irq(AT91_PIN_PA19, port);
-+  if (port->mapbase == AT91RM9200_BASE_US3)
-+    free_irq(AT91_PIN_PA24, port);
-       /*
-        * If there is a specific "close" function (to unregister
diff --git a/target/linux/at91/patches-2.6.21/009-fdl-uartinit.patch b/target/linux/at91/patches-2.6.21/009-fdl-uartinit.patch
deleted file mode 100644 (file)
index c604710..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: linux-2.6.21.7/arch/arm/mach-at91/at91rm9200_devices.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/at91rm9200_devices.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/at91rm9200_devices.c
-@@ -618,7 +618,6 @@ void __init at91_init_leds(u8 cpu_led, u
- #if defined(CONFIG_NEW_LEDS)
--
- static struct platform_device at91_leds = {
-       .name           = "at91_leds",
-       .id             = -1,
-@@ -724,6 +723,10 @@ static inline void configure_usart0_pins
-        *  We need to drive the pin manually.  Default is off (RTS is active low).
-        */
-       at91_set_gpio_output(AT91_PIN_PA21, 1);
-+      at91_set_gpio_output(AT91_PIN_PB6, 1);  /* DTR0 */
-+      at91_set_gpio_output(AT91_PIN_PB7, 1);  /* RI0 */
-+      at91_set_gpio_input(AT91_PIN_PA19, 1);  /* DCD0 */
-+      at91_set_deglitch(AT91_PIN_PA19, 1);
- }
- static struct resource uart1_resources[] = {
-@@ -835,6 +838,12 @@ static inline void configure_usart3_pins
- {
-       at91_set_B_periph(AT91_PIN_PA5, 1);             /* TXD3 */
-       at91_set_B_periph(AT91_PIN_PA6, 0);             /* RXD3 */
-+      at91_set_B_periph(AT91_PIN_PB0, 0);   /* RTS3 */
-+      at91_set_B_periph(AT91_PIN_PB1, 0);   /* CTS3 */
-+      at91_set_gpio_output(AT91_PIN_PB29, 1); /* DTR0 */
-+      at91_set_gpio_output(AT91_PIN_PB2, 1);  /* RI0 */
-+      at91_set_gpio_input(AT91_PIN_PA24, 1);  /* DCD0 */
-+      at91_set_deglitch(AT91_PIN_PA24, 1);
- }
- struct platform_device *at91_uarts[ATMEL_MAX_UART];   /* the UARTs to use */
diff --git a/target/linux/at91/patches-2.6.21/010-dm9161a-phyfix.patch b/target/linux/at91/patches-2.6.21/010-dm9161a-phyfix.patch
deleted file mode 100644 (file)
index 7d7d51f..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: linux-2.6.21.7/drivers/net/arm/at91_ether.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/net/arm/at91_ether.c
-+++ linux-2.6.21.7/drivers/net/arm/at91_ether.c
-@@ -146,6 +146,7 @@ static void update_linkspeed(struct net_
-       struct at91_private *lp = netdev_priv(dev);
-       unsigned int bmsr, bmcr, lpa, mac_cfg;
-       unsigned int speed, duplex;
-+      unsigned long timeout = jiffies + HZ;
-       if (!mii_link_ok(&lp->mii)) {           /* no link */
-               netif_carrier_off(dev);
-@@ -158,8 +159,15 @@ static void update_linkspeed(struct net_
-       read_phy(lp->phy_address, MII_BMSR, &bmsr);
-       read_phy(lp->phy_address, MII_BMCR, &bmcr);
-       if (bmcr & BMCR_ANENABLE) {                             /* AutoNegotiation is enabled */
--              if (!(bmsr & BMSR_ANEGCOMPLETE))
--                      return;                 /* Do nothing - another interrupt generated when negotiation complete */
-+              while (!(bmsr & BMSR_ANEGCOMPLETE)) {
-+                      if (time_after(jiffies, timeout)) {
-+                              printk("at91_ether: Auto-negotiate timeout\n");
-+                              return;
-+                      }
-+                      read_phy(lp->phy_address, MII_BMSR, &bmsr);
-+                      read_phy(lp->phy_address, MII_BMCR, &bmcr);
-+                      cpu_relax();
-+              }
-               read_phy(lp->phy_address, MII_LPA, &lpa);
-               if ((lpa & LPA_100FULL) || (lpa & LPA_100HALF)) speed = SPEED_100;
diff --git a/target/linux/at91/patches-2.6.21/011-vlink-resetfix.patch b/target/linux/at91/patches-2.6.21/011-vlink-resetfix.patch
deleted file mode 100644 (file)
index 38014e8..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/board-vlink.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
-@@ -175,6 +175,7 @@ static void __init vlink_board_init(void
- /* USB Device control */
-        at91_set_gpio_input(AT91_PIN_PB27, 1);  // UDB_CNX
-        at91_set_gpio_output(AT91_PIN_PB28, 1); // UDB_PUP
-+                       at91_set_multi_drive(AT91_PIN_PB28, 1); // Set to multi-drive
- }
diff --git a/target/linux/at91/patches-2.6.21/012-at91-mmcfix.patch b/target/linux/at91/patches-2.6.21/012-at91-mmcfix.patch
deleted file mode 100644 (file)
index b7d6fe5..0000000
+++ /dev/null
@@ -1,426 +0,0 @@
-Index: linux-2.6.21.7/drivers/mmc/at91_mci.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/mmc/at91_mci.c
-+++ linux-2.6.21.7/drivers/mmc/at91_mci.c
-@@ -79,7 +79,8 @@
- #define DRIVER_NAME "at91_mci"
--#undef        SUPPORT_4WIRE
-+//#undef      SUPPORT_4WIRE
-+#define       SUPPORT_4WIRE
- #define FL_SENT_COMMAND       (1 << 0)
- #define FL_SENT_STOP  (1 << 1)
-@@ -132,7 +133,7 @@ struct at91mci_host
- /*
-  * Copy from sg to a dma block - used for transfers
-  */
--static inline void at91mci_sg_to_dma(struct at91mci_host *host, struct mmc_data *data)
-+static inline void at91_mci_sg_to_dma(struct at91mci_host *host, struct mmc_data *data)
- {
-       unsigned int len, i, size;
-       unsigned *dmabuf = host->buffer;
-@@ -181,7 +182,7 @@ static inline void at91mci_sg_to_dma(str
- /*
-  * Prepare a dma read
-  */
--static void at91mci_pre_dma_read(struct at91mci_host *host)
-+static void at91_mci_pre_dma_read(struct at91mci_host *host)
- {
-       int i;
-       struct scatterlist *sg;
-@@ -249,23 +250,24 @@ static void at91mci_pre_dma_read(struct 
- /*
-  * Handle after a dma read
-  */
--static void at91mci_post_dma_read(struct at91mci_host *host)
-+static int at91_mci_post_dma_read(struct at91mci_host *host)
- {
-       struct mmc_command *cmd;
-       struct mmc_data *data;
-+      int completed = 0;
-       pr_debug("post dma read\n");
-       cmd = host->cmd;
-       if (!cmd) {
-               pr_debug("no command\n");
--              return;
-+              return 1;
-       }
-       data = cmd->data;
-       if (!data) {
-               pr_debug("no data\n");
--              return;
-+              return 1;
-       }
-       while (host->in_use_index < host->transfer_index) {
-@@ -300,39 +302,14 @@ static void at91mci_post_dma_read(struct
-       /* Is there another transfer to trigger? */
-       if (host->transfer_index < data->sg_len)
--              at91mci_pre_dma_read(host);
-+              at91_mci_pre_dma_read(host);
-       else {
-+              at91_mci_write(host, AT91_MCI_IDR, AT91_MCI_ENDRX);
-               at91_mci_write(host, AT91_MCI_IER, AT91_MCI_RXBUFF);
--              at91_mci_write(host, ATMEL_PDC_PTCR, ATMEL_PDC_RXTDIS | ATMEL_PDC_TXTDIS);
-       }
-       pr_debug("post dma read done\n");
--}
--
--/*
-- * Handle transmitted data
-- */
--static void at91_mci_handle_transmitted(struct at91mci_host *host)
--{
--      struct mmc_command *cmd;
--      struct mmc_data *data;
--
--      pr_debug("Handling the transmit\n");
--
--      /* Disable the transfer */
--      at91_mci_write(host, ATMEL_PDC_PTCR, ATMEL_PDC_RXTDIS | ATMEL_PDC_TXTDIS);
--
--      /* Now wait for cmd ready */
--      at91_mci_write(host, AT91_MCI_IDR, AT91_MCI_TXBUFE);
--      at91_mci_write(host, AT91_MCI_IER, AT91_MCI_NOTBUSY);
--
--      cmd = host->cmd;
--      if (!cmd) return;
--
--      data = cmd->data;
--      if (!data) return;
--
--      data->bytes_xfered = host->total_length;
-+      return completed;
- }
- /*
-@@ -340,10 +317,17 @@ static void at91_mci_handle_transmitted(
-  */
- static void at91_mci_enable(struct at91mci_host *host)
- {
-+      unsigned int mr;
-+
-       at91_mci_write(host, AT91_MCI_CR, AT91_MCI_MCIEN);
-       at91_mci_write(host, AT91_MCI_IDR, 0xffffffff);
-       at91_mci_write(host, AT91_MCI_DTOR, AT91_MCI_DTOMUL_1M | AT91_MCI_DTOCYC);
--      at91_mci_write(host, AT91_MCI_MR, AT91_MCI_PDCMODE | 0x34a);
-+      mr = AT91_MCI_PDCMODE | 0x34a;
-+
-+      if (cpu_is_at91sam9260() || cpu_is_at91sam9263())
-+              mr |= AT91_MCI_RDPROOF | AT91_MCI_WRPROOF;
-+
-+      at91_mci_write(host, AT91_MCI_MR, mr);
-       /* use Slot A or B (only one at same time) */
-       at91_mci_write(host, AT91_MCI_SDCR, host->board->slot_b);
-@@ -359,9 +343,8 @@ static void at91_mci_disable(struct at91
- /*
-  * Send a command
-- * return the interrupts to enable
-  */
--static unsigned int at91_mci_send_command(struct at91mci_host *host, struct mmc_command *cmd)
-+static void at91_mci_send_command(struct at91mci_host *host, struct mmc_command *cmd)
- {
-       unsigned int cmdr, mr;
-       unsigned int block_length;
-@@ -372,8 +355,7 @@ static unsigned int at91_mci_send_comman
-       host->cmd = cmd;
--      /* Not sure if this is needed */
--#if 0
-+      /* Needed for leaving busy state before CMD1 */
-       if ((at91_mci_read(host, AT91_MCI_SR) & AT91_MCI_RTOE) && (cmd->opcode == 1)) {
-               pr_debug("Clearing timeout\n");
-               at91_mci_write(host, AT91_MCI_ARGR, 0);
-@@ -383,7 +365,7 @@ static unsigned int at91_mci_send_comman
-                       pr_debug("Clearing: SR = %08X\n", at91_mci_read(host, AT91_MCI_SR));
-               }
-       }
--#endif
-+
-       cmdr = cmd->opcode;
-       if (mmc_resp_type(cmd) == MMC_RSP_NONE)
-@@ -440,50 +422,48 @@ static unsigned int at91_mci_send_comman
-               at91_mci_write(host, ATMEL_PDC_TCR, 0);
-               at91_mci_write(host, ATMEL_PDC_TNPR, 0);
-               at91_mci_write(host, ATMEL_PDC_TNCR, 0);
-+              ier = AT91_MCI_CMDRDY;
-+      } else {
-+              /* zero block length in PDC mode */
-+              mr = at91_mci_read(host, AT91_MCI_MR) & 0x7fff;
-+              at91_mci_write(host, AT91_MCI_MR, mr | (block_length << 16) | AT91_MCI_PDCMODE);
-+
-+              /*
-+               * Disable the PDC controller
-+               */
-+              at91_mci_write(host, ATMEL_PDC_PTCR, ATMEL_PDC_RXTDIS | ATMEL_PDC_TXTDIS);
--              at91_mci_write(host, AT91_MCI_ARGR, cmd->arg);
--              at91_mci_write(host, AT91_MCI_CMDR, cmdr);
--              return AT91_MCI_CMDRDY;
--      }
--
--      mr = at91_mci_read(host, AT91_MCI_MR) & 0x7fff; /* zero block length and PDC mode */
--      at91_mci_write(host, AT91_MCI_MR, mr | (block_length << 16) | AT91_MCI_PDCMODE);
--
--      /*
--       * Disable the PDC controller
--       */
--      at91_mci_write(host, ATMEL_PDC_PTCR, ATMEL_PDC_RXTDIS | ATMEL_PDC_TXTDIS);
--
--      if (cmdr & AT91_MCI_TRCMD_START) {
--              data->bytes_xfered = 0;
--              host->transfer_index = 0;
--              host->in_use_index = 0;
--              if (cmdr & AT91_MCI_TRDIR) {
--                      /*
--                       * Handle a read
--                       */
--                      host->buffer = NULL;
--                      host->total_length = 0;
-+              if (cmdr & AT91_MCI_TRCMD_START) {
-+                      data->bytes_xfered = 0;
-+                      host->transfer_index = 0;
-+                      host->in_use_index = 0;
-+                      if (cmdr & AT91_MCI_TRDIR) {
-+                              /*
-+                               * Handle a read
-+                               */
-+                              host->buffer = NULL;
-+                              host->total_length = 0;
--                      at91mci_pre_dma_read(host);
--                      ier = AT91_MCI_ENDRX /* | AT91_MCI_RXBUFF */;
--              }
--              else {
--                      /*
--                       * Handle a write
--                       */
--                      host->total_length = block_length * blocks;
--                      host->buffer = dma_alloc_coherent(NULL,
--                                                host->total_length,
--                                                &host->physical_address, GFP_KERNEL);
--
--                      at91mci_sg_to_dma(host, data);
--
--                      pr_debug("Transmitting %d bytes\n", host->total_length);
--
--                      at91_mci_write(host, ATMEL_PDC_TPR, host->physical_address);
--                      at91_mci_write(host, ATMEL_PDC_TCR, host->total_length / 4);
--                      ier = AT91_MCI_TXBUFE;
-+                              at91_mci_pre_dma_read(host);
-+                              ier = AT91_MCI_ENDRX /* | AT91_MCI_RXBUFF */;
-+                      }
-+                      else {
-+                              /*
-+                              * Handle a write
-+                              */
-+                              host->total_length = block_length * blocks;
-+                              host->buffer = dma_alloc_coherent(NULL,
-+                                                      host->total_length,
-+                                                      &host->physical_address, GFP_KERNEL);
-+
-+                              at91_mci_sg_to_dma(host, data);
-+
-+                              pr_debug("Transmitting %d bytes\n", host->total_length);
-+
-+                              at91_mci_write(host, ATMEL_PDC_TPR, host->physical_address);
-+                              at91_mci_write(host, ATMEL_PDC_TCR, host->total_length / 4);
-+                              ier = AT91_MCI_CMDRDY;
-+                      }
-               }
-       }
-@@ -498,39 +478,24 @@ static unsigned int at91_mci_send_comman
-       if (cmdr & AT91_MCI_TRCMD_START) {
-               if (cmdr & AT91_MCI_TRDIR)
-                       at91_mci_write(host, ATMEL_PDC_PTCR, ATMEL_PDC_RXTEN);
--              else
--                      at91_mci_write(host, ATMEL_PDC_PTCR, ATMEL_PDC_TXTEN);
-       }
--      return ier;
--}
--/*
-- * Wait for a command to complete
-- */
--static void at91mci_process_command(struct at91mci_host *host, struct mmc_command *cmd)
--{
--      unsigned int ier;
--
--      ier = at91_mci_send_command(host, cmd);
--
--      pr_debug("setting ier to %08X\n", ier);
--
--      /* Stop on errors or the required value */
-+      /* Enable selected interrupts */
-       at91_mci_write(host, AT91_MCI_IER, AT91_MCI_ERRORS | ier);
- }
- /*
-  * Process the next step in the request
-  */
--static void at91mci_process_next(struct at91mci_host *host)
-+static void at91_mci_process_next(struct at91mci_host *host)
- {
-       if (!(host->flags & FL_SENT_COMMAND)) {
-               host->flags |= FL_SENT_COMMAND;
--              at91mci_process_command(host, host->request->cmd);
-+              at91_mci_send_command(host, host->request->cmd);
-       }
-       else if ((!(host->flags & FL_SENT_STOP)) && host->request->stop) {
-               host->flags |= FL_SENT_STOP;
--              at91mci_process_command(host, host->request->stop);
-+              at91_mci_send_command(host, host->request->stop);
-       }
-       else
-               mmc_request_done(host->mmc, host->request);
-@@ -539,7 +504,7 @@ static void at91mci_process_next(struct 
- /*
-  * Handle a command that has been completed
-  */
--static void at91mci_completed_command(struct at91mci_host *host)
-+static void at91_mci_completed_command(struct at91mci_host *host)
- {
-       struct mmc_command *cmd = host->cmd;
-       unsigned int status;
-@@ -583,7 +548,7 @@ static void at91mci_completed_command(st
-       else
-               cmd->error = MMC_ERR_NONE;
--      at91mci_process_next(host);
-+      at91_mci_process_next(host);
- }
- /*
-@@ -595,7 +560,60 @@ static void at91_mci_request(struct mmc_
-       host->request = mrq;
-       host->flags = 0;
--      at91mci_process_next(host);
-+      at91_mci_process_next(host);
-+}
-+
-+/*
-+ * Handle transmitted data
-+ */
-+static void at91_mci_handle_transmitted(struct at91mci_host *host)
-+{
-+      struct mmc_command *cmd;
-+      struct mmc_data *data;
-+
-+      pr_debug("Handling the transmit\n");
-+
-+      /* Disable the transfer */
-+      at91_mci_write(host, ATMEL_PDC_PTCR, ATMEL_PDC_RXTDIS | ATMEL_PDC_TXTDIS);
-+
-+      /* Now wait for cmd ready */
-+      at91_mci_write(host, AT91_MCI_IDR, AT91_MCI_TXBUFE);
-+
-+      cmd = host->cmd;
-+      if (!cmd) return;
-+
-+      data = cmd->data;
-+      if (!data) return;
-+
-+      if (cmd->opcode == MMC_WRITE_MULTIPLE_BLOCK) {
-+              pr_debug("multiple write : wait for BLKE...\n");
-+              at91_mci_write(host, AT91_MCI_IER, AT91_MCI_BLKE);
-+      } else
-+              at91_mci_write(host, AT91_MCI_IER, AT91_MCI_NOTBUSY);
-+
-+      data->bytes_xfered = host->total_length;
-+}
-+
-+
-+/*Handle after command sent ready*/
-+static int at91_mci_handle_cmdrdy(struct at91mci_host *host)
-+{
-+      if (!host->cmd)
-+              return 1;
-+      else if (!host->cmd->data) {
-+              if (host->flags & FL_SENT_STOP) {
-+                      /*After multi block write, we mus wait for NOTBUSY*/
-+                      at91_mci_write(host, AT91_MCI_IER, AT91_MCI_NOTBUSY);
-+              } else return 1;
-+      } else if (host->cmd->data->flags & MMC_DATA_WRITE) {
-+              /*After sending multi-block-write command, start DMA transfer*/
-+              at91_mci_write(host, AT91_MCI_IER, AT91_MCI_TXBUFE);
-+              at91_mci_write(host, AT91_MCI_IER, AT91_MCI_BLKE);
-+              at91_mci_write(host, ATMEL_PDC_PTCR, ATMEL_PDC_TXTEN);
-+      }
-+
-+      /* command not completed, have to wait */
-+      return 0;
- }
- /*
-@@ -698,29 +716,33 @@ static irqreturn_t at91_mci_irq(int irq,
-                       at91_mci_handle_transmitted(host);
-               }
-+              if (int_status & AT91_MCI_ENDRX) {
-+                      pr_debug("ENDRX\n");
-+                      at91_mci_post_dma_read(host);
-+              }
-+
-               if (int_status & AT91_MCI_RXBUFF) {
-                       pr_debug("RX buffer full\n");
--                      at91_mci_write(host, AT91_MCI_IER, AT91_MCI_CMDRDY);
-+                      at91_mci_write(host, ATMEL_PDC_PTCR, ATMEL_PDC_RXTDIS | ATMEL_PDC_TXTDIS);
-+                      at91_mci_write(host, AT91_MCI_IDR, AT91_MCI_RXBUFF | AT91_MCI_ENDRX);
-+                      completed = 1;
-               }
-               if (int_status & AT91_MCI_ENDTX)
-                       pr_debug("Transmit has ended\n");
--              if (int_status & AT91_MCI_ENDRX) {
--                      pr_debug("Receive has ended\n");
--                      at91mci_post_dma_read(host);
--              }
--
-               if (int_status & AT91_MCI_NOTBUSY) {
-                       pr_debug("Card is ready\n");
--                      at91_mci_write(host, AT91_MCI_IER, AT91_MCI_CMDRDY);
-+                      completed = 1;
-               }
-               if (int_status & AT91_MCI_DTIP)
-                       pr_debug("Data transfer in progress\n");
--              if (int_status & AT91_MCI_BLKE)
-+              if (int_status & AT91_MCI_BLKE) {
-                       pr_debug("Block transfer has ended\n");
-+                      completed = 1;
-+              }
-               if (int_status & AT91_MCI_TXRDY)
-                       pr_debug("Ready to transmit\n");
-@@ -730,14 +752,14 @@ static irqreturn_t at91_mci_irq(int irq,
-               if (int_status & AT91_MCI_CMDRDY) {
-                       pr_debug("Command ready\n");
--                      completed = 1;
-+                      completed = at91_mci_handle_cmdrdy(host);
-               }
-       }
-       if (completed) {
-               pr_debug("Completed command\n");
-               at91_mci_write(host, AT91_MCI_IDR, 0xffffffff);
--              at91mci_completed_command(host);
-+              at91_mci_completed_command(host);
-       } else
-               at91_mci_write(host, AT91_MCI_IDR, int_status);
diff --git a/target/linux/at91/patches-2.6.21/013-at91-mmc1wire.patch b/target/linux/at91/patches-2.6.21/013-at91-mmc1wire.patch
deleted file mode 100644 (file)
index 5d68e63..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: linux-2.6.21.7/drivers/mmc/at91_mci.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/mmc/at91_mci.c
-+++ linux-2.6.21.7/drivers/mmc/at91_mci.c
-@@ -79,8 +79,7 @@
- #define DRIVER_NAME "at91_mci"
--//#undef      SUPPORT_4WIRE
--#define       SUPPORT_4WIRE
-+#undef        SUPPORT_4WIRE
- #define FL_SENT_COMMAND       (1 << 0)
- #define FL_SENT_STOP  (1 << 1)
diff --git a/target/linux/at91/patches-2.6.21/014-initpartition.patch b/target/linux/at91/patches-2.6.21/014-initpartition.patch
deleted file mode 100644 (file)
index b8bccd2..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: linux-2.6.21.7/drivers/mtd/devices/at91_dataflash.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/mtd/devices/at91_dataflash.c
-+++ linux-2.6.21.7/drivers/mtd/devices/at91_dataflash.c
-@@ -161,12 +161,12 @@ static struct mtd_partition static_parti
-               .mask_flags     = MTD_WRITEABLE,        /* read-only */
-       },
-       {
--              .name           = "kernel",
-+              .name           = "knlroot",
-               .offset         = MTDPART_OFS_NXTBLK,
--              .size           = 5 * 32 * 8 * 1056,    /* 5 sectors */
-+              .size           = 0x320400,     /* 5 sectors */
-       },
-       {
--              .name           = "filesystem",
-+              .name           = "jffs2",
-               .offset         = MTDPART_OFS_NXTBLK,
-               .size           = MTDPART_SIZ_FULL,     /* rest = 26 sectors */
-       }
diff --git a/target/linux/at91/patches-2.6.21/015-simenable.patch b/target/linux/at91/patches-2.6.21/015-simenable.patch
deleted file mode 100644 (file)
index 9b11f76..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-Index: linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/board-vlink.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
-@@ -150,32 +150,38 @@ static void __init vlink_board_init(void
-       /* LEDs */
- //    at91_gpio_leds(vlink_leds, ARRAY_SIZE(vlink_leds));
--/* Other LED's */
--       at91_set_gpio_output(AT91_PIN_PC7, 1);  // LED FRONT AP1
--       at91_set_gpio_output(AT91_PIN_PC8, 1);  // LED FRONT BP1
--       at91_set_gpio_output(AT91_PIN_PB14, 1); // LED BACK AP1
--       at91_set_gpio_output(AT91_PIN_PB15, 1); // LED BACK BP1
--       at91_set_gpio_output(AT91_PIN_PB16, 1); // LED BACK AP2
--       at91_set_gpio_output(AT91_PIN_PB17, 1); // LED BACK BP2
--
--/* SIM Cards */
--       at91_set_gpio_output(AT91_PIN_PB9, 1);  // ENBSC3
--       at91_set_gpio_output(AT91_PIN_PB10, 1); // ENBSC2
--       at91_set_gpio_output(AT91_PIN_PB11, 1); // ENBSC1
--
--/* GSM Module Control */
--       at91_set_gpio_output(AT91_PIN_PB12, 1); // GSMONOFF
--
--/* Test jig presence detection */
--       at91_set_gpio_input(AT91_PIN_PB8, 1);   // JIGPRESENT
--
--/* Power indicator */
--       at91_set_gpio_input(AT91_PIN_PB22, 1);  // PWR_IND
--
--/* USB Device control */
--       at91_set_gpio_input(AT91_PIN_PB27, 1);  // UDB_CNX
--       at91_set_gpio_output(AT91_PIN_PB28, 1); // UDB_PUP
--                       at91_set_multi_drive(AT91_PIN_PB28, 1); // Set to multi-drive
-+      /* Other LED's */
-+      at91_set_gpio_output(AT91_PIN_PC7, 1);  // LED FRONT AP1
-+      at91_set_gpio_output(AT91_PIN_PC8, 1);  // LED FRONT BP1
-+      at91_set_gpio_output(AT91_PIN_PB14, 1); // LED BACK AP1
-+      at91_set_gpio_output(AT91_PIN_PB15, 1); // LED BACK BP1
-+      at91_set_gpio_output(AT91_PIN_PB16, 1); // LED BACK AP2
-+      at91_set_gpio_output(AT91_PIN_PB17, 1); // LED BACK BP2
-+
-+      /* Test jig presence detection */
-+      at91_set_gpio_input(AT91_PIN_PB8, 1);   // JIGPRESENT
-+
-+      /* SIM Cards */
-+      if (at91_get_gpio_value(AT91_PIN_PB8)) {
-+              at91_set_gpio_output(AT91_PIN_PB11, 0);
-+              at91_set_gpio_output(AT91_PIN_PB9, 1);
-+      } else {
-+              at91_set_gpio_output(AT91_PIN_PB11, 1);
-+              at91_set_gpio_output(AT91_PIN_PB9, 0);
-+      }
-+
-+      at91_set_gpio_output(AT91_PIN_PB10, 1); // ENBSC2
-+
-+      /* GSM Module Control */
-+      at91_set_gpio_output(AT91_PIN_PB12, 1); // GSMONOFF
-+
-+      /* Power indicator */
-+      at91_set_gpio_input(AT91_PIN_PB22, 1);  // PWR_IND
-+
-+      /* USB Device control */
-+      at91_set_gpio_input(AT91_PIN_PB27, 1);  // UDB_CNX
-+      at91_set_gpio_output(AT91_PIN_PB28, 1); // UDB_PUP
-+      at91_set_multi_drive(AT91_PIN_PB28, 1); // Set to multi-drive
- }
diff --git a/target/linux/at91/patches-2.6.21/016-v1-15-detect.patch b/target/linux/at91/patches-2.6.21/016-v1-15-detect.patch
deleted file mode 100644 (file)
index ccdb579..0000000
+++ /dev/null
@@ -1,207 +0,0 @@
-Index: linux-2.6.21.7/arch/arm/mach-at91/at91rm9200_devices.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/at91rm9200_devices.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/at91rm9200_devices.c
-@@ -840,9 +840,9 @@ static inline void configure_usart3_pins
-       at91_set_B_periph(AT91_PIN_PA6, 0);             /* RXD3 */
-       at91_set_B_periph(AT91_PIN_PB0, 0);   /* RTS3 */
-       at91_set_B_periph(AT91_PIN_PB1, 0);   /* CTS3 */
--      at91_set_gpio_output(AT91_PIN_PB29, 1); /* DTR0 */
--      at91_set_gpio_output(AT91_PIN_PB2, 1);  /* RI0 */
--      at91_set_gpio_input(AT91_PIN_PA24, 1);  /* DCD0 */
-+      at91_set_gpio_output(AT91_PIN_PB29, 1); /* DTR3 */
-+      at91_set_gpio_output(AT91_PIN_PB2, 1);  /* RI3 */
-+      at91_set_gpio_input(AT91_PIN_PA24, 1);  /* DCD3 */
-       at91_set_deglitch(AT91_PIN_PA24, 1);
- }
-Index: linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
-===================================================================
---- linux-2.6.21.7.orig/arch/arm/mach-at91/board-vlink.c
-+++ linux-2.6.21.7/arch/arm/mach-at91/board-vlink.c
-@@ -126,6 +126,7 @@ static struct spi_board_info vlink_spi_d
- static void __init vlink_board_init(void)
- {
-+      int v100;
-       /* Serial */
-       at91_add_device_serial();
-       /* Ethernet */
-@@ -147,6 +148,10 @@ static void __init vlink_board_init(void
- //    at91_set_gpio_output(AT91_PIN_PB22, 1); /* this MMC card slot can optionally use SPI signaling (CS3). */
-       at91_add_device_mmc(0, &vlink_mmc_data);
- #endif
-+// Set VLink version PIN as an input with pull up (V1.5 = GND)
-+      at91_set_gpio_input(AT91_PIN_PC2, 1);  
-+      v100 = at91_get_gpio_value(AT91_PIN_PC2);
-+
-       /* LEDs */
- //    at91_gpio_leds(vlink_leds, ARRAY_SIZE(vlink_leds));
-@@ -164,10 +169,16 @@ static void __init vlink_board_init(void
-       /* SIM Cards */
-       if (at91_get_gpio_value(AT91_PIN_PB8)) {
-               at91_set_gpio_output(AT91_PIN_PB11, 0);
--              at91_set_gpio_output(AT91_PIN_PB9, 1);
-+              if (v100)
-+                      at91_set_gpio_output(AT91_PIN_PB9, 1);
-+              else
-+                      at91_set_gpio_output(AT91_PIN_PC13, 1);
-       } else {
-               at91_set_gpio_output(AT91_PIN_PB11, 1);
--              at91_set_gpio_output(AT91_PIN_PB9, 0);
-+              if (v100)
-+                      at91_set_gpio_output(AT91_PIN_PB9, 0);
-+              else
-+                      at91_set_gpio_output(AT91_PIN_PC13, 0);
-       }
-       at91_set_gpio_output(AT91_PIN_PB10, 1); // ENBSC2
-@@ -182,7 +193,18 @@ static void __init vlink_board_init(void
-       at91_set_gpio_input(AT91_PIN_PB27, 1);  // UDB_CNX
-       at91_set_gpio_output(AT91_PIN_PB28, 1); // UDB_PUP
-       at91_set_multi_drive(AT91_PIN_PB28, 1); // Set to multi-drive
--
-+      
-+      if (v100)
-+      {       // V100
-+              at91_set_gpio_input (AT91_PIN_PC12, 1);   // SD Card present
-+      }
-+      else
-+      {       // DO special things for V1.5
-+              at91_set_gpio_output(AT91_PIN_PB9 , 0);   // USB suspend
-+              at91_set_gpio_input (AT91_PIN_PC10, 1);   // SD Card present
-+              at91_set_gpio_output(AT91_PIN_PC11, 0);   // USB Vin CTRL for modules onboard 
-+              at91_set_gpio_output(AT91_PIN_PC12, 0);   // SIM control 
-+      }
- }
- MACHINE_START(VLINK, "FDL VersaLink")
-Index: linux-2.6.21.7/drivers/char/vlink_giu.c
-===================================================================
---- linux-2.6.21.7.orig/drivers/char/vlink_giu.c
-+++ linux-2.6.21.7/drivers/char/vlink_giu.c
-@@ -41,8 +41,7 @@ static int major;    /* default is dynamic 
- module_param(major, int, 0);
- MODULE_PARM_DESC(major, "Major device number");
--#define VIO_NR_DEVS 96
--
-+#define VIO_NR_DEVS   96
- struct vio_dev {
-       struct cdev cdev;
- };
-@@ -50,6 +49,53 @@ struct vio_dev {
- struct vio_dev *vio_devices;
- static struct class *vio_class;
-+// KWJ + AJE
-+#define MAX_VIO_NAMES 24
-+typedef struct
-+{
-+      char port;
-+      char pin;
-+      char name100[10];
-+      char name150[10];
-+} VIO_NAMES;
-+
-+VIO_NAMES VioName[MAX_VIO_NAMES] = {  //Port,PIN, V100     , V150
-+                                                                              {'A',19,"port1DTR" ,"port1DTR"},
-+                                                                              {'A',24,"port2DTR" ,"port2DTR"},
-+                                                                              {'B',8, "jigOn"    ,"jigOn"} ,
-+                                                                              {'B',9, "enbSC3"   ,"usbSUSPND"},
-+                                                                              {'B',10,"enbSC2"   ,"enbSC2"},
-+                                                                              {'B',11,"enbSC1"   ,"enbSC1"},
-+                                                                              {'B',12,"gsmONOFF" ,"gsmONOFF"},
-+                                                                              {'B',14,"ledBAP1"  ,"ledBAP1"},
-+                                                                              {'B',15,"ledBBP1"  ,"ledBBP1"},
-+                                                                              {'B',16,"ledBAP2"  ,"ledBAP2"},
-+                                                                              {'B',17,"ledBBP2"  ,"ledBBP2"},
-+                                                                              {'B',27,"udpCNX"   ,"udpCNX"},
-+                                                                              {'B',28,"udpPUP"   ,"udpPUP"},
-+                                                                              {'B',29,"port2DCD" ,"port2DCD"},
-+                                                                              {'C',2, "vlVer100" ,"vlVer150"},
-+                                                                              {'C',7, "ledFAP1"  ,"ledFAP1"},
-+                                                                              {'C',8, "ledFBP1"  ,"ledFBP1"},
-+                                                                              {'C',10,"vioC10"   ,"sdCardON"},
-+                                                                              {'C',11,"vioC11"   ,"vusbCTRL"},
-+                                                                              {'C',12,"sdCardON" ,"simCTRL"},
-+                                                                              {'C',13,"vioC13"   ,"enbSC3"},
-+                                                                              {'C',14,"ledFBP2"  ,"ledFBP2"},
-+                                                                              {'C',15,"ledFAP2"  ,"ledFAP2"},
-+                                                                              {0,0,"",""}
-+                                                                 };
-+/*                                                                            {'B',18,"gsmRIO"  ,"gsmRIO"},
-+                                                                              {'B',20,"gsmTX"   ,"gsmTX"},
-+                                                                              {'B',21,"gsmRX"   ,"gsmRX"},
-+                                                                              {'B',22,"gsmPIND" ,"gsmPIND"},
-+                                                                              {'B',23,"gsmDCD"  ,"gsmDCD"},
-+                                                                              {'B',24,"gsmCTS"  ,"gsmCTS"},
-+                                                                              {'B',25,"gsmDSR"  ,"gsmDSR"},
-+                                                                              {'B',26,"gsmRTS"  ,"gsmRTS"},*/
-+static void lookupPINName(char version100, char *devName, char port, char pin);
-+// EOF KWJ + AJE
-+
- static ssize_t gpio_read(struct file *file, char __user *buf, size_t len,
-                          loff_t *ppos)
- {
-@@ -160,6 +206,8 @@ static int vio_probe(struct platform_dev
- {
-       int retval, i, j;
-       dev_t vdev = 0;
-+      char devName[30];
-+      int  vlinkV100;
-       if (major) {
-               vdev = MKDEV(major, 0);
-@@ -185,6 +233,7 @@ static int vio_probe(struct platform_dev
-               vio_remove(dev);
-               return PTR_ERR(vio_class);
-       }
-+    vlinkV100 = at91_get_gpio_value(AT91_PIN_PC2);            // Denotes V1.5 if ground
-       vio_devices = kmalloc(VIO_NR_DEVS * sizeof(struct vio_dev), GFP_KERNEL);
-       if (!vio_devices) {
-@@ -198,8 +247,10 @@ static int vio_probe(struct platform_dev
-                       int iodev = at91_is_pin_gpio(PIN_BASE + i*32 + j);
-                       if (iodev) {
-                               vio_setup_cdev(&vio_devices[i*32 + j], i*32 + j);
--                              class_device_create(vio_class, NULL, MKDEV(major, i*32 + j), NULL,
--                                      "vio%c%d", i + 'A', j);
-+                              // Lookup name of vio to create
-+                              lookupPINName(vlinkV100, devName, i, j);
-+                              class_device_create(vio_class, NULL, MKDEV(major, i*32 + j), NULL, devName);
-+//                                    "vio%c%d", i + 'A', j);
-                       }
-               }
-@@ -212,6 +263,29 @@ fail:
-       return retval;
- }
-+static void lookupPINName(char version100, char *devName, char port, char pin)
-+{
-+      int i = -1;
-+      char found = 0;
-+      while (!found)
-+      {
-+              i++;
-+              if (i >= MAX_VIO_NAMES)
-+                      break;
-+              if (VioName[i].port == port+'A' && VioName[i].pin == pin)
-+              {
-+                      printk(KERN_ERR "vio++: %c%d=%s\n",VioName[i].port,VioName[i].pin,VioName[i].name150);
-+                      if (version100)
-+                              strcpy(devName, VioName[i].name100);
-+                      else
-+                              strcpy(devName, VioName[i].name150);
-+                      found = 1;
-+              }
-+      }
-+      if (!found)
-+              sprintf(devName, "vio%c%d", port + 'A', pin);
-+}
-+
- static struct platform_device *vio_platform_device;
- static struct platform_driver vio_driver = {
diff --git a/target/linux/au1000/au1500/config-2.6.23 b/target/linux/au1000/au1500/config-2.6.23
deleted file mode 100644 (file)
index dbf773a..0000000
+++ /dev/null
@@ -1,243 +0,0 @@
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-CONFIG_64BIT_PHYS_ADDR=y
-# CONFIG_8139TOO is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-# CONFIG_ATM is not set
-CONFIG_BASE_SMALL=0
-CONFIG_BITREVERSE=y
-# CONFIG_BROADCOM_PHY is not set
-CONFIG_CHR_DEV_SG=m
-CONFIG_CMDLINE="root=/dev/mtdblock0 rootfstype=squashfs,jffs2 init=/etc/preinit"
-# CONFIG_CPU_BIG_ENDIAN is not set
-CONFIG_CPU_HAS_LLSC=y
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_CPU_LITTLE_ENDIAN=y
-# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
-CONFIG_CPU_MIPS32_R1=y
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-CONFIG_CPU_MIPSR1=y
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_VR41XX is not set
-CONFIG_CRAMFS=m
-CONFIG_CRC16=y
-CONFIG_DEVPORT=y
-# CONFIG_DM9000 is not set
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_DUMMY=m
-CONFIG_ELF_CORE=y
-# CONFIG_FIXED_PHY is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_GPIO=y
-# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
-# CONFIG_HAMRADIO is not set
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HID=m
-CONFIG_HID_SUPPORT=y
-CONFIG_HW_HAS_PCI=y
-CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
-CONFIG_I2C=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=m
-# CONFIG_IDE is not set
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INPUT=y
-CONFIG_INPUT_KEYBOARD=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=y
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_LEDS_ALIX is not set
-CONFIG_LEDS_GPIO=y
-# CONFIG_LEDS_TRIGGERS is not set
-# CONFIG_LEMOTE_FULONG is not set
-CONFIG_MACH_ALCHEMY=y
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_VR41XX is not set
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_MIPS=y
-# CONFIG_MIPS_ATLAS is not set
-CONFIG_MIPS_AU1X00_ENET=y
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_COBALT is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-# CONFIG_MIPS_MALTA is not set
-# CONFIG_MIPS_MIRAGE is not set
-CONFIG_MIPS_MTX1=y
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_SEAD is not set
-# CONFIG_MIPS_SIM is not set
-# CONFIG_MIPS_XXS1500 is not set
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MTD=y
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_ALCHEMY is not set
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_CFI=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-# CONFIG_MTD_CFI_INTELEXT is not set
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_CONCAT=y
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-CONFIG_MTD_MTX1=y
-# CONFIG_MTD_ONENAND is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_NET_SCH_ESFQ_NFCT is not set
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NO_IOPORT is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PCIPCWATCHDOG is not set
-CONFIG_PHYLIB=y
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_PPP_MPPE is not set
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_QSEMI_PHY is not set
-CONFIG_RESOURCES_64BIT=y
-# CONFIG_RTC is not set
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-CONFIG_SCSI_CONSTANTS=y
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_SCSI_WAIT_SCAN=m
-CONFIG_SERIAL_8250_AU1X00=y
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_PCI=m
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SMC91X is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_SND_AU1X00 is not set
-CONFIG_SOC_AU1500=y
-CONFIG_SOC_AU1X00=y
-CONFIG_SOFT_WATCHDOG=m
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_STANDALONE is not set
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_SYS_SUPPORTS_KGDB=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-# CONFIG_TC35815 is not set
-# CONFIG_TMD_HERMES is not set
-# CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_TOSHIBA_RBTX4927 is not set
-# CONFIG_TOSHIBA_RBTX4938 is not set
-CONFIG_TRAD_SIGNALS=y
-# CONFIG_USBPCWATCHDOG is not set
-CONFIG_USB_EHCI_HCD=m
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_HCD=m
-# CONFIG_USB_PWC is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_SERIAL_OTI6858 is not set
-CONFIG_USB_UHCI_HCD=m
-# CONFIG_USER_NS is not set
-CONFIG_V4L_USB_DRIVERS=y
-# CONFIG_VGASTATE is not set
-# CONFIG_VIA_RHINE is not set
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_CPIA2 is not set
-CONFIG_VIDEO_V4L1=y
-CONFIG_WDT_MTX1=y
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/au1000/au1500/config-2.6.24 b/target/linux/au1000/au1500/config-2.6.24
deleted file mode 100644 (file)
index 85e2237..0000000
+++ /dev/null
@@ -1,270 +0,0 @@
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-CONFIG_64BIT_PHYS_ADDR=y
-# CONFIG_8139TOO is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUPPORTS_OPROFILE=y
-# CONFIG_ATM is not set
-CONFIG_BASE_SMALL=0
-# CONFIG_BCM47XX is not set
-CONFIG_BITREVERSE=y
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_BT_HCIUART_LL is not set
-CONFIG_CEVT_R4K=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CMDLINE="root=/dev/mtdblock0 rootfstype=squashfs,jffs2 init=/etc/preinit"
-# CONFIG_CPU_BIG_ENDIAN is not set
-CONFIG_CPU_HAS_LLSC=y
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_CPU_LITTLE_ENDIAN=y
-# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
-CONFIG_CPU_MIPS32_R1=y
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-CONFIG_CPU_MIPSR1=y
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_VR41XX is not set
-CONFIG_CRAMFS=m
-CONFIG_CRC16=y
-CONFIG_CSRC_R4K=y
-CONFIG_DEVPORT=y
-# CONFIG_DM9000 is not set
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_DUMMY=m
-CONFIG_ELF_CORE=y
-# CONFIG_FIXED_PHY is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_GPIO=y
-# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
-# CONFIG_HAMRADIO is not set
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HID=m
-# CONFIG_HIDRAW is not set
-CONFIG_HID_SUPPORT=y
-CONFIG_HW_HAS_PCI=y
-CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
-CONFIG_I2C=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=m
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IDE is not set
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INPUT=y
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_IRQ_CPU=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=y
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_LEDS_ALIX is not set
-CONFIG_LEDS_GPIO=y
-# CONFIG_LEDS_TRIGGERS is not set
-# CONFIG_LEMOTE_FULONG is not set
-CONFIG_MACH_ALCHEMY=y
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_VR41XX is not set
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_MDIO_BITBANG is not set
-CONFIG_MIPS=y
-# CONFIG_MIPS_ATLAS is not set
-CONFIG_MIPS_AU1X00_ENET=y
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_COBALT is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-# CONFIG_MIPS_MALTA is not set
-# CONFIG_MIPS_MIRAGE is not set
-CONFIG_MIPS_MTX1=y
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_SEAD is not set
-# CONFIG_MIPS_SIM is not set
-# CONFIG_MIPS_XXS1500 is not set
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MTD=y
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_ALCHEMY is not set
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_CFI=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-# CONFIG_MTD_CFI_INTELEXT is not set
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_CONCAT=y
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-CONFIG_MTD_MTX1=y
-# CONFIG_MTD_ONENAND is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_NET_SCH_ESFQ_NFCT is not set
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NO_IOPORT is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PCIPCWATCHDOG is not set
-CONFIG_PCI=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PHYLIB=y
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_PPP_MPPE is not set
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_QSEMI_PHY is not set
-CONFIG_RESOURCES_64BIT=y
-# CONFIG_RTC is not set
-CONFIG_RTC_LIB=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-CONFIG_SCSI_CONSTANTS=y
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_SCSI_WAIT_SCAN=m
-CONFIG_SERIAL_8250_AU1X00=y
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_PCI=m
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set
-CONFIG_SLABINFO=y
-# CONFIG_SMC91X is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_SND_AU1X00 is not set
-CONFIG_SOC_AU1500=y
-CONFIG_SOC_AU1X00=y
-CONFIG_SOFT_WATCHDOG=m
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_STANDALONE is not set
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_SYS_SUPPORTS_KGDB=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-# CONFIG_TC35815 is not set
-CONFIG_TICK_ONESHOT=y
-# CONFIG_TMD_HERMES is not set
-# CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_TOSHIBA_RBTX4927 is not set
-# CONFIG_TOSHIBA_RBTX4938 is not set
-CONFIG_TRAD_SIGNALS=y
-# CONFIG_USBPCWATCHDOG is not set
-CONFIG_USB=m
-CONFIG_USB_EHCI_HCD=m
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_HCD=m
-# CONFIG_USB_PWC is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_SERIAL_CH341 is not set
-# CONFIG_USB_SERIAL_OTI6858 is not set
-CONFIG_USB_UHCI_HCD=m
-# CONFIG_USER_NS is not set
-CONFIG_V4L_USB_DRIVERS=y
-# CONFIG_VGASTATE is not set
-# CONFIG_VIA_RHINE is not set
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_CPIA2 is not set
-# CONFIG_VIDEO_TCM825X is not set
-CONFIG_VIDEO_V4L1=y
-# CONFIG_VIDEO_VP27SMPX is not set
-CONFIG_WDT_MTX1=y
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/au1000/au1500/config-2.6.25 b/target/linux/au1000/au1500/config-2.6.25
deleted file mode 100644 (file)
index 8f87133..0000000
+++ /dev/null
@@ -1,273 +0,0 @@
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-CONFIG_64BIT_PHYS_ADDR=y
-# CONFIG_8139TOO is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUPPORTS_OPROFILE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_ATM is not set
-CONFIG_BASE_SMALL=0
-# CONFIG_BCM47XX is not set
-CONFIG_BITREVERSE=y
-# CONFIG_BROADCOM_PHY is not set
-CONFIG_CEVT_R4K=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CLASSIC_RCU=y
-CONFIG_CMDLINE="root=/dev/mtdblock0 rootfstype=squashfs,jffs2 init=/etc/preinit"
-# CONFIG_CPU_BIG_ENDIAN is not set
-CONFIG_CPU_HAS_LLSC=y
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_CPU_LITTLE_ENDIAN=y
-# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
-CONFIG_CPU_MIPS32_R1=y
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-CONFIG_CPU_MIPSR1=y
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_VR41XX is not set
-CONFIG_CRAMFS=m
-CONFIG_CRC16=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CSRC_R4K=y
-CONFIG_DEVPORT=y
-# CONFIG_DM9000 is not set
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_DUMMY=m
-# CONFIG_E1000E_ENABLED is not set
-CONFIG_ELF_CORE=y
-# CONFIG_FIXED_PHY is not set
-CONFIG_FS_POSIX_ACL=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_GPIO=y
-# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
-# CONFIG_HAMRADIO is not set
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAVE_IDE=y
-# CONFIG_HAVE_KPROBES is not set
-# CONFIG_HAVE_KRETPROBES is not set
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HID=m
-CONFIG_HID_SUPPORT=y
-CONFIG_HW_HAS_PCI=y
-CONFIG_HW_RANDOM=y
-CONFIG_HZ=250
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
-CONFIG_I2C=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=m
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IDE is not set
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INPUT=y
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_IRQ_CPU=y
-CONFIG_KEXEC=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=y
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-# CONFIG_LEDS_ALIX is not set
-CONFIG_LEDS_GPIO=y
-# CONFIG_LEDS_TRIGGERS is not set
-# CONFIG_LEMOTE_FULONG is not set
-CONFIG_LZO_COMPRESS=m
-CONFIG_LZO_DECOMPRESS=m
-CONFIG_MACH_ALCHEMY=y
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_VR41XX is not set
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_MDIO_BITBANG is not set
-# CONFIG_MEMSTICK is not set
-CONFIG_MIPS=y
-# CONFIG_MIPS_ATLAS is not set
-CONFIG_MIPS_AU1X00_ENET=y
-# CONFIG_MIPS_BOSPORUS is not set
-# CONFIG_MIPS_COBALT is not set
-# CONFIG_MIPS_DB1000 is not set
-# CONFIG_MIPS_DB1100 is not set
-# CONFIG_MIPS_DB1200 is not set
-# CONFIG_MIPS_DB1500 is not set
-# CONFIG_MIPS_DB1550 is not set
-CONFIG_MIPS_L1_CACHE_SHIFT=5
-# CONFIG_MIPS_MALTA is not set
-# CONFIG_MIPS_MIRAGE is not set
-CONFIG_MIPS_MTX1=y
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_PB1000 is not set
-# CONFIG_MIPS_PB1100 is not set
-# CONFIG_MIPS_PB1200 is not set
-# CONFIG_MIPS_PB1500 is not set
-# CONFIG_MIPS_PB1550 is not set
-# CONFIG_MIPS_SEAD is not set
-# CONFIG_MIPS_SIM is not set
-# CONFIG_MIPS_XXS1500 is not set
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MTD=y
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_ALCHEMY is not set
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_CFI=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-# CONFIG_MTD_CFI_INTELEXT is not set
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_CONCAT=y
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-CONFIG_MTD_MTX1=y
-# CONFIG_MTD_ONENAND is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_NET_SCH_ESFQ_NFCT is not set
-# CONFIG_NET_VENDOR_3COM is not set
-CONFIG_NO_HZ=y
-# CONFIG_NO_IOPORT is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
-CONFIG_PCI=y
-# CONFIG_PCIPCWATCHDOG is not set
-CONFIG_PCI_DOMAINS=y
-CONFIG_PHYLIB=y
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-# CONFIG_PPP_MPPE is not set
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_R6040 is not set
-# CONFIG_REALTEK_PHY is not set
-CONFIG_RESOURCES_64BIT=y
-# CONFIG_RTC is not set
-CONFIG_RTC_LIB=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-CONFIG_SCSI_CONSTANTS=y
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_SCSI_WAIT_SCAN=m
-CONFIG_SERIAL_8250_AU1X00=y
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_NR_UARTS=4
-CONFIG_SERIAL_8250_PCI=m
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP28 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set
-CONFIG_SLABINFO=y
-# CONFIG_SMC91X is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_SND_AU1X00 is not set
-CONFIG_SOC_AU1500=y
-CONFIG_SOC_AU1X00=y
-CONFIG_SOFT_WATCHDOG=m
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-CONFIG_SSB_POSSIBLE=y
-# CONFIG_STANDALONE is not set
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_SYS_SUPPORTS_KGDB=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-# CONFIG_TC35815 is not set
-CONFIG_TICK_ONESHOT=y
-# CONFIG_TMD_HERMES is not set
-# CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_TOSHIBA_RBTX4927 is not set
-# CONFIG_TOSHIBA_RBTX4938 is not set
-CONFIG_TRAD_SIGNALS=y
-# CONFIG_USB_R8A66597_HCD is not set
-CONFIG_USB_SUPPORT=y
-# CONFIG_USBPCWATCHDOG is not set
-# CONFIG_VGASTATE is not set
-# CONFIG_VIA_RHINE is not set
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-CONFIG_VIDEO_V4L1=y
-CONFIG_VIDEO_V4L2_COMMON=m
-CONFIG_WDT_MTX1=y
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/au1000/patches/001-au1000_gpio_kconfig.patch b/target/linux/au1000/patches/001-au1000_gpio_kconfig.patch
deleted file mode 100644 (file)
index b3aa063..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-From 8dea23a2b6dae52267b3a969e715d3f0753acf47 Mon Sep 17 00:00:00 2001
-From: Florian Fainelli <florian.fainelli@telecomint.eu>
-Date: Wed, 10 Oct 2007 14:54:11 +0200
-Subject: [PATCH] [PATCH] Add missing generic GPIO support for au1000
-With the generic GPIO support for au1000, we do not
-select it in the kernel configuration.
-
-Signed-off-by: Florian Fainelli <florian.fainelli@telecomint.eu>
----
- arch/mips/au1000/Kconfig |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
---- a/arch/mips/au1000/Kconfig
-+++ b/arch/mips/au1000/Kconfig
-@@ -135,3 +135,4 @@ config SOC_AU1X00
-       select SYS_SUPPORTS_32BIT_KERNEL
-       select SYS_SUPPORTS_APM_EMULATION
-       select SYS_SUPPORTS_KGDB
-+      select GENERIC_GPIO
diff --git a/target/linux/au1000/patches/002-sys_btn_gpio.patch b/target/linux/au1000/patches/002-sys_btn_gpio.patch
deleted file mode 100644 (file)
index e38b83f..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-This patch adds support for the GPIO connected system button on the MTX-1 boards. Default configuration is updated accordingly.
-
-Signed-off-by: Florian Fainelli <florian.fainelli@telecomint.eu>
----
---- a/arch/mips/au1000/mtx-1/platform.c
-+++ b/arch/mips/au1000/mtx-1/platform.c
-@@ -23,9 +23,32 @@
- #include <linux/types.h>
- #include <linux/platform_device.h>
- #include <linux/leds.h>
-+#include <linux/gpio_keys.h>
-+#include <linux/input.h>
- #include <asm/gpio.h>
-+static struct gpio_keys_button mtx1_gpio_button[] = {
-+      {
-+              .gpio = 207,
-+              .code = BTN_0,
-+              .desc = "System button",
-+      }
-+};
-+
-+static struct gpio_keys_platform_data mtx1_buttons_data = {
-+      .buttons = mtx1_gpio_button,
-+      .nbuttons = ARRAY_SIZE(mtx1_gpio_button),
-+};
-+
-+static struct platform_device mtx1_button = {
-+      .name = "gpio-keys",
-+      .id = -1,
-+      .dev = {
-+              .platform_data = &mtx1_buttons_data,
-+      }
-+};
-+
- static struct resource mtx1_wdt_res[] = {
-       [0] = {
-               .start = 15,
-@@ -62,11 +85,13 @@ static struct platform_device mtx1_gpio_
- static struct platform_device *mtx1_devs[] = {
-       &mtx1_gpio_leds,
--      &mtx1_wdt
-+      &mtx1_wdt,
-+      &mtx1_button
- };
- static int __init mtx1_register_devices(void)
- {
-+      gpio_direction_input(207);
-       return platform_add_devices(mtx1_devs, ARRAY_SIZE(mtx1_devs));
- }
diff --git a/target/linux/au1000/patches/005-au1000_eth_link_beat.patch b/target/linux/au1000/patches/005-au1000_eth_link_beat.patch
deleted file mode 100644 (file)
index e3771d7..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/net/au1000_eth.c
-+++ b/drivers/net/au1000_eth.c
-@@ -15,6 +15,9 @@
-  * Author: MontaVista Software, Inc.
-  *            ppopov@mvista.com or source@mvista.com
-  *
-+ *         Bjoern Riemer 2004
-+ *           riemer@fokus.fraunhofer.de or riemer@riemer-nt.de
-+ *             // fixed the link beat detection with ioctls (SIOCGMIIPHY)
-  * ########################################################################
-  *
-  *  This program is free software; you can distribute it and/or modify it
-@@ -835,6 +838,10 @@ static int au1000_init(struct net_device
-       control = MAC_RX_ENABLE | MAC_TX_ENABLE;
- #ifndef CONFIG_CPU_LITTLE_ENDIAN
-+      /*riemer: fix for startup without cable */
-+      if (!link)
-+              dev->flags &= ~IFF_RUNNING;
-+
-       control |= MAC_BIG_ENDIAN;
- #endif
-       if (aup->phy_dev) {
diff --git a/target/linux/au1000/patches/012-mtx1_cmdline.patch b/target/linux/au1000/patches/012-mtx1_cmdline.patch
deleted file mode 100644 (file)
index a41ee6f..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/au1000/mtx-1/init.c
-+++ b/arch/mips/au1000/mtx-1/init.c
-@@ -54,7 +54,7 @@ void __init prom_init(void)
-       prom_argv = (char **) fw_arg1;
-       prom_envp = (char **) fw_arg2;
--      prom_init_cmdline();
-+      strcpy(arcs_cmdline, CONFIG_CMDLINE);
-       memsize_str = prom_getenv("memsize");
-       if (!memsize_str)
diff --git a/target/linux/au1000/patches/013-openwrt_rootfs.patch b/target/linux/au1000/patches/013-openwrt_rootfs.patch
deleted file mode 100644 (file)
index e7bcba6..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/mtd/maps/mtx-1_flash.c
-+++ b/drivers/mtd/maps/mtx-1_flash.c
-@@ -28,7 +28,7 @@ static struct map_info mtx1_map = {
- static struct mtd_partition mtx1_partitions[] = {
-         {
--                .name = "filesystem",
-+                .name = "rootfs",
-                 .size = 0x01C00000,
-                 .offset = 0,
-         },{
diff --git a/target/linux/au1000/patches/014-au1000_eth_ioctl.patch b/target/linux/au1000/patches/014-au1000_eth_ioctl.patch
deleted file mode 100644 (file)
index 9358981..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/drivers/net/au1000_eth.c
-+++ b/drivers/net/au1000_eth.c
-@@ -1306,9 +1306,12 @@ static void set_rx_mode(struct net_devic
-       }
- }
-+#define AU1000_KNOWN_PHY_IOCTLS               (SIOCGMIIPHY & 0xfff0)
- static int au1000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
- {
-       struct au1000_private *aup = (struct au1000_private *)dev->priv;
-+      if((cmd & AU1000_KNOWN_PHY_IOCTLS) != AU1000_KNOWN_PHY_IOCTLS)
-+              return -EINVAL;
-       if (!netif_running(dev)) return -EINVAL;
diff --git a/target/linux/au1000/patches/015-pci-resource.patch b/target/linux/au1000/patches/015-pci-resource.patch
deleted file mode 100644 (file)
index 7b0bc89..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/arch/mips/au1000/common/pci.c
-+++ b/arch/mips/au1000/common/pci.c
-@@ -39,15 +39,15 @@
- /* TBD */
- static struct resource pci_io_resource = {
--      .start  = PCI_IO_START,
--      .end    = PCI_IO_END,
-+      .start  = (resource_size_t)PCI_IO_START,
-+      .end    = (resource_size_t)PCI_IO_END,
-       .name   = "PCI IO space",
-       .flags  = IORESOURCE_IO
- };
- static struct resource pci_mem_resource = {
--      .start  = PCI_MEM_START,
--      .end    = PCI_MEM_END,
-+      .start  = (resource_size_t)PCI_MEM_START,
-+      .end    = (resource_size_t)PCI_MEM_END,
-       .name   = "PCI memory space",
-       .flags  = IORESOURCE_MEM
- };
diff --git a/target/linux/au1000/patches/016-net-irq.patch b/target/linux/au1000/patches/016-net-irq.patch
deleted file mode 100644 (file)
index a5b00a8..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/include/asm-mips/mach-au1x00/au1000.h
-+++ b/include/asm-mips/mach-au1x00/au1000.h
-@@ -623,6 +623,7 @@ enum soc_au1500_ints {
-       AU1000_RTC_MATCH1_INT,
-       AU1000_RTC_MATCH2_INT,
-       AU1500_PCI_ERR_INT,
-+      AU1500_RESERVED_INT,
-       AU1000_USB_DEV_REQ_INT,
-       AU1000_USB_DEV_SUS_INT,
-       AU1000_USB_HOST_INT,
diff --git a/target/linux/au1000/patches/017-gpio-dir.patch b/target/linux/au1000/patches/017-gpio-dir.patch
deleted file mode 100644 (file)
index 5ae819e..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/arch/mips/au1000/common/gpio.c
-+++ b/arch/mips/au1000/common/gpio.c
-@@ -66,7 +66,8 @@ static int au1xxx_gpio2_direction_input(
- static int au1xxx_gpio2_direction_output(unsigned gpio, int value)
- {
-       gpio -= AU1XXX_GPIO_BASE;
--      gpio2->dir = (0x01 << gpio) | (value << gpio);
-+      gpio2->dir |= 0x01 << gpio;
-+      gpio2->output = (GPIO2_OUTPUT_ENABLE_MASK << gpio) | (value << gpio);
-       return 0;
- }
-@@ -95,6 +96,7 @@ static int au1xxx_gpio1_direction_input(
- static int au1xxx_gpio1_direction_output(unsigned gpio, int value)
- {
-       gpio1->trioutclr = (0x01 & gpio);
-+      au1xxx_gpio1_write(gpio, value);
-       return 0;
- }
diff --git a/target/linux/rb532/config-2.6.23 b/target/linux/rb532/config-2.6.23
deleted file mode 100644 (file)
index a0fb738..0000000
+++ /dev/null
@@ -1,201 +0,0 @@
-CONFIG_32BIT=y
-# CONFIG_64BIT is not set
-# CONFIG_8139TOO is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-# CONFIG_ATM is not set
-# CONFIG_AX25 is not set
-CONFIG_BASE_SMALL=0
-CONFIG_BITREVERSE=y
-CONFIG_BLK_DEV_CF_MIPS=y
-# CONFIG_BT is not set
-# CONFIG_CPU_BIG_ENDIAN is not set
-CONFIG_CPU_HAS_LLSC=y
-CONFIG_CPU_HAS_PREFETCH=y
-CONFIG_CPU_HAS_SYNC=y
-CONFIG_CPU_LITTLE_ENDIAN=y
-# CONFIG_CPU_LOONGSON2 is not set
-CONFIG_CPU_MIPS32=y
-CONFIG_CPU_MIPS32_R1=y
-# CONFIG_CPU_MIPS32_R2 is not set
-# CONFIG_CPU_MIPS64_R1 is not set
-# CONFIG_CPU_MIPS64_R2 is not set
-CONFIG_CPU_MIPSR1=y
-# CONFIG_CPU_NEVADA is not set
-# CONFIG_CPU_R10000 is not set
-# CONFIG_CPU_R3000 is not set
-# CONFIG_CPU_R4300 is not set
-# CONFIG_CPU_R4X00 is not set
-# CONFIG_CPU_R5000 is not set
-# CONFIG_CPU_R5432 is not set
-# CONFIG_CPU_R6000 is not set
-# CONFIG_CPU_R8000 is not set
-# CONFIG_CPU_RM7000 is not set
-# CONFIG_CPU_RM9000 is not set
-# CONFIG_CPU_SB1 is not set
-CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
-CONFIG_CPU_SUPPORTS_HIGHMEM=y
-# CONFIG_CPU_TX39XX is not set
-# CONFIG_CPU_TX49XX is not set
-# CONFIG_CPU_VR41XX is not set
-CONFIG_DEVPORT=y
-# CONFIG_DM9000 is not set
-CONFIG_DMA_NEED_PCI_MAP_STATE=y
-CONFIG_DMA_NONCOHERENT=y
-CONFIG_EXT2_FS=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_GPIO=y
-# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HID_SUPPORT=y
-CONFIG_HW_HAS_PCI=y
-CONFIG_HW_RANDOM=y
-# CONFIG_I2C is not set
-# CONFIG_IDE is not set
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INPUT=y
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_IRQ_CPU=y
-CONFIG_KEXEC=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=y
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_KORINA=y
-# CONFIG_LEDS_ALIX is not set
-# CONFIG_LEDS_GPIO is not set
-CONFIG_LEDS_RB500=y
-# CONFIG_LEMOTE_FULONG is not set
-# CONFIG_MACH_ALCHEMY is not set
-# CONFIG_MACH_DECSTATION is not set
-# CONFIG_MACH_JAZZ is not set
-# CONFIG_MACH_VR41XX is not set
-CONFIG_MIKROTIK_RB500=y
-# CONFIG_MINI_FO is not set
-CONFIG_MIPS=y
-# CONFIG_MIPS_ATLAS is not set
-# CONFIG_MIPS_COBALT is not set
-CONFIG_MIPS_L1_CACHE_SHIFT=4
-# CONFIG_MIPS_MALTA is not set
-CONFIG_MIPS_MT_DISABLED=y
-# CONFIG_MIPS_MT_SMP is not set
-# CONFIG_MIPS_MT_SMTC is not set
-# CONFIG_MIPS_SEAD is not set
-# CONFIG_MIPS_SIM is not set
-CONFIG_MTD=y
-# CONFIG_MTD_ABSENT is not set
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_BLOCK2MTD=y
-# CONFIG_MTD_CFI is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-CONFIG_MTD_NAND=y
-# CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-CONFIG_MTD_NAND_PLATFORM=y
-CONFIG_MTD_NAND_VERIFY_WRITE=y
-# CONFIG_MTD_ONENAND is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_NET_SCH_ESFQ_NFCT is not set
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NO_IOPORT is not set
-# CONFIG_PAGE_SIZE_16KB is not set
-CONFIG_PAGE_SIZE_4KB=y
-# CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_PAGE_SIZE_8KB is not set
-# CONFIG_PCIPCWATCHDOG is not set
-CONFIG_PCI=y
-# CONFIG_PMC_MSP is not set
-# CONFIG_PMC_YOSEMITE is not set
-# CONFIG_PNX8550_JBS is not set
-# CONFIG_PNX8550_STB810 is not set
-CONFIG_RC32434_WDT=y
-# CONFIG_RTC is not set
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_WAIT_SCAN is not set
-# CONFIG_SERIAL_8250_EXTENDED is not set
-# CONFIG_SGI_IP22 is not set
-# CONFIG_SGI_IP27 is not set
-# CONFIG_SGI_IP32 is not set
-# CONFIG_SIBYTE_BIGSUR is not set
-# CONFIG_SIBYTE_CARMEL is not set
-# CONFIG_SIBYTE_CRHINE is not set
-# CONFIG_SIBYTE_CRHONE is not set
-# CONFIG_SIBYTE_LITTLESUR is not set
-# CONFIG_SIBYTE_PTSWARM is not set
-# CONFIG_SIBYTE_RHONE is not set
-# CONFIG_SIBYTE_SENTOSA is not set
-# CONFIG_SIBYTE_SWARM is not set
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SOUND is not set
-# CONFIG_SPARSEMEM_STATIC is not set
-CONFIG_SWAP_IO_SPACE=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
-CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
-CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
-# CONFIG_TC35815 is not set
-# CONFIG_TOSHIBA_JMR3927 is not set
-# CONFIG_TOSHIBA_RBTX4927 is not set
-# CONFIG_TOSHIBA_RBTX4938 is not set
-CONFIG_TRAD_SIGNALS=y
-# CONFIG_USB is not set
-# CONFIG_USER_NS is not set
-# CONFIG_VGASTATE is not set
-CONFIG_VIA_RHINE=y
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_VIA_RHINE_NAPI=y
-# CONFIG_YAFFS_9BYTE_TAGS is not set
-CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED=y
-CONFIG_YAFFS_AUTO_YAFFS2=y
-CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=0
-# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-CONFIG_YAFFS_DOES_ECC=y
-CONFIG_YAFFS_ECC_WRONG_ORDER=y
-CONFIG_YAFFS_FS=y
-CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
-CONFIG_YAFFS_YAFFS1=y
-CONFIG_YAFFS_YAFFS2=y
-CONFIG_ZONE_DMA_FLAG=0
diff --git a/target/linux/rb532/files-2.6.23/arch/mips/pci/fixup-rb500.c b/target/linux/rb532/files-2.6.23/arch/mips/pci/fixup-rb500.c
deleted file mode 100644 (file)
index 76c465f..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2001 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
- *             stevel@mvista.com or source@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.
- *
- *  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/init.h>
-
-#include <asm/pci.h>
-#include <asm/io.h>
-
-#include <asm/rc32434/rc32434.h>
-
-static int __devinitdata irq_map[2][12] = {
-       { 0, 0, 2, 3, 2, 3, 0, 0, 0, 0, 0, 1 },
-       { 0, 0, 1, 3, 0, 2, 1, 3, 0, 2, 1, 3 }
-};
-
-int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-{
-       int irq = 0;
-
-       if (dev->bus->number < 2 && PCI_SLOT(dev->devfn) < 12) {
-               irq = irq_map[dev->bus->number][PCI_SLOT(dev->devfn)];
-       }
-       return irq + GROUP4_IRQ_BASE + 4;
-}
-
diff --git a/target/linux/rb532/files-2.6.23/arch/mips/pci/ops-rc32434.c b/target/linux/rb532/files-2.6.23/arch/mips/pci/ops-rc32434.c
deleted file mode 100644 (file)
index b90ab1d..0000000
+++ /dev/null
@@ -1,218 +0,0 @@
-/**************************************************************************
- *
- *  BRIEF MODULE DESCRIPTION
- *     pci_ops for IDT EB434 board
- *
- *  Copyright 2004 IDT Inc. (rischelp@idt.com)
- *  Copyright 2006 Felix Fietkau <nbd@openwrt.org>
- *         
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *
- **************************************************************************
- * May 2004 rkt, neb
- *
- * Initial Release
- *
- * 
- *
- **************************************************************************
- */
-
-#include <linux/autoconf.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/types.h>
-#include <linux/delay.h>
-
-#include <asm/cpu.h>
-#include <asm/io.h>
-
-#include <asm/rc32434/rc32434.h>
-#include <asm/rc32434/pci.h> 
-
-#define PCI_ACCESS_READ  0
-#define PCI_ACCESS_WRITE 1
-
-
-#define PCI_CFG_SET(bus,slot,func,off) \
-       (rc32434_pci->pcicfga = (0x80000000 | \
-                               ((bus) << 16) | ((slot)<<11) | \
-                               ((func)<<8) | (off)))
-
-static inline int config_access(unsigned char access_type, struct pci_bus *bus,
-                         unsigned int devfn, unsigned char where,
-                         u32 * data)
-{ 
-       unsigned int slot = PCI_SLOT(devfn);
-       u8 func = PCI_FUNC(devfn);
-       
-       /* Setup address */
-       PCI_CFG_SET(bus->number, slot, func, where);
-       rc32434_sync();
-       
-       if (access_type == PCI_ACCESS_WRITE)
-               rc32434_pci->pcicfgd = *data;
-       else
-               *data = rc32434_pci->pcicfgd;
-       
-       rc32434_sync();
-       
-       return 0;
-}
-
-
-/*
- * We can't address 8 and 16 bit words directly.  Instead we have to
- * read/write a 32bit word and mask/modify the data we actually want.
- */
-static int read_config_byte(struct pci_bus *bus, unsigned int devfn,
-                            int where, u8 * val)
-{
-       u32 data;
-       int ret;
-       
-       ret = config_access(PCI_ACCESS_READ, bus, devfn, where, &data);
-       *val = (data >> ((where & 3) << 3)) & 0xff;
-       return ret;
-}
-
-static int read_config_word(struct pci_bus *bus, unsigned int devfn,
-                            int where, u16 * val)
-{
-       u32 data;
-       int ret;
-       
-       ret = config_access(PCI_ACCESS_READ, bus, devfn, where, &data);
-       *val = (data >> ((where & 3) << 3)) & 0xffff;
-       return ret;
-}
-
-static int read_config_dword(struct pci_bus *bus, unsigned int devfn,
-                             int where, u32 * val)
-{
-       int ret;
-       int delay = 1;
-
-       if (bus->number == 0 && PCI_SLOT(devfn) > 21)
-               return 0;
-
-retry:
-       ret = config_access(PCI_ACCESS_READ, bus, devfn, where, val);
-       
-       /* PCI scan: check for invalid values, device may not have
-        * finished initializing */
-
-       if (where == PCI_VENDOR_ID) {
-               if (ret == 0xffffffff || ret == 0x00000000 ||
-                       ret == 0x0000ffff || ret == 0xffff0000) {
-
-                       if (delay > 4)
-                               return 0;
-
-                       delay *= 2;
-                       msleep(delay);
-                       goto retry;
-               }
-       }
-       
-       return ret;
-}
-
-static int
-write_config_byte(struct pci_bus *bus, unsigned int devfn, int where,
-                  u8 val)
-{
-       u32 data = 0;
-       
-       if (config_access(PCI_ACCESS_READ, bus, devfn, where, &data))
-               return -1;
-       
-       data = (data & ~(0xff << ((where & 3) << 3))) |
-               (val << ((where & 3) << 3));
-       
-       if (config_access(PCI_ACCESS_WRITE, bus, devfn, where, &data))
-               return -1;
-       
-       return PCIBIOS_SUCCESSFUL;
-}
-
-
-static int
-write_config_word(struct pci_bus *bus, unsigned int devfn, int where,
-                  u16 val)
-{
-       u32 data = 0;
-       
-       if (config_access(PCI_ACCESS_READ, bus, devfn, where, &data))
-               return -1;
-       
-       data = (data & ~(0xffff << ((where & 3) << 3))) |
-               (val << ((where & 3) << 3));
-       
-       if (config_access(PCI_ACCESS_WRITE, bus, devfn, where, &data))
-               return -1;
-       
-       
-       return PCIBIOS_SUCCESSFUL;
-}
-
-
-static int 
-write_config_dword(struct pci_bus *bus, unsigned int devfn, int where,
-                   u32 val)
-{
-       if (config_access(PCI_ACCESS_WRITE, bus, devfn, where, &val))
-               return -1;
-       
-       return PCIBIOS_SUCCESSFUL;
-}
-
-static int pci_config_read(struct pci_bus *bus, unsigned int devfn,
-                          int where, int size, u32 * val)
-{
-       switch (size) {
-       case 1: 
-               return read_config_byte(bus, devfn, where, (u8 *) val);
-       case 2: 
-               return read_config_word(bus, devfn, where, (u16 *) val);
-       default:
-               return read_config_dword(bus, devfn, where, val);
-       }
-}
-
-static int pci_config_write(struct pci_bus *bus, unsigned int devfn,
-                           int where, int size, u32 val)
-{
-       switch (size) {
-       case 1: 
-               return write_config_byte(bus, devfn, where, (u8) val);
-       case 2: 
-               return write_config_word(bus, devfn, where, (u16) val);
-       default:
-               return write_config_dword(bus, devfn, where, val);
-       }
-}
-
-struct pci_ops rc32434_pci_ops = {
-       .read =  pci_config_read,
-       .write = pci_config_write,
-};
diff --git a/target/linux/rb532/files-2.6.23/arch/mips/pci/pci-rc32434.c b/target/linux/rb532/files-2.6.23/arch/mips/pci/pci-rc32434.c
deleted file mode 100644 (file)
index 9ae596c..0000000
+++ /dev/null
@@ -1,236 +0,0 @@
-/**************************************************************************
- *
- *  BRIEF MODULE DESCRIPTION
- *     PCI initialization for IDT EB434 board
- *
- *  Copyright 2004 IDT Inc. (rischelp@idt.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.
- *
- *
- **************************************************************************
- * May 2004 rkt, neb
- *
- * Initial Release
- *
- *
- *
- **************************************************************************
- */
-
-#include <linux/autoconf.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-
-#include <asm/rc32434/rc32434.h>
-#include <asm/rc32434/pci.h>
-
-#define PCI_ACCESS_READ  0
-#define PCI_ACCESS_WRITE 1
-
-/* define an unsigned array for the PCI registers */
-unsigned int korinaCnfgRegs[25] = {
-       KORINA_CNFG1,    KORINA_CNFG2,  KORINA_CNFG3,  KORINA_CNFG4,
-       KORINA_CNFG5,    KORINA_CNFG6,  KORINA_CNFG7,  KORINA_CNFG8,
-       KORINA_CNFG9,    KORINA_CNFG10, KORINA_CNFG11, KORINA_CNFG12,
-       KORINA_CNFG13, KORINA_CNFG14, KORINA_CNFG15, KORINA_CNFG16,
-       KORINA_CNFG17, KORINA_CNFG18, KORINA_CNFG19, KORINA_CNFG20,
-       KORINA_CNFG21, KORINA_CNFG22, KORINA_CNFG23, KORINA_CNFG24
-};
-static struct resource rc32434_res_pci_mem1;
-static struct resource rc32434_res_pci_mem2;
-
-static struct resource rc32434_res_pci_mem1 = {
-       .name = "PCI MEM1",
-       .start = 0x50000000,
-       .end = 0x5FFFFFFF,
-       .flags = IORESOURCE_MEM,
-       .parent = &rc32434_res_pci_mem1,
-       .sibling = NULL,
-       .child = &rc32434_res_pci_mem2
-};
-
-static struct resource rc32434_res_pci_mem2 = {
-       .name = "PCI Mem2",
-       .start = 0x60000000,
-       .end = 0x6FFFFFFF,
-       .flags = IORESOURCE_MEM,
-       .parent = &rc32434_res_pci_mem1,
-       .sibling = NULL,
-       .child = NULL
-};
-
-static struct resource rc32434_res_pci_io1 = {
-       .name = "PCI I/O1",
-       .start = 0x18800000,
-       .end = 0x188FFFFF,
-       .flags = IORESOURCE_IO,
-};
-
-extern struct pci_ops rc32434_pci_ops;
-
-#define PCI_MEM1_START PCI_ADDR_START
-#define PCI_MEM1_END   PCI_ADDR_START + CPUTOPCI_MEM_WIN - 1
-#define PCI_MEM2_START PCI_ADDR_START + CPUTOPCI_MEM_WIN
-#define PCI_MEM2_END   PCI_ADDR_START + ( 2* CPUTOPCI_MEM_WIN)  - 1
-#define PCI_IO1_START  PCI_ADDR_START + (2 * CPUTOPCI_MEM_WIN)
-#define PCI_IO1_END    PCI_ADDR_START + (2* CPUTOPCI_MEM_WIN) + CPUTOPCI_IO_WIN -1
-#define PCI_IO2_START  PCI_ADDR_START + (2 * CPUTOPCI_MEM_WIN) + CPUTOPCI_IO_WIN
-#define PCI_IO2_END    PCI_ADDR_START + (2* CPUTOPCI_MEM_WIN) + (2 * CPUTOPCI_IO_WIN) -1
-
-
-struct pci_controller rc32434_controller2;
-
-struct pci_controller rc32434_controller = {
-       .pci_ops        = &rc32434_pci_ops,
-       .mem_resource   = &rc32434_res_pci_mem1,
-       .io_resource    = &rc32434_res_pci_io1,
-       .mem_offset     = 0,
-       .io_offset      = 0,
-
-};
-
-#ifdef __MIPSEB__
-#define PCI_ENDIAN_FLAG PCILBAC_sb_m
-#else
-#define PCI_ENDIAN_FLAG 0
-#endif
-
-static int __init rc32434_pcibridge_init(void)
-{
-       unsigned int pcicValue, pcicData = 0;
-       unsigned int dummyRead, pciCntlVal;
-       int loopCount;
-       unsigned int pciConfigAddr;
-
-       pcicValue = rc32434_pci->pcic;
-       pcicValue = (pcicValue >> PCIM_SHFT) & PCIM_BIT_LEN;
-       if (!((pcicValue == PCIM_H_EA) ||
-                (pcicValue == PCIM_H_IA_FIX) ||
-               (pcicValue == PCIM_H_IA_RR))) {
-               printk("PCI init error!!!\n");
-               /* Not in Host Mode, return ERROR */
-               return -1;
-       }
-       /* Enables the Idle Grant mode, Arbiter Parking */
-       pcicData |=(PCIC_igm_m|PCIC_eap_m|PCIC_en_m);
-       rc32434_pci->pcic = pcicData; /* Enable the PCI bus Interface */
-       /* Zero out the PCI status & PCI Status Mask */
-       for(;;)
-       {
-          pcicData = rc32434_pci->pcis;
-          if (!(pcicData & PCIS_rip_m))
-                   break;
-       }
-
-       rc32434_pci->pcis = 0;
-       rc32434_pci->pcism = 0xFFFFFFFF;
-       /* Zero out the PCI decoupled registers */
-       rc32434_pci->pcidac=0; /* disable PCI decoupled accesses at initialization */
-       rc32434_pci->pcidas=0; /* clear the status */
-       rc32434_pci->pcidasm=0x0000007F; /* Mask all the interrupts */
-       /* Mask PCI Messaging Interrupts */
-       rc32434_pci_msg->pciiic = 0;
-       rc32434_pci_msg->pciiim = 0xFFFFFFFF;
-       rc32434_pci_msg->pciioic = 0;
-       rc32434_pci_msg->pciioim = 0;
-
-
-       /* Setup PCILB0 as Memory Window */
-       rc32434_pci->pcilba[0].a = (unsigned int) (PCI_ADDR_START);
-
-       /* setup the PCI map address as same as the local address */
-
-       rc32434_pci->pcilba[0].m = (unsigned int) (PCI_ADDR_START);
-
-
-       /* Setup PCILBA1 as MEM */
-       rc32434_pci->pcilba[0].c = ( ((SIZE_256MB & 0x1f) << PCILBAC_size_b) | PCI_ENDIAN_FLAG);
-       dummyRead = rc32434_pci->pcilba[0].c; /* flush the CPU write Buffers */
-       rc32434_pci->pcilba[1].a = 0x60000000;
-       rc32434_pci->pcilba[1].m = 0x60000000;
-
-       /* setup PCILBA2 as IO Window*/
-       rc32434_pci->pcilba[1].c = (((SIZE_256MB & 0x1f) << PCILBAC_size_b )| PCI_ENDIAN_FLAG);
-       dummyRead = rc32434_pci->pcilba[1].c; /* flush the CPU write Buffers */
-       rc32434_pci->pcilba[2].a = 0x18C00000;
-       rc32434_pci->pcilba[2].m = 0x18FFFFFF;
-
-       /* setup PCILBA2 as IO Window*/
-       rc32434_pci->pcilba[2].c = (((SIZE_4MB & 0x1f) << PCILBAC_size_b) | PCI_ENDIAN_FLAG );
-       dummyRead = rc32434_pci->pcilba[2].c; /* flush the CPU write Buffers */
-
-       /* Setup PCILBA3 as IO Window */
-       rc32434_pci->pcilba[3].a = 0x18800000;
-       rc32434_pci->pcilba[3].m = 0x18800000;
-       rc32434_pci->pcilba[3].c = ( (((SIZE_1MB & 0x1ff) << PCILBAC_size_b) | PCILBAC_msi_m) | PCI_ENDIAN_FLAG);
-       dummyRead = rc32434_pci->pcilba[3].c; /* flush the CPU write Buffers */
-
-       pciConfigAddr=(unsigned int)(0x80000004);
-       for(loopCount=0;loopCount<24;loopCount++){
-               rc32434_pci->pcicfga=pciConfigAddr;
-               dummyRead=rc32434_pci->pcicfga;
-               rc32434_pci->pcicfgd = korinaCnfgRegs[loopCount];
-               dummyRead=rc32434_pci->pcicfgd;
-               pciConfigAddr += 4;
-       }
-       rc32434_pci->pcitc = (unsigned int)((PCITC_RTIMER_VAL&0xff) << PCITC_rtimer_b)
-               | ((PCITC_DTIMER_VAL&0xff) << PCITC_dtimer_b);
-
-       pciCntlVal=rc32434_pci->pcic;
-       pciCntlVal &=~(PCIC_tnr_m);
-       rc32434_pci->pcic = pciCntlVal;
-       pciCntlVal=rc32434_pci->pcic;
-       return 0;
-}
-
-/* Do platform specific device initialization at pci_enable_device() time */
-int pcibios_plat_dev_init(struct pci_dev *dev)
-{
-       if (PCI_SLOT(dev->devfn) == 6 && dev->bus->number == 0) {
-               /* disable prefetched memory range */
-               pci_write_config_word(dev, PCI_PREF_MEMORY_LIMIT, 0);
-               pci_write_config_word(dev, PCI_PREF_MEMORY_BASE, 0x10);
-
-               pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, 4);
-       }
-       return 0;
-}
-
-static int __init rc32434_pci_init(void)
-{
-       printk("PCI: Initializing PCI\n");
-
-       ioport_resource.start = rc32434_res_pci_io1.start;
-       ioport_resource.end = rc32434_res_pci_io1.end;
-
-       rc32434_pcibridge_init();
-
-       register_pci_controller(&rc32434_controller);
-       rc32434_sync();
-
-       return 0;
-}
-
-arch_initcall(rc32434_pci_init);
-
diff --git a/target/linux/rb532/files-2.6.23/arch/mips/rb500/Makefile b/target/linux/rb532/files-2.6.23/arch/mips/rb500/Makefile
deleted file mode 100644 (file)
index d3ae3d9..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for the RB500 board specific parts of the kernel
-#
-
-obj-y   += irq.o time.o setup.o serial.o prom.o gpio.o devices.o
diff --git a/target/linux/rb532/files-2.6.23/arch/mips/rb500/devices.c b/target/linux/rb532/files-2.6.23/arch/mips/rb500/devices.c
deleted file mode 100644 (file)
index 6372737..0000000
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- *  RouterBoard 500 Platform devices
- *
- *  Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
- *  Copyright (C) 2007 Florian Fainelli <florian@openwrt.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.
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/ctype.h>
-#include <linux/string.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/nand.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/gpio_keys.h>
-#include <linux/input.h>
-
-#include <asm/bootinfo.h>
-
-#include <asm/rc32434/rc32434.h>
-#include <asm/rc32434/dma.h>
-#include <asm/rc32434/dma_v.h>
-#include <asm/rc32434/eth.h>
-#include <asm/rc32434/rb.h>
-
-#define ETH0_DMA_RX_IRQ        GROUP1_IRQ_BASE + 0
-#define ETH0_DMA_TX_IRQ        GROUP1_IRQ_BASE + 1
-#define ETH0_RX_OVR_IRQ        GROUP3_IRQ_BASE + 9
-#define ETH0_TX_UND_IRQ        GROUP3_IRQ_BASE + 10
-
-#define ETH0_RX_DMA_ADDR  (DMA0_PhysicalAddress + 0*DMA_CHAN_OFFSET)
-#define ETH0_TX_DMA_ADDR  (DMA0_PhysicalAddress + 1*DMA_CHAN_OFFSET)
-
-/* NAND definitions */
-#define MEM32(x) *((volatile unsigned *) (x))
-
-#define GPIO_RDY (1 << 0x08)
-#define GPIO_WPX (1 << 0x09)
-#define GPIO_ALE (1 << 0x0a)
-#define GPIO_CLE (1 << 0x0b)
-
-extern char* board_type;
-
-static struct resource korina_dev0_res[] = {
-       {
-               .name = "korina_regs",
-               .start = ETH0_PhysicalAddress,
-               .end = ETH0_PhysicalAddress + sizeof(ETH_t),
-               .flags = IORESOURCE_MEM,
-        }, {
-               .name = "korina_rx",
-               .start = ETH0_DMA_RX_IRQ,
-               .end = ETH0_DMA_RX_IRQ,
-               .flags = IORESOURCE_IRQ
-       }, {
-               .name = "korina_tx",
-               .start = ETH0_DMA_TX_IRQ,
-               .end = ETH0_DMA_TX_IRQ,
-               .flags = IORESOURCE_IRQ
-       }, {
-               .name = "korina_ovr",
-               .start = ETH0_RX_OVR_IRQ,
-               .end = ETH0_RX_OVR_IRQ,
-               .flags = IORESOURCE_IRQ
-       }, {
-               .name = "korina_und",
-               .start = ETH0_TX_UND_IRQ,
-               .end = ETH0_TX_UND_IRQ,
-               .flags = IORESOURCE_IRQ
-       }, {
-               .name = "korina_dma_rx",
-               .start = ETH0_RX_DMA_ADDR,
-               .end = ETH0_RX_DMA_ADDR + DMA_CHAN_OFFSET - 1,
-               .flags = IORESOURCE_MEM,
-        }, {
-               .name = "korina_dma_tx",
-               .start = ETH0_TX_DMA_ADDR,
-               .end = ETH0_TX_DMA_ADDR + DMA_CHAN_OFFSET - 1,
-               .flags = IORESOURCE_MEM,
-        }
-};
-
-static struct korina_device korina_dev0_data = {
-       .name = "korina0",
-       .mac = {0xde, 0xca, 0xff, 0xc0, 0xff, 0xee}
-};
-
-static struct platform_device korina_dev0 = {
-       .id = 0,
-       .name = "korina",
-       .dev.platform_data = &korina_dev0_data,
-       .resource = korina_dev0_res,
-       .num_resources = ARRAY_SIZE(korina_dev0_res),
-};
-
-#define CF_GPIO_NUM 13
-
-static struct resource cf_slot0_res[] = {
-       {
-               .name = "cf_membase",
-               .flags = IORESOURCE_MEM
-       }, {
-               .name = "cf_irq",
-               .start = (8 + 4 * 32 + CF_GPIO_NUM),    /* 149 */
-               .end = (8 + 4 * 32 + CF_GPIO_NUM),
-               .flags = IORESOURCE_IRQ
-       }
-};
-
-static struct cf_device cf_slot0_data = {
-       .gpio_pin = 13
-};
-
-static struct platform_device cf_slot0 = {
-       .id = 0,
-       .name = "rb500-cf",
-       .dev.platform_data = &cf_slot0_data,
-       .resource = cf_slot0_res,
-       .num_resources = ARRAY_SIZE(cf_slot0_res),
-};
-
-/* Resources and device for NAND.  There is no data needed and no irqs, so just define the memory used. */
-
-/*
- * We need to use the OLD Yaffs-1 OOB layout, otherwise the RB bootloader
- * will not be able to find the kernel that we load.  So set the oobinfo
- * when creating the partitions
- */
-static struct nand_ecclayout rb500_nand_ecclayout = {
-       .eccbytes       = 6,
-       .eccpos         = { 8, 9, 10, 13, 14, 15 },
-       .oobavail       = 9,
-       .oobfree        = { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1 } }
-};
-
-int rb500_dev_ready(struct mtd_info *mtd)
-{
-        return MEM32(IDT434_REG_BASE + GPIOD) & GPIO_RDY;
-}
-
-void rb500_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
-{
-        struct nand_chip *chip = mtd->priv;
-        unsigned char orbits, nandbits;
-
-        if (ctrl & NAND_CTRL_CHANGE) {
-
-                orbits = (ctrl & NAND_CLE) << 1;
-                orbits |= (ctrl & NAND_ALE) >> 1;
-
-                nandbits = (~ctrl & NAND_CLE) << 1;
-                nandbits |= (~ctrl & NAND_ALE) >> 1;
-
-                changeLatchU5(orbits, nandbits);
-        }
-        if (cmd != NAND_CMD_NONE)
-                writeb(cmd, chip->IO_ADDR_W);
-}
-
-static struct resource nand_slot0_res[] = {
-       [0] = {
-               .name = "nand_membase",
-               .flags = IORESOURCE_MEM
-       }
-};
-
-struct platform_nand_data rb500_nand_data = {
-       .ctrl.dev_ready = rb500_dev_ready,
-       .ctrl.cmd_ctrl  = rb500_cmd_ctrl,
-};
-
-static struct platform_device nand_slot0 = {
-       .name = "gen_nand",
-       .id = -1,
-       .resource = nand_slot0_res,
-       .num_resources = ARRAY_SIZE(nand_slot0_res),
-       .dev.platform_data = &rb500_nand_data,
-};
-
-static struct mtd_partition rb500_partition_info[] = {
-       {
-               .name = "Routerboard NAND boot",
-               .offset = 0,
-               .size = 4 * 1024 * 1024,
-       }, {
-               .name = "rootfs",
-               .offset = MTDPART_OFS_NXTBLK,
-               .size = MTDPART_SIZ_FULL,
-       }
-};
-
-static struct platform_device rb500_led = {
-       .name = "rb500-led",
-       .id = 0,
-};
-
-static struct gpio_keys_button rb500_gpio_btn[] = {
-       {
-               .gpio = 1,
-               .code = BTN_0,
-               .desc = "S1",
-               .active_low = 1,
-       }
-};
-
-static struct gpio_keys_platform_data rb500_gpio_btn_data = {
-       .buttons = rb500_gpio_btn,
-       .nbuttons = ARRAY_SIZE(rb500_gpio_btn),
-};
-
-static struct platform_device rb500_button = {
-       .name   = "gpio-keys",
-       .id     = -1,
-       .dev    = {
-               .platform_data = &rb500_gpio_btn_data,
-       }
-};
-
-static struct platform_device *rb500_devs[] = {
-       &korina_dev0,
-       &nand_slot0,
-       &cf_slot0,
-       &rb500_led,
-       &rb500_button
-};
-
-static void __init parse_mac_addr(char *macstr)
-{
-       int i, j;
-       unsigned char result, value;
-
-       for (i = 0; i < 6; i++) {
-               result = 0;
-
-               if (i != 5 && *(macstr + 2) != ':')
-                       return;
-
-               for (j = 0; j < 2; j++) {
-                       if (isxdigit(*macstr)
-                           && (value =
-                               isdigit(*macstr) ? *macstr -
-                               '0' : toupper(*macstr) - 'A' + 10) < 16) {
-                               result = result * 16 + value;
-                               macstr++;
-                       } else
-                               return;
-               }
-
-               macstr++;
-               korina_dev0_data.mac[i] = result;
-       }
-}
-
-
-/* DEVICE CONTROLLER 1 */
-#define CFG_DC_DEV1 (void*)0xb8010010
-#define CFG_DC_DEV2 (void*)0xb8010020
-#define CFG_DC_DEVBASE    0x0
-#define CFG_DC_DEVMASK    0x4
-#define CFG_DC_DEVC       0x8
-#define CFG_DC_DEVTC      0xC
-
-/* NAND definitions */
-#define NAND_CHIP_DELAY        25
-
-static int rb500_nand_fixup(struct mtd_info *mtd)
-{
-       struct nand_chip *chip = mtd->priv;
-
-       if (mtd->writesize == 512)
-               chip->ecc.layout = &rb500_nand_ecclayout;
-
-       return 0;
-}
-
-static void __init rb500_nand_setup(void)
-{
-       switch (mips_machtype) {
-       case MACH_MIKROTIK_RB532A:
-               changeLatchU5(LO_FOFF | LO_CEX, LO_ULED | LO_ALE | LO_CLE | LO_WPX);
-               break;
-       default:
-               changeLatchU5(LO_WPX | LO_FOFF | LO_CEX, LO_ULED | LO_ALE | LO_CLE);
-               break;
-       }
-
-       /* Setup NAND specific settings */
-       rb500_nand_data.chip.nr_chips = 1;
-       rb500_nand_data.chip.nr_partitions = ARRAY_SIZE(rb500_partition_info);
-       rb500_nand_data.chip.partitions = rb500_partition_info;
-       rb500_nand_data.chip.chip_delay = NAND_CHIP_DELAY;
-       rb500_nand_data.chip.options = NAND_NO_AUTOINCR;
-
-       rb500_nand_data.chip.chip_fixup = &rb500_nand_fixup;
-}
-
-
-static int __init plat_setup_devices(void)
-{
-       /* Look for the CF card reader */
-       if (!readl(CFG_DC_DEV1 + CFG_DC_DEVMASK))
-               rb500_devs[1] = NULL;
-       else {
-               cf_slot0_res[0].start =
-                   readl(CFG_DC_DEV1 + CFG_DC_DEVBASE);
-               cf_slot0_res[0].end = cf_slot0_res[0].start + 0x1000;
-       }
-
-       /* Read the NAND resources from the device controller */
-       nand_slot0_res[0].start = readl(CFG_DC_DEV2 + CFG_DC_DEVBASE);
-       nand_slot0_res[0].end = nand_slot0_res[0].start + 0x1000;
-
-       /* Initialise the NAND device */
-       rb500_nand_setup();
-
-       return platform_add_devices(rb500_devs, ARRAY_SIZE(rb500_devs));
-}
-
-static int __init setup_kmac(char *s)
-{
-       printk("korina mac = %s\n", s);
-       parse_mac_addr(s);
-       return 0;
-}
-
-__setup("kmac=", setup_kmac);
-
-arch_initcall(plat_setup_devices);
diff --git a/target/linux/rb532/files-2.6.23/arch/mips/rb500/gpio.c b/target/linux/rb532/files-2.6.23/arch/mips/rb500/gpio.c
deleted file mode 100644 (file)
index 6c92a8f..0000000
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- *  Miscellaneous functions for IDT EB434 board
- *
- *  Copyright 2004 IDT Inc. (rischelp@idt.com)
- *  Copyright 2006 Phil Sutter <n0-1@freewrt.org>
- *  Copyright 2007 Florian Fainelli <florian@openwrt.org>
- *
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <linux/spinlock.h>
-#include <linux/io.h>
-#include <linux/platform_device.h>
-
-#include <asm/addrspace.h>
-#include <asm/gpio.h>
-
-#include <asm/rc32434/rb.h>
-
-#define GPIO_BADDR  0x18050000
-
-static volatile unsigned char *devCtl3Base;
-static unsigned char latchU5State;
-static spinlock_t clu5Lock = SPIN_LOCK_UNLOCKED;
-
-struct rb500_gpio_reg __iomem *rb500_gpio_reg0;
-EXPORT_SYMBOL(rb500_gpio_reg0);
-
-static struct resource rb500_gpio_reg0_res[] = {
-       {
-               .name   = "gpio_reg0",
-               .start  = GPIO_BADDR,
-               .end    = GPIO_BADDR + sizeof(struct rb500_gpio_reg),
-               .flags  = IORESOURCE_MEM,
-       }
-};
-
-void set434Reg(unsigned regOffs, unsigned bit, unsigned len, unsigned val)
-{
-       unsigned flags, data;
-       unsigned i = 0;
-
-       spin_lock_irqsave(&clu5Lock, flags);
-       data = *(volatile unsigned *) (IDT434_REG_BASE + regOffs);
-       for (i = 0; i != len; ++i) {
-               if (val & (1 << i))
-                       data |= (1 << (i + bit));
-               else
-                       data &= ~(1 << (i + bit));
-       }
-       *(volatile unsigned *) (IDT434_REG_BASE + regOffs) = data;
-       spin_unlock_irqrestore(&clu5Lock, flags);
-}
-EXPORT_SYMBOL(set434Reg);
-
-void changeLatchU5(unsigned char orMask, unsigned char nandMask)
-{
-       unsigned flags;
-
-       spin_lock_irqsave(&clu5Lock, flags);
-       latchU5State = (latchU5State | orMask) & ~nandMask;
-       if (!devCtl3Base)
-               devCtl3Base = (volatile unsigned char *)
-                   KSEG1ADDR(*(volatile unsigned *)
-                             KSEG1ADDR(0x18010030));
-       *devCtl3Base = latchU5State;
-       spin_unlock_irqrestore(&clu5Lock, flags);
-}
-EXPORT_SYMBOL(changeLatchU5);
-
-unsigned char getLatchU5State(void)
-{
-       return latchU5State;
-}
-EXPORT_SYMBOL(getLatchU5State);
-
-int rb500_gpio_get_value(unsigned gpio)
-{
-       return readl(&rb500_gpio_reg0->gpiod) & (1 << gpio);
-}
-EXPORT_SYMBOL(rb500_gpio_get_value);
-
-void rb500_gpio_set_value(unsigned gpio, int value)
-{
-       unsigned tmp;
-
-       tmp = readl(&rb500_gpio_reg0->gpiod) & ~(1 << gpio);
-       if (value)
-               tmp |= 1 << gpio;
-
-       writel(tmp, (void *)&rb500_gpio_reg0->gpiod);
-}
-EXPORT_SYMBOL(rb500_gpio_set_value);
-
-int rb500_gpio_direction_input(unsigned gpio)
-{
-       writel(readl(&rb500_gpio_reg0->gpiocfg) & ~(1 << gpio), (void *)&rb500_gpio_reg0->gpiocfg);
-
-       return 0;
-}
-EXPORT_SYMBOL(rb500_gpio_direction_input);
-
-int rb500_gpio_direction_output(unsigned gpio, int value)
-{
-       gpio_set_value(gpio, value);
-       writel(readl(&rb500_gpio_reg0->gpiocfg) | (1 << gpio), (void *)&rb500_gpio_reg0->gpiocfg);
-
-       return 0;
-}
-EXPORT_SYMBOL(rb500_gpio_direction_output);
-
-void rb500_gpio_set_int_level(unsigned gpio, int value)
-{
-       unsigned tmp;
-
-       tmp = readl(&rb500_gpio_reg0->gpioilevel) & ~(1 << gpio);
-       if (value)
-               tmp |= 1 << gpio;
-       writel(tmp, (void *)&rb500_gpio_reg0->gpioilevel);
-}
-EXPORT_SYMBOL(rb500_gpio_set_int_level);
-
-int rb500_gpio_get_int_level(unsigned gpio)
-{
-       return readl(&rb500_gpio_reg0->gpioilevel) & (1 << gpio);
-}
-EXPORT_SYMBOL(rb500_gpio_get_int_level);
-
-void rb500_gpio_set_int_status(unsigned gpio, int value)
-{
-       unsigned tmp;
-
-       tmp = readl(&rb500_gpio_reg0->gpioistat);
-       if (value)
-               tmp |= 1 << gpio;
-       writel(tmp, (void *)&rb500_gpio_reg0->gpioistat);
-}
-EXPORT_SYMBOL(rb500_gpio_set_int_status);
-
-int rb500_gpio_get_int_status(unsigned gpio)
-{
-       return readl(&rb500_gpio_reg0->gpioistat) & (1 << gpio);
-}
-EXPORT_SYMBOL(rb500_gpio_get_int_status);
-
-void rb500_gpio_set_func(unsigned gpio, int value)
-{
-        unsigned tmp;
-
-        tmp = readl(&rb500_gpio_reg0->gpiofunc);
-        if (value)
-                tmp |= 1 << gpio;
-        writel(tmp, (void *)&rb500_gpio_reg0->gpiofunc);
-}
-EXPORT_SYMBOL(rb500_gpio_set_func);
-
-int rb500_gpio_get_func(unsigned gpio)
-{
-        return readl(&rb500_gpio_reg0->gpiofunc) & (1 << gpio);
-}
-EXPORT_SYMBOL(rb500_gpio_get_func);
-
-int __init rb500_gpio_init(void)
-{
-       rb500_gpio_reg0 = ioremap_nocache(rb500_gpio_reg0_res[0].start,
-                               rb500_gpio_reg0_res[0].end -
-                               rb500_gpio_reg0_res[0].start);
-
-       if (!rb500_gpio_reg0) {
-               printk(KERN_ERR "rb500: cannot remap GPIO register 0\n");
-               return -ENXIO;
-       }
-
-       return 0;
-}
-arch_initcall(rb500_gpio_init);
diff --git a/target/linux/rb532/files-2.6.23/arch/mips/rb500/irq.c b/target/linux/rb532/files-2.6.23/arch/mips/rb500/irq.c
deleted file mode 100644 (file)
index 5a4d349..0000000
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * BRIEF MODULE DESCRIPTION
- *     RC32434 interrupt routines.
- *
- * Copyright 2002 MontaVista Software Inc.
- * Author: MontaVista Software, Inc.
- *             stevel@mvista.com or source@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.
- *
- *  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/errno.h>
-#include <linux/init.h>
-#include <linux/kernel_stat.h>
-#include <linux/module.h>
-#include <linux/signal.h>
-#include <linux/sched.h>
-#include <linux/types.h>
-#include <linux/interrupt.h>
-#include <linux/ioport.h>
-#include <linux/timex.h>
-#include <linux/slab.h>
-#include <linux/random.h>
-#include <linux/delay.h>
-
-#include <asm/bitops.h>
-#include <asm/bootinfo.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/time.h>
-#include <asm/mipsregs.h>
-#include <asm/system.h>
-#include <asm/rc32434/rc32434.h>
-#include <asm/rc32434/gpio.h>
-
-extern void set_debug_traps(void);
-extern irq_cpustat_t irq_stat [NR_CPUS];
-unsigned int local_bh_count[NR_CPUS];
-unsigned int local_irq_count[NR_CPUS];
-
-static unsigned int startup_irq(unsigned int irq);
-static void rb500_end_irq(unsigned int irq_nr);
-static void mask_and_ack_irq(unsigned int irq_nr);
-static void rb500_enable_irq(unsigned int irq_nr);
-static void rb500_disable_irq(unsigned int irq_nr);
-
-extern void __init init_generic_irq(void);
-extern struct rb500_gpio_reg __iomem *rb500_gpio_reg0;
-
-typedef struct {
-  u32 mask;       /* mask of valid bits in pending/mask registers */
-  volatile u32 *base_addr;
-} intr_group_t;
-
-#define RC32434_NR_IRQS  (GROUP4_IRQ_BASE + 32)
-
-#if (NR_IRQS < RC32434_NR_IRQS)
-#error Too little irqs defined. Did you override <asm/irq.h> ?
-#endif
-
-static const intr_group_t intr_group[NUM_INTR_GROUPS] = {
-  { 0x0000efff, (u32 *)KSEG1ADDR(IC_GROUP0_PEND + 0 * IC_GROUP_OFFSET) },
-  { 0x00001fff, (u32 *)KSEG1ADDR(IC_GROUP0_PEND + 1 * IC_GROUP_OFFSET) },
-  { 0x00000007, (u32 *)KSEG1ADDR(IC_GROUP0_PEND + 2 * IC_GROUP_OFFSET) },
-  { 0x0003ffff, (u32 *)KSEG1ADDR(IC_GROUP0_PEND + 3 * IC_GROUP_OFFSET) },
-  { 0xffffffff, (u32 *)KSEG1ADDR(IC_GROUP0_PEND + 4 * IC_GROUP_OFFSET) }
-};
-
-#define READ_PEND(base) (*(base))
-#define READ_MASK(base) (*(base + 2))
-#define WRITE_MASK(base, val) (*(base + 2) = (val))
-
-static inline int irq_to_group(unsigned int irq_nr)
-{
-  return ((irq_nr - GROUP0_IRQ_BASE) >> 5);
-}
-
-static inline int group_to_ip(unsigned int group)
-{
-  return group + 2;
-}
-
-static inline void enable_local_irq(unsigned int ip)
-{
-  int ipnum = 0x100 << ip;
-  clear_c0_cause(ipnum);
-  set_c0_status(ipnum);
-}
-
-static inline void disable_local_irq(unsigned int ip)
-{
-  int ipnum = 0x100 << ip;
-  clear_c0_status(ipnum);
-}
-
-static inline void ack_local_irq(unsigned int ip)
-{
-  int ipnum = 0x100 << ip;
-  clear_c0_cause(ipnum);
-}
-
-static void rb500_enable_irq(unsigned int irq_nr)
-{
-  int           ip = irq_nr - GROUP0_IRQ_BASE;
-  unsigned int  group, intr_bit;
-  volatile unsigned int  *addr;
-  
-  
-  if (ip < 0)
-    enable_local_irq(irq_nr);
-  else {
-    group = ip >> 5;
-    ip &= (1<<5)-1;
-    intr_bit = 1 << ip;
-    enable_local_irq(group_to_ip(group));
-    
-    addr = intr_group[group].base_addr;
-    WRITE_MASK(addr, READ_MASK(addr) & ~intr_bit);
-  }
-}
-
-static void rb500_disable_irq(unsigned int irq_nr)
-{
-  int           ip = irq_nr - GROUP0_IRQ_BASE;
-  unsigned int  group, intr_bit, mask;
-  volatile unsigned int  *addr;
-  
-  if (ip < 0) {
-       disable_local_irq(irq_nr);
-    }else{
-    group = ip >> 5;
-    
-    ip &= (1<<5) -1;
-    intr_bit = 1 << ip;
-    addr = intr_group[group].base_addr;
-    mask = READ_MASK(addr);
-    mask |= intr_bit;
-    WRITE_MASK(addr,mask);
-   
-    /*
-     * if there are no more interrupts enabled in this
-     * group, disable corresponding IP
-     */
-    if (mask == intr_group[group].mask)
-      disable_local_irq(group_to_ip(group));
-  }
-}
-
-static unsigned int startup_irq(unsigned int irq_nr)
-{
-  rb500_enable_irq(irq_nr);
-  return 0; 
-}
-
-static void shutdown_irq(unsigned int irq_nr)
-{
-  rb500_disable_irq(irq_nr);
-  return;
-}
-
-static void mask_and_ack_irq(unsigned int irq_nr)
-{
-  rb500_disable_irq(irq_nr);
-  ack_local_irq(group_to_ip(irq_to_group(irq_nr)));
-}
-
-static void rb500_end_irq(unsigned int irq_nr)
-{
-
-  int ip = irq_nr - GROUP0_IRQ_BASE;
-  unsigned int intr_bit, group;
-  volatile unsigned int *addr;
-
-       if ((irq_desc[irq_nr].status & (IRQ_DISABLED | IRQ_INPROGRESS))) {
-               printk("warning: end_irq %d did not enable (%x)\n", 
-                       irq_nr, irq_desc[irq_nr].status);
-               return;
-       }
-       
-       if (ip < 0) {
-               enable_local_irq(irq_nr);
-       } else {
-               group = ip >> 5;
-       
-               ip &= (1 << 5) - 1;
-               intr_bit = 1 << ip;
-       
-               if (irq_nr >= GROUP4_IRQ_BASE && irq_nr <= (GROUP4_IRQ_BASE + 13)) {
-                       rb500_gpio_reg0->gpioistat = rb500_gpio_reg0->gpioistat & ~intr_bit;
-               }
-       
-               enable_local_irq(group_to_ip(group));
-       
-               addr = intr_group[group].base_addr;
-               WRITE_MASK(addr, READ_MASK(addr) & ~intr_bit);
-       }
-}
-
-static struct hw_interrupt_type rc32434_irq_type = {
-  .typename = "RB500",
-  .startup = startup_irq,
-  .shutdown = shutdown_irq,
-  .enable = rb500_enable_irq,
-  .disable = rb500_disable_irq,
-  .ack = mask_and_ack_irq,
-  .end = rb500_end_irq,
-};
-
-
-void __init arch_init_irq(void)
-{
-       int i;
-
-       printk("Initializing IRQ's: %d out of %d\n", RC32434_NR_IRQS, NR_IRQS);
-       memset(irq_desc, 0, sizeof(irq_desc));
-  
-       for (i = 0; i < RC32434_NR_IRQS; i++) {
-               irq_desc[i].status = IRQ_DISABLED;
-               irq_desc[i].action = NULL;
-               irq_desc[i].depth = 1;
-               irq_desc[i].chip = &rc32434_irq_type;
-               spin_lock_init(&irq_desc[i].lock);
-       }
-}
-
-/* Main Interrupt dispatcher */
-asmlinkage void plat_irq_dispatch(void)
-{
-       unsigned int ip, pend, group;
-       volatile unsigned int *addr;
-       unsigned int cp0_cause = read_c0_cause() & read_c0_status();
-
-       if (cp0_cause & CAUSEF_IP7) {
-               ll_timer_interrupt(7);
-       } else if ((ip = (cp0_cause & 0x7c00))) {
-               group = 21 - rc32434_clz(ip);
-
-               addr = intr_group[group].base_addr;
-
-               pend = READ_PEND(addr);
-               pend &= ~READ_MASK(addr); // only unmasked interrupts
-               pend = 39 - rc32434_clz(pend);
-               do_IRQ((group << 5) + pend);
-       }
-}
diff --git a/target/linux/rb532/files-2.6.23/arch/mips/rb500/prom.c b/target/linux/rb532/files-2.6.23/arch/mips/rb500/prom.c
deleted file mode 100644 (file)
index b10172f..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-* prom.c
-**********************************************************************
-* P . Sadik Oct 10, 2003
-*
-* Started change log
-* idt_cpu_freq is make a kernel configuration parameter
-* idt_cpu_freq is exported so that other modules can use it.
-* Code cleanup
-**********************************************************************
-* P. Sadik Oct 20, 2003
-*
-* Removed NVRAM code from here, since they are already available under
-* nvram directory.
-* Added serial port initialisation.
-**********************************************************************
-**********************************************************************
-* P. Sadik Oct 30, 2003
-*
-* Added reset_cons_port
-**********************************************************************
-
-  P.Christeas, 2005-2006
-  Port to 2.6, add 2.6 cmdline parsing
-
-*/
-
-#include <linux/autoconf.h>
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/module.h>
-#include <linux/string.h>
-#include <linux/console.h>
-#include <asm/bootinfo.h>
-#include <linux/bootmem.h>
-#include <linux/ioport.h>
-#include <linux/blkdev.h>
-#include <asm/rc32434/ddr.h>
-
-#define PROM_ENTRY(x)   (0xbfc00000+((x)*8))
-extern void __init setup_serial_port(void);
-
-unsigned int idt_cpu_freq = 132000000;
-EXPORT_SYMBOL(idt_cpu_freq);
-unsigned int gpio_bootup_state = 0;
-EXPORT_SYMBOL(gpio_bootup_state);
-
-char mips_mac_address[18] = "08:00:06:05:40:01";
-EXPORT_SYMBOL(mips_mac_address);
-
-/* what to append to cmdline when button is [not] pressed */
-#define GPIO_INIT_NOBUTTON ""
-#define GPIO_INIT_BUTTON   " 2"
-
-#ifdef CONFIG_MIKROTIK_RB500
-unsigned soft_reboot = 0;
-EXPORT_SYMBOL(soft_reboot);
-#endif
-
-#define SR_NMI                 0x00180000      /* NMI */
-#define SERIAL_SPEED_ENTRY     0x00000001
-
-#ifdef CONFIG_REMOTE_DEBUG
-extern int remote_debug;
-#endif
-
-#define FREQ_TAG   "HZ="
-#define GPIO_TAG   "gpio="
-#define KMAC_TAG   "kmac="
-#define MEM_TAG           "mem="
-#define BOARD_TAG  "board="
-#define IGNORE_CMDLINE_MEM 1
-#define DEBUG_DDR
-
-#define BOARD_RB532    "500"
-#define BOARD_RB532A   "500r5"
-
-void parse_soft_settings(unsigned *ptr, unsigned size);
-void parse_hard_settings(unsigned *ptr, unsigned size);
-
-void __init prom_setup_cmdline(void);
-
-void __init prom_init(void)
-{
-       DDR_t ddr = (DDR_t) DDR_VirtualAddress; /* define the pointer to the DDR registers */
-       phys_t memsize = 0-ddr->ddrmask;
-
-       /* this should be the very first message, even before serial is properly initialized */
-       prom_setup_cmdline();
-       setup_serial_port();
-
-       mips_machgroup = MACH_GROUP_MIKROTIK;
-       soft_reboot = read_c0_status() & SR_NMI;
-       pm_power_off = NULL;
-
-       /*
-        * give all RAM to boot allocator,
-        * except for the first 0x400 and the last 0x200 bytes
-        */
-       add_memory_region(ddr->ddrbase + 0x400, memsize - 0x600, BOOT_MEM_RAM);
-}
-
-void __init prom_free_prom_memory(void)
-{
-       /* No prom memory to free */
-}
-
-static inline int match_tag(char *arg, const char *tag)
-{
-       return (strncmp(arg, tag, strlen(tag)) == 0);
-}
-
-static inline unsigned long tag2ul(char *arg, const char *tag)
-{
-       char *num = arg+strlen(tag);
-       return simple_strtoul(num, 0, 10);
-}
-
-extern char _image_cmdline;
-void __init prom_setup_cmdline(void){
-       char cmd_line[CL_SIZE];
-       char *cp;
-       int prom_argc;
-       char **prom_argv, **prom_envp;
-       int i;
-
-       prom_argc = fw_arg0;
-       prom_argv = (char **) fw_arg1;
-       prom_envp = (char **) fw_arg2;
-
-       cp=cmd_line;
-               /* Note: it is common that parameters start at argv[1] and not argv[0],
-               however, our elf loader starts at [0] */
-       for(i=0;i<prom_argc;i++){
-               if (match_tag(prom_argv[i], FREQ_TAG)) {
-                       idt_cpu_freq = tag2ul(prom_argv[i], FREQ_TAG);
-                       continue;
-               }
-#ifdef IGNORE_CMDLINE_MEM
-               /* parses out the "mem=xx" arg */
-               if (match_tag(prom_argv[i], MEM_TAG)) {
-                       continue;
-               }
-#endif
-               if (i>0) *(cp++) = ' ';
-               if (match_tag(prom_argv[i], BOARD_TAG)) {
-                       char *board = prom_argv[i] + strlen(BOARD_TAG);
-                       if (match_tag(board, BOARD_RB532A))
-                               mips_machtype = MACH_MIKROTIK_RB532A;
-                       else
-                               mips_machtype = MACH_MIKROTIK_RB532;
-               }
-
-               if (match_tag(prom_argv[i], GPIO_TAG)) {
-                       gpio_bootup_state = tag2ul(prom_argv[i], GPIO_TAG);
-               }
-               strcpy(cp,prom_argv[i]);
-               cp+=strlen(prom_argv[i]);
-       }
-       *(cp++) = ' ';
-       strcpy(cp,(&_image_cmdline + 8));
-       cp += strlen(&_image_cmdline);
-
-       i=strlen(arcs_cmdline);
-       if (i>0){
-               *(cp++) = ' ';
-               strcpy(cp,arcs_cmdline);
-               cp+=strlen(arcs_cmdline);
-       }
-       if (gpio_bootup_state&0x02)
-               strcpy(cp,GPIO_INIT_NOBUTTON);
-       else
-               strcpy(cp,GPIO_INIT_BUTTON);
-       cmd_line[CL_SIZE-1] = '\0';
-
-       strcpy(arcs_cmdline,cmd_line);
-}
-
diff --git a/target/linux/rb532/files-2.6.23/arch/mips/rb500/serial.c b/target/linux/rb532/files-2.6.23/arch/mips/rb500/serial.c
deleted file mode 100644 (file)
index 25a03e0..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-/**************************************************************************
- *
- *  BRIEF MODULE DESCRIPTION
- *     Serial port initialisation.
- *
- *  Copyright 2004 IDT Inc. (rischelp@idt.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.
- *
- *
- **************************************************************************
- * May 2004 rkt, neb
- *
- * Initial Release
- *
- * 
- *
- **************************************************************************
- */
-
-
-#include <linux/autoconf.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/pci.h>
-#include <linux/interrupt.h>
-#include <linux/tty.h>
-#include <linux/serial.h>
-#include <linux/serial_core.h>
-#include <linux/serial_8250.h>
-
-#include <asm/time.h>
-#include <asm/cpu.h>
-#include <asm/bootinfo.h>
-#include <asm/irq.h>
-#include <asm/serial.h>
-#include <asm/rc32434/rc32434.h>
-
-extern unsigned int idt_cpu_freq;
-
-static struct uart_port serial_req = {
-       .type = PORT_16550A,
-       .line = 0,
-       .irq = RC32434_UART0_IRQ,
-       //.flags = STD_COM_FLAGS,
-       .iotype = UPIO_MEM,
-       .membase = (char *) KSEG1ADDR(RC32434_UART0_BASE),
-//     .fifosize = 14
-       .regshift = 2
-};
-
-int __init setup_serial_port(void)
-{
-       serial_req.uartclk = idt_cpu_freq;
-
-       if (early_serial_setup(&serial_req))
-               return -ENODEV;
-       
-       return(0);
-}
diff --git a/target/linux/rb532/files-2.6.23/arch/mips/rb500/setup.c b/target/linux/rb532/files-2.6.23/arch/mips/rb500/setup.c
deleted file mode 100644 (file)
index 2fda0e2..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * setup.c - boot time setup code
- */
-
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/sched.h>
-#include <linux/irq.h>
-#include <linux/ioport.h>
-#include <linux/pm.h>
-#include <asm/bootinfo.h>
-#include <asm/mipsregs.h>
-#include <asm/pgtable.h>
-#include <asm/reboot.h>
-#include <asm/addrspace.h>     /* for KSEG1ADDR() */
-#include <asm/time.h>
-#include <asm/io.h>
-#include <asm/rc32434/rc32434.h>
-#include <asm/rc32434/pci.h>
-
-#ifdef CONFIG_PCI
-extern void rc32434_time_init(void);
-extern int __init rc32434_pcibridge_init(void);
-#endif
-
-#define epldMask ((volatile unsigned char *)0xB900000d)
-
-static void rb_machine_restart(char *command)
-{
-       /* just jump to the reset vector */
-       * (volatile unsigned *) KSEG1ADDR(0x18008000) = 0x80000001;
-       ((void (*)(void))KSEG1ADDR(0x1FC00000u))();
-}
-
-static void rb_machine_halt(void)
-{
-       for(;;) continue;
-}
-
-#ifdef CONFIG_CPU_HAS_WB
-void (*__wbflush) (void);
-
-static void rb_write_buffer_flush(void)
-{
-       __asm__ __volatile__
-           ("sync\n\t" "nop\n\t" "loop: bc0f loop\n\t" "nop\n\t");
-}
-#endif
-
-void __init plat_mem_setup(void)
-{
-       unsigned int pciCntlVal;
-
-       board_time_init = rc32434_time_init;
-
-#ifdef CONFIG_CPU_HAS_WB
-       __wbflush = rb_write_buffer_flush;
-#endif
-       _machine_restart = rb_machine_restart;
-       _machine_halt = rb_machine_halt;
-       /*_machine_power_off = rb_machine_power_halt;*/
-       pm_power_off = rb_machine_halt;
-
-       set_io_port_base(KSEG1);
-
-       pciCntlVal=rc32434_pci->pcic;
-       pciCntlVal &= 0xFFFFFF7;
-       rc32434_pci->pcic = pciCntlVal;
-
-#ifdef CONFIG_PCI
-       /* Enable PCI interrupts in EPLD Mask register */
-       *epldMask = 0x0;
-       *(epldMask + 1) = 0x0;
-#endif
-       write_c0_wired(0);
-}
-
-const char *get_system_type(void)
-{
-       return "MIPS RB500";
-}
diff --git a/target/linux/rb532/files-2.6.23/arch/mips/rb500/time.c b/target/linux/rb532/files-2.6.23/arch/mips/rb500/time.c
deleted file mode 100644 (file)
index 13320a6..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-****************************************************************************
-* Carsten Langgaard, carstenl@mips.com
-* Copyright (C) 1999,2000 MIPS Technologies, Inc.  All rights reserved.
-*
-***************************************************************************
-*
-*  This program is free software; you can distribute 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 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.
-*
-****************************************************************************
-*
-* Setting up the clock on the MIPS boards.
-*
-****************************************************************************
-* P. Sadik Oct 10, 2003
-*
-* Started change log.
-* mips_counter_frequency is now calculated at run time, based on idt_cpu_freq.
-* Code cleanup
-****************************************************************************
-*/
-
-#include <linux/autoconf.h>
-#include <linux/init.h>
-#include <linux/kernel_stat.h>
-#include <linux/sched.h>
-#include <linux/spinlock.h>
-#include <linux/mc146818rtc.h>
-#include <linux/irq.h>
-#include <linux/timex.h>
-
-#include <asm/irq_cpu.h>
-#include <asm/mipsregs.h>
-#include <asm/ptrace.h>
-#include <asm/debug.h>
-#include <asm/rc32434/rc32434.h>
-
-static unsigned long r4k_offset; /* Amount to incr compare reg each time */
-static unsigned long r4k_cur;    /* What counter should be at next timer irq */
-extern unsigned int mips_hpt_frequency;
-extern unsigned int idt_cpu_freq;
-
-/* 
- * Figure out the r4k offset, the amount to increment the compare
- * register for each time tick. There is no RTC available.
- *
- * The RC32434 counts at half the CPU *core* speed.
- */
-static unsigned long __init cal_r4koff(void)
-{
-       mips_hpt_frequency = idt_cpu_freq * IDT_CLOCK_MULT / 2;
-       return (mips_hpt_frequency / HZ);
-}
-
-
-void __init rc32434_time_init(void)
-{
-       unsigned int est_freq, flags;
-
-       local_irq_save(flags);
-
-       printk("calculating r4koff... ");
-       r4k_offset = cal_r4koff();
-       printk("%08lx(%d)\n", r4k_offset, (int) r4k_offset);
-
-       est_freq = 2*r4k_offset*HZ;     
-       est_freq += 5000;       /* round */
-       est_freq -= est_freq%10000;
-       printk("CPU frequency %d.%02d MHz\n", est_freq/1000000, 
-              (est_freq%1000000)*100/1000000);
-       local_irq_restore(flags);
-}
-
-void __init plat_timer_setup(struct irqaction *irq)
-{
-       /* we are using the cpu counter for timer interrupts */
-       setup_irq(MIPS_CPU_TIMER_IRQ, irq);
-
-       /* to generate the first timer interrupt */
-       r4k_cur = (read_c0_count() + r4k_offset);
-       write_c0_compare(r4k_cur);
-}
-
diff --git a/target/linux/rb532/files-2.6.23/drivers/block/rb500/Makefile b/target/linux/rb532/files-2.6.23/drivers/block/rb500/Makefile
deleted file mode 100644 (file)
index 3e14dc3..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-## Makefile for the RB532 CF port
-
-obj-y          += bdev.o ata.o
diff --git a/target/linux/rb532/files-2.6.23/drivers/block/rb500/ata.c b/target/linux/rb532/files-2.6.23/drivers/block/rb500/ata.c
deleted file mode 100644 (file)
index 31e6782..0000000
+++ /dev/null
@@ -1,487 +0,0 @@
-/* CF-mips driver
-   This is a block driver for the direct (mmaped) interface to the CF-slot,
-   found in Routerboard.com's RB532 board
-   See SDK provided from routerboard.com.
-   
-   Module adapted By P.Christeas <p_christeas@yahoo.com>, 2005-6.
-   Cleaned up and adapted to platform_device by Felix Fietkau <nbd@openwrt.org>
-
-   This work is redistributed under the terms of the GNU General Public License.
-*/
-
-#include <linux/kernel.h>      /* printk() */
-#include <linux/module.h>      /* module to be loadable */
-#include <linux/delay.h>
-#include <linux/sched.h>
-#include <linux/pci.h>
-#include <linux/ioport.h>      /* request_mem_region() */
-
-#include <asm/gpio.h>
-#include <asm/unaligned.h>             /* ioremap() */
-#include <asm/io.h>            /* ioremap() */
-#include <asm/rc32434/rb.h>
-
-#include "ata.h"
-
-#define REQUEST_MEM_REGION 0
-#define DEBUG 1
-
-#if DEBUG
-#define DEBUGP printk
-#else
-#define DEBUGP(format, args...)
-#endif
-
-#define SECS   1000000         /* unit for wait_not_busy() is 1us */
-
-unsigned cf_head = 0;
-unsigned cf_cyl = 0;
-unsigned cf_spt = 0;
-unsigned cf_sectors = 0;
-static unsigned cf_block_size = 1;
-static void *baddr = 0;
-
-#define DBUF32 ((volatile u32 *)((unsigned long)dev->baddr | ATA_DBUF_OFFSET))
-
-
-static void cf_do_tasklet(unsigned long dev_l);
-
-
-static inline void wareg(u8 val, unsigned reg, struct cf_mips_dev* dev)
-{
-       writeb(val, dev->baddr + ATA_REG_OFFSET + reg);
-}
-
-static inline u8 rareg(unsigned reg, struct cf_mips_dev* dev)
-{
-       return readb(dev->baddr + ATA_REG_OFFSET + reg);
-}
-
-static inline int cfrdy(struct cf_mips_dev *dev)
-{
-       return gpio_get_value(dev->pin);
-}
-
-static inline void prepare_cf_irq(struct cf_mips_dev *dev)
-{
-       rb500_gpio_set_int_level(1, dev->pin);  /* interrupt on cf ready (not busy) */
-       rb500_gpio_set_int_status(0, dev->pin);         /* clear interrupt status */
-}
-
-static inline int cf_present(struct cf_mips_dev* dev)
-{
-       /* TODO: read and configure CIS into memory mapped mode
-        * TODO:   parse CISTPL_CONFIG on CF+ cards to get base address (0x200)
-        * TODO:   maybe adjust power saving setting for Hitachi Microdrive
-        */
-       int i;
-
-       /* setup CFRDY GPIO as input */
-       rb500_gpio_set_func(dev->pin, 0);
-       gpio_direction_input(dev->pin);
-
-       for (i = 0; i < 0x10; ++i) {
-               if (rareg(i,dev) != 0xff)
-                       return 1;
-       }
-       return 0;
-}
-
-static inline int is_busy(struct cf_mips_dev *dev)
-{
-       return !cfrdy(dev);
-}
-
-static int wait_not_busy(int to_us, int wait_for_busy,struct cf_mips_dev *dev)
-{
-       int us_passed = 0;
-       if (wait_for_busy && !is_busy(dev)) {
-               /* busy must appear within 400ns,
-                * but it may dissapear before we see it
-                *  => must not wait for busy in a loop
-                */
-               ndelay(400);
-       }
-
-       do {
-               if (us_passed)
-                       udelay(1);      /* never reached in async mode */
-               if (!is_busy(dev)) {
-                       if (us_passed > 1 * SECS) {
-                               printk(KERN_WARNING "cf-mips:   not busy ok (after %dus)"
-                                      ", status 0x%02x\n", us_passed, (unsigned) rareg(ATA_REG_ST,dev));
-                       }
-                       return CF_TRANS_OK;
-               }
-               if (us_passed == 1 * SECS) {
-                       printk(KERN_WARNING "cf-mips: wait not busy %dus..\n", to_us);
-               }
-               if (dev->async_mode) {
-                       dev->to_timer.expires = jiffies + (to_us * HZ / SECS);
-                       dev->irq_enable_time = jiffies;
-                       prepare_cf_irq(dev);
-                       if (is_busy(dev)) {
-                               add_timer(&dev->to_timer);
-                               enable_irq(dev->irq);
-                               return CF_TRANS_IN_PROGRESS;
-                       }
-                       continue;
-               }
-               ++us_passed;
-       } while (us_passed < to_us);
-
-       printk(KERN_ERR "cf-mips:  wait not busy timeout (%dus)"
-              ", status 0x%02x, state %d\n",
-              to_us, (unsigned) rareg(ATA_REG_ST,dev), dev->tstate);
-       return CF_TRANS_FAILED;
-}
-
-static irqreturn_t cf_irq_handler(int irq, void *dev_id)
-{
-       /* While tasklet has not disabled irq, irq will be retried all the time
-        * because of ILEVEL matching GPIO pin status => deadlock.
-        * To avoid this, we change ILEVEL to 0.
-        */
-       struct cf_mips_dev *dev=dev_id;
-
-       rb500_gpio_set_int_level(0, dev->pin);
-       rb500_gpio_set_int_status(0, dev->pin);
-       
-       del_timer(&dev->to_timer);
-       tasklet_schedule(&dev->tasklet);
-       return IRQ_HANDLED;
-}
-
-static int do_reset(struct cf_mips_dev *dev)
-{
-       printk(KERN_INFO "cf-mips: resetting..\n");
-
-       wareg(ATA_REG_DC_SRST, ATA_REG_DC,dev);
-       udelay(1);              /* FIXME: how long should we wait here? */
-       wareg(0, ATA_REG_DC,dev);
-
-       return wait_not_busy(30 * SECS, 1,dev);
-}
-
-static int set_multiple(struct cf_mips_dev *dev)
-{
-       if (dev->block_size <= 1)
-               return CF_TRANS_OK;
-
-       wareg(dev->block_size, ATA_REG_SC,dev);
-       wareg(ATA_REG_DH_BASE | ATA_REG_DH_LBA, ATA_REG_DH,dev);
-       wareg(ATA_CMD_SET_MULTIPLE, ATA_REG_CMD,dev);
-
-       return wait_not_busy(10 * SECS, 1,dev);
-}
-
-static int set_cmd(struct cf_mips_dev *dev)
-{
-       //DEBUGP(KERN_INFO "cf-mips: ata cmd 0x%02x\n", dev->tcmd);
-       // sector_count should be <=24 bits..
-       BUG_ON(dev->tsect_start>=0x10000000);
-       // This way, it addresses 2^24 * 512 = 128G
-
-       if (dev->tsector_count) {
-               wareg(dev->tsector_count & 0xff, ATA_REG_SC,dev);
-               wareg(dev->tsect_start & 0xff, ATA_REG_SN,dev);
-               wareg((dev->tsect_start >> 8) & 0xff, ATA_REG_CL,dev);
-               wareg((dev->tsect_start >> 16) & 0xff, ATA_REG_CH,dev);
-       }
-       wareg(((dev->tsect_start >> 24) & 0x0f) | ATA_REG_DH_BASE | ATA_REG_DH_LBA,
-             ATA_REG_DH,dev);  /* select drive on all commands */
-       wareg(dev->tcmd, ATA_REG_CMD,dev);
-       return wait_not_busy(10 * SECS, 1,dev);
-}
-
-static int do_trans(struct cf_mips_dev *dev)
-{
-       int res;
-       unsigned st;
-       int transfered;
-       
-       //printk("do_trans: %d sectors left\n",dev->tsectors_left);
-       while (dev->tsectors_left) {
-               transfered = 0;
-
-               st = rareg(ATA_REG_ST,dev);
-               if (!(st & ATA_REG_ST_DRQ)) {
-                       printk(KERN_ERR "cf-mips: do_trans without DRQ (status 0x%x)!\n", st);
-                       if (st & ATA_REG_ST_ERR) {
-                               int errId = rareg(ATA_REG_ERR,dev);
-                               printk(KERN_ERR "cf-mips: %s error, status 0x%x, errid 0x%x\n",
-                                      (dev->tread ? "read" : "write"), st, errId);
-                       }
-                       return CF_TRANS_FAILED;
-               }
-               do { /* Fill/read the buffer one block */
-                       u32 *qbuf, *qend;
-                       qbuf = (u32 *)dev->tbuf;
-                       qend = qbuf + CF_SECT_SIZE / sizeof(u32);
-                       if (dev->tread) {
-                           while (qbuf!=qend)
-                               put_unaligned(*DBUF32,qbuf++);
-                               //*(qbuf++) = *DBUF32;
-                       }
-                       else {
-                           while(qbuf!=qend)
-                               *DBUF32 = get_unaligned(qbuf++);
-                       }
-
-                       dev->tsectors_left--;
-                       dev->tbuf += CF_SECT_SIZE;
-                       dev->tbuf_size -= CF_SECT_SIZE;
-                       transfered++;
-               } while (transfered != dev->block_size && dev->tsectors_left > 0);
-
-               res = wait_not_busy(10 * SECS, 1,dev);
-               if (res != CF_TRANS_OK)
-                       return res;
-       };
-
-       st = rareg(ATA_REG_ST,dev);
-       if (st & (ATA_REG_ST_DRQ | ATA_REG_ST_DWF | ATA_REG_ST_ERR)) {
-               if (st & ATA_REG_ST_DRQ) {
-                       printk(KERN_ERR "cf-mips: DRQ after all %d sectors are %s"
-                              ", status 0x%x\n", dev->tsector_count, (dev->tread ? "read" : "written"), st);
-               } else if (st & ATA_REG_ST_DWF) {
-                       printk(KERN_ERR "cf-mips: write fault, status 0x%x\n", st);
-               } else {
-                       int errId = rareg(ATA_REG_ERR,dev);
-                       printk(KERN_ERR "cf-mips: %s error, status 0x%x, errid 0x%x\n",
-                              (dev->tread ? "read" : "write"), st, errId);
-               }
-               return CF_TRANS_FAILED;
-       }
-       return CF_TRANS_OK;
-}
-
-static int cf_do_state(struct cf_mips_dev *dev)
-{
-       int res;
-       switch (dev->tstate) {  /* fall through everywhere */
-       case TS_IDLE:
-               dev->tstate = TS_READY;
-               if (is_busy(dev)) {
-                       dev->tstate = TS_AFTER_RESET;
-                       res = do_reset(dev);
-                       if (res != CF_TRANS_OK)
-                               break;
-               }
-       case TS_AFTER_RESET:
-               if (dev->tstate == TS_AFTER_RESET) {
-                       dev->tstate = TS_READY;
-                       res = set_multiple(dev);
-                       if (res != CF_TRANS_OK)
-                               break;
-               }
-       case TS_READY:
-               dev->tstate = TS_CMD;
-               res = set_cmd(dev);
-               if (res != CF_TRANS_OK)
-                       break;;
-       case TS_CMD:
-               dev->tstate = TS_TRANS;
-       case TS_TRANS:
-               res = do_trans(dev);
-               break;
-       default:
-               printk(KERN_ERR "cf-mips: BUG: unknown tstate %d\n", dev->tstate);
-               return CF_TRANS_FAILED;
-       }
-       if (res != CF_TRANS_IN_PROGRESS)
-               dev->tstate = TS_IDLE;
-       return res;
-}
-
-static void cf_do_tasklet(unsigned long dev_l)
-{
-       struct cf_mips_dev* dev=(struct cf_mips_dev*) dev_l;
-       int res;
-
-       disable_irq(dev->irq);
-
-       if (dev->tstate == TS_IDLE)
-               return;         /* can happen when irq is first registered */
-
-#if 0
-       DEBUGP(KERN_WARNING "cf-mips:   not busy ok (tasklet)  status 0x%02x\n",
-              (unsigned) rareg(ATA_REG_ST,dev));
-#endif
-
-       res = cf_do_state(dev);
-       if (res == CF_TRANS_IN_PROGRESS)
-               return;
-       cf_async_trans_done(dev,res);
-}
-
-static void cf_async_timeout(unsigned long dev_l)
-{
-       struct cf_mips_dev* dev=(struct cf_mips_dev*) dev_l;
-       disable_irq(dev->irq);
-       /* Perhaps send abort to the device? */
-       printk(KERN_ERR "cf-mips:  wait not busy timeout (%lus)"
-              ", status 0x%02x, state %d\n",
-              jiffies - dev->irq_enable_time, (unsigned) rareg(ATA_REG_ST,dev), dev->tstate);
-       dev->tstate = TS_IDLE;
-       cf_async_trans_done(dev,CF_TRANS_FAILED);
-}
-
-int cf_do_transfer(struct cf_mips_dev* dev,sector_t sector, unsigned long nsect, 
-       char* buffer, int is_write)
-{
-       BUG_ON(dev->tstate!=TS_IDLE);
-       if (nsect > ATA_MAX_SECT_PER_CMD) {
-               printk(KERN_WARNING "cf-mips: sector count %lu out of range\n",nsect);
-               return CF_TRANS_FAILED;
-       }
-       if (sector + nsect > dev->sectors) {
-               printk(KERN_WARNING "cf-mips: sector %lu out of range\n",sector);
-               return CF_TRANS_FAILED;
-       }
-       dev->tbuf = buffer;
-       dev->tbuf_size = nsect*512;
-       dev->tsect_start = sector;
-       dev->tsector_count = nsect;
-       dev->tsectors_left = dev->tsector_count;
-       dev->tread = (is_write)?0:1;
-       
-       dev->tcmd = (dev->block_size == 1 ?
-               (is_write ? ATA_CMD_WRITE_SECTORS : ATA_CMD_READ_SECTORS) :
-               (is_write ? ATA_CMD_WRITE_MULTIPLE : ATA_CMD_READ_MULTIPLE));
-
-       return cf_do_state(dev);
-}
-
-static int do_identify(struct cf_mips_dev *dev)
-{
-       u16 sbuf[CF_SECT_SIZE >> 1];
-       int res;
-       char tstr[17]; //serial
-       char tmp;
-       int i;
-       BUG_ON(dev->tstate!=TS_IDLE);
-       dev->tbuf = (char *) sbuf;
-       dev->tbuf_size = CF_SECT_SIZE;
-       dev->tsect_start = 0;
-       dev->tsector_count = 0;
-       dev->tsectors_left = 1;
-       dev->tread = 1;
-       dev->tcmd = ATA_CMD_IDENTIFY_DRIVE;
-
-       DEBUGP(KERN_INFO "cf-mips: identify drive..\n");
-       res = cf_do_state(dev);
-       if (res == CF_TRANS_IN_PROGRESS) {
-               printk(KERN_ERR "cf-mips: BUG: async identify cmd\n");
-               return CF_TRANS_FAILED;
-       }
-       if (res != CF_TRANS_OK)
-               return 0;
-
-       dev->head = sbuf[3];
-       dev->cyl = sbuf[1];
-       dev->spt = sbuf[6];
-       dev->sectors = ((unsigned long) sbuf[7] << 16) | sbuf[8];
-       dev->dtype=sbuf[0];
-       memcpy(tstr, &sbuf[12], 16);
-       tstr[16] = '\0';
-
-       /* Byte-swap the serial number */
-       for (i = 0; i<8; i++) {
-               tmp = tstr[i * 2];
-               tstr[i * 2] = tstr[i * 2 +1];
-               tstr[i * 2 + 1] = tmp;
-       }
-
-       printk(KERN_INFO "cf-mips: %s detected, C/H/S=%d/%d/%d sectors=%u (%uMB) Serial=%s\n",
-              (sbuf[0] == 0x848A ? "CF card" : "ATA drive"), dev->cyl, dev->head,
-              dev->spt, dev->sectors, dev->sectors >> 11, tstr);
-       return 1;
-}
-
-static void init_multiple(struct cf_mips_dev * dev)
-{
-       int res;
-       DEBUGP(KERN_INFO "cf-mips: detecting block size\n");
-
-       dev->block_size = 128;  /* max block size = 128 sectors (64KB) */
-       do {
-               wareg(dev->block_size, ATA_REG_SC,dev);
-               wareg(ATA_REG_DH_BASE | ATA_REG_DH_LBA, ATA_REG_DH,dev);
-               wareg(ATA_CMD_SET_MULTIPLE, ATA_REG_CMD,dev);
-
-               res = wait_not_busy(10 * SECS, 1,dev);
-               if (res != CF_TRANS_OK) {
-                       printk(KERN_ERR "cf-mips: failed to detect block size: busy!\n");
-                       dev->block_size = 1;
-                       return;
-               }
-               if ((rareg(ATA_REG_ST,dev) & ATA_REG_ST_ERR) == 0)
-                       break;
-               dev->block_size /= 2;
-       } while (dev->block_size > 1);
-
-       printk(KERN_INFO "cf-mips: multiple sectors = %d\n", dev->block_size);
-}
-
-int cf_init(struct cf_mips_dev *dev)
-{
-       tasklet_init(&dev->tasklet,cf_do_tasklet,(unsigned long)dev);
-       dev->baddr = ioremap_nocache((unsigned long)dev->base, CFDEV_BUF_SIZE);
-       if (!dev->baddr) {
-               printk(KERN_ERR "cf-mips: cf_init: ioremap for (%lx,%x) failed\n",
-                      (unsigned long) dev->base, CFDEV_BUF_SIZE);
-               return -EBUSY;
-       }
-
-       if (!cf_present(dev)) {
-               printk(KERN_WARNING "cf-mips: cf card not present\n");
-               iounmap(dev->baddr);
-               return -ENODEV;
-       }
-
-       if (do_reset(dev) != CF_TRANS_OK) {
-               printk(KERN_ERR "cf-mips: cf reset failed\n");
-               iounmap(dev->baddr);
-               return -EBUSY;
-       }
-
-       if (!do_identify(dev)) {
-               printk(KERN_ERR "cf-mips: cf identify failed\n");
-               iounmap(dev->baddr);
-               return -EBUSY;
-       }
-
-/*     set_apm_level(ATA_APM_WITH_STANDBY); */
-       init_multiple(dev);
-
-       init_timer(&dev->to_timer);
-       dev->to_timer.function = cf_async_timeout;
-       dev->to_timer.data = (unsigned long)dev;
-
-       prepare_cf_irq(dev);
-       if (request_irq(dev->irq, cf_irq_handler, 0, "CF Mips", dev)) {
-               printk(KERN_ERR "cf-mips: failed to get irq\n");
-               iounmap(dev->baddr);
-               return -EBUSY;
-       }
-       /* Disable below would be odd, because request will enable, and the tasklet
-         will disable it itself */
-       //disable_irq(dev->irq);
-       
-       dev->async_mode = 1;
-
-       return 0;
-}
-
-void cf_cleanup(struct cf_mips_dev *dev)
-{
-       iounmap(dev->baddr);
-       free_irq(dev->irq, NULL);
-#if REQUEST_MEM_REGION
-       release_mem_region((unsigned long)dev->base, CFDEV_BUF_SIZE);
-#endif
-}
-
-
-/*eof*/
diff --git a/target/linux/rb532/files-2.6.23/drivers/block/rb500/ata.h b/target/linux/rb532/files-2.6.23/drivers/block/rb500/ata.h
deleted file mode 100644 (file)
index 15e8826..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-/* CF-mips driver
-   This is a block driver for the direct (mmaped) interface to the CF-slot,
-   found in Routerboard.com's RB532 board
-   See SDK provided from routerboard.com.
-   
-   Module adapted By P.Christeas <p_christeas@yahoo.com>, 2005-6.
-   Cleaned up and adapted to platform_device by Felix Fietkau <nbd@openwrt.org>
-
-   This work is redistributed under the terms of the GNU General Public License.
-*/
-
-#ifndef __CFMIPS_ATA_H__
-#define __CFMIPS_ATA_H__
-
-#include <linux/interrupt.h>
-
-#define CFG_DC_DEV1    (void*)0xb8010010
-#define   CFG_DC_DEVBASE       0x0
-#define   CFG_DC_DEVMASK       0x4
-#define   CFG_DC_DEVC          0x8
-#define   CFG_DC_DEVTC         0xC
-
-#define CFDEV_BUF_SIZE 0x1000
-#define ATA_CIS_OFFSET 0x200
-#define ATA_REG_OFFSET 0x800
-#define ATA_DBUF_OFFSET        0xC00
-
-#define ATA_REG_FEAT   0x1
-#define ATA_REG_SC     0x2
-#define ATA_REG_SN     0x3
-#define ATA_REG_CL     0x4
-#define ATA_REG_CH     0x5
-#define ATA_REG_DH     0x6
-#define   ATA_REG_DH_BASE      0xa0
-#define   ATA_REG_DH_LBA       0x40
-#define   ATA_REG_DH_DRV       0x10
-#define ATA_REG_CMD    0x7
-#define ATA_REG_ST     0x7
-#define   ATA_REG_ST_BUSY      0x80
-#define   ATA_REG_ST_RDY       0x40
-#define   ATA_REG_ST_DWF       0x20
-#define   ATA_REG_ST_DSC       0x10
-#define   ATA_REG_ST_DRQ       0x08
-#define   ATA_REG_ST_CORR      0x04
-#define   ATA_REG_ST_ERR       0x01
-#define ATA_REG_ERR    0xd
-#define ATA_REG_DC     0xe
-#define   ATA_REG_DC_IEN       0x02
-#define   ATA_REG_DC_SRST      0x04
-
-#define ATA_CMD_READ_SECTORS   0x20
-#define ATA_CMD_WRITE_SECTORS  0x30
-#define ATA_CMD_EXEC_DRIVE_DIAG        0x90
-#define ATA_CMD_READ_MULTIPLE  0xC4
-#define ATA_CMD_WRITE_MULTIPLE 0xC5
-#define ATA_CMD_SET_MULTIPLE   0xC6
-#define ATA_CMD_IDENTIFY_DRIVE 0xEC
-#define ATA_CMD_SET_FEATURES   0xEF
-
-#define ATA_FEATURE_ENABLE_APM 0x05
-#define ATA_FEATURE_DISABLE_APM        0x85
-#define ATA_APM_DISABLED       0x00
-#define ATA_APM_MIN_POWER      0x01
-#define ATA_APM_WITH_STANDBY   0x7f
-#define ATA_APM_WITHOUT_STANDBY        0x80
-#define ATA_APM_MAX_PERFORMANCE        0xfe
-
-#define CF_SECT_SIZE   0x200
-/* That is the ratio CF_SECT_SIZE/512 (the kernel sector size) */
-#define CF_KERNEL_MUL  1
-#define ATA_MAX_SECT_PER_CMD   0x100
-
-#define CF_TRANS_FAILED                0
-#define CF_TRANS_OK            1
-#define CF_TRANS_IN_PROGRESS   2
-
-
-enum trans_state {
-       TS_IDLE = 0,
-       TS_AFTER_RESET,
-       TS_READY,
-       TS_CMD,
-       TS_TRANS
-};
-
-// 
-// #if DEBUG
-// static unsigned long busy_time;
-// #endif
-
-/** Struct to hold the cfdev
-Actually, all the data here only has one instance. However, for 
-reasons of programming conformity, it is passed around as a pointer
-*/
-struct cf_mips_dev {
-       void *base; /* base address for I/O */
-       void *baddr; /* remapped address */
-
-       int pin; /* gpio pin */
-       int irq; /* gpio irq */
-       
-       unsigned head;
-       unsigned cyl;
-       unsigned spt;
-       unsigned sectors;
-       
-       unsigned short block_size;
-       unsigned dtype ; // ATA or CF
-       struct request_queue *queue;
-       struct gendisk  *gd;
-       
-       /* Transaction state */
-       enum trans_state tstate;
-       char *tbuf;
-       unsigned long tbuf_size;
-       sector_t tsect_start;
-       unsigned tsector_count;
-       unsigned tsectors_left;
-       int tread;
-       unsigned tcmd;
-       int async_mode;
-       unsigned long irq_enable_time;
-       
-       struct request *active_req; /* A request is being carried out. Is that different from tstate? */
-       int users;
-       struct timer_list to_timer;
-       struct tasklet_struct tasklet;
-
-       /** This lock ensures that the requests to this device are all done
-       atomically. Transfers can run in parallel, requests are all queued
-       one-by-one */
-       spinlock_t lock;
-};
-
-int cf_do_transfer(struct cf_mips_dev* dev,sector_t sector, unsigned long nsect, 
-       char* buffer, int is_write);
-int cf_init(struct cf_mips_dev* dev);
-void cf_cleanup(struct cf_mips_dev* dev);
-
-void cf_async_trans_done(struct cf_mips_dev* dev, int result);
-// void *cf_get_next_buf(unsigned long *buf_size);
-
-#endif
diff --git a/target/linux/rb532/files-2.6.23/drivers/block/rb500/bdev.c b/target/linux/rb532/files-2.6.23/drivers/block/rb500/bdev.c
deleted file mode 100644 (file)
index f8a9b02..0000000
+++ /dev/null
@@ -1,340 +0,0 @@
-/* CF-mips driver
-   This is a block driver for the direct (mmaped) interface to the CF-slot,
-   found in Routerboard.com's RB532 board
-   See SDK provided from routerboard.com.
-   
-   Module adapted By P.Christeas <p_christeas@yahoo.com>, 2005-6.
-   Cleaned up and adapted to platform_device by Felix Fietkau <nbd@openwrt.org>
-
-   This work is redistributed under the terms of the GNU General Public License.
-*/
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/time.h>
-#include <linux/wait.h>
-#include <linux/fs.h>
-#include <linux/genhd.h>
-#include <linux/blkdev.h>
-#include <linux/blkpg.h>
-#include <linux/hdreg.h>
-#include <linux/platform_device.h>
-
-#include <asm/uaccess.h>
-#include <asm/io.h>
-#include <asm/gpio.h>
-
-#include <asm/rc32434/rb.h>
-
-#ifdef DEBUG
-#define DEBUGP printk
-#define DLEVEL 1
-#else
-#define DEBUGP(format, args...)
-#define DLEVEL 0
-#endif
-
-#define CF_MIPS_MAJOR 13
-#define MAJOR_NR       CF_MIPS_MAJOR
-#define CF_MAX_PART    16              /* max 15 partitions */
-
-#include "ata.h"
-
-//extern struct block_device_operations cf_bdops;
-
-// static struct hd_struct cf_parts[CF_MAX_PART];
-// static int cf_part_sizes[CF_MAX_PART];
-// static int cf_hsect_sizes[CF_MAX_PART];
-// static int cf_max_sectors[CF_MAX_PART];
-// static int cf_blksize_sizes[CF_MAX_PART];
-
-// static spinlock_t lock = SPIN_LOCK_UNLOCKED;
-
-// volatile int cf_busy = 0;
-
-static struct request *active_req = NULL;
-
-static int cf_open (struct inode *, struct file *);
-static int cf_release (struct inode *, struct file *);
-static int cf_ioctl (struct inode *, struct file *, unsigned, unsigned long);
-
-static void cf_request(request_queue_t * q);
-static int cf_transfer(const struct request *req);
-
-/*long (*unlocked_ioctl) (struct file *, unsigned, unsigned long);
-long (*compat_ioctl) (struct file *, unsigned, unsigned long);*/
-// int (*direct_access) (struct block_device *, sector_t, unsigned long *);
-// int (*media_changed) (struct gendisk *);
-// int (*revalidate_disk) (struct gendisk *);
-
-static struct block_device_operations cf_bdops = {
-      .owner = THIS_MODULE,
-      .open = cf_open,
-      .release = cf_release,
-      .ioctl = cf_ioctl,
-      .media_changed = NULL,
-      .unlocked_ioctl = NULL,
-      .revalidate_disk = NULL,
-      .compat_ioctl = NULL,
-      .direct_access = NULL
-};
-
-
-int cf_mips_probe(struct platform_device *pdev)
-{
-       struct gendisk* cf_gendisk=NULL;
-       struct cf_device *cdev = (struct cf_device *) pdev->dev.platform_data;
-       struct cf_mips_dev *dev;
-       struct resource *r;
-       int reg_result;
-
-       reg_result = register_blkdev(MAJOR_NR, "cf-mips");
-       if (reg_result < 0) {
-               printk(KERN_WARNING "cf-mips: can't get major %d\n", MAJOR_NR);
-               return reg_result;
-       }
-
-       dev = (struct cf_mips_dev *)kmalloc(sizeof(struct cf_mips_dev),GFP_KERNEL);
-       if (!dev)
-               goto out_err;
-       memset(dev, 0, sizeof(struct cf_mips_dev));
-       cdev->dev = dev;
-       
-       dev->pin = cdev->gpio_pin;
-       dev->irq = platform_get_irq_byname(pdev, "cf_irq");
-       r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cf_membase");
-       dev->base = (void *) r->start;
-       
-       if (cf_init(dev)) goto out_err;
-       printk("init done");
-       
-       spin_lock_init(&dev->lock);
-       dev->queue = blk_init_queue(cf_request,&dev->lock);
-       if (!dev->queue){
-               printk(KERN_ERR "cf-mips: no mem for queue\n");
-               goto out_err;
-       }
-       blk_queue_max_sectors(dev->queue,ATA_MAX_SECT_PER_CMD);
-
-       /* For memory devices, it is always better to avoid crossing segments
-       inside the same request. */
-/*     if (dev->dtype==0x848A){
-               printk(KERN_INFO "Setting boundary for cf to 0x%x",(dev->block_size*512)-1);
-               blk_queue_segment_boundary(dev->queue, (dev->block_size*512)-1);
-       }*/
-
-       dev->gd = alloc_disk(CF_MAX_PART);
-       cf_gendisk = dev->gd;
-       cdev->gd = dev->gd;
-       if (!cf_gendisk) goto out_err; /* Last of these goto's */
-       
-       cf_gendisk->major = MAJOR_NR;
-       cf_gendisk->first_minor = 0;
-       cf_gendisk->queue=dev->queue;
-       BUG_ON(cf_gendisk->minors != CF_MAX_PART);
-       strcpy(cf_gendisk->disk_name,"cfa");
-       cf_gendisk->fops = &cf_bdops;
-       cf_gendisk->flags = 0 ; /* is not yet GENHD_FL_REMOVABLE */
-       cf_gendisk->private_data=dev;
-       
-       set_capacity(cf_gendisk,dev->sectors * CF_KERNEL_MUL);
-       
-       /* Let the disk go live */
-       add_disk(cf_gendisk);
-#if 0
-       result = cf_init();
-       
-       /* default cfg for all partitions */
-       memset(cf_parts, 0, sizeof (cf_parts[0]) * CF_MAX_PART);
-       memset(cf_part_sizes, 0, sizeof (cf_part_sizes[0]) * CF_MAX_PART);
-       for (i = 0; i < CF_MAX_PART; ++i) {
-               cf_hsect_sizes[i] = CF_SECT_SIZE;
-               cf_max_sectors[i] = ATA_MAX_SECT_PER_CMD;
-               cf_blksize_sizes[i] = BLOCK_SIZE;
-       }
-
-       /* setup info for whole disk (partition 0) */
-       cf_part_sizes[0] = cf_sectors / 2;
-       cf_parts[0].nr_sects = cf_sectors;
-
-       blk_size[MAJOR_NR] = cf_part_sizes;
-       blksize_size[MAJOR_NR] = cf_blksize_sizes;
-       max_sectors[MAJOR_NR] = cf_max_sectors;
-       hardsect_size[MAJOR_NR] = cf_hsect_sizes;
-       read_ahead[MAJOR_NR] = 8;       /* (4kB) */
-
-       blk_init_queue(BLK_DEFAULT_QUEUE(MAJOR_NR), DEVICE_REQUEST);
-
-       add_gendisk(&cf_gendisk);
-#endif
-//     printk(KERN_INFO "cf-mips partition check: \n");
-//     register_disk(cf_gendisk, MKDEV(MAJOR_NR, 0), CF_MAX_PART,
-//                   &cf_bdops, dev->sectors);
-       return 0;
-
-out_err:
-       if (dev->queue){
-               blk_cleanup_queue(dev->queue);
-       }
-       if (reg_result) {
-               unregister_blkdev(MAJOR_NR, "cf-mips");
-               return reg_result;
-       }
-       if (dev){
-               cf_cleanup(dev);
-               kfree(dev);
-       }
-       return 1;
-}
-
-static int
-cf_mips_remove(struct platform_device *pdev)
-{
-       struct cf_device *cdev = (struct cf_device *) pdev->dev.platform_data;
-       struct cf_mips_dev *dev = (struct cf_mips_dev *) cdev->dev;
-       
-       unregister_blkdev(MAJOR_NR, "cf-mips");
-       blk_cleanup_queue(dev->queue);
-
-       del_gendisk(dev->gd);
-       cf_cleanup(dev);
-       return 0;
-}
-
-
-static struct platform_driver cf_driver = {
-       .driver.name = "rb500-cf",
-       .probe = cf_mips_probe,
-       .remove = cf_mips_remove,
-};
-
-static int __init cf_mips_init(void)
-{
-       printk(KERN_INFO "cf-mips module loaded\n");
-       return platform_driver_register(&cf_driver);
-}
-
-static void cf_mips_cleanup(void)
-{
-       platform_driver_unregister(&cf_driver);
-       printk(KERN_INFO "cf-mips module removed\n");
-}
-
-module_init(cf_mips_init);
-module_exit(cf_mips_cleanup);
-
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_BLOCKDEV_MAJOR(CF_MIPS_MAJOR);
-
-
-static int cf_open(struct inode *inode, struct file *filp)
-{
-       struct cf_mips_dev  *dev=inode->i_bdev->bd_disk->private_data;
-       int minor = MINOR(inode->i_rdev);
-       
-       if (minor >= CF_MAX_PART)
-               return -ENODEV;
-       //DEBUGP(KERN_INFO "cf-mips module opened, minor %d\n", minor);
-       spin_lock(&dev->lock);
-       dev->users++;
-       spin_unlock(&dev->lock);
-       filp->private_data=dev;
-       
-       /* dirty workaround to set CFRDY GPIO as an input when some other
-          program sets it as an output */
-       gpio_set_value(dev->pin, 0);
-       return 0;               /* success */
-}
-
-static int cf_release(struct inode *inode, struct file *filp)
-{
-       int minor = MINOR(inode->i_rdev);
-       struct cf_mips_dev  *dev=inode->i_bdev->bd_disk->private_data;
-       spin_lock(&dev->lock);
-       dev->users--;
-       spin_unlock(&dev->lock);
-       return 0;
-}
-
-static int cf_ioctl(struct inode *inode, struct file *filp,
-        unsigned int cmd, unsigned long arg)
-{
-       unsigned minor = MINOR(inode->i_rdev);
-       struct cf_mips_dev  *dev=inode->i_bdev->bd_disk->private_data;
-
-       DEBUGP(KERN_INFO "cf_ioctl cmd %u\n", cmd);
-       switch (cmd) {
-       case BLKRRPART: /* re-read partition table */
-               if (!capable(CAP_SYS_ADMIN))
-                       return -EACCES;
-               printk(KERN_INFO "cf-mips partition check: \n");
-               register_disk(dev->gd);
-               return 0;
-
-       case HDIO_GETGEO:
-               {
-                       struct hd_geometry geo;
-                       geo.cylinders = dev->cyl;
-                       geo.heads = dev->head;
-                       geo.sectors = dev->spt;
-                       geo.start = (*dev->gd->part)[minor].start_sect;
-                       if (copy_to_user((void *) arg, &geo, sizeof (geo)))
-                               return -EFAULT;
-               }
-               return 0;
-       }
-
-       return -EINVAL;         /* unknown command */
-}
-
-static void cf_request(request_queue_t * q)
-{
-       struct cf_mips_dev* dev;
-       
-       struct request * req;
-       int status;
-
-       /* We could have q->queuedata = dev , but haven't yet. */
-       if (active_req)
-               return;
-
-       while ((req=elv_next_request(q))!=NULL){
-               dev=req->rq_disk->private_data;
-               status=cf_transfer(req);
-               if (status==CF_TRANS_IN_PROGRESS){
-                       active_req=req;
-                       return;
-               }
-               end_request(req,status);
-       }
-}
-
-static int cf_transfer(const struct request *req)
-{
-       struct cf_mips_dev* dev=req->rq_disk->private_data;
-
-       if (!blk_fs_request(req)){      
-               if (printk_ratelimit())
-                       printk(KERN_WARNING "cf-mips: skipping non-fs request 0x%x\n",req->cmd[0]);
-               return CF_TRANS_FAILED;
-       }
-       
-       return cf_do_transfer(dev,req->sector,req->current_nr_sectors,req->buffer,rq_data_dir(req));
-}
-
-void cf_async_trans_done(struct cf_mips_dev * dev,int result)
-{
-       struct request *req;
-       
-       spin_lock(&dev->lock);
-       req=active_req;
-       active_req=NULL;
-       end_request(req,result);
-       spin_unlock(&dev->lock);
-
-       spin_lock(&dev->lock);
-       cf_request(dev->queue);
-       spin_unlock(&dev->lock);
-}
-
diff --git a/target/linux/rb532/files-2.6.23/drivers/char/watchdog/rc32434_wdt.c b/target/linux/rb532/files-2.6.23/drivers/char/watchdog/rc32434_wdt.c
deleted file mode 100644 (file)
index 2266329..0000000
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- *     RC32434_WDT 0.01: IDT Interprise 79RC32434 watchdog driver 
- *     Copyright (c) Ondrej Zajicek <santiago@crfreenet.org>, 2006
- *
- *     based on
- *
- *     SoftDog 0.05:   A Software Watchdog Device
- *
- *     (c) Copyright 1996 Alan Cox <alan@redhat.com>, 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.
- *     
- */
-
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/fs.h>
-#include <linux/mm.h>
-#include <linux/miscdevice.h>
-#include <linux/watchdog.h>
-#include <linux/reboot.h>
-#include <linux/smp_lock.h>
-#include <linux/init.h>
-#include <asm/bootinfo.h>
-#include <asm/time.h>
-#include <asm/uaccess.h>
-#include <asm/rc32434/integ.h>
-
-#define DEFAULT_TIMEOUT        15              /* (secs) Default is 15 seconds */
-#define MAX_TIMEOUT    20              
-/*
- * (secs) Max is 20 seconds 
- * (max frequency of counter is ~200 MHz, counter is 32-bit unsigned int) 
- */
-
-#define NAME "rc32434_wdt"
-#define VERSION "0.1"
-
-static INTEG_t rc_wdt = (INTEG_t) INTEG_VirtualAddress;                                                                     
-
-static int expect_close = 0;
-static int access = 0;
-static int timeout = 0;
-
-static int nowayout = WATCHDOG_NOWAYOUT;
-module_param(nowayout, int, 0);
-MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
-MODULE_LICENSE("GPL");
-
-
-static inline void start_wdt(void)
-{
-       rc_wdt -> wtcount = 0;
-       rc_wdt -> errcs |= ERRCS_wre_m;
-       rc_wdt -> wtc   |= WTC_en_m;
-}
-
-static inline void stop_wdt(void)
-{
-       rc_wdt -> wtc   &= ~WTC_en_m;
-       rc_wdt -> errcs &= ~ERRCS_wre_m;
-}
-
-static inline void set_wdt(int new_timeout)
-{
-       u32 cmp = new_timeout * mips_hpt_frequency;
-       u32 state;
-       
-       timeout = new_timeout;
-       /*
-        * store and disable WTC
-        */
-       state = rc_wdt -> wtc & WTC_en_m;
-       rc_wdt -> wtc   &= ~WTC_en_m;
-
-       rc_wdt -> wtcount = 0;
-       rc_wdt -> wtcompare = cmp;
-
-       /*
-        * restore WTC
-        */     
-       rc_wdt -> wtc |= state;
-}
-
-static inline void update_wdt(void)
-{
-       rc_wdt -> wtcount = 0;
-}
-
-/*
- *     Allow only one person to hold it open
- */
-static int wdt_open(struct inode *inode, struct file *file)
-{
-       if (access)
-               return -EBUSY;
-       if (nowayout) {
-               __module_get(THIS_MODULE);
-       }
-       /*
-        *      Activate timer
-        */
-       start_wdt();
-       printk(KERN_INFO NAME ": enabling watchdog timer\n");
-       access = 1;
-       return 0;
-}
-
-static int wdt_release(struct inode *inode, struct file *file)
-{
-       /*
-        *      Shut off the timer.
-        *      Lock it in if it's a module and we set nowayout
-        */
-       if (expect_close && nowayout == 0) {
-               stop_wdt ();
-               printk(KERN_INFO NAME ": disabling watchdog timer\n");
-               module_put(THIS_MODULE);
-       } else {
-               printk (KERN_CRIT NAME ": device closed unexpectedly.  WDT will not stop!\n");
-       }
-       access = 0;
-       return 0;
-}
-
-static ssize_t wdt_write(struct file *file, const char *data, size_t len, loff_t *ppos)
-{
-       /*
-        *      Refresh the timer.
-        */
-       if (len) {
-               if (!nowayout) {
-                       size_t i;
-
-                       /* In case it was set long ago */
-                       expect_close = 0;
-
-                       for (i = 0; i != len; i++) {
-                               char c;
-                               if (get_user(c, data + i))
-                                       return -EFAULT;
-                               if (c == 'V')
-                                       expect_close = 1;
-                       }
-               }
-               update_wdt ();
-               return len;
-       }
-       return 0;
-}
-
-static int wdt_ioctl(struct inode *inode, struct file *file,
-       unsigned int cmd, unsigned long arg)
-{
-       int new_timeout;
-       static struct watchdog_info ident = {
-               .options =              WDIOF_SETTIMEOUT |
-                                       WDIOF_KEEPALIVEPING |
-                                       WDIOF_MAGICCLOSE,
-               .firmware_version =     0,
-               .identity =             "RC32434_WDT Watchdog",
-       };
-       switch (cmd) {
-               default:
-                       return -ENOTTY;
-               case WDIOC_GETSUPPORT:
-                       if(copy_to_user((struct watchdog_info *)arg, &ident, sizeof(ident)))
-                               return -EFAULT;
-                       return 0;
-               case WDIOC_GETSTATUS:
-               case WDIOC_GETBOOTSTATUS:
-                       return put_user(0,(int *)arg);
-               case WDIOC_KEEPALIVE:
-                       update_wdt();
-                       return 0;
-               case WDIOC_SETTIMEOUT:
-                       if (get_user(new_timeout, (int *)arg))
-                               return -EFAULT;
-                       if (new_timeout < 1)
-                               return -EINVAL;
-                       if (new_timeout > MAX_TIMEOUT)
-                               return -EINVAL;
-                       set_wdt(new_timeout);
-                       /* Fall */
-               case WDIOC_GETTIMEOUT:
-                       return put_user(timeout, (int *)arg);
-       }
-}
-
-static struct file_operations wdt_fops = {
-       owner:          THIS_MODULE,
-       llseek:         no_llseek,
-       write:          wdt_write,
-       ioctl:          wdt_ioctl,
-       open:           wdt_open,
-       release:        wdt_release,
-};
-
-static struct miscdevice wdt_miscdev = {
-       minor:          WATCHDOG_MINOR,
-       name:           "watchdog",
-       fops:           &wdt_fops,
-};
-
-static char banner[] __initdata = KERN_INFO NAME ": Watchdog Timer version " VERSION ", timer margin: %d sec\n";
-
-static int __init watchdog_init(void)
-{
-       int ret;
-
-       /*
-        * There should be check for RC32434 SoC
-        */
-       if (mips_machgroup != MACH_GROUP_MIKROTIK) return -1;
-
-       ret = misc_register(&wdt_miscdev);
-
-       if (ret)
-               return ret;
-
-       stop_wdt();
-       set_wdt(DEFAULT_TIMEOUT);
-
-       printk(banner, timeout);
-
-       return 0;
-}
-
-static void __exit watchdog_exit(void)
-{
-       misc_deregister(&wdt_miscdev);
-}
-
-module_init(watchdog_init);
-module_exit(watchdog_exit);
diff --git a/target/linux/rb532/files-2.6.23/drivers/leds/leds-rb500.c b/target/linux/rb532/files-2.6.23/drivers/leds/leds-rb500.c
deleted file mode 100644 (file)
index 3ab530a..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * linux/drivers/leds/leds-rb500.c
- *
- * Copyright (C) 2006
- *     Twente Institute for Wireless and Mobile Communications BV
- *
- * 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 (see file GPLv2).
- *
- * Author: Tjalling Hattink <tjalling.hattink@ti-wmc.nl>
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/leds.h>
-#include <asm/rc32434/rb.h>
-
-static void rb500led_amber_set(struct led_classdev *led_cdev, enum led_brightness value)
-{
-       if (value)
-               changeLatchU5(LO_ULED, 0);
-       else
-               changeLatchU5(0, LO_ULED);
-}
-
-static struct led_classdev rb500_amber_led = {
-       .name                   = "rb500led:amber",
-       .default_trigger        = "ide-disk",
-       .brightness_set         = rb500led_amber_set,
-};
-
-static int rb500led_probe(struct platform_device *pdev)
-{
-       int ret;
-
-       changeLatchU5(0, LO_ULED);
-
-       ret = led_classdev_register(&pdev->dev, &rb500_amber_led);
-
-       return ret;
-}
-
-static int rb500led_remove(struct platform_device *pdev)
-{
-       led_classdev_unregister(&rb500_amber_led);
-
-       return 0;
-}
-
-static struct platform_driver rb500led_driver = {
-       .probe          = rb500led_probe,
-       .remove         = rb500led_remove,
-       .driver         = {
-               .name           = "rb500-led",
-       },
-};
-
-static int __init rb500led_init(void)
-{
-       return platform_driver_register(&rb500led_driver);
-}
-
-static void __exit rb500led_exit(void)
-{
-       platform_driver_unregister(&rb500led_driver);
-}
-
-module_init(rb500led_init);
-module_exit(rb500led_exit);
-
-MODULE_AUTHOR("tjalling.hattink@ti-wmc.nl");
-MODULE_DESCRIPTION("Mikrotik RB500 LED driver");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/rb532/files-2.6.23/drivers/net/korina.c b/target/linux/rb532/files-2.6.23/drivers/net/korina.c
deleted file mode 100644 (file)
index e89f334..0000000
+++ /dev/null
@@ -1,1167 +0,0 @@
-/**************************************************************************
- *
- *  BRIEF MODULE DESCRIPTION
- *     Driver for the IDT RC32434 on-chip ethernet controller.
- *
- *  Copyright 2004 IDT Inc. (rischelp@idt.com)
- *  Copyright 2006 Felix Fietkau <nbd@openwrt.org>
- *         
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  You should have received a copy of the  GNU General Public License along
- *  with this program; if not, write  to the Free Software Foundation, Inc.,
- *  675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *
- **************************************************************************
- * May 2004 rkt, neb
- *
- * Based on the driver developed by B. Maruthanayakam, H. Kou and others.
- *
- * Aug 2004 Sadik
- *
- * Added NAPI
- *
- **************************************************************************
- */
-
-#include <linux/autoconf.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/moduleparam.h>
-#include <linux/sched.h>
-#include <linux/ctype.h>
-#include <linux/types.h>
-#include <linux/fcntl.h>
-#include <linux/interrupt.h>
-#include <linux/ptrace.h>
-#include <linux/init.h>
-#include <linux/ioport.h>
-#include <linux/proc_fs.h>
-#include <linux/in.h>
-#include <linux/slab.h>
-#include <linux/string.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/skbuff.h>
-#include <linux/errno.h>
-#include <linux/platform_device.h>
-#include <asm/bootinfo.h>
-#include <asm/system.h>
-#include <asm/bitops.h>
-#include <asm/pgtable.h>
-#include <asm/segment.h>
-#include <asm/io.h>
-#include <asm/dma.h>
-
-#include <asm/rc32434/rb.h>
-#include "rc32434_eth.h"
-
-#define DRIVER_VERSION "(mar2904)"
-
-#define DRIVER_NAME "rc32434 Ethernet driver. " DRIVER_VERSION
-
-#define STATION_ADDRESS_HIGH(dev) (((dev)->dev_addr[0] << 8) | \
-                                  ((dev)->dev_addr[1]))
-#define STATION_ADDRESS_LOW(dev)  (((dev)->dev_addr[2] << 24) | \
-                                  ((dev)->dev_addr[3] << 16) | \
-                                  ((dev)->dev_addr[4] << 8)  | \
-                                  ((dev)->dev_addr[5]))
-
-#define MII_CLOCK 1250000                              /* no more than 2.5MHz */
-#define CONFIG_IDT_USE_NAPI 1
-
-
-static inline void rc32434_abort_tx(struct net_device *dev)
-{
-       struct rc32434_local *lp = (struct rc32434_local *)dev->priv;
-       rc32434_abort_dma(dev, lp->tx_dma_regs);
-       
-}
-
-static inline void rc32434_abort_rx(struct net_device *dev)
-{
-       struct rc32434_local *lp = (struct rc32434_local *)dev->priv;
-       rc32434_abort_dma(dev, lp->rx_dma_regs);
-       
-}
-
-static inline void rc32434_start_tx(struct rc32434_local *lp,  volatile DMAD_t td)
-{
-       rc32434_start_dma(lp->tx_dma_regs, CPHYSADDR(td));
-}
-
-static inline void rc32434_start_rx(struct rc32434_local *lp, volatile DMAD_t rd)
-{
-       rc32434_start_dma(lp->rx_dma_regs, CPHYSADDR(rd));
-}
-
-static inline void rc32434_chain_tx(struct rc32434_local *lp, volatile DMAD_t td)
-{
-       rc32434_chain_dma(lp->tx_dma_regs, CPHYSADDR(td));
-}
-
-static inline void rc32434_chain_rx(struct rc32434_local *lp, volatile DMAD_t rd)
-{
-       rc32434_chain_dma(lp->rx_dma_regs, CPHYSADDR(rd));
-}
-
-#ifdef RC32434_PROC_DEBUG
-static int rc32434_read_proc(char *buf, char **start, off_t fpos,
-                            int length, int *eof, void *data)
-{
-       struct net_device *dev = (struct net_device *)data;
-       struct rc32434_local *lp = (struct rc32434_local *)dev->priv;
-       int len = 0;
-       
-       /* print out header */
-       len += sprintf(buf + len, "\n\tKorina Ethernet Debug\n\n");
-       len += sprintf (buf + len,
-                       "DMA halt count      = %10d, DMA run count = %10d\n",
-                       lp->dma_halt_cnt, lp->dma_run_cnt);
-       
-       if (fpos >= len) {
-               *start = buf;
-               *eof = 1;
-               return 0;
-       }
-       *start = buf + fpos;
-       
-       if ((len -= fpos) > length) 
-               return length;  
-       *eof = 1;
-       
-       return len;
-       
-}
-#endif
-
-
-/*
- * Restart the RC32434 ethernet controller. 
- */
-static int rc32434_restart(struct net_device *dev)
-{
-       struct rc32434_local *lp = (struct rc32434_local *)dev->priv;
-       
-       /*
-        * Disable interrupts
-        */
-       disable_irq(lp->rx_irq);
-       disable_irq(lp->tx_irq);
-#ifdef RC32434_REVISION
-       disable_irq(lp->ovr_irq);
-#endif 
-       disable_irq(lp->und_irq);
-       
-       /* Mask F E bit in Tx DMA */
-       __raw_writel(__raw_readl(&lp->tx_dma_regs->dmasm) | DMASM_f_m | DMASM_e_m, &lp->tx_dma_regs->dmasm);
-       /* Mask D H E bit in Rx DMA */
-       __raw_writel(__raw_readl(&lp->rx_dma_regs->dmasm) | DMASM_d_m | DMASM_h_m | DMASM_e_m, &lp->rx_dma_regs->dmasm);
-       
-       rc32434_init(dev);
-       rc32434_multicast_list(dev);
-       
-       enable_irq(lp->und_irq);
-#ifdef RC32434_REVISION
-       enable_irq(lp->ovr_irq);
-#endif
-       enable_irq(lp->tx_irq);
-       enable_irq(lp->rx_irq);
-       
-       return 0;
-}
-
-static int rc32434_probe(struct platform_device *pdev)
-{
-       struct korina_device *bif = (struct korina_device *) pdev->dev.platform_data;
-       struct rc32434_local *lp = NULL;
-       struct net_device *dev = NULL;
-       struct resource *r;
-       int i, retval,err;
-       
-       dev = alloc_etherdev(sizeof(struct rc32434_local));
-       if(!dev) {
-               ERR("Korina_eth: alloc_etherdev failed\n");
-               return -1;
-       }
-
-       platform_set_drvdata(pdev, dev);
-       SET_MODULE_OWNER(dev);
-       bif->dev = dev;
-       
-       memcpy(dev->dev_addr, bif->mac, 6);
-
-       /* Initialize the device structure. */
-       if (dev->priv == NULL) {
-               lp = (struct rc32434_local *)kmalloc(sizeof(*lp), GFP_KERNEL);
-               memset(lp, 0, sizeof(struct rc32434_local));
-       } 
-       else {
-               lp = (struct rc32434_local *)dev->priv;
-       }
-       
-       lp->rx_irq = platform_get_irq_byname(pdev, "korina_rx");
-       lp->tx_irq = platform_get_irq_byname(pdev, "korina_tx");
-       lp->ovr_irq = platform_get_irq_byname(pdev, "korina_ovr");
-       lp->und_irq = platform_get_irq_byname(pdev, "korina_und");
-
-       r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_regs");
-       dev->base_addr = r->start;
-       lp->eth_regs = ioremap_nocache(r->start, r->end - r->start);
-       if (!lp->eth_regs) {
-               ERR("Can't remap eth registers\n");
-               retval = -ENXIO;
-               goto probe_err_out;
-       }
-
-       r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_dma_rx");
-       lp->rx_dma_regs = ioremap_nocache(r->start, r->end - r->start);
-       if (!lp->rx_dma_regs) {
-               ERR("Can't remap Rx DMA registers\n");
-               retval = -ENXIO;
-               goto probe_err_out;
-       }
-
-       r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "korina_dma_tx");
-       lp->tx_dma_regs = ioremap_nocache(r->start, r->end - r->start);
-       if (!lp->tx_dma_regs) {
-               ERR("Can't remap Tx DMA registers\n");
-               retval = -ENXIO;
-               goto probe_err_out;
-       }
-       
-#ifdef RC32434_PROC_DEBUG
-       lp->ps = create_proc_read_entry (bif->name, 0, proc_net,
-                                        rc32434_read_proc, dev);
-#endif
-       
-       lp->td_ring =   (DMAD_t)kmalloc(TD_RING_SIZE + RD_RING_SIZE, GFP_KERNEL);
-       if (!lp->td_ring) {
-               ERR("Can't allocate descriptors\n");
-               retval = -ENOMEM;
-               goto probe_err_out;
-       }
-       
-       dma_cache_inv((unsigned long)(lp->td_ring), TD_RING_SIZE + RD_RING_SIZE);
-       
-       /* now convert TD_RING pointer to KSEG1 */
-       lp->td_ring = (DMAD_t )KSEG1ADDR(lp->td_ring);
-       lp->rd_ring = &lp->td_ring[RC32434_NUM_TDS];
-       
-       
-       spin_lock_init(&lp->lock);
-       
-       /* just use the rx dma irq */
-       dev->irq = lp->rx_irq;
-       
-       dev->priv = lp;
-       
-       dev->open = rc32434_open;
-       dev->stop = rc32434_close;
-       dev->hard_start_xmit = rc32434_send_packet;
-       dev->get_stats  = rc32434_get_stats;
-       dev->set_multicast_list = &rc32434_multicast_list;
-       dev->tx_timeout = rc32434_tx_timeout;
-       dev->watchdog_timeo = RC32434_TX_TIMEOUT;
-
-#ifdef CONFIG_IDT_USE_NAPI
-       dev->poll = rc32434_poll;
-       dev->weight = 64;
-       printk("Using NAPI with weight %d\n",dev->weight);
-#else
-       lp->rx_tasklet = kmalloc(sizeof(struct tasklet_struct), GFP_KERNEL);
-       tasklet_init(lp->rx_tasklet, rc32434_rx_tasklet, (unsigned long)dev);
-#endif
-       lp->tx_tasklet = kmalloc(sizeof(struct tasklet_struct), GFP_KERNEL);
-       tasklet_init(lp->tx_tasklet, rc32434_tx_tasklet, (unsigned long)dev);
-       
-       if ((err = register_netdev(dev))) {
-               printk(KERN_ERR "rc32434 ethernet. Cannot register net device %d\n", err);
-               free_netdev(dev);
-               retval = -EINVAL;
-               goto probe_err_out;
-       }
-       
-       INFO("Rx IRQ %d, Tx IRQ %d, ", lp->rx_irq, lp->tx_irq);
-       for (i = 0; i < 6; i++) {
-               printk("%2.2x", dev->dev_addr[i]);
-               if (i<5)
-                       printk(":");
-       }
-       printk("\n");
-       
-       return 0;
-       
- probe_err_out:
-       rc32434_cleanup_module();
-       ERR(" failed.  Returns %d\n", retval);
-       return retval;
-       
-}
-
-static int rc32434_remove(struct platform_device *pdev)
-{
-       struct korina_device *bif = (struct korina_device *) pdev->dev.platform_data;
-       
-       if (bif->dev != NULL) {
-               struct rc32434_local *lp = (struct rc32434_local *)bif->dev->priv;
-               if (lp != NULL) {
-                       if (lp->eth_regs)
-                               iounmap((void*)lp->eth_regs);
-                       if (lp->rx_dma_regs)
-                               iounmap((void*)lp->rx_dma_regs);
-                       if (lp->tx_dma_regs)
-                               iounmap((void*)lp->tx_dma_regs);
-                       if (lp->td_ring)
-                               kfree((void*)KSEG0ADDR(lp->td_ring));
-                       
-#ifdef RC32434_PROC_DEBUG
-                       if (lp->ps) {
-                               remove_proc_entry(bif->name, proc_net);
-                       }
-#endif
-                       kfree(lp);
-               }
-               
-               platform_set_drvdata(pdev, NULL);
-               unregister_netdev(bif->dev);
-               free_netdev(bif->dev);
-               kfree(bif->dev);
-       }
-       return 0;
-}
-
-
-static int rc32434_open(struct net_device *dev)
-{
-       struct rc32434_local *lp = (struct rc32434_local *)dev->priv;
-       
-       /* Initialize */
-       if (rc32434_init(dev)) {
-               ERR("Error: cannot open the Ethernet device\n");
-               return -EAGAIN;
-       }
-       
-       /* Install the interrupt handler that handles the Done Finished Ovr and Und Events */   
-       if (request_irq(lp->rx_irq, &rc32434_rx_dma_interrupt,
-                 SA_SHIRQ | SA_INTERRUPT,
-                       "Korina ethernet Rx", dev)) {
-               ERR(": unable to get Rx DMA IRQ %d\n",
-                   lp->rx_irq);
-               return -EAGAIN;
-       }
-       if (request_irq(lp->tx_irq, &rc32434_tx_dma_interrupt,
-                 SA_SHIRQ | SA_INTERRUPT,
-                       "Korina ethernet Tx", dev)) {
-               ERR(": unable to get Tx DMA IRQ %d\n",
-                   lp->tx_irq);
-               free_irq(lp->rx_irq, dev);
-               return -EAGAIN;
-       }
-       
-#ifdef RC32434_REVISION
-       /* Install handler for overrun error. */
-       if (request_irq(lp->ovr_irq, &rc32434_ovr_interrupt,
-                       SA_SHIRQ | SA_INTERRUPT,
-                       "Ethernet Overflow", dev)) {
-               ERR(": unable to get OVR IRQ %d\n",
-                   lp->ovr_irq);
-               free_irq(lp->rx_irq, dev);
-               free_irq(lp->tx_irq, dev);
-               return -EAGAIN;
-       }
-#endif
-       
-       /* Install handler for underflow error. */
-       if (request_irq(lp->und_irq, &rc32434_und_interrupt,
-                       SA_SHIRQ | SA_INTERRUPT,
-                       "Ethernet Underflow", dev)) {
-               ERR(": unable to get UND IRQ %d\n",
-                   lp->und_irq);
-               free_irq(lp->rx_irq, dev);
-               free_irq(lp->tx_irq, dev);
-#ifdef RC32434_REVISION                
-               free_irq(lp->ovr_irq, dev);             
-#endif
-               return -EAGAIN;
-       }
-       
-       
-       return 0;
-}
-
-
-
-
-static int rc32434_close(struct net_device *dev)
-{
-       struct rc32434_local *lp = (struct rc32434_local *)dev->priv;
-       u32 tmp;
-       
-       /* Disable interrupts */
-       disable_irq(lp->rx_irq);
-       disable_irq(lp->tx_irq);
-#ifdef RC32434_REVISION
-       disable_irq(lp->ovr_irq);
-#endif
-       disable_irq(lp->und_irq);
-       
-       tmp = __raw_readl(&lp->tx_dma_regs->dmasm);
-       tmp = tmp | DMASM_f_m | DMASM_e_m;
-       __raw_writel(tmp, &lp->tx_dma_regs->dmasm);
-       
-       tmp = __raw_readl(&lp->rx_dma_regs->dmasm);
-       tmp = tmp | DMASM_d_m | DMASM_h_m | DMASM_e_m;
-       __raw_writel(tmp, &lp->rx_dma_regs->dmasm);
-       
-       free_irq(lp->rx_irq, dev);
-       free_irq(lp->tx_irq, dev);
-#ifdef RC32434_REVISION        
-       free_irq(lp->ovr_irq, dev);
-#endif
-       free_irq(lp->und_irq, dev);
-       return 0;
-}
-
-
-/* transmit packet */
-static int rc32434_send_packet(struct sk_buff *skb, struct net_device *dev)
-{
-       struct rc32434_local            *lp = (struct rc32434_local *)dev->priv;
-       unsigned long                   flags;
-       u32                                     length;
-       DMAD_t                          td;
-       
-       
-       spin_lock_irqsave(&lp->lock, flags);
-       
-       td = &lp->td_ring[lp->tx_chain_tail];
-       
-       /* stop queue when full, drop pkts if queue already full */
-       if(lp->tx_count >= (RC32434_NUM_TDS - 2)) {
-               lp->tx_full = 1;
-               
-               if(lp->tx_count == (RC32434_NUM_TDS - 2)) {
-                       netif_stop_queue(dev);
-               }
-               else {
-                       lp->stats.tx_dropped++;
-                       dev_kfree_skb_any(skb);
-                       spin_unlock_irqrestore(&lp->lock, flags);
-                       return 1;
-               }          
-       }        
-       
-       lp->tx_count ++;
-       
-       lp->tx_skb[lp->tx_chain_tail] = skb;
-       
-       length = skb->len;
-       dma_cache_wback((u32)skb->data, skb->len);
-       
-       /* Setup the transmit descriptor. */
-       dma_cache_inv((u32) td, sizeof(*td));
-       td->ca = CPHYSADDR(skb->data);
-       
-       if(__raw_readl(&(lp->tx_dma_regs->dmandptr)) == 0) {
-               if( lp->tx_chain_status == empty ) {
-                       td->control = DMA_COUNT(length) |DMAD_cof_m |DMAD_iof_m;                                /*  Update tail      */
-                       lp->tx_chain_tail = (lp->tx_chain_tail + 1) & RC32434_TDS_MASK;                          /*   Move tail       */
-                       __raw_writel(CPHYSADDR(&lp->td_ring[lp->tx_chain_head]), &(lp->tx_dma_regs->dmandptr)); /* Write to NDPTR    */
-                       lp->tx_chain_head = lp->tx_chain_tail;                                                  /* Move head to tail */
-               }
-               else {
-                       td->control = DMA_COUNT(length) |DMAD_cof_m|DMAD_iof_m;                                 /* Update tail */
-                       lp->td_ring[(lp->tx_chain_tail-1)& RC32434_TDS_MASK].control &=  ~(DMAD_cof_m);          /* Link to prev */
-                       lp->td_ring[(lp->tx_chain_tail-1)& RC32434_TDS_MASK].link =  CPHYSADDR(td);              /* Link to prev */
-                       lp->tx_chain_tail = (lp->tx_chain_tail + 1) & RC32434_TDS_MASK;                          /* Move tail */
-                       __raw_writel(CPHYSADDR(&lp->td_ring[lp->tx_chain_head]), &(lp->tx_dma_regs->dmandptr)); /* Write to NDPTR */
-                       lp->tx_chain_head = lp->tx_chain_tail;                                                  /* Move head to tail */
-                       lp->tx_chain_status = empty;
-               }
-       }
-       else {
-               if( lp->tx_chain_status == empty ) {
-                       td->control = DMA_COUNT(length) |DMAD_cof_m |DMAD_iof_m;                                /* Update tail */
-                       lp->tx_chain_tail = (lp->tx_chain_tail + 1) & RC32434_TDS_MASK;                          /* Move tail */
-                       lp->tx_chain_status = filled;
-               }
-               else {
-                       td->control = DMA_COUNT(length) |DMAD_cof_m |DMAD_iof_m;                                /* Update tail */
-                       lp->td_ring[(lp->tx_chain_tail-1)& RC32434_TDS_MASK].control &=  ~(DMAD_cof_m);          /* Link to prev */
-                       lp->td_ring[(lp->tx_chain_tail-1)& RC32434_TDS_MASK].link =  CPHYSADDR(td);              /* Link to prev */
-                       lp->tx_chain_tail = (lp->tx_chain_tail + 1) & RC32434_TDS_MASK;                          /* Move tail */
-               }
-       }
-       dma_cache_wback((u32) td, sizeof(*td));
-       
-       dev->trans_start = jiffies;                             
-       
-       spin_unlock_irqrestore(&lp->lock, flags);
-       
-       return 0;
-}
-
-
-/* Ethernet MII-PHY Handler */
-static void rc32434_mii_handler(unsigned long data)
-{
-       struct net_device *dev = (struct net_device *)data;             
-       struct rc32434_local *lp = (struct rc32434_local *)dev->priv;
-       unsigned long   flags;
-       unsigned long duplex_status;
-       int port_addr = (lp->rx_irq == 0x2c? 1:0) << 8;
-       
-       spin_lock_irqsave(&lp->lock, flags);
-       
-       /* Two ports are using the same MII, the difference is the PHY address */
-       __raw_writel(0, &rc32434_eth0_regs->miimcfg);  
-       __raw_writel(0, &rc32434_eth0_regs->miimcmd);  
-       __raw_writel(port_addr |0x05, &rc32434_eth0_regs->miimaddr);  
-       __raw_writel(MIIMCMD_scn_m, &rc32434_eth0_regs->miimcmd);  
-       while(__raw_readl(&rc32434_eth0_regs->miimind) & MIIMIND_nv_m);
-       
-       ERR("irq:%x             port_addr:%x    RDD:%x\n", 
-           lp->rx_irq, port_addr, __raw_readl(&rc32434_eth0_regs->miimrdd));
-       duplex_status = (__raw_readl(&rc32434_eth0_regs->miimrdd) & 0x140)? ETHMAC2_fd_m: 0;
-       if(duplex_status != lp->duplex_mode) {
-               ERR("The MII-PHY is Auto-negotiated to %s-Duplex mode for Eth-%x\n", duplex_status? "Full":"Half", lp->rx_irq == 0x2c? 1:0);            
-               lp->duplex_mode = duplex_status;
-               rc32434_restart(dev);           
-       }
-       
-       lp->mii_phy_timer.expires = jiffies + 10 * HZ;  
-       add_timer(&lp->mii_phy_timer);
-       
-       spin_unlock_irqrestore(&lp->lock, flags);
-       
-}
-
-#ifdef RC32434_REVISION        
-/* Ethernet Rx Overflow interrupt */
-static irqreturn_t
-rc32434_ovr_interrupt(int irq, void *dev_id)
-{
-       struct net_device *dev = (struct net_device *)dev_id;
-       struct rc32434_local *lp;
-       unsigned int ovr;
-       irqreturn_t retval = IRQ_NONE;
-       
-       ASSERT(dev != NULL);
-       
-       lp = (struct rc32434_local *)dev->priv;
-       spin_lock(&lp->lock);
-       ovr = __raw_readl(&lp->eth_regs->ethintfc);
-       
-       if(ovr & ETHINTFC_ovr_m) {
-               netif_stop_queue(dev);
-               
-               /* clear OVR bit */
-               __raw_writel((ovr & ~ETHINTFC_ovr_m), &lp->eth_regs->ethintfc);
-               
-               /* Restart interface */
-               rc32434_restart(dev);
-               retval = IRQ_HANDLED;
-       }
-       spin_unlock(&lp->lock);
-       
-       return retval;
-}
-
-#endif
-
-
-/* Ethernet Tx Underflow interrupt */
-static irqreturn_t
-rc32434_und_interrupt(int irq, void *dev_id)
-{
-       struct net_device *dev = (struct net_device *)dev_id;
-       struct rc32434_local *lp;
-       unsigned int und;
-       irqreturn_t retval = IRQ_NONE;
-       
-       ASSERT(dev != NULL);
-       
-       lp = (struct rc32434_local *)dev->priv;
-       
-       spin_lock(&lp->lock);
-       
-       und = __raw_readl(&lp->eth_regs->ethintfc);
-       
-       if(und & ETHINTFC_und_m) {
-               netif_stop_queue(dev);
-               
-               __raw_writel((und & ~ETHINTFC_und_m), &lp->eth_regs->ethintfc);
-               
-               /* Restart interface */
-               rc32434_restart(dev);
-               retval = IRQ_HANDLED;
-       }
-       
-       spin_unlock(&lp->lock);
-       
-       return retval;
-}
-
-
-/* Ethernet Rx DMA interrupt */
-static irqreturn_t
-rc32434_rx_dma_interrupt(int irq, void *dev_id)
-{
-       struct net_device *dev = (struct net_device *)dev_id;
-       struct rc32434_local* lp;
-       volatile u32 dmas,dmasm;
-       irqreturn_t retval;
-       
-       ASSERT(dev != NULL);
-       
-       lp = (struct rc32434_local *)dev->priv;
-       
-       spin_lock(&lp->lock);
-       dmas = __raw_readl(&lp->rx_dma_regs->dmas);
-       if(dmas & (DMAS_d_m|DMAS_h_m|DMAS_e_m)) {
-               /* Mask D H E bit in Rx DMA */
-               dmasm = __raw_readl(&lp->rx_dma_regs->dmasm);
-               __raw_writel(dmasm | (DMASM_d_m | DMASM_h_m | DMASM_e_m), &lp->rx_dma_regs->dmasm);
-#ifdef CONFIG_IDT_USE_NAPI
-               if(netif_rx_schedule_prep(dev))
-                        __netif_rx_schedule(dev);
-#else
-               tasklet_hi_schedule(lp->rx_tasklet);
-#endif
-               
-               if (dmas & DMAS_e_m)
-                       ERR(": DMA error\n");
-               
-               retval = IRQ_HANDLED;
-       }
-       else
-               retval = IRQ_NONE;
-       
-       spin_unlock(&lp->lock);
-       return retval;
-}
-
-#ifdef CONFIG_IDT_USE_NAPI
-static int rc32434_poll(struct net_device *rx_data_dev, int *budget)
-#else
-static void rc32434_rx_tasklet(unsigned long rx_data_dev)
-#endif
-{
-       struct net_device *dev = (struct net_device *)rx_data_dev;      
-       struct rc32434_local* lp = netdev_priv(dev);
-       volatile DMAD_t  rd = &lp->rd_ring[lp->rx_next_done];
-       struct sk_buff *skb, *skb_new;
-       u8* pkt_buf;
-       u32 devcs, count, pkt_len, pktuncrc_len;
-       volatile u32 dmas;
-#ifdef CONFIG_IDT_USE_NAPI
-       u32 received = 0;
-       int rx_work_limit = min(*budget,dev->quota);
-#else
-       unsigned long   flags;
-       spin_lock_irqsave(&lp->lock, flags);
-#endif
-
-       dma_cache_inv((u32)rd, sizeof(*rd));
-       while ( (count = RC32434_RBSIZE - (u32)DMA_COUNT(rd->control)) != 0) {
-#ifdef CONFIG_IDT_USE_NAPI
-               if(--rx_work_limit <0)
-                {
-                        break;
-                }
-#endif
-               /* init the var. used for the later operations within the while loop */
-               skb_new = NULL;
-               devcs = rd->devcs;
-               pkt_len = RCVPKT_LENGTH(devcs);
-               skb = lp->rx_skb[lp->rx_next_done];
-      
-               if (count < 64) {
-                       lp->stats.rx_errors++;
-                       lp->stats.rx_dropped++;                 
-               }
-               else if ((devcs & ( ETHRX_ld_m)) !=     ETHRX_ld_m) {
-                       /* check that this is a whole packet */
-                       /* WARNING: DMA_FD bit incorrectly set in Rc32434 (errata ref #077) */
-                       lp->stats.rx_errors++;
-                       lp->stats.rx_dropped++;
-               }
-               else if ( (devcs & ETHRX_rok_m)  ) {
-                       
-                       {
-                               /* must be the (first and) last descriptor then */
-                               pkt_buf = (u8*)lp->rx_skb[lp->rx_next_done]->data;
-                               
-                               pktuncrc_len = pkt_len - 4;
-                               /* invalidate the cache */
-                               dma_cache_inv((unsigned long)pkt_buf, pktuncrc_len);
-                               
-                               /* Malloc up new buffer. */                                       
-                               skb_new = dev_alloc_skb(RC32434_RBSIZE + 2);                                                    
-                               
-                               if (skb_new != NULL){
-                                       /* Make room */
-                                       skb_put(skb, pktuncrc_len);                 
-                                       
-                                       skb->protocol = eth_type_trans(skb, dev);
-                                       
-                                       /* pass the packet to upper layers */
-#ifdef CONFIG_IDT_USE_NAPI
-                                       netif_receive_skb(skb);
-#else
-                                       netif_rx(skb);
-#endif
-                                       
-                                       dev->last_rx = jiffies;
-                                       lp->stats.rx_packets++;
-                                       lp->stats.rx_bytes += pktuncrc_len;
-                                       
-                                       if (IS_RCV_MP(devcs))
-                                               lp->stats.multicast++;
-                                       
-                                       /* 16 bit align */                                                
-                                       skb_reserve(skb_new, 2);        
-                                       
-                                       skb_new->dev = dev;
-                                       lp->rx_skb[lp->rx_next_done] = skb_new;
-                               }
-                               else {
-                                       ERR("no memory, dropping rx packet.\n");
-                                       lp->stats.rx_errors++;          
-                                       lp->stats.rx_dropped++;                                 
-                               }
-                       }
-                       
-               }                       
-               else {
-                       /* This should only happen if we enable accepting broken packets */
-                       lp->stats.rx_errors++;
-                       lp->stats.rx_dropped++;
-                       
-                       /* add statistics counters */
-                       if (IS_RCV_CRC_ERR(devcs)) {
-                               DBG(2, "RX CRC error\n");
-                               lp->stats.rx_crc_errors++;
-                       } 
-                       else if (IS_RCV_LOR_ERR(devcs)) {
-                               DBG(2, "RX LOR error\n");
-                               lp->stats.rx_length_errors++;
-                       }                               
-                       else if (IS_RCV_LE_ERR(devcs)) {
-                               DBG(2, "RX LE error\n");
-                               lp->stats.rx_length_errors++;
-                       }
-                       else if (IS_RCV_OVR_ERR(devcs)) {
-                               lp->stats.rx_over_errors++;
-                       }
-                       else if (IS_RCV_CV_ERR(devcs)) {
-                               /* code violation */
-                               DBG(2, "RX CV error\n");
-                               lp->stats.rx_frame_errors++;
-                       }
-                       else if (IS_RCV_CES_ERR(devcs)) {
-                               DBG(2, "RX Preamble error\n");
-                       }
-               }
-               
-               rd->devcs = 0;
-               
-               /* restore descriptor's curr_addr */
-               if(skb_new)
-                       rd->ca = CPHYSADDR(skb_new->data); 
-               else
-                       rd->ca = CPHYSADDR(skb->data);
-               
-               rd->control = DMA_COUNT(RC32434_RBSIZE) |DMAD_cod_m |DMAD_iod_m;
-               lp->rd_ring[(lp->rx_next_done-1)& RC32434_RDS_MASK].control &=  ~(DMAD_cod_m);  
-               
-               lp->rx_next_done = (lp->rx_next_done + 1) & RC32434_RDS_MASK;
-               dma_cache_wback((u32)rd, sizeof(*rd));
-               rd = &lp->rd_ring[lp->rx_next_done];
-               __raw_writel( ~DMAS_d_m, &lp->rx_dma_regs->dmas);
-       }       
-#ifdef CONFIG_IDT_USE_NAPI
-        dev->quota -= received;
-        *budget =- received;
-        if(rx_work_limit < 0)
-                goto not_done;
-#endif
-       
-       dmas = __raw_readl(&lp->rx_dma_regs->dmas);
-       
-       if(dmas & DMAS_h_m) {
-               __raw_writel( ~(DMAS_h_m | DMAS_e_m), &lp->rx_dma_regs->dmas);
-#ifdef RC32434_PROC_DEBUG
-               lp->dma_halt_cnt++;
-#endif
-               rd->devcs = 0;
-               skb = lp->rx_skb[lp->rx_next_done];
-               rd->ca = CPHYSADDR(skb->data);
-               dma_cache_wback((u32)rd, sizeof(*rd));
-               rc32434_chain_rx(lp,rd);
-       }
-       
-#ifdef CONFIG_IDT_USE_NAPI
-       netif_rx_complete(dev);
-#endif
-       /* Enable D H E bit in Rx DMA */
-       __raw_writel(__raw_readl(&lp->rx_dma_regs->dmasm) & ~(DMASM_d_m | DMASM_h_m |DMASM_e_m), &lp->rx_dma_regs->dmasm); 
-#ifdef CONFIG_IDT_USE_NAPI
-       return 0;
- not_done:
-       return 1;
-#else
-       spin_unlock_irqrestore(&lp->lock, flags);
-       return;
-#endif
-
-       
-}      
-
-
-
-/* Ethernet Tx DMA interrupt */
-static irqreturn_t
-rc32434_tx_dma_interrupt(int irq, void *dev_id)
-{
-       struct net_device *dev = (struct net_device *)dev_id;
-       struct rc32434_local *lp;
-       volatile u32 dmas,dmasm;
-       irqreturn_t retval;
-       
-       ASSERT(dev != NULL);
-       
-       lp = (struct rc32434_local *)dev->priv;
-       
-       spin_lock(&lp->lock);
-       
-       dmas = __raw_readl(&lp->tx_dma_regs->dmas);
-       
-       if (dmas & (DMAS_f_m | DMAS_e_m)) {
-               dmasm = __raw_readl(&lp->tx_dma_regs->dmasm);
-               /* Mask F E bit in Tx DMA */
-               __raw_writel(dmasm | (DMASM_f_m | DMASM_e_m), &lp->tx_dma_regs->dmasm);
-               
-               tasklet_hi_schedule(lp->tx_tasklet);
-               
-               if(lp->tx_chain_status == filled && (__raw_readl(&(lp->tx_dma_regs->dmandptr)) == 0)) {
-                       __raw_writel(CPHYSADDR(&lp->td_ring[lp->tx_chain_head]), &(lp->tx_dma_regs->dmandptr));                 
-                       lp->tx_chain_status = empty;
-                       lp->tx_chain_head = lp->tx_chain_tail;
-                       dev->trans_start = jiffies;
-               }
-               
-               if (dmas & DMAS_e_m)
-                       ERR(": DMA error\n");
-               
-               retval = IRQ_HANDLED;
-       }
-       else
-               retval = IRQ_NONE;
-       
-       spin_unlock(&lp->lock);
-       
-       return retval;
-}
-
-
-static void rc32434_tx_tasklet(unsigned long tx_data_dev)
-{
-       struct net_device *dev = (struct net_device *)tx_data_dev;      
-       struct rc32434_local* lp = (struct rc32434_local *)dev->priv;
-       volatile DMAD_t td = &lp->td_ring[lp->tx_next_done];
-       u32 devcs;
-       unsigned long   flags;
-       volatile u32 dmas;
-       
-       spin_lock_irqsave(&lp->lock, flags);
-       
-       /* process all desc that are done */
-       while(IS_DMA_FINISHED(td->control)) {
-               if(lp->tx_full == 1) {
-                       netif_wake_queue(dev);
-                       lp->tx_full = 0;
-               }
-               
-               devcs = lp->td_ring[lp->tx_next_done].devcs;    
-               if ((devcs & (ETHTX_fd_m | ETHTX_ld_m)) != (ETHTX_fd_m | ETHTX_ld_m)) {
-                       lp->stats.tx_errors++;
-                       lp->stats.tx_dropped++;                         
-                       
-                       /* should never happen */
-                       DBG(1, __FUNCTION__ ": split tx ignored\n");
-               }
-               else if (IS_TX_TOK(devcs)) {
-                       lp->stats.tx_packets++;
-                       lp->stats.tx_bytes+=lp->tx_skb[lp->tx_next_done]->len;
-               }
-               else {
-                       lp->stats.tx_errors++;
-                       lp->stats.tx_dropped++;                         
-                       
-                       /* underflow */
-                       if (IS_TX_UND_ERR(devcs)) 
-                               lp->stats.tx_fifo_errors++;
-                       
-                       /* oversized frame */
-                       if (IS_TX_OF_ERR(devcs))
-                               lp->stats.tx_aborted_errors++;
-                       
-                       /* excessive deferrals */
-                       if (IS_TX_ED_ERR(devcs))
-                               lp->stats.tx_carrier_errors++;
-                       
-                       /* collisions: medium busy */
-                       if (IS_TX_EC_ERR(devcs))
-                               lp->stats.collisions++;
-                       
-                       /* late collision */
-                       if (IS_TX_LC_ERR(devcs))
-                               lp->stats.tx_window_errors++;
-                       
-               }
-               
-               /* We must always free the original skb */
-               if (lp->tx_skb[lp->tx_next_done] != NULL) {
-                       dev_kfree_skb_any(lp->tx_skb[lp->tx_next_done]);
-                       lp->tx_skb[lp->tx_next_done] = NULL;
-               }
-               
-               lp->td_ring[lp->tx_next_done].control = DMAD_iof_m;
-               lp->td_ring[lp->tx_next_done].devcs = ETHTX_fd_m | ETHTX_ld_m;  
-               lp->td_ring[lp->tx_next_done].link = 0;
-               lp->td_ring[lp->tx_next_done].ca = 0;
-               lp->tx_count --;
-               
-               /* go on to next transmission */
-               lp->tx_next_done = (lp->tx_next_done + 1) & RC32434_TDS_MASK;
-               td = &lp->td_ring[lp->tx_next_done];
-               
-       }
-       
-       dmas = __raw_readl(&lp->tx_dma_regs->dmas);
-       __raw_writel( ~dmas, &lp->tx_dma_regs->dmas);
-       
-       /* Enable F E bit in Tx DMA */
-       __raw_writel(__raw_readl(&lp->tx_dma_regs->dmasm) & ~(DMASM_f_m | DMASM_e_m), &lp->tx_dma_regs->dmasm); 
-       spin_unlock_irqrestore(&lp->lock, flags);
-       
-}
-
-
-static struct net_device_stats * rc32434_get_stats(struct net_device *dev)
-{
-       struct rc32434_local *lp = (struct rc32434_local *)dev->priv;
-       return &lp->stats;
-}
-
-
-/*
- * Set or clear the multicast filter for this adaptor.
- */
-static void rc32434_multicast_list(struct net_device *dev)
-{   
-       /* listen to broadcasts always and to treat     */
-       /*       IFF bits independantly */
-       struct rc32434_local *lp = (struct rc32434_local *)dev->priv;
-       unsigned long flags;
-       u32 recognise = ETHARC_ab_m;            /* always accept broadcasts */
-       
-       if (dev->flags & IFF_PROMISC)                   /* set promiscuous mode */
-               recognise |= ETHARC_pro_m;
-       
-       if ((dev->flags & IFF_ALLMULTI) || (dev->mc_count > 15))
-               recognise |= ETHARC_am_m;               /* all multicast & bcast */
-       else if (dev->mc_count > 0) {
-               DBG(2, __FUNCTION__ ": mc_count %d\n", dev->mc_count);
-               recognise |= ETHARC_am_m;               /* for the time being */
-       }
-       
-       spin_lock_irqsave(&lp->lock, flags);
-       __raw_writel(recognise, &lp->eth_regs->etharc);
-       spin_unlock_irqrestore(&lp->lock, flags);
-}
-
-
-static void rc32434_tx_timeout(struct net_device *dev)
-{
-       struct rc32434_local *lp = (struct rc32434_local *)dev->priv;
-       unsigned long flags;
-       
-       spin_lock_irqsave(&lp->lock, flags);
-       rc32434_restart(dev);
-       spin_unlock_irqrestore(&lp->lock, flags);
-       
-}
-
-
-/*
- * Initialize the RC32434 ethernet controller.
- */
-static int rc32434_init(struct net_device *dev)
-{
-       struct rc32434_local *lp = (struct rc32434_local *)dev->priv;
-       int i, j;
-       
-       /* Disable DMA */       
-       rc32434_abort_tx(dev);
-       rc32434_abort_rx(dev); 
-       
-       /* reset ethernet logic */ 
-       __raw_writel(0, &lp->eth_regs->ethintfc);
-       while((__raw_readl(&lp->eth_regs->ethintfc) & ETHINTFC_rip_m))
-               dev->trans_start = jiffies;     
-       
-       /* Enable Ethernet Interface */ 
-       __raw_writel(ETHINTFC_en_m, &lp->eth_regs->ethintfc); 
-       
-#ifndef CONFIG_IDT_USE_NAPI
-       tasklet_disable(lp->rx_tasklet);
-#endif
-       tasklet_disable(lp->tx_tasklet);
-       
-       /* Initialize the transmit Descriptors */
-       for (i = 0; i < RC32434_NUM_TDS; i++) {
-               lp->td_ring[i].control = DMAD_iof_m;
-               lp->td_ring[i].devcs = ETHTX_fd_m | ETHTX_ld_m;
-               lp->td_ring[i].ca = 0;
-               lp->td_ring[i].link = 0;
-               if (lp->tx_skb[i] != NULL) {
-                       dev_kfree_skb_any(lp->tx_skb[i]);
-                       lp->tx_skb[i] = NULL;
-               }
-       }
-       lp->tx_next_done = lp->tx_chain_head = lp->tx_chain_tail =      lp->tx_full = lp->tx_count = 0;
-       lp->    tx_chain_status = empty;
-       
-       /*
-        * Initialize the receive descriptors so that they
-        * become a circular linked list, ie. let the last
-        * descriptor point to the first again.
-        */
-       for (i=0; i<RC32434_NUM_RDS; i++) {
-               struct sk_buff *skb = lp->rx_skb[i];
-               
-               if (lp->rx_skb[i] == NULL) {
-                       skb = dev_alloc_skb(RC32434_RBSIZE + 2);
-                       if (skb == NULL) {
-                               ERR("No memory in the system\n");
-                               for (j = 0; j < RC32434_NUM_RDS; j ++)
-                                       if (lp->rx_skb[j] != NULL) 
-                                               dev_kfree_skb_any(lp->rx_skb[j]);
-                               
-                               return 1;
-                       }
-                       else {
-                               skb->dev = dev;
-                               skb_reserve(skb, 2);
-                               lp->rx_skb[i] = skb;
-                               lp->rd_ring[i].ca = CPHYSADDR(skb->data); 
-                               
-                       }
-               }
-               lp->rd_ring[i].control =        DMAD_iod_m | DMA_COUNT(RC32434_RBSIZE);
-               lp->rd_ring[i].devcs = 0;
-               lp->rd_ring[i].ca = CPHYSADDR(skb->data);
-               lp->rd_ring[i].link = CPHYSADDR(&lp->rd_ring[i+1]);
-               
-       }
-       /* loop back */
-       lp->rd_ring[RC32434_NUM_RDS-1].link = CPHYSADDR(&lp->rd_ring[0]);
-       lp->rx_next_done   = 0;
-       
-       lp->rd_ring[RC32434_NUM_RDS-1].control |= DMAD_cod_m;
-       lp->rx_chain_head = 0;
-       lp->rx_chain_tail = 0;
-       lp->rx_chain_status = empty;
-       
-       __raw_writel(0, &lp->rx_dma_regs->dmas);
-       /* Start Rx DMA */
-       rc32434_start_rx(lp, &lp->rd_ring[0]);
-       
-       /* Enable F E bit in Tx DMA */
-       __raw_writel(__raw_readl(&lp->tx_dma_regs->dmasm) & ~(DMASM_f_m | DMASM_e_m), &lp->tx_dma_regs->dmasm); 
-       /* Enable D H E bit in Rx DMA */
-       __raw_writel(__raw_readl(&lp->rx_dma_regs->dmasm) & ~(DMASM_d_m | DMASM_h_m | DMASM_e_m), &lp->rx_dma_regs->dmasm); 
-       
-       /* Accept only packets destined for this Ethernet device address */
-       __raw_writel(ETHARC_ab_m, &lp->eth_regs->etharc); 
-       
-       /* Set all Ether station address registers to their initial values */ 
-       __raw_writel(STATION_ADDRESS_LOW(dev), &lp->eth_regs->ethsal0); 
-       __raw_writel(STATION_ADDRESS_HIGH(dev), &lp->eth_regs->ethsah0);
-       
-       __raw_writel(STATION_ADDRESS_LOW(dev), &lp->eth_regs->ethsal1); 
-       __raw_writel(STATION_ADDRESS_HIGH(dev), &lp->eth_regs->ethsah1);
-       
-       __raw_writel(STATION_ADDRESS_LOW(dev), &lp->eth_regs->ethsal2); 
-       __raw_writel(STATION_ADDRESS_HIGH(dev), &lp->eth_regs->ethsah2);
-       
-       __raw_writel(STATION_ADDRESS_LOW(dev), &lp->eth_regs->ethsal3); 
-       __raw_writel(STATION_ADDRESS_HIGH(dev), &lp->eth_regs->ethsah3); 
-       
-       
-       /* Frame Length Checking, Pad Enable, CRC Enable, Full Duplex set */ 
-       __raw_writel(ETHMAC2_pe_m | ETHMAC2_cen_m | ETHMAC2_fd_m, &lp->eth_regs->ethmac2);  
-       //ETHMAC2_flc_m         ETHMAC2_fd_m    lp->duplex_mode
-       
-       /* Back to back inter-packet-gap */ 
-       __raw_writel(0x15, &lp->eth_regs->ethipgt); 
-       /* Non - Back to back inter-packet-gap */ 
-       __raw_writel(0x12, &lp->eth_regs->ethipgr); 
-       
-       /* Management Clock Prescaler Divisor */
-       /* Clock independent setting */
-       __raw_writel(((idt_cpu_freq)/MII_CLOCK+1) & ~1,
-                      &lp->eth_regs->ethmcp);
-       
-       /* don't transmit until fifo contains 48b */
-       __raw_writel(48, &lp->eth_regs->ethfifott);
-       
-       __raw_writel(ETHMAC1_re_m, &lp->eth_regs->ethmac1);
-       
-#ifndef CONFIG_IDT_USE_NAPI
-       tasklet_enable(lp->rx_tasklet);
-#endif
-       tasklet_enable(lp->tx_tasklet);
-       
-       netif_start_queue(dev);
-       
-       return 0; 
-}
-
-static struct platform_driver korina_driver = {
-       .driver.name = "korina",
-       .probe = rc32434_probe,
-       .remove = rc32434_remove,
-};
-
-static int __init rc32434_init_module(void)
-{
-       return platform_driver_register(&korina_driver);
-}
-
-static void rc32434_cleanup_module(void)
-{
-       return platform_driver_unregister(&korina_driver);
-}
-
-module_init(rc32434_init_module);
-module_exit(rc32434_cleanup_module);
diff --git a/target/linux/rb532/files-2.6.23/drivers/net/rc32434_eth.h b/target/linux/rb532/files-2.6.23/drivers/net/rc32434_eth.h
deleted file mode 100644 (file)
index eaa0bfe..0000000
+++ /dev/null
@@ -1,178 +0,0 @@
-/**************************************************************************
- *
- *  BRIEF MODULE DESCRIPTION
- *     Definitions for IDT RC32434 on-chip ethernet controller.
- *
- *  Copyright 2004 IDT Inc. (rischelp@idt.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.
- *
- *
- **************************************************************************
- * May 2004 rkt, neb
- *
- * Initial Release
- *
- * Aug 2004
- *
- * Added NAPI
- *
- **************************************************************************
- */
-
-
-#include  <asm/rc32434/rc32434.h>
-#include  <asm/rc32434/dma_v.h>
-#include  <asm/rc32434/eth_v.h>
-
-#define CONFIG_IDT_USE_NAPI 1
-#define RC32434_DEBUG  2
-//#define RC32434_PROC_DEBUG
-#undef RC32434_DEBUG
-
-#ifdef RC32434_DEBUG
-
-/* use 0 for production, 1 for verification, >2 for debug */
-static int rc32434_debug = RC32434_DEBUG;
-#define ASSERT(expr) \
-       if(!(expr)) {   \
-               printk( "Assertion failed! %s,%s,%s,line=%d\n", \
-               #expr,__FILE__,__FUNCTION__,__LINE__);          }
-#define DBG(lvl, format, arg...) if (rc32434_debug > lvl) printk(KERN_INFO "%s: " format, dev->name , ## arg)
-#else
-#define ASSERT(expr) do {} while (0)
-#define DBG(lvl, format, arg...) do {} while (0)
-#endif
-
-#define INFO(format, arg...) printk(KERN_INFO "%s: " format, dev->name , ## arg)
-#define ERR(format, arg...) printk(KERN_ERR "%s: " format, dev->name , ## arg)
-#define WARN(format, arg...) printk(KERN_WARNING "%s: " format, dev->name , ## arg)            
-
-/* the following must be powers of two */
-#ifdef CONFIG_IDT_USE_NAPI
-#define RC32434_NUM_RDS    64                  /* number of receive descriptors */
-#define RC32434_NUM_TDS    64                  /* number of transmit descriptors */
-#else
-#define RC32434_NUM_RDS    128                 /* number of receive descriptors */
-#define RC32434_NUM_TDS    128                 /* number of transmit descriptors */
-#endif
-
-#define RC32434_RBSIZE     1536                /* size of one resource buffer = Ether MTU */
-#define RC32434_RDS_MASK   (RC32434_NUM_RDS-1)
-#define RC32434_TDS_MASK   (RC32434_NUM_TDS-1)
-#define RD_RING_SIZE (RC32434_NUM_RDS * sizeof(struct DMAD_s))
-#define TD_RING_SIZE (RC32434_NUM_TDS * sizeof(struct DMAD_s))
-
-#define RC32434_TX_TIMEOUT HZ * 100
-
-#define rc32434_eth0_regs ((ETH_t)(ETH0_VirtualAddress))
-#define rc32434_eth1_regs ((ETH_t)(ETH1_VirtualAddress))
-
-enum status    { filled,       empty};
-#define IS_DMA_FINISHED(X)   (((X) & (DMAD_f_m)) != 0)
-#define IS_DMA_DONE(X)   (((X) & (DMAD_d_m)) != 0)
-
-
-/* Information that need to be kept for each board. */
-struct rc32434_local {
-       ETH_t  eth_regs;
-       DMA_Chan_t  rx_dma_regs;
-       DMA_Chan_t  tx_dma_regs;
-       volatile DMAD_t   td_ring;                      /* transmit descriptor ring */ 
-       volatile DMAD_t   rd_ring;                      /* receive descriptor ring  */
-       
-       struct sk_buff* tx_skb[RC32434_NUM_TDS];        /* skbuffs for pkt to trans */
-       struct sk_buff* rx_skb[RC32434_NUM_RDS];        /* skbuffs for pkt to trans */
-       
-#ifndef CONFIG_IDT_USE_NAPI
-       struct tasklet_struct * rx_tasklet;
-#endif
-       struct tasklet_struct * tx_tasklet;
-       
-       int     rx_next_done;
-       int     rx_chain_head;
-       int     rx_chain_tail;
-       enum status     rx_chain_status;
-       
-       int     tx_next_done;
-       int     tx_chain_head;
-       int     tx_chain_tail;
-       enum status     tx_chain_status;
-       int tx_count;                   
-       int     tx_full;
-       
-       struct timer_list    mii_phy_timer;
-       unsigned long duplex_mode;
-       
-       int     rx_irq;
-       int    tx_irq;
-       int    ovr_irq;
-       int    und_irq;
-       
-       struct net_device_stats stats;
-       spinlock_t lock; 
-       
-       /* debug /proc entry */
-       struct proc_dir_entry *ps;
-       int dma_halt_cnt;  int dma_run_cnt;
-};
-
-extern unsigned int idt_cpu_freq;
-
-/* Index to functions, as function prototypes. */
-static int rc32434_open(struct net_device *dev);
-static int rc32434_send_packet(struct sk_buff *skb, struct net_device *dev);
-static void rc32434_mii_handler(unsigned long data);
-static irqreturn_t  rc32434_und_interrupt(int irq, void *dev_id);
-static irqreturn_t rc32434_rx_dma_interrupt(int irq, void *dev_id);
-static irqreturn_t rc32434_tx_dma_interrupt(int irq, void *dev_id);
-#ifdef RC32434_REVISION        
-static irqreturn_t rc32434_ovr_interrupt(int irq, void *dev_id);
-#endif
-static int  rc32434_close(struct net_device *dev);
-static struct net_device_stats *rc32434_get_stats(struct net_device *dev);
-static void rc32434_multicast_list(struct net_device *dev);
-static int  rc32434_init(struct net_device *dev);
-static void rc32434_tx_timeout(struct net_device *dev);
-
-static void rc32434_tx_tasklet(unsigned long tx_data_dev);
-#ifdef CONFIG_IDT_USE_NAPI
-static int rc32434_poll(struct net_device *rx_data_dev, int *budget);
-#else
-static void rc32434_rx_tasklet(unsigned long rx_data_dev);
-#endif
-static void rc32434_cleanup_module(void);
-
-
-static inline void rc32434_abort_dma(struct net_device *dev, DMA_Chan_t ch)
-{
-       if (__raw_readl(&ch->dmac) & DMAC_run_m) {
-               __raw_writel(0x10, &ch->dmac); 
-               
-               while (!(__raw_readl(&ch->dmas) & DMAS_h_m))
-                       dev->trans_start = jiffies;             
-               
-               __raw_writel(0, &ch->dmas);  
-       }
-       
-       __raw_writel(0, &ch->dmadptr); 
-       __raw_writel(0, &ch->dmandptr); 
-}
diff --git a/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/ddr.h b/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/ddr.h
deleted file mode 100644 (file)
index 03923a6..0000000
+++ /dev/null
@@ -1,173 +0,0 @@
-#ifndef __IDT_DDR_H__
-#define __IDT_DDR_H__
-
-/*******************************************************************************
- *
- * Copyright 2002 Integrated Device Technology, Inc.
- *             All rights reserved.
- *
- * DDR register definition.
- *
- * File   : $Id: ddr.h,v 1.2 2002/06/06 18:34:03 astichte Exp $
- *
- * Author : ryan.holmQVist@idt.com
- * Date   : 20011005
- * Update :
- *          $Log: ddr.h,v $
- *          Revision 1.2  2002/06/06 18:34:03  astichte
- *          Added XXX_PhysicalAddress and XXX_VirtualAddress
- *
- *          Revision 1.1  2002/05/29 17:33:21  sysarch
- *          jba File moved from vcode/include/idt/acacia
- *
- *
- ******************************************************************************/
-
-enum
-{
-       DDR0_PhysicalAddress    = 0x18018000,
-       DDR_PhysicalAddress     = DDR0_PhysicalAddress,         // Default
-
-       DDR0_VirtualAddress     = 0xb8018000,
-       DDR_VirtualAddress      = DDR0_VirtualAddress,          // Default
-} ;
-
-typedef struct DDR_s
-{
-       u32     ddrbase ;
-       u32     ddrmask ;
-       u32     res1;
-       u32     res2;
-       u32     ddrc ;
-       u32     ddrabase ;
-       u32     ddramask ;
-       u32     ddramap ;
-       u32     ddrcust;
-       u32     ddrrdc;
-       u32     ddrspare;
-} volatile *DDR_t ;
-
-enum
-{
-       DDR0BASE_baseaddr_b     = 16,
-       DDR0BASE_baseaddr_m     = 0xffff0000,
-
-       DDR0MASK_mask_b         = 16,
-       DDR0MASK_mask_m         = 0xffff0000,
-
-       DDR1BASE_baseaddr_b     = 16,
-       DDR1BASE_baseaddr_m     = 0xffff0000,
-
-       DDR1MASK_mask_b         = 16,
-       DDR1MASK_mask_m         = 0xffff0000,
-
-       DDRC_ata_b              = 5,
-       DDRC_ata_m              = 0x000000E0,
-       DDRC_dbw_b              = 8,
-       DDRC_dbw_m              = 0x00000100,
-       DDRC_wr_b               = 9,
-       DDRC_wr_m               = 0x00000600,
-       DDRC_ps_b               = 11,
-       DDRC_ps_m               = 0x00001800,
-       DDRC_dtype_b            = 13,
-       DDRC_dtype_m            = 0x0000e000,
-       DDRC_rfc_b              = 16,
-       DDRC_rfc_m              = 0x000f0000,
-       DDRC_rp_b               = 20,
-       DDRC_rp_m               = 0x00300000,
-       DDRC_ap_b               = 22,
-       DDRC_ap_m               = 0x00400000,
-       DDRC_rcd_b              = 23,
-       DDRC_rcd_m              = 0x01800000,
-       DDRC_cl_b               = 25,
-       DDRC_cl_m               = 0x06000000,
-       DDRC_dbm_b              = 27,
-       DDRC_dbm_m              = 0x08000000,
-       DDRC_sds_b              = 28,
-       DDRC_sds_m              = 0x10000000,
-       DDRC_atp_b              = 29,
-       DDRC_atp_m              = 0x60000000,
-       DDRC_re_b               = 31,
-       DDRC_re_m               = 0x80000000,
-
-       DDRRDC_ces_b            = 0,
-       DDRRDC_ces_m            = 0x00000001,
-       DDRRDC_ace_b            = 1,
-       DDRRDC_ace_m            = 0x00000002,
-
-       DDRABASE_baseaddr_b     = 16,
-       DDRABASE_baseaddr_m     = 0xffff0000,
-
-       DDRAMASK_mask_b         = 16,
-       DDRAMASK_mask_m         = 0xffff0000,
-
-       DDRAMAP_map_b           = 16,
-       DDRAMAP_map_m           = 0xffff0000,
-
-       DDRCUST_cs_b            = 0,
-       DDRCUST_cs_m            = 0x00000003,
-       DDRCUST_we_b            = 2,
-       DDRCUST_we_m            = 0x00000004,
-       DDRCUST_ras_b           = 3,
-       DDRCUST_ras_m           = 0x00000008,
-       DDRCUST_cas_b           = 4,
-       DDRCUST_cas_m           = 0x00000010,
-       DDRCUST_cke_b           = 5,
-       DDRCUST_cke_m           = 0x00000020,
-       DDRCUST_ba_b            = 6,
-       DDRCUST_ba_m            = 0x000000c0,
-
-       RCOUNT_rcount_b         = 0,
-       RCOUNT_rcount_m         = 0x0000ffff,
-
-       RCOMPARE_rcompare_b     = 0,
-       RCOMPARE_rcompare_m     = 0x0000ffff,
-
-       RTC_ce_b                = 0,
-       RTC_ce_m                = 0x00000001,
-       RTC_to_b                = 1,
-       RTC_to_m                = 0x00000002,
-       RTC_rqe_b               = 2,
-       RTC_rqe_m               = 0x00000004,
-
-       DDRDQSC_dm_b            = 0,
-       DDRDQSC_dm_m            = 0x00000003,
-       DDRDQSC_dqsbs_b         = 2,
-       DDRDQSC_dqsbs_m         = 0x000000fc,
-       DDRDQSC_db_b            = 8,
-       DDRDQSC_db_m            = 0x00000100,
-       DDRDQSC_dbsp_b          = 9,
-       DDRDQSC_dbsp_m          = 0x01fffe00,
-       DDRDQSC_bdp_b           = 25,
-       DDRDQSC_bdp_m           = 0x7e000000,
-
-       DDRDLLC_eao_b           = 0,
-       DDRDLLC_eao_m           = 0x00000001,
-       DDRDLLC_eo_b            = 1,
-       DDRDLLC_eo_m            = 0x0000003e,
-       DDRDLLC_fs_b            = 6,
-       DDRDLLC_fs_m            = 0x000000c0,
-       DDRDLLC_as_b            = 8,
-       DDRDLLC_as_m            = 0x00000700,
-       DDRDLLC_sp_b            = 11,
-       DDRDLLC_sp_m            = 0x001ff800,
-
-       DDRDLLFC_men_b          = 0,
-       DDRDLLFC_men_m          = 0x00000001,
-       DDRDLLFC_aen_b          = 1,
-       DDRDLLFC_aen_m          = 0x00000002,
-       DDRDLLFC_ff_b           = 2,
-       DDRDLLFC_ff_m           = 0x00000004,
-
-       DDRDLLTA_addr_b         = 2,
-       DDRDLLTA_addr_m         = 0xfffffffc,
-
-       DDRDLLED_dbe_b          = 0,
-       DDRDLLED_dbe_m          = 0x00000001,
-       DDRDLLED_dte_b          = 1,
-       DDRDLLED_dte_m          = 0x00000002,
-       
-               
-} ;
-
-#endif // __IDT_DDR_H__
diff --git a/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/dma.h b/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/dma.h
deleted file mode 100644 (file)
index 2124f7e..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-#ifndef __IDT_DMA_H__
-#define __IDT_DMA_H__
-
-/*******************************************************************************
- *
- * Copyright 2002 Integrated Device Technology, Inc.
- *             All rights reserved.
- *
- * DMA register definition.
- *
- * File   : $Id: dma.h,v 1.3 2002/06/06 18:34:03 astichte Exp $
- *
- * Author : ryan.holmQVist@idt.com
- * Date   : 20011005
- * Update :
- *         $Log: dma.h,v $
- *         Revision 1.3  2002/06/06 18:34:03  astichte
- *         Added XXX_PhysicalAddress and XXX_VirtualAddress
- *     
- *         Revision 1.2  2002/06/05 18:30:46  astichte
- *         Removed IDTField
- *     
- *         Revision 1.1  2002/05/29 17:33:21  sysarch
- *         jba File moved from vcode/include/idt/acacia
- *     
- *
- ******************************************************************************/
-
-enum
-{
-       DMA0_PhysicalAddress    = 0x18040000,
-       DMA_PhysicalAddress     = DMA0_PhysicalAddress,         // Default
-
-       DMA0_VirtualAddress     = 0xb8040000,
-       DMA_VirtualAddress      = DMA0_VirtualAddress,          // Default
-} ;
-
-/*
- * DMA descriptor (in physical memory).
- */
-
-typedef struct DMAD_s
-{
-       u32                     control ;       // Control. use DMAD_*
-       u32                     ca ;            // Current Address.
-       u32                     devcs ;         // Device control and status.
-       u32                     link ;          // Next descriptor in chain.
-} volatile *DMAD_t ;
-
-enum
-{
-       DMAD_size               = sizeof (struct DMAD_s),
-       DMAD_count_b            = 0,            // in DMAD_t -> control
-       DMAD_count_m            = 0x0003ffff,   // in DMAD_t -> control
-       DMAD_ds_b               = 20,           // in DMAD_t -> control
-       DMAD_ds_m               = 0x00300000,   // in DMAD_t -> control
-               DMAD_ds_ethRcv_v        = 0,
-               DMAD_ds_ethXmt_v        = 0,
-               DMAD_ds_memToFifo_v     = 0,
-               DMAD_ds_fifoToMem_v     = 0,
-               DMAD_ds_pciToMem_v      = 0,
-               DMAD_ds_memToPci_v      = 0,
-       
-       DMAD_devcmd_b           = 22,           // in DMAD_t -> control
-       DMAD_devcmd_m           = 0x01c00000,   // in DMAD_t -> control
-               DMAD_devcmd_byte_v      = 0,    //memory-to-memory
-               DMAD_devcmd_halfword_v  = 1,    //memory-to-memory
-               DMAD_devcmd_word_v      = 2,    //memory-to-memory
-               DMAD_devcmd_2words_v    = 3,    //memory-to-memory
-               DMAD_devcmd_4words_v    = 4,    //memory-to-memory
-               DMAD_devcmd_6words_v    = 5,    //memory-to-memory
-               DMAD_devcmd_8words_v    = 6,    //memory-to-memory
-               DMAD_devcmd_16words_v   = 7,    //memory-to-memory
-       DMAD_cof_b              = 25,           // chain on finished
-       DMAD_cof_m              = 0x02000000,   // 
-       DMAD_cod_b              = 26,           // chain on done
-       DMAD_cod_m              = 0x04000000,   // 
-       DMAD_iof_b              = 27,           // interrupt on finished
-       DMAD_iof_m              = 0x08000000,   // 
-       DMAD_iod_b              = 28,           // interrupt on done
-       DMAD_iod_m              = 0x10000000,   // 
-       DMAD_t_b                = 29,           // terminated
-       DMAD_t_m                = 0x20000000,   // 
-       DMAD_d_b                = 30,           // done
-       DMAD_d_m                = 0x40000000,   // 
-       DMAD_f_b                = 31,           // finished
-       DMAD_f_m                = 0x80000000,   // 
-} ;
-
-/*
- * DMA register (within Internal Register Map).
- */
-
-struct DMA_Chan_s
-{
-       u32             dmac ;          // Control.
-       u32             dmas ;          // Status.      
-       u32             dmasm ;         // Mask.
-       u32             dmadptr ;       // Descriptor pointer.
-       u32             dmandptr ;      // Next descriptor pointer.
-};
-
-typedef struct DMA_Chan_s volatile *DMA_Chan_t ;
-
-//DMA_Channels   use DMACH_count instead
-
-enum
-{
-       DMAC_run_b      = 0,            // 
-       DMAC_run_m      = 0x00000001,   // 
-       DMAC_dm_b       = 1,            // done mask
-       DMAC_dm_m       = 0x00000002,   // 
-       DMAC_mode_b     = 2,            // 
-       DMAC_mode_m     = 0x0000000c,   // 
-               DMAC_mode_auto_v        = 0,
-               DMAC_mode_burst_v       = 1,
-               DMAC_mode_transfer_v    = 2, //usually used
-               DMAC_mode_reserved_v    = 3,
-       DMAC_a_b        = 4,            // 
-       DMAC_a_m        = 0x00000010,   // 
-
-       DMAS_f_b        = 0,            // finished (sticky) 
-       DMAS_f_m        = 0x00000001,   //                   
-       DMAS_d_b        = 1,            // done (sticky)     
-       DMAS_d_m        = 0x00000002,   //                   
-       DMAS_c_b        = 2,            // chain (sticky)    
-       DMAS_c_m        = 0x00000004,   //                   
-       DMAS_e_b        = 3,            // error (sticky)    
-       DMAS_e_m        = 0x00000008,   //                   
-       DMAS_h_b        = 4,            // halt (sticky)     
-       DMAS_h_m        = 0x00000010,   //                   
-
-       DMASM_f_b       = 0,            // finished (1=mask)
-       DMASM_f_m       = 0x00000001,   // 
-       DMASM_d_b       = 1,            // done (1=mask)
-       DMASM_d_m       = 0x00000002,   // 
-       DMASM_c_b       = 2,            // chain (1=mask)
-       DMASM_c_m       = 0x00000004,   // 
-       DMASM_e_b       = 3,            // error (1=mask)
-       DMASM_e_m       = 0x00000008,   // 
-       DMASM_h_b       = 4,            // halt (1=mask)
-       DMASM_h_m       = 0x00000010,   // 
-} ;
-
-/*
- * DMA channel definitions
- */
-
-enum
-{
-       DMACH_ethRcv = 0,
-       DMACH_ethXmt = 1,
-       DMACH_memToFifo = 2,
-       DMACH_fifoToMem = 3,
-       DMACH_pciToMem = 4,
-       DMACH_memToPci = 5,
-       
-       DMACH_count //must be last
-};
-
-
-typedef struct DMAC_s
-{
-       struct DMA_Chan_s ch [DMACH_count] ; //use ch[DMACH_]
-} volatile *DMA_t ;
-
-#endif // __IDT_DMA_H__
-
diff --git a/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/dma_v.h b/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/dma_v.h
deleted file mode 100644 (file)
index 81cb405..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef __IDT_DMA_V_H__
-#define __IDT_DMA_V_H__
-
-/*******************************************************************************
- *
- * Copyright 2002 Integrated Device Technology, Inc.
- *             All rights reserved.
- *
- * DMA register definition.
- *
- * File   : $Id: dma.h,v 1.3 2002/06/06 18:34:03 astichte Exp $
- *
- * Author : ryan.holmQVist@idt.com
- * Date   : 20011005
- * Update :
- *         $Log: dma.h,v $
- *         Revision 1.3  2002/06/06 18:34:03  astichte
- *         Added XXX_PhysicalAddress and XXX_VirtualAddress
- *     
- *         Revision 1.2  2002/06/05 18:30:46  astichte
- *         Removed IDTField
- *     
- *         Revision 1.1  2002/05/29 17:33:21  sysarch
- *         jba File moved from vcode/include/idt/acacia
- *     
- *
- ******************************************************************************/
-#include  <asm/rc32434/dma.h> 
-#include  <asm/rc32434/rc32434.h>
-#define DMA_CHAN_OFFSET  0x14
-#define IS_DMA_USED(X) (((X) & (DMAD_f_m | DMAD_d_m | DMAD_t_m)) != 0)
-#define DMA_COUNT(count)   \
-  ((count) & DMAD_count_m)
-
-#define DMA_HALT_TIMEOUT 500
-
-
-static inline int rc32434_halt_dma(DMA_Chan_t ch)
-{
-       int timeout=1;
-       if (local_readl(&ch->dmac) & DMAC_run_m) {
-               local_writel(0, &ch->dmac); 
-               for (timeout = DMA_HALT_TIMEOUT; timeout > 0; timeout--) {
-                       if (local_readl(&ch->dmas) & DMAS_h_m) {
-                               local_writel(0, &ch->dmas);  
-                               break;
-                       }
-               }
-       }
-
-       return timeout ? 0 : 1;
-}
-
-static inline void rc32434_start_dma(DMA_Chan_t ch, u32 dma_addr)
-{
-       local_writel(0, &ch->dmandptr); 
-       local_writel(dma_addr, &ch->dmadptr);
-}
-
-static inline void rc32434_chain_dma(DMA_Chan_t ch, u32 dma_addr)
-{
-       local_writel(dma_addr, &ch->dmandptr);
-}
-
-#endif // __IDT_DMA_V_H__
-
-
-
-
-
-
-
diff --git a/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/eth.h b/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/eth.h
deleted file mode 100644 (file)
index 2f42976..0000000
+++ /dev/null
@@ -1,320 +0,0 @@
-#ifndef        __IDT_ETH_H__
-#define        __IDT_ETH_H__
-
-/*******************************************************************************
- *
- * Copyright 2002 Integrated Device Technology, Inc.
- *             All rights reserved.
- *
- * Ethernet register definition.
- *
- * File   : $Id: eth.h,v 1.3 2002/06/06 18:34:04 astichte Exp $
- *
- * Author : Allen.Stichter@idt.com
- * Date   : 20020605
- * Update :
- *         $Log: eth.h,v $
- *         Revision 1.3  2002/06/06 18:34:04  astichte
- *         Added XXX_PhysicalAddress and XXX_VirtualAddress
- *     
- *         Revision 1.2  2002/06/05 18:19:46  astichte
- *         Added
- *     
- *         Revision 1.1  2002/05/29 17:33:22  sysarch
- *         jba File moved from vcode/include/idt/acacia
- *
- ******************************************************************************/
-
-enum
-{
-       ETH0_PhysicalAddress    = 0x18060000,
-       ETH_PhysicalAddress     = ETH0_PhysicalAddress,         // Default
-
-       ETH0_VirtualAddress     = 0xb8060000,
-       ETH_VirtualAddress      = ETH0_VirtualAddress,          // Default
-} ;
-
-typedef struct
-{
-       u32 ethintfc            ;
-       u32 ethfifott           ;
-       u32 etharc              ;
-       u32 ethhash0            ;
-       u32 ethhash1            ;
-       u32 ethu0 [4]           ;       // Reserved.    
-       u32 ethpfs              ;
-       u32 ethmcp              ;
-       u32 eth_u1 [10]         ;       // Reserved.
-       u32 ethspare            ;
-       u32 eth_u2 [42]         ;       // Reserved. 
-       u32 ethsal0             ;
-       u32 ethsah0             ;
-       u32 ethsal1             ;
-       u32 ethsah1             ;
-       u32 ethsal2             ;
-       u32 ethsah2             ;
-       u32 ethsal3             ;
-       u32 ethsah3             ;
-       u32 ethrbc              ;
-       u32 ethrpc              ;
-       u32 ethrupc             ;
-       u32 ethrfc              ;
-       u32 ethtbc              ;
-       u32 ethgpf              ;
-       u32 eth_u9 [50]         ;       // Reserved.    
-       u32 ethmac1             ;
-       u32 ethmac2             ;
-       u32 ethipgt             ;
-       u32 ethipgr             ;
-       u32 ethclrt             ;
-       u32 ethmaxf             ;
-       u32 eth_u10             ;       // Reserved.    
-       u32 ethmtest            ;
-       u32 miimcfg             ;
-       u32 miimcmd             ;
-       u32 miimaddr            ;
-       u32 miimwtd             ;
-       u32 miimrdd             ;
-       u32 miimind             ;
-       u32 eth_u11             ;       // Reserved.
-       u32 eth_u12             ;       // Reserved.
-       u32 ethcfsa0            ;
-       u32 ethcfsa1            ;
-       u32 ethcfsa2            ;
-} volatile *ETH_t;
-
-enum
-{
-       ETHINTFC_en_b           = 0,
-       ETHINTFC_en_m           = 0x00000001,
-       ETHINTFC_its_b          = 1,
-       ETHINTFC_its_m          = 0x00000002,
-       ETHINTFC_rip_b          = 2,
-       ETHINTFC_rip_m          = 0x00000004,
-       ETHINTFC_jam_b          = 3,
-       ETHINTFC_jam_m          = 0x00000008,
-       ETHINTFC_ovr_b          = 4,
-       ETHINTFC_ovr_m          = 0x00000010,
-       ETHINTFC_und_b          = 5,
-       ETHINTFC_und_m          = 0x00000020,
-       ETHINTFC_iom_b          = 6,
-       ETHINTFC_iom_m          = 0x000000c0,
-
-       ETHFIFOTT_tth_b         = 0,
-       ETHFIFOTT_tth_m         = 0x0000007f,
-
-       ETHARC_pro_b            = 0,
-       ETHARC_pro_m            = 0x00000001,
-       ETHARC_am_b             = 1,
-       ETHARC_am_m             = 0x00000002,
-       ETHARC_afm_b            = 2,
-       ETHARC_afm_m            = 0x00000004,
-       ETHARC_ab_b             = 3,
-       ETHARC_ab_m             = 0x00000008,
-
-       ETHSAL_byte5_b          = 0,
-       ETHSAL_byte5_m          = 0x000000ff,
-       ETHSAL_byte4_b          = 8,
-       ETHSAL_byte4_m          = 0x0000ff00,
-       ETHSAL_byte3_b          = 16,
-       ETHSAL_byte3_m          = 0x00ff0000,
-       ETHSAL_byte2_b          = 24,
-       ETHSAL_byte2_m          = 0xff000000,
-
-       ETHSAH_byte1_b          = 0,
-       ETHSAH_byte1_m          = 0x000000ff,
-       ETHSAH_byte0_b          = 8,
-       ETHSAH_byte0_m          = 0x0000ff00,
-       
-       ETHGPF_ptv_b            = 0,
-       ETHGPF_ptv_m            = 0x0000ffff,
-
-       ETHPFS_pfd_b            = 0,
-       ETHPFS_pfd_m            = 0x00000001,
-
-       ETHCFSA0_cfsa4_b        = 0,
-       ETHCFSA0_cfsa4_m        = 0x000000ff,
-       ETHCFSA0_cfsa5_b        = 8,
-       ETHCFSA0_cfsa5_m        = 0x0000ff00,
-
-       ETHCFSA1_cfsa2_b        = 0,
-       ETHCFSA1_cfsa2_m        = 0x000000ff,
-       ETHCFSA1_cfsa3_b        = 8,
-       ETHCFSA1_cfsa3_m        = 0x0000ff00,
-
-       ETHCFSA2_cfsa0_b        = 0,
-       ETHCFSA2_cfsa0_m        = 0x000000ff,
-       ETHCFSA2_cfsa1_b        = 8,
-       ETHCFSA2_cfsa1_m        = 0x0000ff00,
-
-       ETHMAC1_re_b            = 0,
-       ETHMAC1_re_m            = 0x00000001,
-       ETHMAC1_paf_b           = 1,
-       ETHMAC1_paf_m           = 0x00000002,
-       ETHMAC1_rfc_b           = 2,
-       ETHMAC1_rfc_m           = 0x00000004,
-       ETHMAC1_tfc_b           = 3,
-       ETHMAC1_tfc_m           = 0x00000008,
-       ETHMAC1_lb_b            = 4,
-       ETHMAC1_lb_m            = 0x00000010,
-       ETHMAC1_mr_b            = 31,
-       ETHMAC1_mr_m            = 0x80000000,
-
-       ETHMAC2_fd_b            = 0,
-       ETHMAC2_fd_m            = 0x00000001,
-       ETHMAC2_flc_b           = 1,
-       ETHMAC2_flc_m           = 0x00000002,
-       ETHMAC2_hfe_b           = 2,
-       ETHMAC2_hfe_m           = 0x00000004,
-       ETHMAC2_dc_b            = 3,
-       ETHMAC2_dc_m            = 0x00000008,
-       ETHMAC2_cen_b           = 4,
-       ETHMAC2_cen_m           = 0x00000010,
-       ETHMAC2_pe_b            = 5,
-       ETHMAC2_pe_m            = 0x00000020,
-       ETHMAC2_vpe_b           = 6,
-       ETHMAC2_vpe_m           = 0x00000040,
-       ETHMAC2_ape_b           = 7,
-       ETHMAC2_ape_m           = 0x00000080,
-       ETHMAC2_ppe_b           = 8,
-       ETHMAC2_ppe_m           = 0x00000100,
-       ETHMAC2_lpe_b           = 9,
-       ETHMAC2_lpe_m           = 0x00000200,
-       ETHMAC2_nb_b            = 12,
-       ETHMAC2_nb_m            = 0x00001000,
-       ETHMAC2_bp_b            = 13,
-       ETHMAC2_bp_m            = 0x00002000,
-       ETHMAC2_ed_b            = 14,
-       ETHMAC2_ed_m            = 0x00004000,
-
-       ETHIPGT_ipgt_b          = 0,
-       ETHIPGT_ipgt_m          = 0x0000007f,
-
-       ETHIPGR_ipgr2_b         = 0,
-       ETHIPGR_ipgr2_m         = 0x0000007f,
-       ETHIPGR_ipgr1_b         = 8,
-       ETHIPGR_ipgr1_m         = 0x00007f00,
-
-       ETHCLRT_maxret_b        = 0,
-       ETHCLRT_maxret_m        = 0x0000000f,
-       ETHCLRT_colwin_b        = 8,
-       ETHCLRT_colwin_m        = 0x00003f00,
-
-       ETHMAXF_maxf_b          = 0,
-       ETHMAXF_maxf_m          = 0x0000ffff,
-
-       ETHMTEST_tb_b           = 2,
-       ETHMTEST_tb_m           = 0x00000004,
-
-       ETHMCP_div_b            = 0,
-       ETHMCP_div_m            = 0x000000ff,
-       
-       MIIMCFG_rsv_b           = 0,
-       MIIMCFG_rsv_m           = 0x0000000c,
-
-       MIIMCMD_rd_b            = 0,
-       MIIMCMD_rd_m            = 0x00000001,
-       MIIMCMD_scn_b           = 1,
-       MIIMCMD_scn_m           = 0x00000002,
-
-       MIIMADDR_regaddr_b      = 0,
-       MIIMADDR_regaddr_m      = 0x0000001f,
-       MIIMADDR_phyaddr_b      = 8,
-       MIIMADDR_phyaddr_m      = 0x00001f00,
-
-       MIIMWTD_wdata_b         = 0,
-       MIIMWTD_wdata_m         = 0x0000ffff,
-
-       MIIMRDD_rdata_b         = 0,
-       MIIMRDD_rdata_m         = 0x0000ffff,
-
-       MIIMIND_bsy_b           = 0,
-       MIIMIND_bsy_m           = 0x00000001,
-       MIIMIND_scn_b           = 1,
-       MIIMIND_scn_m           = 0x00000002,
-       MIIMIND_nv_b            = 2,
-       MIIMIND_nv_m            = 0x00000004,
-
-} ;
-
-/*
- * Values for the DEVCS field of the Ethernet DMA Rx and Tx descriptors.
- */
-enum
-{
-       ETHRX_fd_b              = 0,
-       ETHRX_fd_m              = 0x00000001,
-       ETHRX_ld_b              = 1,
-       ETHRX_ld_m              = 0x00000002,
-       ETHRX_rok_b             = 2,
-       ETHRX_rok_m             = 0x00000004,
-       ETHRX_fm_b              = 3,
-       ETHRX_fm_m              = 0x00000008,
-       ETHRX_mp_b              = 4,
-       ETHRX_mp_m              = 0x00000010,
-       ETHRX_bp_b              = 5,
-       ETHRX_bp_m              = 0x00000020,
-       ETHRX_vlt_b             = 6,
-       ETHRX_vlt_m             = 0x00000040,
-       ETHRX_cf_b              = 7,
-       ETHRX_cf_m              = 0x00000080,
-       ETHRX_ovr_b             = 8,
-       ETHRX_ovr_m             = 0x00000100,
-       ETHRX_crc_b             = 9,
-       ETHRX_crc_m             = 0x00000200,
-       ETHRX_cv_b              = 10,
-       ETHRX_cv_m              = 0x00000400,
-       ETHRX_db_b              = 11,
-       ETHRX_db_m              = 0x00000800,
-       ETHRX_le_b              = 12,
-       ETHRX_le_m              = 0x00001000,
-       ETHRX_lor_b             = 13,
-       ETHRX_lor_m             = 0x00002000,
-       ETHRX_ces_b             = 14,
-       ETHRX_ces_m             = 0x00004000,
-       ETHRX_length_b          = 16,
-       ETHRX_length_m          = 0xffff0000,
-
-       ETHTX_fd_b              = 0,
-       ETHTX_fd_m              = 0x00000001,
-       ETHTX_ld_b              = 1,
-       ETHTX_ld_m              = 0x00000002,
-       ETHTX_oen_b             = 2,
-       ETHTX_oen_m             = 0x00000004,
-       ETHTX_pen_b             = 3,
-       ETHTX_pen_m             = 0x00000008,
-       ETHTX_cen_b             = 4,
-       ETHTX_cen_m             = 0x00000010,
-       ETHTX_hen_b             = 5,
-       ETHTX_hen_m             = 0x00000020,
-       ETHTX_tok_b             = 6,
-       ETHTX_tok_m             = 0x00000040,
-       ETHTX_mp_b              = 7,
-       ETHTX_mp_m              = 0x00000080,
-       ETHTX_bp_b              = 8,
-       ETHTX_bp_m              = 0x00000100,
-       ETHTX_und_b             = 9,
-       ETHTX_und_m             = 0x00000200,
-       ETHTX_of_b              = 10,
-       ETHTX_of_m              = 0x00000400,
-       ETHTX_ed_b              = 11,
-       ETHTX_ed_m              = 0x00000800,
-       ETHTX_ec_b              = 12,
-       ETHTX_ec_m              = 0x00001000,
-       ETHTX_lc_b              = 13,
-       ETHTX_lc_m              = 0x00002000,
-       ETHTX_td_b              = 14,
-       ETHTX_td_m              = 0x00004000,
-       ETHTX_crc_b             = 15,
-       ETHTX_crc_m             = 0x00008000,
-       ETHTX_le_b              = 16,
-       ETHTX_le_m              = 0x00010000,
-       ETHTX_cc_b              = 17,
-       ETHTX_cc_m              = 0x001E0000,
-} ;
-
-#endif // __IDT_ETH_H__
-
-
-
-
diff --git a/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/eth_v.h b/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/eth_v.h
deleted file mode 100644 (file)
index 3ea03c6..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef        __IDT_ETH_V_H__
-#define        __IDT_ETH_V_H__
-
-/*******************************************************************************
- *
- * Copyright 2002 Integrated Device Technology, Inc.
- *             All rights reserved.
- *
- * Ethernet register definition.
- *
- * File   : $Id: eth.h,v 1.3 2002/06/06 18:34:04 astichte Exp $
- *
- * Author : Allen.Stichter@idt.com
- * Date   : 20020605
- * Update :
- *         $Log: eth.h,v $
- *         Revision 1.3  2002/06/06 18:34:04  astichte
- *         Added XXX_PhysicalAddress and XXX_VirtualAddress
- *     
- *         Revision 1.2  2002/06/05 18:19:46  astichte
- *         Added
- *     
- *         Revision 1.1  2002/05/29 17:33:22  sysarch
- *         jba File moved from vcode/include/idt/acacia
- *
- ******************************************************************************/
-
-#include  <asm/rc32434/eth.h> 
-
-#define IS_TX_TOK(X)         (((X) & (1<<ETHTX_tok_b)) >> ETHTX_tok_b )   /* Transmit Okay    */
-#define IS_TX_MP(X)          (((X) & (1<<ETHTX_mp_b))  >> ETHTX_mp_b )    /* Multicast        */
-#define IS_TX_BP(X)          (((X) & (1<<ETHTX_bp_b))  >> ETHTX_bp_b )    /* Broadcast        */
-#define IS_TX_UND_ERR(X)     (((X) & (1<<ETHTX_und_b)) >> ETHTX_und_b )   /* Transmit FIFO Underflow */
-#define IS_TX_OF_ERR(X)      (((X) & (1<<ETHTX_of_b))  >> ETHTX_of_b )    /* Oversized frame  */
-#define IS_TX_ED_ERR(X)      (((X) & (1<<ETHTX_ed_b))  >> ETHTX_ed_b )    /* Excessive deferral  */
-#define IS_TX_EC_ERR(X)      (((X) & (1<<ETHTX_ec_b))  >> ETHTX_ec_b)     /* Excessive collisions  */
-#define IS_TX_LC_ERR(X)      (((X) & (1<<ETHTX_lc_b))  >> ETHTX_lc_b )    /* Late Collision   */
-#define IS_TX_TD_ERR(X)      (((X) & (1<<ETHTX_td_b))  >> ETHTX_td_b )    /* Transmit deferred*/
-#define IS_TX_CRC_ERR(X)     (((X) & (1<<ETHTX_crc_b)) >> ETHTX_crc_b )   /* CRC Error        */
-#define IS_TX_LE_ERR(X)      (((X) & (1<<ETHTX_le_b))  >>  ETHTX_le_b )    /* Length Error     */
-
-#define TX_COLLISION_COUNT(X) (((X) & ETHTX_cc_m)>>ETHTX_cc_b)  /* Collision Count  */
-
-#define IS_RCV_ROK(X)        (((X) & (1<<ETHRX_rok_b)) >> ETHRX_rok_b)    /* Receive Okay     */
-#define IS_RCV_FM(X)         (((X) & (1<<ETHRX_fm_b))  >> ETHRX_fm_b)     /* Is Filter Match  */
-#define IS_RCV_MP(X)         (((X) & (1<<ETHRX_mp_b))  >> ETHRX_mp_b)     /* Is it MP         */
-#define IS_RCV_BP(X)         (((X) & (1<<ETHRX_bp_b))  >> ETHRX_bp_b)     /* Is it BP         */
-#define IS_RCV_VLT(X)        (((X) & (1<<ETHRX_vlt_b)) >> ETHRX_vlt_b)    /* VLAN Tag Detect  */
-#define IS_RCV_CF(X)         (((X) & (1<<ETHRX_cf_b))  >> ETHRX_cf_b)     /* Control Frame    */
-#define IS_RCV_OVR_ERR(X)    (((X) & (1<<ETHRX_ovr_b)) >> ETHRX_ovr_b)    /* Receive Overflow */
-#define IS_RCV_CRC_ERR(X)    (((X) & (1<<ETHRX_crc_b)) >> ETHRX_crc_b)    /* CRC Error        */
-#define IS_RCV_CV_ERR(X)     (((X) & (1<<ETHRX_cv_b))  >> ETHRX_cv_b)     /* Code Violation   */
-#define IS_RCV_DB_ERR(X)     (((X) & (1<<ETHRX_db_b))  >> ETHRX_db_b)     /* Dribble Bits     */
-#define IS_RCV_LE_ERR(X)     (((X) & (1<<ETHRX_le_b))  >> ETHRX_le_b)     /* Length error     */
-#define IS_RCV_LOR_ERR(X)    (((X) & (1<<ETHRX_lor_b)) >> ETHRX_lor_b)    /* Length Out of Range */
-#define IS_RCV_CES_ERR(X)    (((X) & (1<<ETHRX_ces_b)) >> ETHRX_ces_b)  /* Preamble error   */
-#define RCVPKT_LENGTH(X)     (((X) & ETHRX_length_m) >> ETHRX_length_b)   /* Length of the received packet */
-#endif // __IDT_ETH_V_H__
-
-
-
-
-
diff --git a/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/gpio.h b/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/gpio.h
deleted file mode 100644 (file)
index 859b9c9..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright 2002 Integrated Device Technology, Inc.
- *     All rights reserved.
- *
- * GPIO register definition.
- *
- * Author : ryan.holmQVist@idt.com
- * Date   : 20011005
- * Copyright (C) 2001, 2002 Ryan Holm <ryan.holmQVist@idt.com>
- * Copyright (C) 2008 Florian Fainelli <florian@openwrt.org>
- */
-
-#ifndef _RC32434_GPIO_H_
-#define _RC32434_GPIO_H_
-
-#include <linux/types.h>
-
-struct rb500_gpio_reg {
-       u32   gpiofunc;   /* GPIO Function Register
-                          * gpiofunc[x]==0 bit = gpio
-                          * func[x]==1  bit = altfunc
-                          */
-       u32   gpiocfg;    /* GPIO Configuration Register
-                          * gpiocfg[x]==0 bit = input
-                          * gpiocfg[x]==1 bit = output
-                          */
-       u32   gpiod;      /* GPIO Data Register
-                          * gpiod[x] read/write gpio pinX status
-                          */
-       u32   gpioilevel; /* GPIO Interrupt Status Register
-                          * interrupt level (see gpioistat)
-                          */
-       u32   gpioistat;  /* Gpio Interrupt Status Register
-                          * istat[x] = (gpiod[x] == level[x])
-                          * cleared in ISR (STICKY bits)
-                          */
-       u32   gpionmien;  /* GPIO Non-maskable Interrupt Enable Register */
-};
-
-/* UART GPIO signals */
-#define RC32434_UART0_SOUT     (1 << 0)
-#define RC32434_UART0_SIN      (1 << 1)
-#define RC32434_UART0_RTS      (1 << 2)
-#define RC32434_UART0_CTS      (1 << 3)
-
-/* M & P bus GPIO signals */
-#define RC32434_MP_BIT_22      (1 << 4)
-#define RC32434_MP_BIT_23      (1 << 5)
-#define RC32434_MP_BIT_24      (1 << 6)
-#define RC32434_MP_BIT_25      (1 << 7)
-
-/* CPU GPIO signals */
-#define RC32434_CPU_GPIO       (1 << 8)
-
-/* Reserved GPIO signals */
-#define RC32434_AF_SPARE_6     (1 << 9)
-#define RC32434_AF_SPARE_4     (1 << 10)
-#define RC32434_AF_SPARE_3     (1 << 11)
-#define RC32434_AF_SPARE_2     (1 << 12)
-
-/* PCI messaging unit */
-#define RC32434_PCI_MSU_GPIO   (1 << 13)
-
-extern int rb500_gpio_get_value(unsigned gpio);
-extern void rb500_gpio_set_value(unsigned gpio, int value);
-extern int rb500_gpio_direction_input(unsigned gpio);
-extern int rb500_gpio_direction_output(unsigned gpio, int value);
-extern void rb500_gpio_set_int_level(unsigned gpio, int value);
-extern int rb500_gpio_get_int_level(unsigned gpio);
-extern void rb500_gpio_set_int_status(unsigned gpio, int value);
-extern int rb500_gpio_get_int_status(unsigned gpio);
-extern void rb500_gpio_set_func(unsigned gpio, int value);
-extern int rb500_gpio_get_func(unsigned gpio);
-
-
-/* Wrappers for the arch-neutral GPIO API */
-
-static inline int gpio_request(unsigned gpio, const char *label)
-{
-       /* Not yet implemented */
-       return 0;
-}
-
-static inline void gpio_free(unsigned gpio)
-{
-       /* Not yet implemented */
-}
-
-static inline int gpio_direction_input(unsigned gpio)
-{
-       return rb500_gpio_direction_input(gpio);
-}
-
-static inline int gpio_direction_output(unsigned gpio, int value)
-{
-       return rb500_gpio_direction_output(gpio, value);
-}
-
-static inline int gpio_get_value(unsigned gpio)
-{
-       return rb500_gpio_get_value(gpio);
-}
-
-static inline void gpio_set_value(unsigned gpio, int value)
-{
-       rb500_gpio_set_value(gpio, value);
-}
-
-static inline int gpio_to_irq(unsigned gpio)
-{
-       return gpio;
-}
-
-static inline int irq_to_gpio(unsigned irq)
-{
-       return irq;
-}
-
-/* For cansleep */
-#include <asm-generic/gpio.h>
-
-#endif /* _RC32434_GPIO_H_ */
diff --git a/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/integ.h b/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/integ.h
deleted file mode 100644 (file)
index a9e99e4..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef __IDT_INTEG_H__
-#define __IDT_INTEG_H__
-
-/*******************************************************************************
- *
- * Copyright 2002 Integrated Device Technology, Inc.
- *             All rights reserved.
- *
- * System Integrity register definition.
- *
- * File   : $Id: integ.h,v 1.3 2002/06/06 18:34:04 astichte Exp $
- *
- * Author : ryan.holmQVist@idt.com
- * Date   : 20011005
- * Update :
- *         $Log: integ.h,v $
- *         Revision 1.3  2002/06/06 18:34:04  astichte
- *         Added XXX_PhysicalAddress and XXX_VirtualAddress
- *     
- *         Revision 1.2  2002/06/05 18:32:33  astichte
- *         Removed IDTField
- *     
- *         Revision 1.1  2002/05/29 17:33:22  sysarch
- *         jba File moved from vcode/include/idt/acacia
- *
- ******************************************************************************/
-
-enum
-{
-       INTEG0_PhysicalAddress  = 0x18030000,
-       INTEG_PhysicalAddress   = INTEG0_PhysicalAddress,       // Default
-
-       INTEG0_VirtualAddress   = 0xb8030000,
-       INTEG_VirtualAddress    = INTEG0_VirtualAddress,        // Default
-} ;
-
-// if you are looing for CEA, try rst.h
-typedef struct
-{
-       u32 filler [0xc] ;              // 0x30 bytes unused.
-       u32 errcs ;                     // sticky use ERRCS_
-       u32 wtcount ;                   // Watchdog timer count reg.
-       u32 wtcompare ;                 // Watchdog timer timeout value.
-       u32 wtc ;                       // Watchdog timer control. use WTC_
-} volatile *INTEG_t ;
-
-enum
-{
-       ERRCS_wto_b             = 0,            // In INTEG_t -> errcs
-       ERRCS_wto_m             = 0x00000001,
-       ERRCS_wne_b             = 1,            // In INTEG_t -> errcs
-       ERRCS_wne_m             = 0x00000002,
-       ERRCS_ucw_b             = 2,            // In INTEG_t -> errcs
-       ERRCS_ucw_m             = 0x00000004,
-       ERRCS_ucr_b             = 3,            // In INTEG_t -> errcs
-       ERRCS_ucr_m             = 0x00000008,
-       ERRCS_upw_b             = 4,            // In INTEG_t -> errcs
-       ERRCS_upw_m             = 0x00000010,
-       ERRCS_upr_b             = 5,            // In INTEG_t -> errcs
-       ERRCS_upr_m             = 0x00000020,
-       ERRCS_udw_b             = 6,            // In INTEG_t -> errcs
-       ERRCS_udw_m             = 0x00000040,
-       ERRCS_udr_b             = 7,            // In INTEG_t -> errcs
-       ERRCS_udr_m             = 0x00000080,
-       ERRCS_sae_b             = 8,            // In INTEG_t -> errcs
-       ERRCS_sae_m             = 0x00000100,
-       ERRCS_wre_b             = 9,            // In INTEG_t -> errcs
-       ERRCS_wre_m             = 0x00000200,
-
-       WTC_en_b                = 0,            // In INTEG_t -> wtc
-       WTC_en_m                = 0x00000001,
-       WTC_to_b                = 1,            // In INTEG_t -> wtc
-       WTC_to_m                = 0x00000002,
-} ;
-
-#endif // __IDT_INTEG_H__
diff --git a/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/irq.h b/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/irq.h
deleted file mode 100644 (file)
index 65cc13c..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __ASM_MACH_MIPS_IRQ_H
-#define __ASM_MACH_MIPS_IRQ_H
-
-#define NR_IRQS        256
-#include_next <irq.h>
-
-#endif /* __ASM_MACH_MIPS_IRQ_H */
diff --git a/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/pci.h b/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/pci.h
deleted file mode 100644 (file)
index 585a0ae..0000000
+++ /dev/null
@@ -1,692 +0,0 @@
-/**************************************************************************
- *
- *  BRIEF MODULE DESCRIPTION
- *   PCI register definitio
- *
- *  Copyright 2004 IDT Inc. (rischelp@idt.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.
- *
- *
- **************************************************************************
- * May 2004 rkt, neb.
- *
- * Initial Release
- *
- * 
- *
- **************************************************************************
- */
-
-#ifndef __IDT_PCI_H__
-#define __IDT_PCI_H__
-
-enum
-{
-       PCI0_PhysicalAddress    = 0x18080000,
-       PCI_PhysicalAddress     = PCI0_PhysicalAddress,
-
-       PCI0_VirtualAddress     = 0xB8080000,
-       PCI_VirtualAddress      = PCI0_VirtualAddress,
-} ;
-
-enum
-{
-       PCI_LbaCount    = 4,            // Local base addresses.
-} ;
-
-typedef struct
-{
-       u32     a ;             // Address.
-       u32     c ;             // Control.
-       u32     m ;             // mapping.
-} PCI_Map_s ;
-
-typedef struct
-{
-       u32             pcic ;
-       u32             pcis ;
-       u32             pcism ;
-       u32             pcicfga ;
-       u32             pcicfgd ;
-       PCI_Map_s       pcilba [PCI_LbaCount] ;
-       u32             pcidac ;
-       u32             pcidas ;
-       u32             pcidasm ;
-       u32             pcidad ;
-       u32             pcidma8c ;
-       u32             pcidma9c ;
-       u32             pcitc ;
-} volatile *PCI_t ;
-
-// PCI messaging unit.
-enum
-{
-       PCIM_Count      = 2,
-} ;
-typedef struct
-{
-       u32             pciim [PCIM_Count] ;
-       u32             pciom [PCIM_Count] ;
-       u32             pciid ;
-       u32             pciiic ;
-       u32             pciiim ;
-       u32             pciiod ;
-       u32             pciioic ;
-       u32             pciioim ;
-} volatile *PCIM_t ;
-
-/*******************************************************************************
- *
- * PCI Control Register
- *
- ******************************************************************************/
-enum
-{
-       PCIC_en_b       = 0,
-       PCIC_en_m       = 0x00000001,
-       PCIC_tnr_b      = 1,
-       PCIC_tnr_m      = 0x00000002,
-       PCIC_sce_b      = 2,
-       PCIC_sce_m      = 0x00000004,
-       PCIC_ien_b      = 3,
-       PCIC_ien_m      = 0x00000008,
-       PCIC_aaa_b      = 4,
-       PCIC_aaa_m      = 0x00000010,
-       PCIC_eap_b      = 5,
-       PCIC_eap_m      = 0x00000020,
-       PCIC_pcim_b     = 6,
-       PCIC_pcim_m     = 0x000001c0,
-               PCIC_pcim_disabled_v    = 0,
-               PCIC_pcim_tnr_v         = 1,    // Satellite - target not ready
-               PCIC_pcim_suspend_v     = 2,    // Satellite - suspended CPU.
-               PCIC_pcim_extern_v      = 3,    // Host - external arbiter.
-               PCIC_pcim_fixed_v       = 4,    // Host - fixed priority arb.
-               PCIC_pcim_roundrobin_v  = 5,    // Host - round robin priority.
-               PCIC_pcim_reserved6_v   = 6,
-               PCIC_pcim_reserved7_v   = 7,
-       PCIC_igm_b      = 9,
-       PCIC_igm_m      = 0x00000200,
-} ;
-
-/*******************************************************************************
- *
- * PCI Status Register
- *
- ******************************************************************************/
-enum {
-       PCIS_eed_b      = 0,
-       PCIS_eed_m      = 0x00000001,
-       PCIS_wr_b       = 1,
-       PCIS_wr_m       = 0x00000002,
-       PCIS_nmi_b      = 2,
-       PCIS_nmi_m      = 0x00000004,
-       PCIS_ii_b       = 3,
-       PCIS_ii_m       = 0x00000008,
-       PCIS_cwe_b      = 4,
-       PCIS_cwe_m      = 0x00000010,
-       PCIS_cre_b      = 5,
-       PCIS_cre_m      = 0x00000020,
-       PCIS_mdpe_b     = 6,
-       PCIS_mdpe_m     = 0x00000040,
-       PCIS_sta_b      = 7,
-       PCIS_sta_m      = 0x00000080,
-       PCIS_rta_b      = 8,
-       PCIS_rta_m      = 0x00000100,
-       PCIS_rma_b      = 9,
-       PCIS_rma_m      = 0x00000200,
-       PCIS_sse_b      = 10,
-       PCIS_sse_m      = 0x00000400,
-       PCIS_ose_b      = 11,
-       PCIS_ose_m      = 0x00000800,
-       PCIS_pe_b       = 12,
-       PCIS_pe_m       = 0x00001000,
-       PCIS_tae_b      = 13,
-       PCIS_tae_m      = 0x00002000,
-       PCIS_rle_b      = 14,
-       PCIS_rle_m      = 0x00004000,
-       PCIS_bme_b      = 15,
-       PCIS_bme_m      = 0x00008000,
-       PCIS_prd_b      = 16,
-       PCIS_prd_m      = 0x00010000,
-       PCIS_rip_b      = 17,
-       PCIS_rip_m      = 0x00020000,
-} ;
-
-/*******************************************************************************
- *
- * PCI Status Mask Register
- *
- ******************************************************************************/
-enum {
-       PCISM_eed_b             = 0,
-       PCISM_eed_m             = 0x00000001,
-       PCISM_wr_b              = 1,
-       PCISM_wr_m              = 0x00000002,
-       PCISM_nmi_b             = 2,
-       PCISM_nmi_m             = 0x00000004,
-       PCISM_ii_b              = 3,
-       PCISM_ii_m              = 0x00000008,
-       PCISM_cwe_b             = 4,
-       PCISM_cwe_m             = 0x00000010,
-       PCISM_cre_b             = 5,
-       PCISM_cre_m             = 0x00000020,
-       PCISM_mdpe_b            = 6,
-       PCISM_mdpe_m            = 0x00000040,
-       PCISM_sta_b             = 7,
-       PCISM_sta_m             = 0x00000080,
-       PCISM_rta_b             = 8,
-       PCISM_rta_m             = 0x00000100,
-       PCISM_rma_b             = 9,
-       PCISM_rma_m             = 0x00000200,
-       PCISM_sse_b             = 10,
-       PCISM_sse_m             = 0x00000400,
-       PCISM_ose_b             = 11,
-       PCISM_ose_m             = 0x00000800,
-       PCISM_pe_b              = 12,
-       PCISM_pe_m              = 0x00001000,
-       PCISM_tae_b             = 13,
-       PCISM_tae_m             = 0x00002000,
-       PCISM_rle_b             = 14,
-       PCISM_rle_m             = 0x00004000,
-       PCISM_bme_b             = 15,
-       PCISM_bme_m             = 0x00008000,
-       PCISM_prd_b             = 16,
-       PCISM_prd_m             = 0x00010000,
-       PCISM_rip_b             = 17,
-       PCISM_rip_m             = 0x00020000,
-} ;
-
-/*******************************************************************************
- *
- * PCI Configuration Address Register
- *
- ******************************************************************************/
-enum {
-       PCICFGA_reg_b           = 2,
-       PCICFGA_reg_m           = 0x000000fc,
-               PCICFGA_reg_id_v        = 0x00>>2, //use PCFGID_
-               PCICFGA_reg_04_v        = 0x04>>2, //use PCFG04_
-               PCICFGA_reg_08_v        = 0x08>>2, //use PCFG08_
-               PCICFGA_reg_0C_v        = 0x0C>>2, //use PCFG0C_
-               PCICFGA_reg_pba0_v      = 0x10>>2, //use PCIPBA_
-               PCICFGA_reg_pba1_v      = 0x14>>2, //use PCIPBA_
-               PCICFGA_reg_pba2_v      = 0x18>>2, //use PCIPBA_
-               PCICFGA_reg_pba3_v      = 0x1c>>2, //use PCIPBA_
-               PCICFGA_reg_subsystem_v = 0x2c>>2, //use PCFGSS_
-               PCICFGA_reg_3C_v        = 0x3C>>2, //use PCFG3C_
-               PCICFGA_reg_pba0c_v     = 0x44>>2, //use PCIPBAC_
-               PCICFGA_reg_pba0m_v     = 0x48>>2,
-               PCICFGA_reg_pba1c_v     = 0x4c>>2, //use PCIPBAC_
-               PCICFGA_reg_pba1m_v     = 0x50>>2,
-               PCICFGA_reg_pba2c_v     = 0x54>>2, //use PCIPBAC_
-               PCICFGA_reg_pba2m_v     = 0x58>>2,
-               PCICFGA_reg_pba3c_v     = 0x5c>>2, //use PCIPBAC_
-               PCICFGA_reg_pba3m_v     = 0x60>>2,
-               PCICFGA_reg_pmgt_v      = 0x64>>2,
-       PCICFGA_func_b          = 8,
-       PCICFGA_func_m          = 0x00000700,
-       PCICFGA_dev_b           = 11,
-       PCICFGA_dev_m           = 0x0000f800,
-               PCICFGA_dev_internal_v  = 0,
-       PCICFGA_bus_b           = 16,
-       PCICFGA_bus_m           = 0x00ff0000,
-               PCICFGA_bus_type0_v     = 0,    //local bus
-       PCICFGA_en_b            = 31,           // read only
-       PCICFGA_en_m            = 0x80000000,
-} ;
-
-enum {
-       PCFGID_vendor_b         = 0,
-       PCFGID_vendor_m         = 0x0000ffff,
-               PCFGID_vendor_IDT_v             = 0x111d,
-       PCFGID_device_b         = 16,
-       PCFGID_device_m         = 0xffff0000,
-               PCFGID_device_Korinade_v        = 0x0214,
-
-       PCFG04_command_ioena_b          = 1,
-       PCFG04_command_ioena_m          = 0x00000001,
-       PCFG04_command_memena_b         = 2,
-       PCFG04_command_memena_m         = 0x00000002,
-       PCFG04_command_bmena_b          = 3,
-       PCFG04_command_bmena_m          = 0x00000004,
-       PCFG04_command_mwinv_b          = 5,
-       PCFG04_command_mwinv_m          = 0x00000010,
-       PCFG04_command_parena_b         = 7,
-       PCFG04_command_parena_m         = 0x00000040,
-       PCFG04_command_serrena_b        = 9,
-       PCFG04_command_serrena_m        = 0x00000100,
-       PCFG04_command_fastbbena_b      = 10,
-       PCFG04_command_fastbbena_m      = 0x00000200,
-       PCFG04_status_b                 = 16,
-       PCFG04_status_m                 = 0xffff0000,
-       PCFG04_status_66MHz_b           = 21,   // 66 MHz enable
-       PCFG04_status_66MHz_m           = 0x00200000,
-       PCFG04_status_fbb_b             = 23,
-       PCFG04_status_fbb_m             = 0x00800000,
-       PCFG04_status_mdpe_b            = 24,
-       PCFG04_status_mdpe_m            = 0x01000000,
-       PCFG04_status_dst_b             = 25,
-       PCFG04_status_dst_m             = 0x06000000,
-       PCFG04_status_sta_b             = 27,
-       PCFG04_status_sta_m             = 0x08000000,
-       PCFG04_status_rta_b             = 28,
-       PCFG04_status_rta_m             = 0x10000000,
-       PCFG04_status_rma_b             = 29,
-       PCFG04_status_rma_m             = 0x20000000,
-       PCFG04_status_sse_b             = 30,
-       PCFG04_status_sse_m             = 0x40000000,
-       PCFG04_status_pe_b              = 31,
-       PCFG04_status_pe_m              = 0x40000000,
-
-       PCFG08_revId_b                  = 0,
-       PCFG08_revId_m                  = 0x000000ff,
-       PCFG08_classCode_b              = 0,
-       PCFG08_classCode_m              = 0xffffff00,
-               PCFG08_classCode_bridge_v       = 06,
-               PCFG08_classCode_proc_v         = 0x0b3000, // processor-MIPS
-       PCFG0C_cacheline_b              = 0,
-       PCFG0C_cacheline_m              = 0x000000ff,
-       PCFG0C_masterLatency_b          = 8,
-       PCFG0C_masterLatency_m          = 0x0000ff00,
-       PCFG0C_headerType_b             = 16,
-       PCFG0C_headerType_m             = 0x00ff0000,
-       PCFG0C_bist_b                   = 24,
-       PCFG0C_bist_m                   = 0xff000000,
-
-       PCIPBA_msi_b                    = 0,
-       PCIPBA_msi_m                    = 0x00000001,
-       PCIPBA_p_b                      = 3,
-       PCIPBA_p_m                      = 0x00000004,
-       PCIPBA_baddr_b                  = 8,
-       PCIPBA_baddr_m                  = 0xffffff00,
-
-       PCFGSS_vendorId_b               = 0,
-       PCFGSS_vendorId_m               = 0x0000ffff,
-       PCFGSS_id_b                     = 16,
-       PCFGSS_id_m                     = 0xffff0000,
-
-       PCFG3C_interruptLine_b          = 0,
-       PCFG3C_interruptLine_m          = 0x000000ff,
-       PCFG3C_interruptPin_b           = 8,
-       PCFG3C_interruptPin_m           = 0x0000ff00,
-       PCFG3C_minGrant_b               = 16,
-       PCFG3C_minGrant_m               = 0x00ff0000,
-       PCFG3C_maxLat_b                 = 24,
-       PCFG3C_maxLat_m                 = 0xff000000,
-
-       PCIPBAC_msi_b                   = 0,
-       PCIPBAC_msi_m                   = 0x00000001,
-       PCIPBAC_p_b                     = 1,
-       PCIPBAC_p_m                     = 0x00000002,
-       PCIPBAC_size_b                  = 2,
-       PCIPBAC_size_m                  = 0x0000007c,
-       PCIPBAC_sb_b                    = 7,
-       PCIPBAC_sb_m                    = 0x00000080,
-       PCIPBAC_pp_b                    = 8,
-       PCIPBAC_pp_m                    = 0x00000100,
-       PCIPBAC_mr_b                    = 9,
-       PCIPBAC_mr_m                    = 0x00000600,
-               PCIPBAC_mr_read_v       =0,     //no prefetching
-               PCIPBAC_mr_readLine_v   =1,
-               PCIPBAC_mr_readMult_v   =2,
-       PCIPBAC_mrl_b                   = 11,
-       PCIPBAC_mrl_m                   = 0x00000800,
-       PCIPBAC_mrm_b                   = 12,
-       PCIPBAC_mrm_m                   = 0x00001000,
-       PCIPBAC_trp_b                   = 13,
-       PCIPBAC_trp_m                   = 0x00002000,
-
-       PCFG40_trdyTimeout_b            = 0,
-       PCFG40_trdyTimeout_m            = 0x000000ff,
-       PCFG40_retryLim_b               = 8,
-       PCFG40_retryLim_m               = 0x0000ff00,
-};
-
-/*******************************************************************************
- *
- * PCI Local Base Address [0|1|2|3] Register
- *
- ******************************************************************************/
-enum {
-       PCILBA_baddr_b          = 0,            // In PCI_t -> pcilba [] .a
-       PCILBA_baddr_m          = 0xffffff00,
-} ;
-/*******************************************************************************
- *
- * PCI Local Base Address Control Register
- *
- ******************************************************************************/
-enum {
-       PCILBAC_msi_b           = 0,            // In pPci->pcilba[i].c
-       PCILBAC_msi_m           = 0x00000001,
-               PCILBAC_msi_mem_v       = 0,
-               PCILBAC_msi_io_v        = 1,
-       PCILBAC_size_b          = 2,    // In pPci->pcilba[i].c
-       PCILBAC_size_m          = 0x0000007c,
-       PCILBAC_sb_b            = 7,    // In pPci->pcilba[i].c
-       PCILBAC_sb_m            = 0x00000080,
-       PCILBAC_rt_b            = 8,    // In pPci->pcilba[i].c
-       PCILBAC_rt_m            = 0x00000100,
-               PCILBAC_rt_noprefetch_v = 0, // mem read
-               PCILBAC_rt_prefetch_v   = 1, // mem readline
-} ;
-
-/*******************************************************************************
- *
- * PCI Local Base Address [0|1|2|3] Mapping Register
- *
- ******************************************************************************/
-enum {
-       PCILBAM_maddr_b         = 8,
-       PCILBAM_maddr_m         = 0xffffff00,
-} ;
-
-/*******************************************************************************
- *
- * PCI Decoupled Access Control Register
- *
- ******************************************************************************/
-enum {
-       PCIDAC_den_b            = 0,
-       PCIDAC_den_m            = 0x00000001,
-} ;
-
-/*******************************************************************************
- *
- * PCI Decoupled Access Status Register
- *
- ******************************************************************************/
-enum {
-       PCIDAS_d_b      = 0,
-       PCIDAS_d_m      = 0x00000001,
-       PCIDAS_b_b      = 1,
-       PCIDAS_b_m      = 0x00000002,
-       PCIDAS_e_b      = 2,
-       PCIDAS_e_m      = 0x00000004,
-       PCIDAS_ofe_b    = 3,
-       PCIDAS_ofe_m    = 0x00000008,
-       PCIDAS_off_b    = 4,
-       PCIDAS_off_m    = 0x00000010,
-       PCIDAS_ife_b    = 5,
-       PCIDAS_ife_m    = 0x00000020,
-       PCIDAS_iff_b    = 6,
-       PCIDAS_iff_m    = 0x00000040,
-} ;
-
-/*******************************************************************************
- *
- * PCI DMA Channel 8 Configuration Register
- *
- ******************************************************************************/
-enum
-{
-       PCIDMA8C_mbs_b  = 0,            // Maximum Burst Size.
-       PCIDMA8C_mbs_m  = 0x00000fff,   // { pcidma8c }
-       PCIDMA8C_our_b  = 12,           // Optimize Unaligned Burst Reads.
-       PCIDMA8C_our_m  = 0x00001000,   // { pcidma8c }
-} ;
-
-/*******************************************************************************
- *
- * PCI DMA Channel 9 Configuration Register
- *
- ******************************************************************************/
-enum
-{
-       PCIDMA9C_mbs_b  = 0,            // Maximum Burst Size.
-       PCIDMA9C_mbs_m  = 0x00000fff, // { pcidma9c }
-} ;
-
-/*******************************************************************************
- *
- * PCI to Memory(DMA Channel 8) AND Memory to PCI DMA(DMA Channel 9)Descriptors
- *
- ******************************************************************************/
-enum {
-       PCIDMAD_pt_b            = 22,           // in DEVCMD field (descriptor)
-       PCIDMAD_pt_m            = 0x00c00000,   // preferred transaction field
-               // These are for reads (DMA channel 8)
-               PCIDMAD_devcmd_mr_v     = 0,    //memory read
-               PCIDMAD_devcmd_mrl_v    = 1,    //memory read line
-               PCIDMAD_devcmd_mrm_v    = 2,    //memory read multiple
-               PCIDMAD_devcmd_ior_v    = 3,    //I/O read
-               // These are for writes (DMA channel 9)
-               PCIDMAD_devcmd_mw_v     = 0,    //memory write
-               PCIDMAD_devcmd_mwi_v    = 1,    //memory write invalidate
-               PCIDMAD_devcmd_iow_v    = 3,    //I/O write
-
-       // Swap byte field applies to both DMA channel 8 and 9
-       PCIDMAD_sb_b            = 24,           // in DEVCMD field (descriptor)
-       PCIDMAD_sb_m            = 0x01000000,   // swap byte field
-} ;
-
-
-/*******************************************************************************
- *
- * PCI Target Control Register
- *
- ******************************************************************************/
-enum
-{
-       PCITC_rtimer_b          = 0,            // In PCITC_t -> pcitc
-       PCITC_rtimer_m          = 0x000000ff,
-       PCITC_dtimer_b          = 8,            // In PCITC_t -> pcitc
-       PCITC_dtimer_m          = 0x0000ff00,
-       PCITC_rdr_b             = 18,           // In PCITC_t -> pcitc
-       PCITC_rdr_m             = 0x00040000,
-       PCITC_ddt_b             = 19,           // In PCITC_t -> pcitc
-       PCITC_ddt_m             = 0x00080000,
-} ;
-/*******************************************************************************
- *
- * PCI messaging unit [applies to both inbound and outbound registers ]
- *
- ******************************************************************************/
-enum
-{
-       PCIM_m0_b       = 0,            // In PCIM_t -> {pci{iic,iim,ioic,ioim}}
-       PCIM_m0_m       = 0x00000001,   // inbound or outbound message 0
-       PCIM_m1_b       = 1,            // In PCIM_t -> {pci{iic,iim,ioic,ioim}}
-       PCIM_m1_m       = 0x00000002,   // inbound or outbound message 1
-       PCIM_db_b       = 2,            // In PCIM_t -> {pci{iic,iim,ioic,ioim}}
-       PCIM_db_m       = 0x00000004,   // inbound or outbound doorbell
-};
-
-
-
-
-
-
-#define PCI_MSG_VirtualAddress      0xB8088010
-#define rc32434_pci ((volatile PCI_t) PCI0_VirtualAddress)
-#define rc32434_pci_msg ((volatile PCIM_t) PCI_MSG_VirtualAddress)
-
-#define PCIM_SHFT              0x6
-#define PCIM_BIT_LEN           0x7
-#define PCIM_H_EA              0x3
-#define PCIM_H_IA_FIX          0x4
-#define PCIM_H_IA_RR           0x5
-
-#define PCI_ADDR_START         0x50000000
-
-#define CPUTOPCI_MEM_WIN       0x02000000
-#define CPUTOPCI_IO_WIN                0x00100000
-#define PCILBA_SIZE_SHFT       2
-#define PCILBA_SIZE_MASK       0x1F
-#define SIZE_256MB             0x1C
-#define SIZE_128MB             0x1B
-#define SIZE_64MB               0x1A
-#define SIZE_32MB              0x19
-#define SIZE_16MB               0x18
-#define SIZE_4MB               0x16
-#define SIZE_2MB               0x15
-#define SIZE_1MB               0x14
-#define KORINA_CONFIG0_ADDR    0x80000000
-#define KORINA_CONFIG1_ADDR    0x80000004
-#define KORINA_CONFIG2_ADDR    0x80000008
-#define KORINA_CONFIG3_ADDR    0x8000000C
-#define KORINA_CONFIG4_ADDR    0x80000010
-#define KORINA_CONFIG5_ADDR    0x80000014
-#define KORINA_CONFIG6_ADDR    0x80000018
-#define KORINA_CONFIG7_ADDR    0x8000001C
-#define KORINA_CONFIG8_ADDR    0x80000020
-#define KORINA_CONFIG9_ADDR    0x80000024
-#define KORINA_CONFIG10_ADDR   0x80000028
-#define KORINA_CONFIG11_ADDR   0x8000002C
-#define KORINA_CONFIG12_ADDR   0x80000030
-#define KORINA_CONFIG13_ADDR   0x80000034
-#define KORINA_CONFIG14_ADDR   0x80000038
-#define KORINA_CONFIG15_ADDR   0x8000003C
-#define KORINA_CONFIG16_ADDR   0x80000040
-#define KORINA_CONFIG17_ADDR   0x80000044
-#define KORINA_CONFIG18_ADDR   0x80000048
-#define KORINA_CONFIG19_ADDR   0x8000004C
-#define KORINA_CONFIG20_ADDR   0x80000050
-#define KORINA_CONFIG21_ADDR   0x80000054
-#define KORINA_CONFIG22_ADDR   0x80000058
-#define KORINA_CONFIG23_ADDR   0x8000005C
-#define KORINA_CONFIG24_ADDR   0x80000060
-#define KORINA_CONFIG25_ADDR   0x80000064
-#define KORINA_CMD             (PCFG04_command_ioena_m | \
-                                PCFG04_command_memena_m | \
-                                PCFG04_command_bmena_m | \
-                                PCFG04_command_mwinv_m | \
-                                PCFG04_command_parena_m | \
-                                PCFG04_command_serrena_m )
-
-#define KORINA_STAT            (PCFG04_status_mdpe_m | \
-                                PCFG04_status_sta_m  | \
-                                PCFG04_status_rta_m  | \
-                                PCFG04_status_rma_m  | \
-                                PCFG04_status_sse_m  | \
-                                PCFG04_status_pe_m)
-
-#define KORINA_CNFG1           ((KORINA_STAT<<16)|KORINA_CMD)
-
-#define KORINA_REVID           0
-#define KORINA_CLASS_CODE      0
-#define KORINA_CNFG2           ((KORINA_CLASS_CODE<<8) | \
-                                 KORINA_REVID)
-
-#define KORINA_CACHE_LINE_SIZE 4
-#define KORINA_MASTER_LAT      0x3c
-#define KORINA_HEADER_TYPE     0
-#define KORINA_BIST            0
-
-#define KORINA_CNFG3 ((KORINA_BIST << 24) | \
-                     (KORINA_HEADER_TYPE<<16) | \
-                     (KORINA_MASTER_LAT<<8) | \
-                     KORINA_CACHE_LINE_SIZE )
-
-#define KORINA_BAR0    0x00000008 /* 128 MB Memory */
-#define KORINA_BAR1    0x18800001 /* 1 MB IO */
-#define KORINA_BAR2    0x18000001 /* 2 MB IO window for Korina
-                                       internal Registers */
-#define KORINA_BAR3    0x48000008 /* Spare 128 MB Memory */
-
-#define KORINA_CNFG4   KORINA_BAR0
-#define KORINA_CNFG5    KORINA_BAR1
-#define KORINA_CNFG6   KORINA_BAR2
-#define KORINA_CNFG7   KORINA_BAR3
-
-#define KORINA_SUBSYS_VENDOR_ID 0x011d
-#define KORINA_SUBSYSTEM_ID    0x0214
-#define KORINA_CNFG8           0
-#define KORINA_CNFG9           0
-#define KORINA_CNFG10          0
-#define KORINA_CNFG11  ((KORINA_SUBSYS_VENDOR_ID<<16) | \
-                         KORINA_SUBSYSTEM_ID)
-#define KORINA_INT_LINE                1
-#define KORINA_INT_PIN         1
-#define KORINA_MIN_GNT         8
-#define KORINA_MAX_LAT         0x38
-#define KORINA_CNFG12          0
-#define KORINA_CNFG13          0
-#define KORINA_CNFG14          0
-#define KORINA_CNFG15  ((KORINA_MAX_LAT<<24) | \
-                        (KORINA_MIN_GNT<<16) | \
-                        (KORINA_INT_PIN<<8)  | \
-                         KORINA_INT_LINE)
-#define        KORINA_RETRY_LIMIT      0x80
-#define KORINA_TRDY_LIMIT      0x80
-#define KORINA_CNFG16 ((KORINA_RETRY_LIMIT<<8) | \
-                       KORINA_TRDY_LIMIT)
-#define PCI_PBAxC_R            0x0
-#define PCI_PBAxC_RL           0x1
-#define PCI_PBAxC_RM           0x2
-#define SIZE_SHFT              2
-
-#if defined(__MIPSEB__)
-#define KORINA_PBA0C   ( PCIPBAC_mrl_m | PCIPBAC_sb_m | \
-                         ((PCI_PBAxC_RM &0x3) << PCIPBAC_mr_b) | \
-                         PCIPBAC_pp_m | \
-                         (SIZE_128MB<<SIZE_SHFT) | \
-                          PCIPBAC_p_m)
-#else
-#define KORINA_PBA0C   ( PCIPBAC_mrl_m | \
-                         ((PCI_PBAxC_RM &0x3) << PCIPBAC_mr_b) | \
-                         PCIPBAC_pp_m | \
-                         (SIZE_128MB<<SIZE_SHFT) | \
-                          PCIPBAC_p_m)
-#endif
-#define KORINA_CNFG17  KORINA_PBA0C
-#define KORINA_PBA0M   0x0
-#define KORINA_CNFG18  KORINA_PBA0M
-
-#if defined(__MIPSEB__)
-#define KORINA_PBA1C   ((SIZE_1MB<<SIZE_SHFT) | PCIPBAC_sb_m | \
-                         PCIPBAC_msi_m)
-#else
-#define KORINA_PBA1C   ((SIZE_1MB<<SIZE_SHFT) | \
-                         PCIPBAC_msi_m)
-#endif
-#define KORINA_CNFG19  KORINA_PBA1C
-#define KORINA_PBA1M   0x0
-#define KORINA_CNFG20  KORINA_PBA1M
-
-#if defined(__MIPSEB__)
-#define KORINA_PBA2C   ((SIZE_2MB<<SIZE_SHFT) | PCIPBAC_sb_m | \
-                         PCIPBAC_msi_m)
-#else
-#define KORINA_PBA2C   ((SIZE_2MB<<SIZE_SHFT) | \
-                         PCIPBAC_msi_m)
-#endif
-#define KORINA_CNFG21  KORINA_PBA2C
-#define KORINA_PBA2M   0x18000000
-#define KORINA_CNFG22  KORINA_PBA2M
-#define KORINA_PBA3C   0
-#define KORINA_CNFG23  KORINA_PBA3C
-#define KORINA_PBA3M   0
-#define KORINA_CNFG24  KORINA_PBA3M
-
-
-
-#define        PCITC_DTIMER_VAL        8
-#define PCITC_RTIMER_VAL       0x10
-
-
-
-
-#endif // __IDT_PCI_H__
-
-
-
diff --git a/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/rb.h b/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/rb.h
deleted file mode 100644 (file)
index 6800eb0..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *  Copyright (C) 2004 IDT Inc.
- *  Copyright (C) 2006 Felix Fietkau <nbd@openwrt.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.
- *
- */
-#ifndef __MIPS_RB_H__
-#define __MIPS_RB_H__
-#include <linux/genhd.h>
-
-#define IDT434_REG_BASE ((volatile void *) KSEG1ADDR(0x18000000))
-#define DEV0BASE 0x010000
-#define DEV0MASK 0x010004
-#define DEV0C 0x010008
-#define DEV0TC 0x01000C
-#define DEV1BASE 0x010010
-#define DEV1MASK 0x010014
-#define DEV1C 0x010018
-#define DEV1TC 0x01001C
-#define DEV2BASE 0x010020
-#define DEV2MASK 0x010024
-#define DEV2C 0x010028
-#define DEV2TC 0x01002C
-#define DEV3BASE 0x010030
-#define DEV3MASK 0x010034
-#define DEV3C 0x010038
-#define DEV3TC 0x01003C
-#define BTCS 0x010040
-#define BTCOMPARE 0x010044
-#define GPIOFUNC 0x050000
-#define GPIOCFG 0x050004
-#define GPIOD 0x050008
-#define GPIOILEVEL 0x05000C
-#define GPIOISTAT 0x050010
-#define GPIONMIEN 0x050014
-#define IMASK6 0x038038
-
-#define LO_WPX (1 << 0)
-#define LO_ALE (1 << 1)
-#define LO_CLE (1 << 2)
-#define LO_CEX (1 << 3)
-#define LO_FOFF (1 << 5)
-#define LO_SPICS (1 << 6)
-#define LO_ULED (1 << 7)
-
-typedef enum {
-       FUNC = 0x00,
-       CFG = 0x04,
-       DATA = 0x08,
-       ILEVEL = 0x0c,
-       ISTAT = 0x10,
-       NMIEN = 0x14
-} gpio_func;
-
-extern void changeLatchU5(unsigned char orMask, unsigned char nandMask);
-extern unsigned get434Reg(unsigned regOffs);
-extern void set434Reg(unsigned regOffs, unsigned bit, unsigned len, unsigned val);
-extern void gpio_set(gpio_func func, u32 mask, u32 value);
-extern u32 gpio_get(gpio_func func);
-
-#define get434Reg(x) (*(volatile unsigned *) (IDT434_REG_BASE + (x)))
-
-struct korina_device {
-       char *name;
-       unsigned char mac[6];
-       struct net_device *dev;
-};
-
-struct cf_device {
-       int gpio_pin;
-       void *dev;
-       struct gendisk *gd;
-};
-
-#endif
diff --git a/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/rc32434.h b/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/rc32434.h
deleted file mode 100644 (file)
index f3e53e4..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- ***************************************************************************
- * Definitions for IDT RC323434 CPU.
- *
- ****************************************************************************
- * Kiran Rao
- * 
- * Original form
- ****************************************************************************
- * P. Sadik   Oct 08, 2003
- *
- * Started revision history
- * Made IDT_BUS_FREQ a kernel configuration parameter
- ****************************************************************************
- * P. Sadik   Oct 10, 2003
- *
- * Removed IDT_BUS_FREQ, since this parameter is no longer required. Instead
- * idt_cpu_freq is used everywhere
- ****************************************************************************
- * P. Sadik   Oct 20, 2003
- *
- * Removed RC32434_BASE_BAUD
- ****************************************************************************
-*/
-#ifndef _RC32434_H_
-#define _RC32434_H_
-
-#include <linux/autoconf.h>
-#include <linux/delay.h>
-#include <asm/io.h>
-
-#define RC32434_REG_BASE   0x18000000
-
-#define interrupt ((volatile INT_t ) INT0_VirtualAddress)
-
-
-#define IDT_CLOCK_MULT 2
-#define MIPS_CPU_TIMER_IRQ 7
-/* Interrupt Controller */
-#define IC_GROUP0_PEND     (RC32434_REG_BASE + 0x38000)
-#define IC_GROUP0_MASK     (RC32434_REG_BASE + 0x38008)
-#define IC_GROUP_OFFSET    0x0C
-
-#define NUM_INTR_GROUPS    5
-/* 16550 UARTs */
-
-#define GROUP0_IRQ_BASE 8              /* GRP2 IRQ numbers start here */
-#define GROUP1_IRQ_BASE (GROUP0_IRQ_BASE + 32) /* GRP3 IRQ numbers start here */
-#define GROUP2_IRQ_BASE (GROUP1_IRQ_BASE + 32) /* GRP4 IRQ numbers start here */
-#define GROUP3_IRQ_BASE (GROUP2_IRQ_BASE + 32) /* GRP5 IRQ numbers start here */
-#define GROUP4_IRQ_BASE (GROUP3_IRQ_BASE + 32)
-
-
-#ifdef __MIPSEB__
-#define RC32434_UART0_BASE (RC32434_REG_BASE + 0x58003)
-#else
-#define RC32434_UART0_BASE (RC32434_REG_BASE + 0x58000)
-#endif
-
-#define RC32434_UART0_IRQ  GROUP3_IRQ_BASE + 0
-// #define EB434_UART1_IRQ    GROUP4_IRQ_BASE + 11
-
-#define local_readl(addr) __raw_readl(addr)
-#define local_writel(l,addr) __raw_writel(l,addr)
-
-/* cpu pipeline flush */
-static inline void rc32434_sync(void)
-{
-        __asm__ volatile ("sync");
-}
-
-static inline void rc32434_sync_udelay(int us)
-{
-        __asm__ volatile ("sync");
-        udelay(us);
-}
-
-static inline void rc32434_sync_delay(int ms)
-{
-        __asm__ volatile ("sync");
-        mdelay(ms);
-}
-
-/*
- * C access to CLZ and CLO instructions
- * (count leading zeroes/ones).
- */
-static inline int rc32434_clz(unsigned long val)
-{
-       int ret;
-        __asm__ volatile (
-               ".set\tnoreorder\n\t"
-               ".set\tnoat\n\t"
-               ".set\tmips32\n\t"
-               "clz\t%0,%1\n\t"
-                ".set\tmips0\n\t"
-                ".set\tat\n\t"
-                ".set\treorder"
-                : "=r" (ret)
-               : "r" (val));
-
-       return ret;
-}
-static inline int rc32434_clo(unsigned long val)
-{
-       int ret;
-        __asm__ volatile (
-               ".set\tnoreorder\n\t"
-               ".set\tnoat\n\t"
-               ".set\tmips32\n\t"
-               "clo\t%0,%1\n\t"
-                ".set\tmips0\n\t"
-                ".set\tat\n\t"
-                ".set\treorder"
-                : "=r" (ret)
-               : "r" (val));
-
-       return ret;
-}
-
-#endif /* _RC32434_H_ */
diff --git a/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/war.h b/target/linux/rb532/files-2.6.23/include/asm-mips/rc32434/war.h
deleted file mode 100644 (file)
index 3ddf187..0000000
+++ /dev/null
@@ -1,25 +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) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org>
- */
-#ifndef __ASM_MIPS_MACH_MIPS_WAR_H
-#define __ASM_MIPS_MACH_MIPS_WAR_H
-
-#define R4600_V1_INDEX_ICACHEOP_WAR    0
-#define R4600_V1_HIT_CACHEOP_WAR       0
-#define R4600_V2_HIT_CACHEOP_WAR       0
-#define R5432_CP0_INTERRUPT_WAR                0
-#define BCM1250_M3_WAR                 0
-#define SIBYTE_1956_WAR                        0
-#define MIPS4K_ICACHE_REFILL_WAR       1
-#define MIPS_CACHE_SYNC_WAR            0
-#define TX49XX_ICACHE_INDEX_INV_WAR    0
-#define RM9000_CDEX_SMP_WAR            0
-#define ICACHE_REFILLS_WORKAROUND_WAR  0
-#define R10000_LLSC_WAR                        0
-#define MIPS34K_MISSED_ITLB_WAR                0
-
-#endif /* __ASM_MIPS_MACH_MIPS_WAR_H */
diff --git a/target/linux/rb532/patches-2.6.23/100-rb5xx_support.patch b/target/linux/rb532/patches-2.6.23/100-rb5xx_support.patch
deleted file mode 100644 (file)
index 262ea61..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-Index: linux-2.6.23.17/arch/mips/Kconfig
-===================================================================
---- linux-2.6.23.17.orig/arch/mips/Kconfig
-+++ linux-2.6.23.17/arch/mips/Kconfig
-@@ -595,6 +595,20 @@ config WR_PPMC
-         This enables support for the Wind River MIPS32 4KC PPMC evaluation
-         board, which is based on GT64120 bridge chip.
-+config MIKROTIK_RB500
-+      bool "Support for RB5xx boards"
-+      select HW_HAS_PCI
-+      select IRQ_CPU
-+      select SYS_HAS_CPU_MIPS32_R1
-+      select SYS_SUPPORTS_LITTLE_ENDIAN
-+      select SYS_SUPPORTS_32BIT_KERNEL
-+      select SWAP_IO_SPACE
-+      select DMA_NONCOHERENT
-+      select GENERIC_GPIO
-+      help
-+       Support the Mikrotik(tm) Routerboard 500 series,
-+       such as the RB532.
-+
- endchoice
- source "arch/mips/au1000/Kconfig"
-@@ -829,6 +843,7 @@ config MIPS_L1_CACHE_SHIFT
-       default "4" if MACH_DECSTATION
-       default "7" if SGI_IP27 || SNI_RM
-       default "4" if PMC_MSP4200_EVAL
-+      default "4" if MIKROTIK_RB500
-       default "5"
- config HAVE_STD_PC_SERIAL_PORT
-Index: linux-2.6.23.17/arch/mips/Makefile
-===================================================================
---- linux-2.6.23.17.orig/arch/mips/Makefile
-+++ linux-2.6.23.17/arch/mips/Makefile
-@@ -300,6 +300,13 @@ load-$(CONFIG_LEMOTE_FULONG) +=0xfffffff
- cflags-$(CONFIG_LEMOTE_FULONG) += -Iinclude/asm-mips/mach-lemote
- #
-+# Routerboard 532 board
-+#
-+core-$(CONFIG_MIKROTIK_RB500) += arch/mips/rb500/
-+cflags-$(CONFIG_MIKROTIK_RB500)       += -Iinclude/asm-mips/rc32434
-+load-$(CONFIG_MIKROTIK_RB500) += 0xffffffff80101000
-+
-+#
- # For all MIPS, Inc. eval boards
- #
- core-$(CONFIG_MIPS_BOARDS_GEN)        += arch/mips/mips-boards/generic/
-Index: linux-2.6.23.17/arch/mips/pci/Makefile
-===================================================================
---- linux-2.6.23.17.orig/arch/mips/pci/Makefile
-+++ linux-2.6.23.17/arch/mips/pci/Makefile
-@@ -46,3 +46,4 @@ obj-$(CONFIG_TOSHIBA_RBTX4938)       += fixup-
- obj-$(CONFIG_VICTOR_MPC30X)   += fixup-mpc30x.o
- obj-$(CONFIG_ZAO_CAPCELLA)    += fixup-capcella.o
- obj-$(CONFIG_WR_PPMC)         += fixup-wrppmc.o
-+obj-$(CONFIG_MIKROTIK_RB500)  += pci-rc32434.o ops-rc32434.o fixup-rb500.o
-Index: linux-2.6.23.17/drivers/pci/Makefile
-===================================================================
---- linux-2.6.23.17.orig/drivers/pci/Makefile
-+++ linux-2.6.23.17/drivers/pci/Makefile
-@@ -32,6 +32,7 @@ obj-$(CONFIG_PPC32) += setup-irq.o
- obj-$(CONFIG_PPC64) += setup-bus.o
- obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
- obj-$(CONFIG_X86_VISWS) += setup-irq.o
-+obj-$(CONFIG_MIKROTIK_RB500) += setup-irq.o
- #
- # ACPI Related PCI FW Functions
-Index: linux-2.6.23.17/include/asm-mips/bootinfo.h
-===================================================================
---- linux-2.6.23.17.orig/include/asm-mips/bootinfo.h
-+++ linux-2.6.23.17/include/asm-mips/bootinfo.h
-@@ -208,6 +208,11 @@
- #define MACH_GROUP_WINDRIVER   28     /* Windriver boards */
- #define MACH_WRPPMC             1
-+
-+#define MACH_GROUP_MIKROTIK   29      /* Mikrotik Boards                       */
-+#define  MACH_MIKROTIK_RB532  0       /* Mikrotik RouterBoard 532 */
-+#define  MACH_MIKROTIK_RB532A 1       /* Mikrotik RouterBoard 532A */
-+
- #define CL_SIZE                       COMMAND_LINE_SIZE
- const char *get_system_type(void);
-Index: linux-2.6.23.17/include/asm-mips/cpu.h
-===================================================================
---- linux-2.6.23.17.orig/include/asm-mips/cpu.h
-+++ linux-2.6.23.17/include/asm-mips/cpu.h
-@@ -217,8 +217,9 @@
- #define CPU_R14000            64
- #define CPU_LOONGSON1           65
- #define CPU_LOONGSON2           66
-+#define CPU_RC32300                   67
--#define CPU_LAST              66
-+#define CPU_LAST              67
- /*
-  * ISA Level encodings
diff --git a/target/linux/rb532/patches-2.6.23/110-korina_ethernet.patch b/target/linux/rb532/patches-2.6.23/110-korina_ethernet.patch
deleted file mode 100644 (file)
index acfba6c..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: linux-2.6.23.17/drivers/net/Kconfig
-===================================================================
---- linux-2.6.23.17.orig/drivers/net/Kconfig
-+++ linux-2.6.23.17/drivers/net/Kconfig
-@@ -348,6 +348,13 @@ config AX88796
-         AX88796 driver, using platform bus to provide
-         chip detection and resources
-+config KORINA
-+      tristate "Korina Local Ethernet support"
-+      depends on NET_ETHERNET && ( IDT_EB434 || MIKROTIK_RB500)
-+      help
-+      IDT RC32434 has one local ethernet port. Say Y here to enable it.
-+      To compile this driver as a module, choose M here.
-+
- config MACE
-       tristate "MACE (Power Mac ethernet) support"
-       depends on PPC_PMAC && PPC32
-Index: linux-2.6.23.17/drivers/net/Makefile
-===================================================================
---- linux-2.6.23.17.orig/drivers/net/Makefile
-+++ linux-2.6.23.17/drivers/net/Makefile
-@@ -25,6 +25,8 @@ ucc_geth_driver-objs := ucc_geth.o ucc_g
- #
- obj-$(CONFIG_PLIP) += plip.o
-+obj-$(CONFIG_KORINA) += korina.o
-+
- obj-$(CONFIG_ROADRUNNER) += rrunner.o
- obj-$(CONFIG_HAPPYMEAL) += sunhme.o
diff --git a/target/linux/rb532/patches-2.6.23/120-cf.patch b/target/linux/rb532/patches-2.6.23/120-cf.patch
deleted file mode 100644 (file)
index 522195e..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: linux-2.6.23.17/drivers/block/Kconfig
-===================================================================
---- linux-2.6.23.17.orig/drivers/block/Kconfig
-+++ linux-2.6.23.17/drivers/block/Kconfig
-@@ -426,6 +426,14 @@ config SUNVDC
-         Support for virtual disk devices as a client under Sun
-         Logical Domains.
-+config BLK_DEV_CF_MIPS
-+      bool "CF slot of RB532 board"
-+      depends on MIKROTIK_RB500
-+      default y
-+      help
-+       The Routerboard 532 has a CF slot on it. Enable the special block
-+       device driver for it.
-+
- source "drivers/s390/block/Kconfig"
- config XILINX_SYSACE
-Index: linux-2.6.23.17/drivers/block/Makefile
-===================================================================
---- linux-2.6.23.17.orig/drivers/block/Makefile
-+++ linux-2.6.23.17/drivers/block/Makefile
-@@ -21,6 +21,7 @@ obj-$(CONFIG_BLK_DEV_DAC960) += DAC960.o
- obj-$(CONFIG_XILINX_SYSACE)   += xsysace.o
- obj-$(CONFIG_CDROM_PKTCDVD)   += pktcdvd.o
- obj-$(CONFIG_SUNVDC)          += sunvdc.o
-+obj-$(CONFIG_BLK_DEV_CF_MIPS) += rb500/
- obj-$(CONFIG_BLK_DEV_UMEM)    += umem.o
- obj-$(CONFIG_BLK_DEV_NBD)     += nbd.o
diff --git a/target/linux/rb532/patches-2.6.23/140-cmdline_hack.patch b/target/linux/rb532/patches-2.6.23/140-cmdline_hack.patch
deleted file mode 100644 (file)
index 1e01e95..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: linux-2.6.23.17/arch/mips/kernel/head.S
-===================================================================
---- linux-2.6.23.17.orig/arch/mips/kernel/head.S
-+++ linux-2.6.23.17/arch/mips/kernel/head.S
-@@ -132,6 +132,10 @@
-       j kernel_entry
-       nop
-+
-+EXPORT(_image_cmdline)
-+       .ascii "CMDLINE:"
-+
- #ifndef CONFIG_NO_EXCEPT_FILL
-       /*
-        * Reserved space for exception handlers.
diff --git a/target/linux/rb532/patches-2.6.23/200-bridge_resource_hack.patch b/target/linux/rb532/patches-2.6.23/200-bridge_resource_hack.patch
deleted file mode 100644 (file)
index 7079355..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: linux-2.6.23.17/arch/mips/pci/pci.c
-===================================================================
---- linux-2.6.23.17.orig/arch/mips/pci/pci.c
-+++ linux-2.6.23.17/arch/mips/pci/pci.c
-@@ -64,8 +64,10 @@ pcibios_align_resource(void *data, struc
-               /*
-                * Put everything into 0x00-0xff region modulo 0x400
-                */
-+#ifndef CONFIG_MIKROTIK_RB500
-               if (start & 0x300)
-                       start = (start + 0x3ff) & ~0x3ff;
-+#endif
-       } else if (res->flags & IORESOURCE_MEM) {
-               /* Make sure we start at our min on all hoses */
-               if (start < PCIBIOS_MIN_MEM + hose->mem_resource->start)
diff --git a/target/linux/rb532/patches-2.6.23/220-serial_fix.patch b/target/linux/rb532/patches-2.6.23/220-serial_fix.patch
deleted file mode 100644 (file)
index 4af6620..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: linux-2.6.23.17/drivers/serial/8250.c
-===================================================================
---- linux-2.6.23.17.orig/drivers/serial/8250.c
-+++ linux-2.6.23.17/drivers/serial/8250.c
-@@ -433,6 +433,13 @@ serial_out(struct uart_8250_port *up, in
-       default:
-               outb(value, up->port.iobase + offset);
-       }
-+
-+#if defined(CONFIG_IDT_EB434) || defined(CONFIG_MIKROTIK_RB500)
-+      __SLOW_DOWN_IO;
-+      __SLOW_DOWN_IO;
-+      __SLOW_DOWN_IO;
-+      __SLOW_DOWN_IO;
-+#endif
- }
- static void
diff --git a/target/linux/rb532/patches-2.6.23/240-via_rhine_performance.patch b/target/linux/rb532/patches-2.6.23/240-via_rhine_performance.patch
deleted file mode 100644 (file)
index d82b6f7..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-Index: linux-2.6.23.17/drivers/net/via-rhine.c
-===================================================================
---- linux-2.6.23.17.orig/drivers/net/via-rhine.c
-+++ linux-2.6.23.17/drivers/net/via-rhine.c
-@@ -33,6 +33,8 @@
- #define DRV_VERSION   "1.4.3"
- #define DRV_RELDATE   "2007-03-06"
-+#define PKT_ALIGN 1
-+
- /* A few user-configurable values.
-    These may be modified when a driver module is loaded. */
-@@ -40,6 +42,7 @@
- static int debug = 1; /* 1 normal messages, 0 quiet .. 7 verbose. */
- static int max_interrupt_work = 20;
-+#ifndef PKT_ALIGN
- /* Set the copy breakpoint for the copy-only-tiny-frames scheme.
-    Setting to > 1518 effectively disables this feature. */
- #if defined(__alpha__) || defined(__arm__) || defined(__hppa__) \
-@@ -49,6 +52,7 @@ static int rx_copybreak = 1518;
- #else
- static int rx_copybreak;
- #endif
-+#endif /* PKT_ALIGN */
- /* Work-around for broken BIOSes: they are unable to get the chip back out of
-    power state D3 so PXE booting fails. bootparam(7): via-rhine.avoid_D3=1 */
-@@ -111,6 +115,7 @@ static const int multicast_filter_limit 
- #include <asm/io.h>
- #include <asm/irq.h>
- #include <asm/uaccess.h>
-+#include <asm/unaligned.h>
- #include <linux/dmi.h>
- /* These identify the driver base version and may not be removed. */
-@@ -130,12 +135,14 @@ MODULE_LICENSE("GPL");
- module_param(max_interrupt_work, int, 0);
- module_param(debug, int, 0);
--module_param(rx_copybreak, int, 0);
- module_param(avoid_D3, bool, 0);
- MODULE_PARM_DESC(max_interrupt_work, "VIA Rhine maximum events handled per interrupt");
- MODULE_PARM_DESC(debug, "VIA Rhine debug level (0-7)");
--MODULE_PARM_DESC(rx_copybreak, "VIA Rhine copy breakpoint for copy-only-tiny-frames");
- MODULE_PARM_DESC(avoid_D3, "Avoid power state D3 (work-around for broken BIOSes)");
-+#ifndef PKT_ALIGN
-+module_param(rx_copybreak, int, 0);
-+MODULE_PARM_DESC(rx_copybreak, "VIA Rhine copy breakpoint for copy-only-tiny-frames");
-+#endif
- /*
-               Theory of Operation
-@@ -927,7 +934,7 @@ static void alloc_rbufs(struct net_devic
-       /* Fill in the Rx buffers.  Handle allocation failure gracefully. */
-       for (i = 0; i < RX_RING_SIZE; i++) {
--              struct sk_buff *skb = dev_alloc_skb(rp->rx_buf_sz);
-+              struct sk_buff *skb = dev_alloc_skb(rp->rx_buf_sz + 4);
-               rp->rx_skbuff[i] = skb;
-               if (skb == NULL)
-                       break;
-@@ -1484,7 +1491,9 @@ static int rhine_rx(struct net_device *d
-                       struct sk_buff *skb;
-                       /* Length should omit the CRC */
-                       int pkt_len = data_size - 4;
--
-+#ifdef PKT_ALIGN
-+                      int i;
-+#else
-                       /* Check if the packet is long enough to accept without
-                          copying to a minimally-sized skbuff. */
-                       if (pkt_len < rx_copybreak &&
-@@ -1503,7 +1512,9 @@ static int rhine_rx(struct net_device *d
-                                                              rp->rx_skbuff_dma[entry],
-                                                              rp->rx_buf_sz,
-                                                              PCI_DMA_FROMDEVICE);
--                      } else {
-+                      } else
-+#endif
-+                      {
-                               skb = rp->rx_skbuff[entry];
-                               if (skb == NULL) {
-                                       printk(KERN_ERR "%s: Inconsistent Rx "
-@@ -1517,6 +1528,14 @@ static int rhine_rx(struct net_device *d
-                                                rp->rx_skbuff_dma[entry],
-                                                rp->rx_buf_sz,
-                                                PCI_DMA_FROMDEVICE);
-+#ifdef PKT_ALIGN
-+                              /* align the data to the ip header - should be faster than copying the entire packet */
-+                              for (i = pkt_len - (pkt_len % 4); i >= 0; i -= 4) {
-+                                      put_unaligned(*((u32 *) (skb->data + i)), (u32 *) (skb->data + i + 2));
-+                              }
-+                              skb->data += 2;
-+                              skb->tail += 2;
-+#endif
-                       }
-                       skb->protocol = eth_type_trans(skb, dev);
- #ifdef CONFIG_VIA_RHINE_NAPI
diff --git a/target/linux/rb532/patches-2.6.23/510-rb500_led.patch b/target/linux/rb532/patches-2.6.23/510-rb500_led.patch
deleted file mode 100644 (file)
index 714c112..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: linux-2.6.23.17/drivers/leds/Kconfig
-===================================================================
---- linux-2.6.23.17.orig/drivers/leds/Kconfig
-+++ linux-2.6.23.17/drivers/leds/Kconfig
-@@ -107,6 +107,12 @@ config LEDS_GPIO
-         outputs. To be useful the particular board must have LEDs
-         and they must be connected to the GPIO lines.
-+config LEDS_RB500
-+      tristate "LED Support for RB5xx boards"
-+      depends LEDS_CLASS && MIKROTIK_RB500
-+      help
-+        This option enables support for the yellow user LED on RB5xx boards.
-+
- comment "LED Triggers"
- config LEDS_TRIGGERS
-Index: linux-2.6.23.17/drivers/leds/Makefile
-===================================================================
---- linux-2.6.23.17.orig/drivers/leds/Makefile
-+++ linux-2.6.23.17/drivers/leds/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_LEDS_ALIX)                      += leds-alix.o
- obj-$(CONFIG_LEDS_H1940)              += leds-h1940.o
- obj-$(CONFIG_LEDS_COBALT)             += leds-cobalt.o
- obj-$(CONFIG_LEDS_GPIO)                       += leds-gpio.o
-+obj-$(CONFIG_LEDS_RB500)              += leds-rb500.o
- # LED Triggers
- obj-$(CONFIG_LEDS_TRIGGER_TIMER)      += ledtrig-timer.o
diff --git a/target/linux/rb532/patches-2.6.23/520-rc32434_wdt.patch b/target/linux/rb532/patches-2.6.23/520-rc32434_wdt.patch
deleted file mode 100644 (file)
index 32ee23a..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: linux-2.6.23.17/arch/mips/kernel/time.c
-===================================================================
---- linux-2.6.23.17.orig/arch/mips/kernel/time.c
-+++ linux-2.6.23.17/arch/mips/kernel/time.c
-@@ -479,3 +479,5 @@ EXPORT_SYMBOL(rtc_lock);
- EXPORT_SYMBOL(to_tm);
- EXPORT_SYMBOL(rtc_mips_set_time);
- EXPORT_SYMBOL(rtc_mips_get_time);
-+EXPORT_SYMBOL(mips_hpt_frequency);
-+
-Index: linux-2.6.23.17/drivers/char/watchdog/Kconfig
-===================================================================
---- linux-2.6.23.17.orig/drivers/char/watchdog/Kconfig
-+++ linux-2.6.23.17/drivers/char/watchdog/Kconfig
-@@ -647,6 +647,19 @@ config WATCHDOG_RTAS
-         To compile this driver as a module, choose M here. The module
-         will be called wdrtas.
-+config RC32434_WDT
-+      tristate "IDT Interprise 79RC32434 SoC hardware watchdog"
-+      depends on WATCHDOG && MIKROTIK_RB500
-+      help
-+        This is a driver for hardware watchdog integrated in IDT Interprise
-+        79RC32434 SoC. This watchdog simply watches your kernel to make sure
-+        it doesn't freeze, and if it does, it reboots your computer after a
-+        certain amount of time.
-+
-+        To compile this driver as a module, choose M here: the module will be
-+        called rc32434_wdt.
-+
-+
- # S390 Architecture
- config ZVM_WATCHDOG
-Index: linux-2.6.23.17/drivers/char/watchdog/Makefile
-===================================================================
---- linux-2.6.23.17.orig/drivers/char/watchdog/Makefile
-+++ linux-2.6.23.17/drivers/char/watchdog/Makefile
-@@ -90,6 +90,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc
- obj-$(CONFIG_INDYDOG) += indydog.o
- obj-$(CONFIG_WDT_MTX1)        += mtx-1_wdt.o
- obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
-+obj-$(CONFIG_RC32434_WDT) += rc32434_wdt.o
- # PARISC Architecture
diff --git a/target/linux/s3c24xx/config-2.6.24 b/target/linux/s3c24xx/config-2.6.24
deleted file mode 100644 (file)
index aa5da00..0000000
+++ /dev/null
@@ -1,597 +0,0 @@
-CONFIG_AEABI=y
-CONFIG_ALIGNMENT_TRAP=y
-CONFIG_APM_EMULATION=y
-CONFIG_APM_POWER=y
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_BAST is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_CLPS7500 is not set
-# CONFIG_ARCH_CO285 is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_H1940 is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_RPC is not set
-CONFIG_ARCH_S3C2410=y
-CONFIG_ARCH_S3C2440=y
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_SMDK2410 is not set
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-# CONFIG_ARCH_VERSATILE is not set
-CONFIG_ARM=y
-CONFIG_ARM_THUMB=y
-# CONFIG_ARPD is not set
-# CONFIG_ATM is not set
-# CONFIG_AUTOFS4_FS is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_CORGI is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BASE_SMALL=0
-# CONFIG_BATTERY_DS2760 is not set
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BITREVERSE=y
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-# CONFIG_BLK_DEV_SR is not set
-# CONFIG_BLK_DEV_SR_VENDOR is not set
-# CONFIG_BLK_DEV_UB is not set
-# CONFIG_BONDING is not set
-# CONFIG_BOOT_PRINTK_DELAY is not set
-CONFIG_BOUNCE=y
-# CONFIG_BRIDGE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBFUSB is not set
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIVHCI is not set
-# CONFIG_CHR_DEV_SG is not set
-# CONFIG_CIFS_STATS is not set
-CONFIG_CIFS_WEAK_PW_HASH=y
-CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
-# CONFIG_CONFIGFS_FS is not set
-# CONFIG_CONNECTOR is not set
-CONFIG_CPU_32=y
-CONFIG_CPU_32v4T=y
-CONFIG_CPU_ABRT_EV4T=y
-CONFIG_CPU_ARM920T=y
-CONFIG_CPU_CACHE_V4WT=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_COPY_V4WB=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-# CONFIG_CPU_ICACHE_DISABLE is not set
-CONFIG_CPU_LLSERIAL_S3C2410=y
-CONFIG_CPU_LLSERIAL_S3C2440=y
-CONFIG_CPU_S3C2410=y
-CONFIG_CPU_S3C2410_DMA=y
-CONFIG_CPU_S3C2440=y
-CONFIG_CPU_S3C2442=y
-CONFIG_CPU_S3C244X=y
-CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CRAMFS=y
-# CONFIG_CRC_ITU_T is not set
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_DES=y
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HMAC=y
-CONFIG_CRYPTO_HW=y
-# CONFIG_CRYPTO_LRW is not set
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MD5=y
-# CONFIG_CRYPTO_PCBC is not set
-# CONFIG_CRYPTO_XCBC is not set
-CONFIG_DAB=y
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_DEBUG_DRIVER is not set
-CONFIG_DEBUG_ERRORS=y
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_LL is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_DEBUG_MUTEXES is not set
-CONFIG_DEBUG_PREEMPT=y
-# CONFIG_DEBUG_RT_MUTEXES is not set
-CONFIG_DEBUG_S3C_UART=2
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_SHIRQ is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_USER is not set
-# CONFIG_DEBUG_VM is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_DETECT_SOFTLOCKUP=y
-# CONFIG_DM9000 is not set
-CONFIG_DNOTIFY=y
-CONFIG_DUMMY_CONSOLE=y
-# CONFIG_EEPROM_93CX6 is not set
-CONFIG_ELF_CORE=y
-# CONFIG_EMBEDDED is not set
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-CONFIG_FAT_FS=y
-# CONFIG_FAULT_INJECTION is not set
-CONFIG_FB=y
-# CONFIG_FB_BACKLIGHT is not set
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_DDC is not set
-CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_S3C2410=y
-# CONFIG_FB_S3C2410_DEBUG is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FB_UVESA is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FIRMWARE_EDID is not set
-CONFIG_FONTS=y
-# CONFIG_FONT_10x18 is not set
-CONFIG_FONT_6x11=y
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_8x16 is not set
-# CONFIG_FONT_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_SUN8x16 is not set
-CONFIG_FORCED_INLINING=y
-# CONFIG_FPE_FASTFPE is not set
-CONFIG_FPE_NWFPE=y
-# CONFIG_FPE_NWFPE_XP is not set
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FRAME_POINTER=y
-CONFIG_FS_POSIX_ACL=y
-# CONFIG_FUSE_FS is not set
-# CONFIG_FW_LOADER is not set
-# CONFIG_GENERIC_CLOCKEVENTS is not set
-CONFIG_GENERIC_GPIO=y
-# CONFIG_GENERIC_TIME is not set
-# CONFIG_HAMRADIO is not set
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_HFS_FS is not set
-CONFIG_HID=y
-CONFIG_HID_SUPPORT=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_HZ=200
-CONFIG_I2C=y
-# CONFIG_I2C_ALGOBIT is not set
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_S3C2410=y
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IDE is not set
-# CONFIG_IEEE80211 is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_INPUT=y
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_GPIO_BUTTONS is not set
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
-CONFIG_INPUT_TOUCHSCREEN=y
-# CONFIG_INPUT_UINPUT is not set
-# CONFIG_INPUT_YEALINK is not set
-CONFIG_INSTRUMENTATION=y
-# CONFIG_IOSCHED_AS is not set
-# CONFIG_IOSCHED_CFQ is not set
-# CONFIG_IP6_NF_QUEUE is not set
-# CONFIG_IP6_NF_RAW is not set
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_NF_MATCH_RECENT is not set
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_RAW is not set
-# CONFIG_IP_NF_TARGET_CLUSTERIP is not set
-CONFIG_IP_PNP=y
-# CONFIG_IP_PNP_BOOTP is not set
-# CONFIG_IP_PNP_DHCP is not set
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_IP_ROUTE_MULTIPATH is not set
-# CONFIG_IP_ROUTE_VERBOSE is not set
-# CONFIG_ISDN is not set
-CONFIG_JBD=y
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_KEXEC=y
-# CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_KMOD=y
-CONFIG_LCD_CLASS_DEVICE=y
-# CONFIG_LCD_LTV350QV is not set
-# CONFIG_LEDS_S3C24XX is not set
-# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-# CONFIG_LLC2 is not set
-CONFIG_LOCKD=y
-CONFIG_LOCK_KERNEL=y
-# CONFIG_LOCK_STAT is not set
-# CONFIG_LOGO is not set
-# CONFIG_MACH_AML_M5900 is not set
-# CONFIG_MACH_ANUBIS is not set
-# CONFIG_MACH_N30 is not set
-# CONFIG_MACH_NEXCODER_2440 is not set
-# CONFIG_MACH_OSIRIS is not set
-# CONFIG_MACH_OTOM is not set
-CONFIG_MACH_QT2410=y
-# CONFIG_MACH_RX3715 is not set
-CONFIG_MACH_SMDK=y
-# CONFIG_MACH_SMDK2412 is not set
-# CONFIG_MACH_SMDK2413 is not set
-# CONFIG_MACH_SMDK2443 is not set
-# CONFIG_MACH_VR1000 is not set
-# CONFIG_MACH_VSTMS is not set
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_MARKERS is not set
-# CONFIG_MINIX_FS is not set
-CONFIG_MMC=y
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_SPI is not set
-CONFIG_MMC_UNSAFE_RESUME=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MOUSE_GPIO is not set
-# CONFIG_MOUSE_PS2 is not set
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-CONFIG_MSDOS_FS=y
-CONFIG_MTD=y
-CONFIG_MTD_ABSENT=y
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_ALAUDA is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_CFI=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-# CONFIG_MTD_CFI_AMDSTD is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_CMDLINE_PARTS=y
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-CONFIG_MTD_NAND=y
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_NAND_S3C2410=y
-# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
-# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
-CONFIG_MTD_NAND_S3C2410_HWECC=y
-CONFIG_MTD_NAND_VERIFY_WRITE=y
-# CONFIG_MTD_ONENAND is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PHRAM is not set
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-CONFIG_MTD_PHYSMAP_LEN=0
-CONFIG_MTD_PHYSMAP_START=0x8000000
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NETFILTER_NETLINK_LOG is not set
-# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-# CONFIG_NET_CLS_ACT is not set
-# CONFIG_NET_CLS_IND is not set
-# CONFIG_NET_CLS_POLICE is not set
-# CONFIG_NET_EMATCH is not set
-# CONFIG_NET_IPGRE_BROADCAST is not set
-CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NET_SCH_RR is not set
-CONFIG_NFS_FS=y
-# CONFIG_NF_CONNTRACK_AMANDA is not set
-# CONFIG_NF_CONNTRACK_ENABLED is not set
-CONFIG_NF_CONNTRACK_EVENTS=y
-# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set
-# CONFIG_NF_CONNTRACK_SANE is not set
-# CONFIG_NF_CT_NETLINK is not set
-# CONFIG_NF_CT_PROTO_SCTP is not set
-# CONFIG_NF_NAT_AMANDA is not set
-CONFIG_NLS=y
-# CONFIG_NLS_CODEPAGE_1250 is not set
-CONFIG_NLS_CODEPAGE_437=y
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-CONFIG_NLS_ISO8859_1=y
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-CONFIG_NO_IDLE_HZ=y
-CONFIG_NO_IOPORT=y
-# CONFIG_NVRAM is not set
-CONFIG_OABI_COMPAT=y
-# CONFIG_OPROFILE is not set
-# CONFIG_OUTER_CACHE is not set
-# CONFIG_PARTITION_ADVANCED is not set
-# CONFIG_PCI_SYSCALL is not set
-# CONFIG_PDA_POWER is not set
-CONFIG_PLAT_S3C=y
-CONFIG_PLAT_S3C24XX=y
-CONFIG_PM=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_LEGACY=y
-CONFIG_PM_SLEEP=y
-# CONFIG_PM_VERBOSE is not set
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-# CONFIG_PPPOE is not set
-# CONFIG_PPPOL2TP is not set
-CONFIG_PREEMPT=y
-CONFIG_PROFILING=y
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-CONFIG_ROMFS_FS=y
-CONFIG_ROOT_NFS=y
-CONFIG_RPCSEC_GSS_KRB5=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DEBUG=y
-# CONFIG_RTC_DRV_CMOS is not set
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_S3C is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_TEST is not set
-# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_LIB=y
-# CONFIG_RT_MUTEX_TESTER is not set
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_S3C2410_CLOCK=y
-CONFIG_S3C2410_DMA=y
-# CONFIG_S3C2410_DMA_DEBUG is not set
-CONFIG_S3C2410_GPIO=y
-CONFIG_S3C2410_PM=y
-# CONFIG_S3C2410_PM_CHECK is not set
-# CONFIG_S3C2410_PM_DEBUG is not set
-# CONFIG_S3C2410_WATCHDOG is not set
-CONFIG_S3C2440_DMA=y
-# CONFIG_S3C_BOOT_ERROR_RESET is not set
-# CONFIG_S3C_BOOT_WATCHDOG is not set
-CONFIG_S3C_LOWLEVEL_UART_PORT=2
-# CONFIG_SCHEDSTATS is not set
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_SCSI_MULTI_LUN is not set
-CONFIG_SCSI_SCAN_ASYNC=y
-# CONFIG_SCSI_WAIT_SCAN is not set
-# CONFIG_SDIO_UART is not set
-# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_S3C2410=y
-CONFIG_SERIAL_S3C2410_CONSOLE=y
-CONFIG_SERIO=y
-# CONFIG_SERIO_RAW is not set
-# CONFIG_SERIO_SERPORT is not set
-CONFIG_SLABINFO=y
-# CONFIG_SMC91X is not set
-CONFIG_SMDK2440_CPU2440=y
-CONFIG_SMDK2440_CPU2442=y
-# CONFIG_SND_S3C24XX_SOC is not set
-# CONFIG_SND_SOC is not set
-CONFIG_SND_SUPPORT_OLD_API=y
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SOFT_WATCHDOG is not set
-CONFIG_SOUND=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-CONFIG_SPI=y
-CONFIG_SPI_BITBANG=y
-CONFIG_SPI_MASTER=y
-CONFIG_SPI_S3C24XX=y
-CONFIG_SPI_S3C24XX_GPIO=y
-# CONFIG_SPI_SPIDEV is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4096
-CONFIG_SSB_POSSIBLE=y
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
-CONFIG_SUSPEND=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_MD5SIG=y
-# CONFIG_TICK_ONESHOT is not set
-CONFIG_TIMER_STATS=y
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-# CONFIG_TOUCHSCREEN_ELO is not set
-# CONFIG_TOUCHSCREEN_FUJITSU is not set
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_UCB1400 is not set
-# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-CONFIG_UID16=y
-CONFIG_USB=y
-# CONFIG_USBPCWATCHDOG is not set
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-# CONFIG_USB_BERRY_CHARGE is not set
-CONFIG_USB_DEVICE_CLASS=y
-CONFIG_USB_EPSON2888=y
-# CONFIG_USB_ETH is not set
-CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_FILE_STORAGE_TEST is not set
-CONFIG_USB_GADGET=y
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_AT91 is not set
-# CONFIG_USB_GADGET_ATMEL_USBA is not set
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DUALSPEED is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-# CONFIG_USB_GADGET_FSL_USB2 is not set
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LH7A40X is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_NET2280 is not set
-# CONFIG_USB_GADGET_OMAP is not set
-# CONFIG_USB_GADGET_PXA2XX is not set
-CONFIG_USB_GADGET_S3C2410=y
-CONFIG_USB_GADGET_SELECTED=y
-# CONFIG_USB_G_SERIAL is not set
-CONFIG_USB_HID=y
-CONFIG_USB_HIDDEV=y
-# CONFIG_USB_IOWARRIOR is not set
-CONFIG_USB_KC2190=y
-CONFIG_USB_LIBUSUAL=y
-# CONFIG_USB_MIDI_GADGET is not set
-CONFIG_USB_MON=y
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-# CONFIG_USB_OHCI_HCD is not set
-# CONFIG_USB_PERSIST is not set
-# CONFIG_USB_RTL8150 is not set
-CONFIG_USB_S3C2410=y
-# CONFIG_USB_S3C2410_DEBUG is not set
-# CONFIG_USB_SERIAL_CH341 is not set
-# CONFIG_USB_SERIAL_OTI6858 is not set
-CONFIG_USB_SUSPEND=y
-# CONFIG_USB_TRANCEVIBRATOR is not set
-CONFIG_USB_USBNET=y
-# CONFIG_USB_ZERO is not set
-# CONFIG_USER_NS is not set
-CONFIG_VECTORS_BASE=0xffff0000
-CONFIG_VFAT_FS=y
-# CONFIG_VGASTATE is not set
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_VIDEO_DEV is not set
-# CONFIG_VLAN_8021Q is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-# CONFIG_W1 is not set
-# CONFIG_WLAN_80211 is not set
-CONFIG_XFRM_MIGRATE=y
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_XIP_KERNEL is not set
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_ZBOOT_ROM_TEXT=0x0
-# CONFIG_ZISOFS is not set
diff --git a/target/linux/s3c24xx/config-2.6.26 b/target/linux/s3c24xx/config-2.6.26
deleted file mode 100644 (file)
index a6a1ce4..0000000
+++ /dev/null
@@ -1,683 +0,0 @@
-CONFIG_AEABI=y
-CONFIG_ALIGNMENT_TRAP=y
-CONFIG_APM_EMULATION=y
-CONFIG_APM_POWER=y
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_BAST is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_CLPS7500 is not set
-# CONFIG_ARCH_CO285 is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_H1940 is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_MSM7X00A is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_RPC is not set
-CONFIG_ARCH_S3C2410=y
-CONFIG_ARCH_S3C2440=y
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_SMDK2410 is not set
-CONFIG_ARCH_SUPPORTS_AOUT=y
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_ARCH_VERSATILE is not set
-CONFIG_ARM=y
-CONFIG_ARM_THUMB=y
-# CONFIG_ARPD is not set
-CONFIG_ATAGS_PROC=y
-# CONFIG_ATM is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_CORGI is not set
-CONFIG_BACKLIGHT_GTA01=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BASE_SMALL=0
-CONFIG_BATTERY_BQ27000_HDQ=y
-# CONFIG_BATTERY_DS2760 is not set
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BITREVERSE=y
-# CONFIG_BLK_DEV_INITRD is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_DEV_SR=y
-# CONFIG_BLK_DEV_SR_VENDOR is not set
-# CONFIG_BONDING is not set
-CONFIG_BOUNCE=y
-# CONFIG_BRIDGE_EBT_NFLOG is not set
-CONFIG_BRIDGE_NETFILTER=y
-# CONFIG_BSD_DISKLABEL is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
-CONFIG_BT=y
-CONFIG_BT_BNEP=y
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBFUSB is not set
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIUART is not set
-CONFIG_BT_HCIUSB=y
-# CONFIG_BT_HCIVHCI is not set
-CONFIG_BT_HIDP=y
-CONFIG_BT_L2CAP=y
-CONFIG_BT_RFCOMM=y
-CONFIG_BT_SCO=y
-CONFIG_CAN_PM_TRACE=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_CHR_DEV_SG=y
-CONFIG_CLASSIC_RCU=y
-CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
-CONFIG_COMPAT_BRK=y
-# CONFIG_CONFIGFS_FS is not set
-CONFIG_CPU_32=y
-CONFIG_CPU_32v4T=y
-CONFIG_CPU_ABRT_EV4T=y
-CONFIG_CPU_ARM920T=y
-CONFIG_CPU_CACHE_V4WT=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_COPY_V4WB=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-# CONFIG_CPU_ICACHE_DISABLE is not set
-CONFIG_CPU_LLSERIAL_S3C2410=y
-CONFIG_CPU_LLSERIAL_S3C2440=y
-CONFIG_CPU_PABRT_NOIFAR=y
-CONFIG_CPU_S3C2410=y
-CONFIG_CPU_S3C2410_DMA=y
-CONFIG_CPU_S3C2440=y
-CONFIG_CPU_S3C2442=y
-CONFIG_CPU_S3C244X=y
-CONFIG_CPU_TLB_V4WBI=y
-# CONFIG_CRC16 is not set
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC_ITU_T is not set
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_ALGAPI=y
-# CONFIG_CRYPTO_ANUBIS is not set
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLOWFISH=y
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-CONFIG_CRYPTO_CAST6=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CRC32C=y
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HMAC=y
-# CONFIG_CRYPTO_KHAZAD is not set
-CONFIG_CRYPTO_MANAGER=y
-# CONFIG_CRYPTO_MD4 is not set
-CONFIG_CRYPTO_MD5=y
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_NULL is not set
-CONFIG_CRYPTO_SERPENT=y
-CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=y
-CONFIG_CRYPTO_SHA512=y
-CONFIG_CRYPTO_TEA=y
-# CONFIG_CRYPTO_TEST is not set
-# CONFIG_CRYPTO_TGR192 is not set
-CONFIG_CRYPTO_TWOFISH=y
-CONFIG_CRYPTO_TWOFISH_COMMON=y
-# CONFIG_CRYPTO_WP512 is not set
-# CONFIG_CS89x0 is not set
-CONFIG_DAB=y
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_S3C_UART=2
-# CONFIG_DEBUG_USER is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-CONFIG_DISPLAY_JBT6K74=y
-CONFIG_DISPLAY_SUPPORT=y
-# CONFIG_DM9000 is not set
-CONFIG_DNOTIFY=y
-CONFIG_DUMMY_CONSOLE=y
-# CONFIG_EEPROM_93CX6 is not set
-CONFIG_ELF_CORE=y
-# CONFIG_EMBEDDED is not set
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-CONFIG_FAT_FS=y
-CONFIG_FB=y
-# CONFIG_FB_BACKLIGHT is not set
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_S3C2410=y
-# CONFIG_FB_S3C2410_DEBUG is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FIQ=y
-# CONFIG_FIRMWARE_EDID is not set
-CONFIG_FONTS=y
-# CONFIG_FONT_10x18 is not set
-CONFIG_FONT_6x11=y
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_8x16 is not set
-# CONFIG_FONT_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FPE_FASTFPE is not set
-CONFIG_FPE_NWFPE=y
-# CONFIG_FPE_NWFPE_XP is not set
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FRAME_POINTER=y
-CONFIG_FUSE_FS=y
-# CONFIG_FW_LOADER is not set
-# CONFIG_GENERIC_CLOCKEVENTS is not set
-# CONFIG_GENERIC_FIND_FIRST_BIT is not set
-# CONFIG_GENERIC_FIND_NEXT_BIT is not set
-CONFIG_GENERIC_GPIO=y
-# CONFIG_GENERIC_TIME is not set
-CONFIG_GTA02_HDQ=y
-# CONFIG_HAMRADIO is not set
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-# CONFIG_HAVE_DMA_ATTRS is not set
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_HFS_FS is not set
-CONFIG_HID=y
-CONFIG_HID_SUPPORT=y
-CONFIG_HWMON=y
-# CONFIG_HWMON_DEBUG_CHIP is not set
-CONFIG_HW_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_HZ=200
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_S3C2410=y
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IDE is not set
-# CONFIG_IEEE80211 is not set
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_INPUT=y
-# CONFIG_INPUT_EVBUG is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_GPIO_BUTTONS is not set
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_INPUT_LIS302DL=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MOUSEDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
-CONFIG_INPUT_TOUCHSCREEN=y
-# CONFIG_INPUT_UINPUT is not set
-# CONFIG_INPUT_YEALINK is not set
-# CONFIG_IOSCHED_AS is not set
-# CONFIG_IOSCHED_CFQ is not set
-# CONFIG_IP6_NF_QUEUE is not set
-# CONFIG_IP6_NF_RAW is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_NF_FILTER is not set
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_MANGLE is not set
-# CONFIG_IP_NF_MATCH_RECENT is not set
-# CONFIG_IP_NF_QUEUE is not set
-# CONFIG_IP_NF_RAW is not set
-# CONFIG_IP_NF_TARGET_REJECT is not set
-CONFIG_IP_PNP=y
-# CONFIG_IP_PNP_BOOTP is not set
-# CONFIG_IP_PNP_DHCP is not set
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_IP_ROUTE_MULTIPATH is not set
-# CONFIG_IP_ROUTE_VERBOSE is not set
-# CONFIG_ISDN is not set
-# CONFIG_ISO9660_FS is not set
-# CONFIG_IWLWIFI_LEDS is not set
-CONFIG_JBD=y
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_KALLSYMS=y
-CONFIG_KEXEC=y
-# CONFIG_KEYBOARD_ATKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_NEO1973=y
-# CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_KEYBOARD_QT2410=y
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_KMOD=y
-# CONFIG_KPROBES is not set
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_LCD_LTV350QV=y
-# CONFIG_LEDS_ALIX is not set
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_NEO1973_GTA02=y
-CONFIG_LEDS_NEO1973_VIBRATOR=y
-# CONFIG_LEDS_S3C24XX is not set
-# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
-# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-CONFIG_LIBCRC32C=y
-# CONFIG_LLC2 is not set
-CONFIG_LOCALVERSION="-mokodev"
-CONFIG_LOCK_KERNEL=y
-# CONFIG_LOGO is not set
-CONFIG_LOG_BUF_SHIFT=17
-# CONFIG_MACH_AML_M5900 is not set
-# CONFIG_MACH_ANUBIS is not set
-# CONFIG_MACH_N30 is not set
-CONFIG_MACH_NEO1973=y
-CONFIG_MACH_NEO1973_GTA01=y
-CONFIG_MACH_NEO1973_GTA02=y
-# CONFIG_MACH_NEXCODER_2440 is not set
-# CONFIG_MACH_OSIRIS is not set
-# CONFIG_MACH_OTOM is not set
-CONFIG_MACH_QT2410=y
-# CONFIG_MACH_RX3715 is not set
-CONFIG_MACH_SMDK=y
-# CONFIG_MACH_SMDK2412 is not set
-# CONFIG_MACH_SMDK2413 is not set
-# CONFIG_MACH_SMDK2443 is not set
-# CONFIG_MACH_TCT_HAMMER is not set
-# CONFIG_MACH_VR1000 is not set
-# CONFIG_MACH_VSTMS is not set
-# CONFIG_MAC_PARTITION is not set
-CONFIG_MARKERS=y
-CONFIG_MFD_GLAMO=y
-CONFIG_MFD_GLAMO_FB=y
-CONFIG_MFD_GLAMO_MCI=y
-CONFIG_MFD_GLAMO_SPI_FB=y
-CONFIG_MFD_GLAMO_SPI_GPIO=y
-# CONFIG_MINIX_FS is not set
-# CONFIG_MINI_FO is not set
-CONFIG_MMC=y
-CONFIG_MMC_BLOCK=y
-# CONFIG_MMC_BLOCK_BOUNCE is not set
-# CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_S3C=y
-# CONFIG_MMC_SPI is not set
-CONFIG_MMC_UNSAFE_RESUME=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MOUSE_GPIO is not set
-# CONFIG_MOUSE_PS2 is not set
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-CONFIG_MSDOS_FS=y
-CONFIG_MTD=y
-CONFIG_MTD_ABSENT=y
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_ALAUDA is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_CFI=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-# CONFIG_MTD_CFI_AMDSTD is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_CMDLINE_PARTS=y
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_CONCAT=y
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-CONFIG_MTD_NAND=y
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_NAND_S3C2410=y
-# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
-# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
-CONFIG_MTD_NAND_S3C2410_HWECC=y
-CONFIG_MTD_NAND_VERIFY_WRITE=y
-# CONFIG_MTD_ONENAND is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PHRAM is not set
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-CONFIG_MTD_PHYSMAP_LEN=0
-CONFIG_MTD_PHYSMAP_START=0x0
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-CONFIG_MTD_ROM=y
-# CONFIG_MTD_SLRAM is not set
-CONFIG_NAMESPACES=y
-# CONFIG_NEO1973_GTA02_2440 is not set
-# CONFIG_NETDEVICES_MULTIQUEUE is not set
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETFILTER_NETLINK is not set
-# CONFIG_NETFILTER_NETLINK_LOG is not set
-# CONFIG_NETFILTER_NETLINK_QUEUE is not set
-# CONFIG_NETFILTER_XTABLES is not set
-# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
-# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
-# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
-# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
-# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
-# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
-# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
-# CONFIG_NET_CLS_ACT is not set
-# CONFIG_NET_CLS_FLOW is not set
-# CONFIG_NET_CLS_IND is not set
-# CONFIG_NET_EMATCH is not set
-# CONFIG_NET_IPGRE_BROADCAST is not set
-CONFIG_NET_KEY_MIGRATE=y
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NF_CONNTRACK is not set
-CONFIG_NLS=y
-# CONFIG_NLS_CODEPAGE_1250 is not set
-CONFIG_NLS_CODEPAGE_437=y
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-CONFIG_NLS_ISO8859_1=y
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-CONFIG_NO_IDLE_HZ=y
-CONFIG_NO_IOPORT=y
-CONFIG_NR_TTY_DEVICES=4
-# CONFIG_NVRAM is not set
-CONFIG_OABI_COMPAT=y
-# CONFIG_OCF_OCF is not set
-# CONFIG_OUTER_CACHE is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-# CONFIG_PCI_SYSCALL is not set
-CONFIG_PDA_POWER=y
-CONFIG_PLAT_S3C=y
-CONFIG_PLAT_S3C24XX=y
-CONFIG_PM=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_SLEEP=y
-CONFIG_PM_VERBOSE=y
-CONFIG_PNP=y
-# CONFIG_PNPACPI is not set
-CONFIG_PNP_DEBUG=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_POWER_SUPPLY_DEBUG=y
-# CONFIG_PPP is not set
-CONFIG_PREEMPT=y
-CONFIG_PROC_PAGE_MONITOR=y
-# CONFIG_RFKILL is not set
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DEBUG=y
-# CONFIG_RTC_DRV_CMOS is not set
-# CONFIG_RTC_DRV_DS1307 is not set
-# CONFIG_RTC_DRV_DS1374 is not set
-# CONFIG_RTC_DRV_DS1553 is not set
-# CONFIG_RTC_DRV_DS1672 is not set
-# CONFIG_RTC_DRV_DS1742 is not set
-# CONFIG_RTC_DRV_ISL1208 is not set
-# CONFIG_RTC_DRV_M41T80 is not set
-# CONFIG_RTC_DRV_M48T59 is not set
-# CONFIG_RTC_DRV_M48T86 is not set
-# CONFIG_RTC_DRV_PCF8563 is not set
-# CONFIG_RTC_DRV_PCF8583 is not set
-# CONFIG_RTC_DRV_RS5C372 is not set
-# CONFIG_RTC_DRV_S3C is not set
-# CONFIG_RTC_DRV_STK17TA8 is not set
-# CONFIG_RTC_DRV_TEST is not set
-# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_X1205 is not set
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_LIB=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_S3C2410_CLOCK=y
-CONFIG_S3C2410_DMA=y
-# CONFIG_S3C2410_DMA_DEBUG is not set
-CONFIG_S3C2410_GPIO=y
-CONFIG_S3C2410_PM=y
-# CONFIG_S3C2410_PM_CHECK is not set
-# CONFIG_S3C2410_PM_DEBUG is not set
-CONFIG_S3C2410_PWM=y
-# CONFIG_S3C2410_WATCHDOG is not set
-CONFIG_S3C2440_C_FIQ=y
-CONFIG_S3C2440_DMA=y
-# CONFIG_S3C_BOOT_ERROR_RESET is not set
-# CONFIG_S3C_BOOT_WATCHDOG is not set
-CONFIG_S3C_LOWLEVEL_UART_PORT=2
-CONFIG_SCSI=y
-CONFIG_SCSI_SCAN_ASYNC=y
-# CONFIG_SCSI_WAIT_SCAN is not set
-CONFIG_SDIO=y
-CONFIG_SDIO_AR6000_WLAN=y
-CONFIG_SDIO_S3C24XX=y
-CONFIG_SDIO_S3C24XX_DMA=y
-# CONFIG_SDIO_UART is not set
-# CONFIG_SENSORS_PC87360 is not set
-CONFIG_SENSORS_PCF50606=y
-CONFIG_SENSORS_PCF50633=y
-# CONFIG_SERIAL_8250 is not set
-CONFIG_SERIAL_S3C2410=y
-CONFIG_SERIAL_S3C2410_CONSOLE=y
-CONFIG_SERIO=y
-# CONFIG_SERIO_RAW is not set
-# CONFIG_SERIO_SERPORT is not set
-CONFIG_SLAB=y
-CONFIG_SLABINFO=y
-# CONFIG_SLUB is not set
-# CONFIG_SMC91X is not set
-CONFIG_SMDK2440_CPU2440=y
-CONFIG_SMDK2440_CPU2442=y
-CONFIG_SND=y
-CONFIG_SND_HWDEP=y
-CONFIG_SND_MIXER_OSS=y
-CONFIG_SND_PCM=y
-CONFIG_SND_PCM_OSS=y
-CONFIG_SND_S3C24XX_SOC=y
-CONFIG_SND_S3C24XX_SOC_I2S=y
-# CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
-CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=y
-CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=y
-CONFIG_SND_SEQUENCER=y
-# CONFIG_SND_SEQUENCER_OSS is not set
-# CONFIG_SND_SEQ_DUMMY is not set
-CONFIG_SND_SOC=y
-CONFIG_SND_SOC_WM8753=y
-CONFIG_SND_TIMER=y
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_VERBOSE_PROCFS is not set
-# CONFIG_SND_VIRMIDI is not set
-# CONFIG_SOFT_WATCHDOG is not set
-CONFIG_SOUND=y
-# CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-CONFIG_SPI=y
-CONFIG_SPI_BITBANG=y
-# CONFIG_SPI_GPIO is not set
-CONFIG_SPI_MASTER=y
-# CONFIG_SPI_S3C24XX is not set
-CONFIG_SPI_S3C24XX_GPIO=y
-# CONFIG_SPI_SPIDEV is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4096
-CONFIG_SSB_POSSIBLE=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_SWAP is not set
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_SYSFS_DEPRECATED_V2=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_MD5SIG=y
-# CONFIG_TICK_ONESHOT is not set
-# CONFIG_TMPFS is not set
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-# CONFIG_TOUCHSCREEN_ELO is not set
-# CONFIG_TOUCHSCREEN_FUJITSU is not set
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-CONFIG_TOUCHSCREEN_S3C2410=y
-# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-# CONFIG_TOUCHSCREEN_UCB1400 is not set
-# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-CONFIG_TUN=y
-# CONFIG_UDF_FS is not set
-CONFIG_UID16=y
-CONFIG_UIO=y
-# CONFIG_UIO_SMX is not set
-CONFIG_USB=y
-CONFIG_USB_ACM=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-CONFIG_USB_DEVICE_CLASS=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_ETH=y
-CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_FILE_STORAGE is not set
-CONFIG_USB_GADGET=y
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_AT91 is not set
-# CONFIG_USB_GADGET_ATMEL_USBA is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DUALSPEED is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-# CONFIG_USB_GADGET_FSL_USB2 is not set
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LH7A40X is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_NET2280 is not set
-# CONFIG_USB_GADGET_OMAP is not set
-# CONFIG_USB_GADGET_PXA27X is not set
-# CONFIG_USB_GADGET_PXA2XX is not set
-CONFIG_USB_GADGET_S3C2410=y
-CONFIG_USB_GADGET_SELECTED=y
-# CONFIG_USB_G_PRINTER is not set
-# CONFIG_USB_G_SERIAL is not set
-CONFIG_USB_HID=y
-# CONFIG_USB_ISIGHTFW is not set
-CONFIG_USB_KC2190=y
-CONFIG_USB_LIBUSUAL=y
-# CONFIG_USB_MIDI_GADGET is not set
-CONFIG_USB_MON=y
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_HCD=y
-# CONFIG_USB_PRINTER is not set
-# CONFIG_USB_RTL8150 is not set
-CONFIG_USB_S3C2410=y
-# CONFIG_USB_S3C2410_DEBUG is not set
-CONFIG_USB_SERIAL=y
-# CONFIG_USB_SERIAL_CH341 is not set
-CONFIG_USB_SERIAL_CONSOLE=y
-# CONFIG_USB_SERIAL_IUU is not set
-# CONFIG_USB_SERIAL_MOTOROLA is not set
-CONFIG_USB_SERIAL_OPTION=y
-# CONFIG_USB_SERIAL_OTI6858 is not set
-# CONFIG_USB_SERIAL_SPCP8X5 is not set
-CONFIG_USB_STORAGE=y
-# CONFIG_USB_STORAGE_ALAUDA is not set
-CONFIG_USB_STORAGE_CYPRESS_ATACB=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_ONETOUCH=y
-CONFIG_USB_SUSPEND=y
-CONFIG_USB_USBNET=y
-# CONFIG_USB_ZERO is not set
-# CONFIG_USER_NS is not set
-CONFIG_VECTORS_BASE=0xffff0000
-CONFIG_VFAT_FS=y
-# CONFIG_VGASTATE is not set
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_VIDEO_DEV is not set
-# CONFIG_VIDEO_MEDIA is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=y
-# CONFIG_VLAN_8021Q is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-# CONFIG_W1 is not set
-# CONFIG_WLAN_80211 is not set
-CONFIG_XFRM_MIGRATE=y
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_XIP_KERNEL is not set
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_ZBOOT_ROM_TEXT=0x0
diff --git a/target/linux/s3c24xx/patches-2.6.24/1001-explicitly-link-notes-section.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1001-explicitly-link-notes-section.patch.patch
deleted file mode 100644 (file)
index 59886a2..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From bc6ec8d17f2f4dcb70bc1a80ea0630eeb5372406 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:29:03 +0100
-Subject: [PATCH] explicitly-link-notes-section.patch
-
-Since 2.6.23 kbuild produces a 3GB arch/arm/boot/Image because it includes a
-.note.gnu.build-id section at address 0 which is followed by 3GB of 0x00.
-The --build-id option is set in the toplevel Makefile.
-This patch explicitly puts the notes section after the TEXT section.
----
- arch/arm/kernel/vmlinux.lds.S |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
-index 5ff5406..e2922fc 100644
---- a/arch/arm/kernel/vmlinux.lds.S
-+++ b/arch/arm/kernel/vmlinux.lds.S
-@@ -105,6 +105,8 @@ SECTIONS
-               *(.got)                 /* Global offset table          */
-       }
-+      NOTES
-+
-       RODATA
-       _etext = .;                     /* End of text and rodata section */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1002-gta01-no_nand_partitions.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1002-gta01-no_nand_partitions.patch.patch
deleted file mode 100644 (file)
index 88b4d37..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-From 219a4d34b71c37a2a23739718924b0915790f44f Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:29:16 +0100
-Subject: [PATCH] gta01-no_nand_partitions.patch
- [PATCH] support mtd NAND commandline partitions for S3C2410
-
-This patch adds support for the mtd NAND core standard method of passing
-partition table information from the bootloader into the kernel by using
-the kernel commandline.
-
-The board specific code can still manually override and provide a fixed
-partition table, so this patch will behave backwards compatible.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
-Acked-byt: Ben Dooks <ben-linux@fluff.org>
----
- drivers/mtd/nand/s3c2410.c |   18 ++++++++++++++++--
- 1 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
-index 66f76e9..355de78 100644
---- a/drivers/mtd/nand/s3c2410.c
-+++ b/drivers/mtd/nand/s3c2410.c
-@@ -559,17 +559,31 @@ static int s3c2410_nand_remove(struct platform_device *pdev)
- }
- #ifdef CONFIG_MTD_PARTITIONS
-+const char *part_probes[] = { "cmdlinepart", NULL };
- static int s3c2410_nand_add_partition(struct s3c2410_nand_info *info,
-                                     struct s3c2410_nand_mtd *mtd,
-                                     struct s3c2410_nand_set *set)
- {
-+      struct mtd_partition *part_info;
-+      int nr_part = 0;
-+
-       if (set == NULL)
-               return add_mtd_device(&mtd->mtd);
--      if (set->nr_partitions > 0 && set->partitions != NULL) {
--              return add_mtd_partitions(&mtd->mtd, set->partitions, set->nr_partitions);
-+      if (set->nr_partitions == 0) {
-+              mtd->mtd.name = set->name;
-+              nr_part = parse_mtd_partitions(&mtd->mtd, part_probes,
-+                                              &part_info, 0);
-+      } else {
-+              if (set->nr_partitions > 0 && set->partitions != NULL) {
-+                      nr_part = set->nr_partitions;
-+                      part_info = set->partitions;
-+              }
-       }
-+      if (nr_part > 0 && part_info)
-+              return add_mtd_partitions(&mtd->mtd, part_info, nr_part);
-+
-       return add_mtd_device(&mtd->mtd);
- }
- #else
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1003-neo1973-soc-include-fix.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1003-neo1973-soc-include-fix.patch.patch
deleted file mode 100644 (file)
index f39e6f0..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-From ad7705d9145d87c6e94006d48d12372bb319f4e7 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:29:27 +0100
-Subject: [PATCH] neo1973-soc-include-fix.patch
- [PATCH] Fix s3c24xx include file path changes in asoc driver
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- sound/soc/s3c24xx/neo1973_wm8753.c |    4 +++-
- sound/soc/s3c24xx/s3c24xx-i2s.c    |    3 ++-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c
-index d5a8fc2..679b99d 100644
---- a/sound/soc/s3c24xx/neo1973_wm8753.c
-+++ b/sound/soc/s3c24xx/neo1973_wm8753.c
-@@ -30,13 +30,15 @@
- #include <asm/mach-types.h>
- #include <asm/hardware/scoop.h>
--#include <asm/arch/regs-iis.h>
- #include <asm/arch/regs-clock.h>
- #include <asm/arch/regs-gpio.h>
- #include <asm/hardware.h>
- #include <asm/arch/audio.h>
- #include <asm/io.h>
- #include <asm/arch/spi-gpio.h>
-+
-+#include <asm/plat-s3c24xx/regs-iis.h>
-+
- #include "../codecs/wm8753.h"
- #include "lm4857.h"
- #include "s3c24xx-pcm.h"
-diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c
-index cd89c41..fe30e0d 100644
---- a/sound/soc/s3c24xx/s3c24xx-i2s.c
-+++ b/sound/soc/s3c24xx/s3c24xx-i2s.c
-@@ -33,13 +33,14 @@
- #include <asm/hardware.h>
- #include <asm/io.h>
--#include <asm/arch/regs-iis.h>
- #include <asm/arch/regs-gpio.h>
- #include <asm/arch/regs-clock.h>
- #include <asm/arch/audio.h>
- #include <asm/dma.h>
- #include <asm/arch/dma.h>
-+#include <asm/plat-s3c24xx/regs-iis.h>
-+
- #include "s3c24xx-pcm.h"
- #include "s3c24xx-i2s.h"
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1004-asoc-neo1973_wm8753-power.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1004-asoc-neo1973_wm8753-power.patch.patch
deleted file mode 100644 (file)
index ffcbfce..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-From dee63031aaa4377dea64113b0f6789ea053087fd Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:29:38 +0100
-Subject: [PATCH] asoc-neo1973_wm8753-power.patch
-
----
- sound/soc/s3c24xx/neo1973_wm8753.c |   32 ++++++++++++++++++++++++++++++++
- 1 files changed, 32 insertions(+), 0 deletions(-)
-
-diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c
-index 679b99d..0289d1d 100644
---- a/sound/soc/s3c24xx/neo1973_wm8753.c
-+++ b/sound/soc/s3c24xx/neo1973_wm8753.c
-@@ -617,6 +617,35 @@ static int lm4857_i2c_attach(struct i2c_adapter *adap)
-       return i2c_probe(adap, &addr_data, lm4857_amp_probe);
- }
-+static u8 lm4857_state;
-+
-+static int lm4857_suspend(struct i2c_client *dev, pm_message_t state)
-+{
-+      dev_dbg(&dev->dev, "lm4857_suspend\n");
-+      lm4857_state = lm4857_regs[LM4857_CTRL] & 0xf;
-+      if (lm4857_state) {
-+              lm4857_regs[LM4857_CTRL] &= 0xf0;
-+              lm4857_write_regs();
-+      }
-+      return 0;
-+}
-+
-+static int lm4857_resume(struct i2c_client *dev)
-+{
-+      if (lm4857_state) {
-+              lm4857_regs[LM4857_CTRL] |= (lm4857_state & 0x0f);
-+              lm4857_write_regs();
-+      }
-+      return 0;
-+}
-+
-+static void lm4857_shutdown(struct i2c_client *dev)
-+{
-+      dev_dbg(&dev->dev, "lm4857_shutdown\n");
-+      lm4857_regs[LM4857_CTRL] &= 0xf0;
-+      lm4857_write_regs();
-+}
-+
- /* corgi i2c codec control layer */
- static struct i2c_driver lm4857_i2c_driver = {
-       .driver = {
-@@ -624,6 +653,9 @@ static struct i2c_driver lm4857_i2c_driver = {
-               .owner = THIS_MODULE,
-       },
-       .id =             I2C_DRIVERID_LM4857,
-+      .suspend =        lm4857_suspend,
-+      .resume =         lm4857_resume,
-+      .shutdown =       lm4857_shutdown,
-       .attach_adapter = lm4857_i2c_attach,
-       .detach_client =  lm4857_i2c_detach,
-       .command =        NULL,
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1005-asoc-core-suspend_resume.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1005-asoc-core-suspend_resume.patch.patch
deleted file mode 100644 (file)
index 6f0f086..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-From 3ebb4e58d6f7a9f2710a4e174a3c8b59f9fa9bd5 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 1 Jun 2007 12:56:55 +0100
-Subject: [PATCH] asoc-core-suspend_resume.patch
- From 6c868238a5e083dca4d74439a7fd467b5c7726b0 Mon Sep 17 00:00:00 2001
- Subject: [PATCH] This fixes a bug whereby PCM's were not being suspended when the rest of the audio subsystem was suspended.
-
----
- include/sound/soc.h  |    3 +++
- sound/soc/soc-core.c |    5 +++++
- 2 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/include/sound/soc.h b/include/sound/soc.h
-index f47ef1f..aedb348 100644
---- a/include/sound/soc.h
-+++ b/include/sound/soc.h
-@@ -410,6 +410,9 @@ struct snd_soc_dai_link  {
-       /* codec/machine specific init - e.g. add machine controls */
-       int (*init)(struct snd_soc_codec *codec);
-+      
-+      /* DAI pcm */
-+      struct snd_pcm *pcm;
- };
- /* SoC machine */
-diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
-index e6a67b5..25f7818 100644
---- a/sound/soc/soc-core.c
-+++ b/sound/soc/soc-core.c
-@@ -639,6 +639,10 @@ static int soc_suspend(struct platform_device *pdev, pm_message_t state)
-                       dai->dai_ops.digital_mute(dai, 1);
-       }
-+      /* suspend all pcm's */
-+      for(i = 0; i < machine->num_links; i++)
-+              snd_pcm_suspend_all(machine->dai_link[i].pcm);
-+
-       if (machine->suspend_pre)
-               machine->suspend_pre(pdev, state);
-@@ -873,6 +877,7 @@ static int soc_new_pcm(struct snd_soc_device *socdev,
-               return ret;
-       }
-+      dai_link->pcm = pcm;
-       pcm->private_data = rtd;
-       soc_pcm_ops.mmap = socdev->platform->pcm_ops->mmap;
-       soc_pcm_ops.pointer = socdev->platform->pcm_ops->pointer;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1006-fix-i2c-s3c2410-resume-race.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1006-fix-i2c-s3c2410-resume-race.patch.patch
deleted file mode 100644 (file)
index 720608e..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-From d3063c1ec65b37b45e808313133196185ea4901f Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:30:03 +0100
-Subject: [PATCH] fix-i2c-s3c2410-resume-race.patch
- fix-i2c-s3c2410-resume-race.patch
-
-There is a nasty race between i2c-s3c2410 resume and resume of I2C
-driver and the client drivers -- the watchdog device actually gets to
-use the dead I2C bus before it is reinitialized by the I2C driver
-resume!  This patch makes sure any customers get turned away until
-the shopkeeper has woken up.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/busses/i2c-s3c2410.c |   35 ++++++++++++++++++++++++++++++++++-
- 1 files changed, 34 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
-index c44ada5..5ac8309 100644
---- a/drivers/i2c/busses/i2c-s3c2410.c
-+++ b/drivers/i2c/busses/i2c-s3c2410.c
-@@ -71,6 +71,8 @@ struct s3c24xx_i2c {
-       struct resource         *irq;
-       struct resource         *ioarea;
-       struct i2c_adapter      adap;
-+
-+      int                     suspended;
- };
- /* default platform data to use if not supplied in the platform_device
-@@ -156,6 +158,14 @@ static inline void s3c24xx_i2c_disable_irq(struct s3c24xx_i2c *i2c)
-       unsigned long tmp;
-       
-       tmp = readl(i2c->regs + S3C2410_IICCON);
-+
-+/* S3c2442 datasheet
-+ *
-+ * If the IICCON[5]=0, IICCON[4] does not operate correctly.
-+ * So, It is recommended that you should set IICCON[5]=1,
-+ * although you does not use the IIC interrupt.
-+ */
-+
-       writel(tmp & ~S3C2410_IICCON_IRQEN, i2c->regs + S3C2410_IICCON);
- }
-@@ -282,7 +292,7 @@ static int i2s_s3c_irq_nextbyte(struct s3c24xx_i2c *i2c, unsigned long iicstat)
-       case STATE_STOP:
-               dev_err(i2c->dev, "%s: called in STATE_STOP\n", __FUNCTION__);
--              s3c24xx_i2c_disable_irq(i2c);           
-+              s3c24xx_i2c_disable_irq(i2c);
-               goto out_ack;
-       case STATE_START:
-@@ -502,6 +512,14 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int
-       unsigned long timeout;
-       int ret;
-+      if (i2c->suspended) {
-+              dev_err(i2c->dev,
-+                  "Hey I am still asleep (suspended: %d), retry later\n",
-+                  i2c->suspended);
-+              ret = -EAGAIN;
-+              goto out;
-+      }
-+
-       ret = s3c24xx_i2c_set_master(i2c);
-       if (ret != 0) {
-               dev_err(i2c->dev, "cannot get bus (error %d)\n", ret);
-@@ -886,6 +904,17 @@ static int s3c24xx_i2c_remove(struct platform_device *pdev)
- }
- #ifdef CONFIG_PM
-+
-+static int s3c24xx_i2c_suspend(struct platform_device *dev, pm_message_t state)
-+{
-+      struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);
-+
-+      if (i2c != NULL)
-+              i2c->suspended++;
-+
-+      return 0;
-+}
-+
- static int s3c24xx_i2c_resume(struct platform_device *dev)
- {
-       struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);
-@@ -893,6 +922,8 @@ static int s3c24xx_i2c_resume(struct platform_device *dev)
-       if (i2c != NULL)
-               s3c24xx_i2c_init(i2c);
-+      i2c->suspended--;
-+
-       return 0;
- }
-@@ -905,6 +936,7 @@ static int s3c24xx_i2c_resume(struct platform_device *dev)
- static struct platform_driver s3c2410_i2c_driver = {
-       .probe          = s3c24xx_i2c_probe,
-       .remove         = s3c24xx_i2c_remove,
-+      .suspend        = s3c24xx_i2c_suspend,
-       .resume         = s3c24xx_i2c_resume,
-       .driver         = {
-               .owner  = THIS_MODULE,
-@@ -915,6 +947,7 @@ static struct platform_driver s3c2410_i2c_driver = {
- static struct platform_driver s3c2440_i2c_driver = {
-       .probe          = s3c24xx_i2c_probe,
-       .remove         = s3c24xx_i2c_remove,
-+      .suspend        = s3c24xx_i2c_suspend,
-       .resume         = s3c24xx_i2c_resume,
-       .driver         = {
-               .owner  = THIS_MODULE,
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1007-resume-timers-wq.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1007-resume-timers-wq.patch.patch
deleted file mode 100644 (file)
index e7ce35e..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-From fa1e8c2fc849472cddb65bc3138944382b320589 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:30:15 +0100
-Subject: [PATCH] resume-timers-wq.patch
- The initialization of clocks uses mutexes, but we execute the resume in
- an interrupt context. We therefore have to hand this task to a non-interrupt.
-
-Adapted from a patch by Andy Green.
----
- arch/arm/plat-s3c24xx/time.c |   18 +++++++++++++++++-
- 1 files changed, 17 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/time.c b/arch/arm/plat-s3c24xx/time.c
-index 2ec1daa..c11d0dd 100644
---- a/arch/arm/plat-s3c24xx/time.c
-+++ b/arch/arm/plat-s3c24xx/time.c
-@@ -255,8 +255,24 @@ static void __init s3c2410_timer_init (void)
-       setup_irq(IRQ_TIMER4, &s3c2410_timer_irq);
- }
-+static void s3c2410_timer_resume_work(struct work_struct *work)
-+{
-+      s3c2410_timer_setup();
-+}
-+
-+static void s3c2410_timer_resume(void)
-+{
-+      static DECLARE_WORK(work, s3c2410_timer_resume_work);
-+      int res;
-+
-+      res = schedule_work(&work);
-+      if (!res)
-+              printk(KERN_ERR
-+                  "s3c2410_timer_resume_work already queued ???\n");
-+}
-+
- struct sys_timer s3c24xx_timer = {
-       .init           = s3c2410_timer_init,
-       .offset         = s3c2410_gettimeoffset,
--      .resume         = s3c2410_timer_setup
-+      .resume         = s3c2410_timer_resume,
- };
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1008-wm8753-rout2-inv.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1008-wm8753-rout2-inv.patch.patch
deleted file mode 100644 (file)
index 07649e1..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2f6a766ce9bfa4e593b1f88b564f91486cd96f80 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:30:27 +0100
-Subject: [PATCH] wm8753-rout2-inv.patch
-
----
- sound/soc/codecs/wm8753.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
-index efced93..52207d5 100644
---- a/sound/soc/codecs/wm8753.c
-+++ b/sound/soc/codecs/wm8753.c
-@@ -198,6 +198,7 @@ static const char *wm8753_mic_sel[] = {"Mic 1", "Mic 2", "Mic 3"};
- static const char *wm8753_dai_mode[] = {"DAI 0", "DAI 1", "DAI 2", "DAI 3"};
- static const char *wm8753_dat_sel[] = {"Stereo", "Left ADC", "Right ADC",
-       "Channel Swap"};
-+static const char *wm8753_rout2_phase[] = {"Non Inverted", "Inverted"};
- static const struct soc_enum wm8753_enum[] = {
- SOC_ENUM_SINGLE(WM8753_BASS, 7, 2, wm8753_base),
-@@ -228,6 +229,7 @@ SOC_ENUM_SINGLE(WM8753_ADC, 4, 2, wm8753_adc_filter),
- SOC_ENUM_SINGLE(WM8753_MICBIAS, 6, 3, wm8753_mic_sel),
- SOC_ENUM_SINGLE(WM8753_IOCTL, 2, 4, wm8753_dai_mode),
- SOC_ENUM_SINGLE(WM8753_ADC, 7, 4, wm8753_dat_sel),
-+SOC_ENUM_SINGLE(WM8753_OUTCTL, 2, 2, wm8753_rout2_phase),
- };
-@@ -328,6 +330,7 @@ SOC_SINGLE("Mic1 Capture Volume", WM8753_INCTL1, 5, 3, 0),
- SOC_ENUM_EXT("DAI Mode", wm8753_enum[26], wm8753_get_dai, wm8753_set_dai),
- SOC_ENUM("ADC Data Select", wm8753_enum[27]),
-+SOC_ENUM("ROUT2 Phase", wm8753_enum[28]),
- };
- /* add non dapm controls */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1009-s3c2410-bbt.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1009-s3c2410-bbt.patch.patch
deleted file mode 100644 (file)
index bfa3d1c..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From 8e01740813dc6a1d804e61d303549b04e160d153 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:30:37 +0100
-Subject: [PATCH] s3c2410-bbt.patch
- [PATCH] Add Kconfig option to enable NAND bad-block-table support for s3c2410
-
-This patch adds a new CONFIG_MTD_NAND_S3C2410_BBT which, if enabled,
-asks the mtd NAND core to use a bad-block table.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- drivers/mtd/nand/s3c2410.c      |    6 +++++-
- include/asm-arm/plat-s3c/nand.h |    3 +++
- 2 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
-index 355de78..770306c 100644
---- a/drivers/mtd/nand/s3c2410.c
-+++ b/drivers/mtd/nand/s3c2410.c
-@@ -612,9 +612,13 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,
-       chip->select_chip  = s3c2410_nand_select_chip;
-       chip->chip_delay   = 50;
-       chip->priv         = nmtd;
--      chip->options      = 0;
-       chip->controller   = &info->controller;
-+      if (set->flags & S3C2410_NAND_BBT)
-+              chip->options      = NAND_USE_FLASH_BBT;
-+      else
-+              chip->options      = 0;
-+
-       switch (info->cpu_type) {
-       case TYPE_S3C2410:
-               chip->IO_ADDR_W = regs + S3C2410_NFDATA;
-diff --git a/include/asm-arm/plat-s3c/nand.h b/include/asm-arm/plat-s3c/nand.h
-index 8816f7f..cb87f9e 100644
---- a/include/asm-arm/plat-s3c/nand.h
-+++ b/include/asm-arm/plat-s3c/nand.h
-@@ -21,9 +21,12 @@
-  * partitions  = mtd partition list
- */
-+#define S3C2410_NAND_BBT      0x0001
-+
- struct s3c2410_nand_set {
-       int                     nr_chips;
-       int                     nr_partitions;
-+      unsigned int            flags;
-       char                    *name;
-       int                     *nr_map;
-       struct mtd_partition    *partitions;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1010-gta01-pcf50606.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1010-gta01-pcf50606.patch.patch
deleted file mode 100644 (file)
index afd0980..0000000
+++ /dev/null
@@ -1,2443 +0,0 @@
-From 926f25b2e7e1a96e3aa6c8ca38925b35f67dcbc7 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:30:52 +0100
-Subject: [PATCH] gta01-pcf50606.patch
- This is a NXP PCF50606 power management unit driver.
-
-The PCF50606 is used in the FIC/OpenMoko Neo1973 GTA01 GSM phone.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- drivers/i2c/chips/Kconfig    |   11 +
- drivers/i2c/chips/Makefile   |    1 +
- drivers/i2c/chips/pcf50606.c | 1945 ++++++++++++++++++++++++++++++++++++++++++
- drivers/i2c/chips/pcf50606.h |  302 +++++++
- include/linux/i2c-id.h       |    1 +
- include/linux/pcf50606.h     |  108 +++
- 6 files changed, 2368 insertions(+), 0 deletions(-)
- create mode 100644 drivers/i2c/chips/pcf50606.c
- create mode 100644 drivers/i2c/chips/pcf50606.h
- create mode 100644 include/linux/pcf50606.h
-
-diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
-index 2e1c24f..c0011fc 100644
---- a/drivers/i2c/chips/Kconfig
-+++ b/drivers/i2c/chips/Kconfig
-@@ -51,6 +51,17 @@ config SENSORS_EEPROM
-         This driver can also be built as a module.  If so, the module
-         will be called eeprom.
-+config SENSORS_PCF50606
-+      tristate "Philips/NXP PCF50606"
-+      depends on I2C
-+      help
-+        If you say yes here you get support for Philips/NXP PCF50606
-+        PMU (Power Management Unit) chips.
-+
-+        This driver can also be built as a module.  If so, the module
-+        will be called pcf50606.
-+
-+
- config SENSORS_PCF8574
-       tristate "Philips PCF8574 and PCF8574A"
-       depends on EXPERIMENTAL
-diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
-index ca924e1..864e6cf 100644
---- a/drivers/i2c/chips/Makefile
-+++ b/drivers/i2c/chips/Makefile
-@@ -9,6 +9,7 @@ obj-$(CONFIG_SENSORS_EEPROM)   += eeprom.o
- obj-$(CONFIG_SENSORS_MAX6875) += max6875.o
- obj-$(CONFIG_SENSORS_M41T00)  += m41t00.o
- obj-$(CONFIG_SENSORS_PCA9539) += pca9539.o
-+obj-$(CONFIG_SENSORS_PCF50606)        += pcf50606.o
- obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o
- obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o
- obj-$(CONFIG_ISP1301_OMAP)    += isp1301_omap.o
-diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
-new file mode 100644
-index 0000000..6626c68
---- /dev/null
-+++ b/drivers/i2c/chips/pcf50606.c
-@@ -0,0 +1,1945 @@
-+/* Philips/NXP PCF50606 Power Management Unit (PMU) driver
-+ *
-+ * (C) 2006-2007 by OpenMoko, Inc.
-+ * Authors: Harald Welte <laforge@openmoko.org>,
-+ *        Matt Hsu <matt@openmoko.org>
-+ * 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
-+ *
-+ * This driver is a monster ;) It provides the following features
-+ * - voltage control for a dozen different voltage domains
-+ * - charging control for main and backup battery
-+ * - rtc / alarm
-+ * - watchdog
-+ * - adc driver (hw_sensors like)
-+ * - pwm driver
-+ * - backlight
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/i2c.h>
-+#include <linux/types.h>
-+#include <linux/interrupt.h>
-+#include <linux/irq.h>
-+#include <linux/workqueue.h>
-+#include <linux/rtc.h>
-+#include <linux/bcd.h>
-+#include <linux/watchdog.h>
-+#include <linux/miscdevice.h>
-+#include <linux/input.h>
-+#include <linux/fb.h>
-+#include <linux/backlight.h>
-+#include <linux/sched.h>
-+#include <linux/platform_device.h>
-+#include <linux/pcf50606.h>
-+#include <linux/apm-emulation.h>
-+
-+#include <asm/mach-types.h>
-+#include <asm/arch/gta01.h>
-+
-+#include "pcf50606.h"
-+
-+/* we use dev_dbg() throughout the code, but sometimes don't want to
-+ * write an entire line of debug related information.  This DEBUGPC
-+ * macro is a continuation for dev_dbg() */
-+#ifdef DEBUG
-+#define DEBUGPC(x, args ...) printk(x, ## args)
-+#else
-+#define DEBUGPC(x, args ...)
-+#endif
-+
-+/***********************************************************************
-+ * Static data / structures
-+ ***********************************************************************/
-+
-+static unsigned short normal_i2c[] = { 0x08, I2C_CLIENT_END };
-+
-+I2C_CLIENT_INSMOD_1(pcf50606);
-+
-+#define PCF50606_F_CHG_FAST   0x00000001      /* Charger Fast allowed */
-+#define PCF50606_F_CHG_PRESENT        0x00000002      /* Charger present */
-+#define PCF50606_F_CHG_FOK    0x00000004      /* Fast OK for battery */
-+#define PCF50606_F_CHG_ERR    0x00000008      /* Charger Error */
-+#define PCF50606_F_CHG_PROT   0x00000010      /* Charger Protection */
-+#define PCF50606_F_CHG_READY  0x00000020      /* Charging completed */
-+#define PCF50606_F_CHG_MASK   0x000000fc
-+
-+#define PCF50606_F_PWR_PRESSED        0x00000100
-+#define PCF50606_F_RTC_SECOND 0x00000200
-+
-+enum close_state {
-+      CLOSE_STATE_NOT,
-+      CLOSE_STATE_ALLOW = 0x2342,
-+};
-+
-+struct pcf50606_data {
-+      struct i2c_client client;
-+      struct pcf50606_platform_data *pdata;
-+      struct backlight_device *backlight;
-+      struct mutex lock;
-+      unsigned int flags;
-+      unsigned int working;
-+      struct mutex working_lock;
-+      struct work_struct work;
-+      struct rtc_device *rtc;
-+      struct input_dev *input_dev;
-+      int allow_close;
-+      int onkey_seconds;
-+      int irq;
-+#ifdef CONFIG_PM
-+      struct {
-+              u_int8_t dcdc1, dcdc2;
-+              u_int8_t dcdec1;
-+              u_int8_t dcudc1;
-+              u_int8_t ioregc;
-+              u_int8_t d1regc1;
-+              u_int8_t d2regc1;
-+              u_int8_t d3regc1;
-+              u_int8_t lpregc1;
-+              u_int8_t adcc1, adcc2;
-+              u_int8_t pwmc1;
-+              u_int8_t int1m, int2m, int3m;
-+      } standby_regs;
-+#endif
-+};
-+
-+static struct i2c_driver pcf50606_driver;
-+
-+/* This is an ugly construct on how to access the (currently single/global)
-+ * pcf50606 handle from other code in the kernel.  I didn't really come up with
-+ * a more decent method of dynamically resolving this */
-+struct pcf50606_data *pcf50606_global;
-+EXPORT_SYMBOL_GPL(pcf50606_global);
-+
-+static struct platform_device *pcf50606_pdev;
-+
-+/* This is a 10k, B=3370 NTC Thermistor -10..79 centigrade */
-+/* Table entries are offset by +0.5C so a properly rounded value is generated */
-+static const u_int16_t ntc_table_10k_3370B[] = {
-+      /* -10 */
-+      43888, 41819, 39862, 38010, 36257, 34596, 33024, 31534, 30121, 28781,
-+      27510, 26304, 25159, 24071, 23038, 22056, 21122, 20234, 19390, 18586,
-+      17821, 17093, 16399, 15738, 15107, 14506, 13933, 13387, 12865, 12367,
-+      11891, 11437, 11003, 10588, 10192, 9813, 9450, 9103, 8771, 8453,
-+      8149, 7857, 7578, 7310, 7054, 6808, 6572, 6346, 6129, 5920,
-+      5720, 5528, 5344, 5167, 4996, 4833, 4675, 4524, 4379, 4239,
-+      4104, 3975, 3850, 3730, 3614, 3503, 3396, 3292, 3193, 3097,
-+      3004, 2915, 2829, 2745, 2665, 2588, 2513, 2441, 2371, 2304,
-+      2239, 2176, 2116, 2057, 2000, 1945, 1892, 1841, 1791, 1743,
-+};
-+
-+
-+/***********************************************************************
-+ * Low-Level routines
-+ ***********************************************************************/
-+
-+static inline int __reg_write(struct pcf50606_data *pcf, u_int8_t reg,
-+                            u_int8_t val)
-+{
-+      return i2c_smbus_write_byte_data(&pcf->client, reg, val);
-+}
-+
-+static int reg_write(struct pcf50606_data *pcf, u_int8_t reg, u_int8_t val)
-+{
-+      int ret;
-+
-+      mutex_lock(&pcf->lock);
-+      ret = __reg_write(pcf, reg, val);
-+      mutex_unlock(&pcf->lock);
-+
-+      return ret;
-+}
-+
-+static inline int32_t __reg_read(struct pcf50606_data *pcf, u_int8_t reg)
-+{
-+      int32_t ret;
-+
-+      ret = i2c_smbus_read_byte_data(&pcf->client, reg);
-+
-+      return ret;
-+}
-+
-+static u_int8_t reg_read(struct pcf50606_data *pcf, u_int8_t reg)
-+{
-+      int32_t ret;
-+
-+      mutex_lock(&pcf->lock);
-+      ret = __reg_read(pcf, reg);
-+      mutex_unlock(&pcf->lock);
-+
-+      return ret & 0xff;
-+}
-+
-+static int reg_set_bit_mask(struct pcf50606_data *pcf,
-+                          u_int8_t reg, u_int8_t mask, u_int8_t val)
-+{
-+      int ret;
-+      u_int8_t tmp;
-+
-+      val &= mask;
-+
-+      mutex_lock(&pcf->lock);
-+
-+      tmp = __reg_read(pcf, reg);
-+      tmp &= ~mask;
-+      tmp |= val;
-+      ret = __reg_write(pcf, reg, tmp);
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      return ret;
-+}
-+
-+static int reg_clear_bits(struct pcf50606_data *pcf, u_int8_t reg, u_int8_t val)
-+{
-+      int ret;
-+      u_int8_t tmp;
-+
-+      mutex_lock(&pcf->lock);
-+
-+      tmp = __reg_read(pcf, reg);
-+      tmp &= ~val;
-+      ret = __reg_write(pcf, reg, tmp);
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      return ret;
-+}
-+
-+/* synchronously read one ADC channel (busy-wait for result to be complete) */
-+static u_int16_t adc_read(struct pcf50606_data *pcf,  int channel,
-+                        u_int16_t *data2)
-+{
-+      u_int8_t adcs2, adcs1;
-+      u_int16_t ret;
-+
-+      dev_dbg(&pcf->client.dev, "entering (pcf=%p, channel=%u, data2=%p)\n",
-+              pcf, channel, data2);
-+
-+      channel &= PCF50606_ADCC2_ADCMUX_MASK;
-+
-+      mutex_lock(&pcf->lock);
-+
-+      /* start ADC conversion of selected channel */
-+      __reg_write(pcf, PCF50606_REG_ADCC2, channel |
-+                  PCF50606_ADCC2_ADCSTART | PCF50606_ADCC2_RES_10BIT);
-+
-+      do {
-+              adcs2 = __reg_read(pcf, PCF50606_REG_ADCS2);
-+      } while (!(adcs2 & PCF50606_ADCS2_ADCRDY));
-+
-+      adcs1 = __reg_read(pcf, PCF50606_REG_ADCS1);
-+      ret = (adcs1 << 2) | (adcs2 & 0x03);
-+
-+      if (data2) {
-+              adcs1 = __reg_read(pcf, PCF50606_REG_ADCS3);
-+              *data2 = (adcs1 << 2) | ((adcs2 & 0x0c) >> 2);
-+      }
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      dev_dbg(&pcf->client.dev, "returning %u %u\n", ret,
-+              data2 ? *data2 : 0);
-+
-+      return ret;
-+}
-+
-+/***********************************************************************
-+ * Voltage / ADC
-+ ***********************************************************************/
-+
-+static u_int8_t dcudc_voltage(unsigned int millivolts)
-+{
-+      if (millivolts < 900)
-+              return 0;
-+      if (millivolts > 5500)
-+              return 0x1f;
-+      if (millivolts <= 3300) {
-+              millivolts -= 900;
-+              return millivolts/300;
-+      }
-+      if (millivolts < 4000)
-+              return 0x0f;
-+      else {
-+              millivolts -= 4000;
-+              return millivolts/100;
-+      }
-+}
-+
-+static unsigned int dcudc_2voltage(u_int8_t bits)
-+{
-+      bits &= 0x1f;
-+      if (bits < 0x08)
-+              return 900 + bits * 300;
-+      else if (bits < 0x10)
-+              return 3300;
-+      else
-+              return 4000 + bits * 100;
-+}
-+
-+static u_int8_t dcdec_voltage(unsigned int millivolts)
-+{
-+      if (millivolts < 900)
-+              return 0;
-+      else if (millivolts > 3300)
-+              return 0x0f;
-+
-+      millivolts -= 900;
-+      return millivolts/300;
-+}
-+
-+static unsigned int dcdec_2voltage(u_int8_t bits)
-+{
-+      bits &= 0x0f;
-+      return 900 + bits*300;
-+}
-+
-+static u_int8_t dcdc_voltage(unsigned int millivolts)
-+{
-+      if (millivolts < 900)
-+              return 0;
-+      else if (millivolts > 3600)
-+              return 0x1f;
-+
-+      if (millivolts < 1500) {
-+              millivolts -= 900;
-+              return millivolts/25;
-+      } else {
-+              millivolts -= 1500;
-+              return 0x18 + millivolts/300;
-+      }
-+}
-+
-+static unsigned int dcdc_2voltage(u_int8_t bits)
-+{
-+      bits &= 0x1f;
-+      if ((bits & 0x18) == 0x18)
-+              return 1500 + ((bits & 0x7) * 300);
-+      else
-+              return 900 + (bits * 25);
-+}
-+
-+static u_int8_t dx_voltage(unsigned int millivolts)
-+{
-+      if (millivolts < 900)
-+              return 0;
-+      else if (millivolts > 3300)
-+              return 0x18;
-+
-+      millivolts -= 900;
-+      return millivolts/100;
-+}
-+
-+static unsigned int dx_2voltage(u_int8_t bits)
-+{
-+      bits &= 0x1f;
-+      return 900 + (bits * 100);
-+}
-+
-+static const u_int8_t regulator_registers[__NUM_PCF50606_REGULATORS] = {
-+      [PCF50606_REGULATOR_DCD]        = PCF50606_REG_DCDC1,
-+      [PCF50606_REGULATOR_DCDE]       = PCF50606_REG_DCDEC1,
-+      [PCF50606_REGULATOR_DCUD]       = PCF50606_REG_DCUDC1,
-+      [PCF50606_REGULATOR_D1REG]      = PCF50606_REG_D1REGC1,
-+      [PCF50606_REGULATOR_D2REG]      = PCF50606_REG_D2REGC1,
-+      [PCF50606_REGULATOR_D3REG]      = PCF50606_REG_D3REGC1,
-+      [PCF50606_REGULATOR_LPREG]      = PCF50606_REG_LPREGC1,
-+      [PCF50606_REGULATOR_IOREG]      = PCF50606_REG_IOREGC,
-+};
-+
-+int pcf50606_onoff_set(struct pcf50606_data *pcf,
-+                     enum pcf50606_regulator_id reg, int on)
-+{
-+      u_int8_t addr;
-+
-+      if (reg >= __NUM_PCF50606_REGULATORS)
-+              return -EINVAL;
-+
-+      /* IOREG cannot be powered off since it powers the PMU I2C */
-+      if (reg == PCF50606_REGULATOR_IOREG)
-+              return -EIO;
-+
-+      addr = regulator_registers[reg];
-+
-+      if (on == 0)
-+              reg_set_bit_mask(pcf, addr, 0xe0, 0x00);
-+      else
-+              reg_set_bit_mask(pcf, addr, 0xe0, 0xe0);
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(pcf50606_onoff_set);
-+
-+int pcf50606_onoff_get(struct pcf50606_data *pcf,
-+                     enum pcf50606_regulator_id reg)
-+{
-+      u_int8_t val, addr;
-+
-+      if (reg >= __NUM_PCF50606_REGULATORS)
-+              return -EINVAL;
-+
-+      addr = regulator_registers[reg];
-+      val = (reg_read(pcf, addr) & 0xe0) >> 5;
-+
-+      /* PWREN1 = 1, PWREN2 = 1, see table 16 of datasheet */
-+      switch (val) {
-+      case 0:
-+      case 5:
-+              return 0;
-+      default:
-+              return 1;
-+      }
-+}
-+EXPORT_SYMBOL_GPL(pcf50606_onoff_get);
-+
-+int pcf50606_voltage_set(struct pcf50606_data *pcf,
-+                       enum pcf50606_regulator_id reg,
-+                       unsigned int millivolts)
-+{
-+      u_int8_t volt_bits;
-+      u_int8_t regnr;
-+      int rc;
-+
-+      dev_dbg(&pcf->client.dev, "pcf=%p, reg=%d, mvolts=%d\n", pcf, reg,
-+              millivolts);
-+
-+      if (reg >= __NUM_PCF50606_REGULATORS)
-+              return -EINVAL;
-+
-+      if (millivolts > pcf->pdata->rails[reg].voltage.max)
-+              return -EINVAL;
-+
-+      switch (reg) {
-+      case PCF50606_REGULATOR_DCD:
-+              volt_bits = dcdc_voltage(millivolts);
-+              rc = reg_set_bit_mask(pcf, PCF50606_REG_DCDC1, 0x1f,
-+                                    volt_bits);
-+              break;
-+      case PCF50606_REGULATOR_DCDE:
-+              volt_bits = dcdec_voltage(millivolts);
-+              rc = reg_set_bit_mask(pcf, PCF50606_REG_DCDEC1, 0x0f,
-+                                    volt_bits);
-+              break;
-+      case PCF50606_REGULATOR_DCUD:
-+              volt_bits = dcudc_voltage(millivolts);
-+              rc = reg_set_bit_mask(pcf, PCF50606_REG_DCUDC1, 0x1f,
-+                                    volt_bits);
-+              break;
-+      case PCF50606_REGULATOR_D1REG:
-+      case PCF50606_REGULATOR_D2REG:
-+      case PCF50606_REGULATOR_D3REG:
-+              regnr = PCF50606_REG_D1REGC1 + (reg - PCF50606_REGULATOR_D1REG);
-+              volt_bits = dx_voltage(millivolts);
-+              rc = reg_set_bit_mask(pcf, regnr, 0x1f, volt_bits);
-+              break;
-+      case PCF50606_REGULATOR_LPREG:
-+              volt_bits = dx_voltage(millivolts);
-+              rc = reg_set_bit_mask(pcf, PCF50606_REG_LPREGC1, 0x1f,
-+                                    volt_bits);
-+              break;
-+      case PCF50606_REGULATOR_IOREG:
-+              if (millivolts < 1800)
-+                      return -EINVAL;
-+              volt_bits = dx_voltage(millivolts);
-+              rc = reg_set_bit_mask(pcf, PCF50606_REG_IOREGC, 0x1f,
-+                                    volt_bits);
-+              break;
-+      default:
-+              return -EINVAL;
-+      }
-+
-+      return rc;
-+}
-+EXPORT_SYMBOL_GPL(pcf50606_voltage_set);
-+
-+unsigned int pcf50606_voltage_get(struct pcf50606_data *pcf,
-+                       enum pcf50606_regulator_id reg)
-+{
-+      u_int8_t volt_bits;
-+      u_int8_t regnr;
-+      unsigned int rc = 0;
-+
-+      if (reg >= __NUM_PCF50606_REGULATORS)
-+              return -EINVAL;
-+
-+      switch (reg) {
-+      case PCF50606_REGULATOR_DCD:
-+              volt_bits = reg_read(pcf, PCF50606_REG_DCDC1) & 0x1f;
-+              rc = dcdc_2voltage(volt_bits);
-+              break;
-+      case PCF50606_REGULATOR_DCDE:
-+              volt_bits = reg_read(pcf, PCF50606_REG_DCDEC1) & 0x0f;
-+              rc = dcdec_2voltage(volt_bits);
-+              break;
-+      case PCF50606_REGULATOR_DCUD:
-+              volt_bits = reg_read(pcf, PCF50606_REG_DCUDC1) & 0x1f;
-+              rc = dcudc_2voltage(volt_bits);
-+              break;
-+      case PCF50606_REGULATOR_D1REG:
-+      case PCF50606_REGULATOR_D2REG:
-+      case PCF50606_REGULATOR_D3REG:
-+              regnr = PCF50606_REG_D1REGC1 + (reg - PCF50606_REGULATOR_D1REG);
-+              volt_bits = reg_read(pcf, regnr) & 0x1f;
-+              if (volt_bits > 0x18)
-+                      volt_bits = 0x18;
-+              rc = dx_2voltage(volt_bits);
-+              break;
-+      case PCF50606_REGULATOR_LPREG:
-+              volt_bits = reg_read(pcf, PCF50606_REG_LPREGC1) & 0x1f;
-+              if (volt_bits > 0x18)
-+                      volt_bits = 0x18;
-+              rc = dx_2voltage(volt_bits);
-+              break;
-+      case PCF50606_REGULATOR_IOREG:
-+              volt_bits = reg_read(pcf, PCF50606_REG_IOREGC) & 0x1f;
-+              if (volt_bits > 0x18)
-+                      volt_bits = 0x18;
-+              rc = dx_2voltage(volt_bits);
-+              break;
-+      default:
-+              return -EINVAL;
-+      }
-+
-+      return rc;
-+}
-+EXPORT_SYMBOL_GPL(pcf50606_voltage_get);
-+
-+/* go into 'STANDBY' mode, i.e. power off the main CPU and peripherals */
-+void pcf50606_go_standby(void)
-+{
-+      reg_write(pcf50606_global, PCF50606_REG_OOCC1,
-+                PCF50606_OOCC1_GOSTDBY);
-+}
-+EXPORT_SYMBOL_GPL(pcf50606_go_standby);
-+
-+void pcf50606_gpo0_set(struct pcf50606_data *pcf, int on)
-+{
-+      u_int8_t val;
-+
-+      if (on)
-+              val = 0x07;
-+      else
-+              val = 0x0f;
-+
-+      reg_set_bit_mask(pcf, PCF50606_REG_GPOC1, 0x0f, val);
-+}
-+EXPORT_SYMBOL_GPL(pcf50606_gpo0_set);
-+
-+int pcf50606_gpo0_get(struct pcf50606_data *pcf)
-+{
-+      u_int8_t reg = reg_read(pcf, PCF50606_REG_GPOC1) & 0x0f;
-+
-+      if (reg == 0x07 || reg == 0x08)
-+              return 1;
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(pcf50606_gpo0_get);
-+
-+static void pcf50606_work(struct work_struct *work)
-+{
-+      struct pcf50606_data *pcf =
-+                      container_of(work, struct pcf50606_data, work);
-+      u_int8_t pcfirq[3];
-+      int ret;
-+
-+      mutex_lock(&pcf->working_lock);
-+      pcf->working = 1;
-+      /*
-+       * p35 pcf50606 datasheet rev 2.2:
-+       * ''The system controller shall read all interrupt registers in
-+       *   one I2C read action''
-+       * because if you don't INT# gets stuck asserted forever after a
-+       * while
-+       */
-+      ret = i2c_smbus_read_i2c_block_data(&pcf->client, PCF50606_REG_INT1, 3,
-+                                          pcfirq);
-+      if (ret != 3)
-+              DEBUGPC("Oh crap PMU IRQ register read failed %d\n", ret);
-+
-+      dev_dbg(&pcf->client.dev, "INT1=0x%02x INT2=0x%02x INT3=0x%02x:",
-+              pcfirq[0], pcfirq[1], pcfirq[2]);
-+
-+      if (pcfirq[0] & PCF50606_INT1_ONKEYF) {
-+              /* ONKEY falling edge (start of button press) */
-+              DEBUGPC("ONKEYF ");
-+              pcf->flags |= PCF50606_F_PWR_PRESSED;
-+              input_report_key(pcf->input_dev, KEY_POWER, 1);
-+      }
-+      if (pcfirq[0] & PCF50606_INT1_ONKEY1S) {
-+              /* ONKEY pressed for more than 1 second */
-+              pcf->onkey_seconds = 0;
-+              DEBUGPC("ONKEY1S ");
-+              /* Tell PMU we are taking care of this */
-+              reg_set_bit_mask(pcf, PCF50606_REG_OOCC1,
-+                               PCF50606_OOCC1_TOTRST,
-+                               PCF50606_OOCC1_TOTRST);
-+              /* enable SECOND interrupt (hz tick) */
-+              reg_clear_bits(pcf, PCF50606_REG_INT1M, PCF50606_INT1_SECOND);
-+      }
-+      if (pcfirq[0] & PCF50606_INT1_ONKEYR) {
-+              /* ONKEY rising edge (end of button press) */
-+              DEBUGPC("ONKEYR ");
-+              pcf->flags &= ~PCF50606_F_PWR_PRESSED;
-+              pcf->onkey_seconds = -1;
-+              input_report_key(pcf->input_dev, KEY_POWER, 0);
-+              /* disable SECOND interrupt in case RTC didn't
-+               * request it */
-+              if (!(pcf->flags & PCF50606_F_RTC_SECOND))
-+                      reg_set_bit_mask(pcf, PCF50606_REG_INT1M,
-+                                       PCF50606_INT1_SECOND,
-+                                       PCF50606_INT1_SECOND);
-+      }
-+      if (pcfirq[0] & PCF50606_INT1_EXTONR) {
-+              DEBUGPC("EXTONR ");
-+              input_report_key(pcf->input_dev, KEY_POWER2, 1);
-+      }
-+      if (pcfirq[0] & PCF50606_INT1_EXTONF) {
-+              DEBUGPC("EXTONF ");
-+              input_report_key(pcf->input_dev, KEY_POWER2, 0);
-+      }
-+      if (pcfirq[0] & PCF50606_INT1_SECOND) {
-+              DEBUGPC("SECOND ");
-+              if (pcf->flags & PCF50606_F_RTC_SECOND)
-+                      rtc_update_irq(pcf->rtc, 1,
-+                                     RTC_PF | RTC_IRQF);
-+
-+              if (pcf->onkey_seconds >= 0 &&
-+                  pcf->flags & PCF50606_F_PWR_PRESSED) {
-+                      DEBUGPC("ONKEY_SECONDS(%u, OOCC1=0x%02x) ",
-+                              pcf->onkey_seconds,
-+                              reg_read(pcf, PCF50606_REG_OOCC1));
-+                      pcf->onkey_seconds++;
-+                      if (pcf->onkey_seconds >=
-+                          pcf->pdata->onkey_seconds_required) {
-+                              /* Ask init to do 'ctrlaltdel' */
-+                              DEBUGPC("SIGINT(init) ");
-+                              kill_proc(1, SIGINT, 1);
-+                              /* FIXME: what to do if userspace doesn't
-+                               * shut down? Do we want to force it? */
-+                      }
-+              }
-+      }
-+      if (pcfirq[0] & PCF50606_INT1_ALARM) {
-+              DEBUGPC("ALARM ");
-+              if (pcf->pdata->used_features & PCF50606_FEAT_RTC)
-+                      rtc_update_irq(pcf->rtc, 1,
-+                                     RTC_AF | RTC_IRQF);
-+      }
-+
-+      if (pcfirq[1] & PCF50606_INT2_CHGINS) {
-+              /* Charger inserted */
-+              DEBUGPC("CHGINS ");
-+              input_report_key(pcf->input_dev, KEY_BATTERY, 1);
-+              apm_queue_event(APM_POWER_STATUS_CHANGE);
-+              pcf->flags |= PCF50606_F_CHG_PRESENT;
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50606_FEAT_MBC, PMU_EVT_INSERT);
-+              /* FIXME: how to signal this to userspace */
-+      }
-+      if (pcfirq[1] & PCF50606_INT2_CHGRM) {
-+              /* Charger removed */
-+              DEBUGPC("CHGRM ");
-+              input_report_key(pcf->input_dev, KEY_BATTERY, 0);
-+              apm_queue_event(APM_POWER_STATUS_CHANGE);
-+              pcf->flags &= ~(PCF50606_F_CHG_MASK|PCF50606_F_CHG_PRESENT);
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50606_FEAT_MBC, PMU_EVT_INSERT);
-+              /* FIXME: how signal this to userspace */
-+      }
-+      if (pcfirq[1] & PCF50606_INT2_CHGFOK) {
-+              /* Battery ready for fast charging */
-+              DEBUGPC("CHGFOK ");
-+              pcf->flags |= PCF50606_F_CHG_FOK;
-+              /* FIXME: how to signal this to userspace */
-+      }
-+      if (pcfirq[1] & PCF50606_INT2_CHGERR) {
-+              /* Error in charge mode */
-+              DEBUGPC("CHGERR ");
-+              pcf->flags |= PCF50606_F_CHG_ERR;
-+              pcf->flags &= ~(PCF50606_F_CHG_FOK|PCF50606_F_CHG_READY);
-+              /* FIXME: how to signal this to userspace */
-+      }
-+      if (pcfirq[1] & PCF50606_INT2_CHGFRDY) {
-+              /* Fast charge completed */
-+              DEBUGPC("CHGFRDY ");
-+              pcf->flags |= PCF50606_F_CHG_READY;
-+              pcf->flags &= ~PCF50606_F_CHG_FOK;
-+              /* FIXME: how to signal this to userspace */
-+      }
-+      if (pcfirq[1] & PCF50606_INT2_CHGPROT) {
-+              /* Charging protection interrupt */
-+              DEBUGPC("CHGPROT ");
-+              pcf->flags &= ~(PCF50606_F_CHG_FOK|PCF50606_F_CHG_READY);
-+              /* FIXME: signal this to userspace */
-+      }
-+      if (pcfirq[1] & PCF50606_INT2_CHGWD10S) {
-+              /* Charger watchdog will expire in 10 seconds */
-+              DEBUGPC("CHGWD10S ");
-+              reg_set_bit_mask(pcf, PCF50606_REG_OOCC1,
-+                               PCF50606_OOCC1_WDTRST,
-+                               PCF50606_OOCC1_WDTRST);
-+      }
-+      if (pcfirq[1] & PCF50606_INT2_CHGWDEXP) {
-+              /* Charger watchdog expires */
-+              DEBUGPC("CHGWDEXP ");
-+              /* FIXME: how to signal this to userspace */
-+      }
-+
-+      if (pcfirq[2] & PCF50606_INT3_ADCRDY) {
-+              /* ADC result ready */
-+              DEBUGPC("ADCRDY ");
-+      }
-+      if (pcfirq[2] & PCF50606_INT3_ACDINS) {
-+              /* Accessory insertion detected */
-+              DEBUGPC("ACDINS ");
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50606_FEAT_ACD, PMU_EVT_INSERT);
-+      }
-+      if (pcfirq[2] & PCF50606_INT3_ACDREM) {
-+              /* Accessory removal detected */
-+              DEBUGPC("ACDREM ");
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50606_FEAT_ACD, PMU_EVT_REMOVE);
-+      }
-+      /* FIXME: TSCPRES */
-+      if (pcfirq[2] & PCF50606_INT3_LOWBAT) {
-+              /* Really low battery voltage, we have 8 seconds left */
-+              DEBUGPC("LOWBAT ");
-+              apm_queue_event(APM_LOW_BATTERY);
-+              DEBUGPC("SIGPWR(init) ");
-+              kill_proc(1, SIGPWR, 1);
-+              /* Tell PMU we are taking care of this */
-+              reg_set_bit_mask(pcf, PCF50606_REG_OOCC1,
-+                               PCF50606_OOCC1_TOTRST,
-+                               PCF50606_OOCC1_TOTRST);
-+      }
-+      if (pcfirq[2] & PCF50606_INT3_HIGHTMP) {
-+              /* High temperature */
-+              DEBUGPC("HIGHTMP ");
-+              apm_queue_event(APM_CRITICAL_SUSPEND);
-+      }
-+
-+      DEBUGPC("\n");
-+
-+      pcf->working = 0;
-+      input_sync(pcf->input_dev);
-+      put_device(&pcf->client.dev);
-+      mutex_unlock(&pcf->working_lock);
-+}
-+
-+static irqreturn_t pcf50606_irq(int irq, void *_pcf)
-+{
-+      struct pcf50606_data *pcf = _pcf;
-+
-+      dev_dbg(&pcf->client.dev, "entering(irq=%u, pcf=%p): scheduling work\n",
-+              irq, _pcf);
-+      get_device(&pcf->client.dev);
-+      if (!schedule_work(&pcf->work) && !pcf->working)
-+              dev_dbg(&pcf->client.dev, "work item may be lost\n");
-+
-+      return IRQ_HANDLED;
-+}
-+
-+static u_int16_t adc_to_batt_millivolts(u_int16_t adc)
-+{
-+      u_int16_t mvolts;
-+
-+      mvolts = (adc * 6000) / 1024;
-+
-+      return mvolts;
-+}
-+
-+#define BATTVOLT_SCALE_START 2800
-+#define BATTVOLT_SCALE_END 4200
-+#define BATTVOLT_SCALE_DIVIDER ((BATTVOLT_SCALE_END - BATTVOLT_SCALE_START)/100)
-+
-+static u_int8_t battvolt_scale(u_int16_t battvolt)
-+{
-+      /* FIXME: this linear scale is completely bogus */
-+      u_int16_t battvolt_relative = battvolt - BATTVOLT_SCALE_START;
-+      unsigned int percent = battvolt_relative / BATTVOLT_SCALE_DIVIDER;
-+
-+      return percent;
-+}
-+
-+u_int16_t pcf50606_battvolt(struct pcf50606_data *pcf)
-+{
-+      u_int16_t adc;
-+      adc = adc_read(pcf, PCF50606_ADCMUX_BATVOLT_RES, NULL);
-+
-+      return adc_to_batt_millivolts(adc);
-+}
-+EXPORT_SYMBOL_GPL(pcf50606_battvolt);
-+
-+static ssize_t show_battvolt(struct device *dev, struct device_attribute *attr,
-+                           char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+
-+      return sprintf(buf, "%u\n", pcf50606_battvolt(pcf));
-+}
-+static DEVICE_ATTR(battvolt, S_IRUGO | S_IWUSR, show_battvolt, NULL);
-+
-+static int reg_id_by_name(const char *name)
-+{
-+      int reg_id;
-+
-+      if (!strcmp(name, "voltage_dcd"))
-+              reg_id = PCF50606_REGULATOR_DCD;
-+      else if (!strcmp(name, "voltage_dcde"))
-+              reg_id = PCF50606_REGULATOR_DCDE;
-+      else if (!strcmp(name, "voltage_dcud"))
-+              reg_id = PCF50606_REGULATOR_DCUD;
-+      else if (!strcmp(name, "voltage_d1reg"))
-+              reg_id = PCF50606_REGULATOR_D1REG;
-+      else if (!strcmp(name, "voltage_d2reg"))
-+              reg_id = PCF50606_REGULATOR_D2REG;
-+      else if (!strcmp(name, "voltage_d3reg"))
-+              reg_id = PCF50606_REGULATOR_D3REG;
-+      else if (!strcmp(name, "voltage_lpreg"))
-+              reg_id = PCF50606_REGULATOR_LPREG;
-+      else if (!strcmp(name, "voltage_ioreg"))
-+              reg_id = PCF50606_REGULATOR_IOREG;
-+      else
-+              reg_id = -1;
-+
-+      return reg_id;
-+}
-+
-+static ssize_t show_vreg(struct device *dev, struct device_attribute *attr,
-+                       char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      unsigned int reg_id;
-+
-+      reg_id = reg_id_by_name(attr->attr.name);
-+      if (reg_id < 0)
-+              return 0;
-+
-+      if (pcf50606_onoff_get(pcf, reg_id) > 0)
-+              return sprintf(buf, "%u\n", pcf50606_voltage_get(pcf, reg_id));
-+      else
-+              return strlcpy(buf, "0\n", PAGE_SIZE);
-+}
-+
-+static ssize_t set_vreg(struct device *dev, struct device_attribute *attr,
-+                      const char *buf, size_t count)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      unsigned long mvolts = simple_strtoul(buf, NULL, 10);
-+      unsigned int reg_id;
-+
-+      reg_id = reg_id_by_name(attr->attr.name);
-+      if (reg_id < 0)
-+              return -EIO;
-+
-+      dev_dbg(dev, "attempting to set %s(%d) to %lu mvolts\n",
-+              attr->attr.name, reg_id, mvolts);
-+
-+      if (mvolts == 0) {
-+              pcf50606_onoff_set(pcf, reg_id, 0);
-+      } else {
-+              if (pcf50606_voltage_set(pcf, reg_id, mvolts) < 0) {
-+                      dev_warn(dev, "refusing to set %s(%d) to %lu mvolts "
-+                               "(max=%u)\n", attr->attr.name, reg_id, mvolts,
-+                               pcf->pdata->rails[reg_id].voltage.max);
-+                      return -EINVAL;
-+              }
-+              pcf50606_onoff_set(pcf, reg_id, 1);
-+      }
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(voltage_dcd, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_dcde, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_dcud, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_d1reg, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_d2reg, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_d3reg, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_lpreg, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_ioreg, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+
-+/***********************************************************************
-+ * Charger Control
-+ ***********************************************************************/
-+
-+/* Enable/disable fast charging (500mA in the GTA01) */
-+void pcf50606_charge_fast(struct pcf50606_data *pcf, int on)
-+{
-+      if (!(pcf->pdata->used_features & PCF50606_FEAT_MBC))
-+              return;
-+
-+      if (on) {
-+              /* We can allow PCF to automatically charge
-+               * using Ifast */
-+              pcf->flags |= PCF50606_F_CHG_FAST;
-+              reg_set_bit_mask(pcf, PCF50606_REG_MBCC1,
-+                               PCF50606_MBCC1_AUTOFST,
-+                               PCF50606_MBCC1_AUTOFST);
-+      } else {
-+              pcf->flags &= ~PCF50606_F_CHG_FAST;
-+              /* disable automatic fast-charge */
-+              reg_clear_bits(pcf, PCF50606_REG_MBCC1,
-+                              PCF50606_MBCC1_AUTOFST);
-+              /* switch to idle mode to abort existing charge
-+               * process */
-+              reg_set_bit_mask(pcf, PCF50606_REG_MBCC1,
-+                               PCF50606_MBCC1_CHGMOD_MASK,
-+                               PCF50606_MBCC1_CHGMOD_IDLE);
-+      }
-+}
-+EXPORT_SYMBOL_GPL(pcf50606_charge_fast);
-+
-+static inline u_int16_t adc_to_rntc(struct pcf50606_data *pcf, u_int16_t adc)
-+{
-+      u_int32_t r_ntc = (adc * (u_int32_t)pcf->pdata->r_fix_batt) / (1023 - adc);
-+
-+      return r_ntc;
-+}
-+
-+static inline int16_t rntc_to_temp(u_int16_t rntc)
-+{
-+      int i;
-+
-+      for (i = 0; i < ARRAY_SIZE(ntc_table_10k_3370B); i++) {
-+              if (rntc > ntc_table_10k_3370B[i])
-+                      return i - 10;  /* First element is -10 */
-+      }
-+      return -99;     /* Below our range */
-+}
-+
-+static ssize_t show_battemp(struct device *dev, struct device_attribute *attr,
-+                          char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      u_int16_t adc;
-+
-+      adc = adc_read(pcf, PCF50606_ADCMUX_BATTEMP, NULL);
-+
-+      return sprintf(buf, "%d\n", rntc_to_temp(adc_to_rntc(pcf, adc)));
-+}
-+static DEVICE_ATTR(battemp, S_IRUGO | S_IWUSR, show_battemp, NULL);
-+
-+static inline int16_t adc_to_chg_milliamps(struct pcf50606_data *pcf,
-+                                           u_int16_t adc_adcin1,
-+                                           u_int16_t adc_batvolt)
-+{
-+      int32_t res = (adc_adcin1 - adc_batvolt) * 2400;
-+      return (res * 1000) / (pcf->pdata->r_sense_milli * 1024);
-+}
-+
-+static ssize_t show_chgcur(struct device *dev, struct device_attribute *attr,
-+                         char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      u_int16_t adc_batvolt, adc_adcin1;
-+      int16_t ma;
-+
-+      adc_batvolt = adc_read(pcf, PCF50606_ADCMUX_BATVOLT_ADCIN1,
-+                             &adc_adcin1);
-+      ma = adc_to_chg_milliamps(pcf, adc_adcin1, adc_batvolt);
-+
-+      return sprintf(buf, "%d\n", ma);
-+}
-+static DEVICE_ATTR(chgcur, S_IRUGO | S_IWUSR, show_chgcur, NULL);
-+
-+static const char *chgmode_names[] = {
-+      [PCF50606_MBCC1_CHGMOD_QUAL]            = "qualification",
-+      [PCF50606_MBCC1_CHGMOD_PRE]             = "pre",
-+      [PCF50606_MBCC1_CHGMOD_TRICKLE]         = "trickle",
-+      [PCF50606_MBCC1_CHGMOD_FAST_CCCV]       = "fast_cccv",
-+      [PCF50606_MBCC1_CHGMOD_FAST_NOCC]       = "fast_nocc",
-+      [PCF50606_MBCC1_CHGMOD_FAST_NOCV]       = "fast_nocv",
-+      [PCF50606_MBCC1_CHGMOD_FAST_SW]         = "fast_switch",
-+      [PCF50606_MBCC1_CHGMOD_IDLE]            = "idle",
-+};
-+
-+static ssize_t show_chgmode(struct device *dev, struct device_attribute *attr,
-+                          char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      u_int8_t mbcc1 = reg_read(pcf, PCF50606_REG_MBCC1);
-+      u_int8_t chgmod = (mbcc1 & PCF50606_MBCC1_CHGMOD_MASK);
-+
-+      return sprintf(buf, "%s\n", chgmode_names[chgmod]);
-+}
-+
-+static ssize_t set_chgmode(struct device *dev, struct device_attribute *attr,
-+                         const char *buf, size_t count)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      u_int8_t mbcc1 = reg_read(pcf, PCF50606_REG_MBCC1);
-+
-+      mbcc1 &= ~PCF50606_MBCC1_CHGMOD_MASK;
-+
-+      if (!strcmp(buf, "qualification"))
-+              mbcc1 |= PCF50606_MBCC1_CHGMOD_QUAL;
-+      else if (!strcmp(buf, "pre"))
-+              mbcc1 |= PCF50606_MBCC1_CHGMOD_PRE;
-+      else if (!strcmp(buf, "trickle"))
-+              mbcc1 |= PCF50606_MBCC1_CHGMOD_TRICKLE;
-+      else if (!strcmp(buf, "fast_cccv"))
-+              mbcc1 |= PCF50606_MBCC1_CHGMOD_FAST_CCCV;
-+      /* We don't allow the other fast modes for security reasons */
-+      else if (!strcmp(buf, "idle"))
-+              mbcc1 |= PCF50606_MBCC1_CHGMOD_IDLE;
-+      else
-+              return -EINVAL;
-+
-+      reg_write(pcf, PCF50606_REG_MBCC1, mbcc1);
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(chgmode, S_IRUGO | S_IWUSR, show_chgmode, set_chgmode);
-+
-+static const char *chgstate_names[] = {
-+      [PCF50606_F_CHG_FAST]                   = "fast_enabled",
-+      [PCF50606_F_CHG_PRESENT]                = "present",
-+      [PCF50606_F_CHG_FOK]                    = "fast_ok",
-+      [PCF50606_F_CHG_ERR]                    = "error",
-+      [PCF50606_F_CHG_PROT]                   = "protection",
-+      [PCF50606_F_CHG_READY]                  = "ready",
-+};
-+
-+static ssize_t show_chgstate(struct device *dev, struct device_attribute *attr,
-+                          char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      char *b = buf;
-+      int i;
-+
-+      for (i = 0; i < 32; i++)
-+              if (pcf->flags & (1 << i) && i < ARRAY_SIZE(chgstate_names))
-+                      b += sprintf(b, "%s ", chgstate_names[i]);
-+
-+      if (b > buf)
-+              b += sprintf(b, "\n");
-+
-+      return b - buf;
-+}
-+static DEVICE_ATTR(chgstate, S_IRUGO | S_IWUSR, show_chgstate, NULL);
-+
-+/***********************************************************************
-+ * APM emulation
-+ ***********************************************************************/
-+
-+static void pcf50606_get_power_status(struct apm_power_info *info)
-+{
-+      struct pcf50606_data *pcf = pcf50606_global;
-+      u_int8_t mbcc1 = reg_read(pcf, PCF50606_REG_MBCC1);
-+      u_int8_t chgmod = mbcc1 & PCF50606_MBCC1_CHGMOD_MASK;
-+      u_int16_t battvolt = pcf50606_battvolt(pcf);
-+
-+      if (reg_read(pcf, PCF50606_REG_OOCS) & PCF50606_OOCS_EXTON)
-+              info->ac_line_status = APM_AC_ONLINE;
-+      else
-+              info->ac_line_status = APM_AC_OFFLINE;
-+
-+      switch (chgmod) {
-+      case PCF50606_MBCC1_CHGMOD_QUAL:
-+      case PCF50606_MBCC1_CHGMOD_PRE:
-+      case PCF50606_MBCC1_CHGMOD_IDLE:
-+              info->battery_life = battvolt_scale(battvolt);
-+              break;
-+      default:
-+              info->battery_status = APM_BATTERY_STATUS_CHARGING;
-+              info->battery_flag = APM_BATTERY_FLAG_CHARGING;
-+              break;
-+      }
-+}
-+
-+/***********************************************************************
-+ * RTC
-+ ***********************************************************************/
-+
-+struct pcf50606_time {
-+      u_int8_t sec;
-+      u_int8_t min;
-+      u_int8_t hour;
-+      u_int8_t wkday;
-+      u_int8_t day;
-+      u_int8_t month;
-+      u_int8_t year;
-+};
-+
-+static void pcf2rtc_time(struct rtc_time *rtc, struct pcf50606_time *pcf)
-+{
-+      rtc->tm_sec = BCD2BIN(pcf->sec);
-+      rtc->tm_min = BCD2BIN(pcf->min);
-+      rtc->tm_hour = BCD2BIN(pcf->hour);
-+      rtc->tm_wday = BCD2BIN(pcf->wkday);
-+      rtc->tm_mday = BCD2BIN(pcf->day);
-+      rtc->tm_mon = BCD2BIN(pcf->month);
-+      rtc->tm_year = BCD2BIN(pcf->year) + 100;
-+}
-+
-+static void rtc2pcf_time(struct pcf50606_time *pcf, struct rtc_time *rtc)
-+{
-+      pcf->sec = BIN2BCD(rtc->tm_sec);
-+      pcf->min = BIN2BCD(rtc->tm_min);
-+      pcf->hour = BIN2BCD(rtc->tm_hour);
-+      pcf->wkday = BIN2BCD(rtc->tm_wday);
-+      pcf->day = BIN2BCD(rtc->tm_mday);
-+      pcf->month = BIN2BCD(rtc->tm_mon);
-+      pcf->year = BIN2BCD(rtc->tm_year - 100);
-+}
-+
-+static int pcf50606_rtc_ioctl(struct device *dev, unsigned int cmd,
-+                            unsigned long arg)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      switch (cmd) {
-+      case RTC_PIE_OFF:
-+              /* disable periodic interrupt (hz tick) */
-+              pcf->flags &= ~PCF50606_F_RTC_SECOND;
-+              reg_set_bit_mask(pcf, PCF50606_REG_INT1M,
-+                               PCF50606_INT1_SECOND, PCF50606_INT1_SECOND);
-+              return 0;
-+      case RTC_PIE_ON:
-+              /* ensable periodic interrupt (hz tick) */
-+              pcf->flags |= PCF50606_F_RTC_SECOND;
-+              reg_clear_bits(pcf, PCF50606_REG_INT1M, PCF50606_INT1_SECOND);
-+              return 0;
-+      }
-+      return -ENOIOCTLCMD;
-+}
-+
-+static int pcf50606_rtc_read_time(struct device *dev, struct rtc_time *tm)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      struct pcf50606_time pcf_tm;
-+
-+      mutex_lock(&pcf->lock);
-+      pcf_tm.sec = __reg_read(pcf, PCF50606_REG_RTCSC);
-+      pcf_tm.min = __reg_read(pcf, PCF50606_REG_RTCMN);
-+      pcf_tm.hour = __reg_read(pcf, PCF50606_REG_RTCHR);
-+      pcf_tm.wkday = __reg_read(pcf, PCF50606_REG_RTCWD);
-+      pcf_tm.day = __reg_read(pcf, PCF50606_REG_RTCDT);
-+      pcf_tm.month = __reg_read(pcf, PCF50606_REG_RTCMT);
-+      pcf_tm.year = __reg_read(pcf, PCF50606_REG_RTCYR);
-+      mutex_unlock(&pcf->lock);
-+
-+      dev_dbg(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
-+              pcf_tm.day, pcf_tm.month, pcf_tm.year,
-+              pcf_tm.hour, pcf_tm.min, pcf_tm.sec);
-+
-+      pcf2rtc_time(tm, &pcf_tm);
-+
-+      dev_dbg(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
-+              tm->tm_mday, tm->tm_mon, tm->tm_year,
-+              tm->tm_hour, tm->tm_min, tm->tm_sec);
-+
-+      return 0;
-+}
-+
-+static int pcf50606_rtc_set_time(struct device *dev, struct rtc_time *tm)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      struct pcf50606_time pcf_tm;
-+      u_int8_t int1m;
-+
-+      dev_dbg(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
-+              tm->tm_mday, tm->tm_mon, tm->tm_year,
-+              tm->tm_hour, tm->tm_min, tm->tm_sec);
-+      rtc2pcf_time(&pcf_tm, tm);
-+      dev_dbg(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
-+              pcf_tm.day, pcf_tm.month, pcf_tm.year,
-+              pcf_tm.hour, pcf_tm.min, pcf_tm.sec);
-+
-+      mutex_lock(&pcf->lock);
-+
-+      /* disable SECOND interrupt */
-+      int1m = __reg_read(pcf, PCF50606_REG_INT1M);
-+      __reg_write(pcf, PCF50606_REG_INT1M, int1m | PCF50606_INT1_SECOND);
-+
-+      __reg_write(pcf, PCF50606_REG_RTCSC, pcf_tm.sec);
-+      __reg_write(pcf, PCF50606_REG_RTCMN, pcf_tm.min);
-+      __reg_write(pcf, PCF50606_REG_RTCHR, pcf_tm.hour);
-+      __reg_write(pcf, PCF50606_REG_RTCWD, pcf_tm.wkday);
-+      __reg_write(pcf, PCF50606_REG_RTCDT, pcf_tm.day);
-+      __reg_write(pcf, PCF50606_REG_RTCMT, pcf_tm.month);
-+      __reg_write(pcf, PCF50606_REG_RTCYR, pcf_tm.year);
-+
-+      /* restore INT1M, potentially re-enable SECOND interrupt */
-+      __reg_write(pcf, PCF50606_REG_INT1M, int1m);
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      return 0;
-+}
-+
-+static int pcf50606_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      struct pcf50606_time pcf_tm;
-+
-+      mutex_lock(&pcf->lock);
-+      alrm->enabled = 
-+             __reg_read(pcf, PCF50606_REG_INT1M) & PCF50606_INT1_ALARM ? 0 : 1;
-+      pcf_tm.sec = __reg_read(pcf, PCF50606_REG_RTCSCA);
-+      pcf_tm.min = __reg_read(pcf, PCF50606_REG_RTCMNA);
-+      pcf_tm.hour = __reg_read(pcf, PCF50606_REG_RTCHRA);
-+      pcf_tm.wkday = __reg_read(pcf, PCF50606_REG_RTCWDA);
-+      pcf_tm.day = __reg_read(pcf, PCF50606_REG_RTCDTA);
-+      pcf_tm.month = __reg_read(pcf, PCF50606_REG_RTCMTA);
-+      pcf_tm.year = __reg_read(pcf, PCF50606_REG_RTCYRA);
-+      mutex_unlock(&pcf->lock);
-+
-+      pcf2rtc_time(&alrm->time, &pcf_tm);
-+
-+      return 0;
-+}
-+
-+static int pcf50606_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      struct pcf50606_time pcf_tm;
-+      u_int8_t irqmask;
-+
-+      rtc2pcf_time(&pcf_tm, &alrm->time);
-+
-+      mutex_lock(&pcf->lock);
-+
-+      /* disable alarm interrupt */
-+      irqmask = __reg_read(pcf, PCF50606_REG_INT1M);
-+      irqmask |= PCF50606_INT1_ALARM;
-+      __reg_write(pcf, PCF50606_REG_INT1M, irqmask);
-+
-+      __reg_write(pcf, PCF50606_REG_RTCSCA, pcf_tm.sec);
-+      __reg_write(pcf, PCF50606_REG_RTCMNA, pcf_tm.min);
-+      __reg_write(pcf, PCF50606_REG_RTCHRA, pcf_tm.hour);
-+      __reg_write(pcf, PCF50606_REG_RTCWDA, pcf_tm.wkday);
-+      __reg_write(pcf, PCF50606_REG_RTCDTA, pcf_tm.day);
-+      __reg_write(pcf, PCF50606_REG_RTCMTA, pcf_tm.month);
-+      __reg_write(pcf, PCF50606_REG_RTCYRA, pcf_tm.year);
-+
-+      if (alrm->enabled) {
-+              /* (re-)enaable alarm interrupt */
-+              irqmask = __reg_read(pcf, PCF50606_REG_INT1M);
-+              irqmask &= ~PCF50606_INT1_ALARM;
-+              __reg_write(pcf, PCF50606_REG_INT1M, irqmask);
-+      }
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      /* FIXME */
-+      return 0;
-+}
-+
-+static struct rtc_class_ops pcf50606_rtc_ops = {
-+      .ioctl          = pcf50606_rtc_ioctl,
-+      .read_time      = pcf50606_rtc_read_time,
-+      .set_time       = pcf50606_rtc_set_time,
-+      .read_alarm     = pcf50606_rtc_read_alarm,
-+      .set_alarm      = pcf50606_rtc_set_alarm,
-+};
-+
-+/***********************************************************************
-+ * Watchdog
-+ ***********************************************************************/
-+
-+static void pcf50606_wdt_start(struct pcf50606_data *pcf)
-+{
-+      reg_set_bit_mask(pcf, PCF50606_REG_OOCC1, PCF50606_OOCC1_WDTRST,
-+                       PCF50606_OOCC1_WDTRST);
-+}
-+
-+static void pcf50606_wdt_stop(struct pcf50606_data *pcf)
-+{
-+      reg_clear_bits(pcf, PCF50606_REG_OOCS, PCF50606_OOCS_WDTEXP);
-+}
-+
-+static void pcf50606_wdt_keepalive(struct pcf50606_data *pcf)
-+{
-+      pcf50606_wdt_start(pcf);
-+}
-+
-+static int pcf50606_wdt_open(struct inode *inode, struct file *file)
-+{
-+      struct pcf50606_data *pcf = pcf50606_global;
-+
-+      file->private_data = pcf;
-+
-+      /* start the timer */
-+      pcf50606_wdt_start(pcf);
-+
-+      return nonseekable_open(inode, file);
-+}
-+
-+static int pcf50606_wdt_release(struct inode *inode, struct file *file)
-+{
-+      struct pcf50606_data *pcf = file->private_data;
-+
-+      if (pcf->allow_close == CLOSE_STATE_ALLOW)
-+              pcf50606_wdt_stop(pcf);
-+      else {
-+              printk(KERN_CRIT "Unexpected close, not stopping watchdog!\n");
-+              pcf50606_wdt_keepalive(pcf);
-+      }
-+
-+      pcf->allow_close = CLOSE_STATE_NOT;
-+
-+      return 0;
-+}
-+
-+static ssize_t pcf50606_wdt_write(struct file *file, const char __user *data,
-+                                size_t len, loff_t *ppos)
-+{
-+      struct pcf50606_data *pcf = file->private_data;
-+      if (len) {
-+              size_t i;
-+
-+              for (i = 0; i != len; i++) {
-+                      char c;
-+                      if (get_user(c, data + i))
-+                              return -EFAULT;
-+                      if (c == 'V')
-+                              pcf->allow_close = CLOSE_STATE_ALLOW;
-+              }
-+              pcf50606_wdt_keepalive(pcf);
-+      }
-+
-+      return len;
-+}
-+
-+static struct watchdog_info pcf50606_wdt_ident = {
-+      .options        = WDIOF_MAGICCLOSE,
-+      .firmware_version = 0,
-+      .identity       = "PCF50606 Watchdog",
-+};
-+
-+static int pcf50606_wdt_ioctl(struct inode *inode, struct file *file,
-+                            unsigned int cmd, unsigned long arg)
-+{
-+      struct pcf50606_data *pcf = file->private_data;
-+      void __user *argp = (void __user *)arg;
-+      int __user *p = argp;
-+
-+      switch (cmd) {
-+      case WDIOC_GETSUPPORT:
-+              return copy_to_user(argp, &pcf50606_wdt_ident,
-+                                  sizeof(pcf50606_wdt_ident)) ? -EFAULT : 0;
-+              break;
-+      case WDIOC_GETSTATUS:
-+      case WDIOC_GETBOOTSTATUS:
-+              return put_user(0, p);
-+      case WDIOC_KEEPALIVE:
-+              pcf50606_wdt_keepalive(pcf);
-+              return 0;
-+      case WDIOC_GETTIMEOUT:
-+              return put_user(8, p);
-+      default:
-+              return -ENOIOCTLCMD;
-+      }
-+}
-+
-+static struct file_operations pcf50606_wdt_fops = {
-+      .owner          = THIS_MODULE,
-+      .llseek         = no_llseek,
-+      .write          = &pcf50606_wdt_write,
-+      .ioctl          = &pcf50606_wdt_ioctl,
-+      .open           = &pcf50606_wdt_open,
-+      .release        = &pcf50606_wdt_release,
-+};
-+
-+static struct miscdevice pcf50606_wdt_miscdev = {
-+      .minor          = WATCHDOG_MINOR,
-+      .name           = "watchdog",
-+      .fops           = &pcf50606_wdt_fops,
-+};
-+
-+/***********************************************************************
-+ * PWM
-+ ***********************************************************************/
-+
-+static const char *pwm_dc_table[] = {
-+      "0/16", "1/16", "2/16", "3/16",
-+      "4/16", "5/16", "6/16", "7/16",
-+      "8/16", "9/16", "10/16", "11/16",
-+      "12/16", "13/16", "14/16", "15/16",
-+};
-+
-+static ssize_t show_pwm_dc(struct device *dev, struct device_attribute *attr,
-+                         char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      u_int8_t val;
-+
-+      val = reg_read(pcf, PCF50606_REG_PWMC1) >> PCF50606_PWMC1_DC_SHIFT;
-+      val &= 0xf;
-+
-+      return sprintf(buf, "%s\n", pwm_dc_table[val]);
-+}
-+
-+static ssize_t set_pwm_dc(struct device *dev, struct device_attribute *attr,
-+                        const char *buf, size_t count)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      u_int8_t i;
-+
-+      for (i = 0; i < ARRAY_SIZE(pwm_dc_table); i++) {
-+              if (!strncmp(buf, pwm_dc_table[i], strlen(pwm_dc_table[i]))) {
-+                      dev_dbg(dev, "setting pwm dc %s\n\r", pwm_dc_table[i]);
-+                      reg_set_bit_mask(pcf, PCF50606_REG_PWMC1, 0x1e,
-+                                       (i << PCF50606_PWMC1_DC_SHIFT));
-+              }
-+      }
-+      return count;
-+}
-+
-+static DEVICE_ATTR(pwm_dc, S_IRUGO | S_IWUSR, show_pwm_dc, set_pwm_dc);
-+
-+static const char *pwm_clk_table[] = {
-+      "512", "256", "128", "64",
-+      "56300", "28100", "14100", "7000",
-+};
-+
-+static ssize_t show_pwm_clk(struct device *dev, struct device_attribute *attr,
-+                          char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      u_int8_t val;
-+
-+      val = reg_read(pcf, PCF50606_REG_PWMC1) >> PCF50606_PWMC1_CLK_SHIFT;
-+      val &= 0x7;
-+
-+      return sprintf(buf, "%s\n", pwm_clk_table[val]);
-+}
-+
-+static ssize_t set_pwm_clk(struct device *dev, struct device_attribute *attr,
-+                         const char *buf, size_t count)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      u_int8_t i;
-+
-+      for (i = 0; i < ARRAY_SIZE(pwm_clk_table); i++) {
-+              if (!strncmp(buf, pwm_clk_table[i], strlen(pwm_clk_table[i]))) {
-+                      dev_dbg(dev, "setting pwm clk %s\n\r",
-+                              pwm_clk_table[i]);
-+                      reg_set_bit_mask(pcf, PCF50606_REG_PWMC1, 0xe0,
-+                                       (i << PCF50606_PWMC1_CLK_SHIFT));
-+              }
-+      }
-+      return count;
-+}
-+
-+static DEVICE_ATTR(pwm_clk, S_IRUGO | S_IWUSR, show_pwm_clk, set_pwm_clk);
-+
-+static int pcf50606bl_get_intensity(struct backlight_device *bd)
-+{
-+      struct pcf50606_data *pcf = bl_get_data(bd);
-+      int intensity = reg_read(pcf, PCF50606_REG_PWMC1);
-+      intensity = (intensity >> PCF50606_PWMC1_DC_SHIFT);
-+
-+      return intensity & 0xf;
-+}
-+
-+static int pcf50606bl_set_intensity(struct backlight_device *bd)
-+{
-+      struct pcf50606_data *pcf = bl_get_data(bd);
-+      int intensity = bd->props.brightness;
-+
-+      if (bd->props.power != FB_BLANK_UNBLANK)
-+              intensity = 0;
-+      if (bd->props.fb_blank != FB_BLANK_UNBLANK)
-+              intensity = 0;
-+
-+      return reg_set_bit_mask(pcf, PCF50606_REG_PWMC1, 0x1e,
-+                              (intensity << PCF50606_PWMC1_DC_SHIFT));
-+}
-+
-+static struct backlight_ops pcf50606bl_ops = {
-+      .get_brightness = pcf50606bl_get_intensity,
-+      .update_status  = pcf50606bl_set_intensity,
-+};
-+
-+/***********************************************************************
-+ * Driver initialization
-+ ***********************************************************************/
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+/* We currently place those platform devices here to make sure the device
-+ * suspend/resume order is correct */
-+static struct platform_device gta01_pm_gps_dev = {
-+      .name           = "neo1973-pm-gps",
-+};
-+
-+static struct platform_device gta01_pm_bt_dev = {
-+      .name           = "neo1973-pm-bt",
-+};
-+#endif
-+
-+static struct attribute *pcf_sysfs_entries[16] = {
-+      &dev_attr_voltage_dcd.attr,
-+      &dev_attr_voltage_dcde.attr,
-+      &dev_attr_voltage_dcud.attr,
-+      &dev_attr_voltage_d1reg.attr,
-+      &dev_attr_voltage_d2reg.attr,
-+      &dev_attr_voltage_d3reg.attr,
-+      &dev_attr_voltage_lpreg.attr,
-+      &dev_attr_voltage_ioreg.attr,
-+      NULL
-+};
-+
-+static struct attribute_group pcf_attr_group = {
-+      .name   = NULL,                 /* put in device directory */
-+      .attrs  = pcf_sysfs_entries,
-+};
-+
-+static void populate_sysfs_group(struct pcf50606_data *pcf)
-+{
-+      int i = 0;
-+      struct attribute **attr;
-+
-+      for (attr = pcf_sysfs_entries; *attr; attr++)
-+              i++;
-+
-+      if (pcf->pdata->used_features & PCF50606_FEAT_MBC) {
-+              pcf_sysfs_entries[i++] = &dev_attr_chgstate.attr;
-+              pcf_sysfs_entries[i++] = &dev_attr_chgmode.attr;
-+      }
-+
-+      if (pcf->pdata->used_features & PCF50606_FEAT_CHGCUR)
-+              pcf_sysfs_entries[i++] = &dev_attr_chgcur.attr;
-+
-+      if (pcf->pdata->used_features & PCF50606_FEAT_BATVOLT)
-+              pcf_sysfs_entries[i++] = &dev_attr_battvolt.attr;
-+
-+      if (pcf->pdata->used_features & PCF50606_FEAT_BATTEMP)
-+              pcf_sysfs_entries[i++] = &dev_attr_battemp.attr;
-+
-+      if (pcf->pdata->used_features & PCF50606_FEAT_PWM) {
-+              pcf_sysfs_entries[i++] = &dev_attr_pwm_dc.attr;
-+              pcf_sysfs_entries[i++] = &dev_attr_pwm_clk.attr;
-+      }
-+}
-+
-+static int pcf50606_detect(struct i2c_adapter *adapter, int address, int kind)
-+{
-+      struct i2c_client *new_client;
-+      struct pcf50606_data *data;
-+      int err = 0;
-+      int irq;
-+
-+      if (!pcf50606_pdev) {
-+              printk(KERN_ERR "pcf50606: driver needs a platform_device!\n");
-+              return -EIO;
-+      }
-+
-+      irq = platform_get_irq(pcf50606_pdev, 0);
-+      if (irq < 0) {
-+              dev_err(&pcf50606_pdev->dev, "no irq in platform resources!\n");
-+              return -EIO;
-+      }
-+
-+      /* At the moment, we only support one PCF50606 in a system */
-+      if (pcf50606_global) {
-+              dev_err(&pcf50606_pdev->dev,
-+                      "currently only one chip supported\n");
-+              return -EBUSY;
-+      }
-+
-+      data = kzalloc(sizeof(*data), GFP_KERNEL);
-+      if (!data)
-+              return -ENOMEM;
-+
-+      mutex_init(&data->lock);
-+      mutex_init(&data->working_lock);
-+      INIT_WORK(&data->work, pcf50606_work);
-+      data->irq = irq;
-+      data->working = 0;
-+      data->onkey_seconds = -1;
-+      data->pdata = pcf50606_pdev->dev.platform_data;
-+
-+      new_client = &data->client;
-+      i2c_set_clientdata(new_client, data);
-+      new_client->addr = address;
-+      new_client->adapter = adapter;
-+      new_client->driver = &pcf50606_driver;
-+      new_client->flags = 0;
-+      strlcpy(new_client->name, "pcf50606", I2C_NAME_SIZE);
-+
-+      /* now we try to detect the chip */
-+
-+      /* register with i2c core */
-+      err = i2c_attach_client(new_client);
-+      if (err) {
-+              dev_err(&new_client->dev,
-+                      "error during i2c_attach_client()\n");
-+              goto exit_free;
-+      }
-+
-+      populate_sysfs_group(data);
-+
-+      err = sysfs_create_group(&new_client->dev.kobj, &pcf_attr_group);
-+      if (err) {
-+              dev_err(&new_client->dev, "error creating sysfs group\n");
-+              goto exit_detach;
-+      }
-+
-+      /* create virtual charger 'device' */
-+
-+      /* input device registration */
-+      data->input_dev = input_allocate_device();
-+      if (!data->input_dev)
-+              goto exit_sysfs;
-+
-+      data->input_dev->name = "FIC Neo1973 PMU events";
-+      data->input_dev->phys = "I2C";
-+      data->input_dev->id.bustype = BUS_I2C;
-+      data->input_dev->cdev.dev = &new_client->dev;
-+
-+      data->input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_PWR);
-+      set_bit(KEY_POWER, data->input_dev->keybit);
-+      set_bit(KEY_POWER2, data->input_dev->keybit);
-+      set_bit(KEY_BATTERY, data->input_dev->keybit);
-+
-+      err = input_register_device(data->input_dev);
-+      if (err)
-+              goto exit_sysfs;
-+
-+      /* register power off handler with core power management */
-+      pm_power_off = &pcf50606_go_standby;
-+
-+      /* configure interrupt mask */
-+      reg_write(data, PCF50606_REG_INT1M, PCF50606_INT1_SECOND);
-+      reg_write(data, PCF50606_REG_INT2M, 0x00);
-+      reg_write(data, PCF50606_REG_INT3M, PCF50606_INT3_TSCPRES);
-+
-+      err = request_irq(irq, pcf50606_irq, IRQF_TRIGGER_FALLING,
-+                        "pcf50606", data);
-+      if (err < 0)
-+              goto exit_input;
-+
-+      if (enable_irq_wake(irq) < 0)
-+              dev_err(&new_client->dev, "IRQ %u cannot be enabled as wake-up"
-+                      "source in this hardware revision!", irq);
-+
-+      pcf50606_global = data;
-+
-+      if (data->pdata->used_features & PCF50606_FEAT_RTC) {
-+              data->rtc = rtc_device_register("pcf50606", &new_client->dev,
-+                                              &pcf50606_rtc_ops, THIS_MODULE);
-+              if (IS_ERR(data->rtc)) {
-+                      err = PTR_ERR(data->rtc);
-+                      goto exit_irq;
-+              }
-+      }
-+
-+      if (data->pdata->used_features & PCF50606_FEAT_WDT) {
-+              err = misc_register(&pcf50606_wdt_miscdev);
-+              if (err) {
-+                      dev_err(&new_client->dev, "cannot register miscdev on "
-+                             "minor=%d (%d)\n", WATCHDOG_MINOR, err);
-+                      goto exit_rtc;
-+              }
-+      }
-+
-+      if (data->pdata->used_features & PCF50606_FEAT_PWM) {
-+              /* enable PWM controller */
-+              reg_set_bit_mask(data, PCF50606_REG_PWMC1,
-+                               PCF50606_PWMC1_ACTSET,
-+                               PCF50606_PWMC1_ACTSET);
-+      }
-+
-+      if (data->pdata->used_features & PCF50606_FEAT_PWM_BL) {
-+              data->backlight = backlight_device_register("pcf50606-bl",
-+                                                          &new_client->dev,
-+                                                          data,
-+                                                          &pcf50606bl_ops);
-+              if (!data->backlight)
-+                      goto exit_misc;
-+              data->backlight->props.max_brightness = 16;
-+              data->backlight->props.power = FB_BLANK_UNBLANK;
-+              data->backlight->props.brightness =
-+                                      data->pdata->init_brightness;
-+              backlight_update_status(data->backlight);
-+      }
-+
-+      apm_get_power_status = pcf50606_get_power_status;
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+      if (machine_is_neo1973_gta01()) {
-+              gta01_pm_gps_dev.dev.parent = &new_client->dev;
-+              switch (system_rev) {
-+              case GTA01Bv2_SYSTEM_REV:
-+              case GTA01Bv3_SYSTEM_REV:
-+              case GTA01Bv4_SYSTEM_REV:
-+                      gta01_pm_bt_dev.dev.parent = &new_client->dev;
-+                      platform_device_register(&gta01_pm_bt_dev);
-+                      break;
-+              }
-+              platform_device_register(&gta01_pm_gps_dev);
-+              /* a link for gllin compatibility */
-+              err = sysfs_create_link(&platform_bus_type.devices.kobj,
-+                  &gta01_pm_gps_dev.dev.kobj, "gta01-pm-gps.0");
-+              if (err)
-+                      printk(KERN_ERR
-+                          "sysfs_create_link (gta01-pm-gps.0): %d\n", err);
-+      }
-+#endif
-+
-+      if (data->pdata->used_features & PCF50606_FEAT_ACD)
-+              reg_set_bit_mask(data, PCF50606_REG_ACDC1,
-+                               PCF50606_ACDC1_ACDAPE, PCF50606_ACDC1_ACDAPE);
-+      else
-+              reg_clear_bits(data, PCF50606_REG_ACDC1,
-+                             PCF50606_ACDC1_ACDAPE);
-+
-+      return 0;
-+
-+exit_misc:
-+      if (data->pdata->used_features & PCF50606_FEAT_WDT)
-+              misc_deregister(&pcf50606_wdt_miscdev);
-+exit_rtc:
-+      if (data->pdata->used_features & PCF50606_FEAT_RTC)
-+              rtc_device_unregister(pcf50606_global->rtc);
-+exit_irq:
-+      free_irq(pcf50606_global->irq, pcf50606_global);
-+      pcf50606_global = NULL;
-+exit_input:
-+      pm_power_off = NULL;
-+      input_unregister_device(data->input_dev);
-+exit_sysfs:
-+      sysfs_remove_group(&new_client->dev.kobj, &pcf_attr_group);
-+exit_detach:
-+      i2c_detach_client(new_client);
-+exit_free:
-+      kfree(data);
-+      return err;
-+}
-+
-+static int pcf50606_attach_adapter(struct i2c_adapter *adapter)
-+{
-+      return i2c_probe(adapter, &addr_data, &pcf50606_detect);
-+}
-+
-+static int pcf50606_detach_client(struct i2c_client *client)
-+{
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+
-+      apm_get_power_status = NULL;
-+      input_unregister_device(pcf->input_dev);
-+
-+      if (pcf->pdata->used_features & PCF50606_FEAT_PWM_BL)
-+              backlight_device_unregister(pcf->backlight);
-+
-+      if (pcf->pdata->used_features & PCF50606_FEAT_WDT)
-+              misc_deregister(&pcf50606_wdt_miscdev);
-+
-+      if (pcf->pdata->used_features & PCF50606_FEAT_RTC)
-+              rtc_device_unregister(pcf->rtc);
-+
-+      free_irq(pcf->irq, pcf);
-+
-+      sysfs_remove_group(&client->dev.kobj, &pcf_attr_group);
-+
-+      pm_power_off = NULL;
-+
-+      kfree(pcf);
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+#define INT1M_RESUMERS        (PCF50606_INT1_ALARM | \
-+                       PCF50606_INT1_ONKEYF | \
-+                       PCF50606_INT1_EXTONR)
-+#define INT2M_RESUMERS        (PCF50606_INT2_CHGWD10S | \
-+                       PCF50606_INT2_CHGPROT | \
-+                       PCF50606_INT2_CHGERR)
-+#define INT3M_RESUMERS        (PCF50606_INT3_LOWBAT | \
-+                       PCF50606_INT3_HIGHTMP | \
-+                       PCF50606_INT3_ACDINS)
-+static int pcf50606_suspend(struct device *dev, pm_message_t state)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      int i;
-+
-+      /* The general idea is to power down all unused power supplies,
-+       * and then mask all PCF50606 interrup sources but EXTONR, ONKEYF
-+       * and ALARM */
-+
-+      mutex_lock(&pcf->lock);
-+
-+      /* Save all registers that don't "survive" standby state */
-+      pcf->standby_regs.dcdc1 = __reg_read(pcf, PCF50606_REG_DCDC1);
-+      pcf->standby_regs.dcdc2 = __reg_read(pcf, PCF50606_REG_DCDC2);
-+      pcf->standby_regs.dcdec1 = __reg_read(pcf, PCF50606_REG_DCDEC1);
-+      pcf->standby_regs.dcudc1 = __reg_read(pcf, PCF50606_REG_DCUDC1);
-+      pcf->standby_regs.ioregc = __reg_read(pcf, PCF50606_REG_IOREGC);
-+      pcf->standby_regs.d1regc1 = __reg_read(pcf, PCF50606_REG_D1REGC1);
-+      pcf->standby_regs.d2regc1 = __reg_read(pcf, PCF50606_REG_D2REGC1);
-+      pcf->standby_regs.d3regc1 = __reg_read(pcf, PCF50606_REG_D3REGC1);
-+      pcf->standby_regs.lpregc1 = __reg_read(pcf, PCF50606_REG_LPREGC1);
-+      pcf->standby_regs.adcc1 = __reg_read(pcf, PCF50606_REG_ADCC1);
-+      pcf->standby_regs.adcc2 = __reg_read(pcf, PCF50606_REG_ADCC2);
-+      pcf->standby_regs.pwmc1 = __reg_read(pcf, PCF50606_REG_PWMC1);
-+
-+      /* switch off power supplies that are not needed during suspend */
-+      for (i = 0; i < __NUM_PCF50606_REGULATORS; i++) {
-+              if (!(pcf->pdata->rails[i].flags & PMU_VRAIL_F_SUSPEND_ON)) {
-+                      u_int8_t tmp;
-+
-+                      /* IOREG powers the I@C interface so we cannot switch
-+                       * it off */
-+                      if (i == PCF50606_REGULATOR_IOREG)
-+                              continue;
-+
-+                      dev_dbg(dev, "disabling pcf50606 regulator %u\n", i);
-+                      /* we cannot use pcf50606_onoff_set() because we're
-+                       * already under the mutex */
-+                      tmp = __reg_read(pcf, regulator_registers[i]);
-+                      tmp &= 0x1f;
-+                      __reg_write(pcf, regulator_registers[i], tmp);
-+              }
-+      }
-+
-+      pcf->standby_regs.int1m = __reg_read(pcf, PCF50606_REG_INT1M);
-+      pcf->standby_regs.int2m = __reg_read(pcf, PCF50606_REG_INT2M);
-+      pcf->standby_regs.int3m = __reg_read(pcf, PCF50606_REG_INT3M);
-+      __reg_write(pcf, PCF50606_REG_INT1M, ~INT1M_RESUMERS & 0xff);
-+      __reg_write(pcf, PCF50606_REG_INT2M, ~INT2M_RESUMERS & 0xff);
-+      __reg_write(pcf, PCF50606_REG_INT3M, ~INT3M_RESUMERS & 0xff);
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      return 0;
-+}
-+
-+static int pcf50606_resume(struct device *dev)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+
-+      mutex_lock(&pcf->lock);
-+
-+      /* Resume all saved registers that don't "survive" standby state */
-+      __reg_write(pcf, PCF50606_REG_INT1M, pcf->standby_regs.int1m);
-+      __reg_write(pcf, PCF50606_REG_INT2M, pcf->standby_regs.int2m);
-+      __reg_write(pcf, PCF50606_REG_INT3M, pcf->standby_regs.int3m);
-+
-+      __reg_write(pcf, PCF50606_REG_DCDC1, pcf->standby_regs.dcdc1);
-+      __reg_write(pcf, PCF50606_REG_DCDC2, pcf->standby_regs.dcdc2);
-+      __reg_write(pcf, PCF50606_REG_DCDEC1, pcf->standby_regs.dcdec1);
-+      __reg_write(pcf, PCF50606_REG_DCUDC1, pcf->standby_regs.dcudc1);
-+      __reg_write(pcf, PCF50606_REG_IOREGC, pcf->standby_regs.ioregc);
-+      __reg_write(pcf, PCF50606_REG_D1REGC1, pcf->standby_regs.d1regc1);
-+      __reg_write(pcf, PCF50606_REG_D2REGC1, pcf->standby_regs.d2regc1);
-+      __reg_write(pcf, PCF50606_REG_D3REGC1, pcf->standby_regs.d3regc1);
-+      __reg_write(pcf, PCF50606_REG_LPREGC1, pcf->standby_regs.lpregc1);
-+      __reg_write(pcf, PCF50606_REG_ADCC1, pcf->standby_regs.adcc1);
-+      __reg_write(pcf, PCF50606_REG_ADCC2, pcf->standby_regs.adcc2);
-+      __reg_write(pcf, PCF50606_REG_PWMC1, pcf->standby_regs.pwmc1);
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      return 0;
-+}
-+#else
-+#define pcf50606_suspend NULL
-+#define pcf50606_resume NULL
-+#endif
-+
-+static struct i2c_driver pcf50606_driver = {
-+      .driver = {
-+              .name    = "pcf50606",
-+              .suspend = pcf50606_suspend,
-+              .resume  = pcf50606_resume,
-+      },
-+      .id             = I2C_DRIVERID_PCF50606,
-+      .attach_adapter = pcf50606_attach_adapter,
-+      .detach_client  = pcf50606_detach_client,
-+};
-+
-+/* platform driver, since i2c devices don't have platform_data */
-+static int __init pcf50606_plat_probe(struct platform_device *pdev)
-+{
-+      struct pcf50606_platform_data *pdata = pdev->dev.platform_data;
-+
-+      if (!pdata)
-+              return -ENODEV;
-+
-+      pcf50606_pdev = pdev;
-+
-+      return 0;
-+}
-+
-+static int pcf50606_plat_remove(struct platform_device *pdev)
-+{
-+      return 0;
-+}
-+
-+static struct platform_driver pcf50606_plat_driver = {
-+      .probe  = pcf50606_plat_probe,
-+      .remove = pcf50606_plat_remove,
-+      .driver = {
-+              .owner  = THIS_MODULE,
-+              .name   = "pcf50606",
-+      },
-+};
-+
-+static int __init pcf50606_init(void)
-+{
-+      int rc;
-+
-+      rc = platform_driver_register(&pcf50606_plat_driver);
-+      if (!rc)
-+              rc = i2c_add_driver(&pcf50606_driver);
-+
-+      return rc;
-+}
-+
-+static void pcf50606_exit(void)
-+{
-+      i2c_del_driver(&pcf50606_driver);
-+      platform_driver_unregister(&pcf50606_plat_driver);
-+}
-+
-+MODULE_DESCRIPTION("I2C chip driver for NXP PCF50606 power management unit");
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_LICENSE("GPL");
-+
-+module_init(pcf50606_init);
-+module_exit(pcf50606_exit);
-diff --git a/drivers/i2c/chips/pcf50606.h b/drivers/i2c/chips/pcf50606.h
-new file mode 100644
-index 0000000..15b350f
---- /dev/null
-+++ b/drivers/i2c/chips/pcf50606.h
-@@ -0,0 +1,302 @@
-+#ifndef _PCF50606_H
-+#define _PCF50606_H
-+
-+/* Philips PCF50606 Power Managemnt Unit (PMU) driver
-+ * (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ *
-+ */
-+
-+enum pfc50606_regs {
-+      PCF50606_REG_ID         = 0x00,
-+      PCF50606_REG_OOCS       = 0x01,
-+      PCF50606_REG_INT1       = 0x02, /* Interrupt Status */
-+      PCF50606_REG_INT2       = 0x03, /* Interrupt Status */
-+      PCF50606_REG_INT3       = 0x04, /* Interrupt Status */
-+      PCF50606_REG_INT1M      = 0x05, /* Interrupt Mask */
-+      PCF50606_REG_INT2M      = 0x06, /* Interrupt Mask */
-+      PCF50606_REG_INT3M      = 0x07, /* Interrupt Mask */
-+      PCF50606_REG_OOCC1      = 0x08,
-+      PCF50606_REG_OOCC2      = 0x09,
-+      PCF50606_REG_RTCSC      = 0x0a, /* Second */
-+      PCF50606_REG_RTCMN      = 0x0b, /* Minute */
-+      PCF50606_REG_RTCHR      = 0x0c, /* Hour */
-+      PCF50606_REG_RTCWD      = 0x0d, /* Weekday */
-+      PCF50606_REG_RTCDT      = 0x0e, /* Day */
-+      PCF50606_REG_RTCMT      = 0x0f, /* Month */
-+      PCF50606_REG_RTCYR      = 0x10, /* Year */
-+      PCF50606_REG_RTCSCA     = 0x11, /* Alarm Second */
-+      PCF50606_REG_RTCMNA     = 0x12, /* Alarm Minute */
-+      PCF50606_REG_RTCHRA     = 0x13, /* Alarm Hour */
-+      PCF50606_REG_RTCWDA     = 0x14, /* Alarm Weekday */
-+      PCF50606_REG_RTCDTA     = 0x15, /* Alarm Day */
-+      PCF50606_REG_RTCMTA     = 0x16, /* Alarm Month */
-+      PCF50606_REG_RTCYRA     = 0x17, /* Alarm Year */
-+      PCF50606_REG_PSSC       = 0x18, /* Power sequencing */
-+      PCF50606_REG_PWROKM     = 0x19, /* PWROK mask */
-+      PCF50606_REG_PWROKS     = 0x1a, /* PWROK status */
-+      PCF50606_REG_DCDC1      = 0x1b,
-+      PCF50606_REG_DCDC2      = 0x1c,
-+      PCF50606_REG_DCDC3      = 0x1d,
-+      PCF50606_REG_DCDC4      = 0x1e,
-+      PCF50606_REG_DCDEC1     = 0x1f,
-+      PCF50606_REG_DCDEC2     = 0x20,
-+      PCF50606_REG_DCUDC1     = 0x21,
-+      PCF50606_REG_DCUDC2     = 0x22,
-+      PCF50606_REG_IOREGC     = 0x23,
-+      PCF50606_REG_D1REGC1    = 0x24,
-+      PCF50606_REG_D2REGC1    = 0x25,
-+      PCF50606_REG_D3REGC1    = 0x26,
-+      PCF50606_REG_LPREGC1    = 0x27,
-+      PCF50606_REG_LPREGC2    = 0x28,
-+      PCF50606_REG_MBCC1      = 0x29,
-+      PCF50606_REG_MBCC2      = 0x2a,
-+      PCF50606_REG_MBCC3      = 0x2b,
-+      PCF50606_REG_MBCS1      = 0x2c,
-+      PCF50606_REG_BBCC       = 0x2d,
-+      PCF50606_REG_ADCC1      = 0x2e,
-+      PCF50606_REG_ADCC2      = 0x2f,
-+      PCF50606_REG_ADCS1      = 0x30,
-+      PCF50606_REG_ADCS2      = 0x31,
-+      PCF50606_REG_ADCS3      = 0x32,
-+      PCF50606_REG_ACDC1      = 0x33,
-+      PCF50606_REG_BVMC       = 0x34,
-+      PCF50606_REG_PWMC1      = 0x35,
-+      PCF50606_REG_LEDC1      = 0x36,
-+      PCF50606_REG_LEDC2      = 0x37,
-+      PCF50606_REG_GPOC1      = 0x38,
-+      PCF50606_REG_GPOC2      = 0x39,
-+      PCF50606_REG_GPOC3      = 0x3a,
-+      PCF50606_REG_GPOC4      = 0x3b,
-+      PCF50606_REG_GPOC5      = 0x3c,
-+      __NUM_PCF50606_REGS
-+};
-+
-+enum pcf50606_reg_oocs {
-+      PFC50606_OOCS_ONKEY     = 0x01,
-+      PCF50606_OOCS_EXTON     = 0x02,
-+      PCF50606_OOCS_PWROKRST  = 0x04,
-+      PCF50606_OOCS_BATOK     = 0x08,
-+      PCF50606_OOCS_BACKOK    = 0x10,
-+      PCF50606_OOCS_CHGOK     = 0x20,
-+      PCF50606_OOCS_TEMPOK    = 0x40,
-+      PCF50606_OOCS_WDTEXP    = 0x80,
-+};
-+
-+enum pcf50606_reg_oocc1 {
-+      PCF50606_OOCC1_GOSTDBY  = 0x01,
-+      PCF50606_OOCC1_TOTRST   = 0x02,
-+      PCF50606_OOCC1_CLK32ON  = 0x04,
-+      PCF50606_OOCC1_WDTRST   = 0x08,
-+      PCF50606_OOCC1_RTCWAK   = 0x10,
-+      PCF50606_OOCC1_CHGWAK   = 0x20,
-+      PCF50606_OOCC1_EXTONWAK_HIGH    = 0x40,
-+      PCF50606_OOCC1_EXTONWAK_LOW     = 0x80,
-+};
-+
-+enum pcf50606_reg_oocc2 {
-+      PCF50606_OOCC2_ONKEYDB_NONE     = 0x00,
-+      PCF50606_OOCC2_ONKEYDB_14ms     = 0x01,
-+      PCF50606_OOCC2_ONKEYDB_62ms     = 0x02,
-+      PCF50606_OOCC2_ONKEYDB_500ms    = 0x03,
-+      PCF50606_OOCC2_EXTONDB_NONE     = 0x00,
-+      PCF50606_OOCC2_EXTONDB_14ms     = 0x04,
-+      PCF50606_OOCC2_EXTONDB_62ms     = 0x08,
-+      PCF50606_OOCC2_EXTONDB_500ms    = 0x0c,
-+};
-+
-+enum pcf50606_reg_int1 {
-+      PCF50606_INT1_ONKEYR    = 0x01, /* ONKEY rising edge */
-+      PCF50606_INT1_ONKEYF    = 0x02, /* ONKEY falling edge */
-+      PCF50606_INT1_ONKEY1S   = 0x04, /* OMKEY at least 1sec low */
-+      PCF50606_INT1_EXTONR    = 0x08, /* EXTON rising edge */
-+      PCF50606_INT1_EXTONF    = 0x10, /* EXTON falling edge */
-+      PCF50606_INT1_SECOND    = 0x40, /* RTC periodic second interrupt */
-+      PCF50606_INT1_ALARM     = 0x80, /* RTC alarm time is reached */
-+};
-+
-+enum pcf50606_reg_int2 {
-+      PCF50606_INT2_CHGINS    = 0x01, /* Charger inserted */
-+      PCF50606_INT2_CHGRM     = 0x02, /* Charger removed */
-+      PCF50606_INT2_CHGFOK    = 0x04, /* Fast charging OK */
-+      PCF50606_INT2_CHGERR    = 0x08, /* Error in charging mode */
-+      PCF50606_INT2_CHGFRDY   = 0x10, /* Fast charge completed */
-+      PCF50606_INT2_CHGPROT   = 0x20, /* Charging protection interrupt */
-+      PCF50606_INT2_CHGWD10S  = 0x40, /* Charger watchdig expires in 10s */
-+      PCF50606_INT2_CHGWDEXP  = 0x80, /* Charger watchdog expires */
-+};
-+
-+enum pcf50606_reg_int3 {
-+      PCF50606_INT3_ADCRDY    = 0x01, /* ADC conversion finished */
-+      PCF50606_INT3_ACDINS    = 0x02, /* Accessory inserted */
-+      PCF50606_INT3_ACDREM    = 0x04, /* Accessory removed */
-+      PCF50606_INT3_TSCPRES   = 0x08, /* Touch screen pressed */
-+      PCF50606_INT3_LOWBAT    = 0x40, /* Low battery voltage */
-+      PCF50606_INT3_HIGHTMP   = 0x80, /* High temperature */
-+};
-+
-+/* used by PSSC, PWROKM, PWROKS, */
-+enum pcf50606_regu {
-+      PCF50606_REGU_DCD       = 0x01, /* DCD in phase 2 */
-+      PCF50606_REGU_DCDE      = 0x02, /* DCDE in phase 2 */
-+      PCF50606_REGU_DCUD      = 0x04, /* DCDU in phase 2 */
-+      PCF50606_REGU_IO        = 0x08, /* IO in phase 2 */
-+      PCF50606_REGU_D1        = 0x10, /* D1 in phase 2 */
-+      PCF50606_REGU_D2        = 0x20, /* D2 in phase 2 */
-+      PCF50606_REGU_D3        = 0x40, /* D3 in phase 2 */
-+      PCF50606_REGU_LP        = 0x80, /* LP in phase 2 */
-+};
-+
-+enum pcf50606_reg_dcdc4 {
-+      PCF50606_DCDC4_MODE_AUTO        = 0x00,
-+      PCF50606_DCDC4_MODE_PWM         = 0x01,
-+      PCF50606_DCDC4_MODE_PCF         = 0x02,
-+      PCF50606_DCDC4_OFF_FLOAT        = 0x00,
-+      PCF50606_DCDC4_OFF_BYPASS       = 0x04,
-+      PCF50606_DCDC4_OFF_PULLDOWN     = 0x08,
-+      PCF50606_DCDC4_CURLIM_500mA     = 0x00,
-+      PCF50606_DCDC4_CURLIM_750mA     = 0x10,
-+      PCF50606_DCDC4_CURLIM_1000mA    = 0x20,
-+      PCF50606_DCDC4_CURLIM_1250mA    = 0x30,
-+      PCF50606_DCDC4_TOGGLE           = 0x40,
-+      PCF50606_DCDC4_REGSEL_DCDC2     = 0x80,
-+};
-+
-+enum pcf50606_reg_dcdec2 {
-+      PCF50606_DCDEC2_MODE_AUTO       = 0x00,
-+      PCF50606_DCDEC2_MODE_PWM        = 0x01,
-+      PCF50606_DCDEC2_MODE_PCF        = 0x02,
-+      PCF50606_DCDEC2_OFF_FLOAT       = 0x00,
-+      PCF50606_DCDEC2_OFF_BYPASS      = 0x04,
-+};
-+
-+enum pcf50606_reg_dcudc2 {
-+      PCF50606_DCUDC2_MODE_AUTO       = 0x00,
-+      PCF50606_DCUDC2_MODE_PWM        = 0x01,
-+      PCF50606_DCUDC2_MODE_PCF        = 0x02,
-+      PCF50606_DCUDC2_OFF_FLOAT       = 0x00,
-+      PCF50606_DCUDC2_OFF_BYPASS      = 0x04,
-+};
-+
-+enum pcf50606_reg_adcc1 {
-+      PCF50606_ADCC1_TSCMODACT        = 0x01,
-+      PCF50606_ADCC1_TSCMODSTB        = 0x02,
-+      PCF50606_ADCC1_TRATSET          = 0x04,
-+      PCF50606_ADCC1_NTCSWAPE         = 0x08,
-+      PCF50606_ADCC1_NTCSWAOFF        = 0x10,
-+      PCF50606_ADCC1_EXTSYNCBREAK     = 0x20,
-+      /* reserved */
-+      PCF50606_ADCC1_TSCINT           = 0x80,
-+};
-+
-+enum pcf50606_reg_adcc2 {
-+      PCF50606_ADCC2_ADCSTART         = 0x01,
-+      /* see enum pcf50606_adcc2_adcmux */
-+      PCF50606_ADCC2_SYNC_NONE        = 0x00,
-+      PCF50606_ADCC2_SYNC_TXON        = 0x20,
-+      PCF50606_ADCC2_SYNC_PWREN1      = 0x40,
-+      PCF50606_ADCC2_SYNC_PWREN2      = 0x60,
-+      PCF50606_ADCC2_RES_10BIT        = 0x00,
-+      PCF50606_ADCC2_RES_8BIT         = 0x80,
-+};
-+
-+#define PCF50606_ADCC2_ADCMUX_MASK    (0xf << 1)
-+
-+#define ADCMUX_SHIFT  1
-+enum pcf50606_adcc2_adcmux {
-+      PCF50606_ADCMUX_BATVOLT_RES     = 0x0 << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_BATVOLT_SUBTR   = 0x1 << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_ADCIN1_RES      = 0x2 << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_ADCIN1_SUBTR    = 0x3 << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_BATTEMP         = 0x4 << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_ADCIN2          = 0x5 << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_ADCIN3          = 0x6 << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_ADCIN3_RATIO    = 0x7 << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_XPOS            = 0x8 << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_YPOS            = 0x9 << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_P1              = 0xa << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_P2              = 0xb << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_BATVOLT_ADCIN1  = 0xc << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_XY_SEQUENCE     = 0xe << ADCMUX_SHIFT,
-+      PCF50606_P1_P2_RESISTANCE       = 0xf << ADCMUX_SHIFT,
-+};
-+
-+enum pcf50606_adcs2 {
-+      PCF50606_ADCS2_ADCRDY           = 0x80,
-+};
-+
-+enum pcf50606_reg_mbcc1 {
-+      PCF50606_MBCC1_CHGAPE           = 0x01,
-+      PCF50606_MBCC1_AUTOFST          = 0x02,
-+#define       PCF50606_MBCC1_CHGMOD_MASK        0x1c
-+#define       PCF50606_MBCC1_CHGMOD_SHIFT       2
-+      PCF50606_MBCC1_CHGMOD_QUAL      = 0x00,
-+      PCF50606_MBCC1_CHGMOD_PRE       = 0x04,
-+      PCF50606_MBCC1_CHGMOD_TRICKLE   = 0x08,
-+      PCF50606_MBCC1_CHGMOD_FAST_CCCV = 0x0c,
-+      PCF50606_MBCC1_CHGMOD_FAST_NOCC = 0x10,
-+      PCF50606_MBCC1_CHGMOD_FAST_NOCV = 0x14,
-+      PCF50606_MBCC1_CHGMOD_FAST_SW   = 0x18,
-+      PCF50606_MBCC1_CHGMOD_IDLE      = 0x1c,
-+      PCF50606_MBCC1_DETMOD_LOWCHG    = 0x20,
-+      PCF50606_MBCC1_DETMOD_WDRST     = 0x40,
-+};
-+
-+enum pcf50606_reg_acdc1 {
-+      PCF50606_ACDC1_ACDDET           = 0x01,
-+      PCF50606_ACDC1_THRSHLD_1V0      = 0x00,
-+      PCF50606_ACDC1_THRSHLD_1V2      = 0x02,
-+      PCF50606_ACDC1_THRSHLD_1V4      = 0x04,
-+      PCF50606_ACDC1_THRSHLD_1V6      = 0x06,
-+      PCF50606_ACDC1_THRSHLD_1V8      = 0x08,
-+      PCF50606_ACDC1_THRSHLD_2V0      = 0x0a,
-+      PCF50606_ACDC1_THRSHLD_2V2      = 0x0c,
-+      PCF50606_ACDC1_THRSHLD_2V4      = 0x0e,
-+      PCF50606_ACDC1_DISDB            = 0x10,
-+      PCF50606_ACDC1_ACDAPE           = 0x80,
-+};
-+
-+enum pcf50606_reg_bvmc {
-+      PCF50606_BVMC_LOWBAT            = 0x01,
-+      PCF50606_BVMC_THRSHLD_NULL      = 0x00,
-+      PCF50606_BVMC_THRSHLD_2V8       = 0x02,
-+      PCF50606_BVMC_THRSHLD_2V9       = 0x04,
-+      PCF50606_BVMC_THRSHLD_3V        = 0x08,
-+      PCF50606_BVMC_THRSHLD_3V1       = 0x08,
-+      PCF50606_BVMC_THRSHLD_3V2       = 0x0a,
-+      PCF50606_BVMC_THRSHLD_3V3       = 0x0c,
-+      PCF50606_BVMC_THRSHLD_3V4       = 0x0e,
-+      PCF50606_BVMC_DISDB             = 0x10,
-+};
-+
-+enum pcf50606_reg_pwmc1 {
-+      PCF50606_PWMC1_ACTSET           = 0x01,
-+      PCF50606_PWMC1_PWMDC_0_16       = 0x00,
-+      PCF50606_PWMC1_PWMDC_1_16       = 0x02,
-+      PCF50606_PWMC1_PWMDC_2_16       = 0x04,
-+      PCF50606_PWMC1_PWMDC_3_16       = 0x06,
-+      PCF50606_PWMC1_PWMDC_4_16       = 0x08,
-+      PCF50606_PWMC1_PWMDC_5_16       = 0x0a,
-+      PCF50606_PWMC1_PWMDC_6_16       = 0x0c,
-+      PCF50606_PWMC1_PWMDC_7_16       = 0x0e,
-+      PCF50606_PWMC1_PWMDC_8_16       = 0x10,
-+      PCF50606_PWMC1_PWMDC_9_16       = 0x12,
-+      PCF50606_PWMC1_PWMDC_10_16      = 0x14,
-+      PCF50606_PWMC1_PWMDC_11_16      = 0x16,
-+      PCF50606_PWMC1_PWMDC_12_16      = 0x18,
-+      PCF50606_PWMC1_PWMDC_13_16      = 0x1a,
-+      PCF50606_PWMC1_PWMDC_14_16      = 0x1c,
-+      PCF50606_PWMC1_PWMDC_15_16      = 0x1e,
-+      PCF50606_PWMC1_PRESC_512Hz      = 0x20,
-+      PCF50606_PWMC1_PRESC_256Hz      = 0x40,
-+      PCF50606_PWMC1_PRESC_64Hz       = 0x60,
-+      PCF50606_PWMC1_PRESC_56kHz      = 0x80,
-+      PCF50606_PWMC1_PRESC_28kHz      = 0xa0,
-+      PCF50606_PWMC1_PRESC_14kHz      = 0xc0,
-+      PCF50606_PWMC1_PRESC_7kHz       = 0xe0,
-+};
-+#define PCF50606_PWMC1_CLK_SHIFT      5
-+#define PCF50606_PWMC1_DC_SHIFT               1
-+
-+#endif /* _PCF50606_H */
-+
-diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
-index e18017d..9b8ae78 100644
---- a/include/linux/i2c-id.h
-+++ b/include/linux/i2c-id.h
-@@ -167,6 +167,7 @@
- #define I2C_DRIVERID_FSCHER 1046
- #define I2C_DRIVERID_W83L785TS 1047
- #define I2C_DRIVERID_OV7670 1048      /* Omnivision 7670 camera */
-+#define I2C_DRIVERID_PCF50606 1049
- /*
-  * ---- Adapter types ----------------------------------------------------
-diff --git a/include/linux/pcf50606.h b/include/linux/pcf50606.h
-new file mode 100644
-index 0000000..bc98e47
---- /dev/null
-+++ b/include/linux/pcf50606.h
-@@ -0,0 +1,108 @@
-+#ifndef _LINUX_PCF50606_H
-+#define _LINUX_PCF50606_H
-+
-+/* public in-kernel pcf50606 api */
-+enum pcf50606_regulator_id {
-+      PCF50606_REGULATOR_DCD,
-+      PCF50606_REGULATOR_DCDE,
-+      PCF50606_REGULATOR_DCUD,
-+      PCF50606_REGULATOR_D1REG,
-+      PCF50606_REGULATOR_D2REG,
-+      PCF50606_REGULATOR_D3REG,
-+      PCF50606_REGULATOR_LPREG,
-+      PCF50606_REGULATOR_IOREG,
-+      __NUM_PCF50606_REGULATORS
-+};
-+
-+struct pcf50606_data;
-+
-+/* This is an ugly construct on how to access the (currently single/global)
-+ * pcf50606 handle from other code in the kernel.  I didn't really come up with
-+ * a more decent method of dynamically resolving this */
-+extern struct pcf50606_data *pcf50606_global;
-+
-+extern void
-+pcf50606_go_standby(void);
-+
-+extern void
-+pcf50606_gpo0_set(struct pcf50606_data *pcf, int on);
-+
-+extern int
-+pcf50606_gpo0_get(struct pcf50606_data *pcf);
-+
-+extern int
-+pcf50606_voltage_set(struct pcf50606_data *pcf,
-+                   enum pcf50606_regulator_id reg,
-+                   unsigned int millivolts);
-+extern unsigned int
-+pcf50606_voltage_get(struct pcf50606_data *pcf,
-+                   enum pcf50606_regulator_id reg);
-+extern int
-+pcf50606_onoff_get(struct pcf50606_data *pcf,
-+                 enum pcf50606_regulator_id reg);
-+
-+extern int
-+pcf50606_onoff_set(struct pcf50606_data *pcf,
-+                 enum pcf50606_regulator_id reg, int on);
-+
-+extern void
-+pcf50606_charge_fast(struct pcf50606_data *pcf, int on);
-+
-+#define PMU_VRAIL_F_SUSPEND_ON        0x00000001      /* Remains on during suspend */
-+#define PMU_VRAIL_F_UNUSED    0x00000002      /* This rail is not used */
-+struct pmu_voltage_rail {
-+      char *name;
-+      unsigned int flags;
-+      struct {
-+              unsigned int init;
-+              unsigned int max;
-+      } voltage;
-+};
-+
-+enum pmu_event {
-+      PMU_EVT_NONE,
-+      PMU_EVT_INSERT,
-+      PMU_EVT_REMOVE,
-+      __NUM_PMU_EVTS
-+};
-+
-+typedef int pmu_cb(struct device *dev, unsigned int feature,
-+                 enum pmu_event event);
-+
-+#define PCF50606_FEAT_EXTON   0x00000001      /* not yet supported */
-+#define PCF50606_FEAT_MBC     0x00000002
-+#define PCF50606_FEAT_BBC     0x00000004      /* not yet supported */
-+#define PCF50606_FEAT_TSC     0x00000008      /* not yet supported */
-+#define PCF50606_FEAT_WDT     0x00000010
-+#define PCF50606_FEAT_ACD     0x00000020
-+#define PCF50606_FEAT_RTC     0x00000040
-+#define PCF50606_FEAT_PWM     0x00000080
-+#define PCF50606_FEAT_CHGCUR  0x00000100
-+#define PCF50606_FEAT_BATVOLT 0x00000200
-+#define PCF50606_FEAT_BATTEMP 0x00000400
-+#define PCF50606_FEAT_PWM_BL  0x00000800
-+
-+struct pcf50606_platform_data {
-+      /* general */
-+      unsigned int used_features;
-+      unsigned int onkey_seconds_required;
-+
-+      /* voltage regulator related */
-+      struct pmu_voltage_rail rails[__NUM_PCF50606_REGULATORS];
-+      unsigned int used_regulators;
-+
-+      /* charger related */
-+      unsigned int r_fix_batt;
-+      unsigned int r_fix_batt_par;
-+      unsigned int r_sense_milli;
-+
-+      /* backlight related */
-+      unsigned int init_brightness;
-+
-+      struct {
-+              u_int8_t mbcc3; /* charger voltage / current */
-+      } charger;
-+      pmu_cb *cb;
-+};
-+
-+#endif
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1011-gta01-core.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1011-gta01-core.patch.patch
deleted file mode 100644 (file)
index 856bbf1..0000000
+++ /dev/null
@@ -1,822 +0,0 @@
-From 4b0762543b611b44e96ace4feb80e2b4775ea000 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:31:03 +0100
-Subject: [PATCH] gta01-core.patch
- This patch adds support for the FIC Neo1973 GTA01 machine type to the ARM port
- of the Linux kernel.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- MAINTAINERS                          |    8 +
- arch/arm/mach-s3c2410/Kconfig        |    8 +
- arch/arm/mach-s3c2410/Makefile       |    1 +
- arch/arm/mach-s3c2410/mach-gta01.c   |  658 ++++++++++++++++++++++++++++++++++
- arch/arm/plat-s3c24xx/Kconfig        |    5 +
- include/asm-arm/arch-s3c2410/gta01.h |   70 ++++
- 6 files changed, 750 insertions(+), 0 deletions(-)
- create mode 100644 arch/arm/mach-s3c2410/mach-gta01.c
- create mode 100644 include/asm-arm/arch-s3c2410/gta01.h
-
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 2340cfb..4538694 100644
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -1536,6 +1536,14 @@ P:      Akinobu Mita
- M:    akinobu.mita@gmail.com
- S:    Supported
-+FIC/OPENMOKO NEO1973 GSM PHONE
-+P:    Harald Welte
-+M:    laforge@openmoko.org
-+L:    openmoko-kernel@lists.openmoko.org
-+W:    http://wiki.openmoko.org/wiki/Kernel
-+W:    http://wiki.openmoko.org/wiki/Neo1973
-+S:    Maintained
-+
- FRAMEBUFFER LAYER
- P:    Antonino Daplas
- M:    adaplas@gmail.com
-diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
-index e2079cf..a2acd65 100644
---- a/arch/arm/mach-s3c2410/Kconfig
-+++ b/arch/arm/mach-s3c2410/Kconfig
-@@ -110,5 +110,13 @@ config MACH_QT2410
-       help
-          Say Y here if you are using the Armzone QT2410
-+config MACH_NEO1973_GTA01
-+      bool "FIC Neo1973 GSM Phone (GTA01 Hardware)"
-+      select CPU_S3C2410
-+      select MACH_NEO1973
-+      select SENSORS_PCF50606
-+      help
-+         Say Y here if you are using the FIC Neo1973 GSM Phone
-+
- endmenu
-diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile
-index 3e7a855..8952a8d 100644
---- a/arch/arm/mach-s3c2410/Makefile
-+++ b/arch/arm/mach-s3c2410/Makefile
-@@ -29,3 +29,4 @@ obj-$(CONFIG_MACH_AML_M5900) += mach-amlm5900.o
- obj-$(CONFIG_BAST_PC104_IRQ)  += bast-irq.o
- obj-$(CONFIG_MACH_VR1000)     += mach-vr1000.o usb-simtec.o
- obj-$(CONFIG_MACH_QT2410)     += mach-qt2410.o
-+obj-$(CONFIG_MACH_NEO1973_GTA01)+= mach-gta01.o
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-new file mode 100644
-index 0000000..e690ed7
---- /dev/null
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -0,0 +1,658 @@
-+/*
-+ * linux/arch/arm/mach-s3c2410/mach-gta01.c
-+ *
-+ * S3C2410 Machine Support for the FIC Neo1973 GTA01
-+ *
-+ * Copyright (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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
-+ *
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/types.h>
-+#include <linux/interrupt.h>
-+#include <linux/list.h>
-+#include <linux/timer.h>
-+#include <linux/init.h>
-+#include <linux/workqueue.h>
-+#include <linux/platform_device.h>
-+#include <linux/serial_core.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/spi_bitbang.h>
-+#include <linux/mmc/mmc.h>
-+#include <linux/mmc/host.h>
-+
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/nand.h>
-+#include <linux/mtd/nand_ecc.h>
-+#include <linux/mtd/partitions.h>
-+
-+#include <linux/mmc/host.h>
-+
-+#include <linux/pcf50606.h>
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/map.h>
-+#include <asm/mach/irq.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <asm/mach-types.h>
-+
-+#include <asm/arch/regs-gpio.h>
-+#include <asm/arch/fb.h>
-+#include <asm/arch/spi.h>
-+#include <asm/arch/spi-gpio.h>
-+#include <asm/arch/usb-control.h>
-+
-+#include <asm/arch/gta01.h>
-+
-+#include <asm/plat-s3c/regs-serial.h>
-+#include <asm/plat-s3c/nand.h>
-+#include <asm/plat-s3c24xx/devs.h>
-+#include <asm/plat-s3c24xx/cpu.h>
-+#include <asm/plat-s3c24xx/pm.h>
-+#include <asm/plat-s3c24xx/udc.h>
-+
-+static struct map_desc gta01_iodesc[] __initdata = {
-+      {
-+              .virtual        = 0xe0000000,
-+              .pfn            = __phys_to_pfn(S3C2410_CS3+0x01000000),
-+              .length         = SZ_1M,
-+              .type           = MT_DEVICE
-+      },
-+};
-+
-+#define UCON S3C2410_UCON_DEFAULT
-+#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
-+#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
-+
-+static struct s3c2410_uartcfg gta01_uartcfgs[] = {
-+      [0] = {
-+              .hwport      = 0,
-+              .flags       = 0,
-+              .ucon        = UCON,
-+              .ulcon       = ULCON,
-+              .ufcon       = UFCON,
-+      },
-+      [1] = {
-+              .hwport      = 1,
-+              .flags       = 0,
-+              .ucon        = UCON,
-+              .ulcon       = ULCON,
-+              .ufcon       = UFCON,
-+      },
-+};
-+
-+/* PMU driver info */
-+
-+static int pmu_callback(struct device *dev, unsigned int feature,
-+                      enum pmu_event event)
-+{
-+      switch (feature) {
-+      case PCF50606_FEAT_ACD:
-+              switch (event) {
-+              case PMU_EVT_INSERT:
-+                      pcf50606_charge_fast(pcf50606_global, 1);
-+                      break;
-+              case PMU_EVT_REMOVE:
-+                      pcf50606_charge_fast(pcf50606_global, 0);
-+                      break;
-+              default:
-+                      break;
-+              }
-+              break;
-+      default:
-+              break;
-+      }
-+
-+      return 0;
-+}
-+
-+static struct pcf50606_platform_data gta01_pcf_pdata = {
-+      .used_features  = PCF50606_FEAT_EXTON |
-+                        PCF50606_FEAT_MBC |
-+                        PCF50606_FEAT_BBC |
-+                        PCF50606_FEAT_RTC |
-+                        PCF50606_FEAT_WDT |
-+                        PCF50606_FEAT_CHGCUR |
-+                        PCF50606_FEAT_BATVOLT |
-+                        PCF50606_FEAT_BATTEMP,
-+      .onkey_seconds_required = 3,
-+      .cb             = &pmu_callback,
-+      .r_fix_batt     = 10000,
-+      .r_fix_batt_par = 10000,
-+      .r_sense_milli  = 220,
-+      .rails  = {
-+              [PCF50606_REGULATOR_D1REG] = {
-+                      .name           = "bt_3v15",
-+                      .voltage        = {
-+                              .init   = 3150,
-+                              .max    = 3150,
-+                      },
-+              },
-+              [PCF50606_REGULATOR_D2REG] = {
-+                      .name           = "gl_2v5",
-+                      .voltage        = {
-+                              .init   = 2500,
-+                              .max    = 2500,
-+                      },
-+              },
-+              [PCF50606_REGULATOR_D3REG] = {
-+                      .name           = "stby_1v8",
-+                      .flags          = PMU_VRAIL_F_SUSPEND_ON,
-+                      .voltage        = {
-+                              .init   = 1800,
-+                              .max    = 2100,
-+                      },
-+              },
-+              [PCF50606_REGULATOR_DCD] = {
-+                      .name           = "gl_1v5",
-+                      .voltage        = {
-+                              .init   = 1500,
-+                              .max    = 1500,
-+                      },
-+              },
-+              [PCF50606_REGULATOR_DCDE] = {
-+                      .name           = "io_3v3",
-+                      .flags          = PMU_VRAIL_F_SUSPEND_ON,
-+                      .voltage        = {
-+                              .init   = 3300,
-+                              .max    = 3330,
-+                      },
-+              },
-+              [PCF50606_REGULATOR_DCUD] = {
-+                      .name           = "core_1v8",
-+                      .flags          = PMU_VRAIL_F_SUSPEND_ON,
-+                      .voltage        = {
-+                              .init   = 2100,
-+                              .max    = 2100,
-+                      },
-+              },
-+              [PCF50606_REGULATOR_IOREG] = {
-+                      .name           = "codec_3v3",
-+                      .voltage        = {
-+                              .init   = 3300,
-+                              .max    = 3300,
-+                      },
-+              },
-+              [PCF50606_REGULATOR_LPREG] = {
-+                      .name           = "lcm_3v3",
-+                      .voltage        = {
-+                              .init   = 3300,
-+                              .max    = 3300,
-+                      },
-+              }
-+      },
-+};
-+
-+static void cfg_pmu_vrail(struct pmu_voltage_rail *vrail, char *name,
-+                        unsigned int flags, unsigned int init,
-+                        unsigned int max)
-+{
-+      vrail->name = name;
-+      vrail->flags = flags;
-+      vrail->voltage.init = init;
-+      vrail->voltage.max = max;
-+}
-+
-+static void mangle_pmu_pdata_by_system_rev(void)
-+{
-+      switch (system_rev) {
-+      case GTA01Bv4_SYSTEM_REV:
-+              gta01_pcf_pdata.used_features |= PCF50606_FEAT_ACD;
-+              break;
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+              gta01_pcf_pdata.rails[PCF50606_REGULATOR_D3REG]
-+                                      .name = "user1";
-+              gta01_pcf_pdata.rails[PCF50606_REGULATOR_D3REG]
-+                                      .flags &= ~PMU_VRAIL_F_SUSPEND_ON;
-+              gta01_pcf_pdata.rails[PCF50606_REGULATOR_D3REG]
-+                                      .flags = PMU_VRAIL_F_UNUSED;
-+              break;
-+      case GTA01v4_SYSTEM_REV:
-+              cfg_pmu_vrail(&gta01_pcf_pdata.rails[PCF50606_REGULATOR_DCUD],
-+                            "core_1v8", PMU_VRAIL_F_SUSPEND_ON, 1800, 1800);
-+              cfg_pmu_vrail(&gta01_pcf_pdata.rails[PCF50606_REGULATOR_D1REG],
-+                            "vrf_3v", 0, 3000, 3000);
-+              cfg_pmu_vrail(&gta01_pcf_pdata.rails[PCF50606_REGULATOR_D3REG],
-+                            "vtcxo_2v8", 0, 2800, 2800);
-+              cfg_pmu_vrail(&gta01_pcf_pdata.rails[PCF50606_REGULATOR_DCD],
-+                            "gl_3v5", 0, 3500, 3500);
-+              break;
-+      case GTA01v3_SYSTEM_REV:
-+              cfg_pmu_vrail(&gta01_pcf_pdata.rails[PCF50606_REGULATOR_D1REG],
-+                            "vrf_3v", 0, 3000, 3000);
-+              cfg_pmu_vrail(&gta01_pcf_pdata.rails[PCF50606_REGULATOR_D2REG],
-+                            "sd_3v3", 0, 3300, 3300);
-+              cfg_pmu_vrail(&gta01_pcf_pdata.rails[PCF50606_REGULATOR_D3REG],
-+                            "codec_3v3", 0, 3300, 3300);
-+              cfg_pmu_vrail(&gta01_pcf_pdata.rails[PCF50606_REGULATOR_DCD],
-+                            "gpsio_3v3", 0, 3300, 3300);
-+              cfg_pmu_vrail(&gta01_pcf_pdata.rails[PCF50606_REGULATOR_DCUD],
-+                            "core_1v8", PMU_VRAIL_F_SUSPEND_ON, 1800, 1800);
-+              cfg_pmu_vrail(&gta01_pcf_pdata.rails[PCF50606_REGULATOR_IOREG],
-+                            "vtcxo_2v8", 0, 2800, 2800);
-+              break;
-+      }
-+}
-+
-+static struct resource gta01_pmu_resources[] = {
-+      [0] = {
-+              .flags  = IORESOURCE_IRQ,
-+              .start  = GTA01_IRQ_PCF50606,
-+              .end    = GTA01_IRQ_PCF50606,
-+      },
-+};
-+
-+struct platform_device gta01_pmu_dev = {
-+      .name           = "pcf50606",
-+      .num_resources  = ARRAY_SIZE(gta01_pmu_resources),
-+      .resource       = gta01_pmu_resources,
-+      .dev            = {
-+              .platform_data = &gta01_pcf_pdata,
-+      },
-+};
-+
-+/* LCD driver info */
-+
-+/* Configuration for 480x640 toppoly TD028TTEC1.
-+ * Do not mark this as __initdata or it will break! */
-+static struct s3c2410fb_display gta01_displays[] =  {
-+      {
-+              .type           = S3C2410_LCDCON1_TFT,
-+              .width          = 43,
-+              .height         = 58,
-+              .xres           = 480,
-+              .yres           = 640,
-+              .bpp            = 16,
-+
-+              .pixclock       = 40000,        /* HCLK/4 */
-+              .left_margin    = 104,
-+              .right_margin   = 8,
-+              .hsync_len      = 8,
-+              .upper_margin   = 2,
-+              .lower_margin   = 16,
-+              .vsync_len      = 2,
-+              .lcdcon5        = S3C2410_LCDCON5_FRM565 |
-+                                S3C2410_LCDCON5_INVVCLK |
-+                                S3C2410_LCDCON5_INVVLINE |
-+                                S3C2410_LCDCON5_INVVFRAME |
-+                                S3C2410_LCDCON5_PWREN |
-+                                S3C2410_LCDCON5_HWSWP,
-+      },
-+      {
-+              .type           = S3C2410_LCDCON1_TFT,
-+              .width          = 43,
-+              .height         = 58,
-+              .xres           = 480,
-+              .yres           = 640,
-+              .bpp            = 32,
-+
-+              .pixclock       = 40000,        /* HCLK/4 */
-+              .left_margin    = 104,
-+              .right_margin   = 8,
-+              .hsync_len      = 8,
-+              .upper_margin   = 2,
-+              .lower_margin   = 16,
-+              .vsync_len      = 2,
-+              .lcdcon5        = S3C2410_LCDCON5_FRM565 |
-+                                S3C2410_LCDCON5_INVVCLK |
-+                                S3C2410_LCDCON5_INVVLINE |
-+                                S3C2410_LCDCON5_INVVFRAME |
-+                                S3C2410_LCDCON5_PWREN |
-+                                S3C2410_LCDCON5_HWSWP,
-+      },
-+      {
-+              .type           = S3C2410_LCDCON1_TFT,
-+              .width          = 43,
-+              .height         = 58,
-+              .xres           = 240,
-+              .yres           = 320,
-+              .bpp            = 16,
-+
-+              .pixclock       = 40000,        /* HCLK/4 */
-+              .left_margin    = 104,
-+              .right_margin   = 8,
-+              .hsync_len      = 8,
-+              .upper_margin   = 2,
-+              .lower_margin   = 16,
-+              .vsync_len      = 2,
-+              .lcdcon5        = S3C2410_LCDCON5_FRM565 |
-+                                S3C2410_LCDCON5_INVVCLK |
-+                                S3C2410_LCDCON5_INVVLINE |
-+                                S3C2410_LCDCON5_INVVFRAME |
-+                                S3C2410_LCDCON5_PWREN |
-+                                S3C2410_LCDCON5_HWSWP,
-+      },
-+};
-+
-+static struct s3c2410fb_mach_info gta01_lcd_cfg __initdata = {
-+      .displays       = gta01_displays,
-+      .num_displays   = ARRAY_SIZE(gta01_displays),
-+      .default_display = 0,
-+
-+      .lpcsel         = ((0xCE6) & ~7) | 1<<4,
-+};
-+
-+static struct platform_device *gta01_devices[] __initdata = {
-+      &s3c_device_usb,
-+      &s3c_device_lcd,
-+      &s3c_device_wdt,
-+      &s3c_device_i2c,
-+      &s3c_device_iis,
-+      &s3c_device_sdi,
-+      &s3c_device_usbgadget,
-+      &s3c_device_nand,
-+};
-+
-+static struct s3c2410_nand_set gta01_nand_sets[] = {
-+      [0] = {
-+              .name           = "neo1973-nand",
-+              .nr_chips       = 1,
-+              .flags          = S3C2410_NAND_BBT,
-+      },
-+};
-+
-+static struct s3c2410_platform_nand gta01_nand_info = {
-+      .tacls          = 20,
-+      .twrph0         = 60,
-+      .twrph1         = 20,
-+      .nr_sets        = ARRAY_SIZE(gta01_nand_sets),
-+      .sets           = gta01_nand_sets,
-+};
-+
-+static void gta01_udc_command(enum s3c2410_udc_cmd_e cmd)
-+{
-+      printk(KERN_DEBUG "%s(%d)\n", __func__, cmd);
-+
-+      switch (cmd) {
-+      case S3C2410_UDC_P_ENABLE:
-+              s3c2410_gpio_setpin(GTA01_GPIO_USB_PULLUP, 1);
-+              break;
-+      case S3C2410_UDC_P_DISABLE:
-+              s3c2410_gpio_setpin(GTA01_GPIO_USB_PULLUP, 0);
-+              break;
-+      default:
-+              break;
-+      }
-+}
-+
-+/* use a work queue, since I2C API inherently schedules
-+ * and we get called in hardirq context from UDC driver */
-+
-+struct vbus_draw {
-+      struct work_struct work;
-+      int ma;
-+};
-+static struct vbus_draw gta01_udc_vbus_drawer;
-+
-+static void __gta01_udc_vbus_draw(struct work_struct *work)
-+{
-+      /* this is a fix to work around boot-time ordering problems if the
-+       * s3c2410_udc is initialized before the pcf50606 driver has defined
-+       * pcf50606_global */
-+      if (!pcf50606_global)
-+              return;
-+
-+      if (gta01_udc_vbus_drawer.ma >= 500) {
-+              /* enable fast charge */
-+              printk(KERN_DEBUG "udc: enabling fast charge\n");
-+              pcf50606_charge_fast(pcf50606_global, 1);
-+      } else {
-+              /* disable fast charge */
-+              printk(KERN_DEBUG "udc: disabling fast charge\n");
-+              pcf50606_charge_fast(pcf50606_global, 0);
-+      }
-+}
-+
-+static void gta01_udc_vbus_draw(unsigned int ma)
-+{
-+      gta01_udc_vbus_drawer.ma = ma;
-+      schedule_work(&gta01_udc_vbus_drawer.work);
-+}
-+
-+static struct s3c2410_udc_mach_info gta01_udc_cfg = {
-+      .vbus_draw      = gta01_udc_vbus_draw,
-+};
-+
-+/* SPI */
-+
-+static struct spi_board_info gta01_spi_board_info[] = {
-+      {
-+              .modalias       = "jbt6k74",
-+              /* platform_data */
-+              /* controller_data */
-+              /* irq */
-+              .max_speed_hz   = 10 * 1000 * 1000,
-+              .bus_num        = 1,
-+              /* chip_select */
-+      },
-+};
-+
-+static void spi_gpio_cs(struct s3c2410_spigpio_info *spi, int cs)
-+{
-+      switch (cs) {
-+      case BITBANG_CS_ACTIVE:
-+              s3c2410_gpio_setpin(S3C2410_GPG3, 0);
-+              break;
-+      case BITBANG_CS_INACTIVE:
-+              s3c2410_gpio_setpin(S3C2410_GPG3, 1);
-+              break;
-+      }
-+}
-+
-+static struct s3c2410_spigpio_info spi_gpio_cfg = {
-+      .pin_clk        = S3C2410_GPG7,
-+      .pin_mosi       = S3C2410_GPG6,
-+      .pin_miso       = S3C2410_GPG5,
-+      .board_size     = ARRAY_SIZE(gta01_spi_board_info),
-+      .board_info     = gta01_spi_board_info,
-+      .chip_select    = &spi_gpio_cs,
-+};
-+
-+static struct resource s3c_spi_lcm_resource[] = {
-+      [0] = {
-+              .start = S3C2410_GPG3,
-+              .end   = S3C2410_GPG3,
-+      },
-+      [1] = {
-+              .start = S3C2410_GPG5,
-+              .end   = S3C2410_GPG5,
-+      },
-+      [2] = {
-+              .start = S3C2410_GPG6,
-+              .end   = S3C2410_GPG6,
-+      },
-+      [3] = {
-+              .start = S3C2410_GPG7,
-+              .end   = S3C2410_GPG7,
-+      },
-+};
-+
-+struct platform_device s3c_device_spi_lcm = {
-+      .name             = "s3c24xx-spi-gpio",
-+      .id               = 1,
-+      .num_resources    = ARRAY_SIZE(s3c_spi_lcm_resource),
-+      .resource         = s3c_spi_lcm_resource,
-+      .dev = {
-+              .platform_data = &spi_gpio_cfg,
-+      },
-+};
-+
-+static struct gta01bl_machinfo backlight_machinfo = {
-+      .default_intensity      = 1,
-+      .max_intensity          = 1,
-+      .limit_mask             = 1,
-+};
-+
-+static struct resource gta01_bl_resources[] = {
-+      [0] = {
-+              .start  = GTA01_GPIO_BACKLIGHT,
-+              .end    = GTA01_GPIO_BACKLIGHT,
-+      },
-+};
-+
-+struct platform_device gta01_bl_dev = {
-+      .name           = "gta01-bl",
-+      .num_resources  = ARRAY_SIZE(gta01_bl_resources),
-+      .resource       = gta01_bl_resources,
-+      .dev            = {
-+              .platform_data = &backlight_machinfo,
-+      },
-+};
-+
-+static struct resource gta01_led_resources[] = {
-+      [0] = {
-+              .start  = GTA01_GPIO_VIBRATOR_ON,
-+              .end    = GTA01_GPIO_VIBRATOR_ON,
-+      },
-+};
-+
-+struct platform_device gta01_led_dev = {
-+      .name           = "neo1973-vibrator",
-+      .num_resources  = ARRAY_SIZE(gta01_led_resources),
-+      .resource       = gta01_led_resources,
-+};
-+
-+static struct resource gta01_button_resources[] = {
-+      [0] = {
-+              .start = GTA01_GPIO_AUX_KEY,
-+              .end   = GTA01_GPIO_AUX_KEY,
-+      },
-+      [1] = {
-+              .start = GTA01_GPIO_HOLD_KEY,
-+              .end   = GTA01_GPIO_HOLD_KEY,
-+      },
-+      [2] = {
-+              .start = GTA01_GPIO_JACK_INSERT,
-+              .end   = GTA01_GPIO_JACK_INSERT,
-+      },
-+};
-+
-+struct platform_device gta01_button_dev = {
-+      .name           = "neo1973-button",
-+      .num_resources  = ARRAY_SIZE(gta01_button_resources),
-+      .resource       = gta01_button_resources,
-+};
-+
-+static struct platform_device gta01_pm_gsm_dev = {
-+      .name           = "neo1973-pm-gsm",
-+};
-+
-+/* USB */
-+static struct s3c2410_hcd_info gta01_usb_info = {
-+      .port[0]        = {
-+              .flags  = S3C_HCDFLG_USED,
-+      },
-+      .port[1]        = {
-+              .flags  = 0,
-+      },
-+};
-+
-+static void __init gta01_map_io(void)
-+{
-+      s3c24xx_init_io(gta01_iodesc, ARRAY_SIZE(gta01_iodesc));
-+      s3c24xx_init_clocks(12*1000*1000);
-+      s3c24xx_init_uarts(gta01_uartcfgs, ARRAY_SIZE(gta01_uartcfgs));
-+}
-+
-+static irqreturn_t gta01_modem_irq(int irq, void *param)
-+{
-+      printk(KERN_DEBUG "modem wakeup interrupt\n");
-+      return IRQ_HANDLED;
-+}
-+
-+static void __init gta01_machine_init(void)
-+{
-+      int rc;
-+
-+      if (system_rev == GTA01v4_SYSTEM_REV ||
-+          system_rev == GTA01Bv2_SYSTEM_REV ||
-+          system_rev == GTA01Bv3_SYSTEM_REV ||
-+          system_rev == GTA01Bv4_SYSTEM_REV) {
-+              gta01_udc_cfg.udc_command = gta01_udc_command;
-+      }
-+
-+      s3c_device_usb.dev.platform_data = &gta01_usb_info;
-+      s3c_device_nand.dev.platform_data = &gta01_nand_info;
-+
-+      s3c24xx_fb_set_platdata(&gta01_lcd_cfg);
-+
-+      INIT_WORK(&gta01_udc_vbus_drawer.work, __gta01_udc_vbus_draw);
-+      s3c24xx_udc_set_platdata(&gta01_udc_cfg);
-+
-+      /* Set LCD_RESET / XRES to high */
-+      s3c2410_gpio_cfgpin(S3C2410_GPC6, S3C2410_GPIO_OUTPUT);
-+      s3c2410_gpio_setpin(S3C2410_GPC6, 1);
-+
-+      /* SPI chip select is gpio output */
-+      s3c2410_gpio_cfgpin(S3C2410_GPG3, S3C2410_GPIO_OUTPUT);
-+      s3c2410_gpio_setpin(S3C2410_GPG3, 1);
-+      platform_device_register(&s3c_device_spi_lcm);
-+
-+      platform_device_register(&gta01_bl_dev);
-+      platform_device_register(&gta01_button_dev);
-+      platform_device_register(&gta01_pm_gsm_dev);
-+
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+      case GTA01v4_SYSTEM_REV:
-+              /* just use the default (GTA01_IRQ_PCF50606) */
-+              break;
-+      case GTA01Bv2_SYSTEM_REV:
-+      case GTA01Bv3_SYSTEM_REV:
-+              /* just use the default (GTA01_IRQ_PCF50606) */
-+              gta01_led_resources[0].start =
-+                      gta01_led_resources[0].end = GTA01Bv2_GPIO_VIBRATOR_ON;
-+              break;
-+      case GTA01Bv4_SYSTEM_REV:
-+              gta01_pmu_resources[0].start =
-+                      gta01_pmu_resources[0].end = GTA01Bv4_IRQ_PCF50606;
-+              gta01_led_resources[0].start =
-+                      gta01_led_resources[0].end = GTA01Bv4_GPIO_VIBRATOR_ON;
-+              break;
-+      }
-+      mangle_pmu_pdata_by_system_rev();
-+      platform_device_register(&gta01_pmu_dev);
-+      platform_device_register(&gta01_led_dev);
-+
-+      platform_add_devices(gta01_devices, ARRAY_SIZE(gta01_devices));
-+
-+      s3c2410_pm_init();
-+
-+      set_irq_type(GTA01_IRQ_MODEM, IRQT_RISING);
-+      rc = request_irq(GTA01_IRQ_MODEM, gta01_modem_irq, IRQF_DISABLED,
-+                       "modem", NULL);
-+      if (!rc)
-+              printk(KERN_ERR  "GTA01: can't request GSM modem wakeup IRQ\n");
-+      enable_irq_wake(GTA01_IRQ_MODEM);
-+}
-+
-+MACHINE_START(NEO1973_GTA01, "GTA01")
-+      .phys_io        = S3C2410_PA_UART,
-+      .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
-+      .boot_params    = S3C2410_SDRAM_PA + 0x100,
-+      .map_io         = gta01_map_io,
-+      .init_irq       = s3c24xx_init_irq,
-+      .init_machine   = gta01_machine_init,
-+      .timer          = &s3c24xx_timer,
-+MACHINE_END
-diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig
-index b66fb3c..7ee4b82 100644
---- a/arch/arm/plat-s3c24xx/Kconfig
-+++ b/arch/arm/plat-s3c24xx/Kconfig
-@@ -46,4 +46,9 @@ config MACH_SMDK
-       help
-         Common machine code for SMDK2410 and SMDK2440
-+config MACH_NEO1973
-+      bool
-+      help
-+        Common machine code for Neo1973 hardware
-+
- endif
-diff --git a/include/asm-arm/arch-s3c2410/gta01.h b/include/asm-arm/arch-s3c2410/gta01.h
-new file mode 100644
-index 0000000..1cc2099
---- /dev/null
-+++ b/include/asm-arm/arch-s3c2410/gta01.h
-@@ -0,0 +1,70 @@
-+#ifndef _GTA01_H
-+#define _GTA01_H
-+
-+#include <asm/arch/regs-gpio.h>
-+#include <asm/arch/irqs.h>
-+
-+/* Different hardware revisions, passed in ATAG_REVISION by u-boot */
-+#define GTA01v3_SYSTEM_REV    0x00000130
-+#define GTA01v4_SYSTEM_REV    0x00000140
-+#define GTA01Bv2_SYSTEM_REV   0x00000220
-+#define GTA01Bv3_SYSTEM_REV   0x00000230
-+#define GTA01Bv4_SYSTEM_REV   0x00000240
-+
-+/* Backlight */
-+struct gta01bl_machinfo {
-+      unsigned int default_intensity;
-+      unsigned int max_intensity;
-+      unsigned int limit_mask;
-+};
-+
-+/* Definitions common to all revisions */
-+#define GTA01_GPIO_BACKLIGHT  S3C2410_GPB0
-+#define GTA01_GPIO_GPS_PWRON  S3C2410_GPB1
-+#define GTA01_GPIO_MODEM_RST  S3C2410_GPB6
-+#define GTA01_GPIO_MODEM_ON   S3C2410_GPB7
-+#define GTA01_GPIO_LCD_RESET  S3C2410_GPC6
-+#define GTA01_GPIO_PMU_IRQ    S3C2410_GPG8
-+#define GTA01_GPIO_JACK_INSERT        S3C2410_GPF4
-+#define GTA01_GPIO_nSD_DETECT S3C2410_GPF5
-+#define GTA01_GPIO_AUX_KEY    S3C2410_GPF6
-+#define GTA01_GPIO_HOLD_KEY   S3C2410_GPF7
-+#define GTA01_GPIO_VIBRATOR_ON        S3C2410_GPG11
-+
-+#define GTA01_IRQ_MODEM               IRQ_EINT1
-+#define GTA01_IRQ_JACK_INSERT IRQ_EINT4
-+#define GTA01_IRQ_nSD_DETECT  IRQ_EINT5
-+#define GTA01_IRQ_AUX_KEY     IRQ_EINT6
-+#define GTA01_IRQ_PCF50606      IRQ_EINT16
-+
-+/* GTA01v3 */
-+#define GTA01v3_GPIO_nGSM_EN  S3C2410_GPG9
-+
-+/* GTA01v4 */
-+#define GTA01_GPIO_MODEM_DNLOAD       S3C2410_GPG0
-+
-+/* GTA01Bv2 */
-+#define GTA01Bv2_GPIO_nGSM_EN S3C2410_GPF2
-+#define GTA01Bv2_GPIO_VIBRATOR_ON S3C2410_GPB10
-+
-+/* GTA01Bv3 */
-+#define GTA01_GPIO_GPS_EN_3V3 S3C2410_GPG9
-+
-+#define GTA01_GPIO_SDMMC_ON   S3C2410_GPB2
-+#define GTA01_GPIO_BT_EN      S3C2410_GPB5
-+#define GTA01_GPIO_AB_DETECT  S3C2410_GPB8
-+#define GTA01_GPIO_USB_PULLUP S3C2410_GPB9
-+#define GTA01_GPIO_USB_ATTACH S3C2410_GPB10
-+
-+#define GTA01_GPIO_GPS_EN_2V8 S3C2410_GPG9
-+#define GTA01_GPIO_GPS_EN_3V  S3C2410_GPG10
-+#define GTA01_GPIO_GPS_RESET  S3C2410_GPC0
-+
-+/* GTA01Bv4 */
-+#define GTA01Bv4_GPIO_nNAND_WP        S3C2410_GPA16
-+#define GTA01Bv4_GPIO_VIBRATOR_ON S3C2410_GPB3
-+#define GTA01Bv4_GPIO_PMU_IRQ S3C2410_GPG1
-+
-+#define GTA01Bv4_IRQ_PCF50606 IRQ_EINT9
-+
-+#endif /* _GTA01_H */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1012-gta01-jbt6k74.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1012-gta01-jbt6k74.patch.patch
deleted file mode 100644 (file)
index 210d004..0000000
+++ /dev/null
@@ -1,748 +0,0 @@
-From 6887823c9ab409a15ea73bda8a8b0523cebbe444 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:31:13 +0100
-Subject: [PATCH] gta01-jbt6k74.patch
- This driver adds support for the SPI-based control interface of the LCM (LCD
- Panel) found on the FIC GTA01 hardware.
-
-The specific panel in this hardware is a TPO TD028TTEC1, but the driver should
-be able to drive any other diplay based on the JBT6K74-AS controller ASIC.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- arch/arm/mach-s3c2410/Kconfig   |    1 +
- drivers/video/display/Kconfig   |   11 +
- drivers/video/display/Makefile  |    1 +
- drivers/video/display/jbt6k74.c |  678 +++++++++++++++++++++++++++++++++++++++
- 4 files changed, 691 insertions(+), 0 deletions(-)
- create mode 100644 drivers/video/display/jbt6k74.c
-
-diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
-index a2acd65..ff339e1 100644
---- a/arch/arm/mach-s3c2410/Kconfig
-+++ b/arch/arm/mach-s3c2410/Kconfig
-@@ -107,6 +107,7 @@ config MACH_VR1000
- config MACH_QT2410
-       bool "QT2410"
-       select CPU_S3C2410
-+      select DISPLAY_JBT6K74
-       help
-          Say Y here if you are using the Armzone QT2410
-diff --git a/drivers/video/display/Kconfig b/drivers/video/display/Kconfig
-index f99af93..f0da483 100644
---- a/drivers/video/display/Kconfig
-+++ b/drivers/video/display/Kconfig
-@@ -21,4 +21,15 @@ config DISPLAY_SUPPORT
- comment "Display hardware drivers"
-       depends on DISPLAY_SUPPORT
-+config DISPLAY_JBT6K74
-+      tristate "TPO JBT6K74-AS TFT display ASIC control interface"
-+      depends on SPI_MASTER && SYSFS
-+      help
-+        SPI driver for the control interface of TFT panels containing
-+        the TPO JBT6K74-AS controller ASIC, such as the TPO TD028TTEC1
-+        TFT diplay module used in the FIC/OpenMoko Neo1973 GSM phones.
-+
-+        The control interface is required for display operation, as it
-+        controls power management, display timing and gamma calibration.
-+
- endmenu
-diff --git a/drivers/video/display/Makefile b/drivers/video/display/Makefile
-index c0ea832..011b69d 100644
---- a/drivers/video/display/Makefile
-+++ b/drivers/video/display/Makefile
-@@ -3,4 +3,5 @@
- display-objs                          := display-sysfs.o
- obj-$(CONFIG_DISPLAY_SUPPORT)         += display.o
-+obj-$(CONFIG_DISPLAY_JBT6K74)         += jbt6k74.o
-diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c
-new file mode 100644
-index 0000000..d021d7e
---- /dev/null
-+++ b/drivers/video/display/jbt6k74.c
-@@ -0,0 +1,678 @@
-+/* Linux kernel driver for the tpo JBT6K74-AS LCM ASIC
-+ *
-+ * Copyright (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>,
-+ *       Stefan Schmidt <stefan@openmoko.org>
-+ * 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
-+ *
-+ */
-+#include <linux/kernel.h>
-+#include <linux/types.h>
-+#include <linux/module.h>
-+#include <linux/device.h>
-+#include <linux/platform_device.h>
-+#include <linux/delay.h>
-+
-+#include <linux/spi/spi.h>
-+
-+enum jbt_register {
-+      JBT_REG_SLEEP_IN                = 0x10,
-+      JBT_REG_SLEEP_OUT               = 0x11,
-+
-+      JBT_REG_DISPLAY_OFF             = 0x28,
-+      JBT_REG_DISPLAY_ON              = 0x29,
-+
-+      JBT_REG_RGB_FORMAT              = 0x3a,
-+      JBT_REG_QUAD_RATE               = 0x3b,
-+
-+      JBT_REG_POWER_ON_OFF            = 0xb0,
-+      JBT_REG_BOOSTER_OP              = 0xb1,
-+      JBT_REG_BOOSTER_MODE            = 0xb2,
-+      JBT_REG_BOOSTER_FREQ            = 0xb3,
-+      JBT_REG_OPAMP_SYSCLK            = 0xb4,
-+      JBT_REG_VSC_VOLTAGE             = 0xb5,
-+      JBT_REG_VCOM_VOLTAGE            = 0xb6,
-+      JBT_REG_EXT_DISPL               = 0xb7,
-+      JBT_REG_OUTPUT_CONTROL          = 0xb8,
-+      JBT_REG_DCCLK_DCEV              = 0xb9,
-+      JBT_REG_DISPLAY_MODE1           = 0xba,
-+      JBT_REG_DISPLAY_MODE2           = 0xbb,
-+      JBT_REG_DISPLAY_MODE            = 0xbc,
-+      JBT_REG_ASW_SLEW                = 0xbd,
-+      JBT_REG_DUMMY_DISPLAY           = 0xbe,
-+      JBT_REG_DRIVE_SYSTEM            = 0xbf,
-+
-+      JBT_REG_SLEEP_OUT_FR_A          = 0xc0,
-+      JBT_REG_SLEEP_OUT_FR_B          = 0xc1,
-+      JBT_REG_SLEEP_OUT_FR_C          = 0xc2,
-+      JBT_REG_SLEEP_IN_LCCNT_D        = 0xc3,
-+      JBT_REG_SLEEP_IN_LCCNT_E        = 0xc4,
-+      JBT_REG_SLEEP_IN_LCCNT_F        = 0xc5,
-+      JBT_REG_SLEEP_IN_LCCNT_G        = 0xc6,
-+
-+      JBT_REG_GAMMA1_FINE_1           = 0xc7,
-+      JBT_REG_GAMMA1_FINE_2           = 0xc8,
-+      JBT_REG_GAMMA1_INCLINATION      = 0xc9,
-+      JBT_REG_GAMMA1_BLUE_OFFSET      = 0xca,
-+
-+      /* VGA */
-+      JBT_REG_BLANK_CONTROL           = 0xcf,
-+      JBT_REG_BLANK_TH_TV             = 0xd0,
-+      JBT_REG_CKV_ON_OFF              = 0xd1,
-+      JBT_REG_CKV_1_2                 = 0xd2,
-+      JBT_REG_OEV_TIMING              = 0xd3,
-+      JBT_REG_ASW_TIMING_1            = 0xd4,
-+      JBT_REG_ASW_TIMING_2            = 0xd5,
-+
-+      /* QVGA */
-+      JBT_REG_BLANK_CONTROL_QVGA      = 0xd6,
-+      JBT_REG_BLANK_TH_TV_QVGA        = 0xd7,
-+      JBT_REG_CKV_ON_OFF_QVGA         = 0xd8,
-+      JBT_REG_CKV_1_2_QVGA            = 0xd9,
-+      JBT_REG_OEV_TIMING_QVGA         = 0xde,
-+      JBT_REG_ASW_TIMING_1_QVGA       = 0xdf,
-+      JBT_REG_ASW_TIMING_2_QVGA       = 0xe0,
-+
-+
-+      JBT_REG_HCLOCK_VGA              = 0xec,
-+      JBT_REG_HCLOCK_QVGA             = 0xed,
-+
-+};
-+
-+enum jbt_state {
-+      JBT_STATE_DEEP_STANDBY,
-+      JBT_STATE_SLEEP,
-+      JBT_STATE_NORMAL,
-+      JBT_STATE_QVGA_NORMAL,
-+};
-+
-+static const char *jbt_state_names[] = {
-+      [JBT_STATE_DEEP_STANDBY]        = "deep-standby",
-+      [JBT_STATE_SLEEP]               = "sleep",
-+      [JBT_STATE_NORMAL]              = "normal",
-+      [JBT_STATE_QVGA_NORMAL]         = "qvga-normal",
-+};
-+
-+struct jbt_info {
-+      enum jbt_state state, last_state;
-+      struct spi_device *spi_dev;
-+      struct mutex lock;              /* protects tx_buf and reg_cache */
-+      u16 tx_buf[8];
-+      u16 reg_cache[0xEE];
-+};
-+
-+#define JBT_COMMAND   0x000
-+#define JBT_DATA      0x100
-+
-+static int jbt_reg_write_nodata(struct jbt_info *jbt, u8 reg)
-+{
-+      int rc;
-+
-+      mutex_lock(&jbt->lock);
-+
-+      jbt->tx_buf[0] = JBT_COMMAND | reg;
-+      rc = spi_write(jbt->spi_dev, (u8 *)jbt->tx_buf,
-+                     1*sizeof(u16));
-+      if (rc == 0)
-+              jbt->reg_cache[reg] = 0;
-+
-+      mutex_unlock(&jbt->lock);
-+
-+      return rc;
-+}
-+
-+
-+static int jbt_reg_write(struct jbt_info *jbt, u8 reg, u8 data)
-+{
-+      int rc;
-+
-+      mutex_lock(&jbt->lock);
-+
-+      jbt->tx_buf[0] = JBT_COMMAND | reg;
-+      jbt->tx_buf[1] = JBT_DATA | data;
-+      rc = spi_write(jbt->spi_dev, (u8 *)jbt->tx_buf,
-+                     2*sizeof(u16));
-+      if (rc == 0)
-+              jbt->reg_cache[reg] = data;
-+
-+      mutex_unlock(&jbt->lock);
-+
-+      return rc;
-+}
-+
-+static int jbt_reg_write16(struct jbt_info *jbt, u8 reg, u16 data)
-+{
-+      int rc;
-+
-+      mutex_lock(&jbt->lock);
-+
-+      jbt->tx_buf[0] = JBT_COMMAND | reg;
-+      jbt->tx_buf[1] = JBT_DATA | (data >> 8);
-+      jbt->tx_buf[2] = JBT_DATA | (data & 0xff);
-+
-+      rc = spi_write(jbt->spi_dev, (u8 *)jbt->tx_buf,
-+                     3*sizeof(u16));
-+      if (rc == 0)
-+              jbt->reg_cache[reg] = data;
-+
-+      mutex_unlock(&jbt->lock);
-+
-+      return rc;
-+}
-+
-+static int jbt_init_regs(struct jbt_info *jbt, int qvga)
-+{
-+      int rc;
-+
-+      dev_dbg(&jbt->spi_dev->dev, "entering %cVGA mode\n", qvga ? 'Q' : ' ');
-+
-+      rc = jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE1, 0x01);
-+      rc |= jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE2, 0x00);
-+      rc |= jbt_reg_write(jbt, JBT_REG_RGB_FORMAT, 0x60);
-+      rc |= jbt_reg_write(jbt, JBT_REG_DRIVE_SYSTEM, 0x10);
-+      rc |= jbt_reg_write(jbt, JBT_REG_BOOSTER_OP, 0x56);
-+      rc |= jbt_reg_write(jbt, JBT_REG_BOOSTER_MODE, 0x33);
-+      rc |= jbt_reg_write(jbt, JBT_REG_BOOSTER_FREQ, 0x11);
-+      rc |= jbt_reg_write(jbt, JBT_REG_OPAMP_SYSCLK, 0x02);
-+      rc |= jbt_reg_write(jbt, JBT_REG_VSC_VOLTAGE, 0x2b);
-+      rc |= jbt_reg_write(jbt, JBT_REG_VCOM_VOLTAGE, 0x40);
-+      rc |= jbt_reg_write(jbt, JBT_REG_EXT_DISPL, 0x03);
-+      rc |= jbt_reg_write(jbt, JBT_REG_DCCLK_DCEV, 0x04);
-+      /*
-+       * default of 0x02 in JBT_REG_ASW_SLEW responsible for 72Hz requirement
-+       * to avoid red / blue flicker
-+       */
-+      rc |= jbt_reg_write(jbt, JBT_REG_ASW_SLEW, 0x04);
-+      rc |= jbt_reg_write(jbt, JBT_REG_DUMMY_DISPLAY, 0x00);
-+
-+      rc |= jbt_reg_write(jbt, JBT_REG_SLEEP_OUT_FR_A, 0x11);
-+      rc |= jbt_reg_write(jbt, JBT_REG_SLEEP_OUT_FR_B, 0x11);
-+      rc |= jbt_reg_write(jbt, JBT_REG_SLEEP_OUT_FR_C, 0x11);
-+      rc |= jbt_reg_write16(jbt, JBT_REG_SLEEP_IN_LCCNT_D, 0x2040);
-+      rc |= jbt_reg_write16(jbt, JBT_REG_SLEEP_IN_LCCNT_E, 0x60c0);
-+      rc |= jbt_reg_write16(jbt, JBT_REG_SLEEP_IN_LCCNT_F, 0x1020);
-+      rc |= jbt_reg_write16(jbt, JBT_REG_SLEEP_IN_LCCNT_G, 0x60c0);
-+
-+      rc |= jbt_reg_write16(jbt, JBT_REG_GAMMA1_FINE_1, 0x5533);
-+      rc |= jbt_reg_write(jbt, JBT_REG_GAMMA1_FINE_2, 0x00);
-+      rc |= jbt_reg_write(jbt, JBT_REG_GAMMA1_INCLINATION, 0x00);
-+      rc |= jbt_reg_write(jbt, JBT_REG_GAMMA1_BLUE_OFFSET, 0x00);
-+
-+      if (!qvga) {
-+              rc |= jbt_reg_write16(jbt, JBT_REG_HCLOCK_VGA, 0x1f0);
-+              rc |= jbt_reg_write(jbt, JBT_REG_BLANK_CONTROL, 0x02);
-+              rc |= jbt_reg_write16(jbt, JBT_REG_BLANK_TH_TV, 0x0804);
-+
-+              rc |= jbt_reg_write(jbt, JBT_REG_CKV_ON_OFF, 0x01);
-+              rc |= jbt_reg_write16(jbt, JBT_REG_CKV_1_2, 0x0000);
-+
-+              rc |= jbt_reg_write16(jbt, JBT_REG_OEV_TIMING, 0x0d0e);
-+              rc |= jbt_reg_write16(jbt, JBT_REG_ASW_TIMING_1, 0x11a4);
-+              rc |= jbt_reg_write(jbt, JBT_REG_ASW_TIMING_2, 0x0e);
-+      } else {
-+              rc |= jbt_reg_write16(jbt, JBT_REG_HCLOCK_QVGA, 0x00ff);
-+              rc |= jbt_reg_write(jbt, JBT_REG_BLANK_CONTROL_QVGA, 0x02);
-+              rc |= jbt_reg_write16(jbt, JBT_REG_BLANK_TH_TV_QVGA, 0x0804);
-+
-+              rc |= jbt_reg_write(jbt, JBT_REG_CKV_ON_OFF_QVGA, 0x01);
-+              rc |= jbt_reg_write16(jbt, JBT_REG_CKV_1_2_QVGA, 0x0008);
-+
-+              rc |= jbt_reg_write16(jbt, JBT_REG_OEV_TIMING_QVGA, 0x050a);
-+              rc |= jbt_reg_write16(jbt, JBT_REG_ASW_TIMING_1_QVGA, 0x0a19);
-+              rc |= jbt_reg_write(jbt, JBT_REG_ASW_TIMING_2_QVGA, 0x0a);
-+      }
-+
-+      return rc ? -EIO : 0;
-+}
-+
-+static int standby_to_sleep(struct jbt_info *jbt)
-+{
-+      int rc;
-+
-+      /* three times command zero */
-+      rc = jbt_reg_write_nodata(jbt, 0x00);
-+      mdelay(1);
-+      rc |= jbt_reg_write_nodata(jbt, 0x00);
-+      mdelay(1);
-+      rc |= jbt_reg_write_nodata(jbt, 0x00);
-+      mdelay(1);
-+
-+      /* deep standby out */
-+      rc |= jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x17);
-+
-+      return rc ? -EIO : 0;
-+}
-+
-+static int sleep_to_normal(struct jbt_info *jbt)
-+{
-+      int rc;
-+
-+      /* RGB I/F on, RAM wirte off, QVGA through, SIGCON enable */
-+      rc = jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE, 0x80);
-+
-+      /* Quad mode off */
-+      rc |= jbt_reg_write(jbt, JBT_REG_QUAD_RATE, 0x00);
-+
-+      /* AVDD on, XVDD on */
-+      rc |= jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x16);
-+
-+      /* Output control */
-+      rc |= jbt_reg_write16(jbt, JBT_REG_OUTPUT_CONTROL, 0xfff9);
-+
-+      /* Sleep mode off */
-+      rc |= jbt_reg_write_nodata(jbt, JBT_REG_SLEEP_OUT);
-+
-+      /* initialize register set */
-+      rc |= jbt_init_regs(jbt, 0);
-+
-+      return rc ? -EIO : 0;
-+}
-+
-+static int sleep_to_qvga_normal(struct jbt_info *jbt)
-+{
-+      int rc;
-+
-+      /* RGB I/F on, RAM wirte off, QVGA through, SIGCON enable */
-+      rc = jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE, 0x81);
-+
-+      /* Quad mode on */
-+      rc |= jbt_reg_write(jbt, JBT_REG_QUAD_RATE, 0x22);
-+
-+      /* AVDD on, XVDD on */
-+      rc |= jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x16);
-+
-+      /* Output control */
-+      rc |= jbt_reg_write16(jbt, JBT_REG_OUTPUT_CONTROL, 0xfff9);
-+
-+      /* Sleep mode off */
-+      rc |= jbt_reg_write_nodata(jbt, JBT_REG_SLEEP_OUT);
-+
-+      /* initialize register set for qvga*/
-+      rc |= jbt_init_regs(jbt, 1);
-+
-+      return rc ? -EIO : 0;
-+}
-+
-+static int normal_to_sleep(struct jbt_info *jbt)
-+{
-+      int rc;
-+
-+      rc = jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_OFF);
-+      rc |= jbt_reg_write16(jbt, JBT_REG_OUTPUT_CONTROL, 0x8002);
-+      rc |= jbt_reg_write_nodata(jbt, JBT_REG_SLEEP_IN);
-+
-+      return rc ? -EIO : 0;
-+}
-+
-+static int sleep_to_standby(struct jbt_info *jbt)
-+{
-+      return jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x00);
-+}
-+
-+/* frontend function */
-+int jbt6k74_enter_state(struct jbt_info *jbt, enum jbt_state new_state)
-+{
-+      int rc = -EINVAL;
-+
-+      dev_dbg(&jbt->spi_dev->dev, "entering (old_state=%u, "
-+              "new_state=%u)\n", jbt->state, new_state);
-+
-+      switch (jbt->state) {
-+      case JBT_STATE_DEEP_STANDBY:
-+              switch (new_state) {
-+              case JBT_STATE_DEEP_STANDBY:
-+                      rc = 0;
-+                      break;
-+              case JBT_STATE_SLEEP:
-+                      rc = standby_to_sleep(jbt);
-+                      break;
-+              case JBT_STATE_NORMAL:
-+                      /* first transition into sleep */
-+                      rc = standby_to_sleep(jbt);
-+                      /* then transition into normal */
-+                      rc |= sleep_to_normal(jbt);
-+                      break;
-+              case JBT_STATE_QVGA_NORMAL:
-+                      /* first transition into sleep */
-+                      rc = standby_to_sleep(jbt);
-+                      /* then transition into normal */
-+                      rc |= sleep_to_qvga_normal(jbt);
-+                      break;
-+              }
-+              break;
-+      case JBT_STATE_SLEEP:
-+              switch (new_state) {
-+              case JBT_STATE_SLEEP:
-+                      rc = 0;
-+                      break;
-+              case JBT_STATE_DEEP_STANDBY:
-+                      rc = sleep_to_standby(jbt);
-+                      break;
-+              case JBT_STATE_NORMAL:
-+                      rc = sleep_to_normal(jbt);
-+                      break;
-+              case JBT_STATE_QVGA_NORMAL:
-+                      rc = sleep_to_qvga_normal(jbt);
-+                      break;
-+              }
-+              break;
-+      case JBT_STATE_NORMAL:
-+              switch (new_state) {
-+              case JBT_STATE_NORMAL:
-+                      rc = 0;
-+                      break;
-+              case JBT_STATE_DEEP_STANDBY:
-+                      /* first transition into sleep */
-+                      rc = normal_to_sleep(jbt);
-+                      /* then transition into deep standby */
-+                      rc |= sleep_to_standby(jbt);
-+                      break;
-+              case JBT_STATE_SLEEP:
-+                      rc = normal_to_sleep(jbt);
-+                      break;
-+              case JBT_STATE_QVGA_NORMAL:
-+                      /* first transition into sleep */
-+                      rc = normal_to_sleep(jbt);
-+                      /* second transition into deep standby */
-+                      rc |= sleep_to_standby(jbt);
-+                      /* third transition into sleep */
-+                      rc |= standby_to_sleep(jbt);
-+                      /* fourth transition into normal */
-+                      rc |= sleep_to_qvga_normal(jbt);
-+                      break;
-+              }
-+              break;
-+      case JBT_STATE_QVGA_NORMAL:
-+              switch (new_state) {
-+              case JBT_STATE_QVGA_NORMAL:
-+                      rc = 0;
-+                      break;
-+              case JBT_STATE_DEEP_STANDBY:
-+                      /* first transition into sleep */
-+                      rc = normal_to_sleep(jbt);
-+                      /* then transition into deep standby */
-+                      rc |= sleep_to_standby(jbt);
-+                      break;
-+              case JBT_STATE_SLEEP:
-+                      rc = normal_to_sleep(jbt);
-+                      break;
-+              case JBT_STATE_NORMAL:
-+                      /* first transition into sleep */
-+                      rc = normal_to_sleep(jbt);
-+                      /* second transition into deep standby */
-+                      rc |= sleep_to_standby(jbt);
-+                      /* third transition into sleep */
-+                      rc |= standby_to_sleep(jbt);
-+                      /* fourth transition into normal */
-+                      rc |= sleep_to_normal(jbt);
-+                      break;
-+              }
-+              break;
-+      }
-+      if (rc == 0)
-+              jbt->state = new_state;
-+
-+      return rc;
-+}
-+EXPORT_SYMBOL_GPL(jbt6k74_enter_state);
-+
-+int jbt6k74_display_onoff(struct jbt_info *jbt, int on)
-+{
-+      if (on)
-+              return jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_ON);
-+      else
-+              return jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_OFF);
-+}
-+EXPORT_SYMBOL_GPL(jbt6k74_display_onoff);
-+
-+static ssize_t state_read(struct device *dev, struct device_attribute *attr,
-+                        char *buf)
-+{
-+      struct jbt_info *jbt = dev_get_drvdata(dev);
-+
-+      if (jbt->state >= ARRAY_SIZE(jbt_state_names))
-+              return -EIO;
-+
-+      return sprintf(buf, "%s\n", jbt_state_names[jbt->state]);
-+}
-+
-+static ssize_t state_write(struct device *dev, struct device_attribute *attr,
-+                         const char *buf, size_t count)
-+{
-+      struct jbt_info *jbt = dev_get_drvdata(dev);
-+      int i, rc;
-+
-+      for (i = 0; i < ARRAY_SIZE(jbt_state_names); i++) {
-+              if (!strncmp(buf, jbt_state_names[i],
-+                           strlen(jbt_state_names[i]))) {
-+                      rc = jbt6k74_enter_state(jbt, i);
-+                      if (rc)
-+                              return rc;
-+                      switch (i) {
-+                      case JBT_STATE_NORMAL:
-+                      case JBT_STATE_QVGA_NORMAL:
-+                              /* Enable display again after deep-standby */
-+                              rc = jbt6k74_display_onoff(jbt, 1);
-+                              if (rc)
-+                                      return rc;
-+                              break;
-+                      default:
-+                              break;
-+                      }
-+                      return count;
-+              }
-+      }
-+
-+      return -EINVAL;
-+}
-+
-+static DEVICE_ATTR(state, 0644, state_read, state_write);
-+
-+static int reg_by_string(const char *name)
-+{
-+      if (!strcmp(name, "gamma_fine1"))
-+              return JBT_REG_GAMMA1_FINE_1;
-+      else if (!strcmp(name, "gamma_fine2"))
-+              return JBT_REG_GAMMA1_FINE_2;
-+      else if (!strcmp(name, "gamma_inclination"))
-+              return JBT_REG_GAMMA1_INCLINATION;
-+      else
-+              return JBT_REG_GAMMA1_BLUE_OFFSET;
-+}
-+
-+static ssize_t gamma_read(struct device *dev, struct device_attribute *attr,
-+                        char *buf)
-+{
-+      struct jbt_info *jbt = dev_get_drvdata(dev);
-+      int reg = reg_by_string(attr->attr.name);
-+      u16 val;
-+
-+      mutex_lock(&jbt->lock);
-+      val = jbt->reg_cache[reg];
-+      mutex_unlock(&jbt->lock);
-+
-+      return sprintf(buf, "0x%04x\n", val);
-+}
-+
-+static ssize_t gamma_write(struct device *dev, struct device_attribute *attr,
-+                         const char *buf, size_t count)
-+{
-+      struct jbt_info *jbt = dev_get_drvdata(dev);
-+      int reg = reg_by_string(attr->attr.name);
-+      unsigned long val = simple_strtoul(buf, NULL, 10);
-+
-+      jbt_reg_write(jbt, reg, val & 0xff);
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(gamma_fine1, 0644, gamma_read, gamma_write);
-+static DEVICE_ATTR(gamma_fine2, 0644, gamma_read, gamma_write);
-+static DEVICE_ATTR(gamma_inclination, 0644, gamma_read, gamma_write);
-+static DEVICE_ATTR(gamma_blue_offset, 0644, gamma_read, gamma_write);
-+
-+static struct attribute *jbt_sysfs_entries[] = {
-+      &dev_attr_state.attr,
-+      &dev_attr_gamma_fine1.attr,
-+      &dev_attr_gamma_fine2.attr,
-+      &dev_attr_gamma_inclination.attr,
-+      &dev_attr_gamma_blue_offset.attr,
-+      NULL,
-+};
-+
-+static struct attribute_group jbt_attr_group = {
-+      .name   = NULL,
-+      .attrs  = jbt_sysfs_entries,
-+};
-+
-+/* linux device model infrastructure */
-+
-+static int __devinit jbt_probe(struct spi_device *spi)
-+{
-+      int rc;
-+      struct jbt_info *jbt;
-+
-+      /* the controller doesn't have a MISO pin; we can't do detection */
-+
-+      spi->mode = SPI_CPOL | SPI_CPHA;
-+      spi->bits_per_word = 9;
-+
-+      rc = spi_setup(spi);
-+      if (rc < 0) {
-+              dev_err(&spi->dev,
-+                      "error during spi_setup of jbt6k74 driver\n");
-+              return rc;
-+      }
-+
-+      jbt = kzalloc(sizeof(*jbt), GFP_KERNEL);
-+      if (!jbt)
-+              return -ENOMEM;
-+
-+      jbt->spi_dev = spi;
-+      jbt->state = JBT_STATE_DEEP_STANDBY;
-+      mutex_init(&jbt->lock);
-+
-+      dev_set_drvdata(&spi->dev, jbt);
-+
-+      rc = jbt6k74_enter_state(jbt, JBT_STATE_NORMAL);
-+      if (rc < 0) {
-+              dev_err(&spi->dev, "cannot enter NORMAL state\n");
-+              goto err_free_drvdata;
-+      }
-+
-+      rc = jbt6k74_display_onoff(jbt, 1);
-+      if (rc < 0) {
-+              dev_err(&spi->dev, "cannot switch display on\n");
-+              goto err_standby;
-+      }
-+
-+      rc = sysfs_create_group(&spi->dev.kobj, &jbt_attr_group);
-+      if (rc < 0) {
-+              dev_err(&spi->dev, "cannot create sysfs group\n");
-+              goto err_off;
-+      }
-+
-+      return 0;
-+
-+err_off:
-+      jbt6k74_display_onoff(jbt, 0);
-+err_standby:
-+      jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);
-+err_free_drvdata:
-+      dev_set_drvdata(&spi->dev, NULL);
-+      kfree(jbt);
-+
-+      return rc;
-+}
-+
-+static int __devexit jbt_remove(struct spi_device *spi)
-+{
-+      struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-+
-+      /* We don't want to switch off the display in case the user
-+       * accidentially onloads the module (whose use count normally is 0) */
-+
-+      sysfs_remove_group(&spi->dev.kobj, &jbt_attr_group);
-+      dev_set_drvdata(&spi->dev, NULL);
-+      kfree(jbt);
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int jbt_suspend(struct spi_device *spi, pm_message_t state)
-+{
-+      struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-+
-+      /* Save mode for resume */
-+      jbt->last_state = jbt->state;
-+      jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);
-+
-+      return 0;
-+}
-+
-+static int jbt_resume(struct spi_device *spi)
-+{
-+      struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-+
-+      jbt6k74_enter_state(jbt, jbt->last_state);
-+
-+      switch (jbt->last_state) {
-+      case JBT_STATE_NORMAL:
-+      case JBT_STATE_QVGA_NORMAL:
-+              jbt6k74_display_onoff(jbt, 1);
-+              break;
-+      default:
-+              break;
-+      }
-+
-+      return 0;
-+}
-+#else
-+#define jbt_suspend   NULL
-+#define jbt_resume    NULL
-+#endif
-+
-+static struct spi_driver jbt6k74_driver = {
-+      .driver = {
-+              .name   = "jbt6k74",
-+              .owner  = THIS_MODULE,
-+      },
-+
-+      .probe   = jbt_probe,
-+      .remove  = __devexit_p(jbt_remove),
-+      .suspend = jbt_suspend,
-+      .resume  = jbt_resume,
-+};
-+
-+static int __init jbt_init(void)
-+{
-+      return spi_register_driver(&jbt6k74_driver);
-+}
-+
-+static void __exit jbt_exit(void)
-+{
-+      spi_unregister_driver(&jbt6k74_driver);
-+}
-+
-+MODULE_DESCRIPTION("SPI driver for tpo JBT6K74-AS LCM control interface");
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_LICENSE("GPL");
-+
-+module_init(jbt_init);
-+module_exit(jbt_exit);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1013-gta01-inputdevice.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1013-gta01-inputdevice.patch.patch
deleted file mode 100644 (file)
index 5f00bc0..0000000
+++ /dev/null
@@ -1,298 +0,0 @@
-From 042ef688ad9f49101fcb5a195a5ecdbad8fde2f8 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:31:24 +0100
-Subject: [PATCH] gta01-inputdevice.patch
- This provides support for the GTA01 keyboard
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- drivers/input/keyboard/Kconfig      |   12 ++
- drivers/input/keyboard/Makefile     |    1 +
- drivers/input/keyboard/neo1973kbd.c |  242 +++++++++++++++++++++++++++++++++++
- 3 files changed, 255 insertions(+), 0 deletions(-)
- create mode 100644 drivers/input/keyboard/neo1973kbd.c
-
-diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
-index 086d58c..3b9990e 100644
---- a/drivers/input/keyboard/Kconfig
-+++ b/drivers/input/keyboard/Kconfig
-@@ -293,4 +293,16 @@ config KEYBOARD_BFIN
-         To compile this driver as a module, choose M here: the
-         module will be called bf54x-keys.
-+config KEYBOARD_NEO1973
-+      tristate "FIC Neo1973 buttons"
-+      depends on MACH_NEO1973
-+      default y
-+      help
-+        Say Y here to enable the buttons on the FIC Neo1973
-+        GSM phone.
-+
-+        To compile this driver as a module, choose M here: the
-+        module will be called neo1973kbd.
-+
-+
- endif
-diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
-index e97455f..68ecfc5 100644
---- a/drivers/input/keyboard/Makefile
-+++ b/drivers/input/keyboard/Makefile
-@@ -14,6 +14,7 @@ obj-$(CONFIG_KEYBOARD_LOCOMO)                += locomokbd.o
- obj-$(CONFIG_KEYBOARD_NEWTON)         += newtonkbd.o
- obj-$(CONFIG_KEYBOARD_STOWAWAY)               += stowaway.o
- obj-$(CONFIG_KEYBOARD_CORGI)          += corgikbd.o
-+obj-$(CONFIG_KEYBOARD_NEO1973)                += neo1973kbd.o
- obj-$(CONFIG_KEYBOARD_SPITZ)          += spitzkbd.o
- obj-$(CONFIG_KEYBOARD_HIL)            += hil_kbd.o
- obj-$(CONFIG_KEYBOARD_HIL_OLD)                += hilkbd.o
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-new file mode 100644
-index 0000000..917d5ae
---- /dev/null
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -0,0 +1,242 @@
-+/*
-+ * Keyboard driver for FIC Neo1973 GSM phone
-+ *
-+ * (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * All rights reserved.
-+ *
-+ * inspired by corkgbd.c by Richard Purdie
-+ *
-+ * 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/platform_device.h>
-+#include <linux/init.h>
-+#include <linux/input.h>
-+#include <linux/interrupt.h>
-+#include <linux/jiffies.h>
-+#include <linux/module.h>
-+#include <linux/slab.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/arch/gta01.h>
-+#include <asm/mach-types.h>
-+
-+struct neo1973kbd {
-+      struct input_dev *input;
-+      unsigned int suspended;
-+      unsigned long suspend_jiffies;
-+};
-+
-+static irqreturn_t neo1973kbd_aux_irq(int irq, void *dev_id)
-+{
-+      struct neo1973kbd *neo1973kbd_data = dev_id;
-+
-+      /* FIXME: use GPIO from platform_dev resources */
-+      if (s3c2410_gpio_getpin(GTA01_GPIO_AUX_KEY))
-+              input_report_key(neo1973kbd_data->input, KEY_PHONE, 0);
-+      else
-+              input_report_key(neo1973kbd_data->input, KEY_PHONE, 1);
-+
-+      input_sync(neo1973kbd_data->input);
-+
-+      return IRQ_HANDLED;
-+}
-+
-+static irqreturn_t neo1973kbd_hold_irq(int irq, void *dev_id)
-+{
-+      struct neo1973kbd *neo1973kbd_data = dev_id;
-+
-+      /* FIXME: use GPIO from platform_dev resources */
-+      if (s3c2410_gpio_getpin(GTA01_GPIO_HOLD_KEY))
-+              input_report_key(neo1973kbd_data->input, KEY_PAUSE, 1);
-+      else
-+              input_report_key(neo1973kbd_data->input, KEY_PAUSE, 0);
-+
-+      input_sync(neo1973kbd_data->input);
-+
-+      return IRQ_HANDLED;
-+}
-+
-+static irqreturn_t neo1973kbd_headphone_irq(int irq, void *dev_id)
-+{
-+      struct neo1973kbd *neo1973kbd_data = dev_id;
-+
-+      /* FIXME: use GPIO from platform_dev resources */
-+      if (s3c2410_gpio_getpin(GTA01_GPIO_JACK_INSERT))
-+              input_report_switch(neo1973kbd_data->input,
-+                                  SW_HEADPHONE_INSERT, 1);
-+      else
-+              input_report_switch(neo1973kbd_data->input,
-+                                  SW_HEADPHONE_INSERT, 0);
-+
-+      input_sync(neo1973kbd_data->input);
-+
-+      return IRQ_HANDLED;
-+}
-+
-+#ifdef CONFIG_PM
-+static int neo1973kbd_suspend(struct platform_device *dev, pm_message_t state)
-+{
-+      struct neo1973kbd *neo1973kbd = platform_get_drvdata(dev);
-+
-+      neo1973kbd->suspended = 1;
-+
-+      return 0;
-+}
-+
-+static int neo1973kbd_resume(struct platform_device *dev)
-+{
-+      struct neo1973kbd *neo1973kbd = platform_get_drvdata(dev);
-+
-+      neo1973kbd->suspended = 0;
-+
-+      return 0;
-+}
-+#else
-+#define neo1973kbd_suspend    NULL
-+#define neo1973kbd_resume     NULL
-+#endif
-+
-+static int neo1973kbd_probe(struct platform_device *pdev)
-+{
-+      struct neo1973kbd *neo1973kbd;
-+      struct input_dev *input_dev;
-+      int rc, irq_aux, irq_hold, irq_jack;
-+
-+      neo1973kbd = kzalloc(sizeof(struct neo1973kbd), GFP_KERNEL);
-+      input_dev = input_allocate_device();
-+      if (!neo1973kbd || !input_dev) {
-+              kfree(neo1973kbd);
-+              input_free_device(input_dev);
-+              return -ENOMEM;
-+      }
-+
-+      if (pdev->resource[0].flags != 0)
-+              return -EINVAL;
-+
-+      irq_aux = s3c2410_gpio_getirq(pdev->resource[0].start);
-+      if (irq_aux < 0)
-+              return -EINVAL;
-+
-+      irq_hold = s3c2410_gpio_getirq(pdev->resource[1].start);
-+      if (irq_hold < 0)
-+              return -EINVAL;
-+
-+      irq_jack = s3c2410_gpio_getirq(pdev->resource[2].start);
-+      if (irq_jack < 0)
-+              return -EINVAL;
-+
-+      platform_set_drvdata(pdev, neo1973kbd);
-+
-+      neo1973kbd->input = input_dev;
-+
-+      input_dev->name = "Neo1973 Buttons";
-+      input_dev->phys = "neo1973kbd/input0";
-+      input_dev->id.bustype = BUS_HOST;
-+      input_dev->id.vendor = 0x0001;
-+      input_dev->id.product = 0x0001;
-+      input_dev->id.version = 0x0100;
-+      input_dev->cdev.dev = &pdev->dev;
-+      input_dev->private = neo1973kbd;
-+
-+      input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_SW);
-+      set_bit(SW_HEADPHONE_INSERT, input_dev->swbit);
-+      set_bit(KEY_PHONE, input_dev->keybit);
-+      set_bit(KEY_PAUSE, input_dev->keybit);
-+
-+      rc = input_register_device(neo1973kbd->input);
-+      if (rc)
-+              goto out_register;
-+
-+      if (request_irq(irq_aux, neo1973kbd_aux_irq, IRQF_DISABLED |
-+                      IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-+                      "Neo1973 AUX button", neo1973kbd)) {
-+              dev_err(&pdev->dev, "Can't get IRQ %u\n", irq_aux);
-+              goto out_aux;
-+      }
-+
-+      /*
-+       * GTA01 revisions before Bv4 can't be resumed by the PMU, so we use
-+       * resume by AUX.
-+       */
-+      if (machine_is_neo1973_gta01())
-+              enable_irq_wake(irq_aux);
-+
-+      if (request_irq(irq_hold, neo1973kbd_hold_irq, IRQF_DISABLED |
-+                      IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-+                      "Neo1973 HOLD button", neo1973kbd)) {
-+              dev_err(&pdev->dev, "Can't get IRQ %u\n", irq_hold);
-+              goto out_hold;
-+      }
-+
-+      if (request_irq(irq_jack, neo1973kbd_headphone_irq, IRQF_DISABLED |
-+                      IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-+                      "Neo1973 Headphone Jack", neo1973kbd)) {
-+              dev_err(&pdev->dev, "Can't get IRQ %u\n", irq_jack);
-+              goto out_jack;
-+      }
-+      enable_irq_wake(irq_jack);
-+
-+      return 0;
-+
-+out_jack:
-+      free_irq(irq_hold, neo1973kbd);
-+out_hold:
-+      free_irq(irq_aux, neo1973kbd);
-+out_aux:
-+      input_unregister_device(neo1973kbd->input);
-+out_register:
-+      input_free_device(neo1973kbd->input);
-+      platform_set_drvdata(pdev, NULL);
-+      kfree(neo1973kbd);
-+
-+      return -ENODEV;
-+}
-+
-+static int neo1973kbd_remove(struct platform_device *pdev)
-+{
-+      struct neo1973kbd *neo1973kbd = platform_get_drvdata(pdev);
-+
-+      free_irq(s3c2410_gpio_getirq(pdev->resource[2].start), neo1973kbd);
-+      free_irq(s3c2410_gpio_getirq(pdev->resource[1].start), neo1973kbd);
-+      free_irq(s3c2410_gpio_getirq(pdev->resource[0].start), neo1973kbd);
-+
-+      input_unregister_device(neo1973kbd->input);
-+      input_free_device(neo1973kbd->input);
-+      platform_set_drvdata(pdev, NULL);
-+      kfree(neo1973kbd);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver neo1973kbd_driver = {
-+      .probe          = neo1973kbd_probe,
-+      .remove         = neo1973kbd_remove,
-+      .suspend        = neo1973kbd_suspend,
-+      .resume         = neo1973kbd_resume,
-+      .driver         = {
-+              .name   = "neo1973-button",
-+      },
-+};
-+
-+static int __devinit neo1973kbd_init(void)
-+{
-+      return platform_driver_register(&neo1973kbd_driver);
-+}
-+
-+static void __exit neo1973kbd_exit(void)
-+{
-+      platform_driver_unregister(&neo1973kbd_driver);
-+}
-+
-+module_init(neo1973kbd_init);
-+module_exit(neo1973kbd_exit);
-+
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_DESCRIPTION("FIC Neo1973 buttons input driver");
-+MODULE_LICENSE("GPL");
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1014-gta01-power_control.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1014-gta01-power_control.patch.patch
deleted file mode 100644 (file)
index e1889aa..0000000
+++ /dev/null
@@ -1,976 +0,0 @@
-From b627ce9e57a5263ddcc4e6db49625057b6461ad3 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:31:35 +0100
-Subject: [PATCH] gta01-power_control.patch
- [PATCH] Neo1973 GPS / GSM / Bluetooth power control via sysfs
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- arch/arm/plat-s3c24xx/Makefile         |    1 +
- arch/arm/plat-s3c24xx/neo1973_pm_bt.c  |  152 +++++++++
- arch/arm/plat-s3c24xx/neo1973_pm_gps.c |  560 ++++++++++++++++++++++++++++++++
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |  217 ++++++++++++
- 4 files changed, 930 insertions(+), 0 deletions(-)
- create mode 100644 arch/arm/plat-s3c24xx/neo1973_pm_bt.c
- create mode 100644 arch/arm/plat-s3c24xx/neo1973_pm_gps.c
- create mode 100644 arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-
-diff --git a/arch/arm/plat-s3c24xx/Makefile b/arch/arm/plat-s3c24xx/Makefile
-index 8e5ccaa..7192912 100644
---- a/arch/arm/plat-s3c24xx/Makefile
-+++ b/arch/arm/plat-s3c24xx/Makefile
-@@ -28,3 +28,4 @@ obj-$(CONFIG_PM)             += pm.o
- obj-$(CONFIG_PM)              += sleep.o
- obj-$(CONFIG_S3C2410_DMA)     += dma.o
- obj-$(CONFIG_MACH_SMDK)               += common-smdk.o
-+obj-$(CONFIG_MACH_NEO1973)    += neo1973_pm_gsm.o neo1973_pm_gps.o neo1973_pm_bt.o
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-new file mode 100644
-index 0000000..b1af441
---- /dev/null
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-@@ -0,0 +1,152 @@
-+/*
-+ * Bluetooth PM code for the FIC Neo1973 GSM Phone
-+ *
-+ * (C) 2007 by OpenMoko Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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 version 2 as
-+ * published by the Free Software Foundation
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+
-+#include <linux/pcf50606.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/arch/gta01.h>
-+
-+#define DRVMSG "FIC Neo1973 Bluetooth Power Management"
-+
-+static ssize_t bt_read(struct device *dev, struct device_attribute *attr,
-+                     char *buf)
-+{
-+      if (!strcmp(attr->attr.name, "power_on")) {
-+              if (pcf50606_onoff_get(pcf50606_global,
-+                                      PCF50606_REGULATOR_D1REG) &&
-+                  pcf50606_voltage_get(pcf50606_global,
-+                                       PCF50606_REGULATOR_D1REG) == 3100)
-+                      goto out_1;
-+      } else if (!strcmp(attr->attr.name, "reset")) {
-+              if (s3c2410_gpio_getpin(GTA01_GPIO_BT_EN) == 0)
-+                      goto out_1;
-+      }
-+
-+      return strlcpy(buf, "0\n", 3);
-+out_1:
-+      return strlcpy(buf, "1\n", 3);
-+}
-+
-+static ssize_t bt_write(struct device *dev, struct device_attribute *attr,
-+                      const char *buf, size_t count)
-+{
-+      unsigned long on = simple_strtoul(buf, NULL, 10);
-+
-+      if (!strcmp(attr->attr.name, "power_on")) {
-+              /* if we are powering up, assert reset, then power, then
-+               * release reset */
-+              if (on) {
-+                      s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
-+                      pcf50606_voltage_set(pcf50606_global,
-+                                           PCF50606_REGULATOR_D1REG,
-+                                           3100);
-+              }
-+              pcf50606_onoff_set(pcf50606_global,
-+                                 PCF50606_REGULATOR_D1REG, on);
-+              s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on);
-+      } else if (!strcmp(attr->attr.name, "reset")) {
-+              /* reset is low-active, so we need to invert */
-+              s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1);
-+      }
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(power_on, 0644, bt_read, bt_write);
-+static DEVICE_ATTR(reset, 0644, bt_read, bt_write);
-+
-+#ifdef CONFIG_PM
-+static int gta01_bt_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+      dev_dbg(&pdev->dev, DRVMSG ": suspending\n");
-+      /* FIXME: The PMU should save the PMU status, and the GPIO code should
-+       * preserve the GPIO level, so there shouldn't be anything left to do
-+       * for us, should there? */
-+
-+      return 0;
-+}
-+
-+static int gta01_bt_resume(struct platform_device *pdev)
-+{
-+      dev_dbg(&pdev->dev, DRVMSG ": resuming\n");
-+
-+      return 0;
-+}
-+#else
-+#define gta01_bt_suspend      NULL
-+#define gta01_bt_resume               NULL
-+#endif
-+
-+static struct attribute *gta01_bt_sysfs_entries[] = {
-+      &dev_attr_power_on.attr,
-+      &dev_attr_reset.attr,
-+      NULL
-+};
-+
-+static struct attribute_group gta01_bt_attr_group = {
-+      .name   = NULL,
-+      .attrs  = gta01_bt_sysfs_entries,
-+};
-+
-+static int __init gta01_bt_probe(struct platform_device *pdev)
-+{
-+      dev_info(&pdev->dev, DRVMSG ": starting\n");
-+
-+      /* we make sure that the voltage is off */
-+      pcf50606_onoff_set(pcf50606_global,
-+                         PCF50606_REGULATOR_D1REG, 0);
-+      /* we pull reset to low to make sure that the chip doesn't
-+       * drain power through the reset line */
-+      s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
-+
-+      return sysfs_create_group(&pdev->dev.kobj, &gta01_bt_attr_group);
-+}
-+
-+static int gta01_bt_remove(struct platform_device *pdev)
-+{
-+      sysfs_remove_group(&pdev->dev.kobj, &gta01_bt_attr_group);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver gta01_bt_driver = {
-+      .probe          = gta01_bt_probe,
-+      .remove         = gta01_bt_remove,
-+      .suspend        = gta01_bt_suspend,
-+      .resume         = gta01_bt_resume,
-+      .driver         = {
-+              .name           = "neo1973-pm-bt",
-+      },
-+};
-+
-+static int __devinit gta01_bt_init(void)
-+{
-+      return platform_driver_register(&gta01_bt_driver);
-+}
-+
-+static void gta01_bt_exit(void)
-+{
-+      platform_driver_unregister(&gta01_bt_driver);
-+}
-+
-+module_init(gta01_bt_init);
-+module_exit(gta01_bt_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_DESCRIPTION(DRVMSG);
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-new file mode 100644
-index 0000000..f8cf719
---- /dev/null
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-@@ -0,0 +1,560 @@
-+/*
-+ * GPS Power Management code for the FIC Neo1973 GSM Phone
-+ *
-+ * (C) 2007 by OpenMoko Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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 version 2 as
-+ * published by the Free Software Foundation
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/delay.h>
-+#include <linux/platform_device.h>
-+
-+#include <linux/pcf50606.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/arch/gta01.h>
-+
-+/* This is the 2.8V supply for the RTC crystal, the mail clock crystal and
-+ * the input to VDD_RF */
-+static void gps_power_2v8_set(int on)
-+{
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+      case GTA01v4_SYSTEM_REV:
-+              if (on)
-+                      pcf50606_voltage_set(pcf50606_global,
-+                                           PCF50606_REGULATOR_IOREG, 2800);
-+              pcf50606_onoff_set(pcf50606_global,
-+                                 PCF50606_REGULATOR_IOREG, on);
-+              break;
-+      case GTA01Bv2_SYSTEM_REV:
-+              s3c2410_gpio_setpin(GTA01_GPIO_GPS_EN_2V8, on);
-+                      break;
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              break;
-+      }
-+}
-+
-+static int gps_power_2v8_get(void)
-+{
-+      int ret = 0;
-+
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+      case GTA01v4_SYSTEM_REV:
-+              if (pcf50606_onoff_get(pcf50606_global,
-+                                      PCF50606_REGULATOR_IOREG) &&
-+                  pcf50606_voltage_get(pcf50606_global,
-+                                       PCF50606_REGULATOR_IOREG) == 2800)
-+                      ret = 1;
-+              break;
-+      case GTA01Bv2_SYSTEM_REV:
-+              if (s3c2410_gpio_getpin(GTA01_GPIO_GPS_EN_2V8))
-+                      ret = 1;
-+              break;
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              break;
-+      }
-+
-+      return ret;
-+}
-+
-+/* This is the 3V supply (AVDD) for the external RF frontend (LNA bias) */
-+static void gps_power_3v_set(int on)
-+{
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+      case GTA01v4_SYSTEM_REV:
-+              if (on)
-+                      pcf50606_voltage_set(pcf50606_global,
-+                                           PCF50606_REGULATOR_D1REG, 3000);
-+              pcf50606_onoff_set(pcf50606_global,
-+                                 PCF50606_REGULATOR_D1REG, on);
-+              break;
-+      case GTA01Bv2_SYSTEM_REV:
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              s3c2410_gpio_setpin(GTA01_GPIO_GPS_EN_3V, on);
-+              break;
-+      }
-+}
-+
-+static int gps_power_3v_get(void)
-+{
-+      int ret = 0;
-+
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+      case GTA01v4_SYSTEM_REV:
-+              if (pcf50606_onoff_get(pcf50606_global,
-+                                     PCF50606_REGULATOR_D1REG) &&
-+                  pcf50606_voltage_get(pcf50606_global,
-+                                       PCF50606_REGULATOR_D1REG) == 3000)
-+                      ret = 1;
-+              break;
-+      case GTA01Bv2_SYSTEM_REV:
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              if (s3c2410_gpio_getpin(GTA01_GPIO_GPS_EN_3V))
-+                      ret = 1;
-+              break;
-+      }
-+
-+      return ret;
-+}
-+
-+/* This is the 3.3V supply for VDD_IO and VDD_LPREG input */
-+static void gps_power_3v3_set(int on)
-+{
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+      case GTA01v4_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+              if (on)
-+                      pcf50606_voltage_set(pcf50606_global,
-+                                           PCF50606_REGULATOR_DCD, 3300);
-+              pcf50606_onoff_set(pcf50606_global,
-+                                 PCF50606_REGULATOR_DCD, on);
-+              break;
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              s3c2410_gpio_setpin(GTA01_GPIO_GPS_EN_3V3, on);
-+              break;
-+      }
-+}
-+
-+static int gps_power_3v3_get(void)
-+{
-+      int ret = 0;
-+
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+      case GTA01v4_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+              if (pcf50606_onoff_get(pcf50606_global,
-+                                     PCF50606_REGULATOR_DCD) &&
-+                  pcf50606_voltage_get(pcf50606_global,
-+                                       PCF50606_REGULATOR_DCD) == 3300)
-+                      ret = 1;
-+              break;
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              if (s3c2410_gpio_getpin(GTA01_GPIO_GPS_EN_3V3))
-+                      ret = 1;
-+              break;
-+      }
-+
-+      return ret;
-+}
-+
-+/* This is the 2.5V supply for VDD_PLLREG and VDD_COREREG input */
-+static void gps_power_2v5_set(int on)
-+{
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+              /* This is CORE_1V8 and cannot be disabled */
-+              break;
-+      case GTA01v4_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              if (on)
-+                      pcf50606_voltage_set(pcf50606_global,
-+                                           PCF50606_REGULATOR_D2REG, 2500);
-+              pcf50606_onoff_set(pcf50606_global,
-+                                 PCF50606_REGULATOR_D2REG, on);
-+              break;
-+      }
-+}
-+
-+static int gps_power_2v5_get(void)
-+{
-+      int ret = 0;
-+
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+              /* This is CORE_1V8 and cannot be disabled */
-+              ret = 1;
-+              break;
-+      case GTA01v4_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              if (pcf50606_onoff_get(pcf50606_global,
-+                                     PCF50606_REGULATOR_D2REG) &&
-+                  pcf50606_voltage_get(pcf50606_global,
-+                                       PCF50606_REGULATOR_D2REG) == 2500)
-+                      ret = 1;
-+              break;
-+      }
-+
-+      return ret;
-+}
-+
-+/* This is the 1.5V supply for VDD_CORE */
-+static void gps_power_1v5_set(int on)
-+{
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+      case GTA01v4_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+              /* This is switched via 2v5 */
-+              break;
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              if (on)
-+                      pcf50606_voltage_set(pcf50606_global,
-+                                           PCF50606_REGULATOR_DCD, 1500);
-+              pcf50606_onoff_set(pcf50606_global,
-+                                 PCF50606_REGULATOR_DCD, on);
-+              break;
-+      }
-+}
-+
-+static int gps_power_1v5_get(void)
-+{
-+      int ret = 0;
-+
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+      case GTA01v4_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+              /* This is switched via 2v5 */
-+              ret = 1;
-+              break;
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              if (pcf50606_onoff_get(pcf50606_global,
-+                                     PCF50606_REGULATOR_DCD) &&
-+                  pcf50606_voltage_get(pcf50606_global,
-+                                       PCF50606_REGULATOR_DCD) == 1500)
-+                      ret = 1;
-+              break;
-+      }
-+
-+      return ret;
-+}
-+
-+/* This is the POWERON pin */
-+static void gps_pwron_set(int on)
-+{
-+      s3c2410_gpio_setpin(GTA01_GPIO_GPS_PWRON, on);
-+}
-+
-+static int gps_pwron_get(void)
-+{
-+      if (s3c2410_gpio_getpin(GTA01_GPIO_GPS_PWRON))
-+              return 1;
-+      else
-+              return 0;
-+}
-+
-+/* This is the nRESET pin */
-+static void gps_rst_set(int on)
-+{
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+              pcf50606_gpo0_set(pcf50606_global, on);
-+              break;
-+      case GTA01v4_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              s3c2410_gpio_setpin(GTA01_GPIO_GPS_RESET, on);
-+              break;
-+      }
-+}
-+
-+static int gps_rst_get(void)
-+{
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+              if (pcf50606_gpo0_get(pcf50606_global))
-+                      return 1;
-+              break;
-+      case GTA01v4_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              if (s3c2410_gpio_getpin(GTA01_GPIO_GPS_RESET))
-+                      return 1;
-+              break;
-+      }
-+
-+      return 0;
-+}
-+
-+static ssize_t power_gps_read(struct device *dev,
-+                            struct device_attribute *attr, char *buf)
-+{
-+      int ret = 0;
-+
-+      if (!strcmp(attr->attr.name, "power_tcxo_2v8")) {
-+              ret = gps_power_2v8_get();
-+      } else if (!strcmp(attr->attr.name, "power_avdd_3v")) {
-+              ret = gps_power_3v_get();
-+      } else if (!strcmp(attr->attr.name, "pwron")) {
-+              ret = gps_pwron_get();
-+      } else if (!strcmp(attr->attr.name, "reset")) {
-+              ret = gps_rst_get();
-+      } else if (!strcmp(attr->attr.name, "power_lp_io_3v3")) {
-+              ret = gps_power_3v3_get();
-+      } else if (!strcmp(attr->attr.name, "power_pll_core_2v5")) {
-+              ret = gps_power_2v5_get();
-+      } else if (!strcmp(attr->attr.name, "power_core_1v5") ||
-+                 !strcmp(attr->attr.name, "power_vdd_core_1v5")) {
-+              ret = gps_power_1v5_get();
-+      }
-+
-+      if (ret)
-+              return strlcpy(buf, "1\n", 3);
-+      else
-+              return strlcpy(buf, "0\n", 3);
-+}
-+
-+static ssize_t power_gps_write(struct device *dev,
-+                             struct device_attribute *attr, const char *buf,
-+                             size_t count)
-+{
-+      unsigned long on = simple_strtoul(buf, NULL, 10);
-+
-+      if (!strcmp(attr->attr.name, "power_tcxo_2v8")) {
-+              gps_power_2v8_set(on);
-+      } else if (!strcmp(attr->attr.name, "power_avdd_3v")) {
-+              gps_power_3v_set(on);
-+      } else if (!strcmp(attr->attr.name, "pwron")) {
-+              gps_pwron_set(on);
-+      } else if (!strcmp(attr->attr.name, "reset")) {
-+              gps_rst_set(on);
-+      } else if (!strcmp(attr->attr.name, "power_lp_io_3v3")) {
-+              gps_power_3v3_set(on);
-+      } else if (!strcmp(attr->attr.name, "power_pll_core_2v5")) {
-+              gps_power_2v5_set(on);
-+      } else if (!strcmp(attr->attr.name, "power_core_1v5") ||
-+                 !strcmp(attr->attr.name, "power_vdd_core_1v5")) {
-+              gps_power_1v5_set(on);
-+      }
-+
-+      return count;
-+}
-+
-+static void gps_power_sequence_up(void)
-+{
-+      /* According to PMB2520 Data Sheet, Rev. 2006-06-05,
-+       * Chapter 4.2.2 */
-+
-+      /* nRESET must be asserted low */
-+      gps_rst_set(0);
-+
-+      /* POWERON must be de-asserted (low) */
-+      gps_pwron_set(0);
-+
-+      /* Apply VDD_IO and VDD_LPREG_IN */
-+      gps_power_3v3_set(1);
-+
-+      /* VDD_COREREG_IN, VDD_PLLREG_IN */
-+      gps_power_1v5_set(1);
-+      gps_power_2v5_set(1);
-+
-+      /* and VDD_RF may be applied */
-+      gps_power_2v8_set(1);
-+
-+      /* We need to enable AVDD, since in GTA01Bv3 it is
-+       * shared with RFREG_IN */
-+      gps_power_3v_set(1);
-+
-+      msleep(3);      /* Is 3ms enough? */
-+
-+      /* De-asert nRESET */
-+      gps_rst_set(1);
-+
-+      /* Switch power on */
-+      gps_pwron_set(1);
-+
-+}
-+
-+static void gps_power_sequence_down(void)
-+{
-+      /* According to PMB2520 Data Sheet, Rev. 2006-06-05,
-+       * Chapter 4.2.3.1 */
-+      gps_pwron_set(0);
-+
-+      /* Don't disable AVDD before PWRON is cleared, since
-+       * in GTA01Bv3, AVDD and RFREG_IN are shared */
-+      gps_power_3v_set(0);
-+
-+      /* Remove VDD_COREREG_IN, VDD_PLLREG_IN and VDD_REFREG_IN */
-+      gps_power_1v5_set(0);
-+      gps_power_2v5_set(0);
-+      gps_power_2v8_set(0);
-+
-+      /* Remove VDD_LPREG_IN and VDD_IO */
-+      gps_power_3v3_set(0);
-+}
-+
-+
-+static ssize_t power_sequence_read(struct device *dev,
-+                                 struct device_attribute *attr,
-+                                 char *buf)
-+{
-+      return strlcpy(buf, "power_up power_down\n", PAGE_SIZE);
-+}
-+
-+static ssize_t power_sequence_write(struct device *dev,
-+                                  struct device_attribute *attr,
-+                                  const char *buf, size_t count)
-+{
-+      dev_dbg(dev, "wrote: '%s'\n", buf);
-+
-+      if (!strncmp(buf, "power_up", 8))
-+              gps_power_sequence_up();
-+      else if (!strncmp(buf, "power_down", 10))
-+              gps_power_sequence_down();
-+      else
-+              return -EINVAL;
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(power_tcxo_2v8, 0644, power_gps_read, power_gps_write);
-+static DEVICE_ATTR(power_avdd_3v, 0644, power_gps_read, power_gps_write);
-+static DEVICE_ATTR(pwron, 0644, power_gps_read, power_gps_write);
-+static DEVICE_ATTR(reset, 0644, power_gps_read, power_gps_write);
-+static DEVICE_ATTR(power_lp_io_3v3, 0644, power_gps_read, power_gps_write);
-+static DEVICE_ATTR(power_pll_core_2v5, 0644, power_gps_read, power_gps_write);
-+static DEVICE_ATTR(power_core_1v5, 0644, power_gps_read, power_gps_write);
-+static DEVICE_ATTR(power_vdd_core_1v5, 0644, power_gps_read, power_gps_write);
-+static DEVICE_ATTR(power_sequence, 0644, power_sequence_read,
-+                 power_sequence_write);
-+
-+#ifdef CONFIG_PM
-+static int gta01_pm_gps_suspend(struct platform_device *pdev,
-+                              pm_message_t state)
-+{
-+      /* FIXME */
-+      gps_power_sequence_down();
-+
-+      return 0;
-+}
-+
-+static int gta01_pm_gps_resume(struct platform_device *pdev)
-+{
-+      /* FIXME */
-+      gps_power_sequence_up();
-+
-+      return 0;
-+}
-+#else
-+#define gta01_pm_gps_suspend  NULL
-+#define gta01_pm_gps_resume   NULL
-+#endif
-+
-+static struct attribute *gta01_gps_sysfs_entries[] = {
-+      &dev_attr_power_avdd_3v.attr,
-+      &dev_attr_pwron.attr,
-+      &dev_attr_reset.attr,
-+      &dev_attr_power_lp_io_3v3.attr,
-+      &dev_attr_power_pll_core_2v5.attr,
-+      &dev_attr_power_sequence.attr,
-+      NULL,   /* power_core_1v5 */
-+      NULL,   /* power_vdd_core_1v5 */
-+      NULL    /* terminating entry */
-+};
-+
-+static struct attribute_group gta01_gps_attr_group = {
-+      .name   = NULL,
-+      .attrs  = gta01_gps_sysfs_entries,
-+};
-+
-+static int __init gta01_pm_gps_probe(struct platform_device *pdev)
-+{
-+      s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_PWRON, S3C2410_GPIO_OUTPUT);
-+
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+              break;
-+      case GTA01v4_SYSTEM_REV:
-+              s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_RESET, S3C2410_GPIO_OUTPUT);
-+              break;
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_EN_3V3, S3C2410_GPIO_OUTPUT);
-+              /* fallthrough */
-+      case GTA01Bv2_SYSTEM_REV:
-+              s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_EN_2V8, S3C2410_GPIO_OUTPUT);
-+              s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_EN_3V, S3C2410_GPIO_OUTPUT);
-+              s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_RESET, S3C2410_GPIO_OUTPUT);
-+              break;
-+      default:
-+              dev_warn(&pdev->dev, "Unknown GTA01 Revision 0x%x, "
-+                       "AGPS PM features not available!!!\n",
-+                       system_rev);
-+              return -1;
-+              break;
-+      }
-+
-+      gps_power_sequence_down();
-+
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+      case GTA01v4_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+              gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-3] =
-+                                      &dev_attr_power_tcxo_2v8.attr;
-+              break;
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-3] =
-+                                      &dev_attr_power_core_1v5.attr;
-+              gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-2] =
-+                                      &dev_attr_power_vdd_core_1v5.attr;
-+              break;
-+      }
-+
-+      return sysfs_create_group(&pdev->dev.kobj, &gta01_gps_attr_group);
-+}
-+
-+static int gta01_pm_gps_remove(struct platform_device *pdev)
-+{
-+      gps_power_sequence_down();
-+      sysfs_remove_group(&pdev->dev.kobj, &gta01_gps_attr_group);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver gta01_pm_gps_driver = {
-+      .probe          = gta01_pm_gps_probe,
-+      .remove         = gta01_pm_gps_remove,
-+      .suspend        = gta01_pm_gps_suspend,
-+      .resume         = gta01_pm_gps_resume,
-+      .driver         = {
-+              .name           = "neo1973-pm-gps",
-+      },
-+};
-+
-+static int __devinit gta01_pm_gps_init(void)
-+{
-+      return platform_driver_register(&gta01_pm_gps_driver);
-+}
-+
-+static void gta01_pm_gps_exit(void)
-+{
-+      platform_driver_unregister(&gta01_pm_gps_driver);
-+}
-+
-+module_init(gta01_pm_gps_init);
-+module_exit(gta01_pm_gps_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_DESCRIPTION("FIC Neo1973 GPS Power Management");
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-new file mode 100644
-index 0000000..a1615f8
---- /dev/null
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -0,0 +1,217 @@
-+/*
-+ * GSM Management code for the FIC Neo1973 GSM Phone
-+ *
-+ * (C) 2007 by OpenMoko Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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 version 2 as
-+ * published by the Free Software Foundation
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+#include <linux/console.h>
-+#include <linux/errno.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/arch/gta01.h>
-+
-+struct gta01pm_priv {
-+      int gpio_ngsm_en;
-+      struct console *con;
-+};
-+
-+static struct gta01pm_priv gta01_gsm;
-+
-+static struct console *find_s3c24xx_console(void)
-+{
-+      struct console *con;
-+
-+      acquire_console_sem();
-+
-+      for (con = console_drivers; con; con = con->next) {
-+              if (!strcmp(con->name, "ttySAC"))
-+                      break;
-+      }
-+
-+      release_console_sem();
-+
-+      return con;
-+}
-+
-+static ssize_t gsm_read(struct device *dev, struct device_attribute *attr,
-+                      char *buf)
-+{
-+      if (!strcmp(attr->attr.name, "power_on")) {
-+              if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_ON))
-+                      goto out_1;
-+      } else if (!strcmp(attr->attr.name, "reset")) {
-+              if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_RST))
-+                      goto out_1;
-+      } else if (!strcmp(attr->attr.name, "download")) {
-+              if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_DNLOAD))
-+                      goto out_1;
-+      }
-+
-+      return strlcpy(buf, "0\n", 3);
-+out_1:
-+      return strlcpy(buf, "1\n", 3);
-+}
-+
-+static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-+                       const char *buf, size_t count)
-+{
-+      unsigned long on = simple_strtoul(buf, NULL, 10);
-+
-+      if (!strcmp(attr->attr.name, "power_on")) {
-+              if (on) {
-+                      dev_info(dev, "powering up GSM, thus disconnecting "
-+                               "serial console\n");
-+
-+                      if (gta01_gsm.con)
-+                              console_stop(gta01_gsm.con);
-+
-+                      if (gta01_gsm.gpio_ngsm_en)
-+                              s3c2410_gpio_setpin(gta01_gsm.gpio_ngsm_en, 0);
-+
-+                      s3c2410_gpio_setpin(GTA01_GPIO_MODEM_ON, 1);
-+              } else {
-+                      s3c2410_gpio_setpin(GTA01_GPIO_MODEM_ON, 0);
-+
-+                      if (gta01_gsm.gpio_ngsm_en)
-+                              s3c2410_gpio_setpin(gta01_gsm.gpio_ngsm_en, 1);
-+
-+                      if (gta01_gsm.con)
-+                              console_start(gta01_gsm.con);
-+
-+                      dev_info(dev, "powered down GSM, thus enabling "
-+                               "serial console\n");
-+              }
-+      } else if (!strcmp(attr->attr.name, "reset")) {
-+              s3c2410_gpio_setpin(GTA01_GPIO_MODEM_RST, on);
-+      } else if (!strcmp(attr->attr.name, "download")) {
-+              s3c2410_gpio_setpin(GTA01_GPIO_MODEM_DNLOAD, on);
-+      }
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(power_on, 0644, gsm_read, gsm_write);
-+static DEVICE_ATTR(reset, 0644, gsm_read, gsm_write);
-+static DEVICE_ATTR(download, 0644, gsm_read, gsm_write);
-+
-+#ifdef CONFIG_PM
-+static int gta01_gsm_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+      /* GPIO state is saved/restored by S3C2410 core GPIO driver, so we
-+       * don't need to do anything here */
-+
-+      return 0;
-+}
-+
-+static int gta01_gsm_resume(struct platform_device *pdev)
-+{
-+      /* GPIO state is saved/restored by S3C2410 core GPIO driver, so we
-+       * don't need to do anything here */
-+
-+      /* Make sure that the kernel console on the serial port is still
-+       * disabled. FIXME: resume ordering race with serial driver! */
-+      if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_ON) && gta01_gsm.con)
-+              console_stop(gta01_gsm.con);
-+
-+      return 0;
-+}
-+#else
-+#define gta01_gsm_suspend     NULL
-+#define gta01_gsm_resume      NULL
-+#endif
-+
-+static struct attribute *gta01_gsm_sysfs_entries[] = {
-+      &dev_attr_power_on.attr,
-+      &dev_attr_reset.attr,
-+      NULL,
-+      NULL
-+};
-+
-+static struct attribute_group gta01_gsm_attr_group = {
-+      .name   = NULL,
-+      .attrs  = gta01_gsm_sysfs_entries,
-+};
-+
-+static int __init gta01_gsm_probe(struct platform_device *pdev)
-+{
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+              gta01_gsm.gpio_ngsm_en = GTA01v3_GPIO_nGSM_EN;
-+              break;
-+      case GTA01v4_SYSTEM_REV:
-+              gta01_gsm.gpio_ngsm_en = 0;
-+              break;
-+      case GTA01Bv2_SYSTEM_REV:
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              gta01_gsm.gpio_ngsm_en = GTA01Bv2_GPIO_nGSM_EN;
-+              s3c2410_gpio_setpin(GTA01v3_GPIO_nGSM_EN, 0);
-+              break;
-+      default:
-+              dev_warn(&pdev->dev, "Unknown GTA01 Revision 0x%x, "
-+                       "some PM features not available!!!\n",
-+                       system_rev);
-+              break;
-+      }
-+
-+      switch (system_rev) {
-+      case GTA01v4_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+              gta01_gsm_sysfs_entries[ARRAY_SIZE(gta01_gsm_sysfs_entries)-2] =
-+                                                      &dev_attr_download.attr;
-+              break;
-+      default:
-+              break;
-+      }
-+
-+      gta01_gsm.con = find_s3c24xx_console();
-+      if (!gta01_gsm.con)
-+              dev_warn(&pdev->dev, "cannot find S3C24xx console driver\n");
-+
-+      return sysfs_create_group(&pdev->dev.kobj, &gta01_gsm_attr_group);
-+}
-+
-+static int gta01_gsm_remove(struct platform_device *pdev)
-+{
-+      sysfs_remove_group(&pdev->dev.kobj, &gta01_gsm_attr_group);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver gta01_gsm_driver = {
-+      .probe          = gta01_gsm_probe,
-+      .remove         = gta01_gsm_remove,
-+      .suspend        = gta01_gsm_suspend,
-+      .resume         = gta01_gsm_resume,
-+      .driver         = {
-+              .name           = "neo1973-pm-gsm",
-+      },
-+};
-+
-+static int __devinit gta01_gsm_init(void)
-+{
-+      return platform_driver_register(&gta01_gsm_driver);
-+}
-+
-+static void gta01_gsm_exit(void)
-+{
-+      platform_driver_unregister(&gta01_gsm_driver);
-+}
-+
-+module_init(gta01_gsm_init);
-+module_exit(gta01_gsm_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_DESCRIPTION("FIC Neo1973 GSM Power Management");
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1015-s3c2410-pwm.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1015-s3c2410-pwm.patch.patch
deleted file mode 100644 (file)
index a18a619..0000000
+++ /dev/null
@@ -1,322 +0,0 @@
-From e9db29d62cbcef7974099c3a4deac69ad2a72190 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:31:44 +0100
-Subject: [PATCH] s3c2410-pwm.patch
- This patch adds a PWM api abstraction for the S3C2410 SoC
-
-Signed-off-by: Javi Roman <javiroman@kernel-labs.org>
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- arch/arm/mach-s3c2410/Kconfig      |    6 +
- arch/arm/mach-s3c2410/Makefile     |    1 +
- arch/arm/mach-s3c2410/pwm.c        |  214 ++++++++++++++++++++++++++++++++++++
- include/asm-arm/arch-s3c2410/pwm.h |   40 +++++++
- 4 files changed, 261 insertions(+), 0 deletions(-)
- create mode 100644 arch/arm/mach-s3c2410/pwm.c
- create mode 100644 include/asm-arm/arch-s3c2410/pwm.h
-
-diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
-index ff339e1..e42195f 100644
---- a/arch/arm/mach-s3c2410/Kconfig
-+++ b/arch/arm/mach-s3c2410/Kconfig
-@@ -9,6 +9,7 @@ config CPU_S3C2410
-       depends on ARCH_S3C2410
-       select S3C2410_CLOCK
-       select S3C2410_GPIO
-+      select S3C2410_PWM
-       select CPU_LLSERIAL_S3C2410
-       select S3C2410_PM if PM
-       help
-@@ -37,6 +38,11 @@ config S3C2410_CLOCK
-       help
-         Clock code for the S3C2410, and similar processors
-+config S3C2410_PWM
-+      bool
-+      help
-+        PWM timer code for the S3C2410, and similar processors
-+
- menu "S3C2410 Machines"
-diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile
-index 8952a8d..bb577f4 100644
---- a/arch/arm/mach-s3c2410/Makefile
-+++ b/arch/arm/mach-s3c2410/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_CPU_S3C2410_DMA)        += dma.o
- obj-$(CONFIG_S3C2410_PM)      += pm.o sleep.o
- obj-$(CONFIG_S3C2410_GPIO)    += gpio.o
- obj-$(CONFIG_S3C2410_CLOCK)   += clock.o
-+obj-$(CONFIG_S3C2410_PWM)     += pwm.o
- # Machine support
-diff --git a/arch/arm/mach-s3c2410/pwm.c b/arch/arm/mach-s3c2410/pwm.c
-new file mode 100644
-index 0000000..8a07359
---- /dev/null
-+++ b/arch/arm/mach-s3c2410/pwm.c
-@@ -0,0 +1,214 @@
-+/*
-+ * arch/arm/mach-s3c2410/3c2410-pwm.c
-+ *
-+ * Copyright (c) by Javi Roman <javiroman@kernel-labs.org>
-+ *             for the OpenMoko Project.
-+ *
-+ *     S3C2410A SoC PWM 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.
-+ *
-+ * 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/clk.h>
-+#include <asm/hardware.h>
-+#include <asm/plat-s3c/regs-timer.h>
-+#include <asm/arch/pwm.h>
-+
-+int s3c2410_pwm_disable(struct s3c2410_pwm *pwm)
-+{
-+      unsigned long tcon;
-+
-+      /* stop timer */
-+      tcon = __raw_readl(S3C2410_TCON);
-+      tcon &= 0xffffff00;
-+      __raw_writel(tcon, S3C2410_TCON);
-+
-+      clk_disable(pwm->pclk);
-+      clk_put(pwm->pclk);
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(s3c2410_pwm_disable);
-+
-+int s3c2410_pwm_init(struct s3c2410_pwm *pwm)
-+{
-+      pwm->pclk = clk_get(NULL, "timers");
-+      if (IS_ERR(pwm->pclk))
-+              return PTR_ERR(pwm->pclk);
-+
-+      clk_enable(pwm->pclk);
-+      pwm->pclk_rate = clk_get_rate(pwm->pclk);
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(s3c2410_pwm_init);
-+
-+int s3c2410_pwm_enable(struct s3c2410_pwm *pwm)
-+{
-+      unsigned long tcfg0, tcfg1, tcnt, tcmp;
-+
-+      /* control registers bits */
-+      tcfg1 = __raw_readl(S3C2410_TCFG1);
-+      tcfg0 = __raw_readl(S3C2410_TCFG0);
-+
-+      /* divider & scaler slection */
-+      switch (pwm->timerid) {
-+      case PWM0:
-+              tcfg1 &= ~S3C2410_TCFG1_MUX0_MASK;
-+              tcfg0 &= ~S3C2410_TCFG_PRESCALER0_MASK;
-+              break;
-+      case PWM1:
-+              tcfg1 &= ~S3C2410_TCFG1_MUX1_MASK;
-+              tcfg0 &= ~S3C2410_TCFG_PRESCALER0_MASK;
-+              break;
-+      case PWM2:
-+              tcfg1 &= ~S3C2410_TCFG1_MUX2_MASK;
-+              tcfg0 &= ~S3C2410_TCFG_PRESCALER1_MASK;
-+              break;
-+      case PWM3:
-+              tcfg1 &= ~S3C2410_TCFG1_MUX3_MASK;
-+              tcfg0 &= ~S3C2410_TCFG_PRESCALER1_MASK;
-+              break;
-+      case PWM4:
-+              /* timer four is not capable of doing PWM */
-+              break;
-+      default:
-+              clk_disable(pwm->pclk);
-+              clk_put(pwm->pclk);
-+              return -1;
-+      }
-+
-+      /* divider & scaler values */
-+      tcfg1 |= pwm->divider;
-+      __raw_writel(tcfg1, S3C2410_TCFG1);
-+
-+      switch (pwm->timerid) {
-+      case PWM0:
-+      case PWM1:
-+              tcfg0 |= pwm->prescaler;
-+              __raw_writel(tcfg0, S3C2410_TCFG0);
-+              break;
-+      default:
-+              if ((tcfg0 | pwm->prescaler) != tcfg0) {
-+                      printk(KERN_WARNING "not changing prescaler of PWM %u,"
-+                             " since it's shared with timer4 (clock tick)\n",
-+                             pwm->timerid);
-+              }
-+              break;
-+      }
-+
-+      /* timer count and compare buffer initial values */
-+      tcnt = pwm->counter;
-+      tcmp = pwm->comparer;
-+
-+      __raw_writel(tcnt, S3C2410_TCNTB(pwm->timerid));
-+      __raw_writel(tcmp, S3C2410_TCMPB(pwm->timerid));
-+
-+      /* ensure timer is stopped */
-+      s3c2410_pwm_stop(pwm);
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(s3c2410_pwm_enable);
-+
-+int s3c2410_pwm_start(struct s3c2410_pwm *pwm)
-+{
-+      unsigned long tcon;
-+
-+      tcon = __raw_readl(S3C2410_TCON);
-+
-+      switch (pwm->timerid) {
-+      case PWM0:
-+              tcon |= S3C2410_TCON_T0START;
-+              tcon &= ~S3C2410_TCON_T0MANUALUPD;
-+              break;
-+      case PWM1:
-+              tcon |= S3C2410_TCON_T1START;
-+              tcon &= ~S3C2410_TCON_T1MANUALUPD;
-+              break;
-+      case PWM2:
-+              tcon |= S3C2410_TCON_T2START;
-+              tcon &= ~S3C2410_TCON_T2MANUALUPD;
-+              break;
-+      case PWM3:
-+              tcon |= S3C2410_TCON_T3START;
-+              tcon &= ~S3C2410_TCON_T3MANUALUPD;
-+              break;
-+      case PWM4:
-+              /* timer four is not capable of doing PWM */
-+      default:
-+              return -ENODEV;
-+      }
-+
-+      __raw_writel(tcon, S3C2410_TCON);
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(s3c2410_pwm_start);
-+
-+int s3c2410_pwm_stop(struct s3c2410_pwm *pwm)
-+{
-+      unsigned long tcon;
-+
-+      tcon = __raw_readl(S3C2410_TCON);
-+
-+      switch (pwm->timerid) {
-+      case PWM0:
-+              tcon &= ~0x00000000;
-+              tcon |= S3C2410_TCON_T0RELOAD;
-+              tcon |= S3C2410_TCON_T0MANUALUPD;
-+              break;
-+      case PWM1:
-+              tcon &= ~0x00000080;
-+              tcon |= S3C2410_TCON_T1RELOAD;
-+              tcon |= S3C2410_TCON_T1MANUALUPD;
-+              break;
-+      case PWM2:
-+              tcon &= ~0x00000800;
-+              tcon |= S3C2410_TCON_T2RELOAD;
-+              tcon |= S3C2410_TCON_T2MANUALUPD;
-+              break;
-+      case PWM3:
-+              tcon &= ~0x00008000;
-+              tcon |= S3C2410_TCON_T3RELOAD;
-+              tcon |= S3C2410_TCON_T3MANUALUPD;
-+              break;
-+      case PWM4:
-+              /* timer four is not capable of doing PWM */
-+      default:
-+              return -ENODEV;
-+      }
-+
-+      __raw_writel(tcon, S3C2410_TCON);
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(s3c2410_pwm_stop);
-+
-+int s3c2410_pwm_duty_cycle(int reg_value, struct s3c2410_pwm *pwm)
-+{
-+      __raw_writel(reg_value, S3C2410_TCMPB(pwm->timerid));
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(s3c2410_pwm_duty_cycle);
-+
-+int s3c2410_pwm_dumpregs(void)
-+{
-+      printk(KERN_INFO "TCON: %08lx, TCFG0: %08lx, TCFG1: %08lx\n",
-+                      (unsigned long) __raw_readl(S3C2410_TCON),
-+                      (unsigned long) __raw_readl(S3C2410_TCFG0),
-+                      (unsigned long) __raw_readl(S3C2410_TCFG1));
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(s3c2410_pwm_dumpregs);
-diff --git a/include/asm-arm/arch-s3c2410/pwm.h b/include/asm-arm/arch-s3c2410/pwm.h
-new file mode 100644
-index 0000000..a797ec3
---- /dev/null
-+++ b/include/asm-arm/arch-s3c2410/pwm.h
-@@ -0,0 +1,40 @@
-+#ifndef __S3C2410_PWM_H
-+#define __S3C2410_PWM_H
-+
-+#include <linux/err.h>
-+#include <linux/platform_device.h>
-+#include <linux/clk.h>
-+
-+#include <asm-arm/io.h>
-+#include <asm/arch/hardware.h>
-+#include <asm/mach-types.h>
-+#include <asm/plat-s3c/regs-timer.h>
-+#include <asm/arch/gta01.h>
-+
-+enum pwm_timer {
-+      PWM0,
-+      PWM1,
-+      PWM2,
-+      PWM3,
-+      PWM4
-+};
-+
-+struct s3c2410_pwm {
-+      enum pwm_timer timerid;
-+      struct clk *pclk;
-+      unsigned long pclk_rate;
-+      unsigned long prescaler;
-+      unsigned long divider;
-+      unsigned long counter;
-+      unsigned long comparer;
-+};
-+
-+int s3c2410_pwm_init(struct s3c2410_pwm *s3c2410_pwm);
-+int s3c2410_pwm_enable(struct s3c2410_pwm *s3c2410_pwm);
-+int s3c2410_pwm_disable(struct s3c2410_pwm *s3c2410_pwm);
-+int s3c2410_pwm_start(struct s3c2410_pwm *s3c2410_pwm);
-+int s3c2410_pwm_stop(struct s3c2410_pwm *s3c2410_pwm);
-+int s3c2410_pwm_duty_cycle(int reg_value, struct s3c2410_pwm *s3c2410_pwm);
-+int s3c2410_pwm_dumpregs(void);
-+
-+#endif /* __S3C2410_PWM_H */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1016-gta01-vibrator.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1016-gta01-vibrator.patch.patch
deleted file mode 100644 (file)
index bec5999..0000000
+++ /dev/null
@@ -1,244 +0,0 @@
-From f7ad7d5e90a4ab68e7e25df3bd4a56b6c23f5e45 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:31:55 +0100
-Subject: [PATCH] gta01-vibrator.patch
- This patch adds driver support for the vibator device of the FIC/OpenMoko
- Neo1973 GSM phone. The driver uses the existing LED class driver framework,
- since there's a lot of similarity between the LED and the vibrator function.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- drivers/leds/Kconfig                 |    8 ++-
- drivers/leds/Makefile                |    1 +
- drivers/leds/leds-neo1973-vibrator.c |  181 ++++++++++++++++++++++++++++++++++
- 3 files changed, 189 insertions(+), 1 deletions(-)
- create mode 100644 drivers/leds/leds-neo1973-vibrator.c
-
-diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
-index ec568fa..4579a88 100644
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -57,7 +57,7 @@ config LEDS_TOSA
- config LEDS_S3C24XX
-       tristate "LED Support for Samsung S3C24XX GPIO LEDs"
--      depends on LEDS_CLASS && ARCH_S3C2410
-+      depends on LEDS_CLASS && ARCH_S3C2410 && S3C2410_PWM
-       help
-         This option enables support for LEDs connected to GPIO lines
-         on Samsung S3C24XX series CPUs, such as the S3C2410 and S3C2440.
-@@ -114,6 +114,12 @@ config LEDS_CM_X270
-       help
-         This option enables support for the CM-X270 LEDs.
-+config LEDS_NEO1973_VIBRATOR
-+      tristate "Vibrator Support for the FIC Neo1973 GSM phone"
-+      depends on LEDS_CLASS && MACH_NEO1973
-+      help
-+        This option enables support for the vibrator on the FIC Neo1973.
-+
- comment "LED Triggers"
- config LEDS_TRIGGERS
-diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
-index a60de1b..f64332d 100644
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -19,6 +19,7 @@ obj-$(CONFIG_LEDS_COBALT_QUBE)               += leds-cobalt-qube.o
- obj-$(CONFIG_LEDS_COBALT_RAQ)         += leds-cobalt-raq.o
- obj-$(CONFIG_LEDS_GPIO)                       += leds-gpio.o
- obj-$(CONFIG_LEDS_CM_X270)              += leds-cm-x270.o
-+obj-$(CONFIG_LEDS_NEO1973_VIBRATOR)   += leds-neo1973-vibrator.o
- # LED Triggers
- obj-$(CONFIG_LEDS_TRIGGER_TIMER)      += ledtrig-timer.o
-diff --git a/drivers/leds/leds-neo1973-vibrator.c b/drivers/leds/leds-neo1973-vibrator.c
-new file mode 100644
-index 0000000..0336e36
---- /dev/null
-+++ b/drivers/leds/leds-neo1973-vibrator.c
-@@ -0,0 +1,181 @@
-+/*
-+ * LED driver for the vibrator of the FIC Neo1973 GSM Phone
-+ *
-+ * (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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 version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * Javi Roman <javiroman@kernel-labs.org>:
-+ *    Implement PWM support for GTA01Bv4 and later
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/leds.h>
-+#include <asm/hardware.h>
-+#include <asm/mach-types.h>
-+#include <asm/arch/pwm.h>
-+#include <asm/arch/gta01.h>
-+#include <asm/plat-s3c/regs-timer.h>
-+
-+#define COUNTER 64
-+
-+struct neo1973_vib_priv {
-+      struct led_classdev cdev;
-+      unsigned int gpio;
-+      struct mutex mutex;
-+      unsigned int has_pwm;
-+      struct s3c2410_pwm pwm;
-+};
-+
-+static void neo1973_vib_vib_set(struct led_classdev *led_cdev,
-+              enum led_brightness value)
-+{
-+      struct neo1973_vib_priv *vp =
-+              container_of(led_cdev, struct neo1973_vib_priv, cdev);
-+
-+      /*
-+       * value == 255 -> 99% duty cycle (full power)
-+       * value == 128 -> 50% duty cycle (medium power)
-+       * value == 0 -> 0% duty cycle (zero power)
-+       */
-+      mutex_lock(&vp->mutex);
-+      if (vp->has_pwm)
-+              s3c2410_pwm_duty_cycle(value/4, &vp->pwm);
-+      else {
-+              if (value)
-+                      s3c2410_gpio_setpin(vp->gpio, 1);
-+              else
-+                      s3c2410_gpio_setpin(vp->gpio, 0);
-+      }
-+
-+      mutex_unlock(&vp->mutex);
-+}
-+
-+static struct neo1973_vib_priv neo1973_vib_led = {
-+      .cdev = {
-+              .name = "neo1973:vibrator",
-+              .brightness_set = neo1973_vib_vib_set,
-+      },
-+};
-+
-+static int neo1973_vib_init_hw(struct neo1973_vib_priv *vp)
-+{
-+      int rc;
-+
-+      rc = s3c2410_pwm_init(&vp->pwm);
-+      if (rc)
-+              return rc;
-+
-+      vp->pwm.timerid = PWM3;
-+      /* use same prescaler as arch/arm/plat-s3c24xx/time.c */
-+      vp->pwm.prescaler = (6 - 1) / 2;
-+      vp->pwm.divider = S3C2410_TCFG1_MUX3_DIV2;
-+      vp->pwm.counter = COUNTER;
-+      vp->pwm.comparer = COUNTER;
-+
-+      rc = s3c2410_pwm_enable(&vp->pwm);
-+      if (rc)
-+              return rc;
-+
-+      s3c2410_pwm_start(&vp->pwm);
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int neo1973_vib_suspend(struct platform_device *dev, pm_message_t state)
-+{
-+      led_classdev_suspend(&neo1973_vib_led.cdev);
-+      return 0;
-+}
-+
-+static int neo1973_vib_resume(struct platform_device *dev)
-+{
-+      struct neo1973_vib_priv *vp = platform_get_drvdata(dev);
-+
-+      if (vp->has_pwm)
-+              neo1973_vib_init_hw(vp);
-+
-+      led_classdev_resume(&neo1973_vib_led.cdev);
-+
-+      return 0;
-+}
-+#endif /* CONFIG_PM */
-+
-+static int __init neo1973_vib_probe(struct platform_device *pdev)
-+{
-+      struct resource *r;
-+      int rc;
-+
-+      if (!machine_is_neo1973_gta01())
-+              return -EIO;
-+
-+      r = platform_get_resource(pdev, 0, 0);
-+      if (!r || !r->start)
-+              return -EIO;
-+
-+      neo1973_vib_led.gpio = r->start;
-+      platform_set_drvdata(pdev, &neo1973_vib_led);
-+
-+      /* TOUT3 */
-+      if (neo1973_vib_led.gpio == S3C2410_GPB3) {
-+              rc = neo1973_vib_init_hw(&neo1973_vib_led);
-+              if (rc)
-+                      return rc;
-+
-+              s3c2410_pwm_duty_cycle(0, &neo1973_vib_led.pwm);
-+              s3c2410_gpio_cfgpin(neo1973_vib_led.gpio, S3C2410_GPB3_TOUT3);
-+              neo1973_vib_led.has_pwm = 1;
-+      }
-+
-+      mutex_init(&neo1973_vib_led.mutex);
-+
-+      return led_classdev_register(&pdev->dev, &neo1973_vib_led.cdev);
-+}
-+
-+static int neo1973_vib_remove(struct platform_device *pdev)
-+{
-+      if (neo1973_vib_led.has_pwm)
-+              s3c2410_pwm_disable(&neo1973_vib_led.pwm);
-+
-+      led_classdev_unregister(&neo1973_vib_led.cdev);
-+
-+      mutex_destroy(&neo1973_vib_led.mutex);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver neo1973_vib_driver = {
-+      .probe          = neo1973_vib_probe,
-+      .remove         = neo1973_vib_remove,
-+#ifdef CONFIG_PM
-+      .suspend        = neo1973_vib_suspend,
-+      .resume         = neo1973_vib_resume,
-+#endif
-+      .driver         = {
-+              .name           = "neo1973-vibrator",
-+      },
-+};
-+
-+static int __init neo1973_vib_init(void)
-+{
-+      return platform_driver_register(&neo1973_vib_driver);
-+}
-+
-+static void __exit neo1973_vib_exit(void)
-+{
-+      platform_driver_unregister(&neo1973_vib_driver);
-+}
-+
-+module_init(neo1973_vib_init);
-+module_exit(neo1973_vib_exit);
-+
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_DESCRIPTION("FIC Neo1973 vibrator driver");
-+MODULE_LICENSE("GPL");
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1017-gta01-backlight.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1017-gta01-backlight.patch.patch
deleted file mode 100644 (file)
index 342d940..0000000
+++ /dev/null
@@ -1,309 +0,0 @@
-From e6e1c20bc96cc397812ab07f0ccd0a16360f2e24 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:32:08 +0100
-Subject: [PATCH] gta01-backlight.patch
- This is a backlight driver for the FIC/OpenMoko Neo1973 GTA01 GSM Phone
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- drivers/video/backlight/Kconfig    |    8 +
- drivers/video/backlight/Makefile   |    1 +
- drivers/video/backlight/gta01_bl.c |  255 ++++++++++++++++++++++++++++++++++++
- 3 files changed, 264 insertions(+), 0 deletions(-)
- create mode 100644 drivers/video/backlight/gta01_bl.c
-
-diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
-index 9609a6c..b954d15 100644
---- a/drivers/video/backlight/Kconfig
-+++ b/drivers/video/backlight/Kconfig
-@@ -67,6 +67,14 @@ config BACKLIGHT_LOCOMO
-         If you have a Sharp Zaurus SL-5500 (Collie) or SL-5600 (Poodle) say y to
-         enable the LCD/backlight driver.
-+config BACKLIGHT_GTA01
-+      tristate "FIC Neo1973 GTA01 Backlight Driver"
-+      depends on BACKLIGHT_CLASS_DEVICE && MACH_NEO1973_GTA01
-+      default y
-+      help
-+        If you have a FIC Neo1973 GTA01, say y to enable the backlight driver.
-+
-+
- config BACKLIGHT_HP680
-       tristate "HP Jornada 680 Backlight Driver"
-       depends on BACKLIGHT_CLASS_DEVICE && SH_HP6XX
-diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
-index 965a78b..8b489f2 100644
---- a/drivers/video/backlight/Makefile
-+++ b/drivers/video/backlight/Makefile
-@@ -5,6 +5,7 @@ obj-$(CONFIG_LCD_LTV350QV)     += ltv350qv.o
- obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o
- obj-$(CONFIG_BACKLIGHT_CORGI) += corgi_bl.o
-+obj-$(CONFIG_BACKLIGHT_GTA01) += gta01_bl.o
- obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o
- obj-$(CONFIG_BACKLIGHT_LOCOMO)        += locomolcd.o
- obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
-diff --git a/drivers/video/backlight/gta01_bl.c b/drivers/video/backlight/gta01_bl.c
-new file mode 100644
-index 0000000..c2bf0c9
---- /dev/null
-+++ b/drivers/video/backlight/gta01_bl.c
-@@ -0,0 +1,255 @@
-+/*
-+ *  Backlight Driver for FIC GTA01 (Neo1973) GSM Phone
-+ *
-+ * Copyright (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * All rights reserved.
-+ *
-+ *  based on corgi_cl.c, Copyright (c) 2004-2006 Richard Purdie
-+ *
-+ * 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, version 2.
-+ *
-+ * 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
-+ *
-+ * Javi Roman <javiroman@kernel-labs.org>:
-+ *    implement PWM, instead of simple on/off switching
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/mutex.h>
-+#include <linux/fb.h>
-+#include <linux/backlight.h>
-+#include <linux/clk.h>
-+
-+#include <asm/arch/hardware.h>
-+#include <asm/arch/gta01.h>
-+#include <asm/arch/pwm.h>
-+
-+#include <asm/plat-s3c/regs-timer.h>
-+
-+static struct backlight_properties gta01bl_prop;
-+static struct backlight_device *gta01_backlight_device;
-+static struct gta01bl_machinfo *bl_machinfo;
-+
-+static unsigned long gta01bl_flags;
-+
-+struct gta01bl_data {
-+      int intensity;
-+      struct mutex mutex;
-+      struct clk *clk;
-+      struct s3c2410_pwm pwm;
-+};
-+
-+static struct gta01bl_data gta01bl;
-+
-+#define GTA01BL_SUSPENDED     0x01
-+#define GTA01BL_BATTLOW       0x02
-+
-+/* On the GTA01 / Neo1973, we use a 50 or 66MHz PCLK, which gives
-+ * us a 6.25..8.25MHz DIV8 clock, which is further divided by a
-+ * prescaler of 4, resulting in a 1.56..2.06MHz tick.  This results in a
-+ * minimum frequency of 24..31Hz.  At 400Hz, we need to set the count
-+ * to something like 3906..5156, providing us a way sufficient resolution
-+ * for display brightness adjustment. */
-+#define GTA01BL_COUNTER 5156
-+
-+static int gta01bl_send_intensity(struct backlight_device *bd)
-+{
-+      int intensity = bd->props.brightness;
-+
-+      if (bd->props.power != FB_BLANK_UNBLANK)
-+              intensity = 0;
-+      if (bd->props.fb_blank != FB_BLANK_UNBLANK)
-+              intensity = 0;
-+      if (gta01bl_flags & GTA01BL_SUSPENDED)
-+              intensity = 0;
-+      if (gta01bl_flags & GTA01BL_BATTLOW)
-+              intensity &= bl_machinfo->limit_mask;
-+
-+      mutex_lock(&gta01bl.mutex);
-+#ifdef GTA01_BACKLIGHT_ONOFF_ONLY
-+      if (intensity)
-+              s3c2410_gpio_setpin(GTA01_GPIO_BACKLIGHT, 1);
-+      else
-+              s3c2410_gpio_setpin(GTA01_GPIO_BACKLIGHT, 0);
-+#else
-+      if (intensity == bd->props.max_brightness) {
-+              s3c2410_gpio_setpin(GTA01_GPIO_BACKLIGHT, 1);
-+              s3c2410_gpio_cfgpin(GTA01_GPIO_BACKLIGHT, S3C2410_GPIO_OUTPUT);
-+      } else  {
-+              s3c2410_pwm_duty_cycle(intensity & 0xffff, &gta01bl.pwm);
-+              s3c2410_gpio_cfgpin(GTA01_GPIO_BACKLIGHT, S3C2410_GPB0_TOUT0);
-+      }
-+#endif
-+      mutex_unlock(&gta01bl.mutex);
-+
-+      gta01bl.intensity = intensity;
-+      return 0;
-+}
-+
-+static int gta01bl_init_hw(void)
-+{
-+      int rc;
-+
-+      rc = s3c2410_pwm_init(&gta01bl.pwm);
-+      if (rc)
-+              return rc;
-+
-+      gta01bl.pwm.timerid = PWM0;
-+      gta01bl.pwm.prescaler = (4 - 1);
-+      gta01bl.pwm.divider = S3C2410_TCFG1_MUX0_DIV8;
-+      gta01bl.pwm.counter = GTA01BL_COUNTER;
-+      gta01bl.pwm.comparer = gta01bl.pwm.counter;
-+
-+      rc = s3c2410_pwm_enable(&gta01bl.pwm);
-+      if (rc)
-+              return rc;
-+
-+      s3c2410_pwm_start(&gta01bl.pwm);
-+
-+      gta01bl_prop.max_brightness = gta01bl.pwm.counter;
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int gta01bl_suspend(struct platform_device *dev, pm_message_t state)
-+{
-+      gta01bl_flags |= GTA01BL_SUSPENDED;
-+      gta01bl_send_intensity(gta01_backlight_device);
-+      return 0;
-+}
-+
-+static int gta01bl_resume(struct platform_device *dev)
-+{
-+      mutex_lock(&gta01bl.mutex);
-+      gta01bl_init_hw();
-+      mutex_unlock(&gta01bl.mutex);
-+
-+      gta01bl_flags &= ~GTA01BL_SUSPENDED;
-+      gta01bl_send_intensity(gta01_backlight_device);
-+      return 0;
-+}
-+#else
-+#define gta01bl_suspend       NULL
-+#define gta01bl_resume        NULL
-+#endif
-+
-+static int gta01bl_get_intensity(struct backlight_device *bd)
-+{
-+      return gta01bl.intensity;
-+}
-+
-+static int gta01bl_set_intensity(struct backlight_device *bd)
-+{
-+      gta01bl_send_intensity(gta01_backlight_device);
-+      return 0;
-+}
-+
-+/*
-+ * Called when the battery is low to limit the backlight intensity.
-+ * If limit==0 clear any limit, otherwise limit the intensity
-+ */
-+void gta01bl_limit_intensity(int limit)
-+{
-+      if (limit)
-+              gta01bl_flags |= GTA01BL_BATTLOW;
-+      else
-+              gta01bl_flags &= ~GTA01BL_BATTLOW;
-+      gta01bl_send_intensity(gta01_backlight_device);
-+}
-+EXPORT_SYMBOL_GPL(gta01bl_limit_intensity);
-+
-+
-+static struct backlight_ops gta01bl_ops = {
-+      .get_brightness = gta01bl_get_intensity,
-+      .update_status  = gta01bl_set_intensity,
-+};
-+
-+static int __init gta01bl_probe(struct platform_device *pdev)
-+{
-+      struct gta01bl_machinfo *machinfo = pdev->dev.platform_data;
-+      int rc;
-+
-+#ifdef GTA01_BACKLIGHT_ONOFF_ONLY
-+      s3c2410_gpio_cfgpin(GTA01_GPIO_BACKLIGHT, S3C2410_GPIO_OUTPUT);
-+      gta01bl_prop.max_brightness = 1;
-+#else
-+      rc = gta01bl_init_hw();
-+      if (rc < 0)
-+              return rc;
-+#endif
-+      mutex_init(&gta01bl.mutex);
-+
-+      if (!machinfo->limit_mask)
-+              machinfo->limit_mask = -1;
-+
-+      gta01_backlight_device = backlight_device_register("gta01-bl",
-+                                                         &pdev->dev, NULL,
-+                                                         &gta01bl_ops);
-+      if (IS_ERR(gta01_backlight_device))
-+              return PTR_ERR(gta01_backlight_device);
-+
-+      gta01bl_prop.power = FB_BLANK_UNBLANK;
-+      gta01bl_prop.brightness = gta01bl_prop.max_brightness;
-+      memcpy(&gta01_backlight_device->props,
-+             &gta01bl_prop, sizeof(gta01bl_prop));
-+      gta01bl_send_intensity(gta01_backlight_device);
-+
-+      return 0;
-+}
-+
-+static int gta01bl_remove(struct platform_device *dev)
-+{
-+#ifndef GTA01_BACKLIGHT_ONOFF_ONLY
-+      s3c2410_pwm_disable(&gta01bl.pwm);
-+#endif
-+      backlight_device_unregister(gta01_backlight_device);
-+      mutex_destroy(&gta01bl.mutex);
-+
-+      s3c2410_gpio_cfgpin(GTA01_GPIO_BACKLIGHT, S3C2410_GPIO_OUTPUT);
-+      s3c2410_gpio_setpin(GTA01_GPIO_BACKLIGHT, 1);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver gta01bl_driver = {
-+      .probe          = gta01bl_probe,
-+      .remove         = gta01bl_remove,
-+      .suspend        = gta01bl_suspend,
-+      .resume         = gta01bl_resume,
-+      .driver         = {
-+              .name   = "gta01-bl",
-+      },
-+};
-+
-+static int __init gta01bl_init(void)
-+{
-+      return platform_driver_register(&gta01bl_driver);
-+}
-+
-+static void __exit gta01bl_exit(void)
-+{
-+      platform_driver_unregister(&gta01bl_driver);
-+}
-+
-+module_init(gta01bl_init);
-+module_exit(gta01bl_exit);
-+
-+MODULE_DESCRIPTION("FIC GTA01 (Neo1973) Backlight Driver");
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_LICENSE("GPL");
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1018-s3c2410_touchscreen.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1018-s3c2410_touchscreen.patch.patch
deleted file mode 100644 (file)
index b39162b..0000000
+++ /dev/null
@@ -1,636 +0,0 @@
-From 04cce88d3d6753ae23ec36cf383f81aaed5fc71b Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:32:18 +0100
-Subject: [PATCH] s3c2410_touchscreen.patch
-
----
- arch/arm/mach-s3c2410/mach-h1940.c     |    8 +
- arch/arm/plat-s3c24xx/devs.c           |   18 ++
- arch/arm/plat-s3c24xx/s3c244x.c        |    1 +
- drivers/input/touchscreen/Kconfig      |   18 ++
- drivers/input/touchscreen/Makefile     |    1 +
- drivers/input/touchscreen/s3c2410_ts.c |  437 ++++++++++++++++++++++++++++++++
- include/asm-arm/arch-s3c2410/ts.h      |   28 ++
- include/asm-arm/plat-s3c24xx/devs.h    |    1 +
- 8 files changed, 512 insertions(+), 0 deletions(-)
- create mode 100644 drivers/input/touchscreen/s3c2410_ts.c
- create mode 100644 include/asm-arm/arch-s3c2410/ts.h
-
-diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c
-index 7c1145e..93cd8c8 100644
---- a/arch/arm/mach-s3c2410/mach-h1940.c
-+++ b/arch/arm/mach-s3c2410/mach-h1940.c
-@@ -38,6 +38,7 @@
- #include <asm/arch/h1940.h>
- #include <asm/arch/h1940-latch.h>
- #include <asm/arch/fb.h>
-+#include <asm/arch/tc.h>
- #include <asm/plat-s3c24xx/udc.h>
- #include <asm/plat-s3c24xx/clock.h>
-@@ -129,6 +130,11 @@ static struct s3c2410_udc_mach_info h1940_udc_cfg __initdata = {
-       .vbus_pin_inverted      = 1,
- };
-+static struct s3c2410_ts_mach_info h1940_ts_cfg __initdata = {
-+              .delay = 10000,
-+              .presc = 49,
-+              .oversampling_shift = 2,
-+};
- /**
-  * Set lcd on or off
-@@ -186,6 +192,7 @@ static struct platform_device *h1940_devices[] __initdata = {
-       &s3c_device_i2c,
-       &s3c_device_iis,
-       &s3c_device_usbgadget,
-+      &s3c_device_ts,
-       &s3c_device_leds,
-       &s3c_device_bluetooth,
- };
-@@ -214,6 +221,7 @@ static void __init h1940_init(void)
-       u32 tmp;
-       s3c24xx_fb_set_platdata(&h1940_fb_info);
-+      set_s3c2410ts_info(&h1940_ts_cfg);
-       s3c24xx_udc_set_platdata(&h1940_udc_cfg);
-       /* Turn off suspend on both USB ports, and switch the
-diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c
-index e546e93..c1fbe2d 100644
---- a/arch/arm/plat-s3c24xx/devs.c
-+++ b/arch/arm/plat-s3c24xx/devs.c
-@@ -24,6 +24,7 @@
- #include <asm/mach/map.h>
- #include <asm/mach/irq.h>
- #include <asm/arch/fb.h>
-+#include <asm/arch/ts.h>
- #include <asm/hardware.h>
- #include <asm/io.h>
- #include <asm/irq.h>
-@@ -207,6 +208,23 @@ struct platform_device s3c_device_nand = {
- EXPORT_SYMBOL(s3c_device_nand);
-+/* Touchscreen */
-+struct platform_device s3c_device_ts = {
-+      .name             = "s3c2410-ts",
-+      .id               = -1,
-+};
-+
-+EXPORT_SYMBOL(s3c_device_ts);
-+
-+static struct s3c2410_ts_mach_info s3c2410ts_info;
-+
-+void set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info)
-+{
-+      memcpy(&s3c2410ts_info,hard_s3c2410ts_info,sizeof(struct s3c2410_ts_mach_info));
-+      s3c_device_ts.dev.platform_data = &s3c2410ts_info;
-+}
-+EXPORT_SYMBOL(set_s3c2410ts_info);
-+
- /* USB Device (Gadget)*/
- static struct resource s3c_usbgadget_resource[] = {
-diff --git a/arch/arm/plat-s3c24xx/s3c244x.c b/arch/arm/plat-s3c24xx/s3c244x.c
-index 3444b13..b9389b9 100644
---- a/arch/arm/plat-s3c24xx/s3c244x.c
-+++ b/arch/arm/plat-s3c24xx/s3c244x.c
-@@ -67,6 +67,7 @@ void __init s3c244x_map_io(struct map_desc *mach_desc, int size)
-       s3c_device_i2c.name  = "s3c2440-i2c";
-       s3c_device_nand.name = "s3c2440-nand";
-+      s3c_device_ts.name = "s3c2440-ts";
-       s3c_device_usbgadget.name = "s3c2440-usbgadget";
- }
-diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
-index 90e8e92..b94fa62 100644
---- a/drivers/input/touchscreen/Kconfig
-+++ b/drivers/input/touchscreen/Kconfig
-@@ -67,6 +67,24 @@ config TOUCHSCREEN_FUJITSU
-         To compile this driver as a module, choose M here: the
-         module will be called fujitsu-ts.
-+config TOUCHSCREEN_S3C2410
-+      tristate "Samsung S3C2410 touchscreen input driver"
-+      depends on ARCH_S3C2410 && INPUT && INPUT_TOUCHSCREEN
-+      select SERIO
-+      help
-+        Say Y here if you have the s3c2410 touchscreen.
-+
-+        If unsure, say N.
-+
-+        To compile this driver as a module, choose M here: the
-+        module will be called s3c2410_ts.
-+
-+config TOUCHSCREEN_S3C2410_DEBUG
-+      boolean "Samsung S3C2410 touchscreen debug messages"
-+      depends on TOUCHSCREEN_S3C2410
-+      help
-+        Select this if you want debug messages
-+
- config TOUCHSCREEN_GUNZE
-       tristate "Gunze AHL-51S touchscreen"
-       select SERIO
-diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
-index 35d4097..6558e63 100644
---- a/drivers/input/touchscreen/Makefile
-+++ b/drivers/input/touchscreen/Makefile
-@@ -19,3 +19,4 @@ obj-$(CONFIG_TOUCHSCREEN_PENMOUNT)   += penmount.o
- obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT)  += touchright.o
- obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN)    += touchwin.o
- obj-$(CONFIG_TOUCHSCREEN_UCB1400)     += ucb1400_ts.o
-+obj-$(CONFIG_TOUCHSCREEN_S3C2410)     += s3c2410_ts.o
-diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
-new file mode 100644
-index 0000000..68071c2
---- /dev/null
-+++ b/drivers/input/touchscreen/s3c2410_ts.c
-@@ -0,0 +1,437 @@
-+/*
-+ * 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
-+ *
-+ * Copyright (c) 2004 Arnaud Patard <arnaud.patard@rtp-net.org>
-+ * iPAQ H1940 touchscreen support
-+ *
-+ * ChangeLog
-+ *
-+ * 2004-09-05: Herbert Pötzl <herbert@13thfloor.at>
-+ *    - added clock (de-)allocation code
-+ *
-+ * 2005-03-06: Arnaud Patard <arnaud.patard@rtp-net.org>
-+ *      - h1940_ -> s3c2410 (this driver is now also used on the n30
-+ *        machines :P)
-+ *      - Debug messages are now enabled with the config option
-+ *        TOUCHSCREEN_S3C2410_DEBUG
-+ *      - Changed the way the value are read
-+ *      - Input subsystem should now work
-+ *      - Use ioremap and readl/writel
-+ *
-+ * 2005-03-23: Arnaud Patard <arnaud.patard@rtp-net.org>
-+ *      - Make use of some undocumented features of the touchscreen
-+ *        controller
-+ *
-+ * 2007-05-23: Harald Welte <laforge@openmoko.org>
-+ *    - Add proper support for S32440
-+ */
-+
-+#include <linux/errno.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/slab.h>
-+#include <linux/input.h>
-+#include <linux/init.h>
-+#include <linux/serio.h>
-+#include <linux/delay.h>
-+#include <linux/platform_device.h>
-+#include <linux/clk.h>
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+
-+#include <asm/arch/regs-gpio.h>
-+#include <asm/arch/ts.h>
-+
-+#include <asm/plat-s3c/regs-adc.h>
-+
-+/* For ts.dev.id.version */
-+#define S3C2410TSVERSION      0x0101
-+
-+#define TSC_SLEEP  (S3C2410_ADCTSC_PULL_UP_DISABLE | S3C2410_ADCTSC_XY_PST(0))
-+
-+#define WAIT4INT(x)  (((x)<<8) | \
-+                   S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \
-+                   S3C2410_ADCTSC_XY_PST(3))
-+
-+#define AUTOPST            (S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \
-+                   S3C2410_ADCTSC_AUTO_PST | S3C2410_ADCTSC_XY_PST(0))
-+
-+#define DEBUG_LVL    KERN_DEBUG
-+
-+MODULE_AUTHOR("Arnaud Patard <arnaud.patard@rtp-net.org>");
-+MODULE_DESCRIPTION("s3c2410 touchscreen driver");
-+MODULE_LICENSE("GPL");
-+
-+/*
-+ * Definitions & global arrays.
-+ */
-+
-+
-+static char *s3c2410ts_name = "s3c2410 TouchScreen";
-+
-+/*
-+ * Per-touchscreen data.
-+ */
-+
-+struct s3c2410ts {
-+      struct input_dev *dev;
-+      long xp;
-+      long yp;
-+      int count;
-+      int shift;
-+};
-+
-+static struct s3c2410ts ts;
-+static void __iomem *base_addr;
-+
-+static inline void s3c2410_ts_connect(void)
-+{
-+      s3c2410_gpio_cfgpin(S3C2410_GPG12, S3C2410_GPG12_XMON);
-+      s3c2410_gpio_cfgpin(S3C2410_GPG13, S3C2410_GPG13_nXPON);
-+      s3c2410_gpio_cfgpin(S3C2410_GPG14, S3C2410_GPG14_YMON);
-+      s3c2410_gpio_cfgpin(S3C2410_GPG15, S3C2410_GPG15_nYPON);
-+}
-+
-+static void touch_timer_fire(unsigned long data)
-+{
-+      unsigned long data0;
-+      unsigned long data1;
-+      int updown;
-+
-+      data0 = readl(base_addr+S3C2410_ADCDAT0);
-+      data1 = readl(base_addr+S3C2410_ADCDAT1);
-+
-+      updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN));
-+
-+      if (updown) {
-+              if (ts.count != 0) {
-+                      ts.xp >>= ts.shift;
-+                      ts.yp >>= ts.shift;
-+
-+#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG
-+                      {
-+                              struct timeval tv;
-+                              do_gettimeofday(&tv);
-+                              printk(DEBUG_LVL "T: %06d, X: %03ld, Y: %03ld\n", (int)tv.tv_usec, ts.xp, ts.yp);
-+                      }
-+#endif
-+
-+                      input_report_abs(ts.dev, ABS_X, ts.xp);
-+                      input_report_abs(ts.dev, ABS_Y, ts.yp);
-+
-+                      input_report_key(ts.dev, BTN_TOUCH, 1);
-+                      input_report_abs(ts.dev, ABS_PRESSURE, 1);
-+                      input_sync(ts.dev);
-+              }
-+
-+              ts.xp = 0;
-+              ts.yp = 0;
-+              ts.count = 0;
-+
-+              writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC);
-+              writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON);
-+      } else {
-+              ts.count = 0;
-+
-+              input_report_key(ts.dev, BTN_TOUCH, 0);
-+              input_report_abs(ts.dev, ABS_PRESSURE, 0);
-+              input_sync(ts.dev);
-+
-+              writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC);
-+      }
-+}
-+
-+static struct timer_list touch_timer =
-+              TIMER_INITIALIZER(touch_timer_fire, 0, 0);
-+
-+static irqreturn_t stylus_updown(int irq, void *dev_id)
-+{
-+      unsigned long data0;
-+      unsigned long data1;
-+      int updown;
-+
-+      data0 = readl(base_addr+S3C2410_ADCDAT0);
-+      data1 = readl(base_addr+S3C2410_ADCDAT1);
-+
-+      updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN));
-+
-+      /* TODO we should never get an interrupt with updown set while
-+       * the timer is running, but maybe we ought to verify that the
-+       * timer isn't running anyways. */
-+
-+      if (updown)
-+              touch_timer_fire(0);
-+
-+      return IRQ_HANDLED;
-+}
-+
-+
-+static irqreturn_t stylus_action(int irq, void *dev_id)
-+{
-+      unsigned long data0;
-+      unsigned long data1;
-+
-+      data0 = readl(base_addr+S3C2410_ADCDAT0);
-+      data1 = readl(base_addr+S3C2410_ADCDAT1);
-+
-+      ts.xp += data0 & S3C2410_ADCDAT0_XPDATA_MASK;
-+      ts.yp += data1 & S3C2410_ADCDAT1_YPDATA_MASK;
-+      ts.count++;
-+
-+        if (ts.count < (1<<ts.shift)) {
-+              writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC);
-+              writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON);
-+      } else {
-+              mod_timer(&touch_timer, jiffies+1);
-+              writel(WAIT4INT(1), base_addr+S3C2410_ADCTSC);
-+      }
-+
-+      return IRQ_HANDLED;
-+}
-+
-+static struct clk     *adc_clock;
-+
-+/*
-+ * The functions for inserting/removing us as a module.
-+ */
-+
-+static int __init s3c2410ts_probe(struct platform_device *pdev)
-+{
-+      int rc;
-+      struct s3c2410_ts_mach_info *info;
-+      struct input_dev *input_dev;
-+
-+      info = ( struct s3c2410_ts_mach_info *)pdev->dev.platform_data;
-+
-+      if (!info)
-+      {
-+              printk(KERN_ERR "Hm... too bad : no platform data for ts\n");
-+              return -EINVAL;
-+      }
-+
-+#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG
-+      printk(DEBUG_LVL "Entering s3c2410ts_init\n");
-+#endif
-+
-+      adc_clock = clk_get(NULL, "adc");
-+      if (!adc_clock) {
-+              printk(KERN_ERR "failed to get adc clock source\n");
-+              return -ENOENT;
-+      }
-+      clk_enable(adc_clock);
-+
-+#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG
-+      printk(DEBUG_LVL "got and enabled clock\n");
-+#endif
-+
-+      base_addr = ioremap(S3C2410_PA_ADC,0x20);
-+      if (base_addr == NULL) {
-+              printk(KERN_ERR "Failed to remap register block\n");
-+              return -ENOMEM;
-+      }
-+
-+
-+      /* If we acutally are a S3C2410: Configure GPIOs */
-+      if (!strcmp(pdev->name, "s3c2410-ts"))
-+              s3c2410_ts_connect();
-+
-+      if ((info->presc&0xff) > 0)
-+              writel(S3C2410_ADCCON_PRSCEN | S3C2410_ADCCON_PRSCVL(info->presc&0xFF),\
-+                           base_addr+S3C2410_ADCCON);
-+      else
-+              writel(0,base_addr+S3C2410_ADCCON);
-+
-+
-+      /* Initialise registers */
-+      if ((info->delay&0xffff) > 0)
-+              writel(info->delay & 0xffff,  base_addr+S3C2410_ADCDLY);
-+
-+      writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC);
-+
-+      /* Initialise input stuff */
-+      memset(&ts, 0, sizeof(struct s3c2410ts));
-+      input_dev = input_allocate_device();
-+
-+      if (!input_dev) {
-+              printk(KERN_ERR "Unable to allocate the input device !!\n");
-+              return -ENOMEM;
-+      }
-+
-+      ts.dev = input_dev;
-+      ts.dev->evbit[0] = BIT_MASK(EV_SYN) | BIT_MASK(EV_KEY) |
-+                         BIT_MASK(EV_ABS);
-+      ts.dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
-+      input_set_abs_params(ts.dev, ABS_X, 0, 0x3FF, 0, 0);
-+      input_set_abs_params(ts.dev, ABS_Y, 0, 0x3FF, 0, 0);
-+      input_set_abs_params(ts.dev, ABS_PRESSURE, 0, 1, 0, 0);
-+
-+      ts.dev->private = &ts;
-+      ts.dev->name = s3c2410ts_name;
-+      ts.dev->id.bustype = BUS_RS232;
-+      ts.dev->id.vendor = 0xDEAD;
-+      ts.dev->id.product = 0xBEEF;
-+      ts.dev->id.version = S3C2410TSVERSION;
-+
-+      ts.shift = info->oversampling_shift;
-+
-+      /* Get irqs */
-+      if (request_irq(IRQ_ADC, stylus_action, IRQF_SAMPLE_RANDOM,
-+              "s3c2410_action", ts.dev)) {
-+              printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_ADC !\n");
-+              iounmap(base_addr);
-+              return -EIO;
-+      }
-+      if (request_irq(IRQ_TC, stylus_updown, IRQF_SAMPLE_RANDOM,
-+                      "s3c2410_action", ts.dev)) {
-+              printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_TC !\n");
-+              free_irq(IRQ_ADC, ts.dev);
-+              iounmap(base_addr);
-+              return -EIO;
-+      }
-+
-+      printk(KERN_INFO "%s successfully loaded\n", s3c2410ts_name);
-+
-+      /* All went ok, so register to the input system */
-+      rc = input_register_device(ts.dev);
-+      if (rc) {
-+              free_irq(IRQ_TC, ts.dev);
-+              free_irq(IRQ_ADC, ts.dev);
-+              clk_disable(adc_clock);
-+              iounmap(base_addr);
-+              return -EIO;
-+      }
-+
-+      return 0;
-+}
-+
-+static int s3c2410ts_remove(struct platform_device *pdev)
-+{
-+      disable_irq(IRQ_ADC);
-+      disable_irq(IRQ_TC);
-+      free_irq(IRQ_TC,ts.dev);
-+      free_irq(IRQ_ADC,ts.dev);
-+
-+      if (adc_clock) {
-+              clk_disable(adc_clock);
-+              clk_put(adc_clock);
-+              adc_clock = NULL;
-+      }
-+
-+      input_unregister_device(ts.dev);
-+      iounmap(base_addr);
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int s3c2410ts_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+      writel(TSC_SLEEP, base_addr+S3C2410_ADCTSC);
-+      writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_STDBM,
-+             base_addr+S3C2410_ADCCON);
-+
-+      disable_irq(IRQ_ADC);
-+      disable_irq(IRQ_TC);
-+
-+      clk_disable(adc_clock);
-+
-+      return 0;
-+}
-+
-+static int s3c2410ts_resume(struct platform_device *pdev)
-+{
-+      struct s3c2410_ts_mach_info *info =
-+              ( struct s3c2410_ts_mach_info *)pdev->dev.platform_data;
-+
-+      clk_enable(adc_clock);
-+      msleep(1);
-+
-+      enable_irq(IRQ_ADC);
-+      enable_irq(IRQ_TC);
-+
-+      if ((info->presc&0xff) > 0)
-+              writel(S3C2410_ADCCON_PRSCEN | S3C2410_ADCCON_PRSCVL(info->presc&0xFF),\
-+                           base_addr+S3C2410_ADCCON);
-+      else
-+              writel(0,base_addr+S3C2410_ADCCON);
-+
-+      /* Initialise registers */
-+      if ((info->delay&0xffff) > 0)
-+              writel(info->delay & 0xffff,  base_addr+S3C2410_ADCDLY);
-+
-+      writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC);
-+
-+      return 0;
-+}
-+
-+#else
-+#define s3c2410ts_suspend NULL
-+#define s3c2410ts_resume  NULL
-+#endif
-+
-+static struct platform_driver s3c2410ts_driver = {
-+       .driver         = {
-+             .name   = "s3c2410-ts",
-+             .owner  = THIS_MODULE,
-+       },
-+       .probe          = s3c2410ts_probe,
-+       .remove         = s3c2410ts_remove,
-+       .suspend        = s3c2410ts_suspend,
-+       .resume         = s3c2410ts_resume,
-+
-+};
-+
-+static struct platform_driver s3c2440ts_driver = {
-+       .driver         = {
-+             .name   = "s3c2440-ts",
-+             .owner  = THIS_MODULE,
-+       },
-+       .probe          = s3c2410ts_probe,
-+       .remove         = s3c2410ts_remove,
-+       .suspend        = s3c2410ts_suspend,
-+       .resume         = s3c2410ts_resume,
-+
-+};
-+
-+static int __init s3c2410ts_init(void)
-+{
-+      int rc;
-+
-+      rc = platform_driver_register(&s3c2410ts_driver);
-+      if (rc < 0)
-+              return rc;
-+
-+      rc = platform_driver_register(&s3c2440ts_driver);
-+      if (rc < 0)
-+              platform_driver_unregister(&s3c2410ts_driver);
-+
-+      return rc;
-+}
-+
-+static void __exit s3c2410ts_exit(void)
-+{
-+      platform_driver_unregister(&s3c2440ts_driver);
-+      platform_driver_unregister(&s3c2410ts_driver);
-+}
-+
-+module_init(s3c2410ts_init);
-+module_exit(s3c2410ts_exit);
-+
-+/*
-+    Local variables:
-+        compile-command: "make ARCH=arm CROSS_COMPILE=/usr/local/arm/3.3.2/bin/arm-linux- -k -C ../../.."
-+        c-basic-offset: 8
-+    End:
-+*/
-diff --git a/include/asm-arm/arch-s3c2410/ts.h b/include/asm-arm/arch-s3c2410/ts.h
-new file mode 100644
-index 0000000..593632a
---- /dev/null
-+++ b/include/asm-arm/arch-s3c2410/ts.h
-@@ -0,0 +1,28 @@
-+/* linux/include/asm/arch-s3c2410/ts.h
-+ *
-+ * Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.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.
-+ *
-+ *
-+ *  Changelog:
-+ *     24-Mar-2005     RTP     Created file
-+ *     03-Aug-2005     RTP     Renamed to ts.h
-+ */
-+
-+#ifndef __ASM_ARM_TS_H
-+#define __ASM_ARM_TS_H
-+
-+struct s3c2410_ts_mach_info {
-+       int             delay;
-+       int             presc;
-+       int             oversampling_shift;
-+};
-+
-+void set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info);
-+
-+#endif /* __ASM_ARM_TS_H */
-+
-diff --git a/include/asm-arm/plat-s3c24xx/devs.h b/include/asm-arm/plat-s3c24xx/devs.h
-index f9d6f03..43de9cc 100644
---- a/include/asm-arm/plat-s3c24xx/devs.h
-+++ b/include/asm-arm/plat-s3c24xx/devs.h
-@@ -42,6 +42,7 @@ extern struct platform_device s3c_device_timer2;
- extern struct platform_device s3c_device_timer3;
- extern struct platform_device s3c_device_usbgadget;
-+extern struct platform_device s3c_device_ts;
- /* s3c2440 specific devices */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1019-s3c2410_ts-gta01.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1019-s3c2410_ts-gta01.patch.patch
deleted file mode 100644 (file)
index c40f85a..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-From 31fc0f2354bb65ac59ccc1e257fdbd622bda9aef Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:32:30 +0100
-Subject: [PATCH] s3c2410_ts-gta01.patch
-
----
- arch/arm/mach-s3c2410/mach-gta01.c |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index e690ed7..3462c7f 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -33,6 +33,7 @@
- #include <linux/workqueue.h>
- #include <linux/platform_device.h>
- #include <linux/serial_core.h>
-+#include <asm/arch/ts.h>
- #include <linux/spi/spi.h>
- #include <linux/spi/spi_bitbang.h>
- #include <linux/mmc/mmc.h>
-@@ -362,6 +363,7 @@ static struct platform_device *gta01_devices[] __initdata = {
-       &s3c_device_sdi,
-       &s3c_device_usbgadget,
-       &s3c_device_nand,
-+      &s3c_device_ts,
- };
- static struct s3c2410_nand_set gta01_nand_sets[] = {
-@@ -434,6 +436,12 @@ static struct s3c2410_udc_mach_info gta01_udc_cfg = {
-       .vbus_draw      = gta01_udc_vbus_draw,
- };
-+static struct s3c2410_ts_mach_info gta01_ts_cfg = {
-+      .delay = 10000,
-+      .presc = 65,
-+      .oversampling_shift = 5,
-+};
-+
- /* SPI */
- static struct spi_board_info gta01_spi_board_info[] = {
-@@ -599,6 +607,7 @@ static void __init gta01_machine_init(void)
-       INIT_WORK(&gta01_udc_vbus_drawer.work, __gta01_udc_vbus_draw);
-       s3c24xx_udc_set_platdata(&gta01_udc_cfg);
-+      set_s3c2410ts_info(&gta01_ts_cfg);
-       /* Set LCD_RESET / XRES to high */
-       s3c2410_gpio_cfgpin(S3C2410_GPC6, S3C2410_GPIO_OUTPUT);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1020-i2c-permit_invalid_addrs.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1020-i2c-permit_invalid_addrs.patch.patch
deleted file mode 100644 (file)
index dd568de..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-From ae0e6a5c9e4cc1786c8b798ac19259a339476121 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:32:41 +0100
-Subject: [PATCH] i2c-permit_invalid_addrs.patch
- We need this stupid workaround since our amplifier chip uses a 'reserved' I2C
- address
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- drivers/i2c/i2c-core.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
-index b5e13e4..2c802de 100644
---- a/drivers/i2c/i2c-core.c
-+++ b/drivers/i2c/i2c-core.c
-@@ -941,11 +941,11 @@ static int i2c_probe_address(struct i2c_adapter *adapter, int addr, int kind,
-       int err;
-       /* Make sure the address is valid */
--      if (addr < 0x03 || addr > 0x77) {
-+      /*if (addr < 0x03 || addr > 0x77) {
-               dev_warn(&adapter->dev, "Invalid probe address 0x%02x\n",
-                        addr);
-               return -EINVAL;
--      }
-+      }*/
-       /* Skip if already in use */
-       if (i2c_check_addr(adapter, addr))
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1021-g_ether-highpower.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1021-g_ether-highpower.patch.patch
deleted file mode 100644 (file)
index 61019b7..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From 00f10ad5e63625961028479e4814953ff443dfff Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:32:51 +0100
-Subject: [PATCH] g_ether-highpower.patch
-
----
- drivers/usb/gadget/ether.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
-index 9e732bf..a7f38b6 100644
---- a/drivers/usb/gadget/ether.c
-+++ b/drivers/usb/gadget/ether.c
-@@ -464,7 +464,7 @@ eth_config = {
-       .bConfigurationValue =  DEV_CONFIG_VALUE,
-       .iConfiguration =       STRING_CDC,
-       .bmAttributes =         USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER,
--      .bMaxPower =            50,
-+      .bMaxPower =            250,
- };
- #ifdef        CONFIG_USB_ETH_RNDIS
-@@ -478,7 +478,7 @@ rndis_config = {
-       .bConfigurationValue =  DEV_RNDIS_CONFIG_VALUE,
-       .iConfiguration =       STRING_RNDIS,
-       .bmAttributes =         USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER,
--      .bMaxPower =            50,
-+      .bMaxPower =            250,
- };
- #endif
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1022-g_ether-vendor_product.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1022-g_ether-vendor_product.patch.patch
deleted file mode 100644 (file)
index 925dc5f..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From f741358022646f390154cfc922bece654df26741 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:33:02 +0100
-Subject: [PATCH] g_ether-vendor_product.patch
- Use FIC's own USB Vendor ID rather than NetChip's
-
-Yes, we could solve this by some modprobe.conf parameters, but I'd like to
-rather not rely on this.
----
- drivers/usb/gadget/ether.c |   11 ++++-------
- 1 files changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
-index a7f38b6..6efbb44 100644
---- a/drivers/usb/gadget/ether.c
-+++ b/drivers/usb/gadget/ether.c
-@@ -134,11 +134,8 @@ struct eth_dev {
-  * Instead:  allocate your own, using normal USB-IF procedures.
-  */
--/* Thanks to NetChip Technologies for donating this product ID.
-- * It's for devices with only CDC Ethernet configurations.
-- */
--#define CDC_VENDOR_NUM        0x0525          /* NetChip */
--#define CDC_PRODUCT_NUM       0xa4a1          /* Linux-USB Ethernet Gadget */
-+#define CDC_VENDOR_NUM        0x1457          /* First International Computer */
-+#define CDC_PRODUCT_NUM       0x5117          /* Linux-USB Ethernet Gadget */
- /* For hardware that can't talk CDC, we use the same vendor ID that
-  * ARM Linux has used for ethernet-over-usb, both with sa1100 and
-@@ -159,8 +156,8 @@ struct eth_dev {
-  * used with CDC Ethernet, Linux 2.4 hosts will need updates to choose
-  * the non-RNDIS configuration.
-  */
--#define RNDIS_VENDOR_NUM      0x0525  /* NetChip */
--#define RNDIS_PRODUCT_NUM     0xa4a2  /* Ethernet/RNDIS Gadget */
-+#define RNDIS_VENDOR_NUM      0x1457  /* NetChip */
-+#define RNDIS_PRODUCT_NUM     0x5122  /* Ethernet/RNDIS Gadget */
- /* Some systems will want different product identifers published in the
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1023-s3c_mci.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1023-s3c_mci.patch.patch
deleted file mode 100644 (file)
index f9f3122..0000000
+++ /dev/null
@@ -1,1704 +0,0 @@
-From fbe3b2447eb15d4d34d906c8112bb33454163612 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:33:15 +0100
-Subject: [PATCH] s3c_mci.patch
- This is a MMC/SD driver for the Samsung S3C24xx SD/MMC controller, originally
- developed years ago by Thomas Kleffel <tk@maintech.de>.
-
-Due to time restraints, he had no time to further maintain the driver and
-follow the mainline Linux changes in the SD/MMC stack.
-
-With his authorization, I have taken over the task of making it compliant to
-the current mainline SD/MMC API and take care of the mainline kernel merge.
-
-After a potential kernel inclusion, we would co-maintain the driver.
-
-Acked-by: Thomas Kleffel <tk@maintech.de>
-Signed-off-by: Harald Welte <laforge@gnumonks.org>
----
- arch/arm/mach-s3c2412/s3c2412.c         |    3 +
- arch/arm/mach-s3c2440/s3c2440.c         |    3 +
- arch/arm/mach-s3c2442/s3c2442.c         |    4 +
- drivers/mmc/host/Kconfig                |   11 +
- drivers/mmc/host/Makefile               |    2 +-
- drivers/mmc/host/s3cmci.c               | 1419 +++++++++++++++++++++++++++++++
- drivers/mmc/host/s3cmci.h               |   69 ++
- include/asm-arm/arch-s3c2410/mci.h      |   13 +
- include/asm-arm/arch-s3c2410/regs-sdi.h |   22 +-
- 9 files changed, 1542 insertions(+), 4 deletions(-)
- create mode 100644 drivers/mmc/host/s3cmci.c
- create mode 100644 drivers/mmc/host/s3cmci.h
- create mode 100644 include/asm-arm/arch-s3c2410/mci.h
-
-diff --git a/arch/arm/mach-s3c2412/s3c2412.c b/arch/arm/mach-s3c2412/s3c2412.c
-index 4f92a15..6b45fd9 100644
---- a/arch/arm/mach-s3c2412/s3c2412.c
-+++ b/arch/arm/mach-s3c2412/s3c2412.c
-@@ -214,5 +214,8 @@ int __init s3c2412_init(void)
- {
-       printk("S3C2412: Initialising architecture\n");
-+      /* make sure SD/MMC driver can distinguish 2412 from 2410 */
-+      s3c_device_sdi.name = "s3c2412-sdi";
-+
-       return sysdev_register(&s3c2412_sysdev);
- }
-diff --git a/arch/arm/mach-s3c2440/s3c2440.c b/arch/arm/mach-s3c2440/s3c2440.c
-index 90e1da6..6c18cbd 100644
---- a/arch/arm/mach-s3c2440/s3c2440.c
-+++ b/arch/arm/mach-s3c2440/s3c2440.c
-@@ -46,6 +46,9 @@ int __init s3c2440_init(void)
-       s3c_device_wdt.resource[1].start = IRQ_S3C2440_WDT;
-       s3c_device_wdt.resource[1].end   = IRQ_S3C2440_WDT;
-+      /* make sure SD/MMC driver can distinguish 2440 from 2410 */
-+      s3c_device_sdi.name = "s3c2440-sdi";
-+
-       /* register our system device for everything else */
-       return sysdev_register(&s3c2440_sysdev);
-diff --git a/arch/arm/mach-s3c2442/s3c2442.c b/arch/arm/mach-s3c2442/s3c2442.c
-index fbf8264..fbfb330 100644
---- a/arch/arm/mach-s3c2442/s3c2442.c
-+++ b/arch/arm/mach-s3c2442/s3c2442.c
-@@ -21,6 +21,7 @@
- #include <asm/plat-s3c24xx/s3c2442.h>
- #include <asm/plat-s3c24xx/cpu.h>
-+#include <asm/plat-s3c24xx/devs.h>
- static struct sys_device s3c2442_sysdev = {
-       .cls            = &s3c2442_sysclass,
-@@ -30,5 +31,8 @@ int __init s3c2442_init(void)
- {
-       printk("S3C2442: Initialising architecture\n");
-+      /* make sure SD/MMC driver can distinguish 2440 from 2410 */
-+      s3c_device_sdi.name = "s3c2440-sdi";
-+
-       return sysdev_register(&s3c2442_sysdev);
- }
-diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
-index 5fef678..6936802 100644
---- a/drivers/mmc/host/Kconfig
-+++ b/drivers/mmc/host/Kconfig
-@@ -130,3 +130,14 @@ config MMC_SPI
-         If unsure, or if your system has no SPI master driver, say N.
-+config MMC_S3C
-+      tristate "Samsung S3C24xx SD/MMC Card Interface support"
-+      depends on ARCH_S3C2410 && MMC
-+      help
-+        This selects a driver for the MCI interface found in
-+        Samsung's S3C2410, S3C2412, S3C2440, S3C2442 CPUs.
-+        If you have a board based on one of those and a MMC/SD
-+        slot, say Y or M here.
-+
-+        If unsure, say N.
-+
-diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
-index 3877c87..071d256 100644
---- a/drivers/mmc/host/Makefile
-+++ b/drivers/mmc/host/Makefile
-@@ -17,4 +17,4 @@ obj-$(CONFIG_MMC_OMAP)               += omap.o
- obj-$(CONFIG_MMC_AT91)                += at91_mci.o
- obj-$(CONFIG_MMC_TIFM_SD)     += tifm_sd.o
- obj-$(CONFIG_MMC_SPI)         += mmc_spi.o
--
-+obj-$(CONFIG_MMC_S3C)         += s3cmci.o
-diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
-new file mode 100644
-index 0000000..edba055
---- /dev/null
-+++ b/drivers/mmc/host/s3cmci.c
-@@ -0,0 +1,1419 @@
-+/*
-+ *  linux/drivers/mmc/s3cmci.h - Samsung S3C MCI driver
-+ *
-+ *  Copyright (C) 2004-2006 maintech GmbH, Thomas Kleffel <tk@maintech.de>
-+ *  Copyright (C) 2007 Harald Welte <laforge@gnumonks.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.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/clk.h>
-+#include <linux/mmc/host.h>
-+#include <linux/platform_device.h>
-+#include <linux/irq.h>
-+
-+#include <asm/dma.h>
-+#include <asm/dma-mapping.h>
-+
-+#include <asm/io.h>
-+#include <asm/arch/regs-sdi.h>
-+#include <asm/arch/regs-gpio.h>
-+#include <asm/arch/mci.h>
-+#include <asm/arch/dma.h>
-+
-+#include "s3cmci.h"
-+
-+#define DRIVER_NAME "s3c-mci"
-+
-+enum dbg_channels {
-+      dbg_err   = (1 << 0),
-+      dbg_debug = (1 << 1),
-+      dbg_info  = (1 << 2),
-+      dbg_irq   = (1 << 3),
-+      dbg_sg    = (1 << 4),
-+      dbg_dma   = (1 << 5),
-+      dbg_pio   = (1 << 6),
-+      dbg_fail  = (1 << 7),
-+      dbg_conf  = (1 << 8),
-+};
-+
-+static const int dbgmap_err   = dbg_err | dbg_fail;
-+static const int dbgmap_info  = dbg_info | dbg_conf;
-+static const int dbgmap_debug = dbg_debug;
-+
-+#define dbg(host, channels, args...)           \
-+      do {                                     \
-+      if (dbgmap_err & channels)               \
-+              dev_err(&host->pdev->dev, args); \
-+      else if (dbgmap_info & channels)         \
-+              dev_info(&host->pdev->dev, args);\
-+      else if (dbgmap_debug & channels)        \
-+              dev_dbg(&host->pdev->dev, args); \
-+      } while (0)
-+
-+#define RESSIZE(ressource) (((ressource)->end - (ressource)->start)+1)
-+
-+static struct s3c2410_dma_client s3cmci_dma_client = {
-+      .name           = "s3c-mci",
-+};
-+
-+static void finalize_request(struct s3cmci_host *host);
-+static void s3cmci_send_request(struct mmc_host *mmc);
-+static void s3cmci_reset(struct s3cmci_host *host);
-+
-+#ifdef CONFIG_MMC_DEBUG
-+static inline void dbg_dumpregs(struct s3cmci_host *host, char *prefix)
-+{
-+      u32 con, pre, cmdarg, cmdcon, cmdsta, r0, r1, r2, r3, timer, bsize;
-+      u32 datcon, datcnt, datsta, fsta, imask;
-+
-+      con     = readl(host->base + S3C2410_SDICON);
-+      pre     = readl(host->base + S3C2410_SDIPRE);
-+      cmdarg  = readl(host->base + S3C2410_SDICMDARG);
-+      cmdcon  = readl(host->base + S3C2410_SDICMDCON);
-+      cmdsta  = readl(host->base + S3C2410_SDICMDSTAT);
-+      r0      = readl(host->base + S3C2410_SDIRSP0);
-+      r1      = readl(host->base + S3C2410_SDIRSP1);
-+      r2      = readl(host->base + S3C2410_SDIRSP2);
-+      r3      = readl(host->base + S3C2410_SDIRSP3);
-+      timer   = readl(host->base + S3C2410_SDITIMER);
-+      bsize   = readl(host->base + S3C2410_SDIBSIZE);
-+      datcon  = readl(host->base + S3C2410_SDIDCON);
-+      datcnt  = readl(host->base + S3C2410_SDIDCNT);
-+      datsta  = readl(host->base + S3C2410_SDIDSTA);
-+      fsta    = readl(host->base + S3C2410_SDIFSTA);
-+      imask   = readl(host->base + host->sdiimsk);
-+
-+      dbg(host, dbg_debug, "%s  CON:[%08x]  PRE:[%08x]  TMR:[%08x]\n",
-+                              prefix, con, pre, timer);
-+
-+      dbg(host, dbg_debug, "%s CCON:[%08x] CARG:[%08x] CSTA:[%08x]\n",
-+                              prefix, cmdcon, cmdarg, cmdsta);
-+
-+      dbg(host, dbg_debug, "%s DCON:[%08x] FSTA:[%08x]"
-+                             " DSTA:[%08x] DCNT:[%08x]\n",
-+                              prefix, datcon, fsta, datsta, datcnt);
-+
-+      dbg(host, dbg_debug, "%s   R0:[%08x]   R1:[%08x]"
-+                             "   R2:[%08x]   R3:[%08x]\n",
-+                              prefix, r0, r1, r2, r3);
-+}
-+
-+static void prepare_dbgmsg(struct s3cmci_host *host, struct mmc_command *cmd,
-+                                                              int stop)
-+{
-+      snprintf(host->dbgmsg_cmd, 300,
-+              "#%u%s op:CMD%d arg:0x%08x flags:0x08%x retries:%u",
-+              host->ccnt, (stop?" (STOP)":""), cmd->opcode,
-+              cmd->arg, cmd->flags, cmd->retries);
-+
-+      if (cmd->data) {
-+              snprintf(host->dbgmsg_dat, 300,
-+                      "#%u bsize:%u blocks:%u bytes:%u",
-+                      host->dcnt, cmd->data->blksz,
-+                      cmd->data->blocks,
-+                      cmd->data->blocks * cmd->data->blksz);
-+      } else {
-+              host->dbgmsg_dat[0] = '\0';
-+      }
-+}
-+
-+static void dbg_dumpcmd(struct s3cmci_host *host, struct mmc_command *cmd,
-+                                                              int fail)
-+{
-+      unsigned int dbglvl = fail?dbg_fail:dbg_debug;
-+
-+      if (!cmd)
-+              return;
-+
-+      if (cmd->error == 0)
-+              dbg(host, dbglvl, "CMD[OK] %s R0:0x%08x\n",
-+                      host->dbgmsg_cmd, cmd->resp[0]);
-+      else
-+              dbg(host, dbglvl, "CMD[FAIL(%d)] %s Status:%s\n",
-+                      cmd->error, host->dbgmsg_cmd, host->status);
-+
-+      if (!cmd->data)
-+              return;
-+
-+      if (cmd->data->error == 0)
-+              dbg(host, dbglvl, "DAT[OK] %s\n", host->dbgmsg_dat);
-+      else
-+              dbg(host, dbglvl, "DAT[FAIL(%d)] %s DCNT:0x%08x\n",
-+                      cmd->data->error, host->dbgmsg_dat,
-+                      readl(host->base + S3C2410_SDIDCNT));
-+}
-+#endif /* CONFIG_MMC_DEBUG */
-+
-+static inline u32 enable_imask(struct s3cmci_host *host, u32 imask)
-+{
-+      u32 newmask;
-+
-+      newmask = readl(host->base + host->sdiimsk);
-+      newmask |= imask;
-+
-+      writel(newmask, host->base + host->sdiimsk);
-+
-+      return newmask;
-+}
-+
-+static inline u32 disable_imask(struct s3cmci_host *host, u32 imask)
-+{
-+      u32 newmask;
-+
-+      newmask = readl(host->base + host->sdiimsk);
-+      newmask &= ~imask;
-+
-+      writel(newmask, host->base + host->sdiimsk);
-+
-+      return newmask;
-+}
-+
-+static inline void clear_imask(struct s3cmci_host *host)
-+{
-+      writel(0, host->base + host->sdiimsk);
-+}
-+
-+static inline int get_data_buffer(struct s3cmci_host *host,
-+                                u32 *bytes, u8 **pointer)
-+{
-+      struct scatterlist *sg;
-+
-+      if (host->pio_active == XFER_NONE)
-+              return -EINVAL;
-+
-+      if ((!host->mrq) || (!host->mrq->data))
-+              return -EINVAL;
-+
-+      if (host->pio_sgptr >= host->mrq->data->sg_len) {
-+              dbg(host, dbg_debug, "no more buffers (%i/%i)\n",
-+                    host->pio_sgptr, host->mrq->data->sg_len);
-+              return -EBUSY;
-+      }
-+      sg = &host->mrq->data->sg[host->pio_sgptr];
-+
-+      *bytes = sg->length;
-+      *pointer = page_address(sg_page(sg)) + sg->offset;
-+
-+      host->pio_sgptr++;
-+
-+      dbg(host, dbg_sg, "new buffer (%i/%i)\n",
-+            host->pio_sgptr, host->mrq->data->sg_len);
-+
-+      return 0;
-+}
-+
-+#define FIFO_FILL(host) (readl(host->base + S3C2410_SDIFSTA) &        \
-+                              S3C2410_SDIFSTA_COUNTMASK)
-+#define FIFO_FREE(host) (63 - (readl(host->base + S3C2410_SDIFSTA)    \
-+                              & S3C2410_SDIFSTA_COUNTMASK))
-+
-+static inline void do_pio_read(struct s3cmci_host *host)
-+{
-+      int res;
-+      int fifo;
-+      void __iomem *from_ptr;
-+
-+      /* write real prescaler to host, it might be set slow to fix */
-+      writel(host->prescaler, host->base + S3C2410_SDIPRE);
-+
-+      from_ptr = host->base + host->sdidata;
-+
-+      while ((fifo = FIFO_FILL(host))) {
-+              if (!host->pio_bytes) {
-+                      res = get_data_buffer(host, &host->pio_bytes,
-+                                                      &host->pio_ptr);
-+                      if (res) {
-+                              host->pio_active = XFER_NONE;
-+                              host->complete_what = COMPLETION_FINALIZE;
-+
-+                              dbg(host, dbg_pio, "pio_read(): "
-+                                  "complete (no more data).\n");
-+                              return;
-+                      }
-+
-+                      dbg(host, dbg_pio, "pio_read(): new target: "
-+                          "[%i]@[%p]\n", host->pio_bytes, host->pio_ptr);
-+              }
-+
-+              dbg(host, dbg_pio, "pio_read(): fifo:[%02i] "
-+                  "buffer:[%03i] dcnt:[%08X]\n", fifo, host->pio_bytes,
-+                  readl(host->base + S3C2410_SDIDCNT));
-+
-+              if (fifo > host->pio_bytes)
-+                      fifo = host->pio_bytes;
-+
-+              host->pio_bytes -= fifo;
-+              host->pio_count += fifo;
-+
-+              /* we might have an unaligned start of data */
-+              while (((unsigned long)host->pio_ptr & 0x03) && fifo) {
-+                      *(host->pio_ptr++) = readb(host->base + host->sdidata_b);
-+                      fifo--;
-+              }
-+
-+              /* and a major chunk of data in the middle */
-+              for (; fifo >= 4; fifo -=4) {
-+                      *(u32 *) host->pio_ptr = readl(from_ptr);
-+                      host->pio_ptr+= 4;
-+              }
-+
-+              /* as well as some non-modulo-four trailer */
-+              while (fifo) {
-+                      *(host->pio_ptr++) = readb(host->base + host->sdidata_b);
-+                      fifo--;
-+              }
-+      }
-+
-+      if (!host->pio_bytes) {
-+              res = get_data_buffer(host, &host->pio_bytes, &host->pio_ptr);
-+              if (res) {
-+                      dbg(host, dbg_pio, "pio_read(): "
-+                          "complete (no more buffers).\n");
-+                      host->pio_active = XFER_NONE;
-+                      host->complete_what = COMPLETION_FINALIZE;
-+
-+                      return;
-+              }
-+      }
-+
-+      enable_imask(host, S3C2410_SDIIMSK_RXFIFOHALF
-+                                              | S3C2410_SDIIMSK_RXFIFOLAST);
-+}
-+
-+static inline void do_pio_write(struct s3cmci_host *host)
-+{
-+      int res;
-+      int fifo;
-+
-+      void __iomem *to_ptr;
-+
-+      to_ptr = host->base + host->sdidata;
-+
-+      while ((fifo = FIFO_FREE(host))) {
-+              if (!host->pio_bytes) {
-+                      res = get_data_buffer(host, &host->pio_bytes,
-+                                                      &host->pio_ptr);
-+                      if (res) {
-+                              dbg(host, dbg_pio, "pio_write(): "
-+                                      "complete (no more data).\n");
-+                              host->pio_active = XFER_NONE;
-+
-+                              return;
-+                      }
-+
-+                      dbg(host, dbg_pio, "pio_write(): "
-+                              "new source: [%i]@[%p]\n",
-+                              host->pio_bytes, host->pio_ptr);
-+
-+              }
-+
-+              if (fifo > host->pio_bytes)
-+                      fifo = host->pio_bytes;
-+
-+              host->pio_bytes -= fifo;
-+              host->pio_count += fifo;
-+
-+              /* we might have an unaligned start of data */
-+              while (((unsigned long)host->pio_ptr & 0x03) && fifo) {
-+                      writeb(*(host->pio_ptr++), host->base + host->sdidata_b);
-+                      fifo--;
-+              }
-+
-+              /* and a major chunk of data in the middle */
-+              for (; fifo >= 4; fifo -=4) {
-+                      writel(*(u32 *) host->pio_ptr, to_ptr);
-+                      host->pio_ptr += 4;
-+              }
-+
-+              /* as well as some non-modulo-four trailer */
-+              while (fifo) {
-+                      writeb(*(host->pio_ptr++), host->base + host->sdidata_b);
-+                      fifo--;
-+              }
-+      }
-+
-+      enable_imask(host, S3C2410_SDIIMSK_TXFIFOHALF);
-+}
-+
-+static void pio_tasklet(unsigned long data)
-+{
-+      struct s3cmci_host *host = (struct s3cmci_host *) data;
-+
-+      disable_irq(host->irq);
-+
-+      if (host->pio_active == XFER_WRITE)
-+              do_pio_write(host);
-+
-+      if (host->pio_active == XFER_READ)
-+              do_pio_read(host);
-+
-+      if (host->complete_what == COMPLETION_FINALIZE) {
-+              clear_imask(host);
-+              if (host->pio_active != XFER_NONE) {
-+                      dbg(host, dbg_err, "unfinished %s "
-+                              "- pio_count:[%u] pio_bytes:[%u]\n",
-+                              (host->pio_active == XFER_READ)?"read":"write",
-+                              host->pio_count, host->pio_bytes);
-+
-+                      host->mrq->data->error = -EIO;
-+              }
-+
-+              finalize_request(host);
-+      } else
-+              enable_irq(host->irq);
-+}
-+
-+/*
-+ * ISR for SDI Interface IRQ
-+ * Communication between driver and ISR works as follows:
-+ *   host->mrq                        points to current request
-+ *   host->complete_what      tells ISR when the request is considered done
-+ *     COMPLETION_CMDSENT       when the command was sent
-+ *     COMPLETION_RSPFIN          when a response was received
-+ *     COMPLETION_XFERFINISH    when the data transfer is finished
-+ *     COMPLETION_XFERFINISH_RSPFIN both of the above.
-+ *   host->complete_request   is the completion-object the driver waits for
-+ *
-+ * 1) Driver sets up host->mrq and host->complete_what
-+ * 2) Driver prepares the transfer
-+ * 3) Driver enables interrupts
-+ * 4) Driver starts transfer
-+ * 5) Driver waits for host->complete_rquest
-+ * 6) ISR checks for request status (errors and success)
-+ * 6) ISR sets host->mrq->cmd->error and host->mrq->data->error
-+ * 7) ISR completes host->complete_request
-+ * 8) ISR disables interrupts
-+ * 9) Driver wakes up and takes care of the request
-+ *
-+ * Note: "->error"-fields are expected to be set to 0 before the request
-+ *       was issued by mmc.c - therefore they are only set, when an error
-+ *       contition comes up
-+ */
-+
-+static irqreturn_t s3cmci_irq(int irq, void *dev_id)
-+{
-+      struct s3cmci_host *host;
-+      struct mmc_command *cmd;
-+      u32 mci_csta, mci_dsta, mci_fsta, mci_dcnt, mci_imsk;
-+      u32 mci_cclear, mci_dclear;
-+      unsigned long iflags;
-+      int cardint = 0;
-+
-+      host = (struct s3cmci_host *)dev_id;
-+
-+      spin_lock_irqsave(&host->complete_lock, iflags);
-+
-+      mci_csta        = readl(host->base + S3C2410_SDICMDSTAT);
-+      mci_dsta        = readl(host->base + S3C2410_SDIDSTA);
-+      mci_dcnt        = readl(host->base + S3C2410_SDIDCNT);
-+      mci_fsta        = readl(host->base + S3C2410_SDIFSTA);
-+      mci_imsk        = readl(host->base + host->sdiimsk);
-+      mci_cclear      = 0;
-+      mci_dclear      = 0;
-+
-+      if ((host->complete_what == COMPLETION_NONE) ||
-+                      (host->complete_what == COMPLETION_FINALIZE)) {
-+              host->status = "nothing to complete";
-+              clear_imask(host);
-+              goto irq_out;
-+      }
-+
-+      if (!host->mrq) {
-+              host->status = "no active mrq";
-+              clear_imask(host);
-+              goto irq_out;
-+      }
-+
-+      cmd = host->cmd_is_stop?host->mrq->stop:host->mrq->cmd;
-+
-+      if (!cmd) {
-+              host->status = "no active cmd";
-+              clear_imask(host);
-+              goto irq_out;
-+      }
-+
-+      if (!host->dodma) {
-+              if ((host->pio_active == XFER_WRITE) &&
-+                              (mci_fsta & S3C2410_SDIFSTA_TFDET)) {
-+
-+                      disable_imask(host, S3C2410_SDIIMSK_TXFIFOHALF);
-+                      tasklet_schedule(&host->pio_tasklet);
-+                      host->status = "pio tx";
-+              }
-+
-+              if ((host->pio_active == XFER_READ) &&
-+                              (mci_fsta & S3C2410_SDIFSTA_RFDET)) {
-+
-+                      disable_imask(host, S3C2410_SDIIMSK_RXFIFOHALF |
-+                                              S3C2410_SDIIMSK_RXFIFOLAST);
-+
-+                      tasklet_schedule(&host->pio_tasklet);
-+                      host->status = "pio rx";
-+              }
-+      }
-+
-+      if (mci_csta & S3C2410_SDICMDSTAT_CMDTIMEOUT) {
-+              cmd->error = -ETIMEDOUT;
-+              host->status = "error: command timeout";
-+              goto fail_transfer;
-+      }
-+
-+      if (mci_csta & S3C2410_SDICMDSTAT_CMDSENT) {
-+              if (host->complete_what == COMPLETION_CMDSENT) {
-+                      host->status = "ok: command sent";
-+                      goto close_transfer;
-+              }
-+
-+              mci_cclear |= S3C2410_SDICMDSTAT_CMDSENT;
-+      }
-+
-+      if (mci_csta & S3C2410_SDICMDSTAT_CRCFAIL) {
-+              if (cmd->flags & MMC_RSP_CRC) {
-+                      if (host->mrq->cmd->flags & MMC_RSP_136) {
-+                              dbg(host, dbg_irq, "fixup for chip bug: "
-+                                  "ignore CRC fail with long rsp\n");
-+                      } else {
-+                              cmd->error = -EILSEQ;
-+                              host->status = "error: bad command crc";
-+                              goto fail_transfer;
-+                      }
-+              }
-+
-+              mci_cclear |= S3C2410_SDICMDSTAT_CRCFAIL;
-+      }
-+
-+      if (mci_csta & S3C2410_SDICMDSTAT_RSPFIN) {
-+              if (host->complete_what == COMPLETION_RSPFIN) {
-+                      host->status = "ok: command response received";
-+                      goto close_transfer;
-+              }
-+
-+              if (host->complete_what == COMPLETION_XFERFINISH_RSPFIN)
-+                      host->complete_what = COMPLETION_XFERFINISH;
-+
-+              mci_cclear |= S3C2410_SDICMDSTAT_RSPFIN;
-+      }
-+
-+      /* errors handled after this point are only relevant
-+         when a data transfer is in progress */
-+
-+      if (!cmd->data)
-+              goto clear_status_bits;
-+
-+      /* Check for FIFO failure */
-+      if (host->is2440) {
-+              if (mci_fsta & S3C2440_SDIFSTA_FIFOFAIL) {
-+                      host->mrq->data->error = -EIO;
-+                      host->status = "error: 2440 fifo failure";
-+                      goto fail_transfer;
-+              }
-+      } else {
-+              if (mci_dsta & S3C2410_SDIDSTA_FIFOFAIL) {
-+                      cmd->data->error = -EIO;
-+                      host->status = "error:  fifo failure";
-+                      goto fail_transfer;
-+              }
-+      }
-+
-+      if (mci_dsta & S3C2410_SDIDSTA_RXCRCFAIL) {
-+              cmd->data->error = -EILSEQ;
-+              host->status = "error: bad data crc (outgoing)";
-+              goto fail_transfer;
-+      }
-+
-+      if (mci_dsta & S3C2410_SDIDSTA_CRCFAIL) {
-+              cmd->data->error = -EIO;
-+              host->status = "error: bad data crc (incoming)";
-+              goto fail_transfer;
-+      }
-+
-+      if (mci_dsta & S3C2410_SDIDSTA_DATATIMEOUT) {
-+              cmd->data->error = -ETIMEDOUT;
-+              host->status = "error: data timeout";
-+              goto fail_transfer;
-+      }
-+
-+      if (mci_dsta & S3C2410_SDIDSTA_XFERFINISH) {
-+              if (host->complete_what == COMPLETION_XFERFINISH) {
-+                      host->status = "ok: data transfer completed";
-+                      goto close_transfer;
-+              }
-+
-+              if (host->complete_what == COMPLETION_XFERFINISH_RSPFIN)
-+                      host->complete_what = COMPLETION_RSPFIN;
-+
-+              mci_dclear |= S3C2410_SDIDSTA_XFERFINISH;
-+      }
-+
-+      if (mci_dsta & S3C2410_SDIDSTA_SDIOIRQDETECT) {
-+              cardint = 1;
-+              mci_dclear |= S3C2410_SDIDSTA_SDIOIRQDETECT;
-+      }
-+
-+clear_status_bits:
-+      writel(mci_cclear, host->base + S3C2410_SDICMDSTAT);
-+      writel(mci_dclear, host->base + S3C2410_SDIDSTA);
-+
-+      goto irq_out;
-+
-+fail_transfer:
-+      host->pio_active = XFER_NONE;
-+
-+close_transfer:
-+      host->complete_what = COMPLETION_FINALIZE;
-+
-+      clear_imask(host);
-+      tasklet_schedule(&host->pio_tasklet);
-+
-+      goto irq_out;
-+
-+irq_out:
-+      dbg(host, dbg_irq, "csta:0x%08x dsta:0x%08x "
-+                         "fsta:0x%08x dcnt:0x%08x status:%s.\n",
-+                              mci_csta, mci_dsta, mci_fsta,
-+                              mci_dcnt, host->status);
-+
-+      spin_unlock_irqrestore(&host->complete_lock, iflags);
-+
-+      /* We have to delay this as it calls back into the driver */
-+      if (cardint)
-+              mmc_signal_sdio_irq(host->mmc);
-+
-+      return IRQ_HANDLED;
-+
-+}
-+
-+/*
-+ * ISR for the CardDetect Pin
-+*/
-+
-+static irqreturn_t s3cmci_irq_cd(int irq, void *dev_id)
-+{
-+      struct s3cmci_host *host = (struct s3cmci_host *)dev_id;
-+
-+      dbg(host, dbg_irq, "card detect\n");
-+
-+      mmc_detect_change(host->mmc, 500);
-+
-+      return IRQ_HANDLED;
-+}
-+
-+void s3cmci_dma_done_callback(struct s3c2410_dma_chan *dma_ch, void *buf_id,
-+      int size, enum s3c2410_dma_buffresult result)
-+{
-+      unsigned long iflags;
-+      u32 mci_csta, mci_dsta, mci_fsta, mci_dcnt;
-+      struct s3cmci_host *host = (struct s3cmci_host *)buf_id;
-+
-+      mci_csta        = readl(host->base + S3C2410_SDICMDSTAT);
-+      mci_dsta        = readl(host->base + S3C2410_SDIDSTA);
-+      mci_fsta        = readl(host->base + S3C2410_SDIFSTA);
-+      mci_dcnt        = readl(host->base + S3C2410_SDIDCNT);
-+
-+      if ((!host->mrq) || (!host->mrq) || (!host->mrq->data))
-+              return;
-+
-+      if (!host->dmatogo)
-+              return;
-+
-+      spin_lock_irqsave(&host->complete_lock, iflags);
-+
-+      if (result != S3C2410_RES_OK) {
-+              dbg(host, dbg_fail, "DMA FAILED: csta=0x%08x dsta=0x%08x "
-+                      "fsta=0x%08x dcnt:0x%08x result:0x%08x toGo:%u\n",
-+                      mci_csta, mci_dsta, mci_fsta,
-+                      mci_dcnt, result, host->dmatogo);
-+
-+              goto fail_request;
-+      }
-+
-+      host->dmatogo--;
-+      if (host->dmatogo) {
-+              dbg(host, dbg_dma, "DMA DONE  Size:%i DSTA:[%08x] "
-+                      "DCNT:[%08x] toGo:%u\n",
-+                      size, mci_dsta, mci_dcnt, host->dmatogo);
-+
-+              goto out;
-+      }
-+
-+      dbg(host, dbg_dma, "DMA FINISHED Size:%i DSTA:%08x DCNT:%08x\n",
-+              size, mci_dsta, mci_dcnt);
-+
-+      host->complete_what = COMPLETION_FINALIZE;
-+
-+out:
-+      tasklet_schedule(&host->pio_tasklet);
-+      spin_unlock_irqrestore(&host->complete_lock, iflags);
-+      return;
-+
-+
-+fail_request:
-+      host->mrq->data->error = -EIO;
-+      host->complete_what = COMPLETION_FINALIZE;
-+      writel(0, host->base + host->sdiimsk);
-+      goto out;
-+
-+}
-+
-+static void finalize_request(struct s3cmci_host *host)
-+{
-+      struct mmc_request *mrq = host->mrq;
-+      struct mmc_command *cmd = host->cmd_is_stop?mrq->stop:mrq->cmd;
-+      int debug_as_failure = 0;
-+
-+      if (host->complete_what != COMPLETION_FINALIZE)
-+              return;
-+
-+      if (!mrq)
-+              return;
-+
-+      if (cmd->data && (cmd->error == 0) &&
-+                (cmd->data->error == 0)) {
-+
-+              if (host->dodma && (!host->dma_complete)) {
-+                      dbg(host, dbg_dma, "DMA Missing!\n");
-+                      return;
-+              }
-+      }
-+
-+      /* Read response */
-+      cmd->resp[0] = readl(host->base + S3C2410_SDIRSP0);
-+      cmd->resp[1] = readl(host->base + S3C2410_SDIRSP1);
-+      cmd->resp[2] = readl(host->base + S3C2410_SDIRSP2);
-+      cmd->resp[3] = readl(host->base + S3C2410_SDIRSP3);
-+
-+      /* reset clock speed, as it could still be set low for */
-+      writel(host->prescaler, host->base + S3C2410_SDIPRE);
-+
-+      if (cmd->error)
-+              debug_as_failure = 1;
-+
-+      if (cmd->data && cmd->data->error)
-+              debug_as_failure = 1;
-+
-+#ifdef CONFIG_MMC_DEBUG
-+      dbg_dumpcmd(host, cmd, debug_as_failure);
-+#endif
-+      /* Cleanup controller */
-+      writel(0, host->base + S3C2410_SDICMDARG);
-+      writel(S3C2410_SDIDCON_STOP, host->base + S3C2410_SDIDCON);
-+      writel(0, host->base + S3C2410_SDICMDCON);
-+      writel(0, host->base + host->sdiimsk);
-+
-+      if (cmd->data && cmd->error)
-+              cmd->data->error = cmd->error;
-+
-+      if (cmd->data && cmd->data->stop && (!host->cmd_is_stop)) {
-+              host->cmd_is_stop = 1;
-+              s3cmci_send_request(host->mmc);
-+              return;
-+      }
-+
-+      /* If we have no data transfer we are finished here */
-+      if (!mrq->data)
-+              goto request_done;
-+
-+      /* Calulate the amout of bytes transfer, but only if there was
-+       * no error */
-+      if (mrq->data->error == 0)
-+              mrq->data->bytes_xfered =
-+                      (mrq->data->blocks * mrq->data->blksz);
-+      else
-+              mrq->data->bytes_xfered = 0;
-+
-+      /* If we had an error while transfering data we flush the
-+       * DMA channel and the fifo to clear out any garbage */
-+      if (mrq->data->error) {
-+              if (host->dodma)
-+                      s3c2410_dma_ctrl(host->dma, S3C2410_DMAOP_FLUSH);
-+
-+              if (host->is2440) {
-+                      /* Clear failure register and reset fifo */
-+                      writel(S3C2440_SDIFSTA_FIFORESET |
-+                             S3C2440_SDIFSTA_FIFOFAIL,
-+                             host->base + S3C2410_SDIFSTA);
-+              } else {
-+                      u32 mci_con;
-+
-+                      /* reset fifo */
-+                      mci_con = readl(host->base + S3C2410_SDICON);
-+                      mci_con |= S3C2410_SDICON_FIFORESET;
-+
-+                      writel(mci_con, host->base + S3C2410_SDICON);
-+              }
-+      }
-+
-+request_done:
-+      host->complete_what = COMPLETION_NONE;
-+      host->mrq = NULL;
-+      mmc_request_done(host->mmc, mrq);
-+}
-+
-+
-+void s3cmci_dma_setup(struct s3cmci_host *host, enum s3c2410_dmasrc source)
-+{
-+      static int setup_ok;
-+      static enum s3c2410_dmasrc last_source = -1;
-+
-+      if (last_source == source)
-+              return;
-+
-+      last_source = source;
-+
-+      s3c2410_dma_devconfig(host->dma, source, 3,
-+              host->mem->start + host->sdidata);
-+
-+      if (!setup_ok) {
-+              s3c2410_dma_config(host->dma, 4,
-+                      (S3C2410_DCON_HWTRIG | S3C2410_DCON_CH0_SDI));
-+              s3c2410_dma_set_buffdone_fn(host->dma,
-+                                          s3cmci_dma_done_callback);
-+              s3c2410_dma_setflags(host->dma, S3C2410_DMAF_AUTOSTART);
-+              setup_ok = 1;
-+      }
-+}
-+
-+static void s3cmci_send_command(struct s3cmci_host *host,
-+                                      struct mmc_command *cmd)
-+{
-+      u32 ccon, imsk;
-+
-+      imsk  = S3C2410_SDIIMSK_CRCSTATUS | S3C2410_SDIIMSK_CMDTIMEOUT |
-+              S3C2410_SDIIMSK_RESPONSEND | S3C2410_SDIIMSK_CMDSENT |
-+              S3C2410_SDIIMSK_RESPONSECRC;
-+
-+      enable_imask(host, imsk);
-+
-+      if (cmd->data)
-+              host->complete_what = COMPLETION_XFERFINISH_RSPFIN;
-+      else if (cmd->flags & MMC_RSP_PRESENT)
-+              host->complete_what = COMPLETION_RSPFIN;
-+      else
-+              host->complete_what = COMPLETION_CMDSENT;
-+
-+      writel(cmd->arg, host->base + S3C2410_SDICMDARG);
-+
-+      ccon = cmd->opcode & S3C2410_SDICMDCON_INDEX;
-+      ccon |= S3C2410_SDICMDCON_SENDERHOST | S3C2410_SDICMDCON_CMDSTART;
-+
-+      if (cmd->flags & MMC_RSP_PRESENT)
-+              ccon |= S3C2410_SDICMDCON_WAITRSP;
-+
-+      if (cmd->flags & MMC_RSP_136)
-+              ccon |= S3C2410_SDICMDCON_LONGRSP;
-+
-+      writel(ccon, host->base + S3C2410_SDICMDCON);
-+}
-+
-+static int s3cmci_setup_data(struct s3cmci_host *host, struct mmc_data *data)
-+{
-+      u32 dcon, imsk, stoptries = 3;
-+
-+      /* write DCON register */
-+
-+      if (!data) {
-+              writel(0, host->base + S3C2410_SDIDCON);
-+              return 0;
-+      }
-+
-+      while (readl(host->base + S3C2410_SDIDSTA) &
-+              (S3C2410_SDIDSTA_TXDATAON | S3C2410_SDIDSTA_RXDATAON)) {
-+
-+              dbg(host, dbg_err,
-+                  "mci_setup_data() transfer stillin progress.\n");
-+
-+              writel(S3C2410_SDIDCON_STOP, host->base + S3C2410_SDIDCON);
-+              s3cmci_reset(host);
-+
-+              if (0 == (stoptries--)) {
-+#ifdef CONFIG_MMC_DEBUG
-+                      dbg_dumpregs(host, "DRF");
-+#endif
-+
-+                      return -EINVAL;
-+              }
-+      }
-+
-+      dcon  = data->blocks & S3C2410_SDIDCON_BLKNUM_MASK;
-+
-+      if (host->dodma)
-+              dcon |= S3C2410_SDIDCON_DMAEN;
-+
-+      if (host->bus_width == MMC_BUS_WIDTH_4)
-+              dcon |= S3C2410_SDIDCON_WIDEBUS;
-+
-+      if (!(data->flags & MMC_DATA_STREAM))
-+              dcon |= S3C2410_SDIDCON_BLOCKMODE;
-+
-+      if (data->flags & MMC_DATA_WRITE) {
-+              dcon |= S3C2410_SDIDCON_TXAFTERRESP;
-+              dcon |= S3C2410_SDIDCON_XFER_TXSTART;
-+      }
-+
-+      if (data->flags & MMC_DATA_READ) {
-+              dcon |= S3C2410_SDIDCON_RXAFTERCMD;
-+              dcon |= S3C2410_SDIDCON_XFER_RXSTART;
-+      }
-+
-+      if (host->is2440) {
-+              dcon |= S3C2440_SDIDCON_DS_WORD;
-+              dcon |= S3C2440_SDIDCON_DATSTART;
-+      }
-+
-+      writel(dcon, host->base + S3C2410_SDIDCON);
-+
-+      /* write BSIZE register */
-+
-+      writel(data->blksz, host->base + S3C2410_SDIBSIZE);
-+
-+      /* add to IMASK register */
-+      imsk =  S3C2410_SDIIMSK_FIFOFAIL | S3C2410_SDIIMSK_DATACRC |
-+              S3C2410_SDIIMSK_DATATIMEOUT | S3C2410_SDIIMSK_DATAFINISH;
-+
-+      enable_imask(host, imsk);
-+
-+      /* write TIMER register */
-+
-+      if (host->is2440) {
-+              writel(0x007FFFFF, host->base + S3C2410_SDITIMER);
-+      } else {
-+              writel(0x0000FFFF, host->base + S3C2410_SDITIMER);
-+
-+              /* FIX: set slow clock to prevent timeouts on read */
-+              if (data->flags & MMC_DATA_READ)
-+                      writel(0xFF, host->base + S3C2410_SDIPRE);
-+      }
-+
-+      return 0;
-+}
-+
-+static int s3cmci_prepare_pio(struct s3cmci_host *host, struct mmc_data *data)
-+{
-+      int rw = (data->flags & MMC_DATA_WRITE)?1:0;
-+
-+      if (rw != ((data->flags & MMC_DATA_READ)?0:1))
-+              return -EINVAL;
-+
-+      host->pio_sgptr = 0;
-+      host->pio_bytes = 0;
-+      host->pio_count = 0;
-+      host->pio_active = rw?XFER_WRITE:XFER_READ;
-+
-+      if (rw) {
-+              do_pio_write(host);
-+              enable_imask(host, S3C2410_SDIIMSK_TXFIFOHALF);
-+      } else {
-+              enable_imask(host, S3C2410_SDIIMSK_RXFIFOHALF
-+                      | S3C2410_SDIIMSK_RXFIFOLAST);
-+      }
-+
-+      return 0;
-+}
-+
-+static int s3cmci_prepare_dma(struct s3cmci_host *host, struct mmc_data *data)
-+{
-+      int dma_len, i;
-+
-+      int rw = (data->flags & MMC_DATA_WRITE)?1:0;
-+
-+      if (rw != ((data->flags & MMC_DATA_READ)?0:1))
-+              return -EINVAL;
-+
-+      s3cmci_dma_setup(host, rw?S3C2410_DMASRC_MEM:S3C2410_DMASRC_HW);
-+      s3c2410_dma_ctrl(host->dma, S3C2410_DMAOP_FLUSH);
-+
-+      dma_len = dma_map_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
-+                              (rw)?DMA_TO_DEVICE:DMA_FROM_DEVICE);
-+
-+
-+      if (dma_len == 0)
-+              return -ENOMEM;
-+
-+      host->dma_complete = 0;
-+      host->dmatogo = dma_len;
-+
-+      for (i = 0; i < dma_len; i++) {
-+              int res;
-+
-+              dbg(host, dbg_dma, "enqueue %i:%u@%u\n", i,
-+                      sg_dma_address(&data->sg[i]),
-+                      sg_dma_len(&data->sg[i]));
-+
-+              res = s3c2410_dma_enqueue(host->dma, (void *) host,
-+                              sg_dma_address(&data->sg[i]),
-+                              sg_dma_len(&data->sg[i]));
-+
-+              if (res) {
-+                      s3c2410_dma_ctrl(host->dma, S3C2410_DMAOP_FLUSH);
-+                      return -EBUSY;
-+              }
-+      }
-+
-+      s3c2410_dma_ctrl(host->dma, S3C2410_DMAOP_START);
-+
-+      return 0;
-+}
-+
-+static void s3cmci_send_request(struct mmc_host *mmc)
-+{
-+      struct s3cmci_host *host = mmc_priv(mmc);
-+      struct mmc_request *mrq = host->mrq;
-+      struct mmc_command *cmd = host->cmd_is_stop?mrq->stop:mrq->cmd;
-+
-+      host->ccnt++;
-+#ifdef CONFIG_MMC_DEBUG
-+      prepare_dbgmsg(host, cmd, host->cmd_is_stop);
-+#endif
-+      /* clear command, data and fifo status registers;
-+       * Fifo clear only necessary on 2440, but doesn't hurt on 2410 */
-+      writel(0xFFFFFFFF, host->base + S3C2410_SDICMDSTAT);
-+      writel(0xFFFFFFFF, host->base + S3C2410_SDIDSTA);
-+      writel(0xFFFFFFFF, host->base + S3C2410_SDIFSTA);
-+
-+      if (cmd->data) {
-+              int res;
-+              res = s3cmci_setup_data(host, cmd->data);
-+
-+              host->dcnt++;
-+
-+              if (res) {
-+                      cmd->error = -EIO;
-+                      cmd->data->error = -EIO;
-+
-+                      mmc_request_done(mmc, mrq);
-+                      return;
-+              }
-+
-+
-+              if (host->dodma)
-+                      res = s3cmci_prepare_dma(host, cmd->data);
-+              else
-+                      res = s3cmci_prepare_pio(host, cmd->data);
-+
-+              if (res) {
-+                      cmd->error = -EIO;
-+                      cmd->data->error = -EIO;
-+
-+                      mmc_request_done(mmc, mrq);
-+                      return;
-+              }
-+
-+      }
-+
-+      s3cmci_send_command(host, cmd);
-+      enable_irq(host->irq);
-+}
-+
-+static void s3cmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
-+{
-+      struct s3cmci_host *host = mmc_priv(mmc);
-+
-+      host->cmd_is_stop = 0;
-+      host->mrq = mrq;
-+
-+      s3cmci_send_request(mmc);
-+}
-+
-+static void s3cmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-+{
-+      struct s3cmci_host *host = mmc_priv(mmc);
-+      u32 mci_psc, mci_con;
-+
-+      /* Set power */
-+      mci_con = readl(host->base + S3C2410_SDICON);
-+      switch (ios->power_mode) {
-+      case MMC_POWER_ON:
-+      case MMC_POWER_UP:
-+              s3c2410_gpio_cfgpin(S3C2410_GPE5, S3C2410_GPE5_SDCLK);
-+              s3c2410_gpio_cfgpin(S3C2410_GPE6, S3C2410_GPE6_SDCMD);
-+              s3c2410_gpio_cfgpin(S3C2410_GPE7, S3C2410_GPE7_SDDAT0);
-+              s3c2410_gpio_cfgpin(S3C2410_GPE8, S3C2410_GPE8_SDDAT1);
-+              s3c2410_gpio_cfgpin(S3C2410_GPE9, S3C2410_GPE9_SDDAT2);
-+              s3c2410_gpio_cfgpin(S3C2410_GPE10, S3C2410_GPE10_SDDAT3);
-+
-+              if (host->pdata->set_power)
-+                      host->pdata->set_power(ios->power_mode, ios->vdd);
-+
-+              if (!host->is2440)
-+                      mci_con |= S3C2410_SDICON_FIFORESET;
-+
-+              break;
-+
-+      case MMC_POWER_OFF:
-+      default:
-+              s3c2410_gpio_setpin(S3C2410_GPE5, 0);
-+              s3c2410_gpio_cfgpin(S3C2410_GPE5, S3C2410_GPE5_OUTP);
-+
-+              if (host->pdata->set_power)
-+                      host->pdata->set_power(ios->power_mode, ios->vdd);
-+
-+              if (host->is2440)
-+                      mci_con |= S3C2440_SDICON_SDRESET;
-+
-+              break;
-+      }
-+
-+      /* Set clock */
-+      for (mci_psc = 0; mci_psc < 255; mci_psc++) {
-+              host->real_rate = host->clk_rate / (host->clk_div*(mci_psc+1));
-+
-+              if (host->real_rate <= ios->clock)
-+                      break;
-+      }
-+
-+      if (mci_psc > 255)
-+              mci_psc = 255;
-+      host->prescaler = mci_psc;
-+
-+      writel(host->prescaler, host->base + S3C2410_SDIPRE);
-+
-+      /* If requested clock is 0, real_rate will be 0, too */
-+      if (ios->clock == 0)
-+              host->real_rate = 0;
-+
-+      /* Set CLOCK_ENABLE */
-+      if (ios->clock)
-+              mci_con |= S3C2410_SDICON_CLOCKTYPE;
-+      else
-+              mci_con &= ~S3C2410_SDICON_CLOCKTYPE;
-+
-+      writel(mci_con, host->base + S3C2410_SDICON);
-+
-+      if ((ios->power_mode == MMC_POWER_ON)
-+              || (ios->power_mode == MMC_POWER_UP)) {
-+
-+              dbg(host, dbg_conf, "running at %lukHz (requested: %ukHz).\n",
-+                  host->real_rate/1000, ios->clock/1000);
-+      } else {
-+              dbg(host, dbg_conf, "powered down.\n");
-+      }
-+
-+      host->bus_width = ios->bus_width;
-+
-+}
-+
-+static void s3cmci_reset(struct s3cmci_host *host)
-+{
-+      u32 con = readl(host->base + S3C2410_SDICON);
-+
-+      con |= S3C2440_SDICON_SDRESET;
-+
-+      writel(con, host->base + S3C2410_SDICON);
-+}
-+
-+static int s3cmci_get_ro(struct mmc_host *mmc)
-+{
-+      struct s3cmci_host *host = mmc_priv(mmc);
-+
-+      if (host->pdata->gpio_wprotect == 0)
-+              return 0;
-+
-+      return s3c2410_gpio_getpin(host->pdata->gpio_wprotect);
-+}
-+
-+static void s3cmci_enable_sdio_irq(struct mmc_host *mmc, int enable)
-+{
-+      struct s3cmci_host *host = mmc_priv(mmc);
-+
-+      if (enable)
-+              enable_imask(host, S3C2410_SDIIMSK_SDIOIRQ);
-+      else
-+              disable_imask(host, S3C2410_SDIIMSK_SDIOIRQ);
-+}
-+
-+static struct mmc_host_ops s3cmci_ops = {
-+      .request        = s3cmci_request,
-+      .set_ios        = s3cmci_set_ios,
-+      .get_ro         = s3cmci_get_ro,
-+      .enable_sdio_irq = s3cmci_enable_sdio_irq,
-+};
-+
-+static struct s3c24xx_mci_pdata s3cmci_def_pdata = {
-+      .do_dma         = 0,
-+      .gpio_detect    = 0,
-+      .set_power      = NULL,
-+      .ocr_avail      = MMC_VDD_32_33,
-+};
-+
-+static int s3cmci_probe(struct platform_device *pdev, int is2440)
-+{
-+      struct mmc_host         *mmc;
-+      struct s3cmci_host      *host;
-+
-+      int ret;
-+
-+      mmc = mmc_alloc_host(sizeof(struct s3cmci_host), &pdev->dev);
-+      if (!mmc) {
-+              ret = -ENOMEM;
-+              goto probe_out;
-+      }
-+
-+      host = mmc_priv(mmc);
-+      host->mmc       = mmc;
-+      host->pdev      = pdev;
-+
-+      host->pdata = pdev->dev.platform_data;
-+      if (!host->pdata) {
-+              pdev->dev.platform_data = &s3cmci_def_pdata;
-+              host->pdata = &s3cmci_def_pdata;
-+      }
-+
-+      spin_lock_init(&host->complete_lock);
-+      tasklet_init(&host->pio_tasklet, pio_tasklet, (unsigned long) host);
-+      if (is2440) {
-+              host->is2440    = 1;
-+              host->sdiimsk   = S3C2440_SDIIMSK;
-+              host->sdidata   = S3C2440_SDIDATA;
-+              host->sdidata_b = S3C2440_SDIDATA_BYTE;
-+              host->clk_div   = 1;
-+      } else {
-+              host->is2440    = 0;
-+              host->sdiimsk   = S3C2410_SDIIMSK;
-+              host->sdidata   = S3C2410_SDIDATA;
-+              host->sdidata_b = S3C2410_SDIDATA_BYTE;
-+              host->clk_div   = 2;
-+      }
-+      host->dodma             = host->pdata->do_dma;
-+      host->complete_what     = COMPLETION_NONE;
-+      host->pio_active        = XFER_NONE;
-+
-+      host->dma               = DMACH_SDI;
-+      host->irq_cd = s3c2410_gpio_getirq(host->pdata->gpio_detect);
-+      s3c2410_gpio_cfgpin(host->pdata->gpio_detect, S3C2410_GPIO_IRQ);
-+
-+      host->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+      if (!host->mem) {
-+              dev_err(&pdev->dev,
-+                      "failed to get io memory region resouce.\n");
-+
-+              ret = -ENOENT;
-+              goto probe_free_host;
-+      }
-+
-+      host->mem = request_mem_region(host->mem->start,
-+              RESSIZE(host->mem), pdev->name);
-+
-+      if (!host->mem) {
-+              dev_err(&pdev->dev, "failed to request io memory region.\n");
-+              ret = -ENOENT;
-+              goto probe_free_host;
-+      }
-+
-+      host->base = ioremap(host->mem->start, RESSIZE(host->mem));
-+      if (host->base == 0) {
-+              dev_err(&pdev->dev, "failed to ioremap() io memory region.\n");
-+              ret = -EINVAL;
-+              goto probe_free_mem_region;
-+      }
-+
-+      host->irq = platform_get_irq(pdev, 0);
-+      if (host->irq == 0) {
-+              dev_err(&pdev->dev, "failed to get interrupt resouce.\n");
-+              ret = -EINVAL;
-+              goto probe_iounmap;
-+      }
-+
-+      if (request_irq(host->irq, s3cmci_irq, 0, DRIVER_NAME, host)) {
-+              dev_err(&pdev->dev, "failed to request mci interrupt.\n");
-+              ret = -ENOENT;
-+              goto probe_iounmap;
-+      }
-+
-+      disable_irq(host->irq);
-+
-+      s3c2410_gpio_cfgpin(host->pdata->gpio_detect, S3C2410_GPIO_IRQ);
-+      set_irq_type(host->irq_cd, IRQT_BOTHEDGE);
-+
-+      if (request_irq(host->irq_cd, s3cmci_irq_cd, 0, DRIVER_NAME, host)) {
-+              dev_err(&pdev->dev,
-+                      "failed to request card detect interrupt.\n");
-+
-+              ret = -ENOENT;
-+              goto probe_free_irq;
-+      }
-+
-+      if (host->pdata->gpio_wprotect)
-+              s3c2410_gpio_cfgpin(host->pdata->gpio_wprotect,
-+                                  S3C2410_GPIO_INPUT);
-+
-+      if (s3c2410_dma_request(host->dma, &s3cmci_dma_client, NULL)) {
-+              dev_err(&pdev->dev, "unable to get DMA channel.\n");
-+              ret = -EBUSY;
-+              goto probe_free_irq_cd;
-+      }
-+
-+      host->clk = clk_get(&pdev->dev, "sdi");
-+      if (IS_ERR(host->clk)) {
-+              dev_err(&pdev->dev, "failed to find clock source.\n");
-+              ret = PTR_ERR(host->clk);
-+              host->clk = NULL;
-+              goto probe_free_host;
-+      }
-+
-+      ret = clk_enable(host->clk);
-+      if (ret) {
-+              dev_err(&pdev->dev, "failed to enable clock source.\n");
-+              goto clk_free;
-+      }
-+
-+      host->clk_rate = clk_get_rate(host->clk);
-+
-+      mmc->ops        = &s3cmci_ops;
-+      mmc->ocr_avail  = host->pdata->ocr_avail;
-+      mmc->caps       = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ;
-+      mmc->f_min      = host->clk_rate / (host->clk_div * 256);
-+      mmc->f_max      = host->clk_rate / host->clk_div;
-+
-+      mmc->max_blk_count      = 4095;
-+      mmc->max_blk_size       = 4095;
-+      mmc->max_req_size       = 4095 * 512;
-+      mmc->max_seg_size       = mmc->max_req_size;
-+
-+      mmc->max_phys_segs      = 128;
-+      mmc->max_hw_segs        = 128;
-+
-+      dbg(host, dbg_debug, "probe: mode:%s mapped mci_base:%p irq:%u "
-+          "irq_cd:%u dma:%u.\n", (host->is2440?"2440":""),
-+          host->base, host->irq, host->irq_cd, host->dma);
-+
-+      ret = mmc_add_host(mmc);
-+      if (ret) {
-+              dev_err(&pdev->dev, "failed to add mmc host.\n");
-+              goto free_dmabuf;
-+      }
-+
-+      platform_set_drvdata(pdev, mmc);
-+
-+      dev_info(&pdev->dev, "initialisation done.\n");
-+      return 0;
-+
-+ free_dmabuf:
-+      clk_disable(host->clk);
-+
-+ clk_free:
-+      clk_put(host->clk);
-+
-+ probe_free_irq_cd:
-+      free_irq(host->irq_cd, host);
-+
-+ probe_free_irq:
-+      free_irq(host->irq, host);
-+
-+ probe_iounmap:
-+      iounmap(host->base);
-+
-+ probe_free_mem_region:
-+      release_mem_region(host->mem->start, RESSIZE(host->mem));
-+
-+ probe_free_host:
-+      mmc_free_host(mmc);
-+ probe_out:
-+      return ret;
-+}
-+
-+static int s3cmci_remove(struct platform_device *pdev)
-+{
-+      struct mmc_host         *mmc  = platform_get_drvdata(pdev);
-+      struct s3cmci_host      *host = mmc_priv(mmc);
-+
-+      mmc_remove_host(mmc);
-+      clk_disable(host->clk);
-+      clk_put(host->clk);
-+      s3c2410_dma_free(host->dma, &s3cmci_dma_client);
-+      free_irq(host->irq_cd, host);
-+      free_irq(host->irq, host);
-+      iounmap(host->base);
-+      release_mem_region(host->mem->start, RESSIZE(host->mem));
-+      mmc_free_host(mmc);
-+
-+      return 0;
-+}
-+
-+static int s3cmci_probe_2410(struct platform_device *dev)
-+{
-+      return s3cmci_probe(dev, 0);
-+}
-+
-+static int s3cmci_probe_2412(struct platform_device *dev)
-+{
-+      return s3cmci_probe(dev, 1);
-+}
-+
-+static int s3cmci_probe_2440(struct platform_device *dev)
-+{
-+      return s3cmci_probe(dev, 1);
-+}
-+
-+#ifdef CONFIG_PM
-+
-+static int s3cmci_suspend(struct platform_device *dev, pm_message_t state)
-+{
-+      struct mmc_host *mmc = platform_get_drvdata(dev);
-+
-+      return  mmc_suspend_host(mmc, state);
-+}
-+
-+static int s3cmci_resume(struct platform_device *dev)
-+{
-+      struct mmc_host *mmc = platform_get_drvdata(dev);
-+
-+      return mmc_resume_host(mmc);
-+}
-+
-+#else /* CONFIG_PM */
-+#define s3cmci_suspend NULL
-+#define s3cmci_resume NULL
-+#endif /* CONFIG_PM */
-+
-+
-+static struct platform_driver s3cmci_driver_2410 = {
-+      .driver.name    = "s3c2410-sdi",
-+      .probe          = s3cmci_probe_2410,
-+      .remove         = s3cmci_remove,
-+      .suspend        = s3cmci_suspend,
-+      .resume         = s3cmci_resume,
-+};
-+
-+static struct platform_driver s3cmci_driver_2412 = {
-+      .driver.name    = "s3c2412-sdi",
-+      .probe          = s3cmci_probe_2412,
-+      .remove         = s3cmci_remove,
-+      .suspend        = s3cmci_suspend,
-+      .resume         = s3cmci_resume,
-+};
-+
-+static struct platform_driver s3cmci_driver_2440 = {
-+      .driver.name    = "s3c2440-sdi",
-+      .probe          = s3cmci_probe_2440,
-+      .remove         = s3cmci_remove,
-+      .suspend        = s3cmci_suspend,
-+      .resume         = s3cmci_resume,
-+};
-+
-+
-+static int __init s3cmci_init(void)
-+{
-+      platform_driver_register(&s3cmci_driver_2410);
-+      platform_driver_register(&s3cmci_driver_2412);
-+      platform_driver_register(&s3cmci_driver_2440);
-+      return 0;
-+}
-+
-+static void __exit s3cmci_exit(void)
-+{
-+      platform_driver_unregister(&s3cmci_driver_2410);
-+      platform_driver_unregister(&s3cmci_driver_2412);
-+      platform_driver_unregister(&s3cmci_driver_2440);
-+}
-+
-+module_init(s3cmci_init);
-+module_exit(s3cmci_exit);
-+
-+MODULE_DESCRIPTION("Samsung S3C MMC/SD Card Interface driver");
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Thomas Kleffel <tk@maintech.de>");
-diff --git a/drivers/mmc/host/s3cmci.h b/drivers/mmc/host/s3cmci.h
-new file mode 100644
-index 0000000..9644b45
---- /dev/null
-+++ b/drivers/mmc/host/s3cmci.h
-@@ -0,0 +1,69 @@
-+/*
-+ *  linux/drivers/mmc/s3cmci.h - Samsung S3C MCI driver
-+ *
-+ *  Copyright (C) 2004-2006 Thomas Kleffel, 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 version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+enum s3cmci_waitfor {
-+      COMPLETION_NONE,
-+      COMPLETION_FINALIZE,
-+      COMPLETION_CMDSENT,
-+      COMPLETION_RSPFIN,
-+      COMPLETION_XFERFINISH,
-+      COMPLETION_XFERFINISH_RSPFIN,
-+};
-+
-+struct s3cmci_host {
-+      struct platform_device  *pdev;
-+      struct s3c24xx_mci_pdata *pdata;
-+      struct mmc_host         *mmc;
-+      struct resource         *mem;
-+      struct clk              *clk;
-+      void __iomem            *base;
-+      int                     irq;
-+      int                     irq_cd;
-+      int                     dma;
-+
-+      unsigned long           clk_rate;
-+      unsigned long           clk_div;
-+      unsigned long           real_rate;
-+      u8                      prescaler;
-+
-+      int                     is2440;
-+      unsigned                sdiimsk;
-+      unsigned                sdidata;
-+      unsigned                sdidata_b;
-+      int                     dodma;
-+
-+      int                     dmatogo;
-+
-+      struct mmc_request      *mrq;
-+      int                     cmd_is_stop;
-+
-+      spinlock_t              complete_lock;
-+      enum s3cmci_waitfor     complete_what;
-+
-+      int                     dma_complete;
-+
-+      u32                     pio_sgptr;
-+      u32                     pio_bytes;
-+      u32                     pio_count;
-+      u8                      *pio_ptr;
-+#define XFER_NONE 0
-+#define XFER_READ 1
-+#define XFER_WRITE 2
-+      u32                     pio_active;
-+
-+      int                     bus_width;
-+
-+      char                    dbgmsg_cmd[301];
-+      char                    dbgmsg_dat[301];
-+      char                    *status;
-+
-+      unsigned int            ccnt, dcnt;
-+      struct tasklet_struct   pio_tasklet;
-+};
-diff --git a/include/asm-arm/arch-s3c2410/mci.h b/include/asm-arm/arch-s3c2410/mci.h
-new file mode 100644
-index 0000000..24e6cd1
---- /dev/null
-+++ b/include/asm-arm/arch-s3c2410/mci.h
-@@ -0,0 +1,13 @@
-+#ifndef _ARCH_MCI_H
-+#define _ARCH_MCI_H
-+
-+struct s3c24xx_mci_pdata {
-+      unsigned int    gpio_detect;
-+      unsigned int    gpio_wprotect;
-+      unsigned long   ocr_avail;
-+      unsigned int    do_dma;
-+      void            (*set_power)(unsigned char power_mode,
-+                                   unsigned short vdd);
-+};
-+
-+#endif /* _ARCH_NCI_H */
-diff --git a/include/asm-arm/arch-s3c2410/regs-sdi.h b/include/asm-arm/arch-s3c2410/regs-sdi.h
-index bb9d30b..4bb1ec5 100644
---- a/include/asm-arm/arch-s3c2410/regs-sdi.h
-+++ b/include/asm-arm/arch-s3c2410/regs-sdi.h
-@@ -28,9 +28,17 @@
- #define S3C2410_SDIDCNT               (0x30)
- #define S3C2410_SDIDSTA               (0x34)
- #define S3C2410_SDIFSTA               (0x38)
-+
- #define S3C2410_SDIDATA               (0x3C)
-+#define S3C2410_SDIDATA_BYTE          (0x3C)
- #define S3C2410_SDIIMSK               (0x40)
-+#define S3C2440_SDIDATA               (0x40)
-+#define S3C2440_SDIDATA_BYTE          (0x48)
-+#define S3C2440_SDIIMSK               (0x3C)
-+
-+#define S3C2440_SDICON_SDRESET        (1<<8)
-+#define S3C2440_SDICON_MMCCLOCK       (1<<5)
- #define S3C2410_SDICON_BYTEORDER      (1<<4)
- #define S3C2410_SDICON_SDIOIRQ        (1<<3)
- #define S3C2410_SDICON_RWAITEN        (1<<2)
-@@ -42,7 +50,8 @@
- #define S3C2410_SDICMDCON_LONGRSP     (1<<10)
- #define S3C2410_SDICMDCON_WAITRSP     (1<<9)
- #define S3C2410_SDICMDCON_CMDSTART    (1<<8)
--#define S3C2410_SDICMDCON_INDEX       (0xff)
-+#define S3C2410_SDICMDCON_SENDERHOST  (1<<6)
-+#define S3C2410_SDICMDCON_INDEX       (0x3f)
- #define S3C2410_SDICMDSTAT_CRCFAIL    (1<<12)
- #define S3C2410_SDICMDSTAT_CMDSENT    (1<<11)
-@@ -51,6 +60,9 @@
- #define S3C2410_SDICMDSTAT_XFERING    (1<<8)
- #define S3C2410_SDICMDSTAT_INDEX      (0xff)
-+#define S3C2440_SDIDCON_DS_BYTE       (0<<22)
-+#define S3C2440_SDIDCON_DS_HALFWORD   (1<<22)
-+#define S3C2440_SDIDCON_DS_WORD       (2<<22)
- #define S3C2410_SDIDCON_IRQPERIOD     (1<<21)
- #define S3C2410_SDIDCON_TXAFTERRESP   (1<<20)
- #define S3C2410_SDIDCON_RXAFTERCMD    (1<<19)
-@@ -59,6 +71,7 @@
- #define S3C2410_SDIDCON_WIDEBUS       (1<<16)
- #define S3C2410_SDIDCON_DMAEN         (1<<15)
- #define S3C2410_SDIDCON_STOP          (1<<14)
-+#define S3C2440_SDIDCON_DATSTART      (1<<14)
- #define S3C2410_SDIDCON_DATMODE             (3<<12)
- #define S3C2410_SDIDCON_BLKNUM        (0x7ff)
-@@ -68,6 +81,7 @@
- #define S3C2410_SDIDCON_XFER_RXSTART  (2<<12)
- #define S3C2410_SDIDCON_XFER_TXSTART  (3<<12)
-+#define S3C2410_SDIDCON_BLKNUM_MASK   (0xFFF)
- #define S3C2410_SDIDCNT_BLKNUM_SHIFT  (12)
- #define S3C2410_SDIDSTA_RDYWAITREQ    (1<<10)
-@@ -82,10 +96,12 @@
- #define S3C2410_SDIDSTA_TXDATAON      (1<<1)
- #define S3C2410_SDIDSTA_RXDATAON      (1<<0)
-+#define S3C2440_SDIFSTA_FIFORESET      (1<<16)
-+#define S3C2440_SDIFSTA_FIFOFAIL       (3<<14)  /* 3 is correct (2 bits) */
- #define S3C2410_SDIFSTA_TFDET          (1<<13)
- #define S3C2410_SDIFSTA_RFDET          (1<<12)
--#define S3C2410_SDIFSTA_TXHALF         (1<<11)
--#define S3C2410_SDIFSTA_TXEMPTY        (1<<10)
-+#define S3C2410_SDIFSTA_TFHALF         (1<<11)
-+#define S3C2410_SDIFSTA_TFEMPTY        (1<<10)
- #define S3C2410_SDIFSTA_RFLAST         (1<<9)
- #define S3C2410_SDIFSTA_RFFULL         (1<<8)
- #define S3C2410_SDIFSTA_RFHALF         (1<<7)
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1024-s3c_mci-gta01.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1024-s3c_mci-gta01.patch.patch
deleted file mode 100644 (file)
index cd5fb3a..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-From 948f60af720f34294629041773d9947bcefc0a9a Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:33:24 +0100
-Subject: [PATCH] s3c_mci-gta01.patch
-
----
- arch/arm/mach-s3c2410/mach-gta01.c |   56 ++++++++++++++++++++++++++++++++++++
- 1 files changed, 56 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index 3462c7f..87bb189 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -59,6 +59,7 @@
- #include <asm/arch/regs-gpio.h>
- #include <asm/arch/fb.h>
-+#include <asm/arch/mci.h>
- #include <asm/arch/spi.h>
- #include <asm/arch/spi-gpio.h>
- #include <asm/arch/usb-control.h>
-@@ -382,6 +383,59 @@ static struct s3c2410_platform_nand gta01_nand_info = {
-       .sets           = gta01_nand_sets,
- };
-+static void gta01_mmc_set_power(unsigned char power_mode, unsigned short vdd)
-+{
-+      int bit;
-+      int mv = 1700; /* 1.7V for MMC_VDD_165_195 */
-+
-+      printk(KERN_DEBUG "mmc_set_power(power_mode=%u, vdd=%u\n",
-+             power_mode, vdd);
-+
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+              switch (power_mode) {
-+              case MMC_POWER_OFF:
-+                      pcf50606_onoff_set(pcf50606_global,
-+                                         PCF50606_REGULATOR_D2REG, 0);
-+                      break;
-+              case MMC_POWER_ON:
-+                      /* translate MMC_VDD_* VDD bit to mv */
-+                      for (bit = 8; bit != 24; bit++)
-+                              if (vdd == (1 << bit))
-+                                      mv += 100 * (bit - 4);
-+                      pcf50606_voltage_set(pcf50606_global,
-+                                           PCF50606_REGULATOR_D2REG, mv);
-+                      pcf50606_onoff_set(pcf50606_global,
-+                                         PCF50606_REGULATOR_D2REG, 1);
-+                      break;
-+              }
-+              break;
-+      case GTA01v4_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              switch (power_mode) {
-+              case MMC_POWER_OFF:
-+                      s3c2410_gpio_setpin(GTA01_GPIO_SDMMC_ON, 1);
-+                      break;
-+              case MMC_POWER_ON:
-+                      s3c2410_gpio_setpin(GTA01_GPIO_SDMMC_ON, 0);
-+                      break;
-+              }
-+              break;
-+      }
-+}
-+
-+static struct s3c24xx_mci_pdata gta01_mmc_cfg = {
-+      .gpio_detect    = GTA01_GPIO_nSD_DETECT,
-+      .set_power      = &gta01_mmc_set_power,
-+      .ocr_avail      = MMC_VDD_165_195|MMC_VDD_20_21|
-+                        MMC_VDD_21_22|MMC_VDD_22_23|MMC_VDD_23_24|
-+                        MMC_VDD_24_25|MMC_VDD_25_26|MMC_VDD_26_27|
-+                        MMC_VDD_27_28|MMC_VDD_28_29|MMC_VDD_29_30|
-+                        MMC_VDD_30_31|MMC_VDD_31_32|MMC_VDD_32_33,
-+};
-+
- static void gta01_udc_command(enum s3c2410_udc_cmd_e cmd)
- {
-       printk(KERN_DEBUG "%s(%d)\n", __func__, cmd);
-@@ -598,10 +652,12 @@ static void __init gta01_machine_init(void)
-           system_rev == GTA01Bv3_SYSTEM_REV ||
-           system_rev == GTA01Bv4_SYSTEM_REV) {
-               gta01_udc_cfg.udc_command = gta01_udc_command;
-+              gta01_mmc_cfg.ocr_avail = MMC_VDD_32_33;
-       }
-       s3c_device_usb.dev.platform_data = &gta01_usb_info;
-       s3c_device_nand.dev.platform_data = &gta01_nand_info;
-+      s3c_device_sdi.dev.platform_data = &gta01_mmc_cfg;
-       s3c24xx_fb_set_platdata(&gta01_lcd_cfg);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1025-qt2410-s3c_mci-pdata.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1025-qt2410-s3c_mci-pdata.patch.patch
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/target/linux/s3c24xx/patches-2.6.24/1026-s3c24xx-nand-largepage.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1026-s3c24xx-nand-largepage.patch.patch
deleted file mode 100644 (file)
index 1f14c7c..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-From cddfb6f606768265f2b36658761ea9467f098f0a Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:33:44 +0100
-Subject: [PATCH] s3c24xx-nand-largepage.patch
- MTD: S3C24XX large page NAND support
-
-This adds support for using large page NAND devices
-with the S3C24XX NAND controller. This also adds the
-file Documentation/arm/Samsung-S3C24XX/NAND.txt to
-describe the differences.
-
-Signed-off-by: Ben Dooks <ben-linux@fluff.org>
----
- Documentation/arm/Samsung-S3C24XX/NAND.txt     |   30 +++++++++++++++++++
- Documentation/arm/Samsung-S3C24XX/Overview.txt |    2 +
- drivers/mtd/nand/s3c2410.c                     |   38 ++++++++++++++++++++---
- 3 files changed, 65 insertions(+), 5 deletions(-)
- create mode 100644 Documentation/arm/Samsung-S3C24XX/NAND.txt
-
-diff --git a/Documentation/arm/Samsung-S3C24XX/NAND.txt b/Documentation/arm/Samsung-S3C24XX/NAND.txt
-new file mode 100644
-index 0000000..bc478a3
---- /dev/null
-+++ b/Documentation/arm/Samsung-S3C24XX/NAND.txt
-@@ -0,0 +1,30 @@
-+                      S3C24XX NAND Support
-+                      ====================
-+
-+Introduction
-+------------
-+
-+Small Page NAND
-+---------------
-+
-+The driver uses a 512 byte (1 page) ECC code for this setup. The
-+ECC code is not directly compatible with the default kernel ECC
-+code, so the driver enforces its own OOB layout and ECC parameters
-+
-+Large Page NAND
-+---------------
-+
-+The driver is capable of handling NAND flash with a 2KiB page
-+size, with support for hardware ECC generation and correction.
-+
-+Unlike the 512byte page mode, the driver generates ECC data for
-+each 256 byte block in an 2KiB page. This means that more than
-+one error in a page can be rectified. It also means that the
-+OOB layout remains the default kernel layout for these flashes.
-+
-+
-+Document Author
-+---------------
-+
-+Ben Dooks, Copyright 2007 Simtec Electronics
-+
-diff --git a/Documentation/arm/Samsung-S3C24XX/Overview.txt b/Documentation/arm/Samsung-S3C24XX/Overview.txt
-index c31b76f..d04e1e3 100644
---- a/Documentation/arm/Samsung-S3C24XX/Overview.txt
-+++ b/Documentation/arm/Samsung-S3C24XX/Overview.txt
-@@ -156,6 +156,8 @@ NAND
-   controller. If there are any problems the latest linux-mtd
-   code can be found from http://www.linux-mtd.infradead.org/
-+  For more information see Documentation/arm/Samsung-S3C24XX/NAND.txt
-+
- Serial
- ------
-diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
-index 770306c..5c1c09d 100644
---- a/drivers/mtd/nand/s3c2410.c
-+++ b/drivers/mtd/nand/s3c2410.c
-@@ -473,7 +473,7 @@ static int s3c2440_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat, u
-       ecc_code[1] = ecc >> 8;
-       ecc_code[2] = ecc >> 16;
--      pr_debug("%s: returning ecc %06lx\n", __func__, ecc);
-+      pr_debug("%s: returning ecc %06lx\n", __func__, ecc & 0xffffff);
-       return 0;
- }
-@@ -662,9 +662,6 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,
-               chip->ecc.calculate = s3c2410_nand_calculate_ecc;
-               chip->ecc.correct   = s3c2410_nand_correct_data;
-               chip->ecc.mode      = NAND_ECC_HW;
--              chip->ecc.size      = 512;
--              chip->ecc.bytes     = 3;
--              chip->ecc.layout    = &nand_hw_eccoob;
-               switch (info->cpu_type) {
-               case TYPE_S3C2410:
-@@ -688,6 +685,34 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,
-       }
- }
-+/* s3c2410_nand_update_chip
-+ *
-+ * post-probe chip update, to change any items, such as the
-+ * layout for large page nand
-+ */
-+
-+static void s3c2410_nand_update_chip(struct s3c2410_nand_info *info,
-+                                   struct s3c2410_nand_mtd *nmtd)
-+{
-+      struct nand_chip *chip = &nmtd->chip;
-+
-+      printk("%s: chip %p: %d\n", __func__, chip, chip->page_shift);
-+
-+      if (hardware_ecc) {
-+              /* change the behaviour depending on wether we are using
-+               * the large or small page nand device */
-+
-+              if (chip->page_shift > 10) {
-+                      chip->ecc.size      = 256;
-+                      chip->ecc.bytes     = 3;
-+              } else {
-+                      chip->ecc.size      = 512;
-+                      chip->ecc.bytes     = 3;
-+                      chip->ecc.layout    = &nand_hw_eccoob;
-+              }
-+      }
-+}
-+
- /* s3c2410_nand_probe
-  *
-  * called by device layer when it finds a device matching
-@@ -794,9 +819,12 @@ static int s3c24xx_nand_probe(struct platform_device *pdev,
-               s3c2410_nand_init_chip(info, nmtd, sets);
--              nmtd->scan_res = nand_scan(&nmtd->mtd, (sets) ? sets->nr_chips : 1);
-+              nmtd->scan_res = nand_scan_ident(&nmtd->mtd,
-+                                               (sets) ? sets->nr_chips : 1);
-               if (nmtd->scan_res == 0) {
-+                      s3c2410_nand_update_chip(info, nmtd);
-+                      nand_scan_tail(&nmtd->mtd);
-                       s3c2410_nand_add_partition(info, nmtd, sets);
-               }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1027-s3c2410_udc-2440_dual_packet-workaround.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1027-s3c2410_udc-2440_dual_packet-workaround.patch.patch
deleted file mode 100644 (file)
index 644da7a..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-From d8310bb7e4ee4a9f3433a9a1e0e87567337299cb Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:33:55 +0100
-Subject: [PATCH] s3c2410_udc-2440_dual_packet-workaround.patch
- This is a patch that seems to make the USB hangs on the S3C2440 go away. At
- least a good amount of ping torture didn't make them come back so far.
-
-The issue is that, if there are several back-to-back packets,
-sometimes no interrupt is generated for one of them. This
-seems to be caused by the mysterious dual packet mode, which
-the USB hardware enters automatically if the endpoint size is
-half that of the FIFO. (On the 2440, this is the normal
-situation for bulk data endpoints.)
-
-There is also a timing factor in this. I think what happens is
-that the USB hardware automatically sends an acknowledgement
-if there is only one packet in the FIFO (the FIFO has space
-for two). If another packet arrives before the host has
-retrieved and acknowledged the previous one, no interrupt is
-generated for that second one.
-
-However, there may be an indication. There is one undocumented
-bit (none of the 244x manuals document it), OUT_CRS1_REG[1],
-that seems to be set suspiciously often when this condition
-occurs. There is also CLR_DATA_TOGGLE, OUT_CRS1_REG[7], which
-may have a function related to this. (The Samsung manual is
-rather terse on that, as usual.)
-
-This needs to be examined further. For now, the patch seems to do the
-trick.
-
-Note that this is not a clean solution by any means, because we
-might potentially get stuck in that interrupt for quite a while.
----
- drivers/usb/gadget/s3c2410_udc.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c
-index 4ce050c..d4a17af 100644
---- a/drivers/usb/gadget/s3c2410_udc.c
-+++ b/drivers/usb/gadget/s3c2410_udc.c
-@@ -845,6 +845,7 @@ static void s3c2410_udc_handle_ep(struct s3c2410_ep *ep)
-       u32                     ep_csr1;
-       u32                     idx;
-+handle_ep_again:
-       if (likely (!list_empty(&ep->queue)))
-               req = list_entry(ep->queue.next,
-                               struct s3c2410_request, queue);
-@@ -884,6 +885,8 @@ static void s3c2410_udc_handle_ep(struct s3c2410_ep *ep)
-               if ((ep_csr1 & S3C2410_UDC_OCSR1_PKTRDY) && req) {
-                       s3c2410_udc_read_fifo(ep,req);
-+                      if (s3c2410_udc_fifo_count_out())
-+                              goto handle_ep_again;
-               }
-       }
- }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1028-hxd8-core.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1028-hxd8-core.patch.patch
deleted file mode 100644 (file)
index 9e16713..0000000
+++ /dev/null
@@ -1,453 +0,0 @@
-From 23b8a1e056b74101ae9d51ccbab2d208e46c01a4 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:34:06 +0100
-Subject: [PATCH] hxd8-core.patch
- This patch adds another machine, the FIC HXD8
-
----
- arch/arm/mach-s3c2440/Kconfig       |    6 +
- arch/arm/mach-s3c2440/Makefile      |    1 +
- arch/arm/mach-s3c2440/mach-hxd8.c   |  381 +++++++++++++++++++++++++++++++++++
- include/asm-arm/arch-s3c2440/hxd8.h |   16 ++
- 4 files changed, 404 insertions(+), 0 deletions(-)
- create mode 100644 arch/arm/mach-s3c2440/mach-hxd8.c
- create mode 100644 include/asm-arm/arch-s3c2440/hxd8.h
-
-diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
-index f1915bd..6798d9c 100644
---- a/arch/arm/mach-s3c2440/Kconfig
-+++ b/arch/arm/mach-s3c2440/Kconfig
-@@ -67,6 +67,12 @@ config SMDK2440_CPU2440
-       default y if ARCH_S3C2440
-       select CPU_S3C2440
-+config MACH_HXD8
-+      bool "FIC HXD8"
-+      select CPU_S3C2440
-+      select SENSORS_PCF50606
-+      help
-+         Say Y here if you are using the FIC Neo1973 GSM Phone
- endmenu
-diff --git a/arch/arm/mach-s3c2440/Makefile b/arch/arm/mach-s3c2440/Makefile
-index c81ed62..6f590d4 100644
---- a/arch/arm/mach-s3c2440/Makefile
-+++ b/arch/arm/mach-s3c2440/Makefile
-@@ -21,3 +21,4 @@ obj-$(CONFIG_MACH_OSIRIS)    += mach-osiris.o
- obj-$(CONFIG_MACH_RX3715)     += mach-rx3715.o
- obj-$(CONFIG_ARCH_S3C2440)    += mach-smdk2440.o
- obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
-+obj-$(CONFIG_MACH_HXD8)               += mach-hxd8.o
-diff --git a/arch/arm/mach-s3c2440/mach-hxd8.c b/arch/arm/mach-s3c2440/mach-hxd8.c
-new file mode 100644
-index 0000000..3400ed3
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/mach-hxd8.c
-@@ -0,0 +1,381 @@
-+/* linux/arch/arm/mach-s3c2440/mach-hxd8.c
-+ *
-+ * S3C2440 Machine Support for the FIC HXD8
-+ *
-+ * Copyright (c) 2007 OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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
-+ *
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/types.h>
-+#include <linux/interrupt.h>
-+#include <linux/list.h>
-+#include <linux/timer.h>
-+#include <linux/init.h>
-+#include <linux/workqueue.h>
-+#include <linux/serial_core.h>
-+#include <linux/platform_device.h>
-+#include <linux/mmc/host.h>
-+
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/nand.h>
-+#include <linux/mtd/nand_ecc.h>
-+#include <linux/mtd/partitions.h>
-+
-+#include <linux/pcf50606.h>
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/map.h>
-+#include <asm/mach/irq.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/hardware/iomd.h>
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <asm/mach-types.h>
-+
-+//#include <asm/debug-ll.h>
-+#include <asm/arch/regs-gpio.h>
-+#include <asm/arch/regs-lcd.h>
-+#include <asm/arch/idle.h>
-+#include <asm/arch/fb.h>
-+#include <asm/arch/mci.h>
-+#include <asm/arch/ts.h>
-+#include <asm/arch/spi.h>
-+#include <asm/arch/spi-gpio.h>
-+#include <asm/arch/usb-control.h>
-+
-+#include <asm/arch-s3c2440/hxd8.h>
-+#include <asm/arch/gta01.h>
-+
-+//#include "s3c2410.h"
-+//#include "s3c2440.h"
-+//#include "clock.h"
-+#include <asm/plat-s3c/regs-serial.h>
-+#include <asm/plat-s3c/nand.h>
-+#include <asm/plat-s3c24xx/devs.h>
-+#include <asm/plat-s3c24xx/cpu.h>
-+#include <asm/plat-s3c24xx/pm.h>
-+#include <asm/plat-s3c24xx/udc.h>
-+
-+static struct map_desc hxd8_iodesc[] __initdata = {
-+      /* ISA IO Space map (memory space selected by A24) */
-+
-+      {
-+              .virtual        = (u32)S3C24XX_VA_ISA_WORD,
-+              .pfn            = __phys_to_pfn(S3C2410_CS2),
-+              .length         = 0x10000,
-+              .type           = MT_DEVICE,
-+      }, {
-+              .virtual        = (u32)S3C24XX_VA_ISA_WORD + 0x10000,
-+              .pfn            = __phys_to_pfn(S3C2410_CS2 + (1<<24)),
-+              .length         = SZ_4M,
-+              .type           = MT_DEVICE,
-+      }, {
-+              .virtual        = (u32)S3C24XX_VA_ISA_BYTE,
-+              .pfn            = __phys_to_pfn(S3C2410_CS2),
-+              .length         = 0x10000,
-+              .type           = MT_DEVICE,
-+      }, {
-+              .virtual        = (u32)S3C24XX_VA_ISA_BYTE + 0x10000,
-+              .pfn            = __phys_to_pfn(S3C2410_CS2 + (1<<24)),
-+              .length         = SZ_4M,
-+              .type           = MT_DEVICE,
-+      }
-+};
-+
-+#define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK
-+#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
-+#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
-+
-+static struct s3c2410_uartcfg hxd8_uartcfgs[] __initdata = {
-+      [0] = {
-+              .hwport      = 0,
-+              .flags       = 0,
-+              .ucon        = 0x3c5,
-+              .ulcon       = 0x03,
-+              .ufcon       = 0x51,
-+      },
-+      [1] = {
-+              .hwport      = 1,
-+              .flags       = 0,
-+              .ucon        = 0x3c5,
-+              .ulcon       = 0x03,
-+              .ufcon       = 0x51,
-+      },
-+      [2] = {
-+              .hwport      = 2,
-+              .flags       = 0,
-+              .ucon        = 0x3c5,
-+              .ulcon       = 0x03,
-+              .ufcon       = 0x51,
-+      }
-+};
-+
-+static struct s3c2410_nand_set hxd8_nand_sets[] = {
-+      [0] = {
-+              .name           = "hxd8-nand",
-+              .nr_chips       = 1,
-+              .flags          = S3C2410_NAND_BBT,
-+      },
-+      [1] = {
-+              .name           = "hxd8-nand-1",
-+              .nr_chips       = 1,
-+              .flags          = S3C2410_NAND_BBT,
-+      },
-+      [2] = {
-+              .name           = "hxd8-nand-2",
-+              .nr_chips       = 1,
-+              .flags          = S3C2410_NAND_BBT,
-+      },
-+};
-+
-+/* choose a set of timings which should suit most 512Mbit
-+ * chips and beyond.
-+*/
-+
-+static struct s3c2410_platform_nand hxd8_nand_info = {
-+      .tacls          = 20,
-+      .twrph0         = 60,
-+      .twrph1         = 20,
-+      .nr_sets        = ARRAY_SIZE(hxd8_nand_sets),
-+      .sets           = hxd8_nand_sets,
-+};
-+
-+/* PMU configuration */
-+
-+static struct pcf50606_platform_data hxd8_pcf_pdata = {
-+      .used_features  = PCF50606_FEAT_EXTON |
-+                        PCF50606_FEAT_BBC |
-+                        PCF50606_FEAT_WDT |
-+                        PCF50606_FEAT_RTC |
-+                        PCF50606_FEAT_PWM |
-+                        PCF50606_FEAT_PWM_BL |
-+                        PCF50606_FEAT_BATVOLT,
-+      .onkey_seconds_required = 5,
-+      .init_brightness = 8,
-+      .rails  = {
-+              [PCF50606_REGULATOR_D1REG] = {
-+                      .name           = "rc_3v3",
-+                      .voltage        = {
-+                              .init   = 3300,
-+                              .max    = 3300,
-+                      },
-+              },
-+              [PCF50606_REGULATOR_D2REG] = {
-+                      .name           = "gps_3v3",
-+                      .voltage        = {
-+                              .init   = 3300,
-+                              .max    = 3300,
-+                      },
-+              },
-+              [PCF50606_REGULATOR_D3REG] = {
-+                      .name           = "io2_3v3",
-+                      .voltage        = {
-+                              .init   = 3300,
-+                              .max    = 3300,
-+                      },
-+              },
-+              [PCF50606_REGULATOR_DCD] = {
-+                      .name           = "core_1v3",
-+                      .voltage        = {
-+                              .init   = 1300,
-+                              .max    = 1500,
-+                      },
-+              },
-+              [PCF50606_REGULATOR_DCDE] = {
-+                      .name           = "io1_3v3",
-+                      .voltage        = {
-+                              .init   = 3300,
-+                              .max    = 3300,
-+                      },
-+              },
-+              [PCF50606_REGULATOR_DCUD] = {
-+                      .name           = "rf_3v3",
-+                      .voltage        = {
-+                              .init   = 3300,
-+                              .max    = 3300,
-+                      },
-+              },
-+              [PCF50606_REGULATOR_IOREG] = {
-+                      .name           = "audio_3v3",
-+                      .voltage        = {
-+                              .init   = 3300,
-+                              .max    = 3300,
-+                      },
-+              },
-+              [PCF50606_REGULATOR_LPREG] = {
-+                      .name           = "lcm_3v3",
-+                      .voltage        = {
-+                              .init   = 3300,
-+                              .max    = 3300,
-+                      },
-+              },
-+      },
-+};
-+
-+static struct resource hxd8_pmu_resources[] = {
-+      [0] = {
-+              .flags  = IORESOURCE_IRQ,
-+              .start  = HXD8_IRQ_PCF50606,
-+              .end    = HXD8_IRQ_PCF50606,
-+      },
-+};
-+
-+static struct platform_device hxd8_pmu_dev = {
-+      .name           = "pcf50606",
-+      .num_resources  = ARRAY_SIZE(hxd8_pmu_resources),
-+      .resource       = hxd8_pmu_resources,
-+      .dev            = {
-+              .platform_data = &hxd8_pcf_pdata,
-+      },
-+};
-+
-+/* LCD driver info */
-+
-+static struct s3c2410fb_display hxd8_displays[] __initdata =  {
-+      {
-+              .type           = S3C2410_LCDCON1_TFT,
-+              .width          = 480,
-+              .height         = 272,
-+              .xres           = 480,
-+              .yres           = 272,
-+              .bpp            = 16,
-+
-+              .pixclock       = 40000,        /* HCLK/4 */
-+              .left_margin    = 2,
-+              .right_margin   = 2,
-+              .hsync_len      = 41,
-+              .upper_margin   = 2,
-+              .lower_margin   = 2,
-+              .vsync_len      = 10,
-+              .lcdcon5        = S3C2410_LCDCON5_FRM565 |
-+                                S3C2410_LCDCON5_INVVLINE |
-+                                S3C2410_LCDCON5_INVVFRAME,
-+      },
-+};
-+
-+static struct s3c2410fb_mach_info hxd8_lcd_cfg __initdata = {
-+      .displays       = hxd8_displays,
-+      .num_displays   = ARRAY_SIZE(hxd8_displays),
-+      .default_display = 1,
-+
-+      .lpcsel         = ((0xCE6) & ~7),
-+};
-+
-+static struct platform_device hxd8_pm_gsm_dev = {
-+      .name           = "neo1973-pm-gsm",
-+};
-+
-+static void gta01_udc_command(enum s3c2410_udc_cmd_e cmd)
-+{
-+      printk(KERN_DEBUG "%s(%d)\n", __func__, cmd);
-+
-+      switch (cmd) {
-+      case S3C2410_UDC_P_ENABLE:
-+              s3c2410_gpio_setpin(HXD8_GPIO_USB_PULLUP, 1);
-+              break;
-+      case S3C2410_UDC_P_DISABLE:
-+              s3c2410_gpio_setpin(HXD8_GPIO_USB_PULLUP, 0);
-+              break;
-+      case S3C2410_UDC_P_RESET:
-+              /* FIXME! */
-+              break;
-+      default:
-+              break;
-+      }
-+}
-+
-+/* USB Charger */
-+
-+static void hxd8_udc_vbus_draw(unsigned int ma)
-+{
-+      if (ma >= 500) {
-+              /* enable fast charge */
-+              printk(KERN_DEBUG "udc: enabling fast charge\n");
-+              s3c2410_gpio_setpin(HXD8_GPIO_USB_CUR_SEL, 1);
-+      } else {
-+              /* disable fast charge */
-+              printk(KERN_DEBUG "udc: disabling fast charge\n");
-+              s3c2410_gpio_setpin(HXD8_GPIO_USB_CUR_SEL, 0);
-+      }
-+}
-+
-+static struct s3c2410_udc_mach_info hxd8_udc_cfg = {
-+      .vbus_draw      = hxd8_udc_vbus_draw,
-+};
-+
-+/* Touch Screen */
-+static struct s3c2410_ts_mach_info hxd8_ts_cfg = {
-+      .delay = 10000,
-+      .presc = 49,
-+      .oversampling_shift = 4,
-+};
-+
-+static struct platform_device *hxd8_devices[] __initdata = {
-+      &s3c_device_usb,
-+      &s3c_device_lcd,
-+      &s3c_device_wdt,
-+      &s3c_device_i2c,
-+      &s3c_device_iis,
-+      &s3c_device_sdi,
-+      &s3c_device_usbgadget,
-+      &s3c_device_nand,
-+      &s3c_device_ts,
-+};
-+
-+static void __init hxd8_map_io(void)
-+{
-+      s3c24xx_init_io(hxd8_iodesc, ARRAY_SIZE(hxd8_iodesc));
-+      s3c24xx_init_clocks(16934400);
-+      s3c24xx_init_uarts(hxd8_uartcfgs, ARRAY_SIZE(hxd8_uartcfgs));
-+}
-+
-+static void __init hxd8_machine_init(void)
-+{
-+      hxd8_udc_cfg.udc_command = gta01_udc_command;
-+      s3c_device_nand.dev.platform_data = &hxd8_nand_info;
-+
-+      s3c24xx_fb_set_platdata(&hxd8_lcd_cfg);
-+
-+      s3c24xx_udc_set_platdata(&hxd8_udc_cfg);
-+      set_s3c2410ts_info(&hxd8_ts_cfg);
-+
-+      //platform_device_register(&gta01_button_dev);
-+      platform_device_register(&hxd8_pm_gsm_dev);
-+
-+      platform_device_register(&hxd8_pmu_dev);
-+
-+      platform_add_devices(hxd8_devices, ARRAY_SIZE(hxd8_devices));
-+
-+      s3c2410_pm_init();
-+}
-+
-+MACHINE_START(HXD8, "HXD8")
-+      /* Maintainer: Harald Welte <laforge@openmoko.org> */
-+      .phys_io        = S3C2410_PA_UART,
-+      .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
-+      .boot_params    = S3C2410_SDRAM_PA + 0x100,
-+
-+      .init_irq       = s3c24xx_init_irq,
-+      .map_io         = hxd8_map_io,
-+      .init_machine   = hxd8_machine_init,
-+      .timer          = &s3c24xx_timer,
-+MACHINE_END
-diff --git a/include/asm-arm/arch-s3c2440/hxd8.h b/include/asm-arm/arch-s3c2440/hxd8.h
-new file mode 100644
-index 0000000..50e9c11
---- /dev/null
-+++ b/include/asm-arm/arch-s3c2440/hxd8.h
-@@ -0,0 +1,16 @@
-+#ifndef _HXD8_H
-+#define _HXD8_H
-+
-+#include <asm/arch/regs-gpio.h>
-+#include <asm/arch/irqs.h>
-+
-+#define HXD8v1_SYSTEM_REV     0x00000110
-+
-+#define HXD8_GPIO_USB_CUR_SEL S3C2410_GPA0
-+#define HXD8_GPIO_BACKLIGHT   S3C2410_GPB0
-+#define HXD8_GPIO_USB_PULLUP  S3C2410_GPB9
-+#define HXD8_GPIO_PCF50606    S3C2410_GPF6
-+
-+#define HXD8_IRQ_PCF50606     IRQ_EINT6
-+
-+#endif
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1029-hxd8-tsl256x.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1029-hxd8-tsl256x.patch.patch
deleted file mode 100644 (file)
index e230a9b..0000000
+++ /dev/null
@@ -1,537 +0,0 @@
-From d238d3347d19a6df97670624bd0712e61b83b666 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:34:17 +0100
-Subject: [PATCH] hxd8-tsl256x.patch
-
----
- drivers/i2c/chips/Kconfig   |   10 ++
- drivers/i2c/chips/Makefile  |    1 +
- drivers/i2c/chips/tsl256x.c |  310 +++++++++++++++++++++++++++++++++++++++++++
- drivers/i2c/chips/tsl256x.h |  154 +++++++++++++++++++++
- include/linux/i2c-id.h      |    1 +
- 5 files changed, 476 insertions(+), 0 deletions(-)
- create mode 100644 drivers/i2c/chips/tsl256x.c
- create mode 100644 drivers/i2c/chips/tsl256x.h
-
-diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
-index c0011fc..bf0da3a 100644
---- a/drivers/i2c/chips/Kconfig
-+++ b/drivers/i2c/chips/Kconfig
-@@ -174,4 +174,14 @@ config MENELAUS
-         and other features that are often used in portable devices like
-         cell phones and PDAs.
-+config SENSORS_TSL256X
-+      tristate "Texas TSL256X Ambient Light Sensor"
-+      depends on I2C
-+      help
-+        If you say yes here you get support for the Texas TSL256X
-+        ambient light sensor chip.
-+
-+        This driver can also be built as a module.  If so, the module
-+        will be called tsl256x.
-+
- endmenu
-diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
-index 864e6cf..a4772c7 100644
---- a/drivers/i2c/chips/Makefile
-+++ b/drivers/i2c/chips/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_ISP1301_OMAP)   += isp1301_omap.o
- obj-$(CONFIG_TPS65010)                += tps65010.o
- obj-$(CONFIG_MENELAUS)                += menelaus.o
- obj-$(CONFIG_SENSORS_TSL2550) += tsl2550.o
-+obj-$(CONFIG_SENSORS_TSL256X) += tsl256x.o
- ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
- EXTRA_CFLAGS += -DDEBUG
-diff --git a/drivers/i2c/chips/tsl256x.c b/drivers/i2c/chips/tsl256x.c
-new file mode 100644
-index 0000000..455ec5e
---- /dev/null
-+++ b/drivers/i2c/chips/tsl256x.c
-@@ -0,0 +1,310 @@
-+/*
-+ * tsl256x.c  --  TSL256x Light Sensor driver
-+ *
-+ * Copyright 2007 by Fiwin.
-+ * Author: Alec Tsai <alec_tsai@fiwin.com.tw>
-+ *
-+ * 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 I2C client driver refers to pcf50606.c.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/i2c.h>
-+#include <linux/types.h>
-+#include <linux/input.h>
-+
-+#include "tsl256x.h"
-+
-+static unsigned short normal_i2c[] = { 0x39, I2C_CLIENT_END };
-+/* Magic definition of all other variables and things */
-+I2C_CLIENT_INSMOD;
-+
-+struct tsl256x_data {
-+      struct i2c_client       client;
-+      struct mutex            lock;
-+      struct input_dev        *input_dev;
-+};
-+
-+static struct i2c_driver tsl256x_driver;
-+
-+/******************************************************************************
-+ * Low-Level routines
-+ *****************************************************************************/
-+static inline int __reg_write(struct tsl256x_data *tsl, u_int8_t reg,
-+                                                              u_int8_t val)
-+{
-+      return i2c_smbus_write_byte_data(&tsl->client, reg, val);
-+}
-+
-+static int reg_write(struct tsl256x_data *tsl, u_int8_t reg, u_int8_t val)
-+{
-+      int ret;
-+
-+      mutex_lock(&tsl->lock);
-+      ret = __reg_write(tsl, reg, val);
-+      mutex_unlock(&tsl->lock);
-+
-+      return ret;
-+}
-+
-+static inline int32_t __reg_read(struct tsl256x_data *tsl, u_int8_t reg)
-+{
-+      int32_t ret;
-+
-+      ret = i2c_smbus_read_byte_data(&tsl->client, reg);
-+
-+      return ret;
-+}
-+
-+static u_int8_t reg_read(struct tsl256x_data *tsl, u_int8_t reg)
-+{
-+      int32_t ret;
-+
-+      mutex_lock(&tsl->lock);
-+      ret = __reg_read(tsl, reg);
-+      mutex_unlock(&tsl->lock);
-+
-+      return ret & 0xff;
-+}
-+
-+u_int32_t calculate_lux(u_int32_t iGain, u_int32_t iType, u_int32_t ch0,
-+                                              u_int32_t ch1)
-+{
-+      u_int32_t channel0 = ch0 * 636 / 10;
-+      u_int32_t channel1 = ch1 * 636 / 10;
-+      u_int32_t lux_value = 0;
-+      u_int32_t ratio = (channel1 * (2^RATIO_SCALE)) / channel0;
-+      u_int32_t b = 0, m = 0;
-+
-+      if (0 == ch0)
-+              return 0;
-+      else {
-+              if (ratio > (13 * (2^RATIO_SCALE) / 10))
-+                      return 0;
-+      }
-+
-+      switch (iType) {
-+              case 0: // T package
-+                      if ((ratio >= 0) && (ratio <= K1T)) {
-+                              b = B1T;
-+                              m = M1T;
-+                      } else if (ratio <= K2T) {
-+                              b = B2T;
-+                              m = M2T;
-+                      } else if (ratio <= K3T) {
-+                              b = B3T;
-+                              m = M3T;
-+                      } else if (ratio <= K4T) {
-+                              b = B4T;
-+                              m = M4T;
-+                      } else if (ratio <= K5T) {
-+                              b = B5T;
-+                              m = M5T;
-+                      } else if (ratio <= K6T) {
-+                              b = B6T;
-+                              m = M6T;
-+                      } else if (ratio <= K7T) {
-+                              b = B7T;
-+                              m = M7T;
-+                      } else if (ratio > K8T) {
-+                              b = B8T;
-+                              m = M8T;
-+                      }
-+              break;
-+              case 1:// CS package
-+                      if ((ratio >= 0) && (ratio <= K1C)) {
-+                              b = B1C;
-+                              m = M1C;
-+                      } else if (ratio <= K2C) {
-+                              b = B2C;
-+                              m = M2C;
-+                      } else if (ratio <= K3C) {
-+                              b = B3C;
-+                              m = M3C;
-+                      } else if (ratio <= K4C) {
-+                              b = B4C;
-+                              m = M4C;
-+                      } else if (ratio <= K5C) {
-+                              b = B5C;
-+                              m = M5C;
-+                      } else if (ratio <= K6C) {
-+                              b = B6C;
-+                              m = M6C;
-+                      } else if (ratio <= K7C) {
-+                              b = B7C;
-+                              m = M7C;
-+                      } else if (ratio > K8C) {
-+                              b = B8C;
-+                              m = M8C;
-+                      }
-+              break;
-+              default:
-+                      return 0;
-+              break;
-+      }
-+
-+      lux_value = ((channel0 * b) - (channel1 * m)) / 16384;
-+      return(lux_value);
-+}
-+
-+static ssize_t tsl256x_show_light_lux(struct device *dev,
-+                                      struct device_attribute *attr, char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct tsl256x_data *tsl = i2c_get_clientdata(client);
-+      u_int8_t low_byte_of_ch0 = 0, high_byte_of_ch0 = 0;
-+      u_int8_t low_byte_of_ch1 = 0, high_byte_of_ch1 = 0;
-+      u_int32_t adc_value_ch0, adc_value_ch1, adc_value;
-+
-+      low_byte_of_ch0 = reg_read(tsl, TSL256X_REG_DATA0LOW);
-+      high_byte_of_ch0 = reg_read(tsl, TSL256X_REG_DATA0HIGH);
-+      low_byte_of_ch1 = reg_read(tsl, TSL256X_REG_DATA1LOW);
-+      high_byte_of_ch1 = reg_read(tsl, TSL256X_REG_DATA1HIGH);
-+
-+      adc_value_ch0 = (high_byte_of_ch0 * 256 + low_byte_of_ch0) * 16;
-+      adc_value_ch1 = (high_byte_of_ch1 * 256 + low_byte_of_ch1) * 16;
-+
-+      adc_value = calculate_lux(0, 0, adc_value_ch0, adc_value_ch1);
-+      return sprintf(buf, "%d\n", adc_value);
-+}
-+
-+static DEVICE_ATTR(light_lux, S_IRUGO, tsl256x_show_light_lux, NULL);
-+
-+static int tsl256x_detect(struct i2c_adapter *adapter, int address, int kind)
-+{
-+      struct i2c_client *new_client = NULL;
-+      struct tsl256x_data *tsl256x = NULL;
-+      u_int8_t id = 0;
-+      int res = 0;
-+
-+      if (!(tsl256x = kzalloc(sizeof(*tsl256x), GFP_KERNEL)))
-+              return -ENOMEM;
-+
-+      mutex_init(&tsl256x->lock);
-+      new_client = &tsl256x->client;
-+      i2c_set_clientdata(new_client, tsl256x);
-+      new_client->addr = address;
-+      new_client->adapter = adapter;
-+      new_client->driver = &tsl256x_driver;
-+      new_client->flags = 0;
-+      strlcpy(new_client->name, "tsl256x", I2C_NAME_SIZE);
-+
-+      /* now we try to detect the chip */
-+      /* register with i2c core */
-+      res = i2c_attach_client(new_client);
-+      if (res) {
-+              printk(KERN_DEBUG "[%s]Error: during i2c_attach_client()\n",
-+                      new_client->name);
-+              goto exit_free;
-+      } else {
-+              printk(KERN_INFO "TSL256X is attached to I2C bus.\n");
-+      }
-+
-+      /* Configure TSL256X. */
-+      {
-+              /* Power up TSL256X. */
-+              reg_write(tsl256x, TSL256X_REG_CONTROL, 0x03);
-+
-+              /* Check TSL256X ID. */
-+              id = reg_read(tsl256x, TSL256X_REG_ID);
-+              if (TSL2561_ID == (id & 0xF0)) {
-+                      /* Configuring the Timing Register.
-+                              High Gain (16x), integration time of 101ms. */
-+                      reg_write(tsl256x, TSL256X_REG_TIMING, 0x11);
-+              } else {
-+                      goto exit_free;
-+              }
-+      }
-+
-+      res = device_create_file(&new_client->dev, &dev_attr_light_lux);
-+      if (res)
-+              goto exit_detach;
-+
-+      return 0;
-+
-+exit_free:
-+      kfree(tsl256x);
-+      return res;
-+exit_detach:
-+      i2c_detach_client(new_client);
-+      return res;
-+}
-+
-+static int tsl256x_attach_adapter(struct i2c_adapter *adapter)
-+{
-+      return i2c_probe(adapter, &addr_data, &tsl256x_detect);
-+}
-+
-+static int tsl256x_detach_client(struct i2c_client *client)
-+{
-+      struct tsl256x_data *tsl256x = i2c_get_clientdata(client);
-+
-+      printk(KERN_INFO "Detach TSL256X from I2C bus.\n");
-+
-+      /* Power down TSL256X. */
-+      reg_write(tsl256x, TSL256X_REG_CONTROL, 0x00);
-+
-+      device_remove_file(&client->dev, &dev_attr_light_lux);
-+      kfree(tsl256x);
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int tsl256x_suspend(struct device *dev, pm_message_t state)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct tsl256x_data *tsl256x = i2c_get_clientdata(client);
-+
-+      /* Power down TSL256X. */
-+      reg_write(tsl256x, TSL256X_REG_CONTROL, 0x00);
-+
-+      return 0;
-+}
-+
-+static int tsl256x_resume(struct device *dev)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct tsl256x_data *tsl256x = i2c_get_clientdata(client);
-+
-+      /* Power up TSL256X. */
-+      reg_write(tsl256x, TSL256X_REG_CONTROL, 0x03);
-+
-+      return 0;
-+}
-+#endif
-+
-+static struct i2c_driver tsl256x_driver = {
-+      .driver = {
-+              .name           = "tsl256x",
-+              .owner          = THIS_MODULE,
-+#ifdef CONFIG_PM
-+              .suspend        = tsl256x_suspend,
-+              .resume         = tsl256x_resume,
-+#endif
-+      },
-+      .id                             = I2C_DRIVERID_TSL256X,
-+      .attach_adapter = tsl256x_attach_adapter,
-+      .detach_client  = tsl256x_detach_client,
-+};
-+
-+static int __init tsl256x_init(void)
-+{
-+      return i2c_add_driver(&tsl256x_driver);
-+}
-+
-+static void __exit tsl256x_exit(void)
-+{
-+      i2c_del_driver(&tsl256x_driver);
-+}
-+
-+MODULE_AUTHOR("Alec Tsai <alec_tsai@fiwin.com.tw>");
-+MODULE_LICENSE("GPL");
-+
-+module_init(tsl256x_init);
-+module_exit(tsl256x_exit);
-+
-diff --git a/drivers/i2c/chips/tsl256x.h b/drivers/i2c/chips/tsl256x.h
-new file mode 100644
-index 0000000..88de0c6
---- /dev/null
-+++ b/drivers/i2c/chips/tsl256x.h
-@@ -0,0 +1,154 @@
-+/*
-+ * tsl256x.h  --  TSL256x Light Sensor driver
-+ *
-+ * Copyright 2007 by Fiwin.
-+ * Author: Alec Tsai <alec_tsai@fiwin.com.tw>
-+ *
-+ * 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 contents of header file is copied from TSL256x Datasheet.
-+ */
-+
-+#ifndef _TSL256X_H
-+#define _TSL256X_H
-+
-+#define       TSL2560_ID              0x00
-+#define       TSL2561_ID              0x10
-+
-+#define LUX_SCALE             14              /* scale by 2^14 */
-+#define RATIO_SCALE           9               /*scale ratio by 2^9 */
-+
-+/******************************************************************************
-+ * Integration time scaling factors
-+ *****************************************************************************/
-+#define CH_SCALE              10              /* scale channel values by 2^10 */
-+#define CHSCALE_TINT0 0x7517  /* 322/11 * 2^CH_SCALE */
-+#define CHSCALE_TINT1 0x0fe7  /* 322/81 * 2^CH_SCALE */
-+
-+/******************************************************************************
-+ * T Package coefficients
-+ *****************************************************************************/
-+/*
-+ * For Ch1/Ch0=0.00 to 0.50
-+ * Lux/Ch0=0.0304.0.062*((Ch1/Ch0)^1.4)
-+ * piecewise approximation
-+ * For Ch1/Ch0=0.00 to 0.125:
-+ * Lux/Ch0=0.0304.0.0272*(Ch1/Ch0)
-+ *
-+ * For Ch1/Ch0=0.125 to 0.250:
-+ * Lux/Ch0=0.0325.0.0440*(Ch1/Ch0)
-+ *
-+ * For Ch1/Ch0=0.250 to 0.375:
-+ * Lux/Ch0=0.0351.0.0544*(Ch1/Ch0)
-+ *
-+ * For Ch1/Ch0=0.375 to 0.50:
-+ * Lux/Ch0=0.0381.0.0624*(Ch1/Ch0)
-+ *
-+ * For Ch1/Ch0=0.50 to 0.61:
-+ * Lux/Ch0=0.0224.0.031*(Ch1/Ch0)
-+ *
-+ * For Ch1/Ch0=0.61 to 0.80:
-+ * Lux/Ch0=0.0128.0.0153*(Ch1/Ch0)
-+ *
-+ * For Ch1/Ch0=0.80 to 1.30:
-+ * Lux/Ch0=0.00146.0.00112*(Ch1/Ch0)
-+ *
-+ * For Ch1/Ch0>1.3:
-+ * Lux/Ch0=0
-+ */
-+#define K1T 0x0040 /* 0.125 * 2^RATIO_SCALE */
-+#define B1T 0x01f2 /* 0.0304 * 2^LUX_SCALE */
-+#define M1T 0x01be /* 0.0272 * 2^LUX_SCALE */
-+#define K2T 0x0080 /* 0.250 * 2^RATIO_SCALE */
-+#define B2T 0x0214 /* 0.0325 * 2^LUX_SCALE */
-+#define M2T 0x02d1 /* 0.0440 * 2^LUX_SCALE */
-+#define K3T 0x00c0 /* 0.375 * 2^RATIO_SCALE */
-+#define B3T 0x023f /* 0.0351 * 2^LUX_SCALE */
-+#define M3T 0x037b /* 0.0544 * 2^LUX_SCALE */
-+#define K4T 0x0100 /* 0.50 * 2^RATIO_SCALE */
-+#define B4T 0x0270 /* 0.0381 * 2^LUX_SCALE */
-+#define M4T 0x03fe /* 0.0624 * 2^LUX_SCALE */
-+#define K5T 0x0138 /* 0.61 * 2^RATIO_SCALE */
-+#define B5T 0x016f /* 0.0224 * 2^LUX_SCALE */
-+#define M5T 0x01fc /* 0.0310 * 2^LUX_SCALE */
-+#define K6T 0x019a /* 0.80 * 2^RATIO_SCALE */
-+#define B6T 0x00d2 /* 0.0128 * 2^LUX_SCALE */
-+#define M6T 0x00fb /* 0.0153 * 2^LUX_SCALE */
-+#define K7T 0x029a /* 1.3 * 2^RATIO_SCALE */
-+#define B7T 0x0018 /* 0.00146 * 2^LUX_SCALE */
-+#define M7T 0x0012 /* 0.00112 * 2^LUX_SCALE */
-+#define K8T 0x029a /* 1.3 * 2^RATIO_SCALE */
-+#define B8T 0x0000 /* 0.000 * 2^LUX_SCALE */
-+#define M8T 0x0000 /* 0.000 * 2^LUX_SCALE */
-+
-+/******************************************************************************
-+ * CS package coefficients
-+ *****************************************************************************/
-+/*
-+ * For 0 <= Ch1/Ch0 <= 0.52
-+ * Lux/Ch0 = 0.0315.0.0593*((Ch1/Ch0)^1.4)
-+ * piecewise approximation
-+ * For 0 <= Ch1/Ch0 <= 0.13
-+ * Lux/Ch0 = 0.0315.0.0262*(Ch1/Ch0)
-+ * For 0.13 <= Ch1/Ch0 <= 0.26
-+ * Lux/Ch0 = 0.0337.0.0430*(Ch1/Ch0)
-+ * For 0.26 <= Ch1/Ch0 <= 0.39
-+ * Lux/Ch0 = 0.0363.0.0529*(Ch1/Ch0)
-+ * For 0.39 <= Ch1/Ch0 <= 0.52
-+ * Lux/Ch0 = 0.0392.0.0605*(Ch1/Ch0)
-+ * For 0.52 < Ch1/Ch0 <= 0.65
-+ * Lux/Ch0 = 0.0229.0.0291*(Ch1/Ch0)
-+ * For 0.65 < Ch1/Ch0 <= 0.80
-+ * Lux/Ch0 = 0.00157.0.00180*(Ch1/Ch0)
-+ * For 0.80 < Ch1/Ch0 <= 1.30
-+ * Lux/Ch0 = 0.00338.0.00260*(Ch1/Ch0)
-+ * For Ch1/Ch0 > 1.30
-+ * Lux = 0
-+ */
-+#define K1C 0x0043 /* 0.130 * 2^RATIO_SCALE */
-+#define B1C 0x0204 /* 0.0315 * 2^LUX_SCALE */
-+#define M1C 0x01ad /* 0.0262 * 2^LUX_SCALE */
-+#define K2C 0x0085 /* 0.260 * 2^RATIO_SCALE */
-+#define B2C 0x0228 /* 0.0337 * 2^LUX_SCALE */
-+#define M2C 0x02c1 /* 0.0430 * 2^LUX_SCALE */
-+#define K3C 0x00c8 /* 0.390 * 2^RATIO_SCALE */
-+#define B3C 0x0253 /* 0.0363 * 2^LUX_SCALE */
-+#define M3C 0x0363 /* 0.0529 * 2^LUX_SCALE */
-+#define K4C 0x010a /* 0.520 * 2^RATIO_SCALE */
-+#define B4C 0x0282 /* 0.0392 * 2^LUX_SCALE */
-+#define M4C 0x03df /* 0.0605 * 2^LUX_SCALE */
-+#define K5C 0x014d /* 0.65 * 2^RATIO_SCALE */
-+#define B5C 0x0177 /* 0.0229 * 2^LUX_SCALE */
-+#define M5C 0x01dd /* 0.0291 * 2^LUX_SCALE */
-+#define K6C 0x019a /* 0.80 * 2^RATIO_SCALE */
-+#define B6C 0x0101 /* 0.0157 * 2^LUX_SCALE */
-+#define M6C 0x0127 /* 0.0180 * 2^LUX_SCALE */
-+#define K7C 0x029a /* 1.3 * 2^RATIO_SCALE */
-+#define B7C 0x0037 /* 0.00338 * 2^LUX_SCALE */
-+#define M7C 0x002b /* 0.00260 * 2^LUX_SCALE */
-+#define K8C 0x029a /* 1.3 * 2^RATIO_SCALE */
-+#define B8C 0x0000 /* 0.000 * 2^LUX_SCALE */
-+#define M8C 0x0000 /* 0.000 * 2^LUX_SCALE */
-+
-+/* TSL256x registers definition . */
-+enum tsl256x_regs {
-+      TSL256X_REG_CONTROL                     = 0x80, /* Control of basic functions */
-+      TSL256X_REG_TIMING                      = 0x81, /* Integration time/gain control */
-+      TSL256X_REG_THRESHLOWLOW        = 0x82, /* Low byte of low interrupt threshold */
-+      TSL256X_REG_THRESHLOWHIGH       = 0x83, /* High byte of low interrupt threshold */
-+      TSL256X_REG_THRESHHIGHLOW       = 0x84, /* Low byte of high interrupt threshold */
-+      TSL256X_REG_THRESHHIGHHIGH      = 0x85, /* High byte of high interrupt threshold */
-+      TSL256X_REG_INTERRUPT           = 0x86, /* Interrupt control */
-+      TSL256X_REG_CRC                         = 0x88, /* Factory test - not a user register */
-+      TSL256X_REG_ID                          = 0x8A, /* Part number/ Rev ID */
-+      TSL256X_REG_DATA0LOW            = 0x8C, /* Low byte of ADC channel 0 */
-+      TSL256X_REG_DATA0HIGH           = 0x8D, /* High byte of ADC channel 0 */
-+      TSL256X_REG_DATA1LOW            = 0x8E, /* Low byte of ADC channel 1 */
-+      TSL256X_REG_DATA1HIGH           = 0x8F, /* High byte of ADC channel 1 */
-+      __NUM_TSL256X_REGS
-+};
-+
-+#endif /* _TSL256X_H */
-+
-diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
-index 9b8ae78..a089554 100644
---- a/include/linux/i2c-id.h
-+++ b/include/linux/i2c-id.h
-@@ -168,6 +168,7 @@
- #define I2C_DRIVERID_W83L785TS 1047
- #define I2C_DRIVERID_OV7670 1048      /* Omnivision 7670 camera */
- #define I2C_DRIVERID_PCF50606 1049
-+#define I2C_DRIVERID_TSL256X 1050
- /*
-  * ---- Adapter types ----------------------------------------------------
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1030-s3c2442b-cpuid.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1030-s3c2442b-cpuid.patch.patch
deleted file mode 100644 (file)
index 4045755..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6635f1fbaf19b1d50e355bec73974faab070e46f Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:34:27 +0100
-Subject: [PATCH] s3c2442b-cpuid.patch
- Add the Samsung S3C2442B CPU idcode to the samsung s3c24xx platform code
- and fix a Kconfig typo related tot the 2442.
-
----
- arch/arm/mach-s3c2442/Kconfig |    2 +-
- arch/arm/plat-s3c24xx/cpu.c   |   10 ++++++++++
- 2 files changed, 11 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig
-index 26d131a..6cc68a1 100644
---- a/arch/arm/mach-s3c2442/Kconfig
-+++ b/arch/arm/mach-s3c2442/Kconfig
-@@ -6,7 +6,7 @@
- config CPU_S3C2442
-       bool
--      depends on ARCH_S3C2410
-+      depends on ARCH_S3C2440
-       select S3C2410_CLOCK
-       select S3C2410_GPIO
-       select S3C2410_PM if PM
-diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c
-index f513ab0..bebbc14 100644
---- a/arch/arm/plat-s3c24xx/cpu.c
-+++ b/arch/arm/plat-s3c24xx/cpu.c
-@@ -68,6 +68,7 @@ static const char name_s3c2410[]  = "S3C2410";
- static const char name_s3c2412[]  = "S3C2412";
- static const char name_s3c2440[]  = "S3C2440";
- static const char name_s3c2442[]  = "S3C2442";
-+static const char name_s3c2442b[]  = "S3C2442B";
- static const char name_s3c2443[]  = "S3C2443";
- static const char name_s3c2410a[] = "S3C2410A";
- static const char name_s3c2440a[] = "S3C2440A";
-@@ -119,6 +120,15 @@ static struct cpu_table cpu_ids[] __initdata = {
-               .name           = name_s3c2442
-       },
-       {
-+              .idcode         = 0x32440aab,
-+              .idmask         = 0xffffffff,
-+              .map_io         = s3c244x_map_io,
-+              .init_clocks    = s3c244x_init_clocks,
-+              .init_uarts     = s3c244x_init_uarts,
-+              .init           = s3c2442_init,
-+              .name           = name_s3c2442b
-+      },
-+      {
-               .idcode         = 0x32412001,
-               .idmask         = 0xffffffff,
-               .map_io         = s3c2412_map_io,
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1031-pcf50633.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1031-pcf50633.patch.patch
deleted file mode 100644 (file)
index 9de2cd7..0000000
+++ /dev/null
@@ -1,2562 +0,0 @@
-From d485cabe5b95e0b277459ca1c605a0751f5e1dea Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:34:36 +0100
-Subject: [PATCH] pcf50633.patch
-
----
- drivers/i2c/chips/Kconfig    |    9 +
- drivers/i2c/chips/Makefile   |    1 +
- drivers/i2c/chips/pcf50633.c | 1964 ++++++++++++++++++++++++++++++++++++++++++
- drivers/i2c/chips/pcf50633.h |  402 +++++++++
- include/linux/i2c-id.h       |    1 +
- include/linux/pcf50633.h     |  114 +++
- 6 files changed, 2491 insertions(+), 0 deletions(-)
- create mode 100644 drivers/i2c/chips/pcf50633.c
- create mode 100644 drivers/i2c/chips/pcf50633.h
- create mode 100644 include/linux/pcf50633.h
-
-diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
-index bf0da3a..1d6d36f 100644
---- a/drivers/i2c/chips/Kconfig
-+++ b/drivers/i2c/chips/Kconfig
-@@ -61,6 +61,15 @@ config SENSORS_PCF50606
-         This driver can also be built as a module.  If so, the module
-         will be called pcf50606.
-+config SENSORS_PCF50633
-+      tristate "Philips PCF50633"
-+      depends on I2C
-+      help
-+        If you say yes here you get support for Philips PCF50633
-+        PMU (Power Management Unit) chips.
-+
-+        This driver can also be built as a module.  If so, the module
-+        will be called pcf50633.
- config SENSORS_PCF8574
-       tristate "Philips PCF8574 and PCF8574A"
-diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
-index a4772c7..4b6ba04 100644
---- a/drivers/i2c/chips/Makefile
-+++ b/drivers/i2c/chips/Makefile
-@@ -10,6 +10,7 @@ obj-$(CONFIG_SENSORS_MAX6875)        += max6875.o
- obj-$(CONFIG_SENSORS_M41T00)  += m41t00.o
- obj-$(CONFIG_SENSORS_PCA9539) += pca9539.o
- obj-$(CONFIG_SENSORS_PCF50606)        += pcf50606.o
-+obj-$(CONFIG_SENSORS_PCF50633)        += pcf50633.o
- obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o
- obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o
- obj-$(CONFIG_ISP1301_OMAP)    += isp1301_omap.o
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-new file mode 100644
-index 0000000..5488084
---- /dev/null
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -0,0 +1,1964 @@
-+/* Philips PCF50633 Power Management Unit (PMU) driver
-+ *
-+ * (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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
-+ *
-+ * This driver is a monster ;) It provides the following features
-+ * - voltage control for a dozen different voltage domains
-+ * - charging control for main and backup battery
-+ * - rtc / alarm
-+ * - adc driver (hw_sensors like)
-+ * - backlight
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/i2c.h>
-+#include <linux/types.h>
-+#include <linux/interrupt.h>
-+#include <linux/irq.h>
-+#include <linux/workqueue.h>
-+#include <linux/delay.h>
-+#include <linux/rtc.h>
-+#include <linux/bcd.h>
-+#include <linux/watchdog.h>
-+#include <linux/miscdevice.h>
-+#include <linux/input.h>
-+#include <linux/fb.h>
-+#include <linux/backlight.h>
-+#include <linux/sched.h>
-+#include <linux/platform_device.h>
-+#include <linux/pcf50633.h>
-+#include <linux/apm-emulation.h>
-+
-+#include <asm/mach-types.h>
-+#include <asm/arch/gta02.h>
-+
-+#include "pcf50633.h"
-+
-+#if 1
-+#define DEBUGP(x, args ...) printk("%s: " x, __FUNCTION__, ## args)
-+#define DEBUGPC(x, args ...) printk(x, ## args)
-+#else
-+#define DEBUGP(x, args ...)
-+#define DEBUGPC(x, args ...)
-+#endif
-+
-+/***********************************************************************
-+ * Static data / structures
-+ ***********************************************************************/
-+
-+static unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
-+
-+I2C_CLIENT_INSMOD_1(pcf50633);
-+
-+#define PCF50633_FIDX_CHG_ENABLED     0       /* Charger enabled */
-+#define PCF50633_FIDX_CHG_PRESENT     1       /* Charger present */
-+#define PCF50633_FIDX_CHG_ERR         3       /* Charger Error */
-+#define PCF50633_FIDX_CHG_PROT                4       /* Charger Protection */
-+#define PCF50633_FIDX_CHG_READY               5       /* Charging completed */
-+#define PCF50633_FIDX_PWR_PRESSED     8
-+#define PCF50633_FIDX_RTC_SECOND      9
-+#define PCF50633_FIDX_USB_PRESENT     10
-+
-+#define PCF50633_F_CHG_ENABLED        (1 << PCF50633_FIDX_CHG_ENABLED)
-+#define PCF50633_F_CHG_PRESENT        (1 << PCF50633_FIDX_CHG_PRESENT)
-+#define PCF50633_F_CHG_ERR    (1 << PCF50633_FIDX_CHG_ERR)
-+#define PCF50633_F_CHG_PROT   (1 << PCF50633_FIDX_CHG_PROT)
-+#define PCF50633_F_CHG_READY  (1 << PCF50633_FIDX_CHG_READY)
-+
-+#define PCF50633_F_CHG_MASK   0x000000fc
-+
-+#define PCF50633_F_PWR_PRESSED        (1 << PCF50633_FIDX_PWR_PRESSED)
-+#define PCF50633_F_RTC_SECOND (1 << PCF50633_FIDX_RTC_SECOND)
-+#define PCF50633_F_USB_PRESENT        (1 << PCF50633_FIDX_USB_PRESENT)
-+
-+enum close_state {
-+      CLOSE_STATE_NOT,
-+      CLOSE_STATE_ALLOW = 0x2342,
-+};
-+
-+enum charger_type {
-+      CHARGER_TYPE_NONE = 0,
-+      CHARGER_TYPE_HOSTUSB,
-+      CHARGER_TYPE_1A
-+};
-+
-+#define ADC_NOM_CHG_DETECT_1A 6
-+#define ADC_NOM_CHG_DETECT_NONE 43
-+
-+#define MAX_ADC_FIFO_DEPTH 8
-+
-+struct pcf50633_data {
-+      struct i2c_client client;
-+      struct pcf50633_platform_data *pdata;
-+      struct backlight_device *backlight;
-+      struct mutex lock;
-+      unsigned int flags;
-+      unsigned int working;
-+      struct mutex working_lock;
-+      struct work_struct work;
-+      struct rtc_device *rtc;
-+      struct input_dev *input_dev;
-+      int allow_close;
-+      int onkey_seconds;
-+      int irq;
-+
-+      int coldplug_done; /* cleared by probe, set by first work service */
-+      int flag_bat_voltage_read; /* ipc to /sys batt voltage read func */
-+
-+      int charger_adc_result_raw;
-+      enum charger_type charger_type;
-+
-+      /* we have a FIFO of ADC measurement requests that are used only by
-+       * the workqueue service code after the ADC completion interrupt
-+       */
-+      int adc_queue_mux[MAX_ADC_FIFO_DEPTH]; /* which ADC input to use */
-+      int adc_queue_avg[MAX_ADC_FIFO_DEPTH]; /* amount of averaging */
-+      int adc_queue_head; /* head owned by foreground code */
-+      int adc_queue_tail; /* tail owned by service code */
-+
-+#ifdef CONFIG_PM
-+      struct {
-+              u_int8_t int1m, int2m, int3m, int4m, int5m;
-+              u_int8_t ooctim2;
-+              u_int8_t autoout, autoena, automxc;
-+              u_int8_t down1out, down1mxc;
-+              u_int8_t down2out, down2ena;
-+              u_int8_t memldoout, memldoena;
-+              u_int8_t ledout, ledena, leddim;
-+              struct {
-+                      u_int8_t out;
-+                      u_int8_t ena;
-+              } ldo[__NUM_PCF50633_REGS];
-+      } standby_regs;
-+#endif
-+};
-+
-+static struct i2c_driver pcf50633_driver;
-+
-+struct pcf50633_data *pcf50633_global;
-+EXPORT_SYMBOL_GPL(pcf50633_global);
-+
-+static struct platform_device *pcf50633_pdev;
-+
-+/***********************************************************************
-+ * Low-Level routines
-+ ***********************************************************************/
-+
-+static int __reg_write(struct pcf50633_data *pcf, u_int8_t reg, u_int8_t val)
-+{
-+      return i2c_smbus_write_byte_data(&pcf->client, reg, val);
-+}
-+
-+static int reg_write(struct pcf50633_data *pcf, u_int8_t reg, u_int8_t val)
-+{
-+      int ret;
-+
-+      mutex_lock(&pcf->lock);
-+      ret = __reg_write(pcf, reg, val);
-+      mutex_unlock(&pcf->lock);
-+
-+      return ret;
-+}
-+
-+static int32_t __reg_read(struct pcf50633_data *pcf, u_int8_t reg)
-+{
-+      int32_t ret;
-+
-+      ret = i2c_smbus_read_byte_data(&pcf->client, reg);
-+
-+      return ret;
-+}
-+
-+static u_int8_t reg_read(struct pcf50633_data *pcf, u_int8_t reg)
-+{
-+      int32_t ret;
-+
-+      mutex_lock(&pcf->lock);
-+      ret = __reg_read(pcf, reg);
-+      mutex_unlock(&pcf->lock);
-+
-+      return ret & 0xff;
-+}
-+
-+static int reg_set_bit_mask(struct pcf50633_data *pcf,
-+                          u_int8_t reg, u_int8_t mask, u_int8_t val)
-+{
-+      int ret;
-+      u_int8_t tmp;
-+
-+      val &= mask;
-+
-+      mutex_lock(&pcf->lock);
-+
-+      tmp = __reg_read(pcf, reg);
-+      tmp &= ~mask;
-+      tmp |= val;
-+      ret = __reg_write(pcf, reg, tmp);
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      return ret;
-+}
-+
-+static int reg_clear_bits(struct pcf50633_data *pcf, u_int8_t reg, u_int8_t val)
-+{
-+      int ret;
-+      u_int8_t tmp;
-+
-+      mutex_lock(&pcf->lock);
-+
-+      tmp = __reg_read(pcf, reg);
-+      tmp &= ~val;
-+      ret = __reg_write(pcf, reg, tmp);
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      return ret;
-+}
-+
-+/* asynchronously setup reading one ADC channel */
-+static void async_adc_read_setup(struct pcf50633_data *pcf,
-+                               int channel, int avg)
-+{
-+      channel &= PCF50633_ADCC1_ADCMUX_MASK;
-+
-+      /* kill ratiometric, but enable ACCSW biasing */
-+      __reg_write(pcf, PCF50633_REG_ADCC2, 0x00);
-+      __reg_write(pcf, PCF50633_REG_ADCC3, 0x01);
-+
-+      /* start ADC conversion of selected channel */
-+      __reg_write(pcf, PCF50633_REG_ADCC1, channel | avg |
-+                  PCF50633_ADCC1_ADCSTART | PCF50633_ADCC1_RES_10BIT);
-+
-+}
-+
-+static u_int16_t async_adc_complete(struct pcf50633_data *pcf)
-+{
-+      u_int16_t ret = (__reg_read(pcf, PCF50633_REG_ADCS1) << 2) |
-+                      (__reg_read(pcf, PCF50633_REG_ADCS3) &
-+                                                PCF50633_ADCS3_ADCDAT1L_MASK);
-+
-+      return ret;
-+}
-+
-+
-+
-+
-+/***********************************************************************
-+ * Voltage / ADC
-+ ***********************************************************************/
-+
-+static u_int8_t auto_voltage(unsigned int millivolts)
-+{
-+      if (millivolts < 1800)
-+              return 0;
-+      if (millivolts > 3800)
-+              return 0xff;
-+
-+      millivolts -= 625;
-+      return millivolts/25;
-+}
-+
-+static unsigned int auto_2voltage(u_int8_t bits)
-+{
-+      if (bits < 0x2f)
-+              return 0;
-+      return 625 + (bits * 25);
-+}
-+
-+static u_int8_t down_voltage(unsigned int millivolts)
-+{
-+      if (millivolts < 625)
-+              return 0;
-+      else if (millivolts > 3000)
-+              return 0xff;
-+
-+      millivolts -= 625;
-+      return millivolts/25;
-+}
-+
-+static unsigned int down_2voltage(u_int8_t bits)
-+{
-+      return 625 + (bits*25);
-+}
-+
-+static u_int8_t ldo_voltage(unsigned int millivolts)
-+{
-+      if (millivolts < 900)
-+              return 0;
-+      else if (millivolts > 3600)
-+              return 0x1f;
-+
-+      millivolts -= 900;
-+      return millivolts/100;
-+}
-+
-+static unsigned int ldo_2voltage(u_int8_t bits)
-+{
-+      bits &= 0x1f;
-+      return 900 + (bits * 100);
-+}
-+
-+static const u_int8_t regulator_registers[__NUM_PCF50633_REGULATORS] = {
-+      [PCF50633_REGULATOR_AUTO]       = PCF50633_REG_AUTOOUT,
-+      [PCF50633_REGULATOR_DOWN1]      = PCF50633_REG_DOWN1OUT,
-+      [PCF50633_REGULATOR_DOWN2]      = PCF50633_REG_DOWN2OUT,
-+      [PCF50633_REGULATOR_MEMLDO]     = PCF50633_REG_MEMLDOOUT,
-+      [PCF50633_REGULATOR_LDO1]       = PCF50633_REG_LDO1OUT,
-+      [PCF50633_REGULATOR_LDO2]       = PCF50633_REG_LDO2OUT,
-+      [PCF50633_REGULATOR_LDO3]       = PCF50633_REG_LDO3OUT,
-+      [PCF50633_REGULATOR_LDO4]       = PCF50633_REG_LDO4OUT,
-+      [PCF50633_REGULATOR_LDO5]       = PCF50633_REG_LDO5OUT,
-+      [PCF50633_REGULATOR_LDO6]       = PCF50633_REG_LDO6OUT,
-+      [PCF50633_REGULATOR_HCLDO]      = PCF50633_REG_HCLDOOUT,
-+};
-+
-+int pcf50633_onoff_set(struct pcf50633_data *pcf,
-+                     enum pcf50633_regulator_id reg, int on)
-+{
-+      u_int8_t addr;
-+
-+      if (reg >= __NUM_PCF50633_REGULATORS)
-+              return -EINVAL;
-+
-+      /* the *ENA register is always one after the *OUT register */
-+      addr = regulator_registers[reg] + 1;
-+
-+      if (on == 0)
-+              reg_set_bit_mask(pcf, addr, PCF50633_REGULATOR_ON, 0);
-+      else
-+              reg_set_bit_mask(pcf, addr, PCF50633_REGULATOR_ON,
-+                               PCF50633_REGULATOR_ON);
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_onoff_set);
-+
-+int pcf50633_onoff_get(struct pcf50633_data *pcf,
-+                     enum pcf50633_regulator_id reg)
-+{
-+      u_int8_t val, addr;
-+
-+      if (reg >= __NUM_PCF50633_REGULATORS)
-+              return -EINVAL;
-+
-+      /* the *ENA register is always one after the *OUT register */
-+      addr = regulator_registers[reg] + 1;
-+      val = reg_read(pcf, addr) & PCF50633_REGULATOR_ON;
-+
-+      return val;
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_onoff_get);
-+
-+int pcf50633_voltage_set(struct pcf50633_data *pcf,
-+                       enum pcf50633_regulator_id reg,
-+                       unsigned int millivolts)
-+{
-+      u_int8_t volt_bits;
-+      u_int8_t regnr;
-+
-+      DEBUGP("pcf=%p, reg=%d, mvolts=%d\n", pcf, reg, millivolts);
-+
-+      if (reg >= __NUM_PCF50633_REGULATORS)
-+              return -EINVAL;
-+
-+      regnr = regulator_registers[reg];
-+
-+      if (millivolts > pcf->pdata->rails[reg].voltage.max)
-+              return -EINVAL;
-+
-+      switch (reg) {
-+      case PCF50633_REGULATOR_AUTO:
-+              volt_bits = auto_voltage(millivolts);
-+              break;
-+      case PCF50633_REGULATOR_DOWN1:
-+              volt_bits = down_voltage(millivolts);
-+              break;
-+      case PCF50633_REGULATOR_DOWN2:
-+              volt_bits = down_voltage(millivolts);
-+              break;
-+      case PCF50633_REGULATOR_LDO1:
-+      case PCF50633_REGULATOR_LDO2:
-+      case PCF50633_REGULATOR_LDO3:
-+      case PCF50633_REGULATOR_LDO4:
-+      case PCF50633_REGULATOR_LDO5:
-+      case PCF50633_REGULATOR_LDO6:
-+      case PCF50633_REGULATOR_HCLDO:
-+              volt_bits = ldo_voltage(millivolts);
-+              DEBUGP("ldo_voltage(0x%x)=%u\n", millivolts, volt_bits);
-+              break;
-+      default:
-+              return -EINVAL;
-+      }
-+
-+      return reg_write(pcf, regnr, volt_bits);
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_voltage_set);
-+
-+unsigned int pcf50633_voltage_get(struct pcf50633_data *pcf,
-+                       enum pcf50633_regulator_id reg)
-+{
-+      u_int8_t volt_bits;
-+      u_int8_t regnr;
-+      unsigned int rc = 0;
-+
-+      if (reg >= __NUM_PCF50633_REGULATORS)
-+              return -EINVAL;
-+
-+      regnr = regulator_registers[reg];
-+      volt_bits = reg_read(pcf, regnr);
-+
-+      switch (reg) {
-+      case PCF50633_REGULATOR_AUTO:
-+              rc = auto_2voltage(volt_bits);
-+              break;
-+      case PCF50633_REGULATOR_DOWN1:
-+              rc = down_2voltage(volt_bits);
-+              break;
-+      case PCF50633_REGULATOR_DOWN2:
-+              rc = down_2voltage(volt_bits);
-+              break;
-+      case PCF50633_REGULATOR_LDO1:
-+      case PCF50633_REGULATOR_LDO2:
-+      case PCF50633_REGULATOR_LDO3:
-+      case PCF50633_REGULATOR_LDO4:
-+      case PCF50633_REGULATOR_LDO5:
-+      case PCF50633_REGULATOR_LDO6:
-+      case PCF50633_REGULATOR_HCLDO:
-+              rc = ldo_2voltage(volt_bits);
-+              break;
-+      default:
-+              return -EINVAL;
-+      }
-+
-+      return rc;
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_voltage_get);
-+
-+/* go into 'STANDBY' mode, i.e. power off the main CPU and peripherals */
-+void pcf50633_go_standby(void)
-+{
-+      reg_set_bit_mask(pcf50633_global, PCF50633_REG_OOCSHDWN,
-+                PCF50633_OOCSHDWN_GOSTDBY, PCF50633_OOCSHDWN_GOSTDBY);
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_go_standby);
-+
-+void pcf50633_gpio_set(struct pcf50633_data *pcf, enum pcf50633_gpio gpio,
-+                      int on)
-+{
-+      u_int8_t reg = gpio - PCF50633_GPIO1 + PCF50633_REG_GPIO1CFG;
-+
-+      if (on)
-+              reg_set_bit_mask(pcf, reg, 0x0f, 0x07);
-+      else
-+              reg_set_bit_mask(pcf, reg, 0x0f, 0x00);
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_gpio_set);
-+
-+int pcf50633_gpio_get(struct pcf50633_data *pcf, enum pcf50633_gpio gpio)
-+{
-+      u_int8_t reg = gpio - PCF50633_GPIO1 + PCF50633_REG_GPIO1CFG;
-+      u_int8_t val = reg_read(pcf, reg) & 0x0f;
-+
-+      if (val == PCF50633_GPOCFG_GPOSEL_1 ||
-+          val == (PCF50633_GPOCFG_GPOSEL_0|PCF50633_GPOCFG_GPOSEL_INVERSE))
-+              return 1;
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_gpio_get);
-+
-+static int interpret_charger_type_from_adc(struct pcf50633_data *pcf,
-+                                         int sample)
-+{
-+      /* 1A capable charger? */
-+
-+      if (sample < ((ADC_NOM_CHG_DETECT_NONE + ADC_NOM_CHG_DETECT_1A) / 2))
-+              return CHARGER_TYPE_1A;
-+
-+      /* well then, nothing in the USB hole, or USB host / unk adapter */
-+
-+      if (pcf->flags & PCF50633_F_USB_PRESENT) /* ooh power is in there */
-+              return CHARGER_TYPE_HOSTUSB; /* HOSTUSB is the catchall */
-+
-+      return CHARGER_TYPE_NONE; /* no really -- nothing in there */
-+}
-+
-+
-+
-+static void configure_pmu_for_charger(struct pcf50633_data *pcf,
-+                                    enum charger_type type)
-+{
-+      switch (type) {
-+      case CHARGER_TYPE_NONE:
-+              __reg_write(pcf, PCF50633_REG_MBCC7,
-+                                                  PCF50633_MBCC7_USB_SUSPEND);
-+              break;
-+      /*
-+       * the PCF50633 has a feature that it will supply only excess current
-+       * from the charger that is not used to power the device.  So this
-+       * 500mA setting is "up to 500mA" according to that.
-+       */
-+      case CHARGER_TYPE_HOSTUSB:
-+              __reg_write(pcf, PCF50633_REG_MBCC7, PCF50633_MBCC7_USB_500mA);
-+              break;
-+      case CHARGER_TYPE_1A:
-+              __reg_write(pcf, PCF50633_REG_MBCC7, PCF50633_MBCC7_USB_1000mA);
-+              break;
-+      }
-+}
-+
-+static void trigger_next_adc_job_if_any(struct pcf50633_data *pcf)
-+{
-+      if (pcf->adc_queue_head == pcf->adc_queue_tail)
-+              return;
-+      async_adc_read_setup(pcf,
-+                           pcf->adc_queue_mux[pcf->adc_queue_tail],
-+                           pcf->adc_queue_avg[pcf->adc_queue_tail]);
-+}
-+
-+static void add_request_to_adc_queue(struct pcf50633_data *pcf,
-+                                   int mux, int avg)
-+{
-+      int old_head = pcf->adc_queue_head;
-+      pcf->adc_queue_mux[pcf->adc_queue_head] = mux;
-+      pcf->adc_queue_avg[pcf->adc_queue_head] = avg;
-+
-+      pcf->adc_queue_head = (pcf->adc_queue_head + 1) &
-+                            (MAX_ADC_FIFO_DEPTH - 1);
-+
-+      /* it was idle before we just added this?  we need to kick it then */
-+      if (old_head == pcf->adc_queue_tail)
-+              trigger_next_adc_job_if_any(pcf);
-+}
-+
-+static void pcf50633_work(struct work_struct *work)
-+{
-+      struct pcf50633_data *pcf =
-+                      container_of(work, struct pcf50633_data, work);
-+      u_int8_t pcfirq[5];
-+      int ret;
-+      int tail;
-+
-+      mutex_lock(&pcf->working_lock);
-+      pcf->working = 1;
-+      /*
-+       * datasheet says we have to read the five IRQ
-+       * status regs in one transaction
-+       */
-+      ret = i2c_smbus_read_i2c_block_data(&pcf->client, PCF50633_REG_INT1, 5,
-+                                          pcfirq);
-+      if (ret != 5)
-+              DEBUGP("Oh crap PMU IRQ register read failed %d\n", ret);
-+
-+      if (!pcf->coldplug_done) {
-+              DEBUGP("PMU Coldplug init\n");
-+
-+              /* we used SECOND to kick ourselves started -- turn it off */
-+              pcfirq[0] &= ~PCF50633_INT1_SECOND;
-+              reg_set_bit_mask(pcf, PCF50633_REG_INT1M,
-+                                      PCF50633_INT1_SECOND,
-+                                      PCF50633_INT1_SECOND);
-+
-+              /* coldplug the USB if present */
-+              if ((__reg_read(pcf, PCF50633_REG_MBCS1) &
-+                  (PCF50633_MBCS1_USBPRES | PCF50633_MBCS1_USBOK)) ==
-+                  (PCF50633_MBCS1_USBPRES | PCF50633_MBCS1_USBOK)) {
-+                      DEBUGPC("COLD USBINS\n");
-+                      input_report_key(pcf->input_dev, KEY_POWER2, 1);
-+                      apm_queue_event(APM_POWER_STATUS_CHANGE);
-+                      pcf->flags |= PCF50633_F_USB_PRESENT;
-+                      if (pcf->pdata->cb)
-+                              pcf->pdata->cb(&pcf->client.dev,
-+                                      PCF50633_FEAT_MBC, PMU_EVT_USB_INSERT);
-+              }
-+
-+              /* figure out our initial charging stance */
-+              add_request_to_adc_queue(pcf, PCF50633_ADCC1_MUX_ADCIN1,
-+                                            PCF50633_ADCC1_AVERAGE_16);
-+
-+              pcf->coldplug_done = 1;
-+      }
-+
-+      DEBUGP("INT1=0x%02x INT2=0x%02x INT3=0x%02x INT4=0x%02x INT5=0x%02x\n",
-+              pcfirq[0], pcfirq[1], pcfirq[2], pcfirq[3], pcfirq[4]);
-+
-+      if (pcfirq[0] & PCF50633_INT1_ADPINS) {
-+              /* Charger inserted */
-+              DEBUGPC("ADPINS ");
-+              input_report_key(pcf->input_dev, KEY_BATTERY, 1);
-+              apm_queue_event(APM_POWER_STATUS_CHANGE);
-+              pcf->flags |= PCF50633_F_CHG_PRESENT;
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50633_FEAT_MBC, PMU_EVT_INSERT);
-+              /* FIXME: signal this to userspace */
-+              //kobject_uevent( ,KOBJ_ADD);
-+      }
-+      if (pcfirq[0] & PCF50633_INT1_ADPREM) {
-+              /* Charger removed */
-+              DEBUGPC("ADPREM ");
-+              input_report_key(pcf->input_dev, KEY_BATTERY, 0);
-+              apm_queue_event(APM_POWER_STATUS_CHANGE);
-+              pcf->flags &= ~PCF50633_F_CHG_PRESENT;
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50633_FEAT_MBC, PMU_EVT_REMOVE);
-+              /* FIXME: signal this to userspace */
-+              //kobject_uevent( ,KOBJ_ADD);
-+      }
-+      if (pcfirq[0] & PCF50633_INT1_USBINS) {
-+              DEBUGPC("USBINS ");
-+              input_report_key(pcf->input_dev, KEY_POWER2, 1);
-+              apm_queue_event(APM_POWER_STATUS_CHANGE);
-+              pcf->flags |= PCF50633_F_USB_PRESENT;
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50633_FEAT_MBC, PMU_EVT_USB_INSERT);
-+              /* completion irq will figure out our charging stance */
-+              add_request_to_adc_queue(pcf, PCF50633_ADCC1_MUX_ADCIN1,
-+                                   PCF50633_ADCC1_AVERAGE_16);
-+      }
-+      if (pcfirq[0] & PCF50633_INT1_USBREM) {
-+              DEBUGPC("USBREM ");
-+              /* only deal if we had understood it was in */
-+              if (pcf->flags & PCF50633_F_USB_PRESENT) {
-+                      input_report_key(pcf->input_dev, KEY_POWER2, 0);
-+                      apm_queue_event(APM_POWER_STATUS_CHANGE);
-+                      pcf->flags &= ~PCF50633_F_USB_PRESENT;
-+                      if (pcf->pdata->cb)
-+                              pcf->pdata->cb(&pcf->client.dev,
-+                                      PCF50633_FEAT_MBC, PMU_EVT_USB_REMOVE);
-+                      /* completion irq will figure out our charging stance */
-+                      add_request_to_adc_queue(pcf, PCF50633_ADCC1_MUX_ADCIN1,
-+                                      PCF50633_ADCC1_AVERAGE_16);
-+              }
-+      }
-+      if (pcfirq[0] & PCF50633_INT1_ALARM) {
-+              DEBUGPC("ALARM ");
-+              if (pcf->pdata->used_features & PCF50633_FEAT_RTC)
-+                      rtc_update_irq(pcf->rtc, 1, RTC_AF | RTC_IRQF);
-+      }
-+      if (pcfirq[0] & PCF50633_INT1_SECOND) {
-+              DEBUGPC("SECOND ");
-+              if (pcf->flags & PCF50633_F_RTC_SECOND)
-+                      rtc_update_irq(pcf->rtc, 1, RTC_PF | RTC_IRQF);
-+
-+              if (pcf->onkey_seconds >= 0 &&
-+                  pcf->flags & PCF50633_F_PWR_PRESSED) {
-+                      DEBUGP("ONKEY_SECONDS(%u, OOCSTAT=0x%02x) ",
-+                              pcf->onkey_seconds,
-+                              reg_read(pcf, PCF50633_REG_OOCSTAT));
-+                      pcf->onkey_seconds++;
-+                      if (pcf->onkey_seconds >=
-+                          pcf->pdata->onkey_seconds_sig_init) {
-+                              /* Ask init to do 'ctrlaltdel' */
-+                              DEBUGPC("SIGINT(init) ");
-+                              kill_proc(1, SIGINT, 1);
-+                              /* FIXME: what if userspace doesn't shut down? */
-+                      }
-+                      if (pcf->onkey_seconds >=
-+                              pcf->pdata->onkey_seconds_shutdown) {
-+                              DEBUGPC("Power Off ");
-+                              pcf50633_go_standby();
-+                      }
-+              }
-+      }
-+
-+      if (pcfirq[1] & PCF50633_INT2_ONKEYF) {
-+              /* ONKEY falling edge (start of button press) */
-+              DEBUGPC("ONKEYF ");
-+              pcf->flags |= PCF50633_F_PWR_PRESSED;
-+              input_report_key(pcf->input_dev, KEY_POWER, 1);
-+      }
-+      if (pcfirq[1] & PCF50633_INT2_ONKEYR) {
-+              /* ONKEY rising edge (end of button press) */
-+              DEBUGPC("ONKEYR ");
-+              pcf->flags &= ~PCF50633_F_PWR_PRESSED;
-+              pcf->onkey_seconds = -1;
-+              input_report_key(pcf->input_dev, KEY_POWER, 0);
-+              /* disable SECOND interrupt in case RTC didn't
-+               * request it */
-+              if (!(pcf->flags & PCF50633_F_RTC_SECOND))
-+                      reg_set_bit_mask(pcf, PCF50633_REG_INT1M,
-+                                       PCF50633_INT1_SECOND,
-+                                       PCF50633_INT1_SECOND);
-+      }
-+      /* FIXME: we don't use EXTON1/2/3. thats why we skip it */
-+
-+      if (pcfirq[2] & PCF50633_INT3_BATFULL) {
-+              DEBUGPC("BATFULL ");
-+              /* FIXME: signal this to userspace */
-+      }
-+      if (pcfirq[2] & PCF50633_INT3_CHGHALT) {
-+              DEBUGPC("CHGHALT ");
-+              /*
-+               * this is really "battery not pulling current" -- it can
-+               * appear with no battery attached
-+               */
-+              /* FIXME: signal this to userspace */
-+      }
-+      if (pcfirq[2] & PCF50633_INT3_THLIMON) {
-+              DEBUGPC("THLIMON ");
-+              pcf->flags |= PCF50633_F_CHG_PROT;
-+              /* FIXME: signal this to userspace */
-+      }
-+      if (pcfirq[2] & PCF50633_INT3_THLIMOFF) {
-+              DEBUGPC("THLIMOFF ");
-+              pcf->flags &= ~PCF50633_F_CHG_PROT;
-+              /* FIXME: signal this to userspace */
-+      }
-+      if (pcfirq[2] & PCF50633_INT3_USBLIMON) {
-+              DEBUGPC("USBLIMON ");
-+              /* FIXME: signal this to userspace */
-+      }
-+      if (pcfirq[2] & PCF50633_INT3_USBLIMOFF) {
-+              DEBUGPC("USBLIMOFF ");
-+              /* FIXME: signal this to userspace */
-+      }
-+      if (pcfirq[2] & PCF50633_INT3_ADCRDY) {
-+              /* ADC result ready */
-+              DEBUGPC("ADCRDY ");
-+              tail = pcf->adc_queue_tail;
-+              pcf->adc_queue_tail = (pcf->adc_queue_tail + 1) &
-+                                    (MAX_ADC_FIFO_DEPTH - 1);
-+
-+              switch (pcf->adc_queue_mux[tail]) {
-+              case PCF50633_ADCC1_MUX_BATSNS_RES: /* battery voltage */
-+                      pcf->flag_bat_voltage_read =
-+                                                async_adc_complete(pcf);
-+                      break;
-+              case PCF50633_ADCC1_MUX_ADCIN1: /* charger type */
-+                      pcf->charger_adc_result_raw = async_adc_complete(pcf);
-+                      pcf->charger_type = interpret_charger_type_from_adc(
-+                                           pcf, pcf->charger_adc_result_raw);
-+                      configure_pmu_for_charger(pcf, pcf->charger_type);
-+                      break;
-+              default:
-+                      async_adc_complete(pcf);
-+                      break;
-+              }
-+              trigger_next_adc_job_if_any(pcf);
-+      }
-+      if (pcfirq[2] & PCF50633_INT3_ONKEY1S) {
-+              /* ONKEY pressed for more than 1 second */
-+              pcf->onkey_seconds = 0;
-+              DEBUGPC("ONKEY1S ");
-+              /* Tell PMU we are taking care of this */
-+              reg_set_bit_mask(pcf, PCF50633_REG_OOCSHDWN,
-+                               PCF50633_OOCSHDWN_TOTRST,
-+                               PCF50633_OOCSHDWN_TOTRST);
-+              /* enable SECOND interrupt (hz tick) */
-+              reg_clear_bits(pcf, PCF50633_REG_INT1M, PCF50633_INT1_SECOND);
-+      }
-+
-+      if (pcfirq[3] & (PCF50633_INT4_LOWBAT|PCF50633_INT4_LOWSYS)) {
-+              /* Really low battery voltage, we have 8 seconds left */
-+              DEBUGPC("LOWBAT ");
-+              apm_queue_event(APM_LOW_BATTERY);
-+              DEBUGPC("SIGPWR(init) ");
-+              kill_proc(1, SIGPWR, 1);
-+              /* Tell PMU we are taking care of this */
-+              reg_set_bit_mask(pcf, PCF50633_REG_OOCSHDWN,
-+                               PCF50633_OOCSHDWN_TOTRST,
-+                               PCF50633_OOCSHDWN_TOTRST);
-+      }
-+      if (pcfirq[3] & PCF50633_INT4_HIGHTMP) {
-+              /* High temperature */
-+              DEBUGPC("HIGHTMP ");
-+              apm_queue_event(APM_CRITICAL_SUSPEND);
-+      }
-+      if (pcfirq[3] & PCF50633_INT4_AUTOPWRFAIL) {
-+              DEBUGPC("PCF50633_INT4_AUTOPWRFAIL ");
-+              /* FIXME: deal with this */
-+      }
-+      if (pcfirq[3] & PCF50633_INT4_DWN1PWRFAIL) {
-+              DEBUGPC("PCF50633_INT4_DWN1PWRFAIL ");
-+              /* FIXME: deal with this */
-+      }
-+      if (pcfirq[3] & PCF50633_INT4_DWN2PWRFAIL) {
-+              DEBUGPC("PCF50633_INT4_DWN2PWRFAIL ");
-+              /* FIXME: deal with this */
-+      }
-+      if (pcfirq[3] & PCF50633_INT4_LEDPWRFAIL) {
-+              DEBUGPC("PCF50633_INT4_LEDPWRFAIL ");
-+              /* FIXME: deal with this */
-+      }
-+      if (pcfirq[3] & PCF50633_INT4_LEDOVP) {
-+              DEBUGPC("PCF50633_INT4_LEDOVP ");
-+              /* FIXME: deal with this */
-+      }
-+
-+      DEBUGPC("\n");
-+
-+      pcf->working = 0;
-+      input_sync(pcf->input_dev);
-+      put_device(&pcf->client.dev);
-+      mutex_unlock(&pcf->working_lock);
-+}
-+
-+static irqreturn_t pcf50633_irq(int irq, void *_pcf)
-+{
-+      struct pcf50633_data *pcf = _pcf;
-+
-+      DEBUGP("entering(irq=%u, pcf=%p): scheduling work\n", irq, _pcf);
-+
-+      get_device(&pcf->client.dev);
-+      if (!schedule_work(&pcf->work) && !pcf->working)
-+              dev_dbg(&pcf->client.dev, "work item may be lost\n");
-+
-+      return IRQ_HANDLED;
-+}
-+
-+static u_int16_t adc_to_batt_millivolts(u_int16_t adc)
-+{
-+      u_int16_t mvolts;
-+
-+      mvolts = (adc * 6000) / 1024;
-+
-+      return mvolts;
-+}
-+
-+#define BATTVOLT_SCALE_START 2800
-+#define BATTVOLT_SCALE_END 4200
-+#define BATTVOLT_SCALE_DIVIDER ((BATTVOLT_SCALE_END - BATTVOLT_SCALE_START)/100)
-+
-+static u_int8_t battvolt_scale(u_int16_t battvolt)
-+{
-+      /* FIXME: this linear scale is completely bogus */
-+      u_int16_t battvolt_relative = battvolt - BATTVOLT_SCALE_START;
-+      unsigned int percent = battvolt_relative / BATTVOLT_SCALE_DIVIDER;
-+
-+      return percent;
-+}
-+
-+u_int16_t pcf50633_battvolt(struct pcf50633_data *pcf)
-+{
-+      int count = 10;
-+
-+      pcf->flag_bat_voltage_read = -1;
-+      add_request_to_adc_queue(pcf, PCF50633_ADCC1_MUX_BATSNS_RES,
-+                                    PCF50633_ADCC1_AVERAGE_16);
-+
-+      while ((count--) && (pcf->flag_bat_voltage_read < 0))
-+              msleep(1);
-+
-+      if (count < 0) { /* timeout somehow */
-+              DEBUGPC("pcf50633_battvolt timeout :-(\n");
-+              return -1;
-+      }
-+
-+      return adc_to_batt_millivolts(pcf->flag_bat_voltage_read);
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_battvolt);
-+
-+static ssize_t show_battvolt(struct device *dev, struct device_attribute *attr,
-+                           char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+
-+      return sprintf(buf, "%u\n", pcf50633_battvolt(pcf));
-+}
-+static DEVICE_ATTR(battvolt, S_IRUGO | S_IWUSR, show_battvolt, NULL);
-+
-+static int reg_id_by_name(const char *name)
-+{
-+      int reg_id;
-+
-+      if (!strcmp(name, "voltage_auto"))
-+              reg_id = PCF50633_REGULATOR_AUTO;
-+      else if (!strcmp(name, "voltage_down1"))
-+              reg_id = PCF50633_REGULATOR_DOWN1;
-+      else if (!strcmp(name, "voltage_down2"))
-+              reg_id = PCF50633_REGULATOR_DOWN2;
-+      else if (!strcmp(name, "voltage_memldo"))
-+              reg_id = PCF50633_REGULATOR_MEMLDO;
-+      else if (!strcmp(name, "voltage_ldo1"))
-+              reg_id = PCF50633_REGULATOR_LDO1;
-+      else if (!strcmp(name, "voltage_ldo2"))
-+              reg_id = PCF50633_REGULATOR_LDO2;
-+      else if (!strcmp(name, "voltage_ldo3"))
-+              reg_id = PCF50633_REGULATOR_LDO3;
-+      else if (!strcmp(name, "voltage_ldo4"))
-+              reg_id = PCF50633_REGULATOR_LDO4;
-+      else if (!strcmp(name, "voltage_ldo5"))
-+              reg_id = PCF50633_REGULATOR_LDO5;
-+      else if (!strcmp(name, "voltage_ldo6"))
-+              reg_id = PCF50633_REGULATOR_LDO6;
-+      else if (!strcmp(name, "voltage_hcldo"))
-+              reg_id = PCF50633_REGULATOR_HCLDO;
-+      else
-+              reg_id = -1;
-+
-+      return reg_id;
-+}
-+
-+static ssize_t show_vreg(struct device *dev, struct device_attribute *attr,
-+                       char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      unsigned int reg_id;
-+
-+      reg_id = reg_id_by_name(attr->attr.name);
-+      if (reg_id < 0)
-+              return 0;
-+
-+      if (pcf50633_onoff_get(pcf, reg_id) > 0)
-+              return sprintf(buf, "%u\n", pcf50633_voltage_get(pcf, reg_id));
-+      else
-+              return strlcpy(buf, "0\n", PAGE_SIZE);
-+}
-+
-+static ssize_t set_vreg(struct device *dev, struct device_attribute *attr,
-+                      const char *buf, size_t count)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      unsigned long mvolts = simple_strtoul(buf, NULL, 10);
-+      unsigned int reg_id;
-+
-+      reg_id = reg_id_by_name(attr->attr.name);
-+      if (reg_id < 0)
-+              return -EIO;
-+
-+      DEBUGP("attempting to set %s(%d) to %lu mvolts\n", attr->attr.name,
-+              reg_id, mvolts);
-+
-+      if (mvolts == 0) {
-+              pcf50633_onoff_set(pcf, reg_id, 0);
-+      } else {
-+              if (pcf50633_voltage_set(pcf, reg_id, mvolts) < 0) {
-+                      dev_warn(dev, "refusing to set %s(%d) to %lu mvolts "
-+                               "(max=%u)\n", attr->attr.name, reg_id, mvolts,
-+                               pcf->pdata->rails[reg_id].voltage.max);
-+                      return -EINVAL;
-+              }
-+              pcf50633_onoff_set(pcf, reg_id, 1);
-+      }
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(voltage_auto, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_down1, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_down2, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_memldo, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_ldo1, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_ldo2, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_ldo3, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_ldo4, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_ldo5, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_ldo6, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_hcldo, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+
-+/***********************************************************************
-+ * Charger Control
-+ ***********************************************************************/
-+
-+/* Set maximum USB current limit */
-+void pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma)
-+{
-+      u_int8_t bits;
-+
-+      dev_dbg(&pcf->client.dev, "setting usb current limit to %d ma", ma);
-+
-+      if (ma >= 1000)
-+              bits = PCF50633_MBCC7_USB_1000mA;
-+      else if (ma >= 500)
-+              bits = PCF50633_MBCC7_USB_500mA;
-+      else if (ma >= 100)
-+              bits = PCF50633_MBCC7_USB_100mA;
-+      else
-+              bits = PCF50633_MBCC7_USB_SUSPEND;
-+
-+      reg_set_bit_mask(pcf, PCF50633_REG_MBCC7, PCF56033_MBCC7_USB_MASK,
-+                       bits);
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_usb_curlim_set);
-+
-+static ssize_t show_usblim(struct device *dev, struct device_attribute *attr,
-+                         char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      u_int8_t usblim = reg_read(pcf, PCF50633_REG_MBCC7) &
-+                                              PCF56033_MBCC7_USB_MASK;
-+      unsigned int ma;
-+
-+      if (usblim == PCF50633_MBCC7_USB_1000mA)
-+              ma = 1000;
-+      else if (usblim == PCF50633_MBCC7_USB_500mA)
-+              ma = 500;
-+      else if (usblim == PCF50633_MBCC7_USB_100mA)
-+              ma = 100;
-+      else
-+              ma = 0;
-+
-+      return sprintf(buf, "%u\n", ma);
-+}
-+static DEVICE_ATTR(usb_curlim, S_IRUGO | S_IWUSR, show_usblim, NULL);
-+
-+/* Enable/disable charging */
-+void pcf50633_charge_enable(struct pcf50633_data *pcf, int on)
-+{
-+      u_int8_t bits;
-+
-+      if (!(pcf->pdata->used_features & PCF50633_FEAT_MBC))
-+              return;
-+
-+      if (on) {
-+              pcf->flags |= PCF50633_F_CHG_ENABLED;
-+              bits = PCF50633_MBCC1_CHGENA;
-+      } else {
-+              pcf->flags &= ~PCF50633_F_CHG_ENABLED;
-+              bits = 0;
-+      }
-+      reg_set_bit_mask(pcf, PCF50633_REG_MBCC1, PCF50633_MBCC1_CHGENA,
-+                       bits);
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_charge_enable);
-+
-+#if 0
-+#define ONE                   1000000
-+static u_int16_t adc_to_rntc(struct pcf50633_data *pcf, u_int16_t adc)
-+{
-+      u_int32_t r_batt = (adc * pcf->pdata->r_fix_batt) / (1023 - adc);
-+      u_int16_t r_ntc;
-+
-+      /* The battery NTC has a parallell 10kOhms resistor */
-+      r_ntc = ONE / ((ONE/r_batt) - (ONE/pcf->pdata->r_fix_batt_par));
-+
-+      return r_ntc;
-+}
-+#endif
-+static ssize_t show_battemp(struct device *dev, struct device_attribute *attr,
-+                          char *buf)
-+{
-+      return sprintf(buf, "\n");
-+}
-+static DEVICE_ATTR(battemp, S_IRUGO | S_IWUSR, show_battemp, NULL);
-+#if 0
-+static u_int16_t adc_to_chg_milliamps(struct pcf50633_data *pcf,
-+                                           u_int16_t adc_adcin1,
-+                                           u_int16_t adc_batvolt)
-+{
-+      u_int32_t res = ((adc_adcin1 - adc_batvolt) * 6000);
-+      return res / (pcf->pdata->r_sense_milli * 1024 / 1000);
-+}
-+#endif
-+static ssize_t show_chgcur(struct device *dev, struct device_attribute *attr,
-+                         char *buf)
-+{
-+      return sprintf(buf, "\n");
-+}
-+static DEVICE_ATTR(chgcur, S_IRUGO | S_IWUSR, show_chgcur, NULL);
-+
-+static const char *chgmode_names[] = {
-+      [PCF50633_MBCS2_MBC_PLAY]               = "play-only",
-+      [PCF50633_MBCS2_MBC_USB_PRE]            = "pre",
-+      [PCF50633_MBCS2_MBC_ADP_PRE]            = "pre",
-+      [PCF50633_MBCS2_MBC_USB_PRE_WAIT]       = "pre-wait",
-+      [PCF50633_MBCS2_MBC_ADP_PRE_WAIT]       = "pre-wait",
-+      [PCF50633_MBCS2_MBC_USB_FAST]           = "fast",
-+      [PCF50633_MBCS2_MBC_ADP_FAST]           = "fast",
-+      [PCF50633_MBCS2_MBC_USB_FAST_WAIT]      = "fast-wait",
-+      [PCF50633_MBCS2_MBC_ADP_FAST_WAIT]      = "fast-wait",
-+      [PCF50633_MBCS2_MBC_ADP_FAST_WAIT]      = "bat-full",
-+};
-+
-+static ssize_t show_chgmode(struct device *dev, struct device_attribute *attr,
-+                          char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      u_int8_t mbcs2 = reg_read(pcf, PCF50633_REG_MBCS2);
-+      u_int8_t chgmod = (mbcs2 & PCF50633_MBCS2_MBC_MASK);
-+
-+      return sprintf(buf, "%s\n", chgmode_names[chgmod]);
-+}
-+
-+static ssize_t set_chgmode(struct device *dev, struct device_attribute *attr,
-+                         const char *buf, size_t count)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+
-+      /* As opposed to the PCF50606, we can only enable or disable
-+       * charging and not directly jump into a certain mode! */
-+
-+      if (!strcmp(buf, "0\n"))
-+              pcf50633_charge_enable(pcf, 0);
-+      else
-+              pcf50633_charge_enable(pcf, 1);
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(chgmode, S_IRUGO | S_IWUSR, show_chgmode, set_chgmode);
-+
-+static const char *chgstate_names[] = {
-+      [PCF50633_FIDX_CHG_ENABLED]             = "enabled",
-+      [PCF50633_FIDX_CHG_PRESENT]             = "charger_present",
-+      [PCF50633_FIDX_USB_PRESENT]             = "usb_present",
-+      [PCF50633_FIDX_CHG_ERR]                 = "error",
-+      [PCF50633_FIDX_CHG_PROT]                = "protection",
-+      [PCF50633_FIDX_CHG_READY]               = "ready",
-+};
-+
-+static ssize_t show_chgstate(struct device *dev, struct device_attribute *attr,
-+                          char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+
-+      char *b = buf;
-+      int i;
-+
-+      for (i = 0; i < 32; i++)
-+              if (pcf->flags & (1 << i) && i < ARRAY_SIZE(chgstate_names))
-+                      b += sprintf(b, "%s ", chgstate_names[i]);
-+
-+      if (b > buf)
-+              b += sprintf(b, "\n");
-+
-+      return b - buf;
-+}
-+static DEVICE_ATTR(chgstate, S_IRUGO | S_IWUSR, show_chgstate, NULL);
-+
-+/***********************************************************************
-+ * APM emulation
-+ ***********************************************************************/
-+
-+extern void (*apm_get_power_status)(struct apm_power_info *);
-+
-+static void pcf50633_get_power_status(struct apm_power_info *info)
-+{
-+        struct pcf50633_data *pcf = pcf50633_global;
-+      u_int8_t chgmod = reg_read(pcf, PCF50633_REG_MBCS2) &
-+                                 PCF50633_MBCS2_MBC_MASK;
-+
-+      u_int16_t battvolt = pcf50633_battvolt(pcf);
-+
-+      if (reg_read(pcf, PCF50633_REG_MBCS1) &
-+                      (PCF50633_MBCS1_USBPRES|PCF50633_MBCS1_ADAPTPRES))
-+              info->ac_line_status = APM_AC_ONLINE;
-+      else
-+              info->ac_line_status = APM_AC_OFFLINE;
-+
-+      switch (chgmod) {
-+      case PCF50633_MBCS2_MBC_PLAY:
-+      case PCF50633_MBCS2_MBC_USB_PRE:
-+      case PCF50633_MBCS2_MBC_USB_PRE_WAIT:
-+      case PCF50633_MBCS2_MBC_USB_FAST_WAIT:
-+      case PCF50633_MBCS2_MBC_ADP_PRE:
-+      case PCF50633_MBCS2_MBC_ADP_PRE_WAIT:
-+      case PCF50633_MBCS2_MBC_ADP_FAST_WAIT:
-+      case PCF50633_MBCS2_MBC_BAT_FULL:
-+      case PCF50633_MBCS2_MBC_HALT:
-+              info->battery_life = battvolt_scale(battvolt);
-+              break;
-+      case PCF50633_MBCS2_MBC_USB_FAST:
-+      case PCF50633_MBCS2_MBC_ADP_FAST:
-+              info->battery_status = APM_BATTERY_STATUS_CHARGING;
-+              info->battery_flag = APM_BATTERY_FLAG_CHARGING;
-+      default:
-+              break;
-+      }
-+}
-+
-+/***********************************************************************
-+ * RTC
-+ ***********************************************************************/
-+
-+struct pcf50633_time {
-+      u_int8_t sec;
-+      u_int8_t min;
-+      u_int8_t hour;
-+      u_int8_t wkday;
-+      u_int8_t day;
-+      u_int8_t month;
-+      u_int8_t year;
-+};
-+
-+static void pcf2rtc_time(struct rtc_time *rtc, struct pcf50633_time *pcf)
-+{
-+      rtc->tm_sec = BCD2BIN(pcf->sec);
-+      rtc->tm_min = BCD2BIN(pcf->min);
-+      rtc->tm_hour = BCD2BIN(pcf->hour);
-+      rtc->tm_wday = BCD2BIN(pcf->wkday);
-+      rtc->tm_mday = BCD2BIN(pcf->day);
-+      rtc->tm_mon = BCD2BIN(pcf->month);
-+      rtc->tm_year = BCD2BIN(pcf->year) + 100;
-+}
-+
-+static void rtc2pcf_time(struct pcf50633_time *pcf, struct rtc_time *rtc)
-+{
-+      pcf->sec = BIN2BCD(rtc->tm_sec);
-+      pcf->min = BIN2BCD(rtc->tm_min);
-+      pcf->hour = BIN2BCD(rtc->tm_hour);
-+      pcf->wkday = BIN2BCD(rtc->tm_wday);
-+      pcf->day = BIN2BCD(rtc->tm_mday);
-+      pcf->month = BIN2BCD(rtc->tm_mon);
-+      pcf->year = BIN2BCD(rtc->tm_year - 100);
-+}
-+
-+static int pcf50633_rtc_ioctl(struct device *dev, unsigned int cmd,
-+                            unsigned long arg)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      switch (cmd) {
-+      case RTC_PIE_OFF:
-+              /* disable periodic interrupt (hz tick) */
-+              pcf->flags &= ~PCF50633_F_RTC_SECOND;
-+              reg_set_bit_mask(pcf, PCF50633_REG_INT1M,
-+                               PCF50633_INT1_SECOND, PCF50633_INT1_SECOND);
-+              return 0;
-+      case RTC_PIE_ON:
-+              /* ensable periodic interrupt (hz tick) */
-+              pcf->flags |= PCF50633_F_RTC_SECOND;
-+              reg_clear_bits(pcf, PCF50633_REG_INT1M, PCF50633_INT1_SECOND);
-+              return 0;
-+      }
-+      return -ENOIOCTLCMD;
-+}
-+
-+static int pcf50633_rtc_read_time(struct device *dev, struct rtc_time *tm)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      struct pcf50633_time pcf_tm;
-+
-+      mutex_lock(&pcf->lock);
-+      pcf_tm.sec = __reg_read(pcf, PCF50633_REG_RTCSC);
-+      pcf_tm.min = __reg_read(pcf, PCF50633_REG_RTCMN);
-+      pcf_tm.hour = __reg_read(pcf, PCF50633_REG_RTCHR);
-+      pcf_tm.wkday = __reg_read(pcf, PCF50633_REG_RTCWD);
-+      pcf_tm.day = __reg_read(pcf, PCF50633_REG_RTCDT);
-+      pcf_tm.month = __reg_read(pcf, PCF50633_REG_RTCMT);
-+      pcf_tm.year = __reg_read(pcf, PCF50633_REG_RTCYR);
-+      mutex_unlock(&pcf->lock);
-+
-+      DEBUGP("PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
-+              pcf_tm.day, pcf_tm.month, pcf_tm.year,
-+              pcf_tm.hour, pcf_tm.min, pcf_tm.sec);
-+
-+      pcf2rtc_time(tm, &pcf_tm);
-+
-+      DEBUGP("RTC_TIME: %u.%u.%u %u:%u:%u\n",
-+              tm->tm_mday, tm->tm_mon, tm->tm_year,
-+              tm->tm_hour, tm->tm_min, tm->tm_sec);
-+
-+      return 0;
-+}
-+
-+static int pcf50633_rtc_set_time(struct device *dev, struct rtc_time *tm)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      struct pcf50633_time pcf_tm;
-+
-+      DEBUGP("RTC_TIME: %u.%u.%u %u:%u:%u\n",
-+              tm->tm_mday, tm->tm_mon, tm->tm_year,
-+              tm->tm_hour, tm->tm_min, tm->tm_sec);
-+      rtc2pcf_time(&pcf_tm, tm);
-+      DEBUGP("PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
-+              pcf_tm.day, pcf_tm.month, pcf_tm.year,
-+              pcf_tm.hour, pcf_tm.min, pcf_tm.sec);
-+
-+      mutex_lock(&pcf->lock);
-+      /* FIXME: disable second interrupt */
-+      __reg_write(pcf, PCF50633_REG_RTCSC, pcf_tm.sec);
-+      __reg_write(pcf, PCF50633_REG_RTCMN, pcf_tm.min);
-+      __reg_write(pcf, PCF50633_REG_RTCHR, pcf_tm.hour);
-+      __reg_write(pcf, PCF50633_REG_RTCWD, pcf_tm.wkday);
-+      __reg_write(pcf, PCF50633_REG_RTCDT, pcf_tm.day);
-+      __reg_write(pcf, PCF50633_REG_RTCMT, pcf_tm.month);
-+      __reg_write(pcf, PCF50633_REG_RTCYR, pcf_tm.year);
-+      /* FIXME: re-enable second interrupt */
-+      mutex_unlock(&pcf->lock);
-+
-+      return 0;
-+}
-+
-+static int pcf50633_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      struct pcf50633_time pcf_tm;
-+
-+      mutex_lock(&pcf->lock);
-+      alrm->enabled =
-+           __reg_read(pcf, PCF50633_REG_INT1M) & PCF50633_INT1_ALARM ? 0 : 1;
-+      pcf_tm.sec = __reg_read(pcf, PCF50633_REG_RTCSCA);
-+      pcf_tm.min = __reg_read(pcf, PCF50633_REG_RTCMNA);
-+      pcf_tm.hour = __reg_read(pcf, PCF50633_REG_RTCHRA);
-+      pcf_tm.wkday = __reg_read(pcf, PCF50633_REG_RTCWDA);
-+      pcf_tm.day = __reg_read(pcf, PCF50633_REG_RTCDTA);
-+      pcf_tm.month = __reg_read(pcf, PCF50633_REG_RTCMTA);
-+      pcf_tm.year = __reg_read(pcf, PCF50633_REG_RTCYRA);
-+      mutex_unlock(&pcf->lock);
-+
-+      pcf2rtc_time(&alrm->time, &pcf_tm);
-+
-+      return 0;
-+}
-+
-+static int pcf50633_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      struct pcf50633_time pcf_tm;
-+      u_int8_t irqmask;
-+
-+      rtc2pcf_time(&pcf_tm, &alrm->time);
-+
-+      mutex_lock(&pcf->lock);
-+
-+      /* disable alarm interrupt */
-+      irqmask = __reg_read(pcf, PCF50633_REG_INT1M);
-+      irqmask |= PCF50633_INT1_ALARM;
-+      __reg_write(pcf, PCF50633_REG_INT1M, irqmask);
-+
-+      __reg_write(pcf, PCF50633_REG_RTCSCA, pcf_tm.sec);
-+      __reg_write(pcf, PCF50633_REG_RTCMNA, pcf_tm.min);
-+      __reg_write(pcf, PCF50633_REG_RTCHRA, pcf_tm.hour);
-+      __reg_write(pcf, PCF50633_REG_RTCWDA, pcf_tm.wkday);
-+      __reg_write(pcf, PCF50633_REG_RTCDTA, pcf_tm.day);
-+      __reg_write(pcf, PCF50633_REG_RTCMTA, pcf_tm.month);
-+      __reg_write(pcf, PCF50633_REG_RTCYRA, pcf_tm.year);
-+
-+      if (alrm->enabled) {
-+              /* (re-)enaable alarm interrupt */
-+              irqmask = __reg_read(pcf, PCF50633_REG_INT1M);
-+              irqmask &= ~PCF50633_INT1_ALARM;
-+              __reg_write(pcf, PCF50633_REG_INT1M, irqmask);
-+      }
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      /* FIXME */
-+      return 0;
-+}
-+
-+static struct rtc_class_ops pcf50633_rtc_ops = {
-+      .ioctl          = pcf50633_rtc_ioctl,
-+      .read_time      = pcf50633_rtc_read_time,
-+      .set_time       = pcf50633_rtc_set_time,
-+      .read_alarm     = pcf50633_rtc_read_alarm,
-+      .set_alarm      = pcf50633_rtc_set_alarm,
-+};
-+
-+/***********************************************************************
-+ * Backlight device
-+ ***********************************************************************/
-+
-+static int pcf50633bl_get_intensity(struct backlight_device *bd)
-+{
-+      struct pcf50633_data *pcf = bl_get_data(bd);
-+      int intensity = reg_read(pcf, PCF50633_REG_LEDOUT);
-+
-+      return intensity & 0x3f;
-+}
-+
-+static int pcf50633bl_set_intensity(struct backlight_device *bd)
-+{
-+      struct pcf50633_data *pcf = bl_get_data(bd);
-+      int intensity = bd->props.brightness;
-+      int old_intensity = reg_read(pcf, PCF50633_REG_LEDOUT);
-+      u_int8_t ledena;
-+      int ret;
-+
-+      if (bd->props.power != FB_BLANK_UNBLANK)
-+              intensity = 0;
-+      if (bd->props.fb_blank != FB_BLANK_UNBLANK)
-+              intensity = 0;
-+
-+      /* The PCF50633 seems to have some kind of oddity (bug?) when
-+       * the intensity was 0, you need to completely switch it off
-+       * and re-enable it, before it produces any output voltage again */
-+
-+      if (intensity != 0 && old_intensity == 0) {
-+              ledena = reg_read(pcf, PCF50633_REG_LEDENA);
-+              reg_write(pcf, PCF50633_REG_LEDENA, 0x00);
-+      }
-+
-+      ret = reg_set_bit_mask(pcf, PCF50633_REG_LEDOUT, 0x3f,
-+                             intensity);
-+
-+      if (intensity != 0 && old_intensity == 0)
-+              reg_write(pcf, PCF50633_REG_LEDENA, ledena);
-+
-+      return ret;
-+}
-+
-+static struct backlight_ops pcf50633bl_ops = {
-+      .get_brightness = pcf50633bl_get_intensity,
-+      .update_status  = pcf50633bl_set_intensity,
-+};
-+
-+/*
-+ * Charger type
-+ */
-+
-+static ssize_t show_charger_type(struct device *dev,
-+                               struct device_attribute *attr, char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      static const char *names_charger_type[] = {
-+              [CHARGER_TYPE_NONE]     = "none",
-+              [CHARGER_TYPE_HOSTUSB]  = "host/500mA usb",
-+              [CHARGER_TYPE_1A]       = "charger 1A",
-+      };
-+      static const char *names_charger_modes[] = {
-+              [PCF50633_MBCC7_USB_1000mA]     = "1A",
-+              [PCF50633_MBCC7_USB_500mA]      = "500mA",
-+              [PCF50633_MBCC7_USB_100mA]      = "100mA",
-+              [PCF50633_MBCC7_USB_SUSPEND]    = "suspend",
-+      };
-+      int mode = reg_read(pcf, PCF50633_REG_MBCC7) & PCF56033_MBCC7_USB_MASK;
-+
-+      return sprintf(buf, "%s mode %s\n",
-+                          names_charger_type[pcf->charger_type],
-+                          names_charger_modes[mode]);
-+}
-+
-+static DEVICE_ATTR(charger_type, 0444, show_charger_type, NULL);
-+
-+/*
-+ * Charger adc
-+ */
-+
-+static ssize_t show_charger_adc(struct device *dev,
-+                              struct device_attribute *attr, char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+
-+      return sprintf(buf, "%d\n", pcf->charger_adc_result_raw);
-+}
-+
-+static DEVICE_ATTR(charger_adc, 0444, show_charger_adc, NULL);
-+
-+/*
-+ * Dump regs
-+ */
-+
-+static ssize_t show_dump_regs(struct device *dev, struct device_attribute *attr,
-+                          char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      u8 dump[16];
-+      int n, n1, idx = 0;
-+      char *buf1 = buf;
-+      static u8 address_no_read[] = { /* must be ascending */
-+              PCF50633_REG_INT1,
-+              PCF50633_REG_INT2,
-+              PCF50633_REG_INT3,
-+              PCF50633_REG_INT4,
-+              PCF50633_REG_INT5,
-+              0 /* terminator */
-+      };
-+
-+      for (n = 0; n < 256; n += sizeof(dump)) {
-+
-+              for (n1 = 0; n1 < sizeof(dump); n1++)
-+                      if (n == address_no_read[idx]) {
-+                              idx++;
-+                              dump[n1] = 0x00;
-+                      } else
-+                              dump[n1] = reg_read(pcf, n + n1);
-+
-+              hex_dump_to_buffer(dump, sizeof(dump), 16, 1, buf1, 128, 0);
-+              buf1 += strlen(buf1);
-+              *buf1++ = '\n';
-+              *buf1 = '\0';
-+      }
-+
-+      return buf1 - buf;
-+}
-+
-+static DEVICE_ATTR(dump_regs, 0400, show_dump_regs, NULL);
-+
-+
-+/***********************************************************************
-+ * Driver initialization
-+ ***********************************************************************/
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+/* We currently place those platform devices here to make sure the device
-+ * suspend/resume order is correct */
-+static struct platform_device gta01_pm_gps_dev = {
-+      .name           = "neo1973-pm-gps",
-+};
-+
-+static struct platform_device gta01_pm_bt_dev = {
-+      .name           = "neo1973-pm-bt",
-+};
-+#endif
-+
-+/*
-+ * CARE!  This table is modified at runtime!
-+ */
-+static struct attribute *pcf_sysfs_entries[] = {
-+      &dev_attr_voltage_auto.attr,
-+      &dev_attr_voltage_down1.attr,
-+      &dev_attr_voltage_down2.attr,
-+      &dev_attr_voltage_memldo.attr,
-+      &dev_attr_voltage_ldo1.attr,
-+      &dev_attr_voltage_ldo2.attr,
-+      &dev_attr_voltage_ldo3.attr,
-+      &dev_attr_voltage_ldo4.attr,
-+      &dev_attr_voltage_ldo5.attr,
-+      &dev_attr_voltage_ldo6.attr,
-+      &dev_attr_voltage_hcldo.attr,
-+      &dev_attr_charger_type.attr,
-+      &dev_attr_charger_adc.attr,
-+      &dev_attr_dump_regs.attr,
-+      NULL, /* going to add things at this point! */
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+};
-+
-+static struct attribute_group pcf_attr_group = {
-+      .name   = NULL,                 /* put in device directory */
-+      .attrs  = pcf_sysfs_entries,
-+};
-+
-+static void populate_sysfs_group(struct pcf50633_data *pcf)
-+{
-+      int i = 0;
-+      struct attribute **attr;
-+
-+      for (attr = pcf_sysfs_entries; *attr; attr++)
-+              i++;
-+
-+      if (pcf->pdata->used_features & PCF50633_FEAT_MBC) {
-+              pcf_sysfs_entries[i++] = &dev_attr_chgstate.attr;
-+              pcf_sysfs_entries[i++] = &dev_attr_chgmode.attr;
-+              pcf_sysfs_entries[i++] = &dev_attr_usb_curlim.attr;
-+      }
-+
-+      if (pcf->pdata->used_features & PCF50633_FEAT_CHGCUR)
-+              pcf_sysfs_entries[i++] = &dev_attr_chgcur.attr;
-+
-+      if (pcf->pdata->used_features & PCF50633_FEAT_BATVOLT)
-+              pcf_sysfs_entries[i++] = &dev_attr_battvolt.attr;
-+
-+      if (pcf->pdata->used_features & PCF50633_FEAT_BATTEMP)
-+              pcf_sysfs_entries[i++] = &dev_attr_battemp.attr;
-+
-+}
-+
-+static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-+{
-+      struct i2c_client *new_client;
-+      struct pcf50633_data *data;
-+      int err = 0;
-+      int irq;
-+
-+      DEBUGP("entering\n");
-+      if (!pcf50633_pdev) {
-+              printk(KERN_ERR "pcf50633: driver needs a platform_device!\n");
-+              return -EIO;
-+      }
-+
-+      irq = platform_get_irq(pcf50633_pdev, 0);
-+      if (irq < 0) {
-+              dev_err(&pcf50633_pdev->dev, "no irq in platform resources!\n");
-+              return -EIO;
-+      }
-+
-+      /* At the moment, we only support one PCF50633 in a system */
-+      if (pcf50633_global) {
-+              dev_err(&pcf50633_pdev->dev,
-+                      "currently only one chip supported\n");
-+              return -EBUSY;
-+      }
-+
-+      if (!(data = kzalloc(sizeof(*data), GFP_KERNEL)))
-+              return -ENOMEM;
-+
-+      mutex_init(&data->lock);
-+      mutex_init(&data->working_lock);
-+      INIT_WORK(&data->work, pcf50633_work);
-+      data->irq = irq;
-+      data->working = 0;
-+      data->onkey_seconds = -1;
-+      data->pdata = pcf50633_pdev->dev.platform_data;
-+
-+      new_client = &data->client;
-+      i2c_set_clientdata(new_client, data);
-+      new_client->addr = address;
-+      new_client->adapter = adapter;
-+      new_client->driver = &pcf50633_driver;
-+      new_client->flags = 0;
-+      strlcpy(new_client->name, "pcf50633", I2C_NAME_SIZE);
-+
-+      /* now we try to detect the chip */
-+
-+      /* register with i2c core */
-+      if ((err = i2c_attach_client(new_client))) {
-+              dev_err(&new_client->dev,
-+                      "error during i2c_attach_client()\n");
-+              goto exit_free;
-+      }
-+
-+      pcf50633_global = data;
-+
-+      populate_sysfs_group(data);
-+
-+      err = sysfs_create_group(&new_client->dev.kobj, &pcf_attr_group);
-+      if (err) {
-+              dev_err(&new_client->dev, "error creating sysfs group\n");
-+              goto exit_detach;
-+      }
-+
-+      /* create virtual charger 'device' */
-+
-+      /* register power off handler with core power management */
-+      pm_power_off = &pcf50633_go_standby;
-+
-+      data->input_dev = input_allocate_device();
-+      if (!data->input_dev)
-+              goto exit_sysfs;
-+
-+      data->input_dev->name = "GTA02 PMU events";
-+      data->input_dev->phys = "FIXME";
-+      data->input_dev->id.bustype = BUS_I2C;
-+      data->input_dev->cdev.dev = &new_client->dev;
-+
-+      data->input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_PWR);
-+      set_bit(KEY_POWER, data->input_dev->keybit);
-+      set_bit(KEY_POWER2, data->input_dev->keybit);
-+      set_bit(KEY_BATTERY, data->input_dev->keybit);
-+
-+      err = input_register_device(data->input_dev);
-+      if (err)
-+              goto exit_sysfs;
-+
-+      /* configure interrupt mask */
-+      reg_write(data, PCF50633_REG_INT1M, 0x00); /* we want SECOND to kick */
-+      reg_write(data, PCF50633_REG_INT2M, 0x00);
-+      reg_write(data, PCF50633_REG_INT3M, 0x00);
-+      reg_write(data, PCF50633_REG_INT4M, 0x00);
-+      reg_write(data, PCF50633_REG_INT5M, 0x00);
-+
-+      err = request_irq(irq, pcf50633_irq, IRQF_TRIGGER_FALLING,
-+                        "pcf50633", data);
-+      if (err < 0)
-+              goto exit_input;
-+
-+      if (enable_irq_wake(irq) < 0)
-+              dev_err(&new_client->dev, "IRQ %u cannot be enabled as wake-up"
-+                      "source in this hardware revision!", irq);
-+
-+      if (data->pdata->used_features & PCF50633_FEAT_RTC) {
-+              data->rtc = rtc_device_register("pcf50633", &new_client->dev,
-+                                              &pcf50633_rtc_ops, THIS_MODULE);
-+              if (IS_ERR(data->rtc)) {
-+                      err = PTR_ERR(data->rtc);
-+                      goto exit_irq;
-+              }
-+      }
-+
-+      if (data->pdata->used_features & PCF50633_FEAT_PWM_BL) {
-+              data->backlight = backlight_device_register("pcf50633-bl",
-+                                                          &new_client->dev,
-+                                                          data,
-+                                                          &pcf50633bl_ops);
-+              if (!data->backlight)
-+                      goto exit_rtc;
-+              /* FIXME: are we sure we want default == off? */
-+              data->backlight->props.max_brightness = 0x3f;
-+              data->backlight->props.power = FB_BLANK_UNBLANK;
-+              data->backlight->props.fb_blank = FB_BLANK_UNBLANK;
-+              data->backlight->props.brightness =
-+                                      data->backlight->props.max_brightness;
-+              backlight_update_status(data->backlight);
-+      }
-+
-+      apm_get_power_status = pcf50633_get_power_status;
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+      if (machine_is_neo1973_gta02()) {
-+              gta01_pm_gps_dev.dev.parent = &new_client->dev;
-+              gta01_pm_bt_dev.dev.parent = &new_client->dev;
-+              platform_device_register(&gta01_pm_bt_dev);
-+              platform_device_register(&gta01_pm_gps_dev);
-+      }
-+#endif
-+
-+      return 0;
-+exit_rtc:
-+      if (data->pdata->used_features & PCF50633_FEAT_RTC)
-+              rtc_device_unregister(pcf50633_global->rtc);
-+exit_irq:
-+      free_irq(pcf50633_global->irq, pcf50633_global);
-+exit_input:
-+      input_unregister_device(data->input_dev);
-+exit_sysfs:
-+      pm_power_off = NULL;
-+      sysfs_remove_group(&new_client->dev.kobj, &pcf_attr_group);
-+exit_detach:
-+      i2c_detach_client(new_client);
-+exit_free:
-+      kfree(data);
-+      pcf50633_global = NULL;
-+      return err;
-+}
-+
-+static int pcf50633_attach_adapter(struct i2c_adapter *adapter)
-+{
-+      DEBUGP("entering, calling i2c_probe\n");
-+      return i2c_probe(adapter, &addr_data, &pcf50633_detect);
-+}
-+
-+static int pcf50633_detach_client(struct i2c_client *client)
-+{
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+
-+      DEBUGP("entering\n");
-+
-+      apm_get_power_status = NULL;
-+
-+      free_irq(pcf->irq, pcf);
-+
-+      input_unregister_device(pcf->input_dev);
-+
-+      if (pcf->pdata->used_features & PCF50633_FEAT_PWM_BL)
-+              backlight_device_unregister(pcf->backlight);
-+
-+      if (pcf->pdata->used_features & PCF50633_FEAT_RTC)
-+              rtc_device_unregister(pcf->rtc);
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+      if (machine_is_neo1973_gta02()) {
-+              platform_device_unregister(&gta01_pm_bt_dev);
-+              platform_device_unregister(&gta01_pm_gps_dev);
-+      }
-+#endif
-+
-+      sysfs_remove_group(&client->dev.kobj, &pcf_attr_group);
-+
-+      pm_power_off = NULL;
-+
-+      kfree(pcf);
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+#define INT1M_RESUMERS        (PCF50633_INT1_ADPINS           | \
-+                       PCF50633_INT1_ADPREM           | \
-+                       PCF50633_INT1_USBINS           | \
-+                       PCF50633_INT1_USBREM           | \
-+                       PCF50633_INT1_ALARM)
-+#define INT2M_RESUMERS        (PCF50633_INT2_ONKEYF)
-+#define INT3M_RESUMERS        (PCF50633_INT3_BATFULL          | \
-+                       PCF50633_INT3_CHGHALT          | \
-+                       PCF50633_INT3_THLIMON          | \
-+                       PCF50633_INT3_THLIMOFF         | \
-+                       PCF50633_INT3_USBLIMON         | \
-+                       PCF50633_INT3_USBLIMOFF        | \
-+                       PCF50633_INT3_ONKEY1S)
-+#define INT4M_RESUMERS        (PCF50633_INT4_LOWSYS           | \
-+                       PCF50633_INT4_LOWBAT           | \
-+                       PCF50633_INT4_HIGHTMP)
-+#define INT5M_RESUMERS        (0)
-+
-+static int pcf50633_suspend(struct device *dev, pm_message_t state)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      int i;
-+
-+      /* The general idea is to power down all unused power supplies,
-+       * and then mask all PCF50606 interrup sources but EXTONR, ONKEYF
-+       * and ALARM */
-+
-+      mutex_lock(&pcf->lock);
-+
-+      /* Save all registers that don't "survive" standby state */
-+      pcf->standby_regs.ooctim2 = __reg_read(pcf, PCF50633_REG_OOCTIM2);
-+      pcf->standby_regs.autoout = __reg_read(pcf, PCF50633_REG_AUTOOUT);
-+      pcf->standby_regs.autoena = __reg_read(pcf, PCF50633_REG_AUTOENA);
-+      pcf->standby_regs.automxc = __reg_read(pcf, PCF50633_REG_AUTOMXC);
-+      pcf->standby_regs.down1out = __reg_read(pcf, PCF50633_REG_DOWN1OUT);
-+      pcf->standby_regs.down1mxc = __reg_read(pcf, PCF50633_REG_DOWN1MXC);
-+      pcf->standby_regs.down2out = __reg_read(pcf, PCF50633_REG_DOWN2OUT);
-+      pcf->standby_regs.down2ena = __reg_read(pcf, PCF50633_REG_DOWN2ENA);
-+      pcf->standby_regs.memldoout = __reg_read(pcf, PCF50633_REG_MEMLDOOUT);
-+      pcf->standby_regs.memldoena = __reg_read(pcf, PCF50633_REG_MEMLDOENA);
-+      pcf->standby_regs.ledout = __reg_read(pcf, PCF50633_REG_LEDOUT);
-+      pcf->standby_regs.ledena = __reg_read(pcf, PCF50633_REG_LEDENA);
-+      pcf->standby_regs.leddim = __reg_read(pcf, PCF50633_REG_LEDDIM);
-+      /* FIXME: one big read? */
-+      for (i = 0; i < 7; i++) {
-+              u_int8_t reg_out = PCF50633_REG_LDO1OUT + 2*i;
-+              pcf->standby_regs.ldo[i].out = __reg_read(pcf, reg_out);
-+              pcf->standby_regs.ldo[i].ena = __reg_read(pcf, reg_out+1);
-+      }
-+
-+      /* switch off power supplies that are not needed during suspend */
-+      for (i = 0; i < __NUM_PCF50633_REGULATORS; i++) {
-+              if (!(pcf->pdata->rails[i].flags & PMU_VRAIL_F_SUSPEND_ON)) {
-+                      u_int8_t tmp;
-+
-+                      DEBUGP("disabling pcf50633 regulator %u\n", i);
-+                      /* we cannot use pcf50633_onoff_set() because we're
-+                       * already under the mutex */
-+                      tmp = __reg_read(pcf, regulator_registers[i]+1);
-+                      tmp &= 0xfe;
-+                      __reg_write(pcf, regulator_registers[i]+1, tmp);
-+              }
-+      }
-+
-+      pcf->standby_regs.int1m = __reg_read(pcf, PCF50633_REG_INT1M);
-+      pcf->standby_regs.int2m = __reg_read(pcf, PCF50633_REG_INT2M);
-+      pcf->standby_regs.int3m = __reg_read(pcf, PCF50633_REG_INT3M);
-+      pcf->standby_regs.int4m = __reg_read(pcf, PCF50633_REG_INT4M);
-+      pcf->standby_regs.int5m = __reg_read(pcf, PCF50633_REG_INT5M);
-+      __reg_write(pcf, PCF50633_REG_INT1M, ~INT1M_RESUMERS & 0xff);
-+      __reg_write(pcf, PCF50633_REG_INT2M, ~INT2M_RESUMERS & 0xff);
-+      __reg_write(pcf, PCF50633_REG_INT3M, ~INT3M_RESUMERS & 0xff);
-+      __reg_write(pcf, PCF50633_REG_INT4M, ~INT4M_RESUMERS & 0xff);
-+      __reg_write(pcf, PCF50633_REG_INT5M, ~INT5M_RESUMERS & 0xff);
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      return 0;
-+}
-+
-+static int pcf50633_resume(struct device *dev)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      int i;
-+
-+      mutex_lock(&pcf->lock);
-+
-+      /* Resume all saved registers that don't "survive" standby state */
-+      __reg_write(pcf, PCF50633_REG_INT1M, pcf->standby_regs.int1m);
-+      __reg_write(pcf, PCF50633_REG_INT2M, pcf->standby_regs.int2m);
-+      __reg_write(pcf, PCF50633_REG_INT3M, pcf->standby_regs.int3m);
-+      __reg_write(pcf, PCF50633_REG_INT4M, pcf->standby_regs.int4m);
-+      __reg_write(pcf, PCF50633_REG_INT5M, pcf->standby_regs.int5m);
-+
-+      __reg_write(pcf, PCF50633_REG_OOCTIM2, pcf->standby_regs.ooctim2);
-+      __reg_write(pcf, PCF50633_REG_AUTOOUT, pcf->standby_regs.autoout);
-+      __reg_write(pcf, PCF50633_REG_AUTOMXC, pcf->standby_regs.automxc);
-+      __reg_write(pcf, PCF50633_REG_DOWN1OUT, pcf->standby_regs.down1out);
-+      __reg_write(pcf, PCF50633_REG_DOWN1MXC, pcf->standby_regs.down1mxc);
-+      __reg_write(pcf, PCF50633_REG_DOWN2OUT, pcf->standby_regs.down2out);
-+      __reg_write(pcf, PCF50633_REG_DOWN2ENA, pcf->standby_regs.down2ena);
-+      __reg_write(pcf, PCF50633_REG_MEMLDOOUT, pcf->standby_regs.memldoout);
-+      __reg_write(pcf, PCF50633_REG_MEMLDOENA, pcf->standby_regs.memldoena);
-+      __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.ledout);
-+      __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.ledena);
-+      __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.leddim);
-+      /* FIXME: one big read? */
-+      for (i = 0; i < 7; i++) {
-+              u_int8_t reg_out = PCF50633_REG_LDO1OUT + 2*i;
-+              __reg_write(pcf, reg_out, pcf->standby_regs.ldo[i].out);
-+              __reg_write(pcf, reg_out+1, pcf->standby_regs.ldo[i].ena);
-+      }
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      pcf50633_irq(pcf->irq, pcf);
-+
-+      return 0;
-+}
-+#else
-+#define pcf50633_suspend NULL
-+#define pcf50633_resume NULL
-+#endif
-+
-+static struct i2c_driver pcf50633_driver = {
-+      .driver = {
-+              .name   = "pcf50633",
-+              .suspend= pcf50633_suspend,
-+              .resume = pcf50633_resume,
-+      },
-+      .id             = I2C_DRIVERID_PCF50633,
-+      .attach_adapter = pcf50633_attach_adapter,
-+      .detach_client  = pcf50633_detach_client,
-+};
-+
-+/* platform driver, since i2c devices don't have platform_data */
-+static int __init pcf50633_plat_probe(struct platform_device *pdev)
-+{
-+      struct pcf50633_platform_data *pdata = pdev->dev.platform_data;
-+
-+      if (!pdata)
-+              return -ENODEV;
-+
-+      pcf50633_pdev = pdev;
-+
-+      return 0;
-+}
-+
-+static int pcf50633_plat_remove(struct platform_device *pdev)
-+{
-+      return 0;
-+}
-+
-+static struct platform_driver pcf50633_plat_driver = {
-+      .probe  = pcf50633_plat_probe,
-+      .remove = pcf50633_plat_remove,
-+      .driver = {
-+              .owner  = THIS_MODULE,
-+              .name   = "pcf50633",
-+      },
-+};
-+
-+static int __init pcf50633_init(void)
-+{
-+      int rc;
-+
-+      if (!(rc = platform_driver_register(&pcf50633_plat_driver)))
-+              rc = i2c_add_driver(&pcf50633_driver);
-+
-+      return rc;
-+}
-+
-+static void pcf50633_exit(void)
-+{
-+      i2c_del_driver(&pcf50633_driver);
-+      platform_driver_unregister(&pcf50633_plat_driver);
-+}
-+
-+MODULE_DESCRIPTION("I2C chip driver for NXP PCF50633 power management unit");
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_LICENSE("GPL");
-+
-+module_init(pcf50633_init);
-+module_exit(pcf50633_exit);
-diff --git a/drivers/i2c/chips/pcf50633.h b/drivers/i2c/chips/pcf50633.h
-new file mode 100644
-index 0000000..9aad206
---- /dev/null
-+++ b/drivers/i2c/chips/pcf50633.h
-@@ -0,0 +1,402 @@
-+#ifndef _PCF50633_H
-+#define _PCF50633_H
-+
-+/* Philips PCF50633 Power Managemnt Unit (PMU) driver
-+ * (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ *
-+ */
-+
-+enum pfc50633_regs {
-+      PCF50633_REG_VERSION    = 0x00,
-+      PCF50633_REG_VARIANT    = 0x01,
-+      PCF50633_REG_INT1       = 0x02, /* Interrupt Status */
-+      PCF50633_REG_INT2       = 0x03, /* Interrupt Status */
-+      PCF50633_REG_INT3       = 0x04, /* Interrupt Status */
-+      PCF50633_REG_INT4       = 0x05, /* Interrupt Status */
-+      PCF50633_REG_INT5       = 0x06, /* Interrupt Status */
-+      PCF50633_REG_INT1M      = 0x07, /* Interrupt Mask */
-+      PCF50633_REG_INT2M      = 0x08, /* Interrupt Mask */
-+      PCF50633_REG_INT3M      = 0x09, /* Interrupt Mask */
-+      PCF50633_REG_INT4M      = 0x0a, /* Interrupt Mask */
-+      PCF50633_REG_INT5M      = 0x0b, /* Interrupt Mask */
-+      PCF50633_REG_OOCSHDWN   = 0x0c,
-+      PCF50633_REG_OOCWAKE    = 0x0d,
-+      PCF50633_REG_OOCTIM1    = 0x0e,
-+      PCF50633_REG_OOCTIM2    = 0x0f,
-+      PCF50633_REG_OOCMODE    = 0x10,
-+      PCF50633_REG_OOCCTL     = 0x11,
-+      PCF50633_REG_OOCSTAT    = 0x12,
-+      PCF50633_REG_GPIOCTL    = 0x13,
-+      PCF50633_REG_GPIO1CFG   = 0x14,
-+      PCF50633_REG_GPIO2CFG   = 0x15,
-+      PCF50633_REG_GPIO3CFG   = 0x16,
-+      PCF50633_REG_GPOCFG     = 0x17,
-+      PCF50633_REG_BVMCTL     = 0x18,
-+      PCF50633_REG_SVMCTL     = 0x19,
-+      PCF50633_REG_AUTOOUT    = 0x1a,
-+      PCF50633_REG_AUTOENA    = 0x1b,
-+      PCF50633_REG_AUTOCTL    = 0x1c,
-+      PCF50633_REG_AUTOMXC    = 0x1d,
-+      PCF50633_REG_DOWN1OUT   = 0x1e,
-+      PCF50633_REG_DOWN1ENA   = 0x1f,
-+      PCF50633_REG_DOWN1CTL   = 0x20,
-+      PCF50633_REG_DOWN1MXC   = 0x21,
-+      PCF50633_REG_DOWN2OUT   = 0x22,
-+      PCF50633_REG_DOWN2ENA   = 0x23,
-+      PCF50633_REG_DOWN2CTL   = 0x24,
-+      PCF50633_REG_DOWN2MXC   = 0x25,
-+      PCF50633_REG_MEMLDOOUT  = 0x26,
-+      PCF50633_REG_MEMLDOENA  = 0x27,
-+      PCF50633_REG_LEDOUT     = 0x28,
-+      PCF50633_REG_LEDENA     = 0x29,
-+      PCF50633_REG_LEDCTL     = 0x2a,
-+      PCF50633_REG_LEDDIM     = 0x2b,
-+      /* reserved */
-+      PCF50633_REG_LDO1OUT    = 0x2d,
-+      PCF50633_REG_LDO1ENA    = 0x2e,
-+      PCF50633_REG_LDO2OUT    = 0x2f,
-+      PCF50633_REG_LDO2ENA    = 0x30,
-+      PCF50633_REG_LDO3OUT    = 0x31,
-+      PCF50633_REG_LDO3ENA    = 0x32,
-+      PCF50633_REG_LDO4OUT    = 0x33,
-+      PCF50633_REG_LDO4ENA    = 0x34,
-+      PCF50633_REG_LDO5OUT    = 0x35,
-+      PCF50633_REG_LDO5ENA    = 0x36,
-+      PCF50633_REG_LDO6OUT    = 0x37,
-+      PCF50633_REG_LDO6ENA    = 0x38,
-+      PCF50633_REG_HCLDOOUT   = 0x39,
-+      PCF50633_REG_HCLDOENA   = 0x3a,
-+      PCF50633_REG_STBYCTL1   = 0x3b,
-+      PCF50633_REG_STBYCTL2   = 0x3c,
-+      PCF50633_REG_DEBPF1     = 0x3d,
-+      PCF50633_REG_DEBPF2     = 0x3e,
-+      PCF50633_REG_DEBPF3     = 0x3f,
-+      PCF50633_REG_HCLDOOVL   = 0x40,
-+      PCF50633_REG_DCDCSTAT   = 0x41,
-+      PCF50633_REG_LDOSTAT    = 0x42,
-+      PCF50633_REG_MBCC1      = 0x43,
-+      PCF50633_REG_MBCC2      = 0x44,
-+      PCF50633_REG_MBCC3      = 0x45,
-+      PCF50633_REG_MBCC4      = 0x46,
-+      PCF50633_REG_MBCC5      = 0x47,
-+      PCF50633_REG_MBCC6      = 0x48,
-+      PCF50633_REG_MBCC7      = 0x49,
-+      PCF50633_REG_MBCC8      = 0x4a,
-+      PCF50633_REG_MBCS1      = 0x4b,
-+      PCF50633_REG_MBCS2      = 0x4c,
-+      PCF50633_REG_MBCS3      = 0x4d,
-+      PCF50633_REG_BBCCTL     = 0x4e,
-+      PCF50633_REG_ALMGAIN    = 0x4f,
-+      PCF50633_REG_ALMDATA    = 0x50,
-+      /* reserved */
-+      PCF50633_REG_ADCC3      = 0x52,
-+      PCF50633_REG_ADCC2      = 0x53,
-+      PCF50633_REG_ADCC1      = 0x54,
-+      PCF50633_REG_ADCS1      = 0x55,
-+      PCF50633_REG_ADCS2      = 0x56,
-+      PCF50633_REG_ADCS3      = 0x57,
-+      /* reserved */
-+      PCF50633_REG_RTCSC      = 0x59, /* Second */
-+      PCF50633_REG_RTCMN      = 0x5a, /* Minute */
-+      PCF50633_REG_RTCHR      = 0x5b, /* Hour */
-+      PCF50633_REG_RTCWD      = 0x5c, /* Weekday */
-+      PCF50633_REG_RTCDT      = 0x5d, /* Day */
-+      PCF50633_REG_RTCMT      = 0x5e, /* Month */
-+      PCF50633_REG_RTCYR      = 0x5f, /* Year */
-+      PCF50633_REG_RTCSCA     = 0x60, /* Alarm Second */
-+      PCF50633_REG_RTCMNA     = 0x61, /* Alarm Minute */
-+      PCF50633_REG_RTCHRA     = 0x62, /* Alarm Hour */
-+      PCF50633_REG_RTCWDA     = 0x63, /* Alarm Weekday */
-+      PCF50633_REG_RTCDTA     = 0x64, /* Alarm Day */
-+      PCF50633_REG_RTCMTA     = 0x65, /* Alarm Month */
-+      PCF50633_REG_RTCYRA     = 0x66, /* Alarm Year */
-+
-+      PCF50633_REG_MEMBYTE0   = 0x67,
-+      PCF50633_REG_MEMBYTE1   = 0x68,
-+      PCF50633_REG_MEMBYTE2   = 0x69,
-+      PCF50633_REG_MEMBYTE3   = 0x6a,
-+      PCF50633_REG_MEMBYTE4   = 0x6b,
-+      PCF50633_REG_MEMBYTE5   = 0x6c,
-+      PCF50633_REG_MEMBYTE6   = 0x6d,
-+      PCF50633_REG_MEMBYTE7   = 0x6e,
-+      /* reserved */
-+      PCF50633_REG_DCDCPFM    = 0x84,
-+      __NUM_PCF50633_REGS
-+};
-+
-+enum pcf50633_reg_int1 {
-+      PCF50633_INT1_ADPINS    = 0x01, /* Adapter inserted */
-+      PCF50633_INT1_ADPREM    = 0x02, /* Adapter removed */
-+      PCF50633_INT1_USBINS    = 0x04, /* USB inserted */
-+      PCF50633_INT1_USBREM    = 0x08, /* USB removed */
-+      /* reserved */
-+      PCF50633_INT1_ALARM     = 0x40, /* RTC alarm time is reached */
-+      PCF50633_INT1_SECOND    = 0x80, /* RTC periodic second interrupt */
-+};
-+
-+enum pcf50633_reg_int2 {
-+      PCF50633_INT2_ONKEYR    = 0x01, /* ONKEY rising edge */
-+      PCF50633_INT2_ONKEYF    = 0x02, /* ONKEY falling edge */
-+      PCF50633_INT2_EXTON1R   = 0x04, /* EXTON1 rising edge */
-+      PCF50633_INT2_EXTON1F   = 0x08, /* EXTON1 falling edge */
-+      PCF50633_INT2_EXTON2R   = 0x10, /* EXTON2 rising edge */
-+      PCF50633_INT2_EXTON2F   = 0x20, /* EXTON2 falling edge */
-+      PCF50633_INT2_EXTON3R   = 0x40, /* EXTON3 rising edge */
-+      PCF50633_INT2_EXTON3F   = 0x80, /* EXTON3 falling edge */
-+};
-+
-+enum pcf50633_reg_int3 {
-+      PCF50633_INT3_BATFULL   = 0x01, /* Battery full */
-+      PCF50633_INT3_CHGHALT   = 0x02, /* Charger halt */
-+      PCF50633_INT3_THLIMON   = 0x04,
-+      PCF50633_INT3_THLIMOFF  = 0x08,
-+      PCF50633_INT3_USBLIMON  = 0x10,
-+      PCF50633_INT3_USBLIMOFF = 0x20,
-+      PCF50633_INT3_ADCRDY    = 0x40, /* ADC conversion finished */
-+      PCF50633_INT3_ONKEY1S   = 0x80, /* ONKEY pressed 1 second */
-+};
-+
-+enum pcf50633_reg_int4 {
-+      PCF50633_INT4_LOWSYS            = 0x01,
-+      PCF50633_INT4_LOWBAT            = 0x02,
-+      PCF50633_INT4_HIGHTMP           = 0x04,
-+      PCF50633_INT4_AUTOPWRFAIL       = 0x08,
-+      PCF50633_INT4_DWN1PWRFAIL       = 0x10,
-+      PCF50633_INT4_DWN2PWRFAIL       = 0x20,
-+      PCF50633_INT4_LEDPWRFAIL        = 0x40,
-+      PCF50633_INT4_LEDOVP            = 0x80,
-+};
-+
-+enum pcf50633_reg_int5 {
-+      PCF50633_INT5_LDO1PWRFAIL       = 0x01,
-+      PCF50633_INT5_LDO2PWRFAIL       = 0x02,
-+      PCF50633_INT5_LDO3PWRFAIL       = 0x04,
-+      PCF50633_INT5_LDO4PWRFAIL       = 0x08,
-+      PCF50633_INT5_LDO5PWRFAIL       = 0x10,
-+      PCF50633_INT5_LDO6PWRFAIL       = 0x20,
-+      PCF50633_INT5_HCLDOPWRFAIL      = 0x40,
-+      PCF50633_INT5_HCLDOOVL          = 0x80,
-+};
-+
-+enum pcf50633_reg_oocshdwn {
-+      PCF50633_OOCSHDWN_GOSTDBY       = 0x01,
-+      PCF50633_OOCSHDWN_TOTRST        = 0x04,
-+      PCF50633_OOCSHDWN_COLDBOOT      = 0x08,
-+};
-+
-+enum pcf50633_reg_oocwake {
-+      PCF50633_OOCWAKE_ONKEY          = 0x01,
-+      PCF50633_OOCWAKE_EXTON1         = 0x02,
-+      PCF50633_OOCWAKE_EXTON2         = 0x04,
-+      PCF50633_OOCWAKE_EXTON3         = 0x08,
-+      PCF50633_OOCWAKE_RTC            = 0x10,
-+      /* reserved */
-+      PCF50633_OOCWAKE_USB            = 0x40,
-+      PCF50633_OOCWAKE_ADP            = 0x80,
-+};
-+
-+enum pcf50633_reg_mbcc1 {
-+      PCF50633_MBCC1_CHGENA           = 0x01, /* Charger enable */
-+      PCF50633_MBCC1_AUTOSTOP         = 0x02,
-+      PCF50633_MBCC1_AUTORES          = 0x04, /* automatic resume */
-+      PCF50633_MBCC1_RESUME           = 0x08, /* explicit resume cmd */
-+      PCF50633_MBCC1_RESTART          = 0x10, /* restart charging */
-+      PCF50633_MBCC1_PREWDTIME_60M    = 0x20, /* max. precharging time */
-+      PCF50633_MBCC1_WDTIME_1H        = 0x00,
-+      PCF50633_MBCC1_WDTIME_2H        = 0x40,
-+      PCF50633_MBCC1_WDTIME_4H        = 0x80,
-+      PCF50633_MBCC1_WDTIME_6H        = 0xc0,
-+};
-+#define PCF50633_MBCC1_WDTIME_MASK      0xc0
-+
-+enum pcf50633_reg_mbcc2 {
-+      PCF50633_MBCC2_VBATCOND_2V7     = 0x00,
-+      PCF50633_MBCC2_VBATCOND_2V85    = 0x01,
-+      PCF50633_MBCC2_VBATCOND_3V0     = 0x02,
-+      PCF50633_MBCC2_VBATCOND_3V15    = 0x03,
-+      PCF50633_MBCC2_VMAX_4V          = 0x00,
-+      PCF50633_MBCC2_VMAX_4V20        = 0x28,
-+      PCF50633_MBCC2_VRESDEBTIME_64S  = 0x80, /* debounce time (32/64sec) */
-+};
-+#define       PCF50633_MBCC2_VBATCOND_MASK      0x03
-+#define PCF50633_MBCC2_VMAX_MASK        0x3c
-+
-+enum pcf50633_reg_adcc1 {
-+      PCF50633_ADCC1_ADCSTART         = 0x01,
-+      PCF50633_ADCC1_RES_10BIT        = 0x02,
-+      PCF50633_ADCC1_AVERAGE_NO       = 0x00,
-+      PCF50633_ADCC1_AVERAGE_4        = 0x04,
-+      PCF50633_ADCC1_AVERAGE_8        = 0x08,
-+      PCF50633_ADCC1_AVERAGE_16       = 0x0c,
-+
-+      PCF50633_ADCC1_MUX_BATSNS_RES   = 0x00,
-+      PCF50633_ADCC1_MUX_BATSNS_SUBTR = 0x10,
-+      PCF50633_ADCC1_MUX_ADCIN2_RES   = 0x20,
-+      PCF50633_ADCC1_MUX_ADCIN2_SUBTR = 0x30,
-+      PCF50633_ADCC1_MUX_BATTEMP      = 0x60,
-+      PCF50633_ADCC1_MUX_ADCIN1       = 0x70,
-+};
-+#define PCF50633_ADCC1_AVERAGE_MASK   0x0c
-+#define       PCF50633_ADCC1_ADCMUX_MASK      0xf0
-+
-+enum pcf50633_reg_adcc2 {
-+      PCF50633_ADCC2_RATIO_NONE       = 0x00,
-+      PCF50633_ADCC2_RATIO_BATTEMP    = 0x01,
-+      PCF50633_ADCC2_RATIO_ADCIN1     = 0x02,
-+      PCF50633_ADCC2_RATIO_BOTH       = 0x03,
-+      PCF50633_ADCC2_RATIOSETTL_100US = 0x04,
-+};
-+#define PCF50633_ADCC2_RATIO_MASK     0x03
-+
-+enum pcf50633_reg_adcc3 {
-+      PCF50633_ADCC3_ACCSW_EN         = 0x01,
-+      PCF50633_ADCC3_NTCSW_EN         = 0x04,
-+      PCF50633_ADCC3_RES_DIV_TWO      = 0x10,
-+      PCF50633_ADCC3_RES_DIV_THREE    = 0x00,
-+};
-+
-+enum pcf50633_reg_adcs3 {
-+      PCF50633_ADCS3_REF_NTCSW        = 0x00,
-+      PCF50633_ADCS3_REF_ACCSW        = 0x10,
-+      PCF50633_ADCS3_REF_2V0          = 0x20,
-+      PCF50633_ADCS3_REF_VISA         = 0x30,
-+      PCF50633_ADCS3_REF_2V0_2        = 0x70,
-+      PCF50633_ADCS3_ADCRDY           = 0x80,
-+};
-+#define PCF50633_ADCS3_ADCDAT1L_MASK  0x03
-+#define PCF50633_ADCS3_ADCDAT2L_MASK  0x0c
-+#define PCF50633_ADCS3_ADCDAT2L_SHIFT 2
-+#define PCF50633_ASCS3_REF_MASK               0x70
-+
-+enum pcf50633_regulator_enable {
-+      PCF50633_REGULATOR_ON           = 0x01,
-+      PCF50633_REGULATOR_ON_GPIO1     = 0x02,
-+      PCF50633_REGULATOR_ON_GPIO2     = 0x04,
-+      PCF50633_REGULATOR_ON_GPIO3     = 0x08,
-+};
-+#define PCF50633_REGULATOR_ON_MASK    0x0f
-+
-+enum pcf50633_regulator_phase {
-+      PCF50633_REGULATOR_ACTPH1       = 0x00,
-+      PCF50633_REGULATOR_ACTPH2       = 0x10,
-+      PCF50633_REGULATOR_ACTPH3       = 0x20,
-+      PCF50633_REGULATOR_ACTPH4       = 0x30,
-+};
-+#define PCF50633_REGULATOR_ACTPH_MASK 0x30
-+
-+enum pcf50633_reg_gpocfg {
-+      PCF50633_GPOCFG_GPOSEL_0        = 0x00,
-+      PCF50633_GPOCFG_GPOSEL_LED_NFET = 0x01,
-+      PCF50633_GPOCFG_GPOSEL_SYSxOK   = 0x02,
-+      PCF50633_GPOCFG_GPOSEL_CLK32K   = 0x03,
-+      PCF50633_GPOCFG_GPOSEL_ADAPUSB  = 0x04,
-+      PCF50633_GPOCFG_GPOSEL_USBxOK   = 0x05,
-+      PCF50633_GPOCFG_GPOSEL_ACTPH4   = 0x06,
-+      PCF50633_GPOCFG_GPOSEL_1        = 0x07,
-+      PCF50633_GPOCFG_GPOSEL_INVERSE  = 0x08,
-+};
-+#define PCF50633_GPOCFG_GPOSEL_MASK   0x07
-+
-+#if 0
-+enum pcf50633_reg_mbcc1 {
-+      PCF50633_MBCC1_CHGENA           = 0x01,
-+      PCF50633_MBCC1_AUTOSTOP         = 0x02,
-+      PCF50633_MBCC1_AUTORES          = 0x04,
-+      PCF50633_MBCC1_RESUME           = 0x08,
-+      PCF50633_MBCC1_RESTART          = 0x10,
-+      PCF50633_MBCC1_PREWDTIME_30MIN  = 0x00,
-+      PCF50633_MBCC1_PREWDTIME_60MIN  = 0x20,
-+      PCF50633_MBCC1_WDTIME_2HRS      = 0x40,
-+      PCF50633_MBCC1_WDTIME_4HRS      = 0x80,
-+      PCF50633_MBCC1_WDTIME_6HRS      = 0xc0,
-+};
-+
-+enum pcf50633_reg_mbcc2 {
-+      PCF50633_MBCC2_VBATCOND_2V7     = 0x00,
-+      PCF50633_MBCC2_VBATCOND_2V85    = 0x01,
-+      PCF50633_MBCC2_VBATCOND_3V0     = 0x02,
-+      PCF50633_MBCC2_VBATCOND_3V15    = 0x03,
-+      PCF50633_MBCC2_VRESDEBTIME_64S  = 0x80,
-+};
-+#define PCF50633_MBCC2_VMAX_MASK      0x3c
-+#endif
-+
-+enum pcf50633_reg_mbcc7 {
-+      PCF50633_MBCC7_USB_100mA        = 0x00,
-+      PCF50633_MBCC7_USB_500mA        = 0x01,
-+      PCF50633_MBCC7_USB_1000mA       = 0x02,
-+      PCF50633_MBCC7_USB_SUSPEND      = 0x03,
-+      PCF50633_MBCC7_BATTEMP_EN       = 0x04,
-+      PCF50633_MBCC7_BATSYSIMAX_1A6   = 0x00,
-+      PCF50633_MBCC7_BATSYSIMAX_1A8   = 0x40,
-+      PCF50633_MBCC7_BATSYSIMAX_2A0   = 0x80,
-+      PCF50633_MBCC7_BATSYSIMAX_2A2   = 0xc0,
-+};
-+#define PCF56033_MBCC7_USB_MASK               0x03
-+
-+enum pcf50633_reg_mbcc8 {
-+      PCF50633_MBCC8_USBENASUS        = 0x10,
-+};
-+
-+enum pcf50633_reg_mbcs1 {
-+      PCF50633_MBCS1_USBPRES          = 0x01,
-+      PCF50633_MBCS1_USBOK            = 0x02,
-+      PCF50633_MBCS1_ADAPTPRES        = 0x04,
-+      PCF50633_MBCS1_ADAPTOK          = 0x08,
-+      PCF50633_MBCS1_TBAT_OK          = 0x00,
-+      PCF50633_MBCS1_TBAT_ABOVE       = 0x10,
-+      PCF50633_MBCS1_TBAT_BELOW       = 0x20,
-+      PCF50633_MBCS1_TBAT_UNDEF       = 0x30,
-+      PCF50633_MBCS1_PREWDTEXP        = 0x40,
-+      PCF50633_MBCS1_WDTEXP           = 0x80,
-+};
-+
-+enum pcf50633_reg_mbcs2_mbcmod {
-+      PCF50633_MBCS2_MBC_PLAY         = 0x00,
-+      PCF50633_MBCS2_MBC_USB_PRE      = 0x01,
-+      PCF50633_MBCS2_MBC_USB_PRE_WAIT = 0x02,
-+      PCF50633_MBCS2_MBC_USB_FAST     = 0x03,
-+      PCF50633_MBCS2_MBC_USB_FAST_WAIT= 0x04,
-+      PCF50633_MBCS2_MBC_USB_SUSPEND  = 0x05,
-+      PCF50633_MBCS2_MBC_ADP_PRE      = 0x06,
-+      PCF50633_MBCS2_MBC_ADP_PRE_WAIT = 0x07,
-+      PCF50633_MBCS2_MBC_ADP_FAST     = 0x08,
-+      PCF50633_MBCS2_MBC_ADP_FAST_WAIT= 0x09,
-+      PCF50633_MBCS2_MBC_BAT_FULL     = 0x0a,
-+      PCF50633_MBCS2_MBC_HALT         = 0x0b,
-+};
-+#define PCF50633_MBCS2_MBC_MASK               0x0f
-+enum pcf50633_reg_mbcs2_chgstat {
-+      PCF50633_MBCS2_CHGS_NONE        = 0x00,
-+      PCF50633_MBCS2_CHGS_ADAPTER     = 0x10,
-+      PCF50633_MBCS2_CHGS_USB         = 0x20,
-+      PCF50633_MBCS2_CHGS_BOTH        = 0x30,
-+};
-+#define PCF50633_MBCS2_RESSTAT_AUTO   0x40
-+
-+enum pcf50633_reg_mbcs3 {
-+      PCF50633_MBCS3_USBLIM_PLAY      = 0x01,
-+      PCF50633_MBCS3_USBLIM_CGH       = 0x02,
-+      PCF50633_MBCS3_TLIM_PLAY        = 0x04,
-+      PCF50633_MBCS3_TLIM_CHG         = 0x08,
-+      PCF50633_MBCS3_ILIM             = 0x10, /* 1: Ibat > Icutoff */
-+      PCF50633_MBCS3_VLIM             = 0x20, /* 1: Vbat == Vmax */
-+      PCF50633_MBCS3_VBATSTAT         = 0x40, /* 1: Vbat > Vbatcond */
-+      PCF50633_MBCS3_VRES             = 0x80, /* 1: Vbat > Vth(RES) */
-+};
-+
-+/* this is to be provided by the board implementation */
-+extern const u_int8_t pcf50633_initial_regs[__NUM_PCF50633_REGS];
-+
-+void pcf50633_reg_write(u_int8_t reg, u_int8_t val);
-+
-+u_int8_t pcf50633_reg_read(u_int8_t reg);
-+
-+void pcf50633_reg_set_bit_mask(u_int8_t reg, u_int8_t mask, u_int8_t val);
-+void pcf50633_reg_clear_bits(u_int8_t reg, u_int8_t bits);
-+
-+void pcf50633_charge_autofast(int on);
-+
-+#endif /* _PCF50606_H */
-+
-diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
-index a089554..ee60156 100644
---- a/include/linux/i2c-id.h
-+++ b/include/linux/i2c-id.h
-@@ -169,6 +169,7 @@
- #define I2C_DRIVERID_OV7670 1048      /* Omnivision 7670 camera */
- #define I2C_DRIVERID_PCF50606 1049
- #define I2C_DRIVERID_TSL256X 1050
-+#define I2C_DRIVERID_PCF50633 1051
- /*
-  * ---- Adapter types ----------------------------------------------------
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-new file mode 100644
-index 0000000..5f32004
---- /dev/null
-+++ b/include/linux/pcf50633.h
-@@ -0,0 +1,114 @@
-+#ifndef _LINUX_PCF50633_H
-+#define _LINUX_PCF50633_H
-+
-+/* public in-kernel pcf50633 api */
-+enum pcf50633_regulator_id {
-+      PCF50633_REGULATOR_AUTO,
-+      PCF50633_REGULATOR_DOWN1,
-+      PCF50633_REGULATOR_DOWN2,
-+      PCF50633_REGULATOR_MEMLDO,
-+      PCF50633_REGULATOR_LDO1,
-+      PCF50633_REGULATOR_LDO2,
-+      PCF50633_REGULATOR_LDO3,
-+      PCF50633_REGULATOR_LDO4,
-+      PCF50633_REGULATOR_LDO5,
-+      PCF50633_REGULATOR_LDO6,
-+      PCF50633_REGULATOR_HCLDO,
-+      __NUM_PCF50633_REGULATORS
-+};
-+
-+struct pcf50633_data;
-+extern struct pcf50633_data *pcf50633_global;
-+
-+extern void
-+pcf50633_go_standby(void);
-+
-+enum pcf50633_gpio {
-+      PCF50633_GPIO1 = 1,
-+      PCF50633_GPIO2 = 2,
-+      PCF50633_GPIO3 = 3,
-+      PCF50633_GPO = 4,
-+};
-+
-+extern void
-+pcf50633_gpio_set(struct pcf50633_data *pcf, enum pcf50633_gpio gpio, int on);
-+
-+extern int
-+pcf50633_gpio_get(struct pcf50633_data *pcf, enum pcf50633_gpio gpio);
-+
-+extern int
-+pcf50633_voltage_set(struct pcf50633_data *pcf,
-+                   enum pcf50633_regulator_id reg,
-+                   unsigned int millivolts);
-+extern unsigned int
-+pcf50633_voltage_get(struct pcf50633_data *pcf,
-+                   enum pcf50633_regulator_id reg);
-+extern int
-+pcf50633_onoff_get(struct pcf50633_data *pcf,
-+                 enum pcf50633_regulator_id reg);
-+
-+extern int
-+pcf50633_onoff_set(struct pcf50633_data *pcf,
-+                 enum pcf50633_regulator_id reg, int on);
-+
-+extern void
-+pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma);
-+
-+extern void
-+pcf50633_charge_enable(struct pcf50633_data *pcf, int on);
-+
-+/* FIXME: sharded with pcf50606 */
-+#define PMU_VRAIL_F_SUSPEND_ON        0x00000001      /* Remains on during suspend */
-+#define PMU_VRAIL_F_UNUSED    0x00000002      /* This rail is not used */
-+struct pmu_voltage_rail {
-+      char *name;
-+      unsigned int flags;
-+      struct {
-+              unsigned int init;
-+              unsigned int max;
-+      } voltage;
-+};
-+
-+enum pmu_event {
-+      PMU_EVT_NONE,
-+      PMU_EVT_INSERT,
-+      PMU_EVT_REMOVE,
-+      PMU_EVT_USB_INSERT,
-+      PMU_EVT_USB_REMOVE,
-+      __NUM_PMU_EVTS
-+};
-+
-+typedef int pmu_cb(struct device *dev, unsigned int feature,
-+                 enum pmu_event event);
-+
-+#define PCF50633_FEAT_EXTON   0x00000001      /* not yet supported */
-+#define PCF50633_FEAT_MBC     0x00000002
-+#define PCF50633_FEAT_BBC     0x00000004      /* not yet supported */
-+#define PCF50633_FEAT_RTC     0x00000040
-+#define PCF50633_FEAT_CHGCUR  0x00000100
-+#define PCF50633_FEAT_BATVOLT 0x00000200
-+#define PCF50633_FEAT_BATTEMP 0x00000400
-+#define PCF50633_FEAT_PWM_BL  0x00000800
-+
-+struct pcf50633_platform_data {
-+      /* general */
-+      unsigned int used_features;
-+      unsigned int onkey_seconds_sig_init;
-+      unsigned int onkey_seconds_shutdown;
-+
-+      /* voltage regulator related */
-+      struct pmu_voltage_rail rails[__NUM_PCF50633_REGULATORS];
-+      unsigned int used_regulators;
-+
-+      /* charger related */
-+      unsigned int r_fix_batt;
-+      unsigned int r_fix_batt_par;
-+      unsigned int r_sense_milli;
-+
-+      struct {
-+              u_int8_t mbcc3; /* charger voltage / current */
-+      } charger;
-+      pmu_cb *cb;
-+};
-+
-+#endif /* _PCF50633_H */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1032-pcf50633-suspend-hacks.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1032-pcf50633-suspend-hacks.patch.patch
deleted file mode 100644 (file)
index 4c38899..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-From 56b25d1ddc3662594f9344bac89f08bcf993cc61 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:34:44 +0100
-Subject: [PATCH] pcf50633-suspend-hacks.patch
-
----
- drivers/i2c/chips/pcf50633.c |   22 ++++++++++++++++++++--
- 1 files changed, 20 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 5488084..0cf5e53 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -567,8 +567,26 @@ static void pcf50633_work(struct work_struct *work)
-        */
-       ret = i2c_smbus_read_i2c_block_data(&pcf->client, PCF50633_REG_INT1, 5,
-                                           pcfirq);
--      if (ret != 5)
--              DEBUGP("Oh crap PMU IRQ register read failed %d\n", ret);
-+      if (ret != 5) {
-+              DEBUGP("Oh crap PMU IRQ register read failed -- "
-+                     "retrying later %d\n", ret);
-+              /*
-+               * this situation can happen during resume, just defer
-+               * handling the interrupt until enough I2C is up we can
-+               * actually talk to the PMU.  We can't just ignore this
-+               * because we are on a falling edge interrupt and our
-+               * PMU interrupt source does not clear until we read these
-+               * interrupt source registers.
-+               */
-+              if (!schedule_work(&pcf->work) && !pcf->working)
-+                      dev_dbg(&pcf->client.dev, "work item may be lost\n");
-+
-+              /* we don't put the device here, hold it for next time */
-+              mutex_unlock(&pcf->working_lock);
-+              /* don't spew, delaying whatever else is happening */
-+              msleep(1);
-+              return;
-+      }
-       if (!pcf->coldplug_done) {
-               DEBUGP("PMU Coldplug init\n");
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1033-smedia-glamo.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1033-smedia-glamo.patch.patch
deleted file mode 100644 (file)
index 0e15f3e..0000000
+++ /dev/null
@@ -1,3498 +0,0 @@
-From f9fc3f480aeb1fdfcdefdd3c560d06c8297c758b Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:34:54 +0100
-Subject: [PATCH] smedia-glamo.patch
- [ FIXME:
-  include/asm-arm/arch-s3c2410/irqs.h shouldn't contain device-specific
-  changes. ]
-
-This is a Linux kernel driver for the Smedia Glamo336x / Glamo337x
-multi-function peripheral device.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- drivers/mfd/Kconfig                 |    2 +
- drivers/mfd/Makefile                |    1 +
- drivers/mfd/glamo/Kconfig           |   35 ++
- drivers/mfd/glamo/Makefile          |   11 +
- drivers/mfd/glamo/glamo-core.c      | 1151 +++++++++++++++++++++++++++++++++++
- drivers/mfd/glamo/glamo-core.h      |   91 +++
- drivers/mfd/glamo/glamo-fb.c        |  822 +++++++++++++++++++++++++
- drivers/mfd/glamo/glamo-gpio.c      |   62 ++
- drivers/mfd/glamo/glamo-lcm-spi.c   |  241 ++++++++
- drivers/mfd/glamo/glamo-regs.h      |  477 +++++++++++++++
- drivers/mfd/glamo/glamo-spi-gpio.c  |  256 ++++++++
- include/asm-arm/arch-s3c2410/irqs.h |   32 +-
- include/linux/glamo-gpio.h          |   99 +++
- include/linux/glamofb.h             |   39 ++
- include/linux/spi/glamo.h           |   28 +
- 15 files changed, 3345 insertions(+), 2 deletions(-)
- create mode 100644 drivers/mfd/glamo/Kconfig
- create mode 100644 drivers/mfd/glamo/Makefile
- create mode 100644 drivers/mfd/glamo/glamo-core.c
- create mode 100644 drivers/mfd/glamo/glamo-core.h
- create mode 100644 drivers/mfd/glamo/glamo-fb.c
- create mode 100644 drivers/mfd/glamo/glamo-gpio.c
- create mode 100644 drivers/mfd/glamo/glamo-lcm-spi.c
- create mode 100644 drivers/mfd/glamo/glamo-regs.h
- create mode 100644 drivers/mfd/glamo/glamo-spi-gpio.c
- create mode 100644 include/linux/glamo-gpio.h
- create mode 100644 include/linux/glamofb.h
- create mode 100644 include/linux/spi/glamo.h
-
-diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
-index 2571619..fe06f8e 100644
---- a/drivers/mfd/Kconfig
-+++ b/drivers/mfd/Kconfig
-@@ -15,6 +15,8 @@ config MFD_SM501
-         interface. The device may be connected by PCI or local bus with
-         varying functions enabled.
-+source "drivers/mfd/glamo/Kconfig"
-+
- endmenu
- menu "Multimedia Capabilities Port drivers"
-diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
-index 5143209..a2da091 100644
---- a/drivers/mfd/Makefile
-+++ b/drivers/mfd/Makefile
-@@ -3,6 +3,7 @@
- #
- obj-$(CONFIG_MFD_SM501)               += sm501.o
-+obj-$(CONFIG_MFD_GLAMO)               += glamo/
- obj-$(CONFIG_MCP)             += mcp-core.o
- obj-$(CONFIG_MCP_SA11X0)      += mcp-sa11x0.o
-diff --git a/drivers/mfd/glamo/Kconfig b/drivers/mfd/glamo/Kconfig
-new file mode 100644
-index 0000000..b99f2b2
---- /dev/null
-+++ b/drivers/mfd/glamo/Kconfig
-@@ -0,0 +1,35 @@
-+config MFD_GLAMO
-+      bool "Smedia Glamo 336x/337x support"
-+      help
-+        This enables the core driver for the Smedia Glamo 336x/337x
-+        multi-function device.  It includes irq_chip demultiplex as
-+        well as clock / power management and GPIO support.
-+
-+config MFD_GLAMO_FB
-+      tristate "Smedia Glamo 336x/337x framebuffer support"
-+      depends on FB && MFD_GLAMO
-+      help
-+        Frame buffer driver for the LCD controller in the Smedia Glamo
-+        336x/337x.
-+
-+        This driver is also available as a module ( = code which can be
-+        inserted and removed from the running kernel whenever you want). The
-+        module will be called glamofb. If you want to compile it as a module,
-+        say M here and read <file:Documentation/modules.txt>.
-+
-+        If unsure, say N.
-+
-+config MFD_GLAMO_SPI_GPIO
-+       tristate "Glamo GPIO SPI bitbang support"
-+       depends on MFD_GLAMO
-+       help
-+         Enable a bitbanging SPI adapter driver for the Smedia Glamo.
-+
-+config MFD_GLAMO_SPI_FB
-+       tristate "Glamo LCM control channel SPI support"
-+       depends on MFD_GLAMO_FB
-+       help
-+         Enable a bitbanging SPI adapter driver for the Smedia Glamo LCM
-+       control channel.  This SPI interface is frequently used to
-+       interconnect the LCM control interface.
-+
-diff --git a/drivers/mfd/glamo/Makefile b/drivers/mfd/glamo/Makefile
-new file mode 100644
-index 0000000..fb53982
---- /dev/null
-+++ b/drivers/mfd/glamo/Makefile
-@@ -0,0 +1,11 @@
-+#
-+# Makefile for the Smedia Glamo framebuffer driver
-+#
-+
-+obj-$(CONFIG_MFD_GLAMO)                       += glamo-core.o glamo-gpio.o
-+obj-$(CONFIG_MFD_GLAMO_SPI)           += glamo-spi.o
-+obj-$(CONFIG_MFD_GLAMO_SPI_GPIO)      += glamo-spi-gpio.o
-+
-+obj-$(CONFIG_MFD_GLAMO_FB)            += glamo-fb.o
-+obj-$(CONFIG_MFD_GLAMO_SPI_FB)                += glamo-lcm-spi.o
-+
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-new file mode 100644
-index 0000000..acf545f
---- /dev/null
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -0,0 +1,1151 @@
-+/* Smedia Glamo 336x/337x driver
-+ *
-+ * (C) 2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/errno.h>
-+#include <linux/string.h>
-+#include <linux/mm.h>
-+#include <linux/tty.h>
-+#include <linux/slab.h>
-+#include <linux/delay.h>
-+#include <linux/fb.h>
-+#include <linux/init.h>
-+#include <linux/irq.h>
-+#include <linux/interrupt.h>
-+#include <linux/workqueue.h>
-+#include <linux/wait.h>
-+#include <linux/platform_device.h>
-+#include <linux/kernel_stat.h>
-+#include <linux/spinlock.h>
-+#include <linux/glamofb.h>
-+#include <linux/mmc/mmc.h>
-+#include <linux/mmc/host.h>
-+
-+#include <asm/io.h>
-+#include <asm/uaccess.h>
-+#include <asm/div64.h>
-+
-+#ifdef CONFIG_PM
-+#include <linux/pm.h>
-+#endif
-+
-+#include "glamo-regs.h"
-+#include "glamo-core.h"
-+
-+#define RESSIZE(ressource) (((ressource)->end - (ressource)->start)+1)
-+
-+static struct glamo_core *glamo_handle;
-+
-+static inline void __reg_write(struct glamo_core *glamo,
-+                              u_int16_t reg, u_int16_t val)
-+{
-+      writew(val, glamo->base + reg);
-+}
-+
-+static inline u_int16_t __reg_read(struct glamo_core *glamo,
-+                                 u_int16_t reg)
-+{
-+      return readw(glamo->base + reg);
-+}
-+
-+static void __reg_set_bit_mask(struct glamo_core *glamo,
-+                              u_int16_t reg, u_int16_t mask,
-+                              u_int16_t val)
-+{
-+      u_int16_t tmp;
-+
-+      val &= mask;
-+
-+      tmp = __reg_read(glamo, reg);
-+      tmp &= ~mask;
-+      tmp |= val;
-+      __reg_write(glamo, reg, tmp);
-+}
-+
-+static void reg_set_bit_mask(struct glamo_core *glamo,
-+                              u_int16_t reg, u_int16_t mask,
-+                              u_int16_t val)
-+{
-+      spin_lock(&glamo->lock);
-+      __reg_set_bit_mask(glamo, reg, mask, val);
-+      spin_unlock(&glamo->lock);
-+}
-+
-+static inline void __reg_set_bit(struct glamo_core *glamo,
-+                               u_int16_t reg, u_int16_t bit)
-+{
-+      __reg_set_bit_mask(glamo, reg, bit, 0xffff);
-+}
-+
-+static inline void __reg_clear_bit(struct glamo_core *glamo,
-+                                 u_int16_t reg, u_int16_t bit)
-+{
-+      __reg_set_bit_mask(glamo, reg, bit, 0);
-+}
-+
-+static inline void glamo_vmem_write(struct glamo_core *glamo, u_int32_t addr,
-+                                  u_int16_t *src, int len)
-+{
-+      if (addr & 0x0001 || (unsigned long)src & 0x0001 || len & 0x0001) {
-+              dev_err(&glamo->pdev->dev, "unaligned write(0x%08x, 0x%p, "
-+                      "0x%x)!!\n", addr, src, len);
-+      }
-+
-+}
-+
-+static inline void glamo_vmem_read(struct glamo_core *glamo, u_int16_t *buf,
-+                                 u_int32_t addr, int len)
-+{
-+      if (addr & 0x0001 || (unsigned long) buf & 0x0001 || len & 0x0001) {
-+              dev_err(&glamo->pdev->dev, "unaligned read(0x%p, 0x08%x, "
-+                      "0x%x)!!\n", buf, addr, len);
-+      }
-+
-+
-+}
-+
-+/***********************************************************************
-+ * resources of sibling devices
-+ ***********************************************************************/
-+
-+#if 0
-+static struct resource glamo_core_resources[] = {
-+      {
-+              .start  = GLAMO_REGOFS_GENERIC,
-+              .end    = GLAMO_REGOFS_GENERIC + 0x400,
-+              .flags  = IORESOURCE_MEM,
-+      }, {
-+              .start  = 0,
-+              .end    = 0,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct platform_device glamo_core_dev = {
-+      .name           = "glamo-core",
-+      .resource       = &glamo_core_resources,
-+      .num_resources  = ARRAY_SIZE(glamo_core_resources),
-+};
-+#endif
-+
-+static struct resource glamo_jpeg_resources[] = {
-+      {
-+              .start  = GLAMO_REGOFS_JPEG,
-+              .end    = GLAMO_REGOFS_MPEG - 1,
-+              .flags  = IORESOURCE_MEM,
-+      }, {
-+              .start  = IRQ_GLAMO_JPEG,
-+              .end    = IRQ_GLAMO_JPEG,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct platform_device glamo_jpeg_dev = {
-+      .name           = "glamo-jpeg",
-+      .resource       = glamo_jpeg_resources,
-+      .num_resources  = ARRAY_SIZE(glamo_jpeg_resources),
-+};
-+
-+static struct resource glamo_mpeg_resources[] = {
-+      {
-+              .start  = GLAMO_REGOFS_MPEG,
-+              .end    = GLAMO_REGOFS_LCD - 1,
-+              .flags  = IORESOURCE_MEM,
-+      }, {
-+              .start  = IRQ_GLAMO_MPEG,
-+              .end    = IRQ_GLAMO_MPEG,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct platform_device glamo_mpeg_dev = {
-+      .name           = "glamo-mpeg",
-+      .resource       = glamo_mpeg_resources,
-+      .num_resources  = ARRAY_SIZE(glamo_mpeg_resources),
-+};
-+
-+static struct resource glamo_2d_resources[] = {
-+      {
-+              .start  = GLAMO_REGOFS_2D,
-+              .end    = GLAMO_REGOFS_3D - 1,
-+              .flags  = IORESOURCE_MEM,
-+      }, {
-+              .start  = IRQ_GLAMO_2D,
-+              .end    = IRQ_GLAMO_2D,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct platform_device glamo_2d_dev = {
-+      .name           = "glamo-2d",
-+      .resource       = glamo_2d_resources,
-+      .num_resources  = ARRAY_SIZE(glamo_2d_resources),
-+};
-+
-+static struct resource glamo_3d_resources[] = {
-+      {
-+              .start  = GLAMO_REGOFS_3D,
-+              .end    = GLAMO_REGOFS_END - 1,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+};
-+
-+static struct platform_device glamo_3d_dev = {
-+      .name           = "glamo-3d",
-+      .resource       = glamo_3d_resources,
-+      .num_resources  = ARRAY_SIZE(glamo_3d_resources),
-+};
-+
-+static struct platform_device glamo_spigpio_dev = {
-+      .name           = "glamo-spi-gpio",
-+};
-+
-+static struct resource glamo_fb_resources[] = {
-+      /* FIXME: those need to be incremented by parent base */
-+      {
-+              .name   = "glamo-fb-regs",
-+              .start  = GLAMO_REGOFS_LCD,
-+              .end    = GLAMO_REGOFS_MMC - 1,
-+              .flags  = IORESOURCE_MEM,
-+      }, {
-+              .name   = "glamo-fb-mem",
-+              .start  = GLAMO_OFFSET_FB,
-+              .end    = GLAMO_OFFSET_FB + GLAMO_FB_SIZE - 1,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+};
-+
-+static struct platform_device glamo_fb_dev = {
-+      .name           = "glamo-fb",
-+      .resource       = glamo_fb_resources,
-+      .num_resources  = ARRAY_SIZE(glamo_fb_resources),
-+};
-+
-+static struct resource glamo_mmc_resources[] = {
-+      {
-+              /* FIXME: those need to be incremented by parent base */
-+              .start  = GLAMO_REGOFS_MMC,
-+              .end    = GLAMO_REGOFS_MPROC0 - 1,
-+              .flags  = IORESOURCE_MEM
-+      }, {
-+              .start  = IRQ_GLAMO_MMC,
-+              .end    = IRQ_GLAMO_MMC,
-+              .flags  = IORESOURCE_IRQ,
-+      }, { /* our data buffer for MMC transfers */
-+              .start  = GLAMO_OFFSET_FB + GLAMO_FB_SIZE,
-+              .end    = GLAMO_OFFSET_FB + GLAMO_FB_SIZE +
-+                                GLAMO_MMC_BUFFER_SIZE - 1,
-+              .flags  = IORESOURCE_MEM
-+      },
-+};
-+
-+static struct platform_device glamo_mmc_dev = {
-+      .name           = "glamo-mci",
-+      .resource       = glamo_mmc_resources,
-+      .num_resources  = ARRAY_SIZE(glamo_mmc_resources),
-+};
-+
-+struct glamo_mci_pdata glamo_mci_def_pdata = {
-+      .gpio_detect            = 0,
-+      .glamo_set_mci_power    = NULL, /* filled in from MFD platform data */
-+      .ocr_avail              = MMC_VDD_32_33,
-+      .glamo_irq_is_wired     = NULL, /* filled in from MFD platform data */
-+};
-+EXPORT_SYMBOL_GPL(glamo_mci_def_pdata);
-+
-+
-+
-+static void mangle_mem_resources(struct resource *res, int num_res,
-+                               struct resource *parent)
-+{
-+      int i;
-+
-+      for (i = 0; i < num_res; i++) {
-+              if (res[i].flags != IORESOURCE_MEM)
-+                      continue;
-+              res[i].start += parent->start;
-+              res[i].end += parent->start;
-+              res[i].parent = parent;
-+      }
-+}
-+
-+/***********************************************************************
-+ * IRQ demultiplexer
-+ ***********************************************************************/
-+#define irq2glamo(x)  (x - IRQ_GLAMO(0))
-+
-+static void glamo_ack_irq(unsigned int irq)
-+{
-+      /* clear interrupt source */
-+      __reg_write(glamo_handle, GLAMO_REG_IRQ_CLEAR,
-+                  1 << irq2glamo(irq));
-+}
-+
-+static void glamo_mask_irq(unsigned int irq)
-+{
-+      u_int16_t tmp;
-+
-+      /* clear bit in enable register */
-+      tmp = __reg_read(glamo_handle, GLAMO_REG_IRQ_ENABLE);
-+      tmp &= ~(1 << irq2glamo(irq));
-+      __reg_write(glamo_handle, GLAMO_REG_IRQ_ENABLE, tmp);
-+}
-+
-+static void glamo_unmask_irq(unsigned int irq)
-+{
-+      u_int16_t tmp;
-+
-+      /* set bit in enable register */
-+      tmp = __reg_read(glamo_handle, GLAMO_REG_IRQ_ENABLE);
-+      tmp |= (1 << irq2glamo(irq));
-+      __reg_write(glamo_handle, GLAMO_REG_IRQ_ENABLE, tmp);
-+}
-+
-+static struct irq_chip glamo_irq_chip = {
-+      .ack    = glamo_ack_irq,
-+      .mask   = glamo_mask_irq,
-+      .unmask = glamo_unmask_irq,
-+};
-+
-+static void glamo_irq_demux_handler(unsigned int irq, struct irq_desc *desc)
-+{
-+      const unsigned int cpu = smp_processor_id();
-+
-+      spin_lock(&desc->lock);
-+
-+      desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
-+
-+      if (unlikely(desc->status & IRQ_INPROGRESS)) {
-+              desc->status |= (IRQ_PENDING | IRQ_MASKED);
-+              desc->chip->mask(irq);
-+              desc->chip->ack(irq);
-+              goto out_unlock;
-+      }
-+
-+      kstat_cpu(cpu).irqs[irq]++;
-+      desc->chip->ack(irq);
-+      desc->status |= IRQ_INPROGRESS;
-+
-+      do {
-+              u_int16_t irqstatus;
-+              int i;
-+
-+              if (unlikely((desc->status &
-+                              (IRQ_PENDING | IRQ_MASKED | IRQ_DISABLED)) ==
-+                              (IRQ_PENDING | IRQ_MASKED))) {
-+                      /* dealing with pending IRQ, unmasking */
-+                      desc->chip->unmask(irq);
-+                      desc->status &= ~IRQ_MASKED;
-+              }
-+
-+              desc->status &= ~IRQ_PENDING;
-+
-+              /* read IRQ status register */
-+              irqstatus = __reg_read(glamo_handle, GLAMO_REG_IRQ_STATUS);
-+              for (i = 0; i < 9; i++)
-+                      if (irqstatus & (1 << i))
-+                              desc_handle_irq(IRQ_GLAMO(i),
-+                                  irq_desc+IRQ_GLAMO(i));
-+
-+      } while ((desc->status & (IRQ_PENDING | IRQ_DISABLED)) == IRQ_PENDING);
-+
-+      desc->status &= ~IRQ_INPROGRESS;
-+
-+out_unlock:
-+      spin_unlock(&desc->lock);
-+}
-+
-+/***********************************************************************
-+ * 'engine' support
-+ ***********************************************************************/
-+
-+int glamo_engine_enable(struct glamo_core *glamo, enum glamo_engine engine)
-+{
-+      spin_lock(&glamo->lock);
-+      switch (engine) {
-+      case GLAMO_ENGINE_LCD:
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_LCD,
-+                          GLAMO_CLOCK_LCD_EN_M5CLK |
-+                          GLAMO_CLOCK_LCD_EN_DHCLK |
-+                          GLAMO_CLOCK_LCD_EN_DMCLK |
-+                          GLAMO_CLOCK_LCD_EN_DCLK |
-+                          GLAMO_CLOCK_LCD_DG_M5CLK |
-+                          GLAMO_CLOCK_LCD_DG_DMCLK, 0xffff);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_GEN5_1,
-+                          GLAMO_CLOCK_GEN51_EN_DIV_DHCLK |
-+                          GLAMO_CLOCK_GEN51_EN_DIV_DMCLK |
-+                          GLAMO_CLOCK_GEN51_EN_DIV_DCLK, 0xffff);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_HOSTBUS(2),
-+                          GLAMO_HOSTBUS2_MMIO_EN_LCD,
-+                          0xffff);
-+              break;
-+      case GLAMO_ENGINE_MMC:
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_MMC,
-+                                 GLAMO_CLOCK_MMC_EN_M9CLK |
-+                                 GLAMO_CLOCK_MMC_EN_TCLK |
-+                                 GLAMO_CLOCK_MMC_DG_M9CLK |
-+                                 GLAMO_CLOCK_MMC_DG_TCLK, 0xffff);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_HOSTBUS(2),
-+                                 GLAMO_HOSTBUS2_MMIO_EN_MMC,
-+                                 GLAMO_HOSTBUS2_MMIO_EN_MMC);
-+              break;
-+      case GLAMO_ENGINE_2D:
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_2D,
-+                                 GLAMO_CLOCK_2D_EN_M7CLK |
-+                                 GLAMO_CLOCK_2D_EN_GCLK |
-+                                 GLAMO_CLOCK_2D_DG_M7CLK |
-+                                 GLAMO_CLOCK_2D_DG_GCLK, 0xffff);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_HOSTBUS(2),
-+                                 GLAMO_HOSTBUS2_MMIO_EN_2D,
-+                                 GLAMO_HOSTBUS2_MMIO_EN_2D);
-+              break;
-+      case GLAMO_ENGINE_CMDQ:
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_2D,
-+                                 GLAMO_CLOCK_2D_EN_M6CLK, 0xffff);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_HOSTBUS(2),
-+                                 GLAMO_HOSTBUS2_MMIO_EN_CQ,
-+                                 GLAMO_HOSTBUS2_MMIO_EN_CQ);
-+              break;
-+      /* FIXME: Implementation */
-+      default:
-+              break;
-+      }
-+      spin_unlock(&glamo->lock);
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(glamo_engine_enable);
-+
-+int glamo_engine_disable(struct glamo_core *glamo, enum glamo_engine engine)
-+{
-+      spin_lock(&glamo->lock);
-+      switch (engine) {
-+      /* FIXME: Implementation */
-+      default:
-+              break;
-+      }
-+      spin_unlock(&glamo->lock);
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(glamo_engine_disable);
-+
-+struct glamo_script reset_regs[] = {
-+      [GLAMO_ENGINE_LCD] = {
-+              GLAMO_REG_CLOCK_LCD, GLAMO_CLOCK_LCD_RESET
-+      },
-+#if 0
-+      [GLAMO_ENGINE_HOST] = {
-+              GLAMO_REG_CLOCK_HOST, GLAMO_CLOCK_HOST_RESET
-+      },
-+      [GLAMO_ENGINE_MEM] = {
-+              GLAMO_REG_CLOCK_MEM, GLAMO_CLOCK_MEM_RESET
-+      },
-+#endif
-+      [GLAMO_ENGINE_MMC] = {
-+              GLAMO_REG_CLOCK_MMC, GLAMO_CLOCK_MMC_RESET
-+      },
-+      [GLAMO_ENGINE_2D] = {
-+              GLAMO_REG_CLOCK_2D, GLAMO_CLOCK_2D_RESET
-+      },
-+      [GLAMO_ENGINE_JPEG] = {
-+              GLAMO_REG_CLOCK_JPEG, GLAMO_CLOCK_JPEG_RESET
-+      },
-+};
-+
-+void glamo_engine_reset(struct glamo_core *glamo, enum glamo_engine engine)
-+{
-+      struct glamo_script *rst;
-+
-+      if (engine >= ARRAY_SIZE(reset_regs)) {
-+              dev_warn(&glamo->pdev->dev, "unknown engine %u ", engine);
-+              return;
-+      }
-+
-+      rst = &reset_regs[engine];
-+
-+      spin_lock(&glamo->lock);
-+      __reg_set_bit(glamo, rst->reg, rst->val);
-+      spin_unlock(&glamo->lock);
-+
-+      msleep(1);
-+
-+      spin_lock(&glamo->lock);
-+      __reg_clear_bit(glamo, rst->reg, rst->val);
-+      spin_unlock(&glamo->lock);
-+
-+      msleep(1);
-+}
-+EXPORT_SYMBOL_GPL(glamo_engine_reset);
-+
-+enum glamo_pll {
-+      GLAMO_PLL1,
-+      GLAMO_PLL2,
-+};
-+
-+static int glamo_pll_rate(struct glamo_core *glamo,
-+                        enum glamo_pll pll)
-+{
-+      u_int16_t reg;
-+      unsigned int div = 512;
-+      /* FIXME: move osci into platform_data */
-+      unsigned int osci = 32768;
-+
-+      if (osci == 32768)
-+              div = 1;
-+
-+      switch (pll) {
-+      case GLAMO_PLL1:
-+              reg = __reg_read(glamo, GLAMO_REG_PLL_GEN1);
-+              break;
-+      case GLAMO_PLL2:
-+              reg = __reg_read(glamo, GLAMO_REG_PLL_GEN3);
-+              break;
-+      default:
-+              return -EINVAL;
-+      }
-+      return (osci/div)*reg;
-+}
-+
-+int glamo_engine_reclock(struct glamo_core *glamo,
-+                       enum glamo_engine engine,
-+                       int ps)
-+{
-+      int pll, khz;
-+      u_int16_t reg, mask, val = 0;
-+
-+      if (!ps)
-+              return 0;
-+
-+      switch (engine) {
-+      case GLAMO_ENGINE_LCD:
-+              pll = GLAMO_PLL1;
-+              reg = GLAMO_REG_CLOCK_GEN7;
-+              mask = 0xff;
-+              break;
-+      default:
-+              dev_warn(&glamo->pdev->dev,
-+                       "reclock of engine 0x%x not supported\n", engine);
-+              return -EINVAL;
-+              break;
-+      }
-+
-+      pll = glamo_pll_rate(glamo, pll);
-+      khz = 1000000000UL / ps;
-+
-+      if (khz)
-+              val = (pll / khz) / 1000;
-+
-+      dev_dbg(&glamo->pdev->dev,
-+                      "PLL %d, kHZ %d, div %d\n", pll, khz, val);
-+
-+      if (val) {
-+              val--;
-+              reg_set_bit_mask(glamo, reg, mask, val);
-+              msleep(5); /* wait some time to stabilize */
-+
-+              return 0;
-+      } else {
-+              return -EINVAL;
-+      }
-+}
-+EXPORT_SYMBOL_GPL(glamo_engine_reclock);
-+
-+/***********************************************************************
-+ * script support
-+ ***********************************************************************/
-+
-+int glamo_run_script(struct glamo_core *glamo, struct glamo_script *script,
-+                   int len, int may_sleep)
-+{
-+      int i;
-+
-+      for (i = 0; i < len; i++) {
-+              struct glamo_script *line = &script[i];
-+
-+              switch (line->reg) {
-+              case 0xffff:
-+                      return 0;
-+              case 0xfffe:
-+                      if (may_sleep)
-+                              msleep(line->val);
-+                      else
-+                              mdelay(line->val);
-+                      break;
-+              case 0xfffd:
-+                      /* spin until PLLs lock */
-+                      while ((__reg_read(glamo, GLAMO_REG_PLL_GEN5) & 3) != 3)
-+                              ;
-+                      break;
-+              default:
-+                      __reg_write(glamo, script[i].reg, script[i].val);
-+                      break;
-+              }
-+      }
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL(glamo_run_script);
-+
-+static struct glamo_script glamo_init_script[] = {
-+      { GLAMO_REG_CLOCK_HOST,         0x1000 },
-+              { 0xfffe, 2 },
-+      { GLAMO_REG_CLOCK_MEMORY,       0x1000 },
-+      { GLAMO_REG_CLOCK_MEMORY,       0x2000 },
-+      { GLAMO_REG_CLOCK_LCD,          0x1000 },
-+      { GLAMO_REG_CLOCK_MMC,          0x1000 },
-+      { GLAMO_REG_CLOCK_ISP,          0x1000 },
-+      { GLAMO_REG_CLOCK_ISP,          0x3000 },
-+      { GLAMO_REG_CLOCK_JPEG,         0x1000 },
-+      { GLAMO_REG_CLOCK_3D,           0x1000 },
-+      { GLAMO_REG_CLOCK_3D,           0x3000 },
-+      { GLAMO_REG_CLOCK_2D,           0x1000 },
-+      { GLAMO_REG_CLOCK_2D,           0x3000 },
-+      { GLAMO_REG_CLOCK_RISC1,        0x1000 },
-+      { GLAMO_REG_CLOCK_MPEG,         0x3000 },
-+      { GLAMO_REG_CLOCK_MPEG,         0x3000 },
-+      { GLAMO_REG_CLOCK_MPROC,        0x1000 /*0x100f*/ },
-+              { 0xfffe, 2 },
-+      { GLAMO_REG_CLOCK_HOST,         0x0000 },
-+      { GLAMO_REG_CLOCK_MEMORY,       0x0000 },
-+      { GLAMO_REG_CLOCK_LCD,          0x0000 },
-+      { GLAMO_REG_CLOCK_MMC,          0x0000 },
-+#if 0
-+/* unused engines must be left in reset to stop MMC block read "blackouts" */
-+      { GLAMO_REG_CLOCK_ISP,          0x0000 },
-+      { GLAMO_REG_CLOCK_ISP,          0x0000 },
-+      { GLAMO_REG_CLOCK_JPEG,         0x0000 },
-+      { GLAMO_REG_CLOCK_3D,           0x0000 },
-+      { GLAMO_REG_CLOCK_3D,           0x0000 },
-+      { GLAMO_REG_CLOCK_2D,           0x0000 },
-+      { GLAMO_REG_CLOCK_2D,           0x0000 },
-+      { GLAMO_REG_CLOCK_RISC1,        0x0000 },
-+      { GLAMO_REG_CLOCK_MPEG,         0x0000 },
-+      { GLAMO_REG_CLOCK_MPEG,         0x0000 },
-+#endif
-+      { GLAMO_REG_PLL_GEN1,           0x05db },       /* 48MHz */
-+      { GLAMO_REG_PLL_GEN3,           0x09c3 },       /* 80MHz */
-+              { 0xfffd, 0 },
-+      /*
-+       * b9 of this register MUST be zero to get any interrupts on INT#
-+       * the other set bits enable all the engine interrupt sources
-+       */
-+      { GLAMO_REG_IRQ_ENABLE,         0x01ff },
-+      { GLAMO_REG_CLOCK_GEN6,         0x2000 },
-+      { GLAMO_REG_CLOCK_GEN7,         0x0101 },
-+      { GLAMO_REG_CLOCK_GEN8,         0x0100 },
-+      { GLAMO_REG_CLOCK_HOST,         0x000d },
-+      { 0x200,        0x0ef0 },
-+      { 0x202,        0x07ff },
-+      { 0x212,        0x0000 },
-+      { 0x214,        0x4000 },
-+      { 0x216,        0xf00e },
-+      { GLAMO_REG_MEM_TYPE,           0x0874 }, /* 8MB, 16 word pg wr+rd */
-+      { GLAMO_REG_MEM_GEN,            0xafaf }, /* 63 grants min + max */
-+      /*
-+       * the register below originally 0x0108 makes unreliable Glamo MMC
-+       * write operations.  Cranked to 0x05ad to add a wait state, the
-+       * unreliability is not seen after 4GB of write / read testing
-+       */
-+      { GLAMO_REG_MEM_TIMING1,        0x0108 },
-+      { GLAMO_REG_MEM_TIMING2,        0x0010 }, /* Taa = 3 MCLK */
-+      { GLAMO_REG_MEM_TIMING3,        0x0000 },
-+      { GLAMO_REG_MEM_TIMING4,        0x0000 }, /* CE1# delay fall/rise */
-+      { GLAMO_REG_MEM_TIMING5,        0x0000 }, /* UB# LB# */
-+      { GLAMO_REG_MEM_TIMING6,        0x0000 }, /* OE# */
-+      { GLAMO_REG_MEM_TIMING7,        0x0000 }, /* WE# */
-+      { GLAMO_REG_MEM_TIMING8,        0x1002 }, /* MCLK delay, was 0x1000 */
-+      { GLAMO_REG_MEM_TIMING9,        0x6006 },
-+      { GLAMO_REG_MEM_TIMING10,       0x00ff },
-+      { GLAMO_REG_MEM_TIMING11,       0x0001 },
-+      { GLAMO_REG_MEM_POWER1,         0x0020 },
-+      { GLAMO_REG_MEM_POWER2,         0x0000 },
-+      { GLAMO_REG_MEM_DRAM1,          0x0000 },
-+              { 0xfffe, 1 },
-+      { GLAMO_REG_MEM_DRAM1,          0xc100 },
-+              { 0xfffe, 1 },
-+      { GLAMO_REG_MEM_DRAM1,          0xe100 },
-+      { GLAMO_REG_MEM_DRAM2,          0x01d6 },
-+      { GLAMO_REG_CLOCK_MEMORY,       0x000b },
-+};
-+
-+static struct glamo_script glamo_resume_script[] = {
-+      { GLAMO_REG_IRQ_ENABLE,         0x01ff },
-+      { GLAMO_REG_CLOCK_GEN6,         0x2000 },
-+      { GLAMO_REG_CLOCK_GEN7,         0x0001 }, /* 0101 */
-+      { GLAMO_REG_CLOCK_GEN8,         0x0100 },
-+      { GLAMO_REG_CLOCK_HOST,         0x000d },
-+      { 0x200,        0x0ef0 },
-+      { 0x202,        0x07ff },
-+      { 0x212,        0x0000 },
-+      { 0x214,        0x4000 },
-+      { 0x216,        0xf00e },
-+      { GLAMO_REG_MEM_TYPE,           0x0874 }, /* 8MB, 16 word pg wr+rd */
-+      { GLAMO_REG_MEM_GEN,            0xafaf }, /* 63 grants min + max */
-+
-+      { GLAMO_REG_MEM_TIMING1,        0x0108 },
-+      { GLAMO_REG_MEM_TIMING2,        0x0010 }, /* Taa = 3 MCLK */
-+      { GLAMO_REG_MEM_TIMING3,        0x0000 },
-+      { GLAMO_REG_MEM_TIMING4,        0x0000 }, /* CE1# delay fall/rise */
-+      { GLAMO_REG_MEM_TIMING5,        0x0000 }, /* UB# LB# */
-+      { GLAMO_REG_MEM_TIMING6,        0x0000 }, /* OE# */
-+      { GLAMO_REG_MEM_TIMING7,        0x0000 }, /* WE# */
-+      { GLAMO_REG_MEM_TIMING8,        0x1002 }, /* MCLK delay, was 0x1000 */
-+      { GLAMO_REG_MEM_TIMING9,        0x6006 },
-+      { GLAMO_REG_MEM_TIMING10,       0x00ff },
-+      { GLAMO_REG_MEM_TIMING11,       0x0001 },
-+      { GLAMO_REG_MEM_POWER1,         0x0020 },
-+      { GLAMO_REG_MEM_POWER2,         0x0000 },
-+      { GLAMO_REG_MEM_DRAM1,          0x0000 },
-+              { 0xfffe, 1 },
-+      { GLAMO_REG_MEM_DRAM1,          0xc100 },
-+              { 0xfffe, 1 },
-+      { GLAMO_REG_MEM_DRAM1,          0xe100 },
-+      { GLAMO_REG_MEM_DRAM2,          0x01d6 },
-+      { GLAMO_REG_CLOCK_MEMORY,       0x000b },
-+};
-+
-+#if 0 /* MM370 */
-+static const struct glamo_script regs_vram_2mb = {
-+      { GLAMO_REG_CLOCK_MEMORY,       0x3aaa },
-+              { 0xfffe, 50 },
-+      { GLAMO_REG_CLOCK_MEMORY,       0x0aaa },
-+              { 0xfffe, 3 },
-+      { GLAMO_REG_MEM_POWER1,         0x0020 },
-+      { 0x033a,                       0x0000 },
-+      { 0x033c,                       0x0000 },
-+      { 0x033e,                       0x0000 },
-+      { 0x0340,                       0x0000 },
-+      { 0x0342,                       0x0000 },
-+      { 0x0344,                       0x0000 },
-+      { 0x0346,                       0x0240 },
-+      { GLAMO_REG_MEM_TIMING8,        0x1016 },
-+      { GLAMO_REG_MEM_TIMING9,        0x6067 },
-+      { GLAMO_REG_MEM_TIMING10,       0x00ff },
-+      { GLAMO_REG_MEM_TIMING11,       0x0030 },
-+      { GLAMO_REG_MEM_GEN,            0x3fff },
-+      { GLAMO_REG_MEM_GEN,            0xafaf },
-+      { GLAMO_REG_MEM_TIMING1,        0x0108 },
-+      { GLAMO_REG_MEM_TIMING2,        0x0010 },
-+      { GLAMO_REG_MEM_DRAM1,          0x0a00 },
-+              { 0xfffe, 3 },
-+      { GLAMO_REG_MEM_DRAM1,          0xe200 },
-+              { 0xfffe, 1 },
-+};
-+
-+static const struct glamo_script regs_vram_8mb = {
-+      { GLAMO_REG_CLOCK_MEMORY,       0x3aaa },
-+              { 0xfffe, 50 },
-+      { GLAMO_REG_CLOCK_MEMORY,       0x0aaa },
-+              { 0xfffe, 3 },
-+      { GLAMO_REG_MEM_POWER1,         0x0020 },
-+      { 0x033a,                       0x45cf },
-+      { 0x033c,                       0x4240 },
-+      { 0x033e,                       0x53e0 },
-+      { 0x0340,                       0x1401 },
-+      { 0x0342,                       0x0c44 },
-+      { 0x0344,                       0x1d0b },
-+      { 0x0346,                       0x25ac },
-+      { 0x0348,                       0x1953 },
-+              { 0xfffe, 1 },
-+      { GLAMO_REG_MEM_TYPE,           0x087a },
-+      { GLAMO_REG_MEM_DRAM2,          0x01d6 },
-+      { GLAMO_REG_MEM_TIMING8,        0x1060 },
-+      { GLAMO_REG_MEM_TIMING9,        0x6067 },
-+      { GLAMO_REG_MEM_TIMING10,       0x00ff },
-+      { GLAMO_REG_MEM_TIMING11,       0x0030 },
-+      { GLAMO_REG_MEM_GEN,            0x3fff },
-+      { GLAMO_REG_MEM_GEN,            0xafaf },
-+      { GLAMO_REG_MEM_TIMING1,        0x3108 },
-+      { GLAMO_REG_MEM_TIMING2,        0x0010 },
-+      { GLAMO_REG_MEM_DRAM1,          0x0a00 },
-+              { 0xfffe, 3 },
-+      { GLAMO_REG_MEM_DRAM1,          0xe200 },
-+              { 0xfffe, 1 },
-+};
-+#endif
-+
-+enum glamo_power {
-+      GLAMO_POWER_ON,
-+      GLAMO_POWER_STANDBY,
-+      GLAMO_POWER_SUSPEND,
-+};
-+
-+static void glamo_power(struct glamo_core *glamo,
-+                      enum glamo_power new_state)
-+{
-+      spin_lock(&glamo->lock);
-+
-+      switch (new_state) {
-+      case GLAMO_POWER_ON:
-+              /* power up PLL1 and PLL2 */
-+              __reg_set_bit_mask(glamo, GLAMO_REG_DFT_GEN6, 0x0001, 0xffff);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_PLL_GEN3, 0x2000, 0x0000);
-+
-+              /* spin until PLL1 and PLL2 lock */
-+              while ((__reg_read(glamo, GLAMO_REG_PLL_GEN5) & 3) != 3)
-+                      ;
-+
-+              /* enable memory clock and get it out of deep pwrdown */
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_MEMORY,
-+                                 GLAMO_CLOCK_MEM_EN_MOCACLK, 0xffff);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_MEM_DRAM2,
-+                                 GLAMO_MEM_DRAM2_DEEP_PWRDOWN, 0x0000);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_MEM_DRAM1,
-+                                 GLAMO_MEM_DRAM1_SELF_REFRESH, 0x0000);
-+
-+              glamo_run_script(glamo, glamo_resume_script,
-+                               ARRAY_SIZE(glamo_resume_script), 0);
-+
-+              break;
-+      case GLAMO_POWER_STANDBY:
-+              /* enable memory self-refresh */
-+              __reg_set_bit_mask(glamo, GLAMO_REG_MEM_DRAM1,
-+                                 GLAMO_MEM_DRAM1_SELF_REFRESH, 0xffff);
-+              /* stop memory clock */
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_MEMORY,
-+                                 GLAMO_CLOCK_MEM_EN_MOCACLK, 0x0000);
-+              /* power down PLL2 and then PLL1 */
-+              __reg_set_bit_mask(glamo, GLAMO_REG_PLL_GEN3, 0x2000, 0xffff);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_DFT_GEN5, 0x0001, 0xffff);
-+              break;
-+      case GLAMO_POWER_SUSPEND:
-+              __reg_set_bit_mask(glamo, GLAMO_REG_MEM_DRAM2,
-+                                 GLAMO_MEM_DRAM2_DEEP_PWRDOWN, 0xffff);
-+              /* stop memory clock */
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_MEMORY,
-+                                 GLAMO_CLOCK_MEM_EN_MOCACLK, 0x0000);
-+              /* power down PLL2 and then PLL1 */
-+              __reg_set_bit_mask(glamo, GLAMO_REG_PLL_GEN3, 0x2000, 0xffff);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_DFT_GEN5, 0x0001, 0xffff);
-+              break;
-+      }
-+
-+      spin_unlock(&glamo->lock);
-+}
-+
-+#if 0
-+#define MEMDETECT_RETRY       6
-+static unsigned int detect_memsize(struct glamo_core *glamo)
-+{
-+      int i;
-+
-+      /*static const u_int16_t pattern[] = {
-+              0x1111, 0x8a8a, 0x2222, 0x7a7a,
-+              0x3333, 0x6a6a, 0x4444, 0x5a5a,
-+              0x5555, 0x4a4a, 0x6666, 0x3a3a,
-+              0x7777, 0x2a2a, 0x8888, 0x1a1a
-+      }; */
-+
-+      for (i = 0; i < MEMDETECT_RETRY; i++) {
-+              switch (glamo->type) {
-+              case 3600:
-+                      __reg_write(glamo, GLAMO_REG_MEM_TYPE, 0x0072);
-+                      __reg_write(glamo, GLAMO_REG_MEM_DRAM1, 0xc100);
-+                      break;
-+              case 3650:
-+                      switch (glamo->revision) {
-+                      case GLAMO_CORE_REV_A0:
-+                              if (i & 1)
-+                                      __reg_write(glamo, GLAMO_REG_MEM_TYPE,
-+                                                  0x097a);
-+                              else
-+                                      __reg_write(glamo, GLAMO_REG_MEM_TYPE,
-+                                                  0x0173);
-+
-+                              __reg_write(glamo, GLAMO_REG_MEM_DRAM1, 0x0000);
-+                              msleep(1);
-+                              __reg_write(glamo, GLAMO_REG_MEM_DRAM1, 0xc100);
-+                              break;
-+                      default:
-+                              if (i & 1)
-+                                      __reg_write(glamo, GLAMO_REG_MEM_TYPE,
-+                                                  0x0972);
-+                              else
-+                                      __reg_write(glamo, GLAMO_REG_MEM_TYPE,
-+                                                  0x0872);
-+
-+                              __reg_write(glamo, GLAMO_REG_MEM_DRAM1, 0x0000);
-+                              msleep(1);
-+                              __reg_write(glamo, GLAMO_REG_MEM_DRAM1, 0xe100);
-+                              break;
-+                      }
-+                      break;
-+              case 3700:
-+                      /* FIXME */
-+              default:
-+                      break;
-+              }
-+
-+#if 0
-+              /* FIXME: finish implementation */
-+              for (j = 0; j < 8; j++) {
-+                      __
-+#endif
-+      }
-+
-+      return 0;
-+}
-+#endif
-+
-+/* Find out if we can support this version of the Glamo chip */
-+static int glamo_supported(struct glamo_core *glamo)
-+{
-+      u_int16_t dev_id, rev_id; /*, memsize; */
-+
-+      dev_id = __reg_read(glamo, GLAMO_REG_DEVICE_ID);
-+      rev_id = __reg_read(glamo, GLAMO_REG_REVISION_ID);
-+
-+      switch (dev_id) {
-+      case 0x3650:
-+              switch (rev_id) {
-+              case GLAMO_CORE_REV_A2:
-+                      break;
-+              case GLAMO_CORE_REV_A0:
-+              case GLAMO_CORE_REV_A1:
-+              case GLAMO_CORE_REV_A3:
-+                      dev_warn(&glamo->pdev->dev, "untested core revision "
-+                               "%04x, your mileage may vary\n", rev_id);
-+                      break;
-+              default:
-+                      dev_warn(&glamo->pdev->dev, "unknown glamo revision "
-+                               "%04x, your mileage may vary\n", rev_id);
-+                      /* maybe should abort ? */
-+              }
-+              break;
-+      case 0x3600:
-+      case 0x3700:
-+      default:
-+              dev_err(&glamo->pdev->dev, "unsupported Glamo device %04x\n",
-+                      dev_id);
-+              return 0;
-+      }
-+
-+      dev_info(&glamo->pdev->dev, "Detected Glamo core %04x Revision %04x "
-+               "(%uHz CPU / %uHz Memory)\n", dev_id, rev_id,
-+               glamo_pll_rate(glamo, GLAMO_PLL1),
-+               glamo_pll_rate(glamo, GLAMO_PLL2));
-+
-+      return 1;
-+}
-+
-+
-+static int __init glamo_probe(struct platform_device *pdev)
-+{
-+      int rc, irq;
-+      struct glamo_core *glamo;
-+
-+      if (glamo_handle) {
-+              dev_err(&pdev->dev,
-+                      "This driver supports only one instance\n");
-+              return -EBUSY;
-+      }
-+
-+      glamo = kmalloc(GFP_KERNEL, sizeof(*glamo));
-+      if (!glamo)
-+              return -ENOMEM;
-+
-+      spin_lock_init(&glamo->lock);
-+      glamo_handle = glamo;
-+      glamo->pdev = pdev;
-+      glamo->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+      glamo->irq = platform_get_irq(pdev, 0);
-+      glamo->pdata = pdev->dev.platform_data;
-+      if (!glamo->mem || !glamo->pdata) {
-+              dev_err(&pdev->dev, "platform device with no MEM/PDATA ?\n");
-+              rc = -ENOENT;
-+              goto out_free;
-+      }
-+
-+      /* register a number of sibling devices whoise IOMEM resources
-+       * are siblings of pdev's IOMEM resource */
-+#if 0
-+      glamo_core_dev.dev.parent = &pdev.dev;
-+      mangle_mem_resources(glamo_core_dev.resources,
-+                           glamo_core_dev.num_resources, glamo->mem);
-+      glamo_core_dev.resources[1].start = glamo->irq;
-+      glamo_core_dev.resources[1].end = glamo->irq;
-+      platform_device_register(&glamo_core_dev);
-+#endif
-+      /* only remap the generic, hostbus and memory controller registers */
-+      glamo->base = ioremap(glamo->mem->start, GLAMO_REGOFS_VIDCAP);
-+      if (!glamo->base) {
-+              dev_err(&pdev->dev, "failed to ioremap() memory region\n");
-+              goto out_free;
-+      }
-+
-+      /* bring MCI specific stuff over from our MFD platform data */
-+      glamo_mci_def_pdata.glamo_set_mci_power =
-+                                      glamo->pdata->glamo_set_mci_power;
-+      glamo_mci_def_pdata.glamo_irq_is_wired =
-+                                      glamo->pdata->glamo_irq_is_wired;
-+
-+      glamo_mmc_dev.dev.parent = &pdev->dev;
-+      /* we need it later to give to the engine enable and disable */
-+      glamo_mci_def_pdata.pglamo = glamo;
-+      mangle_mem_resources(glamo_mmc_dev.resource,
-+                           glamo_mmc_dev.num_resources, glamo->mem);
-+      platform_device_register(&glamo_mmc_dev);
-+
-+      glamo_2d_dev.dev.parent = &pdev->dev;
-+      mangle_mem_resources(glamo_2d_dev.resource,
-+                           glamo_2d_dev.num_resources, glamo->mem);
-+      platform_device_register(&glamo_2d_dev);
-+
-+      glamo_3d_dev.dev.parent = &pdev->dev;
-+      mangle_mem_resources(glamo_3d_dev.resource,
-+                           glamo_3d_dev.num_resources, glamo->mem);
-+      platform_device_register(&glamo_3d_dev);
-+
-+      glamo_jpeg_dev.dev.parent = &pdev->dev;
-+      mangle_mem_resources(glamo_jpeg_dev.resource,
-+                           glamo_jpeg_dev.num_resources, glamo->mem);
-+      platform_device_register(&glamo_jpeg_dev);
-+
-+      glamo_mpeg_dev.dev.parent = &pdev->dev;
-+      mangle_mem_resources(glamo_mpeg_dev.resource,
-+                           glamo_mpeg_dev.num_resources, glamo->mem);
-+      platform_device_register(&glamo_mpeg_dev);
-+
-+      glamo->pdata->glamo = glamo;
-+      glamo_fb_dev.dev.parent = &pdev->dev;
-+      glamo_fb_dev.dev.platform_data = glamo->pdata;
-+      mangle_mem_resources(glamo_fb_dev.resource,
-+                           glamo_fb_dev.num_resources, glamo->mem);
-+      platform_device_register(&glamo_fb_dev);
-+
-+      glamo->pdata->spigpio_info->glamo = glamo;
-+      glamo_spigpio_dev.dev.parent = &pdev->dev;
-+      glamo_spigpio_dev.dev.platform_data = glamo->pdata->spigpio_info;
-+      platform_device_register(&glamo_spigpio_dev);
-+
-+      /* only request the generic, hostbus and memory controller MMIO */
-+      glamo->mem = request_mem_region(glamo->mem->start,
-+                                      GLAMO_REGOFS_VIDCAP, "glamo-core");
-+      if (!glamo->mem) {
-+              dev_err(&pdev->dev, "failed to request memory region\n");
-+              goto out_free;
-+      }
-+
-+      if (!glamo_supported(glamo)) {
-+              dev_err(&pdev->dev, "This Glamo is not supported\n");
-+              goto out_free;
-+      }
-+
-+      platform_set_drvdata(pdev, glamo);
-+
-+      dev_dbg(&glamo->pdev->dev, "running init script\n");
-+      glamo_run_script(glamo, glamo_init_script,
-+                       ARRAY_SIZE(glamo_init_script), 1);
-+
-+      dev_info(&glamo->pdev->dev, "Glamo core now %uHz CPU / %uHz Memory)\n",
-+               glamo_pll_rate(glamo, GLAMO_PLL1),
-+               glamo_pll_rate(glamo, GLAMO_PLL2));
-+
-+      for (irq = IRQ_GLAMO(0); irq <= IRQ_GLAMO(8); irq++) {
-+              set_irq_chip(irq, &glamo_irq_chip);
-+              set_irq_handler(irq, handle_level_irq);
-+              set_irq_flags(irq, IRQF_VALID);
-+      }
-+
-+      if (glamo->pdata->glamo_irq_is_wired &&
-+          !glamo->pdata->glamo_irq_is_wired()) {
-+              set_irq_chained_handler(glamo->irq, glamo_irq_demux_handler);
-+              set_irq_type(glamo->irq, IRQT_FALLING);
-+              glamo->irq_works = 1;
-+      } else
-+              glamo->irq_works = 0;
-+      return 0;
-+
-+out_free:
-+      glamo_handle = NULL;
-+      kfree(glamo);
-+      return rc;
-+}
-+
-+static int glamo_remove(struct platform_device *pdev)
-+{
-+      struct glamo_core *glamo = platform_get_drvdata(pdev);
-+      int irq;
-+
-+      disable_irq(glamo->irq);
-+      set_irq_chained_handler(glamo->irq, NULL);
-+
-+      for (irq = IRQ_GLAMO(0); irq <= IRQ_GLAMO(8); irq++) {
-+              set_irq_flags(irq, 0);
-+              set_irq_chip(irq, NULL);
-+      }
-+
-+      platform_set_drvdata(pdev, NULL);
-+      platform_device_unregister(&glamo_fb_dev);
-+      platform_device_unregister(&glamo_mmc_dev);
-+      iounmap(glamo->base);
-+      release_mem_region(glamo->mem->start, GLAMO_REGOFS_VIDCAP);
-+      glamo_handle = NULL;
-+      kfree(glamo);
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int glamo_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+      return 0;
-+}
-+
-+static int glamo_resume(struct platform_device *pdev)
-+{
-+      return 0;
-+}
-+#else
-+#define glamo_suspend NULL
-+#define glamo_resume  NULL
-+#endif
-+
-+static struct platform_driver glamo_driver = {
-+      .probe          = glamo_probe,
-+      .remove         = glamo_remove,
-+      .suspend        = glamo_suspend,
-+      .resume         = glamo_resume,
-+      .driver         = {
-+              .name   = "glamo3362",
-+              .owner  = THIS_MODULE,
-+      },
-+};
-+
-+static int __devinit glamo_init(void)
-+{
-+      return platform_driver_register(&glamo_driver);
-+}
-+
-+static void __exit glamo_cleanup(void)
-+{
-+      platform_driver_unregister(&glamo_driver);
-+}
-+
-+module_init(glamo_init);
-+module_exit(glamo_cleanup);
-+
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_DESCRIPTION("Smedia Glamo 336x/337x core/resource driver");
-+MODULE_LICENSE("GPL");
-diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h
-new file mode 100644
-index 0000000..cf89f03
---- /dev/null
-+++ b/drivers/mfd/glamo/glamo-core.h
-@@ -0,0 +1,91 @@
-+#ifndef __GLAMO_CORE_H
-+#define __GLAMO_CORE_H
-+
-+#include <asm/system.h>
-+
-+
-+/* for the time being, we put the on-screen framebuffer into the lowest
-+ * VRAM space.  This should make the code easily compatible with the various
-+ * 2MB/4MB/8MB variants of the Smedia chips */
-+#define GLAMO_OFFSET_VRAM     0x800000
-+#define GLAMO_OFFSET_FB       (GLAMO_OFFSET_VRAM)
-+
-+/* we only allocate the minimum possible size for the framebuffer to make
-+ * sure we have sufficient memory for other functions of the chip */
-+//#define GLAMO_FB_SIZE       (640*480*4)     /* == 0x12c000 */
-+#define GLAMO_INTERNAL_RAM_SIZE 0x800000
-+#define GLAMO_MMC_BUFFER_SIZE (64 * 1024)
-+#define GLAMO_FB_SIZE (GLAMO_INTERNAL_RAM_SIZE - GLAMO_MMC_BUFFER_SIZE)
-+
-+
-+struct glamo_core {
-+      int irq;
-+      int irq_works; /* 0 means PCB does not support Glamo IRQ */
-+      struct resource *mem;
-+      struct resource *mem_core;
-+      void __iomem *base;
-+      struct platform_device *pdev;
-+      struct glamofb_platform_data *pdata;
-+      u_int16_t type;
-+      u_int16_t revision;
-+      spinlock_t lock;
-+};
-+
-+struct glamo_script {
-+      u_int16_t reg;
-+      u_int16_t val;
-+};
-+
-+int glamo_run_script(struct glamo_core *glamo,
-+                   struct glamo_script *script, int len, int may_sleep);
-+
-+enum glamo_engine {
-+      GLAMO_ENGINE_CAPTURE,
-+      GLAMO_ENGINE_ISP,
-+      GLAMO_ENGINE_JPEG,
-+      GLAMO_ENGINE_MPEG_ENC,
-+      GLAMO_ENGINE_MPEG_DEC,
-+      GLAMO_ENGINE_LCD,
-+      GLAMO_ENGINE_CMDQ,
-+      GLAMO_ENGINE_2D,
-+      GLAMO_ENGINE_3D,
-+      GLAMO_ENGINE_MMC,
-+      GLAMO_ENGINE_MICROP0,
-+      GLAMO_ENGINE_RISC,
-+      GLAMO_ENGINE_MICROP1_MPEG_ENC,
-+      GLAMO_ENGINE_MICROP1_MPEG_DEC,
-+#if 0
-+      GLAMO_ENGINE_H264_DEC,
-+      GLAMO_ENGINE_RISC1,
-+      GLAMO_ENGINE_SPI,
-+#endif
-+      __NUM_GLAMO_ENGINES
-+};
-+
-+struct glamo_mci_pdata {
-+      struct glamo_core * pglamo;
-+      unsigned int    gpio_detect;
-+      unsigned int    gpio_wprotect;
-+      unsigned long   ocr_avail;
-+      void            (*glamo_set_mci_power)(unsigned char power_mode,
-+                                   unsigned short vdd);
-+      int             (*glamo_irq_is_wired)(void);
-+};
-+
-+
-+static inline void glamo_reg_access_delay(void)
-+{
-+      int n;
-+
-+      for (n = 0; n != 2; n++)
-+              nop();
-+}
-+
-+
-+int glamo_engine_enable(struct glamo_core *glamo, enum glamo_engine engine);
-+int glamo_engine_disable(struct glamo_core *glamo, enum glamo_engine engine);
-+void glamo_engine_reset(struct glamo_core *glamo, enum glamo_engine engine);
-+int glamo_engine_reclock(struct glamo_core *glamo,
-+                       enum glamo_engine engine, int ps);
-+
-+#endif /* __GLAMO_CORE_H */
-diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c
-new file mode 100644
-index 0000000..394a0ad
---- /dev/null
-+++ b/drivers/mfd/glamo/glamo-fb.c
-@@ -0,0 +1,822 @@
-+/* Smedia Glamo 336x/337x driver
-+ *
-+ * (C) 2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/errno.h>
-+#include <linux/string.h>
-+#include <linux/mm.h>
-+#include <linux/slab.h>
-+#include <linux/delay.h>
-+#include <linux/fb.h>
-+#include <linux/init.h>
-+#include <linux/vmalloc.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/interrupt.h>
-+#include <linux/workqueue.h>
-+#include <linux/wait.h>
-+#include <linux/platform_device.h>
-+#include <linux/clk.h>
-+
-+#include <asm/io.h>
-+#include <asm/uaccess.h>
-+#include <asm/div64.h>
-+
-+#ifdef CONFIG_PM
-+#include <linux/pm.h>
-+#endif
-+
-+#include <linux/glamofb.h>
-+
-+#include "glamo-regs.h"
-+#include "glamo-core.h"
-+
-+#ifdef DEBUG
-+#define GLAMO_LOG(...)
-+#else
-+#define GLAMO_LOG(...) \
-+do { \
-+      printk(KERN_DEBUG "in %s:%s:%d", __FILE__, __func__, __LINE__); \
-+      printk(KERN_DEBUG __VA_ARGS__); \
-+} while (0);
-+#endif
-+
-+
-+#define RESSIZE(ressource) (((ressource)->end - (ressource)->start)+1)
-+
-+struct glamofb_handle {
-+      struct fb_info *fb;
-+      struct device *dev;
-+      struct resource *reg;
-+      struct resource *fb_res;
-+      char __iomem *base;
-+      struct glamofb_platform_data *mach_info;
-+      char __iomem *cursor_addr;
-+      u_int32_t pseudo_pal[16];
-+};
-+
-+/* 'sibling' spi device for lcm init */
-+static struct platform_device glamo_spi_dev = {
-+      .name           = "glamo-lcm-spi",
-+};
-+
-+
-+static int reg_read(struct glamofb_handle *glamo,
-+                         u_int16_t reg)
-+{
-+      glamo_reg_access_delay();
-+      return readw(glamo->base + reg);
-+}
-+
-+static void reg_write(struct glamofb_handle *glamo,
-+                           u_int16_t reg, u_int16_t val)
-+{
-+      glamo_reg_access_delay();
-+      writew(val, glamo->base + reg);
-+}
-+
-+static struct glamo_script glamo_regs[] = {
-+      { GLAMO_REG_LCD_MODE1, 0x0020 },
-+      /* no display rotation, no hardware cursor, no dither, no gamma,
-+       * no retrace flip, vsync low-active, hsync low active,
-+       * no TVCLK, no partial display, hw dest color from fb,
-+       * no partial display mode, LCD1, software flip,  */
-+      { GLAMO_REG_LCD_MODE2, 0x1020 },
-+        /* no video flip, no ptr, no ptr, dhclk,
-+         * normal mode,  no cpuif,
-+         * res, serial msb first, single fb, no fr ctrl,
-+         * cpu if bits all zero, no crc
-+         * 0000 0000 0010  0000 */
-+      { GLAMO_REG_LCD_MODE3, 0x0b40 },
-+        /* src data rgb565, res, 18bit rgb666
-+         * 000 01 011 0100 0000 */
-+      { GLAMO_REG_LCD_POLARITY, 0x440c },
-+        /* DE high active, no cpu/lcd if, cs0 force low, a0 low active,
-+         * np cpu if, 9bit serial data, sclk rising edge latch data
-+         * 01 00 0 100 0 000 01 0 0 */
-+      { GLAMO_REG_LCD_A_BASE1, 0x0000 }, /* display A base address 15:0 */
-+      { GLAMO_REG_LCD_A_BASE2, 0x0000 }, /* display A base address 22:16 */
-+};
-+
-+static int glamofb_run_script(struct glamofb_handle *glamo,
-+                              struct glamo_script *script, int len)
-+{
-+      int i;
-+
-+      for (i = 0; i < len; i++) {
-+              struct glamo_script *line = &script[i];
-+
-+              if (line->reg == 0xffff)
-+                      return 0;
-+              else if (line->reg == 0xfffe)
-+                      msleep(line->val);
-+              else
-+                      reg_write(glamo, script[i].reg, script[i].val);
-+      }
-+
-+      return 0;
-+}
-+
-+static int glamofb_check_var(struct fb_var_screeninfo *var,
-+                           struct fb_info *info)
-+{
-+      struct glamofb_handle *glamo = info->par;
-+
-+      if (var->yres > glamo->mach_info->yres.max)
-+              var->yres = glamo->mach_info->yres.max;
-+      else if (var->yres < glamo->mach_info->yres.min)
-+              var->yres = glamo->mach_info->yres.min;
-+
-+      if (var->xres > glamo->mach_info->xres.max)
-+              var->xres = glamo->mach_info->xres.max;
-+      else if (var->xres < glamo->mach_info->xres.min)
-+              var->xres = glamo->mach_info->xres.min;
-+
-+      if (var->bits_per_pixel > glamo->mach_info->bpp.max)
-+              var->bits_per_pixel = glamo->mach_info->bpp.max;
-+      else if (var->bits_per_pixel < glamo->mach_info->bpp.min)
-+              var->bits_per_pixel = glamo->mach_info->bpp.min;
-+
-+      /* FIXME: set rgb positions */
-+      switch (var->bits_per_pixel) {
-+      case 16:
-+              switch (reg_read(glamo, GLAMO_REG_LCD_MODE3) & 0xc000) {
-+              case GLAMO_LCD_SRC_RGB565:
-+                      var->red.offset         = 11;
-+                      var->green.offset       = 5;
-+                      var->blue.offset        = 0;
-+                      var->red.length         = 5;
-+                      var->green.length       = 6;
-+                      var->blue.length        = 5;
-+                      var->transp.length      = 0;
-+                      break;
-+              case GLAMO_LCD_SRC_ARGB1555:
-+                      var->transp.offset      = 15;
-+                      var->red.offset         = 10;
-+                      var->green.offset       = 5;
-+                      var->blue.offset        = 0;
-+                      var->transp.length      = 1;
-+                      var->red.length         = 5;
-+                      var->green.length       = 5;
-+                      var->blue.length        = 5;
-+                      break;
-+              case GLAMO_LCD_SRC_ARGB4444:
-+                      var->transp.offset      = 12;
-+                      var->red.offset         = 8;
-+                      var->green.offset       = 4;
-+                      var->blue.offset        = 0;
-+                      var->transp.length      = 4;
-+                      var->red.length         = 4;
-+                      var->green.length       = 4;
-+                      var->blue.length        = 4;
-+                      break;
-+              }
-+              break;
-+      case 24:
-+      case 32:
-+      default:
-+              /* The Smedia Glamo doesn't support anything but 16bit color */
-+              printk(KERN_ERR
-+                     "Smedia driver does not [yet?] support 24/32bpp\n");
-+              return -EINVAL;
-+              break;
-+      }
-+
-+      return 0;
-+}
-+
-+static void reg_set_bit_mask(struct glamofb_handle *glamo,
-+                           u_int16_t reg, u_int16_t mask,
-+                           u_int16_t val)
-+{
-+      u_int16_t tmp;
-+
-+      val &= mask;
-+
-+      tmp = reg_read(glamo, reg);
-+      tmp &= ~mask;
-+      tmp |= val;
-+      reg_write(glamo, reg, tmp);
-+}
-+
-+#define GLAMO_LCD_WIDTH_MASK 0x03FF
-+#define GLAMO_LCD_HEIGHT_MASK 0x03FF
-+#define GLAMO_LCD_PITCH_MASK 0x07FE
-+#define GLAMO_LCD_HV_TOTAL_MASK 0x03FF
-+#define GLAMO_LCD_HV_RETR_START_MASK 0x03FF
-+#define GLAMO_LCD_HV_RETR_END_MASK 0x03FF
-+#define GLAMO_LCD_HV_RETR_DISP_START_MASK 0x03FF
-+#define GLAMO_LCD_HV_RETR_DISP_END_MASK 0x03FF
-+
-+enum orientation {
-+    ORIENTATION_PORTRAIT,
-+    ORIENTATION_LANDSCAPE
-+};
-+
-+
-+static void rotate_lcd(struct glamofb_handle *glamo,
-+                       __u32 rotation)
-+{
-+      int glamo_rot;
-+
-+      switch (rotation) {
-+              case FB_ROTATE_UR:
-+                      glamo_rot = GLAMO_LCD_ROT_MODE_0;
-+                      break;
-+              case FB_ROTATE_CW:
-+                      glamo_rot = GLAMO_LCD_ROT_MODE_90;
-+                      break;
-+              case FB_ROTATE_UD:
-+                      glamo_rot = GLAMO_LCD_ROT_MODE_180;
-+                      break;
-+              case FB_ROTATE_CCW:
-+                      glamo_rot = GLAMO_LCD_ROT_MODE_270;
-+                      break;
-+              default:
-+                      glamo_rot = GLAMO_LCD_ROT_MODE_0;
-+                      break;
-+      }
-+      glamofb_cmd_mode(glamo, 1);
-+      reg_set_bit_mask(glamo,
-+                       GLAMO_REG_LCD_WIDTH,
-+                       GLAMO_LCD_ROT_MODE_MASK,
-+                       glamo_rot);
-+      reg_set_bit_mask(glamo,
-+                       GLAMO_REG_LCD_MODE1,
-+                       GLAMO_LCD_MODE1_ROTATE_EN,
-+                       (glamo_rot != GLAMO_LCD_ROT_MODE_0)?
-+                               GLAMO_LCD_MODE1_ROTATE_EN : 0);
-+      glamofb_cmd_mode(glamo, 0);
-+}
-+
-+static enum orientation get_orientation(struct fb_var_screeninfo *var)
-+{
-+      GLAMO_LOG("mark\n")
-+      if (var->xres <= var->yres) {
-+              GLAMO_LOG("portrait\n")
-+              return ORIENTATION_PORTRAIT;
-+      }
-+      GLAMO_LOG("landscape\n")
-+      return ORIENTATION_LANDSCAPE;
-+}
-+
-+static int will_orientation_change(struct fb_var_screeninfo *var)
-+{
-+      enum  orientation orient = get_orientation(var);
-+      switch (orient) {
-+              case ORIENTATION_LANDSCAPE:
-+                      if (var->rotate == FB_ROTATE_UR || var->rotate == FB_ROTATE_UD)
-+                              return 1;
-+                      break;
-+              case ORIENTATION_PORTRAIT:
-+                      if (var->rotate == FB_ROTATE_CW || var->rotate == FB_ROTATE_CCW)
-+                              return 1;
-+                      break;
-+      }
-+      return 0;
-+}
-+
-+static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
-+                                        struct fb_var_screeninfo *var)
-+{
-+      int sync, bp, disp, fp, total, xres, yres, pitch, orientation_changing;
-+
-+      GLAMO_LOG("enter: glamo:%#x, var:%#x\n", (unsigned)glamo, (unsigned)var);
-+      if (!glamo || !var)
-+              return;
-+
-+      glamofb_cmd_mode(glamo, 1);
-+
-+      if (var->pixclock)
-+              glamo_engine_reclock(glamo->mach_info->glamo,
-+                                   GLAMO_ENGINE_LCD,
-+                                   var->pixclock);
-+
-+      xres = var->xres;
-+      yres = var->yres;
-+      GLAMO_LOG("xres:%d, yres:%d, rotate:%d\n", xres, yres, var->rotate);
-+
-+      /*
-+       * figure out if orientation is going to change
-+       */
-+      orientation_changing = will_orientation_change(var);
-+      GLAMO_LOG("orientation_changing:%d\n", orientation_changing);
-+
-+        /*
-+         * adjust the pitch according to new orientation to come
-+         */
-+        if (orientation_changing) {
-+              pitch = var->yres * var->bits_per_pixel / 8;
-+        } else {
-+              pitch = var->xres * var->bits_per_pixel / 8;
-+        }
-+      GLAMO_LOG("pitch:%d\n", pitch);
-+
-+      /*
-+       * set the awaiten LCD geometry
-+       */
-+      reg_set_bit_mask(glamo,
-+                       GLAMO_REG_LCD_WIDTH,
-+                       GLAMO_LCD_WIDTH_MASK,
-+                       xres);
-+      reg_set_bit_mask(glamo,
-+                       GLAMO_REG_LCD_HEIGHT,
-+                       GLAMO_LCD_HEIGHT_MASK,
-+                       yres);
-+      reg_set_bit_mask(glamo,
-+                       GLAMO_REG_LCD_PITCH,
-+                       GLAMO_LCD_PITCH_MASK,
-+                       pitch);
-+
-+      GLAMO_LOG("mark:\n");
-+      /*
-+       * honour the rotation request
-+       */
-+      rotate_lcd(glamo, var->rotate);
-+
-+      /*
-+       * update the reported geometry
-+       * of the framebuffer.
-+       */
-+      if (orientation_changing) {
-+              var->xres_virtual = var->xres = yres;
-+              var->yres_virtual = var->yres = xres;
-+      } else {
-+              var->xres_virtual = var->xres = xres;
-+              var->yres_virtual = var->yres = yres;
-+      }
-+
-+      GLAMO_LOG("reported res:(%d,%d)\n", var->xres, var->yres);
-+      /*
-+       * update scannout timings
-+       */
-+      sync = 0;
-+      bp = sync + var->hsync_len;
-+      disp = bp + var->left_margin;
-+      fp = disp + xres;
-+      total = fp + var->right_margin;
-+
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_HORIZ_TOTAL,
-+                       GLAMO_LCD_HV_TOTAL_MASK, total);
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_HORIZ_RETR_START,
-+                       GLAMO_LCD_HV_RETR_START_MASK, sync);
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_HORIZ_RETR_END,
-+                       GLAMO_LCD_HV_RETR_END_MASK, bp);
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_HORIZ_DISP_START,
-+                        GLAMO_LCD_HV_RETR_DISP_START_MASK, disp);
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_HORIZ_DISP_END,
-+                       GLAMO_LCD_HV_RETR_DISP_END_MASK, fp);
-+
-+      GLAMO_LOG("mark:\n");
-+
-+      sync = 0;
-+      bp = sync + var->vsync_len;
-+      disp = bp + var->upper_margin;
-+      fp = disp + yres;
-+      total = fp + var->lower_margin;
-+
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_VERT_TOTAL,
-+                       GLAMO_LCD_HV_TOTAL_MASK, total);
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_VERT_RETR_START,
-+                        GLAMO_LCD_HV_RETR_START_MASK, sync);
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_VERT_RETR_END,
-+                       GLAMO_LCD_HV_RETR_END_MASK, bp);
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_VERT_DISP_START,
-+                       GLAMO_LCD_HV_RETR_DISP_START_MASK, disp);
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_VERT_DISP_END,
-+                       GLAMO_LCD_HV_RETR_DISP_END_MASK, fp);
-+
-+      GLAMO_LOG("mark:\n");
-+      glamofb_cmd_mode(glamo, 0);
-+
-+      GLAMO_LOG("leave:\n");
-+}
-+
-+static int glamofb_set_par(struct fb_info *info)
-+{
-+      struct glamofb_handle *glamo = info->par;
-+      struct fb_var_screeninfo *var = &info->var;
-+
-+      switch (var->bits_per_pixel) {
-+      case 16:
-+              info->fix.visual = FB_VISUAL_TRUECOLOR;
-+              break;
-+      default:
-+              printk("Smedia driver doesn't support != 16bpp\n");
-+              return -EINVAL;
-+      }
-+
-+      info->fix.line_length = (var->xres * var->bits_per_pixel) / 8;
-+
-+      glamofb_update_lcd_controller(glamo, var);
-+
-+      return 0;
-+}
-+
-+static int glamofb_blank(int blank_mode, struct fb_info *info)
-+{
-+      /* FIXME */
-+      return 0;
-+}
-+
-+static inline unsigned int chan_to_field(unsigned int chan, struct fb_bitfield *bf)
-+{
-+      chan &= 0xffff;
-+      chan >>= 16 - bf->length;
-+      return chan << bf->offset;
-+}
-+
-+static int glamofb_setcolreg(unsigned regno,
-+                           unsigned red, unsigned green, unsigned blue,
-+                           unsigned transp, struct fb_info *info)
-+{
-+      struct glamofb_handle *glamo = info->par;
-+      unsigned int val;
-+
-+      switch (glamo->fb->fix.visual) {
-+      case FB_VISUAL_TRUECOLOR:
-+      case FB_VISUAL_DIRECTCOLOR:
-+              /* true-colour, use pseuo-palette */
-+
-+              if (regno < 16) {
-+                      u32 *pal = glamo->fb->pseudo_palette;
-+
-+                      val  = chan_to_field(red, &glamo->fb->var.red);
-+                      val |= chan_to_field(green, &glamo->fb->var.green);
-+                      val |= chan_to_field(blue, &glamo->fb->var.blue);
-+
-+                      pal[regno] = val;
-+              };
-+              break;
-+      default:
-+              return 1; /* unknown type */
-+      }
-+
-+      return 0;
-+}
-+
-+static int glamofb_cursor(struct fb_info *info, struct fb_cursor *cursor)
-+{
-+      struct glamofb_handle *glamo = info->par;
-+      u_int16_t reg;
-+
-+      if (cursor->image.depth > 2)
-+              return -EINVAL;
-+
-+      reg = reg_read(glamo, GLAMO_REG_LCD_MODE1);
-+
-+      if (cursor->enable)
-+              reg_write(glamo, GLAMO_REG_LCD_MODE1,
-+                        reg | GLAMO_LCD_MODE1_CURSOR_EN);
-+      else
-+              reg_write(glamo, GLAMO_REG_LCD_MODE1,
-+                        reg & ~GLAMO_LCD_MODE1_CURSOR_EN);
-+
-+      if (cursor->set & FB_CUR_SETPOS) {
-+              reg_write(glamo, GLAMO_REG_LCD_CURSOR_X_POS,
-+                        cursor->image.dx);
-+              reg_write(glamo, GLAMO_REG_LCD_CURSOR_Y_POS,
-+                        cursor->image.dy);
-+      }
-+
-+      if (cursor->set & FB_CUR_SETCMAP) {
-+              /* FIXME */
-+      }
-+
-+      if (cursor->set & FB_CUR_SETSIZE ||
-+          cursor->set & (FB_CUR_SETIMAGE | FB_CUR_SETSHAPE)) {
-+              int x, y, op;
-+              const unsigned char *pcol = cursor->image.data;
-+              const unsigned char *pmsk = cursor->mask;
-+              void __iomem *dst = glamo->cursor_addr;
-+              unsigned char dcol = 0;
-+              unsigned char dmsk = 0;
-+
-+              reg_write(glamo, GLAMO_REG_LCD_CURSOR_X_SIZE,
-+                        cursor->image.width);
-+              reg_write(glamo, GLAMO_REG_LCD_CURSOR_PITCH,
-+                        cursor->image.width * 2);
-+              reg_write(glamo, GLAMO_REG_LCD_CURSOR_Y_SIZE,
-+                        cursor->image.height);
-+
-+              for (op = 0; op < (cursor->image.width *
-+                                 cursor->image.height * 2)/8; op += 4)
-+                      writel(0x0, dst + op);
-+
-+              for (y = 0; y < cursor->image.height; y++) {
-+                      for (x = 0; x < cursor->image.width; x++) {
-+                              if ((x % 8) == 0) {
-+                                      dcol = *pcol++;
-+                                      dmsk = *pmsk++;
-+                              } else {
-+                                      dcol >>= 1;
-+                                      dmsk >>= 1;
-+                              }
-+
-+                              if (dmsk & 1) {
-+                                      unsigned int op;
-+
-+                                      op = (dcol & 1) ? 1 : 3;
-+                                      op <<= ((x % 4) * 2);
-+
-+                                      op |= readb(dst + (x / 4));
-+                                      writeb(op, dst + (x / 4));
-+                              }
-+                      }
-+              }
-+      }
-+}
-+
-+static inline int glamofb_cmdq_empty(struct glamofb_handle *gfb)
-+{
-+      return reg_read(gfb, GLAMO_REG_LCD_STATUS1) & (1 << 15);
-+}
-+
-+void glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
-+{
-+      dev_dbg(gfb->dev, "glamofb_cmd_mode(gfb=%p, on=%d)\n", gfb, on);
-+      if (on) {
-+              dev_dbg(gfb->dev, "%s: waiting for cmdq empty: ",
-+                      __FUNCTION__);
-+              while (!glamofb_cmdq_empty(gfb))
-+                      yield();
-+              dev_dbg(gfb->dev, "empty!\n");
-+
-+              /* display the entire frame then switch to command */
-+              reg_write(gfb, GLAMO_REG_LCD_COMMAND1,
-+                        GLAMO_LCD_CMD_TYPE_DISP |
-+                        GLAMO_LCD_CMD_DATA_FIRE_VSYNC);
-+
-+              /* wait until LCD is idle */
-+              dev_dbg(gfb->dev, "waiting for LCD idle: ");
-+              while (!reg_read(gfb, GLAMO_REG_LCD_STATUS2) & (1 << 12))
-+                      yield();
-+              dev_dbg(gfb->dev, "idle!\n");
-+
-+              msleep(90);
-+      } else {
-+              /* RGB interface needs vsync/hsync */
-+              if (reg_read(gfb, GLAMO_REG_LCD_MODE3) & GLAMO_LCD_MODE3_RGB)
-+                      reg_write(gfb, GLAMO_REG_LCD_COMMAND1,
-+                                GLAMO_LCD_CMD_TYPE_DISP |
-+                                GLAMO_LCD_CMD_DATA_DISP_SYNC);
-+
-+              reg_write(gfb, GLAMO_REG_LCD_COMMAND1,
-+                        GLAMO_LCD_CMD_TYPE_DISP |
-+                        GLAMO_LCD_CMD_DATA_DISP_FIRE);
-+      }
-+}
-+EXPORT_SYMBOL_GPL(glamofb_cmd_mode);
-+
-+int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val)
-+{
-+      dev_dbg(gfb->dev, "%s: waiting for cmdq empty\n",
-+              __FUNCTION__);
-+      while (!glamofb_cmdq_empty(gfb))
-+              yield();
-+      dev_dbg(gfb->dev, "idle, writing 0x%04x\n", val);
-+
-+      reg_write(gfb, GLAMO_REG_LCD_COMMAND1, val);
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(glamofb_cmd_write);
-+
-+static struct fb_ops glamofb_ops = {
-+      .owner          = THIS_MODULE,
-+      .fb_check_var   = glamofb_check_var,
-+      .fb_set_par     = glamofb_set_par,
-+      .fb_blank       = glamofb_blank,
-+      .fb_setcolreg   = glamofb_setcolreg,
-+      //.fb_cursor    = glamofb_cursor,
-+      .fb_fillrect    = cfb_fillrect,
-+      .fb_copyarea    = cfb_copyarea,
-+      .fb_imageblit   = cfb_imageblit,
-+};
-+
-+static int glamofb_init_regs(struct glamofb_handle *glamo)
-+{
-+      struct fb_info *info = glamo->fb;
-+
-+      glamofb_check_var(&info->var, info);
-+      glamofb_run_script(glamo, glamo_regs, ARRAY_SIZE(glamo_regs));
-+      glamofb_set_par(info);
-+
-+      return 0;
-+}
-+
-+static int __init glamofb_probe(struct platform_device *pdev)
-+{
-+      int rc = -EIO;
-+      struct fb_info *fbinfo;
-+      struct glamofb_handle *glamofb;
-+      struct glamofb_platform_data *mach_info = pdev->dev.platform_data;
-+
-+      printk(KERN_INFO "SMEDIA Glamo frame buffer driver (C) 2007 "
-+              "OpenMoko, Inc.\n");
-+
-+      fbinfo = framebuffer_alloc(sizeof(struct glamofb_handle), &pdev->dev);
-+      if (!fbinfo)
-+              return -ENOMEM;
-+
-+      glamofb = fbinfo->par;
-+      glamofb->fb = fbinfo;
-+      glamofb->dev = &pdev->dev;
-+
-+      strcpy(fbinfo->fix.id, "SMedia Glamo");
-+
-+      glamofb->reg = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-+                                                  "glamo-fb-regs");
-+      if (!glamofb->reg) {
-+              dev_err(&pdev->dev, "platform device with no registers?\n");
-+              rc = -ENOENT;
-+              goto out_free;
-+      }
-+
-+      glamofb->fb_res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-+                                                      "glamo-fb-mem");
-+      if (!glamofb->fb_res) {
-+              dev_err(&pdev->dev, "platform device with no memory ?\n");
-+              rc = -ENOENT;
-+              goto out_free;
-+      }
-+
-+      glamofb->reg = request_mem_region(glamofb->reg->start,
-+                                        RESSIZE(glamofb->reg), pdev->name);
-+      if (!glamofb->reg) {
-+              dev_err(&pdev->dev, "failed to request mmio region\n");
-+              goto out_free;
-+      }
-+
-+      glamofb->fb_res = request_mem_region(glamofb->fb_res->start,
-+                                           mach_info->fb_mem_size,
-+                                           pdev->name);
-+      if (!glamofb->fb_res) {
-+              dev_err(&pdev->dev, "failed to request vram region\n");
-+              goto out_release_reg;
-+      }
-+
-+      /* we want to remap only the registers required for this core
-+       * driver. */
-+      glamofb->base = ioremap(glamofb->reg->start, RESSIZE(glamofb->reg));
-+      if (!glamofb->base) {
-+              dev_err(&pdev->dev, "failed to ioremap() mmio memory\n");
-+              goto out_release_fb;
-+      }
-+      fbinfo->fix.smem_start = (unsigned long) glamofb->fb_res->start;
-+      fbinfo->fix.smem_len = mach_info->fb_mem_size;
-+
-+      fbinfo->screen_base = ioremap(glamofb->fb_res->start,
-+                                     RESSIZE(glamofb->fb_res));
-+      if (!fbinfo->screen_base) {
-+              dev_err(&pdev->dev, "failed to ioremap() vram memory\n");
-+              goto out_release_fb;
-+      }
-+
-+      platform_set_drvdata(pdev, fbinfo);
-+
-+      glamofb->mach_info = pdev->dev.platform_data;
-+
-+      fbinfo->fix.visual = FB_VISUAL_TRUECOLOR;
-+      fbinfo->fix.type = FB_TYPE_PACKED_PIXELS;
-+      fbinfo->fix.type_aux = 0;
-+      fbinfo->fix.xpanstep = 0;
-+      fbinfo->fix.ypanstep = 0;
-+      fbinfo->fix.ywrapstep = 0;
-+      fbinfo->fix.accel = FB_ACCEL_NONE; /* FIXME */
-+
-+      fbinfo->var.nonstd = 0;
-+      fbinfo->var.activate = FB_ACTIVATE_NOW;
-+      fbinfo->var.height = mach_info->height;
-+      fbinfo->var.width = mach_info->width;
-+      fbinfo->var.accel_flags = 0;
-+      fbinfo->var.vmode = FB_VMODE_NONINTERLACED;
-+
-+      fbinfo->fbops = &glamofb_ops;
-+      fbinfo->flags = FBINFO_FLAG_DEFAULT;
-+      fbinfo->pseudo_palette = &glamofb->pseudo_pal;
-+
-+      fbinfo->var.xres = mach_info->xres.defval;
-+      fbinfo->var.xres_virtual = mach_info->xres.defval;
-+      fbinfo->var.yres = mach_info->yres.defval;
-+      fbinfo->var.yres_virtual = mach_info->yres.defval;
-+      fbinfo->var.bits_per_pixel = mach_info->bpp.defval;
-+
-+      fbinfo->var.pixclock = mach_info->pixclock;
-+      fbinfo->var.left_margin = mach_info->left_margin;
-+      fbinfo->var.right_margin = mach_info->right_margin;
-+      fbinfo->var.upper_margin = mach_info->upper_margin;
-+      fbinfo->var.lower_margin = mach_info->lower_margin;
-+      fbinfo->var.hsync_len = mach_info->hsync_len;
-+      fbinfo->var.vsync_len = mach_info->vsync_len;
-+
-+      memset(fbinfo->screen_base, 0, fbinfo->fix.smem_len);
-+
-+      glamo_engine_enable(mach_info->glamo, GLAMO_ENGINE_LCD);
-+      glamo_engine_reset(mach_info->glamo, GLAMO_ENGINE_LCD);
-+      glamofb_init_regs(glamofb);
-+
-+      rc = register_framebuffer(fbinfo);
-+      if (rc < 0) {
-+              dev_err(&pdev->dev, "failed to register framebuffer\n");
-+              goto out_unmap_fb;
-+      }
-+
-+      if (mach_info->spi_info) {
-+              /* register the sibling spi device */
-+              mach_info->spi_info->glamofb_handle = glamofb;
-+              glamo_spi_dev.dev.parent = &pdev->dev;
-+              glamo_spi_dev.dev.platform_data = mach_info->spi_info;
-+              platform_device_register(&glamo_spi_dev);
-+      }
-+
-+      printk(KERN_INFO "fb%d: %s frame buffer device\n",
-+              fbinfo->node, fbinfo->fix.id);
-+
-+      return 0;
-+
-+out_unmap_fb:
-+      iounmap(fbinfo->screen_base);
-+      iounmap(glamofb->base);
-+out_release_fb:
-+      release_mem_region(glamofb->fb_res->start, RESSIZE(glamofb->fb_res));
-+out_release_reg:
-+      release_mem_region(glamofb->reg->start, RESSIZE(glamofb->reg));
-+out_free:
-+      framebuffer_release(fbinfo);
-+      return rc;
-+}
-+
-+static int glamofb_remove(struct platform_device *pdev)
-+{
-+      struct glamofb_handle *glamofb = platform_get_drvdata(pdev);
-+
-+      platform_set_drvdata(pdev, NULL);
-+      iounmap(glamofb->base);
-+      release_mem_region(glamofb->reg->start, RESSIZE(glamofb->reg));
-+      kfree(glamofb);
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int glamofb_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+      return 0;
-+}
-+
-+static int glamofb_resume(struct platform_device *pdev)
-+{
-+      return 0;
-+}
-+#else
-+#define glamofb_suspend NULL
-+#define glamofb_resume  NULL
-+#endif
-+
-+static struct platform_driver glamofb_driver = {
-+      .probe          = glamofb_probe,
-+      .remove         = glamofb_remove,
-+      .suspend        = glamofb_suspend,
-+      .resume         = glamofb_resume,
-+      .driver         = {
-+              .name   = "glamo-fb",
-+              .owner  = THIS_MODULE,
-+      },
-+};
-+
-+static int __devinit glamofb_init(void)
-+{
-+      return platform_driver_register(&glamofb_driver);
-+}
-+
-+static void __exit glamofb_cleanup(void)
-+{
-+      platform_driver_unregister(&glamofb_driver);
-+}
-+
-+module_init(glamofb_init);
-+module_exit(glamofb_cleanup);
-+
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_DESCRIPTION("Smedia Glamo 336x/337x framebuffer driver");
-+MODULE_LICENSE("GPL");
-diff --git a/drivers/mfd/glamo/glamo-gpio.c b/drivers/mfd/glamo/glamo-gpio.c
-new file mode 100644
-index 0000000..45d0bf9
---- /dev/null
-+++ b/drivers/mfd/glamo/glamo-gpio.c
-@@ -0,0 +1,62 @@
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/spinlock.h>
-+#include <linux/io.h>
-+
-+#include <linux/glamo-gpio.h>
-+
-+#include "glamo-core.h"
-+#include "glamo-regs.h"
-+
-+void glamo_gpio_setpin(struct glamo_core *glamo, unsigned int pin,
-+                     unsigned int value)
-+{
-+      unsigned int reg = REG_OF_GPIO(pin);
-+      u_int16_t tmp;
-+
-+      spin_lock(&glamo->lock);
-+      tmp = readw(glamo->base + reg);
-+      if (value)
-+              tmp |= OUTPUT_BIT(pin);
-+      else
-+              tmp &= ~OUTPUT_BIT(pin);
-+      writew(tmp, glamo->base + reg);
-+      spin_unlock(&glamo->lock);
-+}
-+EXPORT_SYMBOL(glamo_gpio_setpin);
-+
-+int glamo_gpio_getpin(struct glamo_core *glamo, unsigned int pin)
-+{
-+      return readw(REG_OF_GPIO(pin)) & INPUT_BIT(pin) ? 1 : 0;
-+}
-+EXPORT_SYMBOL(glamo_gpio_getpin);
-+
-+void glamo_gpio_cfgpin(struct glamo_core *glamo, unsigned int pinfunc)
-+{
-+      unsigned int reg = REG_OF_GPIO(pinfunc);
-+      u_int16_t tmp;
-+
-+      spin_lock(&glamo->lock);
-+      tmp = readw(glamo->base + reg);
-+
-+      if ((pinfunc & 0x00f0) == GLAMO_GPIO_F_FUNC) {
-+              /* pin is a function pin: clear gpio bit */
-+              tmp &= ~FUNC_BIT(pinfunc);
-+      } else {
-+              /* pin is gpio: set gpio bit */
-+              tmp |= FUNC_BIT(pinfunc);
-+
-+              if (pinfunc & GLAMO_GPIO_F_IN) {
-+                      /* gpio input: set bit to disable output mode */
-+                      tmp |= GPIO_OUT_BIT(pinfunc);
-+              } else if (pinfunc & GLAMO_GPIO_F_OUT) {
-+                      /* gpio output: clear bit to enable output mode */
-+                      tmp &= ~GPIO_OUT_BIT(pinfunc);
-+              }
-+      }
-+      writew(tmp, glamo->base + reg);
-+      spin_unlock(&glamo->lock);
-+}
-+EXPORT_SYMBOL(glamo_gpio_cfgpin);
-+
-diff --git a/drivers/mfd/glamo/glamo-lcm-spi.c b/drivers/mfd/glamo/glamo-lcm-spi.c
-new file mode 100644
-index 0000000..92cabe4
---- /dev/null
-+++ b/drivers/mfd/glamo/glamo-lcm-spi.c
-@@ -0,0 +1,241 @@
-+/*
-+ * Copyright (C) 2007 OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ *
-+ * Smedia Glamo GPIO based SPI driver
-+ *
-+ * 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 driver currently only implements a minimum subset of the hardware
-+ * features, esp. those features that are required to drive the jbt6k74
-+ * LCM controller asic in the TD028TTEC1 LCM.
-+ *
-+*/
-+
-+#define DEBUG
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/device.h>
-+#include <linux/spinlock.h>
-+#include <linux/workqueue.h>
-+#include <linux/platform_device.h>
-+
-+#include <linux/spi/spi.h>
-+#include <linux/spi/spi_bitbang.h>
-+#include <linux/spi/glamo.h>
-+
-+#include <linux/glamofb.h>
-+
-+#include <asm/hardware.h>
-+
-+#include "glamo-core.h"
-+#include "glamo-regs.h"
-+
-+struct glamo_spi {
-+      struct spi_bitbang      bitbang;
-+      struct spi_master       *master;
-+      struct glamo_spi_info   *info;
-+      struct device           *dev;
-+};
-+
-+static inline struct glamo_spi *to_gs(struct spi_device *spi)
-+{
-+      return spi->controller_data;
-+}
-+
-+static int glamo_spi_setupxfer(struct spi_device *spi, struct spi_transfer *t)
-+{
-+      struct glamo_spi *gs = to_gs(spi);
-+      unsigned int bpw;
-+
-+      bpw = t ? t->bits_per_word : spi->bits_per_word;
-+
-+      if (bpw != 9 && bpw != 8) {
-+              dev_err(&spi->dev, "invalid bits-per-word (%d)\n", bpw);
-+              return -EINVAL;
-+      }
-+
-+      return 0;
-+}
-+
-+static void glamo_spi_chipsel(struct spi_device *spi, int value)
-+{
-+#if 0
-+      struct glamo_spi *gs = to_gs(spi);
-+
-+      dev_dbg(&spi->dev, "chipsel %d: spi=%p, gs=%p, info=%p, handle=%p\n",
-+              value, spi, gs, gs->info, gs->info->glamofb_handle);
-+
-+      glamofb_cmd_mode(gs->info->glamofb_handle, value);
-+#endif
-+}
-+
-+static int glamo_spi_txrx(struct spi_device *spi, struct spi_transfer *t)
-+{
-+      struct glamo_spi *gs = to_gs(spi);
-+      const u_int16_t *ui16 = (const u_int16_t *) t->tx_buf;
-+      u_int16_t nine_bits;
-+      int i;
-+
-+      dev_dbg(&spi->dev, "txrx: tx %p, rx %p, bpw %d, len %d\n",
-+              t->tx_buf, t->rx_buf, t->bits_per_word, t->len);
-+
-+      if (spi->bits_per_word == 9)
-+              nine_bits = (1 << 9);
-+      else
-+              nine_bits = 0;
-+
-+      if (t->len > 3 * sizeof(u_int16_t)) {
-+              dev_err(&spi->dev, "this driver doesn't support "
-+                      "%u sized xfers\n", t->len);
-+              return -EINVAL;
-+      }
-+
-+      for (i = 0; i < t->len/sizeof(u_int16_t); i++) {
-+              /* actually transfer the data */
-+#if 1
-+              glamofb_cmd_write(gs->info->glamofb_handle,
-+                                GLAMO_LCD_CMD_TYPE_SERIAL | nine_bits |
-+                                (1 << 10) | (1 << 11) | (ui16[i] & 0x1ff));
-+#endif
-+              /* FIXME: fire ?!? */
-+              if (i == 0 && (ui16[i] & 0x1ff) == 0x29) {
-+                      dev_dbg(&spi->dev, "leaving command mode\n");
-+                      glamofb_cmd_mode(gs->info->glamofb_handle, 0);
-+              }
-+      }
-+
-+      return t->len;
-+}
-+
-+static int glamo_spi_setup(struct spi_device *spi)
-+{
-+      int ret;
-+
-+      if (!spi->bits_per_word)
-+              spi->bits_per_word = 9;
-+
-+      /* FIXME: hardware can do this */
-+      if (spi->mode & SPI_LSB_FIRST)
-+              return -EINVAL;
-+
-+      ret = glamo_spi_setupxfer(spi, NULL);
-+      if (ret < 0) {
-+              dev_err(&spi->dev, "setupxfer returned %d\n", ret);
-+              return ret;
-+      }
-+
-+      dev_dbg(&spi->dev, "%s: mode %d, %u bpw\n",
-+              __FUNCTION__, spi->mode, spi->bits_per_word);
-+
-+      return 0;
-+}
-+
-+static int glamo_spi_probe(struct platform_device *pdev)
-+{
-+      struct spi_master *master;
-+      struct glamo_spi *sp;
-+      int ret;
-+      int i;
-+
-+      master = spi_alloc_master(&pdev->dev, sizeof(struct glamo_spi));
-+      if (master == NULL) {
-+              dev_err(&pdev->dev, "failed to allocate spi master\n");
-+              ret = -ENOMEM;
-+              goto err;
-+      }
-+
-+      sp = spi_master_get_devdata(master);
-+      memset(sp, 0, sizeof(struct glamo_spi));
-+
-+      sp->master = spi_master_get(master);
-+      sp->info = pdev->dev.platform_data;
-+      if (!sp->info) {
-+              dev_err(&pdev->dev, "can't operate without platform data\n");
-+              ret = -EIO;
-+              goto err_no_pdev;
-+      }
-+      dev_dbg(&pdev->dev, "sp->info(pdata) = %p\n", sp->info);
-+
-+      sp->dev = &pdev->dev;
-+
-+      platform_set_drvdata(pdev, sp);
-+
-+      sp->bitbang.master = sp->master;
-+      sp->bitbang.setup_transfer = glamo_spi_setupxfer;
-+      sp->bitbang.chipselect = glamo_spi_chipsel;
-+      sp->bitbang.txrx_bufs = glamo_spi_txrx;
-+      sp->bitbang.master->setup = glamo_spi_setup;
-+
-+      ret = spi_bitbang_start(&sp->bitbang);
-+      if (ret)
-+              goto err_no_bitbang;
-+
-+      /* register the chips to go with the board */
-+
-+      glamofb_cmd_mode(sp->info->glamofb_handle, 1);
-+
-+      for (i = 0; i < sp->info->board_size; i++) {
-+              dev_info(&pdev->dev, "registering %p: %s\n",
-+                       &sp->info->board_info[i],
-+                       sp->info->board_info[i].modalias);
-+
-+              sp->info->board_info[i].controller_data = sp;
-+              spi_new_device(master, sp->info->board_info + i);
-+      }
-+
-+      return 0;
-+
-+err_no_bitbang:
-+      platform_set_drvdata(pdev, NULL);
-+err_no_pdev:
-+      spi_master_put(sp->bitbang.master);
-+err:
-+      return ret;
-+
-+}
-+
-+static int glamo_spi_remove(struct platform_device *pdev)
-+{
-+      struct glamo_spi *sp = platform_get_drvdata(pdev);
-+
-+      spi_bitbang_stop(&sp->bitbang);
-+      spi_master_put(sp->bitbang.master);
-+
-+      return 0;
-+}
-+
-+#define glamo_spi_suspend NULL
-+#define glamo_spi_resume NULL
-+
-+static struct platform_driver glamo_spi_drv = {
-+      .probe          = glamo_spi_probe,
-+      .remove         = glamo_spi_remove,
-+      .suspend        = glamo_spi_suspend,
-+      .resume         = glamo_spi_resume,
-+      .driver         = {
-+              .name   = "glamo-lcm-spi",
-+              .owner  = THIS_MODULE,
-+      },
-+};
-+
-+static int __init glamo_spi_init(void)
-+{
-+      return platform_driver_register(&glamo_spi_drv);
-+}
-+
-+static void __exit glamo_spi_exit(void)
-+{
-+      platform_driver_unregister(&glamo_spi_drv);
-+}
-+
-+module_init(glamo_spi_init);
-+module_exit(glamo_spi_exit);
-+
-+MODULE_DESCRIPTION("Smedia Glamo 336x/337x LCM serial command SPI Driver");
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>")
-+MODULE_LICENSE("GPL");
-diff --git a/drivers/mfd/glamo/glamo-regs.h b/drivers/mfd/glamo/glamo-regs.h
-new file mode 100644
-index 0000000..151cd66
---- /dev/null
-+++ b/drivers/mfd/glamo/glamo-regs.h
-@@ -0,0 +1,477 @@
-+#ifndef _GLAMO_REGS_H
-+#define _GLAMO_REGS_H
-+
-+/* Smedia Glamo 336x/337x driver
-+ *
-+ * (C) 2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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
-+ */
-+
-+enum glamo_regster_offsets {
-+      GLAMO_REGOFS_GENERIC    = 0x0000,
-+      GLAMO_REGOFS_HOSTBUS    = 0x0200,
-+      GLAMO_REGOFS_MEMORY     = 0x0300,
-+      GLAMO_REGOFS_VIDCAP     = 0x0400,
-+      GLAMO_REGOFS_ISP        = 0x0500,
-+      GLAMO_REGOFS_JPEG       = 0x0800,
-+      GLAMO_REGOFS_MPEG       = 0x0c00,
-+      GLAMO_REGOFS_LCD        = 0x1100,
-+      GLAMO_REGOFS_MMC        = 0x1400,
-+      GLAMO_REGOFS_MPROC0     = 0x1500,
-+      GLAMO_REGOFS_MPROC1     = 0x1580,
-+      GLAMO_REGOFS_CMDQUEUE   = 0x1600,
-+      GLAMO_REGOFS_RISC       = 0x1680,
-+      GLAMO_REGOFS_2D         = 0x1700,
-+      GLAMO_REGOFS_3D         = 0x1b00,
-+      GLAMO_REGOFS_END        = 0x2400,
-+};
-+
-+
-+enum glamo_register_generic {
-+      GLAMO_REG_GCONF1        = 0x0000,
-+      GLAMO_REG_GCONF2        = 0x0002,
-+#define       GLAMO_REG_DEVICE_ID     GLAMO_REG_GCONF2
-+      GLAMO_REG_GCONF3        = 0x0004,
-+#define       GLAMO_REG_REVISION_ID   GLAMO_REG_GCONF3
-+      GLAMO_REG_IRQ_GEN1      = 0x0006,
-+#define GLAMO_REG_IRQ_ENABLE  GLAMO_REG_IRQ_GEN1
-+      GLAMO_REG_IRQ_GEN2      = 0x0008,
-+#define GLAMO_REG_IRQ_SET     GLAMO_REG_IRQ_GEN2
-+      GLAMO_REG_IRQ_GEN3      = 0x000a,
-+#define GLAMO_REG_IRQ_CLEAR   GLAMO_REG_IRQ_GEN3
-+      GLAMO_REG_IRQ_GEN4      = 0x000c,
-+#define GLAMO_REG_IRQ_STATUS  GLAMO_REG_IRQ_GEN4
-+      GLAMO_REG_CLOCK_HOST    = 0x0010,
-+      GLAMO_REG_CLOCK_MEMORY  = 0x0012,
-+      GLAMO_REG_CLOCK_LCD     = 0x0014,
-+      GLAMO_REG_CLOCK_MMC     = 0x0016,
-+      GLAMO_REG_CLOCK_ISP     = 0x0018,
-+      GLAMO_REG_CLOCK_JPEG    = 0x001a,
-+      GLAMO_REG_CLOCK_3D      = 0x001c,
-+      GLAMO_REG_CLOCK_2D      = 0x001e,
-+      GLAMO_REG_CLOCK_RISC1   = 0x0020,       /* 3365 only? */
-+      GLAMO_REG_CLOCK_RISC2   = 0x0022,       /* 3365 only? */
-+      GLAMO_REG_CLOCK_MPEG    = 0x0024,
-+      GLAMO_REG_CLOCK_MPROC   = 0x0026,
-+
-+      GLAMO_REG_CLOCK_GEN5_1  = 0x0030,
-+      GLAMO_REG_CLOCK_GEN5_2  = 0x0032,
-+      GLAMO_REG_CLOCK_GEN6    = 0x0034,
-+      GLAMO_REG_CLOCK_GEN7    = 0x0036,
-+      GLAMO_REG_CLOCK_GEN8    = 0x0038,
-+      GLAMO_REG_CLOCK_GEN9    = 0x003a,
-+      GLAMO_REG_CLOCK_GEN10   = 0x003c,
-+      GLAMO_REG_CLOCK_GEN11   = 0x003e,
-+      GLAMO_REG_PLL_GEN1      = 0x0040,
-+      GLAMO_REG_PLL_GEN2      = 0x0042,
-+      GLAMO_REG_PLL_GEN3      = 0x0044,
-+      GLAMO_REG_PLL_GEN4      = 0x0046,
-+      GLAMO_REG_PLL_GEN5      = 0x0048,
-+      GLAMO_REG_GPIO_GEN1     = 0x0050,
-+      GLAMO_REG_GPIO_GEN2     = 0x0052,
-+      GLAMO_REG_GPIO_GEN3     = 0x0054,
-+      GLAMO_REG_GPIO_GEN4     = 0x0056,
-+      GLAMO_REG_GPIO_GEN5     = 0x0058,
-+      GLAMO_REG_GPIO_GEN6     = 0x005a,
-+      GLAMO_REG_GPIO_GEN7     = 0x005c,
-+      GLAMO_REG_GPIO_GEN8     = 0x005e,
-+      GLAMO_REG_GPIO_GEN9     = 0x0060,
-+      GLAMO_REG_GPIO_GEN10    = 0x0062,
-+      GLAMO_REG_DFT_GEN1      = 0x0070,
-+      GLAMO_REG_DFT_GEN2      = 0x0072,
-+      GLAMO_REG_DFT_GEN3      = 0x0074,
-+      GLAMO_REG_DFT_GEN4      = 0x0076,
-+
-+      GLAMO_REG_DFT_GEN5      = 0x01e0,
-+      GLAMO_REG_DFT_GEN6      = 0x01f0,
-+};
-+
-+#define GLAMO_REG_HOSTBUS(x)  (GLAMO_REGOFS_HOSTBUS-2+(x*2))
-+
-+#define REG_MEM(x)            (GLAMO_REGOFS_MEMORY+(x))
-+#define GLAMO_REG_MEM_TIMING(x)       (GLAMO_REG_MEM_TIMING1-2+(x*2))
-+
-+enum glamo_register_mem {
-+      GLAMO_REG_MEM_TYPE      = REG_MEM(0x00),
-+      GLAMO_REG_MEM_GEN       = REG_MEM(0x02),
-+      GLAMO_REG_MEM_TIMING1   = REG_MEM(0x04),
-+      GLAMO_REG_MEM_TIMING2   = REG_MEM(0x06),
-+      GLAMO_REG_MEM_TIMING3   = REG_MEM(0x08),
-+      GLAMO_REG_MEM_TIMING4   = REG_MEM(0x0a),
-+      GLAMO_REG_MEM_TIMING5   = REG_MEM(0x0c),
-+      GLAMO_REG_MEM_TIMING6   = REG_MEM(0x0e),
-+      GLAMO_REG_MEM_TIMING7   = REG_MEM(0x10),
-+      GLAMO_REG_MEM_TIMING8   = REG_MEM(0x12),
-+      GLAMO_REG_MEM_TIMING9   = REG_MEM(0x14),
-+      GLAMO_REG_MEM_TIMING10  = REG_MEM(0x16),
-+      GLAMO_REG_MEM_TIMING11  = REG_MEM(0x18),
-+      GLAMO_REG_MEM_POWER1    = REG_MEM(0x1a),
-+      GLAMO_REG_MEM_POWER2    = REG_MEM(0x1c),
-+      GLAMO_REG_MEM_LCD_BUF1  = REG_MEM(0x1e),
-+      GLAMO_REG_MEM_LCD_BUF2  = REG_MEM(0x20),
-+      GLAMO_REG_MEM_LCD_BUF3  = REG_MEM(0x22),
-+      GLAMO_REG_MEM_LCD_BUF4  = REG_MEM(0x24),
-+      GLAMO_REG_MEM_BIST1     = REG_MEM(0x26),
-+      GLAMO_REG_MEM_BIST2     = REG_MEM(0x28),
-+      GLAMO_REG_MEM_BIST3     = REG_MEM(0x2a),
-+      GLAMO_REG_MEM_BIST4     = REG_MEM(0x2c),
-+      GLAMO_REG_MEM_BIST5     = REG_MEM(0x2e),
-+      GLAMO_REG_MEM_MAH1      = REG_MEM(0x30),
-+      GLAMO_REG_MEM_MAH2      = REG_MEM(0x32),
-+      GLAMO_REG_MEM_DRAM1     = REG_MEM(0x34),
-+      GLAMO_REG_MEM_DRAM2     = REG_MEM(0x36),
-+      GLAMO_REG_MEM_CRC       = REG_MEM(0x38),
-+};
-+
-+#define GLAMO_MEM_TYPE_MASK   0x03
-+
-+enum glamo_reg_mem_dram1 {
-+      GLAMO_MEM_DRAM1_EN_SDRAM_CLK    = (1 << 11),
-+      GLAMO_MEM_DRAM1_SELF_REFRESH    = (1 << 12),
-+};
-+
-+enum glamo_reg_mem_dram2 {
-+      GLAMO_MEM_DRAM2_DEEP_PWRDOWN    = (1 << 12),
-+};
-+
-+enum glamo_irq {
-+      GLAMO_IRQ_HOSTBUS       = 0x0001,
-+      GLAMO_IRQ_JPEG          = 0x0002,
-+      GLAMO_IRQ_MPEG          = 0x0004,
-+      GLAMO_IRQ_MPROC1        = 0x0008,
-+      GLAMO_IRQ_MPROC0        = 0x0010,
-+      GLAMO_IRQ_CMDQUEUE      = 0x0020,
-+      GLAMO_IRQ_2D            = 0x0040,
-+      GLAMO_IRQ_MMC           = 0x0080,
-+      GLAMO_IRQ_RISC          = 0x0100,
-+};
-+
-+enum glamo_reg_clock_host {
-+      GLAMO_CLOCK_HOST_DG_BCLK        = 0x0001,
-+      GLAMO_CLOCK_HOST_DG_M0CLK       = 0x0004,
-+      GLAMO_CLOCK_HOST_RESET          = 0x1000,
-+};
-+
-+enum glamo_reg_clock_mem {
-+      GLAMO_CLOCK_MEM_DG_M1CLK        = 0x0001,
-+      GLAMO_CLOCK_MEM_EN_M1CLK        = 0x0002,
-+      GLAMO_CLOCK_MEM_DG_MOCACLK      = 0x0004,
-+      GLAMO_CLOCK_MEM_EN_MOCACLK      = 0x0008,
-+      GLAMO_CLOCK_MEM_RESET           = 0x1000,
-+      GLAMO_CLOCK_MOCA_RESET          = 0x2000,
-+};
-+
-+enum glamo_reg_clock_lcd {
-+      GLAMO_CLOCK_LCD_DG_DCLK         = 0x0001,
-+      GLAMO_CLOCK_LCD_EN_DCLK         = 0x0002,
-+      GLAMO_CLOCK_LCD_DG_DMCLK        = 0x0004,
-+      GLAMO_CLOCK_LCD_EN_DMCLK        = 0x0008,
-+      //
-+      GLAMO_CLOCK_LCD_EN_DHCLK        = 0x0020,
-+      GLAMO_CLOCK_LCD_DG_M5CLK        = 0x0040,
-+      GLAMO_CLOCK_LCD_EN_M5CLK        = 0x0080,
-+      GLAMO_CLOCK_LCD_RESET           = 0x1000,
-+};
-+
-+enum glamo_reg_clock_mmc {
-+      GLAMO_CLOCK_MMC_DG_TCLK         = 0x0001,
-+      GLAMO_CLOCK_MMC_EN_TCLK         = 0x0002,
-+      GLAMO_CLOCK_MMC_DG_M9CLK        = 0x0004,
-+      GLAMO_CLOCK_MMC_EN_M9CLK        = 0x0008,
-+      GLAMO_CLOCK_MMC_RESET           = 0x1000,
-+};
-+
-+enum glamo_reg_clock_isp {
-+      GLAMO_CLOCK_ISP_DG_I1CLK        = 0x0001,
-+      GLAMO_CLOCK_ISP_EN_I1CLK        = 0x0002,
-+      GLAMO_CLOCK_ISP_DG_CCLK         = 0x0004,
-+      GLAMO_CLOCK_ISP_EN_CCLK         = 0x0008,
-+      //
-+      GLAMO_CLOCK_ISP_EN_SCLK         = 0x0020,
-+      GLAMO_CLOCK_ISP_DG_M2CLK        = 0x0040,
-+      GLAMO_CLOCK_ISP_EN_M2CLK        = 0x0080,
-+      GLAMO_CLOCK_ISP_DG_M15CLK       = 0x0100,
-+      GLAMO_CLOCK_ISP_EN_M15CLK       = 0x0200,
-+      GLAMO_CLOCK_ISP1_RESET          = 0x1000,
-+      GLAMO_CLOCK_ISP2_RESET          = 0x2000,
-+};
-+
-+enum glamo_reg_clock_jpeg {
-+      GLAMO_CLOCK_JPEG_DG_JCLK        = 0x0001,
-+      GLAMO_CLOCK_JPEG_EN_JCLK        = 0x0002,
-+      GLAMO_CLOCK_JPEG_DG_M3CLK       = 0x0004,
-+      GLAMO_CLOCK_JPEG_EN_M3CLK       = 0x0008,
-+      GLAMO_CLOCK_JPEG_RESET          = 0x1000,
-+};
-+
-+enum glamo_reg_clock_2d {
-+      GLAMO_CLOCK_2D_DG_GCLK          = 0x0001,
-+      GLAMO_CLOCK_2D_EN_GCLK          = 0x0002,
-+      GLAMO_CLOCK_2D_DG_M7CLK         = 0x0004,
-+      GLAMO_CLOCK_2D_EN_M7CLK         = 0x0008,
-+      GLAMO_CLOCK_2D_DG_M6CLK         = 0x0010,
-+      GLAMO_CLOCK_2D_EN_M6CLK         = 0x0020,
-+      GLAMO_CLOCK_2D_RESET            = 0x1000,
-+      GLAMO_CLOCK_2D_CQ_RESET         = 0x2000,
-+};
-+
-+enum glamo_reg_clock_3d {
-+      GLAMO_CLOCK_3D_DG_ECLK          = 0x0001,
-+      GLAMO_CLOCK_3D_EN_ECLK          = 0x0002,
-+      GLAMO_CLOCK_3D_DG_RCLK          = 0x0004,
-+      GLAMO_CLOCK_3D_EN_RCLK          = 0x0008,
-+      GLAMO_CLOCK_3D_DG_M8CLK         = 0x0010,
-+      GLAMO_CLOCK_3D_EN_M8CLK         = 0x0020,
-+      GLAMO_CLOCK_3D_BACK_RESET       = 0x1000,
-+      GLAMO_CLOCK_3D_FRONT_RESET      = 0x2000,
-+};
-+
-+enum glamo_reg_clock_mpeg {
-+      GLAMO_CLOCK_MPEG_DG_X0CLK       = 0x0001,
-+      GLAMO_CLOCK_MPEG_EN_X0CLK       = 0x0002,
-+      GLAMO_CLOCK_MPEG_DG_X1CLK       = 0x0004,
-+      GLAMO_CLOCK_MPEG_EN_X1CLK       = 0x0008,
-+      GLAMO_CLOCK_MPEG_DG_X2CLK       = 0x0010,
-+      GLAMO_CLOCK_MPEG_EN_X2CLK       = 0x0020,
-+      GLAMO_CLOCK_MPEG_DG_X3CLK       = 0x0040,
-+      GLAMO_CLOCK_MPEG_EN_X3CLK       = 0x0080,
-+      GLAMO_CLOCK_MPEG_DG_X4CLK       = 0x0100,
-+      GLAMO_CLOCK_MPEG_EN_X4CLK       = 0x0200,
-+      GLAMO_CLOCK_MPEG_DG_X6CLK       = 0x0400,
-+      GLAMO_CLOCK_MPEG_EN_X6CLK       = 0x0800,
-+      GLAMO_CLOCK_MPEG_ENC_RESET      = 0x1000,
-+      GLAMO_CLOCK_MPEG_DEC_RESET      = 0x2000,
-+};
-+
-+enum glamo_reg_clock51 {
-+      GLAMO_CLOCK_GEN51_EN_DIV_MCLK   = 0x0001,
-+      GLAMO_CLOCK_GEN51_EN_DIV_SCLK   = 0x0002,
-+      GLAMO_CLOCK_GEN51_EN_DIV_JCLK   = 0x0004,
-+      GLAMO_CLOCK_GEN51_EN_DIV_DCLK   = 0x0008,
-+      GLAMO_CLOCK_GEN51_EN_DIV_DMCLK  = 0x0010,
-+      GLAMO_CLOCK_GEN51_EN_DIV_DHCLK  = 0x0020,
-+      GLAMO_CLOCK_GEN51_EN_DIV_GCLK   = 0x0040,
-+      GLAMO_CLOCK_GEN51_EN_DIV_TCLK   = 0x0080,
-+      /* FIXME: higher bits */
-+};
-+
-+enum glamo_reg_hostbus2 {
-+      GLAMO_HOSTBUS2_MMIO_EN_ISP      = 0x0001,
-+      GLAMO_HOSTBUS2_MMIO_EN_JPEG     = 0x0002,
-+      GLAMO_HOSTBUS2_MMIO_EN_MPEG     = 0x0004,
-+      GLAMO_HOSTBUS2_MMIO_EN_LCD      = 0x0008,
-+      GLAMO_HOSTBUS2_MMIO_EN_MMC      = 0x0010,
-+      GLAMO_HOSTBUS2_MMIO_EN_MICROP0  = 0x0020,
-+      GLAMO_HOSTBUS2_MMIO_EN_MICROP1  = 0x0040,
-+      GLAMO_HOSTBUS2_MMIO_EN_CQ       = 0x0080,
-+      GLAMO_HOSTBUS2_MMIO_EN_RISC     = 0x0100,
-+      GLAMO_HOSTBUS2_MMIO_EN_2D       = 0x0200,
-+      GLAMO_HOSTBUS2_MMIO_EN_3D       = 0x0400,
-+};
-+
-+/* LCD Controller */
-+
-+#define REG_LCD(x)    (x)
-+enum glamo_reg_lcd {
-+      GLAMO_REG_LCD_MODE1             = REG_LCD(0x00),
-+      GLAMO_REG_LCD_MODE2             = REG_LCD(0x02),
-+      GLAMO_REG_LCD_MODE3             = REG_LCD(0x04),
-+      GLAMO_REG_LCD_WIDTH             = REG_LCD(0x06),
-+      GLAMO_REG_LCD_HEIGHT            = REG_LCD(0x08),
-+      GLAMO_REG_LCD_POLARITY          = REG_LCD(0x0a),
-+      GLAMO_REG_LCD_A_BASE1           = REG_LCD(0x0c),
-+      GLAMO_REG_LCD_A_BASE2           = REG_LCD(0x0e),
-+      GLAMO_REG_LCD_B_BASE1           = REG_LCD(0x10),
-+      GLAMO_REG_LCD_B_BASE2           = REG_LCD(0x12),
-+      GLAMO_REG_LCD_C_BASE1           = REG_LCD(0x14),
-+      GLAMO_REG_LCD_C_BASE2           = REG_LCD(0x16),
-+      GLAMO_REG_LCD_PITCH             = REG_LCD(0x18),
-+      /* RES */
-+      GLAMO_REG_LCD_HORIZ_TOTAL       = REG_LCD(0x1c),
-+      /* RES */
-+      GLAMO_REG_LCD_HORIZ_RETR_START  = REG_LCD(0x20),
-+      /* RES */
-+      GLAMO_REG_LCD_HORIZ_RETR_END    = REG_LCD(0x24),
-+      /* RES */
-+      GLAMO_REG_LCD_HORIZ_DISP_START  = REG_LCD(0x28),
-+      /* RES */
-+      GLAMO_REG_LCD_HORIZ_DISP_END    = REG_LCD(0x2c),
-+      /* RES */
-+      GLAMO_REG_LCD_VERT_TOTAL        = REG_LCD(0x30),
-+      /* RES */
-+      GLAMO_REG_LCD_VERT_RETR_START   = REG_LCD(0x34),
-+      /* RES */
-+      GLAMO_REG_LCD_VERT_RETR_END     = REG_LCD(0x38),
-+      /* RES */
-+      GLAMO_REG_LCD_VERT_DISP_START   = REG_LCD(0x3c),
-+      /* RES */
-+      GLAMO_REG_LCD_VERT_DISP_END     = REG_LCD(0x40),
-+      /* RES */
-+      GLAMO_REG_LCD_POL               = REG_LCD(0x44),
-+      GLAMO_REG_LCD_DATA_START        = REG_LCD(0x46),
-+      GLAMO_REG_LCD_FRATE_CONTRO      = REG_LCD(0x48),
-+      GLAMO_REG_LCD_DATA_CMD_HDR      = REG_LCD(0x4a),
-+      GLAMO_REG_LCD_SP_START          = REG_LCD(0x4c),
-+      GLAMO_REG_LCD_SP_END            = REG_LCD(0x4e),
-+      GLAMO_REG_LCD_CURSOR_BASE1      = REG_LCD(0x50),
-+      GLAMO_REG_LCD_CURSOR_BASE2      = REG_LCD(0x52),
-+      GLAMO_REG_LCD_CURSOR_PITCH      = REG_LCD(0x54),
-+      GLAMO_REG_LCD_CURSOR_X_SIZE     = REG_LCD(0x56),
-+      GLAMO_REG_LCD_CURSOR_Y_SIZE     = REG_LCD(0x58),
-+      GLAMO_REG_LCD_CURSOR_X_POS      = REG_LCD(0x5a),
-+      GLAMO_REG_LCD_CURSOR_Y_POS      = REG_LCD(0x5c),
-+      GLAMO_REG_LCD_CURSOR_PRESET     = REG_LCD(0x5e),
-+      GLAMO_REG_LCD_CURSOR_FG_COLOR   = REG_LCD(0x60),
-+      /* RES */
-+      GLAMO_REG_LCD_CURSOR_BG_COLOR   = REG_LCD(0x64),
-+      /* RES */
-+      GLAMO_REG_LCD_CURSOR_DST_COLOR  = REG_LCD(0x68),
-+      /* RES */
-+      GLAMO_REG_LCD_STATUS1           = REG_LCD(0x80),
-+      GLAMO_REG_LCD_STATUS2           = REG_LCD(0x82),
-+      GLAMO_REG_LCD_STATUS3           = REG_LCD(0x84),
-+      GLAMO_REG_LCD_STATUS4           = REG_LCD(0x86),
-+      /* RES */
-+      GLAMO_REG_LCD_COMMAND1          = REG_LCD(0xa0),
-+      GLAMO_REG_LCD_COMMAND2          = REG_LCD(0xa2),
-+      /* RES */
-+      GLAMO_REG_LCD_WFORM_DELAY1      = REG_LCD(0xb0),
-+      GLAMO_REG_LCD_WFORM_DELAY2      = REG_LCD(0xb2),
-+      /* RES */
-+      GLAMO_REG_LCD_GAMMA_CORR        = REG_LCD(0x100),
-+      /* RES */
-+      GLAMO_REG_LCD_GAMMA_R_ENTRY01   = REG_LCD(0x110),
-+      GLAMO_REG_LCD_GAMMA_R_ENTRY23   = REG_LCD(0x112),
-+      GLAMO_REG_LCD_GAMMA_R_ENTRY45   = REG_LCD(0x114),
-+      GLAMO_REG_LCD_GAMMA_R_ENTRY67   = REG_LCD(0x116),
-+      GLAMO_REG_LCD_GAMMA_R_ENTRY8    = REG_LCD(0x118),
-+      /* RES */
-+      GLAMO_REG_LCD_GAMMA_G_ENTRY01   = REG_LCD(0x130),
-+      GLAMO_REG_LCD_GAMMA_G_ENTRY23   = REG_LCD(0x132),
-+      GLAMO_REG_LCD_GAMMA_G_ENTRY45   = REG_LCD(0x134),
-+      GLAMO_REG_LCD_GAMMA_G_ENTRY67   = REG_LCD(0x136),
-+      GLAMO_REG_LCD_GAMMA_G_ENTRY8    = REG_LCD(0x138),
-+      /* RES */
-+      GLAMO_REG_LCD_GAMMA_B_ENTRY01   = REG_LCD(0x150),
-+      GLAMO_REG_LCD_GAMMA_B_ENTRY23   = REG_LCD(0x152),
-+      GLAMO_REG_LCD_GAMMA_B_ENTRY45   = REG_LCD(0x154),
-+      GLAMO_REG_LCD_GAMMA_B_ENTRY67   = REG_LCD(0x156),
-+      GLAMO_REG_LCD_GAMMA_B_ENTRY8    = REG_LCD(0x158),
-+      /* RES */
-+      GLAMO_REG_LCD_SRAM_DRIVING1     = REG_LCD(0x160),
-+      GLAMO_REG_LCD_SRAM_DRIVING2     = REG_LCD(0x162),
-+      GLAMO_REG_LCD_SRAM_DRIVING3     = REG_LCD(0x164),
-+};
-+
-+enum glamo_reg_lcd_mode1 {
-+      GLAMO_LCD_MODE1_PWRSAVE         = 0x0001,
-+      GLAMO_LCD_MODE1_PARTIAL_PRT     = 0x0002,
-+      GLAMO_LCD_MODE1_HWFLIP          = 0x0004,
-+      GLAMO_LCD_MODE1_LCD2            = 0x0008,
-+      /* RES */
-+      GLAMO_LCD_MODE1_PARTIAL_MODE    = 0x0020,
-+      GLAMO_LCD_MODE1_CURSOR_DSTCOLOR = 0x0040,
-+      GLAMO_LCD_MODE1_PARTIAL_ENABLE  = 0x0080,
-+      GLAMO_LCD_MODE1_TVCLK_IN_ENABLE = 0x0100,
-+      GLAMO_LCD_MODE1_HSYNC_HIGH_ACT  = 0x0200,
-+      GLAMO_LCD_MODE1_VSYNC_HIGH_ACT  = 0x0400,
-+      GLAMO_LCD_MODE1_HSYNC_FLIP      = 0x0800,
-+      GLAMO_LCD_MODE1_GAMMA_COR_EN    = 0x1000,
-+      GLAMO_LCD_MODE1_DITHER_EN       = 0x2000,
-+      GLAMO_LCD_MODE1_CURSOR_EN       = 0x4000,
-+      GLAMO_LCD_MODE1_ROTATE_EN       = 0x8000,
-+};
-+
-+enum glamo_reg_lcd_mode2 {
-+      GLAMO_LCD_MODE2_CRC_CHECK_EN    = 0x0001,
-+      GLAMO_LCD_MODE2_DCMD_PER_LINE   = 0x0002,
-+      GLAMO_LCD_MODE2_NOUSE_BDEF      = 0x0004,
-+      GLAMO_LCD_MODE2_OUT_POS_MODE    = 0x0008,
-+      GLAMO_LCD_MODE2_FRATE_CTRL_EN   = 0x0010,
-+      GLAMO_LCD_MODE2_SINGLE_BUFFER   = 0x0020,
-+      GLAMO_LCD_MODE2_SER_LSB_TO_MSB  = 0x0040,
-+      /* FIXME */
-+};
-+
-+enum glamo_reg_lcd_mode3 {
-+      /* LCD color source data format */
-+      GLAMO_LCD_SRC_RGB565            = 0x0000,
-+      GLAMO_LCD_SRC_ARGB1555          = 0x4000,
-+      GLAMO_LCD_SRC_ARGB4444          = 0x8000,
-+      /* interface type */
-+      GLAMO_LCD_MODE3_LCD             = 0x1000,
-+      GLAMO_LCD_MODE3_RGB             = 0x0800,
-+      GLAMO_LCD_MODE3_CPU             = 0x0000,
-+      /* mode */
-+      GLAMO_LCD_MODE3_RGB332          = 0x0000,
-+      GLAMO_LCD_MODE3_RGB444          = 0x0100,
-+      GLAMO_LCD_MODE3_RGB565          = 0x0200,
-+      GLAMO_LCD_MODE3_RGB666          = 0x0300,
-+      /* depth */
-+      GLAMO_LCD_MODE3_6BITS           = 0x0000,
-+      GLAMO_LCD_MODE3_8BITS           = 0x0010,
-+      GLAMO_LCD_MODE3_9BITS           = 0x0020,
-+      GLAMO_LCD_MODE3_16BITS          = 0x0030,
-+      GLAMO_LCD_MODE3_18BITS          = 0x0040,
-+};
-+
-+enum glamo_lcd_rot_mode {
-+        GLAMO_LCD_ROT_MODE_0            = 0x0000,
-+        GLAMO_LCD_ROT_MODE_180          = 0x2000,
-+        GLAMO_LCD_ROT_MODE_MIRROR       = 0x4000,
-+        GLAMO_LCD_ROT_MODE_FLIP         = 0x6000,
-+        GLAMO_LCD_ROT_MODE_90           = 0x8000,
-+        GLAMO_LCD_ROT_MODE_270          = 0xa000,
-+};
-+#define GLAMO_LCD_ROT_MODE_MASK         0xe000
-+
-+enum glamo_lcd_cmd_type {
-+      GLAMO_LCD_CMD_TYPE_DISP         = 0x0000,
-+      GLAMO_LCD_CMD_TYPE_PARALLEL     = 0x4000,
-+      GLAMO_LCD_CMD_TYPE_SERIAL       = 0x8000,
-+      GLAMO_LCD_CMD_TYPE_SERIAL_DIRECT= 0xc000,
-+};
-+#define GLAMO_LCD_CMD_TYPE_MASK               0xc000
-+
-+enum glamo_lcd_cmds {
-+      GLAMO_LCD_CMD_DATA_DISP_FIRE    = 0x00,
-+      GLAMO_LCD_CMD_DATA_DISP_SYNC    = 0x01,         /* RGB only */
-+      /* switch to command mode, no display */
-+      GLAMO_LCD_CMD_DATA_FIRE_NO_DISP = 0x02,
-+      /* display until VSYNC, switch to command */
-+      GLAMO_LCD_CMD_DATA_FIRE_VSYNC   = 0x11,
-+      /* display until HSYNC, switch to command */
-+      GLAMO_LCD_CMD_DATA_FIRE_HSYNC   = 0x12,
-+      /* display until VSYNC, 1 black frame, VSYNC, switch to command */
-+      GLAMO_LCD_CMD_DATA_FIRE_VSYNC_B = 0x13,
-+      /* don't care about display and switch to command */
-+      GLAMO_LCD_CMD_DATA_FIRE_FREE    = 0x14,         /* RGB only */
-+      /* don't care about display, keep data display but disable data,
-+       * and switch to command */
-+      GLAMO_LCD_CMD_DATA_FIRE_FREE_D  = 0x15,         /* RGB only */
-+};
-+
-+enum glamo_core_revisions {
-+      GLAMO_CORE_REV_A0               = 0x0000,
-+      GLAMO_CORE_REV_A1               = 0x0001,
-+      GLAMO_CORE_REV_A2               = 0x0002,
-+      GLAMO_CORE_REV_A3               = 0x0003,
-+};
-+
-+#endif /* _GLAMO_REGS_H */
-diff --git a/drivers/mfd/glamo/glamo-spi-gpio.c b/drivers/mfd/glamo/glamo-spi-gpio.c
-new file mode 100644
-index 0000000..73926bd
---- /dev/null
-+++ b/drivers/mfd/glamo/glamo-spi-gpio.c
-@@ -0,0 +1,256 @@
-+/*
-+ * Copyright (C) 2007 OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ *
-+ * Smedia Glamo GPIO based SPI driver
-+ *
-+ * 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 driver currently only implements a minimum subset of the hardware
-+ * features, esp. those features that are required to drive the jbt6k74
-+ * LCM controller asic in the TD028TTEC1 LCM.
-+ *
-+*/
-+
-+#define DEBUG
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/device.h>
-+#include <linux/spinlock.h>
-+#include <linux/workqueue.h>
-+#include <linux/platform_device.h>
-+
-+#include <linux/spi/spi.h>
-+#include <linux/spi/spi_bitbang.h>
-+#include <linux/spi/glamo.h>
-+
-+#include <linux/glamofb.h>
-+
-+#include <asm/hardware.h>
-+
-+#include "glamo-core.h"
-+#include "glamo-regs.h"
-+
-+struct glamo_spigpio {
-+      struct spi_bitbang              bitbang;
-+      struct spi_master               *master;
-+      struct glamo_spigpio_info       *info;
-+      struct glamo_core               *glamo;
-+};
-+
-+static inline struct glamo_spigpio *to_sg(struct spi_device *spi)
-+{
-+      return spi->controller_data;
-+}
-+
-+static inline void setsck(struct spi_device *dev, int on)
-+{
-+      struct glamo_spigpio *sg = to_sg(dev);
-+      glamo_gpio_setpin(sg->glamo, sg->info->pin_clk, on ? 1 : 0);
-+}
-+
-+static inline void setmosi(struct spi_device *dev, int on)
-+{
-+      struct glamo_spigpio *sg = to_sg(dev);
-+      glamo_gpio_setpin(sg->glamo, sg->info->pin_mosi, on ? 1 : 0);
-+}
-+
-+static inline u32 getmiso(struct spi_device *dev)
-+{
-+      struct glamo_spigpio *sg = to_sg(dev);
-+      if (sg->info->pin_miso)
-+              return glamo_gpio_getpin(sg->glamo, sg->info->pin_miso) ? 1 : 0;
-+      else
-+              return 0;
-+}
-+
-+#define spidelay(x) ndelay(x)
-+
-+#define EXPAND_BITBANG_TXRX
-+#include <linux/spi/spi_bitbang.h>
-+
-+static u32 glamo_spigpio_txrx_mode0(struct spi_device *spi,
-+                                  unsigned nsecs, u32 word, u8 bits)
-+{
-+      return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 glamo_spigpio_txrx_mode1(struct spi_device *spi,
-+                                  unsigned nsecs, u32 word, u8 bits)
-+{
-+      return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 glamo_spigpio_txrx_mode2(struct spi_device *spi,
-+                                  unsigned nsecs, u32 word, u8 bits)
-+{
-+      return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, bits);
-+}
-+
-+static u32 glamo_spigpio_txrx_mode3(struct spi_device *spi,
-+                                  unsigned nsecs, u32 word, u8 bits)
-+{
-+      return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, bits);
-+}
-+
-+
-+#if 0
-+static int glamo_spigpio_setupxfer(struct spi_device *spi,
-+                                 struct spi_transfer *t)
-+{
-+      struct glamo_spi *gs = to_sg(spi);
-+      unsigned int bpw;
-+
-+      bpw = t ? t->bits_per_word : spi->bits_per_word;
-+
-+      if (bpw != 9 && bpw != 8) {
-+              dev_err(&spi->dev, "invalid bits-per-word (%d)\n", bpw);
-+              return -EINVAL;
-+      }
-+
-+      return 0;
-+}
-+#endif
-+
-+static void glamo_spigpio_chipsel(struct spi_device *spi, int value)
-+{
-+      struct glamo_spigpio *gs = to_sg(spi);
-+#if 0
-+      dev_dbg(&spi->dev, "chipsel %d: spi=%p, gs=%p, info=%p, handle=%p\n",
-+              value, spi, gs, gs->info, gs->info->glamo);
-+#endif
-+      glamo_gpio_setpin(gs->glamo, gs->info->pin_cs, value ? 0 : 1);
-+}
-+
-+
-+static int glamo_spigpio_probe(struct platform_device *pdev)
-+{
-+      struct spi_master *master;
-+      struct glamo_spigpio *sp;
-+      int ret;
-+      int i;
-+
-+      master = spi_alloc_master(&pdev->dev, sizeof(struct glamo_spigpio));
-+      if (master == NULL) {
-+              dev_err(&pdev->dev, "failed to allocate spi master\n");
-+              ret = -ENOMEM;
-+              goto err;
-+      }
-+
-+      sp = spi_master_get_devdata(master);
-+      platform_set_drvdata(pdev, sp);
-+      sp->info = pdev->dev.platform_data;
-+      if (!sp->info) {
-+              dev_err(&pdev->dev, "can't operate without platform data\n");
-+              ret = -EIO;
-+              goto err_no_pdev;
-+      }
-+
-+      master->num_chipselect = 1;
-+      master->bus_num = 2; /* FIXME: use dynamic number */
-+
-+      sp->master = spi_master_get(master);
-+      sp->glamo = sp->info->glamo;
-+
-+      sp->bitbang.master = sp->master;
-+      sp->bitbang.chipselect = glamo_spigpio_chipsel;
-+      sp->bitbang.txrx_word[SPI_MODE_0] = glamo_spigpio_txrx_mode0;
-+      sp->bitbang.txrx_word[SPI_MODE_1] = glamo_spigpio_txrx_mode1;
-+      sp->bitbang.txrx_word[SPI_MODE_2] = glamo_spigpio_txrx_mode2;
-+      sp->bitbang.txrx_word[SPI_MODE_3] = glamo_spigpio_txrx_mode3;
-+
-+      /* set state of spi pins */
-+      glamo_gpio_setpin(sp->glamo, sp->info->pin_clk, 0);
-+      glamo_gpio_setpin(sp->glamo, sp->info->pin_mosi, 0);
-+      glamo_gpio_setpin(sp->glamo, sp->info->pin_cs, 1);
-+
-+      glamo_gpio_cfgpin(sp->glamo, sp->info->pin_clk);
-+      glamo_gpio_cfgpin(sp->glamo, sp->info->pin_mosi);
-+      glamo_gpio_cfgpin(sp->glamo, sp->info->pin_cs);
-+      if (sp->info->pin_miso)
-+              glamo_gpio_cfgpin(sp->glamo, sp->info->pin_miso);
-+
-+      /* bring the LCM panel out of reset if it isn't already */
-+
-+      glamo_gpio_setpin(sp->glamo, GLAMO_GPIO4, 1);
-+      glamo_gpio_cfgpin(sp->glamo, GLAMO_GPIO4_OUTPUT);
-+      msleep(90);
-+
-+#if 0
-+      sp->dev = &pdev->dev;
-+
-+      sp->bitbang.setup_transfer = glamo_spi_setupxfer;
-+      sp->bitbang.txrx_bufs = glamo_spi_txrx;
-+      sp->bitbang.master->setup = glamo_spi_setup;
-+#endif
-+
-+      ret = spi_bitbang_start(&sp->bitbang);
-+      if (ret)
-+              goto err_no_bitbang;
-+
-+      /* register the chips to go with the board */
-+
-+      for (i = 0; i < sp->info->board_size; i++) {
-+              dev_info(&pdev->dev, "registering %p: %s\n",
-+                       &sp->info->board_info[i],
-+                       sp->info->board_info[i].modalias);
-+
-+              sp->info->board_info[i].controller_data = sp;
-+              spi_new_device(master, sp->info->board_info + i);
-+      }
-+
-+      return 0;
-+
-+err_no_bitbang:
-+      platform_set_drvdata(pdev, NULL);
-+err_no_pdev:
-+      spi_master_put(sp->bitbang.master);
-+err:
-+      return ret;
-+
-+}
-+
-+static int glamo_spigpio_remove(struct platform_device *pdev)
-+{
-+      struct glamo_spigpio *sp = platform_get_drvdata(pdev);
-+
-+      spi_bitbang_stop(&sp->bitbang);
-+      spi_master_put(sp->bitbang.master);
-+
-+      return 0;
-+}
-+
-+#define glamo_spigpio_suspend NULL
-+#define glamo_spigpio_resume NULL
-+
-+static struct platform_driver glamo_spi_drv = {
-+      .probe          = glamo_spigpio_probe,
-+      .remove         = glamo_spigpio_remove,
-+      .suspend        = glamo_spigpio_suspend,
-+      .resume         = glamo_spigpio_resume,
-+      .driver         = {
-+              .name   = "glamo-spi-gpio",
-+              .owner  = THIS_MODULE,
-+      },
-+};
-+
-+static int __init glamo_spi_init(void)
-+{
-+      return platform_driver_register(&glamo_spi_drv);
-+}
-+
-+static void __exit glamo_spi_exit(void)
-+{
-+      platform_driver_unregister(&glamo_spi_drv);
-+}
-+
-+module_init(glamo_spi_init);
-+module_exit(glamo_spi_exit);
-+
-+MODULE_DESCRIPTION("Smedia Glamo 336x/337x LCM serial command SPI Driver");
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>")
-+MODULE_LICENSE("GPL");
-diff --git a/include/asm-arm/arch-s3c2410/irqs.h b/include/asm-arm/arch-s3c2410/irqs.h
-index 996f654..9522cd1 100644
---- a/include/asm-arm/arch-s3c2410/irqs.h
-+++ b/include/asm-arm/arch-s3c2410/irqs.h
-@@ -155,9 +155,37 @@
- #define IRQ_S3C2443_AC97      S3C2410_IRQSUB(28)
- #ifdef CONFIG_CPU_S3C2443
--#define NR_IRQS (IRQ_S3C2443_AC97+1)
-+#define _NR_IRQS (IRQ_S3C2443_AC97+1)
- #else
--#define NR_IRQS (IRQ_S3C2440_AC97+1)
-+#define _NR_IRQS (IRQ_S3C2440_AC97+1)
- #endif
-+/*
-+ * The next 16 interrupts are for board specific purposes.  Since
-+ * the kernel can only run on one machine at a time, we can re-use
-+ * these.  If you need more, increase IRQ_BOARD_END, but keep it
-+ * within sensible limits.
-+ */
-+#define IRQ_BOARD_START               _NR_IRQS
-+#define IRQ_BOARD_END         (_NR_IRQS + 10)
-+
-+#if defined(CONFIG_MACH_NEO1973_GTA02)
-+#define NR_IRQS                       (IRQ_BOARD_END)
-+#else
-+#define NR_IRQS                       (IRQ_BOARD_START)
-+#endif
-+
-+/* Neo1973 GTA02 interrupts */
-+#define NEO1973_GTA02_IRQ(x)  (IRQ_BOARD_START + (x))
-+#define IRQ_GLAMO(x)          NEO1973_GTA02_IRQ(x)
-+#define IRQ_GLAMO_HOSTBUS     IRQ_GLAMO(0)
-+#define IRQ_GLAMO_JPEG                IRQ_GLAMO(1)
-+#define IRQ_GLAMO_MPEG                IRQ_GLAMO(2)
-+#define IRQ_GLAMO_MPROC1      IRQ_GLAMO(3)
-+#define IRQ_GLAMO_MPROC0      IRQ_GLAMO(4)
-+#define IRQ_GLAMO_CMDQUEUE    IRQ_GLAMO(5)
-+#define IRQ_GLAMO_2D          IRQ_GLAMO(6)
-+#define IRQ_GLAMO_MMC         IRQ_GLAMO(7)
-+#define IRQ_GLAMO_RISC                IRQ_GLAMO(8)
-+
- #endif /* __ASM_ARCH_IRQ_H */
-diff --git a/include/linux/glamo-gpio.h b/include/linux/glamo-gpio.h
-new file mode 100644
-index 0000000..d00f7e9
---- /dev/null
-+++ b/include/linux/glamo-gpio.h
-@@ -0,0 +1,99 @@
-+#ifndef __GLAMO_GPIO_H
-+#define __GLAMO_GPIO_H
-+
-+struct glamo_core;
-+
-+#define GLAMO_GPIO_BANKA      0x0000
-+#define GLAMO_GPIO_BANKB      0x1000
-+#define GLAMO_GPIO_BANKC      0x2000
-+#define GLAMO_GPIO_BANKD      0x3000
-+
-+#define GLAMO_GPIONO(bank, pin)       ((bank & 0xf000) | ((pin & 0xf) << 8))
-+
-+#define GLAMO_GPIO_F_IN               0x0010
-+#define GLAMO_GPIO_F_OUT      0x0020
-+#define GLAMO_GPIO_F_FUNC     0x0030
-+
-+#define GLAMO_GPIO0           GLAMO_GPIONO(GLAMO_GPIO_BANKA, 0)
-+#define GLAMO_GPIO0_INPUT     (GLAMO_GPIO0 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO0_OUTPUT    (GLAMO_GPIO0 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO0_HA20      (GLAMO_GPIO0 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO1           GLAMO_GPIONO(GLAMO_GPIO_BANKA, 1)
-+#define GLAMO_GPIO1_INPUT     (GLAMO_GPIO1 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO1_OUTPUT    (GLAMO_GPIO1 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO1_HA21      (GLAMO_GPIO1 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO2           GLAMO_GPIONO(GLAMO_GPIO_BANKA, 2)
-+#define GLAMO_GPIO2_INPUT     (GLAMO_GPIO2 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO2_OUTPUT    (GLAMO_GPIO2 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO2_HA22      (GLAMO_GPIO2 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO3           GLAMO_GPIONO(GLAMO_GPIO_BANKA, 3)
-+#define GLAMO_GPIO3_INPUT     (GLAMO_GPIO3 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO3_OUTPUT    (GLAMO_GPIO3 | GLAMO_GPIO_F_OUT)
-+#define       GLAMO_GPIO3_HA23        (GLAMO_GPIO3 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO4           GLAMO_GPIONO(GLAMO_GPIO_BANKB, 0)
-+#define GLAMO_GPIO4_INPUT     (GLAMO_GPIO4 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO4_OUTPUT    (GLAMO_GPIO4 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO4_nLCS0     (GLAMO_GPIO4 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO5           GLAMO_GPIONO(GLAMO_GPIO_BANKB, 1)
-+#define GLAMO_GPIO5_INPUT     (GLAMO_GPIO5 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO5_OUTPUT    (GLAMO_GPIO5 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO5_nLCS1     (GLAMO_GPIO5 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO6           GLAMO_GPIONO(GLAMO_GPIO_BANKB, 2)
-+#define GLAMO_GPIO6_INPUT     (GLAMO_GPIO6 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO6_OUTPUT    (GLAMO_GPIO6 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO6_LDCLK     (GLAMO_GPIO6 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO7           GLAMO_GPIONO(GLAMO_GPIO_BANKB, 3)
-+#define GLAMO_GPIO7_INPUT     (GLAMO_GPIO7 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO7_OUTPUT    (GLAMO_GPIO7 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO7_nLDE      (GLAMO_GPIO7 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO8           GLAMO_GPIONO(GLAMO_GPIO_BANKC, 0)
-+#define GLAMO_GPIO8_INPUT     (GLAMO_GPIO8 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO8_OUTPUT    (GLAMO_GPIO8 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO8_LD16      (GLAMO_GPIO8 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO9           GLAMO_GPIONO(GLAMO_GPIO_BANKC, 1)
-+#define GLAMO_GPIO9_INPUT     (GLAMO_GPIO9 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO9_OUTPUT    (GLAMO_GPIO9 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO9_LD17      (GLAMO_GPIO9 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO10          GLAMO_GPIONO(GLAMO_GPIO_BANKC, 2)
-+#define GLAMO_GPIO10_INPUT    (GLAMO_GPIO10 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO10_OUTPUT   (GLAMO_GPIO10 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO10_LSCK     (GLAMO_GPIO10 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO11          GLAMO_GPIONO(GLAMO_GPIO_BANKC, 3)
-+#define GLAMO_GPIO11_INPUT    (GLAMO_GPIO11 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO11_OUTPUT   (GLAMO_GPIO11 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO11_LSDA     (GLAMO_GPIO11 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO12          GLAMO_GPIONO(GLAMO_GPIO_BANKD, 0)
-+#define GLAMO_GPIO12_INPUT    (GLAMO_GPIO12 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO12_OUTPUT   (GLAMO_GPIO12 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO12_LSA0     (GLAMO_GPIO12 | GLAMO_GPIO_F_FUNC)
-+
-+
-+#define REG_OF_GPIO(gpio)     (((gpio & 0xf000) >> 12)*2 \
-+                                              + GLAMO_REG_GPIO_GEN1)
-+#define NUM_OF_GPIO(gpio)     ((gpio & 0x0f00) >> 8)
-+#define GPIO_OUT_BIT(gpio)    (1 << (NUM_OF_GPIO(gpio) + 0))
-+#define OUTPUT_BIT(gpio)      (1 << (NUM_OF_GPIO(gpio) + 4))
-+#define INPUT_BIT(gpio)               (1 << (NUM_OF_GPIO(gpio) + 8))
-+#define FUNC_BIT(gpio)                (1 << (NUM_OF_GPIO(gpio) + 12))
-+
-+void glamo_gpio_setpin(struct glamo_core *glamo, unsigned int pin,
-+                     unsigned int value);
-+
-+int glamo_gpio_getpin(struct glamo_core *glamo, unsigned int pin);
-+
-+void glamo_gpio_cfgpin(struct glamo_core *glamo, unsigned int pinfunc);
-+
-+
-+#endif /* _GLAMO_GPIO */
-diff --git a/include/linux/glamofb.h b/include/linux/glamofb.h
-new file mode 100644
-index 0000000..24742a2
---- /dev/null
-+++ b/include/linux/glamofb.h
-@@ -0,0 +1,39 @@
-+#ifndef _LINUX_GLAMOFB_H
-+#define _LINUX_GLAMOFB_H
-+
-+#include <linux/spi/glamo.h>
-+
-+struct glamofb_val {
-+      unsigned int defval;
-+      unsigned int min;
-+      unsigned int max;
-+};
-+
-+struct glamo_core;
-+
-+struct glamofb_platform_data {
-+      int width, height;
-+      int pixclock;
-+      int left_margin, right_margin;
-+      int upper_margin, lower_margin;
-+      int hsync_len, vsync_len;
-+      int fb_mem_size;
-+
-+      struct glamofb_val xres;
-+      struct glamofb_val yres;
-+      struct glamofb_val bpp;
-+
-+      struct glamo_spi_info *spi_info;
-+      struct glamo_spigpio_info *spigpio_info;
-+      struct glamo_core *glamo;
-+
-+      /* glamo mmc platform specific info */
-+      void            (*glamo_set_mci_power)(unsigned char power_mode,
-+                                   unsigned short vdd);
-+      int             (*glamo_irq_is_wired)(void);
-+};
-+
-+void glamofb_cmd_mode(struct glamofb_handle *gfb, int on);
-+int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val);
-+
-+#endif
-diff --git a/include/linux/spi/glamo.h b/include/linux/spi/glamo.h
-new file mode 100644
-index 0000000..86419ea
---- /dev/null
-+++ b/include/linux/spi/glamo.h
-@@ -0,0 +1,28 @@
-+#ifndef __GLAMO_SPI_H
-+#define __GLAMO_SPI_H
-+
-+#include <linux/glamo-gpio.h>
-+
-+struct spi_board_info;
-+struct glamofb_handle;
-+struct glamo_core;
-+
-+struct glamo_spi_info {
-+      unsigned long           board_size;
-+      struct spi_board_info   *board_info;
-+      struct glamofb_handle   *glamofb_handle;
-+};
-+
-+struct glamo_spigpio_info {
-+      unsigned int            pin_clk;
-+      unsigned int            pin_mosi;
-+      unsigned int            pin_miso;
-+      unsigned int            pin_cs;
-+
-+      unsigned int            board_size;
-+      struct spi_board_info   *board_info;
-+      struct glamo_core       *glamo;
-+};
-+
-+
-+#endif
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1034-glamo-mmc.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1034-glamo-mmc.patch.patch
deleted file mode 100644 (file)
index 7acc6b2..0000000
+++ /dev/null
@@ -1,1188 +0,0 @@
-From e37b54bbb7d7df4dc2fff9846daabbb6c552d47d Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:35:05 +0100
-Subject: [PATCH] glamo-mmc.patch
-
----
- drivers/mfd/glamo/Kconfig      |    9 +
- drivers/mfd/glamo/Makefile     |    1 +
- drivers/mfd/glamo/glamo-core.c |   17 +-
- drivers/mfd/glamo/glamo-mci.c  |  837 ++++++++++++++++++++++++++++++++++++++++
- drivers/mfd/glamo/glamo-mci.h  |   76 ++++
- drivers/mfd/glamo/glamo-regs.h |  169 ++++++++-
- 6 files changed, 1099 insertions(+), 10 deletions(-)
- create mode 100644 drivers/mfd/glamo/glamo-mci.c
- create mode 100644 drivers/mfd/glamo/glamo-mci.h
-
-diff --git a/drivers/mfd/glamo/Kconfig b/drivers/mfd/glamo/Kconfig
-index b99f2b2..ec2ae3d 100644
---- a/drivers/mfd/glamo/Kconfig
-+++ b/drivers/mfd/glamo/Kconfig
-@@ -33,3 +33,12 @@ config MFD_GLAMO_SPI_FB
-        control channel.  This SPI interface is frequently used to
-        interconnect the LCM control interface.
-+config MFD_GLAMO_MCI
-+      tristate "Glamo S3C SD/MMC Card Interface support"
-+      depends on MFD_GLAMO && MMC
-+      help
-+        This selects a driver for the MCI interface found in
-+        the S-Media GLAMO chip, as used in OpenMoko
-+        neo1973 GTA-02.
-+
-+        If unsure, say N.
-\ No newline at end of file
-diff --git a/drivers/mfd/glamo/Makefile b/drivers/mfd/glamo/Makefile
-index fb53982..dc64d50 100644
---- a/drivers/mfd/glamo/Makefile
-+++ b/drivers/mfd/glamo/Makefile
-@@ -8,4 +8,5 @@ obj-$(CONFIG_MFD_GLAMO_SPI_GPIO)       += glamo-spi-gpio.o
- obj-$(CONFIG_MFD_GLAMO_FB)            += glamo-fb.o
- obj-$(CONFIG_MFD_GLAMO_SPI_FB)                += glamo-lcm-spi.o
-+obj-$(CONFIG_MFD_GLAMO_MCI)           += glamo-mci.o
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index acf545f..8497de2 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -440,7 +440,22 @@ int glamo_engine_disable(struct glamo_core *glamo, enum glamo_engine engine)
- {
-       spin_lock(&glamo->lock);
-       switch (engine) {
--      /* FIXME: Implementation */
-+      case GLAMO_ENGINE_MMC:
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_MMC, 0,
-+                                                 GLAMO_CLOCK_MMC_EN_M9CLK |
-+                                                 GLAMO_CLOCK_MMC_EN_TCLK |
-+                                                 GLAMO_CLOCK_MMC_DG_M9CLK |
-+                                                 GLAMO_CLOCK_MMC_DG_TCLK);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_HOSTBUS(2), 0,
-+                                                 GLAMO_HOSTBUS2_MMIO_EN_MMC);
-+              /* disable the TCLK divider clk input */
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_GEN5_1, 0,
-+                                              GLAMO_CLOCK_GEN51_EN_DIV_TCLK);
-+              /* good idea to hold the thing in reset when we power it off? */
-+/*            writew(readw(glamo->base + GLAMO_REG_CLOCK_MMC) |
-+                    GLAMO_CLOCK_MMC_RESET, glamo->base + GLAMO_REG_CLOCK_MMC);
-+*/
-+              break;
-       default:
-               break;
-       }
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-new file mode 100644
-index 0000000..f559e5e
---- /dev/null
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -0,0 +1,837 @@
-+/*
-+ *  linux/drivers/mmc/host/glamo-mmc.c - Glamo MMC driver
-+ *
-+ *  Copyright (C) 2007 OpenMoko, Inc,  Andy Green <andy@openmoko.com>
-+ *  Based on S3C MMC driver that was:
-+ *  Copyright (C) 2004-2006 maintech GmbH, Thomas Kleffel <tk@maintech.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.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/clk.h>
-+#include <linux/mmc/mmc.h>
-+#include <linux/mmc/host.h>
-+#include <linux/platform_device.h>
-+#include <linux/irq.h>
-+#include <linux/pcf50633.h>
-+#include <linux/delay.h>
-+#include <linux/interrupt.h>
-+
-+#include <asm/dma.h>
-+#include <asm/dma-mapping.h>
-+#include <asm/io.h>
-+
-+#include "glamo-mci.h"
-+#include "glamo-core.h"
-+#include "glamo-regs.h"
-+
-+/* from glamo-core.c */
-+extern struct glamo_mci_pdata glamo_mci_def_pdata;
-+
-+
-+#define DRIVER_NAME "glamo-mci"
-+#define RESSIZE(ressource) (((ressource)->end - (ressource)->start) + 1)
-+
-+static void glamo_mci_send_request(struct mmc_host *mmc);
-+
-+unsigned char CRC7(u8 * pu8, int cnt)
-+{
-+      u8 crc = 0;
-+
-+      while (cnt--) {
-+              int n;
-+              u8 d = *pu8++;
-+              for (n = 0; n < 8; n++) {
-+                      crc <<= 1;
-+                      if ((d & 0x80) ^ (crc & 0x80))
-+                              crc ^= 0x09;
-+                      d <<= 1;
-+              }
-+      }
-+      return (crc << 1) | 1;
-+}
-+
-+/* these _dly versions account for the dead time rules for reg access */
-+static u16 readw_dly(u16 __iomem * pu16)
-+{
-+      glamo_reg_access_delay();
-+      return readw(pu16);
-+}
-+
-+static void writew_dly(u16 val, u16 __iomem * pu16)
-+{
-+      glamo_reg_access_delay();
-+      writew(val, pu16);
-+}
-+
-+static int get_data_buffer(struct glamo_mci_host *host,
-+                         volatile u32 *words, volatile u16 **pointer)
-+{
-+      struct scatterlist *sg;
-+
-+      *words = 0;
-+      *pointer = NULL;
-+
-+      if (host->pio_active == XFER_NONE)
-+              return -EINVAL;
-+
-+      if ((!host->mrq) || (!host->mrq->data))
-+              return -EINVAL;
-+
-+      if (host->pio_sgptr >= host->mrq->data->sg_len) {
-+              dev_dbg(&host->pdev->dev, "no more buffers (%i/%i)\n",
-+                    host->pio_sgptr, host->mrq->data->sg_len);
-+              return -EBUSY;
-+      }
-+      sg = &host->mrq->data->sg[host->pio_sgptr];
-+
-+      *words = sg->length >> 1; /* we are working with a 16-bit data bus */
-+      *pointer = page_address(sg_page(sg)) + sg->offset;
-+
-+      BUG_ON(((long)(*pointer)) & 1);
-+
-+      host->pio_sgptr++;
-+
-+      /* dev_info(&host->pdev->dev, "new buffer (%i/%i)\n",
-+            host->pio_sgptr, host->mrq->data->sg_len); */
-+      return 0;
-+}
-+
-+static void do_pio_read(struct glamo_mci_host *host)
-+{
-+      int res;
-+      u16 __iomem *from_ptr = host->base_data + (RESSIZE(host->mem_data) /
-+                                                            sizeof(u16) / 2);
-+#ifdef DEBUG
-+      u16 * block;
-+#endif
-+
-+      while (1) {
-+              res = get_data_buffer(host, &host->pio_words, &host->pio_ptr);
-+              if (res) {
-+                      host->pio_active = XFER_NONE;
-+                      host->complete_what = COMPLETION_FINALIZE;
-+
-+                      dev_dbg(&host->pdev->dev, "pio_read(): "
-+                              "complete (no more data).\n");
-+                      return;
-+              }
-+
-+              dev_dbg(&host->pdev->dev, "pio_read(): host->pio_words: %d\n",
-+                              host->pio_words);
-+
-+              host->pio_count += host->pio_words << 1;
-+
-+#ifdef DEBUG
-+              block = (u16 *)host->pio_ptr;
-+              res = host->pio_words << 1;
-+#endif
-+              while (host->pio_words--)
-+                      *host->pio_ptr++ = *from_ptr++;
-+#ifdef DEBUG
-+              print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 16, 1,
-+                             (void *)block, res, 1);
-+#endif
-+      }
-+}
-+
-+static int do_pio_write(struct glamo_mci_host *host)
-+{
-+      int res = 0;
-+      volatile u16 __iomem *to_ptr = host->base_data;
-+      int err = 0;
-+
-+      dev_dbg(&host->pdev->dev, "pio_write():\n");
-+      while (!res) {
-+              res = get_data_buffer(host, &host->pio_words, &host->pio_ptr);
-+              if (res)
-+                      continue;
-+
-+              dev_dbg(&host->pdev->dev, "pio_write():new source: [%i]@[%p]\n",
-+                      host->pio_words, host->pio_ptr);
-+
-+              host->pio_count += host->pio_words << 1;
-+              while (host->pio_words--)
-+                      writew(*host->pio_ptr++, to_ptr++);
-+      }
-+
-+      dev_dbg(&host->pdev->dev, "pio_write(): complete\n");
-+      host->pio_active = XFER_NONE;
-+      return err;
-+}
-+
-+static void glamo_mci_irq(unsigned int irq, struct irq_desc *desc)
-+{
-+      struct glamo_mci_host *host = (struct glamo_mci_host *)
-+                                    desc->handler_data;
-+      u16 status;
-+      struct mmc_command *cmd;
-+      unsigned long iflags;
-+
-+      if (!host)
-+              return;
-+      if (!host->mrq)
-+              return;
-+      cmd = host->mrq->cmd;
-+      if (!cmd)
-+              return;
-+
-+      spin_lock_irqsave(&host->complete_lock, iflags);
-+
-+      status = readw_dly(host->base + GLAMO_REG_MMC_RB_STAT1);
-+
-+      /* ack this interrupt source */
-+      writew(GLAMO_IRQ_MMC,
-+             glamo_mci_def_pdata.pglamo->base + GLAMO_REG_IRQ_CLEAR);
-+
-+      if (status & (GLAMO_STAT1_MMC_RTOUT |
-+                    GLAMO_STAT1_MMC_DTOUT))
-+              cmd->error = -ETIMEDOUT;
-+      if (status & (GLAMO_STAT1_MMC_BWERR |
-+                    GLAMO_STAT1_MMC_BRERR))
-+              cmd->error = -EILSEQ;
-+      if (cmd->error) {
-+              dev_err(&host->pdev->dev, "Error after cmd: 0x%x\n", status);
-+              goto done;
-+      }
-+
-+      if (host->pio_active == XFER_READ)
-+              do_pio_read(host);
-+
-+      host->mrq->data->bytes_xfered = host->pio_count;
-+      dev_dbg(&host->pdev->dev, "status = 0x%04x count=%d\n",
-+               status, host->pio_count);
-+
-+      /* issue STOP if we have been given one to use */
-+      if (host->mrq->stop) {
-+              host->cmd_is_stop = 1;
-+              glamo_mci_send_request(host->mmc);
-+              host->cmd_is_stop = 0;
-+      }
-+done:
-+      host->complete_what = COMPLETION_NONE;
-+      host->mrq = NULL;
-+      mmc_request_done(host->mmc, cmd->mrq);
-+      spin_unlock_irqrestore(&host->complete_lock, iflags);
-+}
-+
-+static int glamo_mci_send_command(struct glamo_mci_host *host,
-+                                struct mmc_command *cmd)
-+{
-+      u8 u8a[6];
-+      u16 fire = 0;
-+
-+      /* if we can't do it, reject as busy */
-+      if (!readw_dly(host->base + GLAMO_REG_MMC_RB_STAT1) &
-+           GLAMO_STAT1_MMC_IDLE) {
-+              host->mrq = NULL;
-+              cmd->error = -EBUSY;
-+              mmc_request_done(host->mmc, host->mrq);
-+              return -EBUSY;
-+      }
-+
-+      /* create an array in wire order for CRC computation */
-+      u8a[0] = 0x40 | (cmd->opcode & 0x3f);
-+      u8a[1] = (u8)(cmd->arg >> 24);
-+      u8a[2] = (u8)(cmd->arg >> 16);
-+      u8a[3] = (u8)(cmd->arg >> 8);
-+      u8a[4] = (u8)cmd->arg;
-+      u8a[5] = CRC7(&u8a[0], 5); /* CRC7 on first 5 bytes of packet */
-+
-+      /* issue the wire-order array including CRC in register order */
-+      writew_dly((u8a[4] << 8) | u8a[5], host->base + GLAMO_REG_MMC_CMD_REG1);
-+      writew_dly((u8a[2] << 8) | u8a[3], host->base + GLAMO_REG_MMC_CMD_REG2);
-+      writew_dly((u8a[0] << 8) | u8a[1], host->base + GLAMO_REG_MMC_CMD_REG3);
-+
-+      /* command index toggle */
-+      fire |= (host->ccnt & 1) << 12;
-+
-+      /* set type of command */
-+      switch (mmc_cmd_type(cmd)) {
-+      case MMC_CMD_BC:
-+              fire |= GLAMO_FIRE_MMC_CMDT_BNR;
-+              break;
-+      case MMC_CMD_BCR:
-+              fire |= GLAMO_FIRE_MMC_CMDT_BR;
-+              break;
-+      case MMC_CMD_AC:
-+              fire |= GLAMO_FIRE_MMC_CMDT_AND;
-+              break;
-+      case MMC_CMD_ADTC:
-+              fire |= GLAMO_FIRE_MMC_CMDT_AD;
-+              break;
-+      }
-+      /*
-+       * if it expects a response, set the type expected
-+       *
-+       * R1, Length  : 48bit, Normal response
-+       * R1b, Length : 48bit, same R1, but added card busy status
-+       * R2, Length  : 136bit (really 128 bits with CRC snipped)
-+       * R3, Length  : 48bit (OCR register value)
-+       * R4, Length  : 48bit, SDIO_OP_CONDITION, Reverse SDIO Card
-+       * R5, Length  : 48bit, IO_RW_DIRECTION, Reverse SDIO Card
-+       * R6, Length  : 48bit (RCA register)
-+       * R7, Length  : 48bit (interface condition, VHS(voltage supplied),
-+       *                     check pattern, CRC7)
-+       */
-+      switch (mmc_resp_type(cmd)) {
-+      case MMC_RSP_R6: /* same index as R7 and R1 */
-+              fire |= GLAMO_FIRE_MMC_RSPT_R1;
-+              break;
-+      case MMC_RSP_R1B:
-+              fire |= GLAMO_FIRE_MMC_RSPT_R1b;
-+              break;
-+      case MMC_RSP_R2:
-+              fire |= GLAMO_FIRE_MMC_RSPT_R2;
-+              break;
-+      case MMC_RSP_R3:
-+              fire |= GLAMO_FIRE_MMC_RSPT_R3;
-+              break;
-+      /* R4 and R5 supported by chip not defined in linux/mmc/core.h (sdio) */
-+      }
-+      /*
-+       * From the command index, set up the command class in the host ctrllr
-+       *
-+       * missing guys present on chip but couldn't figure out how to use yet:
-+       *     0x0 "stream read"
-+       *     0x9 "cancel running command"
-+       */
-+      switch (cmd->opcode) {
-+      case MMC_READ_SINGLE_BLOCK:
-+              fire |= GLAMO_FIRE_MMC_CC_SBR; /* single block read */
-+              break;
-+      case MMC_SWITCH: /* 64 byte payload */
-+      case 0x33: /* observed issued by MCI */
-+      case MMC_READ_MULTIPLE_BLOCK:
-+              /* we will get an interrupt off this */
-+              if (!cmd->mrq->stop)
-+                      /* multiblock no stop */
-+                      fire |= GLAMO_FIRE_MMC_CC_MBRNS;
-+              else
-+                       /* multiblock with stop */
-+                      fire |= GLAMO_FIRE_MMC_CC_MBRS;
-+              break;
-+      case MMC_WRITE_BLOCK:
-+              fire |= GLAMO_FIRE_MMC_CC_SBW; /* single block write */
-+              break;
-+      case MMC_WRITE_MULTIPLE_BLOCK:
-+              if (cmd->mrq->stop)
-+                       /* multiblock with stop */
-+                      fire |= GLAMO_FIRE_MMC_CC_MBWS;
-+              else
-+                       /* multiblock NO stop-- 'RESERVED'? */
-+                      fire |= GLAMO_FIRE_MMC_CC_MBWNS;
-+              break;
-+      case MMC_STOP_TRANSMISSION:
-+              fire |= GLAMO_FIRE_MMC_CC_STOP; /* STOP */
-+              break;
-+      default:
-+              fire |= GLAMO_FIRE_MMC_CC_BASIC; /* "basic command" */
-+              break;
-+      }
-+      /* enforce timeout */
-+      if (cmd->data) {
-+              if (cmd->data->timeout_clks)
-+                      writew_dly(cmd->data->timeout_clks >> 4, /* / 16 clks */
-+                                      host->base + GLAMO_REG_MMC_TIMEOUT);
-+              else
-+                      writew_dly(0xfff, host->base + GLAMO_REG_MMC_TIMEOUT);
-+      } else
-+              writew(0xfff, host->base + GLAMO_REG_MMC_TIMEOUT);
-+
-+      /* Generate interrupt on txfer; drive strength max */
-+      writew_dly((readw_dly(host->base + GLAMO_REG_MMC_BASIC) & 0xfe) |
-+                 0x0800 | GLAMO_BASIC_MMC_NO_CLK_RD_WAIT |
-+                 GLAMO_BASIC_MMC_EN_COMPL_INT |
-+                 GLAMO_BASIC_MMC_EN_DR_STR0 |
-+                 GLAMO_BASIC_MMC_EN_DR_STR1,
-+                 host->base + GLAMO_REG_MMC_BASIC);
-+
-+      /* send the command out on the wire */
-+      /* dev_info(&host->pdev->dev, "Using FIRE %04X\n", fire); */
-+      writew_dly(fire, host->base + GLAMO_REG_MMC_CMD_FIRE);
-+      cmd->error = 0;
-+      return 0;
-+}
-+
-+static int glamo_mci_prepare_pio(struct glamo_mci_host *host,
-+                               struct mmc_data *data)
-+{
-+      /*
-+       * the S-Media-internal RAM offset for our MMC buffer
-+       * Read is halfway up the buffer and write is at the start
-+       */
-+      if (data->flags & MMC_DATA_READ) {
-+              writew_dly((u16)(GLAMO_FB_SIZE + (RESSIZE(host->mem_data) / 2)),
-+                         host->base + GLAMO_REG_MMC_WDATADS1);
-+              writew_dly((u16)((GLAMO_FB_SIZE +
-+                                      (RESSIZE(host->mem_data) / 2)) >> 16),
-+                         host->base + GLAMO_REG_MMC_WDATADS2);
-+      } else {
-+              writew_dly((u16)GLAMO_FB_SIZE, host->base +
-+                                             GLAMO_REG_MMC_RDATADS1);
-+              writew_dly((u16)(GLAMO_FB_SIZE >> 16), host->base +
-+                                                     GLAMO_REG_MMC_RDATADS2);
-+      }
-+
-+      /* set up the block info */
-+      writew_dly(data->blksz, host->base + GLAMO_REG_MMC_DATBLKLEN);
-+      writew_dly(data->blocks, host->base + GLAMO_REG_MMC_DATBLKCNT);
-+      dev_dbg(&host->pdev->dev, "(blksz=%d, count=%d)\n",
-+                                 data->blksz, data->blocks);
-+      host->pio_sgptr = 0;
-+      host->pio_words = 0;
-+      host->pio_count = 0;
-+      host->pio_active = 0;
-+      /* if write, prep the write into the shared RAM before the command */
-+      if (data->flags & MMC_DATA_WRITE) {
-+              host->pio_active = XFER_WRITE;
-+              return do_pio_write(host);
-+      }
-+      host->pio_active = XFER_READ;
-+      return 0;
-+}
-+
-+static void glamo_mci_send_request(struct mmc_host *mmc)
-+{
-+      struct glamo_mci_host *host = mmc_priv(mmc);
-+      struct mmc_request *mrq = host->mrq;
-+      struct mmc_command *cmd = host->cmd_is_stop ? mrq->stop : mrq->cmd;
-+      u16 * pu16 = (u16 *)&cmd->resp[0];
-+      u16 * reg_resp = (u16 *)(host->base + GLAMO_REG_MMC_CMD_RSP1);
-+      u16 status;
-+      int n;
-+
-+      host->ccnt++;
-+      /*
-+       * somehow 2.6.24 MCI manages to issue MMC_WRITE_BLOCK *without* the
-+       * MMC_DATA_WRITE flag, WTF?  Work around the madness.
-+       */
-+      if (cmd->opcode == MMC_WRITE_BLOCK)
-+              if (mrq->data)
-+                      mrq->data->flags |= MMC_DATA_WRITE;
-+
-+       /* this guy has data to read/write? */
-+      if ((!host->cmd_is_stop) && cmd->data) {
-+              int res;
-+              host->dcnt++;
-+              res = glamo_mci_prepare_pio(host, cmd->data);
-+              if (res) {
-+                      cmd->error = -EIO;
-+                      cmd->data->error = -EIO;
-+                      mmc_request_done(mmc, mrq);
-+                      return;
-+              }
-+      }
-+
-+      dev_dbg(&host->pdev->dev,"cmd 0x%x, "
-+               "arg 0x%x data=%p mrq->stop=%p flags 0x%x\n",
-+               cmd->opcode, cmd->arg, cmd->data, cmd->mrq->stop,
-+               cmd->flags);
-+
-+      if (glamo_mci_send_command(host, cmd))
-+              return;
-+      /*
-+       * we must spin until response is ready or timed out
-+       * -- we don't get interrupts unless there is a bulk rx
-+       */
-+      do
-+              status = readw_dly(host->base + GLAMO_REG_MMC_RB_STAT1);
-+      while ((((status >> 15) & 1) != (host->ccnt & 1)) ||
-+              (!(status & (GLAMO_STAT1_MMC_RB_RRDY |
-+                           GLAMO_STAT1_MMC_RTOUT |
-+                           GLAMO_STAT1_MMC_DTOUT |
-+                           GLAMO_STAT1_MMC_BWERR |
-+                           GLAMO_STAT1_MMC_BRERR))));
-+
-+      if (status & (GLAMO_STAT1_MMC_RTOUT |
-+                    GLAMO_STAT1_MMC_DTOUT))
-+              cmd->error = -ETIMEDOUT;
-+      if (status & (GLAMO_STAT1_MMC_BWERR |
-+                    GLAMO_STAT1_MMC_BRERR))
-+              cmd->error = -EILSEQ;
-+
-+      if (host->cmd_is_stop)
-+              return;
-+
-+      if (cmd->error) {
-+              dev_err(&host->pdev->dev, "Error after cmd: 0x%x\n", status);
-+              goto done;
-+      }
-+      /*
-+       * mangle the response registers in two different exciting
-+       * undocumented ways discovered by trial and error
-+       */
-+      if (mmc_resp_type(cmd) == MMC_RSP_R2)
-+              /* grab the response */
-+              for (n = 0; n < 8; n++) /* super mangle power 1 */
-+                      pu16[n ^ 6] = readw_dly(&reg_resp[n]);
-+      else
-+              for (n = 0; n < 3; n++) /* super mangle power 2 */
-+                      pu16[n] = (readw_dly(&reg_resp[n]) >> 8) |
-+                                (readw_dly(&reg_resp[n + 1]) << 8);
-+      /*
-+       * if we don't have bulk data to take care of, we're done
-+       */
-+      if (!cmd->data)
-+              goto done;
-+      if (!(cmd->data->flags & (MMC_DATA_READ | MMC_DATA_WRITE)))
-+              goto done;
-+      /*
-+       * Otherwise can can use the interrupt as async completion --
-+       * if there is read data coming, or we wait for write data to complete,
-+       * exit without mmc_request_done() as the payload interrupt
-+       * will service it
-+       */
-+      dev_dbg(&host->pdev->dev, "Waiting for payload data\n");
-+      /*
-+       * if the glamo INT# line isn't wired (*cough* it can happen)
-+       * I'm afraid we have to spin on the IRQ status bit and "be
-+       * our own INT# line"
-+       */
-+      if (!glamo_mci_def_pdata.pglamo->irq_works) {
-+              /* we have faith we will get an "interrupt"... */
-+              while (!(readw_dly(glamo_mci_def_pdata.pglamo->base +
-+                       GLAMO_REG_IRQ_STATUS) & GLAMO_IRQ_MMC))
-+                      ;
-+              /* yay we are an interrupt controller! -- call the ISR */
-+              glamo_mci_irq(IRQ_GLAMO(GLAMO_IRQIDX_MMC),
-+                            irq_desc + IRQ_GLAMO(GLAMO_IRQIDX_MMC));
-+      }
-+      return;
-+
-+done:
-+      host->complete_what = COMPLETION_NONE;
-+      host->mrq = NULL;
-+      mmc_request_done(host->mmc, cmd->mrq);
-+}
-+
-+static void glamo_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)
-+{
-+      struct glamo_mci_host *host = mmc_priv(mmc);
-+
-+      host->cmd_is_stop = 0;
-+      host->mrq = mrq;
-+      glamo_mci_send_request(mmc);
-+}
-+
-+static void glamo_mci_reset(struct glamo_mci_host *host)
-+{
-+      /* reset MMC controller */
-+      writew_dly(GLAMO_CLOCK_MMC_RESET | GLAMO_CLOCK_MMC_DG_TCLK |
-+                 GLAMO_CLOCK_MMC_EN_TCLK | GLAMO_CLOCK_MMC_DG_M9CLK |
-+                 GLAMO_CLOCK_MMC_EN_M9CLK,
-+                 glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_MMC);
-+      msleep(1);
-+      /* and disable reset */
-+      writew_dly(GLAMO_CLOCK_MMC_DG_TCLK |
-+                 GLAMO_CLOCK_MMC_EN_TCLK | GLAMO_CLOCK_MMC_DG_M9CLK |
-+                 GLAMO_CLOCK_MMC_EN_M9CLK,
-+                 glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_MMC);
-+}
-+
-+static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-+{
-+      struct glamo_mci_host *host = mmc_priv(mmc);
-+      int mci_psc = 0;
-+      int n = 0;
-+
-+      /* Set power */
-+      switch(ios->power_mode) {
-+      case MMC_POWER_ON:
-+      case MMC_POWER_UP:
-+              if (host->power_mode_current != MMC_POWER_OFF)
-+                      break;
-+              if (host->vdd_current != ios->vdd) {
-+                      host->pdata->glamo_set_mci_power(ios->power_mode,
-+                                                       ios->vdd);
-+                      host->vdd_current = ios->vdd;
-+              }
-+              glamo_engine_enable(glamo_mci_def_pdata.pglamo,
-+                                                      GLAMO_ENGINE_MMC);
-+              glamo_mci_reset(host);
-+              break;
-+
-+      case MMC_POWER_OFF:
-+      default:
-+              if (host->power_mode_current == MMC_POWER_OFF)
-+                      break;
-+              glamo_engine_disable(glamo_mci_def_pdata.pglamo,
-+                                   GLAMO_ENGINE_MMC);
-+              host->pdata->glamo_set_mci_power(MMC_POWER_OFF, 0);
-+              host->vdd_current = -1;
-+              break;
-+      }
-+      host->power_mode_current = ios->power_mode;
-+
-+       /* Set clock */
-+/*    if (ios->clock) { */
-+      for (mci_psc = 0; mci_psc < 256; mci_psc++) {
-+              host->real_rate = host->clk_rate / (mci_psc + 1);
-+              if (host->real_rate <= ios->clock)
-+                      break;
-+      }
-+      if (mci_psc > 255)
-+              mci_psc = 255;
-+      host->clk_div = mci_psc;
-+      /* set the nearest prescaler factor
-+      *
-+      * register shared with SCLK divisor -- no chance of race because
-+      * we don't use sensor interface
-+      */
-+      writew_dly((readw(glamo_mci_def_pdata.pglamo->base +
-+                      GLAMO_REG_CLOCK_GEN8) & 0xff00) | host->clk_div,
-+              glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN8);
-+      /* enable clock to divider input */
-+      writew_dly(readw(glamo_mci_def_pdata.pglamo->base +
-+              GLAMO_REG_CLOCK_GEN5_1) | GLAMO_CLOCK_GEN51_EN_DIV_TCLK,
-+              glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN5_1);
-+#if 0
-+      } else { /* stop clock */
-+              host->real_rate = 0;
-+              /* remove clock from divider input */
-+              writew(readw(glamo_mci_def_pdata.pglamo->base +
-+                   GLAMO_REG_CLOCK_GEN5_1) & (~GLAMO_CLOCK_GEN51_EN_DIV_TCLK),
-+                   glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN5_1);
-+      }
-+#endif
-+      if ((ios->power_mode == MMC_POWER_ON) ||
-+          (ios->power_mode == MMC_POWER_UP)) {
-+              dev_info(&host->pdev->dev,
-+                      "powered (vdd = %d) clk: %lukHz div=%d (req: %ukHz). "
-+                      "Bus width=%d\n",ios->vdd,
-+                      host->real_rate / 1000, mci_psc,
-+                      ios->clock / 1000, ios->bus_width);
-+      } else
-+              dev_info(&host->pdev->dev, "glamo_mci_set_ios: power down.\n");
-+
-+      /* set bus width */
-+      host->bus_width = ios->bus_width;
-+      if (host->bus_width == MMC_BUS_WIDTH_4)
-+              n = GLAMO_BASIC_MMC_EN_4BIT_DATA;
-+      writew_dly((readw_dly(host->base + GLAMO_REG_MMC_BASIC) &
-+                                        (~GLAMO_BASIC_MMC_EN_4BIT_DATA)) | n,
-+                                            host->base + GLAMO_REG_MMC_BASIC);
-+}
-+
-+
-+/*
-+ * no physical write protect supported by us
-+ */
-+static int glamo_mci_get_ro(struct mmc_host *mmc)
-+{
-+      return 0;
-+}
-+
-+static struct mmc_host_ops glamo_mci_ops = {
-+      .request        = glamo_mci_request,
-+      .set_ios        = glamo_mci_set_ios,
-+      .get_ro         = glamo_mci_get_ro,
-+};
-+
-+static int glamo_mci_probe(struct platform_device *pdev)
-+{
-+      struct mmc_host         *mmc;
-+      struct glamo_mci_host   *host;
-+      int ret;
-+
-+      dev_info(&pdev->dev, "glamo_mci driver (C)2007 OpenMoko, Inc\n");
-+
-+      mmc = mmc_alloc_host(sizeof(struct glamo_mci_host), &pdev->dev);
-+      if (!mmc) {
-+              ret = -ENOMEM;
-+              goto probe_out;
-+      }
-+
-+      host = mmc_priv(mmc);
-+      host->mmc = mmc;
-+      host->pdev = pdev;
-+      host->pdata = &glamo_mci_def_pdata;
-+      host->power_mode_current = MMC_POWER_OFF;
-+
-+      host->complete_what = COMPLETION_NONE;
-+      host->pio_active = XFER_NONE;
-+
-+      spin_lock_init(&host->complete_lock);
-+
-+      host->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+      if (!host->mem) {
-+              dev_err(&pdev->dev,
-+                      "failed to get io memory region resouce.\n");
-+
-+              ret = -ENOENT;
-+              goto probe_free_host;
-+      }
-+
-+      host->mem = request_mem_region(host->mem->start,
-+              RESSIZE(host->mem), pdev->name);
-+
-+      if (!host->mem) {
-+              dev_err(&pdev->dev, "failed to request io memory region.\n");
-+              ret = -ENOENT;
-+              goto probe_free_host;
-+      }
-+
-+      host->base = ioremap(host->mem->start, RESSIZE(host->mem));
-+      if (!host->base) {
-+              dev_err(&pdev->dev, "failed to ioremap() io memory region.\n");
-+              ret = -EINVAL;
-+              goto probe_free_mem_region;
-+      }
-+
-+      /* set the handler for our bit of the shared chip irq register */
-+      set_irq_handler(IRQ_GLAMO(GLAMO_IRQIDX_MMC), glamo_mci_irq);
-+      /* stash host as our handler's private data */
-+      set_irq_data(IRQ_GLAMO(GLAMO_IRQIDX_MMC), host);
-+
-+      /* Get ahold of our data buffer we use for data in and out on MMC */
-+      host->mem_data = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-+      if (!host->mem_data) {
-+              dev_err(&pdev->dev,
-+                      "failed to get io memory region resource.\n");
-+              ret = -ENOENT;
-+              goto probe_iounmap;
-+      }
-+
-+      host->mem_data = request_mem_region(host->mem_data->start,
-+              RESSIZE(host->mem_data), pdev->name);
-+
-+      if (!host->mem_data) {
-+              dev_err(&pdev->dev, "failed to request io memory region.\n");
-+              ret = -ENOENT;
-+              goto probe_iounmap;
-+      }
-+      host->base_data = ioremap(host->mem_data->start,
-+                                        RESSIZE(host->mem_data));
-+      host->data_max_size = RESSIZE(host->mem_data);
-+
-+      if (host->base_data == 0) {
-+              dev_err(&pdev->dev, "failed to ioremap() io memory region.\n");
-+              ret = -EINVAL;
-+              goto probe_free_mem_region_data;
-+      }
-+
-+      host->vdd_current = 0;
-+      host->clk_rate = 50000000; /* really it's 49152000 */
-+      host->clk_div = 16;
-+
-+      /* explain our host controller capabilities */
-+      mmc->ops        = &glamo_mci_ops;
-+      mmc->ocr_avail  = host->pdata->ocr_avail;
-+      mmc->caps       = MMC_CAP_4_BIT_DATA |
-+                        MMC_CAP_MULTIWRITE |
-+                        MMC_CAP_MMC_HIGHSPEED |
-+                        MMC_CAP_SD_HIGHSPEED;
-+      mmc->f_min      = host->clk_rate / 256;
-+      /*
-+       * held at /4 due to concerns of 100R recommended series resistor
-+       * allows 16MHz @ 4-bit --> 8MBytes/sec raw
-+       */
-+      mmc->f_max      = host->clk_rate / 3;
-+
-+      mmc->max_blk_count      = (1 << 16) - 1; /* GLAMO_REG_MMC_RB_BLKCNT */
-+      mmc->max_blk_size       = (1 << 12) - 1; /* GLAMO_REG_MMC_RB_BLKLEN */
-+      mmc->max_req_size       = RESSIZE(host->mem_data) / 2;
-+      mmc->max_seg_size       = mmc->max_req_size;
-+      mmc->max_phys_segs      = 1; /* hw doesn't talk about segs??? */
-+      mmc->max_hw_segs        = 1;
-+
-+      dev_info(&host->pdev->dev, "probe: mapped mci_base:%p irq:%u.\n",
-+              host->base, host->irq);
-+
-+      if ((ret = mmc_add_host(mmc))) {
-+              dev_err(&pdev->dev, "failed to add mmc host.\n");
-+              goto probe_free_mem_region_data;
-+      }
-+
-+      platform_set_drvdata(pdev, mmc);
-+
-+      dev_info(&pdev->dev,"initialisation done.\n");
-+      return 0;
-+
-+ probe_free_mem_region_data:
-+      release_mem_region(host->mem_data->start, RESSIZE(host->mem_data));
-+
-+ probe_iounmap:
-+      iounmap(host->base);
-+
-+ probe_free_mem_region:
-+      release_mem_region(host->mem->start, RESSIZE(host->mem));
-+
-+ probe_free_host:
-+      mmc_free_host(mmc);
-+ probe_out:
-+      return ret;
-+}
-+
-+static int glamo_mci_remove(struct platform_device *pdev)
-+{
-+      struct mmc_host         *mmc  = platform_get_drvdata(pdev);
-+      struct glamo_mci_host   *host = mmc_priv(mmc);
-+
-+      mmc_remove_host(mmc);
-+      /* stop using our handler, revert it to default */
-+      set_irq_handler(IRQ_GLAMO(GLAMO_IRQIDX_MMC), handle_level_irq);
-+      iounmap(host->base);
-+      iounmap(host->base_data);
-+      release_mem_region(host->mem->start, RESSIZE(host->mem));
-+      release_mem_region(host->mem_data->start, RESSIZE(host->mem_data));
-+      mmc_free_host(mmc);
-+
-+      glamo_engine_disable(glamo_mci_def_pdata.pglamo, GLAMO_ENGINE_MMC);
-+      return 0;
-+}
-+
-+
-+#ifdef CONFIG_PM
-+
-+static int glamo_mci_suspend(struct platform_device *dev, pm_message_t state)
-+{
-+      struct mmc_host *mmc = platform_get_drvdata(dev);
-+
-+      return  mmc_suspend_host(mmc, state);
-+}
-+
-+static int glamo_mci_resume(struct platform_device *dev)
-+{
-+      struct mmc_host *mmc = platform_get_drvdata(dev);
-+
-+      return mmc_resume_host(mmc);
-+}
-+
-+#else /* CONFIG_PM */
-+#define glamo_mci_suspend NULL
-+#define glamo_mci_resume NULL
-+#endif /* CONFIG_PM */
-+
-+
-+static struct platform_driver glamo_mci_driver =
-+{
-+      .driver.name    = "glamo-mci",
-+      .probe          = glamo_mci_probe,
-+      .remove         = glamo_mci_remove,
-+      .suspend        = glamo_mci_suspend,
-+      .resume         = glamo_mci_resume,
-+};
-+
-+static int __init glamo_mci_init(void)
-+{
-+      platform_driver_register(&glamo_mci_driver);
-+      return 0;
-+}
-+
-+static void __exit glamo_mci_exit(void)
-+{
-+      platform_driver_unregister(&glamo_mci_driver);
-+}
-+
-+module_init(glamo_mci_init);
-+module_exit(glamo_mci_exit);
-+
-+MODULE_DESCRIPTION("Glamo MMC/SD Card Interface driver");
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
-diff --git a/drivers/mfd/glamo/glamo-mci.h b/drivers/mfd/glamo/glamo-mci.h
-new file mode 100644
-index 0000000..40c3e24
---- /dev/null
-+++ b/drivers/mfd/glamo/glamo-mci.h
-@@ -0,0 +1,76 @@
-+/*
-+ *  linux/drivers/mmc/host/glamo-mmc.h - GLAMO MCI driver
-+ *
-+ *  Copyright (C) 2007-2008 OpenMoko, Inc, Andy Green <andy@openmoko.com>
-+ *   based on S3C MMC driver -->
-+ *  Copyright (C) 2004-2006 Thomas Kleffel, 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 version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+
-+enum glamo_mci_waitfor {
-+      COMPLETION_NONE,
-+      COMPLETION_FINALIZE,
-+      COMPLETION_CMDSENT,
-+      COMPLETION_RSPFIN,
-+      COMPLETION_XFERFINISH,
-+      COMPLETION_XFERFINISH_RSPFIN,
-+};
-+
-+struct glamo_mci_host {
-+      struct platform_device  *pdev;
-+      struct glamo_mci_pdata  *pdata;
-+      struct mmc_host         *mmc;
-+      struct resource         *mem;
-+      struct resource         *mem_data;
-+      struct clk              *clk;
-+      void __iomem            *base;
-+      u16 __iomem             *base_data;
-+      int                     irq;
-+      int                     irq_cd;
-+      int                     dma;
-+      int                     data_max_size;
-+
-+      int                     power_mode_current;
-+      unsigned int            vdd_current;
-+
-+      unsigned long           clk_rate;
-+      unsigned long           clk_div;
-+      unsigned long           real_rate;
-+      u8                      prescaler;
-+
-+      unsigned                sdiimsk;
-+      int                     dodma;
-+
-+      volatile int            dmatogo;
-+
-+      struct mmc_request      *mrq;
-+      int                     cmd_is_stop;
-+
-+      spinlock_t              complete_lock;
-+      volatile enum glamo_mci_waitfor
-+                              complete_what;
-+
-+      volatile int            dma_complete;
-+
-+      volatile u32            pio_sgptr;
-+      volatile u32            pio_words;
-+      volatile u32            pio_count;
-+      volatile u16            *pio_ptr;
-+#define XFER_NONE 0
-+#define XFER_READ 1
-+#define XFER_WRITE 2
-+      volatile u32            pio_active;
-+
-+      int                     bus_width;
-+
-+      char                    dbgmsg_cmd[301];
-+      char                    dbgmsg_dat[301];
-+      volatile char           *status;
-+
-+      unsigned int            ccnt, dcnt;
-+      struct tasklet_struct   pio_tasklet;
-+};
-diff --git a/drivers/mfd/glamo/glamo-regs.h b/drivers/mfd/glamo/glamo-regs.h
-index 151cd66..8f6c45c 100644
---- a/drivers/mfd/glamo/glamo-regs.h
-+++ b/drivers/mfd/glamo/glamo-regs.h
-@@ -150,16 +150,28 @@ enum glamo_reg_mem_dram2 {
-       GLAMO_MEM_DRAM2_DEEP_PWRDOWN    = (1 << 12),
- };
-+enum glamo_irq_index {
-+      GLAMO_IRQIDX_HOSTBUS    = 0,
-+      GLAMO_IRQIDX_JPEG       = 1,
-+      GLAMO_IRQIDX_MPEG       = 2,
-+      GLAMO_IRQIDX_MPROC1     = 3,
-+      GLAMO_IRQIDX_MPROC0     = 4,
-+      GLAMO_IRQIDX_CMDQUEUE   = 5,
-+      GLAMO_IRQIDX_2D         = 6,
-+      GLAMO_IRQIDX_MMC        = 7,
-+      GLAMO_IRQIDX_RISC       = 8,
-+};
-+
- enum glamo_irq {
--      GLAMO_IRQ_HOSTBUS       = 0x0001,
--      GLAMO_IRQ_JPEG          = 0x0002,
--      GLAMO_IRQ_MPEG          = 0x0004,
--      GLAMO_IRQ_MPROC1        = 0x0008,
--      GLAMO_IRQ_MPROC0        = 0x0010,
--      GLAMO_IRQ_CMDQUEUE      = 0x0020,
--      GLAMO_IRQ_2D            = 0x0040,
--      GLAMO_IRQ_MMC           = 0x0080,
--      GLAMO_IRQ_RISC          = 0x0100,
-+      GLAMO_IRQ_HOSTBUS       = (1 << GLAMO_IRQIDX_HOSTBUS),
-+      GLAMO_IRQ_JPEG          = (1 << GLAMO_IRQIDX_JPEG),
-+      GLAMO_IRQ_MPEG          = (1 << GLAMO_IRQIDX_MPEG),
-+      GLAMO_IRQ_MPROC1        = (1 << GLAMO_IRQIDX_MPROC1),
-+      GLAMO_IRQ_MPROC0        = (1 << GLAMO_IRQIDX_MPROC0),
-+      GLAMO_IRQ_CMDQUEUE      = (1 << GLAMO_IRQIDX_CMDQUEUE),
-+      GLAMO_IRQ_2D            = (1 << GLAMO_IRQIDX_2D),
-+      GLAMO_IRQ_MMC           = (1 << GLAMO_IRQIDX_MMC),
-+      GLAMO_IRQ_RISC          = (1 << GLAMO_IRQIDX_RISC),
- };
- enum glamo_reg_clock_host {
-@@ -197,6 +209,145 @@ enum glamo_reg_clock_mmc {
-       GLAMO_CLOCK_MMC_RESET           = 0x1000,
- };
-+enum glamo_reg_basic_mmc {
-+      /* set to disable CRC error rejection */
-+      GLAMO_BASIC_MMC_DISABLE_CRC     = 0x0001,
-+      /* enable completion interrupt */
-+      GLAMO_BASIC_MMC_EN_COMPL_INT    = 0x0002,
-+      /* stop MMC clock while enforced idle waiting for data from card */
-+      GLAMO_BASIC_MMC_NO_CLK_RD_WAIT  = 0x0004,
-+      /* 0 = 1-bit bus to card, 1 = use 4-bit bus (has to be negotiated) */
-+      GLAMO_BASIC_MMC_EN_4BIT_DATA    = 0x0008,
-+      /* enable 75K pullups on D3..D0 */
-+      GLAMO_BASIC_MMC_EN_DATA_PUPS    = 0x0010,
-+      /* enable 75K pullup on CMD */
-+      GLAMO_BASIC_MMC_EN_CMD_PUP      = 0x0020,
-+      /* IO drive strength 00=weak -> 11=strongest */
-+      GLAMO_BASIC_MMC_EN_DR_STR0      = 0x0040,
-+      GLAMO_BASIC_MMC_EN_DR_STR1      = 0x0080,
-+      /* TCLK delay stage A, 0000 = 500ps --> 1111 = 8ns */
-+      GLAMO_BASIC_MMC_EN_TCLK_DLYA0   = 0x0100,
-+      GLAMO_BASIC_MMC_EN_TCLK_DLYA1   = 0x0200,
-+      GLAMO_BASIC_MMC_EN_TCLK_DLYA2   = 0x0400,
-+      GLAMO_BASIC_MMC_EN_TCLK_DLYA3   = 0x0800,
-+      /* TCLK delay stage B (cumulative), 0000 = 500ps --> 1111 = 8ns */
-+      GLAMO_BASIC_MMC_EN_TCLK_DLYB0   = 0x1000,
-+      GLAMO_BASIC_MMC_EN_TCLK_DLYB1   = 0x2000,
-+      GLAMO_BASIC_MMC_EN_TCLK_DLYB2   = 0x4000,
-+      GLAMO_BASIC_MMC_EN_TCLK_DLYB3   = 0x8000,
-+};
-+
-+enum glamo_reg_stat1_mmc {
-+      /* command "counter" (really: toggle) */
-+      GLAMO_STAT1_MMC_CMD_CTR = 0x8000,
-+      /* engine is idle */
-+      GLAMO_STAT1_MMC_IDLE    = 0x4000,
-+      /* readback response is ready */
-+      GLAMO_STAT1_MMC_RB_RRDY = 0x0200,
-+      /* readback data is ready */
-+      GLAMO_STAT1_MMC_RB_DRDY = 0x0100,
-+      /* no response timeout */
-+      GLAMO_STAT1_MMC_RTOUT   = 0x0020,
-+      /* no data timeout */
-+      GLAMO_STAT1_MMC_DTOUT   = 0x0010,
-+      /* CRC error on block write */
-+      GLAMO_STAT1_MMC_BWERR   = 0x0004,
-+      /* CRC error on block read */
-+      GLAMO_STAT1_MMC_BRERR   = 0x0002
-+};
-+
-+enum glamo_reg_fire_mmc {
-+      /* command "counter" (really: toggle)
-+       * the STAT1 register reflects this so you can ensure you don't look
-+       * at status for previous command
-+       */
-+      GLAMO_FIRE_MMC_CMD_CTR  = 0x8000,
-+      /* sets kind of response expected */
-+      GLAMO_FIRE_MMC_RES_MASK = 0x0700,
-+      /* sets command type */
-+      GLAMO_FIRE_MMC_TYP_MASK = 0x00C0,
-+      /* sets command class */
-+      GLAMO_FIRE_MMC_CLS_MASK = 0x000F,
-+};
-+
-+enum glamo_fire_mmc_response_types {
-+      GLAMO_FIRE_MMC_RSPT_R1  = 0x0000,
-+      GLAMO_FIRE_MMC_RSPT_R1b = 0x0100,
-+      GLAMO_FIRE_MMC_RSPT_R2  = 0x0200,
-+      GLAMO_FIRE_MMC_RSPT_R3  = 0x0300,
-+      GLAMO_FIRE_MMC_RSPT_R4  = 0x0400,
-+      GLAMO_FIRE_MMC_RSPT_R5  = 0x0500,
-+};
-+
-+enum glamo_fire_mmc_command_types {
-+      /* broadcast, no response */
-+      GLAMO_FIRE_MMC_CMDT_BNR = 0x0000,
-+      /* broadcast, with response */
-+      GLAMO_FIRE_MMC_CMDT_BR  = 0x0040,
-+      /* addressed, no data */
-+      GLAMO_FIRE_MMC_CMDT_AND = 0x0080,
-+      /* addressed, with data */
-+      GLAMO_FIRE_MMC_CMDT_AD  = 0x00C0,
-+};
-+
-+enum glamo_fire_mmc_command_class {
-+      /* "Stream Read" */
-+      GLAMO_FIRE_MMC_CC_STRR  = 0x0000,
-+      /* Single Block Read */
-+      GLAMO_FIRE_MMC_CC_SBR   = 0x0001,
-+      /* Multiple Block Read With Stop */
-+      GLAMO_FIRE_MMC_CC_MBRS  = 0x0002,
-+      /* Multiple Block Read No Stop */
-+      GLAMO_FIRE_MMC_CC_MBRNS = 0x0003,
-+      /* RESERVED for "Stream Write" */
-+      GLAMO_FIRE_MMC_CC_STRW  = 0x0004,
-+      /* "Stream Write" */
-+      GLAMO_FIRE_MMC_CC_SBW   = 0x0005,
-+      /* RESERVED for Multiple Block Write With Stop */
-+      GLAMO_FIRE_MMC_CC_MBWS  = 0x0006,
-+      /* Multiple Block Write No Stop */
-+      GLAMO_FIRE_MMC_CC_MBWNS = 0x0007,
-+      /* STOP command */
-+      GLAMO_FIRE_MMC_CC_STOP  = 0x0008,
-+      /* Cancel on Running Command */
-+      GLAMO_FIRE_MMC_CC_CANCL = 0x0009,
-+      /* "Basic Command" */
-+      GLAMO_FIRE_MMC_CC_BASIC = 0x000a,
-+};
-+
-+/* these are offsets from the start of the MMC register region */
-+enum glamo_register_mmc {
-+      /* MMC command, b15..8 = cmd arg b7..0; b7..1 = CRC; b0 = end bit */
-+      GLAMO_REG_MMC_CMD_REG1  = 0x00,
-+      /* MMC command, b15..0 = cmd arg b23 .. 8 */
-+      GLAMO_REG_MMC_CMD_REG2  = 0x02,
-+      /* MMC command, b15=start, b14=transmission,
-+       * b13..8=cmd idx, b7..0=cmd arg b31..24
-+       */
-+      GLAMO_REG_MMC_CMD_REG3  = 0x04,
-+      GLAMO_REG_MMC_CMD_FIRE  = 0x06,
-+      GLAMO_REG_MMC_CMD_RSP1  = 0x10,
-+      GLAMO_REG_MMC_CMD_RSP2  = 0x12,
-+      GLAMO_REG_MMC_CMD_RSP3  = 0x14,
-+      GLAMO_REG_MMC_CMD_RSP4  = 0x16,
-+      GLAMO_REG_MMC_CMD_RSP5  = 0x18,
-+      GLAMO_REG_MMC_CMD_RSP6  = 0x1a,
-+      GLAMO_REG_MMC_CMD_RSP7  = 0x1c,
-+      GLAMO_REG_MMC_CMD_RSP8  = 0x1e,
-+      GLAMO_REG_MMC_RB_STAT1  = 0x20,
-+      GLAMO_REG_MMC_RB_BLKCNT = 0x22,
-+      GLAMO_REG_MMC_RB_BLKLEN = 0x24,
-+      GLAMO_REG_MMC_BASIC     = 0x30,
-+      GLAMO_REG_MMC_RDATADS1  = 0x34,
-+      GLAMO_REG_MMC_RDATADS2  = 0x36,
-+      GLAMO_REG_MMC_WDATADS1  = 0x38,
-+      GLAMO_REG_MMC_WDATADS2  = 0x3a,
-+      GLAMO_REG_MMC_DATBLKCNT = 0x3c,
-+      GLAMO_REG_MMC_DATBLKLEN = 0x3e,
-+      GLAMO_REG_MMC_TIMEOUT   = 0x40,
-+
-+};
-+
- enum glamo_reg_clock_isp {
-       GLAMO_CLOCK_ISP_DG_I1CLK        = 0x0001,
-       GLAMO_CLOCK_ISP_EN_I1CLK        = 0x0002,
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1035-gta02-core.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1035-gta02-core.patch.patch
deleted file mode 100644 (file)
index 94dbba0..0000000
+++ /dev/null
@@ -1,1027 +0,0 @@
-From 565a3af138c80c15151d91647b7e92654997ecc8 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:35:15 +0100
-Subject: [PATCH] gta02-core.patch
-
----
- arch/arm/mach-s3c2440/Kconfig        |   15 +
- arch/arm/mach-s3c2440/Makefile       |    1 +
- arch/arm/mach-s3c2440/mach-gta02.c   |  826 ++++++++++++++++++++++++++++++++++
- drivers/leds/leds-neo1973-vibrator.c |    2 +-
- include/asm-arm/arch-s3c2410/gta02.h |   99 ++++
- sound/soc/s3c24xx/neo1973_wm8753.c   |    8 +-
- 6 files changed, 949 insertions(+), 2 deletions(-)
- create mode 100644 arch/arm/mach-s3c2440/mach-gta02.c
- create mode 100644 include/asm-arm/arch-s3c2410/gta02.h
-
-diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
-index 6798d9c..1fab1c0 100644
---- a/arch/arm/mach-s3c2440/Kconfig
-+++ b/arch/arm/mach-s3c2440/Kconfig
-@@ -74,5 +74,20 @@ config MACH_HXD8
-       help
-          Say Y here if you are using the FIC Neo1973 GSM Phone
-+config MACH_NEO1973_GTA02
-+      bool "FIC Neo1973 GSM Phone (GTA02 Hardware)"
-+      select CPU_S3C2442
-+      select SENSORS_PCF50633
-+      help
-+         Say Y here if you are using the FIC Neo1973 GSM Phone
-+
-+config NEO1973_GTA02_2440
-+      bool "Old FIC Neo1973 GTA02 hardware using S3C2440 CPU"
-+      depends on MACH_NEO1973_GTA02
-+      select CPU_S3C2440
-+      help
-+         Say Y here if you are using an early hardware revision
-+         of the FIC/OpenMoko Neo1973 GTA02 GSM Phone.
-+
- endmenu
-diff --git a/arch/arm/mach-s3c2440/Makefile b/arch/arm/mach-s3c2440/Makefile
-index 6f590d4..5305fdb 100644
---- a/arch/arm/mach-s3c2440/Makefile
-+++ b/arch/arm/mach-s3c2440/Makefile
-@@ -22,3 +22,4 @@ obj-$(CONFIG_MACH_RX3715)    += mach-rx3715.o
- obj-$(CONFIG_ARCH_S3C2440)    += mach-smdk2440.o
- obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
- obj-$(CONFIG_MACH_HXD8)               += mach-hxd8.o
-+obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-new file mode 100644
-index 0000000..f72a5ae
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -0,0 +1,826 @@
-+/*
-+ * linux/arch/arm/mach-s3c2440/mach-gta02.c
-+ *
-+ * S3C2440 Machine Support for the FIC GTA02 (Neo1973)
-+ *
-+ * Copyright (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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
-+ *
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/types.h>
-+#include <linux/interrupt.h>
-+#include <linux/list.h>
-+#include <linux/delay.h>
-+#include <linux/timer.h>
-+#include <linux/init.h>
-+#include <linux/workqueue.h>
-+#include <linux/platform_device.h>
-+#include <linux/serial_core.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/glamo.h>
-+#include <linux/spi/spi_bitbang.h>
-+#include <linux/mmc/host.h>
-+
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/nand.h>
-+#include <linux/mtd/nand_ecc.h>
-+#include <linux/mtd/partitions.h>
-+#include <linux/mtd/physmap.h>
-+
-+#include <linux/pcf50633.h>
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/map.h>
-+#include <asm/mach/irq.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <asm/mach-types.h>
-+
-+#include <asm/arch/regs-gpio.h>
-+#include <asm/arch/regs-gpioj.h>
-+#include <asm/arch/fb.h>
-+#include <asm/arch/mci.h>
-+#include <asm/arch/ts.h>
-+#include <asm/arch/spi.h>
-+#include <asm/arch/spi-gpio.h>
-+#include <asm/arch/usb-control.h>
-+
-+#include <asm/arch/gta01.h>
-+#include <asm/arch/gta02.h>
-+
-+#include <asm/plat-s3c/regs-serial.h>
-+#include <asm/plat-s3c/nand.h>
-+#include <asm/plat-s3c24xx/devs.h>
-+#include <asm/plat-s3c24xx/cpu.h>
-+#include <asm/plat-s3c24xx/pm.h>
-+#include <asm/plat-s3c24xx/udc.h>
-+
-+#include <linux/glamofb.h>
-+
-+static struct map_desc gta02_iodesc[] __initdata = {
-+      {
-+              .virtual        = 0xe0000000,
-+              .pfn            = __phys_to_pfn(S3C2410_CS3+0x01000000),
-+              .length         = SZ_1M,
-+              .type           = MT_DEVICE
-+      },
-+};
-+
-+#define UCON S3C2410_UCON_DEFAULT
-+#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
-+#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
-+
-+static struct s3c2410_uartcfg gta02_uartcfgs[] = {
-+      [0] = {
-+              .hwport      = 0,
-+              .flags       = 0,
-+              .ucon        = UCON,
-+              .ulcon       = ULCON,
-+              .ufcon       = UFCON,
-+      },
-+      [1] = {
-+              .hwport      = 1,
-+              .flags       = 0,
-+              .ucon        = UCON,
-+              .ulcon       = ULCON,
-+              .ufcon       = UFCON,
-+      },
-+      [2] = {
-+              .hwport      = 2,
-+              .flags       = 0,
-+              .ucon        = UCON,
-+              .ulcon       = ULCON,
-+              .ufcon       = UFCON,
-+      },
-+
-+};
-+
-+/* PMU driver info */
-+
-+static int pmu_callback(struct device *dev, unsigned int feature,
-+                      enum pmu_event event)
-+{
-+      switch (feature) {
-+      case PCF50633_FEAT_MBC:
-+              switch (event) {
-+              case PMU_EVT_INSERT:
-+              case PMU_EVT_USB_INSERT:
-+                      pcf50633_charge_enable(pcf50633_global, 1);
-+                      break;
-+              case PMU_EVT_REMOVE:
-+              case PMU_EVT_USB_REMOVE:
-+                      pcf50633_charge_enable(pcf50633_global, 0);
-+                      break;
-+              default:
-+                      break;
-+              }
-+              break;
-+      default:
-+              break;
-+      }
-+
-+      return 0;
-+}
-+
-+static struct pcf50633_platform_data gta02_pcf_pdata = {
-+      .used_features  = PCF50633_FEAT_MBC |
-+                        PCF50633_FEAT_BBC |
-+                        PCF50633_FEAT_RTC |
-+                        PCF50633_FEAT_CHGCUR |
-+                        PCF50633_FEAT_BATVOLT |
-+                        PCF50633_FEAT_BATTEMP |
-+                        PCF50633_FEAT_PWM_BL,
-+      .onkey_seconds_sig_init = 4,
-+      .onkey_seconds_shutdown = 8,
-+      .cb             = &pmu_callback,
-+      .r_fix_batt     = 10000,
-+      .r_fix_batt_par = 10000,
-+      .r_sense_milli  = 220,
-+      .rails  = {
-+              [PCF50633_REGULATOR_AUTO] = {
-+                      .name           = "io_3v3",
-+                      .flags          = PMU_VRAIL_F_SUSPEND_ON,
-+                      .voltage        = {
-+                              .init   = 3300,
-+                              .max    = 3300,
-+                      },
-+              },
-+              [PCF50633_REGULATOR_DOWN1] = {
-+                      .name           = "core_1v3",
-+                      .voltage        = {
-+                              .init   = 1300,
-+                              .max    = 1600,
-+                      },
-+              },
-+              [PCF50633_REGULATOR_DOWN2] = {
-+                      .name           = "core_1v8",
-+                      .voltage        = {
-+                              .init   = 1800,
-+                              .max    = 1800,
-+                      },
-+              },
-+              [PCF50633_REGULATOR_HCLDO] = {
-+                      .name           = "sd_3v3",
-+                      .voltage        = {
-+                              .init   = 3300,
-+                              .max    = 3300,
-+                      },
-+              },
-+              [PCF50633_REGULATOR_LDO1] = {
-+                      .name           = "stby_1v3",
-+                      .flags          = PMU_VRAIL_F_SUSPEND_ON,
-+                      .voltage        = {
-+                              .init   = 1300,
-+                              .max    = 1330,
-+                      },
-+              },
-+              [PCF50633_REGULATOR_LDO2] = {
-+                      .name           = "codec_3v3",
-+                      .voltage        = {
-+                              .init   = 3300,
-+                              .max    = 3300,
-+                      },
-+              },
-+              [PCF50633_REGULATOR_LDO3] = {
-+                      .name           = "lcm_3v",
-+                      .voltage        = {
-+                              .init   = 3000,
-+                              .max    = 3000,
-+                      },
-+              },
-+              [PCF50633_REGULATOR_LDO4] = {
-+                      .name           = "gl_2v5",
-+                      .voltage        = {
-+                              .init   = 2500,
-+                              .max    = 2500,
-+                      },
-+              },
-+              [PCF50633_REGULATOR_LDO5] = {
-+                      .name           = "gl_1v5",
-+                      .voltage        = {
-+                              .init   = 1500,
-+                              .max    = 1500,
-+                      },
-+              },
-+              [PCF50633_REGULATOR_LDO6] = {
-+                      .name           = "user1",
-+                      .voltage        = {
-+                              .init   = 0,
-+                              .max    = 3300,
-+                      },
-+              },
-+      },
-+};
-+
-+#if 0 /* currently unused */
-+static void cfg_pmu_vrail(struct pmu_voltage_rail *vrail, char *name,
-+                        unsigned int flags, unsigned int init,
-+                        unsigned int max)
-+{
-+      vrail->name = name;
-+      vrail->flags = flags;
-+      vrail->voltage.init = init;
-+      vrail->voltage.max = max;
-+}
-+#endif
-+
-+static void mangle_pmu_pdata_by_system_rev(void)
-+{
-+      switch (system_rev) {
-+      case GTA02v1_SYSTEM_REV:
-+              /* FIXME: this is only in v1 due to wrong PMU variant */
-+              gta02_pcf_pdata.rails[PCF50633_REGULATOR_DOWN2].flags =
-+                                                      PMU_VRAIL_F_SUSPEND_ON;
-+              break;
-+      case GTA02v2_SYSTEM_REV:
-+      case GTA02v3_SYSTEM_REV:
-+      case GTA02v4_SYSTEM_REV:
-+      case GTA02v5_SYSTEM_REV:
-+      case GTA02v6_SYSTEM_REV:
-+              /* we need to keep the 1.8V going since this is the SDRAM
-+               * self-refresh voltage */
-+              gta02_pcf_pdata.rails[PCF50633_REGULATOR_DOWN2].flags =
-+                                                      PMU_VRAIL_F_SUSPEND_ON;
-+              gta02_pcf_pdata.rails[PCF50633_REGULATOR_DOWN2].name =
-+                                                      "io_1v8",
-+              gta02_pcf_pdata.rails[PCF50633_REGULATOR_LDO1].name =
-+                                                      "gsensor_3v3",
-+              gta02_pcf_pdata.rails[PCF50633_REGULATOR_LDO1].voltage.init =
-+                                                      3300;
-+              gta02_pcf_pdata.rails[PCF50633_REGULATOR_LDO1].voltage.max =
-+                                                      3300;
-+              gta02_pcf_pdata.rails[PCF50633_REGULATOR_LDO1].flags &=
-+                                                      ~PMU_VRAIL_F_SUSPEND_ON;
-+              gta02_pcf_pdata.rails[PCF50633_REGULATOR_LDO3].flags =
-+                                                      PMU_VRAIL_F_UNUSED;
-+              gta02_pcf_pdata.rails[PCF50633_REGULATOR_LDO5] = ((struct pmu_voltage_rail) {
-+                                                      .name = "rf_3v",
-+                                                      .voltage = {
-+                                                              .init = 0,
-+                                                              .max = 3000,
-+                                                      }
-+                                              });
-+              gta02_pcf_pdata.rails[PCF50633_REGULATOR_LDO6] = ((struct pmu_voltage_rail) {
-+                                                      .name = "lcm_3v",
-+                                                      .voltage = {
-+                                                              .init = 3000,
-+                                                              .max = 3000,
-+                                                      }
-+                                              });
-+              break;
-+      default:
-+              break;
-+      }
-+}
-+
-+static struct resource gta02_pmu_resources[] = {
-+      [0] = {
-+              .flags  = IORESOURCE_IRQ,
-+              .start  = GTA02_IRQ_PCF50633,
-+              .end    = GTA02_IRQ_PCF50633,
-+      },
-+};
-+
-+struct platform_device gta02_pmu_dev = {
-+      .name           = "pcf50633",
-+      .num_resources  = ARRAY_SIZE(gta02_pmu_resources),
-+      .resource       = gta02_pmu_resources,
-+      .dev            = {
-+              .platform_data = &gta02_pcf_pdata,
-+      },
-+};
-+
-+
-+/* NOR Flash */
-+
-+#define GTA02_FLASH_BASE      0x18000000 /* GCS3 */
-+#define GTA02_FLASH_SIZE      0x200000 /* 2MBytes */
-+
-+static struct physmap_flash_data gta02_nor_flash_data = {
-+      .width          = 2,
-+};
-+
-+static struct resource gta02_nor_flash_resource = {
-+      .start          = GTA02_FLASH_BASE,
-+      .end            = GTA02_FLASH_BASE + GTA02_FLASH_SIZE - 1,
-+      .flags          = IORESOURCE_MEM,
-+};
-+
-+static struct platform_device gta02_nor_flash = {
-+      .name           = "physmap-flash",
-+      .id             = 0,
-+      .dev            = {
-+                              .platform_data  = &gta02_nor_flash_data,
-+                      },
-+      .resource       = &gta02_nor_flash_resource,
-+      .num_resources  = 1,
-+};
-+
-+
-+
-+static struct resource gta02_sdio_resources[] = {
-+      [0] = {
-+              .flags  = IORESOURCE_IRQ,
-+              .start  = IRQ_SDI,
-+              .end    = IRQ_SDI,
-+      },
-+      [1] = {
-+              .flags = IORESOURCE_MEM,
-+              .start = S3C2410_PA_SDI,
-+              .end   = S3C2410_PA_SDI + S3C24XX_SZ_SDI - 1,
-+      },
-+      [2] = {
-+              .flags = IORESOURCE_DMA,
-+              .start = 0, /* Channel 0 for SDI */
-+              .end = 0,
-+      },
-+};
-+
-+
-+static struct platform_device gta02_sdio_dev = {
-+        .name           = "s3c24xx-sdio",
-+        .id             = -1,
-+        .dev            = {
-+                                .coherent_dma_mask      = 0xffffffff,
-+        },
-+        .resource       = gta02_sdio_resources,
-+        .num_resources  = ARRAY_SIZE(gta02_sdio_resources),
-+};
-+
-+static struct platform_device *gta02_devices[] __initdata = {
-+      &s3c_device_usb,
-+      &s3c_device_wdt,
-+      &s3c_device_i2c,
-+      &s3c_device_iis,
-+      // &s3c_device_sdi, /* FIXME: temporary disable to avoid s3cmci bind */
-+      &s3c_device_usbgadget,
-+      &s3c_device_nand,
-+      &s3c_device_ts,
-+      &s3c_device_spi0,
-+      &s3c_device_spi1,
-+      &gta02_nor_flash,
-+};
-+
-+static struct s3c2410_nand_set gta02_nand_sets[] = {
-+      [0] = {
-+              .name           = "neo1973-nand",
-+              .nr_chips       = 1,
-+              .flags          = S3C2410_NAND_BBT,
-+      },
-+};
-+
-+/* choose a set of timings which should suit most 512Mbit
-+ * chips and beyond.
-+ */
-+
-+static struct s3c2410_platform_nand gta02_nand_info = {
-+      .tacls          = 20,
-+      .twrph0         = 60,
-+      .twrph1         = 20,
-+      .nr_sets        = ARRAY_SIZE(gta02_nand_sets),
-+      .sets           = gta02_nand_sets,
-+};
-+
-+static struct s3c24xx_mci_pdata gta02_mmc_cfg = {
-+      .gpio_detect    = GTA02v1_GPIO_nSD_DETECT,
-+      .set_power      = NULL,
-+      .ocr_avail      = MMC_VDD_32_33,
-+};
-+
-+static void gta02_udc_command(enum s3c2410_udc_cmd_e cmd)
-+{
-+      printk(KERN_DEBUG "%s(%d)\n", __func__, cmd);
-+
-+      switch (cmd) {
-+      case S3C2410_UDC_P_ENABLE:
-+              s3c2410_gpio_setpin(GTA02_GPIO_USB_PULLUP, 1);
-+              break;
-+      case S3C2410_UDC_P_DISABLE:
-+              s3c2410_gpio_setpin(GTA02_GPIO_USB_PULLUP, 0);
-+              break;
-+      case S3C2410_UDC_P_RESET:
-+              /* FIXME! */
-+              break;
-+      default:
-+              break;
-+      }
-+}
-+
-+/* use a work queue, since I2C API inherently schedules
-+ * and we get called in hardirq context from UDC driver */
-+
-+struct vbus_draw {
-+      struct work_struct work;
-+      int ma;
-+};
-+static struct vbus_draw gta02_udc_vbus_drawer;
-+
-+static void __gta02_udc_vbus_draw(struct work_struct *work)
-+{
-+      if (!pcf50633_global) {
-+              printk(KERN_ERR  "pcf50633 not initialized yet, can't change "
-+                     "vbus_draw\n");
-+              return;
-+      }
-+      pcf50633_usb_curlim_set(pcf50633_global, gta02_udc_vbus_drawer.ma);
-+}
-+
-+static void gta02_udc_vbus_draw(unsigned int ma)
-+{
-+      gta02_udc_vbus_drawer.ma = ma;
-+      schedule_work(&gta02_udc_vbus_drawer.work);
-+}
-+
-+static struct s3c2410_udc_mach_info gta02_udc_cfg = {
-+      .vbus_draw      = gta02_udc_vbus_draw,
-+      .udc_command    = gta02_udc_command,
-+
-+};
-+
-+static struct s3c2410_ts_mach_info gta02_ts_cfg = {
-+      .delay = 10000,
-+      .presc = 65,
-+      .oversampling_shift = 5,
-+};
-+
-+/* SPI */
-+
-+static struct spi_board_info gta02_spi_board_info[] = {
-+      {
-+              .modalias       = "jbt6k74",
-+              /* platform_data */
-+              /* controller_data */
-+              /* irq */
-+              .max_speed_hz   = 10 * 1000 * 1000,
-+              .bus_num        = 2,
-+              /* chip_select */
-+      },
-+};
-+
-+static struct glamo_spi_info glamo_spi_cfg = {
-+      .board_size     = ARRAY_SIZE(gta02_spi_board_info),
-+      .board_info     = gta02_spi_board_info,
-+};
-+
-+static struct glamo_spigpio_info glamo_spigpio_cfg = {
-+      .pin_clk        = GLAMO_GPIO10_OUTPUT,
-+      .pin_mosi       = GLAMO_GPIO11_OUTPUT,
-+      .pin_cs         = GLAMO_GPIO12_OUTPUT,
-+      .pin_miso       = 0,
-+      .board_size     = ARRAY_SIZE(gta02_spi_board_info),
-+      .board_info     = gta02_spi_board_info,
-+};
-+
-+static struct resource gta01_led_resources[] = {
-+      [0] = {
-+              .start  = GTA02_GPIO_VIBRATOR_ON,
-+              .end    = GTA02_GPIO_VIBRATOR_ON,
-+      },
-+};
-+
-+static struct platform_device gta01_led_dev = {
-+      .name           = "neo1973-vibrator",
-+      .num_resources  = ARRAY_SIZE(gta01_led_resources),
-+      .resource       = gta01_led_resources,
-+};
-+
-+static struct resource gta02_led_resources[] = {
-+      {
-+              .name   = "gta02-power:orange",
-+              .start  = GTA02_GPIO_PWR_LED1,
-+              .end    = GTA02_GPIO_PWR_LED1,
-+      }, {
-+              .name   = "gta02-power:blue",
-+              .start  = GTA02_GPIO_PWR_LED2,
-+              .end    = GTA02_GPIO_PWR_LED2,
-+      }, {
-+              .name   = "gta02-aux:red",
-+              .start  = GTA02_GPIO_AUX_LED,
-+              .end    = GTA02_GPIO_AUX_LED,
-+      },
-+};
-+
-+struct platform_device gta02_led_dev = {
-+      .name           = "gta02-led",
-+      .num_resources  = ARRAY_SIZE(gta02_led_resources),
-+      .resource       = gta02_led_resources,
-+};
-+
-+static struct resource gta01_button_resources[] = {
-+      [0] = {
-+              .start = GTA02_GPIO_AUX_KEY,
-+              .end   = GTA02_GPIO_AUX_KEY,
-+      },
-+      [1] = {
-+              .start = GTA02_GPIO_HOLD_KEY,
-+              .end   = GTA02_GPIO_HOLD_KEY,
-+      },
-+      [2] = {
-+              .start = GTA02_GPIO_JACK_INSERT,
-+              .end   = GTA02_GPIO_JACK_INSERT,
-+      },
-+};
-+
-+static struct platform_device gta01_button_dev = {
-+      .name           = "neo1973-button",
-+      .num_resources  = ARRAY_SIZE(gta01_button_resources),
-+      .resource       = gta01_button_resources,
-+};
-+
-+static struct platform_device gta01_pm_gsm_dev = {
-+      .name           = "neo1973-pm-gsm",
-+};
-+
-+/* USB */
-+static struct s3c2410_hcd_info gta02_usb_info = {
-+      .port[0]        = {
-+              .flags  = S3C_HCDFLG_USED,
-+      },
-+      .port[1]        = {
-+              .flags  = 0,
-+      },
-+};
-+
-+static int glamo_irq_is_wired(void)
-+{
-+      int rc;
-+      int count = 0;
-+
-+      /*
-+      * GTA02 S-Media IRQs prior to A5 are broken due to a lack of
-+      * a pullup on the INT# line.  Check for the bad behaviour.
-+      */
-+      s3c2410_gpio_setpin(S3C2410_GPG4, 0);
-+      s3c2410_gpio_cfgpin(S3C2410_GPG4, S3C2410_GPG4_OUTP);
-+      s3c2410_gpio_cfgpin(S3C2410_GPG4, S3C2410_GPG4_INP);
-+      /*
-+      * we force it low ourselves for a moment and resume being input.
-+      * If there is a pullup, it won't stay low for long.  But if the
-+      * level converter is there as on < A5 revision, the weak keeper
-+      * on the input of the LC will hold the line low indefinitiely
-+      */
-+      do
-+              rc = s3c2410_gpio_getpin(S3C2410_GPG4);
-+      while ((!rc) && ((count++) < 10));
-+      if (rc) { /* it got pulled back up, it's good */
-+              printk(KERN_INFO "Detected S-Media IRQ# pullup, "
-+              "enabling interrupt\n");
-+              return 0;
-+      } else  /* Gah we can't work with this level converter */
-+              printk(KERN_WARNING "** Detected bad IRQ# circuit found"
-+              " on pre-A5 GTA02: S-Media interrupt disabled **\n");
-+      return -ENODEV;
-+}
-+
-+
-+static void
-+gta02_glamo_mmc_set_power(unsigned char power_mode, unsigned short vdd)
-+{
-+      int mv = 1650;
-+
-+      printk(KERN_DEBUG "mmc_set_power(power_mode=%u, vdd=%u\n",
-+             power_mode, vdd);
-+
-+      switch (system_rev) {
-+      case GTA02v1_SYSTEM_REV:
-+      case GTA02v2_SYSTEM_REV:
-+              break;
-+      case GTA02v3_SYSTEM_REV:
-+      case GTA02v4_SYSTEM_REV:
-+      case GTA02v5_SYSTEM_REV:
-+      case GTA02v6_SYSTEM_REV:
-+              /* depend on pcf50633 driver init */
-+              if (!pcf50633_global)
-+                      while (!pcf50633_global)
-+                              msleep(10);
-+              switch (power_mode) {
-+              case MMC_POWER_ON:
-+              case MMC_POWER_UP:
-+                      /* select and set the voltage */
-+                      if (vdd > 7) {
-+                              mv += 300 + 100 * (vdd - 8);
-+                              if (mv > 3500)
-+                                      mv = 3500;
-+                      }
-+                      pcf50633_voltage_set(pcf50633_global,
-+                                           PCF50633_REGULATOR_HCLDO, mv);
-+                      msleep(10);
-+                      pcf50633_onoff_set(pcf50633_global,
-+                                         PCF50633_REGULATOR_HCLDO, 1);
-+                      msleep(1);
-+                      break;
-+              case MMC_POWER_OFF:
-+                      pcf50633_onoff_set(pcf50633_global,
-+                                         PCF50633_REGULATOR_HCLDO, 0);
-+                      msleep(1);
-+                      break;
-+              }
-+              break;
-+      }
-+}
-+
-+/* Smedia Glamo 3362 */
-+
-+static struct glamofb_platform_data gta02_glamo_pdata = {
-+      .width          = 43,
-+      .height         = 58,
-+       /* 24.5MHz --> 40.816ns */
-+      .pixclock       = 40816,
-+      .left_margin    = 8,
-+      .right_margin   = 16,
-+      .upper_margin   = 2,
-+      .lower_margin   = 16,
-+      .hsync_len      = 8,
-+      .vsync_len      = 2,
-+      .fb_mem_size    = 0x400000, /* glamo has 8 megs of SRAM. we use 4 */
-+      .xres           = {
-+              .min    = 240,
-+              .max    = 640,
-+              .defval = 480,
-+      },
-+      .yres           = {
-+              .min    = 320,
-+              .max    = 640,
-+              .defval = 640,
-+      },
-+      .bpp            = {
-+              .min    = 16,
-+              .max    = 16,
-+              .defval = 16,
-+      },
-+      //.spi_info     = &glamo_spi_cfg,
-+      .spigpio_info   = &glamo_spigpio_cfg,
-+
-+      /* glamo MMC function platform data */
-+      .glamo_set_mci_power = gta02_glamo_mmc_set_power,
-+      .glamo_irq_is_wired = glamo_irq_is_wired,
-+};
-+
-+static struct resource gta02_glamo_resources[] = {
-+      [0] = {
-+              .start  = S3C2410_CS1,
-+              .end    = S3C2410_CS1 + 0x1000000 - 1,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      [1] = {
-+              .start  = GTA02_IRQ_3D,
-+              .end    = GTA02_IRQ_3D,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+      [2] = {
-+              .start = GTA02v1_GPIO_3D_RESET,
-+              .end   = GTA02v1_GPIO_3D_RESET,
-+      },
-+};
-+
-+static struct platform_device gta02_glamo_dev = {
-+      .name           = "glamo3362",
-+      .num_resources  = ARRAY_SIZE(gta02_glamo_resources),
-+      .resource       = gta02_glamo_resources,
-+      .dev            = {
-+              .platform_data  = &gta02_glamo_pdata,
-+      },
-+};
-+
-+static void mangle_glamo_res_by_system_rev(void)
-+{
-+      switch (system_rev) {
-+      case GTA02v1_SYSTEM_REV:
-+              break;
-+      default:
-+              gta02_glamo_resources[2].start = GTA02_GPIO_3D_RESET;
-+              gta02_glamo_resources[2].end = GTA02_GPIO_3D_RESET;
-+              break;
-+      }
-+
-+      switch (system_rev) {
-+      case GTA02v1_SYSTEM_REV:
-+      case GTA02v2_SYSTEM_REV:
-+      case GTA02v3_SYSTEM_REV:
-+      /* case GTA02v4_SYSTEM_REV: - FIXME: handle this later */
-+              /* The hardware is missing a pull-up resistor and thus can't
-+               * support the Smedia Glamo IRQ */
-+              gta02_glamo_resources[1].start = 0;
-+              gta02_glamo_resources[1].end = 0;
-+              break;
-+      }
-+}
-+
-+static void __init gta02_map_io(void)
-+{
-+      s3c24xx_init_io(gta02_iodesc, ARRAY_SIZE(gta02_iodesc));
-+      s3c24xx_init_clocks(12000000);
-+      s3c24xx_init_uarts(gta02_uartcfgs, ARRAY_SIZE(gta02_uartcfgs));
-+}
-+
-+static irqreturn_t gta02_modem_irq(int irq, void *param)
-+{
-+      printk(KERN_DEBUG "modem wakeup interrupt\n");
-+      return IRQ_HANDLED;
-+}
-+
-+static void __init gta02_machine_init(void)
-+{
-+      int rc;
-+
-+      s3c_device_usb.dev.platform_data = &gta02_usb_info;
-+      s3c_device_nand.dev.platform_data = &gta02_nand_info;
-+      s3c_device_sdi.dev.platform_data = &gta02_mmc_cfg;
-+
-+      /* Only GTA02v1 has a SD_DETECT GPIO.  Since the slot is not
-+       * hot-pluggable, this is not required anyway */
-+      switch (system_rev) {
-+      case GTA02v1_SYSTEM_REV:
-+              break;
-+      default:
-+              gta02_mmc_cfg.gpio_detect = 0;
-+              break;
-+      }
-+
-+      INIT_WORK(&gta02_udc_vbus_drawer.work, __gta02_udc_vbus_draw);
-+      s3c24xx_udc_set_platdata(&gta02_udc_cfg);
-+      set_s3c2410ts_info(&gta02_ts_cfg);
-+
-+      /* FIXME: hardcoded WLAN module power-up */
-+      s3c2410_gpio_cfgpin(GTA02_CHIP_PWD, S3C2410_GPIO_OUTPUT);
-+
-+      /* Power is down */
-+      s3c2410_gpio_setpin(GTA02_CHIP_PWD, 1);
-+      mdelay(100);
-+
-+      switch (system_rev) {
-+      case GTA02v1_SYSTEM_REV:
-+              s3c2410_gpio_setpin(GTA02_CHIP_PWD, 0);
-+              break;
-+      default:
-+              s3c2410_gpio_cfgpin(GTA02_GPIO_nWLAN_RESET, S3C2410_GPIO_OUTPUT);
-+              /* Chip is in reset state */
-+              s3c2410_gpio_setpin(GTA02_GPIO_nWLAN_RESET, 0);
-+              mdelay(100);
-+              /* Power is up */
-+              s3c2410_gpio_setpin(GTA02_CHIP_PWD, 0);
-+              mdelay(100);
-+              /* Chip is out of reset */
-+              s3c2410_gpio_setpin(GTA02_GPIO_nWLAN_RESET, 1);
-+              break;
-+      }
-+
-+      platform_device_register(&gta01_button_dev);
-+      platform_device_register(&gta01_pm_gsm_dev);
-+
-+      mangle_pmu_pdata_by_system_rev();
-+      platform_device_register(&gta02_pmu_dev);
-+      platform_device_register(&gta01_led_dev);
-+      platform_device_register(&gta02_led_dev);
-+
-+      mangle_glamo_res_by_system_rev();
-+      platform_device_register(&gta02_glamo_dev);
-+
-+      platform_device_register(&gta02_sdio_dev);
-+
-+      platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices));
-+
-+      s3c2410_pm_init();
-+
-+      /* Set LCD_RESET / XRES to high */
-+      s3c2410_gpio_cfgpin(GTA01_GPIO_LCD_RESET, S3C2410_GPIO_OUTPUT);
-+      s3c2410_gpio_setpin(GTA01_GPIO_LCD_RESET, 1);
-+
-+      /* Make sure the modem can wake us up */
-+      set_irq_type(GTA02_IRQ_MODEM, IRQT_RISING);
-+      rc = request_irq(GTA02_IRQ_MODEM, gta02_modem_irq, IRQF_DISABLED,
-+                       "modem", NULL);
-+      if (rc < 0)
-+              printk(KERN_ERR "GTA02: can't request GSM modem wakeup IRQ\n");
-+      enable_irq_wake(GTA02_IRQ_MODEM);
-+}
-+
-+MACHINE_START(NEO1973_GTA02, "GTA02")
-+      .phys_io        = S3C2410_PA_UART,
-+      .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
-+      .boot_params    = S3C2410_SDRAM_PA + 0x100,
-+      .map_io         = gta02_map_io,
-+      .init_irq       = s3c24xx_init_irq,
-+      .init_machine   = gta02_machine_init,
-+      .timer          = &s3c24xx_timer,
-+MACHINE_END
-diff --git a/drivers/leds/leds-neo1973-vibrator.c b/drivers/leds/leds-neo1973-vibrator.c
-index 0336e36..c943a6a 100644
---- a/drivers/leds/leds-neo1973-vibrator.c
-+++ b/drivers/leds/leds-neo1973-vibrator.c
-@@ -113,7 +113,7 @@ static int __init neo1973_vib_probe(struct platform_device *pdev)
-       struct resource *r;
-       int rc;
--      if (!machine_is_neo1973_gta01())
-+      if (!machine_is_neo1973_gta01() && !machine_is_neo1973_gta02())
-               return -EIO;
-       r = platform_get_resource(pdev, 0, 0);
-diff --git a/include/asm-arm/arch-s3c2410/gta02.h b/include/asm-arm/arch-s3c2410/gta02.h
-new file mode 100644
-index 0000000..fa49d93
---- /dev/null
-+++ b/include/asm-arm/arch-s3c2410/gta02.h
-@@ -0,0 +1,99 @@
-+#ifndef _GTA02_H
-+#define _GTA02_H
-+
-+#include <asm/arch/regs-gpio.h>
-+#include <asm/arch/irqs.h>
-+
-+/* Different hardware revisions, passed in ATAG_REVISION by u-boot */
-+#define GTA02v1_SYSTEM_REV    0x00000310
-+#define GTA02v2_SYSTEM_REV    0x00000320
-+#define GTA02v3_SYSTEM_REV    0x00000330
-+#define GTA02v4_SYSTEM_REV    0x00000340
-+#define GTA02v5_SYSTEM_REV    0x00000350
-+#define GTA02v6_SYSTEM_REV    0x00000360
-+
-+#define GTA02_GPIO_n3DL_GSM   S3C2410_GPA13   /* v1 + v2 + v3 only */
-+
-+#define GTA02_GPIO_PWR_LED1   S3C2410_GPB0
-+#define GTA02_GPIO_PWR_LED2   S3C2410_GPB1
-+#define GTA02_GPIO_AUX_LED    S3C2410_GPB2
-+#define GTA02_GPIO_VIBRATOR_ON        S3C2410_GPB3
-+#define GTA02v1_GPIO_GPS_PWRON        S3C2410_GPB4    /* v1 only */
-+#define GTA02_GPIO_MODEM_RST  S3C2410_GPB5
-+#define GTA02_GPIO_BT_EN      S3C2410_GPB6
-+#define GTA02_GPIO_MODEM_ON   S3C2410_GPB7
-+#define GTA02v1_GPIO_EN_AGPS3V        S3C2410_GPB8    /* v1 only */
-+#define GTA02_GPIO_EXTINT8    S3C2410_GPB8
-+#define GTA02_GPIO_USB_PULLUP S3C2410_GPB9
-+
-+#define GTA02v1_GPIO_nGPS_RST S3C2410_GPC0    /* v1 only */
-+#define GTA02v12_GPIO_PIO3    S3C2410_GPC5    /* v1 + v2 only */
-+#define GTA02_GPIO_PIO5               S3C2410_GPC5    /* v3 + v4 only */
-+#define GTA02_GPIO_LCD_RESET  S3C2410_GPC6    /* v1 + v2 only */
-+#define GTA02v12_GPIO_PIO2    S3C2410_GPC7    /* v1 + v2 only */
-+#define GTA02v2_nUSB_FLT      S3C2410_GPC9    /* v2 only */
-+#define GTA02v2_nUSB_OC               S3C2410_GPC10   /* v2 only */
-+#define GTA02v2_nGSM_OC               S3C2410_GPC12   /* v2 only */
-+
-+#define GTA02v3_GPIO_nG1_CS   S3C2410_GPD12   /* v3 + v4 only */
-+#define GTA02v3_GPIO_nG2_CS   S3C2410_GPD13   /* v3 + v4 only */
-+
-+#define GTA02_GPIO_nG1_INT    S3C2410_GPF0
-+#define GTA02_GPIO_IO1                S3C2410_GPF1
-+#define GTA02v1_GPIO_nG2_INT  S3C2410_GPF2    /* v1 only */
-+#define GTA02_GPIO_PIO_2      S3C2410_GPF2    /* v2 + v3 + v4 only */
-+#define GTA02_GPIO_JACK_INSERT        S3C2410_GPF4
-+#define GTA02v1_GPIO_nSD_DETECT       S3C2410_GPF5    /* v1 only */
-+#define GTA02_GPIO_WLAN_GPIO1 S3C2410_GPF5    /* v2 + v3 + v4 only */
-+#define GTA02_GPIO_AUX_KEY    S3C2410_GPF6
-+#define GTA02_GPIO_HOLD_KEY   S3C2410_GPF7
-+
-+#define GTA02_GPIO_3D_IRQ     S3C2410_GPG4
-+#define GTA02v1_GPIO_nG1_CS   S3C2410_GPG8    /* v1 only */
-+#define GTA02v2_GPIO_nG2_INT  S3C2410_GPG8    /* v2 + v3 + v4 only */
-+#define GTA02v3_GPIO_nUSB_OC  S3C2410_GPG9    /* v3 + v4 only */
-+#define GTA02v3_GPIO_nUSB_FLT S3C2410_GPG10   /* v3 + v4 only */
-+#define GTA02v1_GPIO_nG2_CS   S3C2410_GPG11   /* v1 only */
-+#define GTA02v3_GPIO_nGSM_OC  S3C2410_GPG11   /* v3 + v4 only */
-+
-+#define GTA02v1_GPIO_3D_RESET S3C2440_GPJ0    /* v1 only */
-+#define GTA02v2_GPIO_BAT_ID   S3C2440_GPJ0    /* v2 only */
-+#define GTA02v1_GPIO_WLAN_GPIO8       S3C2440_GPJ1    /* v1 only */
-+#define GTA02_GPIO_AMP_SHUT   S3C2440_GPJ1    /* v2 + v3 + v4 only */
-+#define GTA02v1_GPIO_WLAN_GPIO10      S3C2440_GPJ2
-+#define GTA02_GPIO_HP_IN      S3C2440_GPJ2    /* v2 + v3 + v4 only */
-+#define GTA02v1_GPIO_KEEPACT  S3C2440_GPJ3    /* v1 only */
-+#define GTA02_GPIO_INT0               S3C2440_GPJ3    /* v2 + v3 + v4 only */
-+#define GTA02_GPIO_nGSM_EN    S3C2440_GPJ4
-+#define GTA02_GPIO_3D_RESET   S3C2440_GPJ5
-+#define GTA02_GPIO_nDL_GSM    S3C2440_GPJ6    /* v4 + v5 only */
-+#define GTA02_GPIO_WLAN_GPIO0 S3C2440_GPJ7
-+#define GTA02v1_GPIO_BAT_ID   S3C2440_GPJ8
-+#define GTA02_GPIO_KEEPACT    S3C2440_GPJ8
-+#define GTA02v1_GPIO_AMP_SHUT S3C2440_GPJ9    /* v1 only */
-+#define GTA02v2_nG1_CS                S3C2440_GPJ9    /* v2 only */
-+#define GTA02v1_GPIO_HP_IN    S3C2440_GPJ10
-+#define GTA02v2_nG2_CS                S3C2440_GPJ10   /* v2 only */
-+#define GTA02v1_GPIO_INT0     S3C2440_GPJ11   /* v1 only */
-+#define GTA02_CHIP_PWD                S3C2440_GPJ11   /* v2 + v3 + v4 only */
-+#define GTA02v1_GPIO_nGSM_EN  S3C2440_GPJ12   /* v1 only */
-+#define GTA02_GPIO_nWLAN_RESET        S3C2440_GPJ12   /* v2 + v3 + v4 only */
-+
-+#define GTA02_IRQ_GSENSOR_1   IRQ_EINT0
-+#define GTA02_IRQ_MODEM               IRQ_EINT1
-+#define GTA02v1_IRQ_GSENSOR_2 IRQ_EINT2       /* v1 only */
-+#define GTA02_IRQ_PIO_2               IRQ_EINT2       /* v2 + v3 + v4 only */
-+#define GTA02_IRQ_nJACK_INSERT        IRQ_EINT4
-+#define GTA02v1_IRQ_nSD_CD    IRQ_EINT5       /* v1 only */
-+#define GTA02_IRQ_WLAN_GPIO1  IRQ_EINT5
-+#define GTA02_IRQ_AUX         IRQ_EINT6
-+#define GTA02_IRQ_nHOLD               IRQ_EINT7
-+#define GTA02v1_IRQ_nSIM_CD   IRQ_EINT8       /* v1 only */
-+#define GTA02_IRQ_PCF50633    IRQ_EINT9
-+#define GTA02_IRQ_3D          IRQ_EINT12
-+#define GTA02_IRQ_GSENSOR_2   IRQ_EINT16      /* v2 + v3 + v4 only */
-+#define GTA02v3_IRQ_nUSB_OC   IRQ_EINT17      /* v3 + v4 only */
-+#define GTA02v3_IRQ_nUSB_FLT  IRQ_EINT18      /* v3 + v4 only */
-+#define GTA02v3_IRQ_nGSM_OC   IRQ_EINT19      /* v3 + v4 only */
-+
-+#endif /* _GTA02_H */
-diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c
-index 0289d1d..65a4060 100644
---- a/sound/soc/s3c24xx/neo1973_wm8753.c
-+++ b/sound/soc/s3c24xx/neo1973_wm8753.c
-@@ -672,6 +672,12 @@ static int __init neo1973_init(void)
- {
-       int ret;
-+      if (!machine_is_neo1973_gta01()) {
-+              printk(KERN_INFO
-+                     "Only GTA01 hardware supported by ASoc driver\n");
-+              return -ENODEV;
-+      }
-+
-       neo1973_snd_device = platform_device_alloc("soc-audio", -1);
-       if (!neo1973_snd_device)
-               return -ENOMEM;
-@@ -700,5 +706,5 @@ module_exit(neo1973_exit);
- /* Module information */
- MODULE_AUTHOR("Graeme Gregory, graeme.gregory@wolfsonmicro.com, www.wolfsonmicro.com");
--MODULE_DESCRIPTION("ALSA SoC WM8753 Neo1973");
-+MODULE_DESCRIPTION("ALSA SoC WM8753 Neo1973 GTA01");
- MODULE_LICENSE("GPL");
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1036-gta02-power_control.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1036-gta02-power_control.patch.patch
deleted file mode 100644 (file)
index b59cb64..0000000
+++ /dev/null
@@ -1,586 +0,0 @@
-From a9206f415e86249bfecccd8b6dd86ab9ee362e07 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:35:24 +0100
-Subject: [PATCH] gta02-power_control.patch
-
----
- arch/arm/plat-s3c24xx/neo1973_pm_bt.c  |   84 +++++++++---
- arch/arm/plat-s3c24xx/neo1973_pm_gps.c |  217 ++++++++++++++++++++++++--------
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |   97 ++++++++++++--
- 3 files changed, 309 insertions(+), 89 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-index b1af441..d685ef7 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-@@ -19,7 +19,9 @@
- #include <linux/pcf50606.h>
- #include <asm/hardware.h>
-+#include <asm/mach-types.h>
- #include <asm/arch/gta01.h>
-+#include <asm/arch/gta02.h>
- #define DRVMSG "FIC Neo1973 Bluetooth Power Management"
-@@ -27,14 +29,30 @@ static ssize_t bt_read(struct device *dev, struct device_attribute *attr,
-                      char *buf)
- {
-       if (!strcmp(attr->attr.name, "power_on")) {
--              if (pcf50606_onoff_get(pcf50606_global,
--                                      PCF50606_REGULATOR_D1REG) &&
--                  pcf50606_voltage_get(pcf50606_global,
--                                       PCF50606_REGULATOR_D1REG) == 3100)
--                      goto out_1;
-+              switch (machine_arch_type) {
-+              case MACH_TYPE_NEO1973_GTA01:
-+                      if (pcf50606_onoff_get(pcf50606_global,
-+                                              PCF50606_REGULATOR_D1REG) &&
-+                          pcf50606_voltage_get(pcf50606_global,
-+                                               PCF50606_REGULATOR_D1REG) == 3100)
-+                              goto out_1;
-+                      break;
-+              case MACH_TYPE_NEO1973_GTA02:
-+                      if (s3c2410_gpio_getpin(GTA02_GPIO_BT_EN))
-+                              goto out_1;
-+                      break;
-+              }
-       } else if (!strcmp(attr->attr.name, "reset")) {
--              if (s3c2410_gpio_getpin(GTA01_GPIO_BT_EN) == 0)
--                      goto out_1;
-+              switch (machine_arch_type) {
-+              case MACH_TYPE_NEO1973_GTA01:
-+                      if (s3c2410_gpio_getpin(GTA01_GPIO_BT_EN) == 0)
-+                              goto out_1;
-+                      break;
-+              case MACH_TYPE_NEO1973_GTA02:
-+                      if (s3c2410_gpio_getpin(GTA02_GPIO_BT_EN) == 0)
-+                              goto out_1;
-+                      break;
-+              }
-       }
-       return strlcpy(buf, "0\n", 3);
-@@ -48,20 +66,37 @@ static ssize_t bt_write(struct device *dev, struct device_attribute *attr,
-       unsigned long on = simple_strtoul(buf, NULL, 10);
-       if (!strcmp(attr->attr.name, "power_on")) {
--              /* if we are powering up, assert reset, then power, then
--               * release reset */
--              if (on) {
--                      s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
--                      pcf50606_voltage_set(pcf50606_global,
--                                           PCF50606_REGULATOR_D1REG,
--                                           3100);
-+              switch (machine_arch_type) {
-+              case MACH_TYPE_NEO1973_GTA01:
-+                      /* if we are powering up, assert reset, then power,
-+                       * then release reset */
-+                      if (on) {
-+                              s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
-+                              pcf50606_voltage_set(pcf50606_global,
-+                                                   PCF50606_REGULATOR_D1REG,
-+                                                   3100);
-+                      }
-+                      pcf50606_onoff_set(pcf50606_global,
-+                                         PCF50606_REGULATOR_D1REG, on);
-+                      s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on);
-+                      break;
-+              case MACH_TYPE_NEO1973_GTA02:
-+                      if (on)
-+                              s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, 0);
-+                      else
-+                              s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, 1);
-+                      break;
-               }
--              pcf50606_onoff_set(pcf50606_global,
--                                 PCF50606_REGULATOR_D1REG, on);
--              s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on);
-       } else if (!strcmp(attr->attr.name, "reset")) {
-               /* reset is low-active, so we need to invert */
--              s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1);
-+              switch (machine_arch_type) {
-+              case MACH_TYPE_NEO1973_GTA01:
-+                      s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1);
-+                      break;
-+              case MACH_TYPE_NEO1973_GTA02:
-+                      s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, on ? 0 : 1);
-+                      break;
-+              }
-       }
-       return count;
-@@ -107,9 +142,16 @@ static int __init gta01_bt_probe(struct platform_device *pdev)
- {
-       dev_info(&pdev->dev, DRVMSG ": starting\n");
--      /* we make sure that the voltage is off */
--      pcf50606_onoff_set(pcf50606_global,
--                         PCF50606_REGULATOR_D1REG, 0);
-+      switch (machine_arch_type) {
-+      case MACH_TYPE_NEO1973_GTA01:
-+              /* we make sure that the voltage is off */
-+              pcf50606_onoff_set(pcf50606_global,
-+                                 PCF50606_REGULATOR_D1REG, 0);
-+              break;
-+      case MACH_TYPE_NEO1973_GTA02:
-+              /* FIXME: implementation */
-+              break;
-+      }
-       /* we pull reset to low to make sure that the chip doesn't
-        * drain power through the reset line */
-       s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-index f8cf719..6bd8054 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-@@ -17,10 +17,18 @@
- #include <linux/delay.h>
- #include <linux/platform_device.h>
--#include <linux/pcf50606.h>
--
- #include <asm/hardware.h>
-+
-+#include <asm/mach-types.h>
-+#ifdef CONFIG_MACH_NEO1973_GTA01
- #include <asm/arch/gta01.h>
-+#include <linux/pcf50606.h>
-+#endif
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+#include <asm/arch/gta02.h>
-+#include <linux/pcf50633.h>
-+#endif
- /* This is the 2.8V supply for the RTC crystal, the mail clock crystal and
-  * the input to VDD_RF */
-@@ -248,15 +256,42 @@ static int gps_power_1v5_get(void)
- /* This is the POWERON pin */
- static void gps_pwron_set(int on)
- {
--      s3c2410_gpio_setpin(GTA01_GPIO_GPS_PWRON, on);
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+      if (machine_is_neo1973_gta01())
-+              s3c2410_gpio_setpin(GTA01_GPIO_GPS_PWRON, on);
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+      if (machine_is_neo1973_gta02()) {
-+              if (on)
-+                      pcf50633_voltage_set(pcf50633_global,
-+                              PCF50633_REGULATOR_LDO5, 3000);
-+                      pcf50633_onoff_set(pcf50633_global,
-+                              PCF50633_REGULATOR_LDO5, on);
-+      }
-+#endif /* CONFIG_MACH_NEO1973_GTA02 */
- }
- static int gps_pwron_get(void)
- {
--      if (s3c2410_gpio_getpin(GTA01_GPIO_GPS_PWRON))
--              return 1;
--      else
--              return 0;
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+      if (machine_is_neo1973_gta01()) {
-+              if (s3c2410_gpio_getpin(GTA01_GPIO_GPS_PWRON))
-+                      return 1;
-+              else
-+                      return 0;
-+      }
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+      if (machine_is_neo1973_gta02()) {
-+              if (pcf50633_onoff_get(pcf50633_global, PCF50633_REGULATOR_LDO5))
-+                      return 1;
-+              else
-+                      return 0;
-+      }
-+#endif /* CONFIG_MACH_NEO1973_GTA02 */
-+      return -1;
- }
- /* This is the nRESET pin */
-@@ -441,17 +476,40 @@ static DEVICE_ATTR(power_sequence, 0644, power_sequence_read,
- static int gta01_pm_gps_suspend(struct platform_device *pdev,
-                               pm_message_t state)
- {
--      /* FIXME */
--      gps_power_sequence_down();
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+      if (machine_is_neo1973_gta01()) {
-+              /* FIXME */
-+              gps_power_sequence_down();
-+      }
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+      if (machine_is_neo1973_gta02()) {
-+              /* FIXME */
-+              pcf50633_onoff_set(pcf50633_global,
-+                      PCF50633_REGULATOR_LDO5, 0);
-+      }
-+#endif /* CONFIG_MACH_NEO1973_GTA02 */
-       return 0;
- }
- static int gta01_pm_gps_resume(struct platform_device *pdev)
- {
--      /* FIXME */
--      gps_power_sequence_up();
--
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+      if (machine_is_neo1973_gta01()) {
-+              /* FIXME */
-+              gps_power_sequence_up();
-+      }
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+      if (machine_is_neo1973_gta02()) {
-+              /* FIXME */
-+              pcf50633_onoff_set(pcf50633_global,
-+                      PCF50633_REGULATOR_LDO5, 1);
-+#endif /* CONFIG_MACH_NEO1973_GTA02 */
-+      }
-       return 0;
- }
- #else
-@@ -476,59 +534,110 @@ static struct attribute_group gta01_gps_attr_group = {
-       .attrs  = gta01_gps_sysfs_entries,
- };
-+static struct attribute *gta02_gps_sysfs_entries[] = {
-+      &dev_attr_pwron.attr,
-+      NULL
-+};
-+
-+static struct attribute_group gta02_gps_attr_group = {
-+      .name   = NULL,
-+      .attrs  = gta02_gps_sysfs_entries,
-+};
-+
- static int __init gta01_pm_gps_probe(struct platform_device *pdev)
- {
--      s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_PWRON, S3C2410_GPIO_OUTPUT);
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+      if (machine_is_neo1973_gta01()) {
-+              s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_PWRON, S3C2410_GPIO_OUTPUT);
--      switch (system_rev) {
--      case GTA01v3_SYSTEM_REV:
--              break;
--      case GTA01v4_SYSTEM_REV:
--              s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_RESET, S3C2410_GPIO_OUTPUT);
--              break;
--      case GTA01Bv3_SYSTEM_REV:
--      case GTA01Bv4_SYSTEM_REV:
--              s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_EN_3V3, S3C2410_GPIO_OUTPUT);
--              /* fallthrough */
--      case GTA01Bv2_SYSTEM_REV:
--              s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_EN_2V8, S3C2410_GPIO_OUTPUT);
--              s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_EN_3V, S3C2410_GPIO_OUTPUT);
--              s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_RESET, S3C2410_GPIO_OUTPUT);
--              break;
--      default:
--              dev_warn(&pdev->dev, "Unknown GTA01 Revision 0x%x, "
--                       "AGPS PM features not available!!!\n",
--                       system_rev);
--              return -1;
--              break;
--      }
-+              switch (system_rev) {
-+              case GTA01v3_SYSTEM_REV:
-+                      break;
-+              case GTA01v4_SYSTEM_REV:
-+                      s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_RESET, S3C2410_GPIO_OUTPUT);
-+                      break;
-+              case GTA01Bv3_SYSTEM_REV:
-+              case GTA01Bv4_SYSTEM_REV:
-+                      s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_EN_3V3, S3C2410_GPIO_OUTPUT);
-+                      /* fallthrough */
-+              case GTA01Bv2_SYSTEM_REV:
-+                      s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_EN_2V8, S3C2410_GPIO_OUTPUT);
-+                      s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_EN_3V, S3C2410_GPIO_OUTPUT);
-+                      s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_RESET, S3C2410_GPIO_OUTPUT);
-+                      break;
-+              default:
-+                      dev_warn(&pdev->dev, "Unknown GTA01 Revision 0x%x, "
-+                              "AGPS PM features not available!!!\n",
-+                              system_rev);
-+                      return -1;
-+                      break;
-+              }
--      gps_power_sequence_down();
-+              gps_power_sequence_down();
--      switch (system_rev) {
--      case GTA01v3_SYSTEM_REV:
--      case GTA01v4_SYSTEM_REV:
--      case GTA01Bv2_SYSTEM_REV:
--              gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-3] =
--                                      &dev_attr_power_tcxo_2v8.attr;
--              break;
--      case GTA01Bv3_SYSTEM_REV:
--      case GTA01Bv4_SYSTEM_REV:
--              gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-3] =
--                                      &dev_attr_power_core_1v5.attr;
--              gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-2] =
--                                      &dev_attr_power_vdd_core_1v5.attr;
--              break;
--      }
-+              switch (system_rev) {
-+              case GTA01v3_SYSTEM_REV:
-+              case GTA01v4_SYSTEM_REV:
-+              case GTA01Bv2_SYSTEM_REV:
-+                      gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-3] =
-+                                              &dev_attr_power_tcxo_2v8.attr;
-+                      break;
-+              case GTA01Bv3_SYSTEM_REV:
-+              case GTA01Bv4_SYSTEM_REV:
-+                      gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-3] =
-+                                              &dev_attr_power_core_1v5.attr;
-+                      gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-2] =
-+                                              &dev_attr_power_vdd_core_1v5.attr;
-+                      break;
-+              }
--      return sysfs_create_group(&pdev->dev.kobj, &gta01_gps_attr_group);
-+              return sysfs_create_group(&pdev->dev.kobj, &gta01_gps_attr_group);
-+      }
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+      if (machine_is_neo1973_gta02()) {
-+              switch (system_rev) {
-+              case GTA02v2_SYSTEM_REV:
-+              case GTA02v3_SYSTEM_REV:
-+              case GTA02v4_SYSTEM_REV:
-+              case GTA02v5_SYSTEM_REV:
-+              case GTA02v6_SYSTEM_REV:
-+                      pcf50633_voltage_set(pcf50633_global,
-+                              PCF50633_REGULATOR_LDO5, 3000);
-+                      pcf50633_onoff_set(pcf50633_global,
-+                              PCF50633_REGULATOR_LDO5, 0);
-+                      dev_info(&pdev->dev, "FIC Neo1973 GPS Power Managerment:"
-+                               "starting\n");
-+                      break;
-+              default:
-+                      dev_warn(&pdev->dev, "Unknown GTA02 Revision 0x%x, "
-+                              "AGPS PM features not available!!!\n",
-+                              system_rev);
-+                      return -1;
-+                      break;
-+              }
-+              return sysfs_create_group(&pdev->dev.kobj, &gta02_gps_attr_group);
-+      }
-+#endif /* CONFIG_MACH_NEO1973_GTA02 */
-+      return -1;
- }
- static int gta01_pm_gps_remove(struct platform_device *pdev)
- {
--      gps_power_sequence_down();
--      sysfs_remove_group(&pdev->dev.kobj, &gta01_gps_attr_group);
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+      if (machine_is_neo1973_gta01()) {
-+              gps_power_sequence_down();
-+              sysfs_remove_group(&pdev->dev.kobj, &gta01_gps_attr_group);
-+      }
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+      if (machine_is_neo1973_gta02()) {
-+              pcf50633_onoff_set(pcf50633_global, PCF50633_REGULATOR_LDO5, 0);
-+              sysfs_remove_group(&pdev->dev.kobj, &gta02_gps_attr_group);
-+      }
-+#endif /* CONFIG_MACH_NEO1973_GTA02 */
-       return 0;
- }
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index a1615f8..13cb45b 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -19,8 +19,15 @@
- #include <linux/errno.h>
- #include <asm/hardware.h>
-+#include <asm/mach-types.h>
- #include <asm/arch/gta01.h>
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+#include <asm/arch/gta02.h>
-+#include <linux/pcf50633.h>
-+#include <asm/arch/regs-gpioj.h>
-+#endif
-+
- struct gta01pm_priv {
-       int gpio_ngsm_en;
-       struct console *con;
-@@ -54,8 +61,16 @@ static ssize_t gsm_read(struct device *dev, struct device_attribute *attr,
-               if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_RST))
-                       goto out_1;
-       } else if (!strcmp(attr->attr.name, "download")) {
--              if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_DNLOAD))
--                      goto out_1;
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+              if (machine_is_neo1973_gta01())
-+                      if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_DNLOAD))
-+                              goto out_1;
-+#endif
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+              if (machine_is_neo1973_gta02())
-+                      if (s3c2410_gpio_getpin(GTA02_GPIO_nDL_GSM))
-+                              goto out_1;
-+#endif
-       }
-       return strlcpy(buf, "0\n", 3);
-@@ -70,32 +85,67 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-       if (!strcmp(attr->attr.name, "power_on")) {
-               if (on) {
--                      dev_info(dev, "powering up GSM, thus disconnecting "
--                               "serial console\n");
-+                      if (gta01_gsm.con) {
-+                              dev_info(dev, "powering up GSM, thus "
-+                                       "disconnecting serial console\n");
--                      if (gta01_gsm.con)
-                               console_stop(gta01_gsm.con);
-+                      }
-                       if (gta01_gsm.gpio_ngsm_en)
-                               s3c2410_gpio_setpin(gta01_gsm.gpio_ngsm_en, 0);
-+                      switch (system_rev) {
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+                      case GTA02v2_SYSTEM_REV:
-+                      case GTA02v3_SYSTEM_REV:
-+                      case GTA02v4_SYSTEM_REV:
-+                      case GTA02v5_SYSTEM_REV:
-+                      case GTA02v6_SYSTEM_REV:
-+                              pcf50633_gpio_set(pcf50633_global,
-+                                                PCF50633_GPIO2, 1);
-+                              break;
-+#endif
-+                      }
-+
-                       s3c2410_gpio_setpin(GTA01_GPIO_MODEM_ON, 1);
-               } else {
-                       s3c2410_gpio_setpin(GTA01_GPIO_MODEM_ON, 0);
-+                      switch (system_rev) {
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+                      case GTA02v2_SYSTEM_REV:
-+                      case GTA02v3_SYSTEM_REV:
-+                      case GTA02v4_SYSTEM_REV:
-+                      case GTA02v5_SYSTEM_REV:
-+                      case GTA02v6_SYSTEM_REV:
-+                              pcf50633_gpio_set(pcf50633_global,
-+                                                PCF50633_GPIO2, 0);
-+                              break;
-+#endif
-+                      }
-+
-                       if (gta01_gsm.gpio_ngsm_en)
-                               s3c2410_gpio_setpin(gta01_gsm.gpio_ngsm_en, 1);
--                      if (gta01_gsm.con)
-+                      if (gta01_gsm.con) {
-                               console_start(gta01_gsm.con);
--                      dev_info(dev, "powered down GSM, thus enabling "
--                               "serial console\n");
-+                              dev_info(dev, "powered down GSM, thus enabling "
-+                                       "serial console\n");
-+                      }
-               }
-       } else if (!strcmp(attr->attr.name, "reset")) {
-               s3c2410_gpio_setpin(GTA01_GPIO_MODEM_RST, on);
-       } else if (!strcmp(attr->attr.name, "download")) {
--              s3c2410_gpio_setpin(GTA01_GPIO_MODEM_DNLOAD, on);
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+              if (machine_is_neo1973_gta01())
-+                      s3c2410_gpio_setpin(GTA01_GPIO_MODEM_DNLOAD, on);
-+#endif
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+              if (machine_is_neo1973_gta02())
-+                      s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, on);
-+#endif
-       }
-       return count;
-@@ -111,6 +161,9 @@ static int gta01_gsm_suspend(struct platform_device *pdev, pm_message_t state)
-       /* GPIO state is saved/restored by S3C2410 core GPIO driver, so we
-        * don't need to do anything here */
-+      /* disable DL GSM to prevent jack_insert becoming flaoting */
-+      if (machine_is_neo1973_gta02())
-+              s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, 1);
-       return 0;
- }
-@@ -124,6 +177,8 @@ static int gta01_gsm_resume(struct platform_device *pdev)
-       if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_ON) && gta01_gsm.con)
-               console_stop(gta01_gsm.con);
-+      if (machine_is_neo1973_gta02())
-+              s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, 0);
-       return 0;
- }
- #else
-@@ -134,7 +189,7 @@ static int gta01_gsm_resume(struct platform_device *pdev)
- static struct attribute *gta01_gsm_sysfs_entries[] = {
-       &dev_attr_power_on.attr,
-       &dev_attr_reset.attr,
--      NULL,
-+      &dev_attr_download.attr,
-       NULL
- };
-@@ -158,8 +213,18 @@ static int __init gta01_gsm_probe(struct platform_device *pdev)
-               gta01_gsm.gpio_ngsm_en = GTA01Bv2_GPIO_nGSM_EN;
-               s3c2410_gpio_setpin(GTA01v3_GPIO_nGSM_EN, 0);
-               break;
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+      case GTA02v1_SYSTEM_REV:
-+      case GTA02v2_SYSTEM_REV:
-+      case GTA02v3_SYSTEM_REV:
-+      case GTA02v4_SYSTEM_REV:
-+      case GTA02v5_SYSTEM_REV:
-+      case GTA02v6_SYSTEM_REV:
-+              gta01_gsm.gpio_ngsm_en = 0;
-+              break;
-+#endif
-       default:
--              dev_warn(&pdev->dev, "Unknown GTA01 Revision 0x%x, "
-+              dev_warn(&pdev->dev, "Unknown Neo1973 Revision 0x%x, "
-                        "some PM features not available!!!\n",
-                        system_rev);
-               break;
-@@ -175,9 +240,13 @@ static int __init gta01_gsm_probe(struct platform_device *pdev)
-               break;
-       }
--      gta01_gsm.con = find_s3c24xx_console();
--      if (!gta01_gsm.con)
--              dev_warn(&pdev->dev, "cannot find S3C24xx console driver\n");
-+      if (machine_is_neo1973_gta01()) {
-+              gta01_gsm.con = find_s3c24xx_console();
-+              if (!gta01_gsm.con)
-+                      dev_warn(&pdev->dev,
-+                               "cannot find S3C24xx console driver\n");
-+      } else
-+              gta01_gsm.con = NULL;
-       return sysfs_create_group(&pdev->dev.kobj, &gta01_gsm_attr_group);
- }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1037-gta02-sound.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1037-gta02-sound.patch.patch
deleted file mode 100644 (file)
index b1721e7..0000000
+++ /dev/null
@@ -1,772 +0,0 @@
-From c7b72aecf04a0a51e04f7d9346757c7068e0a74d Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:35:32 +0100
-Subject: [PATCH] gta02-sound.patch
-
----
- include/sound/soc-dapm.h                 |    2 +
- sound/soc/s3c24xx/Kconfig                |    9 +
- sound/soc/s3c24xx/Makefile               |    3 +
- sound/soc/s3c24xx/neo1973_gta02_wm8753.c |  667 ++++++++++++++++++++++++++++++
- sound/soc/soc-dapm.c                     |   24 ++
- 5 files changed, 705 insertions(+), 0 deletions(-)
- create mode 100644 sound/soc/s3c24xx/neo1973_gta02_wm8753.c
-
-diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
-index 2b1ae8e..204be0b 100644
---- a/include/sound/soc-dapm.h
-+++ b/include/sound/soc-dapm.h
-@@ -206,6 +206,8 @@ int snd_soc_dapm_sys_add(struct device *dev);
- /* dapm audio endpoint control */
- int snd_soc_dapm_set_endpoint(struct snd_soc_codec *codec,
-       char *pin, int status);
-+int snd_soc_dapm_get_endpoint(struct snd_soc_codec *codec,
-+      char *pin);
- int snd_soc_dapm_sync_endpoints(struct snd_soc_codec *codec);
- /* dapm widget types */
-diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig
-index 5632a2e..4146ac4 100644
---- a/sound/soc/s3c24xx/Kconfig
-+++ b/sound/soc/s3c24xx/Kconfig
-@@ -25,6 +25,15 @@ config SND_S3C24XX_SOC_NEO1973_WM8753
-         Say Y if you want to add support for SoC audio on smdk2440
-         with the WM8753.
-+config SND_S3C24XX_SOC_NEO1973_GTA02_WM8753
-+      tristate "SoC I2S Audio support for NEO1973 GTA02 - WM8753"
-+      depends on SND_S3C24XX_SOC && MACH_NEO1973_GTA02
-+      select SND_S3C24XX_SOC_I2S
-+      select SND_SOC_WM8753
-+      help
-+        Say Y if you want to add support for SoC audio on neo1973 gta02
-+        with the WM8753 codec
-+
- config SND_S3C24XX_SOC_SMDK2443_WM9710
-       tristate "SoC AC97 Audio support for SMDK2443 - WM9710"
-       depends on SND_S3C24XX_SOC && MACH_SMDK2443
-diff --git a/sound/soc/s3c24xx/Makefile b/sound/soc/s3c24xx/Makefile
-index 13c92f0..e356071 100644
---- a/sound/soc/s3c24xx/Makefile
-+++ b/sound/soc/s3c24xx/Makefile
-@@ -10,6 +10,9 @@ obj-$(CONFIG_SND_S3C2443_SOC_AC97) += snd-soc-s3c2443-ac97.o
- # S3C24XX Machine Support
- snd-soc-neo1973-wm8753-objs := neo1973_wm8753.o
- snd-soc-smdk2443-wm9710-objs := smdk2443_wm9710.o
-+snd-soc-neo1973-gta02-wm8753-objs := neo1973_gta02_wm8753.o
- obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o
- obj-$(CONFIG_SND_S3C24XX_SOC_SMDK2443_WM9710) += snd-soc-smdk2443-wm9710.o
-+obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753) += snd-soc-neo1973-gta02-wm8753.o
-+
-diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
-new file mode 100644
-index 0000000..f32cba3
---- /dev/null
-+++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
-@@ -0,0 +1,667 @@
-+/*
-+ * neo1973_gta02_wm8753.c  --  SoC audio for Neo1973
-+ *
-+ * Copyright 2007 OpenMoko Inc
-+ * Author: Graeme Gregory <graeme@openmoko.org>
-+ * Copyright 2007 Wolfson Microelectronics PLC.
-+ * Author: Graeme Gregory <linux@wolfsonmicro.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.
-+ *
-+ *  Revision history
-+ *    06th Nov 2007   Changed from GTA01 to GTA02
-+ *    20th Jan 2007   Initial version.
-+ *    05th Feb 2007   Rename all to Neo1973
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/timer.h>
-+#include <linux/interrupt.h>
-+#include <linux/platform_device.h>
-+#include <linux/i2c.h>
-+#include <sound/driver.h>
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/soc.h>
-+#include <sound/soc-dapm.h>
-+
-+#include <asm/mach-types.h>
-+#include <asm/hardware/scoop.h>
-+#include <asm/plat-s3c24xx/regs-iis.h>
-+#include <asm/arch/regs-clock.h>
-+#include <asm/arch/regs-gpio.h>
-+#include <asm/hardware.h>
-+#include <asm/arch/audio.h>
-+#include <asm/io.h>
-+#include <asm/arch/spi-gpio.h>
-+#include <asm/arch/regs-gpioj.h>
-+#include <asm/arch/gta02.h>
-+#include "../codecs/wm8753.h"
-+#include "s3c24xx-pcm.h"
-+#include "s3c24xx-i2s.h"
-+
-+/* define the scenarios */
-+#define NEO_AUDIO_OFF                 0
-+#define NEO_GSM_CALL_AUDIO_HANDSET    1
-+#define NEO_GSM_CALL_AUDIO_HEADSET    2
-+#define NEO_GSM_CALL_AUDIO_BLUETOOTH  3
-+#define NEO_STEREO_TO_SPEAKERS                4
-+#define NEO_STEREO_TO_HEADPHONES      5
-+#define NEO_CAPTURE_HANDSET           6
-+#define NEO_CAPTURE_HEADSET           7
-+#define NEO_CAPTURE_BLUETOOTH         8
-+#define NEO_STEREO_TO_HANDSET_SPK     9
-+
-+static struct snd_soc_machine neo1973_gta02;
-+
-+static int neo1973_gta02_hifi_hw_params(struct snd_pcm_substream *substream,
-+      struct snd_pcm_hw_params *params)
-+{
-+      struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+      struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai;
-+      struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai;
-+      unsigned int pll_out = 0, bclk = 0;
-+      int ret = 0;
-+      unsigned long iis_clkrate;
-+
-+      iis_clkrate = s3c24xx_i2s_get_clockrate();
-+
-+      switch (params_rate(params)) {
-+      case 8000:
-+      case 16000:
-+              pll_out = 12288000;
-+              break;
-+      case 48000:
-+              bclk = WM8753_BCLK_DIV_4;
-+              pll_out = 12288000;
-+              break;
-+      case 96000:
-+              bclk = WM8753_BCLK_DIV_2;
-+              pll_out = 12288000;
-+              break;
-+      case 11025:
-+              bclk = WM8753_BCLK_DIV_16;
-+              pll_out = 11289600;
-+              break;
-+      case 22050:
-+              bclk = WM8753_BCLK_DIV_8;
-+              pll_out = 11289600;
-+              break;
-+      case 44100:
-+              bclk = WM8753_BCLK_DIV_4;
-+              pll_out = 11289600;
-+              break;
-+      case 88200:
-+              bclk = WM8753_BCLK_DIV_2;
-+              pll_out = 11289600;
-+              break;
-+      }
-+
-+      /* set codec DAI configuration */
-+      ret = codec_dai->dai_ops.set_fmt(codec_dai,
-+              SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-+              SND_SOC_DAIFMT_CBM_CFM);
-+      if (ret < 0)
-+              return ret;
-+
-+      /* set cpu DAI configuration */
-+      ret = cpu_dai->dai_ops.set_fmt(cpu_dai,
-+              SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-+              SND_SOC_DAIFMT_CBM_CFM);
-+      if (ret < 0)
-+              return ret;
-+
-+      /* set the codec system clock for DAC and ADC */
-+      ret = codec_dai->dai_ops.set_sysclk(codec_dai, WM8753_MCLK, pll_out,
-+              SND_SOC_CLOCK_IN);
-+      if (ret < 0)
-+              return ret;
-+
-+      /* set MCLK division for sample rate */
-+      ret = cpu_dai->dai_ops.set_clkdiv(cpu_dai, S3C24XX_DIV_MCLK,
-+              S3C2410_IISMOD_32FS );
-+      if (ret < 0)
-+              return ret;
-+
-+      /* set codec BCLK division for sample rate */
-+      ret = codec_dai->dai_ops.set_clkdiv(codec_dai,
-+                                      WM8753_BCLKDIV, bclk);
-+      if (ret < 0)
-+              return ret;
-+
-+      /* set prescaler division for sample rate */
-+      ret = cpu_dai->dai_ops.set_clkdiv(cpu_dai, S3C24XX_DIV_PRESCALER,
-+              S3C24XX_PRESCALE(4,4));
-+      if (ret < 0)
-+              return ret;
-+
-+      /* codec PLL input is PCLK/4 */
-+      ret = codec_dai->dai_ops.set_pll(codec_dai, WM8753_PLL1,
-+              iis_clkrate / 4, pll_out);
-+      if (ret < 0)
-+              return ret;
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_hifi_hw_free(struct snd_pcm_substream *substream)
-+{
-+      struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+      struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai;
-+
-+      /* disable the PLL */
-+      return codec_dai->dai_ops.set_pll(codec_dai, WM8753_PLL1, 0, 0);
-+}
-+
-+/*
-+ * Neo1973 WM8753 HiFi DAI opserations.
-+ */
-+static struct snd_soc_ops neo1973_gta02_hifi_ops = {
-+      .hw_params = neo1973_gta02_hifi_hw_params,
-+      .hw_free = neo1973_gta02_hifi_hw_free,
-+};
-+
-+static int neo1973_gta02_voice_hw_params(
-+      struct snd_pcm_substream *substream,
-+      struct snd_pcm_hw_params *params)
-+{
-+      struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+      struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai;
-+      unsigned int pcmdiv = 0;
-+      int ret = 0;
-+      unsigned long iis_clkrate;
-+
-+      iis_clkrate = s3c24xx_i2s_get_clockrate();
-+
-+      if (params_rate(params) != 8000)
-+              return -EINVAL;
-+      if (params_channels(params) != 1)
-+              return -EINVAL;
-+
-+      pcmdiv = WM8753_PCM_DIV_6; /* 2.048 MHz */
-+
-+      /* todo: gg check mode (DSP_B) against CSR datasheet */
-+      /* set codec DAI configuration */
-+      ret = codec_dai->dai_ops.set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_B |
-+              SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);
-+      if (ret < 0)
-+              return ret;
-+
-+      /* set the codec system clock for DAC and ADC */
-+      ret = codec_dai->dai_ops.set_sysclk(codec_dai, WM8753_PCMCLK,
-+              12288000, SND_SOC_CLOCK_IN);
-+      if (ret < 0)
-+              return ret;
-+
-+      /* set codec PCM division for sample rate */
-+      ret = codec_dai->dai_ops.set_clkdiv(codec_dai, WM8753_PCMDIV,
-+                                      pcmdiv);
-+      if (ret < 0)
-+              return ret;
-+
-+      /* configue and enable PLL for 12.288MHz output */
-+      ret = codec_dai->dai_ops.set_pll(codec_dai, WM8753_PLL2,
-+              iis_clkrate / 4, 12288000);
-+      if (ret < 0)
-+              return ret;
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_voice_hw_free(struct snd_pcm_substream *substream)
-+{
-+      struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+      struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai;
-+
-+      /* disable the PLL */
-+      return codec_dai->dai_ops.set_pll(codec_dai, WM8753_PLL2, 0, 0);
-+}
-+
-+static struct snd_soc_ops neo1973_gta02_voice_ops = {
-+      .hw_params = neo1973_gta02_voice_hw_params,
-+      .hw_free = neo1973_gta02_voice_hw_free,
-+};
-+
-+#define LM4853_AMP 1
-+#define LM4853_SPK 2
-+
-+static u8 lm4853_state=0;
-+
-+static int lm4853_set_state(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      int val = ucontrol->value.integer.value[0];
-+
-+      if(val) {
-+              lm4853_state |= LM4853_AMP;
-+              s3c2410_gpio_setpin(GTA02_GPIO_AMP_SHUT,0);
-+      } else {
-+              lm4853_state &= ~LM4853_AMP;
-+              s3c2410_gpio_setpin(GTA02_GPIO_AMP_SHUT,1);
-+      }
-+
-+      return 0;
-+}
-+
-+static int lm4853_get_state(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      ucontrol->value.integer.value[0] = lm4853_state & LM4853_AMP;
-+
-+      return 0;
-+}
-+
-+static int lm4853_set_spk(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      int val = ucontrol->value.integer.value[0];
-+
-+      if(val) {
-+              lm4853_state |= LM4853_SPK;
-+              s3c2410_gpio_setpin(GTA02_GPIO_HP_IN,0);
-+      } else {
-+              lm4853_state &= ~LM4853_SPK;
-+              s3c2410_gpio_setpin(GTA02_GPIO_HP_IN,1);
-+      }
-+
-+      return 0;
-+}
-+
-+static int lm4853_get_spk(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      ucontrol->value.integer.value[0] = (lm4853_state & LM4853_SPK) >> 1;
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_set_stereo_out(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+      int val = ucontrol->value.integer.value[0];
-+
-+      snd_soc_dapm_set_endpoint(codec, "Stereo Out", val);
-+
-+      snd_soc_dapm_sync_endpoints(codec);
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_get_stereo_out(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+
-+      ucontrol->value.integer.value[0] =
-+              snd_soc_dapm_get_endpoint(codec, "Stereo Out");
-+
-+      return 0;
-+}
-+
-+
-+static int neo1973_gta02_set_gsm_out(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+      int val = ucontrol->value.integer.value[0];
-+
-+      snd_soc_dapm_set_endpoint(codec, "GSM Line Out", val);
-+
-+      snd_soc_dapm_sync_endpoints(codec);
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_get_gsm_out(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+
-+      ucontrol->value.integer.value[0] =
-+              snd_soc_dapm_get_endpoint(codec, "GSM Line Out");
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_set_gsm_in(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+      int val = ucontrol->value.integer.value[0];
-+
-+      snd_soc_dapm_set_endpoint(codec, "GSM Line In", val);
-+
-+      snd_soc_dapm_sync_endpoints(codec);
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_get_gsm_in(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+
-+      ucontrol->value.integer.value[0] =
-+              snd_soc_dapm_get_endpoint(codec, "GSM Line In");
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_set_headset_mic(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+      int val = ucontrol->value.integer.value[0];
-+
-+      snd_soc_dapm_set_endpoint(codec, "Headset Mic", val);
-+
-+      snd_soc_dapm_sync_endpoints(codec);
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_get_headset_mic(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+
-+      ucontrol->value.integer.value[0] =
-+              snd_soc_dapm_get_endpoint(codec, "Headset Mic");
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_set_handset_mic(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+      int val = ucontrol->value.integer.value[0];
-+
-+      snd_soc_dapm_set_endpoint(codec, "Handset Mic", val);
-+
-+      snd_soc_dapm_sync_endpoints(codec);
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_get_handset_mic(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+
-+      ucontrol->value.integer.value[0] =
-+              snd_soc_dapm_get_endpoint(codec, "Handset Mic");
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_set_handset_spk(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+      int val = ucontrol->value.integer.value[0];
-+
-+      snd_soc_dapm_set_endpoint(codec, "Handset Spk", val);
-+
-+      snd_soc_dapm_sync_endpoints(codec);
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_get_handset_spk(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+
-+      ucontrol->value.integer.value[0] =
-+              snd_soc_dapm_get_endpoint(codec, "Handset Spk");
-+
-+      return 0;
-+}
-+
-+static const struct snd_soc_dapm_widget wm8753_dapm_widgets[] = {
-+      SND_SOC_DAPM_LINE("Stereo Out", NULL),
-+      SND_SOC_DAPM_LINE("GSM Line Out", NULL),
-+      SND_SOC_DAPM_LINE("GSM Line In", NULL),
-+      SND_SOC_DAPM_MIC("Headset Mic", NULL),
-+      SND_SOC_DAPM_MIC("Handset Mic", NULL),
-+      SND_SOC_DAPM_SPK("Handset Spk", NULL),
-+};
-+
-+
-+/* example machine audio_mapnections */
-+static const char* audio_map[][3] = {
-+
-+      /* Connections to the lm4853 amp */
-+      {"Stereo Out", NULL, "LOUT1"},
-+      {"Stereo Out", NULL, "ROUT1"},
-+
-+      /* Connections to the GSM Module */
-+      {"GSM Line Out", NULL, "MONO1"},
-+      {"GSM Line Out", NULL, "MONO2"},
-+      {"RXP", NULL, "GSM Line In"},
-+      {"RXN", NULL, "GSM Line In"},
-+
-+      /* Connections to Headset */
-+      {"MIC1", NULL, "Mic Bias"},
-+      {"Mic Bias", NULL, "Headset Mic"},
-+
-+      /* Call Mic */
-+      {"MIC2", NULL, "Mic Bias"},
-+      {"MIC2N", NULL, "Mic Bias"},
-+      {"Mic Bias", NULL, "Handset Mic"},
-+
-+      /* Call Speaker */
-+      {"Handset Spk", NULL, "LOUT2"},
-+      {"Handset Spk", NULL, "ROUT2"},
-+
-+      /* Connect the ALC pins */
-+      {"ACIN", NULL, "ACOP"},
-+
-+      {NULL, NULL, NULL},
-+};
-+
-+static const struct snd_kcontrol_new wm8753_neo1973_gta02_controls[] = {
-+      SOC_SINGLE_EXT("DAPM Stereo Out Switch", 0, 0, 1, 0,
-+              neo1973_gta02_get_stereo_out,
-+              neo1973_gta02_set_stereo_out),
-+      SOC_SINGLE_EXT("DAPM GSM Line Out Switch", 1, 0, 1, 0,
-+              neo1973_gta02_get_gsm_out,
-+              neo1973_gta02_set_gsm_out),
-+      SOC_SINGLE_EXT("DAPM GSM Line In Switch", 2, 0, 1, 0,
-+              neo1973_gta02_get_gsm_in,
-+              neo1973_gta02_set_gsm_in),
-+      SOC_SINGLE_EXT("DAPM Headset Mic Switch", 3, 0, 1, 0,
-+              neo1973_gta02_get_headset_mic,
-+              neo1973_gta02_set_headset_mic),
-+      SOC_SINGLE_EXT("DAPM Handset Mic Switch", 4, 0, 1, 0,
-+              neo1973_gta02_get_handset_mic,
-+              neo1973_gta02_set_handset_mic),
-+      SOC_SINGLE_EXT("DAPM Handset Spk Switch", 5, 0, 1, 0,
-+              neo1973_gta02_get_handset_spk,
-+              neo1973_gta02_set_handset_spk),
-+      SOC_SINGLE_EXT("Amp State Switch", 6, 0, 1, 0,
-+              lm4853_get_state,
-+              lm4853_set_state),
-+      SOC_SINGLE_EXT("Amp Spk Switch", 7, 0, 1, 0,
-+              lm4853_get_spk,
-+              lm4853_set_spk),
-+};
-+
-+/*
-+ * This is an example machine initialisation for a wm8753 connected to a
-+ * neo1973 GTA02.
-+ */
-+static int neo1973_gta02_wm8753_init(struct snd_soc_codec *codec)
-+{
-+      int i, err;
-+
-+      /* set up NC codec pins */
-+      snd_soc_dapm_set_endpoint(codec, "OUT3",  0);
-+      snd_soc_dapm_set_endpoint(codec, "OUT4",  0);
-+      snd_soc_dapm_set_endpoint(codec, "LINE1", 0);
-+      snd_soc_dapm_set_endpoint(codec, "LINE2", 0);
-+
-+      /* Add neo1973 gta02 specific widgets */
-+      for (i = 0; i < ARRAY_SIZE(wm8753_dapm_widgets); i++)
-+              snd_soc_dapm_new_control(codec, &wm8753_dapm_widgets[i]);
-+
-+      /* add neo1973 gta02 specific controls */
-+      for (i = 0; i < ARRAY_SIZE(wm8753_neo1973_gta02_controls); i++) {
-+              err = snd_ctl_add(codec->card,
-+                      snd_soc_cnew(&wm8753_neo1973_gta02_controls[i],
-+                      codec, NULL));
-+              if (err < 0)
-+                      return err;
-+      }
-+
-+      /* set up neo1973 gta02 specific audio path audio_mapnects */
-+      for (i = 0; audio_map[i][0] != NULL; i++) {
-+              snd_soc_dapm_connect_input(codec, audio_map[i][0],
-+                      audio_map[i][1], audio_map[i][2]);
-+      }
-+
-+      /* set endpoints to default off mode */
-+      snd_soc_dapm_set_endpoint(codec, "Stereo Out",  0);
-+      snd_soc_dapm_set_endpoint(codec, "GSM Line Out",0);
-+      snd_soc_dapm_set_endpoint(codec, "GSM Line In", 0);
-+      snd_soc_dapm_set_endpoint(codec, "Headset Mic", 0);
-+      snd_soc_dapm_set_endpoint(codec, "Handset Mic", 0);
-+      snd_soc_dapm_set_endpoint(codec, "Handset Spk", 0);
-+
-+      snd_soc_dapm_sync_endpoints(codec);
-+      return 0;
-+}
-+
-+/*
-+ * BT Codec DAI
-+ */
-+static struct snd_soc_cpu_dai bt_dai =
-+{     .name = "Bluetooth",
-+      .id = 0,
-+      .type = SND_SOC_DAI_PCM,
-+      .playback = {
-+              .channels_min = 1,
-+              .channels_max = 1,
-+              .rates = SNDRV_PCM_RATE_8000,
-+              .formats = SNDRV_PCM_FMTBIT_S16_LE,},
-+      .capture = {
-+              .channels_min = 1,
-+              .channels_max = 1,
-+              .rates = SNDRV_PCM_RATE_8000,
-+              .formats = SNDRV_PCM_FMTBIT_S16_LE,},
-+};
-+
-+static struct snd_soc_dai_link neo1973_gta02_dai[] = {
-+{ /* Hifi Playback - for similatious use with voice below */
-+      .name = "WM8753",
-+      .stream_name = "WM8753 HiFi",
-+      .cpu_dai = &s3c24xx_i2s_dai,
-+      .codec_dai = &wm8753_dai[WM8753_DAI_HIFI],
-+      .init = neo1973_gta02_wm8753_init,
-+      .ops = &neo1973_gta02_hifi_ops,
-+},
-+{ /* Voice via BT */
-+      .name = "Bluetooth",
-+      .stream_name = "Voice",
-+      .cpu_dai = &bt_dai,
-+      .codec_dai = &wm8753_dai[WM8753_DAI_VOICE],
-+      .ops = &neo1973_gta02_voice_ops,
-+},
-+};
-+
-+#ifdef CONFIG_PM
-+int neo1973_gta02_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+      s3c2410_gpio_setpin(GTA02_GPIO_AMP_SHUT, 1);
-+
-+      return 0;
-+}
-+
-+int neo1973_gta02_resume(struct platform_device *pdev)
-+{
-+      if(lm4853_state & LM4853_AMP)
-+              s3c2410_gpio_setpin(GTA02_GPIO_AMP_SHUT, 0);
-+
-+      return 0;
-+}
-+#else
-+#define neo1973_gta02_suspend NULL
-+#define neo1973_gta02_resume NULL
-+#endif
-+
-+static struct snd_soc_machine neo1973_gta02 = {
-+      .name = "neo1973-gta02",
-+      .suspend_pre = neo1973_gta02_suspend,
-+      .resume_post = neo1973_gta02_resume,
-+      .dai_link = neo1973_gta02_dai,
-+      .num_links = ARRAY_SIZE(neo1973_gta02_dai),
-+};
-+
-+static struct wm8753_setup_data neo1973_gta02_wm8753_setup = {
-+      .i2c_address = 0x1a,
-+};
-+
-+static struct snd_soc_device neo1973_gta02_snd_devdata = {
-+      .machine = &neo1973_gta02,
-+      .platform = &s3c24xx_soc_platform,
-+      .codec_dev = &soc_codec_dev_wm8753,
-+      .codec_data = &neo1973_gta02_wm8753_setup,
-+};
-+
-+static struct platform_device *neo1973_gta02_snd_device;
-+
-+static int __init neo1973_gta02_init(void)
-+{
-+      int ret;
-+
-+      if (!machine_is_neo1973_gta02()) {
-+              printk(KERN_INFO
-+                     "Only GTA02 hardware supported by ASoc driver\n");
-+              return -ENODEV;
-+      }
-+
-+      neo1973_gta02_snd_device = platform_device_alloc("soc-audio", -1);
-+      if (!neo1973_gta02_snd_device)
-+              return -ENOMEM;
-+
-+      platform_set_drvdata(neo1973_gta02_snd_device,
-+                      &neo1973_gta02_snd_devdata);
-+      neo1973_gta02_snd_devdata.dev = &neo1973_gta02_snd_device->dev;
-+      ret = platform_device_add(neo1973_gta02_snd_device);
-+
-+      if (ret)
-+              platform_device_put(neo1973_gta02_snd_device);
-+
-+      /* Initialise GPIOs used by amp */
-+      s3c2410_gpio_cfgpin(GTA02_GPIO_HP_IN, S3C2410_GPIO_OUTPUT);
-+      s3c2410_gpio_cfgpin(GTA02_GPIO_AMP_SHUT, S3C2410_GPIO_OUTPUT);
-+
-+      /* Amp off by default */
-+      s3c2410_gpio_setpin(GTA02_GPIO_AMP_SHUT, 1);
-+
-+      /* Speaker off by default */
-+      s3c2410_gpio_setpin(GTA02_GPIO_HP_IN, 1);
-+
-+      return ret;
-+}
-+
-+static void __exit neo1973_gta02_exit(void)
-+{
-+      platform_device_unregister(neo1973_gta02_snd_device);
-+}
-+
-+module_init(neo1973_gta02_init);
-+module_exit(neo1973_gta02_exit);
-+
-+/* Module information */
-+MODULE_AUTHOR("Graeme Gregory, graeme@openmoko.org");
-+MODULE_DESCRIPTION("ALSA SoC WM8753 Neo1973 GTA02");
-+MODULE_LICENSE("GPL");
-+
-diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
-index 29a546f..84fa860 100644
---- a/sound/soc/soc-dapm.c
-+++ b/sound/soc/soc-dapm.c
-@@ -1305,6 +1305,30 @@ int snd_soc_dapm_set_endpoint(struct snd_soc_codec *codec,
- EXPORT_SYMBOL_GPL(snd_soc_dapm_set_endpoint);
- /**
-+ * snd_soc_dapm_get_endpoint - get audio endpoint status
-+ * @codec: audio codec
-+ * @endpoint: audio signal endpoint (or start point)
-+ *
-+ * Get audio endpoint status - connected or disconnected.
-+ *
-+ * Returns status
-+ */
-+int snd_soc_dapm_get_endpoint(struct snd_soc_codec *codec,
-+      char *endpoint)
-+{
-+      struct snd_soc_dapm_widget *w;
-+
-+      list_for_each_entry(w, &codec->dapm_widgets, list) {
-+              if (!strcmp(w->name, endpoint)) {
-+                      return w->connected;
-+              }
-+      }
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(snd_soc_dapm_get_endpoint);
-+
-+/**
-  * snd_soc_dapm_free - free dapm resources
-  * @socdev: SoC device
-  *
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1038-lis302dl.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1038-lis302dl.patch.patch
deleted file mode 100644 (file)
index 6cd803c..0000000
+++ /dev/null
@@ -1,781 +0,0 @@
-From e31bab42367386736c07638683acb4da3c775eaf Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:35:42 +0100
-Subject: [PATCH] lis302dl.patch
- This is a Linux driver for the STmicro LIS302DL 3-axis accelerometer.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   46 +++-
- drivers/input/misc/Kconfig         |    9 +
- drivers/input/misc/Makefile        |    1 +
- drivers/input/misc/lis302dl.c      |  633 ++++++++++++++++++++++++++++++++++++
- include/linux/lis302dl.h           |   11 +
- 5 files changed, 699 insertions(+), 1 deletions(-)
- create mode 100644 drivers/input/misc/lis302dl.c
- create mode 100644 include/linux/lis302dl.h
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index f72a5ae..d11da10 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -46,6 +46,7 @@
- #include <linux/mtd/physmap.h>
- #include <linux/pcf50633.h>
-+#include <linux/lis302dl.h>
- #include <asm/mach/arch.h>
- #include <asm/mach/map.h>
-@@ -463,7 +464,7 @@ static struct s3c2410_ts_mach_info gta02_ts_cfg = {
-       .oversampling_shift = 5,
- };
--/* SPI */
-+/* SPI: LCM control interface attached to Glamo3362 */
- static struct spi_board_info gta02_spi_board_info[] = {
-       {
-@@ -504,6 +505,48 @@ static struct platform_device gta01_led_dev = {
-       .resource       = gta01_led_resources,
- };
-+/* SPI: Accelerometers attached to SPI of s3c244x */
-+
-+static void gta02_spi_acc_set_cs(struct s3c2410_spi_info *spi, int cs, int pol)
-+{
-+      s3c2410_gpio_setpin(cs, pol);
-+}
-+
-+static const struct lis302dl_platform_data lis302_pdata[] = {
-+      {
-+              .name           = "lis302-1 (top)"
-+      }, {
-+              .name           = "lis302-2 (bottom)"
-+      },
-+};
-+
-+static struct spi_board_info gta02_spi_acc_bdinfo[] = {
-+      {
-+              .modalias       = "lis302dl",
-+              .platform_data  = &lis302_pdata[0],
-+              .irq            = GTA02_IRQ_GSENSOR_1,
-+              .max_speed_hz   = 400 * 1000,
-+              .bus_num        = 1,
-+              .chip_select    = S3C2410_GPD12,
-+              .mode           = SPI_MODE_3,
-+      },
-+      {
-+              .modalias       = "lis302dl",
-+              .platform_data  = &lis302_pdata[1],
-+              .irq            = GTA02_IRQ_GSENSOR_2,
-+              .max_speed_hz   = 400 * 1000,
-+              .bus_num        = 1,
-+              .chip_select    = S3C2410_GPD13,
-+              .mode           = SPI_MODE_3,
-+      },
-+};
-+
-+static struct s3c2410_spi_info gta02_spi_acc_cfg = {
-+      .set_cs         = gta02_spi_acc_set_cs,
-+      .board_size     = ARRAY_SIZE(gta02_spi_acc_bdinfo),
-+      .board_info     = gta02_spi_acc_bdinfo,
-+};
-+
- static struct resource gta02_led_resources[] = {
-       {
-               .name   = "gta02-power:orange",
-@@ -746,6 +789,7 @@ static void __init gta02_machine_init(void)
-       s3c_device_usb.dev.platform_data = &gta02_usb_info;
-       s3c_device_nand.dev.platform_data = &gta02_nand_info;
-       s3c_device_sdi.dev.platform_data = &gta02_mmc_cfg;
-+      s3c_device_spi1.dev.platform_data = &gta02_spi_acc_cfg;
-       /* Only GTA02v1 has a SD_DETECT GPIO.  Since the slot is not
-        * hot-pluggable, this is not required anyway */
-diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
-index 8f5c7b9..5a15edd 100644
---- a/drivers/input/misc/Kconfig
-+++ b/drivers/input/misc/Kconfig
-@@ -183,4 +183,13 @@ config HP_SDC_RTC
-         Say Y here if you want to support the built-in real time clock
-         of the HP SDC controller.
-+config INPUT_LIS302DL
-+      tristate "STmicro LIS302DL 3-axis accelerometer"
-+      depends on SPI_MASTER
-+      help
-+        SPI driver for the STmicro LIS302DL 3-axis accelerometer.
-+
-+        The userspece interface is a 3-axis (X/Y/Z) relative movement
-+        Linux input device, reporting REL_[XYZ] events.
-+
- endif
-diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
-index 3585b50..f197a67 100644
---- a/drivers/input/misc/Makefile
-+++ b/drivers/input/misc/Makefile
-@@ -18,3 +18,4 @@ obj-$(CONFIG_INPUT_POWERMATE)                += powermate.o
- obj-$(CONFIG_INPUT_YEALINK)           += yealink.o
- obj-$(CONFIG_HP_SDC_RTC)              += hp_sdc_rtc.o
- obj-$(CONFIG_INPUT_UINPUT)            += uinput.o
-+obj-$(CONFIG_INPUT_LIS302DL)          += lis302dl.o
-diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
-new file mode 100644
-index 0000000..45c41c8
---- /dev/null
-+++ b/drivers/input/misc/lis302dl.c
-@@ -0,0 +1,633 @@
-+/* Linux kernel driver for the ST LIS302D 3-axis accelerometer
-+ *
-+ * Copyright (C) 2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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
-+ *
-+ * TODO
-+ *    * statistics for overflow events
-+ *    * configuration interface (sysfs) for
-+ *            * enable/disable x/y/z axis data ready
-+ *            * enable/disable resume from freee fall / click
-+ *            * free fall / click parameters
-+ *            * high pass filter parameters
-+ */
-+#include <linux/kernel.h>
-+#include <linux/types.h>
-+#include <linux/module.h>
-+#include <linux/device.h>
-+#include <linux/platform_device.h>
-+#include <linux/delay.h>
-+#include <linux/input.h>
-+#include <linux/irq.h>
-+#include <linux/interrupt.h>
-+#include <linux/sysfs.h>
-+
-+#include <linux/lis302dl.h>
-+
-+#include <linux/spi/spi.h>
-+
-+#define LIS302DL_WHO_AM_I_MAGIC               0x3b
-+
-+enum lis302dl_reg {
-+      LIS302DL_REG_WHO_AM_I           = 0x0f,
-+      LIS302DL_REG_CTRL1              = 0x20,
-+      LIS302DL_REG_CTRL2              = 0x21,
-+      LIS302DL_REG_CTRL3              = 0x22,
-+      LIS302DL_REG_HP_FILTER_RESET    = 0x23,
-+      LIS302DL_REG_STATUS             = 0x27,
-+      LIS302DL_REG_OUT_X              = 0x29,
-+      LIS302DL_REG_OUT_Y              = 0x2b,
-+      LIS302DL_REG_OUT_Z              = 0x2d,
-+      LIS302DL_REG_FF_WU_CFG_1        = 0x30,
-+      LIS302DL_REG_FF_WU_SRC_1        = 0x31,
-+      LIS302DL_REG_FF_WU_THS_1        = 0x32,
-+      LIS302DL_REG_FF_WU_DURATION_1   = 0x33,
-+      LIS302DL_REG_FF_WU_CFG_2        = 0x34,
-+      LIS302DL_REG_FF_WU_SRC_2        = 0x35,
-+      LIS302DL_REG_FF_WU_THS_2        = 0x36,
-+      LIS302DL_REG_FF_WU_DURATION_2   = 0x37,
-+      LIS302DL_REG_CLICK_CFG          = 0x38,
-+      LIS302DL_REG_CLICK_SRC          = 0x39,
-+      LIS302DL_REG_CLICK_THSY_X       = 0x3b,
-+      LIS302DL_REG_CLICK_THSZ         = 0x3c,
-+      LIS302DL_REG_CLICK_TIME_LIMIT   = 0x3d,
-+      LIS302DL_REG_CLICK_LATENCY      = 0x3e,
-+      LIS302DL_REG_CLICK_WINDOW       = 0x3f,
-+};
-+
-+enum lis302dl_reg_ctrl1 {
-+      LIS302DL_CTRL1_Xen              = 0x01,
-+      LIS302DL_CTRL1_Yen              = 0x02,
-+      LIS302DL_CTRL1_Zen              = 0x04,
-+      LIS302DL_CTRL1_STM              = 0x08,
-+      LIS302DL_CTRL1_STP              = 0x10,
-+      LIS302DL_CTRL1_FS               = 0x20,
-+      LIS302DL_CTRL1_PD               = 0x40,
-+      LIS302DL_CTRL1_DR               = 0x80,
-+};
-+
-+enum lis302dl_reg_ctrl3 {
-+      LIS302DL_CTRL3_PP_OD            = 0x40,
-+};
-+
-+enum lis302dl_reg_status {
-+      LIS302DL_STATUS_XDA             = 0x01,
-+      LIS302DL_STATUS_YDA             = 0x02,
-+      LIS302DL_STATUS_ZDA             = 0x04,
-+      LIS302DL_STATUS_XYZDA           = 0x08,
-+      LIS302DL_STATUS_XOR             = 0x10,
-+      LIS302DL_STATUS_YOR             = 0x20,
-+      LIS302DL_STATUS_ZOR             = 0x40,
-+      LIS302DL_STATUS_XYZOR           = 0x80,
-+};
-+
-+enum lis302dl_reg_ffwusrc1 {
-+      LIS302DL_FFWUSRC1_XL            = 0x01,
-+      LIS302DL_FFWUSRC1_XH            = 0x02,
-+      LIS302DL_FFWUSRC1_YL            = 0x04,
-+      LIS302DL_FFWUSRC1_YH            = 0x08,
-+      LIS302DL_FFWUSRC1_ZL            = 0x10,
-+      LIS302DL_FFWUSRC1_ZH            = 0x20,
-+      LIS302DL_FFWUSRC1_IA            = 0x40,
-+};
-+
-+enum lis302dl_reg_cloik_src {
-+      LIS302DL_CLICKSRC_SINGLE_X      = 0x01,
-+      LIS302DL_CLICKSRC_DOUBLE_X      = 0x02,
-+      LIS302DL_CLICKSRC_SINGLE_Y      = 0x04,
-+      LIS302DL_CLICKSRC_DOUBLE_Y      = 0x08,
-+      LIS302DL_CLICKSRC_SINGLE_Z      = 0x10,
-+      LIS302DL_CLICKSRC_DOUBLE_Z      = 0x20,
-+      LIS302DL_CLICKSRC_IA            = 0x40,
-+};
-+
-+struct lis302dl_info {
-+      struct spi_device *spi_dev;
-+      struct input_dev *input_dev;
-+      struct mutex lock;
-+      struct work_struct work;
-+      unsigned int flags;
-+      unsigned int working;
-+      u_int8_t regs[0x40];
-+};
-+
-+#define LIS302DL_F_WUP_FF             0x0001  /* wake up from free fall */
-+#define LIS302DL_F_WUP_CLICK          0x0002
-+#define LIS302DL_F_POWER              0x0010
-+#define LIS302DL_F_FS                 0x0020  /* ADC full scale */
-+
-+/* lowlevel register access functions */
-+
-+#define READ_BIT      0x01
-+#define MS_BIT                0x02
-+#define ADDR_SHIFT    2
-+
-+static inline u_int8_t __reg_read(struct lis302dl_info *lis, u_int8_t reg)
-+{
-+      int rc;
-+      u_int8_t cmd;
-+
-+      cmd = (reg << ADDR_SHIFT) | READ_BIT;
-+
-+      rc = spi_w8r8(lis->spi_dev, cmd);
-+
-+      return rc;
-+}
-+
-+static u_int8_t reg_read(struct lis302dl_info *lis, u_int8_t reg)
-+{
-+      u_int8_t ret;
-+
-+      mutex_lock(&lis->lock);
-+      ret = __reg_read(lis, reg);
-+      mutex_unlock(&lis->lock);
-+
-+      return ret;
-+}
-+
-+static inline int __reg_write(struct lis302dl_info *lis, u_int8_t reg, u_int8_t val)
-+{
-+      u_int8_t buf[2];
-+
-+      buf[0] = (reg << ADDR_SHIFT);
-+      buf[1] = val;
-+
-+      return spi_write(lis->spi_dev, buf, sizeof(buf));
-+}
-+
-+static int reg_write(struct lis302dl_info *lis, u_int8_t reg, u_int8_t val)
-+{
-+      int ret;
-+
-+      mutex_lock(&lis->lock);
-+      ret = __reg_write(lis, reg, val);
-+      mutex_unlock(&lis->lock);
-+
-+      return ret;
-+}
-+
-+static int reg_set_bit_mask(struct lis302dl_info *lis,
-+                          u_int8_t reg, u_int8_t mask, u_int8_t val)
-+{
-+      int ret;
-+      u_int8_t tmp;
-+
-+      val &= mask;
-+
-+      mutex_lock(&lis->lock);
-+
-+      tmp = __reg_read(lis, reg);
-+      tmp &= ~mask;
-+      tmp |= val;
-+      ret = __reg_write(lis, reg, tmp);
-+
-+      mutex_unlock(&lis->lock);
-+
-+      return ret;
-+}
-+
-+/* interrupt handling related */
-+
-+enum lis302dl_intmode {
-+      LIS302DL_INTMODE_GND            = 0x00,
-+      LIS302DL_INTMODE_FF_WU_1        = 0x01,
-+      LIX302DL_INTMODE_FF_WU_2        = 0x02,
-+      LIX302DL_INTMODE_FF_WU_12       = 0x03,
-+      LIX302DL_INTMODE_DATA_READY     = 0x04,
-+      LIX302DL_INTMODE_CLICK          = 0x07,
-+};
-+
-+static void lis302dl_int_mode(struct spi_device *spi, int int_pin,
-+                            enum lis302dl_intmode mode)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-+
-+      if (int_pin == 1)
-+              reg_set_bit_mask(lis, LIS302DL_REG_CTRL3, 0x07, mode);
-+      else if (int_pin == 2)
-+              reg_set_bit_mask(lis, LIS302DL_REG_CTRL3, 0x38, mode << 3);
-+}
-+
-+static void _report_btn_single(struct input_dev *inp, int btn)
-+{
-+      input_report_key(inp, btn, 1);
-+      input_sync(inp);
-+      input_report_key(inp, btn, 0);
-+}
-+
-+static void _report_btn_double(struct input_dev *inp, int btn)
-+{
-+      input_report_key(inp, btn, 1);
-+      input_sync(inp);
-+      input_report_key(inp, btn, 0);
-+      input_sync(inp);
-+      input_report_key(inp, btn, 1);
-+      input_sync(inp);
-+      input_report_key(inp, btn, 0);
-+}
-+
-+static void lis302dl_work(struct work_struct *work)
-+{
-+      struct lis302dl_info *lis =
-+                      container_of(work, struct lis302dl_info, work);
-+
-+      u_int8_t status, ff_wu_src_1, click_src;
-+      u_int8_t val;
-+
-+      lis->working = 1;
-+
-+      status = reg_read(lis, LIS302DL_REG_STATUS);
-+      ff_wu_src_1 = reg_read(lis, LIS302DL_REG_FF_WU_SRC_1);
-+      click_src = reg_read(lis, LIS302DL_REG_CLICK_SRC);
-+
-+      if (status & LIS302DL_STATUS_XDA) {
-+              val = reg_read(lis, LIS302DL_REG_OUT_X);
-+              if (lis->flags & LIS302DL_F_FS)
-+                      val = val << 2;
-+              input_report_rel(lis->input_dev, REL_X, val);
-+      }
-+
-+      if (status & LIS302DL_STATUS_YDA) {
-+              val = reg_read(lis, LIS302DL_REG_OUT_Y);
-+              if (lis->flags & LIS302DL_F_FS)
-+                      val = val << 2;
-+              input_report_rel(lis->input_dev, REL_Y, val);
-+      }
-+
-+      if (status & LIS302DL_STATUS_ZDA) {
-+              val = reg_read(lis, LIS302DL_REG_OUT_Z);
-+              if (lis->flags & LIS302DL_F_FS)
-+                      val = val << 2;
-+              input_report_rel(lis->input_dev, REL_Z, val);
-+      }
-+
-+      if (status & 0xf0)
-+              dev_dbg(&lis->spi_dev->dev, "overrun!\n");
-+
-+      /* FIXME: implement overrun statistics */
-+
-+      if (ff_wu_src_1 & LIS302DL_FFWUSRC1_IA) {
-+              /* FIXME: free fall interrupt handling */
-+      }
-+
-+      if (click_src & LIS302DL_CLICKSRC_IA) {
-+              if (click_src & LIS302DL_CLICKSRC_SINGLE_X)
-+                      _report_btn_single(lis->input_dev, BTN_X);
-+              if (click_src & LIS302DL_CLICKSRC_DOUBLE_X)
-+                      _report_btn_double(lis->input_dev, BTN_X);
-+
-+              if (click_src & LIS302DL_CLICKSRC_SINGLE_Y)
-+                      _report_btn_single(lis->input_dev, BTN_Y);
-+              if (click_src & LIS302DL_CLICKSRC_DOUBLE_Y)
-+                      _report_btn_double(lis->input_dev, BTN_Y);
-+
-+              if (click_src & LIS302DL_CLICKSRC_SINGLE_Z)
-+                      _report_btn_single(lis->input_dev, BTN_Z);
-+              if (click_src & LIS302DL_CLICKSRC_DOUBLE_Z)
-+                      _report_btn_double(lis->input_dev, BTN_Z);
-+      }
-+
-+      lis->working = 0;
-+      input_sync(lis->input_dev);
-+      put_device(&lis->spi_dev->dev);
-+
-+      enable_irq(lis->spi_dev->irq);
-+}
-+
-+static void lis302dl_schedule_work(struct lis302dl_info *lis)
-+{
-+      int status;
-+
-+      get_device(&lis->spi_dev->dev);
-+      status = schedule_work(&lis->work);
-+      if (!status && !lis->working)
-+              dev_dbg(&lis->spi_dev->dev, "work item may be lost\n");
-+}
-+
-+static irqreturn_t lis302dl_interrupt(int irq, void *_lis)
-+{
-+      struct lis302dl_info *lis = _lis;
-+
-+      lis302dl_schedule_work(lis);
-+
-+      /* Disable any further interrupts until we have processed
-+       * the current one */
-+      disable_irq(lis->spi_dev->irq);
-+
-+      return IRQ_HANDLED;
-+}
-+
-+/* sysfs */
-+
-+static ssize_t show_rate(struct device *dev, struct device_attribute *attr,
-+                       char *buf)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(dev);
-+      u_int8_t ctrl1 = reg_read(lis, LIS302DL_REG_CTRL1);
-+
-+      return sprintf(buf, "%d\n", ctrl1 & LIS302DL_CTRL1_DR ? 400 : 100);
-+}
-+
-+static ssize_t set_rate(struct device *dev, struct device_attribute *attr,
-+                      const char *buf, size_t count)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(dev);
-+
-+      if (!strcmp(buf, "400\n"))
-+              reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_DR,
-+                               LIS302DL_CTRL1_DR);
-+      else
-+              reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_DR, 0);
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(sample_rate, S_IRUGO | S_IWUSR, show_rate, set_rate);
-+
-+static ssize_t show_scale(struct device *dev, struct device_attribute *attr,
-+                        char *buf)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(dev);
-+      u_int8_t ctrl1 = reg_read(lis, LIS302DL_REG_CTRL1);
-+
-+      return sprintf(buf, "%s\n", ctrl1 & LIS302DL_CTRL1_FS ? "9.2" : "2.3");
-+}
-+
-+static ssize_t set_scale(struct device *dev, struct device_attribute *attr,
-+                       const char *buf, size_t count)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(dev);
-+
-+      if (!strcmp(buf, "9.2\n"))
-+              reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_FS,
-+                               LIS302DL_CTRL1_FS);
-+      else
-+              reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_FS, 0);
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(full_scale, S_IRUGO | S_IWUSR, show_scale, set_scale);
-+
-+static struct attribute *lis302dl_sysfs_entries[] = {
-+      &dev_attr_sample_rate.attr,
-+      &dev_attr_full_scale.attr,
-+};
-+
-+static struct attribute_group lis302dl_attr_group = {
-+      .name   = NULL,
-+      .attrs  = lis302dl_sysfs_entries,
-+};
-+
-+/* input device handling and driver core interaction */
-+
-+static int lis302dl_input_open(struct input_dev *inp)
-+{
-+      struct lis302dl_info *lis = inp->private;
-+      u_int8_t ctrl1 = LIS302DL_CTRL1_PD | LIS302DL_CTRL1_Xen |
-+                       LIS302DL_CTRL1_Yen | LIS302DL_CTRL1_Zen;
-+
-+      /* make sure we're powered up and generate data ready */
-+      reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, ctrl1, ctrl1);
-+
-+      return 0;
-+}
-+
-+static void lis302dl_input_close(struct input_dev *inp)
-+{
-+      struct lis302dl_info *lis = inp->private;
-+      u_int8_t ctrl1 = LIS302DL_CTRL1_Xen | LIS302DL_CTRL1_Yen |
-+                       LIS302DL_CTRL1_Zen;
-+
-+      /* since the input core already serializes access and makes sure we
-+       * only see close() for the close of the lastre user, we can safely
-+       * disable the data ready events */
-+      reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, ctrl1, 0x00);
-+
-+      /* however, don't power down the whole device if still needed */
-+      if (!(lis->flags & LIS302DL_F_WUP_FF ||
-+            lis->flags & LIS302DL_F_WUP_CLICK)) {
-+              reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD,
-+                               0x00);
-+      }
-+}
-+
-+static int __devinit lis302dl_probe(struct spi_device *spi)
-+{
-+      int rc;
-+      struct lis302dl_info *lis;
-+      u_int8_t wai;
-+
-+      lis = kzalloc(sizeof(*lis), GFP_KERNEL);
-+      if (!lis)
-+              return -ENOMEM;
-+
-+      mutex_init(&lis->lock);
-+      INIT_WORK(&lis->work, lis302dl_work);
-+      lis->spi_dev = spi;
-+
-+      spi_set_drvdata(spi, lis);
-+
-+      rc = spi_setup(spi);
-+      if (rc < 0) {
-+              printk(KERN_ERR "error durign spi_setup of lis302dl driver\n");
-+              dev_set_drvdata(&spi->dev, NULL);
-+              kfree(lis);
-+              return rc;
-+      }
-+
-+      wai = reg_read(lis, LIS302DL_REG_WHO_AM_I);
-+      if (wai != LIS302DL_WHO_AM_I_MAGIC) {
-+              printk(KERN_ERR "unknown who_am_i signature 0x%02x\n", wai);
-+              dev_set_drvdata(&spi->dev, NULL);
-+              kfree(lis);
-+              return -ENODEV;
-+      }
-+
-+      /* switch interrupt to open collector */
-+      reg_write(lis, LIS302DL_CTRL3_PP_OD, 0x7c);
-+
-+      rc = request_irq(lis->spi_dev->irq, lis302dl_interrupt, IRQF_DISABLED,
-+                       "lis302dl", NULL);
-+      if (rc < 0) {
-+              dev_err(&spi->dev, "error requesting IRQ %d\n",
-+                      lis->spi_dev->irq);
-+              /* FIXME */
-+              return rc;
-+      }
-+
-+      rc = sysfs_create_group(&spi->dev.kobj, &lis302dl_attr_group);
-+      if (rc) {
-+              dev_err(&spi->dev, "error creating sysfs group\n");
-+              /* FIXME */
-+              return rc;
-+      }
-+
-+      /* initialize input layer details */
-+      lis->input_dev = input_allocate_device();
-+      if (!lis->input_dev) {
-+              dev_err(&spi->dev, "Unable to allocate input device\n");
-+              /* FIXME */
-+      }
-+
-+      set_bit(EV_REL, lis->input_dev->evbit);
-+      set_bit(EV_KEY, lis->input_dev->evbit);
-+      set_bit(BTN_X, lis->input_dev->keybit);
-+      set_bit(BTN_Y, lis->input_dev->keybit);
-+      set_bit(BTN_Z, lis->input_dev->keybit);
-+
-+      lis->input_dev->private = lis;
-+      lis->input_dev->name = "lis302dl"; /* FIXME: platform data */
-+      lis->input_dev->id.bustype = BUS_I2C; /* FIXME: SPI Bus */
-+      lis->input_dev->open = lis302dl_input_open;
-+      lis->input_dev->close = lis302dl_input_close;
-+
-+      input_register_device(lis->input_dev);
-+
-+      return 0;
-+}
-+
-+static int __devexit lis302dl_remove(struct spi_device *spi)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-+
-+      /* power down the device */
-+      reg_write(lis, LIS302DL_REG_CTRL1, 0x00);
-+      sysfs_remove_group(&spi->dev.kobj, &lis302dl_attr_group);
-+      input_unregister_device(lis->input_dev);
-+      dev_set_drvdata(&spi->dev, NULL);
-+      kfree(lis);
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int lis302dl_suspend(struct spi_device *spi, pm_message_t state)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-+
-+      /* save registers */
-+      lis->regs[LIS302DL_REG_CTRL1] = reg_read(lis, LIS302DL_REG_CTRL1);
-+      lis->regs[LIS302DL_REG_CTRL2] = reg_read(lis, LIS302DL_REG_CTRL2);
-+      lis->regs[LIS302DL_REG_CTRL3] = reg_read(lis, LIS302DL_REG_CTRL3);
-+      lis->regs[LIS302DL_REG_FF_WU_CFG_1] =
-+                              reg_read(lis, LIS302DL_REG_FF_WU_CFG_1);
-+      lis->regs[LIS302DL_REG_FF_WU_THS_1] =
-+                              reg_read(lis, LIS302DL_REG_FF_WU_THS_1);
-+      lis->regs[LIS302DL_REG_FF_WU_DURATION_1] =
-+                              reg_read(lis, LIS302DL_REG_FF_WU_DURATION_1);
-+      lis->regs[LIS302DL_REG_FF_WU_CFG_2] =
-+                              reg_read(lis, LIS302DL_REG_FF_WU_CFG_2);
-+      lis->regs[LIS302DL_REG_FF_WU_THS_2] =
-+                              reg_read(lis, LIS302DL_REG_FF_WU_THS_2);
-+      lis->regs[LIS302DL_REG_FF_WU_DURATION_2] =
-+                              reg_read(lis, LIS302DL_REG_FF_WU_DURATION_2);
-+      lis->regs[LIS302DL_REG_CLICK_CFG] =
-+                              reg_read(lis, LIS302DL_REG_CLICK_CFG);
-+      lis->regs[LIS302DL_REG_CLICK_THSY_X] =
-+                              reg_read(lis, LIS302DL_REG_CLICK_THSY_X);
-+      lis->regs[LIS302DL_REG_CLICK_THSZ] =
-+                              reg_read(lis, LIS302DL_REG_CLICK_THSZ);
-+      lis->regs[LIS302DL_REG_CLICK_TIME_LIMIT] =
-+                              reg_read(lis, LIS302DL_REG_CLICK_TIME_LIMIT);
-+      lis->regs[LIS302DL_REG_CLICK_LATENCY] =
-+                              reg_read(lis, LIS302DL_REG_CLICK_LATENCY);
-+      lis->regs[LIS302DL_REG_CLICK_WINDOW] =
-+                              reg_read(lis, LIS302DL_REG_CLICK_WINDOW);
-+
-+      /* determine if we want to wake up from the accel. */
-+      if (!(lis->flags & LIS302DL_F_WUP_FF ||
-+            lis->flags & LIS302DL_F_WUP_CLICK)) {
-+              /* power down */
-+              u_int8_t tmp;
-+              tmp = reg_read(lis, LIS302DL_REG_CTRL1);
-+              tmp &= ~LIS302DL_CTRL1_PD;
-+              reg_write(lis, LIS302DL_REG_CTRL1, tmp);
-+      }
-+
-+      return 0;
-+}
-+
-+static int lis302dl_resume(struct spi_device *spi)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-+
-+      /* restore registers after resume */
-+      reg_write(lis, LIS302DL_REG_CTRL1, lis->regs[LIS302DL_REG_CTRL1]);
-+      reg_write(lis, LIS302DL_REG_CTRL2, lis->regs[LIS302DL_REG_CTRL2]);
-+      reg_write(lis, LIS302DL_REG_CTRL3, lis->regs[LIS302DL_REG_CTRL3]);
-+      reg_write(lis, LIS302DL_REG_FF_WU_CFG_1,
-+                lis->regs[LIS302DL_REG_FF_WU_CFG_1]);
-+      reg_write(lis, LIS302DL_REG_FF_WU_THS_1,
-+                lis->regs[LIS302DL_REG_FF_WU_THS_1]);
-+      reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1,
-+                lis->regs[LIS302DL_REG_FF_WU_DURATION_1]);
-+      reg_write(lis, LIS302DL_REG_FF_WU_CFG_2,
-+                lis->regs[LIS302DL_REG_FF_WU_CFG_2]);
-+      reg_write(lis, LIS302DL_REG_FF_WU_THS_2,
-+                lis->regs[LIS302DL_REG_FF_WU_THS_2]);
-+      reg_write(lis, LIS302DL_REG_FF_WU_DURATION_2,
-+                lis->regs[LIS302DL_REG_FF_WU_DURATION_2]);
-+      reg_write(lis, LIS302DL_REG_CLICK_CFG,
-+                lis->regs[LIS302DL_REG_CLICK_CFG]);
-+      reg_write(lis, LIS302DL_REG_CLICK_THSY_X,
-+                lis->regs[LIS302DL_REG_CLICK_THSY_X]);
-+      reg_write(lis, LIS302DL_REG_CLICK_THSZ,
-+                lis->regs[LIS302DL_REG_CLICK_THSZ]);
-+      reg_write(lis, LIS302DL_REG_CLICK_TIME_LIMIT,
-+                lis->regs[LIS302DL_REG_CLICK_TIME_LIMIT]);
-+      reg_write(lis, LIS302DL_REG_CLICK_LATENCY,
-+                lis->regs[LIS302DL_REG_CLICK_LATENCY]);
-+      reg_write(lis, LIS302DL_REG_CLICK_WINDOW,
-+                lis->regs[LIS302DL_REG_CLICK_WINDOW]);
-+
-+      return 0;
-+}
-+#else
-+#define lis302dl_suspend      NULL
-+#define lis302dl_resume               NULL
-+#endif
-+
-+static struct spi_driver lis302dl_driver = {
-+      .driver = {
-+              .name   = "lis302dl",
-+              .owner  = THIS_MODULE,
-+      },
-+
-+      .probe   = lis302dl_probe,
-+      .remove  = __devexit_p(lis302dl_remove),
-+      .suspend = lis302dl_suspend,
-+      .resume  = lis302dl_resume,
-+};
-+
-+static int __init lis302dl_init(void)
-+{
-+      return spi_register_driver(&lis302dl_driver);
-+}
-+
-+static void __exit lis302dl_exit(void)
-+{
-+      spi_unregister_driver(&lis302dl_driver);
-+}
-+
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_LICENSE("GPL");
-+
-+module_init(lis302dl_init);
-+module_exit(lis302dl_exit);
-diff --git a/include/linux/lis302dl.h b/include/linux/lis302dl.h
-new file mode 100644
-index 0000000..d0f31be
---- /dev/null
-+++ b/include/linux/lis302dl.h
-@@ -0,0 +1,11 @@
-+#ifndef _LINUX_LIS302DL_H
-+#define _LINUX_LIS302DL_H
-+
-+#include <linux/types.h>
-+
-+struct lis302dl_platform_data {
-+      char *name;
-+};
-+
-+#endif /* _LINUX_LIS302DL_H */
-+
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1039-gta02-leds.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1039-gta02-leds.patch.patch
deleted file mode 100644 (file)
index 5e5ad45..0000000
+++ /dev/null
@@ -1,276 +0,0 @@
-From b265be540c1169a5d6c32c5b09bb3f7b72a96a9d Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:35:53 +0100
-Subject: [PATCH] gta02-leds.patch
-
----
- drivers/leds/Kconfig              |    6 +
- drivers/leds/Makefile             |    1 +
- drivers/leds/leds-neo1973-gta02.c |  226 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 233 insertions(+), 0 deletions(-)
- create mode 100644 drivers/leds/leds-neo1973-gta02.c
-
-diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
-index 4579a88..2f95707 100644
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -120,6 +120,12 @@ config LEDS_NEO1973_VIBRATOR
-       help
-         This option enables support for the vibrator on the FIC Neo1973.
-+config LEDS_NEO1973_GTA02
-+      tristate "LED Support for the FIC Neo1973 (GTA02)"
-+      depends on LEDS_CLASS && MACH_NEO1973_GTA02
-+      help
-+        This option enables support for the LEDs on the FIC Neo1973.
-+
- comment "LED Triggers"
- config LEDS_TRIGGERS
-diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
-index f64332d..c4ff826 100644
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -20,6 +20,7 @@ obj-$(CONFIG_LEDS_COBALT_RAQ)                += leds-cobalt-raq.o
- obj-$(CONFIG_LEDS_GPIO)                       += leds-gpio.o
- obj-$(CONFIG_LEDS_CM_X270)              += leds-cm-x270.o
- obj-$(CONFIG_LEDS_NEO1973_VIBRATOR)   += leds-neo1973-vibrator.o
-+obj-$(CONFIG_LEDS_NEO1973_GTA02)      += leds-neo1973-gta02.o
- # LED Triggers
- obj-$(CONFIG_LEDS_TRIGGER_TIMER)      += ledtrig-timer.o
-diff --git a/drivers/leds/leds-neo1973-gta02.c b/drivers/leds/leds-neo1973-gta02.c
-new file mode 100644
-index 0000000..bf1d540
---- /dev/null
-+++ b/drivers/leds/leds-neo1973-gta02.c
-@@ -0,0 +1,226 @@
-+/*
-+ * LED driver for the FIC Neo1973 GTA02 GSM phone
-+ *
-+ * (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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 version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/leds.h>
-+#include <asm/hardware.h>
-+#include <asm/mach-types.h>
-+#include <asm/arch/pwm.h>
-+#include <asm/arch/gta02.h>
-+#include <asm/plat-s3c/regs-timer.h>
-+
-+#define MAX_LEDS 3
-+#define COUNTER 256
-+
-+struct gta02_led_priv
-+{
-+      struct mutex mutex;
-+      struct led_classdev cdev;
-+      struct s3c2410_pwm pwm;
-+      unsigned int gpio;
-+      unsigned int has_pwm;
-+};
-+
-+struct gta02_led_bundle
-+{
-+      int num_leds;
-+      struct gta02_led_priv led[MAX_LEDS];
-+};
-+
-+static inline struct gta02_led_priv *to_priv(struct led_classdev *led_cdev)
-+{
-+      return container_of(led_cdev, struct gta02_led_priv, cdev);
-+}
-+
-+static inline struct gta02_led_bundle *to_bundle(struct led_classdev *led_cdev)
-+{
-+      return dev_get_drvdata(led_cdev->dev);
-+}
-+
-+static void gta02led_set(struct led_classdev *led_cdev,
-+              enum led_brightness value)
-+{
-+      struct gta02_led_priv *lp = to_priv(led_cdev);
-+
-+      /*
-+       * value == 255 -> 99% duty cycle (full power)
-+       * value == 128 -> 50% duty cycle (medium power)
-+       * value == 0 -> 0% duty cycle (zero power)
-+       */
-+      mutex_lock(&lp->mutex);
-+      if (lp->has_pwm) {
-+                      s3c2410_pwm_duty_cycle(value, &lp->pwm);
-+      } else {
-+              if (value)
-+                      s3c2410_gpio_setpin(lp->gpio, 1);
-+              else
-+                      s3c2410_gpio_setpin(lp->gpio, 0);
-+      }
-+      mutex_unlock(&lp->mutex);
-+}
-+
-+#ifdef CONFIG_PM
-+static int gta02led_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+      struct gta02_led_bundle *bundle = platform_get_drvdata(pdev);
-+      int i;
-+
-+      for (i = 0; i < bundle->num_leds; i++)
-+              led_classdev_suspend(&bundle->led[i].cdev);
-+
-+      return 0;
-+}
-+
-+static int gta02led_resume(struct platform_device *pdev)
-+{
-+      struct gta02_led_bundle *bundle = platform_get_drvdata(pdev);
-+      int i;
-+
-+      for (i = 0; i < bundle->num_leds; i++)
-+              led_classdev_resume(&bundle->led[i].cdev);
-+
-+      return 0;
-+}
-+#endif
-+
-+static int __init gta02led_probe(struct platform_device *pdev)
-+{
-+      int i, rc;
-+      struct gta02_led_bundle *bundle;
-+
-+      if (!machine_is_neo1973_gta02())
-+              return -EIO;
-+
-+      bundle = kzalloc(sizeof(struct gta02_led_bundle), GFP_KERNEL);
-+      if (!bundle)
-+              return -ENOMEM;
-+      platform_set_drvdata(pdev, bundle);
-+
-+      for (i = 0; i < pdev->num_resources; i++) {
-+              struct gta02_led_priv *lp;
-+              struct resource *r;
-+
-+              if (i >= MAX_LEDS)
-+                      break;
-+
-+              r = platform_get_resource(pdev, 0, i);
-+              if (!r || !r->start || !r->name)
-+                      continue;
-+
-+              lp = &bundle->led[i];
-+
-+              lp->gpio = r->start;
-+              lp->cdev.name = r->name;
-+              lp->cdev.brightness_set = gta02led_set;
-+
-+              switch (lp->gpio) {
-+              case S3C2410_GPB0:
-+                      lp->has_pwm = 1;
-+                      lp->pwm.timerid = PWM0;
-+                      s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB0_TOUT0);
-+                      break;
-+              case S3C2410_GPB1:
-+                      lp->has_pwm = 1;
-+                      lp->pwm.timerid = PWM1;
-+                      s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB1_TOUT1);
-+                      break;
-+              case S3C2410_GPB2:
-+                      lp->has_pwm = 1;
-+                      lp->pwm.timerid = PWM2;
-+                      s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB2_TOUT2);
-+                      break;
-+              case S3C2410_GPB3:
-+                      lp->has_pwm = 1;
-+                      lp->pwm.timerid = PWM3;
-+                      s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB3_TOUT3);
-+                      break;
-+              default:
-+                      break;
-+              }
-+
-+              lp->pwm.prescaler = 0;
-+              lp->pwm.divider = S3C2410_TCFG1_MUX3_DIV8;
-+              lp->pwm.counter = COUNTER;
-+              lp->pwm.comparer = COUNTER;
-+              s3c2410_pwm_enable(&lp->pwm);
-+              s3c2410_pwm_start(&lp->pwm);
-+
-+              switch (lp->gpio) {
-+              case S3C2410_GPB0:
-+              case S3C2410_GPB1:
-+              case S3C2410_GPB2:
-+                      lp->has_pwm = 0;
-+                      s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPIO_OUTPUT);
-+                      s3c2410_gpio_setpin(lp->gpio, 0);
-+                      break;
-+              default:
-+                      break;
-+              }
-+
-+              mutex_init(&lp->mutex);
-+              rc = led_classdev_register(&pdev->dev, &lp->cdev);
-+      }
-+
-+      return 0;
-+}
-+
-+static int gta02led_remove(struct platform_device *pdev)
-+{
-+      struct gta02_led_bundle *bundle = platform_get_drvdata(pdev);
-+      int i;
-+
-+      for (i = 0; i < bundle->num_leds; i++) {
-+              struct gta02_led_priv *lp = &bundle->led[i];
-+              if (lp->has_pwm)
-+                      s3c2410_pwm_disable(&lp->pwm);
-+
-+              led_classdev_unregister(&lp->cdev);
-+              mutex_destroy(&lp->mutex);
-+      }
-+
-+      platform_set_drvdata(pdev, NULL);
-+      kfree(bundle);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver gta02led_driver = {
-+      .probe          = gta02led_probe,
-+      .remove         = gta02led_remove,
-+#ifdef CONFIG_PM
-+      .suspend        = gta02led_suspend,
-+      .resume         = gta02led_resume,
-+#endif
-+      .driver         = {
-+              .name           = "gta02-led",
-+      },
-+};
-+
-+static int __init gta02led_init(void)
-+{
-+      return platform_driver_register(&gta02led_driver);
-+}
-+
-+static void __exit gta02led_exit(void)
-+{
-+      platform_driver_unregister(&gta02led_driver);
-+}
-+
-+module_init(gta02led_init);
-+module_exit(gta02led_exit);
-+
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_DESCRIPTION("FIC Neo1973 GTA02 LED driver");
-+MODULE_LICENSE("GPL");
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1040-gta02-acc.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1040-gta02-acc.patch.patch
deleted file mode 100644 (file)
index fdf024f..0000000
+++ /dev/null
@@ -1,1023 +0,0 @@
-From 54bb0bfc6105dc7842d31ab67bd6afb6de0a6a28 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:36:01 +0100
-Subject: [PATCH] gta02-acc.patch
-
----
- arch/arm/mach-s3c2410/mach-gta01.c      |    2 +-
- arch/arm/mach-s3c2410/mach-qt2410.c     |    2 +-
- arch/arm/mach-s3c2440/mach-gta02.c      |  181 +++++++++++++++--
- drivers/input/misc/lis302dl.c           |  350 ++++++++++++-------------------
- drivers/spi/spi_s3c24xx_gpio.c          |   13 +-
- include/asm-arm/arch-s3c2410/spi-gpio.h |    3 +-
- include/linux/lis302dl.h                |  102 +++++++++
- 7 files changed, 415 insertions(+), 238 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index 87bb189..0543daa 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -510,7 +510,7 @@ static struct spi_board_info gta01_spi_board_info[] = {
-       },
- };
--static void spi_gpio_cs(struct s3c2410_spigpio_info *spi, int cs)
-+static void spi_gpio_cs(struct s3c2410_spigpio_info *spi, int csidx, int cs)
- {
-       switch (cs) {
-       case BITBANG_CS_ACTIVE:
-diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c
-index a1caf4b..6f7b56d 100644
---- a/arch/arm/mach-s3c2410/mach-qt2410.c
-+++ b/arch/arm/mach-s3c2410/mach-qt2410.c
-@@ -214,7 +214,7 @@ static struct platform_device qt2410_led = {
- /* SPI */
--static void spi_gpio_cs(struct s3c2410_spigpio_info *spi, int cs)
-+static void spi_gpio_cs(struct s3c2410_spigpio_info *spi, int csidx, int cs)
- {
-       switch (cs) {
-       case BITBANG_CS_ACTIVE:
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index d11da10..3fbb131 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -78,6 +78,9 @@
- #include <linux/glamofb.h>
-+/* arbitrates which sensor IRQ owns the shared SPI bus */
-+static spinlock_t motion_irq_lock;
-+
- static struct map_desc gta02_iodesc[] __initdata = {
-       {
-               .virtual        = 0xe0000000,
-@@ -377,8 +380,6 @@ static struct platform_device *gta02_devices[] __initdata = {
-       &s3c_device_usbgadget,
-       &s3c_device_nand,
-       &s3c_device_ts,
--      &s3c_device_spi0,
--      &s3c_device_spi1,
-       &gta02_nor_flash,
- };
-@@ -478,10 +479,12 @@ static struct spi_board_info gta02_spi_board_info[] = {
-       },
- };
-+#if 0 /* currently this is not used and we use gpio spi */
- static struct glamo_spi_info glamo_spi_cfg = {
-       .board_size     = ARRAY_SIZE(gta02_spi_board_info),
-       .board_info     = gta02_spi_board_info,
- };
-+#endif /* 0 */
- static struct glamo_spigpio_info glamo_spigpio_cfg = {
-       .pin_clk        = GLAMO_GPIO10_OUTPUT,
-@@ -507,16 +510,99 @@ static struct platform_device gta01_led_dev = {
- /* SPI: Accelerometers attached to SPI of s3c244x */
--static void gta02_spi_acc_set_cs(struct s3c2410_spi_info *spi, int cs, int pol)
-+/*
-+ * Situation is that Linux SPI can't work in an interrupt context, so we
-+ * implement our own bitbang here.  Arbitration is needed because not only
-+ * can this interrupt happen at any time even if foreground wants to use
-+ * the bitbang API from Linux, but multiple motion sensors can be on the
-+ * same SPI bus, and multiple interrupts can happen.
-+ *
-+ * Foreground / interrupt arbitration is okay because the interrupts are
-+ * disabled around all the foreground SPI code.
-+ *
-+ * Interrupt / Interrupt arbitration is evidently needed, otherwise we
-+ * lose edge-triggered service after a while due to the two sensors sharing
-+ * the SPI bus having irqs at the same time eventually.
-+ *
-+ * Servicing is typ 75 - 100us at 400MHz.
-+ */
-+
-+/* #define DEBUG_SPEW_MS */
-+#define MG_PER_SAMPLE 18
-+
-+void gat02_lis302dl_bitbang_read(struct lis302dl_info *lis)
- {
--      s3c2410_gpio_setpin(cs, pol);
-+      struct lis302dl_platform_data *pdata = lis->pdata;
-+      u8 shifter = 0xc0 | LIS302DL_REG_OUT_X; /* read, autoincrement */
-+      int n, n1;
-+      unsigned long flags;
-+#ifdef DEBUG_SPEW_MS
-+      s8 x, y, z;
-+#endif
-+
-+      spin_lock_irqsave(&motion_irq_lock, flags);
-+      s3c2410_gpio_setpin(pdata->pin_chip_select, 0);
-+      for (n = 0; n < 8; n++) { /* write the r/w, inc and address */
-+              s3c2410_gpio_setpin(pdata->pin_clk, 0);
-+              s3c2410_gpio_setpin(pdata->pin_mosi, (shifter >> 7) & 1);
-+              s3c2410_gpio_setpin(pdata->pin_clk, 1);
-+              shifter <<= 1;
-+      }
-+      for (n = 0; n < 5; n++) { /* 5 consequetive registers */
-+              for (n1 = 0; n1 < 8; n1++) { /* 8 bits each */
-+                      s3c2410_gpio_setpin(pdata->pin_clk, 0);
-+                      s3c2410_gpio_setpin(pdata->pin_clk, 1);
-+                      shifter <<= 1;
-+                      if (s3c2410_gpio_getpin(pdata->pin_miso))
-+                              shifter |= 1;
-+              }
-+              switch (n) {
-+              case 0:
-+#ifdef DEBUG_SPEW_MS
-+                      x = shifter;
-+#endif
-+                      input_report_rel(lis->input_dev, REL_X, MG_PER_SAMPLE * (s8)shifter);
-+                      break;
-+              case 2:
-+#ifdef DEBUG_SPEW_MS
-+                      y = shifter;
-+#endif
-+                      input_report_rel(lis->input_dev, REL_Y, MG_PER_SAMPLE * (s8)shifter);
-+                      break;
-+              case 4:
-+#ifdef DEBUG_SPEW_MS
-+                      z = shifter;
-+#endif
-+                      input_report_rel(lis->input_dev, REL_Z, MG_PER_SAMPLE * (s8)shifter);
-+                      break;
-+              }
-+      }
-+      s3c2410_gpio_setpin(pdata->pin_chip_select, 1);
-+      spin_unlock_irqrestore(&motion_irq_lock, flags);
-+      input_sync(lis->input_dev);
-+#ifdef DEBUG_SPEW_MS
-+      printk("%s: %d %d %d\n", pdata->name, x, y, z);
-+#endif
- }
--static const struct lis302dl_platform_data lis302_pdata[] = {
-+
-+struct lis302dl_platform_data lis302_pdata[] = {
-       {
--              .name           = "lis302-1 (top)"
-+              .name           = "lis302-1 (top)",
-+              .pin_chip_select= S3C2410_GPD12,
-+              .pin_clk        = S3C2410_GPG7,
-+              .pin_mosi       = S3C2410_GPG6,
-+              .pin_miso       = S3C2410_GPG5,
-+              .open_drain     = 1, /* altered at runtime by PCB rev */
-+              .lis302dl_bitbang_read = gat02_lis302dl_bitbang_read,
-       }, {
--              .name           = "lis302-2 (bottom)"
-+              .name           = "lis302-2 (bottom)",
-+              .pin_chip_select= S3C2410_GPD13,
-+              .pin_clk        = S3C2410_GPG7,
-+              .pin_mosi       = S3C2410_GPG6,
-+              .pin_miso       = S3C2410_GPG5,
-+              .open_drain     = 1, /* altered at runtime by PCB rev */
-+              .lis302dl_bitbang_read = gat02_lis302dl_bitbang_read,
-       },
- };
-@@ -525,26 +611,75 @@ static struct spi_board_info gta02_spi_acc_bdinfo[] = {
-               .modalias       = "lis302dl",
-               .platform_data  = &lis302_pdata[0],
-               .irq            = GTA02_IRQ_GSENSOR_1,
--              .max_speed_hz   = 400 * 1000,
-+              .max_speed_hz   = 10 * 1000 * 1000,
-               .bus_num        = 1,
--              .chip_select    = S3C2410_GPD12,
-+              .chip_select    = 0,
-               .mode           = SPI_MODE_3,
-       },
-       {
-               .modalias       = "lis302dl",
-               .platform_data  = &lis302_pdata[1],
-               .irq            = GTA02_IRQ_GSENSOR_2,
--              .max_speed_hz   = 400 * 1000,
-+              .max_speed_hz   = 10 * 1000 * 1000,
-               .bus_num        = 1,
--              .chip_select    = S3C2410_GPD13,
-+              .chip_select    = 1,
-               .mode           = SPI_MODE_3,
-       },
- };
--static struct s3c2410_spi_info gta02_spi_acc_cfg = {
--      .set_cs         = gta02_spi_acc_set_cs,
-+static void spi_acc_cs(struct s3c2410_spigpio_info *spigpio_info,
-+                     int csid, int cs)
-+{
-+      struct lis302dl_platform_data * plat_data =
-+                              (struct lis302dl_platform_data *)spigpio_info->
-+                                                   board_info->platform_data;
-+      switch (cs) {
-+      case BITBANG_CS_ACTIVE:
-+              s3c2410_gpio_setpin(plat_data[csid].pin_chip_select, 0);
-+              break;
-+      case BITBANG_CS_INACTIVE:
-+              s3c2410_gpio_setpin(plat_data[csid].pin_chip_select, 1);
-+              break;
-+      }
-+}
-+
-+static struct s3c2410_spigpio_info spi_gpio_cfg = {
-+      .pin_clk        = S3C2410_GPG7,
-+      .pin_mosi       = S3C2410_GPG6,
-+      .pin_miso       = S3C2410_GPG5,
-       .board_size     = ARRAY_SIZE(gta02_spi_acc_bdinfo),
-       .board_info     = gta02_spi_acc_bdinfo,
-+      .chip_select    = &spi_acc_cs,
-+      .num_chipselect = 2,
-+};
-+
-+static struct resource s3c_spi_acc_resource[] = {
-+      [0] = {
-+              .start = S3C2410_GPG3,
-+              .end   = S3C2410_GPG3,
-+      },
-+      [1] = {
-+              .start = S3C2410_GPG5,
-+              .end   = S3C2410_GPG5,
-+      },
-+      [2] = {
-+              .start = S3C2410_GPG6,
-+              .end   = S3C2410_GPG6,
-+      },
-+      [3] = {
-+              .start = S3C2410_GPG7,
-+              .end   = S3C2410_GPG7,
-+      },
-+};
-+
-+static struct platform_device s3c_device_spi_acc = {
-+      .name             = "spi_s3c24xx_gpio",
-+      .id               = 1,
-+      .num_resources    = ARRAY_SIZE(s3c_spi_acc_resource),
-+      .resource         = s3c_spi_acc_resource,
-+      .dev = {
-+              .platform_data = &spi_gpio_cfg,
-+      },
- };
- static struct resource gta02_led_resources[] = {
-@@ -786,10 +921,21 @@ static void __init gta02_machine_init(void)
- {
-       int rc;
-+      switch (system_rev) {
-+      case GTA02v6_SYSTEM_REV:
-+              /* we need push-pull interrupt from motion sensors */
-+              lis302_pdata[0].open_drain = 0;
-+              lis302_pdata[1].open_drain = 0;
-+              break;
-+      default:
-+              break;
-+      }
-+
-+      spin_lock_init(&motion_irq_lock);
-+
-       s3c_device_usb.dev.platform_data = &gta02_usb_info;
-       s3c_device_nand.dev.platform_data = &gta02_nand_info;
-       s3c_device_sdi.dev.platform_data = &gta02_mmc_cfg;
--      s3c_device_spi1.dev.platform_data = &gta02_spi_acc_cfg;
-       /* Only GTA02v1 has a SD_DETECT GPIO.  Since the slot is not
-        * hot-pluggable, this is not required anyway */
-@@ -801,6 +947,12 @@ static void __init gta02_machine_init(void)
-               break;
-       }
-+      /* acc sensor chip selects */
-+      s3c2410_gpio_setpin(S3C2410_GPD12, 1);
-+      s3c2410_gpio_cfgpin(S3C2410_GPD12, S3C2410_GPIO_OUTPUT);
-+      s3c2410_gpio_setpin(S3C2410_GPD13, 1);
-+      s3c2410_gpio_cfgpin(S3C2410_GPD13, S3C2410_GPIO_OUTPUT);
-+
-       INIT_WORK(&gta02_udc_vbus_drawer.work, __gta02_udc_vbus_draw);
-       s3c24xx_udc_set_platdata(&gta02_udc_cfg);
-       set_s3c2410ts_info(&gta02_ts_cfg);
-@@ -829,6 +981,7 @@ static void __init gta02_machine_init(void)
-               break;
-       }
-+      platform_device_register(&s3c_device_spi_acc);
-       platform_device_register(&gta01_button_dev);
-       platform_device_register(&gta01_pm_gsm_dev);
-diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
-index 45c41c8..36bdcf7 100644
---- a/drivers/input/misc/lis302dl.c
-+++ b/drivers/input/misc/lis302dl.c
-@@ -33,117 +33,26 @@
- #include <linux/device.h>
- #include <linux/platform_device.h>
- #include <linux/delay.h>
--#include <linux/input.h>
- #include <linux/irq.h>
- #include <linux/interrupt.h>
- #include <linux/sysfs.h>
- #include <linux/lis302dl.h>
--#include <linux/spi/spi.h>
--
--#define LIS302DL_WHO_AM_I_MAGIC               0x3b
--
--enum lis302dl_reg {
--      LIS302DL_REG_WHO_AM_I           = 0x0f,
--      LIS302DL_REG_CTRL1              = 0x20,
--      LIS302DL_REG_CTRL2              = 0x21,
--      LIS302DL_REG_CTRL3              = 0x22,
--      LIS302DL_REG_HP_FILTER_RESET    = 0x23,
--      LIS302DL_REG_STATUS             = 0x27,
--      LIS302DL_REG_OUT_X              = 0x29,
--      LIS302DL_REG_OUT_Y              = 0x2b,
--      LIS302DL_REG_OUT_Z              = 0x2d,
--      LIS302DL_REG_FF_WU_CFG_1        = 0x30,
--      LIS302DL_REG_FF_WU_SRC_1        = 0x31,
--      LIS302DL_REG_FF_WU_THS_1        = 0x32,
--      LIS302DL_REG_FF_WU_DURATION_1   = 0x33,
--      LIS302DL_REG_FF_WU_CFG_2        = 0x34,
--      LIS302DL_REG_FF_WU_SRC_2        = 0x35,
--      LIS302DL_REG_FF_WU_THS_2        = 0x36,
--      LIS302DL_REG_FF_WU_DURATION_2   = 0x37,
--      LIS302DL_REG_CLICK_CFG          = 0x38,
--      LIS302DL_REG_CLICK_SRC          = 0x39,
--      LIS302DL_REG_CLICK_THSY_X       = 0x3b,
--      LIS302DL_REG_CLICK_THSZ         = 0x3c,
--      LIS302DL_REG_CLICK_TIME_LIMIT   = 0x3d,
--      LIS302DL_REG_CLICK_LATENCY      = 0x3e,
--      LIS302DL_REG_CLICK_WINDOW       = 0x3f,
--};
--
--enum lis302dl_reg_ctrl1 {
--      LIS302DL_CTRL1_Xen              = 0x01,
--      LIS302DL_CTRL1_Yen              = 0x02,
--      LIS302DL_CTRL1_Zen              = 0x04,
--      LIS302DL_CTRL1_STM              = 0x08,
--      LIS302DL_CTRL1_STP              = 0x10,
--      LIS302DL_CTRL1_FS               = 0x20,
--      LIS302DL_CTRL1_PD               = 0x40,
--      LIS302DL_CTRL1_DR               = 0x80,
--};
--
--enum lis302dl_reg_ctrl3 {
--      LIS302DL_CTRL3_PP_OD            = 0x40,
--};
--
--enum lis302dl_reg_status {
--      LIS302DL_STATUS_XDA             = 0x01,
--      LIS302DL_STATUS_YDA             = 0x02,
--      LIS302DL_STATUS_ZDA             = 0x04,
--      LIS302DL_STATUS_XYZDA           = 0x08,
--      LIS302DL_STATUS_XOR             = 0x10,
--      LIS302DL_STATUS_YOR             = 0x20,
--      LIS302DL_STATUS_ZOR             = 0x40,
--      LIS302DL_STATUS_XYZOR           = 0x80,
--};
--
--enum lis302dl_reg_ffwusrc1 {
--      LIS302DL_FFWUSRC1_XL            = 0x01,
--      LIS302DL_FFWUSRC1_XH            = 0x02,
--      LIS302DL_FFWUSRC1_YL            = 0x04,
--      LIS302DL_FFWUSRC1_YH            = 0x08,
--      LIS302DL_FFWUSRC1_ZL            = 0x10,
--      LIS302DL_FFWUSRC1_ZH            = 0x20,
--      LIS302DL_FFWUSRC1_IA            = 0x40,
--};
--
--enum lis302dl_reg_cloik_src {
--      LIS302DL_CLICKSRC_SINGLE_X      = 0x01,
--      LIS302DL_CLICKSRC_DOUBLE_X      = 0x02,
--      LIS302DL_CLICKSRC_SINGLE_Y      = 0x04,
--      LIS302DL_CLICKSRC_DOUBLE_Y      = 0x08,
--      LIS302DL_CLICKSRC_SINGLE_Z      = 0x10,
--      LIS302DL_CLICKSRC_DOUBLE_Z      = 0x20,
--      LIS302DL_CLICKSRC_IA            = 0x40,
--};
--
--struct lis302dl_info {
--      struct spi_device *spi_dev;
--      struct input_dev *input_dev;
--      struct mutex lock;
--      struct work_struct work;
--      unsigned int flags;
--      unsigned int working;
--      u_int8_t regs[0x40];
--};
--
--#define LIS302DL_F_WUP_FF             0x0001  /* wake up from free fall */
--#define LIS302DL_F_WUP_CLICK          0x0002
--#define LIS302DL_F_POWER              0x0010
--#define LIS302DL_F_FS                 0x0020  /* ADC full scale */
--
- /* lowlevel register access functions */
--#define READ_BIT      0x01
--#define MS_BIT                0x02
--#define ADDR_SHIFT    2
-+#define READ_BIT              0x80
-+#define READ_BIT_INC_ADS      0xc0
-+#define       ADDR_MASK               0x3f
--static inline u_int8_t __reg_read(struct lis302dl_info *lis, u_int8_t reg)
-+static u_int8_t __reg_read(struct lis302dl_info *lis, u_int8_t reg)
- {
-       int rc;
-       u_int8_t cmd;
--      cmd = (reg << ADDR_SHIFT) | READ_BIT;
-+      BUG_ON(reg & ~ADDR_MASK);
-+
-+      cmd = reg | READ_BIT;
-       rc = spi_w8r8(lis->spi_dev, cmd);
-@@ -161,11 +70,13 @@ static u_int8_t reg_read(struct lis302dl_info *lis, u_int8_t reg)
-       return ret;
- }
--static inline int __reg_write(struct lis302dl_info *lis, u_int8_t reg, u_int8_t val)
-+static int __reg_write(struct lis302dl_info *lis, u_int8_t reg, u_int8_t val)
- {
-       u_int8_t buf[2];
--      buf[0] = (reg << ADDR_SHIFT);
-+      BUG_ON(reg & ~ADDR_MASK);
-+
-+      buf[0] = reg;
-       buf[1] = val;
-       return spi_write(lis->spi_dev, buf, sizeof(buf));
-@@ -207,10 +118,10 @@ static int reg_set_bit_mask(struct lis302dl_info *lis,
- enum lis302dl_intmode {
-       LIS302DL_INTMODE_GND            = 0x00,
-       LIS302DL_INTMODE_FF_WU_1        = 0x01,
--      LIX302DL_INTMODE_FF_WU_2        = 0x02,
--      LIX302DL_INTMODE_FF_WU_12       = 0x03,
--      LIX302DL_INTMODE_DATA_READY     = 0x04,
--      LIX302DL_INTMODE_CLICK          = 0x07,
-+      LIS302DL_INTMODE_FF_WU_2        = 0x02,
-+      LIS302DL_INTMODE_FF_WU_12       = 0x03,
-+      LIS302DL_INTMODE_DATA_READY     = 0x04,
-+      LIS302DL_INTMODE_CLICK          = 0x07,
- };
- static void lis302dl_int_mode(struct spi_device *spi, int int_pin,
-@@ -218,12 +129,18 @@ static void lis302dl_int_mode(struct spi_device *spi, int int_pin,
- {
-       struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
--      if (int_pin == 1)
-+      switch (int_pin) {
-+      case 1:
-               reg_set_bit_mask(lis, LIS302DL_REG_CTRL3, 0x07, mode);
--      else if (int_pin == 2)
-+              break;
-+      case 2:
-               reg_set_bit_mask(lis, LIS302DL_REG_CTRL3, 0x38, mode << 3);
-+              break;
-+      default:
-+              BUG();
-+      }
- }
--
-+#if 0
- static void _report_btn_single(struct input_dev *inp, int btn)
- {
-       input_report_key(inp, btn, 1);
-@@ -241,95 +158,14 @@ static void _report_btn_double(struct input_dev *inp, int btn)
-       input_sync(inp);
-       input_report_key(inp, btn, 0);
- }
-+#endif
--static void lis302dl_work(struct work_struct *work)
--{
--      struct lis302dl_info *lis =
--                      container_of(work, struct lis302dl_info, work);
--
--      u_int8_t status, ff_wu_src_1, click_src;
--      u_int8_t val;
--
--      lis->working = 1;
--
--      status = reg_read(lis, LIS302DL_REG_STATUS);
--      ff_wu_src_1 = reg_read(lis, LIS302DL_REG_FF_WU_SRC_1);
--      click_src = reg_read(lis, LIS302DL_REG_CLICK_SRC);
--
--      if (status & LIS302DL_STATUS_XDA) {
--              val = reg_read(lis, LIS302DL_REG_OUT_X);
--              if (lis->flags & LIS302DL_F_FS)
--                      val = val << 2;
--              input_report_rel(lis->input_dev, REL_X, val);
--      }
--
--      if (status & LIS302DL_STATUS_YDA) {
--              val = reg_read(lis, LIS302DL_REG_OUT_Y);
--              if (lis->flags & LIS302DL_F_FS)
--                      val = val << 2;
--              input_report_rel(lis->input_dev, REL_Y, val);
--      }
--
--      if (status & LIS302DL_STATUS_ZDA) {
--              val = reg_read(lis, LIS302DL_REG_OUT_Z);
--              if (lis->flags & LIS302DL_F_FS)
--                      val = val << 2;
--              input_report_rel(lis->input_dev, REL_Z, val);
--      }
--
--      if (status & 0xf0)
--              dev_dbg(&lis->spi_dev->dev, "overrun!\n");
--
--      /* FIXME: implement overrun statistics */
--
--      if (ff_wu_src_1 & LIS302DL_FFWUSRC1_IA) {
--              /* FIXME: free fall interrupt handling */
--      }
--
--      if (click_src & LIS302DL_CLICKSRC_IA) {
--              if (click_src & LIS302DL_CLICKSRC_SINGLE_X)
--                      _report_btn_single(lis->input_dev, BTN_X);
--              if (click_src & LIS302DL_CLICKSRC_DOUBLE_X)
--                      _report_btn_double(lis->input_dev, BTN_X);
--
--              if (click_src & LIS302DL_CLICKSRC_SINGLE_Y)
--                      _report_btn_single(lis->input_dev, BTN_Y);
--              if (click_src & LIS302DL_CLICKSRC_DOUBLE_Y)
--                      _report_btn_double(lis->input_dev, BTN_Y);
--
--              if (click_src & LIS302DL_CLICKSRC_SINGLE_Z)
--                      _report_btn_single(lis->input_dev, BTN_Z);
--              if (click_src & LIS302DL_CLICKSRC_DOUBLE_Z)
--                      _report_btn_double(lis->input_dev, BTN_Z);
--      }
--
--      lis->working = 0;
--      input_sync(lis->input_dev);
--      put_device(&lis->spi_dev->dev);
--
--      enable_irq(lis->spi_dev->irq);
--}
--
--static void lis302dl_schedule_work(struct lis302dl_info *lis)
--{
--      int status;
--
--      get_device(&lis->spi_dev->dev);
--      status = schedule_work(&lis->work);
--      if (!status && !lis->working)
--              dev_dbg(&lis->spi_dev->dev, "work item may be lost\n");
--}
- static irqreturn_t lis302dl_interrupt(int irq, void *_lis)
- {
-       struct lis302dl_info *lis = _lis;
--      lis302dl_schedule_work(lis);
--
--      /* Disable any further interrupts until we have processed
--       * the current one */
--      disable_irq(lis->spi_dev->irq);
--
-+      (lis->pdata->lis302dl_bitbang_read)(lis);
-       return IRQ_HANDLED;
- }
-@@ -388,6 +224,7 @@ static DEVICE_ATTR(full_scale, S_IRUGO | S_IWUSR, show_scale, set_scale);
- static struct attribute *lis302dl_sysfs_entries[] = {
-       &dev_attr_sample_rate.attr,
-       &dev_attr_full_scale.attr,
-+      NULL
- };
- static struct attribute_group lis302dl_attr_group = {
-@@ -402,9 +239,16 @@ static int lis302dl_input_open(struct input_dev *inp)
-       struct lis302dl_info *lis = inp->private;
-       u_int8_t ctrl1 = LIS302DL_CTRL1_PD | LIS302DL_CTRL1_Xen |
-                        LIS302DL_CTRL1_Yen | LIS302DL_CTRL1_Zen;
-+      unsigned long flags;
-+      local_save_flags(flags);
-       /* make sure we're powered up and generate data ready */
-       reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, ctrl1, ctrl1);
-+      local_irq_restore(flags);
-+
-+      /* kick it off -- since we are edge triggered, if we missed the edge
-+       * permanent low interrupt is death for us */
-+      (lis->pdata->lis302dl_bitbang_read)(lis);
-       return 0;
- }
-@@ -414,9 +258,12 @@ static void lis302dl_input_close(struct input_dev *inp)
-       struct lis302dl_info *lis = inp->private;
-       u_int8_t ctrl1 = LIS302DL_CTRL1_Xen | LIS302DL_CTRL1_Yen |
-                        LIS302DL_CTRL1_Zen;
-+      unsigned long flags;
-+
-+      local_save_flags(flags);
-       /* since the input core already serializes access and makes sure we
--       * only see close() for the close of the lastre user, we can safely
-+       * only see close() for the close of the last user, we can safely
-        * disable the data ready events */
-       reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, ctrl1, 0x00);
-@@ -426,6 +273,7 @@ static void lis302dl_input_close(struct input_dev *inp)
-               reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD,
-                                0x00);
-       }
-+      local_irq_restore(flags);
- }
- static int __devinit lis302dl_probe(struct spi_device *spi)
-@@ -433,84 +281,138 @@ static int __devinit lis302dl_probe(struct spi_device *spi)
-       int rc;
-       struct lis302dl_info *lis;
-       u_int8_t wai;
-+      unsigned long flags;
-+      struct lis302dl_platform_data *pdata;
-       lis = kzalloc(sizeof(*lis), GFP_KERNEL);
-       if (!lis)
-               return -ENOMEM;
-+      local_save_flags(flags);
-+
-       mutex_init(&lis->lock);
--      INIT_WORK(&lis->work, lis302dl_work);
-       lis->spi_dev = spi;
-       spi_set_drvdata(spi, lis);
-+      pdata = spi->dev.platform_data;
-+
-       rc = spi_setup(spi);
-       if (rc < 0) {
--              printk(KERN_ERR "error durign spi_setup of lis302dl driver\n");
-+              dev_err(&spi->dev, "error during spi_setup\n");
-               dev_set_drvdata(&spi->dev, NULL);
--              kfree(lis);
--              return rc;
-+              goto bail_free_lis;
-       }
-       wai = reg_read(lis, LIS302DL_REG_WHO_AM_I);
-       if (wai != LIS302DL_WHO_AM_I_MAGIC) {
--              printk(KERN_ERR "unknown who_am_i signature 0x%02x\n", wai);
-+              dev_err(&spi->dev, "unknown who_am_i signature 0x%02x\n", wai);
-               dev_set_drvdata(&spi->dev, NULL);
--              kfree(lis);
--              return -ENODEV;
--      }
--
--      /* switch interrupt to open collector */
--      reg_write(lis, LIS302DL_CTRL3_PP_OD, 0x7c);
--
--      rc = request_irq(lis->spi_dev->irq, lis302dl_interrupt, IRQF_DISABLED,
--                       "lis302dl", NULL);
--      if (rc < 0) {
--              dev_err(&spi->dev, "error requesting IRQ %d\n",
--                      lis->spi_dev->irq);
--              /* FIXME */
--              return rc;
-+              rc = -ENODEV;
-+              goto bail_free_lis;
-       }
-       rc = sysfs_create_group(&spi->dev.kobj, &lis302dl_attr_group);
-       if (rc) {
-               dev_err(&spi->dev, "error creating sysfs group\n");
--              /* FIXME */
--              return rc;
-+              goto bail_free_lis;
-       }
-       /* initialize input layer details */
-       lis->input_dev = input_allocate_device();
-       if (!lis->input_dev) {
-               dev_err(&spi->dev, "Unable to allocate input device\n");
--              /* FIXME */
-+              goto bail_sysfs;
-       }
-       set_bit(EV_REL, lis->input_dev->evbit);
--      set_bit(EV_KEY, lis->input_dev->evbit);
-+      set_bit(REL_X, lis->input_dev->relbit);
-+      set_bit(REL_Y, lis->input_dev->relbit);
-+      set_bit(REL_Z, lis->input_dev->relbit);
-+/*    set_bit(EV_KEY, lis->input_dev->evbit);
-       set_bit(BTN_X, lis->input_dev->keybit);
-       set_bit(BTN_Y, lis->input_dev->keybit);
-       set_bit(BTN_Z, lis->input_dev->keybit);
--
-+*/
-       lis->input_dev->private = lis;
--      lis->input_dev->name = "lis302dl"; /* FIXME: platform data */
--      lis->input_dev->id.bustype = BUS_I2C; /* FIXME: SPI Bus */
-+      lis->input_dev->name = pdata->name;
-+       /* SPI Bus not defined as a valid bus for input subsystem*/
-+      lis->input_dev->id.bustype = BUS_I2C; /* lie about it */
-       lis->input_dev->open = lis302dl_input_open;
-       lis->input_dev->close = lis302dl_input_close;
--      input_register_device(lis->input_dev);
-+      rc = input_register_device(lis->input_dev);
-+      if (rc) {
-+              dev_err(&spi->dev, "error %d registering input device\n", rc);
-+              goto bail_inp_dev;
-+      }
-+
-+      reg_write(lis, LIS302DL_REG_CTRL1, 0x47);
-+      reg_write(lis, LIS302DL_REG_CTRL3, 0xc0);
-+      reg_write(lis, LIS302DL_REG_FF_WU_THS_1, 0x14);
-+      reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1, 0x00);
-+      reg_write(lis, LIS302DL_REG_FF_WU_CFG_1, 0x95);
-+
-+      reg_write(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_Xen |
-+                                         LIS302DL_CTRL1_Yen |
-+                                         LIS302DL_CTRL1_Zen);
-+
-+      if (pdata->open_drain)
-+              /* switch interrupt to open collector, active-low */
-+              reg_write(lis, LIS302DL_REG_CTRL3, LIS302DL_CTRL3_PP_OD |
-+                                                 LIS302DL_CTRL3_IHL);
-+      else
-+              /* push-pull, active-low */
-+              reg_write(lis, LIS302DL_REG_CTRL3, LIS302DL_CTRL3_IHL);
-+
-+      lis302dl_int_mode(spi, 1, LIS302DL_INTMODE_DATA_READY);
-+      lis302dl_int_mode(spi, 2, LIS302DL_INTMODE_DATA_READY);
-+
-+      reg_read(lis, LIS302DL_REG_STATUS);
-+      reg_read(lis, LIS302DL_REG_FF_WU_SRC_1);
-+      reg_read(lis, LIS302DL_REG_FF_WU_SRC_2);
-+      reg_read(lis, LIS302DL_REG_CLICK_SRC);
-+      dev_info(&spi->dev, "Found %s\n", pdata->name);
-+
-+      lis->pdata = pdata;
-+
-+      rc = request_irq(lis->spi_dev->irq, lis302dl_interrupt,
-+                       IRQF_TRIGGER_FALLING, "lis302dl", lis);
-+      if (rc < 0) {
-+              dev_err(&spi->dev, "error requesting IRQ %d\n",
-+                      lis->spi_dev->irq);
-+              goto bail_inp_reg;
-+      }
-+      local_irq_restore(flags);
-       return 0;
-+
-+bail_inp_reg:
-+      input_unregister_device(lis->input_dev);
-+bail_inp_dev:
-+      input_free_device(lis->input_dev);
-+bail_sysfs:
-+      sysfs_remove_group(&spi->dev.kobj, &lis302dl_attr_group);
-+bail_free_lis:
-+      kfree(lis);
-+      local_irq_restore(flags);
-+      return rc;
- }
- static int __devexit lis302dl_remove(struct spi_device *spi)
- {
-       struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-+      unsigned long flags;
-       /* power down the device */
-+      local_save_flags(flags);
-       reg_write(lis, LIS302DL_REG_CTRL1, 0x00);
-+      local_irq_restore(flags);
-+
-       sysfs_remove_group(&spi->dev.kobj, &lis302dl_attr_group);
-       input_unregister_device(lis->input_dev);
-+      if (lis->input_dev)
-+              input_free_device(lis->input_dev);
-       dev_set_drvdata(&spi->dev, NULL);
-       kfree(lis);
-@@ -521,6 +423,10 @@ static int __devexit lis302dl_remove(struct spi_device *spi)
- static int lis302dl_suspend(struct spi_device *spi, pm_message_t state)
- {
-       struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-+      unsigned long flags;
-+
-+      disable_irq(lis->spi_dev->irq);
-+      local_save_flags(flags);
-       /* save registers */
-       lis->regs[LIS302DL_REG_CTRL1] = reg_read(lis, LIS302DL_REG_CTRL1);
-@@ -561,12 +467,17 @@ static int lis302dl_suspend(struct spi_device *spi, pm_message_t state)
-               reg_write(lis, LIS302DL_REG_CTRL1, tmp);
-       }
-+      local_irq_restore(flags);
-+
-       return 0;
- }
- static int lis302dl_resume(struct spi_device *spi)
- {
-       struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-+      unsigned long flags;
-+
-+      local_save_flags(flags);
-       /* restore registers after resume */
-       reg_write(lis, LIS302DL_REG_CTRL1, lis->regs[LIS302DL_REG_CTRL1]);
-@@ -597,6 +508,9 @@ static int lis302dl_resume(struct spi_device *spi)
-       reg_write(lis, LIS302DL_REG_CLICK_WINDOW,
-                 lis->regs[LIS302DL_REG_CLICK_WINDOW]);
-+      local_irq_restore(flags);
-+      enable_irq(lis->spi_dev->irq);
-+
-       return 0;
- }
- #else
-diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c
-index 109d82c..03b73dd 100644
---- a/drivers/spi/spi_s3c24xx_gpio.c
-+++ b/drivers/spi/spi_s3c24xx_gpio.c
-@@ -91,7 +91,7 @@ static void s3c2410_spigpio_chipselect(struct spi_device *dev, int value)
-       struct s3c2410_spigpio *sg = spidev_to_sg(dev);
-       if (sg->info && sg->info->chip_select)
--              (sg->info->chip_select)(sg->info, value);
-+              (sg->info->chip_select)(sg->info, dev->chip_select, value);
- }
- static int s3c2410_spigpio_probe(struct platform_device *dev)
-@@ -113,9 +113,11 @@ static int s3c2410_spigpio_probe(struct platform_device *dev)
-       platform_set_drvdata(dev, sp);
--      /* copy in the plkatform data */
-+      /* copy in the platform data */
-       info = sp->info = dev->dev.platform_data;
-+      master->num_chipselect = info->num_chipselect;
-+
-       /* setup spi bitbang adaptor */
-       sp->bitbang.master = spi_master_get(master);
-       sp->bitbang.master->bus_num = info->bus_num;
-@@ -146,12 +148,17 @@ static int s3c2410_spigpio_probe(struct platform_device *dev)
-       /* register the chips to go with the board */
-       for (i = 0; i < sp->info->board_size; i++) {
-+              struct spi_device *spidev;
-+
-               dev_info(&dev->dev, "registering %p: %s\n",
-                        &sp->info->board_info[i],
-                        sp->info->board_info[i].modalias);
-               sp->info->board_info[i].controller_data = sp;
--              spi_new_device(master, sp->info->board_info + i);
-+              spidev = spi_new_device(master, sp->info->board_info + i);
-+              if (spidev)
-+                      spidev->max_speed_hz =
-+                                        sp->info->board_info[i].max_speed_hz;
-       }
-       return 0;
-diff --git a/include/asm-arm/arch-s3c2410/spi-gpio.h b/include/asm-arm/arch-s3c2410/spi-gpio.h
-index ba1dca8..03dea09 100644
---- a/include/asm-arm/arch-s3c2410/spi-gpio.h
-+++ b/include/asm-arm/arch-s3c2410/spi-gpio.h
-@@ -22,11 +22,12 @@ struct s3c2410_spigpio_info {
-       unsigned long            pin_miso;
-       int                      bus_num;
-+      int                      num_chipselect;
-       unsigned long            board_size;
-       struct spi_board_info   *board_info;
--      void (*chip_select)(struct s3c2410_spigpio_info *spi, int cs);
-+      void (*chip_select)(struct s3c2410_spigpio_info *spi, int csid, int cs);
- };
-diff --git a/include/linux/lis302dl.h b/include/linux/lis302dl.h
-index d0f31be..2dea813 100644
---- a/include/linux/lis302dl.h
-+++ b/include/linux/lis302dl.h
-@@ -2,10 +2,112 @@
- #define _LINUX_LIS302DL_H
- #include <linux/types.h>
-+#include <linux/spi/spi.h>
-+#include <linux/input.h>
-+
-+
-+struct lis302dl_info;
- struct lis302dl_platform_data {
-       char *name;
-+      unsigned long pin_chip_select;
-+      unsigned long pin_clk;
-+      unsigned long pin_mosi;
-+      unsigned long pin_miso;
-+      int open_drain;
-+      void (*lis302dl_bitbang_read)(struct lis302dl_info *);
-+};
-+
-+struct lis302dl_info {
-+      struct lis302dl_platform_data *pdata;
-+      struct spi_device *spi_dev;
-+      struct input_dev *input_dev;
-+      struct mutex lock;
-+      unsigned int flags;
-+      u_int8_t regs[0x40];
-+};
-+
-+enum lis302dl_reg {
-+      LIS302DL_REG_WHO_AM_I           = 0x0f,
-+      LIS302DL_REG_CTRL1              = 0x20,
-+      LIS302DL_REG_CTRL2              = 0x21,
-+      LIS302DL_REG_CTRL3              = 0x22,
-+      LIS302DL_REG_HP_FILTER_RESET    = 0x23,
-+      LIS302DL_REG_STATUS             = 0x27,
-+      LIS302DL_REG_OUT_X              = 0x29,
-+      LIS302DL_REG_OUT_Y              = 0x2b,
-+      LIS302DL_REG_OUT_Z              = 0x2d,
-+      LIS302DL_REG_FF_WU_CFG_1        = 0x30,
-+      LIS302DL_REG_FF_WU_SRC_1        = 0x31,
-+      LIS302DL_REG_FF_WU_THS_1        = 0x32,
-+      LIS302DL_REG_FF_WU_DURATION_1   = 0x33,
-+      LIS302DL_REG_FF_WU_CFG_2        = 0x34,
-+      LIS302DL_REG_FF_WU_SRC_2        = 0x35,
-+      LIS302DL_REG_FF_WU_THS_2        = 0x36,
-+      LIS302DL_REG_FF_WU_DURATION_2   = 0x37,
-+      LIS302DL_REG_CLICK_CFG          = 0x38,
-+      LIS302DL_REG_CLICK_SRC          = 0x39,
-+      LIS302DL_REG_CLICK_THSY_X       = 0x3b,
-+      LIS302DL_REG_CLICK_THSZ         = 0x3c,
-+      LIS302DL_REG_CLICK_TIME_LIMIT   = 0x3d,
-+      LIS302DL_REG_CLICK_LATENCY      = 0x3e,
-+      LIS302DL_REG_CLICK_WINDOW       = 0x3f,
-+};
-+
-+enum lis302dl_reg_ctrl1 {
-+      LIS302DL_CTRL1_Xen              = 0x01,
-+      LIS302DL_CTRL1_Yen              = 0x02,
-+      LIS302DL_CTRL1_Zen              = 0x04,
-+      LIS302DL_CTRL1_STM              = 0x08,
-+      LIS302DL_CTRL1_STP              = 0x10,
-+      LIS302DL_CTRL1_FS               = 0x20,
-+      LIS302DL_CTRL1_PD               = 0x40,
-+      LIS302DL_CTRL1_DR               = 0x80,
-+};
-+
-+enum lis302dl_reg_ctrl3 {
-+      LIS302DL_CTRL3_PP_OD            = 0x40,
-+      LIS302DL_CTRL3_IHL              = 0x80,
- };
-+enum lis302dl_reg_status {
-+      LIS302DL_STATUS_XDA             = 0x01,
-+      LIS302DL_STATUS_YDA             = 0x02,
-+      LIS302DL_STATUS_ZDA             = 0x04,
-+      LIS302DL_STATUS_XYZDA           = 0x08,
-+      LIS302DL_STATUS_XOR             = 0x10,
-+      LIS302DL_STATUS_YOR             = 0x20,
-+      LIS302DL_STATUS_ZOR             = 0x40,
-+      LIS302DL_STATUS_XYZOR           = 0x80,
-+};
-+
-+enum lis302dl_reg_ffwusrc1 {
-+      LIS302DL_FFWUSRC1_XL            = 0x01,
-+      LIS302DL_FFWUSRC1_XH            = 0x02,
-+      LIS302DL_FFWUSRC1_YL            = 0x04,
-+      LIS302DL_FFWUSRC1_YH            = 0x08,
-+      LIS302DL_FFWUSRC1_ZL            = 0x10,
-+      LIS302DL_FFWUSRC1_ZH            = 0x20,
-+      LIS302DL_FFWUSRC1_IA            = 0x40,
-+};
-+
-+enum lis302dl_reg_cloik_src {
-+      LIS302DL_CLICKSRC_SINGLE_X      = 0x01,
-+      LIS302DL_CLICKSRC_DOUBLE_X      = 0x02,
-+      LIS302DL_CLICKSRC_SINGLE_Y      = 0x04,
-+      LIS302DL_CLICKSRC_DOUBLE_Y      = 0x08,
-+      LIS302DL_CLICKSRC_SINGLE_Z      = 0x10,
-+      LIS302DL_CLICKSRC_DOUBLE_Z      = 0x20,
-+      LIS302DL_CLICKSRC_IA            = 0x40,
-+};
-+
-+#define LIS302DL_WHO_AM_I_MAGIC               0x3b
-+
-+#define LIS302DL_F_WUP_FF             0x0001  /* wake up from free fall */
-+#define LIS302DL_F_WUP_CLICK          0x0002
-+#define LIS302DL_F_POWER              0x0010
-+#define LIS302DL_F_FS                 0x0020  /* ADC full scale */
-+
-+
- #endif /* _LINUX_LIS302DL_H */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1041-pcf506xx.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1041-pcf506xx.patch.patch
deleted file mode 100644 (file)
index c09f7b9..0000000
+++ /dev/null
@@ -1,200 +0,0 @@
-From 825154a75730a9505750384cda1dc47c6edb3a1d Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:36:10 +0100
-Subject: [PATCH] pcf506xx.patch
- Moved shared PMU code from pcf50606.h and pcf50633.h (which prevented inclusion
- of both at the same time) to pcf506xx.h
-
-- include/linux/pcf50606.h (struct pmu_voltage_rail, enum pmu_event, pmu_cb):
-  moved to pcf506xx.h
-- include/linux/pcf50633.h (struct pmu_voltage_rail, enum pmu_event, pmu_cb):
-  moved to pcf506xx.h
-
-Signed off-by: Werner Almesberger <werner@openmoko.org>
----
- drivers/i2c/chips/pcf50606.c |   28 +++++++++++++++++++++++++++-
- include/linux/pcf50606.h     |   23 +++--------------------
- include/linux/pcf50633.h     |   27 +++------------------------
- include/linux/pcf506xx.h     |   31 +++++++++++++++++++++++++++++++
- 4 files changed, 64 insertions(+), 45 deletions(-)
- create mode 100644 include/linux/pcf506xx.h
-
-diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
-index 6626c68..b530583 100644
---- a/drivers/i2c/chips/pcf50606.c
-+++ b/drivers/i2c/chips/pcf50606.c
-@@ -102,6 +102,7 @@ struct pcf50606_data {
-       int allow_close;
-       int onkey_seconds;
-       int irq;
-+      int coldplug_done;
- #ifdef CONFIG_PM
-       struct {
-               u_int8_t dcdc1, dcdc2;
-@@ -573,6 +574,30 @@ static void pcf50606_work(struct work_struct *work)
-       if (ret != 3)
-               DEBUGPC("Oh crap PMU IRQ register read failed %d\n", ret);
-+      if (!pcf->coldplug_done) {
-+              DEBUGPC("PMU Coldplug init\n");
-+
-+              /* we used SECOND to kick ourselves started -- turn it off */
-+              pcfirq[0] &= ~PCF50606_INT1_SECOND;
-+              reg_set_bit_mask(pcf, PCF50606_REG_INT1M, PCF50606_INT1_SECOND,
-+                               PCF50606_INT1_SECOND);
-+
-+              /* coldplug the USB if present */
-+              if (__reg_read(pcf, PCF50606_REG_OOCS) & PCF50606_OOCS_EXTON) {
-+                      /* Charger inserted */
-+                      DEBUGPC("COLD CHGINS ");
-+                      input_report_key(pcf->input_dev, KEY_BATTERY, 1);
-+                      apm_queue_event(APM_POWER_STATUS_CHANGE);
-+                      pcf->flags |= PCF50606_F_CHG_PRESENT;
-+                      if (pcf->pdata->cb)
-+                              pcf->pdata->cb(&pcf->client.dev,
-+                                      PCF50606_FEAT_MBC, PMU_EVT_INSERT);
-+              }
-+
-+              pcf->coldplug_done = 1;
-+      }
-+
-+
-       dev_dbg(&pcf->client.dev, "INT1=0x%02x INT2=0x%02x INT3=0x%02x:",
-               pcfirq[0], pcfirq[1], pcfirq[2]);
-@@ -1642,7 +1667,8 @@ static int pcf50606_detect(struct i2c_adapter *adapter, int address, int kind)
-       pm_power_off = &pcf50606_go_standby;
-       /* configure interrupt mask */
--      reg_write(data, PCF50606_REG_INT1M, PCF50606_INT1_SECOND);
-+      /* we don't mask SECOND here, because we want one to do coldplug with */
-+      reg_write(data, PCF50606_REG_INT1M, 0x00);
-       reg_write(data, PCF50606_REG_INT2M, 0x00);
-       reg_write(data, PCF50606_REG_INT3M, PCF50606_INT3_TSCPRES);
-diff --git a/include/linux/pcf50606.h b/include/linux/pcf50606.h
-index bc98e47..167328f 100644
---- a/include/linux/pcf50606.h
-+++ b/include/linux/pcf50606.h
-@@ -1,6 +1,9 @@
- #ifndef _LINUX_PCF50606_H
- #define _LINUX_PCF50606_H
-+#include <linux/pcf506xx.h>
-+
-+
- /* public in-kernel pcf50606 api */
- enum pcf50606_regulator_id {
-       PCF50606_REGULATOR_DCD,
-@@ -48,26 +51,6 @@ pcf50606_onoff_set(struct pcf50606_data *pcf,
- extern void
- pcf50606_charge_fast(struct pcf50606_data *pcf, int on);
--#define PMU_VRAIL_F_SUSPEND_ON        0x00000001      /* Remains on during suspend */
--#define PMU_VRAIL_F_UNUSED    0x00000002      /* This rail is not used */
--struct pmu_voltage_rail {
--      char *name;
--      unsigned int flags;
--      struct {
--              unsigned int init;
--              unsigned int max;
--      } voltage;
--};
--
--enum pmu_event {
--      PMU_EVT_NONE,
--      PMU_EVT_INSERT,
--      PMU_EVT_REMOVE,
--      __NUM_PMU_EVTS
--};
--
--typedef int pmu_cb(struct device *dev, unsigned int feature,
--                 enum pmu_event event);
- #define PCF50606_FEAT_EXTON   0x00000001      /* not yet supported */
- #define PCF50606_FEAT_MBC     0x00000002
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index 5f32004..bf50fe4 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -1,6 +1,9 @@
- #ifndef _LINUX_PCF50633_H
- #define _LINUX_PCF50633_H
-+#include <linux/pcf506xx.h>
-+
-+
- /* public in-kernel pcf50633 api */
- enum pcf50633_regulator_id {
-       PCF50633_REGULATOR_AUTO,
-@@ -57,30 +60,6 @@ pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma);
- extern void
- pcf50633_charge_enable(struct pcf50633_data *pcf, int on);
--/* FIXME: sharded with pcf50606 */
--#define PMU_VRAIL_F_SUSPEND_ON        0x00000001      /* Remains on during suspend */
--#define PMU_VRAIL_F_UNUSED    0x00000002      /* This rail is not used */
--struct pmu_voltage_rail {
--      char *name;
--      unsigned int flags;
--      struct {
--              unsigned int init;
--              unsigned int max;
--      } voltage;
--};
--
--enum pmu_event {
--      PMU_EVT_NONE,
--      PMU_EVT_INSERT,
--      PMU_EVT_REMOVE,
--      PMU_EVT_USB_INSERT,
--      PMU_EVT_USB_REMOVE,
--      __NUM_PMU_EVTS
--};
--
--typedef int pmu_cb(struct device *dev, unsigned int feature,
--                 enum pmu_event event);
--
- #define PCF50633_FEAT_EXTON   0x00000001      /* not yet supported */
- #define PCF50633_FEAT_MBC     0x00000002
- #define PCF50633_FEAT_BBC     0x00000004      /* not yet supported */
-diff --git a/include/linux/pcf506xx.h b/include/linux/pcf506xx.h
-new file mode 100644
-index 0000000..33be73e
---- /dev/null
-+++ b/include/linux/pcf506xx.h
-@@ -0,0 +1,31 @@
-+#ifndef _LINUX_PCF506XX_H
-+#define _LINUX_PCF506XX_H
-+
-+
-+#define PMU_VRAIL_F_SUSPEND_ON        0x00000001      /* Remains on during suspend */
-+#define PMU_VRAIL_F_UNUSED    0x00000002      /* This rail is not used */
-+struct pmu_voltage_rail {
-+      char *name;
-+      unsigned int flags;
-+      struct {
-+              unsigned int init;
-+              unsigned int max;
-+      } voltage;
-+};
-+
-+enum pmu_event {
-+      PMU_EVT_NONE,
-+      PMU_EVT_INSERT,
-+      PMU_EVT_REMOVE,
-+#ifdef CONFIG_SENSORS_PCF50633
-+      PMU_EVT_USB_INSERT,
-+      PMU_EVT_USB_REMOVE,
-+#endif
-+      __NUM_PMU_EVTS
-+};
-+
-+typedef int pmu_cb(struct device *dev, unsigned int feature,
-+                 enum pmu_event event);
-+
-+
-+#endif /* !_LINUX_PCF506XX_H */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1042-gta02-bt-fixes.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1042-gta02-bt-fixes.patch.patch
deleted file mode 100644 (file)
index 207b334..0000000
+++ /dev/null
@@ -1,209 +0,0 @@
-From c3baf8bae35ec67edb89c07cd8367040c95cca74 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 4 Apr 2008 11:36:19 +0100
-Subject: [PATCH] gta02-bt-fixes.patch
- Modify GTA02 power manager for bluetooth.
-
-1. Default power value isn't correct. Now we set pcf50633 LDO4 to 3.2 voltage.
-
-2. Separate GTA01 and GTA02 source code.
-
-3. Add pcf50633 API for enable register.
----
- arch/arm/mach-s3c2440/mach-gta02.c    |    4 +-
- arch/arm/plat-s3c24xx/neo1973_pm_bt.c |   71 ++++++++++++++++++++++++++++----
- include/linux/pcf50633.h              |    1 +
- 3 files changed, 65 insertions(+), 11 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 3fbb131..46acede 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -213,10 +213,10 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-                       },
-               },
-               [PCF50633_REGULATOR_LDO4] = {
--                      .name           = "gl_2v5",
-+                      .name           = "bt_3v2",
-                       .voltage        = {
-                               .init   = 2500,
--                              .max    = 2500,
-+                              .max    = 3300,
-                       },
-               },
-               [PCF50633_REGULATOR_LDO5] = {
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-index d685ef7..8f5be88 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-@@ -16,12 +16,19 @@
- #include <linux/kernel.h>
- #include <linux/platform_device.h>
--#include <linux/pcf50606.h>
--
- #include <asm/hardware.h>
- #include <asm/mach-types.h>
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA01
- #include <asm/arch/gta01.h>
-+#include <linux/pcf50606.h>
-+#endif
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
- #include <asm/arch/gta02.h>
-+#include <linux/pcf50633.h>
-+#endif
-+
- #define DRVMSG "FIC Neo1973 Bluetooth Power Management"
-@@ -30,6 +37,8 @@ static ssize_t bt_read(struct device *dev, struct device_attribute *attr,
- {
-       if (!strcmp(attr->attr.name, "power_on")) {
-               switch (machine_arch_type) {
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-               case MACH_TYPE_NEO1973_GTA01:
-                       if (pcf50606_onoff_get(pcf50606_global,
-                                               PCF50606_REGULATOR_D1REG) &&
-@@ -37,21 +46,33 @@ static ssize_t bt_read(struct device *dev, struct device_attribute *attr,
-                                                PCF50606_REGULATOR_D1REG) == 3100)
-                               goto out_1;
-                       break;
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-               case MACH_TYPE_NEO1973_GTA02:
-                       if (s3c2410_gpio_getpin(GTA02_GPIO_BT_EN))
-                               goto out_1;
-                       break;
-+#endif /* CONFIG_MACH_NEO1973_GTA02 */
-+
-               }
-       } else if (!strcmp(attr->attr.name, "reset")) {
-               switch (machine_arch_type) {
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-               case MACH_TYPE_NEO1973_GTA01:
-                       if (s3c2410_gpio_getpin(GTA01_GPIO_BT_EN) == 0)
-                               goto out_1;
-                       break;
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-               case MACH_TYPE_NEO1973_GTA02:
-                       if (s3c2410_gpio_getpin(GTA02_GPIO_BT_EN) == 0)
-                               goto out_1;
-                       break;
-+#endif /* CONFIG_MACH_NEO1973_GTA02 */
-+
-               }
-       }
-@@ -64,9 +85,12 @@ static ssize_t bt_write(struct device *dev, struct device_attribute *attr,
-                       const char *buf, size_t count)
- {
-       unsigned long on = simple_strtoul(buf, NULL, 10);
-+      unsigned int vol;
-       if (!strcmp(attr->attr.name, "power_on")) {
-               switch (machine_arch_type) {
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-               case MACH_TYPE_NEO1973_GTA01:
-                       /* if we are powering up, assert reset, then power,
-                        * then release reset */
-@@ -80,22 +104,39 @@ static ssize_t bt_write(struct device *dev, struct device_attribute *attr,
-                                          PCF50606_REGULATOR_D1REG, on);
-                       s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on);
-                       break;
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-               case MACH_TYPE_NEO1973_GTA02:
-+                      s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, on ? 0 : 1);
-                       if (on)
--                              s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, 0);
--                      else
--                              s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, 1);
-+                              pcf50633_voltage_set(pcf50633_global,
-+                                      PCF50633_REGULATOR_LDO4, 3200);
-+                      pcf50633_onoff_set(pcf50633_global,
-+                              PCF50633_REGULATOR_LDO4, on);
-+                      vol = pcf50633_voltage_get(pcf50633_global,
-+                              PCF50633_REGULATOR_LDO4);
-+                      dev_info(dev, "GTA02 Set PCF50633 LDO4 = %d\n", vol);
-                       break;
-+#endif /* CONFIG_MACH_NEO1973_GTA02 */
-+
-               }
-       } else if (!strcmp(attr->attr.name, "reset")) {
-               /* reset is low-active, so we need to invert */
-               switch (machine_arch_type) {
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-               case MACH_TYPE_NEO1973_GTA01:
-                       s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1);
-                       break;
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-               case MACH_TYPE_NEO1973_GTA02:
-                       s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, on ? 0 : 1);
-                       break;
-+#endif /* CONFIG_MACH_NEO1973_GTA02 */
-+
-               }
-       }
-@@ -143,18 +184,30 @@ static int __init gta01_bt_probe(struct platform_device *pdev)
-       dev_info(&pdev->dev, DRVMSG ": starting\n");
-       switch (machine_arch_type) {
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-       case MACH_TYPE_NEO1973_GTA01:
-               /* we make sure that the voltage is off */
-               pcf50606_onoff_set(pcf50606_global,
-                                  PCF50606_REGULATOR_D1REG, 0);
-+              /* we pull reset to low to make sure that the chip doesn't
-+               * drain power through the reset line */
-+              s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
-               break;
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-       case MACH_TYPE_NEO1973_GTA02:
--              /* FIXME: implementation */
-+              /* we make sure that the voltage is off */
-+              pcf50633_onoff_set(pcf50633_global,
-+                                   PCF50633_REGULATOR_LDO4, 0);
-+              /* we pull reset to low to make sure that the chip doesn't
-+               * drain power through the reset line */
-+              s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, 0);
-               break;
-+#endif /* CONFIG_MACH_NEO1973_GTA02 */
-+
-       }
--      /* we pull reset to low to make sure that the chip doesn't
--       * drain power through the reset line */
--      s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
-       return sysfs_create_group(&pdev->dev.kobj, &gta01_bt_attr_group);
- }
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index bf50fe4..b6a67ee 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -46,6 +46,7 @@ pcf50633_voltage_set(struct pcf50633_data *pcf,
- extern unsigned int
- pcf50633_voltage_get(struct pcf50633_data *pcf,
-                    enum pcf50633_regulator_id reg);
-+
- extern int
- pcf50633_onoff_get(struct pcf50633_data *pcf,
-                  enum pcf50633_regulator_id reg);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1043-openmoko-logo.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1043-openmoko-logo.patch.patch
deleted file mode 100644 (file)
index 213ba28..0000000
+++ /dev/null
@@ -1,40076 +0,0 @@
-From 940bc427718c8ac90466a88829ee2330ff0c6588 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:47 +0100
-Subject: [PATCH] openmoko-logo.patch
-
----
- drivers/video/logo/Kconfig                   |    5 +
- drivers/video/logo/Makefile                  |    1 +
- drivers/video/logo/logo.c                    |    5 +
- drivers/video/logo/logo_openmoko_clut224.ppm |40003 ++++++++++++++++++++++++++
- 4 files changed, 40014 insertions(+), 0 deletions(-)
- create mode 100644 drivers/video/logo/logo_openmoko_clut224.ppm
-
-diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
-index 9de1c11..6d97d00 100644
---- a/drivers/video/logo/Kconfig
-+++ b/drivers/video/logo/Kconfig
-@@ -67,6 +67,11 @@ config LOGO_SUPERH_CLUT224
-       depends on SUPERH
-       default y
-+config LOGO_OPENMOKO_CLUT224
-+      bool "224-color OpenMoko Linux logo"
-+      depends on MACH_NEO1973_GTA01 || MACH_NEO1973_GTA02
-+      default y
-+
- config LOGO_M32R_CLUT224
-       bool "224-color M32R Linux logo"
-       depends on M32R
-diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile
-index a5fc4ed..9eb3350 100644
---- a/drivers/video/logo/Makefile
-+++ b/drivers/video/logo/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_LOGO_SUPERH_MONO)               += logo_superh_mono.o
- obj-$(CONFIG_LOGO_SUPERH_VGA16)               += logo_superh_vga16.o
- obj-$(CONFIG_LOGO_SUPERH_CLUT224)     += logo_superh_clut224.o
- obj-$(CONFIG_LOGO_M32R_CLUT224)               += logo_m32r_clut224.o
-+obj-$(CONFIG_LOGO_OPENMOKO_CLUT224)   += logo_openmoko_clut224.o
- obj-$(CONFIG_SPU_BASE)                        += logo_spe_clut224.o
-diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c
-index fc72684..541fd97 100644
---- a/drivers/video/logo/logo.c
-+++ b/drivers/video/logo/logo.c
-@@ -33,6 +33,7 @@ extern const struct linux_logo logo_superh_mono;
- extern const struct linux_logo logo_superh_vga16;
- extern const struct linux_logo logo_superh_clut224;
- extern const struct linux_logo logo_m32r_clut224;
-+extern const struct linux_logo logo_openmoko_clut224;
- static int nologo;
- module_param(nologo, bool, 0);
-@@ -105,6 +106,10 @@ const struct linux_logo * __init_refok fb_find_logo(int depth)
-               /* M32R Linux logo */
-               logo = &logo_m32r_clut224;
- #endif
-+#ifdef CONFIG_LOGO_OPENMOKO_CLUT224
-+              /* OpenMoko Linux logo */
-+              logo = &logo_openmoko_clut224;
-+#endif
-       }
-       return logo;
- }
-diff --git a/drivers/video/logo/logo_openmoko_clut224.ppm b/drivers/video/logo/logo_openmoko_clut224.ppm
-new file mode 100644
-index 0000000..a2989cb
---- /dev/null
-+++ b/drivers/video/logo/logo_openmoko_clut224.ppm
-@@ -0,0 +1,40003 @@
-+P3
-+480 500
-+255
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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  1 1 1  1 1 1
-+1 1 1  1 1 1  2 2 2  2 2 2  2 2 2  3 3 1
-+3 3 1  3 3 1  3 3 1  3 3 1  3 3 1  3 3 1
-+3 3 1  3 3 1  3 3 1  3 3 1  3 3 1  2 2 2
-+2 2 2  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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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  1 1 1  2 2 2  3 3 1  4 3 1  4 3 1
-+5 4 1  5 4 1  5 4 1  5 4 1  5 4 1  7 5 2
-+7 5 2  7 5 2  7 5 2  7 5 2  7 5 2  7 5 2
-+7 5 2  7 5 2  7 5 2  7 5 2  5 4 1  5 4 1
-+5 4 1  5 4 1  5 4 1  4 3 1  4 3 1  3 3 1
-+3 3 1  2 2 2  1 1 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  1 1 1
-+3 3 1  4 3 1  5 4 1  7 5 2  7 5 2  9 7 3
-+9 7 3  9 7 3  10 9 3  10 9 3  11 9 3  11 9 3
-+10 9 3  13 11 4  11 9 3  13 11 4  13 11 4  13 11 4
-+13 11 4  11 9 3  13 11 4  11 9 3  11 9 3  11 9 3
-+10 9 3  9 7 3  9 7 3  9 7 3  7 5 2  7 5 2
-+7 5 2  5 4 1  5 4 1  4 3 1  3 3 1  3 3 1
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  1 1 1  3 3 1  5 4 1
-+7 5 2  9 7 3  10 9 3  11 9 3  13 11 4  14 11 4
-+15 13 4  15 13 4  15 13 4  16 14 4  18 15 5  18 15 5
-+18 15 5  18 15 5  18 15 5  18 15 5  18 15 5  18 15 5
-+18 15 5  18 15 5  18 15 5  18 15 5  18 15 5  16 14 4
-+16 14 4  15 13 4  15 13 4  14 11 4  13 11 4  13 11 4
-+11 9 3  10 9 3  9 7 3  9 7 3  7 5 2  7 5 2
-+5 4 1  5 4 1  3 3 1  3 3 1  1 1 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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  2 2 2  4 3 1  7 5 2  9 7 3
-+11 9 3  13 11 4  15 13 4  16 14 4  18 15 5  18 15 5
-+20 17 5  22 17 5  23 19 6  23 19 6  24 21 6  24 21 6
-+24 21 6  25 20 6  25 20 6  25 20 6  25 20 6  25 20 6
-+25 20 6  25 20 6  25 20 6  24 21 6  24 21 6  23 19 6
-+23 19 6  23 19 6  22 17 5  20 17 5  18 15 5  18 15 5
-+18 15 5  16 14 4  15 13 4  14 11 4  13 11 4  13 11 4
-+10 9 3  9 7 3  7 5 2  7 5 2  5 4 1  4 3 1
-+3 3 1  2 2 2  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  3 3 1  5 4 1  7 5 2  10 9 3  13 11 4
-+16 14 4  18 15 5  22 17 5  23 19 6  24 21 6  25 20 6
-+27 23 7  29 24 7  29 24 7  29 24 7  31 27 8  31 27 8
-+31 27 8  31 27 8  31 27 8  31 27 8  31 27 8  31 27 8
-+31 27 8  31 27 8  31 27 8  31 27 8  31 27 8  31 27 8
-+29 24 7  29 24 7  27 23 7  27 23 7  25 20 6  25 20 6
-+24 21 6  23 19 6  22 17 5  20 17 5  18 15 5  18 15 5
-+16 14 4  15 13 4  13 11 4  11 9 3  10 9 3  9 7 3
-+7 5 2  5 4 1  4 3 1  3 3 1  1 1 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  0 0 0
-+3 3 1  5 4 1  9 7 3  13 11 4  15 13 4  18 15 5
-+22 17 5  24 21 6  27 23 7  29 24 7  31 27 8  31 27 8
-+31 27 8  37 31 10  37 31 10  37 31 10  37 31 10  37 31 10
-+37 31 10  37 31 10  37 31 10  37 31 10  37 31 10  41 32 10
-+37 31 10  37 31 10  37 31 10  37 31 10  37 31 10  37 31 10
-+37 31 10  37 31 10  37 31 10  37 31 10  31 27 8  31 27 8
-+31 27 8  29 24 7  29 24 7  27 23 7  25 20 6  24 21 6
-+23 19 6  20 17 5  18 15 5  18 15 5  15 13 4  14 11 4
-+13 11 4  10 9 3  9 7 3  7 5 2  5 4 1  4 3 1
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  3 3 1
-+5 4 1  9 7 3  13 11 4  16 14 4  20 17 5  24 21 6
-+27 23 7  31 27 8  31 27 8  37 31 10  37 31 10  37 31 10
-+44 35 11  41 32 10  44 35 11  44 35 11  47 39 13  44 35 11
-+47 39 13  47 39 13  47 39 13  47 39 13  47 39 13  47 39 13
-+47 39 13  47 39 13  47 39 13  47 39 13  44 35 11  44 35 11
-+41 32 10  44 35 11  37 31 10  41 32 10  37 31 10  37 31 10
-+37 31 10  37 31 10  37 31 10  31 27 8  31 27 8  31 27 8
-+29 24 7  27 23 7  25 20 6  23 19 6  22 17 5  18 15 5
-+18 15 5  15 13 4  14 11 4  13 11 4  10 9 3  7 5 2
-+5 4 1  4 3 1  3 3 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1  3 3 1  5 4 1
-+9 7 3  14 11 4  18 15 5  22 17 5  25 20 6  29 24 7
-+31 27 8  37 31 10  37 31 10  44 35 11  47 39 13  47 39 13
-+47 39 13  47 39 13  47 39 13  47 39 13  47 39 13  47 39 13
-+56 48 15  47 39 13  47 39 13  47 39 13  56 48 15  47 39 13
-+47 39 13  47 39 13  47 39 13  56 48 15  47 39 13  47 39 13
-+47 39 13  47 39 13  47 39 13  47 39 13  47 39 13  47 39 13
-+47 39 13  44 35 11  41 32 10  44 35 11  37 31 10  37 31 10
-+37 31 10  37 31 10  31 27 8  29 24 7  27 23 7  25 20 6
-+24 21 6  22 17 5  18 15 5  18 15 5  15 13 4  13 11 4
-+11 9 3  9 7 3  7 5 2  5 4 1  3 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  3 3 1  5 4 1  9 7 3
-+14 11 4  18 15 5  23 19 6  27 23 7  31 27 8  37 31 10
-+37 31 10  44 35 11  47 39 13  47 39 13  47 39 13  56 48 15
-+47 39 13  57 50 17  57 50 17  57 50 17  56 48 15  57 50 17
-+56 48 15  57 50 17  57 50 17  57 50 17  56 48 15  57 50 17
-+57 50 17  57 50 17  57 50 17  56 48 15  57 50 17  57 50 17
-+56 48 15  56 48 15  47 39 13  56 48 15  47 39 13  47 39 13
-+47 39 13  47 39 13  47 39 13  47 39 13  47 39 13  44 35 11
-+44 35 11  37 31 10  37 31 10  37 31 10  37 31 10  31 27 8
-+31 27 8  27 23 7  25 20 6  23 19 6  22 17 5  18 15 5
-+16 14 4  14 11 4  13 11 4  9 7 3  7 5 2  5 4 1
-+3 3 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  3 3 1  5 4 1  9 7 3  13 11 4
-+18 15 5  23 19 6  27 23 7  31 27 8  37 31 10  37 31 10
-+47 39 13  47 39 13  47 39 13  56 48 15  56 48 15  57 50 17
-+57 50 17  57 50 17  56 48 15  57 50 17  56 48 15  57 50 17
-+56 48 15  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  57 50 17  56 48 15  56 48 15
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  47 39 13  56 48 15  47 39 13  47 39 13
-+47 39 13  47 39 13  47 39 13  44 35 11  44 35 11  37 31 10
-+37 31 10  37 31 10  31 27 8  29 24 7  27 23 7  25 20 6
-+23 19 6  18 15 5  18 15 5  15 13 4  13 11 4  10 9 3
-+7 5 2  5 4 1  3 3 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  2 2 2  5 4 1  9 7 3  13 11 4  18 15 5
-+23 19 6  27 23 7  31 27 8  37 31 10  37 31 10  47 39 13
-+47 39 13  47 39 13  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  56 48 15  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  56 48 15
-+56 48 15  47 39 13  47 39 13  47 39 13  47 39 13  47 39 13
-+44 35 11  37 31 10  37 31 10  37 31 10  31 27 8  31 27 8
-+29 24 7  25 20 6  23 19 6  20 17 5  18 15 5  15 13 4
-+13 11 4  9 7 3  7 5 2  5 4 1  3 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+1 1 1  4 3 1  7 5 2  13 11 4  16 14 4  22 17 5
-+27 23 7  31 27 8  37 31 10  37 31 10  47 39 13  47 39 13
-+57 50 16  70 58 37  71 64 51  100 76 42  66 66 66  114 84 45
-+138 129 110  140 134 120  163 154 123  176 168 138  185 178 149  192 187 164
-+200 196 176  216 206 146  200 196 176  227 222 178  227 222 178  227 222 178
-+227 221 169  224 217 160  185 178 149  224 212 126  185 178 149  163 154 123
-+150 141 118  149 122 79  142 111 68  100 76 42  70 58 37  57 50 17
-+57 50 17  56 48 15  57 50 17  57 50 17  57 50 17  57 50 17
-+56 48 15  57 50 17  57 50 17  56 48 15  56 48 15  47 39 13
-+47 39 13  47 39 13  47 39 13  44 35 11  37 31 10  37 31 10
-+37 31 10  31 27 8  29 24 7  25 20 6  23 19 6  20 17 5
-+18 15 5  15 13 4  13 11 4  9 7 3  7 5 2  4 3 1
-+2 2 2  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+3 3 1  7 5 2  11 9 3  15 13 4  20 17 5  25 20 6
-+31 27 8  37 31 10  44 40 33  71 64 51  135 101 60  138 129 110
-+138 129 110  138 129 110  140 134 120  140 134 120  163 154 123  150 141 118
-+150 141 118  140 134 120  138 129 110  138 129 110  138 129 110  138 129 110
-+138 129 110  138 129 110  138 129 110  138 129 110  138 129 110  150 141 118
-+150 141 118  176 168 138  176 168 138  185 178 149  216 206 146  227 221 169
-+227 221 169  227 220 160  227 221 169  227 219 152  226 218 148  216 206 146
-+176 168 138  149 122 79  142 111 68  68 60 43  57 50 16  57 50 17
-+57 50 17  57 50 17  57 50 17  56 48 15  56 48 15  57 50 17
-+56 48 15  47 39 13  47 39 13  47 39 13  47 39 13  44 35 11
-+37 31 10  37 31 10  37 31 10  31 27 8  29 24 7  25 20 6
-+23 19 6  20 17 5  18 15 5  14 11 4  11 9 3  9 7 3
-+5 4 1  3 3 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  0 0 0  0 0 0  0 0 0  0 0 0  2 2 2
-+5 4 1  9 7 3  14 11 4  20 17 5  33 28 19  71 64 51
-+66 66 66  138 129 110  138 129 110  140 134 120  138 129 110  138 129 110
-+138 129 110  140 134 120  138 129 110  140 134 120  176 168 138  192 187 164
-+192 187 164  185 178 149  150 141 118  138 129 110  138 129 110  138 129 110
-+138 129 110  138 129 110  138 129 110  138 129 110  138 129 110  138 129 110
-+138 129 110  138 129 110  138 129 110  138 129 110  138 129 110  138 129 110
-+150 141 118  163 154 123  185 178 149  224 217 160  228 223 179  227 221 169
-+227 219 152  227 219 152  226 218 148  226 218 148  224 212 126  163 154 123
-+142 111 68  70 58 37  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  47 39 13  56 48 15  47 39 13
-+47 39 13  47 39 13  44 35 11  37 31 10  37 31 10  31 27 8
-+29 24 7  25 20 6  23 19 6  18 15 5  16 14 4  13 11 4
-+10 9 3  7 5 2  5 4 1  3 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  0 0 0  1 1 1  3 3 1
-+7 5 2  20 20 20  63 58 50  135 101 60  140 134 120  138 129 110
-+140 134 120  138 129 110  138 129 110  140 134 120  138 129 110  140 134 120
-+138 129 110  138 129 110  163 154 123  229 226 192  229 226 192  229 226 192
-+229 225 190  229 225 190  229 226 192  200 196 176  163 154 123  138 129 110
-+138 129 110  135 101 60  138 129 110  66 66 66  138 129 110  138 129 110
-+135 101 60  138 129 110  66 66 66  138 129 110  135 101 60  138 129 110
-+135 101 60  138 129 110  138 129 110  135 101 60  138 129 110  150 141 118
-+192 187 164  227 221 169  227 221 169  227 220 160  227 219 152  226 218 148
-+226 217 139  226 218 148  176 168 138  149 122 79  75 62 40  57 50 16
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  47 39 13
-+57 50 17  47 39 13  47 39 13  47 39 13  37 31 10  37 31 10
-+37 31 10  31 27 8  29 24 7  25 20 6  22 17 5  18 15 5
-+15 13 4  13 11 4  9 7 3  5 4 1  3 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  5 5 5  52 52 52
-+66 66 66  138 129 110  138 129 110  138 129 110  138 129 110  138 129 110
-+138 129 110  138 129 110  138 129 110  138 129 110  138 129 110  138 129 110
-+138 129 110  192 187 164  229 226 192  229 226 192  229 225 190  229 225 190
-+229 226 192  229 224 185  229 226 192  229 226 192  229 226 192  138 129 110
-+138 129 110  138 129 110  138 129 110  138 129 110  138 129 110  138 129 110
-+66 66 66  138 129 110  138 129 110  138 129 110  138 129 110  66 66 66
-+138 129 110  66 66 66  138 129 110  66 66 66  138 129 110  135 101 60
-+138 129 110  142 111 68  150 141 118  176 168 138  227 221 169  227 221 169
-+227 220 160  226 218 148  227 218 146  227 218 146  226 217 137  176 168 138
-+149 122 79  70 58 37  57 50 17  57 50 17  57 50 17  57 50 17
-+56 48 15  57 50 17  47 39 13  47 39 13  47 39 13  47 39 13
-+41 32 10  37 31 10  37 31 10  31 27 8  27 23 7  24 21 6
-+20 17 5  16 14 4  14 11 4  10 9 3  7 5 2  5 4 1
-+2 2 2  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  17 17 17  66 66 66  138 129 110  138 129 110
-+138 129 110  138 129 110  138 129 110  138 129 110  138 129 110  138 129 110
-+138 129 110  138 129 110  140 134 120  138 129 110  138 129 110  138 129 110
-+185 178 149  229 226 196  229 226 192  229 226 192  229 225 190  229 225 190
-+229 226 192  229 226 192  229 225 190  229 226 192  200 196 176  138 129 110
-+138 129 110  66 66 66  138 129 110  138 129 110  66 66 66  138 129 110
-+138 129 110  135 101 60  66 66 66  138 129 110  66 66 66  140 134 120
-+138 129 110  138 129 110  66 66 66  138 129 110  138 129 110  66 66 66
-+138 129 110  66 66 66  138 129 110  114 84 45  138 129 110  138 129 110
-+192 187 164  227 221 169  227 221 169  227 219 152  227 219 152  227 217 139
-+226 217 139  226 217 139  163 154 123  110 81 38  57 50 17  57 50 17
-+57 50 17  56 48 15  57 50 17  56 48 15  47 39 13  47 39 13
-+47 39 13  47 39 13  37 31 10  37 31 10  31 27 8  29 24 7
-+25 20 6  23 19 6  18 15 5  15 13 4  13 11 4  9 7 3
-+5 4 1  3 3 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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
-+24 24 24  66 66 66  138 129 110  138 129 110  140 134 120  66 66 66
-+138 129 110  140 134 120  66 66 66  140 134 120  66 66 66  138 129 110
-+138 129 110  138 129 110  138 129 110  138 129 110  140 134 120  163 154 123
-+229 226 196  229 226 192  229 226 192  229 226 192  229 226 192  229 225 190
-+229 226 192  229 225 190  229 226 192  229 226 192  176 168 138  138 129 110
-+138 129 110  140 134 120  66 66 66  138 129 110  138 129 110  138 129 110
-+66 66 66  138 129 110  138 129 110  135 101 60  138 129 110  138 129 110
-+66 66 66  135 101 60  138 129 110  66 66 66  138 129 110  66 66 66
-+138 129 110  135 101 60  138 129 110  66 66 66  138 129 110  66 66 66
-+135 101 60  149 122 79  176 168 138  227 221 169  227 221 169  227 220 160
-+227 219 152  227 218 146  226 217 139  226 217 137  185 178 149  135 101 60
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+47 39 13  47 39 13  47 39 13  44 35 11  37 31 10  37 31 10
-+31 27 8  27 23 7  24 21 6  20 17 5  16 14 4  13 11 4
-+9 7 3  7 5 2  4 3 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  25 25 25  66 66 66
-+138 129 110  138 129 110  66 66 66  140 134 120  66 66 66  140 134 120
-+140 134 120  66 66 66  140 134 120  140 134 120  140 134 120  140 134 120
-+138 129 110  138 129 110  138 129 110  138 129 110  138 129 110  200 196 176
-+230 227 202  229 226 192  229 226 192  229 226 192  229 226 192  229 226 192
-+229 226 192  229 226 192  229 226 192  229 226 192  150 141 118  138 129 110
-+66 66 66  138 129 110  138 129 110  135 101 60  66 66 66  138 129 110
-+138 129 110  66 66 66  138 129 110  66 66 66  138 129 110  66 66 66
-+138 129 110  66 66 66  138 129 110  135 101 60  138 129 110  66 66 66
-+138 129 110  66 66 66  138 129 110  100 76 42  138 129 110  114 84 45
-+138 129 110  66 66 66  142 111 68  135 101 60  163 154 123  224 217 160
-+227 221 169  227 220 160  227 219 152  227 218 146  226 217 139  227 218 146
-+216 206 146  135 101 60  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  56 48 15  47 39 13  47 39 13  47 39 13  37 31 10
-+37 31 10  31 27 8  29 24 7  25 20 6  23 19 6  18 15 5
-+14 11 4  10 9 3  7 5 2  4 3 1  2 2 2  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1  17 17 17  66 66 66  138 129 110  138 129 110
-+140 134 120  66 66 66  138 129 110  140 134 120  140 134 120  66 66 66
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+66 66 66  138 129 110  138 129 110  138 129 110  185 178 149  230 227 197
-+229 226 196  229 226 192  229 226 192  229 226 192  229 226 192  229 226 192
-+229 226 192  229 226 192  229 226 192  229 226 192  138 129 110  138 129 110
-+138 129 110  138 129 110  66 66 66  138 129 110  138 129 110  66 66 66
-+138 129 110  66 66 66  138 129 110  66 66 66  138 129 110  66 66 66
-+138 129 110  66 66 66  138 129 110  66 66 66  66 66 66  138 129 110
-+66 66 66  142 111 68  66 66 66  138 129 110  66 66 66  138 129 110
-+66 66 66  138 129 110  66 66 66  138 129 110  66 66 66  135 101 60
-+163 154 123  224 217 160  227 221 169  227 219 152  227 219 152  226 218 148
-+226 218 148  226 217 139  216 206 146  135 101 60  57 50 17  57 50 17
-+56 48 15  56 48 15  56 48 15  56 48 15  47 39 13  47 39 13
-+44 35 11  37 31 10  37 31 10  31 27 8  27 23 7  23 19 6
-+18 15 5  15 13 4  11 9 3  9 7 3  5 4 1  2 2 2
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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
-+6 6 6  65 65 65  138 129 110  138 129 110  66 66 66  140 134 120
-+66 66 66  140 134 120  140 134 120  66 66 66  140 134 120  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  138 129 110  138 129 110
-+140 134 120  140 134 120  138 129 110  138 129 110  200 196 176  230 228 209
-+229 226 192  229 226 192  229 226 196  229 226 196  229 226 196  229 226 196
-+229 226 192  229 226 192  229 226 192  229 224 185  138 129 110  114 84 45
-+138 129 110  135 101 60  138 129 110  66 66 66  138 129 110  66 66 66
-+138 129 110  66 66 66  138 129 110  66 66 66  66 66 66  138 129 110
-+66 66 66  142 111 68  66 66 66  138 129 110  114 84 45  66 66 66
-+138 129 110  66 66 66  142 111 68  66 66 66  135 101 60  66 66 66
-+142 111 68  66 66 66  135 101 60  66 66 66  142 111 68  66 66 66
-+135 101 60  66 66 66  176 168 138  227 220 160  227 221 169  226 218 148
-+226 218 148  226 218 148  226 217 139  226 218 148  185 178 149  110 81 38
-+57 50 17  57 50 17  57 50 17  47 39 13  57 50 17  47 39 13
-+47 39 13  47 39 13  37 31 10  37 31 10  31 27 8  29 24 7
-+24 21 6  20 17 5  16 14 4  13 11 4  9 7 3  5 4 1
-+3 3 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  1 1 1  47 47 47
-+66 66 66  140 134 120  66 66 66  140 134 120  140 134 120  66 66 66
-+140 134 120  140 134 120  66 66 66  140 134 120  140 134 120  66 66 66
-+140 134 120  140 134 120  140 134 120  138 129 110  140 134 120  66 66 66
-+138 129 110  138 129 110  138 129 110  176 168 138  230 227 199  229 226 196
-+229 226 192  229 226 196  229 226 196  229 226 192  229 226 196  229 226 192
-+229 226 196  229 226 192  229 226 196  227 222 178  66 66 66  138 129 110
-+138 129 110  66 66 66  138 129 110  138 129 110  66 66 66  138 129 110
-+66 66 66  114 84 45  66 66 66  138 129 110  66 66 66  135 101 60
-+66 66 66  66 66 66  138 129 110  66 66 66  66 66 66  138 129 110
-+66 66 66  114 84 45  66 66 66  138 129 110  66 66 66  142 111 68
-+66 66 66  138 129 110  66 66 66  142 111 68  66 66 66  138 129 110
-+66 66 66  142 111 68  66 66 66  142 111 68  185 178 149  227 221 169
-+227 220 160  227 219 152  226 218 148  227 218 146  226 217 137  226 217 137
-+163 154 123  75 62 40  57 50 17  57 50 17  57 50 17  56 48 15
-+56 48 15  47 39 13  47 39 13  44 35 11  37 31 10  37 31 10
-+29 24 7  25 20 6  22 17 5  18 15 5  13 11 4  9 7 3
-+5 4 1  3 3 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  9 9 9  66 66 66  138 129 110
-+138 129 110  138 129 110  138 129 110  66 66 66  140 134 120  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+140 134 120  66 66 66  140 134 120  66 66 66  140 134 120  140 134 120
-+138 129 110  66 66 66  140 134 120  200 196 176  230 228 209  229 226 192
-+229 226 196  229 226 196  229 226 196  229 226 196  230 227 197  230 227 197
-+230 227 197  229 226 196  229 226 196  192 187 164  138 129 110  138 129 110
-+66 66 66  138 129 110  66 66 66  138 129 110  66 66 66  138 129 110
-+66 66 66  138 129 110  66 66 66  66 66 66  66 66 66  138 129 110
-+66 66 66  66 66 66  66 66 66  114 84 45  66 66 66  66 66 66
-+138 129 110  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+100 76 42  66 66 66  100 76 42  66 66 66  100 76 42  66 66 66
-+114 84 45  66 66 66  135 101 60  66 66 66  114 84 45  138 129 110
-+216 206 146  227 221 169  227 219 152  227 219 152  226 218 148  227 218 146
-+226 217 137  226 217 137  142 111 68  57 50 17  57 50 17  57 50 17
-+56 48 15  47 39 13  47 39 13  47 39 13  44 35 11  37 31 10
-+37 31 10  31 27 8  27 23 7  23 19 6  16 14 4  14 11 4
-+10 9 3  7 5 2  4 3 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  24 24 24  138 129 110  140 134 120  66 66 66
-+140 134 120  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  140 134 120  66 66 66  140 134 120  140 134 120
-+66 66 66  140 134 120  140 134 120  140 134 120  138 129 110  138 129 110
-+138 129 110  140 134 120  163 154 123  230 227 197  229 226 196  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  229 226 192
-+230 227 197  230 227 197  230 227 197  176 168 138  138 129 110  66 66 66
-+138 129 110  114 84 45  138 129 110  66 66 66  138 129 110  66 66 66
-+66 66 66  66 66 66  138 129 110  66 66 66  66 66 66  66 66 66
-+66 66 66  138 129 110  66 66 66  66 66 66  66 66 66  57 50 17
-+35 34 31  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 17  57 50 17  57 50 17  57 50 17  70 58 37
-+75 62 40  163 154 123  227 221 169  227 219 152  227 219 152  226 218 148
-+226 218 148  226 218 148  226 217 137  176 168 138  75 62 40  57 50 17
-+57 50 17  57 50 17  57 50 17  47 39 13  47 39 13  47 39 13
-+37 31 10  37 31 10  31 27 8  27 23 7  23 19 6  18 15 5
-+14 11 4  10 9 3  7 5 2  4 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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
-+3 3 3  65 65 65  138 129 110  66 66 66  140 134 120  138 129 110
-+66 66 66  140 134 120  140 134 120  66 66 66  140 134 120  140 134 120
-+66 66 66  140 134 120  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+138 129 110  138 129 110  176 168 138  230 228 209  229 226 196  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  176 168 138  138 129 110  135 101 60
-+138 129 110  66 66 66  138 129 110  66 66 66  114 84 45  66 66 66
-+138 129 110  66 66 66  66 66 66  66 66 66  66 66 66  63 58 50
-+35 34 31  24 21 6  24 21 6  31 27 8  31 27 8  31 27 8
-+31 27 8  31 27 8  31 27 8  31 27 8  31 27 8  31 27 8
-+31 27 8  31 27 8  47 39 13  47 39 13  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 17  57 50 17  57 50 17  57 50 16
-+57 50 16  57 50 16  135 101 60  216 206 146  227 219 152  227 219 152
-+227 219 152  226 218 148  227 218 146  226 217 137  226 217 137  135 101 60
-+57 50 17  57 50 17  57 50 17  57 50 17  47 39 13  47 39 13
-+47 39 13  37 31 10  37 31 10  31 27 8  27 23 7  23 19 6
-+18 15 5  15 13 4  10 9 3  7 5 2  4 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1  17 17 17
-+66 66 66  138 129 110  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+140 134 120  66 66 66  138 129 110  138 129 110  140 134 120  140 134 120
-+66 66 66  138 129 110  200 196 176  229 226 196  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  150 141 118  138 129 110  66 66 66
-+138 129 110  66 66 66  135 101 60  66 66 66  138 129 110  66 66 66
-+66 66 66  52 52 52  35 34 31  24 21 6  24 21 6  16 14 4
-+16 14 4  16 14 4  16 14 4  16 14 4  16 14 4  16 14 4
-+20 17 5  24 21 6  24 21 6  24 21 6  31 27 8  31 27 8
-+31 27 8  37 31 10  31 27 8  37 31 10  31 27 8  47 39 13
-+35 34 31  57 50 16  57 50 16  57 50 17  57 50 16  57 50 17
-+57 50 16  57 50 16  57 50 16  90 68 33  176 168 138  227 219 152
-+227 219 152  227 219 152  226 218 148  227 218 146  226 218 148  226 217 137
-+163 154 123  57 50 17  57 50 17  57 50 17  57 50 17  56 48 15
-+47 39 13  47 39 13  41 32 10  37 31 10  31 27 8  29 24 7
-+24 21 6  18 15 5  15 13 4  11 9 3  7 5 2  4 3 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  27 27 27  138 129 110
-+138 129 110  66 66 66  140 134 120  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  138 129 110  66 66 66  140 134 120  138 129 110
-+138 129 110  140 134 120  230 227 201  230 227 199  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  163 154 123  138 129 110  66 66 66
-+138 129 110  66 66 66  138 129 110  66 66 66  66 66 66  57 50 16
-+31 27 8  24 21 6  16 14 4  15 13 4  10 9 3  10 9 3
-+10 9 3  10 9 3  10 9 3  10 9 3  10 9 3  15 13 4
-+16 14 4  16 14 4  16 14 4  16 14 4  24 21 6  24 21 6
-+31 27 8  31 27 8  31 27 8  31 27 8  35 34 31  37 31 10
-+47 39 13  47 39 13  47 39 13  57 50 16  57 50 16  57 50 16
-+57 50 17  57 50 16  57 50 16  57 50 16  57 50 16  163 154 123
-+226 217 139  227 219 152  227 219 152  226 218 148  226 218 148  227 218 146
-+226 217 137  224 212 126  75 62 40  57 50 16  57 50 17  56 48 15
-+47 39 13  56 48 15  47 39 13  37 31 10  37 31 10  31 27 8
-+29 24 7  24 21 6  18 15 5  15 13 4  10 9 3  7 5 2
-+4 3 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  1 1 1  52 52 52  66 66 66  138 129 110
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+140 134 120  66 66 66  138 129 110  138 129 110  138 129 110  66 66 66
-+138 129 110  163 154 123  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  229 226 196  138 129 110  138 129 110  114 84 45
-+138 129 110  100 76 42  58 54 45  47 39 13  31 27 8  24 21 6
-+16 14 4  10 9 3  10 9 3  6 5 1  3 3 1  3 3 1
-+3 3 1  3 3 1  6 5 1  6 5 1  6 5 1  6 5 1
-+10 9 3  10 9 3  10 9 3  16 14 4  16 14 4  16 14 4
-+24 21 6  24 21 6  31 27 8  31 27 8  31 27 8  37 31 10
-+31 27 8  37 31 10  47 39 13  37 31 10  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+142 111 68  227 219 152  227 219 152  227 219 152  226 218 148  226 218 148
-+226 218 148  216 206 146  224 214 136  114 84 45  57 50 17  57 50 17
-+57 50 17  57 50 17  47 39 13  47 39 13  44 35 11  37 31 10
-+31 27 8  29 24 7  24 21 6  18 15 5  15 13 4  10 9 3
-+7 5 2  3 3 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  52 52 52  138 129 110  138 129 110  66 66 66
-+140 134 120  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  140 134 120  66 66 66  138 129 110  138 129 110  138 129 110
-+138 129 110  185 178 149  230 228 209  229 226 196  230 227 197  230 227 197
-+230 227 199  230 227 199  230 227 199  230 227 199  230 227 199  230 227 199
-+230 227 199  230 227 199  229 226 196  138 129 110  66 66 66  66 66 66
-+57 50 17  57 50 16  47 39 13  31 27 8  31 27 8  24 21 6
-+24 21 6  15 13 4  6 5 1  3 3 1  3 3 1  1 1 1
-+1 1 1  1 1 1  1 1 1  3 3 1  3 3 1  3 3 1
-+3 3 1  6 5 1  6 5 1  10 9 3  10 9 3  15 13 4
-+16 14 4  16 14 4  24 21 6  24 21 6  31 27 8  31 27 8
-+31 27 8  31 27 8  37 31 10  47 39 13  35 34 31  47 39 13
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  100 76 42  226 218 148  227 219 152  227 219 152  226 218 148
-+226 218 148  227 218 146  226 218 148  226 217 139  142 111 68  57 50 17
-+57 50 17  56 48 15  56 48 15  47 39 13  47 39 13  47 39 13
-+37 31 10  31 27 8  29 24 7  24 21 6  18 15 5  14 11 4
-+9 7 3  5 4 1  3 3 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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  1 1 1
-+4 4 4  66 66 66  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  138 129 110  140 134 120  66 66 66  138 129 110  66 66 66
-+138 129 110  200 196 176  230 227 199  230 227 199  230 227 199  230 227 199
-+230 227 199  230 227 199  230 227 199  230 227 199  230 227 201  230 227 199
-+230 227 199  230 227 197  229 226 192  138 129 110  75 62 40  57 50 16
-+57 50 16  57 50 16  37 31 10  37 31 10  24 21 6  24 21 6
-+15 13 4  10 9 3  3 3 1  1 1 1  0 0 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  3 3 1  3 3 1  6 5 1  6 5 1  10 9 3
-+10 9 3  16 14 4  16 14 4  20 17 5  24 21 6  24 21 6
-+31 27 8  31 27 8  31 27 8  37 31 10  37 31 10  47 39 13
-+47 39 13  47 39 13  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 17  57 50 17  75 62 40  216 206 146  227 219 152  227 219 152
-+226 218 148  226 218 148  226 218 148  226 218 148  226 217 137  138 129 110
-+57 50 17  57 50 17  57 50 17  57 50 17  47 39 13  47 39 13
-+47 39 13  37 31 10  31 27 8  27 23 7  23 19 6  18 15 5
-+14 11 4  9 7 3  5 4 1  2 2 2  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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
-+65 65 65  138 129 110  138 129 110  66 66 66  140 134 120  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  138 129 110  138 129 110
-+138 129 110  229 226 192  230 227 199  230 227 199  230 227 201  230 227 199
-+230 227 201  230 227 201  230 227 201  230 227 201  230 227 201  230 227 201
-+230 227 201  229 226 196  229 226 192  71 64 51  57 50 16  57 50 16
-+57 50 16  37 31 10  37 31 10  31 27 8  31 27 8  24 21 6
-+16 14 4  10 9 3  6 5 1  3 3 1  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  1 1 1  1 1 1  1 1 1  3 3 1  3 3 1
-+6 5 1  10 9 3  10 9 3  15 13 4  16 14 4  16 14 4
-+24 21 6  24 21 6  31 27 8  31 27 8  31 27 8  37 31 10
-+47 39 13  47 39 13  47 39 13  57 50 16  57 50 16  57 50 16
-+57 50 17  57 50 17  57 50 17  75 62 40  216 206 146  226 218 148
-+227 219 152  226 218 148  226 218 148  227 218 146  226 217 139  226 217 137
-+163 154 123  57 50 16  57 50 16  57 50 16  56 48 15  47 39 13
-+47 39 13  44 35 11  37 31 10  31 27 8  27 23 7  23 19 6
-+18 15 5  13 11 4  9 7 3  5 4 1  2 2 2  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  1 1 1  5 5 5  66 66 66
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  138 129 110  138 129 110  138 129 110  66 66 66
-+140 134 120  229 226 196  230 227 201  230 227 201  230 227 201  230 227 201
-+230 227 201  230 227 201  230 227 199  230 227 201  230 227 201  230 227 197
-+229 226 192  229 226 192  228 223 179  100 76 42  57 50 16  57 50 16
-+57 50 16  57 50 16  47 39 13  31 27 8  31 27 8  16 14 4
-+15 13 4  8 7 4  3 3 1  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  1 1 1  1 1 1  3 3 1
-+3 3 1  6 5 1  6 5 1  10 9 3  10 9 3  16 14 4
-+16 14 4  24 21 6  24 21 6  31 27 8  31 27 8  31 27 8
-+37 31 10  37 31 10  47 39 13  47 39 13  47 39 13  57 50 16
-+57 50 16  57 50 17  57 50 16  57 50 16  57 50 17  216 206 146
-+227 219 152  227 219 152  227 219 152  226 218 148  227 218 146  227 217 139
-+224 212 126  163 154 123  57 50 17  57 50 17  57 50 17  57 50 17
-+47 39 13  47 39 13  44 35 11  37 31 10  31 27 8  27 23 7
-+23 19 6  18 15 5  13 11 4  7 5 2  4 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  65 65 65  138 129 110
-+138 129 110  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  140 134 120  66 66 66  66 66 66  140 134 120
-+66 66 66  66 66 66  140 134 120  66 66 66  66 66 66  66 66 66
-+140 134 120  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  138 129 110  66 66 66  138 129 110  66 66 66  138 129 110
-+176 168 138  229 226 192  230 227 201  230 227 201  230 227 201  230 227 201
-+230 227 201  230 227 201  230 227 201  230 227 199  229 226 192  229 226 192
-+229 226 192  229 226 192  229 226 192  71 64 51  57 50 16  57 50 16
-+47 39 13  35 34 31  31 27 8  37 31 10  31 27 8  20 17 5
-+16 14 4  10 9 3  3 3 1  1 1 1  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  1 1 1  1 1 1  3 3 1  1 1 1  3 3 1
-+3 3 1  3 3 1  3 3 1  6 5 1  10 9 3  10 9 3
-+10 9 3  16 14 4  16 14 4  24 21 6  24 21 6  31 27 8
-+31 27 8  37 31 10  37 31 10  47 39 13  47 39 13  57 50 16
-+57 50 16  57 50 16  57 50 17  57 50 16  57 50 17  75 61 38
-+216 206 146  226 218 148  227 219 152  227 219 152  227 218 146  227 218 146
-+227 218 146  226 217 137  163 154 123  71 53 16  57 50 16  57 50 17
-+56 48 15  47 39 13  47 39 13  37 31 10  37 31 10  31 27 8
-+24 21 6  22 17 5  16 14 4  11 9 3  7 5 2  3 3 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  1 1 1  65 65 65  66 66 66  138 129 110
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  66 66 66  140 134 120  66 66 66
-+66 66 66  140 134 120  66 66 66  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  138 129 110  66 66 66  138 129 110  142 111 68  138 129 110
-+185 178 149  230 227 201  230 227 201  230 227 201  230 227 202  230 227 202
-+230 227 202  230 227 202  230 227 197  229 226 192  229 226 192  229 226 192
-+229 226 192  229 226 192  229 226 192  100 76 42  57 50 16  57 50 16
-+57 50 16  57 50 16  47 39 13  31 27 8  24 21 6  20 17 5
-+15 13 4  8 7 4  5 4 1  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  1 1 1  1 1 1  2 2 2
-+3 3 1  4 3 1  5 4 1  5 4 1  5 4 1  5 4 1
-+5 4 1  6 5 1  6 5 1  5 5 5  6 5 1  10 9 3
-+10 9 3  10 9 3  16 14 4  16 14 4  24 21 6  24 21 6
-+31 27 8  37 31 10  37 31 10  37 31 10  47 39 13  47 39 13
-+56 48 15  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+70 58 37  216 206 146  227 219 152  227 219 152  227 219 152  227 218 146
-+227 218 146  226 217 137  226 217 137  163 154 123  57 50 17  57 50 17
-+57 50 17  57 50 17  47 39 13  47 39 13  37 31 10  37 31 10
-+31 27 8  25 20 6  20 17 5  15 13 4  10 9 3  5 4 1
-+3 3 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  43 43 43  138 129 110  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  66 66 66
-+140 134 120  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+66 66 66  140 134 120  66 66 66  66 66 66  140 134 120  66 66 66
-+138 129 110  66 66 66  138 129 110  138 129 110  66 66 66  138 129 110
-+185 178 149  230 227 201  230 227 202  230 227 202  230 227 202  230 227 202
-+230 227 201  230 227 197  229 226 192  229 226 192  229 226 192  229 226 192
-+229 226 192  229 226 192  229 226 192  100 76 42  57 50 17  57 50 16
-+47 39 13  37 31 10  37 31 10  31 27 8  31 27 8  20 17 5
-+15 13 4  6 6 6  3 3 1  1 1 1  0 0 0  0 0 0
-+0 0 0  1 1 1  2 2 2  3 3 1  5 4 1  5 4 1
-+7 5 2  9 7 3  11 9 3  11 9 3  11 9 3  14 11 4
-+14 11 4  13 11 4  13 11 4  10 9 3  15 13 4  10 9 3
-+10 9 3  15 13 4  16 14 4  16 14 4  14 14 14  24 21 6
-+24 21 6  31 27 8  31 27 8  37 31 10  47 39 13  47 39 13
-+47 39 13  57 50 16  57 50 16  57 50 17  57 50 16  57 50 16
-+57 50 16  90 68 33  226 218 148  227 219 152  227 219 152  227 218 146
-+227 218 146  227 218 146  227 217 139  226 217 137  163 154 123  56 48 15
-+57 50 16  56 48 15  56 48 15  47 39 13  47 39 13  37 31 10
-+37 31 10  27 23 7  24 21 6  18 15 5  14 11 4  9 7 3
-+5 4 1  2 2 2  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  0 0 0  0 0 0
-+2 2 2  22 22 22  138 129 110  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+66 66 66  66 66 66  140 134 120  66 66 66  66 66 66  140 134 120
-+66 66 66  66 66 66  66 66 66  140 134 120  66 66 66  138 129 110
-+66 66 66  138 129 110  66 66 66  138 129 110  66 66 66  138 129 110
-+200 196 176  230 227 202  230 227 201  230 228 209  230 227 202  230 227 197
-+229 226 192  229 226 192  229 226 192  229 226 192  229 226 192  230 227 197
-+229 226 192  229 226 192  229 226 192  66 66 66  57 50 16  57 50 16
-+57 50 16  47 39 13  47 39 13  31 27 8  31 27 8  16 14 4
-+15 13 4  10 9 3  5 4 1  0 0 0  0 0 0  0 0 0
-+2 2 2  3 3 1  5 4 1  7 5 2  11 9 3  14 11 4
-+14 11 4  15 13 4  18 15 5  18 15 5  18 15 5  20 17 5
-+20 17 5  20 17 5  20 17 5  20 17 5  18 15 5  18 15 5
-+16 14 4  16 14 4  16 14 4  20 17 5  16 14 4  24 21 6
-+24 21 6  31 27 8  31 27 8  37 31 10  37 31 10  47 39 13
-+47 39 13  56 48 15  57 50 16  57 50 16  57 50 16  71 53 16
-+57 50 17  57 50 17  114 84 45  227 219 152  227 219 152  227 219 152
-+227 219 152  227 218 146  227 217 139  226 217 137  226 217 137  149 122 79
-+57 50 17  57 50 17  56 48 15  56 48 15  47 39 13  47 39 13
-+37 31 10  31 27 8  27 23 7  23 19 6  18 15 5  13 11 4
-+9 7 3  4 3 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  0 0 0
-+16 16 16  66 66 66  138 129 110  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+66 66 66  140 134 120  66 66 66  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  66 66 66  66 66 66  140 134 120  66 66 66
-+66 66 66  140 134 120  66 66 66  66 66 66  140 134 120  66 66 66
-+138 129 110  66 66 66  138 129 110  135 101 60  138 129 110  66 66 66
-+230 227 197  230 228 209  230 227 201  230 227 201  230 227 197  229 226 192
-+229 226 192  230 227 197  229 226 192  230 227 197  229 226 192  230 227 197
-+230 227 197  230 227 197  230 227 197  100 76 42  57 50 16  57 50 16
-+47 39 13  35 34 31  37 31 10  31 27 8  31 27 8  16 14 4
-+16 14 4  6 6 6  3 3 1  1 1 1  1 1 1  4 3 1
-+5 4 1  9 7 3  11 9 3  14 11 4  17 13 4  18 15 5
-+22 17 5  23 19 6  25 20 6  27 23 7  27 23 7  29 24 7
-+29 24 7  29 24 7  29 24 7  27 23 7  27 23 7  24 21 6
-+24 21 6  24 21 6  20 17 5  20 17 5  24 21 6  20 17 5
-+24 21 6  24 21 6  31 27 8  31 27 8  37 31 10  37 31 10
-+47 39 13  47 39 13  56 48 15  57 50 16  57 50 17  57 50 17
-+71 53 16  57 50 17  57 50 17  149 122 79  227 219 152  227 219 152
-+227 219 152  227 219 152  227 218 146  227 218 146  226 217 137  226 217 137
-+135 101 60  57 50 17  57 50 17  56 48 15  47 39 13  47 39 13
-+44 35 11  37 31 10  31 27 8  27 23 7  22 17 5  16 14 4
-+11 9 3  7 5 2  3 3 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  1 1 1  9 9 9
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+66 66 66  66 66 66  140 134 120  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  140 134 120  66 66 66  66 66 66  138 129 110
-+66 66 66  138 129 110  66 66 66  138 129 110  114 84 45  138 129 110
-+230 227 201  230 227 202  230 227 201  230 227 197  229 226 192  230 227 197
-+230 227 197  229 226 192  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 228 209  100 76 42  57 50 16  57 50 16
-+57 50 16  57 50 16  47 39 13  31 27 8  31 27 8  20 17 5
-+15 13 4  10 9 3  5 4 1  5 4 1  5 4 1  9 7 3
-+13 11 4  15 13 4  18 15 5  22 17 5  25 20 6  27 23 7
-+29 24 7  31 27 8  35 26 8  35 26 8  38 29 9  38 29 9
-+38 29 9  38 29 9  37 31 10  38 29 9  35 26 8  31 27 8
-+31 27 8  29 24 7  27 23 7  24 21 6  24 21 6  24 21 6
-+24 21 6  24 21 6  27 23 7  31 27 8  31 27 8  37 31 10
-+37 31 10  47 39 13  47 39 13  57 50 16  57 50 17  71 53 16
-+57 50 17  71 53 16  57 50 16  57 50 16  163 154 123  227 219 152
-+227 219 152  227 219 152  227 218 146  227 218 146  227 218 146  227 218 146
-+226 217 137  100 76 42  57 50 17  57 50 17  57 50 17  47 39 13
-+47 39 13  37 31 10  37 31 10  31 27 8  25 20 6  18 15 5
-+15 13 4  10 9 3  5 4 1  2 2 2  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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  65 65 65
-+138 129 110  66 66 66  138 129 110  66 66 66  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  66 66 66  66 66 66  140 134 120
-+66 66 66  66 66 66  140 134 120  66 66 66  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+138 129 110  66 66 66  138 129 110  66 66 66  138 129 110  138 129 110
-+229 226 192  230 227 201  230 227 197  229 226 192  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  114 84 45  58 54 45  57 50 16
-+47 39 13  37 31 10  37 31 10  31 27 8  31 27 8  20 17 5
-+16 14 4  10 9 3  8 7 4  9 7 3  11 9 3  15 13 4
-+18 15 5  23 19 6  25 20 6  29 24 7  31 27 8  35 26 8
-+38 29 9  41 32 10  41 32 10  44 35 11  44 35 11  44 35 11
-+44 35 11  44 35 11  44 35 11  44 35 11  43 33 10  43 33 10
-+41 32 10  38 29 9  37 31 10  31 27 8  29 24 7  27 23 7
-+27 23 7  31 27 8  27 23 7  31 27 8  31 27 8  37 31 10
-+44 35 11  47 39 13  47 39 13  56 48 15  57 50 16  57 50 17
-+71 53 16  71 53 16  71 53 16  57 50 16  80 59 18  185 178 149
-+227 218 146  227 219 152  227 219 152  227 218 146  227 218 146  227 218 146
-+226 217 139  224 212 126  75 62 40  57 50 16  57 50 17  57 50 17
-+56 48 15  47 39 13  37 31 10  37 31 10  27 23 7  23 19 6
-+18 15 5  13 11 4  9 7 3  4 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  2 2 2  42 42 42  66 66 66
-+138 129 110  66 66 66  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+66 66 66  140 134 120  66 66 66  66 66 66  140 134 120  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  138 129 110
-+66 66 66  138 129 110  114 84 45  149 122 79  66 66 66  138 129 110
-+230 227 197  229 226 192  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 228 209  135 101 60  57 50 16  57 50 16
-+47 39 13  57 50 16  47 39 13  31 27 8  31 27 8  24 21 6
-+16 14 4  15 13 4  13 11 4  15 13 4  18 15 5  22 17 5
-+25 20 6  29 24 7  31 27 8  35 26 8  41 32 10  44 35 11
-+46 36 11  47 39 13  47 39 13  55 43 14  51 40 13  55 43 14
-+55 43 14  55 43 14  51 40 13  55 43 14  51 40 13  51 40 13
-+46 36 11  46 36 11  43 33 10  41 32 10  38 29 9  35 26 8
-+29 24 7  31 27 8  29 24 7  31 27 8  31 27 8  31 27 8
-+37 31 10  37 31 10  47 39 13  47 39 13  57 50 16  57 50 17
-+57 50 17  71 53 16  57 50 17  71 53 16  71 53 16  90 68 33
-+226 217 139  227 219 152  227 219 152  226 218 148  227 218 146  226 218 148
-+226 217 139  226 217 137  176 168 138  71 53 16  57 50 17  57 50 17
-+56 48 15  47 39 13  47 39 13  37 31 10  37 31 10  27 23 7
-+22 17 5  16 14 4  11 9 3  7 5 2  3 3 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  11 11 11  66 66 66  138 129 110
-+66 66 66  140 134 120  66 66 66  66 66 66  140 134 120  66 66 66
-+66 66 66  140 134 120  66 66 66  66 66 66  66 66 66  66 66 66
-+140 134 120  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+140 134 120  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  138 129 110
-+66 66 66  142 111 68  66 66 66  138 129 110  66 66 66  150 141 118
-+229 226 192  229 226 192  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 199  230 227 199  230 227 199  230 227 199
-+230 227 201  230 227 201  230 227 201  138 129 110  37 31 10  57 50 16
-+57 50 16  47 39 13  37 31 10  37 31 10  31 27 8  24 21 6
-+24 21 6  16 14 4  18 15 5  18 15 5  23 17 5  28 21 6
-+35 26 8  38 29 9  41 32 10  44 35 11  47 39 13  51 40 13
-+55 43 14  55 44 14  58 46 15  56 48 15  59 49 15  59 49 15
-+59 49 15  59 49 15  59 49 15  59 49 15  58 46 15  58 46 15
-+55 43 14  51 40 13  51 40 13  50 37 12  44 35 11  41 32 10
-+38 29 9  35 25 8  35 25 8  35 25 8  35 25 8  35 25 8
-+38 29 9  41 32 10  44 35 11  51 40 13  51 40 13  57 50 16
-+57 50 17  71 53 16  80 59 18  57 50 17  80 59 18  57 50 16
-+142 111 68  227 219 152  227 219 152  227 219 152  226 218 148  227 218 146
-+227 218 146  226 217 137  226 217 137  149 122 79  80 59 18  57 50 17
-+57 50 17  57 50 17  47 39 13  47 39 13  37 31 10  31 27 8
-+25 20 6  18 15 5  14 11 4  9 7 3  5 4 1  2 2 2
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  1 1 1  3 3 3  66 66 66  138 129 110  66 66 66
-+140 134 120  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+140 134 120  66 66 66  66 66 66  66 66 66  140 134 120  66 66 66
-+66 66 66  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  138 129 110  66 66 66
-+66 66 66  138 129 110  66 66 66  135 101 60  75 62 40  138 129 110
-+229 226 192  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 199  230 227 199  230 227 201  230 227 201  230 227 201  230 227 201
-+230 227 201  230 227 201  227 222 178  138 129 110  57 50 16  57 50 16
-+57 50 16  57 50 16  47 39 13  37 31 10  31 27 8  27 23 7
-+27 23 7  25 20 6  23 17 5  28 21 6  29 24 7  35 26 8
-+37 31 10  43 33 10  46 36 11  51 40 13  55 44 14  55 44 14
-+59 49 15  57 50 17  67 48 15  59 49 15  71 53 16  71 53 16
-+71 53 16  71 53 16  71 53 16  71 53 16  67 48 15  59 49 15
-+67 48 15  58 46 15  58 46 15  55 43 14  51 40 13  50 37 12
-+44 35 11  41 32 10  38 27 8  38 27 8  35 25 8  35 25 8
-+38 27 8  38 29 9  43 33 10  50 37 12  51 40 13  59 49 15
-+57 50 16  57 50 17  80 59 18  57 50 17  80 59 18  71 53 16
-+71 53 16  163 154 123  227 219 152  227 219 152  227 219 152  227 218 146
-+227 218 146  227 218 146  226 217 137  226 217 137  114 84 45  57 50 17
-+71 53 16  57 50 17  56 48 15  47 39 13  47 39 13  37 31 10
-+29 24 7  23 19 6  18 15 5  13 11 4  7 5 2  4 3 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  41 41 41  66 66 66  66 66 66  138 129 110
-+66 66 66  140 134 120  66 66 66  66 66 66  140 134 120  66 66 66
-+66 66 66  66 66 66  140 134 120  66 66 66  66 66 66  66 66 66
-+140 134 120  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  140 134 120  66 66 66  66 66 66  66 66 66
-+140 134 120  66 66 66  66 66 66  66 66 66  66 66 66  138 129 110
-+66 66 66  142 111 68  66 66 66  71 64 51  57 50 16  150 141 118
-+228 223 179  230 227 197  230 227 197  230 227 199  230 227 199  230 227 199
-+230 227 201  230 227 201  230 227 201  230 227 201  230 227 202  230 227 202
-+230 227 202  230 227 202  230 227 202  138 129 110  47 39 13  57 50 16
-+57 50 16  47 39 13  47 39 13  47 39 13  31 27 8  31 27 8
-+31 27 8  29 24 7  31 27 8  35 25 8  38 29 9  43 33 10
-+46 36 11  51 40 13  55 43 14  58 46 15  59 49 15  67 48 15
-+71 53 16  71 53 16  71 53 16  71 53 16  80 59 18  71 53 16
-+71 53 16  80 59 18  71 53 16  71 53 16  71 53 16  71 53 16
-+71 53 16  71 53 16  59 49 15  59 49 15  58 46 15  55 43 14
-+50 37 12  46 36 11  43 33 10  38 27 8  38 27 8  38 27 8
-+38 27 8  41 32 10  38 29 9  46 36 11  51 40 13  55 43 14
-+59 49 15  57 50 16  71 53 16  80 59 18  57 50 17  80 59 18
-+80 59 18  90 68 33  224 214 136  227 220 160  227 219 152  227 219 152
-+227 218 146  227 218 146  227 218 146  226 217 139  224 212 126  75 61 38
-+71 53 16  57 50 17  57 50 17  55 44 14  47 39 13  44 35 11
-+37 31 10  24 21 6  20 17 5  15 13 4  10 9 3  5 4 1
-+2 2 2  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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
-+1 1 1  5 5 5  138 129 110  66 66 66  140 134 120  66 66 66
-+66 66 66  66 66 66  140 134 120  66 66 66  66 66 66  66 66 66
-+140 134 120  66 66 66  66 66 66  66 66 66  140 134 120  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  140 134 120
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  138 129 110  66 66 66  114 84 45
-+66 66 66  142 111 68  71 64 51  57 50 16  57 50 16  150 141 118
-+230 227 197  230 227 199  230 227 199  230 227 201  230 227 201  230 227 201
-+230 227 201  230 227 202  230 227 202  230 227 202  230 227 202  230 227 202
-+230 227 202  230 228 209  229 226 192  138 129 110  57 50 16  57 50 16
-+57 50 16  57 50 16  47 39 13  37 31 10  44 35 11  37 31 10
-+37 31 10  35 26 8  38 29 9  38 29 9  41 32 10  46 36 11
-+51 40 13  55 44 14  59 49 15  59 49 15  71 53 16  71 53 16
-+80 59 18  71 53 16  80 59 18  71 53 16  80 59 18  70 58 37
-+71 53 16  80 59 18  70 58 37  80 59 18  80 59 18  80 59 18
-+71 53 16  79 57 18  71 53 16  71 53 16  67 48 15  59 45 14
-+59 45 14  51 40 13  50 37 12  49 31 9  38 29 9  48 30 8
-+38 27 8  48 30 8  38 29 9  43 33 10  46 36 11  51 40 13
-+59 49 15  57 50 16  57 50 17  71 53 16  80 59 18  57 50 17
-+80 59 18  57 50 17  142 111 68  227 219 152  227 219 152  227 219 152
-+227 218 146  227 218 146  227 218 146  226 217 139  224 212 126  163 154 123
-+71 53 16  71 53 16  59 49 15  57 50 16  55 44 14  47 39 13
-+44 35 11  29 24 7  24 21 6  18 15 5  13 11 4  9 7 3
-+4 3 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  52 52 52  66 66 66  138 129 110  66 66 66  66 66 66
-+140 134 120  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+66 66 66  66 66 66  140 134 120  66 66 66  66 66 66  66 66 66
-+66 66 66  140 134 120  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  138 129 110
-+66 66 66  71 64 51  57 50 16  57 50 16  57 50 16  163 154 123
-+229 226 192  230 227 201  230 227 201  230 227 201  230 227 201  230 227 202
-+230 227 202  230 227 202  230 227 202  231 228 207  230 227 204  230 227 204
-+230 228 209  230 227 202  230 228 209  150 141 118  57 50 16  57 50 16
-+57 50 16  57 50 16  47 39 13  47 39 13  47 39 13  37 31 10
-+44 35 11  43 33 10  43 33 10  44 35 11  50 37 12  55 43 14
-+58 46 15  59 49 15  71 53 16  71 53 16  80 59 18  71 53 16
-+70 58 37  80 59 18  90 68 33  138 129 110  163 154 123  200 196 176
-+192 187 164  200 196 176  185 178 149  163 154 123  135 101 60  70 58 37
-+80 59 18  80 59 18  80 59 18  71 53 16  71 53 16  71 53 16
-+59 49 15  60 42 13  51 40 13  50 37 12  43 33 10  41 32 10
-+38 27 8  38 27 8  38 27 8  48 30 8  46 36 11  50 37 12
-+55 43 14  59 49 15  71 53 16  57 50 17  80 59 18  80 59 18
-+80 59 18  80 59 18  57 50 17  185 178 149  227 218 146  227 219 152
-+227 219 152  227 218 146  227 218 146  227 218 146  226 217 137  226 217 137
-+118 85 44  71 53 16  71 53 16  57 50 17  57 50 16  51 40 13
-+47 39 13  37 31 10  27 23 7  22 17 5  16 14 4  11 9 3
-+5 4 1  2 2 2  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  1 1 1  2 2 2
-+14 14 14  138 129 110  66 66 66  66 66 66  140 134 120  66 66 66
-+66 66 66  140 134 120  66 66 66  66 66 66  66 66 66  66 66 66
-+140 134 120  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  138 129 110  114 84 45  66 66 66
-+71 64 51  57 50 16  57 50 16  57 50 16  57 50 16  176 168 138
-+230 227 199  230 227 201  230 227 201  230 227 202  230 227 202  230 227 202
-+230 227 202  231 228 207  230 227 204  230 227 205  230 227 204  230 228 209
-+230 227 202  230 228 209  230 227 199  176 168 138  57 50 16  57 50 16
-+57 50 16  57 50 16  47 39 13  56 48 15  47 39 13  47 39 13
-+47 39 13  46 36 11  50 37 12  50 37 12  55 43 14  59 49 15
-+59 49 15  71 53 16  71 53 16  71 53 16  80 59 18  71 53 16
-+100 76 42  163 154 123  229 226 196  230 227 197  230 227 197  230 227 197
-+229 226 192  229 226 192  229 226 192  229 226 192  229 226 196  224 217 160
-+138 129 110  80 59 18  80 59 18  80 59 18  80 59 18  71 53 16
-+71 53 16  67 48 15  59 45 14  57 41 13  50 37 12  49 31 9
-+48 30 8  38 27 8  48 30 8  41 32 10  48 30 8  50 37 12
-+51 40 13  59 49 15  57 50 16  80 59 18  57 50 17  80 59 18
-+70 58 37  80 59 18  80 59 18  107 78 37  226 218 148  227 219 152
-+227 219 152  227 219 152  227 218 146  227 218 146  226 217 137  226 217 137
-+224 212 126  80 59 18  71 53 16  71 53 16  59 49 15  56 48 15
-+51 40 13  44 35 11  31 27 8  25 20 6  18 15 5  14 11 4
-+9 7 3  4 3 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  1 1 1
-+66 66 66  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+66 66 66  66 66 66  140 134 120  66 66 66  66 66 66  140 134 120
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  176 168 138
-+229 226 196  230 227 202  230 227 202  230 227 202  230 228 209  230 227 202
-+231 228 207  230 227 204  231 228 207  230 228 209  230 227 205  230 227 205
-+230 228 209  230 228 209  230 228 209  176 168 138  57 50 16  80 59 18
-+57 50 17  57 50 16  57 50 16  56 48 15  47 39 13  55 44 14
-+51 40 13  51 40 13  51 40 13  55 43 14  58 46 15  59 49 15
-+71 53 16  79 57 18  80 59 18  70 58 37  80 59 18  138 129 110
-+229 226 192  230 227 202  230 227 202  230 227 202  230 227 201  230 227 199
-+230 227 199  230 227 197  230 227 197  230 227 197  229 226 196  229 226 196
-+229 226 192  192 187 164  100 76 42  80 59 18  80 59 18  80 59 18
-+79 57 18  71 53 16  67 48 15  60 42 13  57 41 13  50 37 12
-+49 31 9  48 30 8  41 32 10  38 27 8  48 30 8  49 31 9
-+51 40 13  60 42 13  59 49 15  59 49 15  80 59 18  71 53 16
-+80 59 18  80 59 18  80 59 18  80 59 18  163 154 123  227 218 146
-+227 219 152  227 219 152  227 218 146  227 218 146  227 218 146  226 217 137
-+226 217 137  149 122 79  80 59 18  57 50 17  71 53 16  57 50 17
-+55 44 14  47 39 13  37 31 10  27 23 7  23 19 6  16 14 4
-+11 9 3  7 5 2  2 2 2  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  2 2 2  35 35 35
-+66 66 66  140 134 120  66 66 66  66 66 66  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  66 66 66  66 66 66  140 134 120
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  176 168 138
-+230 227 202  230 227 201  230 228 209  230 227 204  230 227 204  230 227 205
-+230 227 205  231 228 207  230 227 204  231 228 207  230 228 209  230 228 209
-+230 227 204  230 228 209  230 228 209  192 187 164  57 50 17  71 53 16
-+57 50 17  57 50 17  57 50 16  56 48 15  56 48 15  55 44 14
-+58 46 15  59 45 14  58 46 15  59 49 15  67 48 15  71 53 16
-+71 53 16  80 59 18  80 59 18  80 59 18  150 141 118  229 226 196
-+230 227 202  230 227 204  230 227 204  230 227 202  230 227 202  230 227 201
-+230 227 201  230 227 201  230 227 199  230 227 199  229 226 196  229 226 196
-+230 227 197  230 227 197  227 222 178  114 84 45  90 65 21  80 59 18
-+80 59 18  79 57 18  71 53 16  67 48 15  60 42 13  57 41 13
-+49 31 9  48 30 8  48 30 8  48 30 8  48 30 8  49 31 9
-+50 37 12  60 42 13  59 49 15  57 50 16  71 53 16  57 50 16
-+80 59 18  80 59 18  80 59 18  80 59 18  96 71 33  226 218 148
-+227 219 152  227 219 152  227 218 146  227 218 146  227 218 146  226 217 139
-+226 217 137  226 217 137  90 68 33  80 59 18  71 53 16  59 49 15
-+58 46 15  55 43 14  44 35 11  31 27 8  25 20 6  18 15 5
-+14 11 4  9 7 3  4 3 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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  66 66 66
-+66 66 66  66 66 66  138 129 110  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  138 129 110  65 65 65  57 50 16  37 31 10
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  185 178 149
-+230 228 209  230 227 201  230 228 209  230 227 202  230 228 209  230 228 209
-+230 228 209  231 228 207  230 228 209  231 228 207  230 228 209  231 228 207
-+230 228 209  230 228 209  230 228 209  200 196 176  80 59 18  57 50 17
-+80 59 18  57 50 17  71 53 16  57 50 16  59 49 15  67 48 15
-+59 49 15  67 48 15  59 49 15  69 49 15  71 53 16  71 53 16
-+80 59 18  80 59 18  80 59 18  138 129 110  230 227 199  230 228 209
-+230 228 209  230 227 204  230 227 204  230 227 204  230 227 202  230 227 202
-+230 227 202  230 227 201  230 227 201  230 227 199  230 227 199  230 227 197
-+230 227 197  230 227 197  229 226 196  227 222 178  100 76 42  80 59 18
-+90 65 21  80 59 18  71 53 16  71 53 16  67 48 15  60 42 13
-+58 38 12  49 31 9  49 31 9  48 30 8  43 33 10  48 30 8
-+50 37 12  58 38 12  60 42 13  67 48 15  71 53 16  80 59 18
-+80 59 18  80 59 18  80 59 18  80 59 18  80 59 18  149 122 79
-+227 220 160  227 219 152  227 219 152  227 218 146  227 218 146  227 218 146
-+226 217 137  226 217 137  163 154 123  80 59 18  71 53 16  71 53 16
-+57 50 17  59 49 15  51 40 13  37 31 10  27 23 7  23 19 6
-+16 14 4  11 9 3  5 4 1  2 2 2  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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  1 1 1  7 7 7  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  140 134 120  66 66 66
-+66 66 66  140 134 120  66 66 66  66 66 66  140 134 120  66 66 66
-+66 66 66  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  65 65 65  37 31 10  31 27 8  47 39 13
-+37 31 10  57 50 16  57 50 16  57 50 16  57 50 16  185 178 149
-+230 227 202  230 227 202  230 228 209  230 227 204  230 228 209  231 228 207
-+231 228 207  231 228 207  230 228 209  231 228 207  230 228 209  230 228 209
-+230 228 209  230 228 209  230 228 209  229 226 192  57 50 17  80 59 18
-+71 53 16  71 53 16  57 50 17  71 53 16  67 48 15  67 48 15
-+67 48 15  67 48 15  71 53 16  71 53 16  71 53 16  80 59 18
-+80 59 18  75 61 38  114 84 45  230 227 202  231 228 207  230 228 209
-+230 227 204  230 228 209  230 227 205  230 227 205  230 227 202  231 228 207
-+230 227 202  230 227 202  230 227 201  230 227 201  230 227 199  230 227 199
-+230 227 197  230 227 197  230 227 197  230 227 197  192 187 164  90 68 33
-+90 65 21  80 59 18  80 59 18  78 55 17  71 51 16  67 48 15
-+60 42 13  57 34 10  49 31 9  48 30 8  48 30 8  48 30 8
-+49 31 9  57 34 10  60 42 13  59 49 15  71 53 16  57 50 16
-+80 59 18  80 59 18  80 59 18  80 59 18  90 65 21  96 71 33
-+227 219 152  227 219 152  227 219 152  227 219 152  227 218 146  227 218 146
-+226 217 139  226 217 137  224 212 126  110 81 38  71 53 16  80 59 18
-+71 53 16  59 49 15  55 43 14  37 31 10  31 27 8  25 20 6
-+18 15 5  13 11 4  9 7 3  4 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  4 4 4
-+12 12 12  26 26 26  42 42 42  65 65 65  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  65 65 65  65 65 65
-+66 66 66  66 66 66  35 35 35  31 27 8  31 27 8  47 39 13
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  185 178 149
-+230 228 209  230 228 209  230 227 202  230 228 209  230 228 209  230 227 204
-+230 228 209  231 228 207  231 229 212  231 228 207  231 229 212  231 229 212
-+230 228 209  231 229 212  230 228 209  230 228 209  71 53 16  80 59 18
-+57 50 17  80 59 18  71 53 16  71 53 16  71 53 16  71 53 16
-+71 53 16  71 53 16  71 53 16  79 57 18  80 59 18  80 59 18
-+90 65 21  80 59 18  200 196 176  230 228 209  230 228 209  231 228 207
-+231 228 207  230 228 209  230 227 205  231 228 207  230 227 205  230 227 204
-+230 227 204  230 227 202  230 227 202  230 227 201  230 227 201  230 227 201
-+230 227 199  230 227 197  230 227 197  230 227 197  230 227 197  149 122 79
-+90 65 21  90 65 21  80 59 18  80 59 18  71 53 16  69 49 15
-+60 42 13  58 38 12  57 34 10  49 31 9  48 30 8  48 30 8
-+49 31 9  57 34 10  58 38 12  60 42 13  67 48 15  71 53 16
-+80 59 18  80 59 18  80 59 18  90 68 33  80 59 18  80 59 18
-+163 154 123  226 217 139  227 219 152  227 219 152  227 218 146  227 218 146
-+227 218 146  226 217 137  226 217 137  163 154 123  80 59 18  80 59 18
-+71 53 16  71 53 16  58 46 15  47 39 13  37 31 10  27 23 7
-+22 17 5  15 13 4  10 9 3  5 4 1  2 2 2  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  2 2 2  4 4 4
-+6 6 6  10 10 10  13 13 13  18 18 18  26 26 26  50 50 50
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  65 65 65  52 52 52  52 52 52  65 65 65
-+52 52 52  45 45 45  19 19 19  31 27 8  31 27 8  47 39 13
-+37 31 10  57 50 16  57 50 16  57 50 16  57 50 16  185 178 149
-+230 227 202  230 228 209  230 228 209  230 228 209  230 228 209  230 228 209
-+230 228 209  231 228 207  231 229 212  230 228 209  231 229 212  230 228 209
-+231 229 212  231 229 212  231 229 212  231 229 212  75 62 40  80 59 18
-+80 59 18  80 59 18  71 53 16  80 59 18  71 53 16  71 53 16
-+71 53 16  80 59 18  71 53 16  80 59 18  80 59 18  80 59 18
-+80 59 18  142 111 68  230 228 209  230 228 209  230 228 209  230 228 209
-+230 228 209  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+231 228 207  230 227 204  230 227 202  230 227 202  230 227 201  230 227 201
-+230 227 201  230 227 199  230 227 197  229 226 196  229 226 196  227 222 178
-+91 66 24  90 65 21  90 65 21  80 59 18  79 57 18  71 51 16
-+68 47 15  60 42 13  58 38 12  49 31 9  48 30 8  48 30 8
-+48 30 8  50 37 12  58 38 12  59 45 14  59 49 15  71 53 16
-+71 53 16  80 59 18  80 59 18  80 59 18  90 65 21  80 59 18
-+97 69 27  227 219 152  227 219 152  227 219 152  227 219 152  227 218 146
-+227 218 146  226 217 137  226 217 137  226 217 137  110 81 38  80 59 18
-+71 53 16  71 53 16  59 49 15  51 40 13  37 31 10  31 27 8
-+24 21 6  18 15 5  13 11 4  7 5 2  3 3 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1
-+2 2 2  4 4 4  6 6 6  8 8 8  11 11 11  16 16 16
-+22 22 22  30 30 30  52 52 52  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+65 65 65  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  19 19 19  24 21 6  31 27 8  37 31 10  47 39 13
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 17  185 178 149
-+230 228 209  230 228 209  230 228 209  230 227 204  230 228 209  230 228 209
-+231 229 212  231 229 212  231 229 212  230 228 210  231 229 212  231 229 212
-+231 229 212  231 229 212  231 229 212  231 229 212  100 76 42  75 61 38
-+80 59 18  71 53 16  80 59 18  71 53 16  80 59 18  80 59 18
-+80 59 18  80 59 18  80 59 18  80 59 18  80 59 18  90 68 33
-+80 59 18  176 168 138  230 228 210  231 229 212  230 228 209  230 228 209
-+230 228 209  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+230 227 204  230 227 205  230 227 204  230 227 202  230 227 202  230 227 201
-+230 227 201  230 227 199  230 227 199  230 227 197  229 226 196  229 226 196
-+135 101 60  90 65 21  90 65 21  90 65 21  79 57 18  78 55 17
-+69 49 15  68 47 15  62 38 11  56 33 8  49 31 9  48 30 8
-+49 31 9  56 33 8  57 34 10  60 42 13  68 47 15  71 53 16
-+71 53 16  80 59 18  80 59 18  90 65 21  90 65 21  90 65 21
-+80 59 18  163 154 123  227 219 152  227 219 152  227 219 152  227 218 146
-+227 218 146  227 218 146  226 217 137  226 217 137  163 154 123  90 65 21
-+80 59 18  71 53 16  71 53 16  59 49 15  41 32 10  31 27 8
-+27 23 7  20 17 5  15 13 4  9 7 3  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  1 1 1
-+2 2 2  2 2 2  4 4 4  6 6 6  8 8 8  11 11 11
-+14 14 14  20 20 20  26 26 26  33 33 33  50 50 50  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  65 65 65  65 65 65  65 65 65  52 52 52
-+52 52 52  65 65 65  52 52 52  52 52 52  52 52 52  52 52 52
-+24 24 24  14 14 14  24 21 6  31 27 8  31 27 8  47 39 13
-+35 34 31  47 39 13  57 50 16  57 50 17  57 50 17  176 168 138
-+230 228 209  230 228 209  230 228 209  230 228 209  231 229 212  230 228 209
-+231 229 212  230 228 210  231 229 212  231 229 212  231 229 212  231 229 214
-+231 229 214  231 229 214  231 229 212  231 230 220  142 111 68  80 59 18
-+80 59 18  80 59 18  80 59 18  80 59 18  75 61 38  80 59 18
-+80 59 18  80 59 18  80 59 18  91 66 24  80 59 18  90 65 21
-+80 59 18  229 226 196  231 229 212  231 229 212  231 229 212  231 229 212
-+231 229 212  230 228 209  231 228 207  230 228 209  231 228 207  231 228 207
-+231 228 207  231 228 207  230 227 205  230 227 204  230 227 202  230 227 202
-+230 227 201  230 227 201  230 227 199  230 227 199  229 226 196  229 226 196
-+163 154 123  91 66 24  90 65 21  90 65 21  80 59 18  79 57 18
-+75 50 15  68 47 15  62 38 11  57 34 10  56 33 8  48 30 8
-+49 31 9  49 31 9  58 38 12  62 38 11  68 47 15  71 53 16
-+71 53 16  80 59 18  80 59 18  80 59 18  90 65 21  90 65 21
-+90 65 21  134 96 54  227 219 152  227 219 152  227 219 152  227 218 146
-+227 218 146  227 218 146  226 217 137  226 217 137  224 212 126  110 81 38
-+80 59 18  80 59 18  71 53 16  67 48 15  47 39 13  37 31 10
-+29 24 7  23 19 6  18 15 5  13 11 4  7 5 2  3 3 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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
-+1 1 1  1 1 1  1 1 1  2 2 2  3 3 3  5 5 5
-+6 6 6  9 9 9  12 12 12  16 16 16  20 20 20  27 27 27
-+35 35 35  52 52 52  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  65 65 65  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  37 37 37
-+14 14 14  11 11 11  24 21 6  31 27 8  37 31 10  47 39 13
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 17  176 168 138
-+230 228 209  230 228 209  230 228 209  230 228 209  231 229 212  231 229 212
-+231 229 212  231 229 212  231 229 214  231 229 214  231 229 214  231 229 214
-+231 229 214  231 229 214  231 229 214  231 229 214  138 129 110  57 50 16
-+80 59 18  80 59 18  80 59 18  80 59 18  80 59 18  80 59 18
-+80 59 18  90 68 33  80 59 18  90 65 21  90 65 21  90 65 21
-+100 76 42  230 228 210  230 228 210  231 229 212  231 229 212  230 228 209
-+231 229 212  230 228 209  230 228 209  230 228 209  231 228 207  231 228 207
-+231 228 207  231 228 207  231 228 207  230 227 205  230 227 204  230 227 202
-+230 227 202  230 227 201  230 227 201  230 227 199  229 226 196  229 226 196
-+185 178 149  90 65 21  91 66 24  91 66 24  90 65 21  80 59 18
-+75 50 15  68 47 15  68 47 15  57 34 10  56 33 8  48 30 8
-+56 33 8  56 33 8  57 34 10  62 38 11  60 42 13  69 49 15
-+71 53 16  80 59 18  80 59 18  90 65 21  90 65 21  90 65 21
-+90 65 21  90 65 21  216 206 146  226 218 148  227 219 152  226 218 148
-+227 218 146  227 218 146  227 217 139  226 217 137  226 217 137  163 154 123
-+80 59 18  80 59 18  80 59 18  71 53 16  56 48 15  37 31 10
-+31 27 8  25 20 6  18 15 5  14 11 4  9 7 3  4 3 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1  1 1 1  1 1 1  2 2 2  3 3 3
-+4 4 4  6 6 6  7 7 7  10 10 10  13 13 13  18 18 18
-+22 22 22  30 30 30  37 37 37  47 47 47  65 65 65  65 65 65
-+65 65 65  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  50 50 50  50 50 50  47 47 47  12 12 12
-+9 9 9  16 14 4  24 21 6  31 27 8  31 27 8  47 39 13
-+37 31 10  57 50 16  57 50 16  57 50 17  57 50 17  176 168 138
-+230 228 209  230 228 209  230 228 209  231 229 212  231 229 212  231 229 212
-+231 229 212  231 229 212  231 229 214  231 229 214  231 229 214  231 229 214
-+231 229 214  231 229 214  231 229 214  230 228 209  138 129 110  80 59 18
-+90 65 21  80 59 18  80 59 18  80 59 18  90 65 21  80 59 18
-+90 65 21  80 59 18  90 65 21  91 66 24  80 59 18  90 68 33
-+114 84 45  231 229 214  231 229 214  231 229 214  231 229 212  231 229 212
-+230 228 210  231 229 212  230 228 210  230 228 209  230 228 209  231 228 207
-+231 228 207  231 228 207  230 227 205  231 228 207  230 227 205  230 227 204
-+230 227 202  230 227 202  230 227 201  230 227 201  230 227 199  230 227 201
-+216 206 146  97 69 27  97 69 27  90 65 21  90 63 20  80 59 18
-+78 55 17  75 50 15  68 47 15  62 38 11  57 34 10  56 33 8
-+48 30 8  56 33 8  57 34 10  62 38 11  62 38 11  69 49 15
-+71 53 16  80 59 18  80 59 18  80 59 18  90 65 21  90 65 21
-+90 65 21  80 59 18  149 122 79  227 219 152  227 219 152  227 219 152
-+227 218 146  227 218 146  227 218 146  226 217 137  224 212 126  224 212 126
-+90 65 21  80 59 18  80 59 18  71 53 16  57 50 17  37 31 10
-+37 31 10  27 23 7  22 17 5  15 13 4  10 9 3  5 4 1
-+2 2 2  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1  1 1 1  1 1 1
-+2 2 2  2 2 2  3 3 3  4 4 4  6 6 6  8 8 8
-+10 10 10  13 13 13  17 17 17  21 21 21  26 26 26  35 35 35
-+50 50 50  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  49 49 49  47 47 47  46 46 46  28 28 28  11 11 11
-+8 8 8  11 11 11  24 21 6  31 27 8  31 27 8  47 39 13
-+57 50 16  57 50 16  57 50 16  57 50 17  57 50 17  163 154 123
-+231 230 220  230 228 209  231 229 212  231 229 212  231 229 212  231 229 214
-+231 229 214  231 229 214  231 229 214  231 229 214  231 229 214  231 229 217
-+231 229 217  231 229 217  231 230 220  231 229 214  163 154 123  80 59 18
-+80 59 18  90 68 33  80 59 18  91 66 24  80 59 18  90 68 33
-+90 65 21  90 65 21  90 65 21  90 65 21  91 66 24  90 65 21
-+135 101 60  231 230 220  231 229 214  231 229 214  231 229 214  231 229 214
-+231 229 212  231 229 212  230 228 210  230 228 210  230 228 210  230 228 209
-+231 228 207  231 228 207  231 228 207  231 228 207  230 227 205  230 227 205
-+230 227 204  230 227 202  230 227 202  230 227 201  230 227 201  230 227 199
-+200 196 176  97 69 27  97 69 27  90 65 21  90 65 21  90 63 20
-+78 55 17  75 50 15  68 47 15  62 38 11  62 38 11  56 33 8
-+48 30 8  56 33 8  56 33 8  62 38 11  62 38 11  68 47 15
-+75 50 15  78 55 17  80 59 18  90 65 21  90 65 21  90 65 21
-+90 65 21  90 65 21  107 78 37  226 218 148  227 219 152  227 219 152
-+227 218 146  227 218 146  227 218 146  226 217 137  226 217 137  226 217 137
-+142 111 68  80 59 18  80 59 18  80 59 18  71 53 16  47 39 13
-+37 31 10  29 24 7  24 21 6  18 15 5  13 11 4  7 5 2
-+3 3 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1
-+1 1 1  1 1 1  2 2 2  3 3 3  4 4 4  5 5 5
-+7 7 7  8 8 8  10 10 10  13 13 13  17 17 17  24 24 24
-+30 30 30  42 42 42  52 52 52  52 52 52  52 52 52  49 49 49
-+47 47 47  46 46 46  45 45 45  38 38 38  9 9 9  5 5 5
-+7 7 7  16 14 4  24 21 6  31 27 8  37 31 10  35 34 31
-+47 39 13  57 50 16  57 50 17  57 50 17  57 50 17  150 141 118
-+230 228 210  230 228 210  231 229 212  231 229 212  231 229 214  231 229 214
-+231 229 214  231 229 214  231 229 214  231 229 217  231 229 217  231 229 217
-+231 230 220  231 229 214  231 230 220  231 230 220  185 178 149  80 59 18
-+90 65 21  80 59 18  90 65 21  90 65 21  90 65 21  90 65 21
-+90 65 21  90 65 21  91 66 24  90 65 21  91 66 24  91 66 24
-+100 76 42  231 229 214  231 229 214  231 229 214  231 229 214  231 229 214
-+231 229 214  231 229 212  231 229 212  231 229 212  230 228 210  230 228 210
-+230 228 209  231 228 207  231 228 207  231 228 207  230 227 205  230 227 205
-+230 227 204  230 227 204  230 227 202  230 227 201  230 227 202  229 226 196
-+216 206 146  90 65 21  104 73 28  104 73 28  90 63 20  90 63 20
-+78 55 17  75 50 15  75 50 15  62 38 11  62 38 11  56 33 8
-+56 33 8  56 33 8  56 33 8  62 38 11  62 38 11  68 47 15
-+75 50 15  71 53 16  80 59 18  80 59 18  90 65 21  90 65 21
-+91 66 24  90 65 21  90 65 21  176 168 138  227 220 160  227 219 152
-+227 219 152  227 218 146  227 218 146  226 217 139  226 217 137  224 212 126
-+224 212 126  90 65 21  80 59 18  80 59 18  79 57 18  47 39 13
-+37 31 10  31 27 8  25 20 6  18 15 5  14 11 4  9 7 3
-+4 3 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  1 1 1  1 1 1  1 1 1  1 1 1  2 2 2
-+3 3 3  4 4 4  5 5 5  6 6 6  8 8 8  10 10 10
-+14 14 14  18 18 18  25 25 25  37 37 37  47 47 47  47 47 47
-+46 46 46  45 45 45  43 43 43  22 22 22  11 11 11  6 6 6
-+7 7 7  16 14 4  24 21 6  31 27 8  31 27 8  47 39 13
-+57 50 16  57 50 16  57 50 16  57 50 17  70 58 37  150 141 118
-+231 229 212  231 229 212  231 229 214  231 229 214  231 229 214  231 229 214
-+231 229 214  231 229 214  231 229 217  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 230 220  200 196 176  80 59 18
-+90 65 21  90 68 33  80 59 18  91 66 24  90 65 21  90 65 21
-+90 65 21  90 65 21  91 66 24  91 66 24  91 66 24  91 66 24
-+96 71 33  230 228 209  231 230 220  231 229 214  231 229 214  231 229 214
-+231 229 214  231 229 214  231 229 212  231 229 212  231 229 212  230 228 210
-+230 228 210  230 228 209  231 228 207  231 228 207  231 228 207  230 227 205
-+230 227 205  230 227 204  230 227 202  230 227 202  230 227 201  230 227 201
-+176 168 138  97 69 27  104 73 28  90 65 21  90 65 21  90 63 20
-+80 59 18  75 50 15  75 50 15  62 38 11  62 38 11  57 34 10
-+56 33 8  56 33 8  56 33 8  57 34 10  62 38 11  68 47 15
-+75 50 15  75 50 15  80 59 18  90 65 21  90 65 21  90 65 21
-+91 66 24  97 69 27  90 65 21  156 118 66  227 219 152  227 219 152
-+227 219 152  227 218 146  227 218 146  227 218 146  226 217 137  226 217 137
-+224 212 126  100 74 37  90 65 21  80 59 18  80 59 18  56 48 15
-+44 35 11  37 31 10  29 24 7  23 19 6  15 13 4  10 9 3
-+5 4 1  2 2 2  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  1 1 1  1 1 1
-+1 1 1  2 2 2  3 3 3  4 4 4  5 5 5  7 7 7
-+9 9 9  12 12 12  17 17 17  22 22 22  32 32 32  41 41 41
-+45 45 45  43 43 43  35 35 35  9 9 9  5 5 5  3 3 3
-+10 9 3  15 13 4  24 21 6  31 27 8  37 31 10  47 39 13
-+57 50 16  57 50 16  57 50 16  71 53 16  57 50 16  150 141 118
-+231 229 212  231 229 212  231 229 214  231 229 214  231 229 214  231 229 214
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  231 229 217
-+231 229 217  231 230 220  231 230 220  231 229 217  229 226 192  91 66 24
-+80 59 18  90 65 21  90 65 21  90 65 21  90 65 21  91 66 24
-+91 66 24  91 66 24  91 66 24  91 66 24  91 66 24  97 69 27
-+91 66 24  192 187 164  231 229 217  231 229 217  231 229 217  231 229 214
-+231 229 214  231 229 214  231 229 214  231 229 212  231 229 212  231 229 212
-+230 228 210  230 228 209  230 228 209  231 228 207  231 228 207  231 228 207
-+230 227 205  230 227 205  230 227 204  230 227 202  230 227 202  230 227 197
-+149 122 79  104 73 28  104 73 28  104 73 28  90 63 20  90 63 20
-+90 63 20  75 50 15  75 50 15  75 50 15  62 38 11  62 38 11
-+56 33 8  56 33 8  56 33 8  62 38 11  62 38 11  62 38 11
-+75 50 15  78 55 17  80 59 18  80 59 18  90 65 21  90 65 21
-+90 65 21  104 73 28  90 65 21  110 81 38  227 219 152  227 219 152
-+227 219 152  227 218 146  227 218 146  227 218 146  226 217 137  226 217 137
-+226 217 137  149 122 79  90 65 21  80 59 18  80 59 18  57 50 17
-+44 35 11  37 31 10  31 27 8  24 21 6  18 15 5  13 11 4
-+7 5 2  3 3 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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
-+1 1 1  1 1 1  1 1 1  1 1 1  2 2 2  3 3 3
-+4 4 4  5 5 5  8 8 8  10 10 10  14 14 14  18 18 18
-+25 25 25  41 41 41  21 21 21  10 10 10  5 5 5  4 4 4
-+6 6 6  15 13 4  24 21 6  31 27 8  37 31 10  47 39 13
-+57 50 16  57 50 16  57 50 17  80 59 18  57 50 16  138 129 110
-+230 227 202  231 229 214  231 229 214  231 229 214  231 229 214  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  231 230 220
-+231 229 217  231 230 220  231 230 220  231 230 220  230 228 210  75 61 38
-+90 65 21  90 65 21  90 65 21  91 66 24  90 65 21  91 66 24
-+90 65 21  91 66 24  91 66 24  104 73 28  90 65 21  104 73 28
-+90 65 21  150 141 118  231 229 212  231 229 214  231 229 217  231 229 217
-+231 229 214  231 229 214  231 229 214  231 229 214  231 229 212  231 229 212
-+231 229 212  230 228 210  230 228 209  231 228 207  231 228 207  231 228 207
-+230 227 205  230 227 205  230 227 205  230 227 204  230 227 202  229 226 196
-+110 81 38  104 73 28  104 73 28  90 65 21  90 65 21  90 63 20
-+90 63 20  75 50 15  75 50 15  75 50 15  62 38 11  62 38 11
-+56 33 8  56 33 8  57 34 10  62 38 11  62 38 11  75 50 15
-+68 47 15  75 50 15  78 55 17  90 63 20  90 65 21  90 65 21
-+97 69 27  97 69 27  90 65 21  104 73 28  224 212 126  226 218 148
-+227 219 152  227 219 152  227 218 146  227 218 146  226 217 139  226 217 137
-+226 217 137  224 212 126  80 59 18  90 65 21  80 59 18  71 53 16
-+47 39 13  37 31 10  31 27 8  25 20 6  18 15 5  14 11 4
-+9 7 3  4 3 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  1 1 1  1 1 1  2 2 2
-+2 2 2  4 4 4  5 5 5  7 7 7  8 8 8  11 11 11
-+13 13 13  13 13 13  8 8 8  4 4 4  1 1 1  3 3 3
-+10 9 3  16 14 4  24 21 6  31 27 8  37 31 10  47 39 13
-+57 50 16  57 50 17  57 50 17  57 50 16  57 50 16  149 122 79
-+231 229 212  231 229 214  231 229 214  231 229 214  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 230 220  231 229 217  231 230 220
-+231 230 220  231 230 220  231 230 220  231 230 220  231 230 220  110 81 38
-+90 65 21  90 65 21  91 66 24  90 65 21  90 65 21  90 65 21
-+91 66 24  90 65 21  90 65 21  104 73 28  90 65 21  104 73 28
-+104 73 28  104 73 28  229 226 196  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 214  231 229 214  231 229 214  231 229 214  231 229 212
-+231 229 212  231 229 212  230 228 210  230 228 209  231 228 207  231 228 207
-+231 228 207  230 227 205  230 227 205  230 227 204  229 226 196  176 168 138
-+104 73 28  104 73 28  104 73 28  104 73 28  90 63 20  90 63 20
-+90 63 20  75 50 15  75 50 15  75 50 15  62 38 11  62 38 11
-+62 38 11  62 38 11  62 38 11  62 38 11  62 38 11  62 38 11
-+75 50 15  75 50 15  78 55 17  90 63 20  90 65 21  90 65 21
-+90 65 21  104 73 28  104 73 28  91 66 24  149 122 79  227 219 152
-+227 219 152  227 219 152  227 218 146  227 218 146  227 218 146  226 217 137
-+226 217 137  224 212 126  110 81 38  91 66 24  80 59 18  80 59 18
-+47 39 13  37 31 10  37 31 10  27 23 7  22 17 5  15 13 4
-+10 9 3  5 4 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  1 1 1
-+1 1 1  1 1 1  2 2 2  3 3 3  4 4 4  5 5 5
-+6 6 6  6 6 6  5 5 5  3 3 3  2 2 2  3 3 3
-+10 9 3  16 14 4  24 21 6  31 27 8  37 31 10  47 39 13
-+57 50 16  57 50 16  80 59 18  80 59 18  80 59 18  135 101 60
-+231 230 220  231 229 214  231 229 214  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 230 220  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  200 196 176  176 168 138  100 76 42
-+91 66 24  91 66 24  90 65 21  91 66 24  90 65 21  91 66 24
-+90 65 21  97 69 27  90 65 21  104 73 28  90 65 21  104 73 28
-+90 65 21  104 73 28  150 141 118  230 228 210  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 214  231 229 214  231 229 214  231 229 214
-+231 229 212  230 228 210  231 229 212  230 228 210  230 228 209  231 228 207
-+231 228 207  231 228 207  230 227 205  230 227 205  229 226 196  117 83 35
-+104 73 28  104 73 28  104 73 28  104 73 28  90 63 20  90 63 20
-+90 63 20  75 50 15  75 50 15  75 50 15  62 38 11  62 38 11
-+62 38 11  62 38 11  62 38 11  62 38 11  62 38 11  75 50 15
-+75 50 15  75 50 15  90 63 20  90 63 20  90 63 20  90 65 21
-+104 73 28  90 65 21  104 73 28  97 69 27  135 101 60  227 220 160
-+227 219 152  227 219 152  227 218 146  227 218 146  227 218 146  226 217 137
-+226 217 137  226 217 137  149 122 79  90 65 21  91 66 24  80 59 18
-+47 39 13  47 39 13  37 31 10  29 24 7  24 21 6  16 14 4
-+11 9 3  5 4 1  2 2 2  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  0 0 0
-+0 0 0  1 1 1  1 1 1  1 1 1  2 2 2  2 2 2
-+3 3 3  2 2 2  2 2 2  1 1 1  1 1 1  5 4 1
-+10 9 3  18 15 5  24 21 6  31 27 8  47 39 13  47 39 13
-+57 50 16  57 50 17  57 50 17  57 50 17  80 59 18  66 66 66
-+231 229 214  231 229 214  231 229 217  231 229 217  231 229 217  231 229 217
-+231 230 220  231 230 220  231 230 220  231 230 220  200 196 176  176 168 138
-+138 129 110  135 101 60  91 66 24  91 66 24  91 66 24  91 66 24
-+91 66 24  91 66 24  90 65 21  90 65 21  90 65 21  90 65 21
-+90 65 21  90 65 21  90 65 21  104 73 28  90 65 21  104 73 28
-+104 73 28  104 73 28  104 73 28  192 187 164  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 214  231 229 214  231 229 214
-+231 229 214  231 229 212  231 229 212  230 228 210  230 228 209  231 228 207
-+231 228 207  231 228 207  231 228 207  231 228 207  149 122 79  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  90 63 20  90 63 20
-+75 50 15  90 63 20  75 50 15  62 38 11  75 50 15  62 38 11
-+62 38 11  62 38 11  62 38 11  62 38 11  62 38 11  75 50 15
-+75 50 15  78 55 17  78 55 17  90 63 20  90 65 21  104 73 28
-+90 65 21  104 73 28  90 65 21  104 73 28  104 73 28  226 218 148
-+227 219 152  227 219 152  227 219 152  227 218 146  227 218 146  226 217 137
-+226 217 137  224 212 126  224 212 126  91 66 24  90 65 21  90 65 21
-+57 50 17  47 39 13  37 31 10  31 27 8  25 20 6  18 15 5
-+13 11 4  7 5 2  3 3 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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 1 1  0 0 0  3 3 1  5 4 1
-+13 11 4  18 15 5  27 23 7  31 27 8  37 31 10  47 39 13
-+57 50 16  57 50 17  80 59 18  80 59 18  80 59 18  100 76 42
-+231 230 220  231 230 220  231 229 214  231 230 220  231 229 217  229 226 196
-+185 178 149  150 141 118  135 101 60  90 68 33  90 65 21  91 66 24
-+90 65 21  90 65 21  90 65 21  91 66 24  91 66 24  91 66 24
-+90 65 21  90 65 21  90 65 21  90 65 21  90 65 21  90 65 21
-+90 65 21  90 65 21  90 65 21  90 65 21  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  117 83 35  200 196 176  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 214  231 229 214
-+231 229 214  231 229 212  230 228 210  231 229 212  230 228 210  230 228 209
-+231 228 207  231 228 207  231 228 207  163 154 123  117 83 35  104 73 28
-+117 83 35  104 73 28  104 73 28  90 63 20  104 73 28  90 63 20
-+90 63 20  75 50 15  75 50 15  75 50 15  62 38 11  62 38 11
-+62 38 11  62 38 11  75 50 15  62 38 11  75 50 15  75 50 15
-+75 50 15  90 63 20  90 63 20  90 63 20  90 63 20  90 65 21
-+104 73 28  104 73 28  104 73 28  104 73 28  90 65 21  224 212 126
-+226 218 148  227 219 152  226 218 148  227 218 146  227 218 146  226 217 139
-+226 217 137  224 212 126  224 212 126  90 65 21  90 65 21  90 65 21
-+57 50 16  47 39 13  37 31 10  31 27 8  27 23 7  20 17 5
-+14 11 4  9 7 3  4 3 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 0 0  2 1 0  7 5 2
-+14 11 4  20 17 5  27 23 7  31 27 8  47 39 13  47 39 13
-+57 50 16  57 50 17  80 59 18  57 50 17  80 59 18  90 68 33
-+231 230 220  200 196 176  163 154 123  138 129 110  100 76 42  80 59 18
-+80 59 18  80 59 18  80 59 18  90 65 21  90 65 21  90 65 21
-+90 65 21  90 65 21  91 66 24  91 66 24  91 66 24  90 65 21
-+90 65 21  90 65 21  90 65 21  90 65 21  90 65 21  90 65 21
-+90 65 21  90 65 21  90 65 21  104 73 28  90 65 21  90 65 21
-+104 73 28  104 73 28  104 73 28  104 73 28  117 83 35  192 187 164
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 214  231 229 214
-+231 229 214  231 229 214  231 229 212  231 229 212  230 228 210  230 228 209
-+231 228 207  231 228 207  149 122 79  104 73 28  104 73 28  117 83 35
-+104 73 28  104 73 28  104 73 28  104 73 28  90 63 20  90 63 20
-+90 63 20  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  90 63 20
-+75 50 15  90 63 20  90 63 20  90 63 20  104 73 28  90 65 21
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  150 141 118
-+224 217 160  227 219 152  227 219 152  227 218 146  227 218 146  226 217 139
-+226 217 137  226 217 137  224 212 126  143 106 60  91 66 24  90 65 21
-+57 50 17  47 39 13  44 35 11  37 31 10  29 24 7  22 17 5
-+15 13 4  10 9 3  5 4 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  1 0 0  2 1 0  4 3 1  7 5 2
-+14 11 4  18 15 5  28 21 6  31 27 8  44 35 11  47 39 13
-+57 50 16  57 50 16  71 53 16  80 59 18  80 59 18  80 59 18
-+90 68 33  80 59 18  80 59 18  80 59 18  80 59 18  90 65 21
-+90 65 21  90 65 21  91 66 24  90 65 21  90 65 21  90 65 21
-+90 65 21  91 66 24  90 65 21  90 65 21  90 65 21  90 65 21
-+90 65 21  90 65 21  80 59 18  80 59 18  80 59 18  90 65 21
-+80 59 18  90 65 21  90 65 21  90 65 21  90 65 21  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+163 154 123  229 226 196  231 229 217  231 229 217  231 229 217  231 229 214
-+231 229 214  231 229 214  231 229 212  231 229 212  230 228 210  230 228 210
-+200 196 176  146 109 61  117 83 35  117 83 35  117 83 35  104 73 28
-+104 73 28  104 73 28  104 73 28  90 63 20  90 63 20  90 63 20
-+90 63 20  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  90 63 20  75 50 15
-+90 63 20  90 63 20  90 63 20  90 63 20  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  154 108 49
-+227 218 146  227 219 152  227 219 152  227 218 146  227 218 146  227 218 146
-+226 217 139  226 217 137  224 212 126  149 122 79  104 73 28  90 65 21
-+71 53 16  47 39 13  47 39 13  31 27 8  31 27 8  23 19 6
-+16 14 4  11 9 3  5 4 1  2 2 2  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  2 1 0  4 3 1  5 4 1  9 7 3
-+14 11 4  18 15 5  28 21 6  35 26 8  43 33 10  47 39 13
-+57 50 16  57 50 16  80 59 18  57 50 17  80 59 18  70 58 37
-+80 59 18  80 59 18  90 65 21  80 59 18  90 65 21  80 59 18
-+90 65 21  80 59 18  90 65 21  80 59 18  90 65 21  90 65 21
-+90 65 21  90 65 21  90 65 21  90 65 21  90 65 21  90 65 21
-+90 65 21  80 59 18  80 59 18  80 59 18  80 59 18  80 59 18
-+80 59 18  90 63 20  90 65 21  90 65 21  90 65 21  90 65 21
-+104 73 28  104 73 28  104 73 28  104 73 28  117 83 35  104 73 28
-+104 73 28  117 83 35  150 141 118  192 187 164  231 229 214  231 229 217
-+231 229 214  231 229 214  230 228 210  229 225 190  185 178 149  154 114 62
-+117 83 35  117 83 35  104 73 28  117 83 35  117 83 35  117 83 35
-+104 73 28  104 73 28  104 73 28  104 73 28  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  75 50 15  75 50 15
-+75 50 15  90 63 20  75 50 15  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  134 96 54
-+227 220 160  227 219 152  227 219 152  227 218 146  227 218 146  227 218 146
-+226 217 137  226 217 137  224 212 126  224 212 126  104 73 28  91 66 24
-+80 59 18  47 39 13  47 39 13  37 31 10  31 27 8  24 21 6
-+18 15 5  13 11 4  7 5 2  3 3 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  2 1 0  3 3 1  4 3 1  7 5 2  9 7 3
-+14 11 4  22 17 5  26 19 6  35 25 8  41 32 10  50 37 12
-+55 43 14  57 50 16  57 50 17  80 59 18  80 59 18  80 59 18
-+80 59 18  80 59 18  80 59 18  80 59 18  80 59 18  80 59 18
-+80 59 18  90 65 21  80 59 18  90 65 21  80 59 18  80 59 18
-+80 59 18  90 65 21  80 59 18  90 65 21  80 59 18  80 59 18
-+80 59 18  80 59 18  80 59 18  78 55 17  78 55 17  80 59 18
-+80 59 18  80 59 18  80 59 18  90 63 20  90 63 20  90 65 21
-+104 73 28  104 73 28  104 73 28  117 83 35  104 73 28  117 83 35
-+104 73 28  117 83 35  117 83 35  117 83 35  104 73 28  144 102 51
-+142 111 68  143 106 60  134 96 54  104 73 28  117 83 35  104 73 28
-+117 83 35  117 83 35  117 83 35  117 83 35  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  90 63 20  90 63 20
-+90 63 20  90 63 20  75 50 15  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  117 83 35  104 73 28  104 73 28  104 73 28  104 73 28
-+227 218 146  227 219 152  227 219 152  227 219 152  227 218 146  227 218 146
-+227 217 139  226 217 137  224 212 126  224 212 126  90 65 21  90 65 21
-+80 59 18  57 50 16  47 39 13  37 31 10  31 27 8  24 21 6
-+18 15 5  13 11 4  7 5 2  4 3 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+1 0 0  3 3 1  4 3 1  5 4 1  7 5 2  11 9 3
-+14 11 4  18 15 5  26 19 6  29 24 7  38 29 9  44 35 11
-+55 43 14  57 50 16  57 50 16  80 59 18  57 50 17  80 59 18
-+80 59 18  80 59 18  80 59 18  80 59 18  90 65 21  80 59 18
-+80 59 18  80 59 18  80 59 18  80 59 18  80 59 18  80 59 18
-+80 59 18  80 59 18  80 59 18  80 59 18  80 59 18  80 59 18
-+78 55 17  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  78 55 17  90 63 20  90 63 20  90 65 21
-+90 65 21  104 73 28  104 73 28  104 73 28  117 83 35  104 73 28
-+117 83 35  104 73 28  117 83 35  104 73 28  117 83 35  117 83 35
-+117 83 35  104 73 28  117 83 35  117 83 35  117 83 35  131 88 37
-+104 73 28  117 83 35  117 83 35  104 73 28  131 88 37  104 73 28
-+131 88 37  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  104 73 28  90 63 20  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+117 83 35  104 73 28  117 83 35  104 73 28  117 83 35  104 73 28
-+226 217 139  227 219 152  227 219 152  227 218 146  227 218 146  227 218 146
-+226 217 137  226 217 137  226 217 137  224 212 126  132 90 43  97 69 27
-+80 59 18  47 39 13  47 39 13  37 31 10  37 31 10  27 23 7
-+20 17 5  14 11 4  9 7 3  4 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  0 0 0  0 0 0  0 0 0  0 0 0  1 0 0
-+2 1 0  4 3 1  5 4 1  7 5 2  7 5 2  9 7 3
-+17 13 4  17 13 4  30 16 4  29 24 7  38 27 8  43 33 10
-+51 40 13  55 44 14  59 49 15  57 50 16  80 59 18  71 53 16
-+80 59 18  80 59 18  80 59 18  80 59 18  80 59 18  80 59 18
-+80 59 18  80 59 18  80 59 18  80 59 18  80 59 18  80 59 18
-+80 59 18  78 55 17  78 55 17  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  90 63 20  90 63 20  90 63 20
-+90 63 20  104 73 28  104 73 28  104 73 28  104 73 28  117 83 35
-+117 83 35  117 83 35  117 83 35  117 83 35  117 83 35  104 73 28
-+117 83 35  117 83 35  117 83 35  117 83 35  104 73 28  131 88 37
-+117 83 35  117 83 35  117 83 35  117 83 35  104 73 28  117 83 35
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  90 63 20
-+104 73 28  104 73 28  90 63 20  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  131 88 37  104 73 28  131 88 37  104 73 28  117 83 35
-+117 83 35  104 73 28  117 83 35  104 73 28  143 100 47  224 212 126
-+216 206 146  227 220 160  227 219 152  227 219 152  227 218 146  227 218 146
-+227 217 139  226 217 137  226 217 137  224 212 126  156 118 66  90 65 21
-+90 65 21  57 50 16  47 39 13  37 31 10  37 31 10  27 23 7
-+20 17 5  15 13 4  9 7 3  5 4 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  0 0 0  0 0 0  0 0 0  0 0 0  2 1 0
-+4 3 1  5 4 1  7 5 2  7 5 2  11 9 3  11 9 3
-+11 9 3  23 17 5  23 17 5  36 23 7  38 27 8  38 29 9
-+50 37 12  51 40 13  59 49 15  57 50 16  57 50 16  71 53 16
-+57 50 16  71 53 16  57 50 17  71 53 16  71 53 16  71 53 16
-+71 53 16  71 53 16  71 53 16  71 53 16  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  62 38 11  75 50 15  62 38 11  62 38 11
-+75 50 15  75 50 15  75 50 15  75 50 15  90 63 20  90 63 20
-+90 63 20  90 63 20  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  117 83 35  104 73 28  117 83 35  117 83 35  117 83 35
-+117 83 35  131 88 37  117 83 35  117 83 35  131 88 37  117 83 35
-+117 83 35  117 83 35  131 88 37  104 73 28  131 88 37  104 73 28
-+131 88 37  104 73 28  131 88 37  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+90 63 20  143 92 37  90 63 20  143 92 37  104 73 28  143 92 37
-+104 73 28  131 88 37  104 73 28  104 73 28  117 83 35  117 83 35
-+104 73 28  117 83 35  131 88 37  224 212 126  227 219 152  226 218 148
-+227 219 152  227 219 152  227 219 152  227 219 152  227 218 146  227 218 146
-+227 217 139  226 217 137  226 217 137  226 217 137  149 122 79  104 73 28
-+80 59 18  57 50 17  47 39 13  44 35 11  37 31 10  29 24 7
-+23 19 6  16 14 4  10 9 3  5 4 1  2 2 2  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  0 0 0  0 0 0  0 0 0  2 1 0  3 3 1
-+4 3 1  7 5 2  7 5 2  11 9 3  11 9 3  11 9 3
-+14 11 4  17 13 4  30 16 4  30 16 4  36 23 7  38 27 8
-+48 30 8  50 37 12  58 38 12  59 45 14  59 49 15  59 49 15
-+71 53 16  71 53 16  71 53 16  71 53 16  71 53 16  71 53 16
-+69 49 15  69 49 15  68 47 15  68 47 15  68 47 15  68 47 15
-+68 47 15  75 50 15  62 38 11  75 50 15  62 38 11  75 50 15
-+62 38 11  75 50 15  75 50 15  62 38 11  75 50 15  62 38 11
-+75 50 15  75 50 15  75 50 15  75 50 15  90 63 20  90 63 20
-+90 63 20  90 63 20  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  117 83 35  104 73 28  131 88 37  104 73 28  131 88 37
-+104 73 28  131 88 37  117 83 35  117 83 35  117 83 35  131 88 37
-+117 83 35  131 88 37  104 73 28  131 88 37  104 73 28  131 88 37
-+104 73 28  104 73 28  104 73 28  131 88 37  104 73 28  104 73 28
-+143 92 37  90 63 20  143 92 37  104 73 28  143 92 37  104 73 28
-+154 97 33  90 63 20  143 92 37  90 63 20  143 92 37  90 63 20
-+143 92 37  104 73 28  131 88 37  131 88 37  104 73 28  131 88 37
-+154 108 49  224 212 126  226 218 148  224 217 160  224 217 160  224 217 160
-+227 220 160  227 219 152  227 219 152  227 219 152  227 218 146  227 218 146
-+227 218 146  226 217 137  226 217 137  224 212 126  224 212 126  90 65 21
-+90 65 21  57 50 16  47 39 13  47 39 13  31 27 8  31 27 8
-+24 21 6  16 14 4  11 9 3  5 4 1  2 2 2  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  0 0 0  0 0 0  1 0 0  2 1 0  4 3 1
-+6 5 1  7 5 2  7 5 2  11 9 3  11 9 3  11 9 3
-+17 13 4  17 13 4  23 17 5  23 17 5  36 23 7  38 27 8
-+38 27 8  48 30 8  46 36 11  57 34 10  57 41 13  60 42 13
-+59 45 14  59 49 15  59 49 15  59 49 15  59 45 14  68 47 15
-+62 38 11  68 47 15  62 38 11  68 47 15  62 38 11  75 50 15
-+62 38 11  62 38 11  75 50 15  62 38 11  75 50 15  62 38 11
-+75 50 15  62 38 11  62 38 11  75 50 15  62 38 11  62 38 11
-+62 38 11  75 50 15  75 50 15  75 50 15  75 50 15  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  117 83 35  104 73 28  117 83 35
-+117 83 35  117 83 35  117 83 35  131 88 37  117 83 35  131 88 37
-+117 83 35  131 88 37  104 73 28  154 97 33  104 73 28  143 92 37
-+104 73 28  154 97 33  104 73 28  143 92 37  90 63 20  143 92 37
-+90 63 20  143 92 37  90 63 20  143 92 37  90 63 20  143 92 37
-+90 63 20  143 92 37  104 73 28  143 92 37  104 73 28  143 92 37
-+104 73 28  131 88 37  104 73 28  143 92 37  156 118 66  216 206 146
-+227 220 160  224 217 160  227 221 169  227 221 169  227 220 160  227 220 160
-+227 220 160  227 220 160  227 219 152  227 219 152  227 218 146  227 218 146
-+227 217 139  226 217 137  224 212 126  224 212 126  224 212 126  104 73 28
-+90 65 21  57 50 16  47 39 13  47 39 13  37 31 10  31 27 8
-+24 21 6  18 15 5  13 11 4  7 5 2  3 3 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  0 0 0  0 0 0  2 1 0  4 3 1  5 4 1
-+7 5 2  9 7 3  11 9 3  11 9 3  14 11 4  14 11 4
-+17 13 4  30 16 4  17 13 4  30 16 4  30 16 4  36 23 7
-+38 27 8  43 33 10  48 30 8  50 37 12  56 33 8  58 38 12
-+58 38 12  62 38 11  62 38 11  62 38 11  62 38 11  62 38 11
-+62 38 11  62 38 11  62 38 11  62 38 11  62 38 11  62 38 11
-+62 38 11  62 38 11  62 38 11  62 38 11  62 38 11  62 38 11
-+62 38 11  62 38 11  75 50 15  62 38 11  62 38 11  75 50 15
-+75 50 15  62 38 11  75 50 15  75 50 15  75 50 15  75 50 15
-+90 63 20  90 63 20  90 63 20  104 73 28  90 63 20  104 73 28
-+104 73 28  104 73 28  104 73 28  131 88 37  104 73 28  131 88 37
-+117 83 35  131 88 37  117 83 35  131 88 37  117 83 35  131 88 37
-+117 83 35  131 88 37  131 88 37  104 73 28  131 88 37  131 88 37
-+104 73 28  131 88 37  104 73 28  104 73 28  143 92 37  90 63 20
-+143 92 37  90 63 20  154 97 33  90 63 20  154 97 33  104 73 28
-+143 92 37  104 73 28  143 92 37  104 73 28  143 92 37  104 73 28
-+143 92 37  154 97 33  163 154 123  227 219 152  227 221 169  228 223 179
-+227 221 169  227 221 169  227 221 169  227 220 160  227 220 160  227 220 160
-+227 220 160  227 219 152  227 219 152  227 219 152  227 218 146  227 218 146
-+227 218 146  226 217 137  226 217 137  224 212 126  224 212 126  90 65 21
-+90 65 21  57 50 16  56 48 15  47 39 13  37 31 10  31 27 8
-+27 23 7  18 15 5  11 9 3  7 5 2  3 3 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  0 0 0  2 1 0  3 3 1  4 3 1  7 5 2
-+7 5 2  7 5 2  11 9 3  14 11 4  14 11 4  17 13 4
-+17 13 4  17 13 4  17 13 4  30 16 4  30 16 4  38 21 5
-+38 21 5  38 27 8  48 30 8  48 30 8  49 31 9  50 37 12
-+56 33 8  57 34 10  58 38 12  57 34 10  62 38 11  62 38 11
-+57 34 10  62 38 11  62 38 11  62 38 11  62 38 11  62 38 11
-+62 38 11  62 38 11  62 38 11  62 38 11  62 38 11  62 38 11
-+75 50 15  62 38 11  62 38 11  62 38 11  75 50 15  62 38 11
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  131 88 37
-+104 73 28  117 83 35  131 88 37  117 83 35  131 88 37  131 88 37
-+117 83 35  143 92 37  104 73 28  154 97 33  104 73 28  143 92 37
-+104 73 28  154 97 33  104 73 28  154 97 33  104 73 28  154 97 33
-+104 73 28  154 97 33  104 73 28  154 97 33  104 73 28  154 97 33
-+104 73 28  154 97 33  104 73 28  131 88 37  154 97 33  156 118 66
-+216 206 146  228 223 179  227 221 169  228 223 179  228 223 179  227 221 169
-+227 221 169  227 221 169  227 221 169  227 221 169  227 220 160  227 220 160
-+227 220 160  227 220 160  227 219 152  227 219 152  227 218 146  227 218 146
-+227 217 139  226 217 137  226 217 137  224 212 126  224 212 126  117 83 35
-+90 65 21  57 50 16  47 39 13  47 39 13  37 31 10  31 27 8
-+25 20 6  18 15 5  13 11 4  7 5 2  4 3 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 0 0  2 1 0  4 3 1  5 4 1  7 5 2
-+11 9 3  11 9 3  11 9 3  14 11 4  17 13 4  30 16 4
-+17 13 4  30 16 4  17 13 4  30 16 4  30 16 4  30 16 4
-+38 21 5  38 21 5  38 21 5  48 30 8  48 30 8  48 30 8
-+49 31 9  56 33 8  56 33 8  56 33 8  56 33 8  56 33 8
-+56 33 8  57 34 10  56 33 8  56 33 8  62 38 11  62 38 11
-+62 38 11  62 38 11  62 38 11  62 38 11  75 50 15  62 38 11
-+62 38 11  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  90 63 20
-+75 50 15  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+104 73 28  104 73 28  104 73 28  131 88 37  104 73 28  131 88 37
-+131 88 37  131 88 37  104 73 28  154 97 33  104 73 28  154 97 33
-+117 83 35  131 88 37  131 88 37  131 88 37  131 88 37  131 88 37
-+131 88 37  104 73 28  154 97 33  104 73 28  143 92 37  104 73 28
-+154 97 33  104 73 28  154 97 33  104 73 28  154 97 33  104 73 28
-+154 97 33  143 92 37  154 114 62  216 206 146  227 221 169  229 225 190
-+229 224 185  228 223 179  228 223 179  228 223 179  228 223 179  227 221 169
-+227 221 169  227 221 169  227 221 169  227 220 160  227 221 169  227 220 160
-+227 220 160  227 219 152  227 219 152  227 219 152  226 218 148  227 218 146
-+227 218 146  226 217 137  226 217 137  224 212 126  224 212 126  140 95 42
-+90 65 21  57 50 16  47 39 13  47 39 13  37 31 10  37 31 10
-+27 23 7  20 17 5  14 11 4  9 7 3  4 3 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  2 1 0  4 3 1  5 4 1  7 5 2  7 5 2
-+9 7 3  11 9 3  14 11 4  14 11 4  17 13 4  17 13 4
-+17 13 4  17 13 4  30 16 4  30 16 4  30 16 4  30 16 4
-+38 21 5  38 21 5  38 21 5  38 21 5  38 21 5  48 30 8
-+48 30 8  48 30 8  48 30 8  56 33 8  48 30 8  56 33 8
-+56 33 8  56 33 8  56 33 8  56 33 8  62 38 11  56 33 8
-+62 38 11  62 38 11  75 50 15  62 38 11  62 38 11  75 50 15
-+75 50 15  62 38 11  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  90 63 20  90 63 20  75 50 15
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  104 73 28
-+90 63 20  104 73 28  104 73 28  104 73 28  104 73 28  131 88 37
-+104 73 28  131 88 37  131 88 37  117 83 35  131 88 37  131 88 37
-+131 88 37  131 88 37  131 88 37  131 88 37  131 88 37  131 88 37
-+131 88 37  143 92 37  131 88 37  131 88 37  143 92 37  154 97 33
-+104 73 28  143 92 37  143 92 37  143 92 37  154 97 33  156 118 66
-+176 168 138  227 222 178  229 224 185  229 224 185  229 224 185  229 224 185
-+229 224 185  228 223 179  228 223 179  228 223 179  228 223 179  228 223 179
-+227 221 169  227 221 169  227 221 169  227 221 169  227 220 160  227 220 160
-+227 220 160  227 220 160  227 219 152  227 219 152  226 218 148  227 218 146
-+227 218 146  226 217 137  226 217 137  224 212 126  224 212 126  146 109 61
-+80 59 18  57 50 16  57 50 17  47 39 13  37 31 10  37 31 10
-+27 23 7  20 17 5  14 11 4  9 7 3  4 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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
-+1 1 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 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
-+1 0 0  3 3 1  4 3 1  5 4 1  7 5 2  9 7 3
-+11 9 3  14 11 4  14 11 4  17 13 4  30 16 4  17 13 4
-+30 16 4  30 16 4  30 16 4  30 16 4  30 16 4  30 16 4
-+38 21 5  38 21 5  38 21 5  38 21 5  48 30 8  38 21 5
-+48 30 8  48 30 8  48 30 8  48 30 8  56 33 8  56 33 8
-+56 33 8  56 33 8  56 33 8  62 38 11  62 38 11  62 38 11
-+62 38 11  62 38 11  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  90 63 20
-+75 50 15  90 63 20  90 63 20  75 50 15  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+104 73 28  104 73 28  143 92 37  104 73 28  143 92 37  104 73 28
-+143 92 37  104 73 28  154 97 33  117 83 35  154 97 33  117 83 35
-+143 92 37  131 88 37  131 88 37  131 88 37  131 88 37  131 88 37
-+131 88 37  131 88 37  131 88 37  143 92 37  104 73 28  154 97 33
-+143 92 37  154 97 33  156 118 66  185 178 149  229 224 185  229 224 185
-+229 224 185  229 224 185  229 224 185  229 224 185  229 224 185  229 224 185
-+229 224 185  228 223 179  228 223 179  228 223 179  227 221 169  227 221 169
-+228 223 179  227 221 169  227 221 169  227 220 160  227 220 160  227 220 160
-+227 220 160  227 219 152  227 219 152  227 219 152  227 219 152  227 218 146
-+227 217 139  227 217 139  226 217 137  226 217 137  224 212 126  156 118 66
-+90 65 21  57 50 16  47 39 13  47 39 13  47 39 13  31 27 8
-+27 23 7  23 19 6  15 13 4  9 7 3  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  2 2 2  3 3 1
-+4 3 1  4 3 1  5 4 1  5 4 1  5 4 1  4 3 1
-+3 3 1  3 3 1  1 1 1  1 1 1  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
-+1 0 0  4 3 1  5 4 1  7 5 2  7 5 2  11 9 3
-+11 9 3  14 11 4  17 13 4  17 13 4  17 13 4  14 11 4
-+30 16 4  17 13 4  30 16 4  30 16 4  30 16 4  30 16 4
-+38 21 5  38 21 5  38 21 5  38 21 5  48 30 8  48 30 8
-+48 30 8  48 30 8  48 30 8  56 33 8  56 33 8  56 33 8
-+56 33 8  62 38 11  62 38 11  62 38 11  62 38 11  62 38 11
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  104 73 28
-+104 73 28  90 63 20  104 73 28  104 73 28  104 73 28  104 73 28
-+131 88 37  131 88 37  131 88 37  131 88 37  131 88 37  131 88 37
-+131 88 37  131 88 37  131 88 37  154 97 33  131 88 37  143 92 37
-+143 92 37  143 92 37  131 88 37  154 97 33  156 118 66  156 118 66
-+216 206 146  229 224 185  230 227 199  229 225 190  229 225 190  229 225 190
-+229 225 190  229 225 190  229 224 185  229 224 185  229 224 185  228 223 179
-+229 224 185  228 223 179  228 223 179  228 223 179  228 223 179  228 223 179
-+227 221 169  227 221 169  227 221 169  227 221 169  227 220 160  227 220 160
-+227 220 160  227 220 160  227 219 152  227 219 152  227 218 146  227 218 146
-+227 218 146  226 217 137  226 217 137  224 212 126  224 212 126  156 118 66
-+80 59 18  57 50 16  57 50 16  47 39 13  37 31 10  37 31 10
-+27 23 7  20 17 5  15 13 4  9 7 3  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  3 3 1  5 4 1  5 4 1
-+7 5 2  9 7 3  9 7 3  9 7 3  9 7 3  9 7 3
-+7 5 2  7 5 2  5 4 1  5 4 1  4 3 1  3 3 1
-+3 3 1  2 2 2  2 2 2  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  2 1 0
-+4 3 1  5 4 1  7 5 2  9 7 3  11 9 3  11 9 3
-+17 13 4  17 13 4  17 13 4  30 16 4  30 16 4  30 16 4
-+30 16 4  30 16 4  30 16 4  30 16 4  38 21 5  38 21 5
-+38 21 5  38 21 5  48 30 8  48 30 8  48 30 8  48 30 8
-+56 33 8  56 33 8  56 33 8  56 33 8  57 34 10  62 38 11
-+62 38 11  62 38 11  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  104 73 28  104 73 28
-+104 73 28  104 73 28  143 92 37  104 73 28  154 97 33  131 88 37
-+131 88 37  131 88 37  131 88 37  143 92 37  131 88 37  154 97 33
-+131 88 37  154 97 33  131 88 37  131 88 37  131 88 37  154 97 33
-+154 97 33  156 118 66  176 168 138  227 221 169  230 227 201  231 228 207
-+231 228 207  230 227 201  229 226 196  230 227 197  230 227 197  229 225 190
-+229 225 190  229 225 190  229 224 185  229 225 190  229 224 185  229 224 185
-+229 224 185  228 223 179  228 223 179  227 221 169  228 223 179  227 221 169
-+227 221 169  227 221 169  227 221 169  227 220 160  227 221 169  227 220 160
-+227 220 160  227 219 152  227 219 152  227 219 152  227 218 149  227 218 146
-+227 218 146  226 217 137  226 217 137  226 217 137  224 212 126  156 118 66
-+90 65 21  57 50 16  57 50 16  47 39 13  47 39 13  31 27 8
-+31 27 8  23 19 6  15 13 4  9 7 3  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  2 2 2  4 3 1  7 5 2  9 7 3  10 9 3
-+13 11 4  13 11 4  13 11 4  14 11 4  14 11 4  13 11 4
-+13 11 4  11 9 3  10 9 3  9 7 3  9 7 3  7 5 2
-+7 5 2  5 4 1  5 4 1  5 4 1  5 4 1  5 4 1
-+4 3 1  4 3 1  4 3 1  4 3 1  4 3 1  5 4 1
-+5 4 1  9 7 3  11 9 3  11 9 3  14 11 4  14 11 4
-+30 16 4  17 13 4  30 16 4  17 13 4  30 16 4  30 16 4
-+30 16 4  30 16 4  38 21 5  38 21 5  38 21 5  38 21 5
-+48 30 8  48 30 8  48 30 8  56 33 8  56 33 8  56 33 8
-+56 33 8  57 34 10  62 38 11  62 38 11  75 50 15  62 38 11
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  104 73 28  90 63 20
-+104 73 28  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  104 73 28  90 63 20  104 73 28  104 73 28
-+104 73 28  104 73 28  90 63 20  143 92 37  104 73 28  104 73 28
-+131 88 37  131 88 37  131 88 37  154 97 33  131 88 37  131 88 37
-+154 97 33  131 88 37  154 97 33  156 118 66  163 154 123  216 206 146
-+229 226 196  230 227 201  230 227 199  230 227 202  230 227 202  230 227 202
-+229 226 196  230 227 201  229 225 190  230 227 197  229 225 190  230 227 197
-+229 225 190  229 225 190  229 224 185  229 224 185  229 224 185  228 223 179
-+229 224 185  228 223 179  228 223 179  228 223 179  227 221 169  228 223 179
-+227 221 169  227 221 169  227 221 169  227 221 169  227 220 160  227 220 160
-+227 220 160  227 220 160  227 219 152  227 219 152  227 218 146  227 218 146
-+227 218 146  226 217 137  226 217 137  224 212 126  224 212 126  149 122 79
-+80 59 18  57 50 16  57 50 16  47 39 13  37 31 10  37 31 10
-+27 23 7  23 19 6  15 13 4  9 7 3  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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
-+3 3 1  5 4 1  7 5 2  10 9 3  13 11 4  15 13 4
-+18 15 5  18 15 5  18 15 5  18 15 5  18 15 5  18 15 5
-+18 15 5  18 15 5  16 14 4  15 13 4  14 11 4  13 11 4
-+13 11 4  11 9 3  10 9 3  10 9 3  9 7 3  9 7 3
-+9 7 3  9 7 3  9 7 3  9 7 3  9 7 3  11 9 3
-+13 11 4  14 11 4  17 13 4  17 13 4  30 16 4  17 13 4
-+30 16 4  30 16 4  30 16 4  30 16 4  30 16 4  38 21 5
-+38 21 5  38 21 5  48 30 8  48 30 8  48 30 8  56 33 8
-+49 31 9  57 34 10  57 34 10  57 34 10  57 34 10  62 38 11
-+62 38 11  62 38 11  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  90 63 20
-+104 73 28  90 63 20  104 73 28  104 73 28  104 73 28  104 73 28
-+143 92 37  104 73 28  143 92 37  90 63 20  154 97 33  143 92 37
-+143 92 37  143 92 37  131 88 37  143 92 37  154 97 33  154 108 49
-+163 154 123  216 206 146  229 225 190  230 227 199  231 228 207  231 228 207
-+231 228 207  230 227 204  230 227 202  230 227 202  230 227 201  230 227 199
-+230 227 197  229 226 196  230 227 199  229 225 190  230 227 197  229 225 190
-+229 225 190  229 225 190  229 224 185  229 225 190  229 224 185  229 224 185
-+229 224 185  228 223 179  228 223 179  228 223 179  228 223 179  227 221 169
-+227 221 169  227 221 169  227 221 169  227 220 160  227 220 160  227 220 160
-+227 220 160  227 219 152  227 219 152  227 219 152  227 218 146  227 218 146
-+227 217 139  226 217 137  226 217 137  226 217 137  224 212 126  156 118 66
-+90 65 21  57 50 16  57 50 16  47 39 13  47 39 13  31 27 8
-+31 27 8  20 17 5  15 13 4  10 9 3  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  2 2 2
-+5 4 1  9 7 3  11 9 3  15 13 4  18 15 5  20 17 5
-+23 19 6  24 21 6  25 20 6  27 23 7  24 21 6  25 20 6
-+25 20 6  24 21 6  23 19 6  22 17 5  20 17 5  18 15 5
-+18 15 5  18 15 5  16 14 4  15 13 4  15 13 4  15 13 4
-+15 13 4  15 13 4  14 11 4  14 11 4  15 13 4  17 13 4
-+18 15 5  22 17 5  23 17 5  23 17 5  30 16 4  30 16 4
-+30 16 4  30 16 4  38 21 5  38 27 8  38 27 8  38 27 8
-+41 32 10  49 31 9  49 31 9  49 31 9  57 34 10  57 34 10
-+58 38 12  62 38 11  62 38 11  68 47 15  62 38 11  68 47 15
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  104 73 28  104 73 28  104 73 28  104 73 28
-+90 63 20  143 92 37  90 63 20  143 92 37  90 63 20  143 92 37
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  90 63 20  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  90 63 20  154 97 33  104 73 28  131 88 37
-+131 88 37  131 88 37  154 97 33  154 97 33  229 226 192  231 228 207
-+230 227 201  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+230 227 205  230 227 204  230 227 202  230 227 202  230 227 201  230 227 199
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  229 225 190
-+229 225 190  229 225 190  229 224 185  229 224 185  229 224 185  229 224 185
-+228 223 179  228 223 179  228 223 179  228 223 179  228 223 179  227 221 169
-+228 223 179  227 221 169  227 221 169  227 221 169  227 220 160  227 217 139
-+176 168 138  227 220 160  227 219 152  227 219 152  227 218 146  227 218 146
-+227 218 146  226 217 137  226 217 137  226 217 137  224 212 126  156 118 66
-+57 50 16  57 50 16  57 50 16  47 39 13  37 31 10  37 31 10
-+27 23 7  23 19 6  15 13 4  9 7 3  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  5 4 1
-+7 5 2  11 9 3  15 13 4  18 15 5  23 19 6  25 20 6
-+29 24 7  31 27 8  31 27 8  31 27 8  35 26 8  31 27 8
-+31 27 8  31 27 8  29 24 7  27 23 7  27 23 7  25 20 6
-+25 20 6  24 21 6  23 19 6  23 19 6  23 19 6  23 19 6
-+22 17 5  22 17 5  22 17 5  23 19 6  23 19 6  25 20 6
-+25 20 6  28 21 6  29 24 7  35 25 8  35 25 8  35 26 8
-+38 29 9  41 32 10  41 32 10  48 30 8  49 31 9  50 37 12
-+49 31 9  50 37 12  58 38 12  58 38 12  60 42 13  60 42 13
-+60 42 13  68 47 15  68 47 15  68 47 15  75 50 15  75 50 15
-+75 50 15  75 50 15  78 55 17  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  143 92 37
-+104 73 28  104 73 28  143 92 37  90 63 20  143 92 37  90 63 20
-+104 73 28  143 92 37  90 63 20  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  143 92 37
-+104 73 28  154 97 33  104 73 28  154 97 33  104 73 28  154 97 33
-+154 97 33  143 92 37  131 88 37  154 97 33  229 225 190  231 229 212
-+231 229 212  231 229 212  231 228 207  231 228 207  231 228 207  231 228 207
-+231 228 207  230 227 204  230 227 202  230 227 202  230 227 201  230 227 199
-+230 227 197  230 227 197  229 225 190  230 227 197  229 225 190  229 225 190
-+229 225 190  229 224 185  229 225 190  229 224 185  229 224 185  229 224 185
-+229 224 185  228 223 179  228 223 179  228 223 179  227 221 169  228 223 179
-+227 221 169  227 221 169  227 220 160  227 221 169  224 212 126  143 100 47
-+156 118 66  227 219 152  227 219 152  227 219 152  227 218 146  227 218 146
-+227 217 139  226 217 137  226 217 137  224 212 126  224 212 126  163 154 123
-+80 59 18  57 50 16  57 50 16  47 39 13  47 39 13  31 27 8
-+31 27 8  23 19 6  15 13 4  10 9 3  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  3 3 1  7 5 2
-+11 9 3  15 13 4  18 15 5  24 21 6  27 23 7  31 27 8
-+37 31 10  37 31 10  41 32 10  37 31 10  37 31 10  37 31 10
-+37 31 10  37 31 10  37 31 10  37 31 10  37 31 10  31 27 8
-+31 27 8  31 27 8  29 24 7  29 24 7  29 24 7  27 23 7
-+27 23 7  27 23 7  27 23 7  29 24 7  31 27 8  31 27 8
-+35 26 8  35 26 8  38 29 9  38 29 9  41 32 10  43 33 10
-+43 33 10  46 36 11  50 37 12  50 37 12  51 40 13  58 38 12
-+60 42 13  60 42 13  60 42 13  67 48 15  68 47 15  69 49 15
-+71 51 16  75 50 15  75 50 15  75 50 15  78 55 17  78 55 17
-+78 55 17  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+104 73 28  90 63 20  90 63 20  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  143 92 37  90 63 20
-+143 92 37  104 73 28  143 92 37  90 63 20  143 92 37  104 73 28
-+143 92 37  90 63 20  143 92 37  104 73 28  143 92 37  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  90 63 20
-+143 92 37  90 63 20  143 92 37  104 73 28  154 97 33  104 73 28
-+154 97 33  131 88 37  154 97 33  154 97 33  200 196 176  231 229 212
-+231 228 207  231 229 212  231 228 207  231 228 207  231 228 207  231 228 207
-+231 228 207  230 227 204  230 227 202  230 227 202  230 227 201  230 227 199
-+230 227 197  230 227 197  230 227 197  230 227 197  229 225 190  230 227 197
-+229 225 190  229 225 190  229 224 185  229 224 185  229 224 185  229 224 185
-+228 223 179  228 223 179  228 223 179  228 223 179  227 221 169  228 223 179
-+227 221 169  227 221 169  227 218 146  163 154 123  117 83 35  154 97 33
-+163 154 123  227 219 152  227 219 152  227 219 152  227 218 146  227 218 146
-+227 217 139  226 217 137  226 217 137  224 212 126  224 212 126  156 118 66
-+57 50 16  57 50 16  57 50 16  47 39 13  37 31 10  37 31 10
-+27 23 7  23 19 6  15 13 4  9 7 3  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  2 2 2  5 4 1  9 7 3
-+14 11 4  18 15 5  24 21 6  29 24 7  31 27 8  37 31 10
-+37 31 10  47 39 13  47 39 13  47 39 13  47 39 13  47 39 13
-+47 39 13  44 35 11  44 35 11  37 31 10  41 32 10  37 31 10
-+37 31 10  37 31 10  37 31 10  37 31 10  37 31 10  37 31 10
-+37 31 10  37 31 10  37 31 10  37 31 10  37 31 10  41 32 10
-+41 32 10  44 35 11  46 36 11  46 36 11  50 37 12  50 37 12
-+51 40 13  57 41 13  55 43 14  60 42 13  59 45 14  59 45 14
-+67 48 15  67 48 15  69 49 15  71 51 16  71 53 16  78 55 17
-+78 55 17  79 57 18  80 59 18  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  104 73 28
-+90 63 20  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+143 92 37  104 73 28  154 97 33  104 73 28  104 73 28  143 92 37
-+104 73 28  143 92 37  104 73 28  154 97 33  104 73 28  143 92 37
-+90 63 20  154 97 33  90 63 20  104 73 28  104 73 28  104 73 28
-+143 92 37  90 63 20  143 92 37  90 63 20  143 92 37  104 73 28
-+104 73 28  154 97 33  104 73 28  154 97 33  143 92 37  154 97 33
-+143 92 37  154 97 33  131 88 37  154 97 33  185 178 149  230 227 202
-+231 229 212  231 229 212  231 228 207  231 228 207  231 228 207  231 228 207
-+230 227 204  230 227 204  230 227 202  230 227 201  230 227 201  230 227 199
-+230 227 197  230 227 197  230 227 197  229 225 190  230 227 197  229 224 185
-+229 225 190  229 224 185  229 224 185  229 224 185  229 224 185  229 224 185
-+228 223 179  228 223 179  228 223 179  228 223 179  227 221 169  227 221 169
-+227 221 169  224 212 126  154 97 33  143 92 37  131 88 37  131 88 37
-+156 118 66  227 219 152  227 219 152  227 219 152  227 218 146  227 218 146
-+227 218 146  226 217 137  226 217 137  224 212 126  224 212 126  156 118 66
-+57 50 16  57 50 16  57 50 16  47 39 13  47 39 13  31 27 8
-+31 27 8  20 17 5  15 13 4  10 9 3  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  3 3 1  7 5 2  13 11 4
-+18 15 5  23 19 6  27 23 7  31 27 8  37 31 10  44 35 11
-+47 39 13  47 39 13  47 39 13  56 48 15  47 39 13  56 48 15
-+47 39 13  47 39 13  47 39 13  47 39 13  47 39 13  47 39 13
-+47 39 13  47 39 13  44 35 11  41 32 10  44 35 11  41 32 10
-+44 35 11  37 31 10  41 32 10  44 35 11  44 35 11  47 39 13
-+47 39 13  47 39 13  55 43 14  51 40 13  55 43 14  58 46 15
-+58 46 15  59 45 14  59 49 15  67 48 15  67 48 15  71 51 16
-+71 53 16  71 53 16  71 53 16  79 57 18  79 57 18  80 59 18
-+80 59 18  80 59 18  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  104 73 28  90 63 20  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  131 88 37  104 73 28  143 92 37
-+104 73 28  104 73 28  104 73 28  104 73 28  154 97 33  104 73 28
-+143 92 37  104 73 28  154 97 33  104 73 28  154 97 33  104 73 28
-+154 97 33  90 63 20  154 97 33  104 73 28  154 97 33  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  90 63 20  143 92 37
-+104 73 28  143 92 37  104 73 28  154 97 33  104 73 28  143 92 37
-+131 88 37  154 97 33  154 97 33  154 97 33  163 154 123  231 228 207
-+231 229 212  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+230 227 205  230 227 204  230 227 202  230 227 201  230 227 201  230 227 199
-+230 227 197  230 227 197  230 227 197  230 227 197  229 225 190  230 227 197
-+229 225 190  229 224 185  229 225 190  229 224 185  229 224 185  229 224 185
-+228 223 179  229 224 185  227 221 169  228 223 179  228 223 179  224 214 136
-+156 118 66  131 88 37  131 88 37  131 88 37  131 88 37  131 88 37
-+224 212 126  227 219 152  227 219 152  227 218 146  227 218 146  227 218 146
-+226 217 137  226 217 137  226 217 137  224 212 126  224 212 126  156 118 66
-+57 50 16  57 50 16  57 50 16  47 39 13  37 31 10  37 31 10
-+27 23 7  23 19 6  15 13 4  9 7 3  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  5 4 1  9 7 3  15 13 4
-+20 17 5  25 20 6  31 27 8  37 31 10  44 35 11  47 39 13
-+56 48 15  57 50 17  57 50 17  57 50 17  56 48 15  57 50 17
-+57 50 17  56 48 15  56 48 15  47 39 13  56 48 15  47 39 13
-+47 39 13  47 39 13  47 39 13  47 39 13  47 39 13  47 39 13
-+47 39 13  47 39 13  47 39 13  56 48 15  47 39 13  56 48 15
-+55 44 14  58 46 15  56 48 15  59 49 15  59 49 15  67 48 15
-+59 49 15  71 53 16  71 53 16  71 53 16  71 53 16  78 55 17
-+78 55 17  80 59 18  80 59 18  80 59 18  80 59 18  90 65 21
-+90 63 20  90 65 21  90 65 21  90 65 21  90 65 21  97 69 27
-+104 73 28  90 63 20  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  131 88 37  104 73 28  104 73 28  104 73 28
-+143 92 37  131 88 37  143 92 37  104 73 28  143 92 37  143 92 37
-+154 97 33  156 118 66  176 168 138  156 118 66  154 97 33  104 73 28
-+154 97 33  104 73 28  143 92 37  104 73 28  104 73 28  104 73 28
-+154 97 33  104 73 28  104 73 28  143 92 37  104 73 28  104 73 28
-+143 92 37  104 73 28  154 97 33  104 73 28  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  156 118 66  231 228 207
-+231 229 212  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+230 227 202  230 227 202  230 227 202  230 227 201  230 227 199  230 227 197
-+230 227 197  230 227 197  229 225 190  230 227 197  229 225 190  229 225 190
-+229 225 190  229 224 185  229 224 185  229 224 185  229 224 185  229 224 185
-+228 223 179  228 223 179  228 223 179  227 218 149  156 118 66  154 97 33
-+143 92 37  154 97 33  131 88 37  154 97 33  131 88 37  131 88 37
-+224 212 126  224 214 136  227 219 152  227 219 152  227 218 146  227 218 146
-+227 217 139  226 217 137  226 217 137  224 212 126  224 212 126  154 108 49
-+57 50 16  57 50 16  47 39 13  47 39 13  37 31 10  37 31 10
-+27 23 7  20 17 5  15 13 4  8 7 4  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  3 3 1  7 5 2  13 11 4  18 15 5
-+23 19 6  29 24 7  37 31 10  37 31 10  47 39 13  47 39 13
-+56 48 15  56 48 15  57 50 17  57 50 17  57 50 17  57 50 17
-+56 48 15  57 50 17  57 50 17  57 50 17  56 48 15  57 50 17
-+57 50 17  57 50 17  56 48 15  57 50 17  56 48 15  56 48 15
-+56 48 15  56 48 15  57 50 17  56 48 15  57 50 17  57 50 17
-+57 50 17  59 49 15  59 49 15  67 48 15  71 53 16  71 53 16
-+71 53 16  71 53 16  71 53 16  79 57 18  80 59 18  80 59 18
-+80 59 18  80 59 18  90 65 21  90 65 21  90 65 21  90 65 21
-+90 65 21  97 69 27  90 65 21  97 69 27  97 69 27  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  131 88 37  104 73 28  104 73 28  143 92 37  154 108 49
-+156 118 66  156 118 66  176 168 138  192 187 164  229 225 190  231 229 217
-+238 238 238  238 238 238  231 229 217  176 168 138  143 92 37  154 97 33
-+104 73 28  154 97 33  104 73 28  154 97 33  104 73 28  154 97 33
-+104 73 28  90 63 20  143 92 37  104 73 28  104 73 28  143 92 37
-+104 73 28  154 97 33  104 73 28  143 92 37  143 92 37  143 92 37
-+131 88 37  154 97 33  154 97 33  154 97 33  156 118 66  231 229 212
-+231 229 212  231 228 207  231 228 207  231 228 207  231 228 207  230 227 205
-+230 227 204  230 227 202  230 227 202  230 227 201  230 227 199  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  229 225 190  229 225 190
-+229 225 190  229 225 190  229 224 185  229 224 185  229 224 185  228 223 179
-+229 224 185  227 218 153  156 118 66  154 97 33  154 97 33  143 92 37
-+154 97 33  131 88 37  154 97 33  131 88 37  131 88 37  131 88 37
-+216 206 146  227 219 152  227 219 152  227 218 146  227 218 146  227 218 146
-+226 217 137  226 217 137  224 212 126  224 212 126  224 212 126  110 81 38
-+57 50 16  57 50 16  57 50 16  57 50 17  37 31 10  37 31 10
-+27 23 7  20 17 5  15 13 4  9 7 3  4 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  4 3 1  9 7 3  13 11 4  18 15 5
-+25 20 6  31 27 8  37 31 10  47 39 13  47 39 13  57 50 17
-+57 50 17  57 50 17  57 50 17  150 141 118  142 111 68  60 51 33
-+57 50 16  57 50 17  57 50 17  57 50 17  57 50 17  56 48 15
-+56 48 15  56 48 15  56 48 15  56 48 15  57 50 17  56 48 15
-+56 48 15  57 50 17  56 48 15  57 50 17  59 49 15  67 48 15
-+71 53 16  71 53 16  71 53 16  71 53 16  71 53 16  80 59 18
-+80 59 18  80 59 18  80 59 18  80 59 18  80 59 18  80 59 18
-+90 65 21  90 65 21  90 65 21  90 65 21  91 66 24  91 66 24
-+97 69 27  90 65 21  104 73 28  97 69 27  104 73 28  90 65 21
-+104 73 28  104 73 28  104 73 28  143 92 37  154 108 49  149 122 79
-+163 154 123  176 168 138  216 206 146  229 225 190  230 228 210  231 229 217
-+238 238 238  238 238 238  231 230 220  231 230 220  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  200 196 176  143 92 37  104 73 28
-+154 97 33  104 73 28  154 97 33  104 73 28  143 92 37  90 63 20
-+154 97 33  104 73 28  104 73 28  143 92 37  104 73 28  104 73 28
-+154 97 33  104 73 28  154 97 33  104 73 28  154 97 33  154 97 33
-+143 92 37  154 97 33  154 97 33  154 97 33  154 97 33  230 227 197
-+231 228 207  231 228 207  231 228 207  231 228 207  231 228 207  230 227 205
-+230 227 204  230 227 202  230 227 201  230 227 201  230 227 199  230 227 197
-+230 227 197  230 227 197  229 225 190  229 225 190  230 227 197  229 225 190
-+229 224 185  229 224 185  229 224 185  229 224 185  229 224 185  216 206 146
-+156 118 66  154 97 33  154 97 33  154 97 33  154 97 33  131 88 37
-+154 97 33  131 88 37  131 88 37  154 97 33  131 88 37  154 97 33
-+226 217 137  227 219 152  227 219 152  227 218 149  227 218 146  227 217 139
-+227 217 139  226 217 137  226 217 137  224 212 126  224 212 126  90 65 21
-+57 50 16  57 50 16  47 39 13  37 31 10  47 39 13  31 27 8
-+27 23 7  20 17 5  15 13 4  8 7 4  3 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  2 2 2  5 4 1  10 9 3  16 14 4  23 19 6
-+27 23 7  37 31 10  37 31 10  47 39 13  47 39 13  56 48 15
-+57 50 17  57 50 17  90 68 33  226 218 148  227 219 152  227 219 152
-+176 168 138  138 129 110  135 101 60  75 62 40  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  57 50 17  71 53 16  57 50 17
-+71 53 16  57 50 17  71 53 16  80 59 18  71 53 16  70 58 37
-+80 59 18  80 59 18  80 59 18  80 59 18  91 66 24  80 59 18
-+90 65 21  90 65 21  90 65 21  90 65 21  91 66 24  90 65 21
-+135 101 60  135 98 56  150 141 118  149 122 79  176 168 138  176 168 138
-+200 196 176  227 222 178  231 228 207  231 229 212  231 229 217  231 229 217
-+231 229 214  231 229 217  231 230 220  231 229 217  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  231 230 220  231 230 220  238 238 238
-+231 230 220  231 230 220  231 230 220  230 227 205  143 92 37  154 97 33
-+143 92 37  143 92 37  154 97 33  104 73 28  154 97 33  104 73 28
-+143 92 37  104 73 28  143 92 37  104 73 28  104 73 28  143 92 37
-+104 73 28  154 97 33  104 73 28  154 97 33  143 92 37  131 88 37
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  227 222 178
-+231 228 207  231 228 207  231 228 207  231 228 207  231 228 207  230 227 204
-+230 227 202  230 227 202  230 227 201  230 227 201  230 227 197  230 227 197
-+230 227 197  229 225 190  230 227 197  230 227 197  229 225 190  229 225 190
-+229 225 190  229 224 185  229 224 185  216 206 146  156 118 66  154 97 33
-+154 97 33  154 97 33  154 97 33  143 92 37  154 97 33  154 97 33
-+131 88 37  154 97 33  154 97 33  131 88 37  154 97 33  156 118 66
-+227 219 152  227 219 152  227 219 152  227 218 146  227 218 146  227 218 146
-+226 217 137  226 217 137  224 212 126  224 212 126  224 212 126  57 50 16
-+57 50 16  57 50 16  57 50 16  47 39 13  37 31 10  31 27 8
-+27 23 7  18 15 5  13 11 4  7 5 2  4 3 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+1 1 1  3 3 1  7 5 2  13 11 4  18 15 5  24 21 6
-+31 27 8  37 31 10  47 39 13  47 39 13  57 50 17  57 50 17
-+57 50 17  57 50 17  149 122 79  227 219 152  227 220 160  227 219 152
-+227 220 160  227 219 152  227 220 160  227 221 169  227 221 169  185 178 149
-+176 168 138  163 154 123  150 141 118  142 111 68  138 129 110  142 111 68
-+100 76 42  100 76 42  100 76 42  114 84 45  100 76 42  114 84 45
-+114 84 45  114 84 45  114 84 45  114 84 45  114 84 45  138 129 110
-+149 122 79  138 129 110  138 129 110  150 141 118  176 168 138  163 154 123
-+176 168 138  200 196 176  200 196 176  229 225 190  230 228 209  230 228 209
-+230 228 209  230 228 209  231 228 207  231 229 212  231 229 212  231 229 212
-+231 228 207  231 229 214  231 229 217  231 229 217  231 229 217  231 229 217
-+231 230 220  231 229 217  231 230 220  231 230 220  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  231 230 220  231 230 220  231 230 220
-+231 230 220  238 238 238  231 230 220  231 230 220  154 108 49  131 88 37
-+104 73 28  154 97 33  104 73 28  154 97 33  104 73 28  143 92 37
-+104 73 28  143 92 37  104 73 28  143 92 37  104 73 28  154 97 33
-+104 73 28  154 97 33  143 92 37  143 92 37  143 92 37  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  216 206 146
-+230 227 205  231 228 207  231 228 207  231 228 207  230 227 204  230 227 204
-+230 227 202  230 227 202  230 227 201  230 227 199  230 227 197  230 227 197
-+230 227 197  230 227 197  229 225 190  229 225 190  229 225 190  229 225 190
-+228 223 179  176 168 138  154 108 49  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  131 88 37  154 97 33
-+154 97 33  131 88 37  154 97 33  131 88 37  154 97 33  156 118 66
-+227 219 152  227 219 152  227 219 152  227 218 146  227 218 146  227 217 139
-+226 217 137  226 217 137  224 212 126  224 212 126  224 212 126  57 50 16
-+57 50 16  57 50 16  47 39 13  47 39 13  37 31 10  31 27 8
-+24 21 6  18 15 5  13 11 4  7 5 2  3 3 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+1 1 1  4 3 1  9 7 3  14 11 4  18 15 5  25 20 6
-+31 27 8  37 31 10  47 39 13  47 39 13  56 48 15  57 50 17
-+57 50 16  57 50 16  163 154 123  227 219 152  227 220 160  227 219 152
-+227 220 160  227 221 169  227 220 160  227 221 169  227 221 169  227 220 160
-+227 221 169  227 221 169  227 221 169  227 222 178  227 222 178  227 222 178
-+229 226 192  229 226 192  229 226 192  229 226 196  229 226 196  230 227 199
-+230 227 201  230 227 202  230 227 202  230 228 209  229 226 196  229 226 192
-+229 226 196  229 226 192  229 226 192  229 226 192  230 227 197  231 228 207
-+230 227 202  230 227 202  230 227 204  230 227 205  231 228 207  230 228 209
-+230 228 209  231 229 212  231 229 212  231 229 212  231 229 212  231 229 214
-+231 229 214  231 229 217  231 229 217  231 229 217  231 229 217  231 229 217
-+231 229 217  231 230 220  231 229 217  231 230 220  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  238 238 238  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  238 238 238  149 122 79  143 92 37
-+154 97 33  143 92 37  154 97 33  104 73 28  154 97 33  104 73 28
-+154 97 33  104 73 28  143 92 37  104 73 28  143 92 37  104 73 28
-+143 92 37  104 73 28  154 97 33  104 73 28  143 92 37  143 92 37
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  176 168 138
-+230 228 209  231 228 207  231 228 207  230 227 205  230 227 204  230 227 202
-+230 227 202  230 227 201  230 227 201  230 227 199  230 227 197  230 227 197
-+230 227 197  230 227 197  229 225 190  230 227 197  227 218 153  156 118 66
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  131 88 37
-+154 97 33  154 97 33  131 88 37  154 97 33  131 88 37  224 212 126
-+227 219 152  227 219 152  227 218 149  227 218 146  227 218 146  227 217 139
-+226 217 137  226 217 137  224 212 126  224 212 126  163 154 123  57 50 16
-+57 50 16  57 50 16  47 39 13  47 39 13  37 31 10  31 27 8
-+24 21 6  18 15 5  13 11 4  7 5 2  3 3 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+2 2 2  5 4 1  9 7 3  15 13 4  22 17 5  27 23 7
-+37 31 10  37 31 10  47 39 13  56 48 15  57 50 17  57 50 17
-+57 50 17  57 50 16  163 154 123  227 218 146  227 219 152  227 220 160
-+227 220 160  227 220 160  227 220 160  227 221 169  227 221 169  227 221 169
-+227 221 169  228 223 179  227 221 169  227 222 178  227 222 178  227 222 178
-+229 224 185  229 224 185  229 226 192  229 224 185  229 226 192  229 226 192
-+229 226 192  229 226 192  229 226 192  229 226 196  229 226 196  229 226 196
-+229 226 196  230 227 199  230 227 201  230 227 201  230 227 202  230 227 202
-+230 227 204  230 227 205  231 228 207  231 228 207  231 228 207  230 228 209
-+231 228 207  231 229 212  231 229 212  231 229 212  231 229 214  231 229 214
-+231 229 214  231 229 214  231 229 217  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 230 220  231 230 220  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  231 229 217  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  231 230 220  185 178 149  154 97 33
-+131 88 37  143 92 37  104 73 28  154 97 33  143 92 37  143 92 37
-+104 73 28  154 97 33  104 73 28  143 92 37  104 73 28  154 97 33
-+104 73 28  154 97 33  143 92 37  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  163 154 123
-+230 227 197  231 228 207  231 228 207  230 227 204  230 227 204  230 227 202
-+230 227 202  230 227 201  230 227 199  230 227 197  230 227 197  230 227 197
-+230 227 197  227 222 178  176 168 138  154 108 49  154 97 33  154 108 49
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  131 88 37  154 97 33  154 97 33  131 88 37  224 212 126
-+226 218 148  227 219 152  226 218 148  227 218 146  227 218 146  227 217 139
-+226 217 137  226 217 137  224 212 126  224 212 126  156 118 66  80 59 18
-+57 50 16  57 50 16  47 39 13  47 39 13  37 31 10  31 27 8
-+24 21 6  18 15 5  10 9 3  6 5 1  3 3 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+3 3 1  5 4 1  10 9 3  15 13 4  23 19 6  29 24 7
-+31 27 8  47 39 13  47 39 13  47 39 13  56 48 15  57 50 16
-+57 50 16  57 50 16  163 154 123  227 219 152  227 219 152  227 219 152
-+227 220 160  227 220 160  227 221 169  227 220 160  227 221 169  227 221 169
-+227 221 169  227 221 169  228 223 179  227 222 178  228 223 179  228 223 179
-+228 223 179  229 224 185  228 223 179  229 224 185  229 224 185  229 224 185
-+229 226 192  229 226 192  229 226 192  229 226 192  229 226 196  230 227 197
-+230 227 197  230 227 197  230 227 199  230 227 201  230 227 202  230 227 202
-+230 227 204  230 227 205  231 228 207  231 228 207  231 228 207  231 228 207
-+230 228 209  231 228 207  231 229 212  231 229 212  231 229 212  231 229 214
-+231 229 214  231 229 214  231 229 214  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  231 230 220  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  231 229 217  200 196 176  143 92 37
-+143 92 37  154 97 33  154 97 33  104 73 28  154 97 33  104 73 28
-+154 97 33  104 73 28  154 97 33  104 73 28  154 97 33  104 73 28
-+154 97 33  104 73 28  154 97 33  104 73 28  143 92 37  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  156 118 66
-+230 227 201  231 228 207  231 228 207  230 227 204  230 227 204  230 227 202
-+230 227 201  230 227 201  230 227 201  229 226 196  229 224 185  224 212 126
-+156 118 66  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  131 88 37  154 97 33  154 97 33  227 219 152
-+227 219 152  227 219 152  227 218 146  227 218 146  227 218 146  226 217 137
-+226 217 137  224 212 126  224 212 126  224 212 126  156 118 66  57 50 16
-+57 50 16  57 50 16  47 39 13  47 39 13  31 27 8  31 27 8
-+24 21 6  16 14 4  10 9 3  5 4 1  2 2 2  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+3 3 1  7 5 2  11 9 3  16 14 4  23 19 6  29 24 7
-+37 31 10  44 35 11  47 39 13  57 50 17  57 50 17  57 50 17
-+75 61 38  57 50 16  135 101 60  226 217 137  227 219 152  227 220 160
-+227 219 152  227 220 160  227 220 160  227 221 169  227 221 169  227 221 169
-+227 221 169  228 223 179  227 221 169  228 223 179  228 223 179  228 223 179
-+228 223 179  229 224 185  229 224 185  229 224 185  229 226 192  229 224 185
-+229 226 192  229 226 192  229 226 192  229 226 192  229 226 196  230 227 197
-+230 227 197  230 227 197  230 227 199  230 227 201  230 227 201  230 227 202
-+230 227 202  230 227 204  230 227 205  231 228 207  231 228 207  231 228 207
-+231 228 207  230 228 209  230 228 210  231 229 212  231 229 212  231 229 212
-+231 229 214  231 229 214  231 229 214  231 229 214  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  231 230 220
-+231 229 217  231 230 220  231 230 220  231 230 220  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  231 230 220  231 229 217  154 97 33
-+143 92 37  143 92 37  143 92 37  154 97 33  143 92 37  143 92 37
-+143 92 37  104 73 28  154 97 33  104 73 28  154 97 33  104 73 28
-+154 97 33  154 97 33  143 92 37  154 97 33  154 97 33  143 92 37
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  156 118 66
-+230 227 197  231 228 207  231 228 207  230 227 202  230 227 202  230 227 202
-+230 227 201  229 224 185  185 178 149  156 118 66  154 108 49  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  131 88 37
-+154 97 33  154 97 33  154 97 33  154 97 33  156 118 66  227 219 152
-+227 219 152  227 219 152  227 218 146  227 218 146  227 217 139  226 217 137
-+226 217 137  224 212 126  224 212 126  224 212 126  117 83 35  57 50 16
-+57 50 16  57 50 16  47 39 13  37 31 10  37 31 10  31 27 8
-+20 17 5  15 13 4  10 9 3  5 4 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+3 3 1  7 5 2  11 9 3  18 15 5  24 21 6  31 27 8
-+33 28 19  47 39 13  47 39 13  57 50 17  57 50 17  57 50 16
-+80 59 18  75 61 38  57 50 17  224 214 136  227 219 152  227 219 152
-+227 220 160  227 220 160  227 220 160  227 220 160  227 221 169  227 221 169
-+227 221 169  227 221 169  227 221 169  228 223 179  228 223 179  228 223 179
-+228 223 179  228 223 179  228 223 179  229 226 192  228 223 179  229 226 192
-+229 224 185  229 226 192  229 226 192  229 226 192  229 226 192  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 199  230 227 201  230 227 201
-+230 227 202  230 227 204  230 227 205  230 227 205  231 228 207  231 228 207
-+231 228 207  231 228 207  230 228 209  230 228 210  231 229 212  231 229 212
-+231 229 212  231 229 214  231 229 214  231 229 214  231 229 214  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  231 229 217
-+231 230 220  231 229 217  231 230 220  231 230 220  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  231 229 217  231 229 217  154 108 49
-+143 92 37  143 92 37  154 97 33  104 73 28  154 97 33  104 73 28
-+143 92 37  143 92 37  143 92 37  154 97 33  104 73 28  143 92 37
-+154 97 33  104 73 28  154 97 33  104 73 28  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+230 227 199  231 228 207  230 227 202  230 227 204  229 224 185  216 206 146
-+156 118 66  154 97 33  154 97 33  154 108 49  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  131 88 37  224 212 126  227 219 152
-+227 219 152  227 219 152  227 218 146  227 218 146  227 217 139  226 217 137
-+226 217 137  224 212 126  224 212 126  224 212 126  57 50 16  57 50 16
-+57 50 16  57 50 16  47 39 13  47 39 13  31 27 8  24 21 6
-+20 17 5  15 13 4  10 9 3  5 4 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+3 3 1  7 5 2  11 9 3  18 15 5  23 19 6  31 27 8
-+37 31 10  44 35 11  47 39 13  57 50 17  57 50 17  57 50 17
-+57 50 16  114 84 45  57 50 16  114 84 45  227 220 160  227 219 152
-+227 220 160  227 220 160  227 220 160  227 221 169  227 220 160  227 221 169
-+227 221 169  227 221 169  228 223 179  227 221 169  228 223 179  228 223 179
-+228 223 179  228 223 179  229 224 185  229 224 185  229 224 185  229 226 192
-+229 224 185  229 226 192  229 226 192  229 226 192  229 226 192  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 199  230 227 201  230 227 201
-+230 227 202  230 227 202  230 227 204  230 227 205  230 227 205  231 228 207
-+231 228 207  231 228 207  230 228 209  231 228 207  230 228 210  231 229 212
-+231 229 212  231 229 212  231 229 214  231 229 214  231 229 214  231 229 214
-+231 229 214  231 229 217  231 229 217  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 230 220  231 229 217
-+231 230 220  231 230 220  231 230 220  231 230 220  231 230 220  176 168 138
-+154 97 33  154 97 33  143 92 37  154 97 33  154 97 33  143 92 37
-+143 92 37  104 73 28  154 97 33  104 73 28  154 97 33  104 73 28
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 108 49
-+227 221 169  227 221 169  176 168 138  156 118 66  154 97 33  154 97 33
-+154 108 49  154 108 49  154 97 33  154 97 33  154 97 33  154 108 49
-+154 97 33  154 108 49  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  224 212 126  226 218 148
-+227 219 152  226 218 148  227 218 146  227 218 146  227 217 139  226 217 137
-+226 217 137  224 212 126  224 212 126  224 212 126  57 50 16  57 50 16
-+57 50 16  47 39 13  37 31 10  37 31 10  31 27 8  27 23 7
-+20 17 5  13 11 4  8 7 4  3 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+3 3 1  7 5 2  11 9 3  15 13 4  24 21 6  27 23 7
-+37 31 10  47 39 13  47 39 13  56 48 15  57 50 16  57 50 17
-+57 50 17  135 101 60  57 50 17  57 50 17  149 122 79  227 219 152
-+227 219 152  227 220 160  227 220 160  227 220 160  227 221 169  227 221 169
-+227 221 169  227 221 169  228 223 179  227 221 169  228 223 179  228 223 179
-+228 223 179  228 223 179  228 223 179  229 224 185  229 224 185  229 224 185
-+229 224 185  229 225 190  229 226 192  229 226 192  229 226 192  229 226 192
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 199  230 227 201
-+230 227 201  230 227 202  230 227 202  230 227 204  230 227 205  230 227 205
-+231 228 207  231 228 207  230 228 209  231 228 207  231 229 212  231 229 212
-+231 229 212  231 229 212  231 229 212  231 229 214  231 229 214  231 229 214
-+231 229 214  231 229 214  231 229 217  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  185 178 149
-+143 92 37  143 92 37  154 97 33  154 97 33  104 73 28  143 92 37
-+143 92 37  143 92 37  143 92 37  143 92 37  143 92 37  143 92 37
-+154 97 33  104 73 28  143 92 37  143 92 37  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 108 49  154 97 33  154 97 33  154 97 33  154 108 49  154 97 33
-+154 97 33  154 97 33  154 97 33  154 108 49  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  156 118 66  227 219 152  227 219 152
-+227 219 152  227 218 146  227 218 146  227 218 146  226 217 137  226 217 137
-+224 212 126  224 212 126  224 212 126  156 118 66  57 50 16  57 50 16
-+57 50 16  57 50 16  47 39 13  37 31 10  31 27 8  24 21 6
-+16 14 4  13 11 4  7 5 2  3 3 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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
-+2 2 2  5 4 1  10 9 3  16 14 4  23 19 6  29 24 7
-+31 27 8  44 35 11  47 39 13  57 50 17  57 50 16  57 50 17
-+57 50 17  135 101 60  58 54 45  57 50 16  57 50 16  142 111 68
-+226 218 148  227 220 160  227 220 160  227 220 160  227 220 160  227 221 169
-+227 221 169  227 221 169  227 221 169  228 223 179  227 221 169  228 223 179
-+228 223 179  228 223 179  229 224 185  228 223 179  229 224 185  229 226 192
-+229 224 185  229 226 192  229 225 190  229 226 192  229 226 192  229 226 192
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 199
-+230 227 201  230 227 202  230 227 202  230 227 204  230 227 205  230 227 205
-+230 227 205  231 228 207  231 228 207  231 228 207  231 228 207  231 229 212
-+231 228 207  231 229 212  231 229 212  231 229 212  231 229 214  231 229 214
-+231 229 214  231 229 214  231 229 217  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  230 227 204
-+154 97 33  154 97 33  143 92 37  154 97 33  154 97 33  154 97 33
-+104 73 28  154 97 33  143 92 37  104 73 28  154 97 33  104 73 28
-+154 97 33  154 97 33  154 97 33  143 92 37  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 108 49  154 97 33
-+154 97 33  154 108 49  154 97 33  154 108 49  154 97 33  154 108 49
-+154 97 33  154 108 49  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  163 154 123  226 217 137  227 219 152
-+227 219 152  227 218 146  227 218 146  227 217 139  226 217 137  226 217 137
-+224 212 126  224 212 126  224 212 126  154 108 49  57 50 16  57 50 16
-+57 50 16  37 31 10  47 39 13  37 31 10  31 27 8  24 21 6
-+16 14 4  10 9 3  6 5 1  3 3 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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
-+1 1 1  5 4 1  9 7 3  15 13 4  20 17 5  27 23 7
-+37 31 10  37 31 10  47 39 13  47 39 13  57 50 16  57 50 16
-+57 50 16  68 60 43  142 111 68  57 50 16  57 50 16  57 50 16
-+90 68 33  185 178 149  227 220 160  227 220 160  227 221 169  227 220 160
-+227 221 169  227 221 169  227 221 169  227 221 169  228 223 179  228 223 179
-+228 223 179  228 223 179  229 224 185  228 223 179  229 224 185  229 224 185
-+229 224 185  229 224 185  229 224 185  229 226 192  229 226 192  229 226 192
-+229 226 192  229 226 196  230 227 197  230 227 197  230 227 197  230 227 199
-+230 227 201  230 227 201  230 227 202  230 227 202  230 227 204  230 227 205
-+230 227 205  230 227 205  231 228 207  231 228 207  231 228 207  231 228 207
-+231 229 212  231 229 212  231 229 212  231 229 212  231 229 212  231 229 212
-+231 229 214  231 229 214  231 229 214  231 229 214  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  231 229 217
-+154 97 33  143 92 37  154 97 33  143 92 37  143 92 37  154 97 33
-+154 97 33  143 92 37  143 92 37  154 97 33  143 92 37  154 97 33
-+143 92 37  143 92 37  143 92 37  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 108 49
-+154 97 33  154 108 49  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 108 49  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  226 217 137  227 219 152  227 219 152
-+227 218 146  227 218 146  227 218 146  227 217 139  226 217 137  226 217 137
-+224 212 126  224 212 126  224 212 126  80 59 18  57 50 16  57 50 16
-+57 50 16  57 50 16  37 31 10  37 31 10  27 23 7  24 21 6
-+15 13 4  10 9 3  5 4 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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
-+1 1 1  4 3 1  9 7 3  14 11 4  20 17 5  27 23 7
-+37 31 10  37 31 10  47 39 13  57 50 17  57 50 16  57 50 17
-+57 50 16  57 50 16  150 141 118  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  135 101 60  216 206 146  227 219 152  227 221 169
-+227 220 160  227 221 169  227 221 169  227 221 169  228 223 179  227 221 169
-+228 223 179  228 223 179  228 223 179  228 223 179  229 224 185  229 224 185
-+229 224 185  229 226 192  229 224 185  229 226 192  229 226 192  229 226 192
-+229 226 192  230 227 197  229 226 192  230 227 197  230 227 197  230 227 197
-+230 227 199  230 227 201  230 227 201  230 227 202  230 227 202  230 227 204
-+230 227 205  230 227 205  230 227 205  231 228 207  231 228 207  231 228 207
-+231 228 207  231 228 207  231 229 212  231 229 212  231 229 212  231 229 212
-+231 229 212  231 229 214  231 229 214  231 229 214  231 229 214  231 229 214
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  231 229 217
-+163 154 123  154 97 33  154 97 33  154 97 33  154 97 33  143 92 37
-+143 92 37  143 92 37  143 92 37  143 92 37  104 73 28  154 97 33
-+104 73 28  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 108 49  154 108 49
-+154 108 49  154 108 49  154 108 49  154 108 49  154 108 49  154 108 49
-+154 108 49  154 108 49  154 108 49  154 97 33  154 108 49  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  156 118 66  226 217 137  227 219 152  227 219 152
-+227 218 146  227 218 146  227 218 146  226 217 137  226 217 137  224 212 126
-+224 212 126  224 212 126  224 212 126  57 50 16  57 50 16  57 50 16
-+47 39 13  37 31 10  47 39 13  31 27 8  27 23 7  20 17 5
-+15 13 4  10 9 3  5 4 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  3 3 1  7 5 2  13 11 4  18 15 5  24 21 6
-+31 27 8  37 31 10  37 31 10  47 39 13  57 50 16  57 50 16
-+57 50 16  57 50 16  149 122 79  75 62 40  57 50 16  57 50 16
-+57 50 16  57 50 16  56 48 15  57 50 16  114 84 45  163 154 123
-+227 220 160  227 221 169  227 221 169  227 221 169  228 223 179  227 221 169
-+228 223 179  228 223 179  228 223 179  229 224 185  228 223 179  229 224 185
-+229 224 185  229 224 185  229 225 190  229 224 185  229 226 192  229 226 192
-+229 226 192  229 226 192  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 199  230 227 201  230 227 201  230 227 202  230 227 202
-+230 227 204  230 227 205  230 227 205  230 227 205  231 228 207  231 228 207
-+231 228 207  231 229 212  231 228 207  231 228 207  231 228 207  231 229 212
-+231 229 212  231 229 212  231 229 212  231 229 214  230 228 210  231 229 214
-+230 228 210  231 229 214  230 228 210  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 214  231 228 207
-+176 168 138  154 97 33  154 97 33  154 97 33  143 92 37  154 97 33
-+143 92 37  154 97 33  143 92 37  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  143 92 37  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 108 49
-+154 108 49  154 97 33  154 108 49  154 108 49  154 97 33  154 108 49
-+154 97 33  154 97 33  154 108 49  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  224 212 126  227 219 152  227 219 152  227 219 152
-+227 218 146  227 218 146  227 217 139  226 217 137  226 217 137  224 212 126
-+224 212 126  224 212 126  156 118 66  57 50 16  57 50 16  57 50 16
-+57 50 16  47 39 13  37 31 10  31 27 8  24 21 6  20 17 5
-+13 11 4  6 5 1  5 4 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  3 3 1  7 5 2  11 9 3  18 15 5  24 21 6
-+31 27 8  37 31 10  47 39 13  47 39 13  57 50 17  57 50 16
-+57 50 16  57 50 16  135 101 60  149 122 79  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+80 59 18  135 101 60  163 154 123  227 219 152  227 221 169  228 223 179
-+227 221 169  228 223 179  228 223 179  228 223 179  228 223 179  229 224 185
-+229 224 185  229 224 185  229 224 185  229 225 190  229 225 190  229 226 192
-+229 226 192  229 226 192  230 227 197  229 226 192  230 227 197  230 227 197
-+230 227 197  230 227 199  230 227 199  230 227 201  230 227 201  230 227 202
-+230 227 202  230 227 204  230 227 205  230 227 205  230 227 205  231 228 207
-+231 228 207  231 228 207  231 228 207  231 229 212  231 228 207  231 228 207
-+231 229 212  231 229 212  231 228 207  231 229 214  230 228 210  231 229 214
-+231 229 214  231 229 214  230 228 210  231 229 217  230 228 210  231 229 214
-+230 228 210  231 229 214  231 229 214  231 229 214  231 229 214  231 229 214
-+229 224 185  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+143 92 37  143 92 37  143 92 37  143 92 37  143 92 37  143 92 37
-+143 92 37  143 92 37  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 108 49
-+154 97 33  154 108 49  154 97 33  154 108 49  154 108 49  154 97 33
-+154 108 49  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 108 49  226 217 137  227 218 146  227 219 152  227 218 146
-+227 218 146  227 218 146  227 217 139  226 217 137  226 217 137  224 212 126
-+224 212 126  224 212 126  117 83 35  57 50 16  57 50 16  57 50 16
-+37 31 10  47 39 13  31 27 8  31 27 8  24 21 6  16 14 4
-+13 11 4  6 5 1  3 3 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  2 2 2  5 4 1  10 9 3  15 13 4  20 17 5
-+31 27 8  37 31 10  37 31 10  47 39 13  47 39 13  57 50 16
-+57 50 16  57 50 16  57 50 16  224 212 126  57 50 17  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 16  57 50 17  90 68 33  149 122 79
-+163 154 123  216 206 146  228 223 179  228 223 179  229 224 185  228 223 179
-+229 224 185  229 224 185  229 225 190  229 224 185  229 224 185  229 225 190
-+229 226 192  229 226 192  229 226 192  229 226 196  229 226 196  230 227 197
-+230 227 197  230 227 197  230 227 199  230 227 199  230 227 201  230 227 201
-+230 227 202  230 227 202  230 227 204  230 227 205  230 227 205  231 228 207
-+231 228 207  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+231 229 212  231 228 207  231 229 212  231 229 212  230 228 210  230 228 210
-+230 228 210  231 229 214  231 228 207  231 229 217  231 228 207  231 229 217
-+230 228 210  231 229 217  231 228 207  231 229 214  231 228 207  231 229 214
-+230 227 205  154 97 33  154 97 33  154 97 33  154 97 33  143 92 37
-+154 97 33  154 97 33  154 97 33  143 92 37  154 97 33  143 92 37
-+154 97 33  143 92 37  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 108 49  154 97 33  154 97 33  154 108 49  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  224 212 126  227 219 152  227 219 152  227 219 152  227 218 146
-+227 218 146  227 217 139  226 217 137  226 217 137  224 212 126  224 212 126
-+224 212 126  224 212 126  57 50 16  57 50 16  57 50 16  57 50 16
-+47 39 13  47 39 13  31 27 8  31 27 8  24 21 6  16 14 4
-+10 9 3  5 4 1  2 2 2  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  1 1 1  4 3 1  9 7 3  14 11 4  20 17 5
-+27 23 7  31 27 8  37 31 10  47 39 13  57 50 17  57 50 16
-+57 50 17  57 50 16  57 50 16  163 154 123  135 101 60  57 50 16
-+57 50 16  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  57 50 16
-+57 50 16  71 53 16  71 53 16  100 76 42  142 111 68  138 129 110
-+163 154 123  185 178 149  216 206 146  224 217 160  229 226 192  229 225 190
-+229 225 190  229 226 192  229 226 192  229 226 192  229 226 196  229 226 196
-+230 227 197  230 227 197  230 227 197  230 227 199  230 227 201  230 227 201
-+230 227 201  230 227 202  230 227 202  230 227 204  230 227 205  230 227 205
-+231 228 207  231 228 207  231 228 207  231 228 207  229 225 190  200 196 176
-+200 196 176  229 224 185  230 228 210  231 228 207  230 228 210  231 229 214
-+231 228 207  230 228 210  230 228 210  230 228 210  230 228 210  230 228 210
-+231 229 214  231 228 207  231 229 214  231 229 214  231 229 214  231 228 207
-+231 229 214  163 154 123  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  143 92 37  154 97 33  143 92 37  154 97 33  143 92 37
-+143 92 37  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  224 212 126  226 217 137  227 219 152  227 218 146  227 218 146
-+227 218 146  227 217 139  226 217 137  226 217 137  224 212 126  224 212 126
-+224 212 126  156 118 66  57 50 16  57 50 16  57 50 16  57 50 16
-+37 31 10  37 31 10  31 27 8  27 23 7  20 17 5  15 13 4
-+7 7 7  3 3 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  3 3 1  8 7 4  13 11 4  18 15 5
-+24 21 6  31 27 8  37 31 10  37 31 10  47 39 13  57 50 16
-+57 50 16  57 50 16  57 50 16  110 81 38  176 168 138  57 50 16
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  71 53 16  57 50 17  71 53 16
-+71 53 16  57 50 17  80 59 18  57 50 17  80 59 18  71 53 16
-+80 59 18  80 59 18  71 53 16  80 59 18  80 59 18  90 68 33
-+135 101 60  114 84 45  135 101 60  142 111 68  149 122 79  138 129 110
-+149 122 79  149 122 79  138 129 110  149 122 79  150 141 118  149 122 79
-+150 141 118  149 122 79  150 141 118  149 122 79  135 101 60  143 106 60
-+143 106 60  144 102 51  117 83 35  117 83 35  117 83 35  117 83 35
-+143 92 37  150 141 118  231 228 207  230 228 210  231 228 207  231 228 207
-+230 228 210  230 228 210  230 228 210  231 228 207  231 229 214  230 228 210
-+231 228 207  231 229 214  231 228 207  231 228 207  231 229 214  231 228 207
-+230 227 197  176 168 138  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  143 92 37  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 108 49  154 97 33
-+163 154 123  227 218 146  227 219 152  227 219 152  227 218 146  227 218 146
-+227 218 146  226 217 137  226 217 137  224 212 126  224 212 126  224 212 126
-+224 212 126  117 83 35  57 50 16  57 50 16  57 50 16  47 39 13
-+47 39 13  37 31 10  31 27 8  24 21 6  16 14 4  10 9 3
-+8 7 4  3 3 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  2 2 2  5 4 1  11 9 3  16 14 4
-+24 21 6  31 27 8  37 31 10  47 39 13  47 39 13  47 39 13
-+57 50 17  57 50 16  57 50 16  57 50 16  224 212 126  114 84 45
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  71 53 16
-+57 50 17  80 59 18  57 50 17  80 59 18  80 59 18  71 53 16
-+80 59 18  80 59 18  80 59 18  80 59 18  80 59 18  80 59 18
-+80 59 18  91 66 24  90 65 21  90 65 21  91 66 24  104 73 28
-+97 69 27  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  117 83 35  104 73 28  104 73 28  117 83 35  104 73 28
-+117 83 35  117 83 35  104 73 28  117 83 35  117 83 35  131 88 37
-+104 73 28  154 97 33  231 228 207  231 228 207  231 228 207  230 228 210
-+231 228 207  231 228 207  230 228 210  230 228 210  231 228 207  230 228 210
-+231 228 207  231 229 214  231 228 207  231 229 214  231 228 207  231 228 207
-+231 228 207  229 224 185  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+143 92 37  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 108 49  154 108 49  154 97 33
-+224 212 126  226 217 137  227 219 152  227 218 146  227 218 146  227 218 146
-+227 217 139  226 217 137  226 217 137  226 217 137  224 212 126  224 212 126
-+224 212 126  57 50 16  57 50 16  57 50 16  57 50 16  47 39 13
-+37 31 10  37 31 10  31 27 8  24 21 6  16 14 4  10 9 3
-+6 5 1  3 3 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1  5 4 1  9 8 6  15 13 4
-+20 17 5  24 21 6  33 28 19  37 31 10  37 31 10  57 50 16
-+57 50 16  57 50 17  57 50 16  57 50 16  149 122 79  176 168 138
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 16  57 50 17  71 53 16  57 50 17
-+57 50 17  71 53 16  57 50 17  80 59 18  57 50 17  71 53 16
-+80 59 18  80 59 18  80 59 18  90 65 21  80 59 18  90 65 21
-+90 65 21  90 65 21  90 65 21  91 66 24  91 66 24  90 65 21
-+97 69 27  90 65 21  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  117 83 35  104 73 28
-+117 83 35  104 73 28  117 83 35  117 83 35  131 88 37  117 83 35
-+131 88 37  131 88 37  200 196 176  231 228 207  231 228 207  231 228 207
-+231 228 207  231 228 207  231 228 207  231 228 207  231 228 207  231 229 214
-+231 228 207  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+231 228 207  231 228 207  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 108 49  154 97 33  154 97 33  224 212 126
-+227 218 146  227 218 146  227 219 152  227 218 146  227 218 146  227 218 146
-+226 217 137  226 217 137  224 212 126  224 212 126  224 212 126  224 212 126
-+154 108 49  57 50 16  57 50 16  57 50 16  57 50 16  47 39 13
-+37 31 10  31 27 8  24 21 6  20 17 5  16 14 4  10 9 3
-+5 4 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1  4 3 1  7 5 2  13 11 4
-+18 15 5  24 21 6  31 27 8  37 31 10  47 39 13  47 39 13
-+57 50 16  57 50 16  57 50 17  57 50 16  71 64 51  226 217 137
-+114 84 45  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 16  57 50 16  57 50 16  57 50 17  57 50 17
-+71 53 16  57 50 17  57 50 17  71 53 16  80 59 18  57 50 17
-+80 59 18  57 50 17  80 59 18  80 59 18  80 59 18  80 59 18
-+80 59 18  90 65 21  90 65 21  90 65 21  90 65 21  97 69 27
-+90 65 21  104 73 28  90 65 21  90 65 21  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  117 83 35
-+104 73 28  131 88 37  117 83 35  117 83 35  117 83 35  131 88 37
-+117 83 35  131 88 37  163 154 123  230 227 201  231 228 207  231 228 207
-+231 228 207  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+231 228 207  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+231 228 207  231 228 207  163 154 123  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 108 49  154 108 49  154 97 33  224 212 126
-+226 217 137  227 218 146  227 218 146  227 218 146  227 218 146  227 217 139
-+226 217 137  226 217 137  226 217 137  224 212 126  224 212 126  224 212 126
-+80 59 18  57 50 16  57 50 16  57 50 16  37 31 10  47 39 13
-+37 31 10  31 27 8  31 27 8  16 14 4  10 10 10  6 5 1
-+3 3 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  3 3 1  6 5 1  10 9 3
-+16 14 4  24 21 6  31 27 8  31 27 8  47 39 13  35 34 31
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  163 154 123
-+224 212 126  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 17  57 50 16  57 50 16  57 50 16  57 50 16  71 53 16
-+57 50 17  80 59 18  71 53 16  80 59 18  80 59 18  80 59 18
-+80 59 18  80 59 18  80 59 18  90 65 21  90 65 21  90 65 21
-+90 65 21  90 65 21  90 65 21  104 73 28  90 65 21  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  117 83 35
-+104 73 28  117 83 35  104 73 28  117 83 35  117 83 35  131 88 37
-+117 83 35  143 92 37  156 118 66  231 228 207  231 228 207  231 228 207
-+231 228 207  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+231 228 207  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+231 228 207  230 227 199  224 212 126  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 108 49  154 108 49  154 97 33  154 97 33  224 212 126  227 217 139
-+227 218 146  227 219 152  227 218 146  227 218 146  227 218 146  227 217 139
-+226 217 137  224 212 126  224 212 126  224 212 126  224 212 126  156 118 66
-+57 50 16  57 50 16  57 50 16  57 50 16  47 39 13  47 39 13
-+31 27 8  31 27 8  24 21 6  16 14 4  10 9 3  6 5 1
-+2 2 2  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  1 1 1  5 4 1  10 9 3
-+15 13 4  20 17 5  27 23 7  31 27 8  37 31 10  47 39 13
-+47 39 13  57 50 16  57 50 16  57 50 16  57 50 16  114 84 45
-+226 217 137  142 111 68  57 50 16  57 50 17  57 50 17  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  71 53 16  57 50 16  71 53 16  71 53 16  80 59 18
-+80 59 18  80 59 18  80 59 18  80 59 18  90 65 21  90 65 21
-+90 65 21  90 65 21  90 65 21  90 65 21  90 65 21  90 65 21
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  117 83 35  117 83 35  131 88 37  117 83 35  131 88 37
-+117 83 35  131 88 37  131 88 37  227 222 178  230 227 204  230 227 205
-+230 227 205  230 227 205  231 228 207  230 227 205  231 228 207  230 227 205
-+231 228 207  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+231 228 207  230 227 205  227 222 178  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 108 49  154 108 49  154 108 49  154 97 33  224 212 126  227 217 139
-+227 219 152  227 218 146  227 218 146  227 218 146  227 217 139  226 217 137
-+226 217 137  226 217 137  224 212 126  224 212 126  224 212 126  117 83 35
-+57 50 16  57 50 16  57 50 16  47 39 13  47 39 13  31 27 8
-+31 27 8  24 21 6  16 14 4  16 14 4  10 9 3  3 3 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  3 3 1  6 5 1
-+13 11 4  20 17 5  24 21 6  31 27 8  37 31 10  37 31 10
-+47 39 13  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+176 168 138  224 212 126  63 54 38  57 50 17  57 50 17  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  56 48 15
-+56 48 15  55 44 14  56 48 15  51 40 13  56 48 15  57 50 16
-+57 50 16  57 50 16  59 49 15  57 50 16  71 53 16  57 50 16
-+71 53 16  71 53 16  80 59 18  80 59 18  80 59 18  80 59 18
-+80 59 18  90 63 20  90 63 20  90 63 20  90 65 21  90 63 20
-+90 63 20  90 63 20  90 63 20  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  117 83 35  104 73 28  117 83 35  117 83 35
-+131 88 37  131 88 37  131 88 37  185 178 149  230 227 204  230 227 204
-+230 227 204  230 227 205  230 227 205  230 227 205  230 227 205  230 227 205
-+230 227 205  230 227 205  230 227 205  230 227 205  230 227 205  230 227 205
-+230 227 205  230 227 205  230 227 202  154 108 49  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 108 49
-+154 108 49  154 108 49  154 97 33  224 212 126  227 218 146  227 219 152
-+227 218 146  227 218 146  227 218 146  227 218 146  227 217 139  226 217 137
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  57 50 16
-+57 50 16  57 50 16  57 50 16  47 39 13  47 39 13  37 31 10
-+31 27 8  24 21 6  16 14 4  10 9 3  8 7 4  3 3 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  2 2 2  5 4 1
-+10 9 3  15 13 4  24 21 6  27 23 7  37 31 10  37 31 10
-+47 39 13  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+142 111 68  226 217 137  150 141 118  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  56 48 15  56 48 15  56 48 15  51 40 13
-+51 40 13  51 40 13  51 40 13  47 39 13  46 36 11  50 37 12
-+51 40 13  55 43 14  59 45 14  59 49 15  59 45 14  67 48 15
-+59 49 15  71 53 16  67 48 15  71 53 16  71 53 16  78 55 17
-+78 55 17  78 55 17  80 59 18  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  104 73 28
-+104 73 28  104 73 28  131 88 37  104 73 28  131 88 37  131 88 37
-+117 83 35  131 88 37  131 88 37  156 118 66  230 227 197  230 227 202
-+230 227 202  230 227 202  230 227 204  230 227 204  230 227 204  230 227 204
-+230 227 204  230 227 204  230 227 204  230 227 204  230 227 204  230 227 204
-+230 227 204  230 227 204  231 228 207  224 212 126  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 108 49
-+154 108 49  154 108 49  224 212 126  224 212 126  226 217 137  227 218 146
-+227 218 146  227 218 146  227 218 146  227 217 139  226 217 137  226 217 137
-+224 212 126  224 212 126  224 212 126  224 212 126  117 83 35  57 50 16
-+57 50 16  57 50 16  57 50 16  37 31 10  37 31 10  31 27 8
-+31 27 8  24 21 6  16 14 4  10 9 3  5 5 5  3 3 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  1 1 1  3 3 1
-+8 7 4  13 11 4  20 17 5  24 21 6  31 27 8  37 31 10
-+47 39 13  37 31 10  57 50 16  57 50 16  57 50 16  57 50 16
-+47 39 13  224 212 126  226 217 137  100 76 42  57 50 16  57 50 16
-+57 50 16  56 48 15  56 48 15  56 48 15  55 44 14  55 44 14
-+51 40 13  51 40 13  50 37 12  46 36 11  46 36 11  43 33 10
-+46 36 11  49 31 9  50 37 12  57 34 10  58 38 12  60 42 13
-+60 42 13  60 42 13  68 47 15  68 47 15  68 47 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  78 55 17  75 50 15
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  117 83 35  104 73 28
-+131 88 37  117 83 35  131 88 37  143 92 37  229 225 190  230 227 202
-+230 227 202  230 227 202  230 227 202  230 227 202  230 227 202  230 227 202
-+230 227 202  230 227 202  230 227 202  230 227 202  230 227 202  230 227 202
-+230 227 202  230 227 205  229 224 185  216 206 146  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 108 49  154 108 49  154 108 49
-+154 97 33  154 97 33  224 212 126  227 217 139  227 218 146  227 218 146
-+227 218 146  227 218 146  227 217 139  226 217 137  226 217 137  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  57 50 16  57 50 16
-+57 50 16  57 50 16  47 39 13  47 39 13  37 31 10  31 27 8
-+24 21 6  16 14 4  10 9 3  10 9 3  3 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  3 3 1
-+6 5 1  10 9 3  16 14 4  24 21 6  31 27 8  31 27 8
-+47 39 13  35 34 31  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  100 76 42  226 217 137  224 212 126  57 50 17  57 50 17
-+57 50 16  56 48 15  56 48 15  47 39 13  56 48 15  47 39 13
-+51 40 13  47 39 13  46 36 11  44 35 11  43 33 10  41 32 10
-+38 27 8  38 27 8  48 30 8  49 31 9  49 31 9  50 37 12
-+57 34 10  58 38 12  62 38 11  62 38 11  62 38 11  62 38 11
-+68 47 15  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  104 73 28  104 73 28  131 88 37  104 73 28  143 92 37
-+117 83 35  131 88 37  131 88 37  131 88 37  176 168 138  230 227 197
-+230 227 201  230 227 201  230 227 201  230 227 201  230 227 201  230 227 201
-+230 227 202  230 227 202  230 227 202  230 227 202  230 227 202  230 227 201
-+230 227 201  230 227 201  230 227 202  229 225 190  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 108 49  224 212 126  154 97 33
-+154 108 49  224 212 126  224 212 126  227 217 139  227 218 146  227 218 146
-+227 218 146  227 218 146  227 217 139  227 217 139  226 217 137  226 217 137
-+224 212 126  224 212 126  224 212 126  104 73 28  57 50 16  57 50 16
-+57 50 16  57 50 16  37 31 10  37 31 10  37 31 10  31 27 8
-+24 21 6  16 14 4  10 9 3  8 7 4  3 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1
-+5 4 1  10 9 3  16 14 4  20 17 5  24 21 6  31 27 8
-+37 31 10  37 31 10  47 39 13  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  176 168 138  226 217 137  138 129 110  57 50 17
-+57 50 16  56 48 15  56 48 15  56 48 15  56 48 15  51 40 13
-+51 40 13  46 36 11  44 35 11  41 32 10  41 32 10  38 27 8
-+48 30 8  38 27 8  38 27 8  38 27 8  48 30 8  49 31 9
-+49 31 9  56 33 8  57 34 10  56 33 8  62 38 11  62 38 11
-+62 38 11  62 38 11  62 38 11  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  90 63 20  90 63 20
-+90 63 20  104 73 28  104 73 28  104 73 28  117 83 35  104 73 28
-+117 83 35  131 88 37  131 88 37  154 97 33  156 118 66  230 227 197
-+230 227 199  230 227 201  230 227 201  230 227 201  230 227 201  230 227 201
-+230 227 201  230 227 201  230 227 201  230 227 201  230 227 201  230 227 201
-+230 227 201  230 227 201  230 227 201  230 227 199  156 118 66  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 108 49  154 108 49  154 97 33  154 97 33  154 97 33
-+154 108 49  224 212 126  227 217 139  227 218 146  227 218 146  227 218 146
-+227 218 146  227 217 139  227 217 139  226 217 137  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  57 50 16  57 50 16  57 50 16
-+57 50 16  47 39 13  47 39 13  37 31 10  31 27 8  24 21 6
-+16 14 4  15 13 4  10 9 3  3 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+3 3 1  8 7 4  10 9 3  16 14 4  24 21 6  31 27 8
-+37 31 10  47 39 13  47 39 13  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  110 81 38  226 217 137  226 217 137  114 84 45
-+57 50 17  57 50 16  57 50 16  56 48 15  47 39 13  55 44 14
-+47 39 13  47 39 13  44 35 11  43 33 10  38 29 9  38 27 8
-+36 23 7  38 27 8  38 21 5  38 21 5  38 21 5  48 30 8
-+48 30 8  48 30 8  48 30 8  56 33 8  56 33 8  56 33 8
-+62 38 11  62 38 11  62 38 11  62 38 11  62 38 11  75 50 15
-+62 38 11  75 50 15  75 50 15  75 50 15  75 50 15  90 63 20
-+90 63 20  90 63 20  104 73 28  104 73 28  104 73 28  143 92 37
-+117 83 35  131 88 37  131 88 37  131 88 37  154 97 33  227 222 178
-+230 227 199  230 227 197  230 227 199  230 227 199  230 227 199  230 227 199
-+230 227 199  230 227 199  230 227 199  230 227 199  230 227 199  230 227 199
-+230 227 199  230 227 199  230 227 199  230 227 197  224 212 126  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 108 49  154 108 49  224 212 126  154 97 33  154 108 49  154 108 49
-+224 212 126  227 217 139  227 218 146  227 218 146  227 218 146  227 218 146
-+227 217 139  227 217 139  227 217 139  226 217 137  224 212 126  224 212 126
-+224 212 126  224 212 126  90 65 21  57 50 16  57 50 16  57 50 16
-+57 50 16  37 31 10  37 31 10  37 31 10  31 27 8  24 21 6
-+13 13 13  10 9 3  8 7 4  3 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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  1 1 1
-+1 1 1  6 5 1  7 7 7  16 14 4  20 17 5  24 21 6
-+31 27 8  31 27 8  47 39 13  37 31 10  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  163 154 123  226 217 139  224 214 136
-+75 62 40  57 50 17  57 50 17  56 48 15  56 48 15  55 44 14
-+51 40 13  50 37 12  46 36 11  43 33 10  48 30 8  38 27 8
-+38 27 8  36 23 7  38 21 5  38 21 5  38 21 5  38 21 5
-+38 21 5  48 30 8  48 30 8  48 30 8  56 33 8  56 33 8
-+56 33 8  56 33 8  62 38 11  62 38 11  62 38 11  62 38 11
-+75 50 15  62 38 11  75 50 15  75 50 15  75 50 15  75 50 15
-+90 63 20  90 63 20  104 73 28  104 73 28  104 73 28  104 73 28
-+131 88 37  117 83 35  131 88 37  131 88 37  143 92 37  176 168 138
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  227 221 169  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 108 49  154 108 49
-+154 108 49  154 97 33  154 97 33  154 97 33  154 97 33  224 212 126
-+227 217 139  227 218 146  227 219 152  227 218 146  227 218 146  227 218 146
-+227 217 139  226 217 137  226 217 137  224 212 126  224 212 126  224 212 126
-+224 212 126  156 118 66  57 50 16  57 50 16  57 50 16  57 50 16
-+47 39 13  47 39 13  37 31 10  31 27 8  24 21 6  20 17 5
-+16 14 4  10 9 3  6 5 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  0 0 0
-+0 0 0  3 3 1  6 5 1  13 11 4  16 14 4  24 21 6
-+31 27 8  37 31 10  37 31 10  47 39 13  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  90 68 33  224 212 126  226 217 139
-+176 168 138  71 53 16  57 50 16  57 50 17  57 50 17  56 48 15
-+55 44 14  51 40 13  50 37 12  46 36 11  43 33 10  41 32 10
-+38 27 8  38 27 8  38 21 5  38 21 5  38 21 5  38 21 5
-+38 21 5  38 21 5  48 30 8  48 30 8  48 30 8  56 33 8
-+56 33 8  56 33 8  56 33 8  62 38 11  62 38 11  62 38 11
-+62 38 11  62 38 11  62 38 11  75 50 15  75 50 15  75 50 15
-+90 63 20  90 63 20  90 63 20  104 73 28  104 73 28  131 88 37
-+104 73 28  154 97 33  117 83 35  131 88 37  131 88 37  154 108 49
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  156 118 66
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 108 49  154 108 49  154 108 49  224 212 126
-+154 97 33  154 108 49  154 108 49  154 108 49  224 212 126  224 212 126
-+227 217 139  227 218 146  227 218 146  227 218 146  227 218 146  227 217 139
-+227 217 139  227 217 139  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  90 65 21  57 50 16  57 50 16  57 50 16  47 39 13
-+47 39 13  37 31 10  31 27 8  31 27 8  24 21 6  16 14 4
-+15 13 4  8 7 4  3 3 1  3 3 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  0 0 0
-+1 1 1  3 3 1  6 5 1  10 9 3  11 11 11  24 21 6
-+24 21 6  31 27 8  37 31 10  37 31 10  35 34 31  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  149 122 79  226 217 137
-+226 217 137  150 141 118  57 50 17  71 53 16  59 49 15  59 49 15
-+58 46 15  55 44 14  55 43 14  51 40 13  50 37 12  49 31 9
-+43 33 10  48 30 8  48 30 8  38 27 8  38 21 5  38 21 5
-+38 21 5  38 21 5  48 30 8  38 21 5  48 30 8  38 21 5
-+56 33 8  56 33 8  56 33 8  56 33 8  62 38 11  62 38 11
-+62 38 11  62 38 11  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  90 63 20  90 63 20  104 73 28  104 73 28  104 73 28
-+117 83 35  117 83 35  131 88 37  131 88 37  143 92 37  143 92 37
-+227 221 169  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  229 225 190  230 227 197  230 227 197  228 223 179  224 212 126
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 108 49  154 108 49  154 108 49  154 108 49  154 97 33  154 97 33
-+154 108 49  154 97 33  224 212 126  154 108 49  224 212 126  227 217 139
-+227 218 146  227 218 146  227 218 146  227 218 146  227 217 139  227 217 139
-+226 217 137  226 217 137  224 212 126  224 212 126  224 212 126  224 212 126
-+154 97 33  57 50 16  57 50 16  57 50 16  57 50 16  47 39 13
-+47 39 13  37 31 10  31 27 8  24 21 6  16 14 4  15 13 4
-+10 9 3  6 5 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  0 0 0  0 0 0
-+0 0 0  0 0 0  3 3 1  6 5 1  15 13 4  16 14 4
-+24 21 6  31 27 8  31 27 8  47 39 13  47 39 13  47 39 13
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  176 168 138
-+224 212 126  226 217 137  142 111 68  57 50 16  71 53 16  57 50 17
-+71 53 16  57 50 17  59 45 14  55 43 14  51 40 13  50 37 12
-+46 36 11  48 30 8  48 30 8  48 30 8  48 30 8  38 21 5
-+48 30 8  38 21 5  48 30 8  48 30 8  48 30 8  56 33 8
-+56 33 8  56 33 8  56 33 8  56 33 8  56 33 8  62 38 11
-+62 38 11  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+90 63 20  90 63 20  90 63 20  104 73 28  104 73 28  143 92 37
-+104 73 28  143 92 37  117 83 35  154 97 33  117 83 35  154 97 33
-+163 154 123  229 224 185  229 226 192  230 227 197  229 225 190  229 225 190
-+230 227 197  229 225 190  229 225 190  230 227 197  229 225 190  229 225 190
-+230 227 197  229 225 190  230 227 197  229 225 190  229 225 190  216 206 146
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 108 49  154 108 49  154 108 49  154 108 49
-+224 212 126  154 97 33  154 108 49  224 212 126  154 97 33  154 108 49
-+154 108 49  154 108 49  154 97 33  224 212 126  226 217 137  227 217 139
-+227 219 152  227 218 146  227 218 146  227 217 139  227 217 139  227 217 139
-+226 217 137  224 212 126  224 212 126  224 212 126  224 212 126  156 118 66
-+90 65 21  57 50 16  57 50 16  57 50 16  47 39 13  47 39 13
-+37 31 10  31 27 8  31 27 8  24 21 6  16 14 4  15 13 4
-+8 7 4  3 3 1  3 3 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  0 0 0  0 0 0
-+0 0 0  1 1 1  3 3 1  6 5 1  10 9 3  16 14 4
-+16 14 4  24 21 6  31 27 8  31 27 8  47 39 13  37 31 10
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  91 66 24
-+226 217 137  226 217 137  226 217 137  135 101 60  57 50 17  71 53 16
-+67 48 15  59 49 15  59 49 15  59 45 14  55 44 14  57 41 13
-+51 40 13  50 37 12  49 31 9  48 30 8  48 30 8  48 30 8
-+48 30 8  38 21 5  48 30 8  38 21 5  56 33 8  38 21 5
-+56 33 8  56 33 8  56 33 8  56 33 8  62 38 11  62 38 11
-+62 38 11  62 38 11  75 50 15  75 50 15  75 50 15  75 50 15
-+90 63 20  90 63 20  90 63 20  90 63 20  104 73 28  104 73 28
-+131 88 37  104 73 28  131 88 37  131 88 37  131 88 37  131 88 37
-+154 108 49  229 225 190  229 226 192  229 226 192  229 225 190  230 227 197
-+229 225 190  229 225 190  230 227 197  229 225 190  230 227 197  229 225 190
-+230 227 197  229 225 190  229 225 190  230 227 197  229 225 190  228 223 179
-+156 118 66  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 108 49  154 97 33  154 97 33  224 212 126  154 108 49  154 97 33
-+154 97 33  154 108 49  154 97 33  154 97 33  154 97 33  224 212 126
-+154 108 49  154 108 49  224 212 126  227 217 139  227 218 146  227 218 146
-+227 218 146  227 218 146  227 218 146  227 217 139  227 217 139  226 217 137
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  117 83 35
-+57 50 16  57 50 16  57 50 16  57 50 16  47 39 13  47 39 13
-+37 31 10  31 27 8  24 21 6  16 14 4  15 13 4  10 9 3
-+6 5 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  1 1 1  3 3 1  5 5 5  10 9 3
-+16 14 4  24 21 6  31 27 8  31 27 8  37 31 10  47 39 13
-+47 39 13  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+149 122 79  226 217 137  226 217 139  226 217 139  100 76 42  57 50 17
-+71 53 16  71 53 16  71 53 16  59 49 15  59 49 15  59 45 14
-+59 45 14  58 38 12  50 37 12  57 34 10  49 31 9  48 30 8
-+48 30 8  56 33 8  48 30 8  38 21 5  56 33 8  38 21 5
-+56 33 8  56 33 8  56 33 8  56 33 8  62 38 11  62 38 11
-+62 38 11  75 50 15  62 38 11  75 50 15  75 50 15  75 50 15
-+75 50 15  90 63 20  90 63 20  90 63 20  104 73 28  104 73 28
-+104 73 28  143 92 37  104 73 28  154 97 33  131 88 37  154 97 33
-+131 88 37  216 206 146  229 224 185  229 225 190  229 225 190  229 225 190
-+229 225 190  230 227 197  229 225 190  229 225 190  229 225 190  229 225 190
-+229 225 190  229 225 190  229 225 190  229 225 190  229 225 190  229 224 185
-+224 212 126  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 108 49  154 108 49  154 108 49  154 97 33  154 97 33  154 108 49
-+224 212 126  154 97 33  154 108 49  154 108 49  154 108 49  154 97 33
-+154 108 49  224 212 126  226 217 137  227 217 139  227 219 152  227 218 146
-+227 218 146  227 217 139  227 217 139  227 217 139  227 217 139  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  154 97 33  57 50 16
-+57 50 16  57 50 16  57 50 16  47 39 13  37 31 10  37 31 10
-+31 27 8  31 27 8  24 21 6  16 14 4  15 13 4  8 7 4
-+3 3 1  3 3 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  1 1 1  3 3 1  6 5 1  10 9 3
-+16 14 4  16 14 4  24 21 6  31 27 8  37 31 10  37 31 10
-+35 34 31  47 39 13  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  163 154 123  226 217 137  226 218 148  226 217 139  100 76 42
-+71 53 16  57 50 17  71 53 16  71 53 16  67 48 15  67 48 15
-+59 49 15  59 45 14  60 42 13  57 41 13  57 34 10  56 33 8
-+56 33 8  48 30 8  56 33 8  56 33 8  56 33 8  56 33 8
-+56 33 8  56 33 8  56 33 8  62 38 11  62 38 11  62 38 11
-+75 50 15  62 38 11  75 50 15  75 50 15  75 50 15  75 50 15
-+90 63 20  90 63 20  90 63 20  90 63 20  104 73 28  104 73 28
-+131 88 37  104 73 28  131 88 37  117 83 35  131 88 37  131 88 37
-+154 97 33  156 118 66  229 225 190  229 225 190  229 225 190  229 225 190
-+229 225 190  229 225 190  229 225 190  229 225 190  229 225 190  229 225 190
-+229 225 190  229 225 190  229 225 190  229 225 190  229 224 185  228 223 179
-+224 212 126  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+224 212 126  154 108 49  154 108 49  154 97 33  224 212 126  154 97 33
-+154 97 33  154 108 49  154 97 33  224 212 126  154 108 49  154 97 33
-+224 212 126  227 217 139  227 217 139  227 218 146  227 218 146  227 218 146
-+227 218 146  227 217 139  227 217 139  226 217 137  226 217 137  224 212 126
-+224 212 126  224 212 126  224 212 126  156 118 66  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  47 39 13  47 39 13  31 27 8
-+31 27 8  24 21 6  16 14 4  10 9 3  10 9 3  3 3 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  3 3 1  4 4 4
-+10 9 3  16 14 4  20 17 5  24 21 6  31 27 8  37 31 10
-+47 39 13  47 39 13  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  90 65 21  224 212 126  226 217 137  226 217 139  216 206 146
-+90 68 33  80 59 18  71 53 16  71 53 16  71 53 16  57 50 17
-+67 48 15  67 48 15  59 45 14  59 45 14  58 38 12  58 38 12
-+57 34 10  57 34 10  56 33 8  56 33 8  38 21 5  56 33 8
-+56 33 8  56 33 8  56 33 8  56 33 8  62 38 11  62 38 11
-+62 38 11  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  90 63 20  90 63 20  90 63 20  104 73 28  104 73 28
-+104 73 28  143 92 37  104 73 28  154 97 33  131 88 37  131 88 37
-+143 92 37  154 97 33  227 221 169  229 225 190  229 225 190  229 225 190
-+229 225 190  229 225 190  229 224 185  229 225 190  229 224 185  229 225 190
-+229 224 185  229 224 185  229 225 190  229 224 185  229 224 185  229 224 185
-+229 224 185  154 108 49  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 108 49  154 108 49  154 97 33  154 97 33
-+224 212 126  154 97 33  154 108 49  154 97 33  154 108 49  224 212 126
-+224 212 126  227 217 139  227 218 146  227 218 146  227 218 146  227 218 146
-+227 217 139  227 217 139  227 217 139  226 217 137  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  104 73 28  57 50 16  57 50 16
-+57 50 16  57 50 16  37 31 10  37 31 10  31 27 8  31 27 8
-+24 21 6  24 21 6  16 14 4  15 13 4  8 7 4  3 3 1
-+1 1 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  3 3 1  6 5 1
-+10 9 3  15 13 4  16 14 4  24 21 6  31 27 8  31 27 8
-+37 31 10  47 39 13  37 31 10  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  90 68 33  224 214 136  226 217 139  226 217 137
-+224 214 136  100 76 42  70 58 37  80 59 18  71 53 16  71 53 16
-+71 53 16  71 53 16  67 48 15  67 48 15  67 48 15  60 42 13
-+62 38 11  62 38 11  57 34 10  62 38 11  56 33 8  56 33 8
-+56 33 8  56 33 8  56 33 8  62 38 11  62 38 11  62 38 11
-+62 38 11  62 38 11  62 38 11  75 50 15  75 50 15  75 50 15
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  104 73 28
-+104 73 28  104 73 28  131 88 37  117 83 35  131 88 37  131 88 37
-+131 88 37  154 97 33  163 154 123  229 224 185  229 224 185  229 224 185
-+229 224 185  229 224 185  229 224 185  229 225 190  229 224 185  229 225 190
-+229 224 185  229 225 190  229 224 185  229 225 190  229 224 185  229 224 185
-+227 220 160  224 212 126  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 108 49  154 108 49  154 108 49
-+154 108 49  154 108 49  154 97 33  224 212 126  154 108 49  154 108 49
-+154 97 33  154 108 49  154 108 49  154 97 33  224 212 126  226 217 137
-+227 217 139  227 218 146  227 218 146  227 218 146  227 218 146  227 217 139
-+227 217 139  227 217 139  226 217 137  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  117 83 35  57 50 16  57 50 16  57 50 16
-+57 50 16  47 39 13  47 39 13  47 39 13  31 27 8  31 27 8
-+24 21 6  16 14 4  10 9 3  8 7 4  3 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  1 1 1
-+3 3 1  10 9 3  15 13 4  16 14 4  24 21 6  31 27 8
-+31 27 8  37 31 10  47 39 13  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 17  142 111 68  226 217 137  226 217 139
-+226 217 139  224 214 136  100 76 42  80 59 18  71 53 16  80 59 18
-+71 53 16  71 53 16  71 53 16  71 51 16  67 48 15  68 47 15
-+68 47 15  62 38 11  62 38 11  62 38 11  62 38 11  62 38 11
-+62 38 11  56 33 8  62 38 11  62 38 11  62 38 11  62 38 11
-+62 38 11  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  90 63 20  90 63 20  90 63 20  104 73 28  104 73 28
-+104 73 28  143 92 37  104 73 28  131 88 37  131 88 37  154 97 33
-+131 88 37  131 88 37  154 97 33  227 221 169  229 225 190  229 224 185
-+229 224 185  229 225 190  229 224 185  229 224 185  229 224 185  229 224 185
-+229 224 185  229 224 185  229 224 185  229 224 185  229 224 185  229 224 185
-+229 224 185  224 212 126  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 108 49  154 108 49  224 212 126
-+154 97 33  154 108 49  154 108 49  154 97 33  154 108 49  224 212 126
-+154 97 33  154 108 49  224 212 126  224 212 126  224 212 126  226 217 137
-+227 217 139  227 218 146  227 218 146  227 218 146  227 217 139  227 217 139
-+227 217 139  226 217 137  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  154 97 33  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  37 31 10  37 31 10  31 27 8  31 27 8  24 21 6
-+20 17 5  16 14 4  10 9 3  10 9 3  3 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  1 1 1  1 1 1
-+6 5 1  10 9 3  10 9 3  16 14 4  24 21 6  24 21 6
-+31 27 8  37 31 10  37 31 10  47 39 13  47 39 13  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  150 141 118  226 217 137
-+226 217 139  226 218 148  226 217 139  135 101 60  70 58 37  80 59 18
-+80 59 18  71 53 16  79 57 18  71 53 16  71 53 16  71 51 16
-+68 47 15  75 50 15  68 47 15  75 50 15  62 38 11  62 38 11
-+62 38 11  62 38 11  62 38 11  62 38 11  62 38 11  62 38 11
-+75 50 15  62 38 11  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  90 63 20  90 63 20  104 73 28  90 63 20
-+104 73 28  104 73 28  104 73 28  131 88 37  117 83 35  131 88 37
-+131 88 37  154 97 33  154 97 33  185 178 149  229 224 185  229 224 185
-+229 224 185  229 224 185  229 224 185  229 224 185  229 224 185  229 224 185
-+229 224 185  229 224 185  229 224 185  229 224 185  229 224 185  229 224 185
-+229 224 185  227 220 160  156 118 66  154 108 49  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 108 49  154 108 49  154 97 33  154 97 33
-+154 108 49  154 108 49  154 97 33  224 212 126  154 97 33  154 97 33
-+154 108 49  154 97 33  224 212 126  224 212 126  227 217 139  227 218 146
-+227 218 146  227 218 146  227 218 146  227 217 139  227 217 139  227 217 139
-+226 217 137  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+154 108 49  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+47 39 13  47 39 13  37 31 10  31 27 8  24 21 6  20 17 5
-+16 14 4  10 9 3  5 5 5  3 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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
-+1 1 1  3 3 1  8 7 4  10 9 3  16 14 4  24 21 6
-+31 27 8  31 27 8  37 31 10  47 39 13  47 39 13  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  80 59 18  163 154 123
-+226 217 137  226 217 137  226 217 139  226 217 137  142 111 68  71 53 16
-+80 59 18  80 59 18  80 59 18  79 57 18  71 53 16  78 55 17
-+71 53 16  75 50 15  75 50 15  68 47 15  75 50 15  75 50 15
-+62 38 11  75 50 15  62 38 11  75 50 15  62 38 11  75 50 15
-+62 38 11  75 50 15  62 38 11  75 50 15  75 50 15  75 50 15
-+75 50 15  90 63 20  90 63 20  90 63 20  90 63 20  104 73 28
-+104 73 28  143 92 37  104 73 28  143 92 37  104 73 28  154 97 33
-+131 88 37  131 88 37  154 97 33  154 97 33  228 223 179  229 224 185
-+229 224 185  229 224 185  229 224 185  229 224 185  229 224 185  229 224 185
-+229 224 185  229 224 185  229 224 185  228 223 179  229 224 185  228 223 179
-+229 224 185  228 223 179  224 212 126  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 108 49  154 108 49  154 108 49  154 108 49
-+224 212 126  154 97 33  154 108 49  154 97 33  154 108 49  154 108 49
-+224 212 126  224 212 126  224 212 126  224 212 126  227 217 139  227 218 146
-+227 218 146  227 218 146  227 217 139  227 217 139  227 217 139  227 217 139
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  156 118 66
-+117 83 35  57 50 16  57 50 16  57 50 16  57 50 16  47 39 13
-+37 31 10  37 31 10  31 27 8  31 27 8  24 21 6  16 14 4
-+16 14 4  10 9 3  6 5 1  3 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1
-+1 1 1  3 3 1  10 9 3  10 9 3  16 14 4  14 14 14
-+24 21 6  31 27 8  31 27 8  37 31 10  35 34 31  47 39 13
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+224 212 126  226 217 137  226 217 139  226 217 139  226 217 137  163 154 123
-+75 61 38  80 59 18  80 59 18  80 59 18  80 59 18  79 57 18
-+79 57 18  78 55 17  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  62 38 11  75 50 15  75 50 15  62 38 11
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+90 63 20  75 50 15  90 63 20  90 63 20  90 63 20  104 73 28
-+90 63 20  104 73 28  104 73 28  104 73 28  131 88 37  131 88 37
-+131 88 37  154 97 33  131 88 37  154 97 33  216 206 146  228 223 179
-+228 223 179  229 224 185  228 223 179  228 223 179  228 223 179  228 223 179
-+228 223 179  228 223 179  228 223 179  229 224 185  228 223 179  228 223 179
-+228 223 179  227 221 169  224 212 126  154 97 33  154 108 49  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 108 49  154 97 33  224 212 126  154 97 33
-+154 97 33  154 108 49  154 108 49  154 97 33  224 212 126  154 97 33
-+224 212 126  224 212 126  227 217 139  227 217 139  227 218 146  227 218 146
-+227 218 146  227 217 139  227 217 139  227 217 139  226 217 137  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  90 65 21
-+57 50 16  57 50 16  57 50 16  57 50 16  47 39 13  47 39 13
-+37 31 10  31 27 8  31 27 8  24 21 6  16 14 4  15 13 4
-+10 9 3  3 3 1  3 3 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  1 1 1  3 3 1  5 5 5  10 9 3  16 14 4
-+20 17 5  24 21 6  31 27 8  37 31 10  37 31 10  47 39 13
-+57 50 16  57 50 16  57 50 16  57 50 16  80 59 18  57 50 16
-+80 59 18  176 168 138  226 217 137  226 217 137  226 217 137  226 217 137
-+224 212 126  90 68 33  80 59 18  80 59 18  90 65 21  80 59 18
-+80 59 18  80 59 18  79 57 18  78 55 17  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  90 63 20  75 50 15  90 63 20  90 63 20  90 63 20
-+104 73 28  104 73 28  143 92 37  104 73 28  143 92 37  104 73 28
-+154 97 33  117 83 35  154 97 33  131 88 37  154 108 49  228 223 179
-+228 223 179  228 223 179  228 223 179  228 223 179  228 223 179  228 223 179
-+228 223 179  228 223 179  228 223 179  228 223 179  228 223 179  228 223 179
-+228 223 179  228 223 179  227 221 169  224 212 126  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 108 49  154 108 49  154 108 49  154 97 33  154 97 33
-+224 212 126  154 97 33  154 108 49  154 108 49  224 212 126  224 212 126
-+224 212 126  227 217 139  227 217 139  227 218 146  227 218 146  227 217 139
-+227 217 139  227 217 139  227 217 139  226 217 137  226 217 137  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  80 59 18  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  37 31 10  47 39 13
-+31 27 8  31 27 8  24 21 6  24 21 6  16 14 4  15 13 4
-+8 7 4  3 3 1  3 3 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  1 1 1  3 3 1  6 5 1  10 9 3  15 13 4
-+16 14 4  24 21 6  31 27 8  31 27 8  37 31 10  37 31 10
-+37 31 10  57 50 16  57 50 16  57 50 16  71 53 16  57 50 16
-+71 53 16  80 59 18  224 212 126  226 217 137  226 217 137  226 217 139
-+224 214 136  224 214 136  135 101 60  90 65 21  80 59 18  80 59 18
-+90 65 21  80 59 18  90 63 20  78 55 17  90 63 20  90 63 20
-+90 63 20  75 50 15  90 63 20  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  90 63 20  75 50 15
-+90 63 20  75 50 15  90 63 20  90 63 20  90 63 20  104 73 28
-+104 73 28  90 63 20  90 63 20  131 88 37  104 73 28  131 88 37
-+131 88 37  131 88 37  131 88 37  154 97 33  154 97 33  216 206 146
-+228 223 179  228 223 179  228 223 179  228 223 179  228 223 179  228 223 179
-+228 223 179  228 223 179  228 223 179  228 223 179  228 223 179  228 223 179
-+227 221 169  228 223 179  227 217 139  224 212 126  154 97 33  154 108 49
-+154 108 49  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 108 49  154 108 49  154 97 33  224 212 126  154 108 49  154 97 33
-+154 97 33  154 108 49  154 97 33  224 212 126  224 212 126  224 212 126
-+227 217 139  227 217 139  227 218 146  227 218 146  227 218 146  227 217 139
-+227 217 139  226 217 137  226 217 137  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  80 59 18  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  47 39 13  47 39 13  31 27 8
-+31 27 8  24 21 6  24 21 6  16 14 4  10 9 3  6 5 1
-+3 3 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  1 1 1  3 3 1  10 9 3
-+10 9 3  16 14 4  24 21 6  24 21 6  31 27 8  37 31 10
-+47 39 13  47 39 13  57 50 16  57 50 16  57 50 16  71 53 16
-+57 50 16  80 59 18  90 68 33  224 212 126  224 212 126  226 217 139
-+226 217 139  226 218 148  226 217 139  150 141 118  91 66 24  90 65 21
-+90 65 21  90 65 21  90 63 20  90 63 20  90 63 20  75 50 15
-+90 63 20  90 63 20  75 50 15  90 63 20  90 63 20  75 50 15
-+90 63 20  75 50 15  90 63 20  75 50 15  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+104 73 28  104 73 28  143 92 37  90 63 20  154 97 33  104 73 28
-+154 97 33  131 88 37  154 97 33  131 88 37  154 97 33  154 108 49
-+227 221 169  228 223 179  228 223 179  227 221 169  228 223 179  228 223 179
-+228 223 179  227 221 169  228 223 179  227 221 169  228 223 179  227 221 169
-+228 223 179  227 221 169  227 221 169  227 217 139  154 97 33  154 97 33
-+154 108 49  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 108 49
-+154 108 49  154 108 49  154 108 49  154 97 33  154 97 33  224 212 126
-+154 97 33  224 212 126  224 212 126  224 212 126  226 217 137  227 217 139
-+227 218 146  227 218 146  227 218 146  227 217 139  227 217 139  227 217 139
-+227 217 139  226 217 137  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  80 59 18  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  37 31 10  37 31 10  31 27 8  31 27 8
-+31 27 8  24 21 6  16 14 4  16 14 4  10 9 3  6 5 1
-+3 3 1  1 1 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  1 1 1  1 1 1  3 3 1  6 5 1
-+10 9 3  16 14 4  16 14 4  24 21 6  31 27 8  31 27 8
-+37 31 10  37 31 10  57 50 16  57 50 16  57 50 16  57 50 16
-+80 59 18  57 50 16  57 50 16  90 65 21  176 168 138  226 217 137
-+226 217 137  226 217 139  226 217 139  226 217 137  224 212 126  135 101 60
-+80 59 18  90 65 21  90 65 21  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  104 73 28
-+104 73 28  104 73 28  90 63 20  131 88 37  104 73 28  117 83 35
-+131 88 37  131 88 37  117 83 35  154 97 33  131 88 37  154 97 33
-+216 206 146  228 223 179  227 221 169  228 223 179  227 221 169  228 223 179
-+227 221 169  228 223 179  227 221 169  228 223 179  227 221 169  228 223 179
-+227 221 169  228 223 179  227 221 169  227 217 139  224 212 126  154 108 49
-+154 108 49  154 108 49  154 108 49  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 108 49  154 108 49
-+154 97 33  224 212 126  154 108 49  154 108 49  154 97 33  154 97 33
-+224 212 126  224 212 126  226 217 137  227 217 139  227 217 139  227 217 139
-+227 218 146  227 218 146  227 217 139  227 217 139  227 217 139  227 217 139
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+156 118 66  80 59 18  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  47 39 13  47 39 13  37 31 10  31 27 8  31 27 8
-+24 21 6  16 14 4  15 13 4  10 9 3  6 5 1  3 3 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1  3 3 1
-+5 5 5  10 9 3  15 13 4  16 14 4  24 21 6  31 27 8
-+31 27 8  37 31 10  47 39 13  57 50 16  57 50 16  57 50 16
-+57 50 16  80 59 18  71 53 16  80 59 18  80 59 18  176 168 138
-+224 212 126  226 217 137  226 217 137  226 217 139  226 218 148  226 217 139
-+163 154 123  104 73 28  90 65 21  90 65 21  91 66 24  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  104 73 28  104 73 28
-+104 73 28  104 73 28  143 92 37  104 73 28  143 92 37  104 73 28
-+154 97 33  117 83 35  154 97 33  131 88 37  154 97 33  143 92 37
-+154 108 49  227 220 160  228 223 179  227 221 169  228 223 179  227 221 169
-+227 221 169  227 221 169  227 221 169  227 221 169  227 221 169  227 221 169
-+227 221 169  227 221 169  227 221 169  227 220 160  224 212 126  154 97 33
-+154 97 33  154 108 49  154 108 49  154 108 49  154 97 33  154 97 33
-+154 97 33  154 97 33  154 108 49  154 108 49  154 108 49  154 108 49
-+154 108 49  154 97 33  154 97 33  154 108 49  224 212 126  224 212 126
-+224 212 126  224 212 126  227 217 139  227 217 139  227 218 146  227 218 146
-+227 218 146  227 217 139  227 217 139  227 217 139  227 217 139  226 217 137
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+104 73 28  71 53 16  57 50 16  57 50 16  57 50 16  47 39 13
-+47 39 13  37 31 10  37 31 10  31 27 8  31 27 8  24 21 6
-+20 17 5  16 14 4  10 9 3  10 9 3  3 3 1  3 3 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1  3 3 1
-+3 3 1  10 9 3  10 9 3  13 13 13  16 14 4  24 21 6
-+31 27 8  31 27 8  37 31 10  47 39 13  57 50 16  57 50 16
-+57 50 16  57 50 16  80 59 18  57 50 16  80 59 18  90 65 21
-+163 154 123  226 217 137  226 217 137  226 217 139  226 217 139  226 217 139
-+226 217 137  224 214 136  149 122 79  97 69 27  97 69 27  90 63 20
-+104 73 28  90 63 20  104 73 28  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  131 88 37
-+131 88 37  131 88 37  131 88 37  131 88 37  131 88 37  154 97 33
-+143 92 37  224 212 126  227 221 169  227 221 169  227 221 169  227 221 169
-+227 221 169  227 221 169  227 221 169  227 221 169  227 221 169  227 221 169
-+227 221 169  227 221 169  227 221 169  227 220 160  224 212 126  224 212 126
-+154 108 49  154 108 49  154 108 49  154 108 49  154 108 49  154 108 49
-+154 108 49  154 108 49  154 108 49  154 108 49  154 97 33  224 212 126
-+154 108 49  154 108 49  154 108 49  224 212 126  224 212 126  224 212 126
-+227 217 139  227 217 139  227 218 146  227 218 146  227 218 146  227 217 139
-+227 217 139  227 217 139  227 217 139  226 217 137  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  154 108 49  71 53 16
-+57 50 16  57 50 16  57 50 16  56 48 15  57 50 16  47 39 13
-+47 39 13  37 31 10  31 27 8  31 27 8  24 21 6  16 14 4
-+16 14 4  10 9 3  5 5 5  3 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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
-+1 1 1  3 3 1  6 5 1  10 9 3  16 14 4  24 21 6
-+24 21 6  31 27 8  31 27 8  37 31 10  47 39 13  57 50 16
-+57 50 16  57 50 16  80 59 18  80 59 18  80 59 18  80 59 18
-+80 59 18  149 122 79  226 217 137  226 217 137  226 217 137  226 217 139
-+226 217 139  226 217 139  227 218 146  224 212 126  142 111 68  90 65 21
-+97 69 27  104 73 28  90 63 20  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  143 92 37  104 73 28  154 97 33  104 73 28  154 97 33
-+104 73 28  154 97 33  131 88 37  154 97 33  131 88 37  154 97 33
-+131 88 37  154 97 33  227 218 153  227 221 169  227 221 169  227 221 169
-+227 221 169  227 221 169  227 221 169  227 221 169  227 221 169  227 221 169
-+227 220 160  227 221 169  227 220 160  227 221 169  227 218 153  224 212 126
-+154 97 33  154 97 33  154 108 49  154 108 49  154 108 49  154 108 49
-+154 108 49  154 108 49  154 108 49  154 108 49  154 108 49  154 97 33
-+154 108 49  224 212 126  224 212 126  226 217 137  226 217 137  227 217 139
-+227 218 146  227 218 146  227 218 146  227 218 146  227 217 139  227 217 139
-+227 217 139  227 217 139  226 217 137  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  154 108 49  104 73 28  57 50 16
-+57 50 16  57 50 16  57 50 16  47 39 13  47 39 13  37 31 10
-+37 31 10  37 31 10  31 27 8  24 21 6  24 21 6  16 14 4
-+16 14 4  10 9 3  6 5 1  3 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1
-+1 1 1  3 3 1  6 5 1  10 9 3  10 9 3  16 14 4
-+20 17 5  24 21 6  31 27 8  37 31 10  37 31 10  56 48 15
-+57 50 16  57 50 16  57 50 16  57 50 16  80 59 18  57 50 16
-+80 59 18  90 65 21  143 106 60  224 212 126  226 217 137  226 217 137
-+226 217 139  226 217 139  226 217 139  226 218 148  224 214 136  224 212 126
-+154 108 49  90 63 20  104 73 28  90 63 20  104 73 28  90 63 20
-+104 73 28  104 73 28  90 63 20  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  143 92 37  104 73 28
-+131 88 37  131 88 37  131 88 37  117 83 35  154 97 33  131 88 37
-+154 97 33  154 97 33  163 154 123  227 220 160  227 221 169  227 221 169
-+227 220 160  227 221 169  227 220 160  227 221 169  227 220 160  227 221 169
-+227 220 160  227 221 169  227 220 160  227 220 160  227 218 146  227 217 139
-+154 97 33  154 108 49  154 108 49  154 108 49  154 108 49  154 108 49
-+154 97 33  224 212 126  154 108 49  154 108 49  154 97 33  224 212 126
-+226 217 137  226 217 137  227 217 139  227 217 139  227 217 139  227 218 146
-+227 218 146  227 218 146  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  154 97 33  80 59 18  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  47 39 13  47 39 13  37 31 10
-+31 27 8  31 27 8  24 21 6  24 21 6  16 14 4  10 9 3
-+10 9 3  3 3 1  3 3 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+0 0 0  1 1 1  3 3 1  3 3 1  10 9 3  10 9 3
-+16 14 4  20 17 5  24 21 6  31 27 8  37 31 10  47 39 13
-+47 39 13  57 50 16  57 50 16  71 53 16  57 50 16  80 59 18
-+80 59 18  80 59 18  80 59 18  110 81 38  224 212 126  224 212 126
-+226 217 137  226 217 137  226 217 139  226 217 139  226 217 139  216 206 146
-+227 217 139  224 212 126  154 108 49  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  143 92 37  90 63 20  143 92 37  104 73 28  143 92 37
-+104 73 28  143 92 37  104 73 28  154 97 33  104 73 28  154 97 33
-+131 88 37  131 88 37  154 97 33  131 88 37  131 88 37  154 97 33
-+131 88 37  154 97 33  154 97 33  224 212 126  227 220 160  227 220 160
-+227 221 169  227 220 160  227 220 160  227 220 160  227 220 160  227 220 160
-+227 220 160  227 220 160  227 220 160  227 220 160  227 220 160  227 219 152
-+224 212 126  154 97 33  154 97 33  154 108 49  154 108 49  154 108 49
-+154 97 33  154 97 33  154 108 49  224 212 126  224 212 126  224 212 126
-+226 217 137  227 217 139  227 217 139  227 218 146  227 218 146  227 218 146
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  226 217 137
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  104 73 28  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  37 31 10  47 39 13  37 31 10  31 27 8
-+31 27 8  24 21 6  24 21 6  16 14 4  15 13 4  10 9 3
-+6 5 1  3 3 1  1 1 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+0 0 0  1 1 1  1 1 1  3 3 1  6 5 1  10 9 3
-+10 9 3  16 14 4  20 17 5  24 21 6  31 27 8  31 27 8
-+47 39 13  57 50 16  57 50 16  57 50 16  57 50 16  80 59 18
-+57 50 16  80 59 18  80 59 18  71 53 16  80 59 18  163 154 123
-+224 212 126  226 217 137  226 217 137  226 217 139  227 217 139  227 218 146
-+227 217 139  216 206 146  227 218 146  224 212 126  156 118 66  143 92 37
-+104 73 28  104 73 28  90 63 20  143 92 37  90 63 20  143 92 37
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  90 63 20  143 92 37  104 73 28  143 92 37  104 73 28
-+117 83 35  131 88 37  131 88 37  131 88 37  131 88 37  154 97 33
-+131 88 37  154 97 33  154 97 33  156 118 66  227 220 160  227 220 160
-+227 220 160  227 220 160  227 220 160  227 220 160  227 220 160  227 220 160
-+227 220 160  227 220 160  227 220 160  227 220 160  227 220 160  227 218 146
-+226 217 137  154 108 49  154 108 49  154 108 49  154 108 49  154 97 33
-+224 212 126  224 212 126  226 217 137  226 217 137  227 217 139  227 217 139
-+227 217 139  227 218 146  227 218 146  227 218 146  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  154 108 49
-+80 59 18  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+47 39 13  47 39 13  47 39 13  37 31 10  31 27 8  31 27 8
-+24 21 6  20 17 5  16 14 4  10 9 3  10 9 3  3 3 1
-+3 3 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  1 1 1  3 3 1  3 3 1
-+8 7 4  10 9 3  16 14 4  20 17 5  24 21 6  31 27 8
-+31 27 8  47 39 13  56 48 15  57 50 16  57 50 16  80 59 18
-+80 59 18  80 59 18  80 59 18  80 59 18  80 59 18  90 65 21
-+145 104 53  224 212 126  224 212 126  226 217 137  226 217 137  226 217 137
-+227 217 139  227 217 139  227 217 139  227 218 146  227 217 139  226 216 138
-+163 154 123  154 97 33  154 97 33  90 63 20  104 73 28  104 73 28
-+104 73 28  143 92 37  104 73 28  154 97 33  104 73 28  154 97 33
-+104 73 28  154 97 33  104 73 28  143 92 37  104 73 28  154 97 33
-+131 88 37  131 88 37  131 88 37  154 97 33  131 88 37  131 88 37
-+154 97 33  131 88 37  154 97 33  154 97 33  163 154 123  227 218 146
-+227 220 160  227 220 160  227 220 160  227 220 160  227 220 160  227 220 160
-+227 220 160  227 219 152  227 220 160  227 219 152  227 219 152  227 219 152
-+227 218 146  224 212 126  154 97 33  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  226 217 137  227 217 139  227 217 139  227 218 146
-+227 218 146  227 218 146  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  154 97 33  80 59 18
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+47 39 13  37 31 10  37 31 10  31 27 8  31 27 8  24 21 6
-+24 21 6  16 14 4  15 13 4  10 9 3  6 5 1  3 3 1
-+1 1 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  1 1 1  3 3 1
-+6 5 1  10 9 3  10 9 3  16 14 4  20 17 5  24 21 6
-+27 23 7  31 27 8  37 31 10  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  80 59 18  80 59 18  80 59 18  80 59 18
-+80 59 18  104 73 28  163 154 123  224 212 126  225 215 136  225 215 136
-+226 216 138  227 217 139  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  224 212 126  176 168 138  154 97 33  154 97 33
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  90 63 20
-+143 92 37  104 73 28  104 73 28  154 97 33  104 73 28  131 88 37
-+131 88 37  131 88 37  131 88 37  131 88 37  131 88 37  131 88 37
-+131 88 37  154 97 33  131 88 37  154 97 33  154 97 33  224 212 126
-+227 220 160  227 219 152  227 220 160  227 219 152  227 220 160  227 219 152
-+227 220 160  227 219 152  227 219 152  227 219 152  227 219 152  227 219 152
-+227 218 146  224 212 126  224 212 126  224 212 126  224 212 126  226 217 137
-+227 217 139  227 217 139  227 217 139  227 218 146  227 218 146  227 218 146
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  227 217 139
-+226 217 137  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  154 108 49  90 65 21  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  47 39 13  47 39 13
-+37 31 10  37 31 10  31 27 8  31 27 8  24 21 6  20 17 5
-+16 14 4  10 9 3  8 7 4  3 3 1  3 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1
-+1 1 1  3 3 1  5 5 5  10 9 3  16 14 4  20 17 5
-+24 21 6  27 23 7  31 27 8  37 31 10  47 39 13  57 50 16
-+57 50 16  80 59 18  57 50 16  80 59 18  80 59 18  90 65 21
-+80 59 18  80 59 18  90 65 21  143 100 47  224 212 126  224 212 126
-+224 212 126  226 217 137  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 218 146  227 217 139  227 217 139  227 217 139  226 216 138
-+224 212 126  156 118 66  154 97 33  154 97 33  143 92 37  104 73 28
-+143 92 37  104 73 28  154 97 33  104 73 28  154 97 33  104 73 28
-+154 97 33  117 83 35  143 92 37  131 88 37  154 97 33  131 88 37
-+154 97 33  131 88 37  154 97 33  154 97 33  154 97 33  154 97 33
-+227 217 139  227 219 152  227 219 152  227 219 152  227 219 152  227 219 152
-+227 219 152  227 219 152  227 219 152  227 219 152  227 219 152  227 219 152
-+227 218 146  227 218 146  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  227 218 146  227 218 146  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  226 217 137  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  154 97 33  80 59 18  80 59 18  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  47 39 13  37 31 10  37 31 10
-+37 31 10  31 27 8  31 27 8  24 21 6  16 14 4  16 14 4
-+10 9 3  10 9 3  6 5 1  3 3 1  1 1 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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
-+1 1 1  3 3 1  3 3 1  8 7 4  10 9 3  15 13 4
-+16 14 4  24 21 6  24 21 6  31 27 8  31 27 8  47 39 13
-+57 50 16  57 50 16  57 50 16  80 59 18  80 59 18  80 59 18
-+80 59 18  90 65 21  90 65 21  80 59 18  97 69 27  149 122 79
-+224 212 126  224 212 126  224 212 126  225 215 136  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  216 206 146
-+226 216 138  227 218 153  227 218 153  224 212 126  224 212 126  224 212 126
-+156 118 66  154 108 49  154 97 33  154 97 33  104 73 28  131 88 37
-+117 83 35  131 88 37  131 88 37  131 88 37  131 88 37  131 88 37
-+131 88 37  131 88 37  131 88 37  131 88 37  154 97 33  154 97 33
-+156 118 66  227 219 152  227 219 152  227 219 152  227 219 152  227 219 152
-+227 219 152  227 218 149  227 219 152  227 218 146  227 219 152  227 218 146
-+227 218 146  227 218 146  227 218 146  227 217 139  227 217 139  227 217 139
-+227 217 139  227 218 146  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  226 217 137  226 217 137  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  154 97 33
-+80 59 18  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  47 39 13  47 39 13  47 39 13  37 31 10  37 31 10
-+31 27 8  24 21 6  24 21 6  16 14 4  16 14 4  10 9 3
-+10 9 3  3 3 1  3 3 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  1 1 1  3 3 1  5 5 5  10 9 3
-+15 13 4  16 14 4  24 21 6  24 21 6  31 27 8  31 27 8
-+37 31 10  47 39 13  57 50 16  57 50 16  80 59 18  80 59 18
-+80 59 18  80 59 18  90 65 21  90 65 21  90 65 21  90 65 21
-+117 83 35  163 154 123  224 212 126  224 212 126  224 212 126  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  216 206 146  216 206 146  224 212 126
-+227 217 139  227 218 149  227 217 139  224 214 136  224 212 126  224 212 126
-+224 212 126  163 154 123  156 118 66  224 212 126  156 118 66  224 212 126
-+156 118 66  224 212 126  156 118 66  224 212 126  224 212 126  224 212 126
-+227 217 139  227 219 152  227 218 149  227 218 149  227 218 146  227 218 146
-+227 218 146  227 218 146  227 218 146  227 218 146  227 218 146  227 218 146
-+227 218 146  227 218 146  227 217 139  227 218 146  227 218 146  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  226 217 137
-+226 217 137  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  154 108 49  117 83 35  80 59 18
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+47 39 13  47 39 13  37 31 10  37 31 10  31 27 8  31 27 8
-+24 21 6  24 21 6  16 14 4  16 14 4  10 9 3  10 9 3
-+6 5 1  3 3 1  1 1 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  3 3 1  3 3 1  4 4 4
-+10 9 3  13 11 4  16 14 4  20 17 5  24 21 6  31 27 8
-+31 27 8  37 31 10  37 31 10  57 50 16  57 50 16  57 50 16
-+80 59 18  80 59 18  80 59 18  90 65 21  90 65 21  90 65 21
-+90 65 21  90 63 20  143 92 37  163 154 123  224 212 126  224 212 126
-+224 212 126  227 217 139  224 212 126  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  226 216 138  227 217 139
-+227 218 146  227 217 139  227 218 146  227 218 146  227 218 146  224 214 136
-+224 212 126  227 217 139  226 217 137  226 217 137  226 217 137  226 217 137
-+226 217 137  226 217 137  226 217 137  224 212 126  224 212 126  224 214 136
-+227 218 146  227 218 146  227 218 146  227 218 146  227 218 146  227 218 146
-+227 218 146  227 218 146  227 218 146  227 218 146  227 218 146  227 217 139
-+227 218 146  227 217 139  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  226 217 137  226 217 137  226 217 137  226 217 137  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  154 108 49  117 83 35  80 59 18  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  47 39 13  47 39 13
-+47 39 13  37 31 10  37 31 10  31 27 8  31 27 8  24 21 6
-+24 21 6  16 14 4  15 13 4  10 9 3  8 7 4  3 3 1
-+3 3 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  1 1 1  1 1 1  3 3 1
-+4 4 4  8 7 4  10 9 3  16 14 4  20 17 5  24 21 6
-+24 21 6  31 27 8  37 31 10  37 31 10  47 39 13  47 39 13
-+57 50 16  80 59 18  80 59 18  80 59 18  90 65 21  90 65 21
-+90 65 21  90 65 21  90 65 21  104 73 28  143 92 37  163 154 123
-+224 212 126  224 212 126  224 212 126  224 212 126  227 217 139  224 212 126
-+227 217 139  227 217 139  226 216 138  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 218 146  227 218 146  227 218 146  226 218 148  227 218 146
-+227 218 146  227 218 146  227 218 146  227 217 139  227 218 146  227 218 146
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  226 217 137
-+226 217 137  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  154 108 49
-+154 97 33  80 59 18  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  47 39 13  47 39 13  37 31 10
-+37 31 10  37 31 10  31 27 8  31 27 8  24 21 6  16 14 4
-+16 14 4  15 13 4  10 9 3  8 7 4  6 5 1  3 3 1
-+1 1 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  1 1 1  1 1 1
-+3 3 1  3 3 1  8 7 4  10 9 3  15 13 4  16 14 4
-+24 21 6  24 21 6  31 27 8  31 27 8  37 31 10  37 31 10
-+47 39 13  47 39 13  57 50 16  80 59 18  80 59 18  90 65 21
-+90 65 21  90 65 21  90 65 21  90 65 21  90 65 21  104 73 28
-+154 97 33  156 118 66  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  226 216 138  224 212 126  225 215 136  226 216 138
-+226 216 138  227 217 139  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 218 146  227 217 139  227 218 146
-+227 217 139  227 217 139  226 217 139  226 217 139  226 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  226 217 137  226 217 137  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  154 108 49  90 65 21  80 59 18
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  47 39 13  47 39 13  47 39 13  37 31 10  37 31 10
-+31 27 8  31 27 8  24 21 6  24 21 6  16 14 4  16 14 4
-+10 9 3  10 9 3  6 5 1  3 3 1  1 1 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1
-+1 1 1  3 3 1  3 3 1  6 5 1  10 9 3  10 9 3
-+16 14 4  20 17 5  24 21 6  31 27 8  31 27 8  37 31 10
-+37 31 10  37 31 10  47 39 13  47 39 13  57 50 16  57 50 16
-+80 59 18  90 65 21  90 65 21  104 73 28  90 65 21  90 65 21
-+104 73 28  104 73 28  117 83 35  154 108 49  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+227 217 139  224 212 126  227 217 139  225 215 136  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  226 217 137  226 217 137
-+226 217 137  226 217 137  226 217 137  226 217 137  227 217 139  226 217 137
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  224 212 126  226 217 137
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+154 108 49  154 97 33  80 59 18  80 59 18  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+47 39 13  37 31 10  37 31 10  37 31 10  37 31 10  31 27 8
-+31 27 8  24 21 6  20 17 5  16 14 4  16 14 4  10 9 3
-+10 9 3  6 5 1  3 3 1  1 1 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  1 1 1  3 3 1  3 3 1  4 4 4  10 9 3
-+10 9 3  16 14 4  16 14 4  20 17 5  24 21 6  31 27 8
-+31 27 8  37 31 10  37 31 10  37 31 10  47 39 13  47 39 13
-+56 48 15  57 50 16  71 53 16  90 65 21  90 65 21  104 73 28
-+90 65 21  104 73 28  104 73 28  90 63 20  90 63 20  131 88 37
-+154 108 49  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+226 217 137  224 212 126  226 217 137  226 217 137  226 217 137  226 217 137
-+226 217 137  226 217 137  226 217 137  226 217 137  226 217 137  226 217 137
-+224 212 126  227 217 139  224 212 126  227 217 139  224 212 126  224 212 126
-+226 217 137  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  156 118 66  154 97 33  90 65 21
-+90 65 21  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  47 39 13  37 31 10
-+47 39 13  37 31 10  37 31 10  31 27 8  31 27 8  24 21 6
-+24 21 6  16 14 4  16 14 4  10 9 3  10 9 3  8 7 4
-+3 3 1  3 3 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  1 1 1  3 3 1  3 3 1
-+5 5 5  10 9 3  15 13 4  16 14 4  16 14 4  24 21 6
-+24 21 6  31 27 8  31 27 8  37 31 10  37 31 10  47 39 13
-+47 39 13  47 39 13  56 48 15  47 39 13  57 50 16  71 53 16
-+80 59 18  90 63 20  90 65 21  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  131 88 37  154 108 49  163 154 123  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  226 217 137  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+154 108 49  154 97 33  104 73 28  90 65 21  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  47 39 13  37 31 10  47 39 13  37 31 10
-+37 31 10  31 27 8  31 27 8  31 27 8  24 21 6  20 17 5
-+16 14 4  16 14 4  15 13 4  10 9 3  10 9 3  3 3 1
-+3 3 1  1 1 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  1 1 1  3 3 1
-+3 3 1  6 5 1  6 6 6  10 9 3  16 14 4  16 14 4
-+20 17 5  24 21 6  31 27 8  31 27 8  37 31 10  31 27 8
-+37 31 10  37 31 10  47 39 13  47 39 13  47 39 13  56 48 15
-+56 48 15  59 49 15  59 49 15  71 53 16  90 63 20  90 63 20
-+90 63 20  104 73 28  104 73 28  104 73 28  131 88 37  131 88 37
-+154 97 33  156 118 66  156 118 66  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  154 108 49  154 97 33  90 65 21  80 59 18
-+80 59 18  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+47 39 13  37 31 10  47 39 13  37 31 10  37 31 10  31 27 8
-+31 27 8  31 27 8  24 21 6  24 21 6  16 14 4  16 14 4
-+10 9 3  10 9 3  8 7 4  3 3 1  3 3 1  1 1 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+1 1 1  3 3 1  3 3 1  5 5 5  10 9 3  10 9 3
-+16 14 4  16 14 4  20 17 5  24 21 6  31 27 8  31 27 8
-+37 31 10  37 31 10  37 31 10  47 39 13  47 39 13  44 35 11
-+47 39 13  56 48 15  56 48 15  55 44 14  56 48 15  59 49 15
-+67 48 15  69 49 15  75 50 15  80 59 18  80 59 18  90 63 20
-+104 73 28  117 83 35  131 88 37  131 88 37  117 83 35  154 97 33
-+156 118 66  156 118 66  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  156 118 66  156 118 66  154 108 49  154 97 33  104 73 28
-+71 53 16  57 50 16  71 53 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  47 39 13  47 39 13  37 31 10
-+37 31 10  37 31 10  37 31 10  31 27 8  31 27 8  31 27 8
-+24 21 6  24 21 6  16 14 4  16 14 4  16 14 4  10 9 3
-+10 9 3  10 9 3  3 3 1  3 3 1  1 1 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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
-+1 1 1  1 1 1  3 3 1  6 5 1  6 5 1  10 9 3
-+10 9 3  15 13 4  16 14 4  16 14 4  20 17 5  24 21 6
-+27 23 7  31 27 8  37 31 10  31 27 8  37 31 10  44 35 11
-+44 35 11  44 35 11  47 39 13  47 39 13  51 40 13  55 44 14
-+55 44 14  56 48 15  56 48 15  59 49 15  59 49 15  59 49 15
-+59 49 15  59 49 15  59 49 15  59 49 15  59 49 15  57 50 16
-+80 59 18  80 59 18  69 49 15  62 38 11  59 49 15  59 49 15
-+59 49 15  80 59 18  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  80 59 18  71 53 16  67 48 15
-+71 53 16  90 65 21  80 59 18  80 59 18  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  47 39 13  47 39 13  37 31 10  47 39 13  37 31 10
-+37 31 10  31 27 8  31 27 8  31 27 8  24 21 6  24 21 6
-+20 17 5  16 14 4  16 14 4  10 9 3  10 9 3  8 7 4
-+3 3 1  3 3 1  1 1 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  1 1 1  1 1 1  3 3 1  3 3 1
-+5 5 5  8 7 4  10 9 3  15 13 4  16 14 4  16 14 4
-+24 21 6  24 21 6  24 21 6  31 27 8  31 27 8  37 31 10
-+37 31 10  37 31 10  47 39 13  44 35 11  47 39 13  47 39 13
-+47 39 13  56 48 15  51 40 13  56 48 15  56 48 15  56 48 15
-+56 48 15  56 48 15  59 49 15  59 49 15  59 49 15  57 50 16
-+57 50 16  57 50 16  57 50 16  59 49 15  59 49 15  59 49 15
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  59 49 15  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  47 39 13  37 31 10
-+47 39 13  37 31 10  37 31 10  37 31 10  31 27 8  31 27 8
-+31 27 8  31 27 8  24 21 6  24 21 6  24 21 6  16 14 4
-+16 14 4  16 14 4  10 9 3  10 9 3  6 5 1  3 3 1
-+3 3 1  1 1 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  1 1 1  3 3 1
-+3 3 1  6 5 1  5 5 5  10 9 3  10 9 3  15 13 4
-+15 13 4  16 14 4  24 21 6  24 21 6  24 21 6  31 27 8
-+31 27 8  37 31 10  37 31 10  37 31 10  37 31 10  44 35 11
-+44 35 11  47 39 13  47 39 13  47 39 13  47 39 13  47 39 13
-+56 48 15  56 48 15  56 48 15  56 48 15  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+47 39 13  47 39 13  47 39 13  37 31 10  47 39 13  37 31 10
-+37 31 10  37 31 10  37 31 10  31 27 8  31 27 8  31 27 8
-+24 21 6  24 21 6  24 21 6  16 14 4  16 14 4  15 13 4
-+10 9 3  10 9 3  6 5 1  3 3 1  3 3 1  1 1 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  1 1 1
-+1 1 1  1 1 1  3 3 1  3 3 1  4 4 4  8 7 4
-+10 9 3  15 13 4  15 13 4  16 14 4  20 17 5  24 21 6
-+24 21 6  27 23 7  31 27 8  31 27 8  37 31 10  37 31 10
-+37 31 10  37 31 10  47 39 13  44 35 11  47 39 13  47 39 13
-+47 39 13  47 39 13  47 39 13  56 48 15  47 39 13  56 48 15
-+56 48 15  56 48 15  56 48 15  56 48 15  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  56 48 15  56 48 15
-+57 50 16  56 48 15  57 50 16  57 50 16  56 48 15  56 48 15
-+47 39 13  56 48 15  47 39 13  47 39 13  37 31 10  47 39 13
-+37 31 10  47 39 13  31 27 8  37 31 10  37 31 10  31 27 8
-+31 27 8  31 27 8  31 27 8  24 21 6  24 21 6  24 21 6
-+20 17 5  16 14 4  16 14 4  15 13 4  10 9 3  10 9 3
-+6 5 1  6 5 1  3 3 1  3 3 1  1 1 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  1 1 1  1 1 1  3 3 1  3 3 1  3 3 1
-+6 5 1  6 6 6  10 9 3  10 9 3  16 14 4  16 14 4
-+16 14 4  20 17 5  24 21 6  24 21 6  27 23 7  31 27 8
-+31 27 8  31 27 8  37 31 10  37 31 10  37 31 10  37 31 10
-+37 31 10  47 39 13  44 35 11  47 39 13  47 39 13  47 39 13
-+47 39 13  47 39 13  47 39 13  56 48 15  47 39 13  47 39 13
-+56 48 15  47 39 13  56 48 15  57 50 16  47 39 13  56 48 15
-+56 48 15  56 48 15  47 39 13  56 48 15  47 39 13  56 48 15
-+47 39 13  47 39 13  47 39 13  47 39 13  47 39 13  37 31 10
-+47 39 13  47 39 13  37 31 10  47 39 13  37 31 10  37 31 10
-+37 31 10  37 31 10  31 27 8  31 27 8  31 27 8  31 27 8
-+24 21 6  24 21 6  24 21 6  24 21 6  16 14 4  16 14 4
-+16 14 4  10 9 3  10 9 3  8 7 4  6 5 1  3 3 1
-+3 3 1  1 1 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  0 0 0  1 1 1  1 1 1  1 1 1  3 3 1
-+3 3 1  3 3 1  4 4 4  8 7 4  10 9 3  10 9 3
-+15 13 4  15 13 4  16 14 4  20 17 5  20 17 5  24 21 6
-+24 21 6  27 23 7  31 27 8  31 27 8  31 27 8  37 31 10
-+37 31 10  37 31 10  37 31 10  37 31 10  37 31 10  44 35 11
-+37 31 10  47 39 13  44 35 11  44 35 11  47 39 13  47 39 13
-+47 39 13  47 39 13  47 39 13  47 39 13  47 39 13  47 39 13
-+37 31 10  47 39 13  47 39 13  47 39 13  47 39 13  47 39 13
-+37 31 10  47 39 13  37 31 10  47 39 13  37 31 10  47 39 13
-+31 27 8  37 31 10  37 31 10  31 27 8  37 31 10  31 27 8
-+31 27 8  31 27 8  24 21 6  31 27 8  24 21 6  24 21 6
-+24 21 6  20 17 5  16 14 4  16 14 4  16 14 4  10 9 3
-+10 9 3  10 9 3  6 5 1  6 5 1  3 3 1  3 3 1
-+1 1 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+1 1 1  3 3 1  3 3 1  3 3 1  6 5 1  5 5 5
-+8 7 4  10 9 3  10 9 3  15 13 4  16 14 4  16 14 4
-+16 14 4  20 17 5  24 21 6  24 21 6  24 21 6  27 23 7
-+27 23 7  31 27 8  31 27 8  37 31 10  31 27 8  37 31 10
-+37 31 10  37 31 10  37 31 10  37 31 10  37 31 10  37 31 10
-+37 31 10  37 31 10  37 31 10  37 31 10  37 31 10  37 31 10
-+47 39 13  37 31 10  37 31 10  37 31 10  37 31 10  37 31 10
-+37 31 10  37 31 10  37 31 10  31 27 8  37 31 10  31 27 8
-+31 27 8  31 27 8  31 27 8  31 27 8  31 27 8  24 21 6
-+24 21 6  24 21 6  24 21 6  20 17 5  16 14 4  16 14 4
-+16 14 4  16 14 4  10 9 3  10 9 3  10 9 3  6 5 1
-+6 5 1  3 3 1  3 3 1  1 1 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+0 0 0  1 1 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 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 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 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  1 1 1  1 1 1  1 1 1  3 3 1
-+3 3 1  6 5 1  6 5 1  8 7 4  10 9 3  10 9 3
-+15 13 4  15 13 4  15 13 4  16 14 4  20 17 5  20 17 5
-+24 21 6  24 21 6  24 21 6  24 21 6  27 23 7  27 23 7
-+31 27 8  27 23 7  31 27 8  31 27 8  31 27 8  31 27 8
-+31 27 8  31 27 8  37 31 10  37 31 10  31 27 8  37 31 10
-+31 27 8  31 27 8  37 31 10  31 27 8  31 27 8  31 27 8
-+31 27 8  31 27 8  31 27 8  31 27 8  31 27 8  24 21 6
-+24 21 6  24 21 6  24 21 6  24 21 6  16 14 4  20 17 5
-+16 14 4  16 14 4  16 14 4  16 14 4  16 14 4  15 13 4
-+10 9 3  10 9 3  10 9 3  6 5 1  6 5 1  3 3 1
-+3 3 1  3 3 1  1 1 1  1 1 1  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  1 1 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 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 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  1 1 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 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 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 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 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 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 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 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 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 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 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 1 1  1 1 1
-+1 1 1  1 1 1  2 2 2  2 2 2  2 2 2  2 2 2
-+1 1 1  1 1 1  1 1 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 0 0  0 0 0  0 0 0  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 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 0 0  0 0 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 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 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 0 0  0 0 0  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+3 3 1  3 3 1  3 3 3  6 5 1  4 4 4  8 7 4
-+8 7 4  10 9 3  10 9 3  13 11 4  15 13 4  16 14 4
-+16 14 4  16 14 4  20 17 5  20 17 5  20 17 5  20 17 5
-+24 21 6  24 21 6  24 21 6  24 21 6  24 21 6  27 23 7
-+24 21 6  31 27 8  27 23 7  27 23 7  27 23 7  31 27 8
-+27 23 7  31 27 8  27 23 7  27 23 7  27 23 7  27 23 7
-+31 27 8  24 21 6  24 21 6  24 21 6  24 21 6  24 21 6
-+20 17 5  24 21 6  16 14 4  16 14 4  16 14 4  16 14 4
-+16 14 4  16 14 4  10 9 3  10 9 3  10 9 3  10 9 3
-+6 5 1  6 5 1  3 3 1  3 3 1  3 3 1  2 2 2
-+1 1 1  1 1 1  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  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  2 2 2
-+2 2 2  2 2 2  2 2 2  1 1 1  1 1 1  1 1 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  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 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 0 0  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  2 2 2
-+2 2 2  2 2 2  2 2 2  1 1 1  1 1 1  1 1 1
-+1 1 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 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 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 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 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 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 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 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 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 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  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+2 2 2  2 2 2  2 2 2  2 2 2  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  2 2 2  2 2 2
-+2 2 2  2 2 2  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  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  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  2 2 2  2 2 2
-+2 2 2  2 2 2  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  3 3 3
-+3 3 3  3 3 3  3 3 3  4 4 4  4 4 4  5 5 5
-+5 5 5  8 7 4  7 7 7  9 8 6  9 8 6  10 9 3
-+10 10 10  15 13 4  11 11 11  16 14 4  16 14 4  16 14 4
-+16 14 4  16 14 4  20 17 5  14 14 14  20 17 5  20 17 5
-+20 17 5  20 17 5  24 21 6  24 21 6  20 17 5  24 21 6
-+24 21 6  24 21 6  16 16 16  24 21 6  24 21 6  16 16 16
-+24 21 6  16 16 16  20 17 5  14 14 14  16 14 4  13 13 13
-+16 14 4  12 12 12  11 11 11  16 14 4  11 11 11  10 9 3
-+10 10 10  10 9 3  10 9 3  8 8 8  8 7 4  5 5 5
-+5 5 5  4 4 4  3 3 1  3 3 3  2 2 2  2 2 2
-+2 2 2  2 2 2  1 1 1  1 1 1  1 1 1  1 1 1
-+0 0 0  0 0 0  0 0 0  0 0 0  1 1 1  1 1 1
-+1 1 1  1 1 1  2 2 2  2 2 2  2 2 2  2 2 2
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  3 3 3
-+3 3 3  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  2 2 2  2 2 2  2 2 2  2 2 2  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 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 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 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 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 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 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 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 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 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  1 1 1
-+1 1 1  1 1 1  2 2 2  2 2 2  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  2 2 2  2 2 2
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+2 2 2  2 2 2  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  6 6 6  6 6 6  8 7 4  7 7 7  9 8 6
-+8 7 4  8 7 4  8 8 8  10 9 3  9 9 9  10 10 10
-+15 13 4  11 11 11  15 13 4  16 14 4  16 14 4  14 14 14
-+16 14 4  14 14 14  16 14 4  14 14 14  16 14 4  16 16 16
-+16 14 4  14 14 14  20 17 5  16 14 4  14 14 14  16 14 4
-+13 13 13  15 13 4  16 14 4  16 14 4  11 11 11  15 13 4
-+11 11 11  10 9 3  10 9 3  9 9 9  10 9 3  10 9 3
-+10 9 3  7 7 7  6 6 6  5 5 5  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  2 2 2  2 2 2  2 2 2
-+2 2 2  1 1 1  1 1 1  1 1 1  2 2 2  2 2 2
-+2 2 2  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  2 2 2  2 2 2  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 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 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 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 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 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 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 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 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 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  1 1 1  1 1 1  2 2 2
-+2 2 2  3 3 3  3 3 3  3 3 3  4 4 4  4 4 4
-+4 4 4  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  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  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  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  4 4 4  4 4 4  4 4 4  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  4 4 4  4 4 4  4 4 4  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+6 6 6  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 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  7 7 7  6 6 6
-+6 6 6  6 6 6  6 6 6  6 6 6  5 5 5  6 6 6
-+6 6 6  7 7 7  9 8 6  7 7 7  10 9 3  8 8 8
-+10 9 3  8 8 8  9 9 9  9 9 9  10 10 10  15 13 4
-+9 9 9  15 13 4  12 12 12  15 13 4  12 12 12  15 13 4
-+12 12 12  15 13 4  12 12 12  12 12 12  16 14 4  12 12 12
-+15 13 4  11 11 11  10 10 10  10 10 10  10 9 3  10 10 10
-+9 9 9  9 9 9  9 9 9  10 9 3  8 8 8  8 8 8
-+7 7 7  6 6 6  6 6 6  6 6 6  6 6 6  7 7 7
-+6 6 6  6 6 6  5 5 5  5 5 5  5 5 5  5 5 5
-+4 4 4  4 4 4  4 4 4  4 4 4  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+4 4 4  4 4 4  4 4 4  4 4 4  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
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 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 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
-+5 5 5  5 5 5  5 5 5  5 5 5  4 4 4  4 4 4
-+4 4 4  3 3 3  3 3 3  3 3 3  2 2 2  2 2 2
-+1 1 1  1 1 1  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  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  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  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
-+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  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  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  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  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  1 1 1  1 1 1  2 2 2  2 2 2  3 3 3
-+3 3 3  4 4 4  4 4 4  5 5 5  5 5 5  6 6 6
-+6 6 6  6 6 6  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  7 7 7  7 7 7  7 7 7
-+7 7 7  7 7 7  7 7 7  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 6  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  7 7 7  7 7 7  7 7 7  6 6 6
-+6 6 6  6 6 6  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 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
-+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  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  7 7 7  7 7 7
-+7 7 7  7 7 7  7 7 7  7 7 7  6 6 6  7 7 7
-+8 8 8  7 7 7  9 9 9  10 9 3  8 8 8  9 9 9
-+10 9 3  8 8 8  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  11 11 11  15 13 4  11 11 11  11 11 11  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  9 9 9
-+8 8 8  9 9 9  8 8 8  9 9 9  8 8 8  8 8 8
-+8 8 8  8 8 8  8 8 8  8 8 8  8 8 8  9 9 9
-+8 8 8  7 7 7  7 7 7  7 7 7  7 7 7  6 6 6
-+6 6 6  6 6 6  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 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  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  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  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  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
-+7 7 7  7 7 7  7 7 7  6 6 6  6 6 6  6 6 6
-+5 5 5  5 5 5  4 4 4  4 4 4  3 3 3  3 3 3
-+2 2 2  2 2 2  1 1 1  1 1 1  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  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  1 1 1
-+1 1 1  2 2 2  2 2 2  3 3 3  3 3 3  4 4 4
-+5 5 5  5 5 5  6 6 6  6 6 6  7 7 7  7 7 7
-+8 8 8  8 8 8  9 9 9  9 9 9  9 9 9  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  9 9 9  9 9 9  9 9 9  8 8 8
-+8 8 8  8 8 8  8 8 8  8 8 8  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
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  10 10 10
-+10 10 10  10 10 10  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  9 9 9  9 9 9
-+9 9 9  10 10 10  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  10 10 10  9 9 9  9 9 9
-+10 10 10  9 9 9  9 9 9  10 10 10  10 9 3  11 11 11
-+9 9 9  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  9 9 9  9 9 9  9 9 9  9 9 9  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  9 9 9
-+9 9 9  9 9 9  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  8 8 8  8 8 8
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+9 9 9  9 9 9  9 9 9  8 8 8  8 8 8  7 7 7
-+7 7 7  6 6 6  6 6 6  5 5 5  5 5 5  4 4 4
-+3 3 3  3 3 3  2 2 2  2 2 2  1 1 1  1 1 1
-+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  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  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  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  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  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
-+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  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  0 0 0  0 0 0  1 1 1  1 1 1
-+2 2 2  3 3 3  3 3 3  4 4 4  5 5 5  5 5 5
-+6 6 6  7 7 7  7 7 7  8 8 8  9 9 9  9 9 9
-+10 10 10  10 10 10  11 11 11  11 11 11  11 11 11  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  11 11 11  11 11 11  11 11 11  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  11 11 11  11 11 11  11 11 11  11 11 11  12 12 12
-+12 12 12  12 12 12  12 12 12  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  13 13 13
-+13 13 13  14 14 14  13 13 13  13 13 13  13 13 13  13 13 13
-+14 14 14  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  12 12 12
-+12 12 12  12 12 12  11 11 11  11 11 11  11 11 11  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  11 11 11  11 11 11
-+11 11 11  11 11 11  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  12 12 12  12 12 12  12 12 12  12 12 12
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+11 11 11  11 11 11  11 11 11  10 10 10  10 10 10  9 9 9
-+9 9 9  8 8 8  7 7 7  7 7 7  6 6 6  5 5 5
-+5 5 5  4 4 4  3 3 3  3 3 3  2 2 2  1 1 1
-+1 1 1  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  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  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  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  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
-+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  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  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  1 1 1  1 1 1  2 2 2  3 3 3
-+3 3 3  4 4 4  4 4 4  5 5 5  6 6 6  7 7 7
-+8 8 8  9 9 9  9 9 9  10 10 10  11 11 11  11 11 11
-+12 12 12  12 12 12  13 13 13  13 13 13  13 13 13  14 14 14
-+14 14 14  14 14 14  15 14 14  15 14 14  15 14 14  15 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  13 13 13  13 13 13  13 13 13
-+13 13 13  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  15 14 14  15 14 14  15 14 14
-+15 14 14  15 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  16 16 16  14 14 14  16 16 16
-+16 16 16  16 16 16  14 14 14  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+14 14 14  16 16 16  16 16 16  14 14 14  16 16 16  16 16 16
-+14 14 14  14 14 14  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  12 12 12  12 12 12  12 12 12
-+12 12 12  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  14 14 14  14 14 14  14 14 14  14 14 14  15 14 14
-+15 14 14  15 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+15 14 14  15 14 14  15 14 14  15 14 14  15 14 14  15 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  13 13 13  13 13 13  13 13 13  13 13 13
-+14 14 14  14 14 14  14 14 14  14 14 14  15 14 14  15 14 14
-+15 14 14  15 14 14  15 14 14  15 14 14  15 14 14  15 14 14
-+15 14 14  15 14 14  15 14 14  15 14 14  15 14 14  15 14 14
-+15 14 14  15 14 14  15 14 14  14 14 14  14 14 14  14 14 14
-+13 13 13  13 13 13  13 13 13  12 12 12  12 12 12  11 11 11
-+11 11 11  10 10 10  9 9 9  8 8 8  8 8 8  7 7 7
-+6 6 6  5 5 5  4 4 4  4 4 4  3 3 3  3 3 3
-+2 2 2  1 1 1  1 1 1  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  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  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
-+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  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  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  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  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  1 1 1  1 1 1  2 2 2  3 3 3  3 3 3
-+4 4 4  5 5 5  6 6 6  7 7 7  8 8 8  9 9 9
-+9 9 9  10 10 10  11 11 11  12 12 12  13 13 13  13 13 13
-+14 14 14  15 14 14  15 14 14  16 16 16  16 16 16  16 16 16
-+16 16 16  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  16 16 16  16 16 16  16 16 16  16 16 16  15 14 14
-+15 14 14  15 14 14  15 14 14  15 14 14  15 14 14  15 14 14
-+15 14 14  15 14 14  15 14 14  15 14 14  15 14 14  15 14 14
-+15 14 14  15 14 14  15 14 14  15 14 14  15 14 14  15 14 14
-+15 14 14  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+17 17 17  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  17 17 17  16 16 16  16 16 16  17 17 17
-+16 16 16  16 16 16  17 17 17  16 16 16  16 16 16  16 16 16
-+17 17 17  16 16 16  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  18 18 18  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  16 16 16  16 16 16  16 16 16  16 16 16  15 14 14
-+15 14 14  15 14 14  15 14 14  15 14 14  15 14 14  15 14 14
-+15 14 14  15 14 14  15 14 14  15 14 14  15 14 14  15 14 14
-+15 14 14  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  17 17 17  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  17 17 17  17 17 17  17 17 17  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  16 16 16  16 16 16
-+16 16 16  16 16 16  15 14 14  15 14 14  14 14 14  13 13 13
-+13 13 13  12 12 12  11 11 11  10 10 10  9 9 9  9 9 9
-+8 8 8  7 7 7  6 6 6  5 5 5  4 4 4  3 3 3
-+3 3 3  2 2 2  1 1 1  1 1 1  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  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
-+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  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  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  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  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  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
-+1 1 1  1 1 1  2 2 2  3 3 3  4 4 4  4 4 4
-+5 5 5  6 6 6  7 7 7  8 8 8  9 9 9  10 10 10
-+11 11 11  12 12 12  13 13 13  14 14 14  15 14 14  16 16 16
-+16 16 16  17 17 17  17 17 17  18 18 18  18 18 18  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  18 18 18  18 18 18  18 18 18
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  20 20 20  20 20 20  20 20 20
-+20 20 20  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  19 19 19
-+19 19 19  19 19 19  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  19 19 19  19 19 19  19 19 19
-+19 19 19  18 18 18  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  19 19 19  19 19 19  19 19 19  19 19 19
-+18 18 18  18 18 18  17 17 17  17 17 17  16 16 16  16 16 16
-+15 14 14  14 14 14  13 13 13  12 12 12  11 11 11  10 10 10
-+9 9 9  8 8 8  7 7 7  6 6 6  5 5 5  4 4 4
-+4 4 4  3 3 3  2 2 2  1 1 1  1 1 1  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
-+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  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  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  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  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  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
-+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  1 1 1
-+1 1 1  2 2 2  3 3 3  4 4 4  5 5 5  6 6 6
-+7 7 7  8 8 8  9 9 9  10 10 10  11 11 11  12 12 12
-+13 13 13  14 14 14  15 14 14  16 16 16  17 17 17  18 18 18
-+18 18 18  19 19 19  20 20 20  20 20 20  21 21 21  21 21 21
-+21 21 21  21 21 21  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  22 22 22  22 22 22  22 22 22  22 22 22
-+21 21 21  21 21 21  21 21 21  21 21 21  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+22 22 22  22 22 22  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  22 22 22  22 22 22  22 22 22  22 22 22  24 24 24
-+24 24 24  24 24 24  22 22 22  24 24 24  24 24 24  24 24 24
-+22 22 22  24 24 24  22 22 22  24 24 24  24 24 24  24 24 24
-+22 22 22  24 24 24  24 24 24  22 22 22  22 22 22  22 22 22
-+21 21 21  21 21 21  21 21 21  21 21 21  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  22 22 22
-+22 22 22  22 22 22  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  22 22 22  22 22 22  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+22 22 22  22 22 22  22 22 22  22 22 22  22 22 22  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  22 22 22  22 22 22  22 22 22  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+22 22 22  22 22 22  22 22 22  21 21 21  21 21 21  21 21 21
-+21 21 21  20 20 20  20 20 20  19 19 19  18 18 18  18 18 18
-+17 17 17  16 16 16  15 14 14  14 14 14  13 13 13  12 12 12
-+11 11 11  10 10 10  9 9 9  8 8 8  7 7 7  6 6 6
-+5 5 5  4 4 4  3 3 3  2 2 2  1 1 1  1 1 1
-+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  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  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  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  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  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
-+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  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  1 1 1  1 1 1
-+2 2 2  3 3 3  4 4 4  5 5 5  6 6 6  7 7 7
-+8 8 8  9 9 9  10 10 10  12 12 12  13 13 13  14 14 14
-+15 14 14  16 16 16  17 17 17  18 18 18  19 19 19  20 20 20
-+21 21 21  21 21 21  22 22 22  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  25 25 25  25 25 25  25 25 25  25 25 25
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+24 24 24  25 25 25  26 26 26  26 26 26  25 25 25  26 26 26
-+26 26 26  26 26 26  26 26 26  26 26 26  25 25 25  26 26 26
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  22 22 22  21 21 21  21 21 21  20 20 20
-+19 19 19  18 18 18  17 17 17  16 16 16  15 14 14  14 14 14
-+13 13 13  12 12 12  10 10 10  9 9 9  8 8 8  7 7 7
-+6 6 6  5 5 5  4 4 4  3 3 3  2 2 2  1 1 1
-+1 1 1  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  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  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  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  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
-+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  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  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  1 1 1  2 2 2
-+3 3 3  4 4 4  5 5 5  6 6 6  7 7 7  8 8 8
-+10 10 10  11 11 11  12 12 12  13 13 13  15 14 14  16 16 16
-+17 17 17  18 18 18  19 19 19  20 20 20  21 21 21  22 22 22
-+24 24 24  24 24 24  25 25 25  25 25 25  26 26 26  26 26 26
-+26 26 26  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  26 26 26  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  27 27 27  27 27 27
-+27 27 27  26 26 26  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  26 26 26  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  27 27 27  27 27 27  27 27 27  26 26 26  26 26 26
-+26 26 26  25 25 25  25 25 25  24 24 24  24 24 24  22 22 22
-+21 21 21  20 20 20  19 19 19  18 18 18  17 17 17  16 16 16
-+15 14 14  13 13 13  12 12 12  11 11 11  10 10 10  8 8 8
-+7 7 7  6 6 6  5 5 5  4 4 4  3 3 3  2 2 2
-+1 1 1  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  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  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  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  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
-+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  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  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  1 1 1  2 2 2  3 3 3
-+4 4 4  5 5 5  6 6 6  7 7 7  9 9 9  10 10 10
-+11 11 11  13 13 13  14 14 14  15 14 14  16 16 16  18 18 18
-+19 19 19  20 20 20  21 21 21  22 22 22  24 24 24  25 25 25
-+25 25 25  26 26 26  27 27 27  28 28 28  28 28 28  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  32 32 32
-+30 30 30  32 32 32  30 30 30  32 32 32  30 30 30  32 32 32
-+30 30 30  30 30 30  30 30 30  32 32 32  30 30 30  32 32 32
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+28 28 28  28 28 28  27 27 27  26 26 26  25 25 25  25 25 25
-+24 24 24  22 22 22  21 21 21  20 20 20  19 19 19  18 18 18
-+16 16 16  15 14 14  14 14 14  13 13 13  11 11 11  10 10 10
-+9 9 9  7 7 7  6 6 6  5 5 5  4 4 4  3 3 3
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  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  1 1 1  1 1 1  3 3 3  3 3 3
-+4 4 4  6 6 6  7 7 7  8 8 8  10 10 10  11 11 11
-+13 13 13  14 14 14  16 16 16  17 17 17  18 18 18  20 20 20
-+21 21 21  22 22 22  24 24 24  25 25 25  26 26 26  27 27 27
-+28 28 28  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  32 32 32  32 32 32  32 32 32  32 32 32
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  32 32 32
-+32 32 32  32 32 32  32 32 32  33 33 33  33 33 33  32 32 32
-+32 32 32  32 32 32  32 32 32  32 32 32  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  32 32 32
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  35 35 35  35 35 35  35 35 35  35 35 35  33 33 33
-+35 35 35  35 35 35  35 35 35  33 33 33  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  33 33 33  33 33 33  33 33 33
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  32 32 32
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  32 32 32
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  32 32 32
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  32 32 32
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  32 32 32
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  32 32 32  32 32 32  32 32 32  32 32 32  32 32 32
-+32 32 32  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  33 33 33
-+33 33 33  33 33 33  33 33 33  32 32 32  32 32 32  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  28 28 28  27 27 27
-+26 26 26  25 25 25  24 24 24  22 22 22  21 21 21  20 20 20
-+18 18 18  17 17 17  16 16 16  14 14 14  13 13 13  11 11 11
-+10 10 10  8 8 8  7 7 7  6 6 6  4 4 4  3 3 3
-+3 3 3  1 1 1  1 1 1  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  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  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
-+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  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  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  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  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  1 1 1  2 2 2  3 3 3  4 4 4
-+5 5 5  7 7 7  8 8 8  10 10 10  11 11 11  13 13 13
-+14 14 14  16 16 16  17 17 17  19 19 19  20 20 20  21 21 21
-+24 24 24  25 25 25  26 26 26  27 27 27  28 28 28  30 30 30
-+30 30 30  30 30 30  32 32 32  33 33 33  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  37 37 37  35 35 35
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  33 33 33  32 32 32  30 30 30  30 30 30  30 30 30
-+28 28 28  27 27 27  26 26 26  25 25 25  24 24 24  21 21 21
-+20 20 20  19 19 19  17 17 17  16 16 16  14 14 14  13 13 13
-+11 11 11  10 10 10  8 8 8  7 7 7  5 5 5  4 4 4
-+3 3 3  2 2 2  1 1 1  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  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  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
-+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  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  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  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  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  1 1 1  2 2 2  3 3 3  4 4 4  5 5 5
-+6 6 6  8 8 8  9 9 9  11 11 11  13 13 13  14 14 14
-+16 16 16  17 17 17  19 19 19  20 20 20  22 22 22  24 24 24
-+25 25 25  26 26 26  28 28 28  30 30 30  30 30 30  32 32 32
-+33 33 33  35 35 35  35 35 35  35 35 35  35 35 35  37 37 37
-+37 37 37  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  39 39 39  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  39 39 39  41 41 41  39 39 39
-+41 41 41  39 39 39  41 41 41  41 41 41  41 41 41  41 41 41
-+39 39 39  39 39 39  39 39 39  39 39 39  39 39 39  38 38 38
-+38 38 38  38 38 38  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  39 39 39  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  39 39 39  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  39 39 39  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  37 37 37  37 37 37  37 37 37
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  41 41 41  41 41 41  41 41 41
-+39 39 39  39 39 39  39 39 39  39 39 39  39 39 39  39 39 39
-+39 39 39  39 39 39  38 38 38  38 38 38  37 37 37  37 37 37
-+35 35 35  35 35 35  35 35 35  35 35 35  33 33 33  32 32 32
-+30 30 30  30 30 30  28 28 28  26 26 26  25 25 25  24 24 24
-+22 22 22  20 20 20  19 19 19  17 17 17  16 16 16  14 14 14
-+13 13 13  11 11 11  9 9 9  8 8 8  6 6 6  5 5 5
-+4 4 4  3 3 3  2 2 2  1 1 1  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  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
-+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  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  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  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  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  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+1 1 1  1 1 1  3 3 3  3 3 3  5 5 5  6 6 6
-+7 7 7  9 9 9  11 11 11  12 12 12  14 14 14  16 16 16
-+17 17 17  19 19 19  21 21 21  22 22 22  24 24 24  26 26 26
-+27 27 27  30 30 30  30 30 30  32 32 32  33 33 33  35 35 35
-+35 35 35  37 37 37  37 37 37  38 38 38  39 39 39  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  39 39 39  39 39 39  39 39 39  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  39 39 39  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  39 39 39  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  42 42 42  42 42 42
-+42 42 42  42 42 42  42 42 42  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  42 42 42
-+42 42 42  42 42 42  42 42 42  42 42 42  42 42 42  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  42 42 42  42 42 42  42 42 42
-+42 42 42  42 42 42  42 42 42  42 42 42  42 42 42  42 42 42
-+42 42 42  42 42 42  42 42 42  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  42 42 42  42 42 42
-+42 42 42  42 42 42  42 42 42  42 42 42  42 42 42  42 42 42
-+42 42 42  42 42 42  42 42 42  42 42 42  42 42 42  42 42 42
-+42 42 42  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+39 39 39  38 38 38  37 37 37  37 37 37  35 35 35  35 35 35
-+33 33 33  32 32 32  30 30 30  30 30 30  27 27 27  26 26 26
-+24 24 24  22 22 22  21 21 21  19 19 19  17 17 17  16 16 16
-+14 14 14  12 12 12  11 11 11  9 9 9  7 7 7  6 6 6
-+5 5 5  3 3 3  2 2 2  1 1 1  1 1 1  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+1 1 1  2 2 2  3 3 3  4 4 4  5 5 5  7 7 7
-+8 8 8  10 10 10  12 12 12  13 13 13  16 16 16  17 17 17
-+19 19 19  20 20 20  22 22 22  24 24 24  26 26 26  27 27 27
-+30 30 30  30 30 30  32 32 32  35 35 35  35 35 35  37 37 37
-+38 38 38  39 39 39  41 41 41  41 41 41  42 42 42  42 42 42
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+42 42 42  42 42 42  42 42 42  42 42 42  42 42 42  42 42 42
-+42 42 42  42 42 42  42 42 42  42 42 42  42 42 42  42 42 42
-+42 42 42  42 42 42  42 42 42  42 42 42  42 42 42  42 42 42
-+42 42 42  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  42 42 42  42 42 42  42 42 42  42 42 42
-+42 42 42  42 42 42  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  45 45 45  45 45 45  45 45 45  45 45 45  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  42 42 42
-+42 42 42  41 41 41  41 41 41  39 39 39  38 38 38  37 37 37
-+35 35 35  35 35 35  32 32 32  30 30 30  30 30 30  27 27 27
-+26 26 26  24 24 24  22 22 22  20 20 20  19 19 19  17 17 17
-+16 16 16  13 13 13  12 12 12  10 10 10  8 8 8  7 7 7
-+5 5 5  4 4 4  3 3 3  2 2 2  1 1 1  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+1 1 1  3 3 3  3 3 3  5 5 5  6 6 6  8 8 8
-+9 9 9  11 11 11  13 13 13  15 14 14  17 17 17  18 18 18
-+20 20 20  22 22 22  24 24 24  26 26 26  28 28 28  30 30 30
-+30 30 30  33 33 33  35 35 35  35 35 35  38 38 38  39 39 39
-+41 41 41  42 42 42  43 43 43  43 43 43  43 43 43  45 45 45
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  47 47 47  47 47 47  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  47 47 47  47 47 47  47 47 47  47 47 47
-+47 47 47  48 48 47  48 48 47  48 48 47  48 48 47  48 48 47
-+48 48 47  48 48 47  48 48 47  48 48 47  48 48 47  48 48 47
-+48 48 47  47 47 47  47 47 47  47 47 47  47 47 47  46 46 46
-+46 46 46  46 46 46  46 46 46  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  47 47 47  47 47 47  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  47 47 47  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  47 47 47  47 47 47  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  47 47 47  47 47 47  47 47 47  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  48 48 47  48 48 47  48 48 47  48 48 47
-+48 48 47  48 48 47  48 48 47  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  46 46 46  46 46 46  46 46 46  45 45 45
-+43 43 43  43 43 43  43 43 43  42 42 42  41 41 41  39 39 39
-+38 38 38  35 35 35  35 35 35  33 33 33  30 30 30  30 30 30
-+28 28 28  26 26 26  24 24 24  22 22 22  20 20 20  18 18 18
-+17 17 17  15 14 14  13 13 13  11 11 11  9 9 9  8 8 8
-+6 6 6  5 5 5  3 3 3  3 3 3  1 1 1  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  1 1 1
-+2 2 2  3 3 3  4 4 4  5 5 5  7 7 7  9 9 9
-+10 10 10  12 12 12  14 14 14  16 16 16  18 18 18  20 20 20
-+22 22 22  24 24 24  26 26 26  27 27 27  30 30 30  30 30 30
-+33 33 33  35 35 35  37 37 37  38 38 38  41 41 41  42 42 42
-+43 43 43  43 43 43  45 45 45  46 46 46  47 47 47  48 48 47
-+48 48 47  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  48 48 47  48 48 47  48 48 47  48 48 47  48 48 47
-+48 48 47  47 47 47  47 47 47  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  47 47 47  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  47 47 47  47 47 47  47 47 47  48 48 47
-+48 48 47  48 48 47  48 48 47  48 48 47  48 48 47  48 48 47
-+48 48 47  48 48 47  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  50 50 50
-+50 50 50  50 50 50  50 50 50  50 50 50  50 50 50  50 50 50
-+50 50 50  50 50 50  50 50 50  50 50 50  50 50 50  50 50 50
-+50 50 50  50 50 50  50 50 50  50 50 50  49 49 49  49 49 49
-+49 49 49  48 48 47  48 48 47  48 48 47  48 48 47  48 48 47
-+48 48 47  48 48 47  48 48 47  47 47 47  47 47 47  47 47 47
-+47 47 47  48 48 47  48 48 47  48 48 47  48 48 47  48 48 47
-+48 48 47  48 48 47  48 48 47  48 48 47  48 48 47  48 48 47
-+48 48 47  48 48 47  48 48 47  48 48 47  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  50 50 50  50 50 50  50 50 50  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+48 48 47  48 48 47  48 48 47  48 48 47  48 48 47  48 48 47
-+48 48 47  48 48 47  48 48 47  48 48 47  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  50 50 50
-+50 50 50  50 50 50  50 50 50  50 50 50  50 50 50  50 50 50
-+50 50 50  50 50 50  50 50 50  50 50 50  50 50 50  50 50 50
-+49 49 49  49 49 49  49 49 49  49 49 49  48 48 47  48 48 47
-+47 47 47  46 46 46  45 45 45  43 43 43  43 43 43  42 42 42
-+41 41 41  38 38 38  37 37 37  35 35 35  33 33 33  30 30 30
-+30 30 30  27 27 27  26 26 26  24 24 24  22 22 22  20 20 20
-+18 18 18  16 16 16  14 14 14  12 12 12  10 10 10  9 9 9
-+7 7 7  5 5 5  4 4 4  3 3 3  2 2 2  1 1 1
-+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  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  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  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  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  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
-+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  0 0 0  0 0 0  0 0 0  0 0 0  1 1 1
-+2 2 2  3 3 3  5 5 5  6 6 6  8 8 8  10 10 10
-+11 11 11  13 13 13  15 14 14  17 17 17  19 19 19  21 21 21
-+24 24 24  25 25 25  27 27 27  30 30 30  30 30 30  33 33 33
-+35 35 35  37 37 37  39 39 39  41 41 41  42 42 42  43 43 43
-+45 45 45  47 47 47  48 48 47  66 66 66  140 134 120  140 134 120
-+192 187 164  200 196 176  231 230 220  230 228 210  230 228 210  230 228 210
-+230 228 210  192 187 164  192 187 164  140 134 120  138 129 110  65 65 65
-+50 50 50  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  135 101 60  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  66 66 66
-+52 52 52  52 52 52  50 50 50  50 50 50  50 50 50  50 50 50
-+50 50 50  50 50 50  50 50 50  50 50 50  50 50 50  50 50 50
-+50 50 50  50 50 50  50 50 50  50 50 50  50 50 50  50 50 50
-+50 50 50  66 66 66  138 129 110  140 134 120  140 134 120  192 187 164
-+192 187 164  192 187 164  192 187 164  176 168 138  140 134 120  140 134 120
-+66 66 66  65 65 65  50 50 50  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  63 58 50  138 129 110  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+138 129 110  66 66 66  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  138 129 110  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  138 129 110  52 52 52
-+52 52 52  50 50 50  50 50 50  50 50 50  50 50 50  50 50 50
-+50 50 50  50 50 50  50 50 50  50 50 50  50 50 50  50 50 50
-+50 50 50  50 50 50  50 50 50  50 50 50  50 50 50  50 50 50
-+66 66 66  140 134 120  176 168 138  192 187 164  200 196 176  231 230 220
-+230 228 210  230 228 210  230 228 210  230 228 210  185 178 149  176 168 138
-+140 134 120  138 129 110  45 45 45  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  66 66 66  65 65 65  50 50 50  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  66 66 66  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  66 66 66  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+65 65 65  138 129 110  140 134 120  192 187 164  192 187 164  231 229 217
-+230 228 210  230 228 210  230 228 210  230 228 210  200 196 176  192 187 164
-+140 134 120  140 134 120  66 66 66  50 50 50  45 45 45  43 43 43
-+42 42 42  41 41 41  39 39 39  37 37 37  35 35 35  33 33 33
-+30 30 30  30 30 30  27 27 27  25 25 25  24 24 24  21 21 21
-+19 19 19  17 17 17  15 14 14  13 13 13  11 11 11  10 10 10
-+8 8 8  6 6 6  5 5 5  3 3 3  2 2 2  1 1 1
-+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  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  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  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  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  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
-+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  0 0 0  0 0 0  0 0 0  1 1 1  1 1 1
-+3 3 3  4 4 4  5 5 5  7 7 7  9 9 9  10 10 10
-+12 12 12  14 14 14  16 16 16  18 18 18  20 20 20  24 24 24
-+25 25 25  27 27 27  30 30 30  30 30 30  33 33 33  35 35 35
-+37 37 37  39 39 39  41 41 41  43 43 43  45 45 45  46 46 46
-+66 66 66  140 134 120  231 230 220  255 255 255  255 255 255  255 255 255
-+249 249 249  249 249 249  249 249 249  249 249 249  249 249 249  238 238 238
-+249 249 249  249 249 249  249 249 249  249 249 249  249 249 249  249 249 249
-+200 196 176  140 134 120  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  65 65 65
-+66 66 66  231 230 220  249 249 249  249 249 249  249 249 249  249 249 249
-+255 255 255  249 249 249  255 255 255  249 249 249  255 255 255  249 249 249
-+255 255 255  249 249 249  255 255 255  249 249 249  255 255 255  255 255 255
-+238 238 238  192 187 164  66 66 66  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  65 65 65  66 66 66  185 178 149
-+238 238 238  255 255 255  249 249 249  249 249 249  255 255 255  249 249 249
-+249 249 249  238 238 238  249 249 249  249 249 249  249 249 249  255 255 255
-+255 255 255  238 238 238  200 196 176  138 129 110  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  140 134 120  249 249 249  249 249 249  249 249 249  249 249 249
-+255 255 255  249 249 249  255 255 255  249 249 249  255 255 255  249 249 249
-+255 255 255  249 249 249  255 255 255  249 249 249  255 255 255  249 249 249
-+249 249 249  255 255 255  238 238 238  192 187 164  66 66 66  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  138 129 110  238 238 238  249 249 249  249 249 249
-+249 249 249  249 249 249  255 255 255  249 249 249  255 255 255  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+255 255 255  255 255 255  249 249 249  249 249 249  249 249 249  249 249 249
-+231 230 220  140 134 120  65 65 65  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  65 65 65  66 66 66  185 178 149  238 238 238
-+255 255 255  255 255 255  249 249 249  249 249 249  249 249 249  249 249 249
-+249 249 249  249 249 249  238 238 238  249 249 249  249 249 249  249 249 249
-+249 249 249  249 249 249  238 238 238  192 187 164  138 129 110  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  238 238 238  255 255 255  249 249 249  255 255 255
-+255 255 255  255 255 255  140 134 120  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  230 228 210  255 255 255  255 255 255  255 255 255
-+249 249 249  255 255 255  249 249 249  176 168 138  52 52 52  65 65 65
-+52 52 52  52 52 52  52 52 52  52 52 52  140 134 120  200 196 176
-+249 249 249  249 249 249  249 249 249  249 249 249  249 249 249  249 249 249
-+249 249 249  238 238 238  249 249 249  249 249 249  249 249 249  249 249 249
-+255 255 255  249 249 249  255 255 255  238 238 238  140 134 120  63 58 50
-+45 45 45  43 43 43  41 41 41  39 39 39  37 37 37  35 35 35
-+33 33 33  30 30 30  30 30 30  27 27 27  25 25 25  24 24 24
-+20 20 20  18 18 18  16 16 16  14 14 14  12 12 12  10 10 10
-+9 9 9  7 7 7  5 5 5  4 4 4  3 3 3  1 1 1
-+1 1 1  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  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  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  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  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
-+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  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  0 0 0  0 0 0  1 1 1  2 2 2
-+3 3 3  4 4 4  6 6 6  8 8 8  9 9 9  11 11 11
-+13 13 13  16 16 16  17 17 17  20 20 20  21 21 21  24 24 24
-+26 26 26  28 28 28  30 30 30  32 32 32  35 35 35  37 37 37
-+39 39 39  41 41 41  43 43 43  45 45 45  47 47 47  138 129 110
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  255 255 255  255 255 255
-+249 249 249  255 255 255  255 255 255  249 249 249  255 255 255  255 255 255
-+255 255 255  249 249 249  231 229 217  66 66 66  65 65 65  52 52 52
-+63 58 50  52 52 52  65 65 65  52 52 52  52 52 52  66 66 66
-+249 249 249  255 255 255  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  185 178 149  65 65 65  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  66 66 66  192 187 164  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  230 228 210  66 66 66
-+65 65 65  52 52 52  65 65 65  52 52 52  63 58 50  52 52 52
-+66 66 66  255 255 255  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  249 249 249  140 134 120
-+65 65 65  52 52 52  65 65 65  52 52 52  63 58 50  52 52 52
-+65 65 65  66 66 66  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  255 255 255  238 238 238  66 66 66  66 66 66  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  63 58 50  176 168 138  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  255 255 255  255 255 255  255 255 255  249 249 249  255 255 255
-+249 249 249  255 255 255  249 249 249  249 249 249  249 249 249  200 196 176
-+66 66 66  65 65 65  52 52 52  65 65 65  52 52 52  63 58 50
-+52 52 52  65 65 65  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  65 65 65  52 52 52  65 65 65
-+52 52 52  63 58 50  52 52 52  65 65 65  52 52 52  63 58 50
-+65 65 65  200 196 176  255 255 255  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  192 187 164  52 52 52  65 65 65  52 52 52
-+65 65 65  52 52 52  66 66 66  238 238 238  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  255 255 255
-+249 249 249  255 255 255  255 255 255  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  238 238 238
-+138 129 110  43 43 43  43 43 43  41 41 41  39 39 39  37 37 37
-+35 35 35  32 32 32  30 30 30  28 28 28  26 26 26  24 24 24
-+21 21 21  20 20 20  17 17 17  16 16 16  13 13 13  11 11 11
-+9 9 9  8 8 8  6 6 6  4 4 4  3 3 3  2 2 2
-+1 1 1  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  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  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  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  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
-+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  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  0 0 0  0 0 0  1 1 1  2 2 2
-+3 3 3  5 5 5  6 6 6  8 8 8  10 10 10  12 12 12
-+14 14 14  16 16 16  18 18 18  20 20 20  24 24 24  25 25 25
-+27 27 27  30 30 30  32 32 32  35 35 35  35 35 35  39 39 39
-+41 41 41  43 43 43  46 46 46  43 43 43  176 168 138  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  238 238 238  138 129 110  65 65 65
-+52 52 52  65 65 65  52 52 52  65 65 65  65 65 65  163 154 123
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  249 249 249  249 249 249  230 228 210  66 66 66
-+52 52 52  65 65 65  52 52 52  65 65 65  52 52 52  65 65 65
-+65 65 65  66 66 66  231 230 220  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  255 255 255
-+66 66 66  52 52 52  65 65 65  52 52 52  65 65 65  65 65 65
-+185 178 149  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+163 154 123  52 52 52  65 65 65  52 52 52  65 65 65  52 52 52
-+65 65 65  200 196 176  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  66 66 66  65 65 65
-+52 52 52  65 65 65  63 58 50  65 65 65  52 52 52  65 65 65
-+66 66 66  200 196 176  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  249 249 249
-+231 230 220  66 66 66  52 52 52  65 65 65  52 52 52  65 65 65
-+52 52 52  65 65 65  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  52 52 52  65 65 65  52 52 52
-+65 65 65  52 52 52  65 65 65  52 52 52  65 65 65  52 52 52
-+200 196 176  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  200 196 176  65 65 65  52 52 52  65 65 65  52 52 52
-+49 49 49  138 129 110  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  163 154 123  45 45 45  43 43 43  41 41 41  39 39 39
-+35 35 35  35 35 35  32 32 32  30 30 30  27 27 27  25 25 25
-+24 24 24  20 20 20  18 18 18  16 16 16  14 14 14  12 12 12
-+10 10 10  8 8 8  6 6 6  5 5 5  3 3 3  2 2 2
-+1 1 1  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  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  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  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  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
-+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  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  0 0 0  0 0 0  1 1 1  3 3 3
-+4 4 4  5 5 5  7 7 7  9 9 9  11 11 11  13 13 13
-+15 14 14  17 17 17  19 19 19  21 21 21  24 24 24  26 26 26
-+28 28 28  30 30 30  33 33 33  35 35 35  38 38 38  41 41 41
-+43 43 43  45 45 45  47 47 47  140 134 120  249 249 249  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  238 238 238  66 66 66
-+65 65 65  65 65 65  52 52 52  65 65 65  52 52 52  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+65 65 65  52 52 52  65 65 65  52 52 52  65 65 65  52 52 52
-+65 65 65  231 230 220  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+238 238 238  66 66 66  66 66 66  65 65 65  52 52 52  65 65 65
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  138 129 110  50 50 50  65 65 65  65 65 65  65 65 65
-+52 52 52  231 230 220  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  231 229 217  65 65 65
-+52 52 52  65 65 65  52 52 52  65 65 65  52 52 52  65 65 65
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  230 228 210  65 65 65  65 65 65  65 65 65  52 52 52
-+65 65 65  52 52 52  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  65 65 65  52 52 52
-+65 65 65  65 65 65  52 52 52  65 65 65  65 65 65  192 187 164
-+249 249 249  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+200 196 176  66 66 66  65 65 65  65 65 65  65 65 65  65 65 65
-+66 66 66  238 238 238  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  138 129 110  43 43 43  43 43 43  41 41 41
-+38 38 38  35 35 35  33 33 33  30 30 30  28 28 28  26 26 26
-+24 24 24  21 21 21  19 19 19  17 17 17  15 14 14  13 13 13
-+11 11 11  9 9 9  7 7 7  5 5 5  4 4 4  3 3 3
-+1 1 1  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  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  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  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  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
-+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  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  0 0 0  1 1 1  2 2 2  3 3 3
-+4 4 4  6 6 6  8 8 8  9 9 9  11 11 11  13 13 13
-+16 16 16  18 18 18  20 20 20  22 22 22  25 25 25  27 27 27
-+30 30 30  32 32 32  35 35 35  37 37 37  39 39 39  42 42 42
-+43 43 43  45 45 45  65 65 65  238 238 238  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  238 238 238
-+185 178 149  140 134 120  138 129 110  66 66 66  138 129 110  66 66 66
-+138 129 110  140 134 120  200 196 176  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  200 196 176
-+52 52 52  65 65 65  65 65 65  65 65 65  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+200 196 176  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  192 187 164  231 230 220  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+140 134 120  52 52 52  65 65 65  65 65 65  52 52 52  65 65 65
-+176 168 138  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  249 249 249  200 196 176  176 168 138  140 134 120
-+140 134 120  140 134 120  140 134 120  176 168 138  230 228 210  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  192 187 164  65 65 65  65 65 65  65 65 65  52 52 52
-+200 196 176  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  192 187 164  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  176 168 138  200 196 176  238 238 238
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  200 196 176  65 65 65  65 65 65  52 52 52  65 65 65
-+65 65 65  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  238 238 238  185 178 149  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+230 227 205  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+238 238 238  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  200 196 176  238 238 238  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  249 249 249  138 129 110
-+65 65 65  52 52 52  65 65 65  65 65 65  52 52 52  138 129 110
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  231 230 220  176 168 138  140 134 120  138 129 110
-+66 66 66  138 129 110  66 66 66  138 129 110  176 168 138  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  255 255 255  140 134 120  52 52 52  65 65 65  65 65 65
-+65 65 65  65 65 65  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  65 65 65  66 66 66  140 134 120  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  231 230 220
-+66 66 66  65 65 65  65 65 65  65 65 65  65 65 65  66 66 66
-+200 196 176  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  249 249 249  200 196 176  140 134 120  140 134 120
-+66 66 66  138 129 110  66 66 66  138 129 110  140 134 120  185 178 149
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  238 238 238  65 65 65  43 43 43  42 42 42
-+39 39 39  37 37 37  35 35 35  32 32 32  30 30 30  27 27 27
-+25 25 25  22 22 22  20 20 20  18 18 18  16 16 16  13 13 13
-+11 11 11  9 9 9  8 8 8  6 6 6  4 4 4  3 3 3
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  1 1 1  2 2 2  3 3 3
-+5 5 5  6 6 6  8 8 8  10 10 10  12 12 12  14 14 14
-+16 16 16  18 18 18  21 21 21  24 24 24  26 26 26  28 28 28
-+30 30 30  33 33 33  35 35 35  38 38 38  41 41 41  43 43 43
-+45 45 45  48 48 47  176 168 138  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  163 154 123  66 66 66
-+65 65 65  65 65 65  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  65 65 65  66 66 66  230 228 210  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+138 129 110  52 52 52  65 65 65  65 65 65  65 65 65  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  65 65 65  140 134 120  238 238 238
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+238 238 238  65 65 65  65 65 65  65 65 65  65 65 65  66 66 66
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  200 196 176  66 66 66  66 66 66  65 65 65  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  65 65 65  66 66 66
-+231 230 220  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  238 238 238  66 66 66  65 65 65  65 65 65  65 65 65
-+200 196 176  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  65 65 65  66 66 66
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  66 66 66  66 66 66  66 66 66  65 65 65
-+65 65 65  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  176 168 138  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+192 187 164  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+231 230 220  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  230 228 210  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  192 187 164
-+65 65 65  65 65 65  65 65 65  52 52 52  65 65 65  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+238 238 238  138 129 110  65 65 65  52 52 52  65 65 65  65 65 65
-+66 66 66  66 66 66  66 66 66  66 66 66  65 65 65  66 66 66
-+138 129 110  231 230 220  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  238 238 238  66 66 66  66 66 66  65 65 65
-+65 65 65  65 65 65  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  65 65 65  65 65 65
-+52 52 52  65 65 65  65 65 65  140 134 120  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  231 230 220  66 66 66
-+66 66 66  65 65 65  65 65 65  65 65 65  65 65 65  138 129 110
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  200 196 176  66 66 66  66 66 66  66 66 66  65 65 65
-+66 66 66  66 66 66  66 66 66  65 65 65  65 65 65  65 65 65
-+66 66 66  176 168 138  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  163 154 123  47 47 47  43 43 43
-+41 41 41  38 38 38  35 35 35  33 33 33  30 30 30  28 28 28
-+26 26 26  24 24 24  21 21 21  18 18 18  16 16 16  14 14 14
-+12 12 12  10 10 10  8 8 8  6 6 6  5 5 5  3 3 3
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  1 1 1  2 2 2  3 3 3
-+5 5 5  7 7 7  9 9 9  10 10 10  13 13 13  15 14 14
-+17 17 17  19 19 19  21 21 21  24 24 24  26 26 26  30 30 30
-+32 32 32  35 35 35  37 37 37  39 39 39  42 42 42  43 43 43
-+47 47 47  47 47 47  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  249 249 249  140 134 120  66 66 66  66 66 66
-+65 65 65  65 65 65  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  65 65 65  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  249 249 249
-+192 187 164  65 65 65  65 65 65  65 65 65  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  65 65 65  65 65 65  66 66 66  66 66 66
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+249 249 249  138 129 110  52 52 52  65 65 65  65 65 65  140 134 120
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  231 230 220  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  140 134 120  65 65 65  65 65 65  52 52 52
-+200 196 176  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+231 229 217  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+65 65 65  200 196 176  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  176 168 138  66 66 66  65 65 65  65 65 65
-+65 65 65  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  176 168 138  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  238 238 238
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  238 238 238
-+52 52 52  65 65 65  66 66 66  66 66 66  66 66 66  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  65 65 65  65 65 65  65 65 65  65 65 65  65 65 65
-+66 66 66  66 66 66  66 66 66  65 65 65  65 65 65  65 65 65
-+65 65 65  66 66 66  231 230 220  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  140 134 120  65 65 65  65 65 65
-+65 65 65  65 65 65  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  65 65 65  65 65 65
-+65 65 65  65 65 65  140 134 120  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  238 238 238  66 66 66  66 66 66
-+65 65 65  65 65 65  65 65 65  65 65 65  52 52 52  192 187 164
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  65 65 65  65 65 65  65 65 65  65 65 65
-+65 65 65  66 66 66  140 134 120  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  249 249 249  238 238 238  50 50 50  43 43 43
-+42 42 42  39 39 39  37 37 37  35 35 35  32 32 32  30 30 30
-+26 26 26  24 24 24  21 21 21  19 19 19  17 17 17  15 14 14
-+13 13 13  10 10 10  9 9 9  7 7 7  5 5 5  3 3 3
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  1 1 1  2 2 2  4 4 4
-+5 5 5  7 7 7  9 9 9  11 11 11  13 13 13  16 16 16
-+17 17 17  20 20 20  22 22 22  25 25 25  27 27 27  30 30 30
-+32 32 32  35 35 35  38 38 38  41 41 41  43 43 43  45 45 45
-+49 49 49  138 129 110  238 238 238  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+238 238 238  65 65 65  65 65 65  65 65 65  65 65 65  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+140 134 120  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  185 178 149  65 65 65  65 65 65  65 65 65  192 187 164
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  140 134 120  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  176 168 138  65 65 65  65 65 65  66 66 66
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+65 65 65  138 129 110  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  192 187 164  65 65 65  65 65 65  65 65 65
-+65 65 65  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  176 168 138  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+231 230 220  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  185 178 149
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  66 66 66  65 65 65  66 66 66  185 178 149  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  163 154 123
-+66 66 66  66 66 66  66 66 66  66 66 66  65 65 65  65 65 65
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+65 65 65  66 66 66  138 129 110  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  200 196 176  65 65 65  65 65 65
-+66 66 66  66 66 66  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  66 66 66  66 66 66
-+65 65 65  138 129 110  238 238 238  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  238 238 238  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  65 65 65  65 65 65  65 65 65  238 238 238
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  238 238 238
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  66 66 66  200 196 176  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  66 66 66  52 52 52
-+45 45 45  41 41 41  38 38 38  35 35 35  32 32 32  30 30 30
-+27 27 27  25 25 25  22 22 22  20 20 20  17 17 17  15 14 14
-+13 13 13  11 11 11  9 9 9  7 7 7  5 5 5  4 4 4
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  1 1 1  3 3 3  4 4 4
-+5 5 5  7 7 7  9 9 9  11 11 11  13 13 13  16 16 16
-+18 18 18  20 20 20  24 24 24  25 25 25  28 28 28  30 30 30
-+33 33 33  35 35 35  39 39 39  41 41 41  43 43 43  46 46 46
-+47 47 47  140 134 120  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  140 134 120  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+185 178 149  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  66 66 66  66 66 66  66 66 66  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  200 196 176  65 65 65  65 65 65  52 52 52  230 228 210
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  230 228 210
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  192 187 164  65 65 65  65 65 65  65 65 65
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+65 65 65  52 52 52  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  200 196 176  66 66 66  65 65 65  66 66 66
-+66 66 66  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  140 134 120  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  65 65 65  140 134 120
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  66 66 66  66 66 66  66 66 66  200 196 176  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  52 52 52  230 228 210  255 255 255  255 255 255
-+255 255 255  255 255 255  249 249 249  238 238 238  66 66 66  66 66 66
-+66 66 66  66 66 66  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  176 168 138  66 66 66  66 66 66  66 66 66
-+66 66 66  238 238 238  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  238 238 238  138 129 110  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  249 249 249
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  192 187 164
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  52 52 52  138 129 110  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  176 168 138  49 49 49
-+45 45 45  41 41 41  38 38 38  35 35 35  33 33 33  30 30 30
-+28 28 28  25 25 25  24 24 24  20 20 20  18 18 18  16 16 16
-+13 13 13  11 11 11  9 9 9  7 7 7  5 5 5  4 4 4
-+3 3 3  1 1 1  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  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  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  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
-+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  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  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  1 1 1  3 3 3  4 4 4
-+6 6 6  8 8 8  10 10 10  12 12 12  14 14 14  16 16 16
-+18 18 18  21 21 21  24 24 24  26 26 26  28 28 28  30 30 30
-+35 35 35  37 37 37  39 39 39  42 42 42  45 45 45  47 47 47
-+52 52 52  200 196 176  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  66 66 66  65 65 65  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+138 129 110  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  140 134 120  66 66 66  66 66 66  66 66 66  231 229 217
-+249 249 249  249 249 249  255 255 255  255 255 255  255 255 255  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  231 229 217  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  238 238 238  66 66 66  66 66 66  66 66 66  238 238 238
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  192 187 164
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  200 196 176  66 66 66  66 66 66  65 65 65
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  200 196 176  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  176 168 138  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+192 187 164  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+231 230 220  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  138 129 110
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+138 129 110  65 65 65  66 66 66  66 66 66  238 238 238  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  230 228 210  65 65 65
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  176 168 138  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  66 66 66  66 66 66
-+66 66 66  66 66 66  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  66 66 66  66 66 66
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  138 129 110  50 50 50  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  140 134 120  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  140 134 120
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  65 65 65  238 238 238  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  192 187 164  47 47 47
-+45 45 45  42 42 42  39 39 39  37 37 37  35 35 35  30 30 30
-+28 28 28  26 26 26  24 24 24  21 21 21  18 18 18  16 16 16
-+14 14 14  12 12 12  10 10 10  8 8 8  6 6 6  4 4 4
-+3 3 3  1 1 1  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  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  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  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
-+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  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  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  1 1 1  2 2 2  3 3 3  4 4 4
-+6 6 6  8 8 8  10 10 10  12 12 12  14 14 14  16 16 16
-+19 19 19  21 21 21  24 24 24  26 26 26  30 30 30  32 32 32
-+35 35 35  37 37 37  41 41 41  43 43 43  45 45 45  47 47 47
-+45 45 45  231 229 217  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  231 230 220  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+66 66 66  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  185 178 149  66 66 66  66 66 66  65 65 65  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  192 187 164  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  66 66 66  66 66 66  65 65 65  249 249 249
-+249 249 249  255 255 255  255 255 255  255 255 255  249 249 249  185 178 149
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  200 196 176  66 66 66  66 66 66  65 65 65
-+200 196 176  249 249 249  255 255 255  255 255 255  249 249 249  249 249 249
-+231 230 220  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  200 196 176  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  238 238 238  255 255 255  255 255 255  255 255 255  249 249 249
-+249 249 249  176 168 138  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  52 52 52  138 129 110
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  66 66 66  66 66 66  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  185 178 149  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  65 65 65  140 134 120  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  138 129 110  66 66 66
-+66 66 66  65 65 65  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  66 66 66  231 229 217
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  238 238 238
-+138 129 110  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  176 168 138  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  200 196 176  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  231 230 220  49 49 49
-+45 45 45  43 43 43  41 41 41  37 37 37  35 35 35  32 32 32
-+30 30 30  26 26 26  24 24 24  21 21 21  19 19 19  16 16 16
-+14 14 14  12 12 12  10 10 10  8 8 8  6 6 6  4 4 4
-+3 3 3  2 2 2  1 1 1  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  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  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
-+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  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  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  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  1 1 1  2 2 2  3 3 3  4 4 4
-+6 6 6  8 8 8  10 10 10  12 12 12  14 14 14  17 17 17
-+19 19 19  21 21 21  24 24 24  27 27 27  30 30 30  32 32 32
-+35 35 35  38 38 38  41 41 41  43 43 43  46 46 46  49 49 49
-+50 50 50  238 238 238  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  200 196 176  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  192 187 164  66 66 66  66 66 66  66 66 66  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+65 65 65  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  192 187 164  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  66 66 66  66 66 66  66 66 66  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  238 238 238
-+231 230 220  231 230 220  231 230 220  231 230 220  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  231 230 220  231 230 220  231 230 220
-+231 230 220  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  66 66 66  66 66 66
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  200 196 176  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  176 168 138  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+192 187 164  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+231 230 220  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  138 129 110
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+138 129 110  65 65 65  66 66 66  138 129 110  249 249 249  249 249 249
-+255 255 255  255 255 255  255 255 255  249 249 249  140 134 120  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  65 65 65  138 129 110  238 238 238  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  140 134 120  65 65 65
-+66 66 66  66 66 66  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  140 134 120  249 249 249
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  140 134 120
-+65 65 65  65 65 65  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  192 187 164  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  200 196 176  249 249 249
-+255 255 255  255 255 255  255 255 255  249 249 249  238 238 238  43 43 43
-+46 46 46  43 43 43  41 41 41  38 38 38  35 35 35  32 32 32
-+30 30 30  27 27 27  24 24 24  21 21 21  19 19 19  17 17 17
-+14 14 14  12 12 12  10 10 10  8 8 8  6 6 6  4 4 4
-+3 3 3  2 2 2  1 1 1  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  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  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
-+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  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  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  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  1 1 1  2 2 2  3 3 3  4 4 4
-+6 6 6  8 8 8  10 10 10  12 12 12  15 14 14  17 17 17
-+19 19 19  22 22 22  25 25 25  27 27 27  30 30 30  32 32 32
-+35 35 35  38 38 38  41 41 41  43 43 43  46 46 46  49 49 49
-+50 50 50  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  192 187 164  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+65 65 65  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  200 196 176  66 66 66  66 66 66  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+65 65 65  176 168 138  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  66 66 66  66 66 66  66 66 66  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+249 249 249  238 238 238  249 249 249  238 238 238  249 249 249  238 238 238
-+249 249 249  238 238 238  249 249 249  238 238 238  249 249 249  249 249 249
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  200 196 176  66 66 66  66 66 66  66 66 66
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  200 196 176  255 255 255  255 255 255  255 255 255
-+249 249 249  249 249 249  231 229 217  66 66 66  66 66 66  66 66 66
-+66 66 66  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  140 134 120  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  52 52 52  138 129 110
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  66 66 66  66 66 66  66 66 66  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  140 134 120  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  140 134 120  66 66 66
-+66 66 66  66 66 66  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  192 187 164  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  231 230 220  66 66 66
-+65 65 65  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  200 196 176  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  238 238 238  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  65 65 65  192 187 164  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  49 49 49
-+46 46 46  43 43 43  41 41 41  38 38 38  35 35 35  32 32 32
-+30 30 30  27 27 27  25 25 25  22 22 22  19 19 19  17 17 17
-+15 14 14  12 12 12  10 10 10  8 8 8  6 6 6  4 4 4
-+3 3 3  2 2 2  1 1 1  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  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  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
-+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  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  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  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  1 1 1  2 2 2  3 3 3  4 4 4
-+6 6 6  8 8 8  10 10 10  13 13 13  15 14 14  17 17 17
-+20 20 20  22 22 22  25 25 25  27 27 27  30 30 30  32 32 32
-+35 35 35  38 38 38  41 41 41  43 43 43  46 46 46  49 49 49
-+52 52 52  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  192 187 164  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  238 238 238  249 249 249  255 255 255  255 255 255  255 255 255
-+249 249 249  200 196 176  66 66 66  66 66 66  66 66 66  231 230 220
-+238 238 238  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  176 168 138  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  66 66 66  66 66 66  66 66 66  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  140 134 120  65 65 65  66 66 66  66 66 66
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  200 196 176  249 249 249  255 255 255  255 255 255
-+255 255 255  249 249 249  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  176 168 138  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+192 187 164  249 249 249  249 249 249  255 255 255  255 255 255  249 249 249
-+231 230 220  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  138 129 110
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+138 129 110  65 65 65  66 66 66  140 134 120  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  140 134 120  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  140 134 120  66 66 66
-+66 66 66  66 66 66  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  200 196 176  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  200 196 176  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  200 196 176  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  238 238 238  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  65 65 65  192 187 164  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  47 47 47
-+46 46 46  43 43 43  41 41 41  38 38 38  35 35 35  32 32 32
-+30 30 30  27 27 27  25 25 25  22 22 22  19 19 19  17 17 17
-+15 14 14  13 13 13  10 10 10  8 8 8  6 6 6  4 4 4
-+3 3 3  2 2 2  1 1 1  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  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  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
-+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  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  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  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  1 1 1  2 2 2  3 3 3  4 4 4
-+6 6 6  8 8 8  10 10 10  13 13 13  15 14 14  17 17 17
-+20 20 20  22 22 22  25 25 25  27 27 27  30 30 30  33 33 33
-+35 35 35  38 38 38  41 41 41  43 43 43  46 46 46  49 49 49
-+50 50 50  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+249 249 249  192 187 164  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+65 65 65  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  200 196 176  66 66 66  66 66 66  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  140 134 120  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  138 129 110  66 66 66  66 66 66  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  200 196 176  65 65 65  65 65 65  66 66 66  65 65 65
-+200 196 176  249 249 249  255 255 255  255 255 255  249 249 249  249 249 249
-+231 230 220  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  200 196 176  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+238 238 238  176 168 138  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  52 52 52  138 129 110
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  66 66 66  52 52 52  138 129 110  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  140 134 120  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  65 65 65  138 129 110  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  163 154 123  66 66 66
-+66 66 66  66 66 66  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  192 187 164  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  200 196 176  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  238 238 238  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  65 65 65  65 65 65  192 187 164  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  49 49 49
-+46 46 46  43 43 43  41 41 41  38 38 38  35 35 35  32 32 32
-+30 30 30  27 27 27  25 25 25  22 22 22  20 20 20  17 17 17
-+15 14 14  13 13 13  10 10 10  8 8 8  6 6 6  4 4 4
-+3 3 3  2 2 2  1 1 1  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  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  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
-+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  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  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  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  1 1 1  2 2 2  3 3 3  4 4 4
-+6 6 6  8 8 8  10 10 10  13 13 13  15 14 14  17 17 17
-+20 20 20  22 22 22  25 25 25  27 27 27  30 30 30  32 32 32
-+35 35 35  38 38 38  41 41 41  43 43 43  46 46 46  49 49 49
-+52 52 52  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  192 187 164  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+65 65 65  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  200 196 176  66 66 66  66 66 66  66 66 66  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+65 65 65  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  192 187 164  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  66 66 66  66 66 66  66 66 66  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+192 187 164  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+200 196 176  249 249 249  249 249 249  255 255 255  255 255 255  249 249 249
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  200 196 176  249 249 249  249 249 249  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  176 168 138  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+192 187 164  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+231 230 220  65 65 65  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  138 129 110
-+238 238 238  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+138 129 110  65 65 65  66 66 66  138 129 110  238 238 238  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  140 134 120  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  140 134 120  66 66 66
-+66 66 66  66 66 66  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  140 134 120  238 238 238
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  200 196 176  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  238 238 238  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  65 65 65  192 187 164  249 249 249
-+249 249 249  255 255 255  255 255 255  255 255 255  238 238 238  50 50 50
-+46 46 46  43 43 43  41 41 41  38 38 38  35 35 35  32 32 32
-+30 30 30  27 27 27  25 25 25  22 22 22  19 19 19  17 17 17
-+15 14 14  13 13 13  10 10 10  8 8 8  6 6 6  4 4 4
-+3 3 3  2 2 2  1 1 1  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  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  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
-+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  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  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  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  1 1 1  2 2 2  3 3 3  4 4 4
-+6 6 6  8 8 8  10 10 10  12 12 12  15 14 14  17 17 17
-+19 19 19  22 22 22  25 25 25  27 27 27  30 30 30  32 32 32
-+35 35 35  38 38 38  41 41 41  43 43 43  46 46 46  49 49 49
-+52 52 52  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  200 196 176  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+249 249 249  192 187 164  66 66 66  66 66 66  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+65 65 65  192 187 164  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  66 66 66  66 66 66  66 66 66  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  185 178 149
-+65 65 65  65 65 65  65 65 65  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  65 65 65  65 65 65  65 65 65  65 65 65
-+65 65 65  66 66 66  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  200 196 176  255 255 255  255 255 255  255 255 255
-+249 249 249  249 249 249  231 229 217  66 66 66  66 66 66  66 66 66
-+66 66 66  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  140 134 120  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  52 52 52  138 129 110
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  66 66 66  66 66 66  66 66 66  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  140 134 120  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  138 129 110  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  140 134 120  66 66 66
-+66 66 66  66 66 66  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  52 52 52  230 228 210
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+192 187 164  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  192 187 164  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  65 65 65  65 65 65  200 196 176  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  238 238 238  49 49 49
-+46 46 46  43 43 43  41 41 41  38 38 38  35 35 35  32 32 32
-+30 30 30  27 27 27  25 25 25  22 22 22  19 19 19  17 17 17
-+15 14 14  12 12 12  10 10 10  8 8 8  6 6 6  4 4 4
-+3 3 3  2 2 2  1 1 1  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  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  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
-+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  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  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  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  1 1 1  2 2 2  3 3 3  4 4 4
-+6 6 6  8 8 8  10 10 10  12 12 12  14 14 14  17 17 17
-+19 19 19  21 21 21  24 24 24  27 27 27  30 30 30  32 32 32
-+35 35 35  38 38 38  41 41 41  43 43 43  46 46 46  48 48 47
-+50 50 50  230 228 210  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  231 230 220  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  140 134 120  66 66 66  66 66 66  66 66 66  231 230 220
-+238 238 238  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+65 65 65  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  200 196 176  249 249 249  249 249 249  255 255 255  255 255 255
-+255 255 255  238 238 238  66 66 66  66 66 66  66 66 66  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  192 187 164
-+65 65 65  65 65 65  66 66 66  65 65 65  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  200 196 176  249 249 249  255 255 255  255 255 255
-+255 255 255  249 249 249  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  176 168 138  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+192 187 164  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+231 230 220  65 65 65  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  138 129 110
-+238 238 238  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+138 129 110  65 65 65  66 66 66  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  192 187 164  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  140 134 120  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  138 129 110  65 65 65
-+65 65 65  66 66 66  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  66 66 66  66 66 66
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  185 178 149  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  185 178 149  249 249 249
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  65 65 65  231 230 220  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  200 196 176  52 52 52
-+47 47 47  43 43 43  41 41 41  37 37 37  35 35 35  32 32 32
-+30 30 30  27 27 27  24 24 24  21 21 21  19 19 19  17 17 17
-+14 14 14  12 12 12  10 10 10  8 8 8  6 6 6  4 4 4
-+3 3 3  2 2 2  1 1 1  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  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  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
-+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  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  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  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  1 1 1  2 2 2  3 3 3  4 4 4
-+6 6 6  8 8 8  10 10 10  12 12 12  14 14 14  16 16 16
-+19 19 19  21 21 21  24 24 24  26 26 26  30 30 30  32 32 32
-+35 35 35  37 37 37  41 41 41  43 43 43  45 45 45  49 49 49
-+47 47 47  200 196 176  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  238 238 238  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+140 134 120  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  140 134 120  66 66 66  66 66 66  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+65 65 65  231 230 220  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  231 229 217  66 66 66  66 66 66  66 66 66  238 238 238
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+65 65 65  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+200 196 176  249 249 249  255 255 255  255 255 255  249 249 249  249 249 249
-+231 230 220  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  200 196 176  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+238 238 238  176 168 138  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  52 52 52  138 129 110
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  66 66 66  66 66 66  66 66 66  238 238 238  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  231 230 220  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  65 65 65  192 187 164  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  66 66 66  65 65 65
-+66 66 66  66 66 66  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  176 168 138  66 66 66  66 66 66  65 65 65
-+138 129 110  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  238 238 238  176 168 138  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  140 134 120  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  140 134 120
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  238 238 238  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  192 187 164  49 49 49
-+45 45 45  43 43 43  41 41 41  37 37 37  35 35 35  32 32 32
-+30 30 30  26 26 26  24 24 24  21 21 21  19 19 19  16 16 16
-+14 14 14  12 12 12  10 10 10  8 8 8  6 6 6  4 4 4
-+3 3 3  2 2 2  1 1 1  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  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  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
-+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  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  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  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  1 1 1  3 3 3  4 4 4
-+6 6 6  8 8 8  10 10 10  12 12 12  14 14 14  16 16 16
-+18 18 18  21 21 21  24 24 24  26 26 26  28 28 28  30 30 30
-+35 35 35  37 37 37  39 39 39  42 42 42  45 45 45  47 47 47
-+50 50 50  163 154 123  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  65 65 65  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  66 66 66  66 66 66  66 66 66  66 66 66  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+65 65 65  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  200 196 176  66 66 66  66 66 66  66 66 66  230 228 210
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  231 230 220
-+65 65 65  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+200 196 176  249 249 249  249 249 249  255 255 255  255 255 255  249 249 249
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  200 196 176  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  176 168 138  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+192 187 164  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+231 230 220  65 65 65  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  138 129 110
-+238 238 238  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+138 129 110  65 65 65  66 66 66  66 66 66  230 228 210  249 249 249
-+255 255 255  255 255 255  255 255 255  249 249 249  249 249 249  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  238 238 238  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  231 230 220  66 66 66  66 66 66
-+66 66 66  66 66 66  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  66 66 66  66 66 66
-+65 65 65  138 129 110  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  249 249 249  140 134 120  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  140 134 120  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  140 134 120  50 50 50
-+46 46 46  42 42 42  39 39 39  35 35 35  35 35 35  30 30 30
-+28 28 28  26 26 26  24 24 24  21 21 21  18 18 18  16 16 16
-+14 14 14  11 11 11  9 9 9  8 8 8  6 6 6  4 4 4
-+3 3 3  1 1 1  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  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  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  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
-+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  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  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  1 1 1  3 3 3  4 4 4
-+5 5 5  7 7 7  9 9 9  11 11 11  13 13 13  16 16 16
-+18 18 18  20 20 20  24 24 24  25 25 25  28 28 28  30 30 30
-+33 33 33  35 35 35  38 38 38  41 41 41  45 45 45  46 46 46
-+39 39 39  138 129 110  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  231 230 220  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+238 238 238  66 66 66  66 66 66  66 66 66  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+185 178 149  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  176 168 138  65 65 65  65 65 65  65 65 65  192 187 164
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  249 249 249
-+66 66 66  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+200 196 176  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  200 196 176  249 249 249  255 255 255  255 255 255
-+249 249 249  249 249 249  231 229 217  66 66 66  66 66 66  66 66 66
-+66 66 66  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  140 134 120  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  52 52 52  138 129 110
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  66 66 66  66 66 66  66 66 66  163 154 123  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  192 187 164
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  140 134 120  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  249 249 249  192 187 164  66 66 66  66 66 66
-+66 66 66  66 66 66  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  66 66 66  65 65 65
-+65 65 65  50 50 50  138 129 110  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  140 134 120  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  238 238 238
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  65 65 65  231 230 220  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  66 66 66  47 47 47
-+43 43 43  41 41 41  38 38 38  35 35 35  33 33 33  30 30 30
-+28 28 28  25 25 25  24 24 24  20 20 20  18 18 18  16 16 16
-+13 13 13  11 11 11  9 9 9  7 7 7  5 5 5  4 4 4
-+3 3 3  1 1 1  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  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  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  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
-+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  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  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  1 1 1  3 3 3  4 4 4
-+5 5 5  7 7 7  9 9 9  11 11 11  13 13 13  15 14 14
-+17 17 17  20 20 20  22 22 22  25 25 25  27 27 27  30 30 30
-+32 32 32  35 35 35  38 38 38  41 41 41  43 43 43  45 45 45
-+47 47 47  45 45 45  238 238 238  249 249 249  255 255 255  255 255 255
-+255 255 255  249 249 249  249 249 249  185 178 149  65 65 65  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  238 238 238
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+185 178 149  66 66 66  66 66 66  66 66 66  66 66 66  231 230 220
-+238 238 238  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+65 65 65  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  138 129 110
-+238 238 238  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  66 66 66  66 66 66  66 66 66  65 65 65  140 134 120
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+192 187 164  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+200 196 176  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  200 196 176  249 249 249  255 255 255  255 255 255
-+255 255 255  249 249 249  200 196 176  65 65 65  66 66 66  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  176 168 138  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+192 187 164  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+231 230 220  65 65 65  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  138 129 110
-+238 238 238  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+138 129 110  65 65 65  66 66 66  66 66 66  66 66 66  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+140 134 120  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  138 129 110  238 238 238  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  138 129 110  65 65 65  66 66 66
-+66 66 66  66 66 66  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  66 66 66  66 66 66
-+65 65 65  65 65 65  65 65 65  140 134 120  249 249 249  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  140 134 120
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+231 230 220  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  192 187 164  249 249 249  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  231 230 220  52 52 52  49 49 49
-+43 43 43  41 41 41  38 38 38  35 35 35  32 32 32  30 30 30
-+27 27 27  25 25 25  22 22 22  20 20 20  17 17 17  15 14 14
-+13 13 13  11 11 11  9 9 9  7 7 7  5 5 5  4 4 4
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  1 1 1  2 2 2  3 3 3
-+5 5 5  7 7 7  9 9 9  10 10 10  13 13 13  15 14 14
-+17 17 17  19 19 19  21 21 21  24 24 24  26 26 26  30 30 30
-+30 30 30  35 35 35  37 37 37  39 39 39  42 42 42  43 43 43
-+49 49 49  52 52 52  140 134 120  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  249 249 249  249 249 249  200 196 176  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  65 65 65  138 129 110  238 238 238  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  140 134 120  238 238 238
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+249 249 249  185 178 149  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+200 196 176  249 249 249  255 255 255  255 255 255  249 249 249  249 249 249
-+231 229 217  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  200 196 176  249 249 249  255 255 255  255 255 255
-+255 255 255  249 249 249  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+238 238 238  176 168 138  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  52 52 52  138 129 110
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  65 65 65  66 66 66  66 66 66  66 66 66  230 227 205
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+238 238 238  176 168 138  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+140 134 120  238 238 238  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  238 238 238  65 65 65  65 65 65  65 65 65
-+66 66 66  66 66 66  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  66 66 66  65 65 65
-+65 65 65  65 65 65  65 65 65  52 52 52  140 134 120  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  238 238 238
-+140 134 120  66 66 66  66 66 66  66 66 66  52 52 52  138 129 110
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  231 230 220  138 129 110  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  200 196 176  249 249 249  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  140 134 120  47 47 47  45 45 45
-+42 42 42  39 39 39  37 37 37  35 35 35  30 30 30  30 30 30
-+26 26 26  24 24 24  21 21 21  19 19 19  17 17 17  15 14 14
-+13 13 13  10 10 10  8 8 8  6 6 6  5 5 5  3 3 3
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  1 1 1  2 2 2  3 3 3
-+5 5 5  6 6 6  8 8 8  10 10 10  12 12 12  14 14 14
-+16 16 16  18 18 18  21 21 21  24 24 24  26 26 26  28 28 28
-+30 30 30  33 33 33  35 35 35  38 38 38  41 41 41  43 43 43
-+45 45 45  50 50 50  65 65 65  238 238 238  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  249 249 249  249 249 249
-+200 196 176  140 134 120  140 134 120  66 66 66  138 129 110  66 66 66
-+140 134 120  176 168 138  231 230 220  238 238 238  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  249 249 249  238 238 238
-+192 187 164  192 187 164  200 196 176  192 187 164  200 196 176  192 187 164
-+192 187 164  200 196 176  200 196 176  238 238 238  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+138 129 110  65 65 65  65 65 65  65 65 65  65 65 65  66 66 66
-+200 196 176  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  249 249 249  200 196 176  192 187 164  192 187 164
-+192 187 164  192 187 164  192 187 164  192 187 164  192 187 164  192 187 164
-+192 187 164  192 187 164  192 187 164  192 187 164  192 187 164  192 187 164
-+192 187 164  176 168 138  65 65 65  65 65 65  65 65 65  65 65 65
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+200 196 176  65 65 65  65 65 65  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  65 65 65  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  200 196 176  249 249 249  249 249 249  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  140 134 120  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  65 65 65  65 65 65  65 65 65
-+192 187 164  238 238 238  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  52 52 52  66 66 66  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  65 65 65  65 65 65  65 65 65  138 129 110
-+238 238 238  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+138 129 110  65 65 65  65 65 65  66 66 66  65 65 65  138 129 110
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  249 249 249  238 238 238  200 196 176  140 134 120  138 129 110
-+66 66 66  140 134 120  66 66 66  140 134 120  192 187 164  238 238 238
-+249 249 249  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  66 66 66  65 65 65
-+65 65 65  65 65 65  65 65 65  65 65 65  65 65 65  140 134 120
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  138 129 110  65 65 65  65 65 65  66 66 66  52 52 52
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  249 249 249  230 228 210  163 154 123  140 134 120
-+138 129 110  66 66 66  138 129 110  138 129 110  140 134 120  200 196 176
-+249 249 249  255 255 255  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  238 238 238  52 52 52  47 47 47  43 43 43
-+41 41 41  38 38 38  35 35 35  33 33 33  30 30 30  28 28 28
-+25 25 25  24 24 24  21 21 21  18 18 18  16 16 16  14 14 14
-+12 12 12  10 10 10  8 8 8  6 6 6  4 4 4  3 3 3
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  1 1 1  2 2 2  3 3 3
-+4 4 4  6 6 6  8 8 8  9 9 9  11 11 11  13 13 13
-+16 16 16  18 18 18  20 20 20  22 22 22  25 25 25  27 27 27
-+30 30 30  32 32 32  33 33 33  37 37 37  39 39 39  41 41 41
-+45 45 45  46 46 46  41 41 41  138 129 110  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  249 249 249  249 249 249  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  238 238 238  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  249 249 249
-+249 249 249  238 238 238  249 249 249  238 238 238  249 249 249  238 238 238
-+249 249 249  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  192 187 164
-+52 52 52  65 65 65  52 52 52  65 65 65  65 65 65  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  249 249 249  249 249 249
-+249 249 249  249 249 249  249 249 249  249 249 249  249 249 249  249 249 249
-+249 249 249  249 249 249  249 249 249  249 249 249  249 249 249  249 249 249
-+238 238 238  231 230 220  65 65 65  65 65 65  65 65 65  65 65 65
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+200 196 176  65 65 65  52 52 52  65 65 65  65 65 65  52 52 52
-+65 65 65  52 52 52  65 65 65  52 52 52  65 65 65  52 52 52
-+65 65 65  52 52 52  200 196 176  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  65 65 65  65 65 65
-+65 65 65  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  176 168 138  66 66 66  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  65 65 65  65 65 65  65 65 65  52 52 52
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  65 65 65  65 65 65  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  65 65 65  65 65 65  47 47 47  138 129 110
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  52 52 52  65 65 65  65 65 65  65 65 65  52 52 52
-+176 168 138  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  249 249 249  249 249 249  249 249 249  249 249 249
-+255 255 255  255 255 255  255 255 255  249 249 249  249 249 249  249 249 249
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  200 196 176  52 52 52  65 65 65  52 52 52  65 65 65
-+65 65 65  65 65 65  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  52 52 52  65 65 65  65 65 65  66 66 66
-+140 134 120  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+238 238 238  238 238 238  138 129 110  65 65 65  66 66 66  66 66 66
-+66 66 66  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  249 249 249  249 249 249  249 249 249  249 249 249
-+249 249 249  249 249 249  249 249 249  249 249 249  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  238 238 238  138 129 110  47 47 47  43 43 43  42 42 42
-+39 39 39  37 37 37  35 35 35  32 32 32  30 30 30  27 27 27
-+25 25 25  22 22 22  20 20 20  18 18 18  16 16 16  13 13 13
-+11 11 11  9 9 9  8 8 8  6 6 6  4 4 4  3 3 3
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  0 0 0  1 1 1  3 3 3
-+4 4 4  5 5 5  7 7 7  9 9 9  11 11 11  13 13 13
-+15 14 14  17 17 17  19 19 19  21 21 21  24 24 24  26 26 26
-+28 28 28  30 30 30  33 33 33  35 35 35  38 38 38  39 39 39
-+42 42 42  45 45 45  46 46 46  45 45 45  140 134 120  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  238 238 238  138 129 110  52 52 52
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  231 230 220
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+249 249 249  255 255 255  249 249 249  255 255 255  249 249 249  255 255 255
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  200 196 176  66 66 66
-+65 65 65  52 52 52  65 65 65  52 52 52  65 65 65  65 65 65
-+66 66 66  140 134 120  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  255 255 255  249 249 249  255 255 255  249 249 249
-+255 255 255  249 249 249  255 255 255  249 249 249  249 249 249  249 249 249
-+249 249 249  231 230 220  52 52 52  65 65 65  52 52 52  65 65 65
-+200 196 176  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+200 196 176  65 65 65  65 65 65  52 52 52  65 65 65  65 65 65
-+52 52 52  65 65 65  65 65 65  65 65 65  52 52 52  65 65 65
-+65 65 65  52 52 52  200 196 176  249 249 249  249 249 249  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  65 65 65  65 65 65
-+52 52 52  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  140 134 120  66 66 66  65 65 65  65 65 65  52 52 52
-+65 65 65  52 52 52  65 65 65  65 65 65  52 52 52  65 65 65
-+192 187 164  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+231 230 220  52 52 52  65 65 65  52 52 52  65 65 65  52 52 52
-+65 65 65  52 52 52  65 65 65  65 65 65  52 52 52  66 66 66
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+138 129 110  52 52 52  65 65 65  52 52 52  52 52 52  65 65 65
-+65 65 65  192 187 164  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+230 227 205  66 66 66  65 65 65  65 65 65  52 52 52  65 65 65
-+52 52 52  65 65 65  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  65 65 65  52 52 52
-+52 52 52  65 65 65  65 65 65  52 52 52  65 65 65  65 65 65
-+65 65 65  176 168 138  249 249 249  255 255 255  255 255 255  255 255 255
-+249 249 249  249 249 249  238 238 238  66 66 66  66 66 66  65 65 65
-+65 65 65  66 66 66  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  255 255 255  249 249 249
-+255 255 255  255 255 255  249 249 249  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  140 134 120  39 39 39  41 41 41  42 42 42  41 41 41
-+38 38 38  35 35 35  33 33 33  30 30 30  28 28 28  26 26 26
-+24 24 24  21 21 21  19 19 19  17 17 17  15 14 14  13 13 13
-+11 11 11  9 9 9  7 7 7  5 5 5  4 4 4  3 3 3
-+1 1 1  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  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  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  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  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
-+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  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  0 0 0  0 0 0  1 1 1  2 2 2
-+3 3 3  5 5 5  6 6 6  8 8 8  10 10 10  12 12 12
-+14 14 14  16 16 16  18 18 18  20 20 20  24 24 24  25 25 25
-+27 27 27  30 30 30  32 32 32  35 35 35  35 35 35  38 38 38
-+41 41 41  43 43 43  45 45 45  45 45 45  65 65 65  66 66 66
-+231 230 220  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  52 52 52  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  65 65 65  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  249 249 249  176 168 138  65 65 65  52 52 52
-+52 52 52  65 65 65  52 52 52  65 65 65  52 52 52  52 52 52
-+52 52 52  52 52 52  138 129 110  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  231 230 220  65 65 65  52 52 52  65 65 65  52 52 52
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+200 196 176  65 65 65  52 52 52  65 65 65  52 52 52  65 65 65
-+52 52 52  65 65 65  52 52 52  52 52 52  65 65 65  52 52 52
-+65 65 65  52 52 52  200 196 176  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  200 196 176  52 52 52  65 65 65  52 52 52
-+65 65 65  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  176 168 138  65 65 65  65 65 65  52 52 52  65 65 65
-+65 65 65  52 52 52  65 65 65  52 52 52  65 65 65  52 52 52
-+192 187 164  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  65 65 65  52 52 52  65 65 65  65 65 65  52 52 52
-+65 65 65  65 65 65  52 52 52  52 52 52  65 65 65  138 129 110
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  52 52 52  52 52 52  65 65 65  65 65 65  52 52 52
-+52 52 52  65 65 65  140 134 120  238 238 238  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  176 168 138
-+65 65 65  52 52 52  65 65 65  52 52 52  65 65 65  52 52 52
-+65 65 65  52 52 52  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  52 52 52  65 65 65  52 52 52
-+65 65 65  52 52 52  52 52 52  65 65 65  52 52 52  52 52 52
-+65 65 65  52 52 52  185 178 149  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  249 249 249  249 249 249  66 66 66  65 65 65
-+66 66 66  66 66 66  66 66 66  200 196 176  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  238 238 238
-+66 66 66  47 47 47  45 45 45  42 42 42  41 41 41  38 38 38
-+35 35 35  33 33 33  32 32 32  30 30 30  27 27 27  25 25 25
-+24 24 24  20 20 20  18 18 18  16 16 16  14 14 14  12 12 12
-+10 10 10  8 8 8  6 6 6  5 5 5  3 3 3  2 2 2
-+1 1 1  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  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  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  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  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
-+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  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  0 0 0  0 0 0  1 1 1  2 2 2
-+3 3 3  4 4 4  6 6 6  8 8 8  9 9 9  11 11 11
-+13 13 13  15 14 14  17 17 17  20 20 20  21 21 21  24 24 24
-+26 26 26  28 28 28  30 30 30  32 32 32  35 35 35  37 37 37
-+39 39 39  41 41 41  43 43 43  45 45 45  47 47 47  52 52 52
-+52 52 52  140 134 120  200 196 176  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  238 238 238
-+192 187 164  138 129 110  52 52 52  66 66 66  66 66 66  65 65 65
-+65 65 65  65 65 65  66 66 66  66 66 66  66 66 66  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+231 230 220  185 178 149  66 66 66  65 65 65  52 52 52  52 52 52
-+65 65 65  50 50 50  52 52 52  52 52 52  52 52 52  65 65 65
-+52 52 52  52 52 52  52 52 52  66 66 66  185 178 149  238 238 238
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  231 230 220  50 50 50  52 52 52  65 65 65  52 52 52
-+200 196 176  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+200 196 176  65 65 65  52 52 52  52 52 52  52 52 52  52 52 52
-+65 65 65  52 52 52  52 52 52  65 65 65  52 52 52  52 52 52
-+52 52 52  52 52 52  200 196 176  249 249 249  249 249 249  255 255 255
-+255 255 255  255 255 255  200 196 176  65 65 65  52 52 52  65 65 65
-+52 52 52  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  140 134 120  65 65 65  52 52 52  52 52 52  52 52 52
-+52 52 52  65 65 65  52 52 52  52 52 52  52 52 52  52 52 52
-+192 187 164  238 238 238  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  47 47 47  52 52 52  52 52 52  52 52 52  65 65 65
-+52 52 52  52 52 52  65 65 65  52 52 52  52 52 52  138 129 110
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  66 66 66  65 65 65  52 52 52  52 52 52  65 65 65
-+52 52 52  52 52 52  65 65 65  66 66 66  163 154 123  231 230 220
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  231 230 220  176 168 138  66 66 66  65 65 65
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  65 65 65  52 52 52  52 52 52
-+65 65 65  52 52 52  52 52 52  52 52 52  65 65 65  52 52 52
-+52 52 52  52 52 52  65 65 65  192 187 164  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  238 238 238  66 66 66
-+65 65 65  65 65 65  65 65 65  52 52 52  138 129 110  192 187 164
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  200 196 176  140 134 120  49 49 49
-+52 52 52  52 52 52  43 43 43  41 41 41  39 39 39  37 37 37
-+35 35 35  32 32 32  30 30 30  28 28 28  26 26 26  24 24 24
-+21 21 21  19 19 19  17 17 17  15 14 14  13 13 13  11 11 11
-+9 9 9  8 8 8  6 6 6  4 4 4  3 3 3  2 2 2
-+1 1 1  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  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  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  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  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
-+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  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  0 0 0  0 0 0  1 1 1  1 1 1
-+3 3 3  4 4 4  5 5 5  7 7 7  9 9 9  10 10 10
-+12 12 12  14 14 14  16 16 16  18 18 18  20 20 20  22 22 22
-+25 25 25  27 27 27  30 30 30  30 30 30  33 33 33  35 35 35
-+37 37 37  39 39 39  41 41 41  43 43 43  45 45 45  49 49 49
-+47 47 47  49 49 49  52 52 52  66 66 66  66 66 66  140 134 120
-+176 168 138  192 187 164  192 187 164  231 229 217  231 230 220  200 196 176
-+192 187 164  192 187 164  140 134 120  140 134 120  66 66 66  65 65 65
-+52 52 52  52 52 52  65 65 65  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  65 65 65  66 66 66  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  231 230 220
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  138 129 110  66 66 66
-+52 52 52  52 52 52  65 65 65  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+66 66 66  138 129 110  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  52 52 52  52 52 52  52 52 52  43 43 43
-+138 129 110  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  52 52 52  52 52 52  52 52 52  65 65 65  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  65 65 65
-+52 52 52  47 47 47  138 129 110  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  138 129 110  65 65 65  52 52 52  52 52 52
-+52 52 52  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  66 66 66  52 52 52  52 52 52  65 65 65  52 52 52
-+65 65 65  52 52 52  52 52 52  52 52 52  65 65 65  66 66 66
-+66 66 66  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  52 52 52  52 52 52  65 65 65  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  66 66 66
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+66 66 66  65 65 65  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+65 65 65  138 129 110  140 134 120  185 178 149  192 187 164  192 187 164
-+230 228 210  231 230 220  200 196 176  192 187 164  192 187 164  140 134 120
-+140 134 120  66 66 66  52 52 52  65 65 65  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  65 65 65  52 52 52  65 65 65
-+52 52 52  52 52 52  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  66 66 66  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  65 65 65  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  138 129 110
-+52 52 52  52 52 52  52 52 52  52 52 52  46 46 46  50 50 50
-+65 65 65  66 66 66  140 134 120  140 134 120  192 187 164  192 187 164
-+200 196 176  230 228 210  231 229 217  192 187 164  192 187 164  176 168 138
-+140 134 120  138 129 110  52 52 52  49 49 49  45 45 45  46 46 46
-+45 45 45  43 43 43  41 41 41  39 39 39  37 37 37  35 35 35
-+33 33 33  30 30 30  28 28 28  26 26 26  25 25 25  22 22 22
-+20 20 20  18 18 18  16 16 16  14 14 14  12 12 12  10 10 10
-+9 9 9  7 7 7  5 5 5  4 4 4  3 3 3  1 1 1
-+1 1 1  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  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  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  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  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
-+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  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  0 0 0  0 0 0  0 0 0  1 1 1
-+2 2 2  3 3 3  5 5 5  6 6 6  8 8 8  10 10 10
-+11 11 11  13 13 13  15 14 14  17 17 17  19 19 19  21 21 21
-+24 24 24  25 25 25  27 27 27  30 30 30  30 30 30  33 33 33
-+35 35 35  37 37 37  39 39 39  41 41 41  42 42 42  43 43 43
-+45 45 45  46 46 46  47 47 47  52 52 52  65 65 65  52 52 52
-+47 47 47  45 45 45  46 46 46  46 46 46  49 49 49  52 52 52
-+52 52 52  52 52 52  65 65 65  65 65 65  65 65 65  65 65 65
-+52 52 52  65 65 65  52 52 52  52 52 52  65 65 65  52 52 52
-+65 65 65  52 52 52  65 65 65  65 65 65  65 65 65  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  200 196 176
-+65 65 65  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+65 65 65  65 65 65  52 52 52  52 52 52  49 49 49  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  49 49 49  49 49 49  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+46 46 46  49 49 49  52 52 52  52 52 52  52 52 52  49 49 49
-+45 45 45  49 49 49  52 52 52  52 52 52  50 50 50  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  49 49 49
-+52 52 52  50 50 50  45 45 45  49 49 49  52 52 52  52 52 52
-+52 52 52  52 52 52  47 47 47  47 47 47  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  65 65 65
-+65 65 65  65 65 65  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+65 65 65  65 65 65  52 52 52  52 52 52  52 52 52  50 50 50
-+47 47 47  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  65 65 65
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  46 46 46  49 49 49  49 49 49  49 49 49  50 50 50
-+47 47 47  45 45 45  49 49 49  49 49 49  47 47 47  50 50 50
-+50 50 50  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  50 50 50  52 52 52  52 52 52  52 52 52
-+52 52 52  65 65 65  52 52 52  65 65 65  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  49 49 49
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  65 65 65  52 52 52  65 65 65  50 50 50  50 50 50
-+52 52 52  49 49 49  43 43 43  45 45 45  45 45 45  45 45 45
-+43 43 43  39 39 39  43 43 43  47 47 47  45 45 45  43 43 43
-+43 43 43  41 41 41  39 39 39  37 37 37  35 35 35  33 33 33
-+32 32 32  30 30 30  27 27 27  25 25 25  24 24 24  21 21 21
-+19 19 19  17 17 17  15 14 14  13 13 13  11 11 11  9 9 9
-+8 8 8  6 6 6  5 5 5  3 3 3  2 2 2  1 1 1
-+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  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  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  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  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  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
-+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  0 0 0  0 0 0  0 0 0  0 0 0  1 1 1
-+2 2 2  3 3 3  4 4 4  5 5 5  7 7 7  9 9 9
-+10 10 10  12 12 12  14 14 14  16 16 16  18 18 18  20 20 20
-+21 21 21  24 24 24  25 25 25  27 27 27  30 30 30  32 32 32
-+33 33 33  35 35 35  37 37 37  38 38 38  39 39 39  41 41 41
-+43 43 43  45 45 45  45 45 45  45 45 45  46 46 46  46 46 46
-+49 49 49  49 49 49  49 49 49  49 49 49  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  65 65 65  52 52 52  65 65 65
-+52 52 52  65 65 65  65 65 65  65 65 65  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+65 65 65  65 65 65  65 65 65  65 65 65  65 65 65  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  50 50 50  50 50 50  49 49 49
-+49 49 49  47 47 47  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  50 50 50  52 52 52  52 52 52  50 50 50  50 50 50
-+50 50 50  49 49 49  50 50 50  49 49 49  47 47 47  49 49 49
-+47 47 47  49 49 49  49 49 49  49 49 49  47 47 47  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  47 47 47
-+49 49 49  49 49 49  47 47 47  49 49 49  49 49 49  50 50 50
-+50 50 50  49 49 49  49 49 49  50 50 50  50 50 50  50 50 50
-+52 52 52  50 50 50  52 52 52  52 52 52  50 50 50  47 47 47
-+47 47 47  49 49 49  52 52 52  50 50 50  49 49 49  49 49 49
-+49 49 49  50 50 50  52 52 52  50 50 50  50 50 50  50 50 50
-+49 49 49  47 47 47  49 49 49  49 49 49  49 49 49  50 50 50
-+49 49 49  49 49 49  50 50 50  50 50 50  50 50 50  50 50 50
-+52 52 52  52 52 52  52 52 52  52 52 52  50 50 50  50 50 50
-+49 49 49  49 49 49  49 49 49  50 50 50  49 49 49  47 47 47
-+49 49 49  50 50 50  50 50 50  52 52 52  50 50 50  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  50 50 50
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  50 50 50
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  50 50 50  50 50 50  49 49 49  50 50 50  50 50 50
-+52 52 52  52 52 52  52 52 52  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  47 47 47  49 49 49  49 49 49  49 49 49
-+49 49 49  47 47 47  49 49 49  47 47 47  47 47 47  49 49 49
-+50 50 50  50 50 50  49 49 49  50 50 50  50 50 50  52 52 52
-+52 52 52  49 49 49  49 49 49  49 49 49  47 47 47  49 49 49
-+49 49 49  49 49 49  50 50 50  50 50 50  50 50 50  49 49 49
-+50 50 50  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+50 50 50  50 50 50  50 50 50  49 49 49  50 50 50  50 50 50
-+49 49 49  49 49 49  49 49 49  47 47 47  49 49 49  47 47 47
-+47 47 47  46 46 46  45 45 45  45 45 45  43 43 43  41 41 41
-+41 41 41  38 38 38  37 37 37  35 35 35  33 33 33  30 30 30
-+30 30 30  27 27 27  25 25 25  24 24 24  21 21 21  20 20 20
-+18 18 18  16 16 16  14 14 14  12 12 12  10 10 10  9 9 9
-+7 7 7  5 5 5  4 4 4  3 3 3  2 2 2  1 1 1
-+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  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  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  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  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  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
-+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  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+1 1 1  3 3 3  3 3 3  5 5 5  6 6 6  8 8 8
-+9 9 9  11 11 11  13 13 13  15 14 14  16 16 16  18 18 18
-+20 20 20  22 22 22  24 24 24  26 26 26  27 27 27  28 28 28
-+32 32 32  33 33 33  35 35 35  35 35 35  37 37 37  39 39 39
-+41 41 41  41 41 41  43 43 43  43 43 43  43 43 43  46 46 46
-+45 45 45  46 46 46  47 47 47  47 47 47  49 49 49  50 50 50
-+50 50 50  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+65 65 65  52 52 52  52 52 52  52 52 52  65 65 65  52 52 52
-+65 65 65  52 52 52  65 65 65  52 52 52  66 66 66  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+52 52 52  65 65 65  52 52 52  52 52 52  52 52 52  65 65 65
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+50 50 50  49 49 49  46 46 46  47 47 47  46 46 46  46 46 46
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  46 46 46  45 45 45  46 46 46  46 46 46  46 46 46
-+47 47 47  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+50 50 50  50 50 50  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  47 47 47  47 47 47  47 47 47  47 47 47  47 47 47
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  47 47 47  47 47 47
-+47 47 47  47 47 47  47 47 47  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  47 47 47  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  47 47 47  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  47 47 47  47 47 47  47 47 47
-+47 47 47  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  47 47 47  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  47 47 47  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  47 47 47  47 47 47  47 47 47  46 46 46
-+46 46 46  46 46 46  46 46 46  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  47 47 47  47 47 47  47 47 47  47 47 47
-+47 47 47  46 46 46  47 47 47  47 47 47  46 46 46  46 46 46
-+46 46 46  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  46 46 46  46 46 46  47 47 47
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  47 47 47  47 47 47
-+47 47 47  47 47 47  49 49 49  47 47 47  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  46 46 46  46 46 46  45 45 45  45 45 45
-+43 43 43  43 43 43  43 43 43  41 41 41  41 41 41  39 39 39
-+37 37 37  35 35 35  35 35 35  33 33 33  30 30 30  30 30 30
-+27 27 27  26 26 26  24 24 24  22 22 22  20 20 20  18 18 18
-+16 16 16  15 14 14  13 13 13  11 11 11  9 9 9  8 8 8
-+6 6 6  5 5 5  3 3 3  2 2 2  1 1 1  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+1 1 1  2 2 2  3 3 3  4 4 4  5 5 5  7 7 7
-+8 8 8  10 10 10  12 12 12  13 13 13  15 14 14  17 17 17
-+19 19 19  20 20 20  22 22 22  24 24 24  26 26 26  27 27 27
-+30 30 30  30 30 30  32 32 32  35 35 35  35 35 35  37 37 37
-+38 38 38  39 39 39  39 39 39  42 42 42  42 42 42  42 42 42
-+43 43 43  43 43 43  43 43 43  46 46 46  45 45 45  46 46 46
-+47 47 47  47 47 47  49 49 49  50 50 50  52 52 52  52 52 52
-+52 52 52  52 52 52  65 65 65  52 52 52  52 52 52  52 52 52
-+52 52 52  65 65 65  52 52 52  65 65 65  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+52 52 52  65 65 65  52 52 52  65 65 65  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  50 50 50  49 49 49  47 47 47
-+47 47 47  46 46 46  45 45 45  45 45 45  45 45 45  43 43 43
-+43 43 43  43 43 43  43 43 43  42 42 42  42 42 42  42 42 42
-+42 42 42  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+45 45 45  43 43 43  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  45 45 45  45 45 45
-+43 43 43  45 45 45  43 43 43  45 45 45  43 43 43  45 45 45
-+45 45 45  43 43 43  45 45 45  45 45 45  43 43 43  45 45 45
-+43 43 43  45 45 45  43 43 43  45 45 45  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  45 45 45  43 43 43  45 45 45
-+43 43 43  45 45 45  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  45 45 45  43 43 43
-+45 45 45  43 43 43  45 45 45  43 43 43  45 45 45  43 43 43
-+45 45 45  45 45 45  45 45 45  43 43 43  45 45 45  43 43 43
-+43 43 43  43 43 43  43 43 43  45 45 45  43 43 43  45 45 45
-+43 43 43  45 45 45  43 43 43  45 45 45  43 43 43  45 45 45
-+45 45 45  43 43 43  45 45 45  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  45 45 45  43 43 43
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+43 43 43  45 45 45  45 45 45  45 45 45  45 45 45  46 46 46
-+43 43 43  45 45 45  43 43 43  43 43 43  43 43 43  42 42 42
-+43 43 43  41 41 41  41 41 41  39 39 39  38 38 38  35 35 35
-+35 35 35  35 35 35  32 32 32  30 30 30  30 30 30  27 27 27
-+26 26 26  24 24 24  22 22 22  20 20 20  19 19 19  17 17 17
-+15 14 14  13 13 13  12 12 12  10 10 10  8 8 8  7 7 7
-+5 5 5  4 4 4  3 3 3  2 2 2  1 1 1  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  1 1 1  2 2 2  3 3 3  5 5 5  6 6 6
-+7 7 7  9 9 9  10 10 10  12 12 12  14 14 14  16 16 16
-+17 17 17  19 19 19  20 20 20  22 22 22  24 24 24  25 25 25
-+27 27 27  28 28 28  30 30 30  30 30 30  33 33 33  35 35 35
-+35 35 35  35 35 35  38 38 38  38 38 38  39 39 39  39 39 39
-+41 41 41  41 41 41  43 43 43  42 42 42  43 43 43  45 45 45
-+45 45 45  45 45 45  46 46 46  47 47 47  47 47 47  49 49 49
-+49 49 49  50 50 50  52 52 52  52 52 52  52 52 52  52 52 52
-+65 65 65  52 52 52  52 52 52  65 65 65  52 52 52  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  49 49 49  47 47 47  46 46 46  45 45 45
-+43 43 43  43 43 43  43 43 43  42 42 42  42 42 42  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  39 39 39  41 41 41  39 39 39
-+41 41 41  39 39 39  41 41 41  41 41 41  41 41 41  42 42 42
-+42 42 42  42 42 42  42 42 42  42 42 42  42 42 42  42 42 42
-+42 42 42  42 42 42  43 43 43  43 43 43  43 43 43  42 42 42
-+42 42 42  42 42 42  42 42 42  42 42 42  41 41 41  42 42 42
-+42 42 42  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+42 42 42  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  42 42 42  43 43 43  42 42 42  42 42 42  42 42 42
-+42 42 42  42 42 42  42 42 42  42 42 42  43 43 43  42 42 42
-+42 42 42  42 42 42  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  42 42 42  41 41 41  42 42 42  41 41 41  42 42 42
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  42 42 42
-+43 43 43  41 41 41  42 42 42  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  39 39 39  41 41 41  39 39 39  41 41 41
-+41 41 41  41 41 41  42 42 42  42 42 42  42 42 42  42 42 42
-+42 42 42  43 43 43  42 42 42  43 43 43  42 42 42  42 42 42
-+42 42 42  42 42 42  41 41 41  41 41 41  41 41 41  41 41 41
-+42 42 42  41 41 41  42 42 42  41 41 41  42 42 42  42 42 42
-+43 43 43  42 42 42  42 42 42  42 42 42  43 43 43  42 42 42
-+42 42 42  42 42 42  41 41 41  42 42 42  41 41 41  41 41 41
-+41 41 41  39 39 39  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  39 39 39
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  42 42 42  41 41 41  39 39 39  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  43 43 43
-+42 42 42  42 42 42  42 42 42  42 42 42  42 42 42  42 42 42
-+43 43 43  42 42 42  42 42 42  42 42 42  42 42 42  42 42 42
-+43 43 43  41 41 41  41 41 41  41 41 41  41 41 41  39 39 39
-+39 39 39  38 38 38  37 37 37  37 37 37  35 35 35  33 33 33
-+33 33 33  30 30 30  30 30 30  28 28 28  27 27 27  25 25 25
-+24 24 24  22 22 22  20 20 20  19 19 19  17 17 17  16 16 16
-+14 14 14  12 12 12  10 10 10  9 9 9  7 7 7  6 6 6
-+4 4 4  3 3 3  2 2 2  1 1 1  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  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
-+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  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  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  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  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  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  1 1 1  2 2 2  3 3 3  4 4 4  5 5 5
-+6 6 6  8 8 8  9 9 9  11 11 11  13 13 13  14 14 14
-+16 16 16  17 17 17  19 19 19  20 20 20  22 22 22  24 24 24
-+25 25 25  26 26 26  28 28 28  30 30 30  30 30 30  32 32 32
-+33 33 33  35 35 35  35 35 35  35 35 35  37 37 37  37 37 37
-+37 37 37  38 38 38  39 39 39  39 39 39  41 41 41  41 41 41
-+42 42 42  43 43 43  45 45 45  45 45 45  46 46 46  47 47 47
-+47 47 47  47 47 47  49 49 49  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  65 65 65  200 196 176
-+255 255 255  255 255 255  255 255 255  249 249 249  249 249 249  200 196 176
-+65 65 65  52 52 52  52 52 52  52 52 52  52 52 52  50 50 50
-+49 49 49  47 47 47  46 46 46  45 45 45  45 45 45  43 43 43
-+42 42 42  42 42 42  39 39 39  41 41 41  39 39 39  39 39 39
-+38 38 38  38 38 38  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  38 38 38  38 38 38  38 38 38  38 38 38
-+39 39 39  39 39 39  39 39 39  39 39 39  39 39 39  39 39 39
-+39 39 39  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+39 39 39  39 39 39  39 39 39  39 39 39  39 39 39  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  39 39 39  38 38 38  38 38 38  38 38 38  38 38 38
-+39 39 39  39 39 39  39 39 39  39 39 39  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  39 39 39  39 39 39  39 39 39
-+39 39 39  39 39 39  38 38 38  38 38 38  39 39 39  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  39 39 39
-+38 38 38  38 38 38  38 38 38  38 38 38  39 39 39  39 39 39
-+39 39 39  39 39 39  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  39 39 39  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  39 39 39  38 38 38  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  39 39 39  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  38 38 38  38 38 38  38 38 38
-+38 38 38  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  39 39 39
-+39 39 39  39 39 39  39 39 39  39 39 39  41 41 41  39 39 39
-+41 41 41  39 39 39  39 39 39  39 39 39  39 39 39  39 39 39
-+39 39 39  38 38 38  38 38 38  38 38 38  37 37 37  37 37 37
-+37 37 37  35 35 35  35 35 35  35 35 35  33 33 33  32 32 32
-+30 30 30  30 30 30  28 28 28  26 26 26  25 25 25  24 24 24
-+22 22 22  20 20 20  19 19 19  17 17 17  16 16 16  14 14 14
-+12 12 12  11 11 11  9 9 9  8 8 8  6 6 6  5 5 5
-+4 4 4  3 3 3  2 2 2  1 1 1  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  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
-+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  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  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  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  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  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  1 1 1  2 2 2  3 3 3  4 4 4
-+5 5 5  7 7 7  8 8 8  10 10 10  11 11 11  13 13 13
-+14 14 14  16 16 16  17 17 17  18 18 18  20 20 20  21 21 21
-+24 24 24  24 24 24  25 25 25  27 27 27  28 28 28  28 28 28
-+30 30 30  30 30 30  32 32 32  33 33 33  33 33 33  35 35 35
-+35 35 35  35 35 35  37 37 37  37 37 37  38 38 38  39 39 39
-+41 41 41  39 39 39  42 42 42  42 42 42  43 43 43  45 45 45
-+45 45 45  46 46 46  47 47 47  47 47 47  49 49 49  50 50 50
-+50 50 50  52 52 52  52 52 52  52 52 52  52 52 52  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  249 249 249  192 187 164
-+49 49 49  52 52 52  52 52 52  52 52 52  49 49 49  47 47 47
-+46 46 46  45 45 45  43 43 43  43 43 43  42 42 42  41 41 41
-+41 41 41  39 39 39  38 38 38  37 37 37  37 37 37  37 37 37
-+35 35 35  35 35 35  35 35 35  33 33 33  35 35 35  33 33 33
-+35 35 35  33 33 33  35 35 35  35 35 35  33 33 33  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+37 37 37  35 35 35  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  35 35 35  37 37 37  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  37 37 37
-+35 35 35  37 37 37  37 37 37  35 35 35  37 37 37  35 35 35
-+37 37 37  35 35 35  37 37 37  35 35 35  37 37 37  35 35 35
-+37 37 37  35 35 35  37 37 37  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  37 37 37  35 35 35
-+37 37 37  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  37 37 37  35 35 35
-+37 37 37  35 35 35  37 37 37  35 35 35  37 37 37  35 35 35
-+37 37 37  37 37 37  35 35 35  37 37 37  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  37 37 37  37 37 37
-+35 35 35  37 37 37  35 35 35  37 37 37  35 35 35  37 37 37
-+37 37 37  35 35 35  37 37 37  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  33 33 33  33 33 33
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  35 35 35
-+37 37 37  35 35 35  35 35 35  35 35 35  35 35 35  33 33 33
-+33 33 33  33 33 33  32 32 32  30 30 30  30 30 30  30 30 30
-+28 28 28  27 27 27  25 25 25  24 24 24  24 24 24  21 21 21
-+20 20 20  18 18 18  17 17 17  16 16 16  14 14 14  13 13 13
-+11 11 11  10 10 10  8 8 8  7 7 7  5 5 5  4 4 4
-+3 3 3  2 2 2  1 1 1  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  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  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
-+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  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  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  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  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  1 1 1  1 1 1  3 3 3  3 3 3
-+4 4 4  6 6 6  7 7 7  8 8 8  10 10 10  11 11 11
-+13 13 13  14 14 14  16 16 16  17 17 17  18 18 18  20 20 20
-+21 21 21  22 22 22  22 22 22  25 25 25  26 26 26  27 27 27
-+28 28 28  28 28 28  30 30 30  30 30 30  30 30 30  32 32 32
-+32 32 32  33 33 33  33 33 33  35 35 35  35 35 35  35 35 35
-+37 37 37  38 38 38  39 39 39  41 41 41  41 41 41  42 42 42
-+43 43 43  43 43 43  45 45 45  45 45 45  46 46 46  47 47 47
-+47 47 47  49 49 49  50 50 50  52 52 52  52 52 52  200 196 176
-+255 255 255  255 255 255  255 255 255  249 249 249  249 249 249  200 196 176
-+49 49 49  50 50 50  49 49 49  47 47 47  46 46 46  45 45 45
-+43 43 43  42 42 42  41 41 41  41 41 41  39 39 39  38 38 38
-+37 37 37  35 35 35  35 35 35  35 35 35  33 33 33  33 33 33
-+33 33 33  32 32 32  32 32 32  32 32 32  30 30 30  32 32 32
-+30 30 30  32 32 32  30 30 30  30 30 30  30 30 30  32 32 32
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  33 33 33
-+33 33 33  33 33 33  33 33 33  35 35 35  33 33 33  35 35 35
-+33 33 33  35 35 35  33 33 33  35 35 35  33 33 33  35 35 35
-+35 35 35  35 35 35  35 35 35  33 33 33  33 33 33  33 33 33
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  33 33 33
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  32 32 32
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  32 32 32
-+33 33 33  32 32 32  32 32 32  33 33 33  33 33 33  32 32 32
-+32 32 32  32 32 32  32 32 32  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  32 32 32
-+33 33 33  32 32 32  32 32 32  32 32 32  32 32 32  32 32 32
-+32 32 32  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  32 32 32  32 32 32
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  32 32 32
-+32 32 32  32 32 32  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+32 32 32  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  32 32 32
-+32 32 32  32 32 32  32 32 32  30 30 30  30 30 30  32 32 32
-+30 30 30  32 32 32  32 32 32  32 32 32  32 32 32  32 32 32
-+32 32 32  32 32 32  33 33 33  33 33 33  32 32 32  32 32 32
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  32 32 32
-+32 32 32  32 32 32  32 32 32  33 33 33  33 33 33  33 33 33
-+33 33 33  35 35 35  33 33 33  35 35 35  33 33 33  35 35 35
-+35 35 35  35 35 35  35 35 35  33 33 33  35 35 35  33 33 33
-+33 33 33  33 33 33  33 33 33  32 32 32  32 32 32  32 32 32
-+30 30 30  30 30 30  30 30 30  28 28 28  28 28 28  27 27 27
-+26 26 26  25 25 25  22 22 22  22 22 22  21 21 21  20 20 20
-+18 18 18  17 17 17  16 16 16  14 14 14  13 13 13  11 11 11
-+10 10 10  8 8 8  7 7 7  6 6 6  4 4 4  3 3 3
-+2 2 2  1 1 1  1 1 1  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  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  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
-+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  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  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  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  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  1 1 1  2 2 2  3 3 3
-+4 4 4  5 5 5  6 6 6  7 7 7  8 8 8  10 10 10
-+11 11 11  12 12 12  14 14 14  15 14 14  16 16 16  18 18 18
-+19 19 19  20 20 20  21 21 21  22 22 22  24 24 24  25 25 25
-+25 25 25  26 26 26  27 27 27  27 27 27  28 28 28  28 28 28
-+28 28 28  30 30 30  32 32 32  32 32 32  33 33 33  35 35 35
-+35 35 35  35 35 35  35 35 35  37 37 37  38 38 38  39 39 39
-+41 41 41  41 41 41  42 42 42  43 43 43  43 43 43  45 45 45
-+45 45 45  47 47 47  46 46 46  47 47 47  47 47 47  140 134 120
-+192 187 164  192 187 164  185 178 149  192 187 164  192 187 164  140 134 120
-+41 41 41  46 46 46  45 45 45  43 43 43  43 43 43  42 42 42
-+41 41 41  41 41 41  39 39 39  38 38 38  37 37 37  35 35 35
-+35 35 35  35 35 35  33 33 33  32 32 32  30 30 30  32 32 32
-+30 30 30  30 30 30  28 28 28  30 30 30  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  30 30 30
-+28 28 28  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  32 32 32  30 30 30  32 32 32  30 30 30  32 32 32
-+30 30 30  32 32 32  30 30 30  32 32 32  30 30 30  32 32 32
-+30 30 30  30 30 30  32 32 32  32 32 32  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  28 28 28  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  32 32 32  32 32 32  30 30 30  32 32 32  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  28 28 28  30 30 30  28 28 28  30 30 30
-+28 28 28  30 30 30  28 28 28  30 30 30  28 28 28  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  32 32 32  30 30 30  32 32 32  30 30 30
-+30 30 30  30 30 30  30 30 30  32 32 32  30 30 30  32 32 32
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  28 28 28
-+28 28 28  27 27 27  27 27 27  26 26 26  25 25 25  25 25 25
-+24 24 24  22 22 22  21 21 21  20 20 20  19 19 19  17 17 17
-+16 16 16  15 14 14  13 13 13  12 12 12  11 11 11  10 10 10
-+8 8 8  7 7 7  6 6 6  5 5 5  3 3 3  3 3 3
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  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  1 1 1  2 2 2
-+3 3 3  4 4 4  5 5 5  6 6 6  7 7 7  8 8 8
-+10 10 10  11 11 11  12 12 12  13 13 13  15 14 14  16 16 16
-+17 17 17  18 18 18  19 19 19  20 20 20  21 21 21  21 21 21
-+24 24 24  24 24 24  25 25 25  25 25 25  25 25 25  26 26 26
-+27 27 27  27 27 27  28 28 28  30 30 30  30 30 30  32 32 32
-+32 32 32  33 33 33  35 35 35  35 35 35  35 35 35  37 37 37
-+37 37 37  38 38 38  39 39 39  41 41 41  41 41 41  42 42 42
-+42 42 42  43 43 43  45 45 45  43 43 43  46 46 46  45 45 45
-+41 41 41  39 39 39  41 41 41  38 38 38  37 37 37  39 39 39
-+43 43 43  43 43 43  43 43 43  43 43 43  41 41 41  39 39 39
-+38 38 38  37 37 37  35 35 35  35 35 35  35 35 35  33 33 33
-+32 32 32  30 30 30  30 30 30  30 30 30  30 30 30  28 28 28
-+27 27 27  27 27 27  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  27 27 27  27 27 27  27 27 27
-+27 27 27  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  27 27 27
-+28 28 28  27 27 27  28 28 28  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  28 28 28  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  30 30 30  28 28 28  28 28 28  28 28 28  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  27 27 27  28 28 28  28 28 28  28 28 28
-+27 27 27  27 27 27  27 27 27  28 28 28  27 27 27  28 28 28
-+27 27 27  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+26 26 26  26 26 26  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  26 26 26  26 26 26  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  27 27 27  27 27 27  27 27 27  26 26 26  26 26 26
-+25 25 25  25 25 25  25 25 25  24 24 24  22 22 22  22 22 22
-+21 21 21  20 20 20  19 19 19  18 18 18  17 17 17  16 16 16
-+15 14 14  13 13 13  12 12 12  11 11 11  9 9 9  8 8 8
-+7 7 7  6 6 6  5 5 5  4 4 4  3 3 3  2 2 2
-+1 1 1  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  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  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  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  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
-+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  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  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  1 1 1
-+2 2 2  3 3 3  4 4 4  5 5 5  6 6 6  7 7 7
-+8 8 8  9 9 9  10 10 10  11 11 11  13 13 13  14 14 14
-+15 14 14  16 16 16  17 17 17  18 18 18  19 19 19  20 20 20
-+20 20 20  21 21 21  22 22 22  22 22 22  22 22 22  24 24 24
-+24 24 24  25 25 25  26 26 26  26 26 26  27 27 27  28 28 28
-+30 30 30  30 30 30  30 30 30  33 33 33  33 33 33  35 35 35
-+35 35 35  35 35 35  37 37 37  37 37 37  38 38 38  39 39 39
-+41 41 41  39 39 39  41 41 41  42 42 42  43 43 43  42 42 42
-+42 42 42  42 42 42  42 42 42  42 42 42  42 42 42  42 42 42
-+41 41 41  41 41 41  41 41 41  39 39 39  38 38 38  37 37 37
-+37 37 37  35 35 35  33 33 33  32 32 32  32 32 32  30 30 30
-+30 30 30  28 28 28  28 28 28  27 27 27  26 26 26  25 25 25
-+25 25 25  24 24 24  24 24 24  22 22 22  24 24 24  22 22 22
-+24 24 24  22 22 22  24 24 24  22 22 22  24 24 24  22 22 22
-+24 24 24  22 22 22  24 24 24  24 24 24  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  26 26 26
-+26 26 26  26 26 26  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+25 25 25  24 24 24  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  26 26 26  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+24 24 24  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  24 24 24
-+24 24 24  24 24 24  22 22 22  24 24 24  22 22 22  24 24 24
-+22 22 22  24 24 24  22 22 22  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  24 24 24  24 24 24  24 24 24
-+24 24 24  22 22 22  22 22 22  21 21 21  20 20 20  20 20 20
-+19 19 19  18 18 18  17 17 17  16 16 16  15 14 14  14 14 14
-+13 13 13  11 11 11  10 10 10  9 9 9  8 8 8  7 7 7
-+6 6 6  5 5 5  4 4 4  3 3 3  2 2 2  1 1 1
-+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  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  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  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  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  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
-+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  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  1 1 1
-+1 1 1  2 2 2  3 3 3  4 4 4  5 5 5  5 5 5
-+6 6 6  8 8 8  9 9 9  10 10 10  11 11 11  12 12 12
-+13 13 13  14 14 14  15 14 14  16 16 16  17 17 17  17 17 17
-+18 18 18  19 19 19  20 20 20  20 20 20  20 20 20  21 21 21
-+21 21 21  22 22 22  24 24 24  24 24 24  25 25 25  26 26 26
-+27 27 27  28 28 28  28 28 28  30 30 30  30 30 30  30 30 30
-+32 32 32  33 33 33  35 35 35  35 35 35  35 35 35  35 35 35
-+37 37 37  38 38 38  38 38 38  39 39 39  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  39 39 39  39 39 39  39 39 39
-+39 39 39  38 38 38  37 37 37  37 37 37  35 35 35  35 35 35
-+33 33 33  33 33 33  30 30 30  30 30 30  30 30 30  28 28 28
-+27 27 27  26 26 26  25 25 25  24 24 24  22 22 22  24 24 24
-+22 22 22  21 21 21  21 21 21  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  21 21 21  21 21 21  21 21 21  21 21 21  22 22 22
-+22 22 22  22 22 22  22 22 22  24 24 24  22 22 22  24 24 24
-+24 24 24  22 22 22  24 24 24  24 24 24  24 24 24  22 22 22
-+24 24 24  22 22 22  24 24 24  24 24 24  22 22 22  22 22 22
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  22 22 22  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  22 22 22  22 22 22  22 22 22
-+21 21 21  21 21 21  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  22 22 22  22 22 22  21 21 21
-+21 21 21  21 21 21  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  22 22 22  22 22 22
-+24 24 24  22 22 22  24 24 24  22 22 22  24 24 24  22 22 22
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  22 22 22
-+22 22 22  22 22 22  22 22 22  21 21 21  21 21 21  20 20 20
-+20 20 20  20 20 20  20 20 20  19 19 19  18 18 18  17 17 17
-+17 17 17  16 16 16  15 14 14  14 14 14  13 13 13  12 12 12
-+11 11 11  10 10 10  9 9 9  8 8 8  6 6 6  5 5 5
-+5 5 5  4 4 4  3 3 3  2 2 2  1 1 1  1 1 1
-+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  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  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  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  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  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
-+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  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
-+1 1 1  1 1 1  2 2 2  3 3 3  3 3 3  4 4 4
-+5 5 5  6 6 6  7 7 7  8 8 8  9 9 9  10 10 10
-+11 11 11  12 12 12  13 13 13  14 14 14  15 14 14  15 14 14
-+16 16 16  16 16 16  17 17 17  18 18 18  18 18 18  18 18 18
-+19 19 19  20 20 20  20 20 20  21 21 21  22 22 22  24 24 24
-+24 24 24  25 25 25  26 26 26  27 27 27  28 28 28  28 28 28
-+30 30 30  30 30 30  32 32 32  32 32 32  33 33 33  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  37 37 37  35 35 35
-+37 37 37  37 37 37  37 37 37  35 35 35  37 37 37  35 35 35
-+37 37 37  35 35 35  35 35 35  33 33 33  33 33 33  32 32 32
-+30 30 30  30 30 30  28 28 28  27 27 27  26 26 26  25 25 25
-+24 24 24  24 24 24  22 22 22  21 21 21  21 21 21  20 20 20
-+19 19 19  19 19 19  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  19 19 19  19 19 19  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+19 19 19  19 19 19  19 19 19  19 19 19  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  18 18 18  18 18 18  19 19 19
-+19 19 19  19 19 19  19 19 19  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  18 18 18  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  21 21 21  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  20 20 20  20 20 20
-+20 20 20  20 20 20  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  18 18 18  18 18 18  18 18 18  18 18 18  18 18 18
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  18 18 18  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  18 18 18  18 18 18  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  19 19 19  19 19 19  19 19 19  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  19 19 19  19 19 19  19 19 19  18 18 18
-+18 18 18  18 18 18  17 17 17  16 16 16  16 16 16  16 16 16
-+14 14 14  14 14 14  13 13 13  12 12 12  11 11 11  10 10 10
-+9 9 9  8 8 8  7 7 7  6 6 6  5 5 5  4 4 4
-+3 3 3  3 3 3  2 2 2  1 1 1  1 1 1  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
-+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  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  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  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  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  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
-+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  1 1 1  1 1 1  2 2 2  3 3 3  3 3 3
-+4 4 4  5 5 5  6 6 6  7 7 7  8 8 8  8 8 8
-+9 9 9  10 10 10  11 11 11  12 12 12  13 13 13  13 13 13
-+14 14 14  14 14 14  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  17 17 17  18 18 18  19 19 19  20 20 20  20 20 20
-+21 21 21  22 22 22  24 24 24  24 24 24  25 25 25  26 26 26
-+27 27 27  28 28 28  28 28 28  30 30 30  30 30 30  30 30 30
-+32 32 32  32 32 32  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  35 35 35  35 35 35  33 33 33
-+33 33 33  33 33 33  33 33 33  30 30 30  30 30 30  30 30 30
-+28 28 28  27 27 27  26 26 26  25 25 25  24 24 24  24 24 24
-+21 21 21  21 21 21  20 20 20  19 19 19  18 18 18  17 17 17
-+16 16 16  16 16 16  16 16 16  16 16 16  14 14 14  16 16 16
-+14 14 14  16 16 16  14 14 14  16 16 16  14 14 14  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  14 14 14  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  14 14 14  14 14 14  13 13 13
-+13 13 13  12 12 12  11 11 11  10 10 10  9 9 9  8 8 8
-+8 8 8  7 7 7  6 6 6  5 5 5  4 4 4  3 3 3
-+3 3 3  2 2 2  1 1 1  1 1 1  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  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
-+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  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  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  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  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  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  1 1 1  2 2 2  2 2 2
-+3 3 3  4 4 4  4 4 4  5 5 5  6 6 6  7 7 7
-+8 8 8  8 8 8  9 9 9  10 10 10  10 10 10  11 11 11
-+11 11 11  12 12 12  13 13 13  13 13 13  13 13 13  14 14 14
-+14 14 14  14 14 14  16 16 16  16 16 16  17 17 17  18 18 18
-+19 19 19  20 20 20  21 21 21  21 21 21  24 24 24  22 22 22
-+24 24 24  25 25 25  26 26 26  27 27 27  27 27 27  28 28 28
-+30 30 30  30 30 30  30 30 30  32 32 32  32 32 32  30 30 30
-+32 32 32  30 30 30  32 32 32  30 30 30  30 30 30  32 32 32
-+30 30 30  30 30 30  30 30 30  28 28 28  28 28 28  27 27 27
-+26 26 26  25 25 25  24 24 24  22 22 22  21 21 21  20 20 20
-+19 19 19  18 18 18  17 17 17  16 16 16  16 16 16  16 16 16
-+14 14 14  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  14 14 14  14 14 14  14 14 14  16 16 16
-+14 14 14  16 16 16  14 14 14  16 16 16  14 14 14  16 16 16
-+14 14 14  16 16 16  14 14 14  16 16 16  14 14 14  16 16 16
-+14 14 14  16 16 16  14 14 14  16 16 16  14 14 14  16 16 16
-+14 14 14  14 14 14  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+14 14 14  14 14 14  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  14 14 14  14 14 14  16 16 16  14 14 14
-+16 16 16  14 14 14  16 16 16  14 14 14  16 16 16  14 14 14
-+16 16 16  14 14 14  16 16 16  14 14 14  16 16 16  14 14 14
-+16 16 16  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+13 13 13  13 13 13  13 13 13  12 12 12  11 11 11  11 11 11
-+10 10 10  10 10 10  9 9 9  8 8 8  8 8 8  7 7 7
-+6 6 6  5 5 5  4 4 4  4 4 4  3 3 3  2 2 2
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  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  1 1 1  1 1 1
-+2 2 2  3 3 3  3 3 3  4 4 4  4 4 4  5 5 5
-+6 6 6  6 6 6  7 7 7  8 8 8  9 9 9  9 9 9
-+10 10 10  10 10 10  10 10 10  11 11 11  11 11 11  11 11 11
-+12 12 12  12 12 12  13 13 13  14 14 14  16 16 16  16 16 16
-+16 16 16  17 17 17  18 18 18  19 19 19  20 20 20  21 21 21
-+21 21 21  22 22 22  24 24 24  24 24 24  25 25 25  25 25 25
-+26 26 26  27 27 27  27 27 27  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  27 27 27  27 27 27  26 26 26  25 25 25  25 25 25
-+22 22 22  22 22 22  21 21 21  20 20 20  19 19 19  18 18 18
-+17 17 17  16 16 16  14 14 14  14 14 14  13 13 13  12 12 12
-+11 11 11  11 11 11  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+11 11 11  11 11 11  11 11 11  12 12 12  12 12 12  12 12 12
-+12 12 12  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  12 12 12
-+12 12 12  12 12 12  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  10 10 10  10 10 10
-+10 10 10  10 10 10  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  12 12 12  12 12 12  12 12 12  12 12 12
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  11 11 11
-+11 11 11  11 11 11  10 10 10  10 10 10  10 10 10  9 9 9
-+9 9 9  8 8 8  7 7 7  6 6 6  6 6 6  5 5 5
-+4 4 4  4 4 4  3 3 3  3 3 3  2 2 2  1 1 1
-+1 1 1  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  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  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  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  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
-+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  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  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  0 0 0  0 0 0  1 1 1
-+1 1 1  2 2 2  2 2 2  3 3 3  3 3 3  4 4 4
-+4 4 4  5 5 5  5 5 5  6 6 6  7 7 7  7 7 7
-+8 8 8  8 8 8  9 9 9  9 9 9  9 9 9  9 9 9
-+10 10 10  10 10 10  10 10 10  11 11 11  12 12 12  13 13 13
-+14 14 14  16 16 16  16 16 16  16 16 16  17 17 17  18 18 18
-+19 19 19  20 20 20  21 21 21  21 21 21  22 22 22  24 24 24
-+24 24 24  25 25 25  25 25 25  25 25 25  26 26 26  27 27 27
-+26 26 26  27 27 27  26 26 26  27 27 27  26 26 26  26 26 26
-+26 26 26  25 25 25  25 25 25  24 24 24  24 24 24  22 22 22
-+21 21 21  20 20 20  19 19 19  18 18 18  16 16 16  16 16 16
-+14 14 14  13 13 13  12 12 12  11 11 11  10 10 10  10 10 10
-+9 9 9  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
-+9 9 9  9 9 9  9 9 9  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  10 10 10  10 10 10  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  9 9 9
-+9 9 9  9 9 9  9 9 9  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  8 8 8  8 8 8
-+8 8 8  8 8 8  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  9 9 9
-+9 9 9  9 9 9  9 9 9  8 8 8  8 8 8  7 7 7
-+7 7 7  6 6 6  5 5 5  5 5 5  4 4 4  4 4 4
-+3 3 3  3 3 3  2 2 2  2 2 2  1 1 1  1 1 1
-+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  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  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  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  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  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
-+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  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  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  1 1 1  1 1 1  2 2 2  2 2 2  3 3 3
-+3 3 3  4 4 4  4 4 4  5 5 5  5 5 5  5 5 5
-+6 6 6  6 6 6  7 7 7  7 7 7  7 7 7  7 7 7
-+8 8 8  8 8 8  8 8 8  9 9 9  10 10 10  10 10 10
-+11 11 11  12 12 12  13 13 13  14 14 14  14 14 14  16 16 16
-+17 17 17  17 17 17  18 18 18  19 19 19  20 20 20  20 20 20
-+21 21 21  22 22 22  22 22 22  22 22 22  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  25 25 25  24 24 24  24 24 24
-+22 22 22  24 24 24  22 22 22  21 21 21  20 20 20  20 20 20
-+18 18 18  17 17 17  16 16 16  16 16 16  14 14 14  13 13 13
-+12 12 12  11 11 11  10 10 10  9 9 9  8 8 8  7 7 7
-+6 6 6  6 6 6  5 5 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
-+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  9 9 9  9 9 9  9 9 9  8 8 8  8 8 8
-+8 8 8  8 8 8  7 7 7  8 8 8  8 8 8  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
-+7 7 7  7 7 7  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  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  8 8 8  8 8 8  8 8 8
-+8 8 8  8 8 8  8 8 8  8 8 8  8 8 8  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  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 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  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  7 7 7
-+7 7 7  7 7 7  7 7 7  6 6 6  6 6 6  5 5 5
-+5 5 5  5 5 5  4 4 4  4 4 4  3 3 3  3 3 3
-+2 2 2  2 2 2  1 1 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  1 1 1  1 1 1  2 2 2
-+2 2 2  3 3 3  3 3 3  3 3 3  4 4 4  4 4 4
-+4 4 4  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  7 7 7  8 8 8
-+9 9 9  10 10 10  11 11 11  11 11 11  13 13 13  13 13 13
-+14 14 14  14 14 14  16 16 16  16 16 16  17 17 17  18 18 18
-+19 19 19  20 20 20  20 20 20  20 20 20  21 21 21  21 21 21
-+22 22 22  22 22 22  22 22 22  22 22 22  21 21 21  21 21 21
-+22 22 22  20 20 20  20 20 20  19 19 19  18 18 18  17 17 17
-+16 16 16  16 16 16  14 14 14  13 13 13  12 12 12  11 11 11
-+10 10 10  9 9 9  8 8 8  6 6 6  5 5 5  5 5 5
-+4 4 4  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  4 4 4  4 4 4  4 4 4  4 4 4  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 6  6 6 6  6 6 6  7 7 7
-+7 7 7  7 7 7  6 6 6  6 6 6  6 6 6  7 7 7
-+7 7 7  6 6 6  6 6 6  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 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  7 7 7  7 7 7  7 7 7  7 7 7
-+7 7 7  7 7 7  6 6 6  6 6 6  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 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  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 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  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  5 5 5  5 5 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 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  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  4 4 4  4 4 4
-+4 4 4  3 3 3  3 3 3  3 3 3  2 2 2  2 2 2
-+1 1 1  1 1 1  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  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  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  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
-+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  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  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  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  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  1 1 1
-+1 1 1  1 1 1  2 2 2  2 2 2  2 2 2  3 3 3
-+3 3 3  3 3 3  3 3 3  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  5 5 5  6 6 6
-+7 7 7  8 8 8  8 8 8  9 9 9  10 10 10  11 11 11
-+12 12 12  13 13 13  13 13 13  14 14 14  14 14 14  16 16 16
-+16 16 16  17 17 17  18 18 18  18 18 18  20 20 20  20 20 20
-+20 20 20  20 20 20  21 21 21  20 20 20  21 21 21  19 19 19
-+18 18 18  18 18 18  17 17 17  16 16 16  16 16 16  14 14 14
-+14 14 14  13 13 13  12 12 12  11 11 11  10 10 10  9 9 9
-+8 8 8  7 7 7  6 6 6  5 5 5  4 4 4  3 3 3
-+2 2 2  2 2 2  1 1 1  1 1 1  2 2 2  2 2 2
-+2 2 2  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  5 5 5  5 5 5  5 5 5
-+4 4 4  4 4 4  5 5 5  5 5 5  5 5 5  5 5 5
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  5 5 5  5 5 5  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  3 3 3  3 3 3
-+3 3 3  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  3 3 3  3 3 3  3 3 3  3 3 3
-+2 2 2  2 2 2  2 2 2  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 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 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 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 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 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 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 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 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 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  1 1 1  1 1 1  1 1 1  1 1 1
-+2 2 2  2 2 2  2 2 2  2 2 2  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  4 4 4
-+5 5 5  5 5 5  6 6 6  7 7 7  8 8 8  9 9 9
-+9 9 9  10 10 10  11 11 11  12 12 12  13 13 13  13 13 13
-+14 14 14  16 16 16  16 16 16  16 16 16  17 17 17  17 17 17
-+19 19 19  18 18 18  18 18 18  18 18 18  17 17 17  17 17 17
-+16 16 16  16 16 16  16 16 16  14 14 14  13 13 13  13 13 13
-+12 12 12  11 11 11  10 10 10  9 9 9  8 8 8  7 7 7
-+6 6 6  5 5 5  4 4 4  3 3 3  2 2 2  1 1 1
-+1 1 1  0 0 0  0 0 0  0 0 0  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  4 4 4  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  4 4 4  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  1 1 1
-+1 1 1  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+3 3 3  3 3 3  3 3 3  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  2 2 2  2 2 2  2 2 2  2 2 2  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 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 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 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 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 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 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 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 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 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
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  2 2 2  2 2 2
-+3 3 3  3 3 3  4 4 4  5 5 5  6 6 6  6 6 6
-+7 7 7  8 8 8  9 9 9  10 10 10  11 11 11  11 11 11
-+12 12 12  13 13 13  14 14 14  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  17 17 17  16 16 16  16 16 16  16 16 16
-+16 16 16  14 14 14  13 13 13  13 13 13  12 12 12  11 11 11
-+10 10 10  9 9 9  8 8 8  7 7 7  6 6 6  5 5 5
-+4 4 4  3 3 3  3 3 3  2 2 2  1 1 1  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  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  1 1 1  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  2 2 2  1 1 1  1 1 1  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  1 1 1  2 2 2
-+2 2 2  2 2 2  2 2 2  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  1 1 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  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 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 0 0  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 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 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 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 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 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 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 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 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 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 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 0 0  0 0 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  2 2 2  3 3 3  3 3 3  4 4 4  5 5 5
-+5 5 5  6 6 6  7 7 7  8 8 8  9 9 9  10 10 10
-+11 11 11  11 11 11  12 12 12  13 13 13  13 13 13  13 13 13
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  13 13 13
-+13 13 13  12 12 12  11 11 11  11 11 11  10 10 10  9 9 9
-+8 8 8  7 7 7  6 6 6  5 5 5  5 5 5  4 4 4
-+3 3 3  2 2 2  1 1 1  1 1 1  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  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  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 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 0 0  0 0 0  0 0 0  0 0 0  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 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 1 1  1 1 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  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 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 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  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 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 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 0 0  0 0 0  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 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 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 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 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 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 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 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 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 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 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  1 1 1  2 2 2  2 2 2  3 3 3  4 4 4
-+4 4 4  5 5 5  6 6 6  7 7 7  8 8 8  8 8 8
-+9 9 9  10 10 10  10 10 10  11 11 11  11 11 11  12 12 12
-+12 12 12  12 12 12  13 13 13  12 12 12  12 12 12  11 11 11
-+11 11 11  10 10 10  10 10 10  9 9 9  8 8 8  8 8 8
-+7 7 7  6 6 6  5 5 5  4 4 4  4 4 4  3 3 3
-+2 2 2  2 2 2  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1  1 1 1  2 2 2  3 3 3
-+3 3 3  4 4 4  5 5 5  5 5 5  6 6 6  7 7 7
-+8 8 8  8 8 8  9 9 9  9 9 9  10 10 10  10 10 10
-+10 10 10  11 11 11  11 11 11  11 11 11  11 11 11  10 10 10
-+10 10 10  9 9 9  8 8 8  8 8 8  7 7 7  6 6 6
-+5 5 5  5 5 5  4 4 4  3 3 3  3 3 3  2 2 2
-+1 1 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  1 1 1  1 1 1  2 2 2
-+3 3 3  3 3 3  4 4 4  4 4 4  5 5 5  5 5 5
-+6 6 6  7 7 7  7 7 7  8 8 8  8 8 8  8 8 8
-+9 9 9  9 9 9  8 8 8  8 8 8  9 9 9  8 8 8
-+8 8 8  7 7 7  7 7 7  6 6 6  5 5 5  5 5 5
-+4 4 4  4 4 4  3 3 3  3 3 3  2 2 2  1 1 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  1 1 1
-+2 2 2  2 2 2  3 3 3  3 3 3  4 4 4  4 4 4
-+5 5 5  5 5 5  5 5 5  6 6 6  6 6 6  7 7 7
-+7 7 7  7 7 7  7 7 7  7 7 7  6 6 6  7 7 7
-+7 7 7  6 6 6  5 5 5  5 5 5  5 5 5  4 4 4
-+4 4 4  3 3 3  2 2 2  2 2 2  1 1 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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  1 1 1
-+1 1 1  1 1 1  2 2 2  2 2 2  3 3 3  3 3 3
-+3 3 3  4 4 4  4 4 4  5 5 5  5 5 5  6 6 6
-+5 5 5  5 5 5  5 5 5  6 6 6  5 5 5  5 5 5
-+4 4 4  4 4 4  4 4 4  3 3 3  3 3 3  3 3 3
-+2 2 2  2 2 2  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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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  1 1 1  1 1 1  1 1 1  2 2 2  2 2 2
-+2 2 2  3 3 3  3 3 3  3 3 3  3 3 3  4 4 4
-+4 4 4  4 4 4  4 4 4  5 5 5  4 4 4  4 4 4
-+3 3 3  3 3 3  3 3 3  3 3 3  2 2 2  2 2 2
-+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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 0 0  1 1 1  1 1 1  1 1 1
-+1 1 1  2 2 2  2 2 2  2 2 2  2 2 2  3 3 3
-+3 3 3  4 4 4  3 3 3  3 3 3  2 2 2  2 2 2
-+2 2 2  2 2 2  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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 0 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 1 1
-+1 1 1  2 2 2  2 2 2  2 2 2  1 1 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1044-config-nr-tty-devices.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1044-config-nr-tty-devices.patch.patch
deleted file mode 100644 (file)
index cc3d453..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-From 29296aa9ec0140894c77b076806217fd19c0ce9d Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:47 +0100
-Subject: [PATCH] config-nr-tty-devices.patch
-
----
- drivers/char/Kconfig |   12 ++++++++++++
- include/linux/vt.h   |   11 +++++++++++
- 2 files changed, 23 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index 2e3a0d4..ed913da 100644
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -58,6 +58,18 @@ config VT_CONSOLE
-         If unsure, say Y.
-+config NR_TTY_DEVICES
-+      int "Maximum tty device number"
-+      depends on VT
-+      default 63
-+      ---help---
-+        This is the highest numbered device created in /dev. You will actually have
-+        NR_TTY_DEVICES+1 devices in /dev. The default is 63, which will result in
-+        64 /dev entries. The lowest number you can set is 11, anything below that, 
-+        and it will default to 11. 63 is also the upper limit so we don't overrun
-+        the serial consoles.
-+
-+
- config HW_CONSOLE
-       bool
-       depends on VT && !S390 && !UML
-diff --git a/include/linux/vt.h b/include/linux/vt.h
-index 02c1c02..2ba4d21 100644
---- a/include/linux/vt.h
-+++ b/include/linux/vt.h
-@@ -18,8 +18,19 @@ extern int unregister_vt_notifier(struct notifier_block *nb);
-  * resizing).
-  */
- #define MIN_NR_CONSOLES 1       /* must be at least 1 */
-+#if (CONFIG_NR_TTY_DEVICES < 4)
-+/* Lower Limit */
-+#define MAX_NR_CONSOLES       4       /* serial lines start at 64 */
-+#define MAX_NR_USER_CONSOLES 4        /* must be root to allocate above this */
-+#elif (CONFIG_NR_TTY_DEVICES > 63)
-+/* Upper Limit */
- #define MAX_NR_CONSOLES       63      /* serial lines start at 64 */
- #define MAX_NR_USER_CONSOLES 63       /* must be root to allocate above this */
-+#else
-+/* They chose a sensible number */
-+#define MAX_NR_CONSOLES CONFIG_NR_TTY_DEVICES
-+#define MAX_NR_USER_CONSOLES CONFIG_NR_TTY_DEVICES
-+#endif
-               /* Note: the ioctl VT_GETSTATE does not work for
-                  consoles 16 and higher (since it returns a short) */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1045-pm-debug_less_verbose.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1045-pm-debug_less_verbose.patch.patch
deleted file mode 100644 (file)
index d5bf1f8..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From 2ea3a6a1337ce1ad496db7e650ac6301f7be34dd Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:47 +0100
-Subject: [PATCH] pm-debug_less_verbose.patch
-
----
- drivers/base/power/main.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
-index 691ffb6..86ba4f1 100644
---- a/drivers/base/power/main.c
-+++ b/drivers/base/power/main.c
-@@ -40,9 +40,9 @@ int (*platform_enable_wakeup)(struct device *dev, int is_on);
- void device_pm_add(struct device *dev)
- {
--      pr_debug("PM: Adding info for %s:%s\n",
-+      /* pr_debug("PM: Adding info for %s:%s\n",
-                dev->bus ? dev->bus->name : "No Bus",
--               kobject_name(&dev->kobj));
-+               kobject_name(&dev->kobj)); */
-       mutex_lock(&dpm_list_mtx);
-       list_add_tail(&dev->power.entry, &dpm_active);
-       mutex_unlock(&dpm_list_mtx);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1046-s3c2410_serial-nodebug.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1046-s3c2410_serial-nodebug.patch.patch
deleted file mode 100644 (file)
index 0c56f4c..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From b2b07b5cf12c430ad74b44602b098e7b711a2b72 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:48 +0100
-Subject: [PATCH] s3c2410_serial-nodebug.patch
-
----
- drivers/serial/s3c2410.c |    8 --------
- 1 files changed, 0 insertions(+), 8 deletions(-)
-
-diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
-index e773c8e..6c93a1b 100644
---- a/drivers/serial/s3c2410.c
-+++ b/drivers/serial/s3c2410.c
-@@ -708,10 +708,6 @@ static unsigned int s3c24xx_serial_getclk(struct uart_port *port,
-               int calc_deviation;
-               for (sptr = res; sptr < resptr; sptr++) {
--                      printk(KERN_DEBUG
--                             "found clk %p (%s) quot %d, calc %d\n",
--                             sptr->clksrc, sptr->clksrc->name,
--                             sptr->quot, sptr->calc);
-                       calc_deviation = baud - sptr->calc;
-                       if (calc_deviation < 0)
-@@ -723,12 +719,8 @@ static unsigned int s3c24xx_serial_getclk(struct uart_port *port,
-                       }
-               }
--              printk(KERN_DEBUG "best %p (deviation %d)\n", best, deviation);
-       }
--      printk(KERN_DEBUG "selected clock %p (%s) quot %d, calc %d\n",
--             best->clksrc, best->clksrc->name, best->quot, best->calc);
--
-       /* store results to pass back */
-       *clksrc = best->clksrc;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1047-input-nots-mousedev.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1047-input-nots-mousedev.patch.patch
deleted file mode 100644 (file)
index 198beb9..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5c2f325aefe9280ae6f1220200bf40281d218fda Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:48 +0100
-Subject: [PATCH] input-nots-mousedev.patch
- This patch disables the reporting of touchscreen-like devices via
- /dev/input/mice.  In the Neo1973 (much like other handheld devices),
- we need this to distinguish between the touchscreen (which uses tslib)
- and optional additional usb/bluetooth mice that might be attached.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- drivers/input/mousedev.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
-index be83516..0ae06bb 100644
---- a/drivers/input/mousedev.c
-+++ b/drivers/input/mousedev.c
-@@ -1009,6 +1009,7 @@ static const struct input_device_id mousedev_ids[] = {
-               .evbit = { BIT_MASK(EV_KEY) | BIT_MASK(EV_REL) },
-               .relbit = { BIT_MASK(REL_WHEEL) },
-       },      /* A separate scrollwheel */
-+#if 0
-       {
-               .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
-                               INPUT_DEVICE_ID_MATCH_KEYBIT |
-@@ -1018,6 +1019,7 @@ static const struct input_device_id mousedev_ids[] = {
-               .absbit = { BIT_MASK(ABS_X) | BIT_MASK(ABS_Y) },
-       },      /* A tablet like device, at least touch detection,
-                  two absolute axes */
-+#endif
-       {
-               .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
-                               INPUT_DEVICE_ID_MATCH_KEYBIT |
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1048-s3c2440-nand-disable-hwecc.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1048-s3c2440-nand-disable-hwecc.patch.patch
deleted file mode 100644 (file)
index f939f8b..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From 1d89da736ed33d3f7c398fb9f8dfddecb7c7c7a9 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:48 +0100
-Subject: [PATCH] s3c2440-nand-disable-hwecc.patch
- Disable the hardware ECC checking on S3C2440 based platforms (HXD8, SMDK2440,
- GTA02) for the time being, since our u-boot doesn't yet support it for 2k page
- size NAND
-
----
- drivers/mtd/nand/s3c2410.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
-index 5c1c09d..f83bed9 100644
---- a/drivers/mtd/nand/s3c2410.c
-+++ b/drivers/mtd/nand/s3c2410.c
-@@ -658,7 +658,7 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,
-       nmtd->mtd.owner    = THIS_MODULE;
-       nmtd->set          = set;
--      if (hardware_ecc) {
-+      if (info->cpu_type == TYPE_S3C2410 && hardware_ecc) {
-               chip->ecc.calculate = s3c2410_nand_calculate_ecc;
-               chip->ecc.correct   = s3c2410_nand_correct_data;
-               chip->ecc.mode      = NAND_ECC_HW;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1049-qt2410-cs8900.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1049-qt2410-cs8900.patch.patch
deleted file mode 100644 (file)
index a7179ff..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-From a1ad9949db4fa268e152e9b2efb2fa5932596d63 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:49 +0100
-Subject: [PATCH] qt2410-cs8900.patch
-
----
- drivers/net/Kconfig  |    4 ++--
- drivers/net/cs89x0.c |   14 +++++++++++++-
- 2 files changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
-index 9af05a2..272e0ec 100644
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -1209,7 +1209,7 @@ source "drivers/net/ibm_newemac/Kconfig"
- config NET_PCI
-       bool "EISA, VLB, PCI and on board controllers"
--      depends on ISA || EISA || PCI
-+      depends on ISA || EISA || PCI || MACH_QT2410
-       help
-         This is another class of network cards which attach directly to the
-         bus. If you have one of those, say Y and read the Ethernet-HOWTO,
-@@ -1385,7 +1385,7 @@ config FORCEDETH_NAPI
- config CS89x0
-       tristate "CS89x0 support"
--      depends on NET_PCI && (ISA || MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X)
-+      depends on NET_PCI && (ISA || MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X || MACH_QT2410)
-       ---help---
-         Support for CS89x0 chipset based Ethernet cards. If you have a
-         network (Ethernet) card of this type, say Y and read the
-diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
-index 5717509..c6235e1 100644
---- a/drivers/net/cs89x0.c
-+++ b/drivers/net/cs89x0.c
-@@ -194,6 +194,10 @@ static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0};
- #define CIRRUS_DEFAULT_IRQ    VH_INTC_INT_NUM_CASCADED_INTERRUPT_1 /* Event inputs bank 1 - ID 35/bit 3 */
- static unsigned int netcard_portlist[] __initdata = {CIRRUS_DEFAULT_BASE, 0};
- static unsigned int cs8900_irq_map[] = {CIRRUS_DEFAULT_IRQ, 0, 0, 0};
-+#elif defined(CONFIG_MACH_QT2410)
-+#include <asm/arch/irqs.h>
-+static unsigned int netcard_portlist [] __initdata = { 0xe0000300, 0 };
-+static unsigned int cs8900_irq_map[] = { IRQ_EINT9, 0, 0, 0 };
- #else
- static unsigned int netcard_portlist[] __initdata =
-    { 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x2e0, 0};
-@@ -829,6 +833,14 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
-       printk(" IRQ %d", dev->irq);
-+      dev->dev_addr[0] = 0x00;
-+      dev->dev_addr[1] = 0x00;
-+      dev->dev_addr[2] = 0xc0;
-+      dev->dev_addr[3] = 0xff;
-+      dev->dev_addr[4] = 0xee;
-+      dev->dev_addr[5] = 0x08;
-+      set_mac_address(dev, dev->dev_addr);
-+
- #if ALLOW_DMA
-       if (lp->use_dma) {
-               get_dma_channel(dev);
-@@ -1304,7 +1316,7 @@ net_open(struct net_device *dev)
-       else
- #endif
-       {
--#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01) && !defined(CONFIG_ARCH_PNX010X)
-+#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01) && !defined(CONFIG_ARCH_PNX010X) && !defined(CONFIG_MACH_QT2410)
-               if (((1 << dev->irq) & lp->irq_map) == 0) {
-                       printk(KERN_ERR "%s: IRQ %d is not in our map of allowable IRQs, which is %x\n",
-                                dev->name, dev->irq, lp->irq_map);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1050-s3c2410-qt2410-buttons.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1050-s3c2410-qt2410-buttons.patch.patch
deleted file mode 100644 (file)
index c606c2e..0000000
+++ /dev/null
@@ -1,311 +0,0 @@
-From 9deba66bfaf3a3293436e405830a666df8f36ed6 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:49 +0100
-Subject: [PATCH] s3c2410-qt2410-buttons.patch
-
----
- arch/arm/mach-s3c2410/mach-qt2410.c |   18 +++
- drivers/input/keyboard/Kconfig      |    5 +
- drivers/input/keyboard/Makefile     |    1 +
- drivers/input/keyboard/qt2410kbd.c  |  233 +++++++++++++++++++++++++++++++++++
- 4 files changed, 257 insertions(+), 0 deletions(-)
- create mode 100644 drivers/input/keyboard/qt2410kbd.c
-
-diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c
-index 6f7b56d..daf94cd 100644
---- a/arch/arm/mach-s3c2410/mach-qt2410.c
-+++ b/arch/arm/mach-s3c2410/mach-qt2410.c
-@@ -321,6 +321,24 @@ static int __init qt2410_tft_setup(char *str)
- __setup("tft=", qt2410_tft_setup);
-+static struct resource qt2410_button_resources[] = {
-+      [0] = {
-+              .start = S3C2410_GPF0,
-+              .end   = S3C2410_GPF0,
-+      },
-+      [1] = {
-+              .start = S3C2410_GPF2,
-+              .end   = S3C2410_GPF2,
-+      },
-+};
-+
-+struct platform_device qt2410_button_dev = {
-+      .name           ="qt2410-button",
-+      .num_resources  = ARRAY_SIZE(qt2410_button_resources),
-+      .resource       = qt2410_button_resources,
-+};
-+
-+
- static void __init qt2410_map_io(void)
- {
-       s3c24xx_init_io(qt2410_iodesc, ARRAY_SIZE(qt2410_iodesc));
-diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
-index 3b9990e..a61ca45 100644
---- a/drivers/input/keyboard/Kconfig
-+++ b/drivers/input/keyboard/Kconfig
-@@ -304,5 +304,10 @@ config KEYBOARD_NEO1973
-         To compile this driver as a module, choose M here: the
-         module will be called neo1973kbd.
-+config KEYBOARD_QT2410
-+      tristate "QT2410 buttons"
-+      depends on MACH_QT2410
-+      default y
-+
- endif
-diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
-index 68ecfc5..34bfc33 100644
---- a/drivers/input/keyboard/Makefile
-+++ b/drivers/input/keyboard/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_KEYBOARD_NEWTON)                += newtonkbd.o
- obj-$(CONFIG_KEYBOARD_STOWAWAY)               += stowaway.o
- obj-$(CONFIG_KEYBOARD_CORGI)          += corgikbd.o
- obj-$(CONFIG_KEYBOARD_NEO1973)                += neo1973kbd.o
-+obj-$(CONFIG_KEYBOARD_QT2410)         += qt2410kbd.o
- obj-$(CONFIG_KEYBOARD_SPITZ)          += spitzkbd.o
- obj-$(CONFIG_KEYBOARD_HIL)            += hil_kbd.o
- obj-$(CONFIG_KEYBOARD_HIL_OLD)                += hilkbd.o
-diff --git a/drivers/input/keyboard/qt2410kbd.c b/drivers/input/keyboard/qt2410kbd.c
-new file mode 100644
-index 0000000..4d497a3
---- /dev/null
-+++ b/drivers/input/keyboard/qt2410kbd.c
-@@ -0,0 +1,233 @@
-+/*
-+ * Keyboard driver for Armzone QT2410
-+ *
-+ * (C) 2006 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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 version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+#include <linux/delay.h>
-+#include <linux/platform_device.h>
-+#include <linux/init.h>
-+#include <linux/input.h>
-+#include <linux/interrupt.h>
-+#include <linux/jiffies.h>
-+#include <linux/module.h>
-+#include <linux/slab.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/arch/gta01.h>
-+
-+struct gta01kbd {
-+      struct input_dev *input;
-+      unsigned int suspended;
-+      unsigned long suspend_jiffies;
-+};
-+
-+static irqreturn_t gta01kbd_interrupt(int irq, void *dev_id)
-+{
-+      struct gta01kbd *gta01kbd_data = dev_id;
-+
-+      /* FIXME: use GPIO from platform_dev resources */
-+      if (s3c2410_gpio_getpin(S3C2410_GPF0))
-+              input_report_key(gta01kbd_data->input, KEY_PHONE, 1);
-+      else
-+              input_report_key(gta01kbd_data->input, KEY_PHONE, 0);
-+
-+      input_sync(gta01kbd_data->input);
-+
-+      return IRQ_HANDLED;
-+}
-+
-+
-+#ifdef CONFIG_PM
-+static int gta01kbd_suspend(struct platform_device *dev, pm_message_t state)
-+{
-+      struct gta01kbd *gta01kbd = platform_get_drvdata(dev);
-+
-+      gta01kbd->suspended = 1;
-+
-+      return 0;
-+}
-+
-+static int gta01kbd_resume(struct platform_device *dev)
-+{
-+      struct gta01kbd *gta01kbd = platform_get_drvdata(dev);
-+
-+      gta01kbd->suspended = 0;
-+
-+      return 0;
-+}
-+#else
-+#define gta01kbd_suspend      NULL
-+#define gta01kbd_resume               NULL
-+#endif
-+
-+static int gta01kbd_probe(struct platform_device *pdev)
-+{
-+      struct gta01kbd *gta01kbd;
-+      struct input_dev *input_dev;
-+      int irq_911;
-+      int rc = 0;
-+
-+      gta01kbd = kzalloc(sizeof(struct gta01kbd), GFP_KERNEL);
-+      if (!gta01kbd) {
-+              rc = -ENOMEM;
-+              goto bail;
-+      }
-+      input_dev = input_allocate_device();
-+      if (!gta01kbd || !input_dev) {
-+              rc = -ENOMEM;
-+              goto bail_free;
-+      }
-+
-+      if (pdev->resource[0].flags != 0) {\
-+              rc = -EINVAL;
-+              goto bail_free_dev;
-+      }
-+
-+      irq_911 = s3c2410_gpio_getirq(pdev->resource[0].start);
-+      if (irq_911 < 0) {
-+              rc = -EINVAL;
-+              goto bail_free_dev;
-+      }
-+
-+      platform_set_drvdata(pdev, gta01kbd);
-+
-+      gta01kbd->input = input_dev;
-+
-+#if 0
-+      spin_lock_init(&gta01kbd->lock);
-+      /* Init Keyboard rescan timer */
-+      init_timer(&corgikbd->timer);
-+      corgikbd->timer.function = corgikbd_timer_callback;
-+      corgikbd->timer.data = (unsigned long) corgikbd;
-+
-+      /* Init Hinge Timer */
-+      init_timer(&corgikbd->htimer);
-+      corgikbd->htimer.function = corgikbd_hinge_timer;
-+      corgikbd->htimer.data = (unsigned long) corgikbd;
-+
-+      corgikbd->suspend_jiffies=jiffies;
-+
-+      memcpy(corgikbd->keycode, corgikbd_keycode, sizeof(corgikbd->keycode));
-+#endif
-+
-+      input_dev->name = "QT2410 Buttons";
-+      input_dev->phys = "qt2410kbd/input0";
-+      input_dev->id.bustype = BUS_HOST;
-+      input_dev->id.vendor = 0x0001;
-+      input_dev->id.product = 0x0001;
-+      input_dev->id.version = 0x0100;
-+      input_dev->cdev.dev = &pdev->dev;
-+      input_dev->private = gta01kbd;
-+
-+      input_dev->evbit[0] = BIT(EV_KEY);
-+#if 0
-+      input_dev->keycode = gta01kbd->keycode;
-+      input_dev->keycodesize = sizeof(unsigned char);
-+      input_dev->keycodemax = ARRAY_SIZE(corgikbd_keycode);
-+
-+      for (i = 0; i < ARRAY_SIZE(corgikbd_keycode); i++)
-+              set_bit(corgikbd->keycode[i], input_dev->keybit);
-+      clear_bit(0, input_dev->keybit);
-+      set_bit(SW_LID, input_dev->swbit);
-+      set_bit(SW_TABLET_MODE, input_dev->swbit);
-+      set_bit(SW_HEADPHONE_INSERT, input_dev->swbit);
-+#endif
-+
-+      rc = input_register_device(gta01kbd->input);
-+      if (rc)
-+              goto bail_free_dev;
-+
-+      s3c2410_gpio_cfgpin(S3C2410_GPF0, S3C2410_GPF0_EINT0);
-+      if (request_irq(irq_911, gta01kbd_interrupt,
-+                      IRQF_DISABLED | IRQF_TRIGGER_RISING |
-+                      IRQF_TRIGGER_FALLING, "qt2410kbd_eint0", gta01kbd))
-+              printk(KERN_WARNING "gta01kbd: Can't get IRQ\n");
-+      enable_irq_wake(irq_911);
-+
-+      /* FIXME: headphone insert */
-+
-+#if 0
-+      mod_timer(&corgikbd->htimer, jiffies + msecs_to_jiffies(HINGE_SCAN_INTERVAL));
-+
-+      /* Setup sense interrupts - RisingEdge Detect, sense lines as inputs */
-+      for (i = 0; i < CORGI_KEY_SENSE_NUM; i++) {
-+              pxa_gpio_mode(CORGI_GPIO_KEY_SENSE(i) | GPIO_IN);
-+              if (request_irq(CORGI_IRQ_GPIO_KEY_SENSE(i), corgikbd_interrupt,
-+                              SA_INTERRUPT | SA_TRIGGER_RISING,
-+                              "corgikbd", corgikbd))
-+                      printk(KERN_WARNING "corgikbd: Can't get IRQ: %d!\n", i);
-+      }
-+
-+      /* Set Strobe lines as outputs - set high */
-+      for (i = 0; i < CORGI_KEY_STROBE_NUM; i++)
-+              pxa_gpio_mode(CORGI_GPIO_KEY_STROBE(i) | GPIO_OUT | GPIO_DFLT_HIGH);
-+
-+      /* Setup the headphone jack as an input */
-+      pxa_gpio_mode(CORGI_GPIO_AK_INT | GPIO_IN);
-+#endif
-+
-+      return 0;
-+
-+bail_free_dev:
-+      input_free_device(input_dev);
-+bail_free:
-+      kfree(gta01kbd);
-+bail:
-+      return rc;
-+}
-+
-+static int gta01kbd_remove(struct platform_device *pdev)
-+{
-+      struct gta01kbd *gta01kbd = platform_get_drvdata(pdev);
-+
-+      free_irq(s3c2410_gpio_getirq(pdev->resource[0].start), gta01kbd);
-+#if 0
-+      int i;
-+
-+      for (i = 0; i < CORGI_KEY_SENSE_NUM; i++)
-+              free_irq(CORGI_IRQ_GPIO_KEY_SENSE(i), corgikbd);
-+
-+      del_timer_sync(&corgikbd->htimer);
-+      del_timer_sync(&corgikbd->timer);
-+#endif
-+      input_unregister_device(gta01kbd->input);
-+
-+      kfree(gta01kbd);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver gta01kbd_driver = {
-+      .probe          = gta01kbd_probe,
-+      .remove         = gta01kbd_remove,
-+      .suspend        = gta01kbd_suspend,
-+      .resume         = gta01kbd_resume,
-+      .driver         = {
-+              .name   = "qt2410-button",
-+      },
-+};
-+
-+static int __devinit gta01kbd_init(void)
-+{
-+      return platform_driver_register(&gta01kbd_driver);
-+}
-+
-+static void __exit gta01kbd_exit(void)
-+{
-+      platform_driver_unregister(&gta01kbd_driver);
-+}
-+
-+module_init(gta01kbd_init);
-+module_exit(gta01kbd_exit);
-+
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_DESCRIPTION("Armzone QT2410 Buttons Driver");
-+MODULE_LICENSE("GPL");
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1051-fail-unless-uimage.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1051-fail-unless-uimage.patch.patch
deleted file mode 100644 (file)
index f5121d8..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-From 13a8a1f0848115f23553d15f15aa2b836f459614 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:49 +0100
-Subject: [PATCH] fail-unless-uimage.patch
- Fail the build noisily if "mkimage" can't be found, e.g., if we forgot to add
- the u-boot directory to PATH.
-
----
- scripts/mkuboot.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/scripts/mkuboot.sh b/scripts/mkuboot.sh
-index 2e3d3cd..446739c 100755
---- a/scripts/mkuboot.sh
-+++ b/scripts/mkuboot.sh
-@@ -11,7 +11,7 @@ if [ -z "${MKIMAGE}" ]; then
-       if [ -z "${MKIMAGE}" ]; then
-               # Doesn't exist
-               echo '"mkimage" command not found - U-Boot images will not be built' >&2
--              exit 0;
-+              exit 1;
-       fi
- fi
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1052-montour-audio.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1052-montour-audio.patch.patch
deleted file mode 100644 (file)
index 85a2344..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From f8c4e2db8608131a88c6c0f17d55cbd540d32ec8 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:50 +0100
-Subject: [PATCH] montour-audio.patch
- http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=1190
-
----
- sound/soc/codecs/wm8753.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
-index 52207d5..3df5b44 100644
---- a/sound/soc/codecs/wm8753.c
-+++ b/sound/soc/codecs/wm8753.c
-@@ -279,7 +279,7 @@ SOC_DOUBLE_R("Speaker Playback ZC Switch", WM8753_LOUT2V, WM8753_ROUT2V, 7, 1, 0
- SOC_SINGLE("Mono Bypass Playback Volume", WM8753_MOUTM1, 4, 7, 1),
- SOC_SINGLE("Mono Sidetone Playback Volume", WM8753_MOUTM2, 4, 7, 1),
--SOC_SINGLE("Mono Voice Playback Volume", WM8753_MOUTM2, 4, 7, 1),
-+SOC_SINGLE("Mono Voice Playback Volume", WM8753_MOUTM2, 0, 7, 1),
- SOC_SINGLE("Mono Playback ZC Switch", WM8753_MOUTV, 7, 1, 0),
- SOC_ENUM("Bass Boost", wm8753_enum[0]),
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1053-introduce-fiq-basis.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1053-introduce-fiq-basis.patch.patch
deleted file mode 100644 (file)
index 066fe0f..0000000
+++ /dev/null
@@ -1,601 +0,0 @@
-From f83b2007a1e3552a5f15faacf42f7383cd73129a Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:50 +0100
-Subject: [PATCH] introduce-fiq-basis.patch
- Adds a C-based FIQ ISR which is very convenient (and unusual --
- normally you have to do FIQ ISR in assembler only).
- Based on my article:
-
-http://warmcat.com/_wp/2007/09/17/at91rm9200-fiq-faq-and-simple-example-code-patch/
-
-Implemented as a platform device and driver.
-
-Suspend / resume is tested and works.
-
-Signed-off-by: Andy Green <andy@warmcat.com>
----
- arch/arm/mach-s3c2440/Kconfig                |    7 +
- arch/arm/mach-s3c2440/Makefile               |    1 +
- arch/arm/mach-s3c2440/fiq_c_isr.c            |  250 ++++++++++++++++++++++++++
- arch/arm/mach-s3c2440/fiq_c_isr.h            |   64 +++++++
- arch/arm/mach-s3c2440/mach-gta02.c           |   22 +++
- arch/arm/plat-s3c24xx/irq.c                  |   32 +++-
- include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h |   28 +++
- include/asm-arm/arch-s3c2410/irqs.h          |    4 +
- include/asm-arm/plat-s3c24xx/irq.h           |   20 ++
- 9 files changed, 426 insertions(+), 2 deletions(-)
- create mode 100644 arch/arm/mach-s3c2440/fiq_c_isr.c
- create mode 100644 arch/arm/mach-s3c2440/fiq_c_isr.h
- create mode 100644 include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-
-diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
-index 1fab1c0..f7bea5d 100644
---- a/arch/arm/mach-s3c2440/Kconfig
-+++ b/arch/arm/mach-s3c2440/Kconfig
-@@ -22,6 +22,13 @@ config S3C2440_DMA
-       help
-         Support for S3C2440 specific DMA code5A
-+config S3C2440_C_FIQ
-+      bool "FIQ ISR support in C"
-+      depends on ARCH_S3C2410
-+      select FIQ
-+      help
-+        Support for S3C2440 FIQ support in C -- see
-+        ./arch/arm/macs3c2440/fiq_c_isr.c
- menu "S3C2440 Machines"
-diff --git a/arch/arm/mach-s3c2440/Makefile b/arch/arm/mach-s3c2440/Makefile
-index 5305fdb..e3ca9e3 100644
---- a/arch/arm/mach-s3c2440/Makefile
-+++ b/arch/arm/mach-s3c2440/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_CPU_S3C2440)    += s3c2440.o dsc.o
- obj-$(CONFIG_CPU_S3C2440)     += irq.o
- obj-$(CONFIG_CPU_S3C2440)     += clock.o
- obj-$(CONFIG_S3C2440_DMA)     += dma.o
-+obj-$(CONFIG_S3C2440_C_FIQ)   += fiq_c_isr.o
- # Machine support
-diff --git a/arch/arm/mach-s3c2440/fiq_c_isr.c b/arch/arm/mach-s3c2440/fiq_c_isr.c
-new file mode 100644
-index 0000000..12f4527
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/fiq_c_isr.c
-@@ -0,0 +1,250 @@
-+/*
-+ * Copyright 2007  Andy Green <andy@warmcat.com>
-+ * S3C modfifications
-+ * Copyright 2008 Andy Green <andy@openmoko.com>
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <asm/hardware.h>
-+#include <asm/fiq.h>
-+#include "fiq_c_isr.h"
-+#include <linux/sysfs.h>
-+#include <linux/device.h>
-+#include <linux/platform_device.h>
-+
-+#include <asm/io.h>
-+
-+#include <asm/plat-s3c24xx/cpu.h>
-+#include <asm/plat-s3c24xx/irq.h>
-+
-+/*
-+ * Major Caveats for using FIQ
-+ * ---------------------------
-+ *
-+ * 1) it CANNOT touch any vmalloc()'d memory, only memory
-+ *    that was kmalloc()'d.  Static allocations in the monolithic kernel
-+ *    are kmalloc()'d so they are okay.  You can touch memory-mapped IO, but
-+ *    the pointer for it has to have been stored in kmalloc'd memory.  The
-+ *    reason for this is simple: every now and then Linux turns off interrupts
-+ *    and reorders the paging tables.  If a FIQ happens during this time, the
-+ *    virtual memory space can be partly or entirely disordered or missing.
-+ *
-+ * 2) Because vmalloc() is used when a module is inserted, THIS FIQ
-+ *    ISR HAS TO BE IN THE MONOLITHIC KERNEL, not a module.  But the way
-+ *    it is set up, you can all to enable and disable it from your module
-+ *    and intercommunicate with it through struct fiq_ipc
-+ *    fiq_ipc which you can define in
-+ *    asm/archfiq_ipc_type.h.  The reason is the same as above, a
-+ *    FIQ could happen while even the ISR is not present in virtual memory
-+ *    space due to pagetables being changed at the time.
-+ *
-+ * 3) You can't call any Linux API code except simple macros
-+ *    - understand that FIQ can come in at any time, no matter what
-+ *      state of undress the kernel may privately be in, thinking it
-+ *      locked the door by turning off interrupts... FIQ is an
-+ *      unstoppable monster force (which is its value)
-+ *    - they are not vmalloc()'d memory safe
-+ *    - they might do crazy stuff like sleep: FIQ pisses fire and
-+ *      is not interested in 'sleep' that the weak seem to need
-+ *    - calling APIs from FIQ can re-enter un-renterable things
-+ *    - summary: you cannot interoperate with linux APIs directly in the FIQ ISR
-+ *
-+ * If you follow these rules, it is fantastic, an extremely powerful, solid,
-+ * genuine hard realtime feature.
-+ *
-+ */
-+
-+/* more than enough to cover our jump instruction to the isr */
-+#define SIZEOF_FIQ_JUMP 8
-+/* more than enough to cover s3c2440_fiq_isr() in 4K blocks */
-+#define SIZEOF_FIQ_ISR 0x2000
-+/* increase the size of the stack that is active during FIQ as needed */
-+static u8 u8aFiqStack[4096];
-+
-+/* only one FIQ ISR possible, okay to do these here */
-+u32 _fiq_ack_mask; /* used by isr exit define */
-+unsigned long _fiq_count_fiqs; /* used by isr exit define */
-+static int _fiq_irq; /* private ; irq index we were started with, or 0 */
-+
-+/* this function must live in the monolithic kernel somewhere!  A module is
-+ * NOT good enough!
-+ */
-+extern void __attribute__ ((naked)) s3c2440_fiq_isr(void);
-+
-+/* this is copied into the hard FIQ vector during init */
-+
-+static void __attribute__ ((naked)) s3c2440_FIQ_Branch(void)
-+{
-+      asm __volatile__ (
-+              "mov pc, r8 ; "
-+      );
-+}
-+
-+/* sysfs */
-+
-+static ssize_t show_count(struct device *dev, struct device_attribute *attr,
-+                       char *buf)
-+{
-+      return sprintf(buf, "%ld\n", _fiq_count_fiqs);
-+}
-+
-+static DEVICE_ATTR(count, 0444, show_count, NULL);
-+
-+static struct attribute *s3c2440_fiq_sysfs_entries[] = {
-+      &dev_attr_count.attr,
-+      NULL
-+};
-+
-+static struct attribute_group s3c2440_fiq_attr_group = {
-+      .name   = "fiq",
-+      .attrs  = s3c2440_fiq_sysfs_entries,
-+};
-+
-+/*
-+ * call this from your kernel module to set up the FIQ ISR to service FIQs,
-+ * You need to have configured your FIQ input pin before anything will happen
-+ *
-+ * call it with, eg, IRQ_TIMER3 from asm-arm/arch-s3c2410/irqs.h
-+ *
-+ * you still need to clear the source interrupt in S3C2410_INTMSK to get
-+ * anything good happening
-+ */
-+static void fiq_init_irq_source(int irq_index_fiq)
-+{
-+      if (!irq_index_fiq) /* no interrupt */
-+              return;
-+
-+      printk(KERN_INFO"Enabling FIQ using int idx %d\n",
-+             irq_index_fiq - S3C2410_CPUIRQ_OFFSET);
-+      local_fiq_disable();
-+
-+      _fiq_irq = irq_index_fiq;
-+      _fiq_ack_mask = 1 << (irq_index_fiq - S3C2410_CPUIRQ_OFFSET);
-+
-+      /* let our selected interrupt be a magic FIQ interrupt */
-+      __raw_writel(_fiq_ack_mask, S3C2410_INTMOD);
-+
-+      /* it's ready to go as soon as we unmask the source in S3C2410_INTMSK */
-+      local_fiq_enable();
-+}
-+
-+
-+/* call this from your kernel module to disable generation of FIQ actions */
-+static void fiq_disable_irq_source(void)
-+{
-+      /* nothing makes FIQ any more */
-+      __raw_writel(0, S3C2410_INTMOD);
-+      local_fiq_disable();
-+      _fiq_irq = 0; /* no active source interrupt now either */
-+}
-+
-+/* this starts FIQ timer events... they continue until the FIQ ISR sees that
-+ * its work is done and it turns off the timer.  After setting up the fiq_ipc
-+ * struct with new work, you call this to start FIQ timer actions up again.
-+ * Only the FIQ ISR decides when it is done and controls turning off the
-+ * timer events.
-+ */
-+void fiq_kick(void)
-+{
-+      unsigned long flags;
-+
-+      /* we have to take care about FIQ because this modification is
-+       * non-atomic, FIQ could come in after the read and before the
-+       * writeback and its changes to the register would be lost
-+       * (platform INTMSK mod code is taken care of already)
-+       */
-+      local_save_flags(flags);
-+      local_fiq_disable();
-+      __raw_writel(__raw_readl(S3C2410_INTMSK) &
-+                   ~(1 << (_fiq_irq - S3C2410_CPUIRQ_OFFSET)),
-+                   S3C2410_INTMSK);
-+      local_irq_restore(flags);
-+}
-+EXPORT_SYMBOL_GPL(fiq_kick);
-+
-+
-+
-+static int __init sc32440_fiq_probe(struct platform_device *pdev)
-+{
-+      struct resource *r = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-+
-+      if (!r)
-+              return -EIO;
-+      /* configure for the interrupt we are meant to use */
-+      fiq_init_irq_source(r->start);
-+
-+      return sysfs_create_group(&pdev->dev.kobj, &s3c2440_fiq_attr_group);
-+}
-+
-+static int sc32440_fiq_remove(struct platform_device *pdev)
-+{
-+      fiq_disable_irq_source();
-+      sysfs_remove_group(&pdev->dev.kobj, &s3c2440_fiq_attr_group);
-+      return 0;
-+}
-+
-+static void fiq_set_vector_and_regs(void)
-+{
-+      struct pt_regs regs;
-+
-+      /* prep the special FIQ mode regs */
-+      memset(&regs, 0, sizeof(regs));
-+      regs.ARM_r8 = (unsigned long)s3c2440_fiq_isr;
-+      regs.ARM_sp = (unsigned long)u8aFiqStack + sizeof(u8aFiqStack) - 4;
-+      /* set up the special FIQ-mode-only registers from our regs */
-+      set_fiq_regs(&regs);
-+      /* copy our jump to the real ISR into the hard vector address */
-+      set_fiq_handler(s3c2440_FIQ_Branch, SIZEOF_FIQ_JUMP);
-+}
-+
-+#ifdef CONFIG_PM
-+static int sc32440_fiq_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+      /* nothing makes FIQ any more */
-+      __raw_writel(0, S3C2410_INTMOD);
-+      local_fiq_disable();
-+
-+      return 0;
-+}
-+
-+static int sc32440_fiq_resume(struct platform_device *pdev)
-+{
-+      fiq_set_vector_and_regs();
-+      fiq_init_irq_source(_fiq_irq);
-+      return 0;
-+}
-+#else
-+#define sc32440_fiq_suspend   NULL
-+#define sc32440_fiq_resume    NULL
-+#endif
-+
-+static struct platform_driver sc32440_fiq_driver = {
-+      .driver = {
-+              .name   = "sc32440_fiq",
-+              .owner  = THIS_MODULE,
-+      },
-+
-+      .probe   = sc32440_fiq_probe,
-+      .remove  = __devexit_p(sc32440_fiq_remove),
-+      .suspend = sc32440_fiq_suspend,
-+      .resume  = sc32440_fiq_resume,
-+};
-+
-+static int __init sc32440_fiq_init(void)
-+{
-+      fiq_set_vector_and_regs();
-+
-+      return platform_driver_register(&sc32440_fiq_driver);
-+}
-+
-+static void __exit sc32440_fiq_exit(void)
-+{
-+      fiq_disable_irq_source();
-+}
-+
-+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
-+MODULE_LICENSE("GPL");
-+
-+module_init(sc32440_fiq_init);
-+module_exit(sc32440_fiq_exit);
-diff --git a/arch/arm/mach-s3c2440/fiq_c_isr.h b/arch/arm/mach-s3c2440/fiq_c_isr.h
-new file mode 100644
-index 0000000..f08740e
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/fiq_c_isr.h
-@@ -0,0 +1,64 @@
-+#ifndef _LINUX_FIQ_C_ISR_H
-+#define _LINUX_FIQ_C_ISR_H
-+
-+#include <asm/arch-s3c2410/regs-irq.h>
-+
-+extern unsigned long _fiq_count_fiqs;
-+extern u32 _fiq_ack_mask;
-+
-+/* This CANNOT be implemented in a module -- it has to be used in code
-+ * included in the monolithic kernel
-+ */
-+
-+#define FIQ_HANDLER_START() \
-+void __attribute__ ((naked)) s3c2440_fiq_isr(void) \
-+{\
-+      /*\
-+       * you can declare local vars here, take care to set the frame size\
-+       *  below accordingly if there are more than a few dozen bytes of them\
-+       */\
-+
-+/* stick your locals here :-)
-+ * Do NOT initialize them here!  define them and initialize them after
-+ * FIQ_HANDLER_ENTRY() is done.
-+ */
-+
-+#define FIQ_HANDLER_ENTRY(LOCALS, FRAME) \
-+      const int _FIQ_FRAME_SIZE = FRAME; \
-+      /* entry takes care to store registers we will be treading on here */\
-+      asm __volatile__ (\
-+              "mov     ip, sp ;"\
-+              /* stash FIQ and r0-r8 normal regs */\
-+              "stmdb  sp!, {r0-r12, lr};"\
-+              /* allow SP to get some space */\
-+              "sub     sp, sp, %1 ;"\
-+              /* !! THIS SETS THE FRAME, adjust to > sizeof locals */\
-+              "sub     fp, sp, %0 ;"\
-+              :\
-+              : "rI" (LOCALS), "rI" (FRAME)\
-+              :"r9"\
-+      );
-+
-+/* stick your ISR code here and then end with... */
-+
-+#define FIQ_HANDLER_END() \
-+      _fiq_count_fiqs++;\
-+      __raw_writel(_fiq_ack_mask, S3C2410_SRCPND);\
-+\
-+      /* exit back to normal mode restoring everything */\
-+      asm __volatile__ (\
-+              /* pop our allocation */\
-+              "add     sp, sp, %0 ;"\
-+              /* return FIQ regs back to pristine state\
-+               * and get normal regs back\
-+               */\
-+              "ldmia  sp!, {r0-r12, lr};"\
-+\
-+              /* return */\
-+              "subs   pc, lr, #4;"\
-+              : \
-+              : "rI" (_FIQ_FRAME_SIZE) \
-+      );\
-+}
-+
-+#endif /* _LINUX_FIQ_C_ISR_H */
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 46acede..0bdd0e0 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -78,9 +78,31 @@
- #include <linux/glamofb.h>
-+#include <asm/arch/fiq_ipc_gta02.h>
-+#include "fiq_c_isr.h"
-+
- /* arbitrates which sensor IRQ owns the shared SPI bus */
- static spinlock_t motion_irq_lock;
-+/* define FIQ IPC struct */
-+/*
-+ * contains stuff FIQ ISR modifies and normal kernel code can see and use
-+ * this is defined in <asm/arch/fiq_ipc_gta02.h>, you should customize
-+ * the definition in there and include the same definition in your kernel
-+ * module that wants to interoperate with your FIQ code.
-+ */
-+struct fiq_ipc fiq_ipc;
-+EXPORT_SYMBOL(fiq_ipc);
-+
-+/* define FIQ ISR */
-+
-+FIQ_HANDLER_START()
-+/* define your locals here -- no initializers though */
-+FIQ_HANDLER_ENTRY(256, 512)
-+/* Your ISR here :-) */
-+FIQ_HANDLER_END()
-+
-+
- static struct map_desc gta02_iodesc[] __initdata = {
-       {
-               .virtual        = 0xe0000000,
-diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c
-index 8fbc884..82f0b04 100644
---- a/arch/arm/plat-s3c24xx/irq.c
-+++ b/arch/arm/plat-s3c24xx/irq.c
-@@ -133,12 +133,20 @@ static void
- s3c_irq_mask(unsigned int irqno)
- {
-       unsigned long mask;
--
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      unsigned long flags;
-+#endif
-       irqno -= IRQ_EINT0;
--
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      local_save_flags(flags);
-+      local_fiq_disable();
-+#endif
-       mask = __raw_readl(S3C2410_INTMSK);
-       mask |= 1UL << irqno;
-       __raw_writel(mask, S3C2410_INTMSK);
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      local_irq_restore(flags);
-+#endif
- }
- static inline void
-@@ -155,9 +163,19 @@ s3c_irq_maskack(unsigned int irqno)
- {
-       unsigned long bitval = 1UL << (irqno - IRQ_EINT0);
-       unsigned long mask;
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      unsigned long flags;
-+#endif
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      local_save_flags(flags);
-+      local_fiq_disable();
-+#endif
-       mask = __raw_readl(S3C2410_INTMSK);
-       __raw_writel(mask|bitval, S3C2410_INTMSK);
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      local_irq_restore(flags);
-+#endif
-       __raw_writel(bitval, S3C2410_SRCPND);
-       __raw_writel(bitval, S3C2410_INTPND);
-@@ -168,15 +186,25 @@ static void
- s3c_irq_unmask(unsigned int irqno)
- {
-       unsigned long mask;
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      unsigned long flags;
-+#endif
-       if (irqno != IRQ_TIMER4 && irqno != IRQ_EINT8t23)
-               irqdbf2("s3c_irq_unmask %d\n", irqno);
-       irqno -= IRQ_EINT0;
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      local_save_flags(flags);
-+      local_fiq_disable();
-+#endif
-       mask = __raw_readl(S3C2410_INTMSK);
-       mask &= ~(1UL << irqno);
-       __raw_writel(mask, S3C2410_INTMSK);
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      local_irq_restore(flags);
-+#endif
- }
- struct irq_chip s3c_irq_level_chip = {
-diff --git a/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h b/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-new file mode 100644
-index 0000000..341f2bb
---- /dev/null
-+++ b/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-@@ -0,0 +1,28 @@
-+#ifndef _LINUX_FIQ_IPC_H
-+#define _LINUX_FIQ_IPC_H
-+
-+/*
-+ * this defines the struct which is used to communicate between the FIQ
-+ * world and the normal linux kernel world.  One of these structs is
-+ * statically defined for you in the monolithic kernel so the FIQ ISR code
-+ * can safely touch it any any time.
-+ *
-+ * You also want to include this file in your kernel module that wants to
-+ * communicate with your FIQ code.  Add any kinds of vars that are used by
-+ * the FIQ ISR and the module in here.
-+ *
-+ * To get you started there is just an int that is incremented every FIQ
-+ * you can remove this when you are ready to customize, but it is useful
-+ * for testing
-+ */
-+
-+struct fiq_ipc {
-+      u8 u8a[0]; /* placeholder */
-+};
-+
-+/* actual definition lives in arch/arm/mach-s3c2440/fiq_c_isr.c */
-+extern struct fiq_ipc fiq_ipc;
-+
-+extern void fiq_kick(void);  /* provoke a FIQ "immediately" */
-+
-+#endif /* _LINUX_FIQ_IPC_H */
-diff --git a/include/asm-arm/arch-s3c2410/irqs.h b/include/asm-arm/arch-s3c2410/irqs.h
-index 9522cd1..ab50ffb 100644
---- a/include/asm-arm/arch-s3c2410/irqs.h
-+++ b/include/asm-arm/arch-s3c2410/irqs.h
-@@ -188,4 +188,8 @@
- #define IRQ_GLAMO_MMC         IRQ_GLAMO(7)
- #define IRQ_GLAMO_RISC                IRQ_GLAMO(8)
-+/* offset for FIQ IRQ numbers - used by arm fiq.c */
-+
-+#define FIQ_START 0
-+
- #endif /* __ASM_ARCH_IRQ_H */
-diff --git a/include/asm-arm/plat-s3c24xx/irq.h b/include/asm-arm/plat-s3c24xx/irq.h
-index 8af6d95..f70b1fc 100644
---- a/include/asm-arm/plat-s3c24xx/irq.h
-+++ b/include/asm-arm/plat-s3c24xx/irq.h
-@@ -23,8 +23,15 @@ s3c_irqsub_mask(unsigned int irqno, unsigned int parentbit,
- {
-       unsigned long mask;
-       unsigned long submask;
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      unsigned long flags;
-+#endif
-       submask = __raw_readl(S3C2410_INTSUBMSK);
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      local_save_flags(flags);
-+      local_fiq_disable();
-+#endif
-       mask = __raw_readl(S3C2410_INTMSK);
-       submask |= (1UL << (irqno - IRQ_S3CUART_RX0));
-@@ -37,6 +44,9 @@ s3c_irqsub_mask(unsigned int irqno, unsigned int parentbit,
-       /* write back masks */
-       __raw_writel(submask, S3C2410_INTSUBMSK);
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      local_irq_restore(flags);
-+#endif
- }
-@@ -45,8 +55,15 @@ s3c_irqsub_unmask(unsigned int irqno, unsigned int parentbit)
- {
-       unsigned long mask;
-       unsigned long submask;
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      unsigned long flags;
-+#endif
-       submask = __raw_readl(S3C2410_INTSUBMSK);
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      local_save_flags(flags);
-+      local_fiq_disable();
-+#endif
-       mask = __raw_readl(S3C2410_INTMSK);
-       submask &= ~(1UL << (irqno - IRQ_S3CUART_RX0));
-@@ -55,6 +72,9 @@ s3c_irqsub_unmask(unsigned int irqno, unsigned int parentbit)
-       /* write back masks */
-       __raw_writel(submask, S3C2410_INTSUBMSK);
-       __raw_writel(mask, S3C2410_INTMSK);
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      local_irq_restore(flags);
-+#endif
- }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1054-introduce-fiq-use-timer3-as-source.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1054-introduce-fiq-use-timer3-as-source.patch.patch
deleted file mode 100644 (file)
index d02655b..0000000
+++ /dev/null
@@ -1,220 +0,0 @@
-From 4ef3bf9d0e7ffd1e70f24e47b7ede98258c8b8f4 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:51 +0100
-Subject: [PATCH] introduce-fiq-use-timer3-as-source.patch
-
-This makes the FIQ stuff specific to one of the timers on the
-s3c244x and adds the platform stuff for fiq in the gta02 init
-
-Currently one sysfs node is exposed, a count of FIQ events
-
-cat /sys/devices/platform/sc32440_fiq.0/fiq/count
-
-From: Andy Green <andy@openmoko.com>
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/fiq_c_isr.c            |   56 +++++++++++++++++++++----
- arch/arm/mach-s3c2440/fiq_c_isr.h            |    2 +
- arch/arm/mach-s3c2440/mach-gta02.c           |   17 ++++++++
- include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h |    2 +-
- 4 files changed, 67 insertions(+), 10 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/fiq_c_isr.c b/arch/arm/mach-s3c2440/fiq_c_isr.c
-index 12f4527..a71a234 100644
---- a/arch/arm/mach-s3c2440/fiq_c_isr.c
-+++ b/arch/arm/mach-s3c2440/fiq_c_isr.c
-@@ -18,6 +18,9 @@
- #include <asm/plat-s3c24xx/cpu.h>
- #include <asm/plat-s3c24xx/irq.h>
-+#include <asm/arch/pwm.h>
-+#include <asm/plat-s3c/regs-timer.h>
-+
- /*
-  * Major Caveats for using FIQ
-  * ---------------------------
-@@ -66,6 +69,10 @@ static u8 u8aFiqStack[4096];
- u32 _fiq_ack_mask; /* used by isr exit define */
- unsigned long _fiq_count_fiqs; /* used by isr exit define */
- static int _fiq_irq; /* private ; irq index we were started with, or 0 */
-+struct s3c2410_pwm pwm_timer_fiq;
-+int _fiq_timer_index;
-+u16 _fiq_timer_divisor;
-+
- /* this function must live in the monolithic kernel somewhere!  A module is
-  * NOT good enough!
-@@ -110,23 +117,45 @@ static struct attribute_group s3c2440_fiq_attr_group = {
-  * you still need to clear the source interrupt in S3C2410_INTMSK to get
-  * anything good happening
-  */
--static void fiq_init_irq_source(int irq_index_fiq)
-+static int fiq_init_irq_source(int irq_index_fiq)
- {
-+      int rc = 0;
-+
-       if (!irq_index_fiq) /* no interrupt */
--              return;
-+              goto bail;
--      printk(KERN_INFO"Enabling FIQ using int idx %d\n",
--             irq_index_fiq - S3C2410_CPUIRQ_OFFSET);
-       local_fiq_disable();
-       _fiq_irq = irq_index_fiq;
-       _fiq_ack_mask = 1 << (irq_index_fiq - S3C2410_CPUIRQ_OFFSET);
-+      timer_index = (irq_index_fiq - IRQ_TIMER0);
-+
-+      /* set up the timer to operate as a pwm device */
-+
-+      rc = s3c2410_pwm_init(&pwm_timer_fiq);
-+      if (rc)
-+              goto bail;
-+
-+      pwm_timer_fiq.timerid = PWM0 + timer_index;
-+      pwm_timer_fiq.prescaler = (6 - 1) / 2;
-+      pwm_timer_fiq.divider = S3C2410_TCFG1_MUX3_DIV2;
-+      /* default rate == ~32us */
-+      pwm_timer_fiq.counter = pwm_timer_fiq.comparer =
-+                                      timer_divisor = 64;
-+
-+      rc = s3c2410_pwm_enable(&pwm_timer_fiq);
-+      if (rc)
-+              goto bail;
-+
-+      s3c2410_pwm_start(&pwm_timer_fiq);
-       /* let our selected interrupt be a magic FIQ interrupt */
-       __raw_writel(_fiq_ack_mask, S3C2410_INTMOD);
-       /* it's ready to go as soon as we unmask the source in S3C2410_INTMSK */
-       local_fiq_enable();
-+bail:
-+      return rc;
- }
-@@ -139,15 +168,13 @@ static void fiq_disable_irq_source(void)
-       _fiq_irq = 0; /* no active source interrupt now either */
- }
--/* this starts FIQ timer events... they continue until the FIQ ISR sees that
-- * its work is done and it turns off the timer.  After setting up the fiq_ipc
-- * struct with new work, you call this to start FIQ timer actions up again.
-- * Only the FIQ ISR decides when it is done and controls turning off the
-- * timer events.
-+/*
-+ * fiq_kick() forces a FIQ event to happen shortly after leaving the routine
-  */
- void fiq_kick(void)
- {
-       unsigned long flags;
-+      u32 tcon;
-       /* we have to take care about FIQ because this modification is
-        * non-atomic, FIQ could come in after the read and before the
-@@ -156,15 +183,24 @@ void fiq_kick(void)
-        */
-       local_save_flags(flags);
-       local_fiq_disable();
-+      /* allow FIQs to resume */
-       __raw_writel(__raw_readl(S3C2410_INTMSK) &
-                    ~(1 << (_fiq_irq - S3C2410_CPUIRQ_OFFSET)),
-                    S3C2410_INTMSK);
-+      tcon = __raw_readl(S3C2410_TCON) & ~S3C2410_TCON_T3START;
-+      /* fake the timer to a count of 1 */
-+      __raw_writel(1, S3C2410_TCNTB(timer_index));
-+      __raw_writel(tcon | S3C2410_TCON_T3MANUALUPD, S3C2410_TCON);
-+      __raw_writel(tcon | S3C2410_TCON_T3MANUALUPD | S3C2410_TCON_T3START,
-+                   S3C2410_TCON);
-+      __raw_writel(tcon | S3C2410_TCON_T3START, S3C2410_TCON);
-       local_irq_restore(flags);
- }
- EXPORT_SYMBOL_GPL(fiq_kick);
-+
- static int __init sc32440_fiq_probe(struct platform_device *pdev)
- {
-       struct resource *r = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-@@ -172,6 +208,8 @@ static int __init sc32440_fiq_probe(struct platform_device *pdev)
-       if (!r)
-               return -EIO;
-       /* configure for the interrupt we are meant to use */
-+      printk(KERN_INFO"Enabling FIQ using irq %d\n", r->start);
-+
-       fiq_init_irq_source(r->start);
-       return sysfs_create_group(&pdev->dev.kobj, &s3c2440_fiq_attr_group);
-diff --git a/arch/arm/mach-s3c2440/fiq_c_isr.h b/arch/arm/mach-s3c2440/fiq_c_isr.h
-index f08740e..0c45eb7 100644
---- a/arch/arm/mach-s3c2440/fiq_c_isr.h
-+++ b/arch/arm/mach-s3c2440/fiq_c_isr.h
-@@ -5,6 +5,8 @@
- extern unsigned long _fiq_count_fiqs;
- extern u32 _fiq_ack_mask;
-+extern int _fiq_timer_index;
-+extern u16 _fiq_timer_divisor;
- /* This CANNOT be implemented in a module -- it has to be used in code
-  * included in the monolithic kernel
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 0bdd0e0..cb839b2 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -57,6 +57,7 @@
- #include <asm/irq.h>
- #include <asm/mach-types.h>
-+#include <asm/arch-s3c2410/regs-irq.h>
- #include <asm/arch/regs-gpio.h>
- #include <asm/arch/regs-gpioj.h>
- #include <asm/arch/fb.h>
-@@ -336,6 +337,21 @@ struct platform_device gta02_pmu_dev = {
-       },
- };
-+/* FIQ */
-+
-+static struct resource sc32440_fiq_resources[] = {
-+      [0] = {
-+              .flags  = IORESOURCE_IRQ,
-+              .start  = IRQ_TIMER3,
-+              .end    = IRQ_TIMER3,
-+      },
-+};
-+
-+struct platform_device sc32440_fiq_device = {
-+      .name           = "sc32440_fiq",
-+      .num_resources  = 1,
-+      .resource       = sc32440_fiq_resources,
-+};
- /* NOR Flash */
-@@ -403,6 +419,7 @@ static struct platform_device *gta02_devices[] __initdata = {
-       &s3c_device_nand,
-       &s3c_device_ts,
-       &gta02_nor_flash,
-+      &sc32440_fiq_device,
- };
- static struct s3c2410_nand_set gta02_nand_sets[] = {
-diff --git a/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h b/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-index 341f2bb..6cbd8e4 100644
---- a/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-+++ b/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-@@ -22,7 +22,7 @@ struct fiq_ipc {
- /* actual definition lives in arch/arm/mach-s3c2440/fiq_c_isr.c */
- extern struct fiq_ipc fiq_ipc;
--
-+extern unsigned long _fiq_count_fiqs;
- extern void fiq_kick(void);  /* provoke a FIQ "immediately" */
- #endif /* _LINUX_FIQ_IPC_H */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1055-introduce-fiq-migrate-vibrator-gta02-only.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1055-introduce-fiq-migrate-vibrator-gta02-only.patch.patch
deleted file mode 100644 (file)
index 399da0f..0000000
+++ /dev/null
@@ -1,243 +0,0 @@
-From b1b2748dd58ae925df4b4e98921db373a7777e9b Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:52 +0100
-Subject: [PATCH] introduce-fiq-migrate-vibrator-gta02-only.patch
-
-On GTA02 we use FIQ to manage the vibrator IO now.  That
-is necessary because we stole timer3 from doing hw pwm
-for vibrator.  This keeps the same UI in /sys but does
-"bitbang pwm" on the same vibrator GPIO
-
-From: Andy Green <andy@openmoko.com>
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/fiq_c_isr.c            |   13 +++++---
- arch/arm/mach-s3c2440/mach-gta02.c           |   38 ++++++++++++++++++++++++++
- drivers/leds/Kconfig                         |    1 +
- drivers/leds/leds-neo1973-vibrator.c         |   24 +++++++++++++++-
- include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h |    9 +++++-
- 5 files changed, 77 insertions(+), 8 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/fiq_c_isr.c b/arch/arm/mach-s3c2440/fiq_c_isr.c
-index a71a234..38692fc 100644
---- a/arch/arm/mach-s3c2440/fiq_c_isr.c
-+++ b/arch/arm/mach-s3c2440/fiq_c_isr.c
-@@ -79,6 +79,7 @@ u16 _fiq_timer_divisor;
-  */
- extern void __attribute__ ((naked)) s3c2440_fiq_isr(void);
-+
- /* this is copied into the hard FIQ vector during init */
- static void __attribute__ ((naked)) s3c2440_FIQ_Branch(void)
-@@ -128,7 +129,7 @@ static int fiq_init_irq_source(int irq_index_fiq)
-       _fiq_irq = irq_index_fiq;
-       _fiq_ack_mask = 1 << (irq_index_fiq - S3C2410_CPUIRQ_OFFSET);
--      timer_index = (irq_index_fiq - IRQ_TIMER0);
-+      _fiq_timer_index = (irq_index_fiq - IRQ_TIMER0);
-       /* set up the timer to operate as a pwm device */
-@@ -136,12 +137,11 @@ static int fiq_init_irq_source(int irq_index_fiq)
-       if (rc)
-               goto bail;
--      pwm_timer_fiq.timerid = PWM0 + timer_index;
-+      pwm_timer_fiq.timerid = PWM0 + _fiq_timer_index;
-       pwm_timer_fiq.prescaler = (6 - 1) / 2;
-       pwm_timer_fiq.divider = S3C2410_TCFG1_MUX3_DIV2;
-       /* default rate == ~32us */
--      pwm_timer_fiq.counter = pwm_timer_fiq.comparer =
--                                      timer_divisor = 64;
-+      pwm_timer_fiq.counter = pwm_timer_fiq.comparer = 3000;
-       rc = s3c2410_pwm_enable(&pwm_timer_fiq);
-       if (rc)
-@@ -149,6 +149,8 @@ static int fiq_init_irq_source(int irq_index_fiq)
-       s3c2410_pwm_start(&pwm_timer_fiq);
-+      _fiq_timer_divisor = 0xffff; /* so kick will work initially */
-+
-       /* let our selected interrupt be a magic FIQ interrupt */
-       __raw_writel(_fiq_ack_mask, S3C2410_INTMOD);
-@@ -189,7 +191,7 @@ void fiq_kick(void)
-                    S3C2410_INTMSK);
-       tcon = __raw_readl(S3C2410_TCON) & ~S3C2410_TCON_T3START;
-       /* fake the timer to a count of 1 */
--      __raw_writel(1, S3C2410_TCNTB(timer_index));
-+      __raw_writel(1, S3C2410_TCNTB(_fiq_timer_index));
-       __raw_writel(tcon | S3C2410_TCON_T3MANUALUPD, S3C2410_TCON);
-       __raw_writel(tcon | S3C2410_TCON_T3MANUALUPD | S3C2410_TCON_T3START,
-                    S3C2410_TCON);
-@@ -207,6 +209,7 @@ static int __init sc32440_fiq_probe(struct platform_device *pdev)
-       if (!r)
-               return -EIO;
-+
-       /* configure for the interrupt we are meant to use */
-       printk(KERN_INFO"Enabling FIQ using irq %d\n", r->start);
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index cb839b2..8c7bbe7 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -95,12 +95,50 @@ static spinlock_t motion_irq_lock;
- struct fiq_ipc fiq_ipc;
- EXPORT_SYMBOL(fiq_ipc);
-+#define DIVISOR_FROM_US(x) ((x) << 1)
-+
-+#define FIQ_DIVISOR_VIBRATOR DIVISOR_FROM_US(100)
-+
- /* define FIQ ISR */
- FIQ_HANDLER_START()
- /* define your locals here -- no initializers though */
-+      u16 divisor;
- FIQ_HANDLER_ENTRY(256, 512)
- /* Your ISR here :-) */
-+      divisor = 0xffff;
-+
-+      /* Vibrator servicing */
-+
-+      if (fiq_ipc.vib_pwm_latched || fiq_ipc.vib_pwm) { /* not idle */
-+              if (((u8)_fiq_count_fiqs) == fiq_ipc.vib_pwm_latched)
-+                      s3c2410_gpio_setpin(fiq_ipc.vib_gpio_pin, 0);
-+              if (((u8)_fiq_count_fiqs) == 0) {
-+                      fiq_ipc.vib_pwm_latched = fiq_ipc.vib_pwm;
-+                      if (fiq_ipc.vib_pwm_latched)
-+                              s3c2410_gpio_setpin(fiq_ipc.vib_gpio_pin, 1);
-+              }
-+              divisor = FIQ_DIVISOR_VIBRATOR;
-+      }
-+
-+      /* TODO: HDQ servicing */
-+
-+
-+
-+      /* disable further timer interrupts if nobody has any work
-+       * or adjust rate according to who still has work
-+       *
-+       * CAUTION: it means forground code must disable FIQ around
-+       * its own non-atomic S3C2410_INTMSK changes... not common
-+       * thankfully and taken care of by the fiq-basis patch
-+       */
-+      if (divisor == 0xffff) /* mask the fiq irq source */
-+              __raw_writel(__raw_readl(S3C2410_INTMSK) | _fiq_ack_mask,
-+                           S3C2410_INTMSK);
-+      else /* still working, maybe at a different rate */
-+              __raw_writel(divisor, S3C2410_TCNTB(_fiq_timer_index));
-+      _fiq_timer_divisor = divisor;
-+
- FIQ_HANDLER_END()
-diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
-index 2f95707..77aa3bd 100644
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -117,6 +117,7 @@ config LEDS_CM_X270
- config LEDS_NEO1973_VIBRATOR
-       tristate "Vibrator Support for the FIC Neo1973 GSM phone"
-       depends on LEDS_CLASS && MACH_NEO1973
-+      select S3C2440_C_FIQ
-       help
-         This option enables support for the vibrator on the FIC Neo1973.
-diff --git a/drivers/leds/leds-neo1973-vibrator.c b/drivers/leds/leds-neo1973-vibrator.c
-index c943a6a..36ed216 100644
---- a/drivers/leds/leds-neo1973-vibrator.c
-+++ b/drivers/leds/leds-neo1973-vibrator.c
-@@ -23,6 +23,8 @@
- #include <asm/arch/gta01.h>
- #include <asm/plat-s3c/regs-timer.h>
-+#include <asm/arch-s3c2410/fiq_ipc_gta02.h>
-+
- #define COUNTER 64
- struct neo1973_vib_priv {
-@@ -39,6 +41,11 @@ static void neo1973_vib_vib_set(struct led_classdev *led_cdev,
-       struct neo1973_vib_priv *vp =
-               container_of(led_cdev, struct neo1973_vib_priv, cdev);
-+      if (machine_is_neo1973_gta02()) { /* use FIQ to control GPIO */
-+              fiq_ipc.vib_pwm = value; /* set it for FIQ */
-+              fiq_kick(); /* start up FIQs if not already going */
-+              return;
-+      }
-       /*
-        * value == 255 -> 99% duty cycle (full power)
-        * value == 128 -> 50% duty cycle (medium power)
-@@ -46,7 +53,7 @@ static void neo1973_vib_vib_set(struct led_classdev *led_cdev,
-        */
-       mutex_lock(&vp->mutex);
-       if (vp->has_pwm)
--              s3c2410_pwm_duty_cycle(value/4, &vp->pwm);
-+              s3c2410_pwm_duty_cycle(value / 4, &vp->pwm);
-       else {
-               if (value)
-                       s3c2410_gpio_setpin(vp->gpio, 1);
-@@ -123,6 +130,15 @@ static int __init neo1973_vib_probe(struct platform_device *pdev)
-       neo1973_vib_led.gpio = r->start;
-       platform_set_drvdata(pdev, &neo1973_vib_led);
-+      if (machine_is_neo1973_gta02()) { /* use FIQ to control GPIO */
-+              s3c2410_gpio_setpin(neo1973_vib_led.gpio, 0); /* off */
-+              s3c2410_gpio_cfgpin(neo1973_vib_led.gpio, S3C2410_GPIO_OUTPUT);
-+              /* safe, kmalloc'd copy needed for FIQ ISR */
-+              fiq_ipc.vib_gpio_pin = neo1973_vib_led.gpio;
-+              fiq_ipc.vib_pwm = 0; /* off */
-+              goto configured;
-+      }
-+
-       /* TOUT3 */
-       if (neo1973_vib_led.gpio == S3C2410_GPB3) {
-               rc = neo1973_vib_init_hw(&neo1973_vib_led);
-@@ -133,7 +149,7 @@ static int __init neo1973_vib_probe(struct platform_device *pdev)
-               s3c2410_gpio_cfgpin(neo1973_vib_led.gpio, S3C2410_GPB3_TOUT3);
-               neo1973_vib_led.has_pwm = 1;
-       }
--
-+configured:
-       mutex_init(&neo1973_vib_led.mutex);
-       return led_classdev_register(&pdev->dev, &neo1973_vib_led.cdev);
-@@ -141,6 +157,10 @@ static int __init neo1973_vib_probe(struct platform_device *pdev)
- static int neo1973_vib_remove(struct platform_device *pdev)
- {
-+      if (machine_is_neo1973_gta02()) /* use FIQ to control GPIO */
-+              fiq_ipc.vib_pwm = 0; /* off */
-+      /* would only need kick if already off so no kick needed */
-+
-       if (neo1973_vib_led.has_pwm)
-               s3c2410_pwm_disable(&neo1973_vib_led.pwm);
-diff --git a/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h b/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-index 6cbd8e4..507d235 100644
---- a/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-+++ b/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-@@ -16,8 +16,15 @@
-  * for testing
-  */
-+#include <asm/arch/pwm.h>
-+#include <asm/plat-s3c/regs-timer.h>
-+
-+
- struct fiq_ipc {
--      u8 u8a[0]; /* placeholder */
-+      /* vibrator */
-+      unsigned long vib_gpio_pin; /* which pin to meddle with */
-+      u8 vib_pwm; /* 0 = OFF -- will ensure GPIO deasserted and stop FIQ */
-+      u8 vib_pwm_latched;
- };
- /* actual definition lives in arch/arm/mach-s3c2440/fiq_c_isr.c */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1056-fiq-hdq.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1056-fiq-hdq.patch.patch
deleted file mode 100644 (file)
index 6e4fad3..0000000
+++ /dev/null
@@ -1,606 +0,0 @@
-From 7ffc881aa6a039b2e353449b97dca8a64ee3969a Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:52 +0100
-Subject: [PATCH] fiq-hdq.patch
-
----
- arch/arm/mach-s3c2440/mach-gta02.c           |  204 +++++++++++++++++++++-
- drivers/power/Kconfig                        |    8 +
- drivers/power/Makefile                       |    2 +
- drivers/power/gta02_hdq.c                    |  250 ++++++++++++++++++++++++++
- include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h |   23 +++
- include/asm-arm/arch-s3c2410/gta02.h         |    1 +
- include/linux/gta02_hdq.h                    |    8 +
- 7 files changed, 495 insertions(+), 1 deletions(-)
- create mode 100644 drivers/power/gta02_hdq.c
- create mode 100644 include/linux/gta02_hdq.h
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 8c7bbe7..cea76e7 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -99,6 +99,19 @@ EXPORT_SYMBOL(fiq_ipc);
- #define FIQ_DIVISOR_VIBRATOR DIVISOR_FROM_US(100)
-+#ifdef CONFIG_GTA02_HDQ
-+/* HDQ specific */
-+#define HDQ_SAMPLE_PERIOD_US 20
-+/* private HDQ FSM state -- all other info interesting for caller in fiq_ipc */
-+static enum hdq_bitbang_states hdq_state;
-+static u8 hdq_ctr;
-+static u8 hdq_ctr2;
-+static u8 hdq_bit;
-+static u8 hdq_shifter;
-+static u8 hdq_tx_data_done;
-+
-+#define FIQ_DIVISOR_HDQ DIVISOR_FROM_US(HDQ_SAMPLE_PERIOD_US)
-+#endif
- /* define FIQ ISR */
- FIQ_HANDLER_START()
-@@ -121,9 +134,171 @@ FIQ_HANDLER_ENTRY(256, 512)
-               divisor = FIQ_DIVISOR_VIBRATOR;
-       }
--      /* TODO: HDQ servicing */
-+#ifdef CONFIG_GTA02_HDQ
-+      /* HDQ servicing */
-+
-+      switch (hdq_state) {
-+      case HDQB_IDLE:
-+              if (fiq_ipc.hdq_request_ctr == fiq_ipc.hdq_transaction_ctr)
-+                      break;
-+              hdq_ctr = 210 / HDQ_SAMPLE_PERIOD_US;
-+              s3c2410_gpio_setpin(fiq_ipc.hdq_gpio_pin, 0);
-+              s3c2410_gpio_cfgpin(fiq_ipc.hdq_gpio_pin, S3C2410_GPIO_OUTPUT);
-+              hdq_tx_data_done = 0;
-+              hdq_state = HDQB_TX_BREAK;
-+              break;
-+
-+      case HDQB_TX_BREAK: /* issue low for > 190us */
-+              if (--hdq_ctr == 0) {
-+                      hdq_ctr = 60 / HDQ_SAMPLE_PERIOD_US;
-+                      hdq_state = HDQB_TX_BREAK_RECOVERY;
-+                      s3c2410_gpio_setpin(fiq_ipc.hdq_gpio_pin, 1);
-+              }
-+              break;
-+
-+      case HDQB_TX_BREAK_RECOVERY: /* issue low for > 40us */
-+              if (--hdq_ctr)
-+                      break;
-+              hdq_shifter = fiq_ipc.hdq_ads;
-+              hdq_bit = 8; /* 8 bits of ads / rw */
-+              hdq_tx_data_done = 0; /* doing ads */
-+              /* fallthru on last one */
-+      case HDQB_ADS_CALC:
-+              if (hdq_shifter & 1)
-+                      hdq_ctr = 50 / HDQ_SAMPLE_PERIOD_US;
-+              else
-+                      hdq_ctr = 120 / HDQ_SAMPLE_PERIOD_US;
-+              /* carefully precompute the other phase length */
-+              hdq_ctr2 = (210 - (hdq_ctr * HDQ_SAMPLE_PERIOD_US)) /
-+                              HDQ_SAMPLE_PERIOD_US;
-+              hdq_state = HDQB_ADS_LOW;
-+              hdq_shifter >>= 1;
-+              hdq_bit--;
-+              s3c2410_gpio_setpin(fiq_ipc.hdq_gpio_pin, 0);
-+              break;
-+
-+      case HDQB_ADS_LOW:
-+              if (--hdq_ctr)
-+                      break;
-+              s3c2410_gpio_setpin(fiq_ipc.hdq_gpio_pin, 1);
-+              hdq_state = HDQB_ADS_HIGH;
-+              break;
-+
-+      case HDQB_ADS_HIGH:
-+              if (--hdq_ctr2 > 1) /* account for HDQB_ADS_CALC */
-+                      break;
-+              if (hdq_bit) { /* more bits to do */
-+                      hdq_state = HDQB_ADS_CALC;
-+                      break;
-+              }
-+              /* no more bits, wait it out until hdq_ctr2 exhausted */
-+              if (hdq_ctr2)
-+                      break;
-+              /* ok no more bits and very last state */
-+              hdq_ctr = 60 / HDQ_SAMPLE_PERIOD_US;
-+              /* FIXME 0 = read */
-+              if (fiq_ipc.hdq_ads & 0x80) { /* write the byte out */
-+                       /* set delay before payload */
-+                      hdq_ctr = 300 / HDQ_SAMPLE_PERIOD_US;
-+                      /* already high, no need to write */
-+                      hdq_state = HDQB_WAIT_TX;
-+                      break;
-+              }
-+              /* read the next byte */
-+              hdq_bit = 8; /* 8 bits of data */
-+              hdq_ctr = 3000 / HDQ_SAMPLE_PERIOD_US;
-+              hdq_state = HDQB_WAIT_RX;
-+              s3c2410_gpio_cfgpin(fiq_ipc.hdq_gpio_pin, S3C2410_GPIO_INPUT);
-+              break;
-+
-+      case HDQB_WAIT_TX: /* issue low for > 40us */
-+              if (--hdq_ctr)
-+                      break;
-+              if (!hdq_tx_data_done) { /* was that the data sent? */
-+                      hdq_tx_data_done++;
-+                      hdq_shifter = fiq_ipc.hdq_tx_data;
-+                      hdq_bit = 8; /* 8 bits of data */
-+                      hdq_state = HDQB_ADS_CALC; /* start sending */
-+                      break;
-+              }
-+              fiq_ipc.hdq_error = 0;
-+              fiq_ipc.hdq_transaction_ctr++;
-+              hdq_state = HDQB_IDLE; /* all tx is done */
-+              /* idle in input mode, it's pulled up by 10K */
-+              s3c2410_gpio_cfgpin(fiq_ipc.hdq_gpio_pin, S3C2410_GPIO_INPUT);
-+              break;
-+
-+      case HDQB_WAIT_RX: /* wait for battery to talk to us */
-+              if (s3c2410_gpio_getpin(fiq_ipc.hdq_gpio_pin) == 0) {
-+                      /* it talks to us! */
-+                      hdq_ctr2 = 1;
-+                      hdq_bit = 8; /* 8 bits of data */
-+                      /* timeout */
-+                      hdq_ctr = 300 / HDQ_SAMPLE_PERIOD_US;
-+                      hdq_state = HDQB_DATA_RX_LOW;
-+                      break;
-+              }
-+              if (--hdq_ctr == 0) { /* timed out, error */
-+                      fiq_ipc.hdq_error = 1;
-+                      fiq_ipc.hdq_transaction_ctr++;
-+                      hdq_state = HDQB_IDLE; /* abort */
-+              }
-+              break;
-+
-+      /*
-+       * HDQ basically works by measuring the low time of the bit cell
-+       * 32-50us --> '1', 80 - 145us --> '0'
-+       */
-+
-+      case HDQB_DATA_RX_LOW:
-+              if (s3c2410_gpio_getpin(fiq_ipc.hdq_gpio_pin)) {
-+                      fiq_ipc.hdq_rx_data >>= 1;
-+                      if (hdq_ctr2 <= (65 / HDQ_SAMPLE_PERIOD_US))
-+                              fiq_ipc.hdq_rx_data |= 0x80;
-+
-+                      if (--hdq_bit == 0) {
-+                              fiq_ipc.hdq_error = 0;
-+                              fiq_ipc.hdq_transaction_ctr++; /* done */
-+                              hdq_state = HDQB_IDLE;
-+                      } else
-+                              hdq_state = HDQB_DATA_RX_HIGH;
-+                      /* timeout */
-+                      hdq_ctr = 1000 / HDQ_SAMPLE_PERIOD_US;
-+                      hdq_ctr2 = 1;
-+                      break;
-+              }
-+              hdq_ctr2++;
-+              if (--hdq_ctr)
-+                      break;
-+               /* timed out, error */
-+              fiq_ipc.hdq_error = 2;
-+              fiq_ipc.hdq_transaction_ctr++;
-+              hdq_state = HDQB_IDLE; /* abort */
-+              break;
-+      case HDQB_DATA_RX_HIGH:
-+              if (!s3c2410_gpio_getpin(fiq_ipc.hdq_gpio_pin)) {
-+                      /* it talks to us! */
-+                      hdq_ctr2 = 1;
-+                      /* timeout */
-+                      hdq_ctr = 400 / HDQ_SAMPLE_PERIOD_US;
-+                      hdq_state = HDQB_DATA_RX_LOW;
-+                      break;
-+              }
-+              if (--hdq_ctr)
-+                      break;
-+              /* timed out, error */
-+              fiq_ipc.hdq_error = 3;
-+              fiq_ipc.hdq_transaction_ctr++;
-+              /* we're in input mode already */
-+              hdq_state = HDQB_IDLE; /* abort */
-+              break;
-+      }
-+      if (hdq_state != HDQB_IDLE) /* ie, not idle */
-+              if (divisor > FIQ_DIVISOR_HDQ)
-+                      divisor = FIQ_DIVISOR_HDQ; /* keep us going */
-+#endif
-       /* disable further timer interrupts if nobody has any work
-        * or adjust rate according to who still has work
-@@ -391,6 +566,23 @@ struct platform_device sc32440_fiq_device = {
-       .resource       = sc32440_fiq_resources,
- };
-+#ifdef CONFIG_GTA02_HDQ
-+/* HDQ */
-+
-+static struct resource gta02_hdq_resources[] = {
-+      [0] = {
-+              .start  = GTA02v5_GPIO_HDQ,
-+              .end    = GTA02v5_GPIO_HDQ,
-+      },
-+};
-+
-+struct platform_device gta02_hdq_device = {
-+      .name           = "gta02-hdq",
-+      .num_resources  = 1,
-+      .resource       = gta02_hdq_resources,
-+};
-+#endif
-+
- /* NOR Flash */
- #define GTA02_FLASH_BASE      0x18000000 /* GCS3 */
-@@ -1074,6 +1266,16 @@ static void __init gta02_machine_init(void)
-       platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices));
-+#ifdef CONFIG_GTA02_HDQ
-+      switch (system_rev) {
-+      case GTA02v5_SYSTEM_REV:
-+      case GTA02v6_SYSTEM_REV:
-+              platform_device_register(&gta02_hdq_device);
-+              break;
-+      default:
-+              break;
-+      }
-+#endif
-       s3c2410_pm_init();
-       /* Set LCD_RESET / XRES to high */
-diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
-index 58c806e..0a4515d 100644
---- a/drivers/power/Kconfig
-+++ b/drivers/power/Kconfig
-@@ -50,3 +50,11 @@ config BATTERY_OLPC
-         Say Y to enable support for the battery on the OLPC laptop.
- endif # POWER_SUPPLY
-+
-+config GTA02_HDQ
-+      tristate "Neo Freerunner HDQ"
-+      depends on MACH_NEO1973_GTA02 && FIQ && S3C2440_C_FIQ
-+      help
-+        Say Y to enable support for communicating with an HDQ battery
-+        on the Neo Freerunner.  You probably want to select
-+        at least BATTERY_BQ27000_HDQ as well
-diff --git a/drivers/power/Makefile b/drivers/power/Makefile
-index 6413ded..88f227f 100644
---- a/drivers/power/Makefile
-+++ b/drivers/power/Makefile
-@@ -20,3 +20,5 @@ obj-$(CONFIG_APM_POWER)              += apm_power.o
- obj-$(CONFIG_BATTERY_DS2760)  += ds2760_battery.o
- obj-$(CONFIG_BATTERY_PMU)     += pmu_battery.o
- obj-$(CONFIG_BATTERY_OLPC)    += olpc_battery.o
-+
-+obj-$(CONFIG_GTA02_HDQ)               += gta02_hdq.o
-diff --git a/drivers/power/gta02_hdq.c b/drivers/power/gta02_hdq.c
-new file mode 100644
-index 0000000..12c742e
---- /dev/null
-+++ b/drivers/power/gta02_hdq.c
-@@ -0,0 +1,250 @@
-+/*
-+ * HDQ driver for the FIC Neo1973 GTA02 GSM phone
-+ *
-+ * (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Andy Green <andy@openmoko.com>
-+ * 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 version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/platform_device.h>
-+#include <asm/hardware.h>
-+#include <asm/mach-types.h>
-+#include <asm/arch/gta02.h>
-+#include <asm/arch/fiq_ipc_gta02.h>
-+
-+
-+
-+#define HDQ_READ 0
-+#define HDQ_WRITE 0x80
-+
-+
-+int gta02hdq_initialized(void)
-+{
-+      return fiq_ipc.hdq_probed;
-+}
-+EXPORT_SYMBOL_GPL(gta02hdq_initialized);
-+
-+int gta02hdq_read(int address)
-+{
-+      int count_sleeps = 5;
-+      int ret = -ETIME;
-+
-+      mutex_lock(&fiq_ipc.hdq_lock);
-+
-+      fiq_ipc.hdq_ads = address | HDQ_READ;
-+      fiq_ipc.hdq_request_ctr++;
-+      fiq_kick();
-+      /*
-+       * FIQ takes care of it while we block our calling process
-+       * But we're not spinning -- other processes run normally while
-+       * we wait for the result
-+       */
-+      while (count_sleeps--) {
-+              msleep(10); /* valid transaction always completes in < 10ms */
-+
-+              if (fiq_ipc.hdq_request_ctr != fiq_ipc.hdq_transaction_ctr)
-+                      continue;
-+
-+              if (fiq_ipc.hdq_error)
-+                      goto done; /* didn't see a response in good time */
-+
-+              ret = fiq_ipc.hdq_rx_data;
-+              goto done;
-+      }
-+      ret = -EINVAL;
-+
-+done:
-+      mutex_unlock(&fiq_ipc.hdq_lock);
-+      return ret;
-+}
-+EXPORT_SYMBOL_GPL(gta02hdq_read);
-+
-+int gta02hdq_write(int address, u8 data)
-+{
-+      int count_sleeps = 5;
-+      int ret = -ETIME;
-+
-+      mutex_lock(&fiq_ipc.hdq_lock);
-+
-+      fiq_ipc.hdq_ads = address | HDQ_WRITE;
-+      fiq_ipc.hdq_tx_data = data;
-+      fiq_ipc.hdq_request_ctr++;
-+      fiq_kick();
-+      /*
-+       * FIQ takes care of it while we block our calling process
-+       * But we're not spinning -- other processes run normally while
-+       * we wait for the result
-+       */
-+      while (count_sleeps--) {
-+              msleep(10); /* valid transaction always completes in < 10ms */
-+
-+              if (fiq_ipc.hdq_request_ctr != fiq_ipc.hdq_transaction_ctr)
-+                      continue; /* something bad with FIQ */
-+
-+              if (fiq_ipc.hdq_error)
-+                      goto done; /* didn't see a response in good time */
-+      }
-+      ret = -EINVAL;
-+
-+done:
-+      mutex_unlock(&fiq_ipc.hdq_lock);
-+      return ret;
-+}
-+EXPORT_SYMBOL_GPL(gta02hdq_write);
-+
-+/* sysfs */
-+
-+static ssize_t hdq_sysfs_dump(struct device *dev, struct device_attribute *attr,
-+                       char *buf)
-+{
-+      int n;
-+      int v;
-+      u8 u8a[128]; /* whole address space for HDQ */
-+      char *end = buf;
-+
-+      /* the dump does not take care about 16 bit regs, because at this
-+       * bus level we don't know about the chip details
-+       */
-+      for (n = 0; n < sizeof(u8a); n++) {
-+              v = gta02hdq_read(n);
-+              if (v < 0)
-+                      goto bail;
-+              u8a[n] = v;
-+      }
-+
-+      for (n = 0; n < sizeof(u8a); n += 16) {
-+              hex_dump_to_buffer(u8a + n, sizeof(u8a), 16, 1, end, 4096, 0);
-+              end += strlen(end);
-+              *end++ = '\n';
-+              *end = '\0';
-+      }
-+      return (end - buf);
-+
-+bail:
-+      return sprintf(buf, "ERROR %d\n", v);
-+}
-+
-+/* you write by <address> <data>, eg, "34 128" */
-+
-+#define atoi(str) simple_strtoul(((str != NULL) ? str : ""), NULL, 0)
-+
-+static ssize_t hdq_sysfs_write(struct device *dev,
-+                             struct device_attribute *attr,
-+                             const char *buf, size_t count)
-+{
-+      const char *end = buf + count;
-+      int address = atoi(buf);
-+
-+      while ((buf != end) && (*buf != ' '))
-+              buf++;
-+      if (buf >= end)
-+              return 0;
-+      while ((buf < end) && (*buf == ' '))
-+              buf++;
-+      if (buf >= end)
-+              return 0;
-+
-+      gta02hdq_write(address, atoi(buf));
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(dump, 0400, hdq_sysfs_dump, NULL);
-+static DEVICE_ATTR(write, 0600, NULL, hdq_sysfs_write);
-+
-+static struct attribute *gta02hdq_sysfs_entries[] = {
-+      &dev_attr_dump.attr,
-+      &dev_attr_write.attr,
-+      NULL
-+};
-+
-+static struct attribute_group gta02hdq_attr_group = {
-+      .name   = "hdq",
-+      .attrs  = gta02hdq_sysfs_entries,
-+};
-+
-+
-+#ifdef CONFIG_PM
-+static int gta02hdq_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+      /* after 18s of this, the battery monitor will also go to sleep */
-+      s3c2410_gpio_setpin(fiq_ipc.hdq_gpio_pin, 0);
-+      s3c2410_gpio_cfgpin(fiq_ipc.hdq_gpio_pin, S3C2410_GPIO_OUTPUT);
-+      return 0;
-+}
-+
-+static int gta02hdq_resume(struct platform_device *pdev)
-+{
-+      s3c2410_gpio_setpin(fiq_ipc.hdq_gpio_pin, 1);
-+      s3c2410_gpio_cfgpin(fiq_ipc.hdq_gpio_pin, S3C2410_GPIO_OUTPUT);
-+      return 0;
-+}
-+#endif
-+
-+static int __init gta02hdq_probe(struct platform_device *pdev)
-+{
-+      struct resource *r = platform_get_resource(pdev, 0, 0);
-+
-+      if (!machine_is_neo1973_gta02())
-+              return -EIO;
-+
-+      if (!r)
-+              return -EINVAL;
-+
-+      platform_set_drvdata(pdev, NULL);
-+
-+      mutex_init(&fiq_ipc.hdq_lock);
-+
-+      /* set our HDQ comms pin from the platform data */
-+      fiq_ipc.hdq_gpio_pin = r->start;
-+
-+      s3c2410_gpio_setpin(fiq_ipc.hdq_gpio_pin, 1);
-+      s3c2410_gpio_cfgpin(fiq_ipc.hdq_gpio_pin, S3C2410_GPIO_OUTPUT);
-+
-+      fiq_ipc.hdq_probed = 1; /* we are ready to do stuff now */
-+
-+      return sysfs_create_group(&pdev->dev.kobj, &gta02hdq_attr_group);
-+}
-+
-+static int gta02hdq_remove(struct platform_device *pdev)
-+{
-+      sysfs_remove_group(&pdev->dev.kobj, &gta02hdq_attr_group);
-+      return 0;
-+}
-+
-+static struct platform_driver gta02hdq_driver = {
-+      .probe          = gta02hdq_probe,
-+      .remove         = gta02hdq_remove,
-+#ifdef CONFIG_PM
-+      .suspend        = gta02hdq_suspend,
-+      .resume         = gta02hdq_resume,
-+#endif
-+      .driver         = {
-+              .name           = "gta02-hdq",
-+      },
-+};
-+
-+static int __init gta02hdq_init(void)
-+{
-+      return platform_driver_register(&gta02hdq_driver);
-+}
-+
-+static void __exit gta02hdq_exit(void)
-+{
-+      platform_driver_unregister(&gta02hdq_driver);
-+}
-+
-+module_init(gta02hdq_init);
-+module_exit(gta02hdq_exit);
-+
-+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
-+MODULE_DESCRIPTION("GTA02 HDQ driver");
-+MODULE_LICENSE("GPL");
-diff --git a/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h b/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-index 507d235..c5eb3df 100644
---- a/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-+++ b/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-@@ -19,12 +19,35 @@
- #include <asm/arch/pwm.h>
- #include <asm/plat-s3c/regs-timer.h>
-+enum hdq_bitbang_states {
-+      HDQB_IDLE = 0,
-+      HDQB_TX_BREAK,
-+      HDQB_TX_BREAK_RECOVERY,
-+      HDQB_ADS_CALC,
-+      HDQB_ADS_LOW,
-+      HDQB_ADS_HIGH,
-+      HDQB_WAIT_RX,
-+      HDQB_DATA_RX_LOW,
-+      HDQB_DATA_RX_HIGH,
-+      HDQB_WAIT_TX,
-+};
- struct fiq_ipc {
-       /* vibrator */
-       unsigned long vib_gpio_pin; /* which pin to meddle with */
-       u8 vib_pwm; /* 0 = OFF -- will ensure GPIO deasserted and stop FIQ */
-       u8 vib_pwm_latched;
-+
-+      /* hdq */
-+      u8 hdq_probed; /* nonzero after HDQ driver probed */
-+      struct mutex hdq_lock; /* if you want to use hdq, you have to take lock */
-+      unsigned long hdq_gpio_pin; /* GTA02 = GPD14 which pin to meddle with */
-+      u8 hdq_ads; /* b7..b6 = register address, b0 = r/w */
-+      u8 hdq_tx_data; /* data to tx for write action */
-+      u8 hdq_rx_data; /* data received in read action */
-+      u8 hdq_request_ctr; /* incremented by "user" to request a transfer */
-+      u8 hdq_transaction_ctr; /* incremented after each transfer */
-+      u8 hdq_error; /* 0 = no error */
- };
- /* actual definition lives in arch/arm/mach-s3c2440/fiq_c_isr.c */
-diff --git a/include/asm-arm/arch-s3c2410/gta02.h b/include/asm-arm/arch-s3c2410/gta02.h
-index fa49d93..f686a7a 100644
---- a/include/asm-arm/arch-s3c2410/gta02.h
-+++ b/include/asm-arm/arch-s3c2410/gta02.h
-@@ -37,6 +37,7 @@
- #define GTA02v3_GPIO_nG1_CS   S3C2410_GPD12   /* v3 + v4 only */
- #define GTA02v3_GPIO_nG2_CS   S3C2410_GPD13   /* v3 + v4 only */
-+#define GTA02v5_GPIO_HDQ      S3C2410_GPD14   /* v5 + */
- #define GTA02_GPIO_nG1_INT    S3C2410_GPF0
- #define GTA02_GPIO_IO1                S3C2410_GPF1
-diff --git a/include/linux/gta02_hdq.h b/include/linux/gta02_hdq.h
-new file mode 100644
-index 0000000..2f43a62
---- /dev/null
-+++ b/include/linux/gta02_hdq.h
-@@ -0,0 +1,8 @@
-+#ifndef __GTA02HDQ_H__
-+#define __GTA02HDQ_H__
-+
-+int gta02hdq_read(int address);
-+int gta02hdq_write(int address, u8 data);
-+int gta02hdq_initialized(void);
-+
-+#endif
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1057-bq27000-battery-driver.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1057-bq27000-battery-driver.patch.patch
deleted file mode 100644 (file)
index 2bd3caf..0000000
+++ /dev/null
@@ -1,510 +0,0 @@
-From 40d5d4e980e0d4a5d00759f7fa2a18488f95a0ef Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:52 +0100
-Subject: [PATCH] bq27000-battery-driver.patch
-
----
- arch/arm/mach-s3c2440/Kconfig      |    2 +
- arch/arm/mach-s3c2440/mach-gta02.c |   21 ++
- drivers/power/Kconfig              |    7 +-
- drivers/power/Makefile             |    1 +
- drivers/power/bq27000_battery.c    |  375 ++++++++++++++++++++++++++++++++++++
- include/linux/bq27000_battery.h    |   12 ++
- 6 files changed, 417 insertions(+), 1 deletions(-)
- create mode 100644 drivers/power/bq27000_battery.c
- create mode 100644 include/linux/bq27000_battery.h
-
-diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
-index f7bea5d..71719ac 100644
---- a/arch/arm/mach-s3c2440/Kconfig
-+++ b/arch/arm/mach-s3c2440/Kconfig
-@@ -85,6 +85,8 @@ config MACH_NEO1973_GTA02
-       bool "FIC Neo1973 GSM Phone (GTA02 Hardware)"
-       select CPU_S3C2442
-       select SENSORS_PCF50633
-+      select POWER_SUPPLY
-+      select GTA02_HDQ
-       help
-          Say Y here if you are using the FIC Neo1973 GSM Phone
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index cea76e7..3816ea5 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -81,6 +81,8 @@
- #include <asm/arch/fiq_ipc_gta02.h>
- #include "fiq_c_isr.h"
-+#include <linux/gta02_hdq.h>
-+#include <linux/bq27000_battery.h>
- /* arbitrates which sensor IRQ owns the shared SPI bus */
- static spinlock_t motion_irq_lock;
-@@ -583,6 +585,24 @@ struct platform_device gta02_hdq_device = {
- };
- #endif
-+/* BQ27000 Battery */
-+
-+struct bq27000_platform_data bq27000_pdata = {
-+      .name = "bat",
-+      .rsense_mohms = 20,
-+      .hdq_read = gta02hdq_read,
-+      .hdq_write = gta02hdq_write,
-+      .hdq_initialized = gta02hdq_initialized,
-+};
-+
-+struct platform_device bq27000_battery_device = {
-+      .name           = "bq27000-battery",
-+      .dev = {
-+              .platform_data = &bq27000_pdata,
-+      },
-+};
-+
-+
- /* NOR Flash */
- #define GTA02_FLASH_BASE      0x18000000 /* GCS3 */
-@@ -1271,6 +1291,7 @@ static void __init gta02_machine_init(void)
-       case GTA02v5_SYSTEM_REV:
-       case GTA02v6_SYSTEM_REV:
-               platform_device_register(&gta02_hdq_device);
-+              platform_device_register(&bq27000_battery_device);
-               break;
-       default:
-               break;
-diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
-index 0a4515d..feb8b0a 100644
---- a/drivers/power/Kconfig
-+++ b/drivers/power/Kconfig
-@@ -49,7 +49,10 @@ config BATTERY_OLPC
-       help
-         Say Y to enable support for the battery on the OLPC laptop.
--endif # POWER_SUPPLY
-+config BATTERY_BQ27000_HDQ
-+      tristate "BQ27000 HDQ battery monitor driver"
-+      help
-+        Say Y to enable support for the battery on the Neo Freerunner
- config GTA02_HDQ
-       tristate "Neo Freerunner HDQ"
-@@ -58,3 +61,5 @@ config GTA02_HDQ
-         Say Y to enable support for communicating with an HDQ battery
-         on the Neo Freerunner.  You probably want to select
-         at least BATTERY_BQ27000_HDQ as well
-+
-+endif # POWER_SUPPLY
-diff --git a/drivers/power/Makefile b/drivers/power/Makefile
-index 88f227f..d7e87ad 100644
---- a/drivers/power/Makefile
-+++ b/drivers/power/Makefile
-@@ -20,5 +20,6 @@ obj-$(CONFIG_APM_POWER)              += apm_power.o
- obj-$(CONFIG_BATTERY_DS2760)  += ds2760_battery.o
- obj-$(CONFIG_BATTERY_PMU)     += pmu_battery.o
- obj-$(CONFIG_BATTERY_OLPC)    += olpc_battery.o
-+obj-$(CONFIG_BATTERY_BQ27000_HDQ)     += bq27000_battery.o
- obj-$(CONFIG_GTA02_HDQ)               += gta02_hdq.o
-diff --git a/drivers/power/bq27000_battery.c b/drivers/power/bq27000_battery.c
-new file mode 100644
-index 0000000..d19186a
---- /dev/null
-+++ b/drivers/power/bq27000_battery.c
-@@ -0,0 +1,375 @@
-+/*
-+ * Driver for batteries with bq27000 chips inside via HDQ
-+ *
-+ * Copyright 2008 Openmoko, Inc
-+ * Andy Green <andy@openmoko.com>
-+ *
-+ * based on ds2760 driver, original copyright notice for that --->
-+ *
-+ * Copyright © 2007 Anton Vorontsov
-+ *           2004-2007 Matt Reimer
-+ *           2004 Szabolcs Gyurko
-+ *
-+ * Use consistent with the GNU GPL is permitted,
-+ * provided that this copyright notice is
-+ * preserved in its entirety in all copies and derived works.
-+ *
-+ * Author:  Anton Vorontsov <cbou@mail.ru>
-+ *        February 2007
-+ *
-+ *        Matt Reimer <mreimer@vpop.net>
-+ *        April 2004, 2005, 2007
-+ *
-+ *        Szabolcs Gyurko <szabolcs.gyurko@tlt.hu>
-+ *        September 2004
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/param.h>
-+#include <linux/jiffies.h>
-+#include <linux/delay.h>
-+#include <linux/pm.h>
-+#include <linux/platform_device.h>
-+#include <linux/power_supply.h>
-+#include <linux/bq27000_battery.h>
-+
-+enum bq27000_regs {
-+      /* RAM regs */
-+              /* read-write after this */
-+      BQ27000_CTRL = 0, /* Device Control Register */
-+      BQ27000_MODE, /* Device Mode Register */
-+      BQ27000_AR_L, /* At-Rate H L */
-+      BQ27000_AR_H,
-+              /* read-only after this */
-+      BQ27000_ARTTE_L, /* At-Rate Time To Empty H L */
-+      BQ27000_ARTTE_H,
-+      BQ27000_TEMP_L, /* Reported Temperature H L */
-+      BQ27000_TEMP_H,
-+      BQ27000_VOLT_L, /* Reported Voltage H L */
-+      BQ27000_VOLT_H,
-+      BQ27000_FLAGS, /* Status Flags */
-+      BQ27000_RSOC, /* Relative State of Charge */
-+      BQ27000_NAC_L, /* Nominal Available Capacity H L */
-+      BQ27000_NAC_H,
-+      BQ27000_CACD_L, /* Discharge Compensated H L */
-+      BQ27000_CACD_H,
-+      BQ27000_CACT_L, /* Temperature Compensated H L */
-+      BQ27000_CACT_H,
-+      BQ27000_LMD_L, /* Last measured discharge H L */
-+      BQ27000_LMD_H,
-+      BQ27000_AI_L, /* Average Current H L */
-+      BQ27000_AI_H,
-+      BQ27000_TTE_L, /* Time to Empty H L */
-+      BQ27000_TTE_H,
-+      BQ27000_TTF_L, /* Time to Full H L */
-+      BQ27000_TTF_H,
-+      BQ27000_SI_L, /* Standby Current H L */
-+      BQ27000_SI_H,
-+      BQ27000_STTE_L, /* Standby Time To Empty H L */
-+      BQ27000_STTE_H,
-+      BQ27000_MLI_L, /* Max Load Current H L */
-+      BQ27000_MLI_H,
-+      BQ27000_MLTTE_L, /* Max Load Time To Empty H L */
-+      BQ27000_MLTTE_H,
-+      BQ27000_SAE_L, /* Available Energy H L */
-+      BQ27000_SAE_H,
-+      BQ27000_AP_L, /* Available Power H L */
-+      BQ27000_AP_H,
-+      BQ27000_TTECP_L, /* Time to Empty at Constant Power H L */
-+      BQ27000_TTECP_H,
-+      BQ27000_CYCL_L, /* Cycle count since learning cycle H L */
-+      BQ27000_CYCL_H,
-+      BQ27000_CYCT_L, /* Cycle Count Total H L */
-+      BQ27000_CYCT_H,
-+      BQ27000_CSOC, /* Compensated State Of Charge */
-+      /* EEPROM regs */
-+              /* read-write after this */
-+      BQ27000_EE_EE_EN = 0x6e, /* EEPROM Program Enable */
-+      BQ27000_EE_ILMD = 0x76, /* Initial Last Measured Discharge High Byte */
-+      BQ27000_EE_SEDVF, /* Scaled EDVF Threshold */
-+      BQ27000_EE_SEDV1, /* Scaled EDV1 Threshold */
-+      BQ27000_EE_ISLC, /* Initial Standby Load Current */
-+      BQ27000_EE_DMFSD, /* Digital Magnitude Filter and Self Discharge */
-+      BQ27000_EE_TAPER, /* Aging Estimate Enable, Charge Termination Taper */
-+      BQ27000_EE_PKCFG, /* Pack Configuration Values */
-+      BQ27000_EE_IMLC, /* Initial Max Load Current or ID #3 */
-+      BQ27000_EE_DCOMP, /* Discharge rate compensation constants or ID #2 */
-+      BQ27000_EE_TCOMP, /* Temperature Compensation constants or ID #1 */
-+};
-+
-+enum bq27000_status_flags {
-+      BQ27000_STATUS_CHGS = 0x80, /* 1 = being charged */
-+      BQ27000_STATUS_NOACT = 0x40, /* 1 = no activity */
-+      BQ27000_STATUS_IMIN = 0x20, /* 1 = Lion taper current mode */
-+      BQ27000_STATUS_CI = 0x10, /* 1 = capacity likely  innacurate */
-+      BQ27000_STATUS_CALIP = 0x08, /* 1 = calibration in progress */
-+      BQ27000_STATUS_VDQ = 0x04, /* 1 = capacity should be accurate */
-+      BQ27000_STATUS_EDV1 = 0x02, /* 1 = end of discharge.. <6% left */
-+      BQ27000_STATUS_EDVF = 0x01, /* 1 = no, it's really empty now */
-+};
-+
-+#define NANOVOLTS_UNIT 3750
-+
-+struct bq27000_device_info {
-+      struct device *dev;
-+      struct power_supply bat;
-+
-+      int rsense_mohms;               /* from platform */
-+
-+      int (*hdq_initialized)(void); /* from platform */
-+      int (*hdq_read)(int); /* from platform */
-+      int (*hdq_write)(int, u8); /* from platform */
-+};
-+
-+/*
-+ * reading 16 bit values over HDQ has a special hazard where the
-+ * hdq device firmware can update the 16-bit register during the time we
-+ * read the two halves.  TI document SLUS556D recommends the algorithm here
-+ * to avoid trouble
-+ */
-+
-+static int hdq_read16(struct bq27000_device_info *di, int address)
-+{
-+      int acc;
-+      int high;
-+      int retries = 3;
-+
-+      while (retries--) {
-+
-+              high = (di->hdq_read)(address + 1); /* high part */
-+
-+              if (high < 0)
-+                      return high;
-+              acc = (di->hdq_read)(address);
-+              if (acc < 0)
-+                      return acc;
-+
-+              /* confirm high didn't change between reading it and low */
-+              if (high == (di->hdq_read)(address + 1))
-+                      return (high << 8) | acc;
-+      }
-+
-+      return -ETIME;
-+}
-+
-+#define to_bq27000_device_info(x) container_of((x), \
-+                                             struct bq27000_device_info, \
-+                                             bat);
-+
-+static void bq27000_battery_external_power_changed(struct power_supply *psy)
-+{
-+      struct bq27000_device_info *di = to_bq27000_device_info(psy);
-+
-+      dev_dbg(di->dev, "%s\n", __FUNCTION__);
-+}
-+
-+static int bq27000_battery_get_property(struct power_supply *psy,
-+                                     enum power_supply_property psp,
-+                                     union power_supply_propval *val)
-+{
-+      int v, n;
-+      struct bq27000_device_info *di = to_bq27000_device_info(psy);
-+
-+      if (!(di->hdq_initialized)())
-+              return -EINVAL;
-+
-+      switch (psp) {
-+      case POWER_SUPPLY_PROP_STATUS:
-+              val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
-+              v = hdq_read16(di, BQ27000_AI_L);
-+              if (v < 0)
-+                      return v;
-+              if (v < 2) { /* no real activity on the battery */
-+                      if (!hdq_read16(di, BQ27000_TTF_L))
-+                              val->intval = POWER_SUPPLY_STATUS_FULL;
-+                      else
-+                              val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
-+                      break;
-+              }
-+              /* power is actually going in or out... */
-+              v = (di->hdq_read)(BQ27000_FLAGS);
-+              if (v < 0)
-+                      return v;
-+              if (v & BQ27000_STATUS_CHGS)
-+                      val->intval = POWER_SUPPLY_STATUS_CHARGING;
-+              else
-+                      val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
-+              break;
-+      case POWER_SUPPLY_PROP_VOLTAGE_NOW:
-+              v = hdq_read16(di, BQ27000_VOLT_L);
-+              if (v < 0)
-+                      return v;
-+              val->intval = v * 1000; /* mV -> uV */
-+              break;
-+      case POWER_SUPPLY_PROP_CURRENT_NOW:
-+              v = (di->hdq_read)(BQ27000_FLAGS);
-+              if (v < 0)
-+                      return v;
-+              if (v & BQ27000_STATUS_CHGS)
-+                      n = -NANOVOLTS_UNIT;
-+              else
-+                      n = NANOVOLTS_UNIT;
-+              v = hdq_read16(di, BQ27000_AI_L);
-+              if (v < 0)
-+                      return v;
-+              val->intval = (v * n) / di->rsense_mohms;
-+              break;
-+      case POWER_SUPPLY_PROP_CHARGE_FULL:
-+              v = hdq_read16(di, BQ27000_LMD_L);
-+              if (v < 0)
-+                      return v;
-+              val->intval = (v * 3570) / di->rsense_mohms;
-+              break;
-+      case POWER_SUPPLY_PROP_TEMP:
-+              v = hdq_read16(di, BQ27000_TEMP_L);
-+              if (v < 0)
-+                      return v;
-+              /* K (in 0.25K units) is 273.15 up from C (in 0.1C)*/
-+              /* 10926 = 27315 * 4 / 10 */
-+              val->intval = (((long)v * 10l) - 10926) / 4;
-+              break;
-+      case POWER_SUPPLY_PROP_TECHNOLOGY:
-+              val->intval = POWER_SUPPLY_TECHNOLOGY_LION;
-+              break;
-+      case POWER_SUPPLY_PROP_CAPACITY:
-+              val->intval = (di->hdq_read)(BQ27000_RSOC);
-+              if (val->intval < 0)
-+                      return val->intval;
-+              break;
-+      case POWER_SUPPLY_PROP_PRESENT:
-+              v = (di->hdq_read)(BQ27000_RSOC);
-+              val->intval = !(v < 0);
-+              break;
-+      case POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW:
-+              v = hdq_read16(di, BQ27000_TTE_L);
-+              if (v < 0)
-+                      return v;
-+              val->intval = 60 * v;
-+              break;
-+      case POWER_SUPPLY_PROP_TIME_TO_FULL_NOW:
-+              v = hdq_read16(di, BQ27000_TTF_L);
-+              if (v < 0)
-+                      return v;
-+              val->intval = 60 * v;
-+              break;
-+      default:
-+              return -EINVAL;
-+      }
-+
-+      return 0;
-+}
-+
-+static enum power_supply_property bq27000_battery_props[] = {
-+      POWER_SUPPLY_PROP_STATUS,
-+      POWER_SUPPLY_PROP_VOLTAGE_NOW,
-+      POWER_SUPPLY_PROP_CURRENT_NOW,
-+      POWER_SUPPLY_PROP_CHARGE_FULL,
-+      POWER_SUPPLY_PROP_TEMP,
-+      POWER_SUPPLY_PROP_TECHNOLOGY,
-+      POWER_SUPPLY_PROP_PRESENT,
-+      POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW,
-+      POWER_SUPPLY_PROP_TIME_TO_FULL_NOW,
-+      POWER_SUPPLY_PROP_MODEL_NAME,
-+      POWER_SUPPLY_PROP_CAPACITY
-+};
-+
-+static int bq27000_battery_probe(struct platform_device *pdev)
-+{
-+      int retval = 0;
-+      struct bq27000_device_info *di;
-+      struct bq27000_platform_data *pdata;
-+
-+      dev_info(&pdev->dev, "BQ27000 Battery Driver (C) 2008 Openmoko, Inc\n");
-+
-+      di = kzalloc(sizeof(*di), GFP_KERNEL);
-+      if (!di) {
-+              retval = -ENOMEM;
-+              goto di_alloc_failed;
-+      }
-+
-+      platform_set_drvdata(pdev, di);
-+
-+      pdata = pdev->dev.platform_data;
-+      di->dev         = &pdev->dev;
-+      /* di->w1_dev        = pdev->dev.parent; */
-+      di->bat.name       = pdata->name;
-+      di->bat.type       = POWER_SUPPLY_TYPE_BATTERY;
-+      di->bat.properties     = bq27000_battery_props;
-+      di->bat.num_properties = ARRAY_SIZE(bq27000_battery_props);
-+      di->bat.get_property   = bq27000_battery_get_property;
-+      di->bat.external_power_changed =
-+                                bq27000_battery_external_power_changed;
-+      di->hdq_read = pdata->hdq_read;
-+      di->hdq_write = pdata->hdq_write;
-+      di->rsense_mohms = pdata->rsense_mohms;
-+      di->hdq_initialized = pdata->hdq_initialized;
-+
-+      retval = power_supply_register(&pdev->dev, &di->bat);
-+      if (retval) {
-+              dev_err(di->dev, "failed to register battery\n");
-+              goto batt_failed;
-+      }
-+
-+      return 0;
-+
-+batt_failed:
-+      kfree(di);
-+di_alloc_failed:
-+      return retval;
-+}
-+
-+static int bq27000_battery_remove(struct platform_device *pdev)
-+{
-+      struct bq27000_device_info *di = platform_get_drvdata(pdev);
-+
-+      power_supply_unregister(&di->bat);
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+
-+static int bq27000_battery_suspend(struct platform_device *pdev,
-+                                pm_message_t state)
-+{
-+      return 0;
-+}
-+
-+static int bq27000_battery_resume(struct platform_device *pdev)
-+{
-+      return 0;
-+}
-+
-+#else
-+
-+#define bq27000_battery_suspend NULL
-+#define bq27000_battery_resume NULL
-+
-+#endif /* CONFIG_PM */
-+
-+static struct platform_driver bq27000_battery_driver = {
-+      .driver = {
-+              .name = "bq27000-battery",
-+      },
-+      .probe    = bq27000_battery_probe,
-+      .remove   = bq27000_battery_remove,
-+      .suspend  = bq27000_battery_suspend,
-+      .resume   = bq27000_battery_resume,
-+};
-+
-+static int __init bq27000_battery_init(void)
-+{
-+      return platform_driver_register(&bq27000_battery_driver);
-+}
-+
-+static void __exit bq27000_battery_exit(void)
-+{
-+      platform_driver_unregister(&bq27000_battery_driver);
-+}
-+
-+module_init(bq27000_battery_init);
-+module_exit(bq27000_battery_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
-+MODULE_DESCRIPTION("bq27000 battery driver");
-diff --git a/include/linux/bq27000_battery.h b/include/linux/bq27000_battery.h
-new file mode 100644
-index 0000000..36b4f20
---- /dev/null
-+++ b/include/linux/bq27000_battery.h
-@@ -0,0 +1,12 @@
-+#ifndef __BQ27000_BATTERY_H__
-+#define __BQ27000_BATTERY_H__
-+
-+struct bq27000_platform_data {
-+      const char      *name;
-+      int             rsense_mohms;
-+      int (*hdq_read)(int);
-+      int (*hdq_write)(int, u8);
-+      int (*hdq_initialized)(void);
-+};
-+
-+#endif
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1058-fix-EVIOCGRAB-semantics.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1058-fix-EVIOCGRAB-semantics.patch.patch
deleted file mode 100644 (file)
index 4a24b73..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-From a6b37451a52ae7d30c2493b9cc14b8604e81587d Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:53 +0100
-Subject: [PATCH] fix-EVIOCGRAB-semantics.patch
-
----
- drivers/input/evdev.c |   32 +++++++++++++++-----------------
- 1 files changed, 15 insertions(+), 17 deletions(-)
-
-diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
-index e5b4e9b..2f3d825 100644
---- a/drivers/input/evdev.c
-+++ b/drivers/input/evdev.c
-@@ -28,7 +28,7 @@ struct evdev {
-       char name[16];
-       struct input_handle handle;
-       wait_queue_head_t wait;
--      struct evdev_client *grab;
-+      int *grab;
-       struct list_head client_list;
-       spinlock_t client_lock; /* protects client_list */
-       struct mutex mutex;
-@@ -39,6 +39,7 @@ struct evdev_client {
-       struct input_event buffer[EVDEV_BUFFER_SIZE];
-       int head;
-       int tail;
-+      int grab;
-       spinlock_t buffer_lock; /* protects access to buffer, head and tail */
-       struct fasync_struct *fasync;
-       struct evdev *evdev;
-@@ -79,12 +80,8 @@ static void evdev_event(struct input_handle *handle,
-       rcu_read_lock();
--      client = rcu_dereference(evdev->grab);
--      if (client)
-+      list_for_each_entry_rcu(client, &evdev->client_list, node)
-               evdev_pass_event(client, &event);
--      else
--              list_for_each_entry_rcu(client, &evdev->client_list, node)
--                      evdev_pass_event(client, &event);
-       rcu_read_unlock();
-@@ -135,14 +132,15 @@ static int evdev_grab(struct evdev *evdev, struct evdev_client *client)
- {
-       int error;
--      if (evdev->grab)
-+      if (client->grab)
-               return -EBUSY;
--      error = input_grab_device(&evdev->handle);
--      if (error)
--              return error;
--
--      rcu_assign_pointer(evdev->grab, client);
-+      if (!evdev->grab++) {
-+          error = input_grab_device(&evdev->handle);
-+          if (error)
-+                  return error;
-+      }
-+      client->grab = 1;
-       synchronize_rcu();
-       return 0;
-@@ -150,12 +148,12 @@ static int evdev_grab(struct evdev *evdev, struct evdev_client *client)
- static int evdev_ungrab(struct evdev *evdev, struct evdev_client *client)
- {
--      if (evdev->grab != client)
-+      if (!client->grab)
-               return  -EINVAL;
--      rcu_assign_pointer(evdev->grab, NULL);
--      synchronize_rcu();
--      input_release_device(&evdev->handle);
-+      if (!--evdev->grab && evdev->exist)
-+              input_release_device(&evdev->handle);
-+      client->grab = 0;
-       return 0;
- }
-@@ -230,7 +228,7 @@ static int evdev_release(struct inode *inode, struct file *file)
-       struct evdev *evdev = client->evdev;
-       mutex_lock(&evdev->mutex);
--      if (evdev->grab == client)
-+      if (client->grab)
-               evdev_ungrab(evdev, client);
-       mutex_unlock(&evdev->mutex);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1059-iis-suspend.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1059-iis-suspend.patch.patch
deleted file mode 100644 (file)
index c97396e..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-From 148a1026b1975e3a50981cf7df3d4aae2b34611e Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:53 +0100
-Subject: [PATCH] iis-suspend.patch
-
----
- sound/soc/s3c24xx/s3c24xx-i2s.c |   38 ++++++++++++++++++++++++++++++++++++++
- 1 files changed, 38 insertions(+), 0 deletions(-)
-
-diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c
-index fe30e0d..4d74cc0 100644
---- a/sound/soc/s3c24xx/s3c24xx-i2s.c
-+++ b/sound/soc/s3c24xx/s3c24xx-i2s.c
-@@ -76,6 +76,10 @@ static struct s3c24xx_pcm_dma_params s3c24xx_i2s_pcm_stereo_in = {
- struct s3c24xx_i2s_info {
-       void __iomem    *regs;
-       struct clk      *iis_clk;
-+      u32             iiscon;
-+      u32             iismod;
-+      u32             iisfcon;
-+      u32             iispsr;
- };
- static struct s3c24xx_i2s_info s3c24xx_i2s;
-@@ -406,6 +410,38 @@ static int s3c24xx_i2s_probe(struct platform_device *pdev)
-       return 0;
- }
-+#ifdef CONFIG_PM
-+int s3c24xx_i2s_suspend(struct platform_device *pdev,
-+                struct snd_soc_cpu_dai *cpu_dai)
-+{
-+      s3c24xx_i2s.iiscon = readl(s3c24xx_i2s.regs + S3C2410_IISCON);
-+      s3c24xx_i2s.iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD);
-+      s3c24xx_i2s.iisfcon = readl(s3c24xx_i2s.regs + S3C2410_IISFCON);
-+      s3c24xx_i2s.iispsr = readl(s3c24xx_i2s.regs + S3C2410_IISPSR);
-+
-+      clk_disable(s3c24xx_i2s.iis_clk);
-+
-+      return 0;
-+}
-+
-+int s3c24xx_i2s_resume(struct platform_device *pdev,
-+                struct snd_soc_cpu_dai *cpu_dai)
-+{
-+      clk_enable(s3c24xx_i2s.iis_clk);
-+
-+        writel(s3c24xx_i2s.iiscon, s3c24xx_i2s.regs + S3C2410_IISCON);
-+        writel(s3c24xx_i2s.iismod, s3c24xx_i2s.regs + S3C2410_IISMOD);
-+        writel(s3c24xx_i2s.iisfcon, s3c24xx_i2s.regs + S3C2410_IISFCON);
-+        writel(s3c24xx_i2s.iispsr, s3c24xx_i2s.regs + S3C2410_IISPSR);
-+
-+      return 0;
-+}
-+#else
-+#define s3c24xx_i2s_suspend NULL
-+#define s3c24xx_i2s_resume NULL
-+#endif
-+
-+
- #define S3C24XX_I2S_RATES \
-       (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 | SNDRV_PCM_RATE_16000 | \
-       SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
-@@ -416,6 +452,8 @@ struct snd_soc_cpu_dai s3c24xx_i2s_dai = {
-       .id = 0,
-       .type = SND_SOC_DAI_I2S,
-       .probe = s3c24xx_i2s_probe,
-+      .suspend = s3c24xx_i2s_suspend,
-+      .resume = s3c24xx_i2s_resume,
-       .playback = {
-               .channels_min = 2,
-               .channels_max = 2,
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1060-s3c24xx-pcm-suspend.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1060-s3c24xx-pcm-suspend.patch.patch
deleted file mode 100644 (file)
index 2b496ff..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-From 1179eb1bf9d827aaa2b4b6adc4ba135bf9074bcc Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:53 +0100
-Subject: [PATCH] s3c24xx-pcm-suspend.patch
-
----
- sound/soc/s3c24xx/s3c24xx-pcm.c |   48 ++++++++++++++++++++------------------
- 1 files changed, 25 insertions(+), 23 deletions(-)
-
-diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c
-index 4107a87..e9f3b60 100644
---- a/sound/soc/s3c24xx/s3c24xx-pcm.c
-+++ b/sound/soc/s3c24xx/s3c24xx-pcm.c
-@@ -49,7 +49,9 @@ static const struct snd_pcm_hardware s3c24xx_pcm_hardware = {
-       .info                   = SNDRV_PCM_INFO_INTERLEAVED |
-                                   SNDRV_PCM_INFO_BLOCK_TRANSFER |
-                                   SNDRV_PCM_INFO_MMAP |
--                                  SNDRV_PCM_INFO_MMAP_VALID,
-+                                  SNDRV_PCM_INFO_MMAP_VALID |
-+                                  SNDRV_PCM_INFO_PAUSE |
-+                                  SNDRV_PCM_INFO_RESUME,
-       .formats                = SNDRV_PCM_FMTBIT_S16_LE |
-                                   SNDRV_PCM_FMTBIT_U16_LE |
-                                   SNDRV_PCM_FMTBIT_U8 |
-@@ -176,28 +178,6 @@ static int s3c24xx_pcm_hw_params(struct snd_pcm_substream *substream,
-               }
-       }
--      /* channel needs configuring for mem=>device, increment memory addr,
--       * sync to pclk, half-word transfers to the IIS-FIFO. */
--      if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
--              s3c2410_dma_devconfig(prtd->params->channel,
--                              S3C2410_DMASRC_MEM, S3C2410_DISRCC_INC |
--                              S3C2410_DISRCC_APB, prtd->params->dma_addr);
--
--              s3c2410_dma_config(prtd->params->channel,
--                              prtd->params->dma_size,
--                              S3C2410_DCON_SYNC_PCLK | 
--                              S3C2410_DCON_HANDSHAKE);
--      } else {
--              s3c2410_dma_config(prtd->params->channel,
--                              prtd->params->dma_size,
--                              S3C2410_DCON_HANDSHAKE | 
--                              S3C2410_DCON_SYNC_PCLK);
--
--              s3c2410_dma_devconfig(prtd->params->channel,
--                                      S3C2410_DMASRC_HW, 0x3,
--                                      prtd->params->dma_addr);
--      }
--
-       s3c2410_dma_set_buffdone_fn(prtd->params->channel,
-                                   s3c24xx_audio_buffdone);
-@@ -246,6 +226,28 @@ static int s3c24xx_pcm_prepare(struct snd_pcm_substream *substream)
-       if (!prtd->params)
-               return 0;
-+      /* channel needs configuring for mem=>device, increment memory addr,
-+       * sync to pclk, half-word transfers to the IIS-FIFO. */
-+      if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-+              s3c2410_dma_devconfig(prtd->params->channel,
-+                              S3C2410_DMASRC_MEM, S3C2410_DISRCC_INC |
-+                              S3C2410_DISRCC_APB, prtd->params->dma_addr);
-+
-+              s3c2410_dma_config(prtd->params->channel,
-+                              prtd->params->dma_size,
-+                              S3C2410_DCON_SYNC_PCLK |
-+                              S3C2410_DCON_HANDSHAKE);
-+      } else {
-+              s3c2410_dma_config(prtd->params->channel,
-+                              prtd->params->dma_size,
-+                              S3C2410_DCON_HANDSHAKE |
-+                              S3C2410_DCON_SYNC_PCLK);
-+
-+              s3c2410_dma_devconfig(prtd->params->channel,
-+                                      S3C2410_DMASRC_HW, 0x3,
-+                                      prtd->params->dma_addr);
-+      }
-+
-       /* flush the DMA channel */
-       s3c2410_dma_ctrl(prtd->params->channel, S3C2410_DMAOP_FLUSH);
-       prtd->dma_loaded = 0;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1061-s3c2410-usb-switch.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1061-s3c2410-usb-switch.patch.patch
deleted file mode 100644 (file)
index a26b237..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-From e98d739947484f7ca2cf0fe017fda73cab63067a Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:54 +0100
-Subject: [PATCH] s3c2410-usb-switch.patch
-
----
- drivers/usb/host/ohci-s3c2410.c |   43 +++++++++++++++++++++++++++++++++++++++
- 1 files changed, 43 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
-index 44b79e8..68f5689 100644
---- a/drivers/usb/host/ohci-s3c2410.c
-+++ b/drivers/usb/host/ohci-s3c2410.c
-@@ -24,6 +24,7 @@
- #include <asm/hardware.h>
- #include <asm/arch/usb-control.h>
-+#include <asm/arch/regs-gpio.h>
- #define valid_port(idx) ((idx) == 1 || (idx) == 2)
-@@ -308,6 +309,40 @@ static void s3c2410_hcd_oc(struct s3c2410_hcd_info *info, int port_oc)
-       local_irq_restore(flags);
- }
-+/* switching of USB pads */
-+static ssize_t show_usb_mode(struct device *dev, struct device_attribute *attr,
-+                           char *buf)
-+{
-+      if (__raw_readl(S3C24XX_MISCCR) & S3C2410_MISCCR_USBHOST)
-+              return sprintf(buf, "host\n");
-+
-+      return sprintf(buf, "device\n");
-+}
-+
-+static ssize_t set_usb_mode(struct device *dev, struct device_attribute *attr,
-+                          const char *buf, size_t count)
-+{
-+      if (!strncmp(buf, "host", 4)) {
-+              printk("s3c2410: changing usb to host\n");
-+              s3c2410_modify_misccr(S3C2410_MISCCR_USBHOST,
-+                                    S3C2410_MISCCR_USBHOST);
-+              /* FIXME:
-+               * - call machine-specific disable-pullup function i
-+               * - enable +Vbus (if hardware supports it)
-+               */
-+              s3c2410_gpio_setpin(S3C2410_GPB9, 0);
-+      } else if (!strncmp(buf, "device", 6)) {
-+              printk("s3c2410: changing usb to device\n");
-+              s3c2410_modify_misccr(S3C2410_MISCCR_USBHOST, 0);
-+              s3c2410_gpio_setpin(S3C2410_GPB9, 1);
-+      } else
-+              printk("s3c2410: unknown mode\n");
-+              return -EINVAL;
-+      return count;
-+}
-+
-+static DEVICE_ATTR(usb_mode, S_IRUGO | S_IWUSR, show_usb_mode, set_usb_mode);
-+
- /* may be called without controller electrically present */
- /* may be called with controller, bus, and devices active */
-@@ -325,6 +360,7 @@ static void s3c2410_hcd_oc(struct s3c2410_hcd_info *info, int port_oc)
- static void
- usb_hcd_s3c2410_remove (struct usb_hcd *hcd, struct platform_device *dev)
- {
-+      device_remove_file(&dev->dev, &dev_attr_usb_mode);
-       usb_remove_hcd(hcd);
-       s3c2410_stop_hc(dev);
-       iounmap(hcd->regs);
-@@ -392,8 +428,15 @@ static int usb_hcd_s3c2410_probe (const struct hc_driver *driver,
-       if (retval != 0)
-               goto err_ioremap;
-+      retval = device_create_file(&dev->dev, &dev_attr_usb_mode);
-+      if (retval != 0)
-+              goto err_hcd;
-+
-       return 0;
-+ err_hcd:
-+      usb_remove_hcd(hcd);
-+
-  err_ioremap:
-       s3c2410_stop_hc(dev);
-       iounmap(hcd->regs);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1062-pnp_fixes.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1062-pnp_fixes.patch.patch
deleted file mode 100644 (file)
index 5fc57e3..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From 30659e6b5f8c44bc80a0e79ae2b40e7208ac2b51 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:54 +0100
-Subject: [PATCH] pnp_fixes.patch
-
----
- drivers/pnp/Kconfig    |    2 +-
- drivers/pnp/resource.c |    2 ++
- 2 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/pnp/Kconfig b/drivers/pnp/Kconfig
-index 821933f..f9313cf 100644
---- a/drivers/pnp/Kconfig
-+++ b/drivers/pnp/Kconfig
-@@ -5,7 +5,7 @@
- menuconfig PNP
-       bool "Plug and Play support"
-       depends on HAS_IOMEM
--      depends on ISA || ACPI
-+      depends on ISA || ACPI || SDIO
-       ---help---
-         Plug and Play (PnP) is a standard for peripherals which allows those
-         peripherals to be configured by software, e.g. assign IRQ's or other
-diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
-index e50ebcf..60d2b1b 100644
---- a/drivers/pnp/resource.c
-+++ b/drivers/pnp/resource.c
-@@ -431,6 +431,7 @@ int pnp_check_dma(struct pnp_dev *dev, int idx)
-               }
-       }
-+#if 0
-       /* check if the resource is already in use, skip if the
-        * device is active because it itself may be in use */
-       if (!dev->active) {
-@@ -438,6 +439,7 @@ int pnp_check_dma(struct pnp_dev *dev, int idx)
-                       return 0;
-               free_dma(*dma);
-       }
-+#endif
-       /* check for conflicts with other pnp devices */
-       pnp_for_each_dev(tdev) {
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1063-atheros_2_0_function.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1063-atheros_2_0_function.patch.patch
deleted file mode 100644 (file)
index c0008c7..0000000
+++ /dev/null
@@ -1,33239 +0,0 @@
-From 5fe4b00cb39ab337cfeab4ceb8ad252b9aac4583 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:55 +0100
-Subject: [PATCH] atheros_2_0_function.patch
-
----
- drivers/sdio/function/Kconfig                      |   11 +
- drivers/sdio/function/Makefile                     |    1 +
- drivers/sdio/function/wlan/Makefile                |    4 +
- drivers/sdio/function/wlan/ar6000/Makefile         |   38 +
- .../sdio/function/wlan/ar6000/ar6000/ar6000_drv.c  | 3062 ++++++++++++++
- .../sdio/function/wlan/ar6000/ar6000/ar6000_drv.h  |  360 ++
- .../function/wlan/ar6000/ar6000/ar6000_raw_if.c    |  439 ++
- .../function/wlan/ar6000/ar6000/ar6xapi_linux.h    |  128 +
- .../function/wlan/ar6000/ar6000/athdrv_linux.h     |  993 +++++
- .../function/wlan/ar6000/ar6000/athtypes_linux.h   |   47 +
- .../function/wlan/ar6000/ar6000/config_linux.h     |   44 +
- .../sdio/function/wlan/ar6000/ar6000/debug_linux.h |   86 +
- drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c   | 2540 +++++++++++
- drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c  |  225 +
- .../sdio/function/wlan/ar6000/ar6000/osapi_linux.h |  319 ++
- .../function/wlan/ar6000/ar6000/wireless_ext.c     | 1946 +++++++++
- drivers/sdio/function/wlan/ar6000/bmi/bmi.c        |  657 +++
- .../sdio/function/wlan/ar6000/bmi/bmi_internal.h   |   45 +
- drivers/sdio/function/wlan/ar6000/hif/hif.c        |  818 ++++
- .../sdio/function/wlan/ar6000/hif/hif_internal.h   |  102 +
- drivers/sdio/function/wlan/ar6000/htc/ar6k.c       |  991 +++++
- drivers/sdio/function/wlan/ar6000/htc/ar6k.h       |  191 +
- .../sdio/function/wlan/ar6000/htc/ar6k_events.c    |  638 +++
- drivers/sdio/function/wlan/ar6000/htc/htc.c        |  507 +++
- drivers/sdio/function/wlan/ar6000/htc/htc_debug.h  |   65 +
- .../sdio/function/wlan/ar6000/htc/htc_internal.h   |  168 +
- drivers/sdio/function/wlan/ar6000/htc/htc_recv.c   |  703 ++++
- drivers/sdio/function/wlan/ar6000/htc/htc_send.c   |  541 +++
- .../sdio/function/wlan/ar6000/htc/htc_services.c   |  403 ++
- .../function/wlan/ar6000/include/AR6001_regdump.h  |  100 +
- .../function/wlan/ar6000/include/AR6K_version.h    |   36 +
- .../wlan/ar6000/include/AR6K_version.h.NEW         |   36 +
- .../sdio/function/wlan/ar6000/include/AR6Khwreg.h  |  147 +
- .../sdio/function/wlan/ar6000/include/a_config.h   |   27 +
- .../sdio/function/wlan/ar6000/include/a_debug.h    |   41 +
- drivers/sdio/function/wlan/ar6000/include/a_drv.h  |   28 +
- .../sdio/function/wlan/ar6000/include/a_drv_api.h  |  185 +
- .../sdio/function/wlan/ar6000/include/a_osapi.h    |   28 +
- .../sdio/function/wlan/ar6000/include/a_types.h    |   28 +
- .../sdio/function/wlan/ar6000/include/ar6000_api.h |   29 +
- .../function/wlan/ar6000/include/ar6000_diag.h     |   38 +
- .../sdio/function/wlan/ar6000/include/athdefs.h    |   85 +
- drivers/sdio/function/wlan/ar6000/include/athdrv.h |   32 +
- .../sdio/function/wlan/ar6000/include/athendpack.h |   41 +
- .../function/wlan/ar6000/include/athstartpack.h    |   42 +
- drivers/sdio/function/wlan/ar6000/include/bmi.h    |  100 +
- .../sdio/function/wlan/ar6000/include/bmi_msg.h    |  199 +
- .../sdio/function/wlan/ar6000/include/common_drv.h |   61 +
- drivers/sdio/function/wlan/ar6000/include/dbglog.h |  107 +
- .../sdio/function/wlan/ar6000/include/dbglog_api.h |   46 +
- .../sdio/function/wlan/ar6000/include/dbglog_id.h  |  307 ++
- .../sdio/function/wlan/ar6000/include/dl_list.h    |  114 +
- .../sdio/function/wlan/ar6000/include/dset_api.h   |   63 +
- .../function/wlan/ar6000/include/dset_internal.h   |   39 +
- drivers/sdio/function/wlan/ar6000/include/dsetid.h |  110 +
- drivers/sdio/function/wlan/ar6000/include/gpio.h   |   34 +
- .../sdio/function/wlan/ar6000/include/gpio_api.h   |   57 +
- drivers/sdio/function/wlan/ar6000/include/hif.h    |  291 ++
- .../function/wlan/ar6000/include/host_version.h    |   49 +
- drivers/sdio/function/wlan/ar6000/include/htc.h    |  190 +
- .../sdio/function/wlan/ar6000/include/htc_api.h    |  436 ++
- .../sdio/function/wlan/ar6000/include/htc_packet.h |  138 +
- .../function/wlan/ar6000/include/htc_services.h    |   37 +
- .../sdio/function/wlan/ar6000/include/ieee80211.h  |  342 ++
- .../function/wlan/ar6000/include/ieee80211_ioctl.h |  163 +
- .../function/wlan/ar6000/include/ieee80211_node.h  |   77 +
- .../sdio/function/wlan/ar6000/include/ini_dset.h   |   40 +
- drivers/sdio/function/wlan/ar6000/include/regDb.h  |   19 +
- .../sdio/function/wlan/ar6000/include/regdump.h    |   33 +
- .../sdio/function/wlan/ar6000/include/targaddrs.h  |  158 +
- .../sdio/function/wlan/ar6000/include/testcmd.h    |  144 +
- .../sdio/function/wlan/ar6000/include/wlan_api.h   |  101 +
- .../sdio/function/wlan/ar6000/include/wlan_dset.h  |   20 +
- drivers/sdio/function/wlan/ar6000/include/wmi.h    | 1743 ++++++++
- .../sdio/function/wlan/ar6000/include/wmi_api.h    |  259 ++
- drivers/sdio/function/wlan/ar6000/include/wmix.h   |  233 +
- .../sdio/function/wlan/ar6000/miscdrv/common_drv.c |  467 +++
- .../function/wlan/ar6000/miscdrv/credit_dist.c     |  346 ++
- drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c |  371 ++
- .../function/wlan/ar6000/wlan/wlan_recv_beacon.c   |  192 +
- .../sdio/function/wlan/ar6000/wlan/wlan_utils.c    |   59 +
- drivers/sdio/function/wlan/ar6000/wmi/wmi.c        | 3921 +++++++++++++++++
- drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h    | 4421 ++++++++++++++++++++
- drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h   |   71 +
- 84 files changed, 32553 insertions(+), 0 deletions(-)
- create mode 100644 drivers/sdio/function/Kconfig
- create mode 100644 drivers/sdio/function/Makefile
- create mode 100644 drivers/sdio/function/wlan/Makefile
- create mode 100644 drivers/sdio/function/wlan/ar6000/Makefile
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/bmi/bmi.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/hif/hif.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/hif/hif_internal.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/htc/ar6k.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/htc/ar6k.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/htc/htc.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/htc/htc_debug.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/htc/htc_internal.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/htc/htc_recv.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/htc/htc_send.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/htc/htc_services.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/AR6K_version.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/a_config.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/a_debug.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/a_drv.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/a_drv_api.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/a_osapi.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/a_types.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/ar6000_api.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/athdefs.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/athdrv.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/athendpack.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/athstartpack.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/bmi.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/bmi_msg.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/common_drv.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/dbglog.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/dbglog_api.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/dbglog_id.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/dl_list.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/dset_api.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/dset_internal.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/dsetid.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/gpio.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/gpio_api.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/hif.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/host_version.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/htc.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/htc_api.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/htc_packet.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/htc_services.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/ieee80211.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/ini_dset.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/regDb.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/regdump.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/targaddrs.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/testcmd.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/wlan_api.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/wlan_dset.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/wmi.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/wmi_api.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/wmix.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/wmi/wmi.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h
-
-diff --git a/drivers/sdio/function/Kconfig b/drivers/sdio/function/Kconfig
-new file mode 100644
-index 0000000..9b46af3
---- /dev/null
-+++ b/drivers/sdio/function/Kconfig
-@@ -0,0 +1,11 @@
-+#menu "SDIO function drivers"
-+
-+config SDIO_AR6000_WLAN
-+        tristate "ar6000 wireless networking over sdio"
-+      depends on SDIO
-+        select WIRELESS_EXT
-+        default m
-+        help
-+          good luck.
-+
-+#endmenu
-\ No newline at end of file
-diff --git a/drivers/sdio/function/Makefile b/drivers/sdio/function/Makefile
-new file mode 100644
-index 0000000..4940d37
---- /dev/null
-+++ b/drivers/sdio/function/Makefile
-@@ -0,0 +1 @@
-+obj-$(CONFIG_SDIO_AR6000_WLAN)          += wlan/
-\ No newline at end of file
-diff --git a/drivers/sdio/function/wlan/Makefile b/drivers/sdio/function/wlan/Makefile
-new file mode 100644
-index 0000000..b1e61fc
---- /dev/null
-+++ b/drivers/sdio/function/wlan/Makefile
-@@ -0,0 +1,4 @@
-+#
-+# SDIO wlan ar600 card function driver
-+#
-+obj-$(CONFIG_SDIO_AR6000_WLAN)          += ar6000/
-\ No newline at end of file
-diff --git a/drivers/sdio/function/wlan/ar6000/Makefile b/drivers/sdio/function/wlan/ar6000/Makefile
-new file mode 100644
-index 0000000..810dab6
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/Makefile
-@@ -0,0 +1,38 @@
-+REV ?= 2
-+
-+PWD := $(shell pwd)
-+
-+EXTRA_CFLAGS += -I$(src)/include
-+
-+EXTRA_CFLAGS += -DLINUX -DDEBUG -D__KERNEL__ -DHTC_RAW_INTERFACE\
-+                -DTCMD -DSEND_EVENT_TO_APP -DUSER_KEYS \
-+                -DNO_SYNC_FLUSH #\
-+                -DMULTIPLE_FRAMES_PER_INTERRUPT -DAR6000REV$(REV) \
-+                -DBLOCK_TX_PATH_FLAG \
-+              -DSDIO \
-+
-+EXTRA_CFLAGS += -DKERNEL_2_6
-+
-+obj-$(CONFIG_SDIO_AR6000_WLAN) += ar6000.o
-+
-+ar6000-objs += htc/ar6k.o                        \
-+             htc/ar6k_events.o           \
-+               htc/htc_send.o            \
-+               htc/htc_recv.o            \
-+               htc/htc_services.o          \
-+               htc/htc.o                 \
-+               hif/hif.o                 \
-+               bmi/bmi.o                   \
-+               ar6000/ar6000_drv.o         \
-+               ar6000/ar6000_raw_if.o    \
-+               ar6000/netbuf.o                   \
-+               ar6000/wireless_ext.o     \
-+               ar6000/ioctl.o            \
-+               miscdrv/common_drv.o      \
-+               miscdrv/credit_dist.o     \
-+               wmi/wmi.o                   \
-+               wlan/wlan_node.o            \
-+               wlan/wlan_recv_beacon.o     \
-+               wlan/wlan_utils.o
-+
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-new file mode 100644
-index 0000000..bb9ef55
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-@@ -0,0 +1,3062 @@
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+/*
-+ * This driver is a pseudo ethernet driver to access the Atheros AR6000
-+ * WLAN Device
-+ */
-+static const char athId[] __attribute__ ((unused)) = "$Id: //depot/sw/releases/olca2.0-GPL/host/os/linux/ar6000_drv.c#2 $";
-+
-+#include "ar6000_drv.h"
-+#include "htc.h"
-+
-+MODULE_LICENSE("GPL and additional rights");
-+
-+#ifndef REORG_APTC_HEURISTICS
-+#undef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+#endif /* REORG_APTC_HEURISTICS */
-+
-+#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+#define APTC_TRAFFIC_SAMPLING_INTERVAL     100  /* msec */
-+#define APTC_UPPER_THROUGHPUT_THRESHOLD    3000 /* Kbps */
-+#define APTC_LOWER_THROUGHPUT_THRESHOLD    2000 /* Kbps */
-+
-+typedef struct aptc_traffic_record {
-+    A_BOOL timerScheduled;
-+    struct timeval samplingTS;
-+    unsigned long bytesReceived;
-+    unsigned long bytesTransmitted;
-+} APTC_TRAFFIC_RECORD;
-+
-+A_TIMER aptcTimer;
-+APTC_TRAFFIC_RECORD aptcTR;
-+#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-+
-+int bmienable = 0;
-+unsigned int bypasswmi = 0;
-+unsigned int debuglevel = 0;
-+int tspecCompliance = 1;
-+unsigned int busspeedlow = 0;
-+unsigned int onebitmode = 0;
-+unsigned int skipflash = 0;
-+unsigned int wmitimeout = 2;
-+unsigned int wlanNodeCaching = 1;
-+unsigned int enableuartprint = 0;
-+unsigned int logWmiRawMsgs = 0;
-+unsigned int enabletimerwar = 0;
-+unsigned int mbox_yield_limit = 99;
-+int reduce_credit_dribble = 1 + HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_ONE_HALF;
-+int allow_trace_signal = 0;
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+unsigned int testmode =0;
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+module_param(bmienable, int, 0644);
-+module_param(bypasswmi, int, 0644);
-+module_param(debuglevel, int, 0644);
-+module_param(tspecCompliance, int, 0644);
-+module_param(onebitmode, int, 0644);
-+module_param(busspeedlow, int, 0644);
-+module_param(skipflash, int, 0644);
-+module_param(wmitimeout, int, 0644);
-+module_param(wlanNodeCaching, int, 0644);
-+module_param(logWmiRawMsgs, int, 0644);
-+module_param(enableuartprint, int, 0644);
-+module_param(enabletimerwar, int, 0644);
-+module_param(mbox_yield_limit, int, 0644);
-+module_param(reduce_credit_dribble, int, 0644);
-+module_param(allow_trace_signal, int, 0644);
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+module_param(testmode, int, 0644);
-+#endif
-+#else
-+
-+#define __user
-+/* for linux 2.4 and lower */
-+MODULE_PARM(bmienable,"i");
-+MODULE_PARM(bypasswmi,"i");
-+MODULE_PARM(debuglevel, "i");
-+MODULE_PARM(onebitmode,"i");
-+MODULE_PARM(busspeedlow, "i");
-+MODULE_PARM(skipflash, "i");
-+MODULE_PARM(wmitimeout, "i");
-+MODULE_PARM(wlanNodeCaching, "i");
-+MODULE_PARM(enableuartprint,"i");
-+MODULE_PARM(logWmiRawMsgs, "i");
-+MODULE_PARM(enabletimerwar,"i");
-+MODULE_PARM(mbox_yield_limit,"i");
-+MODULE_PARM(reduce_credit_dribble,"i");
-+MODULE_PARM(allow_trace_signal,"i");
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+MODULE_PARM(testmode, "i");
-+#endif
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
-+/* in 2.6.10 and later this is now a pointer to a uint */
-+unsigned int _mboxnum = HTC_MAILBOX_NUM_MAX;
-+#define mboxnum &_mboxnum
-+#else
-+unsigned int mboxnum = HTC_MAILBOX_NUM_MAX;
-+#endif
-+
-+#ifdef DEBUG
-+A_UINT32 g_dbg_flags = DBG_DEFAULTS;
-+unsigned int debugflags = 0;
-+int debugdriver = 1;
-+unsigned int debughtc = 128;
-+unsigned int debugbmi = 1;
-+unsigned int debughif = 2;
-+unsigned int resetok = 1;
-+unsigned int txcreditsavailable[HTC_MAILBOX_NUM_MAX] = {0};
-+unsigned int txcreditsconsumed[HTC_MAILBOX_NUM_MAX] = {0};
-+unsigned int txcreditintrenable[HTC_MAILBOX_NUM_MAX] = {0};
-+unsigned int txcreditintrenableaggregate[HTC_MAILBOX_NUM_MAX] = {0};
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+module_param(debugflags, int, 0644);
-+module_param(debugdriver, int, 0644);
-+module_param(debughtc, int, 0644);
-+module_param(debugbmi, int, 0644);
-+module_param(debughif, int, 0644);
-+module_param(resetok, int, 0644);
-+module_param_array(txcreditsavailable, int, mboxnum, 0644);
-+module_param_array(txcreditsconsumed, int, mboxnum, 0644);
-+module_param_array(txcreditintrenable, int, mboxnum, 0644);
-+module_param_array(txcreditintrenableaggregate, int, mboxnum, 0644);
-+#else
-+/* linux 2.4 and lower */
-+MODULE_PARM(debugflags,"i");
-+MODULE_PARM(debugdriver, "i");
-+MODULE_PARM(debughtc, "i");
-+MODULE_PARM(debugbmi, "i");
-+MODULE_PARM(debughif, "i");
-+MODULE_PARM(resetok, "i");
-+MODULE_PARM(txcreditsavailable, "0-3i");
-+MODULE_PARM(txcreditsconsumed, "0-3i");
-+MODULE_PARM(txcreditintrenable, "0-3i");
-+MODULE_PARM(txcreditintrenableaggregate, "0-3i");
-+#endif
-+
-+#endif /* DEBUG */
-+
-+unsigned int tx_attempt[HTC_MAILBOX_NUM_MAX] = {0};
-+unsigned int tx_post[HTC_MAILBOX_NUM_MAX] = {0};
-+unsigned int tx_complete[HTC_MAILBOX_NUM_MAX] = {0};
-+unsigned int hifBusRequestNumMax = 40;
-+unsigned int war23838_disabled = 0;
-+#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+unsigned int enableAPTCHeuristics = 1;
-+#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+module_param_array(tx_attempt, int, mboxnum, 0644);
-+module_param_array(tx_post, int, mboxnum, 0644);
-+module_param_array(tx_complete, int, mboxnum, 0644);
-+module_param(hifBusRequestNumMax, int, 0644);
-+module_param(war23838_disabled, int, 0644);
-+#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+module_param(enableAPTCHeuristics, int, 0644);
-+#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-+#else
-+MODULE_PARM(tx_attempt, "0-3i");
-+MODULE_PARM(tx_post, "0-3i");
-+MODULE_PARM(tx_complete, "0-3i");
-+MODULE_PARM(hifBusRequestNumMax, "i");
-+MODULE_PARM(war23838_disabled, "i");
-+#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+MODULE_PARM(enableAPTCHeuristics, "i");
-+#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-+#endif
-+
-+#ifdef BLOCK_TX_PATH_FLAG
-+int blocktx = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+module_param(blocktx, int, 0644);
-+#else
-+MODULE_PARM(blocktx, "i");
-+#endif
-+#endif /* BLOCK_TX_PATH_FLAG */
-+
-+// TODO move to arsoft_c
-+USER_RSSI_THOLD rssi_map[12];
-+
-+int reconnect_flag = 0;
-+
-+DECLARE_WAIT_QUEUE_HEAD(ar6000_scan_queue);
-+
-+/* Function declarations */
-+static int ar6000_init_module(void);
-+static void ar6000_cleanup_module(void);
-+
-+int ar6000_init(struct net_device *dev);
-+static int ar6000_open(struct net_device *dev);
-+static int ar6000_close(struct net_device *dev);
-+static void ar6000_init_control_info(AR_SOFTC_T *ar);
-+static int ar6000_data_tx(struct sk_buff *skb, struct net_device *dev);
-+
-+static void ar6000_destroy(struct net_device *dev, unsigned int unregister);
-+static void ar6000_detect_error(unsigned long ptr);
-+static struct net_device_stats *ar6000_get_stats(struct net_device *dev);
-+static struct iw_statistics *ar6000_get_iwstats(struct net_device * dev);
-+
-+/*
-+ * HTC service connection handlers
-+ */
-+static void ar6000_avail_ev(HTC_HANDLE HTCHandle);
-+
-+static void ar6000_unavail_ev(void *Instance);
-+
-+static void ar6000_target_failure(void *Instance, A_STATUS Status);
-+
-+static void ar6000_rx(void *Context, HTC_PACKET *pPacket);
-+
-+static void ar6000_rx_refill(void *Context,HTC_ENDPOINT_ID Endpoint);
-+
-+static void ar6000_tx_complete(void *Context, HTC_PACKET *pPacket);
-+
-+static void ar6000_tx_queue_full(void *Context, HTC_ENDPOINT_ID Endpoint);
-+
-+/*
-+ * Static variables
-+ */
-+
-+static struct net_device *ar6000_devices[MAX_AR6000];
-+extern struct iw_handler_def ath_iw_handler_def;
-+DECLARE_WAIT_QUEUE_HEAD(arEvent);
-+static void ar6000_cookie_init(AR_SOFTC_T *ar);
-+static void ar6000_cookie_cleanup(AR_SOFTC_T *ar);
-+static void ar6000_free_cookie(AR_SOFTC_T *ar, struct ar_cookie * cookie);
-+static struct ar_cookie *ar6000_alloc_cookie(AR_SOFTC_T *ar);
-+static void ar6000_TxDataCleanup(AR_SOFTC_T *ar);
-+
-+#ifdef USER_KEYS
-+static A_STATUS ar6000_reinstall_keys(AR_SOFTC_T *ar,A_UINT8 key_op_ctrl);
-+#endif
-+
-+
-+static struct ar_cookie s_ar_cookie_mem[MAX_COOKIE_NUM];
-+
-+#define HOST_INTEREST_ITEM_ADDRESS(ar, item)    \
-+((ar->arTargetType == TARGET_TYPE_AR6001) ?     \
-+   AR6001_HOST_INTEREST_ITEM_ADDRESS(item) :    \
-+   AR6002_HOST_INTEREST_ITEM_ADDRESS(item))
-+
-+
-+/* Debug log support */
-+
-+/*
-+ * Flag to govern whether the debug logs should be parsed in the kernel
-+ * or reported to the application.
-+ */
-+#define REPORT_DEBUG_LOGS_TO_APP
-+
-+A_STATUS
-+ar6000_set_host_app_area(AR_SOFTC_T *ar)
-+{
-+    A_UINT32 address, data;
-+    struct host_app_area_s host_app_area;
-+
-+    /* Fetch the address of the host_app_area_s instance in the host interest area */
-+    address = HOST_INTEREST_ITEM_ADDRESS(ar, hi_app_host_interest);
-+    if (ar6000_ReadRegDiag(ar->arHifDevice, &address, &data) != A_OK) {
-+        return A_ERROR;
-+    }
-+    address = data;
-+    host_app_area.wmi_protocol_ver = WMI_PROTOCOL_VERSION;
-+    if (ar6000_WriteDataDiag(ar->arHifDevice, address,
-+                             (A_UCHAR *)&host_app_area,
-+                             sizeof(struct host_app_area_s)) != A_OK)
-+    {
-+        return A_ERROR;
-+    }
-+
-+    return A_OK;
-+}
-+
-+A_UINT32
-+dbglog_get_debug_hdr_ptr(AR_SOFTC_T *ar)
-+{
-+    A_UINT32 param;
-+    A_UINT32 address;
-+    A_STATUS status;
-+
-+    address = HOST_INTEREST_ITEM_ADDRESS(ar, hi_dbglog_hdr);
-+    if ((status = ar6000_ReadDataDiag(ar->arHifDevice, address,
-+                                      (A_UCHAR *)&param, 4)) != A_OK)
-+    {
-+        param = 0;
-+    }
-+
-+    return param;
-+}
-+
-+/*
-+ * The dbglog module has been initialized. Its ok to access the relevant
-+ * data stuctures over the diagnostic window.
-+ */
-+void
-+ar6000_dbglog_init_done(AR_SOFTC_T *ar)
-+{
-+    ar->dbglog_init_done = TRUE;
-+}
-+
-+A_UINT32
-+dbglog_get_debug_fragment(A_INT8 *datap, A_UINT32 len, A_UINT32 limit)
-+{
-+    A_INT32 *buffer;
-+    A_UINT32 count;
-+    A_UINT32 numargs;
-+    A_UINT32 length;
-+    A_UINT32 fraglen;
-+
-+    count = fraglen = 0;
-+    buffer = (A_INT32 *)datap;
-+    length = (limit >> 2);
-+
-+    if (len <= limit) {
-+        fraglen = len;
-+    } else {
-+        while (count < length) {
-+            numargs = DBGLOG_GET_NUMARGS(buffer[count]);
-+            fraglen = (count << 2);
-+            count += numargs + 1;
-+        }
-+    }
-+
-+    return fraglen;
-+}
-+
-+void
-+dbglog_parse_debug_logs(A_INT8 *datap, A_UINT32 len)
-+{
-+    A_INT32 *buffer;
-+    A_UINT32 count;
-+    A_UINT32 timestamp;
-+    A_UINT32 debugid;
-+    A_UINT32 moduleid;
-+    A_UINT32 numargs;
-+    A_UINT32 length;
-+
-+    count = 0;
-+    buffer = (A_INT32 *)datap;
-+    length = (len >> 2);
-+    while (count < length) {
-+        debugid = DBGLOG_GET_DBGID(buffer[count]);
-+        moduleid = DBGLOG_GET_MODULEID(buffer[count]);
-+        numargs = DBGLOG_GET_NUMARGS(buffer[count]);
-+        timestamp = DBGLOG_GET_TIMESTAMP(buffer[count]);
-+        switch (numargs) {
-+            case 0:
-+            AR_DEBUG_PRINTF("%d %d (%d)\n", moduleid, debugid, timestamp);
-+            break;
-+
-+            case 1:
-+            AR_DEBUG_PRINTF("%d %d (%d): 0x%x\n", moduleid, debugid,
-+                            timestamp, buffer[count+1]);
-+            break;
-+
-+            case 2:
-+            AR_DEBUG_PRINTF("%d %d (%d): 0x%x, 0x%x\n", moduleid, debugid,
-+                            timestamp, buffer[count+1], buffer[count+2]);
-+            break;
-+
-+            default:
-+            AR_DEBUG_PRINTF("Invalid args: %d\n", numargs);
-+        }
-+        count += numargs + 1;
-+    }
-+}
-+
-+int
-+ar6000_dbglog_get_debug_logs(AR_SOFTC_T *ar)
-+{
-+    struct dbglog_hdr_s debug_hdr;
-+    struct dbglog_buf_s debug_buf;
-+    A_UINT32 address;
-+    A_UINT32 length;
-+    A_UINT32 dropped;
-+    A_UINT32 firstbuf;
-+    A_UINT32 debug_hdr_ptr;
-+
-+    if (!ar->dbglog_init_done) return A_ERROR;
-+
-+
-+    AR6000_SPIN_LOCK(&ar->arLock, 0);
-+
-+    if (ar->dbgLogFetchInProgress) {
-+        AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+        return A_EBUSY;
-+    }
-+
-+        /* block out others */
-+    ar->dbgLogFetchInProgress = TRUE;
-+
-+    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+
-+    debug_hdr_ptr = dbglog_get_debug_hdr_ptr(ar);
-+    printk("debug_hdr_ptr: 0x%x\n", debug_hdr_ptr);
-+
-+    /* Get the contents of the ring buffer */
-+    if (debug_hdr_ptr) {
-+        address = debug_hdr_ptr;
-+        length = sizeof(struct dbglog_hdr_s);
-+        ar6000_ReadDataDiag(ar->arHifDevice, address,
-+                            (A_UCHAR *)&debug_hdr, length);
-+        address = (A_UINT32)debug_hdr.dbuf;
-+        firstbuf = address;
-+        dropped = debug_hdr.dropped;
-+        length = sizeof(struct dbglog_buf_s);
-+        ar6000_ReadDataDiag(ar->arHifDevice, address,
-+                            (A_UCHAR *)&debug_buf, length);
-+
-+        do {
-+            address = (A_UINT32)debug_buf.buffer;
-+            length = debug_buf.length;
-+            if ((length) && (debug_buf.length <= debug_buf.bufsize)) {
-+                /* Rewind the index if it is about to overrun the buffer */
-+                if (ar->log_cnt > (DBGLOG_HOST_LOG_BUFFER_SIZE - length)) {
-+                    ar->log_cnt = 0;
-+                }
-+                if(A_OK != ar6000_ReadDataDiag(ar->arHifDevice, address,
-+                                    (A_UCHAR *)&ar->log_buffer[ar->log_cnt], length))
-+                {
-+                    break;
-+                }
-+                ar6000_dbglog_event(ar, dropped, &ar->log_buffer[ar->log_cnt], length);
-+                ar->log_cnt += length;
-+            } else {
-+                AR_DEBUG_PRINTF("Length: %d (Total size: %d)\n",
-+                                debug_buf.length, debug_buf.bufsize);
-+            }
-+
-+            address = (A_UINT32)debug_buf.next;
-+            length = sizeof(struct dbglog_buf_s);
-+            if(A_OK != ar6000_ReadDataDiag(ar->arHifDevice, address,
-+                                (A_UCHAR *)&debug_buf, length))
-+            {
-+                break;
-+            }
-+
-+        } while (address != firstbuf);
-+    }
-+
-+    ar->dbgLogFetchInProgress = FALSE;
-+
-+    return A_OK;
-+}
-+
-+void
-+ar6000_dbglog_event(AR_SOFTC_T *ar, A_UINT32 dropped,
-+                    A_INT8 *buffer, A_UINT32 length)
-+{
-+#ifdef REPORT_DEBUG_LOGS_TO_APP
-+    #define MAX_WIRELESS_EVENT_SIZE 252
-+    /*
-+     * Break it up into chunks of MAX_WIRELESS_EVENT_SIZE bytes of messages.
-+     * There seems to be a limitation on the length of message that could be
-+     * transmitted to the user app via this mechanism.
-+     */
-+    A_UINT32 send, sent;
-+
-+    sent = 0;
-+    send = dbglog_get_debug_fragment(&buffer[sent], length - sent,
-+                                     MAX_WIRELESS_EVENT_SIZE);
-+    while (send) {
-+        ar6000_send_event_to_app(ar, WMIX_DBGLOG_EVENTID, &buffer[sent], send);
-+        sent += send;
-+        send = dbglog_get_debug_fragment(&buffer[sent], length - sent,
-+                                         MAX_WIRELESS_EVENT_SIZE);
-+    }
-+#else
-+    AR_DEBUG_PRINTF("Dropped logs: 0x%x\nDebug info length: %d\n",
-+                    dropped, length);
-+
-+    /* Interpret the debug logs */
-+    dbglog_parse_debug_logs(buffer, length);
-+#endif /* REPORT_DEBUG_LOGS_TO_APP */
-+}
-+
-+
-+
-+static int __init
-+ar6000_init_module(void)
-+{
-+    static int probed = 0;
-+    A_STATUS status;
-+    HTC_INIT_INFO initInfo;
-+
-+    A_MEMZERO(&initInfo,sizeof(initInfo));
-+    initInfo.AddInstance = ar6000_avail_ev;
-+    initInfo.DeleteInstance = ar6000_unavail_ev;
-+    initInfo.TargetFailure = ar6000_target_failure;
-+
-+
-+#ifdef DEBUG
-+    /* Set the debug flags if specified at load time */
-+    if(debugflags != 0)
-+    {
-+        g_dbg_flags = debugflags;
-+    }
-+#endif
-+
-+    if (probed) {
-+        return -ENODEV;
-+    }
-+    probed++;
-+
-+#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+    memset(&aptcTR, 0, sizeof(APTC_TRAFFIC_RECORD));
-+#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-+
-+#ifdef CONFIG_HOST_GPIO_SUPPORT
-+    ar6000_gpio_init();
-+#endif /* CONFIG_HOST_GPIO_SUPPORT */
-+
-+    status = HTCInit(&initInfo);
-+    if(status != A_OK)
-+        return -ENODEV;
-+
-+    return 0;
-+}
-+
-+static void __exit
-+ar6000_cleanup_module(void)
-+{
-+    int i = 0;
-+    struct net_device *ar6000_netdev;
-+
-+#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+    /* Delete the Adaptive Power Control timer */
-+    if (timer_pending(&aptcTimer)) {
-+        del_timer_sync(&aptcTimer);
-+    }
-+#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-+
-+    for (i=0; i < MAX_AR6000; i++) {
-+        if (ar6000_devices[i] != NULL) {
-+            ar6000_netdev = ar6000_devices[i];
-+            ar6000_devices[i] = NULL;
-+            ar6000_destroy(ar6000_netdev, 1);
-+        }
-+    }
-+
-+        /* shutting down HTC will cause the HIF layer to detach from the
-+         * underlying bus driver which will cause the subsequent deletion of
-+         * all HIF and HTC instances */
-+    HTCShutDown();
-+
-+    AR_DEBUG_PRINTF("ar6000_cleanup: success\n");
-+}
-+
-+#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+void
-+aptcTimerHandler(unsigned long arg)
-+{
-+    A_UINT32 numbytes;
-+    A_UINT32 throughput;
-+    AR_SOFTC_T *ar;
-+    A_STATUS status;
-+
-+    ar = (AR_SOFTC_T *)arg;
-+    A_ASSERT(ar != NULL);
-+    A_ASSERT(!timer_pending(&aptcTimer));
-+
-+    AR6000_SPIN_LOCK(&ar->arLock, 0);
-+
-+    /* Get the number of bytes transferred */
-+    numbytes = aptcTR.bytesTransmitted + aptcTR.bytesReceived;
-+    aptcTR.bytesTransmitted = aptcTR.bytesReceived = 0;
-+
-+    /* Calculate and decide based on throughput thresholds */
-+    throughput = ((numbytes * 8)/APTC_TRAFFIC_SAMPLING_INTERVAL); /* Kbps */
-+    if (throughput < APTC_LOWER_THROUGHPUT_THRESHOLD) {
-+        /* Enable Sleep and delete the timer */
-+        A_ASSERT(ar->arWmiReady == TRUE);
-+        AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+        status = wmi_powermode_cmd(ar->arWmi, REC_POWER);
-+        AR6000_SPIN_LOCK(&ar->arLock, 0);
-+        A_ASSERT(status == A_OK);
-+        aptcTR.timerScheduled = FALSE;
-+    } else {
-+        A_TIMEOUT_MS(&aptcTimer, APTC_TRAFFIC_SAMPLING_INTERVAL, 0);
-+    }
-+
-+    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+}
-+#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-+
-+
-+
-+/* set HTC block size, assume BMI is already initialized */
-+A_STATUS ar6000_SetHTCBlockSize(AR_SOFTC_T *ar)
-+{
-+    A_STATUS status;
-+    A_UINT32 blocksizes[HTC_MAILBOX_NUM_MAX];
-+
-+    do {
-+            /* get the block sizes */
-+        status = HIFConfigureDevice(ar->arHifDevice, HIF_DEVICE_GET_MBOX_BLOCK_SIZE,
-+                                    blocksizes, sizeof(blocksizes));
-+
-+        if (A_FAILED(status)) {
-+            AR_DEBUG_PRINTF("Failed to get block size info from HIF layer...\n");
-+            break;
-+        }
-+            /* note: we actually get the block size for mailbox 1, for SDIO the block
-+             * size on mailbox 0 is artificially set to 1 */
-+            /* must be a power of 2 */
-+        A_ASSERT((blocksizes[1] & (blocksizes[1] - 1)) == 0);
-+
-+            /* set the host interest area for the block size */
-+        status = BMIWriteMemory(ar->arHifDevice,
-+                                HOST_INTEREST_ITEM_ADDRESS(ar, hi_mbox_io_block_sz),
-+                                (A_UCHAR *)&blocksizes[1],
-+                                4);
-+
-+        if (A_FAILED(status)) {
-+            AR_DEBUG_PRINTF("BMIWriteMemory for IO block size failed \n");
-+            break;
-+        }
-+
-+        AR_DEBUG_PRINTF("Block Size Set: %d (target address:0x%X)\n",
-+                blocksizes[1], HOST_INTEREST_ITEM_ADDRESS(ar, hi_mbox_io_block_sz));
-+
-+            /* set the host interest area for the mbox ISR yield limit */
-+        status = BMIWriteMemory(ar->arHifDevice,
-+                                HOST_INTEREST_ITEM_ADDRESS(ar, hi_mbox_isr_yield_limit),
-+                                (A_UCHAR *)&mbox_yield_limit,
-+                                4);
-+
-+        if (A_FAILED(status)) {
-+            AR_DEBUG_PRINTF("BMIWriteMemory for yield limit failed \n");
-+            break;
-+        }
-+
-+    } while (FALSE);
-+
-+    return status;
-+}
-+
-+/*
-+ * HTC Event handlers
-+ */
-+static void
-+ar6000_avail_ev(HTC_HANDLE HTCHandle)
-+{
-+    int i;
-+    struct net_device *dev;
-+    AR_SOFTC_T *ar;
-+    int device_index = 0;
-+
-+    AR_DEBUG_PRINTF("ar6000_available\n");
-+
-+    for (i=0; i < MAX_AR6000; i++) {
-+        if (ar6000_devices[i] == NULL) {
-+            break;
-+        }
-+    }
-+
-+    if (i == MAX_AR6000) {
-+        AR_DEBUG_PRINTF("ar6000_available: max devices reached\n");
-+        return;
-+    }
-+
-+    /* Save this. It gives a bit better readability especially since */
-+    /* we use another local "i" variable below.                      */
-+    device_index = i;
-+
-+    A_ASSERT(HTCHandle != NULL);
-+
-+    dev = alloc_etherdev(sizeof(AR_SOFTC_T));
-+    if (dev == NULL) {
-+        AR_DEBUG_PRINTF("ar6000_available: can't alloc etherdev\n");
-+        return;
-+    }
-+
-+    ether_setup(dev);
-+
-+    if (dev->priv == NULL) {
-+        printk(KERN_CRIT "ar6000_available: Could not allocate memory\n");
-+        return;
-+    }
-+
-+    A_MEMZERO(dev->priv, sizeof(AR_SOFTC_T));
-+
-+    ar                       = (AR_SOFTC_T *)dev->priv;
-+    ar->arNetDev             = dev;
-+    ar->arHtcTarget          = HTCHandle;
-+    ar->arHifDevice          = HTCGetHifDevice(HTCHandle);
-+    ar->arWlanState          = WLAN_ENABLED;
-+    ar->arDeviceIndex        = device_index;
-+
-+    A_INIT_TIMER(&ar->arHBChallengeResp.timer, ar6000_detect_error, dev);
-+    ar->arHBChallengeResp.seqNum = 0;
-+    ar->arHBChallengeResp.outstanding = FALSE;
-+    ar->arHBChallengeResp.missCnt = 0;
-+    ar->arHBChallengeResp.frequency = AR6000_HB_CHALLENGE_RESP_FREQ_DEFAULT;
-+    ar->arHBChallengeResp.missThres = AR6000_HB_CHALLENGE_RESP_MISS_THRES_DEFAULT;
-+
-+    ar6000_init_control_info(ar);
-+    init_waitqueue_head(&arEvent);
-+    sema_init(&ar->arSem, 1);
-+
-+#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+    A_INIT_TIMER(&aptcTimer, aptcTimerHandler, ar);
-+#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-+
-+    /*
-+     * If requested, perform some magic which requires no cooperation from
-+     * the Target.  It causes the Target to ignore flash and execute to the
-+     * OS from ROM.
-+     *
-+     * This is intended to support recovery from a corrupted flash on Targets
-+     * that support flash.
-+     */
-+    if (skipflash)
-+    {
-+        ar6000_reset_device_skipflash(ar->arHifDevice);
-+            }
-+
-+    BMIInit();
-+    {
-+        struct bmi_target_info targ_info;
-+
-+        if (BMIGetTargetInfo(ar->arHifDevice, &targ_info) != A_OK) {
-+            return;
-+        }
-+
-+        ar->arVersion.target_ver = targ_info.target_ver;
-+        ar->arTargetType = targ_info.target_type;
-+    }
-+
-+    if (enableuartprint) {
-+        A_UINT32 param;
-+        param = 1;
-+        if (BMIWriteMemory(ar->arHifDevice,
-+                           HOST_INTEREST_ITEM_ADDRESS(ar, hi_serial_enable),
-+                           (A_UCHAR *)&param,
-+                           4)!= A_OK)
-+        {
-+             AR_DEBUG_PRINTF("BMIWriteMemory for enableuartprint failed \n");
-+             return ;
-+        }
-+        AR_DEBUG_PRINTF("Serial console prints enabled\n");
-+    }
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+    if(testmode) {
-+        ar->arTargetMode = AR6000_TCMD_MODE;
-+    }else {
-+        ar->arTargetMode = AR6000_WLAN_MODE;
-+    }
-+#endif
-+    if (enabletimerwar) {
-+        A_UINT32 param;
-+
-+        if (BMIReadMemory(ar->arHifDevice,
-+            HOST_INTEREST_ITEM_ADDRESS(ar, hi_option_flag),
-+            (A_UCHAR *)&param,
-+            4)!= A_OK)
-+        {
-+            AR_DEBUG_PRINTF("BMIReadMemory for enabletimerwar failed \n");
-+            return;
-+        }
-+
-+        param |= HI_OPTION_TIMER_WAR;
-+
-+        if (BMIWriteMemory(ar->arHifDevice,
-+            HOST_INTEREST_ITEM_ADDRESS(ar, hi_option_flag),
-+            (A_UCHAR *)&param,
-+            4) != A_OK)
-+        {
-+            AR_DEBUG_PRINTF("BMIWriteMemory for enabletimerwar failed \n");
-+            return;
-+        }
-+        AR_DEBUG_PRINTF("Timer WAR enabled\n");
-+    }
-+
-+
-+        /* since BMIInit is called in the driver layer, we have to set the block
-+         * size here for the target */
-+
-+    if (A_FAILED(ar6000_SetHTCBlockSize(ar))) {
-+        return;
-+    }
-+
-+    spin_lock_init(&ar->arLock);
-+
-+    /* Don't install the init function if BMI is requested */
-+    if(!bmienable)
-+    {
-+        dev->init = ar6000_init;
-+    } else {
-+        AR_DEBUG_PRINTF(" BMI enabled \n");
-+    }
-+
-+    dev->open = &ar6000_open;
-+    dev->stop = &ar6000_close;
-+    dev->hard_start_xmit = &ar6000_data_tx;
-+    dev->get_stats = &ar6000_get_stats;
-+
-+    /* dev->tx_timeout = ar6000_tx_timeout; */
-+    dev->do_ioctl = &ar6000_ioctl;
-+    dev->watchdog_timeo = AR6000_TX_TIMEOUT;
-+    ar6000_ioctl_iwsetup(&ath_iw_handler_def);
-+    dev->wireless_handlers = &ath_iw_handler_def;
-+    ath_iw_handler_def.get_wireless_stats = ar6000_get_iwstats; /*Displayed via proc fs */
-+
-+    /*
-+     * We need the OS to provide us with more headroom in order to
-+     * perform dix to 802.3, WMI header encap, and the HTC header
-+     */
-+    dev->hard_header_len = ETH_HLEN + sizeof(ATH_LLC_SNAP_HDR) +
-+        sizeof(WMI_DATA_HDR) + HTC_HEADER_LEN;
-+
-+    /* This runs the init function */
-+    if (register_netdev(dev)) {
-+        AR_DEBUG_PRINTF("ar6000_avail: register_netdev failed\n");
-+        ar6000_destroy(dev, 0);
-+        return;
-+    }
-+
-+    HTCSetInstance(ar->arHtcTarget, ar);
-+
-+    /* We only register the device in the global list if we succeed. */
-+    /* If the device is in the global list, it will be destroyed     */
-+    /* when the module is unloaded.                                  */
-+    ar6000_devices[device_index] = dev;
-+
-+    AR_DEBUG_PRINTF("ar6000_avail: name=%s htcTarget=0x%x, dev=0x%x (%d), ar=0x%x\n",
-+                    dev->name, (A_UINT32)HTCHandle, (A_UINT32)dev, device_index,
-+                    (A_UINT32)ar);
-+}
-+
-+static void ar6000_target_failure(void *Instance, A_STATUS Status)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)Instance;
-+    WMI_TARGET_ERROR_REPORT_EVENT errEvent;
-+    static A_BOOL sip = FALSE;
-+
-+    if (Status != A_OK) {
-+        if (timer_pending(&ar->arHBChallengeResp.timer)) {
-+            A_UNTIMEOUT(&ar->arHBChallengeResp.timer);
-+        }
-+
-+        /* try dumping target assertion information (if any) */
-+        ar6000_dump_target_assert_info(ar->arHifDevice,ar->arTargetType);
-+
-+        /*
-+         * Fetch the logs from the target via the diagnostic
-+         * window.
-+         */
-+        ar6000_dbglog_get_debug_logs(ar);
-+
-+        /* Report the error only once */
-+        if (!sip) {
-+            sip = TRUE;
-+            errEvent.errorVal = WMI_TARGET_COM_ERR |
-+                                WMI_TARGET_FATAL_ERR;
-+            ar6000_send_event_to_app(ar, WMI_ERROR_REPORT_EVENTID,
-+                                     (A_UINT8 *)&errEvent,
-+                                     sizeof(WMI_TARGET_ERROR_REPORT_EVENT));
-+        }
-+    }
-+}
-+
-+static void
-+ar6000_unavail_ev(void *Instance)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)Instance;
-+        /* NULL out it's entry in the global list */
-+    ar6000_devices[ar->arDeviceIndex] = NULL;
-+    ar6000_destroy(ar->arNetDev, 1);
-+}
-+
-+/*
-+ * We need to differentiate between the surprise and planned removal of the
-+ * device because of the following consideration:
-+ * - In case of surprise removal, the hcd already frees up the pending
-+ *   for the device and hence there is no need to unregister the function
-+ *   driver inorder to get these requests. For planned removal, the function
-+ *   driver has to explictly unregister itself to have the hcd return all the
-+ *   pending requests before the data structures for the devices are freed up.
-+ *   Note that as per the current implementation, the function driver will
-+ *   end up releasing all the devices since there is no API to selectively
-+ *   release a particular device.
-+ * - Certain commands issued to the target can be skipped for surprise
-+ *   removal since they will anyway not go through.
-+ */
-+static void
-+ar6000_destroy(struct net_device *dev, unsigned int unregister)
-+{
-+    AR_SOFTC_T *ar;
-+
-+    AR_DEBUG_PRINTF("+ar6000_destroy \n");
-+
-+    if((dev == NULL) || ((ar = netdev_priv(dev)) == NULL))
-+    {
-+        AR_DEBUG_PRINTF("%s(): Failed to get device structure.\n", __func__);
-+        return;
-+    }
-+
-+    /* Stop the transmit queues */
-+    netif_stop_queue(dev);
-+
-+    /* Disable the target and the interrupts associated with it */
-+    if (ar->arWmiReady == TRUE)
-+    {
-+        if (!bypasswmi)
-+        {
-+            if (ar->arConnected == TRUE || ar->arConnectPending == TRUE)
-+            {
-+                AR_DEBUG_PRINTF("%s(): Disconnect\n", __func__);
-+                AR6000_SPIN_LOCK(&ar->arLock, 0);
-+                ar6000_init_profile_info(ar);
-+                AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+                wmi_disconnect_cmd(ar->arWmi);
-+            }
-+
-+            ar6000_dbglog_get_debug_logs(ar);
-+            ar->arWmiReady  = FALSE;
-+            ar->arConnected = FALSE;
-+            ar->arConnectPending = FALSE;
-+            wmi_shutdown(ar->arWmi);
-+            ar->arWmiEnabled = FALSE;
-+            ar->arWmi = NULL;
-+            ar->arWlanState = WLAN_ENABLED;
-+#ifdef USER_KEYS
-+            ar->user_savedkeys_stat = USER_SAVEDKEYS_STAT_INIT;
-+            ar->user_key_ctrl      = 0;
-+#endif
-+        }
-+
-+         AR_DEBUG_PRINTF("%s(): WMI stopped\n", __func__);
-+    }
-+    else
-+    {
-+        AR_DEBUG_PRINTF("%s(): WMI not ready 0x%08x 0x%08x\n",
-+            __func__, (unsigned int) ar, (unsigned int) ar->arWmi);
-+
-+        /* Shut down WMI if we have started it */
-+        if(ar->arWmiEnabled == TRUE)
-+        {
-+            AR_DEBUG_PRINTF("%s(): Shut down WMI\n", __func__);
-+            wmi_shutdown(ar->arWmi);
-+            ar->arWmiEnabled = FALSE;
-+            ar->arWmi = NULL;
-+        }
-+    }
-+
-+    /* stop HTC */
-+    HTCStop(ar->arHtcTarget);
-+
-+    /* set the instance to NULL so we do not get called back on remove incase we
-+     * we're explicity destroyed by module unload */
-+    HTCSetInstance(ar->arHtcTarget, NULL);
-+
-+    if (resetok) {
-+        /* try to reset the device if we can
-+         * The driver may have been configure NOT to reset the target during
-+         * a debug session */
-+        AR_DEBUG_PRINTF(" Attempting to reset target on instance destroy.... \n");
-+        ar6000_reset_device(ar->arHifDevice, ar->arTargetType);
-+    } else {
-+        AR_DEBUG_PRINTF(" Host does not want target reset. \n");
-+    }
-+
-+       /* Done with cookies */
-+    ar6000_cookie_cleanup(ar);
-+
-+    /* Cleanup BMI */
-+    BMIInit();
-+
-+    /* Clear the tx counters */
-+    memset(tx_attempt, 0, sizeof(tx_attempt));
-+    memset(tx_post, 0, sizeof(tx_post));
-+    memset(tx_complete, 0, sizeof(tx_complete));
-+
-+
-+    /* Free up the device data structure */
-+    if (unregister)
-+          unregister_netdev(dev);
-+#ifndef free_netdev
-+    kfree(dev);
-+#else
-+    free_netdev(dev);
-+#endif
-+
-+    AR_DEBUG_PRINTF("-ar6000_destroy \n");
-+}
-+
-+static void ar6000_detect_error(unsigned long ptr)
-+{
-+    struct net_device *dev = (struct net_device *)ptr;
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_TARGET_ERROR_REPORT_EVENT errEvent;
-+
-+    AR6000_SPIN_LOCK(&ar->arLock, 0);
-+
-+    if (ar->arHBChallengeResp.outstanding) {
-+        ar->arHBChallengeResp.missCnt++;
-+    } else {
-+        ar->arHBChallengeResp.missCnt = 0;
-+    }
-+
-+    if (ar->arHBChallengeResp.missCnt > ar->arHBChallengeResp.missThres) {
-+        /* Send Error Detect event to the application layer and do not reschedule the error detection module timer */
-+        ar->arHBChallengeResp.missCnt = 0;
-+        ar->arHBChallengeResp.seqNum = 0;
-+        errEvent.errorVal = WMI_TARGET_COM_ERR | WMI_TARGET_FATAL_ERR;
-+        AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+        ar6000_send_event_to_app(ar, WMI_ERROR_REPORT_EVENTID,
-+                                 (A_UINT8 *)&errEvent,
-+                                 sizeof(WMI_TARGET_ERROR_REPORT_EVENT));
-+        return;
-+    }
-+
-+    /* Generate the sequence number for the next challenge */
-+    ar->arHBChallengeResp.seqNum++;
-+    ar->arHBChallengeResp.outstanding = TRUE;
-+
-+    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+
-+    /* Send the challenge on the control channel */
-+    if (wmi_get_challenge_resp_cmd(ar->arWmi, ar->arHBChallengeResp.seqNum, DRV_HB_CHALLENGE) != A_OK) {
-+        AR_DEBUG_PRINTF("Unable to send heart beat challenge\n");
-+    }
-+
-+
-+    /* Reschedule the timer for the next challenge */
-+    A_TIMEOUT_MS(&ar->arHBChallengeResp.timer, ar->arHBChallengeResp.frequency * 1000, 0);
-+}
-+
-+void ar6000_init_profile_info(AR_SOFTC_T *ar)
-+{
-+    ar->arSsidLen            = 0;
-+    A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
-+    ar->arNetworkType        = INFRA_NETWORK;
-+    ar->arDot11AuthMode      = OPEN_AUTH;
-+    ar->arAuthMode           = NONE_AUTH;
-+    ar->arPairwiseCrypto     = NONE_CRYPT;
-+    ar->arPairwiseCryptoLen  = 0;
-+    ar->arGroupCrypto        = NONE_CRYPT;
-+    ar->arGroupCryptoLen     = 0;
-+    A_MEMZERO(ar->arWepKeyList, sizeof(ar->arWepKeyList));
-+    A_MEMZERO(ar->arReqBssid, sizeof(ar->arReqBssid));
-+    A_MEMZERO(ar->arBssid, sizeof(ar->arBssid));
-+    ar->arBssChannel = 0;
-+}
-+
-+static void
-+ar6000_init_control_info(AR_SOFTC_T *ar)
-+{
-+    ar->arWmiEnabled         = FALSE;
-+    ar6000_init_profile_info(ar);
-+    ar->arDefTxKeyIndex      = 0;
-+    A_MEMZERO(ar->arWepKeyList, sizeof(ar->arWepKeyList));
-+    ar->arChannelHint        = 0;
-+    ar->arListenInterval     = MAX_LISTEN_INTERVAL;
-+    ar->arVersion.host_ver   = AR6K_SW_VERSION;
-+    ar->arRssi               = 0;
-+    ar->arTxPwr              = 0;
-+    ar->arTxPwrSet           = FALSE;
-+    ar->arSkipScan           = 0;
-+    ar->arBeaconInterval     = 0;
-+    ar->arBitRate            = 0;
-+    ar->arMaxRetries         = 0;
-+    ar->arWmmEnabled         = TRUE;
-+}
-+
-+static int
-+ar6000_open(struct net_device *dev)
-+{
-+    /* Wake up the queues */
-+    netif_wake_queue(dev);
-+
-+    return 0;
-+}
-+
-+static int
-+ar6000_close(struct net_device *dev)
-+{
-+    netif_stop_queue(dev);
-+
-+    return 0;
-+}
-+
-+/* connect to a service */
-+static A_STATUS ar6000_connectservice(AR_SOFTC_T               *ar,
-+                                      HTC_SERVICE_CONNECT_REQ  *pConnect,
-+                                      WMI_PRI_STREAM_ID        WmiStreamID,
-+                                      char                     *pDesc)
-+{
-+    A_STATUS                 status;
-+    HTC_SERVICE_CONNECT_RESP response;
-+
-+    do {
-+
-+        A_MEMZERO(&response,sizeof(response));
-+
-+        status = HTCConnectService(ar->arHtcTarget,
-+                                   pConnect,
-+                                   &response);
-+
-+        if (A_FAILED(status)) {
-+            AR_DEBUG_PRINTF(" Failed to connect to %s service status:%d \n", pDesc, status);
-+            break;
-+        }
-+
-+        if (WmiStreamID == WMI_NOT_MAPPED) {
-+                /* done */
-+            break;
-+        }
-+
-+            /* set endpoint mapping for the WMI stream in the driver layer */
-+        arSetWMIStream2EndpointIDMap(ar,WmiStreamID,response.Endpoint);
-+
-+    } while (FALSE);
-+
-+    return status;
-+}
-+
-+static void ar6000_TxDataCleanup(AR_SOFTC_T *ar)
-+{
-+        /* flush all the data (non-control) streams
-+         * we only flush packets that are tagged as data, we leave any control packets that
-+         * were in the TX queues alone */
-+    HTCFlushEndpoint(ar->arHtcTarget,
-+                     arWMIStream2EndpointID(ar,WMI_BEST_EFFORT_PRI),
-+                     AR6K_DATA_PKT_TAG);
-+    HTCFlushEndpoint(ar->arHtcTarget,
-+                     arWMIStream2EndpointID(ar,WMI_LOW_PRI),
-+                     AR6K_DATA_PKT_TAG);
-+    HTCFlushEndpoint(ar->arHtcTarget,
-+                     arWMIStream2EndpointID(ar,WMI_HIGH_PRI),
-+                     AR6K_DATA_PKT_TAG);
-+    HTCFlushEndpoint(ar->arHtcTarget,
-+                     arWMIStream2EndpointID(ar,WMI_HIGHEST_PRI),
-+                     AR6K_DATA_PKT_TAG);
-+}
-+
-+/* This function does one time initialization for the lifetime of the device */
-+int ar6000_init(struct net_device *dev)
-+{
-+    AR_SOFTC_T *ar;
-+    A_STATUS    status;
-+    A_INT32     timeleft;
-+
-+    if((ar = netdev_priv(dev)) == NULL)
-+    {
-+        return(-EIO);
-+    }
-+
-+    /* Do we need to finish the BMI phase */
-+    if(BMIDone(ar->arHifDevice) != A_OK)
-+    {
-+        return -EIO;
-+    }
-+
-+    if (!bypasswmi)
-+    {
-+#if 0 /* TBDXXX */
-+        if (ar->arVersion.host_ver != ar->arVersion.target_ver) {
-+            A_PRINTF("WARNING: Host version 0x%x does not match Target "
-+                    " version 0x%x!\n",
-+                    ar->arVersion.host_ver, ar->arVersion.target_ver);
-+        }
-+#endif
-+
-+        /* Indicate that WMI is enabled (although not ready yet) */
-+        ar->arWmiEnabled = TRUE;
-+        if ((ar->arWmi = wmi_init((void *) ar)) == NULL)
-+        {
-+            AR_DEBUG_PRINTF("%s() Failed to initialize WMI.\n", __func__);
-+            return(-EIO);
-+        }
-+
-+        AR_DEBUG_PRINTF("%s() Got WMI @ 0x%08x.\n", __func__,
-+            (unsigned int) ar->arWmi);
-+    }
-+
-+    do {
-+        HTC_SERVICE_CONNECT_REQ connect;
-+
-+            /* the reason we have to wait for the target here is that the driver layer
-+             * has to init BMI in order to set the host block size,
-+             */
-+        status = HTCWaitTarget(ar->arHtcTarget);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+        A_MEMZERO(&connect,sizeof(connect));
-+            /* meta data is unused for now */
-+        connect.pMetaData = NULL;
-+        connect.MetaDataLength = 0;
-+            /* these fields are the same for all service endpoints */
-+        connect.EpCallbacks.pContext = ar;
-+        connect.EpCallbacks.EpTxComplete = ar6000_tx_complete;
-+        connect.EpCallbacks.EpRecv = ar6000_rx;
-+        connect.EpCallbacks.EpRecvRefill = ar6000_rx_refill;
-+        connect.EpCallbacks.EpSendFull = ar6000_tx_queue_full;
-+            /* set the max queue depth so that our ar6000_tx_queue_full handler gets called.
-+             * Linux has the peculiarity of not providing flow control between the
-+             * NIC and the network stack. There is no API to indicate that a TX packet
-+             * was sent which could provide some back pressure to the network stack.
-+             * Under linux you would have to wait till the network stack consumed all sk_buffs
-+             * before any back-flow kicked in. Which isn't very friendly.
-+             * So we have to manage this ourselves */
-+        connect.MaxSendQueueDepth = 32;
-+
-+            /* connect to control service */
-+        connect.ServiceID = WMI_CONTROL_SVC;
-+        status = ar6000_connectservice(ar,
-+                                       &connect,
-+                                       WMI_CONTROL_PRI,
-+                                       "WMI CONTROL");
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+            /* for the remaining data services set the connection flag to reduce dribbling,
-+             * if configured to do so */
-+        if (reduce_credit_dribble) {
-+            connect.ConnectionFlags |= HTC_CONNECT_FLAGS_REDUCE_CREDIT_DRIBBLE;
-+            /* the credit dribble trigger threshold is (reduce_credit_dribble - 1) for a value
-+             * of 0-3 */
-+            connect.ConnectionFlags &= ~HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_MASK;
-+            connect.ConnectionFlags |=
-+                        ((A_UINT16)reduce_credit_dribble - 1) & HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_MASK;
-+        }
-+            /* connect to best-effort service */
-+        connect.ServiceID = WMI_DATA_BE_SVC;
-+
-+        status = ar6000_connectservice(ar,
-+                                       &connect,
-+                                       WMI_BEST_EFFORT_PRI,
-+                                       "WMI DATA BE");
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+            /* connect to back-ground
-+             * map this to WMI LOW_PRI */
-+        connect.ServiceID = WMI_DATA_BK_SVC;
-+        status = ar6000_connectservice(ar,
-+                                       &connect,
-+                                       WMI_LOW_PRI,
-+                                       "WMI DATA BK");
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+            /* connect to Video service, map this to
-+             * to HI PRI */
-+        connect.ServiceID = WMI_DATA_VI_SVC;
-+        status = ar6000_connectservice(ar,
-+                                       &connect,
-+                                       WMI_HIGH_PRI,
-+                                       "WMI DATA VI");
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+            /* connect to VO service, this is currently not
-+             * mapped to a WMI priority stream due to historical reasons.
-+             * WMI originally defined 3 priorities over 3 mailboxes
-+             * We can change this when WMI is reworked so that priorities are not
-+             * dependent on mailboxes */
-+        connect.ServiceID = WMI_DATA_VO_SVC;
-+        status = ar6000_connectservice(ar,
-+                                       &connect,
-+                                       WMI_HIGHEST_PRI,
-+                                       "WMI DATA VO");
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+        A_ASSERT(arWMIStream2EndpointID(ar,WMI_CONTROL_PRI) != 0);
-+        A_ASSERT(arWMIStream2EndpointID(ar,WMI_BEST_EFFORT_PRI) != 0);
-+        A_ASSERT(arWMIStream2EndpointID(ar,WMI_LOW_PRI) != 0);
-+        A_ASSERT(arWMIStream2EndpointID(ar,WMI_HIGH_PRI) != 0);
-+        A_ASSERT(arWMIStream2EndpointID(ar,WMI_HIGHEST_PRI) != 0);
-+    } while (FALSE);
-+
-+    if (A_FAILED(status)) {
-+        return (-EIO);
-+    }
-+
-+    /*
-+     * give our connected endpoints some buffers
-+     */
-+    ar6000_rx_refill(ar, arWMIStream2EndpointID(ar,WMI_CONTROL_PRI));
-+
-+    ar6000_rx_refill(ar, arWMIStream2EndpointID(ar,WMI_BEST_EFFORT_PRI));
-+
-+    /*
-+     * We will post the receive buffers only for SPE testing and so we are
-+     * making it conditional on the 'bypasswmi' flag.
-+     */
-+    if (bypasswmi) {
-+        ar6000_rx_refill(ar,arWMIStream2EndpointID(ar,WMI_LOW_PRI));
-+        ar6000_rx_refill(ar,arWMIStream2EndpointID(ar,WMI_HIGH_PRI));
-+    }
-+
-+        /* setup credit distribution */
-+    ar6000_setup_credit_dist(ar->arHtcTarget, &ar->arCreditStateInfo);
-+
-+    /* Since cookies are used for HTC transports, they should be */
-+    /* initialized prior to enabling HTC.                        */
-+    ar6000_cookie_init(ar);
-+
-+    /* start HTC */
-+    status = HTCStart(ar->arHtcTarget);
-+
-+    if (status != A_OK) {
-+        if (ar->arWmiEnabled == TRUE) {
-+            wmi_shutdown(ar->arWmi);
-+            ar->arWmiEnabled = FALSE;
-+            ar->arWmi = NULL;
-+        }
-+        ar6000_cookie_cleanup(ar);
-+        return -EIO;
-+    }
-+
-+    if (!bypasswmi) {
-+        /* Wait for Wmi event to be ready */
-+        timeleft = wait_event_interruptible_timeout(arEvent,
-+            (ar->arWmiReady == TRUE), wmitimeout * HZ);
-+
-+        if(!timeleft || signal_pending(current))
-+        {
-+            AR_DEBUG_PRINTF("WMI is not ready or wait was interrupted\n");
-+#if defined(DWSIM) /* TBDXXX */
-+            AR_DEBUG_PRINTF(".....but proceed anyway.\n");
-+#else
-+            return -EIO;
-+#endif
-+        }
-+
-+        AR_DEBUG_PRINTF("%s() WMI is ready\n", __func__);
-+
-+        /* Communicate the wmi protocol verision to the target */
-+        if ((ar6000_set_host_app_area(ar)) != A_OK) {
-+            AR_DEBUG_PRINTF("Unable to set the host app area\n");
-+        }
-+    }
-+
-+    ar->arNumDataEndPts = 1;
-+
-+    return(0);
-+}
-+
-+
-+void
-+ar6000_bitrate_rx(void *devt, A_INT32 rateKbps)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
-+
-+    ar->arBitRate = rateKbps;
-+    wake_up(&arEvent);
-+}
-+
-+void
-+ar6000_ratemask_rx(void *devt, A_UINT16 ratemask)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
-+
-+    ar->arRateMask = ratemask;
-+    wake_up(&arEvent);
-+}
-+
-+void
-+ar6000_txPwr_rx(void *devt, A_UINT8 txPwr)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
-+
-+    ar->arTxPwr = txPwr;
-+    wake_up(&arEvent);
-+}
-+
-+
-+void
-+ar6000_channelList_rx(void *devt, A_INT8 numChan, A_UINT16 *chanList)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
-+
-+    A_MEMCPY(ar->arChannelList, chanList, numChan * sizeof (A_UINT16));
-+    ar->arNumChannels = numChan;
-+
-+    wake_up(&arEvent);
-+}
-+
-+A_UINT8
-+ar6000_ibss_map_epid(struct sk_buff *skb, struct net_device *dev, A_UINT32 * mapNo)
-+{
-+    AR_SOFTC_T      *ar = (AR_SOFTC_T *)dev->priv;
-+    A_UINT8         *datap;
-+    ATH_MAC_HDR     *macHdr;
-+    A_UINT32         i, eptMap;
-+
-+    (*mapNo) = 0;
-+    datap = A_NETBUF_DATA(skb);
-+    macHdr = (ATH_MAC_HDR *)(datap + sizeof(WMI_DATA_HDR));
-+    if (IEEE80211_IS_MULTICAST(macHdr->dstMac)) {
-+        return ENDPOINT_2;
-+    }
-+
-+    eptMap = -1;
-+    for (i = 0; i < ar->arNodeNum; i ++) {
-+        if (IEEE80211_ADDR_EQ(macHdr->dstMac, ar->arNodeMap[i].macAddress)) {
-+            (*mapNo) = i + 1;
-+            ar->arNodeMap[i].txPending ++;
-+            return ar->arNodeMap[i].epId;
-+        }
-+
-+        if ((eptMap == -1) && !ar->arNodeMap[i].txPending) {
-+            eptMap = i;
-+        }
-+    }
-+
-+    if (eptMap == -1) {
-+        eptMap = ar->arNodeNum;
-+        ar->arNodeNum ++;
-+        A_ASSERT(ar->arNodeNum <= MAX_NODE_NUM);
-+    }
-+
-+    A_MEMCPY(ar->arNodeMap[eptMap].macAddress, macHdr->dstMac, IEEE80211_ADDR_LEN);
-+
-+    for (i = ENDPOINT_2; i <= ENDPOINT_5; i ++) {
-+        if (!ar->arTxPending[i]) {
-+            ar->arNodeMap[eptMap].epId = i;
-+            break;
-+        }
-+        // No free endpoint is available, start redistribution on the inuse endpoints.
-+        if (i == ENDPOINT_5) {
-+            ar->arNodeMap[eptMap].epId = ar->arNexEpId;
-+            ar->arNexEpId ++;
-+            if (ar->arNexEpId > ENDPOINT_5) {
-+                ar->arNexEpId = ENDPOINT_2;
-+            }
-+        }
-+    }
-+
-+    (*mapNo) = eptMap + 1;
-+    ar->arNodeMap[eptMap].txPending ++;
-+
-+    return ar->arNodeMap[eptMap].epId;
-+}
-+
-+#ifdef DEBUG
-+static void ar6000_dump_skb(struct sk_buff *skb)
-+{
-+   u_char *ch;
-+   for (ch = A_NETBUF_DATA(skb);
-+        (A_UINT32)ch < ((A_UINT32)A_NETBUF_DATA(skb) +
-+        A_NETBUF_LEN(skb)); ch++)
-+    {
-+         AR_DEBUG_PRINTF("%2.2x ", *ch);
-+    }
-+    AR_DEBUG_PRINTF("\n");
-+}
-+#endif
-+
-+static int
-+ar6000_data_tx(struct sk_buff *skb, struct net_device *dev)
-+{
-+    AR_SOFTC_T        *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_PRI_STREAM_ID streamID = WMI_NOT_MAPPED;
-+    A_UINT32          mapNo = 0;
-+    int               len;
-+    struct ar_cookie *cookie;
-+    A_BOOL            checkAdHocPsMapping = FALSE;
-+
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,13)
-+    skb->list = NULL;
-+#endif
-+
-+    AR_DEBUG2_PRINTF("ar6000_data_tx start - skb=0x%x, data=0x%x, len=0x%x\n",
-+                     (A_UINT32)skb, (A_UINT32)A_NETBUF_DATA(skb),
-+                     A_NETBUF_LEN(skb));
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+     /* TCMD doesnt support any data, free the buf and return */
-+    if(ar->arTargetMode == AR6000_TCMD_MODE) {
-+        A_NETBUF_FREE(skb);
-+        return 0;
-+    }
-+#endif
-+    do {
-+
-+        if (ar->arWmiReady == FALSE && bypasswmi == 0) {
-+            break;
-+        }
-+
-+#ifdef BLOCK_TX_PATH_FLAG
-+        if (blocktx) {
-+            break;
-+        }
-+#endif /* BLOCK_TX_PATH_FLAG */
-+
-+        if (ar->arWmiEnabled) {
-+            if (A_NETBUF_HEADROOM(skb) < dev->hard_header_len) {
-+                struct sk_buff  *newbuf;
-+                /*
-+                 * We really should have gotten enough headroom but sometimes
-+                 * we still get packets with not enough headroom.  Copy the packet.
-+                 */
-+                len = A_NETBUF_LEN(skb);
-+                newbuf = A_NETBUF_ALLOC(len);
-+                if (newbuf == NULL) {
-+                    break;
-+                }
-+                A_NETBUF_PUT(newbuf, len);
-+                A_MEMCPY(A_NETBUF_DATA(newbuf), A_NETBUF_DATA(skb), len);
-+                A_NETBUF_FREE(skb);
-+                skb = newbuf;
-+                /* fall through and assemble header */
-+            }
-+
-+            if (wmi_dix_2_dot3(ar->arWmi, skb) != A_OK) {
-+                AR_DEBUG_PRINTF("ar6000_data_tx - wmi_dix_2_dot3 failed\n");
-+                break;
-+            }
-+
-+            if (wmi_data_hdr_add(ar->arWmi, skb, DATA_MSGTYPE) != A_OK) {
-+                AR_DEBUG_PRINTF("ar6000_data_tx - wmi_data_hdr_add failed\n");
-+                break;
-+            }
-+
-+            if ((ar->arNetworkType == ADHOC_NETWORK) &&
-+                ar->arIbssPsEnable && ar->arConnected) {
-+                    /* flag to check adhoc mapping once we take the lock below: */
-+                checkAdHocPsMapping = TRUE;
-+
-+            } else {
-+                    /* get the stream mapping */
-+                if (ar->arWmmEnabled) {
-+                    streamID = wmi_get_stream_id(ar->arWmi,
-+                                    wmi_implicit_create_pstream(ar->arWmi, skb, UPLINK_TRAFFIC, UNDEFINED_PRI));
-+                } else {
-+                    streamID = WMI_BEST_EFFORT_PRI;
-+                }
-+            }
-+
-+        } else {
-+            struct iphdr    *ipHdr;
-+            /*
-+             * the endpoint is directly based on the TOS field in the IP
-+             * header **** only for testing ******
-+             */
-+            ipHdr = A_NETBUF_DATA(skb) + sizeof(ATH_MAC_HDR);
-+                /* here we map the TOS field to an endpoint number, this is for
-+                 * the endpointping test application */
-+            streamID = IP_TOS_TO_WMI_PRI(ipHdr->tos);
-+        }
-+
-+    } while (FALSE);
-+
-+        /* did we succeed ? */
-+    if ((streamID == WMI_NOT_MAPPED) && !checkAdHocPsMapping) {
-+            /* cleanup and exit */
-+        A_NETBUF_FREE(skb);
-+        AR6000_STAT_INC(ar, tx_dropped);
-+        AR6000_STAT_INC(ar, tx_aborted_errors);
-+        return 0;
-+    }
-+
-+    cookie = NULL;
-+
-+        /* take the lock to protect driver data */
-+    AR6000_SPIN_LOCK(&ar->arLock, 0);
-+
-+    do {
-+
-+        if (checkAdHocPsMapping) {
-+            streamID = ar6000_ibss_map_epid(skb, dev, &mapNo);
-+        }
-+
-+        A_ASSERT(streamID != WMI_NOT_MAPPED);
-+
-+            /* validate that the endpoint is connected */
-+        if (arWMIStream2EndpointID(ar,streamID) == 0) {
-+            AR_DEBUG_PRINTF("Stream %d is NOT mapped!\n",streamID);
-+            break;
-+        }
-+            /* allocate resource for this packet */
-+        cookie = ar6000_alloc_cookie(ar);
-+
-+        if (cookie != NULL) {
-+                /* update counts while the lock is held */
-+            ar->arTxPending[streamID]++;
-+            ar->arTotalTxDataPending++;
-+        }
-+
-+    } while (FALSE);
-+
-+    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+
-+    if (cookie != NULL) {
-+        cookie->arc_bp[0] = (A_UINT32)skb;
-+        cookie->arc_bp[1] = mapNo;
-+        SET_HTC_PACKET_INFO_TX(&cookie->HtcPkt,
-+                               cookie,
-+                               A_NETBUF_DATA(skb),
-+                               A_NETBUF_LEN(skb),
-+                               arWMIStream2EndpointID(ar,streamID),
-+                               AR6K_DATA_PKT_TAG);
-+
-+#ifdef DEBUG
-+        if (debugdriver >= 3) {
-+            ar6000_dump_skb(skb);
-+        }
-+#endif
-+            /* HTC interface is asynchronous, if this fails, cleanup will happen in
-+             * the ar6000_tx_complete callback */
-+        HTCSendPkt(ar->arHtcTarget, &cookie->HtcPkt);
-+    } else {
-+            /* no packet to send, cleanup */
-+        A_NETBUF_FREE(skb);
-+        AR6000_STAT_INC(ar, tx_dropped);
-+        AR6000_STAT_INC(ar, tx_aborted_errors);
-+    }
-+
-+    return 0;
-+}
-+
-+#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+static void
-+tvsub(register struct timeval *out, register struct timeval *in)
-+{
-+    if((out->tv_usec -= in->tv_usec) < 0) {
-+        out->tv_sec--;
-+        out->tv_usec += 1000000;
-+    }
-+    out->tv_sec -= in->tv_sec;
-+}
-+
-+void
-+applyAPTCHeuristics(AR_SOFTC_T *ar)
-+{
-+    A_UINT32 duration;
-+    A_UINT32 numbytes;
-+    A_UINT32 throughput;
-+    struct timeval ts;
-+    A_STATUS status;
-+
-+    AR6000_SPIN_LOCK(&ar->arLock, 0);
-+
-+    if ((enableAPTCHeuristics) && (!aptcTR.timerScheduled)) {
-+        do_gettimeofday(&ts);
-+        tvsub(&ts, &aptcTR.samplingTS);
-+        duration = ts.tv_sec * 1000 + ts.tv_usec / 1000; /* ms */
-+        numbytes = aptcTR.bytesTransmitted + aptcTR.bytesReceived;
-+
-+        if (duration > APTC_TRAFFIC_SAMPLING_INTERVAL) {
-+            /* Initialize the time stamp and byte count */
-+            aptcTR.bytesTransmitted = aptcTR.bytesReceived = 0;
-+            do_gettimeofday(&aptcTR.samplingTS);
-+
-+            /* Calculate and decide based on throughput thresholds */
-+            throughput = ((numbytes * 8) / duration);
-+            if (throughput > APTC_UPPER_THROUGHPUT_THRESHOLD) {
-+                /* Disable Sleep and schedule a timer */
-+                A_ASSERT(ar->arWmiReady == TRUE);
-+                AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+                status = wmi_powermode_cmd(ar->arWmi, MAX_PERF_POWER);
-+                AR6000_SPIN_LOCK(&ar->arLock, 0);
-+                A_TIMEOUT_MS(&aptcTimer, APTC_TRAFFIC_SAMPLING_INTERVAL, 0);
-+                aptcTR.timerScheduled = TRUE;
-+            }
-+        }
-+    }
-+
-+    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+}
-+#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-+
-+static void ar6000_tx_queue_full(void *Context, HTC_ENDPOINT_ID Endpoint)
-+{
-+    AR_SOFTC_T     *ar = (AR_SOFTC_T *)Context;
-+
-+
-+    if (Endpoint == arWMIStream2EndpointID(ar,WMI_CONTROL_PRI)) {
-+        if (!bypasswmi) {
-+                /* under normal WMI if this is getting full, then something is running rampant
-+                 * the host should not be exhausting the WMI queue with too many commands
-+                 * the only exception to this is during testing using endpointping */
-+
-+            AR6000_SPIN_LOCK(&ar->arLock, 0);
-+                /* set flag to handle subsequent messages */
-+            ar->arWMIControlEpFull = TRUE;
-+            AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+            AR_DEBUG_PRINTF("WMI Control Endpoint is FULL!!! \n");
-+        }
-+    } else {
-+
-+        AR6000_SPIN_LOCK(&ar->arLock, 0);
-+        ar->arNetQueueStopped = TRUE;
-+        AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+        /* one of the data endpoints queues is getting full..need to stop network stack
-+         * the queue will resume in ar6000_tx_complete() */
-+        netif_stop_queue(ar->arNetDev);
-+    }
-+
-+
-+}
-+
-+
-+static void
-+ar6000_tx_complete(void *Context, HTC_PACKET *pPacket)
-+{
-+    AR_SOFTC_T     *ar = (AR_SOFTC_T *)Context;
-+    void           *cookie = (void *)pPacket->pPktContext;
-+    struct sk_buff *skb = NULL;
-+    A_UINT32        mapNo = 0;
-+    A_STATUS        status;
-+    struct ar_cookie * ar_cookie;
-+    WMI_PRI_STREAM_ID streamID;
-+    A_BOOL          wakeEvent = FALSE;
-+
-+    status = pPacket->Status;
-+    ar_cookie = (struct ar_cookie *)cookie;
-+    skb = (struct sk_buff *)ar_cookie->arc_bp[0];
-+    streamID = arEndpoint2WMIStreamID(ar,pPacket->Endpoint);
-+    mapNo = ar_cookie->arc_bp[1];
-+
-+    A_ASSERT(skb);
-+    A_ASSERT(pPacket->pBuffer == A_NETBUF_DATA(skb));
-+
-+    if (A_SUCCESS(status)) {
-+        A_ASSERT(pPacket->ActualLength == A_NETBUF_LEN(skb));
-+    }
-+
-+    AR_DEBUG2_PRINTF("ar6000_tx_complete skb=0x%x data=0x%x len=0x%x sid=%d ",
-+                     (A_UINT32)skb, (A_UINT32)pPacket->pBuffer,
-+                     pPacket->ActualLength,
-+                     streamID);
-+
-+        /* lock the driver as we update internal state */
-+    AR6000_SPIN_LOCK(&ar->arLock, 0);
-+
-+    ar->arTxPending[streamID]--;
-+
-+    if ((streamID != WMI_CONTROL_PRI) || bypasswmi) {
-+        ar->arTotalTxDataPending--;
-+    }
-+
-+    if (streamID == WMI_CONTROL_PRI)
-+    {
-+        if (ar->arWMIControlEpFull) {
-+                /* since this packet completed, the WMI EP is no longer full */
-+            ar->arWMIControlEpFull = FALSE;
-+        }
-+
-+        if (ar->arTxPending[streamID] == 0) {
-+            wakeEvent = TRUE;
-+        }
-+    }
-+
-+    if (A_FAILED(status)) {
-+        AR_DEBUG_PRINTF("%s() -TX ERROR, status: 0x%x\n", __func__,
-+                        status);
-+        AR6000_STAT_INC(ar, tx_errors);
-+    } else {
-+        AR_DEBUG2_PRINTF("OK\n");
-+        AR6000_STAT_INC(ar, tx_packets);
-+        ar->arNetStats.tx_bytes += A_NETBUF_LEN(skb);
-+#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+        aptcTR.bytesTransmitted += a_netbuf_to_len(skb);
-+        applyAPTCHeuristics(ar);
-+#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-+    }
-+
-+    // TODO this needs to be looked at
-+    if ((ar->arNetworkType == ADHOC_NETWORK) && ar->arIbssPsEnable
-+        && (streamID != WMI_CONTROL_PRI) && mapNo)
-+    {
-+        mapNo --;
-+        ar->arNodeMap[mapNo].txPending --;
-+
-+        if (!ar->arNodeMap[mapNo].txPending && (mapNo == (ar->arNodeNum - 1))) {
-+            A_UINT32 i;
-+            for (i = ar->arNodeNum; i > 0; i --) {
-+                if (!ar->arNodeMap[i - 1].txPending) {
-+                    A_MEMZERO(&ar->arNodeMap[i - 1], sizeof(struct ar_node_mapping));
-+                    ar->arNodeNum --;
-+                } else {
-+                    break;
-+                }
-+            }
-+        }
-+    }
-+
-+    /* Freeing a cookie should not be contingent on either of */
-+    /* these flags, just if we have a cookie or not.           */
-+    /* Can we even get here without a cookie? Fix later.       */
-+    if (ar->arWmiReady == TRUE || (bypasswmi))
-+    {
-+        ar6000_free_cookie(ar, cookie);
-+    }
-+
-+    if (ar->arNetQueueStopped) {
-+        ar->arNetQueueStopped = FALSE;
-+    }
-+
-+    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+
-+    /* lock is released, we can freely call other kernel APIs */
-+
-+        /* this indirectly frees the HTC_PACKET */
-+    A_NETBUF_FREE(skb);
-+
-+    if ((ar->arConnected == TRUE) || (bypasswmi)) {
-+        if (status != A_ECANCELED) {
-+                /* don't wake the queue if we are flushing, other wise it will just
-+                 * keep queueing packets, which will keep failing */
-+            netif_wake_queue(ar->arNetDev);
-+        }
-+    }
-+
-+    if (wakeEvent) {
-+        wake_up(&arEvent);
-+    }
-+
-+}
-+
-+/*
-+ * Receive event handler.  This is called by HTC when a packet is received
-+ */
-+int pktcount;
-+static void
-+ar6000_rx(void *Context, HTC_PACKET *pPacket)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)Context;
-+    struct sk_buff *skb = (struct sk_buff *)pPacket->pPktContext;
-+    int minHdrLen;
-+    A_STATUS        status = pPacket->Status;
-+    WMI_PRI_STREAM_ID streamID = arEndpoint2WMIStreamID(ar,pPacket->Endpoint);
-+    HTC_ENDPOINT_ID   ept = pPacket->Endpoint;
-+
-+    A_ASSERT((status != A_OK) || (pPacket->pBuffer == (A_NETBUF_DATA(skb) + HTC_HEADER_LEN)));
-+
-+    AR_DEBUG2_PRINTF("ar6000_rx ar=0x%x sid=%d, skb=0x%x, data=0x%x, len=0x%x ",
-+                    (A_UINT32)ar, streamID, (A_UINT32)skb, (A_UINT32)pPacket->pBuffer,
-+                    pPacket->ActualLength);
-+    if (status != A_OK) {
-+        AR_DEBUG2_PRINTF("ERR\n");
-+    } else {
-+        AR_DEBUG2_PRINTF("OK\n");
-+    }
-+
-+        /* take lock to protect buffer counts
-+         * and adaptive power throughput state */
-+    AR6000_SPIN_LOCK(&ar->arLock, 0);
-+
-+    ar->arRxBuffers[streamID]--;
-+
-+    if (A_SUCCESS(status)) {
-+        AR6000_STAT_INC(ar, rx_packets);
-+        ar->arNetStats.rx_bytes += pPacket->ActualLength;
-+#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+        aptcTR.bytesReceived += a_netbuf_to_len(skb);
-+        applyAPTCHeuristics(ar);
-+#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-+
-+        A_NETBUF_PUT(skb, pPacket->ActualLength +  HTC_HEADER_LEN);
-+        A_NETBUF_PULL(skb, HTC_HEADER_LEN);
-+
-+#ifdef DEBUG
-+        if (debugdriver >= 2) {
-+            ar6000_dump_skb(skb);
-+        }
-+#endif /* DEBUG */
-+    }
-+
-+    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+
-+    if (status != A_OK) {
-+        AR6000_STAT_INC(ar, rx_errors);
-+        A_NETBUF_FREE(skb);
-+    } else if (ar->arWmiEnabled == TRUE) {
-+        if (streamID == WMI_CONTROL_PRI) {
-+           /*
-+            * this is a wmi control msg
-+            */
-+            wmi_control_rx(ar->arWmi, skb);
-+        } else {
-+            WMI_DATA_HDR *dhdr = (WMI_DATA_HDR *)A_NETBUF_DATA(skb);
-+            if (WMI_DATA_HDR_IS_MSG_TYPE(dhdr, CNTL_MSGTYPE)) {
-+                /*
-+                 * this is a wmi control msg
-+                 */
-+                /* strip off WMI hdr */
-+                wmi_data_hdr_remove(ar->arWmi, skb);
-+                wmi_control_rx(ar->arWmi, skb);
-+            } else {
-+                /*
-+                 * this is a wmi data packet
-+                 */
-+                minHdrLen = sizeof (WMI_DATA_HDR) + sizeof(ATH_MAC_HDR) +
-+                            sizeof(ATH_LLC_SNAP_HDR);
-+
-+                if ((pPacket->ActualLength < minHdrLen) ||
-+                    (pPacket->ActualLength > AR6000_BUFFER_SIZE))
-+                {
-+                    /*
-+                     * packet is too short or too long
-+                     */
-+                    AR_DEBUG_PRINTF("TOO SHORT or TOO LONG\n");
-+                    AR6000_STAT_INC(ar, rx_errors);
-+                    AR6000_STAT_INC(ar, rx_length_errors);
-+                    A_NETBUF_FREE(skb);
-+                } else {
-+                    if (ar->arWmmEnabled) {
-+                        wmi_implicit_create_pstream(ar->arWmi, skb,
-+                            DNLINK_TRAFFIC, UNDEFINED_PRI);
-+                    }
-+#if 0
-+                    /* Access RSSI values here */
-+                    AR_DEBUG_PRINTF("RSSI %d\n",
-+                        ((WMI_DATA_HDR *) A_NETBUF_DATA(skb))->rssi);
-+#endif
-+                    wmi_data_hdr_remove(ar->arWmi, skb);
-+                    wmi_dot3_2_dix(ar->arWmi, skb);
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+                    /*
-+                     * extra push and memcpy, for eth_type_trans() of 2.4 kernel
-+                     * will pull out hard_header_len bytes of the skb.
-+                     */
-+                    A_NETBUF_PUSH(skb, sizeof(WMI_DATA_HDR) + sizeof(ATH_LLC_SNAP_HDR) + HTC_HEADER_LEN);
-+                    A_MEMCPY(A_NETBUF_DATA(skb), A_NETBUF_DATA(skb) + sizeof(WMI_DATA_HDR) +
-+                             sizeof(ATH_LLC_SNAP_HDR) + HTC_HEADER_LEN, sizeof(ATH_MAC_HDR));
-+#endif
-+                    if ((ar->arNetDev->flags & IFF_UP) == IFF_UP)
-+                    {
-+                        skb->dev = ar->arNetDev;
-+                        skb->protocol = eth_type_trans(skb, ar->arNetDev);
-+                        netif_rx(skb);
-+                    }
-+                    else
-+                    {
-+                        A_NETBUF_FREE(skb);
-+                    }
-+                }
-+            }
-+        }
-+    } else {
-+        if ((ar->arNetDev->flags & IFF_UP) == IFF_UP)
-+        {
-+            skb->dev = ar->arNetDev;
-+            skb->protocol = eth_type_trans(skb, ar->arNetDev);
-+            netif_rx(skb);
-+        }
-+        else
-+        {
-+            A_NETBUF_FREE(skb);
-+        }
-+    }
-+
-+    if (status != A_ECANCELED) {
-+        /*
-+         * HTC provides A_ECANCELED status when it doesn't want to be refilled
-+         * (probably due to a shutdown)
-+         */
-+        ar6000_rx_refill(Context, ept);
-+    }
-+
-+
-+}
-+
-+static void
-+ar6000_rx_refill(void *Context, HTC_ENDPOINT_ID Endpoint)
-+{
-+    AR_SOFTC_T  *ar = (AR_SOFTC_T *)Context;
-+    void        *osBuf;
-+    int         RxBuffers;
-+    int         buffersToRefill;
-+    HTC_PACKET  *pPacket;
-+    WMI_PRI_STREAM_ID streamId = arEndpoint2WMIStreamID(ar,Endpoint);
-+
-+    buffersToRefill = (int)AR6000_MAX_RX_BUFFERS -
-+                                    (int)ar->arRxBuffers[streamId];
-+
-+    if (buffersToRefill <= 0) {
-+            /* fast return, nothing to fill */
-+        return;
-+    }
-+
-+    AR_DEBUG2_PRINTF("ar6000_rx_refill: providing htc with %d buffers at eid=%d\n",
-+                    buffersToRefill, Endpoint);
-+
-+    for (RxBuffers = 0; RxBuffers < buffersToRefill; RxBuffers++) {
-+        osBuf = A_NETBUF_ALLOC(AR6000_BUFFER_SIZE);
-+        if (NULL == osBuf) {
-+            break;
-+        }
-+            /* the HTC packet wrapper is at the head of the reserved area
-+             * in the skb */
-+        pPacket = (HTC_PACKET *)(A_NETBUF_HEAD(osBuf));
-+            /* set re-fill info */
-+        SET_HTC_PACKET_INFO_RX_REFILL(pPacket,osBuf,A_NETBUF_DATA(osBuf),AR6000_BUFFER_SIZE,Endpoint);
-+            /* add this packet */
-+        HTCAddReceivePkt(ar->arHtcTarget, pPacket);
-+    }
-+
-+        /* update count */
-+    AR6000_SPIN_LOCK(&ar->arLock, 0);
-+    ar->arRxBuffers[streamId] += RxBuffers;
-+    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+}
-+
-+static struct net_device_stats *
-+ar6000_get_stats(struct net_device *dev)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    return &ar->arNetStats;
-+}
-+
-+static struct iw_statistics *
-+ar6000_get_iwstats(struct net_device * dev)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    TARGET_STATS *pStats = &ar->arTargetStats;
-+    struct iw_statistics * pIwStats = &ar->arIwStats;
-+
-+    if ((ar->arWmiReady == FALSE)
-+    /*
-+     * The in_atomic function is used to determine if the scheduling is
-+     * allowed in the current context or not. This was introduced in 2.6
-+     * From what I have read on the differences between 2.4 and 2.6, the
-+     * 2.4 kernel did not support preemption and so this check might not
-+     * be required for 2.4 kernels.
-+     */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        || (in_atomic())
-+#endif
-+       )
-+    {
-+        pIwStats->status = 0;
-+        pIwStats->qual.qual = 0;
-+        pIwStats->qual.level =0;
-+        pIwStats->qual.noise = 0;
-+        pIwStats->discard.code =0;
-+        pIwStats->discard.retries=0;
-+        pIwStats->miss.beacon =0;
-+        return pIwStats;
-+    }
-+    if (down_interruptible(&ar->arSem)) {
-+        pIwStats->status = 0;
-+        return pIwStats;
-+    }
-+
-+
-+    ar->statsUpdatePending = TRUE;
-+
-+    if(wmi_get_stats_cmd(ar->arWmi) != A_OK) {
-+        up(&ar->arSem);
-+        pIwStats->status = 0;
-+        return pIwStats;
-+    }
-+
-+    wait_event_interruptible_timeout(arEvent, ar->statsUpdatePending == FALSE, wmitimeout * HZ);
-+
-+    if (signal_pending(current)) {
-+        AR_DEBUG_PRINTF("ar6000 : WMI get stats timeout \n");
-+        up(&ar->arSem);
-+        pIwStats->status = 0;
-+        return pIwStats;
-+    }
-+    pIwStats->status = 1 ;
-+    pIwStats->qual.qual = pStats->cs_aveBeacon_rssi;
-+    pIwStats->qual.level =pStats->cs_aveBeacon_rssi + 161;  /* noise is -95 dBm */
-+    pIwStats->qual.noise = pStats->noise_floor_calibation;
-+    pIwStats->discard.code = pStats->rx_decrypt_err;
-+    pIwStats->discard.retries = pStats->tx_retry_cnt;
-+    pIwStats->miss.beacon = pStats->cs_bmiss_cnt;
-+    up(&ar->arSem);
-+    return pIwStats;
-+}
-+
-+void
-+ar6000_ready_event(void *devt, A_UINT8 *datap, A_UINT8 phyCap)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
-+    struct net_device *dev = ar->arNetDev;
-+
-+    ar->arWmiReady = TRUE;
-+    wake_up(&arEvent);
-+    A_MEMCPY(dev->dev_addr, datap, AR6000_ETH_ADDR_LEN);
-+    AR_DEBUG_PRINTF("mac address = %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n",
-+        dev->dev_addr[0], dev->dev_addr[1],
-+        dev->dev_addr[2], dev->dev_addr[3],
-+        dev->dev_addr[4], dev->dev_addr[5]);
-+
-+    ar->arPhyCapability = phyCap;
-+}
-+
-+A_UINT8
-+ar6000_iptos_to_userPriority(A_UINT8 *pkt)
-+{
-+    struct iphdr *ipHdr = (struct iphdr *)pkt;
-+    A_UINT8 userPriority;
-+
-+    /*
-+     * IP Tos format :
-+     *      (Refer Pg 57 WMM-test-plan-v1.2)
-+     * IP-TOS - 8bits
-+     *          : DSCP(6-bits) ECN(2-bits)
-+     *          : DSCP - P2 P1 P0 X X X
-+     *              where (P2 P1 P0) form 802.1D
-+     */
-+    userPriority = ipHdr->tos >> 5;
-+    return (userPriority & 0x7);
-+}
-+
-+void
-+ar6000_connect_event(AR_SOFTC_T *ar, A_UINT16 channel, A_UINT8 *bssid,
-+                     A_UINT16 listenInterval, A_UINT16 beaconInterval,
-+                     NETWORK_TYPE networkType, A_UINT8 beaconIeLen,
-+                     A_UINT8 assocReqLen, A_UINT8 assocRespLen,
-+                     A_UINT8 *assocInfo)
-+{
-+    union iwreq_data wrqu;
-+    int i, beacon_ie_pos, assoc_resp_ie_pos, assoc_req_ie_pos;
-+    static const char *tag1 = "ASSOCINFO(ReqIEs=";
-+    static const char *tag2 = "ASSOCRESPIE=";
-+    static const char *beaconIetag = "BEACONIE=";
-+    char buf[WMI_CONTROL_MSG_MAX_LEN * 2 + sizeof(tag1)];
-+    char *pos;
-+    A_UINT8 key_op_ctrl;
-+
-+    A_MEMCPY(ar->arBssid, bssid, sizeof(ar->arBssid));
-+    ar->arBssChannel = channel;
-+
-+    A_PRINTF("AR6000 connected event on freq %d ", channel);
-+    A_PRINTF("with bssid %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x "
-+            " listenInterval=%d, beaconInterval = %d, beaconIeLen = %d assocReqLen=%d"
-+            " assocRespLen =%d\n",
-+             bssid[0], bssid[1], bssid[2],
-+             bssid[3], bssid[4], bssid[5],
-+             listenInterval, beaconInterval,
-+             beaconIeLen, assocReqLen, assocRespLen);
-+    if (networkType & ADHOC_NETWORK) {
-+        if (networkType & ADHOC_CREATOR) {
-+            A_PRINTF("Network: Adhoc (Creator)\n");
-+        } else {
-+            A_PRINTF("Network: Adhoc (Joiner)\n");
-+        }
-+    } else {
-+        A_PRINTF("Network: Infrastructure\n");
-+    }
-+
-+    if (beaconIeLen && (sizeof(buf) > (9 + beaconIeLen * 2))) {
-+        AR_DEBUG_PRINTF("\nBeaconIEs= ");
-+
-+        beacon_ie_pos = 0;
-+        A_MEMZERO(buf, sizeof(buf));
-+        sprintf(buf, "%s", beaconIetag);
-+        pos = buf + 9;
-+        for (i = beacon_ie_pos; i < beacon_ie_pos + beaconIeLen; i++) {
-+            AR_DEBUG_PRINTF("%2.2x ", assocInfo[i]);
-+            sprintf(pos, "%2.2x", assocInfo[i]);
-+            pos += 2;
-+        }
-+        AR_DEBUG_PRINTF("\n");
-+
-+        A_MEMZERO(&wrqu, sizeof(wrqu));
-+        wrqu.data.length = strlen(buf);
-+        wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);
-+    }
-+
-+    if (assocRespLen && (sizeof(buf) > (12 + (assocRespLen * 2))))
-+    {
-+        assoc_resp_ie_pos = beaconIeLen + assocReqLen +
-+                            sizeof(A_UINT16)  +  /* capinfo*/
-+                            sizeof(A_UINT16)  +  /* status Code */
-+                            sizeof(A_UINT16)  ;  /* associd */
-+        A_MEMZERO(buf, sizeof(buf));
-+        sprintf(buf, "%s", tag2);
-+        pos = buf + 12;
-+        AR_DEBUG_PRINTF("\nAssocRespIEs= ");
-+        /*
-+         * The Association Response Frame w.o. the WLAN header is delivered to
-+         * the host, so skip over to the IEs
-+         */
-+        for (i = assoc_resp_ie_pos; i < assoc_resp_ie_pos + assocRespLen - 6; i++)
-+        {
-+            AR_DEBUG_PRINTF("%2.2x ", assocInfo[i]);
-+            sprintf(pos, "%2.2x", assocInfo[i]);
-+            pos += 2;
-+        }
-+        AR_DEBUG_PRINTF("\n");
-+
-+        A_MEMZERO(&wrqu, sizeof(wrqu));
-+        wrqu.data.length = strlen(buf);
-+        wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);
-+    }
-+
-+    if (assocReqLen && (sizeof(buf) > (17 + (assocReqLen * 2)))) {
-+        /*
-+         * assoc Request includes capability and listen interval. Skip these.
-+         */
-+        assoc_req_ie_pos =  beaconIeLen +
-+                            sizeof(A_UINT16)  +  /* capinfo*/
-+                            sizeof(A_UINT16);    /* listen interval */
-+
-+        A_MEMZERO(buf, sizeof(buf));
-+        sprintf(buf, "%s", tag1);
-+        pos = buf + 17;
-+        AR_DEBUG_PRINTF("AssocReqIEs= ");
-+        for (i = assoc_req_ie_pos; i < assoc_req_ie_pos + assocReqLen - 4; i++) {
-+            AR_DEBUG_PRINTF("%2.2x ", assocInfo[i]);
-+            sprintf(pos, "%2.2x", assocInfo[i]);
-+            pos += 2;;
-+        }
-+        AR_DEBUG_PRINTF("\n");
-+
-+        A_MEMZERO(&wrqu, sizeof(wrqu));
-+        wrqu.data.length = strlen(buf);
-+        wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);
-+    }
-+
-+#ifdef USER_KEYS
-+    if (ar->user_savedkeys_stat == USER_SAVEDKEYS_STAT_RUN &&
-+        ar->user_saved_keys.keyOk == TRUE)
-+    {
-+
-+        key_op_ctrl = KEY_OP_VALID_MASK & ~KEY_OP_INIT_TSC;
-+        if (ar->user_key_ctrl & AR6000_USER_SETKEYS_RSC_UNCHANGED) {
-+            key_op_ctrl &= ~KEY_OP_INIT_RSC;
-+        } else {
-+            key_op_ctrl |= KEY_OP_INIT_RSC;
-+        }
-+        ar6000_reinstall_keys(ar, key_op_ctrl);
-+    }
-+#endif /* USER_KEYS */
-+
-+        /* flush data queues */
-+    ar6000_TxDataCleanup(ar);
-+
-+    netif_wake_queue(ar->arNetDev);
-+
-+    if ((OPEN_AUTH == ar->arDot11AuthMode) &&
-+        (NONE_AUTH == ar->arAuthMode)      &&
-+        (WEP_CRYPT == ar->arPairwiseCrypto))
-+    {
-+        if (!ar->arConnected) {
-+            ar6000_install_static_wep_keys(ar);
-+        }
-+    }
-+
-+    ar->arConnected  = TRUE;
-+    ar->arConnectPending = FALSE;
-+
-+    reconnect_flag = 0;
-+
-+    A_MEMZERO(&wrqu, sizeof(wrqu));
-+    A_MEMCPY(wrqu.addr.sa_data, bssid, IEEE80211_ADDR_LEN);
-+    wrqu.addr.sa_family = ARPHRD_ETHER;
-+    wireless_send_event(ar->arNetDev, SIOCGIWAP, &wrqu, NULL);
-+    if ((ar->arNetworkType == ADHOC_NETWORK) && ar->arIbssPsEnable) {
-+        A_MEMZERO(ar->arNodeMap, sizeof(ar->arNodeMap));
-+        ar->arNodeNum = 0;
-+        ar->arNexEpId = ENDPOINT_2;
-+    }
-+
-+}
-+
-+void ar6000_set_numdataendpts(AR_SOFTC_T *ar, A_UINT32 num)
-+{
-+    A_ASSERT(num <= (HTC_MAILBOX_NUM_MAX - 1));
-+    ar->arNumDataEndPts = num;
-+}
-+
-+void
-+ar6000_disconnect_event(AR_SOFTC_T *ar, A_UINT8 reason, A_UINT8 *bssid,
-+                        A_UINT8 assocRespLen, A_UINT8 *assocInfo, A_UINT16 protocolReasonStatus)
-+{
-+    A_UINT8 i;
-+
-+    A_PRINTF("AR6000 disconnected");
-+    if (bssid[0] || bssid[1] || bssid[2] || bssid[3] || bssid[4] || bssid[5]) {
-+        A_PRINTF(" from %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x ",
-+                 bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5]);
-+    }
-+
-+    AR_DEBUG_PRINTF("\nDisconnect Reason is %d", reason);
-+    AR_DEBUG_PRINTF("\nProtocol Reason/Status Code is %d", protocolReasonStatus);
-+    AR_DEBUG_PRINTF("\nAssocResp Frame = %s",
-+                    assocRespLen ? " " : "NULL");
-+    for (i = 0; i < assocRespLen; i++) {
-+        if (!(i % 0x10)) {
-+            AR_DEBUG_PRINTF("\n");
-+        }
-+        AR_DEBUG_PRINTF("%2.2x ", assocInfo[i]);
-+    }
-+    AR_DEBUG_PRINTF("\n");
-+    /*
-+     * If the event is due to disconnect cmd from the host, only they the target
-+     * would stop trying to connect. Under any other condition, target would
-+     * keep trying to connect.
-+     *
-+     */
-+    if( reason == DISCONNECT_CMD)
-+    {
-+        ar->arConnectPending = FALSE;
-+    } else {
-+        ar->arConnectPending = TRUE;
-+        if (((reason == ASSOC_FAILED) && (protocolReasonStatus == 0x11)) ||
-+            ((reason == ASSOC_FAILED) && (protocolReasonStatus == 0x0) && (reconnect_flag == 1))) {
-+            ar->arConnected = TRUE;
-+            return;
-+        }
-+    }
-+    ar->arConnected = FALSE;
-+
-+    if( (reason != CSERV_DISCONNECT) || (reconnect_flag != 1) ) {
-+        reconnect_flag = 0;
-+    }
-+
-+#ifdef USER_KEYS
-+    if (reason != CSERV_DISCONNECT)
-+    {
-+        ar->user_savedkeys_stat = USER_SAVEDKEYS_STAT_INIT;
-+        ar->user_key_ctrl      = 0;
-+    }
-+#endif /* USER_KEYS */
-+
-+    netif_stop_queue(ar->arNetDev);
-+    A_MEMZERO(ar->arBssid, sizeof(ar->arBssid));
-+    ar->arBssChannel = 0;
-+    ar->arBeaconInterval = 0;
-+
-+    ar6000_TxDataCleanup(ar);
-+}
-+
-+void
-+ar6000_regDomain_event(AR_SOFTC_T *ar, A_UINT32 regCode)
-+{
-+    A_PRINTF("AR6000 Reg Code = 0x%x\n", regCode);
-+    ar->arRegCode = regCode;
-+}
-+
-+void
-+ar6000_neighborReport_event(AR_SOFTC_T *ar, int numAps, WMI_NEIGHBOR_INFO *info)
-+{
-+    static const char *tag = "PRE-AUTH";
-+    char buf[128];
-+    union iwreq_data wrqu;
-+    int i;
-+
-+    AR_DEBUG_PRINTF("AR6000 Neighbor Report Event\n");
-+    for (i=0; i < numAps; info++, i++) {
-+        AR_DEBUG_PRINTF("bssid %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x ",
-+            info->bssid[0], info->bssid[1], info->bssid[2],
-+            info->bssid[3], info->bssid[4], info->bssid[5]);
-+        if (info->bssFlags & WMI_PREAUTH_CAPABLE_BSS) {
-+            AR_DEBUG_PRINTF("preauth-cap");
-+        }
-+        if (info->bssFlags & WMI_PMKID_VALID_BSS) {
-+            AR_DEBUG_PRINTF(" pmkid-valid\n");
-+            continue;           /* we skip bss if the pmkid is already valid */
-+        }
-+        AR_DEBUG_PRINTF("\n");
-+        snprintf(buf, sizeof(buf), "%s%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x",
-+                 tag,
-+                 info->bssid[0], info->bssid[1], info->bssid[2],
-+                 info->bssid[3], info->bssid[4], info->bssid[5],
-+                 i, info->bssFlags);
-+        A_MEMZERO(&wrqu, sizeof(wrqu));
-+        wrqu.data.length = strlen(buf);
-+        wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);
-+    }
-+}
-+
-+void
-+ar6000_tkip_micerr_event(AR_SOFTC_T *ar, A_UINT8 keyid, A_BOOL ismcast)
-+{
-+    static const char *tag = "MLME-MICHAELMICFAILURE.indication";
-+    char buf[128];
-+    union iwreq_data wrqu;
-+
-+    A_PRINTF("AR6000 TKIP MIC error received for keyid %d %scast\n",
-+             keyid, ismcast ? "multi": "uni");
-+    snprintf(buf, sizeof(buf), "%s(keyid=%d %scat)", tag, keyid,
-+             ismcast ? "multi" : "uni");
-+    memset(&wrqu, 0, sizeof(wrqu));
-+    wrqu.data.length = strlen(buf);
-+    wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);
-+}
-+
-+void
-+ar6000_scanComplete_event(AR_SOFTC_T *ar, A_STATUS status)
-+{
-+      AR_DEBUG_PRINTF("AR6000 scan complete: %d\n", status);
-+
-+      ar->scan_complete = 1;
-+      wake_up_interruptible(&ar6000_scan_queue);
-+}
-+
-+void
-+ar6000_targetStats_event(AR_SOFTC_T *ar,  WMI_TARGET_STATS *pTarget)
-+{
-+    TARGET_STATS *pStats = &ar->arTargetStats;
-+    A_UINT8 ac;
-+
-+    A_PRINTF("AR6000 updating target stats\n");
-+    pStats->tx_packets          += pTarget->txrxStats.tx_stats.tx_packets;
-+    pStats->tx_bytes            += pTarget->txrxStats.tx_stats.tx_bytes;
-+    pStats->tx_unicast_pkts     += pTarget->txrxStats.tx_stats.tx_unicast_pkts;
-+    pStats->tx_unicast_bytes    += pTarget->txrxStats.tx_stats.tx_unicast_bytes;
-+    pStats->tx_multicast_pkts   += pTarget->txrxStats.tx_stats.tx_multicast_pkts;
-+    pStats->tx_multicast_bytes  += pTarget->txrxStats.tx_stats.tx_multicast_bytes;
-+    pStats->tx_broadcast_pkts   += pTarget->txrxStats.tx_stats.tx_broadcast_pkts;
-+    pStats->tx_broadcast_bytes  += pTarget->txrxStats.tx_stats.tx_broadcast_bytes;
-+    pStats->tx_rts_success_cnt  += pTarget->txrxStats.tx_stats.tx_rts_success_cnt;
-+    for(ac = 0; ac < WMM_NUM_AC; ac++)
-+        pStats->tx_packet_per_ac[ac] += pTarget->txrxStats.tx_stats.tx_packet_per_ac[ac];
-+    pStats->tx_errors           += pTarget->txrxStats.tx_stats.tx_errors;
-+    pStats->tx_failed_cnt       += pTarget->txrxStats.tx_stats.tx_failed_cnt;
-+    pStats->tx_retry_cnt        += pTarget->txrxStats.tx_stats.tx_retry_cnt;
-+    pStats->tx_rts_fail_cnt     += pTarget->txrxStats.tx_stats.tx_rts_fail_cnt;
-+    pStats->tx_unicast_rate      = wmi_get_rate(pTarget->txrxStats.tx_stats.tx_unicast_rate);
-+
-+    pStats->rx_packets          += pTarget->txrxStats.rx_stats.rx_packets;
-+    pStats->rx_bytes            += pTarget->txrxStats.rx_stats.rx_bytes;
-+    pStats->rx_unicast_pkts     += pTarget->txrxStats.rx_stats.rx_unicast_pkts;
-+    pStats->rx_unicast_bytes    += pTarget->txrxStats.rx_stats.rx_unicast_bytes;
-+    pStats->rx_multicast_pkts   += pTarget->txrxStats.rx_stats.rx_multicast_pkts;
-+    pStats->rx_multicast_bytes  += pTarget->txrxStats.rx_stats.rx_multicast_bytes;
-+    pStats->rx_broadcast_pkts   += pTarget->txrxStats.rx_stats.rx_broadcast_pkts;
-+    pStats->rx_broadcast_bytes  += pTarget->txrxStats.rx_stats.rx_broadcast_bytes;
-+    pStats->rx_fragment_pkt     += pTarget->txrxStats.rx_stats.rx_fragment_pkt;
-+    pStats->rx_errors           += pTarget->txrxStats.rx_stats.rx_errors;
-+    pStats->rx_crcerr           += pTarget->txrxStats.rx_stats.rx_crcerr;
-+    pStats->rx_key_cache_miss   += pTarget->txrxStats.rx_stats.rx_key_cache_miss;
-+    pStats->rx_decrypt_err      += pTarget->txrxStats.rx_stats.rx_decrypt_err;
-+    pStats->rx_duplicate_frames += pTarget->txrxStats.rx_stats.rx_duplicate_frames;
-+    pStats->rx_unicast_rate      = wmi_get_rate(pTarget->txrxStats.rx_stats.rx_unicast_rate);
-+
-+
-+    pStats->tkip_local_mic_failure
-+                                += pTarget->txrxStats.tkipCcmpStats.tkip_local_mic_failure;
-+    pStats->tkip_counter_measures_invoked
-+                                += pTarget->txrxStats.tkipCcmpStats.tkip_counter_measures_invoked;
-+    pStats->tkip_replays        += pTarget->txrxStats.tkipCcmpStats.tkip_replays;
-+    pStats->tkip_format_errors  += pTarget->txrxStats.tkipCcmpStats.tkip_format_errors;
-+    pStats->ccmp_format_errors  += pTarget->txrxStats.tkipCcmpStats.ccmp_format_errors;
-+    pStats->ccmp_replays        += pTarget->txrxStats.tkipCcmpStats.ccmp_replays;
-+
-+
-+    pStats->power_save_failure_cnt += pTarget->pmStats.power_save_failure_cnt;
-+    pStats->noise_floor_calibation = pTarget->noise_floor_calibation;
-+
-+    pStats->cs_bmiss_cnt        += pTarget->cservStats.cs_bmiss_cnt;
-+    pStats->cs_lowRssi_cnt      += pTarget->cservStats.cs_lowRssi_cnt;
-+    pStats->cs_connect_cnt      += pTarget->cservStats.cs_connect_cnt;
-+    pStats->cs_disconnect_cnt   += pTarget->cservStats.cs_disconnect_cnt;
-+    pStats->cs_aveBeacon_snr    = pTarget->cservStats.cs_aveBeacon_snr;
-+    pStats->cs_aveBeacon_rssi   = pTarget->cservStats.cs_aveBeacon_rssi;
-+    pStats->cs_lastRoam_msec    = pTarget->cservStats.cs_lastRoam_msec;
-+    pStats->cs_snr              = pTarget->cservStats.cs_snr;
-+    pStats->cs_rssi             = pTarget->cservStats.cs_rssi;
-+
-+    pStats->lq_val              = pTarget->lqVal;
-+
-+    pStats->wow_num_pkts_dropped += pTarget->wowStats.wow_num_pkts_dropped;
-+    pStats->wow_num_host_pkt_wakeups += pTarget->wowStats.wow_num_host_pkt_wakeups;
-+    pStats->wow_num_host_event_wakeups += pTarget->wowStats.wow_num_host_event_wakeups;
-+    pStats->wow_num_events_discarded += pTarget->wowStats.wow_num_events_discarded;
-+
-+    ar->statsUpdatePending = FALSE;
-+    wake_up(&arEvent);
-+}
-+
-+void
-+ar6000_rssiThreshold_event(AR_SOFTC_T *ar,  WMI_RSSI_THRESHOLD_VAL newThreshold, A_INT16 rssi)
-+{
-+    USER_RSSI_THOLD userRssiThold;
-+
-+    userRssiThold.tag = rssi_map[newThreshold].tag;
-+    userRssiThold.rssi = rssi;
-+    AR_DEBUG2_PRINTF("rssi Threshold range = %d tag = %d  rssi = %d\n", newThreshold, userRssiThold.tag, rssi);
-+    ar6000_send_event_to_app(ar, WMI_RSSI_THRESHOLD_EVENTID,(A_UINT8 *)&userRssiThold, sizeof(USER_RSSI_THOLD));
-+}
-+
-+
-+void
-+ar6000_hbChallengeResp_event(AR_SOFTC_T *ar, A_UINT32 cookie, A_UINT32 source)
-+{
-+    if (source == APP_HB_CHALLENGE) {
-+        /* Report it to the app in case it wants a positive acknowledgement */
-+        ar6000_send_event_to_app(ar, WMIX_HB_CHALLENGE_RESP_EVENTID,
-+                                 (A_UINT8 *)&cookie, sizeof(cookie));
-+    } else {
-+        /* This would ignore the replys that come in after their due time */
-+        if (cookie == ar->arHBChallengeResp.seqNum) {
-+            ar->arHBChallengeResp.outstanding = FALSE;
-+        }
-+    }
-+}
-+
-+
-+void
-+ar6000_reportError_event(AR_SOFTC_T *ar, WMI_TARGET_ERROR_VAL errorVal)
-+{
-+    char    *errString[] = {
-+                [WMI_TARGET_PM_ERR_FAIL]    "WMI_TARGET_PM_ERR_FAIL",
-+                [WMI_TARGET_KEY_NOT_FOUND]  "WMI_TARGET_KEY_NOT_FOUND",
-+                [WMI_TARGET_DECRYPTION_ERR] "WMI_TARGET_DECRYPTION_ERR",
-+                [WMI_TARGET_BMISS]          "WMI_TARGET_BMISS",
-+                [WMI_PSDISABLE_NODE_JOIN]   "WMI_PSDISABLE_NODE_JOIN"
-+                };
-+
-+    A_PRINTF("AR6000 Error on Target. Error = 0x%x\n", errorVal);
-+
-+    /* One error is reported at a time, and errorval is a bitmask */
-+    if(errorVal & (errorVal - 1))
-+       return;
-+
-+    A_PRINTF("AR6000 Error type = ");
-+    switch(errorVal)
-+    {
-+        case WMI_TARGET_PM_ERR_FAIL:
-+        case WMI_TARGET_KEY_NOT_FOUND:
-+        case WMI_TARGET_DECRYPTION_ERR:
-+        case WMI_TARGET_BMISS:
-+        case WMI_PSDISABLE_NODE_JOIN:
-+            A_PRINTF("%s\n", errString[errorVal]);
-+            break;
-+        default:
-+            A_PRINTF("INVALID\n");
-+            break;
-+    }
-+
-+}
-+
-+
-+void
-+ar6000_cac_event(AR_SOFTC_T *ar, A_UINT8 ac, A_UINT8 cacIndication,
-+                 A_UINT8 statusCode, A_UINT8 *tspecSuggestion)
-+{
-+    WMM_TSPEC_IE    *tspecIe;
-+
-+    /*
-+     * This is the TSPEC IE suggestion from AP.
-+     * Suggestion provided by AP under some error
-+     * cases, could be helpful for the host app.
-+     * Check documentation.
-+     */
-+    tspecIe = (WMM_TSPEC_IE *)tspecSuggestion;
-+
-+    /*
-+     * What do we do, if we get TSPEC rejection? One thought
-+     * that comes to mind is implictly delete the pstream...
-+     */
-+    A_PRINTF("AR6000 CAC notification. "
-+                "AC = %d, cacIndication = 0x%x, statusCode = 0x%x\n",
-+                 ac, cacIndication, statusCode);
-+}
-+
-+#define AR6000_PRINT_BSSID(_pBss)  do {     \
-+        A_PRINTF("%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x ",\
-+                 (_pBss)[0],(_pBss)[1],(_pBss)[2],(_pBss)[3],\
-+                 (_pBss)[4],(_pBss)[5]);  \
-+} while(0)
-+
-+void
-+ar6000_roam_tbl_event(AR_SOFTC_T *ar, WMI_TARGET_ROAM_TBL *pTbl)
-+{
-+    A_UINT8 i;
-+
-+    A_PRINTF("ROAM TABLE NO OF ENTRIES is %d ROAM MODE is %d\n",
-+              pTbl->numEntries, pTbl->roamMode);
-+    for (i= 0; i < pTbl->numEntries; i++) {
-+        A_PRINTF("[%d]bssid %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x ", i,
-+            pTbl->bssRoamInfo[i].bssid[0], pTbl->bssRoamInfo[i].bssid[1],
-+            pTbl->bssRoamInfo[i].bssid[2],
-+            pTbl->bssRoamInfo[i].bssid[3],
-+            pTbl->bssRoamInfo[i].bssid[4],
-+            pTbl->bssRoamInfo[i].bssid[5]);
-+        A_PRINTF("RSSI %d RSSIDT %d LAST RSSI %d UTIL %d ROAM_UTIL %d"
-+                 " BIAS %d\n",
-+            pTbl->bssRoamInfo[i].rssi,
-+            pTbl->bssRoamInfo[i].rssidt,
-+            pTbl->bssRoamInfo[i].last_rssi,
-+            pTbl->bssRoamInfo[i].util,
-+            pTbl->bssRoamInfo[i].roam_util,
-+            pTbl->bssRoamInfo[i].bias);
-+    }
-+}
-+
-+void
-+ar6000_wow_list_event(struct ar6_softc *ar, A_UINT8 num_filters, WMI_GET_WOW_LIST_REPLY *wow_reply)
-+{
-+    A_UINT8 i,j;
-+
-+    /*Each event now contains exactly one filter, see bug 26613*/
-+    A_PRINTF("WOW pattern %d of %d patterns\n", wow_reply->this_filter_num,                 wow_reply->num_filters);
-+    A_PRINTF("wow mode = %s host mode = %s\n",
-+            (wow_reply->wow_mode == 0? "disabled":"enabled"),
-+            (wow_reply->host_mode == 1 ? "awake":"asleep"));
-+
-+
-+    /*If there are no patterns, the reply will only contain generic
-+      WoW information. Pattern information will exist only if there are
-+      patterns present. Bug 26716*/
-+
-+   /* If this event contains pattern information, display it*/
-+    if (wow_reply->this_filter_num) {
-+        i=0;
-+        A_PRINTF("id=%d size=%d offset=%d\n",
-+                    wow_reply->wow_filters[i].wow_filter_id,
-+                    wow_reply->wow_filters[i].wow_filter_size,
-+                    wow_reply->wow_filters[i].wow_filter_offset);
-+       A_PRINTF("wow pattern = ");
-+       for (j=0; j< wow_reply->wow_filters[i].wow_filter_size; j++) {
-+             A_PRINTF("%2.2x",wow_reply->wow_filters[i].wow_filter_pattern[j]);
-+        }
-+
-+        A_PRINTF("\nwow mask = ");
-+        for (j=0; j< wow_reply->wow_filters[i].wow_filter_size; j++) {
-+            A_PRINTF("%2.2x",wow_reply->wow_filters[i].wow_filter_mask[j]);
-+        }
-+        A_PRINTF("\n");
-+    }
-+}
-+
-+/*
-+ * Report the Roaming related data collected on the target
-+ */
-+void
-+ar6000_display_roam_time(WMI_TARGET_ROAM_TIME *p)
-+{
-+    A_PRINTF("Disconnect Data : BSSID: ");
-+    AR6000_PRINT_BSSID(p->disassoc_bssid);
-+    A_PRINTF(" RSSI %d DISASSOC Time %d NO_TXRX_TIME %d\n",
-+             p->disassoc_bss_rssi,p->disassoc_time,
-+             p->no_txrx_time);
-+    A_PRINTF("Connect Data: BSSID: ");
-+    AR6000_PRINT_BSSID(p->assoc_bssid);
-+    A_PRINTF(" RSSI %d ASSOC Time %d TXRX_TIME %d\n",
-+             p->assoc_bss_rssi,p->assoc_time,
-+             p->allow_txrx_time);
-+    A_PRINTF("Last Data Tx Time (b4 Disassoc) %d "\
-+             "First Data Tx Time (after Assoc) %d\n",
-+             p->last_data_txrx_time, p->first_data_txrx_time);
-+}
-+
-+void
-+ar6000_roam_data_event(AR_SOFTC_T *ar, WMI_TARGET_ROAM_DATA *p)
-+{
-+    switch (p->roamDataType) {
-+        case ROAM_DATA_TIME:
-+            ar6000_display_roam_time(&p->u.roamTime);
-+            break;
-+        default:
-+            break;
-+    }
-+}
-+
-+void
-+ar6000_bssInfo_event_rx(AR_SOFTC_T *ar, A_UINT8 *datap, int len)
-+{
-+    struct sk_buff *skb;
-+    WMI_BSS_INFO_HDR *bih = (WMI_BSS_INFO_HDR *)datap;
-+
-+
-+    if (!ar->arMgmtFilter) {
-+        return;
-+    }
-+    if (((ar->arMgmtFilter & IEEE80211_FILTER_TYPE_BEACON) &&
-+        (bih->frameType != BEACON_FTYPE))  ||
-+        ((ar->arMgmtFilter & IEEE80211_FILTER_TYPE_PROBE_RESP) &&
-+        (bih->frameType != PROBERESP_FTYPE)))
-+    {
-+        return;
-+    }
-+
-+    if ((skb = A_NETBUF_ALLOC_RAW(len)) != NULL) {
-+
-+        A_NETBUF_PUT(skb, len);
-+        A_MEMCPY(A_NETBUF_DATA(skb), datap, len);
-+        skb->dev = ar->arNetDev;
-+      printk("MAC RAW...\n");
-+//        skb->mac.raw = A_NETBUF_DATA(skb);
-+        skb->ip_summed = CHECKSUM_NONE;
-+        skb->pkt_type = PACKET_OTHERHOST;
-+        skb->protocol = __constant_htons(0x0019);
-+        netif_rx(skb);
-+    }
-+}
-+
-+A_UINT32 wmiSendCmdNum;
-+
-+A_STATUS
-+ar6000_control_tx(void *devt, void *osbuf, WMI_PRI_STREAM_ID streamID)
-+{
-+    AR_SOFTC_T       *ar = (AR_SOFTC_T *)devt;
-+    A_STATUS         status = A_OK;
-+    struct ar_cookie *cookie = NULL;
-+    int i;
-+
-+        /* take lock to protect ar6000_alloc_cookie() */
-+    AR6000_SPIN_LOCK(&ar->arLock, 0);
-+
-+    do {
-+
-+        AR_DEBUG2_PRINTF("ar_contrstatus = ol_tx: skb=0x%x, len=0x%x, sid=%d\n",
-+                         (A_UINT32)osbuf, A_NETBUF_LEN(osbuf), streamID);
-+
-+        if ((streamID == WMI_CONTROL_PRI) && (ar->arWMIControlEpFull)) {
-+                /* control endpoint is full, don't allocate resources, we
-+                 * are just going to drop this packet */
-+            cookie = NULL;
-+            AR_DEBUG_PRINTF(" WMI Control EP full, dropping packet : 0x%X, len:%d \n",
-+                    (A_UINT32)osbuf, A_NETBUF_LEN(osbuf));
-+        } else {
-+            cookie = ar6000_alloc_cookie(ar);
-+        }
-+
-+        if (cookie == NULL) {
-+            status = A_NO_MEMORY;
-+            break;
-+        }
-+
-+        if(logWmiRawMsgs) {
-+            A_PRINTF("WMI cmd send, msgNo %d :", wmiSendCmdNum);
-+            for(i = 0; i < a_netbuf_to_len(osbuf); i++)
-+                A_PRINTF("%x ", ((A_UINT8 *)a_netbuf_to_data(osbuf))[i]);
-+            A_PRINTF("\n");
-+        }
-+
-+        wmiSendCmdNum++;
-+
-+    } while (FALSE);
-+
-+    if (cookie != NULL) {
-+            /* got a structure to send it out on */
-+        ar->arTxPending[streamID]++;
-+
-+        if (streamID != WMI_CONTROL_PRI) {
-+            ar->arTotalTxDataPending++;
-+        }
-+    }
-+
-+    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+
-+    if (cookie != NULL) {
-+        cookie->arc_bp[0] = (A_UINT32)osbuf;
-+        cookie->arc_bp[1] = 0;
-+        SET_HTC_PACKET_INFO_TX(&cookie->HtcPkt,
-+                               cookie,
-+                               A_NETBUF_DATA(osbuf),
-+                               A_NETBUF_LEN(osbuf),
-+                               arWMIStream2EndpointID(ar,streamID),
-+                               AR6K_CONTROL_PKT_TAG);
-+            /* this interface is asynchronous, if there is an error, cleanup will happen in the
-+             * TX completion callback */
-+        HTCSendPkt(ar->arHtcTarget, &cookie->HtcPkt);
-+        status = A_OK;
-+    }
-+
-+    return status;
-+}
-+
-+/* indicate tx activity or inactivity on a WMI stream */
-+void ar6000_indicate_tx_activity(void *devt, A_UINT8 TrafficClass, A_BOOL Active)
-+{
-+    AR_SOFTC_T  *ar = (AR_SOFTC_T *)devt;
-+    WMI_PRI_STREAM_ID streamid;
-+
-+    if (ar->arWmiEnabled) {
-+        streamid = wmi_get_stream_id(ar->arWmi, TrafficClass);
-+    } else {
-+            /* for mbox ping testing, the traffic class is mapped directly as a stream ID,
-+             * see handling of AR6000_XIOCTL_TRAFFIC_ACTIVITY_CHANGE in ioctl.c */
-+        streamid = (WMI_PRI_STREAM_ID)TrafficClass;
-+    }
-+
-+        /* notify HTC, this may cause credit distribution changes */
-+
-+    HTCIndicateActivityChange(ar->arHtcTarget,
-+                              arWMIStream2EndpointID(ar,streamid),
-+                              Active);
-+
-+}
-+
-+module_init(ar6000_init_module);
-+module_exit(ar6000_cleanup_module);
-+
-+/* Init cookie queue */
-+static void
-+ar6000_cookie_init(AR_SOFTC_T *ar)
-+{
-+    A_UINT32    i;
-+
-+    ar->arCookieList = NULL;
-+    A_MEMZERO(s_ar_cookie_mem, sizeof(s_ar_cookie_mem));
-+
-+    for (i = 0; i < MAX_COOKIE_NUM; i++) {
-+        ar6000_free_cookie(ar, &s_ar_cookie_mem[i]);
-+    }
-+}
-+
-+/* cleanup cookie queue */
-+static void
-+ar6000_cookie_cleanup(AR_SOFTC_T *ar)
-+{
-+    /* It is gone .... */
-+    ar->arCookieList = NULL;
-+}
-+
-+/* Init cookie queue */
-+static void
-+ar6000_free_cookie(AR_SOFTC_T *ar, struct ar_cookie * cookie)
-+{
-+    /* Insert first */
-+    A_ASSERT(ar != NULL);
-+    A_ASSERT(cookie != NULL);
-+    cookie->arc_list_next = ar->arCookieList;
-+    ar->arCookieList = cookie;
-+}
-+
-+/* cleanup cookie queue */
-+static struct ar_cookie *
-+ar6000_alloc_cookie(AR_SOFTC_T  *ar)
-+{
-+    struct ar_cookie   *cookie;
-+
-+    cookie = ar->arCookieList;
-+    if(cookie != NULL)
-+    {
-+        ar->arCookieList = cookie->arc_list_next;
-+    }
-+
-+    return cookie;
-+}
-+
-+#ifdef SEND_EVENT_TO_APP
-+/*
-+ * This function is used to send event which come from taget to
-+ * the application. The buf which send to application is include
-+ * the event ID and event content.
-+ */
-+#define EVENT_ID_LEN   2
-+void ar6000_send_event_to_app(AR_SOFTC_T *ar, A_UINT16 eventId,
-+                              A_UINT8 *datap, int len)
-+{
-+
-+#if (WIRELESS_EXT >= 15)
-+
-+/* note: IWEVCUSTOM only exists in wireless extensions after version 15 */
-+
-+    char *buf;
-+    A_UINT16 size;
-+    union iwreq_data wrqu;
-+
-+    size = len + EVENT_ID_LEN;
-+
-+    if (size > IW_CUSTOM_MAX) {
-+        AR_DEBUG_PRINTF("WMI event ID : 0x%4.4X, len = %d too big for IWEVCUSTOM (max=%d) \n",
-+                eventId, size, IW_CUSTOM_MAX);
-+        return;
-+    }
-+
-+    buf = A_MALLOC_NOWAIT(size);
-+    A_MEMZERO(buf, size);
-+    A_MEMCPY(buf, &eventId, EVENT_ID_LEN);
-+    A_MEMCPY(buf+EVENT_ID_LEN, datap, len);
-+
-+    //AR_DEBUG_PRINTF("event ID = %d,len = %d\n",*(A_UINT16*)buf, size);
-+    A_MEMZERO(&wrqu, sizeof(wrqu));
-+    wrqu.data.length = size;
-+    wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);
-+
-+    A_FREE(buf);
-+#endif
-+
-+
-+}
-+#endif
-+
-+
-+void
-+ar6000_tx_retry_err_event(void *devt)
-+{
-+    AR_DEBUG2_PRINTF("Tx retries reach maximum!\n");
-+}
-+
-+void
-+ar6000_snrThresholdEvent_rx(void *devt, WMI_SNR_THRESHOLD_VAL newThreshold, A_UINT8 snr)
-+{
-+    AR_DEBUG2_PRINTF("snr threshold range %d, snr %d\n", newThreshold, snr);
-+}
-+
-+void
-+ar6000_lqThresholdEvent_rx(void *devt, WMI_LQ_THRESHOLD_VAL newThreshold, A_UINT8 lq)
-+{
-+    AR_DEBUG2_PRINTF("lq threshold range %d, lq %d\n", newThreshold, lq);
-+}
-+
-+
-+
-+A_UINT32
-+a_copy_to_user(void *to, const void *from, A_UINT32 n)
-+{
-+    return(copy_to_user(to, from, n));
-+}
-+
-+A_UINT32
-+a_copy_from_user(void *to, const void *from, A_UINT32 n)
-+{
-+    return(copy_from_user(to, from, n));
-+}
-+
-+
-+A_STATUS
-+ar6000_get_driver_cfg(struct net_device *dev,
-+                        A_UINT16 cfgParam,
-+                        void *result)
-+{
-+
-+    A_STATUS    ret = 0;
-+
-+    switch(cfgParam)
-+    {
-+        case AR6000_DRIVER_CFG_GET_WLANNODECACHING:
-+           *((A_UINT32 *)result) = wlanNodeCaching;
-+           break;
-+        case AR6000_DRIVER_CFG_LOG_RAW_WMI_MSGS:
-+           *((A_UINT32 *)result) = logWmiRawMsgs;
-+            break;
-+        default:
-+           ret = EINVAL;
-+           break;
-+    }
-+
-+    return ret;
-+}
-+
-+void
-+ar6000_keepalive_rx(void *devt, A_UINT8 configured)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
-+
-+    ar->arKeepaliveConfigured = configured;
-+    wake_up(&arEvent);
-+}
-+
-+void
-+ar6000_pmkid_list_event(void *devt, A_UINT8 numPMKID, WMI_PMKID *pmkidList)
-+{
-+    A_UINT8 i, j;
-+
-+    A_PRINTF("Number of Cached PMKIDs is %d\n", numPMKID);
-+
-+    for (i = 0; i < numPMKID; i++) {
-+        A_PRINTF("\nPMKID %d ", i);
-+            for (j = 0; j < WMI_PMKID_LEN; j++) {
-+                A_PRINTF("%2.2x", pmkidList->pmkid[j]);
-+            }
-+        pmkidList++;
-+    }
-+}
-+
-+#ifdef USER_KEYS
-+static A_STATUS
-+
-+ar6000_reinstall_keys(AR_SOFTC_T *ar, A_UINT8 key_op_ctrl)
-+{
-+    A_STATUS status = A_OK;
-+    struct ieee80211req_key *uik = &ar->user_saved_keys.ucast_ik;
-+    struct ieee80211req_key *bik = &ar->user_saved_keys.bcast_ik;
-+    CRYPTO_TYPE  keyType = ar->user_saved_keys.keyType;
-+
-+    if (IEEE80211_CIPHER_CCKM_KRK != uik->ik_type) {
-+        if (NONE_CRYPT == keyType) {
-+            goto _reinstall_keys_out;
-+        }
-+
-+        if (uik->ik_keylen) {
-+            status = wmi_addKey_cmd(ar->arWmi, uik->ik_keyix,
-+                    ar->user_saved_keys.keyType, PAIRWISE_USAGE,
-+                    uik->ik_keylen, (A_UINT8 *)&uik->ik_keyrsc,
-+                    uik->ik_keydata, key_op_ctrl, SYNC_BEFORE_WMIFLAG);
-+        }
-+
-+    } else {
-+        status = wmi_add_krk_cmd(ar->arWmi, uik->ik_keydata);
-+    }
-+
-+    if (IEEE80211_CIPHER_CCKM_KRK != bik->ik_type) {
-+        if (NONE_CRYPT == keyType) {
-+            goto _reinstall_keys_out;
-+        }
-+
-+        if (bik->ik_keylen) {
-+            status = wmi_addKey_cmd(ar->arWmi, bik->ik_keyix,
-+                    ar->user_saved_keys.keyType, GROUP_USAGE,
-+                    bik->ik_keylen, (A_UINT8 *)&bik->ik_keyrsc,
-+                    bik->ik_keydata, key_op_ctrl, NO_SYNC_WMIFLAG);
-+        }
-+    } else {
-+        status = wmi_add_krk_cmd(ar->arWmi, bik->ik_keydata);
-+    }
-+
-+_reinstall_keys_out:
-+    ar->user_savedkeys_stat = USER_SAVEDKEYS_STAT_INIT;
-+    ar->user_key_ctrl      = 0;
-+
-+    return status;
-+}
-+#endif /* USER_KEYS */
-+
-+
-+void
-+ar6000_dset_open_req(
-+    void *context,
-+    A_UINT32 id,
-+    A_UINT32 targHandle,
-+    A_UINT32 targReplyFn,
-+    A_UINT32 targReplyArg)
-+{
-+}
-+
-+void
-+ar6000_dset_close(
-+    void *context,
-+    A_UINT32 access_cookie)
-+{
-+    return;
-+}
-+
-+void
-+ar6000_dset_data_req(
-+   void *context,
-+   A_UINT32 accessCookie,
-+   A_UINT32 offset,
-+   A_UINT32 length,
-+   A_UINT32 targBuf,
-+   A_UINT32 targReplyFn,
-+   A_UINT32 targReplyArg)
-+{
-+}
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h
-new file mode 100644
-index 0000000..c7b6ec4
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h
-@@ -0,0 +1,360 @@
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef _AR6000_H_
-+#define _AR6000_H_
-+
-+#include <linux/version.h>
-+
-+
-+#include <linux/autoconf.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/spinlock.h>
-+#include <linux/skbuff.h>
-+#include <linux/if_ether.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <net/iw_handler.h>
-+#include <linux/if_arp.h>
-+#include <linux/ip.h>
-+#include <asm/semaphore.h>
-+#include <linux/wireless.h>
-+#include <linux/module.h>
-+#include <asm/io.h>
-+
-+#include <a_config.h>
-+#include <athdefs.h>
-+#include "a_types.h"
-+#include "a_osapi.h"
-+#include "htc_api.h"
-+#include "wmi.h"
-+#include "a_drv.h"
-+#include "bmi.h"
-+#include <ieee80211.h>
-+#include <ieee80211_ioctl.h>
-+#include <wlan_api.h>
-+#include <wmi_api.h>
-+#include "gpio_api.h"
-+#include "gpio.h"
-+#include <host_version.h>
-+#include <linux/rtnetlink.h>
-+#include <linux/init.h>
-+#include <linux/moduleparam.h>
-+#include "AR6Khwreg.h"
-+#include "ar6000_api.h"
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+#include <testcmd.h>
-+#endif
-+
-+#include "targaddrs.h"
-+#include "dbglog_api.h"
-+#include "ar6000_diag.h"
-+#include "common_drv.h"
-+
-+#ifndef  __dev_put
-+#define  __dev_put(dev) dev_put(dev)
-+#endif
-+
-+#ifdef USER_KEYS
-+
-+#define USER_SAVEDKEYS_STAT_INIT     0
-+#define USER_SAVEDKEYS_STAT_RUN      1
-+
-+// TODO this needs to move into the AR_SOFTC struct
-+struct USER_SAVEDKEYS {
-+    struct ieee80211req_key   ucast_ik;
-+    struct ieee80211req_key   bcast_ik;
-+    CRYPTO_TYPE               keyType;
-+    A_BOOL                    keyOk;
-+};
-+#endif
-+
-+#define DBG_INFO              0x00000001
-+#define DBG_ERROR             0x00000002
-+#define DBG_WARNING           0x00000004
-+#define DBG_SDIO              0x00000008
-+#define DBG_HIF                       0x00000010
-+#define DBG_HTC                       0x00000020
-+#define DBG_WMI                       0x00000040
-+#define DBG_WMI2              0x00000080
-+#define DBG_DRIVER            0x00000100
-+
-+#define DBG_DEFAULTS  (DBG_ERROR|DBG_WARNING)
-+
-+
-+#ifdef DEBUG
-+#define AR_DEBUG_PRINTF(args...)        if (debugdriver) A_PRINTF(args);
-+#define AR_DEBUG2_PRINTF(args...)        if (debugdriver >= 2) A_PRINTF(args);
-+extern int debugdriver;
-+#else
-+#define AR_DEBUG_PRINTF(args...)
-+#define AR_DEBUG2_PRINTF(args...)
-+#endif
-+
-+A_STATUS ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
-+A_STATUS ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#define       MAX_AR6000                        1
-+#define AR6000_MAX_RX_BUFFERS             16
-+#define AR6000_BUFFER_SIZE                1664
-+#define AR6000_TX_TIMEOUT                 10
-+#define       AR6000_ETH_ADDR_LEN               6
-+#define       AR6000_MAX_ENDPOINTS              4
-+#define MAX_NODE_NUM                      15
-+#define MAX_COOKIE_NUM                    150
-+#define AR6000_HB_CHALLENGE_RESP_FREQ_DEFAULT        1
-+#define AR6000_HB_CHALLENGE_RESP_MISS_THRES_DEFAULT  1
-+
-+enum {
-+    DRV_HB_CHALLENGE = 0,
-+    APP_HB_CHALLENGE
-+};
-+
-+/* HTC RAW streams */
-+typedef enum _HTC_RAW_STREAM_ID {
-+    HTC_RAW_STREAM_NOT_MAPPED = -1,
-+    HTC_RAW_STREAM_0 = 0,
-+    HTC_RAW_STREAM_1 = 1,
-+    HTC_RAW_STREAM_2 = 2,
-+    HTC_RAW_STREAM_3 = 3,
-+    HTC_RAW_STREAM_NUM_MAX
-+} HTC_RAW_STREAM_ID;
-+
-+#define RAW_HTC_READ_BUFFERS_NUM    4
-+#define RAW_HTC_WRITE_BUFFERS_NUM   4
-+
-+typedef struct {
-+    int currPtr;
-+    int length;
-+    unsigned char data[AR6000_BUFFER_SIZE];
-+    HTC_PACKET    HTCPacket;
-+} raw_htc_buffer;
-+
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+/*
-+ *  add TCMD_MODE besides wmi and bypasswmi
-+ *  in TCMD_MODE, only few TCMD releated wmi commands
-+ *  counld be hanlder
-+ */
-+enum {
-+    AR6000_WMI_MODE = 0,
-+    AR6000_BYPASS_MODE,
-+    AR6000_TCMD_MODE,
-+    AR6000_WLAN_MODE
-+};
-+#endif /* CONFIG_HOST_TCMD_SUPPORT */
-+
-+struct ar_wep_key {
-+    A_UINT8                 arKeyIndex;
-+    A_UINT8                 arKeyLen;
-+    A_UINT8                 arKey[64];
-+} ;
-+
-+struct ar_node_mapping {
-+    A_UINT8                 macAddress[6];
-+    A_UINT8                 epId;
-+    A_UINT8                 txPending;
-+};
-+
-+struct ar_cookie {
-+    A_UINT32               arc_bp[2];    /* Must be first field */
-+    HTC_PACKET             HtcPkt;       /* HTC packet wrapper */
-+    struct ar_cookie *arc_list_next;
-+};
-+
-+struct ar_hb_chlng_resp {
-+    A_TIMER                 timer;
-+    A_UINT32                frequency;
-+    A_UINT32                seqNum;
-+    A_BOOL                  outstanding;
-+    A_UINT8                 missCnt;
-+    A_UINT8                 missThres;
-+};
-+
-+typedef struct ar6_softc {
-+    struct net_device       *arNetDev;    /* net_device pointer */
-+    void                    *arWmi;
-+    int                     arTxPending[WMI_PRI_MAX_COUNT];
-+    int                     arTotalTxDataPending;
-+    A_UINT8                 arNumDataEndPts;
-+    A_BOOL                  arWmiEnabled;
-+    A_BOOL                  arWmiReady;
-+    A_BOOL                  arConnected;
-+    HTC_HANDLE              arHtcTarget;
-+    void                    *arHifDevice;
-+    spinlock_t              arLock;
-+    struct semaphore        arSem;
-+    int                     arRxBuffers[WMI_PRI_MAX_COUNT];
-+    int                     arSsidLen;
-+    u_char                  arSsid[32];
-+    A_UINT8                 arNetworkType;
-+    A_UINT8                 arDot11AuthMode;
-+    A_UINT8                 arAuthMode;
-+    A_UINT8                 arPairwiseCrypto;
-+    A_UINT8                 arPairwiseCryptoLen;
-+    A_UINT8                 arGroupCrypto;
-+    A_UINT8                 arGroupCryptoLen;
-+    A_UINT8                 arDefTxKeyIndex;
-+    struct ar_wep_key       arWepKeyList[WMI_MAX_KEY_INDEX + 1];
-+    A_UINT8                 arBssid[6];
-+    A_UINT8                 arReqBssid[6];
-+    A_UINT16                arChannelHint;
-+    A_UINT16                arBssChannel;
-+    A_UINT16                arListenInterval;
-+    struct ar6000_version   arVersion;
-+    A_UINT32                arTargetType;
-+    A_INT8                  arRssi;
-+    A_UINT8                 arTxPwr;
-+    A_BOOL                  arTxPwrSet;
-+    A_INT32                 arBitRate;
-+    struct net_device_stats arNetStats;
-+    struct iw_statistics      arIwStats;
-+    A_INT8                  arNumChannels;
-+    A_UINT16                arChannelList[32];
-+    A_UINT32                arRegCode;
-+    A_BOOL                  statsUpdatePending;
-+    TARGET_STATS            arTargetStats;
-+    A_INT8                  arMaxRetries;
-+    A_UINT8                 arPhyCapability;
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+    A_UINT8                 tcmdRxReport;
-+    A_UINT32                tcmdRxTotalPkt;
-+    A_INT32                 tcmdRxRssi;
-+    A_UINT32                tcmdPm;
-+   A_UINT32                 arTargetMode;
-+#endif
-+    AR6000_WLAN_STATE       arWlanState;
-+    struct ar_node_mapping  arNodeMap[MAX_NODE_NUM];
-+    A_UINT8                 arIbssPsEnable;
-+    A_UINT8                 arNodeNum;
-+    A_UINT8                 arNexEpId;
-+    struct ar_cookie        *arCookieList;
-+    A_UINT16                arRateMask;
-+    A_UINT8                 arSkipScan;
-+    A_UINT16                arBeaconInterval;
-+    A_BOOL                  arConnectPending;
-+    A_BOOL                  arWmmEnabled;
-+    struct ar_hb_chlng_resp arHBChallengeResp;
-+    A_UINT8                 arKeepaliveConfigured;
-+    A_UINT32                arMgmtFilter;
-+    HTC_ENDPOINT_ID         arWmi2EpMapping[WMI_PRI_MAX_COUNT];
-+    WMI_PRI_STREAM_ID       arEp2WmiMapping[ENDPOINT_MAX];
-+#ifdef HTC_RAW_INTERFACE
-+    HTC_ENDPOINT_ID         arRaw2EpMapping[HTC_RAW_STREAM_NUM_MAX];
-+    HTC_RAW_STREAM_ID       arEp2RawMapping[ENDPOINT_MAX];
-+    struct semaphore        raw_htc_read_sem[HTC_RAW_STREAM_NUM_MAX];
-+    struct semaphore        raw_htc_write_sem[HTC_RAW_STREAM_NUM_MAX];
-+    wait_queue_head_t       raw_htc_read_queue[HTC_RAW_STREAM_NUM_MAX];
-+    wait_queue_head_t       raw_htc_write_queue[HTC_RAW_STREAM_NUM_MAX];
-+    raw_htc_buffer          raw_htc_read_buffer[HTC_RAW_STREAM_NUM_MAX][RAW_HTC_READ_BUFFERS_NUM];
-+    raw_htc_buffer          raw_htc_write_buffer[HTC_RAW_STREAM_NUM_MAX][RAW_HTC_WRITE_BUFFERS_NUM];
-+    A_BOOL                  write_buffer_available[HTC_RAW_STREAM_NUM_MAX];
-+    A_BOOL                  read_buffer_available[HTC_RAW_STREAM_NUM_MAX];
-+#endif
-+    A_BOOL                  arNetQueueStopped;
-+    A_BOOL                  arRawIfInit;
-+    int                     arDeviceIndex;
-+    COMMON_CREDIT_STATE_INFO arCreditStateInfo;
-+    A_BOOL                  arWMIControlEpFull;
-+    A_BOOL                  dbgLogFetchInProgress;
-+    A_UCHAR                 log_buffer[DBGLOG_HOST_LOG_BUFFER_SIZE];
-+    A_UINT32                log_cnt;
-+    A_UINT32                dbglog_init_done;
-+    A_UINT32                arConnectCtrlFlags;
-+      A_UINT32                scan_complete;
-+#ifdef USER_KEYS
-+    A_INT32                 user_savedkeys_stat;
-+    A_UINT32                user_key_ctrl;
-+    struct USER_SAVEDKEYS   user_saved_keys;
-+#endif
-+} AR_SOFTC_T;
-+
-+
-+#define arWMIStream2EndpointID(ar,wmi)          (ar)->arWmi2EpMapping[(wmi)]
-+#define arSetWMIStream2EndpointIDMap(ar,wmi,ep)  \
-+{  (ar)->arWmi2EpMapping[(wmi)] = (ep); \
-+   (ar)->arEp2WmiMapping[(ep)] = (wmi); }
-+#define arEndpoint2WMIStreamID(ar,ep)           (ar)->arEp2WmiMapping[(ep)]
-+
-+#define arRawIfEnabled(ar) (ar)->arRawIfInit
-+#define arRawStream2EndpointID(ar,raw)          (ar)->arRaw2EpMapping[(raw)]
-+#define arSetRawStream2EndpointIDMap(ar,raw,ep)  \
-+{  (ar)->arRaw2EpMapping[(raw)] = (ep); \
-+   (ar)->arEp2RawMapping[(ep)] = (raw); }
-+#define arEndpoint2RawStreamID(ar,ep)           (ar)->arEp2RawMapping[(ep)]
-+
-+struct ar_giwscan_param {
-+    char    *current_ev;
-+    char    *end_buf;
-+    A_BOOL  firstPass;
-+};
-+
-+#define AR6000_STAT_INC(ar, stat)       (ar->arNetStats.stat++)
-+
-+#define AR6000_SPIN_LOCK(lock, param)   do {                            \
-+    if (irqs_disabled()) {                                              \
-+        AR_DEBUG_PRINTF("IRQs disabled:AR6000_LOCK\n");                 \
-+    }                                                                   \
-+    spin_lock_bh(lock);                                                 \
-+} while (0)
-+
-+#define AR6000_SPIN_UNLOCK(lock, param) do {                            \
-+    if (irqs_disabled()) {                                              \
-+        AR_DEBUG_PRINTF("IRQs disabled: AR6000_UNLOCK\n");              \
-+    }                                                                   \
-+    spin_unlock_bh(lock);                                               \
-+} while (0)
-+
-+int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
-+int ar6000_ioctl_dispatcher(struct net_device *dev, struct ifreq *rq, int cmd);
-+void ar6000_ioctl_iwsetup(struct iw_handler_def *def);
-+void ar6000_gpio_init(void);
-+void ar6000_init_profile_info(AR_SOFTC_T *ar);
-+void ar6000_install_static_wep_keys(AR_SOFTC_T *ar);
-+int ar6000_init(struct net_device *dev);
-+int ar6000_dbglog_get_debug_logs(AR_SOFTC_T *ar);
-+A_STATUS ar6000_SetHTCBlockSize(AR_SOFTC_T *ar);
-+
-+#ifdef HTC_RAW_INTERFACE
-+
-+#ifndef __user
-+#define __user
-+#endif
-+
-+int ar6000_htc_raw_open(AR_SOFTC_T *ar);
-+int ar6000_htc_raw_close(AR_SOFTC_T *ar);
-+ssize_t ar6000_htc_raw_read(AR_SOFTC_T *ar,
-+                            HTC_RAW_STREAM_ID StreamID,
-+                            char __user *buffer, size_t count);
-+ssize_t ar6000_htc_raw_write(AR_SOFTC_T *ar,
-+                             HTC_RAW_STREAM_ID StreamID,
-+                             char __user *buffer, size_t count);
-+
-+#endif /* HTC_RAW_INTERFACE */
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _AR6000_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c
-new file mode 100644
-index 0000000..746cb2b
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c
-@@ -0,0 +1,439 @@
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "ar6000_drv.h"
-+
-+#ifdef HTC_RAW_INTERFACE
-+
-+static void
-+ar6000_htc_raw_read_cb(void *Context, HTC_PACKET *pPacket)
-+{
-+    AR_SOFTC_T        *ar = (AR_SOFTC_T *)Context;
-+    raw_htc_buffer    *busy;
-+    HTC_RAW_STREAM_ID streamID;
-+
-+    busy = (raw_htc_buffer *)pPacket->pPktContext;
-+    A_ASSERT(busy != NULL);
-+
-+    if (pPacket->Status == A_ECANCELED) {
-+        /*
-+         * HTC provides A_ECANCELED status when it doesn't want to be refilled
-+         * (probably due to a shutdown)
-+         */
-+        return;
-+    }
-+
-+    streamID = arEndpoint2RawStreamID(ar,pPacket->Endpoint);
-+    A_ASSERT(streamID != HTC_RAW_STREAM_NOT_MAPPED);
-+
-+#ifdef CF
-+   if (down_trylock(&ar->raw_htc_read_sem[streamID])) {
-+#else
-+    if (down_interruptible(&ar->raw_htc_read_sem[streamID])) {
-+#endif /* CF */
-+        AR_DEBUG2_PRINTF("Unable to down the semaphore\n");
-+    }
-+
-+    A_ASSERT((pPacket->Status != A_OK) ||
-+             (pPacket->pBuffer == (busy->data + HTC_HEADER_LEN)));
-+
-+    busy->length = pPacket->ActualLength + HTC_HEADER_LEN;
-+    busy->currPtr = HTC_HEADER_LEN;
-+    ar->read_buffer_available[streamID] = TRUE;
-+    //AR_DEBUG_PRINTF("raw read cb:  0x%X 0x%X \n", busy->currPtr,busy->length);
-+    up(&ar->raw_htc_read_sem[streamID]);
-+
-+    /* Signal the waiting process */
-+    AR_DEBUG2_PRINTF("Waking up the StreamID(%d) read process\n", streamID);
-+    wake_up_interruptible(&ar->raw_htc_read_queue[streamID]);
-+}
-+
-+static void
-+ar6000_htc_raw_write_cb(void *Context, HTC_PACKET *pPacket)
-+{
-+    AR_SOFTC_T          *ar = (AR_SOFTC_T  *)Context;
-+    raw_htc_buffer      *free;
-+    HTC_RAW_STREAM_ID   streamID;
-+
-+    free = (raw_htc_buffer *)pPacket->pPktContext;
-+    A_ASSERT(free != NULL);
-+
-+    if (pPacket->Status == A_ECANCELED) {
-+        /*
-+         * HTC provides A_ECANCELED status when it doesn't want to be refilled
-+         * (probably due to a shutdown)
-+         */
-+        return;
-+    }
-+
-+    streamID = arEndpoint2RawStreamID(ar,pPacket->Endpoint);
-+    A_ASSERT(streamID != HTC_RAW_STREAM_NOT_MAPPED);
-+
-+#ifdef CF
-+    if (down_trylock(&ar->raw_htc_write_sem[streamID])) {
-+#else
-+    if (down_interruptible(&ar->raw_htc_write_sem[streamID])) {
-+#endif
-+        AR_DEBUG2_PRINTF("Unable to down the semaphore\n");
-+    }
-+
-+    A_ASSERT(pPacket->pBuffer == (free->data + HTC_HEADER_LEN));
-+
-+    free->length = 0;
-+    ar->write_buffer_available[streamID] = TRUE;
-+    up(&ar->raw_htc_write_sem[streamID]);
-+
-+    /* Signal the waiting process */
-+    AR_DEBUG2_PRINTF("Waking up the StreamID(%d) write process\n", streamID);
-+    wake_up_interruptible(&ar->raw_htc_write_queue[streamID]);
-+}
-+
-+/* connect to a service */
-+static A_STATUS ar6000_connect_raw_service(AR_SOFTC_T        *ar,
-+                                           HTC_RAW_STREAM_ID StreamID)
-+{
-+    A_STATUS                 status;
-+    HTC_SERVICE_CONNECT_RESP response;
-+    A_UINT8                  streamNo;
-+    HTC_SERVICE_CONNECT_REQ  connect;
-+
-+    do {
-+
-+        A_MEMZERO(&connect,sizeof(connect));
-+            /* pass the stream ID as meta data to the RAW streams service */
-+        streamNo = (A_UINT8)StreamID;
-+        connect.pMetaData = &streamNo;
-+        connect.MetaDataLength = sizeof(A_UINT8);
-+            /* these fields are the same for all endpoints */
-+        connect.EpCallbacks.pContext = ar;
-+        connect.EpCallbacks.EpTxComplete = ar6000_htc_raw_write_cb;
-+        connect.EpCallbacks.EpRecv = ar6000_htc_raw_read_cb;
-+            /* simple interface, we don't need these optional callbacks */
-+        connect.EpCallbacks.EpRecvRefill = NULL;
-+        connect.EpCallbacks.EpSendFull = NULL;
-+        connect.MaxSendQueueDepth = RAW_HTC_WRITE_BUFFERS_NUM;
-+
-+            /* connect to the raw streams service, we may be able to get 1 or more
-+             * connections, depending on WHAT is running on the target */
-+        connect.ServiceID = HTC_RAW_STREAMS_SVC;
-+
-+        A_MEMZERO(&response,sizeof(response));
-+
-+            /* try to connect to the raw stream, it is okay if this fails with
-+             * status HTC_SERVICE_NO_MORE_EP */
-+        status = HTCConnectService(ar->arHtcTarget,
-+                                   &connect,
-+                                   &response);
-+
-+        if (A_FAILED(status)) {
-+            if (response.ConnectRespCode == HTC_SERVICE_NO_MORE_EP) {
-+                AR_DEBUG_PRINTF("HTC RAW , No more streams allowed \n");
-+                status = A_OK;
-+            }
-+            break;
-+        }
-+
-+            /* set endpoint mapping for the RAW HTC streams */
-+        arSetRawStream2EndpointIDMap(ar,StreamID,response.Endpoint);
-+
-+        AR_DEBUG_PRINTF("HTC RAW : stream ID: %d, endpoint: %d\n",
-+                        StreamID, arRawStream2EndpointID(ar,StreamID));
-+
-+    } while (FALSE);
-+
-+    return status;
-+}
-+
-+int ar6000_htc_raw_open(AR_SOFTC_T *ar)
-+{
-+    A_STATUS status;
-+    int streamID, endPt, count2;
-+    raw_htc_buffer *buffer;
-+    HTC_SERVICE_ID servicepriority;
-+
-+    A_ASSERT(ar->arHtcTarget != NULL);
-+
-+        /* wait for target */
-+    status = HTCWaitTarget(ar->arHtcTarget);
-+
-+    if (A_FAILED(status)) {
-+        AR_DEBUG_PRINTF("HTCWaitTarget failed (%d)\n", status);
-+        return -ENODEV;
-+    }
-+
-+    for (endPt = 0; endPt < ENDPOINT_MAX; endPt++) {
-+        ar->arEp2RawMapping[endPt] = HTC_RAW_STREAM_NOT_MAPPED;
-+    }
-+
-+    for (streamID = HTC_RAW_STREAM_0; streamID < HTC_RAW_STREAM_NUM_MAX; streamID++) {
-+        /* Initialize the data structures */
-+        init_MUTEX(&ar->raw_htc_read_sem[streamID]);
-+        init_MUTEX(&ar->raw_htc_write_sem[streamID]);
-+        init_waitqueue_head(&ar->raw_htc_read_queue[streamID]);
-+        init_waitqueue_head(&ar->raw_htc_write_queue[streamID]);
-+
-+            /* try to connect to the raw service */
-+        status = ar6000_connect_raw_service(ar,streamID);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+        if (arRawStream2EndpointID(ar,streamID) == 0) {
-+            break;
-+        }
-+
-+        for (count2 = 0; count2 < RAW_HTC_READ_BUFFERS_NUM; count2 ++) {
-+            /* Initialize the receive buffers */
-+            buffer = &ar->raw_htc_write_buffer[streamID][count2];
-+            memset(buffer, 0, sizeof(raw_htc_buffer));
-+            buffer = &ar->raw_htc_read_buffer[streamID][count2];
-+            memset(buffer, 0, sizeof(raw_htc_buffer));
-+
-+            SET_HTC_PACKET_INFO_RX_REFILL(&buffer->HTCPacket,
-+                                          buffer,
-+                                          buffer->data,
-+                                          AR6000_BUFFER_SIZE,
-+                                          arRawStream2EndpointID(ar,streamID));
-+
-+            /* Queue buffers to HTC for receive */
-+            if ((status = HTCAddReceivePkt(ar->arHtcTarget, &buffer->HTCPacket)) != A_OK)
-+            {
-+                BMIInit();
-+                return -EIO;
-+            }
-+        }
-+
-+        for (count2 = 0; count2 < RAW_HTC_WRITE_BUFFERS_NUM; count2 ++) {
-+            /* Initialize the receive buffers */
-+            buffer = &ar->raw_htc_write_buffer[streamID][count2];
-+            memset(buffer, 0, sizeof(raw_htc_buffer));
-+        }
-+
-+        ar->read_buffer_available[streamID] = FALSE;
-+        ar->write_buffer_available[streamID] = TRUE;
-+    }
-+
-+    if (A_FAILED(status)) {
-+        return -EIO;
-+    }
-+
-+    AR_DEBUG_PRINTF("HTC RAW, number of streams the target supports: %d \n", streamID);
-+
-+    servicepriority = HTC_RAW_STREAMS_SVC;  /* only 1 */
-+
-+        /* set callbacks and priority list */
-+    HTCSetCreditDistribution(ar->arHtcTarget,
-+                             ar,
-+                             NULL,  /* use default */
-+                             NULL,  /* use default */
-+                             &servicepriority,
-+                             1);
-+
-+    /* Start the HTC component */
-+    if ((status = HTCStart(ar->arHtcTarget)) != A_OK) {
-+        BMIInit();
-+        return -EIO;
-+    }
-+
-+    (ar)->arRawIfInit = TRUE;
-+
-+    return 0;
-+}
-+
-+int ar6000_htc_raw_close(AR_SOFTC_T *ar)
-+{
-+    A_PRINTF("ar6000_htc_raw_close called \n");
-+    HTCStop(ar->arHtcTarget);
-+
-+        /* reset the device */
-+    ar6000_reset_device(ar->arHifDevice, ar->arTargetType);
-+    /* Initialize the BMI component */
-+    BMIInit();
-+
-+    return 0;
-+}
-+
-+raw_htc_buffer *
-+get_filled_buffer(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID)
-+{
-+    int count;
-+    raw_htc_buffer *busy;
-+
-+    /* Check for data */
-+    for (count = 0; count < RAW_HTC_READ_BUFFERS_NUM; count ++) {
-+        busy = &ar->raw_htc_read_buffer[StreamID][count];
-+        if (busy->length) {
-+            break;
-+        }
-+    }
-+    if (busy->length) {
-+        ar->read_buffer_available[StreamID] = TRUE;
-+    } else {
-+        ar->read_buffer_available[StreamID] = FALSE;
-+    }
-+
-+    return busy;
-+}
-+
-+ssize_t ar6000_htc_raw_read(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID,
-+                            char __user *buffer, size_t length)
-+{
-+    int readPtr;
-+    raw_htc_buffer *busy;
-+
-+    if (arRawStream2EndpointID(ar,StreamID) == 0) {
-+        AR_DEBUG_PRINTF("StreamID(%d) not connected! \n", StreamID);
-+        return -EFAULT;
-+    }
-+
-+    if (down_interruptible(&ar->raw_htc_read_sem[StreamID])) {
-+        return -ERESTARTSYS;
-+    }
-+
-+    busy = get_filled_buffer(ar,StreamID);
-+    while (!ar->read_buffer_available[StreamID]) {
-+        up(&ar->raw_htc_read_sem[StreamID]);
-+
-+        /* Wait for the data */
-+        AR_DEBUG2_PRINTF("Sleeping StreamID(%d) read process\n", StreamID);
-+        if (wait_event_interruptible(ar->raw_htc_read_queue[StreamID],
-+                                     ar->read_buffer_available[StreamID]))
-+        {
-+            return -EINTR;
-+        }
-+        if (down_interruptible(&ar->raw_htc_read_sem[StreamID])) {
-+            return -ERESTARTSYS;
-+        }
-+        busy = get_filled_buffer(ar,StreamID);
-+    }
-+
-+    /* Read the data */
-+    readPtr = busy->currPtr;
-+    if (length > busy->length - HTC_HEADER_LEN) {
-+        length = busy->length - HTC_HEADER_LEN;
-+    }
-+    if (copy_to_user(buffer, &busy->data[readPtr], length)) {
-+        up(&ar->raw_htc_read_sem[StreamID]);
-+        return -EFAULT;
-+    }
-+
-+    busy->currPtr += length;
-+
-+    //AR_DEBUG_PRINTF("raw read ioctl:  currPTR : 0x%X 0x%X \n", busy->currPtr,busy->length);
-+
-+    if (busy->currPtr == busy->length)
-+    {
-+        busy->currPtr = 0;
-+        busy->length = 0;
-+        HTC_PACKET_RESET_RX(&busy->HTCPacket);
-+        //AR_DEBUG_PRINTF("raw read ioctl:  ep for packet:%d \n", busy->HTCPacket.Endpoint);
-+        HTCAddReceivePkt(ar->arHtcTarget, &busy->HTCPacket);
-+    }
-+    ar->read_buffer_available[StreamID] = FALSE;
-+    up(&ar->raw_htc_read_sem[StreamID]);
-+
-+    return length;
-+}
-+
-+static raw_htc_buffer *
-+get_free_buffer(AR_SOFTC_T *ar, HTC_ENDPOINT_ID StreamID)
-+{
-+    int count;
-+    raw_htc_buffer *free;
-+
-+    free = NULL;
-+    for (count = 0; count < RAW_HTC_WRITE_BUFFERS_NUM; count ++) {
-+        free = &ar->raw_htc_write_buffer[StreamID][count];
-+        if (free->length == 0) {
-+            break;
-+        }
-+    }
-+    if (!free->length) {
-+        ar->write_buffer_available[StreamID] = TRUE;
-+    } else {
-+        ar->write_buffer_available[StreamID] = FALSE;
-+    }
-+
-+    return free;
-+}
-+
-+ssize_t ar6000_htc_raw_write(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID,
-+                     char __user *buffer, size_t length)
-+{
-+    int writePtr;
-+    raw_htc_buffer *free;
-+
-+    if (arRawStream2EndpointID(ar,StreamID) == 0) {
-+        AR_DEBUG_PRINTF("StreamID(%d) not connected! \n", StreamID);
-+        return -EFAULT;
-+    }
-+
-+    if (down_interruptible(&ar->raw_htc_write_sem[StreamID])) {
-+        return -ERESTARTSYS;
-+    }
-+
-+    /* Search for a free buffer */
-+    free = get_free_buffer(ar,StreamID);
-+
-+    /* Check if there is space to write else wait */
-+    while (!ar->write_buffer_available[StreamID]) {
-+        up(&ar->raw_htc_write_sem[StreamID]);
-+
-+        /* Wait for buffer to become free */
-+        AR_DEBUG2_PRINTF("Sleeping StreamID(%d) write process\n", StreamID);
-+        if (wait_event_interruptible(ar->raw_htc_write_queue[StreamID],
-+                                     ar->write_buffer_available[StreamID]))
-+        {
-+            return -EINTR;
-+        }
-+        if (down_interruptible(&ar->raw_htc_write_sem[StreamID])) {
-+            return -ERESTARTSYS;
-+        }
-+        free = get_free_buffer(ar,StreamID);
-+    }
-+
-+    /* Send the data */
-+    writePtr = HTC_HEADER_LEN;
-+    if (length > (AR6000_BUFFER_SIZE - HTC_HEADER_LEN)) {
-+        length = AR6000_BUFFER_SIZE - HTC_HEADER_LEN;
-+    }
-+
-+    if (copy_from_user(&free->data[writePtr], buffer, length)) {
-+        up(&ar->raw_htc_read_sem[StreamID]);
-+        return -EFAULT;
-+    }
-+
-+    free->length = length;
-+
-+    SET_HTC_PACKET_INFO_TX(&free->HTCPacket,
-+                           free,
-+                           &free->data[writePtr],
-+                           length,
-+                           arRawStream2EndpointID(ar,StreamID),
-+                           AR6K_DATA_PKT_TAG);
-+
-+    HTCSendPkt(ar->arHtcTarget,&free->HTCPacket);
-+
-+    ar->write_buffer_available[StreamID] = FALSE;
-+    up(&ar->raw_htc_write_sem[StreamID]);
-+
-+    return length;
-+}
-+#endif /* HTC_RAW_INTERFACE */
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h b/drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h
-new file mode 100644
-index 0000000..b8e6e09
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h
-@@ -0,0 +1,128 @@
-+#ifndef _AR6XAPI_LINUX_H
-+#define _AR6XAPI_LINUX_H
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+struct ar6_softc;
-+
-+void ar6000_ready_event(void *devt, A_UINT8 *datap, A_UINT8 phyCap);
-+A_UINT8 ar6000_iptos_to_userPriority(A_UINT8 *pkt);
-+A_STATUS ar6000_control_tx(void *devt, void *osbuf, WMI_PRI_STREAM_ID streamID);
-+void ar6000_connect_event(struct ar6_softc *ar, A_UINT16 channel,
-+                          A_UINT8 *bssid, A_UINT16 listenInterval,
-+                          A_UINT16 beaconInterval, NETWORK_TYPE networkType,
-+                          A_UINT8 beaconIeLen, A_UINT8 assocReqLen,
-+                          A_UINT8 assocRespLen,A_UINT8 *assocInfo);
-+void ar6000_disconnect_event(struct ar6_softc *ar, A_UINT8 reason,
-+                             A_UINT8 *bssid, A_UINT8 assocRespLen,
-+                             A_UINT8 *assocInfo, A_UINT16 protocolReasonStatus);
-+void ar6000_tkip_micerr_event(struct ar6_softc *ar, A_UINT8 keyid,
-+                              A_BOOL ismcast);
-+void ar6000_bitrate_rx(void *devt, A_INT32 rateKbps);
-+void ar6000_channelList_rx(void *devt, A_INT8 numChan, A_UINT16 *chanList);
-+void ar6000_regDomain_event(struct ar6_softc *ar, A_UINT32 regCode);
-+void ar6000_txPwr_rx(void *devt, A_UINT8 txPwr);
-+void ar6000_keepalive_rx(void *devt, A_UINT8 configured);
-+void ar6000_neighborReport_event(struct ar6_softc *ar, int numAps,
-+                                 WMI_NEIGHBOR_INFO *info);
-+void ar6000_set_numdataendpts(struct ar6_softc *ar, A_UINT32 num);
-+void ar6000_scanComplete_event(struct ar6_softc *ar, A_STATUS status);
-+void ar6000_targetStats_event(struct ar6_softc *ar,  WMI_TARGET_STATS *pStats);
-+void ar6000_rssiThreshold_event(struct ar6_softc *ar,
-+                                WMI_RSSI_THRESHOLD_VAL newThreshold,
-+                                A_INT16 rssi);
-+void ar6000_reportError_event(struct ar6_softc *, WMI_TARGET_ERROR_VAL errorVal);
-+void ar6000_cac_event(struct ar6_softc *ar, A_UINT8 ac, A_UINT8 cac_indication,
-+                                A_UINT8 statusCode, A_UINT8 *tspecSuggestion);
-+void ar6000_hbChallengeResp_event(struct ar6_softc *, A_UINT32 cookie, A_UINT32 source);
-+void
-+ar6000_roam_tbl_event(struct ar6_softc *ar, WMI_TARGET_ROAM_TBL *pTbl);
-+
-+void
-+ar6000_roam_data_event(struct ar6_softc *ar, WMI_TARGET_ROAM_DATA *p);
-+
-+void
-+ar6000_wow_list_event(struct ar6_softc *ar, A_UINT8 num_filters,
-+                      WMI_GET_WOW_LIST_REPLY *wow_reply);
-+
-+void ar6000_pmkid_list_event(void *devt, A_UINT8 numPMKID,
-+                             WMI_PMKID *pmkidList);
-+
-+void ar6000_gpio_intr_rx(A_UINT32 intr_mask, A_UINT32 input_values);
-+void ar6000_gpio_data_rx(A_UINT32 reg_id, A_UINT32 value);
-+void ar6000_gpio_ack_rx(void);
-+
-+void ar6000_dbglog_init_done(struct ar6_softc *ar);
-+
-+#ifdef SEND_EVENT_TO_APP
-+void ar6000_send_event_to_app(struct ar6_softc *ar, A_UINT16 eventId, A_UINT8 *datap, int len);
-+#endif
-+
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+void ar6000_tcmd_rx_report_event(void *devt, A_UINT8 * results, int len);
-+#endif
-+
-+void ar6000_tx_retry_err_event(void *devt);
-+
-+void ar6000_snrThresholdEvent_rx(void *devt,
-+                                 WMI_SNR_THRESHOLD_VAL newThreshold,
-+                                 A_UINT8 snr);
-+
-+void ar6000_lqThresholdEvent_rx(void *devt, WMI_LQ_THRESHOLD_VAL range, A_UINT8 lqVal);
-+
-+
-+void ar6000_ratemask_rx(void *devt, A_UINT16 ratemask);
-+
-+A_STATUS ar6000_get_driver_cfg(struct net_device *dev,
-+                                A_UINT16 cfgParam,
-+                                void *result);
-+void ar6000_bssInfo_event_rx(struct ar6_softc *ar, A_UINT8 *data, int len);
-+
-+void ar6000_dbglog_event(struct ar6_softc *ar, A_UINT32 dropped,
-+                         A_INT8 *buffer, A_UINT32 length);
-+
-+int ar6000_dbglog_get_debug_logs(struct ar6_softc *ar);
-+
-+void ar6000_indicate_tx_activity(void *devt, A_UINT8 trafficClass, A_BOOL Active);
-+
-+void ar6000_dset_open_req(void *devt,
-+                          A_UINT32 id,
-+                          A_UINT32 targ_handle,
-+                          A_UINT32 targ_reply_fn,
-+                          A_UINT32 targ_reply_arg);
-+void ar6000_dset_close(void *devt, A_UINT32 access_cookie);
-+void ar6000_dset_data_req(void *devt,
-+                          A_UINT32 access_cookie,
-+                          A_UINT32 offset,
-+                          A_UINT32 length,
-+                          A_UINT32 targ_buf,
-+                          A_UINT32 targ_reply_fn,
-+                          A_UINT32 targ_reply_arg);
-+
-+
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h b/drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h
-new file mode 100644
-index 0000000..9c3e449
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h
-@@ -0,0 +1,993 @@
-+/*
-+ * Copyright (c) 2004-2006 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef _ATHDRV_LINUX_H
-+#define _ATHDRV_LINUX_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+
-+/*
-+ * There are two types of ioctl's here: Standard ioctls and
-+ * eXtended ioctls.  All extended ioctls (XIOCTL) are multiplexed
-+ * off of the single ioctl command, AR6000_IOCTL_EXTENDED.  The
-+ * arguments for every XIOCTL starts with a 32-bit command word
-+ * that is used to select which extended ioctl is in use.  After
-+ * the command word are command-specific arguments.
-+ */
-+
-+/* Linux standard Wireless Extensions, private ioctl interfaces */
-+#define IEEE80211_IOCTL_SETPARAM             (SIOCIWFIRSTPRIV+0)
-+#define IEEE80211_IOCTL_GETPARAM             (SIOCIWFIRSTPRIV+1)
-+#define IEEE80211_IOCTL_SETKEY               (SIOCIWFIRSTPRIV+2)
-+#define IEEE80211_IOCTL_SETWMMPARAMS         (SIOCIWFIRSTPRIV+3)
-+#define IEEE80211_IOCTL_DELKEY               (SIOCIWFIRSTPRIV+4)
-+#define IEEE80211_IOCTL_GETWMMPARAMS         (SIOCIWFIRSTPRIV+5)
-+#define IEEE80211_IOCTL_SETOPTIE             (SIOCIWFIRSTPRIV+6)
-+#define IEEE80211_IOCTL_SETMLME              (SIOCIWFIRSTPRIV+7)
-+//#define IEEE80211_IOCTL_GETOPTIE             (SIOCIWFIRSTPRIV+7)
-+#define IEEE80211_IOCTL_ADDPMKID             (SIOCIWFIRSTPRIV+8)
-+//#define IEEE80211_IOCTL_SETAUTHALG           (SIOCIWFIRSTPRIV+10)
-+#define IEEE80211_IOCTL_LASTONE              (SIOCIWFIRSTPRIV+9)
-+
-+
-+
-+/*                      ====WMI Ioctls====                                    */
-+/*
-+ *
-+ * Many ioctls simply provide WMI services to application code:
-+ * an application makes such an ioctl call with a set of arguments
-+ * that are packaged into the corresponding WMI message, and sent
-+ * to the Target.
-+ */
-+
-+#define AR6000_IOCTL_WMI_GETREV              (SIOCIWFIRSTPRIV+10)
-+/*
-+ * arguments:
-+ *   ar6000_version *revision
-+ */
-+
-+#define AR6000_IOCTL_WMI_SETPWR              (SIOCIWFIRSTPRIV+11)
-+/*
-+ * arguments:
-+ *   WMI_POWER_MODE_CMD pwrModeCmd (see include/wmi.h)
-+ * uses: WMI_SET_POWER_MODE_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SETSCAN             (SIOCIWFIRSTPRIV+12)
-+/*
-+ * arguments:
-+ *   WMI_SCAN_PARAMS_CMD scanParams (see include/wmi.h)
-+ * uses: WMI_SET_SCAN_PARAMS_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SETLISTENINT        (SIOCIWFIRSTPRIV+13)
-+/*
-+ * arguments:
-+ *   UINT32 listenInterval
-+ * uses: WMI_SET_LISTEN_INT_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SETBSSFILTER        (SIOCIWFIRSTPRIV+14)
-+/*
-+ * arguments:
-+ *   WMI_BSS_FILTER filter (see include/wmi.h)
-+ * uses: WMI_SET_BSS_FILTER_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SET_CHANNELPARAMS   (SIOCIWFIRSTPRIV+16)
-+/*
-+ * arguments:
-+ *   WMI_CHANNEL_PARAMS_CMD chParams
-+ * uses: WMI_SET_CHANNEL_PARAMS_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SET_PROBEDSSID      (SIOCIWFIRSTPRIV+17)
-+/*
-+ * arguments:
-+ *   WMI_PROBED_SSID_CMD probedSsids (see include/wmi.h)
-+ * uses: WMI_SETPROBED_SSID_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SET_PMPARAMS        (SIOCIWFIRSTPRIV+18)
-+/*
-+ * arguments:
-+ *   WMI_POWER_PARAMS_CMD powerParams (see include/wmi.h)
-+ * uses: WMI_SET_POWER_PARAMS_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SET_BADAP           (SIOCIWFIRSTPRIV+19)
-+/*
-+ * arguments:
-+ *   WMI_ADD_BAD_AP_CMD badAPs (see include/wmi.h)
-+ * uses: WMI_ADD_BAD_AP_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_GET_QOS_QUEUE       (SIOCIWFIRSTPRIV+20)
-+/*
-+ * arguments:
-+ *   ar6000_queuereq queueRequest (see below)
-+ */
-+
-+#define AR6000_IOCTL_WMI_CREATE_QOS          (SIOCIWFIRSTPRIV+21)
-+/*
-+ * arguments:
-+ *   WMI_CREATE_PSTREAM createPstreamCmd (see include/wmi.h)
-+ * uses: WMI_CREATE_PSTREAM_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_DELETE_QOS          (SIOCIWFIRSTPRIV+22)
-+/*
-+ * arguments:
-+ *   WMI_DELETE_PSTREAM_CMD deletePstreamCmd (see include/wmi.h)
-+ * uses: WMI_DELETE_PSTREAM_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SET_SNRTHRESHOLD   (SIOCIWFIRSTPRIV+23)
-+/*
-+ * arguments:
-+ *   WMI_SNR_THRESHOLD_PARAMS_CMD thresholdParams (see include/wmi.h)
-+ * uses: WMI_SNR_THRESHOLD_PARAMS_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SET_ERROR_REPORT_BITMASK (SIOCIWFIRSTPRIV+24)
-+/*
-+ * arguments:
-+ *   WMI_TARGET_ERROR_REPORT_BITMASK errorReportBitMask (see include/wmi.h)
-+ * uses: WMI_TARGET_ERROR_REPORT_BITMASK_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_GET_TARGET_STATS    (SIOCIWFIRSTPRIV+25)
-+/*
-+ * arguments:
-+ *   TARGET_STATS *targetStats (see below)
-+ * uses: WMI_GET_STATISTICS_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SET_ASSOC_INFO      (SIOCIWFIRSTPRIV+26)
-+/*
-+ * arguments:
-+ *   WMI_SET_ASSOC_INFO_CMD setAssocInfoCmd
-+ * uses: WMI_SET_ASSOC_INFO_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SET_ACCESS_PARAMS   (SIOCIWFIRSTPRIV+27)
-+/*
-+ * arguments:
-+ *   WMI_SET_ACCESS_PARAMS_CMD setAccessParams (see include/wmi.h)
-+ * uses: WMI_SET_ACCESS_PARAMS_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SET_BMISS_TIME      (SIOCIWFIRSTPRIV+28)
-+/*
-+ * arguments:
-+ *   UINT32 beaconMissTime
-+ * uses: WMI_SET_BMISS_TIME_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SET_DISC_TIMEOUT    (SIOCIWFIRSTPRIV+29)
-+/*
-+ * arguments:
-+ *   WMI_DISC_TIMEOUT_CMD disconnectTimeoutCmd (see include/wmi.h)
-+ * uses: WMI_SET_DISC_TIMEOUT_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SET_IBSS_PM_CAPS    (SIOCIWFIRSTPRIV+30)
-+/*
-+ * arguments:
-+ *   WMI_IBSS_PM_CAPS_CMD ibssPowerMgmtCapsCmd
-+ * uses: WMI_SET_IBSS_PM_CAPS_CMDID
-+ */
-+
-+/*
-+ * There is a very small space available for driver-private
-+ * wireless ioctls.  In order to circumvent this limitation,
-+ * we multiplex a bunch of ioctls (XIOCTLs) on top of a
-+ * single AR6000_IOCTL_EXTENDED ioctl.
-+ */
-+#define AR6000_IOCTL_EXTENDED                (SIOCIWFIRSTPRIV+31)
-+
-+
-+/*                         ====BMI Extended Ioctls====                        */
-+
-+#define AR6000_XIOCTL_BMI_DONE                                  1
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_BMI_DONE)
-+ * uses: BMI_DONE
-+ */
-+
-+#define AR6000_XIOCTL_BMI_READ_MEMORY                           2
-+/*
-+ * arguments:
-+ *   union {
-+ *     struct {
-+ *       UINT32 cmd (AR6000_XIOCTL_BMI_READ_MEMORY)
-+ *       UINT32 address
-+ *       UINT32 length
-+ *     }
-+ *     char results[length]
-+ *   }
-+ * uses: BMI_READ_MEMORY
-+ */
-+
-+#define AR6000_XIOCTL_BMI_WRITE_MEMORY                          3
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_BMI_WRITE_MEMORY)
-+ *   UINT32 address
-+ *   UINT32 length
-+ *   char data[length]
-+ * uses: BMI_WRITE_MEMORY
-+ */
-+
-+#define AR6000_XIOCTL_BMI_EXECUTE                               4
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_BMI_EXECUTE)
-+ *   UINT32 TargetAddress
-+ *   UINT32 parameter
-+ * uses: BMI_EXECUTE
-+ */
-+
-+#define AR6000_XIOCTL_BMI_SET_APP_START                         5
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_BMI_SET_APP_START)
-+ *   UINT32 TargetAddress
-+ * uses: BMI_SET_APP_START
-+ */
-+
-+#define AR6000_XIOCTL_BMI_READ_SOC_REGISTER                     6
-+/*
-+ * arguments:
-+ *   union {
-+ *     struct {
-+ *       UINT32 cmd (AR6000_XIOCTL_BMI_READ_SOC_REGISTER)
-+ *       UINT32 TargetAddress, 32-bit aligned
-+ *     }
-+ *     UINT32 result
-+ *   }
-+ * uses: BMI_READ_SOC_REGISTER
-+ */
-+
-+#define AR6000_XIOCTL_BMI_WRITE_SOC_REGISTER                    7
-+/*
-+ * arguments:
-+ *     struct {
-+ *       UINT32 cmd (AR6000_XIOCTL_BMI_WRITE_SOC_REGISTER)
-+ *       UINT32 TargetAddress, 32-bit aligned
-+ *       UINT32 newValue
-+ *     }
-+ * uses: BMI_WRITE_SOC_REGISTER
-+ */
-+
-+#define AR6000_XIOCTL_BMI_TEST                                  8
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_BMI_TEST)
-+ *   UINT32 address
-+ *   UINT32 length
-+ *   UINT32 count
-+ */
-+
-+
-+
-+/* Historical Host-side DataSet support */
-+#define AR6000_XIOCTL_UNUSED9                                   9
-+#define AR6000_XIOCTL_UNUSED10                                  10
-+#define AR6000_XIOCTL_UNUSED11                                  11
-+
-+/*                      ====Misc Extended Ioctls====                          */
-+
-+#define AR6000_XIOCTL_FORCE_TARGET_RESET                        12
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_FORCE_TARGET_RESET)
-+ */
-+
-+
-+#ifdef HTC_RAW_INTERFACE
-+/* HTC Raw Interface Ioctls */
-+#define AR6000_XIOCTL_HTC_RAW_OPEN                              13
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_HTC_RAW_OPEN)
-+ */
-+
-+#define AR6000_XIOCTL_HTC_RAW_CLOSE                             14
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_HTC_RAW_CLOSE)
-+ */
-+
-+#define AR6000_XIOCTL_HTC_RAW_READ                              15
-+/*
-+ * arguments:
-+ *   union {
-+ *     struct {
-+ *       UINT32 cmd (AR6000_XIOCTL_HTC_RAW_READ)
-+ *       UINT32 mailboxID
-+ *       UINT32 length
-+ *     }
-+ *     results[length]
-+ *   }
-+ */
-+
-+#define AR6000_XIOCTL_HTC_RAW_WRITE                             16
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_HTC_RAW_WRITE)
-+ *   UINT32 mailboxID
-+ *   UINT32 length
-+ *   char buffer[length]
-+ */
-+#endif /* HTC_RAW_INTERFACE */
-+
-+#define AR6000_XIOCTL_CHECK_TARGET_READY                        17
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_CHECK_TARGET_READY)
-+ */
-+
-+
-+
-+/*                ====GPIO (General Purpose I/O) Extended Ioctls====          */
-+
-+#define AR6000_XIOCTL_GPIO_OUTPUT_SET                           18
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_GPIO_OUTPUT_SET)
-+ *   ar6000_gpio_output_set_cmd_s (see below)
-+ * uses: WMIX_GPIO_OUTPUT_SET_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_GPIO_INPUT_GET                            19
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_GPIO_INPUT_GET)
-+ * uses: WMIX_GPIO_INPUT_GET_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_GPIO_REGISTER_SET                         20
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_GPIO_REGISTER_SET)
-+ *   ar6000_gpio_register_cmd_s (see below)
-+ * uses: WMIX_GPIO_REGISTER_SET_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_GPIO_REGISTER_GET                         21
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_GPIO_REGISTER_GET)
-+ *   ar6000_gpio_register_cmd_s (see below)
-+ * uses: WMIX_GPIO_REGISTER_GET_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_GPIO_INTR_ACK                             22
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_GPIO_INTR_ACK)
-+ *   ar6000_cpio_intr_ack_cmd_s (see below)
-+ * uses: WMIX_GPIO_INTR_ACK_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_GPIO_INTR_WAIT                            23
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_GPIO_INTR_WAIT)
-+ */
-+
-+
-+
-+/*                    ====more wireless commands====                          */
-+
-+#define AR6000_XIOCTL_SET_ADHOC_BSSID                           24
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_SET_ADHOC_BSSID)
-+ *   WMI_SET_ADHOC_BSSID_CMD setAdHocBssidCmd (see include/wmi.h)
-+ */
-+
-+#define AR6000_XIOCTL_SET_OPT_MODE                              25
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_SET_OPT_MODE)
-+ *   WMI_SET_OPT_MODE_CMD setOptModeCmd (see include/wmi.h)
-+ * uses: WMI_SET_OPT_MODE_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_OPT_SEND_FRAME                            26
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_OPT_SEND_FRAME)
-+ *   WMI_OPT_TX_FRAME_CMD optTxFrameCmd (see include/wmi.h)
-+ * uses: WMI_OPT_TX_FRAME_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_SET_ADHOC_BEACON_INTVAL                   27
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_SET_ADHOC_BEACON_INTVAL)
-+ *   WMI_BEACON_INT_CMD beaconIntCmd (see include/wmi.h)
-+ * uses: WMI_SET_BEACON_INT_CMDID
-+ */
-+
-+
-+#define IEEE80211_IOCTL_SETAUTHALG                              28
-+
-+
-+#define AR6000_XIOCTL_SET_VOICE_PKT_SIZE                        29
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_SET_VOICE_PKT_SIZE)
-+ *   WMI_SET_VOICE_PKT_SIZE_CMD setVoicePktSizeCmd (see include/wmi.h)
-+ * uses: WMI_SET_VOICE_PKT_SIZE_CMDID
-+ */
-+
-+
-+#define AR6000_XIOCTL_SET_MAX_SP                                30
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_SET_MAX_SP)
-+ *   WMI_SET_MAX_SP_LEN_CMD maxSPLen(see include/wmi.h)
-+ * uses: WMI_SET_MAX_SP_LEN_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_WMI_GET_ROAM_TBL                          31
-+
-+#define AR6000_XIOCTL_WMI_SET_ROAM_CTRL                         32
-+
-+#define AR6000_XIOCTRL_WMI_SET_POWERSAVE_TIMERS                 33
-+
-+
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTRL_WMI_SET_POWERSAVE_TIMERS)
-+ *   WMI_SET_POWERSAVE_TIMERS_CMD powerSaveTimers(see include/wmi.h)
-+ *   WMI_SET_POWERSAVE_TIMERS_CMDID
-+ */
-+
-+#define AR6000_XIOCTRL_WMI_GET_POWER_MODE                        34
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTRL_WMI_GET_POWER_MODE)
-+ */
-+
-+#define AR6000_XIOCTRL_WMI_SET_WLAN_STATE                       35
-+typedef enum {
-+    WLAN_DISABLED,
-+    WLAN_ENABLED
-+} AR6000_WLAN_STATE;
-+/*
-+ * arguments:
-+ * enable/disable
-+ */
-+
-+#define AR6000_XIOCTL_WMI_GET_ROAM_DATA                         36
-+
-+#define AR6000_XIOCTL_WMI_SETRETRYLIMITS                37
-+/*
-+ * arguments:
-+ *   WMI_SET_RETRY_LIMITS_CMD ibssSetRetryLimitsCmd
-+ * uses: WMI_SET_RETRY_LIMITS_CMDID
-+ */
-+
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+/*       ====extended commands for radio test ====                          */
-+
-+#define AR6000_XIOCTL_TCMD_CONT_TX                      38
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_TCMD_CONT_TX)
-+ *   WMI_TCMD_CONT_TX_CMD contTxCmd (see include/wmi.h)
-+ * uses: WMI_TCMD_CONT_TX_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_TCMD_CONT_RX                      39
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_TCMD_CONT_RX)
-+ *   WMI_TCMD_CONT_RX_CMD rxCmd (see include/wmi.h)
-+ * uses: WMI_TCMD_CONT_RX_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_TCMD_PM                           40
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_TCMD_PM)
-+ *   WMI_TCMD_PM_CMD pmCmd (see include/wmi.h)
-+ * uses: WMI_TCMD_PM_CMDID
-+ */
-+
-+#endif /* CONFIG_HOST_TCMD_SUPPORT */
-+
-+#define AR6000_XIOCTL_WMI_STARTSCAN                     41
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_WMI_STARTSCAN)
-+ *   UINT8  scanType
-+ *   UINT8  scanConnected
-+ *   A_BOOL forceFgScan
-+ * uses: WMI_START_SCAN_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_WMI_SETFIXRATES                   42
-+
-+#define AR6000_XIOCTL_WMI_GETFIXRATES                   43
-+
-+
-+#define AR6000_XIOCTL_WMI_SET_RSSITHRESHOLD             44
-+/*
-+ * arguments:
-+ *   WMI_RSSI_THRESHOLD_PARAMS_CMD thresholdParams (see include/wmi.h)
-+ * uses: WMI_RSSI_THRESHOLD_PARAMS_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_WMI_CLR_RSSISNR                   45
-+/*
-+ * arguments:
-+ *   WMI_CLR_RSSISNR_CMD thresholdParams (see include/wmi.h)
-+ * uses: WMI_CLR_RSSISNR_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_WMI_SET_LQTHRESHOLD               46
-+/*
-+ * arguments:
-+ *   WMI_LQ_THRESHOLD_PARAMS_CMD thresholdParams (see include/wmi.h)
-+ * uses: WMI_LQ_THRESHOLD_PARAMS_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_WMI_SET_RTS                        47
-+/*
-+ * arguments:
-+ *   WMI_SET_RTS_MODE_CMD (see include/wmi.h)
-+ * uses: WMI_SET_RTS_MODE_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_WMI_SET_LPREAMBLE                 48
-+
-+#define AR6000_XIOCTL_WMI_SET_AUTHMODE                  49
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_WMI_SET_AUTHMODE)
-+ *   UINT8  mode
-+ * uses: WMI_SET_RECONNECT_AUTH_MODE_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_WMI_SET_REASSOCMODE               50
-+
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_WMI_SET_WMM)
-+ *   UINT8  mode
-+ * uses: WMI_SET_WMM_CMDID
-+ */
-+#define AR6000_XIOCTL_WMI_SET_WMM                       51
-+
-+/*
-+ * arguments:
-+ * UINT32 cmd (AR6000_XIOCTL_WMI_SET_HB_CHALLENGE_RESP_PARAMS)
-+ * UINT32 frequency
-+ * UINT8  threshold
-+ */
-+#define AR6000_XIOCTL_WMI_SET_HB_CHALLENGE_RESP_PARAMS  52
-+
-+/*
-+ * arguments:
-+ * UINT32 cmd (AR6000_XIOCTL_WMI_GET_HB_CHALLENGE_RESP)
-+ * UINT32 cookie
-+ */
-+#define AR6000_XIOCTL_WMI_GET_HB_CHALLENGE_RESP         53
-+
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_WMI_GET_RD)
-+ *   UINT32 regDomain
-+ */
-+#define AR6000_XIOCTL_WMI_GET_RD                        54
-+
-+#define AR6000_XIOCTL_DIAG_READ                         55
-+
-+#define AR6000_XIOCTL_DIAG_WRITE                        56
-+
-+/*
-+ * arguments cmd (AR6000_XIOCTL_SET_TXOP)
-+ * WMI_TXOP_CFG  txopEnable
-+ */
-+#define AR6000_XIOCTL_WMI_SET_TXOP                      57
-+
-+#ifdef USER_KEYS
-+/*
-+ * arguments:
-+ * UINT32 cmd (AR6000_XIOCTL_USER_SETKEYS)
-+ * UINT32 keyOpCtrl
-+ * uses AR6000_USER_SETKEYS_INFO
-+ */
-+#define AR6000_XIOCTL_USER_SETKEYS                      58
-+#endif /* USER_KEYS */
-+
-+#define AR6000_XIOCTL_WMI_SET_KEEPALIVE                 59
-+/*
-+ * arguments:
-+ *   UINT8 cmd (AR6000_XIOCTL_WMI_SET_KEEPALIVE)
-+ *   UINT8 keepaliveInterval
-+ * uses: WMI_SET_KEEPALIVE_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_WMI_GET_KEEPALIVE                 60
-+/*
-+ * arguments:
-+ *   UINT8 cmd (AR6000_XIOCTL_WMI_GET_KEEPALIVE)
-+ *   UINT8 keepaliveInterval
-+ *   A_BOOL configured
-+ * uses: WMI_GET_KEEPALIVE_CMDID
-+ */
-+
-+/*               ====ROM Patching Extended Ioctls====                       */
-+
-+#define AR6000_XIOCTL_BMI_ROMPATCH_INSTALL              61
-+/*
-+ * arguments:
-+ *     union {
-+ *       struct {
-+ *         UINT32 cmd (AR6000_XIOCTL_BMI_ROMPATCH_INSTALL)
-+ *         UINT32 ROM Address
-+ *         UINT32 RAM Address
-+ *         UINT32 number of bytes
-+ *         UINT32 activate? (0 or 1)
-+ *       }
-+ *       A_UINT32 resulting rompatch ID
-+ *     }
-+ * uses: BMI_ROMPATCH_INSTALL
-+ */
-+
-+#define AR6000_XIOCTL_BMI_ROMPATCH_UNINSTALL            62
-+/*
-+ * arguments:
-+ *     struct {
-+ *       UINT32 cmd (AR6000_XIOCTL_BMI_ROMPATCH_UNINSTALL)
-+ *       UINT32 rompatch ID
-+ *     }
-+ * uses: BMI_ROMPATCH_UNINSTALL
-+ */
-+
-+#define AR6000_XIOCTL_BMI_ROMPATCH_ACTIVATE             63
-+/*
-+ * arguments:
-+ *     struct {
-+ *       UINT32 cmd (AR6000_XIOCTL_BMI_ROMPATCH_ACTIVATE)
-+ *       UINT32 rompatch count
-+ *       UINT32 rompatch IDs[rompatch count]
-+ *     }
-+ * uses: BMI_ROMPATCH_ACTIVATE
-+ */
-+
-+#define AR6000_XIOCTL_BMI_ROMPATCH_DEACTIVATE           64
-+/*
-+ * arguments:
-+ *     struct {
-+ *       UINT32 cmd (AR6000_XIOCTL_BMI_ROMPATCH_DEACTIVATE)
-+ *       UINT32 rompatch count
-+ *       UINT32 rompatch IDs[rompatch count]
-+ *     }
-+ * uses: BMI_ROMPATCH_DEACTIVATE
-+ */
-+
-+#define AR6000_XIOCTL_WMI_SET_APPIE             65
-+/*
-+ * arguments:
-+ *      struct {
-+ *          UINT32 cmd (AR6000_XIOCTL_WMI_SET_APPIE)
-+ *          UINT32  app_frmtype;
-+ *          UINT32  app_buflen;
-+ *          UINT8   app_buf[];
-+ *      }
-+ */
-+#define AR6000_XIOCTL_WMI_SET_MGMT_FRM_RX_FILTER    66
-+/*
-+ * arguments:
-+ *      A_UINT32 filter_type;
-+ */
-+
-+#define AR6000_XIOCTL_DBGLOG_CFG_MODULE             67
-+
-+#define AR6000_XIOCTL_DBGLOG_GET_DEBUG_LOGS         68
-+
-+#define AR6000_XIOCTL_WMI_SET_WSC_STATUS              70
-+/*
-+ * arguments:
-+ *      A_UINT32 wsc_status;
-+ *            (WSC_REG_INACTIVE or WSC_REG_ACTIVE)
-+ */
-+
-+/*
-+ * arguments:
-+ *      struct {
-+ *          A_UINT8 streamType;
-+ *          A_UINT8 status;
-+ *      }
-+ * uses: WMI_SET_BT_STATUS_CMDID
-+ */
-+#define AR6000_XIOCTL_WMI_SET_BT_STATUS             71
-+
-+/*
-+ * arguments:
-+ *      struct {
-+ *           A_UINT8 paramType;
-+ *           union {
-+ *               A_UINT8 noSCOPkts;
-+ *               BT_PARAMS_A2DP a2dpParams;
-+ *               BT_COEX_REGS regs;
-+ *           };
-+ *      }
-+ * uses: WMI_SET_BT_PARAM_CMDID
-+ */
-+#define AR6000_XIOCTL_WMI_SET_BT_PARAMS             72
-+
-+#define AR6000_XIOCTL_WMI_SET_HOST_SLEEP_MODE       73
-+#define AR6000_XIOCTL_WMI_SET_WOW_MODE              74
-+#define AR6000_XIOCTL_WMI_GET_WOW_LIST              75
-+#define AR6000_XIOCTL_WMI_ADD_WOW_PATTERN           76
-+#define AR6000_XIOCTL_WMI_DEL_WOW_PATTERN           77
-+
-+
-+
-+#define AR6000_XIOCTL_TARGET_INFO                   78
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_TARGET_INFO)
-+ *   A_UINT32 TargetVersion (returned)
-+ *   A_UINT32 TargetType    (returned)
-+ * (See also bmi_msg.h target_ver and target_type)
-+ */
-+
-+#define AR6000_XIOCTL_DUMP_HTC_CREDIT_STATE         79
-+/*
-+ * arguments:
-+ *      none
-+ */
-+
-+#define AR6000_XIOCTL_TRAFFIC_ACTIVITY_CHANGE       80
-+/*
-+ * This ioctl is used to emulate traffic activity
-+ * timeouts.  Activity/inactivity will trigger the driver
-+ * to re-balance credits.
-+ *
-+ * arguments:
-+ *      ar6000_traffic_activity_change
-+ */
-+
-+#define AR6000_XIOCTL_WMI_SET_CONNECT_CTRL_FLAGS    81
-+/*
-+ * This ioctl is used to set the connect control flags
-+ *
-+ * arguments:
-+ *      A_UINT32 connectCtrlFlags
-+ */
-+
-+#define AR6000_XIOCTL_WMI_SET_AKMP_PARAMS              82
-+/*
-+ * This IOCTL sets any Authentication,Key Management and Protection
-+ * related parameters. This is used along with the information set in
-+ * Connect Command.
-+ * Currently this enables Multiple PMKIDs to an AP.
-+ *
-+ * arguments:
-+ *      struct {
-+ *          A_UINT32    akmpInfo;
-+ *      }
-+ * uses: WMI_SET_AKMP_PARAMS_CMD
-+ */
-+
-+#define AR6000_XIOCTL_WMI_GET_PMKID_LIST            83
-+
-+#define AR6000_XIOCTL_WMI_SET_PMKID_LIST            84
-+/*
-+ * This IOCTL is used to set a list of PMKIDs. This list of
-+ * PMKIDs is used in the [Re]AssocReq Frame. This list is used
-+ * only if the MultiPMKID option is enabled via the
-+ * AR6000_XIOCTL_WMI_SET_AKMP_PARAMS  IOCTL.
-+ *
-+ * arguments:
-+ *      struct {
-+ *          A_UINT32    numPMKID;
-+ *          WMI_PMKID   pmkidList[WMI_MAX_PMKID_CACHE];
-+ *      }
-+ * uses: WMI_SET_PMKIDLIST_CMD
-+ */
-+
-+/* Historical DSETPATCH support for INI patches */
-+#define AR6000_XIOCTL_UNUSED90                      90
-+
-+
-+
-+/* used by AR6000_IOCTL_WMI_GETREV */
-+struct ar6000_version {
-+    A_UINT32        host_ver;
-+    A_UINT32        target_ver;
-+};
-+
-+/* used by AR6000_IOCTL_WMI_GET_QOS_QUEUE */
-+struct ar6000_queuereq {
-+    A_UINT8         trafficClass;
-+    A_UINT16        activeTsids;
-+};
-+
-+/* used by AR6000_IOCTL_WMI_GET_TARGET_STATS */
-+typedef struct targetStats_t {
-+    A_UINT64    tx_packets;
-+    A_UINT64    tx_bytes;
-+    A_UINT64    tx_unicast_pkts;
-+    A_UINT64    tx_unicast_bytes;
-+    A_UINT64    tx_multicast_pkts;
-+    A_UINT64    tx_multicast_bytes;
-+    A_UINT64    tx_broadcast_pkts;
-+    A_UINT64    tx_broadcast_bytes;
-+    A_UINT64    tx_rts_success_cnt;
-+    A_UINT64    tx_packet_per_ac[4];
-+
-+    A_UINT64    tx_errors;
-+    A_UINT64    tx_failed_cnt;
-+    A_UINT64    tx_retry_cnt;
-+    A_UINT64    tx_rts_fail_cnt;
-+    A_INT32     tx_unicast_rate;
-+    A_UINT64    rx_packets;
-+    A_UINT64    rx_bytes;
-+    A_UINT64    rx_unicast_pkts;
-+    A_UINT64    rx_unicast_bytes;
-+    A_UINT64    rx_multicast_pkts;
-+    A_UINT64    rx_multicast_bytes;
-+    A_UINT64    rx_broadcast_pkts;
-+    A_UINT64    rx_broadcast_bytes;
-+    A_UINT64    rx_fragment_pkt;
-+
-+    A_UINT64    rx_errors;
-+    A_UINT64    rx_crcerr;
-+    A_UINT64    rx_key_cache_miss;
-+    A_UINT64    rx_decrypt_err;
-+    A_UINT64    rx_duplicate_frames;
-+    A_INT32     rx_unicast_rate;
-+
-+    A_UINT64    tkip_local_mic_failure;
-+    A_UINT64    tkip_counter_measures_invoked;
-+    A_UINT64    tkip_replays;
-+    A_UINT64    tkip_format_errors;
-+    A_UINT64    ccmp_format_errors;
-+    A_UINT64    ccmp_replays;
-+
-+    A_UINT64    power_save_failure_cnt;
-+    A_INT16     noise_floor_calibation;
-+
-+    A_UINT64    cs_bmiss_cnt;
-+    A_UINT64    cs_lowRssi_cnt;
-+    A_UINT64    cs_connect_cnt;
-+    A_UINT64    cs_disconnect_cnt;
-+    A_UINT8     cs_aveBeacon_snr;
-+    A_INT16     cs_aveBeacon_rssi;
-+    A_UINT8     cs_lastRoam_msec;
-+    A_UINT8     cs_snr;
-+    A_INT16     cs_rssi;
-+
-+    A_UINT32    lq_val;
-+
-+    A_UINT32    wow_num_pkts_dropped;
-+    A_UINT8     wow_num_host_pkt_wakeups;
-+    A_UINT8     wow_num_host_event_wakeups;
-+    A_UINT16    wow_num_events_discarded;
-+
-+}TARGET_STATS;
-+
-+typedef struct targetStats_cmd_t {
-+    TARGET_STATS targetStats;
-+    int clearStats;
-+} TARGET_STATS_CMD;
-+
-+/* used by AR6000_XIOCTL_USER_SETKEYS */
-+
-+/*
-+ * Setting this bit to 1 doesnot initialize the RSC on the firmware
-+ */
-+#define AR6000_XIOCTL_USER_SETKEYS_RSC_CTRL    1
-+#define AR6000_USER_SETKEYS_RSC_UNCHANGED     0x00000002
-+
-+typedef struct {
-+    A_UINT32  keyOpCtrl;  /* Bit Map of Key Mgmt Ctrl Flags */
-+} AR6000_USER_SETKEYS_INFO;
-+
-+
-+/* used by AR6000_XIOCTL_GPIO_OUTPUT_SET */
-+struct ar6000_gpio_output_set_cmd_s {
-+    A_UINT32 set_mask;
-+    A_UINT32 clear_mask;
-+    A_UINT32 enable_mask;
-+    A_UINT32 disable_mask;
-+};
-+
-+/*
-+ * used by AR6000_XIOCTL_GPIO_REGISTER_GET and AR6000_XIOCTL_GPIO_REGISTER_SET
-+ */
-+struct ar6000_gpio_register_cmd_s {
-+    A_UINT32 gpioreg_id;
-+    A_UINT32 value;
-+};
-+
-+/* used by AR6000_XIOCTL_GPIO_INTR_ACK */
-+struct ar6000_gpio_intr_ack_cmd_s {
-+    A_UINT32 ack_mask;
-+};
-+
-+/* used by AR6000_XIOCTL_GPIO_INTR_WAIT */
-+struct ar6000_gpio_intr_wait_cmd_s {
-+    A_UINT32 intr_mask;
-+    A_UINT32 input_values;
-+};
-+
-+/* used by the AR6000_XIOCTL_DBGLOG_CFG_MODULE */
-+typedef struct ar6000_dbglog_module_config_s {
-+    A_UINT32 valid;
-+    A_UINT16 mmask;
-+    A_UINT16 tsr;
-+    A_BOOL   rep;
-+    A_UINT16 size;
-+} DBGLOG_MODULE_CONFIG;
-+
-+typedef struct user_rssi_thold_t {
-+    A_INT16     tag;
-+    A_INT16     rssi;
-+} USER_RSSI_THOLD;
-+
-+typedef struct user_rssi_params_t {
-+    A_UINT8            weight;
-+    A_UINT32           pollTime;
-+    USER_RSSI_THOLD    tholds[12];
-+} USER_RSSI_PARAMS;
-+
-+/*
-+ * Host driver may have some config parameters. Typically, these
-+ * config params are one time config parameters. These could
-+ * correspond to any of the underlying modules. Host driver exposes
-+ * an api for the underlying modules to get this config.
-+ */
-+#define AR6000_DRIVER_CFG_BASE                  0x8000
-+
-+/* Should driver perform wlan node caching? */
-+#define AR6000_DRIVER_CFG_GET_WLANNODECACHING   0x8001
-+/*Should we log raw WMI msgs */
-+#define AR6000_DRIVER_CFG_LOG_RAW_WMI_MSGS      0x8002
-+
-+/* used by AR6000_XIOCTL_DIAG_READ & AR6000_XIOCTL_DIAG_WRITE */
-+struct ar6000_diag_window_cmd_s {
-+    unsigned int addr;
-+    unsigned int value;
-+};
-+
-+
-+struct ar6000_traffic_activity_change {
-+    A_UINT32    StreamID;   /* stream ID to indicate activity change */
-+    A_UINT32    Active;     /* active (1) or inactive (0) */
-+};
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h b/drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h
-new file mode 100644
-index 0000000..3e91de3
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h
-@@ -0,0 +1,47 @@
-+/*
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/os/linux/include/athtypes_linux.h#1 $
-+ *
-+ * This file contains the definitions of the basic atheros data types.
-+ * It is used to map the data types in atheros files to a platform specific
-+ * type.
-+ *
-+ * Copyright 2003-2005 Atheros Communications, 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef _ATHTYPES_LINUX_H_
-+#define _ATHTYPES_LINUX_H_
-+
-+#ifdef __KERNEL__
-+#include <linux/types.h>
-+#endif
-+
-+typedef int8_t      A_INT8;
-+typedef int16_t     A_INT16;
-+typedef int32_t     A_INT32;
-+typedef int64_t     A_INT64;
-+
-+typedef u_int8_t     A_UINT8;
-+typedef u_int16_t    A_UINT16;
-+typedef u_int32_t    A_UINT32;
-+typedef u_int64_t    A_UINT64;
-+
-+typedef int             A_BOOL;
-+typedef char            A_CHAR;
-+typedef unsigned char   A_UCHAR;
-+typedef unsigned long   A_ATH_TIMER;
-+
-+
-+#endif /* _ATHTYPES_LINUX_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h b/drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h
-new file mode 100644
-index 0000000..11a691d
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h
-@@ -0,0 +1,44 @@
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef _CONFIG_LINUX_H_
-+#define _CONFIG_LINUX_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/*
-+ * Host-side GPIO support is optional.
-+ * If run-time access to GPIO pins is not required, then
-+ * this should be changed to #undef.
-+ */
-+#define CONFIG_HOST_GPIO_SUPPORT
-+
-+/*
-+ * Host side Test Command support
-+ */
-+#define CONFIG_HOST_TCMD_SUPPORT
-+
-+#define USE_4BYTE_REGISTER_ACCESS
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h b/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h
-new file mode 100644
-index 0000000..e62e960
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h
-@@ -0,0 +1,86 @@
-+/*
-+ * Copyright (c) 2004-2006 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef _DEBUG_LINUX_H_
-+#define _DEBUG_LINUX_H_
-+
-+#define DBG_DEFAULTS  (DBG_ERROR|DBG_WARNING)
-+
-+extern A_UINT32 g_dbg_flags;
-+
-+#define DBGFMT  "%s() : "
-+#define DBGARG  __func__
-+#define DBGFN A_PRINTF
-+
-+/* ------- Debug related stuff ------- */
-+enum {
-+    ATH_DEBUG_SEND = 0x0001,
-+    ATH_DEBUG_RECV = 0x0002,
-+    ATH_DEBUG_SYNC = 0x0004,
-+    ATH_DEBUG_DUMP = 0x0008,
-+    ATH_DEBUG_IRQ  = 0x0010,
-+    ATH_DEBUG_TRC  = 0x0020,
-+    ATH_DEBUG_WARN = 0x0040,
-+    ATH_DEBUG_ERR  = 0x0080,
-+    ATH_LOG_INF          = 0x0100,
-+    ATH_DEBUG_BMI  = 0x0110,
-+    ATH_DEBUG_WMI  = 0x0120,
-+    ATH_DEBUG_HIF  = 0x0140,
-+    ATH_DEBUG_HTC  = 0x0180,
-+    ATH_DEBUG_WLAN = 0x1000,
-+    ATH_LOG_ERR          = 0x1010,
-+    ATH_DEBUG_ANY  = 0xFFFF,
-+};
-+
-+#ifdef DEBUG
-+
-+#define A_DPRINTF(f, a) \
-+      if(g_dbg_flags & (f)) \
-+      {       \
-+              DBGFN a ; \
-+      }
-+
-+
-+// TODO FIX usage of A_PRINTF!
-+#define AR_DEBUG_LVL_CHECK(lvl) (debughtc & (lvl))
-+#define AR_DEBUG_PRINTBUF(buffer, length, desc) do {   \
-+    if (debughtc & ATH_DEBUG_DUMP) {             \
-+        DebugDumpBytes(buffer, length,desc);               \
-+    }                                            \
-+} while(0)
-+#define PRINTX_ARG(arg...) arg
-+#define AR_DEBUG_PRINTF(flags, args) do {        \
-+    if (debughtc & (flags)) {                    \
-+        A_PRINTF(KERN_ALERT PRINTX_ARG args);    \
-+    }                                            \
-+} while (0)
-+#define AR_DEBUG_ASSERT(test) do {               \
-+    if (!(test)) {                               \
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Debug Assert Caught, File %s, Line: %d, Test:%s \n",__FILE__, __LINE__,#test));         \
-+    }                                            \
-+} while(0)
-+extern int debughtc;
-+#else
-+#define AR_DEBUG_PRINTF(flags, args)
-+#define AR_DEBUG_PRINTBUF(buffer, length)
-+#define AR_DEBUG_ASSERT(test)
-+#define AR_DEBUG_LVL_CHECK(lvl) 0
-+#define A_DPRINTF(f, a)
-+#endif
-+
-+#endif /* _DEBUG_LINUX_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c b/drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c
-new file mode 100644
-index 0000000..eb712b4
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c
-@@ -0,0 +1,2540 @@
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "ar6000_drv.h"
-+
-+static A_UINT8 bcast_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-+static A_UINT8 null_mac[] = {0x0, 0x0, 0x0, 0x0, 0x0, 0x0};
-+extern USER_RSSI_THOLD rssi_map[12];
-+extern unsigned int wmitimeout;
-+extern A_WAITQUEUE_HEAD arEvent;
-+extern int tspecCompliance;
-+extern int bmienable;
-+extern int bypasswmi;
-+
-+static int
-+ar6000_ioctl_get_roam_tbl(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if(wmi_get_roam_tbl_cmd(ar->arWmi) != A_OK) {
-+        return -EIO;
-+    }
-+
-+    return 0;
-+}
-+
-+static int
-+ar6000_ioctl_get_roam_data(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+
-+    /* currently assume only roam times are required */
-+    if(wmi_get_roam_data_cmd(ar->arWmi, ROAM_DATA_TIME) != A_OK) {
-+        return -EIO;
-+    }
-+
-+
-+    return 0;
-+}
-+
-+static int
-+ar6000_ioctl_set_roam_ctrl(struct net_device *dev, char *userdata)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_SET_ROAM_CTRL_CMD cmd;
-+    A_UINT8 size = sizeof(cmd);
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+
-+    if (copy_from_user(&cmd, userdata, size)) {
-+        return -EFAULT;
-+    }
-+
-+    if (cmd.roamCtrlType == WMI_SET_HOST_BIAS) {
-+        if (cmd.info.bssBiasInfo.numBss > 1) {
-+            size += (cmd.info.bssBiasInfo.numBss - 1) * sizeof(WMI_BSS_BIAS);
-+        }
-+    }
-+
-+    if (copy_from_user(&cmd, userdata, size)) {
-+        return -EFAULT;
-+    }
-+
-+    if(wmi_set_roam_ctrl_cmd(ar->arWmi, &cmd, size) != A_OK) {
-+        return -EIO;
-+    }
-+
-+    return 0;
-+}
-+
-+static int
-+ar6000_ioctl_set_powersave_timers(struct net_device *dev, char *userdata)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_POWERSAVE_TIMERS_POLICY_CMD cmd;
-+    A_UINT8 size = sizeof(cmd);
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, userdata, size)) {
-+        return -EFAULT;
-+    }
-+
-+    if (copy_from_user(&cmd, userdata, size)) {
-+        return -EFAULT;
-+    }
-+
-+    if(wmi_set_powersave_timers_cmd(ar->arWmi, &cmd, size) != A_OK) {
-+        return -EIO;
-+    }
-+
-+    return 0;
-+}
-+
-+static int
-+ar6000_ioctl_set_wmm(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_SET_WMM_CMD cmd;
-+    A_STATUS ret;
-+
-+    if ((dev->flags & IFF_UP) != IFF_UP) {
-+        return -EIO;
-+    }
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, (char *)((unsigned int*)rq->ifr_data + 1),
-+                                sizeof(cmd)))
-+    {
-+        return -EFAULT;
-+    }
-+
-+    if (cmd.status == WMI_WMM_ENABLED) {
-+        ar->arWmmEnabled = TRUE;
-+    } else {
-+        ar->arWmmEnabled = FALSE;
-+    }
-+
-+    ret = wmi_set_wmm_cmd(ar->arWmi, cmd.status);
-+
-+    switch (ret) {
-+        case A_OK:
-+            return 0;
-+        case A_EBUSY :
-+            return -EBUSY;
-+        case A_NO_MEMORY:
-+            return -ENOMEM;
-+        case A_EINVAL:
-+        default:
-+            return -EFAULT;
-+    }
-+}
-+
-+static int
-+ar6000_ioctl_set_txop(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_SET_WMM_TXOP_CMD cmd;
-+    A_STATUS ret;
-+
-+    if ((dev->flags & IFF_UP) != IFF_UP) {
-+        return -EIO;
-+    }
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, (char *)((unsigned int*)rq->ifr_data + 1),
-+                                sizeof(cmd)))
-+    {
-+        return -EFAULT;
-+    }
-+
-+    ret = wmi_set_wmm_txop(ar->arWmi, cmd.txopEnable);
-+
-+    switch (ret) {
-+        case A_OK:
-+            return 0;
-+        case A_EBUSY :
-+            return -EBUSY;
-+        case A_NO_MEMORY:
-+            return -ENOMEM;
-+        case A_EINVAL:
-+        default:
-+            return -EFAULT;
-+    }
-+}
-+
-+static int
-+ar6000_ioctl_get_rd(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    A_STATUS ret = 0;
-+
-+    if ((dev->flags & IFF_UP) != IFF_UP || ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if(copy_to_user((char *)((unsigned int*)rq->ifr_data + 1),
-+                            &ar->arRegCode, sizeof(ar->arRegCode)))
-+        ret = -EFAULT;
-+
-+    return ret;
-+}
-+
-+
-+/* Get power mode command */
-+static int
-+ar6000_ioctl_get_power_mode(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_POWER_MODE_CMD power_mode;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    power_mode.powerMode = wmi_get_power_mode_cmd(ar->arWmi);
-+    if (copy_to_user(rq->ifr_data, &power_mode, sizeof(WMI_POWER_MODE_CMD))) {
-+        ret = -EFAULT;
-+    }
-+
-+    return ret;
-+}
-+
-+
-+static int
-+ar6000_ioctl_set_channelParams(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_CHANNEL_PARAMS_CMD cmd, *cmdp;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+
-+    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    if (cmd.numChannels > 1) {
-+        cmdp = A_MALLOC(130);
-+        if (copy_from_user(cmdp, rq->ifr_data,
-+                           sizeof (*cmdp) +
-+                           ((cmd.numChannels - 1) * sizeof(A_UINT16))))
-+        {
-+            kfree(cmdp);
-+            return -EFAULT;
-+        }
-+    } else {
-+        cmdp = &cmd;
-+    }
-+
-+    if ((ar->arPhyCapability == WMI_11G_CAPABILITY) &&
-+        ((cmdp->phyMode == WMI_11A_MODE) || (cmdp->phyMode == WMI_11AG_MODE)))
-+    {
-+        ret = -EINVAL;
-+    }
-+
-+    if (!ret &&
-+        (wmi_set_channelParams_cmd(ar->arWmi, cmdp->scanParam, cmdp->phyMode,
-+                                   cmdp->numChannels, cmdp->channelList)
-+         != A_OK))
-+    {
-+        ret = -EIO;
-+    }
-+
-+    if (cmd.numChannels > 1) {
-+        kfree(cmdp);
-+    }
-+
-+    return ret;
-+}
-+
-+static int
-+ar6000_ioctl_set_snr_threshold(struct net_device *dev, struct ifreq *rq)
-+{
-+
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_SNR_THRESHOLD_PARAMS_CMD cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    if( wmi_set_snr_threshold_params(ar->arWmi, &cmd) != A_OK ) {
-+        ret = -EIO;
-+    }
-+
-+    return ret;
-+}
-+
-+static int
-+ar6000_ioctl_set_rssi_threshold(struct net_device *dev, struct ifreq *rq)
-+{
-+#define SWAP_THOLD(thold1, thold2) do { \
-+    USER_RSSI_THOLD tmpThold;           \
-+    tmpThold.tag = thold1.tag;          \
-+    tmpThold.rssi = thold1.rssi;        \
-+    thold1.tag = thold2.tag;            \
-+    thold1.rssi = thold2.rssi;          \
-+    thold2.tag = tmpThold.tag;          \
-+    thold2.rssi = tmpThold.rssi;        \
-+} while (0)
-+
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_RSSI_THRESHOLD_PARAMS_CMD cmd;
-+    USER_RSSI_PARAMS rssiParams;
-+    A_INT32 i, j;
-+
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user((char *)&rssiParams, (char *)((unsigned int *)rq->ifr_data + 1), sizeof(USER_RSSI_PARAMS))) {
-+        return -EFAULT;
-+    }
-+    cmd.weight = rssiParams.weight;
-+    cmd.pollTime = rssiParams.pollTime;
-+
-+    A_MEMCPY(rssi_map, &rssiParams.tholds, sizeof(rssi_map));
-+    /*
-+     *  only 6 elements, so use bubble sorting, in ascending order
-+     */
-+    for (i = 5; i > 0; i--) {
-+        for (j = 0; j < i; j++) { /* above tholds */
-+            if (rssi_map[j+1].rssi < rssi_map[j].rssi) {
-+                SWAP_THOLD(rssi_map[j+1], rssi_map[j]);
-+            } else if (rssi_map[j+1].rssi == rssi_map[j].rssi) {
-+                return EFAULT;
-+            }
-+        }
-+    }
-+    for (i = 11; i > 6; i--) {
-+        for (j = 6; j < i; j++) { /* below tholds */
-+            if (rssi_map[j+1].rssi < rssi_map[j].rssi) {
-+                SWAP_THOLD(rssi_map[j+1], rssi_map[j]);
-+            } else if (rssi_map[j+1].rssi == rssi_map[j].rssi) {
-+                return EFAULT;
-+            }
-+        }
-+    }
-+
-+#ifdef DEBUG
-+    for (i = 0; i < 12; i++) {
-+        AR_DEBUG2_PRINTF("thold[%d].tag: %d, thold[%d].rssi: %d \n",
-+                i, rssi_map[i].tag, i, rssi_map[i].rssi);
-+    }
-+#endif
-+    cmd.thresholdAbove1_Val = rssi_map[0].rssi;
-+    cmd.thresholdAbove2_Val = rssi_map[1].rssi;
-+    cmd.thresholdAbove3_Val = rssi_map[2].rssi;
-+    cmd.thresholdAbove4_Val = rssi_map[3].rssi;
-+    cmd.thresholdAbove5_Val = rssi_map[4].rssi;
-+    cmd.thresholdAbove6_Val = rssi_map[5].rssi;
-+    cmd.thresholdBelow1_Val = rssi_map[6].rssi;
-+    cmd.thresholdBelow2_Val = rssi_map[7].rssi;
-+    cmd.thresholdBelow3_Val = rssi_map[8].rssi;
-+    cmd.thresholdBelow4_Val = rssi_map[9].rssi;
-+    cmd.thresholdBelow5_Val = rssi_map[10].rssi;
-+    cmd.thresholdBelow6_Val = rssi_map[11].rssi;
-+
-+    if( wmi_set_rssi_threshold_params(ar->arWmi, &cmd) != A_OK ) {
-+        ret = -EIO;
-+    }
-+
-+    return ret;
-+}
-+
-+static int
-+ar6000_ioctl_set_lq_threshold(struct net_device *dev, struct ifreq *rq)
-+{
-+
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_LQ_THRESHOLD_PARAMS_CMD cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, (char *)((unsigned int *)rq->ifr_data + 1), sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    if( wmi_set_lq_threshold_params(ar->arWmi, &cmd) != A_OK ) {
-+        ret = -EIO;
-+    }
-+
-+    return ret;
-+}
-+
-+
-+static int
-+ar6000_ioctl_set_probedSsid(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_PROBED_SSID_CMD cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    if (wmi_probedSsid_cmd(ar->arWmi, cmd.entryIndex, cmd.flag, cmd.ssidLength,
-+                                  cmd.ssid) != A_OK)
-+    {
-+        ret = -EIO;
-+    }
-+
-+    return ret;
-+}
-+
-+static int
-+ar6000_ioctl_set_badAp(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_ADD_BAD_AP_CMD cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+
-+    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    if (cmd.badApIndex > WMI_MAX_BAD_AP_INDEX) {
-+        return -EIO;
-+    }
-+
-+    if (A_MEMCMP(cmd.bssid, null_mac, AR6000_ETH_ADDR_LEN) == 0) {
-+        /*
-+         * This is a delete badAP.
-+         */
-+        if (wmi_deleteBadAp_cmd(ar->arWmi, cmd.badApIndex) != A_OK) {
-+            ret = -EIO;
-+        }
-+    } else {
-+        if (wmi_addBadAp_cmd(ar->arWmi, cmd.badApIndex, cmd.bssid) != A_OK) {
-+            ret = -EIO;
-+        }
-+    }
-+
-+    return ret;
-+}
-+
-+static int
-+ar6000_ioctl_create_qos(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_CREATE_PSTREAM_CMD cmd;
-+    A_STATUS ret;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+
-+    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    ret = wmi_verify_tspec_params(&cmd, tspecCompliance);
-+    if (ret == A_OK)
-+        ret = wmi_create_pstream_cmd(ar->arWmi, &cmd);
-+
-+    switch (ret) {
-+        case A_OK:
-+            return 0;
-+        case A_EBUSY :
-+            return -EBUSY;
-+        case A_NO_MEMORY:
-+            return -ENOMEM;
-+        case A_EINVAL:
-+        default:
-+            return -EFAULT;
-+    }
-+}
-+
-+static int
-+ar6000_ioctl_delete_qos(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_DELETE_PSTREAM_CMD cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    ret = wmi_delete_pstream_cmd(ar->arWmi, cmd.trafficClass, cmd.tsid);
-+
-+    switch (ret) {
-+        case A_OK:
-+            return 0;
-+        case A_EBUSY :
-+            return -EBUSY;
-+        case A_NO_MEMORY:
-+            return -ENOMEM;
-+        case A_EINVAL:
-+        default:
-+            return -EFAULT;
-+    }
-+}
-+
-+static int
-+ar6000_ioctl_get_qos_queue(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    struct ar6000_queuereq qreq;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if( copy_from_user(&qreq, rq->ifr_data,
-+                  sizeof(struct ar6000_queuereq)))
-+        return -EFAULT;
-+
-+    qreq.activeTsids = wmi_get_mapped_qos_queue(ar->arWmi, qreq.trafficClass);
-+
-+    if (copy_to_user(rq->ifr_data, &qreq,
-+                 sizeof(struct ar6000_queuereq)))
-+    {
-+        ret = -EFAULT;
-+    }
-+
-+    return ret;
-+}
-+
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+static A_STATUS
-+ar6000_ioctl_tcmd_get_rx_report(struct net_device *dev,
-+                                 struct ifreq *rq, A_UINT8 *data, A_UINT32 len)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    A_UINT32    buf[2];
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (down_interruptible(&ar->arSem)) {
-+        return -ERESTARTSYS;
-+    }
-+    ar->tcmdRxReport = 0;
-+    if (wmi_test_cmd(ar->arWmi, data, len) != A_OK) {
-+        up(&ar->arSem);
-+        return -EIO;
-+    }
-+
-+    wait_event_interruptible_timeout(arEvent, ar->tcmdRxReport != 0, wmitimeout * HZ);
-+
-+    if (signal_pending(current)) {
-+        ret = -EINTR;
-+    }
-+
-+    buf[0] = ar->tcmdRxTotalPkt;
-+    buf[1] = ar->tcmdRxRssi;
-+    if (!ret && copy_to_user(rq->ifr_data, buf, sizeof(buf))) {
-+        ret = -EFAULT;
-+    }
-+
-+    up(&ar->arSem);
-+
-+    return ret;
-+}
-+
-+void
-+ar6000_tcmd_rx_report_event(void *devt, A_UINT8 * results, int len)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
-+    TCMD_CONT_RX * rx_rep = (TCMD_CONT_RX *)results;
-+
-+    ar->tcmdRxTotalPkt = rx_rep->u.report.totalPkt;
-+    ar->tcmdRxRssi = rx_rep->u.report.rssiInDBm;
-+    ar->tcmdRxReport = 1;
-+
-+    wake_up(&arEvent);
-+}
-+#endif /* CONFIG_HOST_TCMD_SUPPORT*/
-+
-+static int
-+ar6000_ioctl_set_error_report_bitmask(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_TARGET_ERROR_REPORT_BITMASK cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    ret = wmi_set_error_report_bitmask(ar->arWmi, cmd.bitmask);
-+
-+    return  (ret==0 ? ret : -EINVAL);
-+}
-+
-+static int
-+ar6000_clear_target_stats(struct net_device *dev)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    TARGET_STATS *pStats = &ar->arTargetStats;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+       return -EIO;
-+    }
-+    AR6000_SPIN_LOCK(&ar->arLock, 0);
-+    A_MEMZERO(pStats, sizeof(TARGET_STATS));
-+    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+    return ret;
-+}
-+
-+static int
-+ar6000_ioctl_get_target_stats(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    TARGET_STATS_CMD cmd;
-+    TARGET_STATS *pStats = &ar->arTargetStats;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+    if (down_interruptible(&ar->arSem)) {
-+        return -ERESTARTSYS;
-+    }
-+
-+    ar->statsUpdatePending = TRUE;
-+
-+    if(wmi_get_stats_cmd(ar->arWmi) != A_OK) {
-+        up(&ar->arSem);
-+        return -EIO;
-+    }
-+
-+    wait_event_interruptible_timeout(arEvent, ar->statsUpdatePending == FALSE, wmitimeout * HZ);
-+
-+    if (signal_pending(current)) {
-+        ret = -EINTR;
-+    }
-+
-+    if (!ret && copy_to_user(rq->ifr_data, pStats, sizeof(*pStats))) {
-+        ret = -EFAULT;
-+    }
-+
-+    if (cmd.clearStats == 1) {
-+        ret = ar6000_clear_target_stats(dev);
-+    }
-+
-+    up(&ar->arSem);
-+
-+    return ret;
-+}
-+
-+static int
-+ar6000_ioctl_set_access_params(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_SET_ACCESS_PARAMS_CMD cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    if (wmi_set_access_params_cmd(ar->arWmi, cmd.txop, cmd.eCWmin, cmd.eCWmax,
-+                                  cmd.aifsn) == A_OK)
-+    {
-+        ret = 0;
-+    } else {
-+        ret = -EINVAL;
-+    }
-+
-+    return (ret);
-+}
-+
-+static int
-+ar6000_ioctl_set_disconnect_timeout(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_DISC_TIMEOUT_CMD cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    if (wmi_disctimeout_cmd(ar->arWmi, cmd.disconnectTimeout) == A_OK)
-+    {
-+        ret = 0;
-+    } else {
-+        ret = -EINVAL;
-+    }
-+
-+    return (ret);
-+}
-+
-+static int
-+ar6000_xioctl_set_voice_pkt_size(struct net_device *dev, char * userdata)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_SET_VOICE_PKT_SIZE_CMD cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, userdata, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    if (wmi_set_voice_pkt_size_cmd(ar->arWmi, cmd.voicePktSize) == A_OK)
-+    {
-+        ret = 0;
-+    } else {
-+        ret = -EINVAL;
-+    }
-+
-+
-+    return (ret);
-+}
-+
-+static int
-+ar6000_xioctl_set_max_sp_len(struct net_device *dev, char * userdata)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_SET_MAX_SP_LEN_CMD cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, userdata, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    if (wmi_set_max_sp_len_cmd(ar->arWmi, cmd.maxSPLen) == A_OK)
-+    {
-+        ret = 0;
-+    } else {
-+        ret = -EINVAL;
-+    }
-+
-+    return (ret);
-+}
-+
-+
-+static int
-+ar6000_xioctl_set_bt_status_cmd(struct net_device *dev, char * userdata)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_SET_BT_STATUS_CMD cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, userdata, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    if (wmi_set_bt_status_cmd(ar->arWmi, cmd.streamType, cmd.status) == A_OK)
-+    {
-+        ret = 0;
-+    } else {
-+        ret = -EINVAL;
-+    }
-+
-+    return (ret);
-+}
-+
-+static int
-+ar6000_xioctl_set_bt_params_cmd(struct net_device *dev, char * userdata)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_SET_BT_PARAMS_CMD cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, userdata, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    if (wmi_set_bt_params_cmd(ar->arWmi, &cmd) == A_OK)
-+    {
-+        ret = 0;
-+    } else {
-+        ret = -EINVAL;
-+    }
-+
-+    return (ret);
-+}
-+
-+#ifdef CONFIG_HOST_GPIO_SUPPORT
-+struct ar6000_gpio_intr_wait_cmd_s  gpio_intr_results;
-+/* gpio_reg_results and gpio_data_available are protected by arSem */
-+static struct ar6000_gpio_register_cmd_s gpio_reg_results;
-+static A_BOOL gpio_data_available; /* Requested GPIO data available */
-+static A_BOOL gpio_intr_available; /* GPIO interrupt info available */
-+static A_BOOL gpio_ack_received;   /* GPIO ack was received */
-+
-+/* Host-side initialization for General Purpose I/O support */
-+void ar6000_gpio_init(void)
-+{
-+    gpio_intr_available = FALSE;
-+    gpio_data_available = FALSE;
-+    gpio_ack_received   = FALSE;
-+}
-+
-+/*
-+ * Called when a GPIO interrupt is received from the Target.
-+ * intr_values shows which GPIO pins have interrupted.
-+ * input_values shows a recent value of GPIO pins.
-+ */
-+void
-+ar6000_gpio_intr_rx(A_UINT32 intr_mask, A_UINT32 input_values)
-+{
-+    gpio_intr_results.intr_mask = intr_mask;
-+    gpio_intr_results.input_values = input_values;
-+    *((volatile A_BOOL *)&gpio_intr_available) = TRUE;
-+    wake_up(&arEvent);
-+}
-+
-+/*
-+ * This is called when a response is received from the Target
-+ * for a previous or ar6000_gpio_input_get or ar6000_gpio_register_get
-+ * call.
-+ */
-+void
-+ar6000_gpio_data_rx(A_UINT32 reg_id, A_UINT32 value)
-+{
-+    gpio_reg_results.gpioreg_id = reg_id;
-+    gpio_reg_results.value = value;
-+    *((volatile A_BOOL *)&gpio_data_available) = TRUE;
-+    wake_up(&arEvent);
-+}
-+
-+/*
-+ * This is called when an acknowledgement is received from the Target
-+ * for a previous or ar6000_gpio_output_set or ar6000_gpio_register_set
-+ * call.
-+ */
-+void
-+ar6000_gpio_ack_rx(void)
-+{
-+    gpio_ack_received = TRUE;
-+    wake_up(&arEvent);
-+}
-+
-+A_STATUS
-+ar6000_gpio_output_set(struct net_device *dev,
-+                       A_UINT32 set_mask,
-+                       A_UINT32 clear_mask,
-+                       A_UINT32 enable_mask,
-+                       A_UINT32 disable_mask)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    gpio_ack_received = FALSE;
-+    return wmi_gpio_output_set(ar->arWmi,
-+                set_mask, clear_mask, enable_mask, disable_mask);
-+}
-+
-+static A_STATUS
-+ar6000_gpio_input_get(struct net_device *dev)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    *((volatile A_BOOL *)&gpio_data_available) = FALSE;
-+    return wmi_gpio_input_get(ar->arWmi);
-+}
-+
-+static A_STATUS
-+ar6000_gpio_register_set(struct net_device *dev,
-+                         A_UINT32 gpioreg_id,
-+                         A_UINT32 value)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    gpio_ack_received = FALSE;
-+    return wmi_gpio_register_set(ar->arWmi, gpioreg_id, value);
-+}
-+
-+static A_STATUS
-+ar6000_gpio_register_get(struct net_device *dev,
-+                         A_UINT32 gpioreg_id)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    *((volatile A_BOOL *)&gpio_data_available) = FALSE;
-+    return wmi_gpio_register_get(ar->arWmi, gpioreg_id);
-+}
-+
-+static A_STATUS
-+ar6000_gpio_intr_ack(struct net_device *dev,
-+                     A_UINT32 ack_mask)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    gpio_intr_available = FALSE;
-+    return wmi_gpio_intr_ack(ar->arWmi, ack_mask);
-+}
-+#endif /* CONFIG_HOST_GPIO_SUPPORT */
-+
-+int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    HIF_DEVICE *hifDevice = ar->arHifDevice;
-+    int ret, param, param2;
-+    unsigned int address = 0;
-+    unsigned int length = 0;
-+    unsigned char *buffer;
-+    char *userdata;
-+    A_UINT32 connectCtrlFlags;
-+
-+
-+    static WMI_SCAN_PARAMS_CMD scParams = {0, 0, 0, 0, 0,
-+                                           WMI_SHORTSCANRATIO_DEFAULT,
-+                                           DEFAULT_SCAN_CTRL_FLAGS,
-+                                           0};
-+    WMI_SET_AKMP_PARAMS_CMD  akmpParams;
-+    WMI_SET_PMKID_LIST_CMD   pmkidInfo;
-+
-+    if (cmd == AR6000_IOCTL_EXTENDED)
-+    {
-+        /*
-+         * This allows for many more wireless ioctls than would otherwise
-+         * be available.  Applications embed the actual ioctl command in
-+         * the first word of the parameter block, and use the command
-+         * AR6000_IOCTL_EXTENDED_CMD on the ioctl call.
-+         */
-+        get_user(cmd, (int *)rq->ifr_data);
-+        userdata = (char *)(((unsigned int *)rq->ifr_data)+1);
-+    }
-+    else
-+    {
-+        userdata = (char *)rq->ifr_data;
-+    }
-+
-+    if ((ar->arWlanState == WLAN_DISABLED) &&
-+        ((cmd != AR6000_XIOCTRL_WMI_SET_WLAN_STATE) &&
-+         (cmd != AR6000_XIOCTL_DIAG_READ) &&
-+         (cmd != AR6000_XIOCTL_DIAG_WRITE)))
-+    {
-+        return -EIO;
-+    }
-+
-+    ret = 0;
-+    switch(cmd)
-+    {
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+        case AR6000_XIOCTL_TCMD_CONT_TX:
-+            {
-+                TCMD_CONT_TX txCmd;
-+
-+                if (ar->tcmdPm == TCMD_PM_SLEEP) {
-+                    A_PRINTF("Can NOT send tx tcmd when target is asleep! \n");
-+                    return -EFAULT;
-+                }
-+
-+                if(copy_from_user(&txCmd, userdata, sizeof(TCMD_CONT_TX)))
-+                    return -EFAULT;
-+                wmi_test_cmd(ar->arWmi,(A_UINT8 *)&txCmd, sizeof(TCMD_CONT_TX));
-+            }
-+            break;
-+        case AR6000_XIOCTL_TCMD_CONT_RX:
-+            {
-+                TCMD_CONT_RX rxCmd;
-+
-+                if (ar->tcmdPm == TCMD_PM_SLEEP) {
-+                    A_PRINTF("Can NOT send rx tcmd when target is asleep! \n");
-+                    return -EFAULT;
-+                }
-+                if(copy_from_user(&rxCmd, userdata, sizeof(TCMD_CONT_RX)))
-+                    return -EFAULT;
-+                switch(rxCmd.act)
-+                {
-+                    case TCMD_CONT_RX_PROMIS:
-+                    case TCMD_CONT_RX_FILTER:
-+                    case TCMD_CONT_RX_SETMAC:
-+                         wmi_test_cmd(ar->arWmi,(A_UINT8 *)&rxCmd,
-+                                                sizeof(TCMD_CONT_RX));
-+                         break;
-+                    case TCMD_CONT_RX_REPORT:
-+                         ar6000_ioctl_tcmd_get_rx_report(dev, rq,
-+                         (A_UINT8 *)&rxCmd, sizeof(TCMD_CONT_RX));
-+                         break;
-+                    default:
-+                         A_PRINTF("Unknown Cont Rx mode: %d\n",rxCmd.act);
-+                         return -EINVAL;
-+                }
-+            }
-+            break;
-+        case AR6000_XIOCTL_TCMD_PM:
-+            {
-+                TCMD_PM pmCmd;
-+
-+                if(copy_from_user(&pmCmd, userdata, sizeof(TCMD_PM)))
-+                    return -EFAULT;
-+                ar->tcmdPm = pmCmd.mode;
-+                wmi_test_cmd(ar->arWmi, (A_UINT8*)&pmCmd, sizeof(TCMD_PM));
-+            }
-+            break;
-+#endif /* CONFIG_HOST_TCMD_SUPPORT */
-+
-+        case AR6000_XIOCTL_BMI_DONE:
-+            if(bmienable)
-+            {
-+                ret = ar6000_init(dev);
-+            }
-+            else
-+            {
-+                ret = BMIDone(hifDevice);
-+            }
-+            break;
-+
-+        case AR6000_XIOCTL_BMI_READ_MEMORY:
-+            get_user(address, (unsigned int *)userdata);
-+            get_user(length, (unsigned int *)userdata + 1);
-+            AR_DEBUG_PRINTF("Read Memory (address: 0x%x, length: %d)\n",
-+                             address, length);
-+            if ((buffer = (unsigned char *)A_MALLOC(length)) != NULL) {
-+                A_MEMZERO(buffer, length);
-+                ret = BMIReadMemory(hifDevice, address, buffer, length);
-+                if (copy_to_user(rq->ifr_data, buffer, length)) {
-+                    ret = -EFAULT;
-+                }
-+                A_FREE(buffer);
-+            } else {
-+                ret = -ENOMEM;
-+            }
-+            break;
-+
-+        case AR6000_XIOCTL_BMI_WRITE_MEMORY:
-+            get_user(address, (unsigned int *)userdata);
-+            get_user(length, (unsigned int *)userdata + 1);
-+            AR_DEBUG_PRINTF("Write Memory (address: 0x%x, length: %d)\n",
-+                             address, length);
-+            if ((buffer = (unsigned char *)A_MALLOC(length)) != NULL) {
-+                A_MEMZERO(buffer, length);
-+                if (copy_from_user(buffer, &userdata[sizeof(address) +
-+                                   sizeof(length)], length))
-+                {
-+                    ret = -EFAULT;
-+                } else {
-+                    ret = BMIWriteMemory(hifDevice, address, buffer, length);
-+                }
-+                A_FREE(buffer);
-+            } else {
-+                ret = -ENOMEM;
-+            }
-+            break;
-+
-+        case AR6000_XIOCTL_BMI_TEST:
-+           AR_DEBUG_PRINTF("No longer supported\n");
-+           ret = -EOPNOTSUPP;
-+           break;
-+
-+        case AR6000_XIOCTL_BMI_EXECUTE:
-+            get_user(address, (unsigned int *)userdata);
-+            get_user(param, (unsigned int *)userdata + 1);
-+            AR_DEBUG_PRINTF("Execute (address: 0x%x, param: %d)\n",
-+                             address, param);
-+            ret = BMIExecute(hifDevice, address, &param);
-+            put_user(param, (unsigned int *)rq->ifr_data); /* return value */
-+            break;
-+
-+        case AR6000_XIOCTL_BMI_SET_APP_START:
-+            get_user(address, (unsigned int *)userdata);
-+            AR_DEBUG_PRINTF("Set App Start (address: 0x%x)\n", address);
-+            ret = BMISetAppStart(hifDevice, address);
-+            break;
-+
-+        case AR6000_XIOCTL_BMI_READ_SOC_REGISTER:
-+            get_user(address, (unsigned int *)userdata);
-+            ret = BMIReadSOCRegister(hifDevice, address, &param);
-+            put_user(param, (unsigned int *)rq->ifr_data); /* return value */
-+            break;
-+
-+        case AR6000_XIOCTL_BMI_WRITE_SOC_REGISTER:
-+            get_user(address, (unsigned int *)userdata);
-+            get_user(param, (unsigned int *)userdata + 1);
-+            ret = BMIWriteSOCRegister(hifDevice, address, param);
-+            break;
-+
-+#ifdef HTC_RAW_INTERFACE
-+        case AR6000_XIOCTL_HTC_RAW_OPEN:
-+            ret = A_OK;
-+            if (!arRawIfEnabled(ar)) {
-+                /* make sure block size is set in case the target was reset since last
-+                  * BMI phase (i.e. flashup downloads) */
-+                ret = ar6000_SetHTCBlockSize(ar);
-+                if (A_FAILED(ret)) {
-+                    break;
-+                }
-+                /* Terminate the BMI phase */
-+                ret = BMIDone(hifDevice);
-+                if (ret == A_OK) {
-+                    ret = ar6000_htc_raw_open(ar);
-+                }
-+            }
-+            break;
-+
-+        case AR6000_XIOCTL_HTC_RAW_CLOSE:
-+            if (arRawIfEnabled(ar)) {
-+                ret = ar6000_htc_raw_close(ar);
-+                arRawIfEnabled(ar) = FALSE;
-+            } else {
-+                ret = A_ERROR;
-+            }
-+            break;
-+
-+        case AR6000_XIOCTL_HTC_RAW_READ:
-+            if (arRawIfEnabled(ar)) {
-+                unsigned int streamID;
-+                get_user(streamID, (unsigned int *)userdata);
-+                get_user(length, (unsigned int *)userdata + 1);
-+                buffer = rq->ifr_data + sizeof(length);
-+                ret = ar6000_htc_raw_read(ar, (HTC_RAW_STREAM_ID)streamID,
-+                                          buffer, length);
-+                put_user(ret, (unsigned int *)rq->ifr_data);
-+            } else {
-+                ret = A_ERROR;
-+            }
-+            break;
-+
-+        case AR6000_XIOCTL_HTC_RAW_WRITE:
-+            if (arRawIfEnabled(ar)) {
-+                unsigned int streamID;
-+                get_user(streamID, (unsigned int *)userdata);
-+                get_user(length, (unsigned int *)userdata + 1);
-+                buffer = userdata + sizeof(streamID) + sizeof(length);
-+                ret = ar6000_htc_raw_write(ar, (HTC_RAW_STREAM_ID)streamID,
-+                                           buffer, length);
-+                put_user(ret, (unsigned int *)rq->ifr_data);
-+            } else {
-+                ret = A_ERROR;
-+            }
-+            break;
-+#endif /* HTC_RAW_INTERFACE */
-+
-+        case AR6000_IOCTL_WMI_GETREV:
-+        {
-+            if (copy_to_user(rq->ifr_data, &ar->arVersion,
-+                             sizeof(ar->arVersion)))
-+            {
-+                ret = -EFAULT;
-+            }
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SETPWR:
-+        {
-+            WMI_POWER_MODE_CMD pwrModeCmd;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&pwrModeCmd, userdata,
-+                                   sizeof(pwrModeCmd)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_powermode_cmd(ar->arWmi, pwrModeCmd.powerMode)
-+                       != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SET_IBSS_PM_CAPS:
-+        {
-+            WMI_IBSS_PM_CAPS_CMD ibssPmCaps;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&ibssPmCaps, userdata,
-+                                   sizeof(ibssPmCaps)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_ibsspmcaps_cmd(ar->arWmi, ibssPmCaps.power_saving, ibssPmCaps.ttl,
-+                    ibssPmCaps.atim_windows, ibssPmCaps.timeout_value) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+                AR6000_SPIN_LOCK(&ar->arLock, 0);
-+                ar->arIbssPsEnable = ibssPmCaps.power_saving;
-+                AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+            }
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SET_PMPARAMS:
-+        {
-+            WMI_POWER_PARAMS_CMD pmParams;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&pmParams, userdata,
-+                                      sizeof(pmParams)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_pmparams_cmd(ar->arWmi, pmParams.idle_period,
-+                                     pmParams.pspoll_number,
-+                                     pmParams.dtim_policy) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SETSCAN:
-+        {
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&scParams, userdata,
-+                                      sizeof(scParams)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (CAN_SCAN_IN_CONNECT(scParams.scanCtrlFlags)) {
-+                    ar->arSkipScan = FALSE;
-+                } else {
-+                    ar->arSkipScan = TRUE;
-+                }
-+
-+                if (wmi_scanparams_cmd(ar->arWmi, scParams.fg_start_period,
-+                                       scParams.fg_end_period,
-+                                       scParams.bg_period,
-+                                       scParams.minact_chdwell_time,
-+                                       scParams.maxact_chdwell_time,
-+                                       scParams.pas_chdwell_time,
-+                                       scParams.shortScanRatio,
-+                                       scParams.scanCtrlFlags,
-+                                       scParams.max_dfsch_act_time) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SETLISTENINT:
-+        {
-+            WMI_LISTEN_INT_CMD listenCmd;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&listenCmd, userdata,
-+                                      sizeof(listenCmd)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                    if (wmi_listeninterval_cmd(ar->arWmi, listenCmd.listenInterval, listenCmd.numBeacons) != A_OK) {
-+                        ret = -EIO;
-+                    } else {
-+                        AR6000_SPIN_LOCK(&ar->arLock, 0);
-+                        ar->arListenInterval = param;
-+                        AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+                    }
-+
-+                }
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SET_BMISS_TIME:
-+        {
-+            WMI_BMISS_TIME_CMD bmissCmd;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&bmissCmd, userdata,
-+                                      sizeof(bmissCmd)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_bmisstime_cmd(ar->arWmi, bmissCmd.bmissTime, bmissCmd.numBeacons) != A_OK) {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SETBSSFILTER:
-+        {
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else {
-+
-+                get_user(param, (unsigned char *)userdata);
-+                get_user(param2, (unsigned int *)(userdata + 1));
-+              printk("SETBSSFILTER: filter 0x%x, mask: 0x%x\n", param, param2);
-+                if (wmi_bssfilter_cmd(ar->arWmi, param, param2) != A_OK) {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SET_SNRTHRESHOLD:
-+        {
-+            ret = ar6000_ioctl_set_snr_threshold(dev, rq);
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_RSSITHRESHOLD:
-+        {
-+            ret = ar6000_ioctl_set_rssi_threshold(dev, rq);
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_CLR_RSSISNR:
-+        {
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            }
-+            ret = wmi_clr_rssi_snr(ar->arWmi);
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_LQTHRESHOLD:
-+        {
-+            ret = ar6000_ioctl_set_lq_threshold(dev, rq);
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_LPREAMBLE:
-+        {
-+            WMI_SET_LPREAMBLE_CMD setLpreambleCmd;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&setLpreambleCmd, userdata,
-+                                   sizeof(setLpreambleCmd)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_set_lpreamble_cmd(ar->arWmi, setLpreambleCmd.status)
-+                       != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_RTS:
-+        {
-+            WMI_SET_RTS_CMD rtsCmd;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&rtsCmd, userdata,
-+                                   sizeof(rtsCmd)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_set_rts_cmd(ar->arWmi, rtsCmd.threshold)
-+                       != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_WMM:
-+        {
-+            ret = ar6000_ioctl_set_wmm(dev, rq);
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_TXOP:
-+        {
-+            ret = ar6000_ioctl_set_txop(dev, rq);
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_GET_RD:
-+        {
-+            ret = ar6000_ioctl_get_rd(dev, rq);
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SET_CHANNELPARAMS:
-+        {
-+            ret = ar6000_ioctl_set_channelParams(dev, rq);
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SET_PROBEDSSID:
-+        {
-+            ret = ar6000_ioctl_set_probedSsid(dev, rq);
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SET_BADAP:
-+        {
-+            ret = ar6000_ioctl_set_badAp(dev, rq);
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_CREATE_QOS:
-+        {
-+            ret = ar6000_ioctl_create_qos(dev, rq);
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_DELETE_QOS:
-+        {
-+            ret = ar6000_ioctl_delete_qos(dev, rq);
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_GET_QOS_QUEUE:
-+        {
-+            ret = ar6000_ioctl_get_qos_queue(dev, rq);
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_GET_TARGET_STATS:
-+        {
-+            ret = ar6000_ioctl_get_target_stats(dev, rq);
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SET_ERROR_REPORT_BITMASK:
-+        {
-+            ret = ar6000_ioctl_set_error_report_bitmask(dev, rq);
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SET_ASSOC_INFO:
-+        {
-+            WMI_SET_ASSOC_INFO_CMD cmd;
-+            A_UINT8 assocInfo[WMI_MAX_ASSOC_INFO_LEN];
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else {
-+                get_user(cmd.ieType, userdata);
-+                if (cmd.ieType >= WMI_MAX_ASSOC_INFO_TYPE) {
-+                    ret = -EIO;
-+                } else {
-+                    get_user(cmd.bufferSize, userdata + 1);
-+                    if (cmd.bufferSize > WMI_MAX_ASSOC_INFO_LEN) {
-+                        ret = -EFAULT;
-+                        break;
-+                    }
-+                    if (copy_from_user(assocInfo, userdata + 2,
-+                                       cmd.bufferSize))
-+                    {
-+                        ret = -EFAULT;
-+                    } else {
-+                        if (wmi_associnfo_cmd(ar->arWmi, cmd.ieType,
-+                                                 cmd.bufferSize,
-+                                                 assocInfo) != A_OK)
-+                        {
-+                            ret = -EIO;
-+                        }
-+                    }
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SET_ACCESS_PARAMS:
-+        {
-+            ret = ar6000_ioctl_set_access_params(dev, rq);
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SET_DISC_TIMEOUT:
-+        {
-+            ret = ar6000_ioctl_set_disconnect_timeout(dev, rq);
-+            break;
-+        }
-+        case AR6000_XIOCTL_FORCE_TARGET_RESET:
-+        {
-+            if (ar->arHtcTarget)
-+            {
-+//                HTCForceReset(htcTarget);
-+            }
-+            else
-+            {
-+                AR_DEBUG_PRINTF("ar6000_ioctl cannot attempt reset.\n");
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_TARGET_INFO:
-+        case AR6000_XIOCTL_CHECK_TARGET_READY: /* backwards compatibility */
-+        {
-+            /* If we made it to here, then the Target exists and is ready. */
-+
-+            if (cmd == AR6000_XIOCTL_TARGET_INFO) {
-+                if (copy_to_user((A_UINT32 *)rq->ifr_data, &ar->arVersion.target_ver,
-+                                 sizeof(ar->arVersion.target_ver)))
-+                {
-+                    ret = -EFAULT;
-+                }
-+                if (copy_to_user(((A_UINT32 *)rq->ifr_data)+1, &ar->arTargetType,
-+                                 sizeof(ar->arTargetType)))
-+                {
-+                    ret = -EFAULT;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_HB_CHALLENGE_RESP_PARAMS:
-+        {
-+            WMI_SET_HB_CHALLENGE_RESP_PARAMS_CMD hbparam;
-+
-+            if (copy_from_user(&hbparam, userdata, sizeof(hbparam)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                AR6000_SPIN_LOCK(&ar->arLock, 0);
-+                /* Start a cyclic timer with the parameters provided. */
-+                if (hbparam.frequency) {
-+                    ar->arHBChallengeResp.frequency = hbparam.frequency;
-+                }
-+                if (hbparam.threshold) {
-+                    ar->arHBChallengeResp.missThres = hbparam.threshold;
-+                }
-+
-+                /* Delete the pending timer and start a new one */
-+                if (timer_pending(&ar->arHBChallengeResp.timer)) {
-+                    A_UNTIMEOUT(&ar->arHBChallengeResp.timer);
-+                }
-+                A_TIMEOUT_MS(&ar->arHBChallengeResp.timer, ar->arHBChallengeResp.frequency * 1000, 0);
-+                AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_GET_HB_CHALLENGE_RESP:
-+        {
-+            A_UINT32 cookie;
-+
-+            if (copy_from_user(&cookie, userdata, sizeof(cookie))) {
-+                return -EFAULT;
-+            }
-+
-+            /* Send the challenge on the control channel */
-+            if (wmi_get_challenge_resp_cmd(ar->arWmi, cookie, APP_HB_CHALLENGE) != A_OK) {
-+                return -EIO;
-+            }
-+            break;
-+        }
-+#ifdef USER_KEYS
-+        case AR6000_XIOCTL_USER_SETKEYS:
-+        {
-+
-+            ar->user_savedkeys_stat = USER_SAVEDKEYS_STAT_RUN;
-+
-+            if (copy_from_user(&ar->user_key_ctrl, userdata,
-+                               sizeof(ar->user_key_ctrl)))
-+            {
-+                return -EFAULT;
-+            }
-+
-+            A_PRINTF("ar6000 USER set key %x\n", ar->user_key_ctrl);
-+            break;
-+        }
-+#endif /* USER_KEYS */
-+
-+#ifdef CONFIG_HOST_GPIO_SUPPORT
-+        case AR6000_XIOCTL_GPIO_OUTPUT_SET:
-+        {
-+            struct ar6000_gpio_output_set_cmd_s gpio_output_set_cmd;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                return -EIO;
-+            }
-+            if (down_interruptible(&ar->arSem)) {
-+                return -ERESTARTSYS;
-+            }
-+
-+            if (copy_from_user(&gpio_output_set_cmd, userdata,
-+                                sizeof(gpio_output_set_cmd)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                ret = ar6000_gpio_output_set(dev,
-+                                             gpio_output_set_cmd.set_mask,
-+                                             gpio_output_set_cmd.clear_mask,
-+                                             gpio_output_set_cmd.enable_mask,
-+                                             gpio_output_set_cmd.disable_mask);
-+                if (ret != A_OK) {
-+                    ret = EIO;
-+                }
-+            }
-+            up(&ar->arSem);
-+            break;
-+        }
-+        case AR6000_XIOCTL_GPIO_INPUT_GET:
-+        {
-+            if (ar->arWmiReady == FALSE) {
-+                return -EIO;
-+            }
-+            if (down_interruptible(&ar->arSem)) {
-+                return -ERESTARTSYS;
-+            }
-+
-+            ret = ar6000_gpio_input_get(dev);
-+            if (ret != A_OK) {
-+                up(&ar->arSem);
-+                return -EIO;
-+            }
-+
-+            /* Wait for Target to respond. */
-+            wait_event_interruptible(arEvent, gpio_data_available);
-+            if (signal_pending(current)) {
-+                ret = -EINTR;
-+            } else {
-+                A_ASSERT(gpio_reg_results.gpioreg_id == GPIO_ID_NONE);
-+
-+                if (copy_to_user(userdata, &gpio_reg_results.value,
-+                                 sizeof(gpio_reg_results.value)))
-+                {
-+                    ret = -EFAULT;
-+                }
-+            }
-+            up(&ar->arSem);
-+            break;
-+        }
-+        case AR6000_XIOCTL_GPIO_REGISTER_SET:
-+        {
-+            struct ar6000_gpio_register_cmd_s gpio_register_cmd;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                return -EIO;
-+            }
-+            if (down_interruptible(&ar->arSem)) {
-+                return -ERESTARTSYS;
-+            }
-+
-+            if (copy_from_user(&gpio_register_cmd, userdata,
-+                                sizeof(gpio_register_cmd)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                ret = ar6000_gpio_register_set(dev,
-+                                               gpio_register_cmd.gpioreg_id,
-+                                               gpio_register_cmd.value);
-+                if (ret != A_OK) {
-+                    ret = EIO;
-+                }
-+
-+                /* Wait for acknowledgement from Target */
-+                wait_event_interruptible(arEvent, gpio_ack_received);
-+                if (signal_pending(current)) {
-+                    ret = -EINTR;
-+                }
-+            }
-+            up(&ar->arSem);
-+            break;
-+        }
-+        case AR6000_XIOCTL_GPIO_REGISTER_GET:
-+        {
-+            struct ar6000_gpio_register_cmd_s gpio_register_cmd;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                return -EIO;
-+            }
-+            if (down_interruptible(&ar->arSem)) {
-+                return -ERESTARTSYS;
-+            }
-+
-+            if (copy_from_user(&gpio_register_cmd, userdata,
-+                                sizeof(gpio_register_cmd)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                ret = ar6000_gpio_register_get(dev, gpio_register_cmd.gpioreg_id);
-+                if (ret != A_OK) {
-+                    up(&ar->arSem);
-+                    return -EIO;
-+                }
-+
-+                /* Wait for Target to respond. */
-+                wait_event_interruptible(arEvent, gpio_data_available);
-+                if (signal_pending(current)) {
-+                    ret = -EINTR;
-+                } else {
-+                    A_ASSERT(gpio_register_cmd.gpioreg_id == gpio_reg_results.gpioreg_id);
-+                    if (copy_to_user(userdata, &gpio_reg_results,
-+                                     sizeof(gpio_reg_results)))
-+                    {
-+                        ret = -EFAULT;
-+                    }
-+                }
-+            }
-+            up(&ar->arSem);
-+            break;
-+        }
-+        case AR6000_XIOCTL_GPIO_INTR_ACK:
-+        {
-+            struct ar6000_gpio_intr_ack_cmd_s gpio_intr_ack_cmd;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                return -EIO;
-+            }
-+            if (down_interruptible(&ar->arSem)) {
-+                return -ERESTARTSYS;
-+            }
-+
-+            if (copy_from_user(&gpio_intr_ack_cmd, userdata,
-+                                sizeof(gpio_intr_ack_cmd)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                ret = ar6000_gpio_intr_ack(dev, gpio_intr_ack_cmd.ack_mask);
-+                if (ret != A_OK) {
-+                    ret = EIO;
-+                }
-+            }
-+            up(&ar->arSem);
-+            break;
-+        }
-+        case AR6000_XIOCTL_GPIO_INTR_WAIT:
-+        {
-+            /* Wait for Target to report an interrupt. */
-+            dev_hold(dev);
-+            rtnl_unlock();
-+            wait_event_interruptible(arEvent, gpio_intr_available);
-+            rtnl_lock();
-+            __dev_put(dev);
-+
-+            if (signal_pending(current)) {
-+                ret = -EINTR;
-+            } else {
-+                if (copy_to_user(userdata, &gpio_intr_results,
-+                                 sizeof(gpio_intr_results)))
-+                {
-+                    ret = -EFAULT;
-+                }
-+            }
-+            break;
-+        }
-+#endif /* CONFIG_HOST_GPIO_SUPPORT */
-+
-+        case AR6000_XIOCTL_DBGLOG_CFG_MODULE:
-+        {
-+            struct ar6000_dbglog_module_config_s config;
-+
-+            if (copy_from_user(&config, userdata, sizeof(config))) {
-+                return -EFAULT;
-+            }
-+
-+            /* Send the challenge on the control channel */
-+            if (wmi_config_debug_module_cmd(ar->arWmi, config.mmask,
-+                                            config.tsr, config.rep,
-+                                            config.size, config.valid) != A_OK)
-+            {
-+                return -EIO;
-+            }
-+            break;
-+        }
-+
-+        case AR6000_XIOCTL_DBGLOG_GET_DEBUG_LOGS:
-+        {
-+            /* Send the challenge on the control channel */
-+            if (ar6000_dbglog_get_debug_logs(ar) != A_OK)
-+            {
-+                return -EIO;
-+            }
-+            break;
-+        }
-+
-+        case AR6000_XIOCTL_SET_ADHOC_BSSID:
-+        {
-+            WMI_SET_ADHOC_BSSID_CMD adhocBssid;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&adhocBssid, userdata,
-+                                      sizeof(adhocBssid)))
-+            {
-+                ret = -EFAULT;
-+            } else if (A_MEMCMP(adhocBssid.bssid, bcast_mac,
-+                                AR6000_ETH_ADDR_LEN) == 0)
-+            {
-+                ret = -EFAULT;
-+            } else {
-+
-+                A_MEMCPY(ar->arReqBssid, adhocBssid.bssid, sizeof(ar->arReqBssid));
-+        }
-+            break;
-+        }
-+
-+        case AR6000_XIOCTL_SET_OPT_MODE:
-+        {
-+        WMI_SET_OPT_MODE_CMD optModeCmd;
-+            AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&optModeCmd, userdata,
-+                                      sizeof(optModeCmd)))
-+            {
-+                ret = -EFAULT;
-+            } else if (ar->arConnected && optModeCmd.optMode == SPECIAL_ON) {
-+                ret = -EFAULT;
-+
-+            } else if (wmi_set_opt_mode_cmd(ar->arWmi, optModeCmd.optMode)
-+                       != A_OK)
-+            {
-+                ret = -EIO;
-+            }
-+            break;
-+        }
-+
-+        case AR6000_XIOCTL_OPT_SEND_FRAME:
-+        {
-+        WMI_OPT_TX_FRAME_CMD optTxFrmCmd;
-+            A_UINT8 data[MAX_OPT_DATA_LEN];
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&optTxFrmCmd, userdata,
-+                                      sizeof(optTxFrmCmd)))
-+            {
-+                ret = -EFAULT;
-+            } else if (copy_from_user(data,
-+                                      userdata+sizeof(WMI_OPT_TX_FRAME_CMD)-1,
-+                                      optTxFrmCmd.optIEDataLen))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                ret = wmi_opt_tx_frame_cmd(ar->arWmi,
-+                                           optTxFrmCmd.frmType,
-+                                           optTxFrmCmd.dstAddr,
-+                                           optTxFrmCmd.bssid,
-+                                           optTxFrmCmd.optIEDataLen,
-+                                           data);
-+            }
-+
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SETRETRYLIMITS:
-+        {
-+            WMI_SET_RETRY_LIMITS_CMD setRetryParams;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&setRetryParams, userdata,
-+                                      sizeof(setRetryParams)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_set_retry_limits_cmd(ar->arWmi, setRetryParams.frameType,
-+                                          setRetryParams.trafficClass,
-+                                          setRetryParams.maxRetries,
-+                                          setRetryParams.enableNotify) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+                AR6000_SPIN_LOCK(&ar->arLock, 0);
-+                ar->arMaxRetries = setRetryParams.maxRetries;
-+                AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+            }
-+            break;
-+        }
-+
-+        case AR6000_XIOCTL_SET_ADHOC_BEACON_INTVAL:
-+        {
-+            WMI_BEACON_INT_CMD bIntvlCmd;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&bIntvlCmd, userdata,
-+                       sizeof(bIntvlCmd)))
-+            {
-+                ret = -EFAULT;
-+            } else if (wmi_set_adhoc_bconIntvl_cmd(ar->arWmi, bIntvlCmd.beaconInterval)
-+                        != A_OK)
-+            {
-+                ret = -EIO;
-+            }
-+            break;
-+        }
-+        case IEEE80211_IOCTL_SETAUTHALG:
-+        {
-+            AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+            struct ieee80211req_authalg req;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&req, userdata,
-+                       sizeof(struct ieee80211req_authalg)))
-+            {
-+                ret = -EFAULT;
-+            } else if (req.auth_alg == AUTH_ALG_OPEN_SYSTEM) {
-+                ar->arDot11AuthMode  = OPEN_AUTH;
-+                ar->arPairwiseCrypto  = NONE_CRYPT;
-+                ar->arGroupCrypto     = NONE_CRYPT;
-+            } else if (req.auth_alg == AUTH_ALG_LEAP) {
-+                ar->arDot11AuthMode   = LEAP_AUTH;
-+            } else {
-+                ret = -EIO;
-+            }
-+            break;
-+        }
-+
-+        case AR6000_XIOCTL_SET_VOICE_PKT_SIZE:
-+            ret = ar6000_xioctl_set_voice_pkt_size(dev, userdata);
-+            break;
-+
-+        case AR6000_XIOCTL_SET_MAX_SP:
-+            ret = ar6000_xioctl_set_max_sp_len(dev, userdata);
-+            break;
-+
-+        case AR6000_XIOCTL_WMI_GET_ROAM_TBL:
-+            ret = ar6000_ioctl_get_roam_tbl(dev, rq);
-+            break;
-+        case AR6000_XIOCTL_WMI_SET_ROAM_CTRL:
-+            ret = ar6000_ioctl_set_roam_ctrl(dev, userdata);
-+            break;
-+        case AR6000_XIOCTRL_WMI_SET_POWERSAVE_TIMERS:
-+            ret = ar6000_ioctl_set_powersave_timers(dev, userdata);
-+            break;
-+        case AR6000_XIOCTRL_WMI_GET_POWER_MODE:
-+            ret = ar6000_ioctl_get_power_mode(dev, rq);
-+            break;
-+        case AR6000_XIOCTRL_WMI_SET_WLAN_STATE:
-+            get_user(ar->arWlanState, (unsigned int *)userdata);
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+                break;
-+            }
-+
-+            if (ar->arWlanState == WLAN_ENABLED) {
-+                /* Enable foreground scanning */
-+                if (wmi_scanparams_cmd(ar->arWmi, scParams.fg_start_period,
-+                                       scParams.fg_end_period,
-+                                       scParams.bg_period,
-+                                       scParams.minact_chdwell_time,
-+                                       scParams.maxact_chdwell_time,
-+                                       scParams.pas_chdwell_time,
-+                                       scParams.shortScanRatio,
-+                                       scParams.scanCtrlFlags,
-+                                       scParams.max_dfsch_act_time) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+                if (ar->arSsidLen) {
-+                    ar->arConnectPending = TRUE;
-+                    if (wmi_connect_cmd(ar->arWmi, ar->arNetworkType,
-+                                        ar->arDot11AuthMode, ar->arAuthMode,
-+                                        ar->arPairwiseCrypto,
-+                                        ar->arPairwiseCryptoLen,
-+                                        ar->arGroupCrypto, ar->arGroupCryptoLen,
-+                                        ar->arSsidLen, ar->arSsid,
-+                                        ar->arReqBssid, ar->arChannelHint,
-+                                        ar->arConnectCtrlFlags) != A_OK)
-+                    {
-+                        ret = -EIO;
-+                        ar->arConnectPending = FALSE;
-+                    }
-+                }
-+            } else {
-+                /* Disconnect from the AP and disable foreground scanning */
-+                AR6000_SPIN_LOCK(&ar->arLock, 0);
-+                if (ar->arConnected == TRUE || ar->arConnectPending == TRUE) {
-+                    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+                    wmi_disconnect_cmd(ar->arWmi);
-+                } else {
-+                    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+                }
-+
-+                if (wmi_scanparams_cmd(ar->arWmi, 0xFFFF, 0, 0, 0, 0, 0, 0, 0xFF, 0) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        case AR6000_XIOCTL_WMI_GET_ROAM_DATA:
-+            ret = ar6000_ioctl_get_roam_data(dev, rq);
-+            break;
-+        case AR6000_XIOCTL_WMI_SET_BT_STATUS:
-+            ret = ar6000_xioctl_set_bt_status_cmd(dev, userdata);
-+            break;
-+        case AR6000_XIOCTL_WMI_SET_BT_PARAMS:
-+            ret = ar6000_xioctl_set_bt_params_cmd(dev, userdata);
-+            break;
-+        case AR6000_XIOCTL_WMI_STARTSCAN:
-+        {
-+            WMI_START_SCAN_CMD setStartScanCmd;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                    ret = -EIO;
-+                } else if (copy_from_user(&setStartScanCmd, userdata,
-+                                          sizeof(setStartScanCmd)))
-+                {
-+                    ret = -EFAULT;
-+                } else {
-+                    if (wmi_startscan_cmd(ar->arWmi, setStartScanCmd.scanType,
-+                                    setStartScanCmd.forceFgScan,
-+                                    setStartScanCmd.isLegacy,
-+                                    setStartScanCmd.homeDwellTime,
-+                                    setStartScanCmd.forceScanInterval) != A_OK)
-+                    {
-+                        ret = -EIO;
-+                    }
-+                }
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SETFIXRATES:
-+        {
-+            WMI_FIX_RATES_CMD setFixRatesCmd;
-+            A_STATUS returnStatus;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                    ret = -EIO;
-+                } else if (copy_from_user(&setFixRatesCmd, userdata,
-+                                          sizeof(setFixRatesCmd)))
-+                {
-+                    ret = -EFAULT;
-+                } else {
-+                    returnStatus = wmi_set_fixrates_cmd(ar->arWmi, setFixRatesCmd.fixRateMask);
-+                    if (returnStatus == A_EINVAL)
-+                    {
-+                        ret = -EINVAL;
-+                    }
-+                    else if(returnStatus != A_OK) {
-+                        ret = -EIO;
-+                    }
-+                }
-+            break;
-+        }
-+
-+        case AR6000_XIOCTL_WMI_GETFIXRATES:
-+        {
-+            WMI_FIX_RATES_CMD getFixRatesCmd;
-+            AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+            int ret = 0;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                return -EIO;
-+            }
-+
-+            if (down_interruptible(&ar->arSem)) {
-+                return -ERESTARTSYS;
-+            }
-+            /* Used copy_from_user/copy_to_user to access user space data */
-+            if (copy_from_user(&getFixRatesCmd, userdata, sizeof(getFixRatesCmd))) {
-+                ret = -EFAULT;
-+            } else {
-+                ar->arRateMask = 0xFFFF;
-+
-+                if (wmi_get_ratemask_cmd(ar->arWmi) != A_OK) {
-+                    up(&ar->arSem);
-+                    return -EIO;
-+                }
-+
-+                wait_event_interruptible_timeout(arEvent, ar->arRateMask != 0xFFFF, wmitimeout * HZ);
-+
-+                if (signal_pending(current)) {
-+                    ret = -EINTR;
-+                }
-+
-+                if (!ret) {
-+                    getFixRatesCmd.fixRateMask = ar->arRateMask;
-+                }
-+
-+                if(copy_to_user(userdata, &getFixRatesCmd, sizeof(getFixRatesCmd))) {
-+                   ret = -EFAULT;
-+                }
-+
-+                up(&ar->arSem);
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_AUTHMODE:
-+        {
-+            WMI_SET_AUTH_MODE_CMD setAuthMode;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&setAuthMode, userdata,
-+                                      sizeof(setAuthMode)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_set_authmode_cmd(ar->arWmi, setAuthMode.mode) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_REASSOCMODE:
-+        {
-+            WMI_SET_REASSOC_MODE_CMD setReassocMode;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&setReassocMode, userdata,
-+                                      sizeof(setReassocMode)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_set_reassocmode_cmd(ar->arWmi, setReassocMode.mode) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_DIAG_READ:
-+        {
-+            A_UINT32 addr, data;
-+            get_user(addr, (unsigned int *)userdata);
-+            if (ar6000_ReadRegDiag(ar->arHifDevice, &addr, &data) != A_OK) {
-+                ret = -EIO;
-+            }
-+            put_user(data, (unsigned int *)userdata + 1);
-+            break;
-+        }
-+        case AR6000_XIOCTL_DIAG_WRITE:
-+        {
-+            A_UINT32 addr, data;
-+            get_user(addr, (unsigned int *)userdata);
-+            get_user(data, (unsigned int *)userdata + 1);
-+            if (ar6000_WriteRegDiag(ar->arHifDevice, &addr, &data) != A_OK) {
-+                ret = -EIO;
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_KEEPALIVE:
-+        {
-+             WMI_SET_KEEPALIVE_CMD setKeepAlive;
-+             if (ar->arWmiReady == FALSE) {
-+                 return -EIO;
-+             } else if (copy_from_user(&setKeepAlive, userdata,
-+                        sizeof(setKeepAlive))){
-+                 ret = -EFAULT;
-+             } else {
-+                 if (wmi_set_keepalive_cmd(ar->arWmi, setKeepAlive.keepaliveInterval) != A_OK) {
-+                     ret = -EIO;
-+               }
-+             }
-+             break;
-+        }
-+        case AR6000_XIOCTL_WMI_GET_KEEPALIVE:
-+        {
-+            AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+            WMI_GET_KEEPALIVE_CMD getKeepAlive;
-+            int ret = 0;
-+            if (ar->arWmiReady == FALSE) {
-+               return -EIO;
-+            }
-+            if (down_interruptible(&ar->arSem)) {
-+                return -ERESTARTSYS;
-+            }
-+            if (copy_from_user(&getKeepAlive, userdata,sizeof(getKeepAlive))) {
-+               ret = -EFAULT;
-+            } else {
-+            getKeepAlive.keepaliveInterval = wmi_get_keepalive_cmd(ar->arWmi);
-+            ar->arKeepaliveConfigured = 0xFF;
-+            if (wmi_get_keepalive_configured(ar->arWmi) != A_OK){
-+                up(&ar->arSem);
-+                return -EIO;
-+            }
-+            wait_event_interruptible_timeout(arEvent, ar->arKeepaliveConfigured != 0xFF, wmitimeout * HZ);
-+            if (signal_pending(current)) {
-+                ret = -EINTR;
-+            }
-+
-+            if (!ret) {
-+                getKeepAlive.configured = ar->arKeepaliveConfigured;
-+            }
-+            if (copy_to_user(userdata, &getKeepAlive, sizeof(getKeepAlive))) {
-+               ret = -EFAULT;
-+            }
-+            up(&ar->arSem);
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_APPIE:
-+        {
-+            WMI_SET_APPIE_CMD appIEcmd;
-+            A_UINT8           appIeInfo[IEEE80211_APPIE_FRAME_MAX_LEN];
-+            A_UINT32            fType,ieLen;
-+
-+          if (ar->arWmiReady == FALSE) {
-+                  return -EIO;
-+          }
-+          get_user(fType, (A_UINT32 *)userdata);
-+          appIEcmd.mgmtFrmType = fType;
-+          if (appIEcmd.mgmtFrmType >= IEEE80211_APPIE_NUM_OF_FRAME) {
-+                  ret = -EIO;
-+          } else {
-+                  get_user(ieLen, (A_UINT32 *)(userdata + 4));
-+                  appIEcmd.ieLen = ieLen;
-+                  if (appIEcmd.ieLen > IEEE80211_APPIE_FRAME_MAX_LEN) {
-+                          ret = -EIO;
-+                          break;
-+                  }
-+                  if (copy_from_user(appIeInfo, userdata + 8, appIEcmd.ieLen)) {
-+                          ret = -EFAULT;
-+                  } else {
-+                          if (wmi_set_appie_cmd(ar->arWmi, appIEcmd.mgmtFrmType,
-+                                                appIEcmd.ieLen,  appIeInfo) != A_OK)
-+                          {
-+                                  ret = -EIO;
-+                          }
-+                  }
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_MGMT_FRM_RX_FILTER:
-+        {
-+            WMI_BSS_FILTER_CMD cmd;
-+            A_UINT32    filterType;
-+
-+            if (copy_from_user(&filterType, userdata, sizeof(A_UINT32)))
-+            {
-+                return -EFAULT;
-+            }
-+            if (filterType & (IEEE80211_FILTER_TYPE_BEACON |
-+                                    IEEE80211_FILTER_TYPE_PROBE_RESP))
-+            {
-+                cmd.bssFilter = ALL_BSS_FILTER;
-+            } else {
-+                cmd.bssFilter = NONE_BSS_FILTER;
-+            }
-+            if (wmi_bssfilter_cmd(ar->arWmi, cmd.bssFilter, 0) != A_OK) {
-+                ret = -EIO;
-+            }
-+
-+            AR6000_SPIN_LOCK(&ar->arLock, 0);
-+            ar->arMgmtFilter = filterType;
-+            AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_WSC_STATUS:
-+        {
-+            A_UINT32    wsc_status;
-+
-+            if (copy_from_user(&wsc_status, userdata, sizeof(A_UINT32)))
-+            {
-+                return -EFAULT;
-+            }
-+            if (wmi_set_wsc_status_cmd(ar->arWmi, wsc_status) != A_OK) {
-+                ret = -EIO;
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_BMI_ROMPATCH_INSTALL:
-+        {
-+            A_UINT32 ROM_addr;
-+            A_UINT32 RAM_addr;
-+            A_UINT32 nbytes;
-+            A_UINT32 do_activate;
-+            A_UINT32 rompatch_id;
-+
-+            get_user(ROM_addr, (A_UINT32 *)userdata);
-+            get_user(RAM_addr, (A_UINT32 *)userdata + 1);
-+            get_user(nbytes, (A_UINT32 *)userdata + 2);
-+            get_user(do_activate, (A_UINT32 *)userdata + 3);
-+            AR_DEBUG_PRINTF("Install rompatch from ROM: 0x%x to RAM: 0x%x  length: %d\n",
-+                             ROM_addr, RAM_addr, nbytes);
-+            ret = BMIrompatchInstall(hifDevice, ROM_addr, RAM_addr,
-+                                        nbytes, do_activate, &rompatch_id);
-+            if (ret == A_OK) {
-+                put_user(rompatch_id, (unsigned int *)rq->ifr_data); /* return value */
-+            }
-+            break;
-+        }
-+
-+        case AR6000_XIOCTL_BMI_ROMPATCH_UNINSTALL:
-+        {
-+            A_UINT32 rompatch_id;
-+
-+            get_user(rompatch_id, (A_UINT32 *)userdata);
-+            AR_DEBUG_PRINTF("UNinstall rompatch_id %d\n", rompatch_id);
-+            ret = BMIrompatchUninstall(hifDevice, rompatch_id);
-+            break;
-+        }
-+
-+        case AR6000_XIOCTL_BMI_ROMPATCH_ACTIVATE:
-+        case AR6000_XIOCTL_BMI_ROMPATCH_DEACTIVATE:
-+        {
-+            A_UINT32 rompatch_count;
-+
-+            get_user(rompatch_count, (A_UINT32 *)userdata);
-+            AR_DEBUG_PRINTF("Change rompatch activation count=%d\n", rompatch_count);
-+            length = sizeof(A_UINT32) * rompatch_count;
-+            if ((buffer = (unsigned char *)A_MALLOC(length)) != NULL) {
-+                A_MEMZERO(buffer, length);
-+                if (copy_from_user(buffer, &userdata[sizeof(rompatch_count)], length))
-+                {
-+                    ret = -EFAULT;
-+                } else {
-+                    if (cmd == AR6000_XIOCTL_BMI_ROMPATCH_ACTIVATE) {
-+                        ret = BMIrompatchActivate(hifDevice, rompatch_count, (A_UINT32 *)buffer);
-+                    } else {
-+                        ret = BMIrompatchDeactivate(hifDevice, rompatch_count, (A_UINT32 *)buffer);
-+                    }
-+                }
-+                A_FREE(buffer);
-+            } else {
-+                ret = -ENOMEM;
-+            }
-+
-+            break;
-+        }
-+
-+        case AR6000_XIOCTL_WMI_SET_HOST_SLEEP_MODE:
-+        {
-+            WMI_SET_HOST_SLEEP_MODE_CMD setHostSleepMode;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&setHostSleepMode, userdata,
-+                                      sizeof(setHostSleepMode)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_set_host_sleep_mode_cmd(ar->arWmi,
-+                                &setHostSleepMode) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_WOW_MODE:
-+        {
-+            WMI_SET_WOW_MODE_CMD setWowMode;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&setWowMode, userdata,
-+                                      sizeof(setWowMode)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_set_wow_mode_cmd(ar->arWmi,
-+                                &setWowMode) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_GET_WOW_LIST:
-+        {
-+            WMI_GET_WOW_LIST_CMD getWowList;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&getWowList, userdata,
-+                                      sizeof(getWowList)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_get_wow_list_cmd(ar->arWmi,
-+                                &getWowList) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_ADD_WOW_PATTERN:
-+        {
-+#define WOW_PATTERN_SIZE 64
-+#define WOW_MASK_SIZE 64
-+
-+            WMI_ADD_WOW_PATTERN_CMD cmd;
-+            A_UINT8 mask_data[WOW_PATTERN_SIZE]={0};
-+            A_UINT8 pattern_data[WOW_PATTERN_SIZE]={0};
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else {
-+
-+                if(copy_from_user(&cmd, userdata,
-+                            sizeof(WMI_ADD_WOW_PATTERN_CMD)))
-+                      return -EFAULT;
-+                if (copy_from_user(pattern_data,
-+                                      userdata + 3,
-+                                      cmd.filter_size)){
-+                        ret = -EFAULT;
-+                        break;
-+                }
-+                if (copy_from_user(mask_data,
-+                                      (userdata + 3 + cmd.filter_size),
-+                                      cmd.filter_size)){
-+                        ret = -EFAULT;
-+                        break;
-+                } else {
-+                    if (wmi_add_wow_pattern_cmd(ar->arWmi,
-+                                &cmd, pattern_data, mask_data, cmd.filter_size) != A_OK){
-+                        ret = -EIO;
-+                    }
-+                }
-+            }
-+#undef WOW_PATTERN_SIZE
-+#undef WOW_MASK_SIZE
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_DEL_WOW_PATTERN:
-+        {
-+            WMI_DEL_WOW_PATTERN_CMD delWowPattern;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&delWowPattern, userdata,
-+                                      sizeof(delWowPattern)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_del_wow_pattern_cmd(ar->arWmi,
-+                                &delWowPattern) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_DUMP_HTC_CREDIT_STATE:
-+            if (ar->arHtcTarget != NULL) {
-+                HTCDumpCreditStates(ar->arHtcTarget);
-+            }
-+            break;
-+        case AR6000_XIOCTL_TRAFFIC_ACTIVITY_CHANGE:
-+            if (ar->arHtcTarget != NULL) {
-+                struct ar6000_traffic_activity_change data;
-+
-+                if (copy_from_user(&data, userdata, sizeof(data)))
-+                {
-+                    return -EFAULT;
-+                }
-+                    /* note, this is used for testing (mbox ping testing), indicate activity
-+                     * change using the stream ID as the traffic class */
-+                ar6000_indicate_tx_activity(ar,
-+                                            (A_UINT8)data.StreamID,
-+                                            data.Active ? TRUE : FALSE);
-+            }
-+            break;
-+        case AR6000_XIOCTL_WMI_SET_CONNECT_CTRL_FLAGS:
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&connectCtrlFlags, userdata,
-+                                      sizeof(connectCtrlFlags)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                ar->arConnectCtrlFlags = connectCtrlFlags;
-+            }
-+            break;
-+        case AR6000_XIOCTL_WMI_SET_AKMP_PARAMS:
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&akmpParams, userdata,
-+                                      sizeof(WMI_SET_AKMP_PARAMS_CMD)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_set_akmp_params_cmd(ar->arWmi, &akmpParams) != A_OK) {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        case AR6000_XIOCTL_WMI_SET_PMKID_LIST:
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else {
-+                if (copy_from_user(&pmkidInfo.numPMKID, userdata,
-+                                      sizeof(pmkidInfo.numPMKID)))
-+                {
-+                    ret = -EFAULT;
-+                    break;
-+                }
-+                if (copy_from_user(&pmkidInfo.pmkidList,
-+                                   userdata + sizeof(pmkidInfo.numPMKID),
-+                                   pmkidInfo.numPMKID * sizeof(WMI_PMKID)))
-+                {
-+                    ret = -EFAULT;
-+                    break;
-+                }
-+                if (wmi_set_pmkid_list_cmd(ar->arWmi, &pmkidInfo) != A_OK) {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        case AR6000_XIOCTL_WMI_GET_PMKID_LIST:
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else  {
-+                if (wmi_get_pmkid_list_cmd(ar->arWmi) != A_OK) {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        default:
-+            ret = -EOPNOTSUPP;
-+    }
-+    return ret;
-+}
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c b/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c
-new file mode 100644
-index 0000000..97b273b
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c
-@@ -0,0 +1,225 @@
-+
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+#include <linux/kernel.h>
-+#include <linux/skbuff.h>
-+#include <a_config.h>
-+#include "athdefs.h"
-+#include "a_types.h"
-+#include "a_osapi.h"
-+#include "htc_packet.h"
-+
-+#define AR6000_DATA_OFFSET    64
-+
-+void a_netbuf_enqueue(A_NETBUF_QUEUE_T *q, void *pkt)
-+{
-+    skb_queue_tail((struct sk_buff_head *) q, (struct sk_buff *) pkt);
-+}
-+
-+void a_netbuf_prequeue(A_NETBUF_QUEUE_T *q, void *pkt)
-+{
-+    skb_queue_head((struct sk_buff_head *) q, (struct sk_buff *) pkt);
-+}
-+
-+void *a_netbuf_dequeue(A_NETBUF_QUEUE_T *q)
-+{
-+    return((void *) skb_dequeue((struct sk_buff_head *) q));
-+}
-+
-+int a_netbuf_queue_size(A_NETBUF_QUEUE_T *q)
-+{
-+    return(skb_queue_len((struct sk_buff_head *) q));
-+}
-+
-+int a_netbuf_queue_empty(A_NETBUF_QUEUE_T *q)
-+{
-+    return(skb_queue_empty((struct sk_buff_head *) q));
-+}
-+
-+void a_netbuf_queue_init(A_NETBUF_QUEUE_T *q)
-+{
-+    skb_queue_head_init((struct sk_buff_head *) q);
-+}
-+
-+void *
-+a_netbuf_alloc(int size)
-+{
-+    struct sk_buff *skb;
-+    skb = dev_alloc_skb(AR6000_DATA_OFFSET + sizeof(HTC_PACKET) + size);
-+    skb_reserve(skb, AR6000_DATA_OFFSET + sizeof(HTC_PACKET));
-+    return ((void *)skb);
-+}
-+
-+/*
-+ * Allocate an SKB w.o. any encapsulation requirement.
-+ */
-+void *
-+a_netbuf_alloc_raw(int size)
-+{
-+    struct sk_buff *skb;
-+
-+    skb = dev_alloc_skb(size);
-+
-+    return ((void *)skb);
-+}
-+
-+void
-+a_netbuf_free(void *bufPtr)
-+{
-+    struct sk_buff *skb = (struct sk_buff *)bufPtr;
-+
-+    dev_kfree_skb(skb);
-+}
-+
-+A_UINT32
-+a_netbuf_to_len(void *bufPtr)
-+{
-+    return (((struct sk_buff *)bufPtr)->len);
-+}
-+
-+void *
-+a_netbuf_to_data(void *bufPtr)
-+{
-+    return (((struct sk_buff *)bufPtr)->data);
-+}
-+
-+/*
-+ * Add len # of bytes to the beginning of the network buffer
-+ * pointed to by bufPtr
-+ */
-+A_STATUS
-+a_netbuf_push(void *bufPtr, A_INT32 len)
-+{
-+    skb_push((struct sk_buff *)bufPtr, len);
-+
-+    return A_OK;
-+}
-+
-+/*
-+ * Add len # of bytes to the beginning of the network buffer
-+ * pointed to by bufPtr and also fill with data
-+ */
-+A_STATUS
-+a_netbuf_push_data(void *bufPtr, char *srcPtr, A_INT32 len)
-+{
-+    skb_push((struct sk_buff *) bufPtr, len);
-+    A_MEMCPY(((struct sk_buff *)bufPtr)->data, srcPtr, len);
-+
-+    return A_OK;
-+}
-+
-+/*
-+ * Add len # of bytes to the end of the network buffer
-+ * pointed to by bufPtr
-+ */
-+A_STATUS
-+a_netbuf_put(void *bufPtr, A_INT32 len)
-+{
-+    skb_put((struct sk_buff *)bufPtr, len);
-+
-+    return A_OK;
-+}
-+
-+/*
-+ * Add len # of bytes to the end of the network buffer
-+ * pointed to by bufPtr and also fill with data
-+ */
-+A_STATUS
-+a_netbuf_put_data(void *bufPtr, char *srcPtr, A_INT32 len)
-+{
-+    char *start = ((struct sk_buff *)bufPtr)->data +
-+        ((struct sk_buff *)bufPtr)->len;
-+    skb_put((struct sk_buff *)bufPtr, len);
-+    A_MEMCPY(start, srcPtr, len);
-+
-+    return A_OK;
-+}
-+
-+
-+/*
-+ * Trim the network buffer pointed to by bufPtr to len # of bytes
-+ */
-+A_STATUS
-+a_netbuf_setlen(void *bufPtr, A_INT32 len)
-+{
-+    skb_trim((struct sk_buff *)bufPtr, len);
-+
-+    return A_OK;
-+}
-+
-+/*
-+ * Chop of len # of bytes from the end of the buffer.
-+ */
-+A_STATUS
-+a_netbuf_trim(void *bufPtr, A_INT32 len)
-+{
-+    skb_trim((struct sk_buff *)bufPtr, ((struct sk_buff *)bufPtr)->len - len);
-+
-+    return A_OK;
-+}
-+
-+/*
-+ * Chop of len # of bytes from the end of the buffer and return the data.
-+ */
-+A_STATUS
-+a_netbuf_trim_data(void *bufPtr, char *dstPtr, A_INT32 len)
-+{
-+    char *start = ((struct sk_buff *)bufPtr)->data +
-+        (((struct sk_buff *)bufPtr)->len - len);
-+
-+    A_MEMCPY(dstPtr, start, len);
-+    skb_trim((struct sk_buff *)bufPtr, ((struct sk_buff *)bufPtr)->len - len);
-+
-+    return A_OK;
-+}
-+
-+
-+/*
-+ * Returns the number of bytes available to a a_netbuf_push()
-+ */
-+A_INT32
-+a_netbuf_headroom(void *bufPtr)
-+{
-+    return (skb_headroom((struct sk_buff *)bufPtr));
-+}
-+
-+/*
-+ * Removes specified number of bytes from the beginning of the buffer
-+ */
-+A_STATUS
-+a_netbuf_pull(void *bufPtr, A_INT32 len)
-+{
-+    skb_pull((struct sk_buff *)bufPtr, len);
-+
-+    return A_OK;
-+}
-+
-+/*
-+ * Removes specified number of bytes from the beginning of the buffer
-+ * and return the data
-+ */
-+A_STATUS
-+a_netbuf_pull_data(void *bufPtr, char *dstPtr, A_INT32 len)
-+{
-+    A_MEMCPY(dstPtr, ((struct sk_buff *)bufPtr)->data, len);
-+    skb_pull((struct sk_buff *)bufPtr, len);
-+
-+    return A_OK;
-+}
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h b/drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h
-new file mode 100644
-index 0000000..5b64212
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h
-@@ -0,0 +1,319 @@
-+/*
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/os/linux/include/osapi_linux.h#1 $
-+ *
-+ * This file contains the definitions of the basic atheros data types.
-+ * It is used to map the data types in atheros files to a platform specific
-+ * type.
-+ *
-+ * Copyright 2003-2005 Atheros Communications, 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef _OSAPI_LINUX_H_
-+#define _OSAPI_LINUX_H_
-+
-+#ifdef __KERNEL__
-+
-+#include <linux/version.h>
-+#include <linux/types.h>
-+#include <linux/kernel.h>
-+#include <linux/string.h>
-+#include <linux/skbuff.h>
-+#include <linux/netdevice.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#include <linux/jiffies.h>
-+#endif
-+#include <linux/timer.h>
-+#include <linux/delay.h>
-+#include <linux/wait.h>
-+#ifdef KERNEL_2_4
-+#include <asm/arch/irq.h>
-+#include <asm/irq.h>
-+#endif
-+
-+#ifdef __GNUC__
-+#define __ATTRIB_PACK           __attribute__ ((packed))
-+#define __ATTRIB_PRINTF         __attribute__ ((format (printf, 1, 2)))
-+#define __ATTRIB_NORETURN       __attribute__ ((noreturn))
-+#ifndef INLINE
-+#define INLINE                  __inline__
-+#endif
-+#else /* Not GCC */
-+#define __ATTRIB_PACK
-+#define __ATTRIB_PRINTF
-+#define __ATTRIB_NORETURN
-+#ifndef INLINE
-+#define INLINE                  __inline
-+#endif
-+#endif /* End __GNUC__ */
-+
-+#define PREPACK
-+#define POSTPACK                __ATTRIB_PACK
-+
-+/*
-+ * Endianes macros
-+ */
-+#define A_BE2CPU8(x)       ntohb(x)
-+#define A_BE2CPU16(x)      ntohs(x)
-+#define A_BE2CPU32(x)      ntohl(x)
-+
-+#define A_LE2CPU8(x)       (x)
-+#define A_LE2CPU16(x)      (x)
-+#define A_LE2CPU32(x)      (x)
-+
-+#define A_CPU2BE8(x)       htonb(x)
-+#define A_CPU2BE16(x)      htons(x)
-+#define A_CPU2BE32(x)      htonl(x)
-+
-+#define A_MEMCPY(dst, src, len)         memcpy((A_UINT8 *)(dst), (src), (len))
-+#define A_MEMZERO(addr, len)            memset(addr, 0, len)
-+#define A_MEMCMP(addr1, addr2, len)     memcmp((addr1), (addr2), (len))
-+#define A_MALLOC(size)                  kmalloc((size), GFP_KERNEL)
-+#define A_MALLOC_NOWAIT(size)           kmalloc((size), GFP_ATOMIC)
-+#define A_FREE(addr)                    kfree(addr)
-+#define A_PRINTF(args...)               printk(args)
-+
-+/* Mutual Exclusion */
-+typedef spinlock_t                      A_MUTEX_T;
-+#define A_MUTEX_INIT(mutex)             spin_lock_init(mutex)
-+#define A_MUTEX_LOCK(mutex)             spin_lock_bh(mutex)
-+#define A_MUTEX_UNLOCK(mutex)           spin_unlock_bh(mutex)
-+#define A_IS_MUTEX_VALID(mutex)         TRUE  /* okay to return true, since A_MUTEX_DELETE does nothing */
-+#define A_MUTEX_DELETE(mutex)           /* spin locks are not kernel resources so nothing to free.. */
-+
-+/* Get current time in ms adding a constant offset (in ms) */
-+#define A_GET_MS(offset)    \
-+      (jiffies + ((offset) / 1000) * HZ)
-+
-+/*
-+ * Timer Functions
-+ */
-+#define A_MDELAY(msecs)                 mdelay(msecs)
-+typedef struct timer_list               A_TIMER;
-+
-+#define A_INIT_TIMER(pTimer, pFunction, pArg) do {              \
-+    init_timer(pTimer);                                         \
-+    (pTimer)->function = (pFunction);                           \
-+    (pTimer)->data   = (unsigned long)(pArg);                   \
-+} while (0)
-+
-+/*
-+ * Start a Timer that elapses after 'periodMSec' milli-seconds
-+ * Support is provided for a one-shot timer. The 'repeatFlag' is
-+ * ignored.
-+ */
-+#define A_TIMEOUT_MS(pTimer, periodMSec, repeatFlag) do {                   \
-+    if (repeatFlag) {                                                       \
-+        printk("\n" __FILE__ ":%d: Timer Repeat requested\n",__LINE__);     \
-+        panic("Timer Repeat");                                              \
-+    }                                                                       \
-+    mod_timer((pTimer), jiffies + HZ * (periodMSec) / 1000);                \
-+} while (0)
-+
-+/*
-+ * Cancel the Timer.
-+ */
-+#define A_UNTIMEOUT(pTimer) do {                                \
-+    del_timer((pTimer));                                        \
-+} while (0)
-+
-+#define A_DELETE_TIMER(pTimer) do {                             \
-+} while (0)
-+
-+/*
-+ * Wait Queue related functions
-+ */
-+typedef wait_queue_head_t               A_WAITQUEUE_HEAD;
-+#define A_INIT_WAITQUEUE_HEAD(head)     init_waitqueue_head(head)
-+#ifndef wait_event_interruptible_timeout
-+#define __wait_event_interruptible_timeout(wq, condition, ret)          \
-+do {                                                                    \
-+        wait_queue_t __wait;                                            \
-+        init_waitqueue_entry(&__wait, current);                         \
-+                                                                        \
-+        add_wait_queue(&wq, &__wait);                                   \
-+        for (;;) {                                                      \
-+                set_current_state(TASK_INTERRUPTIBLE);                  \
-+                if (condition)                                          \
-+                        break;                                          \
-+                if (!signal_pending(current)) {                         \
-+                        ret = schedule_timeout(ret);                    \
-+                        if (!ret)                                       \
-+                                break;                                  \
-+                        continue;                                       \
-+                }                                                       \
-+                ret = -ERESTARTSYS;                                     \
-+                break;                                                  \
-+        }                                                               \
-+        current->state = TASK_RUNNING;                                  \
-+        remove_wait_queue(&wq, &__wait);                                \
-+} while (0)
-+
-+#define wait_event_interruptible_timeout(wq, condition, timeout)        \
-+({                                                                      \
-+        long __ret = timeout;                                           \
-+        if (!(condition))                                               \
-+                __wait_event_interruptible_timeout(wq, condition, __ret); \
-+        __ret;                                                          \
-+})
-+#endif /* wait_event_interruptible_timeout */
-+
-+#define A_WAIT_EVENT_INTERRUPTIBLE_TIMEOUT(head, condition, timeout) do { \
-+    wait_event_interruptible_timeout(head, condition, timeout); \
-+} while (0)
-+
-+#define A_WAKE_UP(head)                 wake_up(head)
-+
-+#ifdef DEBUG
-+#define A_ASSERT(expr)  \
-+    if (!(expr)) {   \
-+        printk(KERN_ALERT "\n" __FILE__ ":%d: Assertion " #expr " failed!\n",__LINE__); \
-+        panic(#expr); \
-+    }
-+
-+#else
-+#define A_ASSERT(expr)
-+#endif /* DEBUG */
-+
-+/*
-+ * Initialization of the network buffer subsystem
-+ */
-+#define A_NETBUF_INIT()
-+
-+/*
-+ * Network buffer queue support
-+ */
-+typedef struct sk_buff_head A_NETBUF_QUEUE_T;
-+
-+#define A_NETBUF_QUEUE_INIT(q)  \
-+    a_netbuf_queue_init(q)
-+
-+#define A_NETBUF_ENQUEUE(q, pkt) \
-+    a_netbuf_enqueue((q), (pkt))
-+#define A_NETBUF_PREQUEUE(q, pkt) \
-+    a_netbuf_prequeue((q), (pkt))
-+#define A_NETBUF_DEQUEUE(q) \
-+    (a_netbuf_dequeue(q))
-+#define A_NETBUF_QUEUE_SIZE(q)  \
-+    a_netbuf_queue_size(q)
-+#define A_NETBUF_QUEUE_EMPTY(q) \
-+    a_netbuf_queue_empty(q)
-+
-+/*
-+ * Network buffer support
-+ */
-+#define A_NETBUF_ALLOC(size) \
-+    a_netbuf_alloc(size)
-+#define A_NETBUF_ALLOC_RAW(size) \
-+    a_netbuf_alloc_raw(size)
-+#define A_NETBUF_FREE(bufPtr) \
-+    a_netbuf_free(bufPtr)
-+#define A_NETBUF_DATA(bufPtr) \
-+    a_netbuf_to_data(bufPtr)
-+#define A_NETBUF_LEN(bufPtr) \
-+    a_netbuf_to_len(bufPtr)
-+#define A_NETBUF_PUSH(bufPtr, len) \
-+    a_netbuf_push(bufPtr, len)
-+#define A_NETBUF_PUT(bufPtr, len) \
-+    a_netbuf_put(bufPtr, len)
-+#define A_NETBUF_TRIM(bufPtr,len) \
-+    a_netbuf_trim(bufPtr, len)
-+#define A_NETBUF_PULL(bufPtr, len) \
-+    a_netbuf_pull(bufPtr, len)
-+#define A_NETBUF_HEADROOM(bufPtr)\
-+    a_netbuf_headroom(bufPtr)
-+#define A_NETBUF_SETLEN(bufPtr,len) \
-+    a_netbuf_setlen(bufPtr, len)
-+
-+/* Add data to end of a buffer  */
-+#define A_NETBUF_PUT_DATA(bufPtr, srcPtr,  len) \
-+    a_netbuf_put_data(bufPtr, srcPtr, len)
-+
-+/* Add data to start of the  buffer */
-+#define A_NETBUF_PUSH_DATA(bufPtr, srcPtr,  len) \
-+    a_netbuf_push_data(bufPtr, srcPtr, len)
-+
-+/* Remove data at start of the buffer */
-+#define A_NETBUF_PULL_DATA(bufPtr, dstPtr, len) \
-+    a_netbuf_pull_data(bufPtr, dstPtr, len)
-+
-+/* Remove data from the end of the buffer */
-+#define A_NETBUF_TRIM_DATA(bufPtr, dstPtr, len) \
-+    a_netbuf_trim_data(bufPtr, dstPtr, len)
-+
-+/* View data as "size" contiguous bytes of type "t" */
-+#define A_NETBUF_VIEW_DATA(bufPtr, t, size) \
-+    (t )( ((struct skbuf *)(bufPtr))->data)
-+
-+/* return the beginning of the headroom for the buffer */
-+#define A_NETBUF_HEAD(bufPtr) \
-+        ((((struct sk_buff *)(bufPtr))->head))
-+
-+/*
-+ * OS specific network buffer access routines
-+ */
-+void *a_netbuf_alloc(int size);
-+void *a_netbuf_alloc_raw(int size);
-+void a_netbuf_free(void *bufPtr);
-+void *a_netbuf_to_data(void *bufPtr);
-+A_UINT32 a_netbuf_to_len(void *bufPtr);
-+A_STATUS a_netbuf_push(void *bufPtr, A_INT32 len);
-+A_STATUS a_netbuf_push_data(void *bufPtr, char *srcPtr, A_INT32 len);
-+A_STATUS a_netbuf_put(void *bufPtr, A_INT32 len);
-+A_STATUS a_netbuf_put_data(void *bufPtr, char *srcPtr, A_INT32 len);
-+A_STATUS a_netbuf_pull(void *bufPtr, A_INT32 len);
-+A_STATUS a_netbuf_pull_data(void *bufPtr, char *dstPtr, A_INT32 len);
-+A_STATUS a_netbuf_trim(void *bufPtr, A_INT32 len);
-+A_STATUS a_netbuf_trim_data(void *bufPtr, char *dstPtr, A_INT32 len);
-+A_STATUS a_netbuf_setlen(void *bufPtr, A_INT32 len);
-+A_INT32 a_netbuf_headroom(void *bufPtr);
-+void a_netbuf_enqueue(A_NETBUF_QUEUE_T *q, void *pkt);
-+void a_netbuf_prequeue(A_NETBUF_QUEUE_T *q, void *pkt);
-+void *a_netbuf_dequeue(A_NETBUF_QUEUE_T *q);
-+int a_netbuf_queue_size(A_NETBUF_QUEUE_T *q);
-+int a_netbuf_queue_empty(A_NETBUF_QUEUE_T *q);
-+int a_netbuf_queue_empty(A_NETBUF_QUEUE_T *q);
-+void a_netbuf_queue_init(A_NETBUF_QUEUE_T *q);
-+
-+/*
-+ * Kernel v.s User space functions
-+ */
-+A_UINT32 a_copy_to_user(void *to, const void *from, A_UINT32 n);
-+A_UINT32 a_copy_from_user(void *to, const void *from, A_UINT32 n);
-+
-+#else /* __KERNEL__ */
-+
-+#ifdef __GNUC__
-+#define __ATTRIB_PACK           __attribute__ ((packed))
-+#define __ATTRIB_PRINTF         __attribute__ ((format (printf, 1, 2)))
-+#define __ATTRIB_NORETURN       __attribute__ ((noreturn))
-+#ifndef INLINE
-+#define INLINE                  __inline__
-+#endif
-+#else /* Not GCC */
-+#define __ATTRIB_PACK
-+#define __ATTRIB_PRINTF
-+#define __ATTRIB_NORETURN
-+#ifndef INLINE
-+#define INLINE                  __inline
-+#endif
-+#endif /* End __GNUC__ */
-+
-+#define PREPACK
-+#define POSTPACK                __ATTRIB_PACK
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _OSAPI_LINUX_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c b/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
-new file mode 100644
-index 0000000..d775e4d
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
-@@ -0,0 +1,1946 @@
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "ar6000_drv.h"
-+
-+static A_UINT8 bcast_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-+static void ar6000_set_quality(struct iw_quality *iq, A_INT8 rssi);
-+extern unsigned int wmitimeout;
-+extern A_WAITQUEUE_HEAD arEvent;
-+extern wait_queue_head_t ar6000_scan_queue;
-+
-+/*
-+ * Encode a WPA or RSN information element as a custom
-+ * element using the hostap format.
-+ */
-+static u_int
-+encode_ie(void *buf, size_t bufsize,
-+    const u_int8_t *ie, size_t ielen,
-+    const char *leader, size_t leader_len)
-+{
-+    u_int8_t *p;
-+    int i;
-+
-+    if (bufsize < leader_len)
-+        return 0;
-+    p = buf;
-+    memcpy(p, leader, leader_len);
-+    bufsize -= leader_len;
-+    p += leader_len;
-+    for (i = 0; i < ielen && bufsize > 2; i++)
-+        p += sprintf(p, "%02x", ie[i]);
-+    return (i == ielen ? p - (u_int8_t *)buf : 0);
-+}
-+
-+void
-+ar6000_scan_node(void *arg, bss_t *ni)
-+{
-+    struct iw_event iwe;
-+#if WIRELESS_EXT > 14
-+    char buf[64*2 + 30];
-+#endif
-+    struct ar_giwscan_param *param;
-+    A_CHAR *current_ev;
-+    A_CHAR *end_buf;
-+    struct ieee80211_common_ie  *cie;
-+
-+    param = (struct ar_giwscan_param *)arg;
-+
-+    if (param->current_ev >= param->end_buf) {
-+        return;
-+    }
-+    if ((param->firstPass == TRUE) &&
-+        ((ni->ni_cie.ie_wpa == NULL) && (ni->ni_cie.ie_rsn == NULL))) {
-+        /*
-+         * Only forward wpa bss's in first pass
-+         */
-+        return;
-+    }
-+
-+     if ((param->firstPass == FALSE) &&
-+        ((ni->ni_cie.ie_wpa != NULL) || (ni->ni_cie.ie_rsn != NULL))) {
-+        /*
-+         * Only forward non-wpa bss's in 2nd pass
-+         */
-+        return;
-+    }
-+
-+    current_ev = param->current_ev;
-+    end_buf = param->end_buf;
-+
-+    cie = &ni->ni_cie;
-+
-+    A_MEMZERO(&iwe, sizeof(iwe));
-+    iwe.cmd = SIOCGIWAP;
-+    iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
-+    A_MEMCPY(iwe.u.ap_addr.sa_data, ni->ni_macaddr, 6);
-+    current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
-+                                      IW_EV_ADDR_LEN);
-+
-+    A_MEMZERO(&iwe, sizeof(iwe));
-+    iwe.cmd = SIOCGIWESSID;
-+    iwe.u.data.flags = 1;
-+    iwe.u.data.length = cie->ie_ssid[1];
-+    current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
-+                                      &cie->ie_ssid[2]);
-+
-+    if (cie->ie_capInfo & (IEEE80211_CAPINFO_ESS|IEEE80211_CAPINFO_IBSS)) {
-+        A_MEMZERO(&iwe, sizeof(iwe));
-+        iwe.cmd = SIOCGIWMODE;
-+        iwe.u.mode = cie->ie_capInfo & IEEE80211_CAPINFO_ESS ?
-+                IW_MODE_MASTER : IW_MODE_ADHOC;
-+        current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
-+                                          IW_EV_UINT_LEN);
-+    }
-+
-+    A_MEMZERO(&iwe, sizeof(iwe));
-+    iwe.cmd = SIOCGIWFREQ;
-+    iwe.u.freq.m = cie->ie_chan * 100000;
-+    iwe.u.freq.e = 1;
-+    current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
-+                                      IW_EV_FREQ_LEN);
-+
-+    A_MEMZERO(&iwe, sizeof(iwe));
-+    iwe.cmd = IWEVQUAL;
-+    ar6000_set_quality(&iwe.u.qual, ni->ni_snr);
-+    current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
-+                                      IW_EV_QUAL_LEN);
-+
-+    A_MEMZERO(&iwe, sizeof(iwe));
-+    iwe.cmd = SIOCGIWENCODE;
-+    if (cie->ie_capInfo & IEEE80211_CAPINFO_PRIVACY) {
-+        iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
-+    } else {
-+        iwe.u.data.flags = IW_ENCODE_DISABLED;
-+    }
-+    iwe.u.data.length = 0;
-+    current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, "");
-+
-+    A_MEMZERO(&iwe, sizeof(iwe));
-+    iwe.cmd = IWEVCUSTOM;
-+    snprintf(buf, sizeof(buf), "bcn_int=%d", cie->ie_beaconInt);
-+    iwe.u.data.length = strlen(buf);
-+    current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, buf);
-+
-+    if (cie->ie_wpa != NULL) {
-+        static const char wpa_leader[] = "wpa_ie=";
-+
-+        A_MEMZERO(&iwe, sizeof(iwe));
-+        iwe.cmd = IWEVCUSTOM;
-+        iwe.u.data.length = encode_ie(buf, sizeof(buf), cie->ie_wpa,
-+                                      cie->ie_wpa[1]+2,
-+                                      wpa_leader, sizeof(wpa_leader)-1);
-+
-+        if (iwe.u.data.length != 0) {
-+            current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, buf);
-+        }
-+    }
-+
-+    if (cie->ie_rsn != NULL && cie->ie_rsn[0] == IEEE80211_ELEMID_RSN) {
-+        static const char rsn_leader[] = "rsn_ie=";
-+
-+        A_MEMZERO(&iwe, sizeof(iwe));
-+        iwe.cmd = IWEVCUSTOM;
-+        iwe.u.data.length = encode_ie(buf, sizeof(buf), cie->ie_rsn,
-+                                      cie->ie_rsn[1]+2,
-+                                      rsn_leader, sizeof(rsn_leader)-1);
-+
-+        if (iwe.u.data.length != 0) {
-+            current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, buf);
-+        }
-+    }
-+
-+    if (cie->ie_wmm != NULL) {
-+        static const char wmm_leader[] = "wmm_ie=";
-+
-+        A_MEMZERO(&iwe, sizeof(iwe));
-+        iwe.cmd = IWEVCUSTOM;
-+        iwe.u.data.length = encode_ie(buf, sizeof(buf), cie->ie_wmm,
-+                                      cie->ie_wmm[1]+2,
-+                                      wmm_leader, sizeof(wmm_leader)-1);
-+        if (iwe.u.data.length != 0) {
-+            current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, buf);
-+        }
-+    }
-+
-+    if (cie->ie_ath != NULL) {
-+        static const char ath_leader[] = "ath_ie=";
-+
-+        A_MEMZERO(&iwe, sizeof(iwe));
-+        iwe.cmd = IWEVCUSTOM;
-+        iwe.u.data.length = encode_ie(buf, sizeof(buf), cie->ie_ath,
-+                                      cie->ie_ath[1]+2,
-+                                      ath_leader, sizeof(ath_leader)-1);
-+        if (iwe.u.data.length != 0) {
-+            current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, buf);
-+        }
-+    }
-+
-+    param->current_ev = current_ev;
-+}
-+
-+int
-+ar6000_ioctl_giwscan(struct net_device *dev,
-+            struct iw_request_info *info,
-+            struct iw_point *data, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    struct ar_giwscan_param param;
-+    int i;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    param.current_ev = extra;
-+    param.end_buf = extra + IW_SCAN_MAX_DATA;
-+    param.firstPass = TRUE;
-+
-+    /*
-+     * Do two passes to insure WPA scan candidates
-+     * are sorted to the front.  This is a hack to deal with
-+     * the wireless extensions capping scan results at
-+     * IW_SCAN_MAX_DATA bytes.  In densely populated environments
-+     * it's easy to overflow this buffer (especially with WPA/RSN
-+     * information elements).  Note this sorting hack does not
-+     * guarantee we won't overflow anyway.
-+     */
-+    for (i = 0; i < 2; i++) {
-+        /*
-+         * Translate data to WE format.
-+         */
-+        wmi_iterate_nodes(ar->arWmi, ar6000_scan_node, &param);
-+        param.firstPass = FALSE;
-+        if (param.current_ev >= param.end_buf) {
-+            data->length = param.current_ev - extra;
-+            return -E2BIG;
-+        }
-+    }
-+
-+    if(!(data->length = param.current_ev - extra)) {
-+          printk("%s(): data length %d\n", __FUNCTION__, data->length);
-+          return -EAGAIN;
-+    }
-+    return 0;
-+}
-+
-+extern int reconnect_flag;
-+/* SIOCSIWESSID */
-+static int
-+ar6000_ioctl_siwessid(struct net_device *dev,
-+                     struct iw_request_info *info,
-+                     struct iw_point *data, char *ssid)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    A_STATUS status;
-+    A_UINT8     arNetworkType;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    /*
-+     * iwconfig passes a null terminated string with length including this
-+     * so we need to account for this
-+     */
-+    if (data->flags && (!data->length || (data->length == 1) ||
-+        ((data->length - 1) > sizeof(ar->arSsid))))
-+    {
-+        /*
-+         * ssid is invalid
-+         */
-+        return -EINVAL;
-+    }
-+    /* Added for bug 25178, return an IOCTL error instead of target returning
-+       Illegal parameter error when either the BSSID or channel is missing
-+       and we cannot scan during connect.
-+     */
-+    if (data->flags) {
-+        if (ar->arSkipScan == TRUE &&
-+            (ar->arChannelHint == 0 ||
-+             (!ar->arReqBssid[0] && !ar->arReqBssid[1] && !ar->arReqBssid[2] &&
-+              !ar->arReqBssid[3] && !ar->arReqBssid[4] && !ar->arReqBssid[5])))
-+        {
-+            return -EINVAL;
-+        }
-+    }
-+
-+    if (down_interruptible(&ar->arSem)) {
-+        return -ERESTARTSYS;
-+    }
-+
-+    if (ar->arTxPending[WMI_CONTROL_PRI]) {
-+        /*
-+         * sleep until the command queue drains
-+         */
-+        wait_event_interruptible_timeout(arEvent,
-+            ar->arTxPending[WMI_CONTROL_PRI] == 0, wmitimeout * HZ);
-+        if (signal_pending(current)) {
-+            return -EINTR;
-+        }
-+    }
-+
-+    if (!data->flags) {
-+        arNetworkType = ar->arNetworkType;
-+        ar6000_init_profile_info(ar);
-+        ar->arNetworkType = arNetworkType;
-+    }
-+
-+    if ((ar->arSsidLen) || (!data->flags))
-+    {
-+        if ((!data->flags) ||
-+            (A_MEMCMP(ar->arSsid, ssid, ar->arSsidLen) != 0) ||
-+            (ar->arSsidLen != (data->length)))
-+        {
-+            /*
-+             * SSID set previously or essid off has been issued.
-+             *
-+             * Disconnect Command is issued in two cases after wmi is ready
-+             * (1) ssid is different from the previous setting
-+             * (2) essid off has been issued
-+             *
-+             */
-+            if (ar->arWmiReady == TRUE) {
-+                reconnect_flag = 0;
-+                status = wmi_disconnect_cmd(ar->arWmi);
-+                A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
-+                ar->arSsidLen = 0;
-+                if (ar->arSkipScan == FALSE) {
-+                    A_MEMZERO(ar->arReqBssid, sizeof(ar->arReqBssid));
-+                }
-+                if (!data->flags) {
-+                    up(&ar->arSem);
-+                    return 0;
-+                }
-+            } else {
-+                 up(&ar->arSem);
-+            }
-+        }
-+        else
-+        {
-+            /*
-+             * SSID is same, so we assume profile hasn't changed.
-+             * If the interface is up and wmi is ready, we issue
-+             * a reconnect cmd. Issue a reconnect only we are already
-+             * connected.
-+             */
-+            if((ar->arConnected == TRUE) && (ar->arWmiReady == TRUE))
-+            {
-+                reconnect_flag = TRUE;
-+                status = wmi_reconnect_cmd(ar->arWmi,ar->arReqBssid,
-+                                           ar->arChannelHint);
-+                up(&ar->arSem);
-+                if (status != A_OK) {
-+                    return -EIO;
-+                }
-+                return 0;
-+            }
-+            else{
-+                /*
-+                 * Dont return if connect is pending.
-+                 */
-+                if(!(ar->arConnectPending)) {
-+                    up(&ar->arSem);
-+                    return 0;
-+                }
-+            }
-+        }
-+    }
-+
-+    ar->arSsidLen = data->length;
-+    A_MEMCPY(ar->arSsid, ssid, ar->arSsidLen);
-+
-+    /* The ssid length check prevents second "essid off" from the user,
-+       to be treated as a connect cmd. The second "essid off" is ignored.
-+    */
-+    if((ar->arWmiReady == TRUE) && (ar->arSsidLen > 0) )
-+    {
-+        AR6000_SPIN_LOCK(&ar->arLock, 0);
-+        if (SHARED_AUTH == ar->arDot11AuthMode) {
-+            ar6000_install_static_wep_keys(ar);
-+        }
-+        AR_DEBUG_PRINTF("Connect called with authmode %d dot11 auth %d"\
-+                        " PW crypto %d PW crypto Len %d GRP crypto %d"\
-+                        " GRP crypto Len %d\n",
-+                        ar->arAuthMode, ar->arDot11AuthMode,
-+                        ar->arPairwiseCrypto, ar->arPairwiseCryptoLen,
-+                        ar->arGroupCrypto, ar->arGroupCryptoLen);
-+        reconnect_flag = 0;
-+        AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+        status = wmi_connect_cmd(ar->arWmi, ar->arNetworkType,
-+                                 ar->arDot11AuthMode, ar->arAuthMode,
-+                                 ar->arPairwiseCrypto, ar->arPairwiseCryptoLen,
-+                                 ar->arGroupCrypto,ar->arGroupCryptoLen,
-+                                 ar->arSsidLen, ar->arSsid,
-+                                 ar->arReqBssid, ar->arChannelHint,
-+                                 ar->arConnectCtrlFlags);
-+
-+
-+        up(&ar->arSem);
-+
-+        if (status != A_OK) {
-+            return -EIO;
-+        }
-+        ar->arConnectPending = TRUE;
-+    }else{
-+      up(&ar->arSem);
-+    }
-+    return 0;
-+}
-+
-+/* SIOCGIWESSID */
-+static int
-+ar6000_ioctl_giwessid(struct net_device *dev,
-+                     struct iw_request_info *info,
-+                     struct iw_point *data, char *essid)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    if (!ar->arSsidLen) {
-+        return -EINVAL;
-+    }
-+
-+    data->flags = 1;
-+    data->length = ar->arSsidLen;
-+    A_MEMCPY(essid, ar->arSsid, ar->arSsidLen);
-+
-+    return 0;
-+}
-+
-+
-+void ar6000_install_static_wep_keys(AR_SOFTC_T *ar)
-+{
-+    A_UINT8 index;
-+    A_UINT8 keyUsage;
-+
-+    for (index = WMI_MIN_KEY_INDEX; index <= WMI_MAX_KEY_INDEX; index++) {
-+        if (ar->arWepKeyList[index].arKeyLen) {
-+            keyUsage = GROUP_USAGE;
-+            if (index == ar->arDefTxKeyIndex) {
-+                keyUsage |= TX_USAGE;
-+            }
-+            wmi_addKey_cmd(ar->arWmi,
-+                           index,
-+                           WEP_CRYPT,
-+                           keyUsage,
-+                           ar->arWepKeyList[index].arKeyLen,
-+                           NULL,
-+                           ar->arWepKeyList[index].arKey, KEY_OP_INIT_VAL,
-+                           NO_SYNC_WMIFLAG);
-+        }
-+    }
-+}
-+
-+int
-+ar6000_ioctl_delkey(struct net_device *dev, struct iw_request_info *info,
-+             void *w, char *extra)
-+{
-+    return 0;
-+}
-+
-+int
-+ar6000_ioctl_setmlme(struct net_device *dev, struct iw_request_info *info,
-+             void *w, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    struct ieee80211req_mlme *mlme = (struct ieee80211req_mlme *)extra;
-+
-+    if ((ar->arWmiReady == FALSE) || (ar->arConnected != TRUE))
-+              return -EIO;
-+
-+    switch (mlme->im_op) {
-+        case IEEE80211_MLME_DISASSOC:
-+        case IEEE80211_MLME_DEAUTH:
-+            /* Not Supported */
-+            break;
-+        default:
-+            break;
-+    }
-+    return 0;
-+}
-+
-+
-+int
-+ar6000_ioctl_setwmmparams(struct net_device *dev, struct iw_request_info *info,
-+             void *w, char *extra)
-+{
-+    return -EIO;            /* for now */
-+}
-+
-+int
-+ar6000_ioctl_getwmmparams(struct net_device *dev, struct iw_request_info *info,
-+             void *w, char *extra)
-+{
-+    return -EIO;            /* for now */
-+}
-+
-+int ar6000_ioctl_setoptie(struct net_device *dev, struct iw_request_info *info,
-+                        struct iw_point *data, char *extra)
-+{
-+      /* The target generates the WPA/RSN IE */
-+      return 0;
-+}
-+
-+int
-+ar6000_ioctl_setauthalg(struct net_device *dev, struct iw_request_info *info,
-+             void *w, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    struct ieee80211req_authalg *req = (struct ieee80211req_authalg *)extra;
-+    int ret = 0;
-+
-+
-+    AR6000_SPIN_LOCK(&ar->arLock, 0);
-+
-+    if (req->auth_alg == AUTH_ALG_OPEN_SYSTEM) {
-+        ar->arDot11AuthMode  = OPEN_AUTH;
-+    } else if (req->auth_alg == AUTH_ALG_LEAP) {
-+        ar->arDot11AuthMode   = LEAP_AUTH;
-+        ar->arPairwiseCrypto  = WEP_CRYPT;
-+        ar->arGroupCrypto     = WEP_CRYPT;
-+    } else {
-+        ret = -EIO;
-+    }
-+
-+    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+
-+    return ret;
-+}
-+static int
-+ar6000_ioctl_addpmkid(struct net_device *dev, struct iw_request_info *info,
-+             void *w, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    struct ieee80211req_addpmkid  *req = (struct ieee80211req_addpmkid *)extra;
-+    A_STATUS status;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    AR_DEBUG_PRINTF("Add pmkid for %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x en=%d\n",
-+                    req->pi_bssid[0], req->pi_bssid[1], req->pi_bssid[2],
-+                    req->pi_bssid[3], req->pi_bssid[4], req->pi_bssid[5],
-+                    req->pi_enable);
-+
-+    status = wmi_setPmkid_cmd(ar->arWmi, req->pi_bssid, req->pi_pmkid,
-+                              req->pi_enable);
-+
-+    if (status != A_OK) {
-+        return -EIO;
-+    }
-+
-+    return 0;
-+}
-+
-+/*
-+ * SIOCSIWRATE
-+ */
-+int
-+ar6000_ioctl_siwrate(struct net_device *dev,
-+            struct iw_request_info *info,
-+            struct iw_param *rrq, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    A_UINT32  kbps;
-+
-+    if (rrq->fixed) {
-+        kbps = rrq->value / 1000;           /* rrq->value is in bps */
-+    } else {
-+        kbps = -1;                          /* -1 indicates auto rate */
-+    }
-+    if(kbps != -1 && wmi_validate_bitrate(ar->arWmi, kbps) == A_EINVAL)
-+    {
-+        AR_DEBUG_PRINTF("BitRate is not Valid %d\n", kbps);
-+        return -EINVAL;
-+    }
-+    ar->arBitRate = kbps;
-+    if(ar->arWmiReady == TRUE)
-+    {
-+        if (wmi_set_bitrate_cmd(ar->arWmi, kbps) != A_OK) {
-+            return -EINVAL;
-+        }
-+    }
-+    return 0;
-+}
-+
-+/*
-+ * SIOCGIWRATE
-+ */
-+int
-+ar6000_ioctl_giwrate(struct net_device *dev,
-+            struct iw_request_info *info,
-+            struct iw_param *rrq, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    int ret = 0;
-+
-+    if (down_interruptible(&ar->arSem)) {
-+        return -ERESTARTSYS;
-+    }
-+    if(ar->arWmiReady == TRUE)
-+    {
-+        ar->arBitRate = 0xFFFF;
-+        if (wmi_get_bitrate_cmd(ar->arWmi) != A_OK) {
-+            up(&ar->arSem);
-+            return -EIO;
-+        }
-+        wait_event_interruptible_timeout(arEvent, ar->arBitRate != 0xFFFF, wmitimeout * HZ);
-+        if (signal_pending(current)) {
-+            ret = -EINTR;
-+        }
-+    }
-+    /* If the interface is down or wmi is not ready or the target is not
-+       connected - return the value stored in the device structure */
-+    if (!ret) {
-+        if (ar->arBitRate == -1) {
-+            rrq->fixed = TRUE;
-+            rrq->value = 0;
-+        } else {
-+            rrq->value = ar->arBitRate * 1000;
-+        }
-+    }
-+
-+    up(&ar->arSem);
-+
-+    return ret;
-+}
-+
-+/*
-+ * SIOCSIWTXPOW
-+ */
-+static int
-+ar6000_ioctl_siwtxpow(struct net_device *dev,
-+             struct iw_request_info *info,
-+             struct iw_param *rrq, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    A_UINT8 dbM;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    if (rrq->disabled) {
-+        return -EOPNOTSUPP;
-+    }
-+
-+    if (rrq->fixed) {
-+        if (rrq->flags != IW_TXPOW_DBM) {
-+            return -EOPNOTSUPP;
-+        }
-+        ar->arTxPwr= dbM = rrq->value;
-+        ar->arTxPwrSet = TRUE;
-+    } else {
-+        ar->arTxPwr = dbM = 0;
-+        ar->arTxPwrSet = FALSE;
-+    }
-+    if(ar->arWmiReady == TRUE)
-+    {
-+        AR_DEBUG_PRINTF("Set tx pwr cmd %d dbM\n", dbM);
-+        wmi_set_txPwr_cmd(ar->arWmi, dbM);
-+    }
-+    return 0;
-+}
-+
-+/*
-+ * SIOCGIWTXPOW
-+ */
-+int
-+ar6000_ioctl_giwtxpow(struct net_device *dev,
-+            struct iw_request_info *info,
-+            struct iw_param *rrq, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    int ret = 0;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    if (down_interruptible(&ar->arSem)) {
-+        return -ERESTARTSYS;
-+    }
-+    if((ar->arWmiReady == TRUE) && (ar->arConnected == TRUE))
-+    {
-+        ar->arTxPwr = 0;
-+
-+        if (wmi_get_txPwr_cmd(ar->arWmi) != A_OK) {
-+            up(&ar->arSem);
-+            return -EIO;
-+        }
-+
-+        wait_event_interruptible_timeout(arEvent, ar->arTxPwr != 0, wmitimeout * HZ);
-+
-+        if (signal_pending(current)) {
-+            ret = -EINTR;
-+         }
-+    }
-+   /* If the interace is down or wmi is not ready or target is not connected
-+      then return value stored in the device structure */
-+
-+    if (!ret) {
-+         if (ar->arTxPwrSet == TRUE) {
-+            rrq->fixed = TRUE;
-+        }
-+        rrq->value = ar->arTxPwr;
-+        rrq->flags = IW_TXPOW_DBM;
-+    }
-+
-+    up(&ar->arSem);
-+
-+    return ret;
-+}
-+
-+/*
-+ * SIOCSIWRETRY
-+ * since iwconfig only provides us with one max retry value, we use it
-+ * to apply to data frames of the BE traffic class.
-+ */
-+static int
-+ar6000_ioctl_siwretry(struct net_device *dev,
-+             struct iw_request_info *info,
-+             struct iw_param *rrq, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    if (rrq->disabled) {
-+        return -EOPNOTSUPP;
-+    }
-+
-+    if ((rrq->flags & IW_RETRY_TYPE) != IW_RETRY_LIMIT) {
-+        return -EOPNOTSUPP;
-+    }
-+
-+    if ( !(rrq->value >= WMI_MIN_RETRIES) || !(rrq->value <= WMI_MAX_RETRIES)) {
-+            return - EINVAL;
-+    }
-+    if(ar->arWmiReady == TRUE)
-+    {
-+        if (wmi_set_retry_limits_cmd(ar->arWmi, DATA_FRAMETYPE, WMM_AC_BE,
-+                                     rrq->value, 0) != A_OK){
-+            return -EINVAL;
-+        }
-+    }
-+    ar->arMaxRetries = rrq->value;
-+    return 0;
-+}
-+
-+/*
-+ * SIOCGIWRETRY
-+ */
-+static int
-+ar6000_ioctl_giwretry(struct net_device *dev,
-+             struct iw_request_info *info,
-+             struct iw_param *rrq, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    rrq->disabled = 0;
-+    switch (rrq->flags & IW_RETRY_TYPE) {
-+    case IW_RETRY_LIFETIME:
-+        return -EOPNOTSUPP;
-+        break;
-+    case IW_RETRY_LIMIT:
-+        rrq->flags = IW_RETRY_LIMIT;
-+        switch (rrq->flags & IW_RETRY_MODIFIER) {
-+        case IW_RETRY_MIN:
-+            rrq->flags |= IW_RETRY_MIN;
-+            rrq->value = WMI_MIN_RETRIES;
-+            break;
-+        case IW_RETRY_MAX:
-+            rrq->flags |= IW_RETRY_MAX;
-+            rrq->value = ar->arMaxRetries;
-+            break;
-+        }
-+        break;
-+    }
-+    return 0;
-+}
-+
-+/*
-+ * SIOCSIWENCODE
-+ */
-+static int
-+ar6000_ioctl_siwencode(struct net_device *dev,
-+              struct iw_request_info *info,
-+              struct iw_point *erq, char *keybuf)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    int index;
-+    A_INT32 auth = ar->arDot11AuthMode;
-+    /*
-+     *  Static WEP Keys should be configured before setting the SSID
-+     */
-+    if (ar->arSsidLen) {
-+        return -EIO;
-+    }
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    index = erq->flags & IW_ENCODE_INDEX;
-+
-+    if (index && (((index - 1) < WMI_MIN_KEY_INDEX) ||
-+                  ((index - 1) > WMI_MAX_KEY_INDEX)))
-+    {
-+        return -EIO;
-+    }
-+
-+    if (erq->flags & IW_ENCODE_DISABLED) {
-+        /*
-+         * Encryption disabled
-+         */
-+        if (index) {
-+            /*
-+             * If key index was specified then clear the specified key
-+             */
-+            index--;
-+            A_MEMZERO(ar->arWepKeyList[index].arKey,
-+                      sizeof(ar->arWepKeyList[index].arKey));
-+            ar->arWepKeyList[index].arKeyLen = 0;
-+        }
-+        ar->arDot11AuthMode       = OPEN_AUTH;
-+        ar->arPairwiseCrypto      = NONE_CRYPT;
-+        ar->arGroupCrypto         = NONE_CRYPT;
-+        ar->arAuthMode            = NONE_AUTH;
-+    } else {
-+        /*
-+         * Enabling WEP encryption
-+         */
-+        if (index) {
-+            index--;                /* keyindex is off base 1 in iwconfig */
-+        }
-+
-+        if (erq->flags & IW_ENCODE_OPEN) {
-+            auth = OPEN_AUTH;
-+        } else if (erq->flags & IW_ENCODE_RESTRICTED) {
-+            auth = SHARED_AUTH;
-+        }
-+
-+        if (erq->length) {
-+            if (!IEEE80211_IS_VALID_WEP_CIPHER_LEN(erq->length)) {
-+                return -EIO;
-+            }
-+
-+            A_MEMZERO(ar->arWepKeyList[index].arKey,
-+                      sizeof(ar->arWepKeyList[index].arKey));
-+            A_MEMCPY(ar->arWepKeyList[index].arKey, keybuf, erq->length);
-+            ar->arWepKeyList[index].arKeyLen = erq->length;
-+        } else {
-+            if (ar->arWepKeyList[index].arKeyLen == 0) {
-+                return -EIO;
-+            }
-+            ar->arDefTxKeyIndex = index;
-+        }
-+
-+        ar->arPairwiseCrypto      = WEP_CRYPT;
-+        ar->arGroupCrypto         = WEP_CRYPT;
-+        ar->arDot11AuthMode       = auth;
-+        ar->arAuthMode            = NONE_AUTH;
-+    }
-+
-+    /*
-+     * profile has changed.  Erase ssid to signal change
-+     */
-+    A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
-+
-+    return 0;
-+}
-+
-+static int
-+ar6000_ioctl_giwencode(struct net_device *dev,
-+              struct iw_request_info *info,
-+              struct iw_point *erq, char *key)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-+    A_UINT8 keyIndex;
-+    struct ar_wep_key *wk;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    if (ar->arPairwiseCrypto == NONE_CRYPT) {
-+        erq->length = 0;
-+        erq->flags = IW_ENCODE_DISABLED;
-+    } else {
-+        /* get the keyIndex */
-+        keyIndex = erq->flags & IW_ENCODE_INDEX;
-+        if (0 == keyIndex) {
-+            keyIndex = ar->arDefTxKeyIndex;
-+        } else if ((keyIndex - 1 < WMI_MIN_KEY_INDEX) ||
-+                   (keyIndex - 1 > WMI_MAX_KEY_INDEX))
-+        {
-+            keyIndex = WMI_MIN_KEY_INDEX;
-+        } else {
-+            keyIndex--;
-+        }
-+        erq->flags = keyIndex + 1;
-+        erq->flags |= IW_ENCODE_ENABLED;
-+        wk = &ar->arWepKeyList[keyIndex];
-+        if (erq->length > wk->arKeyLen) {
-+            erq->length = wk->arKeyLen;
-+        }
-+        if (wk->arKeyLen) {
-+            A_MEMCPY(key, wk->arKey, erq->length);
-+        }
-+        if (ar->arDot11AuthMode == OPEN_AUTH) {
-+            erq->flags |= IW_ENCODE_OPEN;
-+        } else if (ar->arDot11AuthMode == SHARED_AUTH) {
-+            erq->flags |= IW_ENCODE_RESTRICTED;
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+static int ar6000_ioctl_siwpower(struct net_device *dev,
-+                               struct iw_request_info *info,
-+                               union iwreq_data *wrqu, char *extra)
-+{
-+      AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-+      WMI_POWER_MODE power_mode;
-+
-+      if (wrqu->power.disabled)
-+              power_mode = MAX_PERF_POWER;
-+      else
-+              power_mode = REC_POWER;
-+
-+      if (wmi_powermode_cmd(ar->arWmi, power_mode) < 0)
-+              return -EIO;
-+
-+      return 0;
-+}
-+
-+static int ar6000_ioctl_giwpower(struct net_device *dev,
-+                               struct iw_request_info *info,
-+                               union iwreq_data *wrqu, char *extra)
-+{
-+      AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-+
-+      return wmi_get_power_mode_cmd(ar->arWmi);
-+}
-+
-+static int ar6000_ioctl_siwgenie(struct net_device *dev,
-+                               struct iw_request_info *info,
-+                               struct iw_point *dwrq,
-+                               char *extra)
-+{
-+      /* The target does that for us */
-+      return 0;
-+}
-+
-+static int ar6000_ioctl_giwgenie(struct net_device *dev,
-+                               struct iw_request_info *info,
-+                               struct iw_point *dwrq,
-+                               char *extra)
-+{
-+      return 0;
-+}
-+
-+static int ar6000_ioctl_siwauth(struct net_device *dev,
-+                              struct iw_request_info *info,
-+                              struct iw_param *param,
-+                              char *extra)
-+{
-+      AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-+      int reset = 0;
-+
-+      switch (param->flags & IW_AUTH_INDEX) {
-+      case IW_AUTH_WPA_VERSION:
-+              if (param->value & IW_AUTH_WPA_VERSION_DISABLED) {
-+                      ar->arAuthMode = NONE_AUTH;
-+              }
-+              if (param->value & IW_AUTH_WPA_VERSION_WPA) {
-+                      ar->arAuthMode = WPA_AUTH;
-+              }
-+              if (param->value & IW_AUTH_WPA_VERSION_WPA2) {
-+                      ar->arAuthMode = WPA2_AUTH;
-+              }
-+
-+              reset = 1;
-+              break;
-+      case IW_AUTH_CIPHER_PAIRWISE:
-+              if (param->value & IW_AUTH_CIPHER_NONE) {
-+                      ar->arPairwiseCrypto = NONE_CRYPT;
-+              }
-+              if (param->value & IW_AUTH_CIPHER_WEP40) {
-+                      ar->arPairwiseCrypto = WEP_CRYPT;
-+              }
-+              if (param->value & IW_AUTH_CIPHER_TKIP) {
-+                      ar->arPairwiseCrypto = TKIP_CRYPT;
-+              }
-+              if (param->value & IW_AUTH_CIPHER_CCMP) {
-+                      ar->arPairwiseCrypto = AES_CRYPT;
-+              }
-+
-+              reset = 1;
-+              break;
-+      case IW_AUTH_CIPHER_GROUP:
-+              if (param->value & IW_AUTH_CIPHER_NONE) {
-+                      ar->arGroupCrypto = NONE_CRYPT;
-+              }
-+              if (param->value & IW_AUTH_CIPHER_WEP40) {
-+                      ar->arGroupCrypto = WEP_CRYPT;
-+              }
-+              if (param->value & IW_AUTH_CIPHER_TKIP) {
-+                      ar->arGroupCrypto = TKIP_CRYPT;
-+              }
-+              if (param->value & IW_AUTH_CIPHER_CCMP) {
-+                      ar->arGroupCrypto = AES_CRYPT;
-+              }
-+
-+              reset = 1;
-+              break;
-+      case IW_AUTH_KEY_MGMT:
-+              if (param->value & IW_AUTH_KEY_MGMT_PSK) {
-+                      if (ar->arAuthMode == WPA_AUTH) {
-+                              ar->arAuthMode = WPA_PSK_AUTH;
-+                      } else if (ar->arAuthMode == WPA2_AUTH) {
-+                              ar->arAuthMode = WPA2_PSK_AUTH;
-+                      }
-+
-+                      reset = 1;
-+              }
-+              break;
-+
-+      case IW_AUTH_TKIP_COUNTERMEASURES:
-+              if (ar->arWmiReady == FALSE) {
-+                      return -EIO;
-+              }
-+              wmi_set_tkip_countermeasures_cmd(ar->arWmi, param->value);
-+              break;
-+
-+      case IW_AUTH_DROP_UNENCRYPTED:
-+              break;
-+
-+      case IW_AUTH_80211_AUTH_ALG:
-+              if (param->value & IW_AUTH_ALG_OPEN_SYSTEM) {
-+                      ar->arDot11AuthMode  = OPEN_AUTH;
-+              }
-+              if (param->value & IW_AUTH_ALG_SHARED_KEY) {
-+                      ar->arDot11AuthMode  = SHARED_AUTH;
-+              }
-+              if (param->value & IW_AUTH_ALG_LEAP) {
-+                      ar->arDot11AuthMode   = LEAP_AUTH;
-+                      ar->arPairwiseCrypto  = WEP_CRYPT;
-+                      ar->arGroupCrypto     = WEP_CRYPT;
-+              }
-+
-+              reset = 1;
-+              break;
-+
-+      case IW_AUTH_WPA_ENABLED:
-+              reset = 1;
-+              break;
-+
-+      case IW_AUTH_RX_UNENCRYPTED_EAPOL:
-+              break;
-+
-+      case IW_AUTH_PRIVACY_INVOKED:
-+              break;
-+
-+      default:
-+              printk("%s(): Unknown flag 0x%x\n", __FUNCTION__, param->flags);
-+              return -EOPNOTSUPP;
-+      }
-+
-+      if (reset)
-+              memset(ar->arSsid, 0, sizeof(ar->arSsid));
-+
-+      return 0;
-+}
-+
-+static int ar6000_ioctl_giwauth(struct net_device *dev,
-+                              struct iw_request_info *info,
-+                              struct iw_param *dwrq,
-+                              char *extra)
-+{
-+      return 0;
-+}
-+
-+static int ar6000_ioctl_siwencodeext(struct net_device *dev,
-+                                   struct iw_request_info *info,
-+                                   union iwreq_data *wrqu,
-+                                   char *extra)
-+{
-+      AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-+      struct iw_point *encoding = &wrqu->encoding;
-+      struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
-+      int alg = ext->alg, idx;
-+
-+      if (ar->arWlanState == WLAN_DISABLED) {
-+              return -EIO;
-+      }
-+
-+      /* Determine and validate the key index */
-+      idx = (encoding->flags & IW_ENCODE_INDEX) - 1;
-+      if (idx) {
-+              if (idx < 0 || idx > 3)
-+                      return -EINVAL;
-+      }
-+
-+      if ((alg == IW_ENCODE_ALG_TKIP) || (alg == IW_ENCODE_ALG_CCMP)) {
-+              struct ieee80211req_key ik;
-+              KEY_USAGE key_usage;
-+              CRYPTO_TYPE key_type = NONE_CRYPT;
-+              int status;
-+
-+              ar->user_saved_keys.keyOk = FALSE;
-+
-+              if (alg == IW_ENCODE_ALG_TKIP) {
-+                      key_type = TKIP_CRYPT;
-+                      ik.ik_type = IEEE80211_CIPHER_TKIP;
-+              } else {
-+                      key_type = AES_CRYPT;
-+                      ik.ik_type = IEEE80211_CIPHER_AES_CCM;
-+              }
-+
-+              ik.ik_keyix = idx;
-+              ik.ik_keylen = ext->key_len;
-+              ik.ik_flags = IEEE80211_KEY_RECV;
-+              if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
-+                      ik.ik_flags |= IEEE80211_KEY_XMIT
-+                              | IEEE80211_KEY_DEFAULT;
-+              }
-+
-+              if (ext->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID) {
-+                      memcpy(&ik.ik_keyrsc, ext->rx_seq, 8);
-+              }
-+
-+              memcpy(ik.ik_keydata, ext->key, ext->key_len);
-+
-+              ar->user_saved_keys.keyType = key_type;
-+              if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) {
-+                      key_usage = GROUP_USAGE;
-+                      memset(ik.ik_macaddr, 0, ETH_ALEN);
-+                      memcpy(&ar->user_saved_keys.bcast_ik, &ik,
-+                             sizeof(struct ieee80211req_key));
-+              } else {
-+                      key_usage = PAIRWISE_USAGE;
-+                      memcpy(ik.ik_macaddr, ext->addr.sa_data, ETH_ALEN);
-+                      memcpy(&ar->user_saved_keys.ucast_ik, &ik,
-+                             sizeof(struct ieee80211req_key));
-+              }
-+
-+              status = wmi_addKey_cmd(ar->arWmi, ik.ik_keyix, key_type,
-+                                      key_usage, ik.ik_keylen,
-+                                      (A_UINT8 *)&ik.ik_keyrsc,
-+                                      ik.ik_keydata,
-+                                      KEY_OP_INIT_VAL, SYNC_BEFORE_WMIFLAG);
-+
-+              if (status < 0)
-+                      return -EIO;
-+
-+              ar->user_saved_keys.keyOk = TRUE;
-+
-+              return 0;
-+
-+      } else {
-+              /* WEP falls back to SIWENCODE */
-+              return -EOPNOTSUPP;
-+      }
-+
-+      return 0;
-+}
-+
-+
-+static int ar6000_ioctl_giwencodeext(struct net_device *dev,
-+                                   struct iw_request_info *info,
-+                                   struct iw_point *dwrq,
-+                                   char *extra)
-+{
-+      return 0;
-+}
-+
-+
-+static int
-+ar6000_ioctl_setparam(struct net_device *dev,
-+                      struct iw_request_info *info,
-+                      void *erq, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    int *i = (int *)extra;
-+    int param = i[0];
-+    int value = i[1];
-+    int ret = 0;
-+    A_BOOL profChanged = FALSE;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    switch (param) {
-+        case IEEE80211_PARAM_WPA:
-+            switch (value) {
-+                case WPA_MODE_WPA1:
-+                    ar->arAuthMode = WPA_AUTH;
-+                    profChanged    = TRUE;
-+                    break;
-+                case WPA_MODE_WPA2:
-+                    ar->arAuthMode = WPA2_AUTH;
-+                    profChanged    = TRUE;
-+                    break;
-+                case WPA_MODE_NONE:
-+                    ar->arAuthMode = NONE_AUTH;
-+                    profChanged    = TRUE;
-+                    break;
-+          default:
-+                  printk("IEEE80211_PARAM_WPA: Unknown value %d\n", value);
-+            }
-+            break;
-+        case IEEE80211_PARAM_AUTHMODE:
-+            switch(value) {
-+                case IEEE80211_AUTH_WPA_PSK:
-+                    if (WPA_AUTH == ar->arAuthMode) {
-+                        ar->arAuthMode = WPA_PSK_AUTH;
-+                        profChanged    = TRUE;
-+                    } else if (WPA2_AUTH == ar->arAuthMode) {
-+                        ar->arAuthMode = WPA2_PSK_AUTH;
-+                        profChanged    = TRUE;
-+                    } else {
-+                        AR_DEBUG_PRINTF("Error -  Setting PSK mode when WPA "\
-+                                        "param was set to %d\n",
-+                                        ar->arAuthMode);
-+                        ret = -1;
-+                    }
-+                    break;
-+                case IEEE80211_AUTH_WPA_CCKM:
-+                    if (WPA2_AUTH == ar->arAuthMode) {
-+                        ar->arAuthMode = WPA2_AUTH_CCKM;
-+                    } else {
-+                        ar->arAuthMode = WPA_AUTH_CCKM;
-+                    }
-+                    break;
-+                default:
-+                    break;
-+            }
-+            break;
-+        case IEEE80211_PARAM_UCASTCIPHER:
-+            switch (value) {
-+                case IEEE80211_CIPHER_AES_CCM:
-+                    ar->arPairwiseCrypto = AES_CRYPT;
-+                    profChanged          = TRUE;
-+                    break;
-+                case IEEE80211_CIPHER_TKIP:
-+                    ar->arPairwiseCrypto = TKIP_CRYPT;
-+                    profChanged          = TRUE;
-+                    break;
-+                case IEEE80211_CIPHER_WEP:
-+                    ar->arPairwiseCrypto = WEP_CRYPT;
-+                    profChanged          = TRUE;
-+                    break;
-+                case IEEE80211_CIPHER_NONE:
-+                    ar->arPairwiseCrypto = NONE_CRYPT;
-+                    profChanged          = TRUE;
-+                    break;
-+            }
-+            break;
-+        case IEEE80211_PARAM_UCASTKEYLEN:
-+            if (!IEEE80211_IS_VALID_WEP_CIPHER_LEN(value)) {
-+                ret = -EIO;
-+            } else {
-+                ar->arPairwiseCryptoLen = value;
-+            }
-+            break;
-+        case IEEE80211_PARAM_MCASTCIPHER:
-+            switch (value) {
-+                case IEEE80211_CIPHER_AES_CCM:
-+                    ar->arGroupCrypto = AES_CRYPT;
-+                    profChanged       = TRUE;
-+                    break;
-+                case IEEE80211_CIPHER_TKIP:
-+                    ar->arGroupCrypto = TKIP_CRYPT;
-+                    profChanged       = TRUE;
-+                    break;
-+                case IEEE80211_CIPHER_WEP:
-+                    ar->arGroupCrypto = WEP_CRYPT;
-+                    profChanged       = TRUE;
-+                    break;
-+                case IEEE80211_CIPHER_NONE:
-+                    ar->arGroupCrypto = NONE_CRYPT;
-+                    profChanged       = TRUE;
-+                    break;
-+            }
-+            break;
-+        case IEEE80211_PARAM_MCASTKEYLEN:
-+            if (!IEEE80211_IS_VALID_WEP_CIPHER_LEN(value)) {
-+                ret = -EIO;
-+            } else {
-+                ar->arGroupCryptoLen = value;
-+            }
-+            break;
-+        case IEEE80211_PARAM_COUNTERMEASURES:
-+            if (ar->arWmiReady == FALSE) {
-+                return -EIO;
-+            }
-+            wmi_set_tkip_countermeasures_cmd(ar->arWmi, value);
-+            break;
-+        default:
-+            break;
-+    }
-+
-+    if (profChanged == TRUE) {
-+        /*
-+         * profile has changed.  Erase ssid to signal change
-+         */
-+        A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
-+    }
-+
-+    return ret;
-+}
-+
-+int
-+ar6000_ioctl_getparam(struct net_device *dev, struct iw_request_info *info,
-+            void *w, char *extra)
-+{
-+    return -EIO;            /* for now */
-+}
-+
-+int
-+ar6000_ioctl_setkey(struct net_device *dev, struct iw_request_info *info,
-+                  void *w, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    struct ieee80211req_key *ik = (struct ieee80211req_key *)extra;
-+    KEY_USAGE keyUsage;
-+    A_STATUS status;
-+    CRYPTO_TYPE keyType = NONE_CRYPT;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    ar->user_saved_keys.keyOk = FALSE;
-+
-+    if ( 0 == memcmp(ik->ik_macaddr, "\x00\x00\x00\x00\x00\x00",
-+                     IEEE80211_ADDR_LEN)) {
-+        keyUsage = GROUP_USAGE;
-+        A_MEMCPY(&ar->user_saved_keys.bcast_ik, ik,
-+                 sizeof(struct ieee80211req_key));
-+    } else {
-+        keyUsage = PAIRWISE_USAGE;
-+        A_MEMCPY(&ar->user_saved_keys.ucast_ik, ik,
-+                 sizeof(struct ieee80211req_key));
-+    }
-+
-+    switch (ik->ik_type) {
-+        case IEEE80211_CIPHER_WEP:
-+            keyType = WEP_CRYPT;
-+            break;
-+        case IEEE80211_CIPHER_TKIP:
-+            keyType = TKIP_CRYPT;
-+            break;
-+        case IEEE80211_CIPHER_AES_CCM:
-+            keyType = AES_CRYPT;
-+            break;
-+        default:
-+            break;
-+    }
-+    ar->user_saved_keys.keyType = keyType;
-+
-+    if (IEEE80211_CIPHER_CCKM_KRK != ik->ik_type) {
-+        if (NONE_CRYPT == keyType) {
-+            return -EIO;
-+        }
-+
-+        status = wmi_addKey_cmd(ar->arWmi, ik->ik_keyix, keyType, keyUsage,
-+                                ik->ik_keylen, (A_UINT8 *)&ik->ik_keyrsc,
-+                                ik->ik_keydata, KEY_OP_INIT_VAL,
-+                                SYNC_BEFORE_WMIFLAG);
-+
-+        if (status != A_OK) {
-+            return -EIO;
-+        }
-+    } else {
-+        status = wmi_add_krk_cmd(ar->arWmi, ik->ik_keydata);
-+    }
-+
-+    ar->user_saved_keys.keyOk = TRUE;
-+
-+    return 0;
-+}
-+
-+
-+/*
-+ * SIOCGIWNAME
-+ */
-+int
-+ar6000_ioctl_giwname(struct net_device *dev,
-+           struct iw_request_info *info,
-+           char *name, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    switch (ar->arPhyCapability) {
-+    case (WMI_11A_CAPABILITY):
-+        strncpy(name, "AR6000 802.11a", IFNAMSIZ);
-+        break;
-+    case (WMI_11G_CAPABILITY):
-+        strncpy(name, "AR6000 802.11g", IFNAMSIZ);
-+        break;
-+    case (WMI_11AG_CAPABILITY):
-+        strncpy(name, "AR6000 802.11ag", IFNAMSIZ);
-+        break;
-+    default:
-+        strncpy(name, "AR6000 802.11", IFNAMSIZ);
-+        break;
-+    }
-+
-+    return 0;
-+}
-+
-+/*
-+ * SIOCSIWFREQ
-+ */
-+int
-+ar6000_ioctl_siwfreq(struct net_device *dev,
-+            struct iw_request_info *info,
-+            struct iw_freq *freq, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    /*
-+     * We support limiting the channels via wmiconfig.
-+     *
-+     * We use this command to configure the channel hint for the connect cmd
-+     * so it is possible the target will end up connecting to a different
-+     * channel.
-+     */
-+    if (freq->e > 1) {
-+        return -EINVAL;
-+    } else if (freq->e == 1) {
-+        ar->arChannelHint = freq->m / 100000;
-+    } else {
-+        ar->arChannelHint = wlan_ieee2freq(freq->m);
-+    }
-+
-+    A_PRINTF("channel hint set to %d\n", ar->arChannelHint);
-+    return 0;
-+}
-+
-+/*
-+ * SIOCGIWFREQ
-+ */
-+int
-+ar6000_ioctl_giwfreq(struct net_device *dev,
-+                struct iw_request_info *info,
-+                struct iw_freq *freq, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    if (ar->arConnected != TRUE) {
-+        return -EINVAL;
-+    }
-+
-+    freq->m = ar->arBssChannel * 100000;
-+    freq->e = 1;
-+
-+    return 0;
-+}
-+
-+/*
-+ * SIOCSIWMODE
-+ */
-+int
-+ar6000_ioctl_siwmode(struct net_device *dev,
-+            struct iw_request_info *info,
-+            __u32 *mode, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    switch (*mode) {
-+    case IW_MODE_INFRA:
-+        ar->arNetworkType = INFRA_NETWORK;
-+        break;
-+    case IW_MODE_ADHOC:
-+        ar->arNetworkType = ADHOC_NETWORK;
-+        break;
-+    default:
-+        return -EINVAL;
-+    }
-+
-+    return 0;
-+}
-+
-+/*
-+ * SIOCGIWMODE
-+ */
-+int
-+ar6000_ioctl_giwmode(struct net_device *dev,
-+            struct iw_request_info *info,
-+            __u32 *mode, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    switch (ar->arNetworkType) {
-+    case INFRA_NETWORK:
-+        *mode = IW_MODE_INFRA;
-+        break;
-+    case ADHOC_NETWORK:
-+        *mode = IW_MODE_ADHOC;
-+        break;
-+    default:
-+        return -EIO;
-+    }
-+    return 0;
-+}
-+
-+/*
-+ * SIOCSIWSENS
-+ */
-+int
-+ar6000_ioctl_siwsens(struct net_device *dev,
-+            struct iw_request_info *info,
-+            struct iw_param *sens, char *extra)
-+{
-+    return 0;
-+}
-+
-+/*
-+ * SIOCGIWSENS
-+ */
-+int
-+ar6000_ioctl_giwsens(struct net_device *dev,
-+            struct iw_request_info *info,
-+            struct iw_param *sens, char *extra)
-+{
-+    sens->value = 0;
-+    sens->fixed = 1;
-+
-+    return 0;
-+}
-+
-+/*
-+ * SIOCGIWRANGE
-+ */
-+int
-+ar6000_ioctl_giwrange(struct net_device *dev,
-+             struct iw_request_info *info,
-+             struct iw_point *data, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    struct iw_range *range = (struct iw_range *) extra;
-+    int i, ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    if (down_interruptible(&ar->arSem)) {
-+        return -ERESTARTSYS;
-+    }
-+    ar->arNumChannels = -1;
-+    A_MEMZERO(ar->arChannelList, sizeof (ar->arChannelList));
-+
-+    if (wmi_get_channelList_cmd(ar->arWmi) != A_OK) {
-+        up(&ar->arSem);
-+        return -EIO;
-+    }
-+
-+    wait_event_interruptible_timeout(arEvent, ar->arNumChannels != -1, wmitimeout * HZ);
-+
-+    if (signal_pending(current)) {
-+        up(&ar->arSem);
-+        return -EINTR;
-+    }
-+
-+    data->length = sizeof(struct iw_range);
-+    A_MEMZERO(range, sizeof(struct iw_range));
-+
-+    range->txpower_capa = 0;
-+
-+    range->min_pmp = 1 * 1024;
-+    range->max_pmp = 65535 * 1024;
-+    range->min_pmt = 1 * 1024;
-+    range->max_pmt = 1000 * 1024;
-+    range->pmp_flags = IW_POWER_PERIOD;
-+    range->pmt_flags = IW_POWER_TIMEOUT;
-+    range->pm_capa = 0;
-+
-+    range->we_version_compiled = WIRELESS_EXT;
-+    range->we_version_source = 13;
-+
-+    range->retry_capa = IW_RETRY_LIMIT;
-+    range->retry_flags = IW_RETRY_LIMIT;
-+    range->min_retry = 0;
-+    range->max_retry = 255;
-+
-+    range->num_frequency = range->num_channels = ar->arNumChannels;
-+    for (i = 0; i < ar->arNumChannels; i++) {
-+        range->freq[i].i = wlan_freq2ieee(ar->arChannelList[i]);
-+        range->freq[i].m = ar->arChannelList[i] * 100000;
-+        range->freq[i].e = 1;
-+         /*
-+         * Linux supports max of 32 channels, bail out once you
-+         * reach the max.
-+         */
-+        if (i == IW_MAX_FREQUENCIES) {
-+            break;
-+        }
-+    }
-+
-+    /* Max quality is max field value minus noise floor */
-+    range->max_qual.qual  = 0xff - 161;
-+
-+    /*
-+     * In order to use dBm measurements, 'level' must be lower
-+     * than any possible measurement (see iw_print_stats() in
-+     * wireless tools).  It's unclear how this is meant to be
-+     * done, but setting zero in these values forces dBm and
-+     * the actual numbers are not used.
-+     */
-+    range->max_qual.level = 0;
-+    range->max_qual.noise = 0;
-+
-+    range->sensitivity = 3;
-+
-+    range->max_encoding_tokens = 4;
-+    /* XXX query driver to find out supported key sizes */
-+    range->num_encoding_sizes = 3;
-+    range->encoding_size[0] = 5;        /* 40-bit */
-+    range->encoding_size[1] = 13;       /* 104-bit */
-+    range->encoding_size[2] = 16;       /* 128-bit */
-+
-+    range->num_bitrates = 0;
-+
-+    /* estimated maximum TCP throughput values (bps) */
-+    range->throughput = 22000000;
-+
-+    range->min_rts = 0;
-+    range->max_rts = 2347;
-+    range->min_frag = 256;
-+    range->max_frag = 2346;
-+
-+    up(&ar->arSem);
-+
-+    return ret;
-+}
-+
-+
-+/*
-+ * SIOCSIWAP
-+ * This ioctl is used to set the desired bssid for the connect command.
-+ */
-+int
-+ar6000_ioctl_siwap(struct net_device *dev,
-+              struct iw_request_info *info,
-+              struct sockaddr *ap_addr, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    if (ap_addr->sa_family != ARPHRD_ETHER) {
-+        return -EIO;
-+    }
-+
-+    if (A_MEMCMP(&ap_addr->sa_data, bcast_mac, AR6000_ETH_ADDR_LEN) == 0) {
-+        A_MEMZERO(ar->arReqBssid, sizeof(ar->arReqBssid));
-+    } else {
-+        A_MEMCPY(ar->arReqBssid, &ap_addr->sa_data,  sizeof(ar->arReqBssid));
-+    }
-+
-+    return 0;
-+}
-+
-+/*
-+ * SIOCGIWAP
-+ */
-+int
-+ar6000_ioctl_giwap(struct net_device *dev,
-+              struct iw_request_info *info,
-+              struct sockaddr *ap_addr, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    if (ar->arConnected != TRUE) {
-+        return -EINVAL;
-+    }
-+
-+    A_MEMCPY(&ap_addr->sa_data, ar->arBssid, sizeof(ar->arBssid));
-+    ap_addr->sa_family = ARPHRD_ETHER;
-+
-+    return 0;
-+}
-+
-+/*
-+ * SIOCGIWAPLIST
-+ */
-+int
-+ar6000_ioctl_iwaplist(struct net_device *dev,
-+            struct iw_request_info *info,
-+            struct iw_point *data, char *extra)
-+{
-+    return -EIO;            /* for now */
-+}
-+
-+/*
-+ * SIOCSIWSCAN
-+ */
-+int
-+ar6000_ioctl_siwscan(struct net_device *dev,
-+                     struct iw_request_info *info,
-+                     struct iw_point *data, char *extra)
-+{
-+#define ACT_DWELLTIME_DEFAULT   105
-+#define HOME_TXDRAIN_TIME       100
-+#define SCAN_INT                HOME_TXDRAIN_TIME + ACT_DWELLTIME_DEFAULT
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    /* We ask for everything from the target */
-+    if (wmi_bssfilter_cmd(ar->arWmi, ALL_BSS_FILTER, 0) != A_OK) {
-+          printk("Couldn't set filtering\n");
-+          ret = -EIO;
-+    }
-+
-+    if (wmi_startscan_cmd(ar->arWmi, WMI_LONG_SCAN, FALSE, FALSE, \
-+                          HOME_TXDRAIN_TIME, SCAN_INT) != A_OK) {
-+        ret = -EIO;
-+    }
-+
-+    ar->scan_complete = 0;
-+    wait_event_interruptible_timeout(ar6000_scan_queue, ar->scan_complete,
-+                                   5 * HZ);
-+
-+    if (wmi_bssfilter_cmd(ar->arWmi, NONE_BSS_FILTER, 0) != A_OK) {
-+          printk("Couldn't set filtering\n");
-+          ret = -EIO;
-+    }
-+
-+    return ret;
-+#undef  ACT_DWELLTIME_DEFAULT
-+#undef HOME_TXDRAIN_TIME
-+#undef SCAN_INT
-+}
-+
-+
-+/*
-+ * Units are in db above the noise floor. That means the
-+ * rssi values reported in the tx/rx descriptors in the
-+ * driver are the SNR expressed in db.
-+ *
-+ * If you assume that the noise floor is -95, which is an
-+ * excellent assumption 99.5 % of the time, then you can
-+ * derive the absolute signal level (i.e. -95 + rssi).
-+ * There are some other slight factors to take into account
-+ * depending on whether the rssi measurement is from 11b,
-+ * 11g, or 11a.   These differences are at most 2db and
-+ * can be documented.
-+ *
-+ * NB: various calculations are based on the orinoco/wavelan
-+ *     drivers for compatibility
-+ */
-+static void
-+ar6000_set_quality(struct iw_quality *iq, A_INT8 rssi)
-+{
-+    if (rssi < 0) {
-+        iq->qual = 0;
-+    } else {
-+        iq->qual = rssi;
-+    }
-+
-+    /* NB: max is 94 because noise is hardcoded to 161 */
-+    if (iq->qual > 94)
-+        iq->qual = 94;
-+
-+    iq->noise = 161;        /* -95dBm */
-+    iq->level = iq->noise + iq->qual;
-+    iq->updated = 7;
-+}
-+
-+
-+/* Structures to export the Wireless Handlers */
-+static const iw_handler ath_handlers[] = {
-+    (iw_handler) NULL,                          /* SIOCSIWCOMMIT */
-+    (iw_handler) ar6000_ioctl_giwname,          /* SIOCGIWNAME */
-+    (iw_handler) NULL,                          /* SIOCSIWNWID */
-+    (iw_handler) NULL,                          /* SIOCGIWNWID */
-+    (iw_handler) ar6000_ioctl_siwfreq,          /* SIOCSIWFREQ */
-+    (iw_handler) ar6000_ioctl_giwfreq,          /* SIOCGIWFREQ */
-+    (iw_handler) ar6000_ioctl_siwmode,          /* SIOCSIWMODE */
-+    (iw_handler) ar6000_ioctl_giwmode,          /* SIOCGIWMODE */
-+    (iw_handler) ar6000_ioctl_siwsens,          /* SIOCSIWSENS */
-+    (iw_handler) ar6000_ioctl_giwsens,          /* SIOCGIWSENS */
-+    (iw_handler) NULL /* not _used */,          /* SIOCSIWRANGE */
-+    (iw_handler) ar6000_ioctl_giwrange,         /* SIOCGIWRANGE */
-+    (iw_handler) NULL /* not used */,           /* SIOCSIWPRIV */
-+    (iw_handler) NULL /* kernel code */,        /* SIOCGIWPRIV */
-+    (iw_handler) NULL /* not used */,           /* SIOCSIWSTATS */
-+    (iw_handler) NULL /* kernel code */,        /* SIOCGIWSTATS */
-+    (iw_handler) NULL,                          /* SIOCSIWSPY */
-+    (iw_handler) NULL,                          /* SIOCGIWSPY */
-+    (iw_handler) NULL,                          /* SIOCSIWTHRSPY */
-+    (iw_handler) NULL,                          /* SIOCGIWTHRSPY */
-+    (iw_handler) ar6000_ioctl_siwap,            /* SIOCSIWAP */
-+    (iw_handler) ar6000_ioctl_giwap,            /* SIOCGIWAP */
-+    (iw_handler) NULL,                          /* -- hole -- */
-+    (iw_handler) ar6000_ioctl_iwaplist,         /* SIOCGIWAPLIST */
-+    (iw_handler) ar6000_ioctl_siwscan,          /* SIOCSIWSCAN */
-+    (iw_handler) ar6000_ioctl_giwscan,          /* SIOCGIWSCAN */
-+    (iw_handler) ar6000_ioctl_siwessid,         /* SIOCSIWESSID */
-+    (iw_handler) ar6000_ioctl_giwessid,         /* SIOCGIWESSID */
-+    (iw_handler) NULL,                          /* SIOCSIWNICKN */
-+    (iw_handler) NULL,                          /* SIOCGIWNICKN */
-+    (iw_handler) NULL,                          /* -- hole -- */
-+    (iw_handler) NULL,                          /* -- hole -- */
-+    (iw_handler) ar6000_ioctl_siwrate,          /* SIOCSIWRATE */
-+    (iw_handler) ar6000_ioctl_giwrate,          /* SIOCGIWRATE */
-+    (iw_handler) NULL,           /* SIOCSIWRTS */
-+    (iw_handler) NULL,           /* SIOCGIWRTS */
-+    (iw_handler) NULL,          /* SIOCSIWFRAG */
-+    (iw_handler) NULL,          /* SIOCGIWFRAG */
-+    (iw_handler) ar6000_ioctl_siwtxpow,         /* SIOCSIWTXPOW */
-+    (iw_handler) ar6000_ioctl_giwtxpow,         /* SIOCGIWTXPOW */
-+    (iw_handler) ar6000_ioctl_siwretry,         /* SIOCSIWRETRY */
-+    (iw_handler) ar6000_ioctl_giwretry,         /* SIOCGIWRETRY */
-+    (iw_handler) ar6000_ioctl_siwencode,        /* SIOCSIWENCODE */
-+    (iw_handler) ar6000_ioctl_giwencode,        /* SIOCGIWENCODE */
-+    (iw_handler) ar6000_ioctl_siwpower,         /* SIOCSIWPOWER */
-+    (iw_handler) ar6000_ioctl_giwpower,         /* SIOCGIWPOWER */
-+    (iw_handler) NULL,        /* -- hole -- */
-+    (iw_handler) NULL,        /* -- hole -- */
-+    (iw_handler) ar6000_ioctl_siwgenie,       /* SIOCSIWGENIE */
-+    (iw_handler) ar6000_ioctl_giwgenie,       /* SIOCGIWGENIE */
-+    (iw_handler) ar6000_ioctl_siwauth,        /* SIOCSIWAUTH */
-+    (iw_handler) ar6000_ioctl_giwauth,        /* SIOCGIWAUTH */
-+    (iw_handler) ar6000_ioctl_siwencodeext,/* SIOCSIWENCODEEXT */
-+    (iw_handler) ar6000_ioctl_giwencodeext,/* SIOCGIWENCODEEXT */
-+    (iw_handler) NULL,                /* SIOCSIWPMKSA */
-+};
-+
-+static const iw_handler ath_priv_handlers[] = {
-+    (iw_handler) ar6000_ioctl_setparam,         /* SIOCWFIRSTPRIV+0 */
-+    (iw_handler) ar6000_ioctl_getparam,         /* SIOCWFIRSTPRIV+1 */
-+    (iw_handler) ar6000_ioctl_setkey,           /* SIOCWFIRSTPRIV+2 */
-+    (iw_handler) ar6000_ioctl_setwmmparams,     /* SIOCWFIRSTPRIV+3 */
-+    (iw_handler) ar6000_ioctl_delkey,           /* SIOCWFIRSTPRIV+4 */
-+    (iw_handler) ar6000_ioctl_getwmmparams,     /* SIOCWFIRSTPRIV+5 */
-+    (iw_handler) ar6000_ioctl_setoptie,         /* SIOCWFIRSTPRIV+6 */
-+    (iw_handler) ar6000_ioctl_setmlme,          /* SIOCWFIRSTPRIV+7 */
-+    (iw_handler) ar6000_ioctl_addpmkid,         /* SIOCWFIRSTPRIV+8 */
-+};
-+
-+#define IW_PRIV_TYPE_KEY \
-+    (IW_PRIV_TYPE_BYTE | sizeof(struct ieee80211req_key))
-+#define IW_PRIV_TYPE_DELKEY \
-+    (IW_PRIV_TYPE_BYTE | sizeof(struct ieee80211req_del_key))
-+#define IW_PRIV_TYPE_MLME \
-+    (IW_PRIV_TYPE_BYTE | sizeof(struct ieee80211req_mlme))
-+#define IW_PRIV_TYPE_ADDPMKID \
-+    (IW_PRIV_TYPE_BYTE | sizeof(struct ieee80211req_addpmkid))
-+
-+static const struct iw_priv_args ar6000_priv_args[] = {
-+    { IEEE80211_IOCTL_SETKEY,
-+      IW_PRIV_TYPE_KEY | IW_PRIV_SIZE_FIXED, 0,       "setkey"},
-+    { IEEE80211_IOCTL_DELKEY,
-+      IW_PRIV_TYPE_DELKEY | IW_PRIV_SIZE_FIXED, 0,    "delkey"},
-+    { IEEE80211_IOCTL_SETPARAM,
-+      IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, 0,   "setparam"},
-+    { IEEE80211_IOCTL_GETPARAM,
-+      IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-+      IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,      "getparam"},
-+    { IEEE80211_IOCTL_SETWMMPARAMS,
-+      IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 4, 0,   "setwmmparams"},
-+    { IEEE80211_IOCTL_GETWMMPARAMS,
-+      IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 3,
-+      IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,      "getwmmparams"},
-+    { IEEE80211_IOCTL_SETOPTIE,
-+      IW_PRIV_TYPE_BYTE, 0,       "setie"},
-+    { IEEE80211_IOCTL_SETMLME,
-+      IW_PRIV_TYPE_MLME, 0,       "setmlme"},
-+    { IEEE80211_IOCTL_ADDPMKID,
-+      IW_PRIV_TYPE_ADDPMKID | IW_PRIV_SIZE_FIXED, 0,  "addpmkid"},
-+};
-+
-+void ar6000_ioctl_iwsetup(struct iw_handler_def *def)
-+{
-+    def->private_args = (struct iw_priv_args *)ar6000_priv_args;
-+    def->num_private_args = ARRAY_SIZE(ar6000_priv_args);
-+}
-+
-+struct iw_handler_def ath_iw_handler_def = {
-+    .standard         = (iw_handler *)ath_handlers,
-+    .num_standard     = ARRAY_SIZE(ath_handlers),
-+    .private          = (iw_handler *)ath_priv_handlers,
-+    .num_private      = ARRAY_SIZE(ath_priv_handlers),
-+};
-+
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/bmi/bmi.c b/drivers/sdio/function/wlan/ar6000/bmi/bmi.c
-new file mode 100644
-index 0000000..d7b610c
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/bmi/bmi.c
-@@ -0,0 +1,657 @@
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "hif.h"
-+#include "bmi.h"
-+#include "htc_api.h"
-+#include "bmi_internal.h"
-+
-+/*
-+Although we had envisioned BMI to run on top of HTC, this is not what the
-+final implementation boiled down to on dragon. Its a part of BSP and does
-+not use the HTC protocol either. On the host side, however, we were still
-+living with the original idea. I think the time has come to accept the truth
-+and separate it from HTC which has been carrying BMI's burden all this while.
-+It shall make HTC state machine relatively simpler
-+*/
-+
-+/* APIs visible to the driver */
-+void
-+BMIInit(void)
-+{
-+    bmiDone = FALSE;
-+}
-+
-+A_STATUS
-+BMIDone(HIF_DEVICE *device)
-+{
-+    A_STATUS status;
-+    A_UINT32 cid;
-+
-+    if (bmiDone) {
-+        AR_DEBUG_PRINTF (ATH_DEBUG_BMI, ("BMIDone skipped\n"));
-+        return A_OK;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Done: Enter (device: 0x%p)\n", device));
-+    bmiDone = TRUE;
-+    cid = BMI_DONE;
-+
-+    status = bmiBufferSend(device, (A_UCHAR *)&cid, sizeof(cid));
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-+        return A_ERROR;
-+    }
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Done: Exit\n"));
-+
-+    return A_OK;
-+}
-+
-+A_STATUS
-+BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info)
-+{
-+    A_STATUS status;
-+    A_UINT32 cid;
-+
-+    if (bmiDone) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Get Target Info: Enter (device: 0x%p)\n", device));
-+    cid = BMI_GET_TARGET_INFO;
-+
-+    status = bmiBufferSend(device, (A_UCHAR *)&cid, sizeof(cid));
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-+        return A_ERROR;
-+    }
-+
-+    status = bmiBufferReceive(device, (A_UCHAR *)&targ_info->target_ver,
-+                                                sizeof(targ_info->target_ver));
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read Target Version from the device\n"));
-+        return A_ERROR;
-+    }
-+
-+    if (targ_info->target_ver == TARGET_VERSION_SENTINAL) {
-+        /* Determine how many bytes are in the Target's targ_info */
-+        status = bmiBufferReceive(device, (A_UCHAR *)&targ_info->target_info_byte_count,
-+                                            sizeof(targ_info->target_info_byte_count));
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read Target Info Byte Count from the device\n"));
-+            return A_ERROR;
-+        }
-+
-+        /*
-+         * The Target's targ_info doesn't match the Host's targ_info.
-+         * We need to do some backwards compatibility work to make this OK.
-+         */
-+        A_ASSERT(targ_info->target_info_byte_count == sizeof(*targ_info));
-+
-+        /* Read the remainder of the targ_info */
-+        status = bmiBufferReceive(device,
-+                        ((A_UCHAR *)targ_info)+sizeof(targ_info->target_info_byte_count),
-+                        sizeof(*targ_info)-sizeof(targ_info->target_info_byte_count));
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read Target Info (%d bytes) from the device\n",
-+                                                              targ_info->target_info_byte_count));
-+            return A_ERROR;
-+        }
-+    } else {
-+        /*
-+         * Target must be an AR6001 whose firmware does not
-+         * support BMI_GET_TARGET_INFO.  Construct the data
-+         * that it would have sent.
-+         */
-+        targ_info->target_info_byte_count = sizeof(targ_info);
-+        targ_info->target_type = TARGET_TYPE_AR6001;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Get Target Info: Exit (ver: 0x%x type: 0x%x)\n",
-+                                                              targ_info->target_ver, targ_info->target_type));
-+    printk("BMI Get Target Info: Exit (ver: 0x%x type: 0x%x)\n",
-+         targ_info->target_ver, targ_info->target_type);
-+
-+    return A_OK;
-+}
-+
-+A_STATUS
-+BMIReadMemory(HIF_DEVICE *device,
-+              A_UINT32 address,
-+              A_UCHAR *buffer,
-+              A_UINT32 length)
-+{
-+    A_UINT32 cid;
-+    A_STATUS status;
-+    A_UINT32 offset;
-+    A_UINT32 remaining, rxlen;
-+    static A_UCHAR data[BMI_DATASZ_MAX + sizeof(cid) + sizeof(address) + sizeof(length)];
-+    memset (&data, 0, BMI_DATASZ_MAX + sizeof(cid) + sizeof(address) + sizeof(length));
-+
-+    if (bmiDone) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-+                              ("BMI Read Memory: Enter (device: 0x%p, address: 0x%x, length: %d)\n",
-+                              device, address, length));
-+
-+    cid = BMI_READ_MEMORY;
-+
-+    remaining = length;
-+
-+    while (remaining)
-+    {
-+        rxlen = (remaining < BMI_DATASZ_MAX) ? remaining : BMI_DATASZ_MAX;
-+        offset = 0;
-+        A_MEMCPY(&data[offset], &cid, sizeof(cid));
-+        offset += sizeof(cid);
-+        A_MEMCPY(&data[offset], &address, sizeof(address));
-+        offset += sizeof(address);
-+        A_MEMCPY(&data[offset], &rxlen, sizeof(rxlen));
-+        offset += sizeof(length);
-+
-+        status = bmiBufferSend(device, data, offset);
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-+            return A_ERROR;
-+        }
-+        status = bmiBufferReceive(device, data, rxlen);
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));
-+            return A_ERROR;
-+        }
-+        A_MEMCPY(&buffer[length - remaining], data, rxlen);
-+        remaining -= rxlen; address += rxlen;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Read Memory: Exit\n"));
-+    return A_OK;
-+}
-+
-+A_STATUS
-+BMIWriteMemory(HIF_DEVICE *device,
-+               A_UINT32 address,
-+               A_UCHAR *buffer,
-+               A_UINT32 length)
-+{
-+    A_UINT32 cid;
-+    A_STATUS status;
-+    A_UINT32 offset;
-+    A_UINT32 remaining, txlen;
-+    const A_UINT32 header = sizeof(cid) + sizeof(address) + sizeof(length);
-+    static A_UCHAR data[BMI_DATASZ_MAX + sizeof(cid) + sizeof(address) + sizeof(length)];
-+      memset (&data, 0, header);
-+
-+    if (bmiDone) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-+         ("BMI Write Memory: Enter (device: 0x%p, address: 0x%x, length: %d)\n",
-+         device, address, length));
-+
-+    cid = BMI_WRITE_MEMORY;
-+
-+    remaining = length;
-+    while (remaining)
-+    {
-+        txlen = (remaining < (BMI_DATASZ_MAX - header)) ?
-+                                       remaining : (BMI_DATASZ_MAX - header);
-+        offset = 0;
-+        A_MEMCPY(&data[offset], &cid, sizeof(cid));
-+        offset += sizeof(cid);
-+        A_MEMCPY(&data[offset], &address, sizeof(address));
-+        offset += sizeof(address);
-+        A_MEMCPY(&data[offset], &txlen, sizeof(txlen));
-+        offset += sizeof(txlen);
-+        A_MEMCPY(&data[offset], &buffer[length - remaining], txlen);
-+        offset += txlen;
-+        status = bmiBufferSend(device, data, offset);
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-+            return A_ERROR;
-+        }
-+        remaining -= txlen; address += txlen;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Write Memory: Exit\n"));
-+
-+    return A_OK;
-+}
-+
-+A_STATUS
-+BMIExecute(HIF_DEVICE *device,
-+           A_UINT32 address,
-+           A_UINT32 *param)
-+{
-+    A_UINT32 cid;
-+    A_STATUS status;
-+    A_UINT32 offset;
-+    static A_UCHAR data[sizeof(cid) + sizeof(address) + sizeof(*param)];
-+    memset (&data, 0, sizeof(cid) + sizeof(address) + sizeof(*param));
-+
-+    if (bmiDone) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-+       ("BMI Execute: Enter (device: 0x%p, address: 0x%x, param: %d)\n",
-+        device, address, *param));
-+
-+    cid = BMI_EXECUTE;
-+
-+    offset = 0;
-+    A_MEMCPY(&data[offset], &cid, sizeof(cid));
-+    offset += sizeof(cid);
-+    A_MEMCPY(&data[offset], &address, sizeof(address));
-+    offset += sizeof(address);
-+    A_MEMCPY(&data[offset], param, sizeof(*param));
-+    offset += sizeof(*param);
-+    status = bmiBufferSend(device, data, offset);
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-+        return A_ERROR;
-+    }
-+
-+    status = bmiBufferReceive(device, data, sizeof(*param));
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));
-+        return A_ERROR;
-+    }
-+
-+    A_MEMCPY(param, data, sizeof(*param));
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Execute: Exit (param: %d)\n", *param));
-+    return A_OK;
-+}
-+
-+A_STATUS
-+BMISetAppStart(HIF_DEVICE *device,
-+               A_UINT32 address)
-+{
-+    A_UINT32 cid;
-+    A_STATUS status;
-+    A_UINT32 offset;
-+    static A_UCHAR data[sizeof(cid) + sizeof(address)];
-+    memset (&data, 0, sizeof(cid) + sizeof(address));
-+
-+    if (bmiDone) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-+       ("BMI Set App Start: Enter (device: 0x%p, address: 0x%x)\n",
-+        device, address));
-+
-+    cid = BMI_SET_APP_START;
-+
-+    offset = 0;
-+    A_MEMCPY(&data[offset], &cid, sizeof(cid));
-+    offset += sizeof(cid);
-+    A_MEMCPY(&data[offset], &address, sizeof(address));
-+    offset += sizeof(address);
-+    status = bmiBufferSend(device, data, offset);
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Set App Start: Exit\n"));
-+    return A_OK;
-+}
-+
-+A_STATUS
-+BMIReadSOCRegister(HIF_DEVICE *device,
-+                   A_UINT32 address,
-+                   A_UINT32 *param)
-+{
-+    A_UINT32 cid;
-+    A_STATUS status;
-+    A_UINT32 offset;
-+    static A_UCHAR data[sizeof(cid) + sizeof(address)];
-+    memset (&data, 0, sizeof(cid) + sizeof(address));
-+
-+    if (bmiDone) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-+       ("BMI Read SOC Register: Enter (device: 0x%p, address: 0x%x)\n",
-+       device, address));
-+
-+    cid = BMI_READ_SOC_REGISTER;
-+
-+    offset = 0;
-+    A_MEMCPY(&data[offset], &cid, sizeof(cid));
-+    offset += sizeof(cid);
-+    A_MEMCPY(&data[offset], &address, sizeof(address));
-+    offset += sizeof(address);
-+
-+    status = bmiBufferSend(device, data, offset);
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-+        return A_ERROR;
-+    }
-+
-+    status = bmiBufferReceive(device, data, sizeof(*param));
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));
-+        return A_ERROR;
-+    }
-+    A_MEMCPY(param, data, sizeof(*param));
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Read SOC Register: Exit (value: %d)\n", *param));
-+    return A_OK;
-+}
-+
-+A_STATUS
-+BMIWriteSOCRegister(HIF_DEVICE *device,
-+                    A_UINT32 address,
-+                    A_UINT32 param)
-+{
-+    A_UINT32 cid;
-+    A_STATUS status;
-+    A_UINT32 offset;
-+    static A_UCHAR data[sizeof(cid) + sizeof(address) + sizeof(param)];
-+
-+    memset (&data, 0, sizeof(cid) + sizeof(address) + sizeof(param));
-+
-+    if (bmiDone) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-+     ("BMI Write SOC Register: Enter (device: 0x%p, address: 0x%x, param: %d)\n",
-+     device, address, param));
-+
-+    cid = BMI_WRITE_SOC_REGISTER;
-+
-+    offset = 0;
-+    A_MEMCPY(&data[offset], &cid, sizeof(cid));
-+    offset += sizeof(cid);
-+    A_MEMCPY(&data[offset], &address, sizeof(address));
-+    offset += sizeof(address);
-+    A_MEMCPY(&data[offset], &param, sizeof(param));
-+    offset += sizeof(param);
-+    status = bmiBufferSend(device, data, offset);
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Read SOC Register: Exit\n"));
-+    return A_OK;
-+}
-+
-+A_STATUS
-+BMIrompatchInstall(HIF_DEVICE *device,
-+                   A_UINT32 ROM_addr,
-+                   A_UINT32 RAM_addr,
-+                   A_UINT32 nbytes,
-+                   A_UINT32 do_activate,
-+                   A_UINT32 *rompatch_id)
-+{
-+    A_UINT32 cid;
-+    A_STATUS status;
-+    A_UINT32 offset;
-+    static A_UCHAR data[sizeof(cid) + sizeof(ROM_addr) + sizeof(RAM_addr) +
-+                                sizeof(nbytes) + sizeof(do_activate)];
-+
-+      memset (&data, 0, sizeof(cid) + sizeof(ROM_addr) + sizeof(RAM_addr) +
-+                      sizeof(nbytes) + sizeof(do_activate));
-+
-+    if (bmiDone) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-+         ("BMI rompatch Install: Enter (device: 0x%p, ROMaddr: 0x%x, RAMaddr: 0x%x length: %d activate: %d)\n",
-+         device, ROM_addr, RAM_addr, nbytes, do_activate));
-+
-+    cid = BMI_ROMPATCH_INSTALL;
-+
-+    offset = 0;
-+    A_MEMCPY(&data[offset], &cid, sizeof(cid));
-+    offset += sizeof(cid);
-+    A_MEMCPY(&data[offset], &ROM_addr, sizeof(ROM_addr));
-+    offset += sizeof(ROM_addr);
-+    A_MEMCPY(&data[offset], &RAM_addr, sizeof(RAM_addr));
-+    offset += sizeof(RAM_addr);
-+    A_MEMCPY(&data[offset], &nbytes, sizeof(nbytes));
-+    offset += sizeof(nbytes);
-+    A_MEMCPY(&data[offset], &do_activate, sizeof(do_activate));
-+    offset += sizeof(do_activate);
-+    status = bmiBufferSend(device, data, offset);
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-+        return A_ERROR;
-+    }
-+
-+    status = bmiBufferReceive(device, (A_UCHAR *)rompatch_id, sizeof(*rompatch_id));
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI rompatch Install: (rompatch_id=%d)\n", *rompatch_id));
-+    return A_OK;
-+}
-+
-+A_STATUS
-+BMIrompatchUninstall(HIF_DEVICE *device,
-+                     A_UINT32 rompatch_id)
-+{
-+    A_UINT32 cid;
-+    A_STATUS status;
-+    A_UINT32 offset;
-+    static A_UCHAR data[sizeof(cid) + sizeof(rompatch_id)];
-+    memset (&data, 0, sizeof(cid) + sizeof(rompatch_id));
-+
-+    if (bmiDone) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-+         ("BMI rompatch Uninstall: Enter (device: 0x%p, rompatch_id: %d)\n",
-+                                                                       device, rompatch_id));
-+
-+    cid = BMI_ROMPATCH_UNINSTALL;
-+
-+    offset = 0;
-+    A_MEMCPY(&data[offset], &cid, sizeof(cid));
-+    offset += sizeof(cid);
-+    A_MEMCPY(&data[offset], &rompatch_id, sizeof(rompatch_id));
-+    offset += sizeof(rompatch_id);
-+    status = bmiBufferSend(device, data, offset);
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI rompatch UNinstall: (rompatch_id=0x%x)\n", rompatch_id));
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+_BMIrompatchChangeActivation(HIF_DEVICE *device,
-+                             A_UINT32 rompatch_count,
-+                             A_UINT32 *rompatch_list,
-+                             A_UINT32 do_activate)
-+{
-+    A_UINT32 cid;
-+    A_STATUS status;
-+    A_UINT32 offset;
-+    static A_UCHAR data[BMI_DATASZ_MAX + sizeof(cid) + sizeof(rompatch_count)];
-+    A_UINT32 length;
-+
-+      memset (&data, 0, BMI_DATASZ_MAX + sizeof(cid) + sizeof(rompatch_count));
-+
-+    if (bmiDone) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-+         ("BMI Change rompatch Activation: Enter (device: 0x%p, count: %d)\n",
-+           device, rompatch_count));
-+
-+    cid = do_activate ? BMI_ROMPATCH_ACTIVATE : BMI_ROMPATCH_DEACTIVATE;
-+
-+    offset = 0;
-+    A_MEMCPY(&data[offset], &cid, sizeof(cid));
-+    offset += sizeof(cid);
-+    A_MEMCPY(&data[offset], &rompatch_count, sizeof(rompatch_count));
-+    offset += sizeof(rompatch_count);
-+    length = rompatch_count * sizeof(*rompatch_list);
-+    A_MEMCPY(&data[offset], rompatch_list, length);
-+    offset += length;
-+    status = bmiBufferSend(device, data, offset);
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Change rompatch Activation: Exit\n"));
-+
-+    return A_OK;
-+}
-+
-+A_STATUS
-+BMIrompatchActivate(HIF_DEVICE *device,
-+                    A_UINT32 rompatch_count,
-+                    A_UINT32 *rompatch_list)
-+{
-+    return _BMIrompatchChangeActivation(device, rompatch_count, rompatch_list, 1);
-+}
-+
-+A_STATUS
-+BMIrompatchDeactivate(HIF_DEVICE *device,
-+                      A_UINT32 rompatch_count,
-+                      A_UINT32 *rompatch_list)
-+{
-+    return _BMIrompatchChangeActivation(device, rompatch_count, rompatch_list, 0);
-+}
-+
-+/* BMI Access routines */
-+A_STATUS
-+bmiBufferSend(HIF_DEVICE *device,
-+              A_UCHAR *buffer,
-+              A_UINT32 length)
-+{
-+    A_STATUS status;
-+    A_UINT32 timeout;
-+    A_UINT32 address;
-+    static A_UINT32 cmdCredits;
-+    A_UINT32 mboxAddress[HTC_MAILBOX_NUM_MAX];
-+
-+    HIFConfigureDevice(device, HIF_DEVICE_GET_MBOX_ADDR,
-+                       &mboxAddress, sizeof(mboxAddress));
-+
-+    cmdCredits = 0;
-+    timeout = BMI_COMMUNICATION_TIMEOUT;
-+
-+    while(timeout-- && !cmdCredits) {
-+        /* Read the counter register to get the command credits */
-+        address = COUNT_DEC_ADDRESS + (HTC_MAILBOX_NUM_MAX + ENDPOINT1) * 4;
-+        /* hit the credit counter with a 4-byte access, the first byte read will hit the counter and cause
-+         * a decrement, while the remaining 3 bytes has no effect.  The rationale behind this is to
-+         * make all HIF accesses 4-byte aligned */
-+        status = HIFReadWrite(device, address, (A_UINT8 *)&cmdCredits, 4,
-+            HIF_RD_SYNC_BYTE_INC, NULL);
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to decrement the command credit count register\n"));
-+            return A_ERROR;
-+        }
-+        /* the counter is only 8=bits, ignore anything in the upper 3 bytes */
-+        cmdCredits &= 0xFF;
-+    }
-+
-+    if (cmdCredits) {
-+        address = mboxAddress[ENDPOINT1];
-+        status = HIFReadWrite(device, address, buffer, length,
-+            HIF_WR_SYNC_BYTE_INC, NULL);
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to send the BMI data to the device\n"));
-+            return A_ERROR;
-+        }
-+    } else {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMI Communication timeout\n"));
-+        return A_ERROR;
-+    }
-+
-+    return status;
-+}
-+
-+A_STATUS
-+bmiBufferReceive(HIF_DEVICE *device,
-+                 A_UCHAR *buffer,
-+                 A_UINT32 length)
-+{
-+    A_STATUS status;
-+    A_UINT32 address;
-+    A_UINT32 timeout;
-+    static A_UINT32 cmdCredits;
-+    A_UINT32 mboxAddress[HTC_MAILBOX_NUM_MAX];
-+
-+    HIFConfigureDevice(device, HIF_DEVICE_GET_MBOX_ADDR,
-+                       &mboxAddress, sizeof(mboxAddress));
-+
-+    cmdCredits = 0;
-+    timeout = BMI_COMMUNICATION_TIMEOUT;
-+    while(timeout-- && !cmdCredits) {
-+        /* Read the counter register to get the command credits */
-+        address = COUNT_ADDRESS + (HTC_MAILBOX_NUM_MAX + ENDPOINT1) * 1;
-+        /* read the counter using a 4-byte read.  Since the counter is NOT auto-decrementing,
-+         * we can read this counter multiple times using a non-incrementing address mode.
-+         * The rationale here is to make all HIF accesses a multiple of 4 bytes */
-+        status = HIFReadWrite(device, address, (A_UINT8 *)&cmdCredits, sizeof(cmdCredits),
-+            HIF_RD_SYNC_BYTE_FIX, NULL);
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read the command credit count register\n"));
-+            return A_ERROR;
-+        }
-+            /* we did a 4-byte read to the same count register so mask off upper bytes */
-+        cmdCredits &= 0xFF;
-+        status = A_ERROR;
-+    }
-+
-+    if (cmdCredits) {
-+        address = mboxAddress[ENDPOINT1];
-+        status = HIFReadWrite(device, address, buffer, length,
-+            HIF_RD_SYNC_BYTE_INC, NULL);
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read the BMI data from the device\n"));
-+            return A_ERROR;
-+        }
-+    } else {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Communication timeout\n"));
-+        return A_ERROR;
-+    }
-+
-+    return status;
-+}
-diff --git a/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h b/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h
-new file mode 100644
-index 0000000..1e21354
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h
-@@ -0,0 +1,45 @@
-+#ifndef BMI_INTERNAL_H
-+#define BMI_INTERNAL_H
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "a_config.h"
-+#include "athdefs.h"
-+#include "a_types.h"
-+#include "a_osapi.h"
-+#include "a_debug.h"
-+#include "AR6Khwreg.h"
-+#include "bmi_msg.h"
-+
-+#define BMI_COMMUNICATION_TIMEOUT       100000
-+
-+/* ------ Global Variable Declarations ------- */
-+A_BOOL bmiDone;
-+
-+A_STATUS
-+bmiBufferSend(HIF_DEVICE *device,
-+              A_UCHAR *buffer,
-+              A_UINT32 length);
-+
-+A_STATUS
-+bmiBufferReceive(HIF_DEVICE *device,
-+                 A_UCHAR *buffer,
-+                 A_UINT32 length);
-+
-+#endif
-diff --git a/drivers/sdio/function/wlan/ar6000/hif/hif.c b/drivers/sdio/function/wlan/ar6000/hif/hif.c
-new file mode 100644
-index 0000000..f5a0986
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/hif/hif.c
-@@ -0,0 +1,818 @@
-+/*
-+ * @file: hif.c
-+ *
-+ * @abstract: HIF layer reference implementation for Atheros SDIO stack
-+ *
-+ * @notice: Copyright (c) 2004-2006 Atheros Communications 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "hif_internal.h"
-+
-+/* ------ Static Variables ------ */
-+
-+/* ------ Global Variable Declarations ------- */
-+SD_PNP_INFO Ids[] = {
-+    {
-+        .SDIO_ManufacturerID = MANUFACTURER_ID_AR6001_BASE | 0xB,
-+        .SDIO_ManufacturerCode = MANUFACTURER_CODE,
-+        .SDIO_FunctionClass = FUNCTION_CLASS,
-+        .SDIO_FunctionNo = 1
-+    },
-+    {
-+        .SDIO_ManufacturerID = MANUFACTURER_ID_AR6001_BASE | 0xA,
-+        .SDIO_ManufacturerCode = MANUFACTURER_CODE,
-+        .SDIO_FunctionClass = FUNCTION_CLASS,
-+        .SDIO_FunctionNo = 1
-+    },
-+    {
-+        .SDIO_ManufacturerID = MANUFACTURER_ID_AR6001_BASE | 0x9,
-+        .SDIO_ManufacturerCode = MANUFACTURER_CODE,
-+        .SDIO_FunctionClass = FUNCTION_CLASS,
-+        .SDIO_FunctionNo = 1
-+    },
-+    {
-+        .SDIO_ManufacturerID = MANUFACTURER_ID_AR6001_BASE | 0x8,
-+        .SDIO_ManufacturerCode = MANUFACTURER_CODE,
-+        .SDIO_FunctionClass = FUNCTION_CLASS,
-+        .SDIO_FunctionNo = 1
-+    },
-+    {
-+        .SDIO_ManufacturerID = MANUFACTURER_ID_AR6002_BASE | 0x0,
-+        .SDIO_ManufacturerCode = MANUFACTURER_CODE,
-+        .SDIO_FunctionClass = FUNCTION_CLASS,
-+        .SDIO_FunctionNo = 1
-+    },
-+    {
-+        .SDIO_ManufacturerID = MANUFACTURER_ID_AR6002_BASE | 0x1,
-+        .SDIO_ManufacturerCode = MANUFACTURER_CODE,
-+        .SDIO_FunctionClass = FUNCTION_CLASS,
-+        .SDIO_FunctionNo = 1
-+    },
-+    {
-+    }                      //list is null termintaed
-+};
-+
-+TARGET_FUNCTION_CONTEXT FunctionContext = {
-+    .function.Version    = CT_SDIO_STACK_VERSION_CODE,
-+    .function.pName      = "sdio_wlan",
-+    .function.MaxDevices = 1,
-+    .function.NumDevices = 0,
-+    .function.pIds       = Ids,
-+    .function.pProbe     = hifDeviceInserted,
-+    .function.pRemove    = hifDeviceRemoved,
-+    .function.pSuspend   = NULL,
-+    .function.pResume    = NULL,
-+    .function.pWake      = NULL,
-+    .function.pContext   = &FunctionContext,
-+};
-+
-+HIF_DEVICE hifDevice[HIF_MAX_DEVICES];
-+HTC_CALLBACKS htcCallbacks;
-+BUS_REQUEST busRequest[BUS_REQUEST_MAX_NUM];
-+static BUS_REQUEST *s_busRequestFreeQueue = NULL;
-+OS_CRITICALSECTION lock;
-+extern A_UINT32 onebitmode;
-+extern A_UINT32 busspeedlow;
-+extern A_UINT32 debughif;
-+
-+#ifdef DEBUG
-+#define ATH_DEBUG_ERROR 1
-+#define ATH_DEBUG_WARN  2
-+#define ATH_DEBUG_TRACE 3
-+#define _AR_DEBUG_PRINTX_ARG(arg...) arg
-+#define AR_DEBUG_PRINTF(lvl, args)\
-+    {if (lvl <= debughif)\
-+        A_PRINTF(KERN_ALERT _AR_DEBUG_PRINTX_ARG args);\
-+    }
-+#else
-+#define AR_DEBUG_PRINTF(lvl, args)
-+#endif
-+
-+static BUS_REQUEST *hifAllocateBusRequest(void);
-+static void hifFreeBusRequest(BUS_REQUEST *busrequest);
-+static THREAD_RETURN insert_helper_func(POSKERNEL_HELPER pHelper);
-+static void ResetAllCards(void);
-+
-+/* ------ Functions ------ */
-+int HIFInit(HTC_CALLBACKS *callbacks)
-+{
-+    SDIO_STATUS status;
-+    DBG_ASSERT(callbacks != NULL);
-+
-+    /* Store the callback and event handlers */
-+    htcCallbacks.deviceInsertedHandler = callbacks->deviceInsertedHandler;
-+    htcCallbacks.deviceRemovedHandler = callbacks->deviceRemovedHandler;
-+    htcCallbacks.deviceSuspendHandler = callbacks->deviceSuspendHandler;
-+    htcCallbacks.deviceResumeHandler = callbacks->deviceResumeHandler;
-+    htcCallbacks.deviceWakeupHandler = callbacks->deviceWakeupHandler;
-+    htcCallbacks.rwCompletionHandler = callbacks->rwCompletionHandler;
-+    htcCallbacks.dsrHandler = callbacks->dsrHandler;
-+
-+    CriticalSectionInit(&lock);
-+
-+    /* Register with bus driver core */
-+    status = SDIO_RegisterFunction(&FunctionContext.function);
-+    DBG_ASSERT(SDIO_SUCCESS(status));
-+
-+    return(0);
-+}
-+
-+A_STATUS
-+HIFReadWrite(HIF_DEVICE *device,
-+             A_UINT32 address,
-+             A_UCHAR *buffer,
-+             A_UINT32 length,
-+             A_UINT32 request,
-+             void *context)
-+{
-+    A_UINT8 rw;
-+    A_UINT8 mode;
-+    A_UINT8 funcNo;
-+    A_UINT8 opcode;
-+    A_UINT16 count;
-+    SDREQUEST *sdrequest;
-+    SDIO_STATUS sdiostatus;
-+    BUS_REQUEST *busrequest;
-+    A_STATUS    status = A_OK;
-+
-+    DBG_ASSERT(device != NULL);
-+    DBG_ASSERT(device->handle != NULL);
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Device: %p\n", device));
-+
-+    do {
-+        busrequest = hifAllocateBusRequest();
-+        if (busrequest == NULL) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR, ("HIF Unable to allocate bus request\n"));
-+            status = A_NO_RESOURCE;
-+            break;
-+        }
-+
-+        sdrequest = busrequest->request;
-+        busrequest->context = context;
-+
-+        sdrequest->pDataBuffer = buffer;
-+        if (request & HIF_SYNCHRONOUS) {
-+            sdrequest->Flags = SDREQ_FLAGS_RESP_SDIO_R5 | SDREQ_FLAGS_DATA_TRANS;
-+            sdrequest->pCompleteContext = NULL;
-+            sdrequest->pCompletion = NULL;
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Execution mode: Synchronous\n"));
-+        } else if (request & HIF_ASYNCHRONOUS) {
-+            sdrequest->Flags = SDREQ_FLAGS_RESP_SDIO_R5 | SDREQ_FLAGS_DATA_TRANS |
-+                               SDREQ_FLAGS_TRANS_ASYNC;
-+            sdrequest->pCompleteContext = busrequest;
-+            sdrequest->pCompletion = hifRWCompletionHandler;
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Execution mode: Asynchronous\n"));
-+        } else {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-+                            ("Invalid execution mode: 0x%08x\n", request));
-+            status = A_EINVAL;
-+            break;
-+        }
-+
-+        if (request & HIF_EXTENDED_IO) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Command type: CMD53\n"));
-+            sdrequest->Command = CMD53;
-+        } else {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-+                            ("Invalid command type: 0x%08x\n", request));
-+            status = A_EINVAL;
-+            break;
-+        }
-+
-+        if (request & HIF_BLOCK_BASIS) {
-+            mode = CMD53_BLOCK_BASIS;
-+            sdrequest->BlockLen = HIF_MBOX_BLOCK_SIZE;
-+            sdrequest->BlockCount = length / HIF_MBOX_BLOCK_SIZE;
-+            count = sdrequest->BlockCount;
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-+                            ("Block mode (BlockLen: %d, BlockCount: %d)\n",
-+                            sdrequest->BlockLen, sdrequest->BlockCount));
-+        } else if (request & HIF_BYTE_BASIS) {
-+            mode = CMD53_BYTE_BASIS;
-+            sdrequest->BlockLen = length;
-+            sdrequest->BlockCount = 1;
-+            count = sdrequest->BlockLen;
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-+                            ("Byte mode (BlockLen: %d, BlockCount: %d)\n",
-+                            sdrequest->BlockLen, sdrequest->BlockCount));
-+        } else {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-+                            ("Invalid data mode: 0x%08x\n", request));
-+            status = A_EINVAL;
-+            break;
-+        }
-+
-+#if 0
-+        /* useful for checking register accesses */
-+        if (length & 0x3) {
-+            A_PRINTF(KERN_ALERT"HIF (%s) is not a multiple of 4 bytes, addr:0x%X, len:%d\n",
-+                                request & HIF_WRITE ? "write":"read", address, length);
-+        }
-+#endif
-+
-+        if ((address >= HIF_MBOX_START_ADDR(0)) &&
-+            (address <= HIF_MBOX_END_ADDR(3)))
-+        {
-+
-+            DBG_ASSERT(length <= HIF_MBOX_WIDTH);
-+
-+            /*
-+             * Mailbox write. Adjust the address so that the last byte
-+             * falls on the EOM address.
-+             */
-+            address += (HIF_MBOX_WIDTH - length);
-+        }
-+
-+
-+
-+        if (request & HIF_WRITE) {
-+            rw = CMD53_WRITE;
-+            sdrequest->Flags |= SDREQ_FLAGS_DATA_WRITE;
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Direction: Write\n"));
-+        } else if (request & HIF_READ) {
-+            rw = CMD53_READ;
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Direction: Read\n"));
-+        } else {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-+                            ("Invalid direction: 0x%08x\n", request));
-+            status = A_EINVAL;
-+            break;
-+        }
-+
-+        if (request & HIF_FIXED_ADDRESS) {
-+            opcode = CMD53_FIXED_ADDRESS;
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Address mode: Fixed\n"));
-+        } else if (request & HIF_INCREMENTAL_ADDRESS) {
-+            opcode = CMD53_INCR_ADDRESS;
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Address mode: Incremental\n"));
-+        } else {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-+                            ("Invalid address mode: 0x%08x\n", request));
-+            status = A_EINVAL;
-+            break;
-+        }
-+
-+        funcNo = SDDEVICE_GET_SDIO_FUNCNO(device->handle);
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Function number: %d\n", funcNo));
-+        SDIO_SET_CMD53_ARG(sdrequest->Argument, rw, funcNo,
-+                           mode, opcode, address, count);
-+
-+        /* Send the command out */
-+        sdiostatus = SDDEVICE_CALL_REQUEST_FUNC(device->handle, sdrequest);
-+
-+        if (!SDIO_SUCCESS(sdiostatus)) {
-+            status = A_ERROR;
-+        }
-+
-+    } while (FALSE);
-+
-+    if (A_FAILED(status) || (request & HIF_SYNCHRONOUS)) {
-+        if (busrequest != NULL) {
-+            hifFreeBusRequest(busrequest);
-+        }
-+    }
-+
-+    if (A_FAILED(status) && (request & HIF_ASYNCHRONOUS)) {
-+            /* call back async handler on failure */
-+        htcCallbacks.rwCompletionHandler(context, status);
-+    }
-+
-+    return status;
-+}
-+
-+A_STATUS
-+HIFConfigureDevice(HIF_DEVICE *device, HIF_DEVICE_CONFIG_OPCODE opcode,
-+                   void *config, A_UINT32 configLen)
-+{
-+    A_UINT32 count;
-+
-+    switch(opcode) {
-+        case HIF_DEVICE_GET_MBOX_BLOCK_SIZE:
-+            ((A_UINT32 *)config)[0] = HIF_MBOX0_BLOCK_SIZE;
-+            ((A_UINT32 *)config)[1] = HIF_MBOX1_BLOCK_SIZE;
-+            ((A_UINT32 *)config)[2] = HIF_MBOX2_BLOCK_SIZE;
-+            ((A_UINT32 *)config)[3] = HIF_MBOX3_BLOCK_SIZE;
-+            break;
-+
-+        case HIF_DEVICE_GET_MBOX_ADDR:
-+            for (count = 0; count < 4; count ++) {
-+                ((A_UINT32 *)config)[count] = HIF_MBOX_START_ADDR(count);
-+            }
-+            break;
-+        case HIF_DEVICE_GET_IRQ_PROC_MODE:
-+                /* the SDIO stack allows the interrupts to be processed either way, ASYNC or SYNC */
-+            *((HIF_DEVICE_IRQ_PROCESSING_MODE *)config) = HIF_DEVICE_IRQ_ASYNC_SYNC;
-+            break;
-+        default:
-+            AR_DEBUG_PRINTF(ATH_DEBUG_WARN,
-+                            ("Unsupported configuration opcode: %d\n", opcode));
-+            return A_ERROR;
-+    }
-+
-+    return A_OK;
-+}
-+
-+void
-+HIFShutDownDevice(HIF_DEVICE *device)
-+{
-+    A_UINT8 data;
-+    A_UINT32 count;
-+    SDIO_STATUS status;
-+    SDCONFIG_BUS_MODE_DATA busSettings;
-+    SDCONFIG_FUNC_ENABLE_DISABLE_DATA fData;
-+
-+    if (device != NULL) {
-+        DBG_ASSERT(device->handle != NULL);
-+
-+        /* Remove the allocated current if any */
-+        status = SDLIB_IssueConfig(device->handle,
-+                                   SDCONFIG_FUNC_FREE_SLOT_CURRENT, NULL, 0);
-+        DBG_ASSERT(SDIO_SUCCESS(status));
-+
-+        /* Disable the card */
-+        fData.EnableFlags = SDCONFIG_DISABLE_FUNC;
-+        fData.TimeOut = 1;
-+        status = SDLIB_IssueConfig(device->handle, SDCONFIG_FUNC_ENABLE_DISABLE,
-+                                   &fData, sizeof(fData));
-+        DBG_ASSERT(SDIO_SUCCESS(status));
-+
-+        /* Perform a soft I/O reset */
-+        data = SDIO_IO_RESET;
-+        status = SDLIB_IssueCMD52(device->handle, 0, SDIO_IO_ABORT_REG,
-+                                  &data, 1, 1);
-+        DBG_ASSERT(SDIO_SUCCESS(status));
-+
-+        /*
-+         * WAR - Codetelligence driver does not seem to shutdown correctly in 1
-+         * bit mode. By default it configures the HC in the 4 bit. Its later in
-+         * our driver that we switch to 1 bit mode. If we try to shutdown, the
-+         * driver hangs so we revert to 4 bit mode, to be transparent to the
-+         * underlying bus driver.
-+         */
-+        if (onebitmode) {
-+            ZERO_OBJECT(busSettings);
-+            busSettings.BusModeFlags = SDDEVICE_GET_BUSMODE_FLAGS(device->handle);
-+            SDCONFIG_SET_BUS_WIDTH(busSettings.BusModeFlags,
-+                                   SDCONFIG_BUS_WIDTH_4_BIT);
-+
-+            /* Issue config request to change the bus width to 4 bit */
-+            status = SDLIB_IssueConfig(device->handle, SDCONFIG_BUS_MODE_CTRL,
-+                                       &busSettings,
-+                                       sizeof(SDCONFIG_BUS_MODE_DATA));
-+            DBG_ASSERT(SDIO_SUCCESS(status));
-+        }
-+
-+        /* Free the bus requests */
-+        for (count = 0; count < BUS_REQUEST_MAX_NUM; count ++) {
-+            SDDeviceFreeRequest(device->handle, busRequest[count].request);
-+        }
-+        /* Clean up the queue */
-+        s_busRequestFreeQueue = NULL;
-+    } else {
-+            /* since we are unloading the driver anyways, reset all cards in case the SDIO card
-+             * is externally powered and we are unloading the SDIO stack.  This avoids the problem when
-+             * the SDIO stack is reloaded and attempts are made to re-enumerate a card that is already
-+             * enumerated */
-+        ResetAllCards();
-+        /* Unregister with bus driver core */
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-+                        ("Unregistering with the bus driver\n"));
-+        status = SDIO_UnregisterFunction(&FunctionContext.function);
-+        DBG_ASSERT(SDIO_SUCCESS(status));
-+    }
-+}
-+
-+void
-+hifRWCompletionHandler(SDREQUEST *request)
-+{
-+    A_STATUS status;
-+    void *context;
-+    BUS_REQUEST *busrequest;
-+
-+    if (SDIO_SUCCESS(request->Status)) {
-+        status = A_OK;
-+    } else {
-+        status = A_ERROR;
-+    }
-+
-+    DBG_ASSERT(status == A_OK);
-+    busrequest = (BUS_REQUEST *) request->pCompleteContext;
-+    context = (void *) busrequest->context;
-+        /* free the request before calling the callback, in case the
-+         * callback submits another request, this guarantees that
-+         * there is at least 1 free request available everytime the callback
-+         * is invoked */
-+    hifFreeBusRequest(busrequest);
-+    htcCallbacks.rwCompletionHandler(context, status);
-+}
-+
-+void
-+hifIRQHandler(void *context)
-+{
-+    A_STATUS status;
-+    HIF_DEVICE *device;
-+
-+    device = (HIF_DEVICE *)context;
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Device: %p\n", device));
-+    status = htcCallbacks.dsrHandler(device->htc_handle);
-+    DBG_ASSERT(status == A_OK);
-+}
-+
-+BOOL
-+hifDeviceInserted(SDFUNCTION *function, SDDEVICE *handle)
-+{
-+    BOOL enabled;
-+    A_UINT8 data;
-+    A_UINT32 count;
-+    HIF_DEVICE *device;
-+    SDIO_STATUS status;
-+    A_UINT16 maxBlocks;
-+    A_UINT16 maxBlockSize;
-+    SDCONFIG_BUS_MODE_DATA busSettings;
-+    SDCONFIG_FUNC_ENABLE_DISABLE_DATA fData;
-+    TARGET_FUNCTION_CONTEXT *functionContext;
-+    SDCONFIG_FUNC_SLOT_CURRENT_DATA slotCurrent;
-+    SD_BUSCLOCK_RATE                currentBusClock;
-+
-+    DBG_ASSERT(function != NULL);
-+    DBG_ASSERT(handle != NULL);
-+
-+    device = addHifDevice(handle);
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Device: %p\n", device));
-+    functionContext =  (TARGET_FUNCTION_CONTEXT *)function->pContext;
-+
-+    /*
-+     * Issue commands to get the manufacturer ID and stuff and compare it
-+     * against the rev Id derived from the ID registered during the
-+     * initialization process. Report the device only in the case there
-+     * is a match. In the case od SDIO, the bus driver has already queried
-+     * these details so we just need to use their data structures to get the
-+     * relevant values. Infact, the driver has already matched it against
-+     * the Ids that we registered with it so we dont need to the step here.
-+     */
-+
-+    /* Configure the SDIO Bus Width */
-+    if (onebitmode) {
-+        data = SDIO_BUS_WIDTH_1_BIT;
-+        status = SDLIB_IssueCMD52(handle, 0, SDIO_BUS_IF_REG, &data, 1, 1);
-+        if (!SDIO_SUCCESS(status)) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-+                            ("Unable to set the bus width to 1 bit\n"));
-+            return FALSE;
-+        }
-+    }
-+
-+    /* Get current bus flags */
-+    ZERO_OBJECT(busSettings);
-+
-+    busSettings.BusModeFlags = SDDEVICE_GET_BUSMODE_FLAGS(handle);
-+    if (onebitmode) {
-+        SDCONFIG_SET_BUS_WIDTH(busSettings.BusModeFlags,
-+                               SDCONFIG_BUS_WIDTH_1_BIT);
-+    }
-+
-+        /* get the current operating clock, the bus driver sets us up based
-+         * on what our CIS reports and what the host controller can handle
-+         * we can use this to determine whether we want to drop our clock rate
-+         * down */
-+    currentBusClock = SDDEVICE_GET_OPER_CLOCK(handle);
-+    busSettings.ClockRate = currentBusClock;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-+                        ("HIF currently running at: %d \n",currentBusClock));
-+
-+        /* see if HIF wants to run at a lower clock speed, we may already be
-+         * at that lower clock speed */
-+    if (currentBusClock > (SDIO_CLOCK_FREQUENCY_DEFAULT >> busspeedlow)) {
-+        busSettings.ClockRate = SDIO_CLOCK_FREQUENCY_DEFAULT >> busspeedlow;
-+        AR_DEBUG_PRINTF(ATH_DEBUG_WARN,
-+                        ("HIF overriding clock to %d \n",busSettings.ClockRate));
-+    }
-+
-+    /* Issue config request to override clock rate */
-+    status = SDLIB_IssueConfig(handle, SDCONFIG_FUNC_CHANGE_BUS_MODE, &busSettings,
-+                               sizeof(SDCONFIG_BUS_MODE_DATA));
-+    if (!SDIO_SUCCESS(status)) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-+                        ("Unable to configure the host clock\n"));
-+        return FALSE;
-+    } else {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-+                        ("Configured clock: %d, Maximum clock: %d\n",
-+                        busSettings.ActualClockRate,
-+                        SDDEVICE_GET_MAX_CLOCK(handle)));
-+    }
-+
-+    /*
-+     * Check if the target supports block mode. This result of this check
-+     * can be used to implement the HIFReadWrite API.
-+     */
-+    if (SDDEVICE_GET_SDIO_FUNC_MAXBLKSIZE(handle)) {
-+        /* Limit block size to operational block limit or card function
-+           capability */
-+        maxBlockSize = min(SDDEVICE_GET_OPER_BLOCK_LEN(handle),
-+                           SDDEVICE_GET_SDIO_FUNC_MAXBLKSIZE(handle));
-+
-+        /* check if the card support multi-block transfers */
-+        if (!(SDDEVICE_GET_SDIOCARD_CAPS(handle) & SDIO_CAPS_MULTI_BLOCK)) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Byte basis only\n"));
-+
-+            /* Limit block size to max byte basis */
-+            maxBlockSize =  min(maxBlockSize,
-+                                (A_UINT16)SDIO_MAX_LENGTH_BYTE_BASIS);
-+            maxBlocks = 1;
-+        } else {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Multi-block capable\n"));
-+            maxBlocks = SDDEVICE_GET_OPER_BLOCKS(handle);
-+            status = SDLIB_SetFunctionBlockSize(handle, HIF_MBOX_BLOCK_SIZE);
-+            if (!SDIO_SUCCESS(status)) {
-+                AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-+                                ("Failed to set block size. Err:%d\n", status));
-+                return FALSE;
-+            }
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-+                        ("Bytes Per Block: %d bytes, Block Count:%d \n",
-+                        maxBlockSize, maxBlocks));
-+    } else {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-+                        ("Function does not support Block Mode!\n"));
-+        return FALSE;
-+    }
-+
-+    /* Allocate the slot current */
-+    status = SDLIB_GetDefaultOpCurrent(handle, &slotCurrent.SlotCurrent);
-+    if (SDIO_SUCCESS(status)) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Allocating Slot current: %d mA\n",
-+                                slotCurrent.SlotCurrent));
-+        status = SDLIB_IssueConfig(handle, SDCONFIG_FUNC_ALLOC_SLOT_CURRENT,
-+                                   &slotCurrent, sizeof(slotCurrent));
-+        if (!SDIO_SUCCESS(status)) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-+                            ("Failed to allocate slot current %d\n", status));
-+            return FALSE;
-+        }
-+    }
-+
-+    /* Enable the dragon function */
-+    count = 0;
-+    enabled = FALSE;
-+    fData.TimeOut = 1;
-+    fData.EnableFlags = SDCONFIG_ENABLE_FUNC;
-+    while ((count++ < SDWLAN_ENABLE_DISABLE_TIMEOUT) && !enabled)
-+    {
-+        /* Enable dragon */
-+        status = SDLIB_IssueConfig(handle, SDCONFIG_FUNC_ENABLE_DISABLE,
-+                                   &fData, sizeof(fData));
-+        if (!SDIO_SUCCESS(status)) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-+                            ("Attempting to enable the card again\n"));
-+            continue;
-+        }
-+
-+        /* Mark the status as enabled */
-+        enabled = TRUE;
-+    }
-+
-+    /* Check if we were succesful in enabling the target */
-+    if (!enabled) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-+                        ("Failed to communicate with the target\n"));
-+        return FALSE;
-+    }
-+
-+    /* Allocate the bus requests to be used later */
-+    A_MEMZERO(busRequest, sizeof(busRequest));
-+    for (count = 0; count < BUS_REQUEST_MAX_NUM; count ++) {
-+        if ((busRequest[count].request = SDDeviceAllocRequest(handle)) == NULL){
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR, ("Unable to allocate memory\n"));
-+            /* TODO: Free the memory that has already been allocated */
-+            return FALSE;
-+        }
-+        hifFreeBusRequest(&busRequest[count]);
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-+                ("0x%08x = busRequest[%d].request = 0x%08x\n",
-+                              (unsigned int) &busRequest[count], count,
-+                              (unsigned int) busRequest[count].request));
-+    }
-+
-+        /* Schedule a worker to handle device inserted, this is a temporary workaround
-+         * to fix a deadlock if the device fails to intialize in the insertion handler
-+         * The failure causes the instance to shutdown the HIF layer and unregister the
-+         * function driver within the busdriver probe context which can deadlock
-+         *
-+         * NOTE: we cannot use the default work queue because that would block
-+         * SD bus request processing for all synchronous I/O. We must use a kernel
-+         * thread that is creating using the helper library.
-+         * */
-+
-+    if (SDIO_SUCCESS(SDLIB_OSCreateHelper(&device->insert_helper,
-+                         insert_helper_func,
-+                         device))) {
-+        device->helper_started = TRUE;
-+    }
-+
-+    return TRUE;
-+}
-+
-+static THREAD_RETURN insert_helper_func(POSKERNEL_HELPER pHelper)
-+{
-+
-+    /*
-+     * Adding a wait of around a second before we issue the very first
-+     * command to dragon. During the process of loading/unloading the
-+     * driver repeatedly it was observed that we get a data timeout
-+     * while accessing function 1 registers in the chip. The theory at
-+     * this point is that some initialization delay in dragon is
-+     * causing the SDIO state in dragon core to be not ready even after
-+     * the ready bit indicates that function 1 is ready. Accomodating
-+     * for this behavior by adding some delay in the driver before it
-+     * issues the first command after switching on dragon. Need to
-+     * investigate this a bit more - TODO
-+     */
-+
-+    A_MDELAY(1000);
-+        /* Inform HTC */
-+    if ((htcCallbacks.deviceInsertedHandler(SD_GET_OS_HELPER_CONTEXT(pHelper))) != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Device rejected\n"));
-+    }
-+
-+    return 0;
-+}
-+
-+void
-+HIFAckInterrupt(HIF_DEVICE *device)
-+{
-+    SDIO_STATUS status;
-+    DBG_ASSERT(device != NULL);
-+    DBG_ASSERT(device->handle != NULL);
-+
-+    /* Acknowledge our function IRQ */
-+    status = SDLIB_IssueConfig(device->handle, SDCONFIG_FUNC_ACK_IRQ,
-+                               NULL, 0);
-+    DBG_ASSERT(SDIO_SUCCESS(status));
-+}
-+
-+void
-+HIFUnMaskInterrupt(HIF_DEVICE *device)
-+{
-+    SDIO_STATUS status;
-+
-+    DBG_ASSERT(device != NULL);
-+    DBG_ASSERT(device->handle != NULL);
-+
-+    /* Register the IRQ Handler */
-+    SDDEVICE_SET_IRQ_HANDLER(device->handle, hifIRQHandler, device);
-+
-+    /* Unmask our function IRQ */
-+    status = SDLIB_IssueConfig(device->handle, SDCONFIG_FUNC_UNMASK_IRQ,
-+                               NULL, 0);
-+    DBG_ASSERT(SDIO_SUCCESS(status));
-+}
-+
-+void HIFMaskInterrupt(HIF_DEVICE *device)
-+{
-+    SDIO_STATUS status;
-+    DBG_ASSERT(device != NULL);
-+    DBG_ASSERT(device->handle != NULL);
-+
-+    /* Mask our function IRQ */
-+    status = SDLIB_IssueConfig(device->handle, SDCONFIG_FUNC_MASK_IRQ,
-+                               NULL, 0);
-+    DBG_ASSERT(SDIO_SUCCESS(status));
-+
-+    /* Unregister the IRQ Handler */
-+    SDDEVICE_SET_IRQ_HANDLER(device->handle, NULL, NULL);
-+}
-+
-+static BUS_REQUEST *hifAllocateBusRequest(void)
-+{
-+    BUS_REQUEST *busrequest;
-+
-+    /* Acquire lock */
-+    CriticalSectionAcquire(&lock);
-+
-+    /* Remove first in list */
-+    if((busrequest = s_busRequestFreeQueue) != NULL)
-+    {
-+        s_busRequestFreeQueue = busrequest->next;
-+    }
-+
-+    /* Release lock */
-+    CriticalSectionRelease(&lock);
-+
-+    return busrequest;
-+}
-+
-+static void
-+hifFreeBusRequest(BUS_REQUEST *busrequest)
-+{
-+    DBG_ASSERT(busrequest != NULL);
-+
-+    /* Acquire lock */
-+    CriticalSectionAcquire(&lock);
-+
-+    /* Insert first in list */
-+    busrequest->next = s_busRequestFreeQueue;
-+    s_busRequestFreeQueue = busrequest;
-+
-+    /* Release lock */
-+    CriticalSectionRelease(&lock);
-+}
-+
-+void
-+hifDeviceRemoved(SDFUNCTION *function, SDDEVICE *handle)
-+{
-+    A_STATUS status;
-+    HIF_DEVICE *device;
-+    DBG_ASSERT(function != NULL);
-+    DBG_ASSERT(handle != NULL);
-+
-+    device = getHifDevice(handle);
-+    status = htcCallbacks.deviceRemovedHandler(device->htc_handle, A_OK);
-+
-+        /* cleanup the helper thread */
-+    if (device->helper_started) {
-+        SDLIB_OSDeleteHelper(&device->insert_helper);
-+        device->helper_started = FALSE;
-+    }
-+
-+    delHifDevice(handle);
-+    DBG_ASSERT(status == A_OK);
-+}
-+
-+HIF_DEVICE *
-+addHifDevice(SDDEVICE *handle)
-+{
-+    DBG_ASSERT(handle != NULL);
-+    hifDevice[0].handle = handle;
-+    return &hifDevice[0];
-+}
-+
-+HIF_DEVICE *
-+getHifDevice(SDDEVICE *handle)
-+{
-+    DBG_ASSERT(handle != NULL);
-+    return &hifDevice[0];
-+}
-+
-+void
-+delHifDevice(SDDEVICE *handle)
-+{
-+    DBG_ASSERT(handle != NULL);
-+    hifDevice[0].handle = NULL;
-+}
-+
-+static void ResetAllCards(void)
-+{
-+    UINT8       data;
-+    SDIO_STATUS status;
-+    int         i;
-+
-+    data = SDIO_IO_RESET;
-+
-+    /* set the I/O CARD reset bit:
-+     * NOTE: we are exploiting a "feature" of the SDIO core that resets the core when you
-+     * set the RES bit in the SDIO_IO_ABORT register.  This bit however "normally" resets the
-+     * I/O functions leaving the SDIO core in the same state (as per SDIO spec).
-+     * In this design, this reset can be used to reset the SDIO core itself */
-+    for (i = 0; i < HIF_MAX_DEVICES; i++) {
-+        if (hifDevice[i].handle != NULL) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-+                        ("Issuing I/O Card reset for instance: %d \n",i));
-+                /* set the I/O Card reset bit */
-+            status = SDLIB_IssueCMD52(hifDevice[i].handle,
-+                                      0,                    /* function 0 space */
-+                                      SDIO_IO_ABORT_REG,
-+                                      &data,
-+                                      1,                    /* 1 byte */
-+                                      TRUE);                /* write */
-+        }
-+    }
-+
-+}
-+
-+void HIFSetHandle(void *hif_handle, void *handle)
-+{
-+    HIF_DEVICE *device = (HIF_DEVICE *) hif_handle;
-+
-+    device->htc_handle = handle;
-+
-+    return;
-+}
-diff --git a/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h b/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h
-new file mode 100644
-index 0000000..d8fc101
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h
-@@ -0,0 +1,102 @@
-+/*
-+ * @file: hif_internal.h
-+ *
-+ * @abstract: internal header file for hif layer
-+ *
-+ * @notice: Copyright (c) 2004-2006 Atheros Communications 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include <linux/sdio/ctsystem.h>
-+#include <linux/sdio/sdio_busdriver.h>
-+#include <linux/sdio/_sdio_defs.h>
-+#include <linux/sdio/sdio_lib.h>
-+#include "a_config.h"
-+#include "athdefs.h"
-+#include "a_types.h"
-+#include "a_osapi.h"
-+#include "hif.h"
-+
-+#define MANUFACTURER_ID_AR6001_BASE        0x100
-+#define MANUFACTURER_ID_AR6002_BASE        0x200
-+#define FUNCTION_CLASS                     0x0
-+#define MANUFACTURER_CODE                  0x271
-+
-+#define BUS_REQUEST_MAX_NUM                64
-+
-+#define SDIO_CLOCK_FREQUENCY_DEFAULT       25000000
-+#define SDWLAN_ENABLE_DISABLE_TIMEOUT      20
-+#define FLAGS_CARD_ENAB                    0x02
-+#define FLAGS_CARD_IRQ_UNMSK               0x04
-+
-+#define HIF_MBOX_BLOCK_SIZE                128
-+#define HIF_MBOX_BASE_ADDR                 0x800
-+#define HIF_MBOX_WIDTH                     0x800
-+#define HIF_MBOX0_BLOCK_SIZE               1
-+#define HIF_MBOX1_BLOCK_SIZE               HIF_MBOX_BLOCK_SIZE
-+#define HIF_MBOX2_BLOCK_SIZE               HIF_MBOX_BLOCK_SIZE
-+#define HIF_MBOX3_BLOCK_SIZE               HIF_MBOX_BLOCK_SIZE
-+
-+#define HIF_MBOX_START_ADDR(mbox)                        \
-+    HIF_MBOX_BASE_ADDR + mbox * HIF_MBOX_WIDTH
-+
-+#define HIF_MBOX_END_ADDR(mbox)                                \
-+    HIF_MBOX_START_ADDR(mbox) + HIF_MBOX_WIDTH - 1
-+
-+struct hif_device {
-+    SDDEVICE *handle;
-+    void *htc_handle;
-+    OSKERNEL_HELPER insert_helper;
-+    BOOL  helper_started;
-+};
-+
-+typedef struct target_function_context {
-+    SDFUNCTION           function; /* function description of the bus driver */
-+    OS_SEMAPHORE         instanceSem; /* instance lock. Unused */
-+    SDLIST               instanceList; /* list of instances. Unused */
-+} TARGET_FUNCTION_CONTEXT;
-+
-+typedef struct bus_request {
-+    struct bus_request *next;
-+    SDREQUEST *request;
-+    void *context;
-+} BUS_REQUEST;
-+
-+BOOL
-+hifDeviceInserted(SDFUNCTION *function, SDDEVICE *device);
-+
-+void
-+hifDeviceRemoved(SDFUNCTION *function, SDDEVICE *device);
-+
-+SDREQUEST *
-+hifAllocateDeviceRequest(SDDEVICE *device);
-+
-+void
-+hifFreeDeviceRequest(SDREQUEST *request);
-+
-+void
-+hifRWCompletionHandler(SDREQUEST *request);
-+
-+void
-+hifIRQHandler(void *context);
-+
-+HIF_DEVICE *
-+addHifDevice(SDDEVICE *handle);
-+
-+HIF_DEVICE *
-+getHifDevice(SDDEVICE *handle);
-+
-+void
-+delHifDevice(SDDEVICE *handle);
-diff --git a/drivers/sdio/function/wlan/ar6000/htc/ar6k.c b/drivers/sdio/function/wlan/ar6000/htc/ar6k.c
-new file mode 100644
-index 0000000..0fd671a
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/htc/ar6k.c
-@@ -0,0 +1,991 @@
-+/*
-+ * AR6K device layer that handles register level I/O
-+ *
-+ * Copyright (c) 2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+#include "a_config.h"
-+#include "athdefs.h"
-+#include "a_types.h"
-+#include "AR6Khwreg.h"
-+#include "a_osapi.h"
-+#include "a_debug.h"
-+#include "hif.h"
-+#include "htc_packet.h"
-+#include "ar6k.h"
-+
-+#define MAILBOX_FOR_BLOCK_SIZE 1
-+
-+extern A_UINT32 resetok;
-+
-+static A_STATUS DevEnableInterrupts(AR6K_DEVICE *pDev);
-+static A_STATUS DevDisableInterrupts(AR6K_DEVICE *pDev);
-+
-+#define LOCK_AR6K(p)      A_MUTEX_LOCK(&(p)->Lock);
-+#define UNLOCK_AR6K(p)    A_MUTEX_UNLOCK(&(p)->Lock);
-+
-+void AR6KFreeIOPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket)
-+{
-+    LOCK_AR6K(pDev);
-+    HTC_PACKET_ENQUEUE(&pDev->RegisterIOList,pPacket);
-+    UNLOCK_AR6K(pDev);
-+}
-+
-+HTC_PACKET *AR6KAllocIOPacket(AR6K_DEVICE *pDev)
-+{
-+    HTC_PACKET *pPacket;
-+
-+    LOCK_AR6K(pDev);
-+    pPacket = HTC_PACKET_DEQUEUE(&pDev->RegisterIOList);
-+    UNLOCK_AR6K(pDev);
-+
-+    return pPacket;
-+}
-+
-+A_STATUS DevSetup(AR6K_DEVICE *pDev)
-+{
-+    A_UINT32 mailboxaddrs[AR6K_MAILBOXES];
-+    A_UINT32 blocksizes[AR6K_MAILBOXES];
-+    A_STATUS status = A_OK;
-+    int      i;
-+
-+    AR_DEBUG_ASSERT(AR6K_IRQ_PROC_REGS_SIZE == 16);
-+    AR_DEBUG_ASSERT(AR6K_IRQ_ENABLE_REGS_SIZE == 4);
-+
-+    do {
-+            /* give a handle to HIF for this target */
-+        HIFSetHandle(pDev->HIFDevice, (void *)pDev);
-+            /* initialize our free list of IO packets */
-+        INIT_HTC_PACKET_QUEUE(&pDev->RegisterIOList);
-+        A_MUTEX_INIT(&pDev->Lock);
-+
-+            /* get the addresses for all 4 mailboxes */
-+        status = HIFConfigureDevice(pDev->HIFDevice, HIF_DEVICE_GET_MBOX_ADDR,
-+                                    mailboxaddrs, sizeof(mailboxaddrs));
-+
-+        if (status != A_OK) {
-+            AR_DEBUG_ASSERT(FALSE);
-+            break;
-+        }
-+
-+            /* carve up register I/O packets (these are for ASYNC register I/O ) */
-+        for (i = 0; i < AR6K_MAX_REG_IO_BUFFERS; i++) {
-+            HTC_PACKET *pIOPacket;
-+            pIOPacket = &pDev->RegIOBuffers[i].HtcPacket;
-+            SET_HTC_PACKET_INFO_RX_REFILL(pIOPacket,
-+                                          pDev,
-+                                          pDev->RegIOBuffers[i].Buffer,
-+                                          AR6K_REG_IO_BUFFER_SIZE,
-+                                          0); /* don't care */
-+            AR6KFreeIOPacket(pDev,pIOPacket);
-+        }
-+
-+            /* get the address of the mailbox we are using */
-+        pDev->MailboxAddress = mailboxaddrs[HTC_MAILBOX];
-+
-+            /* get the block sizes */
-+        status = HIFConfigureDevice(pDev->HIFDevice, HIF_DEVICE_GET_MBOX_BLOCK_SIZE,
-+                                    blocksizes, sizeof(blocksizes));
-+
-+        if (status != A_OK) {
-+            AR_DEBUG_ASSERT(FALSE);
-+            break;
-+        }
-+
-+            /* note: we actually get the block size of a mailbox other than 0, for SDIO the block
-+             * size on mailbox 0 is artificially set to 1.  So we use the block size that is set
-+             * for the other 3 mailboxes */
-+        pDev->BlockSize = blocksizes[MAILBOX_FOR_BLOCK_SIZE];
-+            /* must be a power of 2 */
-+        AR_DEBUG_ASSERT((pDev->BlockSize & (pDev->BlockSize - 1)) == 0);
-+
-+            /* assemble mask, used for padding to a block */
-+        pDev->BlockMask = pDev->BlockSize - 1;
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("BlockSize: %d, MailboxAddress:0x%X \n",
-+                    pDev->BlockSize, pDev->MailboxAddress));
-+
-+        pDev->GetPendingEventsFunc = NULL;
-+            /* see if the HIF layer implements the get pending events function  */
-+        HIFConfigureDevice(pDev->HIFDevice,
-+                           HIF_DEVICE_GET_PENDING_EVENTS_FUNC,
-+                           &pDev->GetPendingEventsFunc,
-+                           sizeof(pDev->GetPendingEventsFunc));
-+
-+            /* assume we can process HIF interrupt events asynchronously */
-+        pDev->HifIRQProcessingMode = HIF_DEVICE_IRQ_ASYNC_SYNC;
-+
-+            /* see if the HIF layer overrides this assumption */
-+        HIFConfigureDevice(pDev->HIFDevice,
-+                           HIF_DEVICE_GET_IRQ_PROC_MODE,
-+                           &pDev->HifIRQProcessingMode,
-+                           sizeof(pDev->HifIRQProcessingMode));
-+
-+        switch (pDev->HifIRQProcessingMode) {
-+            case HIF_DEVICE_IRQ_SYNC_ONLY:
-+                AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("HIF Interrupt processing is SYNC ONLY\n"));
-+                break;
-+            case HIF_DEVICE_IRQ_ASYNC_SYNC:
-+                AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("HIF Interrupt processing is ASYNC and SYNC\n"));
-+                break;
-+            default:
-+                AR_DEBUG_ASSERT(FALSE);
-+        }
-+
-+        pDev->HifMaskUmaskRecvEvent = NULL;
-+
-+            /* see if the HIF layer implements the mask/unmask recv events function  */
-+        HIFConfigureDevice(pDev->HIFDevice,
-+                           HIF_DEVICE_GET_RECV_EVENT_MASK_UNMASK_FUNC,
-+                           &pDev->HifMaskUmaskRecvEvent,
-+                           sizeof(pDev->HifMaskUmaskRecvEvent));
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("HIF special overrides : 0x%X , 0x%X\n",
-+                 (A_UINT32)pDev->GetPendingEventsFunc, (A_UINT32)pDev->HifMaskUmaskRecvEvent));
-+
-+        status = DevDisableInterrupts(pDev);
-+
-+    } while (FALSE);
-+
-+    if (A_FAILED(status)) {
-+            /* make sure handle is cleared */
-+        HIFSetHandle(pDev->HIFDevice, NULL);
-+    }
-+
-+    return status;
-+
-+}
-+
-+static A_STATUS DevEnableInterrupts(AR6K_DEVICE *pDev)
-+{
-+    A_STATUS                  status;
-+    AR6K_IRQ_ENABLE_REGISTERS regs;
-+
-+    LOCK_AR6K(pDev);
-+
-+        /* Enable all the interrupts except for the dragon interrupt */
-+    pDev->IrqEnableRegisters.int_status_enable = INT_STATUS_ENABLE_ERROR_SET(0x01) |
-+                                      INT_STATUS_ENABLE_CPU_SET(0x01) |
-+                                      INT_STATUS_ENABLE_COUNTER_SET(0x01);
-+
-+    if (NULL == pDev->GetPendingEventsFunc) {
-+        pDev->IrqEnableRegisters.int_status_enable |= INT_STATUS_ENABLE_MBOX_DATA_SET(0x01);
-+    } else {
-+        /* The HIF layer provided us with a pending events function which means that
-+         * the detection of pending mbox messages is handled in the HIF layer.
-+         * This is the case for the SPI2 interface.
-+         * In the normal case we enable MBOX interrupts, for the case
-+         * with HIFs that offer this mechanism, we keep these interrupts
-+         * masked */
-+        pDev->IrqEnableRegisters.int_status_enable &= ~INT_STATUS_ENABLE_MBOX_DATA_SET(0x01);
-+    }
-+
-+
-+    /* Set up the CPU Interrupt Status Register */
-+    pDev->IrqEnableRegisters.cpu_int_status_enable = CPU_INT_STATUS_ENABLE_BIT_SET(0x00);
-+
-+    /* Set up the Error Interrupt Status Register */
-+    pDev->IrqEnableRegisters.error_status_enable =
-+                                  ERROR_STATUS_ENABLE_RX_UNDERFLOW_SET(0x01) |
-+                                  ERROR_STATUS_ENABLE_TX_OVERFLOW_SET(0x01);
-+
-+    /* Set up the Counter Interrupt Status Register (only for debug interrupt to catch fatal errors) */
-+    pDev->IrqEnableRegisters.counter_int_status_enable =
-+        COUNTER_INT_STATUS_ENABLE_BIT_SET(AR6K_TARGET_DEBUG_INTR_MASK);
-+
-+        /* copy into our temp area */
-+    A_MEMCPY(&regs,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);
-+
-+    UNLOCK_AR6K(pDev);
-+
-+        /* always synchronous */
-+    status = HIFReadWrite(pDev->HIFDevice,
-+                          INT_STATUS_ENABLE_ADDRESS,
-+                          &regs.int_status_enable,
-+                          AR6K_IRQ_ENABLE_REGS_SIZE,
-+                          HIF_WR_SYNC_BYTE_INC,
-+                          NULL);
-+
-+    if (status != A_OK) {
-+        /* Can't write it for some reason */
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                        ("Failed to update interrupt control registers err: %d\n", status));
-+
-+    }
-+
-+    return status;
-+}
-+
-+static A_STATUS DevDisableInterrupts(AR6K_DEVICE *pDev)
-+{
-+    AR6K_IRQ_ENABLE_REGISTERS regs;
-+
-+    LOCK_AR6K(pDev);
-+        /* Disable all interrupts */
-+    pDev->IrqEnableRegisters.int_status_enable = 0;
-+    pDev->IrqEnableRegisters.cpu_int_status_enable = 0;
-+    pDev->IrqEnableRegisters.error_status_enable = 0;
-+    pDev->IrqEnableRegisters.counter_int_status_enable = 0;
-+        /* copy into our temp area */
-+    A_MEMCPY(&regs,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);
-+
-+    UNLOCK_AR6K(pDev);
-+
-+        /* always synchronous */
-+    return HIFReadWrite(pDev->HIFDevice,
-+                        INT_STATUS_ENABLE_ADDRESS,
-+                        &regs.int_status_enable,
-+                        AR6K_IRQ_ENABLE_REGS_SIZE,
-+                        HIF_WR_SYNC_BYTE_INC,
-+                        NULL);
-+}
-+
-+/* enable device interrupts */
-+A_STATUS DevUnmaskInterrupts(AR6K_DEVICE *pDev)
-+{
-+        /* Unmask the host controller interrupts */
-+    HIFUnMaskInterrupt(pDev->HIFDevice);
-+
-+    return DevEnableInterrupts(pDev);
-+}
-+
-+/* disable all device interrupts */
-+A_STATUS DevMaskInterrupts(AR6K_DEVICE *pDev)
-+{
-+    A_STATUS status;
-+
-+    status = DevDisableInterrupts(pDev);
-+
-+    if (A_SUCCESS(status)) {
-+            /* Disable the interrupt at the HIF layer */
-+        HIFMaskInterrupt(pDev->HIFDevice);
-+    }
-+
-+    return status;
-+}
-+
-+/* callback when our fetch to enable/disable completes */
-+static void DevDoEnableDisableRecvAsyncHandler(void *Context, HTC_PACKET *pPacket)
-+{
-+    AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevDoEnableDisableRecvAsyncHandler: (dev: 0x%X)\n", (A_UINT32)pDev));
-+
-+    if (A_FAILED(pPacket->Status)) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                (" Failed to disable receiver, status:%d \n", pPacket->Status));
-+    }
-+        /* free this IO packet */
-+    AR6KFreeIOPacket(pDev,pPacket);
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("-DevDoEnableDisableRecvAsyncHandler \n"));
-+}
-+
-+/* disable packet reception (used in case the host runs out of buffers)
-+ * this is the "override" method when the HIF reports another methods to
-+ * disable recv events */
-+static A_STATUS DevDoEnableDisableRecvOverride(AR6K_DEVICE *pDev, A_BOOL EnableRecv, A_BOOL AsyncMode)
-+{
-+    A_STATUS                  status = A_OK;
-+    HTC_PACKET                *pIOPacket = NULL;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("DevDoEnableDisableRecvOverride: Enable:%d Mode:%d\n",
-+            EnableRecv,AsyncMode));
-+
-+    do {
-+
-+        if (AsyncMode) {
-+
-+            pIOPacket = AR6KAllocIOPacket(pDev);
-+
-+            if (NULL == pIOPacket) {
-+                status = A_NO_MEMORY;
-+                AR_DEBUG_ASSERT(FALSE);
-+                break;
-+            }
-+
-+                /* stick in our completion routine when the I/O operation completes */
-+            pIOPacket->Completion = DevDoEnableDisableRecvAsyncHandler;
-+            pIOPacket->pContext = pDev;
-+
-+                /* call the HIF layer override and do this asynchronously */
-+            status = pDev->HifMaskUmaskRecvEvent(pDev->HIFDevice,
-+                                                 EnableRecv ? HIF_UNMASK_RECV : HIF_MASK_RECV,
-+                                                 pIOPacket);
-+            break;
-+        }
-+
-+            /* if we get here we are doing it synchronously */
-+        status = pDev->HifMaskUmaskRecvEvent(pDev->HIFDevice,
-+                                             EnableRecv ? HIF_UNMASK_RECV : HIF_MASK_RECV,
-+                                             NULL);
-+
-+    } while (FALSE);
-+
-+    if (A_FAILED(status) && (pIOPacket != NULL)) {
-+        AR6KFreeIOPacket(pDev,pIOPacket);
-+    }
-+
-+    return status;
-+}
-+
-+/* disable packet reception (used in case the host runs out of buffers)
-+ * this is the "normal" method using the interrupt enable registers through
-+ * the host I/F */
-+static A_STATUS DevDoEnableDisableRecvNormal(AR6K_DEVICE *pDev, A_BOOL EnableRecv, A_BOOL AsyncMode)
-+{
-+    A_STATUS                  status = A_OK;
-+    HTC_PACKET                *pIOPacket = NULL;
-+    AR6K_IRQ_ENABLE_REGISTERS regs;
-+
-+        /* take the lock to protect interrupt enable shadows */
-+    LOCK_AR6K(pDev);
-+
-+    if (EnableRecv) {
-+        pDev->IrqEnableRegisters.int_status_enable |= INT_STATUS_ENABLE_MBOX_DATA_SET(0x01);
-+    } else {
-+        pDev->IrqEnableRegisters.int_status_enable &= ~INT_STATUS_ENABLE_MBOX_DATA_SET(0x01);
-+    }
-+
-+        /* copy into our temp area */
-+    A_MEMCPY(&regs,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);
-+    UNLOCK_AR6K(pDev);
-+
-+    do {
-+
-+        if (AsyncMode) {
-+
-+            pIOPacket = AR6KAllocIOPacket(pDev);
-+
-+            if (NULL == pIOPacket) {
-+                status = A_NO_MEMORY;
-+                AR_DEBUG_ASSERT(FALSE);
-+                break;
-+            }
-+
-+                /* copy values to write to our async I/O buffer */
-+            A_MEMCPY(pIOPacket->pBuffer,&regs,AR6K_IRQ_ENABLE_REGS_SIZE);
-+
-+                /* stick in our completion routine when the I/O operation completes */
-+            pIOPacket->Completion = DevDoEnableDisableRecvAsyncHandler;
-+            pIOPacket->pContext = pDev;
-+
-+                /* write it out asynchronously */
-+            HIFReadWrite(pDev->HIFDevice,
-+                         INT_STATUS_ENABLE_ADDRESS,
-+                         pIOPacket->pBuffer,
-+                         AR6K_IRQ_ENABLE_REGS_SIZE,
-+                         HIF_WR_ASYNC_BYTE_INC,
-+                         pIOPacket);
-+            break;
-+        }
-+
-+        /* if we get here we are doing it synchronously */
-+
-+        status = HIFReadWrite(pDev->HIFDevice,
-+                              INT_STATUS_ENABLE_ADDRESS,
-+                              &regs.int_status_enable,
-+                              AR6K_IRQ_ENABLE_REGS_SIZE,
-+                              HIF_WR_SYNC_BYTE_INC,
-+                              NULL);
-+
-+    } while (FALSE);
-+
-+    if (A_FAILED(status) && (pIOPacket != NULL)) {
-+        AR6KFreeIOPacket(pDev,pIOPacket);
-+    }
-+
-+    return status;
-+}
-+
-+
-+A_STATUS DevStopRecv(AR6K_DEVICE *pDev, A_BOOL AsyncMode)
-+{
-+    if (NULL == pDev->HifMaskUmaskRecvEvent) {
-+        return DevDoEnableDisableRecvNormal(pDev,FALSE,AsyncMode);
-+    } else {
-+        return DevDoEnableDisableRecvOverride(pDev,FALSE,AsyncMode);
-+    }
-+}
-+
-+A_STATUS DevEnableRecv(AR6K_DEVICE *pDev, A_BOOL AsyncMode)
-+{
-+    if (NULL == pDev->HifMaskUmaskRecvEvent) {
-+        return DevDoEnableDisableRecvNormal(pDev,TRUE,AsyncMode);
-+    } else {
-+        return DevDoEnableDisableRecvOverride(pDev,TRUE,AsyncMode);
-+    }
-+}
-+
-+void DevDumpRegisters(AR6K_IRQ_PROC_REGISTERS   *pIrqProcRegs,
-+                      AR6K_IRQ_ENABLE_REGISTERS *pIrqEnableRegs)
-+{
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_DUMP, ("\n<------- Register Table -------->\n"));
-+
-+    if (pIrqProcRegs != NULL) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-+            ("Int Status:               0x%x\n",pIrqProcRegs->host_int_status));
-+        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-+            ("CPU Int Status:            0x%x\n",pIrqProcRegs->cpu_int_status));
-+        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-+            ("Error Int Status:          0x%x\n",pIrqProcRegs->error_int_status));
-+        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-+            ("Counter Int Status:        0x%x\n",pIrqProcRegs->counter_int_status));
-+        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-+            ("Mbox Frame:                0x%x\n",pIrqProcRegs->mbox_frame));
-+        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-+            ("Rx Lookahead Valid:        0x%x\n",pIrqProcRegs->rx_lookahead_valid));
-+        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-+            ("Rx Lookahead 0:            0x%x\n",pIrqProcRegs->rx_lookahead[0]));
-+        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-+            ("Rx Lookahead 1:            0x%x\n",pIrqProcRegs->rx_lookahead[1]));
-+    }
-+
-+    if (pIrqEnableRegs != NULL) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-+            ("Int Status Enable:         0x%x\n",pIrqEnableRegs->int_status_enable));
-+        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-+            ("Counter Int Status Enable: 0x%x\n",pIrqEnableRegs->counter_int_status_enable));
-+        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP, ("<------------------------------->\n"));
-+    }
-+}
-+
-+
-+#ifdef MBOXHW_UNIT_TEST
-+
-+
-+/* This is a mailbox hardware unit test that must be called in a schedulable context
-+ * This test is very simple, it will send a list of buffers with a counting pattern
-+ * and the target will invert the data and send the message back
-+ *
-+ * the unit test has the following constraints:
-+ *
-+ * The target has at least 8 buffers of 256 bytes each. The host will send
-+ * the following pattern of buffers in rapid succession :
-+ *
-+ * 1 buffer - 128 bytes
-+ * 1 buffer - 256 bytes
-+ * 1 buffer - 512 bytes
-+ * 1 buffer - 1024 bytes
-+ *
-+ * The host will send the buffers to one mailbox and wait for buffers to be reflected
-+ * back from the same mailbox. The target sends the buffers FIFO order.
-+ * Once the final buffer has been received for a mailbox, the next mailbox is tested.
-+ *
-+ *
-+ * Note:  To simplifythe test , we assume that the chosen buffer sizes
-+ *        will fall on a nice block pad
-+ *
-+ * It is expected that higher-order tests will be written to stress the mailboxes using
-+ * a message-based protocol (with some performance timming) that can create more
-+ * randomness in the packets sent over mailboxes.
-+ *
-+ * */
-+
-+#define A_ROUND_UP_PWR2(x, align)    (((int) (x) + ((align)-1)) & ~((align)-1))
-+
-+#define BUFFER_BLOCK_PAD 128
-+
-+#if 0
-+#define BUFFER1 128
-+#define BUFFER2 256
-+#define BUFFER3 512
-+#define BUFFER4 1024
-+#endif
-+
-+#if 1
-+#define BUFFER1 80
-+#define BUFFER2 200
-+#define BUFFER3 444
-+#define BUFFER4 800
-+#endif
-+
-+#define TOTAL_BYTES (A_ROUND_UP_PWR2(BUFFER1,BUFFER_BLOCK_PAD) + \
-+                     A_ROUND_UP_PWR2(BUFFER2,BUFFER_BLOCK_PAD) + \
-+                     A_ROUND_UP_PWR2(BUFFER3,BUFFER_BLOCK_PAD) + \
-+                     A_ROUND_UP_PWR2(BUFFER4,BUFFER_BLOCK_PAD) )
-+
-+#define TEST_BYTES (BUFFER1 +  BUFFER2 + BUFFER3 + BUFFER4)
-+
-+#define TEST_CREDITS_RECV_TIMEOUT 100
-+
-+static A_UINT8  g_Buffer[TOTAL_BYTES];
-+static A_UINT32 g_MailboxAddrs[AR6K_MAILBOXES];
-+static A_UINT32 g_BlockSizes[AR6K_MAILBOXES];
-+
-+#define BUFFER_PROC_LIST_DEPTH 4
-+
-+typedef struct _BUFFER_PROC_LIST{
-+    A_UINT8  *pBuffer;
-+    A_UINT32 length;
-+}BUFFER_PROC_LIST;
-+
-+
-+#define PUSH_BUFF_PROC_ENTRY(pList,len,pCurrpos) \
-+{                                                   \
-+    (pList)->pBuffer = (pCurrpos);                  \
-+    (pList)->length = (len);                        \
-+    (pCurrpos) += (len);                            \
-+    (pList)++;                                      \
-+}
-+
-+/* a simple and crude way to send different "message" sizes */
-+static void AssembleBufferList(BUFFER_PROC_LIST *pList)
-+{
-+    A_UINT8 *pBuffer = g_Buffer;
-+
-+#if BUFFER_PROC_LIST_DEPTH < 4
-+#error "Buffer processing list depth is not deep enough!!"
-+#endif
-+
-+    PUSH_BUFF_PROC_ENTRY(pList,BUFFER1,pBuffer);
-+    PUSH_BUFF_PROC_ENTRY(pList,BUFFER2,pBuffer);
-+    PUSH_BUFF_PROC_ENTRY(pList,BUFFER3,pBuffer);
-+    PUSH_BUFF_PROC_ENTRY(pList,BUFFER4,pBuffer);
-+
-+}
-+
-+#define FILL_ZERO     TRUE
-+#define FILL_COUNTING FALSE
-+static void InitBuffers(A_BOOL Zero)
-+{
-+    A_UINT16 *pBuffer16 = (A_UINT16 *)g_Buffer;
-+    int      i;
-+
-+        /* fill buffer with 16 bit counting pattern or zeros */
-+    for (i = 0; i <  (TOTAL_BYTES / 2) ; i++) {
-+        if (!Zero) {
-+            pBuffer16[i] = (A_UINT16)i;
-+        } else {
-+            pBuffer16[i] = 0;
-+        }
-+    }
-+}
-+
-+
-+static A_BOOL CheckOneBuffer(A_UINT16 *pBuffer16, int Length)
-+{
-+    int      i;
-+    A_UINT16 startCount;
-+    A_BOOL   success = TRUE;
-+
-+        /* get the starting count */
-+    startCount = pBuffer16[0];
-+        /* invert it, this is the expected value */
-+    startCount = ~startCount;
-+        /* scan the buffer and verify */
-+    for (i = 0; i < (Length / 2) ; i++,startCount++) {
-+            /* target will invert all the data */
-+        if ((A_UINT16)pBuffer16[i] != (A_UINT16)~startCount) {
-+            success = FALSE;
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Invalid Data Got:0x%X, Expecting:0x%X (offset:%d, total:%d) \n",
-+                        pBuffer16[i], ((A_UINT16)~startCount), i, Length));
-+             AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("0x%X 0x%X 0x%X 0x%X \n",
-+                        pBuffer16[i], pBuffer16[i + 1], pBuffer16[i + 2],pBuffer16[i+3]));
-+            break;
-+        }
-+    }
-+
-+    return success;
-+}
-+
-+static A_BOOL CheckBuffers(void)
-+{
-+    int      i;
-+    A_BOOL   success = TRUE;
-+    BUFFER_PROC_LIST checkList[BUFFER_PROC_LIST_DEPTH];
-+
-+        /* assemble the list */
-+    AssembleBufferList(checkList);
-+
-+        /* scan the buffers and verify */
-+    for (i = 0; i < BUFFER_PROC_LIST_DEPTH ; i++) {
-+        success = CheckOneBuffer((A_UINT16 *)checkList[i].pBuffer, checkList[i].length);
-+        if (!success) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Buffer : 0x%X, Length:%d failed verify \n",
-+                        (A_UINT32)checkList[i].pBuffer, checkList[i].length));
-+            break;
-+        }
-+    }
-+
-+    return success;
-+}
-+
-+    /* find the end marker for the last buffer we will be sending */
-+static A_UINT16 GetEndMarker(void)
-+{
-+    A_UINT8  *pBuffer;
-+    BUFFER_PROC_LIST checkList[BUFFER_PROC_LIST_DEPTH];
-+
-+        /* fill up buffers with the normal counting pattern */
-+    InitBuffers(FILL_COUNTING);
-+
-+        /* assemble the list we will be sending down */
-+    AssembleBufferList(checkList);
-+        /* point to the last 2 bytes of the last buffer */
-+    pBuffer = &(checkList[BUFFER_PROC_LIST_DEPTH - 1].pBuffer[(checkList[BUFFER_PROC_LIST_DEPTH - 1].length) - 2]);
-+
-+        /* the last count in the last buffer is the marker */
-+    return (A_UINT16)pBuffer[0] | ((A_UINT16)pBuffer[1] << 8);
-+}
-+
-+#define ATH_PRINT_OUT_ZONE ATH_DEBUG_ERR
-+
-+/* send the ordered buffers to the target */
-+static A_STATUS SendBuffers(AR6K_DEVICE *pDev, int mbox)
-+{
-+    A_STATUS         status = A_OK;
-+    A_UINT32         request = HIF_WR_SYNC_BLOCK_INC;
-+    BUFFER_PROC_LIST sendList[BUFFER_PROC_LIST_DEPTH];
-+    int              i;
-+    int              totalBytes = 0;
-+    int              paddedLength;
-+    int              totalwPadding = 0;
-+
-+    AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Sending buffers on mailbox : %d \n",mbox));
-+
-+        /* fill buffer with counting pattern */
-+    InitBuffers(FILL_COUNTING);
-+
-+        /* assemble the order in which we send */
-+    AssembleBufferList(sendList);
-+
-+    for (i = 0; i < BUFFER_PROC_LIST_DEPTH; i++) {
-+
-+            /* we are doing block transfers, so we need to pad everything to a block size */
-+        paddedLength = (sendList[i].length + (g_BlockSizes[mbox] - 1)) &
-+                       (~(g_BlockSizes[mbox] - 1));
-+
-+            /* send each buffer synchronously */
-+        status = HIFReadWrite(pDev->HIFDevice,
-+                              g_MailboxAddrs[mbox],
-+                              sendList[i].pBuffer,
-+                              paddedLength,
-+                              request,
-+                              NULL);
-+        if (status != A_OK) {
-+            break;
-+        }
-+        totalBytes += sendList[i].length;
-+        totalwPadding += paddedLength;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Sent %d bytes (%d padded bytes) to mailbox : %d \n",totalBytes,totalwPadding,mbox));
-+
-+    return status;
-+}
-+
-+/* poll the mailbox credit counter until we get a credit or timeout */
-+static A_STATUS GetCredits(AR6K_DEVICE *pDev, int mbox, int *pCredits)
-+{
-+    A_STATUS status = A_OK;
-+    int      timeout = TEST_CREDITS_RECV_TIMEOUT;
-+    A_UINT8  credits = 0;
-+    A_UINT32 address;
-+
-+    while (TRUE) {
-+
-+            /* Read the counter register to get credits, this auto-decrements  */
-+        address = COUNT_DEC_ADDRESS + (AR6K_MAILBOXES + mbox) * 4;
-+        status = HIFReadWrite(pDev->HIFDevice, address, &credits, sizeof(credits),
-+                              HIF_RD_SYNC_BYTE_FIX, NULL);
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                ("Unable to decrement the command credit count register (mbox=%d)\n",mbox));
-+            status = A_ERROR;
-+            break;
-+        }
-+
-+        if (credits) {
-+            break;
-+        }
-+
-+        timeout--;
-+
-+        if (timeout <= 0) {
-+              AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                (" Timeout reading credit registers (mbox=%d, address:0x%X) \n",mbox,address));
-+            status = A_ERROR;
-+            break;
-+        }
-+
-+         /* delay a little, target may not be ready */
-+         A_MDELAY(1000);
-+
-+    }
-+
-+    if (status == A_OK) {
-+        *pCredits = credits;
-+    }
-+
-+    return status;
-+}
-+
-+
-+/* wait for the buffers to come back */
-+static A_STATUS RecvBuffers(AR6K_DEVICE *pDev, int mbox)
-+{
-+    A_STATUS         status = A_OK;
-+    A_UINT32         request = HIF_RD_SYNC_BLOCK_INC;
-+    BUFFER_PROC_LIST recvList[BUFFER_PROC_LIST_DEPTH];
-+    int              curBuffer;
-+    int              credits;
-+    int              i;
-+    int              totalBytes = 0;
-+    int              paddedLength;
-+    int              totalwPadding = 0;
-+
-+    AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Waiting for buffers on mailbox : %d \n",mbox));
-+
-+        /* zero the buffers */
-+    InitBuffers(FILL_ZERO);
-+
-+        /* assemble the order in which we should receive */
-+    AssembleBufferList(recvList);
-+
-+    curBuffer = 0;
-+
-+    while (curBuffer < BUFFER_PROC_LIST_DEPTH) {
-+
-+            /* get number of buffers that have been completed, this blocks
-+             * until we get at least 1 credit or it times out */
-+        status = GetCredits(pDev, mbox, &credits);
-+
-+        if (status != A_OK) {
-+            break;
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Got %d messages on mailbox : %d \n",credits, mbox));
-+
-+            /* get all the buffers that are sitting on the queue */
-+        for (i = 0; i < credits; i++) {
-+            AR_DEBUG_ASSERT(curBuffer < BUFFER_PROC_LIST_DEPTH);
-+                /* recv the current buffer synchronously, the buffers should come back in
-+                 * order... with padding applied by the target */
-+            paddedLength = (recvList[curBuffer].length + (g_BlockSizes[mbox] - 1)) &
-+                       (~(g_BlockSizes[mbox] - 1));
-+
-+            status = HIFReadWrite(pDev->HIFDevice,
-+                                  g_MailboxAddrs[mbox],
-+                                  recvList[curBuffer].pBuffer,
-+                                  paddedLength,
-+                                  request,
-+                                  NULL);
-+            if (status != A_OK) {
-+                AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Failed to read %d bytes on mailbox:%d : address:0x%X \n",
-+                        recvList[curBuffer].length, mbox, g_MailboxAddrs[mbox]));
-+                break;
-+            }
-+
-+            totalwPadding += paddedLength;
-+            totalBytes += recvList[curBuffer].length;
-+            curBuffer++;
-+        }
-+
-+        if (status != A_OK) {
-+            break;
-+        }
-+            /* go back and get some more */
-+        credits = 0;
-+    }
-+
-+    if (totalBytes != TEST_BYTES) {
-+        AR_DEBUG_ASSERT(FALSE);
-+    }  else {
-+        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Got all buffers on mbox:%d total recv :%d (w/Padding : %d) \n",
-+            mbox, totalBytes, totalwPadding));
-+    }
-+
-+    return status;
-+
-+
-+}
-+
-+static A_STATUS DoOneMboxHWTest(AR6K_DEVICE *pDev, int mbox)
-+{
-+    A_STATUS status;
-+
-+    do {
-+            /* send out buffers */
-+        status = SendBuffers(pDev,mbox);
-+
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Sending buffers Failed : %d mbox:%d\n",status,mbox));
-+            break;
-+        }
-+
-+            /* go get them, this will block */
-+        status =  RecvBuffers(pDev, mbox);
-+
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Recv buffers Failed : %d mbox:%d\n",status,mbox));
-+            break;
-+        }
-+
-+            /* check the returned data patterns */
-+        if (!CheckBuffers()) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Buffer Verify Failed : mbox:%d\n",mbox));
-+            status = A_ERROR;
-+            break;
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, (" Send/Recv success! mailbox : %d \n",mbox));
-+
-+    }  while (FALSE);
-+
-+    return status;
-+}
-+
-+/* here is where the test starts */
-+A_STATUS DoMboxHWTest(AR6K_DEVICE *pDev)
-+{
-+    int      i;
-+    A_STATUS status;
-+    int      credits = 0;
-+    A_UINT8  params[4];
-+    int      numBufs;
-+    int      bufferSize;
-+    A_UINT16 temp;
-+
-+
-+    AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, (" DoMboxHWTest START -  \n"));
-+
-+    do {
-+            /* get the addresses for all 4 mailboxes */
-+        status = HIFConfigureDevice(pDev->HIFDevice, HIF_DEVICE_GET_MBOX_ADDR,
-+                                    g_MailboxAddrs, sizeof(g_MailboxAddrs));
-+
-+        if (status != A_OK) {
-+            AR_DEBUG_ASSERT(FALSE);
-+            break;
-+        }
-+
-+            /* get the block sizes */
-+        status = HIFConfigureDevice(pDev->HIFDevice, HIF_DEVICE_GET_MBOX_BLOCK_SIZE,
-+                                    g_BlockSizes, sizeof(g_BlockSizes));
-+
-+        if (status != A_OK) {
-+            AR_DEBUG_ASSERT(FALSE);
-+            break;
-+        }
-+
-+            /* note, the HIF layer usually reports mbox 0 to have a block size of
-+             * 1, but our test wants to run in block-mode for all mailboxes, so we treat all mailboxes
-+             * the same. */
-+        g_BlockSizes[0] = g_BlockSizes[1];
-+        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Block Size to use: %d \n",g_BlockSizes[0]));
-+
-+        if (g_BlockSizes[1] > BUFFER_BLOCK_PAD) {
-+            AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("%d Block size is too large for buffer pad %d\n",
-+                g_BlockSizes[1], BUFFER_BLOCK_PAD));
-+            break;
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Waiting for target.... \n"));
-+
-+            /* the target lets us know it is ready by giving us 1 credit on
-+             * mailbox 0 */
-+        status = GetCredits(pDev, 0, &credits);
-+
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Failed to wait for target ready \n"));
-+            break;
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Target is ready ...\n"));
-+
-+            /* read the first 4 scratch registers */
-+        status = HIFReadWrite(pDev->HIFDevice,
-+                              SCRATCH_ADDRESS,
-+                              params,
-+                              4,
-+                              HIF_RD_SYNC_BYTE_INC,
-+                              NULL);
-+
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Failed to wait get parameters \n"));
-+            break;
-+        }
-+
-+        numBufs = params[0];
-+        bufferSize = (int)(((A_UINT16)params[2] << 8) | (A_UINT16)params[1]);
-+
-+        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE,
-+            ("Target parameters: bufs per mailbox:%d, buffer size:%d bytes (total space: %d, minimum required space (w/padding): %d) \n",
-+            numBufs, bufferSize, (numBufs * bufferSize), TOTAL_BYTES));
-+
-+        if ((numBufs * bufferSize) < TOTAL_BYTES) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Not Enough buffer space to run test! need:%d, got:%d \n",
-+                TOTAL_BYTES, (numBufs*bufferSize)));
-+            status = A_ERROR;
-+            break;
-+        }
-+
-+        temp = GetEndMarker();
-+
-+        status = HIFReadWrite(pDev->HIFDevice,
-+                              SCRATCH_ADDRESS + 4,
-+                              (A_UINT8 *)&temp,
-+                              2,
-+                              HIF_WR_SYNC_BYTE_INC,
-+                              NULL);
-+
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Failed to write end marker \n"));
-+            break;
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("End Marker: 0x%X \n",temp));
-+
-+        temp = (A_UINT16)g_BlockSizes[1];
-+            /* convert to a mask */
-+        temp = temp - 1;
-+        status = HIFReadWrite(pDev->HIFDevice,
-+                              SCRATCH_ADDRESS + 6,
-+                              (A_UINT8 *)&temp,
-+                              2,
-+                              HIF_WR_SYNC_BYTE_INC,
-+                              NULL);
-+
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Failed to write block mask \n"));
-+            break;
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Set Block Mask: 0x%X \n",temp));
-+
-+            /* execute the test on each mailbox */
-+        for (i = 0; i < AR6K_MAILBOXES; i++) {
-+            status = DoOneMboxHWTest(pDev, i);
-+            if (status != A_OK) {
-+                break;
-+            }
-+        }
-+
-+    } while (FALSE);
-+
-+    if (status == A_OK) {
-+        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, (" DoMboxHWTest DONE - SUCCESS! -  \n"));
-+    } else {
-+        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, (" DoMboxHWTest DONE - FAILED! -  \n"));
-+    }
-+        /* don't let HTC_Start continue, the target is actually not running any HTC code */
-+    return A_ERROR;
-+}
-+#endif
-+
-+
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/htc/ar6k.h b/drivers/sdio/function/wlan/ar6000/htc/ar6k.h
-new file mode 100644
-index 0000000..301ab34
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/htc/ar6k.h
-@@ -0,0 +1,191 @@
-+/*
-+ *
-+ * Copyright (c) 2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef AR6K_H_
-+#define AR6K_H_
-+
-+#define AR6K_MAILBOXES 4
-+
-+/* HTC runs over mailbox 0 */
-+#define HTC_MAILBOX          0
-+
-+#define AR6K_TARGET_DEBUG_INTR_MASK     0x01
-+
-+#define OTHER_INTS_ENABLED (INT_STATUS_ENABLE_ERROR_MASK |   \
-+                            INT_STATUS_ENABLE_CPU_MASK   |   \
-+                            INT_STATUS_ENABLE_COUNTER_MASK)
-+
-+//#define MBOXHW_UNIT_TEST 1
-+
-+#include "athstartpack.h"
-+typedef PREPACK struct _AR6K_IRQ_PROC_REGISTERS {
-+    A_UINT8                      host_int_status;
-+    A_UINT8                      cpu_int_status;
-+    A_UINT8                      error_int_status;
-+    A_UINT8                      counter_int_status;
-+    A_UINT8                      mbox_frame;
-+    A_UINT8                      rx_lookahead_valid;
-+    A_UINT8                      hole[2];
-+    A_UINT32                     rx_lookahead[2];
-+} POSTPACK AR6K_IRQ_PROC_REGISTERS;
-+
-+#define AR6K_IRQ_PROC_REGS_SIZE sizeof(AR6K_IRQ_PROC_REGISTERS)
-+
-+
-+
-+typedef PREPACK struct _AR6K_IRQ_ENABLE_REGISTERS {
-+    A_UINT8                      int_status_enable;
-+    A_UINT8                      cpu_int_status_enable;
-+    A_UINT8                      error_status_enable;
-+    A_UINT8                      counter_int_status_enable;
-+} POSTPACK AR6K_IRQ_ENABLE_REGISTERS;
-+
-+#include "athendpack.h"
-+
-+#define AR6K_IRQ_ENABLE_REGS_SIZE sizeof(AR6K_IRQ_ENABLE_REGISTERS)
-+
-+#define AR6K_REG_IO_BUFFER_SIZE     32
-+#define AR6K_MAX_REG_IO_BUFFERS     8
-+
-+/* buffers for ASYNC I/O */
-+typedef struct AR6K_ASYNC_REG_IO_BUFFER {
-+    HTC_PACKET    HtcPacket;   /* we use an HTC packet as a wrapper for our async register-based I/O */
-+    A_UINT8       Buffer[AR6K_REG_IO_BUFFER_SIZE];
-+} AR6K_ASYNC_REG_IO_BUFFER;
-+
-+typedef struct _AR6K_DEVICE {
-+    A_MUTEX_T                   Lock;
-+    AR6K_IRQ_PROC_REGISTERS     IrqProcRegisters;
-+    AR6K_IRQ_ENABLE_REGISTERS   IrqEnableRegisters;
-+    void                        *HIFDevice;
-+    A_UINT32                    BlockSize;
-+    A_UINT32                    BlockMask;
-+    A_UINT32                    MailboxAddress;
-+    HIF_PENDING_EVENTS_FUNC     GetPendingEventsFunc;
-+    void                        *HTCContext;
-+    HTC_PACKET_QUEUE            RegisterIOList;
-+    AR6K_ASYNC_REG_IO_BUFFER    RegIOBuffers[AR6K_MAX_REG_IO_BUFFERS];
-+    void                        (*TargetFailureCallback)(void *Context);
-+    A_STATUS                    (*MessagePendingCallback)(void *Context, A_UINT32 LookAhead, A_BOOL *pAsyncProc);
-+    HIF_DEVICE_IRQ_PROCESSING_MODE  HifIRQProcessingMode;
-+    HIF_MASK_UNMASK_RECV_EVENT      HifMaskUmaskRecvEvent;
-+} AR6K_DEVICE;
-+
-+#define IS_DEV_IRQ_PROCESSING_ASYNC_ALLOWED(pDev) ((pDev)->HifIRQProcessingMode != HIF_DEVICE_IRQ_SYNC_ONLY)
-+
-+A_STATUS DevSetup(AR6K_DEVICE *pDev);
-+A_STATUS DevUnmaskInterrupts(AR6K_DEVICE *pDev);
-+A_STATUS DevMaskInterrupts(AR6K_DEVICE *pDev);
-+A_STATUS DevPollMboxMsgRecv(AR6K_DEVICE *pDev,
-+                            A_UINT32    *pLookAhead,
-+                            int          TimeoutMS);
-+A_STATUS DevRWCompletionHandler(void *context, A_STATUS status);
-+A_STATUS DevDsrHandler(void *context);
-+A_STATUS DevCheckPendingRecvMsgsAsync(void *context);
-+void     DevDumpRegisters(AR6K_IRQ_PROC_REGISTERS   *pIrqProcRegs,
-+                          AR6K_IRQ_ENABLE_REGISTERS *pIrqEnableRegs);
-+
-+#define DEV_STOP_RECV_ASYNC TRUE
-+#define DEV_STOP_RECV_SYNC  FALSE
-+#define DEV_ENABLE_RECV_ASYNC TRUE
-+#define DEV_ENABLE_RECV_SYNC  FALSE
-+A_STATUS DevStopRecv(AR6K_DEVICE *pDev, A_BOOL ASyncMode);
-+A_STATUS DevEnableRecv(AR6K_DEVICE *pDev, A_BOOL ASyncMode);
-+
-+static INLINE A_STATUS DevSendPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, A_UINT32 SendLength) {
-+    A_UINT32 paddedLength;
-+    A_BOOL   sync = (pPacket->Completion == NULL) ? TRUE : FALSE;
-+    A_STATUS status;
-+
-+       /* adjust the length to be a multiple of block size if appropriate */
-+    paddedLength = (SendLength + (pDev->BlockMask)) &
-+                    (~(pDev->BlockMask));
-+#if 0 // BufferLength may not be set in , fix this...
-+    if (paddedLength > pPacket->BufferLength) {
-+        AR_DEBUG_ASSERT(FALSE);
-+        if (pPacket->Completion != NULL) {
-+            COMPLETE_HTC_PACKET(pPacket,A_EINVAL);
-+        }
-+        return A_EINVAL;
-+    }
-+#endif
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND,
-+                ("DevSendPacket, Padded Length: %d Mbox:0x%X (mode:%s)\n",
-+                paddedLength,
-+                pDev->MailboxAddress,
-+                sync ? "SYNC" : "ASYNC"));
-+
-+    status = HIFReadWrite(pDev->HIFDevice,
-+                          pDev->MailboxAddress,
-+                          pPacket->pBuffer,
-+                          paddedLength,     /* the padded length */
-+                          sync ? HIF_WR_SYNC_BLOCK_INC : HIF_WR_ASYNC_BLOCK_INC,
-+                          sync ? NULL : pPacket);  /* pass the packet as the context to the HIF request */
-+
-+    if (sync) {
-+        pPacket->Status = status;
-+    }
-+
-+    return status;
-+}
-+
-+static INLINE A_STATUS DevRecvPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, A_UINT32 RecvLength) {
-+    A_UINT32 paddedLength;
-+    A_STATUS status;
-+    A_BOOL   sync = (pPacket->Completion == NULL) ? TRUE : FALSE;
-+
-+        /* adjust the length to be a multiple of block size if appropriate */
-+    paddedLength = (RecvLength + (pDev->BlockMask)) &
-+                    (~(pDev->BlockMask));
-+    if (paddedLength > pPacket->BufferLength) {
-+        AR_DEBUG_ASSERT(FALSE);
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                ("DevRecvPacket, Not enough space for padlen:%d recvlen:%d bufferlen:%d \n",
-+                    paddedLength,RecvLength,pPacket->BufferLength));
-+        if (pPacket->Completion != NULL) {
-+            COMPLETE_HTC_PACKET(pPacket,A_EINVAL);
-+        }
-+        return A_EINVAL;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,
-+                ("DevRecvPacket, Padded Length: %d Mbox:0x%X (mode:%s)\n",
-+                paddedLength,
-+                pDev->MailboxAddress,
-+                sync ? "SYNC" : "ASYNC"));
-+
-+    status = HIFReadWrite(pDev->HIFDevice,
-+                          pDev->MailboxAddress,
-+                          pPacket->pBuffer,
-+                          paddedLength,
-+                          sync ? HIF_RD_SYNC_BLOCK_INC : HIF_RD_ASYNC_BLOCK_INC,
-+                          sync ? NULL : pPacket);  /* pass the packet as the context to the HIF request */
-+
-+    if (sync) {
-+        pPacket->Status = status;
-+    }
-+
-+    return status;
-+}
-+
-+#ifdef MBOXHW_UNIT_TEST
-+A_STATUS DoMboxHWTest(AR6K_DEVICE *pDev);
-+#endif
-+
-+#endif /*AR6K_H_*/
-diff --git a/drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c b/drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c
-new file mode 100644
-index 0000000..fbbcd51
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c
-@@ -0,0 +1,638 @@
-+/*
-+ * AR6K Driver layer event handling (i.e. interrupts, message polling)
-+ *
-+ * Copyright (c) 2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+#include "a_config.h"
-+#include "athdefs.h"
-+#include "a_types.h"
-+#include "AR6Khwreg.h"
-+#include "a_osapi.h"
-+#include "a_debug.h"
-+#include "hif.h"
-+#include "htc_packet.h"
-+#include "ar6k.h"
-+
-+extern void AR6KFreeIOPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket);
-+extern HTC_PACKET *AR6KAllocIOPacket(AR6K_DEVICE *pDev);
-+
-+static A_STATUS DevServiceDebugInterrupt(AR6K_DEVICE *pDev);
-+
-+#define DELAY_PER_INTERVAL_MS 10  /* 10 MS delay per polling interval */
-+
-+/* completion routine for ALL HIF layer async I/O */
-+A_STATUS DevRWCompletionHandler(void *context, A_STATUS status)
-+{
-+    HTC_PACKET *pPacket = (HTC_PACKET *)context;
-+
-+    COMPLETE_HTC_PACKET(pPacket,status);
-+
-+    return A_OK;
-+}
-+
-+/* mailbox recv message polling */
-+A_STATUS DevPollMboxMsgRecv(AR6K_DEVICE *pDev,
-+                            A_UINT32    *pLookAhead,
-+                            int          TimeoutMS)
-+{
-+    A_STATUS status = A_OK;
-+    int      timeout = TimeoutMS/DELAY_PER_INTERVAL_MS;
-+
-+    AR_DEBUG_ASSERT(timeout > 0);
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("+DevPollMboxMsgRecv \n"));
-+
-+    while (TRUE) {
-+
-+        if (pDev->GetPendingEventsFunc != NULL)
-+              {
-+
-+            HIF_PENDING_EVENTS_INFO events;
-+
-+            /* the HIF layer uses a special mechanism to get events, do this
-+             * synchronously */
-+            status = pDev->GetPendingEventsFunc(pDev->HIFDevice,
-+                                            &events,
-+                                            NULL);
-+            if (A_FAILED(status))
-+                      {
-+                AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Failed to get pending events \n"));
-+                              break;
-+            }
-+
-+            if (events.Events & HIF_RECV_MSG_AVAIL)
-+                      {
-+                    /*  there is a message available, the lookahead should be valid now */
-+                *pLookAhead = events.LookAhead;
-+
-+                break;
-+            }
-+        }
-+              else
-+              {
-+
-+                /* this is the standard HIF way.... */
-+                /* load the register table */
-+            status = HIFReadWrite(pDev->HIFDevice,
-+                                  HOST_INT_STATUS_ADDRESS,
-+                                  (A_UINT8 *)&pDev->IrqProcRegisters,
-+                                  AR6K_IRQ_PROC_REGS_SIZE,
-+                                  HIF_RD_SYNC_BYTE_INC,
-+                                  NULL);
-+
-+            if (A_FAILED(status))
-+                      {
-+                AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Failed to read register table \n"));
-+                break;
-+            }
-+
-+                /* check for MBOX data and valid lookahead */
-+            if (pDev->IrqProcRegisters.host_int_status & (1 << HTC_MAILBOX))
-+                      {
-+                if (pDev->IrqProcRegisters.rx_lookahead_valid & (1 << HTC_MAILBOX))
-+                              {
-+                    /* mailbox has a message and the look ahead is valid */
-+                    *pLookAhead = pDev->IrqProcRegisters.rx_lookahead[HTC_MAILBOX];
-+                    break;
-+                }
-+            }
-+
-+        }
-+
-+        timeout--;
-+
-+        if (timeout <= 0)
-+              {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, (" Timeout waiting for recv message \n"));
-+            status = A_ERROR;
-+
-+                /* check if the target asserted */
-+            if ( pDev->IrqProcRegisters.counter_int_status & AR6K_TARGET_DEBUG_INTR_MASK) {
-+                    /* target signaled an assert, process this pending interrupt
-+                     * this will call the target failure handler */
-+                DevServiceDebugInterrupt(pDev);
-+            }
-+
-+            break;
-+        }
-+
-+            /* delay a little  */
-+         A_MDELAY(DELAY_PER_INTERVAL_MS);
-+         AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("  Retry Mbox Poll : %d \n",timeout));
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("-DevPollMboxMsgRecv \n"));
-+
-+    return status;
-+}
-+
-+static A_STATUS DevServiceCPUInterrupt(AR6K_DEVICE *pDev)
-+{
-+    A_STATUS status;
-+    A_UINT8  cpu_int_status;
-+    A_UINT8  regBuffer[4];
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ, ("CPU Interrupt\n"));
-+    cpu_int_status = pDev->IrqProcRegisters.cpu_int_status &
-+                     pDev->IrqEnableRegisters.cpu_int_status_enable;
-+    AR_DEBUG_ASSERT(cpu_int_status);
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,
-+                    ("Valid interrupt source(s) in CPU_INT_STATUS: 0x%x\n",
-+                    cpu_int_status));
-+
-+        /* Clear the interrupt */
-+    pDev->IrqProcRegisters.cpu_int_status &= ~cpu_int_status; /* W1C */
-+
-+        /* set up the register transfer buffer to hit the register 4 times , this is done
-+         * to make the access 4-byte aligned to mitigate issues with host bus interconnects that
-+         * restrict bus transfer lengths to be a multiple of 4-bytes */
-+
-+        /* set W1C value to clear the interrupt, this hits the register first */
-+    regBuffer[0] = cpu_int_status;
-+        /* the remaining 4 values are set to zero which have no-effect  */
-+    regBuffer[1] = 0;
-+    regBuffer[2] = 0;
-+    regBuffer[3] = 0;
-+
-+    status = HIFReadWrite(pDev->HIFDevice,
-+                          CPU_INT_STATUS_ADDRESS,
-+                          regBuffer,
-+                          4,
-+                          HIF_WR_SYNC_BYTE_FIX,
-+                          NULL);
-+
-+    AR_DEBUG_ASSERT(status == A_OK);
-+    return status;
-+}
-+
-+
-+static A_STATUS DevServiceErrorInterrupt(AR6K_DEVICE *pDev)
-+{
-+    A_STATUS status;
-+    A_UINT8  error_int_status;
-+    A_UINT8  regBuffer[4];
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ, ("Error Interrupt\n"));
-+    error_int_status = pDev->IrqProcRegisters.error_int_status & 0x0F;
-+    AR_DEBUG_ASSERT(error_int_status);
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,
-+                    ("Valid interrupt source(s) in ERROR_INT_STATUS: 0x%x\n",
-+                    error_int_status));
-+
-+    if (ERROR_INT_STATUS_WAKEUP_GET(error_int_status)) {
-+        /* Wakeup */
-+        AR_DEBUG_PRINTF(ATH_DEBUG_IRQ, ("Error : Wakeup\n"));
-+    }
-+
-+    if (ERROR_INT_STATUS_RX_UNDERFLOW_GET(error_int_status)) {
-+        /* Rx Underflow */
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Error : Rx Underflow\n"));
-+    }
-+
-+    if (ERROR_INT_STATUS_TX_OVERFLOW_GET(error_int_status)) {
-+        /* Tx Overflow */
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Error : Tx Overflow\n"));
-+    }
-+
-+        /* Clear the interrupt */
-+    pDev->IrqProcRegisters.error_int_status &= ~error_int_status; /* W1C */
-+
-+        /* set up the register transfer buffer to hit the register 4 times , this is done
-+         * to make the access 4-byte aligned to mitigate issues with host bus interconnects that
-+         * restrict bus transfer lengths to be a multiple of 4-bytes */
-+
-+        /* set W1C value to clear the interrupt, this hits the register first */
-+    regBuffer[0] = error_int_status;
-+        /* the remaining 4 values are set to zero which have no-effect  */
-+    regBuffer[1] = 0;
-+    regBuffer[2] = 0;
-+    regBuffer[3] = 0;
-+
-+    status = HIFReadWrite(pDev->HIFDevice,
-+                          ERROR_INT_STATUS_ADDRESS,
-+                          regBuffer,
-+                          4,
-+                          HIF_WR_SYNC_BYTE_FIX,
-+                          NULL);
-+
-+    AR_DEBUG_ASSERT(status == A_OK);
-+    return status;
-+}
-+
-+static A_STATUS DevServiceDebugInterrupt(AR6K_DEVICE *pDev)
-+{
-+    A_UINT32 dummy;
-+    A_STATUS status;
-+
-+    /* Send a target failure event to the application */
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Target debug interrupt\n"));
-+
-+    if (pDev->TargetFailureCallback != NULL) {
-+        pDev->TargetFailureCallback(pDev->HTCContext);
-+    }
-+
-+    /* clear the interrupt , the debug error interrupt is
-+     * counter 0 */
-+        /* read counter to clear interrupt */
-+    status = HIFReadWrite(pDev->HIFDevice,
-+                          COUNT_DEC_ADDRESS,
-+                          (A_UINT8 *)&dummy,
-+                          4,
-+                          HIF_RD_SYNC_BYTE_INC,
-+                          NULL);
-+
-+    AR_DEBUG_ASSERT(status == A_OK);
-+    return status;
-+}
-+
-+static A_STATUS DevServiceCounterInterrupt(AR6K_DEVICE *pDev)
-+{
-+    A_UINT8 counter_int_status;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ, ("Counter Interrupt\n"));
-+
-+    counter_int_status = pDev->IrqProcRegisters.counter_int_status &
-+                         pDev->IrqEnableRegisters.counter_int_status_enable;
-+
-+    AR_DEBUG_ASSERT(counter_int_status);
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,
-+                    ("Valid interrupt source(s) in COUNTER_INT_STATUS: 0x%x\n",
-+                    counter_int_status));
-+
-+    /* Check if the debug interrupt is pending */
-+    if (counter_int_status & AR6K_TARGET_DEBUG_INTR_MASK) {
-+        return DevServiceDebugInterrupt(pDev);
-+    }
-+
-+    return A_OK;
-+}
-+
-+/* callback when our fetch to get interrupt status registers completes */
-+static void DevGetEventAsyncHandler(void *Context, HTC_PACKET *pPacket)
-+{
-+    AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context;
-+    A_UINT32    lookAhead = 0;
-+    A_BOOL      otherInts = FALSE;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevGetEventAsyncHandler: (dev: 0x%X)\n", (A_UINT32)pDev));
-+
-+    do {
-+
-+        if (A_FAILED(pPacket->Status)) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                    (" GetEvents I/O request failed, status:%d \n", pPacket->Status));
-+            /* bail out, don't unmask HIF interrupt */
-+            break;
-+        }
-+
-+        if (pDev->GetPendingEventsFunc != NULL) {
-+                /* the HIF layer collected the information for us */
-+            HIF_PENDING_EVENTS_INFO *pEvents = (HIF_PENDING_EVENTS_INFO *)pPacket->pBuffer;
-+            if (pEvents->Events & HIF_RECV_MSG_AVAIL) {
-+                lookAhead = pEvents->LookAhead;
-+                if (0 == lookAhead) {
-+                    AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" DevGetEventAsyncHandler1, lookAhead is zero! \n"));
-+                }
-+            }
-+            if (pEvents->Events & HIF_OTHER_EVENTS) {
-+                otherInts = TRUE;
-+            }
-+        } else {
-+                /* standard interrupt table handling.... */
-+            AR6K_IRQ_PROC_REGISTERS *pReg = (AR6K_IRQ_PROC_REGISTERS *)pPacket->pBuffer;
-+            A_UINT8                 host_int_status;
-+
-+            host_int_status = pReg->host_int_status & pDev->IrqEnableRegisters.int_status_enable;
-+
-+            if (host_int_status & (1 << HTC_MAILBOX)) {
-+                host_int_status &= ~(1 << HTC_MAILBOX);
-+                if (pReg->rx_lookahead_valid & (1 << HTC_MAILBOX)) {
-+                        /* mailbox has a message and the look ahead is valid */
-+                    lookAhead = pReg->rx_lookahead[HTC_MAILBOX];
-+                    if (0 == lookAhead) {
-+                        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" DevGetEventAsyncHandler2, lookAhead is zero! \n"));
-+                    }
-+                }
-+            }
-+
-+            if (host_int_status) {
-+                    /* there are other interrupts to handle */
-+                otherInts = TRUE;
-+            }
-+        }
-+
-+        if (otherInts || (lookAhead == 0)) {
-+            /* if there are other interrupts to process, we cannot do this in the async handler so
-+             * ack the interrupt which will cause our sync handler to run again
-+             * if however there are no more messages, we can now ack the interrupt  */
-+            AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,
-+                (" Acking interrupt from DevGetEventAsyncHandler (otherints:%d, lookahead:0x%X)\n",
-+                otherInts, lookAhead));
-+            HIFAckInterrupt(pDev->HIFDevice);
-+        } else {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,
-+                    (" DevGetEventAsyncHandler : detected another message, lookahead :0x%X \n",
-+                    lookAhead));
-+                /* lookahead is non-zero and there are no other interrupts to service,
-+                 * go get the next message */
-+            pDev->MessagePendingCallback(pDev->HTCContext, lookAhead, NULL);
-+        }
-+
-+    } while (FALSE);
-+
-+        /* free this IO packet */
-+    AR6KFreeIOPacket(pDev,pPacket);
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("-DevGetEventAsyncHandler \n"));
-+}
-+
-+/* called by the HTC layer when it wants us to check if the device has any more pending
-+ * recv messages, this starts off a series of async requests to read interrupt registers  */
-+A_STATUS DevCheckPendingRecvMsgsAsync(void *context)
-+{
-+    AR6K_DEVICE  *pDev = (AR6K_DEVICE *)context;
-+    A_STATUS      status = A_OK;
-+    HTC_PACKET   *pIOPacket;
-+
-+    /* this is called in an ASYNC only context, we may NOT block, sleep or call any apis that can
-+     * cause us to switch contexts */
-+
-+   AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevCheckPendingRecvMsgsAsync: (dev: 0x%X)\n", (A_UINT32)pDev));
-+
-+   do {
-+
-+        if (HIF_DEVICE_IRQ_SYNC_ONLY == pDev->HifIRQProcessingMode) {
-+                /* break the async processing chain right here, no need to continue.
-+                 * The DevDsrHandler() will handle things in a loop when things are driven
-+                 * synchronously  */
-+            break;
-+        }
-+            /* first allocate one of our HTC packets we created for async I/O
-+             * we reuse HTC packet definitions so that we can use the completion mechanism
-+             * in DevRWCompletionHandler() */
-+        pIOPacket = AR6KAllocIOPacket(pDev);
-+
-+        if (NULL == pIOPacket) {
-+                /* there should be only 1 asynchronous request out at a time to read these registers
-+                 * so this should actually never happen */
-+            status = A_NO_MEMORY;
-+            AR_DEBUG_ASSERT(FALSE);
-+            break;
-+        }
-+
-+            /* stick in our completion routine when the I/O operation completes */
-+        pIOPacket->Completion = DevGetEventAsyncHandler;
-+        pIOPacket->pContext = pDev;
-+
-+        if (pDev->GetPendingEventsFunc) {
-+                /* HIF layer has it's own mechanism, pass the IO to it.. */
-+            status = pDev->GetPendingEventsFunc(pDev->HIFDevice,
-+                                                (HIF_PENDING_EVENTS_INFO *)pIOPacket->pBuffer,
-+                                                pIOPacket);
-+
-+        } else {
-+                /* standard way, read the interrupt register table asynchronously again */
-+            status = HIFReadWrite(pDev->HIFDevice,
-+                                  HOST_INT_STATUS_ADDRESS,
-+                                  pIOPacket->pBuffer,
-+                                  AR6K_IRQ_PROC_REGS_SIZE,
-+                                  HIF_RD_ASYNC_BYTE_INC,
-+                                  pIOPacket);
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,(" Async IO issued to get interrupt status...\n"));
-+   } while (FALSE);
-+
-+   AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("-DevCheckPendingRecvMsgsAsync \n"));
-+
-+   return status;
-+}
-+
-+/* process pending interrupts synchronously */
-+static A_STATUS ProcessPendingIRQs(AR6K_DEVICE *pDev, A_BOOL *pDone, A_BOOL *pASyncProcessing)
-+{
-+    A_STATUS    status = A_OK;
-+    A_UINT8     host_int_status = 0;
-+    A_UINT32    lookAhead = 0;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+ProcessPendingIRQs: (dev: 0x%X)\n", (A_UINT32)pDev));
-+
-+    /*** NOTE: the HIF implementation guarantees that the context of this call allows
-+     *         us to perform SYNCHRONOUS I/O, that is we can block, sleep or call any API that
-+     *         can block or switch thread/task ontexts.
-+     *         This is a fully schedulable context.
-+     * */
-+    do {
-+
-+        if (pDev->GetPendingEventsFunc != NULL) {
-+            HIF_PENDING_EVENTS_INFO events;
-+
-+                /* the HIF layer uses a special mechanism to get events
-+                 * get this synchronously  */
-+            status = pDev->GetPendingEventsFunc(pDev->HIFDevice,
-+                                                &events,
-+                                                NULL);
-+
-+            if (A_FAILED(status)) {
-+                break;
-+            }
-+
-+            if (events.Events & HIF_RECV_MSG_AVAIL) {
-+                lookAhead = events.LookAhead;
-+                if (0 == lookAhead) {
-+                    AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" ProcessPendingIRQs1 lookAhead is zero! \n"));
-+                }
-+            }
-+
-+            if (!(events.Events & HIF_OTHER_EVENTS) ||
-+                !(pDev->IrqEnableRegisters.int_status_enable & OTHER_INTS_ENABLED)) {
-+                    /* no need to read the register table, no other interesting interrupts.
-+                     * Some interfaces (like SPI) can shadow interrupt sources without
-+                     * requiring the host to do a full table read */
-+                break;
-+            }
-+
-+            /* otherwise fall through and read the register table */
-+        }
-+
-+        /*
-+         * Read the first 28 bytes of the HTC register table. This will yield us
-+         * the value of different int status registers and the lookahead
-+         * registers.
-+         *    length = sizeof(int_status) + sizeof(cpu_int_status) +
-+         *             sizeof(error_int_status) + sizeof(counter_int_status) +
-+         *             sizeof(mbox_frame) + sizeof(rx_lookahead_valid) +
-+         *             sizeof(hole) +  sizeof(rx_lookahead) +
-+         *             sizeof(int_status_enable) + sizeof(cpu_int_status_enable) +
-+         *             sizeof(error_status_enable) +
-+         *             sizeof(counter_int_status_enable);
-+         *
-+        */
-+        status = HIFReadWrite(pDev->HIFDevice,
-+                              HOST_INT_STATUS_ADDRESS,
-+                              (A_UINT8 *)&pDev->IrqProcRegisters,
-+                              AR6K_IRQ_PROC_REGS_SIZE,
-+                              HIF_RD_SYNC_BYTE_INC,
-+                              NULL);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+        if (AR_DEBUG_LVL_CHECK(ATH_DEBUG_IRQ)) {
-+            DevDumpRegisters(&pDev->IrqProcRegisters,
-+                             &pDev->IrqEnableRegisters);
-+        }
-+
-+            /* Update only those registers that are enabled */
-+        host_int_status = pDev->IrqProcRegisters.host_int_status &
-+                          pDev->IrqEnableRegisters.int_status_enable;
-+
-+        if (NULL == pDev->GetPendingEventsFunc) {
-+                /* only look at mailbox status if the HIF layer did not provide this function,
-+                 * on some HIF interfaces reading the RX lookahead is not valid to do */
-+            if (host_int_status & (1 << HTC_MAILBOX)) {
-+                    /* mask out pending mailbox value, we use "lookAhead" as the real flag for
-+                     * mailbox processing below */
-+                host_int_status &= ~(1 << HTC_MAILBOX);
-+                if (pDev->IrqProcRegisters.rx_lookahead_valid & (1 << HTC_MAILBOX)) {
-+                        /* mailbox has a message and the look ahead is valid */
-+                    lookAhead = pDev->IrqProcRegisters.rx_lookahead[HTC_MAILBOX];
-+                    if (0 == lookAhead) {
-+                        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" ProcessPendingIRQs2, lookAhead is zero! \n"));
-+                    }
-+                }
-+            }
-+        } else {
-+                /* not valid to check if the HIF has another mechanism for reading mailbox pending status*/
-+            host_int_status &= ~(1 << HTC_MAILBOX);
-+        }
-+
-+    } while (FALSE);
-+
-+
-+    do {
-+
-+            /* did the interrupt status fetches succeed? */
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+        if ((0 == host_int_status) && (0 == lookAhead)) {
-+                /* nothing to process, the caller can use this to break out of a loop */
-+            *pDone = TRUE;
-+            break;
-+        }
-+
-+        if (lookAhead != 0) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("Pending mailbox message, LookAhead: 0x%X\n",lookAhead));
-+                /* Mailbox Interrupt, the HTC layer may issue async requests to empty the
-+                 * mailbox...
-+                 * When emptying the recv mailbox we use the async handler above called from the
-+                 * completion routine of the callers read request. This can improve performance
-+                 * by reducing context switching when we rapidly pull packets */
-+            status = pDev->MessagePendingCallback(pDev->HTCContext, lookAhead, pASyncProcessing);
-+            if (A_FAILED(status)) {
-+                break;
-+            }
-+        }
-+
-+            /* now handle the rest of them */
-+        AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,
-+                            (" Valid interrupt source(s) for OTHER interrupts: 0x%x\n",
-+                            host_int_status));
-+
-+        if (HOST_INT_STATUS_CPU_GET(host_int_status)) {
-+                /* CPU Interrupt */
-+            status = DevServiceCPUInterrupt(pDev);
-+            if (A_FAILED(status)){
-+                break;
-+            }
-+        }
-+
-+        if (HOST_INT_STATUS_ERROR_GET(host_int_status)) {
-+                /* Error Interrupt */
-+            status = DevServiceErrorInterrupt(pDev);
-+            if (A_FAILED(status)){
-+                break;
-+            }
-+        }
-+
-+        if (HOST_INT_STATUS_COUNTER_GET(host_int_status)) {
-+                /* Counter Interrupt */
-+            status = DevServiceCounterInterrupt(pDev);
-+            if (A_FAILED(status)){
-+                break;
-+            }
-+        }
-+
-+    } while (FALSE);
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("-ProcessPendingIRQs: (done:%d, async:%d) status=%d \n",
-+                *pDone, *pASyncProcessing, status));
-+
-+    return status;
-+}
-+
-+
-+/* Synchronousinterrupt handler, this handler kicks off all interrupt processing.*/
-+A_STATUS DevDsrHandler(void *context)
-+{
-+    AR6K_DEVICE *pDev = (AR6K_DEVICE *)context;
-+    A_STATUS    status = A_OK;
-+    A_BOOL      done = FALSE;
-+    A_BOOL      asyncProc = FALSE;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevDsrHandler: (dev: 0x%X)\n", (A_UINT32)pDev));
-+
-+
-+    while (!done) {
-+        status = ProcessPendingIRQs(pDev, &done, &asyncProc);
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+        if (HIF_DEVICE_IRQ_SYNC_ONLY == pDev->HifIRQProcessingMode) {
-+            /* the HIF layer does not allow async IRQ processing, override the asyncProc flag */
-+            asyncProc = FALSE;
-+            /* this will cause us to re-enter ProcessPendingIRQ() and re-read interrupt status registers.
-+             * this has a nice side effect of blocking us until all async read requests are completed.
-+             * This behavior is required on some HIF implementations that do not allow ASYNC
-+             * processing in interrupt handlers (like Windows CE) */
-+        }
-+
-+        if (asyncProc) {
-+                /* the function performed some async I/O for performance, we
-+                   need to exit the ISR immediately, the check below will prevent the interrupt from being
-+                   Ack'd while we handle it asynchronously */
-+            break;
-+        }
-+
-+    }
-+
-+    if (A_SUCCESS(status) && !asyncProc) {
-+            /* Ack the interrupt only if :
-+             *  1. we did not get any errors in processing interrupts
-+             *  2. there are no outstanding async processing requests */
-+        AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,(" Acking interrupt from DevDsrHandler \n"));
-+        HIFAckInterrupt(pDev->HIFDevice);
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("-DevDsrHandler \n"));
-+    return A_OK;
-+}
-+
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/htc/htc.c b/drivers/sdio/function/wlan/ar6000/htc/htc.c
-new file mode 100644
-index 0000000..b5e691b
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/htc/htc.c
-@@ -0,0 +1,507 @@
-+/*
-+ *
-+ * Copyright (c) 2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "htc_internal.h"
-+
-+
-+static HTC_INIT_INFO  HTCInitInfo = {NULL,NULL,NULL};
-+static A_BOOL         HTCInitialized = FALSE;
-+
-+static A_STATUS HTCTargetInsertedHandler(void *hif_handle);
-+static A_STATUS HTCTargetRemovedHandler(void *handle, A_STATUS status);
-+static void HTCReportFailure(void *Context);
-+
-+/* Initializes the HTC layer */
-+A_STATUS HTCInit(HTC_INIT_INFO *pInitInfo)
-+{
-+    HTC_CALLBACKS htcCallbacks;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCInit: Enter\n"));
-+    if (HTCInitialized) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCInit: Exit\n"));
-+        return A_OK;
-+    }
-+
-+    A_MEMCPY(&HTCInitInfo,pInitInfo,sizeof(HTC_INIT_INFO));
-+
-+    A_MEMZERO(&htcCallbacks, sizeof(HTC_CALLBACKS));
-+
-+        /* setup HIF layer callbacks */
-+    htcCallbacks.deviceInsertedHandler = HTCTargetInsertedHandler;
-+    htcCallbacks.deviceRemovedHandler = HTCTargetRemovedHandler;
-+        /* the device layer handles these */
-+    htcCallbacks.rwCompletionHandler = DevRWCompletionHandler;
-+    htcCallbacks.dsrHandler = DevDsrHandler;
-+    HIFInit(&htcCallbacks);
-+    HTCInitialized = TRUE;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCInit: Exit\n"));
-+    return A_OK;
-+}
-+
-+void HTCFreeControlBuffer(HTC_TARGET *target, HTC_PACKET *pPacket, HTC_PACKET_QUEUE *pList)
-+{
-+    LOCK_HTC(target);
-+    HTC_PACKET_ENQUEUE(pList,pPacket);
-+    UNLOCK_HTC(target);
-+}
-+
-+HTC_PACKET *HTCAllocControlBuffer(HTC_TARGET *target,  HTC_PACKET_QUEUE *pList)
-+{
-+    HTC_PACKET *pPacket;
-+
-+    LOCK_HTC(target);
-+    pPacket = HTC_PACKET_DEQUEUE(pList);
-+    UNLOCK_HTC(target);
-+
-+    return pPacket;
-+}
-+
-+/* cleanup the HTC instance */
-+static void HTCCleanup(HTC_TARGET *target)
-+{
-+    if (A_IS_MUTEX_VALID(&target->HTCLock)) {
-+        A_MUTEX_DELETE(&target->HTCLock);
-+    }
-+
-+    if (A_IS_MUTEX_VALID(&target->HTCRxLock)) {
-+        A_MUTEX_DELETE(&target->HTCRxLock);
-+    }
-+
-+    if (A_IS_MUTEX_VALID(&target->HTCTxLock)) {
-+        A_MUTEX_DELETE(&target->HTCTxLock);
-+    }
-+        /* free our instance */
-+    A_FREE(target);
-+}
-+
-+/* registered target arrival callback from the HIF layer */
-+static A_STATUS HTCTargetInsertedHandler(void *hif_handle)
-+{
-+    HTC_TARGET              *target = NULL;
-+    A_STATUS                 status;
-+    int                      i;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("htcTargetInserted - Enter\n"));
-+
-+    do {
-+
-+            /* allocate target memory */
-+        if ((target = (HTC_TARGET *)A_MALLOC(sizeof(HTC_TARGET))) == NULL) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to allocate memory\n"));
-+            status = A_ERROR;
-+            break;
-+        }
-+
-+        A_MEMZERO(target, sizeof(HTC_TARGET));
-+        A_MUTEX_INIT(&target->HTCLock);
-+        A_MUTEX_INIT(&target->HTCRxLock);
-+        A_MUTEX_INIT(&target->HTCTxLock);
-+        INIT_HTC_PACKET_QUEUE(&target->ControlBufferTXFreeList);
-+        INIT_HTC_PACKET_QUEUE(&target->ControlBufferRXFreeList);
-+
-+            /* give device layer the hif device handle */
-+        target->Device.HIFDevice = hif_handle;
-+            /* give the device layer our context (for event processing)
-+             * the device layer will register it's own context with HIF
-+             * so we need to set this so we can fetch it in the target remove handler */
-+        target->Device.HTCContext = target;
-+            /* set device layer target failure callback */
-+        target->Device.TargetFailureCallback = HTCReportFailure;
-+            /* set device layer recv message pending callback */
-+        target->Device.MessagePendingCallback = HTCRecvMessagePendingHandler;
-+        target->EpWaitingForBuffers = ENDPOINT_MAX;
-+
-+            /* setup device layer */
-+        status = DevSetup(&target->Device);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+            /* carve up buffers/packets for control messages */
-+        for (i = 0; i < NUM_CONTROL_RX_BUFFERS; i++) {
-+            HTC_PACKET *pControlPacket;
-+            pControlPacket = &target->HTCControlBuffers[i].HtcPacket;
-+            SET_HTC_PACKET_INFO_RX_REFILL(pControlPacket,
-+                                          target,
-+                                          target->HTCControlBuffers[i].Buffer,
-+                                          HTC_CONTROL_BUFFER_SIZE,
-+                                          ENDPOINT_0);
-+            HTC_FREE_CONTROL_RX(target,pControlPacket);
-+        }
-+
-+        for (;i < NUM_CONTROL_BUFFERS;i++) {
-+             HTC_PACKET *pControlPacket;
-+             pControlPacket = &target->HTCControlBuffers[i].HtcPacket;
-+             INIT_HTC_PACKET_INFO(pControlPacket,
-+                                  target->HTCControlBuffers[i].Buffer,
-+                                  HTC_CONTROL_BUFFER_SIZE);
-+             HTC_FREE_CONTROL_TX(target,pControlPacket);
-+        }
-+
-+    } while (FALSE);
-+
-+    if (A_SUCCESS(status)) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRC, (" calling AddInstance callback \n"));
-+            /* announce ourselves */
-+        HTCInitInfo.AddInstance((HTC_HANDLE)target);
-+    } else {
-+        if (target != NULL) {
-+            HTCCleanup(target);
-+        }
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("htcTargetInserted - Exit\n"));
-+
-+    return status;
-+}
-+
-+/* registered removal callback from the HIF layer */
-+static A_STATUS HTCTargetRemovedHandler(void *handle, A_STATUS status)
-+{
-+    HTC_TARGET *target;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("+HTCTargetRemovedHandler handle:0x%X \n",(A_UINT32)handle));
-+
-+    if (NULL == handle) {
-+            /* this could be NULL in the event that target initialization failed */
-+        return A_OK;
-+    }
-+
-+    target = ((AR6K_DEVICE *)handle)->HTCContext;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("   removing target:0x%X instance:0x%X ... \n",
-+            (A_UINT32)target, (A_UINT32)target->pInstanceContext));
-+
-+    if (target->pInstanceContext != NULL) {
-+            /* let upper layer know, it needs to call HTCStop() */
-+        HTCInitInfo.DeleteInstance(target->pInstanceContext);
-+    }
-+
-+    HIFShutDownDevice(target->Device.HIFDevice);
-+
-+    HTCCleanup(target);
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("-HTCTargetRemovedHandler \n"));
-+    return A_OK;
-+}
-+
-+/* get the low level HIF device for the caller , the caller may wish to do low level
-+ * HIF requests */
-+void *HTCGetHifDevice(HTC_HANDLE HTCHandle)
-+{
-+    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+    return target->Device.HIFDevice;
-+}
-+
-+/* set the instance block for this HTC handle, so that on removal, the blob can be
-+ * returned to the caller */
-+void HTCSetInstance(HTC_HANDLE HTCHandle, void *Instance)
-+{
-+    HTC_TARGET  *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+
-+    target->pInstanceContext = Instance;
-+}
-+
-+/* wait for the target to arrive (sends HTC Ready message)
-+ * this operation is fully synchronous and the message is polled for */
-+A_STATUS HTCWaitTarget(HTC_HANDLE HTCHandle)
-+{
-+    HTC_TARGET              *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+    A_STATUS                 status;
-+    HTC_PACKET              *pPacket = NULL;
-+    HTC_READY_MSG           *pRdyMsg;
-+    HTC_SERVICE_CONNECT_REQ  connect;
-+    HTC_SERVICE_CONNECT_RESP resp;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCWaitTarget - Enter (target:0x%X) \n", (A_UINT32)target));
-+
-+    do {
-+
-+#ifdef MBOXHW_UNIT_TEST
-+
-+        status = DoMboxHWTest(&target->Device);
-+
-+        if (status != A_OK) {
-+            break;
-+        }
-+
-+#endif
-+
-+            /* we should be getting 1 control message that the target is ready */
-+        status = HTCWaitforControlMessage(target, &pPacket);
-+
-+        if (A_FAILED(status)) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, (" Target Not Available!!\n"));
-+            break;
-+        }
-+
-+            /* we controlled the buffer creation so it has to be properly aligned */
-+        pRdyMsg = (HTC_READY_MSG *)pPacket->pBuffer;
-+
-+        if ((pRdyMsg->MessageID != HTC_MSG_READY_ID) ||
-+            (pPacket->ActualLength < sizeof(HTC_READY_MSG))) {
-+                /* this message is not valid */
-+            AR_DEBUG_ASSERT(FALSE);
-+            status = A_EPROTO;
-+            break;
-+        }
-+
-+        if (pRdyMsg->CreditCount == 0 || pRdyMsg->CreditSize == 0) {
-+              /* this message is not valid */
-+            AR_DEBUG_ASSERT(FALSE);
-+            status = A_EPROTO;
-+            break;
-+        }
-+
-+        target->TargetCredits = pRdyMsg->CreditCount;
-+        target->TargetCreditSize = pRdyMsg->CreditSize;
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRC, (" Target Ready: credits: %d credit size: %d\n",
-+                target->TargetCredits, target->TargetCreditSize));
-+
-+            /* setup our pseudo HTC control endpoint connection */
-+        A_MEMZERO(&connect,sizeof(connect));
-+        A_MEMZERO(&resp,sizeof(resp));
-+        connect.EpCallbacks.pContext = target;
-+        connect.EpCallbacks.EpTxComplete = HTCControlTxComplete;
-+        connect.EpCallbacks.EpRecv = HTCControlRecv;
-+        connect.EpCallbacks.EpRecvRefill = NULL;  /* not needed */
-+        connect.EpCallbacks.EpSendFull = NULL;    /* not nedded */
-+        connect.MaxSendQueueDepth = NUM_CONTROL_BUFFERS;
-+        connect.ServiceID = HTC_CTRL_RSVD_SVC;
-+
-+            /* connect fake service */
-+        status = HTCConnectService((HTC_HANDLE)target,
-+                                   &connect,
-+                                   &resp);
-+
-+        if (!A_FAILED(status)) {
-+            break;
-+        }
-+
-+    } while (FALSE);
-+
-+    if (pPacket != NULL) {
-+        HTC_FREE_CONTROL_RX(target,pPacket);
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCWaitTarget - Exit\n"));
-+
-+    return status;
-+}
-+
-+
-+
-+/* Start HTC, enable interrupts and let the target know host has finished setup */
-+A_STATUS HTCStart(HTC_HANDLE HTCHandle)
-+{
-+    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+    HTC_PACKET *pPacket;
-+    A_STATUS   status;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCStart Enter\n"));
-+
-+        /* now that we are starting, push control receive buffers into the
-+         * HTC control endpoint */
-+
-+    while (1) {
-+        pPacket = HTC_ALLOC_CONTROL_RX(target);
-+        if (NULL == pPacket) {
-+            break;
-+        }
-+        HTCAddReceivePkt((HTC_HANDLE)target,pPacket);
-+    }
-+
-+    do {
-+
-+        AR_DEBUG_ASSERT(target->InitCredits != NULL);
-+        AR_DEBUG_ASSERT(target->EpCreditDistributionListHead != NULL);
-+        AR_DEBUG_ASSERT(target->EpCreditDistributionListHead->pNext != NULL);
-+
-+            /* call init credits callback to do the distribution ,
-+             * NOTE: the first entry in the distribution list is ENDPOINT_0, so
-+             * we pass the start of the list after this one. */
-+        target->InitCredits(target->pCredDistContext,
-+                            target->EpCreditDistributionListHead->pNext,
-+                            target->TargetCredits);
-+
-+        if (AR_DEBUG_LVL_CHECK(ATH_DEBUG_TRC)) {
-+            DumpCreditDistStates(target);
-+        }
-+
-+            /* the caller is done connecting to services, so we can indicate to the
-+            * target that the setup phase is complete */
-+        status = HTCSendSetupComplete(target);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+            /* unmask interrupts */
-+        status = DevUnmaskInterrupts(&target->Device);
-+
-+        if (A_FAILED(status)) {
-+            HTCStop(target);
-+        }
-+
-+    } while (FALSE);
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCStart Exit\n"));
-+    return status;
-+}
-+
-+
-+/* stop HTC communications, i.e. stop interrupt reception, and flush all queued buffers */
-+void HTCStop(HTC_HANDLE HTCHandle)
-+{
-+    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("+HTCStop \n"));
-+
-+        /* mark that we are shutting down .. */
-+    target->HTCStateFlags |= HTC_STATE_STOPPING;
-+
-+        /* Masking interrupts is a synchronous operation, when this function returns
-+         * all pending HIF I/O has completed, we can safely flush the queues */
-+    DevMaskInterrupts(&target->Device);
-+
-+        /* flush all send packets */
-+    HTCFlushSendPkts(target);
-+        /* flush all recv buffers */
-+    HTCFlushRecvBuffers(target);
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("-HTCStop \n"));
-+}
-+
-+/* undo what was done in HTCInit() */
-+void HTCShutDown(void)
-+{
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("+HTCShutDown: \n"));
-+    HTCInitialized = FALSE;
-+        /* undo HTCInit */
-+    HIFShutDownDevice(NULL);
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("-HTCShutDown: \n"));
-+}
-+
-+void HTCDumpCreditStates(HTC_HANDLE HTCHandle)
-+{
-+    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+
-+    LOCK_HTC_TX(target);
-+
-+    DumpCreditDistStates(target);
-+
-+    UNLOCK_HTC_TX(target);
-+}
-+
-+/* report a target failure from the device, this is a callback from the device layer
-+ * which uses a mechanism to report errors from the target (i.e. special interrupts) */
-+static void HTCReportFailure(void *Context)
-+{
-+    HTC_TARGET *target = (HTC_TARGET *)Context;
-+
-+    target->TargetFailure = TRUE;
-+
-+    if ((target->pInstanceContext != NULL) && (HTCInitInfo.TargetFailure != NULL)) {
-+            /* let upper layer know, it needs to call HTCStop() */
-+        HTCInitInfo.TargetFailure(target->pInstanceContext, A_ERROR);
-+    }
-+}
-+
-+void DebugDumpBytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription)
-+{
-+    A_CHAR stream[60];
-+    A_UINT32 i;
-+    A_UINT16 offset, count;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("<---------Dumping %d Bytes : %s ------>\n", length, pDescription));
-+
-+    count = 0;
-+    offset = 0;
-+    for(i = 0; i < length; i++) {
-+        sprintf(stream + offset, "%2.2X ", buffer[i]);
-+        count ++;
-+        offset += 3;
-+
-+        if(count == 16) {
-+            count = 0;
-+            offset = 0;
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("[H]: %s\n", stream));
-+            A_MEMZERO(stream, 60);
-+        }
-+    }
-+
-+    if(offset != 0) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("[H]: %s\n", stream));
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("<------------------------------------------------->\n"));
-+}
-+
-+A_BOOL HTCGetEndpointStatistics(HTC_HANDLE               HTCHandle,
-+                                HTC_ENDPOINT_ID          Endpoint,
-+                                HTC_ENDPOINT_STAT_ACTION Action,
-+                                HTC_ENDPOINT_STATS       *pStats)
-+{
-+
-+#ifdef HTC_EP_STAT_PROFILING
-+    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+    A_BOOL     clearStats = FALSE;
-+    A_BOOL     sample = FALSE;
-+
-+    switch (Action) {
-+        case HTC_EP_STAT_SAMPLE :
-+            sample = TRUE;
-+            break;
-+        case HTC_EP_STAT_SAMPLE_AND_CLEAR :
-+            sample = TRUE;
-+            clearStats = TRUE;
-+            break;
-+        case HTC_EP_STAT_CLEAR :
-+            clearStats = TRUE;
-+            break;
-+        default:
-+            break;
-+    }
-+
-+    A_ASSERT(Endpoint < ENDPOINT_MAX);
-+
-+        /* lock out TX and RX while we sample and/or clear */
-+    LOCK_HTC_TX(target);
-+    LOCK_HTC_RX(target);
-+
-+    if (sample) {
-+        A_ASSERT(pStats != NULL);
-+            /* return the stats to the caller */
-+        A_MEMCPY(pStats, &target->EndPoint[Endpoint].EndPointStats, sizeof(HTC_ENDPOINT_STATS));
-+    }
-+
-+    if (clearStats) {
-+            /* reset stats */
-+        A_MEMZERO(&target->EndPoint[Endpoint].EndPointStats, sizeof(HTC_ENDPOINT_STATS));
-+    }
-+
-+    UNLOCK_HTC_RX(target);
-+    UNLOCK_HTC_TX(target);
-+
-+    return TRUE;
-+#else
-+    return FALSE;
-+#endif
-+}
-diff --git a/drivers/sdio/function/wlan/ar6000/htc/htc_debug.h b/drivers/sdio/function/wlan/ar6000/htc/htc_debug.h
-new file mode 100644
-index 0000000..08080be
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/htc/htc_debug.h
-@@ -0,0 +1,65 @@
-+#ifndef HTC_DEBUG_H_
-+#define HTC_DEBUG_H_
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+/* ------- Debug related stuff ------- */
-+enum {
-+    ATH_DEBUG_SEND = 0x0001,
-+    ATH_DEBUG_RECV = 0x0002,
-+    ATH_DEBUG_SYNC = 0x0004,
-+    ATH_DEBUG_DUMP = 0x0008,
-+    ATH_DEBUG_IRQ  = 0x0010,
-+    ATH_DEBUG_TRC  = 0x0020,
-+    ATH_DEBUG_WARN = 0x0040,
-+    ATH_DEBUG_ERR  = 0x0080,
-+    ATH_DEBUG_ANY  = 0xFFFF,
-+};
-+
-+#ifdef DEBUG
-+
-+// TODO FIX usage of A_PRINTF!
-+#define AR_DEBUG_LVL_CHECK(lvl) (debughtc & (lvl))
-+#define AR_DEBUG_PRINTBUF(buffer, length, desc) do {   \
-+    if (debughtc & ATH_DEBUG_DUMP) {             \
-+        DebugDumpBytes(buffer, length,desc);               \
-+    }                                            \
-+} while(0)
-+#define PRINTX_ARG(arg...) arg
-+#define AR_DEBUG_PRINTF(flags, args) do {        \
-+    if (debughtc & (flags)) {                    \
-+        A_PRINTF(KERN_ALERT PRINTX_ARG args);    \
-+    }                                            \
-+} while (0)
-+#define AR_DEBUG_ASSERT(test) do {               \
-+    if (!(test)) {                               \
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Debug Assert Caught, File %s, Line: %d, Test:%s \n",__FILE__, __LINE__,#test));         \
-+    }                                            \
-+} while(0)
-+extern int debughtc;
-+#else
-+#define AR_DEBUG_PRINTF(flags, args)
-+#define AR_DEBUG_PRINTBUF(buffer, length, desc)
-+#define AR_DEBUG_ASSERT(test)
-+#define AR_DEBUG_LVL_CHECK(lvl) 0
-+#endif
-+
-+void DebugDumpBytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription);
-+
-+#endif /*HTC_DEBUG_H_*/
-diff --git a/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h b/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h
-new file mode 100644
-index 0000000..ebb8ac1
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h
-@@ -0,0 +1,168 @@
-+/*
-+ *
-+ * Copyright (c) 2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef _HTC_INTERNAL_H_
-+#define _HTC_INTERNAL_H_
-+
-+/* for debugging, uncomment this to capture the last frame header, on frame header
-+ * processing errors, the last frame header is dump for comparison */
-+//#define HTC_CAPTURE_LAST_FRAME
-+
-+//#define HTC_EP_STAT_PROFILING
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-+
-+/* Header files */
-+#include "a_config.h"
-+#include "athdefs.h"
-+#include "a_types.h"
-+#include "a_osapi.h"
-+#include "a_debug.h"
-+#include "htc.h"
-+#include "htc_api.h"
-+#include "bmi_msg.h"
-+#include "hif.h"
-+#include "ar6k.h"
-+
-+/* HTC operational parameters */
-+#define HTC_TARGET_RESPONSE_TIMEOUT        2000 /* in ms */
-+#define HTC_TARGET_DEBUG_INTR_MASK         0x01
-+#define HTC_TARGET_CREDIT_INTR_MASK        0xF0
-+
-+typedef struct _HTC_ENDPOINT {
-+    HTC_SERVICE_ID              ServiceID;      /* service ID this endpoint is bound to
-+                                                   non-zero value means this endpoint is in use */
-+    HTC_PACKET_QUEUE            TxQueue;        /* HTC frame buffer TX queue */
-+    HTC_PACKET_QUEUE            RxBuffers;      /* HTC frame buffer RX list */
-+    HTC_ENDPOINT_CREDIT_DIST    CreditDist;     /* credit distribution structure (exposed to driver layer) */
-+    HTC_EP_CALLBACKS            EpCallBacks;    /* callbacks associated with this endpoint */
-+    int                         MaxTxQueueDepth;   /* max depth of the TX queue before we need to
-+                                                      call driver's full handler */
-+    int                         CurrentTxQueueDepth; /* current TX queue depth */
-+    int                         MaxMsgLength;        /* max length of endpoint message */
-+#ifdef HTC_EP_STAT_PROFILING
-+    HTC_ENDPOINT_STATS          EndPointStats;  /* endpoint statistics */
-+#endif
-+} HTC_ENDPOINT;
-+
-+#ifdef HTC_EP_STAT_PROFILING
-+#define INC_HTC_EP_STAT(p,stat,count) (p)->EndPointStats.stat += (count);
-+#else
-+#define INC_HTC_EP_STAT(p,stat,count)
-+#endif
-+
-+#define HTC_SERVICE_TX_PACKET_TAG  HTC_TX_PACKET_TAG_INTERNAL
-+
-+#define NUM_CONTROL_BUFFERS     8
-+#define NUM_CONTROL_TX_BUFFERS  2
-+#define NUM_CONTROL_RX_BUFFERS  (NUM_CONTROL_BUFFERS - NUM_CONTROL_TX_BUFFERS)
-+
-+#define HTC_CONTROL_BUFFER_SIZE (HTC_MAX_CONTROL_MESSAGE_LENGTH + HTC_HDR_LENGTH)
-+
-+typedef struct HTC_CONTROL_BUFFER {
-+    HTC_PACKET    HtcPacket;
-+    A_UINT8       Buffer[HTC_CONTROL_BUFFER_SIZE];
-+} HTC_CONTROL_BUFFER;
-+
-+/* our HTC target state */
-+typedef struct _HTC_TARGET {
-+    HTC_ENDPOINT                EndPoint[ENDPOINT_MAX];
-+    HTC_CONTROL_BUFFER          HTCControlBuffers[NUM_CONTROL_BUFFERS];
-+    HTC_ENDPOINT_CREDIT_DIST   *EpCreditDistributionListHead;
-+    HTC_PACKET_QUEUE            ControlBufferTXFreeList;
-+    HTC_PACKET_QUEUE            ControlBufferRXFreeList;
-+    HTC_CREDIT_DIST_CALLBACK    DistributeCredits;
-+    HTC_CREDIT_INIT_CALLBACK    InitCredits;
-+    void                       *pCredDistContext;
-+    int                         TargetCredits;
-+    int                         TargetCreditSize;
-+    A_MUTEX_T                   HTCLock;
-+    A_MUTEX_T                   HTCRxLock;
-+    A_MUTEX_T                   HTCTxLock;
-+    AR6K_DEVICE                 Device;         /* AR6K - specific state */
-+    A_UINT32                    HTCStateFlags;
-+    HTC_ENDPOINT_ID             EpWaitingForBuffers;
-+    A_BOOL                      TargetFailure;
-+    void                       *pInstanceContext;
-+#define HTC_STATE_WAIT_BUFFERS  (1 << 0)
-+#define HTC_STATE_STOPPING      (1 << 1)
-+#ifdef HTC_CAPTURE_LAST_FRAME
-+    HTC_FRAME_HDR               LastFrameHdr;  /* useful for debugging */
-+    A_UINT8                     LastTrailer[256];
-+    A_UINT8                     LastTrailerLength;
-+#endif
-+} HTC_TARGET;
-+
-+#define HTC_STOPPING(t) ((t)->HTCStateFlags & HTC_STATE_STOPPING)
-+#define LOCK_HTC(t)      A_MUTEX_LOCK(&(t)->HTCLock);
-+#define UNLOCK_HTC(t)    A_MUTEX_UNLOCK(&(t)->HTCLock);
-+#define LOCK_HTC_RX(t)   A_MUTEX_LOCK(&(t)->HTCRxLock);
-+#define UNLOCK_HTC_RX(t) A_MUTEX_UNLOCK(&(t)->HTCRxLock);
-+#define LOCK_HTC_TX(t)   A_MUTEX_LOCK(&(t)->HTCTxLock);
-+#define UNLOCK_HTC_TX(t) A_MUTEX_UNLOCK(&(t)->HTCTxLock);
-+
-+#define GET_HTC_TARGET_FROM_HANDLE(hnd) ((HTC_TARGET *)(hnd))
-+#define HTC_RECYCLE_RX_PKT(target,p)                \
-+{                                                   \
-+    HTC_PACKET_RESET_RX(pPacket);                   \
-+    HTCAddReceivePkt((HTC_HANDLE)(target),(p));     \
-+}
-+
-+/* internal HTC functions */
-+void        HTCControlTxComplete(void *Context, HTC_PACKET *pPacket);
-+void        HTCControlRecv(void *Context, HTC_PACKET *pPacket);
-+A_STATUS    HTCWaitforControlMessage(HTC_TARGET *target, HTC_PACKET **ppControlPacket);
-+HTC_PACKET *HTCAllocControlBuffer(HTC_TARGET *target, HTC_PACKET_QUEUE *pList);
-+void        HTCFreeControlBuffer(HTC_TARGET *target, HTC_PACKET *pPacket, HTC_PACKET_QUEUE *pList);
-+A_STATUS    HTCIssueSend(HTC_TARGET *target, HTC_PACKET *pPacket, A_UINT8 Flags);
-+A_STATUS    HTCIssueRecv(HTC_TARGET *target, HTC_PACKET *pPacket);
-+void        HTCRecvCompleteHandler(void *Context, HTC_PACKET *pPacket);
-+A_STATUS    HTCRecvMessagePendingHandler(void *Context, A_UINT32 LookAhead, A_BOOL *pAsyncProc);
-+void        HTCProcessCreditRpt(HTC_TARGET *target, HTC_CREDIT_REPORT *pRpt, int NumEntries, HTC_ENDPOINT_ID FromEndpoint);
-+A_STATUS    HTCSendSetupComplete(HTC_TARGET *target);
-+void        HTCFlushRecvBuffers(HTC_TARGET *target);
-+void        HTCFlushSendPkts(HTC_TARGET *target);
-+void        DumpCreditDist(HTC_ENDPOINT_CREDIT_DIST *pEPDist);
-+void        DumpCreditDistStates(HTC_TARGET *target);
-+void          DebugDumpBytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription);
-+
-+static INLINE HTC_PACKET *HTC_ALLOC_CONTROL_TX(HTC_TARGET *target) {
-+    HTC_PACKET *pPacket = HTCAllocControlBuffer(target,&target->ControlBufferTXFreeList);
-+    if (pPacket != NULL) {
-+            /* set payload pointer area with some headroom */
-+        pPacket->pBuffer = pPacket->pBufferStart + HTC_HDR_LENGTH;
-+    }
-+    return pPacket;
-+}
-+
-+#define HTC_FREE_CONTROL_TX(t,p) HTCFreeControlBuffer((t),(p),&(t)->ControlBufferTXFreeList)
-+#define HTC_ALLOC_CONTROL_RX(t)  HTCAllocControlBuffer((t),&(t)->ControlBufferRXFreeList)
-+#define HTC_FREE_CONTROL_RX(t,p) \
-+{                                                                \
-+    HTC_PACKET_RESET_RX(p);                                      \
-+    HTCFreeControlBuffer((t),(p),&(t)->ControlBufferRXFreeList); \
-+}
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _HTC_INTERNAL_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c b/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c
-new file mode 100644
-index 0000000..4be2b08
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c
-@@ -0,0 +1,703 @@
-+/*
-+ *
-+ * Copyright (c) 2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "htc_internal.h"
-+
-+#define HTCIssueRecv(t, p) \
-+    DevRecvPacket(&(t)->Device,  \
-+                  (p),          \
-+                  (p)->ActualLength)
-+
-+#define DO_RCV_COMPLETION(t,p,e)            \
-+{                                           \
-+    if ((p)->ActualLength > 0) {            \
-+        AR_DEBUG_PRINTF(ATH_DEBUG_RECV, (" completing packet 0x%X (%d bytes) on ep : %d \n", \
-+            (A_UINT32)(p), (p)->ActualLength, (p)->Endpoint));  \
-+        (e)->EpCallBacks.EpRecv((e)->EpCallBacks.pContext,      \
-+                                (p));                           \
-+    } else {                                                    \
-+        AR_DEBUG_PRINTF(ATH_DEBUG_RECV, (" recycling empty packet \n"));  \
-+        HTC_RECYCLE_RX_PKT((t), (p));                           \
-+    }                                                           \
-+}
-+
-+#ifdef HTC_EP_STAT_PROFILING
-+#define HTC_RX_STAT_PROFILE(t,ep,lookAhead)            \
-+{                                                      \
-+    LOCK_HTC_RX((t));                                  \
-+    INC_HTC_EP_STAT((ep), RxReceived, 1);              \
-+    if ((lookAhead) != 0) {                            \
-+        INC_HTC_EP_STAT((ep), RxLookAheads, 1);        \
-+    }                                                  \
-+    UNLOCK_HTC_RX((t));                                \
-+}
-+#else
-+#define HTC_RX_STAT_PROFILE(t,ep,lookAhead)
-+#endif
-+
-+static INLINE A_STATUS HTCProcessTrailer(HTC_TARGET *target,
-+                                         A_UINT8    *pBuffer,
-+                                         int         Length,
-+                                         A_UINT32   *pNextLookAhead,
-+                                         HTC_ENDPOINT_ID FromEndpoint)
-+{
-+    HTC_RECORD_HDR          *pRecord;
-+    A_UINT8                 *pRecordBuf;
-+    HTC_LOOKAHEAD_REPORT    *pLookAhead;
-+    A_UINT8                 *pOrigBuffer;
-+    int                     origLength;
-+    A_STATUS                status;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("+HTCProcessTrailer (length:%d) \n", Length));
-+
-+    if (AR_DEBUG_LVL_CHECK(ATH_DEBUG_RECV)) {
-+        AR_DEBUG_PRINTBUF(pBuffer,Length,"Recv Trailer");
-+    }
-+
-+    pOrigBuffer = pBuffer;
-+    origLength = Length;
-+    status = A_OK;
-+
-+    while (Length > 0) {
-+
-+        if (Length < sizeof(HTC_RECORD_HDR)) {
-+            status = A_EPROTO;
-+            break;
-+        }
-+            /* these are byte aligned structs */
-+        pRecord = (HTC_RECORD_HDR *)pBuffer;
-+        Length -= sizeof(HTC_RECORD_HDR);
-+        pBuffer += sizeof(HTC_RECORD_HDR);
-+
-+        if (pRecord->Length > Length) {
-+                /* no room left in buffer for record */
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                (" invalid record length: %d (id:%d) buffer has: %d bytes left \n",
-+                        pRecord->Length, pRecord->RecordID, Length));
-+            status = A_EPROTO;
-+            break;
-+        }
-+            /* start of record follows the header */
-+        pRecordBuf = pBuffer;
-+
-+        switch (pRecord->RecordID) {
-+            case HTC_RECORD_CREDITS:
-+                AR_DEBUG_ASSERT(pRecord->Length >= sizeof(HTC_CREDIT_REPORT));
-+                HTCProcessCreditRpt(target,
-+                                    (HTC_CREDIT_REPORT *)pRecordBuf,
-+                                    pRecord->Length / (sizeof(HTC_CREDIT_REPORT)),
-+                                    FromEndpoint);
-+                break;
-+            case HTC_RECORD_LOOKAHEAD:
-+                AR_DEBUG_ASSERT(pRecord->Length >= sizeof(HTC_LOOKAHEAD_REPORT));
-+                pLookAhead = (HTC_LOOKAHEAD_REPORT *)pRecordBuf;
-+                if ((pLookAhead->PreValid == ((~pLookAhead->PostValid) & 0xFF)) &&
-+                    (pNextLookAhead != NULL)) {
-+
-+                    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,
-+                                (" LookAhead Report Found (pre valid:0x%X, post valid:0x%X) \n",
-+                                pLookAhead->PreValid,
-+                                pLookAhead->PostValid));
-+
-+                        /* look ahead bytes are valid, copy them over */
-+                    ((A_UINT8 *)pNextLookAhead)[0] = pLookAhead->LookAhead[0];
-+                    ((A_UINT8 *)pNextLookAhead)[1] = pLookAhead->LookAhead[1];
-+                    ((A_UINT8 *)pNextLookAhead)[2] = pLookAhead->LookAhead[2];
-+                    ((A_UINT8 *)pNextLookAhead)[3] = pLookAhead->LookAhead[3];
-+
-+                    if (AR_DEBUG_LVL_CHECK(ATH_DEBUG_RECV)) {
-+                        DebugDumpBytes((A_UINT8 *)pNextLookAhead,4,"Next Look Ahead");
-+                    }
-+                }
-+                break;
-+            default:
-+                AR_DEBUG_PRINTF(ATH_DEBUG_ERR, (" unhandled record: id:%d length:%d \n",
-+                        pRecord->RecordID, pRecord->Length));
-+                break;
-+        }
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+            /* advance buffer past this record for next time around */
-+        pBuffer += pRecord->Length;
-+        Length -= pRecord->Length;
-+    }
-+
-+    if (A_FAILED(status)) {
-+        DebugDumpBytes(pOrigBuffer,origLength,"BAD Recv Trailer");
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("-HTCProcessTrailer \n"));
-+    return status;
-+
-+}
-+
-+/* process a received message (i.e. strip off header, process any trailer data)
-+ * note : locks must be released when this function is called */
-+static A_STATUS HTCProcessRecvHeader(HTC_TARGET *target, HTC_PACKET *pPacket, A_UINT32 *pNextLookAhead)
-+{
-+    A_UINT8   temp;
-+    A_UINT8   *pBuf;
-+    A_STATUS  status = A_OK;
-+    A_UINT16  payloadLen;
-+    A_UINT32  lookAhead;
-+
-+    pBuf = pPacket->pBuffer;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("+HTCProcessRecvHeader \n"));
-+
-+    if (AR_DEBUG_LVL_CHECK(ATH_DEBUG_RECV)) {
-+        AR_DEBUG_PRINTBUF(pBuf,pPacket->ActualLength,"HTC Recv PKT");
-+    }
-+
-+    do {
-+        /* note, we cannot assume the alignment of pBuffer, so we use the safe macros to
-+         * retrieve 16 bit fields */
-+        payloadLen = A_GET_UINT16_FIELD(pBuf, HTC_FRAME_HDR, PayloadLen);
-+
-+        ((A_UINT8 *)&lookAhead)[0] = pBuf[0];
-+        ((A_UINT8 *)&lookAhead)[1] = pBuf[1];
-+        ((A_UINT8 *)&lookAhead)[2] = pBuf[2];
-+        ((A_UINT8 *)&lookAhead)[3] = pBuf[3];
-+
-+        if (lookAhead != pPacket->HTCReserved) {
-+            /* somehow the lookahead that gave us the full read length did not
-+             * reflect the actual header in the pending message */
-+             AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                    ("HTCProcessRecvHeader, lookahead mismatch! \n"));
-+             DebugDumpBytes((A_UINT8 *)&pPacket->HTCReserved,4,"Expected Message LookAhead");
-+             DebugDumpBytes(pBuf,sizeof(HTC_FRAME_HDR),"Current Frame Header");
-+#ifdef HTC_CAPTURE_LAST_FRAME
-+            DebugDumpBytes((A_UINT8 *)&target->LastFrameHdr,sizeof(HTC_FRAME_HDR),"Last Frame Header");
-+            if (target->LastTrailerLength != 0) {
-+                DebugDumpBytes(target->LastTrailer,
-+                               target->LastTrailerLength,
-+                               "Last trailer");
-+            }
-+#endif
-+            status = A_EPROTO;
-+            break;
-+        }
-+
-+            /* get flags */
-+        temp = A_GET_UINT8_FIELD(pBuf, HTC_FRAME_HDR, Flags);
-+
-+        if (temp & HTC_FLAGS_RECV_TRAILER) {
-+            /* this packet has a trailer */
-+
-+                /* extract the trailer length in control byte 0 */
-+            temp = A_GET_UINT8_FIELD(pBuf, HTC_FRAME_HDR, ControlBytes[0]);
-+
-+            if ((temp < sizeof(HTC_RECORD_HDR)) || (temp > payloadLen)) {
-+                AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                    ("HTCProcessRecvHeader, invalid header (payloadlength should be :%d, CB[0] is:%d) \n",
-+                        payloadLen, temp));
-+                status = A_EPROTO;
-+                break;
-+            }
-+
-+                /* process trailer data that follows HDR + application payload */
-+            status = HTCProcessTrailer(target,
-+                                       (pBuf + HTC_HDR_LENGTH + payloadLen - temp),
-+                                       temp,
-+                                       pNextLookAhead,
-+                                       pPacket->Endpoint);
-+
-+            if (A_FAILED(status)) {
-+                break;
-+            }
-+
-+#ifdef HTC_CAPTURE_LAST_FRAME
-+            A_MEMCPY(target->LastTrailer, (pBuf + HTC_HDR_LENGTH + payloadLen - temp), temp);
-+            target->LastTrailerLength = temp;
-+#endif
-+                /* trim length by trailer bytes */
-+            pPacket->ActualLength -= temp;
-+        }
-+#ifdef HTC_CAPTURE_LAST_FRAME
-+         else {
-+            target->LastTrailerLength = 0;
-+        }
-+#endif
-+
-+            /* if we get to this point, the packet is good */
-+            /* remove header and adjust length */
-+        pPacket->pBuffer += HTC_HDR_LENGTH;
-+        pPacket->ActualLength -= HTC_HDR_LENGTH;
-+
-+    } while (FALSE);
-+
-+    if (A_FAILED(status)) {
-+            /* dump the whole packet */
-+        DebugDumpBytes(pBuf,pPacket->ActualLength,"BAD HTC Recv PKT");
-+    } else {
-+#ifdef HTC_CAPTURE_LAST_FRAME
-+        A_MEMCPY(&target->LastFrameHdr,pBuf,sizeof(HTC_FRAME_HDR));
-+#endif
-+        if (AR_DEBUG_LVL_CHECK(ATH_DEBUG_RECV)) {
-+            if (pPacket->ActualLength > 0) {
-+                AR_DEBUG_PRINTBUF(pPacket->pBuffer,pPacket->ActualLength,"HTC - Application Msg");
-+            }
-+        }
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("-HTCProcessRecvHeader \n"));
-+    return status;
-+}
-+
-+/* asynchronous completion handler for recv packet fetching, when the device layer
-+ * completes a read request, it will call this completion handler */
-+void HTCRecvCompleteHandler(void *Context, HTC_PACKET *pPacket)
-+{
-+    HTC_TARGET      *target = (HTC_TARGET *)Context;
-+    HTC_ENDPOINT    *pEndpoint;
-+    A_UINT32        nextLookAhead = 0;
-+    A_STATUS        status;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("+HTCRecvCompleteHandler (status:%d, ep:%d) \n",
-+                pPacket->Status, pPacket->Endpoint));
-+
-+    AR_DEBUG_ASSERT(pPacket->Endpoint < ENDPOINT_MAX);
-+    pEndpoint = &target->EndPoint[pPacket->Endpoint];
-+    pPacket->Completion = NULL;
-+
-+        /* get completion status */
-+    status = pPacket->Status;
-+
-+    do {
-+        if (A_FAILED(status)) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("HTCRecvCompleteHandler: request failed (status:%d, ep:%d) \n",
-+                pPacket->Status, pPacket->Endpoint));
-+            break;
-+        }
-+            /* process the header for any trailer data */
-+        status = HTCProcessRecvHeader(target,pPacket,&nextLookAhead);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+            /* was there a lookahead for the next packet? */
-+        if (nextLookAhead != 0) {
-+            A_STATUS nextStatus;
-+            AR_DEBUG_PRINTF(ATH_DEBUG_RECV,
-+                            ("HTCRecvCompleteHandler - next look ahead was non-zero : 0x%X \n",
-+                             nextLookAhead));
-+                /* we have another packet, get the next packet fetch started (pipelined) before
-+                 * we call into the endpoint's callback, this will start another async request */
-+            nextStatus = HTCRecvMessagePendingHandler(target,nextLookAhead,NULL);
-+            if (A_EPROTO == nextStatus) {
-+                AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                            ("Next look ahead from recv header was INVALID\n"));
-+                DebugDumpBytes((A_UINT8 *)&nextLookAhead,
-+                                4,
-+                                "BAD lookahead from lookahead report");
-+            }
-+        } else {
-+             AR_DEBUG_PRINTF(ATH_DEBUG_RECV,
-+            ("HTCRecvCompleteHandler - rechecking for more messages...\n"));
-+            /* if we did not get anything on the look-ahead,
-+             * call device layer to asynchronously re-check for messages. If we can keep the async
-+             * processing going we get better performance.  If there is a pending message we will keep processing
-+             * messages asynchronously which should pipeline things nicely */
-+            DevCheckPendingRecvMsgsAsync(&target->Device);
-+        }
-+
-+        HTC_RX_STAT_PROFILE(target,pEndpoint,nextLookAhead);
-+        DO_RCV_COMPLETION(target,pPacket,pEndpoint);
-+
-+    } while (FALSE);
-+
-+    if (A_FAILED(status)) {
-+         AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                         ("HTCRecvCompleteHandler , message fetch failed (status = %d) \n",
-+                         status));
-+            /* recyle this packet */
-+         HTC_RECYCLE_RX_PKT(target, pPacket);
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("-HTCRecvCompleteHandler\n"));
-+}
-+
-+/* synchronously wait for a control message from the target,
-+ * This function is used at initialization time ONLY.  At init messages
-+ * on ENDPOINT 0 are expected. */
-+A_STATUS HTCWaitforControlMessage(HTC_TARGET *target, HTC_PACKET **ppControlPacket)
-+{
-+    A_STATUS        status;
-+    A_UINT32        lookAhead;
-+    HTC_PACKET      *pPacket = NULL;
-+    HTC_FRAME_HDR   *pHdr;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("+HTCWaitforControlMessage \n"));
-+
-+    do  {
-+
-+        *ppControlPacket = NULL;
-+
-+            /* call the polling function to see if we have a message */
-+        status = DevPollMboxMsgRecv(&target->Device,
-+                                    &lookAhead,
-+                                    HTC_TARGET_RESPONSE_TIMEOUT);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_RECV,
-+                ("HTCWaitforControlMessage : lookAhead : 0x%X \n", lookAhead));
-+
-+            /* check the lookahead */
-+        pHdr = (HTC_FRAME_HDR *)&lookAhead;
-+
-+        if (pHdr->EndpointID != ENDPOINT_0) {
-+                /* unexpected endpoint number, should be zero */
-+            AR_DEBUG_ASSERT(FALSE);
-+            status = A_EPROTO;
-+            break;
-+        }
-+
-+        if (A_FAILED(status)) {
-+                /* bad message */
-+            AR_DEBUG_ASSERT(FALSE);
-+            status = A_EPROTO;
-+            break;
-+        }
-+
-+        pPacket = HTC_ALLOC_CONTROL_RX(target);
-+
-+        if (pPacket == NULL) {
-+            AR_DEBUG_ASSERT(FALSE);
-+            status = A_NO_MEMORY;
-+            break;
-+        }
-+
-+        pPacket->HTCReserved = lookAhead;
-+        pPacket->ActualLength = pHdr->PayloadLen + HTC_HDR_LENGTH;
-+
-+        if (pPacket->ActualLength > pPacket->BufferLength) {
-+            AR_DEBUG_ASSERT(FALSE);
-+            status = A_EPROTO;
-+            break;
-+        }
-+
-+            /* we want synchronous operation */
-+        pPacket->Completion = NULL;
-+
-+            /* get the message from the device, this will block */
-+        status = HTCIssueRecv(target, pPacket);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+            /* process receive header */
-+        status = HTCProcessRecvHeader(target,pPacket,NULL);
-+
-+        pPacket->Status = status;
-+
-+        if (A_FAILED(status)) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                    ("HTCWaitforControlMessage, HTCProcessRecvHeader failed (status = %d) \n",
-+                     status));
-+            break;
-+        }
-+
-+            /* give the caller this control message packet, they are responsible to free */
-+        *ppControlPacket = pPacket;
-+
-+    } while (FALSE);
-+
-+    if (A_FAILED(status)) {
-+        if (pPacket != NULL) {
-+                /* cleanup buffer on error */
-+            HTC_FREE_CONTROL_RX(target,pPacket);
-+        }
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("-HTCWaitforControlMessage \n"));
-+
-+    return status;
-+}
-+
-+/* callback when device layer or lookahead report parsing detects a pending message */
-+A_STATUS HTCRecvMessagePendingHandler(void *Context, A_UINT32 LookAhead, A_BOOL *pAsyncProc)
-+{
-+    HTC_TARGET      *target = (HTC_TARGET *)Context;
-+    A_STATUS         status = A_OK;
-+    HTC_PACKET      *pPacket = NULL;
-+    HTC_FRAME_HDR   *pHdr;
-+    HTC_ENDPOINT    *pEndpoint;
-+    A_BOOL          asyncProc = FALSE;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("+HTCRecvMessagePendingHandler LookAhead:0x%X \n",LookAhead));
-+
-+    if (IS_DEV_IRQ_PROCESSING_ASYNC_ALLOWED(&target->Device)) {
-+            /* We use async mode to get the packets if the device layer supports it.
-+             * The device layer interfaces with HIF in which HIF may have restrictions on
-+             * how interrupts are processed */
-+        asyncProc = TRUE;
-+    }
-+
-+    if (pAsyncProc != NULL) {
-+            /* indicate to caller how we decided to process this */
-+        *pAsyncProc = asyncProc;
-+    }
-+
-+    while (TRUE) {
-+
-+        pHdr = (HTC_FRAME_HDR *)&LookAhead;
-+
-+        if (pHdr->EndpointID >= ENDPOINT_MAX) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Invalid Endpoint in look-ahead: %d \n",pHdr->EndpointID));
-+                /* invalid endpoint */
-+            status = A_EPROTO;
-+            break;
-+        }
-+
-+        if (pHdr->PayloadLen > HTC_MAX_PAYLOAD_LENGTH) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Payload length %d exceeds max HTC : %d !\n",
-+                    pHdr->PayloadLen, HTC_MAX_PAYLOAD_LENGTH));
-+            status = A_EPROTO;
-+            break;
-+        }
-+
-+        pEndpoint = &target->EndPoint[pHdr->EndpointID];
-+
-+        if (0 == pEndpoint->ServiceID) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Endpoint %d is not connected !\n",pHdr->EndpointID));
-+                /* endpoint isn't even connected */
-+            status = A_EPROTO;
-+            break;
-+        }
-+
-+            /* lock RX to get a buffer */
-+        LOCK_HTC_RX(target);
-+
-+            /* get a packet from the endpoint recv queue */
-+        pPacket = HTC_PACKET_DEQUEUE(&pEndpoint->RxBuffers);
-+
-+        if (NULL == pPacket) {
-+                /* check for refill handler */
-+            if (pEndpoint->EpCallBacks.EpRecvRefill != NULL) {
-+                UNLOCK_HTC_RX(target);
-+                    /* call the re-fill handler */
-+                pEndpoint->EpCallBacks.EpRecvRefill(pEndpoint->EpCallBacks.pContext,
-+                                                    pHdr->EndpointID);
-+                LOCK_HTC_RX(target);
-+                    /* check if we have more buffers */
-+                pPacket = HTC_PACKET_DEQUEUE(&pEndpoint->RxBuffers);
-+                    /* fall through */
-+            }
-+        }
-+
-+        if (NULL == pPacket) {
-+                /* this is not an error, we simply need to mark that we are waiting for buffers.*/
-+            target->HTCStateFlags |= HTC_STATE_WAIT_BUFFERS;
-+            target->EpWaitingForBuffers = pHdr->EndpointID;
-+            status = A_NO_MEMORY;
-+        }
-+
-+        UNLOCK_HTC_RX(target);
-+
-+        if (A_FAILED(status)) {
-+                /* no buffers */
-+            break;
-+        }
-+
-+        AR_DEBUG_ASSERT(pPacket->Endpoint == pHdr->EndpointID);
-+
-+            /* make sure this message can fit in the endpoint buffer */
-+        if ((pHdr->PayloadLen + HTC_HDR_LENGTH) > pPacket->BufferLength) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                    ("Payload Length Error : header reports payload of: %d, endpoint buffer size: %d \n",
-+                    pHdr->PayloadLen, pPacket->BufferLength));
-+            status = A_EPROTO;
-+            break;
-+        }
-+
-+        pPacket->HTCReserved = LookAhead; /* set expected look ahead */
-+            /* set the amount of data to fetch */
-+        pPacket->ActualLength = pHdr->PayloadLen + HTC_HDR_LENGTH;
-+
-+        if (asyncProc) {
-+                /* we use async mode to get the packet if the device layer supports it
-+                 * set our callback and context */
-+            pPacket->Completion = HTCRecvCompleteHandler;
-+            pPacket->pContext = target;
-+        } else {
-+                /* fully synchronous */
-+            pPacket->Completion = NULL;
-+        }
-+
-+            /* go fetch the packet */
-+        status = HTCIssueRecv(target, pPacket);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+        if (asyncProc) {
-+                /* we did this asynchronously so we can get out of the loop, the asynch processing
-+                 * creates a chain of requests to continue processing pending messages in the
-+                 * context of callbacks  */
-+            break;
-+        }
-+
-+            /* in the sync case, we process the packet, check lookaheads and then repeat */
-+
-+        LookAhead = 0;
-+        status = HTCProcessRecvHeader(target,pPacket,&LookAhead);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+        HTC_RX_STAT_PROFILE(target,pEndpoint,LookAhead);
-+        DO_RCV_COMPLETION(target,pPacket,pEndpoint);
-+
-+        pPacket = NULL;
-+
-+        if (0 == LookAhead) {
-+            break;
-+        }
-+
-+    }
-+
-+    if (A_NO_MEMORY == status) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                (" Endpoint :%d has no buffers, blocking receiver to prevent overrun.. \n",
-+                pHdr->EndpointID));
-+            /* try to stop receive at the device layer */
-+        DevStopRecv(&target->Device, asyncProc ? DEV_STOP_RECV_ASYNC : DEV_STOP_RECV_SYNC);
-+        status = A_OK;
-+    } else if (A_FAILED(status)) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                        ("Failed to get pending message : LookAhead Value: 0x%X (status = %d) \n",
-+                        LookAhead, status));
-+        if (pPacket != NULL) {
-+                /* clean up packet on error */
-+            HTC_RECYCLE_RX_PKT(target, pPacket);
-+        }
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("-HTCRecvMessagePendingHandler \n"));
-+
-+    return status;
-+}
-+
-+/* Makes a buffer available to the HTC module */
-+A_STATUS HTCAddReceivePkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket)
-+{
-+    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+    HTC_ENDPOINT *pEndpoint;
-+    A_BOOL       unblockRecv = FALSE;
-+    A_STATUS     status = A_OK;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND,
-+                    ("+- HTCAddReceivePkt: endPointId: %d, buffer: 0x%X, length: %d\n",
-+                    pPacket->Endpoint, (A_UINT32)pPacket->pBuffer, pPacket->BufferLength));
-+
-+    do {
-+
-+        if (HTC_STOPPING(target)) {
-+            status = A_ECANCELED;
-+            break;
-+        }
-+
-+        AR_DEBUG_ASSERT(pPacket->Endpoint < ENDPOINT_MAX);
-+
-+        pEndpoint = &target->EndPoint[pPacket->Endpoint];
-+
-+        LOCK_HTC_RX(target);
-+
-+            /* store receive packet */
-+        HTC_PACKET_ENQUEUE(&pEndpoint->RxBuffers, pPacket);
-+
-+            /* check if we are blocked waiting for a new buffer */
-+        if (target->HTCStateFlags & HTC_STATE_WAIT_BUFFERS) {
-+            if (target->EpWaitingForBuffers == pPacket->Endpoint) {
-+                AR_DEBUG_PRINTF(ATH_DEBUG_RECV,(" receiver was blocked on ep:%d, unblocking.. \n",
-+                    target->EpWaitingForBuffers));
-+                target->HTCStateFlags &= ~HTC_STATE_WAIT_BUFFERS;
-+                target->EpWaitingForBuffers = ENDPOINT_MAX;
-+                unblockRecv = TRUE;
-+            }
-+        }
-+
-+        UNLOCK_HTC_RX(target);
-+
-+        if (unblockRecv && !HTC_STOPPING(target)) {
-+                /* TODO : implement a buffer threshold count? */
-+            DevEnableRecv(&target->Device,DEV_ENABLE_RECV_SYNC);
-+        }
-+
-+    } while (FALSE);
-+
-+    return status;
-+}
-+
-+static void HTCFlushEndpointRX(HTC_TARGET *target, HTC_ENDPOINT *pEndpoint)
-+{
-+    HTC_PACKET  *pPacket;
-+
-+    LOCK_HTC_RX(target);
-+
-+    while (1) {
-+        pPacket = HTC_PACKET_DEQUEUE(&pEndpoint->RxBuffers);
-+        if (NULL == pPacket) {
-+            break;
-+        }
-+        UNLOCK_HTC_RX(target);
-+        pPacket->Status = A_ECANCELED;
-+        pPacket->ActualLength = 0;
-+        AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("  Flushing RX packet:0x%X, length:%d, ep:%d \n",
-+                (A_UINT32)pPacket, pPacket->BufferLength, pPacket->Endpoint));
-+            /* give the packet back */
-+        pEndpoint->EpCallBacks.EpRecv(pEndpoint->EpCallBacks.pContext,
-+                                      pPacket);
-+        LOCK_HTC_RX(target);
-+    }
-+
-+    UNLOCK_HTC_RX(target);
-+
-+
-+}
-+
-+void HTCFlushRecvBuffers(HTC_TARGET *target)
-+{
-+    HTC_ENDPOINT    *pEndpoint;
-+    int             i;
-+
-+        /* NOTE: no need to flush endpoint 0, these buffers were
-+         * allocated as part of the HTC struct */
-+    for (i = ENDPOINT_1; i < ENDPOINT_MAX; i++) {
-+        pEndpoint = &target->EndPoint[i];
-+        if (pEndpoint->ServiceID == 0) {
-+                /* not in use.. */
-+            continue;
-+        }
-+        HTCFlushEndpointRX(target,pEndpoint);
-+    }
-+
-+
-+}
-+
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/htc/htc_send.c b/drivers/sdio/function/wlan/ar6000/htc/htc_send.c
-new file mode 100644
-index 0000000..7792dd6
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/htc/htc_send.c
-@@ -0,0 +1,541 @@
-+/*
-+ *
-+ * Copyright (c) 2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "htc_internal.h"
-+
-+#define DO_EP_TX_COMPLETION(ep,p)                                    \
-+{                                                                    \
-+    (p)->Completion = NULL;                                          \
-+    (ep)->EpCallBacks.EpTxComplete((ep)->EpCallBacks.pContext,(p));  \
-+}
-+
-+
-+/* call the distribute credits callback with the distribution */
-+#define DO_DISTRIBUTION(t,reason,description,pList) \
-+{                                             \
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND,           \
-+        ("  calling distribute function (%s) (dfn:0x%X, ctxt:0x%X, dist:0x%X) \n", \
-+                (description),                                           \
-+                (A_UINT32)(t)->DistributeCredits,                        \
-+                (A_UINT32)(t)->pCredDistContext,                         \
-+                (A_UINT32)pList));                                       \
-+    (t)->DistributeCredits((t)->pCredDistContext,                        \
-+                           (pList),                                      \
-+                           (reason));                                    \
-+}
-+
-+/* our internal send packet completion handler when packets are submited to the AR6K device
-+ * layer */
-+static void HTCSendPktCompletionHandler(void *Context, HTC_PACKET *pPacket)
-+{
-+    HTC_TARGET      *target = (HTC_TARGET *)Context;
-+    HTC_ENDPOINT    *pEndpoint = &target->EndPoint[pPacket->Endpoint];
-+
-+
-+    if (A_FAILED(pPacket->Status)) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+            ("HTCSendPktCompletionHandler: request failed (status:%d, ep:%d) \n",
-+                pPacket->Status, pPacket->Endpoint));
-+    }
-+        /* first, fixup the head room we allocated */
-+    pPacket->pBuffer += HTC_HDR_LENGTH;
-+        /* do completion */
-+    DO_EP_TX_COMPLETION(pEndpoint,pPacket);
-+}
-+
-+A_STATUS HTCIssueSend(HTC_TARGET *target, HTC_PACKET *pPacket, A_UINT8 SendFlags)
-+{
-+    A_STATUS status;
-+    A_UINT8 *pHdrBuf;
-+    A_BOOL   sync = FALSE;
-+
-+        /* caller always provides headrooom */
-+    pPacket->pBuffer -= HTC_HDR_LENGTH;
-+    pHdrBuf = pPacket->pBuffer;
-+        /* setup frame header */
-+    A_SET_UINT16_FIELD(pHdrBuf,HTC_FRAME_HDR,PayloadLen,(A_UINT16)pPacket->ActualLength);
-+    A_SET_UINT8_FIELD(pHdrBuf,HTC_FRAME_HDR,Flags,SendFlags);
-+    A_SET_UINT8_FIELD(pHdrBuf,HTC_FRAME_HDR,EndpointID, (A_UINT8)pPacket->Endpoint);
-+
-+    if (pPacket->Completion == NULL) {
-+            /* mark that this request was synchronously issued */
-+        sync = TRUE;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND,
-+                    ("+-HTCIssueSend: transmit length : %d (%s) \n",
-+                    pPacket->ActualLength + HTC_HDR_LENGTH,
-+                    sync ? "SYNC" : "ASYNC" ));
-+
-+        /* send message to device */
-+    status = DevSendPacket(&target->Device,
-+                           pPacket,
-+                           pPacket->ActualLength + HTC_HDR_LENGTH);
-+
-+    if (sync) {
-+            /* use local sync variable.  If this was issued asynchronously, pPacket is no longer
-+             * safe to access. */
-+        pPacket->pBuffer += HTC_HDR_LENGTH;
-+    }
-+
-+    /* if this request was asynchronous, the packet completion routine will be invoked by
-+     * the device layer when the HIF layer completes the request */
-+
-+    return status;
-+}
-+
-+/* try to send the current packet or a packet at the head of the TX queue,
-+ * if there are no credits, the packet remains in the queue.
-+ * this function always succeeds and returns a flag if the TX queue for
-+ * the endpoint has hit the set limit */
-+static A_BOOL HTCTrySend(HTC_TARGET   *target,
-+                         HTC_ENDPOINT *pEndpoint,
-+                         HTC_PACKET   *pPacketToSend)
-+{
-+    HTC_PACKET  *pPacket;
-+    int         creditsRequired;
-+    int         remainder;
-+    A_UINT8     sendFlags;
-+    A_BOOL      epFull = FALSE;
-+
-+    LOCK_HTC_TX(target);
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND,("+HTCTrySend (pPkt:0x%X)\n",(A_UINT32)pPacketToSend));
-+
-+    if (pPacketToSend != NULL) {
-+        /* caller supplied us a packet to queue to the tail of the HTC TX queue before
-+         * we check the tx queue */
-+        HTC_PACKET_ENQUEUE(&pEndpoint->TxQueue,pPacketToSend);
-+        pEndpoint->CurrentTxQueueDepth++;
-+    }
-+
-+        /* now drain the TX queue for transmission as long as we have enough
-+         * credits */
-+
-+    while (1) {
-+
-+        if (HTC_QUEUE_EMPTY(&pEndpoint->TxQueue)) {
-+                /* nothing in the queue */
-+            break;
-+        }
-+
-+        sendFlags = 0;
-+
-+            /* get packet at head, but don't remove it */
-+        pPacket = HTC_GET_PKT_AT_HEAD(&pEndpoint->TxQueue);
-+        AR_DEBUG_PRINTF(ATH_DEBUG_SEND,(" Got head packet:0x%X , Queue Depth: %d\n",
-+                (A_UINT32)pPacket, pEndpoint->CurrentTxQueueDepth));
-+
-+            /* figure out how many credits this message requires */
-+        creditsRequired = (pPacket->ActualLength + HTC_HDR_LENGTH) / target->TargetCreditSize;
-+        remainder = (pPacket->ActualLength + HTC_HDR_LENGTH) % target->TargetCreditSize;
-+
-+        if (remainder) {
-+            creditsRequired++;
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_SEND,(" Creds Required:%d   Got:%d\n",
-+                            creditsRequired, pEndpoint->CreditDist.TxCredits));
-+
-+        if (pEndpoint->CreditDist.TxCredits < creditsRequired) {
-+
-+            /* not enough credits */
-+
-+            if (pPacket->Endpoint == ENDPOINT_0) {
-+                    /* leave it in the queue */
-+                break;
-+            }
-+                /* invoke the registered distribution function only if this is not
-+                 * endpoint 0, we let the driver layer provide more credits if it can.
-+                 * We pass the credit distribution list starting at the endpoint in question
-+                 * */
-+
-+                /* set how many credits we need  */
-+            pEndpoint->CreditDist.TxCreditsSeek =
-+                                    creditsRequired - pEndpoint->CreditDist.TxCredits;
-+            DO_DISTRIBUTION(target,
-+                            HTC_CREDIT_DIST_SEEK_CREDITS,
-+                            "Seek Credits",
-+                            &pEndpoint->CreditDist);
-+
-+            pEndpoint->CreditDist.TxCreditsSeek = 0;
-+
-+            if (pEndpoint->CreditDist.TxCredits < creditsRequired) {
-+                    /* still not enough credits to send, leave packet in the queue */
-+                AR_DEBUG_PRINTF(ATH_DEBUG_SEND,
-+                    (" Not enough credits for ep %d leaving packet in queue..\n",
-+                    pPacket->Endpoint));
-+                break;
-+            }
-+
-+        }
-+
-+        pEndpoint->CreditDist.TxCredits -= creditsRequired;
-+        INC_HTC_EP_STAT(pEndpoint, TxCreditsConsummed, creditsRequired);
-+
-+            /* check if we need credits */
-+        if (pEndpoint->CreditDist.TxCredits < pEndpoint->CreditDist.TxCreditsPerMaxMsg) {
-+            sendFlags |= HTC_FLAGS_NEED_CREDIT_UPDATE;
-+            INC_HTC_EP_STAT(pEndpoint, TxCreditLowIndications, 1);
-+            AR_DEBUG_PRINTF(ATH_DEBUG_SEND,(" Host Needs Credits  \n"));
-+        }
-+
-+            /* now we can fully dequeue */
-+        pPacket = HTC_PACKET_DEQUEUE(&pEndpoint->TxQueue);
-+        pEndpoint->CurrentTxQueueDepth--;
-+
-+        INC_HTC_EP_STAT(pEndpoint, TxIssued, 1);
-+
-+        UNLOCK_HTC_TX(target);
-+
-+        HTCIssueSend(target, pPacket, sendFlags);
-+
-+        LOCK_HTC_TX(target);
-+
-+        /* go back and check for more messages */
-+    }
-+
-+    if (pEndpoint->CurrentTxQueueDepth >= pEndpoint->MaxTxQueueDepth) {
-+            /* let caller know that this endpoint has reached the maximum depth */
-+        epFull = TRUE;
-+    }
-+
-+    UNLOCK_HTC_TX(target);
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND,("-HTCTrySend:  \n"));
-+    return epFull;
-+}
-+
-+/* HTC API - HTCSendPkt */
-+A_STATUS HTCSendPkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket)
-+{
-+    HTC_TARGET      *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+    HTC_ENDPOINT    *pEndpoint;
-+    HTC_ENDPOINT_ID ep;
-+    A_STATUS        status = A_OK;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND,
-+                    ("+HTCSendPkt: Enter endPointId: %d, buffer: 0x%X, length: %d \n",
-+                    pPacket->Endpoint, (A_UINT32)pPacket->pBuffer, pPacket->ActualLength));
-+
-+    ep = pPacket->Endpoint;
-+    AR_DEBUG_ASSERT(ep < ENDPOINT_MAX);
-+    pEndpoint = &target->EndPoint[ep];
-+
-+    do {
-+
-+        if (HTC_STOPPING(target)) {
-+            status = A_ECANCELED;
-+            pPacket->Status = status;
-+            DO_EP_TX_COMPLETION(pEndpoint,pPacket);
-+            break;
-+        }
-+            /* everything sent through this interface is asynchronous */
-+            /* fill in HTC completion routines */
-+        pPacket->Completion = HTCSendPktCompletionHandler;
-+        pPacket->pContext = target;
-+
-+        if (HTCTrySend(target, pEndpoint, pPacket)) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_SEND, (" Endpoint %d, TX queue is full, Depth:%d, Max:%d \n",
-+                    ep, pEndpoint->CurrentTxQueueDepth, pEndpoint->MaxTxQueueDepth));
-+                /* queue is now full, let caller know */
-+            if (pEndpoint->EpCallBacks.EpSendFull != NULL) {
-+                AR_DEBUG_PRINTF(ATH_DEBUG_SEND, (" Calling driver's send full callback.... \n"));
-+                pEndpoint->EpCallBacks.EpSendFull(pEndpoint->EpCallBacks.pContext,
-+                                                  ep);
-+            }
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("-HTCSendPkt \n"));
-+    } while (FALSE);
-+
-+    return status;
-+}
-+
-+
-+/* check TX queues to drain because of credit distribution update */
-+static INLINE void HTCCheckEndpointTxQueues(HTC_TARGET *target)
-+{
-+    HTC_ENDPOINT                *pEndpoint;
-+    HTC_ENDPOINT_CREDIT_DIST    *pDistItem;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("+HTCCheckEndpointTxQueues \n"));
-+    pDistItem = target->EpCreditDistributionListHead;
-+
-+        /* run through the credit distribution list to see
-+         * if there are packets queued
-+         * NOTE: no locks need to be taken since the distribution list
-+         * is not dynamic (cannot be re-ordered) and we are not modifying any state */
-+    while (pDistItem != NULL) {
-+        pEndpoint = (HTC_ENDPOINT *)pDistItem->pHTCReserved;
-+
-+        if (pEndpoint->CurrentTxQueueDepth > 0) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_SEND, (" Ep %d has %d credits and %d Packets in TX Queue \n",
-+                    pDistItem->Endpoint, pEndpoint->CreditDist.TxCredits, pEndpoint->CurrentTxQueueDepth));
-+                /* try to start the stalled queue, this list is ordered by priority.
-+                 * Highest priority queue get's processed first, if there are credits available the
-+                 * highest priority queue will get a chance to reclaim credits from lower priority
-+                 * ones */
-+            HTCTrySend(target, pEndpoint, NULL);
-+        }
-+
-+        pDistItem = pDistItem->pNext;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("-HTCCheckEndpointTxQueues \n"));
-+}
-+
-+/* process credit reports and call distribution function */
-+void HTCProcessCreditRpt(HTC_TARGET *target, HTC_CREDIT_REPORT *pRpt, int NumEntries, HTC_ENDPOINT_ID FromEndpoint)
-+{
-+    int             i;
-+    HTC_ENDPOINT    *pEndpoint;
-+    int             totalCredits = 0;
-+    A_BOOL          doDist = FALSE;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("+HTCProcessCreditRpt, Credit Report Entries:%d \n", NumEntries));
-+
-+        /* lock out TX while we update credits */
-+    LOCK_HTC_TX(target);
-+
-+    for (i = 0; i < NumEntries; i++, pRpt++) {
-+        if (pRpt->EndpointID >= ENDPOINT_MAX) {
-+            AR_DEBUG_ASSERT(FALSE);
-+            break;
-+        }
-+
-+        pEndpoint = &target->EndPoint[pRpt->EndpointID];
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("  Endpoint %d got %d credits \n",
-+                pRpt->EndpointID, pRpt->Credits));
-+
-+
-+#ifdef HTC_EP_STAT_PROFILING
-+
-+        INC_HTC_EP_STAT(pEndpoint, TxCreditRpts, 1);
-+        INC_HTC_EP_STAT(pEndpoint, TxCreditsReturned, pRpt->Credits);
-+
-+        if (FromEndpoint == pRpt->EndpointID) {
-+                /* this credit report arrived on the same endpoint indicating it arrived in an RX
-+                 * packet */
-+            INC_HTC_EP_STAT(pEndpoint, TxCreditsFromRx, pRpt->Credits);
-+            INC_HTC_EP_STAT(pEndpoint, TxCreditRptsFromRx, 1);
-+        } else if (FromEndpoint == ENDPOINT_0) {
-+                /* this credit arrived on endpoint 0 as a NULL message */
-+            INC_HTC_EP_STAT(pEndpoint, TxCreditsFromEp0, pRpt->Credits);
-+            INC_HTC_EP_STAT(pEndpoint, TxCreditRptsFromEp0, 1);
-+        } else {
-+                /* arrived on another endpoint */
-+            INC_HTC_EP_STAT(pEndpoint, TxCreditsFromOther, pRpt->Credits);
-+            INC_HTC_EP_STAT(pEndpoint, TxCreditRptsFromOther, 1);
-+        }
-+
-+#endif
-+
-+        if (ENDPOINT_0 == pRpt->EndpointID) {
-+                /* always give endpoint 0 credits back */
-+            pEndpoint->CreditDist.TxCredits += pRpt->Credits;
-+        } else {
-+                /* for all other endpoints, update credits to distribute, the distribution function
-+                 * will handle giving out credits back to the endpoints */
-+            pEndpoint->CreditDist.TxCreditsToDist += pRpt->Credits;
-+                /* flag that we have to do the distribution */
-+            doDist = TRUE;
-+        }
-+
-+        totalCredits += pRpt->Credits;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("  Report indicated %d credits to distribute \n", totalCredits));
-+
-+    if (doDist) {
-+            /* this was a credit return based on a completed send operations
-+             * note, this is done with the lock held */
-+        DO_DISTRIBUTION(target,
-+                        HTC_CREDIT_DIST_SEND_COMPLETE,
-+                        "Send Complete",
-+                        target->EpCreditDistributionListHead->pNext);
-+    }
-+
-+    UNLOCK_HTC_TX(target);
-+
-+    if (totalCredits) {
-+        HTCCheckEndpointTxQueues(target);
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("-HTCProcessCreditRpt \n"));
-+}
-+
-+/* flush endpoint TX queue */
-+static void HTCFlushEndpointTX(HTC_TARGET *target, HTC_ENDPOINT *pEndpoint, HTC_TX_TAG Tag)
-+{
-+    HTC_PACKET          *pPacket;
-+    HTC_PACKET_QUEUE    discardQueue;
-+
-+        /* initialize the discard queue */
-+    INIT_HTC_PACKET_QUEUE(&discardQueue);
-+
-+    LOCK_HTC_TX(target);
-+
-+        /* interate from the front of the TX queue and flush out packets */
-+    ITERATE_OVER_LIST_ALLOW_REMOVE(&pEndpoint->TxQueue, pPacket, HTC_PACKET, ListLink) {
-+
-+            /* check for removal */
-+        if ((HTC_TX_PACKET_TAG_ALL == Tag) || (Tag == pPacket->PktInfo.AsTx.Tag)) {
-+                /* remove from queue */
-+            HTC_PACKET_REMOVE(pPacket);
-+                /* add it to the discard pile */
-+            HTC_PACKET_ENQUEUE(&discardQueue, pPacket);
-+            pEndpoint->CurrentTxQueueDepth--;
-+        }
-+
-+    } ITERATE_END;
-+
-+    UNLOCK_HTC_TX(target);
-+
-+        /* empty the discard queue */
-+    while (1) {
-+        pPacket = HTC_PACKET_DEQUEUE(&discardQueue);
-+        if (NULL == pPacket) {
-+            break;
-+        }
-+        pPacket->Status = A_ECANCELED;
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("  Flushing TX packet:0x%X, length:%d, ep:%d tag:0x%X \n",
-+                (A_UINT32)pPacket, pPacket->ActualLength, pPacket->Endpoint, pPacket->PktInfo.AsTx.Tag));
-+        DO_EP_TX_COMPLETION(pEndpoint,pPacket);
-+    }
-+
-+}
-+
-+void DumpCreditDist(HTC_ENDPOINT_CREDIT_DIST *pEPDist)
-+{
-+    HTC_ENDPOINT *pEndpoint = (HTC_ENDPOINT *)pEPDist->pHTCReserved;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("--- EP : %d  ServiceID: 0x%X    --------------\n",
-+                        pEPDist->Endpoint, pEPDist->ServiceID));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" this:0x%X next:0x%X prev:0x%X\n",
-+                (A_UINT32)pEPDist, (A_UINT32)pEPDist->pNext, (A_UINT32)pEPDist->pPrev));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" DistFlags          : 0x%X \n", pEPDist->DistFlags));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCreditsNorm      : %d \n", pEPDist->TxCreditsNorm));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCreditsMin       : %d \n", pEPDist->TxCreditsMin));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCredits          : %d \n", pEPDist->TxCredits));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCreditsAssigned  : %d \n", pEPDist->TxCreditsAssigned));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCreditsSeek      : %d \n", pEPDist->TxCreditsSeek));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCreditSize       : %d \n", pEPDist->TxCreditSize));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCreditsPerMaxMsg : %d \n", pEPDist->TxCreditsPerMaxMsg));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCreditsToDist    : %d \n", pEPDist->TxCreditsToDist));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxQueueDepth       : %d \n", pEndpoint->CurrentTxQueueDepth));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("----------------------------------------------------\n"));
-+}
-+
-+void DumpCreditDistStates(HTC_TARGET *target)
-+{
-+    HTC_ENDPOINT_CREDIT_DIST *pEPList = target->EpCreditDistributionListHead;
-+
-+    while (pEPList != NULL) {
-+        DumpCreditDist(pEPList);
-+        pEPList = pEPList->pNext;
-+    }
-+
-+    if (target->DistributeCredits != NULL) {
-+        DO_DISTRIBUTION(target,
-+                        HTC_DUMP_CREDIT_STATE,
-+                        "Dump State",
-+                        NULL);
-+    }
-+}
-+
-+/* flush all send packets from all endpoint queues */
-+void HTCFlushSendPkts(HTC_TARGET *target)
-+{
-+    HTC_ENDPOINT    *pEndpoint;
-+    int             i;
-+
-+    DumpCreditDistStates(target);
-+
-+    for (i = ENDPOINT_0; i < ENDPOINT_MAX; i++) {
-+        pEndpoint = &target->EndPoint[i];
-+        if (pEndpoint->ServiceID == 0) {
-+                /* not in use.. */
-+            continue;
-+        }
-+        HTCFlushEndpointTX(target,pEndpoint,HTC_TX_PACKET_TAG_ALL);
-+    }
-+
-+
-+}
-+
-+/* HTC API to flush an endpoint's TX queue*/
-+void HTCFlushEndpoint(HTC_HANDLE HTCHandle, HTC_ENDPOINT_ID Endpoint, HTC_TX_TAG Tag)
-+{
-+    HTC_TARGET      *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+    HTC_ENDPOINT    *pEndpoint = &target->EndPoint[Endpoint];
-+
-+    if (pEndpoint->ServiceID == 0) {
-+        AR_DEBUG_ASSERT(FALSE);
-+        /* not in use.. */
-+        return;
-+    }
-+
-+    HTCFlushEndpointTX(target, pEndpoint, Tag);
-+}
-+
-+/* HTC API to indicate activity to the credit distribution function */
-+void HTCIndicateActivityChange(HTC_HANDLE      HTCHandle,
-+                               HTC_ENDPOINT_ID Endpoint,
-+                               A_BOOL          Active)
-+{
-+    HTC_TARGET      *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+    HTC_ENDPOINT    *pEndpoint = &target->EndPoint[Endpoint];
-+    A_BOOL          doDist = FALSE;
-+
-+    if (pEndpoint->ServiceID == 0) {
-+        AR_DEBUG_ASSERT(FALSE);
-+        /* not in use.. */
-+        return;
-+    }
-+
-+    LOCK_HTC_TX(target);
-+
-+    if (Active) {
-+        if (!(pEndpoint->CreditDist.DistFlags & HTC_EP_ACTIVE)) {
-+                /* mark active now */
-+            pEndpoint->CreditDist.DistFlags |= HTC_EP_ACTIVE;
-+            doDist = TRUE;
-+        }
-+    } else {
-+        if (pEndpoint->CreditDist.DistFlags & HTC_EP_ACTIVE) {
-+                /* mark inactive now */
-+            pEndpoint->CreditDist.DistFlags &= ~HTC_EP_ACTIVE;
-+            doDist = TRUE;
-+        }
-+    }
-+
-+    if (doDist) {
-+        /* do distribution again based on activity change
-+         * note, this is done with the lock held */
-+        DO_DISTRIBUTION(target,
-+                        HTC_CREDIT_DIST_ACTIVITY_CHANGE,
-+                        "Activity Change",
-+                        target->EpCreditDistributionListHead->pNext);
-+    }
-+
-+    UNLOCK_HTC_TX(target);
-+
-+}
-diff --git a/drivers/sdio/function/wlan/ar6000/htc/htc_services.c b/drivers/sdio/function/wlan/ar6000/htc/htc_services.c
-new file mode 100644
-index 0000000..e5d50d1
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/htc/htc_services.c
-@@ -0,0 +1,403 @@
-+/*
-+ *
-+ * Copyright (c) 2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "htc_internal.h"
-+
-+void HTCControlTxComplete(void *Context, HTC_PACKET *pPacket)
-+{
-+        /* not implemented
-+         * we do not send control TX frames during normal runtime, only during setup  */
-+    AR_DEBUG_ASSERT(FALSE);
-+}
-+
-+    /* callback when a control message arrives on this endpoint */
-+void HTCControlRecv(void *Context, HTC_PACKET *pPacket)
-+{
-+    AR_DEBUG_ASSERT(pPacket->Endpoint == ENDPOINT_0);
-+
-+        /* the only control messages we are expecting are NULL messages (credit resports), which should
-+         * never get here */
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                    ("HTCControlRecv, got message with length:%d \n",
-+                    pPacket->ActualLength + HTC_HDR_LENGTH));
-+
-+        /* dump header and message */
-+    DebugDumpBytes(pPacket->pBuffer - HTC_HDR_LENGTH,
-+                   pPacket->ActualLength + HTC_HDR_LENGTH,
-+                   "Unexpected ENDPOINT 0 Message");
-+
-+    HTC_RECYCLE_RX_PKT((HTC_TARGET*)Context,pPacket);
-+}
-+
-+A_STATUS HTCSendSetupComplete(HTC_TARGET *target)
-+{
-+    HTC_PACKET             *pSendPacket = NULL;
-+    A_STATUS                status;
-+    HTC_SETUP_COMPLETE_MSG *pSetupComplete;
-+
-+    do {
-+           /* allocate a packet to send to the target */
-+        pSendPacket = HTC_ALLOC_CONTROL_TX(target);
-+
-+        if (NULL == pSendPacket) {
-+            status = A_NO_MEMORY;
-+            break;
-+        }
-+
-+            /* assemble setup complete message */
-+        pSetupComplete = (HTC_SETUP_COMPLETE_MSG *)pSendPacket->pBuffer;
-+        A_MEMZERO(pSetupComplete,sizeof(HTC_SETUP_COMPLETE_MSG));
-+        pSetupComplete->MessageID = HTC_MSG_SETUP_COMPLETE_ID;
-+
-+        SET_HTC_PACKET_INFO_TX(pSendPacket,
-+                               NULL,
-+                               (A_UINT8 *)pSetupComplete,
-+                               sizeof(HTC_SETUP_COMPLETE_MSG),
-+                               ENDPOINT_0,
-+                               HTC_SERVICE_TX_PACKET_TAG);
-+
-+            /* we want synchronous operation */
-+        pSendPacket->Completion = NULL;
-+            /* send the message */
-+        status = HTCIssueSend(target,pSendPacket,0);
-+
-+    } while (FALSE);
-+
-+    if (pSendPacket != NULL) {
-+        HTC_FREE_CONTROL_TX(target,pSendPacket);
-+    }
-+
-+    return status;
-+}
-+
-+
-+A_STATUS HTCConnectService(HTC_HANDLE               HTCHandle,
-+                           HTC_SERVICE_CONNECT_REQ  *pConnectReq,
-+                           HTC_SERVICE_CONNECT_RESP *pConnectResp)
-+{
-+    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+    A_STATUS                            status = A_OK;
-+    HTC_PACKET                          *pRecvPacket = NULL;
-+    HTC_PACKET                          *pSendPacket = NULL;
-+    HTC_CONNECT_SERVICE_RESPONSE_MSG    *pResponseMsg;
-+    HTC_CONNECT_SERVICE_MSG             *pConnectMsg;
-+    HTC_ENDPOINT_ID                     assignedEndpoint = ENDPOINT_MAX;
-+    HTC_ENDPOINT                        *pEndpoint;
-+    int                                 maxMsgSize = 0;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("+HTCConnectService, target:0x%X SvcID:0x%X \n",
-+               (A_UINT32)target, pConnectReq->ServiceID));
-+
-+    do {
-+
-+        AR_DEBUG_ASSERT(pConnectReq->ServiceID != 0);
-+
-+        if (HTC_CTRL_RSVD_SVC == pConnectReq->ServiceID) {
-+                /* special case for pseudo control service */
-+            assignedEndpoint = ENDPOINT_0;
-+            maxMsgSize = HTC_MAX_CONTROL_MESSAGE_LENGTH;
-+        } else {
-+                /* allocate a packet to send to the target */
-+            pSendPacket = HTC_ALLOC_CONTROL_TX(target);
-+
-+            if (NULL == pSendPacket) {
-+                AR_DEBUG_ASSERT(FALSE);
-+                status = A_NO_MEMORY;
-+                break;
-+            }
-+                /* assemble connect service message */
-+            pConnectMsg = (HTC_CONNECT_SERVICE_MSG *)pSendPacket->pBuffer;
-+            AR_DEBUG_ASSERT(pConnectMsg != NULL);
-+            A_MEMZERO(pConnectMsg,sizeof(HTC_CONNECT_SERVICE_MSG));
-+            pConnectMsg->MessageID = HTC_MSG_CONNECT_SERVICE_ID;
-+            pConnectMsg->ServiceID = pConnectReq->ServiceID;
-+            pConnectMsg->ConnectionFlags = pConnectReq->ConnectionFlags;
-+                /* check caller if it wants to transfer meta data */
-+            if ((pConnectReq->pMetaData != NULL) &&
-+                (pConnectReq->MetaDataLength <= HTC_SERVICE_META_DATA_MAX_LENGTH)) {
-+                    /* copy meta data into message buffer (after header ) */
-+                A_MEMCPY((A_UINT8 *)pConnectMsg + sizeof(HTC_CONNECT_SERVICE_MSG),
-+                         pConnectReq->pMetaData,
-+                         pConnectReq->MetaDataLength);
-+                pConnectMsg->ServiceMetaLength = pConnectReq->MetaDataLength;
-+            }
-+
-+            SET_HTC_PACKET_INFO_TX(pSendPacket,
-+                                   NULL,
-+                                   (A_UINT8 *)pConnectMsg,
-+                                   sizeof(HTC_CONNECT_SERVICE_MSG) + pConnectMsg->ServiceMetaLength,
-+                                   ENDPOINT_0,
-+                                   HTC_SERVICE_TX_PACKET_TAG);
-+
-+                /* we want synchronous operation */
-+            pSendPacket->Completion = NULL;
-+
-+            status = HTCIssueSend(target,pSendPacket,0);
-+
-+            if (A_FAILED(status)) {
-+                break;
-+            }
-+
-+                /* wait for response */
-+            status = HTCWaitforControlMessage(target, &pRecvPacket);
-+
-+            if (A_FAILED(status)) {
-+                break;
-+            }
-+                /* we controlled the buffer creation so it has to be properly aligned */
-+            pResponseMsg = (HTC_CONNECT_SERVICE_RESPONSE_MSG *)pRecvPacket->pBuffer;
-+
-+            if ((pResponseMsg->MessageID != HTC_MSG_CONNECT_SERVICE_RESPONSE_ID) ||
-+                (pRecvPacket->ActualLength < sizeof(HTC_CONNECT_SERVICE_RESPONSE_MSG))) {
-+                    /* this message is not valid */
-+                AR_DEBUG_ASSERT(FALSE);
-+                status = A_EPROTO;
-+                break;
-+            }
-+
-+            pConnectResp->ConnectRespCode = pResponseMsg->Status;
-+                /* check response status */
-+            if (pResponseMsg->Status != HTC_SERVICE_SUCCESS) {
-+                AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                    (" Target failed service 0x%X connect request (status:%d)\n",
-+                                pResponseMsg->ServiceID, pResponseMsg->Status));
-+                status = A_EPROTO;
-+                break;
-+            }
-+
-+            assignedEndpoint = pResponseMsg->EndpointID;
-+            maxMsgSize = pResponseMsg->MaxMsgSize;
-+
-+            if ((pConnectResp->pMetaData != NULL) &&
-+                (pResponseMsg->ServiceMetaLength > 0) &&
-+                (pResponseMsg->ServiceMetaLength <= HTC_SERVICE_META_DATA_MAX_LENGTH)) {
-+                    /* caller supplied a buffer and the target responded with data */
-+                int copyLength = min((int)pConnectResp->BufferLength, (int)pResponseMsg->ServiceMetaLength);
-+                    /* copy the meta data */
-+                A_MEMCPY(pConnectResp->pMetaData,
-+                         ((A_UINT8 *)pResponseMsg) + sizeof(HTC_CONNECT_SERVICE_RESPONSE_MSG),
-+                         copyLength);
-+                pConnectResp->ActualLength = copyLength;
-+            }
-+
-+        }
-+
-+            /* the rest of these are parameter checks so set the error status */
-+        status = A_EPROTO;
-+
-+        if (assignedEndpoint >= ENDPOINT_MAX) {
-+            AR_DEBUG_ASSERT(FALSE);
-+            break;
-+        }
-+
-+        if (0 == maxMsgSize) {
-+            AR_DEBUG_ASSERT(FALSE);
-+            break;
-+        }
-+
-+        pEndpoint = &target->EndPoint[assignedEndpoint];
-+
-+        if (pEndpoint->ServiceID != 0) {
-+            /* endpoint already in use! */
-+            AR_DEBUG_ASSERT(FALSE);
-+            break;
-+        }
-+
-+            /* return assigned endpoint to caller */
-+        pConnectResp->Endpoint = assignedEndpoint;
-+        pConnectResp->MaxMsgLength = maxMsgSize;
-+
-+            /* setup the endpoint */
-+        pEndpoint->ServiceID = pConnectReq->ServiceID; /* this marks the endpoint in use */
-+        pEndpoint->MaxTxQueueDepth = pConnectReq->MaxSendQueueDepth;
-+        pEndpoint->MaxMsgLength = maxMsgSize;
-+            /* copy all the callbacks */
-+        pEndpoint->EpCallBacks = pConnectReq->EpCallbacks;
-+        INIT_HTC_PACKET_QUEUE(&pEndpoint->RxBuffers);
-+        INIT_HTC_PACKET_QUEUE(&pEndpoint->TxQueue);
-+            /* set the credit distribution info for this endpoint, this information is
-+             * passed back to the credit distribution callback function */
-+        pEndpoint->CreditDist.ServiceID = pConnectReq->ServiceID;
-+        pEndpoint->CreditDist.pHTCReserved = pEndpoint;
-+        pEndpoint->CreditDist.Endpoint = assignedEndpoint;
-+        pEndpoint->CreditDist.TxCreditSize = target->TargetCreditSize;
-+        pEndpoint->CreditDist.TxCreditsPerMaxMsg = maxMsgSize / target->TargetCreditSize;
-+
-+        if (0 == pEndpoint->CreditDist.TxCreditsPerMaxMsg) {
-+            pEndpoint->CreditDist.TxCreditsPerMaxMsg = 1;
-+        }
-+
-+        status = A_OK;
-+
-+    } while (FALSE);
-+
-+    if (pSendPacket != NULL) {
-+        HTC_FREE_CONTROL_TX(target,pSendPacket);
-+    }
-+
-+    if (pRecvPacket != NULL) {
-+        HTC_FREE_CONTROL_RX(target,pRecvPacket);
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("-HTCConnectService \n"));
-+
-+    return status;
-+}
-+
-+static void AddToEndpointDistList(HTC_TARGET *target, HTC_ENDPOINT_CREDIT_DIST *pEpDist)
-+{
-+    HTC_ENDPOINT_CREDIT_DIST *pCurEntry,*pLastEntry;
-+
-+    if (NULL == target->EpCreditDistributionListHead) {
-+        target->EpCreditDistributionListHead = pEpDist;
-+        pEpDist->pNext = NULL;
-+        pEpDist->pPrev = NULL;
-+        return;
-+    }
-+
-+        /* queue to the end of the list, this does not have to be very
-+         * fast since this list is built at startup time */
-+    pCurEntry = target->EpCreditDistributionListHead;
-+
-+    while (pCurEntry) {
-+        pLastEntry = pCurEntry;
-+        pCurEntry = pCurEntry->pNext;
-+    }
-+
-+    pLastEntry->pNext = pEpDist;
-+    pEpDist->pPrev = pLastEntry;
-+    pEpDist->pNext = NULL;
-+}
-+
-+
-+
-+/* default credit init callback */
-+static void HTCDefaultCreditInit(void                     *Context,
-+                                 HTC_ENDPOINT_CREDIT_DIST *pEPList,
-+                                 int                      TotalCredits)
-+{
-+    HTC_ENDPOINT_CREDIT_DIST *pCurEpDist;
-+    int                      totalEps = 0;
-+    int                      creditsPerEndpoint;
-+
-+    pCurEpDist = pEPList;
-+        /* first run through the list and figure out how many endpoints we are dealing with */
-+    while (pCurEpDist != NULL) {
-+        pCurEpDist = pCurEpDist->pNext;
-+        totalEps++;
-+    }
-+
-+        /* even distribution */
-+    creditsPerEndpoint = TotalCredits/totalEps;
-+
-+    pCurEpDist = pEPList;
-+        /* run through the list and set minimum and normal credits and
-+         * provide the endpoint with some credits to start */
-+    while (pCurEpDist != NULL) {
-+
-+        if (creditsPerEndpoint < pCurEpDist->TxCreditsPerMaxMsg) {
-+                /* too many endpoints and not enough credits */
-+            AR_DEBUG_ASSERT(FALSE);
-+            break;
-+        }
-+            /* our minimum is set for at least 1 max message */
-+        pCurEpDist->TxCreditsMin = pCurEpDist->TxCreditsPerMaxMsg;
-+            /* this value is ignored by our credit alg, since we do
-+             * not dynamically adjust credits, this is the policy of
-+             * the "default" credit distribution, something simple and easy */
-+        pCurEpDist->TxCreditsNorm = 0xFFFF;
-+            /* give the endpoint minimum credits */
-+        pCurEpDist->TxCredits = creditsPerEndpoint;
-+        pCurEpDist->TxCreditsAssigned = creditsPerEndpoint;
-+        pCurEpDist = pCurEpDist->pNext;
-+    }
-+
-+}
-+
-+/* default credit distribution callback, NOTE, this callback holds the TX lock */
-+void HTCDefaultCreditDist(void                     *Context,
-+                          HTC_ENDPOINT_CREDIT_DIST *pEPDistList,
-+                          HTC_CREDIT_DIST_REASON   Reason)
-+{
-+    HTC_ENDPOINT_CREDIT_DIST *pCurEpDist;
-+
-+    if (Reason == HTC_CREDIT_DIST_SEND_COMPLETE) {
-+        pCurEpDist = pEPDistList;
-+            /* simple distribution */
-+        while (pCurEpDist != NULL) {
-+            if (pCurEpDist->TxCreditsToDist > 0) {
-+                    /* just give the endpoint back the credits */
-+                pCurEpDist->TxCredits += pCurEpDist->TxCreditsToDist;
-+                pCurEpDist->TxCreditsToDist = 0;
-+            }
-+            pCurEpDist = pCurEpDist->pNext;
-+        }
-+    }
-+
-+    /* note we do not need to handle the other reason codes as this is a very
-+     * simple distribution scheme, no need to seek for more credits or handle inactivity */
-+}
-+
-+void HTCSetCreditDistribution(HTC_HANDLE               HTCHandle,
-+                              void                     *pCreditDistContext,
-+                              HTC_CREDIT_DIST_CALLBACK CreditDistFunc,
-+                              HTC_CREDIT_INIT_CALLBACK CreditInitFunc,
-+                              HTC_SERVICE_ID           ServicePriorityOrder[],
-+                              int                      ListLength)
-+{
-+    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+    int i;
-+    int ep;
-+
-+    if (CreditInitFunc != NULL) {
-+            /* caller has supplied their own distribution functions */
-+        target->InitCredits = CreditInitFunc;
-+        AR_DEBUG_ASSERT(CreditDistFunc != NULL);
-+        target->DistributeCredits = CreditDistFunc;
-+        target->pCredDistContext = pCreditDistContext;
-+    } else {
-+        /* caller wants HTC to do distribution */
-+        /* if caller wants service to handle distributions then
-+         * it must set both of these to NULL! */
-+        AR_DEBUG_ASSERT(CreditDistFunc == NULL);
-+        target->InitCredits = HTCDefaultCreditInit;
-+        target->DistributeCredits = HTCDefaultCreditDist;
-+        target->pCredDistContext = target;
-+    }
-+
-+        /* always add HTC control endpoint first, we only expose the list after the
-+         * first one, this is added for TX queue checking */
-+    AddToEndpointDistList(target, &target->EndPoint[ENDPOINT_0].CreditDist);
-+
-+        /* build the list of credit distribution structures in priority order
-+         * supplied by the caller, these will follow endpoint 0 */
-+    for (i = 0; i < ListLength; i++) {
-+            /* match services with endpoints and add the endpoints to the distribution list
-+             * in FIFO order */
-+        for (ep = ENDPOINT_1; ep < ENDPOINT_MAX; ep++) {
-+            if (target->EndPoint[ep].ServiceID == ServicePriorityOrder[i]) {
-+                    /* queue this one to the list */
-+                AddToEndpointDistList(target, &target->EndPoint[ep].CreditDist);
-+                break;
-+            }
-+        }
-+        AR_DEBUG_ASSERT(ep < ENDPOINT_MAX);
-+    }
-+
-+}
-diff --git a/drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h b/drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h
-new file mode 100644
-index 0000000..c1bcade
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h
-@@ -0,0 +1,100 @@
-+/*
-+ * Copyright (c) 2006 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ */
-+
-+#ifndef __AR6000_REGDUMP_H__
-+#define __AR6000_REGDUMP_H__
-+
-+#if !defined(__ASSEMBLER__)
-+/*
-+ * Target CPU state at the time of failure is reflected
-+ * in a register dump, which the Host can fetch through
-+ * the diagnostic window.
-+ */
-+
-+struct MIPS_exception_frame_s {
-+    A_UINT32 pc;        /* Program Counter */
-+    A_UINT32 at;        /* MIPS General Purpose registers */
-+    A_UINT32 v0;
-+    A_UINT32 v1;
-+    A_UINT32 a0;
-+    A_UINT32 a1;
-+    A_UINT32 a2;
-+    A_UINT32 a3;
-+    A_UINT32 t0;
-+    A_UINT32 t1;
-+    A_UINT32 t2;
-+    A_UINT32 t3;
-+    A_UINT32 t4;
-+    A_UINT32 t5;
-+    A_UINT32 t6;
-+    A_UINT32 t7;
-+    A_UINT32 s0;
-+    A_UINT32 s1;
-+    A_UINT32 s2;
-+    A_UINT32 s3;
-+    A_UINT32 s4;
-+    A_UINT32 s5;
-+    A_UINT32 s6;
-+    A_UINT32 s7;
-+    A_UINT32 t8;
-+    A_UINT32 t9;
-+    A_UINT32 k0;
-+    A_UINT32 k1;
-+    A_UINT32 gp;
-+    A_UINT32 sp;
-+    A_UINT32 s8;
-+    A_UINT32 ra;
-+    A_UINT32 cause; /* Selected coprocessor regs */
-+    A_UINT32 status;
-+};
-+typedef struct MIPS_exception_frame_s CPU_exception_frame_t;
-+
-+#endif
-+
-+/*
-+ * Offsets into MIPS_exception_frame structure, for use in assembler code
-+ * MUST MATCH C STRUCTURE ABOVE
-+ */
-+#define RD_pc           0
-+#define RD_at           1
-+#define RD_v0           2
-+#define RD_v1           3
-+#define RD_a0           4
-+#define RD_a1           5
-+#define RD_a2           6
-+#define RD_a3           7
-+#define RD_t0           8
-+#define RD_t1           9
-+#define RD_t2           10
-+#define RD_t3           11
-+#define RD_t4           12
-+#define RD_t5           13
-+#define RD_t6           14
-+#define RD_t7           15
-+#define RD_s0           16
-+#define RD_s1           17
-+#define RD_s2           18
-+#define RD_s3           19
-+#define RD_s4           20
-+#define RD_s5           21
-+#define RD_s6           22
-+#define RD_s7           23
-+#define RD_t8           24
-+#define RD_t9           25
-+#define RD_k0           26
-+#define RD_k1           27
-+#define RD_gp           28
-+#define RD_sp           29
-+#define RD_s8           30
-+#define RD_ra           31
-+#define RD_cause        32
-+#define RD_status       33
-+
-+#define RD_SIZE         (34*4) /* Space for this number of words */
-+
-+#endif /* __AR6000_REGDUMP_H__ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h b/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h
-new file mode 100644
-index 0000000..d5b2a20
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h
-@@ -0,0 +1,36 @@
-+#define __VER_MAJOR_ 2
-+#define __VER_MINOR_ 0
-+#define __VER_PATCH_ 0
-+
-+
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ * The makear6ksdk script (used for release builds) modifies the following line.
-+ */
-+#define __BUILD_NUMBER_ 18
-+
-+
-+/* Format of the version number. */
-+#define VER_MAJOR_BIT_OFFSET          28
-+#define VER_MINOR_BIT_OFFSET          24
-+#define VER_PATCH_BIT_OFFSET          16
-+#define VER_BUILD_NUM_BIT_OFFSET      0
-+
-+
-+/*
-+ * The version has the following format:
-+ * Bits 28-31: Major version
-+ * Bits 24-27: Minor version
-+ * Bits 16-23: Patch version
-+ * Bits 0-15:  Build number (automatically generated during build process )
-+ * E.g. Build 1.1.3.7 would be represented as 0x11030007.
-+ *
-+ * DO NOT split the following macro into multiple lines as this may confuse the build scripts.
-+ */
-+#define AR6K_SW_VERSION       ( ( __VER_MAJOR_ << VER_MAJOR_BIT_OFFSET ) + ( __VER_MINOR_ << VER_MINOR_BIT_OFFSET ) + ( __VER_PATCH_ << VER_PATCH_BIT_OFFSET ) + ( __BUILD_NUMBER_ << VER_BUILD_NUM_BIT_OFFSET ) )
-+
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW b/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW
-new file mode 100644
-index 0000000..d5b2a20
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW
-@@ -0,0 +1,36 @@
-+#define __VER_MAJOR_ 2
-+#define __VER_MINOR_ 0
-+#define __VER_PATCH_ 0
-+
-+
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ * The makear6ksdk script (used for release builds) modifies the following line.
-+ */
-+#define __BUILD_NUMBER_ 18
-+
-+
-+/* Format of the version number. */
-+#define VER_MAJOR_BIT_OFFSET          28
-+#define VER_MINOR_BIT_OFFSET          24
-+#define VER_PATCH_BIT_OFFSET          16
-+#define VER_BUILD_NUM_BIT_OFFSET      0
-+
-+
-+/*
-+ * The version has the following format:
-+ * Bits 28-31: Major version
-+ * Bits 24-27: Minor version
-+ * Bits 16-23: Patch version
-+ * Bits 0-15:  Build number (automatically generated during build process )
-+ * E.g. Build 1.1.3.7 would be represented as 0x11030007.
-+ *
-+ * DO NOT split the following macro into multiple lines as this may confuse the build scripts.
-+ */
-+#define AR6K_SW_VERSION       ( ( __VER_MAJOR_ << VER_MAJOR_BIT_OFFSET ) + ( __VER_MINOR_ << VER_MINOR_BIT_OFFSET ) + ( __VER_PATCH_ << VER_PATCH_BIT_OFFSET ) + ( __BUILD_NUMBER_ << VER_BUILD_NUM_BIT_OFFSET ) )
-+
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h b/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h
-new file mode 100644
-index 0000000..ecfdf20
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h
-@@ -0,0 +1,147 @@
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ * This file contains the definitions for AR6001 registers
-+ * that may be directly manipulated by Host software.
-+ */
-+
-+#ifndef __AR6KHWREG_H__
-+#define __AR6KHWREG_H__
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/* Host registers */
-+#define HOST_INT_STATUS_ADDRESS                  0x00000400
-+#define CPU_INT_STATUS_ADDRESS                   0x00000401
-+#define ERROR_INT_STATUS_ADDRESS                 0x00000402
-+#define INT_STATUS_ENABLE_ADDRESS                0x00000418
-+#define CPU_INT_STATUS_ENABLE_ADDRESS            0x00000419
-+#define COUNT_ADDRESS                            0x00000420
-+#define COUNT_DEC_ADDRESS                        0x00000440
-+#define WINDOW_DATA_ADDRESS                      0x00000474
-+#define WINDOW_WRITE_ADDR_ADDRESS                0x00000478
-+#define WINDOW_READ_ADDR_ADDRESS                 0x0000047c
-+
-+/* Target addresses */
-+#define RESET_CONTROL_ADDRESS                    0x0c000000
-+#define MC_REMAP_VALID_ADDRESS                   0x0c004080
-+#define MC_REMAP_SIZE_ADDRESS                    0x0c004100
-+#define MC_REMAP_COMPARE_ADDRESS                 0x0c004180
-+#define MC_REMAP_TARGET_ADDRESS                  0x0c004200
-+#define LOCAL_COUNT_ADDRESS                      0x0c014080
-+#define LOCAL_SCRATCH_ADDRESS                    0x0c0140c0
-+
-+
-+#define INT_STATUS_ENABLE_ERROR_MSB              7
-+#define INT_STATUS_ENABLE_ERROR_LSB              7
-+#define INT_STATUS_ENABLE_ERROR_MASK             0x00000080
-+#define INT_STATUS_ENABLE_ERROR_GET(x)           (((x) & INT_STATUS_ENABLE_ERROR_MASK) >> INT_STATUS_ENABLE_ERROR_LSB)
-+#define INT_STATUS_ENABLE_ERROR_SET(x)           (((x) << INT_STATUS_ENABLE_ERROR_LSB) & INT_STATUS_ENABLE_ERROR_MASK)
-+
-+#define INT_STATUS_ENABLE_CPU_MSB                6
-+#define INT_STATUS_ENABLE_CPU_LSB                6
-+#define INT_STATUS_ENABLE_CPU_MASK               0x00000040
-+#define INT_STATUS_ENABLE_CPU_GET(x)             (((x) & INT_STATUS_ENABLE_CPU_MASK) >> INT_STATUS_ENABLE_CPU_LSB)
-+#define INT_STATUS_ENABLE_CPU_SET(x)             (((x) << INT_STATUS_ENABLE_CPU_LSB) & INT_STATUS_ENABLE_CPU_MASK)
-+
-+#define INT_STATUS_ENABLE_COUNTER_MSB            4
-+#define INT_STATUS_ENABLE_COUNTER_LSB            4
-+#define INT_STATUS_ENABLE_COUNTER_MASK           0x00000010
-+#define INT_STATUS_ENABLE_COUNTER_GET(x)         (((x) & INT_STATUS_ENABLE_COUNTER_MASK) >> INT_STATUS_ENABLE_COUNTER_LSB)
-+#define INT_STATUS_ENABLE_COUNTER_SET(x)         (((x) << INT_STATUS_ENABLE_COUNTER_LSB) & INT_STATUS_ENABLE_COUNTER_MASK)
-+
-+#define INT_STATUS_ENABLE_MBOX_DATA_MSB          3
-+#define INT_STATUS_ENABLE_MBOX_DATA_LSB          0
-+#define INT_STATUS_ENABLE_MBOX_DATA_MASK         0x0000000f
-+#define INT_STATUS_ENABLE_MBOX_DATA_GET(x)       (((x) & INT_STATUS_ENABLE_MBOX_DATA_MASK) >> INT_STATUS_ENABLE_MBOX_DATA_LSB)
-+#define INT_STATUS_ENABLE_MBOX_DATA_SET(x)       (((x) << INT_STATUS_ENABLE_MBOX_DATA_LSB) & INT_STATUS_ENABLE_MBOX_DATA_MASK)
-+
-+#define ERROR_STATUS_ENABLE_RX_UNDERFLOW_MSB     1
-+#define ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB     1
-+#define ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK    0x00000002
-+#define ERROR_STATUS_ENABLE_RX_UNDERFLOW_GET(x)  (((x) & ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK) >> ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB)
-+#define ERROR_STATUS_ENABLE_RX_UNDERFLOW_SET(x)  (((x) << ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB) & ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK)
-+
-+#define ERROR_STATUS_ENABLE_TX_OVERFLOW_MSB      0
-+#define ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB      0
-+#define ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK     0x00000001
-+#define ERROR_STATUS_ENABLE_TX_OVERFLOW_GET(x)   (((x) & ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK) >> ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB)
-+#define ERROR_STATUS_ENABLE_TX_OVERFLOW_SET(x)   (((x) << ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB) & ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK)
-+
-+
-+#define CPU_INT_STATUS_ENABLE_BIT_MSB            7
-+#define CPU_INT_STATUS_ENABLE_BIT_LSB            0
-+#define CPU_INT_STATUS_ENABLE_BIT_MASK           0x000000ff
-+#define CPU_INT_STATUS_ENABLE_BIT_GET(x)         (((x) & CPU_INT_STATUS_ENABLE_BIT_MASK) >> CPU_INT_STATUS_ENABLE_BIT_LSB)
-+#define CPU_INT_STATUS_ENABLE_BIT_SET(x)         (((x) << CPU_INT_STATUS_ENABLE_BIT_LSB) & CPU_INT_STATUS_ENABLE_BIT_MASK)
-+
-+#define COUNTER_INT_STATUS_ENABLE_BIT_MSB        7
-+#define COUNTER_INT_STATUS_ENABLE_BIT_LSB        0
-+#define COUNTER_INT_STATUS_ENABLE_BIT_MASK       0x000000ff
-+#define COUNTER_INT_STATUS_ENABLE_BIT_GET(x)     (((x) & COUNTER_INT_STATUS_ENABLE_BIT_MASK) >> COUNTER_INT_STATUS_ENABLE_BIT_LSB)
-+#define COUNTER_INT_STATUS_ENABLE_BIT_SET(x)     (((x) << COUNTER_INT_STATUS_ENABLE_BIT_LSB) & COUNTER_INT_STATUS_ENABLE_BIT_MASK)
-+
-+#define ERROR_INT_STATUS_WAKEUP_MSB              2
-+#define ERROR_INT_STATUS_WAKEUP_LSB              2
-+#define ERROR_INT_STATUS_WAKEUP_MASK             0x00000004
-+#define ERROR_INT_STATUS_WAKEUP_GET(x)           (((x) & ERROR_INT_STATUS_WAKEUP_MASK) >> ERROR_INT_STATUS_WAKEUP_LSB)
-+#define ERROR_INT_STATUS_WAKEUP_SET(x)           (((x) << ERROR_INT_STATUS_WAKEUP_LSB) & ERROR_INT_STATUS_WAKEUP_MASK)
-+
-+#define ERROR_INT_STATUS_RX_UNDERFLOW_MSB        1
-+#define ERROR_INT_STATUS_RX_UNDERFLOW_LSB        1
-+#define ERROR_INT_STATUS_RX_UNDERFLOW_MASK       0x00000002
-+#define ERROR_INT_STATUS_RX_UNDERFLOW_GET(x)     (((x) & ERROR_INT_STATUS_RX_UNDERFLOW_MASK) >> ERROR_INT_STATUS_RX_UNDERFLOW_LSB)
-+#define ERROR_INT_STATUS_RX_UNDERFLOW_SET(x)     (((x) << ERROR_INT_STATUS_RX_UNDERFLOW_LSB) & ERROR_INT_STATUS_RX_UNDERFLOW_MASK)
-+
-+#define ERROR_INT_STATUS_TX_OVERFLOW_MSB         0
-+#define ERROR_INT_STATUS_TX_OVERFLOW_LSB         0
-+#define ERROR_INT_STATUS_TX_OVERFLOW_MASK        0x00000001
-+#define ERROR_INT_STATUS_TX_OVERFLOW_GET(x)      (((x) & ERROR_INT_STATUS_TX_OVERFLOW_MASK) >> ERROR_INT_STATUS_TX_OVERFLOW_LSB)
-+#define ERROR_INT_STATUS_TX_OVERFLOW_SET(x)      (((x) << ERROR_INT_STATUS_TX_OVERFLOW_LSB) & ERROR_INT_STATUS_TX_OVERFLOW_MASK)
-+
-+#define HOST_INT_STATUS_ERROR_MSB                7
-+#define HOST_INT_STATUS_ERROR_LSB                7
-+#define HOST_INT_STATUS_ERROR_MASK               0x00000080
-+#define HOST_INT_STATUS_ERROR_GET(x)             (((x) & HOST_INT_STATUS_ERROR_MASK) >> HOST_INT_STATUS_ERROR_LSB)
-+#define HOST_INT_STATUS_ERROR_SET(x)             (((x) << HOST_INT_STATUS_ERROR_LSB) & HOST_INT_STATUS_ERROR_MASK)
-+
-+#define HOST_INT_STATUS_CPU_MSB                  6
-+#define HOST_INT_STATUS_CPU_LSB                  6
-+#define HOST_INT_STATUS_CPU_MASK                 0x00000040
-+#define HOST_INT_STATUS_CPU_GET(x)               (((x) & HOST_INT_STATUS_CPU_MASK) >> HOST_INT_STATUS_CPU_LSB)
-+#define HOST_INT_STATUS_CPU_SET(x)               (((x) << HOST_INT_STATUS_CPU_LSB) & HOST_INT_STATUS_CPU_MASK)
-+
-+#define HOST_INT_STATUS_COUNTER_MSB              4
-+#define HOST_INT_STATUS_COUNTER_LSB              4
-+#define HOST_INT_STATUS_COUNTER_MASK             0x00000010
-+#define HOST_INT_STATUS_COUNTER_GET(x)           (((x) & HOST_INT_STATUS_COUNTER_MASK) >> HOST_INT_STATUS_COUNTER_LSB)
-+#define HOST_INT_STATUS_COUNTER_SET(x)           (((x) << HOST_INT_STATUS_COUNTER_LSB) & HOST_INT_STATUS_COUNTER_MASK)
-+
-+#define RESET_CONTROL_WARM_RST_MSB               7
-+#define RESET_CONTROL_WARM_RST_LSB               7
-+#define RESET_CONTROL_WARM_RST_MASK              0x00000080
-+#define RESET_CONTROL_WARM_RST_GET(x)            (((x) & RESET_CONTROL_WARM_RST_MASK) >> RESET_CONTROL_WARM_RST_LSB)
-+#define RESET_CONTROL_WARM_RST_SET(x)            (((x) << RESET_CONTROL_WARM_RST_LSB) & RESET_CONTROL_WARM_RST_MASK)
-+
-+#define RESET_CONTROL_COLD_RST_MSB               8
-+#define RESET_CONTROL_COLD_RST_LSB               8
-+#define RESET_CONTROL_COLD_RST_MASK              0x00000100
-+#define RESET_CONTROL_COLD_RST_GET(x)            (((x) & RESET_CONTROL_COLD_RST_MASK) >> RESET_CONTROL_COLD_RST_LSB)
-+#define RESET_CONTROL_COLD_RST_SET(x)            (((x) << RESET_CONTROL_COLD_RST_LSB) & RESET_CONTROL_COLD_RST_MASK)
-+
-+#define RESET_CAUSE_LAST_MSB                     2
-+#define RESET_CAUSE_LAST_LSB                     0
-+#define RESET_CAUSE_LAST_MASK                    0x00000007
-+#define RESET_CAUSE_LAST_GET(x)                  (((x) & RESET_CAUSE_LAST_MASK) >> RESET_CAUSE_LAST_LSB)
-+#define RESET_CAUSE_LAST_SET(x)                  (((x) << RESET_CAUSE_LAST_LSB) & RESET_CAUSE_LAST_MASK)
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* __AR6KHWREG_H__ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/a_config.h b/drivers/sdio/function/wlan/ar6000/include/a_config.h
-new file mode 100644
-index 0000000..627b298
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/a_config.h
-@@ -0,0 +1,27 @@
-+#ifndef _A_CONFIG_H_
-+#define _A_CONFIG_H_
-+/*
-+ * Copyright (c) 2004-2005 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+/*
-+ * This file contains software configuration options that enables
-+ * specific software "features"
-+ */
-+#include "../ar6000/config_linux.h"
-+
-+#endif
-diff --git a/drivers/sdio/function/wlan/ar6000/include/a_debug.h b/drivers/sdio/function/wlan/ar6000/include/a_debug.h
-new file mode 100644
-index 0000000..4b0b351
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/a_debug.h
-@@ -0,0 +1,41 @@
-+#ifndef _A_DEBUG_H_
-+#define _A_DEBUG_H_
-+/*
-+ * Copyright (c) 2004-2006 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include <a_types.h>
-+#include <a_osapi.h>
-+
-+#define DBG_INFO              0x00000001
-+#define DBG_ERROR             0x00000002
-+#define DBG_WARNING           0x00000004
-+#define DBG_SDIO              0x00000008
-+#define DBG_HIF                       0x00000010
-+#define DBG_HTC                       0x00000020
-+#define DBG_WMI                       0x00000040
-+#define DBG_WMI2              0x00000080
-+#define DBG_DRIVER            0x00000100
-+
-+#define DBG_DEFAULTS  (DBG_ERROR|DBG_WARNING)
-+
-+#include "../ar6000/debug_linux.h"
-+
-+#endif
-diff --git a/drivers/sdio/function/wlan/ar6000/include/a_drv.h b/drivers/sdio/function/wlan/ar6000/include/a_drv.h
-new file mode 100644
-index 0000000..07e52d1
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/a_drv.h
-@@ -0,0 +1,28 @@
-+#ifndef _A_DRV_H_
-+#define _A_DRV_H_
-+/*
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/include/a_drv.h#1 $
-+ *
-+ * This file contains the definitions of the basic atheros data types.
-+ * It is used to map the data types in atheros files to a platform specific
-+ * type.
-+ *
-+ * Copyright 2003-2005 Atheros Communications, 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "../ar6000/athdrv_linux.h"
-+
-+#endif /* _ADRV_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/a_drv_api.h b/drivers/sdio/function/wlan/ar6000/include/a_drv_api.h
-new file mode 100644
-index 0000000..7531726
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/a_drv_api.h
-@@ -0,0 +1,185 @@
-+#ifndef _A_DRV_API_H_
-+#define _A_DRV_API_H_
-+/*
-+ * Copyright (c) 2004-2006 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/****************************************************************************/
-+/****************************************************************************/
-+/**                                                                        **/
-+/** WMI related hooks                                                      **/
-+/**                                                                        **/
-+/****************************************************************************/
-+/****************************************************************************/
-+
-+#include <ar6000_api.h>
-+
-+#define A_WMI_CHANNELLIST_RX(devt, numChan, chanList) \
-+      ar6000_channelList_rx((devt), (numChan), (chanList))
-+
-+#define A_WMI_SET_NUMDATAENDPTS(devt, num)    \
-+      ar6000_set_numdataendpts((devt), (num))
-+
-+#define A_WMI_CONTROL_TX(devt, osbuf, streamID)       \
-+      ar6000_control_tx((devt), (osbuf), (streamID))
-+
-+#define A_WMI_TARGETSTATS_EVENT(devt, pStats) \
-+      ar6000_targetStats_event((devt), (pStats))
-+
-+#define A_WMI_SCANCOMPLETE_EVENT(devt, status)        \
-+      ar6000_scanComplete_event((devt), (status))
-+
-+#ifdef CONFIG_HOST_DSET_SUPPORT
-+
-+#define A_WMI_DSET_DATA_REQ(devt, access_cookie, offset, length, targ_buf, targ_reply_fn, targ_reply_arg)     \
-+      ar6000_dset_data_req((devt), (access_cookie), (offset), (length), (targ_buf), (targ_reply_fn), (targ_reply_arg))
-+
-+#define A_WMI_DSET_CLOSE(devt, access_cookie) \
-+      ar6000_dset_close((devt), (access_cookie))
-+
-+#endif
-+
-+#define A_WMI_DSET_OPEN_REQ(devt, id, targ_handle, targ_reply_fn, targ_reply_arg) \
-+      ar6000_dset_open_req((devt), (id), (targ_handle), (targ_reply_fn), (targ_reply_arg))
-+
-+#define A_WMI_CONNECT_EVENT(devt, channel, bssid, listenInterval, beaconInterval, networkType, beaconIeLen, assocReqLen, assocRespLen, assocInfo) \
-+      ar6000_connect_event((devt), (channel), (bssid), (listenInterval), (beaconInterval), (networkType), (beaconIeLen), (assocReqLen), (assocRespLen), (assocInfo))
-+
-+#define A_WMI_REGDOMAIN_EVENT(devt, regCode)  \
-+      ar6000_regDomain_event((devt), (regCode))
-+
-+#define A_WMI_NEIGHBORREPORT_EVENT(devt, numAps, info)        \
-+      ar6000_neighborReport_event((devt), (numAps), (info))
-+
-+#define A_WMI_DISCONNECT_EVENT(devt, reason, bssid, assocRespLen, assocInfo, protocolReasonStatus)    \
-+      ar6000_disconnect_event((devt), (reason), (bssid), (assocRespLen), (assocInfo), (protocolReasonStatus))
-+
-+#define A_WMI_TKIP_MICERR_EVENT(devt, keyid, ismcast) \
-+      ar6000_tkip_micerr_event((devt), (keyid), (ismcast))
-+
-+#define A_WMI_BITRATE_RX(devt, rateKbps)      \
-+      ar6000_bitrate_rx((devt), (rateKbps))
-+
-+#define A_WMI_TXPWR_RX(devt, txPwr)   \
-+      ar6000_txPwr_rx((devt), (txPwr))
-+
-+#define A_WMI_READY_EVENT(devt, datap, phyCap)        \
-+      ar6000_ready_event((devt), (datap), (phyCap))
-+
-+#define A_WMI_DBGLOG_INIT_DONE(ar) \
-+        ar6000_dbglog_init_done(ar);
-+
-+#define A_WMI_RSSI_THRESHOLD_EVENT(devt, newThreshold, rssi)  \
-+      ar6000_rssiThreshold_event((devt), (newThreshold), (rssi))
-+
-+#define A_WMI_REPORT_ERROR_EVENT(devt, errorVal)      \
-+      ar6000_reportError_event((devt), (errorVal))
-+
-+#define A_WMI_ROAM_TABLE_EVENT(devt, pTbl) \
-+      ar6000_roam_tbl_event((devt), (pTbl))
-+
-+#define A_WMI_ROAM_DATA_EVENT(devt, p) \
-+      ar6000_roam_data_event((devt), (p))
-+
-+#define A_WMI_WOW_LIST_EVENT(devt, num_filters, wow_filters)  \
-+      ar6000_wow_list_event((devt), (num_filters), (wow_filters))
-+
-+#define A_WMI_CAC_EVENT(devt, ac, cac_indication, statusCode, tspecSuggestion)  \
-+      ar6000_cac_event((devt), (ac), (cac_indication), (statusCode), (tspecSuggestion))
-+
-+#define A_WMI_IPTOS_TO_USERPRIORITY(pkt)    \
-+      ar6000_iptos_to_userPriority((pkt))
-+
-+#define A_WMI_PMKID_LIST_EVENT(devt, num_pmkid, pmkid_list)   \
-+      ar6000_pmkid_list_event((devt), (num_pmkid), (pmkid_list))
-+
-+#ifdef CONFIG_HOST_GPIO_SUPPORT
-+
-+#define A_WMI_GPIO_INTR_RX(intr_mask, input_values) \
-+      ar6000_gpio_intr_rx((intr_mask), (input_values))
-+
-+#define A_WMI_GPIO_DATA_RX(reg_id, value) \
-+      ar6000_gpio_data_rx((reg_id), (value))
-+
-+#define A_WMI_GPIO_ACK_RX() \
-+      ar6000_gpio_ack_rx()
-+
-+#endif
-+
-+#ifdef SEND_EVENT_TO_APP
-+
-+#define A_WMI_SEND_EVENT_TO_APP(ar, eventId, datap, len) \
-+      ar6000_send_event_to_app((ar), (eventId), (datap), (len))
-+
-+#else
-+
-+#define A_WMI_SEND_EVENT_TO_APP(ar, eventId, datap, len)
-+
-+#endif
-+
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+#define A_WMI_TCMD_RX_REPORT_EVENT(devt, results, len) \
-+      ar6000_tcmd_rx_report_event((devt), (results), (len))
-+#endif
-+
-+#define A_WMI_HBCHALLENGERESP_EVENT(devt, cookie, source)    \
-+    ar6000_hbChallengeResp_event((devt), (cookie), (source))
-+
-+#define A_WMI_TX_RETRY_ERR_EVENT(devt) \
-+      ar6000_tx_retry_err_event((devt))
-+
-+#define A_WMI_SNR_THRESHOLD_EVENT_RX(devt, newThreshold, snr) \
-+      ar6000_snrThresholdEvent_rx((devt), (newThreshold), (snr))
-+
-+#define A_WMI_LQ_THRESHOLD_EVENT_RX(devt, range, lqVal) \
-+      ar6000_lqThresholdEvent_rx((devt), (range), (lqVal))
-+
-+#define A_WMI_RATEMASK_RX(devt, ratemask) \
-+      ar6000_ratemask_rx((devt), (ratemask))
-+
-+#define A_WMI_KEEPALIVE_RX(devt, configured)    \
-+        ar6000_keepalive_rx((devt), (configured))
-+
-+#define A_WMI_BSSINFO_EVENT_RX(ar, datp, len)   \
-+        ar6000_bssInfo_event_rx((ar), (datap), (len))
-+
-+#define A_WMI_DBGLOG_EVENT(ar, dropped, buffer, length) \
-+        ar6000_dbglog_event((ar), (dropped), (buffer), (length));
-+
-+#define A_WMI_STREAM_TX_ACTIVE(devt,trafficClass) \
-+    ar6000_indicate_tx_activity((devt),(trafficClass), TRUE)
-+
-+#define A_WMI_STREAM_TX_INACTIVE(devt,trafficClass) \
-+    ar6000_indicate_tx_activity((devt),(trafficClass), FALSE)
-+
-+/****************************************************************************/
-+/****************************************************************************/
-+/**                                                                        **/
-+/** HTC related hooks                                                      **/
-+/**                                                                        **/
-+/****************************************************************************/
-+/****************************************************************************/
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-diff --git a/drivers/sdio/function/wlan/ar6000/include/a_osapi.h b/drivers/sdio/function/wlan/ar6000/include/a_osapi.h
-new file mode 100644
-index 0000000..7d60867
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/a_osapi.h
-@@ -0,0 +1,28 @@
-+#ifndef _A_OSAPI_H_
-+#define _A_OSAPI_H_
-+/*
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/include/a_osapi.h#1 $
-+ *
-+ * This file contains the definitions of the basic atheros data types.
-+ * It is used to map the data types in atheros files to a platform specific
-+ * type.
-+ *
-+ * Copyright 2003-2005 Atheros Communications, 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "../ar6000/osapi_linux.h"
-+
-+#endif /* _OSAPI_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/a_types.h b/drivers/sdio/function/wlan/ar6000/include/a_types.h
-new file mode 100644
-index 0000000..e2ed090
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/a_types.h
-@@ -0,0 +1,28 @@
-+#ifndef _A_TYPES_H_
-+#define _A_TYPES_H_
-+/*
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/include/a_types.h#1 $
-+ *
-+ * This file contains the definitions of the basic atheros data types.
-+ * It is used to map the data types in atheros files to a platform specific
-+ * type.
-+ *
-+ * Copyright 2003-2005 Atheros Communications, 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "../ar6000/athtypes_linux.h"
-+
-+#endif /* _ATHTYPES_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h b/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h
-new file mode 100644
-index 0000000..abe5de7
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h
-@@ -0,0 +1,29 @@
-+#ifndef _AR6000_API_H_
-+#define _AR6000_API_H_
-+/*
-+ * Copyright (c) 2004-2005 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * This file contains the API to access the OS dependent atheros host driver
-+ * by the WMI or WLAN generic modules.
-+ *
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/include/ar6000_api.h#1 $
-+ *
-+ *
-+ *  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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "../ar6000/ar6xapi_linux.h"
-+
-+#endif /* _AR6000_API_H */
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h b/drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h
-new file mode 100644
-index 0000000..2df131d
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h
-@@ -0,0 +1,38 @@
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef AR6000_DIAG_H_
-+#define AR6000_DIAG_H_
-+
-+
-+A_STATUS
-+ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
-+
-+A_STATUS
-+ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
-+
-+A_STATUS
-+ar6000_ReadDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address,
-+                    A_UCHAR *data, A_UINT32 length);
-+
-+A_STATUS
-+ar6000_WriteDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address,
-+                     A_UCHAR *data, A_UINT32 length);
-+
-+#endif /*AR6000_DIAG_H_*/
-diff --git a/drivers/sdio/function/wlan/ar6000/include/athdefs.h b/drivers/sdio/function/wlan/ar6000/include/athdefs.h
-new file mode 100644
-index 0000000..c28c871
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/athdefs.h
-@@ -0,0 +1,85 @@
-+#ifndef __ATHDEFS_H__
-+#define __ATHDEFS_H__
-+
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ * This file contains definitions that may be used across both
-+ * Host and Target software.  Nothing here is module-dependent
-+ * or platform-dependent.
-+ */
-+
-+/*
-+ * Generic error codes that can be used by hw, sta, ap, sim, dk
-+ * and any other environments. Since these are enums, feel free to
-+ * add any more codes that you need.
-+ */
-+
-+typedef enum {
-+    A_ERROR = -1,               /* Generic error return */
-+    A_OK = 0,                   /* success */
-+                                /* Following values start at 1 */
-+    A_DEVICE_NOT_FOUND,         /* not able to find PCI device */
-+    A_NO_MEMORY,                /* not able to allocate memory, not available */
-+    A_MEMORY_NOT_AVAIL,         /* memory region is not free for mapping */
-+    A_NO_FREE_DESC,             /* no free descriptors available */
-+    A_BAD_ADDRESS,              /* address does not match descriptor */
-+    A_WIN_DRIVER_ERROR,         /* used in NT_HW version, if problem at init */
-+    A_REGS_NOT_MAPPED,          /* registers not correctly mapped */
-+    A_EPERM,                    /* Not superuser */
-+    A_EACCES,                   /* Access denied */
-+    A_ENOENT,                   /* No such entry, search failed, etc. */
-+    A_EEXIST,                   /* The object already exists (can't create) */
-+    A_EFAULT,                   /* Bad address fault */
-+    A_EBUSY,                    /* Object is busy */
-+    A_EINVAL,                   /* Invalid parameter */
-+    A_EMSGSIZE,                 /* Inappropriate message buffer length */
-+    A_ECANCELED,                /* Operation canceled */
-+    A_ENOTSUP,                  /* Operation not supported */
-+    A_ECOMM,                    /* Communication error on send */
-+    A_EPROTO,                   /* Protocol error */
-+    A_ENODEV,                   /* No such device */
-+    A_EDEVNOTUP,                /* device is not UP */
-+    A_NO_RESOURCE,              /* No resources for requested operation */
-+    A_HARDWARE,                 /* Hardware failure */
-+    A_PENDING,                  /* Asynchronous routine; will send up results la
-+ter (typically in callback) */
-+    A_EBADCHANNEL,              /* The channel cannot be used */
-+    A_DECRYPT_ERROR,            /* Decryption error */
-+    A_PHY_ERROR,                /* RX PHY error */
-+    A_CONSUMED                  /* Object was consumed */
-+} A_STATUS;
-+
-+#define A_SUCCESS(x)        (x == A_OK)
-+#define A_FAILED(x)         (!A_SUCCESS(x))
-+
-+#ifndef TRUE
-+#define TRUE 1
-+#endif
-+
-+#ifndef FALSE
-+#define FALSE 0
-+#endif
-+
-+/*
-+ * The following definition is WLAN specific definition
-+ */
-+typedef enum {
-+    MODE_11A = 0,   /* 11a Mode */
-+    MODE_11G = 1,   /* 11g + 11b Mode */
-+    MODE_11B = 2,   /* 11b Mode */
-+    MODE_11GONLY = 3, /* 11g only Mode */
-+    MODE_UNKNOWN = 4,
-+    MODE_MAX = 4
-+} WLAN_PHY_MODE;
-+
-+typedef enum {
-+    WLAN_11A_CAPABILITY   = 1,
-+    WLAN_11G_CAPABILITY   = 2,
-+    WLAN_11AG_CAPABILITY  = 3,
-+}WLAN_CAPABILITY;
-+
-+#endif /* __ATHDEFS_H__ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/athdrv.h b/drivers/sdio/function/wlan/ar6000/include/athdrv.h
-new file mode 100644
-index 0000000..19da97e
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/athdrv.h
-@@ -0,0 +1,32 @@
-+/*
-+ * Copyright (c) 2004-2006 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef _ATHDRV_H_
-+#define _ATHDRV_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _ATHDRV_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/athendpack.h b/drivers/sdio/function/wlan/ar6000/include/athendpack.h
-new file mode 100644
-index 0000000..42921ae
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/athendpack.h
-@@ -0,0 +1,41 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+ * @file: athendpack.h
-+ *
-+ * @abstract: end compiler-specific structure packing
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+#ifdef VXWORKS
-+#endif /* VXWORKS */
-+
-+#ifdef LINUX
-+#endif /* LINUX */
-+
-+#ifdef QNX
-+#endif /* QNX */
-+
-+#ifdef INTEGRITY
-+#include "integrity/athendpack_integrity.h"
-+#endif /* INTEGRITY */
-+
-+#ifdef NUCLEUS
-+#endif /* NUCLEUS */
-+
-+#ifdef UNDER_CE
-+#include "../os/wince/include/athendpack_wince.h"
-+#endif /* WINCE */
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/include/athstartpack.h b/drivers/sdio/function/wlan/ar6000/include/athstartpack.h
-new file mode 100644
-index 0000000..6632cc2
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/athstartpack.h
-@@ -0,0 +1,42 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+ * @file: athstartpack.h
-+ *
-+ * @abstract: start compiler-specific structure packing
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifdef VXWORKS
-+#endif /* VXWORKS */
-+
-+#ifdef LINUX
-+#endif /* LINUX */
-+
-+#ifdef QNX
-+#endif /* QNX */
-+
-+#ifdef INTEGRITY
-+#include "integrity/athstartpack_integrity.h"
-+#endif /* INTEGRITY */
-+
-+#ifdef NUCLEUS
-+#endif /* NUCLEUS */
-+
-+#ifdef UNDER_CE
-+#include "../os/wince/include/athstartpack_wince.h"
-+#endif /* WINCE */
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/include/bmi.h b/drivers/sdio/function/wlan/ar6000/include/bmi.h
-new file mode 100644
-index 0000000..2eb7134
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/bmi.h
-@@ -0,0 +1,100 @@
-+#ifndef _BMI_H_
-+#define _BMI_H_
-+/*
-+ * Copyright (c) 2004-2005 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ * BMI declarations and prototypes
-+ */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-+
-+/* Header files */
-+#include "a_config.h"
-+#include "athdefs.h"
-+#include "a_types.h"
-+#include "hif.h"
-+#include "a_osapi.h"
-+#include "bmi_msg.h"
-+
-+void
-+BMIInit(void);
-+
-+A_STATUS
-+BMIDone(HIF_DEVICE *device);
-+
-+A_STATUS
-+BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info);
-+
-+A_STATUS
-+BMIReadMemory(HIF_DEVICE *device,
-+              A_UINT32 address,
-+              A_UCHAR *buffer,
-+              A_UINT32 length);
-+
-+A_STATUS
-+BMIWriteMemory(HIF_DEVICE *device,
-+               A_UINT32 address,
-+               A_UCHAR *buffer,
-+               A_UINT32 length);
-+
-+A_STATUS
-+BMIExecute(HIF_DEVICE *device,
-+           A_UINT32 address,
-+           A_UINT32 *param);
-+
-+A_STATUS
-+BMISetAppStart(HIF_DEVICE *device,
-+               A_UINT32 address);
-+
-+A_STATUS
-+BMIReadSOCRegister(HIF_DEVICE *device,
-+                   A_UINT32 address,
-+                   A_UINT32 *param);
-+
-+A_STATUS
-+BMIWriteSOCRegister(HIF_DEVICE *device,
-+                    A_UINT32 address,
-+                    A_UINT32 param);
-+
-+A_STATUS
-+BMIrompatchInstall(HIF_DEVICE *device,
-+                   A_UINT32 ROM_addr,
-+                   A_UINT32 RAM_addr,
-+                   A_UINT32 nbytes,
-+                   A_UINT32 do_activate,
-+                   A_UINT32 *patch_id);
-+
-+A_STATUS
-+BMIrompatchUninstall(HIF_DEVICE *device,
-+                     A_UINT32 rompatch_id);
-+
-+A_STATUS
-+BMIrompatchActivate(HIF_DEVICE *device,
-+                    A_UINT32 rompatch_count,
-+                    A_UINT32 *rompatch_list);
-+
-+A_STATUS
-+BMIrompatchDeactivate(HIF_DEVICE *device,
-+                      A_UINT32 rompatch_count,
-+                      A_UINT32 *rompatch_list);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _BMI_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/bmi_msg.h b/drivers/sdio/function/wlan/ar6000/include/bmi_msg.h
-new file mode 100644
-index 0000000..7c91ef4
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/bmi_msg.h
-@@ -0,0 +1,199 @@
-+#ifndef __BMI_MSG_H__
-+#define __BMI_MSG_H__
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+/*
-+ * Bootloader Messaging Interface (BMI)
-+ *
-+ * BMI is a very simple messaging interface used during initialization
-+ * to read memory, write memory, execute code, and to define an
-+ * application entry PC.
-+ *
-+ * It is used to download an application to AR6K, to provide
-+ * patches to code that is already resident on AR6K, and generally
-+ * to examine and modify state.  The Host has an opportunity to use
-+ * BMI only once during bootup.  Once the Host issues a BMI_DONE
-+ * command, this opportunity ends.
-+ *
-+ * The Host writes BMI requests to mailbox0, and reads BMI responses
-+ * from mailbox0.   BMI requests all begin with a command
-+ * (see below for specific commands), and are followed by
-+ * command-specific data.
-+ *
-+ * Flow control:
-+ * The Host can only issue a command once the Target gives it a
-+ * "BMI Command Credit", using AR6K Counter #4.  As soon as the
-+ * Target has completed a command, it issues another BMI Command
-+ * Credit (so the Host can issue the next command).
-+ *
-+ * BMI handles all required Target-side cache flushing.
-+ */
-+
-+
-+/* Maximum data size used for BMI transfers */
-+#define BMI_DATASZ_MAX                     32
-+
-+/* BMI Commands */
-+
-+#define BMI_NO_COMMAND                      0
-+
-+#define BMI_DONE                            1
-+        /*
-+         * Semantics: Host is done using BMI
-+         * Request format:
-+         *    A_UINT32      command (BMI_DONE)
-+         * Response format: none
-+         */
-+
-+#define BMI_READ_MEMORY                     2
-+        /*
-+         * Semantics: Host reads AR6K memory
-+         * Request format:
-+         *    A_UINT32      command (BMI_READ_MEMORY)
-+         *    A_UINT32      address
-+         *    A_UINT32      length, at most BMI_DATASZ_MAX
-+         * Response format:
-+         *    A_UINT8       data[length]
-+         */
-+
-+#define BMI_WRITE_MEMORY                    3
-+        /*
-+         * Semantics: Host writes AR6K memory
-+         * Request format:
-+         *    A_UINT32       command (BMI_WRITE_MEMORY)
-+         *    A_UINT32      address
-+         *    A_UINT32      length, at most BMI_DATASZ_MAX
-+         *    A_UINT8       data[length]
-+         * Response format: none
-+         */
-+
-+#define BMI_EXECUTE                         4
-+        /*
-+         * Semantics: Causes AR6K to execute code
-+         * Request format:
-+         *    A_UINT32      command (BMI_EXECUTE)
-+         *    A_UINT32      address
-+         *    A_UINT32      parameter
-+         * Response format:
-+         *    A_UINT32      return value
-+         */
-+
-+#define BMI_SET_APP_START                   5
-+        /*
-+         * Semantics: Set Target application starting address
-+         * Request format:
-+         *    A_UINT32      command (BMI_SET_APP_START)
-+         *    A_UINT32      address
-+         * Response format: none
-+         */
-+
-+#define BMI_READ_SOC_REGISTER               6
-+        /*
-+         * Semantics: Read a 32-bit Target SOC register.
-+         * Request format:
-+         *    A_UINT32      command (BMI_READ_REGISTER)
-+         *    A_UINT32      address
-+         * Response format:
-+         *    A_UINT32      value
-+         */
-+
-+#define BMI_WRITE_SOC_REGISTER              7
-+        /*
-+         * Semantics: Write a 32-bit Target SOC register.
-+         * Request format:
-+         *    A_UINT32      command (BMI_WRITE_REGISTER)
-+         *    A_UINT32      address
-+         *    A_UINT32      value
-+         *
-+         * Response format: none
-+         */
-+
-+#define BMI_GET_TARGET_ID                  8
-+#define BMI_GET_TARGET_INFO                8
-+        /*
-+         * Semantics: Fetch the 4-byte Target information
-+         * Request format:
-+         *    A_UINT32      command (BMI_GET_TARGET_ID/INFO)
-+         * Response format1 (old firmware):
-+         *    A_UINT32      TargetVersionID
-+         * Response format2 (newer firmware):
-+         *    A_UINT32      TARGET_VERSION_SENTINAL
-+         *    struct bmi_target_info;
-+         */
-+
-+struct bmi_target_info {
-+    A_UINT32 target_info_byte_count; /* size of this structure */
-+    A_UINT32 target_ver;             /* Target Version ID */
-+    A_UINT32 target_type;            /* Target type */
-+};
-+#define TARGET_VERSION_SENTINAL 0xffffffff
-+#define TARGET_TYPE_AR6001 1
-+#define TARGET_TYPE_AR6002 2
-+
-+
-+#define BMI_ROMPATCH_INSTALL               9
-+        /*
-+         * Semantics: Install a ROM Patch.
-+         * Request format:
-+         *    A_UINT32      command (BMI_ROMPATCH_INSTALL)
-+         *    A_UINT32      Target ROM Address
-+         *    A_UINT32      Target RAM Address
-+         *    A_UINT32      Size, in bytes
-+         *    A_UINT32      Activate? 1-->activate;
-+         *                            0-->install but do not activate
-+         * Response format:
-+         *    A_UINT32      PatchID
-+         */
-+
-+#define BMI_ROMPATCH_UNINSTALL             10
-+        /*
-+         * Semantics: Uninstall a previously-installed ROM Patch,
-+         * automatically deactivating, if necessary.
-+         * Request format:
-+         *    A_UINT32      command (BMI_ROMPATCH_UNINSTALL)
-+         *    A_UINT32      PatchID
-+         *
-+         * Response format: none
-+         */
-+
-+#define BMI_ROMPATCH_ACTIVATE              11
-+        /*
-+         * Semantics: Activate a list of previously-installed ROM Patches.
-+         * Request format:
-+         *    A_UINT32      command (BMI_ROMPATCH_ACTIVATE)
-+         *    A_UINT32      rompatch_count
-+         *    A_UINT32      PatchID[rompatch_count]
-+         *
-+         * Response format: none
-+         */
-+
-+#define BMI_ROMPATCH_DEACTIVATE            12
-+        /*
-+         * Semantics: Deactivate a list of active ROM Patches.
-+         * Request format:
-+         *    A_UINT32      command (BMI_ROMPATCH_DEACTIVATE)
-+         *    A_UINT32      rompatch_count
-+         *    A_UINT32      PatchID[rompatch_count]
-+         *
-+         * Response format: none
-+         */
-+
-+
-+#endif /* __BMI_MSG_H__ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/common_drv.h b/drivers/sdio/function/wlan/ar6000/include/common_drv.h
-new file mode 100644
-index 0000000..1bdc3da
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/common_drv.h
-@@ -0,0 +1,61 @@
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+
-+#ifndef COMMON_DRV_H_
-+#define COMMON_DRV_H_
-+
-+#include "hif.h"
-+#include "htc_packet.h"
-+
-+
-+
-+/* structure that is the state information for the default credit distribution callback
-+ * drivers should instantiate (zero-init as well) this structure in their driver instance
-+ * and pass it as a context to the HTC credit distribution functions */
-+typedef struct _COMMON_CREDIT_STATE_INFO {
-+    int TotalAvailableCredits;      /* total credits in the system at startup */
-+    int CurrentFreeCredits;         /* credits available in the pool that have not been
-+                                       given out to endpoints */
-+    HTC_ENDPOINT_CREDIT_DIST *pLowestPriEpDist;  /* pointer to the lowest priority endpoint dist struct */
-+} COMMON_CREDIT_STATE_INFO;
-+
-+
-+/* HTC TX packet tagging definitions */
-+#define AR6K_CONTROL_PKT_TAG    HTC_TX_PACKET_TAG_USER_DEFINED
-+#define AR6K_DATA_PKT_TAG       (AR6K_CONTROL_PKT_TAG + 1)
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/* OS-independent APIs */
-+A_STATUS ar6000_setup_credit_dist(HTC_HANDLE HTCHandle, COMMON_CREDIT_STATE_INFO *pCredInfo);
-+A_STATUS ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
-+A_STATUS ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
-+A_STATUS ar6000_ReadDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address,  A_UCHAR *data, A_UINT32 length);
-+A_STATUS ar6000_reset_device(HIF_DEVICE *hifDevice, A_UINT32 TargetType);
-+void ar6000_dump_target_assert_info(HIF_DEVICE *hifDevice, A_UINT32 TargetType);
-+A_STATUS ar6000_reset_device_skipflash(HIF_DEVICE *hifDevice);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /*COMMON_DRV_H_*/
-diff --git a/drivers/sdio/function/wlan/ar6000/include/dbglog.h b/drivers/sdio/function/wlan/ar6000/include/dbglog.h
-new file mode 100644
-index 0000000..3d1e528
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/dbglog.h
-@@ -0,0 +1,107 @@
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ * This file contains the definitions and data structures associated with
-+ * the log based debug mechanism.
-+ *
-+ */
-+
-+#ifndef _DBGLOG_H_
-+#define _DBGLOG_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#define DBGLOG_TIMESTAMP_OFFSET          0
-+#define DBGLOG_TIMESTAMP_MASK            0x0000FFFF /* Bit 0-15. Contains bit
-+                                                       8-23 of the LF0 timer */
-+#define DBGLOG_DBGID_OFFSET              16
-+#define DBGLOG_DBGID_MASK                0x03FF0000 /* Bit 16-25 */
-+#define DBGLOG_DBGID_NUM_MAX             256 /* Upper limit is width of mask */
-+
-+#define DBGLOG_MODULEID_OFFSET           26
-+#define DBGLOG_MODULEID_MASK             0x3C000000 /* Bit 26-29 */
-+#define DBGLOG_MODULEID_NUM_MAX          16 /* Upper limit is width of mask */
-+
-+/*
-+ * Please ensure that the definition of any new module intrduced is captured
-+ * between the DBGLOG_MODULEID_START and DBGLOG_MODULEID_END defines. The
-+ * structure is required for the parser to correctly pick up the values for
-+ * different modules.
-+ */
-+#define DBGLOG_MODULEID_START
-+#define DBGLOG_MODULEID_INF                   0
-+#define DBGLOG_MODULEID_WMI                   1
-+#define DBGLOG_MODULEID_CSERV                 2
-+#define DBGLOG_MODULEID_PM                    3
-+#define DBGLOG_MODULEID_TXRX_MGMTBUF          4
-+#define DBGLOG_MODULEID_TXRX_TXBUF            5
-+#define DBGLOG_MODULEID_TXRX_RXBUF            6
-+#define DBGLOG_MODULEID_WOW                   7
-+#define DBGLOG_MODULEID_WHAL                  8
-+#define DBGLOG_MODULEID_END
-+
-+#define DBGLOG_NUM_ARGS_OFFSET             30
-+#define DBGLOG_NUM_ARGS_MASK               0xC0000000 /* Bit 30-31 */
-+#define DBGLOG_NUM_ARGS_MAX                2 /* Upper limit is width of mask */
-+
-+#define DBGLOG_MODULE_LOG_ENABLE_OFFSET    0
-+#define DBGLOG_MODULE_LOG_ENABLE_MASK      0x0000FFFF
-+
-+#define DBGLOG_REPORTING_ENABLED_OFFSET    16
-+#define DBGLOG_REPORTING_ENABLED_MASK      0x00010000
-+
-+#define DBGLOG_TIMESTAMP_RESOLUTION_OFFSET 17
-+#define DBGLOG_TIMESTAMP_RESOLUTION_MASK   0x000E0000
-+
-+#define DBGLOG_REPORT_SIZE_OFFSET          20
-+#define DBGLOG_REPORT_SIZE_MASK            0x3FF00000
-+
-+#define DBGLOG_LOG_BUFFER_SIZE             1500
-+#define DBGLOG_DBGID_DEFINITION_LEN_MAX    64
-+
-+struct dbglog_buf_s {
-+    struct dbglog_buf_s *next;
-+    A_INT8              *buffer;
-+    A_UINT32             bufsize;
-+    A_UINT32             length;
-+    A_UINT32             count;
-+    A_UINT32             free;
-+};
-+
-+struct dbglog_hdr_s {
-+    struct dbglog_buf_s *dbuf;
-+    A_UINT32             dropped;
-+};
-+
-+struct dbglog_config_s {
-+    A_UINT32                    cfgvalid; /* Mask with valid config bits */
-+    union {
-+        /* TODO: Take care of endianness */
-+        struct {
-+            A_UINT32            mmask:16; /* Mask of modules with logging on */
-+            A_UINT32            rep:1; /* Reporting enabled or not */
-+            A_UINT32            tsr:3; /* Time stamp resolution. Def: 1 ms */
-+            A_UINT32            size:10; /* Report size in number of messages */
-+            A_UINT32            reserved:2;
-+        } dbglog_config;
-+
-+        A_UINT32                value;
-+    } u;
-+};
-+
-+#define cfgmmask                   u.dbglog_config.mmask
-+#define cfgrep                     u.dbglog_config.rep
-+#define cfgtsr                     u.dbglog_config.tsr
-+#define cfgsize                    u.dbglog_config.size
-+#define cfgvalue                   u.value
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _DBGLOG_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/dbglog_api.h b/drivers/sdio/function/wlan/ar6000/include/dbglog_api.h
-new file mode 100644
-index 0000000..06c8102
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/dbglog_api.h
-@@ -0,0 +1,46 @@
-+#ifndef _DBGLOG_API_H_
-+#define _DBGLOG_API_H_
-+/*
-+ * Copyright (c) 2004-2006 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ * This file contains host side debug primitives.
-+ */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "dbglog.h"
-+
-+#define DBGLOG_HOST_LOG_BUFFER_SIZE            DBGLOG_LOG_BUFFER_SIZE
-+
-+#define DBGLOG_GET_DBGID(arg) \
-+    ((arg & DBGLOG_DBGID_MASK) >> DBGLOG_DBGID_OFFSET)
-+
-+#define DBGLOG_GET_MODULEID(arg) \
-+    ((arg & DBGLOG_MODULEID_MASK) >> DBGLOG_MODULEID_OFFSET)
-+
-+#define DBGLOG_GET_NUMARGS(arg) \
-+    ((arg & DBGLOG_NUM_ARGS_MASK) >> DBGLOG_NUM_ARGS_OFFSET)
-+
-+#define DBGLOG_GET_TIMESTAMP(arg) \
-+    ((arg & DBGLOG_TIMESTAMP_MASK) >> DBGLOG_TIMESTAMP_OFFSET)
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _DBGLOG_API_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/dbglog_id.h b/drivers/sdio/function/wlan/ar6000/include/dbglog_id.h
-new file mode 100644
-index 0000000..ce22b16
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/dbglog_id.h
-@@ -0,0 +1,307 @@
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ * This file contains the definitions of the debug identifiers for different
-+ * modules.
-+ *
-+ */
-+
-+#ifndef _DBGLOG_ID_H_
-+#define _DBGLOG_ID_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/*
-+ * The nomenclature for the debug identifiers is MODULE_DESCRIPTION.
-+ * Please ensure that the definition of any new debugid introduced is captured
-+ * between the <MODULE>_DBGID_DEFINITION_START and
-+ * <MODULE>_DBGID_DEFINITION_END defines. The structure is required for the
-+ * parser to correctly pick up the values for different debug identifiers.
-+ */
-+
-+/* INF debug identifier definitions */
-+#define INF_DBGID_DEFINITION_START
-+#define INF_ASSERTION_FAILED                          1
-+#define INF_TARGET_ID                                 2
-+#define INF_DBGID_DEFINITION_END
-+
-+/* WMI debug identifier definitions */
-+#define WMI_DBGID_DEFINITION_START
-+#define WMI_CMD_RX_XTND_PKT_TOO_SHORT                 1
-+#define WMI_EXTENDED_CMD_NOT_HANDLED                  2
-+#define WMI_CMD_RX_PKT_TOO_SHORT                      3
-+#define WMI_CALLING_WMI_EXTENSION_FN                  4
-+#define WMI_CMD_NOT_HANDLED                           5
-+#define WMI_IN_SYNC                                   6
-+#define WMI_TARGET_WMI_SYNC_CMD                       7
-+#define WMI_SET_SNR_THRESHOLD_PARAMS                  8
-+#define WMI_SET_RSSI_THRESHOLD_PARAMS                 9
-+#define WMI_SET_LQ_TRESHOLD_PARAMS                   10
-+#define WMI_TARGET_CREATE_PSTREAM_CMD                11
-+#define WMI_WI_DTM_INUSE                             12
-+#define WMI_TARGET_DELETE_PSTREAM_CMD                13
-+#define WMI_TARGET_IMPLICIT_DELETE_PSTREAM_CMD       14
-+#define WMI_TARGET_GET_BIT_RATE_CMD                  15
-+#define WMI_GET_RATE_MASK_CMD_FIX_RATE_MASK_IS       16
-+#define WMI_TARGET_GET_AVAILABLE_CHANNELS_CMD        17
-+#define WMI_TARGET_GET_TX_PWR_CMD                    18
-+#define WMI_FREE_EVBUF_WMIBUF                        19
-+#define WMI_FREE_EVBUF_DATABUF                       20
-+#define WMI_FREE_EVBUF_BADFLAG                       21
-+#define WMI_HTC_RX_ERROR_DATA_PACKET                 22
-+#define WMI_HTC_RX_SYNC_PAUSING_FOR_MBOX             23
-+#define WMI_INCORRECT_WMI_DATA_HDR_DROPPING_PKT      24
-+#define WMI_SENDING_READY_EVENT                      25
-+#define WMI_SETPOWER_MDOE_TO_MAXPERF                 26
-+#define WMI_SETPOWER_MDOE_TO_REC                     27
-+#define WMI_BSSINFO_EVENT_FROM                       28
-+#define WMI_TARGET_GET_STATS_CMD                     29
-+#define WMI_SENDING_SCAN_COMPLETE_EVENT              30
-+#define WMI_SENDING_RSSI_INDB_THRESHOLD_EVENT        31
-+#define WMI_SENDING_RSSI_INDBM_THRESHOLD_EVENT       32
-+#define WMI_SENDING_LINK_QUALITY_THRESHOLD_EVENT     33
-+#define WMI_SENDING_ERROR_REPORT_EVENT               34
-+#define WMI_SENDING_CAC_EVENT                        35
-+#define WMI_TARGET_GET_ROAM_TABLE_CMD                36
-+#define WMI_TARGET_GET_ROAM_DATA_CMD                 37
-+#define WMI_SENDING_GPIO_INTR_EVENT                  38
-+#define WMI_SENDING_GPIO_ACK_EVENT                   39
-+#define WMI_SENDING_GPIO_DATA_EVENT                  40
-+#define WMI_CMD_RX                                   41
-+#define WMI_CMD_RX_XTND                              42
-+#define WMI_EVENT_SEND                               43
-+#define WMI_EVENT_SEND_XTND                          44
-+#define WMI_DBGID_DEFINITION_END
-+
-+/* CSERV debug identifier definitions */
-+#define CSERV_DBGID_DEFINITION_START
-+#define CSERV_BEGIN_SCAN1                             1
-+#define CSERV_BEGIN_SCAN2                             2
-+#define CSERV_END_SCAN1                               3
-+#define CSERV_END_SCAN2                               4
-+#define CSERV_CHAN_SCAN_START                         5
-+#define CSERV_CHAN_SCAN_STOP                          6
-+#define CSERV_CHANNEL_OPPPORTUNITY                    7
-+#define CSERV_NC_TIMEOUT                              8
-+#define CSERV_BACK_HOME                              10
-+#define CSERV_CHMGR_CH_CALLBACK1                     11
-+#define CSERV_CHMGR_CH_CALLBACK2                     12
-+#define CSERV_CHMGR_CH_CALLBACK3                     13
-+#define CSERV_SET_SCAN_PARAMS1                       14
-+#define CSERV_SET_SCAN_PARAMS2                       15
-+#define CSERV_SET_SCAN_PARAMS3                       16
-+#define CSERV_SET_SCAN_PARAMS4                       17
-+#define CSERV_ABORT_SCAN                             18
-+#define CSERV_NEWSTATE                               19
-+#define CSERV_MINCHMGR_OP_END                        20
-+#define CSERV_CHMGR_OP_END                           21
-+#define CSERV_DISCONNECT_TIMEOUT                     22
-+#define CSERV_ROAM_TIMEOUT                           23
-+#define CSERV_FORCE_SCAN1                            24
-+#define CSERV_FORCE_SCAN2                            25
-+#define CSERV_FORCE_SCAN3                            26
-+#define CSERV_UTIL_TIMEOUT                           27
-+#define CSERV_RSSIPOLLER                             28
-+#define CSERV_RETRY_CONNECT_TIMEOUT                  29
-+#define CSERV_RSSIINDBMPOLLER                        30
-+#define CSERV_BGSCAN_ENABLE                          31
-+#define CSERV_BGSCAN_DISABLE                         32
-+#define CSERV_WLAN_START_SCAN_CMD1                   33
-+#define CSERV_WLAN_START_SCAN_CMD2                   34
-+#define CSERV_WLAN_START_SCAN_CMD3                   35
-+#define CSERV_START_SCAN_CMD                         36
-+#define CSERV_START_FORCE_SCAN                       37
-+#define CSERV_NEXT_CHAN                              38
-+#define CSERV_SET_REGCODE                            39
-+#define CSERV_START_ADHOC                            40
-+#define CSERV_ADHOC_AT_HOME                          41
-+#define CSERV_OPT_AT_HOME                            42
-+#define CSERV_WLAN_CONNECT_CMD                       43
-+#define CSERV_WLAN_RECONNECT_CMD                     44
-+#define CSERV_WLAN_DISCONNECT_CMD                    45
-+#define CSERV_BSS_CHANGE_CHANNEL                     46
-+#define CSERV_BEACON_RX                              47
-+#define CSERV_KEEPALIVE_CHECK                        48
-+#define CSERV_RC_BEGIN_SCAN                          49
-+#define CSERV_RC_SCAN_START                          50
-+#define CSERV_RC_SCAN_STOP                           51
-+#define CSERV_RC_NEXT                                52
-+#define CSERV_RC_SCAN_END                            53
-+#define CSERV_PROBE_CALLBACK                         54
-+#define CSERV_ROAM1                                  55
-+#define CSERV_ROAM2                                  56
-+#define CSERV_ROAM3                                  57
-+#define CSERV_CONNECT_EVENT                          58
-+#define CSERV_DISCONNECT_EVENT                       59
-+#define CSERV_BMISS_HANDLER1                         60
-+#define CSERV_BMISS_HANDLER2                         61
-+#define CSERV_BMISS_HANDLER3                         62
-+#define CSERV_LOWRSSI_HANDLER                        63
-+#define CSERV_WLAN_SET_PMKID_CMD                     64
-+#define CSERV_RECONNECT_REQUEST                      65
-+#define CSERV_KEYSPLUMBED_EVENT                      66
-+#define CSERV_NEW_REG                                67
-+#define CSERV_SET_RSSI_THOLD                         68
-+#define CSERV_RSSITHRESHOLDCHECK                     69
-+#define CSERV_RSSIINDBMTHRESHOLDCHECK                70
-+#define CSERV_WLAN_SET_OPT_CMD1                      71
-+#define CSERV_WLAN_SET_OPT_CMD2                      72
-+#define CSERV_WLAN_SET_OPT_CMD3                      73
-+#define CSERV_WLAN_SET_OPT_CMD4                      74
-+#define CSERV_SCAN_CONNECT_STOP                      75
-+#define CSERV_BMISS_HANDLER4                         76
-+#define CSERV_INITIALIZE_TIMER                       77
-+#define CSERV_ARM_TIMER                              78
-+#define CSERV_DISARM_TIMER                           79
-+#define CSERV_UNINITIALIZE_TIMER                     80
-+#define CSERV_DISCONNECT_EVENT2                      81
-+#define CSERV_SCAN_CONNECT_START                     82
-+#define CSERV_BSSINFO_MEMORY_ALLOC_FAILED            83
-+#define CSERV_SET_SCAN_PARAMS5                       84
-+#define CSERV_DBGID_DEFINITION_END
-+
-+/* TXRX debug identifier definitions */
-+#define TXRX_TXBUF_DBGID_DEFINITION_START
-+#define TXRX_TXBUF_ALLOCATE_BUF                      1
-+#define TXRX_TXBUF_QUEUE_BUF_TO_MBOX                 2
-+#define TXRX_TXBUF_QUEUE_BUF_TO_TXQ                  3
-+#define TXRX_TXBUF_TXQ_DEPTH                         4
-+#define TXRX_TXBUF_IBSS_QUEUE_TO_SFQ                 5
-+#define TXRX_TXBUF_IBSS_QUEUE_TO_TXQ_FRM_SFQ         6
-+#define TXRX_TXBUF_INITIALIZE_TIMER                  7
-+#define TXRX_TXBUF_ARM_TIMER                         8
-+#define TXRX_TXBUF_DISARM_TIMER                      9
-+#define TXRX_TXBUF_UNINITIALIZE_TIMER                10
-+#define TXRX_TXBUF_DBGID_DEFINITION_END
-+
-+#define TXRX_RXBUF_DBGID_DEFINITION_START
-+#define TXRX_RXBUF_ALLOCATE_BUF                      1
-+#define TXRX_RXBUF_QUEUE_TO_HOST                     2
-+#define TXRX_RXBUF_QUEUE_TO_WLAN                     3
-+#define TXRX_RXBUF_ZERO_LEN_BUF                      4
-+#define TXRX_RXBUF_QUEUE_TO_HOST_LASTBUF_IN_RXCHAIN  5
-+#define TXRX_RXBUF_LASTBUF_IN_RXCHAIN_ZEROBUF        6
-+#define TXRX_RXBUF_QUEUE_EMPTY_QUEUE_TO_WLAN         7
-+#define TXRX_RXBUF_SEND_TO_RECV_MGMT                 8
-+#define TXRX_RXBUF_SEND_TO_IEEE_LAYER                9
-+#define TXRX_RXBUF_DBGID_DEFINITION_END
-+
-+#define TXRX_MGMTBUF_DBGID_DEFINITION_START
-+#define TXRX_MGMTBUF_ALLOCATE_BUF                    1
-+#define TXRX_MGMTBUF_ALLOCATE_SM_BUF                 2
-+#define TXRX_MGMTBUF_ALLOCATE_RMBUF                  3
-+#define TXRX_MGMTBUF_GET_BUF                         4
-+#define TXRX_MGMTBUF_GET_SM_BUF                      5
-+#define TXRX_MGMTBUF_QUEUE_BUF_TO_TXQ                6
-+#define TXRX_MGMTBUF_REAPED_BUF                      7
-+#define TXRX_MGMTBUF_REAPED_SM_BUF                   8
-+#define TXRX_MGMTBUF_WAIT_FOR_TXQ_DRAIN              9
-+#define TXRX_MGMTBUF_WAIT_FOR_TXQ_SFQ_DRAIN          10
-+#define TXRX_MGMTBUF_ENQUEUE_INTO_SFQ                11
-+#define TXRX_MGMTBUF_DEQUEUE_FROM_SFQ                12
-+#define TXRX_MGMTBUF_PAUSE_TXQ                       13
-+#define TXRX_MGMTBUF_RESUME_TXQ                      14
-+#define TXRX_MGMTBUF_WAIT_FORTXQ_DRAIN_TIMEOUT       15
-+#define TXRX_MGMTBUF_DRAINQ                          16
-+#define TXRX_MGMTBUF_INDICATE_Q_DRAINED              17
-+#define TXRX_MGMTBUF_DBGID_DEFINITION_END
-+
-+/* PM (Power Module) debug identifier definitions */
-+#define PM_DBGID_DEFINITION_START
-+#define PM_INIT                                      1
-+#define PM_ENABLE                                    2
-+#define PM_SET_STATE                                 3
-+#define PM_SET_POWERMODE                             4
-+#define PM_CONN_NOTIFY                               5
-+#define PM_REF_COUNT_NEGATIVE                        6
-+#define PM_APSD_ENABLE                               7
-+#define PM_UPDATE_APSD_STATE                         8
-+#define PM_CHAN_OP_REQ                               9
-+#define PM_SET_MY_BEACON_POLICY                      10
-+#define PM_SET_ALL_BEACON_POLICY                     11
-+#define PM_SET_PM_PARAMS1                            12
-+#define PM_SET_PM_PARAMS2                            13
-+#define PM_ADHOC_SET_PM_CAPS_FAIL                    14
-+#define PM_ADHOC_UNKNOWN_IBSS_ATTRIB_ID              15
-+#define PM_DBGID_DEFINITION_END
-+
-+/* Wake on Wireless debug identifier definitions */
-+#define WOW_DBGID_DEFINITION_START
-+#define WOW_INIT                                        1
-+#define WOW_GET_CONFIG_DSET                             2
-+#define WOW_NO_CONFIG_DSET                              3
-+#define WOW_INVALID_CONFIG_DSET                         4
-+#define WOW_USE_DEFAULT_CONFIG                          5
-+#define WOW_SETUP_GPIO                                  6
-+#define WOW_INIT_DONE                                   7
-+#define WOW_SET_GPIO_PIN                                8
-+#define WOW_CLEAR_GPIO_PIN                              9
-+#define WOW_SET_WOW_MODE_CMD                            10
-+#define WOW_SET_HOST_MODE_CMD                           11
-+#define WOW_ADD_WOW_PATTERN_CMD                         12
-+#define WOW_NEW_WOW_PATTERN_AT_INDEX                    13
-+#define WOW_DEL_WOW_PATTERN_CMD                         14
-+#define WOW_LIST_CONTAINS_PATTERNS                      15
-+#define WOW_GET_WOW_LIST_CMD                            16
-+#define WOW_INVALID_FILTER_ID                           17
-+#define WOW_INVALID_FILTER_LISTID                       18
-+#define WOW_NO_VALID_FILTER_AT_ID                       19
-+#define WOW_NO_VALID_LIST_AT_ID                         20
-+#define WOW_NUM_PATTERNS_EXCEEDED                       21
-+#define WOW_NUM_LISTS_EXCEEDED                          22
-+#define WOW_GET_WOW_STATS                               23
-+#define WOW_CLEAR_WOW_STATS                             24
-+#define WOW_WAKEUP_HOST                                 25
-+#define WOW_EVENT_WAKEUP_HOST                           26
-+#define WOW_EVENT_DISCARD                               27
-+#define WOW_PATTERN_MATCH                               28
-+#define WOW_PATTERN_NOT_MATCH                           29
-+#define WOW_PATTERN_NOT_MATCH_OFFSET                    30
-+#define WOW_DISABLED_HOST_ASLEEP                        31
-+#define WOW_ENABLED_HOST_ASLEEP_NO_PATTERNS             32
-+#define WOW_ENABLED_HOST_ASLEEP_NO_MATCH_FOUND          33
-+#define WOW_DBGID_DEFINITION_END
-+
-+/* WHAL debug identifier definitions */
-+#define WHAL_DBGID_DEFINITION_START
-+#define WHAL_ERROR_ANI_CONTROL                      1
-+#define WHAL_ERROR_CHIP_TEST1                       2
-+#define WHAL_ERROR_CHIP_TEST2                       3
-+#define WHAL_ERROR_EEPROM_CHECKSUM                  4
-+#define WHAL_ERROR_EEPROM_MACADDR                   5
-+#define WHAL_ERROR_INTERRUPT_HIU                    6
-+#define WHAL_ERROR_KEYCACHE_RESET                   7
-+#define WHAL_ERROR_KEYCACHE_SET                     8
-+#define WHAL_ERROR_KEYCACHE_TYPE                    9
-+#define WHAL_ERROR_KEYCACHE_TKIPENTRY              10
-+#define WHAL_ERROR_KEYCACHE_WEPLENGTH              11
-+#define WHAL_ERROR_PHY_INVALID_CHANNEL             12
-+#define WHAL_ERROR_POWER_AWAKE                     13
-+#define WHAL_ERROR_POWER_SET                       14
-+#define WHAL_ERROR_RECV_STOPDMA                    15
-+#define WHAL_ERROR_RECV_STOPPCU                    16
-+#define WHAL_ERROR_RESET_CHANNF1                   17
-+#define WHAL_ERROR_RESET_CHANNF2                   18
-+#define WHAL_ERROR_RESET_PM                        19
-+#define WHAL_ERROR_RESET_OFFSETCAL                 20
-+#define WHAL_ERROR_RESET_RFGRANT                   21
-+#define WHAL_ERROR_RESET_RXFRAME                   22
-+#define WHAL_ERROR_RESET_STOPDMA                   23
-+#define WHAL_ERROR_RESET_RECOVER                   24
-+#define WHAL_ERROR_XMIT_COMPUTE                    25
-+#define WHAL_ERROR_XMIT_NOQUEUE                    26
-+#define WHAL_ERROR_XMIT_ACTIVEQUEUE                27
-+#define WHAL_ERROR_XMIT_BADTYPE                    28
-+#define WHAL_DBGID_DEFINITION_END
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _DBGLOG_ID_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/dl_list.h b/drivers/sdio/function/wlan/ar6000/include/dl_list.h
-new file mode 100644
-index 0000000..4b9c581
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/dl_list.h
-@@ -0,0 +1,114 @@
-+/*
-+ *
-+ * Double-link list definitions (adapted from Atheros SDIO stack)
-+ *
-+ * Copyright (c) 2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+#ifndef __DL_LIST_H___
-+#define __DL_LIST_H___
-+
-+#define A_CONTAINING_STRUCT(address, struct_type, field_name)\
-+            ((struct_type *)((A_UINT32)(address) - (A_UINT32)(&((struct_type *)0)->field_name)))
-+
-+/* list functions */
-+/* pointers for the list */
-+typedef struct _DL_LIST {
-+    struct _DL_LIST *pPrev;
-+    struct _DL_LIST *pNext;
-+}DL_LIST, *PDL_LIST;
-+/*
-+ * DL_LIST_INIT , initialize doubly linked list
-+*/
-+#define DL_LIST_INIT(pList)\
-+    {(pList)->pPrev = pList; (pList)->pNext = pList;}
-+
-+#define DL_LIST_IS_EMPTY(pList) (((pList)->pPrev == (pList)) && ((pList)->pNext == (pList)))
-+#define DL_LIST_GET_ITEM_AT_HEAD(pList) (pList)->pNext
-+#define DL_LIST_GET_ITEM_AT_TAIL(pList) (pList)->pPrev
-+/*
-+ * ITERATE_OVER_LIST pStart is the list, pTemp is a temp list member
-+ * NOT: do not use this function if the items in the list are deleted inside the
-+ * iteration loop
-+*/
-+#define ITERATE_OVER_LIST(pStart, pTemp) \
-+    for((pTemp) =(pStart)->pNext; pTemp != (pStart); (pTemp) = (pTemp)->pNext)
-+
-+
-+/* safe iterate macro that allows the item to be removed from the list
-+ * the iteration continues to the next item in the list
-+ */
-+#define ITERATE_OVER_LIST_ALLOW_REMOVE(pStart,pItem,st,offset)  \
-+{                                                       \
-+    PDL_LIST  pTemp;                                     \
-+    pTemp = (pStart)->pNext;                            \
-+    while (pTemp != (pStart)) {                         \
-+        (pItem) = A_CONTAINING_STRUCT(pTemp,st,offset);   \
-+         pTemp = pTemp->pNext;                          \
-+
-+#define ITERATE_END }}
-+
-+/*
-+ * DL_ListInsertTail - insert pAdd to the end of the list
-+*/
-+static INLINE PDL_LIST DL_ListInsertTail(PDL_LIST pList, PDL_LIST pAdd) {
-+        /* insert at tail */
-+    pAdd->pPrev = pList->pPrev;
-+    pAdd->pNext = pList;
-+    pList->pPrev->pNext = pAdd;
-+    pList->pPrev = pAdd;
-+    return pAdd;
-+}
-+
-+/*
-+ * DL_ListInsertHead - insert pAdd into the head of the list
-+*/
-+static INLINE PDL_LIST DL_ListInsertHead(PDL_LIST pList, PDL_LIST pAdd) {
-+        /* insert at head */
-+    pAdd->pPrev = pList;
-+    pAdd->pNext = pList->pNext;
-+    pList->pNext->pPrev = pAdd;
-+    pList->pNext = pAdd;
-+    return pAdd;
-+}
-+
-+#define DL_ListAdd(pList,pItem) DL_ListInsertHead((pList),(pItem))
-+/*
-+ * DL_ListRemove - remove pDel from list
-+*/
-+static INLINE PDL_LIST DL_ListRemove(PDL_LIST pDel) {
-+    pDel->pNext->pPrev = pDel->pPrev;
-+    pDel->pPrev->pNext = pDel->pNext;
-+        /* point back to itself just to be safe, incase remove is called again */
-+    pDel->pNext = pDel;
-+    pDel->pPrev = pDel;
-+    return pDel;
-+}
-+
-+/*
-+ * DL_ListRemoveItemFromHead - get a list item from the head
-+*/
-+static INLINE PDL_LIST DL_ListRemoveItemFromHead(PDL_LIST pList) {
-+    PDL_LIST pItem = NULL;
-+    if (pList->pNext != pList) {
-+        pItem = pList->pNext;
-+            /* remove the first item from head */
-+        DL_ListRemove(pItem);
-+    }
-+    return pItem;
-+}
-+
-+#endif /* __DL_LIST_H___ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/dset_api.h b/drivers/sdio/function/wlan/ar6000/include/dset_api.h
-new file mode 100644
-index 0000000..de5cc6a
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/dset_api.h
-@@ -0,0 +1,63 @@
-+/*
-+ * Copyright (c) 2004-2006 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/include/dset_api.h#1 $
-+ *
-+ * Host-side DataSet API.
-+ *
-+ */
-+
-+#ifndef _DSET_API_H_
-+#define _DSET_API_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-+
-+/*
-+ * Host-side DataSet support is optional, and is not
-+ * currently required for correct operation.  To disable
-+ * Host-side DataSet support, set this to 0.
-+ */
-+#ifndef CONFIG_HOST_DSET_SUPPORT
-+#define CONFIG_HOST_DSET_SUPPORT 1
-+#endif
-+
-+/* Called to send a DataSet Open Reply back to the Target. */
-+A_STATUS wmi_dset_open_reply(struct wmi_t *wmip,
-+                             A_UINT32 status,
-+                             A_UINT32 access_cookie,
-+                             A_UINT32 size,
-+                             A_UINT32 version,
-+                             A_UINT32 targ_handle,
-+                             A_UINT32 targ_reply_fn,
-+                             A_UINT32 targ_reply_arg);
-+
-+/* Called to send a DataSet Data Reply back to the Target. */
-+A_STATUS wmi_dset_data_reply(struct wmi_t *wmip,
-+                             A_UINT32 status,
-+                             A_UINT8 *host_buf,
-+                             A_UINT32 length,
-+                             A_UINT32 targ_buf,
-+                             A_UINT32 targ_reply_fn,
-+                             A_UINT32 targ_reply_arg);
-+
-+#ifdef __cplusplus
-+}
-+#endif /* __cplusplus */
-+
-+
-+#endif /* _DSET_API_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/dset_internal.h b/drivers/sdio/function/wlan/ar6000/include/dset_internal.h
-new file mode 100644
-index 0000000..f0be380
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/dset_internal.h
-@@ -0,0 +1,39 @@
-+/*
-+ * Copyright (c) 2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ */
-+
-+#ifndef __DSET_INTERNAL_H__
-+#define __DSET_INTERNAL_H__
-+
-+/*
-+ * Internal dset definitions, common for DataSet layer.
-+ */
-+
-+#define DSET_TYPE_STANDARD      0
-+#define DSET_TYPE_BPATCHED      1
-+#define DSET_TYPE_COMPRESSED    2
-+
-+/* Dataset descriptor */
-+
-+typedef struct dset_descriptor_s {
-+  struct dset_descriptor_s  *next;         /* List link. NULL only at the last
-+                                              descriptor */
-+  A_UINT16                   id;           /* Dset ID */
-+  A_UINT16                   size;         /* Dset size. */
-+  void                      *DataPtr;      /* Pointer to raw data for standard
-+                                              DataSet or pointer to original
-+                                              dset_descriptor for patched
-+                                              DataSet */
-+  A_UINT32                   data_type;    /* DSET_TYPE_*, above */
-+
-+  void                      *AuxPtr;       /* Additional data that might
-+                                              needed for data_type. For
-+                                              example, pointer to patch
-+                                              Dataset descriptor for BPatch. */
-+} dset_descriptor_t;
-+
-+#endif /* __DSET_INTERNAL_H__ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/dsetid.h b/drivers/sdio/function/wlan/ar6000/include/dsetid.h
-new file mode 100644
-index 0000000..85729f8
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/dsetid.h
-@@ -0,0 +1,110 @@
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ */
-+
-+#ifndef __DSETID_H__
-+#define __DSETID_H__
-+
-+/* Well-known DataSet IDs */
-+#define DSETID_UNUSED                     0x00000000
-+#define DSETID_BOARD_DATA                 0x00000001 /* Cal and board data */
-+#define DSETID_REGDB                      0x00000002 /* Regulatory Database */
-+#define DSETID_POWER_CONTROL              0x00000003 /* TX Pwr Lim & Ant Gain */
-+#define DSETID_USER_CONFIG                0x00000004 /* User Configuration */
-+
-+#define DSETID_ANALOG_CONTROL_DATA_START  0x00000005
-+#define DSETID_ANALOG_CONTROL_DATA_END    0x00000025
-+/*
-+ * Get DSETID for various reference clock speeds.
-+ * For each speed there are three DataSets that correspond
-+ * to the three columns of bank6 data (addr, 11a, 11b/g).
-+ * This macro returns the dsetid of the first of those
-+ * three DataSets.
-+ */
-+#define ANALOG_CONTROL_DATA_DSETID(refclk) \
-+        (DSETID_ANALOG_CONTROL_DATA_START + 3*refclk)
-+
-+/*
-+ * There are TWO STARTUP_PATCH DataSets.
-+ * DSETID_STARTUP_PATCH is historical, and was applied before BMI on
-+ * earlier systems.  On AR6002, it is applied after BMI, just like
-+ * DSETID_STARTUP_PATCH2.
-+ */
-+#define DSETID_STARTUP_PATCH              0x00000026
-+#define DSETID_GPIO_CONFIG_PATCH          0x00000027
-+#define DSETID_WLANREGS                   0x00000028 /* override wlan regs */
-+#define DSETID_STARTUP_PATCH2             0x00000029
-+
-+#define DSETID_WOW_CONFIG                 0x00000090 /* WoW Configuration */
-+
-+/* Add WHAL_INI_DATA_ID to DSETID_INI_DATA for a specific WHAL INI table. */
-+#define DSETID_INI_DATA                   0x00000100
-+/* Reserved for WHAL INI Tables: 0x100..0x11f */
-+#define DSETID_INI_DATA_END               0x0000011f
-+
-+#define DSETID_VENDOR_START               0x00010000 /* Vendor-defined DataSets */
-+
-+#define DSETID_INDEX_END                  0xfffffffe /* Reserved to indicate the
-+                                                        end of a memory-based
-+                                                        DataSet Index */
-+#define DSETID_INDEX_FREE                 0xffffffff /* An unused index entry */
-+
-+/*
-+ * PATCH DataSet format:
-+ * A list of patches, terminated by a patch with
-+ * address=PATCH_END.
-+ *
-+ * This allows for patches to be stored in flash.
-+ */
-+struct patch_s {
-+    A_UINT32 *address;
-+    A_UINT32  data;
-+};
-+
-+/*
-+ * Skip some patches.  Can be used to erase a single patch in a
-+ * patch DataSet without having to re-write the DataSet.  May
-+ * also be used to embed information for use by subsequent
-+ * patch code.  The "data" in a PATCH_SKIP tells how many
-+ * bytes of length "patch_s" to skip.
-+ */
-+#define PATCH_SKIP      ((A_UINT32 *)0x00000000)
-+
-+/*
-+ * Execute code at the address specified by "data".
-+ * The address of the patch structure is passed as
-+ * the one parameter.
-+ */
-+#define PATCH_CODE_ABS  ((A_UINT32 *)0x00000001)
-+
-+/*
-+ * Same as PATCH_CODE_ABS, but treat "data" as an
-+ * offset from the start of the patch word.
-+ */
-+#define PATCH_CODE_REL  ((A_UINT32 *)0x00000002)
-+
-+/* Mark the end of this patch DataSet. */
-+#define PATCH_END       ((A_UINT32 *)0xffffffff)
-+
-+/*
-+ * A DataSet which contains a Binary Patch to some other DataSet
-+ * uses the original dsetid with the DSETID_BPATCH_FLAG bit set.
-+ * Such a BPatch DataSet consists of BPatch metadata followed by
-+ * the bdiff bytes.  BPatch metadata consists of a single 32-bit
-+ * word that contains the size of the BPatched final image.
-+ *
-+ * To create a suitable bdiff DataSet, use bdiff in host/tools/bdiff
-+ * to create "diffs":
-+ *  bdiff -q -O -nooldmd5 -nonewmd5 -d ORIGfile NEWfile diffs
-+ * Then add BPatch metadata to the start of "diffs".
-+ *
-+ * NB: There are some implementation-induced restrictions
-+ * on which DataSets can be BPatched.
-+ */
-+#define DSETID_BPATCH_FLAG                0x80000000
-+
-+#endif /* __DSETID_H__ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/gpio.h b/drivers/sdio/function/wlan/ar6000/include/gpio.h
-new file mode 100644
-index 0000000..2203c7e
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/gpio.h
-@@ -0,0 +1,34 @@
-+/*
-+ * Copyright (c) 2005 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ */
-+
-+#if defined(AR6001)
-+#define GPIO_PIN_COUNT 18
-+#else
-+#define GPIO_PIN_COUNT 18
-+#endif
-+
-+/*
-+ * Possible values for WMIX_GPIO_SET_REGISTER_CMDID.
-+ * NB: These match hardware order, so that addresses can
-+ * easily be computed.
-+ */
-+#define GPIO_ID_OUT             0x00000000
-+#define GPIO_ID_OUT_W1TS        0x00000001
-+#define GPIO_ID_OUT_W1TC        0x00000002
-+#define GPIO_ID_ENABLE          0x00000003
-+#define GPIO_ID_ENABLE_W1TS     0x00000004
-+#define GPIO_ID_ENABLE_W1TC     0x00000005
-+#define GPIO_ID_IN              0x00000006
-+#define GPIO_ID_STATUS          0x00000007
-+#define GPIO_ID_STATUS_W1TS     0x00000008
-+#define GPIO_ID_STATUS_W1TC     0x00000009
-+#define GPIO_ID_PIN0            0x0000000a
-+#define GPIO_ID_PIN(n)          (GPIO_ID_PIN0+(n))
-+
-+#define GPIO_LAST_REGISTER_ID   GPIO_ID_PIN(17)
-+#define GPIO_ID_NONE            0xffffffff
-diff --git a/drivers/sdio/function/wlan/ar6000/include/gpio_api.h b/drivers/sdio/function/wlan/ar6000/include/gpio_api.h
-new file mode 100644
-index 0000000..8078aa5
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/gpio_api.h
-@@ -0,0 +1,57 @@
-+#ifndef _GPIO_API_H_
-+#define _GPIO_API_H_
-+/*
-+ * Copyright 2005 Atheros Communications, 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+/*
-+ * Host-side General Purpose I/O API.
-+ *
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/include/gpio_api.h#1 $
-+ */
-+
-+/*
-+ * Send a command to the Target in order to change output on GPIO pins.
-+ */
-+A_STATUS wmi_gpio_output_set(struct wmi_t *wmip,
-+                             A_UINT32 set_mask,
-+                             A_UINT32 clear_mask,
-+                             A_UINT32 enable_mask,
-+                             A_UINT32 disable_mask);
-+
-+/*
-+ * Send a command to the Target requesting input state of GPIO pins.
-+ */
-+A_STATUS wmi_gpio_input_get(struct wmi_t *wmip);
-+
-+/*
-+ * Send a command to the Target to change the value of a GPIO register.
-+ */
-+A_STATUS wmi_gpio_register_set(struct wmi_t *wmip,
-+                               A_UINT32 gpioreg_id,
-+                               A_UINT32 value);
-+
-+/*
-+ * Send a command to the Target to fetch the value of a GPIO register.
-+ */
-+A_STATUS wmi_gpio_register_get(struct wmi_t *wmip, A_UINT32 gpioreg_id);
-+
-+/*
-+ * Send a command to the Target, acknowledging some GPIO interrupts.
-+ */
-+A_STATUS wmi_gpio_intr_ack(struct wmi_t *wmip, A_UINT32 ack_mask);
-+
-+#endif /* _GPIO_API_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/hif.h b/drivers/sdio/function/wlan/ar6000/include/hif.h
-new file mode 100644
-index 0000000..f32388c
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/hif.h
-@@ -0,0 +1,291 @@
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ * HIF specific declarations and prototypes
-+ */
-+
-+#ifndef _HIF_H_
-+#define _HIF_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-+
-+/* Header files */
-+#include "a_config.h"
-+#include "athdefs.h"
-+#include "a_types.h"
-+#include "a_osapi.h"
-+
-+typedef struct htc_callbacks HTC_CALLBACKS;
-+typedef struct hif_device HIF_DEVICE;
-+
-+/*
-+ * direction - Direction of transfer (HIF_READ/HIF_WRITE).
-+ */
-+#define HIF_READ                    0x00000001
-+#define HIF_WRITE                   0x00000002
-+#define HIF_DIR_MASK                (HIF_READ | HIF_WRITE)
-+
-+/*
-+ *     type - An interface may support different kind of read/write commands.
-+ *            The command type is divided into a basic and an extended command
-+ *            and can be specified using HIF_BASIC_IO/HIF_EXTENDED_IO.
-+ */
-+#define HIF_BASIC_IO                0x00000004
-+#define HIF_EXTENDED_IO             0x00000008
-+#define HIF_TYPE_MASK               (HIF_BASIC_IO | HIF_EXTENDED_IO)
-+
-+/*
-+ *     emode - This indicates the whether the command is to be executed in a
-+ *             blocking or non-blocking fashion (HIF_SYNCHRONOUS/
-+ *             HIF_ASYNCHRONOUS). The read/write data paths in HTC have been
-+ *             implemented using the asynchronous mode allowing the the bus
-+ *             driver to indicate the completion of operation through the
-+ *             registered callback routine. The requirement primarily comes
-+ *             from the contexts these operations get called from (a driver's
-+ *             transmit context or the ISR context in case of receive).
-+ *             Support for both of these modes is essential.
-+ */
-+#define HIF_SYNCHRONOUS             0x00000010
-+#define HIF_ASYNCHRONOUS            0x00000020
-+#define HIF_EMODE_MASK              (HIF_SYNCHRONOUS | HIF_ASYNCHRONOUS)
-+
-+/*
-+ *     dmode - An interface may support different kinds of commands based on
-+ *             the tradeoff between the amount of data it can carry and the
-+ *             setup time. Byte and Block modes are supported (HIF_BYTE_BASIS/
-+ *             HIF_BLOCK_BASIS). In case of latter, the data is rounded off
-+ *             to the nearest block size by padding. The size of the block is
-+ *             configurable at compile time using the HIF_BLOCK_SIZE and is
-+ *             negotiated with the target during initialization after the
-+ *             dragon interrupts are enabled.
-+ */
-+#define HIF_BYTE_BASIS              0x00000040
-+#define HIF_BLOCK_BASIS             0x00000080
-+#define HIF_DMODE_MASK              (HIF_BYTE_BASIS | HIF_BLOCK_BASIS)
-+
-+/*
-+ *     amode - This indicates if the address has to be incremented on dragon
-+ *             after every read/write operation (HIF?FIXED_ADDRESS/
-+ *             HIF_INCREMENTAL_ADDRESS).
-+ */
-+#define HIF_FIXED_ADDRESS           0x00000100
-+#define HIF_INCREMENTAL_ADDRESS     0x00000200
-+#define HIF_AMODE_MASK              (HIF_FIXED_ADDRESS | HIF_INCREMENTAL_ADDRESS)
-+
-+#define HIF_WR_ASYNC_BYTE_FIX   \
-+    (HIF_WRITE | HIF_ASYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_FIXED_ADDRESS)
-+#define HIF_WR_ASYNC_BYTE_INC   \
-+    (HIF_WRITE | HIF_ASYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_INCREMENTAL_ADDRESS)
-+#define HIF_WR_ASYNC_BLOCK_INC  \
-+    (HIF_WRITE | HIF_ASYNCHRONOUS | HIF_EXTENDED_IO | HIF_BLOCK_BASIS | HIF_INCREMENTAL_ADDRESS)
-+#define HIF_WR_SYNC_BYTE_FIX    \
-+    (HIF_WRITE | HIF_SYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_FIXED_ADDRESS)
-+#define HIF_WR_SYNC_BYTE_INC    \
-+    (HIF_WRITE | HIF_SYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_INCREMENTAL_ADDRESS)
-+#define HIF_WR_SYNC_BLOCK_INC  \
-+    (HIF_WRITE | HIF_SYNCHRONOUS | HIF_EXTENDED_IO | HIF_BLOCK_BASIS | HIF_INCREMENTAL_ADDRESS)
-+#define HIF_RD_SYNC_BYTE_INC    \
-+    (HIF_READ | HIF_SYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_INCREMENTAL_ADDRESS)
-+#define HIF_RD_SYNC_BYTE_FIX    \
-+    (HIF_READ | HIF_SYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_FIXED_ADDRESS)
-+#define HIF_RD_ASYNC_BYTE_FIX   \
-+    (HIF_READ | HIF_ASYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_FIXED_ADDRESS)
-+#define HIF_RD_ASYNC_BLOCK_FIX  \
-+    (HIF_READ | HIF_ASYNCHRONOUS | HIF_EXTENDED_IO | HIF_BLOCK_BASIS | HIF_FIXED_ADDRESS)
-+#define HIF_RD_ASYNC_BYTE_INC   \
-+    (HIF_READ | HIF_ASYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_INCREMENTAL_ADDRESS)
-+#define HIF_RD_ASYNC_BLOCK_INC  \
-+    (HIF_READ | HIF_ASYNCHRONOUS | HIF_EXTENDED_IO | HIF_BLOCK_BASIS | HIF_INCREMENTAL_ADDRESS)
-+#define HIF_RD_SYNC_BLOCK_INC  \
-+    (HIF_READ | HIF_SYNCHRONOUS | HIF_EXTENDED_IO | HIF_BLOCK_BASIS | HIF_INCREMENTAL_ADDRESS)
-+
-+
-+typedef enum {
-+    HIF_DEVICE_POWER_STATE = 0,
-+    HIF_DEVICE_GET_MBOX_BLOCK_SIZE,
-+    HIF_DEVICE_GET_MBOX_ADDR,
-+    HIF_DEVICE_GET_PENDING_EVENTS_FUNC,
-+    HIF_DEVICE_GET_IRQ_PROC_MODE,
-+    HIF_DEVICE_GET_RECV_EVENT_MASK_UNMASK_FUNC,
-+} HIF_DEVICE_CONFIG_OPCODE;
-+
-+/*
-+ * HIF CONFIGURE definitions:
-+ *
-+ *   HIF_DEVICE_GET_MBOX_BLOCK_SIZE
-+ *   input : none
-+ *   output : array of 4 A_UINT32s
-+ *   notes: block size is returned for each mailbox (4)
-+ *
-+ *   HIF_DEVICE_GET_MBOX_ADDR
-+ *   input : none
-+ *   output : array of 4 A_UINT32
-+ *   notes: address is returned for each mailbox (4) in the array
-+ *
-+ *   HIF_DEVICE_GET_PENDING_EVENTS_FUNC
-+ *   input : none
-+ *   output: HIF_PENDING_EVENTS_FUNC function pointer
-+ *   notes: this is optional for the HIF layer, if the request is
-+ *          not handled then it indicates that the upper layer can use
-+ *          the standard device methods to get pending events (IRQs, mailbox messages etc..)
-+ *          otherwise it can call the function pointer to check pending events.
-+ *
-+ *   HIF_DEVICE_GET_IRQ_PROC_MODE
-+ *   input : none
-+ *   output : HIF_DEVICE_IRQ_PROCESSING_MODE (interrupt processing mode)
-+ *   note: the hif layer interfaces with the underlying OS-specific bus driver. The HIF
-+ *         layer can report whether IRQ processing is requires synchronous behavior or
-+ *         can be processed using asynchronous bus requests (typically faster).
-+ *
-+ *   HIF_DEVICE_GET_RECV_EVENT_MASK_UNMASK_FUNC
-+ *   input :
-+ *   output : HIF_MASK_UNMASK_RECV_EVENT function pointer
-+ *   notes: this is optional for the HIF layer.  The HIF layer may require a special mechanism
-+ *          to mask receive message events.  The upper layer can call this pointer when it needs
-+ *          to mask/unmask receive events (in case it runs out of buffers).
-+ *
-+ *
-+ */
-+
-+typedef enum {
-+    HIF_DEVICE_IRQ_SYNC_ONLY,   /* for HIF implementations that require the DSR to process all
-+                                   interrupts before returning */
-+    HIF_DEVICE_IRQ_ASYNC_SYNC,  /* for HIF implementations that allow DSR to process interrupts
-+                                   using ASYNC I/O (that is HIFAckInterrupt can be called at a
-+                                   later time */
-+} HIF_DEVICE_IRQ_PROCESSING_MODE;
-+
-+#define HIF_MAX_DEVICES                 1
-+
-+struct htc_callbacks {
-+    A_UCHAR *name;
-+    A_UINT32 id;
-+    A_STATUS (* deviceInsertedHandler)(void *hif_handle);
-+    A_STATUS (* deviceRemovedHandler)(void *htc_handle, A_STATUS status);
-+    A_STATUS (* deviceSuspendHandler)(void *htc_handle);
-+    A_STATUS (* deviceResumeHandler)(void *htc_handle);
-+    A_STATUS (* deviceWakeupHandler)(void *htc_handle);
-+    A_STATUS (* rwCompletionHandler)(void *context, A_STATUS status);
-+    A_STATUS (* dsrHandler)(void *htc_handle);
-+};
-+
-+
-+#define HIF_OTHER_EVENTS     (1 << 0)   /* other interrupts (non-Recv) are pending, host
-+                                           needs to read the register table to figure out what */
-+#define HIF_RECV_MSG_AVAIL   (1 << 1)   /* pending recv packet */
-+
-+typedef struct _HIF_PENDING_EVENTS_INFO {
-+    A_UINT32 Events;
-+    A_UINT32 LookAhead;
-+} HIF_PENDING_EVENTS_INFO;
-+
-+    /* function to get pending events , some HIF modules use special mechanisms
-+     * to detect packet available and other interrupts */
-+typedef A_STATUS ( *HIF_PENDING_EVENTS_FUNC)(HIF_DEVICE              *device,
-+                                             HIF_PENDING_EVENTS_INFO *pEvents,
-+                                             void                    *AsyncContext);
-+
-+#define HIF_MASK_RECV    TRUE
-+#define HIF_UNMASK_RECV  FALSE
-+    /* function to mask recv events */
-+typedef A_STATUS ( *HIF_MASK_UNMASK_RECV_EVENT)(HIF_DEVICE  *device,
-+                                                A_BOOL      Mask,
-+                                                void        *AsyncContext);
-+
-+
-+/*
-+ * This API is used by the HTC layer to initialize the HIF layer and to
-+ * register different callback routines. Support for following events has
-+ * been captured - DSR, Read/Write completion, Device insertion/removal,
-+ * Device suspension/resumption/wakeup. In addition to this, the API is
-+ * also used to register the name and the revision of the chip. The latter
-+ * can be used to verify the revision of the chip read from the device
-+ * before reporting it to HTC.
-+ */
-+int HIFInit(HTC_CALLBACKS *callbacks);
-+
-+/*
-+ * This API is used to provide the read/write interface over the specific bus
-+ * interface.
-+ * address - Starting address in the dragon's address space. For mailbox
-+ *           writes, it refers to the start of the mbox boundary. It should
-+ *           be ensured that the last byte falls on the mailbox's EOM. For
-+ *           mailbox reads, it refers to the end of the mbox boundary.
-+ * buffer - Pointer to the buffer containg the data to be transmitted or
-+ *          received.
-+ * length - Amount of data to be transmitted or received.
-+ * request - Characterizes the attributes of the command.
-+ */
-+A_STATUS
-+HIFReadWrite(HIF_DEVICE    *device,
-+             A_UINT32       address,
-+             A_UCHAR       *buffer,
-+             A_UINT32       length,
-+             A_UINT32       request,
-+             void          *context);
-+
-+/*
-+ * This can be initiated from the unload driver context ie when the HTCShutdown
-+ * routine is called.
-+ */
-+void HIFShutDownDevice(HIF_DEVICE *device);
-+
-+/*
-+ * This should translate to an acknowledgment to the bus driver indicating that
-+ * the previous interrupt request has been serviced and the all the relevant
-+ * sources have been cleared. HTC is ready to process more interrupts.
-+ * This should prevent the bus driver from raising an interrupt unless the
-+ * previous one has been serviced and acknowledged using the previous API.
-+ */
-+void HIFAckInterrupt(HIF_DEVICE *device);
-+
-+void HIFMaskInterrupt(HIF_DEVICE *device);
-+
-+void HIFUnMaskInterrupt(HIF_DEVICE *device);
-+
-+/*
-+ * This set of functions are to be used by the bus driver to notify
-+ * the HIF module about various events.
-+ * These are not implemented if the bus driver provides an alternative
-+ * way for this notification though callbacks for instance.
-+ */
-+int HIFInsertEventNotify(void);
-+
-+int HIFRemoveEventNotify(void);
-+
-+int HIFIRQEventNotify(void);
-+
-+int HIFRWCompleteEventNotify(void);
-+
-+/*
-+ * This function associates a opaque handle with the HIF layer
-+ * to be used in communication with upper layer i.e. HTC.
-+ * This would normaly be a pointer to htc_target data structure.
-+ */
-+void HIFSetHandle(void *hif_handle, void *handle);
-+
-+A_STATUS
-+HIFConfigureDevice(HIF_DEVICE *device, HIF_DEVICE_CONFIG_OPCODE opcode,
-+                   void *config, A_UINT32 configLen);
-+
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _HIF_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/host_version.h b/drivers/sdio/function/wlan/ar6000/include/host_version.h
-new file mode 100644
-index 0000000..c090115
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/host_version.h
-@@ -0,0 +1,49 @@
-+#ifndef _HOST_VERSION_H_
-+#define _HOST_VERSION_H_
-+/*
-+ * Copyright (c) 2004-2005 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * This file contains version information for the sample host driver for the
-+ * AR6000 chip
-+ *
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/include/host_version.h#2 $
-+ *
-+ *
-+ *  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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include <AR6K_version.h>
-+
-+/*
-+ * The version number is made up of major, minor, patch and build
-+ * numbers. These are 16 bit numbers.  The build and release script will
-+ * set the build number using a Perforce counter.  Here the build number is
-+ * set to 9999 so that builds done without the build-release script are easily
-+ * identifiable.
-+ */
-+
-+#define ATH_SW_VER_MAJOR      __VER_MAJOR_
-+#define ATH_SW_VER_MINOR      __VER_MINOR_
-+#define ATH_SW_VER_PATCH      __VER_PATCH_
-+#define ATH_SW_VER_BUILD 9999
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _HOST_VERSION_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/htc.h b/drivers/sdio/function/wlan/ar6000/include/htc.h
-new file mode 100644
-index 0000000..152d867
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/htc.h
-@@ -0,0 +1,190 @@
-+/*
-+ * Copyright (c) 2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ */
-+
-+
-+#ifndef __HTC_H__
-+#define __HTC_H__
-+
-+#ifndef ATH_TARGET
-+#include "athstartpack.h"
-+#endif
-+
-+#define A_OFFSETOF(type,field) (int)(&(((type *)NULL)->field))
-+
-+#define ASSEMBLE_UNALIGNED_UINT16(p,highbyte,lowbyte) \
-+        (((A_UINT16)(((A_UINT8 *)(p))[(highbyte)])) << 8 | (A_UINT16)(((A_UINT8 *)(p))[(lowbyte)]))
-+
-+/* alignment independent macros (little-endian) to fetch UINT16s or UINT8s from a
-+ * structure using only the type and field name.
-+ * Use these macros if there is the potential for unaligned buffer accesses. */
-+#define A_GET_UINT16_FIELD(p,type,field) \
-+    ASSEMBLE_UNALIGNED_UINT16(p,\
-+                              A_OFFSETOF(type,field) + 1, \
-+                              A_OFFSETOF(type,field))
-+
-+#define A_SET_UINT16_FIELD(p,type,field,value) \
-+{                                              \
-+    ((A_UINT8 *)(p))[A_OFFSETOF(type,field)] = (A_UINT8)(value);        \
-+    ((A_UINT8 *)(p))[A_OFFSETOF(type,field) + 1] = (A_UINT8)((value) >> 8); \
-+}
-+
-+#define A_GET_UINT8_FIELD(p,type,field) \
-+            ((A_UINT8 *)(p))[A_OFFSETOF(type,field)]
-+
-+#define A_SET_UINT8_FIELD(p,type,field,value) \
-+    ((A_UINT8 *)(p))[A_OFFSETOF(type,field)] = (value)
-+
-+/****** DANGER DANGER ***************
-+ *
-+ *   The frame header length and message formats defined herein were
-+ *   selected to accommodate optimal alignment for target processing.  This reduces code
-+ *   size and improves performance.
-+ *
-+ *   Any changes to the header length may alter the alignment and cause exceptions
-+ *   on the target. When adding to the message structures insure that fields are
-+ *   properly aligned.
-+ *
-+ */
-+
-+/* HTC frame header */
-+typedef PREPACK struct _HTC_FRAME_HDR{
-+        /* do not remove or re-arrange these fields, these are minimally required
-+         * to take advantage of 4-byte lookaheads in some hardware implementations */
-+    A_UINT8   EndpointID;
-+    A_UINT8   Flags;
-+    A_UINT16  PayloadLen;       /* length of data (including trailer) that follows the header */
-+
-+    /***** end of 4-byte lookahead ****/
-+
-+    A_UINT8   ControlBytes[2];
-+
-+    /* message payload starts after the header */
-+
-+} POSTPACK HTC_FRAME_HDR;
-+
-+/* frame header flags */
-+#define HTC_FLAGS_NEED_CREDIT_UPDATE (1 << 0)
-+#define HTC_FLAGS_RECV_TRAILER       (1 << 1)
-+
-+
-+#define HTC_HDR_LENGTH  (sizeof(HTC_FRAME_HDR))
-+#define HTC_MAX_TRAILER_LENGTH   255
-+#define HTC_MAX_PAYLOAD_LENGTH   (2048 - sizeof(HTC_FRAME_HDR))
-+
-+/* HTC control message IDs */
-+typedef enum {
-+    HTC_MSG_READY_ID = 1,
-+    HTC_MSG_CONNECT_SERVICE_ID = 2,
-+    HTC_MSG_CONNECT_SERVICE_RESPONSE_ID = 3,
-+    HTC_MSG_SETUP_COMPLETE_ID = 4,
-+} HTC_MSG_IDS;
-+
-+#define HTC_MAX_CONTROL_MESSAGE_LENGTH  256
-+
-+/* base message ID header */
-+typedef PREPACK struct {
-+    A_UINT16 MessageID;
-+} POSTPACK HTC_UNKNOWN_MSG;
-+
-+/* HTC ready message
-+ * direction : target-to-host  */
-+typedef PREPACK struct {
-+    A_UINT16  MessageID;    /* ID */
-+    A_UINT16  CreditCount;  /* number of credits the target can offer */
-+    A_UINT16  CreditSize;   /* size of each credit */
-+    A_UINT8   MaxEndpoints; /* maximum number of endpoints the target has resources for */
-+    A_UINT8   _Pad1;
-+} POSTPACK HTC_READY_MSG;
-+
-+#define HTC_SERVICE_META_DATA_MAX_LENGTH 128
-+
-+/* connect service
-+ * direction : host-to-target */
-+typedef PREPACK struct {
-+    A_UINT16  MessageID;
-+    A_UINT16  ServiceID;           /* service ID of the service to connect to */
-+    A_UINT16  ConnectionFlags;     /* connection flags */
-+
-+#define HTC_CONNECT_FLAGS_REDUCE_CREDIT_DRIBBLE (1 << 2)  /* reduce credit dribbling when
-+                                                             the host needs credits */
-+#define HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_MASK             (0x3)
-+#define HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_ONE_FOURTH        0x0
-+#define HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_ONE_HALF          0x1
-+#define HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_THREE_FOURTHS     0x2
-+#define HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_UNITY             0x3
-+
-+    A_UINT8   ServiceMetaLength;   /* length of meta data that follows */
-+    A_UINT8   _Pad1;
-+
-+    /* service-specific meta data starts after the header */
-+
-+} POSTPACK HTC_CONNECT_SERVICE_MSG;
-+
-+/* connect response
-+ * direction : target-to-host */
-+typedef PREPACK struct {
-+    A_UINT16  MessageID;
-+    A_UINT16  ServiceID;            /* service ID that the connection request was made */
-+    A_UINT8   Status;               /* service connection status */
-+    A_UINT8   EndpointID;           /* assigned endpoint ID */
-+    A_UINT16  MaxMsgSize;           /* maximum expected message size on this endpoint */
-+    A_UINT8   ServiceMetaLength;    /* length of meta data that follows */
-+    A_UINT8   _Pad1;
-+
-+    /* service-specific meta data starts after the header */
-+
-+} POSTPACK HTC_CONNECT_SERVICE_RESPONSE_MSG;
-+
-+typedef PREPACK struct {
-+    A_UINT16  MessageID;
-+    /* currently, no other fields */
-+} POSTPACK HTC_SETUP_COMPLETE_MSG;
-+
-+
-+/* connect response status codes */
-+#define HTC_SERVICE_SUCCESS      0  /* success */
-+#define HTC_SERVICE_NOT_FOUND    1  /* service could not be found */
-+#define HTC_SERVICE_FAILED       2  /* specific service failed the connect */
-+#define HTC_SERVICE_NO_RESOURCES 3  /* no resources (i.e. no more endpoints) */
-+#define HTC_SERVICE_NO_MORE_EP   4  /* specific service is not allowing any more
-+                                       endpoints */
-+
-+/* report record IDs */
-+typedef enum {
-+    HTC_RECORD_NULL  = 0,
-+    HTC_RECORD_CREDITS   = 1,
-+    HTC_RECORD_LOOKAHEAD = 2,
-+} HTC_RPT_IDS;
-+
-+typedef PREPACK struct {
-+    A_UINT8 RecordID;     /* Record ID */
-+    A_UINT8 Length;       /* Length of record */
-+} POSTPACK HTC_RECORD_HDR;
-+
-+typedef PREPACK struct {
-+    A_UINT8 EndpointID;     /* Endpoint that owns these credits */
-+    A_UINT8 Credits;        /* credits to report since last report */
-+} POSTPACK HTC_CREDIT_REPORT;
-+
-+typedef PREPACK struct {
-+    A_UINT8 PreValid;         /* pre valid guard */
-+    A_UINT8 LookAhead[4];     /* 4 byte lookahead */
-+    A_UINT8 PostValid;        /* post valid guard */
-+
-+   /* NOTE: the LookAhead array is guarded by a PreValid and Post Valid guard bytes.
-+    * The PreValid bytes must equal the inverse of the PostValid byte */
-+
-+} POSTPACK HTC_LOOKAHEAD_REPORT;
-+
-+#ifndef ATH_TARGET
-+#include "athendpack.h"
-+#endif
-+
-+
-+#endif /* __HTC_H__ */
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/include/htc_api.h b/drivers/sdio/function/wlan/ar6000/include/htc_api.h
-new file mode 100644
-index 0000000..73b7df6
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/htc_api.h
-@@ -0,0 +1,436 @@
-+/*
-+ *
-+ * Copyright (c) 2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef _HTC_API_H_
-+#define _HTC_API_H_
-+
-+#include <htc.h>
-+#include <htc_services.h>
-+#include "htc_packet.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-+
-+/* TODO.. for BMI */
-+#define ENDPOINT1 0
-+// TODO -remove me, but we have to fix BMI first
-+#define HTC_MAILBOX_NUM_MAX    4
-+
-+
-+/* ------ Endpoint IDS ------ */
-+typedef enum
-+{
-+    ENDPOINT_UNUSED = -1,
-+    ENDPOINT_0 = 0,
-+    ENDPOINT_1 = 1,
-+    ENDPOINT_2 = 2,
-+    ENDPOINT_3,
-+    ENDPOINT_4,
-+    ENDPOINT_5,
-+    ENDPOINT_6,
-+    ENDPOINT_7,
-+    ENDPOINT_8,
-+    ENDPOINT_MAX,
-+} HTC_ENDPOINT_ID;
-+
-+/* this is the amount of header room required by users of HTC */
-+#define HTC_HEADER_LEN         HTC_HDR_LENGTH
-+
-+typedef void *HTC_HANDLE;
-+
-+typedef A_UINT16 HTC_SERVICE_ID;
-+
-+typedef struct _HTC_INIT_INFO {
-+    void   (*AddInstance)(HTC_HANDLE);
-+    void   (*DeleteInstance)(void *Instance);
-+    void   (*TargetFailure)(void *Instance, A_STATUS Status);
-+} HTC_INIT_INFO;
-+
-+/* per service connection send completion */
-+typedef void   (*HTC_EP_SEND_PKT_COMPLETE)(void *,HTC_PACKET *);
-+/* per service connection pkt received */
-+typedef void   (*HTC_EP_RECV_PKT)(void *,HTC_PACKET *);
-+
-+/* Optional per service connection receive buffer re-fill callback,
-+ * On some OSes (like Linux) packets are allocated from a global pool and indicated up
-+ * to the network stack.  The driver never gets the packets back from the OS.  For these OSes
-+ * a refill callback can be used to allocate and re-queue buffers into HTC.
-+ *
-+ * On other OSes, the network stack can call into the driver's OS-specifc "return_packet" handler and
-+ * the driver can re-queue these buffers into HTC. In this regard a refill callback is
-+ * unnecessary */
-+typedef void   (*HTC_EP_RECV_REFILL)(void *, HTC_ENDPOINT_ID Endpoint);
-+
-+/* Optional per service connection callback when a send queue is full. This can occur if the
-+ * host continues queueing up TX packets faster than credits can arrive
-+ * To prevent the host (on some Oses like Linux) from continuously queueing packets
-+ * and consuming resources, this callback is provided so that that the host
-+ * can disable TX in the subsystem (i.e. network stack)
-+ * Other OSes require a "per-packet" indication_RAW_STREAM_NUM_MAX for each completed TX packet, this
-+ * closed loop mechanism will prevent the network stack from overunning the NIC */
-+typedef void (*HTC_EP_SEND_QUEUE_FULL)(void *, HTC_ENDPOINT_ID Endpoint);
-+
-+typedef struct _HTC_EP_CALLBACKS {
-+    void                     *pContext;     /* context for each callback */
-+    HTC_EP_SEND_PKT_COMPLETE EpTxComplete;  /* tx completion callback for connected endpoint */
-+    HTC_EP_RECV_PKT          EpRecv;        /* receive callback for connected endpoint */
-+    HTC_EP_RECV_REFILL       EpRecvRefill;  /* OPTIONAL receive re-fill callback for connected endpoint */
-+    HTC_EP_SEND_QUEUE_FULL   EpSendFull;    /* OPTIONAL send full callback */
-+} HTC_EP_CALLBACKS;
-+
-+/* service connection information */
-+typedef struct _HTC_SERVICE_CONNECT_REQ {
-+    HTC_SERVICE_ID   ServiceID;                 /* service ID to connect to */
-+    A_UINT16         ConnectionFlags;           /* connection flags, see htc protocol definition */
-+    A_UINT8         *pMetaData;                 /* ptr to optional service-specific meta-data */
-+    A_UINT8          MetaDataLength;            /* optional meta data length */
-+    HTC_EP_CALLBACKS EpCallbacks;               /* endpoint callbacks */
-+    int              MaxSendQueueDepth;         /* maximum depth of any send queue */
-+} HTC_SERVICE_CONNECT_REQ;
-+
-+/* service connection response information */
-+typedef struct _HTC_SERVICE_CONNECT_RESP {
-+    A_UINT8     *pMetaData;             /* caller supplied buffer to optional meta-data */
-+    A_UINT8     BufferLength;           /* length of caller supplied buffer */
-+    A_UINT8     ActualLength;           /* actual length of meta data */
-+    HTC_ENDPOINT_ID Endpoint;           /* endpoint to communicate over */
-+    int         MaxMsgLength;           /* max length of all messages over this endpoint */
-+    A_UINT8     ConnectRespCode;        /* connect response code from target */
-+} HTC_SERVICE_CONNECT_RESP;
-+
-+/* endpoint distribution structure */
-+typedef struct _HTC_ENDPOINT_CREDIT_DIST {
-+    struct _HTC_ENDPOINT_CREDIT_DIST *pNext;
-+    struct _HTC_ENDPOINT_CREDIT_DIST *pPrev;
-+    HTC_SERVICE_ID      ServiceID;          /* Service ID (set by HTC) */
-+    HTC_ENDPOINT_ID     Endpoint;           /* endpoint for this distribution struct (set by HTC) */
-+    A_UINT32            DistFlags;          /* distribution flags, distribution function can
-+                                               set default activity using SET_EP_ACTIVE() macro */
-+    int                 TxCreditsNorm;      /* credits for normal operation, anything above this
-+                                               indicates the endpoint is over-subscribed, this field
-+                                               is only relevant to the credit distribution function */
-+    int                 TxCreditsMin;       /* floor for credit distribution, this field is
-+                                               only relevant to the credit distribution function */
-+    int                 TxCreditsAssigned;  /* number of credits assigned to this EP, this field
-+                                               is only relevant to the credit dist function */
-+    int                 TxCredits;          /* current credits available, this field is used by
-+                                               HTC to determine whether a message can be sent or
-+                                               must be queued */
-+    int                 TxCreditsToDist;    /* pending credits to distribute on this endpoint, this
-+                                               is set by HTC when credit reports arrive.
-+                                               The credit distribution functions sets this to zero
-+                                               when it distributes the credits */
-+    int                 TxCreditsSeek;      /* this is the number of credits that the current pending TX
-+                                               packet needs to transmit.  This is set by HTC when
-+                                               and endpoint needs credits in order to transmit */
-+    int                 TxCreditSize;       /* size in bytes of each credit (set by HTC) */
-+    int                 TxCreditsPerMaxMsg; /* credits required for a maximum sized messages (set by HTC) */
-+    void                *pHTCReserved;      /* reserved for HTC use */
-+} HTC_ENDPOINT_CREDIT_DIST;
-+
-+#define HTC_EP_ACTIVE                            (1 << 31)
-+
-+/* macro to check if an endpoint has gone active, useful for credit
-+ * distributions */
-+#define IS_EP_ACTIVE(epDist)  ((epDist)->DistFlags & HTC_EP_ACTIVE)
-+#define SET_EP_ACTIVE(epDist) (epDist)->DistFlags |= HTC_EP_ACTIVE
-+
-+    /* credit distibution code that is passed into the distrbution function,
-+     * there are mandatory and optional codes that must be handled */
-+typedef enum _HTC_CREDIT_DIST_REASON {
-+    HTC_CREDIT_DIST_SEND_COMPLETE = 0,     /* credits available as a result of completed
-+                                              send operations (MANDATORY) resulting in credit reports */
-+    HTC_CREDIT_DIST_ACTIVITY_CHANGE = 1,   /* a change in endpoint activity occured (OPTIONAL) */
-+    HTC_CREDIT_DIST_SEEK_CREDITS,          /* an endpoint needs to "seek" credits (OPTIONAL) */
-+    HTC_DUMP_CREDIT_STATE                  /* for debugging, dump any state information that is kept by
-+                                              the distribution function */
-+} HTC_CREDIT_DIST_REASON;
-+
-+typedef void (*HTC_CREDIT_DIST_CALLBACK)(void                     *Context,
-+                                         HTC_ENDPOINT_CREDIT_DIST *pEPList,
-+                                         HTC_CREDIT_DIST_REASON   Reason);
-+
-+typedef void (*HTC_CREDIT_INIT_CALLBACK)(void *Context,
-+                                         HTC_ENDPOINT_CREDIT_DIST *pEPList,
-+                                         int                      TotalCredits);
-+
-+    /* endpoint statistics action */
-+typedef enum _HTC_ENDPOINT_STAT_ACTION {
-+    HTC_EP_STAT_SAMPLE = 0,                /* only read statistics */
-+    HTC_EP_STAT_SAMPLE_AND_CLEAR = 1,      /* sample and immediately clear statistics */
-+    HTC_EP_STAT_CLEAR                      /* clear only */
-+} HTC_ENDPOINT_STAT_ACTION;
-+
-+    /* endpoint statistics */
-+typedef struct _HTC_ENDPOINT_STATS {
-+    A_UINT32  TxCreditLowIndications;  /* number of times the host set the credit-low flag in a send message on
-+                                        this endpoint */
-+    A_UINT32  TxIssued;               /* running count of TX packets issued */
-+    A_UINT32  TxCreditRpts;           /* running count of total credit reports received for this endpoint */
-+    A_UINT32  TxCreditRptsFromRx;
-+    A_UINT32  TxCreditRptsFromOther;
-+    A_UINT32  TxCreditRptsFromEp0;
-+    A_UINT32  TxCreditsFromRx;        /* count of credits received via Rx packets on this endpoint */
-+    A_UINT32  TxCreditsFromOther;     /* count of credits received via another endpoint */
-+    A_UINT32  TxCreditsFromEp0;       /* count of credits received via another endpoint */
-+    A_UINT32  TxCreditsConsummed;     /* count of consummed credits */
-+    A_UINT32  TxCreditsReturned;      /* count of credits returned */
-+    A_UINT32  RxReceived;             /* count of RX packets received */
-+    A_UINT32  RxLookAheads;           /* count of lookahead records
-+                                         found in messages received on this endpoint */
-+} HTC_ENDPOINT_STATS;
-+
-+/* ------ Function Prototypes ------ */
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Initialize HTC
-+  @function name: HTCInit
-+  @input:  pInfo - initialization information
-+  @output:
-+  @return: A_OK on success
-+  @notes: The caller initializes global HTC state and registers various instance
-+          notification callbacks (see HTC_INIT_INFO).
-+
-+  @example:
-+  @see also: HTCShutdown
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+A_STATUS    HTCInit(HTC_INIT_INFO *pInfo);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Get the underlying HIF device handle
-+  @function name: HTCGetHifDevice
-+  @input:  HTCHandle - handle passed into the AddInstance callback
-+  @output:
-+  @return: opaque HIF device handle usable in HIF API calls.
-+  @notes:
-+  @example:
-+  @see also:
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void       *HTCGetHifDevice(HTC_HANDLE HTCHandle);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Set the associated instance for the HTC handle
-+  @function name: HTCSetInstance
-+  @input:  HTCHandle - handle passed into the AddInstance callback
-+           Instance - caller supplied instance object
-+  @output:
-+  @return:
-+  @notes:  Caller must set the instance information for the HTC handle in order to receive
-+           notifications for instance deletion (DeleteInstance callback is called) and for target
-+           failure notification.
-+  @example:
-+  @see also:
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void        HTCSetInstance(HTC_HANDLE HTCHandle, void *Instance);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Set credit distribution parameters
-+  @function name: HTCSetCreditDistribution
-+  @input:  HTCHandle - HTC handle
-+           pCreditDistCont - caller supplied context to pass into distribution functions
-+           CreditDistFunc - Distribution function callback
-+           CreditDistInit - Credit Distribution initialization callback
-+           ServicePriorityOrder - Array containing list of service IDs, lowest index is highest
-+                                  priority
-+           ListLength - number of elements in ServicePriorityOrder
-+  @output:
-+  @return:
-+  @notes:  The user can set a custom credit distribution function to handle special requirements
-+           for each endpoint.  A default credit distribution routine can be used by setting
-+           CreditInitFunc to NULL.  The default credit distribution is only provided for simple
-+           "fair" credit distribution without regard to any prioritization.
-+
-+  @example:
-+  @see also:
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void        HTCSetCreditDistribution(HTC_HANDLE               HTCHandle,
-+                                     void                     *pCreditDistContext,
-+                                     HTC_CREDIT_DIST_CALLBACK CreditDistFunc,
-+                                     HTC_CREDIT_INIT_CALLBACK CreditInitFunc,
-+                                     HTC_SERVICE_ID           ServicePriorityOrder[],
-+                                     int                      ListLength);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Wait for the target to indicate the HTC layer is ready
-+  @function name: HTCWaitTarget
-+  @input:  HTCHandle - HTC handle
-+  @output:
-+  @return:
-+  @notes:  This API blocks until the target responds with an HTC ready message.
-+           The caller should not connect services until the target has indicated it is
-+           ready.
-+  @example:
-+  @see also: HTCConnectService
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+A_STATUS    HTCWaitTarget(HTC_HANDLE HTCHandle);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Start target service communications
-+  @function name: HTCStart
-+  @input:  HTCHandle - HTC handle
-+  @output:
-+  @return:
-+  @notes: This API indicates to the target that the service connection phase is complete
-+          and the target can freely start all connected services.  This API should only be
-+          called AFTER all service connections have been made.  TCStart will issue a
-+          SETUP_COMPLETE message to the target to indicate that all service connections
-+          have been made and the target can start communicating over the endpoints.
-+  @example:
-+  @see also: HTCConnectService
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+A_STATUS    HTCStart(HTC_HANDLE HTCHandle);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Add receive packet to HTC
-+  @function name: HTCAddReceivePkt
-+  @input:  HTCHandle - HTC handle
-+           pPacket - HTC receive packet to add
-+  @output:
-+  @return: A_OK on success
-+  @notes:  user must supply HTC packets for capturing incomming HTC frames.  The caller
-+           must initialize each HTC packet using the SET_HTC_PACKET_INFO_RX_REFILL()
-+           macro.
-+  @example:
-+  @see also:
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+A_STATUS    HTCAddReceivePkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Connect to an HTC service
-+  @function name: HTCConnectService
-+  @input:  HTCHandle - HTC handle
-+           pReq - connection details
-+  @output: pResp - connection response
-+  @return:
-+  @notes:  Service connections must be performed before HTCStart.  User provides callback handlers
-+           for various endpoint events.
-+  @example:
-+  @see also: HTCStart
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+A_STATUS    HTCConnectService(HTC_HANDLE HTCHandle,
-+                              HTC_SERVICE_CONNECT_REQ  *pReq,
-+                              HTC_SERVICE_CONNECT_RESP *pResp);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Send an HTC packet
-+  @function name: HTCSendPkt
-+  @input:  HTCHandle - HTC handle
-+           pPacket - packet to send
-+  @output:
-+  @return: A_OK
-+  @notes:  Caller must initialize packet using SET_HTC_PACKET_INFO_TX() macro.
-+           This interface is fully asynchronous.  On error, HTC SendPkt will
-+           call the registered Endpoint callback to cleanup the packet.
-+  @example:
-+  @see also: HTCFlushEndpoint
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+A_STATUS    HTCSendPkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Stop HTC service communications
-+  @function name: HTCStop
-+  @input:  HTCHandle - HTC handle
-+  @output:
-+  @return:
-+  @notes: HTC communications is halted.  All receive and pending TX packets will
-+          be flushed.
-+  @example:
-+  @see also:
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void        HTCStop(HTC_HANDLE HTCHandle);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Shutdown HTC
-+  @function name: HTCShutdown
-+  @input:
-+  @output:
-+  @return:
-+  @notes:  This cleans up all resources allocated by HTCInit().
-+  @example:
-+  @see also: HTCInit
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void        HTCShutDown(void);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Flush pending TX packets
-+  @function name: HTCFlushEndpoint
-+  @input:  HTCHandle - HTC handle
-+           Endpoint - Endpoint to flush
-+           Tag - flush tag
-+  @output:
-+  @return:
-+  @notes:  The Tag parameter is used to selectively flush packets with matching tags.
-+           The value of 0 forces all packets to be flush regardless of tag.
-+  @example:
-+  @see also: HTCSendPkt
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void        HTCFlushEndpoint(HTC_HANDLE HTCHandle, HTC_ENDPOINT_ID Endpoint, HTC_TX_TAG Tag);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Dump credit distribution state
-+  @function name: HTCDumpCreditStates
-+  @input:  HTCHandle - HTC handle
-+  @output:
-+  @return:
-+  @notes:  This dumps all credit distribution information to the debugger
-+  @example:
-+  @see also:
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void        HTCDumpCreditStates(HTC_HANDLE HTCHandle);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Indicate a traffic activity change on an endpoint
-+  @function name: HTCIndicateActivityChange
-+  @input:  HTCHandle - HTC handle
-+           Endpoint - endpoint in which activity has changed
-+           Active - TRUE if active, FALSE if it has become inactive
-+  @output:
-+  @return:
-+  @notes:  This triggers the registered credit distribution function to
-+           re-adjust credits for active/inactive endpoints.
-+  @example:
-+  @see also:
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void        HTCIndicateActivityChange(HTC_HANDLE      HTCHandle,
-+                                      HTC_ENDPOINT_ID Endpoint,
-+                                      A_BOOL          Active);
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Get endpoint statistics
-+  @function name: HTCGetEndpointStatistics
-+  @input:  HTCHandle - HTC handle
-+           Endpoint - Endpoint identifier
-+           Action - action to take with statistics
-+  @output:
-+           pStats - statistics that were sampled (can be NULL if Action is HTC_EP_STAT_CLEAR)
-+
-+  @return: TRUE if statistics profiling is enabled, otherwise FALSE.
-+
-+  @notes:  Statistics is a compile-time option and this function may return FALSE
-+           if HTC is not compiled with profiling.
-+
-+           The caller can specify the statistic "action" to take when sampling
-+           the statistics.  This includes:
-+
-+           HTC_EP_STAT_SAMPLE: The pStats structure is filled with the current values.
-+           HTC_EP_STAT_SAMPLE_AND_CLEAR: The structure is filled and the current statistics
-+                             are cleared.
-+           HTC_EP_STAT_CLEA : the statistics are cleared, the called can pass a NULL value for
-+                   pStats
-+
-+  @example:
-+  @see also:
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+A_BOOL       HTCGetEndpointStatistics(HTC_HANDLE               HTCHandle,
-+                                      HTC_ENDPOINT_ID          Endpoint,
-+                                      HTC_ENDPOINT_STAT_ACTION Action,
-+                                      HTC_ENDPOINT_STATS       *pStats);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _HTC_API_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/htc_packet.h b/drivers/sdio/function/wlan/ar6000/include/htc_packet.h
-new file mode 100644
-index 0000000..9ce8718
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/htc_packet.h
-@@ -0,0 +1,138 @@
-+/*
-+ *
-+ * Copyright (c) 2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef HTC_PACKET_H_
-+#define HTC_PACKET_H_
-+
-+
-+#include "dl_list.h"
-+
-+struct _HTC_PACKET;
-+
-+typedef void (* HTC_PACKET_COMPLETION)(void *,struct _HTC_PACKET *);
-+
-+typedef A_UINT16 HTC_TX_TAG;
-+
-+typedef struct _HTC_TX_PACKET_INFO {
-+    HTC_TX_TAG    Tag;            /* tag used to selective flush packets */
-+} HTC_TX_PACKET_INFO;
-+
-+#define HTC_TX_PACKET_TAG_ALL          0    /* a tag of zero is reserved and used to flush ALL packets */
-+#define HTC_TX_PACKET_TAG_INTERNAL     1                                /* internal tags start here */
-+#define HTC_TX_PACKET_TAG_USER_DEFINED (HTC_TX_PACKET_TAG_INTERNAL + 9) /* user-defined tags start here */
-+
-+typedef struct _HTC_RX_PACKET_INFO {
-+    A_UINT32    Unused;          /* for future use and to make compilers happy */
-+} HTC_RX_PACKET_INFO;
-+
-+/* wrapper around endpoint-specific packets */
-+typedef struct _HTC_PACKET {
-+    DL_LIST         ListLink;       /* double link */
-+    void            *pPktContext;   /* caller's per packet specific context */
-+
-+    A_UINT8         *pBufferStart;  /* the true buffer start , the caller can
-+                                       store the real buffer start here.  In
-+                                       receive callbacks, the HTC layer sets pBuffer
-+                                       to the start of the payload past the header. This
-+                                       field allows the caller to reset pBuffer when it
-+                                       recycles receive packets back to HTC */
-+    /*
-+     * Pointer to the start of the buffer. In the transmit
-+     * direction this points to the start of the payload. In the
-+     * receive direction, however, the buffer when queued up
-+     * points to the start of the HTC header but when returned
-+     * to the caller points to the start of the payload
-+     */
-+    A_UINT8         *pBuffer;       /* payload start (RX/TX) */
-+    A_UINT32        BufferLength;   /* length of buffer */
-+    A_UINT32        ActualLength;   /* actual length of payload */
-+    int             Endpoint;       /* endpoint that this packet was sent/recv'd from */
-+    A_STATUS        Status;         /* completion status */
-+    union {
-+        HTC_TX_PACKET_INFO  AsTx;   /* Tx Packet specific info */
-+        HTC_RX_PACKET_INFO  AsRx;   /* Rx Packet specific info */
-+    } PktInfo;
-+
-+    /* the following fields are for internal HTC use */
-+    HTC_PACKET_COMPLETION Completion;   /* completion */
-+    void                  *pContext;    /* HTC private completion context */
-+    A_UINT32              HTCReserved;  /* reserved */
-+} HTC_PACKET;
-+
-+
-+
-+#define COMPLETE_HTC_PACKET(p,status)        \
-+{                                            \
-+    (p)->Status = (status);                  \
-+    (p)->Completion((p)->pContext,(p));      \
-+}
-+
-+#define INIT_HTC_PACKET_INFO(p,b,len)             \
-+{                                                 \
-+    (p)->pBufferStart = (b);                      \
-+    (p)->BufferLength = (len);                    \
-+}
-+
-+/* macro to set an initial RX packet for refilling HTC */
-+#define SET_HTC_PACKET_INFO_RX_REFILL(p,c,b,len,ep) \
-+{                                                 \
-+    (p)->pPktContext = (c);                       \
-+    (p)->pBuffer = (b);                           \
-+    (p)->pBufferStart = (b);                      \
-+    (p)->BufferLength = (len);                    \
-+    (p)->Endpoint = (ep);                         \
-+}
-+
-+/* fast macro to recycle an RX packet that will be re-queued to HTC */
-+#define HTC_PACKET_RESET_RX(p)              \
-+    (p)->pBuffer = (p)->pBufferStart
-+
-+/* macro to set packet parameters for TX */
-+#define SET_HTC_PACKET_INFO_TX(p,c,b,len,ep,tag)  \
-+{                                                 \
-+    (p)->pPktContext = (c);                       \
-+    (p)->pBuffer = (b);                           \
-+    (p)->ActualLength = (len);                    \
-+    (p)->Endpoint = (ep);                         \
-+    (p)->PktInfo.AsTx.Tag = (tag);                \
-+}
-+
-+/* HTC Packet Queueing Macros */
-+typedef DL_LIST HTC_PACKET_QUEUE;
-+/* initialize queue */
-+#define INIT_HTC_PACKET_QUEUE(pQ) DL_LIST_INIT((pQ))
-+/* enqueue HTC packet to the tail of the queue */
-+#define HTC_PACKET_ENQUEUE(pQ,p)  DL_ListInsertTail((pQ),&(p)->ListLink)
-+/* test if a queue is empty */
-+#define HTC_QUEUE_EMPTY(pQ)       DL_LIST_IS_EMPTY((pQ))
-+/* get packet at head without removing it */
-+#define HTC_GET_PKT_AT_HEAD(pQ)   A_CONTAINING_STRUCT((DL_LIST_GET_ITEM_AT_HEAD(pQ)),HTC_PACKET,ListLink);
-+/* remove a packet from the current list it is linked to */
-+#define HTC_PACKET_REMOVE(p)      DL_ListRemove(&(p)->ListLink)
-+
-+/* dequeue an HTC packet from the head of the queue */
-+static INLINE HTC_PACKET *HTC_PACKET_DEQUEUE(HTC_PACKET_QUEUE *queue) {
-+    DL_LIST    *pItem = DL_ListRemoveItemFromHead(queue);
-+    if (pItem != NULL) {
-+        return A_CONTAINING_STRUCT(pItem, HTC_PACKET, ListLink);
-+    }
-+    return NULL;
-+}
-+
-+#endif /*HTC_PACKET_H_*/
-diff --git a/drivers/sdio/function/wlan/ar6000/include/htc_services.h b/drivers/sdio/function/wlan/ar6000/include/htc_services.h
-new file mode 100644
-index 0000000..fc6fc29
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/htc_services.h
-@@ -0,0 +1,37 @@
-+/*
-+ * Copyright (c) 2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ */
-+
-+#ifndef __HTC_SERVICES_H__
-+#define __HTC_SERVICES_H__
-+
-+/* Current service IDs */
-+
-+typedef enum {
-+    RSVD_SERVICE_GROUP  = 0,
-+    WMI_SERVICE_GROUP   = 1,
-+
-+    HTC_TEST_GROUP = 254,
-+    HTC_SERVICE_GROUP_LAST = 255
-+}HTC_SERVICE_GROUP_IDS;
-+
-+#define MAKE_SERVICE_ID(group,index) \
-+            (int)(((int)group << 8) | (int)(index))
-+
-+/* NOTE: service ID of 0x0000 is reserved and should never be used */
-+#define HTC_CTRL_RSVD_SVC MAKE_SERVICE_ID(RSVD_SERVICE_GROUP,1)
-+#define WMI_CONTROL_SVC   MAKE_SERVICE_ID(WMI_SERVICE_GROUP,0)
-+#define WMI_DATA_BE_SVC   MAKE_SERVICE_ID(WMI_SERVICE_GROUP,1)
-+#define WMI_DATA_BK_SVC   MAKE_SERVICE_ID(WMI_SERVICE_GROUP,2)
-+#define WMI_DATA_VI_SVC   MAKE_SERVICE_ID(WMI_SERVICE_GROUP,3)
-+#define WMI_DATA_VO_SVC   MAKE_SERVICE_ID(WMI_SERVICE_GROUP,4)
-+#define WMI_MAX_SERVICES  5
-+
-+/* raw stream service (i.e. flash, tcmd, calibration apps) */
-+#define HTC_RAW_STREAMS_SVC MAKE_SERVICE_ID(HTC_TEST_GROUP,0)
-+
-+#endif /*HTC_SERVICES_H_*/
-diff --git a/drivers/sdio/function/wlan/ar6000/include/ieee80211.h b/drivers/sdio/function/wlan/ar6000/include/ieee80211.h
-new file mode 100644
-index 0000000..7090040
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/ieee80211.h
-@@ -0,0 +1,342 @@
-+/*-
-+ * Copyright (c) 2001 Atsushi Onoe
-+ * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting
-+ * Copyright (c) 2006 Atheros Communications, Inc.
-+ *
-+ * Wireless Network driver for Atheros AR6001
-+ * All rights reserved.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
-+ *
-+ */
-+#ifndef _NET80211_IEEE80211_H_
-+#define _NET80211_IEEE80211_H_
-+
-+#include "athstartpack.h"
-+
-+/*
-+ * 802.11 protocol definitions.
-+ */
-+
-+#define IEEE80211_ADDR_LEN  6       /* size of 802.11 address */
-+/* is 802.11 address multicast/broadcast? */
-+#define IEEE80211_IS_MULTICAST(_a)  (*(_a) & 0x01)
-+#define IEEE80211_ADDR_EQ(addr1, addr2)     \
-+    (A_MEMCMP(addr1, addr2, IEEE80211_ADDR_LEN) == 0)
-+
-+#define IEEE80211_KEYBUF_SIZE 16
-+#define IEEE80211_MICBUF_SIZE (8+8)  /* space for both tx and rx */
-+
-+/*
-+ * NB: these values are ordered carefully; there are lots of
-+ * of implications in any reordering.  In particular beware
-+ * that 4 is not used to avoid conflicting with IEEE80211_F_PRIVACY.
-+ */
-+#define IEEE80211_CIPHER_WEP            0
-+#define IEEE80211_CIPHER_TKIP           1
-+#define IEEE80211_CIPHER_AES_OCB        2
-+#define IEEE80211_CIPHER_AES_CCM        3
-+#define IEEE80211_CIPHER_CKIP           5
-+#define IEEE80211_CIPHER_CCKM_KRK       6
-+#define IEEE80211_CIPHER_NONE           7       /* pseudo value */
-+
-+#define IEEE80211_CIPHER_MAX            (IEEE80211_CIPHER_NONE+1)
-+
-+#define IEEE80211_IS_VALID_WEP_CIPHER_LEN(len) \
-+        (((len) == 5) || ((len) == 13) || ((len) == 16))
-+
-+
-+
-+/*
-+ * generic definitions for IEEE 802.11 frames
-+ */
-+PREPACK struct ieee80211_frame {
-+    A_UINT8    i_fc[2];
-+    A_UINT8    i_dur[2];
-+    A_UINT8    i_addr1[IEEE80211_ADDR_LEN];
-+    A_UINT8    i_addr2[IEEE80211_ADDR_LEN];
-+    A_UINT8    i_addr3[IEEE80211_ADDR_LEN];
-+    A_UINT8    i_seq[2];
-+    /* possibly followed by addr4[IEEE80211_ADDR_LEN]; */
-+    /* see below */
-+} POSTPACK;
-+
-+#define IEEE80211_FC0_VERSION_MASK          0x03
-+#define IEEE80211_FC0_VERSION_SHIFT         0
-+#define IEEE80211_FC0_VERSION_0             0x00
-+#define IEEE80211_FC0_TYPE_MASK             0x0c
-+#define IEEE80211_FC0_TYPE_SHIFT            2
-+#define IEEE80211_FC0_TYPE_MGT              0x00
-+#define IEEE80211_FC0_TYPE_CTL              0x04
-+#define IEEE80211_FC0_TYPE_DATA             0x08
-+
-+#define IEEE80211_FC0_SUBTYPE_MASK          0xf0
-+#define IEEE80211_FC0_SUBTYPE_SHIFT         4
-+/* for TYPE_MGT */
-+#define IEEE80211_FC0_SUBTYPE_ASSOC_REQ     0x00
-+#define IEEE80211_FC0_SUBTYPE_ASSOC_RESP    0x10
-+#define IEEE80211_FC0_SUBTYPE_REASSOC_REQ   0x20
-+#define IEEE80211_FC0_SUBTYPE_REASSOC_RESP  0x30
-+#define IEEE80211_FC0_SUBTYPE_PROBE_REQ     0x40
-+#define IEEE80211_FC0_SUBTYPE_PROBE_RESP    0x50
-+#define IEEE80211_FC0_SUBTYPE_BEACON        0x80
-+#define IEEE80211_FC0_SUBTYPE_ATIM          0x90
-+#define IEEE80211_FC0_SUBTYPE_DISASSOC      0xa0
-+#define IEEE80211_FC0_SUBTYPE_AUTH          0xb0
-+#define IEEE80211_FC0_SUBTYPE_DEAUTH        0xc0
-+/* for TYPE_CTL */
-+#define IEEE80211_FC0_SUBTYPE_PS_POLL       0xa0
-+#define IEEE80211_FC0_SUBTYPE_RTS           0xb0
-+#define IEEE80211_FC0_SUBTYPE_CTS           0xc0
-+#define IEEE80211_FC0_SUBTYPE_ACK           0xd0
-+#define IEEE80211_FC0_SUBTYPE_CF_END        0xe0
-+#define IEEE80211_FC0_SUBTYPE_CF_END_ACK    0xf0
-+/* for TYPE_DATA (bit combination) */
-+#define IEEE80211_FC0_SUBTYPE_DATA          0x00
-+#define IEEE80211_FC0_SUBTYPE_CF_ACK        0x10
-+#define IEEE80211_FC0_SUBTYPE_CF_POLL       0x20
-+#define IEEE80211_FC0_SUBTYPE_CF_ACPL       0x30
-+#define IEEE80211_FC0_SUBTYPE_NODATA        0x40
-+#define IEEE80211_FC0_SUBTYPE_CFACK         0x50
-+#define IEEE80211_FC0_SUBTYPE_CFPOLL        0x60
-+#define IEEE80211_FC0_SUBTYPE_CF_ACK_CF_ACK 0x70
-+#define IEEE80211_FC0_SUBTYPE_QOS           0x80
-+#define IEEE80211_FC0_SUBTYPE_QOS_NULL      0xc0
-+
-+#define IEEE80211_FC1_DIR_MASK              0x03
-+#define IEEE80211_FC1_DIR_NODS              0x00    /* STA->STA */
-+#define IEEE80211_FC1_DIR_TODS              0x01    /* STA->AP  */
-+#define IEEE80211_FC1_DIR_FROMDS            0x02    /* AP ->STA */
-+#define IEEE80211_FC1_DIR_DSTODS            0x03    /* AP ->AP  */
-+
-+#define IEEE80211_FC1_MORE_FRAG             0x04
-+#define IEEE80211_FC1_RETRY                 0x08
-+#define IEEE80211_FC1_PWR_MGT               0x10
-+#define IEEE80211_FC1_MORE_DATA             0x20
-+#define IEEE80211_FC1_WEP                   0x40
-+#define IEEE80211_FC1_ORDER                 0x80
-+
-+#define IEEE80211_SEQ_FRAG_MASK             0x000f
-+#define IEEE80211_SEQ_FRAG_SHIFT            0
-+#define IEEE80211_SEQ_SEQ_MASK              0xfff0
-+#define IEEE80211_SEQ_SEQ_SHIFT             4
-+
-+#define IEEE80211_NWID_LEN                  32
-+
-+/*
-+ * 802.11 rate set.
-+ */
-+#define IEEE80211_RATE_SIZE     8       /* 802.11 standard */
-+#define IEEE80211_RATE_MAXSIZE  15      /* max rates we'll handle */
-+
-+#define WMM_NUM_AC                  4   /* 4 AC categories */
-+
-+#define WMM_PARAM_ACI_M         0x60    /* Mask for ACI field */
-+#define WMM_PARAM_ACI_S         5   /* Shift for ACI field */
-+#define WMM_PARAM_ACM_M         0x10    /* Mask for ACM bit */
-+#define WMM_PARAM_ACM_S         4       /* Shift for ACM bit */
-+#define WMM_PARAM_AIFSN_M       0x0f    /* Mask for aifsn field */
-+#define WMM_PARAM_LOGCWMIN_M    0x0f    /* Mask for CwMin field (in log) */
-+#define WMM_PARAM_LOGCWMAX_M    0xf0    /* Mask for CwMax field (in log) */
-+#define WMM_PARAM_LOGCWMAX_S    4   /* Shift for CwMax field */
-+
-+#define WMM_AC_TO_TID(_ac) (       \
-+    ((_ac) == WMM_AC_VO) ? 6 : \
-+    ((_ac) == WMM_AC_VI) ? 5 : \
-+    ((_ac) == WMM_AC_BK) ? 1 : \
-+    0)
-+
-+#define TID_TO_WMM_AC(_tid) (      \
-+    ((_tid) < 1) ? WMM_AC_BE : \
-+    ((_tid) < 3) ? WMM_AC_BK : \
-+    ((_tid) < 6) ? WMM_AC_VI : \
-+    WMM_AC_VO)
-+/*
-+ * Management information element payloads.
-+ */
-+
-+enum {
-+    IEEE80211_ELEMID_SSID       = 0,
-+    IEEE80211_ELEMID_RATES      = 1,
-+    IEEE80211_ELEMID_FHPARMS    = 2,
-+    IEEE80211_ELEMID_DSPARMS    = 3,
-+    IEEE80211_ELEMID_CFPARMS    = 4,
-+    IEEE80211_ELEMID_TIM        = 5,
-+    IEEE80211_ELEMID_IBSSPARMS  = 6,
-+    IEEE80211_ELEMID_COUNTRY    = 7,
-+    IEEE80211_ELEMID_CHALLENGE  = 16,
-+    /* 17-31 reserved for challenge text extension */
-+    IEEE80211_ELEMID_PWRCNSTR   = 32,
-+    IEEE80211_ELEMID_PWRCAP     = 33,
-+    IEEE80211_ELEMID_TPCREQ     = 34,
-+    IEEE80211_ELEMID_TPCREP     = 35,
-+    IEEE80211_ELEMID_SUPPCHAN   = 36,
-+    IEEE80211_ELEMID_CHANSWITCH = 37,
-+    IEEE80211_ELEMID_MEASREQ    = 38,
-+    IEEE80211_ELEMID_MEASREP    = 39,
-+    IEEE80211_ELEMID_QUIET      = 40,
-+    IEEE80211_ELEMID_IBSSDFS    = 41,
-+    IEEE80211_ELEMID_ERP        = 42,
-+    IEEE80211_ELEMID_RSN        = 48,
-+    IEEE80211_ELEMID_XRATES     = 50,
-+    IEEE80211_ELEMID_TPC        = 150,
-+    IEEE80211_ELEMID_CCKM       = 156,
-+    IEEE80211_ELEMID_VENDOR     = 221,  /* vendor private */
-+};
-+
-+#define ATH_OUI             0x7f0300        /* Atheros OUI */
-+#define ATH_OUI_TYPE        0x01
-+#define ATH_OUI_SUBTYPE     0x01
-+#define ATH_OUI_VERSION     0x00
-+
-+#define WPA_OUI             0xf25000
-+#define WPA_OUI_TYPE        0x01
-+#define WPA_VERSION         1          /* current supported version */
-+
-+#define WPA_CSE_NULL        0x00
-+#define WPA_CSE_WEP40       0x01
-+#define WPA_CSE_TKIP        0x02
-+#define WPA_CSE_CCMP        0x04
-+#define WPA_CSE_WEP104      0x05
-+
-+#define WPA_ASE_NONE        0x00
-+#define WPA_ASE_8021X_UNSPEC    0x01
-+#define WPA_ASE_8021X_PSK   0x02
-+
-+#define RSN_OUI         0xac0f00
-+#define RSN_VERSION     1       /* current supported version */
-+
-+#define RSN_CSE_NULL        0x00
-+#define RSN_CSE_WEP40       0x01
-+#define RSN_CSE_TKIP        0x02
-+#define RSN_CSE_WRAP        0x03
-+#define RSN_CSE_CCMP        0x04
-+#define RSN_CSE_WEP104      0x05
-+
-+#define RSN_ASE_NONE        0x00
-+#define RSN_ASE_8021X_UNSPEC    0x01
-+#define RSN_ASE_8021X_PSK   0x02
-+
-+#define RSN_CAP_PREAUTH     0x01
-+
-+#define WMM_OUI         0xf25000
-+#define WMM_OUI_TYPE        0x02
-+#define WMM_INFO_OUI_SUBTYPE    0x00
-+#define WMM_PARAM_OUI_SUBTYPE   0x01
-+#define WMM_VERSION     1
-+
-+/* WMM stream classes */
-+#define WMM_NUM_AC  4
-+#define WMM_AC_BE   0       /* best effort */
-+#define WMM_AC_BK   1       /* background */
-+#define WMM_AC_VI   2       /* video */
-+#define WMM_AC_VO   3       /* voice */
-+
-+/* TSPEC related */
-+#define ACTION_CATEGORY_CODE_TSPEC                 17
-+#define ACTION_CODE_TSPEC_ADDTS                    0
-+#define ACTION_CODE_TSPEC_ADDTS_RESP               1
-+#define ACTION_CODE_TSPEC_DELTS                    2
-+
-+typedef enum {
-+    TSPEC_STATUS_CODE_ADMISSION_ACCEPTED = 0,
-+    TSPEC_STATUS_CODE_ADDTS_INVALID_PARAMS = 0x1,
-+    TSPEC_STATUS_CODE_ADDTS_REQUEST_REFUSED = 0x3,
-+    TSPEC_STATUS_CODE_UNSPECIFIED_QOS_RELATED_FAILURE = 0xC8,
-+    TSPEC_STATUS_CODE_REQUESTED_REFUSED_POLICY_CONFIGURATION = 0xC9,
-+    TSPEC_STATUS_CODE_INSUFFCIENT_BANDWIDTH = 0xCA,
-+    TSPEC_STATUS_CODE_INVALID_PARAMS = 0xCB,
-+    TSPEC_STATUS_CODE_DELTS_SENT    = 0x30,
-+    TSPEC_STATUS_CODE_DELTS_RECV    = 0x31,
-+} TSPEC_STATUS_CODE;
-+
-+/*
-+ * WMM/802.11e Tspec Element
-+ */
-+typedef PREPACK struct wmm_tspec_ie_t {
-+    A_UINT8     elementId;
-+    A_UINT8     len;
-+    A_UINT8     oui[3];
-+    A_UINT8     ouiType;
-+    A_UINT8     ouiSubType;
-+    A_UINT8     version;
-+    A_UINT16    tsInfo_info;
-+    A_UINT8     tsInfo_reserved;
-+    A_UINT16    nominalMSDU;
-+    A_UINT16    maxMSDU;
-+    A_UINT32    minServiceInt;
-+    A_UINT32    maxServiceInt;
-+    A_UINT32    inactivityInt;
-+    A_UINT32    suspensionInt;
-+    A_UINT32    serviceStartTime;
-+    A_UINT32    minDataRate;
-+    A_UINT32    meanDataRate;
-+    A_UINT32    peakDataRate;
-+    A_UINT32    maxBurstSize;
-+    A_UINT32    delayBound;
-+    A_UINT32    minPhyRate;
-+    A_UINT16    sba;
-+    A_UINT16    mediumTime;
-+} POSTPACK WMM_TSPEC_IE;
-+
-+
-+/*
-+ * BEACON management packets
-+ *
-+ *  octet timestamp[8]
-+ *  octet beacon interval[2]
-+ *  octet capability information[2]
-+ *  information element
-+ *      octet elemid
-+ *      octet length
-+ *      octet information[length]
-+ */
-+
-+#define IEEE80211_BEACON_INTERVAL(beacon) \
-+    ((beacon)[8] | ((beacon)[9] << 8))
-+#define IEEE80211_BEACON_CAPABILITY(beacon) \
-+    ((beacon)[10] | ((beacon)[11] << 8))
-+
-+#define IEEE80211_CAPINFO_ESS               0x0001
-+#define IEEE80211_CAPINFO_IBSS              0x0002
-+#define IEEE80211_CAPINFO_CF_POLLABLE       0x0004
-+#define IEEE80211_CAPINFO_CF_POLLREQ        0x0008
-+#define IEEE80211_CAPINFO_PRIVACY           0x0010
-+#define IEEE80211_CAPINFO_SHORT_PREAMBLE    0x0020
-+#define IEEE80211_CAPINFO_PBCC              0x0040
-+#define IEEE80211_CAPINFO_CHNL_AGILITY      0x0080
-+/* bits 8-9 are reserved */
-+#define IEEE80211_CAPINFO_SHORT_SLOTTIME    0x0400
-+#define IEEE80211_CAPINFO_APSD              0x0800
-+/* bit 12 is reserved */
-+#define IEEE80211_CAPINFO_DSSSOFDM          0x2000
-+/* bits 14-15 are reserved */
-+
-+/*
-+ * Authentication Modes
-+ */
-+
-+enum ieee80211_authmode {
-+    IEEE80211_AUTH_NONE     = 0,
-+    IEEE80211_AUTH_OPEN     = 1,
-+    IEEE80211_AUTH_SHARED   = 2,
-+    IEEE80211_AUTH_8021X    = 3,
-+    IEEE80211_AUTH_AUTO     = 4,   /* auto-select/accept */
-+    /* NB: these are used only for ioctls */
-+    IEEE80211_AUTH_WPA      = 5,  /* WPA/RSN  w/ 802.1x */
-+    IEEE80211_AUTH_WPA_PSK  = 6,  /* WPA/RSN  w/ PSK */
-+    IEEE80211_AUTH_WPA_CCKM = 7,  /* WPA/RSN IE  w/ CCKM */
-+};
-+
-+#include "athendpack.h"
-+
-+#endif /* _NET80211_IEEE80211_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h b/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h
-new file mode 100644
-index 0000000..dab6747
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h
-@@ -0,0 +1,163 @@
-+/*
-+ * Copyright (c) 2004-2005 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ *
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/os/linux/include/ieee80211_ioctl.h#1 $
-+ */
-+
-+#ifndef _IEEE80211_IOCTL_H_
-+#define _IEEE80211_IOCTL_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/*
-+ * Extracted from the MADWIFI net80211/ieee80211_ioctl.h
-+ */
-+
-+/*
-+ * WPA/RSN get/set key request.  Specify the key/cipher
-+ * type and whether the key is to be used for sending and/or
-+ * receiving.  The key index should be set only when working
-+ * with global keys (use IEEE80211_KEYIX_NONE for ``no index'').
-+ * Otherwise a unicast/pairwise key is specified by the bssid
-+ * (on a station) or mac address (on an ap).  They key length
-+ * must include any MIC key data; otherwise it should be no
-+ more than IEEE80211_KEYBUF_SIZE.
-+ */
-+struct ieee80211req_key {
-+      u_int8_t        ik_type;        /* key/cipher type */
-+      u_int8_t        ik_pad;
-+      u_int16_t       ik_keyix;       /* key index */
-+      u_int8_t        ik_keylen;      /* key length in bytes */
-+      u_int8_t        ik_flags;
-+#define IEEE80211_KEY_XMIT  0x01
-+#define IEEE80211_KEY_RECV  0x02
-+#define       IEEE80211_KEY_DEFAULT   0x80    /* default xmit key */
-+      u_int8_t        ik_macaddr[IEEE80211_ADDR_LEN];
-+      u_int64_t       ik_keyrsc;      /* key receive sequence counter */
-+      u_int64_t       ik_keytsc;      /* key transmit sequence counter */
-+      u_int8_t        ik_keydata[IEEE80211_KEYBUF_SIZE+IEEE80211_MICBUF_SIZE];
-+};
-+/*
-+ * Delete a key either by index or address.  Set the index
-+ * to IEEE80211_KEYIX_NONE when deleting a unicast key.
-+ */
-+struct ieee80211req_del_key {
-+      u_int8_t        idk_keyix;      /* key index */
-+      u_int8_t        idk_macaddr[IEEE80211_ADDR_LEN];
-+};
-+/*
-+ * MLME state manipulation request.  IEEE80211_MLME_ASSOC
-+ * only makes sense when operating as a station.  The other
-+ * requests can be used when operating as a station or an
-+ * ap (to effect a station).
-+ */
-+struct ieee80211req_mlme {
-+      u_int8_t        im_op;          /* operation to perform */
-+#define       IEEE80211_MLME_ASSOC            1       /* associate station */
-+#define       IEEE80211_MLME_DISASSOC         2       /* disassociate station */
-+#define       IEEE80211_MLME_DEAUTH           3       /* deauthenticate station */
-+#define       IEEE80211_MLME_AUTHORIZE        4       /* authorize station */
-+#define       IEEE80211_MLME_UNAUTHORIZE      5       /* unauthorize station */
-+      u_int16_t       im_reason;      /* 802.11 reason code */
-+      u_int8_t        im_macaddr[IEEE80211_ADDR_LEN];
-+};
-+
-+struct ieee80211req_addpmkid {
-+    u_int8_t    pi_bssid[IEEE80211_ADDR_LEN];
-+    u_int8_t    pi_enable;
-+    u_int8_t    pi_pmkid[16];
-+};
-+
-+#define AUTH_ALG_OPEN_SYSTEM  0x01
-+#define AUTH_ALG_SHARED_KEY   0x02
-+#define AUTH_ALG_LEAP         0x04
-+
-+struct ieee80211req_authalg {
-+   u_int8_t auth_alg;
-+};
-+
-+/*
-+ * Request to add an IE to a Management Frame
-+ */
-+enum{
-+    IEEE80211_APPIE_FRAME_BEACON     = 0,
-+    IEEE80211_APPIE_FRAME_PROBE_REQ  = 1,
-+    IEEE80211_APPIE_FRAME_PROBE_RESP = 2,
-+    IEEE80211_APPIE_FRAME_ASSOC_REQ  = 3,
-+    IEEE80211_APPIE_FRAME_ASSOC_RESP = 4,
-+    IEEE80211_APPIE_NUM_OF_FRAME     = 5
-+};
-+
-+/*
-+ * The Maximum length of the IE that can be added to a Management frame
-+ */
-+#define IEEE80211_APPIE_FRAME_MAX_LEN  78
-+
-+struct ieee80211req_getset_appiebuf {
-+    u_int32_t app_frmtype; /* management frame type for which buffer is added */
-+    u_int32_t app_buflen;  /*application supplied buffer length */
-+    u_int8_t  app_buf[];
-+};
-+
-+/*
-+ * The following definitions are used by an application to set filter
-+ * for receiving management frames
-+ */
-+enum {
-+     IEEE80211_FILTER_TYPE_BEACON      =   0x1,
-+     IEEE80211_FILTER_TYPE_PROBE_REQ   =   0x2,
-+     IEEE80211_FILTER_TYPE_PROBE_RESP  =   0x4,
-+     IEEE80211_FILTER_TYPE_ASSOC_REQ   =   0x8,
-+     IEEE80211_FILTER_TYPE_ASSOC_RESP  =   0x10,
-+     IEEE80211_FILTER_TYPE_AUTH        =   0x20,
-+     IEEE80211_FILTER_TYPE_DEAUTH      =   0x40,
-+     IEEE80211_FILTER_TYPE_DISASSOC    =   0x80,
-+     IEEE80211_FILTER_TYPE_ALL         =   0xFF  /* used to check the valid filter bits */
-+};
-+
-+struct ieee80211req_set_filter {
-+      u_int32_t app_filterype; /* management frame filter type */
-+};
-+
-+enum {
-+    IEEE80211_PARAM_AUTHMODE = 3,   /* Authentication Mode */
-+    IEEE80211_PARAM_MCASTCIPHER = 5,
-+    IEEE80211_PARAM_MCASTKEYLEN = 6,    /* multicast key length */
-+    IEEE80211_PARAM_UCASTCIPHER = 8,
-+    IEEE80211_PARAM_UCASTKEYLEN = 9,    /* unicast key length */
-+      IEEE80211_PARAM_WPA             = 10,   /* WPA mode (0,1,2) */
-+      IEEE80211_PARAM_ROAMING         = 12,   /* roaming mode */
-+      IEEE80211_PARAM_PRIVACY         = 13,   /* privacy invoked */
-+      IEEE80211_PARAM_COUNTERMEASURES = 14,   /* WPA/TKIP countermeasures */
-+      IEEE80211_PARAM_DROPUNENCRYPTED = 15,   /* discard unencrypted frames */
-+};
-+
-+/*
-+ * Values for IEEE80211_PARAM_WPA
-+ */
-+#define WPA_MODE_WPA1   1
-+#define WPA_MODE_WPA2   2
-+#define WPA_MODE_AUTO   3
-+#define WPA_MODE_NONE   4
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _IEEE80211_IOCTL_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h b/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h
-new file mode 100644
-index 0000000..46b613c
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h
-@@ -0,0 +1,77 @@
-+/*-
-+ * Copyright (c) 2001 Atsushi Onoe
-+ * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting
-+ * Copyright (c) 2006 Atheros Communications, Inc.
-+ *
-+ * Wireless Network driver for Atheros AR6001
-+ * All rights reserved.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
-+ *
-+ */
-+#ifndef _IEEE80211_NODE_H_
-+#define _IEEE80211_NODE_H_
-+
-+/*
-+ * Node locking definitions.
-+ */
-+#define IEEE80211_NODE_LOCK_INIT(_nt)   A_MUTEX_INIT(&(_nt)->nt_nodelock)
-+#define IEEE80211_NODE_LOCK_DESTROY(_nt)
-+#define IEEE80211_NODE_LOCK(_nt)        A_MUTEX_LOCK(&(_nt)->nt_nodelock)
-+#define IEEE80211_NODE_UNLOCK(_nt)      A_MUTEX_UNLOCK(&(_nt)->nt_nodelock)
-+#define IEEE80211_NODE_LOCK_BH(_nt)     A_MUTEX_LOCK(&(_nt)->nt_nodelock)
-+#define IEEE80211_NODE_UNLOCK_BH(_nt)   A_MUTEX_UNLOCK(&(_nt)->nt_nodelock)
-+#define IEEE80211_NODE_LOCK_ASSERT(_nt)
-+
-+/*
-+ * Node reference counting definitions.
-+ *
-+ * ieee80211_node_initref   initialize the reference count to 1
-+ * ieee80211_node_incref    add a reference
-+ * ieee80211_node_decref    remove a reference
-+ * ieee80211_node_dectestref    remove a reference and return 1 if this
-+ *              is the last reference, otherwise 0
-+ * ieee80211_node_refcnt    reference count for printing (only)
-+ */
-+#define ieee80211_node_initref(_ni)     ((_ni)->ni_refcnt = 1)
-+#define ieee80211_node_incref(_ni)      ((_ni)->ni_refcnt++)
-+#define ieee80211_node_decref(_ni)      ((_ni)->ni_refcnt--)
-+#define ieee80211_node_dectestref(_ni)  (((_ni)->ni_refcnt--) == 0)
-+#define ieee80211_node_refcnt(_ni)      ((_ni)->ni_refcnt)
-+
-+#define IEEE80211_NODE_HASHSIZE 32
-+/* simple hash is enough for variation of macaddr */
-+#define IEEE80211_NODE_HASH(addr)   \
-+    (((const A_UINT8 *)(addr))[IEEE80211_ADDR_LEN - 1] % \
-+        IEEE80211_NODE_HASHSIZE)
-+
-+/*
-+ * Table of ieee80211_node instances.  Each ieee80211com
-+ * has at least one for holding the scan candidates.
-+ * When operating as an access point or in ibss mode there
-+ * is a second table for associated stations or neighbors.
-+ */
-+struct ieee80211_node_table {
-+    void                   *nt_wmip;       /* back reference */
-+    A_MUTEX_T               nt_nodelock;    /* on node table */
-+    struct bss              *nt_node_first; /* information of all nodes */
-+    struct bss              *nt_node_last;  /* information of all nodes */
-+    struct bss              *nt_hash[IEEE80211_NODE_HASHSIZE];
-+    const char              *nt_name;   /* for debugging */
-+    A_UINT32                nt_scangen; /* gen# for timeout scan */
-+    A_TIMER                 nt_inact_timer;
-+    A_UINT8                 isTimerArmed;   /* is the node timer armed */
-+};
-+
-+#define WLAN_NODE_INACT_TIMEOUT_MSEC            10000
-+
-+#endif /* _IEEE80211_NODE_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/ini_dset.h b/drivers/sdio/function/wlan/ar6000/include/ini_dset.h
-new file mode 100644
-index 0000000..410f2b5
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/ini_dset.h
-@@ -0,0 +1,40 @@
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ */
-+#ifndef _INI_DSET_H_
-+#define _INI_DSET_H_
-+
-+/*
-+ * Each of these represents a WHAL INI table, which consists
-+ * of an "address column" followed by 1 or more "value columns".
-+ *
-+ * Software uses the base WHAL_INI_DATA_ID+column to access a
-+ * DataSet that holds a particular column of data.
-+ */
-+typedef enum {
-+    WHAL_INI_DATA_ID_NULL               =0,
-+    WHAL_INI_DATA_ID_MODE_SPECIFIC      =1,  /* 2,3 */
-+    WHAL_INI_DATA_ID_COMMON             =4,  /* 5 */
-+    WHAL_INI_DATA_ID_BB_RFGAIN          =6,  /* 7,8 */
-+    WHAL_INI_DATA_ID_ANALOG_BANK1       =9,  /* 10 */
-+    WHAL_INI_DATA_ID_ANALOG_BANK2       =11, /* 12 */
-+    WHAL_INI_DATA_ID_ANALOG_BANK3       =13, /* 14, 15 */
-+    WHAL_INI_DATA_ID_ANALOG_BANK6       =16, /* 17, 18 */
-+    WHAL_INI_DATA_ID_ANALOG_BANK7       =19, /* 20 */
-+    WHAL_INI_DATA_ID_MODE_OVERRIDES     =21, /* 22,23 */
-+    WHAL_INI_DATA_ID_COMMON_OVERRIDES   =24, /* 25 */
-+
-+    WHAL_INI_DATA_ID_MAX                =25
-+} WHAL_INI_DATA_ID;
-+
-+typedef PREPACK struct {
-+    A_UINT16 freqIndex; // 1 - A mode 2 - B or G mode 0 - common
-+    A_UINT16 offset;
-+    A_UINT32 newValue;
-+} POSTPACK INI_DSET_REG_OVERRIDE;
-+
-+#endif
-diff --git a/drivers/sdio/function/wlan/ar6000/include/regDb.h b/drivers/sdio/function/wlan/ar6000/include/regDb.h
-new file mode 100644
-index 0000000..b3f665f
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/regDb.h
-@@ -0,0 +1,19 @@
-+/*
-+ * Copyright (c) 2005 Atheros Communications, Inc.
-+ * All rights reserved.
-+ *
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ * This module contains the header files for regulatory module,
-+ * which include the DB schema and DB values.
-+ * $Id:
-+ */
-+
-+#ifndef __REG_DB_H__
-+#define __REG_DB_H__
-+
-+#include "./regulatory/reg_dbschema.h"
-+#include "./regulatory/reg_dbvalues.h"
-+
-+#endif  /* __REG_DB_H__ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/regdump.h b/drivers/sdio/function/wlan/ar6000/include/regdump.h
-new file mode 100644
-index 0000000..0106825
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/regdump.h
-@@ -0,0 +1,33 @@
-+#ifndef __REGDUMP_H__
-+#define __REGDUMP_H__
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ */
-+#if defined(AR6001)
-+#include "AR6001/AR6001_regdump.h"
-+#endif
-+#if defined(AR6002)
-+#include "AR6002/AR6002_regdump.h"
-+#endif
-+
-+#if !defined(__ASSEMBLER__)
-+/*
-+ * Target CPU state at the time of failure is reflected
-+ * in a register dump, which the Host can fetch through
-+ * the diagnostic window.
-+ */
-+struct register_dump_s {
-+    A_UINT32 target_id;               /* Target ID */
-+    A_UINT32 assline;                 /* Line number (if assertion failure) */
-+    A_UINT32 pc;                      /* Program Counter at time of exception */
-+    A_UINT32 badvaddr;                /* Virtual address causing exception */
-+    CPU_exception_frame_t exc_frame;  /* CPU-specific exception info */
-+
-+    /* Could copy top of stack here, too.... */
-+};
-+#endif /* __ASSEMBLER__ */
-+#endif /* __REGDUMP_H__ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/targaddrs.h b/drivers/sdio/function/wlan/ar6000/include/targaddrs.h
-new file mode 100644
-index 0000000..da2a650
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/targaddrs.h
-@@ -0,0 +1,158 @@
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ */
-+
-+#ifndef __TARGADDRS_H__
-+#define __TARGADDRS_H__
-+#if defined(AR6001)
-+#include "AR6001/addrs.h"
-+#endif
-+#if defined(AR6002)
-+#include "AR6002/addrs.h"
-+#endif
-+
-+/*
-+ * AR6K option bits, to enable/disable various features.
-+ * By default, all option bits are 0.
-+ * These bits can be set in LOCAL_SCRATCH register 0.
-+ */
-+#define AR6K_OPTION_BMI_DISABLE      0x01 /* Disable BMI comm with Host */
-+#define AR6K_OPTION_SERIAL_ENABLE    0x02 /* Enable serial port msgs */
-+#define AR6K_OPTION_WDT_DISABLE      0x04 /* WatchDog Timer override */
-+#define AR6K_OPTION_SLEEP_DISABLE    0x08 /* Disable system sleep */
-+#define AR6K_OPTION_STOP_BOOT        0x10 /* Stop boot processes (for ATE) */
-+#define AR6K_OPTION_ENABLE_NOANI     0x20 /* Operate without ANI */
-+#define AR6K_OPTION_DSET_DISABLE     0x40 /* Ignore DataSets */
-+#define AR6K_OPTION_IGNORE_FLASH     0x80 /* Ignore flash during bootup */
-+
-+/*
-+ * xxx_HOST_INTEREST_ADDRESS is the address in Target RAM of the
-+ * host_interest structure.  It must match the address of the _host_interest
-+ * symbol (see linker script).
-+ *
-+ * Host Interest is shared between Host and Target in order to coordinate
-+ * between the two, and is intended to remain constant (with additions only
-+ * at the end) across software releases.
-+ */
-+#define AR6001_HOST_INTEREST_ADDRESS     0x80000600
-+#define AR6002_HOST_INTEREST_ADDRESS     0x00500400
-+
-+#define HOST_INTEREST_MAX_SIZE          0x100
-+
-+#if !defined(__ASSEMBLER__)
-+struct register_dump_s;
-+struct dbglog_hdr_s;
-+
-+/*
-+ * These are items that the Host may need to access
-+ * via BMI or via the Diagnostic Window. The position
-+ * of items in this structure must remain constant
-+ * across firmware revisions!
-+ *
-+ * Types for each item must be fixed size across
-+ * target and host platforms.
-+ *
-+ * More items may be added at the end.
-+ */
-+struct host_interest_s {
-+    /*
-+     * Pointer to application-defined area, if any.
-+     * Set by Target application during startup.
-+     */
-+    A_UINT32               hi_app_host_interest;                      /* 0x00 */
-+
-+    /* Pointer to register dump area, valid after Target crash. */
-+    A_UINT32               hi_failure_state;                          /* 0x04 */
-+
-+    /* Pointer to debug logging header */
-+    A_UINT32               hi_dbglog_hdr;                             /* 0x08 */
-+
-+    /* Indicates whether or not flash is present on Target.
-+     * NB: flash_is_present indicator is here not just
-+     * because it might be of interest to the Host; but
-+     * also because it's set early on by Target's startup
-+     * asm code and we need it to have a special RAM address
-+     * so that it doesn't get reinitialized with the rest
-+     * of data.
-+     */
-+    A_UINT32               hi_flash_is_present;                       /* 0x0c */
-+
-+    /*
-+     * General-purpose flag bits, similar to AR6000_OPTION_* flags.
-+     * Can be used by application rather than by OS.
-+     */
-+    A_UINT32               hi_option_flag;                            /* 0x10 */
-+
-+    /*
-+     * Boolean that determines whether or not to
-+     * display messages on the serial port.
-+     */
-+    A_UINT32               hi_serial_enable;                          /* 0x14 */
-+
-+    /* Start address of Flash DataSet index, if any */
-+    A_UINT32               hi_dset_list_head;                         /* 0x18 */
-+
-+    /* Override Target application start address */
-+    A_UINT32               hi_app_start;                              /* 0x1c */
-+
-+    /* Clock and voltage tuning */
-+    A_UINT32               hi_skip_clock_init;                        /* 0x20 */
-+    A_UINT32               hi_core_clock_setting;                     /* 0x24 */
-+    A_UINT32               hi_cpu_clock_setting;                      /* 0x28 */
-+    A_UINT32               hi_system_sleep_setting;                   /* 0x2c */
-+    A_UINT32               hi_xtal_control_setting;                   /* 0x30 */
-+    A_UINT32               hi_pll_ctrl_setting_24ghz;                 /* 0x34 */
-+    A_UINT32               hi_pll_ctrl_setting_5ghz;                  /* 0x38 */
-+    A_UINT32               hi_ref_voltage_trim_setting;               /* 0x3c */
-+    A_UINT32               hi_clock_info;                             /* 0x40 */
-+
-+    /*
-+     * Flash configuration overrides, used only
-+     * when firmware is not executing from flash.
-+     * (When using flash, modify the global variables
-+     * with equivalent names.)
-+     */
-+    A_UINT32               hi_bank0_addr_value;                       /* 0x44 */
-+    A_UINT32               hi_bank0_read_value;                       /* 0x48 */
-+    A_UINT32               hi_bank0_write_value;                      /* 0x4c */
-+    A_UINT32               hi_bank0_config_value;                     /* 0x50 */
-+
-+    /* Pointer to Board Data  */
-+    A_UINT32               hi_board_data;                             /* 0x54 */
-+    A_UINT32               hi_board_data_initialized;                 /* 0x58 */
-+
-+    A_UINT32               hi_dset_RAM_index_table;                   /* 0x5c */
-+
-+    A_UINT32               hi_desired_baud_rate;                      /* 0x60 */
-+    A_UINT32               hi_dbglog_config;                          /* 0x64 */
-+    A_UINT32               hi_end_RAM_reserve_sz;                     /* 0x68 */
-+    A_UINT32               hi_mbox_io_block_sz;                       /* 0x6c */
-+
-+    A_UINT32               hi_num_bpatch_streams;                     /* 0x70 */
-+    A_UINT32               hi_mbox_isr_yield_limit;                   /* 0x74 */
-+
-+    A_UINT32               hi_refclk_hz;                              /* 0x78 */
-+};
-+
-+/* Bits defined in hi_option_flag */
-+#define HI_OPTION_TIMER_WAR     1 /* not really used */
-+
-+/*
-+ * Intended for use by Host software, this macro returns the Target RAM
-+ * address of any item in the host_interest structure.
-+ * Example: target_addr = AR6001_HOST_INTEREST_ITEM_ADDRESS(hi_board_data);
-+ */
-+#define AR6001_HOST_INTEREST_ITEM_ADDRESS(item) \
-+    ((A_UINT32)&((((struct host_interest_s *)(AR6001_HOST_INTEREST_ADDRESS))->item)))
-+
-+#define AR6002_HOST_INTEREST_ITEM_ADDRESS(item) \
-+    ((A_UINT32)&((((struct host_interest_s *)(AR6002_HOST_INTEREST_ADDRESS))->item)))
-+
-+
-+#endif /* !__ASSEMBLER__ */
-+
-+#endif /* __TARGADDRS_H__ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/testcmd.h b/drivers/sdio/function/wlan/ar6000/include/testcmd.h
-new file mode 100644
-index 0000000..737533a
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/testcmd.h
-@@ -0,0 +1,144 @@
-+/*
-+ * Copyright (c) 2004-2005 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ */
-+
-+#ifndef  TESTCMD_H_
-+#define  TESTCMD_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+typedef enum {
-+    ZEROES_PATTERN = 0,
-+    ONES_PATTERN,
-+    REPEATING_10,
-+    PN7_PATTERN,
-+    PN9_PATTERN,
-+    PN15_PATTERN
-+}TX_DATA_PATTERN;
-+
-+/* Continous tx
-+   mode : TCMD_CONT_TX_OFF - Disabling continous tx
-+          TCMD_CONT_TX_SINE - Enable continuous unmodulated tx
-+          TCMD_CONT_TX_FRAME- Enable continuous modulated tx
-+   freq : Channel freq in Mhz. (e.g 2412 for channel 1 in 11 g)
-+dataRate: 0 - 1 Mbps
-+          1 - 2 Mbps
-+          2 - 5.5 Mbps
-+          3 - 11 Mbps
-+          4 - 6 Mbps
-+          5 - 9 Mbps
-+          6 - 12 Mbps
-+          7 - 18 Mbps
-+          8 - 24 Mbps
-+          9 - 36 Mbps
-+         10 - 28 Mbps
-+         11 - 54 Mbps
-+  txPwr: Tx power in dBm[5 -11] for unmod Tx, [5-14] for mod Tx
-+antenna:  1 - one antenna
-+          2 - two antenna
-+Note : Enable/disable continuous tx test cmd works only when target is awake.
-+*/
-+
-+typedef enum {
-+    TCMD_CONT_TX_OFF = 0,
-+    TCMD_CONT_TX_SINE,
-+    TCMD_CONT_TX_FRAME,
-+    TCMD_CONT_TX_TX99,
-+    TCMD_CONT_TX_TX100
-+} TCMD_CONT_TX_MODE;
-+
-+typedef PREPACK struct {
-+    A_UINT32                 testCmdId;
-+    A_UINT32                mode;
-+    A_UINT32                freq;
-+    A_UINT32                dataRate;
-+    A_INT32                 txPwr;
-+    A_UINT32                antenna;
-+    A_UINT32                enANI;
-+    A_UINT32                scramblerOff;
-+    A_UINT32                aifsn;
-+    A_UINT16                pktSz;
-+    A_UINT16                txPattern;
-+} POSTPACK TCMD_CONT_TX;
-+
-+#define TCMD_TXPATTERN_ZERONE                 0x1
-+#define TCMD_TXPATTERN_ZERONE_DIS_SCRAMBLE    0x2
-+
-+/* Continuous Rx
-+ act: TCMD_CONT_RX_PROMIS - promiscuous mode (accept all incoming frames)
-+      TCMD_CONT_RX_FILTER - filter mode (accept only frames with dest
-+                                             address equal specified
-+                                             mac address (set via act =3)
-+      TCMD_CONT_RX_REPORT  off mode  (disable cont rx mode and get the
-+                                          report from the last cont
-+                                          Rx test)
-+
-+     TCMD_CONT_RX_SETMAC - set MacAddr mode (sets the MAC address for the
-+                                                 target. This Overrides
-+                                                 the default MAC address.)
-+
-+*/
-+typedef enum {
-+    TCMD_CONT_RX_PROMIS =0,
-+    TCMD_CONT_RX_FILTER,
-+    TCMD_CONT_RX_REPORT,
-+    TCMD_CONT_RX_SETMAC
-+} TCMD_CONT_RX_ACT;
-+
-+typedef PREPACK struct {
-+    A_UINT32         testCmdId;
-+    A_UINT32        act;
-+    A_UINT32        enANI;
-+    PREPACK union {
-+        struct PREPACK TCMD_CONT_RX_PARA {
-+            A_UINT32    freq;
-+            A_UINT32    antenna;
-+        } POSTPACK para;
-+        struct PREPACK TCMD_CONT_RX_REPORT {
-+            A_UINT32    totalPkt;
-+            A_INT32    rssiInDBm;
-+        } POSTPACK report;
-+        struct PREPACK TCMD_CONT_RX_MAC {
-+            A_UCHAR    addr[ATH_MAC_LEN];
-+        } POSTPACK mac;
-+    } POSTPACK u;
-+} POSTPACK TCMD_CONT_RX;
-+
-+/* Force sleep/wake  test cmd
-+ mode: TCMD_PM_WAKEUP - Wakeup the target
-+       TCMD_PM_SLEEP - Force the target to sleep.
-+ */
-+typedef enum {
-+    TCMD_PM_WAKEUP = 1, /* be consistent with target */
-+    TCMD_PM_SLEEP
-+} TCMD_PM_MODE;
-+
-+typedef PREPACK struct {
-+      A_UINT32  testCmdId;
-+    A_UINT32  mode;
-+} POSTPACK TCMD_PM;
-+
-+typedef enum{
-+    TCMD_CONT_TX_ID,
-+    TCMD_CONT_RX_ID,
-+    TCMD_PM_ID
-+   } TCMD_ID;
-+
-+typedef PREPACK union {
-+          TCMD_CONT_TX contTx;
-+          TCMD_CONT_RX contRx;
-+          TCMD_PM pm ;
-+} POSTPACK TEST_CMD;
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* TESTCMD_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/wlan_api.h b/drivers/sdio/function/wlan/ar6000/include/wlan_api.h
-new file mode 100644
-index 0000000..aabca4b
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/wlan_api.h
-@@ -0,0 +1,101 @@
-+#ifndef _HOST_WLAN_API_H_
-+#define _HOST_WLAN_API_H_
-+/*
-+ * Copyright (c) 2004-2005 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * This file contains the API for the host wlan module
-+ *
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/include/wlan_api.h#1 $
-+ *
-+ *
-+ *  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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+struct ieee80211_node_table;
-+struct ieee80211_frame;
-+
-+struct ieee80211_common_ie {
-+    A_UINT16    ie_chan;
-+    A_UINT8     *ie_tstamp;
-+    A_UINT8     *ie_ssid;
-+    A_UINT8     *ie_rates;
-+    A_UINT8     *ie_xrates;
-+    A_UINT8     *ie_country;
-+    A_UINT8     *ie_wpa;
-+    A_UINT8     *ie_rsn;
-+    A_UINT8     *ie_wmm;
-+    A_UINT8     *ie_ath;
-+    A_UINT16    ie_capInfo;
-+    A_UINT16    ie_beaconInt;
-+    A_UINT8     *ie_tim;
-+    A_UINT8     *ie_chswitch;
-+    A_UINT8     ie_erp;
-+    A_UINT8     *ie_wsc;
-+};
-+
-+typedef struct bss {
-+    A_UINT8                      ni_macaddr[6];
-+    A_UINT8                      ni_snr;
-+    A_INT16                      ni_rssi;
-+    struct bss                   *ni_list_next;
-+    struct bss                   *ni_list_prev;
-+    struct bss                   *ni_hash_next;
-+    struct bss                   *ni_hash_prev;
-+    struct ieee80211_common_ie   ni_cie;
-+    A_UINT8                     *ni_buf;
-+    struct ieee80211_node_table *ni_table;
-+    A_UINT32                     ni_refcnt;
-+    int                          ni_scangen;
-+    A_UINT32                     ni_tstamp;
-+} bss_t;
-+
-+typedef void wlan_node_iter_func(void *arg, bss_t *);
-+
-+bss_t *wlan_node_alloc(struct ieee80211_node_table *nt, int wh_size);
-+void wlan_node_free(bss_t *ni);
-+void wlan_setup_node(struct ieee80211_node_table *nt, bss_t *ni,
-+                const A_UINT8 *macaddr);
-+bss_t *wlan_find_node(struct ieee80211_node_table *nt, const A_UINT8 *macaddr);
-+void wlan_node_reclaim(struct ieee80211_node_table *nt, bss_t *ni);
-+void wlan_free_allnodes(struct ieee80211_node_table *nt);
-+void wlan_iterate_nodes(struct ieee80211_node_table *nt, wlan_node_iter_func *f,
-+                        void *arg);
-+
-+void wlan_node_table_init(void *wmip, struct ieee80211_node_table *nt);
-+void wlan_node_table_reset(struct ieee80211_node_table *nt);
-+void wlan_node_table_cleanup(struct ieee80211_node_table *nt);
-+
-+A_STATUS wlan_parse_beacon(A_UINT8 *buf, int framelen,
-+                           struct ieee80211_common_ie *cie);
-+
-+A_UINT16 wlan_ieee2freq(int chan);
-+A_UINT32 wlan_freq2ieee(A_UINT16 freq);
-+
-+
-+bss_t *
-+wlan_find_Ssidnode (struct ieee80211_node_table *nt, A_UCHAR *pSsid,
-+                                      A_UINT32 ssidLength, A_BOOL bIsWPA2);
-+
-+void
-+wlan_node_return (struct ieee80211_node_table *nt, bss_t *ni);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _HOST_WLAN_API_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/wlan_dset.h b/drivers/sdio/function/wlan/ar6000/include/wlan_dset.h
-new file mode 100644
-index 0000000..8a876d6
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/wlan_dset.h
-@@ -0,0 +1,20 @@
-+/*
-+ * Copyright (c) 2007 Atheros Communications, Inc.
-+ * All rights reserved.
-+ *
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ */
-+
-+#ifndef __WLAN_DSET_H__
-+#define __WKAN_DSET_H__
-+
-+typedef PREPACK struct wow_config_dset {
-+
-+    A_UINT8 valid_dset;
-+    A_UINT8 gpio_enable;
-+    A_UINT16 gpio_pin;
-+} POSTPACK WOW_CONFIG_DSET;
-+
-+#endif
-diff --git a/drivers/sdio/function/wlan/ar6000/include/wmi.h b/drivers/sdio/function/wlan/ar6000/include/wmi.h
-new file mode 100644
-index 0000000..045acd4
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/wmi.h
-@@ -0,0 +1,1743 @@
-+/*
-+ * Copyright (c) 2004-2006 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ * This file contains the definitions of the WMI protocol specified in the
-+ * Wireless Module Interface (WMI).  It includes definitions of all the
-+ * commands and events. Commands are messages from the host to the WM.
-+ * Events and Replies are messages from the WM to the host.
-+ *
-+ * Ownership of correctness in regards to WMI commands
-+ * belongs to the host driver and the WM is not required to validate
-+ * parameters for value, proper range, or any other checking.
-+ *
-+ */
-+
-+#ifndef _WMI_H_
-+#define _WMI_H_
-+
-+#ifndef ATH_TARGET
-+#include "athstartpack.h"
-+#endif
-+
-+#include "wmix.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#define WMI_PROTOCOL_VERSION    0x0002
-+#define WMI_PROTOCOL_REVISION   0x0000
-+
-+#define ATH_MAC_LEN             6               /* length of mac in bytes */
-+#define WMI_CMD_MAX_LEN         100
-+#define WMI_CONTROL_MSG_MAX_LEN     256
-+#define WMI_OPT_CONTROL_MSG_MAX_LEN 1536
-+#define IS_ETHERTYPE(_typeOrLen)        ((_typeOrLen) >= 0x0600)
-+#define RFC1042OUI      {0x00, 0x00, 0x00}
-+
-+#define IP_ETHERTYPE 0x0800
-+
-+#define WMI_IMPLICIT_PSTREAM 0xFF
-+#define WMI_MAX_THINSTREAM 15
-+
-+struct host_app_area_s {
-+    A_UINT32 wmi_protocol_ver;
-+};
-+
-+/*
-+ * Data Path
-+ */
-+typedef PREPACK struct {
-+    A_UINT8     dstMac[ATH_MAC_LEN];
-+    A_UINT8     srcMac[ATH_MAC_LEN];
-+    A_UINT16    typeOrLen;
-+} POSTPACK ATH_MAC_HDR;
-+
-+typedef PREPACK struct {
-+    A_UINT8     dsap;
-+    A_UINT8     ssap;
-+    A_UINT8     cntl;
-+    A_UINT8     orgCode[3];
-+    A_UINT16    etherType;
-+} POSTPACK ATH_LLC_SNAP_HDR;
-+
-+typedef enum {
-+    DATA_MSGTYPE = 0x0,
-+    CNTL_MSGTYPE,
-+    SYNC_MSGTYPE
-+} WMI_MSG_TYPE;
-+
-+
-+typedef PREPACK struct {
-+    A_INT8      rssi;
-+    A_UINT8     info;            /* WMI_MSG_TYPE in lower 2 bits - b1b0 */
-+                                 /* UP in next 3 bits - b4b3b2 */
-+#define WMI_DATA_HDR_MSG_TYPE_MASK  0x03
-+#define WMI_DATA_HDR_MSG_TYPE_SHIFT 0
-+#define WMI_DATA_HDR_UP_MASK        0x07
-+#define WMI_DATA_HDR_UP_SHIFT       2
-+#define WMI_DATA_HDR_IS_MSG_TYPE(h, t)  (((h)->info & (WMI_DATA_HDR_MSG_TYPE_MASK)) == (t))
-+} POSTPACK WMI_DATA_HDR;
-+
-+
-+#define WMI_DATA_HDR_SET_MSG_TYPE(h, t) (h)->info = (((h)->info & ~(WMI_DATA_HDR_MSG_TYPE_MASK << WMI_DATA_HDR_MSG_TYPE_SHIFT)) | (t << WMI_DATA_HDR_MSG_TYPE_SHIFT))
-+#define WMI_DATA_HDR_SET_UP(h, p) (h)->info = (((h)->info & ~(WMI_DATA_HDR_UP_MASK << WMI_DATA_HDR_UP_SHIFT)) | (p << WMI_DATA_HDR_UP_SHIFT))
-+
-+/*
-+ * Control Path
-+ */
-+typedef PREPACK struct {
-+    A_UINT16    commandId;
-+} POSTPACK WMI_CMD_HDR;        /* used for commands and events */
-+
-+/*
-+ * List of Commnands
-+ */
-+typedef enum {
-+    WMI_CONNECT_CMDID           = 0x0001,
-+    WMI_RECONNECT_CMDID,
-+    WMI_DISCONNECT_CMDID,
-+    WMI_SYNCHRONIZE_CMDID,
-+    WMI_CREATE_PSTREAM_CMDID,
-+    WMI_DELETE_PSTREAM_CMDID,
-+    WMI_START_SCAN_CMDID,
-+    WMI_SET_SCAN_PARAMS_CMDID,
-+    WMI_SET_BSS_FILTER_CMDID,
-+    WMI_SET_PROBED_SSID_CMDID,
-+    WMI_SET_LISTEN_INT_CMDID,
-+    WMI_SET_BMISS_TIME_CMDID,
-+    WMI_SET_DISC_TIMEOUT_CMDID,
-+    WMI_GET_CHANNEL_LIST_CMDID,
-+    WMI_SET_BEACON_INT_CMDID,
-+    WMI_GET_STATISTICS_CMDID,
-+    WMI_SET_CHANNEL_PARAMS_CMDID,
-+    WMI_SET_POWER_MODE_CMDID,
-+    WMI_SET_IBSS_PM_CAPS_CMDID,
-+    WMI_SET_POWER_PARAMS_CMDID,
-+    WMI_SET_POWERSAVE_TIMERS_POLICY_CMDID,
-+    WMI_ADD_CIPHER_KEY_CMDID,
-+    WMI_DELETE_CIPHER_KEY_CMDID,
-+    WMI_ADD_KRK_CMDID,
-+    WMI_DELETE_KRK_CMDID,
-+    WMI_SET_PMKID_CMDID,
-+    WMI_SET_TX_PWR_CMDID,
-+    WMI_GET_TX_PWR_CMDID,
-+    WMI_SET_ASSOC_INFO_CMDID,
-+    WMI_ADD_BAD_AP_CMDID,
-+    WMI_DELETE_BAD_AP_CMDID,
-+    WMI_SET_TKIP_COUNTERMEASURES_CMDID,
-+    WMI_RSSI_THRESHOLD_PARAMS_CMDID,
-+    WMI_TARGET_ERROR_REPORT_BITMASK_CMDID,
-+    WMI_SET_ACCESS_PARAMS_CMDID,
-+    WMI_SET_RETRY_LIMITS_CMDID,
-+    WMI_SET_OPT_MODE_CMDID,
-+    WMI_OPT_TX_FRAME_CMDID,
-+    WMI_SET_VOICE_PKT_SIZE_CMDID,
-+    WMI_SET_MAX_SP_LEN_CMDID,
-+    WMI_SET_ROAM_CTRL_CMDID,
-+    WMI_GET_ROAM_TBL_CMDID,
-+    WMI_GET_ROAM_DATA_CMDID,
-+    WMI_ENABLE_RM_CMDID,
-+    WMI_SET_MAX_OFFHOME_DURATION_CMDID,
-+    WMI_EXTENSION_CMDID,                        /* Non-wireless extensions */
-+    WMI_SNR_THRESHOLD_PARAMS_CMDID,
-+    WMI_LQ_THRESHOLD_PARAMS_CMDID,
-+    WMI_SET_LPREAMBLE_CMDID,
-+    WMI_SET_RTS_CMDID,
-+    WMI_CLR_RSSI_SNR_CMDID,
-+    WMI_SET_FIXRATES_CMDID,
-+    WMI_GET_FIXRATES_CMDID,
-+    WMI_SET_AUTH_MODE_CMDID,
-+    WMI_SET_REASSOC_MODE_CMDID,
-+    WMI_SET_WMM_CMDID,
-+    WMI_SET_WMM_TXOP_CMDID,
-+    WMI_TEST_CMDID,
-+    WMI_SET_BT_STATUS_CMDID,
-+    WMI_SET_BT_PARAMS_CMDID,
-+
-+    WMI_SET_KEEPALIVE_CMDID,
-+    WMI_GET_KEEPALIVE_CMDID,
-+    WMI_SET_APPIE_CMDID,
-+    WMI_GET_APPIE_CMDID,
-+    WMI_SET_WSC_STATUS_CMDID,
-+
-+    /* Wake on Wireless */
-+    WMI_SET_HOST_SLEEP_MODE_CMDID,
-+    WMI_SET_WOW_MODE_CMDID,
-+    WMI_GET_WOW_LIST_CMDID,
-+    WMI_ADD_WOW_PATTERN_CMDID,
-+    WMI_DEL_WOW_PATTERN_CMDID,
-+    WMI_SET_MAC_ADDRESS_CMDID,
-+    WMI_SET_AKMP_PARAMS_CMDID,
-+    WMI_SET_PMKID_LIST_CMDID,
-+    WMI_GET_PMKID_LIST_CMDID,
-+
-+    /*
-+     * Developer commands starts at 0xF000
-+     */
-+    WMI_SET_BITRATE_CMDID = 0xF000,
-+    WMI_GET_BITRATE_CMDID,
-+    WMI_SET_WHALPARAM_CMDID,
-+
-+} WMI_COMMAND_ID;
-+
-+/*
-+ * Frame Types
-+ */
-+typedef enum {
-+    WMI_FRAME_BEACON        =   0,
-+    WMI_FRAME_PROBE_REQ,
-+    WMI_FRAME_PROBE_RESP,
-+    WMI_FRAME_ASSOC_REQ,
-+    WMI_FRAME_ASSOC_RESP,
-+    WMI_NUM_MGMT_FRAME
-+} WMI_MGMT_FRAME_TYPE;
-+
-+/*
-+ * Connect Command
-+ */
-+typedef enum {
-+    INFRA_NETWORK       = 0x01,
-+    ADHOC_NETWORK       = 0x02,
-+    ADHOC_CREATOR       = 0x04,
-+} NETWORK_TYPE;
-+
-+typedef enum {
-+    OPEN_AUTH           = 0x01,
-+    SHARED_AUTH         = 0x02,
-+    LEAP_AUTH           = 0x04,  /* different from IEEE_AUTH_MODE definitions */
-+} DOT11_AUTH_MODE;
-+
-+typedef enum {
-+    NONE_AUTH           = 0x01,
-+    WPA_AUTH            = 0x02,
-+    WPA_PSK_AUTH        = 0x03,
-+    WPA2_AUTH           = 0x04,
-+    WPA2_PSK_AUTH       = 0x05,
-+    WPA_AUTH_CCKM       = 0x06,
-+    WPA2_AUTH_CCKM      = 0x07,
-+} AUTH_MODE;
-+
-+typedef enum {
-+    NONE_CRYPT          = 0x01,
-+    WEP_CRYPT           = 0x02,
-+    TKIP_CRYPT          = 0x03,
-+    AES_CRYPT           = 0x04,
-+} CRYPTO_TYPE;
-+
-+#define WMI_MIN_CRYPTO_TYPE NONE_CRYPT
-+#define WMI_MAX_CRYPTO_TYPE (AES_CRYPT + 1)
-+
-+#define WMI_MIN_KEY_INDEX   0
-+#define WMI_MAX_KEY_INDEX   3
-+
-+#define WMI_MAX_KEY_LEN     32
-+
-+#define WMI_MAX_SSID_LEN    32
-+
-+typedef enum {
-+    CONNECT_ASSOC_POLICY_USER = 0x0001,
-+    CONNECT_SEND_REASSOC = 0x0002,
-+    CONNECT_IGNORE_WPAx_GROUP_CIPHER = 0x0004,
-+    CONNECT_PROFILE_MATCH_DONE = 0x0008,
-+    CONNECT_IGNORE_AAC_BEACON = 0x0010,
-+    CONNECT_CSA_FOLLOW_BSS = 0x0020,
-+} WMI_CONNECT_CTRL_FLAGS_BITS;
-+
-+#define DEFAULT_CONNECT_CTRL_FLAGS         (CONNECT_CSA_FOLLOW_BSS)
-+
-+typedef PREPACK struct {
-+    A_UINT8     networkType;
-+    A_UINT8     dot11AuthMode;
-+    A_UINT8     authMode;
-+    A_UINT8     pairwiseCryptoType;
-+    A_UINT8     pairwiseCryptoLen;
-+    A_UINT8     groupCryptoType;
-+    A_UINT8     groupCryptoLen;
-+    A_UINT8     ssidLength;
-+    A_UCHAR     ssid[WMI_MAX_SSID_LEN];
-+    A_UINT16    channel;
-+    A_UINT8     bssid[ATH_MAC_LEN];
-+    A_UINT32    ctrl_flags;
-+} POSTPACK WMI_CONNECT_CMD;
-+
-+/*
-+ * WMI_RECONNECT_CMDID
-+ */
-+typedef PREPACK struct {
-+    A_UINT16    channel;                    /* hint */
-+    A_UINT8     bssid[ATH_MAC_LEN];         /* mandatory if set */
-+} POSTPACK WMI_RECONNECT_CMD;
-+
-+/*
-+ * WMI_ADD_CIPHER_KEY_CMDID
-+ */
-+typedef enum {
-+    PAIRWISE_USAGE      = 0x00,
-+    GROUP_USAGE         = 0x01,
-+    TX_USAGE            = 0x02,     /* default Tx Key - Static WEP only */
-+} KEY_USAGE;
-+
-+/*
-+ * Bit Flag
-+ * Bit 0 - Initialise TSC - default is Initialize
-+ */
-+#define KEY_OP_INIT_TSC       0x01
-+#define KEY_OP_INIT_RSC       0x02
-+
-+#define KEY_OP_INIT_VAL     0x03     /* Default Initialise the TSC & RSC */
-+#define KEY_OP_VALID_MASK   0x03
-+
-+typedef PREPACK struct {
-+    A_UINT8     keyIndex;
-+    A_UINT8     keyType;
-+    A_UINT8     keyUsage;           /* KEY_USAGE */
-+    A_UINT8     keyLength;
-+    A_UINT8     keyRSC[8];          /* key replay sequence counter */
-+    A_UINT8     key[WMI_MAX_KEY_LEN];
-+    A_UINT8     key_op_ctrl;       /* Additional Key Control information */
-+} POSTPACK WMI_ADD_CIPHER_KEY_CMD;
-+
-+/*
-+ * WMI_DELETE_CIPHER_KEY_CMDID
-+ */
-+typedef PREPACK struct {
-+    A_UINT8     keyIndex;
-+} POSTPACK WMI_DELETE_CIPHER_KEY_CMD;
-+
-+#define WMI_KRK_LEN     16
-+/*
-+ * WMI_ADD_KRK_CMDID
-+ */
-+typedef PREPACK struct {
-+    A_UINT8     krk[WMI_KRK_LEN];
-+} POSTPACK WMI_ADD_KRK_CMD;
-+
-+/*
-+ * WMI_SET_TKIP_COUNTERMEASURES_CMDID
-+ */
-+typedef enum {
-+    WMI_TKIP_CM_DISABLE = 0x0,
-+    WMI_TKIP_CM_ENABLE  = 0x1,
-+} WMI_TKIP_CM_CONTROL;
-+
-+typedef PREPACK struct {
-+    A_UINT8  cm_en;                     /* WMI_TKIP_CM_CONTROL */
-+} POSTPACK WMI_SET_TKIP_COUNTERMEASURES_CMD;
-+
-+/*
-+ * WMI_SET_PMKID_CMDID
-+ */
-+
-+#define WMI_PMKID_LEN 16
-+
-+typedef enum {
-+   PMKID_DISABLE = 0,
-+   PMKID_ENABLE  = 1,
-+} PMKID_ENABLE_FLG;
-+
-+typedef PREPACK struct {
-+    A_UINT8     bssid[ATH_MAC_LEN];
-+    A_UINT8     enable;                 /* PMKID_ENABLE_FLG */
-+    A_UINT8     pmkid[WMI_PMKID_LEN];
-+} POSTPACK WMI_SET_PMKID_CMD;
-+
-+/*
-+ * WMI_START_SCAN_CMD
-+ */
-+typedef enum {
-+    WMI_LONG_SCAN  = 0,
-+    WMI_SHORT_SCAN = 1,
-+} WMI_SCAN_TYPE;
-+
-+typedef PREPACK struct {
-+    A_BOOL   forceFgScan;
-+    A_BOOL   isLegacy;        /* For Legacy Cisco AP compatibility */
-+    A_UINT32 homeDwellTime;   /* Maximum duration in the home channel(milliseconds) */
-+    A_UINT32 forceScanInterval;    /* Time interval between scans (milliseconds)*/
-+    A_UINT8  scanType;           /* WMI_SCAN_TYPE */
-+} POSTPACK WMI_START_SCAN_CMD;
-+
-+/*
-+ * WMI_SET_SCAN_PARAMS_CMDID
-+ */
-+#define WMI_SHORTSCANRATIO_DEFAULT      3
-+typedef enum {
-+    CONNECT_SCAN_CTRL_FLAGS = 0x01,    /* set if can scan in the Connect cmd */
-+    SCAN_CONNECTED_CTRL_FLAGS = 0x02,  /* set if scan for the SSID it is */
-+                                       /* already connected to */
-+    ACTIVE_SCAN_CTRL_FLAGS = 0x04,     /* set if enable active scan */
-+    ROAM_SCAN_CTRL_FLAGS = 0x08,       /* set if enable roam scan when bmiss and lowrssi */
-+    REPORT_BSSINFO_CTRL_FLAGS = 0x10,   /* set if follows customer BSSINFO reporting rule */
-+    ENABLE_AUTO_CTRL_FLAGS = 0x20,      /* if disabled, target doesn't
-+                                          scan after a disconnect event  */
-+    ENABLE_SCAN_ABORT_EVENT = 0x40      /* Scan complete event with canceled status will be generated when a scan is prempted before it gets completed */
-+
-+} WMI_SCAN_CTRL_FLAGS_BITS;
-+
-+#define CAN_SCAN_IN_CONNECT(flags)      (flags & CONNECT_SCAN_CTRL_FLAGS)
-+#define CAN_SCAN_CONNECTED(flags)       (flags & SCAN_CONNECTED_CTRL_FLAGS)
-+#define ENABLE_ACTIVE_SCAN(flags)       (flags & ACTIVE_SCAN_CTRL_FLAGS)
-+#define ENABLE_ROAM_SCAN(flags)         (flags & ROAM_SCAN_CTRL_FLAGS)
-+#define CONFIG_REPORT_BSSINFO(flags)     (flags & REPORT_BSSINFO_CTRL_FLAGS)
-+#define IS_AUTO_SCAN_ENABLED(flags)      (flags & ENABLE_AUTO_CTRL_FLAGS)
-+#define SCAN_ABORT_EVENT_ENABLED(flags) (flags & ENABLE_SCAN_ABORT_EVENT)
-+
-+#define DEFAULT_SCAN_CTRL_FLAGS         (CONNECT_SCAN_CTRL_FLAGS| SCAN_CONNECTED_CTRL_FLAGS| ACTIVE_SCAN_CTRL_FLAGS| ROAM_SCAN_CTRL_FLAGS | ENABLE_AUTO_CTRL_FLAGS)
-+
-+
-+typedef PREPACK struct {
-+    A_UINT16    fg_start_period;        /* seconds */
-+    A_UINT16    fg_end_period;          /* seconds */
-+    A_UINT16    bg_period;              /* seconds */
-+    A_UINT16    maxact_chdwell_time;    /* msec */
-+    A_UINT16    pas_chdwell_time;       /* msec */
-+    A_UINT8     shortScanRatio;         /* how many shorts scan for one long */
-+    A_UINT8     scanCtrlFlags;
-+    A_UINT16    minact_chdwell_time;    /* msec */
-+    A_UINT32    max_dfsch_act_time;  /* msecs */
-+} POSTPACK WMI_SCAN_PARAMS_CMD;
-+
-+/*
-+ * WMI_SET_BSS_FILTER_CMDID
-+ */
-+typedef enum {
-+    NONE_BSS_FILTER = 0x0,              /* no beacons forwarded */
-+    ALL_BSS_FILTER,                     /* all beacons forwarded */
-+    PROFILE_FILTER,                     /* only beacons matching profile */
-+    ALL_BUT_PROFILE_FILTER,             /* all but beacons matching profile */
-+    CURRENT_BSS_FILTER,                 /* only beacons matching current BSS */
-+    ALL_BUT_BSS_FILTER,                 /* all but beacons matching BSS */
-+    PROBED_SSID_FILTER,                 /* beacons matching probed ssid */
-+    LAST_BSS_FILTER,                    /* marker only */
-+} WMI_BSS_FILTER;
-+
-+typedef PREPACK struct {
-+    A_UINT8    bssFilter;                      /* see WMI_BSS_FILTER */
-+    A_UINT32   ieMask;
-+} POSTPACK WMI_BSS_FILTER_CMD;
-+
-+/*
-+ * WMI_SET_PROBED_SSID_CMDID
-+ */
-+#define MAX_PROBED_SSID_INDEX   5
-+
-+typedef enum {
-+    DISABLE_SSID_FLAG  = 0,                  /* disables entry */
-+    SPECIFIC_SSID_FLAG = 0x01,               /* probes specified ssid */
-+    ANY_SSID_FLAG      = 0x02,               /* probes for any ssid */
-+} WMI_SSID_FLAG;
-+
-+typedef PREPACK struct {
-+    A_UINT8     entryIndex;                     /* 0 to MAX_PROBED_SSID_INDEX */
-+    A_UINT8     flag;                           /* WMI_SSID_FLG */
-+    A_UINT8     ssidLength;
-+    A_UINT8     ssid[32];
-+} POSTPACK WMI_PROBED_SSID_CMD;
-+
-+/*
-+ * WMI_SET_LISTEN_INT_CMDID
-+ * The Listen interval is between 15 and 3000 TUs
-+ */
-+#define MIN_LISTEN_INTERVAL 15
-+#define MAX_LISTEN_INTERVAL 5000
-+#define MIN_LISTEN_BEACONS 1
-+#define MAX_LISTEN_BEACONS 50
-+
-+typedef PREPACK struct {
-+    A_UINT16     listenInterval;
-+    A_UINT16     numBeacons;
-+} POSTPACK WMI_LISTEN_INT_CMD;
-+
-+/*
-+ * WMI_SET_BEACON_INT_CMDID
-+ */
-+typedef PREPACK struct {
-+    A_UINT16     beaconInterval;
-+} POSTPACK WMI_BEACON_INT_CMD;
-+
-+/*
-+ * WMI_SET_BMISS_TIME_CMDID
-+ * valid values are between 1000 and 5000 TUs
-+ */
-+
-+#define MIN_BMISS_TIME     1000
-+#define MAX_BMISS_TIME     5000
-+#define MIN_BMISS_BEACONS  1
-+#define MAX_BMISS_BEACONS  50
-+
-+typedef PREPACK struct {
-+    A_UINT16     bmissTime;
-+    A_UINT16     numBeacons;
-+} POSTPACK WMI_BMISS_TIME_CMD;
-+
-+/*
-+ * WMI_SET_POWER_MODE_CMDID
-+ */
-+typedef enum {
-+    REC_POWER = 0x01,
-+    MAX_PERF_POWER,
-+} WMI_POWER_MODE;
-+
-+typedef PREPACK struct {
-+    A_UINT8     powerMode;      /* WMI_POWER_MODE */
-+} POSTPACK WMI_POWER_MODE_CMD;
-+
-+/*
-+ * WMI_SET_POWER_PARAMS_CMDID
-+ */
-+typedef enum {
-+    IGNORE_DTIM = 0x01,
-+    NORMAL_DTIM = 0x02,
-+    STICK_DTIM  = 0x03,
-+} WMI_DTIM_POLICY;
-+
-+typedef PREPACK struct {
-+    A_UINT16    idle_period;             /* msec */
-+    A_UINT16    pspoll_number;
-+    A_UINT16    dtim_policy;
-+} POSTPACK WMI_POWER_PARAMS_CMD;
-+
-+typedef PREPACK struct {
-+    A_UINT8    power_saving;
-+    A_UINT8    ttl; /* number of beacon periods */
-+    A_UINT16   atim_windows;          /* msec */
-+    A_UINT16   timeout_value;         /* msec */
-+} POSTPACK WMI_IBSS_PM_CAPS_CMD;
-+
-+/*
-+ * WMI_SET_POWERSAVE_TIMERS_POLICY_CMDID
-+ */
-+typedef enum {
-+    IGNORE_TIM_ALL_QUEUES_APSD = 0,
-+    PROCESS_TIM_ALL_QUEUES_APSD = 1,
-+    IGNORE_TIM_SIMULATED_APSD = 2,
-+    PROCESS_TIM_SIMULATED_APSD = 3,
-+} APSD_TIM_POLICY;
-+
-+typedef PREPACK struct {
-+    A_UINT16    psPollTimeout;          /* msec */
-+    A_UINT16    triggerTimeout;         /* msec */
-+    A_UINT32    apsdTimPolicy;      /* TIM behavior with  ques APSD enabled. Default is IGNORE_TIM_ALL_QUEUES_APSD */
-+    A_UINT32    simulatedAPSDTimPolicy;      /* TIM behavior with  simulated APSD enabled. Default is PROCESS_TIM_SIMULATED_APSD */
-+} POSTPACK WMI_POWERSAVE_TIMERS_POLICY_CMD;
-+
-+/*
-+ * WMI_SET_VOICE_PKT_SIZE_CMDID
-+ */
-+typedef PREPACK struct {
-+    A_UINT16    voicePktSize;
-+} POSTPACK WMI_SET_VOICE_PKT_SIZE_CMD;
-+
-+/*
-+ * WMI_SET_MAX_SP_LEN_CMDID
-+ */
-+typedef enum {
-+    DELIVER_ALL_PKT = 0x0,
-+    DELIVER_2_PKT = 0x1,
-+    DELIVER_4_PKT = 0x2,
-+    DELIVER_6_PKT = 0x3,
-+} APSD_SP_LEN_TYPE;
-+
-+typedef PREPACK struct {
-+    A_UINT8    maxSPLen;
-+} POSTPACK WMI_SET_MAX_SP_LEN_CMD;
-+
-+/*
-+ * WMI_SET_DISC_TIMEOUT_CMDID
-+ */
-+typedef PREPACK struct {
-+    A_UINT8     disconnectTimeout;          /* seconds */
-+} POSTPACK WMI_DISC_TIMEOUT_CMD;
-+
-+typedef enum {
-+    UPLINK_TRAFFIC = 0,
-+    DNLINK_TRAFFIC = 1,
-+    BIDIR_TRAFFIC = 2,
-+} DIR_TYPE;
-+
-+typedef enum {
-+    DISABLE_FOR_THIS_AC = 0,
-+    ENABLE_FOR_THIS_AC  = 1,
-+    ENABLE_FOR_ALL_AC   = 2,
-+} VOICEPS_CAP_TYPE;
-+
-+typedef enum {
-+    TRAFFIC_TYPE_APERIODIC = 0,
-+    TRAFFIC_TYPE_PERIODIC = 1,
-+}TRAFFIC_TYPE;
-+
-+/*
-+ * WMI_CREATE_PSTREAM_CMDID
-+ */
-+typedef PREPACK struct {
-+    A_UINT32        minServiceInt;           /* in milli-sec */
-+    A_UINT32        maxServiceInt;           /* in milli-sec */
-+    A_UINT32        inactivityInt;           /* in milli-sec */
-+    A_UINT32        suspensionInt;           /* in milli-sec */
-+    A_UINT32        serviceStartTime;
-+    A_UINT32        minDataRate;             /* in bps */
-+    A_UINT32        meanDataRate;            /* in bps */
-+    A_UINT32        peakDataRate;            /* in bps */
-+    A_UINT32        maxBurstSize;
-+    A_UINT32        delayBound;
-+    A_UINT32        minPhyRate;              /* in bps */
-+    A_UINT32        sba;
-+    A_UINT32        mediumTime;
-+    A_UINT16        nominalMSDU;             /* in octects */
-+    A_UINT16        maxMSDU;                 /* in octects */
-+    A_UINT8         trafficClass;
-+    A_UINT8         trafficType;             /* TRAFFIC_TYPE */
-+    A_UINT8         trafficDirection;        /* TRAFFIC_DIR */
-+    A_UINT8         voicePSCapability;       /* VOICEPS_CAP_TYPE */
-+    A_UINT8         tsid;
-+    A_UINT8         userPriority;            /* 802.1D user priority */
-+} POSTPACK WMI_CREATE_PSTREAM_CMD;
-+
-+/*
-+ * WMI_DELETE_PSTREAM_CMDID
-+ */
-+typedef PREPACK struct {
-+    A_UINT8     trafficClass;
-+    A_UINT8     tsid;
-+} POSTPACK WMI_DELETE_PSTREAM_CMD;
-+
-+/*
-+ * WMI_SET_CHANNEL_PARAMS_CMDID
-+ */
-+typedef enum {
-+    WMI_11A_MODE  = 0x1,
-+    WMI_11G_MODE  = 0x2,
-+    WMI_11AG_MODE = 0x3,
-+    WMI_11B_MODE  = 0x4,
-+    WMI_11GONLY_MODE = 0x5,
-+} WMI_PHY_MODE;
-+
-+#define WMI_MAX_CHANNELS        32
-+
-+typedef PREPACK struct {
-+    A_UINT8     reserved1;
-+    A_UINT8     scanParam;              /* set if enable scan */
-+    A_UINT8     phyMode;                /* see WMI_PHY_MODE */
-+    A_UINT8     numChannels;            /* how many channels follow */
-+    A_UINT16    channelList[1];         /* channels in Mhz */
-+} POSTPACK WMI_CHANNEL_PARAMS_CMD;
-+
-+
-+/*
-+ *  WMI_RSSI_THRESHOLD_PARAMS_CMDID
-+ *  Setting the polltime to 0 would disable polling.
-+ *  Threshold values are in the ascending order, and should agree to:
-+ *  (lowThreshold_lowerVal < lowThreshold_upperVal < highThreshold_lowerVal
-+ *      < highThreshold_upperVal)
-+ */
-+
-+typedef PREPACK struct WMI_RSSI_THRESHOLD_PARAMS{
-+    A_UINT32    pollTime;               /* Polling time as a factor of LI */
-+    A_INT16     thresholdAbove1_Val;          /* lowest of upper */
-+    A_INT16     thresholdAbove2_Val;
-+    A_INT16     thresholdAbove3_Val;
-+    A_INT16     thresholdAbove4_Val;
-+    A_INT16     thresholdAbove5_Val;
-+    A_INT16     thresholdAbove6_Val;          /* highest of upper */
-+    A_INT16     thresholdBelow1_Val;         /* lowest of bellow */
-+    A_INT16     thresholdBelow2_Val;
-+    A_INT16     thresholdBelow3_Val;
-+    A_INT16     thresholdBelow4_Val;
-+    A_INT16     thresholdBelow5_Val;
-+    A_INT16     thresholdBelow6_Val;         /* highest of bellow */
-+    A_UINT8     weight;                  /* "alpha" */
-+    A_UINT8     reserved[3];
-+} POSTPACK  WMI_RSSI_THRESHOLD_PARAMS_CMD;
-+
-+/*
-+ *  WMI_SNR_THRESHOLD_PARAMS_CMDID
-+ *  Setting the polltime to 0 would disable polling.
-+ */
-+
-+typedef PREPACK struct WMI_SNR_THRESHOLD_PARAMS{
-+    A_UINT32    pollTime;               /* Polling time as a factor of LI */
-+    A_UINT8     weight;                  /* "alpha" */
-+    A_UINT8     thresholdAbove1_Val;      /* lowest of uppper*/
-+    A_UINT8     thresholdAbove2_Val;
-+    A_UINT8     thresholdAbove3_Val;
-+    A_UINT8     thresholdAbove4_Val;      /* highest of upper */
-+    A_UINT8     thresholdBelow1_Val;     /* lowest of bellow */
-+    A_UINT8     thresholdBelow2_Val;
-+    A_UINT8     thresholdBelow3_Val;
-+    A_UINT8     thresholdBelow4_Val;     /* highest of bellow */
-+    A_UINT8     reserved[3];
-+} POSTPACK WMI_SNR_THRESHOLD_PARAMS_CMD;
-+
-+/*
-+ *  WMI_LQ_THRESHOLD_PARAMS_CMDID
-+ */
-+typedef PREPACK struct WMI_LQ_THRESHOLD_PARAMS {
-+    A_UINT8     enable;
-+    A_UINT8     thresholdAbove1_Val;
-+    A_UINT8     thresholdAbove2_Val;
-+    A_UINT8     thresholdAbove3_Val;
-+    A_UINT8     thresholdAbove4_Val;
-+    A_UINT8     thresholdBelow1_Val;
-+    A_UINT8     thresholdBelow2_Val;
-+    A_UINT8     thresholdBelow3_Val;
-+    A_UINT8     thresholdBelow4_Val;
-+    A_UINT8     reserved[3];
-+} POSTPACK  WMI_LQ_THRESHOLD_PARAMS_CMD;
-+
-+typedef enum {
-+    WMI_LPREAMBLE_DISABLED = 0,
-+    WMI_LPREAMBLE_ENABLED
-+} WMI_LPREAMBLE_STATUS;
-+
-+typedef PREPACK struct {
-+    A_UINT8     status;
-+}POSTPACK WMI_SET_LPREAMBLE_CMD;
-+
-+typedef PREPACK struct {
-+    A_UINT16    threshold;
-+}POSTPACK WMI_SET_RTS_CMD;
-+
-+/*
-+ *  WMI_TARGET_ERROR_REPORT_BITMASK_CMDID
-+ *  Sets the error reporting event bitmask in target. Target clears it
-+ *  upon an error. Subsequent errors are counted, but not reported
-+ *  via event, unless the bitmask is set again.
-+ */
-+typedef PREPACK struct {
-+    A_UINT32    bitmask;
-+} POSTPACK  WMI_TARGET_ERROR_REPORT_BITMASK;
-+
-+/*
-+ * WMI_SET_TX_PWR_CMDID
-+ */
-+typedef PREPACK struct {
-+    A_UINT8     dbM;                  /* in dbM units */
-+} POSTPACK WMI_SET_TX_PWR_CMD, WMI_TX_PWR_REPLY;
-+
-+/*
-+ * WMI_SET_ASSOC_INFO_CMDID
-+ *
-+ * A maximum of 2 private IEs can be sent in the [Re]Assoc request.
-+ * A 3rd one, the CCX version IE can also be set from the host.
-+ */
-+#define WMI_MAX_ASSOC_INFO_TYPE    2
-+#define WMI_CCX_VER_IE             2 /* ieType to set CCX Version IE */
-+
-+#define WMI_MAX_ASSOC_INFO_LEN     240
-+
-+typedef PREPACK struct {
-+    A_UINT8     ieType;
-+    A_UINT8     bufferSize;
-+    A_UINT8     assocInfo[1];       /* up to WMI_MAX_ASSOC_INFO_LEN */
-+} POSTPACK WMI_SET_ASSOC_INFO_CMD;
-+
-+
-+/*
-+ * WMI_GET_TX_PWR_CMDID does not take any parameters
-+ */
-+
-+/*
-+ * WMI_ADD_BAD_AP_CMDID
-+ */
-+#define WMI_MAX_BAD_AP_INDEX      1
-+
-+typedef PREPACK struct {
-+    A_UINT8     badApIndex;         /* 0 to WMI_MAX_BAD_AP_INDEX */
-+    A_UINT8     bssid[ATH_MAC_LEN];
-+} POSTPACK WMI_ADD_BAD_AP_CMD;
-+
-+/*
-+ * WMI_DELETE_BAD_AP_CMDID
-+ */
-+typedef PREPACK struct {
-+    A_UINT8     badApIndex;         /* 0 to WMI_MAX_BAD_AP_INDEX */
-+} POSTPACK WMI_DELETE_BAD_AP_CMD;
-+
-+/*
-+ * WMI_SET_ACCESS_PARAMS_CMDID
-+ */
-+#define WMI_DEFAULT_TXOP_ACPARAM    0       /* implies one MSDU */
-+#define WMI_DEFAULT_ECWMIN_ACPARAM  4       /* corresponds to CWmin of 15 */
-+#define WMI_DEFAULT_ECWMAX_ACPARAM  10      /* corresponds to CWmax of 1023 */
-+#define WMI_MAX_CW_ACPARAM          15      /* maximum eCWmin or eCWmax */
-+#define WMI_DEFAULT_AIFSN_ACPARAM   2
-+#define WMI_MAX_AIFSN_ACPARAM       15
-+typedef PREPACK struct {
-+    A_UINT16 txop;                      /* in units of 32 usec */
-+    A_UINT8  eCWmin;
-+    A_UINT8  eCWmax;
-+    A_UINT8  aifsn;
-+} POSTPACK WMI_SET_ACCESS_PARAMS_CMD;
-+
-+
-+/*
-+ * WMI_SET_RETRY_LIMITS_CMDID
-+ *
-+ * This command is used to customize the number of retries the
-+ * wlan device will perform on a given frame.
-+ */
-+#define WMI_MIN_RETRIES 2
-+#define WMI_MAX_RETRIES 13
-+typedef enum {
-+    MGMT_FRAMETYPE    = 0,
-+    CONTROL_FRAMETYPE = 1,
-+    DATA_FRAMETYPE    = 2
-+} WMI_FRAMETYPE;
-+
-+typedef PREPACK struct {
-+    A_UINT8 frameType;                      /* WMI_FRAMETYPE */
-+    A_UINT8 trafficClass;                   /* applies only to DATA_FRAMETYPE */
-+    A_UINT8 maxRetries;
-+    A_UINT8 enableNotify;
-+} POSTPACK WMI_SET_RETRY_LIMITS_CMD;
-+
-+/*
-+ * WMI_SET_ROAM_CTRL_CMDID
-+ *
-+ * This command is used to influence the Roaming behaviour
-+ * Set the host biases of the BSSs before setting the roam mode as bias
-+ * based.
-+ */
-+
-+/*
-+ * Different types of Roam Control
-+ */
-+
-+typedef enum {
-+        WMI_FORCE_ROAM          = 1,      /* Roam to the specified BSSID */
-+        WMI_SET_ROAM_MODE       = 2,      /* default ,progd bias, no roam */
-+        WMI_SET_HOST_BIAS       = 3,     /* Set the Host Bias */
-+        WMI_SET_LOWRSSI_SCAN_PARAMS = 4, /* Set lowrssi Scan parameters */
-+} WMI_ROAM_CTRL_TYPE;
-+
-+#define WMI_MIN_ROAM_CTRL_TYPE WMI_FORCE_ROAM
-+#define WMI_MAX_ROAM_CTRL_TYPE WMI_SET_LOWRSSI_SCAN_PARAMS
-+
-+/*
-+ * ROAM MODES
-+ */
-+
-+typedef enum {
-+        WMI_DEFAULT_ROAM_MODE   = 1,  /* RSSI based ROAM */
-+        WMI_HOST_BIAS_ROAM_MODE = 2, /* HOST BIAS based ROAM */
-+        WMI_LOCK_BSS_MODE  = 3  /* Lock to the Current BSS - no Roam */
-+} WMI_ROAM_MODE;
-+
-+/*
-+ * BSS HOST BIAS INFO
-+ */
-+
-+typedef PREPACK struct {
-+        A_UINT8 bssid[ATH_MAC_LEN];
-+        A_INT8  bias;
-+} POSTPACK WMI_BSS_BIAS;
-+
-+typedef PREPACK struct {
-+        A_UINT8 numBss;
-+        WMI_BSS_BIAS bssBias[1];
-+} POSTPACK WMI_BSS_BIAS_INFO;
-+
-+typedef PREPACK struct WMI_LOWRSSI_SCAN_PARAMS {
-+        A_UINT16 lowrssi_scan_period;
-+        A_INT16  lowrssi_scan_threshold;
-+        A_INT16  lowrssi_roam_threshold;
-+        A_UINT8  roam_rssi_floor;
-+        A_UINT8  reserved[1];              /* For alignment */
-+} POSTPACK WMI_LOWRSSI_SCAN_PARAMS;
-+
-+typedef PREPACK struct {
-+    PREPACK union {
-+        A_UINT8 bssid[ATH_MAC_LEN]; /* WMI_FORCE_ROAM */
-+        A_UINT8 roamMode;           /* WMI_SET_ROAM_MODE  */
-+        WMI_BSS_BIAS_INFO bssBiasInfo; /* WMI_SET_HOST_BIAS */
-+        WMI_LOWRSSI_SCAN_PARAMS lrScanParams;
-+    } POSTPACK info;
-+    A_UINT8   roamCtrlType ;
-+} POSTPACK WMI_SET_ROAM_CTRL_CMD;
-+
-+/*
-+ * WMI_ENABLE_RM_CMDID
-+ */
-+typedef PREPACK struct {
-+        A_BOOL enable_radio_measurements;
-+} POSTPACK WMI_ENABLE_RM_CMD;
-+
-+/*
-+ * WMI_SET_MAX_OFFHOME_DURATION_CMDID
-+ */
-+typedef PREPACK struct {
-+        A_UINT8 max_offhome_duration;
-+} POSTPACK WMI_SET_MAX_OFFHOME_DURATION_CMD;
-+
-+typedef PREPACK struct {
-+    A_UINT32 frequency;
-+    A_UINT8  threshold;
-+} POSTPACK WMI_SET_HB_CHALLENGE_RESP_PARAMS_CMD;
-+
-+typedef enum {
-+    BT_STREAM_UNDEF = 0,
-+    BT_STREAM_SCO,             /* SCO stream */
-+    BT_STREAM_A2DP,            /* A2DP stream */
-+    BT_STREAM_MAX
-+} BT_STREAM_TYPE;
-+
-+typedef enum {
-+    BT_PARAM_SCO = 1,         /* SCO stream parameters */
-+    BT_PARAM_A2DP,            /* A2DP stream parameters */
-+    BT_PARAM_MISC,            /* miscellaneous parameters */
-+    BT_PARAM_REGS,            /* co-existence register parameters */
-+    BT_PARAM_MAX
-+} BT_PARAM_TYPE;
-+
-+typedef enum {
-+    BT_STATUS_UNDEF = 0,
-+    BT_STATUS_START,
-+    BT_STATUS_STOP,
-+    BT_STATUS_RESUME,
-+    BT_STATUS_SUSPEND,
-+    BT_STATUS_MAX
-+} BT_STREAM_STATUS;
-+
-+typedef PREPACK struct {
-+    A_UINT8 streamType;
-+    A_UINT8 status;
-+} POSTPACK WMI_SET_BT_STATUS_CMD;
-+
-+typedef PREPACK struct {
-+    A_UINT8 noSCOPkts;
-+    A_UINT8 pspollTimeout;
-+    A_UINT8 stompbt;
-+} POSTPACK BT_PARAMS_SCO;
-+
-+typedef PREPACK struct {
-+    A_UINT32 period;
-+    A_UINT32 dutycycle;
-+    A_UINT8  stompbt;
-+} POSTPACK BT_PARAMS_A2DP;
-+
-+typedef PREPACK struct {
-+    A_UINT32 mode;
-+    A_UINT32 scoWghts;
-+    A_UINT32 a2dpWghts;
-+    A_UINT32 genWghts;
-+    A_UINT32 mode2;
-+    A_UINT8  setVal;
-+} POSTPACK BT_COEX_REGS;
-+
-+typedef enum {
-+    WLAN_PROTECT_POLICY = 1,
-+    WLAN_COEX_CTRL_FLAGS
-+} BT_PARAMS_MISC_TYPE;
-+
-+typedef enum {
-+    WLAN_PROTECT_PER_STREAM = 0x01,   /* default */
-+    WLAN_PROTECT_ANY_TX = 0x02
-+} WLAN_PROTECT_FLAGS;
-+
-+
-+#define WLAN_DISABLE_COEX_IN_DISCONNECT   0x01 /* default */
-+#define WLAN_KEEP_COEX_IN_DISCONNECT      0x02
-+#define WLAN_STOMPBT_IN_DISCONNECT        0x04
-+
-+#define WLAN_DISABLE_COEX_IN_ROAM         0x10 /* default */
-+#define WLAN_KEEP_COEX_IN_ROAM            0x20
-+#define WLAN_STOMPBT_IN_ROAM              0x40
-+
-+#define WLAN_DISABLE_COEX_IN_SCAN        0x100 /* default */
-+#define WLAN_KEEP_COEX_IN_SCAN           0x200
-+#define WLAN_STOMPBT_IN_SCAN             0x400
-+
-+#define WLAN_DISABLE_COEX_BT_OFF        0x1000 /* default */
-+#define WLAN_KEEP_COEX_BT_OFF           0x2000
-+#define WLAN_STOMPBT_BT_OFF             0x4000
-+
-+typedef PREPACK struct {
-+    A_UINT32 period;
-+    A_UINT32 dutycycle;
-+    A_UINT8  stompbt;
-+    A_UINT8  policy;
-+} POSTPACK WLAN_PROTECT_POLICY_TYPE;
-+
-+typedef PREPACK struct {
-+    PREPACK union {
-+        WLAN_PROTECT_POLICY_TYPE protectParams;
-+        A_UINT16 wlanCtrlFlags;
-+    } POSTPACK info;
-+    A_UINT8 paramType;
-+} POSTPACK BT_PARAMS_MISC;
-+
-+typedef PREPACK struct {
-+    PREPACK union {
-+        BT_PARAMS_SCO scoParams;
-+        BT_PARAMS_A2DP a2dpParams;
-+        BT_PARAMS_MISC miscParams;
-+        BT_COEX_REGS regs;
-+    } POSTPACK info;
-+    A_UINT8 paramType;
-+} POSTPACK WMI_SET_BT_PARAMS_CMD;
-+
-+/*
-+ * Command Replies
-+ */
-+
-+/*
-+ * WMI_GET_CHANNEL_LIST_CMDID reply
-+ */
-+typedef PREPACK struct {
-+    A_UINT8     reserved1;
-+    A_UINT8     numChannels;            /* number of channels in reply */
-+    A_UINT16    channelList[1];         /* channel in Mhz */
-+} POSTPACK WMI_CHANNEL_LIST_REPLY;
-+
-+typedef enum {
-+    A_SUCCEEDED = A_OK,
-+    A_FAILED_DELETE_STREAM_DOESNOT_EXIST=250,
-+    A_SUCCEEDED_MODIFY_STREAM=251,
-+    A_FAILED_INVALID_STREAM = 252,
-+    A_FAILED_MAX_THINSTREAMS = 253,
-+    A_FAILED_CREATE_REMOVE_PSTREAM_FIRST = 254,
-+} PSTREAM_REPLY_STATUS;
-+
-+/*
-+ * List of Events (target to host)
-+ */
-+typedef enum {
-+    WMI_READY_EVENTID           = 0x1001,
-+    WMI_CONNECT_EVENTID,
-+    WMI_DISCONNECT_EVENTID,
-+    WMI_BSSINFO_EVENTID,
-+    WMI_CMDERROR_EVENTID,
-+    WMI_REGDOMAIN_EVENTID,
-+    WMI_PSTREAM_TIMEOUT_EVENTID,
-+    WMI_NEIGHBOR_REPORT_EVENTID,
-+    WMI_TKIP_MICERR_EVENTID,
-+    WMI_SCAN_COMPLETE_EVENTID,
-+    WMI_REPORT_STATISTICS_EVENTID,
-+    WMI_RSSI_THRESHOLD_EVENTID,
-+    WMI_ERROR_REPORT_EVENTID,
-+    WMI_OPT_RX_FRAME_EVENTID,
-+    WMI_REPORT_ROAM_TBL_EVENTID,
-+    WMI_EXTENSION_EVENTID,
-+    WMI_CAC_EVENTID,
-+    WMI_SNR_THRESHOLD_EVENTID,
-+    WMI_LQ_THRESHOLD_EVENTID,
-+    WMI_TX_RETRY_ERR_EVENTID,
-+    WMI_REPORT_ROAM_DATA_EVENTID,
-+    WMI_TEST_EVENTID,
-+    WMI_APLIST_EVENTID,
-+    WMI_GET_WOW_LIST_EVENTID,
-+    WMI_GET_PMKID_LIST_EVENTID
-+} WMI_EVENT_ID;
-+
-+typedef enum {
-+    WMI_11A_CAPABILITY   = 1,
-+    WMI_11G_CAPABILITY   = 2,
-+    WMI_11AG_CAPABILITY  = 3,
-+} WMI_PHY_CAPABILITY;
-+
-+typedef PREPACK struct {
-+    A_UINT8     macaddr[ATH_MAC_LEN];
-+    A_UINT8     phyCapability;              /* WMI_PHY_CAPABILITY */
-+} POSTPACK WMI_READY_EVENT;
-+
-+/*
-+ * Connect Event
-+ */
-+typedef PREPACK struct {
-+    A_UINT16    channel;
-+    A_UINT8     bssid[ATH_MAC_LEN];
-+    A_UINT16    listenInterval;
-+    A_UINT16    beaconInterval;
-+    A_UINT32    networkType;
-+    A_UINT8     beaconIeLen;
-+    A_UINT8     assocReqLen;
-+    A_UINT8     assocRespLen;
-+    A_UINT8     assocInfo[1];
-+} POSTPACK WMI_CONNECT_EVENT;
-+
-+/*
-+ * Disconnect Event
-+ */
-+typedef enum {
-+    NO_NETWORK_AVAIL   = 0x01,
-+    LOST_LINK          = 0x02,     /* bmiss */
-+    DISCONNECT_CMD     = 0x03,
-+    BSS_DISCONNECTED   = 0x04,
-+    AUTH_FAILED        = 0x05,
-+    ASSOC_FAILED       = 0x06,
-+    NO_RESOURCES_AVAIL = 0x07,
-+    CSERV_DISCONNECT   = 0x08,
-+    INVALID_PROFILE    = 0x0a,
-+    DOT11H_CHANNEL_SWITCH = 0x0b,
-+} WMI_DISCONNECT_REASON;
-+
-+typedef PREPACK struct {
-+    A_UINT16    protocolReasonStatus;  /* reason code, see 802.11 spec. */
-+    A_UINT8     bssid[ATH_MAC_LEN];    /* set if known */
-+    A_UINT8     disconnectReason ;      /* see WMI_DISCONNECT_REASON */
-+    A_UINT8     assocRespLen;
-+    A_UINT8     assocInfo[1];
-+} POSTPACK WMI_DISCONNECT_EVENT;
-+
-+/*
-+ * BSS Info Event.
-+ * Mechanism used to inform host of the presence and characteristic of
-+ * wireless networks present.  Consists of bss info header followed by
-+ * the beacon or probe-response frame body.  The 802.11 header is not included.
-+ */
-+typedef enum {
-+    BEACON_FTYPE = 0x1,
-+    PROBERESP_FTYPE,
-+    ACTION_MGMT_FTYPE,
-+} WMI_BI_FTYPE;
-+
-+enum {
-+    BSS_ELEMID_CHANSWITCH = 0x01,
-+    BSS_ELEMID_ATHEROS = 0x02,
-+};
-+
-+typedef PREPACK struct {
-+    A_UINT16    channel;
-+    A_UINT8     frameType;          /* see WMI_BI_FTYPE */
-+    A_UINT8     snr;
-+    A_INT16     rssi;
-+    A_UINT8     bssid[ATH_MAC_LEN];
-+    A_UINT32    ieMask;
-+} POSTPACK WMI_BSS_INFO_HDR;
-+
-+/*
-+ * Command Error Event
-+ */
-+typedef enum {
-+    INVALID_PARAM  = 0x01,
-+    ILLEGAL_STATE  = 0x02,
-+    INTERNAL_ERROR = 0x03,
-+} WMI_ERROR_CODE;
-+
-+typedef PREPACK struct {
-+    A_UINT16    commandId;
-+    A_UINT8     errorCode;
-+} POSTPACK WMI_CMD_ERROR_EVENT;
-+
-+/*
-+ * New Regulatory Domain Event
-+ */
-+typedef PREPACK struct {
-+    A_UINT32    regDomain;
-+} POSTPACK WMI_REG_DOMAIN_EVENT;
-+
-+typedef PREPACK struct {
-+    A_UINT8     trafficClass;
-+} POSTPACK WMI_PSTREAM_TIMEOUT_EVENT;
-+
-+/*
-+ * The WMI_NEIGHBOR_REPORT Event is generated by the target to inform
-+ * the host of BSS's it has found that matches the current profile.
-+ * It can be used by the host to cache PMKs and/to initiate pre-authentication
-+ * if the BSS supports it.  The first bssid is always the current associated
-+ * BSS.
-+ * The bssid and bssFlags information repeats according to the number
-+ * or APs reported.
-+ */
-+typedef enum {
-+    WMI_DEFAULT_BSS_FLAGS   = 0x00,
-+    WMI_PREAUTH_CAPABLE_BSS = 0x01,
-+    WMI_PMKID_VALID_BSS     = 0x02,
-+} WMI_BSS_FLAGS;
-+
-+typedef PREPACK struct {
-+    A_UINT8     bssid[ATH_MAC_LEN];
-+    A_UINT8     bssFlags;            /* see WMI_BSS_FLAGS */
-+} POSTPACK WMI_NEIGHBOR_INFO;
-+
-+typedef PREPACK struct {
-+    A_INT8      numberOfAps;
-+    WMI_NEIGHBOR_INFO neighbor[1];
-+} POSTPACK WMI_NEIGHBOR_REPORT_EVENT;
-+
-+/*
-+ * TKIP MIC Error Event
-+ */
-+typedef PREPACK struct {
-+    A_UINT8 keyid;
-+    A_UINT8 ismcast;
-+} POSTPACK WMI_TKIP_MICERR_EVENT;
-+
-+/*
-+ * WMI_SCAN_COMPLETE_EVENTID - no parameters (old), staus parameter (new)
-+ */
-+typedef PREPACK struct {
-+    A_STATUS status;
-+} POSTPACK WMI_SCAN_COMPLETE_EVENT;
-+
-+#define MAX_OPT_DATA_LEN 1400
-+
-+/*
-+ * WMI_SET_ADHOC_BSSID_CMDID
-+ */
-+typedef PREPACK struct {
-+    A_UINT8     bssid[ATH_MAC_LEN];
-+} POSTPACK WMI_SET_ADHOC_BSSID_CMD;
-+
-+/*
-+ * WMI_SET_OPT_MODE_CMDID
-+ */
-+typedef enum {
-+    SPECIAL_OFF,
-+    SPECIAL_ON,
-+} OPT_MODE_TYPE;
-+
-+typedef PREPACK struct {
-+    A_UINT8     optMode;
-+} POSTPACK WMI_SET_OPT_MODE_CMD;
-+
-+/*
-+ * WMI_TX_OPT_FRAME_CMDID
-+ */
-+typedef enum {
-+    OPT_PROBE_REQ   = 0x01,
-+    OPT_PROBE_RESP  = 0x02,
-+    OPT_CPPP_START  = 0x03,
-+    OPT_CPPP_STOP   = 0x04,
-+} WMI_OPT_FTYPE;
-+
-+typedef PREPACK struct {
-+    A_UINT16    optIEDataLen;
-+    A_UINT8     frmType;
-+    A_UINT8     dstAddr[ATH_MAC_LEN];
-+    A_UINT8     bssid[ATH_MAC_LEN];
-+    A_UINT8     reserved;               /* For alignment */
-+    A_UINT8     optIEData[1];
-+} POSTPACK WMI_OPT_TX_FRAME_CMD;
-+
-+/*
-+ * Special frame receive Event.
-+ * Mechanism used to inform host of the receiption of the special frames.
-+ * Consists of special frame info header followed by special frame body.
-+ * The 802.11 header is not included.
-+ */
-+typedef PREPACK struct {
-+    A_UINT16    channel;
-+    A_UINT8     frameType;          /* see WMI_OPT_FTYPE */
-+    A_INT8      snr;
-+    A_UINT8     srcAddr[ATH_MAC_LEN];
-+    A_UINT8     bssid[ATH_MAC_LEN];
-+} POSTPACK WMI_OPT_RX_INFO_HDR;
-+
-+/*
-+ * Reporting statistics.
-+ */
-+typedef PREPACK struct {
-+    A_UINT32   tx_packets;
-+    A_UINT32   tx_bytes;
-+    A_UINT32   tx_unicast_pkts;
-+    A_UINT32   tx_unicast_bytes;
-+    A_UINT32   tx_multicast_pkts;
-+    A_UINT32   tx_multicast_bytes;
-+    A_UINT32   tx_broadcast_pkts;
-+    A_UINT32   tx_broadcast_bytes;
-+    A_UINT32   tx_rts_success_cnt;
-+    A_UINT32   tx_packet_per_ac[4];
-+    A_UINT32   tx_errors_per_ac[4];
-+
-+    A_UINT32   tx_errors;
-+    A_UINT32   tx_failed_cnt;
-+    A_UINT32   tx_retry_cnt;
-+    A_UINT32   tx_rts_fail_cnt;
-+    A_INT32    tx_unicast_rate;
-+}POSTPACK tx_stats_t;
-+
-+typedef PREPACK struct {
-+    A_UINT32   rx_packets;
-+    A_UINT32   rx_bytes;
-+    A_UINT32   rx_unicast_pkts;
-+    A_UINT32   rx_unicast_bytes;
-+    A_UINT32   rx_multicast_pkts;
-+    A_UINT32   rx_multicast_bytes;
-+    A_UINT32   rx_broadcast_pkts;
-+    A_UINT32   rx_broadcast_bytes;
-+    A_UINT32   rx_fragment_pkt;
-+
-+    A_UINT32   rx_errors;
-+    A_UINT32   rx_crcerr;
-+    A_UINT32   rx_key_cache_miss;
-+    A_UINT32   rx_decrypt_err;
-+    A_UINT32   rx_duplicate_frames;
-+    A_INT32    rx_unicast_rate;
-+}POSTPACK rx_stats_t;
-+
-+typedef PREPACK struct {
-+    A_UINT32   tkip_local_mic_failure;
-+    A_UINT32   tkip_counter_measures_invoked;
-+    A_UINT32   tkip_replays;
-+    A_UINT32   tkip_format_errors;
-+    A_UINT32   ccmp_format_errors;
-+    A_UINT32   ccmp_replays;
-+}POSTPACK tkip_ccmp_stats_t;
-+
-+typedef PREPACK struct {
-+    A_UINT32   power_save_failure_cnt;
-+}POSTPACK pm_stats_t;
-+
-+typedef PREPACK struct {
-+    A_UINT32    cs_bmiss_cnt;
-+    A_UINT32    cs_lowRssi_cnt;
-+    A_UINT16    cs_connect_cnt;
-+    A_UINT16    cs_disconnect_cnt;
-+    A_INT16     cs_aveBeacon_rssi;
-+    A_UINT16    cs_roam_count;
-+    A_UINT16    cs_rssi;
-+    A_UINT8     cs_snr;
-+    A_UINT8     cs_aveBeacon_snr;
-+    A_UINT8     cs_lastRoam_msec;
-+} POSTPACK cserv_stats_t;
-+
-+typedef PREPACK struct {
-+    tx_stats_t          tx_stats;
-+    rx_stats_t          rx_stats;
-+    tkip_ccmp_stats_t   tkipCcmpStats;
-+}POSTPACK wlan_net_stats_t;
-+
-+typedef PREPACK struct {
-+    A_UINT32    wow_num_pkts_dropped;
-+    A_UINT16    wow_num_events_discarded;
-+    A_UINT8     wow_num_host_pkt_wakeups;
-+    A_UINT8     wow_num_host_event_wakeups;
-+} POSTPACK wlan_wow_stats_t;
-+
-+typedef PREPACK struct {
-+    A_UINT32            lqVal;
-+    A_INT32             noise_floor_calibation;
-+    pm_stats_t          pmStats;
-+    wlan_net_stats_t    txrxStats;
-+    wlan_wow_stats_t    wowStats;
-+    cserv_stats_t       cservStats;
-+} POSTPACK WMI_TARGET_STATS;
-+
-+/*
-+ * WMI_RSSI_THRESHOLD_EVENTID.
-+ * Indicate the RSSI events to host. Events are indicated when we breach a
-+ * thresold value.
-+ */
-+typedef enum{
-+    WMI_RSSI_THRESHOLD1_ABOVE = 0,
-+    WMI_RSSI_THRESHOLD2_ABOVE,
-+    WMI_RSSI_THRESHOLD3_ABOVE,
-+    WMI_RSSI_THRESHOLD4_ABOVE,
-+    WMI_RSSI_THRESHOLD5_ABOVE,
-+    WMI_RSSI_THRESHOLD6_ABOVE,
-+    WMI_RSSI_THRESHOLD1_BELOW,
-+    WMI_RSSI_THRESHOLD2_BELOW,
-+    WMI_RSSI_THRESHOLD3_BELOW,
-+    WMI_RSSI_THRESHOLD4_BELOW,
-+    WMI_RSSI_THRESHOLD5_BELOW,
-+    WMI_RSSI_THRESHOLD6_BELOW
-+}WMI_RSSI_THRESHOLD_VAL;
-+
-+typedef PREPACK struct {
-+    A_INT16 rssi;
-+    A_UINT8 range;
-+}POSTPACK WMI_RSSI_THRESHOLD_EVENT;
-+
-+/*
-+ *  WMI_ERROR_REPORT_EVENTID
-+ */
-+typedef enum{
-+    WMI_TARGET_PM_ERR_FAIL      = 0x00000001,
-+    WMI_TARGET_KEY_NOT_FOUND    = 0x00000002,
-+    WMI_TARGET_DECRYPTION_ERR   = 0x00000004,
-+    WMI_TARGET_BMISS            = 0x00000008,
-+    WMI_PSDISABLE_NODE_JOIN     = 0x00000010,
-+    WMI_TARGET_COM_ERR          = 0x00000020,
-+    WMI_TARGET_FATAL_ERR        = 0x00000040
-+} WMI_TARGET_ERROR_VAL;
-+
-+typedef PREPACK struct {
-+    A_UINT32 errorVal;
-+}POSTPACK  WMI_TARGET_ERROR_REPORT_EVENT;
-+
-+typedef PREPACK struct {
-+    A_UINT8 retrys;
-+}POSTPACK  WMI_TX_RETRY_ERR_EVENT;
-+
-+typedef enum{
-+    WMI_SNR_THRESHOLD1_ABOVE = 1,
-+    WMI_SNR_THRESHOLD1_BELOW,
-+    WMI_SNR_THRESHOLD2_ABOVE,
-+    WMI_SNR_THRESHOLD2_BELOW,
-+    WMI_SNR_THRESHOLD3_ABOVE,
-+    WMI_SNR_THRESHOLD3_BELOW,
-+    WMI_SNR_THRESHOLD4_ABOVE,
-+    WMI_SNR_THRESHOLD4_BELOW
-+} WMI_SNR_THRESHOLD_VAL;
-+
-+typedef PREPACK struct {
-+    A_UINT8 range;  /* WMI_SNR_THRESHOLD_VAL */
-+    A_UINT8 snr;
-+}POSTPACK  WMI_SNR_THRESHOLD_EVENT;
-+
-+typedef enum{
-+    WMI_LQ_THRESHOLD1_ABOVE = 1,
-+    WMI_LQ_THRESHOLD1_BELOW,
-+    WMI_LQ_THRESHOLD2_ABOVE,
-+    WMI_LQ_THRESHOLD2_BELOW,
-+    WMI_LQ_THRESHOLD3_ABOVE,
-+    WMI_LQ_THRESHOLD3_BELOW,
-+    WMI_LQ_THRESHOLD4_ABOVE,
-+    WMI_LQ_THRESHOLD4_BELOW
-+} WMI_LQ_THRESHOLD_VAL;
-+
-+typedef PREPACK struct {
-+    A_INT32 lq;
-+    A_UINT8 range;  /* WMI_LQ_THRESHOLD_VAL */
-+}POSTPACK  WMI_LQ_THRESHOLD_EVENT;
-+/*
-+ * WMI_REPORT_ROAM_TBL_EVENTID
-+ */
-+#define MAX_ROAM_TBL_CAND   5
-+
-+typedef PREPACK struct {
-+    A_INT32 roam_util;
-+    A_UINT8 bssid[ATH_MAC_LEN];
-+    A_INT8  rssi;
-+    A_INT8  rssidt;
-+    A_INT8  last_rssi;
-+    A_INT8  util;
-+    A_INT8  bias;
-+    A_UINT8 reserved; /* For alignment */
-+} POSTPACK WMI_BSS_ROAM_INFO;
-+
-+
-+typedef PREPACK struct {
-+    A_UINT16  roamMode;
-+    A_UINT16  numEntries;
-+    WMI_BSS_ROAM_INFO bssRoamInfo[1];
-+} POSTPACK WMI_TARGET_ROAM_TBL;
-+
-+/*
-+ *  WMI_CAC_EVENTID
-+ */
-+typedef enum {
-+    CAC_INDICATION_ADMISSION = 0x00,
-+    CAC_INDICATION_ADMISSION_RESP = 0x01,
-+    CAC_INDICATION_DELETE = 0x02,
-+    CAC_INDICATION_NO_RESP = 0x03,
-+}CAC_INDICATION;
-+
-+#define WMM_TSPEC_IE_LEN   63
-+
-+typedef PREPACK struct {
-+    A_UINT8 ac;
-+    A_UINT8 cac_indication;
-+    A_UINT8 statusCode;
-+    A_UINT8 tspecSuggestion[WMM_TSPEC_IE_LEN];
-+}POSTPACK  WMI_CAC_EVENT;
-+
-+/*
-+ * WMI_APLIST_EVENTID
-+ */
-+
-+typedef enum {
-+    APLIST_VER1 = 1,
-+} APLIST_VER;
-+
-+typedef PREPACK struct {
-+    A_UINT8     bssid[ATH_MAC_LEN];
-+    A_UINT16    channel;
-+} POSTPACK  WMI_AP_INFO_V1;
-+
-+typedef PREPACK union {
-+    WMI_AP_INFO_V1  apInfoV1;
-+} POSTPACK WMI_AP_INFO;
-+
-+typedef PREPACK struct {
-+    A_UINT8     apListVer;
-+    A_UINT8     numAP;
-+    WMI_AP_INFO apList[1];
-+} POSTPACK WMI_APLIST_EVENT;
-+
-+/*
-+ * developer commands
-+ */
-+
-+/*
-+ * WMI_SET_BITRATE_CMDID
-+ *
-+ * Get bit rate cmd uses same definition as set bit rate cmd
-+ */
-+typedef enum {
-+    RATE_AUTO   = -1,
-+    RATE_1Mb    = 0,
-+    RATE_2Mb    = 1,
-+    RATE_5_5Mb  = 2,
-+    RATE_11Mb   = 3,
-+    RATE_6Mb    = 4,
-+    RATE_9Mb    = 5,
-+    RATE_12Mb   = 6,
-+    RATE_18Mb   = 7,
-+    RATE_24Mb   = 8,
-+    RATE_36Mb   = 9,
-+    RATE_48Mb   = 10,
-+    RATE_54Mb   = 11,
-+} WMI_BIT_RATE;
-+
-+typedef PREPACK struct {
-+    A_INT8      rateIndex;          /* see WMI_BIT_RATE */
-+} POSTPACK WMI_BIT_RATE_CMD, WMI_BIT_RATE_REPLY;
-+
-+/*
-+ * WMI_SET_FIXRATES_CMDID
-+ *
-+ * Get fix rates cmd uses same definition as set fix rates cmd
-+ */
-+typedef enum {
-+    FIX_RATE_1Mb    = 0x1,
-+    FIX_RATE_2Mb    = 0x2,
-+    FIX_RATE_5_5Mb  = 0x4,
-+    FIX_RATE_11Mb   = 0x8,
-+    FIX_RATE_6Mb    = 0x10,
-+    FIX_RATE_9Mb    = 0x20,
-+    FIX_RATE_12Mb   = 0x40,
-+    FIX_RATE_18Mb   = 0x80,
-+    FIX_RATE_24Mb   = 0x100,
-+    FIX_RATE_36Mb   = 0x200,
-+    FIX_RATE_48Mb   = 0x400,
-+    FIX_RATE_54Mb   = 0x800,
-+} WMI_FIX_RATES_MASK;
-+
-+typedef PREPACK struct {
-+    A_UINT16      fixRateMask;          /* see WMI_BIT_RATE */
-+} POSTPACK WMI_FIX_RATES_CMD, WMI_FIX_RATES_REPLY;
-+
-+/*
-+ * WMI_SET_RECONNECT_AUTH_MODE_CMDID
-+ *
-+ * Set authentication mode
-+ */
-+typedef enum {
-+    RECONN_DO_AUTH = 0x00,
-+    RECONN_NOT_AUTH = 0x01
-+} WMI_AUTH_MODE;
-+
-+typedef PREPACK struct {
-+    A_UINT8 mode;
-+} POSTPACK WMI_SET_AUTH_MODE_CMD;
-+
-+/*
-+ * WMI_SET_REASSOC_MODE_CMDID
-+ *
-+ * Set authentication mode
-+ */
-+typedef enum {
-+    REASSOC_DO_DISASSOC = 0x00,
-+    REASSOC_DONOT_DISASSOC = 0x01
-+} WMI_REASSOC_MODE;
-+
-+typedef PREPACK struct {
-+    A_UINT8 mode;
-+}POSTPACK WMI_SET_REASSOC_MODE_CMD;
-+
-+typedef enum {
-+    ROAM_DATA_TIME = 1,            /* Get The Roam Time Data */
-+} ROAM_DATA_TYPE;
-+
-+typedef PREPACK struct {
-+    A_UINT32        disassoc_time;
-+    A_UINT32        no_txrx_time;
-+    A_UINT32        assoc_time;
-+    A_UINT32        allow_txrx_time;
-+    A_UINT32        last_data_txrx_time;
-+    A_UINT32        first_data_txrx_time;
-+    A_UINT8         disassoc_bssid[ATH_MAC_LEN];
-+    A_INT8          disassoc_bss_rssi;
-+    A_UINT8         assoc_bssid[ATH_MAC_LEN];
-+    A_INT8          assoc_bss_rssi;
-+} POSTPACK WMI_TARGET_ROAM_TIME;
-+
-+typedef PREPACK struct {
-+    PREPACK union {
-+        WMI_TARGET_ROAM_TIME roamTime;
-+    } POSTPACK u;
-+    A_UINT8 roamDataType ;
-+} POSTPACK WMI_TARGET_ROAM_DATA;
-+
-+typedef enum {
-+    WMI_WMM_DISABLED = 0,
-+    WMI_WMM_ENABLED
-+} WMI_WMM_STATUS;
-+
-+typedef PREPACK struct {
-+    A_UINT8    status;
-+}POSTPACK WMI_SET_WMM_CMD;
-+
-+typedef enum {
-+    WMI_TXOP_DISABLED = 0,
-+    WMI_TXOP_ENABLED
-+} WMI_TXOP_CFG;
-+
-+typedef PREPACK struct {
-+    A_UINT8    txopEnable;
-+}POSTPACK WMI_SET_WMM_TXOP_CMD;
-+
-+typedef PREPACK struct {
-+    A_UINT8 keepaliveInterval;
-+} POSTPACK WMI_SET_KEEPALIVE_CMD;
-+
-+typedef PREPACK struct {
-+    A_BOOL configured;
-+    A_UINT8 keepaliveInterval;
-+} POSTPACK WMI_GET_KEEPALIVE_CMD;
-+
-+/*
-+ * Add Application specified IE to a management frame
-+ */
-+#define WMI_MAX_IE_LEN  78
-+
-+typedef PREPACK struct {
-+    A_UINT8 mgmtFrmType;  /* one of WMI_MGMT_FRAME_TYPE */
-+    A_UINT8 ieLen;    /* Length  of the IE that should be added to the MGMT frame */
-+    A_UINT8 ieInfo[1];
-+} POSTPACK WMI_SET_APPIE_CMD;
-+
-+/*
-+ * Notify the WSC registration status to the target
-+ */
-+#define WSC_REG_ACTIVE     1
-+#define WSC_REG_INACTIVE   0
-+/* Generic Hal Interface for setting hal paramters. */
-+/* Add new Set HAL Param cmdIds here for newer params */
-+typedef enum {
-+   WHAL_SETCABTO_CMDID = 1,
-+}WHAL_CMDID;
-+
-+typedef PREPACK struct {
-+    A_UINT8 cabTimeOut;
-+} POSTPACK WHAL_SETCABTO_PARAM;
-+
-+typedef PREPACK struct {
-+    A_UINT8  whalCmdId;
-+    A_UINT8 data[1];
-+} POSTPACK WHAL_PARAMCMD;
-+
-+
-+#define WOW_MAX_FILTER_LISTS 1 /*4*/
-+#define WOW_MAX_FILTERS_PER_LIST 4
-+#define WOW_PATTERN_SIZE 64
-+#define WOW_MASK_SIZE 64
-+
-+typedef PREPACK struct {
-+    A_UINT8 wow_valid_filter;
-+    A_UINT8 wow_filter_id;
-+    A_UINT8 wow_filter_size;
-+    A_UINT8 wow_filter_offset;
-+    A_UINT8 wow_filter_mask[WOW_MASK_SIZE];
-+    A_UINT8 wow_filter_pattern[WOW_PATTERN_SIZE];
-+} POSTPACK WOW_FILTER;
-+
-+
-+typedef PREPACK struct {
-+    A_UINT8 wow_valid_list;
-+    A_UINT8 wow_list_id;
-+    A_UINT8 wow_num_filters;
-+    A_UINT8 wow_total_list_size;
-+    WOW_FILTER list[WOW_MAX_FILTERS_PER_LIST];
-+} POSTPACK WOW_FILTER_LIST;
-+
-+typedef PREPACK struct {
-+    A_BOOL awake;
-+    A_BOOL asleep;
-+} POSTPACK WMI_SET_HOST_SLEEP_MODE_CMD;
-+
-+typedef PREPACK struct {
-+    A_BOOL enable_wow;
-+} POSTPACK WMI_SET_WOW_MODE_CMD;
-+
-+typedef PREPACK struct {
-+    A_UINT8 filter_list_id;
-+} POSTPACK WMI_GET_WOW_LIST_CMD;
-+
-+/*
-+ * WMI_GET_WOW_LIST_CMD reply
-+ */
-+typedef PREPACK struct {
-+    A_UINT8     num_filters;     /* number of patterns in reply */
-+    A_UINT8     this_filter_num; /*  this is filter # x of total num_filters */
-+    A_UINT8     wow_mode;
-+    A_UINT8     host_mode;
-+    WOW_FILTER  wow_filters[1];
-+} POSTPACK WMI_GET_WOW_LIST_REPLY;
-+
-+typedef PREPACK struct {
-+    A_UINT8 filter_list_id;
-+    A_UINT8 filter_size;
-+    A_UINT8 filter_offset;
-+    A_UINT8 filter[1];
-+} POSTPACK WMI_ADD_WOW_PATTERN_CMD;
-+
-+typedef PREPACK struct {
-+    A_UINT16 filter_list_id;
-+    A_UINT16 filter_id;
-+} POSTPACK WMI_DEL_WOW_PATTERN_CMD;
-+
-+typedef PREPACK struct {
-+    A_UINT8 macaddr[ATH_MAC_LEN];
-+} POSTPACK WMI_SET_MAC_ADDRESS_CMD;
-+
-+/*
-+ * WMI_SET_AKMP_PARAMS_CMD
-+ */
-+
-+#define WMI_AKMP_MULTI_PMKID_EN   0x000001
-+
-+typedef PREPACK struct {
-+    A_UINT32    akmpInfo;
-+} POSTPACK WMI_SET_AKMP_PARAMS_CMD;
-+
-+typedef PREPACK struct {
-+    A_UINT8 pmkid[WMI_PMKID_LEN];
-+} POSTPACK WMI_PMKID;
-+
-+/*
-+ * WMI_SET_PMKID_LIST_CMD
-+ */
-+#define WMI_MAX_PMKID_CACHE   8
-+
-+typedef PREPACK struct {
-+    A_UINT32    numPMKID;
-+    WMI_PMKID   pmkidList[WMI_MAX_PMKID_CACHE];
-+} POSTPACK WMI_SET_PMKID_LIST_CMD;
-+
-+/*
-+ * WMI_GET_PMKID_LIST_CMD  Reply
-+ * Following the Number of PMKIDs is the list of PMKIDs
-+ */
-+typedef PREPACK struct {
-+    A_UINT32    numPMKID;
-+    WMI_PMKID   pmkidList[1];
-+} POSTPACK WMI_PMKID_LIST_REPLY;
-+
-+/* index used for priority streams */
-+typedef enum {
-+    WMI_NOT_MAPPED  = -1,
-+    WMI_CONTROL_PRI = 0,
-+    WMI_BEST_EFFORT_PRI = 1,
-+    WMI_LOW_PRI = 2,
-+    WMI_HIGH_PRI = 3,
-+    WMI_HIGHEST_PRI,
-+    WMI_PRI_MAX_COUNT
-+} WMI_PRI_STREAM_ID;
-+
-+#ifndef ATH_TARGET
-+#include "athendpack.h"
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _WMI_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/wmi_api.h b/drivers/sdio/function/wlan/ar6000/include/wmi_api.h
-new file mode 100644
-index 0000000..aa9a9c6
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/wmi_api.h
-@@ -0,0 +1,259 @@
-+#ifndef _WMI_API_H_
-+#define _WMI_API_H_
-+/*
-+ * Copyright (c) 2004-2006 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * This file contains the definitions for the Wireless Module Interface (WMI).
-+ *
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/include/wmi_api.h#2 $
-+ *
-+ *
-+ *  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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/*
-+ * IP QoS Field definitions according to 802.1p
-+ */
-+#define BEST_EFFORT_PRI         0
-+#define BACKGROUND_PRI          1
-+#define EXCELLENT_EFFORT_PRI    3
-+#define CONTROLLED_LOAD_PRI     4
-+#define VIDEO_PRI               5
-+#define VOICE_PRI               6
-+#define NETWORK_CONTROL_PRI     7
-+#define MAX_NUM_PRI             8
-+
-+#define UNDEFINED_PRI           (0xff)
-+
-+/* simple mapping of IP TOS field to a WMI priority stream
-+ * this mapping was taken from the original linux driver implementation
-+ * The operation maps the following
-+ *
-+ *  */
-+#define IP_TOS_TO_WMI_PRI(tos)  \
-+    ((WMI_PRI_STREAM_ID)(((tos) >> 1) & 0x03))
-+
-+#define WMI_IMPLICIT_PSTREAM_INACTIVITY_INT 5000 /* 5 seconds */
-+
-+
-+struct wmi_t;
-+
-+void *wmi_init(void *devt);
-+
-+void wmi_qos_state_init(struct wmi_t *wmip);
-+void wmi_shutdown(struct wmi_t *wmip);
-+A_UINT16  wmi_get_mapped_qos_queue(struct wmi_t *, A_UINT8);
-+A_STATUS wmi_dix_2_dot3(struct wmi_t *wmip, void *osbuf);
-+A_STATUS wmi_data_hdr_add(struct wmi_t *wmip, void *osbuf, A_UINT8 msgType);
-+A_STATUS wmi_dot3_2_dix(struct wmi_t *wmip, void *osbuf);
-+A_STATUS wmi_data_hdr_remove(struct wmi_t *wmip, void *osbuf);
-+A_STATUS wmi_syncpoint(struct wmi_t *wmip);
-+A_STATUS wmi_syncpoint_reset(struct wmi_t *wmip);
-+WMI_PRI_STREAM_ID wmi_get_stream_id(struct wmi_t *wmip, A_UINT8 trafficClass);
-+A_UINT8 wmi_implicit_create_pstream(struct wmi_t *wmip, void *osbuf, A_UINT8 dir, A_UINT8 up);
-+
-+A_STATUS wmi_control_rx(struct wmi_t *wmip, void *osbuf);
-+void wmi_iterate_nodes(struct wmi_t *wmip, wlan_node_iter_func *f, void *arg);
-+void wmi_free_allnodes(struct wmi_t *wmip);
-+bss_t *wmi_find_node(struct wmi_t *wmip, const A_UINT8 *macaddr);
-+
-+
-+typedef enum {
-+    NO_SYNC_WMIFLAG = 0,
-+    SYNC_BEFORE_WMIFLAG,            /* transmit all queued data before cmd */
-+    SYNC_AFTER_WMIFLAG,             /* any new data waits until cmd execs */
-+    SYNC_BOTH_WMIFLAG,
-+    END_WMIFLAG                     /* end marker */
-+} WMI_SYNC_FLAG;
-+
-+A_STATUS wmi_cmd_send(struct wmi_t *wmip, void *osbuf, WMI_COMMAND_ID cmdId,
-+                      WMI_SYNC_FLAG flag);
-+A_STATUS wmi_connect_cmd(struct wmi_t *wmip,
-+                         NETWORK_TYPE netType,
-+                         DOT11_AUTH_MODE dot11AuthMode,
-+                         AUTH_MODE authMode,
-+                         CRYPTO_TYPE pairwiseCrypto,
-+                         A_UINT8 pairwiseCryptoLen,
-+                         CRYPTO_TYPE groupCrypto,
-+                         A_UINT8 groupCryptoLen,
-+                         int ssidLength,
-+                         A_UCHAR *ssid,
-+                         A_UINT8 *bssid,
-+                         A_UINT16 channel,
-+                         A_UINT32 ctrl_flags);
-+A_STATUS wmi_reconnect_cmd(struct wmi_t *wmip,
-+                           A_UINT8 *bssid,
-+                           A_UINT16 channel);
-+A_STATUS wmi_disconnect_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_getrev_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType,
-+                           A_BOOL forceFgScan, A_BOOL isLegacy,
-+                           A_UINT32 homeDwellTime, A_UINT32 forceScanInterval);
-+A_STATUS wmi_scanparams_cmd(struct wmi_t *wmip, A_UINT16 fg_start_sec,
-+                            A_UINT16 fg_end_sec, A_UINT16 bg_sec,
-+                            A_UINT16 minact_chdw_msec,
-+                            A_UINT16 maxact_chdw_msec, A_UINT16 pas_chdw_msec,
-+                            A_UINT8 shScanRatio, A_UINT8 scanCtrlFlags,
-+                            A_UINT32 max_dfsch_act_time);
-+A_STATUS wmi_bssfilter_cmd(struct wmi_t *wmip, A_UINT8 filter, A_UINT32 ieMask);
-+A_STATUS wmi_probedSsid_cmd(struct wmi_t *wmip, A_UINT8 index, A_UINT8 flag,
-+                            A_UINT8 ssidLength, A_UCHAR *ssid);
-+A_STATUS wmi_listeninterval_cmd(struct wmi_t *wmip, A_UINT16 listenInterval, A_UINT16 listenBeacons);
-+A_STATUS wmi_bmisstime_cmd(struct wmi_t *wmip, A_UINT16 bmisstime, A_UINT16 bmissbeacons);
-+A_STATUS wmi_associnfo_cmd(struct wmi_t *wmip, A_UINT8 ieType,
-+                           A_UINT8 ieLen, A_UINT8 *ieInfo);
-+A_STATUS wmi_powermode_cmd(struct wmi_t *wmip, A_UINT8 powerMode);
-+A_STATUS wmi_ibsspmcaps_cmd(struct wmi_t *wmip, A_UINT8 pmEnable, A_UINT8 ttl,
-+                            A_UINT16 atim_windows, A_UINT16 timeout_value);
-+A_STATUS wmi_pmparams_cmd(struct wmi_t *wmip, A_UINT16 idlePeriod,
-+                           A_UINT16 psPollNum, A_UINT16 dtimPolicy);
-+A_STATUS wmi_disctimeout_cmd(struct wmi_t *wmip, A_UINT8 timeout);
-+A_STATUS wmi_sync_cmd(struct wmi_t *wmip, A_UINT8 syncNumber);
-+A_STATUS wmi_create_pstream_cmd(struct wmi_t *wmip, WMI_CREATE_PSTREAM_CMD *pstream);
-+A_STATUS wmi_delete_pstream_cmd(struct wmi_t *wmip, A_UINT8 trafficClass, A_UINT8 streamID);
-+A_STATUS wmi_set_bitrate_cmd(struct wmi_t *wmip, A_INT32 rate);
-+A_STATUS wmi_get_bitrate_cmd(struct wmi_t *wmip);
-+A_INT8   wmi_validate_bitrate(struct wmi_t *wmip, A_INT32 rate);
-+A_STATUS wmi_get_regDomain_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_get_channelList_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_set_channelParams_cmd(struct wmi_t *wmip, A_UINT8 scanParam,
-+                                   WMI_PHY_MODE mode, A_INT8 numChan,
-+                                   A_UINT16 *channelList);
-+
-+A_STATUS wmi_set_snr_threshold_params(struct wmi_t *wmip,
-+                                       WMI_SNR_THRESHOLD_PARAMS_CMD *snrCmd);
-+A_STATUS wmi_set_rssi_threshold_params(struct wmi_t *wmip,
-+                                        WMI_RSSI_THRESHOLD_PARAMS_CMD *rssiCmd);
-+A_STATUS wmi_clr_rssi_snr(struct wmi_t *wmip);
-+A_STATUS wmi_set_lq_threshold_params(struct wmi_t *wmip,
-+                                      WMI_LQ_THRESHOLD_PARAMS_CMD *lqCmd);
-+A_STATUS wmi_set_rts_cmd(struct wmi_t *wmip, A_UINT16 threshold);
-+A_STATUS wmi_set_lpreamble_cmd(struct wmi_t *wmip, A_UINT8 status);
-+
-+A_STATUS wmi_set_error_report_bitmask(struct wmi_t *wmip, A_UINT32 bitmask);
-+
-+A_STATUS wmi_get_challenge_resp_cmd(struct wmi_t *wmip, A_UINT32 cookie,
-+                                    A_UINT32 source);
-+A_STATUS wmi_config_debug_module_cmd(struct wmi_t *wmip, A_UINT16 mmask,
-+                                     A_UINT16 tsr, A_BOOL rep, A_UINT16 size,
-+                                     A_UINT32 valid);
-+A_STATUS wmi_get_stats_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_addKey_cmd(struct wmi_t *wmip, A_UINT8 keyIndex,
-+                        CRYPTO_TYPE keyType, A_UINT8 keyUsage,
-+                        A_UINT8 keyLength,A_UINT8 *keyRSC,
-+                        A_UINT8 *keyMaterial, A_UINT8 key_op_ctrl,
-+                        WMI_SYNC_FLAG sync_flag);
-+A_STATUS wmi_add_krk_cmd(struct wmi_t *wmip, A_UINT8 *krk);
-+A_STATUS wmi_delete_krk_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_deleteKey_cmd(struct wmi_t *wmip, A_UINT8 keyIndex);
-+A_STATUS wmi_set_akmp_params_cmd(struct wmi_t *wmip,
-+                                 WMI_SET_AKMP_PARAMS_CMD *akmpParams);
-+A_STATUS wmi_get_pmkid_list_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_set_pmkid_list_cmd(struct wmi_t *wmip,
-+                                WMI_SET_PMKID_LIST_CMD *pmkInfo);
-+A_STATUS wmi_set_txPwr_cmd(struct wmi_t *wmip, A_UINT8 dbM);
-+A_STATUS wmi_get_txPwr_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_addBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex, A_UINT8 *bssid);
-+A_STATUS wmi_deleteBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex);
-+A_STATUS wmi_set_tkip_countermeasures_cmd(struct wmi_t *wmip, A_BOOL en);
-+A_STATUS wmi_setPmkid_cmd(struct wmi_t *wmip, A_UINT8 *bssid, A_UINT8 *pmkId,
-+                          A_BOOL set);
-+A_STATUS wmi_set_access_params_cmd(struct wmi_t *wmip, A_UINT16 txop,
-+                                   A_UINT8 eCWmin, A_UINT8 eCWmax,
-+                                   A_UINT8 aifsn);
-+A_STATUS wmi_set_retry_limits_cmd(struct wmi_t *wmip, A_UINT8 frameType,
-+                                  A_UINT8 trafficClass, A_UINT8 maxRetries,
-+                                  A_UINT8 enableNotify);
-+
-+void wmi_get_current_bssid(struct wmi_t *wmip, A_UINT8 *bssid);
-+
-+A_STATUS wmi_get_roam_tbl_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_get_roam_data_cmd(struct wmi_t *wmip, A_UINT8 roamDataType);
-+A_STATUS wmi_set_roam_ctrl_cmd(struct wmi_t *wmip, WMI_SET_ROAM_CTRL_CMD *p,
-+                               A_UINT8 size);
-+A_STATUS wmi_set_powersave_timers_cmd(struct wmi_t *wmip,
-+                            WMI_POWERSAVE_TIMERS_POLICY_CMD *pCmd,
-+                            A_UINT8 size);
-+
-+A_STATUS wmi_set_opt_mode_cmd(struct wmi_t *wmip, A_UINT8 optMode);
-+A_STATUS wmi_opt_tx_frame_cmd(struct wmi_t *wmip,
-+                              A_UINT8 frmType,
-+                              A_UINT8 *dstMacAddr,
-+                              A_UINT8 *bssid,
-+                              A_UINT16 optIEDataLen,
-+                              A_UINT8 *optIEData);
-+
-+A_STATUS wmi_set_adhoc_bconIntvl_cmd(struct wmi_t *wmip, A_UINT16 intvl);
-+A_STATUS wmi_set_voice_pkt_size_cmd(struct wmi_t *wmip, A_UINT16 voicePktSize);
-+A_STATUS wmi_set_max_sp_len_cmd(struct wmi_t *wmip, A_UINT8 maxSpLen);
-+A_UINT8  convert_userPriority_to_trafficClass(A_UINT8 userPriority);
-+A_UINT8 wmi_get_power_mode_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_verify_tspec_params(WMI_CREATE_PSTREAM_CMD *pCmd, A_BOOL tspecCompliance);
-+
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+A_STATUS wmi_test_cmd(struct wmi_t *wmip, A_UINT8 *buf, A_UINT32  len);
-+#endif
-+
-+A_STATUS wmi_set_bt_status_cmd(struct wmi_t *wmip, A_UINT8 streamType, A_UINT8 status);
-+A_STATUS wmi_set_bt_params_cmd(struct wmi_t *wmip, WMI_SET_BT_PARAMS_CMD* cmd);
-+
-+
-+/*
-+ *  This function is used to configure the fix rates mask to the target.
-+ */
-+A_STATUS wmi_set_fixrates_cmd(struct wmi_t *wmip, A_INT16 fixRatesMask);
-+A_STATUS wmi_get_ratemask_cmd(struct wmi_t *wmip);
-+
-+A_STATUS wmi_set_authmode_cmd(struct wmi_t *wmip, A_UINT8 mode);
-+
-+A_STATUS wmi_set_reassocmode_cmd(struct wmi_t *wmip, A_UINT8 mode);
-+
-+A_STATUS wmi_set_wmm_cmd(struct wmi_t *wmip, WMI_WMM_STATUS status);
-+A_STATUS wmi_set_wmm_txop(struct wmi_t *wmip, WMI_TXOP_CFG txEnable);
-+
-+A_STATUS wmi_get_keepalive_configured(struct wmi_t *wmip);
-+A_UINT8 wmi_get_keepalive_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_set_keepalive_cmd(struct wmi_t *wmip, A_UINT8 keepaliveInterval);
-+
-+A_STATUS wmi_set_appie_cmd(struct wmi_t *wmip, A_UINT8 mgmtFrmType,
-+                           A_UINT8 ieLen,A_UINT8 *ieInfo);
-+
-+A_STATUS wmi_set_halparam_cmd(struct wmi_t *wmip, A_UINT8 *cmd, A_UINT16 dataLen);
-+A_INT32 wmi_get_rate(A_INT8 rateindex);
-+
-+/*Wake on Wireless WMI commands*/
-+A_STATUS wmi_set_host_sleep_mode_cmd(struct wmi_t *wmip, WMI_SET_HOST_SLEEP_MODE_CMD *cmd);
-+A_STATUS wmi_set_wow_mode_cmd(struct wmi_t *wmip, WMI_SET_WOW_MODE_CMD *cmd);
-+A_STATUS wmi_get_wow_list_cmd(struct wmi_t *wmip, WMI_GET_WOW_LIST_CMD *cmd);
-+A_STATUS wmi_add_wow_pattern_cmd(struct wmi_t *wmip,
-+                                 WMI_ADD_WOW_PATTERN_CMD *cmd, A_UINT8* pattern, A_UINT8* mask, A_UINT8 pattern_size);
-+A_STATUS wmi_del_wow_pattern_cmd(struct wmi_t *wmip,
-+                                 WMI_DEL_WOW_PATTERN_CMD *cmd);
-+A_STATUS wmi_set_wsc_status_cmd(struct wmi_t *wmip, A_UINT32 status);
-+
-+bss_t *
-+wmi_find_Ssidnode (struct wmi_t *wmip, A_UCHAR *pSsid,
-+                                 A_UINT32 ssidLength, A_BOOL bIsWPA2);
-+
-+void
-+wmi_node_return (struct wmi_t *wmip, bss_t *bss);
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _WMI_API_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/wmix.h b/drivers/sdio/function/wlan/ar6000/include/wmix.h
-new file mode 100644
-index 0000000..8f12b5e
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/wmix.h
-@@ -0,0 +1,233 @@
-+/*
-+ * Copyright (c) 2004-2005 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ * This file contains extensions of the WMI protocol specified in the
-+ * Wireless Module Interface (WMI).  It includes definitions of all
-+ * extended commands and events.  Extensions include useful commands
-+ * that are not directly related to wireless activities.  They may
-+ * be hardware-specific, and they might not be supported on all
-+ * implementations.
-+ *
-+ * Extended WMIX commands are encapsulated in a WMI message with
-+ * cmd=WMI_EXTENSION_CMD.
-+ *
-+ */
-+
-+#ifndef _WMIX_H_
-+#define _WMIX_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#ifndef ATH_TARGET
-+#include "athstartpack.h"
-+#endif
-+
-+#include "dbglog.h"
-+
-+/*
-+ * Extended WMI commands are those that are needed during wireless
-+ * operation, but which are not really wireless commands.  This allows,
-+ * for instance, platform-specific commands.  Extended WMI commands are
-+ * embedded in a WMI command message with WMI_COMMAND_ID=WMI_EXTENSION_CMDID.
-+ * Extended WMI events are similarly embedded in a WMI event message with
-+ * WMI_EVENT_ID=WMI_EXTENSION_EVENTID.
-+ */
-+typedef PREPACK struct {
-+    A_UINT32    commandId;
-+} POSTPACK WMIX_CMD_HDR;
-+
-+typedef enum {
-+    WMIX_DSETOPEN_REPLY_CMDID           = 0x2001,
-+    WMIX_DSETDATA_REPLY_CMDID,
-+    WMIX_GPIO_OUTPUT_SET_CMDID,
-+    WMIX_GPIO_INPUT_GET_CMDID,
-+    WMIX_GPIO_REGISTER_SET_CMDID,
-+    WMIX_GPIO_REGISTER_GET_CMDID,
-+    WMIX_GPIO_INTR_ACK_CMDID,
-+    WMIX_HB_CHALLENGE_RESP_CMDID,
-+    WMIX_DBGLOG_CFG_MODULE_CMDID,
-+} WMIX_COMMAND_ID;
-+
-+typedef enum {
-+    WMIX_DSETOPENREQ_EVENTID            = 0x3001,
-+    WMIX_DSETCLOSE_EVENTID,
-+    WMIX_DSETDATAREQ_EVENTID,
-+    WMIX_GPIO_INTR_EVENTID,
-+    WMIX_GPIO_DATA_EVENTID,
-+    WMIX_GPIO_ACK_EVENTID,
-+    WMIX_HB_CHALLENGE_RESP_EVENTID,
-+    WMIX_DBGLOG_EVENTID,
-+} WMIX_EVENT_ID;
-+
-+/*
-+ * =============DataSet support=================
-+ */
-+
-+/*
-+ * WMIX_DSETOPENREQ_EVENTID
-+ * DataSet Open Request Event
-+ */
-+typedef PREPACK struct {
-+    A_UINT32 dset_id;
-+    A_UINT32 targ_dset_handle;  /* echo'ed, not used by Host, */
-+    A_UINT32 targ_reply_fn;     /* echo'ed, not used by Host, */
-+    A_UINT32 targ_reply_arg;    /* echo'ed, not used by Host, */
-+} POSTPACK WMIX_DSETOPENREQ_EVENT;
-+
-+/*
-+ * WMIX_DSETCLOSE_EVENTID
-+ * DataSet Close Event
-+ */
-+typedef PREPACK struct {
-+    A_UINT32 access_cookie;
-+} POSTPACK WMIX_DSETCLOSE_EVENT;
-+
-+/*
-+ * WMIX_DSETDATAREQ_EVENTID
-+ * DataSet Data Request Event
-+ */
-+typedef PREPACK struct {
-+    A_UINT32 access_cookie;
-+    A_UINT32 offset;
-+    A_UINT32 length;
-+    A_UINT32 targ_buf;         /* echo'ed, not used by Host, */
-+    A_UINT32 targ_reply_fn;    /* echo'ed, not used by Host, */
-+    A_UINT32 targ_reply_arg;   /* echo'ed, not used by Host, */
-+} POSTPACK WMIX_DSETDATAREQ_EVENT;
-+
-+typedef PREPACK struct {
-+    A_UINT32              status;
-+    A_UINT32              targ_dset_handle;
-+    A_UINT32              targ_reply_fn;
-+    A_UINT32              targ_reply_arg;
-+    A_UINT32              access_cookie;
-+    A_UINT32              size;
-+    A_UINT32              version;
-+} POSTPACK WMIX_DSETOPEN_REPLY_CMD;
-+
-+typedef PREPACK struct {
-+    A_UINT32              status;
-+    A_UINT32              targ_buf;
-+    A_UINT32              targ_reply_fn;
-+    A_UINT32              targ_reply_arg;
-+    A_UINT32              length;
-+    A_UINT8               buf[1];
-+} POSTPACK WMIX_DSETDATA_REPLY_CMD;
-+
-+
-+/*
-+ * =============GPIO support=================
-+ * All masks are 18-bit masks with bit N operating on GPIO pin N.
-+ */
-+
-+#include "gpio.h"
-+
-+/*
-+ * Set GPIO pin output state.
-+ * In order for output to be driven, a pin must be enabled for output.
-+ * This can be done during initialization through the GPIO Configuration
-+ * DataSet, or during operation with the enable_mask.
-+ *
-+ * If a request is made to simultaneously set/clear or set/disable or
-+ * clear/disable or disable/enable, results are undefined.
-+ */
-+typedef PREPACK struct {
-+    A_UINT32              set_mask;             /* pins to set */
-+    A_UINT32              clear_mask;           /* pins to clear */
-+    A_UINT32              enable_mask;          /* pins to enable for output */
-+    A_UINT32              disable_mask;         /* pins to disable/tristate */
-+} POSTPACK WMIX_GPIO_OUTPUT_SET_CMD;
-+
-+/*
-+ * Set a GPIO register.  For debug/exceptional cases.
-+ * Values for gpioreg_id are GPIO_REGISTER_IDs, defined in a
-+ * platform-dependent header.
-+ */
-+typedef PREPACK struct {
-+    A_UINT32              gpioreg_id;           /* GPIO register ID */
-+    A_UINT32              value;                /* value to write */
-+} POSTPACK WMIX_GPIO_REGISTER_SET_CMD;
-+
-+/* Get a GPIO register.  For debug/exceptional cases. */
-+typedef PREPACK struct {
-+    A_UINT32              gpioreg_id;           /* GPIO register to read */
-+} POSTPACK WMIX_GPIO_REGISTER_GET_CMD;
-+
-+/*
-+ * Host acknowledges and re-arms GPIO interrupts.  A single
-+ * message should be used to acknowledge all interrupts that
-+ * were delivered in an earlier WMIX_GPIO_INTR_EVENT message.
-+ */
-+typedef PREPACK struct {
-+    A_UINT32              ack_mask;             /* interrupts to acknowledge */
-+} POSTPACK WMIX_GPIO_INTR_ACK_CMD;
-+
-+/*
-+ * Target informs Host of GPIO interrupts that have ocurred since the
-+ * last WMIX_GIPO_INTR_ACK_CMD was received.  Additional information --
-+ * the current GPIO input values is provided -- in order to support
-+ * use of a GPIO interrupt as a Data Valid signal for other GPIO pins.
-+ */
-+typedef PREPACK struct {
-+    A_UINT32              intr_mask;            /* pending GPIO interrupts */
-+    A_UINT32              input_values;         /* recent GPIO input values */
-+} POSTPACK WMIX_GPIO_INTR_EVENT;
-+
-+/*
-+ * Target responds to Host's earlier WMIX_GPIO_INPUT_GET_CMDID request
-+ * using a GPIO_DATA_EVENT with
-+ *   value set to the mask of GPIO pin inputs and
-+ *   reg_id set to GPIO_ID_NONE
-+ *
-+ *
-+ * Target responds to Hosts's earlier WMIX_GPIO_REGISTER_GET_CMDID request
-+ * using a GPIO_DATA_EVENT with
-+ *   value set to the value of the requested register and
-+ *   reg_id identifying the register (reflects the original request)
-+ * NB: reg_id supports the future possibility of unsolicited
-+ * WMIX_GPIO_DATA_EVENTs (for polling GPIO input), and it may
-+ * simplify Host GPIO support.
-+ */
-+typedef PREPACK struct {
-+    A_UINT32              value;
-+    A_UINT32              reg_id;
-+} POSTPACK WMIX_GPIO_DATA_EVENT;
-+
-+/*
-+ * =============Error Detection support=================
-+ */
-+
-+/*
-+ * WMIX_HB_CHALLENGE_RESP_CMDID
-+ * Heartbeat Challenge Response command
-+ */
-+typedef PREPACK struct {
-+    A_UINT32              cookie;
-+    A_UINT32              source;
-+} POSTPACK WMIX_HB_CHALLENGE_RESP_CMD;
-+
-+/*
-+ * WMIX_HB_CHALLENGE_RESP_EVENTID
-+ * Heartbeat Challenge Response Event
-+ */
-+#define WMIX_HB_CHALLENGE_RESP_EVENT WMIX_HB_CHALLENGE_RESP_CMD
-+
-+typedef PREPACK struct {
-+    struct dbglog_config_s config;
-+} POSTPACK WMIX_DBGLOG_CFG_MODULE_CMD;
-+
-+#ifndef ATH_TARGET
-+#include "athendpack.h"
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _WMIX_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c b/drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c
-new file mode 100644
-index 0000000..2b0dfd3
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c
-@@ -0,0 +1,467 @@
-+
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "a_config.h"
-+#include "athdefs.h"
-+#include "a_types.h"
-+#include "AR6Khwreg.h"
-+#include "targaddrs.h"
-+#include "a_osapi.h"
-+#include "hif.h"
-+#include "htc_api.h"
-+#include "bmi.h"
-+#include "bmi_msg.h"
-+#include "common_drv.h"
-+#include "a_debug.h"
-+#include "targaddrs.h"
-+
-+#define HOST_INTEREST_ITEM_ADDRESS(target, item)    \
-+(((TargetType) == TARGET_TYPE_AR6001) ?     \
-+   AR6001_HOST_INTEREST_ITEM_ADDRESS(item) :    \
-+   AR6002_HOST_INTEREST_ITEM_ADDRESS(item))
-+
-+
-+/* Compile the 4BYTE version of the window register setup routine,
-+ * This mitigates host interconnect issues with non-4byte aligned bus requests, some
-+ * interconnects use bus adapters that impose strict limitations.
-+ * Since diag window access is not intended for performance critical operations, the 4byte mode should
-+ * be satisfactory even though it generates 4X the bus activity. */
-+
-+#ifdef USE_4BYTE_REGISTER_ACCESS
-+
-+    /* set the window address register (using 4-byte register access ). */
-+A_STATUS ar6000_SetAddressWindowRegister(HIF_DEVICE *hifDevice, A_UINT32 RegisterAddr, A_UINT32 Address)
-+{
-+    A_STATUS status;
-+    A_UINT8 addrValue[4];
-+    int i;
-+
-+        /* write bytes 1,2,3 of the register to set the upper address bytes, the LSB is written
-+         * last to initiate the access cycle */
-+
-+    for (i = 1; i <= 3; i++) {
-+            /* fill the buffer with the address byte value we want to hit 4 times*/
-+        addrValue[0] = ((A_UINT8 *)&Address)[i];
-+        addrValue[1] = addrValue[0];
-+        addrValue[2] = addrValue[0];
-+        addrValue[3] = addrValue[0];
-+
-+            /* hit each byte of the register address with a 4-byte write operation to the same address,
-+             * this is a harmless operation */
-+        status = HIFReadWrite(hifDevice,
-+                              RegisterAddr+i,
-+                              addrValue,
-+                              4,
-+                              HIF_WR_SYNC_BYTE_FIX,
-+                              NULL);
-+        if (status != A_OK) {
-+            break;
-+        }
-+    }
-+
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Cannot write initial bytes of 0x%x to window reg: 0x%X \n",
-+             RegisterAddr, Address));
-+        return status;
-+    }
-+
-+        /* write the address register again, this time write the whole 4-byte value.
-+         * The effect here is that the LSB write causes the cycle to start, the extra
-+         * 3 byte write to bytes 1,2,3 has no effect since we are writing the same values again */
-+    status = HIFReadWrite(hifDevice,
-+                          RegisterAddr,
-+                          (A_UCHAR *)(&Address),
-+                          4,
-+                          HIF_WR_SYNC_BYTE_INC,
-+                          NULL);
-+
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Cannot write 0x%x to window reg: 0x%X \n",
-+            RegisterAddr, Address));
-+        return status;
-+    }
-+
-+    return A_OK;
-+
-+
-+
-+}
-+
-+
-+#else
-+
-+    /* set the window address register */
-+A_STATUS ar6000_SetAddressWindowRegister(HIF_DEVICE *hifDevice, A_UINT32 RegisterAddr, A_UINT32 Address)
-+{
-+    A_STATUS status;
-+
-+        /* write bytes 1,2,3 of the register to set the upper address bytes, the LSB is written
-+         * last to initiate the access cycle */
-+    status = HIFReadWrite(hifDevice,
-+                          RegisterAddr+1,  /* write upper 3 bytes */
-+                          ((A_UCHAR *)(&Address))+1,
-+                          sizeof(A_UINT32)-1,
-+                          HIF_WR_SYNC_BYTE_INC,
-+                          NULL);
-+
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Cannot write initial bytes of 0x%x to window reg: 0x%X \n",
-+             RegisterAddr, Address));
-+        return status;
-+    }
-+
-+        /* write the LSB of the register, this initiates the operation */
-+    status = HIFReadWrite(hifDevice,
-+                          RegisterAddr,
-+                          (A_UCHAR *)(&Address),
-+                          sizeof(A_UINT8),
-+                          HIF_WR_SYNC_BYTE_INC,
-+                          NULL);
-+
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Cannot write 0x%x to window reg: 0x%X \n",
-+            RegisterAddr, Address));
-+        return status;
-+    }
-+
-+    return A_OK;
-+}
-+
-+#endif
-+
-+/*
-+ * Read from the AR6000 through its diagnostic window.
-+ * No cooperation from the Target is required for this.
-+ */
-+A_STATUS
-+ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data)
-+{
-+    A_STATUS status;
-+
-+        /* set window register to start read cycle */
-+    status = ar6000_SetAddressWindowRegister(hifDevice,
-+                                             WINDOW_READ_ADDR_ADDRESS,
-+                                             *address);
-+
-+    if (status != A_OK) {
-+        return status;
-+    }
-+
-+        /* read the data */
-+    status = HIFReadWrite(hifDevice,
-+                          WINDOW_DATA_ADDRESS,
-+                          (A_UCHAR *)data,
-+                          sizeof(A_UINT32),
-+                          HIF_RD_SYNC_BYTE_INC,
-+                          NULL);
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Cannot read from WINDOW_DATA_ADDRESS\n"));
-+        return status;
-+    }
-+
-+    return status;
-+}
-+
-+
-+/*
-+ * Write to the AR6000 through its diagnostic window.
-+ * No cooperation from the Target is required for this.
-+ */
-+A_STATUS
-+ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data)
-+{
-+    A_STATUS status;
-+
-+        /* set write data */
-+    status = HIFReadWrite(hifDevice,
-+                          WINDOW_DATA_ADDRESS,
-+                          (A_UCHAR *)data,
-+                          sizeof(A_UINT32),
-+                          HIF_WR_SYNC_BYTE_INC,
-+                          NULL);
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Cannot write 0x%x to WINDOW_DATA_ADDRESS\n", *data));
-+        return status;
-+    }
-+
-+        /* set window register, which starts the write cycle */
-+    return ar6000_SetAddressWindowRegister(hifDevice,
-+                                           WINDOW_WRITE_ADDR_ADDRESS,
-+                                           *address);
-+}
-+
-+A_STATUS
-+ar6000_ReadDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address,
-+                    A_UCHAR *data, A_UINT32 length)
-+{
-+    A_UINT32 count;
-+    A_STATUS status = A_OK;
-+
-+    for (count = 0; count < length; count += 4, address += 4) {
-+        if ((status = ar6000_ReadRegDiag(hifDevice, &address,
-+                                         (A_UINT32 *)&data[count])) != A_OK)
-+        {
-+            break;
-+        }
-+    }
-+
-+    return status;
-+}
-+
-+A_STATUS
-+ar6000_WriteDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address,
-+                     A_UCHAR *data, A_UINT32 length)
-+{
-+    A_UINT32 count;
-+    A_STATUS status = A_OK;
-+
-+    for (count = 0; count < length; count += 4, address += 4) {
-+        if ((status = ar6000_WriteRegDiag(hifDevice, &address,
-+                                          (A_UINT32 *)&data[count])) != A_OK)
-+        {
-+            break;
-+        }
-+    }
-+
-+    return status;
-+}
-+
-+A_STATUS
-+ar6000_reset_device_skipflash(HIF_DEVICE *hifDevice)
-+{
-+    int i;
-+    struct forceROM_s {
-+        A_UINT32 addr;
-+        A_UINT32 data;
-+    };
-+    struct forceROM_s *ForceROM;
-+    int szForceROM;
-+    A_UINT32 instruction;
-+
-+    static struct forceROM_s ForceROM_REV2[] = {
-+        /* NB: This works for old REV2 ROM (old). */
-+        {0x00001ff0, 0x175b0027}, /* jump instruction at 0xa0001ff0 */
-+        {0x00001ff4, 0x00000000}, /* nop instruction at 0xa0001ff4 */
-+
-+        {MC_REMAP_TARGET_ADDRESS, 0x00001ff0}, /* remap to 0xa0001ff0 */
-+        {MC_REMAP_COMPARE_ADDRESS, 0x01000040},/* ...from 0xbfc00040 */
-+        {MC_REMAP_SIZE_ADDRESS, 0x00000000},   /* ...1 cache line */
-+        {MC_REMAP_VALID_ADDRESS, 0x00000001},  /* ...remap is valid */
-+
-+        {LOCAL_COUNT_ADDRESS+0x10, 0}, /* clear BMI credit counter */
-+
-+        {RESET_CONTROL_ADDRESS, RESET_CONTROL_WARM_RST_MASK},
-+    };
-+
-+    static struct forceROM_s ForceROM_NEW[] = {
-+        /* NB: This works for AR6000 ROM REV3 and beyond.  */
-+        {LOCAL_SCRATCH_ADDRESS, AR6K_OPTION_IGNORE_FLASH},
-+        {LOCAL_COUNT_ADDRESS+0x10, 0}, /* clear BMI credit counter */
-+        {RESET_CONTROL_ADDRESS, RESET_CONTROL_WARM_RST_MASK},
-+    };
-+
-+    /*
-+     * Examine a semi-arbitrary instruction that's different
-+     * in REV2 and other revisions.
-+     * NB: If a Host port does not require simultaneous support
-+     * for multiple revisions of Target ROM, this code can be elided.
-+     */
-+    (void)ar6000_ReadDataDiag(hifDevice, 0x01000040,
-+                              (A_UCHAR *)&instruction, 4);
-+
-+    AR_DEBUG_PRINTF(ATH_LOG_ERR, ("instruction=0x%x\n", instruction));
-+
-+    if (instruction == 0x3c1aa200) {
-+        /* It's an old ROM */
-+        ForceROM = ForceROM_REV2;
-+        szForceROM = sizeof(ForceROM_REV2)/sizeof(*ForceROM);
-+        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Using OLD method\n"));
-+    } else {
-+        ForceROM = ForceROM_NEW;
-+        szForceROM = sizeof(ForceROM_NEW)/sizeof(*ForceROM);
-+        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Using NEW method\n"));
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Force Target to execute from ROM....\n"));
-+    for (i = 0; i < szForceROM; i++)
-+    {
-+        if (ar6000_WriteRegDiag(hifDevice,
-+                                &ForceROM[i].addr,
-+                                &ForceROM[i].data) != A_OK)
-+        {
-+            AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Cannot force Target to execute ROM!\n"));
-+            return A_ERROR;
-+        }
-+    }
-+
-+    A_MDELAY(50); /* delay to allow dragon to come to BMI phase  */
-+    return A_OK;
-+}
-+
-+/* reset device */
-+A_STATUS ar6000_reset_device(HIF_DEVICE *hifDevice, A_UINT32 TargetType)
-+{
-+
-+#if !defined(DWSIM)
-+    A_STATUS status = A_OK;
-+    A_UINT32 address;
-+    A_UINT32 data;
-+
-+    do {
-+
-+        // address = RESET_CONTROL_ADDRESS;
-+        data = RESET_CONTROL_COLD_RST_MASK;
-+
-+          /* Hardcode the address of RESET_CONTROL_ADDRESS based on the target type */
-+        if (TargetType == TARGET_TYPE_AR6001) {
-+            address = 0x0C000000;
-+        } else {
-+            if (TargetType == TARGET_TYPE_AR6002) {
-+                address = 0x00004000;
-+            } else {
-+                A_ASSERT(0);
-+            }
-+        }
-+
-+        status = ar6000_WriteRegDiag(hifDevice, &address, &data);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+        /*
-+         * Read back the RESET CAUSE register to ensure that the cold reset
-+         * went through.
-+         */
-+        A_MDELAY(2000); /* 2 second delay to allow things to settle down */
-+
-+
-+        // address = RESET_CAUSE_ADDRESS;
-+        /* Hardcode the address of RESET_CAUSE_ADDRESS based on the target type */
-+        if (TargetType == TARGET_TYPE_AR6001) {
-+            address = 0x0C0000CC;
-+        } else {
-+            if (TargetType == TARGET_TYPE_AR6002) {
-+                address = 0x000040C0;
-+            } else {
-+                A_ASSERT(0);
-+            }
-+        }
-+
-+        data = 0;
-+        status = ar6000_ReadRegDiag(hifDevice, &address, &data);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Reset Cause readback: 0x%X \n",data));
-+        data &= RESET_CAUSE_LAST_MASK;
-+        if (data != 2) {
-+            AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Unable to cold reset the target \n"));
-+        }
-+
-+    } while (FALSE);
-+
-+    if (A_FAILED(status)) {
-+        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Failed to reset target \n"));
-+    }
-+#endif
-+    return A_OK;
-+}
-+
-+#define REG_DUMP_COUNT_AR6001   38  /* WORDs, derived from AR6001_regdump.h */
-+#define REG_DUMP_COUNT_AR6002   32  /* WORDs, derived from AR6002_regdump.h */
-+
-+
-+#if REG_DUMP_COUNT_AR6001 <= REG_DUMP_COUNT_AR6002
-+#define REGISTER_DUMP_LEN_MAX  REG_DUMP_COUNT_AR6002
-+#else
-+#define REGISTER_DUMP_LEN_MAX  REG_DUMP_COUNT_AR6001
-+#endif
-+
-+void ar6000_dump_target_assert_info(HIF_DEVICE *hifDevice, A_UINT32 TargetType)
-+{
-+    A_UINT32 address;
-+    A_UINT32 regDumpArea = 0;
-+    A_STATUS status;
-+    A_UINT32 regDumpValues[REGISTER_DUMP_LEN_MAX];
-+    A_UINT32 regDumpCount = 0;
-+    A_UINT32 i;
-+
-+    do {
-+
-+            /* the reg dump pointer is copied to the host interest area */
-+        address = HOST_INTEREST_ITEM_ADDRESS(TargetType, hi_failure_state);
-+
-+        if (TargetType == TARGET_TYPE_AR6001) {
-+                /* for AR6001, this is a fixed location because the ptr is actually stuck in cache,
-+                 * this may be fixed in later firmware versions */
-+            address = 0x18a0;
-+            regDumpCount = REG_DUMP_COUNT_AR6001;
-+
-+        } else  if (TargetType == TARGET_TYPE_AR6002) {
-+
-+            regDumpCount = REG_DUMP_COUNT_AR6002;
-+
-+        } else {
-+            A_ASSERT(0);
-+        }
-+
-+            /* read RAM location through diagnostic window */
-+        status = ar6000_ReadRegDiag(hifDevice, &address, &regDumpArea);
-+
-+        if (A_FAILED(status)) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("AR6K: Failed to get ptr to register dump area \n"));
-+            break;
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("AR6K: Location of register dump data: 0x%X \n",regDumpArea));
-+
-+        if (regDumpArea == 0) {
-+                /* no reg dump */
-+            break;
-+        }
-+
-+        if (TargetType == TARGET_TYPE_AR6001) {
-+            regDumpArea &= 0x0FFFFFFF;  /* convert to physical address in target memory */
-+        }
-+
-+            /* fetch register dump data */
-+        status = ar6000_ReadDataDiag(hifDevice,
-+                                     regDumpArea,
-+                                     (A_UCHAR *)&regDumpValues[0],
-+                                     regDumpCount * (sizeof(A_UINT32)));
-+
-+        if (A_FAILED(status)) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("AR6K: Failed to get register dump \n"));
-+            break;
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("AR6K: Register Dump: \n"));
-+
-+        for (i = 0; i < regDumpCount; i++) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" %d :  0x%8.8X \n",i, regDumpValues[i]));
-+        }
-+
-+    } while (FALSE);
-+
-+}
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c b/drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c
-new file mode 100644
-index 0000000..8d37d62
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c
-@@ -0,0 +1,346 @@
-+
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "a_config.h"
-+#include "athdefs.h"
-+#include "a_types.h"
-+#include "a_osapi.h"
-+#include "a_debug.h"
-+#include "htc_api.h"
-+#include "common_drv.h"
-+
-+/********* CREDIT DISTRIBUTION FUNCTIONS ******************************************/
-+
-+#define NO_VO_SERVICE 1 /* currently WMI only uses 3 data streams, so we leave VO service inactive */
-+
-+#ifdef NO_VO_SERVICE
-+#define DATA_SVCS_USED 3
-+#else
-+#define DATA_SVCS_USED 4
-+#endif
-+
-+static void RedistributeCredits(COMMON_CREDIT_STATE_INFO *pCredInfo,
-+                                HTC_ENDPOINT_CREDIT_DIST *pEPDistList);
-+
-+static void SeekCredits(COMMON_CREDIT_STATE_INFO *pCredInfo,
-+                        HTC_ENDPOINT_CREDIT_DIST *pEPDistList);
-+
-+/* reduce an ep's credits back to a set limit */
-+static INLINE void ReduceCredits(COMMON_CREDIT_STATE_INFO *pCredInfo,
-+                                HTC_ENDPOINT_CREDIT_DIST  *pEpDist,
-+                                int                       Limit)
-+{
-+    int credits;
-+
-+        /* set the new limit */
-+    pEpDist->TxCreditsAssigned = Limit;
-+
-+    if (pEpDist->TxCredits <= Limit) {
-+        return;
-+    }
-+
-+        /* figure out how much to take away */
-+    credits = pEpDist->TxCredits - Limit;
-+        /* take them away */
-+    pEpDist->TxCredits -= credits;
-+    pCredInfo->CurrentFreeCredits += credits;
-+}
-+
-+/* give an endpoint some credits from the free credit pool */
-+#define GiveCredits(pCredInfo,pEpDist,credits)      \
-+{                                                   \
-+    (pEpDist)->TxCredits += (credits);              \
-+    (pEpDist)->TxCreditsAssigned += (credits);      \
-+    (pCredInfo)->CurrentFreeCredits -= (credits);   \
-+}
-+
-+
-+/* default credit init callback.
-+ * This function is called in the context of HTCStart() to setup initial (application-specific)
-+ * credit distributions */
-+static void ar6000_credit_init(void                     *Context,
-+                               HTC_ENDPOINT_CREDIT_DIST *pEPList,
-+                               int                      TotalCredits)
-+{
-+    HTC_ENDPOINT_CREDIT_DIST *pCurEpDist;
-+    int                      count;
-+    COMMON_CREDIT_STATE_INFO *pCredInfo = (COMMON_CREDIT_STATE_INFO *)Context;
-+
-+    pCredInfo->CurrentFreeCredits = TotalCredits;
-+    pCredInfo->TotalAvailableCredits = TotalCredits;
-+
-+    pCurEpDist = pEPList;
-+
-+        /* run through the list and initialize */
-+    while (pCurEpDist != NULL) {
-+
-+            /* set minimums for each endpoint */
-+        pCurEpDist->TxCreditsMin = pCurEpDist->TxCreditsPerMaxMsg;
-+
-+        if (pCurEpDist->ServiceID == WMI_CONTROL_SVC) {
-+                /* give control service some credits */
-+            GiveCredits(pCredInfo,pCurEpDist,pCurEpDist->TxCreditsMin);
-+                /* control service is always marked active, it never goes inactive EVER */
-+            SET_EP_ACTIVE(pCurEpDist);
-+        } else if (pCurEpDist->ServiceID == WMI_DATA_BK_SVC) {
-+                /* this is the lowest priority data endpoint, save this off for easy access */
-+            pCredInfo->pLowestPriEpDist = pCurEpDist;
-+        }
-+
-+        /* Streams have to be created (explicit | implicit)for all kinds
-+         * of traffic. BE endpoints are also inactive in the beginning.
-+         * When BE traffic starts it creates implicit streams that
-+         * redistributes credits.
-+         */
-+
-+        /* note, all other endpoints have minimums set but are initially given NO credits.
-+         * Credits will be distributed as traffic activity demands */
-+        pCurEpDist = pCurEpDist->pNext;
-+    }
-+
-+    if (pCredInfo->CurrentFreeCredits <= 0) {
-+        AR_DEBUG_PRINTF(ATH_LOG_INF, ("Not enough credits (%d) to do credit distributions \n", TotalCredits));
-+        A_ASSERT(FALSE);
-+        return;
-+    }
-+
-+        /* reset list */
-+    pCurEpDist = pEPList;
-+        /* now run through the list and set max operating credit limits for everyone */
-+    while (pCurEpDist != NULL) {
-+        if (pCurEpDist->ServiceID == WMI_CONTROL_SVC) {
-+                /* control service max is just 1 max message */
-+            pCurEpDist->TxCreditsNorm = pCurEpDist->TxCreditsPerMaxMsg;
-+        } else {
-+                /* for the remaining data endpoints, we assume that each TxCreditsPerMaxMsg are
-+                 * the same.
-+                 * We use a simple calculation here, we take the remaining credits and
-+                 * determine how many max messages this can cover and then set each endpoint's
-+                 * normal value equal to half this amount.
-+                 * */
-+            count = (pCredInfo->CurrentFreeCredits/pCurEpDist->TxCreditsPerMaxMsg) * pCurEpDist->TxCreditsPerMaxMsg;
-+            count = count >> 1;
-+            count = max(count,pCurEpDist->TxCreditsPerMaxMsg);
-+                /* set normal */
-+            pCurEpDist->TxCreditsNorm = count;
-+
-+        }
-+        pCurEpDist = pCurEpDist->pNext;
-+    }
-+
-+}
-+
-+
-+/* default credit distribution callback
-+ * This callback is invoked whenever endpoints require credit distributions.
-+ * A lock is held while this function is invoked, this function shall NOT block.
-+ * The pEPDistList is a list of distribution structures in prioritized order as
-+ * defined by the call to the HTCSetCreditDistribution() api.
-+ *
-+ */
-+static void ar6000_credit_distribute(void                     *Context,
-+                                     HTC_ENDPOINT_CREDIT_DIST *pEPDistList,
-+                                     HTC_CREDIT_DIST_REASON   Reason)
-+{
-+    HTC_ENDPOINT_CREDIT_DIST *pCurEpDist;
-+    COMMON_CREDIT_STATE_INFO *pCredInfo = (COMMON_CREDIT_STATE_INFO *)Context;
-+
-+    switch (Reason) {
-+        case HTC_CREDIT_DIST_SEND_COMPLETE :
-+            pCurEpDist = pEPDistList;
-+                /* we are given the start of the endpoint distribution list.
-+                 * There may be one or more endpoints to service.
-+                 * Run through the list and distribute credits */
-+            while (pCurEpDist != NULL) {
-+
-+                if (pCurEpDist->TxCreditsToDist > 0) {
-+                        /* return the credits back to the endpoint */
-+                    pCurEpDist->TxCredits += pCurEpDist->TxCreditsToDist;
-+                        /* always zero out when we are done */
-+                    pCurEpDist->TxCreditsToDist = 0;
-+
-+                    if (pCurEpDist->TxCredits > pCurEpDist->TxCreditsAssigned) {
-+                            /* reduce to the assigned limit, previous credit reductions
-+                             * could have caused the limit to change */
-+                        ReduceCredits(pCredInfo, pCurEpDist, pCurEpDist->TxCreditsAssigned);
-+                    }
-+
-+                    if (pCurEpDist->TxCredits > pCurEpDist->TxCreditsNorm) {
-+                            /* oversubscribed endpoints need to reduce back to normal */
-+                        ReduceCredits(pCredInfo, pCurEpDist, pCurEpDist->TxCreditsNorm);
-+                    }
-+                }
-+
-+                pCurEpDist = pCurEpDist->pNext;
-+            }
-+
-+            A_ASSERT(pCredInfo->CurrentFreeCredits <= pCredInfo->TotalAvailableCredits);
-+
-+            break;
-+
-+        case HTC_CREDIT_DIST_ACTIVITY_CHANGE :
-+            RedistributeCredits(pCredInfo,pEPDistList);
-+            break;
-+        case HTC_CREDIT_DIST_SEEK_CREDITS :
-+            SeekCredits(pCredInfo,pEPDistList);
-+            break;
-+        case HTC_DUMP_CREDIT_STATE :
-+            AR_DEBUG_PRINTF(ATH_LOG_INF, ("Credit Distribution, total : %d, free : %d\n",
-+                                                                      pCredInfo->TotalAvailableCredits, pCredInfo->CurrentFreeCredits));
-+            break;
-+        default:
-+            break;
-+
-+    }
-+
-+}
-+
-+/* redistribute credits based on activity change */
-+static void RedistributeCredits(COMMON_CREDIT_STATE_INFO *pCredInfo,
-+                                HTC_ENDPOINT_CREDIT_DIST *pEPDistList)
-+{
-+    HTC_ENDPOINT_CREDIT_DIST *pCurEpDist = pEPDistList;
-+
-+        /* walk through the list and remove credits from inactive endpoints */
-+    while (pCurEpDist != NULL) {
-+
-+        if (pCurEpDist->ServiceID != WMI_CONTROL_SVC) {
-+            if (!IS_EP_ACTIVE(pCurEpDist)) {
-+                    /* EP is inactive, reduce credits back to zero */
-+                ReduceCredits(pCredInfo, pCurEpDist, 0);
-+            }
-+        }
-+
-+        /* NOTE in the active case, we do not need to do anything further,
-+         * when an EP goes active and needs credits, HTC will call into
-+         * our distribution function using a reason code of HTC_CREDIT_DIST_SEEK_CREDITS  */
-+
-+        pCurEpDist = pCurEpDist->pNext;
-+    }
-+
-+    A_ASSERT(pCredInfo->CurrentFreeCredits <= pCredInfo->TotalAvailableCredits);
-+
-+}
-+
-+/* HTC has an endpoint that needs credits, pEPDist is the endpoint in question */
-+static void SeekCredits(COMMON_CREDIT_STATE_INFO *pCredInfo,
-+                        HTC_ENDPOINT_CREDIT_DIST *pEPDist)
-+{
-+    HTC_ENDPOINT_CREDIT_DIST *pCurEpDist;
-+    int                      credits = 0;
-+    int                      need;
-+
-+    do {
-+
-+        if (pEPDist->ServiceID == WMI_CONTROL_SVC) {
-+                /* we never oversubscribe on the control service, this is not
-+                 * a high performance path and the target never holds onto control
-+                 * credits for too long */
-+            break;
-+        }
-+
-+        /* for all other services, we follow a simple algorithm of
-+         * 1. checking the free pool for credits
-+         * 2. checking lower priority endpoints for credits to take */
-+
-+        if (pCredInfo->CurrentFreeCredits >= 2 * pEPDist->TxCreditsSeek) {
-+                /* try to give more credits than it needs */
-+            credits = 2 * pEPDist->TxCreditsSeek;
-+        } else {
-+                /* give what we can */
-+            credits = min(pCredInfo->CurrentFreeCredits,pEPDist->TxCreditsSeek);
-+        }
-+
-+        if (credits >= pEPDist->TxCreditsSeek) {
-+                /* we found some to fullfill the seek request */
-+            break;
-+        }
-+
-+        /* we don't have enough in the free pool, try taking away from lower priority services
-+         *
-+         * The rule for taking away credits:
-+         *   1. Only take from lower priority endpoints
-+         *   2. Only take what is allocated above the minimum (never starve an endpoint completely)
-+         *   3. Only take what you need.
-+         *
-+         * */
-+
-+            /* starting at the lowest priority */
-+        pCurEpDist = pCredInfo->pLowestPriEpDist;
-+
-+            /* work backwards until we hit the endpoint again */
-+        while (pCurEpDist != pEPDist) {
-+                /* calculate how many we need so far */
-+            need = pEPDist->TxCreditsSeek - pCredInfo->CurrentFreeCredits;
-+
-+            if ((pCurEpDist->TxCreditsAssigned - need) > pCurEpDist->TxCreditsMin) {
-+                    /* the current one has been allocated more than it's minimum and it
-+                     * has enough credits assigned above it's minimum to fullfill our need
-+                     * try to take away just enough to fullfill our need */
-+                ReduceCredits(pCredInfo,
-+                              pCurEpDist,
-+                              pCurEpDist->TxCreditsAssigned - need);
-+
-+                if (pCredInfo->CurrentFreeCredits >= pEPDist->TxCreditsSeek) {
-+                        /* we have enough */
-+                    break;
-+                }
-+            }
-+
-+            pCurEpDist = pCurEpDist->pPrev;
-+        }
-+
-+            /* return what we can get */
-+        credits = min(pCredInfo->CurrentFreeCredits,pEPDist->TxCreditsSeek);
-+
-+    } while (FALSE);
-+
-+        /* did we find some credits? */
-+    if (credits) {
-+            /* give what we can */
-+        GiveCredits(pCredInfo, pEPDist, credits);
-+    }
-+
-+}
-+
-+/* initialize and setup credit distribution */
-+A_STATUS ar6000_setup_credit_dist(HTC_HANDLE HTCHandle, COMMON_CREDIT_STATE_INFO *pCredInfo)
-+{
-+    HTC_SERVICE_ID servicepriority[5];
-+
-+    A_MEMZERO(pCredInfo,sizeof(COMMON_CREDIT_STATE_INFO));
-+
-+    servicepriority[0] = WMI_CONTROL_SVC;  /* highest */
-+    servicepriority[1] = WMI_DATA_VO_SVC;
-+    servicepriority[2] = WMI_DATA_VI_SVC;
-+    servicepriority[3] = WMI_DATA_BE_SVC;
-+    servicepriority[4] = WMI_DATA_BK_SVC; /* lowest */
-+
-+        /* set callbacks and priority list */
-+    HTCSetCreditDistribution(HTCHandle,
-+                             pCredInfo,
-+                             ar6000_credit_distribute,
-+                             ar6000_credit_init,
-+                             servicepriority,
-+                             5);
-+
-+    return A_OK;
-+}
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c b/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c
-new file mode 100644
-index 0000000..b124845
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c
-@@ -0,0 +1,371 @@
-+/*-
-+ * Copyright (c) 2001 Atsushi Onoe
-+ * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting
-+ * Copyright (c) 2004-2005 Atheros Communications
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ *    derived from this software without specific prior written permission.
-+ *
-+ * Alternatively, this software may be distributed under the terms of the
-+ * GNU General Public License ("GPL") version 2 as published by the Free
-+ * Software Foundation.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
-+ *
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/wlan/src/wlan_node.c#1 $
-+ */
-+/*
-+ * IEEE 802.11 node handling support.
-+ */
-+#include <a_config.h>
-+#include <athdefs.h>
-+#include <a_types.h>
-+#include <a_osapi.h>
-+#include <a_debug.h>
-+#include <ieee80211.h>
-+#include <wlan_api.h>
-+#include <ieee80211_node.h>
-+#include <htc_api.h>
-+#include <wmi.h>
-+#include <wmi_api.h>
-+
-+static void wlan_node_timeout(A_ATH_TIMER arg);
-+static bss_t * _ieee80211_find_node(struct ieee80211_node_table *nt,
-+                                    const A_UINT8 *macaddr);
-+
-+bss_t *
-+wlan_node_alloc(struct ieee80211_node_table *nt, int wh_size)
-+{
-+    bss_t *ni;
-+
-+    ni = A_MALLOC_NOWAIT(sizeof(bss_t));
-+
-+    if (ni != NULL) {
-+        ni->ni_buf = A_MALLOC_NOWAIT(wh_size);
-+        if (ni->ni_buf == NULL) {
-+            A_FREE(ni);
-+            ni = NULL;
-+            return ni;
-+        }
-+    } else {
-+        return ni;
-+    }
-+
-+    /* Make sure our lists are clean */
-+    ni->ni_list_next = NULL;
-+    ni->ni_list_prev = NULL;
-+    ni->ni_hash_next = NULL;
-+    ni->ni_hash_prev = NULL;
-+
-+    //
-+    // ni_scangen never initialized before and during suspend/resume of winmobile, customer (LG/SEMCO) identified
-+    // that some junk has been stored in this, due to this scan list didn't properly updated
-+    //
-+    ni->ni_scangen     = 0;
-+
-+    return ni;
-+}
-+
-+void
-+wlan_node_free(bss_t *ni)
-+{
-+    if (ni->ni_buf != NULL) {
-+        A_FREE(ni->ni_buf);
-+    }
-+    A_FREE(ni);
-+}
-+
-+void
-+wlan_setup_node(struct ieee80211_node_table *nt, bss_t *ni,
-+                const A_UINT8 *macaddr)
-+{
-+    int hash;
-+
-+    A_MEMCPY(ni->ni_macaddr, macaddr, IEEE80211_ADDR_LEN);
-+    hash = IEEE80211_NODE_HASH(macaddr);
-+    ieee80211_node_initref(ni);     /* mark referenced */
-+
-+    ni->ni_tstamp = A_GET_MS(WLAN_NODE_INACT_TIMEOUT_MSEC);
-+    IEEE80211_NODE_LOCK_BH(nt);
-+
-+    /* Insert at the end of the node list */
-+    ni->ni_list_next = NULL;
-+    ni->ni_list_prev = nt->nt_node_last;
-+    if(nt->nt_node_last != NULL)
-+    {
-+        nt->nt_node_last->ni_list_next = ni;
-+    }
-+    nt->nt_node_last = ni;
-+    if(nt->nt_node_first == NULL)
-+    {
-+        nt->nt_node_first = ni;
-+    }
-+
-+    /* Insert into the hash list i.e. the bucket */
-+    if((ni->ni_hash_next = nt->nt_hash[hash]) != NULL)
-+    {
-+        nt->nt_hash[hash]->ni_hash_prev = ni;
-+    }
-+    ni->ni_hash_prev = NULL;
-+    nt->nt_hash[hash] = ni;
-+
-+    if (!nt->isTimerArmed) {
-+        A_TIMEOUT_MS(&nt->nt_inact_timer, WLAN_NODE_INACT_TIMEOUT_MSEC, 0);
-+        nt->isTimerArmed = TRUE;
-+    }
-+
-+    IEEE80211_NODE_UNLOCK_BH(nt);
-+}
-+
-+static bss_t *
-+_ieee80211_find_node(struct ieee80211_node_table *nt,
-+    const A_UINT8 *macaddr)
-+{
-+    bss_t *ni;
-+    int hash;
-+
-+    IEEE80211_NODE_LOCK_ASSERT(nt);
-+
-+    hash = IEEE80211_NODE_HASH(macaddr);
-+    for(ni = nt->nt_hash[hash]; ni; ni = ni->ni_hash_next) {
-+        if (IEEE80211_ADDR_EQ(ni->ni_macaddr, macaddr)) {
-+            ieee80211_node_incref(ni);  /* mark referenced */
-+            return ni;
-+        }
-+    }
-+    return NULL;
-+}
-+
-+bss_t *
-+wlan_find_node(struct ieee80211_node_table *nt, const A_UINT8 *macaddr)
-+{
-+    bss_t *ni;
-+
-+    IEEE80211_NODE_LOCK(nt);
-+    ni = _ieee80211_find_node(nt, macaddr);
-+    IEEE80211_NODE_UNLOCK(nt);
-+    return ni;
-+}
-+
-+/*
-+ * Reclaim a node.  If this is the last reference count then
-+ * do the normal free work.  Otherwise remove it from the node
-+ * table and mark it gone by clearing the back-reference.
-+ */
-+void
-+wlan_node_reclaim(struct ieee80211_node_table *nt, bss_t *ni)
-+{
-+    IEEE80211_NODE_LOCK(nt);
-+
-+    if(ni->ni_list_prev == NULL)
-+    {
-+        /* First in list so fix the list head */
-+        nt->nt_node_first = ni->ni_list_next;
-+    }
-+    else
-+    {
-+        ni->ni_list_prev->ni_list_next = ni->ni_list_next;
-+    }
-+
-+    if(ni->ni_list_next == NULL)
-+    {
-+        /* Last in list so fix list tail */
-+        nt->nt_node_last = ni->ni_list_prev;
-+    }
-+    else
-+    {
-+        ni->ni_list_next->ni_list_prev = ni->ni_list_prev;
-+    }
-+
-+    if(ni->ni_hash_prev == NULL)
-+    {
-+        /* First in list so fix the list head */
-+        int hash;
-+        hash = IEEE80211_NODE_HASH(ni->ni_macaddr);
-+        nt->nt_hash[hash] = ni->ni_hash_next;
-+    }
-+    else
-+    {
-+        ni->ni_hash_prev->ni_hash_next = ni->ni_hash_next;
-+    }
-+
-+    if(ni->ni_hash_next != NULL)
-+    {
-+        ni->ni_hash_next->ni_hash_prev = ni->ni_hash_prev;
-+    }
-+    wlan_node_free(ni);
-+
-+    IEEE80211_NODE_UNLOCK(nt);
-+}
-+
-+static void
-+wlan_node_dec_free(bss_t *ni)
-+{
-+    if (ieee80211_node_dectestref(ni)) {
-+        wlan_node_free(ni);
-+    }
-+}
-+
-+void
-+wlan_free_allnodes(struct ieee80211_node_table *nt)
-+{
-+    bss_t *ni;
-+
-+    while ((ni = nt->nt_node_first) != NULL) {
-+        wlan_node_reclaim(nt, ni);
-+    }
-+}
-+
-+void
-+wlan_iterate_nodes(struct ieee80211_node_table *nt, wlan_node_iter_func *f,
-+                   void *arg)
-+{
-+    bss_t *ni;
-+    A_UINT32 gen;
-+
-+    gen = ++nt->nt_scangen;
-+
-+    IEEE80211_NODE_LOCK(nt);
-+    for (ni = nt->nt_node_first; ni; ni = ni->ni_list_next) {
-+        if (ni->ni_scangen != gen) {
-+            ni->ni_scangen = gen;
-+            (void) ieee80211_node_incref(ni);
-+            (*f)(arg, ni);
-+            wlan_node_dec_free(ni);
-+        }
-+    }
-+    IEEE80211_NODE_UNLOCK(nt);
-+}
-+
-+/*
-+ * Node table support.
-+ */
-+void
-+wlan_node_table_init(void *wmip, struct ieee80211_node_table *nt)
-+{
-+    int i;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_WLAN, ("node table = 0x%x\n", (A_UINT32)nt));
-+    IEEE80211_NODE_LOCK_INIT(nt);
-+
-+    nt->nt_node_first = nt->nt_node_last = NULL;
-+    for(i = 0; i < IEEE80211_NODE_HASHSIZE; i++)
-+    {
-+        nt->nt_hash[i] = NULL;
-+    }
-+    A_INIT_TIMER(&nt->nt_inact_timer, wlan_node_timeout, nt);
-+    nt->isTimerArmed = FALSE;
-+    nt->nt_wmip = wmip;
-+}
-+
-+static void
-+wlan_node_timeout(A_ATH_TIMER arg)
-+{
-+    struct ieee80211_node_table *nt = (struct ieee80211_node_table *)arg;
-+    bss_t *bss, *nextBss;
-+    A_UINT8 myBssid[IEEE80211_ADDR_LEN], reArmTimer = FALSE;
-+
-+    wmi_get_current_bssid(nt->nt_wmip, myBssid);
-+
-+    bss = nt->nt_node_first;
-+    while (bss != NULL)
-+    {
-+        nextBss = bss->ni_list_next;
-+        if (A_MEMCMP(myBssid, bss->ni_macaddr, sizeof(myBssid)) != 0)
-+        {
-+
-+            if (bss->ni_tstamp <= A_GET_MS(0))
-+            {
-+               /*
-+                * free up all but the current bss - if set
-+                */
-+                wlan_node_reclaim(nt, bss);
-+            }
-+            else
-+            {
-+                /*
-+                 * Re-arm timer, only when we have a bss other than
-+                 * current bss AND it is not aged-out.
-+                 */
-+                reArmTimer = TRUE;
-+            }
-+        }
-+        bss = nextBss;
-+    }
-+
-+    if(reArmTimer)
-+        A_TIMEOUT_MS(&nt->nt_inact_timer, WLAN_NODE_INACT_TIMEOUT_MSEC, 0);
-+
-+    nt->isTimerArmed = reArmTimer;
-+}
-+
-+void
-+wlan_node_table_cleanup(struct ieee80211_node_table *nt)
-+{
-+    A_UNTIMEOUT(&nt->nt_inact_timer);
-+    A_DELETE_TIMER(&nt->nt_inact_timer);
-+    wlan_free_allnodes(nt);
-+    IEEE80211_NODE_LOCK_DESTROY(nt);
-+}
-+
-+bss_t *
-+wlan_find_Ssidnode (struct ieee80211_node_table *nt, A_UCHAR *pSsid,
-+                                      A_UINT32 ssidLength, A_BOOL bIsWPA2)
-+{
-+    bss_t   *ni = NULL;
-+      A_UCHAR *pIESsid = NULL;
-+
-+    IEEE80211_NODE_LOCK (nt);
-+
-+    for (ni = nt->nt_node_first; ni; ni = ni->ni_list_next) {
-+              pIESsid = ni->ni_cie.ie_ssid;
-+              if (pIESsid[1] <= 32) {
-+
-+                      // Step 1 : Check SSID
-+                      if (0x00 == memcmp (pSsid, &pIESsid[2], ssidLength)) {
-+
-+                              // Step 2 : if SSID matches, check WPA or WPA2
-+                              if (TRUE == bIsWPA2 && NULL != ni->ni_cie.ie_rsn) {
-+                                      ieee80211_node_incref (ni);  /* mark referenced */
-+                                      IEEE80211_NODE_UNLOCK (nt);
-+                                      return ni;
-+                              }
-+                              if (FALSE == bIsWPA2 && NULL != ni->ni_cie.ie_wpa) {
-+                                      ieee80211_node_incref(ni);  /* mark referenced */
-+                                      IEEE80211_NODE_UNLOCK (nt);
-+                                      return ni;
-+                              }
-+                      }
-+              }
-+    }
-+
-+    IEEE80211_NODE_UNLOCK (nt);
-+
-+    return NULL;
-+}
-+
-+void
-+wlan_node_return (struct ieee80211_node_table *nt, bss_t *ni)
-+{
-+      IEEE80211_NODE_LOCK (nt);
-+      wlan_node_dec_free (ni);
-+      IEEE80211_NODE_UNLOCK (nt);
-+}
-diff --git a/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c b/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c
-new file mode 100644
-index 0000000..15beabb
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c
-@@ -0,0 +1,192 @@
-+/*-
-+ * Copyright (c) 2001 Atsushi Onoe
-+ * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ *    derived from this software without specific prior written permission.
-+ *
-+ * Alternatively, this software may be distributed under the terms of the
-+ * GNU General Public License ("GPL") version 2 as published by the Free
-+ * Software Foundation.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
-+ */
-+/*
-+ * IEEE 802.11 input handling.
-+ */
-+
-+#include "a_config.h"
-+#include "athdefs.h"
-+#include "a_types.h"
-+#include "a_osapi.h"
-+#include <wmi.h>
-+#include <ieee80211.h>
-+#include <wlan_api.h>
-+
-+#define IEEE80211_VERIFY_LENGTH(_len, _minlen) do {         \
-+    if ((_len) < (_minlen)) {                   \
-+        return A_EINVAL;                         \
-+    }                               \
-+} while (0)
-+
-+#define IEEE80211_VERIFY_ELEMENT(__elem, __maxlen) do {         \
-+    if ((__elem) == NULL) {                     \
-+        return A_EINVAL;                         \
-+    }                               \
-+    if ((__elem)[1] > (__maxlen)) {                 \
-+        return A_EINVAL;                         \
-+    }                               \
-+} while (0)
-+
-+
-+/* unaligned little endian access */
-+#define LE_READ_2(p)                            \
-+    ((A_UINT16)                            \
-+     ((((A_UINT8 *)(p))[0]      ) | (((A_UINT8 *)(p))[1] <<  8)))
-+
-+#define LE_READ_4(p)                            \
-+    ((A_UINT32)                            \
-+     ((((A_UINT8 *)(p))[0]      ) | (((A_UINT8 *)(p))[1] <<  8) | \
-+      (((A_UINT8 *)(p))[2] << 16) | (((A_UINT8 *)(p))[3] << 24)))
-+
-+
-+static int __inline
-+iswpaoui(const A_UINT8 *frm)
-+{
-+    return frm[1] > 3 && LE_READ_4(frm+2) == ((WPA_OUI_TYPE<<24)|WPA_OUI);
-+}
-+
-+static int __inline
-+iswmmoui(const A_UINT8 *frm)
-+{
-+    return frm[1] > 3 && LE_READ_4(frm+2) == ((WMM_OUI_TYPE<<24)|WMM_OUI);
-+}
-+
-+static int __inline
-+iswmmparam(const A_UINT8 *frm)
-+{
-+    return frm[1] > 5 && frm[6] == WMM_PARAM_OUI_SUBTYPE;
-+}
-+
-+static int __inline
-+iswmminfo(const A_UINT8 *frm)
-+{
-+    return frm[1] > 5 && frm[6] == WMM_INFO_OUI_SUBTYPE;
-+}
-+
-+static int __inline
-+isatherosoui(const A_UINT8 *frm)
-+{
-+    return frm[1] > 3 && LE_READ_4(frm+2) == ((ATH_OUI_TYPE<<24)|ATH_OUI);
-+}
-+
-+static int __inline
-+iswscoui(const A_UINT8 *frm)
-+{
-+    return frm[1] > 3 && LE_READ_4(frm+2) == ((0x04<<24)|WPA_OUI);
-+}
-+
-+A_STATUS
-+wlan_parse_beacon(A_UINT8 *buf, int framelen, struct ieee80211_common_ie *cie)
-+{
-+    A_UINT8 *frm, *efrm;
-+
-+    frm = buf;
-+    efrm = (A_UINT8 *) (frm + framelen);
-+
-+    /*
-+     * beacon/probe response frame format
-+     *  [8] time stamp
-+     *  [2] beacon interval
-+     *  [2] capability information
-+     *  [tlv] ssid
-+     *  [tlv] supported rates
-+     *  [tlv] country information
-+     *  [tlv] parameter set (FH/DS)
-+     *  [tlv] erp information
-+     *  [tlv] extended supported rates
-+     *  [tlv] WMM
-+     *  [tlv] WPA or RSN
-+     *  [tlv] Atheros Advanced Capabilities
-+     */
-+    IEEE80211_VERIFY_LENGTH(efrm - frm, 12);
-+    A_MEMZERO(cie, sizeof(*cie));
-+
-+    cie->ie_tstamp = frm; frm += 8;
-+    cie->ie_beaconInt = A_LE2CPU16(*(A_UINT16 *)frm);  frm += 2;
-+    cie->ie_capInfo = A_LE2CPU16(*(A_UINT16 *)frm);  frm += 2;
-+    cie->ie_chan = 0;
-+
-+    while (frm < efrm) {
-+        switch (*frm) {
-+        case IEEE80211_ELEMID_SSID:
-+            cie->ie_ssid = frm;
-+            break;
-+        case IEEE80211_ELEMID_RATES:
-+            cie->ie_rates = frm;
-+            break;
-+        case IEEE80211_ELEMID_COUNTRY:
-+            cie->ie_country = frm;
-+            break;
-+        case IEEE80211_ELEMID_FHPARMS:
-+            break;
-+        case IEEE80211_ELEMID_DSPARMS:
-+            cie->ie_chan = frm[2];
-+            break;
-+        case IEEE80211_ELEMID_TIM:
-+            cie->ie_tim = frm;
-+            break;
-+        case IEEE80211_ELEMID_IBSSPARMS:
-+            break;
-+        case IEEE80211_ELEMID_XRATES:
-+            cie->ie_xrates = frm;
-+            break;
-+        case IEEE80211_ELEMID_ERP:
-+            if (frm[1] != 1) {
-+                //A_PRINTF("Discarding ERP Element - Bad Len\n");
-+                return A_EINVAL;
-+            }
-+            cie->ie_erp = frm[2];
-+            break;
-+        case IEEE80211_ELEMID_RSN:
-+            cie->ie_rsn = frm;
-+            break;
-+        case IEEE80211_ELEMID_VENDOR:
-+            if (iswpaoui(frm)) {
-+                cie->ie_wpa = frm;
-+            } else if (iswmmoui(frm)) {
-+                cie->ie_wmm = frm;
-+            } else if (isatherosoui(frm)) {
-+                cie->ie_ath = frm;
-+            } else if(iswscoui(frm)) {
-+                cie->ie_wsc = frm;
-+            }
-+            break;
-+        default:
-+            break;
-+        }
-+        frm += frm[1] + 2;
-+    }
-+    IEEE80211_VERIFY_ELEMENT(cie->ie_rates, IEEE80211_RATE_MAXSIZE);
-+    IEEE80211_VERIFY_ELEMENT(cie->ie_ssid, IEEE80211_NWID_LEN);
-+
-+    return A_OK;
-+}
-diff --git a/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c b/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c
-new file mode 100644
-index 0000000..fd5aac9
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c
-@@ -0,0 +1,59 @@
-+/*
-+ * Copyright (c) 2004-2005 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * This module implements frequently used wlan utilies
-+ *
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/wlan/src/wlan_utils.c#1 $
-+ *
-+ *
-+ *  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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include <a_config.h>
-+#include <athdefs.h>
-+#include <a_types.h>
-+#include <a_osapi.h>
-+
-+/*
-+ * converts ieee channel number to frequency
-+ */
-+A_UINT16
-+wlan_ieee2freq(int chan)
-+{
-+    if (chan == 14) {
-+        return 2484;
-+    }
-+    if (chan < 14) {    /* 0-13 */
-+        return (2407 + (chan*5));
-+    }
-+    if (chan < 27) {    /* 15-26 */
-+        return (2512 + ((chan-15)*20));
-+    }
-+    return (5000 + (chan*5));
-+}
-+
-+/*
-+ * Converts MHz frequency to IEEE channel number.
-+ */
-+A_UINT32
-+wlan_freq2ieee(A_UINT16 freq)
-+{
-+    if (freq == 2484)
-+        return 14;
-+    if (freq < 2484)
-+        return (freq - 2407) / 5;
-+    if (freq < 5000)
-+        return 15 + ((freq - 2512) / 20);
-+    return (freq - 5000) / 5;
-+}
-diff --git a/drivers/sdio/function/wlan/ar6000/wmi/wmi.c b/drivers/sdio/function/wlan/ar6000/wmi/wmi.c
-new file mode 100644
-index 0000000..0e0e6ba
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/wmi/wmi.c
-@@ -0,0 +1,3921 @@
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * This module implements the hardware independent layer of the
-+ * Wireless Module Interface (WMI) protocol.
-+ *
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/wmi/wmi.c#3 $
-+ *
-+ *
-+ *  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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include <a_config.h>
-+#include <athdefs.h>
-+#include <a_types.h>
-+#include <a_osapi.h>
-+#include "htc.h"
-+#include "htc_api.h"
-+#include "wmi.h"
-+#include <ieee80211.h>
-+#include <ieee80211_node.h>
-+#include <wlan_api.h>
-+#include <wmi_api.h>
-+#include "dset_api.h"
-+#include "gpio_api.h"
-+#include "wmi_host.h"
-+#include "a_drv.h"
-+#include "a_drv_api.h"
-+#include "a_debug.h"
-+#include "dbglog_api.h"
-+
-+static A_STATUS wmi_ready_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+
-+static A_STATUS wmi_connect_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                     int len);
-+static A_STATUS wmi_disconnect_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                        int len);
-+static A_STATUS wmi_tkip_micerr_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                        int len);
-+static A_STATUS wmi_bssInfo_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                     int len);
-+static A_STATUS wmi_opt_frame_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                       int len);
-+static A_STATUS wmi_pstream_timeout_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                     int len);
-+static A_STATUS wmi_sync_point(struct wmi_t *wmip);
-+
-+static A_STATUS wmi_bitrate_reply_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                     int len);
-+static A_STATUS wmi_ratemask_reply_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                     int len);
-+static A_STATUS wmi_channelList_reply_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                         int len);
-+static A_STATUS wmi_regDomain_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                       int len);
-+static A_STATUS wmi_txPwr_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+static A_STATUS wmi_neighborReport_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                             int len);
-+
-+static A_STATUS wmi_dset_open_req_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                     int len);
-+#ifdef CONFIG_HOST_DSET_SUPPORT
-+static A_STATUS wmi_dset_close_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+static A_STATUS wmi_dset_data_req_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                     int len);
-+#endif /* CONFIG_HOST_DSET_SUPPORT */
-+
-+
-+static A_STATUS wmi_scanComplete_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                     int len);
-+static A_STATUS wmi_errorEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+static A_STATUS wmi_statsEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+static A_STATUS wmi_rssiThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+static A_STATUS wmi_hbChallengeResp_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+static A_STATUS wmi_reportErrorEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+static A_STATUS wmi_cac_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+static A_STATUS wmi_roam_tbl_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                      int len);
-+static A_STATUS wmi_roam_data_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                      int len);
-+static A_STATUS wmi_get_wow_list_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                      int len);
-+static A_STATUS
-+wmi_get_pmkid_list_event_rx(struct wmi_t *wmip, A_UINT8 *datap, A_UINT32 len);
-+
-+#ifdef CONFIG_HOST_GPIO_SUPPORT
-+static A_STATUS wmi_gpio_intr_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+static A_STATUS wmi_gpio_data_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+static A_STATUS wmi_gpio_ack_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+#endif /* CONFIG_HOST_GPIO_SUPPORT */
-+
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+static A_STATUS
-+wmi_tcmd_test_report_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+#endif
-+
-+static A_STATUS
-+wmi_txRetryErrEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+
-+static A_STATUS
-+wmi_snrThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+
-+static A_STATUS
-+wmi_lqThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+
-+static A_BOOL
-+wmi_is_bitrate_index_valid(struct wmi_t *wmip, A_UINT32 rateIndex);
-+
-+static A_STATUS
-+wmi_aplistEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+
-+static A_STATUS
-+wmi_dbglog_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+
-+static A_STATUS wmi_keepalive_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+
-+int wps_enable;
-+static const A_INT32 wmi_rateTable[] = {
-+    1000,
-+    2000,
-+    5500,
-+    11000,
-+    6000,
-+    9000,
-+    12000,
-+    18000,
-+    24000,
-+    36000,
-+    48000,
-+    54000,
-+    0};
-+
-+#define MODE_A_SUPPORT_RATE_START       4
-+#define MODE_A_SUPPORT_RATE_STOP        11
-+
-+#define MODE_GONLY_SUPPORT_RATE_START   MODE_A_SUPPORT_RATE_START
-+#define MODE_GONLY_SUPPORT_RATE_STOP    MODE_A_SUPPORT_RATE_STOP
-+
-+#define MODE_B_SUPPORT_RATE_START       0
-+#define MODE_B_SUPPORT_RATE_STOP        3
-+
-+#define MODE_G_SUPPORT_RATE_START       0
-+#define MODE_G_SUPPORT_RATE_STOP        11
-+
-+#define MAX_NUMBER_OF_SUPPORT_RATES     (MODE_G_SUPPORT_RATE_STOP + 1)
-+
-+/* 802.1d to AC mapping. Refer pg 57 of WMM-test-plan-v1.2 */
-+const A_UINT8 up_to_ac[]= {
-+                WMM_AC_BE,
-+                WMM_AC_BK,
-+                WMM_AC_BK,
-+                WMM_AC_BE,
-+                WMM_AC_VI,
-+                WMM_AC_VI,
-+                WMM_AC_VO,
-+                WMM_AC_VO,
-+            };
-+
-+void *
-+wmi_init(void *devt)
-+{
-+    struct wmi_t *wmip;
-+
-+    wmip = A_MALLOC(sizeof(struct wmi_t));
-+    if (wmip == NULL) {
-+        return (NULL);
-+    }
-+    A_MEMZERO(wmip, sizeof(*wmip));
-+    A_MUTEX_INIT(&wmip->wmi_lock);
-+    wmip->wmi_devt = devt;
-+    wlan_node_table_init(wmip, &wmip->wmi_scan_table);
-+    wmi_qos_state_init(wmip);
-+    wmip->wmi_powerMode = REC_POWER;
-+    wmip->wmi_phyMode = WMI_11G_MODE;
-+
-+    return (wmip);
-+}
-+
-+void
-+wmi_qos_state_init(struct wmi_t *wmip)
-+{
-+    A_UINT8 i;
-+
-+    if (wmip == NULL) {
-+        return;
-+    }
-+    LOCK_WMI(wmip);
-+
-+    /* Initialize QoS States */
-+    wmip->wmi_numQoSStream = 0;
-+
-+    wmip->wmi_fatPipeExists = 0;
-+
-+    for (i=0; i < WMM_NUM_AC; i++) {
-+        wmip->wmi_streamExistsForAC[i]=0;
-+    }
-+
-+        /* Initialize the static Wmi stream Pri to WMM AC mappings Arrays */
-+    WMI_INIT_WMISTREAM_AC_MAP(wmip);
-+
-+    UNLOCK_WMI(wmip);
-+
-+    A_WMI_SET_NUMDATAENDPTS(wmip->wmi_devt, 1);
-+}
-+
-+void
-+wmi_shutdown(struct wmi_t *wmip)
-+{
-+    if (wmip != NULL) {
-+        wlan_node_table_cleanup(&wmip->wmi_scan_table);
-+        if (A_IS_MUTEX_VALID(&wmip->wmi_lock)) {
-+            A_MUTEX_DELETE(&wmip->wmi_lock);
-+        }
-+        A_FREE(wmip);
-+    }
-+}
-+
-+/*
-+ *  performs DIX to 802.3 encapsulation for transmit packets.
-+ *  uses passed in buffer.  Returns buffer or NULL if failed.
-+ *  Assumes the entire DIX header is contigous and that there is
-+ *  enough room in the buffer for a 802.3 mac header and LLC+SNAP headers.
-+ */
-+A_STATUS
-+wmi_dix_2_dot3(struct wmi_t *wmip, void *osbuf)
-+{
-+    A_UINT8          *datap;
-+    A_UINT16         typeorlen;
-+    ATH_MAC_HDR      macHdr;
-+    ATH_LLC_SNAP_HDR *llcHdr;
-+
-+    A_ASSERT(osbuf != NULL);
-+
-+    if (A_NETBUF_HEADROOM(osbuf) <
-+        (sizeof(ATH_LLC_SNAP_HDR) + sizeof(WMI_DATA_HDR)))
-+    {
-+        return A_NO_MEMORY;
-+    }
-+
-+    datap = A_NETBUF_DATA(osbuf);
-+
-+    typeorlen = *(A_UINT16 *)(datap + ATH_MAC_LEN + ATH_MAC_LEN);
-+
-+    if (!IS_ETHERTYPE(A_BE2CPU16(typeorlen))) {
-+        /*
-+         * packet is already in 802.3 format - return success
-+         */
-+        A_DPRINTF(DBG_WMI, (DBGFMT "packet already 802.3\n", DBGARG));
-+        return (A_OK);
-+    }
-+
-+    /*
-+     * Save mac fields and length to be inserted later
-+     */
-+    A_MEMCPY(macHdr.dstMac, datap, ATH_MAC_LEN);
-+    A_MEMCPY(macHdr.srcMac, datap + ATH_MAC_LEN, ATH_MAC_LEN);
-+    macHdr.typeOrLen = A_CPU2BE16(A_NETBUF_LEN(osbuf) - sizeof(ATH_MAC_HDR) +
-+                                  sizeof(ATH_LLC_SNAP_HDR));
-+
-+    /*
-+     * Make room for LLC+SNAP headers
-+     */
-+    if (A_NETBUF_PUSH(osbuf, sizeof(ATH_LLC_SNAP_HDR)) != A_OK) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    datap = A_NETBUF_DATA(osbuf);
-+
-+    A_MEMCPY(datap, &macHdr, sizeof (ATH_MAC_HDR));
-+
-+    llcHdr = (ATH_LLC_SNAP_HDR *)(datap + sizeof(ATH_MAC_HDR));
-+    llcHdr->dsap      = 0xAA;
-+    llcHdr->ssap      = 0xAA;
-+    llcHdr->cntl      = 0x03;
-+    llcHdr->orgCode[0] = 0x0;
-+    llcHdr->orgCode[1] = 0x0;
-+    llcHdr->orgCode[2] = 0x0;
-+    llcHdr->etherType = typeorlen;
-+
-+    return (A_OK);
-+}
-+
-+/*
-+ * Adds a WMI data header
-+ * Assumes there is enough room in the buffer to add header.
-+ */
-+A_STATUS
-+wmi_data_hdr_add(struct wmi_t *wmip, void *osbuf, A_UINT8 msgType)
-+{
-+    WMI_DATA_HDR     *dtHdr;
-+
-+    A_ASSERT(osbuf != NULL);
-+
-+    if (A_NETBUF_PUSH(osbuf, sizeof(WMI_DATA_HDR)) != A_OK) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    dtHdr = (WMI_DATA_HDR *)A_NETBUF_DATA(osbuf);
-+    dtHdr->info = msgType;
-+    dtHdr->rssi = 0;
-+
-+    return (A_OK);
-+}
-+
-+A_UINT8 wmi_implicit_create_pstream(struct wmi_t *wmip, void *osbuf, A_UINT8 dir, A_UINT8 up)
-+{
-+    A_UINT8         *datap;
-+    A_UINT8         trafficClass = WMM_AC_BE, userPriority = up;
-+    ATH_LLC_SNAP_HDR *llcHdr;
-+    A_UINT16        ipType = IP_ETHERTYPE;
-+    WMI_DATA_HDR     *dtHdr;
-+    WMI_CREATE_PSTREAM_CMD  cmd;
-+    A_BOOL           streamExists = FALSE;
-+
-+    A_ASSERT(osbuf != NULL);
-+
-+    datap = A_NETBUF_DATA(osbuf);
-+
-+    if (up == UNDEFINED_PRI) {
-+    llcHdr = (ATH_LLC_SNAP_HDR *)(datap + sizeof(WMI_DATA_HDR) +
-+                                  sizeof(ATH_MAC_HDR));
-+
-+        if (llcHdr->etherType == A_CPU2BE16(ipType)) {
-+        /* Extract the endpoint info from the TOS field in the IP header */
-+        userPriority = A_WMI_IPTOS_TO_USERPRIORITY(((A_UINT8 *)llcHdr) + sizeof(ATH_LLC_SNAP_HDR));
-+        }
-+    }
-+
-+    if (userPriority < MAX_NUM_PRI) {
-+        trafficClass = convert_userPriority_to_trafficClass(userPriority);
-+    }
-+
-+    dtHdr = (WMI_DATA_HDR *)datap;
-+    if(dir==UPLINK_TRAFFIC)
-+        dtHdr->info |= (userPriority & WMI_DATA_HDR_UP_MASK) << WMI_DATA_HDR_UP_SHIFT;  /* lower 3-bits are 802.1d priority */
-+
-+    LOCK_WMI(wmip);
-+    streamExists = wmip->wmi_fatPipeExists;
-+    UNLOCK_WMI(wmip);
-+
-+    if (!(streamExists & (1 << trafficClass))) {
-+
-+        A_MEMZERO(&cmd, sizeof(cmd));
-+          cmd.trafficClass = trafficClass;
-+          cmd.userPriority = userPriority;
-+              cmd.inactivityInt = WMI_IMPLICIT_PSTREAM_INACTIVITY_INT;
-+            /* Implicit streams are created with TSID 0xFF */
-+        cmd.tsid = WMI_IMPLICIT_PSTREAM;
-+        wmi_create_pstream_cmd(wmip, &cmd);
-+    }
-+
-+    return trafficClass;
-+}
-+
-+WMI_PRI_STREAM_ID
-+wmi_get_stream_id(struct wmi_t *wmip, A_UINT8 trafficClass)
-+{
-+    return WMI_ACCESSCATEGORY_WMISTREAM(wmip, trafficClass);
-+}
-+
-+/*
-+ *  performs 802.3 to DIX encapsulation for received packets.
-+ *  Assumes the entire 802.3 header is contigous.
-+ */
-+A_STATUS
-+wmi_dot3_2_dix(struct wmi_t *wmip, void *osbuf)
-+{
-+    A_UINT8          *datap;
-+    ATH_MAC_HDR      macHdr;
-+    ATH_LLC_SNAP_HDR *llcHdr;
-+
-+    A_ASSERT(osbuf != NULL);
-+    datap = A_NETBUF_DATA(osbuf);
-+
-+    A_MEMCPY(&macHdr, datap, sizeof(ATH_MAC_HDR));
-+    llcHdr = (ATH_LLC_SNAP_HDR *)(datap + sizeof(ATH_MAC_HDR));
-+    macHdr.typeOrLen = llcHdr->etherType;
-+
-+    if (A_NETBUF_PULL(osbuf, sizeof(ATH_LLC_SNAP_HDR)) != A_OK) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    datap = A_NETBUF_DATA(osbuf);
-+
-+    A_MEMCPY(datap, &macHdr, sizeof (ATH_MAC_HDR));
-+
-+    return (A_OK);
-+}
-+
-+/*
-+ * Removes a WMI data header
-+ */
-+A_STATUS
-+wmi_data_hdr_remove(struct wmi_t *wmip, void *osbuf)
-+{
-+    A_ASSERT(osbuf != NULL);
-+
-+    return (A_NETBUF_PULL(osbuf, sizeof(WMI_DATA_HDR)));
-+}
-+
-+void
-+wmi_iterate_nodes(struct wmi_t *wmip, wlan_node_iter_func *f, void *arg)
-+{
-+    wlan_iterate_nodes(&wmip->wmi_scan_table, f, arg);
-+}
-+
-+/*
-+ * WMI Extended Event received from Target.
-+ */
-+A_STATUS
-+wmi_control_rx_xtnd(struct wmi_t *wmip, void *osbuf)
-+{
-+    WMIX_CMD_HDR *cmd;
-+    A_UINT16 id;
-+    A_UINT8 *datap;
-+    A_UINT32 len;
-+    A_STATUS status = A_OK;
-+
-+    if (A_NETBUF_LEN(osbuf) < sizeof(WMIX_CMD_HDR)) {
-+        A_DPRINTF(DBG_WMI, (DBGFMT "bad packet 1\n", DBGARG));
-+        wmip->wmi_stats.cmd_len_err++;
-+        A_NETBUF_FREE(osbuf);
-+        return A_ERROR;
-+    }
-+
-+    cmd = (WMIX_CMD_HDR *)A_NETBUF_DATA(osbuf);
-+    id = cmd->commandId;
-+
-+    if (A_NETBUF_PULL(osbuf, sizeof(WMIX_CMD_HDR)) != A_OK) {
-+        A_DPRINTF(DBG_WMI, (DBGFMT "bad packet 2\n", DBGARG));
-+        wmip->wmi_stats.cmd_len_err++;
-+        A_NETBUF_FREE(osbuf);
-+        return A_ERROR;
-+    }
-+
-+    datap = A_NETBUF_DATA(osbuf);
-+    len = A_NETBUF_LEN(osbuf);
-+
-+    switch (id) {
-+    case (WMIX_DSETOPENREQ_EVENTID):
-+        status = wmi_dset_open_req_rx(wmip, datap, len);
-+        break;
-+#ifdef CONFIG_HOST_DSET_SUPPORT
-+    case (WMIX_DSETCLOSE_EVENTID):
-+        status = wmi_dset_close_rx(wmip, datap, len);
-+        break;
-+    case (WMIX_DSETDATAREQ_EVENTID):
-+        status = wmi_dset_data_req_rx(wmip, datap, len);
-+        break;
-+#endif /* CONFIG_HOST_DSET_SUPPORT */
-+#ifdef CONFIG_HOST_GPIO_SUPPORT
-+    case (WMIX_GPIO_INTR_EVENTID):
-+        wmi_gpio_intr_rx(wmip, datap, len);
-+        break;
-+    case (WMIX_GPIO_DATA_EVENTID):
-+        wmi_gpio_data_rx(wmip, datap, len);
-+        break;
-+    case (WMIX_GPIO_ACK_EVENTID):
-+        wmi_gpio_ack_rx(wmip, datap, len);
-+        break;
-+#endif /* CONFIG_HOST_GPIO_SUPPORT */
-+    case (WMIX_HB_CHALLENGE_RESP_EVENTID):
-+        wmi_hbChallengeResp_rx(wmip, datap, len);
-+        break;
-+    case (WMIX_DBGLOG_EVENTID):
-+        wmi_dbglog_event_rx(wmip, datap, len);
-+        break;
-+    default:
-+        A_DPRINTF(DBG_WMI|DBG_ERROR,
-+            (DBGFMT "Unknown id 0x%x\n", DBGARG, id));
-+        wmip->wmi_stats.cmd_id_err++;
-+        status = A_ERROR;
-+        break;
-+    }
-+
-+    return status;
-+}
-+
-+/*
-+ * Control Path
-+ */
-+A_UINT32 cmdRecvNum;
-+
-+A_STATUS
-+wmi_control_rx(struct wmi_t *wmip, void *osbuf)
-+{
-+    WMI_CMD_HDR *cmd;
-+    A_UINT16 id;
-+    A_UINT8 *datap;
-+    A_UINT32 len, i, loggingReq;
-+    A_STATUS status = A_OK;
-+
-+    A_ASSERT(osbuf != NULL);
-+    if (A_NETBUF_LEN(osbuf) < sizeof(WMI_CMD_HDR)) {
-+        A_DPRINTF(DBG_WMI, (DBGFMT "bad packet 1\n", DBGARG));
-+        wmip->wmi_stats.cmd_len_err++;
-+        A_NETBUF_FREE(osbuf);
-+        return A_ERROR;
-+    }
-+
-+    cmd = (WMI_CMD_HDR *)A_NETBUF_DATA(osbuf);
-+    id = cmd->commandId;
-+
-+    if (A_NETBUF_PULL(osbuf, sizeof(WMI_CMD_HDR)) != A_OK) {
-+        A_DPRINTF(DBG_WMI, (DBGFMT "bad packet 2\n", DBGARG));
-+        wmip->wmi_stats.cmd_len_err++;
-+        A_NETBUF_FREE(osbuf);
-+        return A_ERROR;
-+    }
-+
-+    datap = A_NETBUF_DATA(osbuf);
-+    len = A_NETBUF_LEN(osbuf);
-+
-+    ar6000_get_driver_cfg(wmip->wmi_devt,
-+                    AR6000_DRIVER_CFG_LOG_RAW_WMI_MSGS,
-+                    &loggingReq);
-+
-+    if(loggingReq) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("WMI %d \n",id));
-+        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("WMI recv, MsgNo %d : ", cmdRecvNum));
-+        for(i = 0; i < len; i++)
-+            AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("%x ", datap[i]));
-+        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("\n"));
-+    }
-+
-+    LOCK_WMI(wmip);
-+    cmdRecvNum++;
-+    UNLOCK_WMI(wmip);
-+
-+    switch (id) {
-+    case (WMI_GET_BITRATE_CMDID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_GET_BITRATE_CMDID\n", DBGARG));
-+        status = wmi_bitrate_reply_rx(wmip, datap, len);
-+        break;
-+    case (WMI_GET_CHANNEL_LIST_CMDID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_GET_CHANNEL_LIST_CMDID\n", DBGARG));
-+        status = wmi_channelList_reply_rx(wmip, datap, len);
-+        break;
-+    case (WMI_GET_TX_PWR_CMDID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_GET_TX_PWR_CMDID\n", DBGARG));
-+        status = wmi_txPwr_reply_rx(wmip, datap, len);
-+        break;
-+    case (WMI_READY_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_READY_EVENTID\n", DBGARG));
-+        status = wmi_ready_event_rx(wmip, datap, len);
-+        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-+        A_WMI_DBGLOG_INIT_DONE(wmip->wmi_devt);
-+        break;
-+    case (WMI_CONNECT_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_CONNECT_EVENTID\n", DBGARG));
-+        status = wmi_connect_event_rx(wmip, datap, len);
-+        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-+        break;
-+    case (WMI_DISCONNECT_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_DISCONNECT_EVENTID\n", DBGARG));
-+        status = wmi_disconnect_event_rx(wmip, datap, len);
-+        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-+        break;
-+    case (WMI_TKIP_MICERR_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_TKIP_MICERR_EVENTID\n", DBGARG));
-+        status = wmi_tkip_micerr_event_rx(wmip, datap, len);
-+        break;
-+    case (WMI_BSSINFO_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_BSSINFO_EVENTID\n", DBGARG));
-+        status = wmi_bssInfo_event_rx(wmip, datap, len);
-+        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-+        break;
-+    case (WMI_REGDOMAIN_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_REGDOMAIN_EVENTID\n", DBGARG));
-+        status = wmi_regDomain_event_rx(wmip, datap, len);
-+        break;
-+    case (WMI_PSTREAM_TIMEOUT_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_PSTREAM_TIMEOUT_EVENTID\n", DBGARG));
-+        status = wmi_pstream_timeout_event_rx(wmip, datap, len);
-+            /* pstreams are fatpipe abstractions that get implicitly created.
-+             * User apps only deal with thinstreams. creation of a thinstream
-+             * by the user or data traffic flow in an AC triggers implicit
-+             * pstream creation. Do we need to send this event to App..?
-+             * no harm in sending it.
-+             */
-+        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-+        break;
-+    case (WMI_NEIGHBOR_REPORT_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_NEIGHBOR_REPORT_EVENTID\n", DBGARG));
-+        status = wmi_neighborReport_event_rx(wmip, datap, len);
-+        break;
-+    case (WMI_SCAN_COMPLETE_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_SCAN_COMPLETE_EVENTID\n", DBGARG));
-+        status = wmi_scanComplete_rx(wmip, datap, len);
-+        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-+        break;
-+    case (WMI_CMDERROR_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_CMDERROR_EVENTID\n", DBGARG));
-+        status = wmi_errorEvent_rx(wmip, datap, len);
-+        break;
-+    case (WMI_REPORT_STATISTICS_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_REPORT_STATISTICS_EVENTID\n", DBGARG));
-+        status = wmi_statsEvent_rx(wmip, datap, len);
-+        break;
-+    case (WMI_RSSI_THRESHOLD_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_RSSI_THRESHOLD_EVENTID\n", DBGARG));
-+        status = wmi_rssiThresholdEvent_rx(wmip, datap, len);
-+        break;
-+    case (WMI_ERROR_REPORT_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_ERROR_REPORT_EVENTID\n", DBGARG));
-+        status = wmi_reportErrorEvent_rx(wmip, datap, len);
-+        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-+        break;
-+    case (WMI_OPT_RX_FRAME_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_OPT_RX_FRAME_EVENTID\n", DBGARG));
-+        status = wmi_opt_frame_event_rx(wmip, datap, len);
-+        break;
-+    case (WMI_REPORT_ROAM_TBL_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_REPORT_ROAM_TBL_EVENTID\n", DBGARG));
-+        status = wmi_roam_tbl_event_rx(wmip, datap, len);
-+        break;
-+    case (WMI_EXTENSION_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_EXTENSION_EVENTID\n", DBGARG));
-+        status = wmi_control_rx_xtnd(wmip, osbuf);
-+        break;
-+    case (WMI_CAC_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_CAC_EVENTID\n", DBGARG));
-+        status = wmi_cac_event_rx(wmip, datap, len);
-+        break;
-+    case (WMI_REPORT_ROAM_DATA_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_REPORT_ROAM_DATA_EVENTID\n", DBGARG));
-+        status = wmi_roam_data_event_rx(wmip, datap, len);
-+        break;
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+    case (WMI_TEST_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_TEST_EVENTID\n", DBGARG));
-+        status = wmi_tcmd_test_report_rx(wmip, datap, len);
-+        break;
-+#endif
-+    case (WMI_GET_FIXRATES_CMDID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_GET_FIXRATES_CMDID\n", DBGARG));
-+        status = wmi_ratemask_reply_rx(wmip, datap, len);
-+        break;
-+    case (WMI_TX_RETRY_ERR_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_TX_RETRY_ERR_EVENTID\n", DBGARG));
-+        status = wmi_txRetryErrEvent_rx(wmip, datap, len);
-+        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-+        break;
-+    case (WMI_SNR_THRESHOLD_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_SNR_THRESHOLD_EVENTID\n", DBGARG));
-+        status = wmi_snrThresholdEvent_rx(wmip, datap, len);
-+        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-+        break;
-+    case (WMI_LQ_THRESHOLD_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_LQ_THRESHOLD_EVENTID\n", DBGARG));
-+        status = wmi_lqThresholdEvent_rx(wmip, datap, len);
-+        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-+        break;
-+    case (WMI_APLIST_EVENTID):
-+        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("Received APLIST Event\n"));
-+        status = wmi_aplistEvent_rx(wmip, datap, len);
-+        break;
-+    case (WMI_GET_KEEPALIVE_CMDID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_GET_KEEPALIVE_CMDID\n", DBGARG));
-+        status = wmi_keepalive_reply_rx(wmip, datap, len);
-+        break;
-+    case (WMI_GET_WOW_LIST_EVENTID):
-+        status = wmi_get_wow_list_event_rx(wmip, datap, len);
-+        break;
-+    case (WMI_GET_PMKID_LIST_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_GET_PMKID_LIST Event\n", DBGARG));
-+        status = wmi_get_pmkid_list_event_rx(wmip, datap, len);
-+        break;
-+    default:
-+        A_DPRINTF(DBG_WMI|DBG_ERROR,
-+            (DBGFMT "Unknown id 0x%x\n", DBGARG, id));
-+        wmip->wmi_stats.cmd_id_err++;
-+        status = A_ERROR;
-+        break;
-+    }
-+
-+    A_NETBUF_FREE(osbuf);
-+
-+    return status;
-+}
-+
-+static A_STATUS
-+wmi_ready_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_READY_EVENT *ev = (WMI_READY_EVENT *)datap;
-+
-+    if (len < sizeof(WMI_READY_EVENT)) {
-+        return A_EINVAL;
-+    }
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+    wmip->wmi_ready = TRUE;
-+    A_WMI_READY_EVENT(wmip->wmi_devt, ev->macaddr, ev->phyCapability);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_connect_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_CONNECT_EVENT *ev;
-+
-+    if (len < sizeof(WMI_CONNECT_EVENT)) {
-+        return A_EINVAL;
-+    }
-+    ev = (WMI_CONNECT_EVENT *)datap;
-+    A_DPRINTF(DBG_WMI,
-+        (DBGFMT "freq %d bssid %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n",
-+        DBGARG, ev->channel,
-+        ev->bssid[0], ev->bssid[1], ev->bssid[2],
-+        ev->bssid[3], ev->bssid[4], ev->bssid[5]));
-+
-+    A_MEMCPY(wmip->wmi_bssid, ev->bssid, ATH_MAC_LEN);
-+
-+    A_WMI_CONNECT_EVENT(wmip->wmi_devt, ev->channel, ev->bssid,
-+                         ev->listenInterval, ev->beaconInterval,
-+                         ev->networkType, ev->beaconIeLen,
-+                         ev->assocReqLen, ev->assocRespLen,
-+                         ev->assocInfo);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_regDomain_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_REG_DOMAIN_EVENT *ev;
-+
-+    if (len < sizeof(*ev)) {
-+        return A_EINVAL;
-+    }
-+    ev = (WMI_REG_DOMAIN_EVENT *)datap;
-+
-+    A_WMI_REGDOMAIN_EVENT(wmip->wmi_devt, ev->regDomain);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_neighborReport_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_NEIGHBOR_REPORT_EVENT *ev;
-+    int numAps;
-+
-+    if (len < sizeof(*ev)) {
-+        return A_EINVAL;
-+    }
-+    ev = (WMI_NEIGHBOR_REPORT_EVENT *)datap;
-+    numAps = ev->numberOfAps;
-+
-+    if (len < (int)(sizeof(*ev) + ((numAps - 1) * sizeof(WMI_NEIGHBOR_INFO)))) {
-+        return A_EINVAL;
-+    }
-+
-+    A_WMI_NEIGHBORREPORT_EVENT(wmip->wmi_devt, numAps, ev->neighbor);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_disconnect_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_DISCONNECT_EVENT *ev;
-+
-+    if (len < sizeof(WMI_DISCONNECT_EVENT)) {
-+        return A_EINVAL;
-+    }
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    ev = (WMI_DISCONNECT_EVENT *)datap;
-+
-+    A_MEMZERO(wmip->wmi_bssid, sizeof(wmip->wmi_bssid));
-+
-+    A_WMI_DISCONNECT_EVENT(wmip->wmi_devt, ev->disconnectReason, ev->bssid,
-+                            ev->assocRespLen, ev->assocInfo, ev->protocolReasonStatus);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_tkip_micerr_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_TKIP_MICERR_EVENT *ev;
-+
-+    if (len < sizeof(*ev)) {
-+        return A_EINVAL;
-+    }
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    ev = (WMI_TKIP_MICERR_EVENT *)datap;
-+    A_WMI_TKIP_MICERR_EVENT(wmip->wmi_devt, ev->keyid, ev->ismcast);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_bssInfo_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    bss_t *bss;
-+    WMI_BSS_INFO_HDR *bih;
-+    A_UINT8 *buf;
-+    A_UINT32 nodeCachingAllowed;
-+
-+    if (len <= sizeof(WMI_BSS_INFO_HDR)) {
-+        return A_EINVAL;
-+    }
-+
-+    A_WMI_BSSINFO_EVENT_RX(wmip->wmi_devt, datap, len);
-+    /* What is driver config for wlan node caching? */
-+    if(ar6000_get_driver_cfg(wmip->wmi_devt,
-+                    AR6000_DRIVER_CFG_GET_WLANNODECACHING,
-+                    &nodeCachingAllowed) != A_OK) {
-+        return A_EINVAL;
-+    }
-+
-+    if(!nodeCachingAllowed) {
-+        return A_OK;
-+    }
-+
-+
-+    bih = (WMI_BSS_INFO_HDR *)datap;
-+    buf = datap + sizeof(WMI_BSS_INFO_HDR);
-+    len -= sizeof(WMI_BSS_INFO_HDR);
-+
-+    A_DPRINTF(DBG_WMI2, (DBGFMT "bssInfo event - ch %u, rssi %02x, "
-+              "bssid \"%02x:%02x:%02x:%02x:%02x:%02x\"\n", DBGARG,
-+              bih->channel, (unsigned char) bih->rssi, bih->bssid[0],
-+              bih->bssid[1], bih->bssid[2], bih->bssid[3], bih->bssid[4],
-+              bih->bssid[5]));
-+
-+    if(wps_enable && (bih->frameType == PROBERESP_FTYPE) ) {
-+          printk("%s() A_OK 2\n", __FUNCTION__);
-+              return A_OK;
-+    }
-+
-+    bss = wlan_find_node(&wmip->wmi_scan_table, bih->bssid);
-+    if (bss != NULL) {
-+        /*
-+         * Free up the node.  Not the most efficient process given
-+         * we are about to allocate a new node but it is simple and should be
-+         * adequate.
-+         */
-+        wlan_node_reclaim(&wmip->wmi_scan_table, bss);
-+    }
-+
-+    bss = wlan_node_alloc(&wmip->wmi_scan_table, len);
-+    if (bss == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    bss->ni_snr        = bih->snr;
-+    bss->ni_rssi       = bih->rssi;
-+    A_ASSERT(bss->ni_buf != NULL);
-+    A_MEMCPY(bss->ni_buf, buf, len);
-+
-+    if (wlan_parse_beacon(bss->ni_buf, len, &bss->ni_cie) != A_OK) {
-+        wlan_node_free(bss);
-+        return A_EINVAL;
-+    }
-+
-+    /*
-+     * Update the frequency in ie_chan, overwriting of channel number
-+     * which is done in wlan_parse_beacon
-+     */
-+    bss->ni_cie.ie_chan = bih->channel;
-+    wlan_setup_node(&wmip->wmi_scan_table, bss, bih->bssid);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_opt_frame_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    bss_t *bss;
-+    WMI_OPT_RX_INFO_HDR *bih;
-+    A_UINT8 *buf;
-+
-+    if (len <= sizeof(WMI_OPT_RX_INFO_HDR)) {
-+        return A_EINVAL;
-+    }
-+
-+    bih = (WMI_OPT_RX_INFO_HDR *)datap;
-+    buf = datap + sizeof(WMI_OPT_RX_INFO_HDR);
-+    len -= sizeof(WMI_OPT_RX_INFO_HDR);
-+
-+    A_DPRINTF(DBG_WMI2, (DBGFMT "opt frame event %2.2x:%2.2x\n", DBGARG,
-+        bih->bssid[4], bih->bssid[5]));
-+
-+    bss = wlan_find_node(&wmip->wmi_scan_table, bih->bssid);
-+    if (bss != NULL) {
-+        /*
-+         * Free up the node.  Not the most efficient process given
-+         * we are about to allocate a new node but it is simple and should be
-+         * adequate.
-+         */
-+        wlan_node_reclaim(&wmip->wmi_scan_table, bss);
-+    }
-+
-+    bss = wlan_node_alloc(&wmip->wmi_scan_table, len);
-+    if (bss == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    bss->ni_snr        = bih->snr;
-+    bss->ni_cie.ie_chan = bih->channel;
-+    A_ASSERT(bss->ni_buf != NULL);
-+    A_MEMCPY(bss->ni_buf, buf, len);
-+    wlan_setup_node(&wmip->wmi_scan_table, bss, bih->bssid);
-+
-+    return A_OK;
-+}
-+
-+    /* This event indicates inactivity timeout of a fatpipe(pstream)
-+     * at the target
-+     */
-+static A_STATUS
-+wmi_pstream_timeout_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_PSTREAM_TIMEOUT_EVENT *ev;
-+
-+    if (len < sizeof(WMI_PSTREAM_TIMEOUT_EVENT)) {
-+        return A_EINVAL;
-+    }
-+
-+    A_DPRINTF(DBG_WMI, (DBGFMT "wmi_pstream_timeout_event_rx\n", DBGARG));
-+
-+    ev = (WMI_PSTREAM_TIMEOUT_EVENT *)datap;
-+
-+        /* When the pstream (fat pipe == AC) timesout, it means there were no
-+         * thinStreams within this pstream & it got implicitly created due to
-+         * data flow on this AC. We start the inactivity timer only for
-+         * implicitly created pstream. Just reset the host state.
-+         */
-+        /* Set the activeTsids for this AC to 0 */
-+    LOCK_WMI(wmip);
-+    wmip->wmi_streamExistsForAC[ev->trafficClass]=0;
-+    wmip->wmi_fatPipeExists &= ~(1 << ev->trafficClass);
-+    UNLOCK_WMI(wmip);
-+
-+        /*Indicate inactivity to driver layer for this fatpipe (pstream)*/
-+    A_WMI_STREAM_TX_INACTIVE(wmip->wmi_devt, ev->trafficClass);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_bitrate_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_BIT_RATE_CMD *reply;
-+    A_INT32 rate;
-+
-+    if (len < sizeof(WMI_BIT_RATE_CMD)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_BIT_RATE_CMD *)datap;
-+    A_DPRINTF(DBG_WMI,
-+        (DBGFMT "Enter - rateindex %d\n", DBGARG, reply->rateIndex));
-+
-+    if (reply->rateIndex == RATE_AUTO) {
-+        rate = RATE_AUTO;
-+    } else {
-+        rate = wmi_rateTable[(A_UINT32) reply->rateIndex];
-+    }
-+
-+    A_WMI_BITRATE_RX(wmip->wmi_devt, rate);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_ratemask_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_FIX_RATES_CMD *reply;
-+
-+    if (len < sizeof(WMI_BIT_RATE_CMD)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_FIX_RATES_CMD *)datap;
-+    A_DPRINTF(DBG_WMI,
-+        (DBGFMT "Enter - fixed rate mask %x\n", DBGARG, reply->fixRateMask));
-+
-+    A_WMI_RATEMASK_RX(wmip->wmi_devt, reply->fixRateMask);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_channelList_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_CHANNEL_LIST_REPLY *reply;
-+
-+    if (len < sizeof(WMI_CHANNEL_LIST_REPLY)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_CHANNEL_LIST_REPLY *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_CHANNELLIST_RX(wmip->wmi_devt, reply->numChannels,
-+                          reply->channelList);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_txPwr_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_TX_PWR_REPLY *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_TX_PWR_REPLY *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_TXPWR_RX(wmip->wmi_devt, reply->dbM);
-+
-+    return A_OK;
-+}
-+static A_STATUS
-+wmi_keepalive_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_GET_KEEPALIVE_CMD *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_GET_KEEPALIVE_CMD *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_KEEPALIVE_RX(wmip->wmi_devt, reply->configured);
-+
-+    return A_OK;
-+}
-+
-+
-+static A_STATUS
-+wmi_dset_open_req_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMIX_DSETOPENREQ_EVENT *dsetopenreq;
-+
-+    if (len < sizeof(WMIX_DSETOPENREQ_EVENT)) {
-+        return A_EINVAL;
-+    }
-+    dsetopenreq = (WMIX_DSETOPENREQ_EVENT *)datap;
-+    A_DPRINTF(DBG_WMI,
-+        (DBGFMT "Enter - dset_id=0x%x\n", DBGARG, dsetopenreq->dset_id));
-+    A_WMI_DSET_OPEN_REQ(wmip->wmi_devt,
-+                        dsetopenreq->dset_id,
-+                        dsetopenreq->targ_dset_handle,
-+                        dsetopenreq->targ_reply_fn,
-+                        dsetopenreq->targ_reply_arg);
-+
-+    return A_OK;
-+}
-+
-+#ifdef CONFIG_HOST_DSET_SUPPORT
-+static A_STATUS
-+wmi_dset_close_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMIX_DSETCLOSE_EVENT *dsetclose;
-+
-+    if (len < sizeof(WMIX_DSETCLOSE_EVENT)) {
-+        return A_EINVAL;
-+    }
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    dsetclose = (WMIX_DSETCLOSE_EVENT *)datap;
-+    A_WMI_DSET_CLOSE(wmip->wmi_devt, dsetclose->access_cookie);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_dset_data_req_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMIX_DSETDATAREQ_EVENT *dsetdatareq;
-+
-+    if (len < sizeof(WMIX_DSETDATAREQ_EVENT)) {
-+        return A_EINVAL;
-+    }
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    dsetdatareq = (WMIX_DSETDATAREQ_EVENT *)datap;
-+    A_WMI_DSET_DATA_REQ(wmip->wmi_devt,
-+                         dsetdatareq->access_cookie,
-+                         dsetdatareq->offset,
-+                         dsetdatareq->length,
-+                         dsetdatareq->targ_buf,
-+                         dsetdatareq->targ_reply_fn,
-+                         dsetdatareq->targ_reply_arg);
-+
-+    return A_OK;
-+}
-+#endif /* CONFIG_HOST_DSET_SUPPORT */
-+
-+static A_STATUS
-+wmi_scanComplete_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_SCAN_COMPLETE_EVENT *ev;
-+
-+    ev = (WMI_SCAN_COMPLETE_EVENT *)datap;
-+    A_WMI_SCANCOMPLETE_EVENT(wmip->wmi_devt, ev->status);
-+
-+    return A_OK;
-+}
-+
-+/*
-+ * Target is reporting a programming error.  This is for
-+ * developer aid only.  Target only checks a few common violations
-+ * and it is responsibility of host to do all error checking.
-+ * Behavior of target after wmi error event is undefined.
-+ * A reset is recommended.
-+ */
-+static A_STATUS
-+wmi_errorEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_CMD_ERROR_EVENT *ev;
-+
-+    ev = (WMI_CMD_ERROR_EVENT *)datap;
-+    AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("Programming Error: cmd=%d ", ev->commandId));
-+    switch (ev->errorCode) {
-+    case (INVALID_PARAM):
-+        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("Illegal Parameter\n"));
-+        break;
-+    case (ILLEGAL_STATE):
-+        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("Illegal State\n"));
-+        break;
-+    case (INTERNAL_ERROR):
-+        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("Internal Error\n"));
-+        break;
-+    }
-+
-+    return A_OK;
-+}
-+
-+
-+static A_STATUS
-+wmi_statsEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_TARGET_STATS *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_TARGET_STATS *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_TARGETSTATS_EVENT(wmip->wmi_devt, reply);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_rssiThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_RSSI_THRESHOLD_EVENT *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_RSSI_THRESHOLD_EVENT *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_RSSI_THRESHOLD_EVENT(wmip->wmi_devt, reply->range, reply->rssi);
-+
-+    return A_OK;
-+}
-+
-+
-+static A_STATUS
-+wmi_reportErrorEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_TARGET_ERROR_REPORT_EVENT *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_TARGET_ERROR_REPORT_EVENT *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_REPORT_ERROR_EVENT(wmip->wmi_devt, reply->errorVal);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_cac_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_CAC_EVENT *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_CAC_EVENT *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_CAC_EVENT(wmip->wmi_devt, reply->ac,
-+                reply->cac_indication, reply->statusCode,
-+                reply->tspecSuggestion);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_hbChallengeResp_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMIX_HB_CHALLENGE_RESP_EVENT *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMIX_HB_CHALLENGE_RESP_EVENT *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "wmi: challenge response event\n", DBGARG));
-+
-+    A_WMI_HBCHALLENGERESP_EVENT(wmip->wmi_devt, reply->cookie, reply->source);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_roam_tbl_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_TARGET_ROAM_TBL *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_TARGET_ROAM_TBL *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_ROAM_TABLE_EVENT(wmip->wmi_devt, reply);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_roam_data_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_TARGET_ROAM_DATA *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_TARGET_ROAM_DATA *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_ROAM_DATA_EVENT(wmip->wmi_devt, reply);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_txRetryErrEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_TX_RETRY_ERR_EVENT *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_TX_RETRY_ERR_EVENT *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_TX_RETRY_ERR_EVENT(wmip->wmi_devt);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_snrThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_SNR_THRESHOLD_EVENT *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_SNR_THRESHOLD_EVENT *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_SNR_THRESHOLD_EVENT_RX(wmip->wmi_devt, reply->range, reply->snr);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_lqThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_LQ_THRESHOLD_EVENT *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_LQ_THRESHOLD_EVENT *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_LQ_THRESHOLD_EVENT_RX(wmip->wmi_devt, reply->range, reply->lq);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_aplistEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    A_UINT16 ap_info_entry_size;
-+    WMI_APLIST_EVENT *ev = (WMI_APLIST_EVENT *)datap;
-+    WMI_AP_INFO_V1 *ap_info_v1;
-+    A_UINT8 i;
-+
-+    if (len < sizeof(WMI_APLIST_EVENT)) {
-+        return A_EINVAL;
-+    }
-+
-+    if (ev->apListVer == APLIST_VER1) {
-+        ap_info_entry_size = sizeof(WMI_AP_INFO_V1);
-+        ap_info_v1 = (WMI_AP_INFO_V1 *)ev->apList;
-+    } else {
-+        return A_EINVAL;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("Number of APs in APLIST Event is %d\n", ev->numAP));
-+    if (len < (int)(sizeof(WMI_APLIST_EVENT) +
-+              (ev->numAP - 1) * ap_info_entry_size))
-+    {
-+        return A_EINVAL;
-+    }
-+
-+    /*
-+     * AP List Ver1 Contents
-+     */
-+    for (i = 0; i < ev->numAP; i++) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("AP#%d BSSID %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x "\
-+                    "Channel %d\n", i,
-+                   ap_info_v1->bssid[0], ap_info_v1->bssid[1],
-+                   ap_info_v1->bssid[2], ap_info_v1->bssid[3],
-+                   ap_info_v1->bssid[4], ap_info_v1->bssid[5],
-+                   ap_info_v1->channel));
-+        ap_info_v1++;
-+    }
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_dbglog_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    A_UINT32 dropped;
-+
-+    dropped = *((A_UINT32 *)datap);
-+    datap += sizeof(dropped);
-+    len -= sizeof(dropped);
-+    A_WMI_DBGLOG_EVENT(wmip->wmi_devt, dropped, datap, len);
-+    return A_OK;
-+}
-+
-+#ifdef CONFIG_HOST_GPIO_SUPPORT
-+static A_STATUS
-+wmi_gpio_intr_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMIX_GPIO_INTR_EVENT *gpio_intr = (WMIX_GPIO_INTR_EVENT *)datap;
-+
-+    A_DPRINTF(DBG_WMI,
-+        (DBGFMT "Enter - intrmask=0x%x input=0x%x.\n", DBGARG,
-+        gpio_intr->intr_mask, gpio_intr->input_values));
-+
-+    A_WMI_GPIO_INTR_RX(gpio_intr->intr_mask, gpio_intr->input_values);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_gpio_data_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMIX_GPIO_DATA_EVENT *gpio_data = (WMIX_GPIO_DATA_EVENT *)datap;
-+
-+    A_DPRINTF(DBG_WMI,
-+        (DBGFMT "Enter - reg=%d value=0x%x\n", DBGARG,
-+        gpio_data->reg_id, gpio_data->value));
-+
-+    A_WMI_GPIO_DATA_RX(gpio_data->reg_id, gpio_data->value);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_gpio_ack_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_GPIO_ACK_RX();
-+
-+    return A_OK;
-+}
-+#endif /* CONFIG_HOST_GPIO_SUPPORT */
-+
-+/*
-+ * Called to send a wmi command. Command specific data is already built
-+ * on osbuf and current osbuf->data points to it.
-+ */
-+A_STATUS
-+wmi_cmd_send(struct wmi_t *wmip, void *osbuf, WMI_COMMAND_ID cmdId,
-+               WMI_SYNC_FLAG syncflag)
-+{
-+#define IS_LONG_CMD(cmdId) ((cmdId == WMI_OPT_TX_FRAME_CMDID) || (cmdId == WMI_ADD_WOW_PATTERN_CMDID))
-+    WMI_CMD_HDR         *cHdr;
-+    WMI_PRI_STREAM_ID   streamID = WMI_CONTROL_PRI;
-+
-+    A_ASSERT(osbuf != NULL);
-+
-+    if (syncflag >= END_WMIFLAG) {
-+        return A_EINVAL;
-+    }
-+
-+    if ((syncflag == SYNC_BEFORE_WMIFLAG) || (syncflag == SYNC_BOTH_WMIFLAG)) {
-+        /*
-+         * We want to make sure all data currently queued is transmitted before
-+         * the cmd execution.  Establish a new sync point.
-+         */
-+        wmi_sync_point(wmip);
-+    }
-+
-+    if (A_NETBUF_PUSH(osbuf, sizeof(WMI_CMD_HDR)) != A_OK) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    cHdr = (WMI_CMD_HDR *)A_NETBUF_DATA(osbuf);
-+    cHdr->commandId = cmdId;
-+
-+    /*
-+     * Send cmd, some via control pipe, others via data pipe
-+     */
-+    if (IS_LONG_CMD(cmdId)) {
-+        wmi_data_hdr_add(wmip, osbuf, CNTL_MSGTYPE);
-+        // TODO ... these can now go through the control endpoint via HTC 2.0
-+        streamID = WMI_BEST_EFFORT_PRI;
-+    }
-+    A_WMI_CONTROL_TX(wmip->wmi_devt, osbuf, streamID);
-+
-+    if ((syncflag == SYNC_AFTER_WMIFLAG) || (syncflag == SYNC_BOTH_WMIFLAG)) {
-+        /*
-+         * We want to make sure all new data queued waits for the command to
-+         * execute. Establish a new sync point.
-+         */
-+        wmi_sync_point(wmip);
-+    }
-+    return (A_OK);
-+#undef IS_LONG_CMD
-+}
-+
-+A_STATUS
-+wmi_cmd_send_xtnd(struct wmi_t *wmip, void *osbuf, WMI_COMMAND_ID cmdId,
-+                  WMI_SYNC_FLAG syncflag)
-+{
-+    WMIX_CMD_HDR     *cHdr;
-+
-+    if (A_NETBUF_PUSH(osbuf, sizeof(WMIX_CMD_HDR)) != A_OK) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    cHdr = (WMIX_CMD_HDR *)A_NETBUF_DATA(osbuf);
-+    cHdr->commandId = cmdId;
-+
-+    return wmi_cmd_send(wmip, osbuf, WMI_EXTENSION_CMDID, syncflag);
-+}
-+
-+A_STATUS
-+wmi_connect_cmd(struct wmi_t *wmip, NETWORK_TYPE netType,
-+                DOT11_AUTH_MODE dot11AuthMode, AUTH_MODE authMode,
-+                CRYPTO_TYPE pairwiseCrypto, A_UINT8 pairwiseCryptoLen,
-+                CRYPTO_TYPE groupCrypto,A_UINT8 groupCryptoLen,
-+                int ssidLength, A_UCHAR *ssid,
-+                A_UINT8 *bssid, A_UINT16 channel, A_UINT32 ctrl_flags)
-+{
-+    void *osbuf;
-+    WMI_CONNECT_CMD *cc;
-+
-+    if ((pairwiseCrypto == NONE_CRYPT) && (groupCrypto != NONE_CRYPT)) {
-+        return A_EINVAL;
-+    }
-+    if ((pairwiseCrypto != NONE_CRYPT) && (groupCrypto == NONE_CRYPT)) {
-+        return A_EINVAL;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(WMI_CONNECT_CMD));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(WMI_CONNECT_CMD));
-+
-+    cc = (WMI_CONNECT_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cc, sizeof(*cc));
-+
-+    A_MEMCPY(cc->ssid, ssid, ssidLength);
-+    cc->ssidLength          = ssidLength;
-+    cc->networkType         = netType;
-+    cc->dot11AuthMode       = dot11AuthMode;
-+    cc->authMode            = authMode;
-+    cc->pairwiseCryptoType  = pairwiseCrypto;
-+    cc->pairwiseCryptoLen   = pairwiseCryptoLen;
-+    cc->groupCryptoType     = groupCrypto;
-+    cc->groupCryptoLen      = groupCryptoLen;
-+    cc->channel             = channel;
-+    cc->ctrl_flags          = ctrl_flags;
-+
-+    if (bssid != NULL) {
-+        A_MEMCPY(cc->bssid, bssid, ATH_MAC_LEN);
-+    }
-+    if (wmi_set_keepalive_cmd(wmip, wmip->wmi_keepaliveInterval) != A_OK) {
-+        return(A_ERROR);
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_CONNECT_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_reconnect_cmd(struct wmi_t *wmip, A_UINT8 *bssid, A_UINT16 channel)
-+{
-+    void *osbuf;
-+    WMI_RECONNECT_CMD *cc;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(WMI_RECONNECT_CMD));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(WMI_RECONNECT_CMD));
-+
-+    cc = (WMI_RECONNECT_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cc, sizeof(*cc));
-+
-+    cc->channel = channel;
-+
-+    if (bssid != NULL) {
-+        A_MEMCPY(cc->bssid, bssid, ATH_MAC_LEN);
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_RECONNECT_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_disconnect_cmd(struct wmi_t *wmip)
-+{
-+    void *osbuf;
-+    A_STATUS status;
-+
-+    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    /* Bug fix for 24817(elevator bug) - the disconnect command does not
-+       need to do a SYNC before.*/
-+    status = (wmi_cmd_send(wmip, osbuf, WMI_DISCONNECT_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+
-+    return status;
-+}
-+
-+A_STATUS
-+wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType,
-+                  A_BOOL forceFgScan, A_BOOL isLegacy,
-+                  A_UINT32 homeDwellTime, A_UINT32 forceScanInterval)
-+{
-+    void *osbuf;
-+    WMI_START_SCAN_CMD *sc;
-+
-+    if ((scanType != WMI_LONG_SCAN) && (scanType != WMI_SHORT_SCAN)) {
-+        return A_EINVAL;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*sc));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*sc));
-+
-+    sc = (WMI_START_SCAN_CMD *)(A_NETBUF_DATA(osbuf));
-+    sc->scanType = scanType;
-+    sc->forceFgScan = forceFgScan;
-+    sc->isLegacy = isLegacy;
-+    sc->homeDwellTime = homeDwellTime;
-+    sc->forceScanInterval = forceScanInterval;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_START_SCAN_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_scanparams_cmd(struct wmi_t *wmip, A_UINT16 fg_start_sec,
-+                   A_UINT16 fg_end_sec, A_UINT16 bg_sec,
-+                   A_UINT16 minact_chdw_msec, A_UINT16 maxact_chdw_msec,
-+                   A_UINT16 pas_chdw_msec,
-+                   A_UINT8 shScanRatio, A_UINT8 scanCtrlFlags,
-+                   A_UINT32 max_dfsch_act_time)
-+{
-+    void *osbuf;
-+    WMI_SCAN_PARAMS_CMD *sc;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*sc));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*sc));
-+
-+    sc = (WMI_SCAN_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(sc, sizeof(*sc));
-+    sc->fg_start_period  = fg_start_sec;
-+    sc->fg_end_period    = fg_end_sec;
-+    sc->bg_period        = bg_sec;
-+    sc->minact_chdwell_time = minact_chdw_msec;
-+    sc->maxact_chdwell_time = maxact_chdw_msec;
-+    sc->pas_chdwell_time = pas_chdw_msec;
-+    sc->shortScanRatio   = shScanRatio;
-+    sc->scanCtrlFlags    = scanCtrlFlags;
-+    sc->max_dfsch_act_time = max_dfsch_act_time;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_SCAN_PARAMS_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_bssfilter_cmd(struct wmi_t *wmip, A_UINT8 filter, A_UINT32 ieMask)
-+{
-+    void *osbuf;
-+    WMI_BSS_FILTER_CMD *cmd;
-+
-+    if (filter >= LAST_BSS_FILTER) {
-+        return A_EINVAL;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_BSS_FILTER_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->bssFilter = filter;
-+    cmd->ieMask = ieMask;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_BSS_FILTER_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_probedSsid_cmd(struct wmi_t *wmip, A_UINT8 index, A_UINT8 flag,
-+                   A_UINT8 ssidLength, A_UCHAR *ssid)
-+{
-+    void *osbuf;
-+    WMI_PROBED_SSID_CMD *cmd;
-+
-+    if (index > MAX_PROBED_SSID_INDEX) {
-+        return A_EINVAL;
-+    }
-+    if (ssidLength > sizeof(cmd->ssid)) {
-+        return A_EINVAL;
-+    }
-+    if ((flag & (DISABLE_SSID_FLAG | ANY_SSID_FLAG)) && (ssidLength > 0)) {
-+        return A_EINVAL;
-+    }
-+    if ((flag & SPECIFIC_SSID_FLAG) && !ssidLength) {
-+        return A_EINVAL;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_PROBED_SSID_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->entryIndex = index;
-+    cmd->flag       = flag;
-+    cmd->ssidLength = ssidLength;
-+    A_MEMCPY(cmd->ssid, ssid, ssidLength);
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_PROBED_SSID_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_listeninterval_cmd(struct wmi_t *wmip, A_UINT16 listenInterval, A_UINT16 listenBeacons)
-+{
-+    void *osbuf;
-+    WMI_LISTEN_INT_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_LISTEN_INT_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->listenInterval = listenInterval;
-+    cmd->numBeacons = listenBeacons;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_LISTEN_INT_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_bmisstime_cmd(struct wmi_t *wmip, A_UINT16 bmissTime, A_UINT16 bmissBeacons)
-+{
-+    void *osbuf;
-+    WMI_BMISS_TIME_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_BMISS_TIME_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->bmissTime = bmissTime;
-+    cmd->numBeacons =  bmissBeacons;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_BMISS_TIME_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_associnfo_cmd(struct wmi_t *wmip, A_UINT8 ieType,
-+                     A_UINT8 ieLen, A_UINT8 *ieInfo)
-+{
-+    void *osbuf;
-+    WMI_SET_ASSOC_INFO_CMD *cmd;
-+    A_UINT16 cmdLen;
-+
-+    cmdLen = sizeof(*cmd) + ieLen - 1;
-+    osbuf = A_NETBUF_ALLOC(cmdLen);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, cmdLen);
-+
-+    cmd = (WMI_SET_ASSOC_INFO_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, cmdLen);
-+    cmd->ieType = ieType;
-+    cmd->bufferSize = ieLen;
-+    A_MEMCPY(cmd->assocInfo, ieInfo, ieLen);
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_ASSOC_INFO_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_powermode_cmd(struct wmi_t *wmip, A_UINT8 powerMode)
-+{
-+    void *osbuf;
-+    WMI_POWER_MODE_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_POWER_MODE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->powerMode = powerMode;
-+    wmip->wmi_powerMode = powerMode;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_POWER_MODE_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_ibsspmcaps_cmd(struct wmi_t *wmip, A_UINT8 pmEnable, A_UINT8 ttl,
-+                   A_UINT16 atim_windows, A_UINT16 timeout_value)
-+{
-+    void *osbuf;
-+    WMI_IBSS_PM_CAPS_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_IBSS_PM_CAPS_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->power_saving = pmEnable;
-+    cmd->ttl = ttl;
-+    cmd->atim_windows = atim_windows;
-+    cmd->timeout_value = timeout_value;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_IBSS_PM_CAPS_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_pmparams_cmd(struct wmi_t *wmip, A_UINT16 idlePeriod,
-+                 A_UINT16 psPollNum, A_UINT16 dtimPolicy)
-+{
-+    void *osbuf;
-+    WMI_POWER_PARAMS_CMD *pm;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*pm));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*pm));
-+
-+    pm = (WMI_POWER_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(pm, sizeof(*pm));
-+    pm->idle_period   = idlePeriod;
-+    pm->pspoll_number = psPollNum;
-+    pm->dtim_policy   = dtimPolicy;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_POWER_PARAMS_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_disctimeout_cmd(struct wmi_t *wmip, A_UINT8 timeout)
-+{
-+    void *osbuf;
-+    WMI_DISC_TIMEOUT_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_DISC_TIMEOUT_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->disconnectTimeout = timeout;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_DISC_TIMEOUT_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_addKey_cmd(struct wmi_t *wmip, A_UINT8 keyIndex, CRYPTO_TYPE keyType,
-+               A_UINT8 keyUsage, A_UINT8 keyLength, A_UINT8 *keyRSC,
-+               A_UINT8 *keyMaterial, A_UINT8 key_op_ctrl,
-+               WMI_SYNC_FLAG sync_flag)
-+{
-+    void *osbuf;
-+    WMI_ADD_CIPHER_KEY_CMD *cmd;
-+
-+    if ((keyIndex > WMI_MAX_KEY_INDEX) || (keyLength > WMI_MAX_KEY_LEN) ||
-+        (keyMaterial == NULL))
-+    {
-+        return A_EINVAL;
-+    }
-+
-+    if ((WEP_CRYPT != keyType) && (NULL == keyRSC)) {
-+        return A_EINVAL;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_ADD_CIPHER_KEY_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->keyIndex = keyIndex;
-+    cmd->keyType  = keyType;
-+    cmd->keyUsage = keyUsage;
-+    cmd->keyLength = keyLength;
-+    A_MEMCPY(cmd->key, keyMaterial, keyLength);
-+    if (NULL != keyRSC) {
-+        A_MEMCPY(cmd->keyRSC, keyRSC, sizeof(cmd->keyRSC));
-+    }
-+    cmd->key_op_ctrl = key_op_ctrl;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_ADD_CIPHER_KEY_CMDID, sync_flag));
-+}
-+
-+A_STATUS
-+wmi_add_krk_cmd(struct wmi_t *wmip, A_UINT8 *krk)
-+{
-+    void *osbuf;
-+    WMI_ADD_KRK_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_ADD_KRK_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    A_MEMCPY(cmd->krk, krk, WMI_KRK_LEN);
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_ADD_KRK_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_delete_krk_cmd(struct wmi_t *wmip)
-+{
-+    void *osbuf;
-+
-+    osbuf = A_NETBUF_ALLOC(0);
-+
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_DELETE_KRK_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_deleteKey_cmd(struct wmi_t *wmip, A_UINT8 keyIndex)
-+{
-+    void *osbuf;
-+    WMI_DELETE_CIPHER_KEY_CMD *cmd;
-+
-+    if (keyIndex > WMI_MAX_KEY_INDEX) {
-+        return A_EINVAL;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_DELETE_CIPHER_KEY_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->keyIndex = keyIndex;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_DELETE_CIPHER_KEY_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_setPmkid_cmd(struct wmi_t *wmip, A_UINT8 *bssid, A_UINT8 *pmkId,
-+                 A_BOOL set)
-+{
-+    void *osbuf;
-+    WMI_SET_PMKID_CMD *cmd;
-+
-+    if (bssid == NULL) {
-+        return A_EINVAL;
-+    }
-+
-+    if ((set == TRUE) && (pmkId == NULL)) {
-+        return A_EINVAL;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_PMKID_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMCPY(cmd->bssid, bssid, sizeof(cmd->bssid));
-+    if (set == TRUE) {
-+        A_MEMCPY(cmd->pmkid, pmkId, sizeof(cmd->pmkid));
-+        cmd->enable = PMKID_ENABLE;
-+    } else {
-+        A_MEMZERO(cmd->pmkid, sizeof(cmd->pmkid));
-+        cmd->enable = PMKID_DISABLE;
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_PMKID_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_tkip_countermeasures_cmd(struct wmi_t *wmip, A_BOOL en)
-+{
-+    void *osbuf;
-+    WMI_SET_TKIP_COUNTERMEASURES_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_TKIP_COUNTERMEASURES_CMD *)(A_NETBUF_DATA(osbuf));
-+    cmd->cm_en = (en == TRUE)? WMI_TKIP_CM_ENABLE : WMI_TKIP_CM_DISABLE;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_TKIP_COUNTERMEASURES_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_akmp_params_cmd(struct wmi_t *wmip,
-+                        WMI_SET_AKMP_PARAMS_CMD *akmpParams)
-+{
-+    void *osbuf;
-+    WMI_SET_AKMP_PARAMS_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+    cmd = (WMI_SET_AKMP_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-+    cmd->akmpInfo = akmpParams->akmpInfo;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_AKMP_PARAMS_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_pmkid_list_cmd(struct wmi_t *wmip,
-+                       WMI_SET_PMKID_LIST_CMD *pmkInfo)
-+{
-+    void *osbuf;
-+    WMI_SET_PMKID_LIST_CMD *cmd;
-+    A_UINT16 cmdLen;
-+    A_UINT8 i;
-+
-+    cmdLen = sizeof(pmkInfo->numPMKID) +
-+             pmkInfo->numPMKID * sizeof(WMI_PMKID);
-+
-+    osbuf = A_NETBUF_ALLOC(cmdLen);
-+
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, cmdLen);
-+    cmd = (WMI_SET_PMKID_LIST_CMD *)(A_NETBUF_DATA(osbuf));
-+    cmd->numPMKID = pmkInfo->numPMKID;
-+
-+    for (i = 0; i < cmd->numPMKID; i++) {
-+        A_MEMCPY(&cmd->pmkidList[i], &pmkInfo->pmkidList[i],
-+                 WMI_PMKID_LEN);
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_PMKID_LIST_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_get_pmkid_list_cmd(struct wmi_t *wmip)
-+{
-+    void *osbuf;
-+
-+    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_GET_PMKID_LIST_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_dataSync_send(struct wmi_t *wmip, void *osbuf, WMI_PRI_STREAM_ID streamID)
-+{
-+    WMI_DATA_HDR     *dtHdr;
-+
-+    A_ASSERT(streamID != WMI_CONTROL_PRI);
-+    A_ASSERT(osbuf != NULL);
-+
-+    if (A_NETBUF_PUSH(osbuf, sizeof(WMI_DATA_HDR)) != A_OK) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    dtHdr = (WMI_DATA_HDR *)A_NETBUF_DATA(osbuf);
-+    dtHdr->info =
-+      (SYNC_MSGTYPE & WMI_DATA_HDR_MSG_TYPE_MASK) << WMI_DATA_HDR_MSG_TYPE_SHIFT;
-+
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter - streamID %d\n", DBGARG, streamID));
-+
-+    return (A_WMI_CONTROL_TX(wmip->wmi_devt, osbuf, streamID));
-+}
-+
-+typedef struct _WMI_DATA_SYNC_BUFS {
-+    A_UINT8            trafficClass;
-+    void               *osbuf;
-+}WMI_DATA_SYNC_BUFS;
-+
-+static A_STATUS
-+wmi_sync_point(struct wmi_t *wmip)
-+{
-+      void *cmd_osbuf;
-+    WMI_DATA_SYNC_BUFS dataSyncBufs[WMM_NUM_AC];
-+      A_UINT8 i,numPriStreams=0;
-+      A_STATUS status;
-+
-+      A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    memset(dataSyncBufs,0,sizeof(dataSyncBufs));
-+
-+    /* lock out while we walk through the priority list and assemble our local array */
-+    LOCK_WMI(wmip);
-+
-+    for (i=0; i < WMM_NUM_AC ; i++) {
-+              if (wmip->wmi_fatPipeExists & (1 << i)) {
-+            numPriStreams++;
-+            dataSyncBufs[numPriStreams-1].trafficClass = i;
-+        }
-+    }
-+
-+    UNLOCK_WMI(wmip);
-+
-+    /* dataSyncBufs is now filled with entries (starting at index 0) containing valid streamIDs */
-+
-+    do {
-+          /*
-+           * We allocate all network buffers needed so we will be able to
-+           * send all required frames.
-+           */
-+          cmd_osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-+          if (cmd_osbuf == NULL) {
-+                  status = A_NO_MEMORY;
-+            break;
-+          }
-+
-+          for (i=0; i < numPriStreams ; i++) {
-+              dataSyncBufs[i].osbuf = A_NETBUF_ALLOC(0);
-+            if (dataSyncBufs[i].osbuf == NULL) {
-+                status = A_NO_MEMORY;
-+                break;
-+            }
-+          } //end for
-+
-+          /*
-+           * Send sync cmd followed by sync data messages on all endpoints being
-+           * used
-+           */
-+          status = wmi_cmd_send(wmip, cmd_osbuf, WMI_SYNCHRONIZE_CMDID,
-+                                                NO_SYNC_WMIFLAG);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+            /* cmd buffer sent, we no longer own it */
-+        cmd_osbuf = NULL;
-+
-+              for(i=0; i < numPriStreams; i++) {
-+            A_ASSERT(dataSyncBufs[i].osbuf != NULL);
-+
-+            status = wmi_dataSync_send(wmip, dataSyncBufs[i].osbuf,
-+                        WMI_ACCESSCATEGORY_WMISTREAM(wmip,dataSyncBufs[i].trafficClass));
-+
-+            if (A_FAILED(status)) {
-+                break;
-+            }
-+            /* we don't own this buffer anymore, NULL it out of the array so it
-+             * won't get cleaned up */
-+            dataSyncBufs[i].osbuf = NULL;
-+              } //end for
-+
-+    } while(FALSE);
-+
-+    /* free up any resources left over (possibly due to an error) */
-+
-+    if (cmd_osbuf != NULL) {
-+        A_NETBUF_FREE(cmd_osbuf);
-+    }
-+
-+    for (i = 0; i < numPriStreams; i++) {
-+        if (dataSyncBufs[i].osbuf != NULL) {
-+            A_NETBUF_FREE(dataSyncBufs[i].osbuf);
-+        }
-+    }
-+
-+      return (status);
-+}
-+
-+A_STATUS
-+wmi_create_pstream_cmd(struct wmi_t *wmip, WMI_CREATE_PSTREAM_CMD *params)
-+{
-+    void *osbuf;
-+    WMI_CREATE_PSTREAM_CMD *cmd;
-+      A_UINT16 activeTsids=0;
-+    A_UINT8 fatPipeExistsForAC=0;
-+
-+    /* Validate all the parameters. */
-+    if( !((params->userPriority < 8) &&
-+         (params->userPriority <= 0x7) &&
-+         (convert_userPriority_to_trafficClass(params->userPriority) == params->trafficClass)  &&
-+         (params->trafficDirection == UPLINK_TRAFFIC ||
-+            params->trafficDirection == DNLINK_TRAFFIC ||
-+            params->trafficDirection == BIDIR_TRAFFIC) &&
-+         (params->trafficType == TRAFFIC_TYPE_APERIODIC ||
-+            params->trafficType == TRAFFIC_TYPE_PERIODIC ) &&
-+         (params->voicePSCapability == DISABLE_FOR_THIS_AC  ||
-+            params->voicePSCapability == ENABLE_FOR_THIS_AC ||
-+            params->voicePSCapability == ENABLE_FOR_ALL_AC) &&
-+         (params->tsid == WMI_IMPLICIT_PSTREAM || params->tsid <= WMI_MAX_THINSTREAM)) )
-+    {
-+        return  A_EINVAL;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    A_DPRINTF(DBG_WMI,
-+        (DBGFMT "Sending create_pstream_cmd: ac=%d    tsid:%d\n", DBGARG,
-+        params->trafficClass, params->tsid));
-+
-+    cmd = (WMI_CREATE_PSTREAM_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    A_MEMCPY(cmd, params, sizeof(*cmd));
-+
-+        /* this is an implicitly created Fat pipe */
-+    if (params->tsid == WMI_IMPLICIT_PSTREAM) {
-+        LOCK_WMI(wmip);
-+        fatPipeExistsForAC = (wmip->wmi_fatPipeExists & (1 << params->trafficClass));
-+        wmip->wmi_fatPipeExists |= (1<<params->trafficClass);
-+        UNLOCK_WMI(wmip);
-+    } else {
-+            /* this is an explicitly created thin stream within a fat pipe */
-+        LOCK_WMI(wmip);
-+        fatPipeExistsForAC = (wmip->wmi_fatPipeExists & (1 << params->trafficClass));
-+        activeTsids = wmip->wmi_streamExistsForAC[params->trafficClass];
-+        wmip->wmi_streamExistsForAC[params->trafficClass] |= (1<<params->tsid);
-+            /* if a thinstream becomes active, the fat pipe automatically
-+            * becomes active
-+            */
-+        wmip->wmi_fatPipeExists |= (1<<params->trafficClass);
-+        UNLOCK_WMI(wmip);
-+    }
-+
-+        /* Indicate activty change to driver layer only if this is the
-+         * first TSID to get created in this AC explicitly or an implicit
-+         * fat pipe is getting created.
-+         */
-+    if (!fatPipeExistsForAC) {
-+        A_WMI_STREAM_TX_ACTIVE(wmip->wmi_devt, params->trafficClass);
-+    }
-+
-+    /* mike: should be SYNC_BEFORE_WMIFLAG */
-+    return (wmi_cmd_send(wmip, osbuf, WMI_CREATE_PSTREAM_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_delete_pstream_cmd(struct wmi_t *wmip, A_UINT8 trafficClass, A_UINT8 tsid)
-+{
-+    void *osbuf;
-+    WMI_DELETE_PSTREAM_CMD *cmd;
-+    A_STATUS status;
-+      A_UINT16 activeTsids=0;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_DELETE_PSTREAM_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+
-+    cmd->trafficClass = trafficClass;
-+    cmd->tsid = tsid;
-+
-+    LOCK_WMI(wmip);
-+    activeTsids = wmip->wmi_streamExistsForAC[trafficClass];
-+    UNLOCK_WMI(wmip);
-+
-+        /* Check if the tsid was created & exists */
-+    if (!(activeTsids & (1<<tsid))) {
-+
-+        A_DPRINTF(DBG_WMI,
-+        (DBGFMT "TSID %d does'nt exist for trafficClass: %d\n", DBGARG, tsid, trafficClass));
-+            /* TODO: return a more appropriate err code */
-+        return A_ERROR;
-+    }
-+
-+    A_DPRINTF(DBG_WMI,
-+        (DBGFMT "Sending delete_pstream_cmd: trafficClass: %d tsid=%d\n", DBGARG, trafficClass, tsid));
-+
-+    status = (wmi_cmd_send(wmip, osbuf, WMI_DELETE_PSTREAM_CMDID,
-+                         SYNC_BEFORE_WMIFLAG));
-+
-+    LOCK_WMI(wmip);
-+    wmip->wmi_streamExistsForAC[trafficClass] &= ~(1<<tsid);
-+    activeTsids = wmip->wmi_streamExistsForAC[trafficClass];
-+    UNLOCK_WMI(wmip);
-+
-+
-+        /* Indicate stream inactivity to driver layer only if all tsids
-+         * within this AC are deleted.
-+         */
-+    if(!activeTsids) {
-+        A_WMI_STREAM_TX_INACTIVE(wmip->wmi_devt, trafficClass);
-+        wmip->wmi_fatPipeExists &= ~(1<<trafficClass);
-+    }
-+
-+    return status;
-+}
-+
-+/*
-+ * used to set the bit rate.  rate is in Kbps.  If rate == -1
-+ * then auto selection is used.
-+ */
-+A_STATUS
-+wmi_set_bitrate_cmd(struct wmi_t *wmip, A_INT32 rate)
-+{
-+    void *osbuf;
-+    WMI_BIT_RATE_CMD *cmd;
-+    A_INT8 index;
-+
-+    if (rate != -1) {
-+        index = wmi_validate_bitrate(wmip, rate);
-+        if(index == A_EINVAL){
-+            return A_EINVAL;
-+        }
-+    } else {
-+        index = -1;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_BIT_RATE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+
-+    cmd->rateIndex = index;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_BITRATE_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_get_bitrate_cmd(struct wmi_t *wmip)
-+{
-+    void *osbuf;
-+
-+    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_GET_BITRATE_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+/*
-+ * Returns TRUE iff the given rate index is legal in the current PHY mode.
-+ */
-+A_BOOL
-+wmi_is_bitrate_index_valid(struct wmi_t *wmip, A_UINT32 rateIndex)
-+{
-+    WMI_PHY_MODE phyMode = wmip->wmi_phyMode;
-+    A_BOOL isValid = TRUE;
-+    switch(phyMode) {
-+        case WMI_11A_MODE:
-+            if ((rateIndex < MODE_A_SUPPORT_RATE_START) || (rateIndex > MODE_A_SUPPORT_RATE_STOP)) {
-+                isValid = FALSE;
-+            }
-+            break;
-+
-+        case WMI_11B_MODE:
-+            if ((rateIndex < MODE_B_SUPPORT_RATE_START) || (rateIndex > MODE_B_SUPPORT_RATE_STOP)) {
-+                isValid = FALSE;
-+            }
-+            break;
-+
-+        case WMI_11GONLY_MODE:
-+            if ((rateIndex < MODE_GONLY_SUPPORT_RATE_START) || (rateIndex > MODE_GONLY_SUPPORT_RATE_STOP)) {
-+                isValid = FALSE;
-+            }
-+            break;
-+
-+        case WMI_11G_MODE:
-+        case WMI_11AG_MODE:
-+            if ((rateIndex < MODE_G_SUPPORT_RATE_START) || (rateIndex > MODE_G_SUPPORT_RATE_STOP)) {
-+                isValid = FALSE;
-+            }
-+            break;
-+
-+        default:
-+            A_ASSERT(FALSE);
-+            break;
-+    }
-+
-+    return isValid;
-+}
-+
-+A_INT8
-+wmi_validate_bitrate(struct wmi_t *wmip, A_INT32 rate)
-+{
-+    A_INT8 i;
-+    if (rate != -1)
-+    {
-+        for (i=0;;i++)
-+        {
-+            if (wmi_rateTable[(A_UINT32) i] == 0) {
-+                return A_EINVAL;
-+            }
-+            if (wmi_rateTable[(A_UINT32) i] == rate) {
-+                break;
-+            }
-+        }
-+    }
-+    else{
-+     i = -1;
-+    }
-+
-+    if(wmi_is_bitrate_index_valid(wmip, i) != TRUE) {
-+        return A_EINVAL;
-+    }
-+
-+    return i;
-+}
-+
-+A_STATUS
-+wmi_set_fixrates_cmd(struct wmi_t *wmip, A_INT16 fixRatesMask)
-+{
-+    void *osbuf;
-+    WMI_FIX_RATES_CMD *cmd;
-+    A_UINT32 rateIndex;
-+
-+    /* Make sure all rates in the mask are valid in the current PHY mode */
-+    for(rateIndex = 0; rateIndex < MAX_NUMBER_OF_SUPPORT_RATES; rateIndex++) {
-+       if((1 << rateIndex) & (A_UINT32)fixRatesMask) {
-+            if(wmi_is_bitrate_index_valid(wmip, rateIndex) != TRUE) {
-+                A_DPRINTF(DBG_WMI, (DBGFMT "Set Fix Rates command failed: Given rate is illegal in current PHY mode\n", DBGARG));
-+                return A_EINVAL;
-+            }
-+       }
-+    }
-+
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_FIX_RATES_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+
-+    cmd->fixRateMask = fixRatesMask;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_FIXRATES_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_get_ratemask_cmd(struct wmi_t *wmip)
-+{
-+    void *osbuf;
-+
-+    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_GET_FIXRATES_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_get_channelList_cmd(struct wmi_t *wmip)
-+{
-+    void *osbuf;
-+
-+    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_GET_CHANNEL_LIST_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+/*
-+ * used to generate a wmi sey channel Parameters cmd.
-+ * mode should always be specified and corresponds to the phy mode of the
-+ * wlan.
-+ * numChan should alway sbe specified. If zero indicates that all available
-+ * channels should be used.
-+ * channelList is an array of channel frequencies (in Mhz) which the radio
-+ * should limit its operation to.  It should be NULL if numChan == 0.  Size of
-+ * array should correspond to numChan entries.
-+ */
-+A_STATUS
-+wmi_set_channelParams_cmd(struct wmi_t *wmip, A_UINT8 scanParam,
-+                          WMI_PHY_MODE mode, A_INT8 numChan,
-+                          A_UINT16 *channelList)
-+{
-+    void *osbuf;
-+    WMI_CHANNEL_PARAMS_CMD *cmd;
-+    A_INT8 size;
-+
-+    size = sizeof (*cmd);
-+
-+    if (numChan) {
-+        if (numChan > WMI_MAX_CHANNELS) {
-+            return A_EINVAL;
-+        }
-+        size += sizeof(A_UINT16) * (numChan - 1);
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_CHANNEL_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, size);
-+
-+    wmip->wmi_phyMode = mode;
-+    cmd->scanParam   = scanParam;
-+    cmd->phyMode     = mode;
-+    cmd->numChannels = numChan;
-+    A_MEMCPY(cmd->channelList, channelList, numChan * sizeof(A_UINT16));
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_CHANNEL_PARAMS_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_rssi_threshold_params(struct wmi_t *wmip,
-+                              WMI_RSSI_THRESHOLD_PARAMS_CMD *rssiCmd)
-+{
-+    void    *osbuf;
-+    A_INT8  size;
-+    WMI_RSSI_THRESHOLD_PARAMS_CMD *cmd;
-+    /* These values are in ascending order */
-+    if( rssiCmd->thresholdAbove6_Val <= rssiCmd->thresholdAbove5_Val ||
-+        rssiCmd->thresholdAbove5_Val <= rssiCmd->thresholdAbove4_Val ||
-+        rssiCmd->thresholdAbove4_Val <= rssiCmd->thresholdAbove3_Val ||
-+        rssiCmd->thresholdAbove3_Val <= rssiCmd->thresholdAbove2_Val ||
-+        rssiCmd->thresholdAbove2_Val <= rssiCmd->thresholdAbove1_Val ||
-+        rssiCmd->thresholdBelow6_Val <= rssiCmd->thresholdBelow5_Val ||
-+        rssiCmd->thresholdBelow5_Val <= rssiCmd->thresholdBelow4_Val ||
-+        rssiCmd->thresholdBelow4_Val <= rssiCmd->thresholdBelow3_Val ||
-+        rssiCmd->thresholdBelow3_Val <= rssiCmd->thresholdBelow2_Val ||
-+        rssiCmd->thresholdBelow2_Val <= rssiCmd->thresholdBelow1_Val) {
-+
-+        return A_EINVAL;
-+    }
-+
-+    size = sizeof (*cmd);
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_RSSI_THRESHOLD_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, size);
-+    A_MEMCPY(cmd, rssiCmd, sizeof(WMI_RSSI_THRESHOLD_PARAMS_CMD));
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_RSSI_THRESHOLD_PARAMS_CMDID,
-+                            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_host_sleep_mode_cmd(struct wmi_t *wmip,
-+                              WMI_SET_HOST_SLEEP_MODE_CMD *hostModeCmd)
-+{
-+    void    *osbuf;
-+    A_INT8  size;
-+    WMI_SET_HOST_SLEEP_MODE_CMD *cmd;
-+
-+    if( hostModeCmd->awake == hostModeCmd->asleep) {
-+        return A_EINVAL;
-+    }
-+
-+    size = sizeof (*cmd);
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_SET_HOST_SLEEP_MODE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, size);
-+    A_MEMCPY(cmd, hostModeCmd, sizeof(WMI_SET_HOST_SLEEP_MODE_CMD));
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_HOST_SLEEP_MODE_CMDID,
-+                            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_wow_mode_cmd(struct wmi_t *wmip,
-+                              WMI_SET_WOW_MODE_CMD *wowModeCmd)
-+{
-+    void    *osbuf;
-+    A_INT8  size;
-+    WMI_SET_WOW_MODE_CMD *cmd;
-+
-+    size = sizeof (*cmd);
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_SET_WOW_MODE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, size);
-+    A_MEMCPY(cmd, wowModeCmd, sizeof(WMI_SET_WOW_MODE_CMD));
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_WOW_MODE_CMDID,
-+                            NO_SYNC_WMIFLAG));
-+
-+}
-+
-+A_STATUS
-+wmi_get_wow_list_cmd(struct wmi_t *wmip,
-+                              WMI_GET_WOW_LIST_CMD *wowListCmd)
-+{
-+    void    *osbuf;
-+    A_INT8  size;
-+    WMI_GET_WOW_LIST_CMD *cmd;
-+
-+    size = sizeof (*cmd);
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_GET_WOW_LIST_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, size);
-+    A_MEMCPY(cmd, wowListCmd, sizeof(WMI_GET_WOW_LIST_CMD));
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_GET_WOW_LIST_CMDID,
-+                            NO_SYNC_WMIFLAG));
-+
-+}
-+
-+static A_STATUS
-+wmi_get_wow_list_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_GET_WOW_LIST_REPLY *reply;
-+
-+    if (len < sizeof(WMI_GET_WOW_LIST_REPLY)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_GET_WOW_LIST_REPLY *)datap;
-+
-+    A_WMI_WOW_LIST_EVENT(wmip->wmi_devt, reply->num_filters,
-+                          reply);
-+
-+    return A_OK;
-+}
-+
-+A_STATUS wmi_add_wow_pattern_cmd(struct wmi_t *wmip,
-+                                 WMI_ADD_WOW_PATTERN_CMD *addWowCmd,
-+                                 A_UINT8* pattern, A_UINT8* mask,
-+                                 A_UINT8 pattern_size)
-+{
-+    void    *osbuf;
-+    A_INT8  size;
-+    WMI_ADD_WOW_PATTERN_CMD *cmd;
-+    A_UINT8 *filter_mask = NULL;
-+
-+    size = sizeof (*cmd);
-+
-+    size += ((2 * addWowCmd->filter_size)* sizeof(A_UINT8));
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_ADD_WOW_PATTERN_CMD *)(A_NETBUF_DATA(osbuf));
-+    cmd->filter_list_id = addWowCmd->filter_list_id;
-+    cmd->filter_offset = addWowCmd->filter_offset;
-+    cmd->filter_size = addWowCmd->filter_size;
-+
-+    A_MEMCPY(cmd->filter, pattern, addWowCmd->filter_size);
-+
-+    filter_mask = (A_UINT8*)(cmd->filter + cmd->filter_size);
-+    A_MEMCPY(filter_mask, mask, addWowCmd->filter_size);
-+
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_ADD_WOW_PATTERN_CMDID,
-+                            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_del_wow_pattern_cmd(struct wmi_t *wmip,
-+                              WMI_DEL_WOW_PATTERN_CMD *delWowCmd)
-+{
-+    void    *osbuf;
-+    A_INT8  size;
-+    WMI_DEL_WOW_PATTERN_CMD *cmd;
-+
-+    size = sizeof (*cmd);
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_DEL_WOW_PATTERN_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, size);
-+    A_MEMCPY(cmd, delWowCmd, sizeof(WMI_DEL_WOW_PATTERN_CMD));
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_DEL_WOW_PATTERN_CMDID,
-+                            NO_SYNC_WMIFLAG));
-+
-+}
-+
-+A_STATUS
-+wmi_set_snr_threshold_params(struct wmi_t *wmip,
-+                             WMI_SNR_THRESHOLD_PARAMS_CMD *snrCmd)
-+{
-+    void    *osbuf;
-+    A_INT8  size;
-+    WMI_SNR_THRESHOLD_PARAMS_CMD *cmd;
-+    /* These values are in ascending order */
-+    if( snrCmd->thresholdAbove4_Val <= snrCmd->thresholdAbove3_Val ||
-+        snrCmd->thresholdAbove3_Val <= snrCmd->thresholdAbove2_Val ||
-+        snrCmd->thresholdAbove2_Val <= snrCmd->thresholdAbove1_Val ||
-+        snrCmd->thresholdBelow4_Val <= snrCmd->thresholdBelow3_Val ||
-+        snrCmd->thresholdBelow3_Val <= snrCmd->thresholdBelow2_Val ||
-+        snrCmd->thresholdBelow2_Val <= snrCmd->thresholdBelow1_Val) {
-+
-+        return A_EINVAL;
-+    }
-+
-+    size = sizeof (*cmd);
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_SNR_THRESHOLD_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, size);
-+    A_MEMCPY(cmd, snrCmd, sizeof(WMI_SNR_THRESHOLD_PARAMS_CMD));
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SNR_THRESHOLD_PARAMS_CMDID,
-+                            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_clr_rssi_snr(struct wmi_t *wmip)
-+{
-+    void    *osbuf;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(int));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_CLR_RSSI_SNR_CMDID,
-+                            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_lq_threshold_params(struct wmi_t *wmip,
-+                             WMI_LQ_THRESHOLD_PARAMS_CMD *lqCmd)
-+{
-+    void    *osbuf;
-+    A_INT8  size;
-+    WMI_LQ_THRESHOLD_PARAMS_CMD *cmd;
-+    /* These values are in ascending order */
-+    if( lqCmd->thresholdAbove4_Val <= lqCmd->thresholdAbove3_Val ||
-+        lqCmd->thresholdAbove3_Val <= lqCmd->thresholdAbove2_Val ||
-+        lqCmd->thresholdAbove2_Val <= lqCmd->thresholdAbove1_Val ||
-+        lqCmd->thresholdBelow4_Val <= lqCmd->thresholdBelow3_Val ||
-+        lqCmd->thresholdBelow3_Val <= lqCmd->thresholdBelow2_Val ||
-+        lqCmd->thresholdBelow2_Val <= lqCmd->thresholdBelow1_Val ) {
-+
-+        return A_EINVAL;
-+    }
-+
-+    size = sizeof (*cmd);
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_LQ_THRESHOLD_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, size);
-+    A_MEMCPY(cmd, lqCmd, sizeof(WMI_LQ_THRESHOLD_PARAMS_CMD));
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_LQ_THRESHOLD_PARAMS_CMDID,
-+                            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_error_report_bitmask(struct wmi_t *wmip, A_UINT32 mask)
-+{
-+    void    *osbuf;
-+    A_INT8  size;
-+    WMI_TARGET_ERROR_REPORT_BITMASK *cmd;
-+
-+    size = sizeof (*cmd);
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_TARGET_ERROR_REPORT_BITMASK *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, size);
-+
-+    cmd->bitmask = mask;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_TARGET_ERROR_REPORT_BITMASK_CMDID,
-+                            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_get_challenge_resp_cmd(struct wmi_t *wmip, A_UINT32 cookie, A_UINT32 source)
-+{
-+    void *osbuf;
-+    WMIX_HB_CHALLENGE_RESP_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMIX_HB_CHALLENGE_RESP_CMD *)(A_NETBUF_DATA(osbuf));
-+    cmd->cookie = cookie;
-+    cmd->source = source;
-+
-+    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_HB_CHALLENGE_RESP_CMDID,
-+                              NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_config_debug_module_cmd(struct wmi_t *wmip, A_UINT16 mmask,
-+                            A_UINT16 tsr, A_BOOL rep, A_UINT16 size,
-+                            A_UINT32 valid)
-+{
-+    void *osbuf;
-+    WMIX_DBGLOG_CFG_MODULE_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMIX_DBGLOG_CFG_MODULE_CMD *)(A_NETBUF_DATA(osbuf));
-+    cmd->config.cfgmmask = mmask;
-+    cmd->config.cfgtsr = tsr;
-+    cmd->config.cfgrep = rep;
-+    cmd->config.cfgsize = size;
-+    cmd->config.cfgvalid = valid;
-+
-+    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_DBGLOG_CFG_MODULE_CMDID,
-+                              NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_get_stats_cmd(struct wmi_t *wmip)
-+{
-+    void *osbuf;
-+
-+    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_GET_STATISTICS_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_addBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex, A_UINT8 *bssid)
-+{
-+    void *osbuf;
-+    WMI_ADD_BAD_AP_CMD *cmd;
-+
-+    if ((bssid == NULL) || (apIndex > WMI_MAX_BAD_AP_INDEX)) {
-+        return A_EINVAL;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_ADD_BAD_AP_CMD *)(A_NETBUF_DATA(osbuf));
-+    cmd->badApIndex = apIndex;
-+    A_MEMCPY(cmd->bssid, bssid, sizeof(cmd->bssid));
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_ADD_BAD_AP_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_deleteBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex)
-+{
-+    void *osbuf;
-+    WMI_DELETE_BAD_AP_CMD *cmd;
-+
-+    if (apIndex > WMI_MAX_BAD_AP_INDEX) {
-+        return A_EINVAL;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_DELETE_BAD_AP_CMD *)(A_NETBUF_DATA(osbuf));
-+    cmd->badApIndex = apIndex;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_DELETE_BAD_AP_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_txPwr_cmd(struct wmi_t *wmip, A_UINT8 dbM)
-+{
-+    void *osbuf;
-+    WMI_SET_TX_PWR_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_TX_PWR_CMD *)(A_NETBUF_DATA(osbuf));
-+    cmd->dbM = dbM;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_TX_PWR_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_get_txPwr_cmd(struct wmi_t *wmip)
-+{
-+    void *osbuf;
-+
-+    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_GET_TX_PWR_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_UINT16
-+wmi_get_mapped_qos_queue(struct wmi_t *wmip, A_UINT8 trafficClass)
-+{
-+      A_UINT16 activeTsids=0;
-+
-+    LOCK_WMI(wmip);
-+    activeTsids = wmip->wmi_streamExistsForAC[trafficClass];
-+    UNLOCK_WMI(wmip);
-+
-+    return activeTsids;
-+}
-+
-+A_STATUS
-+wmi_get_roam_tbl_cmd(struct wmi_t *wmip)
-+{
-+    void *osbuf;
-+
-+    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_GET_ROAM_TBL_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_get_roam_data_cmd(struct wmi_t *wmip, A_UINT8 roamDataType)
-+{
-+    void *osbuf;
-+    A_UINT32 size = sizeof(A_UINT8);
-+    WMI_TARGET_ROAM_DATA *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(size);      /* no payload */
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_TARGET_ROAM_DATA *)(A_NETBUF_DATA(osbuf));
-+    cmd->roamDataType = roamDataType;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_GET_ROAM_DATA_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_roam_ctrl_cmd(struct wmi_t *wmip, WMI_SET_ROAM_CTRL_CMD *p,
-+                      A_UINT8 size)
-+{
-+    void *osbuf;
-+    WMI_SET_ROAM_CTRL_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_SET_ROAM_CTRL_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, size);
-+
-+    A_MEMCPY(cmd, p, size);
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_ROAM_CTRL_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_powersave_timers_cmd(struct wmi_t *wmip,
-+                            WMI_POWERSAVE_TIMERS_POLICY_CMD *pCmd,
-+                            A_UINT8 size)
-+{
-+    void *osbuf;
-+    WMI_POWERSAVE_TIMERS_POLICY_CMD *cmd;
-+
-+    /* These timers can't be zero */
-+    if(!pCmd->psPollTimeout || !pCmd->triggerTimeout ||
-+       !(pCmd->apsdTimPolicy == IGNORE_TIM_ALL_QUEUES_APSD ||
-+         pCmd->apsdTimPolicy == PROCESS_TIM_ALL_QUEUES_APSD) ||
-+       !(pCmd->simulatedAPSDTimPolicy == IGNORE_TIM_SIMULATED_APSD ||
-+         pCmd->simulatedAPSDTimPolicy == PROCESS_TIM_SIMULATED_APSD))
-+        return A_EINVAL;
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_POWERSAVE_TIMERS_POLICY_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, size);
-+
-+    A_MEMCPY(cmd, pCmd, size);
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_POWERSAVE_TIMERS_POLICY_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+#ifdef CONFIG_HOST_GPIO_SUPPORT
-+/* Send a command to Target to change GPIO output pins. */
-+A_STATUS
-+wmi_gpio_output_set(struct wmi_t *wmip,
-+                    A_UINT32 set_mask,
-+                    A_UINT32 clear_mask,
-+                    A_UINT32 enable_mask,
-+                    A_UINT32 disable_mask)
-+{
-+    void *osbuf;
-+    WMIX_GPIO_OUTPUT_SET_CMD *output_set;
-+    int size;
-+
-+    size = sizeof(*output_set);
-+
-+    A_DPRINTF(DBG_WMI,
-+        (DBGFMT "Enter - set=0x%x clear=0x%x enb=0x%x dis=0x%x\n", DBGARG,
-+        set_mask, clear_mask, enable_mask, disable_mask));
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+    A_NETBUF_PUT(osbuf, size);
-+    output_set = (WMIX_GPIO_OUTPUT_SET_CMD *)(A_NETBUF_DATA(osbuf));
-+
-+    output_set->set_mask                   = set_mask;
-+    output_set->clear_mask                 = clear_mask;
-+    output_set->enable_mask                = enable_mask;
-+    output_set->disable_mask               = disable_mask;
-+
-+    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_GPIO_OUTPUT_SET_CMDID,
-+                             NO_SYNC_WMIFLAG));
-+}
-+
-+/* Send a command to the Target requesting state of the GPIO input pins */
-+A_STATUS
-+wmi_gpio_input_get(struct wmi_t *wmip)
-+{
-+    void *osbuf;
-+
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    osbuf = A_NETBUF_ALLOC(0);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_GPIO_INPUT_GET_CMDID,
-+                             NO_SYNC_WMIFLAG));
-+}
-+
-+/* Send a command to the Target that changes the value of a GPIO register. */
-+A_STATUS
-+wmi_gpio_register_set(struct wmi_t *wmip,
-+                      A_UINT32 gpioreg_id,
-+                      A_UINT32 value)
-+{
-+    void *osbuf;
-+    WMIX_GPIO_REGISTER_SET_CMD *register_set;
-+    int size;
-+
-+    size = sizeof(*register_set);
-+
-+    A_DPRINTF(DBG_WMI,
-+        (DBGFMT "Enter - reg=%d value=0x%x\n", DBGARG, gpioreg_id, value));
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+    A_NETBUF_PUT(osbuf, size);
-+    register_set = (WMIX_GPIO_REGISTER_SET_CMD *)(A_NETBUF_DATA(osbuf));
-+
-+    register_set->gpioreg_id               = gpioreg_id;
-+    register_set->value                    = value;
-+
-+    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_GPIO_REGISTER_SET_CMDID,
-+                             NO_SYNC_WMIFLAG));
-+}
-+
-+/* Send a command to the Target to fetch the value of a GPIO register. */
-+A_STATUS
-+wmi_gpio_register_get(struct wmi_t *wmip,
-+                      A_UINT32 gpioreg_id)
-+{
-+    void *osbuf;
-+    WMIX_GPIO_REGISTER_GET_CMD *register_get;
-+    int size;
-+
-+    size = sizeof(*register_get);
-+
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter - reg=%d\n", DBGARG, gpioreg_id));
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+    A_NETBUF_PUT(osbuf, size);
-+    register_get = (WMIX_GPIO_REGISTER_GET_CMD *)(A_NETBUF_DATA(osbuf));
-+
-+    register_get->gpioreg_id               = gpioreg_id;
-+
-+    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_GPIO_REGISTER_GET_CMDID,
-+                             NO_SYNC_WMIFLAG));
-+}
-+
-+/* Send a command to the Target acknowledging some GPIO interrupts. */
-+A_STATUS
-+wmi_gpio_intr_ack(struct wmi_t *wmip,
-+                  A_UINT32 ack_mask)
-+{
-+    void *osbuf;
-+    WMIX_GPIO_INTR_ACK_CMD *intr_ack;
-+    int size;
-+
-+    size = sizeof(*intr_ack);
-+
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter ack_mask=0x%x\n", DBGARG, ack_mask));
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+    A_NETBUF_PUT(osbuf, size);
-+    intr_ack = (WMIX_GPIO_INTR_ACK_CMD *)(A_NETBUF_DATA(osbuf));
-+
-+    intr_ack->ack_mask               = ack_mask;
-+
-+    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_GPIO_INTR_ACK_CMDID,
-+                             NO_SYNC_WMIFLAG));
-+}
-+#endif /* CONFIG_HOST_GPIO_SUPPORT */
-+
-+A_STATUS
-+wmi_set_access_params_cmd(struct wmi_t *wmip, A_UINT16 txop, A_UINT8 eCWmin,
-+                          A_UINT8 eCWmax, A_UINT8 aifsn)
-+{
-+    void *osbuf;
-+    WMI_SET_ACCESS_PARAMS_CMD *cmd;
-+
-+    if ((eCWmin > WMI_MAX_CW_ACPARAM) || (eCWmax > WMI_MAX_CW_ACPARAM) ||
-+        (aifsn > WMI_MAX_AIFSN_ACPARAM))
-+    {
-+        return A_EINVAL;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_ACCESS_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-+    cmd->txop   = txop;
-+    cmd->eCWmin = eCWmin;
-+    cmd->eCWmax = eCWmax;
-+    cmd->aifsn  = aifsn;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_ACCESS_PARAMS_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_retry_limits_cmd(struct wmi_t *wmip, A_UINT8 frameType,
-+                         A_UINT8 trafficClass, A_UINT8 maxRetries,
-+                         A_UINT8 enableNotify)
-+{
-+    void *osbuf;
-+    WMI_SET_RETRY_LIMITS_CMD *cmd;
-+
-+    if ((frameType != MGMT_FRAMETYPE) && (frameType != CONTROL_FRAMETYPE) &&
-+        (frameType != DATA_FRAMETYPE))
-+    {
-+        return A_EINVAL;
-+    }
-+
-+    if (maxRetries > WMI_MAX_RETRIES) {
-+        return A_EINVAL;
-+    }
-+
-+    if (frameType != DATA_FRAMETYPE) {
-+        trafficClass = 0;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_RETRY_LIMITS_CMD *)(A_NETBUF_DATA(osbuf));
-+    cmd->frameType    = frameType;
-+    cmd->trafficClass = trafficClass;
-+    cmd->maxRetries   = maxRetries;
-+    cmd->enableNotify = enableNotify;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_RETRY_LIMITS_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+void
-+wmi_get_current_bssid(struct wmi_t *wmip, A_UINT8 *bssid)
-+{
-+    if (bssid != NULL) {
-+        A_MEMCPY(bssid, wmip->wmi_bssid, ATH_MAC_LEN);
-+    }
-+}
-+
-+A_STATUS
-+wmi_set_opt_mode_cmd(struct wmi_t *wmip, A_UINT8 optMode)
-+{
-+    void *osbuf;
-+    WMI_SET_OPT_MODE_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_OPT_MODE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->optMode = optMode;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_OPT_MODE_CMDID,
-+                         SYNC_BOTH_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_opt_tx_frame_cmd(struct wmi_t *wmip,
-+                      A_UINT8 frmType,
-+                      A_UINT8 *dstMacAddr,
-+                      A_UINT8 *bssid,
-+                      A_UINT16 optIEDataLen,
-+                      A_UINT8 *optIEData)
-+{
-+    void *osbuf;
-+    WMI_OPT_TX_FRAME_CMD *cmd;
-+    osbuf = A_NETBUF_ALLOC(optIEDataLen + sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, (optIEDataLen + sizeof(*cmd)));
-+
-+    cmd = (WMI_OPT_TX_FRAME_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, (optIEDataLen + sizeof(*cmd)-1));
-+
-+    cmd->frmType    = frmType;
-+    cmd->optIEDataLen   = optIEDataLen;
-+    //cmd->optIEData     = (A_UINT8 *)((int)cmd + sizeof(*cmd));
-+    A_MEMCPY(cmd->bssid, bssid, sizeof(cmd->bssid));
-+    A_MEMCPY(cmd->dstAddr, dstMacAddr, sizeof(cmd->dstAddr));
-+    A_MEMCPY(&cmd->optIEData[0], optIEData, optIEDataLen);
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_OPT_TX_FRAME_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_adhoc_bconIntvl_cmd(struct wmi_t *wmip, A_UINT16 intvl)
-+{
-+    void *osbuf;
-+    WMI_BEACON_INT_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_BEACON_INT_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->beaconInterval = intvl;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_BEACON_INT_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+
-+A_STATUS
-+wmi_set_voice_pkt_size_cmd(struct wmi_t *wmip, A_UINT16 voicePktSize)
-+{
-+    void *osbuf;
-+    WMI_SET_VOICE_PKT_SIZE_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_VOICE_PKT_SIZE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->voicePktSize = voicePktSize;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_VOICE_PKT_SIZE_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+
-+A_STATUS
-+wmi_set_max_sp_len_cmd(struct wmi_t *wmip, A_UINT8 maxSPLen)
-+{
-+    void *osbuf;
-+    WMI_SET_MAX_SP_LEN_CMD *cmd;
-+
-+    /* maxSPLen is a two-bit value. If user trys to set anything
-+     * other than this, then its invalid
-+     */
-+    if(maxSPLen & ~0x03)
-+        return  A_EINVAL;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_MAX_SP_LEN_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->maxSPLen = maxSPLen;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_MAX_SP_LEN_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+A_UINT8
-+convert_userPriority_to_trafficClass(A_UINT8 userPriority)
-+{
-+        return  (up_to_ac[userPriority & 0x7]);
-+}
-+
-+A_UINT8
-+wmi_get_power_mode_cmd(struct wmi_t *wmip)
-+{
-+    return wmip->wmi_powerMode;
-+}
-+
-+A_STATUS
-+wmi_verify_tspec_params(WMI_CREATE_PSTREAM_CMD *pCmd, A_BOOL tspecCompliance)
-+{
-+    return A_OK;
-+}
-+
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+static A_STATUS
-+wmi_tcmd_test_report_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+
-+   A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+   A_WMI_TCMD_RX_REPORT_EVENT(wmip->wmi_devt, datap, len);
-+
-+   return A_OK;
-+}
-+
-+#endif /* CONFIG_HOST_TCMD_SUPPORT*/
-+
-+A_STATUS
-+wmi_set_authmode_cmd(struct wmi_t *wmip, A_UINT8 mode)
-+{
-+    void *osbuf;
-+    WMI_SET_AUTH_MODE_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_AUTH_MODE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->mode = mode;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_AUTH_MODE_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_reassocmode_cmd(struct wmi_t *wmip, A_UINT8 mode)
-+{
-+    void *osbuf;
-+    WMI_SET_REASSOC_MODE_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_REASSOC_MODE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->mode = mode;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_REASSOC_MODE_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_lpreamble_cmd(struct wmi_t *wmip, A_UINT8 status)
-+{
-+    void *osbuf;
-+    WMI_SET_LPREAMBLE_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_LPREAMBLE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->status = status;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_LPREAMBLE_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_rts_cmd(struct wmi_t *wmip, A_UINT16 threshold)
-+{
-+    void *osbuf;
-+    WMI_SET_RTS_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_RTS_CMD*)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->threshold = threshold;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_RTS_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_wmm_cmd(struct wmi_t *wmip, WMI_WMM_STATUS status)
-+{
-+    void *osbuf;
-+    WMI_SET_WMM_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_WMM_CMD*)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->status = status;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_WMM_CMDID,
-+            NO_SYNC_WMIFLAG));
-+
-+}
-+
-+A_STATUS
-+wmi_set_wmm_txop(struct wmi_t *wmip, WMI_TXOP_CFG cfg)
-+{
-+    void *osbuf;
-+    WMI_SET_WMM_TXOP_CMD *cmd;
-+
-+    if( !((cfg == WMI_TXOP_DISABLED) || (cfg == WMI_TXOP_ENABLED)) )
-+        return A_EINVAL;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_WMM_TXOP_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->txopEnable = cfg;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_WMM_TXOP_CMDID,
-+            NO_SYNC_WMIFLAG));
-+
-+}
-+
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+/* WMI  layer doesn't need to know the data type of the test cmd.
-+   This would be beneficial for customers like Qualcomm, who might
-+   have different test command requirements from differnt manufacturers
-+ */
-+A_STATUS
-+wmi_test_cmd(struct wmi_t *wmip, A_UINT8 *buf, A_UINT32  len)
-+{
-+    void *osbuf;
-+    char *data;
-+
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    osbuf= A_NETBUF_ALLOC(len);
-+    if(osbuf == NULL)
-+    {
-+        return A_NO_MEMORY;
-+    }
-+    A_NETBUF_PUT(osbuf, len);
-+    data = A_NETBUF_DATA(osbuf);
-+    A_MEMCPY(data, buf, len);
-+
-+    return(wmi_cmd_send(wmip, osbuf, WMI_TEST_CMDID,
-+         NO_SYNC_WMIFLAG));
-+}
-+
-+#endif
-+
-+A_STATUS
-+wmi_set_bt_status_cmd(struct wmi_t *wmip, A_UINT8 streamType, A_UINT8 status)
-+{
-+    void *osbuf;
-+    WMI_SET_BT_STATUS_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_BT_STATUS_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->streamType = streamType;
-+    cmd->status = status;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_BT_STATUS_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_bt_params_cmd(struct wmi_t *wmip, WMI_SET_BT_PARAMS_CMD* cmd)
-+{
-+    void *osbuf;
-+    WMI_SET_BT_PARAMS_CMD* alloc_cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    alloc_cmd = (WMI_SET_BT_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(alloc_cmd, sizeof(*cmd));
-+    A_MEMCPY(alloc_cmd, cmd, sizeof(*cmd));
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_BT_PARAMS_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_get_keepalive_configured(struct wmi_t *wmip)
-+{
-+    void *osbuf;
-+    WMI_GET_KEEPALIVE_CMD *cmd;
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+    cmd = (WMI_GET_KEEPALIVE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    return (wmi_cmd_send(wmip, osbuf, WMI_GET_KEEPALIVE_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_UINT8
-+wmi_get_keepalive_cmd(struct wmi_t *wmip)
-+{
-+    return wmip->wmi_keepaliveInterval;
-+}
-+
-+A_STATUS
-+wmi_set_keepalive_cmd(struct wmi_t *wmip, A_UINT8 keepaliveInterval)
-+{
-+    void *osbuf;
-+    WMI_SET_KEEPALIVE_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_KEEPALIVE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->keepaliveInterval = keepaliveInterval;
-+    wmip->wmi_keepaliveInterval = keepaliveInterval;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_KEEPALIVE_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_appie_cmd(struct wmi_t *wmip, A_UINT8 mgmtFrmType, A_UINT8 ieLen,
-+                  A_UINT8 *ieInfo)
-+{
-+    void *osbuf;
-+    WMI_SET_APPIE_CMD *cmd;
-+    A_UINT16 cmdLen;
-+
-+    if (ieLen > WMI_MAX_IE_LEN) {
-+        return A_ERROR;
-+    }
-+    cmdLen = sizeof(*cmd) + ieLen - 1;
-+    osbuf = A_NETBUF_ALLOC(cmdLen);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, cmdLen);
-+
-+    cmd = (WMI_SET_APPIE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, cmdLen);
-+
-+    cmd->mgmtFrmType = mgmtFrmType;
-+    cmd->ieLen = ieLen;
-+    A_MEMCPY(cmd->ieInfo, ieInfo, ieLen);
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_APPIE_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_halparam_cmd(struct wmi_t *wmip, A_UINT8 *cmd, A_UINT16 dataLen)
-+{
-+    void *osbuf;
-+    A_UINT8 *data;
-+
-+    osbuf = A_NETBUF_ALLOC(dataLen);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, dataLen);
-+
-+    data = A_NETBUF_DATA(osbuf);
-+
-+    A_MEMCPY(data, cmd, dataLen);
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_WHALPARAM_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_INT32
-+wmi_get_rate(A_INT8 rateindex)
-+{
-+    if (rateindex == RATE_AUTO) {
-+        return 0;
-+    } else {
-+        return(wmi_rateTable[(A_UINT32) rateindex]);
-+    }
-+}
-+
-+void
-+wmi_node_return (struct wmi_t *wmip, bss_t *bss)
-+{
-+      if (NULL != bss)
-+      {
-+              wlan_node_return (&wmip->wmi_scan_table, bss);
-+      }
-+}
-+
-+bss_t *
-+wmi_find_Ssidnode (struct wmi_t *wmip, A_UCHAR *pSsid,
-+                                 A_UINT32 ssidLength, A_BOOL bIsWPA2)
-+{
-+      bss_t *node = NULL;
-+    node = wlan_find_Ssidnode (&wmip->wmi_scan_table, pSsid,
-+                                                         ssidLength, bIsWPA2);
-+      return node;
-+}
-+
-+void
-+wmi_free_allnodes(struct wmi_t *wmip)
-+{
-+      wlan_free_allnodes(&wmip->wmi_scan_table);
-+}
-+
-+bss_t *
-+wmi_find_node(struct wmi_t *wmip, const A_UINT8 *macaddr)
-+{
-+      bss_t *ni=NULL;
-+      ni=wlan_find_node(&wmip->wmi_scan_table,macaddr);
-+      return ni;
-+}
-+
-+A_STATUS
-+wmi_dset_open_reply(struct wmi_t *wmip,
-+                    A_UINT32 status,
-+                    A_UINT32 access_cookie,
-+                    A_UINT32 dset_size,
-+                    A_UINT32 dset_version,
-+                    A_UINT32 targ_handle,
-+                    A_UINT32 targ_reply_fn,
-+                    A_UINT32 targ_reply_arg)
-+{
-+    void *osbuf;
-+    WMIX_DSETOPEN_REPLY_CMD *open_reply;
-+
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter - wmip=0x%x\n", DBGARG, (int)wmip));
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*open_reply));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*open_reply));
-+    open_reply = (WMIX_DSETOPEN_REPLY_CMD *)(A_NETBUF_DATA(osbuf));
-+
-+    open_reply->status                   = status;
-+    open_reply->targ_dset_handle         = targ_handle;
-+    open_reply->targ_reply_fn            = targ_reply_fn;
-+    open_reply->targ_reply_arg           = targ_reply_arg;
-+    open_reply->access_cookie            = access_cookie;
-+    open_reply->size                     = dset_size;
-+    open_reply->version                  = dset_version;
-+
-+    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_DSETOPEN_REPLY_CMDID,
-+                             NO_SYNC_WMIFLAG));
-+}
-+
-+static A_STATUS
-+wmi_get_pmkid_list_event_rx(struct wmi_t *wmip, A_UINT8 *datap, A_UINT32 len)
-+{
-+    WMI_PMKID_LIST_REPLY *reply;
-+    A_UINT32 expected_len;
-+
-+    if (len < sizeof(WMI_PMKID_LIST_REPLY)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_PMKID_LIST_REPLY *)datap;
-+    expected_len = sizeof(reply->numPMKID) + reply->numPMKID * WMI_PMKID_LEN;
-+
-+    if (len < expected_len) {
-+        return A_EINVAL;
-+    }
-+
-+    A_WMI_PMKID_LIST_EVENT(wmip->wmi_devt, reply->numPMKID,
-+                           reply->pmkidList);
-+
-+    return A_OK;
-+}
-+
-+#ifdef CONFIG_HOST_DSET_SUPPORT
-+A_STATUS
-+wmi_dset_data_reply(struct wmi_t *wmip,
-+                    A_UINT32 status,
-+                    A_UINT8 *user_buf,
-+                    A_UINT32 length,
-+                    A_UINT32 targ_buf,
-+                    A_UINT32 targ_reply_fn,
-+                    A_UINT32 targ_reply_arg)
-+{
-+    void *osbuf;
-+    WMIX_DSETDATA_REPLY_CMD *data_reply;
-+    int size;
-+
-+    size = sizeof(*data_reply) + length;
-+
-+    A_DPRINTF(DBG_WMI,
-+        (DBGFMT "Enter - length=%d status=%d\n", DBGARG, length, status));
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+    A_NETBUF_PUT(osbuf, size);
-+    data_reply = (WMIX_DSETDATA_REPLY_CMD *)(A_NETBUF_DATA(osbuf));
-+
-+    data_reply->status                     = status;
-+    data_reply->targ_buf                   = targ_buf;
-+    data_reply->targ_reply_fn              = targ_reply_fn;
-+    data_reply->targ_reply_arg             = targ_reply_arg;
-+    data_reply->length                     = length;
-+
-+    if (status == A_OK) {
-+        if (a_copy_from_user(data_reply->buf, user_buf, length)) {
-+            return A_ERROR;
-+        }
-+    }
-+
-+    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_DSETDATA_REPLY_CMDID,
-+                             NO_SYNC_WMIFLAG));
-+}
-+#endif /* CONFIG_HOST_DSET_SUPPORT */
-+
-+A_STATUS
-+wmi_set_wsc_status_cmd(struct wmi_t *wmip, A_UINT32 status)
-+{
-+    void *osbuf;
-+    char *cmd;
-+
-+      wps_enable = status;
-+
-+    osbuf = a_netbuf_alloc(sizeof(1));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    a_netbuf_put(osbuf, sizeof(1));
-+
-+    cmd = (char *)(a_netbuf_to_data(osbuf));
-+
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd[0] = (status?1:0);
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_WSC_STATUS_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h b/drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h
-new file mode 100644
-index 0000000..19cd938
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h
-@@ -0,0 +1,4421 @@
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+
-+#if 0
-+Wireless Module Interface (WMI) Documentaion
-+
-+   This section describes the format and the usage model for WMI control and
-+   data messages between the host and the AR6000-based targets. The header
-+   file include/wmi.h contains all command and event manifest constants as
-+   well as structure typedefs for each set of command and reply parameters.
-+
-+Data Frames
-+
-+   The data payload transmitted and received by the target follows RFC-1042
-+   encapsulation and thus starts with an 802.2-style LLC-SNAP header. The
-+   WLAN module completes 802.11 encapsulation of the payload, including the
-+   MAC header, FCS, and WLAN security related fields. At the interface to the
-+   message transport (HTC), a data frame is encapsulated in a WMI message.
-+
-+WMI Message Structure
-+
-+   The WMI protocol leverages an 802.3-style Ethernet header in communicating
-+   the source and destination information between the host and the AR6000
-+   modules using a 14-byte 802.3 header ahead of the 802.2-style payload. In
-+   addition, the WMI protocol adds a header to all data messages:
-+
-+    {
-+    INT8    rssi
-+                  The RSSI of the received packet and its units are shown in db above the
-+                      noise floor, and the noise floor is shown in dbm.
-+    UINT8   info
-+                      Contains information on message type and user priority. Message type
-+                      differentiates between a data packet and a synchronization message.
-+    } WMI_DATA_HDR
-+
-+   User priority contains the 802.1d user priority info from host to target. Host
-+   software translates the host Ethernet format to 802.3 format prior to Tx and
-+   802.3 format to host format in the Rx direction. The host does not transmit the
-+   FCS that follows the data. MsgType differentiates between a regular data
-+   packet (msgType=0) and a synchronization message (msgType=1).
-+
-+Data Endpoints
-+
-+   The AR6000 chipset provides several data endpoints to support quality of
-+   service (QoS) and maintains separate queues and separate DMA engines for
-+   each data endpoint. A data endpoint can be bi-directional.
-+
-+   Best effort (BE) class traffic uses the default data endpoint (2). The host can
-+   establish up to two additional data endpoints for other traffic classes. Once
-+   such a data endpoint is established, it sends and receives corresponding QoS
-+   traffic in a manner similar to the default data endpoint.
-+
-+   If QoS is desired over the interconnect, host software must classify each data
-+   packet and place it on the appropriate data endpoint. The information
-+   required to classify data is generally available in-band as an 802.1p/q style
-+   tag or as the ToS field in the IP header. The information may also be available
-+   out-of-band depending on the host DDI.
-+
-+Connection States
-+
-+   Table B-1 describes the AR6000 WLAN connection states:
-+
-+   Table B-1.  AR6000 Connection States
-+
-+Connection State
-+    Description
-+
-+   DISCONNECTED
-+    In this state, the AR6000 device is not connected to a wireless
-+   network. The device is in this state after reset when it sends the
-+   WIRELESS MODULE \93READY\94 EVENT, after it processes a
-+   DISCONNECT command, and when it loses its link with the
-+   access point (AP) that it was connected to. The device signals a
-+   transition to the DISCONNECTED state with a \93DISCONNECT\94
-+   event.
-+
-+CONNECTED
-+    In this state, the AR6000 device is connected to wireless networks.
-+   The device enters this state after successfully processing a
-+   CONNECT, which establishes a connection with a wireless
-+   network. The device signals a transition to the CONNECTED state
-+   with a \93CONNECT\94 event.
-+
-+
-+Message Types
-+
-+   WMI uses commands, replies, and events for the control and configuration of
-+   the AR6000 device. The control protocol is asynchronous. Table B-2 describes
-+   AR6000 message types:
-+
-+Table B-2.  AR6000 Message Types
-+
-+Message Type
-+    Description
-+
-+Commands
-+    Control messages that flow from the host to the device
-+
-+Replies/Events
-+    Control messages that flow from the device to the host.
-+
-+   The device issues a reply to some WMI commands, but not to others.
-+   The payload in a reply is command-specific, and some commands do
-+   not trigger a reply message at all. Events are control messages issued
-+   by the device to signal the occurrence of an asynchronous event.
-+
-+
-+WMI Message Format
-+
-+   All WMI control commands, replies and events use the header format:
-+
-+   WMI_CMD_HDR Header Format
-+   {
-+        UINT16 id
-+                 This 16-bit constant identifies which WMI command the host is issuing,
-+                 which command the target is replying to, or which event has occurred.
-+        WMI_CMD_HDR
-+   }
-+
-+
-+   A variable-size command-, reply-, or event-specific payload follows the
-+   header. Over the interconnect, all fields in control messages (including
-+   WMI_CMD_HDR and the command specific payload) use 32-bit little Endian
-+   byte ordering and fields are packed. The AR6000 device always executes
-+   commands in order, and the host may send multiple commands without
-+   waiting for previous commands to complete. A majority of commands are
-+   processed to completion once received. Other commands trigger a longer
-+   duration activity whose completion is signaled to the host through an event.
-+
-+Command Restrictions
-+
-+   Some commands may only be issued when the AR6000 device is in a certain
-+   state. The host is required to wait for an event signaling a state transition
-+   before such a command can be issued. For example, if a command requires
-+   the device to be in the CONNECTED state, then the host is required to wait
-+   for a \93CONNECT\94 event before it issues that command.
-+
-+   The device ignores any commands inappropriate for its current state. If the
-+   command triggers a reply, the device generates an error reply. Otherwise, the
-+   device silently ignores the inappropriate command.
-+
-+Command and Data Synchronization
-+
-+   WMI provides a mechanism for a host to advise the device of necessary
-+   synchronization between commands and data. The device implements
-+   synchronization; no implicit synchronization exists between endpoints.
-+
-+   The host controls synchronization using the \93SYNCHRONIZE\94 command
-+   over the control channel and synchronization messages over data channels.
-+   The device stops each data channel upon receiving a synchronization message
-+   on that channel, processing all data packets received prior to that message.
-+   After the device receives synchronization messages for each data endpoint
-+   and the \93SYNCHRONIZE\94 command, it resumes all channels.
-+
-+   When the host must guarantee a command executes before processing new
-+   data packets, it first issues the command, then issues the \93SYNCHRONIZE\94
-+   command and sends synchronization messages on data channels. When the
-+   host must guarantee the device has processed all old data packets before a
-+   processing a new command, it issues a \93SYNCHRONIZE\94 command and
-+   synchronization messages on all data channels, then issues the desired
-+   command.
-+
-+
-+
-+WMI Commands
-+
-+   ADD_BAD_AP
-+    Cause the AR6000 device to avoid a particular AP
-+   ADD_CIPHER_KEY
-+    Add or replace any of the four AR6000 encryption keys
-+   ADD_WOW_PATTERN
-+    Used to add a pattern to the WoW pattern list
-+   CLR_RSSI_SNR
-+    Clear the current calculated RSSI and SNR value
-+   CONNECT_CMD
-+    Request that the AR6000 device establish a wireless connection
-+        with the specified SSID
-+   CREATE_PSTREAM
-+    Create prioritized data endpoint between the host and device
-+   DELETE_BAD_AP
-+    Clear an entry in the bad AP table
-+   DELETE_CIPHER_KEY
-+    Delete a previously added cipher key
-+   DELETE_PSTREAM
-+    Delete a prioritized data endpoint
-+   DELETE_WOW_PATTERN
-+    Remove a pre-specified pattern from the WoW pattern list
-+   EXTENSION
-+    WMI message interface command
-+   GET_BIT_RATE
-+    Retrieve rate most recently used by the AR6000
-+   GET_CHANNEL_LIST
-+    Retrieve list of channels used by the AR6000
-+   GET_FIXRATES
-+    Retrieves the rate-mask set via the SET_FIXRATES command.
-+   GET_PMKID_LIST_CMD
-+    Retrieve the firmware list of PMKIDs
-+   GET_ROAM_DATA
-+    Internal use for data collection; available in special build only
-+   GET_ROAM_TBL
-+    Retrieve the roaming table maintained on the target
-+   GET_TARGET_STATS
-+    Request that the target send the statistics it maintains
-+   GET_TX_PWR
-+    Retrieve the current AR6000 device Tx power levels
-+   GET_WOW_LIST
-+    Retrieve the current list of WoW patterns
-+   LQ_THRESHOLD_PARAMS
-+    Set the link quality thresholds
-+   OPT_TX_FRAME
-+    Send a special frame (special feature)
-+   RECONNECT
-+    Request a reconnection to a BSS
-+   RSSI_THRESHOLD_PARAMS
-+    Configure how the AR6000 device monitors and reports signal
-+       strength (RSSI) of the connected BSS
-+   SCAN_PARAMS
-+    Determine dwell time and changes scanned channels
-+   SET_ACCESS_PARAMS
-+    Set access parameters for the wireless network
-+   SET_ADHOC_BSSID
-+    Set the BSSID for an ad hoc network
-+   SET_AKMP_PARAMS
-+    Set multiPMKID mode
-+   SET_APPIE
-+    Add application-specified IE to a management frame
-+   SET_ASSOC_INFO
-+    Specify the IEs the device should add to association or
-+        reassociation requests
-+   SET_AUTH_MODE
-+    Set 802.11 authentication mode of reconnection
-+   SET_BEACON_INT
-+    Set the beacon interval for an ad hoc network
-+   SET_BIT_RATE
-+    Set the AR6000 to a specific fixed bit rate
-+   SET_BMISS_TIME
-+    Set the beacon miss time
-+   SET_BSS_FILTER
-+    Inform the AR6000 of network types about which it wants to
-+        receive information using a \93BSSINFO\94 event
-+   SET_BT_PARAMS
-+    Set the status of a Bluetooth stream (SCO or A2DP) or set
-+        Bluetooth coexistence register parameters
-+   SET_BT_STATUS
-+    Set the status of a Bluetooth stream (SCO or A2DP)
-+   SET_CHANNEL_PARAMETERS
-+    Configure WLAN channel parameters
-+   SET_DISC_TIMEOUT
-+    Set the amount of time the AR6000 spends attempting to
-+        reestablish a connection
-+   SET_FIXRATES
-+    Set the device to a specific fixed PHY rate (supported subset)
-+   SET_HALPARAM
-+    Internal AR6000 command to set certain hardware parameters
-+   SET_HOST_SLEEP_MODE
-+    Set the host mode to asleep or awake
-+   SET_IBSS_PM_CAPS
-+    Support a non-standard power management scheme for an
-+        ad hoc network
-+   SET_LISTEN_INT
-+    Request a listen interval
-+   SET_LPREAMBLE
-+    Override the short preamble capability of the AR6000 device
-+   SET_MAX_SP_LEN
-+    Set the maximum service period
-+   SET_OPT_MODE
-+    Set the special mode on/off (special feature)
-+   SET_PMKID
-+    Set the pairwise master key ID (PMKID)
-+   SET_PMKID_LIST_CMD
-+    Configure the firmware list of PMKIDs
-+   SET_POWER_MODE
-+    Set guidelines on trade-off between power utilization
-+   SET_POWER_PARAMS
-+    Configure power parameters
-+   SET_POWERSAVE_PARAMS
-+    Set the two AR6000 power save timers
-+   SET_PROBED_SSID
-+    Provide list of SSIDs the device should seek
-+   SET_REASSOC_MODE
-+    Specify whether the disassociated frame should be sent upon
-+        reassociation
-+   SET_RETRY_LIMITS
-+    Limit how many times the device tries to send a frame
-+   SET_ROAM_CTRL
-+    Control roaming behavior
-+   SET_RTS
-+    Determine when RTS should be sent
-+   SET_SCAN_PARAMS
-+    Set the AR6000 scan parameters
-+   SET_TKIP_COUNTERMEASURES
-+    Enable/disable reports of TKIP MIC errors
-+   SET_TX_PWR
-+    Specify the AR6000 device Tx power levels
-+   SET_VOICE_PKT_SIZE
-+    Set voice packet size
-+   SET_WMM
-+    Override the AR6000 WMM capability
-+   SET_WMM_TXOP
-+    Configure TxOP bursting when sending traffic to a WMM-
-+    capable AP
-+   SET_WOW_MODE
-+    Enable/disable WoW mode
-+   SET_WSC_STATUS
-+    Enable/disable profile check in cserv when the WPS protocol
-+    is in progress
-+   SNR_THRESHOLD_PARAMS
-+    Configure how the device monitors and reports SNR of BSS
-+   START_SCAN
-+    Start a long or short channel scan
-+   SYNCHRONIZE
-+    Force a synchronization point between command and data
-+    paths
-+   TARGET_REPORT_ERROR_BITMASK
-+    Control \93ERROR_REPORT\94 events from the AR6000
-+
-+
-+
-+
-+Name
-+    ADD_BAD_AP
-+
-+Synopsis
-+    The host uses this command to cause the AR6000 to avoid a particular AP. The
-+    AR6000 maintain a table with up to two APs to avoid. An ADD_BAD_AP command
-+    adds or replaces the specified entry in this bad AP table.
-+
-+    If the AR6000 are currently connected to the AP specified in this command, they
-+    disassociate.
-+
-+Command
-+    wmiconfig eth1 --badap <bssid> <badApIndex>
-+
-+Command Parameters
-+    UINT8 badApIndex    Index [0...1] that identifies which entry in the
-+                        bad AP table to use
-+
-+
-+    UINT8 bssid[6]  MAC address of the AP to avoid
-+
-+Command Values
-+    badApIndex = 0, 1    Entry in the bad AP table to use
-+
-+Reset Value
-+    The bad AP table is cleared
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93DELETE_BAD_AP\94 on page B-13
-+
-+=====================================================================
-+Name
-+    ADD_CIPHER_KEY
-+
-+Synopsis
-+    The host uses this command to add/replace any of four encryption keys on the
-+    AR6000. The ADD_CIPHER_KEY command is issued after the CONNECT event
-+    has been received by the host for all dot11Auth modes except for SHARED_AUTH.
-+    When the dot11AuthMode is SHARED_AUTH, then the ADD_CIPHER_KEY
-+    command should be issued before the \93CONNECT\94 command.
-+
-+Command
-+    wmiconfig eth1 --cipherkey <keyIndex> <keyType> <keyUsage>
-+                            <keyLength> <keyopctrl> <keyRSC> <key>
-+
-+Command Parameters
-+    UINT8 keyIndex      Index (0...3) of the key to add/replace;
-+                        uniquely identifies the key
-+    UINT8 keyType    CRYPTO_TYPE
-+    UINT8 keyUsage   Specifies usage parameters of the key when
-+                     keyType = WEP_CRYPT
-+    UINT8 keyLength  Length of the key in bytes
-+    UINT8 keyOpCtrl  bit[0] = Initialize TSC (default),
-+                     bit[1] = Initialize RSC
-+    UINT8 keyRSC[8]  Key replay sequence counter (RSC) initial
-+                     value the device should use
-+    UINT8 key[32]    Key material used for this connection
-+    Command Values
-+    {
-+        NONE_CRYPT = 1
-+        WEP_CRYPT  = 2
-+        TKIP_CRYPT = 3
-+        AES_CRYPT  = 4
-+        KEY_OP_INIT_TSC   0x01
-+        KEY_OP_INIT_RSC   0x02
-+        KEY_OP_INIT_VAL   0x03
-+                Default is to Initialize the TSC
-+        KEY_OP_VALID_MASK 0x04
-+                Two operations defined
-+    } CRYPTO_TYPE
-+
-+    {
-+        PAIRWISE_USAGE  = 0  Set if the key is used for unicast traffic only
-+        GROUP_USAGE     = 1  Set if the key is used to receive multicast
-+                              traffic (also set for static WEP keys)
-+        TX_USAGE        = 2  Set for the GROUP key used to transmit frames
-+                All others are reserved
-+    } KEY_USAGE
-+
-+Reset Value
-+    The four available keys are disabled.
-+
-+Restrictions
-+    The cipher should correspond to the encryption mode specified in the \93CONNECT\94
-+    command.
-+
-+See Also
-+    \93DELETE_CIPHER_KEY\94
-+
-+=====================================================================
-+
-+
-+Name
-+    ADD_WOW_PATTERN
-+
-+Synopsis
-+    The host uses this command to add a pattern to the WoW pattern list; used for
-+    pattern-matching for host wakeups by the WoW module. If the host mode is asleep
-+    and WoW is enabled, all packets are matched against the existing WoW patterns. If a
-+    packet matches any of the patterns specified, the target will wake up the host. All
-+    non-matching packets are discarded by the target without being sent up to the host.
-+
-+Command
-+    wmiconfig \96addwowpattern <list-id> <filter-size> <filter-offset>
-+    <pattern> <mask>
-+
-+Command Parameters
-+    A_UINT8  filter_list_id    ID of the list that is to include the new pattern
-+    A_UINT8  filter_size       Size of the new pattern
-+    A_UINT8  filter_offset     Offset at which the pattern matching for this
-+                                new pattern should begin at
-+    A_UINT8  filter[1]         Byte stream that contains both the pattern and
-+                                the mask of the new WoW wake-up pattern
-+
-+Reply Parameters
-+    None
-+
-+Reset Value
-+    None defined (default host mode is awake)
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93DELETE_WOW_PATTERN\94
-+
-+=====================================================================
-+
-+
-+Name
-+    CLR_RSSI_SNR
-+
-+Synopsis
-+    Clears the current calculated RSSI and SNR value. RSSI and SNR are reported by
-+    running-average value. This command will clear the history and have a fresh start
-+    for the running-average mechanism.
-+
-+Command
-+    wmiconfig eth1 --cleanRssiSnr
-+
-+Command Parameters
-+    None
-+
-+Reply Parameters
-+    None
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+Name
-+    CONNECT_CMD
-+
-+Synopsis
-+    New connect control information (connectCtrl) is added, with 32 possible modifiers.
-+
-+    CONNECT_SEND_REASSOC
-+        Valid only for a host-controlled connection to a
-+        particular AP. If this bit is set, a reassociation frame is
-+        sent. If this bit is clear, an association request frame is
-+        sent to the AP.
-+
-+    CONNECT_IGNORE_WPAx_GROUP_CIPHER
-+        No group key is issued in the CONNECT command,
-+        so use the group key advertised by the AP. In a target-
-+        initiated roaming situation this allows a STA to roam
-+        between APs that support different multicast ciphers.
-+
-+    CONNECT_PROFILE_MATCH_DONE
-+        In a host-controlled connection case, it is possible that
-+        during connect, firmware may not have the
-+        information for a profile match (e.g, when the AP
-+        supports hidden SSIDs and the device may not
-+        transmit probe requests during connect). By setting
-+        this bit in the connection control information, the
-+        firmware waits for a beacon from the AP with the
-+        BSSID supplied in the CONNECT command. No
-+        additional profile checks are done.
-+
-+    CONNECT_IGNORE_AAC_BEACON
-+        Ignore the Admission Capacity information in the
-+        beacon of the AP
-+
-+    CONNECT_ASSOC_POLICY_USER
-+        When set, the CONNECT_SEND_REASSOC setting
-+        determines if an Assoc or Reassoc is sent to an AP
-+
-+Command
-+    wmiconfig --setconnectctrl <ctrl flags bitmask>
-+
-+Command Parameters
-+    typedef struct{
-+    A_UINT8 networktype;
-+    A_UINT8 dot11authmode;
-+    A_UINT8 authmode;
-+    A_UINT8 pairwiseCryptoType; /*CRYPTO_TYPE*/
-+    A_UINT8 pairwiseCryptoLen;
-+    A_UINT8 groupCryptoType; /*CRYPTO_TYPE*/
-+    A_UINT8 groupCryptoLen;
-+    A_UINT8 ssidLength;
-+    A_UCHAR ssid[WMI_MAX_SSID_LEN];
-+    A_UINT16 channel;
-+    A_UINT8 bssid[AUTH_MAC_LEN];
-+    A_UINT8 ctrl_flags; /*WMI_CONNECT_CTRL_FLAGS_BITS*/
-+    } WMI_CONNECT_CMD;
-+
-+    ctrl flags bitmask
-+        = 0x0001 CONNECT_ASSOC_POLICY_USER
-+            Assoc frames are sent using the policy specified by
-+            the flag
-+        = 0x0002 CONNECT_SEND_REASSOC
-+            Send Reassoc frame while connecting, otherwise send
-+            assoc frames
-+        = 0x0004 CONNECT_IGNORE_WPAx_GROUP_CIPHER
-+            Ignore WPAx group cipher for WPA/WPA2
-+        = 0x0008 CONNECT_PROFILE_MATCH_DONE
-+            Ignore any profile check
-+        = 0x0010 CONNECT_IGNORE_AAC_BEACON
-+            Ignore the admission control information in the
-+            beacon
-+        ... CONNECT_CMD, continued
-+        Command Values
-+        typedef enum {
-+            INFRA_NETWORK       = 0x01,
-+            ADHOC_NETWORK       = 0x02,
-+            ADHOC_CREATOR       = 0x04,
-+        } NETWORK_TYPE;
-+
-+        typedef enum {
-+            OPEN_AUTH           = 0x01,
-+            SHARED_AUTH         = 0x02,
-+            LEAP_AUTH           = 0x04,
-+        } DOT11_AUTH_MODE;
-+        typedef enum {
-+            NONE_AUTH           = 0x01,
-+            WPA_AUTH            = 0x02,
-+            WPA_PSK_AUTH        = 0x03,
-+            WPA2_AUTH           = 0x04,
-+            WPA2_PSK_AUTH       = 0x05,
-+            WPA_AUTH_CCKM       = 0x06,
-+            WPA2_AUTH_CCKM      = 0x07,
-+        } AUTH_MODE;
-+        typedef enum {
-+            NONE_CRYPT          = 0x01,
-+            WEP_CRYPT           = 0x02,
-+            TKIP_CRYPT          = 0x03,
-+            AES_CRYPT           = 0x04,
-+        } CRYPTO_TYPE;
-+        typedef enum {
-+            CONNECT_ASSOC_POLICY_USER = 0x0001,
-+            CONNECT_SEND_REASSOC = 0x0002,
-+            CONNECT_IGNORE_WPAx_GROUP_CIPHER = 0x0004,
-+            CONNECT_PROFILE_MATCH_DONE = 0x0008,
-+            CONNECT_IGNORE_AAC_BEACON = 0x0010,
-+        } WMI_CONNECT_CTRL_FLAGS_BITS;
-+
-+    pairwiseCryptoLen and groupCryptoLen are valid when the respective
-+    CryptoTypesis WEP_CRYPT, otherwise this value should be 0. This is the length in
-+    bytes.
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    CREATE_PSTREAM
-+
-+Synopsis
-+    The host uses this command to create a new prioritized data endpoint between the
-+    host and the AR6000 device that carries a prioritized stream of data. If the AP that the
-+    device connects to requires TSPEC stream establishment, the device requests the
-+    corresponding TSPEC with the AP. The maximum and minimum service interval
-+    ranges from 0 \96 0x7FFFFFFF (ms), where 0 = disabled. The device does not send a
-+    reply event for this command, as it is always assumed the command has succeeded.
-+    An AP admission control response comes to the host via a WMI_CAC_INDICATION
-+    event, once the response for the ADDTS frame comes.
-+
-+    Examples of cases where reassociation is generated (when WMM) and cases where
-+    ADDTS is generated (when WMM and enabling ACM) are when:
-+        Changing UAPSD flags in WMM mode, reassociation is generated
-+        Changing the interval of sending auto QoS Null frame in WMM mode;
-+            reassociation is not generated
-+        Issuing a command with same previous parameters in WMM mode and enabling
-+            ACM, an ADDTS request is generated
-+        Changing the interval of a QoS null frame sending in WMM mode and enabling
-+            ACM, an ADDTS request is generated
-+        Issuing the command in disconnected state, reassociation or ADDTS is not
-+            generated but the parameters are available after (re)association
-+
-+Command
-+    --createqos <user priority> <direction> <traffic class>
-+<trafficType> <voice PS capability> <min service interval> <max
-+service interval> <inactivity interval> <suspension interval>
-+<service start time> <tsid> <nominal MSDU> <max MSDU> <min data
-+rate> <mean data rate> <peak data rate> <max burst size> <delay
-+bound> <min phy rate> <sba> <medium time> where:
-+
-+    <user priority>
-+    802.1D user priority range (0\967)
-+    <direction>
-+        = 0    Tx (uplink) traffic
-+        = 1    Rx (downlink) traffic
-+        = 2    Bi-directional traffic
-+    <traffic class>
-+        = 1    BK
-+        = 2    VI
-+        = 3    VO
-+    <trafficType>
-+        = 0    Aperiodic
-+        = 1    Periodic
-+    <voice PS capability>
-+        Specifies whether the voice power save mechanism
-+    (APSD if AP supports it or legacy/simulated APSD
-+    [using PS-Poll]) should be used
-+        = 0    Disable voice power save for traffic class
-+        = 1    Enable APSD voice power save for traffic class
-+        = 2    Enable voice power save for all traffic classes
-+    <min service interval>
-+        (In ms)
-+    <max service interval>
-+        Inactivity interval (in ms) (0 = Infinite)
-+    <suspension interval>
-+        (In ms)
-+    <service start time>
-+        Service start time
-+    <tsid>
-+        TSID range (0\9615)
-+    <nominal MSDU>
-+        Nominal MAC SDU size
-+    <max MSDU>
-+        Maximum MAC SDU size
-+    <min data rate>
-+        Minimum data rate (in bps)
-+    <mean data rate>
-+        Mean data rate (in bps)
-+    <peak data rate>
-+        Peak data rate (in bps)
-+    <max burst size>
-+        Maximum burst size (in bps)
-+    <delay bound>
-+        Delay bound
-+    <min phy rate>
-+        Minimum PHY rate (in bps)
-+    <sba>
-+        Surplus bandwidth allowance
-+    <medium time>
-+        Medium time in TU of 32-ms periods per sec
-+    ... CREATE_PSTREAM (continued)
-+
-+Command Parameters
-+    UINT8 trafficClass    TRAFFIC_CLASS value
-+    UINT8 traffic
-+    Direction
-+    DIR_TYPE value
-+    UINT8    rxQueueNum
-+        AR6000 device mailbox index (2 or 3)
-+        corresponding to the endpoint the host
-+        wishes to use to receive packets for the
-+        prioritized stream
-+    UINT8 trafficType  TRAFFIC_TYPE value
-+    UINT8 voicePS
-+Capability
-+    VOICEPS_CAP_TYPE value
-+    UINT8 tsid          Traffic stream ID
-+    UINT8 userPriority  802.1D user priority
-+    UINT16 nominalMSDU  Nominal MSDU in octets
-+    UINT16 maxMSDU      Maximum MSDU in octets
-+    UINT32 minServiceInt Minimum service interval: the min.
-+                            period of traffic specified (in ms)
-+    UINT32 maxServiceInt  Maximum service interval: the max.
-+                        period of traffic specified (in ms)
-+    UINT32 inactivityInt Indicates how many ms an established
-+                        stream is inactive before the prioritized
-+                        data endpoint is taken down and the
-+                        corresponding T-SPEC deleted
-+    UINT32 suspensionInt  Suspension interval (in ms)
-+    UINT32 service       StartTime Service start time
-+    UINT32 minDataRate  Minimum data rate (in bps)
-+    UINT32 meanDataRate Mean data rate (in bps)
-+    UINT32 peakDataRate Peak data rate (in bps)
-+    UINT32 maxBurstSize
-+    UINT32 delayBound
-+    UINT32 minPhyRate   Minimum PHY rate for TSPEC (in bps)
-+    UINT32 sba          Surplus bandwidth allowance
-+    UINT32 mediumTime   Medium TSPEC time (in units of 32 ms)
-+Command Values
-+    {
-+        WMM_AC_BE = 0   Best Effort
-+        WMM_AC_BK = 1   Background
-+        WMM_AC_VI = 2   Video
-+        WMM_AC_VO = 3   Voice
-+        All other values reserved
-+    } TRAFFIC_CLASS
-+    {
-+        UPLINK_TRAFFIC   = 0  From the AR6000 device to the AP
-+        DOWNLINK_TRAFFIC = 1  From the AP to the AR6000 device
-+        BIDIR_TRAFFIC    = 2  Bi-directional traffic
-+        All other values reserved
-+    } DIR_TYPE
-+    {
-+        DISABLE_FOR_THIS_AC = 0
-+        ENABLE_FOR_THIS_AC  = 1
-+        ENABLE_FOR_ALL_AC   = 2
-+        All other values reserved
-+    } VOICEPS_CAP_TYPE
-+
-+    ... CREATE_PSTREAM (continued)
-+
-+
-+        VI  BE   BK    Supported, Y/N?
-+   0    0    0    0    Y
-+   0    0    0    1    Y
-+   0    0    1    0    N
-+   0    0    1    1    N
-+   0    1    0    0    Y
-+   0    1    0    1    Y
-+   0    1    1    0    N
-+   0    1    1    1    N
-+   1    0    0    0    Y
-+   1    0    0    1    Y
-+   1    0    1    0    N
-+   1    1    0    0    N
-+   1    1    0    1    Y
-+   1    1    0    0    N
-+   1    1    1    0    N
-+   1    1    1    1    Y
-+
-+Reset Value
-+    No pstream is present after reset; each of the BE, BK, VI,VO pstreams must be created
-+    (either implicitly by data flow or explicitly by user)
-+
-+Restrictions
-+    This command can only be issued when the device is in the CONNECTED state. If
-+    the device receives the command while in DISCONNECTED state, it replies with a
-+    failure indication. At most four prioritized data endpoints can be created, one for
-+    each AC.
-+
-+See Also
-+    \93DELETE_PSTREAM\94
-+=====================================================================
-+
-+Name
-+    DELETE_BAD_AP
-+
-+Synopsis
-+    The host uses this command to clear a particular entry in the bad AP table
-+
-+Command
-+    wmiconfig eth1 --rmAP [--num=<index>] // used to clear a badAP
-+    entry. num is index from 0-3
-+
-+Command Parameters
-+    UINT8  badApIndex   Index [0...n] that identifies the entry in the bad
-+                        AP table to delete
-+
-+Command Values
-+    badApIndex   = 0, 1, 2, 3
-+            Entry in the bad AP table
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93ADD_BAD_AP\94
-+
-+=====================================================================
-+
-+
-+Name
-+    DELETE_CIPHER_KEY
-+
-+Synopsis
-+    The host uses this command to delete a key that was previously added with the
-+    \93ADD_CIPHER_KEY\94 command.
-+
-+Command
-+    TBD
-+
-+Command Parameters
-+    UINT8   keyIndex    Index (0...3) of the key to be deleted
-+
-+Command Values
-+    keyIndex    = 0, 1,2, 3    Key to delete
-+
-+Reset Value
-+    None
-+
-+Restrictions
-+    The host should not delete a key that is currently in use by the AR6000.
-+
-+See Also
-+    \93ADD_CIPHER_KEY\94
-+
-+=====================================================================
-+
-+Name
-+    DELETE_PSTREAM
-+
-+Synopsis
-+    The host uses this command to delete a prioritized data endpoint created by a
-+    previous \93CREATE_PSTREAM\94 command
-+
-+Command
-+    --deleteqos <trafficClass> <tsid>, where:
-+
-+    <traffic class>
-+        = 0    BE
-+        = 1    BK
-+        = 2    VI
-+        = 3    VO
-+    <tsid>
-+        The TSpec ID; use the -qosqueue option
-+        to get the active TSpec IDs for each traffic class
-+
-+Command Parameters
-+    A_UINT8    trafficClass    Indicate the traffic class of the stream
-+                            being deleted
-+
-+Command Values
-+    {
-+        WMM_AC_BE = 0    Best effort
-+        WMM_AC_BK = 1    Background
-+        WMM_AC_VI = 2    Video
-+        WMM_AC_VO = 3    Voice
-+    } TRAFFIC CLASS
-+
-+    0-15 for TSID
-+
-+Reply Values
-+    N/A
-+
-+Restrictions
-+    This command should only be issued after a \93CREATE_PSTREAM\94 command has
-+    successfully created a prioritized stream
-+
-+See Also
-+    \93CREATE_PSTREAM\94
-+
-+=====================================================================
-+
-+
-+Name
-+    DELETE_WOW_PATTERN
-+
-+Synopsis
-+    The host uses this command to remove a pre-specified pattern from the
-+    WoW pattern list.
-+
-+Command
-+    wmiconfig \96delwowpattern <list-id> <pattern-id>
-+
-+Command Parameters
-+    A_UINT8    filter_list_id    ID of the list that contains the WoW filter
-+                                 pattern to delete
-+    A_UINT8    filter_id    ID of the WoW filter pattern to delete
-+
-+Reply Parameters
-+    None
-+
-+
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93ADD_WOW_PATTERN\94
-+
-+=====================================================================
-+
-+
-+Name
-+    EXTENSION
-+
-+Synopsis
-+    The WMI message interface is used mostly for wireless control messages to a wireless
-+    module applicable to wireless module management regardless of the target platform
-+    implementation. However, some commands only peripherally related to wireless
-+    management are desired during operation. These wireless extension commands may
-+    be platform-specific or implementation-dependent.
-+
-+Command
-+    N/A
-+
-+Command Parameters
-+    Command-specific
-+
-+Command Values
-+    Command-specific
-+
-+Reply Parameters
-+    Command-specific
-+
-+Reset Values
-+    None defined
-+
-+Restrictions
-+    None defined
-+
-+=====================================================================
-+
-+
-+Name
-+    GET_BIT_RATE
-+
-+Synopsis
-+    Used by the host to obtain the rate most recently used by the AR6000 device
-+
-+Command
-+    wmiconfig eth1 --getfixrates
-+
-+Command Parameters
-+    None
-+
-+
-+
-+Reply Parameters
-+    INT8
-+    rateIndex
-+    See the \93SET_BIT_RATE\94 command
-+
-+Reset Values
-+    None
-+
-+Restrictions
-+    This command should only be used during development/debug; it is not intended
-+for use in production. It is only valid when the device is in the CONNECTED state
-+
-+See Also
-+    \93SET_BIT_RATE\94
-+
-+=====================================================================
-+
-+
-+Name
-+    GET_CHANNEL_LIST
-+
-+Synopsis
-+    Used by the host uses to retrieve the list of channels that can be used by the device
-+    while in the current wireless mode and in the current regulatory domain.
-+
-+Command
-+    TBD
-+
-+Command Parameters
-+    None
-+
-+Reply Parameters
-+    UINT8    reserved    Reserved
-+    UINT8    numberOfChannels    Number of channels the reply contains
-+    UINT16    channelList[numberOfChannels]  Array of channel frequencies (in MHz)
-+
-+Reset Values
-+    None defined
-+
-+Restrictions
-+    The maximum number of channels that can be reported are 32
-+
-+=====================================================================
-+
-+
-+Name
-+    GET_FIXRATES
-+
-+Synopsis
-+    Clears the current calculated RSSI and SNR value. RSSI and SNR are reported by
-+    running-average value. This command will clear the history and have a fresh start for
-+    the running-average mechanism.
-+
-+Synopsis
-+    This returns rate-mask set via WMI_SET_FIXRATES to retrieve the current fixed rate
-+    that the AR6001 or AR6001 is using. See \93SET_FIXRATES\94.
-+
-+Command
-+    wmiconfig eth1 --getfixrates
-+
-+Command Parameters
-+    A_UINT16    fixRateMask;    Note: if this command is used prior to
-+                using WMI_SET_FIXRATES, AR6000
-+                returns 0xffff as fixRateMask, indicating
-+                all the rates are enabled
-+
-+Reply Parameters
-+    None
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93SET_FIXRATES\94
-+
-+=====================================================================
-+
-+
-+
-+Name
-+    GET_PMKID_LIST_CMD
-+
-+Synopsis
-+    Retrieves the list of PMKIDs on the firmware. The
-+    WMI_GET_PMKID_LIST_EVENT is generated by the firmware.
-+
-+Command
-+    TBD
-+
-+Command Parameters
-+
-+Reset Values
-+    None
-+
-+Restrictions
-+    None
-+
-+See Also
-+    SET_PMKID_LIST_CMD GET_PMKID_LIST_EVENT
-+
-+=====================================================================
-+
-+
-+Name
-+    GET_ROAM_TBL
-+
-+Synopsis
-+    Retrieve the roaming table maintained on the target. The response is reported
-+    asynchronously through the ROAM_TBL_EVENT.
-+
-+Command
-+    wmiconfig --getroamtable <roamctrl> <info>
-+
-+Command Parameters
-+    A_UINT8    roamCtrlType;
-+    A_UINT16   roamMode
-+    A_UINT16   numEntries
-+    WMI_BSS_ROAM_INFO bssRoamInfo[1]
-+
-+Reply Value
-+    Reported asynchronously through the ROAM_TBL_EVENT
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+See Also
-+    SET_KEEPALIVE
-+
-+=====================================================================
-+
-+
-+Name
-+    GET_TARGET_STATS
-+
-+Synopsis
-+    The host uses this command to request that the target send the statistics that it
-+    maintains. The statistics obtained from the target are accrued in the host every time
-+    the GET_TARGET_STATS command is issued. The --clearStats option is added to
-+    clear the target statistics maintained in the host.
-+
-+Command
-+    wmiconfig --getTargetStats --clearStats
-+
-+Command Parameters
-+    TARGET_STATS    targetStats
-+    WMI_TARGET_STATS
-+    UINT8   clearStats
-+
-+
-+Reply Value
-+    RSSI return value (0\96100)
-+
-+Reset Values
-+    All statistics are cleared (zeroed)
-+
-+Restrictions
-+    The --getTargetStats option must be used; the --clearStats option is also available also
-+
-+
-+=====================================================================
-+
-+Name
-+    GET_TX_PWR
-+
-+Synopsis
-+    The host uses this command to retrieve the current Tx power level
-+
-+Command
-+    wmiconfig -i eth1 --getpower
-+
-+Command Parameters
-+    None
-+
-+Reply Parameters
-+    UINT16 dbM    The current Tx power level specified in dbM
-+
-+Reset Values
-+    The maximum permitted by the regulatory domain
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93SET_TX_PWR\94
-+
-+=====================================================================
-+
-+
-+Name
-+    GET_WOW_LIST
-+
-+Synopsis
-+    The host uses this command to retrieve the current list of WoW patterns.
-+
-+Command
-+    wmiconfig \96getwowlist <list-id>
-+
-+Command Parameters
-+    A_UINT8 filter_list_id    ID of the list of WoW patterns to retrieve
-+
-+Reply Value(s)
-+    A_UINT16  num_filters    Number of WoW patterns contained in the list
-+    A_UINT8   wow_mode    Current mode of WoW (enabled or disabled)
-+    A_UINT8    host_mode    Current host mode (asleep or awake)
-+    WOW_FILTER    wow_filters[1]
-+        Contents of the WoW filter pattern list
-+        (contains mask, pattern, offset and size
-+    information for each of the patterns)
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93SET_WSC_STATUS\94
-+
-+=====================================================================
-+
-+
-+Name
-+    LQ_THRESHOLD_PARAMS
-+
-+Synopsis
-+    Sets Link Quality thresholds, the sampling will happen at every unicast data frame
-+    Tx if a certain threshold is met, and the corresponding event will be sent to the host.
-+
-+Command
-+    --lqThreshold <enable> <upper_threshold_1> ...
-+    <upper_threshold_4> <lower_threshold_1> ... <lower_threshold_4>
-+
-+Command Parameters
-+    <enable>    = 0    Disable link quality sampling
-+                = 1    Enable link quality sampling
-+    <upper_threshold_x>  Above thresholds (value in [0,100]), in
-+                    ascending order
-+    <lower_threshold_x> Below thresholds (value in [0,100]), in
-+                    ascending order
-+
-+Command Values
-+    See command parameters
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    OPT_TX_FRAME
-+
-+Synopsis
-+    Special feature, sends a special frame.
-+
-+Command
-+    wmiconfig --sendframe <frmType> <dstaddr> <bssid> <optIEDatalen>
-+    <optIEData>
-+
-+Command Parameters
-+    {
-+        A_UINT16    optIEDataLen;
-+        A_UINT8    frmType;
-+        A_UINT8    dstAddr[ATH_MAC_LEN];
-+        A_UINT8    bssid[ATH_MAC_LEN];
-+        A_UINT8    optIEData[1];
-+    } WMI_OPT_TX_FRAME_CMD;
-+
-+Command Values
-+    <frmtype>   = 1    Probe request frame
-+                = 2    Probe response frame
-+                = 3    CPPP start
-+                = 4    CPPP stop
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    Send a special frame only when special mode is on.
-+
-+=====================================================================
-+
-+
-+Name
-+    RECONNECT
-+
-+Synopsis
-+    This command requests a reconnection to a BSS to which the AR6000 device was
-+    formerly connected
-+
-+Command
-+    TBD
-+
-+Command Parameters
-+    UINT16    channel    Provides a hint as to which channel was
-+                        used for a previous connection
-+    UINT8    bssid[6]    If set, indicates which BSSID to connect to
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    None
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93CONNECT_CMD\94
-+
-+=====================================================================
-+
-+
-+Name
-+    RSSI_THRESHOLD_PARAMS
-+
-+Synopsis
-+    Configures how the AR6000 device monitors and reports signal strength (RSSI) of the
-+    connected BSS, which is used as a link quality metric. The four RSSI threshold sets (in
-+    dbM) of the host specification divide the signal strength range into six segments.
-+    When signal strength increases or decreases across one of the boundaries, an
-+    RSSI_THRESHOLD event is signaled to the host. The host may then choose to take
-+    action (such as influencing roaming).
-+
-+Command
-+    wmiconfig eth1 --rssiThreshold <weight> <pollTime>
-+        <above_threshold_val_1> ... <above_threshold_tag_6>
-+        <above_threshold_val_6>
-+        <below_threshold_tag_1> <below_threshold_val_1> ...
-+        <below_threshold_tag_6> <below_threshold_val_6>
-+
-+Command Parameters
-+    UINT8    weight    Range in [1, 16] used to calculate average RSSI
-+    UINT32   pollTime   RSSI (signal strength) sampling frequency in
-+                seconds (if pollTime = 0, single strength
-+        sampling is disabled)
-+    USER_RSS__THOLD tholds[12]  Thresholds (6 x 2)
-+
-+Command Values
-+    None defined
-+
-+Reset Values
-+    pollTime is 0, and sampling is disabled
-+
-+Restrictions
-+    Can only be issued if the AR6000 device is connected
-+
-+
-+=====================================================================
-+
-+Name
-+    SCAN_PARAMS
-+
-+Synopsis
-+    The minact parameter determines the minimum active channel dwell time, within
-+    which if the STA receives any beacon, it remains on that channel until the maxact
-+    channel dwell time. If the STA does not receive a beacon within the minact dwell
-+    time, it switches to scan the next channel.
-+
-+Command
-+    wmiconfig -scan -minact=<ms> --maxact=<ms>
-+
-+Command Parameters
-+    UINT16    maxact    Channel dwell time (in ms), default = 0
-+    UINT16    minact    Channel dwell time (in ms), default = 105
-+
-+Command Values
-+    See channel parameters
-+
-+Reset Values
-+    None defined
-+
-+Restrictions
-+    The minact value should be greater than 0; maxact should be between 5\9665535 ms
-+    and greater than minact
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_ACCESS_PARAMS
-+
-+Synopsis
-+    Allows the host to set access parameters for the wireless network. A thorough
-+    understanding of IEEE 802.11 is required to properly manipulate these parameters.
-+
-+Command
-+    wmiconfig eth1 --acparams --txop <limit> --cwmin <0-15>
-+    --cwmax <0-15> --aifsn<0-15>
-+
-+Command Parameters
-+    UINT16    txop    The maximum time (expressed in units of
-+                        32 ms) the device can spend transmitting
-+                        after acquiring the right to transmit
-+    UINT8    eCWmin    Minimum contention window
-+    UINT8    eCWmax    Maximum contention window
-+    UINT8    aifsn    The arbitration inter-frame space number
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    Reasonable defaults that vary, between endpoints (prioritized streams)
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_ADHOC_BSSID
-+
-+Synopsis
-+    Allows the host to set the BSSID for an ad hoc network. If a network with this BSSID
-+    is not found, the target creates an ad hoc network with this BSSID after the connect
-+    WMI command is triggered (e.g., by the SIOCSIWESSID IOCTL).
-+
-+Command
-+    wmiconfig eth1 --adhocbssid <bssid>
-+
-+Command Parameters
-+    A_UINT8     bssid[ATH_MAC_LEN]    BSSID is specified in xx:xx:xx:xx:xx:xx format
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    None
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_AKMP_PARAMS
-+
-+Synopsis
-+    Enables or disables multi PMKID mode.
-+
-+Command
-+    wmiconfig eth1 --setakmp --multipmkid=<on/off>
-+
-+Command Parameters
-+    typedef struct {
-+      A_UINT32    akmpInfo;
-+    } WMI_SET_AKMP_PARAMS_CMD;
-+
-+Command Values
-+    akmpInfo;
-+    bit[0] = 0
-+        MultiPMKID mode is disabled and PMKIDs that
-+        were set using the WMI_SET_PMKID_CMD are
-+        used in the [Re]AssocRequest frame.
-+     bit[0] = 1
-+        MultiPMKID mode is enabled and PMKIDs issued
-+        by the WMI_SET_PMKID_LIST_CMD are used in
-+        the next [Re]AssocRequest sent to the AP.
-+
-+Reset Values
-+    MultiPMKID mode is disabled
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_APPIE
-+
-+Synopsis
-+    Add an application-specified IE to a management frame. The maximum length is
-+    76 bytes. Including the length and the element ID, this translates to 78 bytes.
-+
-+Command
-+    wmiconfig --setappie <frame> <IE>, where:
-+
-+    frame
-+        One of beacon, probe, respon, assoc
-+
-+    IE
-+        A hex string beginning with DD (if = 0, no
-+        IE is sent in the management frame)
-+
-+Command Parameters
-+    mgmtFrmType;
-+        A WMI_MGMT_FRAME_TYPE
-+
-+    ieLen;
-+        Length of the IE to add to the GMT frame
-+
-+Command Values
-+    None
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    Supported only for the probe request and association request management frame
-+types. Also, only one IE can be added per management frame type.
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_ASSOC_INFO
-+
-+Synopsis
-+    The host uses this command to specify any information elements (IEs) it wishes the
-+    AR6000 device to add to all future association and reassociation requests. IEs must be
-+    correct and are used as is by the device. IEs specified through this command are
-+    cleared with a DISCONNECT.
-+
-+Command
-+    wmiconfig eth1 --setAssocIe <IE>
-+
-+Command Parameters
-+    UINT8    ieType    Used directly in 802.11 frames
-+    UINT8    bufferSize    Size of assocInfo (in bytes) ranging from
-+                        0\96240. If = 0, previously set IEs are cleared.
-+    UINT8    assocInfo[bufferSize]    Used directly in 802.11 frames
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    IEs are cleared
-+
-+Restrictions
-+    This command can only be issued in the DISCONNECTED state
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_AUTHMODE
-+
-+Synopsis
-+    Sets the 802.11 authentication mode of reconnection
-+
-+Command
-+    wmiconfig eth1 --setauthmode <mode>
-+
-+Command Parameters
-+    UINT8    mode
-+
-+Command Values
-+    mode    = 0x00    Proceed with authentication during reconnect
-+            = 0x01    Do not proceed with authentication during reconnect
-+
-+Reset Values
-+    Authentication
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_BEACON_INT
-+
-+Synopsis
-+    Sets the beacon interval for an ad hoc network. Beacon interval selection may have an
-+    impact on power savings. To some degree, a longer interval reduces power
-+    consumption but also decreases throughput. A thorough understanding of IEEE
-+    802.11 ad hoc networks is required to use this command effectively.
-+
-+Command
-+    wmiconfig eth1 --ibssconintv
-+
-+Command Parameters
-+    UINT16    beaconInterval    Specifies the beacon interval in TU units (1024 ms)
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    The default beacon interval is 100 TUs (102.4 ms)
-+
-+Restrictions
-+    This command can only be issued before the AR6000 device starts an ad hoc network
-+
-+See Also
-+    \93SET_IBSS_PM_CAPS\94
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_BIT_RATE
-+
-+Synopsis
-+    The host uses this command to set the AR6000 device to a specific fixed rate.
-+
-+Command
-+    wmiconfig eth1 --setfixrates <rate_0> ... <rate_n>
-+
-+Command Parameters
-+    INT8    rateIndex
-+    A WMI_BIT_RATE value
-+    {
-+        RATE_AUTO    = -1
-+        RATE_1Mb     = 0
-+        RATE_2Mb     = 1
-+        RATE_5_5M    = 2
-+        RATE_11Mb    = 3
-+        RATE_6Mb     = 4
-+        RATE_9Mb     = 5
-+        RATE_12Mb    = 6
-+        RATE_18Mb    = 7
-+        RATE_24Mb    = 8
-+        RATE_36Mb    = 9
-+        RATE_48Mb    = 10
-+        RATE_54Mb    = 11
-+      } WMI_BIT_RATE
-+
-+
-+Command Values
-+    See command parameters
-+
-+Reset Values
-+    The dynamic rate is determined by the AR6000 device
-+
-+Restrictions
-+    This command is intended for use only during development/debug; it is not
-+intended for use in production
-+
-+See Also
-+    \93GET_BIT_RATE\94
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_BMISS_TIME
-+
-+Synopsis
-+    This command sets the beacon miss (BMISS) time, which the AR6000 hardware use
-+    to recognize missed beacons. When an excessive number (15) of consecutive beacons
-+    are missed, the AR6000 consider switching to a different BSS. The time can be
-+    specified in number of beacons or in TUs.
-+
-+Command(s)
-+    wmiconfig eth1 --setbmissbeacons=<val>
-+    wmiconfig eth1 --setbmisstime=<val>
-+
-+Command Parameters
-+    UINT16    bmissTime    Specifies the beacon miss time
-+                            [1000...5000] in TUs (1024 ms)
-+    UINT16    bmissbeacons  Specifies the number of beacons [5...50]
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    bmissTime is 1500 TUs (1536 ms)
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_BSS_FILTER
-+
-+Synopsis
-+    The host uses this to inform the AR6000 device of the types of networks about which
-+    it wants to receive information from the \93BSSINFO\94 event. As the device performs
-+    either foreground or background scans, it applies the filter and sends \93BSSINFO\94
-+    events only for the networks that pass the filter. If any of the  bssFilter or the ieMask
-+    filter matches, a BSS Info is sent to the host. The ieMask currently is used as a match
-+    for the IEs in the beacons, probe reponses and channel switch action management
-+    frame. See also \93Scan and Roam\94 on page C-1.
-+
-+    The BSS filter command has been enhanced to support IE based filtering. The IEs can
-+    be specified as a bitmask through this command using this enum.
-+
-+Command
-+    wmiconfig eth1 \96filter = <filter> --ieMask 0x<mask>
-+
-+Command Parameters
-+    UINT8    BssFilter
-+
-+ Command Values
-+    typedef struct {
-+        A_UINT8    bssFilter;    See WMI_BSS_FILTER
-+        A_UINT32    ieMask;
-+    } __ATTRIB_PACK WMI_BSS_FILTER_CMD;
-+
-+    The ieMask can take this combination of values:
-+
-+    enum {
-+        BSS_ELEMID_CHANSWITCH   = 0x01
-+        BSS_ELEMID_ATHEROS      = 0x02,
-+    }
-+
-+Reply Value
-+    None
-+
-+Reset Value
-+    BssFilter = NONE_BSS_FILTER (0)
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93CONNECT_CMD\94
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_BT_PARAMS
-+
-+Synopsis
-+    This command is used to set the status of a Bluetooth stream or set Bluetooth
-+    coexistence register parameters. The stream may be an SCO or an A2DP stream and
-+    its status can be started/stopped/suspended/resumed.
-+
-+Command
-+    wmiconfig \96setBTparams <paramType> <params>
-+
-+Command Parameters
-+    struct {
-+       union {
-+            BT_PARAMS_SCO    scoParams;
-+            BT_PARAMS_A2DP   a2dpParams;
-+            BT_PARAMS_MISC   miscParams;
-+            BT_COEX_REGS     regs;
-+        } info;
-+         A_UINT8 paramType;
-+        struct {
-+            A_UINT8 noSCOPkts;    Number of SCO packets between consecutive PS-POLLs
-+            A_UINT8 pspollTimeout;
-+            A_UINT8 stompbt;
-+        } BT_PARAMS_SCO;
-+        struct {
-+            A2DP BT stream parameters
-+            A_UINT32   period;
-+            A_UINT32   dutycycle;
-+            A_UINT8    stompbt;
-+        } BT_PARAMS_A2DP;
-+        struct {
-+            union {
-+               WLAN_PROTECT_POLICY_TYPE   protectParams;
-+               A_UINT16    wlanCtrlFlags;
-+            }info;
-+        A_UINT8 paramType;
-+        } BT_PARAMS_MISC;
-+        struct {
-+            BT coexistence registers values
-+            A_UINT32    mode;     Coexistence mode
-+            A_UINT32    scoWghts; WLAN and BT weights
-+            A_UINT32    a2dpWghts;
-+            A_UINT32    genWghts;
-+            A_UINT32    mode2;    Coexistence mode2
-+            A_UINT8    setVal;
-+        } BT_COEX_REGS;
-+
-+Command Values
-+    None defined
-+
-+Reset Value
-+    None
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_BT_STATUS
-+
-+Synopsis
-+    Sets the status of a Bluetooth stream. The stream may be a SCO or an A2DP stream
-+    and its status can be started/stopped/suspended/resumed.
-+
-+Command
-+    wmiconfig \96setBTstatus <streamType> <status>
-+
-+Command Parameters
-+    {
-+        A_UINT8        streamType;    Stream type
-+        A_UINT8        status;    Stream status
-+    }WMI_SET_BT_STATUS_CMD;
-+
-+Command Values
-+    {
-+        BT_STREAM_UNDEF    = 0
-+        BT_STREAM_SCO
-+        SCO stream
-+        BT_STREAM_A2DP
-+        A2DP stream
-+        BT_STREAM_MAX
-+    } BT_STREAM_TYPE;
-+
-+    {
-+        BT_STATUS_UNDEF    = 0
-+        BT_STATUS_START
-+        BT_STATUS_STOP
-+        BT_STATUS_RESUME
-+        BT_STATUS_SUSPEND
-+        BT_STATUS_MAX
-+    } BT_STREAM_STATUS;
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_CHANNEL_PARAMETERS
-+
-+Synopsis
-+    Configures various WLAN parameters related to channels, sets the wireless mode,
-+    and can restrict the AR6000 device to a subset of available channels. The list of
-+    available channels varies depending on the wireless mode and the regulatory
-+    domain. The device never operates on a channel outside of its regulatory domain. The
-+    device starts to scan the list of channels right after this command.
-+
-+Command
-+    wmiconfig eth1 --wmode <mode> <list>
-+
-+Command Parameters
-+    UINT8    phyMode    See Values below.
-+    UINT8    numberOfChannels
-+        Number of channels in the channel array that
-+        follows. If = 0, then the device uses all of the
-+        channels permitted by the regulatory domain
-+        and by the specified phyMode.
-+    UINT16    channel[numberOfChannels]
-+        Array listing the subset of channels (expressed
-+        as frequencies in MHz) the host wants the
-+        device to use. Any channel not permitted by
-+        the specified phyMode or by the specified
-+        regulatory domain is ignored by the device.
-+
-+Command Values
-+    phyMode = {
-+        Wireless mode
-+        11a    = 0x01
-+        11g    = 0x02
-+        11ag   = 0x03
-+        11b    = 0x04
-+        11g only    = 0x05
-+        }
-+
-+Reset Values
-+    phyMode
-+    11ag
-+    802.11a/g modules
-+        11g
-+    802.11g module
-+    channels
-+        Defaults to all channels permitted by the
-+        current regulatory domain.
-+
-+Restrictions
-+    This command, if issued, should be issued soon after reset and prior to the first
-+    connection. This command should only be issued in the DISCONNECTED state.
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_DISC_TIMEOUT
-+
-+Synopsis
-+    The host uses this command to configure the amount of time that the AR6000 should
-+    spend when it attempts to reestablish a connection after losing link with its current
-+    BSS. If this time limit is exceeded, the AR6000 send a \93DISCONNECT\94 event. After
-+    sending the \93DISCONNECT\94 event the AR6000 continues to attempt to reestablish a
-+    connection, but they do so at the interval corresponding to a foreground scan as
-+    established by the \93SET_SCAN_PARAMS\94 command.
-+
-+    A timeout value of 0 indicates that the AR6000 will disable all autonomous roaming,
-+    so that the AR6000 will not perform any scans after sending a \93DISCONNECT\94
-+    event to the host. The state is maintained until a shutdown or host sets different
-+    timeout value from 0.
-+
-+Command
-+    wmiconfig eth1 --disc=<timeout in seconds>
-+
-+Command Parameters
-+    UINT8    disconnectTimeout
-+        Specifies the time limit (in seconds) after
-+        which a failure to reestablish a connection
-+        results in a \93DISCONNECT\94 event
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    disconnectTimeout is 10 seconds
-+
-+Restrictions
-+    This command can only be issued while in a DISCONNECTED state
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_FIXRATES
-+
-+Synopsis
-+    By default, the AR6000 device uses all PHY rates based on mode of operation. If the
-+    host application requires the device to use subset of supported rates, it can set those
-+    rates with this command. In 802.11g mode, the AR6000 device takes the entire
-+    802.11g basic rate set and the rates specified with this command and uses it as the
-+    supported rate set.
-+
-+    This rate set is advertised in the probe request and the assoc/re-assoc request as
-+    supported rates. Upon successful association, the device modifies the rate set pool
-+    using the: intersection of AP-supported rates with the union of the 802.11g basic rate
-+    set and rates set using this command. The device picks transmission rates from this
-+    pool based on a rate control algorithm.
-+
-+Command
-+    TBD
-+
-+Command Parameters
-+    A_UINT16    fixRateMask;
-+        The individual bit is an index for rate table,
-+        and setting the that index to 1 would set that
-+        corresponding rate. E.g., fixRateMask = 9
-+        (1001) sets 1 Mbps and 11 Mbps.
-+
-+Command Values
-+    None
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93GET_FIXRATES\94
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_WHAL_PARAM
-+
-+Synopsis
-+    An internal AR6000 command that is used to set certain hardware parameters. The
-+    description of this command is in $WORKAREA/include/halapi.h.
-+
-+Command
-+    TBD
-+
-+Command Parameters
-+    ATH_HAL_SETCABTO_CMDID
-+        Sets the timeout waiting for the multicast
-+        traffic after a DTIM beacon (in TUs).
-+
-+Command Values
-+    None
-+
-+Reset Value
-+    Default = 10 TUs
-+
-+Restrictions
-+    This command should be executed before issuing a connect command.
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_HOST_SLEEP_MODE
-+
-+Synopsis
-+    The host uses this command to set the host mode to asleep or awake. All packets are
-+    delivered to the host when the host mode is awake. When host mode is asleep, only if
-+    WoW is enabled and the incoming packet matches one of the specified WoW
-+    patterns, will the packet be delivered to the host. The host will also be woken up by
-+    the target for pattern-matching packets and important events.
-+
-+Command
-+    wmiconfig \96sethostmode=<asleep/awake>
-+
-+Command Parameters
-+    A_BOOL    awake    Set the host mode to awake
-+    A_BOOL    asleep   Set the host mode to asleep
-+
-+Command Values
-+    1 = awake, 0 = asleep
-+
-+Reset Value
-+    None defined (default host mode is awake)
-+
-+Restrictions
-+    None
-+
-+
-+=====================================================================
-+
-+Name
-+    SET_IBSS_PM_CAPS
-+
-+Synopsis
-+    Used to support a non-standard power management scheme for an ad hoc wireless
-+    network consisting of up to eight stations (STAs) that support this form of power
-+    saving (e.g., Atheros-based STAs). A thorough understanding of IEEE 802.11 ad hoc
-+    networks is required to use this command effectively.
-+
-+Command
-+    wmiconfig eth1 --ibsspmcaps --ps=<enable/disable>
-+        --aw=<ATIM Windows in ms>
-+        --ttl=<Time to live in number of beacon periods>
-+        --to=<timeout in ms>
-+
-+Command Parameters
-+    UINT8    power_saving
-+        = 0
-+        The non-standard power saving scheme is
-+        disabled and maximum throughput (with no
-+        power saving) is obtained.
-+
-+        = 1
-+        Ad hoc power saving scheme is enabled (but
-+        throughput may be decreased)
-+
-+    UINT16    atim_windows
-+        Specifies the length (in ms) of the ad hoc traffic
-+        indication message (ATIM) windows used in an ad
-+        hoc network. All Atheros-based STAs that join the
-+        network use this duration ATIM window.
-+
-+    The duration is communicated between wireless
-+    STAs through an IE in beacons and probe responses.
-+
-+    The host sets atim_windows to control trade-offs
-+    between power use and throughput. The value
-+    chosen should be based on the beacon interval (see
-+    the \93SET_BEACON_INT\94 command) on the
-+    expected number of STAs in the IBSS, and on the
-+    amount of traffic and traffic patterns between STAs.
-+
-+    UINT16    timeout_value
-+        Specifies the timeout (in ms). The value is the same
-+        for all ad hoc connections, but tracks separately for
-+        each.
-+
-+        Applicable only for a beacon period and used to
-+        derive actual timeout values on the Tx and Rx sides.
-+        On the Tx side, the value defines a window during
-+        which the STA accepts the frame(s) from the host for a
-+        particular connection. Until closed, the window
-+        restarts with every frame received from the host. On
-+        the Rx side, indicates the time until which the STA
-+        continues accepting frames from a particular
-+        connection. The value resets with every frame
-+        received. The value can be used to determine the
-+        trade off between throughput and power.
-+        Default = 10 ms
-+
-+    UINT8    ttl
-+        Specifies the value in number of beacon periods. The
-+        value is used to set a limit on the time until which a
-+        frame is kept alive in the AR6001 before being
-+        discarded. Default = 5
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    By default, power_saving is enabled with atim_window = 20 ms
-+
-+Restrictions
-+    Can only be issued before the AR6000 starts an ad hoc network
-+
-+See Also
-+    \93SET_BEACON_INT\94
-+
-+=====================================================================
-+
-+
-+
-+Name
-+    SET_LISTEN_INT
-+
-+Synopsis
-+    The host uses this command to request a listen interval, which determines how often
-+    the AR6000 device should wake up and listen for traffic. The listen interval can be set
-+    by the TUs or by the number of beacons. The device may not be able to comply with
-+    the request (e.g., if the beacon interval is greater than the requested listen interval, the
-+    device sets the listen interval to the beacon interval). The actual listen interval used
-+    by the device is available in the \93CONNECT\94 event.
-+
-+Command
-+    wmiconfig eth1 --listen=<#of TUs, can range from 15 to 3000>
-+
-+    --listenbeacons=<#of beacons, can range from 1 to 50>
-+
-+Command Parameters
-+    UINT16    listenInterval
-+        Specifies the listen interval in Kms
-+        (1024 ms), ranging from 100 to 1000
-+
-+    UINT16    listenbeacons
-+        Specifies the listen interval in beacons,
-+        ranging from 1 to 50
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    The device sets the listen interval equal to the beacon interval of the AP it associates
-+    to.
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_LPREAMBLE
-+
-+Synopsis
-+    Overrides the short preamble capability of the AR6000 device
-+
-+Command
-+    TBD
-+
-+Command Parameters
-+    WMI_LPREAMBLE_DISABLED
-+        The device is short-preamble capable
-+
-+    WMI_LPREAMBLE_ENABLED
-+        The device supports only the long-
-+    preamble mode
-+
-+Command Values
-+    None
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+
-+=====================================================================
-+
-+Name
-+    SET_MAX_SP_LEN
-+
-+Synopsis
-+    Set the maximum service period; indicates the number of packets the AR6001 can
-+    receive from the AP when triggered
-+
-+Command
-+    wmiconfig eth1 --setMaxSPLength <maxSPLen>
-+
-+Command Parameters
-+    UINT8    maxSPLen
-+        An APSD_SP_LEN_TYPE value
-+
-+Command Values
-+    {
-+        DELIVER_ALL_PKT  = 0x0
-+        DELIVER_2_PKT    = 0x1
-+        DELIVER_4_PKT    = 0x2
-+        DELIVER_6_PKT    = 0x3
-+    }APSD_SP_LEN_TYPE
-+
-+
-+Reset Values
-+    maxSPLen is DELIVER_ALL_PKT
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_OPT_MODE
-+
-+Synopsis
-+    Special feature, sets the special mode on/off
-+
-+Command
-+    wmiconfig eth1 --mode <mode>
-+    Set the optional mode, where mode is special or off
-+
-+Command Parameters
-+    enum {
-+        SPECIAL_OFF
-+        SPECIAL_ON
-+    } OPT_MODE_TYPE;
-+
-+Command Values
-+
-+Reset Value
-+    Mode = Off
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_PMKID
-+
-+Synopsis
-+    The host uses this command to enable or disable a pairwise master key ID (PMKID)
-+    in the AR6000 PMKID cache. The AR6000 clears its PMKID cache on receipt of a
-+    DISCONNECT command from the host. Individual entries in the cache might be
-+    deleted as the AR6000 detect new APs and decides to remove old ones.
-+
-+Command
-+    wmiconfig eth1 --setbsspmkid --bssid=<aabbccddeeff>
-+    --bsspmkid=<pmkid>
-+
-+Command Parameters
-+    UINT8    bssid[6]
-+        The MAC address of the AP that the
-+        PMKID corresponds to (6 bytes in hex
-+        format)
-+
-+    UINT8    enable
-+        Either PMKID_DISABLE (0) to disable
-+        the PMKID or PMKID_ENABLE (1) to
-+        enable it (16 bytes in hex format)
-+
-+    UINT8    pmkid[16]
-+        Meaningful only if enable is
-+        PMKID_ENABLE, when it is the PMKID
-+        that the AR6000 should use on the next
-+        reassociation with the specified AP
-+
-+Command Values
-+    enable
-+    = 0 (disable), 1 (enable)
-+    PKMID enabled/disabled
-+
-+Reset Values
-+    None defined
-+
-+Restrictions
-+    Only supported in infrastructure networks
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_PMKID_LIST_CMD
-+
-+Synopsis
-+    Configures the list of PMKIDs on the firmware.
-+
-+Command
-+    wmiconfig --setpmkidlist --numpmkid=<n> --pmkid=<pmkid_1>
-+    ... --pmkid=<pmkid_n>
-+
-+    Where n is the number of pmkids (maximum = 8) and pmkid_i is the ith pmkid (16
-+    bytes in hex format)
-+
-+Command Parameters
-+    {
-+        A_UINT8 pmkid[WMI_PMKID_LEN];
-+    } __ATTRIB_PACK WMI_PMKID;
-+
-+    {
-+        A_UINT32 numPMKID;
-+        WMI_PMKID pmkidList[WMI_MAX_PMKID_CACHE];
-+    } __ATTRIB_PACK WMI_SET_PMKID_LIST_CMD;
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    None
-+
-+Restrictions
-+    Supported only in infrastructure modes
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_POWER_MODE
-+
-+Synopsis
-+    The host uses this command to provide the AR6000 device with guidelines on the
-+    desired trade-off between power utilization and performance.
-+
-+        In normal power mode, the device enters a sleep state if they have nothing to do,
-+        which conserves power but may cost performance as it can take up to 2 ms to
-+        resume operation after leaving sleep state.
-+
-+        In maximum performance mode, the device never enters sleep state, thus no time
-+        is spent waking up, resulting in higher power consumption and better
-+        performance.
-+
-+Command
-+    TBD
-+
-+Command Parameters
-+    UINT8    powerMode
-+        WMI_POWER_MODE value
-+    {
-+        REC_POWER   = 1
-+            (Recommended setting) Tries to conserve
-+            power without sacrificing performance
-+        MAX_PERF_POWER    = 2
-+            Setting that maximizes performance at
-+            the expense of power
-+
-+            All other values are reserved
-+    } WMI_POWER_MODE
-+
-+Command Values
-+    See command parameters
-+
-+Reset Values
-+    powerMode is REC_POWER
-+
-+Restrictions
-+    This command should only be issued in the DISCONNECTED state for the
-+    infrastructure network.
-+
-+            For a PM-disabled ad hoc network, the power mode should remain in
-+            MAX_PERF_POWER.
-+
-+            For a PM-enabled ad hoc network, the device can have REC_POWER or
-+            MAX_PERF_POWER set, but either way it must follow the power save ad hoc
-+            protocol. The host can change power modes in the CONNECTED state.
-+
-+    Host changes to the PS setting when the STA is off the home channel take no effect
-+    and cause a TARGET_PM_FAIL event.
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_POWER_PARAMS
-+
-+Synopsis
-+    The host uses this command to configure power parameters
-+
-+Command
-+    wmiconfig eth1 --pmparams --it=<ms> --np=<number of PS POLL>
-+    --dp=<DTIM policy: ignore/normal/stick>
-+
-+Command Parameters
-+    UINT16    idle_period
-+        Length of time (in ms) the AR6000 device
-+        remains awake after frame Rx/Tx before going
-+        to SLEEP state
-+
-+    UINT16    pspoll_number
-+            The number of PowerSavePoll (PS-poll)
-+            messages the device should send before
-+            notifying the AP it is awake
-+
-+    UINT16    dtim_policy
-+            A WMI_POWER_PARAMS_CMD value
-+
-+    {
-+        IGNORE_DTIM    =1
-+            The device does not listen to any content after
-+            beacon (CAB) traffic
-+        NORMAL_DTIM    = 2
-+            DTIM period follows the listen interval (e.g., if
-+            the listen interval is 4 and the DTIM period is 2,
-+            the device wakes up every fourth beacon)
-+        STICK_DTIM    = 3
-+            Device attempt to receive all CAB traffic (e.g., if
-+            the DTIM period is 2 and the listen interval is 4,
-+            the device wakes up every second beacon)
-+    } WMI_POWER_PARAMS_CMD
-+
-+Command Parameters
-+    See command parameters
-+
-+Reset Values
-+    idle_period
-+        200 ms
-+
-+    pspoll_number
-+    = 1
-+
-+    dtim_policy
-+    = NORMAL_DTIM
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_POWERSAVE_PARAMS
-+
-+Synopsis
-+    Set the two AR6000 power save timers (PS-POLL timer and APSD trigger timer) and
-+    the two ASPD TIM policies
-+
-+Command
-+    wmiconfig eth1--psparams --psPollTimer=<psPollTimeout in ms>
-+    --triggerTimer=<triggerTimeout in ms> --apsdTimPolicy=<ignore/
-+    adhere> --simulatedAPSDTimPolicy=<ignore/adhere>
-+
-+Command Parameters
-+    typedef struct {
-+        A_UINT16    psPollTimeout;
-+            Timeout (in ms) after sending PS-POLL; the
-+            AR6000 device sleeps if it does not receive a
-+            data packet from the AP
-+
-+        A_UINT16    triggerTimeout;
-+            Timeout (in ms) after sending a trigger; the
-+            device sleeps if it does not receive any data
-+            or null frame from the AP
-+
-+        APSD_TIM_POLICY    apsdTimPolicy;
-+            TIM behavior with queue APSD enabled
-+
-+        APSD_TIM_POLICY    simulatedAPSD
-+
-+        TimPolicy;
-+            TIM behavior with simulated APSD
-+            enabled
-+
-+    typedef enum {
-+        IGNORE_TIM_ALL_QUEUES_APSD = 0,
-+        PROCESS_TIM_ALL_QUEUES_APSD = 1,
-+        IGNORE_TIM_SIMULATED_APSD = 2,
-+        POWERSAVE_TIMERS_POLICY = 3,
-+    } APSD_TIM_POLICY;
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    psPollTimeout is 50 ms; triggerTimeout is 10 ms;
-+    apsdTimPolicy = IGNORE_TIM_ALL_QUEUES_APSD;
-+    simulatedAPSDTimPolicy = POWERSAVE_TIMERS_POLICY
-+
-+Restrictions
-+    When this command is used, all parameters must be set; this command does not
-+    allow setting only one parameter.
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_PROBED_SSID
-+
-+Synopsis
-+    The host uses this command to provide a list of up to MAX_PROBED_SSID_INDEX
-+    (six) SSIDs that the AR6000 device should actively look for. It lists the active SSID
-+    table. By default, the device actively looks for only the SSID specified in the
-+    \93CONNECT_CMD\94 command, and only when the regulatory domain allows active
-+    probing. With this command, specified SSIDs are probed for, even if they are hidden.
-+
-+Command
-+    wmiconfig eth1 --ssid=<ssid> [--num=<index>]
-+
-+Command Parameters
-+    {
-+        A_UINT8    numSsids
-+            A number from 0 to
-+            MAX_PROBED_SSID_INDEX indicating
-+            the active SSID table entry index for this
-+            command (if the specified entry index
-+            already has an SSID, the SSID specified in
-+            this command replaces it)
-+
-+        WMI_PROBED_SSID_INFO    probedSSID[1]
-+    } WMI_PROBED_SSID_CMD
-+
-+    {
-+        A_UINT8    flag
-+            WMI_SSID_FLAG indicates the current
-+            entry in the active SSID table
-+        A_UINT8    ssidLength
-+            Length of the specified SSID in bytes.
-+            If = 0, the entry corresponding to the
-+            index is erased
-+        A_UINT8    ssid[32]
-+            SSID string actively probed for when
-+            permitted by the regulatory domain
-+    } WMI_PROBED_SSID_INFO
-+
-+Command Values
-+    WMI_SSID_FLAG
-+    {
-+         DISABLE_SSID_FLAG    = 0
-+            Disables entry
-+        SPECIFIC_SSID_FLAG    = 1
-+            Probes specified SSID
-+        ANY_SSID_FLAG    = 2
-+            Probes for any SSID
-+    } WMI_SSID_FLAG
-+
-+Reset Value
-+    The entries are unused.
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_REASSOC_MODE
-+
-+Synopsis
-+    Specify whether the disassociated frame should be sent or not upon reassociation.
-+
-+Command
-+    wmiconfig eth1 --setreassocmode <mode>
-+
-+Command Parameters
-+    UINT8    mode
-+
-+Command Values
-+    mode
-+        = 0x00
-+        Send disassoc to a previously connected AP
-+        upon reassociation
-+        = 0x01
-+        Do not send disassoc to previously connected
-+        AP upon reassociation
-+
-+Reset Values
-+    None defined
-+
-+Restrictions
-+    None
-+
-+
-+=====================================================================
-+
-+Name
-+    SET_RETRY_LIMITS
-+
-+Synopsis
-+    Allows the host to influence the number of times that the AR6000 device should
-+    attempt to send a frame before they give up.
-+
-+Command
-+    wmiconfig --setretrylimits <frameType> <trafficClass> <maxRetries>
-+    <enableNotify>
-+
-+Command Parameters
-+    {
-+        UINT8    frameType
-+            A WMI_FRAMETYPE specifying
-+            which type of frame is of interest.
-+        UINT8    trafficClass
-+            Specifies a traffic class (see
-+            \93CREATE_PSTREAM\94). This
-+            parameter is only significant when
-+            frameType = DATA_FRAMETYPE.
-+        UINT8    maxRetries
-+            Maximum number of times the
-+            device attempts to retry a frame Tx,
-+            ranging from WMI_MIN_RETRIES
-+            (2) to WMI_MAX_RETRIES (15). If
-+            the special value 0 is used,
-+            maxRetries is set to 15.
-+        A_UINT8    enableNotify
-+            Notify when enabled
-+    } WMI_RETRY_LIMIT_INFO
-+
-+    {
-+        A_UINT8    numEntries
-+        WMI_RETRY_LIMIT_INFO  retryLimitInfo[1]
-+    } WMI_SET_RETRY_LIMITS_CMD
-+
-+Command Values
-+    {
-+        MGMT_FRAMETYPE    = 0    Management frame
-+        CONTROL_FRAMETYPE = 1    Control frame
-+        DATA_FRAMETYPE    = 2    Data frame
-+    } WMI_FRAMETYPE
-+
-+Reset Values
-+    Retries are set to 15
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_ROAM_CTRL
-+
-+Synopsis
-+    Affects how the AR6000 device selects a BSS. The host uses this command to set and
-+    enable low RSSI scan parameters. The time period of low RSSI background scan is
-+    mentioned in scan period. Low RSSI scan is triggered when the current RSSI
-+    threshold (75% of current RSSI) is equal to or less than scan threshold.
-+
-+    Low RSSI roam is triggered when the current RSSI threshold falls below the roam
-+    threshold and roams to a better AP by the end of the scan cycle. During Low RSSI
-+    roam, if the STA finds a new AP with an RSSI greater than roam RSSI to floor, during
-+    scan, it roams immediately to it instead of waiting for the end of the scan cycle. See
-+    also \93Scan and Roam\94 on page C-1.
-+
-+Command
-+    wmiconfig --roam <roamctrl> <info>, where info is <scan period>
-+    <scan threshold> <roam threshold> <roam rssi floor>
-+
-+Command Parameters
-+    A_UINT8    roamCtrlType;
-+
-+Command Values
-+    WMI_FORCE_ROAM     = 1
-+    Roam to the specified BSSID
-+
-+    WMI_SET_ROAM_MODE  = 2
-+    Default, progd bias, no roam
-+
-+    WMI_SET_HOST_BIAS  = 3
-+    Set the host bias
-+
-+    WMI_SET_LOWRSSI_SCAN_PARAMS  = 4
-+    Info parameters
-+
-+    A_UINT8    bssid[ATH_MAC_LEN];
-+    WMI_FORCE_ROAM
-+
-+    A_UINT8    roamMode;
-+    WMI_SET_ROAM_MODE
-+
-+    A_UINT8    bssBiasInfo;
-+    WMI_SET_HOST_BIAS
-+
-+    A_UINT16    lowrssi_scan_period;
-+    WMI_SET_LOWRSSI_SCAN_PARAMS
-+
-+    A_INT16
-+    lowrssi_scan_threshold;
-+    WMI_SET_LOWRSSI_SCAN_PARAMS
-+
-+    A_INT16    lowrssi_roam_threshold;
-+    WMI_SET_LOWRSSI_SCAN_PARAMS
-+
-+    A_UINT8    roam_rssi_floor;
-+    WMI_SET_LOWRSSI_SCAN_PARAMS
-+
-+Reset Value
-+    None defined (default lowrssi scan is disabled. Enabled only when scan period is set.)
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_RTS
-+
-+Synopsis
-+    Decides when RTS should be sent.
-+
-+Command
-+    wmiconfig eth1 --setRTS <pkt length threshold>
-+
-+Command Parameters
-+    A_UINT16
-+    threshold;
-+    Command parameter threshold in bytes. An RTS is
-+    sent if the data length is more than this threshold.
-+    The default is to NOT send RTS.
-+
-+Command Values
-+    None
-+
-+Reset Value
-+    Not to send RTS.
-+
-+Restrictions
-+    None
-+
-+
-+=====================================================================
-+
-+Name
-+    SET_SCAN_PARAMS
-+
-+Synopsis
-+    The host uses this command to set the AR6000 scan parameters, including the duty
-+    cycle for both foreground and background scanning. Foreground scanning takes
-+    place when the AR6000 device is not connected, and discovers all available wireless
-+    networks to find the best BSS to join. Background scanning takes place when the
-+    device is already connected to a network and scans for potential roaming candidates
-+    and maintains them in order of best to worst. A second priority of background
-+    scanning is to find new wireless networks.
-+
-+    The device initiates a scan when necessary. For example, a foreground scan is always
-+    started on receipt of a \93CONNECT_CMD\94 command or when the device cannot find
-+    a BSS to connect to. Foreground scanning is disabled by default until receipt of a
-+    CONNECT command. Background scanning is enabled by default and occurs every
-+    60 seconds after the device is connected.
-+
-+    The device implements a binary backoff interval for foreground scanning when it
-+    enters the DISCONNECTED state after losing connectivity with an AP or when a
-+    CONNECT command is received. The first interval is ForegroundScanStartPeriod,
-+    which doubles after each scan until the interval reaches ForegroundScanEndPeriod.
-+    If the host terminates a connection with DISCONNECT, the foreground scan period
-+    is ForegroundScanEndPeriod. All scan intervals are measured from the time a full
-+    scan ends to the time the next full scan starts. The host starts a scan by issuing a
-+    \93START_SCAN\94 command. See also \93Scan and Roam\94 on page C-1.
-+
-+Command
-+    wmiconfig eth1 --scan --fgstart=<sec> --fgend=<sec> --bg=<sec> --
-+    act=<msec> --pas=<msec> --sr=<short scan ratio> --scanctrlflags
-+    <connScan> <scanConnected> <activeScan> <reportBSSINFO>
-+
-+Command Parameters
-+    UINT16    fgStartPeriod
-+        First interval used by the device when it
-+        disconnects from an AP or receives a
-+        CONNECT command, specified in seconds (0\96
-+        65535). If = 0, the device uses the reset value.
-+        If = 65535, the device disables foreground
-+        scanning.
-+
-+    UINT16    fgEndPeriod
-+        The maximum interval the device waits between
-+        foreground scans specified in seconds (from
-+        ForegroundScanStartPeriod to 65535). If = 0, the
-+        device uses the reset value.
-+
-+    UINT16    bgScanPeriod
-+        The period of background scan specified in
-+        seconds (0\9665535). By default, it is set to the reset
-+        value of 60 seconds. If 0 or 65535 is specified, the
-+        device disables background scanning.
-+
-+    UINT16    maxactChDwellTime
-+        The period of time the device stays on a
-+        particular channel while active scanning. It is
-+        specified in ms (10\9665535). If the special value of
-+        0 is specified, the device uses the reset value.
-+
-+    UINT16    PasChDwellTime
-+        The period of time the device remains on a
-+        particular channel while passive scanning. It is
-+        specified in ms (10\9665535). If the special value of
-+        0 is specified, the device uses the reset value.
-+
-+    UINT8    shortScanRatio
-+        Number of short scans to perform for each
-+        long scan.
-+
-+    UINT8    scanCtrlFlasgs
-+
-+    UINT16    minactChDwellTime
-+        Specified in ms
-+
-+    UINT32    maxDFSchActTime
-+        The maximum time a DFS channel can stay
-+        active before being marked passive, specified in
-+        ms.
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    ForegroundScanStart
-+Period
-+        1 sec
-+
-+    ForegroundScanEndPeriod
-+        60 sec
-+
-+    BackgroundScanPeriod
-+        60 sec
-+
-+    ActiveChannelDwellTime
-+        105 ms
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_TKIP_COUNTERMEASURES
-+
-+Synopsis
-+    The host issues this command to tell the target whether to enable or disable TKIP
-+    countermeasures.
-+
-+Command
-+    TBD
-+
-+Command Parameters
-+    UINT8    WMI_TKIP_CM_ENABLE
-+        Enables the countermeasures
-+
-+
-+    UINT8    TKIP_CM_DISABLE
-+        Disables the countermeasures
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    By default, TKIP MIC reporting is disabled
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_TX_PWR
-+
-+Synopsis
-+    The host uses this command to specify the Tx power level of the AR6000. Cannot be
-+    used to exceed the power limit permitted by the regulatory domain. The maximum
-+    output power is limited in the chip to 31.5 dBm; the range is 0 \96 31.5 dbm.
-+
-+Command
-+    wmiconfig --power <dbM>
-+
-+Command Parameters
-+    UINT8    dbM
-+        The desired Tx power specified in dbM.
-+        If = 0, the device chooses the maximum
-+        permitted by the regulatory domain.
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    The maximum permitted by the regulatory domain
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93GET_TX_PWR\94
-+
-+
-+=====================================================================
-+
-+Name
-+    SET_VOICE_PKT_SIZE
-+
-+Synopsis
-+    If an AP does not support WMM, it has no way to differentiate voice from data.
-+    Because the voice packet is typically small, packet in size less than voicePktSize are
-+    assumed to be voice, otherwise it is treated as data.
-+
-+Command
-+    wmiconfig eth1 --setVoicePktSize <size-in-bytes>
-+
-+Command Parameters
-+    UINT16    voicePktSize
-+        Packet size in octets
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    voicePktSize default is 400 bytes
-+
-+Restrictions
-+    No effect if WMM is unavailable
-+
-+
-+=====================================================================
-+
-+Name
-+    SET_WMM
-+
-+Synopsis
-+    Overrides the AR6000 device WMM capability
-+
-+Command
-+    wmiconfig eth1 --setwmm <enable>
-+
-+Command Parameters
-+    WMI_WMM_ENABLED
-+        Enables WMM
-+
-+    WMI_WMM_DISABLED
-+        Disables WMM support
-+
-+Command Values
-+    0 = disabled
-+    1 = enabled
-+
-+Reset Value
-+    WMM Disabled
-+
-+Restrictions
-+    None
-+
-+
-+=====================================================================
-+
-+Name
-+    SET_WMM_TXOP
-+
-+Synopsis
-+    Configures TxOP Bursting when sending traffic to a WMM capable AP
-+
-+Command
-+    wmiconfig eth1 --txopbursting <burstEnable>
-+
-+    <burstEnable>
-+        = 0
-+    Disallow TxOp bursting
-+
-+        = 1
-+    Allow TxOp bursting
-+
-+Command Parameters
-+    txopEnable
-+        = WMI_TXOP_DISABLED
-+        Disabled
-+
-+        = WMI_TXOP_ENABLED
-+        Enabled
-+
-+Command Values
-+    txopEnable
-+        = 0    Disabled
-+
-+        = 1    Enabled
-+
-+Reset Value
-+    Bursting is off by default
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_WOW_MODE
-+
-+Synopsis
-+    The host uses this command to enable or disable the WoW mode. When WoW mode
-+    is enabled and the host is asleep, pattern matching takes place at the target level.
-+    Only packets that match any of the pre-specified WoW filter patterns, will be passed
-+    up to the host. The host will also be woken up by the target. Packets which do not
-+    match any of the WoW patterns are discarded.
-+
-+Command
-+    wmiconfig \96setwowmode <enable/disable>
-+
-+Command Parameters
-+    A_BOOL    enable_wow
-+        Enable or disable WoW:
-+
-+Command Values
-+        = 0
-+    Disable WoW
-+
-+        = 1
-+    Enable WoW
-+
-+Reset Value
-+    None defined (default WoW mode is disabled).
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93GET_WOW_LIST\94
-+
-+
-+=====================================================================
-+
-+Name
-+    SET_WSC_STATUS
-+
-+Synopsis
-+    The supplicant uses this command to inform the target about the status of the WSC
-+    registration protocol. During the WSC registration protocol, a flag is set so the target
-+    bypasses some of the checks in the CSERV module. At the end of the registration, this
-+    flag is reset.
-+
-+Command
-+    N/A
-+
-+Command Parameters
-+    A_BOOL status
-+        = 1    WSC registration in progress
-+        = 0    WSC protocol not running
-+
-+Reply Parameters
-+    None
-+
-+Reset Value
-+    None defined (default = 0)
-+
-+Restrictions
-+    None
-+
-+
-+=====================================================================
-+
-+Name
-+    SNR_THRESHOLD_PARAMS
-+
-+Synopsis
-+    Configures how the AR6000 device monitors and reports SNR of the connected BSS,
-+    used as a link quality metric.
-+
-+Command
-+    --snrThreshold <weight> <upper_threshold_1> ...
-+    <upper_threshold_4> <lower_threshold_1> ... <lower_threshold_4>
-+    <pollTimer>
-+
-+Command Parameters
-+    <weight>
-+        Share with rssiThreshold. Range in [1, 16], used
-+        in the formula to calculate average RSSI
-+
-+    <upper_threshold_x>
-+        Above thresholds expressed in db, in ascending
-+        order
-+
-+    <lower_threshold_x>
-+        Below thresholds expressed in db, in ascending
-+        order
-+
-+    <pollTimer>
-+        The signal strength sampling frequency in
-+        seconds. If polltime = 0, signal strength
-+        sampling is disabled
-+
-+Command Values
-+    None
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    START_SCAN
-+
-+Synopsis
-+    The host uses this command to start a long or short channel scan. All future scans are
-+    relative to the time the AR6000 device processes this command. The device performs
-+    a channel scan on receipt of this command, even if a scan was already in progress.
-+    The host uses this command when it wishes to refresh its cached database of wireless
-+    networks. The isLegacy field will be removed (0 for now) because it is achieved by
-+    setting CONNECT_PROFILE_MATCH_DONE in the CONNECT command. See also
-+    \93Scan and Roam\94
-+
-+Command
-+    wmiconfig eth1 --startscan <scan type> <forcefgscan> 0
-+    <homeDwellTime> <forceScanInterval>
-+
-+Command Parameters
-+    UINT8    scanType
-+        WMI_SCAN_TYPE
-+
-+Command Values
-+    {
-+        WMI_LONG_SCAN    =0x0
-+            Requests a full scan
-+        WMI_SHORT_SCAN   =0x1
-+            Requests a short scan
-+    } WMI_SCAN_TYPE
-+
-+    A_BOOL    forceFgScan
-+        forceFgScan
-+        = 0
-+        Disable the foreground scan
-+
-+        forceFgScan
-+        = 1
-+        Forces a foreground scan
-+
-+    A_UINT32    homeDwellTime
-+        Maximum duration in the home
-+        channel (in ms)
-+
-+    A_UINT32     forceScanInterval
-+        Time interval between scans (in ms)
-+
-+    A_UINT32     scanType
-+        WMI_SCAN_TYPE
-+
-+Reset Value
-+    Disable forcing foreground scan
-+
-+Restrictions
-+    isLegacy field will no longer be supported (pass as 0 for now)
-+
-+
-+=====================================================================
-+
-+Name
-+    SYNCHRONIZE
-+
-+Synopsis
-+    The host uses this command to force a synchronization point between the command
-+    and data paths
-+
-+Command
-+    TBD
-+
-+Command Parameters
-+    None
-+
-+
-+
-+Command Values
-+    None
-+
-+
-+
-+Reset Values
-+    None
-+
-+
-+
-+Restrictions
-+    None
-+
-+
-+=====================================================================
-+
-+Name
-+    TARGET_ERROR_REPORT_BITMASK
-+
-+Synopsis
-+    Allows the host to control \93ERROR_REPORT\94 events from the AR6000 device.
-+
-+        If error reporting is disabled for an error type, a count of errors of that type is
-+        maintained by the device.
-+
-+        If error reporting is enabled for an error type, an \93ERROR_REPORT\94 event is
-+        sent when an error occurs and the error report bit is cleared.
-+
-+    Error counts for each error type are available through the \93GET_TARGET_STATS\94
-+    command.
-+
-+Command
-+    wmiconfig eth1 --setErrorReportingBitmask
-+
-+Command Parameters
-+    UINT32    bitmask
-+        Represents the set of
-+        WMI_TARGET_ERROR_VAL error types
-+        enabled for reporting
-+
-+Command Values
-+    {
-+        WMI_TARGET_PM_ERR_FAIL    = 0x00000001
-+            Power save fails (only two cases):
-+               Retry out of null function/QoS null
-+               function to associated AP for PS
-+               indication'
-+               Host changes the PS setting when
-+               STA is off home channel
-+
-+        WMI_TARGET_KEY_NOT_FOUND    = 0x00000002
-+            No cipher key
-+        WMI_TARGET_DECRYPTION_ERR   = 0x00000004
-+            Decryption error
-+        WMI_TARGET_BMISS            = 0x00000008
-+            Beacon miss
-+        WMI_PSDISABLE_NODE_JOIN     = 0x00000010
-+            A non-PS-enabled STA joined the
-+            PS-enabled network
-+        WMI_TARGET_COM_ERR          = 0x00000020
-+            Host/target communication error
-+        WMI_TARGET_FATAL_ERR        = 0x00000040
-+            Fatal error
-+    } WMI_TARGET_ERROR_VAL
-+
-+Reset Values
-+    Bitmask is 0, and all error reporting is disabled
-+
-+Restrictions
-+    None
-+
-+
-+=====================================================================
-+WMI Events
-+
-+Event
-+    Description
-+    Page
-+
-+
-+BSSINFO
-+    Contains information describing BSSs collected during a scan
-+
-+CAC_EVENTID
-+    Indicates signalling events in admission control
-+
-+CMDERROR
-+    The AR6000 device encounters an error while attempting to process
-+    a command
-+
-+CONNECT
-+    The device has connected to a wireless network
-+
-+DISCONNECT
-+    The device lost connectivity with a wireless network
-+
-+ERROR_REPORT
-+    An error has occurred for which the host previously requested
-+    notification with the command
-+    \93TARGET_ERROR_REPORT_BITMASK\94
-+
-+EXTENSION
-+    WMI extension event
-+
-+GET_PMKID_LIST_EVENT
-+    Created in response to a \93GET_PMKID_LIST_CMD\94 command
-+
-+GET_WOW_LIST_EVENT
-+    Response to the wmiconfig \93GET_WOW_LIST\94 command to
-+    retrieve the configured WoW patterns
-+
-+NEIGHBOR_REPORT
-+    Neighbor APs that match the current profile were detected
-+
-+OPT_RX_FRAME_EVENT
-+    (Special feature) informs the host of the reception of a special frame
-+
-+PSTREAM_TIMEOUT
-+    A prioritized stream has been idle for a specified interval
-+
-+READY
-+    The AR6000 device is ready to accept commands
-+
-+REGDOMAIN
-+    The regulatory domain has changed
-+
-+REPORT_ROAM_DATA_EVENT
-+    Reports the roam time calculations made by the device
-+    (generated with a special build)
-+    \97
-+
-+REPORT_STATISTICS
-+    Reply to a \93GET_TARGET_STATS\94 command
-+
-+ROAM_TBL_EVENT
-+    Reports the roam table
-+
-+RSSI_THRESHOLD
-+    Signal strength from the connected AP has crossed the threshold
-+    defined in the \93RSSI_THRESHOLD_PARAMS\94 command
-+
-+SCAN_COMPLETE_EVENT
-+    A scan has completed (added status SCAN_ABORTED in release 2.0)
-+
-+TEST_EVENT
-+    Event generated by the TCMD
-+
-+TKIP_MICERROR
-+    TKIP MIC errors were detected
-+
-+=====================================================================
-+
-+Name
-+    BSSINFO
-+
-+Synopsis
-+    Contains information describing one or more BSSs as collected during a scan.
-+    Information includes the BSSID, SSID, RSSI, network type, channel, supported rates,
-+    and IEs. BSSINFO events are sent only after the device receives a beacon or probe-
-+    response frame that pass the filter specified in the \93SET_BSS_FILTER\94 command.
-+    BSSINFO events consist of a small header followed by a copy of the beacon or probe
-+    response frame. The 802.11 header is not present. For formats of beacon and probe-
-+    response frames please consult the IEEE 802.11 specification.
-+
-+    The beacons or probe responses containing the IE specified by the
-+    WMI_BSS_FILTER_CMD are passed to the host through the
-+    WMI_BSSINFO_EVENT. The event carries a 32-bit bitmask that indicates the IEs that
-+    were detected in the management frame. The frame type field has been extended to
-+    indicate action management frames. This would be helpful to route these frames
-+    through the same event mechanism as used by the beacon processing function.
-+
-+    If the bssFilter in the SET_BSS_FILTER matches, then the ieMask is not relevant
-+    because the BSSINFO event is sent to the host. If the bssFilter doesnot match in the
-+    beacons/probe respones, then the ieMask match dictates whether the BSSINFO
-+    event is sent to the host. In the case of action management frames, the ieMask is the
-+    filter that is applied.
-+
-+Event ID
-+    0x1004
-+
-+Event Parameters
-+    typedef struct {
-+        A_UINT16    channel;
-+            Specifies the frequency (in MHz) where the
-+            frame was received
-+        A_UINT8    frameType;
-+            A WMI_BI_FTYPE value
-+        A_UINT8    snr;
-+        A_INT16    rssi;
-+            Indicates signal strength
-+        A_UINT8    bssid[ATH_MAC_LEN];
-+        A_UINT32    ieMask;
-+    } _ATTRIB_PACK_WMI_BSS_INFO_HDR;
-+
-+    Beacon or Probe Response Frame
-+
-+Event Values
-+    {
-+        BEACON_FTYPE    = 0x1
-+            Indicates a beacon frame
-+        PROBERESP_FTYPE
-+            Indicates a probe response frame
-+        ACTION_MGMT_FTYPE
-+     } WMI_BI_FTYPE
-+
-+=====================================================================
-+
-+Name
-+    CAC_EVENTID
-+
-+Synopsis
-+    Indicates signalling events in admission control. Events are generated when
-+    admission is accepted, rejected, or deleted by either the host or the AP. If the AP does
-+    not respond to an admission request within a timeout of 500 ms, an event is
-+    generated to the host.
-+
-+Event ID
-+    0x1011
-+
-+Event Parameters
-+    UINT8
-+    ac
-+    Access class pertaining to the
-+signalling
-+
-+    UINT8    cac_indication
-+        Type of indication; indications are
-+        listed in WMI_CAC_INDICATION
-+
-+    UINT8    statusCode
-+        AP response status code for a
-+        request
-+
-+    UINT8    tspecSuggestion[63]
-+        Suggested TSPEC from AP
-+
-+Event Values
-+    {
-+        CAC_INDICATION_ADMISSION = 0x00
-+        CAC_INDICATION_ADMISSION_RESP    = 0x01
-+        CAC_INDICATION_DELETE    = 0x02
-+        CAC_INDICATION_NO_RESP   = 0x03
-+    } WMI_CAC_INDICATION
-+
-+
-+=====================================================================
-+
-+
-+Name
-+    CMDERROR
-+
-+Synopsis
-+    Indicates that the AR6000 device encountered an error while attempting to process a
-+    command. This error is fatal and indicates that the device requires a reset.
-+
-+Event ID
-+    0x1005
-+
-+Event Parameters
-+    UINT16    commandId
-+        Corresponds to the command which generated
-+        the error
-+    UINT8    errorCode
-+        A WMI_ERROR_CODE value
-+
-+Event Values
-+    {
-+        INVALID_PARAM    = 1
-+            Invalid parameter
-+        ILLEGAL_STATE    = 2
-+            Illegal state
-+        INTERNAL_ERROR   = 3
-+            Internal Error
-+        All other values reserved
-+    } WMI_ERROR_CODE
-+
-+
-+=====================================================================
-+
-+
-+Name
-+    CONNECT
-+
-+Synopsis
-+    Signals that the AR6000 connected to a wireless network. Connection occurs due to a
-+    \93CONNECT\94 command or roaming to a new AP. For infrastructure networks, shows
-+    that the AR6000 successfully performed 802.11 authentication and AP association.
-+
-+Event ID
-+    0x1002
-+
-+Event Parameters
-+    UINT16    channel
-+        Channel frequency (in MHz) of the network the
-+        AR6000 are connected to
-+
-+    UINT8    bssid[6]
-+        MAC address of the AP the AR6000 are
-+        connected to or the BSSID of the ad hoc
-+        network
-+
-+    UINT16    listenInterval
-+        Listen interval (in Kms) that the AR6000 are
-+        using
-+
-+    UINT 8    beaconIeLen
-+        Length (in bytes) of the beacon IEs
-+
-+    UINT8    assocInfo
-+        Pointer to an array containing beacon IEs,
-+        followed first by association request IEs then by
-+        association response IEs
-+
-+    UINT8    assocReqLen
-+        Length (in bytes) of the assocReqIEs array
-+
-+    UINT8    assocRespLen
-+        Length (in bytes) of the assocRespIEs array
-+
-+Event Values
-+    None defined
-+
-+=====================================================================
-+
-+
-+Name
-+    DISCONNECT
-+
-+Synopsis
-+    Signals that the AR6000 device lost connectivity with the wireless network.
-+    DISCONENCT is generated when the device fails to complete a \93CONNECT\94
-+    command or as a result of a transition from a connected state to disconnected state.
-+
-+    After sending the \93DISCONNECT\94 event the device continually tries to re-establish
-+    a connection. A LOST_LINK occurs when STA cannot receive beacons within the
-+    specified time for the SET_BMISS_TIME command.
-+
-+Event ID
-+    0x1003
-+
-+Event Parameters
-+    UINT8    disconnect
-+        Reason
-+        A WMI_DISCONNECT_REASON value
-+
-+    UINT8    bssid[6]
-+        Indicates which BSS the device was connected to
-+
-+    UINT8    assocRespLen
-+        Length of the 802.11 association response frame
-+        that triggered this event, or 0 if not applicable
-+
-+    UINT8    assocInfo[assocRespLen]
-+        Copy of the 802.11 association response frame
-+
-+Event Values
-+    {
-+        NO_NETWORK_AVAIL    =0x01
-+            Indicates that the device was unable to
-+            establish or find the desired network
-+        LOST_LINK    =0x02
-+            Indicates the devices is no longer receiving
-+            beacons from the BSS it was previously
-+            connected to
-+
-+        DISCONNECT_CMD  =0x03
-+            Indicates a \93DISCONNECT\94 command was
-+            processed
-+        BSS_DISCONNECTED =0x04
-+            Indicates the BSS explicitly disconnected the
-+            device. Possible mechanisms include the AP
-+            sending 802.11 management frames
-+            (e.g., disassociate or deauthentication
-+            messages).
-+        AUTH_FAILED    =0x05
-+            Indicates that the device failed 802.11
-+            authentication with the BSS
-+        ASSOC_FAILED    =0x06
-+            Indicates that the device failed 802.11
-+            association with the BSS
-+        NO_RESOURCES_AVAIL    =0x07
-+            Indicates that a connection failed because the
-+            AP had insufficient resources to complete the
-+            connection
-+        CSERV_DISCONNECT    =0x08
-+            Indicates that the device\92s connection services
-+            module decided to disconnect from a BSS,
-+            which can happen for a variety of reasons (e.g.,
-+            the host marks the current connected AP as a
-+            bad AP).
-+        INVALID_PROFILE    =0x0A
-+            Indicates that an attempt was made to
-+            reconnect to a BSS that no longer matches the
-+            current profile
-+        All other values are reserved
-+    } WMI_DISCONNECT_REASON
-+
-+
-+=====================================================================
-+
-+
-+Name
-+    ERROR_REPORT
-+
-+Synopsis
-+    Signals that a type of error has occurred for which the host previously requested
-+    notification through the \93TARGET_ERROR_REPORT_BITMASK\94 command.
-+
-+Event ID
-+    0x100D
-+
-+Event Parameters
-+    UINT32    errorVal
-+            WMI_TARGET_ERROR_VAL value. See
-+            \93TARGET_ERROR_REPORT_BITMASK\94.
-+
-+Event Values
-+    errorVal
-+    = 0x00000001
-+    Power save fails
-+
-+        = 0x00000002
-+    No cipher key
-+
-+        = 0x00000004
-+    Decryption error
-+
-+        = 0x00000008
-+    Beacon miss
-+
-+        = 0x00000010
-+    A non-power save disabled node has joined
-+    the PS-enabled network
-+
-+
-+=====================================================================
-+
-+
-+Name
-+    EXTENSION
-+
-+Synopsis
-+    The WMI is used mostly for wireless control messages to a wireless module that
-+    apply to wireless module management regardless of the target platform
-+    implementation. However, some events peripherally related to wireless management
-+    are desired during operation. These wireless extension events may be platform-
-+    specific or implementation-dependent. See \93WMI Extension Commands\94
-+
-+
-+Event ID
-+    0x1010
-+
-+
-+=====================================================================
-+
-+
-+Name
-+    GET_PMKID_LIST_EVENT
-+
-+Synopsis
-+    Generated by firmware in response to a \93GET_PMKID_LIST_CMD\94 command.
-+
-+Event Parameters
-+    typedef struct {
-+        A_UINT32    numPMKID;
-+            Contains the number of PMKIDs in the reply
-+        WMI_PMKID   pmkidList[1];
-+    } __ATTRIB_PACK WMI_PMKID_LIST_REPLY;
-+
-+Event Values
-+    None
-+
-+
-+=====================================================================
-+
-+
-+Name
-+    GET_WOW_LIST_EVENT
-+
-+Synopsis
-+    Response to the wmiconfig \96getwowlist command to retrieve the configured Wake on
-+    Wireless patterns
-+
-+Event ID
-+    0x10018
-+
-+Event Parameters
-+    {
-+
-+    A_UINT8    num_filters
-+        Total number of patterns in the list
-+    A_UINT8    this_filter_num
-+        The filter number
-+    A_UINT8    wow_mode
-+        Shows whether WoW is enabled or disabled
-+    A_UINT8    host_mode
-+        Shows whether the host is asleep or awake
-+    WOW_FILTER    wow_filters[1]
-+        List of WoW filters (pattern and mask data bytes)
-+    } WMI_GET_WOW_LIST_REPLY;
-+
-+    {
-+        Each wow_filter_list element shows:
-+    A_UINT8    wow_valid_filter
-+        Whether the filter is valid
-+    A_UINT8    wow_filter_list_id
-+        Filter List ID (23 = default)
-+    A_UINT8    wow_filter_size
-+        Size in bytes of the filter
-+    A_UINT8    wow_filter_offset
-+        Offset of the pattern to search in the data packet
-+    A_UINT8    wow_filter_mask[MASK_SIZE]
-+        The mask to be applied to the pattern
-+    A_UINT8    wow_filter_pattern[WOW_PATTERN_SIZE]
-+        The pattern that to match to wake up the host
-+    } WOW_FILTER
-+
-+Event Values
-+    None
-+
-+=====================================================================
-+
-+
-+
-+Name
-+    NEIGHBOR_REPORT
-+
-+Synopsis
-+    Indicates the existence of neighbor APs that match the current profile. The host uses
-+    this event to populate the PMKID cache on the AR6000 and/or to perform
-+    preauthentication. This event is only generated in infrastructure mode.
-+
-+    A total of numberOfAps pairs of bssid/bssFlags exist, one pair for each AP.
-+
-+Event ID
-+    0x1008
-+
-+Event Parameters
-+    UINT8    numberOfAps
-+        The number of APs reported about in
-+        this event
-+    {
-+        UINT8    bssid[6]
-+            MAC address of a neighbor AP
-+        UINT8    bssFlags
-+            A WMI_BSS_FLAGS value
-+    }[numberOfAps]
-+
-+
-+Event Values
-+    {
-+        WMI_DEFAULT_BSS_FLAGS    = 0
-+            Logical OR of 1 or more
-+        WMI_BSS_FLAGS
-+        WMI_PREAUTH_CAPABLE_BSS
-+            = 1
-+            Indicates that this AP is capable of
-+            preauthentication
-+        WMI_PMKID_VALID_BSS
-+            = 2
-+            Indicates that the AR6000 have a
-+            valid pairwise master key for this AP
-+    } WMI_BSS_FLAGS
-+
-+
-+=====================================================================
-+
-+
-+
-+Name
-+    OPT_RX_FRAME_EVENT
-+
-+Synopsis
-+    Special feature, informs host of the reception of a special frame.
-+
-+Event ID
-+    0x100E
-+
-+Event Parameters
-+    {
-+        A_UINT16    channel;
-+        A_UINT8    frameType;
-+        A_INT8    snr;
-+        A_UINT8    srcAddr[ATH_MAC_LEN];
-+        A_UINT8    bssid[ATH_MAC_LEN];
-+        }WMI_OPT_RX_INFO_HDR
-+
-+Event Values
-+    None
-+
-+=====================================================================
-+
-+
-+
-+Name
-+    PSTREAM_TIMEOUT
-+
-+Synopsis
-+    Indicates that a priority stream that got created as a result of priority-marked data
-+    flow (priority marked in IP TOS) being idle for the default inactivity interval period
-+    (specified in the \93CREATE_PSTREAM\94 command) used for priority streams created
-+    implicitly by the driver. This event is not indicated for user-created priority streams.
-+    User-created priority streams exist until the users delete them explicitly. They do not
-+    timeout due to data inactivity.
-+
-+Event ID
-+    0x1007
-+
-+Event Parameters
-+    A_UINT8
-+    trafficClass
-+    Indicated the traffic class of priority
-+    stream that timed out
-+
-+Event Values
-+    {
-+        WMM_AC_BE    = 0
-+            Best effort
-+        WMM_AC_BK    = 1
-+            Background
-+        WMM_AC_VI    = 2
-+            Video
-+        WMM_AC_VO     = 3
-+            Voice
-+    } TRAFFIC CLASS
-+
-+
-+=====================================================================
-+
-+Name
-+    READY
-+
-+Synopsis
-+    Indicates that the AR6000 device is prepared to accept commands. It is sent once after
-+    power on or reset. It also indicates the MAC address of the device.
-+
-+Event ID
-+    0x1001
-+
-+Event Parameters
-+    UINT8    macAddr[6]
-+        Device MAC address
-+    UINT8    phyCapability
-+        A WMI_PHY_CAPABILITY value. Indicates the
-+        capabilities of the device wireless module\92s radio
-+
-+Event Values
-+    {
-+        WMI_11A_CAPABILITY       = 1
-+        WMI_11G_CAPABILITY       = 2
-+        WMI_11AG_CAPABILITY      = 3
-+    } WMI_PHY_CAPABILITY
-+
-+
-+=====================================================================
-+
-+Name
-+    REGDOMAIN
-+
-+Synopsis
-+    Indicates that the regulatory domain has changed. It initially occurs when the
-+    AR6000 device reads the board data information. The regulatory domain can also
-+    change when the device is a world-mode SKU. In this case, the regulatory domain is
-+    based on the country advertised by APs per the IEEE 802.11d specification. A
-+    potential side effect of a regulatory domain change is a change in the list of available
-+    channels. Any channel restrictions that exist as a result of a previous
-+    \93SET_CHANNEL_PARAMETERS\94 command are lifted.
-+
-+Event ID
-+    0x1006
-+
-+Event Parameters
-+    UINT32    regDomain
-+        The range of 0x0000 \96 0x00FF
-+        corresponds to an ISO country code.
-+
-+    Other regCodes are reserved for world
-+    mode settings and specific regulatory
-+    domains.
-+
-+Event Values
-+    None
-+
-+
-+=====================================================================
-+
-+
-+
-+Name
-+    REPORT_STATISTICS
-+
-+Synopsis
-+    A reply to a \93GET_TARGET_STATS\94 command.
-+
-+Event ID
-+    0x100B
-+
-+Event Parameters
-+    When the statistics are sent to the host, the AR6001 clear them so that a new set of
-+    statistics are collected for the next report.
-+
-+    UINT32    tx_packets
-+    UINT32    tx_bytes
-+    UINT32    tx_unicast_pkts
-+    UINT32    tx_unicast_bytes
-+    UINT32    tx_multicast_pkts
-+    UINT32    tx_multicast_bytes
-+    UINT32    tx_broadcast_pkts
-+    UINT32    tx_broadcast_bytes
-+    UINT32    tx_rts_success_cnt
-+    UINT32    tx_packet_per_ac[4]
-+        Tx packets per AC: [0] = BE, [1] = BK,
-+        [2] = VI, [3] = VO
-+    UINT32    tx_errors
-+        Number of packets which failed Tx, due
-+        to all failures
-+    ... REPORT_STATISTICS, continued
-+    UINT32    tx_failed_cnt
-+        Number of data packets that failed Tx
-+    UINT32    tx_retry_cnt
-+        Number of Tx retries for all packets
-+    UINT32    tx_rts_fail_cnt
-+        Number of RTS Tx failed count
-+    UINT32    rx_packets
-+    UINT32    rx_bytes
-+    UINT32    rx_unicast_pkts
-+    UINT32    rx_unicast_bytes
-+    UINT32    rx_multicast_pkts
-+    UINT32    rx_multicast_bytes
-+    UINT32    rx_broadcast_pkts
-+    UINT32    rx_broadcast_bytes
-+    UINT32    rx_fragment_pkt
-+        Number of fragmented packets received
-+    UINT32    rx_errors
-+        Number of Rx errors due to all failures
-+    UINT32    rx_crcerr
-+        Number of Rx errors due to CRC errors
-+    UINT32    rx_key_cache_miss
-+        Number of Rx errors due to a key not
-+        being plumbed
-+    UINT32    rx_decrypt_err
-+        Number of Rx errors due to decryption
-+        failure
-+    UINT32    rx_duplicate_frames
-+        Number of duplicate frames received
-+    UINT32    tkip_local_mic_failure
-+        Number of TKIP MIC errors detected
-+    UINT32    tkip_counter_measures_invoked
-+        Number of times TKIP countermeasures
-+        were invoked
-+    UINT32    tkip_replays
-+        Number of frames that replayed a TKIP
-+        encrypted frame received earlier
-+    UINT32    tkip_format_errors
-+        Number of frames that did not conform
-+        to the TKIP frame format
-+    UINT32    ccmp_format_errors
-+        Number of frames that did not conform
-+        to the CCMP frame format
-+    UINT32    ccmp_replays
-+        Number of frames that replayed a CCMP
-+        encrypted frame received earlier
-+    UINT32    power_save_failure_cnt
-+        Number of failures that occurred when
-+        the AR6001 could not go to sleep
-+    UINT32    cs_bmiss_cnt
-+        Number of BMISS interrupts since
-+    connection
-+    UINT32    cs_lowRssi_cnt
-+        Number of the times the RSSI went below
-+        the low RSSI threshold
-+    UINT16    cs_connect_cnt
-+        Number of connection times
-+    UINT16    cs_disconnect_cnt
-+        Number of disconnection times
-+    UINT8    cs_aveBeacon_rssi
-+        The current averaged value of the RSSI
-+        from the beacons of the connected BSS
-+    UINT8    cs_lastRoam_msec
-+        Time that the last roaming took, in ms.
-+        This time is the difference between
-+        roaming start and actual connection.
-+
-+Event Values
-+    None defined
-+
-+
-+=====================================================================
-+
-+Name
-+    ROAM_TBL_EVENT
-+
-+Synopsis
-+    Reports the roam table, which contains the current roam mode and this information
-+    for every BSS:
-+
-+Event ID
-+    0x100F
-+
-+Event Parameters
-+    A_UINT8     bssid[ATH_MAC_LEN];
-+        BSSID
-+    A_UINT8     rssi
-+        Averaged RSSI
-+    A_UINT8     rssidt
-+        Change in RSSI
-+    A_UINT8     last_rssi
-+        Last recorded RSSI
-+    A_UINT8     roam_util
-+        Utility value used in roaming decision
-+    A_UINT8     util
-+        Base utility with the BSS
-+    A_UINT8     bias
-+        Host configured for this BSS
-+
-+Event Values
-+    roamMode
-+        Current roam mode
-+
-+        = 1
-+    RSSI based roam
-+
-+        = 2
-+    Host bias-based roam
-+
-+        = 3
-+    Lock to the current BSS
-+
-+        = 4
-+    Autonomous roaming disabled
-+
-+
-+=====================================================================
-+
-+Name
-+    RSSI_THRESHOLD
-+
-+Synopsis
-+    Alerts the host that the signal strength from the connected AP has crossed a
-+    interesting threshold as defined in a previous \93RSSI_THRESHOLD_PARAMS\94
-+    command.
-+
-+Event ID
-+    0x100C
-+
-+Event Parameters
-+    UINT8    range
-+        A WMI_RSSI_THRESHOLD_VAL
-+        value, which indicates the range of
-+        the average signal strength
-+
-+Event Values
-+    {
-+        WMI_RSSI_LOWTHRESHOLD_BELOW_LOWERVAL  = 1
-+        WMI_RSSI_LOWTHRESHOLD_LOWERVAL        = 2
-+        WMI_RSSI_LOWTHRESHOLD_UPPERVAL        = 3
-+        WMI_RSSI_HIGHTHRESHOLD_LOWERVAL       = 4
-+        WMI_RSSI_HIGHTHRESHOLD_HIGHERVAL      = 5
-+    } WMI_RSSI_THRESHOLD_VAL
-+
-+
-+=====================================================================
-+
-+Name
-+    SCAN_COMPLETE_EVENT
-+
-+Synopsis
-+    Indicates the scan status. if the Scan was not completed, this event is generated with
-+    the status A_ECANCELED.
-+
-+Event ID
-+    0x100A
-+
-+Event Parameters
-+    A_UINT8    scanStatus
-+
-+Event Values
-+    {
-+        #define     SCAN_ABORTED 16
-+        #define     SCAN_COMPLETED 0
-+        A_UINT8     scanStatus
-+            A_OK or A_ECANCELED
-+    } WMI_SCAN_COMPLETE_EVENT;
-+
-+
-+=====================================================================
-+
-+Name
-+    TEST_EVENT
-+
-+Synopsis
-+    The TCMD application uses a single WMI event (WMI_TEST_EVENTID) to
-+    communicate events from target to host. The events are parsed by the TCMD
-+    application and WMI layer is oblivious of it.
-+
-+Event ID
-+    0x1016
-+
-+Event Parameters
-+    WMI_TEST_EVENTID
-+
-+
-+Event Values
-+    None
-+
-+
-+=====================================================================
-+
-+
-+
-+Name
-+    TKIP_MICERR
-+
-+Synopsis
-+    Indicates that TKIP MIC errors were detected.
-+
-+Event ID
-+    0x1009
-+
-+Event Parameters
-+    UINT8    keyid
-+        Indicates the TKIP key ID
-+
-+    UINT8    ismcast
-+        0 = Unicast
-+        1 = Multicast
-+
-+Event Values
-+    See event parameters
-+
-+=====================================================================
-+
-+WMI Extension Commands
-+
-+The WMI EXTENSION command is used to multiplex a collection of
-+commands that:
-+
-+        Are not generic wireless commands
-+        May be implementation-specific
-+        May be target platform-specific
-+        May be optional for a host implementation
-+
-+    An extension command is sent to the AR6000 targets like any other WMI
-+command message and uses the WMI_EXTENSION. The first field of the
-+payload for this EXTENSION command is another commandId, sometimes
-+called the subcommandId, which indicates which extension command is
-+being used. A subcommandId-specific payload follows the subcommandId.
-+
-+All extensions (subcommandIds) are listed in the header file include/wmix.h.
-+See also \93WMI Extension Events\94 on page B-58.
-+
-+
-+WMI Extension Commands
-+
-+
-+GPIO_INPUT_GET
-+    Read GPIO pins configured for input
-+
-+GPIO_INTR_ACK
-+    Acknowledge and re-arm GPIO interrupts reported earlier
-+
-+GPIO_OUTPUT_SET
-+    Manage output on GPIO pins configured for output
-+
-+GPIO_REGISTER_GET
-+    Read an arbitrary GPIO register
-+
-+GPIO_REGISTER_SET
-+    Dynamically change GPIO configuration
-+
-+SET_LQTHRESHOLD
-+    Set link quality thresholds; the sampling happens at every unicast
-+    data frame Tx, if certain thresholds are met, and corresponding
-+    events are sent to the host
-+
-+
-+=====================================================================
-+
-+Name
-+    GPIO_INPUT_GET
-+
-+Synopsis
-+    Allows the host to read GPIO pins that are configured for input. The values read are
-+    returned through a \93GPIO_DATA\94 extension event.
-+
-+NOTE: Support for GPIO is optional.
-+
-+Command
-+    N/A
-+
-+Command Parameters
-+    None
-+
-+
-+
-+Reply Parameters
-+    None
-+
-+
-+Reset Value
-+    None
-+
-+
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    GPIO_INTR_ACK
-+
-+Synopsis
-+    The host uses this command to acknowledge and to re-arm GPIO interrupts reported
-+    through an earlier \93GPIO_INTR\94 extension event. A single \93GPIO_INTR_ACK\94
-+    command should be used to acknowledge all GPIO interrupts that the host knows to
-+    be outstanding (if pending interrupts are not acknowledged through
-+    \93GPIO_INTR_ACK\94, another \93GPIO_INTR\94 extension event is raised).
-+
-+NOTE: Support for GPIO is optional.
-+
-+Command
-+    N/A
-+
-+Command Parameters
-+    UINT32    ack_mask
-+        A mask of interrupting GPIO pins (e.g., ack_mask
-+        bit [3] acknowledges an interrupt from the pin GPIO3).
-+
-+Command Values
-+    None
-+
-+Reset Value
-+    None
-+
-+Restrictions
-+    The host should acknowledge only interrupts about which it was notified.
-+
-+
-+=====================================================================
-+
-+Name
-+    GPIO_OUTPUT_SET
-+
-+Synopsis
-+    Manages output on GPIO pins configured for output.
-+
-+    Conflicts between set_mask and clear_mask or enable_mask and disable_mask result
-+    in undefined behavior.
-+
-+NOTE: Support for GPIO is optional.
-+
-+Command
-+    N/A
-+
-+Command Parameters
-+    UINT32    set_mask
-+        Specifies which pins should drive a 1 out
-+    UINT32    clear_mask
-+        Specifies which pins should drive a 0 out
-+    UINT32    enable_mask
-+        Specifies which pins should be enabled for output
-+    UINT32    disable_mask
-+        Specifies which pins should be disabled for output
-+
-+Command Values
-+    None
-+
-+
-+Reset Value
-+    None
-+
-+
-+Restrictions
-+    None
-+
-+
-+
-+=====================================================================
-+
-+
-+Name
-+    GPIO_REGISTER_GET
-+
-+Synopsis
-+    Allows the host to read an arbitrary GPIO register. It is intended for use during
-+    bringup/debug. The target responds to this command with a \93GPIO_DATA\94 event.
-+
-+NOTE: Support for GPIO is optional.
-+
-+Command
-+    N/A
-+
-+Command Parameters
-+    UINT32
-+    gpioreg_id
-+    Specifies a GPIO register identifier, as defined
-+in include/AR6000/AR6000_gpio.h
-+
-+Reply Parameters
-+    None
-+
-+Reset Value
-+    N/A
-+
-+Restrictions
-+    None
-+
-+
-+=====================================================================
-+
-+Name
-+    GPIO_REGISTER_SET
-+
-+Synopsis
-+    Allows the host to dynamically change GPIO configuration (usually handled
-+    statically through the GPIO configuration DataSet).
-+
-+NOTE: Support for GPIO is optional.
-+
-+Command
-+    N/A
-+
-+Command Parameters
-+    UINT32    gpioreg_id
-+        Specifies a GPIO register identifier, as defined in
-+        include/AR6000/AR6000_gpio.h
-+    UINT32    value
-+        Specifies a value to write to the specified
-+        GPIO register
-+
-+Command Values
-+    None
-+
-+
-+Reset Value
-+    Initial hardware configuration is as defined in the AR6001 or AR6002 ROCmTM
-+    Single-Chip MAC/BB/Radio for 2.4/5 GHz Embedded WLAN Applications data sheet. This
-+    configuration is modified by the GPIO Configuration DataSet, if one exists.
-+
-+Restrictions
-+    None
-+
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_LQTHRESHOLD
-+
-+Synopsis
-+    Set link quality thresholds, the sampling happens at every unicast data frame Tx, if
-+    certain threshold is met, corresponding event will be sent to host.
-+
-+Command
-+    wmiconfig eth1 --lqThreshold <enable> <upper_threshold_1>...
-+    <upper_threshold_4> <lower_threshold_1>... <lower_threshold_4>
-+
-+Command Parameters
-+    A_UINT8   enable;
-+    A_UINT8   thresholdAbove1_Val;
-+    A_UINT8   thresholdAbove2_Val;
-+    A_UINT8   thresholdAbove3_Val;
-+    A_UINT8   thresholdAbove4_Val;
-+    A_UINT8   thresholdBelow1_Val;
-+    A_UINT8   thresholdBelow2_Val;
-+    A_UINT8   thresholdBelow3_Val;
-+    A_UINT8   thresholdBelow4_Val;
-+
-+Command Values
-+    enable
-+    = 0
-+    Disable link quality sampling
-+
-+        = 1
-+    Enable link quality sampling
-+
-+
-+    thresholdAbove_Val
-+    [1...4]
-+    Above thresholds (value in [0,100]), in ascending
-+    order threshold
-+
-+    Below_Val [1...4] = below thresholds (value
-+    in [0,100]), in ascending order
-+
-+Reset Values
-+    None
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+WMI Extension Events
-+
-+The WMI EXTENSION event is used for a collection of events that:
-+
-+    Are not generic wireless events
-+    May be implementation-specific
-+    May be target platform-specific
-+    May be optional for a host implementation
-+
-+    An extension event is sent from the AR6000 device targets to the host just like
-+any other WMI event message, using the WMI_EXTENSION_EVENTID. The
-+first field of the payload for this \93EXTENSION\94 event is another commandId
-+(sometimes called the subcommandId) that indicates which \93EXTENSION\94
-+event is being used. A subcommandId-specific payload follows the
-+subcommandId.
-+
-+All extensions (subcommandIds) are listed in the header file include/wmix.h.
-+See also \93WMI Extension Commands\94 on page B-55.
-+
-+
-+WMI Extension Events
-+
-+
-+GPIO_ACK
-+    Acknowledges a host set command has been processed by the device
-+
-+GPIO_DATA
-+    Response to a host\92s request for data
-+
-+GPIO_INTR
-+    Signals that GPIO interrupts are pending
-+
-+
-+=====================================================================
-+
-+Name
-+    GPIO_ACK
-+
-+Synopsis
-+    Acknowledges that a host set command (either \93GPIO_OUTPUT_SET\94 or
-+    \93GPIO_REGISTER_SET\94) has been processed by the AR6000 device.
-+
-+NOTE: Support for GPIO is optional.
-+
-+Event ID
-+    N/A
-+
-+Event Parameters
-+    None
-+
-+
-+Event Values
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    GPIO_DATA
-+
-+Synopsis
-+    The AR6000 device uses this event to respond to the host\92s earlier request for data
-+    (through either a \93GPIO_REGISTER_GET\94 or a \93GPIO_INPUT_GET\94 command).
-+
-+NOTE: Support for GPIO is optional.
-+
-+Event ID
-+    N/A
-+
-+Event Parameters
-+    UINT32    value
-+        Holds the data of interest, which is either a register value
-+        (in the case of \93GPIO_REGISTER_GET\94) or a mask of
-+        pin inputs (in the case of \93GPIO_INPUT_GET\94).
-+    UINT32    reg_id
-+        Indicates which register was read (in the case of
-+        \93GPIO_REGISTER_GET\94) or is GPIO_ID_NONE (in the
-+        case of \93GPIO_INPUT_GET\94)
-+
-+Event Values
-+    None
-+
-+
-+=====================================================================
-+
-+
-+
-+Name
-+    GPIO_INTR
-+
-+Synopsis
-+    The AR6000 device raises this event to signal that GPIO interrupts are pending.
-+    These GPIOs may be interrupts that occurred after the last \93GPIO_INTR_ACK\94
-+    command was issued, or may be GPIO interrupts that the host failed to acknowledge
-+    in the last \93GPIO_INTR_ACK\94. The AR6000 will not raise another GPIO_INTR
-+    event until this event is acknowledged through a \93GPIO_INTR_ACK\94 command.
-+
-+NOTE: Support for GPIO is optional.
-+
-+Event ID
-+    N/A
-+
-+Event Parameters
-+    UINT32    intr_mask
-+        Indicates which GPIO interrupts are currently pending
-+
-+    UINT32    input_values
-+        A recent copy of the GPIO input values, taken at the
-+        time the most recent GPIO interrupt was processed
-+
-+Event Values
-+    None
-+
-+
-+
-+=====================================================================
-+#endif
-diff --git a/drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h b/drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h
-new file mode 100644
-index 0000000..57844bc
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h
-@@ -0,0 +1,71 @@
-+#ifndef _WMI_HOST_H_
-+#define _WMI_HOST_H_
-+/*
-+ * Copyright (c) 2004-2006 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * This file contains local definitios for the wmi host module.
-+ *
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/wmi/wmi_host.h#1 $
-+ *
-+ *
-+ *  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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+struct wmi_stats {
-+    A_UINT32    cmd_len_err;
-+    A_UINT32    cmd_id_err;
-+};
-+
-+struct wmi_t {
-+    A_BOOL                          wmi_ready;
-+    A_BOOL                          wmi_numQoSStream;
-+    A_UINT8                         wmi_wmiStream2AcMapping[WMI_PRI_MAX_COUNT];
-+    WMI_PRI_STREAM_ID               wmi_ac2WmiStreamMapping[WMM_NUM_AC];
-+    A_UINT16                        wmi_streamExistsForAC[WMM_NUM_AC];
-+    A_UINT8                         wmi_fatPipeExists;
-+    void                           *wmi_devt;
-+    struct wmi_stats                wmi_stats;
-+    struct ieee80211_node_table     wmi_scan_table;
-+    A_UINT8                         wmi_bssid[ATH_MAC_LEN];
-+    A_UINT8                         wmi_powerMode;
-+    A_UINT8                         wmi_phyMode;
-+    A_UINT8                         wmi_keepaliveInterval;
-+    A_MUTEX_T                       wmi_lock;
-+};
-+
-+#define WMI_INIT_WMISTREAM_AC_MAP(w) \
-+{  (w)->wmi_wmiStream2AcMapping[WMI_BEST_EFFORT_PRI] = WMM_AC_BE; \
-+   (w)->wmi_wmiStream2AcMapping[WMI_LOW_PRI] = WMM_AC_BK; \
-+   (w)->wmi_wmiStream2AcMapping[WMI_HIGH_PRI] = WMM_AC_VI; \
-+   (w)->wmi_wmiStream2AcMapping[WMI_HIGHEST_PRI] = WMM_AC_VO; \
-+   (w)->wmi_ac2WmiStreamMapping[WMM_AC_BE] = WMI_BEST_EFFORT_PRI; \
-+   (w)->wmi_ac2WmiStreamMapping[WMM_AC_BK] = WMI_LOW_PRI; \
-+   (w)->wmi_ac2WmiStreamMapping[WMM_AC_VI] = WMI_HIGH_PRI; \
-+   (w)->wmi_ac2WmiStreamMapping[WMM_AC_VO] = WMI_HIGHEST_PRI; }
-+
-+#define WMI_WMISTREAM_ACCESSCATEGORY(w,s)      (w)->wmi_wmiStream2AcMapping[s]
-+#define WMI_ACCESSCATEGORY_WMISTREAM(w,ac)       (w)->wmi_ac2WmiStreamMapping[ac]
-+
-+#define LOCK_WMI(w)     A_MUTEX_LOCK(&(w)->wmi_lock);
-+#define UNLOCK_WMI(w)   A_MUTEX_UNLOCK(&(w)->wmi_lock);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _WMI_HOST_H_ */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1064-atheros_2_0_hcd.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1064-atheros_2_0_hcd.patch.patch
deleted file mode 100644 (file)
index b927a18..0000000
+++ /dev/null
@@ -1,1637 +0,0 @@
-From ba3a75feb93ededf6f5bcc950bb207a4a59e1dc7 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:55 +0100
-Subject: [PATCH] atheros_2_0_hcd.patch
-
----
- drivers/sdio/hcd/Kconfig               |   14 +
- drivers/sdio/hcd/Makefile              |    1 +
- drivers/sdio/hcd/s3c24xx/Makefile      |    2 +
- drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c | 1502 ++++++++++++++++++++++++++++++++
- drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h |   67 ++
- 5 files changed, 1586 insertions(+), 0 deletions(-)
- create mode 100644 drivers/sdio/hcd/Kconfig
- create mode 100644 drivers/sdio/hcd/Makefile
- create mode 100644 drivers/sdio/hcd/s3c24xx/Makefile
- create mode 100644 drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
- create mode 100644 drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
-
-diff --git a/drivers/sdio/hcd/Kconfig b/drivers/sdio/hcd/Kconfig
-new file mode 100644
-index 0000000..e4d8397
---- /dev/null
-+++ b/drivers/sdio/hcd/Kconfig
-@@ -0,0 +1,14 @@
-+config SDIO_S3C24XX
-+      tristate "Samsung s3c24xx host controller"
-+      depends on PLAT_S3C24XX && SDIO
-+      default m
-+      help
-+        good luck.
-+
-+config SDIO_S3C24XX_DMA
-+      bool "Samsung s3c24xx host controller DMA I/O"
-+      depends on SDIO_S3C24XX
-+      default n
-+      help
-+        good luck.
-+
-diff --git a/drivers/sdio/hcd/Makefile b/drivers/sdio/hcd/Makefile
-new file mode 100644
-index 0000000..e2401e2
---- /dev/null
-+++ b/drivers/sdio/hcd/Makefile
-@@ -0,0 +1 @@
-+obj-$(CONFIG_PLAT_S3C24XX)            += s3c24xx/
-diff --git a/drivers/sdio/hcd/s3c24xx/Makefile b/drivers/sdio/hcd/s3c24xx/Makefile
-new file mode 100644
-index 0000000..d2d099c
---- /dev/null
-+++ b/drivers/sdio/hcd/s3c24xx/Makefile
-@@ -0,0 +1,2 @@
-+obj-$(CONFIG_PLAT_S3C24XX) += sdio_s3c24xx_hcd.o
-+sdio_s3c24xx_hcd-objs := s3c24xx_hcd.o
-diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-new file mode 100644
-index 0000000..3c4758b
---- /dev/null
-+++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-@@ -0,0 +1,1502 @@
-+/*
-+ * s3c24xx_hcd.c - Samsung S3C MCI driver, Atheros SDIO API compatible.
-+ *
-+ * Copyright (C) 2007 by OpenMoko, Inc.
-+ * Written by Samuel Ortiz <sameo@openedhand.com>
-+ * 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.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/interrupt.h>
-+#include <linux/list.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/errno.h>
-+#include <linux/platform_device.h>
-+#include <linux/device.h>
-+#include <linux/clk.h>
-+#include <linux/fs.h>
-+#include <linux/ioport.h>
-+#include <linux/workqueue.h>
-+#include <linux/completion.h>
-+#include <linux/delay.h>
-+#include <linux/seq_file.h>
-+#include <linux/debugfs.h>
-+
-+#include <linux/sdio/ctsystem.h>
-+#include <linux/sdio/sdio_busdriver.h>
-+#include <linux/sdio/sdio_lib.h>
-+
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <asm/uaccess.h>
-+#include <asm/dma.h>
-+#include <asm/dma-mapping.h>
-+
-+#include <asm/arch/regs-sdi.h>
-+#include <asm/arch/regs-gpio.h>
-+#include <asm/arch/mci.h>
-+#include <asm/arch/gta02.h>
-+
-+#include "s3c24xx_hcd.h"
-+
-+#define DESCRIPTION "S3c24xx SDIO host controller"
-+#define AUTHOR "Samuel Ortiz <sameo@openedhand.com>"
-+
-+#define RESSIZE(ressource) (((ressource)->end - (ressource)->start)+1)
-+
-+static struct s3c2410_dma_client s3c24xx_hcd_dma_client = {
-+      .name           = "s3c24xx_hcd",
-+};
-+
-+extern struct platform_device s3c_device_sdi;
-+
-+static void dump_request(struct s3c24xx_hcd_context * context)
-+{
-+    if (context->hcd.pCurrentRequest != NULL) {
-+        DBG_PRINT(SDDBG_ERROR, ("Current Request Command:%d, ARG:0x%8.8X flags: 0x%04x\n",
-+                              context->hcd.pCurrentRequest->Command, context->hcd.pCurrentRequest->Argument,
-+                              context->hcd.pCurrentRequest->Flags));
-+        if (IS_SDREQ_DATA_TRANS(context->hcd.pCurrentRequest->Flags)) {
-+            DBG_PRINT(SDDBG_ERROR, ("Data %s, Blocks: %d, BlockLen:%d Remaining: %d \n",
-+                      IS_SDREQ_WRITE_DATA(context->hcd.pCurrentRequest->Flags) ? "WRITE":"READ",
-+                      context->hcd.pCurrentRequest->BlockCount,
-+                      context->hcd.pCurrentRequest->BlockLen,
-+                      context->hcd.pCurrentRequest->DataRemaining));
-+        }
-+    }
-+}
-+
-+static void s3c24xx_dump_regs(struct s3c24xx_hcd_context * context)
-+{
-+      u32 con, pre, cmdarg, cmdcon, cmdsta, r0, r1, r2, r3, timer, bsize;
-+      u32 datcon, datcnt, datsta, fsta, imask;
-+
-+      con     = readl(context->base + S3C2410_SDICON);
-+      pre     = readl(context->base + S3C2410_SDIPRE);
-+      cmdarg  = readl(context->base + S3C2410_SDICMDARG);
-+      cmdcon  = readl(context->base + S3C2410_SDICMDCON);
-+      cmdsta  = readl(context->base + S3C2410_SDICMDSTAT);
-+      r0      = readl(context->base + S3C2410_SDIRSP0);
-+      r1      = readl(context->base + S3C2410_SDIRSP1);
-+      r2      = readl(context->base + S3C2410_SDIRSP2);
-+      r3      = readl(context->base + S3C2410_SDIRSP3);
-+      timer   = readl(context->base + S3C2410_SDITIMER);
-+      bsize   = readl(context->base + S3C2410_SDIBSIZE);
-+      datcon  = readl(context->base + S3C2410_SDIDCON);
-+      datcnt  = readl(context->base + S3C2410_SDIDCNT);
-+      datsta  = readl(context->base + S3C2410_SDIDSTA);
-+      fsta    = readl(context->base + S3C2410_SDIFSTA);
-+      imask   = readl(context->base + S3C2440_SDIIMSK);
-+
-+      printk("SDICON:    0x%08x\n", con);
-+      printk("SDIPRE:    0x%08x\n", pre);
-+      printk("SDICmdArg: 0x%08x\n", cmdarg);
-+      printk("SDICmdCon: 0x%08x\n", cmdcon);
-+      printk("SDICmdSta: 0x%08x\n", cmdsta);
-+      printk("SDIRSP0:   0x%08x\n", r0);
-+      printk("SDIRSP1:   0x%08x\n", r1);
-+      printk("SDIRSP2:   0x%08x\n", r2);
-+      printk("SDIRSP3:   0x%08x\n", r3);
-+      printk("SDIDTimer: 0x%08x\n", timer);
-+      printk("SDIBSize:  0x%08x\n", bsize);
-+      printk("SDIDatCon: 0x%08x\n", datcon);
-+      printk("SDIDatCnt: 0x%08x\n", datcnt);
-+      printk("SDIDatSta: 0x%08x\n", datsta);
-+      printk("SDIFSta:   0x%08x\n", fsta);
-+      printk("SDIIntMsk: 0x%08x\n", imask);
-+}
-+
-+static inline void s3c24xx_hcd_clear_imask(struct s3c24xx_hcd_context * context)
-+{
-+      if (context->int_sdio) {
-+              writel(S3C2410_SDIIMSK_SDIOIRQ | S3C2410_SDIIMSK_READWAIT,
-+                     context->base + S3C2440_SDIIMSK);
-+      }  else {
-+              writel(0, context->base + S3C2440_SDIIMSK);
-+      }
-+}
-+
-+static inline void s3c24xx_hcd_set_imask(struct s3c24xx_hcd_context * context)
-+{
-+      writel(context->int_mask, context->base + S3C2440_SDIIMSK);
-+}
-+
-+
-+static inline void s3c24xx_hcd_clear_dsta(struct s3c24xx_hcd_context * context)
-+{
-+      u32 dsta;
-+
-+      dsta = readl(context->base + S3C2410_SDIDSTA);
-+      writel(dsta, context->base + S3C2410_SDIDSTA);
-+}
-+
-+static inline void s3c24xx_hcd_clear_csta(struct s3c24xx_hcd_context * context)
-+{
-+      u32 csta, csta_clear = 0;
-+
-+      csta = readl(context->base + S3C2410_SDICMDSTAT);
-+
-+      if (csta & S3C2410_SDICMDSTAT_CRCFAIL)
-+              csta_clear |= S3C2410_SDICMDSTAT_CRCFAIL;
-+      if (csta & S3C2410_SDICMDSTAT_CMDSENT)
-+              csta_clear |= S3C2410_SDICMDSTAT_CMDSENT;
-+      if (csta & S3C2410_SDICMDSTAT_CMDTIMEOUT)
-+              csta_clear |= S3C2410_SDICMDSTAT_CMDTIMEOUT;
-+      if (csta & S3C2410_SDICMDSTAT_RSPFIN)
-+              csta_clear |= S3C2410_SDICMDSTAT_RSPFIN;
-+
-+      writel(csta_clear, context->base + S3C2410_SDICMDSTAT);
-+}
-+
-+static inline void s3c24xx_hcd_clear_sta(struct s3c24xx_hcd_context * context)
-+{
-+      u32 csta, dsta, csta_clear = 0, dsta_clear = 0;
-+
-+      csta = readl(context->base + S3C2410_SDICMDSTAT);
-+      dsta = readl(context->base + S3C2410_SDIDSTA);
-+
-+      if (csta & S3C2410_SDICMDSTAT_CRCFAIL)
-+              csta_clear |= S3C2410_SDICMDSTAT_CRCFAIL;
-+      if (csta & S3C2410_SDICMDSTAT_CMDSENT)
-+              csta_clear |= S3C2410_SDICMDSTAT_CMDSENT;
-+      if (csta & S3C2410_SDICMDSTAT_CMDTIMEOUT)
-+              csta_clear |= S3C2410_SDICMDSTAT_CMDTIMEOUT;
-+      if (csta & S3C2410_SDICMDSTAT_RSPFIN)
-+              csta_clear |= S3C2410_SDICMDSTAT_RSPFIN;
-+
-+
-+      if (dsta & S3C2410_SDIDSTA_RDYWAITREQ)
-+              dsta_clear |= S3C2410_SDIDSTA_RDYWAITREQ;
-+      if (dsta & S3C2410_SDIDSTA_SDIOIRQDETECT)
-+              dsta_clear |= S3C2410_SDIDSTA_SDIOIRQDETECT;
-+      if (dsta & S3C2410_SDIDSTA_FIFOFAIL)
-+              dsta_clear |= S3C2410_SDIDSTA_FIFOFAIL;
-+      if (dsta & S3C2410_SDIDSTA_CRCFAIL)
-+              dsta_clear |= S3C2410_SDIDSTA_CRCFAIL;
-+      if (dsta & S3C2410_SDIDSTA_RXCRCFAIL)
-+              dsta_clear |= S3C2410_SDIDSTA_RXCRCFAIL;
-+      if (dsta & S3C2410_SDIDSTA_DATATIMEOUT)
-+              dsta_clear |= S3C2410_SDIDSTA_DATATIMEOUT;
-+      if (dsta & S3C2410_SDIDSTA_XFERFINISH)
-+              dsta_clear |= S3C2410_SDIDSTA_XFERFINISH;
-+      if (dsta & S3C2410_SDIDSTA_BUSYFINISH)
-+              dsta_clear |= S3C2410_SDIDSTA_BUSYFINISH;
-+      if (dsta & S3C2410_SDIDSTA_SBITERR)
-+              dsta_clear |= S3C2410_SDIDSTA_SBITERR;
-+
-+      writel(csta_clear, context->base + S3C2410_SDICMDSTAT);
-+      writel(dsta_clear, context->base + S3C2410_SDIDSTA);
-+}
-+
-+static inline void s3c24xx_hcd_fifo_reset(struct s3c24xx_hcd_context * context)
-+{
-+      u32 fsta;
-+
-+      fsta = readl(context->base + S3C2410_SDIFSTA);
-+      fsta |= S3C2440_SDIFSTA_FIFORESET;
-+      writel(fsta, context->base + S3C2410_SDIFSTA);
-+}
-+
-+#if 0
-+static void s3c24xx_hcd_reset(struct s3c24xx_hcd_context * context)
-+{
-+      u32 con, counter;
-+      unsigned long flags;
-+
-+      spin_lock_irqsave(&context->lock, flags);
-+
-+      con = readl(context->base + S3C2410_SDICON);
-+
-+      con |= S3C2440_SDICON_SDRESET;
-+
-+      writel(con, context->base + S3C2410_SDICON);
-+
-+      counter = 1000;
-+      while(counter) {
-+              con = readl(context->base + S3C2410_SDICON);
-+              if (!(con & S3C2440_SDICON_SDRESET))
-+                      break;
-+              counter--;
-+              mdelay(1);
-+      }
-+
-+      spin_unlock_irqrestore(&context->lock, flags);
-+}
-+#endif
-+
-+static SDIO_STATUS s3c24xx_hcd_clock_enable(struct s3c24xx_hcd_context * context,
-+                                          unsigned int clock_rate,
-+                                          unsigned char enable)
-+{
-+      SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+      unsigned long flags;
-+      u32 con;
-+
-+      spin_lock_irqsave(&context->lock, flags);
-+
-+      con = readl(context->base + S3C2410_SDICON);
-+
-+      if (enable && clock_rate) {
-+              con |= S3C2410_SDICON_CLOCKTYPE;
-+      } else {
-+              con &= ~S3C2410_SDICON_CLOCKTYPE;
-+      }
-+
-+      if (clock_rate) {
-+              int prescaler;
-+
-+              for (prescaler = 0; prescaler < 0xff; prescaler++) {
-+                      context->device.actual_clock_rate =
-+                              context->device.max_clock_rate / (prescaler + 1);
-+
-+                      if (context->device.actual_clock_rate <= clock_rate &&
-+                          context->device.actual_clock_rate <= context->hcd.MaxClockRate)
-+                              break;
-+              }
-+
-+              if (prescaler == 0xff)
-+                      DBG_PRINT(SDDBG_ERROR , ("Using lowest clock rate\n"));
-+
-+              writel(prescaler, context->base + S3C2410_SDIPRE);
-+      }
-+
-+      writel(con, context->base + S3C2410_SDICON);
-+
-+      spin_unlock_irqrestore(&context->lock, flags);
-+
-+      return SDIOErrorToOSError(status);
-+}
-+
-+static void s3c24xx_hcd_set_bus_mode(struct s3c24xx_hcd_context *context,
-+                                   PSDCONFIG_BUS_MODE_DATA pMode)
-+{
-+      u32 datacon;
-+      unsigned long flags;
-+
-+      DBG_PRINT(SDDBG_TRACE , ("SetBusMode\n"));
-+
-+      spin_lock_irqsave(&context->lock, flags);
-+      datacon = readl(context->base + S3C2410_SDIDCON);
-+
-+      switch (SDCONFIG_GET_BUSWIDTH(pMode->BusModeFlags)) {
-+        case SDCONFIG_BUS_WIDTH_1_BIT:
-+              context->bus_width = 1;
-+              datacon &= S3C2410_SDIDCON_WIDEBUS;
-+              break;
-+        case SDCONFIG_BUS_WIDTH_4_BIT:
-+              context->bus_width = 4;
-+              datacon |= S3C2410_SDIDCON_WIDEBUS;
-+              break;
-+        default:
-+              DBG_PRINT(SDDBG_TRACE , ("Unknown bus width: %d\n", SDCONFIG_GET_BUSWIDTH(pMode->BusModeFlags)));
-+              break;
-+      }
-+
-+      writel(datacon, context->base + S3C2410_SDIDCON);
-+      spin_unlock_irqrestore(&context->lock, flags);
-+
-+      /* Set clock rate and enable clock */
-+      s3c24xx_hcd_clock_enable(context, pMode->ClockRate, 1);
-+      pMode->ActualClockRate = context->device.actual_clock_rate;
-+
-+      DBG_PRINT(SDDBG_TRACE , ("BUS mode: %d bits wide, actual clock rate: %d kHz (requested %d kHz)\n",
-+                               context->bus_width, pMode->ActualClockRate / 1000, pMode->ClockRate / 1000));
-+}
-+
-+
-+static void s3c24xx_hcd_dma_complete(struct s3c24xx_hcd_context * context)
-+{
-+      u32 dsta, counter, i;
-+      PSDREQUEST req;
-+      SDIO_STATUS status = SDIO_STATUS_ERROR;
-+
-+      req = GET_CURRENT_REQUEST(&context->hcd);
-+      if (req == NULL) {
-+              DBG_PRINT(SDDBG_ERROR, ("%s(): No current request\n", __FUNCTION__));
-+              return;
-+      }
-+
-+      if (context->complete == S3C24XX_HCD_DATA_READ) {
-+              /* DMA READ completion */
-+              if (context->latest_xfer_size != req->DataRemaining) {
-+                      DBG_PRINT(SDDBG_ERROR, ("Unexpected read xfer size: %d <-> %d\n",
-+                                              context->latest_xfer_size, req->DataRemaining));
-+                      status = SDIO_STATUS_BUS_WRITE_ERROR;
-+              }
-+
-+              counter = 0;
-+              dsta = readl(context->base + S3C2410_SDIDSTA);
-+              while (!(dsta & S3C2410_SDIDSTA_XFERFINISH)) {
-+                      if (counter > 500) {
-+                              printk("read xfer timed out\n");
-+                              s3c24xx_dump_regs(context);
-+                              memcpy(req->pDataBuffer, context->io_buffer,
-+                                     req->BlockCount * req->BlockLen);
-+                              printk("Transfer: %dx%d\n", req->BlockCount, req->BlockLen);
-+                              for (i = 0; i < req->DataRemaining; i++)
-+                                      printk("0x%x ", *(((char *)context->io_buffer) + i));
-+                              printk("\n");
-+                              status = SDIO_STATUS_BUS_READ_TIMEOUT;
-+                              goto out;
-+                      }
-+                      dsta = readl(context->base + S3C2410_SDIDSTA);
-+                      counter++;
-+                      mdelay(1);
-+              };
-+
-+              dma_sync_single(NULL, context->io_buffer_dma,
-+                              req->BlockCount * req->BlockLen, DMA_BIDIRECTIONAL);
-+
-+              writel(S3C2410_SDIDSTA_XFERFINISH, context->base + S3C2410_SDIDSTA);
-+
-+              memcpy(req->pDataBuffer, context->io_buffer,
-+                     req->BlockCount * req->BlockLen);
-+
-+              req->DataRemaining = 0;
-+              status = SDIO_STATUS_SUCCESS;
-+
-+      } else if (context->complete == S3C24XX_HCD_DATA_WRITE) {
-+              /* DMA WRITE completion */
-+              if (context->latest_xfer_size != req->DataRemaining) {
-+                      DBG_PRINT(SDDBG_ERROR, ("Unexpected write xfer size: %d <-> %d\n",
-+                                              context->latest_xfer_size, req->DataRemaining));
-+                      status = SDIO_STATUS_BUS_WRITE_ERROR;
-+              }
-+
-+              dsta = readl(context->base + S3C2410_SDIDSTA);
-+              counter = 0;
-+              while (!(dsta & S3C2410_SDIDSTA_XFERFINISH)) {
-+                      if (counter > 500) {
-+                              printk("write xfer timed out\n");
-+                              status = SDIO_STATUS_BUS_WRITE_ERROR;
-+                              goto out;
-+                      }
-+                      dsta = readl(context->base + S3C2410_SDIDSTA);
-+                      counter++;
-+                      mdelay(1);
-+              };
-+
-+              writel(S3C2410_SDIDSTA_XFERFINISH, context->base + S3C2410_SDIDSTA);
-+              req->DataRemaining = 0;
-+              status = SDIO_STATUS_SUCCESS;
-+      }
-+
-+ out:
-+      req->Status = status;
-+}
-+
-+static void s3c24xx_hcd_pio_complete(struct s3c24xx_hcd_context * context)
-+{
-+      u32 fsta, counter;
-+      u8 *ptr;
-+      int fifo_count;
-+      PSDREQUEST req;
-+      SDIO_STATUS status = SDIO_STATUS_ERROR;
-+
-+      req = GET_CURRENT_REQUEST(&context->hcd);
-+      if (req == NULL) {
-+              DBG_PRINT(SDDBG_ERROR, ("%s(): No current request\n", __FUNCTION__));
-+              return;
-+      }
-+
-+      ptr = req->pDataBuffer;
-+
-+      if (context->complete == S3C24XX_HCD_DATA_READ) {
-+              counter = 0;
-+              DBG_PRINT(SDDBG_TRACE, ("Data read..."));
-+              do {
-+                      counter++;
-+                      fsta = readl(context->base + S3C2410_SDIFSTA);
-+                      mdelay(1);
-+                      if (counter > 1000) {
-+                              DBG_PRINT(SDDBG_ERROR, ("DATA read timeout\n"));
-+                              status = SDIO_STATUS_BUS_READ_TIMEOUT;
-+                              s3c24xx_dump_regs(context);
-+                              goto out;
-+                      }
-+              } while(!(fsta & S3C2410_SDIFSTA_RFDET));
-+              DBG_PRINT(SDDBG_TRACE, ("RX detected\n"));
-+
-+              while (1) {
-+                      counter = 0;
-+                      fifo_count = (readl(context->base + S3C2410_SDIFSTA) & S3C2410_SDIFSTA_COUNTMASK);
-+                      while (!fifo_count) {
-+                              counter++;
-+                              mdelay(1);
-+                              if (counter > 500) {
-+                                      s3c24xx_dump_regs(context);
-+                                      DBG_PRINT(SDDBG_ERROR, ("No more bytes in FIFO\n"));
-+                                      goto out;
-+                              }
-+                              fifo_count = (readl(context->base + S3C2410_SDIFSTA) & S3C2410_SDIFSTA_COUNTMASK);
-+                      }
-+
-+                      if (fifo_count > req->DataRemaining) {
-+                              DBG_PRINT(SDDBG_ERROR, ("DATA read, fifo_count %d > expected %d\n", fifo_count, req->DataRemaining));
-+                              fifo_count = req->DataRemaining;
-+                      }
-+
-+                      req->DataRemaining -= fifo_count;
-+                      while (fifo_count > 0) {
-+                              if (context->data_size == 4)
-+                                      *(ptr) = readl(context->base + S3C2440_SDIDATA);
-+                              else if (context->data_size == 2)
-+                                      *(ptr) = readw(context->base + S3C2440_SDIDATA);
-+                              else
-+                                      *(ptr) = readb(context->base + S3C2440_SDIDATA);
-+
-+                              ptr += context->data_size;
-+                              fifo_count -= context->data_size;
-+
-+                      }
-+
-+                      if (!req->DataRemaining) {
-+                              /* We poll for xfer finish */
-+                              counter = 0;
-+                              while (!(readl(context->base + S3C2410_SDIDSTA)
-+                                               & S3C2410_SDIDSTA_XFERFINISH)) {
-+                                      counter++;
-+                                      mdelay(1);
-+                                      if (counter > 500) {
-+                                              DBG_PRINT(SDDBG_ERROR, ("RX XFERFINISH missing\n"));
-+                                              s3c24xx_dump_regs(context);
-+                                              break;
-+                                      }
-+                              }
-+
-+                              status = SDIO_STATUS_SUCCESS;
-+                              goto out;
-+                      }
-+              }
-+
-+      } else if (context->complete == S3C24XX_HCD_DATA_WRITE) {
-+              counter = 0;
-+              DBG_PRINT(SDDBG_TRACE, ("Data write..."));
-+              do {
-+                      counter++;
-+                      fsta = readl(context->base + S3C2410_SDIFSTA);
-+                      mdelay(1);
-+                      if (counter > 1000) {
-+                              DBG_PRINT(SDDBG_ERROR, ("DATA write timeout\n"));
-+                              status = SDIO_STATUS_BUS_WRITE_ERROR;
-+                              goto out;
-+                              break;
-+                      }
-+
-+              } while(!(fsta & S3C2410_SDIFSTA_TFDET));
-+              DBG_PRINT(SDDBG_TRACE, ("TX detected\n"));
-+
-+              while (1) {
-+                      counter = 0;
-+                      fifo_count = 63 - (readl(context->base + S3C2410_SDIFSTA) & S3C2410_SDIFSTA_COUNTMASK);
-+                      while (!fifo_count) {
-+                              counter++;
-+                              mdelay(1);
-+                              if (counter > 500) {
-+                                      s3c24xx_dump_regs(context);
-+                                      DBG_PRINT(SDDBG_ERROR, ("No more space in FIFO\n"));
-+                                      goto out;
-+                              }
-+                              fifo_count = 63 - (readl(context->base + S3C2410_SDIFSTA) & S3C2410_SDIFSTA_COUNTMASK);
-+                      }
-+
-+                      if (fifo_count > req->DataRemaining)
-+                              fifo_count = req->DataRemaining;
-+
-+                              req->DataRemaining -= fifo_count;
-+
-+                              while (fifo_count > 0) {
-+                                      if (context->data_size == 4)
-+                                              writel(*(ptr), context->base + S3C2440_SDIDATA);
-+                                      else if (context->data_size == 2)
-+                                              writew(*(ptr), context->base + S3C2440_SDIDATA);
-+                                      else
-+                                              writeb(*(ptr), context->base + S3C2440_SDIDATA);
-+
-+                                      ptr += context->data_size;
-+                                      fifo_count -= context->data_size;
-+                              }
-+
-+                              if (!req->DataRemaining) {
-+                                      /* We poll for xfer finish */
-+                                      counter = 0;
-+                                      while (!(readl(context->base + S3C2410_SDIDSTA)
-+                                               & S3C2410_SDIDSTA_XFERFINISH)) {
-+                                              counter++;
-+                                              mdelay(1);
-+                                              if (counter > 500) {
-+                                                      DBG_PRINT(SDDBG_ERROR, ("RX XFERFINISH missing\n"));
-+                                                      s3c24xx_dump_regs(context);
-+                                                      break;
-+                                              }
-+                                      }
-+
-+                                      status = SDIO_STATUS_SUCCESS;
-+                                      goto out;
-+                              }
-+              }
-+
-+      } else {
-+              DBG_PRINT(SDDBG_ERROR, ("Wrong context: %d\n", context->complete));
-+      }
-+
-+ out:
-+      req->Status = status;
-+}
-+
-+static void s3c24xx_hcd_io_work(struct work_struct *work)
-+{
-+      PSDREQUEST req;
-+      SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+      struct s3c24xx_hcd_context * context =
-+              container_of(work, struct s3c24xx_hcd_context, io_work);
-+
-+      req = GET_CURRENT_REQUEST(&context->hcd);
-+      if (req == NULL) {
-+              DBG_PRINT(SDDBG_ERROR, ("%s(): No current request\n", __FUNCTION__));
-+              return;
-+      }
-+
-+      if (req->Status == SDIO_STATUS_BUS_RESP_TIMEOUT) {
-+              DBG_PRINT(SDDBG_ERROR, ("### TIMEOUT ###\n"));
-+              s3c24xx_dump_regs(context);
-+              goto out;
-+      }
-+
-+      if (context->complete == S3C24XX_HCD_NO_RESPONSE &&
-+          req->Status == SDIO_STATUS_SUCCESS) {
-+              DBG_PRINT(SDDBG_TRACE, ("CMD done, Status: %d\n", req->Status));
-+              printk("CMD done, Status: %d\n", req->Status);
-+              goto out;
-+      }
-+
-+      if ((context->complete == S3C24XX_HCD_RESPONSE_SHORT ||
-+           context->complete == S3C24XX_HCD_RESPONSE_LONG ||
-+           context->complete == S3C24XX_HCD_DATA_READ ||
-+           context->complete == S3C24XX_HCD_DATA_WRITE) &&
-+          req->Status == SDIO_STATUS_SUCCESS) {
-+              u32 resp[4];
-+
-+              /* We need to copy the response data and send it over */
-+              resp[0] = readl(context->base + S3C2410_SDIRSP0);
-+              resp[1] = readl(context->base + S3C2410_SDIRSP1);
-+              resp[2] = readl(context->base + S3C2410_SDIRSP2);
-+              resp[3] = readl(context->base + S3C2410_SDIRSP3);
-+
-+              if (GET_SDREQ_RESP_TYPE(req->Flags) != SDREQ_FLAGS_RESP_R2) {
-+                      DBG_PRINT(SDDBG_TRACE, ("SHORT response: 0x%08x\n", resp[0]));
-+                      memcpy(&req->Response[1], (u8*)resp, 4);
-+                      req->Response[5] = (readl(context->base + S3C2410_SDICMDSTAT) & 0xff);
-+              } else {
-+                      printk("LONG response: 0x%08x\n", resp[0]);
-+                      DBG_PRINT(SDDBG_TRACE, ("LONG response: 0x%08x\n", resp[0]));
-+                      memcpy(&req->Response[1], (u8*)resp, 16);
-+                      //req->Response[17] = (readl(context->base + S3C2410_SDICMDSTAT) & 0xff);
-+              }
-+
-+              /* There is a data stage */
-+              if (context->complete == S3C24XX_HCD_DATA_READ ||
-+                  context->complete == S3C24XX_HCD_DATA_WRITE) {
-+                      status = SDIO_CheckResponse(&context->hcd, req,
-+                                                  SDHCD_CHECK_DATA_TRANS_OK);
-+
-+                      if (!SDIO_SUCCESS(status)) {
-+                              DBG_PRINT(SDDBG_ERROR,
-+                                        ("Target not ready for data xfer\n"));
-+                              return;
-+                      }
-+
-+                      if (context->dma_en) {
-+                              dma_sync_single(NULL, context->io_buffer_dma,
-+                                              req->BlockCount * req->BlockLen, DMA_BIDIRECTIONAL);
-+
-+                              s3c2410_dma_ctrl(context->dma_channel, S3C2410_DMAOP_START);
-+
-+                              wait_for_completion(&context->dma_complete);
-+
-+                              s3c24xx_hcd_dma_complete(context);
-+                      } else {
-+                              s3c24xx_hcd_pio_complete(context);
-+                      }
-+              }
-+      }
-+
-+ out:
-+      s3c24xx_hcd_clear_sta(context);
-+      s3c24xx_hcd_clear_imask(context);
-+
-+      writel(0, context->base + S3C2410_SDICMDARG);
-+      writel(0, context->base + S3C2410_SDICMDCON);
-+
-+      SDIO_HandleHcdEvent(&context->hcd, EVENT_HCD_TRANSFER_DONE);
-+}
-+
-+static void s3c24xx_hcd_irq_work(struct work_struct *work)
-+{
-+      struct s3c24xx_hcd_context * context =
-+              container_of(work, struct s3c24xx_hcd_context, irq_work);
-+
-+      disable_irq(context->io_irq);
-+
-+      writel(S3C2410_SDIDSTA_SDIOIRQDETECT, context->base + S3C2410_SDIDSTA);
-+
-+      SDIO_HandleHcdEvent(&context->hcd, EVENT_HCD_SDIO_IRQ_PENDING);
-+
-+      enable_irq(context->io_irq);
-+}
-+
-+void s3c24xx_hcd_dma_done(struct s3c2410_dma_chan *dma_ch, void *buf_id,
-+                        int size, enum s3c2410_dma_buffresult result)
-+{
-+      struct s3c24xx_hcd_context * context =
-+              (struct s3c24xx_hcd_context *) buf_id;
-+
-+      if (result != S3C2410_RES_OK) {
-+              DBG_PRINT(SDDBG_ERROR, ("%s(): DMA xfer failed: %d\n", __FUNCTION__, result));
-+              s3c24xx_dump_regs(context);
-+      }
-+
-+      context->latest_xfer_size = size;
-+      complete(&context->dma_complete);
-+}
-+
-+static int s3c24xx_hcd_prepare_dma(struct s3c24xx_hcd_context * context)
-+{
-+      PSDREQUEST req;
-+      SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+      int read = 0, hwcfg = S3C2410_DISRCC_INC | S3C2410_DISRCC_APB;
-+      enum s3c2410_dmasrc source = S3C2410_DMASRC_MEM;
-+
-+      req = GET_CURRENT_REQUEST(&context->hcd);
-+      if (req == NULL) {
-+              DBG_PRINT(SDDBG_ERROR, ("%s(): No current request\n", __FUNCTION__));
-+              status = SDIO_STATUS_ERROR;
-+      }
-+
-+      if (!context->dma_en) {
-+              DBG_PRINT(SDDBG_ERROR, ("%s(): DMA is disabled\n", __FUNCTION__));
-+              status = SDIO_STATUS_ERROR;
-+      }
-+
-+      if (!IS_SDREQ_DATA_TRANS(req->Flags)) {
-+              DBG_PRINT(SDDBG_ERROR, ("%s(): No data to transfer\n", __FUNCTION__));
-+              status = SDIO_STATUS_ERROR;
-+      }
-+
-+      if(!IS_SDREQ_WRITE_DATA(req->Flags)) {
-+              read = 1;
-+              source = S3C2410_DMASRC_HW;
-+              hwcfg = S3C2410_DISRCC_APB | 1;
-+      } else {
-+              memcpy(context->io_buffer, req->pDataBuffer, req->DataRemaining);
-+              dma_sync_single(NULL, context->io_buffer_dma,
-+                              req->BlockCount * req->BlockLen, DMA_BIDIRECTIONAL);
-+
-+      }
-+
-+      s3c2410_dma_devconfig(context->dma_channel, source, hwcfg,
-+                            (unsigned long)context->mem->start + S3C2440_SDIDATA);
-+
-+      s3c2410_dma_config(context->dma_channel, context->data_size,
-+                         S3C2410_DCON_CH0_SDI);
-+                         //(S3C2410_DCON_HWTRIG | S3C2410_DCON_CH0_SDI));
-+
-+      s3c2410_dma_set_buffdone_fn(context->dma_channel, s3c24xx_hcd_dma_done);
-+
-+//    s3c2410_dma_setflags(context->dma_channel, S3C2410_DMAF_AUTOSTART);
-+
-+      s3c2410_dma_ctrl(context->dma_channel, S3C2410_DMAOP_FLUSH);
-+
-+      s3c2410_dma_enqueue(context->dma_channel, context,
-+                          context->io_buffer_dma,
-+                          req->DataRemaining);
-+
-+      return 0;
-+}
-+
-+
-+static irqreturn_t s3c24xx_hcd_irq(int irq, void *dev_id)
-+{
-+      u32 cmdsta, dsta, fsta;
-+      unsigned long flags, trace = 0;
-+      PSDREQUEST req;
-+      struct s3c24xx_hcd_context * context =
-+              (struct s3c24xx_hcd_context *)dev_id;
-+
-+      spin_lock_irqsave(&context->lock, flags);
-+
-+      s3c24xx_hcd_clear_imask(context);
-+
-+      cmdsta = readl(context->base + S3C2410_SDICMDSTAT);
-+      dsta = readl(context->base + S3C2410_SDIDSTA);
-+      fsta = readl(context->base + S3C2410_SDIFSTA);
-+
-+      context->cmdsta = cmdsta;
-+      context->dsta = dsta;
-+      context->fsta = fsta;
-+
-+      s3c24xx_hcd_clear_csta(context);
-+
-+      if (dsta & S3C2410_SDIDSTA_SDIOIRQDETECT) {
-+              writel(S3C2410_SDIDSTA_SDIOIRQDETECT, context->base + S3C2410_SDIDSTA);
-+
-+              if (context->int_sdio) {
-+                      u32 imask;
-+
-+                      context->int_sdio = 0;
-+
-+                      imask = readl(context->base + S3C2440_SDIIMSK);
-+                      imask &= ~S3C2410_SDIIMSK_SDIOIRQ;
-+                      writel(imask, context->base + S3C2440_SDIIMSK);
-+                      schedule_work(&context->irq_work);
-+              }
-+      }
-+
-+      req = GET_CURRENT_REQUEST(&context->hcd);
-+      if (req == NULL) {
-+              DBG_PRINT(SDDBG_TRACE, ("%s(): No current request\n", __FUNCTION__));
-+              goto out;
-+      }
-+
-+      if (cmdsta & S3C2410_SDICMDSTAT_CMDTIMEOUT) {
-+              DBG_PRINT(SDDBG_ERROR, ("TIMEOUT\n"));
-+              printk("TIMEOUT\n");
-+              req->Status = SDIO_STATUS_BUS_RESP_TIMEOUT;
-+              writel(S3C2410_SDICMDSTAT_CMDTIMEOUT, context->base + S3C2410_SDICMDSTAT);
-+              schedule_work(&context->io_work);
-+      }
-+
-+      if (cmdsta & S3C2410_SDICMDSTAT_CRCFAIL) {
-+              DBG_PRINT(SDDBG_ERROR, ("CRCFAIL 0x%x\n", cmdsta));
-+              printk("CRCFAIL 0x%x\n", cmdsta);
-+              req->Status = SDIO_STATUS_BUS_RESP_CRC_ERR;
-+              dump_request(context);
-+              writel(S3C2410_SDICMDSTAT_CRCFAIL, context->base + S3C2410_SDICMDSTAT);
-+              schedule_work(&context->io_work);
-+      }
-+
-+
-+      if (cmdsta & S3C2410_SDICMDSTAT_CMDSENT) {
-+              writel(S3C2410_SDICMDSTAT_CMDSENT, context->base + S3C2410_SDICMDSTAT);
-+
-+              if (context->complete == S3C24XX_HCD_NO_RESPONSE) {
-+                      req->Status = SDIO_STATUS_SUCCESS;
-+                      trace = 1;
-+                      schedule_work(&context->io_work);
-+              }
-+      }
-+
-+      if (cmdsta & S3C2410_SDICMDSTAT_RSPFIN ||
-+          (IS_SDREQ_WRITE_DATA(req->Flags) && (fsta &  S3C2410_SDIFSTA_TFDET)) ||
-+          (!IS_SDREQ_WRITE_DATA(req->Flags) && (fsta &  S3C2410_SDIFSTA_RFDET))) {
-+
-+              writel(S3C2410_SDICMDSTAT_RSPFIN, context->base + S3C2410_SDICMDSTAT);
-+
-+              if (context->complete == S3C24XX_HCD_RESPONSE_SHORT ||
-+                  context->complete == S3C24XX_HCD_RESPONSE_LONG ||
-+                  context->complete == S3C24XX_HCD_DATA_READ ||
-+                  context->complete == S3C24XX_HCD_DATA_WRITE) {
-+                      req->Status = SDIO_STATUS_SUCCESS;
-+                      if (trace)
-+                              printk("IO work already scheduled, cmdsta: 0x%x\n", cmdsta);
-+                      schedule_work(&context->io_work);
-+              }
-+      }
-+
-+ out:
-+      if (dsta & S3C2410_SDIDSTA_RDYWAITREQ) {
-+              printk("S3C2410_SDIDSTA_RDYWAITREQ\n");
-+              //writel(S3C2410_SDIDSTA_RDYWAITREQ, context->base + S3C2410_SDIDSTA);
-+      }
-+
-+      if (dsta & S3C2410_SDIDSTA_FIFOFAIL) {
-+              printk("S3C2410_SDIDSTA_FIFOFAIL\n");
-+              writel(S3C2410_SDIDSTA_FIFOFAIL, context->base + S3C2410_SDIDSTA);
-+      }
-+
-+      if (dsta & S3C2410_SDIDSTA_CRCFAIL) {
-+              printk("S3C2410_SDIDSTA_CRCFAIL\n");
-+              writel(S3C2410_SDIDSTA_CRCFAIL, context->base + S3C2410_SDIDSTA);
-+      }
-+
-+      if (dsta & S3C2410_SDIDSTA_RXCRCFAIL) {
-+              printk("S3C2410_SDIDSTA_RXCRCFAIL\n");
-+              writel(S3C2410_SDIDSTA_RXCRCFAIL, context->base + S3C2410_SDIDSTA);
-+      }
-+
-+      if (dsta & S3C2410_SDIDSTA_DATATIMEOUT) {
-+              printk("S3C2410_SDIDSTA_DATATIMEOUT\n");
-+              writel(S3C2410_SDIDSTA_DATATIMEOUT, context->base + S3C2410_SDIDSTA);
-+      }
-+
-+      if (dsta & S3C2410_SDIDSTA_BUSYFINISH) {
-+              printk("S3C2410_SDIDSTA_BUSYFINISH\n");
-+              writel(S3C2410_SDIDSTA_BUSYFINISH, context->base + S3C2410_SDIDSTA);
-+      }
-+
-+      if (dsta & S3C2410_SDIDSTA_SBITERR) {
-+              printk("S3C2410_SDIDSTA_SBIERR\n");
-+              writel(S3C2410_SDIDSTA_SBITERR, context->base + S3C2410_SDIDSTA);
-+      }
-+
-+      spin_unlock_irqrestore(&context->lock, flags);
-+      return IRQ_HANDLED;
-+}
-+
-+
-+SDIO_STATUS s3c24xx_hcd_config(PSDHCD hcd, PSDCONFIG config)
-+{
-+      u32 con, imsk;
-+      SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+      PSDCONFIG_SDIO_INT_CTRL_DATA int_data;
-+      struct s3c24xx_hcd_context * context = (struct s3c24xx_hcd_context *)hcd->pContext;
-+
-+      switch (GET_SDCONFIG_CMD(config)){
-+      case SDCONFIG_GET_WP:
-+              DBG_PRINT(SDDBG_TRACE, ("config GET_WP\n"));
-+              *((SDCONFIG_WP_VALUE *)config->pData) = 0;
-+              status = SDIO_STATUS_SUCCESS;
-+              break;
-+      case SDCONFIG_SEND_INIT_CLOCKS:
-+              DBG_PRINT(SDDBG_TRACE, ("config SEND_INIT_CLOCKS\n"));
-+
-+              /* We stop/start the clock */
-+              con = readl(context->base + S3C2410_SDICON);
-+
-+              con &= ~S3C2410_SDICON_CLOCKTYPE;
-+              writel(con, context->base + S3C2410_SDICON);
-+
-+              mdelay(100);
-+
-+              con |= S3C2410_SDICON_CLOCKTYPE;
-+              writel(con, context->base + S3C2410_SDICON);
-+
-+              mdelay(100);
-+
-+              status = SDIO_STATUS_SUCCESS;
-+              break;
-+        case SDCONFIG_SDIO_INT_CTRL:
-+              DBG_PRINT(SDDBG_TRACE, ("config SDIO_INT_CTRL\n"));
-+              int_data =  GET_SDCONFIG_CMD_DATA(PSDCONFIG_SDIO_INT_CTRL_DATA, config);
-+
-+              if (int_data->SlotIRQEnable &
-+                  (IRQ_DETECT_1_BIT | IRQ_DETECT_4_BIT | IRQ_DETECT_MULTI_BLK) ) {
-+                      imsk = readl(context->base + S3C2440_SDIIMSK);
-+
-+                      if (int_data->SlotIRQEnable) {
-+                              printk("SDIO_INT_CTRL enable IRQ\n");
-+                              DBG_PRINT(SDDBG_TRACE, ("SDIO_INT_CTRL enable IRQ\n"));
-+                              context->int_sdio = 1;
-+                              imsk |= S3C2410_SDIIMSK_SDIOIRQ;
-+                              writel(imsk, context->base + S3C2440_SDIIMSK);
-+                      } else {
-+                              printk("SDIO_INT_CTRL disable IRQ\n");
-+                              DBG_PRINT(SDDBG_TRACE, ("SDIO_INT_CTRL disable IRQ\n"));
-+                              context->int_sdio = 0;
-+                              imsk &= ~S3C2410_SDIIMSK_SDIOIRQ;
-+                              writel(imsk, context->base + S3C2440_SDIIMSK);
-+                      }
-+              }
-+              status = SDIO_STATUS_SUCCESS;
-+              break;
-+        case SDCONFIG_SDIO_REARM_INT:
-+              DBG_PRINT(SDDBG_TRACE, ("config SDIO_REARM_INT\n"));
-+
-+              context->int_sdio = 1;
-+              imsk = readl(context->base + S3C2440_SDIIMSK);
-+              imsk |= S3C2410_SDIIMSK_SDIOIRQ;
-+              writel(imsk, context->base + S3C2440_SDIIMSK);
-+
-+              status = SDIO_STATUS_SUCCESS;
-+              break;
-+      case SDCONFIG_FUNC_CHANGE_BUS_MODE:
-+        case SDCONFIG_BUS_MODE_CTRL:
-+              s3c24xx_hcd_set_bus_mode(context, (PSDCONFIG_BUS_MODE_DATA)(config->pData));
-+              DBG_PRINT(SDDBG_TRACE, ("config BUS_MODE_CTRL\n"));
-+              status = SDIO_STATUS_SUCCESS;
-+              break;
-+        case SDCONFIG_POWER_CTRL:
-+              DBG_PRINT(SDDBG_TRACE, ("config POWER_CTRL\n"));
-+              status = SDIO_STATUS_SUCCESS;
-+              break;
-+        case SDCONFIG_GET_HCD_DEBUG:
-+              DBG_PRINT(SDDBG_TRACE, ("config GET_HCD_DEBUG\n"));
-+              status = SDIO_STATUS_SUCCESS;
-+              break;
-+        case SDCONFIG_SET_HCD_DEBUG:
-+              DBG_PRINT(SDDBG_TRACE, ("config SET_HCD_DEBUG\n"));
-+              status = SDIO_STATUS_SUCCESS;
-+              break;
-+      default:
-+              /* invalid request */
-+              DBG_PRINT(SDDBG_ERROR, ("%s() - unsupported command: 0x%X\n",
-+                                     __FUNCTION__, GET_SDCONFIG_CMD(config)));
-+              status = SDIO_STATUS_INVALID_PARAMETER;
-+      }
-+
-+      return SDIOErrorToOSError(status);
-+}
-+
-+
-+SDIO_STATUS s3c24xx_hcd_request(PSDHCD hcd)
-+{
-+      SDIO_STATUS status = SDIO_STATUS_PENDING;
-+      PSDREQUEST req;
-+      u32 cmdcon, imask;
-+      unsigned long flags;
-+      struct s3c24xx_hcd_context * context =
-+              (struct s3c24xx_hcd_context *)hcd->pContext;
-+
-+      req = GET_CURRENT_REQUEST(hcd);
-+      DBG_ASSERT(req != NULL);
-+
-+      if (req->Flags & SDREQ_FLAGS_DATA_SHORT_TRANSFER)
-+              printk("### SHORT TRANSFER ###\n");
-+
-+      spin_lock_irqsave(&context->lock, flags);
-+
-+      /* Clear command, data and fifo status registers */
-+      writel(0xFFFFFFFF, context->base + S3C2410_SDICMDSTAT);
-+      writel(0xFFFFFFFF, context->base + S3C2410_SDIDSTA);
-+      writel(0xFFFFFFFF, context->base + S3C2410_SDIFSTA);
-+
-+      /* Enabling irqs */
-+      imask = S3C2410_SDIIMSK_READWAIT;
-+
-+      cmdcon = readl(context->base + S3C2410_SDICMDCON);
-+
-+        switch (GET_SDREQ_RESP_TYPE(req->Flags)) {
-+      case SDREQ_FLAGS_NO_RESP:
-+              cmdcon &= ~S3C2410_SDICMDCON_WAITRSP;
-+              context->complete = S3C24XX_HCD_NO_RESPONSE;
-+              imask |= S3C2410_SDIIMSK_CMDSENT;
-+                break;
-+      case SDREQ_FLAGS_RESP_R1:
-+      case SDREQ_FLAGS_RESP_R1B:
-+      case SDREQ_FLAGS_RESP_R3:
-+      case SDREQ_FLAGS_RESP_SDIO_R4:
-+      case SDREQ_FLAGS_RESP_SDIO_R5:
-+      case SDREQ_FLAGS_RESP_R6:
-+              cmdcon &= ~S3C2410_SDICMDCON_LONGRSP;
-+              cmdcon |= S3C2410_SDICMDCON_WAITRSP;
-+              context->complete = S3C24XX_HCD_RESPONSE_SHORT;
-+              imask |= S3C2410_SDIIMSK_CRCSTATUS | S3C2410_SDIIMSK_RESPONSEND
-+                      | S3C2410_SDIIMSK_CMDTIMEOUT | S3C2410_SDIIMSK_RESPONSECRC;
-+                break;
-+      case SDREQ_FLAGS_RESP_R2:
-+              cmdcon |= S3C2410_SDICMDCON_LONGRSP;
-+              cmdcon |= S3C2410_SDICMDCON_WAITRSP;
-+              context->complete = S3C24XX_HCD_RESPONSE_LONG;
-+              imask |= S3C2410_SDIIMSK_CRCSTATUS | S3C2410_SDIIMSK_RESPONSEND
-+                      | S3C2410_SDIIMSK_CMDTIMEOUT | S3C2410_SDIIMSK_RESPONSECRC;
-+                break;
-+
-+      }
-+
-+      /* There is a data part */
-+      if (IS_SDREQ_DATA_TRANS(req->Flags)) {
-+              u32 dcon = 0;
-+
-+              if (readl(context->base + S3C2410_SDIDSTA) &
-+                  (S3C2410_SDIDSTA_TXDATAON | S3C2410_SDIDSTA_RXDATAON)) {
-+                      printk("##### DATA ON: 0x%x ######\n", readl(context->base + S3C2410_SDIDSTA));
-+              }
-+
-+              /* Setting timer */
-+              writel(0x7fffff, context->base + S3C2410_SDITIMER);
-+
-+              /* Block size */
-+              writel(req->BlockLen, context->base + S3C2410_SDIBSIZE);
-+              /* Number of blocks */
-+              dcon |= (0xfff & req->BlockCount);
-+
-+              if (context->bus_width == 4)
-+                      dcon |= S3C2410_SDIDCON_WIDEBUS;
-+
-+              req->DataRemaining = req->BlockCount * req->BlockLen;
-+
-+              /* Set data size, and start the transfer */
-+              dcon |= S3C2410_SDIDCON_IRQPERIOD;
-+              if (!(req->DataRemaining % 4)) {
-+                      context->data_size = 4;
-+                      dcon |= S3C2440_SDIDCON_DS_WORD;
-+              } else if (!(req->DataRemaining % 2)) {
-+                      context->data_size = 2;
-+                      dcon |= S3C2440_SDIDCON_DS_HALFWORD;
-+              } else {
-+                      context->data_size = 1;
-+                      dcon |= S3C2440_SDIDCON_DS_BYTE;
-+              }
-+
-+#ifdef CONFIG_SDIO_S3C24XX_DMA
-+              if (req->DataRemaining > 16) {
-+                      context->dma_en = 1;
-+              } else
-+#endif
-+              {
-+                      context->dma_en = 0;
-+                      context->data_size = 1;
-+                      dcon |= S3C2440_SDIDCON_DS_BYTE;
-+              }
-+
-+              if (context->dma_en) {
-+                      dcon |= S3C2410_SDIDCON_DMAEN;
-+                      s3c24xx_hcd_prepare_dma(context);
-+              }
-+
-+              if (IS_SDREQ_WRITE_DATA(req->Flags)) {
-+                      /* Data write */
-+                      DBG_PRINT(SDDBG_TRACE, ("Start data write, block count=%d, block size=%d\n",
-+                                              req->BlockCount, req->BlockLen));
-+
-+                      /* Data configuration: transmit after resp, block mode*/
-+                      dcon |= S3C2410_SDIDCON_TXAFTERRESP | S3C2410_SDIDCON_BLOCKMODE;
-+
-+                      /* This is a write */
-+                      dcon |= S3C2410_SDIDCON_XFER_TXSTART;
-+
-+                      imask |= S3C2410_SDIIMSK_TXFIFOHALF | S3C2410_SDIIMSK_TXFIFOEMPTY |
-+                              S3C2410_SDIIMSK_FIFOFAIL | S3C2410_SDIIMSK_DATACRC |
-+                              S3C2410_SDIIMSK_DATATIMEOUT | S3C2410_SDIIMSK_DATAFINISH;
-+
-+                      context->complete = S3C24XX_HCD_DATA_WRITE;
-+              } else {
-+                      /* Data read */
-+                      DBG_PRINT(SDDBG_TRACE, ("Start data read, block count=%d, block size=%d\n",
-+                                              req->BlockCount, req->BlockLen));
-+
-+                      /* Data configuration: receive after cmd, block mode*/
-+                      dcon |= S3C2410_SDIDCON_RXAFTERCMD | S3C2410_SDIDCON_BLOCKMODE;
-+
-+                      /* This is a read */
-+                      dcon |= S3C2410_SDIDCON_XFER_RXSTART;
-+
-+                      imask |= S3C2410_SDIIMSK_RXFIFOHALF | S3C2410_SDIIMSK_RXFIFOLAST |
-+                              S3C2410_SDIIMSK_FIFOFAIL | S3C2410_SDIIMSK_DATACRC |
-+                              S3C2410_SDIIMSK_DATATIMEOUT | S3C2410_SDIIMSK_DATAFINISH;
-+
-+                      context->complete = S3C24XX_HCD_DATA_READ;
-+              }
-+
-+              dcon |= S3C2440_SDIDCON_DATSTART;
-+
-+              writel(dcon, context->base + S3C2410_SDIDCON);
-+
-+              cmdcon |= S3C2410_SDICMDCON_WITHDATA;
-+
-+      } else {
-+              cmdcon &= ~S3C2410_SDICMDCON_WITHDATA;
-+      }
-+
-+      cmdcon |= req->Command & S3C2410_SDICMDCON_INDEX;
-+      cmdcon |= S3C2410_SDICMDCON_SENDERHOST | S3C2410_SDICMDCON_CMDSTART;
-+
-+      req->Status = SDIO_STATUS_PENDING;
-+
-+      if (context->int_sdio)
-+              imask |= S3C2410_SDIIMSK_SDIOIRQ;
-+      context->int_mask = imask;
-+      writel(imask, context->base + S3C2440_SDIIMSK);
-+      writel(req->Argument, context->base + S3C2410_SDICMDARG);
-+      writel(cmdcon, context->base + S3C2410_SDICMDCON);
-+
-+      spin_unlock_irqrestore(&context->lock, flags);
-+
-+      return status;
-+}
-+
-+static int s3c24xx_hcd_hw_init(struct s3c24xx_hcd_context * context)
-+{
-+      SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+      u32 con, datacon;
-+
-+      /* Clock */
-+      context->device.clock = clk_get(NULL, "sdi");
-+      if (IS_ERR(context->device.clock)) {
-+              DBG_PRINT(SDDBG_ERROR, ("Couldn't get clock\n"));
-+              status = PTR_ERR(context->device.clock);
-+              context->device.clock = NULL;
-+              return status;
-+      }
-+
-+      status = clk_enable(context->device.clock);
-+      if (SDIO_IS_ERROR(status)) {
-+              DBG_PRINT(SDDBG_ERROR, ("Couldn't get clock\n"));
-+              return SDIOErrorToOSError(status);
-+      }
-+
-+      context->device.max_clock_rate = clk_get_rate(context->device.clock);
-+      context->device.actual_clock_rate = context->device.max_clock_rate;
-+
-+      /* I/O */
-+      context->mem = request_mem_region(context->mem->start,
-+                                        RESSIZE(context->mem), context->description);
-+
-+      if (!context->mem) {
-+              DBG_PRINT(SDDBG_ERROR, ("Failed to request io memory region\n"));
-+              status = -ENOENT;
-+              goto out_disable_clock;
-+      }
-+
-+      context->base = ioremap(context->mem->start, RESSIZE(context->mem));
-+      if (context->base == 0) {
-+              DBG_PRINT(SDDBG_ERROR, ("failed to ioremap() io memory region.\n"));
-+              status = -EINVAL;
-+              goto out_free_mem_region;
-+      }
-+
-+      /* IRQ */
-+#if 0
-+      context->cd_irq = s3c2410_gpio_getirq(GTA02v1_GPIO_nSD_DETECT);
-+      s3c2410_gpio_cfgpin(GTA02v1_GPIO_nSD_DETECT, S3C2410_GPIO_IRQ);
-+
-+      if (request_irq(context->cd_irq, s3c24xx_hcd_cd_irq, 0, context->description, context)) {
-+              DBG_PRINT(SDDBG_ERROR, ("failed to request card detect interrupt.\n"));
-+              status = -ENOENT;
-+              goto out_unmap_mem_region;
-+      }
-+#endif
-+
-+      if (request_irq(context->io_irq, s3c24xx_hcd_irq, 0, context->description, context)) {
-+              DBG_PRINT(SDDBG_ERROR, ("failed to request mci interrupt.\n"));
-+              status = -ENOENT;
-+              goto out_unmap_mem_region;
-+      }
-+
-+
-+      /* DMA */
-+      context->io_buffer_size = 4 * 4096;
-+      context->io_buffer = dma_alloc_writecombine(&context->pdev->dev,
-+                                                  context->io_buffer_size,
-+                                                  &context->io_buffer_dma,
-+                                                  GFP_KERNEL | GFP_DMA);
-+
-+      if (context->io_buffer == NULL) {
-+              DBG_PRINT(SDDBG_ERROR, ("failed to allocate DMA buffer\n"));
-+              status = -ENOMEM;
-+              goto out_free_irq;
-+
-+      }
-+
-+      if (s3c2410_dma_request(context->dma_channel, &s3c24xx_hcd_dma_client, NULL)) {
-+              DBG_PRINT(SDDBG_ERROR, ("unable to get DMA channel.\n"));
-+              status = -ENOENT;
-+              goto out_free_dma;
-+      }
-+
-+
-+      /* Set multiplexing */
-+      s3c2410_gpio_cfgpin(S3C2410_GPE5, S3C2410_GPE5_SDCLK);
-+      s3c2410_gpio_cfgpin(S3C2410_GPE6, S3C2410_GPE6_SDCMD);
-+      s3c2410_gpio_cfgpin(S3C2410_GPE7, S3C2410_GPE7_SDDAT0);
-+      s3c2410_gpio_cfgpin(S3C2410_GPE8, S3C2410_GPE8_SDDAT1);
-+      s3c2410_gpio_cfgpin(S3C2410_GPE9, S3C2410_GPE9_SDDAT2);
-+      s3c2410_gpio_cfgpin(S3C2410_GPE10, S3C2410_GPE10_SDDAT3);
-+
-+      con = readl(context->base + S3C2410_SDICON);
-+      con |= S3C2410_SDICON_SDIOIRQ;
-+      writel(con, context->base + S3C2410_SDICON);
-+
-+      datacon = readl(context->base + S3C2410_SDIDCON);
-+      datacon |= S3C2410_SDIDCON_WIDEBUS;
-+      writel(datacon, context->base + S3C2410_SDIDCON);
-+
-+      printk("S3c24xx SDIO: IRQ:%d Detect IRQ:%d DMA channel:%d base@0x%p PCLK@%ld kHz\n",
-+             context->io_irq, context->cd_irq, context->dma_channel, context->base,
-+             context->device.max_clock_rate/1000);
-+
-+      return SDIOErrorToOSError(status);
-+
-+ out_free_dma:
-+      dma_free_writecombine(&context->pdev->dev,context->io_buffer_size,
-+                            context->io_buffer, context->io_buffer_dma);
-+
-+ out_free_irq:
-+      free_irq(context->io_irq, context);
-+
-+ out_unmap_mem_region:
-+      iounmap(context->base);
-+
-+ out_free_mem_region:
-+      release_mem_region(context->mem->start, RESSIZE(context->mem));
-+
-+ out_disable_clock:
-+      clk_disable(context->device.clock);
-+
-+      return SDIOErrorToOSError(status);
-+}
-+
-+static void s3c24xx_hcd_hw_cleanup(struct s3c24xx_hcd_context * context)
-+{
-+      clk_disable(context->device.clock);
-+      free_irq(context->io_irq, context);
-+      iounmap(context->base);
-+      release_mem_region(context->mem->start, RESSIZE(context->mem));
-+      dma_free_writecombine(&context->pdev->dev,context->io_buffer_size,
-+                            context->io_buffer, context->io_buffer_dma);
-+}
-+
-+static int s3c24xx_hcd_pnp_probe(struct pnp_dev *pBusDevice, const struct pnp_device_id *pId)
-+{
-+      SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+
-+      status = s3c24xx_hcd_hw_init(&hcd_context);
-+      if (SDIO_IS_ERROR(status)) {
-+              DBG_PRINT(SDDBG_ERROR, ("HW Init failed\n"));
-+              return SDIOErrorToOSError(status);
-+      }
-+
-+      status = SDIO_RegisterHostController(&hcd_context.hcd);
-+      if (SDIO_IS_ERROR(status)) {
-+              DBG_PRINT(SDDBG_ERROR, ("Host registration failed\n"));
-+              s3c24xx_hcd_hw_cleanup(&hcd_context);
-+              return SDIOErrorToOSError(status);
-+      }
-+
-+      /* Our card is built-in, we force the attachement event */
-+      SDIO_HandleHcdEvent(&hcd_context.hcd, EVENT_HCD_ATTACH);
-+
-+      return 0;
-+}
-+
-+static void s3c24xx_hcd_pnp_remove(struct pnp_dev *pBusDevice)
-+{
-+}
-+
-+/* the driver context data */
-+struct s3c24xx_hcd_context hcd_context = {
-+      .description  = DESCRIPTION,
-+      .hcd.pName = "sdio_s3c24xx",
-+      .hcd.Version = CT_SDIO_STACK_VERSION_CODE,
-+      .hcd.pModule = THIS_MODULE,
-+      /* builtin card, 4 bits bus */
-+      .hcd.Attributes = SDHCD_ATTRIB_BUS_4BIT | SDHCD_ATTRIB_BUS_1BIT | SDHCD_ATTRIB_MULTI_BLK_IRQ,
-+      .hcd.SlotNumber = 0,
-+      .hcd.MaxSlotCurrent = 500, /* 1/2 amp */
-+      .hcd.SlotVoltageCaps = SLOT_POWER_3_3V, /* 3.3V */
-+      .hcd.SlotVoltagePreferred = SLOT_POWER_3_3V, /* 3.3V */
-+      .hcd.MaxClockRate = 25000000,
-+      .hcd.MaxBytesPerBlock = 0xfff, /* 0 - 4095 */
-+      .hcd.MaxBlocksPerTrans = 0xfff, /* 0 - 4095 */
-+      .hcd.pContext = &hcd_context,
-+      .hcd.pRequest = s3c24xx_hcd_request,
-+      .hcd.pConfigure = s3c24xx_hcd_config,
-+      .device.pnp_device.name = "sdio_s3c24xx_hcd",
-+      .device.pnp_driver.name = "sdio_s3c24xx_hcd",
-+      .device.pnp_driver.probe  = s3c24xx_hcd_pnp_probe,
-+      .device.pnp_driver.remove = s3c24xx_hcd_pnp_remove,
-+};
-+
-+static int s3c24xx_hcd_probe(struct platform_device * pdev)
-+{
-+      SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+      struct resource *r = NULL;
-+
-+      printk("S3c2440 SDIO Host controller\n");
-+
-+      hcd_context.pdev = pdev;
-+
-+      hcd_context.mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+      if (hcd_context.mem == NULL) {
-+              DBG_PRINT(SDDBG_ERROR, ("No memory region\n"));
-+              status = SDIO_STATUS_NO_RESOURCES;
-+              goto out;
-+      }
-+
-+      hcd_context.io_irq = platform_get_irq(pdev, 0);
-+      if (hcd_context.io_irq == 0) {
-+              DBG_PRINT(SDDBG_ERROR, ("No IRQ\n"));
-+              status = SDIO_STATUS_NO_RESOURCES;
-+              goto out;
-+      }
-+
-+      r = platform_get_resource(pdev, IORESOURCE_DMA, 0);
-+      if (r == NULL) {
-+              DBG_PRINT(SDDBG_ERROR, ("No DMA channel\n"));
-+              status = SDIO_STATUS_NO_RESOURCES;
-+              goto out;
-+      }
-+      hcd_context.dma_channel = r->start;
-+      hcd_context.dma_en = 0;
-+
-+      hcd_context.int_sdio = 0;
-+
-+      spin_lock_init(&hcd_context.lock);
-+
-+      init_completion(&hcd_context.dma_complete);
-+      init_completion(&hcd_context.xfer_complete);
-+
-+      INIT_WORK(&hcd_context.io_work, s3c24xx_hcd_io_work);
-+      INIT_WORK(&hcd_context.irq_work, s3c24xx_hcd_irq_work);
-+
-+      mdelay(100);
-+
-+      status = SDIO_BusAddOSDevice(&hcd_context.device.dma,
-+                                   &hcd_context.device.pnp_driver,
-+                                   &hcd_context.device.pnp_device);
-+
-+ out:
-+
-+      return SDIOErrorToOSError(status);
-+}
-+
-+/*
-+ * module cleanup
-+ */
-+static int s3c24xx_hcd_remove(struct platform_device * pdev) {
-+      printk("S3C2440 SDIO host controller unloaded\n");
-+      SDIO_BusRemoveOSDevice(&hcd_context.device.pnp_driver, &hcd_context.device.pnp_device);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver s3c24xx_hcd_sdio =
-+{
-+      .driver.name    = "s3c24xx-sdio",
-+      .probe          = s3c24xx_hcd_probe,
-+      .remove         = s3c24xx_hcd_remove,
-+};
-+
-+#ifdef CONFIG_DEBUG_FS
-+static struct dentry *debugfs_dir;
-+
-+static int s3c24xx_hcd_debugfs_show(struct seq_file *s, void *data)
-+{
-+      PSDREQUEST req;
-+      u32 con, pre, cmdarg, cmdcon, cmdsta, r0, r1, r2, r3, timer, bsize;
-+      u32 datcon, datcnt, datsta, fsta, imask;
-+      struct s3c24xx_hcd_context * context = &hcd_context;
-+
-+
-+      con     = readl(context->base + S3C2410_SDICON);
-+      pre     = readl(context->base + S3C2410_SDIPRE);
-+      cmdarg  = readl(context->base + S3C2410_SDICMDARG);
-+      cmdcon  = readl(context->base + S3C2410_SDICMDCON);
-+      cmdsta  = readl(context->base + S3C2410_SDICMDSTAT);
-+      r0      = readl(context->base + S3C2410_SDIRSP0);
-+      r1      = readl(context->base + S3C2410_SDIRSP1);
-+      r2      = readl(context->base + S3C2410_SDIRSP2);
-+      r3      = readl(context->base + S3C2410_SDIRSP3);
-+      timer   = readl(context->base + S3C2410_SDITIMER);
-+      bsize   = readl(context->base + S3C2410_SDIBSIZE);
-+      datcon  = readl(context->base + S3C2410_SDIDCON);
-+      datcnt  = readl(context->base + S3C2410_SDIDCNT);
-+      datsta  = readl(context->base + S3C2410_SDIDSTA);
-+      fsta    = readl(context->base + S3C2410_SDIFSTA);
-+      imask   = readl(context->base + S3C2440_SDIIMSK);
-+
-+      seq_printf(s, "SDICON:    0x%08x\n", con);
-+      seq_printf(s, "SDIPRE:    0x%08x\n", pre);
-+      seq_printf(s, "SDICmdArg: 0x%08x\n", cmdarg);
-+      seq_printf(s, "SDICmdCon: 0x%08x\n", cmdcon);
-+      seq_printf(s, "SDICmdSta: 0x%08x\n", cmdsta);
-+      seq_printf(s, "SDIRSP0:   0x%08x\n", r0);
-+      seq_printf(s, "SDIRSP1:   0x%08x\n", r1);
-+      seq_printf(s, "SDIRSP2:   0x%08x\n", r2);
-+      seq_printf(s, "SDIRSP3:   0x%08x\n", r3);
-+      seq_printf(s, "SDIDTimer: 0x%08x\n", timer);
-+      seq_printf(s, "SDIBSize:  0x%08x\n", bsize);
-+      seq_printf(s, "SDIDatCon: 0x%08x\n", datcon);
-+      seq_printf(s, "SDIDatCnt: 0x%08x\n", datcnt);
-+      seq_printf(s, "SDIDatSta: 0x%08x\n", datsta);
-+      seq_printf(s, "SDIFSta:   0x%08x\n", fsta);
-+      seq_printf(s, "SDIIntMsk: 0x%08x\n", imask);
-+      seq_printf(s, "\n");
-+
-+      seq_printf(s, "Current REQ: \n");
-+      req = GET_CURRENT_REQUEST(&context->hcd);
-+      if (req == NULL) {
-+              seq_printf(s, " No current request\n");
-+      } else {
-+              seq_printf(s, " Command: %d\n", req->Command);
-+              seq_printf(s, " Args: 0x%x\n", req->Argument);
-+              seq_printf(s, " Flags: 0x%x\n", req->Flags);
-+              seq_printf(s, " %d blocks x %d bytes\n", req->BlockCount, req->BlockLen);
-+              seq_printf(s, " %d bytes remaining\n", req->DataRemaining);
-+      }
-+
-+      seq_printf(s, "Context: \n");
-+      seq_printf(s, " INT mask: 0x%x\n", context->int_mask);
-+      seq_printf(s, " sdio INT: %d\n", context->int_sdio);
-+      seq_printf(s, " cmdsta: 0x%x\n", context->cmdsta);
-+      seq_printf(s, " dsta: 0x%x\n", context->dsta);
-+      seq_printf(s, " fsta: 0x%x\n", context->fsta);
-+
-+      return 0;
-+}
-+
-+static int s3c24xx_hcd_debugfs_open(struct inode *inode,
-+                                      struct file *file)
-+{
-+      return single_open(file, s3c24xx_hcd_debugfs_show, NULL);
-+}
-+
-+static const struct file_operations s3c24xx_hcd_debugfs_fops = {
-+      .open           = s3c24xx_hcd_debugfs_open,
-+      .read           = seq_read,
-+      .llseek         = seq_lseek,
-+      .release        = single_release,
-+      .owner          = THIS_MODULE,
-+};
-+
-+
-+static int s3c24xx_debugfs_init(struct s3c24xx_hcd_context * context)
-+{
-+      debugfs_dir = debugfs_create_dir("s3c24xx_sdio", NULL);
-+
-+      debugfs_create_file("registers", 0444, debugfs_dir,
-+                          (void *)context,
-+                          &s3c24xx_hcd_debugfs_fops);
-+
-+      return 0;
-+}
-+
-+#else
-+
-+static int s3c24xx_debugfs_init(struct s3c24xx_hcd_context * context)
-+{
-+      return 0;
-+}
-+
-+#endif
-+
-+static int __init s3c24xx_hcd_init(void)
-+{
-+      int ret;
-+
-+      ret = s3c24xx_debugfs_init(&hcd_context);
-+      if (ret) {
-+              printk("%s(): debugfs init failed\n", __FUNCTION__);
-+      }
-+
-+      platform_driver_register(&s3c24xx_hcd_sdio);
-+
-+      return 0;
-+}
-+
-+static void __exit s3c24xx_hcd_exit(void)
-+{
-+      platform_driver_unregister(&s3c24xx_hcd_sdio);
-+}
-+
-+
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION(DESCRIPTION);
-+MODULE_AUTHOR(AUTHOR);
-+
-+module_init(s3c24xx_hcd_init);
-+module_exit(s3c24xx_hcd_exit);
-diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
-new file mode 100644
-index 0000000..eb262fc
---- /dev/null
-+++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
-@@ -0,0 +1,67 @@
-+#ifndef __SDIO_S3C24XX_HCD_H___
-+#define __SDIO_S3C24XX_HCD_H___
-+
-+#define S3C24XX_HCD_NO_RESPONSE     1
-+#define S3C24XX_HCD_RESPONSE_SHORT  2
-+#define S3C24XX_HCD_RESPONSE_LONG   3
-+#define S3C24XX_HCD_DATA_READ       4
-+#define S3C24XX_HCD_DATA_WRITE      5
-+
-+struct s3c24xx_hcd_device {
-+      OS_PNPDEVICE   pnp_device;     /* the OS device for this HCD */
-+      OS_PNPDRIVER   pnp_driver;     /* the OS driver for this HCD */
-+      SDDMA_DESCRIPTION dma;
-+      struct clk * clock;
-+      unsigned long max_clock_rate;
-+      unsigned long actual_clock_rate;
-+};
-+
-+
-+/* driver wide data, this driver only supports one device,
-+ * so we include the per device data here also */
-+struct s3c24xx_hcd_context {
-+      PTEXT                     description;       /* human readable device decsription */
-+      SDHCD                     hcd;                /* HCD description for bus driver */
-+      struct s3c24xx_hcd_device device;             /* the single device's info */
-+      struct platform_device    *pdev;
-+      struct resource           *mem;
-+      void __iomem              *base;
-+      UINT32                    io_irq;
-+      UINT32                    cd_irq;
-+      BOOL                      card_inserted;       /* card inserted flag */
-+      BOOL                      cmd_processed;       /* command phase was processed */
-+      UINT32                    fifo_depth;          /* FIFO depth for the bus mode */
-+      BOOL                      irq_masked;
-+      UINT32                    bus_width;
-+      UINT32                    data_size;           /* Word, half word, or byte */
-+      UINT32                    latest_xfer_size;
-+
-+      void                      *io_buffer;         /* Kernel address */
-+      dma_addr_t                io_buffer_dma;      /* Bus address */
-+      UINT32                    io_buffer_size;
-+      UINT32                    dma_channel;
-+      UINT32                    dma_en;
-+      struct completion         dma_complete;
-+      struct completion         xfer_complete;
-+
-+      UINT32                    int_mask;
-+      UINT32                    int_sdio;            /* Do we have SDIO interrupt on ? */
-+
-+      UINT32                    complete;
-+
-+      UINT32                    cmdsta;
-+      UINT32                    dsta;
-+      UINT32                    fsta;
-+
-+      spinlock_t                lock;
-+
-+      struct work_struct        io_work;
-+      struct work_struct        irq_work;
-+};
-+
-+SDIO_STATUS s3c24xx_hcd_config(PSDHCD hcd, PSDCONFIG config);
-+SDIO_STATUS s3c24xx_hcd_request(PSDHCD hcd);
-+
-+struct s3c24xx_hcd_context hcd_context;
-+
-+#endif
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1065-atheros_2_0_sdio_stack.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1065-atheros_2_0_sdio_stack.patch.patch
deleted file mode 100644 (file)
index 38ca950..0000000
+++ /dev/null
@@ -1,13982 +0,0 @@
-From f4ae4d14785cce7635c750286e579e79c3a27a7a Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:57 +0100
-Subject: [PATCH] atheros_2_0_sdio_stack.patch
-
----
- arch/arm/Kconfig                                 |    2 +
- drivers/Kconfig                                  |    2 +
- drivers/Makefile                                 |    1 +
- drivers/sdio/Kconfig                             |   17 +
- drivers/sdio/Makefile                            |    4 +
- drivers/sdio/stack/Makefile                      |    1 +
- drivers/sdio/stack/busdriver/Makefile            |    2 +
- drivers/sdio/stack/busdriver/_busdriver.h        |  466 ++++
- drivers/sdio/stack/busdriver/sdio_bus.c          | 2120 +++++++++++++++
- drivers/sdio/stack/busdriver/sdio_bus_events.c   | 1040 +++++++
- drivers/sdio/stack/busdriver/sdio_bus_misc.c     | 3122 ++++++++++++++++++++++
- drivers/sdio/stack/busdriver/sdio_bus_os.c       |  832 ++++++
- drivers/sdio/stack/busdriver/sdio_function.c     |  715 +++++
- drivers/sdio/stack/lib/Makefile                  |    2 +
- drivers/sdio/stack/lib/_sdio_lib.h               |   50 +
- drivers/sdio/stack/lib/sdio_lib_c.c              |  908 +++++++
- drivers/sdio/stack/lib/sdio_lib_os.c             |  251 ++
- drivers/sdio/stack/platform/Makefile             |    2 +
- drivers/sdio/stack/platform/sdioplatformdriver.c |  300 +++
- include/linux/sdio/_sdio_defs.h                  |  638 +++++
- include/linux/sdio/ctsystem.h                    |  115 +
- include/linux/sdio/ctsystem_linux.h              |  983 +++++++
- include/linux/sdio/mmc_defs.h                    |  103 +
- include/linux/sdio/sdio_busdriver.h              | 1435 ++++++++++
- include/linux/sdio/sdio_hcd_defs.h               |  219 ++
- include/linux/sdio/sdio_lib.h                    |  270 ++
- include/linux/sdio/sdlist.h                      |  141 +
- 27 files changed, 13741 insertions(+), 0 deletions(-)
- create mode 100644 drivers/sdio/Kconfig
- create mode 100644 drivers/sdio/Makefile
- create mode 100644 drivers/sdio/stack/Makefile
- create mode 100644 drivers/sdio/stack/busdriver/Makefile
- create mode 100644 drivers/sdio/stack/busdriver/_busdriver.h
- create mode 100644 drivers/sdio/stack/busdriver/sdio_bus.c
- create mode 100644 drivers/sdio/stack/busdriver/sdio_bus_events.c
- create mode 100644 drivers/sdio/stack/busdriver/sdio_bus_misc.c
- create mode 100644 drivers/sdio/stack/busdriver/sdio_bus_os.c
- create mode 100644 drivers/sdio/stack/busdriver/sdio_function.c
- create mode 100644 drivers/sdio/stack/lib/Makefile
- create mode 100644 drivers/sdio/stack/lib/_sdio_lib.h
- create mode 100644 drivers/sdio/stack/lib/sdio_lib_c.c
- create mode 100644 drivers/sdio/stack/lib/sdio_lib_os.c
- create mode 100644 drivers/sdio/stack/platform/Makefile
- create mode 100644 drivers/sdio/stack/platform/sdioplatformdriver.c
- create mode 100644 include/linux/sdio/_sdio_defs.h
- create mode 100644 include/linux/sdio/ctsystem.h
- create mode 100644 include/linux/sdio/ctsystem_linux.h
- create mode 100644 include/linux/sdio/mmc_defs.h
- create mode 100644 include/linux/sdio/sdio_busdriver.h
- create mode 100644 include/linux/sdio/sdio_hcd_defs.h
- create mode 100644 include/linux/sdio/sdio_lib.h
- create mode 100644 include/linux/sdio/sdlist.h
-
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index a04f507..23e3d6b 100644
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -1064,6 +1064,8 @@ source "drivers/hid/Kconfig"
- source "drivers/usb/Kconfig"
-+source "drivers/sdio/Kconfig"
-+
- source "drivers/mmc/Kconfig"
- source "drivers/leds/Kconfig"
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index f4076d9..bea3e95 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -74,6 +74,8 @@ source "drivers/hid/Kconfig"
- source "drivers/usb/Kconfig"
-+source "drivers/sdio/Kconfig"
-+
- source "drivers/mmc/Kconfig"
- source "drivers/leds/Kconfig"
-diff --git a/drivers/Makefile b/drivers/Makefile
-index 8cb37e3..7951916 100644
---- a/drivers/Makefile
-+++ b/drivers/Makefile
-@@ -77,6 +77,7 @@ obj-$(CONFIG_LGUEST_GUEST)   += lguest/
- obj-$(CONFIG_CPU_FREQ)                += cpufreq/
- obj-$(CONFIG_CPU_IDLE)                += cpuidle/
- obj-$(CONFIG_MMC)             += mmc/
-+obj-$(CONFIG_SDIO)              += sdio/
- obj-$(CONFIG_NEW_LEDS)                += leds/
- obj-$(CONFIG_INFINIBAND)      += infiniband/
- obj-$(CONFIG_SGI_SN)          += sn/
-diff --git a/drivers/sdio/Kconfig b/drivers/sdio/Kconfig
-new file mode 100644
-index 0000000..14bf5e3
---- /dev/null
-+++ b/drivers/sdio/Kconfig
-@@ -0,0 +1,17 @@
-+#
-+# SDIO driver and host controller support
-+#
-+
-+menu "SDIO support"
-+
-+config SDIO
-+        tristate "SDIO support"
-+        default m
-+        ---help---
-+          good luck.
-+
-+source "drivers/sdio/hcd/Kconfig"
-+
-+source "drivers/sdio/function/Kconfig"
-+
-+endmenu
-diff --git a/drivers/sdio/Makefile b/drivers/sdio/Makefile
-new file mode 100644
-index 0000000..f56aa0f
---- /dev/null
-+++ b/drivers/sdio/Makefile
-@@ -0,0 +1,4 @@
-+#Makefile for SDIO stack
-+obj-$(CONFIG_SDIO)      += stack/
-+obj-$(CONFIG_SDIO)      += hcd/
-+obj-$(CONFIG_SDIO)      += function/
-diff --git a/drivers/sdio/stack/Makefile b/drivers/sdio/stack/Makefile
-new file mode 100644
-index 0000000..ff0e24d
---- /dev/null
-+++ b/drivers/sdio/stack/Makefile
-@@ -0,0 +1 @@
-+obj-$(CONFIG_SDIO)      += busdriver/ lib/
-\ No newline at end of file
-diff --git a/drivers/sdio/stack/busdriver/Makefile b/drivers/sdio/stack/busdriver/Makefile
-new file mode 100644
-index 0000000..1130e2d
---- /dev/null
-+++ b/drivers/sdio/stack/busdriver/Makefile
-@@ -0,0 +1,2 @@
-+obj-$(CONFIG_SDIO) += sdio_busdriver.o
-+sdio_busdriver-objs := sdio_bus.o sdio_function.o sdio_bus_misc.o sdio_bus_events.o sdio_bus_os.o
-diff --git a/drivers/sdio/stack/busdriver/_busdriver.h b/drivers/sdio/stack/busdriver/_busdriver.h
-new file mode 100644
-index 0000000..a85aed1
---- /dev/null
-+++ b/drivers/sdio/stack/busdriver/_busdriver.h
-@@ -0,0 +1,466 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: _busdriver.h
-+
-+@abstract: internal include file for busdriver
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#ifndef ___BUSDRIVER_H___
-+#define ___BUSDRIVER_H___
-+#include <linux/sdio/sdio_lib.h>
-+
-+#define SDIODBG_FUNC_IRQ  (SDDBG_TRACE + 1)
-+#define SDIODBG_REQUESTS  (SDDBG_TRACE + 2)
-+#define SDIODBG_CD_TIMER  (SDDBG_TRACE + 3)
-+#define SDIODBG_HCD_EVENTS  (SDDBG_TRACE + 4)
-+
-+#define SDIOBUS_CD_TIMER_ID 0
-+
-+#define SDBUS_MAX_RETRY   3
-+
-+/* Notes on list linkages:
-+ *  list heads are held in BDCONTEXT
-+ *  HcdList - SDHCD
-+ *          one per registered host controller
-+ *          Next - links of all HCDs
-+ *  DeviceList SDDEVICE
-+ *          one per inserted device
-+ *          Next - links of all devices
-+ *          DeviceListNext - links of all devices on a function
-+ *          pFunction - ptr to Function supportting this device
-+ *          pHcd - ptr to HCD with supporting this device
-+ *  FunctionList SDFUNCTION
-+ *          one per register function driver
-+ *          Next - links of all functions
-+ *          DeviceList - list of devices being support by this function
-+ *                       uses DeviceListNext in SDDEVICE to link
-+ *
-+ *
-+*/
-+
-+#define SDMMC_DEFAULT_CMD_RETRIES           1
-+#define SDMMC_DEFAULT_CARD_READY_RETRIES    200
-+#define OCR_READY_CHECK_DELAY_MS            10
-+#define SDMMC_POWER_SETTLE_DELAY            400  /* in milliseconds */
-+#define SDBUS_DEFAULT_REQ_LIST_SIZE         16
-+#define SDBUS_DEFAULT_REQ_SIG_SIZE          8
-+#define CARD_DETECT_PAUSE                   100
-+#define SDBUS_DEFAULT_CD_POLLING_INTERVAL   1000  /* in milliseconds */
-+#define MAX_CARD_DETECT_MSGS                16
-+#define SDMMC_DEFAULT_BYTES_PER_BLOCK       2048
-+#define SDMMC_DEFAULT_BLOCKS_PER_TRANS      512
-+#define SDMMC_CMD13_POLLING_MULTIPLIER      1000 /* per block multiplier */
-+#define MAX_HCD_REQ_RECURSION               5
-+#define MAX_HCD_RECURSION_RUNAWAY           100
-+
-+    /* internal signalling item */
-+typedef struct _SIGNAL_ITEM{
-+    SDLIST       SDList;        /* list link*/
-+    OS_SIGNAL    Signal;        /* signal */
-+}SIGNAL_ITEM, *PSIGNAL_ITEM;
-+
-+typedef struct _HCD_EVENT_MESSAGE {
-+    HCD_EVENT Event;    /* the event */
-+    PSDHCD    pHcd;     /* hcd that generated the event */
-+}HCD_EVENT_MESSAGE, *PHCD_EVENT_MESSAGE;
-+
-+/* internal data for bus driver */
-+typedef struct _BDCONTEXT {
-+
-+    /* list of SD requests and signalling semaphores and a semaphore to protect it */
-+    SDLIST  RequestList;
-+    SDLIST  SignalList;
-+    OS_CRITICALSECTION RequestListCritSection;
-+    /* list of host controller bus drivers, sempahore to protect it */
-+    SDLIST HcdList;
-+    OS_SEMAPHORE HcdListSem;
-+    /* list of inserted devices, semaphore to protect it */
-+    SDLIST DeviceList;
-+    OS_SEMAPHORE DeviceListSem;
-+    /* list of function drivers, semaphore to protect it */
-+    SDLIST FunctionList;
-+    OS_SEMAPHORE FunctionListSem;
-+    INT              RequestListSize;        /* default request list */
-+    INT              SignalSemListSize;      /* default signalling semaphore size */
-+    INT              CurrentRequestAllocations; /*current count of allocated requests */
-+    INT              CurrentSignalAllocations;   /* current count of signal allocations */
-+    INT              MaxRequestAllocations;  /* max number of allocated requests to keep around*/
-+    INT              MaxSignalAllocations;   /* max number of signal allocations to keep around*/
-+    INT              RequestRetries;         /* cmd retries */
-+    INT              CardReadyPollingRetry;  /* card ready polling retry count */
-+    INT              PowerSettleDelay;       /* power settle delay */
-+    INT              CMD13PollingMultiplier; /* CMD13 (GET STATUS) multiplier */
-+    SD_BUSCLOCK_RATE DefaultOperClock;       /* default operation clock */
-+    SD_BUSMODE_FLAGS DefaultBusMode;         /* default bus mode */
-+    UINT16           DefaultOperBlockLen;    /* default operational block length per block */
-+    UINT16           DefaultOperBlockCount;  /* default operational block count per transaction */
-+    UINT32           CDPollingInterval;      /* card insert/removal polling interval */
-+    UINT8            InitMask;               /* bus driver init mask */
-+#define BD_TIMER_INIT    0x01
-+#define HELPER_INIT      0x02
-+#define RESOURCE_INIT    0x04
-+    BOOL             CDTimerQueued;          /* card detect timer queued */
-+    OSKERNEL_HELPER  CardDetectHelper;       /* card detect helper */
-+    PSDMESSAGE_QUEUE pCardDetectMsgQueue;    /* card detect message queue */
-+    ULONG            HcdInUseField;          /* bit field of in use HCD numbers*/
-+    UINT32           ConfigFlags;            /* bus driver configuration flags */
-+#define BD_CONFIG_SDREQ_FORCE_ALL_ASYNC 0x00000001
-+    INT              MaxHcdRecursion;        /* max HCD recurion level */
-+}BDCONTEXT, *PBDCONTEXT;
-+
-+#define BD_DEFAULT_CONFIG_FLAGS 0x00000000
-+#define IsQueueBusy(pRequestQueue)      (pRequestQueue)->Busy
-+#define MarkQueueBusy(pRequestQueue)    (pRequestQueue)->Busy = TRUE
-+#define MarkQueueNotBusy(pRequestQueue) (pRequestQueue)->Busy = FALSE
-+
-+#define CLEAR_INTERNAL_REQ_FLAGS(pReq) (pReq)->Flags &= ~(UINT)((SDREQ_FLAGS_RESP_SPI_CONVERTED | \
-+                                                          SDREQ_FLAGS_FORCE_DEFERRED_COMPLETE))
-+
-+/* macros to insert request into the queue */
-+#define QueueRequest(pReqQ,pReq) SDListInsertTail(&(pReqQ)->Queue,&(pReq)->SDList)
-+#define QueueRequestToFront(pReqQ,pReq) SDListInsertHead(&(pReqQ)->Queue,&(pReq)->SDList)
-+
-+/* macros to remove an item from the head of the queue */
-+static INLINE PSDREQUEST DequeueRequest(PSDREQUESTQUEUE pRequestQueue) {
-+    PSDLIST pItem;
-+    pItem = SDListRemoveItemFromHead(&pRequestQueue->Queue);
-+    if (pItem != NULL) {
-+        return CONTAINING_STRUCT(pItem, SDREQUEST, SDList);
-+    }
-+    return NULL;
-+};
-+
-+static INLINE SDIO_STATUS InitializeRequestQueue(PSDREQUESTQUEUE pRequestQueue) {
-+    SDLIST_INIT(&pRequestQueue->Queue);
-+    MarkQueueNotBusy(pRequestQueue);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+static INLINE void CleanupRequestQueue(PSDREQUESTQUEUE pRequestQueue) {
-+
-+}
-+
-+/* for bus driver internal use only */
-+SDIO_STATUS _SDIO_BusDriverInitialize(void);
-+SDIO_STATUS _SDIO_BusGetDefaultSettings(PBDCONTEXT pBdc);
-+void _SDIO_BusDriverCleanup(void);
-+SDIO_STATUS RemoveAllFunctions(void);
-+SDIO_STATUS RemoveHcdFunctions(PSDHCD pHcd);
-+PSDDEVICE AllocateDevice(PSDHCD pHcd);
-+BOOL AddDeviceToList(PSDDEVICE pDevice);
-+SDIO_STATUS DeleteDevices(PSDHCD pHcd);
-+SDIO_STATUS NotifyDeviceRemove(PSDDEVICE pDevice);
-+extern PBDCONTEXT pBusContext;
-+extern const CT_VERSION_CODE g_Version;
-+SDIO_STATUS _SDIO_RegisterHostController(PSDHCD pHcd);
-+SDIO_STATUS _SDIO_UnregisterHostController(PSDHCD pHcd);
-+SDIO_STATUS _SDIO_HandleHcdEvent(PSDHCD pHcd, HCD_EVENT Event);
-+SDIO_STATUS _SDIO_RegisterFunction(PSDFUNCTION pFunction);
-+SDIO_STATUS _SDIO_UnregisterFunction(PSDFUNCTION pFunction);
-+SDIO_STATUS _SDIO_CheckResponse(PSDHCD pHcd, PSDREQUEST pReq, SDHCD_RESPONSE_CHECK_MODE CheckMode);
-+SDIO_STATUS ProbeForFunction(PSDDEVICE pDevice, PSDHCD pHcd);
-+SDIO_STATUS SDInitializeCard(PSDHCD pHcd);
-+SDIO_STATUS SDQuerySDMMCInfo(PSDDEVICE pDevice);
-+SDIO_STATUS SDQuerySDIOInfo(PSDDEVICE pDevice);
-+SDIO_STATUS SDEnableFunction(PSDDEVICE pDevice, PSDCONFIG_FUNC_ENABLE_DISABLE_DATA pEnData);
-+SDIO_STATUS SDAllocFreeSlotCurrent(PSDDEVICE pDevice, BOOL Allocate, PSDCONFIG_FUNC_SLOT_CURRENT_DATA pData);
-+SDIO_STATUS SDMaskUnmaskFunctionIRQ(PSDDEVICE pDevice, BOOL Mask);
-+SDIO_STATUS SDFunctionAckInterrupt(PSDDEVICE pDevice);
-+SDIO_STATUS SDSPIModeEnableDisableCRC(PSDDEVICE pDevice,BOOL Enable);
-+SDIO_STATUS IssueBusConfig(PSDDEVICE pDev, PSDCONFIG pConfig);
-+SDIO_STATUS IssueBusRequest(PSDDEVICE pDev, PSDREQUEST pReq);
-+PSDREQUEST IssueAllocRequest(PSDDEVICE pDev);
-+void IssueFreeRequest(PSDDEVICE pDev, PSDREQUEST pReq);
-+PSDREQUEST AllocateRequest(void);
-+void FreeRequest(PSDREQUEST pReq);
-+PSIGNAL_ITEM AllocateSignal(void);
-+void FreeSignal(PSIGNAL_ITEM pSignal);
-+SDIO_STATUS InitializeTimers(void);
-+SDIO_STATUS CleanupTimers(void);
-+SDIO_STATUS QueueTimer(INT TimerID, UINT32 TimeOut);
-+SDIO_STATUS DeviceAttach(PSDHCD pHcd);
-+SDIO_STATUS DeviceDetach(PSDHCD pHcd);
-+SDIO_STATUS DeviceInterrupt(PSDHCD pHcd);
-+SDIO_STATUS CardInitSetup(PSDHCD pHcd);
-+void RunCardDetect(void);
-+void SDIO_NotifyTimerTriggered(INT TimerID);
-+SDIO_STATUS TestPresence(PSDHCD          pHcd,
-+                         CARD_INFO_FLAGS TestType,
-+                         PSDREQUEST      pReq);
-+#define _IssueSimpleBusRequest(pHcd,Cmd,Arg,Flags,pReqToUse) \
-+          _IssueBusRequestBd((pHcd),(Cmd),(Arg),(Flags),(pReqToUse),NULL,0)
-+
-+SDIO_STATUS Do_OS_IncHcdReference(PSDHCD pHcd);
-+SDIO_STATUS Do_OS_DecHcdReference(PSDHCD pHcd);
-+SDIO_STATUS TryNoIrqPendingCheck(PSDDEVICE pDev);
-+
-+    /* check API version compatibility of an HCD or function driver to a stack major/minor version
-+     if the driver version is greater than the major number, we are compatible
-+     if the driver version is equal, then we check if the minor is greater than or equal
-+     we don't have to check for the less than major, because the bus driver never loads
-+     drivers with different major numbers ...
-+     if the busdriver compiled version major is greater than the major version being checked this
-+     macro will resolved to ALWAYS true thus optimizing the code to not check the HCD since
-+     as a rule we never load an HCD with a lower major number */
-+#define CHECK_API_VERSION_COMPAT(p,major,minor)       \
-+     ((CT_SDIO_STACK_VERSION_MAJOR(CT_SDIO_STACK_VERSION_CODE) > (major)) || \
-+      (GET_SDIO_STACK_VERSION_MINOR((p)) >= (minor)))
-+
-+static INLINE SDIO_STATUS OS_IncHcdReference(PSDHCD pHcd) {
-+        /* this API was added in version 2.3 which requires access to a field in the HCD structure */
-+    if (CHECK_API_VERSION_COMPAT(pHcd,2,3)) {
-+            /* we can safely call the OS-dependent function */
-+        return Do_OS_IncHcdReference(pHcd);
-+    }
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+static INLINE SDIO_STATUS OS_DecHcdReference(PSDHCD pHcd) {
-+            /* this API was added in version 2.3 which requires access to a field in the HCD structure */
-+    if (CHECK_API_VERSION_COMPAT(pHcd,2,3)) {
-+            /* we can safely call the OS-dependent function */
-+        return Do_OS_DecHcdReference(pHcd);
-+    }
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+SDIO_STATUS _IssueBusRequestBd(PSDHCD           pHcd,
-+                               UINT8            Cmd,
-+                               UINT32           Argument,
-+                               SDREQUEST_FLAGS  Flags,
-+                               PSDREQUEST       pReqToUse,
-+                               PVOID            pData,
-+                               INT              Length);
-+
-+SDIO_STATUS IssueRequestToHCD(PSDHCD pHcd,PSDREQUEST pReq);
-+
-+#define CALL_HCD_CONFIG(pHcd,pCfg) (pHcd)->pConfigure((pHcd),(pCfg))
-+    /* macro to force all requests to be asynchronous in the HCD */
-+static INLINE BOOL ForceAllRequestsAsync(void) {
-+    return (pBusContext->ConfigFlags & BD_CONFIG_SDREQ_FORCE_ALL_ASYNC);
-+}
-+
-+static INLINE SDIO_STATUS CallHcdRequest(PSDHCD pHcd) {
-+
-+    if (pHcd->pCurrentRequest->Flags & SDREQ_FLAGS_PSEUDO) {
-+        DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: PSEUDO Request 0x%X \n",
-+                    (INT)pHcd->pCurrentRequest));
-+            /* return successful completion so that processing can finish */
-+        return SDIO_STATUS_SUCCESS;
-+    }
-+
-+    if (ForceAllRequestsAsync()) {
-+            /* all requests must be completed(indicated) in a separate context */
-+        pHcd->pCurrentRequest->Flags |= SDREQ_FLAGS_FORCE_DEFERRED_COMPLETE;
-+    } else {
-+            /* otherwise perform a test on flags in the HCD */
-+        if (!CHECK_API_VERSION_COMPAT(pHcd,2,6) &&
-+            AtomicTest_Set(&pHcd->HcdFlags, HCD_REQUEST_CALL_BIT)) {
-+
-+            /* bit was already set, this is a recursive call,
-+             * we need to tell the HCD to complete the
-+             * request in a separate context */
-+            DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Recursive CallHcdRequest \n"));
-+            pHcd->pCurrentRequest->Flags |= SDREQ_FLAGS_FORCE_DEFERRED_COMPLETE;
-+        }
-+    }
-+ #if DEBUG
-+    {
-+        SDIO_STATUS status;
-+        BOOL forceDeferred;
-+        forceDeferred = pHcd->pCurrentRequest->Flags & SDREQ_FLAGS_FORCE_DEFERRED_COMPLETE;
-+        status = pHcd->pRequest(pHcd);
-+        if (forceDeferred) {
-+                /* status better be pending... */
-+            DBG_ASSERT(status == SDIO_STATUS_PENDING);
-+        }
-+        return status;
-+    }
-+ #else
-+    return pHcd->pRequest(pHcd);
-+ #endif
-+
-+}
-+
-+/* note the caller of this macro must take the HCD lock to protect the count */
-+#define CHECK_HCD_RECURSE(pHcd,pReq)   \
-+{                                      \
-+    (pHcd)->Recursion++;               \
-+    DBG_ASSERT((pHcd)->Recursion < MAX_HCD_RECURSION_RUNAWAY); \
-+    if ((pHcd)->Recursion > pBusContext->MaxHcdRecursion) {    \
-+        DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Recursive Request Count Exceeded (%d) \n",(pHcd)->Recursion)); \
-+        (pReq)->Flags |= SDREQ_FLAGS_FORCE_DEFERRED_COMPLETE; \
-+    }                                                         \
-+}
-+
-+/* InternalFlags bit number settings */
-+#define SDBD_INIT        1
-+#define SDBD_PENDING    15
-+#define SDBD_ALLOC_IRQ_SAFE     2
-+
-+#define SDBD_ALLOC_IRQ_SAFE_MASK (1 << SDBD_ALLOC_IRQ_SAFE)
-+
-+static void INLINE DoRequestCompletion(PSDREQUEST pReq, PSDHCD pHcd) {
-+    CLEAR_INTERNAL_REQ_FLAGS(pReq);
-+    if (pReq->pCompletion != NULL) {
-+        DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Calling completion on request:0x%X, CMD:%d \n",
-+           (INT)pReq, pReq->Command));
-+            /* call completion routine, mark request reusable */
-+        AtomicTest_Clear(&pReq->InternalFlags, SDBD_PENDING);
-+        pReq->pCompletion(pReq);
-+    } else {
-+            /* mark request reusable */
-+        AtomicTest_Clear(&pReq->InternalFlags, SDBD_PENDING);
-+    }
-+}
-+
-+THREAD_RETURN CardDetectHelperFunction(POSKERNEL_HELPER pHelper);
-+THREAD_RETURN SDIOIrqHelperFunction(POSKERNEL_HELPER pHelper);
-+
-+void ConvertSPI_Response(PSDREQUEST pReq, UINT8 *pRespBuffer);
-+
-+static INLINE SDIO_STATUS PostCardDetectEvent(PBDCONTEXT pSDB, HCD_EVENT Event, PSDHCD pHcd) {
-+    HCD_EVENT_MESSAGE message;
-+    SDIO_STATUS       status;
-+    message.Event = Event;
-+    message.pHcd = pHcd;
-+
-+    if (pHcd != NULL) {
-+            /* increment HCD reference count to process this HCD message */
-+        status = OS_IncHcdReference(pHcd);
-+        if (!SDIO_SUCCESS(status)) {
-+            return status;
-+        }
-+    }
-+        /* post card detect message */
-+    status = SDLIB_PostMessage(pSDB->pCardDetectMsgQueue, &message, sizeof(message));
-+    if (!SDIO_SUCCESS(status)) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: PostCardDetectEvent error status %d\n",status));
-+        if (pHcd != NULL) {
-+                /* decrement count */
-+            OS_DecHcdReference(pHcd);
-+        }
-+        return status;
-+    }
-+        /* wake card detect helper */
-+    DBG_PRINT(SDIODBG_HCD_EVENTS, ("SDIO Bus Driver: PostCardDetectEvent waking\n"));
-+    return SD_WAKE_OS_HELPER(&pSDB->CardDetectHelper);
-+};
-+
-+/* initialize device fields */
-+static INLINE void InitDeviceData(PSDHCD pHcd, PSDDEVICE pDevice) {
-+    ZERO_POBJECT(pDevice);
-+    SDLIST_INIT(&pDevice->SDList);
-+    SDLIST_INIT(&pDevice->FuncListLink);
-+    pDevice->pRequest = IssueBusRequest;
-+    pDevice->pConfigure = IssueBusConfig;
-+    pDevice->AllocRequest = IssueAllocRequest;
-+    pDevice->FreeRequest = IssueFreeRequest;
-+        /* set card flags in the ID */
-+    pDevice->pId[0].CardFlags = pHcd->CardProperties.Flags;
-+    pDevice->pFunction = NULL;
-+    pDevice->pHcd = pHcd;
-+    SET_SDIO_STACK_VERSION(pDevice);
-+}
-+
-+/* de-initialize device fields */
-+static INLINE void DeinitDeviceData(PSDDEVICE pDevice) {
-+}
-+
-+/* reset hcd state */
-+static INLINE void ResetHcdState(PSDHCD pHcd) {
-+    ZERO_POBJECT(&pHcd->CardProperties);
-+    pHcd->PendingHelperIrqs = 0;
-+    pHcd->PendingIrqAcks = 0;
-+    pHcd->IrqsEnabled = 0;
-+    pHcd->pCurrentRequest = NULL;
-+    pHcd->IrqProcState = SDHCD_IDLE;
-+        /* mark this device as special */
-+    pHcd->pPseudoDev->pId[0].CardFlags = CARD_PSEUDO;
-+    pHcd->SlotCurrentAllocated = 0;
-+}
-+
-+static INLINE SDIO_STATUS _IssueConfig(PSDHCD           pHcd,
-+                                       SDCONFIG_COMMAND Command,
-+                                       PVOID            pData,
-+                                       INT              Length){
-+    SDCONFIG  configHdr;
-+    SET_SDCONFIG_CMD_INFO(&configHdr,Command,pData,Length);
-+    return CALL_HCD_CONFIG(pHcd,&configHdr);
-+}
-+
-+/* prototypes */
-+#define _AcquireHcdLock(pHcd)CriticalSectionAcquireSyncIrq(&(pHcd)->HcdCritSection)
-+#define _ReleaseHcdLock(pHcd)CriticalSectionReleaseSyncIrq(&(pHcd)->HcdCritSection)
-+
-+#define AcquireHcdLock(pDev) CriticalSectionAcquireSyncIrq(&(pDev)->pHcd->HcdCritSection)
-+#define ReleaseHcdLock(pDev) CriticalSectionReleaseSyncIrq(&(pDev)->pHcd->HcdCritSection)
-+
-+SDIO_STATUS OS_AddDevice(PSDDEVICE pDevice, PSDFUNCTION pFunction);
-+void OS_RemoveDevice(PSDDEVICE pDevice);
-+SDIO_STATUS OS_InitializeDevice(PSDDEVICE pDevice, PSDFUNCTION pFunction);
-+SDIO_STATUS SetOperationalBusMode(PSDDEVICE               pDevice,
-+                                  PSDCONFIG_BUS_MODE_DATA pBusMode);
-+void FreeDevice(PSDDEVICE pDevice);
-+BOOL IsPotentialIdMatch(PSD_PNP_INFO pIdsDev, PSD_PNP_INFO pIdsFuncList);
-+
-+
-+#define CHECK_FUNCTION_DRIVER_VERSION(pF) \
-+    (GET_SDIO_STACK_VERSION_MAJOR((pF)) == CT_SDIO_STACK_VERSION_MAJOR(g_Version))
-+#define CHECK_HCD_DRIVER_VERSION(pH) \
-+    (GET_SDIO_STACK_VERSION_MAJOR((pH)) == CT_SDIO_STACK_VERSION_MAJOR(g_Version))
-+
-+/* CLARIFICATION on SDREQ_FLAGS_PSEUDO and SDREQ_FLAGS_BARRIER flags :
-+ *
-+ * A request marked as PSEUDO is synchronized with bus requests and is not a true request
-+ * that is issued to an HCD.
-+ *
-+ * A request marked with a BARRIER flag requires that the completion routine be called
-+ * before the next bus request starts.  This is required for HCD requests that can change
-+ * bus or clock modes.  Changing the clock or bus mode while a bus request is pending
-+ * can cause problems.
-+ *
-+ *
-+ *
-+ * */
-+#define SD_PSEUDO_REQ_FLAGS \
-+      (SDREQ_FLAGS_PSEUDO | SDREQ_FLAGS_BARRIER | SDREQ_FLAGS_TRANS_ASYNC)
-+
-+#endif /*___BUSDRIVER_H___*/
-diff --git a/drivers/sdio/stack/busdriver/sdio_bus.c b/drivers/sdio/stack/busdriver/sdio_bus.c
-new file mode 100644
-index 0000000..ffc1e9f
---- /dev/null
-+++ b/drivers/sdio/stack/busdriver/sdio_bus.c
-@@ -0,0 +1,2120 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdio_bus.c
-+
-+@abstract: OS independent bus driver support
-+@category abstract: HD_Reference Host Controller Driver Interfaces.
-+@category abstract: PD_Reference
-+    Peripheral Driver Interfaces.
-+
-+#notes: this file supports the HCD's and generic functions
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define MODULE_NAME  SDBUSDRIVER
-+#include <linux/sdio/ctsystem.h>
-+#include <linux/sdio/sdio_busdriver.h>
-+#include <linux/sdio/_sdio_defs.h>
-+#include <linux/sdio/sdio_lib.h>
-+#include <linux/sdio/mmc_defs.h>
-+#include "_busdriver.h"
-+
-+/* list of host controller bus drivers */
-+PBDCONTEXT pBusContext = NULL;
-+static void CleanUpBusResources(void);
-+static SDIO_STATUS AllocateBusResources(void);
-+static PSIGNAL_ITEM BuildSignal(void);
-+static void DestroySignal(PSIGNAL_ITEM pSignal);
-+
-+const CT_VERSION_CODE g_Version = CT_SDIO_STACK_VERSION_CODE;
-+/*
-+ * _SDIO_BusDriverInitialize - call once on driver loading
-+ *
-+*/
-+SDIO_STATUS _SDIO_BusDriverInitialize(void)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Version: %d.%d\n",
-+       CT_SDIO_STACK_VERSION_MAJOR(g_Version),CT_SDIO_STACK_VERSION_MINOR(g_Version)));
-+
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: enter _SDIO_BusDriverInitialize\n"));
-+
-+    do {
-+        /* allocate our internal data initialize it */
-+        pBusContext = KernelAlloc(sizeof(BDCONTEXT));
-+        if (pBusContext == NULL) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_BusDriverInitialize can't allocate memory.\n"));
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            break;
-+        }
-+        memset(pBusContext,0,sizeof(BDCONTEXT));
-+        SDLIST_INIT(&pBusContext->RequestList);
-+        SDLIST_INIT(&pBusContext->HcdList);
-+        SDLIST_INIT(&pBusContext->DeviceList);
-+        SDLIST_INIT(&pBusContext->FunctionList);
-+        SDLIST_INIT(&pBusContext->SignalList);
-+
-+            /* setup defaults */
-+        pBusContext->RequestRetries = SDMMC_DEFAULT_CMD_RETRIES;
-+        pBusContext->CardReadyPollingRetry = SDMMC_DEFAULT_CARD_READY_RETRIES;
-+        pBusContext->PowerSettleDelay = SDMMC_POWER_SETTLE_DELAY;
-+        pBusContext->DefaultOperClock = MMC_HS_MAX_BUS_CLOCK;
-+        pBusContext->DefaultBusMode = SDCONFIG_BUS_WIDTH_4_BIT;
-+        pBusContext->RequestListSize = SDBUS_DEFAULT_REQ_LIST_SIZE;
-+        pBusContext->SignalSemListSize = SDBUS_DEFAULT_REQ_SIG_SIZE;
-+        pBusContext->CDPollingInterval = SDBUS_DEFAULT_CD_POLLING_INTERVAL;
-+        pBusContext->DefaultOperBlockLen = SDMMC_DEFAULT_BYTES_PER_BLOCK;
-+        pBusContext->DefaultOperBlockCount = SDMMC_DEFAULT_BLOCKS_PER_TRANS;
-+        pBusContext->ConfigFlags = BD_DEFAULT_CONFIG_FLAGS;
-+        pBusContext->CMD13PollingMultiplier = SDMMC_CMD13_POLLING_MULTIPLIER;
-+        pBusContext->MaxHcdRecursion = MAX_HCD_REQ_RECURSION;
-+
-+            /* get overrides for the defaults */
-+        status = _SDIO_BusGetDefaultSettings(pBusContext);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+
-+        pBusContext->MaxRequestAllocations = pBusContext->RequestListSize << 1;
-+        pBusContext->MaxSignalAllocations = pBusContext->SignalSemListSize << 1;
-+
-+        status = CriticalSectionInit(&pBusContext->RequestListCritSection);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_BusDriverInitialize can't CriticalSectionInit.\n"));
-+            break;
-+        }
-+        status = SemaphoreInitialize(&pBusContext->HcdListSem, 1);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_BusDriverInitialize can't SemaphoreInitialize HcdListSem.\n"));
-+            break;
-+        }
-+        status = SemaphoreInitialize(&pBusContext->DeviceListSem, 1);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_BusDriverInitialize can't SemaphoreInitialize DeviceListSem.\n"));
-+            break;
-+        }
-+        status = SemaphoreInitialize(&pBusContext->FunctionListSem, 1);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_BusDriverInitialize can't SemaphoreInitialize FunctionListSem.\n"));
-+            break;
-+        }
-+        status = AllocateBusResources();
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_BusDriverInitialize can't AllocateBusResources.\n"));
-+            break;
-+        }
-+
-+        pBusContext->InitMask |= RESOURCE_INIT;
-+
-+        pBusContext->pCardDetectMsgQueue = SDLIB_CreateMessageQueue(MAX_CARD_DETECT_MSGS,
-+                                                                   sizeof(HCD_EVENT_MESSAGE));
-+
-+        if (NULL == pBusContext->pCardDetectMsgQueue) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_BusDriverInitialize can't CreateMessageQueue.\n"));
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            break;
-+        }
-+
-+        status = SDLIB_OSCreateHelper(&pBusContext->CardDetectHelper,
-+                                      CardDetectHelperFunction,
-+                                      NULL);
-+
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_BusDriverInitialize can't OSCreateHelper.\n"));
-+            break;
-+        }
-+
-+        pBusContext->InitMask |= HELPER_INIT;
-+
-+        status = InitializeTimers();
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_BusDriverInitialize can't InitializeTimers.\n"));
-+            break;
-+        }
-+        pBusContext->InitMask |= BD_TIMER_INIT;
-+    } while(FALSE);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        _SDIO_BusDriverCleanup();
-+    }
-+
-+    return status;
-+}
-+
-+
-+/*
-+ * _SDIO_BusDriverBusDriverCleanup - call once on driver unloading
-+ *
-+*/
-+void _SDIO_BusDriverCleanup(void) {
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: _SDIO_BusDriverCleanup\n"));
-+
-+    if (pBusContext->InitMask & BD_TIMER_INIT) {
-+        CleanupTimers();
-+    }
-+
-+    if (pBusContext->InitMask & HELPER_INIT) {
-+        SDLIB_OSDeleteHelper(&pBusContext->CardDetectHelper);
-+    }
-+
-+    if (pBusContext->pCardDetectMsgQueue != NULL) {
-+        SDLIB_DeleteMessageQueue(pBusContext->pCardDetectMsgQueue);
-+        pBusContext->pCardDetectMsgQueue = NULL;
-+    }
-+        /* remove functions */
-+    RemoveAllFunctions();
-+        /* cleanup all devices */
-+    DeleteDevices(NULL);
-+    CleanUpBusResources();
-+    CriticalSectionDelete(&pBusContext->RequestListCritSection);
-+    SemaphoreDelete(&pBusContext->HcdListSem);
-+    SemaphoreDelete(&pBusContext->DeviceListSem);
-+    SemaphoreDelete(&pBusContext->FunctionListSem);
-+    KernelFree(pBusContext);
-+    pBusContext = NULL;
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: _SDIO_BusDriverCleanup\n"));
-+}
-+
-+
-+/* cleanup hcd */
-+static void CleanupHcd(PSDHCD pHcd)
-+{
-+    SDLIB_OSDeleteHelper(&pHcd->SDIOIrqHelper);
-+    CleanupRequestQueue(&pHcd->CompletedRequestQueue);
-+    CleanupRequestQueue(&pHcd->RequestQueue);
-+    CriticalSectionDelete(&pHcd->HcdCritSection);
-+    SemaphoreDelete(&pHcd->ConfigureOpsSem);
-+    pHcd->pCurrentRequest = NULL;
-+    if (pHcd->pPseudoDev != NULL) {
-+        FreeDevice(pHcd->pPseudoDev);
-+        pHcd->pPseudoDev = NULL;
-+    }
-+}
-+
-+/* set up the hcd */
-+static SDIO_STATUS SetupHcd(PSDHCD pHcd)
-+{
-+    SDIO_STATUS status;
-+
-+    ZERO_POBJECT(&pHcd->SDIOIrqHelper);
-+    ZERO_POBJECT(&pHcd->ConfigureOpsSem);
-+    ZERO_POBJECT(&pHcd->HcdCritSection);
-+    ZERO_POBJECT(&pHcd->RequestQueue);
-+    ZERO_POBJECT(&pHcd->CompletedRequestQueue);
-+    pHcd->pPseudoDev = NULL;
-+    pHcd->Recursion = 0;
-+
-+    do {
-+
-+        pHcd->pPseudoDev = AllocateDevice(pHcd);
-+
-+        if (NULL == pHcd->pPseudoDev) {
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            break;
-+        }
-+
-+        ResetHcdState(pHcd);
-+
-+        status = SemaphoreInitialize(&pHcd->ConfigureOpsSem,1);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+        status = CriticalSectionInit(&pHcd->HcdCritSection);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+        status = InitializeRequestQueue(&pHcd->RequestQueue);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+        status = InitializeRequestQueue(&pHcd->CompletedRequestQueue);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+            /* create SDIO Irq helper */
-+        status = SDLIB_OSCreateHelper(&pHcd->SDIOIrqHelper,
-+                                      SDIOIrqHelperFunction,
-+                                     (PVOID)pHcd);
-+    } while(FALSE);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+            /* undo what we did */
-+        CleanupHcd(pHcd);
-+    }
-+    return status;
-+}
-+
-+
-+/*
-+ * _SDIO_RegisterHostController - register a host controller bus driver
-+ *
-+*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Register a host controller driver with the bus driver.
-+
-+  @function name: SDIO_RegisterHostController
-+  @prototype: SDIO_STATUS SDIO_RegisterHostController (PSDHCD pHcd)
-+  @category: HD_Reference
-+
-+  @input:  pHcd - the host controller definition structure.
-+
-+  @output: none
-+
-+  @return: SDIO_STATUS - SDIO_STATUS_SUCCESS when successful.
-+
-+  @notes: Each host controller driver must register with the bus driver when loaded.
-+          The driver registers an SDHCD structure initialized with hardware properties
-+          and callback functions for bus requests and configuration.  On multi-slot
-+          hardware ,each slot should be registered with a separate SDHCD structure.
-+          The bus driver views each slot as a seperate host controller object.
-+          The driver should be prepared to receive configuration requests before
-+          this call returns. The host controller driver must unregister itself when
-+          shutting down.
-+
-+  @example: Registering a host controller driver:
-+    static SDHCD Hcd = {
-+       .pName = "sdio_custom_hcd",
-+       .Version = CT_SDIO_STACK_VERSION_CODE,  // set stack version code
-+       .SlotNumber = 0,                        // bus driver internal use
-+       .Attributes = SDHCD_ATTRIB_BUS_1BIT | SDHCD_ATTRIB_BUS_4BIT | SDHCD_ATTRIB_MULTI_BLK_IRQ
-+                     SDHCD_ATTRIB_AUTO_CMD12 ,
-+       .MaxBytesPerBlock = 2048     // each data block can be up to 2048 bytes
-+       .MaxBlocksPerTrans = 1024,   // each data transaction can consist of 1024 blocks
-+       .MaxSlotCurrent = 500,       // max FET switch current rating
-+       .SlotVoltageCaps = SLOT_POWER_3_3V,      // only 3.3V operation
-+       .SlotVoltagePreferred = SLOT_POWER_3_3V,
-+       .MaxClockRate = 24000000,   // 24 Mhz max operation
-+       .pContext = &HcdContext,    // set our driver context
-+       .pRequest = HcdRequest,     // set SDIO bus request callback
-+       .pConfigure = HcdConfig,    // set SDIO bus configuration callback
-+    };
-+    if (!SDIO_SUCCESS((status = SDIO_RegisterHostController(&Hcd)))) {
-+         DBG_PRINT(SDDBG_ERROR, ("SDIO HCD - failed to register with host, status =%d\n",
-+                                    status));
-+    }
-+
-+  @see also: SDIO_UnregisterHostController
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _SDIO_RegisterHostController(PSDHCD pHcd) {
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: _SDIO_RegisterHostController - %s\n",pHcd->pName));
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: Host Controller Stack Version: %d.%d \n",
-+        GET_SDIO_STACK_VERSION_MAJOR(pHcd),GET_SDIO_STACK_VERSION_MINOR(pHcd)));
-+
-+    if (!CHECK_HCD_DRIVER_VERSION(pHcd)) {
-+        DBG_PRINT(SDDBG_ERROR,
-+           ("SDIO Bus Driver: HCD Major Version Mismatch (hcd = %d, bus driver = %d)\n",
-+           GET_SDIO_STACK_VERSION_MAJOR(pHcd), CT_SDIO_STACK_VERSION_MAJOR(g_Version)));
-+        return SDIO_STATUS_INVALID_PARAMETER;
-+    }
-+        /* setup hcd */
-+    status = SetupHcd(pHcd);
-+    if (!SDIO_SUCCESS(status)) {
-+        return status;
-+    }
-+
-+    do {
-+        INT slotNumber;
-+
-+            /* protect the HCD list */
-+        if (!SDIO_SUCCESS((status = SemaphorePendInterruptable(&pBusContext->HcdListSem)))) {
-+            break;  /* wait interrupted */
-+        }
-+            /* find a unique number for this HCD, must be done under semaphore protection */
-+        slotNumber = FirstClearBit(&pBusContext->HcdInUseField);
-+        if (slotNumber < 0) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_RegisterHostController, error, slotNumber exceeded\n"));
-+            /* fake something */
-+            slotNumber = 31;
-+        }
-+        SetBit(&pBusContext->HcdInUseField, slotNumber);
-+        pHcd->SlotNumber = slotNumber;
-+            /* add HCD to the end of the internal list */
-+        SDListAdd(&pBusContext->HcdList , &pHcd->SDList);
-+        if (!SDIO_SUCCESS((status = SemaphorePost(&pBusContext->HcdListSem)))) {
-+            break;   /* wait interrupted */
-+        }
-+        if (pHcd->Attributes & SDHCD_ATTRIB_SLOT_POLLING) {
-+                /* post message to card detect helper to do polling */
-+            PostCardDetectEvent(pBusContext, EVENT_HCD_CD_POLLING, NULL);
-+        }
-+    } while (FALSE);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+       CleanupHcd(pHcd);
-+       DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_RegisterHostController, error 0x%X.\n", status));
-+    }
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: _SDIO_RegisterHostController\n"));
-+    return status;
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Unregister a host controller driver with the bus driver.
-+
-+  @function name: SDIO_UnregisterHostController
-+  @prototype: SDIO_STATUS SDIO_UnregisterHostController (PSDHCD pHcd)
-+  @category: HD_Reference
-+
-+  @input:  pHcd - the host controller definition structure that was registered.
-+
-+  @output: none
-+
-+  @return: SDIO_STATUS - SDIO_STATUS_SUCCESS when successful.
-+
-+  @notes: Each host controller driver must unregister with the bus driver when
-+          unloading. The driver is responsible for halting any outstanding I/O
-+          operations.  The bus driver will automatically unload function drivers
-+          that may be attached assigned to cards inserted into slots.
-+
-+  @example: Unregistering a host controller driver:
-+    if (!SDIO_SUCCESS((status = SDIO_UnregisterHostController(&Hcd)))) {
-+         DBG_PRINT(SDDBG_ERROR, ("SDIO HCD - failed to unregister with host, status =%d\n",
-+                                    status));
-+    }
-+
-+  @see also: SDIO_RegisterHostController
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _SDIO_UnregisterHostController(PSDHCD pHcd) {
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: _SDIO_UnregisterHostController\n"));
-+
-+        /* remove functions associated with the HCD */
-+    RemoveHcdFunctions(pHcd);
-+        /* remove any devices associated with the HCD */
-+    DeleteDevices(pHcd);
-+    /* wait for the message queue to be empty, so we don't have any delayed requests going
-+       to this device */
-+    while(!SDLIB_IsQueueEmpty(pBusContext->pCardDetectMsgQueue)) {
-+        /* wait for the messages to be handled */
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: _SDIO_UnregisterHostController, waiting on messages\n"));
-+        OSSleep(250);
-+    }
-+
-+    /* protect the HCD list */
-+    if (!SDIO_SUCCESS((status = SemaphorePendInterruptable(&pBusContext->HcdListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+    ClearBit(&pBusContext->HcdInUseField, pHcd->SlotNumber);
-+    /* delete HCD from list  */
-+    SDListRemove(&pHcd->SDList);
-+    if (!SDIO_SUCCESS((status = SemaphorePost(&pBusContext->HcdListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+        /* cleanup anything we allocated */
-+    CleanupHcd(pHcd);
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: _SDIO_UnregisterHostController\n"));
-+    return status;
-+cleanup:
-+    DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_UnregisterHostController, error 0x%X.\n", status));
-+    return status;
-+}
-+
-+/* documentation headers only for Request and Configure */
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: The bus driver calls the request callback to start an SDIO bus transaction.
-+  @function name: Request
-+  @prototype: SDIO_STATUS (*pRequest) (struct _SDHCD *pHcd)
-+  @category: HD_Reference
-+
-+  @input:  pHcd - the host controller structure that was registered
-+
-+  @output: none
-+
-+  @return: SDIO_STATUS
-+
-+  @notes:
-+          The bus driver maintains an internal queue of SDREQUEST structures submited by function
-+          drivers. The driver should use request macros to obtain a pointer to the current SDREQUEST
-+          at the head of the queue.  The driver can access the fields of the current request in order
-+          to program hardware appropriately.   Once the request completes, the driver should update
-+          the current request information (final status, response bytes and/or data) and call
-+          SDIO_HandleHcdEvent() with the event type of EVENT_HCD_TRANSFER_DONE.
-+          The bus driver will remove the current request from the head of the queue and start the next
-+          request.
-+
-+  @example: Example of a typical Request callback:
-+  SDIO_STATUS HcdRequest(PSDHCD pHcd)
-+  {
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    PSDHCD_DRIVER_CONTEXT pHct = (PSDHCD_DRIVER_CONTEXT)pHcd->pContext;
-+    UINT32                temp = 0;
-+    PSDREQUEST            pReq;
-+       // get the current request
-+    pReq = GET_CURRENT_REQUEST(pHcd);
-+    DBG_ASSERT(pReq != NULL);
-+       // get controller settings based on response type
-+    switch (GET_SDREQ_RESP_TYPE(pReq->Flags)) {
-+        case SDREQ_FLAGS_NO_RESP:
-+            break;
-+        case SDREQ_FLAGS_RESP_R1:
-+        case SDREQ_FLAGS_RESP_MMC_R4:
-+        case SDREQ_FLAGS_RESP_MMC_R5:
-+        case SDREQ_FLAGS_RESP_R6:
-+        case SDREQ_FLAGS_RESP_SDIO_R5:
-+            temp |= CMDDAT_RES_R1_R4_R5;
-+            break;
-+        case SDREQ_FLAGS_RESP_R1B:
-+            temp |= (CMDDAT_RES_R1_R4_R5 | CMDAT_RES_BUSY);
-+            break;
-+        case SDREQ_FLAGS_RESP_R2:
-+            temp |= CMDDAT_RES_R2;
-+            break;
-+        case SDREQ_FLAGS_RESP_R3:
-+        case SDREQ_FLAGS_RESP_SDIO_R4:
-+            temp |= CMDDAT_RES_R3;
-+            break;
-+    }
-+        // check for data
-+    if (pReq->Flags & SDREQ_FLAGS_DATA_TRANS){
-+        temp |= CMDDAT_DATA_EN;
-+        // set data remaining count
-+        pReq->DataRemaining = pReq->BlockLen * pReq->BlockCount;
-+        DBG_PRINT(TRACE_DATA, ("SDIO %s Data Transfer, Blocks:%d, BlockLen:%d, Total:%d \n",
-+                    IS_SDREQ_WRITE_DATA(pReq->Flags) ? "TX":"RX",
-+                    pReq->BlockCount, pReq->BlockLen, pReq->DataRemaining));
-+        if (IS_SDREQ_WRITE_DATA(pReq->Flags)) {
-+                // write operation
-+        }
-+    }
-+    // .... program hardware, interrupt handler will complete request
-+    return SDIO_STATUS_PENDING;
-+  }
-+
-+  @see also: SDIO_HandleHcdEvent
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: The bus driver calls the configure callback to set various options
-+             and modes in the host controller hardware.
-+
-+  @function name: Configure
-+  @prototype: SDIO_STATUS (*pConfigure) (struct _SDHCD *pHcd, PSDCONFIG pConfig)
-+  @category: HD_Reference
-+
-+  @input:  pHcd - the host controller structure that was registered
-+  @input:  pConfig - configuration request structure
-+
-+  @output: none
-+
-+  @return: SDIO_STATUS
-+
-+  @notes:
-+          The host controller driver recieves configuration requests for options
-+          such as slot voltage, bus width, clock rates and interrupt detection.
-+          The bus driver guarantees that only one configuration option request
-+          can be issued at a time.
-+
-+  @example: Example of a typical configure callback:
-+  SDIO_STATUS HcdConfig(PSDHCD pHcd, PSDCONFIG pConfig)
-+  {
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    PSDHCD_DRIVER_CONTEXT pHct = (PSDHCD_DRIVER_CONTEXT)pHcd->pContext;
-+    UINT16      command;
-+        // get command
-+    command = GET_SDCONFIG_CMD(pConfig);
-+        // decode command
-+    switch (command){
-+        case SDCONFIG_GET_WP:
-+            if (GetGpioPinLevel(pHct,SDIO_CARD_WP_GPIO) == WP_POLARITY) {
-+                *((SDCONFIG_WP_VALUE *)pConfig->pData) = 1;
-+            } else {
-+                *((SDCONFIG_WP_VALUE *)pConfig->pData) = 0;
-+            }
-+            break;
-+        case SDCONFIG_SEND_INIT_CLOCKS:
-+            ClockStartStop(pHct,CLOCK_ON);
-+                // sleep a little, should be at least 80 clocks at our lowest clock setting
-+            status = OSSleep(100);
-+            ClockStartStop(pHct,CLOCK_OFF);
-+            break;
-+        case SDCONFIG_SDIO_INT_CTRL:
-+            if (GET_SDCONFIG_CMD_DATA(PSDCONFIG_SDIO_INT_CTRL_DATA,pConfig)->SlotIRQEnable) {
-+                // request to enable IRQ detection
-+            } else {
-+                // request to disable IRQ detectioon
-+            }
-+            break;
-+        case SDCONFIG_SDIO_REARM_INT:
-+                // request to re-arm the card IRQ detection logic
-+            break;
-+        case SDCONFIG_BUS_MODE_CTRL:
-+                // request to set bus mode
-+            {
-+                // get bus mode data structure
-+               PSDCONFIG_BUS_MODE_DATA pBusMode =
-+                      GET_SDCONFIG_CMD_DATA(PSDCONFIG_SDIO_INT_CTRL_DATA,pConfig);
-+                // set bus mode based on settings in bus mode structure
-+                // bus mode   :  pBusMode->BusModeFlags
-+                // clock rate :  pBusMode->ClockRate
-+            }
-+            break;
-+        case SDCONFIG_POWER_CTRL:
-+                // request to set power/voltage
-+            {
-+                PSDCONFIG_POWER_CTRL_DATA pPowerSetting =
-+                       GET_SDCONFIG_CMD_DATA(PSDCONFIG_POWER_CTRL_DATA,pConfig);
-+                if (pPowerSetting->SlotPowerEnable) {
-+                    // turn on slot power
-+                    //
-+                } else {
-+                    // turn off slot power
-+                }
-+                DBG_PRINT(PXA_TRACE_CONFIG, ("SDIO PXA255 PwrControl: En:%d, VCC:0x%X \n",
-+                      pPowerSetting->SlotPowerEnable,
-+                      pPowerSetting->SlotPowerVoltageMask));
-+            }
-+            break;
-+        default:
-+            // unsupported
-+            status = SDIO_STATUS_INVALID_PARAMETER;
-+    }
-+    return status;
-+ }
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+
-+/*
-+ * Allocate a Device instance
-+ */
-+PSDDEVICE AllocateDevice(PSDHCD pHcd)
-+{
-+    PSDDEVICE pDevice;
-+
-+    pDevice = KernelAlloc(sizeof(SDDEVICE));
-+    if (pDevice != NULL) {
-+        InitDeviceData(pHcd,pDevice);
-+    }
-+    return pDevice;
-+}
-+
-+
-+/*
-+ * Free a Device instance
-+ */
-+void FreeDevice(PSDDEVICE pDevice)
-+{
-+    DeinitDeviceData(pDevice);
-+    KernelFree(pDevice);
-+}
-+/*
-+ * add this device to the list
-+ */
-+BOOL AddDeviceToList(PSDDEVICE pDevice)
-+{
-+    BOOL success = FALSE;
-+
-+    do {
-+            /* protect the driver list */
-+        if (!SDIO_SUCCESS(SemaphorePendInterruptable(&pBusContext->DeviceListSem))) {
-+            break;   /* wait interrupted */
-+        }
-+
-+            /* add new device to the internal list */
-+        SDListAdd(&pBusContext->DeviceList , &pDevice->SDList);
-+
-+        if (!SDIO_SUCCESS(SemaphorePost(&pBusContext->DeviceListSem))) {
-+            break;
-+        }
-+
-+        success = TRUE;
-+    } while (FALSE);
-+
-+    return success;
-+}
-+
-+/*
-+ *  Delete device associated with the HCD
-+ *  if pHCD is NULL this function cleans up all devices, the caller
-+ *  better have cleaned up functions first!
-+ */
-+SDIO_STATUS DeleteDevices(PSDHCD pHcd)
-+{
-+    SDIO_STATUS status;
-+    PSDDEVICE   pDevice;
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: DeleteDevices hcd:0x%X \n", (INT)pHcd));
-+      /* protect the device list */
-+    if (!SDIO_SUCCESS((status = SemaphorePendInterruptable(&pBusContext->DeviceListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+    SDITERATE_OVER_LIST_ALLOW_REMOVE(&pBusContext->DeviceList,pDevice,SDDEVICE,SDList) {
-+            /* only remove devices for the hcd or if we are cleaning up all */
-+        if ((NULL == pHcd) || (pDevice->pHcd == pHcd)) {
-+            SDListRemove(&pDevice->SDList);
-+            DeinitDeviceData(pDevice);
-+            FreeDevice(pDevice);
-+        }
-+    }SDITERATE_END;
-+    if (!SDIO_SUCCESS((status = SemaphorePost(&pBusContext->DeviceListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: DeleteDevices \n"));
-+    return status;
-+cleanup:
-+    DBG_PRINT(SDDBG_ERROR, ("-SDIO Bus Driver: DeleteDevice, error exit 0x%X\n", status));
-+    return status;
-+}
-+
-+
-+static SDIO_STATUS AllocateBusResources(void)
-+{
-+    INT                 ii;
-+    PSDREQUEST          pReq;
-+    PSIGNAL_ITEM        pSignal;
-+
-+    DBG_PRINT(SDDBG_TRACE,
-+    ("+SDIO Bus Driver: AllocateBusResources (R:%d,S:%d) (CR:%d,MR:%d)(CS:%d,MS:%d) \n",
-+       pBusContext->RequestListSize,
-+       pBusContext->SignalSemListSize,
-+       pBusContext->CurrentRequestAllocations,pBusContext->MaxRequestAllocations,
-+       pBusContext->CurrentSignalAllocations,pBusContext->MaxSignalAllocations));
-+
-+        /* allocate some initial requests */
-+    for (ii = 0; ii < pBusContext->RequestListSize; ii++) {
-+        pReq = AllocateRequest();
-+        if (pReq == NULL) {
-+            break;
-+        }
-+            /* free requests adds the request to the list */
-+        FreeRequest(pReq);
-+    }
-+
-+    for (ii = 0; ii < pBusContext->SignalSemListSize; ii++) {
-+        pSignal = AllocateSignal();
-+        if (pSignal == NULL) {
-+            break;
-+        }
-+            /* freeing it adds it to the list */
-+        FreeSignal(pSignal);
-+    }
-+
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: AllocateBusResources\n"));
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+
-+/* cleanup bus resources */
-+static void CleanUpBusResources(void)
-+{
-+    PSDLIST      pItem;
-+    PSDREQUEST   pReq;
-+    PSIGNAL_ITEM pSignal;
-+
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: CleanUpBusResources (CR:%d,MR:%d)(CS:%d,MS:%d) \n",
-+       pBusContext->CurrentRequestAllocations,pBusContext->MaxRequestAllocations,
-+       pBusContext->CurrentSignalAllocations,pBusContext->MaxSignalAllocations));
-+
-+    while(1) {
-+        pItem = SDListRemoveItemFromHead(&pBusContext->RequestList);
-+        if (NULL == pItem) {
-+            break;
-+        }
-+            /* free the request */
-+        pReq = CONTAINING_STRUCT(pItem, SDREQUEST, SDList);
-+        if (pReq->InternalFlags & SDBD_ALLOC_IRQ_SAFE_MASK) {
-+            KernelFreeIrqSafe(pReq);
-+        } else {
-+            KernelFree(pReq);
-+        }
-+        pBusContext->CurrentRequestAllocations--;
-+    }
-+
-+    if (pBusContext->CurrentRequestAllocations != 0) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Request allocations are not ZERO! (CR:%d)\n",
-+             pBusContext->CurrentRequestAllocations));
-+    }
-+
-+    while(1) {
-+        pItem = SDListRemoveItemFromHead(&pBusContext->SignalList);
-+        if (NULL == pItem) {
-+            break;
-+        }
-+        pSignal = CONTAINING_STRUCT(pItem, SIGNAL_ITEM, SDList);
-+        DestroySignal(pSignal);
-+        pBusContext->CurrentSignalAllocations--;
-+    }
-+
-+    if (pBusContext->CurrentSignalAllocations != 0) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Signal allocations are not ZERO! (CR:%d)\n",
-+             pBusContext->CurrentRequestAllocations));
-+    }
-+
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: CleanUpBusResources\n"));
-+}
-+
-+
-+/* free a request to the lookaside list */
-+void FreeRequest(PSDREQUEST pReq)
-+{
-+    SDIO_STATUS status;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    status = CriticalSectionAcquireSyncIrq(&pBusContext->RequestListCritSection);
-+        /* protect request list */
-+    if (!SDIO_SUCCESS(status)) {
-+        return;
-+    }
-+
-+    if ((pBusContext->CurrentRequestAllocations <= pBusContext->MaxRequestAllocations) ||
-+         !(pReq->InternalFlags & SDBD_ALLOC_IRQ_SAFE_MASK)) {
-+            /* add it to the list */
-+        SDListAdd(&pBusContext->RequestList, &pReq->SDList);
-+            /* we will hold onto this one */
-+        pReq = NULL;
-+    } else {
-+            /* decrement count */
-+        pBusContext->CurrentRequestAllocations--;
-+    }
-+
-+    status = CriticalSectionReleaseSyncIrq(&pBusContext->RequestListCritSection);
-+
-+    if (pReq != NULL) {
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Free Request allocation (CR:%d,MR:%d)\n",
-+        pBusContext->CurrentRequestAllocations,pBusContext->MaxRequestAllocations));
-+        if (pReq->InternalFlags & SDBD_ALLOC_IRQ_SAFE_MASK) {
-+            KernelFreeIrqSafe(pReq);
-+        } else {
-+                /* we should never free the ones that were normally allocated */
-+            DBG_ASSERT(FALSE);
-+        }
-+    }
-+}
-+
-+/* allocate a request from the lookaside list */
-+PSDREQUEST AllocateRequest(void)
-+{
-+    PSDLIST  pItem;
-+    SDIO_STATUS status;
-+    PSDREQUEST pReq = NULL;
-+    ATOMIC_FLAGS internalflags;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+
-+    status = CriticalSectionAcquireSyncIrq(&pBusContext->RequestListCritSection);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        return NULL;
-+    }
-+
-+    if (pBusContext->InitMask & RESOURCE_INIT) {
-+            /* check the list, we are now running... */
-+        pItem = SDListRemoveItemFromHead(&pBusContext->RequestList);
-+    } else {
-+            /* we are loading the list with requests at initialization */
-+        pItem = NULL;
-+    }
-+    status = CriticalSectionReleaseSyncIrq(&pBusContext->RequestListCritSection);
-+
-+    if (pItem != NULL) {
-+        pReq = CONTAINING_STRUCT(pItem, SDREQUEST, SDList);
-+    } else {
-+        if (pBusContext->InitMask & RESOURCE_INIT) {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Request List empty..allocating new one (irq-safe) (CR:%d,MR:%d)\n",
-+            pBusContext->CurrentRequestAllocations,pBusContext->MaxRequestAllocations));
-+                /* the resource list was already allocated, we must be running now.
-+                 * at run-time, we allocate using the safe IRQ */
-+            pReq = (PSDREQUEST)KernelAllocIrqSafe(sizeof(SDREQUEST));
-+                /* mark that this one was created using IRQ safe allocation */
-+            internalflags = SDBD_ALLOC_IRQ_SAFE_MASK;
-+        } else {
-+                /* use the normal allocation since we are called at initialization */
-+            pReq = (PSDREQUEST)KernelAlloc(sizeof(SDREQUEST));
-+            internalflags = 0;
-+        }
-+
-+        if (pReq != NULL) {
-+            pReq->InternalFlags = internalflags;
-+                /* keep track of allocations */
-+            status = CriticalSectionAcquireSyncIrq(&pBusContext->RequestListCritSection);
-+            pBusContext->CurrentRequestAllocations++;
-+            status = CriticalSectionReleaseSyncIrq(&pBusContext->RequestListCritSection);
-+        }
-+    }
-+
-+
-+    if (pReq != NULL) {
-+            /* preserve internal flags */
-+        internalflags = pReq->InternalFlags;
-+        ZERO_POBJECT(pReq);
-+        pReq->InternalFlags = internalflags;
-+    }
-+
-+    return pReq;
-+}
-+
-+void DestroySignal(PSIGNAL_ITEM pSignal)
-+{
-+   SignalDelete(&pSignal->Signal);
-+   KernelFree(pSignal);
-+}
-+
-+PSIGNAL_ITEM BuildSignal(void)
-+{
-+    PSIGNAL_ITEM pSignal;
-+
-+    pSignal = (PSIGNAL_ITEM)KernelAlloc(sizeof(SIGNAL_ITEM));
-+    if (pSignal != NULL) {
-+            /* initialize signal */
-+        if (!SDIO_SUCCESS(SignalInitialize(&pSignal->Signal))) {
-+            KernelFree(pSignal);
-+            pSignal = NULL;
-+        }
-+    }
-+    return pSignal;
-+}
-+/* free a signal*/
-+void FreeSignal(PSIGNAL_ITEM pSignal)
-+{
-+    SDIO_STATUS status;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    status = CriticalSectionAcquireSyncIrq(&pBusContext->RequestListCritSection);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        return;
-+    }
-+
-+    if (pBusContext->CurrentSignalAllocations <= pBusContext->MaxSignalAllocations) {
-+            /* add it to the list */
-+        SDListAdd(&pBusContext->SignalList, &pSignal->SDList);
-+            /* flag that we are holding onto it */
-+        pSignal = NULL;
-+    } else {
-+            /* decrement count */
-+        pBusContext->CurrentSignalAllocations--;
-+    }
-+
-+    status = CriticalSectionReleaseSyncIrq(&pBusContext->RequestListCritSection);
-+
-+    if (pSignal != NULL) {
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Free signal allocation (CS:%d,MS:%d)\n",
-+        pBusContext->CurrentSignalAllocations,pBusContext->MaxSignalAllocations));
-+        DestroySignal(pSignal);
-+    }
-+}
-+
-+/* allocate a signal from the list */
-+PSIGNAL_ITEM AllocateSignal(void)
-+{
-+    PSDLIST         pItem;
-+    PSIGNAL_ITEM    pSignal;
-+    SDIO_STATUS status;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    status = CriticalSectionAcquireSyncIrq(&pBusContext->RequestListCritSection);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        return NULL;
-+    }
-+
-+    if (pBusContext->InitMask & RESOURCE_INIT) {
-+            /* check the list */
-+        pItem = SDListRemoveItemFromHead(&pBusContext->SignalList);
-+    } else {
-+            /* we are loading the list */
-+        pItem = NULL;
-+    }
-+
-+    status = CriticalSectionReleaseSyncIrq(&pBusContext->RequestListCritSection);
-+    if (pItem != NULL) {
-+            /* return the one from the list */
-+        pSignal = CONTAINING_STRUCT(pItem, SIGNAL_ITEM, SDList);
-+    } else {
-+        if (pBusContext->InitMask & RESOURCE_INIT) {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Signal List empty..allocating new one (CS:%d,MS:%d)\n",
-+            pBusContext->CurrentSignalAllocations,pBusContext->MaxSignalAllocations));
-+        }
-+            /* just allocate one */
-+        pSignal = BuildSignal();
-+        status = CriticalSectionAcquireSyncIrq(&pBusContext->RequestListCritSection);
-+        if (pSignal != NULL) {
-+            pBusContext->CurrentSignalAllocations++;
-+        }
-+        status = CriticalSectionReleaseSyncIrq(&pBusContext->RequestListCritSection);
-+    }
-+
-+
-+    return pSignal;
-+}
-+
-+/*
-+ * Issus Bus Request (exposed to function drivers)
-+*/
-+PSDREQUEST IssueAllocRequest(PSDDEVICE pDev)
-+{
-+    return AllocateRequest();
-+}
-+
-+/*
-+ * Free Request (exposed to function drivers)
-+*/
-+void IssueFreeRequest(PSDDEVICE pDev, PSDREQUEST pReq)
-+{
-+    FreeRequest(pReq);
-+}
-+
-+/*
-+ * Issus Bus Request (exposed to function drivers)
-+*/
-+SDIO_STATUS IssueBusRequest(PSDDEVICE pDev, PSDREQUEST pReq)
-+{
-+    pReq->pFunction = pDev->pFunction;
-+    return IssueRequestToHCD(pDev->pHcd,pReq);
-+}
-+
-+
-+    /* completion routine for HCD configs, this is synchronized with normal bus requests */
-+static void HcdConfigComplete(PSDREQUEST pReq)
-+{
-+
-+    pReq->Status = CALL_HCD_CONFIG((PSDHCD)pReq->pDataBuffer, (PSDCONFIG)pReq->pCompleteContext);
-+
-+    SignalSet(&((PSIGNAL_ITEM)pReq->pHcdContext)->Signal);
-+}
-+
-+SDIO_STATUS SendSyncedHcdBusConfig(PSDDEVICE pDevice, PSDCONFIG pConfig)
-+{
-+    SDIO_STATUS     status = SDIO_STATUS_SUCCESS;
-+    PSDREQUEST      pReq = NULL;
-+    PSIGNAL_ITEM    pSignal = NULL;
-+
-+    do {
-+
-+        pSignal = AllocateSignal();
-+        if (NULL == pSignal) {
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            break;
-+        }
-+
-+        pReq = AllocateRequest();
-+        if (NULL == pReq) {
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            break;
-+        }
-+
-+            /* issue pseudo request to sync this with bus requests */
-+        pReq->pCompletion = HcdConfigComplete;
-+        pReq->pCompleteContext = pConfig;
-+            /* re-use hcd context to store the signal since this request
-+             * never actually goes to an HCD */
-+        pReq->pHcdContext = pSignal;
-+        pReq->pDataBuffer = pDevice->pHcd;
-+            /* flag this as barrier in case it may change the bus mode of the HCD */
-+        pReq->Flags = SDREQ_FLAGS_PSEUDO | SDREQ_FLAGS_BARRIER | SDREQ_FLAGS_TRANS_ASYNC;
-+        pReq->Status = SDIO_STATUS_SUCCESS;
-+
-+            /* issue request */
-+        status = IssueRequestToHCD(pDevice->pHcd,pReq);
-+
-+    } while (FALSE);
-+
-+    if (SDIO_SUCCESS(status)) {
-+        DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Config Request Sync-Op waiting....\n"));
-+        status = SignalWait(&pSignal->Signal);
-+
-+        if (SDIO_SUCCESS(status)) {
-+                /* return the result of the configuration request */
-+            status = pReq->Status;
-+        }
-+    }
-+
-+        /* cleanup */
-+    if (pReq != NULL) {
-+        FreeRequest(pReq);
-+    }
-+
-+    if (pSignal != NULL) {
-+        FreeSignal(pSignal);
-+    }
-+
-+    return status;
-+}
-+
-+/*
-+ * Issus bus Configuration  (exposed to function drivers)
-+*/
-+SDIO_STATUS IssueBusConfig(PSDDEVICE pDev, PSDCONFIG pConfig)
-+{
-+    SDIO_STATUS status;
-+    INT         cmdLength;
-+    UINT8       debugLevel = SDDBG_ERROR;
-+
-+    cmdLength = GET_SDCONFIG_CMD_LEN(pConfig);
-+    status = SDIO_STATUS_INVALID_PARAMETER;
-+
-+    do {
-+            /* check buffers and length */
-+        if (IS_SDCONFIG_CMD_GET(pConfig) || IS_SDCONFIG_CMD_PUT(pConfig)) {
-+            if ((GET_SDCONFIG_CMD_DATA(PVOID,pConfig) == NULL) || (0 == cmdLength)) {
-+                break;
-+            }
-+        }
-+
-+        switch (GET_SDCONFIG_CMD(pConfig)) {
-+            case SDCONFIG_FUNC_ACK_IRQ:
-+                status = SDFunctionAckInterrupt(pDev);
-+                break;
-+            case SDCONFIG_FUNC_ENABLE_DISABLE:
-+                if (cmdLength < sizeof(SDCONFIG_FUNC_ENABLE_DISABLE_DATA)) {
-+                    break;
-+                }
-+                status = SDEnableFunction(pDev,
-+                           GET_SDCONFIG_CMD_DATA(PSDCONFIG_FUNC_ENABLE_DISABLE_DATA,pConfig));
-+                break;
-+            case SDCONFIG_FUNC_UNMASK_IRQ:
-+                status = SDMaskUnmaskFunctionIRQ(pDev,FALSE);
-+                break;
-+            case SDCONFIG_FUNC_MASK_IRQ:
-+                status = SDMaskUnmaskFunctionIRQ(pDev,TRUE);
-+                break;
-+            case SDCONFIG_FUNC_SPI_MODE_DISABLE_CRC:
-+                status = SDSPIModeEnableDisableCRC(pDev,FALSE);
-+                break;
-+            case SDCONFIG_FUNC_SPI_MODE_ENABLE_CRC:
-+                status = SDSPIModeEnableDisableCRC(pDev,TRUE);
-+                break;
-+            case SDCONFIG_FUNC_ALLOC_SLOT_CURRENT:
-+                status = SDAllocFreeSlotCurrent(pDev,
-+                                                TRUE,
-+                                   GET_SDCONFIG_CMD_DATA(PSDCONFIG_FUNC_SLOT_CURRENT_DATA,pConfig));
-+                break;
-+            case SDCONFIG_FUNC_FREE_SLOT_CURRENT:
-+                status = SDAllocFreeSlotCurrent(pDev, FALSE, NULL);
-+                break;
-+            case SDCONFIG_FUNC_CHANGE_BUS_MODE:
-+
-+                status = SetOperationalBusMode(pDev,
-+                                               GET_SDCONFIG_CMD_DATA(PSDCONFIG_BUS_MODE_DATA,
-+                                               pConfig));
-+                break;
-+            case SDCONFIG_FUNC_NO_IRQ_PEND_CHECK:
-+                status = TryNoIrqPendingCheck(pDev);
-+                break;
-+            default:
-+
-+                if (GET_SDCONFIG_CMD(pConfig) & SDCONFIG_FLAGS_HC_CONFIG) {
-+                        /* synchronize config requests with busrequests */
-+                    status = SendSyncedHcdBusConfig(pDev,pConfig);
-+                } else {
-+                    DBG_PRINT(SDDBG_ERROR,
-+                        ("SDIO Bus Driver: IssueBusConfig - unknown command:0x%X \n",
-+                        GET_SDCONFIG_CMD(pConfig)));
-+                    status = SDIO_STATUS_INVALID_PARAMETER;
-+                }
-+                break;
-+        }
-+    } while(FALSE);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+
-+           if(status == SDIO_STATUS_FUNC_ENABLE_TIMEOUT ){ /* reduce debug level to avoid timeout error messages */
-+                debugLevel = SDDBG_TRACE;
-+         }
-+
-+
-+         DBG_PRINT(debugLevel,
-+                ("SDIO Bus Driver: IssueBusConfig - Error in command:0x%X, Buffer:0x%X, Length:%d Err:%d\n",
-+                GET_SDCONFIG_CMD(pConfig),
-+                GET_SDCONFIG_CMD_DATA(INT,pConfig),
-+                cmdLength, status));
-+    }
-+    return status;
-+}
-+
-+/* start a request */
-+static INLINE SDIO_STATUS StartHcdRequest(PSDHCD pHcd, PSDREQUEST pReq)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    if ((pReq->pFunction != NULL) && (pReq->pFunction->Flags & SDFUNCTION_FLAG_REMOVING)) {
-+        /* this device or function is going away, fail any new requests */
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: StartHcdRequest, fail request 0x%X, device is removing\n", (UINT)pReq));
-+        pReq->Status = SDIO_STATUS_CANCELED;
-+        return SDIO_STATUS_SDREQ_QUEUE_FAILED;
-+    }
-+
-+    status = _AcquireHcdLock(pHcd);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to acquire HCD request lock: Err:%d\n", status));
-+        pReq->Status = SDIO_STATUS_SDREQ_QUEUE_FAILED;
-+        return SDIO_STATUS_SDREQ_QUEUE_FAILED;
-+    }
-+
-+    if (pReq->Flags & SDREQ_FLAGS_QUEUE_HEAD) {
-+            /* caller wants this request queued to the head */
-+
-+            /* a completion routine for a barrier request is called
-+             * while the queue is busy.  A barrier request can
-+             * insert a new request at the head of the queue */
-+        DBG_ASSERT(IsQueueBusy(&pHcd->RequestQueue));
-+        QueueRequestToFront(&pHcd->RequestQueue,pReq);
-+    } else {
-+            /* insert in queue at tail */
-+        QueueRequest(&pHcd->RequestQueue,pReq);
-+
-+            /* is queue busy ? */
-+        if (IsQueueBusy(&pHcd->RequestQueue)) {
-+                /* release lock */
-+            status = _ReleaseHcdLock(pHcd);
-+                /* controller is busy already, no need to call the hcd */
-+            return SDIO_STATUS_PENDING;
-+        }
-+            /* mark it as busy */
-+        MarkQueueBusy(&pHcd->RequestQueue);
-+    }
-+
-+        /* remove item from head and set current request */
-+    SET_CURRENT_REQUEST(pHcd, DequeueRequest(&pHcd->RequestQueue));
-+    if (CHECK_API_VERSION_COMPAT(pHcd,2,6)) {
-+        CHECK_HCD_RECURSE(pHcd, pHcd->pCurrentRequest);
-+    }
-+        /* release lock */
-+    status = _ReleaseHcdLock(pHcd);
-+        /* controller was not busy, call into HCD to process current request */
-+    status = CallHcdRequest(pHcd);
-+    return status;
-+}
-+
-+
-+/* used by CMD12,CMD13 to save the original completion routine */
-+#define GET_BD_RSV_REQUEST_COMPLETION(pR)   (PSDEQUEST_COMPLETION)(pR)->pBdRsv1
-+#define SET_BD_RSV_REQUEST_COMPLETION(pR,c) (pR)->pBdRsv1 = (PVOID)(c)
-+
-+/* used by CMD12 processing to save/restore the original data transfer status */
-+#define GET_BD_RSV_ORIG_STATUS(pR)          (SDIO_STATUS)(pR)->pBdRsv2
-+#define SET_BD_RSV_ORIG_STATUS(pR,s)        (pR)->pBdRsv2 = (PVOID)(s)
-+
-+/* used by CMD13 processing to get/set polling count */
-+#define GET_BD_RSV_STATUS_POLL_COUNT(pR)     (INT)(pR)->pBdRsv2
-+#define SET_BD_RSV_STATUS_POLL_COUNT(pR,s)   (pR)->pBdRsv2 = (PVOID)(s)
-+
-+/* used by CMD55 processing to save the second part of the request */
-+#define GET_BD_RSV_ORIG_REQ(pR)             (PSDREQUEST)(pR)->pBdRsv1
-+#define SET_BD_RSV_ORIG_REQ(pR,r)           (pR)->pBdRsv1 = (PVOID)(r)
-+
-+/* used by all to save HCD */
-+#define GET_BD_RSV_HCD(pR)                  (PSDHCD)(pR)->pBdRsv3
-+#define SET_BD_RSV_HCD(pR,h)                (pR)->pBdRsv3 = (PVOID)(h)
-+
-+static void CMD13CompletionBarrier(PSDREQUEST pReq);
-+
-+static INLINE void SetupCMD13(PSDHCD pHcd, PSDREQUEST pReq)
-+{
-+    pReq->Command = CMD13;
-+        /* sequence must be atomic, queue it to the head and flag as a barrier */
-+    pReq->Flags = SDREQ_FLAGS_QUEUE_HEAD | SDREQ_FLAGS_BARRIER | SDREQ_FLAGS_TRANS_ASYNC;
-+    if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+        pReq->Argument = 0;
-+        pReq->Flags |= SDREQ_FLAGS_RESP_R2;
-+    } else {
-+        pReq->Flags |= SDREQ_FLAGS_RESP_R1;
-+        pReq->Argument |= pHcd->CardProperties.RCA << 16;
-+    }
-+        /* insert completion */
-+    pReq->pCompletion = CMD13CompletionBarrier;
-+}
-+
-+/* CMD13 (GET STATUS) completion */
-+static void CMD13CompletionBarrier(PSDREQUEST pReq)
-+{
-+    PSDEQUEST_COMPLETION pOrigCompletion = GET_BD_RSV_REQUEST_COMPLETION(pReq);
-+    PSDHCD               pHcd = GET_BD_RSV_HCD(pReq);
-+    INT                  pollingCount = GET_BD_RSV_STATUS_POLL_COUNT(pReq);
-+    BOOL                 doCompletion = TRUE;
-+    UINT32               cardStatus;
-+
-+    DBG_ASSERT(pOrigCompletion != NULL);
-+    DBG_ASSERT(pHcd != NULL);
-+    DBG_PRINT(SDIODBG_REQUESTS, ("+SDIO Bus Driver: CMD13CompletionBarrier (cnt:%d) \n",pollingCount));
-+
-+    do {
-+        if (!SDIO_SUCCESS(pReq->Status)) {
-+            break;
-+        }
-+
-+        cardStatus = SD_R1_GET_CARD_STATUS(pReq->Response);
-+
-+        if (cardStatus & SD_CS_TRANSFER_ERRORS) {
-+            DBG_PRINT(SDIODBG_REQUESTS,("SDIO Bus Driver: Card transfer errors : 0x%X \n",cardStatus));
-+            pReq->Status = SDIO_STATUS_PROGRAM_STATUS_ERROR;
-+            break;
-+        }
-+
-+        if (SD_CS_GET_STATE(cardStatus) != SD_CS_STATE_PRG) {
-+            DBG_PRINT(SDIODBG_REQUESTS,("SDIO Bus Driver: Card programming done \n"));
-+            break;
-+        }
-+
-+        DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Card still programming.. \n"));
-+        pollingCount--;
-+
-+        if (pollingCount < 0) {
-+            pReq->Status = SDIO_STATUS_PROGRAM_TIMEOUT;
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: card programming timeout!\n"));
-+            break;
-+        }
-+
-+        doCompletion = FALSE;
-+            /* keep trying */
-+        SET_BD_RSV_STATUS_POLL_COUNT(pReq, pollingCount);
-+        SetupCMD13(pHcd,pReq);
-+        DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: re-issuing CMD13 \n"));
-+            /* re-issue */
-+        IssueRequestToHCD(pHcd, pReq);
-+
-+    } while (FALSE);
-+
-+
-+    if (doCompletion) {
-+            /* restore original completion routine */
-+        pReq->pCompletion = pOrigCompletion;
-+            /* call original completion routine */
-+        pOrigCompletion(pReq);
-+    }
-+
-+    DBG_PRINT(SDIODBG_REQUESTS, ("-SDIO Bus Driver: CMD13CompletionBarrier \n"));
-+}
-+
-+/* command 13 (GET STATUS) preparation */
-+static void PrepCMD13Barrier(PSDREQUEST pReq)
-+{
-+    SDIO_STATUS status = pReq->Status;
-+    PSDHCD      pHcd = GET_BD_RSV_HCD(pReq);
-+    INT         pollingCount;
-+    PSDEQUEST_COMPLETION pOrigCompletion = GET_BD_RSV_REQUEST_COMPLETION(pReq);
-+
-+    DBG_ASSERT(pHcd != NULL);
-+    DBG_ASSERT(pOrigCompletion != NULL);
-+
-+    DBG_PRINT(SDIODBG_REQUESTS, ("+SDIO Bus Driver: PrepCMD13Barrier \n"));
-+
-+    if (SDIO_SUCCESS(status)) {
-+            /* re-use the request for CMD13 */
-+        SetupCMD13(pHcd,pReq);
-+            /* set polling count to a multiple of the Block count, if the BlockCount was
-+             * zeroed by the HCD, then set it to 1X multiplier */
-+        pollingCount = max(pBusContext->CMD13PollingMultiplier,
-+                           pBusContext->CMD13PollingMultiplier * (INT)pReq->BlockCount);
-+            /* initialize count */
-+        SET_BD_RSV_STATUS_POLL_COUNT(pReq, pollingCount);
-+            /* re-issue it, we can call IssueRequest here since we are re-using the request */
-+        IssueRequestToHCD(pHcd, pReq);
-+    } else {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Request Failure (%d) , CMD13 bypassed.\n",status));
-+            /* call the original completion routine */
-+        pOrigCompletion(pReq);
-+    }
-+
-+    DBG_PRINT(SDIODBG_REQUESTS, ("-SDIO Bus Driver: PrepCMD13Barrier (%d) \n",status));
-+}
-+
-+/* CMD12 completion */
-+static void CMD12Completion(PSDREQUEST pReq)
-+{
-+    PSDEQUEST_COMPLETION pOrigCompletion = GET_BD_RSV_REQUEST_COMPLETION(pReq);
-+
-+    DBG_ASSERT(pOrigCompletion != NULL);
-+
-+    DBG_PRINT(SDIODBG_REQUESTS, ("+SDIO Bus Driver: CMD12Completion \n"));
-+
-+        /* restore original completion routine */
-+    pReq->pCompletion = pOrigCompletion;
-+
-+    if (SDIO_SUCCESS(pReq->Status)) {
-+            /* if CMD12 succeeds, we want to return the result of the original
-+             * request */
-+        pReq->Status = GET_BD_RSV_ORIG_STATUS(pReq);
-+        DBG_PRINT(SDIODBG_REQUESTS,
-+                ("SDIO Bus Driver: PrepCMD12Completion original status %d \n",pReq->Status));
-+    }
-+        /* call original completion routine */
-+    pOrigCompletion(pReq);
-+
-+    DBG_PRINT(SDIODBG_REQUESTS, ("-SDIO Bus Driver: CMD12Completion \n"));
-+}
-+
-+/* CMD12 preparation */
-+static void PrepCMD12Barrier(PSDREQUEST pReq)
-+{
-+
-+    SDIO_STATUS status = pReq->Status;
-+    PSDHCD               pHcd = GET_BD_RSV_HCD(pReq);
-+    PSDEQUEST_COMPLETION pOrigCompletion = GET_BD_RSV_REQUEST_COMPLETION(pReq);
-+
-+    DBG_ASSERT(pHcd != NULL);
-+    DBG_ASSERT(pOrigCompletion != NULL);
-+
-+    DBG_PRINT(SDIODBG_REQUESTS, ("+SDIO Bus Driver: PrepCMD12Barrier \n"));
-+
-+    if (SDIO_SUCCESS(status) ||    /* only issue CMD12 on success or specific bus errors */
-+        (SDIO_STATUS_BUS_READ_TIMEOUT == status) ||
-+        (SDIO_STATUS_BUS_READ_CRC_ERR == status) ||
-+        (SDIO_STATUS_BUS_WRITE_ERROR == status)) {
-+        if (!CHECK_API_VERSION_COMPAT(pHcd,2,6)) {
-+            if (!ForceAllRequestsAsync()) {
-+                /* clear the call bit as an optimization, note clearing it wholesale here will
-+                 * allow request processing to recurse one more level */
-+                AtomicTest_Clear(&pHcd->HcdFlags, HCD_REQUEST_CALL_BIT);
-+            }
-+        }
-+            /* re-use the request for CMD12 */
-+        pReq->Command = CMD12;
-+        pReq->Argument = 0;
-+
-+            /* if the data transfer was successful, check for transfer check */
-+        if (SDIO_SUCCESS(status) &&
-+            (pReq->Flags & SDREQ_FLAGS_AUTO_TRANSFER_STATUS)) {
-+                /* original data request requires a transfer status check, which is another
-+                 * barrier request */
-+            pReq->Flags = SDREQ_FLAGS_RESP_R1B | SDREQ_FLAGS_QUEUE_HEAD | SDREQ_FLAGS_BARRIER |
-+                          SDREQ_FLAGS_TRANS_ASYNC;
-+            DBG_PRINT(SDIODBG_REQUESTS, ("-SDIO Bus Driver: PrepCMD12Barrier , chaining CMD13 \n"));
-+                /* switch out completion to send the CMD13 next */
-+            pReq->pCompletion = PrepCMD13Barrier;
-+        } else {
-+            pReq->Flags = SDREQ_FLAGS_RESP_R1B | SDREQ_FLAGS_QUEUE_HEAD | SDREQ_FLAGS_TRANS_ASYNC;
-+            pReq->pCompletion = CMD12Completion;
-+        }
-+
-+            /* save the original data transfer request status */
-+        SET_BD_RSV_ORIG_STATUS(pReq,status);
-+            /* re-issue it, we can call IssueRequest here since we are re-using the request */
-+        IssueRequestToHCD(pHcd, pReq);
-+    } else {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Request Failure (%d) , CMD12 bypassed.\n",status));
-+            /* call the original completion routine */
-+        pOrigCompletion(pReq);
-+    }
-+
-+    DBG_PRINT(SDIODBG_REQUESTS, ("-SDIO Bus Driver: PrepCMD12Barrier (%d) \n",status));
-+}
-+
-+
-+/* CMD55 barrier - this is a special barrier completion routine, we have to submit the second
-+ * part of the command command sequence atomically */
-+static void CMD55CompletionBarrier(PSDREQUEST pReq)
-+{
-+    SDIO_STATUS status = pReq->Status;
-+    PSDREQUEST  pOrigReq = GET_BD_RSV_ORIG_REQ(pReq);
-+    PSDHCD      pHcd = GET_BD_RSV_HCD(pReq);
-+    BOOL        doCompletion = FALSE;
-+
-+    DBG_ASSERT(pOrigReq != NULL);
-+    DBG_ASSERT(pHcd != NULL);
-+
-+    DBG_PRINT(SDIODBG_REQUESTS, ("+SDIO Bus Driver: CMD55Completion \n"));
-+
-+    do {
-+
-+        if (!SDIO_SUCCESS(status)) {
-+                /* command 55 failed */
-+            pOrigReq->Status = status;
-+            doCompletion = TRUE;
-+            break;
-+        }
-+
-+        if (!(SD_R1_GET_CARD_STATUS(pReq->Response) & SD_CS_APP_CMD)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Card is not accepting CMD55, status:0x%X \n",
-+                    SD_R1_GET_CARD_STATUS(pReq->Response)));
-+            pOrigReq->Status = SDIO_STATUS_INVALID_COMMAND;
-+            doCompletion = TRUE;
-+            break;
-+        }
-+
-+        if (!CHECK_API_VERSION_COMPAT(pHcd,2,6)) {
-+            if (!ForceAllRequestsAsync()) {
-+                AtomicTest_Clear(&pHcd->HcdFlags, HCD_REQUEST_CALL_BIT);
-+            }
-+        }
-+
-+            /* flag the original request to queue to the head */
-+        pOrigReq->Flags |= SDREQ_FLAGS_QUEUE_HEAD;
-+            /* submit original request, we cannot call IssueRequestHCD() here because the
-+             * original request has already gone through IssueRequestHCD() already */
-+        status = StartHcdRequest(pHcd, pOrigReq);
-+
-+        if (SDIO_STATUS_PENDING == status) {
-+            break;
-+        }
-+
-+        pOrigReq->Status = status;
-+
-+        if (SDIO_STATUS_SDREQ_QUEUE_FAILED == status) {
-+                /* never made it to the queue */
-+            doCompletion = TRUE;
-+            break;
-+        }
-+
-+            /* request completed in-line */
-+        _SDIO_HandleHcdEvent(pHcd, EVENT_HCD_TRANSFER_DONE);
-+
-+    } while (FALSE);
-+
-+    if (doCompletion) {
-+        DoRequestCompletion(pOrigReq, pHcd);
-+    }
-+
-+        /* free the CMD55 request */
-+    FreeRequest(pReq);
-+
-+    DBG_PRINT(SDIODBG_REQUESTS, ("-SDIO Bus Driver: CMD55Completion \n"));
-+}
-+
-+
-+/* synch completion routine */
-+static void SynchCompletion(PSDREQUEST pRequest)
-+{
-+    PSIGNAL_ITEM pSignal;
-+
-+    pSignal = (PSIGNAL_ITEM)pRequest->pCompleteContext;
-+    DBG_ASSERT(pSignal != NULL);
-+    if (!SDIO_SUCCESS(SignalSet(&pSignal->Signal))) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: SynchCompletion - signal failed \n"));
-+    }
-+
-+}
-+
-+/*
-+ * Issue a request to the host controller
-+ *
-+ *
-+ * The following flags are handled internally by the bus driver to guarantee atomicity.
-+ *
-+ *    SDREQ_FLAGS_APP_CMD - SD Extended commands requiring CMD55 to precede the actual command
-+ *    SDREQ_FLAGS_AUTO_CMD12 - Memory Card Data transfer needs CMD12 to stop transfer
-+ *                             (multi-block reads/writes)
-+ *    SDREQ_FLAGS_AUTO_TRANSFER_STATUS - Memory card data transfer needs transfer status polling
-+ *                                       using CMD13
-+ *
-+ *    These request flags require additional commands prepended or appended to the original command
-+ *
-+ *    The order of command execution :
-+ *
-+ *    Order  Condition                 Command Issued
-+ *    -------------------------------------------------------------
-+ *      1.   If APP_CMD                CMD55 issued.
-+ *      2.   Always                    Caller command issued.
-+ *      3.   If AUTO_CMD12             CMD12 issued.
-+ *      4.   If AUTO_TRANSFER_STATUS   CMD13 issued until card programming is complete
-+*/
-+SDIO_STATUS IssueRequestToHCD(PSDHCD pHcd, PSDREQUEST pReq)
-+{
-+    SDIO_STATUS     status = SDIO_STATUS_SUCCESS;
-+    PSIGNAL_ITEM    pSignal = NULL;
-+    BOOL            handleFailedReqSubmit = FALSE;
-+
-+    CLEAR_INTERNAL_REQ_FLAGS(pReq);
-+
-+    do {
-+            /* mark request in-use */
-+        ATOMIC_FLAGS internal = AtomicTest_Set(&pReq->InternalFlags, SDBD_PENDING);
-+        if (internal & (1<<SDBD_PENDING)) {
-+            DBG_ASSERT_WITH_MSG(FALSE,
-+                            "SDIO Bus Driver: IssueRequestToHCD - request already in use \n");
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Request already in use: 0x%X",(INT)pReq));
-+        }
-+
-+        if (!(pReq->Flags & SDREQ_FLAGS_TRANS_ASYNC)) {
-+                /* caller wants synchronous operation, insert our completion routine */
-+            pReq->pCompletion = SynchCompletion;
-+            pSignal = AllocateSignal();
-+            if (NULL == pSignal) {
-+                status = SDIO_STATUS_NO_RESOURCES;
-+                pReq->Status = SDIO_STATUS_NO_RESOURCES;
-+                handleFailedReqSubmit = TRUE;
-+                    /* no need to continue */
-+                break;
-+            }
-+            pReq->pCompleteContext = (PVOID)pSignal;
-+        }
-+
-+        if ((pReq->Flags & SDREQ_FLAGS_AUTO_CMD12) &&
-+            !(pHcd->Attributes & SDHCD_ATTRIB_AUTO_CMD12) &&
-+            !(IS_HCD_BUS_MODE_SPI(pHcd) && IS_SDREQ_WRITE_DATA(pReq->Flags))) {
-+            DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Auto CMD12 on Request:0x%08X \n",(INT)pReq));
-+                /* caller wants CMD12 auto-issued and the HCD does not support it */
-+                /* setup caller's request as a barrier and replace their completion routine */
-+            pReq->Flags |= SDREQ_FLAGS_BARRIER;
-+                /* take off the flag, since the BD will be issuing it */
-+            pReq->Flags &= ~SDREQ_FLAGS_AUTO_CMD12;
-+                /* save original completion */
-+            SET_BD_RSV_REQUEST_COMPLETION(pReq,pReq->pCompletion);
-+                /* save the HCD we are on */
-+            SET_BD_RSV_HCD(pReq,pHcd);
-+                /* use completion for preping CMD12 */
-+            pReq->pCompletion = PrepCMD12Barrier;
-+        }
-+
-+        if (pReq->Flags & SDREQ_FLAGS_AUTO_TRANSFER_STATUS) {
-+            /* caller wants transfer status checked. If a CMD12
-+             * barrier request has been setup we let the CMD12 completion take care
-+             * of setting up the transfer check */
-+            if (pReq->pCompletion != PrepCMD12Barrier) {
-+                    /* make CMD13 prep a barrier */
-+                pReq->Flags |= SDREQ_FLAGS_BARRIER;
-+                    /* save original completion */
-+                SET_BD_RSV_REQUEST_COMPLETION(pReq,pReq->pCompletion);
-+                    /* save the HCD we are on */
-+                SET_BD_RSV_HCD(pReq,pHcd);
-+                    /* use completion for preping CMD13 */
-+                pReq->pCompletion = PrepCMD13Barrier;
-+            }
-+        }
-+
-+            /* check app command, the two command sequence must be handled atomically */
-+        if (pReq->Flags & SDREQ_FLAGS_APP_CMD) {
-+            PSDREQUEST      pCmd55;
-+                /* allocate request to handle initial CMD55 command */
-+            pCmd55 = AllocateRequest();
-+            if (NULL == pCmd55) {
-+                status = SDIO_STATUS_NO_RESOURCES;
-+                pReq->Status = SDIO_STATUS_NO_RESOURCES;
-+                    /* complete the caller's request with error */
-+                handleFailedReqSubmit = TRUE;
-+                    /* no need to continue */
-+                break;
-+            }
-+                /* first submit CMD55 */
-+                /* set RCA */
-+            pCmd55->Argument = pHcd->CardProperties.RCA << 16;
-+                /* mark as a barrier request */
-+            pCmd55->Flags = SDREQ_FLAGS_RESP_R1 | SDREQ_FLAGS_BARRIER | SDREQ_FLAGS_TRANS_ASYNC;
-+            pCmd55->Command = CMD55;
-+                /* call our barrier completion routine when done */
-+            pCmd55->pCompletion = CMD55CompletionBarrier;
-+                /* save request and target HCD */
-+            SET_BD_RSV_ORIG_REQ(pCmd55,pReq);
-+            SET_BD_RSV_HCD(pCmd55,pHcd);
-+                /* recursively start the CMD55 request, since the CMD55 is a barrier
-+                 * request, it's completion routine will submit the actual request
-+                 * atomically */
-+            status = IssueRequestToHCD(pHcd, pCmd55);
-+
-+        } else {
-+                /* start the normal request */
-+            status = StartHcdRequest(pHcd,pReq);
-+        }
-+
-+
-+        if (SDIO_STATUS_SDREQ_QUEUE_FAILED == status) {
-+            handleFailedReqSubmit = TRUE;
-+                /* no need to continue, clean up at the end */
-+            break;
-+        }
-+
-+            /* at this point, the request was either queued or was processed by the
-+             * HCD */
-+
-+        DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: HCD returned status:%d on request: 0x%X, (CMD:%d) \n",
-+                  status, (INT)pReq, pReq->Command));
-+
-+        if (status != SDIO_STATUS_PENDING) {
-+            /* the HCD completed the request within the HCD request callback,
-+             * check and see if this is a synchronous request */
-+            if (pSignal != NULL) {
-+                    /* it was synchronous */
-+                DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Sync-Op signal wait bypassed \n"));
-+                    /* NULL out completion info, there's no need to
-+                     * signal the semaphore */
-+                pReq->pCompletion = NULL;
-+
-+            } else {
-+                DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Async operation completed in-line \n"));
-+                    /* this was an async call, always return pending */
-+                status = SDIO_STATUS_PENDING;
-+            }
-+                /* process this completed transfer on behalf of the HCD */
-+            _SDIO_HandleHcdEvent(pHcd, EVENT_HCD_TRANSFER_DONE);
-+
-+                /* done processing */
-+            break;
-+        }
-+                /* I/O is now pending, could be sync or async */
-+                /* check for synch op */
-+        if (pSignal != NULL) {
-+                /* wait for completion */
-+            DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Sync-Op signal waiting....\n"));
-+                /* this is not interruptable, as the HCD must complete it. */
-+            status = SignalWait(&pSignal->Signal);
-+                /* don't need the signal anymore */
-+            FreeSignal(pSignal);
-+            pSignal = NULL;
-+
-+            /* note: it is safe to touch pReq since we own
-+             * the completion routine for synch transfers */
-+
-+                /* check signal wait status */
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_TRACE,
-+                ("SDIO Bus Driver - IssueRequestToHCD: Synch transfer - signal wait failed, cancelling req 0X%X\n",
-+                (UINT)pReq));
-+                pReq->Status = SDIO_STATUS_CANCELED;
-+                status = SDIO_STATUS_CANCELED;
-+                break;
-+            }
-+            DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Sync-Op woke up\n"));
-+                /* return the completion status of the request */
-+            status = pReq->Status;
-+        } else {
-+            DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Async operation Pending \n"));
-+        }
-+
-+    } while (FALSE);
-+
-+        /* see if we need to clean up failed submissions */
-+    if (handleFailedReqSubmit) {
-+            /* make sure this is cleared */
-+        AtomicTest_Clear(&pReq->InternalFlags, SDBD_PENDING);
-+            /* the  request processing failed before it was submitted to the HCD */
-+            /* note: since it never made it to the queue we can touch pReq */
-+        if (pReq->Flags & SDREQ_FLAGS_TRANS_ASYNC) {
-+            /* for ASYNC requests, we need to call the completion routine */
-+            DoRequestCompletion(pReq, pHcd);
-+                /* return pending for all ASYNC requests */
-+            status = SDIO_STATUS_PENDING;
-+        }
-+    }
-+
-+        /* check if we need to clean up the signal */
-+    if (pSignal != NULL) {
-+            /* make sure this is freed */
-+        FreeSignal(pSignal);
-+    }
-+        /* return status */
-+    return status;
-+}
-+
-+/* documentation for configuration requests */
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Enable or Disable the SDIO Function
-+
-+  @function name: SDCONFIG_FUNC_ENABLE_DISABLE
-+  @prototype: SDCONFIG_FUNC_ENABLE_DISABLE
-+  @category: PD_Reference
-+
-+  @input:  SDCONFIG_FUNC_ENABLE_DISABLE_DATA - Enable Data structure
-+
-+  @output: none
-+
-+  @return: SDIO Status
-+
-+  @notes: This command code is used in the SDLIB_IssueConfig() API.  The command
-+          uses the SDCONFIG_FUNC_ENABLE_DISABLE_DATA structure.  The caller must set the
-+          EnableFlags and specify the TimeOut value in milliseconds.   The TimeOut
-+          value is used for polling the I/O ready bit.  This command returns a status
-+          of SDIO_STATUS_FUNC_ENABLE_TIMEOUT if the ready bit was not set/cleared
-+          by the card within the timeout period.
-+
-+  @example: Example of enabling an I/O function:
-+        fData.EnableFlags = SDCONFIG_ENABLE_FUNC;
-+        fData.TimeOut = 500;
-+        status = SDLIB_IssueConfig(pInstance->pDevice,
-+                                   SDCONFIG_FUNC_ENABLE_DISABLE,
-+                                   &fData,
-+                                   sizeof(fData));
-+
-+  @see also: SDLIB_IssueConfig
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Unmask the function's IRQ
-+
-+  @function name: SDCONFIG_FUNC_UNMASK_IRQ
-+  @prototype: SDCONFIG_FUNC_UNMASK_IRQ
-+  @category: PD_Reference
-+
-+  @input:  none
-+
-+  @output: none
-+
-+  @return: SDIO Status
-+
-+  @notes: This command code is used in the SDLIB_IssueConfig() API.  The command
-+          unmasks the IRQ for the I/O function. This request sets the function's
-+          interrupt enable bit in the INTENABLE register in the
-+          common register space.
-+
-+  @example: Example of unmasking interrupt :
-+        status = SDLIB_IssueConfig(pInstance->pDevice,
-+                                   SDCONFIG_FUNC_UNMASK_IRQ,
-+                                   NULL,
-+                                   0);
-+
-+  @see also: SDCONFIG_FUNC_MASK_IRQ
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Mask the function's IRQ
-+
-+  @function name: SDCONFIG_FUNC_MASK_IRQ
-+  @prototype: SDCONFIG_FUNC_MASK_IRQ
-+  @category: PD_Reference
-+
-+  @input:  none
-+
-+  @output: none
-+
-+  @return: SDIO Status
-+
-+  @notes: This command code is used in the SDLIB_IssueConfig() API.  The command
-+          masks the IRQ for the I/O function.
-+
-+  @example: Example of unmasking interrupt :
-+        status = SDLIB_IssueConfig(pInstance->pDevice,
-+                                   SDCONFIG_FUNC_MASK_IRQ,
-+                                   NULL,
-+                                   0);
-+
-+  @see also: SDCONFIG_FUNC_UNMASK_IRQ
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Acknowledge that the function's IRQ has been handled
-+
-+  @function name: SDCONFIG_FUNC_ACK_IRQ
-+  @prototype: SDCONFIG_FUNC_ACK_IRQ
-+  @category: PD_Reference
-+
-+  @input:  none
-+
-+  @output: none
-+
-+  @return: SDIO Status
-+
-+  @notes: This command code is used in the SDLIB_IssueConfig() API.  The command
-+          indicates to the bus driver that the function driver has handled the
-+          interrupt.  The bus driver will notify the host controller to unmask the
-+          interrupt source.  SDIO interrupts are level triggered and are masked at the
-+          host controller level until all function drivers have indicated that they
-+          have handled their respective interrupt. This command can be issued in either
-+          the IRQ handler or asynchronous IRQ handler.
-+
-+  @example: Example of acknowledging an interrupt :
-+        status = SDLIB_IssueConfig(pInstance->pDevice,
-+                                   SDCONFIG_FUNC_ACK_IRQ,
-+                                   NULL,
-+                                   0);
-+
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Disable SD/MMC/SDIO card CRC checking.
-+
-+  @function name: SDCONFIG_FUNC_SPI_MODE_DISABLE_CRC
-+  @prototype: SDCONFIG_FUNC_SPI_MODE_DISABLE_CRC
-+  @category: PD_Reference
-+
-+  @input:  none
-+
-+  @output: none
-+
-+  @return: SDIO Status
-+
-+  @notes: This command code is used in the SDLIB_IssueConfig() API.  The command
-+          issues CMD59 to disable SPI-CRC checking and requests the host controller
-+          driver to stop checking the CRC. This is typically used in systems where
-+          CRC checking is not required and performance is improved if the CRC checking
-+          is ommitted (i.e. SPI implementations without hardware CRC support).
-+
-+  @example: Example of disabling SPI CRC checking:
-+        status = SDLIB_IssueConfig(pInstance->pDevice,
-+                                   SDCONFIG_FUNC_SPI_MODE_DISABLE_CRC,
-+                                   NULL,
-+                                   0);
-+
-+  @see also: SDCONFIG_FUNC_SPI_MODE_ENABLE_CRC
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Enable SD/MMC/SDIO card CRC checking.
-+
-+  @function name: SDCONFIG_FUNC_SPI_MODE_ENABLE_CRC
-+  @prototype: SDCONFIG_FUNC_SPI_MODE_ENABLE_CRC
-+  @category: PD_Reference
-+
-+  @input:  none
-+
-+  @output: none
-+
-+  @return: SDIO Status
-+
-+  @notes: This command code is used in the SDLIB_IssueConfig() API.  The command
-+          issues CMD59 to enable SPI-CRC checking and requests the host controller
-+          driver to generate valid CRCs for commands and data as well as
-+          check the CRC in responses and incomming data blocks.
-+
-+  @example: Example of enabling SPI CRC checking:
-+        status = SDLIB_IssueConfig(pInstance->pDevice,
-+                                   SDCONFIG_FUNC_SPI_MODE_ENABLE_CRC,
-+                                   NULL,
-+                                   0);
-+
-+  @see also: SDCONFIG_FUNC_SPI_MODE_DISABLE_CRC
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Allocate slot current for a card function.
-+
-+  @function name: SDCONFIG_FUNC_ALLOC_SLOT_CURRENT
-+  @prototype: SDCONFIG_FUNC_ALLOC_SLOT_CURRENT
-+  @category: PD_Reference
-+
-+  @input:  SDCONFIG_FUNC_SLOT_CURRENT_DATA
-+
-+  @output: SDCONFIG_FUNC_SLOT_CURRENT_DATA
-+
-+  @return: SDIO Status
-+
-+  @notes: This command code is used in the SDLIB_IssueConfig() API.  The command
-+          requests an allocation of slot current to satisfy the power requirements
-+          of the function.  The command uses the SDCONFIG_FUNC_SLOT_CURRENT_DATA
-+          data structure to pass the required current in mA. Slot current allocation
-+          is not cummulative and this command should only be issued once by each function
-+          driver with the worse case slot current usage.
-+          The command returns SDIO_STATUS_NO_RESOURCES if the
-+          requirement cannot be met by the host hardware.  The SlotCurrent field will
-+          contain the remaining current available to the slot.  The slot current should
-+          be allocated before the function is enabled using SDCONFIG_FUNC_ENABLE_DISABLE.
-+          When a function driver is unloaded it should free the slot current allocation
-+          by using the SDCONFIG_FUNC_FREE_SLOT_CURRENT command.
-+
-+  @example: Example of allocating slot current:
-+        slotCurrent.SlotCurrent = 150;  // 150 mA
-+        status = SDLIB_IssueConfig(pInstance->pDevice,
-+                                   SDCONFIG_FUNC_ALLOC_SLOT_CURRENT,
-+                                   &slotCurrent,
-+                                   sizeof(slotCurrent));
-+
-+
-+  @see also: SDCONFIG_FUNC_FREE_SLOT_CURRENT
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Free slot current for a card function.
-+
-+  @function name: SDCONFIG_FUNC_FREE_SLOT_CURRENT
-+  @prototype: SDCONFIG_FUNC_FREE_SLOT_CURRENT
-+  @category: PD_Reference
-+
-+  @input:  none
-+
-+  @output: none
-+
-+  @return: SDIO Status
-+
-+  @notes: This command code is used in the SDLIB_IssueConfig() API.  The command
-+          frees the allocated current for a card function.  This command should be
-+          issued only once (per function) and only after an allocation was successfully made.
-+
-+  @example: Example of freeing slot current:
-+        status = SDLIB_IssueConfig(pInstance->pDevice,
-+                                   SDCONFIG_FUNC_FREE_SLOT_CURRENT,
-+                                   NULL,
-+                                   0);
-+
-+  @see also: SDCONFIG_FUNC_ALLOC_SLOT_CURRENT
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Set the bus mode for the SD/SDIO card.
-+
-+  @function name: SDCONFIG_FUNC_CHANGE_BUS_MODE
-+  @prototype: SDCONFIG_FUNC_CHANGE_BUS_MODE
-+  @category: PD_Reference
-+
-+  @input:  none
-+
-+  @output: none
-+
-+  @return: SDIO Status
-+
-+  @notes:     This command code is used in the SDLIB_IssueConfig() API.  The command
-+          alters the card's bus mode (width and clock rate) to a driver specified
-+          value.  The driver must read the current bus mode flags, modify if necessary
-+          and pass the value in the SDCONFIG_BUS_MODE_DATA structure.
-+              If the bus width is changed (1 or 4 bit) the caller must adjust the mode flags
-+          for the new width. Cards cannot be switched between 1/4 bit and SPI mode.
-+          Switching to or from SPI mode requires a power cycle. Adjustments to the clock
-+          rate is immediate on the next bus transaction.  The actual clock rate value is
-+          limited by the host controller and is reported in the ClockRate field when the
-+          command completes successfully.
-+              The bus mode change is card wide and may affect other SDIO functions on
-+          multi-function cards. Use this feature with caution. This feature should NOT be
-+          used to dynamically control clock rates during runtime and should only be used
-+          at card initialization. Changing the bus mode must be done with SDIO function
-+          interrupts masked.
-+              This request can block and must only be called from a schedulable context.
-+
-+  @example: Example of changing the clock rate:
-+    SDCONFIG_BUS_MODE_DATA  busSettings;
-+    ZERO_OBJECT(busSettings);
-+       // get current bus flags and keep the same bus width
-+    busSettings.BusModeFlags = SDDEVICE_GET_BUSMODE_FLAGS(pInstance->pDevice);
-+    busSettings.ClockRate = 8000000;  // adjust clock to 8 Mhz
-+       // issue config request to override clock rate
-+    status = SDLIB_IssueConfig(pInstance->pDevice,
-+                               SDCONFIG_FUNC_CHANGE_BUS_MODE,
-+                               &busSettings,
-+                               sizeof(SDCONFIG_BUS_MODE_DATA));
-+
-+  @see also: SDDEVICE_GET_BUSMODE_FLAGS
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the debug level of the underlying host controller driver.
-+
-+  @function name: SDCONFIG_GET_HCD_DEBUG
-+  @prototype: SDCONFIG_GET_HCD_DEBUG
-+  @category: PD_Reference
-+
-+  @input:  none
-+
-+  @output: CT_DEBUG_LEVEL
-+
-+  @return: SDIO Status
-+
-+  @notes: This command code is used in the SDLIB_IssueConfig() API.  The command
-+          requests the current debug level of the HCD driver.  This API is useful for
-+          saving the current debug level of the HCD prior to issuing SDCONFIG_SET_HCD_DEBUG
-+          in order to increase the verbosity of the HCD. This API should be used only for
-+          debugging purposes.  If multiple functions attempt to save and set the HCD debug
-+          level simultanously, the final debug level will be unknown. Not all HCDs support
-+          this command.
-+
-+  @example: Example of saving the debug level:
-+        CT_DEBUG_LEVEL savedDebug;
-+        status = SDLIB_IssueConfig(pInstance->pDevice,
-+                                   SDCONFIG_GET_HCD_DEBUG,
-+                                   &savedDebug,
-+                                   sizeof(savedDebug));
-+
-+  @see also: SDCONFIG_SET_HCD_DEBUG
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Set the debug level of the underlying host controller driver.
-+
-+  @function name: SDCONFIG_SET_HCD_DEBUG
-+  @prototype: SDCONFIG_SET_HCD_DEBUG
-+  @category: PD_Reference
-+
-+  @input:  CT_DEBUG_LEVEL
-+
-+  @output: none
-+
-+  @return: SDIO Status
-+
-+  @notes: This command code is used in the SDLIB_IssueConfig() API.  The command
-+          sets the current debug level of the HCD driver.  This API is useful for
-+          setting the debug level of the HCD programatically for debugging purposes.
-+          If multiple functions attempt to save and set the HCD debug
-+          level simultanously, the final debug level will be unknown. Not all HCDs support
-+          this request.
-+
-+  @example: Example of setting the debug level:
-+        CT_DEBUG_LEVEL setDebug = 15;
-+        status = SDLIB_IssueConfig(pInstance->pDevice,
-+                                   SDCONFIG_GET_HCD_DEBUG,
-+                                   &setDebug,
-+                                   sizeof(setDebug));
-+
-+  @see also: SDCONFIG_GET_HCD_DEBUG
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Instruct the bus driver to not check the SDIO card interrupt pending
-+             register on card interrupts, if possible.
-+
-+  @function name: SDCONFIG_FUNC_NO_IRQ_PEND_CHECK
-+  @prototype: SDCONFIG_FUNC_NO_IRQ_PEND_CHECK
-+  @category: PD_Reference
-+
-+  @input:  none
-+
-+  @output: none
-+
-+  @return: SDIO Status
-+
-+  @notes: This command code is used in the SDLIB_IssueConfig() API.  The command instructs the
-+          bus driver to skip checking the card interrupt pending register on each card
-+          interrupt.  The bus driver will assume the function is interrupting and immediately start
-+          the interrupt processing stage. This option is only valid for single function cards.
-+          The bus driver will reject the command for a card with more than 1 function.
-+          For single function cards, this can improve interrupt response time.
-+
-+  @example: Example of skipping IRQ pending checks:
-+
-+        status = SDLIB_IssueConfig(pInstance->pDevice,
-+                                   SDCONFIG_FUNC_NO_IRQ_PEND_CHECK,
-+                                   NULL,
-+                                   0);
-+
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-diff --git a/drivers/sdio/stack/busdriver/sdio_bus_events.c b/drivers/sdio/stack/busdriver/sdio_bus_events.c
-new file mode 100644
-index 0000000..5b3148d
---- /dev/null
-+++ b/drivers/sdio/stack/busdriver/sdio_bus_events.c
-@@ -0,0 +1,1040 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdio_bus_events.c
-+
-+@abstract: OS independent bus driver support
-+
-+#notes: this file contains various event handlers and helpers
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define MODULE_NAME  SDBUSDRIVER
-+#include <linux/sdio/ctsystem.h>
-+#include <linux/sdio/sdio_busdriver.h>
-+#include <linux/sdio/sdio_lib.h>
-+#include "_busdriver.h"
-+#include <linux/sdio/_sdio_defs.h>
-+#include <linux/sdio/mmc_defs.h>
-+
-+static SDIO_STATUS ScanSlotForCard(PSDHCD pHcd,
-+                                   PBOOL  pCardPresent);
-+static void GetPendingIrqComplete(PSDREQUEST pReq);
-+static void ProcessPendingIrqs(PSDHCD  pHcd, UINT8 IntPendingMsk);
-+
-+/*
-+ * DeviceDetach - tell core a device was removed from a slot
-+*/
-+SDIO_STATUS DeviceDetach(PSDHCD pHcd)
-+{
-+    SDCONFIG_SDIO_INT_CTRL_DATA irqData;
-+
-+    ZERO_OBJECT(irqData);
-+
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: DeviceDetach\n"));
-+        /* tell any function drivers we are gone */
-+    RemoveHcdFunctions(pHcd);
-+        /* delete the devices associated with this HCD */
-+    DeleteDevices(pHcd);
-+        /* check and see if there are any IRQs that were left enabled */
-+    if (pHcd->IrqsEnabled) {
-+        irqData.SlotIRQEnable = FALSE;
-+            /* turn off IRQ detection in HCD */
-+        _IssueConfig(pHcd,SDCONFIG_SDIO_INT_CTRL,(PVOID)&irqData, sizeof(irqData));
-+    }
-+
-+        /* reset hcd state */
-+    ResetHcdState(pHcd);
-+
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: DeviceDetach\n"));
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+/*
-+ * DeviceAttach - tell core a device was inserted into a slot
-+*/
-+SDIO_STATUS DeviceAttach(PSDHCD pHcd)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    PSDDEVICE pDevice = NULL;
-+    UINT      ii;
-+
-+
-+    if (IS_CARD_PRESENT(pHcd)) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: DeviceAttach called on occupied slot!\n"));
-+        return SDIO_STATUS_ERROR;
-+    }
-+
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: DeviceAttach bdctxt:0x%X \n", (UINT32)pBusContext));
-+
-+    if (IS_HCD_RAW(pHcd)) {
-+         DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: RAW HCD (%s) device attach \n",pHcd->pName));
-+            /* this is a raw HCD */
-+        memset(&pHcd->CardProperties,0,sizeof(pHcd->CardProperties));
-+        pHcd->CardProperties.Flags = CARD_RAW;
-+        pHcd->CardProperties.IOFnCount = 0;
-+          /* for raw HCD, set up minimum parameters
-+           * since we cannot determine these values using any standard, use values
-+           * reported by the HCD */
-+            /* the operational rate is just the max clock rate reported */
-+        pHcd->CardProperties.OperBusClock =  pHcd->MaxClockRate;
-+            /* the max bytes per data transfer is just the max bytes per block */
-+        pHcd->CardProperties.OperBlockLenLimit = pHcd->MaxBytesPerBlock;
-+            /* if the raw HCD uses blocks to transfer, report the operational size
-+             * from the HCD max value */
-+        pHcd->CardProperties.OperBlockCountLimit = pHcd->MaxBlocksPerTrans;
-+            /* set the slot preferred voltage */
-+        pHcd->CardProperties.CardVoltage = pHcd->SlotVoltagePreferred;
-+    } else {
-+            /* initialize this card and get card properties  */
-+        if (!SDIO_SUCCESS((status = SDInitializeCard(pHcd)))) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: DeviceAttach, failed to initialize card, %d\n",
-+                                   status));
-+            return status;
-+        }
-+    }
-+
-+        /* check for SD or MMC, this must be done first as the query may involve
-+         * de-selecting the card */
-+    do {
-+        if (!(pHcd->CardProperties.Flags & (CARD_MMC | CARD_SD | CARD_RAW))) {
-+                /* none of these were discovered */
-+            break;
-+        }
-+        pDevice = AllocateDevice(pHcd);
-+        if (NULL == pDevice) {
-+            break;
-+        }
-+        if (pHcd->CardProperties.Flags & CARD_RAW) {
-+                /* set function number to 1 for IRQ processing */
-+            SDDEVICE_SET_SDIO_FUNCNO(pDevice,1);
-+        } else {
-+                /* get the ID info for the SD/MMC Card */
-+            if (!SDIO_SUCCESS((status = SDQuerySDMMCInfo(pDevice)))) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: DeviceAttach, query SDMMC Info failed \n"));
-+                FreeDevice(pDevice);
-+                break;
-+            }
-+        }
-+        AddDeviceToList(pDevice);
-+            /* look for a function driver to handle this card */
-+        ProbeForFunction(pDevice, pHcd);
-+    } while (FALSE);
-+
-+        /* create a device for each I/O function */
-+    for(ii= 1; ii <= pHcd->CardProperties.IOFnCount; ii++) {
-+        pDevice = AllocateDevice(pHcd);
-+        if (NULL == pDevice) {
-+            break;
-+        }
-+            /* set the function number */
-+        SDDEVICE_SET_SDIO_FUNCNO(pDevice,ii);
-+            /* get the ID info for each I/O function */
-+        if (!SDIO_SUCCESS((status = SDQuerySDIOInfo(pDevice)))) {
-+            DBG_PRINT(SDDBG_ERROR,
-+                    ("SDIO Bus Driver: DeviceAttach, could not query SDIO Info, funcNo:%d status:%d \n",
-+                    ii, status));
-+            FreeDevice(pDevice);
-+                /* keep loading other functions */
-+            continue;
-+        }
-+        AddDeviceToList(pDevice);
-+            /* look for a function driver to handle this card */
-+        ProbeForFunction(pDevice, pHcd);
-+    }
-+
-+
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: DeviceAttach \n"));
-+    return status;
-+}
-+
-+static INLINE void CompleteRequestCheckCancel(PSDHCD pHcd, PSDREQUEST pReqToComplete)
-+{
-+    BOOL cancel = FALSE;
-+    PSDFUNCTION pFunc = NULL;
-+
-+        /* handle cancel of current request */
-+    if (pReqToComplete->Flags & SDREQ_FLAGS_CANCELED) {
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver - _SDIO_HandleHcdEvent: cancelling req 0X%X\n", (UINT)pReqToComplete));
-+        cancel = TRUE;
-+        pReqToComplete->Status = SDIO_STATUS_CANCELED;
-+        pFunc = pReqToComplete->pFunction;
-+        DBG_ASSERT(pFunc != NULL);
-+    }
-+
-+    DoRequestCompletion(pReqToComplete, pHcd);
-+
-+    if (cancel) {
-+        SignalSet(&pFunc->CleanupReqSig);
-+    }
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Indicate to the SDIO bus driver (core) of an event in the host controller
-+             driver.
-+
-+  @function name: SDIO_HandleHcdEvent
-+  @prototype: SDIO_STATUS SDIO_HandleHcdEvent(PSDHCD pHcd, HCD_EVENT Event)
-+  @category: HD_Reference
-+
-+  @input:  pHcd - the host controller structure that was registered
-+           HCD_EVENT - event code
-+
-+  @output: none
-+
-+  @return: SDIO_STATUS
-+
-+  @notes:
-+          The host controller driver can indicate asynchronous events by calling this
-+          function with an appropriate event code. Refer to the HDK help manual for
-+          more information on the event types
-+
-+  @example: Example of indicating a card insertion event:
-+            SDIO_HandleHcdEvent(&Hcd, EVENT_HCD_ATTACH);
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _SDIO_HandleHcdEvent(PSDHCD pHcd, HCD_EVENT Event)
-+{
-+    PSDREQUEST       pReq;
-+    PSDREQUEST       pReqToComplete = NULL;
-+    PSDREQUEST       pNextReq = NULL;
-+    SDIO_STATUS      status;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    DBG_PRINT(SDIODBG_HCD_EVENTS, ("SDIO Bus Driver: _SDIO_HandleHcdEvent, event type 0x%X, HCD:0x%X\n",
-+                         Event, (UINT)pHcd));
-+
-+    if (Event == EVENT_HCD_TRANSFER_DONE) {
-+        pReq = GET_CURRENT_REQUEST(pHcd);
-+        if (NULL == pReq) {
-+            DBG_ASSERT(FALSE);
-+            return SDIO_STATUS_ERROR;
-+        }
-+
-+        status = _AcquireHcdLock(pHcd);
-+        if (SDIO_SUCCESS(status)) {
-+                /* null out the current request */
-+            SET_CURRENT_REQUEST(pHcd, NULL);
-+            status = _ReleaseHcdLock(pHcd);
-+        } else {
-+            DBG_PRINT(SDDBG_ERROR,
-+              ("SDIO Bus Driver: SDIO_HandleHcdEvent Failed to acquire HCD lock \n"));
-+            return SDIO_STATUS_ERROR;
-+        }
-+
-+            /* note: the queue is still marked busy to prevent other threads/tasks from starting
-+             * new requests while we are handling completion , some completed requests are
-+             * marked as barrier requests which must be handled atomically */
-+
-+        status = pReq->Status;
-+        DBG_PRINT(SDIODBG_REQUESTS,
-+            ("+SDIO Bus Driver: Handling Transfer Done (CMD:%d, Status:%d) from HCD:0x%08X \n",
-+                  pReq->Command, status, (INT)pHcd));
-+            /* check SPI mode conversion */
-+        if (IS_HCD_BUS_MODE_SPI(pHcd) && SDIO_SUCCESS(status)) {
-+            if (!(pReq->Flags & SDREQ_FLAGS_RESP_SKIP_SPI_FILT) && !(pReq->Flags & SDREQ_FLAGS_PSEUDO) &&
-+                (GET_SDREQ_RESP_TYPE(pReq->Flags) != SDREQ_FLAGS_NO_RESP)) {
-+                ConvertSPI_Response(pReq, NULL);
-+            }
-+        }
-+
-+        DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Completing Request:0x%08X \n",(INT)pReq));
-+
-+        if (!SDIO_SUCCESS(status) &&
-+            (status != SDIO_STATUS_CANCELED)  &&
-+            !(pReq->Flags & SDREQ_FLAGS_CANCELED) &&
-+            (pReq->RetryCount > 0)) {
-+                /* retry the request if it failed, was NOT cancelled and the retry count
-+                 * is greater than zero */
-+            pReq->RetryCount--;
-+            pReqToComplete = NULL;
-+                /* clear SPI converted flag */
-+            pReq->Flags &= ~SDREQ_FLAGS_RESP_SPI_CONVERTED;
-+            pNextReq = pReq;
-+        } else {
-+                /* complete the request */
-+            if (pReq->Flags & SDREQ_FLAGS_BARRIER) {
-+                    /* a barrier request must be completed before the next bus request is
-+                     * started */
-+                CompleteRequestCheckCancel(pHcd, pReq);
-+                if (!ForceAllRequestsAsync()) {
-+                    if (CHECK_API_VERSION_COMPAT(pHcd,2,6)) {
-+                            /* the request was completed, decrement recursion count */
-+                        status = _AcquireHcdLock(pHcd);
-+                        if (!SDIO_SUCCESS(status)) {
-+                            return status;
-+                        }
-+                        pHcd->Recursion--;
-+                        DBG_ASSERT(pHcd->Recursion >= 0);
-+                        status = _ReleaseHcdLock(pHcd);
-+                    } else {
-+                            /* reset bit */
-+                        AtomicTest_Clear(&pHcd->HcdFlags, HCD_REQUEST_CALL_BIT);
-+                    }
-+                }
-+                pReqToComplete = NULL;
-+            } else {
-+                    /* complete this after the next request has
-+                     * been started */
-+                pReqToComplete = pReq;
-+            }
-+        }
-+
-+            /* acquire the hcd lock to look at the queues */
-+        status = _AcquireHcdLock(pHcd);
-+        if (SDIO_SUCCESS(status)) {
-+            if (pReqToComplete != NULL) {
-+                    /* queue the request that was completed */
-+                QueueRequest(&pHcd->CompletedRequestQueue, pReqToComplete);
-+            }
-+            if (NULL == pNextReq) {
-+                    /* check the queue for the next request */
-+                DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Checking queue.. \n"));
-+                    /* check to see if the HCD was already working on one.  This occurs if
-+                     * the current request being completed was a barrier request and the
-+                     * barrier completion routine submitted a new request to the head of the
-+                     * queue */
-+                if (GET_CURRENT_REQUEST(pHcd) == NULL) {
-+                    pNextReq = DequeueRequest(&pHcd->RequestQueue);
-+                    if (NULL == pNextReq) {
-+                            /* nothing in the queue, mark it not busy */
-+                        MarkQueueNotBusy(&pHcd->RequestQueue);
-+                        DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Queue idle \n"));
-+                    } else {
-+                        DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Next request in queue: 0x%X \n",
-+                            (INT)pNextReq));
-+                    }
-+                } else {
-+                    DBG_PRINT(SDIODBG_REQUESTS,
-+                        ("SDIO Bus Driver: Busy Queue from barrier request \n"));
-+                }
-+            }
-+
-+            if (pNextReq != NULL) {
-+                    /* a new request will be submitted to the HCD below,
-+                     * check recursion while we have the lock */
-+                if (CHECK_API_VERSION_COMPAT(pHcd,2,6)) {
-+                    CHECK_HCD_RECURSE(pHcd,pNextReq);
-+                }
-+            }
-+            status = _ReleaseHcdLock(pHcd);
-+        } else {
-+            DBG_PRINT(SDDBG_ERROR,
-+              ("SDIO Bus Driver: SDIO_HandleHcdEvent Failed to acquire HCD lock \n"));
-+            return SDIO_STATUS_ERROR;
-+        }
-+            /* check for the next request to issue */
-+        if (pNextReq != NULL) {
-+            DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Starting Next Request: 0x%X \n",
-+                        (INT)pNextReq));
-+            SET_CURRENT_REQUEST(pHcd,pNextReq);
-+            status = CallHcdRequest(pHcd);
-+                /* check and see if the HCD completed the request in the callback */
-+            if (status != SDIO_STATUS_PENDING) {
-+                    /* recurse and process the request */
-+                _SDIO_HandleHcdEvent(pHcd, EVENT_HCD_TRANSFER_DONE);
-+            }
-+        }
-+
-+        /* now empty the completed request queue
-+         * - this guarantees in-order completion even during recursion */
-+        status = _AcquireHcdLock(pHcd);
-+        if (SDIO_SUCCESS(status)) {
-+            while (1) {
-+                pReqToComplete = DequeueRequest(&pHcd->CompletedRequestQueue);
-+                status = _ReleaseHcdLock(pHcd);
-+                if (pReqToComplete != NULL) {
-+                    CompleteRequestCheckCancel(pHcd, pReqToComplete);
-+                    if (!CHECK_API_VERSION_COMPAT(pHcd,2,6)) {
-+                        if (!ForceAllRequestsAsync()) {
-+                                /* reset bit */
-+                            AtomicTest_Clear(&pHcd->HcdFlags, HCD_REQUEST_CALL_BIT);
-+                        }
-+                    }
-+                        /* re-acquire lock */
-+                    status = _AcquireHcdLock(pHcd);
-+                    if (!SDIO_SUCCESS(status)) {
-+                        return SDIO_STATUS_ERROR;
-+                    }
-+                    if (CHECK_API_VERSION_COMPAT(pHcd,2,6)) {
-+                        if (!ForceAllRequestsAsync()) {
-+                            /* while we have the lock, decrement recursion count each time
-+                             * we complete a request */
-+                            pHcd->Recursion--;
-+                            DBG_ASSERT(pHcd->Recursion >= 0);
-+                        }
-+                    }
-+                }  else {
-+                        /* we're done */
-+                    break;
-+                }
-+            }
-+        } else {
-+            DBG_PRINT(SDDBG_ERROR,
-+              ("SDIO Bus Driver: SDIO_HandleHcdEvent Failed to acquire HCD lock \n"));
-+            return SDIO_STATUS_ERROR;
-+        }
-+        DBG_PRINT(SDIODBG_REQUESTS, ("-SDIO Bus Driver: Transfer Done Handled \n"));
-+        return SDIO_STATUS_SUCCESS;
-+    }
-+
-+    switch(Event) {
-+        case EVENT_HCD_ATTACH:
-+        case EVENT_HCD_DETACH:
-+                /* card detect helper does the actual attach detach */
-+            return PostCardDetectEvent(pBusContext,Event,pHcd);
-+        case EVENT_HCD_SDIO_IRQ_PENDING:
-+            return DeviceInterrupt(pHcd);
-+        default:
-+            DBG_PRINT(SDDBG_ERROR, ("-SDIO Bus Driver: SDIO_HandleHcdEvent, invalid event type 0x%X, HCD:0x%X\n",
-+                                    Event, (UINT)pHcd));
-+        return SDIO_STATUS_INVALID_PARAMETER;
-+    }
-+
-+}
-+
-+/* card detect helper function */
-+THREAD_RETURN CardDetectHelperFunction(POSKERNEL_HELPER pHelper)
-+{
-+    SDIO_STATUS       status;
-+    HCD_EVENT_MESSAGE message;
-+    INT               length;
-+
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver - CardDetectHelperFunction starting up: 0x%X \n", (INT)pHelper));
-+
-+    while (1) {
-+
-+            /* wait for wake up event */
-+        status = SD_WAIT_FOR_WAKEUP(pHelper);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver - Card Detect Helper Semaphore Pend Error:%d \n",
-+                                    status));
-+            break;
-+        }
-+
-+        if (SD_IS_HELPER_SHUTTING_DOWN(pHelper)) {
-+                /* cleanup message queue on shutdown */
-+            while (1) {
-+                length = sizeof(message);
-+                    /* get a message */
-+                status = SDLIB_GetMessage(pBusContext->pCardDetectMsgQueue,
-+                                          &message, &length);
-+                if (!SDIO_SUCCESS(status)) {
-+                    break;
-+                }
-+                if (message.pHcd != NULL) {
-+                        /* decrement HCD reference count */
-+                    OS_DecHcdReference(message.pHcd);
-+                }
-+            }
-+
-+            break;
-+        }
-+
-+        while (1) {
-+            length = sizeof(message);
-+                /* get a message */
-+            status = SDLIB_GetMessage(pBusContext->pCardDetectMsgQueue,
-+                                      &message, &length);
-+            if (!SDIO_SUCCESS(status)) {
-+                break;
-+            }
-+
-+            switch (message.Event) {
-+                case EVENT_HCD_ATTACH:
-+                    DeviceAttach(message.pHcd);
-+                    break;
-+                case EVENT_HCD_DETACH:
-+                    DeviceDetach(message.pHcd);
-+                    break;
-+                case EVENT_HCD_CD_POLLING:
-+                        /* run detector */
-+                    RunCardDetect();
-+                    break;
-+                default:
-+                    DBG_ASSERT(FALSE);
-+                    break;
-+            }
-+
-+            if (message.pHcd != NULL) {
-+                    /* message was processed, decrement reference count */
-+                OS_DecHcdReference(message.pHcd);
-+            }
-+        }
-+    }
-+
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver - Card Detect Helper Exiting.. \n"));
-+    return 0;
-+}
-+
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  RunCardDetect - run card detect on host controller slots that require polling
-+  Input:
-+  Output:
-+  Return:
-+  Notes: This function is called from the card detect timer thread
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void RunCardDetect(void)
-+{
-+    BOOL       CDPollingRequired = FALSE;
-+    PSDLIST    pListItem;
-+    PSDHCD     pHcd;
-+    BOOL       cardPresent;
-+
-+    DBG_PRINT(SDIODBG_CD_TIMER, ("+SDIO Bus Driver: RunCardDetect\n"));
-+
-+       /* protect the HCD list */
-+    if (!SDIO_SUCCESS(SemaphorePendInterruptable(&pBusContext->HcdListSem))) {
-+        DBG_ASSERT(FALSE);
-+        return;  /* wait interrupted */
-+    }
-+        /* while we are running the detector we are blocking HCD removal*/
-+    SDITERATE_OVER_LIST(&pBusContext->HcdList, pListItem) {
-+        pHcd = CONTAINING_STRUCT(pListItem, SDHCD, SDList);
-+            /* does the HCD require polling ? */
-+        if (pHcd->Attributes & SDHCD_ATTRIB_SLOT_POLLING) {
-+            DBG_PRINT(SDIODBG_CD_TIMER, ("SDIO Bus Driver: Found HCD requiring polling \n"));
-+                /* set flag to queue the timer */
-+            CDPollingRequired = TRUE;
-+            if (IS_CARD_PRESENT(pHcd)) {
-+                    /* there is a device in the slot */
-+                cardPresent = TRUE;
-+                if (SDIO_SUCCESS(ScanSlotForCard(pHcd,&cardPresent))) {
-+                    if (!cardPresent) {
-+                        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver CD Polling.. Card Removal Detected\n"));
-+                        DeviceDetach(pHcd);
-+                    }
-+                }
-+            } else {
-+                cardPresent = FALSE;
-+                if (SDIO_SUCCESS(ScanSlotForCard(pHcd,&cardPresent))) {
-+                     if (cardPresent) {
-+                        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver CD Polling.. Card Detected\n"));
-+                        DeviceAttach(pHcd);
-+                    }
-+                }
-+            }
-+        }
-+
-+        DBG_PRINT(SDIODBG_CD_TIMER, ("SDIO Bus Driver: moving to next hcd:0x%X \n",
-+                                     (INT)pListItem->pNext));
-+    }
-+
-+        /* check if we need to queue the timer */
-+    if (CDPollingRequired && !pBusContext->CDTimerQueued) {
-+        pBusContext->CDTimerQueued = TRUE;
-+        DBG_PRINT(SDIODBG_CD_TIMER, ("SDIO Bus Driver: Queuing Card detect timer \n"));
-+        if (!SDIO_SUCCESS(
-+            QueueTimer(SDIOBUS_CD_TIMER_ID, pBusContext->CDPollingInterval))) {
-+            DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: failed to queue CD timer \n"));
-+            pBusContext->CDTimerQueued = FALSE;
-+        }
-+    }
-+        /* release HCD list lock */
-+    SemaphorePost(&pBusContext->HcdListSem);
-+    DBG_PRINT(SDIODBG_CD_TIMER, ("-SDIO Bus Driver: RunCardDetect\n"));
-+}
-+
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  ScanSlotForCard - scan slot for a card
-+  Input:  pHcd - the hcd
-+  Output: pCardPresent - card present flag (set/cleared on return)
-+  Return:
-+  Notes:
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static SDIO_STATUS ScanSlotForCard(PSDHCD pHcd,PBOOL pCardPresent)
-+{
-+    SDIO_STATUS         status = SDIO_STATUS_SUCCESS;
-+    UINT8               temp;
-+
-+    DBG_PRINT(SDIODBG_CD_TIMER, ("+SDIO Bus Driver: ScanSlotForCard\n"));
-+
-+    do {
-+        if (!IS_CARD_PRESENT(pHcd)) {
-+            INT   dbgLvl;
-+            dbgLvl = DBG_GET_DEBUG_LEVEL();
-+            DBG_SET_DEBUG_LEVEL(SDDBG_WARN);
-+            status = CardInitSetup(pHcd);
-+            DBG_SET_DEBUG_LEVEL(dbgLvl);
-+            if (!SDIO_SUCCESS(status)) {
-+                break;
-+            }
-+                /* issue go-idle */
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_RESP_R1,NULL);
-+            } else {
-+                _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_NO_RESP,NULL);
-+            }
-+                /* try SDIO */
-+            status = TestPresence(pHcd,CARD_SDIO,NULL);
-+            if (SDIO_SUCCESS(status)) {
-+                *pCardPresent = TRUE;
-+                break;
-+            }
-+                /* issue go-idle */
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_RESP_R1,NULL);
-+            } else {
-+                _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_NO_RESP,NULL);
-+            }
-+                /* try SD */
-+            status = TestPresence(pHcd,CARD_SD,NULL);
-+            if (SDIO_SUCCESS(status)) {
-+                *pCardPresent = TRUE;
-+                break;
-+            }
-+                /* issue go-idle */
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_RESP_R1,NULL);
-+            } else {
-+                _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_NO_RESP,NULL);
-+            }
-+                /* try MMC */
-+            status = TestPresence(pHcd,CARD_MMC,NULL);
-+            if (SDIO_SUCCESS(status)) {
-+                *pCardPresent = TRUE;
-+                break;
-+            }
-+        } else {
-+            if (pHcd->CardProperties.Flags & CARD_SDIO) {
-+#ifdef DUMP_INT_PENDING
-+                temp = 0;
-+                    /* handy debug prints to check interrupt status and print pending register */
-+                status = Cmd52ReadByteCommon(pHcd->pPseudoDev, SDIO_INT_ENABLE_REG, &temp);
-+                if (SDIO_SUCCESS(status) && (temp != 0)) {
-+                    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: INT Enable Reg: 0x%2.2X\n", temp));
-+                    status = Cmd52ReadByteCommon(pHcd->pPseudoDev, SDIO_INT_PENDING_REG, &temp);
-+                    if (SDIO_SUCCESS(status)) {
-+                        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: INT Pend Reg: 0x%2.2X\n", temp));
-+                    }
-+                }
-+#endif
-+                    /* for SDIO cards, read the revision register */
-+                status = Cmd52ReadByteCommon(pHcd->pPseudoDev, CCCR_SDIO_REVISION_REG, &temp);
-+            } else if (pHcd->CardProperties.Flags & (CARD_SD | CARD_MMC)) {
-+                    /* for SD/MMC cards, issue SEND_STATUS */
-+                if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                        /* SPI uses the SPI R2 response */
-+                    status = _IssueSimpleBusRequest(pHcd,
-+                                                    CMD13,
-+                                                    0,
-+                                                    SDREQ_FLAGS_RESP_R2,
-+                                                    NULL);
-+                } else {
-+                    status = _IssueSimpleBusRequest(pHcd,
-+                                                    CMD13,
-+                                                    (pHcd->CardProperties.RCA << 16),
-+                                                    SDREQ_FLAGS_RESP_R1,NULL);
-+                }
-+            } else {
-+                DBG_ASSERT(FALSE);
-+            }
-+            if (!SDIO_SUCCESS(status)) {
-+                    /* card is gone */
-+                *pCardPresent = FALSE;
-+            }
-+        }
-+    } while (FALSE);
-+
-+    if (status == SDIO_STATUS_BUS_RESP_TIMEOUT) {
-+        status = SDIO_STATUS_SUCCESS;
-+    }
-+
-+    DBG_PRINT(SDIODBG_CD_TIMER, ("-SDIO Bus Driver: ScanSlotForCard status:%d\n",
-+                                 status));
-+
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  DeviceInterrupt - handle device interrupt
-+  Input:  pHcd -  host controller
-+  Output:
-+  Return:
-+  Notes:
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS DeviceInterrupt(PSDHCD pHcd)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    SDIO_STATUS status2;
-+    PSDREQUEST pReq = NULL;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    DBG_PRINT(SDIODBG_FUNC_IRQ, ("+SDIO Bus Driver: DeviceInterrupt\n"));
-+
-+    if (!IS_CARD_PRESENT(pHcd)) {
-+        DBG_PRINT(SDDBG_ERROR, ("-SDIO Bus Driver: Device interrupt asserted on empty slot!\n"));
-+        return SDIO_STATUS_ERROR;
-+    }
-+
-+    do {
-+            /* for RAW HCDs or HCDs flagged for single-function IRQ optimization */
-+        if (IS_HCD_RAW(pHcd) || (pHcd->HcdFlags & (1 << HCD_IRQ_NO_PEND_CHECK))) {
-+            status = _AcquireHcdLock(pHcd);
-+            if (!SDIO_SUCCESS(status)) {
-+                return status;
-+            }
-+            if (pHcd->IrqProcState != SDHCD_IDLE) {
-+                status = SDIO_STATUS_ERROR;
-+                status2 = _ReleaseHcdLock(pHcd);
-+            } else {
-+                DBG_PRINT(SDIODBG_FUNC_IRQ, ("SDIO Bus Driver :  Device Interrupt \n"));
-+                    /* mark that we are processing */
-+                pHcd->IrqProcState = SDHCD_IRQ_PENDING;
-+                status2 = _ReleaseHcdLock(pHcd);
-+                    /* process Irqs for raw hcds or HCDs with the single function optimization */
-+                    /* force processing of function 1 interrupt */
-+                ProcessPendingIrqs(pHcd, (1 << 1));
-+            }
-+            DBG_PRINT(SDIODBG_FUNC_IRQ, ("-SDIO Bus Driver: DeviceInterrupt: %d\n", status));
-+                /* done with RAW irqs */
-+            return status;
-+        }
-+
-+            /* pre-allocate a request to get the pending bits, we have to do this outside the
-+              * hcd lock acquisition */
-+        pReq = AllocateRequest();
-+
-+        if (NULL == pReq) {
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            break;
-+        }
-+
-+        status = _AcquireHcdLock(pHcd);
-+
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+
-+        if (pHcd->IrqProcState != SDHCD_IDLE) {
-+            status = SDIO_STATUS_ERROR;
-+        } else {
-+                /* mark that we are processing */
-+            pHcd->IrqProcState = SDHCD_IRQ_PENDING;
-+                /* build argument to read IRQ pending register */
-+            SDIO_SET_CMD52_READ_ARG(pReq->Argument,0,SDIO_INT_PENDING_REG);
-+            pReq->Command = CMD52;
-+            pReq->Flags = SDREQ_FLAGS_TRANS_ASYNC | SDREQ_FLAGS_RESP_SDIO_R5;
-+            pReq->pCompleteContext = (PVOID)pHcd;
-+            pReq->pCompletion = GetPendingIrqComplete;
-+            pReq->RetryCount = SDBUS_MAX_RETRY;
-+        }
-+
-+        status2 = _ReleaseHcdLock(pHcd);
-+
-+        if (!SDIO_SUCCESS(status2)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: lock release error: %d\n", status2));
-+        }
-+
-+    } while (FALSE);
-+
-+    if (SDIO_SUCCESS(status)) {
-+        DBG_ASSERT(pReq != NULL);
-+        IssueRequestToHCD(pHcd,pReq);
-+        status = SDIO_STATUS_PENDING;
-+    } else {
-+        if (pReq != NULL) {
-+            FreeRequest(pReq);
-+        }
-+    }
-+
-+    DBG_PRINT(SDIODBG_FUNC_IRQ, ("-SDIO Bus Driver: DeviceInterrupt: %d\n", status));
-+    return status;
-+}
-+
-+
-+/* SDIO IRQ helper */
-+THREAD_RETURN SDIOIrqHelperFunction(POSKERNEL_HELPER pHelper)
-+{
-+    PSDHCD            pHcd;
-+    SDIO_STATUS       status;
-+    PSDLIST           pListItem;
-+    PSDDEVICE         pDevice;
-+    UINT8             funcMask;
-+    PSDDEVICE         pDeviceIRQ[7];
-+    UINT              deviceIrqCount = 0;
-+    UINT              ii;
-+
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver - SDIOIrqHelperFunction starting up \n"));
-+
-+    pHcd = (PSDHCD)pHelper->pContext;
-+    DBG_ASSERT(pHcd != NULL);
-+
-+    while (1) {
-+
-+            /* wait for wake up event */
-+        status = SD_WAIT_FOR_WAKEUP(pHelper);
-+
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver - SDIOIrqHelperFunction Pend Error:%d \n",
-+                                    status));
-+            break;
-+        }
-+
-+        if (SD_IS_HELPER_SHUTTING_DOWN(pHelper)) {
-+            break;
-+        }
-+
-+        DBG_PRINT(SDIODBG_FUNC_IRQ, ("SDIO Bus Driver - Pending IRQs:0x%X \n",
-+                                     pHcd->PendingHelperIrqs));
-+
-+         /* take the device list lock as we iterate through the list, this blocks
-+             * device removals */
-+        status = SemaphorePendInterruptable(&pBusContext->DeviceListSem);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+            /* walk through the device list matching HCD and interrupting function */
-+        SDITERATE_OVER_LIST(&pBusContext->DeviceList, pListItem) {
-+            pDevice = CONTAINING_STRUCT(pListItem, SDDEVICE, SDList);
-+                /* check if device belongs to the HCD */
-+            if (pDevice->pHcd != pHcd){
-+                    /* not on this hcd */
-+                continue;
-+            }
-+            funcMask = 1 << SDDEVICE_GET_SDIO_FUNCNO(pDevice);
-+                /* check device function against the pending mask */
-+            if (!(funcMask & pHcd->PendingHelperIrqs)) {
-+                    /* this one is not scheduled for the helper */
-+                continue;
-+            }
-+                /* clear bit */
-+            pHcd->PendingHelperIrqs &= ~funcMask;
-+                /* check for sync IRQ and call handler */
-+            if (pDevice->pIrqFunction != NULL) {
-+                DBG_PRINT(SDIODBG_FUNC_IRQ, ("SDIO Bus Driver: Calling IRQ Handler. Fn:%d\n",
-+                                             SDDEVICE_GET_SDIO_FUNCNO(pDevice)));
-+                /* save the device so we can process it without holding any locks */
-+                pDeviceIRQ[deviceIrqCount++] = pDevice;
-+            } else {
-+                    /* this is actually okay if the device is removing, the callback
-+                     * is NULLed out */
-+                DBG_PRINT(SDIODBG_FUNC_IRQ, ("SDIO Bus Driver: No IRQ handler Fn:%d\n",
-+                                             SDDEVICE_GET_SDIO_FUNCNO(pDevice)));
-+            }
-+        }
-+            /* should have handled all these */
-+        DBG_ASSERT(pHcd->PendingHelperIrqs == 0);
-+        pHcd->PendingHelperIrqs = 0;
-+        SemaphorePost(&pBusContext->DeviceListSem);
-+        for (ii = 0; ii < deviceIrqCount; ii++) {
-+            /* now call the function */
-+            SDDEVICE_CALL_IRQ_HANDLER(pDeviceIRQ[ii]);
-+        }
-+        deviceIrqCount = 0;
-+    }
-+
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver - SDIOIrqHelperFunction Exiting.. \n"));
-+    return 0;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  GetPendingIrqComplete - completion routine for getting pending IRQs
-+  Input:  pRequest -  completed request
-+  Output:
-+  Return:
-+  Notes:
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static void GetPendingIrqComplete(PSDREQUEST pReq)
-+{
-+    UINT8       intPendingMsk;
-+    PSDHCD      pHcd;
-+
-+    do {
-+        pHcd = (PSDHCD)pReq->pCompleteContext;
-+        DBG_ASSERT(pHcd != NULL);
-+
-+        if (!SDIO_SUCCESS(pReq->Status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to get Interrupt pending register Err:%d\n",
-+                                    pReq->Status));
-+            break;
-+        }
-+
-+        if (SD_R5_GET_RESP_FLAGS(pReq->Response) & SD_R5_ERRORS) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: CMD52 resp error: 0x%X \n",
-+                                    SD_R5_GET_RESP_FLAGS(pReq->Response)));
-+            break;
-+        }
-+            /* extract the pending mask */
-+        intPendingMsk =  SD_R5_GET_READ_DATA(pReq->Response) & SDIO_INT_PEND_MASK;
-+            /* process them */
-+        ProcessPendingIrqs(pHcd, intPendingMsk);
-+
-+    } while (FALSE);
-+
-+    FreeRequest(pReq);
-+
-+    DBG_PRINT(SDIODBG_FUNC_IRQ, ("-SDIO Bus Driver: GetPendingIrqComplete \n"));
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  ProcessPendingIrqs - processing pending Irqs
-+  Input:  pHcd - host controller
-+  Input:  IntPendingMsk -  pending irq bit mask
-+  Output:
-+  Return:
-+  Notes:
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static void ProcessPendingIrqs(PSDHCD pHcd, UINT8 IntPendingMsk)
-+{
-+    PSDLIST     pListItem;
-+    PSDDEVICE   pDevice;
-+    UINT8       funcMask;
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    DBG_PRINT(SDIODBG_FUNC_IRQ, ("+SDIO Bus Driver: ProcessPendingIrqs \n"));
-+    do {
-+            /* acquire lock to protect configuration and irq enables */
-+        status = _AcquireHcdLock(pHcd);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+
-+            /* sanity check */
-+        if ((IntPendingMsk & pHcd->IrqsEnabled) != IntPendingMsk) {
-+            DBG_PRINT(SDDBG_ERROR,
-+                ("SDIO Bus Driver: IRQs asserting when not enabled : curr:0x%X , card reports: 0x%X\n",
-+                     pHcd->IrqsEnabled, IntPendingMsk));
-+                /* remove the pending IRQs that are not enabled */
-+            IntPendingMsk &= pHcd->IrqsEnabled;
-+                /* fall through */
-+        }
-+
-+        if (!IntPendingMsk) {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: No interrupts on HCD:0x%X \n", (INT)pHcd));
-+            pHcd->IrqProcState = SDHCD_IDLE;
-+            if (pHcd->IrqsEnabled) {
-+                    /* only re-arm if there are IRQs enabled */
-+                _IssueConfig(pHcd,SDCONFIG_SDIO_REARM_INT,NULL,0);
-+            }
-+            status = _ReleaseHcdLock(pHcd);
-+            break;
-+        }
-+            /* reset helper IRQ bits */
-+        pHcd->PendingHelperIrqs = 0;
-+            /* save pending IRQ acks */
-+        pHcd->PendingIrqAcks = IntPendingMsk;
-+        status = _ReleaseHcdLock(pHcd);
-+        DBG_PRINT(SDIODBG_FUNC_IRQ, ("SDIO Bus Driver: INTs Pending - 0x%2.2X \n", IntPendingMsk));
-+            /* take the device list lock as we iterate through the list, this blocks
-+             * device removals */
-+        status = SemaphorePendInterruptable(&pBusContext->DeviceListSem);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+            /* walk through the device list matching HCD and interrupting function */
-+        SDITERATE_OVER_LIST(&pBusContext->DeviceList, pListItem) {
-+            pDevice = CONTAINING_STRUCT(pListItem, SDDEVICE, SDList);
-+                /* check if device belongs to the HCD */
-+            if (pDevice->pHcd != pHcd){
-+                    /* not on this hcd */
-+                continue;
-+            }
-+            funcMask = 1 << SDDEVICE_GET_SDIO_FUNCNO(pDevice);
-+                /* check device function against the pending mask */
-+            if (!(funcMask & IntPendingMsk)) {
-+                    /* this one is not interrupting */
-+                continue;
-+            }
-+                /* check for async IRQ and call handler */
-+            if (pDevice->pIrqAsyncFunction != NULL) {
-+                DBG_PRINT(SDIODBG_FUNC_IRQ, ("SDIO Bus Driver: Calling Async IRQ Handler. Fn:%d\n",
-+                                             SDDEVICE_GET_SDIO_FUNCNO(pDevice)));
-+                SDDEVICE_CALL_IRQ_ASYNC_HANDLER(pDevice);
-+            } else {
-+                    /* this one needs the helper */
-+                pHcd->PendingHelperIrqs |= funcMask;
-+                DBG_PRINT(SDIODBG_FUNC_IRQ, ("SDIO Bus Driver: No Async IRQ, Pending Helper Fn:%d\n",
-+                                             SDDEVICE_GET_SDIO_FUNCNO(pDevice)));
-+            }
-+        }
-+            /* release HCD list lock */
-+        SemaphorePost(&pBusContext->DeviceListSem);
-+            /* check for helper IRQs */
-+        if (pHcd->PendingHelperIrqs) {
-+            pHcd->IrqProcState = SDHCD_IRQ_HELPER;
-+            DBG_PRINT(SDIODBG_FUNC_IRQ, ("SDIO Bus Driver: Waking IRQ Helper \n"));
-+            if (!SDIO_SUCCESS(SD_WAKE_OS_HELPER(&pHcd->SDIOIrqHelper))) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: failed to wake helper! \n"));
-+            }
-+        }
-+    } while (FALSE);
-+
-+    DBG_PRINT(SDIODBG_FUNC_IRQ, ("-SDIO Bus Driver: ProcessPendingIrqs \n"));
-+}
-+
-+SDIO_STATUS TryNoIrqPendingCheck(PSDDEVICE pDevice)
-+{
-+    if (pDevice->pHcd->CardProperties.IOFnCount > 1) {
-+            /* not supported on multi-function cards */
-+        DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: IRQ Pending Check cannot be bypassed, (Funcs:%d)\n",
-+            pDevice->pHcd->CardProperties.IOFnCount));
-+        return SDIO_STATUS_UNSUPPORTED;
-+    }
-+
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: pending IRQ check bypassed \n"));
-+        /* set flag to optimize this */
-+    AtomicTest_Set(&pDevice->pHcd->HcdFlags, HCD_IRQ_NO_PEND_CHECK);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  SDIO_NotifyTimerTriggered - notification handler that a timer expired
-+  Input:  TimerID - ID of timer that expired
-+  Output:
-+  Return:
-+  Notes:
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void SDIO_NotifyTimerTriggered(INT TimerID)
-+{
-+
-+    switch (TimerID) {
-+        case SDIOBUS_CD_TIMER_ID:
-+            pBusContext->CDTimerQueued = FALSE;
-+                /* post an HCD polling event to the helper thread */
-+            PostCardDetectEvent(pBusContext, EVENT_HCD_CD_POLLING, NULL);
-+            break;
-+        default:
-+            DBG_ASSERT(FALSE);
-+    }
-+
-+}
-diff --git a/drivers/sdio/stack/busdriver/sdio_bus_misc.c b/drivers/sdio/stack/busdriver/sdio_bus_misc.c
-new file mode 100644
-index 0000000..c5c7381
---- /dev/null
-+++ b/drivers/sdio/stack/busdriver/sdio_bus_misc.c
-@@ -0,0 +1,3122 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdio_bus_misc.c
-+
-+@abstract: OS independent bus driver support
-+
-+#notes: this file contains miscellaneous control functions
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define MODULE_NAME  SDBUSDRIVER
-+#include <linux/sdio/ctsystem.h>
-+#include <linux/sdio/sdio_busdriver.h>
-+#include <linux/sdio/sdio_lib.h>
-+#include "_busdriver.h"
-+#include <linux/sdio/_sdio_defs.h>
-+#include <linux/sdio/mmc_defs.h>
-+
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  IssueBusRequestBd - issue a bus request
-+  Input:  pHcd - HCD object
-+          Cmd - command to issue
-+          Argument - command argument
-+          Flags - request flags
-+
-+  Output: pReqToUse - request to use (if caller wants response data)
-+  Return: SDIO Status
-+  Notes:  This function only issues 1 block data transfers
-+          This function issues the request synchronously
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _IssueBusRequestBd(PSDHCD           pHcd,
-+                               UINT8            Cmd,
-+                               UINT32           Argument,
-+                               SDREQUEST_FLAGS  Flags,
-+                               PSDREQUEST       pReqToUse,
-+                               PVOID            pData,
-+                               INT              Length)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    PSDREQUEST  pReq;
-+
-+    if (NULL == pReqToUse) {
-+            /* caller doesn't care about the response data, allocate locally */
-+        pReq = AllocateRequest();
-+        if (NULL == pReq) {
-+            return SDIO_STATUS_NO_RESOURCES;
-+        }
-+    } else {
-+            /* use the caller's request buffer */
-+        pReq = pReqToUse;
-+    }
-+
-+    pReq->Argument = Argument;
-+    pReq->Flags = Flags;
-+    pReq->Command = Cmd;
-+    if (pReq->Flags & SDREQ_FLAGS_DATA_TRANS) {
-+        pReq->pDataBuffer  = pData;
-+        pReq->BlockCount = 1;
-+        pReq->BlockLen = Length;
-+    }
-+
-+    status = IssueRequestToHCD(pHcd,pReq);
-+
-+    if (NULL == pReqToUse) {
-+        DBG_ASSERT(pReq != NULL);
-+        FreeRequest(pReq);
-+    }
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  ConvertVoltageCapsToOCRMask - initialize card
-+  Input:  VoltageCaps - voltage cap to look up
-+  Return: 32 bit OCR mask
-+  Notes:  this function sets voltage for +- 10%
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static UINT32 ConvertVoltageCapsToOCRMask(SLOT_VOLTAGE_MASK VoltageCaps)
-+{
-+    UINT32 ocrMask;
-+
-+    ocrMask = 0;
-+
-+    if (VoltageCaps & SLOT_POWER_3_3V) {
-+        ocrMask |= SD_OCR_3_2_TO_3_3_VDD | SD_OCR_3_3_TO_3_4_VDD;
-+    }
-+    if (VoltageCaps & SLOT_POWER_3_0V) {
-+        ocrMask |= SD_OCR_2_9_TO_3_0_VDD | SD_OCR_3_0_TO_3_1_VDD;
-+    }
-+    if (VoltageCaps & SLOT_POWER_2_8V) {
-+        ocrMask |= SD_OCR_2_7_TO_2_8_VDD | SD_OCR_2_8_TO_2_9_VDD;
-+    }
-+    if (VoltageCaps & SLOT_POWER_2_0V) {
-+        ocrMask |= SD_OCR_1_9_TO_2_0_VDD | SD_OCR_2_0_TO_2_1_VDD;
-+    }
-+    if (VoltageCaps & SLOT_POWER_1_8V) {
-+        ocrMask |= SD_OCR_1_7_TO_1_8_VDD | SD_OCR_1_8_TO_1_9_VDD;
-+    }
-+    if (VoltageCaps & SLOT_POWER_1_6V) {
-+        ocrMask |= SD_OCR_1_6_TO_1_7_VDD;
-+    }
-+
-+    return ocrMask;
-+}
-+
-+static UINT32 GetUsableOCRValue(UINT32 CardOCR, UINT32 SlotOCRMask)
-+{
-+    INT    i;
-+    UINT32 mask = 0;
-+
-+    for (i = 0; i < 32; i++) {
-+        mask = 1 << i;
-+        if ((SlotOCRMask & mask) && (CardOCR & mask)) {
-+            return mask;
-+        }
-+    }
-+
-+    return mask;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  GetPowerSetting - power up the SDIO card
-+  Input:  pHcd - HCD object
-+          pOCRvalue - OCR value of the card
-+  Output: pOCRvalue - OCR to actually use
-+  Return: power setting for HCD based on card's OCR, zero indicates unsupported
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static SLOT_VOLTAGE_MASK GetPowerSetting(PSDHCD pHcd, UINT32 *pOCRvalue)
-+{
-+    UINT32                      ocrMask;
-+    SLOT_VOLTAGE_MASK           hcdVoltage = 0;
-+    SLOT_VOLTAGE_MASK           hcdVMask;
-+    INT                         i;
-+
-+        /* check preferred value */
-+    ocrMask = ConvertVoltageCapsToOCRMask(pHcd->SlotVoltagePreferred);
-+    if (ocrMask & *pOCRvalue) {
-+            /* using preferred voltage */
-+        *pOCRvalue = GetUsableOCRValue(*pOCRvalue, ocrMask);
-+        hcdVoltage = pHcd->SlotVoltagePreferred;
-+    } else {
-+            /* walk through the slot voltage caps and find a match */
-+        for (i = 0; i < 8; i++) {
-+            hcdVMask = (1 << i);
-+            if (hcdVMask & pHcd->SlotVoltageCaps) {
-+                ocrMask = ConvertVoltageCapsToOCRMask((SLOT_VOLTAGE_MASK)(pHcd->SlotVoltageCaps & hcdVMask));
-+                if (ocrMask & *pOCRvalue) {
-+                        /* found a match */
-+                    *pOCRvalue = GetUsableOCRValue(*pOCRvalue, ocrMask);
-+                    hcdVoltage = pHcd->SlotVoltageCaps & hcdVMask;
-+                    break;
-+                }
-+            }
-+        }
-+    }
-+
-+    return hcdVoltage;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  TestPresence - test the presence of a card/function
-+  Input:  pHcd - HCD object
-+          TestType - type of test to perform
-+  Output: pReq - Request to use (optional)
-+  Return:
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS TestPresence(PSDHCD          pHcd,
-+                         CARD_INFO_FLAGS TestType,
-+                         PSDREQUEST      pReq)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_ERROR;
-+
-+     switch (TestType) {
-+        case CARD_SDIO:
-+                /* issue CMD5 */
-+            status = _IssueSimpleBusRequest(pHcd,CMD5,0,
-+                        SDREQ_FLAGS_RESP_SDIO_R4 | SDREQ_FLAGS_RESP_SKIP_SPI_FILT,pReq);
-+            break;
-+        case CARD_SD:
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                 /* ACMD41 just starts initialization when in SPI mode, argument is ignored
-+                 * Note: In SPI mode ACMD41 uses an R1 response */
-+                status = _IssueSimpleBusRequest(pHcd,ACMD41,0,
-+                                                SDREQ_FLAGS_APP_CMD | SDREQ_FLAGS_RESP_R1,pReq);
-+
-+            } else {
-+                /* issue ACMD41 with OCR value of zero */
-+                /* ACMD41 on SD uses an R3 response */
-+                status = _IssueSimpleBusRequest(pHcd,ACMD41,0,
-+                                                SDREQ_FLAGS_APP_CMD | SDREQ_FLAGS_RESP_R3,pReq);
-+            }
-+            break;
-+        case CARD_MMC:
-+                 /* issue CMD1 */
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                    /* note: in SPI mode an R1 response is used */
-+                status = _IssueSimpleBusRequest(pHcd,CMD1,0,SDREQ_FLAGS_RESP_R1,pReq);
-+            } else {
-+                status = _IssueSimpleBusRequest(pHcd,CMD1,0,SDREQ_FLAGS_RESP_R3,pReq);
-+            }
-+            break;
-+        default:
-+            DBG_ASSERT(FALSE);
-+            break;
-+    }
-+
-+    return status;
-+}
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  ReadOCR - read the OCR
-+  Input:  pHcd - HCD object
-+          ReadType - type of read to perform
-+          OCRValue - OCR value to use as an argument
-+  Output: pReq - Request to use
-+          pOCRValueRd - OCR value read back (can be NULL)
-+  Return:
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static SDIO_STATUS ReadOCR(PSDHCD          pHcd,
-+                           CARD_INFO_FLAGS ReadType,
-+                           PSDREQUEST      pReq,
-+                           UINT32          OCRValue,
-+                           UINT32          *pOCRValueRd)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_ERROR;
-+
-+     switch (ReadType) {
-+        case CARD_SDIO:
-+                /* CMD5 for SDIO cards */
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                    /* skip the SPI filter, we will decode the response here  */
-+                status = _IssueSimpleBusRequest(pHcd,CMD5,
-+                                                OCRValue,
-+                                                SDREQ_FLAGS_RESP_SDIO_R4 |
-+                                                SDREQ_FLAGS_RESP_SKIP_SPI_FILT,
-+                                                pReq);
-+            } else {
-+                    /* native SD */
-+                status = _IssueSimpleBusRequest(pHcd,CMD5,
-+                                                OCRValue,
-+                                                SDREQ_FLAGS_RESP_SDIO_R4,
-+                                                pReq);
-+            }
-+            break;
-+        case CARD_SD:
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                    /* CMD58 is used to read the OCR */
-+                status = _IssueSimpleBusRequest(pHcd,CMD58,
-+                                                0, /* argument ignored */
-+                                                (SDREQ_FLAGS_RESP_R3 | SDREQ_FLAGS_RESP_SKIP_SPI_FILT),
-+                                                pReq);
-+            } else {
-+                    /* SD Native uses ACMD41 */
-+                status = _IssueSimpleBusRequest(pHcd,ACMD41,
-+                                                OCRValue,
-+                                                SDREQ_FLAGS_APP_CMD | SDREQ_FLAGS_RESP_R3,
-+                                                pReq);
-+            }
-+            break;
-+        case CARD_MMC:
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                    /* CMD58 is used to read the OCR  */
-+                status = _IssueSimpleBusRequest(pHcd,CMD58,
-+                                                0, /* argument ignored */
-+                                                (SDREQ_FLAGS_RESP_R3 | SDREQ_FLAGS_RESP_SKIP_SPI_FILT),
-+                                                pReq);
-+            } else {
-+                    /* MMC Native uses CMD1 */
-+                status = _IssueSimpleBusRequest(pHcd,CMD1,
-+                                                OCRValue, SDREQ_FLAGS_RESP_R3,
-+                                                pReq);
-+            }
-+            break;
-+        default:
-+            DBG_ASSERT(FALSE);
-+            break;
-+    }
-+
-+    if (SDIO_SUCCESS(status) && (pOCRValueRd != NULL)) {
-+        *pOCRValueRd = 0;
-+            /* someone wants the OCR read back */
-+        switch (ReadType) {
-+            case CARD_SDIO:
-+                if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                    *pOCRValueRd = SPI_SDIO_R4_GET_OCR(pReq->Response);
-+                } else {
-+                    *pOCRValueRd = SD_SDIO_R4_GET_OCR(pReq->Response);
-+                }
-+                break;
-+            case CARD_SD:
-+            case CARD_MMC:
-+                if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                    *pOCRValueRd = SPI_R3_GET_OCR(pReq->Response);
-+                } else {
-+                    *pOCRValueRd = SD_R3_GET_OCR(pReq->Response);
-+                }
-+                break;
-+            default:
-+                DBG_ASSERT(FALSE);
-+                break;
-+        }
-+    }
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  PollCardReady - poll card till it's ready
-+  Input:  pHcd - HCD object
-+          OCRValue - OCR value to poll with
-+          PollType - polling type (based on card type)
-+  Output:
-+  Return:
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS PollCardReady(PSDHCD pHcd, UINT32 OCRValue, CARD_INFO_FLAGS PollType)
-+{
-+    INT             cardReadyRetry;
-+    SDIO_STATUS     status;
-+    PSDREQUEST      pReq;
-+
-+    if (!((PollType == CARD_SDIO) || (PollType == CARD_SD) || (PollType == CARD_MMC))) {
-+        DBG_ASSERT(FALSE);
-+        return SDIO_STATUS_INVALID_PARAMETER;
-+    }
-+
-+    pReq = AllocateRequest();
-+    if (NULL == pReq) {
-+        return SDIO_STATUS_NO_RESOURCES;
-+    }
-+
-+    status = SDIO_STATUS_SUCCESS;
-+    cardReadyRetry = pBusContext->CardReadyPollingRetry;
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Polling card ready, Using OCR:0x%8.8X, Poll Type:0x%X\n",
-+                            OCRValue,PollType));
-+
-+        /* now issue CMD with the actual OCR as an argument until the card is ready */
-+    while (cardReadyRetry) {
-+        if (IS_HCD_BUS_MODE_SPI(pHcd) && !(PollType == CARD_SDIO)) {
-+            if (PollType == CARD_MMC) {
-+                /* under SPI mode for MMC cards, we need to issue CMD1 and
-+                 * check the response for the "in-idle" bit */
-+                status = _IssueSimpleBusRequest(pHcd,
-+                                                CMD1,
-+                                                0,
-+                                                SDREQ_FLAGS_RESP_R1 | SDREQ_FLAGS_RESP_SKIP_SPI_FILT,
-+                                                pReq);
-+            } else if (PollType == CARD_SD) {
-+                 /* under SPI mode for SD cards, we need to issue ACMD41 and
-+                 * check the response for the "in-idle" bit */
-+                 status = _IssueSimpleBusRequest(pHcd,
-+                                                 ACMD41,
-+                                                 0,
-+                                                 SDREQ_FLAGS_RESP_R1 |
-+                                                 SDREQ_FLAGS_APP_CMD |
-+                                                 SDREQ_FLAGS_RESP_SKIP_SPI_FILT,
-+                                                 pReq);
-+            } else {
-+                DBG_ASSERT(FALSE);
-+            }
-+        } else {
-+                /* for SD/MMC in native mode and SDIO (all modes) we need to read the OCR register */
-+                /* read the OCR using the supplied OCR value as an argument, we don't care about the
-+                  * actual OCR read-back, but we are interested in the response */
-+            status = ReadOCR(pHcd,PollType,pReq,OCRValue,NULL);
-+        }
-+
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to issue CMD to poll ready \n"));
-+            break;
-+        }
-+        if (PollType == CARD_SDIO)  {
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                if (SPI_SDIO_R4_IS_CARD_READY(pReq->Response)) {
-+                    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SDIO Card Ready! (SPI) \n"));
-+                    break;
-+                }
-+            } else {
-+                if (SD_SDIO_R4_IS_CARD_READY(pReq->Response)) {
-+                    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SDIO Card Ready! \n"));
-+                    break;
-+                }
-+            }
-+        } else if ((PollType == CARD_SD) || (PollType == CARD_MMC)) {
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                    /* check response when MMC or SD cards operate in SPI mode */
-+                if (!(GET_SPI_R1_RESP_TOKEN(pReq->Response) & SPI_CS_STATE_IDLE)) {
-+                        /* card is no longer in idle */
-+                    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SD/MMC Card (SPI mode) is ready! \n"));
-+                    break;
-+                }
-+            } else {
-+                    /* check the OCR busy bit */
-+                if (SD_R3_IS_CARD_READY(pReq->Response)) {
-+                    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SD/MMC (Native Mode) Card Ready! \n"));
-+                    break;
-+                }
-+            }
-+        } else {
-+            DBG_ASSERT(FALSE);
-+        }
-+        cardReadyRetry--;
-+            /* delay */
-+        status = OSSleep(OCR_READY_CHECK_DELAY_MS);
-+        if (!SDIO_SUCCESS(status)){
-+            break;
-+        }
-+    }
-+
-+    if (0 == cardReadyRetry) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Card Ready timeout! \n"));
-+        status = SDIO_STATUS_DEVICE_ERROR;
-+    }
-+
-+    FreeRequest(pReq);
-+
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  AdjustSlotPower - adjust slot power
-+  Input:  pHcd - HCD object
-+  Output: pOCRvalue - ocr value to use
-+  Return:
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static SDIO_STATUS AdjustSlotPower(PSDHCD pHcd, UINT32 *pOCRvalue)
-+{
-+    SDCONFIG_POWER_CTRL_DATA    pwrSetting;
-+    SDIO_STATUS                 status = SDIO_STATUS_SUCCESS;
-+
-+    ZERO_OBJECT(pwrSetting);
-+    DBG_PRINT(SDDBG_TRACE,
-+        ("SDIO Bus Driver: Adjusting Slot Power, Requesting adjustment for OCR:0x%8.8X \n",
-+         *pOCRvalue));
-+
-+    do {
-+        pwrSetting.SlotPowerEnable = TRUE;
-+            /* get optimal power setting */
-+        pwrSetting.SlotPowerVoltageMask = GetPowerSetting(pHcd, pOCRvalue);
-+        if (0 == pwrSetting.SlotPowerVoltageMask) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: No matching voltage for OCR \n"));
-+            status = SDIO_STATUS_DEVICE_ERROR;
-+            break;
-+        }
-+
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Slot Pwr Mask 0x%X for OCR:0x%8.8X \n",
-+                                pwrSetting.SlotPowerVoltageMask,*pOCRvalue));
-+        status = _IssueConfig(pHcd,SDCONFIG_POWER_CTRL,&pwrSetting,sizeof(pwrSetting));
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to set power in hcd \n"));
-+            break;
-+        }
-+            /* delay for power to settle */
-+        OSSleep(pBusContext->PowerSettleDelay);
-+            /* save off for drivers */
-+        pHcd->CardProperties.CardVoltage  = pwrSetting.SlotPowerVoltageMask;
-+
-+    } while (FALSE);
-+
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  ConvertEncodedTransSpeed - convert encoded TRANS_SPEED value to a clock rate
-+  Input:  TransSpeedValue - encoded transfer speed value
-+  Output:
-+  Return: appropriate SD clock rate
-+  Notes: This function returns a rate of 0, if it could not be determined.
-+         This function can check tran speed values for SD,SDIO and MMC cards
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static SD_BUSCLOCK_RATE ConvertEncodedTransSpeed(UINT8 TransSpeedValue)
-+{
-+    SD_BUSCLOCK_RATE transfMul = 0;
-+    UINT8            timeVal = 0;
-+
-+    switch (TransSpeedValue & TRANSFER_UNIT_MULTIPIER_MASK) {
-+        case 0:
-+            transfMul = 10000;
-+            break;
-+        case 1:
-+            transfMul = 100000;
-+            break;
-+        case 2:
-+            transfMul = 1000000;
-+            break;
-+        case 3:
-+            transfMul = 10000000;
-+            break;
-+        default:
-+            transfMul = 0;
-+            DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: Card transfer multipler is wrong (val=0x%X)! \n",
-+                                   TransSpeedValue));
-+            break;
-+    }
-+
-+    switch ((TransSpeedValue & TIME_VALUE_MASK) >> TIME_VALUE_SHIFT) {
-+        case 1: timeVal = 10; break;
-+        case 2: timeVal = 12; break;
-+        case 3: timeVal = 13; break;
-+        case 4: timeVal = 15; break;
-+        case 5: timeVal = 20; break;
-+        case 6: timeVal = 25; break;
-+        case 7: timeVal = 30; break;
-+        case 8: timeVal = 35; break;
-+        case 9: timeVal = 40; break;
-+        case 10: timeVal = 45; break;
-+        case 11: timeVal = 50; break;
-+        case 12: timeVal = 55; break;
-+        case 13: timeVal = 60; break;
-+        case 14: timeVal = 70; break;
-+        case 15: timeVal = 80; break;
-+        default: timeVal = 0;
-+        DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: Card time value is wrong (val=0x%X)! \n",
-+                               TransSpeedValue));
-+        break;
-+    }
-+
-+    if ((transfMul != 0) && (timeVal != 0)) {
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Card Reported Max: %d Hz (0x%X) \n",
-+                                (timeVal*transfMul), TransSpeedValue));
-+        return timeVal*transfMul;
-+    }
-+
-+    return 0;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  SelectDeselectCard - Select or deselect a card
-+  Input:  pHcd - HCD object
-+          Select - select the card
-+  Output:
-+  Return: status
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static SDIO_STATUS SelectDeselectCard(PSDHCD pHcd, BOOL Select)
-+{
-+    SDIO_STATUS status;
-+
-+    if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+            /* SPI mode cards do not support selection */
-+        status = SDIO_STATUS_SUCCESS;
-+    } else {
-+        if (!Select) {
-+                /* deselect, note that deselecting a card does not return a response */
-+            status = _IssueSimpleBusRequest(pHcd,
-+                                            CMD7,0,
-+                                            SDREQ_FLAGS_NO_RESP,NULL);
-+        } else {
-+                /* select */
-+            status = _IssueSimpleBusRequest(pHcd,
-+                                            CMD7,(pHcd->CardProperties.RCA << 16),
-+                                            SDREQ_FLAGS_RESP_R1B,NULL);
-+        }
-+    }
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Failed to %s card, RCA:0x%X Err:%d \n",
-+            (Select ? "Select":"Deselect"), pHcd->CardProperties.RCA, status));
-+    }
-+    return status;
-+}
-+
-+/* reorder a buffer by swapping MSB with LSB */
-+static void ReorderBuffer(UINT8 *pBuffer, INT Bytes)
-+{
-+    UINT8 *pEnd;
-+    UINT8 temp;
-+
-+    DBG_ASSERT(!(Bytes & 1));
-+        /* point to the end */
-+    pEnd = &pBuffer[Bytes - 1];
-+        /* divide in half */
-+    Bytes = Bytes >> 1;
-+
-+    while (Bytes) {
-+        temp = *pBuffer;
-+            /* swap bytes */
-+        *pBuffer = *pEnd;
-+        *pEnd = temp;
-+        pBuffer++;
-+        pEnd--;
-+        Bytes--;
-+    }
-+}
-+
-+#define ADJUST_OPER_CLOCK(pBusMode,Clock) \
-+    (pBusMode)->ClockRate = min((SD_BUSCLOCK_RATE)(Clock),(pBusMode)->ClockRate)
-+#define ADJUST_OPER_BLOCK_LEN(pCaps,Length) \
-+    (pCaps)->OperBlockLenLimit = min((UINT16)(Length),(pCaps)->OperBlockLenLimit)
-+#define ADJUST_OPER_BLOCK_COUNT(pCaps,Count) \
-+    (pCaps)->OperBlockCountLimit = min((UINT16)(Count),(pCaps)->OperBlockCountLimit)
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  GetBusParameters - Get bus parameters for a card
-+  Input:  pHcd - HCD object
-+          pBusMode - current bus mode on entry
-+  Output: pBusMode - new adjusted bus mode
-+  Return: status
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static SDIO_STATUS GetBusParameters(PSDHCD pHcd, PSDCONFIG_BUS_MODE_DATA pBusMode)
-+{
-+    SDIO_STATUS                        status = SDIO_STATUS_SUCCESS;
-+    UINT8                              temp;
-+    UINT32                             tplAddr;
-+    struct SDIO_FUNC_EXT_COMMON_TPL    func0ext;
-+    UINT8                              scrRegister[SD_SCR_BYTES];
-+    SD_BUSCLOCK_RATE                   cardReportedRate = 0;
-+    PSDREQUEST                         pReq = NULL;
-+    BOOL                               spiMode = FALSE;
-+
-+
-+    if (SDCONFIG_GET_BUSWIDTH(pBusMode->BusModeFlags) == SDCONFIG_BUS_WIDTH_SPI) {
-+        spiMode = TRUE;
-+    }
-+
-+    if (!spiMode) {
-+            /* set highest bus mode bus driver is allowing (non-SPI), the code below will
-+               * adjust to lower or equal settings */
-+        pBusMode->BusModeFlags = pBusContext->DefaultBusMode;
-+    }
-+        /* set operational parameters */
-+    pBusMode->ClockRate = pBusContext->DefaultOperClock;
-+    pHcd->CardProperties.OperBlockLenLimit = pBusContext->DefaultOperBlockLen;
-+    pHcd->CardProperties.OperBlockCountLimit = pBusContext->DefaultOperBlockCount;
-+
-+        /* adjust operational block counts and length to match HCD */
-+    ADJUST_OPER_BLOCK_LEN(&pHcd->CardProperties,pHcd->MaxBytesPerBlock);
-+    ADJUST_OPER_BLOCK_COUNT(&pHcd->CardProperties,pHcd->MaxBlocksPerTrans);
-+        /* limit operational clock to the max clock rate */
-+    ADJUST_OPER_CLOCK(pBusMode,pHcd->MaxClockRate);
-+
-+    if (!spiMode) {
-+            /* check HCD bus mode */
-+        if (!(pHcd->Attributes & SDHCD_ATTRIB_BUS_4BIT) ||
-+            ((pHcd->CardProperties.Flags & CARD_SDIO) &&
-+             (pHcd->Attributes & SDHCD_ATTRIB_NO_4BIT_IRQ)) ) {
-+
-+            if (pHcd->Attributes & SDHCD_ATTRIB_BUS_4BIT) {
-+                DBG_PRINT(SDDBG_WARN,
-+                ("SDIO Card Detected, but host does not support IRQs in 4 bit mode - dropping to 1 bit. \n"));
-+            }
-+                /* force to 1 bit mode */
-+            SDCONFIG_SET_BUS_WIDTH(pBusMode->BusModeFlags, SDCONFIG_BUS_WIDTH_1_BIT);
-+        }
-+    }
-+
-+        /* now do various card inquiries to drop the bus mode or clock
-+         * none of these checks can raise the bus mode or clock higher that what
-+         * was initialized above */
-+    do {
-+        if (pHcd->CardProperties.Flags & (CARD_SD | CARD_MMC)) {
-+                /* allocate a request for response data we'll need */
-+            pReq = AllocateRequest();
-+            if (NULL == pReq) {
-+                status = SDIO_STATUS_NO_RESOURCES;
-+                break;
-+            }
-+        }
-+
-+        if (!spiMode && (pHcd->CardProperties.Flags & CARD_MMC)) {
-+                /* MMC cards all run in 1 bit mode */
-+            SDCONFIG_SET_BUS_WIDTH(pBusMode->BusModeFlags, SDCONFIG_BUS_WIDTH_1_BIT);
-+        }
-+
-+        if (pHcd->CardProperties.Flags & CARD_SD) {
-+            DBG_ASSERT(pReq != NULL);
-+            DBG_PRINT(SDDBG_TRACE, ("Getting SCR from SD Card..\n"));
-+                /* read SCR (requires data transfer) to get supported modes */
-+            status = _IssueBusRequestBd(pHcd,ACMD51,0,
-+                                        SDREQ_FLAGS_RESP_R1 | SDREQ_FLAGS_APP_CMD |
-+                                        SDREQ_FLAGS_DATA_TRANS,
-+                                        pReq,&scrRegister,SD_SCR_BYTES);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_WARN, ("SD card does not have SCR. \n"));
-+                if (!spiMode) {
-+                        /* switch it to 1 bit mode */
-+                    SDCONFIG_SET_BUS_WIDTH(pBusMode->BusModeFlags, SDCONFIG_BUS_WIDTH_1_BIT);
-+                }
-+                status = SDIO_STATUS_SUCCESS;
-+            } else {
-+                    /* we have to reorder this buffer since the SCR is sent MSB first on the data
-+                     * data bus */
-+                ReorderBuffer(scrRegister,SD_SCR_BYTES);
-+                    /* got the SCR */
-+                DBG_PRINT(SDDBG_TRACE, ("SD SCR StructRev:0x%X, Flags:0x%X \n",
-+                        GET_SD_SCR_STRUCT_VER(scrRegister),
-+                        GET_SD_SCR_BUSWIDTHS_FLAGS(scrRegister)));
-+                    /* set the revision */
-+                switch (GET_SD_SCR_SDSPEC_VER(scrRegister)) {
-+                    case SCR_SD_SPEC_1_00:
-+                        DBG_PRINT(SDDBG_TRACE, ("SD Spec Revision 1.01 \n"));
-+                        pHcd->CardProperties.SD_MMC_Revision = SD_REVISION_1_01;
-+                        break;
-+                    case SCR_SD_SPEC_1_10:
-+                        DBG_PRINT(SDDBG_TRACE, ("SD Spec Revision 1.10 \n"));
-+                        pHcd->CardProperties.SD_MMC_Revision = SD_REVISION_1_10;
-+                        break;
-+                    default:
-+                        DBG_PRINT(SDDBG_WARN, ("SD Spec Revision is greater than 1.10 \n"));
-+                        pHcd->CardProperties.SD_MMC_Revision = SD_REVISION_1_10;
-+                        break;
-+                }
-+
-+                if (!(GET_SD_SCR_BUSWIDTHS(scrRegister) & SCR_BUS_SUPPORTS_4_BIT)) {
-+                    if (!spiMode) {
-+                        DBG_PRINT(SDDBG_WARN, ("SD SCR reports 1bit only Mode \n"));
-+                            /* switch it to 1 bit mode */
-+                        SDCONFIG_SET_BUS_WIDTH(pBusMode->BusModeFlags, SDCONFIG_BUS_WIDTH_1_BIT);
-+                    }
-+                }
-+            }
-+        }
-+
-+        if (pHcd->CardProperties.Flags & (CARD_SD | CARD_MMC)) {
-+            DBG_ASSERT(pReq != NULL);
-+                /* de-select the card in order to get the CSD */
-+            status = SelectDeselectCard(pHcd,FALSE);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to deselect card before getting CSD \n"));
-+                break;
-+            }
-+                /* Get CSD for SD or MMC cards */
-+            if (spiMode) {
-+                    /* in SPI mode, getting the CSD requires a read data transfer */
-+                status = _IssueBusRequestBd(pHcd,CMD9,0,
-+                                            SDREQ_FLAGS_RESP_R1 | SDREQ_FLAGS_DATA_TRANS,
-+                                            pReq,
-+                                            pHcd->CardProperties.CardCSD,
-+                                            MAX_CSD_CID_BYTES);
-+                if (SDIO_SUCCESS(status)) {
-+                        /* when the CSD is sent over in SPI data mode, it comes to us in MSB first
-+                         * and thus is not ordered correctly as defined in the SD spec */
-+                    ReorderBuffer(pHcd->CardProperties.CardCSD,MAX_CSD_CID_BYTES);
-+                }
-+            } else {
-+                status = _IssueSimpleBusRequest(pHcd,
-+                                                CMD9,
-+                                                (pHcd->CardProperties.RCA << 16),
-+                                                SDREQ_FLAGS_RESP_R2,
-+                                                pReq);
-+                if (SDIO_SUCCESS(status)) {
-+                        /* save the CSD */
-+                    memcpy(pHcd->CardProperties.CardCSD,pReq->Response,MAX_CARD_RESPONSE_BYTES);
-+                }
-+            }
-+
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to get CSD, Err:%d \n",
-+                                        status));
-+                break;
-+            }
-+                /* for MMC cards, the spec version is in the CSD */
-+            if (pHcd->CardProperties.Flags & CARD_MMC) {
-+                DBG_PRINT(SDDBG_TRACE, ("MMC Spec version : (0x%2.2X) \n",
-+                            GET_MMC_SPEC_VERSION(pHcd->CardProperties.CardCSD)));
-+                switch (GET_MMC_SPEC_VERSION(pHcd->CardProperties.CardCSD)) {
-+                    case MMC_SPEC_1_0_TO_1_2:
-+                    case MMC_SPEC_1_4:
-+                    case MMC_SPEC_2_0_TO_2_2:
-+                        DBG_PRINT(SDDBG_WARN, ("MMC Spec version less than 3.1 \n"));
-+                        pHcd->CardProperties.SD_MMC_Revision = MMC_REVISION_1_0_2_2;
-+                        break;
-+                    case MMC_SPEC_3_1:
-+                        DBG_PRINT(SDDBG_TRACE, ("MMC Spec version 3.1 \n"));
-+                        pHcd->CardProperties.SD_MMC_Revision = MMC_REVISION_3_1;
-+                        break;
-+                    case MMC_SPEC_4_0_TO_4_1:
-+                        DBG_PRINT(SDDBG_TRACE, ("MMC Spec version 4.0-4.1 \n"));
-+                        pHcd->CardProperties.SD_MMC_Revision = MMC_REVISION_4_0;
-+                        break;
-+                    default:
-+                        pHcd->CardProperties.SD_MMC_Revision = MMC_REVISION_3_1;
-+                        DBG_PRINT(SDDBG_WARN, ("MMC Spec version greater than 4.1\n"));
-+                        break;
-+                }
-+            }
-+                /* re-select the card  */
-+            status = SelectDeselectCard(pHcd,TRUE);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to re-select card after getting CSD \n"));
-+                break;
-+            }
-+        }
-+
-+        if ((pHcd->CardProperties.Flags & CARD_SD) &&
-+            !(pHcd->CardProperties.Flags & CARD_SDIO) &&
-+             SDDEVICE_IS_SD_REV_GTEQ_1_10(pHcd->pPseudoDev) &&
-+             (pHcd->Attributes & SDHCD_ATTRIB_SD_HIGH_SPEED) &&
-+             !spiMode)  {
-+            UINT32 arg;
-+            PUINT8 pSwitchStatusBlock = KernelAlloc(SD_SWITCH_FUNC_STATUS_BLOCK_BYTES);
-+
-+            if (NULL == pSwitchStatusBlock) {
-+                status = SDIO_STATUS_NO_RESOURCES;
-+                break;
-+            }
-+
-+            arg = SD_SWITCH_FUNC_ARG_GROUP_CHECK(SD_SWITCH_HIGH_SPEED_GROUP,
-+                                                 SD_SWITCH_HIGH_SPEED_FUNC_NO);
-+
-+                /* for 1.10 SD cards, check if high speed mode is supported */
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Checking SD Card for switchable functions (CMD6 arg:0x%X)\n",arg));
-+
-+                /* issue simple data transfer request to read the switch status */
-+            status = _IssueBusRequestBd(pHcd,
-+                                        CMD6,
-+                                        arg,
-+                                        SDREQ_FLAGS_RESP_R1 | SDREQ_FLAGS_DATA_TRANS,
-+                                        pReq,
-+                                        pSwitchStatusBlock,
-+                                        SD_SWITCH_FUNC_STATUS_BLOCK_BYTES);
-+
-+            if (SDIO_SUCCESS(status)) {
-+                UINT16 switchGroupMask;
-+                    /* need to reorder this since cards send this MSB first */
-+                ReorderBuffer(pSwitchStatusBlock,SD_SWITCH_FUNC_STATUS_BLOCK_BYTES);
-+                switchGroupMask = SD_SWITCH_FUNC_STATUS_GET_GRP_BIT_MASK(pSwitchStatusBlock,SD_SWITCH_HIGH_SPEED_GROUP);
-+                DBG_PRINT(SDDBG_TRACE, ("SD Card Switch Status Group1 Mask:0x%X Max Current:%d\n",
-+                        switchGroupMask, SD_SWITCH_FUNC_STATUS_GET_MAX_CURRENT(pSwitchStatusBlock) ));
-+                if (SD_SWITCH_FUNC_STATUS_GET_MAX_CURRENT(pSwitchStatusBlock) == 0) {
-+                    DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: SD Switch Status block has zero max current \n"));
-+                    SDLIB_PrintBuffer(pSwitchStatusBlock,
-+                                      SD_SWITCH_FUNC_STATUS_BLOCK_BYTES,
-+                                      "SDIO Bus Driver: SD Switch Status Block Error");
-+                } else {
-+                        /* check HS support */
-+                    if (switchGroupMask & (1 << SD_SWITCH_HIGH_SPEED_FUNC_NO)) {
-+                        DBG_PRINT(SDDBG_TRACE, ("SD Card Supports High Speed Mode\n"));
-+                            /* set the rate, this will override the CSD value */
-+                        cardReportedRate = SD_HS_MAX_BUS_CLOCK;
-+                        pBusMode->BusModeFlags |= SDCONFIG_BUS_MODE_SD_HS;
-+                    }
-+                }
-+            } else {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to get SD Switch Status block (%d)\n", status));
-+                    /* just fall through, we'll handle this like a normal SD card */
-+                status = SDIO_STATUS_SUCCESS;
-+            }
-+
-+            KernelFree(pSwitchStatusBlock);
-+        }
-+
-+        if ((pHcd->CardProperties.Flags & CARD_MMC) &&
-+             SDDEVICE_IS_MMC_REV_GTEQ_4_0(pHcd->pPseudoDev) &&
-+             (pHcd->Attributes & SDHCD_ATTRIB_MMC_HIGH_SPEED) &&
-+             !spiMode)  {
-+                /* for MMC cards, get the Extended CSD to get the High speed and
-+                 * wide bus paramaters */
-+
-+            PUINT8 pExtData = KernelAlloc(MMC_EXT_CSD_SIZE);
-+
-+            if (NULL == pExtData) {
-+                status = SDIO_STATUS_NO_RESOURCES;
-+                break;
-+            }
-+                /* issue simple data transfer request to read the extended CSD */
-+            status = _IssueBusRequestBd(pHcd,MMC_CMD8,0,
-+                                        SDREQ_FLAGS_RESP_R1 | SDREQ_FLAGS_DATA_TRANS,
-+                                        pReq,
-+                                        pExtData,
-+                                        MMC_EXT_CSD_SIZE);
-+            if (SDIO_SUCCESS(status)) {
-+                 DBG_PRINT(SDDBG_TRACE, ("MMC Ext CSD Version: 0x%X Card Type: 0x%X\n",
-+                        pExtData[MMC_EXT_VER_OFFSET],pExtData[MMC_EXT_CARD_TYPE_OFFSET]));
-+                    /* check HS support */
-+                if (pExtData[MMC_EXT_CARD_TYPE_OFFSET] & MMC_EXT_CARD_TYPE_HS_52) {
-+                        /* try 52 Mhz */
-+                    cardReportedRate = 52000000;
-+                    pBusMode->BusModeFlags |= SDCONFIG_BUS_MODE_MMC_HS;
-+                } else if (pExtData[MMC_EXT_CARD_TYPE_OFFSET] & MMC_EXT_CARD_TYPE_HS_26) {
-+                        /* try 26MHZ */
-+                    cardReportedRate = 26000000;
-+                    pBusMode->BusModeFlags |= SDCONFIG_BUS_MODE_MMC_HS;
-+                } else {
-+                        /* doesn't report high speed capable */
-+                    cardReportedRate = 0;
-+                }
-+
-+                if (cardReportedRate && !spiMode) {
-+                        /* figure out the bus mode */
-+                    if (pHcd->Attributes & SDHCD_ATTRIB_BUS_MMC8BIT) {
-+                        SDCONFIG_SET_BUS_WIDTH(pBusMode->BusModeFlags, SDCONFIG_BUS_WIDTH_MMC8_BIT);
-+                    } else if (pHcd->Attributes & SDHCD_ATTRIB_BUS_4BIT) {
-+                        SDCONFIG_SET_BUS_WIDTH(pBusMode->BusModeFlags, SDCONFIG_BUS_WIDTH_4_BIT);
-+                    } else {
-+                        /* we leave it to default to 1 bit mode */
-+                    }
-+                }
-+            } else {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to get MMC Extended CSD \n"));
-+                    /* just fall through, we'll do without the extended information
-+                     * and run it like a legacy MMC card */
-+                status = SDIO_STATUS_SUCCESS;
-+            }
-+
-+            KernelFree(pExtData);
-+        }
-+
-+        if (pHcd->CardProperties.Flags & (CARD_SD | CARD_MMC)) {
-+
-+            if (0 == cardReportedRate) {
-+                    /* extract rate from CSD only if it was not set by earlier tests */
-+                cardReportedRate = ConvertEncodedTransSpeed(
-+                                GET_SD_CSD_TRANS_SPEED(pHcd->CardProperties.CardCSD));
-+                    /* fall through and test for zero again */
-+            }
-+
-+            if (cardReportedRate != 0) {
-+                     /* adjust clock based on what the card can handle */
-+                ADJUST_OPER_CLOCK(pBusMode,cardReportedRate);
-+            } else {
-+                    /* something is wrong with the CSD */
-+                if (DBG_GET_DEBUG_LEVEL() >= SDDBG_TRACE) {
-+                    SDLIB_PrintBuffer(pHcd->CardProperties.CardCSD,
-+                                      MAX_CARD_RESPONSE_BYTES,
-+                                      "SDIO Bus Driver: CSD Dump");
-+                }
-+                    /* can't figure out the card rate, so set reasonable defaults */
-+                if (pHcd->CardProperties.Flags & CARD_SD) {
-+                    ADJUST_OPER_CLOCK(pBusMode,SD_MAX_BUS_CLOCK);
-+                } else {
-+                    ADJUST_OPER_CLOCK(pBusMode,MMC_MAX_BUS_CLOCK);
-+                }
-+            }
-+        }
-+
-+            /* note, we do SDIO card "after" SD in case this is a combo card */
-+        if (pHcd->CardProperties.Flags & CARD_SDIO) {
-+                /* read card capabilities */
-+            status = Cmd52ReadByteCommon(pHcd->pPseudoDev,
-+                                         SDIO_CARD_CAPS_REG,
-+                                         &pHcd->CardProperties.SDIOCaps);
-+            if (!SDIO_SUCCESS(status)) {
-+                break;
-+            }
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Card Caps: 0x%X \n",pHcd->CardProperties.SDIOCaps));
-+            if (pHcd->CardProperties.SDIOCaps & SDIO_CAPS_LOW_SPEED) {
-+                    /* adjust max clock for LS device */
-+                ADJUST_OPER_CLOCK(pBusMode,SDIO_LOW_SPEED_MAX_BUS_CLOCK);
-+                    /* adjust bus if LS device does not support 4 bit mode */
-+                if (!(pHcd->CardProperties.SDIOCaps & SDIO_CAPS_4BIT_LS)) {
-+                    if (!spiMode) {
-+                            /* low speed device does not support 4 bit mode, force us to 1 bit */
-+                        SDCONFIG_SET_BUS_WIDTH(pBusMode->BusModeFlags,
-+                                               SDCONFIG_BUS_WIDTH_1_BIT);
-+                    }
-+                }
-+            }
-+
-+                /* check if 1.2 card supports high speed mode, checking HCD as well*/
-+            if (SDDEVICE_IS_SDIO_REV_GTEQ_1_20(pHcd->pPseudoDev) &&
-+                (pHcd->Attributes & SDHCD_ATTRIB_SD_HIGH_SPEED) &&
-+                !spiMode) {
-+                UCHAR hsControl = 0;
-+
-+                status = Cmd52ReadByteCommon(pHcd->pPseudoDev,
-+                                             SDIO_HS_CONTROL_REG,
-+                                             &hsControl);
-+
-+                if (!SDIO_SUCCESS(status)) {
-+                    DBG_PRINT(SDDBG_TRACE,
-+                        ("SDIO Failed to read high speed control (%d) \n",status));
-+                        /* reset status and continue */
-+                    status = SDIO_STATUS_SUCCESS;
-+                } else {
-+                    if (hsControl & SDIO_HS_CONTROL_SHS) {
-+                        DBG_PRINT(SDDBG_TRACE, ("SDIO Card Supports High Speed Mode\n"));
-+                        pBusMode->BusModeFlags |= SDCONFIG_BUS_MODE_SD_HS;
-+                    }
-+                }
-+
-+            }
-+
-+            cardReportedRate = 0;
-+            temp = sizeof(func0ext);
-+            tplAddr = pHcd->CardProperties.CommonCISPtr;
-+                /* get the FUNCE tuple */
-+            status = SDLIB_FindTuple(pHcd->pPseudoDev,
-+                                     CISTPL_FUNCE,
-+                                     &tplAddr,
-+                                     (PUINT8)&func0ext,
-+                                     &temp);
-+            if (!SDIO_SUCCESS(status) || (temp < sizeof(func0ext))) {
-+                DBG_PRINT(SDDBG_WARN, ("SDIO Function 0 Ext. Tuple Missing (Got size:%d) \n", temp));
-+                    /* reset status */
-+                status = SDIO_STATUS_SUCCESS;
-+            } else {
-+                    /* convert encoded value to rate */
-+                cardReportedRate = ConvertEncodedTransSpeed(func0ext.MaxTransSpeed);
-+            }
-+
-+            if (cardReportedRate != 0) {
-+                if (pBusMode->BusModeFlags & SDCONFIG_BUS_MODE_SD_HS) {
-+                    if (cardReportedRate <= SD_MAX_BUS_CLOCK) {
-+                        DBG_PRINT(SDDBG_WARN,
-+                            ("SDIO Function tuple reports clock:%d Hz, with advertised High Speed support \n", cardReportedRate));
-+                            /* back off high speed support */
-+                        pBusMode->BusModeFlags &= ~SDCONFIG_BUS_MODE_SD_HS;
-+                    }
-+                } else {
-+                    if (cardReportedRate > SD_MAX_BUS_CLOCK) {
-+                        DBG_PRINT(SDDBG_WARN,
-+                            ("SDIO Function tuple reports clock:%d Hz, without advertising High Speed support..using 25Mhz \n", cardReportedRate));
-+                        cardReportedRate = SD_MAX_BUS_CLOCK;
-+                    }
-+                }
-+                    /* adjust clock based on what the card can handle */
-+                ADJUST_OPER_CLOCK(pBusMode,cardReportedRate);
-+
-+            } else {
-+                    /* set a reasonable default */
-+                ADJUST_OPER_CLOCK(pBusMode,SD_MAX_BUS_CLOCK);
-+            }
-+        }
-+    } while (FALSE);
-+
-+    if (pReq != NULL) {
-+        FreeRequest(pReq);
-+    }
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  SetOperationalBusMode - set operational bus mode
-+  Input:  pDevice - pDevice that is requesting the change
-+          pBusMode - operational bus mode
-+  Output: pBusMode - on return will have the actual clock rate set
-+  Return: status
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS SetOperationalBusMode(PSDDEVICE                pDevice,
-+                                  PSDCONFIG_BUS_MODE_DATA  pBusMode)
-+{
-+    SDIO_STATUS     status = SDIO_STATUS_SUCCESS;
-+    UCHAR           regData;
-+    UINT32          arg;
-+    UINT32          switcharg;
-+    PSDHCD          pHcd = pDevice->pHcd;
-+
-+        /* synchronize access for updating bus mode settings */
-+    status = SemaphorePendInterruptable(&pDevice->pHcd->ConfigureOpsSem);
-+    if (!SDIO_SUCCESS(status)) {
-+        return status;
-+    }
-+
-+    do {
-+
-+        if (!IS_CARD_PRESENT(pHcd)) {
-+                /* for an empty slot (a Pseudo dev was passed in) we still allow the
-+                 * bus mode to be set for the card detect
-+                 * polling */
-+            status = _IssueConfig(pHcd,SDCONFIG_BUS_MODE_CTRL,pBusMode,sizeof(SDCONFIG_BUS_MODE_DATA));
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to set bus mode in hcd : Err:%d \n",
-+                                        status));
-+            }
-+                /* nothing more to do */
-+            break;
-+        }
-+
-+
-+        if ((pBusMode->BusModeFlags == SDDEVICE_GET_BUSMODE_FLAGS(pDevice)) &&
-+            (pBusMode->ClockRate == SDDEVICE_GET_OPER_CLOCK(pDevice))) {
-+            DBG_PRINT(SDDBG_TRACE,
-+               ("SDIO Bus Driver: Bus mode already set, nothing to do\n"));
-+            pBusMode->ActualClockRate = SDDEVICE_GET_OPER_CLOCK(pDevice);
-+            break;
-+        }
-+
-+        if (pBusMode->BusModeFlags & SDCONFIG_BUS_MODE_MMC_HS) {
-+            if (!(pHcd->Attributes & SDHCD_ATTRIB_MMC_HIGH_SPEED)) {
-+                status = SDIO_STATUS_INVALID_PARAMETER;
-+                DBG_PRINT(SDDBG_ERROR,
-+                        ("SDIO Bus Driver: HCD does not support MMC High Speed\n"));
-+                break;
-+            }
-+        }
-+
-+        if (pBusMode->BusModeFlags & SDCONFIG_BUS_MODE_SD_HS) {
-+            if (!(pHcd->Attributes & SDHCD_ATTRIB_SD_HIGH_SPEED)) {
-+                status = SDIO_STATUS_INVALID_PARAMETER;
-+                DBG_PRINT(SDDBG_ERROR,
-+                        ("SDIO Bus Driver: HCD does not support SD High Speed\n"));
-+                break;
-+            }
-+        }
-+
-+            /* before we set the operational clock and mode, configure the clock for high
-+             * speed mode on the card , if necessary */
-+        if ((pHcd->CardProperties.Flags & CARD_MMC) &&
-+            (pBusMode->BusModeFlags & SDCONFIG_BUS_MODE_MMC_HS) &&
-+            !(SDDEVICE_GET_BUSMODE_FLAGS(pDevice) & SDCONFIG_BUS_MODE_MMC_HS)) {
-+
-+            switcharg = MMC_SWITCH_BUILD_ARG(MMC_SWITCH_CMD_SET0,
-+                                             MMC_SWITCH_WRITE_BYTE,
-+                                             MMC_EXT_HS_TIMING_OFFSET,
-+                                             MMC_EXT_HS_TIMING_ENABLE);
-+            status = _IssueSimpleBusRequest(pHcd,
-+                                            MMC_CMD_SWITCH,
-+                                            switcharg,
-+                                            SDREQ_FLAGS_RESP_R1B,
-+                                            NULL);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR,
-+                 ("SDIO Bus Driver: Failed to switch MMC High Speed Mode (arg:0x%X): %d \n",
-+                                        switcharg, status));
-+                break;
-+            }
-+
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: High Speed MMC enabled (arg:0x%X)\n",
-+                switcharg));
-+        }
-+
-+            /* before setting bus mode and clock in the HCD, switch card to high speed mode
-+             * if necessary */
-+        if ((pHcd->CardProperties.Flags & CARD_SD) &&
-+            (pBusMode->BusModeFlags & SDCONFIG_BUS_MODE_SD_HS) &&
-+            !(SDDEVICE_GET_BUSMODE_FLAGS(pDevice) & SDCONFIG_BUS_MODE_SD_HS)) {
-+            UINT32     arg;
-+            PUINT8     pSwitchStatusBlock;
-+
-+            pSwitchStatusBlock = KernelAlloc(SD_SWITCH_FUNC_STATUS_BLOCK_BYTES);
-+
-+            if (NULL == pSwitchStatusBlock) {
-+                status = SDIO_STATUS_NO_RESOURCES;
-+                break;
-+            }
-+
-+                /* set high speed group */
-+            arg = SD_SWITCH_FUNC_ARG_GROUP_SET(SD_SWITCH_HIGH_SPEED_GROUP,
-+                                               SD_SWITCH_HIGH_SPEED_FUNC_NO);
-+
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Setting SD Card for High Speed mode (CMD6 arg:0x%X)\n",arg));
-+
-+                /* issue simple data transfer request to switch modes */
-+            status = _IssueBusRequestBd(pHcd,
-+                                        CMD6,
-+                                        arg,
-+                                        SDREQ_FLAGS_RESP_R1 | SDREQ_FLAGS_DATA_TRANS,
-+                                        NULL,
-+                                        pSwitchStatusBlock,
-+                                        SD_SWITCH_FUNC_STATUS_BLOCK_BYTES);
-+
-+            if (SDIO_SUCCESS(status)) {
-+                ReorderBuffer(pSwitchStatusBlock,SD_SWITCH_FUNC_STATUS_BLOCK_BYTES);
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SD High Speed Result, Got Max Current:%d mA, SwitchResult:0x%X \n",
-+                      SD_SWITCH_FUNC_STATUS_GET_MAX_CURRENT(pSwitchStatusBlock),
-+                      SDSwitchGetSwitchResult(pSwitchStatusBlock, SD_SWITCH_HIGH_SPEED_GROUP)));
-+                if (SD_SWITCH_FUNC_STATUS_GET_MAX_CURRENT(pSwitchStatusBlock) == 0) {
-+                    DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Error in Status Block after High Speed Switch (current==0) \n"));
-+                    status = SDIO_STATUS_DEVICE_ERROR;
-+                }
-+                if (SDSwitchGetSwitchResult(pSwitchStatusBlock, SD_SWITCH_HIGH_SPEED_GROUP) !=
-+                    SD_SWITCH_HIGH_SPEED_FUNC_NO) {
-+                    DBG_PRINT(SDDBG_ERROR,
-+                        ("SDIO Bus Driver: Error in Status Block after High Speed Switch (Group1 did not switch) \n"));
-+                    status = SDIO_STATUS_DEVICE_ERROR;
-+                }
-+                if (SDIO_SUCCESS(status)) {
-+                    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SD High Speed Mode Enabled \n"));
-+                } else {
-+                    SDLIB_PrintBuffer(pSwitchStatusBlock,
-+                                      SD_SWITCH_FUNC_STATUS_BLOCK_BYTES,
-+                                       "SDIO Bus Driver: SD Switch Status Block Error");
-+                }
-+            } else {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to Set SD High Speed Mode (%d) \n",status));
-+            }
-+            KernelFree(pSwitchStatusBlock);
-+
-+            if (!SDIO_SUCCESS(status)) {
-+                break;
-+            }
-+        }
-+
-+            /* enable/disable high speed mode for SDIO card */
-+        if (pHcd->CardProperties.Flags & CARD_SDIO) {
-+            BOOL doSet = TRUE;
-+
-+            if ((pBusMode->BusModeFlags & SDCONFIG_BUS_MODE_SD_HS) &&
-+                !(SDDEVICE_GET_BUSMODE_FLAGS(pDevice) & SDCONFIG_BUS_MODE_SD_HS)) {
-+                    /* enable */
-+                regData = SDIO_HS_CONTROL_EHS;
-+            } else if (!(pBusMode->BusModeFlags & SDCONFIG_BUS_MODE_SD_HS) &&
-+                       (SDDEVICE_GET_BUSMODE_FLAGS(pDevice) & SDCONFIG_BUS_MODE_SD_HS)) {
-+                    /* disable */
-+                regData = 0;
-+            } else {
-+                    /* do nothing */
-+                doSet = FALSE;
-+            }
-+
-+            if (doSet) {
-+                status = Cmd52WriteByteCommon(pDevice,
-+                                              SDIO_HS_CONTROL_REG,
-+                                              &regData);
-+
-+                if (!SDIO_SUCCESS(status)) {
-+                    DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to %s HS mode in SDIO card : Err:%d\n",
-+                                            (SDIO_HS_CONTROL_EHS == regData) ? "enable":"disable" , status));
-+                    break;
-+                } else {
-+                    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver:SDIO Card %s for High Speed mode \n",
-+                                    (SDIO_HS_CONTROL_EHS == regData) ? "enabled":"disabled" ));
-+                }
-+            }
-+        }
-+
-+            /* use synchronize-with-bus request version, this may have been requested by a
-+             * function driver */
-+        status = SDLIB_IssueConfig(pDevice,
-+                                   SDCONFIG_BUS_MODE_CTRL,
-+                                   pBusMode,
-+                                   sizeof(SDCONFIG_BUS_MODE_DATA));
-+
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to set bus mode in hcd : Err:%d \n",
-+                                    status));
-+            break;
-+        }
-+
-+             /* check requested bus width against the current mode */
-+        if (SDCONFIG_GET_BUSWIDTH(pBusMode->BusModeFlags) ==
-+                SDCONFIG_GET_BUSWIDTH(pHcd->CardProperties.BusMode)) {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Bus mode set, no width change\n"));
-+            break;
-+        }
-+
-+        if (SDCONFIG_GET_BUSWIDTH(pBusMode->BusModeFlags) == SDCONFIG_BUS_WIDTH_SPI) {
-+                /* nothing more to do for SPI */
-+            break;
-+        }
-+
-+            /* set the bus width for SD and combo cards */
-+        if (pHcd->CardProperties.Flags & CARD_SD) {
-+            if (SDCONFIG_GET_BUSWIDTH(pBusMode->BusModeFlags) == SDCONFIG_BUS_WIDTH_4_BIT) {
-+                    /* turn off card detect resistor */
-+                status = _IssueSimpleBusRequest(pHcd,
-+                                                ACMD42,
-+                                                0, /* disable CD */
-+                                                SDREQ_FLAGS_APP_CMD | SDREQ_FLAGS_RESP_R1,
-+                                                NULL);
-+                if (!SDIO_SUCCESS(status)) {
-+                    DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: Failed to disable CD Res: %d \n",
-+                                           status)); /* this should be okay */
-+                }
-+                arg = SD_ACMD6_BUS_WIDTH_4_BIT;
-+            } else {
-+                    /* don't need to turn off CD in 1 bit mode, just set mode */
-+                arg = SD_ACMD6_BUS_WIDTH_1_BIT;
-+
-+            }
-+                /* set the bus width */
-+            status = _IssueSimpleBusRequest(pHcd,
-+                                            ACMD6,
-+                                            arg, /* set bus mode */
-+                                            SDREQ_FLAGS_APP_CMD | SDREQ_FLAGS_RESP_R1,
-+                                            NULL);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to set bus width: %d \n",
-+                                        status));
-+                break;
-+            }
-+        }
-+            /* set bus width for SDIO cards */
-+        if (pHcd->CardProperties.Flags & CARD_SDIO) {
-+                /* default */
-+            regData = CARD_DETECT_DISABLE | SDIO_BUS_WIDTH_1_BIT;
-+
-+            if (SDCONFIG_GET_BUSWIDTH(pBusMode->BusModeFlags) == SDCONFIG_BUS_WIDTH_4_BIT) {
-+                    /* turn off card detect resistor and set buswidth */
-+                regData = CARD_DETECT_DISABLE | SDIO_BUS_WIDTH_4_BIT;
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Enabling 4 bit mode on card \n"));
-+            } else {
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Enabling 1 bit mode on card \n"));
-+            }
-+            status = Cmd52WriteByteCommon(pDevice,
-+                                          SDIO_BUS_IF_REG,
-+                                          &regData);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to set bus mode in Card : Err:%d\n",
-+                                        status));
-+                break;
-+            }
-+
-+                /* check for 4-bit interrupt detect mode */
-+            if ((SDCONFIG_GET_BUSWIDTH(pBusMode->BusModeFlags) == SDCONFIG_BUS_WIDTH_4_BIT) &&
-+                (pHcd->CardProperties.SDIOCaps & SDIO_CAPS_INT_MULTI_BLK) &&
-+                (pHcd->Attributes & SDHCD_ATTRIB_MULTI_BLK_IRQ)) {
-+                    /* enable interrupts between blocks, this doesn't actually turn on interrupts
-+                     * it merely allows interrupts to be asserted in the inter-block gap */
-+                pHcd->CardProperties.SDIOCaps |= SDIO_CAPS_ENB_INT_MULTI_BLK;
-+
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: 4-Bit Multi-blk Interrupt support enabled\n"));
-+            } else {
-+                    /* make sure this is disabled */
-+                pHcd->CardProperties.SDIOCaps &= ~SDIO_CAPS_ENB_INT_MULTI_BLK;
-+            }
-+
-+            status = Cmd52WriteByteCommon(pDevice,
-+                                          SDIO_CARD_CAPS_REG,
-+                                          &pHcd->CardProperties.SDIOCaps);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to update Card Caps register Err:%d\n",
-+                                        status));
-+                break;
-+            }
-+        }
-+
-+            /* set data bus width for MMC */
-+        if (pHcd->CardProperties.Flags & CARD_MMC) {
-+            UINT8  buswidth = 0;
-+
-+            if (SDCONFIG_GET_BUSWIDTH(pBusMode->BusModeFlags) == SDCONFIG_BUS_WIDTH_4_BIT) {
-+                buswidth = MMC_EXT_BUS_WIDTH_4_BIT;
-+            } else if (SDCONFIG_GET_BUSWIDTH(pBusMode->BusModeFlags) == SDCONFIG_BUS_WIDTH_MMC8_BIT) {
-+                buswidth = MMC_EXT_BUS_WIDTH_8_BIT;
-+            } else {
-+                /* normal 1 bit mode .. nothing to do */
-+                break;
-+            }
-+                /* now set the bus mode on the card */
-+            switcharg = MMC_SWITCH_BUILD_ARG(MMC_SWITCH_CMD_SET0,
-+                                             MMC_SWITCH_WRITE_BYTE,
-+                                             MMC_EXT_BUS_WIDTH_OFFSET,
-+                                             buswidth);
-+
-+            status = _IssueSimpleBusRequest(pHcd,
-+                                            MMC_CMD_SWITCH,
-+                                            switcharg,
-+                                            SDREQ_FLAGS_RESP_R1B,
-+                                            NULL);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to set MMC bus width (arg:0x%X): %d \n",
-+                                        switcharg, status));
-+                break;
-+            }
-+
-+            if (SDCONFIG_GET_BUSWIDTH(pBusMode->BusModeFlags) == SDCONFIG_BUS_WIDTH_4_BIT) {
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: 4 bit MMC mode enabled (arg:0x%X) \n",
-+                      switcharg));
-+            } else if (SDCONFIG_GET_BUSWIDTH(pBusMode->BusModeFlags) == SDCONFIG_BUS_WIDTH_MMC8_BIT) {
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: 8-Bit MMC mode enabled (arg:0x%X) \n",
-+                      switcharg));
-+            }
-+        }
-+
-+    } while (FALSE);
-+
-+    if (SDIO_SUCCESS(status)) {
-+            /* set the operating mode */
-+        pHcd->CardProperties.BusMode = pBusMode->BusModeFlags;
-+            /* set the actual clock rate */
-+        pHcd->CardProperties.OperBusClock = pBusMode->ActualClockRate;
-+    }
-+
-+    SemaphorePost(&pDevice->pHcd->ConfigureOpsSem);
-+
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  CardInitSetup - setup host for card initialization
-+  Input:  pHcd - HCD object
-+  Output:
-+  Return:
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS CardInitSetup(PSDHCD pHcd)
-+{
-+    SDCONFIG_INIT_CLOCKS_DATA   initClocks;
-+    SDCONFIG_BUS_MODE_DATA      busMode;
-+    UINT32                      OCRvalue;
-+    SDIO_STATUS                 status = SDIO_STATUS_SUCCESS;
-+
-+    ZERO_OBJECT(initClocks);
-+    ZERO_OBJECT(busMode);
-+        /* setup defaults */
-+    initClocks.NumberOfClocks = SDMMC_MIN_INIT_CLOCKS;
-+    busMode.ClockRate = SD_INIT_BUS_CLOCK;
-+
-+        /* check for SPI only */
-+    if (pHcd->Attributes & SDHCD_ATTRIB_BUS_SPI) {
-+            /* SPI cards startup in non-CRC mode with the exception of CMD0, the
-+             * HCDs must issue CMD0 with the correct CRC , the spec shows that a
-+             * CMD 0 sequence is 0x40,0x00,0x00,0x00,0x00,0x95 */
-+        busMode.BusModeFlags = SDCONFIG_BUS_WIDTH_SPI | SDCONFIG_BUS_MODE_SPI_NO_CRC;
-+    }
-+        /* check if host supports 1 bit mode */
-+        /* TODO : if host supports power switching, we can
-+         * could initialize cards in SPI mode first */
-+    if (pHcd->Attributes & SDHCD_ATTRIB_BUS_1BIT) {
-+        busMode.BusModeFlags = SDCONFIG_BUS_WIDTH_1_BIT;
-+    }
-+
-+        /* set initial VDD, starting at the highest allowable voltage and working
-+         * our way down */
-+    if (pHcd->SlotVoltageCaps & SLOT_POWER_3_3V) {
-+        OCRvalue = SD_OCR_3_2_TO_3_3_VDD;
-+    } else if (pHcd->SlotVoltageCaps & SLOT_POWER_3_0V) {
-+        OCRvalue = SD_OCR_2_9_TO_3_0_VDD;
-+    } else if (pHcd->SlotVoltageCaps & SLOT_POWER_2_8V) {
-+        OCRvalue = SD_OCR_2_7_TO_2_8_VDD;
-+    } else if (pHcd->SlotVoltageCaps & SLOT_POWER_2_0V) {
-+        OCRvalue = SD_OCR_1_9_TO_2_0_VDD;
-+    } else if (pHcd->SlotVoltageCaps & SLOT_POWER_1_8V) {
-+        OCRvalue = SD_OCR_1_7_TO_1_8_VDD;
-+    } else if (pHcd->SlotVoltageCaps & SLOT_POWER_1_6V) {
-+        OCRvalue = SD_OCR_1_6_TO_1_7_VDD;
-+    } else {
-+        DBG_ASSERT(FALSE);
-+        OCRvalue = 0;
-+    }
-+
-+    do {
-+            /* power up the card */
-+        status = AdjustSlotPower(pHcd, &OCRvalue);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to adjust slot power \n"));
-+            break;
-+        }
-+        status = SetOperationalBusMode(pHcd->pPseudoDev,&busMode);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to set bus mode \n"));
-+            break;
-+        }
-+        status = _IssueConfig(pHcd,SDCONFIG_SEND_INIT_CLOCKS,&initClocks,sizeof(initClocks));
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to send init clocks in hcd \n"));
-+            break;
-+        }
-+
-+    } while(FALSE);
-+
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  SDInitializeCard - initialize card
-+  Input:  pHcd - HCD object
-+  Output: pProperties - card properties
-+  Return:
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS SDInitializeCard(PSDHCD pHcd)
-+{
-+    SDCONFIG_BUS_MODE_DATA      busMode;
-+    SDIO_STATUS                 status = SDIO_STATUS_SUCCESS;
-+    PSDREQUEST                  pReq = NULL;
-+    UINT32                      OCRvalue;
-+    UINT32                      tplAddr;
-+    UINT8                       temp;
-+    struct SDIO_MANFID_TPL      manfid;
-+    SDCONFIG_WP_VALUE           wpValue;
-+    UINT8                       cisBuffer[3];
-+
-+    OCRvalue = 0;
-+
-+    do {
-+        if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Initializing card in SPI mode \n"));
-+        } else {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Initializing card in MMC/SD mode \n"));
-+        }
-+
-+        pReq = AllocateRequest();
-+        if (NULL == pReq) {
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: failed to allocate bus request \n"));
-+            break;
-+        }
-+        memset(pReq, 0, sizeof(SDREQUEST));
-+
-+        status = CardInitSetup(pHcd);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to setup card \n"));
-+            break;
-+        }
-+        status = _IssueConfig(pHcd,SDCONFIG_GET_WP,&wpValue,sizeof(wpValue));
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: host doesn't support Write Protect \n"));
-+        } else {
-+            if (wpValue) {
-+                pHcd->CardProperties.Flags |= CARD_SD_WP;
-+                DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: SD WP switch is on \n"));
-+            }
-+        }
-+
-+        if (!(pHcd->Attributes & SDHCD_ATTRIB_SLOT_POLLING) &&
-+            IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                /* for non-slot polling HCDs operating in SPI mode
-+                 * issue CMD0 to reset card state and to place the card
-+                 * in SPI mode.  If slot polling is used, the polling thread
-+                 * will have already issued a CMD0 to place the card in SPI mode*/
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                INT ii = 256;
-+                status = SDIO_STATUS_ERROR;
-+                /* if the CMD0 fails, retry it. Some cards have a hard time getting into SPI mode.*/
-+                while ((!SDIO_SUCCESS(status)) && (ii-- >= 0)) {
-+                    status = _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_RESP_R1,pReq);
-+                    OSSleep(20);
-+                }
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: cmd0 go SPI retries:(256) %d\n", ii));
-+
-+            } else {
-+                status = _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_NO_RESP,pReq);
-+            }
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: go-idle failed! \n"));
-+                break;
-+            }
-+        }
-+
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Looking for SDIO.. \n"));
-+            /* check for SDIO card by trying to read it's OCR */
-+        status = ReadOCR(pHcd,CARD_SDIO,pReq,0,&OCRvalue);
-+        if (SDIO_SUCCESS(status)) {
-+                /* we got a response, this is an SDIO card */
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                    /* handle SPI */
-+                pHcd->CardProperties.IOFnCount = SPI_SDIO_R4_GET_IO_FUNC_COUNT(pReq->Response);
-+                if (SPI_SDIO_R4_IS_MEMORY_PRESENT(pReq->Response)) {
-+                        /* flag an SD function exists */
-+                    pHcd->CardProperties.Flags |= CARD_SD;
-+                }
-+            } else {
-+                    /* handle native SD */
-+                pHcd->CardProperties.IOFnCount = SD_SDIO_R4_GET_IO_FUNC_COUNT(pReq->Response);
-+                if (SD_SDIO_R4_IS_MEMORY_PRESENT(pReq->Response)) {
-+                        /* flag an SD function exists */
-+                    pHcd->CardProperties.Flags |= CARD_SD;
-+                }
-+
-+            }
-+            if (0 == pHcd->CardProperties.IOFnCount) {
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SDIO Card reports no functions \n"));
-+                status = SDIO_STATUS_DEVICE_ERROR;
-+                pHcd->CardProperties.Flags = 0;
-+                break;
-+            }
-+            pHcd->CardProperties.Flags |= CARD_SDIO;
-+
-+            DBG_PRINT(SDDBG_TRACE,
-+                ("SDIO Bus Driver: SDIO Card, Functions: %d Card Info Flags:0x%X OCR:0x%8.8X\n",
-+                      pHcd->CardProperties.IOFnCount, pHcd->CardProperties.Flags, OCRvalue));
-+                /* adjust slot power for this SDIO card */
-+            status = AdjustSlotPower(pHcd, &OCRvalue);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to set power in hcd \n"));
-+                break;
-+            }
-+                /* poll for SDIO card ready */
-+            status = PollCardReady(pHcd,OCRvalue,CARD_SDIO);
-+            if (!SDIO_SUCCESS(status)) {
-+                break;
-+            }
-+        } else if (status != SDIO_STATUS_BUS_RESP_TIMEOUT){
-+                /* major error in hcd, bail */
-+            break;
-+        }
-+
-+            /* check if this is an SDIO-only card before continuing  */
-+        if (!(pHcd->CardProperties.Flags & CARD_SD) && (pHcd->CardProperties.Flags & CARD_SDIO)) {
-+                /* this is an SDIO card with no memory function */
-+            goto prepareCard;
-+        }
-+
-+        if (!(pHcd->CardProperties.Flags & CARD_SDIO)) {
-+                /* issue go idle only if we did not find an SDIO function in our earlier test */
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                status = _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_RESP_R1,pReq);
-+            } else {
-+                status = _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_NO_RESP,pReq);
-+            }
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: go-idle failed! \n"));
-+                break;
-+            }
-+        }
-+
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Looking for SD Memory.. \n"));
-+            /* SD Memory Card checking */
-+            /* test for present of SD card (stand-alone or combo card) */
-+        status = TestPresence(pHcd, CARD_SD, pReq);
-+        if (SDIO_SUCCESS(status)) {
-+                /* there is an SD Card present, could be part of a combo system */
-+            pHcd->CardProperties.Flags |= CARD_SD;
-+            if (0 == OCRvalue) {
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SD Memory card detected. \n"));
-+                    /* no OCR value on entry this is a stand-alone card, go and get it*/
-+                status = ReadOCR(pHcd,CARD_SD,pReq,0,&OCRvalue);
-+                if (!SDIO_SUCCESS(status) || (OCRvalue == 0)) {
-+                    DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to get OCR (status:%d) \n",
-+                                            status));
-+                    break;
-+                }
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SD Card Reports OCR:0x%8.8X \n", OCRvalue));
-+                status = AdjustSlotPower(pHcd, &OCRvalue);
-+                if (!SDIO_SUCCESS(status)) {
-+                    DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to adjust power \n"));
-+                    break;
-+                }
-+            } else {
-+                 DBG_ASSERT((pHcd->CardProperties.Flags & (CARD_SD | CARD_SDIO)));
-+                 DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SDIO Combo Card detected \n"));
-+            }
-+                /* poll for SD card ready */
-+            status = PollCardReady(pHcd,OCRvalue,CARD_SD);
-+            if (!SDIO_SUCCESS(status)) {
-+                    /* check if this card has an SDIO function */
-+                if (pHcd->CardProperties.Flags & CARD_SDIO) {
-+                    DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: Combo Detected but SD memory function failed \n"));
-+                        /* allow SDIO functions to load normally */
-+                    status = SDIO_STATUS_SUCCESS;
-+                        /* remove SD flag */
-+                    pHcd->CardProperties.Flags &= ~CARD_SD;
-+                } else {
-+                    break;
-+                }
-+            } else {
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SD Memory ready. \n"));
-+            }
-+                /* we're done, no need to check for MMC */
-+            goto prepareCard;
-+        } else if (status != SDIO_STATUS_BUS_RESP_TIMEOUT){
-+                /* major error in hcd, bail */
-+            break;
-+        }
-+
-+        /* MMC card checking */
-+        /* if we get here, these better not be set */
-+        DBG_ASSERT(!(pHcd->CardProperties.Flags & (CARD_SD | CARD_SDIO)));
-+           /* issue go idle */
-+        if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+            status = _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_RESP_R1,pReq);
-+        } else {
-+            status = _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_NO_RESP,pReq);
-+        }
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: go-idle failed! \n"));
-+            break;
-+        }
-+
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Looking for MMC.. \n"));
-+        status = TestPresence(pHcd, CARD_MMC, pReq);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: unknown card detected \n"));
-+            break;
-+        }
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: MMC Card Detected \n"));
-+        pHcd->CardProperties.Flags |= CARD_MMC;
-+            /* read the OCR value */
-+        status = ReadOCR(pHcd,CARD_MMC,pReq,0,&OCRvalue);
-+        if (!SDIO_SUCCESS(status) || (OCRvalue == 0)) {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Failed to get OCR (status:%d)",
-+                                    status));
-+            break;
-+        }
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: MMC Card Reports OCR:0x%8.8X \n", OCRvalue));
-+            /* adjust power */
-+        status = AdjustSlotPower(pHcd, &OCRvalue);
-+        if (!SDIO_SUCCESS(status)) {
-+             DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to adjust power \n"));
-+             break;
-+        }
-+            /* poll for MMC card ready */
-+        status = PollCardReady(pHcd,OCRvalue,CARD_MMC);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+            /* fall through and prepare MMC card */
-+
-+prepareCard:
-+            /* we're done figuring out what was inserted, and setting up
-+             * optimal slot voltage, now we need to prepare the card */
-+        if (!IS_HCD_BUS_MODE_SPI(pHcd) &&
-+            (pHcd->CardProperties.Flags & (CARD_SD | CARD_MMC))) {
-+                /* non-SPI SD or MMC cards need to be moved to the "ident" state before we can get the
-+                 * RCA or select the card using the new RCA */
-+            status = _IssueSimpleBusRequest(pHcd,CMD2,0,SDREQ_FLAGS_RESP_R2,pReq);
-+            if (!SDIO_SUCCESS(status)){
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: failed to move SD/MMC card into ident state \n"));
-+                break;
-+            }
-+        }
-+
-+        if (!IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                /* non-SPI mode cards need their RCA's setup */
-+            if (pHcd->CardProperties.Flags & (CARD_SD | CARD_SDIO)) {
-+                    /* issue CMD3 to get RCA on SD/SDIO cards */
-+                status = _IssueSimpleBusRequest(pHcd,CMD3,0,SDREQ_FLAGS_RESP_R6,pReq);
-+                if (!SDIO_SUCCESS(status)){
-+                    DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: failed to get RCA for SD/SDIO card \n"));
-+                    break;
-+                }
-+                pHcd->CardProperties.RCA = SD_R6_GET_RCA(pReq->Response);
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SD/SDIO RCA:0x%X \n",
-+                                        pHcd->CardProperties.RCA));
-+            } else if (pHcd->CardProperties.Flags & CARD_MMC) {
-+                    /* for MMC cards, we have to assign a relative card address */
-+                    /* just a non-zero number */
-+                pHcd->CardProperties.RCA = 1;
-+                    /* issue CMD3 to set the RCA for MMC cards */
-+                status = _IssueSimpleBusRequest(pHcd,
-+                                                CMD3,(pHcd->CardProperties.RCA << 16),
-+                                                SDREQ_FLAGS_RESP_R1,pReq);
-+                if (!SDIO_SUCCESS(status)){
-+                    DBG_PRINT(SDDBG_ERROR,
-+                            ("SDIO Bus Driver: failed to set RCA for MMC card! (err=%d) \n",status));
-+                    break;
-+                }
-+            } else {
-+                DBG_ASSERT(FALSE);
-+            }
-+        }
-+            /* select the card in order to get the rest of the card info, applies
-+             * to SDIO/SD/MMC cards*/
-+        status = SelectDeselectCard(pHcd, TRUE);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: failed to select card! \n"));
-+            break;
-+        }
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver, Card now Selected.. \n"));
-+
-+        if (pHcd->CardProperties.Flags & CARD_SDIO) {
-+                /* read SDIO revision register */
-+            status = Cmd52ReadByteCommon(pHcd->pPseudoDev, CCCR_SDIO_REVISION_REG, &temp);
-+            if (!SDIO_SUCCESS(status)) {
-+                break;
-+            }
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Revision Reg: 0x%X \n", temp));
-+            switch (temp & SDIO_REV_MASK) {
-+                case SDIO_REV_1_00:
-+                    DBG_PRINT(SDDBG_TRACE, ("SDIO Spec Revision 1.00 \n"));
-+                    pHcd->CardProperties.SDIORevision = SDIO_REVISION_1_00;
-+                    break;
-+                case SDIO_REV_1_10:
-+                    DBG_PRINT(SDDBG_TRACE, ("SDIO Spec Revision 1.10 \n"));
-+                    pHcd->CardProperties.SDIORevision = SDIO_REVISION_1_10;
-+                    break;
-+                case SDIO_REV_1_20:
-+                    DBG_PRINT(SDDBG_TRACE, ("SDIO Spec Revision 1.20 \n"));
-+                    pHcd->CardProperties.SDIORevision = SDIO_REVISION_1_20;
-+                    break;
-+                default:
-+                    DBG_PRINT(SDDBG_WARN, ("SDIO Warning: unknown SDIO revision, treating like 1.0 device \n"));
-+                    pHcd->CardProperties.SDIORevision = SDIO_REVISION_1_00;
-+                    break;
-+            }
-+                /* get the common CIS ptr */
-+            status = Cmd52ReadMultipleCommon(pHcd->pPseudoDev,
-+                                             SDIO_CMN_CIS_PTR_LOW_REG,
-+                                             cisBuffer,
-+                                             3);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to get CIS ptr, Err:%d", status));
-+                break;
-+            }
-+                /* this is endian-safe*/
-+            pHcd->CardProperties.CommonCISPtr = ((UINT32)cisBuffer[0]) |
-+                                                (((UINT32)cisBuffer[1]) << 8) |
-+                                                (((UINT32)cisBuffer[2]) << 16);
-+
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Card CIS Ptr: 0x%X \n", pHcd->CardProperties.CommonCISPtr));
-+            temp = sizeof(manfid);
-+            tplAddr = pHcd->CardProperties.CommonCISPtr;
-+                /* get the MANFID tuple */
-+            status = SDLIB_FindTuple(pHcd->pPseudoDev,
-+                                     CISTPL_MANFID,
-+                                     &tplAddr,
-+                                     (PUINT8)&manfid,
-+                                     &temp);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: Failed to get MANFID tuple err:%d \n", status));
-+                status = SDIO_STATUS_SUCCESS;
-+            } else {
-+                    /* save this off so that it can be copied into each SDIO Func's SDDEVICE structure */
-+                pHcd->CardProperties.SDIO_ManufacturerCode =
-+                                        CT_LE16_TO_CPU_ENDIAN(manfid.ManufacturerCode);
-+                pHcd->CardProperties.SDIO_ManufacturerID =
-+                                        CT_LE16_TO_CPU_ENDIAN(manfid.ManufacturerInfo);
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO MANFID:0x%X, MANFINFO:0x%X \n",
-+                                        pHcd->CardProperties.SDIO_ManufacturerID,
-+                                        pHcd->CardProperties.SDIO_ManufacturerCode));
-+            }
-+
-+            if (pHcd->CardProperties.SDIORevision >= SDIO_REVISION_1_10) {
-+                    /* read power control */
-+                status = Cmd52ReadByteCommon(pHcd->pPseudoDev, SDIO_POWER_CONTROL_REG, &temp);
-+                if (SDIO_SUCCESS(status)) {
-+                        /* check for power control support which indicates the card may use more
-+                         * than 200 mA */
-+                    if (temp & SDIO_POWER_CONTROL_SMPC) {
-+                            /* check that the host can support this. */
-+                        if (pHcd->MaxSlotCurrent >= SDIO_EMPC_CURRENT_THRESHOLD) {
-+                            temp = SDIO_POWER_CONTROL_EMPC;
-+                                /* enable power control on the card */
-+                            status = Cmd52WriteByteCommon(pHcd->pPseudoDev, SDIO_POWER_CONTROL_REG, &temp);
-+                            if (!SDIO_SUCCESS(status)) {
-+                                DBG_PRINT(SDDBG_ERROR,
-+                                        ("SDIO Busdriver: failed to enable power control (%d) \n",status));
-+                                break;
-+                            }
-+                                /* mark that the card is high power */
-+                            pHcd->CardProperties.Flags |= CARD_HIPWR;
-+
-+                            DBG_PRINT(SDDBG_TRACE,
-+                               ("SDIO Busdriver: Power Control Enabled on SDIO (1.10 or greater) card \n"));
-+                        } else {
-+                            DBG_PRINT(SDDBG_WARN,
-+                               ("SDIO Busdriver: Card can operate higher than 200mA, host cannot (max:%d) \n",
-+                               pHcd->MaxSlotCurrent));
-+                            /* this is not fatal, the card should operate at a reduced rate */
-+                        }
-+                    } else {
-+                        DBG_PRINT(SDDBG_TRACE,
-+                            ("SDIO Busdriver: SDIO 1.10 (or greater) card draws less than 200mA \n"));
-+                    }
-+                } else {
-+                    DBG_PRINT(SDDBG_WARN,
-+                            ("SDIO Busdriver: failed to get POWER CONTROL REG (%d) \n",status));
-+                    /* fall through and continue on at reduced mode */
-+                }
-+            }
-+        }
-+            /* get the current bus parameters */
-+        busMode.BusModeFlags = pHcd->CardProperties.BusMode;
-+        busMode.ClockRate =  pHcd->CardProperties.OperBusClock;
-+            /* get the rest of the bus parameters like clock and supported bus width */
-+        status = GetBusParameters(pHcd,&busMode);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+
-+        if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                /* check HCD if it wants to run without SPI CRC */
-+            if (pHcd->Attributes & SDHCD_ATTRIB_NO_SPI_CRC) {
-+                    /* hcd would rather not run with CRC we don't need to tell the card since SPI mode
-+                     * cards power up with CRC initially disabled */
-+                busMode.BusModeFlags |= SDCONFIG_BUS_MODE_SPI_NO_CRC;
-+            } else {
-+                    /* first enable SPI CRC checking if the HCD can handle it */
-+                status = SDSPIModeEnableDisableCRC(pHcd->pPseudoDev, TRUE);
-+                if (!SDIO_SUCCESS(status)) {
-+                    DBG_PRINT(SDDBG_ERROR,
-+                                ("SDIO Bus Driver: Failed to set Enable SPI CRC on card \n"));
-+                    break;
-+                }
-+            }
-+        }
-+
-+        status = SetOperationalBusMode(pHcd->pPseudoDev, &busMode);
-+
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to set operational bus mode\n"));
-+            break;
-+        }
-+
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Oper. Mode: Clock:%d, Bus:0x%X \n",
-+                                pHcd->CardProperties.OperBusClock,pHcd->CardProperties.BusMode));
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Card in TRANS state, Ready: CardInfo Flags 0x%X \n",
-+                                pHcd->CardProperties.Flags));
-+
-+    } while (FALSE);
-+
-+    if (pReq != NULL) {
-+        FreeRequest(pReq);
-+    }
-+
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  SDQuerySDMMCInfo - query MMC card info
-+  Input:  pDevice - device
-+  Output:
-+  Return:
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS SDQuerySDMMCInfo(PSDDEVICE pDevice)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    PSDREQUEST  pReq = NULL;
-+    UINT8       CID[MAX_CSD_CID_BYTES];
-+
-+    do {
-+        pReq = AllocateRequest();
-+        if (NULL == pReq) {
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            break;
-+        }
-+            /* de-select the card */
-+        status = SelectDeselectCard(pDevice->pHcd,FALSE);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to deselect card before getting CID \n"));
-+            break;
-+        }
-+
-+        if (SDDEVICE_IS_BUSMODE_SPI(pDevice)) {
-+                /* in SPI mode, getting the CSD requires a data transfer */
-+            status = _IssueBusRequestBd(pDevice->pHcd,CMD10,0,
-+                                        SDREQ_FLAGS_RESP_R1 | SDREQ_FLAGS_DATA_TRANS,
-+                                        pReq,
-+                                        CID,
-+                                        MAX_CSD_CID_BYTES);
-+            if (SDIO_SUCCESS(status)) {
-+                    /* in SPI mode we need to reorder to the CID since SPI data comes in MSB first*/
-+                ReorderBuffer(CID,MAX_CSD_CID_BYTES);
-+            }
-+        } else {
-+                /* get the CID */
-+            status = _IssueSimpleBusRequest(pDevice->pHcd,
-+                                            CMD10,
-+                                            (SDDEVICE_GET_CARD_RCA(pDevice) << 16),
-+                                            SDREQ_FLAGS_RESP_R2,
-+                                            pReq);
-+            if (SDIO_SUCCESS(status)) {
-+                    /* extract it from the reponse */
-+                memcpy(CID,pReq->Response,MAX_CSD_CID_BYTES);
-+            }
-+        }
-+
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_WARN, ("SDQuerySDMMCInfo: failed to get CID. \n"));
-+            status = SDIO_STATUS_SUCCESS;
-+        } else {
-+            pDevice->pId[0].SDMMC_ManfacturerID = GET_SD_CID_MANFID(CID);
-+            pDevice->pId[0].SDMMC_OEMApplicationID = GET_SD_CID_OEMID(CID);
-+#if DEBUG
-+            {
-+                char pBuf[7];
-+
-+                pBuf[0] = GET_SD_CID_PN_1(CID);
-+                pBuf[1] = GET_SD_CID_PN_2(CID);
-+                pBuf[2] = GET_SD_CID_PN_3(CID);
-+                pBuf[3] = GET_SD_CID_PN_4(CID);
-+                pBuf[4] = GET_SD_CID_PN_5(CID);
-+                if (pDevice->pHcd->CardProperties.Flags & CARD_MMC) {
-+                    pBuf[5] = GET_SD_CID_PN_6(CID);
-+                    pBuf[6] = 0;
-+                } else {
-+                    pBuf[5] = 0;
-+                }
-+                DBG_PRINT(SDDBG_TRACE, ("SDQuerySDMMCInfo: Product String: %s\n", pBuf));
-+            }
-+#endif
-+            DBG_PRINT(SDDBG_TRACE, ("SDQuerySDMMCInfo: ManfID: 0x%X, OEMID:0x%X \n",
-+                       pDevice->pId[0].SDMMC_ManfacturerID, pDevice->pId[0].SDMMC_OEMApplicationID));
-+        }
-+            /* re-select card */
-+        status = SelectDeselectCard(pDevice->pHcd,TRUE);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to re-select card after getting CID \n"));
-+            break;
-+        }
-+    } while (FALSE);
-+
-+    if (pReq != NULL) {
-+        FreeRequest(pReq);
-+    }
-+
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  SDQuerySDIOInfo - query SDIO card info
-+  Input:  pDevice - the device
-+  Output:
-+  Return:
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS SDQuerySDIOInfo(PSDDEVICE pDevice)
-+{
-+    SDIO_STATUS     status = SDIO_STATUS_SUCCESS;
-+    UINT32          faddress;
-+    UINT8           fInfo;
-+    UINT32          nextTpl;
-+    UINT8           tplLength;
-+    UINT8           cisPtrBuffer[3];
-+    struct SDIO_FUNC_EXT_FUNCTION_TPL_1_1 funcTuple;
-+
-+        /* use the card-wide SDIO manufacturer code and ID previously read.*/
-+    pDevice->pId[0].SDIO_ManufacturerCode = pDevice->pHcd->CardProperties.SDIO_ManufacturerCode;
-+    pDevice->pId[0].SDIO_ManufacturerID = pDevice->pHcd->CardProperties.SDIO_ManufacturerID;
-+
-+        /* calculate function base address */
-+    faddress = CalculateFBROffset(SDDEVICE_GET_SDIO_FUNCNO(pDevice));
-+    DBG_ASSERT(faddress != 0);
-+
-+    do {
-+        status = Cmd52ReadByteCommon(pDevice,
-+                                     FBR_FUNC_INFO_REG_OFFSET(faddress),
-+                                     &fInfo);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to get function info, Err:%d , using Class:UNKNOWN\n", status));
-+            fInfo = 0;
-+            pDevice->pId[0].SDIO_FunctionClass = 0;
-+            status = SDIO_STATUS_SUCCESS;
-+        } else {
-+            pDevice->pId[0].SDIO_FunctionClass = fInfo & FUNC_INFO_DEVICE_CODE_MASK;
-+        }
-+
-+        if ((FUNC_INFO_DEVICE_CODE_LAST == pDevice->pId[0].SDIO_FunctionClass) &&
-+            SDDEVICE_IS_SDIO_REV_GTEQ_1_10(pDevice)) {
-+                /* if the device code is the last one, check for 1.1 revision and get the
-+                 * extended code */
-+            status = Cmd52ReadByteCommon(pDevice,
-+                                         FBR_FUNC_EXT_DEVICE_CODE_OFFSET(faddress),
-+                                         &(pDevice->pId[0].SDIO_FunctionClass));
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to get 1.1 extended DC, Err:%d\n",
-+                                        status));
-+                break;
-+            }
-+        }
-+
-+            /* get the function CIS ptr */
-+        status = Cmd52ReadMultipleCommon(pDevice,
-+                                         FBR_FUNC_CIS_LOW_OFFSET(faddress),
-+                                         cisPtrBuffer,
-+                                         3);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to get FN CIS ptr, Err:%d\n", status));
-+            break;
-+        }
-+            /* endian safe */
-+        pDevice->DeviceInfo.AsSDIOInfo.FunctionCISPtr = ((UINT32)cisPtrBuffer[0]) |
-+                                                        (((UINT32)cisPtrBuffer[1]) << 8) |
-+                                                        (((UINT32)cisPtrBuffer[2]) << 16);
-+
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Function:%d, Class:%d FnCISPtr:0x%X \n",
-+                  SDDEVICE_GET_SDIO_FUNCNO(pDevice),
-+                  pDevice->pId[0].SDIO_FunctionClass,pDevice->DeviceInfo.AsSDIOInfo.FunctionCISPtr));
-+
-+        if (fInfo & FUNC_INFO_SUPPORTS_CSA_MASK) {
-+               /* get the function CSA ptr */
-+            status = Cmd52ReadMultipleCommon(pDevice,
-+                                             FBR_FUNC_CSA_LOW_OFFSET(faddress),
-+                                             cisPtrBuffer,
-+                                             3);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to get FN CSA ptr, Err:%d \n", status));
-+                break;
-+            }
-+                /* endian safe */
-+            pDevice->DeviceInfo.AsSDIOInfo.FunctionCSAPtr = ((UINT32)cisPtrBuffer[0]) |
-+                                                            (((UINT32)cisPtrBuffer[1]) << 8) |
-+                                                            (((UINT32)cisPtrBuffer[2]) << 16);
-+
-+        }
-+
-+        nextTpl = SDDEVICE_GET_SDIO_FUNC_CISPTR(pDevice);
-+            /* look for the funce TPL */
-+        tplLength = sizeof(funcTuple);
-+            /* go get the func CE tuple */
-+        status = SDLIB_FindTuple(pDevice,
-+                                 CISTPL_FUNCE,
-+                                 &nextTpl,
-+                                 (PUINT8)&funcTuple,
-+                                 &tplLength);
-+
-+        if (!SDIO_SUCCESS(status)){
-+            /* handles case of bad CIS or missing tupple, allow function driver to handle */
-+            DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: Failed to get FuncCE Tuple: %d \n", status));
-+            status = SDIO_STATUS_SUCCESS;
-+            break;
-+        }
-+            /* set the max block size */
-+        pDevice->DeviceInfo.AsSDIOInfo.FunctionMaxBlockSize =
-+                                CT_LE16_TO_CPU_ENDIAN(funcTuple.CommonInfo.MaxBlockSize);
-+
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Function:%d, MaxBlocks:%d \n",
-+                  SDDEVICE_GET_SDIO_FUNCNO(pDevice),
-+                  pDevice->DeviceInfo.AsSDIOInfo.FunctionMaxBlockSize));
-+
-+            /* check for MANFID function tuple (SDIO 1.1 or greater) */
-+        if (SDDEVICE_IS_SDIO_REV_GTEQ_1_10(pDevice)) {
-+            struct SDIO_MANFID_TPL      manfid;
-+            nextTpl = SDDEVICE_GET_SDIO_FUNC_CISPTR(pDevice);
-+            tplLength = sizeof(manfid);
-+                /* get the MANFID tuple */
-+            status = SDLIB_FindTuple(pDevice,
-+                                     CISTPL_MANFID,
-+                                     &nextTpl,
-+                                     (PUINT8)&manfid,
-+                                     &tplLength);
-+            if (SDIO_SUCCESS(status)) {
-+                    /* this function has a MANFID tuple */
-+                pDevice->pId[0].SDIO_ManufacturerCode =
-+                                        CT_LE16_TO_CPU_ENDIAN(manfid.ManufacturerCode);
-+                pDevice->pId[0].SDIO_ManufacturerID =
-+                                        CT_LE16_TO_CPU_ENDIAN(manfid.ManufacturerInfo);
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO 1.1 (Function Specific) MANFID:0x%X, MANFINFO:0x%X \n",
-+                                        pDevice->pId[0].SDIO_ManufacturerID,
-+                                        pDevice->pId[0].SDIO_ManufacturerCode));
-+            } else {
-+                DBG_PRINT(SDDBG_WARN, ("SDIO 1.1, No CISTPL_MANFID Tuple in FUNC CIS \n"));
-+                status = SDIO_STATUS_SUCCESS;
-+            }
-+        }
-+    } while (FALSE);
-+
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  SDEnableFunction - enable function
-+  Input:  pDevice - the device/function
-+          pEnData - enable data;
-+  Output:
-+  Return: status
-+  Notes: Note, this performs synchronous calls
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS SDEnableFunction(PSDDEVICE pDevice, PSDCONFIG_FUNC_ENABLE_DISABLE_DATA pEnData)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    UINT8       registerValue;
-+    UINT8       mask;
-+    FUNC_ENABLE_TIMEOUT  retry;
-+
-+        /* take the configure op lock to make this atomic */
-+    status = SemaphorePendInterruptable(&pDevice->pHcd->ConfigureOpsSem);
-+    if (!SDIO_SUCCESS(status)) {
-+        return status;
-+    }
-+
-+    status = SDIO_STATUS_INVALID_PARAMETER;
-+    do {
-+        if (!(pDevice->pHcd->CardProperties.Flags & CARD_SDIO)){
-+                /* nothing to do if it's not an SDIO card */
-+            break;
-+        }
-+
-+        if (!((SDDEVICE_GET_SDIO_FUNCNO(pDevice) >= SDIO_FIRST_FUNCTION_NUMBER) &&
-+              (SDDEVICE_GET_SDIO_FUNCNO(pDevice) <= SDIO_LAST_FUNCTION_NUMBER))){
-+            DBG_ASSERT(FALSE);
-+            break;
-+        }
-+            /* make sure there is a timeout value */
-+        if (0 == pEnData->TimeOut) {
-+            break;
-+        }
-+
-+        mask = 1 << SDDEVICE_GET_SDIO_FUNCNO(pDevice);
-+            /* read the enable register */
-+        status = Cmd52ReadByteCommon(pDevice, SDIO_ENABLE_REG, &registerValue);
-+        if (!SDIO_SUCCESS(status)){
-+            break;
-+        }
-+        if (pEnData->EnableFlags & SDCONFIG_ENABLE_FUNC) {
-+                /* set the enable register bit */
-+            registerValue |= mask;
-+        } else {
-+               /* clear the bit */
-+            registerValue &= ~mask;
-+        }
-+
-+        DBG_PRINT(SDDBG_TRACE,
-+                ("SDIO Bus Driver %s Function, Mask:0x%X Enable Reg Value:0x%2.2X\n",
-+                 (pEnData->EnableFlags & SDCONFIG_ENABLE_FUNC) ? "Enabling":"Disabling",
-+                 mask,
-+                 registerValue));
-+
-+            /* write it back out */
-+        status = Cmd52WriteByteCommon(pDevice, SDIO_ENABLE_REG, &registerValue);
-+        if (!SDIO_SUCCESS(status)){
-+            break;
-+        }
-+            /* now poll the ready bit until it sets or clears */
-+        retry = pEnData->TimeOut;
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Function Enable/Disable Polling: %d retries \n",
-+                                retry));
-+        while (retry) {
-+            status = Cmd52ReadByteCommon(pDevice, SDIO_READY_REG, &registerValue);
-+            if (!SDIO_SUCCESS(status)){
-+                break;
-+            }
-+            if (pEnData->EnableFlags & SDCONFIG_ENABLE_FUNC) {
-+                    /* if the bit is set, the device is ready */
-+                if (registerValue & mask) {
-+                        /* device ready */
-+                    break;
-+                }
-+            } else {
-+                if (!(registerValue & mask)) {
-+                        /* device is no longer ready */
-+                    break;
-+                }
-+            }
-+                /* sleep before trying again */
-+            status = OSSleep(1);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("OSSleep Failed! \n"));
-+                break;
-+            }
-+            retry--;
-+        }
-+
-+        if (0 == retry) {
-+            status = SDIO_STATUS_FUNC_ENABLE_TIMEOUT;
-+            break;
-+        }
-+
-+    } while (FALSE);
-+
-+    SemaphorePost(&pDevice->pHcd->ConfigureOpsSem);
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  SDAllocFreeSlotCurrent - allocate or free slot current
-+  Input:  pDevice - the device/function
-+          Allocate - Allocate current, else free
-+          pData - slotcurrent data (non-NULL if Allocate is TRUE)
-+  Output:
-+  Return: status
-+  Notes:  if the function returns SDIO_STATUS_NO_RESOURCES, the pData->SlotCurrent field is
-+          updated with the available current
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS SDAllocFreeSlotCurrent(PSDDEVICE pDevice, BOOL Allocate, PSDCONFIG_FUNC_SLOT_CURRENT_DATA pData)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: SDAllocFreeSlotCurrent\n"));
-+
-+        /* take the configure op lock to make this atomic */
-+    status = SemaphorePendInterruptable(&pDevice->pHcd->ConfigureOpsSem);
-+    if (!SDIO_SUCCESS(status)) {
-+        return status;
-+    }
-+
-+    status = SDIO_STATUS_INVALID_PARAMETER;
-+    do {
-+            /* check the current budget and allocate */
-+        if (Allocate) {
-+            if (0 == pData->SlotCurrent) {
-+                /* caller must specify current requirement for the power mode */
-+                break;
-+            }
-+            if (pDevice->SlotCurrentAlloc != 0) {
-+               /* slot current has already been allocated, caller needs to free
-+                * first */
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Slot Current Already allocated! \n"));
-+                break;
-+            }
-+            if (((UINT32)pDevice->pHcd->SlotCurrentAllocated + (UINT32)pData->SlotCurrent) >
-+                (UINT32)pDevice->pHcd->MaxSlotCurrent) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Slot Current Budget exceeded, Requesting: %d, Allocated already: %d, Max: %d \n",
-+                            pData->SlotCurrent, pDevice->pHcd->SlotCurrentAllocated,
-+                            pDevice->pHcd->MaxSlotCurrent));
-+                status = SDIO_STATUS_NO_RESOURCES;
-+                    /* return remaining */
-+                pData->SlotCurrent = pDevice->pHcd->MaxSlotCurrent -
-+                                     pDevice->pHcd->SlotCurrentAllocated;
-+                break;
-+            }
-+                /* bump up allocation */
-+            pDevice->pHcd->SlotCurrentAllocated += pData->SlotCurrent;
-+                /* save this off for the call to free slot current */
-+            pDevice->SlotCurrentAlloc = pData->SlotCurrent;
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Slot Current Requested: %d, New Total: %d, Max: %d \n",
-+                            pData->SlotCurrent, pDevice->pHcd->SlotCurrentAllocated,
-+                            pDevice->pHcd->MaxSlotCurrent));
-+
-+        } else {
-+            if (0 == pDevice->SlotCurrentAlloc) {
-+                    /* no allocation */
-+                break;
-+            }
-+                /* return the allocation back */
-+            if (pDevice->SlotCurrentAlloc <= pDevice->pHcd->SlotCurrentAllocated) {
-+                pDevice->pHcd->SlotCurrentAllocated -= pDevice->SlotCurrentAlloc;
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Slot Current Freed: %d, New Total: %d, Max: %d \n",
-+                            pDevice->SlotCurrentAlloc, pDevice->pHcd->SlotCurrentAllocated,
-+                            pDevice->pHcd->MaxSlotCurrent));
-+            } else {
-+                DBG_ASSERT(FALSE);
-+            }
-+
-+                /* make sure this is zeroed */
-+            pDevice->SlotCurrentAlloc = 0;
-+        }
-+
-+        status = SDIO_STATUS_SUCCESS;
-+
-+    } while (FALSE);
-+
-+    SemaphorePost(&pDevice->pHcd->ConfigureOpsSem);
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: SDAllocFreeSlotCurrent, %d\n", status));
-+    return status;
-+}
-+
-+static void RawHcdIrqControl(PSDHCD pHcd, BOOL Enable)
-+{
-+    SDIO_STATUS status;
-+    SDCONFIG_SDIO_INT_CTRL_DATA irqData;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    ZERO_OBJECT(irqData);
-+
-+    status = _AcquireHcdLock(pHcd);
-+    if (!SDIO_SUCCESS(status)) {
-+        return;
-+    }
-+
-+    do {
-+            /* for raw devices, we simply enable/disable in the HCD only */
-+        if (Enable) {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver (RAW) Unmasking Int \n"));
-+            irqData.IRQDetectMode = IRQ_DETECT_RAW;
-+            irqData.SlotIRQEnable = TRUE;
-+        } else {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver (RAW) Masking Int \n"));
-+            irqData.SlotIRQEnable = FALSE;
-+        }
-+
-+        status = _IssueConfig(pHcd,SDCONFIG_SDIO_INT_CTRL,
-+                              (PVOID)&irqData, sizeof(irqData));
-+
-+        if (!SDIO_SUCCESS(status)){
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver failed to enable/disable IRQ in (RAW) hcd :%d\n",
-+                                    status));
-+        }
-+
-+    } while (FALSE);
-+
-+    status = _ReleaseHcdLock(pHcd);
-+}
-+
-+static void RawHcdEnableIrqPseudoComplete(PSDREQUEST pReq)
-+{
-+    if (SDIO_SUCCESS(pReq->Status)) {
-+        RawHcdIrqControl((PSDHCD)pReq->pCompleteContext, TRUE);
-+    }
-+    FreeRequest(pReq);
-+}
-+
-+static void RawHcdDisableIrqPseudoComplete(PSDREQUEST pReq)
-+{
-+    RawHcdIrqControl((PSDHCD)pReq->pCompleteContext, FALSE);
-+    FreeRequest(pReq);
-+}
-+
-+static void HcdIrqControl(PSDHCD pHcd, BOOL Enable)
-+{
-+    SDIO_STATUS                 status;
-+    SDCONFIG_SDIO_INT_CTRL_DATA irqData;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    ZERO_OBJECT(irqData);
-+
-+    status = _AcquireHcdLock(pHcd);
-+    if (!SDIO_SUCCESS(status)) {
-+        return;
-+    }
-+
-+    do {
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: HcdIrqControl (%s), IrqsEnabled:0x%X \n",
-+                        Enable ? "Enable":"Disable",pHcd->IrqsEnabled ));
-+
-+        if (Enable) {
-+            irqData.SlotIRQEnable = TRUE;
-+        } else {
-+            irqData.SlotIRQEnable = FALSE;
-+        }
-+                /* setup HCD to enable/disable it's detection hardware */
-+        if (irqData.SlotIRQEnable) {
-+                /* set the IRQ detection mode */
-+            switch (SDCONFIG_GET_BUSWIDTH(pHcd->CardProperties.BusMode)) {
-+                case SDCONFIG_BUS_WIDTH_SPI:
-+                    irqData.IRQDetectMode = IRQ_DETECT_SPI;
-+                    break;
-+                case SDCONFIG_BUS_WIDTH_1_BIT:
-+                    irqData.IRQDetectMode = IRQ_DETECT_1_BIT;
-+                    break;
-+                case SDCONFIG_BUS_WIDTH_4_BIT:
-+                    irqData.IRQDetectMode = IRQ_DETECT_4_BIT;
-+                        /* check card and HCD for 4bit multi-block interrupt support */
-+                    if ((pHcd->CardProperties.SDIOCaps & SDIO_CAPS_INT_MULTI_BLK) &&
-+                        (pHcd->Attributes & SDHCD_ATTRIB_MULTI_BLK_IRQ)) {
-+                            /* note: during initialization of the card, the mult-blk IRQ support
-+                             * is enabled in card caps register */
-+                        irqData.IRQDetectMode |= IRQ_DETECT_MULTI_BLK;
-+                        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver enabling IRQ in multi-block mode:\n"));
-+                    }
-+                    break;
-+                default:
-+                    DBG_ASSERT(FALSE);
-+                    break;
-+            }
-+
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver enabling IRQ in HCD Mode:0x%X\n",
-+                                     irqData.IRQDetectMode));
-+        }
-+
-+        status = _IssueConfig(pHcd,SDCONFIG_SDIO_INT_CTRL,
-+                                (PVOID)&irqData, sizeof(irqData));
-+        if (!SDIO_SUCCESS(status)){
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver failed to enable/disable IRQ in hcd %d\n",
-+                                    status));
-+        }
-+
-+    } while (FALSE);
-+
-+    status = _ReleaseHcdLock(pHcd);
-+}
-+
-+static BOOL CheckWriteIntEnableSuccess(PSDREQUEST pReq)
-+{
-+    if (!SDIO_SUCCESS(pReq->Status)){
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to get write INT Enable register Err:%d\n",
-+                                     pReq->Status));
-+        return FALSE;
-+    }
-+
-+    if (SD_R5_GET_RESP_FLAGS(pReq->Response) & SD_R5_ERRORS) {
-+       DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: WriteIntEnableComplete CMD52 resp error: 0x%X \n",
-+                  SD_R5_GET_RESP_FLAGS(pReq->Response)));
-+        return FALSE;
-+    }
-+
-+    return TRUE;
-+}
-+
-+static void HcdIrqEnableComplete(PSDREQUEST pReq)
-+{
-+    if (CheckWriteIntEnableSuccess(pReq)) {
-+            /* configure HCD */
-+        HcdIrqControl((PSDHCD)pReq->pCompleteContext, TRUE);
-+    }
-+    FreeRequest(pReq);
-+}
-+
-+static void HcdIrqDisableComplete(PSDREQUEST pReq)
-+{
-+    CheckWriteIntEnableSuccess(pReq);
-+    HcdIrqControl((PSDHCD)pReq->pCompleteContext, FALSE);
-+    FreeRequest(pReq);
-+}
-+
-+static void WriteIntEnableComplete(PSDREQUEST pReq)
-+{
-+   if (CheckWriteIntEnableSuccess(pReq)) {
-+       DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Wrote INT Enable value:0x%X \n",
-+                    (INT)pReq->pCompleteContext));
-+   }
-+   FreeRequest(pReq);
-+}
-+
-+static void HcdAckComplete(PSDREQUEST pReq)
-+{
-+    SDIO_STATUS status;
-+    DBG_PRINT(SDIODBG_FUNC_IRQ, ("SDIO Bus Driver: Hcd (0x%X) Irq Ack \n",
-+                    (INT)pReq->pCompleteContext));
-+        /* re-arm the HCD */
-+    status = _IssueConfig((PSDHCD)pReq->pCompleteContext,SDCONFIG_SDIO_REARM_INT,NULL,0);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: HCD Re-Arm failed : %d\n",
-+                    status));
-+    }
-+    FreeRequest(pReq);
-+}
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  SDFunctionAckInterrupt - handle device interrupt acknowledgement
-+  Input:  pDevice - the device
-+  Output:
-+  Return:
-+  Notes:
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS SDFunctionAckInterrupt(PSDDEVICE pDevice)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    UCHAR       mask;
-+    PSDREQUEST  pReq = NULL;
-+    BOOL        setHcd = FALSE;
-+    SDIO_STATUS status2;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    pReq = AllocateRequest();
-+    if (NULL == pReq) {
-+        return SDIO_STATUS_NO_RESOURCES;
-+    }
-+
-+    status = _AcquireHcdLock(pDevice->pHcd);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        FreeRequest(pReq);
-+        return status;
-+    }
-+
-+    do {
-+        if (!((SDDEVICE_GET_SDIO_FUNCNO(pDevice) >= SDIO_FIRST_FUNCTION_NUMBER) &&
-+              (SDDEVICE_GET_SDIO_FUNCNO(pDevice) <= SDIO_LAST_FUNCTION_NUMBER))){
-+            status = SDIO_STATUS_INVALID_PARAMETER;
-+            DBG_ASSERT(FALSE);
-+            break;
-+        }
-+        mask = 1 << SDDEVICE_GET_SDIO_FUNCNO(pDevice);
-+        if (pDevice->pHcd->PendingIrqAcks & mask) {
-+                /* clear the ack bit in question */
-+            pDevice->pHcd->PendingIrqAcks &= ~mask;
-+            if (0 == pDevice->pHcd->PendingIrqAcks) {
-+                pDevice->pHcd->IrqProcState = SDHCD_IDLE;
-+                    /* no pending acks, so re-arm if irqs are stilled enabled */
-+                if (pDevice->pHcd->IrqsEnabled) {
-+                    setHcd = TRUE;
-+                        /* issue pseudo request to sync this with bus requests */
-+                    pReq->Status = SDIO_STATUS_SUCCESS;
-+                    pReq->pCompletion = HcdAckComplete;
-+                    pReq->pCompleteContext = pDevice->pHcd;
-+                    pReq->Flags = SD_PSEUDO_REQ_FLAGS;
-+                }
-+            }
-+        } else {
-+            DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: AckInterrupt: no IRQ pending on Function :%d, \n",
-+                        SDDEVICE_GET_SDIO_FUNCNO(pDevice)));
-+        }
-+    } while (FALSE);
-+
-+    status2 = ReleaseHcdLock(pDevice);
-+
-+    if (pReq != NULL) {
-+        if (SDIO_SUCCESS(status) && (setHcd)) {
-+                /* issue request */
-+            IssueRequestToHCD(pDevice->pHcd,pReq);
-+        } else {
-+            FreeRequest(pReq);
-+        }
-+    }
-+
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  SDMaskUnmaskFunctionIRQ - mask/unmask function IRQ
-+  Input:  pDevice - the device/function
-+          MaskInt - mask interrupt
-+  Output:
-+  Return: status
-+  Notes:  Note, this function can be called from an ISR or completion context
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS SDMaskUnmaskFunctionIRQ(PSDDEVICE pDevice, BOOL MaskInt)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    UINT8       mask;
-+    UINT8       controlVal;
-+    BOOL        setHcd;
-+    PSDREQUEST  pReq = NULL;
-+    SDIO_STATUS status2;
-+
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    setHcd = FALSE;
-+
-+    pReq = AllocateRequest();
-+    if (NULL == pReq) {
-+        return SDIO_STATUS_NO_RESOURCES;
-+    }
-+
-+    status = _AcquireHcdLock(pDevice->pHcd);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        FreeRequest(pReq);
-+        return status;
-+    }
-+
-+    do {
-+
-+        if (pDevice->pHcd->CardProperties.Flags & CARD_RAW) {
-+            if (!MaskInt) {
-+                if (!pDevice->pHcd->IrqsEnabled) {
-+                    pReq->pCompletion = RawHcdEnableIrqPseudoComplete;
-+                    setHcd = TRUE;
-+                    pDevice->pHcd->IrqsEnabled = 1 << 1;
-+                }
-+            } else {
-+                if (pDevice->pHcd->IrqsEnabled) {
-+                    pReq->pCompletion = RawHcdDisableIrqPseudoComplete;
-+                    setHcd = TRUE;
-+                    pDevice->pHcd->IrqsEnabled = 0;
-+                }
-+            }
-+
-+            if (setHcd) {
-+                    /* hcd IRQ control requests must be synched with outstanding
-+                     * bus requests so we issue a pseudo bus request  */
-+                pReq->pCompleteContext = pDevice->pHcd;
-+                pReq->Flags = SD_PSEUDO_REQ_FLAGS;
-+                pReq->Status = SDIO_STATUS_SUCCESS;
-+            } else {
-+                    /* no request to submit, just free it */
-+                FreeRequest(pReq);
-+                pReq = NULL;
-+            }
-+                /* we're done, submit the bus request if any */
-+            break;
-+        }
-+
-+        if (!(pDevice->pHcd->CardProperties.Flags & CARD_SDIO)){
-+                /* nothing to do if it's not an SDIO card */
-+            DBG_ASSERT(FALSE);
-+            status = SDIO_STATUS_INVALID_PARAMETER;
-+            break;
-+        }
-+
-+        if (!((SDDEVICE_GET_SDIO_FUNCNO(pDevice) >= SDIO_FIRST_FUNCTION_NUMBER) &&
-+              (SDDEVICE_GET_SDIO_FUNCNO(pDevice) <= SDIO_LAST_FUNCTION_NUMBER))){
-+            status = SDIO_STATUS_INVALID_PARAMETER;
-+            DBG_ASSERT(FALSE);
-+            break;
-+        }
-+
-+        mask = 1 << SDDEVICE_GET_SDIO_FUNCNO(pDevice);
-+        if (!MaskInt) {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver Unmasking Int, Mask:0x%X\n", mask));
-+                /* check interrupts that were enabled on entry */
-+            if (0 == pDevice->pHcd->IrqsEnabled) {
-+                    /* need to turn on interrupts in HCD */
-+                setHcd = TRUE;
-+                    /* use this completion routine */
-+                pReq->pCompletion = HcdIrqEnableComplete;
-+            }
-+                /* set the enable bit, in the shadow register */
-+            pDevice->pHcd->IrqsEnabled |= mask;
-+                /* make sure control value includes the master enable */
-+            controlVal = pDevice->pHcd->IrqsEnabled | SDIO_INT_MASTER_ENABLE;
-+        } else {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver Masking Int, Mask:0x%X\n", mask));
-+                /* clear the bit */
-+            pDevice->pHcd->IrqsEnabled &= ~mask;
-+                /* check and see if this clears all the bits */
-+            if (0 == pDevice->pHcd->IrqsEnabled){
-+                    /* if none of the functions are enabled, clear this register */
-+                controlVal = 0;
-+                    /* disable in host */
-+                setHcd = TRUE;
-+                    /* use this completion routine */
-+                pReq->pCompletion = HcdIrqDisableComplete;
-+            } else {
-+                    /* set control value making sure master enable is left on */
-+                controlVal = pDevice->pHcd->IrqsEnabled | SDIO_INT_MASTER_ENABLE;
-+            }
-+        }
-+
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver INT_ENABLE_REG value:0x%X\n", controlVal));
-+            /* setup bus request to update the mask register */
-+        SDIO_SET_CMD52_WRITE_ARG(pReq->Argument,0,SDIO_INT_ENABLE_REG,controlVal);
-+        pReq->Command = CMD52;
-+        pReq->Flags = SDREQ_FLAGS_TRANS_ASYNC | SDREQ_FLAGS_RESP_SDIO_R5;
-+
-+        if (setHcd) {
-+                /* make this a barrier request and set context*/
-+            pReq->Flags |= SDREQ_FLAGS_BARRIER;
-+            pReq->pCompleteContext = pDevice->pHcd;
-+        } else {
-+                /* does not require an update to the HCD  */
-+            pReq->pCompleteContext = (PVOID)(UINT32)controlVal;
-+            pReq->pCompletion = WriteIntEnableComplete;
-+        }
-+
-+    } while (FALSE);
-+
-+    status2 = _ReleaseHcdLock(pDevice->pHcd);
-+
-+    if (pReq != NULL) {
-+        if (SDIO_SUCCESS(status)) {
-+                /* issue request */
-+            IssueRequestToHCD(pDevice->pHcd,pReq);
-+        } else {
-+            FreeRequest(pReq);
-+        }
-+    }
-+
-+    return status;
-+}
-+
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  SDSPIModeEnableDisableCRC - Enable/Disable SPI Mode CRC checking
-+  Input:  pDevice - the device/function
-+          Enable - Enable CRC
-+  Output:
-+  Return: status
-+  Notes:  Note, this function can be called from an ISR or completion context
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS SDSPIModeEnableDisableCRC(PSDDEVICE pDevice,BOOL Enable)
-+{
-+    SDCONFIG_BUS_MODE_DATA busMode;
-+    SDIO_STATUS            status = SDIO_STATUS_SUCCESS;
-+    UINT32                 cmdARG = 0;
-+
-+    if (!SDDEVICE_IS_BUSMODE_SPI(pDevice)) {
-+        return SDIO_STATUS_INVALID_PARAMETER;
-+    }
-+       //??we should make these atomic using a barrier
-+
-+        /* get the current mode and clock */
-+    busMode.BusModeFlags = pDevice->pHcd->CardProperties.BusMode;
-+    busMode.ClockRate = pDevice->pHcd->CardProperties.OperBusClock;
-+
-+    if (Enable) {
-+            /* clear the no-CRC flag */
-+        busMode.BusModeFlags &= ~SDCONFIG_BUS_MODE_SPI_NO_CRC;
-+        cmdARG = SD_CMD59_CRC_ON;
-+    } else {
-+        busMode.BusModeFlags |= SDCONFIG_BUS_MODE_SPI_NO_CRC;
-+        cmdARG = SD_CMD59_CRC_OFF;
-+    }
-+
-+    do {
-+            /* issue CMD59 to turn on/off CRC */
-+        status = _IssueSimpleBusRequest(pDevice->pHcd,
-+                                        CMD59,
-+                                        cmdARG,
-+                                        SDREQ_FLAGS_RESP_R1,
-+                                        NULL);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed issue CMD59 (arg=0x%X) Err:%d \n",
-+                                    cmdARG, status));
-+            break;
-+        }
-+        if (Enable) {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: CRC Enabled in SPI mode \n"));
-+        } else {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: CRC Disabled in SPI mode \n"));
-+        }
-+        status = SetOperationalBusMode(pDevice,&busMode);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to set SPI NO CRC mode in hcd : Err:%d \n",
-+                                    status));
-+            break;
-+        }
-+    } while (FALSE);
-+
-+    return status;
-+}
-+
-+
-+static UINT32 ConvertSPIStatusToSDCardStatus(UINT8 SpiR1, UINT8 SpiR2)
-+{
-+    UINT32 cardStatus = 0;
-+
-+    if (SpiR1 != 0) {
-+            /* convert the error */
-+        if (SpiR1 & SPI_CS_ERASE_RESET) {
-+            cardStatus |= SD_CS_ERASE_RESET;
-+        }
-+        if (SpiR1 & SPI_CS_ILLEGAL_CMD) {
-+            cardStatus |= SD_CS_ILLEGAL_CMD_ERR;
-+        }
-+        if (SpiR1 & SPI_CS_CMD_CRC_ERR) {
-+            cardStatus |= SD_CS_PREV_CMD_CRC_ERR;
-+        }
-+        if (SpiR1 & SPI_CS_ERASE_SEQ_ERR) {
-+            cardStatus |= SD_CS_ERASE_SEQ_ERR;
-+        }
-+        if (SpiR1 & SPI_CS_ADDRESS_ERR) {
-+            cardStatus |= SD_CS_ADDRESS_ERR;
-+        }
-+        if (SpiR1 & SPI_CS_PARAM_ERR) {
-+            cardStatus |= SD_CS_CMD_OUT_OF_RANGE;
-+        }
-+    }
-+
-+    if (SpiR2 != 0) {
-+            /* convert the error */
-+        if (SpiR2 & SPI_CS_CARD_IS_LOCKED) {
-+            cardStatus |= SD_CS_CARD_LOCKED;
-+        }
-+        if (SpiR2 & SPI_CS_LOCK_UNLOCK_FAILED) {
-+                /* this bit is shared, just set both */
-+            cardStatus |= (SD_CS_LK_UNLK_FAILED | SD_CS_WP_ERASE_SKIP);
-+        }
-+        if (SpiR2 & SPI_CS_ERROR) {
-+            cardStatus |= SD_CS_GENERAL_ERR;
-+        }
-+        if (SpiR2 & SPI_CS_INTERNAL_ERROR) {
-+            cardStatus |= SD_CS_CARD_INTERNAL_ERR;
-+        }
-+        if (SpiR2 & SPI_CS_ECC_FAILED) {
-+            cardStatus |= SD_CS_ECC_FAILED;
-+        }
-+        if (SpiR2 & SPI_CS_WP_VIOLATION) {
-+            cardStatus |= SD_CS_WP_ERR;
-+        }
-+        if (SpiR2 & SPI_CS_ERASE_PARAM_ERR) {
-+            cardStatus |= SD_CS_ERASE_PARAM_ERR;
-+        }
-+        if (SpiR2 & SPI_CS_OUT_OF_RANGE) {
-+            cardStatus |= SD_CS_CMD_OUT_OF_RANGE;
-+        }
-+    }
-+
-+    return cardStatus;
-+}
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  ConvertSPI_Response - filter the SPI response and convert it to an SD Response
-+  Input:  pReq - request
-+  Output: pReq - modified response, if pRespBuffer is not NULL
-+          pRespBuffer - converted response (optional)
-+  Return:
-+  Notes:  This function converts a SPI response into an SD response.  A caller
-+          can supply a buffer instead.
-+          For SPI bus operation the HCD must send the SPI response as
-+          a stream of bytes, the highest byte contains the first received byte from the
-+          card.  This function only filters simple responses (R1 primarily).
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void ConvertSPI_Response(PSDREQUEST pReq, UINT8 *pRespBuffer)
-+{
-+
-+    UINT32  cardStatus;
-+
-+    if (pReq->Flags & SDREQ_FLAGS_RESP_SPI_CONVERTED) {
-+            /* already converted */
-+        return;
-+    }
-+    if (NULL == pRespBuffer) {
-+        pRespBuffer = pReq->Response;
-+    }
-+
-+    switch (GET_SDREQ_RESP_TYPE(pReq->Flags)) {
-+        case SDREQ_FLAGS_RESP_R1:
-+        case SDREQ_FLAGS_RESP_R1B:
-+            cardStatus = ConvertSPIStatusToSDCardStatus(GET_SPI_R1_RESP_TOKEN(pReq->Response),
-+                                                        0);
-+            if (CMD55 == pReq->Command) {
-+                    /* we emulate this since SPI does not have such a bit */
-+                cardStatus |= SD_CS_APP_CMD;
-+            }
-+                /* stuff the SD card status */
-+            SD_R1_SET_CMD_STATUS(pRespBuffer,cardStatus);
-+                /* stuff the command */
-+            SD_R1_SET_CMD(pRespBuffer,pReq->Command);
-+            pReq->Flags |= SDREQ_FLAGS_RESP_SPI_CONVERTED;
-+            break;
-+        case SDREQ_FLAGS_RESP_SDIO_R5:
-+            {
-+                UINT8 respFlags;
-+                UINT8 readData;
-+
-+                readData = GET_SPI_SDIO_R5_RESPONSE_RDATA(pReq->Response);
-+                respFlags = GET_SPI_SDIO_R5_RESP_TOKEN(pReq->Response);
-+
-+                pRespBuffer[SD_R5_RESP_FLAGS_OFFSET] = 0;
-+                if (respFlags != 0) {
-+                    if (respFlags & SPI_R5_ILLEGAL_CMD) {
-+                        pRespBuffer[SD_R5_RESP_FLAGS_OFFSET] |= SD_R5_ILLEGAL_CMD;
-+                    }
-+                    if (respFlags & SPI_R5_CMD_CRC) {
-+                        pRespBuffer[SD_R5_RESP_FLAGS_OFFSET] |= SD_R5_RESP_CMD_ERR;
-+                    }
-+                    if (respFlags & SPI_R5_FUNC_ERR) {
-+                        pRespBuffer[SD_R5_RESP_FLAGS_OFFSET] |= SD_R5_INVALID_FUNC;
-+                    }
-+                    if (respFlags & SPI_R5_PARAM_ERR) {
-+                        pRespBuffer[SD_R5_RESP_FLAGS_OFFSET] |= SD_R5_ARG_RANGE_ERR;
-+                    }
-+                }
-+                    /* stuff read data */
-+                pRespBuffer[SD_SDIO_R5_READ_DATA_OFFSET] = readData;
-+                    /* stuff the command */
-+                SD_R5_SET_CMD(pRespBuffer,pReq->Command);
-+            }
-+            pReq->Flags |= SDREQ_FLAGS_RESP_SPI_CONVERTED;
-+            break;
-+        case SDREQ_FLAGS_RESP_R2:
-+                /* for CMD13 and ACMD13 , SPI uses it's own R2 response format (2 bytes) */
-+                /* the issue of CMD13 needs to change the response flag to R2 */
-+            if (CMD13 == pReq->Command) {
-+                cardStatus = ConvertSPIStatusToSDCardStatus(
-+                                    GET_SPI_R2_RESP_TOKEN(pReq->Response),
-+                                    GET_SPI_R2_STATUS_TOKEN(pReq->Response));
-+                    /* stuff the SD card status */
-+                SD_R1_SET_CMD_STATUS(pRespBuffer,cardStatus);
-+                    /* stuff the command */
-+                SD_R1_SET_CMD(pRespBuffer,pReq->Command);
-+                pReq->Flags |= SDREQ_FLAGS_RESP_SPI_CONVERTED;
-+                break;
-+            }
-+                /* no other commands should be using R2 when using SPI, if they are
-+                 * they should be bypassing the filter  */
-+            DBG_ASSERT(FALSE);
-+            break;
-+        default:
-+                /* for all others:
-+                 *
-+                 * SDREQ_FLAGS_RESP_R6 - SPI mode does not use RCA
-+                 * SDREQ_FLAGS_RESP_R3 - bus driver handles this internally
-+                 * SDREQ_FLAGS_RESP_SDIO_R4 - bus driver handles this internally
-+                 *
-+                 */
-+            DBG_PRINT(SDDBG_ERROR, ("ConvertSPI_Response - invalid response type:0x%2.2X",
-+                                    GET_SDREQ_RESP_TYPE(pReq->Flags)));
-+            DBG_ASSERT(FALSE);
-+            break;
-+    }
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Check an SD/MMC/SDIO response.
-+
-+  @function name: SDIO_CheckResponse
-+  @prototype: SDIO_STATUS SDIO_CheckResponse(PSDHCD pHcd, PSDREQUEST pReq, SDHCD_RESPONSE_CHECK_MODE CheckMode)
-+  @category: HD_Reference
-+
-+  @input:  pHcd - the host controller definition structure.
-+  @input:  pReq - request containing the response
-+  @input:  CheckMode - mode
-+
-+  @return: SDIO_STATUS
-+
-+  @notes: Host controller drivers must call into this function to validate various command
-+          responses before continuing with data transfers or for decoding received SPI tokens.
-+          The CheckMode option determines the type of validation to perform.
-+          if (CheckMode == SDHCD_CHECK_DATA_TRANS_OK) :
-+             The host controller must check the card response to determine whether it
-+          is safe to perform a data transfer.  This API only checks commands that
-+          involve data transfers and checks various status fields in the command response.
-+          If the card cannot accept data, this function will return a non-successful status that
-+          should be treated as a request failure.  The host driver should complete the request with the
-+          returned status. Host controller should only call this function in preparation for a
-+          data transfer.
-+          if (CheckMode == SDHCD_CHECK_SPI_TOKEN) :
-+             This API checks the SPI token and returns a timeout status if the illegal command bit is
-+          set.  This simulates the behavior of SD 1/4 bit operation where illegal commands result in
-+          a command timeout.  A driver that supports SPI mode should pass every response to this
-+          function to determine the appropriate error status to complete the request with.  If the
-+          API returns success, the response indicates that the card accepted the command.
-+
-+  @example: Checking the response before starting the data transfer :
-+        if (SDIO_SUCCESS(status) && (pReq->Flags & SDREQ_FLAGS_DATA_TRANS)) {
-+                // check the response to see if we should continue with data
-+            status = SDIO_CheckResponse(pHcd, pReq, SDHCD_CHECK_DATA_TRANS_OK);
-+            if (SDIO_SUCCESS(status)) {
-+                .... start data transfer phase
-+            } else {
-+               ... card response indicates that the card cannot handle data
-+                  // set completion status
-+               pRequest->Status = status;
-+            }
-+        }
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  _SDIO_CheckResponse - check response on behalf of the host controller
-+  Input:  pHcd - host controller
-+          pReq - request containing the response
-+          CheckMode - mode
-+  Output:
-+  Return: status
-+  Notes:
-+
-+    CheckMode == SDHCD_CHECK_DATA_TRANS_OK :
-+    The host controller requests a check on the response to determine whether it
-+    is okay to perform a data transfer.  This function only filters on commands that
-+    involve data.  Host controller should only call this function in preparation for a
-+    data transfer.
-+
-+    CheckMode == SDHCD_CHECK_SPI_TOKEN :
-+    The bus driver checks the SPI token and returns a timeout status if the illegal command bit is
-+    set.  This simulates the behavior of SD native operation.
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _SDIO_CheckResponse(PSDHCD pHcd, PSDREQUEST pReq, SDHCD_RESPONSE_CHECK_MODE CheckMode)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+
-+    if (CheckMode == SDHCD_CHECK_DATA_TRANS_OK) {
-+        UINT32      cardStatus;
-+        UINT8       *pResponse;
-+        UINT8       convertedResponse[MAX_CARD_RESPONSE_BYTES];
-+
-+        if (!(pReq->Flags & SDREQ_FLAGS_DATA_TRANS) ||
-+             (pReq->Flags & SDREQ_FLAGS_DATA_SKIP_RESP_CHK) ||
-+             (GET_SDREQ_RESP_TYPE(pReq->Flags) ==  SDREQ_FLAGS_NO_RESP)) {
-+            return SDIO_STATUS_SUCCESS;
-+        }
-+        pResponse = pReq->Response;
-+            /* check SPI mode */
-+        if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+            if (!(pReq->Flags & SDREQ_FLAGS_RESP_SKIP_SPI_FILT)) {
-+                    /* apply conversion */
-+                ConvertSPI_Response(pReq, NULL);
-+            } else {
-+                    /* temporarily convert the response, without altering the original */
-+                ConvertSPI_Response(pReq, convertedResponse);
-+                    /* point to the converted one */
-+                pResponse = convertedResponse;
-+            }
-+        }
-+
-+        switch (GET_SDREQ_RESP_TYPE(pReq->Flags)) {
-+            case SDREQ_FLAGS_RESP_R1:
-+            case SDREQ_FLAGS_RESP_R1B:
-+                cardStatus = SD_R1_GET_CARD_STATUS(pResponse);
-+                if (!(cardStatus &
-+                     (SD_CS_ILLEGAL_CMD_ERR | SD_CS_CARD_INTERNAL_ERR | SD_CS_GENERAL_ERR))) {
-+                        /* okay for data */
-+                    break;
-+                }
-+                    /* figure out what it was */
-+                if (cardStatus & SD_CS_ILLEGAL_CMD_ERR) {
-+                    status = SDIO_STATUS_DATA_STATE_INVALID;
-+                } else {
-+                    status = SDIO_STATUS_DATA_ERROR_UNKNOWN;
-+                }
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Check Response Error. R1 CardStatus:0x%X \n",
-+                                        cardStatus));
-+                break;
-+            case SDREQ_FLAGS_RESP_SDIO_R5:
-+                cardStatus = SD_R5_GET_RESP_FLAGS(pResponse);
-+                if (!(cardStatus & SD_R5_CURRENT_CMD_ERRORS)){
-+                        /* all okay */
-+                    break;
-+                }
-+
-+                status = ConvertCMD52ResponseToSDIOStatus((UINT8)cardStatus);
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Check Response Error. R5 CardStatus:0x%X \n",
-+                                        cardStatus));
-+                break;
-+            default:
-+                break;
-+        }
-+
-+        return status;
-+    }
-+
-+    {
-+        UINT8       spiToken;
-+
-+            /* handle SPI token validation */
-+        switch (GET_SDREQ_RESP_TYPE(pReq->Flags)) {
-+            case SDREQ_FLAGS_RESP_R2:
-+                spiToken = GET_SPI_R2_RESP_TOKEN(pReq->Response);
-+                break;
-+            case SDREQ_FLAGS_RESP_SDIO_R5:
-+                spiToken = GET_SPI_SDIO_R5_RESP_TOKEN(pReq->Response);
-+                break;
-+            case SDREQ_FLAGS_RESP_R3:
-+                spiToken = GET_SPI_R3_RESP_TOKEN(pReq->Response);
-+                break;
-+            case SDREQ_FLAGS_RESP_SDIO_R4:
-+                spiToken = GET_SPI_SDIO_R4_RESP_TOKEN(pReq->Response);
-+                break;
-+            default:
-+                    /* all other tokesn are SPI R1 type */
-+                spiToken = GET_SPI_R1_RESP_TOKEN(pReq->Response);
-+                break;
-+        }
-+
-+        if ((GET_SDREQ_RESP_TYPE(pReq->Flags) == SDREQ_FLAGS_RESP_SDIO_R5) ||
-+            (GET_SDREQ_RESP_TYPE(pReq->Flags) == SDREQ_FLAGS_RESP_SDIO_R4)) {
-+                /* handle SDIO status tokens */
-+            if ((spiToken & SPI_R5_ILLEGAL_CMD) ||
-+                (spiToken & SPI_R5_CMD_CRC)) {
-+                status = SDIO_STATUS_BUS_RESP_TIMEOUT;
-+            }
-+        } else {
-+                /* handle all other status tokens */
-+            if ((spiToken & SPI_CS_ILLEGAL_CMD) ||
-+                (spiToken & SPI_CS_CMD_CRC_ERR)) {
-+                status = SDIO_STATUS_BUS_RESP_TIMEOUT;
-+            }
-+       }
-+    }
-+
-+    return status;
-+}
-+
-diff --git a/drivers/sdio/stack/busdriver/sdio_bus_os.c b/drivers/sdio/stack/busdriver/sdio_bus_os.c
-new file mode 100644
-index 0000000..dbdb955
---- /dev/null
-+++ b/drivers/sdio/stack/busdriver/sdio_bus_os.c
-@@ -0,0 +1,832 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdio_bus_os.c
-+
-+@abstract: Linux implementation module
-+
-+#notes: includes module load and unload functions
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+/* debug level for this module*/
-+#define DBG_DECLARE 3;
-+
-+#include <linux/sdio/ctsystem.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/version.h>
-+#include <linux/init.h>
-+#include <linux/workqueue.h>
-+#include <linux/delay.h>
-+#include <linux/kthread.h>
-+#include <linux/pnp.h>
-+void pnp_remove_card_device(struct pnp_dev *dev);
-+#include <linux/sdio/sdio_busdriver.h>
-+#include <linux/sdio/sdio_lib.h>
-+#include "_busdriver.h"
-+
-+#define DESCRIPTION "SDIO Bus Driver"
-+#define AUTHOR "Atheros Communications, Inc."
-+
-+/* debug print parameter */
-+/* configuration and default parameters */
-+static int RequestRetries = SDMMC_DEFAULT_CMD_RETRIES;
-+module_param(RequestRetries, int, 0644);
-+MODULE_PARM_DESC(RequestRetries, "number of command retries");
-+static int CardReadyPollingRetry = SDMMC_DEFAULT_CARD_READY_RETRIES;
-+module_param(CardReadyPollingRetry, int, 0644);
-+MODULE_PARM_DESC(CardReadyPollingRetry, "number of card ready retries");
-+static int PowerSettleDelay = SDMMC_POWER_SETTLE_DELAY;
-+module_param(PowerSettleDelay, int, 0644);
-+MODULE_PARM_DESC(PowerSettleDelay, "delay in ms for power to settle after power changes");
-+static int DefaultOperClock = 52000000;
-+module_param(DefaultOperClock, int, 0644);
-+MODULE_PARM_DESC(DefaultOperClock, "maximum operational clock limit");
-+static int DefaultBusMode = SDCONFIG_BUS_WIDTH_4_BIT;
-+module_param(DefaultBusMode, int, 0644);
-+MODULE_PARM_DESC(DefaultBusMode, "default bus mode: see SDCONFIG_BUS_WIDTH_xxx");
-+static int RequestListSize = SDBUS_DEFAULT_REQ_LIST_SIZE;
-+module_param(RequestListSize, int, 0644);
-+MODULE_PARM_DESC(RequestListSize, "");
-+static int SignalSemListSize = SDBUS_DEFAULT_REQ_SIG_SIZE;
-+module_param(SignalSemListSize, int, 0644);
-+MODULE_PARM_DESC(SignalSemListSize, "");
-+static int CDPollingInterval = SDBUS_DEFAULT_CD_POLLING_INTERVAL;
-+module_param(CDPollingInterval, int, 0644);
-+MODULE_PARM_DESC(CDPollingInterval, "");
-+static int DefaultOperBlockLen = SDMMC_DEFAULT_BYTES_PER_BLOCK;
-+module_param(DefaultOperBlockLen, int, 0644);
-+MODULE_PARM_DESC(DefaultOperBlockLen, "operational block length");
-+static int DefaultOperBlockCount = SDMMC_DEFAULT_BLOCKS_PER_TRANS;
-+module_param(DefaultOperBlockCount, int, 0644);
-+MODULE_PARM_DESC(DefaultOperBlockCount, "operational block count");
-+static int ConfigFlags = BD_DEFAULT_CONFIG_FLAGS;
-+module_param(ConfigFlags, int, 0644);
-+MODULE_PARM_DESC(ConfigFlags, "config flags");
-+
-+static int HcdRCount = MAX_HCD_REQ_RECURSION;
-+module_param(HcdRCount, int, 0644);
-+MODULE_PARM_DESC(HcdRCount, "HCD request recursion count");
-+
-+static void CardDetect_WorkItem(
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+void *context);
-+#else
-+struct work_struct *ignored);
-+#endif
-+static void CardDetect_TimerFunc(unsigned long Context);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+static DECLARE_WORK(CardDetectPollWork, CardDetect_WorkItem
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+, 0);
-+#else
-+);
-+#endif
-+#endif
-+static int RegisterDriver(PSDFUNCTION pFunction);
-+static int UnregisterDriver(PSDFUNCTION pFunction);
-+
-+static struct timer_list CardDetectTimer;
-+
-+#define SDDEVICE_FROM_OSDEVICE(pOSDevice)  container_of(pOSDevice, SDDEVICE, Device)
-+#define SDFUNCTION_FROM_OSDRIVER(pOSDriver)  container_of(pOSDriver, SDFUNCTION, Driver)
-+
-+
-+/*
-+ * SDIO_RegisterHostController - register a host controller bus driver
-+*/
-+SDIO_STATUS SDIO_RegisterHostController(PSDHCD pHcd) {
-+    /* we are the exported verison, call the internal verison */
-+    return _SDIO_RegisterHostController(pHcd);
-+}
-+
-+/*
-+ * SDIO_UnregisterHostController - unregister a host controller bus driver
-+*/
-+SDIO_STATUS SDIO_UnregisterHostController(PSDHCD pHcd) {
-+    /* we are the exported verison, call the internal verison */
-+    return _SDIO_UnregisterHostController(pHcd);
-+}
-+
-+/*
-+ * SDIO_RegisterFunction - register a function driver
-+*/
-+SDIO_STATUS SDIO_RegisterFunction(PSDFUNCTION pFunction) {
-+    int error;
-+    SDIO_STATUS status;
-+
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO BusDriver - SDIO_RegisterFunction\n"));
-+
-+        /* since we do PnP registration first, we need to check the version */
-+    if (!CHECK_FUNCTION_DRIVER_VERSION(pFunction)) {
-+        DBG_PRINT(SDDBG_ERROR,
-+           ("SDIO Bus Driver: Function Major Version Mismatch (hcd = %d, bus driver = %d)\n",
-+           GET_SDIO_STACK_VERSION_MAJOR(pFunction), CT_SDIO_STACK_VERSION_MAJOR(g_Version)));
-+        return SDIO_STATUS_INVALID_PARAMETER;
-+    }
-+
-+    /* we are the exported verison, call the internal verison after registering with the bus
-+       we handle probes internally to the bus driver */
-+    if ((error = RegisterDriver(pFunction)) < 0) {
-+        DBG_PRINT(SDDBG_ERROR,
-+            ("SDIO BusDriver - SDIO_RegisterFunction, failed to register with system bus driver: %d\n",
-+            error));
-+        status = OSErrorToSDIOError(error);
-+    } else {
-+        status = _SDIO_RegisterFunction(pFunction);
-+        if (!SDIO_SUCCESS(status)) {
-+            UnregisterDriver(pFunction);
-+        }
-+    }
-+
-+    return status;
-+}
-+
-+/*
-+ * SDIO_UnregisterFunction - unregister a function driver
-+*/
-+SDIO_STATUS SDIO_UnregisterFunction(PSDFUNCTION pFunction) {
-+    SDIO_STATUS status;
-+    /* we are the exported verison, call the internal verison */
-+    status = _SDIO_UnregisterFunction(pFunction);
-+    UnregisterDriver(pFunction);
-+    return  status;
-+}
-+
-+/*
-+ * SDIO_HandleHcdEvent - tell core an event occurred
-+*/
-+SDIO_STATUS SDIO_HandleHcdEvent(PSDHCD pHcd, HCD_EVENT Event) {
-+    /* we are the exported verison, call the internal verison */
-+    DBG_PRINT(SDIODBG_HCD_EVENTS, ("SDIO Bus Driver: SDIO_HandleHcdEvent, event type 0x%X, HCD:0x%X\n",
-+                         Event, (UINT)pHcd));
-+    return _SDIO_HandleHcdEvent(pHcd, Event);
-+}
-+
-+/* get default settings */
-+SDIO_STATUS _SDIO_BusGetDefaultSettings(PBDCONTEXT pBdc)
-+{
-+    /* these defaults are module params */
-+    pBdc->RequestRetries = RequestRetries;
-+    pBdc->CardReadyPollingRetry = CardReadyPollingRetry;
-+    pBdc->PowerSettleDelay = PowerSettleDelay;
-+    pBdc->DefaultOperClock = DefaultOperClock;
-+    pBdc->DefaultBusMode = DefaultBusMode;
-+    pBdc->RequestListSize = RequestListSize;
-+    pBdc->SignalSemListSize = SignalSemListSize;
-+    pBdc->CDPollingInterval = CDPollingInterval;
-+    pBdc->DefaultOperBlockLen = DefaultOperBlockLen;
-+    pBdc->DefaultOperBlockCount = DefaultOperBlockCount;
-+    pBdc->ConfigFlags = ConfigFlags;
-+    pBdc->MaxHcdRecursion = HcdRCount;
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+static void CardDetect_TimerFunc(unsigned long Context)
-+{
-+    DBG_PRINT(SDIODBG_CD_TIMER, ("+ SDIO BusDriver Card Detect Timer\n"));
-+
-+        /* timers run in an ISR context and cannot block or sleep, so we need
-+         * to queue a work item to call the bus driver timer notification */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+    if (schedule_work(&CardDetectPollWork) <= 0) {
-+        DBG_PRINT(SDDBG_ERROR, ("Failed to queue Card Detect timer!\n"));
-+    }
-+#else
-+    CardDetect_WorkItem(NULL);
-+#endif
-+    DBG_PRINT(SDIODBG_CD_TIMER, ("- SDIO BusDriver  Card Detect Timer\n"));
-+}
-+
-+/*
-+ * Initialize any timers we are using
-+*/
-+SDIO_STATUS InitializeTimers(void)
-+{
-+    init_timer(&CardDetectTimer);
-+    CardDetectTimer.function = CardDetect_TimerFunc;
-+    CardDetectTimer.data = 0;
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+/*
-+ * cleanup timers
-+*/
-+SDIO_STATUS CleanupTimers(void)
-+{
-+    del_timer(&CardDetectTimer);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+
-+/*
-+ * Queue a timer, Timeout is in milliseconds
-+*/
-+SDIO_STATUS QueueTimer(INT TimerID, UINT32 TimeOut)
-+{
-+    UINT32 delta;
-+
-+        /* convert timeout to ticks */
-+    delta = (TimeOut * HZ)/1000;
-+    if (delta == 0) {
-+        delta = 1;
-+    }
-+    DBG_PRINT(SDIODBG_CD_TIMER, ("SDIO BusDriver - SDIO_QueueTimer System Ticks Per Sec:%d \n",HZ));
-+    DBG_PRINT(SDIODBG_CD_TIMER, ("SDIO BusDriver - SDIO_QueueTimer TimerID: %d TimeOut:%d MS, requires %d Ticks\n",
-+                TimerID,TimeOut,delta));
-+    switch (TimerID) {
-+        case SDIOBUS_CD_TIMER_ID:
-+            CardDetectTimer.expires = jiffies + delta;
-+            add_timer(&CardDetectTimer);
-+            break;
-+        default:
-+            return SDIO_STATUS_INVALID_PARAMETER;
-+    }
-+
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+/* check a response on behalf of the host controller, to allow it to proceed with a
-+ * data transfer */
-+SDIO_STATUS SDIO_CheckResponse(PSDHCD pHcd, PSDREQUEST pReq, SDHCD_RESPONSE_CHECK_MODE CheckMode)
-+{
-+    return _SDIO_CheckResponse(pHcd,pReq,CheckMode);
-+}
-+
-+/*
-+ * CardDetect_WorkItem - the work item for handling card detect polling interrupt
-+*/
-+static void CardDetect_WorkItem(
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+void *context)
-+#else
-+struct work_struct *ignored)
-+#endif
-+{
-+        /* call bus driver function */
-+    SDIO_NotifyTimerTriggered(SDIOBUS_CD_TIMER_ID);
-+}
-+
-+/*
-+ * OS_IncHcdReference - increment host controller driver reference count
-+*/
-+SDIO_STATUS Do_OS_IncHcdReference(PSDHCD pHcd)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+
-+    do {
-+        if (NULL == pHcd->pModule) {
-+                /* hcds that are 2.3 or higher should set this */
-+            DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: HCD:%s should set module ptr!\n",
-+                (pHcd->pName != NULL) ? pHcd->pName : "Unknown"));
-+            break;
-+        }
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        if (!try_module_get(pHcd->pModule)) {
-+            status = SDIO_STATUS_ERROR;
-+        }
-+#else
-+        if (!try_inc_mod_count(pHcd->pModule)) {
-+            status = SDIO_STATUS_ERROR;
-+        }
-+#endif
-+
-+    } while (FALSE);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: HCD:%s failed to get module\n",
-+            (pHcd->pName != NULL) ? pHcd->pName : "Unknown"));
-+    }
-+
-+    return status;
-+}
-+
-+/*
-+ * OS_DecHcdReference - decrement host controller driver reference count
-+*/
-+SDIO_STATUS Do_OS_DecHcdReference(PSDHCD pHcd)
-+{
-+    if (pHcd->pModule != NULL) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        module_put(pHcd->pModule);
-+#else
-+            /* 2.4 or lower */
-+        __MOD_DEC_USE_COUNT(pHcd->pModule);
-+#endif
-+    }
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+/****************************************************************************************/
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#include <linux/pnp.h>
-+
-+#if !defined(CONFIG_PNP)
-+#error "CONFIG_PNP not defined"
-+#endif
-+
-+static ULONG InUseDevices = 0;
-+static spinlock_t InUseDevicesLock = SPIN_LOCK_UNLOCKED;
-+
-+static const struct pnp_device_id pnp_idtable[] = {
-+    {"SD_XXXX",  0}
-+};
-+static int sdio_get_resources(struct pnp_dev * pDev, struct pnp_resource_table * res)
-+{
-+    DBG_PRINT(SDDBG_TRACE,
-+        ("SDIO BusDriver - sdio_get_resources: %s\n",
-+        pDev->dev.bus_id));
-+    return 0;
-+}
-+static int sdio_set_resources(struct pnp_dev * pDev, struct pnp_resource_table * res)
-+{
-+    DBG_PRINT(SDDBG_TRACE,
-+        ("SDIO BusDriver - sdio_set_resources: %s\n",
-+        pDev->dev.bus_id));
-+    return 0;
-+}
-+
-+static int sdio_disable_resources(struct pnp_dev *pDev)
-+{
-+    DBG_PRINT(SDDBG_TRACE,
-+        ("SDIO BusDriver - sdio_disable_resources: %s\n",
-+        pDev->dev.bus_id));
-+    if (pDev != NULL) {
-+        pDev->active = 0;
-+    }
-+    return 0;
-+}
-+void    release(struct device * pDev) {
-+    DBG_PRINT(SDDBG_TRACE,
-+        ("SDIO BusDriver - release: %s\n",
-+        pDev->bus_id));
-+    return;
-+}
-+struct pnp_protocol sdio_protocol = {
-+    .name   = "SDIO",
-+    .get    = sdio_get_resources,
-+    .set    = sdio_set_resources,
-+    .disable = sdio_disable_resources,
-+    .dev.release = release,
-+};
-+
-+/*
-+ * driver_probe - probe for OS based driver
-+*/
-+static int driver_probe(struct pnp_dev* pOSDevice, const struct pnp_device_id *pId)
-+{
-+    PSDDEVICE pDevice = SDDEVICE_FROM_OSDEVICE(pOSDevice);
-+    PSDFUNCTION pFunction = pDevice->Device.dev.driver_data;
-+
-+    if (pFunction == NULL) {
-+        return -1;
-+    }
-+
-+    if (strcmp(pFunction->pName, pOSDevice->dev.driver->name) == 0) {
-+        DBG_PRINT(SDDBG_TRACE,
-+            ("SDIO BusDriver - driver_probe, match: %s/%s driver: %s\n",
-+            pOSDevice->dev.bus_id, pFunction->pName, pOSDevice->dev.driver->name));
-+        return 1;
-+    } else {
-+        DBG_PRINT(SDDBG_TRACE,
-+            ("SDIO BusDriver - driver_probe, no match: %s/%s driver: %s\n",
-+            pOSDevice->dev.bus_id, pFunction->pName, pOSDevice->dev.driver->name));
-+        return -1;
-+    }
-+/*    if (pOSDevice->id != NULL) {
-+        if (strcmp(pOSDevice->id->id, pId->id) == 0) {
-+            DBG_PRINT(SDDBG_TRACE,
-+                ("SDIO BusDriver - driver_probe, match: %s/%s\n",
-+                pOSDevice->dev.bus_id, pId->id));
-+            return 1;
-+        }
-+        DBG_PRINT(SDDBG_TRACE,
-+            ("SDIO BusDriver - driver_probe, did not match: %s/%s/%s\n",
-+            pOSDevice->dev.bus_id, pId->id, pOSDevice->id->id));
-+    } else {
-+        DBG_PRINT(SDDBG_TRACE,
-+            ("SDIO BusDriver - driver_probe, did not match: %s/%s\n",
-+            pOSDevice->dev.bus_id, pId->id));
-+    }
-+    return -1;
-+*/
-+//??    if (pDevice->Device.dev.driver_data != NULL) {
-+//??        if (pDevice->Device.dev.driver_data == pFunction) {
-+//??    if (pDevice->Device.data != NULL) {
-+//??        if (pDevice->Device.data == pFunction) {
-+//??            DBG_PRINT(SDDBG_TRACE,
-+//??                ("SDIO BusDriver - driver_probe, match: %s\n",
-+//??                pOSDevice->dev.bus_id));
-+//??            return 1;
-+//??        }
-+//??    }
-+   DBG_PRINT(SDDBG_TRACE,
-+        ("SDIO BusDriver - driver_probe,  match: %s\n",
-+        pOSDevice->dev.bus_id));
-+    return 1;
-+}
-+
-+static int RegisterDriver(PSDFUNCTION pFunction)
-+{
-+    memset(&pFunction->Driver, 0, sizeof(pFunction->Driver));
-+    pFunction->Driver.name = pFunction->pName;
-+    pFunction->Driver.probe = driver_probe;
-+    pFunction->Driver.id_table = pnp_idtable;
-+    pFunction->Driver.flags = PNP_DRIVER_RES_DO_NOT_CHANGE;
-+
-+    DBG_PRINT(SDDBG_TRACE,
-+            ("SDIO BusDriver - SDIO_RegisterFunction, registering driver: %s\n",
-+            pFunction->Driver.name));
-+    return pnp_register_driver(&pFunction->Driver);
-+}
-+
-+static int UnregisterDriver(PSDFUNCTION pFunction)
-+{
-+    DBG_PRINT(SDDBG_TRACE,
-+            ("+SDIO BusDriver - UnregisterDriver, driver: %s\n",
-+            pFunction->Driver.name));
-+    pnp_unregister_driver(&pFunction->Driver);
-+    DBG_PRINT(SDDBG_TRACE,
-+            ("-SDIO BusDriver - UnregisterDriver\n"));
-+   return 0;
-+}
-+
-+/*
-+ * OS_InitializeDevice - initialize device that will be registered
-+*/
-+SDIO_STATUS OS_InitializeDevice(PSDDEVICE pDevice, PSDFUNCTION pFunction)
-+{
-+    struct pnp_id *pFdname;
-+    memset(&pDevice->Device, 0, sizeof(pDevice->Device));
-+    pDevice->Device.dev.driver_data = (PVOID)pFunction;
-+//??    pDevice->Device.data = (PVOID)pFunction;
-+//??    pDevice->Device.dev.driver = &pFunction->Driver.driver;
-+//??    pDevice->Device.driver = &pFunction->Driver;
-+//??    pDevice->Device.dev.release = release;
-+    /* get a unique device number, must be done with locks held */
-+    spin_lock(&InUseDevicesLock);
-+    pDevice->Device.number = FirstClearBit(&InUseDevices);
-+    SetBit(&InUseDevices, pDevice->Device.number);
-+    spin_unlock(&InUseDevicesLock);
-+    pDevice->Device.capabilities = PNP_REMOVABLE | PNP_DISABLE;
-+    pDevice->Device.protocol = &sdio_protocol;
-+    pDevice->Device.active = 1;
-+
-+    pnp_init_resource_table(&pDevice->Device.res);
-+
-+    pFdname = KernelAlloc(sizeof(struct pnp_id));
-+
-+    if (NULL == pFdname) {
-+        return SDIO_STATUS_NO_RESOURCES;
-+    }
-+    /* set the id as slot number/function number */
-+    snprintf(pFdname->id, sizeof(pFdname->id), "SD_%02X%02X",
-+             pDevice->pHcd->SlotNumber, (UINT)SDDEVICE_GET_SDIO_FUNCNO(pDevice));
-+    pFdname->next = NULL;
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO BusDriver - OS_InitializeDevice adding id: %s\n",
-+                             pFdname->id));
-+    pnp_add_id(pFdname, &pDevice->Device);
-+
-+        /* deal with DMA settings */
-+    if (pDevice->pHcd->pDmaDescription != NULL) {
-+        pDevice->Device.dev.dma_mask = &pDevice->pHcd->pDmaDescription->Mask;
-+        pDevice->Device.dev.coherent_dma_mask = pDevice->pHcd->pDmaDescription->Mask;
-+    }
-+
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+/*
-+ * OS_AddDevice - must be pre-initialized with OS_InitializeDevice
-+*/
-+SDIO_STATUS OS_AddDevice(PSDDEVICE pDevice, PSDFUNCTION pFunction)
-+{
-+    int error;
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO BusDriver - OS_AddDevice adding function: %s\n",
-+                               pFunction->pName));
-+    error = pnp_add_device(&pDevice->Device);
-+    if (error < 0) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO BusDriver - OS_AddDevice failed pnp_add_device: %d\n",
-+                               error));
-+    }
-+        /* replace the buggy pnp's release */
-+    pDevice->Device.dev.release = release;
-+
-+    return OSErrorToSDIOError(error);
-+}
-+
-+/*
-+ * OS_RemoveDevice - unregister device with driver and bus
-+*/
-+void OS_RemoveDevice(PSDDEVICE pDevice)
-+{
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO BusDriver - OS_RemoveDevice \n"));
-+    pnp_remove_card_device(&pDevice->Device);
-+    spin_lock(&InUseDevicesLock);
-+    ClearBit(&InUseDevices, pDevice->Device.number);
-+    spin_unlock(&InUseDevicesLock);
-+
-+    if (pDevice->Device.id != NULL) {
-+        KernelFree(pDevice->Device.id);
-+        pDevice->Device.id = NULL;
-+    }
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Add OS device to bus driver.
-+
-+  @function name: SDIO_BusAddOSDevice
-+  @category: HD_Reference
-+
-+  @output: pDma    - descrip[tion of support DMA or NULL
-+  @output: pDriver - assigned driver object
-+  @output: pDevice - assigned device object
-+
-+  @return: SDIO_STATUS - SDIO_STATUS_SUCCESS when successful.
-+
-+  @notes: If the HCD does not register with the driver sub-system directly (like in the PCI case),
-+          then it should register with the bus driver to obtain OS dependent device objects.
-+          All input structures should be maintained throughout the life of the driver.
-+
-+  @example: getting device objects:
-+    typedef struct _SDHCD_DRIVER {
-+        OS_PNPDEVICE   HcdDevice;     / * the OS device for this HCD * /
-+        OS_PNPDRIVER   HcdDriver;     / * the OS driver for this HCD * /
-+        SDDMA_DESCRIPTION Dma;        / * driver DMA description * /
-+    }SDHCD_DRIVER, *PSDHCD_DRIVER;
-+
-+    typedef struct _SDHCD_DRIVER_CONTEXT {
-+        PTEXT        pDescription;       / * human readable device decsription * /
-+        SDLIST       DeviceList;         / * the list of current devices handled by this driver * /
-+        OS_SEMAPHORE DeviceListSem;      / * protection for the DeviceList * /
-+        UINT         DeviceCount;        / * number of devices currently installed * /
-+        SDHCD_DRIVER Driver;             / * OS dependent driver specific info * /
-+    }SDHCD_DRIVER_CONTEXT, *PSDHCD_DRIVER_CONTEXT;
-+
-+    static SDHCD_DRIVER_CONTEXT HcdContext = {
-+        .pDescription  = DESCRIPTION,
-+        .DeviceCount   = 0,
-+        .Driver.HcdDevice.name = "sdio_xxx_hcd",
-+        .Driver.HcdDriver.name = "sdio_xxx_hcd",
-+    }
-+    .....
-+    status = SDIO_BusAddOSDevice(NULL, &HcdContext.Driver, &HcdContext.Device);
-+    if (SDIO_SUCCESS(status) {
-+        return Probe(&HcdContext.Device);
-+    }
-+    return SDIOErrorToOSError(status);
-+
-+  @see also: SDIO_BusRemoveOSDevice
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS SDIO_BusAddOSDevice(PSDDMA_DESCRIPTION pDma, POS_PNPDRIVER pDriver, POS_PNPDEVICE pDevice)
-+{
-+    int err;
-+    struct pnp_id *pFdname;
-+    struct pnp_device_id *pFdid;
-+    static int slotNumber = 0; /* we just use an increasing count for the slots number */
-+
-+    if (pDma != NULL) {
-+        pDevice->dev.dma_mask = &pDma->Mask;
-+        pDevice->dev.coherent_dma_mask = pDma->Mask;
-+    }
-+    DBG_PRINT(SDDBG_ERROR,
-+            ("SDIO BusDriver - SDIO_GetBusOSDevice, registering driver: %s DMAmask: 0x%x\n",
-+            pDriver->name, (UINT)*pDevice->dev.dma_mask));
-+    pFdid = KernelAlloc(sizeof(struct pnp_device_id)*2);
-+    /* set the id as slot number/function number */
-+    snprintf(pFdid[0].id, sizeof(pFdid[0].id), "SD_%02X08",
-+             slotNumber++);
-+    pFdid[0].driver_data = 0;
-+    pFdid[1].id[0] = '\0';
-+    pFdid[1].driver_data = 0;
-+
-+    pDriver->id_table = pFdid;
-+    pDriver->flags = PNP_DRIVER_RES_DO_NOT_CHANGE;
-+    err = pnp_register_driver(pDriver);
-+    if (err < 0) {
-+        DBG_PRINT(SDDBG_ERROR,
-+            ("SDIO BusDriver - SDIO_GetBusOSDevice, failed registering driver: %s, err: %d\n",
-+            pDriver->name, err));
-+        return OSErrorToSDIOError(err);
-+    }
-+
-+    pDevice->protocol = &sdio_protocol;
-+    pDevice->capabilities = PNP_REMOVABLE | PNP_DISABLE;
-+    pDevice->active = 1;
-+
-+    pFdname = KernelAlloc(sizeof(struct pnp_id));
-+    /* set the id as slot number/function number */
-+    snprintf(pFdname->id, sizeof(pFdname->id), "SD_%02X08",
-+             0); //??pDevice->pHcd->SlotNumber);//?????fix this, slotnumber isn't vaialble yet
-+    pFdname->next = NULL;
-+    pnp_add_id(pFdname, pDevice);
-+
-+    /* get a unique device number */
-+    spin_lock(&InUseDevicesLock);
-+    pDevice->number = FirstClearBit(&InUseDevices);
-+    SetBit(&InUseDevices, pDevice->number);
-+    spin_unlock(&InUseDevicesLock);
-+    pnp_init_resource_table(&pDevice->res);
-+    err = pnp_add_device(pDevice);
-+    if (err < 0) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO BusDriver - SDIO_GetBusOSDevice failed pnp_device_add: %d\n",
-+                               err));
-+        pnp_unregister_driver(pDriver);
-+    }
-+    /* replace the buggy pnp's release */
-+    pDevice->dev.release = release;
-+    return OSErrorToSDIOError(err);
-+}
-+
-+/**+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Return OS device from bus driver.
-+
-+  @function name: SDIO_BusRemoveOSDevice
-+  @category: HD_Reference
-+
-+  @input: pDriver - setup PNP driver object
-+  @input: pDevice - setup PNP device object
-+
-+  @return: none
-+
-+
-+  @example: returning device objects:
-+        SDIO_BusRemoveOSDevice(&HcdContext.Driver, &HcdContext.Device);
-+
-+
-+  @see also: SDIO_BusAddOSDevice
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void SDIO_BusRemoveOSDevice(POS_PNPDRIVER pDriver, POS_PNPDEVICE pDevice)
-+{
-+    DBG_PRINT(SDDBG_ERROR,
-+            ("SDIO BusDriver - SDIO_PutBusOSDevice, unregistering driver: %s\n",
-+            pDriver->name));
-+
-+    pnp_remove_card_device(pDevice);
-+    if (pDevice->id != NULL) {
-+        KernelFree(pDevice->id);
-+        pDevice->id = NULL;
-+    }
-+
-+    spin_lock(&InUseDevicesLock);
-+    ClearBit(&InUseDevices, pDevice->number);
-+    spin_unlock(&InUseDevicesLock);
-+
-+    pnp_unregister_driver(pDriver);
-+    if (pDriver->id_table != NULL) {
-+        KernelFree((void *)pDriver->id_table);
-+        pDriver->id_table = NULL;
-+    }
-+
-+}
-+
-+
-+/*
-+ * module init
-+*/
-+static int __init sdio_busdriver_init(void) {
-+    SDIO_STATUS status;
-+    int error;
-+    REL_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: loaded\n"));
-+    if (!SDIO_SUCCESS((status = _SDIO_BusDriverInitialize()))) {
-+        return SDIOErrorToOSError(status);
-+    }
-+    /* register the sdio bus */
-+    error = pnp_register_protocol(&sdio_protocol);
-+    if (error < 0) {
-+        REL_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: failed to register bus device, %d\n", error));
-+        _SDIO_BusDriverCleanup();
-+        return error;
-+    }
-+    return 0;
-+}
-+
-+/*
-+ * module cleanup
-+*/
-+static void __exit sdio_busdriver_cleanup(void) {
-+    REL_PRINT(SDDBG_TRACE, ("SDIO unloaded\n"));
-+    _SDIO_BusDriverCleanup();
-+    pnp_unregister_protocol(&sdio_protocol);
-+DBG_PRINT(SDDBG_TRACE,
-+            ("SDIO BusDriver - unloaded 1\n"));
-+}
-+EXPORT_SYMBOL(SDIO_BusAddOSDevice);
-+EXPORT_SYMBOL(SDIO_BusRemoveOSDevice);
-+
-+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+    /* 2.4 */
-+static int RegisterDriver(PSDFUNCTION pFunction)
-+{
-+    return 0;
-+}
-+
-+static int UnregisterDriver(PSDFUNCTION pFunction)
-+{
-+    DBG_PRINT(SDDBG_TRACE,
-+            ("+-SDIO BusDriver - UnregisterDriver, driver: \n"));
-+   return 0;
-+}
-+
-+/*
-+ * OS_InitializeDevice - initialize device that will be registered
-+*/
-+SDIO_STATUS OS_InitializeDevice(PSDDEVICE pDevice, PSDFUNCTION pFunction)
-+{
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+/*
-+ * OS_AddDevice - must be pre-initialized with OS_InitializeDevice
-+*/
-+SDIO_STATUS OS_AddDevice(PSDDEVICE pDevice, PSDFUNCTION pFunction)
-+{
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO BusDriver - OS_AddDevice adding function: %s\n",
-+                               pFunction->pName));
-+    return SDIO_STATUS_SUCCESS;
-+
-+}
-+
-+/*
-+ * OS_RemoveDevice - unregister device with driver and bus
-+*/
-+void OS_RemoveDevice(PSDDEVICE pDevice)
-+{
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO BusDriver - OS_RemoveDevice \n"));
-+}
-+
-+/*
-+ * module init
-+*/
-+static int __init sdio_busdriver_init(void) {
-+    SDIO_STATUS status;
-+    REL_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: loaded\n"));
-+    if (!SDIO_SUCCESS((status = _SDIO_BusDriverInitialize()))) {
-+        return SDIOErrorToOSError(status);
-+    }
-+    return 0;
-+}
-+
-+/*
-+ * module cleanup
-+*/
-+static void __exit sdio_busdriver_cleanup(void) {
-+    REL_PRINT(SDDBG_TRACE, ("SDIO unloaded\n"));
-+    _SDIO_BusDriverCleanup();
-+}
-+#else  ////KERNEL_VERSION
-+#error "unsupported kernel version: "UTS_RELEASE
-+#endif //KERNEL_VERSION
-+
-+MODULE_LICENSE("GPL and additional rights");
-+MODULE_DESCRIPTION(DESCRIPTION);
-+MODULE_AUTHOR(AUTHOR);
-+
-+module_init(sdio_busdriver_init);
-+module_exit(sdio_busdriver_cleanup);
-+EXPORT_SYMBOL(SDIO_RegisterHostController);
-+EXPORT_SYMBOL(SDIO_UnregisterHostController);
-+EXPORT_SYMBOL(SDIO_HandleHcdEvent);
-+EXPORT_SYMBOL(SDIO_CheckResponse);
-+EXPORT_SYMBOL(SDIO_RegisterFunction);
-+EXPORT_SYMBOL(SDIO_UnregisterFunction);
-diff --git a/drivers/sdio/stack/busdriver/sdio_function.c b/drivers/sdio/stack/busdriver/sdio_function.c
-new file mode 100644
-index 0000000..78b8e17
---- /dev/null
-+++ b/drivers/sdio/stack/busdriver/sdio_function.c
-@@ -0,0 +1,715 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdio_function.c
-+
-+@abstract: OS independent bus driver support for function drivers
-+
-+@notes: This file supports the interface between SDIO function drivers and the bus driver.
-+
-+@notice: Copyright (c), 2004-2005 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define MODULE_NAME  SDBUSDRIVER
-+#include <linux/sdio/ctsystem.h>
-+#include <linux/sdio/sdio_busdriver.h>
-+#include <linux/sdio/sdio_lib.h>
-+#include "_busdriver.h"
-+
-+static SDIO_STATUS ProbeForDevice(PSDFUNCTION pFunction);
-+
-+#ifdef CT_MAN_CODE_CHECK
-+static UINT16 ManCodeCheck = CT_MAN_CODE_CHECK;
-+#endif
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Register a function driver with the bus driver.
-+
-+  @function name: SDIO_RegisterFunction
-+  @prototype: SDIO_STATUS SDIO_RegisterFunction(PSDFUNCTION pFunction)
-+  @category: PD_Reference
-+  @input:  pFunction - the function definition structure.
-+
-+  @output: none
-+
-+  @return: SDIO_STATUS - SDIO_STATUS_SUCCESS when succesful.
-+
-+  @notes: Each function driver must register with the bus driver once upon loading.
-+          The calling function must be prepared to receive a Probe callback before
-+          this function returns. This will occur when an perpheral device is already
-+          pluugged in that is supported by this function.
-+          The function driver should unregister itself when exiting.
-+          The bus driver checks for possible function drivers to support a device
-+          in reverse registration order.
-+
-+  @example: Registering a function driver:
-+            //list of devices supported by this function driver
-+       static SD_PNP_INFO Ids[] = {
-+            {.SDIO_ManufacturerID = 0xaa55,
-+             .SDIO_ManufacturerCode = 0x5555,
-+             .SDIO_FunctionNo = 1},
-+            {}                      //list is null termintaed
-+        };
-+        static GENERIC_FUNCTION_CONTEXT FunctionContext = {
-+            .Function.pName    = "sdio_generic", //name of the device
-+            .Function.Version  = CT_SDIO_STACK_VERSION_CODE, // set stack version
-+            .Function.MaxDevices = 1,    //maximum number of devices supported by this driver
-+            .Function.NumDevices = 0,    //current number of devices, always zero to start
-+            .Function.pIds     = Ids,    //the list of devices supported by this device
-+            .Function.pProbe   = Probe,  //pointer to the function drivers Probe function
-+                                         //  that will be called when a possibly supported device
-+                                         //  is inserted.
-+            .Function.pRemove  = Remove, //pointer to the function drivers Remove function
-+                                         /  that will be called when a device is removed.
-+            .Function.pContext = &FunctionContext, //data value that will be passed into Probe and
-+                                         //  Remove callbacks.
-+        };
-+        SDIO_STATUS status;
-+        status = SDIO_RegisterFunction(&FunctionContext.Function)
-+        if (!SDIO_SUCCESS(status)) {
-+            ...failed to register
-+        }
-+
-+  @see also: SDIO_UnregisterFunction
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _SDIO_RegisterFunction(PSDFUNCTION pFunction)
-+{
-+      SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+
-+#ifdef CT_MAN_CODE_CHECK
-+    DBG_PRINT(SDDBG_TRACE,
-+        ("SDIO Bus Driver: _SDIO_RegisterFunction: WARNING, this version is locked to Memory cards and SDIO cards with JEDEC IDs of: 0x%X\n",
-+            ManCodeCheck));
-+#else
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: _SDIO_RegisterFunction\n"));
-+#endif
-+
-+      DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: Function Driver Stack Version: %d.%d \n",
-+        GET_SDIO_STACK_VERSION_MAJOR(pFunction),GET_SDIO_STACK_VERSION_MINOR(pFunction)));
-+
-+    if (!CHECK_FUNCTION_DRIVER_VERSION(pFunction)) {
-+        DBG_PRINT(SDDBG_ERROR,
-+           ("SDIO Bus Driver: Function Major Version Mismatch (hcd = %d, bus driver = %d)\n",
-+           GET_SDIO_STACK_VERSION_MAJOR(pFunction), CT_SDIO_STACK_VERSION_MAJOR(g_Version)));
-+        return SDIO_STATUS_INVALID_PARAMETER;
-+    }
-+
-+
-+      /* sanity check the driver */
-+      if ((pFunction == NULL) ||
-+              (pFunction->pProbe == NULL) ||
-+              (pFunction->pIds == NULL)) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_RegisterFunction, invalid registration data\n"));
-+          return SDIO_STATUS_INVALID_PARAMETER;
-+      }
-+    /* protect the function list and add the function */
-+    if (!SDIO_SUCCESS((status = SemaphorePendInterruptable(&pBusContext->FunctionListSem)))) {
-+      goto cleanup;   /* wait interrupted */
-+    }
-+    SignalInitialize(&pFunction->CleanupReqSig);
-+    SDLIST_INIT(&pFunction->DeviceList);
-+    SDListAdd(&pBusContext->FunctionList, &pFunction->SDList);
-+    if (!SDIO_SUCCESS((status = SemaphorePost(&pBusContext->FunctionListSem)))) {
-+      goto cleanup;   /* wait interrupted */
-+    }
-+
-+      /* see if we have devices for this new function driver */
-+      ProbeForDevice(pFunction);
-+
-+      return status;
-+cleanup:
-+    DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_RegisterFunction, error exit 0x%X\n", status));
-+    return status;
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Unregister a function driver with the bus driver.
-+
-+  @function name: SDIO_UnregisterFunction
-+  @prototype: SDIO_STATUS SDIO_UnregisterFunction(PSDFUNCTION pFunction)
-+  @category: PD_Reference
-+
-+  @input:  pFunction - the function definition structure.
-+
-+  @output: none
-+
-+  @return: SDIO_STATUS - SDIO_STATUS_SUCCESS when succesful.
-+
-+  @notes: Each function driver must unregister from the bus driver when the function driver
-+          exits.
-+          A function driver must disconnect from any interrupts before calling this function.
-+
-+  @example: Unregistering a function driver:
-+        SDIO_UnregisterFunction(&FunctionContext.Function);
-+
-+  @see also: SDIO_RegisterFunction
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _SDIO_UnregisterFunction(PSDFUNCTION pFunction)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    PSDDEVICE pDevice;
-+
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: _SDIO_UnregisterFunction\n"));
-+
-+    /* protect the function list and synchronize with Probe() and Remove()*/
-+    if (!SDIO_SUCCESS((status = SemaphorePendInterruptable(&pBusContext->FunctionListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+        /* remove this function from the function list */
-+    SDListRemove(&pFunction->SDList);
-+        /* now remove this function as the handler for any of its devices */
-+    SDITERATE_OVER_LIST_ALLOW_REMOVE(&pFunction->DeviceList, pDevice, SDDEVICE,FuncListLink)  {
-+        if (pDevice->pFunction == pFunction) {
-+                /* notify removal */
-+            NotifyDeviceRemove(pDevice);
-+        }
-+    }SDITERATE_END;
-+
-+    SignalDelete(&pFunction->CleanupReqSig);
-+
-+    if (!SDIO_SUCCESS((status = SemaphorePost(&pBusContext->FunctionListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: _SDIO_UnregisterFunction\n"));
-+      return status;
-+
-+cleanup:
-+    DBG_PRINT(SDDBG_ERROR, ("-SDIO Bus Driver: _SDIO_UnregisterFunction, error exit 0x%X\n", status));
-+    return status;
-+}
-+
-+/* documentation headers only for Probe and Remove */
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: This function is called by the Busdriver when a device is inserted that can be supported by this function driver.
-+
-+  @function name: Probe
-+  @prototype: BOOL (*pProbe)(struct _SDFUNCTION *pFunction, struct _SDDEVICE *pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pFunction - the function definition structure that was passed to Busdriver
-+                       via the SDIO_RegisterFunction.
-+  @input:  pDevice   - the description of the newly inserted device.
-+
-+  @output: none
-+
-+  @return: TRUE  - this function driver will suport this device
-+           FALSE - this function driver will not support this device
-+
-+  @notes: The Busdriver calls the Probe function of a function driver to inform it that device is
-+          available for the function driver to control. The function driver should initialize the
-+          device and be pepared to acceopt any interrupts from the device before returning.
-+
-+  @example: Example of typical Probe function callback:
-+  static BOOL Probe(PSDFUNCTION pFunction, PSDDEVICE pDevice) {
-+       ...get the our context info passed into the SDIO_RegisterFunction
-+    PSDXXX_DRIVER_CONTEXT pFunctionContext =
-+                                (PSDXXX_DRIVER_CONTEXT)pFunction->pContext;
-+    SDIO_STATUS status;
-+       //test the identification of this device and ensure we want to support it
-+       // we can test based on class, or use more specific tests on SDIO_ManufacturerID, etc.
-+    if (pDevice->pId[0].SDIO_FunctionClass == XXX) {
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO XXX Function: Probe - card matched (0x%X/0x%X/0x%X)\n",
-+                                pDevice->pId[0].SDIO_ManufacturerID,
-+                                pDevice->pId[0].SDIO_ManufacturerCode,
-+                                pDevice->pId[0].SDIO_FunctionNo));
-+        ...
-+
-+  @see also: SDIO_RegisterFunction
-+  @see also: Remove
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+BOOL FilterPnpInfo(PSDDEVICE pDevice)
-+{
-+#ifdef CT_MAN_CODE_CHECK
-+    if (pDevice->pId[0].CardFlags & CARD_SDIO) {
-+        if (pDevice->pId[0].SDIO_ManufacturerCode != ManCodeCheck) {
-+            DBG_PRINT(SDDBG_ERROR,
-+             ("SDIO Card with JEDEC ID:0x%X , not Allowed! Driver check halted. "
-+              "Please Contact sales@codetelligence.com.\n",
-+                    pDevice->pId[0].SDIO_ManufacturerCode));
-+            return FALSE;
-+        }
-+    }
-+    return TRUE;
-+#else
-+    return TRUE;
-+#endif
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: This function is called by the Busdriver when a device controlled by this function
-+             function driver is removed.
-+
-+  @function name: Remove
-+  @prototype: void (*pRemove)(struct _SDFUNCTION *pFunction, struct _SDDEVICE *pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pFunction - the function definition structure that was passed to Busdriver
-+                       via the SDIO_RegisterFunction.
-+  @input:  pDevice   - the description of the device being removed.
-+
-+  @output: none
-+
-+  @return: none
-+
-+  @notes: The Busdriver calls the Remove function of a function driver to inform it that device it
-+          was supporting has been removed. The device has already been removed, so no further I/O
-+          to the device can be performed.
-+
-+  @example: Example of typical Remove function callback:
-+    void Remove(PSDFUNCTION pFunction, PSDDEVICE pDevice) {
-+            // get the our context info passed into the SDIO_RegisterFunction
-+        PSDXXX_DRIVER_CONTEXT pFunctionContext =
-+                             (PSDXXX_DRIVER_CONTEXT)pFunction->pContext;
-+           ...free any acquired resources.
-+
-+  @see also: SDIO_RegisterFunction
-+  @see also: Probe
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*
-+ * ProbeForFunction - look for a function driver to handle this card
-+ *
-+*/
-+SDIO_STATUS ProbeForFunction(PSDDEVICE pDevice, PSDHCD pHcd) {
-+    SDIO_STATUS status;
-+    PSDLIST pList;
-+    PSDFUNCTION pFunction;
-+
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: ProbeForFunction\n"));
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: ProbeForFunction - Dump of Device PNP Data: \n"));
-+    DBG_PRINT(SDDBG_TRACE, (" Card Flags 0x%X \n", pDevice->pId[0].CardFlags));
-+    if (pDevice->pId[0].CardFlags & CARD_SDIO) {
-+        DBG_PRINT(SDDBG_TRACE, (" SDIO MANF:      0x%X \n", pDevice->pId[0].SDIO_ManufacturerID));
-+        DBG_PRINT(SDDBG_TRACE, (" SDIO MANFCODE:  0x%X \n", pDevice->pId[0].SDIO_ManufacturerCode));
-+        DBG_PRINT(SDDBG_TRACE, (" SDIO FuncNo:    %d \n", pDevice->pId[0].SDIO_FunctionNo));
-+        DBG_PRINT(SDDBG_TRACE, (" SDIO FuncClass: %d \n", pDevice->pId[0].SDIO_FunctionClass));
-+    }
-+    if (pDevice->pId[0].CardFlags & (CARD_MMC | CARD_SD)) {
-+        DBG_PRINT(SDDBG_TRACE, (" SDMMC MANFID: 0x%X \n",pDevice->pId[0].SDMMC_ManfacturerID));
-+        DBG_PRINT(SDDBG_TRACE, (" SDMMC OEMID:  0x%X \n",pDevice->pId[0].SDMMC_OEMApplicationID));
-+    }
-+
-+    if (!FilterPnpInfo(pDevice)) {
-+        status = SDIO_STATUS_SUCCESS;
-+        goto cleanup;
-+    }
-+
-+    /* protect the function list */
-+    if (!SDIO_SUCCESS((status = SemaphorePendInterruptable(&pBusContext->FunctionListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+
-+    /* protect against ProbeForDevice */
-+    if (!SDIO_SUCCESS((status = SemaphorePendInterruptable(&pBusContext->DeviceListSem)))) {
-+            /* release the function list semaphore we just took */
-+        SemaphorePost(&pBusContext->FunctionListSem);
-+        goto cleanup;
-+    }
-+
-+    if (pDevice->pFunction != NULL) {
-+            /* device already has a function driver handling it */
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: ProbeForFunction, device already has function\n"));
-+            /* release function list */
-+        SemaphorePost(&pBusContext->DeviceListSem);
-+            /* release function list */
-+        SemaphorePost(&pBusContext->FunctionListSem);
-+            /* just return success */
-+        status = SDIO_STATUS_SUCCESS;
-+        goto cleanup;
-+    }
-+
-+        /* release device list */
-+    SemaphorePost(&pBusContext->DeviceListSem);
-+
-+    /* walk functions looking for one that can handle this device */
-+    SDITERATE_OVER_LIST(&pBusContext->FunctionList, pList) {
-+        pFunction = CONTAINING_STRUCT(pList, SDFUNCTION, SDList);
-+        if (pFunction->NumDevices >=  pFunction->MaxDevices) {
-+            /* function can't support any more devices */
-+            continue;
-+        }
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: ProbeForFunction - checking: %s \n",
-+                                pFunction->pName));
-+
-+        /* see if this function handles this device */
-+        if (IsPotentialIdMatch(pDevice->pId, pFunction->pIds)) {
-+            if (!FilterPnpInfo(pDevice)) {
-+                break;
-+            }
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: ProbeForFunction -Got Match, probing: %s \n",
-+                                    pFunction->pName));
-+            /* we need to setup with the OS bus driver before the probe, so probe can
-+              do OS operations. */
-+            OS_InitializeDevice(pDevice, pFunction);
-+            if (!SDIO_SUCCESS(OS_AddDevice(pDevice, pFunction))) {
-+                break;
-+            }
-+            /* close enough match, ask the function driver if it supports us */
-+            if (pFunction->pProbe(pFunction, pDevice)) {
-+                /* she accepted the device, add to list */
-+                pDevice->pFunction = pFunction;
-+                SDListAdd(&pFunction->DeviceList, &pDevice->FuncListLink);
-+                pFunction->NumDevices++;
-+                break;
-+            } else {
-+                DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: %s did not claim the device \n",
-+                  pFunction->pName));
-+                /* didn't take this device */
-+                OS_RemoveDevice(pDevice);
-+            }
-+
-+        }
-+    }
-+    if (!SDIO_SUCCESS((status = SemaphorePost(&pBusContext->FunctionListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: ProbeForFunction\n"));
-+      return status;
-+cleanup:
-+    DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: ProbeForFunction, error exit 0x%X\n", status));
-+    return status;
-+}
-+
-+/*
-+ * ProbeForDevice - look for a device that this function driver supports
-+ *
-+*/
-+static SDIO_STATUS ProbeForDevice(PSDFUNCTION pFunction) {
-+    SDIO_STATUS status;
-+    PSDLIST pList;
-+    PSDDEVICE pDevice;
-+
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: ProbeForDevice\n"));
-+    if (pFunction->NumDevices >=  pFunction->MaxDevices) {
-+        /* function can't support any more devices */
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: ProbeForDevice, too many devices in function\n"));
-+        return SDIO_STATUS_SUCCESS;
-+    }
-+
-+     /* protect the driver list */
-+    if (!SDIO_SUCCESS((status = SemaphorePendInterruptable(&pBusContext->DeviceListSem)))) {
-+      goto cleanup;   /* wait interrupted */
-+    }
-+    /* walk device list */
-+    SDITERATE_OVER_LIST(&pBusContext->DeviceList, pList) {
-+        pDevice = CONTAINING_STRUCT(pList, SDDEVICE, SDList);
-+        if (pDevice->pFunction != NULL) {
-+            /* device already has a function driver handling it */
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: ProbeForDevice, device already has function\n"));
-+            continue;
-+        }
-+        /* see if this function handles this device */
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: ProbeForDevice, matching ID:%d %d class:%d\n",
-+                                pDevice->pId[0].SDIO_ManufacturerID,
-+                                pDevice->pId[0].SDIO_FunctionNo,
-+                                pDevice->pId[0].SDIO_FunctionClass));
-+        if (IsPotentialIdMatch(pDevice->pId, pFunction->pIds)) {
-+            if (!FilterPnpInfo(pDevice)) {
-+                break;
-+            }
-+            /* we need to setup with the OS bus driver before the probe, so probe can
-+              do OS operations. */
-+            OS_InitializeDevice(pDevice, pFunction);
-+            if (!SDIO_SUCCESS(OS_AddDevice(pDevice, pFunction))) {
-+                break;
-+            }
-+            /* close enough match, ask the function driver if it supports us */
-+            if (pFunction->pProbe(pFunction, pDevice)) {
-+                /* she accepted the device, add to list */
-+                pDevice->pFunction = pFunction;
-+                SDListAdd(&pFunction->DeviceList, &pDevice->FuncListLink);
-+                pFunction->NumDevices++;
-+                break;
-+            } else {
-+                DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: %s did not claim the device \n",
-+                  pFunction->pName));
-+                /* didn't take this device */
-+                OS_RemoveDevice(pDevice);
-+            }
-+        }
-+    }
-+    if (!SDIO_SUCCESS((status = SemaphorePost(&pBusContext->DeviceListSem)))) {
-+      goto cleanup;   /* wait interrupted */
-+    }
-+
-+      return status;
-+cleanup:
-+    DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: ProbeForDevice, error exit 0x%X\n", status));
-+    return status;
-+}
-+
-+#if 0
-+static void DumpPnpEntry(PSD_PNP_INFO pInfo)
-+{
-+    DBG_PRINT(SDDBG_TRACE, ("Function PnpInfo Dump: \n"));
-+    DBG_PRINT(SDDBG_TRACE, (" Card Flags      0x%X \n", pInfo->CardFlags));
-+    DBG_PRINT(SDDBG_TRACE, (" SDIO MANF:      0x%X \n", pInfo->SDIO_ManufacturerID));
-+    DBG_PRINT(SDDBG_TRACE, (" SDIO MANFCODE:  0x%X \n", pInfo->SDIO_ManufacturerCode));
-+    DBG_PRINT(SDDBG_TRACE, (" SDIO FuncNo:    %d \n", pInfo->SDIO_FunctionNo));
-+    DBG_PRINT(SDDBG_TRACE, (" SDIO FuncClass: %d \n", pInfo->SDIO_FunctionClass));
-+    DBG_PRINT(SDDBG_TRACE, (" SDMMC MANFID:   0x%X \n", pInfo->SDMMC_ManfacturerID));
-+    DBG_PRINT(SDDBG_TRACE, (" SDMMC OEMID:    0x%X \n", pInfo->SDMMC_OEMApplicationID));
-+}
-+#endif
-+/*
-+ * IsPotentialIdMatch - test for potential device match
-+ *
-+*/
-+BOOL IsPotentialIdMatch(PSD_PNP_INFO pIdsDev, PSD_PNP_INFO pIdsFuncList) {
-+    PSD_PNP_INFO pTFn;
-+      BOOL match = FALSE;
-+
-+      for (pTFn = pIdsFuncList;!IS_LAST_SDPNPINFO_ENTRY(pTFn);pTFn++) {
-+        //DumpPnpEntry(pTFn);
-+            /* check specific SDIO Card manufacturer ID, Code and Function number */
-+              if ((pIdsDev->SDIO_ManufacturerID != 0) &&
-+                  (pTFn->SDIO_ManufacturerID != 0) &&
-+                  (pIdsDev->SDIO_ManufacturerID == pTFn->SDIO_ManufacturerID) &&
-+                  (pIdsDev->SDIO_ManufacturerCode == pTFn->SDIO_ManufacturerCode) &&
-+            ((pIdsDev->SDIO_FunctionNo == pTFn->SDIO_FunctionNo) ||
-+             (pTFn->SDIO_FunctionNo == 0)) ) {
-+                  match = TRUE;
-+            break;
-+              }
-+            /* check generic function class */
-+        if ((pIdsDev->SDIO_FunctionClass != 0) &&
-+            (pTFn->SDIO_FunctionClass != 0) &&
-+            (pIdsDev->SDIO_FunctionClass == pTFn->SDIO_FunctionClass)) {
-+            match = TRUE;
-+            break;
-+        }
-+            /* check specific SDMMC MANFID and APPLICATION ID, NOTE SANDISK
-+             * uses a MANFID of zero! */
-+        if ((pTFn->SDMMC_OEMApplicationID != 0) &&
-+            (pIdsDev->SDMMC_ManfacturerID == pTFn->SDMMC_ManfacturerID) &&
-+            (pIdsDev->SDMMC_OEMApplicationID == pTFn->SDMMC_OEMApplicationID)) {
-+            match = TRUE;
-+            break;
-+        }
-+
-+            /* check generic SD Card */
-+        if ((pIdsDev->CardFlags & CARD_SD) &&
-+            (pTFn->CardFlags & CARD_SD)){
-+            match = TRUE;
-+            break;
-+        }
-+
-+            /* check generic MMC Card */
-+        if ((pIdsDev->CardFlags & CARD_MMC) &&
-+            (pTFn->CardFlags & CARD_MMC)){
-+            match = TRUE;
-+            break;
-+        }
-+
-+             /* check raw Card */
-+        if ((pIdsDev->CardFlags & CARD_RAW) &&
-+            (pTFn->CardFlags & CARD_RAW)){
-+            match = TRUE;
-+            break;
-+        }
-+      }
-+
-+    return match;
-+}
-+
-+/*
-+ * NotifyDeviceRemove - tell function driver on this device that the device is being removed
-+ *
-+*/
-+SDIO_STATUS NotifyDeviceRemove(PSDDEVICE pDevice) {
-+    SDIO_STATUS     status;
-+    SDREQUESTQUEUE  cancelQueue;
-+    PSDREQUEST      pReq;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    InitializeRequestQueue(&cancelQueue);
-+
-+      if ((pDevice->pFunction != NULL) &&
-+        (pDevice->pFunction->pRemove != NULL)){
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: removing device 0x%X\n", (INT)pDevice));
-+            /* fail any outstanding requests for this device */
-+            /* acquire lock for request queue */
-+        status = _AcquireHcdLock(pDevice->pHcd);
-+        if (!SDIO_SUCCESS(status)) {
-+            return status;
-+        }
-+            /* mark the function to block any more requests comming down */
-+        pDevice->pFunction->Flags |= SDFUNCTION_FLAG_REMOVING;
-+            /* walk through HCD queue and remove this function's requests */
-+        SDITERATE_OVER_LIST_ALLOW_REMOVE(&pDevice->pHcd->RequestQueue.Queue, pReq, SDREQUEST, SDList) {
-+            if (pReq->pFunction == pDevice->pFunction) {
-+                /* cancel this request, as this device or function is being removed */
-+                /* note that these request are getting completed out of order */
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver - NotifyDeviceRemove: canceling req 0x%X\n", (UINT)pReq));
-+                pReq->Status = SDIO_STATUS_CANCELED;
-+                    /* remove it from the HCD queue */
-+                SDListRemove(&pReq->SDList);
-+                    /* add it to the cancel queue */
-+                QueueRequest(&cancelQueue, pReq);
-+            }
-+        }SDITERATE_END;
-+
-+        status = _ReleaseHcdLock(pDevice->pHcd);
-+
-+           /* now empty the cancel queue if anything is in there */
-+        while (TRUE) {
-+            pReq = DequeueRequest(&cancelQueue);
-+            if (NULL == pReq) {
-+                break;
-+            }
-+                /* complete the request */
-+            DoRequestCompletion(pReq, pDevice->pHcd);
-+        }
-+            /* re-acquire the lock to deal with the current request */
-+        status = _AcquireHcdLock(pDevice->pHcd);
-+        if (!SDIO_SUCCESS(status)) {
-+            return status;
-+        }
-+            /* now deal with the current request */
-+        pReq = GET_CURRENT_REQUEST(pDevice->pHcd);
-+        if ((pReq !=NULL) && (pReq->pFunction == pDevice->pFunction) && (pReq->pFunction != NULL)) {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver - NotifyDeviceRemove: Outstanding Req 0x%X on HCD: 0x%X.. waiting...\n",
-+                (UINT)pReq, (UINT)pDevice->pHcd));
-+                /* the outstanding request on this device is for the function being removed */
-+            pReq->Flags |= SDREQ_FLAGS_CANCELED;
-+                /* wait for this request to get completed normally */
-+            status = _ReleaseHcdLock(pDevice->pHcd);
-+            SignalWait(&pDevice->pFunction->CleanupReqSig);
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver - NotifyDeviceRemove: Outstanding HCD Req 0x%X completed \n", (UINT)pReq));
-+        }  else {
-+                /* release lock */
-+            status = _ReleaseHcdLock(pDevice->pHcd);
-+        }
-+
-+            /* synchronize with ISR SYNC Handlers */
-+              status = SemaphorePendInterruptable(&pBusContext->DeviceListSem);
-+        if (!SDIO_SUCCESS(status)) {
-+            return status;
-+        }
-+            /* call this devices Remove function */
-+        pDevice->pFunction->pRemove(pDevice->pFunction,pDevice);
-+        pDevice->pFunction->NumDevices--;
-+            /* make sure the sync handler is NULLed out */
-+        pDevice->pIrqFunction = NULL;
-+        SemaphorePost(&pBusContext->DeviceListSem);
-+
-+        OS_RemoveDevice(pDevice);
-+            /* detach this device from the function list it belongs to */
-+        SDListRemove(&pDevice->FuncListLink);
-+        pDevice->pFunction->Flags &= ~SDFUNCTION_FLAG_REMOVING;
-+              pDevice->pFunction = NULL;
-+      }
-+      return SDIO_STATUS_SUCCESS;
-+}
-+
-+
-+/*
-+ * RemoveHcdFunctions - remove all functions attached to an HCD
-+ *
-+*/
-+SDIO_STATUS RemoveHcdFunctions(PSDHCD pHcd) {
-+    SDIO_STATUS status;
-+    PSDLIST pList;
-+    PSDFUNCTION pFunction;
-+    PSDDEVICE pDevice;
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: RemoveHcdFunctions\n"));
-+
-+    /* walk through the functions and remove the ones associated with this HCD */
-+    /* protect the driver list */
-+    if (!SDIO_SUCCESS((status = SemaphorePend(&pBusContext->FunctionListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+        /* mark that card is being removed */
-+    pHcd->CardProperties.CardState |= CARD_STATE_REMOVED;
-+    SDITERATE_OVER_LIST(&pBusContext->FunctionList, pList) {
-+        pFunction = CONTAINING_STRUCT(pList, SDFUNCTION, SDList);
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: scanning function 0x%X, %s\n", (INT)pFunction,
-+                                (pFunction == NULL)?"NULL":pFunction->pName));
-+
-+        /* walk the devices on this function and look for a match */
-+        SDITERATE_OVER_LIST_ALLOW_REMOVE(&pFunction->DeviceList, pDevice, SDDEVICE,FuncListLink) {
-+            if (pDevice->pHcd == pHcd) {
-+                /* match, remove it */
-+                NotifyDeviceRemove(pDevice);
-+            }
-+        SDITERATE_END;
-+    SDITERATE_END;
-+    if (!SDIO_SUCCESS((status = SemaphorePost(&pBusContext->FunctionListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: RemoveHcdFunctions\n"));
-+    return SDIO_STATUS_SUCCESS;
-+
-+cleanup:
-+    DBG_PRINT(SDDBG_ERROR, ("-SDIO Bus Driver: RemoveHcdFunctions, error exit 0x%X\n", status));
-+    return status;
-+}
-+
-+/*
-+ * RemoveAllFunctions - remove all functions attached
-+ *
-+*/
-+SDIO_STATUS RemoveAllFunctions()
-+{
-+    SDIO_STATUS status;
-+    PSDLIST pList;
-+    PSDHCD pHcd;
-+
-+    /* walk through the HCDs  */
-+    /* protect the driver list */
-+    if (!SDIO_SUCCESS((status = SemaphorePend(&pBusContext->HcdListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+    SDITERATE_OVER_LIST(&pBusContext->HcdList, pList) {
-+        pHcd = CONTAINING_STRUCT(pList, SDHCD, SDList);
-+            /* remove the functions */
-+        RemoveHcdFunctions(pHcd);
-+    }
-+    if (!SDIO_SUCCESS((status = SemaphorePost(&pBusContext->HcdListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+    return SDIO_STATUS_SUCCESS;
-+cleanup:
-+    DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: RemoveAllFunctions, error exit 0x%X\n", status));
-+    return status;
-+}
-+
-diff --git a/drivers/sdio/stack/lib/Makefile b/drivers/sdio/stack/lib/Makefile
-new file mode 100644
-index 0000000..44fa038
---- /dev/null
-+++ b/drivers/sdio/stack/lib/Makefile
-@@ -0,0 +1,2 @@
-+obj-$(CONFIG_SDIO) += sdio_lib.o
-+sdio_lib-objs := sdio_lib_c.o sdio_lib_os.o
-diff --git a/drivers/sdio/stack/lib/_sdio_lib.h b/drivers/sdio/stack/lib/_sdio_lib.h
-new file mode 100644
-index 0000000..28762b0
---- /dev/null
-+++ b/drivers/sdio/stack/lib/_sdio_lib.h
-@@ -0,0 +1,50 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: _sdio_lib.h
-+
-+@abstract: SDIO Lib internal include
-+
-+#notes:
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#ifndef ___SDIO_LIB_H___
-+#define ___SDIO_LIB_H___
-+
-+#endif /* ___SDIO_LIB_H___*/
-diff --git a/drivers/sdio/stack/lib/sdio_lib_c.c b/drivers/sdio/stack/lib/sdio_lib_c.c
-new file mode 100644
-index 0000000..4bc5a83
---- /dev/null
-+++ b/drivers/sdio/stack/lib/sdio_lib_c.c
-@@ -0,0 +1,908 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdio_lib_c.c
-+
-+@abstract: OS independent SDIO library functions
-+@category abstract: Support_Reference Support Functions.
-+
-+@notes: Support functions for device I/O
-+
-+@notice: Copyright (c), 2004-2005 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define MODULE_NAME  SDLIB_
-+
-+#include <linux/sdio/ctsystem.h>
-+#include <linux/sdio/sdio_busdriver.h>
-+#include <linux/sdio/_sdio_defs.h>
-+#include <linux/sdio/sdio_lib.h>
-+#include "_sdio_lib.h"
-+
-+#define _Cmd52WriteByteCommon(pDev, Address, pValue) \
-+                _SDLIB_IssueCMD52((pDev),0,(Address),(pValue),1,TRUE)
-+#define _Cmd52ReadByteCommon(pDev, Address, pValue) \
-+                _SDLIB_IssueCMD52((pDev),0,(Address),pValue,1,FALSE)
-+#define _Cmd52ReadMultipleCommon(pDev, Address, pBuf,length) \
-+                _SDLIB_IssueCMD52((pDev),0,(Address),(pBuf),(length),FALSE)
-+
-+/* inline version */
-+static INLINE void _iSDLIB_SetupCMD52Request(UINT8         FuncNo,
-+                                             UINT32        Address,
-+                                             BOOL          Write,
-+                                             UINT8         WriteData,
-+                                             PSDREQUEST    pRequest) {
-+    if (Write) {
-+        SDIO_SET_CMD52_ARG(pRequest->Argument,CMD52_WRITE,
-+                           FuncNo,
-+                           CMD52_NORMAL_WRITE,Address,WriteData);
-+    } else {
-+        SDIO_SET_CMD52_ARG(pRequest->Argument,CMD52_READ,FuncNo,0,Address,0x00);
-+    }
-+
-+    pRequest->Flags = SDREQ_FLAGS_RESP_SDIO_R5;
-+    pRequest->Command = CMD52;
-+}
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Setup cmd52 requests
-+
-+  @function name: SDLIB_SetupCMD52Request
-+  @prototype: void SDLIB_SetupCMD52Request(UINT8         FuncNo,
-+                                           UINT32        Address,
-+                                           BOOL          Write,
-+                                           UINT8         WriteData,
-+                                           PSDREQUEST    pRequest)
-+  @category: PD_Reference
-+
-+  @input:  FunctionNo - function number.
-+  @input:  Address - I/O address, 17-bit register address.
-+  @input:  Write  - TRUE if a write operation, FALSE for reads.
-+  @input:  WriteData - write data, byte to write if write operation.
-+
-+  @output: pRequest - request is updated with cmd52 parameters
-+
-+  @return: none
-+
-+  @notes: This function does not perform any I/O. For register reads, the completion
-+          routine can use the SD_R5_GET_READ_DATA() macro to extract the register value.
-+          The routine should also extract the response flags using the SD_R5_GET_RESP_FLAGS()
-+          macro and check the flags with the SD_R5_ERRORS mask.
-+
-+  @example: Getting the register value from the completion routine:
-+          flags = SD_R5_GET_RESP_FLAGS(pRequest->Response);
-+          if (flags & SD_R5_ERRORS) {
-+             ... errors
-+          } else {
-+             registerValue = SD_R5_GET_READ_DATA(pRequest->Response);
-+          }
-+
-+  @see also: SDLIB_IssueCMD52
-+  @see also: SDDEVICE_CALL_REQUEST_FUNC
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void _SDLIB_SetupCMD52Request(UINT8         FuncNo,
-+                              UINT32        Address,
-+                              BOOL          Write,
-+                              UINT8         WriteData,
-+                              PSDREQUEST    pRequest)
-+{
-+    _iSDLIB_SetupCMD52Request(FuncNo,Address,Write,WriteData,pRequest);
-+}
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Issue a CMD52 to read or write a register
-+
-+  @function name: SDLIB_IssueCMD52
-+  @prototype: SDIO_STATUS SDLIB_IssueCMD52(PSDDEVICE     pDevice,
-+                                           UINT8         FuncNo,
-+                                           UINT32        Address,
-+                                           PUINT8        pData,
-+                                           INT           ByteCount,
-+                                           BOOL          Write)
-+  @category: PD_Reference
-+  @input: pDevice - the device that is the target of the command.
-+  @input: FunctionNo - function number of the target.
-+  @input: Address - 17-bit register address.
-+  @input: ByteCount - number of bytes to read or write,
-+  @input: Write - TRUE if a write operation, FALSE for reads.
-+  @input: pData - data buffer for writes.
-+
-+  @output: pData - data buffer for writes.
-+
-+  @return: SDIO Status
-+
-+  @notes:  This function will allocate a request and issue multiple byte reads or writes
-+           to satisfy the ByteCount requested.  This function is fully synchronous and will block
-+           the caller.
-+
-+  @see also: SDLIB_SetupCMD52Request
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _SDLIB_IssueCMD52(PSDDEVICE     pDevice,
-+                              UINT8         FuncNo,
-+                              UINT32        Address,
-+                              PUINT8        pData,
-+                              INT           ByteCount,
-+                              BOOL          Write)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+
-+    PSDREQUEST  pReq = NULL;
-+
-+    pReq = SDDeviceAllocRequest(pDevice);
-+
-+    if (NULL == pReq) {
-+        return SDIO_STATUS_NO_RESOURCES;
-+    }
-+
-+    while (ByteCount) {
-+        _iSDLIB_SetupCMD52Request(FuncNo,Address,Write,*pData,pReq);
-+        status = SDDEVICE_CALL_REQUEST_FUNC(pDevice,pReq);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+
-+        status = ConvertCMD52ResponseToSDIOStatus(SD_R5_GET_RESP_FLAGS(pReq->Response));
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Library: CMD52 resp error: 0x%X \n",
-+                                    SD_R5_GET_RESP_FLAGS(pReq->Response)));
-+            break;
-+        }
-+        if (!Write) {
-+                /* store the byte */
-+            *pData =  SD_R5_GET_READ_DATA(pReq->Response);
-+        }
-+        pData++;
-+        Address++;
-+        ByteCount--;
-+    }
-+
-+    SDDeviceFreeRequest(pDevice,pReq);
-+    return status;
-+}
-+
-+
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Find a device's tuple.
-+
-+  @function name: SDLIB_FindTuple
-+  @prototype: SDIO_STATUS SDLIB_FindTuple(PSDDEVICE  pDevice,
-+                                          UINT8      Tuple,
-+                                          UINT32     *pTupleScanAddress,
-+                                          PUINT8     pBuffer,
-+                                          UINT8      *pLength)
-+
-+  @category: PD_Reference
-+  @input: pDevice - the device that is the target of the command.
-+  @input: Tuple - 8-bit ID of tuple to find
-+  @input: pTupleScanAddress - On entry pTupleScanAddress is the adddress to start scanning
-+  @input: pLength - length of pBuffer
-+
-+  @output: pBuffer - storage for tuple
-+  @output: pTupleScanAddress - address of the next tuple
-+  @output: pLength - length of tuple read
-+
-+  @return: status
-+
-+  @notes: It is possible to have the same tuple ID multiple times with different lengths. This function
-+          blocks and is fully synchronous.
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _SDLIB_FindTuple(PSDDEVICE  pDevice,
-+                             UINT8      Tuple,
-+                             UINT32     *pTupleScanAddress,
-+                             PUINT8     pBuffer,
-+                             UINT8      *pLength)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    UINT32      scanStart = *pTupleScanAddress;
-+    UINT8       tupleCode;
-+    UINT8       tupleLink;
-+
-+        /* sanity check */
-+    if (scanStart < SDIO_CIS_AREA_BEGIN) {
-+        return SDIO_STATUS_CIS_OUT_OF_RANGE;
-+    }
-+
-+    while (TRUE) {
-+            /* check for end */
-+        if (scanStart > SDIO_CIS_AREA_END) {
-+            status = SDIO_STATUS_TUPLE_NOT_FOUND;
-+            break;
-+        }
-+            /* get the code */
-+        status = _Cmd52ReadByteCommon(pDevice, scanStart, &tupleCode);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+        if (CISTPL_END == tupleCode) {
-+                /* found the end */
-+            status = SDIO_STATUS_TUPLE_NOT_FOUND;
-+            break;
-+        }
-+            /* bump past tuple code */
-+        scanStart++;
-+            /* get the tuple link value */
-+        status = _Cmd52ReadByteCommon(pDevice, scanStart, &tupleLink);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+            /* bump past tuple link*/
-+        scanStart++;
-+            /* check tuple we just found */
-+        if (tupleCode == Tuple) {
-+             DBG_PRINT(SDDBG_TRACE, ("SDIO Library: Tuple:0x%2.2X Found at Address:0x%X, TupleLink:0x%X \n",
-+                                     Tuple, (scanStart - 2), tupleLink));
-+            if (tupleLink != CISTPL_LINK_END) {
-+                    /* return the next scan address to the caller */
-+                *pTupleScanAddress = scanStart + tupleLink;
-+            } else {
-+                    /* the tuple link is an end marker */
-+                *pTupleScanAddress = 0xFFFFFFFF;
-+            }
-+                /* go get the tuple */
-+            status = _Cmd52ReadMultipleCommon(pDevice, scanStart,pBuffer,min(*pLength,tupleLink));
-+            if (SDIO_SUCCESS(status)) {
-+                    /* set the actual return length */
-+                *pLength = min(*pLength,tupleLink);
-+            }
-+                /* break out of loop */
-+            break;
-+        }
-+            /*increment past this entire tuple */
-+        scanStart += tupleLink;
-+    }
-+
-+    return status;
-+}
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Issue an SDIO configuration command.
-+
-+  @function name: SDLIB_IssueConfig
-+  @prototype: SDIO_STATUS _SDLIB_IssueConfig(PSDDEVICE        pDevice,
-+                                             SDCONFIG_COMMAND Command,
-+                                             PVOID            pData,
-+                                             INT              Length)
-+
-+  @category: PD_Reference
-+  @input:  pDevice - the device that is the target of the command.
-+  @input:  Command - command to send, see example.
-+  @input:  pData - command's data
-+  @input:  Length length of pData
-+
-+  @output: pData - updated on commands that return data.
-+
-+  @return: SDIO Status
-+
-+  @example: Command and data pairs:
-+            Type                               Data
-+            SDCONFIG_GET_WP             SDCONFIG_WP_VALUE
-+            SDCONFIG_SEND_INIT_CLOCKS   none
-+            SDCONFIG_SDIO_INT_CTRL      SDCONFIG_SDIO_INT_CTRL_DATA
-+            SDCONFIG_SDIO_REARM_INT     none
-+            SDCONFIG_BUS_MODE_CTRL      SDCONFIG_BUS_MODE_DATA
-+            SDCONFIG_POWER_CTRL         SDCONFIG_POWER_CTRL_DATA
-+
-+  @notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _SDLIB_IssueConfig(PSDDEVICE        pDevice,
-+                               SDCONFIG_COMMAND Command,
-+                               PVOID            pData,
-+                               INT              Length)
-+{
-+    SDCONFIG  configHdr;
-+    SET_SDCONFIG_CMD_INFO(&configHdr,Command,pData,Length);
-+    return SDDEVICE_CALL_CONFIG_FUNC(pDevice,&configHdr);
-+}
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Set function block size
-+
-+  @function name: SDLIB_SetFunctionBlockSize
-+  @prototype: SDIO_STATUS SDLIB_SetFunctionBlockSize(PSDDEVICE        pDevice,
-+                                                     UINT16           BlockSize)
-+
-+  @category: PD_Reference
-+  @input:  pDevice - the device that is the target of the command.
-+  @input:  BlockSize - block size to set in function
-+
-+  @output: none
-+
-+  @return: SDIO Status
-+
-+  @notes:  Issues CMD52 to set the block size.  This function is fully synchronous and may
-+           block.
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _SDLIB_SetFunctionBlockSize(PSDDEVICE        pDevice,
-+                                        UINT16           BlockSize)
-+{
-+    UINT8   data[2];
-+
-+      /* endian safe */
-+    data[0] = (UINT8)BlockSize;
-+    data[1] = (UINT8)(BlockSize >> 8);
-+        /* write the function blk size control register */
-+    return _SDLIB_IssueCMD52(pDevice,
-+                             0,    /* function 0 register space */
-+                             FBR_FUNC_BLK_SIZE_LOW_OFFSET(CalculateFBROffset(
-+                             SDDEVICE_GET_SDIO_FUNCNO(pDevice))),
-+                             data,
-+                             2,
-+                             TRUE);
-+}
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Print a buffer to the debug output
-+
-+  @function name: SDLIB_PrintBuffer
-+  @prototype: void SDLIB_PrintBuffer(PUCHAR pBuffer, INT Length, PTEXT pDescription)
-+  @category: Support_Reference
-+
-+  @input:  pBuffer - Hex buffer to be printed.
-+  @input:  Length - length of pBuffer.
-+  @input:  pDescription - String title to be printed above the dump.
-+
-+  @output: none
-+
-+  @return: none
-+
-+  @notes:  Prints the buffer by converting to ASCII and using REL_PRINT() with 16
-+           bytes per line.
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void _SDLIB_PrintBuffer(PUCHAR pBuffer, INT Length, PTEXT pDescription)
-+{
-+    TEXT  line[49];
-+    TEXT  address[5];
-+    TEXT  ascii[17];
-+    TEXT  temp[5];
-+    INT   i;
-+    UCHAR num;
-+    USHORT offset = 0;
-+
-+    REL_PRINT(0,
-+              ("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n"));
-+    if (pDescription != NULL) {
-+        REL_PRINT(0, ("Description: %s \n\n",pDescription));
-+    } else {
-+        REL_PRINT(0, ("Description: NONE \n\n"));
-+    }
-+    REL_PRINT(0,
-+              ("Offset                   Data                               ASCII        \n"));
-+    REL_PRINT(0,
-+              ("--------------------------------------------------------------------------\n"));
-+
-+    while (Length) {
-+        line[0] = (TEXT)0;
-+        ascii[0] = (TEXT)0;
-+        address[0] = (TEXT)0;
-+        sprintf(address,"%4.4X",offset);
-+        for (i = 0; i < 16; i++) {
-+            if (Length != 0) {
-+                num = *pBuffer;
-+                sprintf(temp,"%2.2X ",num);
-+                strcat(line,temp);
-+                if ((num >= 0x20) && (num <= 0x7E)) {
-+                    sprintf(temp,"%c",*pBuffer);
-+                } else {
-+                    sprintf(temp,"%c",0x2e);
-+                }
-+                strcat(ascii,temp);
-+                pBuffer++;
-+                Length--;
-+            } else {
-+                    /* pad partial line with spaces */
-+                strcat(line,"   ");
-+                strcat(ascii," ");
-+            }
-+        }
-+        REL_PRINT(0,("%s    %s   %s\n", address, line, ascii));
-+        offset += 16;
-+    }
-+    REL_PRINT(0,
-+              ("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n"));
-+
-+}
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get default operational current
-+
-+  @function name: SDLIB_GetDefaultOpCurrent
-+  @prototype: SDIO_STATUS SDLIB_GetDefaultOpCurrent(PSDDEVICE  pDevice, SD_SLOT_CURRENT *pOpCurrent)
-+  @category: PD_Reference
-+
-+  @input: pDevice - the device that is the target of the command.
-+
-+  @output: pOpCurrent - operational current in mA.
-+
-+  @return: SDIO_STATUS
-+
-+  @notes:  This routine reads the function's CISTPL_FUNCE tuple for the default operational
-+           current. For SDIO 1.0 devices this value is read from the 8-bit TPLFE_OP_MAX_PWR
-+           field.  For SDIO 1.1 devices, the HP MAX power field is used only if the device is
-+           operating in HIPWR mode. Otherwise the 8-bit TPLFE_OP_MAX_PWR field is used.
-+           Some systems may restrict high power/current mode and force cards to operate in a
-+           legacy (< 200mA) mode.  This function is fully synchronous and will block the caller.
-+
-+   @example: Getting the default operational current for this function:
-+            // get default operational current
-+       status = SDLIB_GetDefaultOpCurrent(pDevice, &slotCurrent);
-+       if (!SDIO_SUCCESS(status)) {
-+           .. failed
-+       }
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _SDLIB_GetDefaultOpCurrent(PSDDEVICE  pDevice, SD_SLOT_CURRENT *pOpCurrent)
-+{
-+    UINT32              nextTpl;
-+    UINT8               tplLength;
-+    struct SDIO_FUNC_EXT_FUNCTION_TPL_1_1 funcTuple;
-+    SDIO_STATUS         status;
-+
-+      /* get the FUNCE tuple */
-+    nextTpl = SDDEVICE_GET_SDIO_FUNC_CISPTR(pDevice);
-+    tplLength = sizeof(funcTuple);
-+        /* go get the function Extension tuple */
-+    status = _SDLIB_FindTuple(pDevice,
-+                              CISTPL_FUNCE,
-+                              &nextTpl,
-+                              (PUINT8)&funcTuple,
-+                              &tplLength);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDLIB_GetDefaultOpCurrent: Failed to get FuncE Tuple: %d \n", status));
-+        return status;
-+    }
-+       /* use the operational power (8-bit) value of current in mA as default*/
-+    *pOpCurrent = funcTuple.CommonInfo.OpMaxPwr;
-+    if ((tplLength >= sizeof(funcTuple)) && (SDDEVICE_IS_SDIO_REV_GTEQ_1_10(pDevice))) {
-+            /* we have a 1.1 tuple */
-+             /* check for HIPWR mode */
-+        if (SDDEVICE_GET_CARD_FLAGS(pDevice) & CARD_HIPWR) {
-+                /* use the maximum operational power (16 bit ) from the tuple */
-+            *pOpCurrent = CT_LE16_TO_CPU_ENDIAN(funcTuple.HiPwrMaxPwr);
-+        }
-+    }
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+
-+static INLINE void FreeMessageBlock(PSDMESSAGE_QUEUE pQueue, PSDMESSAGE_BLOCK pMsg) {
-+    SDListInsertHead(&pQueue->FreeMessageList, &pMsg->SDList);
-+}
-+static INLINE void QueueMessageBlock(PSDMESSAGE_QUEUE pQueue, PSDMESSAGE_BLOCK pMsg) {
-+    SDListInsertTail(&pQueue->MessageList, &pMsg->SDList);
-+}
-+static INLINE void QueueMessageToHead(PSDMESSAGE_QUEUE pQueue, PSDMESSAGE_BLOCK pMsg) {
-+    SDListInsertHead(&pQueue->MessageList, &pMsg->SDList);
-+}
-+
-+static INLINE PSDMESSAGE_BLOCK GetFreeMessageBlock(PSDMESSAGE_QUEUE pQueue) {
-+    PSDLIST pItem = SDListRemoveItemFromHead(&pQueue->FreeMessageList);
-+    if (pItem != NULL) {
-+        return CONTAINING_STRUCT(pItem, SDMESSAGE_BLOCK , SDList);
-+    }
-+    return NULL;
-+}
-+static INLINE PSDMESSAGE_BLOCK GetQueuedMessage(PSDMESSAGE_QUEUE pQueue) {
-+    PSDLIST pItem = SDListRemoveItemFromHead(&pQueue->MessageList);
-+    if (pItem != NULL) {
-+        return CONTAINING_STRUCT(pItem, SDMESSAGE_BLOCK , SDList);
-+    }
-+    return NULL;
-+}
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Create a message queue
-+
-+  @function name: SDLIB_CreateMessageQueue
-+  @prototype: PSDMESSAGE_QUEUE SDLIB_CreateMessageQueue(INT MaxMessages, INT MaxMessageLength)
-+  @category: Support_Reference
-+
-+  @input: MaxMessages - Maximum number of messages this queue supports
-+  @input: MaxMessageLength - Maximum size of each message
-+
-+  @return: Message queue object, NULL on failure
-+
-+  @notes:  This function creates a simple first-in-first-out message queue.  The caller must determine
-+           the maximum number of messages the queue supports and the size of each message.  This
-+           function will pre-allocate memory for each message. A producer of data posts a message
-+           using SDLIB_PostMessage with a user defined data structure. A consumer of this data
-+           can retrieve the message (in FIFO order) using SDLIB_GetMessage. A message queue does not
-+           provide a signaling mechanism for notifying a consumer of data. Notifying a consumer is
-+           user defined.
-+
-+  @see also: SDLIB_DeleteMessageQueue, SDLIB_GetMessage, SDLIB_PostMessage.
-+
-+  @example: Creating a message queue:
-+       typedef struct _MyMessage {
-+           UINT8 Code;
-+           PVOID pDataBuffer;
-+       } MyMessage;
-+            // create message queue, 16 messages max.
-+       pMsgQueue = SDLIB_CreateMessageQueue(16,sizeof(MyMessage));
-+       if (NULL == pMsgQueue) {
-+           .. failed
-+       }
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+PSDMESSAGE_QUEUE _CreateMessageQueue(INT MaxMessages, INT MaxMessageLength)
-+{
-+    PSDMESSAGE_QUEUE pQueue = NULL;
-+    SDIO_STATUS      status = SDIO_STATUS_SUCCESS;
-+    INT              ii;
-+    PSDMESSAGE_BLOCK pMsg;
-+
-+    do {
-+        pQueue = (PSDMESSAGE_QUEUE)KernelAlloc(sizeof(SDMESSAGE_QUEUE));
-+
-+        if (NULL == pQueue) {
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            break;
-+        }
-+        SDLIST_INIT(&pQueue->MessageList);
-+        SDLIST_INIT(&pQueue->FreeMessageList);
-+        pQueue->MaxMessageLength = MaxMessageLength;
-+        status = CriticalSectionInit(&pQueue->MessageCritSection);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+            /* allocate message blocks */
-+        for (ii = 0; ii < MaxMessages; ii++) {
-+            pMsg = (PSDMESSAGE_BLOCK)KernelAlloc(sizeof(SDMESSAGE_BLOCK) + MaxMessageLength -1);
-+            if (NULL == pMsg) {
-+                break;
-+            }
-+            FreeMessageBlock(pQueue, pMsg);
-+        }
-+
-+        if (0 == ii) {
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            break;
-+        }
-+
-+    } while (FALSE);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        if (pQueue != NULL) {
-+            _DeleteMessageQueue(pQueue);
-+            pQueue = NULL;
-+        }
-+    }
-+    return pQueue;
-+}
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Delete a message queue
-+
-+  @function name: SDLIB_DeleteMessageQueue
-+  @prototype: void SDLIB_DeleteMessageQueue(PSDMESSAGE_QUEUE pQueue)
-+  @category: Support_Reference
-+
-+  @input: pQueue - message queue to delete
-+
-+  @notes: This function flushes the message queue and frees all memory allocated for
-+          messages.
-+
-+  @see also: SDLIB_CreateMessageQueue
-+
-+  @example: Deleting a message queue:
-+       if (pMsgQueue != NULL) {
-+            SDLIB_DeleteMessageQueue(pMsgQueue);
-+       }
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void _DeleteMessageQueue(PSDMESSAGE_QUEUE pQueue)
-+{
-+    PSDMESSAGE_BLOCK pMsg;
-+    SDIO_STATUS     status;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    status = CriticalSectionAcquireSyncIrq(&pQueue->MessageCritSection);
-+
-+        /* cleanup free list */
-+    while (1) {
-+        pMsg = GetFreeMessageBlock(pQueue);
-+        if (pMsg != NULL) {
-+            KernelFree(pMsg);
-+        } else {
-+            break;
-+        }
-+    }
-+        /* cleanup any in the queue */
-+    while (1) {
-+        pMsg = GetQueuedMessage(pQueue);
-+        if (pMsg != NULL) {
-+            KernelFree(pMsg);
-+        } else {
-+            break;
-+        }
-+    }
-+
-+    status = CriticalSectionReleaseSyncIrq(&pQueue->MessageCritSection);
-+    CriticalSectionDelete(&pQueue->MessageCritSection);
-+    KernelFree(pQueue);
-+
-+}
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Post a message queue
-+
-+  @function name: SDLIB_PostMessage
-+  @prototype: SDIO_STATUS SDLIB_PostMessage(PSDMESSAGE_QUEUE pQueue, PVOID pMessage, INT MessageLength)
-+  @category: Support_Reference
-+
-+  @input: pQueue - message queue to post to
-+  @input: pMessage - message to post
-+  @input: MessageLength - length of message (for validation)
-+
-+  @return: SDIO_STATUS
-+
-+  @notes: The message queue uses an internal list of user defined message structures.  When
-+          posting a message the message is copied into an allocated structure and queued.  The memory
-+          pointed to by pMessage does not need to be allocated and can reside on the stack.
-+          The length of the message to post can be smaller that the maximum message size. This allows
-+          for variable length messages up to the maximum message size. This
-+          function returns SDIO_STATUS_NO_RESOURCES, if the message queue is full.  This
-+          function returns SDIO_STATUS_BUFFER_TOO_SMALL, if the message size exceeds the maximum
-+          size of a message.  Posting and getting messsages from a message queue is safe in any
-+          driver context.
-+
-+  @see also: SDLIB_CreateMessageQueue , SDLIB_GetMessage
-+
-+  @example: Posting a message
-+       MyMessage message;
-+           // set up message
-+       message.code = MESSAGE_DATA_READY;
-+       message.pData = pInstance->pDataBuffers[currentIndex];
-+           // post message
-+       status = SDLIB_PostMessage(pInstance->pReadQueue,&message,sizeof(message));
-+       if (!SDIO_SUCCESS(status)) {
-+           // failed
-+       }
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _PostMessage(PSDMESSAGE_QUEUE pQueue, PVOID pMessage, INT MessageLength)
-+{
-+    SDIO_STATUS status2;
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    PSDMESSAGE_BLOCK pMsg;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    if (MessageLength > pQueue->MaxMessageLength) {
-+        return SDIO_STATUS_BUFFER_TOO_SMALL;
-+    }
-+
-+    status = CriticalSectionAcquireSyncIrq(&pQueue->MessageCritSection);
-+    if (!SDIO_SUCCESS(status)) {
-+        return status;
-+    }
-+
-+    do {
-+            /* get a message block */
-+        pMsg = GetFreeMessageBlock(pQueue);
-+        if (NULL == pMsg) {
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            break;
-+        }
-+            /* copy the message */
-+        memcpy(pMsg->MessageStart,pMessage,MessageLength);
-+            /* set the length of the message */
-+        pMsg->MessageLength = MessageLength;
-+            /* queue the message to the list  */
-+        QueueMessageBlock(pQueue,pMsg);
-+    } while (FALSE);
-+
-+    status2 = CriticalSectionReleaseSyncIrq(&pQueue->MessageCritSection);
-+    return status;
-+}
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get a message from a message queue
-+
-+  @function name: SDLIB_GetMessage
-+  @prototype: SDIO_STATUS SDLIB_GetMessage(PSDMESSAGE_QUEUE pQueue, PVOID pData, INT *pBufferLength)
-+  @category: Support_Reference
-+
-+  @input: pQueue - message queue to retreive a message from
-+  @input: pBufferLength - on entry, the length of the data buffer
-+  @output: pData - buffer to hold the message
-+  @output: pBufferLength - on return, contains the number of bytes copied
-+
-+  @return: SDIO_STATUS
-+
-+  @notes: The message queue uses an internal list of user defined message structures.  The message is
-+          dequeued (FIFO order) and copied to the callers buffer.  The internal allocation for the message
-+          is returned back to the message queue. This function returns SDIO_STATUS_NO_MORE_MESSAGES
-+          if the message queue is empty. If the length of the buffer is smaller than the length of
-+          the message at the head of the queue,this function returns SDIO_STATUS_BUFFER_TOO_SMALL and
-+          returns the required length in pBufferLength.
-+
-+  @see also: SDLIB_CreateMessageQueue , SDLIB_PostMessage
-+
-+  @example: Getting a message
-+       MyMessage message;
-+       INT       length;
-+           // set length
-+       length = sizeof(message);
-+           // post message
-+       status = SDLIB_GetMessage(pInstance->pReadQueue,&message,&length);
-+       if (!SDIO_SUCCESS(status)) {
-+           // failed
-+       }
-+
-+  @example: Checking queue for a message and getting the size of the message
-+       INT       length;
-+           // use zero length to get the size of the message
-+       length = 0;
-+       status = SDLIB_GetMessage(pInstance->pReadQueue,NULL,&length);
-+       if (status == SDIO_STATUS_NO_MORE_MESSAGES) {
-+            // no messages in queue
-+       } else if (status == SDIO_STATUS_BUFFER_TOO_SMALL) {
-+            // message exists in queue and length of message is returned
-+            messageSizeInQueue = length;
-+       } else {
-+            // some other failure
-+       }
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _GetMessage(PSDMESSAGE_QUEUE pQueue, PVOID pData, INT *pBufferLength)
-+{
-+    SDIO_STATUS status2;
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    PSDMESSAGE_BLOCK pMsg;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    status = CriticalSectionAcquireSyncIrq(&pQueue->MessageCritSection);
-+    if (!SDIO_SUCCESS(status)) {
-+        return status;
-+    }
-+
-+    do {
-+        pMsg = GetQueuedMessage(pQueue);
-+        if (NULL == pMsg) {
-+            status = SDIO_STATUS_NO_MORE_MESSAGES;
-+            break;
-+        }
-+        if (*pBufferLength < pMsg->MessageLength) {
-+                /* caller buffer is too small */
-+            *pBufferLength = pMsg->MessageLength;
-+                /* stick it back to the front */
-+            QueueMessageToHead(pQueue, pMsg);
-+            status = SDIO_STATUS_BUFFER_TOO_SMALL;
-+            break;
-+        }
-+            /* copy the message to the callers buffer */
-+        memcpy(pData,pMsg->MessageStart,pMsg->MessageLength);
-+            /* return actual length */
-+        *pBufferLength = pMsg->MessageLength;
-+            /* return this message block back to the free list  */
-+        FreeMessageBlock(pQueue, pMsg);
-+
-+    } while (FALSE);
-+
-+    status2 = CriticalSectionReleaseSyncIrq(&pQueue->MessageCritSection);
-+
-+    return status;
-+}
-+
-+/* the following documents the OS helper APIs */
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Create an OS-specific helper task/thread
-+
-+  @function name: SDLIB_OSCreateHelper
-+  @prototype: SDIO_STATUS SDLIB_OSCreateHelper(POSKERNEL_HELPER pHelper,
-+                                               PHELPER_FUNCTION pFunction,
-+                                               PVOID            pContext)
-+  @category: Support_Reference
-+
-+  @input: pHelper - caller allocated helper object
-+  @input: pFunction - helper function
-+  @input: pContext - helper context
-+
-+  @return: SDIO_STATUS
-+
-+  @notes: This function creates a helper task/thread that runs in a new execution context. The newly
-+          created task/thread invokes the helper function. The thread/task exits when the helper
-+          function returns.  The helper function has the prototype of:
-+          THREAD_RETURN HelperFunction(POSKERNEL_HELPER pHelper)
-+          The helper function usually implements a while loop and suspends execution using
-+          SD_WAIT_FOR_WAKEUP().  On exit the helper function can return an OS-specific THREAD_RETURN
-+          code (usually zero). The helper function executes in a fully schedule-able context and
-+          can block on semaphores and sleep.
-+
-+  @see also: SDLIB_OSDeleteHelper , SD_WAIT_FOR_WAKEUP
-+
-+  @example: A thread helper function:
-+       THREAD_RETURN HelperFunction(POSKERNEL_HELPER pHelper)
-+       {
-+           SDIO_STATUS status;
-+           PMYCONTEXT pContext = (PMYCONTEXT)SD_GET_OS_HELPER_CONTEXT(pHelper);
-+                // wait for wake up
-+           while(1) {
-+                  status = SD_WAIT_FOR_WAKEUP(pHelper);
-+                  if (!SDIO_SUCCESS(status)) {
-+                      break;
-+                  }
-+                  if (SD_IS_HELPER_SHUTTING_DOWN(pHelper)) {
-+                      //... shutting down
-+                      break;
-+                  }
-+                  // handle wakeup...
-+            }
-+            return 0;
-+       }
-+
-+  @example: Creating a helper:
-+       status = SDLIB_OSCreateHelper(&pInstance->OSHelper,HelperFunction,pInstance);
-+       if (!SDIO_SUCCESS(status)) {
-+           // failed
-+       }
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Delete an OS helper task/thread
-+
-+  @function name: SDLIB_OSDeleteHelper
-+  @prototype: void SDLIB_OSDeleteHelper(POSKERNEL_HELPER pHelper)
-+  @category: Support_Reference
-+
-+  @input: pHelper - caller allocated helper object
-+
-+  @notes: This function wakes the helper and waits(blocks) until the helper exits. The caller can
-+          only pass an OS helper structure that was initialized sucessfully by
-+          SDLIB_OSCreateHelper.  The caller must be in a schedulable context.
-+
-+  @see also: SDLIB_OSCreateHelper
-+
-+  @example: Deleting a helper:
-+       if (pInstance->HelperCreated) {
-+               // clean up the helper if we successfully created it
-+           SDLIB_OSDeleteHelper(&pInstance->OSHelper);
-+       }
-+
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+
-diff --git a/drivers/sdio/stack/lib/sdio_lib_os.c b/drivers/sdio/stack/lib/sdio_lib_os.c
-new file mode 100644
-index 0000000..55363d0
---- /dev/null
-+++ b/drivers/sdio/stack/lib/sdio_lib_os.c
-@@ -0,0 +1,251 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdio_function_os.c
-+
-+@abstract: Linux implementation module for SDIO library
-+
-+#notes: includes module load and unload functions
-+
-+@notice: Copyright (c), 2004 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+/* debug level for this module*/
-+#define DBG_DECLARE 4;
-+#include <linux/sdio/ctsystem.h>
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/kthread.h>
-+
-+#include <linux/sdio/sdio_busdriver.h>
-+#include <linux/sdio/sdio_lib.h>
-+#include "_sdio_lib.h"
-+
-+#define DESCRIPTION "SDIO Kernel Library"
-+#define AUTHOR "Atheros Communications, Inc."
-+
-+/* proxies */
-+SDIO_STATUS SDLIB_IssueCMD52(PSDDEVICE     pDevice,
-+                            UINT8         FuncNo,
-+                            UINT32        Address,
-+                            PUINT8        pData,
-+                            INT           ByteCount,
-+                            BOOL          Write)
-+{
-+    return _SDLIB_IssueCMD52(pDevice,FuncNo,Address,pData,ByteCount,Write);
-+}
-+
-+SDIO_STATUS SDLIB_FindTuple(PSDDEVICE  pDevice,
-+                         UINT8      Tuple,
-+                         UINT32     *pTupleScanAddress,
-+                         PUINT8     pBuffer,
-+                         UINT8      *pLength)
-+{
-+    return _SDLIB_FindTuple(pDevice,Tuple,pTupleScanAddress,pBuffer,pLength);
-+}
-+
-+SDIO_STATUS SDLIB_IssueConfig(PSDDEVICE        pDevice,
-+                              SDCONFIG_COMMAND Command,
-+                              PVOID            pData,
-+                              INT              Length)
-+{
-+    return _SDLIB_IssueConfig(pDevice,Command,pData,Length);
-+}
-+
-+void SDLIB_PrintBuffer(PUCHAR pBuffer,INT Length,PTEXT pDescription)
-+{
-+    _SDLIB_PrintBuffer(pBuffer,Length,pDescription);
-+}
-+
-+SDIO_STATUS SDLIB_SetFunctionBlockSize(PSDDEVICE        pDevice,
-+                                       UINT16           BlockSize)
-+{
-+    return _SDLIB_SetFunctionBlockSize(pDevice,BlockSize);
-+}
-+
-+void SDLIB_SetupCMD52Request(UINT8         FuncNo,
-+                             UINT32        Address,
-+                             BOOL          Write,
-+                             UINT8         WriteData,
-+                             PSDREQUEST    pRequest)
-+{
-+    _SDLIB_SetupCMD52Request(FuncNo,Address,Write,WriteData,pRequest);
-+}
-+
-+SDIO_STATUS SDLIB_GetDefaultOpCurrent(PSDDEVICE  pDevice, SD_SLOT_CURRENT *pOpCurrent)
-+{
-+    return _SDLIB_GetDefaultOpCurrent(pDevice,pOpCurrent);
-+}
-+
-+/* helper function launcher */
-+INT HelperLaunch(PVOID pContext)
-+{
-+    INT exit;
-+        /* call function */
-+    exit = ((POSKERNEL_HELPER)pContext)->pHelperFunc((POSKERNEL_HELPER)pContext);
-+    complete_and_exit(&((POSKERNEL_HELPER)pContext)->Completion, exit);
-+    return exit;
-+}
-+
-+/*
-+ * OSCreateHelper - create a worker kernel thread
-+*/
-+SDIO_STATUS SDLIB_OSCreateHelper(POSKERNEL_HELPER pHelper,
-+                           PHELPER_FUNCTION pFunction,
-+                           PVOID            pContext)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+
-+    memset(pHelper,0,sizeof(OSKERNEL_HELPER));
-+
-+    do {
-+        pHelper->pContext = pContext;
-+        pHelper->pHelperFunc = pFunction;
-+        status = SignalInitialize(&pHelper->WakeSignal);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+        init_completion(&pHelper->Completion);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        pHelper->pTask = kthread_create(HelperLaunch,
-+                                       (PVOID)pHelper,
-+                                       "SDIO Helper");
-+        if (NULL == pHelper->pTask) {
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            break;
-+        }
-+        wake_up_process(pHelper->pTask);
-+#else
-+    /* 2.4 */
-+        pHelper->pTask = kernel_thread(HelperLaunch,
-+                                       (PVOID)pHelper,
-+                                       (CLONE_FS | CLONE_FILES | SIGCHLD));
-+        if (pHelper->pTask < 0) {
-+            DBG_PRINT(SDDBG_TRACE,
-+                ("SDIO BusDriver - OSCreateHelper, failed to create thread\n"));
-+        }
-+#endif
-+
-+    } while (FALSE);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        SDLIB_OSDeleteHelper(pHelper);
-+    }
-+    return status;
-+}
-+
-+/*
-+ * OSDeleteHelper - delete thread created with OSCreateHelper
-+*/
-+void SDLIB_OSDeleteHelper(POSKERNEL_HELPER pHelper)
-+{
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+    if (pHelper->pTask != NULL) {
-+#else
-+    /* 2.4 */
-+    if (pHelper->pTask >= 0) {
-+#endif
-+        pHelper->ShutDown = TRUE;
-+        SignalSet(&pHelper->WakeSignal);
-+            /* wait for thread to exit */
-+        wait_for_completion(&pHelper->Completion);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        pHelper->pTask = NULL;
-+#else
-+    /* 2.4 */
-+        pHelper->pTask = 0;
-+#endif
-+    }
-+
-+    SignalDelete(&pHelper->WakeSignal);
-+}
-+
-+/*
-+ * module init
-+*/
-+static int __init sdio_lib_init(void) {
-+    REL_PRINT(SDDBG_TRACE, ("SDIO Library load\n"));
-+    return 0;
-+}
-+
-+/*
-+ * module cleanup
-+*/
-+static void __exit sdio_lib_cleanup(void) {
-+    REL_PRINT(SDDBG_TRACE, ("SDIO Library unload\n"));
-+}
-+
-+PSDMESSAGE_QUEUE SDLIB_CreateMessageQueue(INT MaxMessages, INT MaxMessageLength)
-+{
-+    return _CreateMessageQueue(MaxMessages,MaxMessageLength);
-+
-+}
-+void SDLIB_DeleteMessageQueue(PSDMESSAGE_QUEUE pQueue)
-+{
-+    _DeleteMessageQueue(pQueue);
-+}
-+
-+SDIO_STATUS SDLIB_PostMessage(PSDMESSAGE_QUEUE pQueue, PVOID pMessage, INT MessageLength)
-+{
-+    return _PostMessage(pQueue,pMessage,MessageLength);
-+}
-+
-+SDIO_STATUS SDLIB_GetMessage(PSDMESSAGE_QUEUE pQueue, PVOID pData, INT *pBufferLength)
-+{
-+    return _GetMessage(pQueue,pData,pBufferLength);
-+}
-+
-+MODULE_LICENSE("GPL and additional rights");
-+MODULE_DESCRIPTION(DESCRIPTION);
-+MODULE_AUTHOR(AUTHOR);
-+module_init(sdio_lib_init);
-+module_exit(sdio_lib_cleanup);
-+EXPORT_SYMBOL(SDLIB_IssueCMD52);
-+EXPORT_SYMBOL(SDLIB_FindTuple);
-+EXPORT_SYMBOL(SDLIB_IssueConfig);
-+EXPORT_SYMBOL(SDLIB_PrintBuffer);
-+EXPORT_SYMBOL(SDLIB_SetFunctionBlockSize);
-+EXPORT_SYMBOL(SDLIB_SetupCMD52Request);
-+EXPORT_SYMBOL(SDLIB_GetDefaultOpCurrent);
-+EXPORT_SYMBOL(SDLIB_OSCreateHelper);
-+EXPORT_SYMBOL(SDLIB_OSDeleteHelper);
-+EXPORT_SYMBOL(SDLIB_CreateMessageQueue);
-+EXPORT_SYMBOL(SDLIB_DeleteMessageQueue);
-+EXPORT_SYMBOL(SDLIB_PostMessage);
-+EXPORT_SYMBOL(SDLIB_GetMessage);
-diff --git a/drivers/sdio/stack/platform/Makefile b/drivers/sdio/stack/platform/Makefile
-new file mode 100644
-index 0000000..14b3612
---- /dev/null
-+++ b/drivers/sdio/stack/platform/Makefile
-@@ -0,0 +1,2 @@
-+obj-$(CONFIG_SDIO) += sdio_platform.o
-+sdio_platform-objs := sdioplatformdriver.o
-\ No newline at end of file
-diff --git a/drivers/sdio/stack/platform/sdioplatformdriver.c b/drivers/sdio/stack/platform/sdioplatformdriver.c
-new file mode 100644
-index 0000000..d5520fc
---- /dev/null
-+++ b/drivers/sdio/stack/platform/sdioplatformdriver.c
-@@ -0,0 +1,300 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdioplatformdriver.c
-+
-+@abstract: Linux implementation module for SDIO pltaform driver
-+
-+#notes:
-+
-+@notice: Copyright (c), 2006 Atheros Communications, Inc.
-+
-+@license:  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 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+#define DESCRIPTION "SDIO Platform Driver"
-+#define AUTHOR "Atheros Communications, Inc."
-+
-+//??for .h
-+
-+struct sdioplatform_peripheral {
-+    struct list_head    node;
-+    struct sdioplatform_controller *controller;
-+    struct device       dev;
-+};
-+struct sdioplatform_driver {
-+    struct device_driver drv;
-+    int (*probe)(struct sdioplatform_peripheral *);
-+    void (*remove)(struct sdioplatform_peripheral *);
-+    int (*suspend)(struct sdioplatform_peripheral *, pm_message_t);
-+    int (*resume)(struct sdioplatform_peripheral *);
-+};
-+
-+
-+struct sdioplatform_controller {
-+    struct device       *dev;
-+};
-+struct sdioplatform_controller_driver {
-+    struct device_driver drv;
-+    int (*probe)(struct sdioplatform_controller *);
-+    void (*remove)(struct sdioplatform_controller *);
-+    int (*suspend)(struct sdioplatform_controller *, pm_message_t);
-+    int (*resume)(struct sdioplatform_controller *);
-+};
-+
-+
-+
-+#define device_to_sdioplatform_peripheral(d)  container_of(d, struct sdioplatform_peripheral, dev)
-+#define driver_to_sdioplatform_driver(d)  container_of(d, struct sdioplatform_driver, drv)
-+
-+#define device_to_sdioplatform_controller(d)  container_of(d, struct sdioplatform_controller, dev)
-+#define driver_to_sdioplatform_controller_driver(d)  container_of(d, struct sdioplatform_controller_driver, drv)
-+
-+#define SDIOPLATFORM_ATTR(name, fmt, args...)                    \
-+static ssize_t sdio_##name##_show (struct device *dev, struct device_attribute *attr, char *buf) \
-+{                                   \
-+    struct sdioplatform_peripheral *peripheral = device_to_sdioplatform_peripheral(dev);  \
-+    return sprintf(buf, fmt, args);                 \
-+}
-+
-+SDIOPLATFORM_ATTR(bus_id, "%s\n", bus_id);
-+#define SDIOPLATFORM_ATTR_RO(name) __ATTR(name, S_IRUGO, sdioplatform_##name##_show, NULL)
-+
-+static struct device_attribute sdioplatform_dev_attrs[] = {
-+    SDIOPLATFORM_ATTR_RO(bus_id),
-+    __ATTR_NULL
-+};
-+
-+static struct bus_type sdioplatform_bus_type = {
-+    .name       = "sdioplatform",
-+    .dev_attrs  = sdioplatform_dev_attrs,
-+    .match      = sdioplatform_bus_match,
-+    .hotplug    = NULL,
-+    .suspend    = sdioplatform_bus_suspend,
-+    .resume     = sdioplatform_bus_resume,
-+};
-+
-+
-+/* controller functions */
-+static int sdioplatform_controllerdrv_probe(struct device *dev)
-+{
-+    struct sdioplatform_controller_driver *drv = driver_to_sdioplatform_controller_driver(dev->driver);
-+    struct sdioplatform_controller *controller = device_to_sdioplatform_controller(dev);
-+
-+    return drv->probe(controller);
-+}
-+
-+static int sdioplatform_controllerdrv_remove(struct device *dev)
-+{
-+    struct sdioplatform_controller_driver *drv = driver_to_sdioplatform_controller_driver(dev->driver);
-+    struct sdioplatform_controller *controller = device_to_sdioplatform_controller(dev);
-+
-+    return drv->remove(controller);
-+}
-+
-+/*
-+ * sdioplatform_register_controller_driver - register a controller driver
-+ */
-+int sdioplatform_register_controller_driver(struct sdioplatform_controller_driver *drv)
-+{
-+    drv->drv.bus = &sdioplatform_bus_type;
-+    drv->drv.probe = sdioplatform_controllerdrv_probe;
-+    drv->drv.remove = sdioplatform_controllerdrv_remove;
-+    return driver_register(&drv->drv);
-+}
-+
-+/*
-+ *  sdioplatform_unregister_controller_driver - unregister a controller driver
-+ */
-+void sdioplatform_unregister_controller_driver(struct sdioplatform_driver *drv)
-+{
-+    driver_unregister(&drv->drv);
-+}
-+
-+/*
-+ * sdioplatform_add_controller - register a controller device
-+ */
-+int sdioplatform_add_controller(char *name, struct sdioplatform_controller *dev)
-+{
-+    if (!dev) {
-+        return -EINVAL;
-+    }
-+    strncpy(dev->dev.bus_id, BUS_ID_SIZE, name);
-+    return device_register(&dev->dev);
-+}
-+
-+/*
-+ * sdioplatform_remove_controller - unregister a controller device
-+ */
-+int sdioplatform_remove_controller(char *name, struct sdioplatform_controller *dev)
-+{
-+    if (!dev) {
-+        return -EINVAL;
-+    }
-+    return device_unregister(&dev->dev);
-+}
-+
-+/* peripheral functions */
-+static int sdioplatform_drv_probe(struct device *dev)
-+{
-+    struct sdioplatform_driver *drv = driver_to_sdioplatform_driver(dev->driver);
-+    struct sdioplatform_peripheral *peripheral = device_to_sdioplatform_peripheral(dev);
-+
-+    return drv->probe(peripheral);
-+}
-+
-+static int sdioplatform_controllerdrv_remove(struct device *dev)
-+{
-+    struct sdioplatform_controller_driver *drv = driver_to_sdioplatform_controller_driver(dev->driver);
-+    struct sdioplatform_controller *controller = device_to_sdioplatform_controller(dev);
-+
-+    return drv->remove(controller);
-+}
-+
-+/*
-+ * sdioplatform_register_driver - register a driver
-+ */
-+int sdioplatform_register_driver(struct sdioplatform_driver *drv)
-+{
-+    drv->drv.bus = &sdioplatform_bus_type;
-+    drv->drv.probe = sdioplatform_drv_probe;
-+    drv->drv.remove = sdioplatform_drv_remove;
-+    return driver_register(&drv->drv);
-+}
-+
-+/*
-+ *  sdioplatform_unregister_driver - unregister a driver
-+ */
-+void sdioplatform_unregister_driver(struct sdioplatform_driver *drv)
-+{
-+    driver_unregister(&drv->drv);
-+}
-+
-+/*
-+ * sdioplatform_add_peripheral - register a peripheral device
-+ */
-+int sdioplatform_add_peripheral(char *name, struct sdioplatform_peripheral *dev)
-+{
-+    if (!dev) {
-+        return -EINVAL;
-+    }
-+    strncpy(dev->dev.bus_id, BUS_ID_SIZE, name);
-+    return device_register(&dev->dev);
-+}
-+
-+/*
-+ * sdioplatform_remove_peripheral - unregister a peripheral device
-+ */
-+int sdioplatform_remove_peripheral(char *name, struct sdioplatform_peripheral *dev)
-+{
-+    if (!dev) {
-+        return -EINVAL;
-+    }
-+    return device_unregister(&dev->dev);
-+}
-+
-+
-+
-+
-+
-+static int sdioplatform_bus_match(struct device *dev, struct device_driver *drv)
-+{
-+    /* probes handle the matching */
-+    return 1;
-+}
-+
-+static int sdioplatform_bus_suspend(struct device *dev, pm_message_t state)
-+{
-+    struct sdioplatform_driver *drv = driver_to_sdioplatform_driver(dev->driver);
-+    struct sdioplatform_peripheral *peripheral = device_to_sdioplatform_peripheral(dev);
-+    int ret = 0;
-+
-+    if (peripheral->driver && drv->suspend) {
-+        ret = drv->suspend(peripheral, state);
-+    }
-+    return ret;
-+}
-+
-+static int sdioplatform_bus_resume(struct device *dev)
-+{
-+    struct sdioplatform_driver *drv = driver_to_sdioplatform_driver(dev->driver);
-+    struct sdioplatform_peripheral *peripheral = device_to_sdioplatform_peripheral(dev);
-+    int ret = 0;
-+
-+    if (peripheral->driver && drv->resume) {
-+        ret = drv->resume(card);
-+    }
-+    return ret;
-+}
-+
-+/*
-+ * module init
-+*/
-+static int __init sdio_platformdriver_init(void) {
-+    int ret = bus_register(&sdioplatform_bus_type);
-+    return ret;
-+}
-+
-+/*
-+ * module cleanup
-+*/
-+static void __exit sdio_platformdriver_cleanup(void) {
-+    REL_PRINT(SDDBG_TRACE, ("SDIO unloaded\n"));
-+    _SDIO_BusDriverCleanup();
-+}
-+
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION(DESCRIPTION);
-+MODULE_AUTHOR(AUTHOR);
-+
-+module_init(sdio_platformdriver_init);
-+module_exit(sdio_platformdriver_cleanup);
-+EXPORT_SYMBOL(sdioplatform_register_controller_driver);
-+EXPORT_SYMBOL(sdioplatform_unregister_controller_driver);
-+EXPORT_SYMBOL(sdioplatform_add_controller);
-+EXPORT_SYMBOL(sdioplatform_remove_controller);
-+EXPORT_SYMBOL(sdioplatform_register_driver);
-+EXPORT_SYMBOL(sdioplatform_unregister_driver);
-+EXPORT_SYMBOL(sdioplatform_add_peripheral);
-+EXPORT_SYMBOL(sdioplatform_remove_peripheral);
-+
-+
-+
-diff --git a/include/linux/sdio/_sdio_defs.h b/include/linux/sdio/_sdio_defs.h
-new file mode 100644
-index 0000000..a3f5542
---- /dev/null
-+++ b/include/linux/sdio/_sdio_defs.h
-@@ -0,0 +1,638 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: _sdio_defs.h
-+
-+@abstract: SD/SDIO definitions
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#ifndef ___SDIO_DEFS_H___
-+#define ___SDIO_DEFS_H___
-+
-+#define SD_INIT_BUS_CLOCK   100000    /* initialization clock in hz */
-+#define SPI_INIT_BUS_CLOCK  100000    /* initialization clock in hz */
-+#define SD_MAX_BUS_CLOCK    25000000  /* max clock speed in hz */
-+#define SD_HS_MAX_BUS_CLOCK 50000000  /* SD high speed max clock speed in hz */
-+#define SDIO_LOW_SPEED_MAX_BUS_CLOCK 400000 /* max low speed clock in hz */
-+#define SDMMC_MIN_INIT_CLOCKS   80    /* minimun number of initialization clocks */
-+#define SDIO_EMPC_CURRENT_THRESHOLD  300  /* SDIO 1.10 , EMPC (mA) threshold, we add some overhead */
-+
-+/* commands */
-+#define CMD0    0
-+#define CMD1    1
-+#define CMD2    2
-+#define CMD3    3
-+#define CMD4    4
-+#define CMD5    5
-+#define CMD6    6
-+#define CMD7    7
-+#define CMD9    9
-+#define CMD10   10
-+#define CMD12   12
-+#define CMD13   13
-+#define CMD15   15
-+#define CMD16   16
-+#define CMD17   17
-+#define CMD18   18
-+#define CMD24   24
-+#define CMD25   25
-+#define CMD27   27
-+#define CMD28   28
-+#define CMD29   29
-+#define CMD30   30
-+#define CMD32   32
-+#define CMD33   33
-+#define CMD38   38
-+#define CMD42   42
-+#define CMD52   52
-+#define CMD53   53
-+#define CMD55   55
-+#define CMD56   56
-+#define CMD58   58
-+#define CMD59   59
-+#define ACMD6   6
-+#define ACMD13  13
-+#define ACMD22  22
-+#define ACMD23  23
-+#define ACMD41  41
-+#define ACMD42  42
-+#define ACMD51  51
-+
-+#define SD_ACMD6_BUS_WIDTH_1_BIT         0x00
-+#define SD_ACMD6_BUS_WIDTH_4_BIT         0x02
-+
-+#define SD_CMD59_CRC_OFF            0x00000000
-+#define SD_CMD59_CRC_ON             0x00000001
-+
-+/* SD/SPI max response size */
-+#define SD_MAX_CMD_RESPONSE_BYTES SD_R2_RESPONSE_BYTES
-+
-+#define SD_R1_RESPONSE_BYTES  6
-+#define SD_R1B_RESPONSE_BYTES SD_R1_RESPONSE_BYTES
-+#define SD_R1_GET_CMD(pR) ((pR)[5] & 0xC0))
-+#define SD_R1_SET_CMD(pR,cmd)  (pR)[5] = (cmd) & 0xC0
-+#define SD_R1_GET_CARD_STATUS(pR) (((UINT32)((pR)[1]))        |  \
-+                                  (((UINT32)((pR)[2])) << 8)  |  \
-+                                  (((UINT32)((pR)[3])) << 16) |  \
-+                                  (((UINT32)((pR)[4])) << 24) )
-+#define SD_R1_SET_CMD_STATUS(pR,status) \
-+{                                      \
-+    (pR)[1] = (UINT8)(status);         \
-+    (pR)[2] = (UINT8)((status) >> 8);  \
-+    (pR)[3] = (UINT8)((status) >> 16); \
-+    (pR)[4] = (UINT8)((status) >> 24); \
-+}
-+
-+/* SD R1 card status bit masks */
-+#define SD_CS_CMD_OUT_OF_RANGE  ((UINT32)(1 << 31))
-+#define SD_CS_ADDRESS_ERR       (1 << 30)
-+#define SD_CS_BLK_LEN_ERR       (1 << 29)
-+#define SD_CS_ERASE_SEQ_ERR     (1 << 28)
-+#define SD_CS_ERASE_PARAM_ERR   (1 << 27)
-+#define SD_CS_WP_ERR            (1 << 26)
-+#define SD_CS_CARD_LOCKED       (1 << 25)
-+#define SD_CS_LK_UNLK_FAILED    (1 << 24)
-+#define SD_CS_PREV_CMD_CRC_ERR  (1 << 23)
-+#define SD_CS_ILLEGAL_CMD_ERR   (1 << 22)
-+#define SD_CS_ECC_FAILED        (1 << 21)
-+#define SD_CS_CARD_INTERNAL_ERR (1 << 20)
-+#define SD_CS_GENERAL_ERR       (1 << 19)
-+#define SD_CS_CSD_OVERWR_ERR    (1 << 16)
-+#define SD_CS_WP_ERASE_SKIP     (1 << 15)
-+#define SD_CS_ECC_DISABLED      (1 << 14)
-+#define SD_CS_ERASE_RESET       (1 << 13)
-+#define SD_CS_GET_STATE(status) (((status) >> 9) & 0x0f)
-+#define SD_CS_SET_STATE(status, state) \
-+{                               \
-+    (status) &= ~(0x0F << 9);   \
-+    (status) |= (state) << 9    \
-+}
-+
-+#define SD_CS_TRANSFER_ERRORS \
-+                ( SD_CS_ADDRESS_ERR       | \
-+                  SD_CS_BLK_LEN_ERR       | \
-+                  SD_CS_ERASE_SEQ_ERR     | \
-+                  SD_CS_ERASE_PARAM_ERR   | \
-+                  SD_CS_WP_ERR            | \
-+                  SD_CS_ECC_FAILED        | \
-+                  SD_CS_CARD_INTERNAL_ERR | \
-+                  SD_CS_GENERAL_ERR )
-+
-+#define SD_CS_STATE_IDLE   0
-+#define SD_CS_STATE_READY  1
-+#define SD_CS_STATE_IDENT  2
-+#define SD_CS_STATE_STBY   3
-+#define SD_CS_STATE_TRANS  4
-+#define SD_CS_STATE_DATA   5
-+#define SD_CS_STATE_RCV    6
-+#define SD_CS_STATE_PRG    7
-+#define SD_CS_STATE_DIS    8
-+#define SD_CS_READY_FOR_DATA    (1 << 8)
-+#define SD_CS_APP_CMD           (1 << 5)
-+#define SD_CS_AKE_SEQ_ERR       (1 << 3)
-+
-+/* SD R2 response */
-+#define SD_R2_RESPONSE_BYTES  17
-+#define MAX_CSD_CID_BYTES     16
-+#define SD_R2_SET_STUFF_BITS(pR)   (pR)[16] = 0x3F
-+#define GET_SD_CSD_TRANS_SPEED(pR) (pR)[12]
-+#define GET_SD_CID_MANFID(pR)      (pR)[15]
-+#define GET_SD_CID_PN_1(pR)        (pR)[12]
-+#define GET_SD_CID_PN_2(pR)        (pR)[11]
-+#define GET_SD_CID_PN_3(pR)        (pR)[10]
-+#define GET_SD_CID_PN_4(pR)        (pR)[9]
-+#define GET_SD_CID_PN_5(pR)        (pR)[8]
-+#define GET_SD_CID_PN_6(pR)        (pR)[7]
-+
-+#define GET_SD_CID_OEMID(pR)      ((((UINT16)(pR)[14]) << 8 )| (UINT16)((pR)[13]))
-+#define SDMMC_OCR_VOLTAGE_MASK 0x7FFFFFFF
-+/* SD R3 response */
-+#define SD_R3_RESPONSE_BYTES 6
-+#define SD_R3_GET_OCR(pR) ((((UINT32)((pR)[1])) |  \
-+                           (((UINT32)((pR)[2])) << 8)  |  \
-+                           (((UINT32)((pR)[3])) << 16) | \
-+                           (((UINT32)((pR)[4])) << 24)) & SDMMC_OCR_VOLTAGE_MASK)
-+#define SD_R3_IS_CARD_READY(pR)  (((pR)[4] & 0x80) == 0x80)
-+
-+/* OCR bit definitions */
-+#define SD_OCR_CARD_PWR_UP_STATUS  ((UINT32)(1 << 31))
-+#define SD_OCR_3_5_TO_3_6_VDD      (1 << 23)
-+#define SD_OCR_3_4_TO_3_5_VDD      (1 << 22)
-+#define SD_OCR_3_3_TO_3_4_VDD      (1 << 21)
-+#define SD_OCR_3_2_TO_3_3_VDD      (1 << 20)
-+#define SD_OCR_3_1_TO_3_2_VDD      (1 << 19)
-+#define SD_OCR_3_0_TO_3_1_VDD      (1 << 18)
-+#define SD_OCR_2_9_TO_3_0_VDD      (1 << 17)
-+#define SD_OCR_2_8_TO_2_9_VDD      (1 << 16)
-+#define SD_OCR_2_7_TO_2_8_VDD      (1 << 15)
-+#define SD_OCR_2_6_TO_2_7_VDD      (1 << 14)
-+#define SD_OCR_2_5_TO_2_6_VDD      (1 << 13)
-+#define SD_OCR_2_4_TO_2_5_VDD      (1 << 12)
-+#define SD_OCR_2_3_TO_2_4_VDD      (1 << 11)
-+#define SD_OCR_2_2_TO_2_3_VDD      (1 << 10)
-+#define SD_OCR_2_1_TO_2_2_VDD      (1 << 9)
-+#define SD_OCR_2_0_TO_2_1_VDD      (1 << 8)
-+#define SD_OCR_1_9_TO_2_0_VDD      (1 << 7)
-+#define SD_OCR_1_8_TO_1_9_VDD      (1 << 6)
-+#define SD_OCR_1_7_TO_1_8_VDD      (1 << 5)
-+#define SD_OCR_1_6_TO_1_7_VDD      (1 << 4)
-+
-+/* SD Status data block */
-+#define SD_STATUS_DATA_BYTES        64
-+#define SDS_GET_DATA_WIDTH(buffer)  ((buffer)[0] & 0xC0)
-+#define SDS_BUS_1_BIT               0x00
-+#define SDS_BUS_4_BIT               0x80
-+#define SDS_GET_SECURE_MODE(buffer) ((buffer)[0] & 0x20)
-+#define SDS_CARD_SECURE_MODE        0x20
-+#define SDS_GET_CARD_TYPE(buffer)   ((buffer)[60] & 0x0F)
-+#define SDS_SD_CARD_RW              0x00
-+#define SDS_SD_CARD_ROM             0x01
-+
-+/* SD R6 response */
-+#define SD_R6_RESPONSE_BYTES 6
-+#define SD_R6_GET_RCA(pR) ((UINT16)((pR)[3]) | (((UINT16)((pR)[4])) << 8))
-+#define SD_R6_GET_CS(pR)  ((UINT16)((pR)[1]) | (((UINT16)((pR)[2])) << 8))
-+
-+/* SD Configuration Register (SCR) */
-+#define SD_SCR_BYTES            8
-+#define SCR_REV_1_0             0x00
-+#define SCR_SD_SPEC_1_00        0x00
-+#define SCR_SD_SPEC_1_10        0x01
-+#define SCR_BUS_SUPPORTS_1_BIT  0x01
-+#define SCR_BUS_SUPPORTS_4_BIT  0x04
-+#define SCR_SD_SECURITY_MASK    0x70
-+#define SCR_SD_NO_SECURITY      0x00
-+#define SCR_SD_SECURITY_1_0     0x10
-+#define SCR_SD_SECURITY_2_0     0x20
-+#define SCR_DATA_STATUS_1_AFTER_ERASE  0x80
-+
-+#define GET_SD_SCR_STRUCT_VER(pB) ((pB)[7] >> 4)
-+#define GET_SD_SCR_SDSPEC_VER(pB) ((pB)[7] & 0x0F)
-+#define GET_SD_SCR_BUSWIDTHS(pB)  ((pB)[6] & 0x0F)
-+#define GET_SD_SCR_BUSWIDTHS_FLAGS(pB)  (pB)[6]
-+#define GET_SD_SCR_SECURITY(pB)   (((pB)[6] >> 4) & 0x07)
-+#define GET_SD_SCR_DATA_STAT_AFTER_ERASE(pB) (((pB)[6] >> 7) & 0x01)
-+
-+/* SDIO R4 Response */
-+#define SD_SDIO_R4_RESPONSE_BYTES 6
-+#define SD_SDIO_R4_GET_OCR(pR) ((UINT32)((pR)[1])        |  \
-+                          (((UINT32)(pR)[2]) << 8)  |  \
-+                          (((UINT32)(pR)[3]) << 16))
-+#define SD_SDIO_R4_IS_MEMORY_PRESENT(pR)   (((pR)[4] & 0x08) == 0x08)
-+#define SD_SDIO_R4_GET_IO_FUNC_COUNT(pR)   (((pR)[4] >> 4) & 0x07)
-+#define SD_SDIO_R4_IS_CARD_READY(pR)       (((pR)[4] & 0x80) == 0x80)
-+
-+/* SDIO R5 response */
-+#define SD_SDIO_R5_RESPONSE_BYTES      6
-+#define SD_SDIO_R5_READ_DATA_OFFSET    1
-+#define SD_R5_GET_READ_DATA(pR)  (pR)[SD_SDIO_R5_READ_DATA_OFFSET]
-+#define SD_R5_RESP_FLAGS_OFFSET   2
-+#define SD_R5_GET_RESP_FLAGS(pR) (pR)[SD_R5_RESP_FLAGS_OFFSET]
-+#define SD_R5_SET_CMD(pR,cmd)  (pR)[5] = (cmd) & 0xC0
-+#define SD_R5_RESP_CMD_ERR  (1 << 7) /* for previous cmd */
-+#define SD_R5_ILLEGAL_CMD   (1 << 6)
-+#define SD_R5_GENERAL_ERR   (1 << 3)
-+#define SD_R5_INVALID_FUNC  (1 << 1)
-+#define SD_R5_ARG_RANGE_ERR (1 << 0)
-+#define SD_R5_CURRENT_CMD_ERRORS (SD_R5_ILLEGAL_CMD | SD_R5_GENERAL_ERR \
-+                                 | SD_R5_INVALID_FUNC | SD_R5_ARG_RANGE_ERR)
-+#define SD_R5_ERRORS (SD_R5_CURRENT_CMD_ERRORS)
-+
-+#define SD_R5_GET_IO_STATE(pR) (((pR)[2] >> 4) & 0x03)
-+#define SD_R5_STATE_DIS 0x00
-+#define SD_R5_STATE_CMD 0x01
-+#define SD_R5_STATE_TRN 0x02
-+
-+/* SDIO Modified R6 Response */
-+#define SD_SDIO_R6_RESPONSE_BYTES 6
-+#define SD_SDIO_R6_GET_RCA(pR)  ((UINT16)((pR)[3]) | ((UINT16)((pR)[4]) << 8))
-+#define SD_SDIO_R6_GET_CSTAT(pR)((UINT16)((pR)[1]) | ((UINT16)((pR)[2]) << 8))
-+
-+/* SPI mode R1 response */
-+#define SPI_R1_RESPONSE_BYTES   1
-+#define GET_SPI_R1_RESP_TOKEN(pR) (pR)[0]
-+#define SPI_CS_STATE_IDLE       0x01
-+#define SPI_CS_ERASE_RESET      (1 << 1)
-+#define SPI_CS_ILLEGAL_CMD      (1 << 2)
-+#define SPI_CS_CMD_CRC_ERR      (1 << 3)
-+#define SPI_CS_ERASE_SEQ_ERR    (1 << 4)
-+#define SPI_CS_ADDRESS_ERR      (1 << 5)
-+#define SPI_CS_PARAM_ERR        (1 << 6)
-+#define SPI_CS_ERR_MASK         0x7c
-+
-+/* SPI mode R2 response */
-+#define SPI_R2_RESPONSE_BYTES  2
-+#define GET_SPI_R2_RESP_TOKEN(pR)   (pR)[1]
-+#define GET_SPI_R2_STATUS_TOKEN(pR) (pR)[0]
-+/* the first response byte is defined above */
-+/* the second response byte is defined below */
-+#define SPI_CS_CARD_IS_LOCKED      (1 << 0)
-+#define SPI_CS_LOCK_UNLOCK_FAILED  (1 << 1)
-+#define SPI_CS_ERROR               (1 << 2)
-+#define SPI_CS_INTERNAL_ERROR      (1 << 3)
-+#define SPI_CS_ECC_FAILED          (1 << 4)
-+#define SPI_CS_WP_VIOLATION        (1 << 5)
-+#define SPI_CS_ERASE_PARAM_ERR     (1 << 6)
-+#define SPI_CS_OUT_OF_RANGE        (1 << 7)
-+
-+/* SPI mode R3 response */
-+#define SPI_R3_RESPONSE_BYTES 5
-+#define SPI_R3_GET_OCR(pR) ((((UINT32)((pR)[0])) |         \
-+                            (((UINT32)((pR)[1])) << 8)  |  \
-+                            (((UINT32)((pR)[2])) << 16) |  \
-+                            (((UINT32)((pR)[3])) << 24)) & SDMMC_OCR_VOLTAGE_MASK)
-+#define SPI_R3_IS_CARD_READY(pR)  (((pR)[3] & 0x80) == 0x80)
-+#define GET_SPI_R3_RESP_TOKEN(pR) (pR)[4]
-+
-+/* SPI mode SDIO R4 response */
-+#define SPI_SDIO_R4_RESPONSE_BYTES 5
-+#define SPI_SDIO_R4_GET_OCR(pR) ((UINT32)((pR)[0])        |  \
-+                          (((UINT32)(pR)[1]) << 8)   |  \
-+                          (((UINT32)(pR)[2]) << 16))
-+#define SPI_SDIO_R4_IS_MEMORY_PRESENT(pR)   (((pR)[3] & 0x08) == 0x08)
-+#define SPI_SDIO_R4_GET_IO_FUNC_COUNT(pR)   (((pR)[3] >> 4) & 0x07)
-+#define SPI_SDIO_R4_IS_CARD_READY(pR)       (((pR)[3] & 0x80) == 0x80)
-+#define GET_SPI_SDIO_R4_RESP_TOKEN(pR)  (pR)[4]
-+
-+/* SPI Mode SDIO R5 response */
-+#define SPI_SDIO_R5_RESPONSE_BYTES 2
-+#define GET_SPI_SDIO_R5_RESP_TOKEN(pR)     (pR)[1]
-+#define GET_SPI_SDIO_R5_RESPONSE_RDATA(pR) (pR)[0]
-+#define SPI_R5_IDLE_STATE   0x01
-+#define SPI_R5_ILLEGAL_CMD  (1 << 2)
-+#define SPI_R5_CMD_CRC      (1 << 3)
-+#define SPI_R5_FUNC_ERR     (1 << 4)
-+#define SPI_R5_PARAM_ERR    (1 << 6)
-+
-+/* SDIO COMMAND 52 Definitions */
-+#define CMD52_READ  0
-+#define CMD52_WRITE 1
-+#define CMD52_READ_AFTER_WRITE 1
-+#define CMD52_NORMAL_WRITE     0
-+#define SDIO_SET_CMD52_ARG(arg,rw,func,raw,address,writedata) \
-+    (arg) = (((rw) & 1) << 31)           | \
-+            (((func) & 0x7) << 28)       | \
-+            (((raw) & 1) << 27)          | \
-+            (1 << 26)                    | \
-+            (((address) & 0x1FFFF) << 9) | \
-+            (1 << 8)                     | \
-+            ((writedata) & 0xFF)
-+#define SDIO_SET_CMD52_READ_ARG(arg,func,address) \
-+    SDIO_SET_CMD52_ARG(arg,CMD52_READ,(func),0,address,0x00)
-+#define SDIO_SET_CMD52_WRITE_ARG(arg,func,address,value) \
-+    SDIO_SET_CMD52_ARG(arg,CMD52_WRITE,(func),CMD52_NORMAL_WRITE,address,value)
-+
-+/* SDIO COMMAND 53 Definitions */
-+#define CMD53_READ          0
-+#define CMD53_WRITE         1
-+#define CMD53_BLOCK_BASIS   1
-+#define CMD53_BYTE_BASIS    0
-+#define CMD53_FIXED_ADDRESS 0
-+#define CMD53_INCR_ADDRESS  1
-+#define SDIO_SET_CMD53_ARG(arg,rw,func,mode,opcode,address,bytes_blocks) \
-+    (arg) = (((rw) & 1) << 31)                  | \
-+            (((func) & 0x7) << 28)              | \
-+            (((mode) & 1) << 27)                | \
-+            (((opcode) & 1) << 26)              | \
-+            (((address) & 0x1FFFF) << 9)        | \
-+            ((bytes_blocks) & 0x1FF)
-+
-+#define SDIO_MAX_LENGTH_BYTE_BASIS  512
-+#define SDIO_MAX_BLOCKS_BLOCK_BASIS 511
-+#define SDIO_MAX_BYTES_PER_BLOCK    2048
-+#define SDIO_COMMON_AREA_FUNCTION_NUMBER 0
-+#define SDIO_FIRST_FUNCTION_NUMBER       1
-+#define SDIO_LAST_FUNCTION_NUMBER        7
-+
-+#define CMD53_CONVERT_BYTE_BASIS_BLK_LENGTH_PARAM(b) (((b) < SDIO_MAX_LENGTH_BYTE_BASIS) ? (b) : 0)
-+#define CMD53_CONVERT_BLOCK_BASIS_BLK_COUNT_PARAM(b) (((b) <= SDIO_MAX_BLOCKS_BLOCK_BASIS) ? (b) : 0)
-+
-+
-+/* SDIO COMMON Registers */
-+
-+/* revision register */
-+#define CCCR_SDIO_REVISION_REG  0x00
-+#define CCCR_REV_MASK           0x0F
-+#define CCCR_REV_1_0            0x00
-+#define CCCR_REV_1_1            0x01
-+#define SDIO_REV_MASK           0xF0
-+#define SDIO_REV_1_00           0x00
-+#define SDIO_REV_1_10           0x10
-+#define SDIO_REV_1_20           0x20
-+/* SD physical spec revision */
-+#define SD_SPEC_REVISION_REG    0x01
-+#define SD_REV_MASK             0x0F
-+#define SD_REV_1_01             0x00
-+#define SD_REV_1_10             0x01
-+/* I/O Enable  */
-+#define SDIO_ENABLE_REG         0x02
-+/* I/O Ready */
-+#define SDIO_READY_REG          0x03
-+/* Interrupt Enable */
-+#define SDIO_INT_ENABLE_REG     0x04
-+#define SDIO_INT_MASTER_ENABLE  0x01
-+#define SDIO_INT_ALL_ENABLE     0xFE
-+/* Interrupt Pending */
-+#define SDIO_INT_PENDING_REG    0x05
-+#define SDIO_INT_PEND_MASK      0xFE
-+/* I/O Abort */
-+#define SDIO_IO_ABORT_REG       0x06
-+#define SDIO_IO_RESET           (1 << 3)
-+/* Bus Interface */
-+#define SDIO_BUS_IF_REG         0x07
-+#define CARD_DETECT_DISABLE     0x80
-+#define SDIO_BUS_WIDTH_1_BIT    0x00
-+#define SDIO_BUS_WIDTH_4_BIT    0x02
-+/* Card Capabilities */
-+#define SDIO_CARD_CAPS_REG          0x08
-+#define SDIO_CAPS_CMD52_WHILE_DATA  0x01   /* card can issue CMD52 while data transfer */
-+#define SDIO_CAPS_MULTI_BLOCK       0x02   /* card supports multi-block data transfers */
-+#define SDIO_CAPS_READ_WAIT         0x04   /* card supports read-wait protocol */
-+#define SDIO_CAPS_SUSPEND_RESUME    0x08   /* card supports I/O function suspend/resume */
-+#define SDIO_CAPS_INT_MULTI_BLK     0x10   /* interrupts between multi-block data capable */
-+#define SDIO_CAPS_ENB_INT_MULTI_BLK 0x20   /* enable ints between muli-block data */
-+#define SDIO_CAPS_LOW_SPEED         0x40   /* low speed card */
-+#define SDIO_CAPS_4BIT_LS           0x80   /* 4 bit low speed card */
-+/* Common CIS pointer */
-+#define SDIO_CMN_CIS_PTR_LOW_REG    0x09
-+#define SDIO_CMN_CIS_PTR_MID_REG    0x0a
-+#define SDIO_CMN_CIS_PTR_HI_REG     0x0b
-+/* Bus suspend */
-+#define SDIO_BUS_SUSPEND_REG            0x0c
-+#define SDIO_FUNC_SUSPEND_STATUS_MASK   0x01 /* selected function is suspended */
-+#define SDIO_SUSPEND_FUNCTION           0x02 /* suspend the current selected function */
-+/* Function select (for bus suspension) */
-+#define SDIO_FUNCTION_SELECT_REG        0x0d
-+#define SDIO_SUSPEND_FUNCTION_0         0x00
-+#define SDIO_SUSPEND_MEMORY_FUNC_MASK    0x08
-+/* Function Execution */
-+#define SDIO_FUNCTION_EXEC_REG          0x0e
-+#define SDIO_MEMORY_FUNC_EXEC_MASK      0x01
-+/* Function Ready */
-+#define SDIO_FUNCTION_READY_REG          0x0f
-+#define SDIO_MEMORY_FUNC_BUSY_MASK       0x01
-+
-+/* power control 1.10 only  */
-+#define SDIO_POWER_CONTROL_REG            0x12
-+#define SDIO_POWER_CONTROL_SMPC           0x01
-+#define SDIO_POWER_CONTROL_EMPC           0x02
-+
-+/* high speed control , 1.20 only */
-+#define SDIO_HS_CONTROL_REG               0x13
-+#define SDIO_HS_CONTROL_SHS               0x01
-+#define SDIO_HS_CONTROL_EHS               0x02
-+
-+/* Function Base Registers */
-+#define xFUNCTION_FBR_OFFSET(funcNo) (0x100*(funcNo))
-+/* offset calculation that does not use multiplication */
-+static INLINE UINT32 CalculateFBROffset(UCHAR FuncNo) {
-+    UCHAR i = FuncNo;
-+    UINT32 offset = 0;
-+    while (i) {
-+        offset += 0x100;
-+        i--;
-+    }
-+    return offset;
-+}
-+/* Function info */
-+#define FBR_FUNC_INFO_REG_OFFSET(fbr)   ((fbr) + 0x00)
-+#define FUNC_INFO_SUPPORTS_CSA_MASK     0x40
-+#define FUNC_INFO_ENABLE_CSA            0x80
-+#define FUNC_INFO_DEVICE_CODE_MASK      0x0F
-+#define FUNC_INFO_DEVICE_CODE_LAST      0x0F
-+#define FBR_FUNC_EXT_DEVICE_CODE_OFFSET(fbr) ((fbr) + 0x01)
-+/* Function Power selection */
-+#define FBR_FUNC_POWER_SELECT_OFFSET(fbr)    ((fbr) + 0x02)
-+#define FUNC_POWER_SELECT_SPS           0x01
-+#define FUNC_POWER_SELECT_EPS           0x02
-+/* Function CIS ptr */
-+#define FBR_FUNC_CIS_LOW_OFFSET(fbr)   ((fbr) + 0x09)
-+#define FBR_FUNC_CIS_MID_OFFSET(fbr)   ((fbr) + 0x0a)
-+#define FBR_FUNC_CIS_HI_OFFSET(fbr)    ((fbr) + 0x0b)
-+/* Function CSA ptr */
-+#define FBR_FUNC_CSA_LOW_OFFSET(fbr)   ((fbr) + 0x0c)
-+#define FBR_FUNC_CSA_MID_OFFSET(fbr)   ((fbr) + 0x0d)
-+#define FBR_FUNC_CSA_HI_OFFSET(fbr)    ((fbr) + 0x0e)
-+/* Function CSA data window */
-+#define FBR_FUNC_CSA_DATA_OFFSET(fbr)  ((fbr) + 0x0f)
-+/* Function Block Size Control */
-+#define FBR_FUNC_BLK_SIZE_LOW_OFFSET(fbr)  ((fbr) + 0x10)
-+#define FBR_FUNC_BLK_SIZE_HI_OFFSET(fbr)   ((fbr) + 0x11)
-+#define SDIO_CIS_AREA_BEGIN   0x00001000
-+#define SDIO_CIS_AREA_END     0x00017fff
-+/* Tuple definitions */
-+#define CISTPL_NULL         0x00
-+#define CISTPL_CHECKSUM     0x10
-+#define CISTPL_VERS_1       0x15
-+#define CISTPL_ALTSTR       0x16
-+#define CISTPL_MANFID       0x20
-+#define CISTPL_FUNCID       0x21
-+#define CISTPL_FUNCE        0x22
-+#define CISTPL_VENDOR       0x91
-+#define CISTPL_END          0xff
-+#define CISTPL_LINK_END     0xff
-+
-+
-+/* these structures must be packed */
-+
-+/* Manufacturer ID tuple */
-+struct SDIO_MANFID_TPL {
-+    UINT16  ManufacturerCode;   /* jedec code */
-+    UINT16  ManufacturerInfo;   /* manufacturer specific code */
-+}CT_PACK_STRUCT;
-+
-+/* Function ID Tuple */
-+struct SDIO_FUNC_ID_TPL {
-+    UINT8  DeviceCode;  /* device code */
-+    UINT8  InitMask;    /* system initialization mask (not used) */
-+}CT_PACK_STRUCT;
-+
-+    /* Extended Function Tuple (Common) */
-+struct SDIO_FUNC_EXT_COMMON_TPL {
-+    UINT8   Type;                               /* type */
-+    UINT16  Func0_MaxBlockSize;                 /* max function 0 block transfer size */
-+    UINT8   MaxTransSpeed;                      /* max transfer speed (encoded) */
-+#define TRANSFER_UNIT_MULTIPIER_MASK  0x07
-+#define TIME_VALUE_MASK               0x78
-+#define TIME_VALUE_SHIFT              3
-+}CT_PACK_STRUCT;
-+
-+/* Extended Function Tuple (Per Function) */
-+struct SDIO_FUNC_EXT_FUNCTION_TPL {
-+    UINT8   Type;                               /* type */
-+#define SDIO_FUNC_INFO_WAKEUP_SUPPORT 0x01
-+    UINT8   FunctionInfo;                       /* function info */
-+    UINT8   SDIORev;                            /* revision */
-+    UINT32  CardPSN;                            /* product serial number */
-+    UINT32  CSASize;                            /* CSA size */
-+    UINT8   CSAProperties;                      /* CSA properties */
-+    UINT16  MaxBlockSize;                       /* max block size for block transfers */
-+    UINT32  FunctionOCR;                        /* optimal function OCR */
-+    UINT8   OpMinPwr;                           /* operational min power */
-+    UINT8   OpAvgPwr;                           /* operational average power */
-+    UINT8   OpMaxPwr;                           /* operation maximum power */
-+    UINT8   SbMinPwr;                           /* standby minimum power */
-+    UINT8   SbAvgPwr;                           /* standby average power */
-+    UINT8   SbMaxPwr;                           /* standby maximum power */
-+    UINT16  MinBandWidth;                       /* minimum bus bandwidth */
-+    UINT16  OptBandWidth;                       /* optimalbus bandwitdh */
-+}CT_PACK_STRUCT;
-+
-+struct SDIO_FUNC_EXT_FUNCTION_TPL_1_1 {
-+    struct SDIO_FUNC_EXT_FUNCTION_TPL CommonInfo;  /* from 1.0*/
-+    UINT16  EnableTimeOut;                  /* timeout for enable */
-+    UINT16  OperPwrMaxPwr;
-+    UINT16  OperPwrAvgPwr;
-+    UINT16  HiPwrMaxPwr;
-+    UINT16  HiPwrAvgPwr;
-+    UINT16  LowPwrMaxPwr;
-+    UINT16  LowPwrAvgPwr;
-+}CT_PACK_STRUCT;
-+
-+static INLINE SDIO_STATUS ConvertCMD52ResponseToSDIOStatus(UINT8 CMD52ResponseFlags) {
-+    if (!(CMD52ResponseFlags & SD_R5_ERRORS)) {
-+        return SDIO_STATUS_SUCCESS;
-+    }
-+    if (CMD52ResponseFlags & SD_R5_ILLEGAL_CMD) {
-+        return SDIO_STATUS_DATA_STATE_INVALID;
-+    } else if (CMD52ResponseFlags & SD_R5_INVALID_FUNC) {
-+        return SDIO_STATUS_INVALID_FUNC;
-+    } else if (CMD52ResponseFlags & SD_R5_ARG_RANGE_ERR) {
-+        return SDIO_STATUS_FUNC_ARG_ERROR;
-+    } else {
-+        return SDIO_STATUS_DATA_ERROR_UNKNOWN;
-+    }
-+}
-+
-+/* CMD6 mode switch definitions */
-+
-+#define SD_SWITCH_FUNC_CHECK    0
-+#define SD_SWITCH_FUNC_SET      ((UINT32)(1 << 31))
-+#define SD_FUNC_NO_SELECT_MASK  0x00FFFFFF
-+#define SD_SWITCH_GRP_1         0
-+#define SD_SWITCH_GRP_2         1
-+#define SD_SWITCH_GRP_3         2
-+#define SD_SWITCH_GRP_4         3
-+#define SD_SWITCH_GRP_5         4
-+#define SD_SWITCH_GRP_6         5
-+
-+#define SD_SWITCH_HIGH_SPEED_GROUP     SD_SWITCH_GRP_1
-+#define SD_SWITCH_HIGH_SPEED_FUNC_NO   1
-+
-+#define SD_SWITCH_MAKE_SHIFT(grp) ((grp) * 4)
-+
-+#define SD_SWITCH_MAKE_GRP_PATTERN(FuncGrp,FuncNo) \
-+     ((SD_FUNC_NO_SELECT_MASK & (~(0xF << SD_SWITCH_MAKE_SHIFT(FuncGrp)))) |  \
-+        (((FuncNo) & 0xF) << SD_SWITCH_MAKE_SHIFT(FuncGrp)))                 \
-+
-+#define SD_SWITCH_FUNC_ARG_GROUP_CHECK(FuncGrp,FuncNo) \
-+    (SD_SWITCH_FUNC_CHECK | SD_SWITCH_MAKE_GRP_PATTERN(FuncGrp,FuncNo))
-+
-+#define SD_SWITCH_FUNC_ARG_GROUP_SET(FuncGrp,FuncNo)   \
-+    (SD_SWITCH_FUNC_SET | SD_SWITCH_MAKE_GRP_PATTERN(FuncGrp,FuncNo))
-+
-+#define SD_SWITCH_FUNC_STATUS_BLOCK_BYTES 64
-+
-+#define SD_SWITCH_FUNC_STATUS_GET_GRP_BIT_MASK(pBuffer,FuncGrp) \
-+    (USHORT)((pBuffer)[50 + ((FuncGrp)*2)] | ((pBuffer)[51 + ((FuncGrp)*2)] << 8))
-+
-+#define SD_SWITCH_FUNC_STATUS_GET_MAX_CURRENT(pBuffer) \
-+     (USHORT)((pBuffer)[62] | ((pBuffer)[63] << 8))
-+
-+static INLINE UINT8 SDSwitchGetSwitchResult(PUINT8 pBuffer, UINT8 FuncGrp)
-+{
-+    switch (FuncGrp) {
-+        case 0:
-+            return (pBuffer[47] & 0xF);
-+        case 1:
-+            return (pBuffer[47] >> 4);
-+        case 2:
-+            return (pBuffer[48] & 0xF);
-+        case 3:
-+            return (pBuffer[48] >> 4);
-+        case 4:
-+            return (pBuffer[49] & 0xF);
-+        case 5:
-+            return (pBuffer[49] >> 4);
-+        default:
-+            return 0xF;
-+    }
-+}
-+
-+#endif
-diff --git a/include/linux/sdio/ctsystem.h b/include/linux/sdio/ctsystem.h
-new file mode 100644
-index 0000000..4f72739
---- /dev/null
-+++ b/include/linux/sdio/ctsystem.h
-@@ -0,0 +1,115 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: cpsystem.h
-+
-+@abstract: common system include file.
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#ifndef __CPSYSTEM_H___
-+#define __CPSYSTEM_H___
-+
-+/* SDIO stack status defines */
-+/* < 0 error, >0 warning, 0 success */
-+#define SDIO_IS_WARNING(status) ((status) > 0)
-+#define SDIO_IS_ERROR(status) ((status) < 0)
-+#define SDIO_SUCCESS(status) ((SDIO_STATUS)(status) >= 0)
-+#define SDIO_STATUS_SUCCESS             0
-+#define SDIO_STATUS_ERROR              -1
-+#define SDIO_STATUS_INVALID_PARAMETER  -2
-+#define SDIO_STATUS_PENDING             3
-+#define SDIO_STATUS_DEVICE_NOT_FOUND   -4
-+#define SDIO_STATUS_DEVICE_ERROR       -5
-+#define SDIO_STATUS_INTERRUPTED        -6
-+#define SDIO_STATUS_NO_RESOURCES       -7
-+#define SDIO_STATUS_CANCELED           -8
-+#define SDIO_STATUS_BUFFER_TOO_SMALL   -9
-+#define SDIO_STATUS_NO_MORE_MESSAGES   -10
-+#define SDIO_STATUS_BUS_RESP_TIMEOUT   -20    /* response timed-out */
-+#define SDIO_STATUS_BUS_READ_TIMEOUT   -21    /* read data timed-out */
-+#define SDIO_STATUS_BUS_READ_CRC_ERR   -22   /* data CRC failed */
-+#define SDIO_STATUS_BUS_WRITE_ERROR    -23   /* write failed */
-+#define SDIO_STATUS_BUS_RESP_CRC_ERR   -24   /* response received with a CRC error */
-+#define SDIO_STATUS_INVALID_TUPLE_LENGTH -25 /* tuple length was invalid */
-+#define SDIO_STATUS_TUPLE_NOT_FOUND      -26 /* tuple could not be found */
-+#define SDIO_STATUS_CIS_OUT_OF_RANGE     -27 /* CIS is out of range in the tuple scan */
-+#define SDIO_STATUS_FUNC_ENABLE_TIMEOUT  -28 /* card timed out enabling or disabling */
-+#define SDIO_STATUS_DATA_STATE_INVALID   -29 /* card is in an invalid state for data */
-+#define SDIO_STATUS_DATA_ERROR_UNKNOWN   -30 /* card cannot process data transfer */
-+#define SDIO_STATUS_INVALID_FUNC         -31 /* sdio request is not valid for the function */
-+#define SDIO_STATUS_FUNC_ARG_ERROR       -32 /* sdio request argument is invalid or out of range */
-+#define SDIO_STATUS_INVALID_COMMAND      -33 /* SD COMMAND is invalid for the card state */
-+#define SDIO_STATUS_SDREQ_QUEUE_FAILED   -34 /* request failed to insert into queue */
-+#define SDIO_STATUS_BUS_RESP_TIMEOUT_SHIFTABLE -35  /* response timed-out, possibily shiftable to correct  */
-+#define SDIO_STATUS_UNSUPPORTED          -36  /* not supported  */
-+#define SDIO_STATUS_PROGRAM_TIMEOUT      -37  /* memory card programming timeout  */
-+#define SDIO_STATUS_PROGRAM_STATUS_ERROR -38  /* memory card programming errors  */
-+
-+#include <linux/sdio/ctsystem_linux.h>
-+
-+/* get structure from contained field */
-+#define CONTAINING_STRUCT(address, struct_type, field_name)\
-+            ((struct_type *)((ULONG_PTR)(address) - (ULONG_PTR)(&((struct_type *)0)->field_name)))
-+
-+#define ZERO_OBJECT(obj) memset(&(obj),0,sizeof(obj))
-+#define ZERO_POBJECT(pObj) memset((pObj),0,sizeof(*(pObj)))
-+
-+
-+/* bit field support functions */
-+static INLINE void SetBit(PULONG pField, UINT position) {
-+    *pField |= 1 << position;
-+}
-+static INLINE void ClearBit(PULONG pField, UINT position) {
-+    *pField &= ~(1 << position);
-+}
-+static INLINE BOOL IsBitSet(PULONG pField, UINT position) {
-+    return (*pField & (1 << position));
-+}
-+static INLINE INT FirstClearBit(PULONG pField) {
-+    UINT ii;
-+    for(ii = 0; ii < sizeof(ULONG)*8; ii++) {
-+        if (!IsBitSet(pField, ii)) {
-+            return ii;
-+        }
-+    }
-+    /* no clear bits found */
-+    return -1;
-+}
-+
-+#endif /* __CPSYSTEM_H___ */
-diff --git a/include/linux/sdio/ctsystem_linux.h b/include/linux/sdio/ctsystem_linux.h
-new file mode 100644
-index 0000000..0de89a6
---- /dev/null
-+++ b/include/linux/sdio/ctsystem_linux.h
-@@ -0,0 +1,983 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: ctsystem_linux.h
-+
-+@abstract: common system include file for Linux.
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#ifndef __CPSYSTEM_LINUX_H___
-+#define __CPSYSTEM_LINUX_H___
-+
-+/* #define DBG_TIMESTAMP 1 */
-+#define SD_TRACK_REQ 1
-+
-+/* LINUX support */
-+#include <linux/version.h>
-+
-+#ifndef KERNEL_VERSION
-+  #error KERNEL_VERSION macro not defined!
-+#endif
-+
-+#ifndef  LINUX_VERSION_CODE
-+  #error LINUX_VERSION_CODE macro not defined!
-+#endif
-+
-+#include <linux/autoconf.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/types.h>
-+#include <linux/spinlock.h>
-+#include <linux/module.h>
-+
-+#include <linux/interrupt.h>
-+#include <linux/pnp.h>
-+#include <asm/hardirq.h>
-+#include <asm/semaphore.h>
-+#include <asm/io.h>
-+#include <asm/scatterlist.h>
-+#ifdef DBG_TIMESTAMP
-+#include <asm/timex.h>
-+#endif /* DBG_TIMESTAMP */
-+#ifndef in_atomic
-+    /* released version of 2.6.9 */
-+#include <linux/hardirq.h>
-+#endif
-+#include <linux/delay.h>
-+#include <linux/device.h>
-+
-+/* generic types */
-+typedef    unsigned char    UCHAR;
-+typedef    unsigned char *  PUCHAR;
-+typedef    char             TEXT;
-+typedef    char *           PTEXT;
-+typedef    unsigned short   USHORT;
-+typedef    unsigned short*  PUSHORT;
-+typedef    unsigned int     UINT;
-+typedef    unsigned int*    PUINT;
-+typedef    int              INT;
-+typedef    int*             PINT;
-+typedef    unsigned long    ULONG;
-+typedef    unsigned long*   PULONG;
-+typedef    u8               UINT8;
-+typedef    u16              UINT16;
-+typedef    u32              UINT32;
-+typedef    u8*              PUINT8;
-+typedef    u16*             PUINT16;
-+typedef    u32*             PUINT32;
-+typedef    unsigned char *  ULONG_PTR;
-+typedef    void*            PVOID;
-+typedef    unsigned char    BOOL;
-+typedef    BOOL*            PBOOL;
-+typedef    int              SDIO_STATUS;
-+typedef    int              SYSTEM_STATUS;
-+typedef    unsigned int     EVENT_TYPE;
-+typedef    unsigned int     EVENT_ARG;
-+typedef    unsigned int*    PEVENT_TYPE;
-+typedef    struct semaphore OS_SEMAPHORE;
-+typedef    struct semaphore* POS_SEMAPHORE;
-+typedef    struct semaphore  OS_SIGNAL;    /* OS signals are just semaphores */
-+typedef    struct semaphore* POS_SIGNAL;
-+typedef    spinlock_t OS_CRITICALSECTION;
-+typedef    spinlock_t *POS_CRITICALSECTION;
-+typedef    int              SDPOWER_STATE;
-+typedef    unsigned long    ATOMIC_FLAGS;
-+typedef    INT              THREAD_RETURN;
-+typedef    dma_addr_t       DMA_ADDRESS;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
-+typedef    struct task_struct* PKERNEL_TASK;
-+typedef    struct device_driver OS_DRIVER;
-+typedef    struct device_driver* POS_DRIVER;
-+typedef    struct device    OS_DEVICE;
-+typedef    struct device*   POS_DEVICE;
-+typedef    struct pnp_driver OS_PNPDRIVER;
-+typedef    struct pnp_driver* POS_PNPDRIVER;
-+typedef    struct pnp_dev   OS_PNPDEVICE;
-+typedef    struct pnp_dev*  POS_PNPDEVICE;
-+typedef    struct module*   POS_MODULE;
-+#else
-+/* 2.4 */
-+typedef    int              PKERNEL_TASK;
-+typedef    PVOID            OS_DRIVER;
-+typedef    PVOID*           POS_DRIVER;
-+typedef    PVOID            OS_DEVICE;
-+typedef    PVOID*           POS_DEVICE;
-+typedef    PVOID            OS_PNPDRIVER;
-+typedef    PVOID*           POS_PNPDRIVER;
-+typedef    PVOID            OS_PNPDEVICE;
-+typedef    PVOID*           POS_PNPDEVICE;
-+typedef    struct module*   POS_MODULE;
-+#define    module_param(a,b,c) MODULE_PARM(a, "i")
-+#endif
-+
-+typedef    int              CT_DEBUG_LEVEL;
-+
-+
-+#ifndef TRUE
-+#define TRUE 1
-+#endif
-+#ifndef FALSE
-+#define FALSE 0
-+#endif
-+#ifndef NULL
-+#define NULL ((PVOID)0)
-+#endif
-+#define SDDMA_DESCRIPTION_FLAG_DMA   0x1  /* DMA enabled */
-+#define SDDMA_DESCRIPTION_FLAG_SGDMA 0x2  /* Scatter-Gather DMA enabled */
-+typedef struct _SDDMA_DESCRIPTION {
-+    UINT16      Flags;      /* SDDMA_DESCRIPTION_FLAG_xxx */
-+    UINT16      MaxDescriptors; /* number of supported scatter gather entries */
-+    UINT32      MaxBytesPerDescriptor;  /* maximum bytes in a DMA descriptor entry */
-+    u64         Mask;              /* dma address mask */
-+    UINT32      AddressAlignment;  /* dma address alignment mask, least significant bits indicate illegal address bits */
-+    UINT32      LengthAlignment;   /* dma buffer length alignment mask, least significant bits indicate illegal length bits  */
-+}SDDMA_DESCRIPTION, *PSDDMA_DESCRIPTION;
-+typedef struct scatterlist SDDMA_DESCRIPTOR, *PSDDMA_DESCRIPTOR;
-+
-+#define INLINE  inline
-+#define CT_PACK_STRUCT __attribute__ ((packed))
-+
-+#define CT_DECLARE_MODULE_PARAM_INTEGER(p)  module_param(p, int, 0644);
-+
-+/* debug print macros */
-+//#define SDDBG_KERNEL_PRINT_LEVEL KERN_DEBUG
-+#define SDDBG_KERNEL_PRINT_LEVEL KERN_ALERT
-+#define DBG_MASK_NONE 0x0
-+#define DBG_MASK_HCD  0x100
-+#define DBG_MASK_LIB  0x200
-+#define DBG_MASK_BUS  0x400
-+
-+/* debug output levels, this must be order low number to higher */
-+#define SDDBG_ERROR 3
-+#define SDDBG_WARN  4
-+#define SDDBG_DEBUG 6
-+#define SDDBG_TRACE 7
-+#define SDDBG_ALL   0xff
-+
-+#define DBG_LEVEL_NONE  0
-+#define DBG_LEVEL_ERROR SDDBG_ERROR
-+#define DBG_LEVEL_WARN  SDDBG_WARN
-+#define DBG_LEVEL_DEBUG SDDBG_DEBUG
-+#define DBG_LEVEL_TRACE SDDBG_TRACE
-+#define DBG_LEVEL_ALL   SDDBG_ALL
-+
-+#define DBG_GET_LEVEL(lvl) ((lvl) & 0xff)
-+#define DBG_GET_MASK(lvl) (((lvl) & 0xff00))
-+
-+#define DBG_SDIO_MASK (DBG_MASK_NONE | DBG_LEVEL_DEBUG)
-+
-+#define DEBUG 1
-+
-+#ifdef DEBUG
-+
-+#define DBG_ASSERT(test) \
-+{                         \
-+    if (!(test)) {          \
-+        DBG_PRINT(SDDBG_ERROR, ("Debug Assert Caught, File %s, Line: %d, Test:%s \n",__FILE__, __LINE__,#test)); \
-+    }                     \
-+}
-+#define DBG_ASSERT_WITH_MSG(test,s) \
-+{                                   \
-+    if (!(test)) {                  \
-+        DBG_PRINT(SDDBG_ERROR, ("Assert:%s File %s, Line: %d \n",(s),__FILE__, __LINE__)); \
-+    }                     \
-+}
-+
-+#define DBG_PRINT(lvl, args)\
-+    do {\
-+            if (DBG_GET_LEVEL(lvl) <= (DBG_SDIO_MASK & 0xff)) \
-+                printk(_DBG_PRINTX_ARG args); \
-+    } while(0);
-+
-+#else /* DEBUG */
-+
-+#define DBG_PRINT(lvl, str)
-+#define DBG_ASSERT(test)
-+#define DBG_ASSERT_WITH_MSG(test,s)
-+#endif /* DEBUG */
-+
-+#define _DBG_PRINTX_ARG(arg...) arg /* unroll the parens around the var args*/
-+#define DBG_GET_DEBUG_LEVEL() DBG_GET_LEVEL(DBG_SDIO_MASK)
-+#define DBG_SET_DEBUG_LEVEL(v)
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Print a string to the debugger or console
-+
-+  @function name: REL_PRINT
-+  @prototype: void REL_PRINT(INT Level, string)
-+  @category: Support_Reference
-+  @input:  Level - debug level for the print
-+
-+  @output: none
-+
-+  @return:
-+
-+  @notes: If Level is less than the current debug level, the print will be
-+          issued. This print cannot be conditionally compiled.
-+  @see also: DBG_PRINT
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define REL_PRINT(lvl, args)\
-+    {if (lvl <= DBG_GET_DEBUG_LEVEL())\
-+        printk(SDDBG_KERNEL_PRINT_LEVEL _DBG_PRINTX_ARG args);\
-+    }
-+/* debug output levels, this must be order low number to higher */
-+#define SDDBG_ERROR 3
-+#define SDDBG_WARN  4
-+#define SDDBG_DEBUG 6
-+#define SDDBG_TRACE 7
-+
-+#ifdef DBG_CRIT_SECTION_RECURSE
-+   /* this macro thows an exception if the lock is recursively taken
-+    * the kernel must be configured with: CONFIG_DEBUG_SPINLOCK=y */
-+#define call_spin_lock(pCrit) \
-+{                                     \
-+  UINT32 unlocked = 1;                \
-+  if ((pCrit)->lock) {unlocked = 0;}  \
-+  spin_lock_bh(pCrit);                \
-+  if (!unlocked) {                     \
-+     unlocked = 0x01;                   \
-+     unlocked = *((volatile UINT32 *)unlocked); \
-+  }                                   \
-+}
-+
-+#define call_spin_lock_irqsave(pCrit,isc) \
-+{                                     \
-+  UINT32 unlocked = 1;                \
-+  if ((pCrit)->lock) {unlocked = 0;}  \
-+  spin_lock_irqsave(pCrit,isc);                \
-+  if (!unlocked) {                     \
-+     unlocked = 0x01;                   \
-+     unlocked = *((volatile UINT32 *)unlocked); \
-+  }                                   \
-+}
-+
-+#else
-+#define call_spin_lock(s) spin_lock_bh(s)
-+#define call_spin_lock_irqsave(s,isc) spin_lock_irqsave(s,isc)
-+#endif
-+
-+#define call_spin_unlock(s) spin_unlock_bh((s))
-+#define call_spin_unlock_irqrestore(s,isc) spin_unlock_irqrestore(s,isc)
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
-+#define NonSchedulable() (in_atomic() || irqs_disabled())
-+#else
-+#define NonSchedulable() (irqs_disabled())
-+#endif
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Initialize a critical section object.
-+
-+  @function name: CriticalSectionInit
-+  @prototype: SDIO_STATUS CriticalSectionInit(POS_CRITICALSECTION pCrit)
-+  @category: Support_Reference
-+  @output: pCrit - pointer to critical section to initialize
-+
-+  @return: SDIO_STATUS_SUCCESS on success.
-+
-+  @notes:  CriticalSectionDelete() must be called to cleanup any resources
-+           associated with the critical section.
-+
-+  @see also: CriticalSectionDelete, CriticalSectionAcquire, CriticalSectionRelease
-+  @example: To initialize a critical section:
-+        status = CriticalSectionInit(&pDevice->ListLock);
-+        if (!SDIO_SUCCESS(status)) {
-+                .. failed
-+            return status;
-+        }
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline SDIO_STATUS CriticalSectionInit(POS_CRITICALSECTION pCrit) {
-+    spin_lock_init(pCrit);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Acquire a critical section lock.
-+
-+  @function name: CriticalSectionAcquire
-+  @prototype: SDIO_STATUS CriticalSectionAcquire(POS_CRITICALSECTION pCrit)
-+  @category: Support_Reference
-+
-+  @input: pCrit - pointer to critical section that was initialized
-+
-+  @return: SDIO_STATUS_SUCCESS on success.
-+
-+  @notes:  The critical section lock is acquired when this function returns
-+           SDIO_STATUS_SUCCESS.  Use CriticalSectionRelease() to release
-+           the critical section lock.
-+
-+  @see also: CriticalSectionRelease
-+
-+  @example: To acquire a critical section lock:
-+        status = CriticalSectionAcquire(&pDevice->ListLock);
-+        if (!SDIO_SUCCESS(status)) {
-+                .. failed
-+            return status;
-+        }
-+        ... access protected data
-+            // unlock
-+        status = CriticalSectionRelease(&pDevice->ListLock);
-+        if (!SDIO_SUCCESS(status)) {
-+                .. failed
-+            return status;
-+        }
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline SDIO_STATUS CriticalSectionAcquire(POS_CRITICALSECTION pCrit) {
-+    call_spin_lock(pCrit);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+// macro-tized versions
-+#define CriticalSectionAcquire_M(pCrit) \
-+    SDIO_STATUS_SUCCESS; call_spin_lock(pCrit)
-+#define CriticalSectionRelease_M(pCrit) \
-+    SDIO_STATUS_SUCCESS; call_spin_unlock(pCrit)
-+
-+#define CT_DECLARE_IRQ_SYNC_CONTEXT() unsigned long _ctSyncFlags
-+
-+#define CriticalSectionAcquireSyncIrq(pCrit) \
-+    SDIO_STATUS_SUCCESS; call_spin_lock_irqsave(pCrit,_ctSyncFlags)
-+
-+#define CriticalSectionReleaseSyncIrq(pCrit) \
-+    SDIO_STATUS_SUCCESS; call_spin_unlock_irqrestore(pCrit,_ctSyncFlags)
-+
-+
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Release a critical section lock.
-+
-+  @function name: CriticalSectionRelease
-+  @prototype: SDIO_STATUS CriticalSectionRelease(POS_CRITICALSECTION pCrit)
-+  @category: Support_Reference
-+
-+  @input: pCrit - pointer to critical section that was initialized
-+
-+  @return: SDIO_STATUS_SUCCESS on success.
-+
-+  @notes:  The critical section lock is released when this function returns
-+           SDIO_STATUS_SUCCESS.
-+
-+  @see also: CriticalSectionAcquire
-+
-+  @example: see CriticalSectionAcquire
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline SDIO_STATUS CriticalSectionRelease(POS_CRITICALSECTION pCrit) {
-+    call_spin_unlock(pCrit);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Cleanup a critical section object
-+
-+  @function name: CriticalSectionDelete
-+  @prototype: void CriticalSectionDelete(POS_CRITICALSECTION pCrit)
-+  @category: Support_Reference
-+
-+  @input: pCrit - an initialized critical section object
-+
-+  @return: SDIO_STATUS_SUCCESS on success.
-+
-+  @notes:
-+
-+  @see also: CriticalSectionInit, CriticalSectionAcquire, CriticalSectionRelease
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline void CriticalSectionDelete(POS_CRITICALSECTION pCrit) {
-+    return;
-+}
-+
-+/* internal use */
-+static inline SDIO_STATUS SignalInitialize(POS_SIGNAL pSignal) {
-+    sema_init(pSignal, 0);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+/* internal use */
-+static inline void SignalDelete(POS_SIGNAL pSignal) {
-+    return;
-+}
-+/* internal use */
-+static inline SDIO_STATUS SignalWaitInterruptible(POS_SIGNAL pSignal) {
-+    DBG_ASSERT_WITH_MSG(!NonSchedulable(),"SignalWaitInterruptible not allowed\n");
-+    if (down_interruptible(pSignal) == 0) {
-+        return SDIO_STATUS_SUCCESS;
-+    } else {
-+        return SDIO_STATUS_INTERRUPTED;
-+    }
-+}
-+/* internal use */
-+static inline SDIO_STATUS SignalWait(POS_SIGNAL pSignal) {
-+    DBG_ASSERT_WITH_MSG(!NonSchedulable(),"SignalWait not allowed\n");
-+    down(pSignal);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+/* internal use */
-+static inline SDIO_STATUS SignalSet(POS_SIGNAL pSignal) {
-+    up(pSignal);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Initialize a semaphore object.
-+
-+  @function name: SemaphoreInitialize
-+  @prototype: SDIO_STATUS SemaphoreInitialize(POS_SEMAPHORE pSem, UINT value)
-+  @category: Support_Reference
-+
-+  @input:  value - initial value of the semaphore
-+
-+  @output: pSem - pointer to a semaphore object to initialize
-+
-+  @return: SDIO_STATUS_SUCCESS on success.
-+
-+  @notes:  SemaphoreDelete() must be called to cleanup any resources
-+           associated with the semaphore
-+
-+  @see also: SemaphoreDelete, SemaphorePend, SemaphorePendInterruptable
-+
-+  @example: To initialize a semaphore:
-+        status = SemaphoreInitialize(&pDevice->ResourceSem,1);
-+        if (!SDIO_SUCCESS(status)) {
-+                .. failed
-+            return status;
-+        }
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline SDIO_STATUS SemaphoreInitialize(POS_SEMAPHORE pSem, UINT value) {
-+    sema_init(pSem, value);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Cleanup a semaphore object.
-+
-+  @function name: SemaphoreDelete
-+  @prototype: void SemaphoreDelete(POS_SEMAPHORE pSem)
-+  @category: Support_Reference
-+
-+  @input: pSem - pointer to a semaphore object to cleanup
-+
-+  @return:
-+
-+  @notes:
-+
-+  @see also: SemaphoreInitialize
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline void SemaphoreDelete(POS_SEMAPHORE pSem) {
-+    return;
-+}
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Acquire the semaphore or pend if the resource is not available
-+
-+  @function name: SemaphorePend
-+  @prototype: SDIO_STATUS SemaphorePend(POS_SEMAPHORE pSem)
-+  @category: Support_Reference
-+
-+  @input: pSem - pointer to an initialized semaphore object
-+
-+  @return: SDIO_STATUS_SUCCESS on success.
-+
-+  @notes: If the semaphore count is zero this function blocks until the count
-+          becomes non-zero, otherwise the count is decremented and execution
-+          continues. While waiting, the task/thread cannot be interrupted.
-+          If the task or thread should be interruptible, use SemaphorePendInterruptible.
-+          On some OSes SemaphorePend and SemaphorePendInterruptible behave the same.
-+
-+  @see also: SemaphorePendInterruptable, SemaphorePost
-+  @example: To wait for a resource using a semaphore:
-+        status = SemaphorePend(&pDevice->ResourceSem);
-+        if (!SDIO_SUCCESS(status)) {
-+                .. failed
-+            return status;
-+        }
-+        ... resource acquired
-+        SemaphorePost(&pDevice->ResourceSem);
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline SDIO_STATUS SemaphorePend(POS_SEMAPHORE pSem) {
-+    DBG_ASSERT_WITH_MSG(!NonSchedulable(),"SemaphorePend not allowed\n");
-+    down(pSem);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Acquire the semaphore or pend if the resource is not available
-+
-+  @function name: SemaphorePendInterruptable
-+  @prototype: SDIO_STATUS SemaphorePendInterruptable(POS_SEMAPHORE pSem)
-+  @category: Support_Reference
-+
-+  @input: pSem - pointer to an initialized semaphore object
-+
-+  @return: SDIO_STATUS_SUCCESS on success.
-+
-+  @notes: If the semaphore count is zero this function blocks until the count
-+          becomes non-zero, otherwise the count is decremented and execution
-+          continues. While waiting, the task/thread can be interrupted.
-+          If the task or thread should not be interruptible, use SemaphorePend.
-+
-+  @see also: SemaphorePend, SemaphorePost
-+  @example: To wait for a resource using a semaphore:
-+        status = SemaphorePendInterruptable(&pDevice->ResourceSem);
-+        if (!SDIO_SUCCESS(status)) {
-+                .. failed, could have been interrupted
-+            return status;
-+        }
-+        ... resource acquired
-+        SemaphorePost(&pDevice->ResourceSem);
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline SDIO_STATUS SemaphorePendInterruptable(POS_SEMAPHORE pSem) {
-+    DBG_ASSERT_WITH_MSG(!NonSchedulable(),"SemaphorePendInterruptable not allowed\n");
-+    if (down_interruptible(pSem) == 0) {
-+        return SDIO_STATUS_SUCCESS;
-+    } else {
-+        return SDIO_STATUS_INTERRUPTED;
-+    }
-+}
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Post a semaphore.
-+
-+  @function name: SemaphorePost
-+  @prototype: SDIO_STATUS SemaphorePost(POS_SEMAPHORE pSem)
-+  @category: Support_Reference
-+
-+  @input: pSem - pointer to an initialized semaphore object
-+
-+  @return: SDIO_STATUS_SUCCESS on success.
-+
-+  @notes: This function increments the semaphore count.
-+
-+  @see also: SemaphorePend, SemaphorePendInterruptable.
-+  @example: Posting a semaphore:
-+        status = SemaphorePendInterruptable(&pDevice->ResourceSem);
-+        if (!SDIO_SUCCESS(status)) {
-+                .. failed, could have been interrupted
-+            return status;
-+        }
-+        ... resource acquired
-+            // post the semaphore
-+        SemaphorePost(&pDevice->ResourceSem);
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline SDIO_STATUS SemaphorePost(POS_SEMAPHORE pSem) {
-+    DBG_ASSERT_WITH_MSG(!NonSchedulable(),"SemaphorePost not allowed\n");
-+    up(pSem);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Allocate a block of kernel accessible memory
-+
-+  @function name: KernelAlloc
-+  @prototype: PVOID KernelAlloc(UINT size)
-+  @category: Support_Reference
-+
-+  @input: size - size of memory block to allocate
-+
-+  @return: pointer to the allocated memory, NULL if allocation failed
-+
-+  @notes: For operating systems that use paging, the allocated memory is always
-+          non-paged memory.  Caller should only use KernelFree() to release the
-+          block of memory.  This call can potentially block and should only be called
-+          from a schedulable context.  Use KernelAllocIrqSafe() if the allocation
-+          must be made from a non-schedulable context.
-+
-+  @see also: KernelFree, KernelAllocIrqSafe
-+  @example: allocating memory:
-+        pBlock = KernelAlloc(1024);
-+        if (pBlock == NULL) {
-+                .. failed, no memory
-+            return SDIO_STATUS_INSUFFICIENT_RESOURCES;
-+        }
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline PVOID KernelAlloc(UINT size) {
-+    PVOID pMem = kmalloc(size, GFP_KERNEL);
-+    if (pMem != NULL) { memset(pMem,0,size); }
-+    return pMem;
-+}
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Free a block of kernel accessible memory.
-+
-+  @function name: KernelFree
-+  @prototype: void KernelFree(PVOID ptr)
-+  @category: Support_Reference
-+
-+  @input: ptr - pointer to memory allocated with KernelAlloc()
-+
-+  @return:
-+
-+  @notes: Caller should only use KernelFree() to release memory that was allocated
-+          with KernelAlloc().
-+
-+  @see also: KernelAlloc
-+  @example: KernelFree(pBlock);
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline void KernelFree(PVOID ptr) {
-+    kfree(ptr);
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Allocate a block of kernel accessible memory in an IRQ-safe manner
-+
-+  @function name: KernelAllocIrqSafe
-+  @prototype: PVOID KernelAllocIrqSafe(UINT size)
-+  @category: Support_Reference
-+
-+  @input: size - size of memory block to allocate
-+
-+  @return: pointer to the allocated memory, NULL if allocation failed
-+
-+  @notes: This variant of KernelAlloc allows the allocation of small blocks of
-+          memory from an ISR or from a context where scheduling has been disabled.
-+          The allocations should be small as the memory is typically allocated
-+          from a critical heap. The caller should only use KernelFreeIrqSafe()
-+          to release the block of memory.
-+
-+  @see also: KernelAlloc, KernelFreeIrqSafe
-+  @example: allocating memory:
-+        pBlock = KernelAllocIrqSafe(16);
-+        if (pBlock == NULL) {
-+                .. failed, no memory
-+            return SDIO_STATUS_INSUFFICIENT_RESOURCES;
-+        }
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline PVOID KernelAllocIrqSafe(UINT size) {
-+    return kmalloc(size, GFP_ATOMIC);
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Free a block of kernel accessible memory.
-+
-+  @function name: KernelFreeIrqSafe
-+  @prototype: void KernelFreeIrqSafe(PVOID ptr)
-+  @category: Support_Reference
-+
-+  @input: ptr - pointer to memory allocated with KernelAllocIrqSafe()
-+
-+  @return:
-+
-+  @notes: Caller should only use KernelFreeIrqSafe() to release memory that was allocated
-+          with KernelAllocIrqSafe().
-+
-+  @see also: KernelAllocIrqSafe
-+  @example: KernelFreeIrqSafe(pBlock);
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline void KernelFreeIrqSafe(PVOID ptr) {
-+    kfree(ptr);
-+}
-+
-+/* error status conversions */
-+static inline SYSTEM_STATUS SDIOErrorToOSError(SDIO_STATUS status) {
-+    switch (status) {
-+        case SDIO_STATUS_SUCCESS:
-+            return 0;
-+        case SDIO_STATUS_INVALID_PARAMETER:
-+            return -EINVAL;
-+        case SDIO_STATUS_PENDING:
-+            return -EAGAIN; /* try again */
-+        case SDIO_STATUS_DEVICE_NOT_FOUND:
-+            return -ENXIO;
-+        case SDIO_STATUS_DEVICE_ERROR:
-+            return -EIO;
-+        case SDIO_STATUS_INTERRUPTED:
-+            return -EINTR;
-+        case SDIO_STATUS_NO_RESOURCES:
-+            return -ENOMEM;
-+        case SDIO_STATUS_ERROR:
-+        default:
-+            return -EFAULT;
-+    }
-+}
-+static inline SDIO_STATUS OSErrorToSDIOError(SYSTEM_STATUS status) {
-+    if (status >=0) {
-+        return SDIO_STATUS_SUCCESS;
-+    }
-+    switch (status) {
-+        case -EINVAL:
-+            return SDIO_STATUS_INVALID_PARAMETER;
-+        case -ENXIO:
-+            return SDIO_STATUS_DEVICE_NOT_FOUND;
-+        case -EIO:
-+            return SDIO_STATUS_DEVICE_ERROR;
-+        case -EINTR:
-+            return SDIO_STATUS_INTERRUPTED;
-+        case -ENOMEM:
-+            return SDIO_STATUS_NO_RESOURCES;
-+        case -EFAULT:
-+            return SDIO_STATUS_ERROR;
-+        default:
-+            return SDIO_STATUS_ERROR;
-+    }
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Sleep or delay the execution context for a number of milliseconds.
-+
-+  @function name: OSSleep
-+  @prototype: SDIO_STATUS OSSleep(INT SleepInterval)
-+  @category: Support_Reference
-+
-+  @input: SleepInterval - time in milliseconds to put the execution context to sleep
-+
-+  @return: SDIO_STATUS_SUCCESS if sleep succeeded.
-+
-+  @notes: Caller should be in a context that allows it to sleep or block.  The
-+  minimum duration of sleep may be greater than 1 MS on some platforms and OSes.
-+
-+  @see also: OSSleep
-+  @example: Using sleep to delay
-+        EnableSlotPower(pSlot);
-+            // wait for power to settle
-+        status = OSSleep(100);
-+        if (!SDIO_SUCCESS(status)){
-+            // failed..
-+        }
-+
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline SDIO_STATUS OSSleep(INT SleepInterval) {
-+    UINT32 delta;
-+
-+    DBG_ASSERT_WITH_MSG(!NonSchedulable(),"OSSleep not allowed\n");
-+        /* convert timeout to ticks */
-+    delta = (SleepInterval * HZ)/1000;
-+    if (delta == 0) {
-+        delta = 1;
-+    }
-+    set_current_state(TASK_INTERRUPTIBLE);
-+    if (schedule_timeout(delta) != 0) {
-+        return SDIO_STATUS_INTERRUPTED;
-+    }
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: get the OSs device object
-+
-+  @function name: SD_GET_OS_DEVICE
-+  @prototype: POS_DEVICE SD_GET_OS_DEVICE(PSDDEVICE pDevice)
-+  @category: Support_Reference
-+
-+  @input: pDevice - the device on the HCD
-+
-+  @return: pointer to the OSs device
-+
-+  @see also:
-+  @example: obtain low level device
-+        pFunctionContext->GpsDevice.Port.dev = SD_GET_OS_DEVICE(pDevice);
-+
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SD_GET_OS_DEVICE(pDevice) &((pDevice)->Device.dev)
-+
-+
-+#ifdef __iomem
-+    /* new type checking in 2.6.9 */
-+    /* I/O Access macros */
-+#define _READ_DWORD_REG(reg)  \
-+        readl((const volatile void __iomem *)(reg))
-+#define _READ_WORD_REG(reg)  \
-+        readw((const volatile void __iomem *)(reg))
-+#define _READ_BYTE_REG(reg)  \
-+        readb((const volatile void __iomem *)(reg))
-+#define _WRITE_DWORD_REG(reg,value)  \
-+        writel((value),(volatile void __iomem *)(reg))
-+#define _WRITE_WORD_REG(reg,value)  \
-+        writew((value),(volatile void __iomem *)(reg))
-+#define _WRITE_BYTE_REG(reg,value)  \
-+        writeb((value),(volatile void __iomem *)(reg))
-+#else
-+    /* I/O Access macros */
-+#define _READ_DWORD_REG(reg)  \
-+        readl((reg))
-+#define _READ_WORD_REG(reg)  \
-+        readw((reg))
-+#define _READ_BYTE_REG(reg)  \
-+        readb((reg))
-+#define _WRITE_DWORD_REG(reg,value)  \
-+        writel((value),(reg))
-+#define _WRITE_WORD_REG(reg,value)  \
-+        writew((value),(reg))
-+#define _WRITE_BYTE_REG(reg,value)  \
-+        writeb((value),(reg))
-+#endif
-+    /* atomic operators */
-+static inline ATOMIC_FLAGS AtomicTest_Set(volatile ATOMIC_FLAGS *pValue, INT BitNo) {
-+    return test_and_set_bit(BitNo,(ATOMIC_FLAGS *)pValue);
-+}
-+static inline ATOMIC_FLAGS AtomicTest_Clear(volatile ATOMIC_FLAGS *pValue, INT BitNo) {
-+    return test_and_clear_bit(BitNo,(ATOMIC_FLAGS *)pValue);
-+}
-+
-+struct _OSKERNEL_HELPER;
-+
-+typedef THREAD_RETURN (*PHELPER_FUNCTION)(struct _OSKERNEL_HELPER *);
-+
-+typedef struct _OSKERNEL_HELPER {
-+    PKERNEL_TASK            pTask;
-+    BOOL                    ShutDown;
-+    OS_SIGNAL               WakeSignal;
-+    struct completion       Completion;
-+    PVOID                   pContext;
-+    PHELPER_FUNCTION        pHelperFunc;
-+}OSKERNEL_HELPER, *POSKERNEL_HELPER;
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Wake the helper thread
-+
-+  @function name: SD_WAKE_OS_HELPER
-+  @prototype: SD_WAKE_OS_HELPER(POSKERNEL_HELPER pOSHelper)
-+  @category: Support_Reference
-+
-+  @input: pOSHelper - the OS helper object
-+
-+  @return: SDIO_STATUS
-+
-+  @see also: SDLIB_OSCreateHelper
-+
-+  @example: Waking up a helper thread
-+        status = SD_WAKE_OS_HELPER(&pInstance->OSHelper);
-+
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SD_WAKE_OS_HELPER(p)        SignalSet(&(p)->WakeSignal)
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Obtains the context for the helper function
-+
-+  @function name: SD_GET_OS_HELPER_CONTEXT
-+  @prototype: SD_GET_OS_HELPER_CONTEXT(POSKERNEL_HELPER pOSHelper)
-+  @category: Support_Reference
-+
-+  @input: pOSHelper - the OS helper object
-+
-+  @return: helper specific context
-+
-+  @notes: This macro should only be called by the function associated with
-+          the helper object.
-+
-+  @see also: SDLIB_OSCreateHelper
-+
-+  @example: Getting the helper specific context
-+        PMYCONTEXT pContext = (PMYCONTEXT)SD_GET_OS_HELPER_CONTEXT(pHelper);
-+
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SD_GET_OS_HELPER_CONTEXT(p)     (p)->pContext
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Check helper function shut down flag.
-+
-+  @function name: SD_IS_HELPER_SHUTTING_DOWN
-+  @prototype: SD_IS_HELPER_SHUTTING_DOWN(POSKERNEL_HELPER pOSHelper)
-+  @category: Support_Reference
-+
-+  @input: pOSHelper - the OS helper object
-+
-+  @return: TRUE if shutting down, else FALSE
-+
-+  @notes: This macro should only be called by the function associated with
-+          the helper object.  The function should call this macro when it
-+          unblocks from the call to SD_WAIT_FOR_WAKEUP().  If this function
-+          returns TRUE, the function should clean up and exit.
-+
-+  @see also: SDLIB_OSCreateHelper , SD_WAIT_FOR_WAKEUP
-+
-+  @example: Checking for shutdown
-+        while(1) {
-+              status = SD_WAIT_FOR_WAKEUP(pHelper);
-+              if (!SDIO_SUCCESS(status)) {
-+                  break;
-+              }
-+              if (SD_IS_HELPER_SHUTTING_DOWN(pHelper)) {
-+                  ... shutting down
-+                  break;
-+              }
-+        }
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SD_IS_HELPER_SHUTTING_DOWN(p)   (p)->ShutDown
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Suspend and wait for wakeup signal
-+
-+  @function name: SD_WAIT_FOR_WAKEUP
-+  @prototype: SD_WAIT_FOR_WAKEUP(POSKERNEL_HELPER pOSHelper)
-+  @category: Support_Reference
-+
-+  @input: pOSHelper - the OS helper object
-+
-+  @return: SDIO_STATUS
-+
-+  @notes: This macro should only be called by the function associated with
-+          the helper object.  The function should call this function to suspend (block)
-+          itself and wait for a wake up signal. The function should always check
-+          whether the function should exit by calling SD_IS_HELPER_SHUTTING_DOWN.
-+
-+  @see also: SDLIB_OSCreateHelper , SD_IS_HELPER_SHUTTING_DOWN
-+
-+  @example: block on the wake signal
-+        while(1) {
-+              status = SD_WAIT_FOR_WAKEUP(pHelper);
-+              if (!SDIO_SUCCESS(status)) {
-+                  break;
-+              }
-+              if (SD_IS_HELPER_SHUTTING_DOWN(pHelper)) {
-+                  ... shutting down
-+                  break;
-+              }
-+        }
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SD_WAIT_FOR_WAKEUP(p)   SignalWait(&(p)->WakeSignal);
-+
-+#define CT_LE16_TO_CPU_ENDIAN(x) __le16_to_cpu(x)
-+#define CT_LE32_TO_CPU_ENDIAN(x) __le32_to_cpu(x)
-+#define CT_CPU_ENDIAN_TO_LE16(x) __cpu_to_le16(x)
-+#define CT_CPU_ENDIAN_TO_LE32(x) __cpu_to_le32(x)
-+
-+#define CT_CPU_ENDIAN_TO_BE16(x) __cpu_to_be16(x)
-+#define CT_CPU_ENDIAN_TO_BE32(x) __cpu_to_be32(x)
-+#define CT_BE16_TO_CPU_ENDIAN(x) __be16_to_cpu(x)
-+#define CT_BE32_TO_CPU_ENDIAN(x) __be32_to_cpu(x)
-+#endif /* __CPSYSTEM_LINUX_H___ */
-+
-diff --git a/include/linux/sdio/mmc_defs.h b/include/linux/sdio/mmc_defs.h
-new file mode 100644
-index 0000000..576ebd7
---- /dev/null
-+++ b/include/linux/sdio/mmc_defs.h
-@@ -0,0 +1,103 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: mmc_defs.h
-+
-+@abstract: MMC definitions not already defined in _sdio_defs.h
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#ifndef ___MMC_DEFS_H___
-+#define ___MMC_DEFS_H___
-+
-+#define MMC_MAX_BUS_CLOCK    20000000 /* max clock speed in hz */
-+#define MMC_HS_MAX_BUS_CLOCK 52000000 /* MMC PLUS (high speed) max clock rate in hz */
-+
-+/* R2 (CSD) macros */
-+#define GET_MMC_CSD_TRANS_SPEED(pR) (pR)[12]
-+#define GET_MMC_SPEC_VERSION(pR)    (((pR)[15] >> 2) & 0x0F)
-+#define MMC_SPEC_1_0_TO_1_2         0x00
-+#define MMC_SPEC_1_4                0x01
-+#define MMC_SPEC_2_0_TO_2_2         0x02
-+#define MMC_SPEC_3_1                0x03
-+#define MMC_SPEC_4_0_TO_4_1         0x04
-+
-+#define MMC_CMD_SWITCH    6
-+#define MMC_CMD8    8
-+
-+#define MMC_SWITCH_CMD_SET    0
-+#define MMC_SWITCH_SET_BITS   1
-+#define MMC_SWITCH_CLEAR_BITS 2
-+#define MMC_SWITCH_WRITE_BYTE 3
-+#define MMC_SWITCH_CMD_SET0   0
-+#define MMC_SWITCH_BUILD_ARG(cmdset,access,index,value) \
-+     (((cmdset) & 0x07) | (((access) & 0x03) << 24) | (((index) & 0xFF) << 16) | (((value) & 0xFF) << 8))
-+
-+#define MMC_EXT_CSD_SIZE                     512
-+
-+#define MMC_EXT_S_CMD_SET_OFFSET             504
-+#define MMC_EXT_MIN_PERF_W_8_52_OFFSET       210
-+#define MMC_EXT_MIN_PERF_R_8_52_OFFSET       209
-+#define MMC_EXT_MIN_PERF_W_8_26_4_52_OFFSET  208
-+#define MMC_EXT_MIN_PERF_R_8_26_4_52_OFFSET  207
-+#define MMC_EXT_MIN_PERF_W_4_26_OFFSET       206
-+#define MMC_EXT_MIN_PERF_R_4_56_OFFSET       205
-+#define MMC_EXT_PWR_CL_26_360_OFFSET         203
-+#define MMC_EXT_PWR_CL_52_360_OFFSET         202
-+#define MMC_EXT_PWR_CL_26_195_OFFSET         201
-+#define MMC_EXT_PWR_CL_52_195_OFFSET         200
-+#define MMC_EXT_GET_PWR_CLASS(reg)    ((reg) & 0xF)
-+#define MMC_EXT_MAX_PWR_CLASSES       16
-+#define MMC_EXT_CARD_TYPE_OFFSET             196
-+#define MMC_EXT_CARD_TYPE_HS_52  (1 << 1)
-+#define MMC_EXT_CARD_TYPE_HS_26  (1 << 0)
-+#define MMC_EXT_CSD_VER_OFFSET               194
-+#define MMC_EXT_VER_OFFSET                   192
-+#define MMC_EXT_VER_1_0          0
-+#define MMC_EXT_VER_1_1          1
-+#define MMC_EXT_CMD_SET_OFFSET               191
-+#define MMC_EXT_CMD_SET_REV_OFFSET           189
-+#define MMC_EXT_PWR_CLASS_OFFSET             187
-+#define MMC_EXT_HS_TIMING_OFFSET             185
-+#define MMC_EXT_HS_TIMING_ENABLE   0x01
-+#define MMC_EXT_BUS_WIDTH_OFFSET             183
-+#define MMC_EXT_BUS_WIDTH_1_BIT    0x00
-+#define MMC_EXT_BUS_WIDTH_4_BIT    0x01
-+#define MMC_EXT_BUS_WIDTH_8_BIT    0x02
-+
-+#endif
-diff --git a/include/linux/sdio/sdio_busdriver.h b/include/linux/sdio/sdio_busdriver.h
-new file mode 100644
-index 0000000..b431d3d
---- /dev/null
-+++ b/include/linux/sdio/sdio_busdriver.h
-@@ -0,0 +1,1435 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdio_busdriver.h
-+
-+@abstract: include file for registration of SDIO function drivers
-+  and SDIO host controller bus drivers.
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#ifndef __SDIO_BUSDRIVER_H___
-+#define __SDIO_BUSDRIVER_H___
-+
-+typedef UINT8      CT_VERSION_CODE;
-+#define CT_SDIO_STACK_VERSION_CODE ((CT_VERSION_CODE)0x26)   /* version code that must be set in various structures */
-+#define CT_SDIO_STACK_VERSION_MAJOR(v) (((v) & 0xF0) >> 4)
-+#define CT_SDIO_STACK_VERSION_MINOR(v) (((v) & 0x0F))
-+#define SET_SDIO_STACK_VERSION(p) (p)->Version = CT_SDIO_STACK_VERSION_CODE
-+#define GET_SDIO_STACK_VERSION(p) (p)->Version
-+#define GET_SDIO_STACK_VERSION_MAJOR(p) CT_SDIO_STACK_VERSION_MAJOR(GET_SDIO_STACK_VERSION(p))
-+#define GET_SDIO_STACK_VERSION_MINOR(p) CT_SDIO_STACK_VERSION_MINOR(GET_SDIO_STACK_VERSION(p))
-+#include "sdlist.h"
-+
-+/* card flags */
-+typedef UINT16      CARD_INFO_FLAGS;
-+#define CARD_MMC        0x0001    /* Multi-media card */
-+#define CARD_SD         0x0002    /* SD-Memory present */
-+#define CARD_SDIO       0x0004    /* SDIO present */
-+#define CARD_RAW        0x0008    /* Raw card */
-+#define CARD_COMBO      (CARD_SD | CARD_SDIO)  /* SDIO with SD */
-+#define CARD_TYPE_MASK  0x000F    /* card type mask */
-+#define CARD_SD_WP      0x0010    /* SD WP on */
-+#define CARD_PSEUDO     0x0020    /* pseudo card (internal use) */
-+#define CARD_HIPWR      0x0040    /* card can use more than 200mA (SDIO 1.1 or greater)*/
-+#define GET_CARD_TYPE(flags) ((flags) & CARD_TYPE_MASK)
-+
-+/* bus mode and clock rate */
-+typedef UINT32  SD_BUSCLOCK_RATE;       /* clock rate in hz */
-+typedef UINT16  SD_BUSMODE_FLAGS;
-+#define SDCONFIG_BUS_WIDTH_RESERVED           0x00
-+#define SDCONFIG_BUS_WIDTH_SPI                0x01
-+#define SDCONFIG_BUS_WIDTH_1_BIT              0x02
-+#define SDCONFIG_BUS_WIDTH_4_BIT              0x03
-+#define SDCONFIG_BUS_WIDTH_MMC8_BIT           0x04
-+#define SDCONFIG_BUS_WIDTH_MASK               0x0F
-+#define SDCONFIG_SET_BUS_WIDTH(flags,width) \
-+{                       \
-+    (flags) &= ~SDCONFIG_BUS_WIDTH_MASK; \
-+    (flags) |= (width);                  \
-+}
-+#define SDCONFIG_GET_BUSWIDTH(flags) ((flags) & SDCONFIG_BUS_WIDTH_MASK)
-+#define SDCONFIG_BUS_MODE_SPI_NO_CRC         0x40   /* SPI bus is operating with NO CRC */
-+#define SDCONFIG_BUS_MODE_SD_HS              0x80   /* set interface to SD high speed mode  */
-+#define SDCONFIG_BUS_MODE_MMC_HS             0x20   /* set interface to MMC high speed mode */
-+
-+typedef UINT16 SD_SLOT_CURRENT;      /* slot current in mA */
-+
-+typedef UINT8 SLOT_VOLTAGE_MASK;     /* slot voltage */
-+#define SLOT_POWER_3_3V  0x01
-+#define SLOT_POWER_3_0V  0x02
-+#define SLOT_POWER_2_8V  0x04
-+#define SLOT_POWER_2_0V  0x08
-+#define SLOT_POWER_1_8V  0x10
-+#define SLOT_POWER_1_6V  0x20
-+
-+#define MAX_CARD_RESPONSE_BYTES 17
-+
-+/* plug and play information for SD cards */
-+typedef struct _SD_PNP_INFO {
-+    UINT16 SDIO_ManufacturerCode;  /* JEDEC Code */
-+    UINT16 SDIO_ManufacturerID;    /* manf-specific ID */
-+    UINT8  SDIO_FunctionNo;        /* function number 1-7 */
-+    UINT8  SDIO_FunctionClass;     /* function class */
-+    UINT8  SDMMC_ManfacturerID;    /* card CID's MANF-ID */
-+    UINT16 SDMMC_OEMApplicationID; /* card CID's OEMAPP-ID */
-+    CARD_INFO_FLAGS CardFlags;     /* card flags */
-+}SD_PNP_INFO, *PSD_PNP_INFO;
-+
-+#define IS_LAST_SDPNPINFO_ENTRY(id)\
-+    (((id)->SDIO_ManufacturerCode == 0) &&\
-+     ((id)->SDIO_ManufacturerID == 0) &&\
-+     ((id)->SDIO_FunctionNo == 0) &&\
-+     ((id)->SDIO_FunctionClass == 0) &&\
-+     ((id)->SDMMC_OEMApplicationID == 0) && \
-+     ((id)->CardFlags == 0))
-+
-+/* card properties */
-+typedef struct _CARD_PROPERTIES {
-+    UINT8              IOFnCount;      /* number of I/O functions */
-+    UINT8              SDIORevision;   /* SDIO revision */
-+#define SDIO_REVISION_1_00 0x00
-+#define SDIO_REVISION_1_10 0x01
-+#define SDIO_REVISION_1_20 0x02
-+    UINT8              SD_MMC_Revision; /* SD or MMC revision */
-+#define SD_REVISION_1_01  0x00
-+#define SD_REVISION_1_10  0x01
-+#define MMC_REVISION_1_0_2_2 0x00
-+#define MMC_REVISION_3_1  0x01
-+#define MMC_REVISION_4_0  0x02
-+    UINT16 SDIO_ManufacturerCode;      /* JEDEC Code */
-+    UINT16 SDIO_ManufacturerID;        /* manf-specific ID */
-+    UINT32             CommonCISPtr;   /* common CIS ptr */
-+    UINT16             RCA;            /* relative card address */
-+    UINT8              SDIOCaps;       /* SDIO card capabilities (refer to SDIO spec for decoding) */
-+    UINT8              CardCSD[MAX_CARD_RESPONSE_BYTES];    /* for SD/MMC cards */
-+    CARD_INFO_FLAGS    Flags;          /* card flags */
-+    SD_BUSCLOCK_RATE   OperBusClock;   /* operational bus clock (based on HCD limit)*/
-+    SD_BUSMODE_FLAGS   BusMode;        /* current card bus mode */
-+    UINT16             OperBlockLenLimit; /* operational bytes per block length limit*/
-+    UINT16             OperBlockCountLimit; /* operational number of blocks per transfer limit */
-+    UINT8              CardState;      /* card state flags */
-+    SLOT_VOLTAGE_MASK  CardVoltage;    /* card operational voltage */
-+#define CARD_STATE_REMOVED 0x01
-+}CARD_PROPERTIES, *PCARD_PROPERTIES;
-+
-+/* SDREQUEST request flags */
-+typedef UINT32 SDREQUEST_FLAGS;
-+/* write operation */
-+#define SDREQ_FLAGS_DATA_WRITE         0x8000
-+/* has data (read or write) */
-+#define SDREQ_FLAGS_DATA_TRANS         0x4000
-+/* command is an atomic APP command, requiring CMD55 to be issued */
-+#define SDREQ_FLAGS_APP_CMD            0x2000
-+/* transfer should be handled asynchronously */
-+#define SDREQ_FLAGS_TRANS_ASYNC        0x1000
-+/* host should skip the SPI response filter for this command */
-+#define SDREQ_FLAGS_RESP_SKIP_SPI_FILT 0x0800
-+/* host should skip the response check for this data transfer */
-+#define SDREQ_FLAGS_DATA_SKIP_RESP_CHK 0x0400
-+/* flag requesting a CMD12 be automatically issued by host controller */
-+#define SDREQ_FLAGS_AUTO_CMD12         0x0200
-+/* flag indicating that the data buffer meets HCD's DMA restrictions   */
-+#define SDREQ_FLAGS_DATA_DMA           0x0010
-+/* indicate to host that this is a short and quick transfer, the HCD may optimize
-+ * this request to reduce interrupt overhead */
-+#define SDREQ_FLAGS_DATA_SHORT_TRANSFER   0x00010000
-+/* indicate to the host that this is a raw request */
-+#define SDREQ_FLAGS_RAW                   0x00020000
-+/* auto data transfer status check for MMC and Memory cards */
-+#define SDREQ_FLAGS_AUTO_TRANSFER_STATUS  0x00100000
-+
-+#define SDREQ_FLAGS_UNUSED1               0x00200000
-+#define SDREQ_FLAGS_UNUSED2               0x00400000
-+#define SDREQ_FLAGS_UNUSED3               0x00800000
-+#define SDREQ_FLAGS_UNUSED4               0x01000000
-+#define SDREQ_FLAGS_UNUSED5               0x02000000
-+
-+/* the following flags are internal use only */
-+#define SDREQ_FLAGS_FORCE_DEFERRED_COMPLETE 0x0100
-+/* flag indicating that response has been converted (internal use) */
-+#define SDREQ_FLAGS_RESP_SPI_CONVERTED      0x0040
-+/* request was cancelled - internal use only */
-+#define SDREQ_FLAGS_CANCELED                0x0020
-+/* a barrier operation */
-+#define SDREQ_FLAGS_BARRIER                 0x00040000
-+/* a pseudo bus request */
-+#define SDREQ_FLAGS_PSEUDO                  0x00080000
-+/* queue to the head */
-+#define SDREQ_FLAGS_QUEUE_HEAD              0x04000000
-+
-+#define SDREQ_FLAGS_I_UNUSED1               0x08000000
-+#define SDREQ_FLAGS_I_UNUSED2               0x10000000
-+#define SDREQ_FLAGS_I_UNUSED3               0x20000000
-+#define SDREQ_FLAGS_I_UNUSED4               0x40000000
-+#define SDREQ_FLAGS_I_UNUSED5               0x80000000
-+
-+/* response type mask */
-+#define SDREQ_FLAGS_RESP_MASK       0x000F
-+#define GET_SDREQ_RESP_TYPE(flags)     ((flags) & SDREQ_FLAGS_RESP_MASK)
-+#define IS_SDREQ_WRITE_DATA(flags)     ((flags) & SDREQ_FLAGS_DATA_WRITE)
-+#define IS_SDREQ_DATA_TRANS(flags)     ((flags) & SDREQ_FLAGS_DATA_TRANS)
-+#define IS_SDREQ_RAW(flags)            ((flags) & SDREQ_FLAGS_RAW)
-+#define IS_SDREQ_FORCE_DEFERRED_COMPLETE(flags) ((flags) & SDREQ_FLAGS_FORCE_DEFERRED_COMPLETE)
-+#define SDREQ_FLAGS_NO_RESP         0x0000
-+#define SDREQ_FLAGS_RESP_R1         0x0001
-+#define SDREQ_FLAGS_RESP_R1B        0x0002
-+#define SDREQ_FLAGS_RESP_R2         0x0003
-+#define SDREQ_FLAGS_RESP_R3         0x0004
-+#define SDREQ_FLAGS_RESP_MMC_R4     0x0005 /* not supported, for future use */
-+#define SDREQ_FLAGS_RESP_MMC_R5     0x0006 /* not supported, for future use */
-+#define SDREQ_FLAGS_RESP_R6         0x0007
-+#define SDREQ_FLAGS_RESP_SDIO_R4    0x0008
-+#define SDREQ_FLAGS_RESP_SDIO_R5    0x0009
-+
-+struct _SDREQUEST;
-+struct _SDFUNCTION;
-+
-+typedef void (*PSDEQUEST_COMPLETION)(struct _SDREQUEST *);
-+
-+/* defines SD/MMC and SDIO requests for the RAW-mode API */
-+typedef struct _SDREQUEST {
-+    SDLIST  SDList;             /* internal use list*/
-+    UINT32  Argument;           /* SD/SDIO/MMC 32 bit argument */
-+    SDREQUEST_FLAGS Flags;      /* request flags */
-+    ATOMIC_FLAGS InternalFlags; /* internal use flags */
-+    UINT8   Command;            /* SD/SDIO/MMC 8 bit command */
-+    UINT8   Response[MAX_CARD_RESPONSE_BYTES];       /* buffer for CMD response */
-+    UINT16  BlockCount;         /* number of blocks to send/rcv */
-+    UINT16  BlockLen;           /* length of each block */
-+    UINT16  DescriptorCount;    /* number of DMA descriptor entries in pDataBuffer if DMA */
-+    PVOID   pDataBuffer;        /* starting address of buffer (or ptr to PSDDMA_DESCRIPTOR*/
-+    UINT32  DataRemaining;      /* number of bytes remaining in the transfer (internal use) */
-+    PVOID   pHcdContext;        /* internal use context */
-+    PSDEQUEST_COMPLETION pCompletion; /* function driver completion routine */
-+    PVOID   pCompleteContext;   /* function driver completion context */
-+    SDIO_STATUS Status;         /* completion status */
-+    struct _SDFUNCTION* pFunction; /* function driver that generated request (internal use)*/
-+    INT     RetryCount;          /* number of times to retry on error, non-data cmds only */
-+    PVOID   pBdRsv1;        /* reserved */
-+    PVOID   pBdRsv2;
-+    PVOID   pBdRsv3;
-+}SDREQUEST, *PSDREQUEST;
-+
-+    /* a request queue */
-+typedef struct _SDREQUESTQUEUE {
-+    SDLIST        Queue;           /* the queue of requests */
-+    BOOL          Busy;            /* busy flag */
-+}SDREQUESTQUEUE, *PSDREQUESTQUEUE;
-+
-+
-+typedef UINT16 SDCONFIG_COMMAND;
-+/* SDCONFIG request flags */
-+/* get operation */
-+#define SDCONFIG_FLAGS_DATA_GET       0x8000
-+/* put operation */
-+#define SDCONFIG_FLAGS_DATA_PUT       0x4000
-+/* host controller */
-+#define SDCONFIG_FLAGS_HC_CONFIG      0x2000
-+/* both */
-+#define SDCONFIG_FLAGS_DATA_BOTH      (SDCONFIG_FLAGS_DATA_GET | SDCONFIG_FLAGS_DATA_PUT)
-+/* no data */
-+#define SDCONFIG_FLAGS_DATA_NONE      0x0000
-+
-+/* SDCONFIG commands */
-+#define SDCONFIG_GET_HCD_DEBUG   (SDCONFIG_FLAGS_HC_CONFIG | SDCONFIG_FLAGS_DATA_GET  | 275)
-+#define SDCONFIG_SET_HCD_DEBUG   (SDCONFIG_FLAGS_HC_CONFIG | SDCONFIG_FLAGS_DATA_PUT  | 276)
-+
-+/* custom hcd commands */
-+#define SDCONFIG_GET_HOST_CUSTOM   (SDCONFIG_FLAGS_HC_CONFIG | SDCONFIG_FLAGS_DATA_GET  | 300)
-+#define SDCONFIG_PUT_HOST_CUSTOM   (SDCONFIG_FLAGS_HC_CONFIG | SDCONFIG_FLAGS_DATA_PUT  | 301)
-+
-+/* function commands */
-+#define SDCONFIG_FUNC_ENABLE_DISABLE         (SDCONFIG_FLAGS_DATA_PUT  | 18)
-+#define SDCONFIG_FUNC_UNMASK_IRQ             (SDCONFIG_FLAGS_DATA_NONE | 21)
-+#define SDCONFIG_FUNC_MASK_IRQ               (SDCONFIG_FLAGS_DATA_NONE | 22)
-+#define SDCONFIG_FUNC_ACK_IRQ                (SDCONFIG_FLAGS_DATA_NONE | 23)
-+#define SDCONFIG_FUNC_SPI_MODE_DISABLE_CRC   (SDCONFIG_FLAGS_DATA_NONE | 24)
-+#define SDCONFIG_FUNC_SPI_MODE_ENABLE_CRC    (SDCONFIG_FLAGS_DATA_NONE | 25)
-+#define SDCONFIG_FUNC_ALLOC_SLOT_CURRENT     (SDCONFIG_FLAGS_DATA_PUT  | 26)
-+#define SDCONFIG_FUNC_FREE_SLOT_CURRENT      (SDCONFIG_FLAGS_DATA_NONE | 27)
-+#define SDCONFIG_FUNC_CHANGE_BUS_MODE        (SDCONFIG_FLAGS_DATA_BOTH | 28)
-+#define SDCONFIG_FUNC_CHANGE_BUS_MODE_ASYNC  (SDCONFIG_FLAGS_DATA_BOTH | 29)
-+#define SDCONFIG_FUNC_NO_IRQ_PEND_CHECK      (SDCONFIG_FLAGS_DATA_NONE | 30)
-+
-+typedef UINT8  FUNC_ENABLE_DISABLE_FLAGS;
-+typedef UINT32 FUNC_ENABLE_TIMEOUT;
-+
-+    /* function enable */
-+typedef struct _SDCONFIG_FUNC_ENABLE_DISABLE_DATA {
-+#define SDCONFIG_DISABLE_FUNC   0x0000
-+#define SDCONFIG_ENABLE_FUNC    0x0001
-+    FUNC_ENABLE_DISABLE_FLAGS    EnableFlags;     /* enable flags*/
-+    FUNC_ENABLE_TIMEOUT          TimeOut;         /* timeout in milliseconds */
-+    void (*pOpComplete)(PVOID Context, SDIO_STATUS status); /* reserved */
-+    PVOID                        pOpCompleteContext;        /* reserved */
-+}SDCONFIG_FUNC_ENABLE_DISABLE_DATA, *PSDCONFIG_FUNC_ENABLE_DISABLE_DATA;
-+
-+    /* slot current allocation data */
-+typedef struct _SDCONFIG_FUNC_SLOT_CURRENT_DATA {
-+    SD_SLOT_CURRENT     SlotCurrent;    /* slot current to request in mA*/
-+}SDCONFIG_FUNC_SLOT_CURRENT_DATA, *PSDCONFIG_FUNC_SLOT_CURRENT_DATA;
-+
-+/* slot bus mode configuration */
-+typedef struct _SDCONFIG_BUS_MODE_DATA {
-+    SD_BUSCLOCK_RATE   ClockRate;       /* clock rate in Hz */
-+    SD_BUSMODE_FLAGS   BusModeFlags;    /* bus mode flags */
-+    SD_BUSCLOCK_RATE   ActualClockRate; /* actual rate in KHz */
-+}SDCONFIG_BUS_MODE_DATA, *PSDCONFIG_BUS_MODE_DATA;
-+
-+/* defines configuration requests for the HCD */
-+typedef struct _SDCONFIG {
-+    SDCONFIG_COMMAND  Cmd;          /* configuration command */
-+    PVOID   pData;        /* configuration data */
-+    INT     DataLength;   /* config data length */
-+}SDCONFIG, *PSDCONFIG;
-+
-+#define SET_SDCONFIG_CMD_INFO(pHdr,cmd,pC,len) \
-+{           \
-+  (pHdr)->Cmd = (cmd);                     \
-+  (pHdr)->pData = (PVOID)(pC);             \
-+  (pHdr)->DataLength = (len);              \
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get a pointer to the configuration command data.
-+
-+  @function name: GET_SDCONFIG_CMD
-+  @prototype: UNIT16 GET_SDCONFIG_CMD (PSDCONFIG pCommand)
-+  @category: HD_Reference
-+
-+  @input:  pCommand - config command structure.
-+
-+  @return: command code
-+
-+  @notes: Implemented as a macro. This macro returns the command code for this
-+          configuration request.
-+
-+  @example: getting the command code:
-+    cmd = GET_SDCONFIG_CMD(pConfig);
-+    switch (cmd) {
-+        case SDCONFIG_GET_WP:
-+             .. get write protect switch position
-+           break;
-+        ...
-+    }
-+
-+  @see also: GET_SDCONFIG_CMD_LEN, GET_SDCONFIG_CMD_DATA
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define GET_SDCONFIG_CMD(pBuffer)     ((pBuffer)->Cmd)
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get a pointer to the configuration command data.
-+
-+  @function name: GET_SDCONFIG_CMD_LEN
-+  @prototype: INT GET_SDCONFIG_CMD_LEN (PSDCONFIG pCommand)
-+  @category: HD_Reference
-+
-+  @input:  pCommand - config command structure.
-+
-+  @return: length of config command data
-+
-+  @notes: Implemented as a macro. Host controller drivers can use this macro to extract
-+          the number of bytes of command specific data. This can be used to validate the
-+          config data buffer size.
-+
-+  @example: getting the data length:
-+    length = GET_SDCONFIG_CMD_LEN(pConfig);
-+    if (length < CUSTOM_COMMAND_XXX_SIZE) {
-+       ... invalid length
-+    }
-+
-+  @see also: GET_SDCONFIG_CMD, GET_SDCONFIG_CMD_DATA
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define GET_SDCONFIG_CMD_LEN(pBuffer) ((pBuffer)->DataLength)
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get a pointer to the configuration command data.
-+
-+  @function name: GET_SDCONFIG_CMD_DATA
-+  @prototype: (casted ptr) GET_SDCONFIG_CMD_DATA (type, PSDCONFIG pCommand)
-+  @category: HD_Reference
-+
-+  @input:  type - pointer type to cast the returned pointer to.
-+           pCommand - config command structure.
-+
-+  @return: type-casted pointer to the command's data
-+
-+  @notes: Implemented as a macro.  Host controller drivers can use this macro to extract
-+          a pointer to the command specific data in an HCD configuration request.
-+
-+  @example: getting the pointer:
-+        // get interrupt control data
-+    pIntControl = GET_SDCONFIG_CMD_DATA(PSDCONFIG_SDIO_INT_CTRL_DATA,pConfig);
-+    if (pIntControl->SlotIRQEnable) {
-+       ... enable slot IRQ detection
-+    }
-+
-+  @see also: GET_SDCONFIG_CMD, GET_SDCONFIG_CMD_LEN
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define GET_SDCONFIG_CMD_DATA(type,pBuffer) ((type)((pBuffer)->pData))
-+#define IS_SDCONFIG_CMD_GET(pBuffer)  ((pBuffer)->Cmd & SDCONFIG_FLAGS_DATA_GET)
-+#define IS_SDCONFIG_CMD_PUT(pBuffer)  ((pBuffer)->Cmd & SDCONFIG_FLAGS_DATA_PUT)
-+
-+struct _SDDEVICE;
-+struct _SDHCD;
-+
-+typedef UINT8   SD_FUNCTION_FLAGS;
-+#define SDFUNCTION_FLAG_REMOVING       0x01
-+
-+/* function driver registration structure */
-+typedef struct _SDFUNCTION {
-+    CT_VERSION_CODE Version;    /* version code of the SDIO stack */
-+      SDLIST     SDList;          /* internal use list*/
-+    PTEXT      pName;           /* name of registering driver */
-+    UINT       MaxDevices;      /* maximum number of devices supported by this function */
-+    UINT       NumDevices;      /* number of devices supported by this function */
-+    PSD_PNP_INFO pIds;          /* null terminated table of supported devices*/
-+    BOOL (*pProbe)(struct _SDFUNCTION *pFunction, struct _SDDEVICE *pDevice);/* New device inserted */
-+                                /* Device removed (NULL if not a hot-plug capable driver) */
-+    void (*pRemove)(struct _SDFUNCTION *pFunction, struct _SDDEVICE *pDevice);
-+    SDIO_STATUS (*pSuspend)(struct _SDFUNCTION *pFunction, SDPOWER_STATE state); /* Device suspended */
-+    SDIO_STATUS (*pResume)(struct _SDFUNCTION *pFunction); /* Device woken up */
-+                                /* Enable wake event */
-+    SDIO_STATUS (*pWake) (struct _SDFUNCTION *pFunction, SDPOWER_STATE state, BOOL enable);
-+      PVOID      pContext;        /* function driver use data */
-+      OS_PNPDRIVER Driver;        /* driver registration with base system */
-+      SDLIST     DeviceList;      /* the list of devices this driver is using*/
-+    OS_SIGNAL   CleanupReqSig;  /* wait for requests completion on cleanup (internal use) */
-+    SD_FUNCTION_FLAGS Flags;    /* internal flags (internal use) */
-+}SDFUNCTION, *PSDFUNCTION;
-+
-+typedef UINT8  HCD_EVENT;
-+
-+    /* device info for SDIO functions */
-+typedef struct _SDIO_DEVICE_INFO {
-+    UINT32  FunctionCISPtr;         /* function's CIS ptr */
-+    UINT32  FunctionCSAPtr;         /* function's CSA ptr */
-+    UINT16  FunctionMaxBlockSize;   /* function's reported max block size */
-+}SDIO_DEVICE_INFO, *PSDIO_DEVICE_INFO;
-+
-+    /* device info for SD/MMC card functions */
-+typedef struct _SDMMC_INFO{
-+    UINT8  Unused;    /* reserved */
-+}SDMMC_INFO, *PSDMMC_INFO;
-+
-+    /* union of SDIO function and device info */
-+typedef union _SDDEVICE_INFO {
-+    SDIO_DEVICE_INFO AsSDIOInfo;
-+    SDMMC_INFO       AsSDMMCInfo;
-+}SDDEVICE_INFO, *PSDDEVICE_INFO;
-+
-+
-+typedef UINT8   SD_DEVICE_FLAGS;
-+#define SDDEVICE_FLAG_REMOVING       0x01
-+
-+/* inserted device description, describes an inserted card */
-+typedef struct _SDDEVICE {
-+    SDLIST      SDList;             /* internal use list*/
-+    SDLIST      FuncListLink;       /* internal use list */
-+                                    /* read/write request function */
-+    SDIO_STATUS (*pRequest)(struct _SDDEVICE *pDev, PSDREQUEST req);
-+                                    /* get/set configuration */
-+    SDIO_STATUS (*pConfigure)(struct _SDDEVICE *pDev, PSDCONFIG config);
-+    PSDREQUEST  (*AllocRequest)(struct _SDDEVICE *pDev);      /* allocate a request */
-+    void        (*FreeRequest)(struct _SDDEVICE *pDev, PSDREQUEST pReq); /* free the request */
-+    void        (*pIrqFunction)(PVOID pContext);       /* interrupt routine, synchronous calls allowed */
-+    void        (*pIrqAsyncFunction)(PVOID pContext); /* async IRQ function , asynch only calls */
-+    PVOID       IrqContext;         /* irq context */
-+    PVOID       IrqAsyncContext;    /* irq async context */
-+    PSDFUNCTION pFunction;          /* function driver supporting this device */
-+    struct _SDHCD  *pHcd;           /* host controller this device is on (internal use) */
-+    SDDEVICE_INFO   DeviceInfo;     /* device info */
-+    SD_PNP_INFO pId[1];             /* id of this device  */
-+    OS_PNPDEVICE Device;            /* device registration with base system */
-+    SD_SLOT_CURRENT  SlotCurrentAlloc; /* allocated slot current for this device/function (internal use) */
-+    SD_DEVICE_FLAGS Flags;          /* internal use flags */
-+    CT_VERSION_CODE Version;        /* version code of the bus driver */
-+}SDDEVICE, *PSDDEVICE;
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get SDIO Bus Driver Version Major number
-+
-+  @function name: SDDEVICE_GET_VERSION_MAJOR
-+  @prototype: INT SDDEVICE_GET_VERSION_MAJOR(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: integer value for the major version
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_GET_VERSION_MINOR
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_VERSION_MAJOR(pDev) (GET_SDIO_STACK_VERSION_MAJOR(pDev))
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get SDIO Bus Driver Version Minor number
-+
-+  @function name: SDDEVICE_GET_VERSION_MINOR
-+  @prototype: INT SDDEVICE_GET_VERSION_MINOR(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: integer value for the minor version
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_GET_VERSION_MAJOR
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_VERSION_MINOR(pDev) (GET_SDIO_STACK_VERSION_MINOR(pDev))
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Test the SDIO revision for greater than or equal to 1.10
-+
-+  @function name: SDDEVICE_IS_SDIO_REV_GTEQ_1_10
-+  @prototype: BOOL SDDEVICE_IS_SDIO_REV_GTEQ_1_10(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: TRUE if the revision is greater than or equal to 1.10
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_IS_SD_REV_GTEQ_1_10
-+  @see also: SDDEVICE_IS_MMC_REV_GTEQ_4_0
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_IS_SDIO_REV_GTEQ_1_10(pDev) ((pDev)->pHcd->CardProperties.SDIORevision >= SDIO_REVISION_1_10)
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Test the SDIO revision for greater than or equal to 1.20
-+
-+  @function name: SDDEVICE_IS_SDIO_REV_GTEQ_1_20
-+  @prototype: BOOL SDDEVICE_IS_SDIO_REV_GTEQ_1_20(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: TRUE if the revision is greater than or equal to 1.20
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_IS_SD_REV_GTEQ_1_10
-+  @see also: SDDEVICE_IS_SDIO_REV_GTEQ_1_10
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_IS_SDIO_REV_GTEQ_1_20(pDev) ((pDev)->pHcd->CardProperties.SDIORevision >= SDIO_REVISION_1_20)
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Test the SD revision for greater than or equal to 1.10
-+
-+  @function name: SDDEVICE_IS_SD_REV_GTEQ_1_10
-+  @prototype: BOOL SDDEVICE_IS_SD_REV_GTEQ_1_10(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: TRUE if the revision is greater than or equal to 1.10
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_IS_SDIO_REV_GTEQ_1_10
-+  @see also: SDDEVICE_IS_MMC_REV_GTEQ_4_0
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_IS_SD_REV_GTEQ_1_10(pDev) ((pDev)->pHcd->CardProperties.SD_MMC_Revision >= SD_REVISION_1_10)
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Test the MMC revision for greater than or equal to 4.0
-+
-+  @function name: SDDEVICE_IS_MMC_REV_GTEQ_4_0
-+  @prototype: BOOL SDDEVICE_IS_MMC_REV_GTEQ_4_0(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: TRUE if the revision is greater than or equal to 4.0
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_IS_SDIO_REV_GTEQ_1_10
-+  @see also: SDDEVICE_IS_SD_REV_GTEQ_1_10
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_IS_MMC_REV_GTEQ_4_0(pDev) ((pDev)->pHcd->CardProperties.SD_MMC_Revision >= MMC_REVISION_4_0)
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Test for write protect enabled
-+
-+  @function name: SDDEVICE_IS_CARD_WP_ON
-+  @prototype: BOOL SDDEVICE_IS_CARD_WP_ON(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: TRUE if device is write protected.
-+
-+  @notes: Implemented as a macro.
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_IS_CARD_WP_ON(pDev)       ((pDev)->pHcd->CardProperties.Flags & CARD_SD_WP)
-+
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the device's manufacturer specific ID
-+
-+  @function name: SDDEVICE_GET_SDIO_MANFID
-+  @prototype: UINT16 SDDEVICE_GET_SDIO_MANFID(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: function number
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_GET_SDIO_MANFCODE
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SDIO_MANFID(pDev)     (pDev)->pId[0].SDIO_ManufacturerID
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the device's manufacturer code
-+
-+  @function name: SDDEVICE_GET_SDIO_MANFCODE
-+  @prototype: UINT16 SDDEVICE_GET_SDIO_MANFCODE(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: function number
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_GET_SDIO_MANFID
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SDIO_MANFCODE(pDev)     (pDev)->pId[0].SDIO_ManufacturerCode
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the device's function number
-+
-+  @function name: SDDEVICE_GET_SDIO_FUNCNO
-+  @prototype: UINT8 SDDEVICE_GET_SDIO_FUNCNO(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: function number
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_GET_SDIO_FUNC_CLASS
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SDIO_FUNCNO(pDev)     (pDev)->pId[0].SDIO_FunctionNo
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the functions's class
-+
-+  @function name: SDDEVICE_GET_SDIO_FUNC_CLASS
-+  @prototype: UINT8 SDDEVICE_GET_SDIO_FUNC_CLASS(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: class number
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_GET_SDIO_FUNCNO
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SDIO_FUNC_CLASS(pDev) (pDev)->pId[0].SDIO_FunctionClass
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the functions's Card Information Structure pointer
-+
-+  @function name: SDDEVICE_GET_SDIO_FUNC_CISPTR
-+  @prototype: UINT32 SDDEVICE_GET_SDIO_FUNC_CISPTR(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: CIS offset
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_GET_SDIO_FUNC_CSAPTR
-+  @see also: SDDEVICE_GET_SDIO_COMMON_CISPTR
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SDIO_FUNC_CISPTR(pDev)(pDev)->DeviceInfo.AsSDIOInfo.FunctionCISPtr
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the functions's Code Stoarge Area pointer
-+
-+  @function name: SDDEVICE_GET_SDIO_FUNC_CSAPTR
-+  @prototype: UINT32 SDDEVICE_GET_SDIO_FUNC_CSAPTR(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: CSA offset
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_GET_SDIO_FUNC_CISPTR
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SDIO_FUNC_CSAPTR(pDev)(pDev)->DeviceInfo.AsSDIOInfo.FunctionCSAPtr
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the functions's maximum reported block size
-+
-+  @function name: SDDEVICE_GET_SDIO_FUNC_MAXBLKSIZE
-+  @prototype: UINT16 SDDEVICE_GET_SDIO_FUNC_MAXBLKSIZE(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: block size
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also:
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SDIO_FUNC_MAXBLKSIZE(pDev) (pDev)->DeviceInfo.AsSDIOInfo.FunctionMaxBlockSize
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the common Card Information Structure pointer
-+
-+  @function name: SDDEVICE_GET_SDIO_COMMON_CISPTR
-+  @prototype: UINT32 SDDEVICE_GET_SDIO_COMMON_CISPTR(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: Common CIS Address (in SDIO address space)
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_GET_SDIO_FUNC_CSAPTR
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SDIO_COMMON_CISPTR(pDev) (pDev)->pHcd->CardProperties.CommonCISPtr
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the card capabilities
-+
-+  @function name: SDDEVICE_GET_SDIO_CARD_CAPS
-+  @prototype: UINT8 SDDEVICE_GET_SDIO_CARD_CAPS(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: 8-bit card capabilities register
-+
-+  @notes: Implemented as a macro. Refer to SDIO spec for decoding.
-+
-+  @see also: SDDEVICE_GET_CARD_FLAGS
-+  @see also: SDDEVICE_GET_SDIOCARD_CAPS
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SDIO_CARD_CAPS(pDev)     (pDev)->pHcd->CardProperties.SDIOCaps
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the card flags
-+
-+  @function name: SDDEVICE_GET_CARD_FLAGS
-+  @prototype: CARD_INFO_FLAGS SDDEVICE_GET_CARD_FLAGS(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: flags
-+
-+  @notes: Implemented as a macro.
-+
-+  @example: Get card type:
-+        CARD_INFO_FLAGS flags;
-+        flags = SDDEVICE_GET_CARD_FLAGS(pDevice);
-+        switch(GET_CARD_TYPE(flags)) {
-+            case CARD_MMC: // Multi-media card
-+                ...
-+            case CARD_SD:  // SD-Memory present
-+                ...
-+            case CARD_SDIO: // SDIO card present
-+                ...
-+            case CARD_COMBO: //SDIO card with SD
-+                ...
-+        }
-+        if (flags & CARD_SD_WP) {
-+            ...SD write protect on
-+        }
-+
-+  @see also: SDDEVICE_GET_SDIO_CARD_CAPS
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_CARD_FLAGS(pDev)      (pDev)->pHcd->CardProperties.Flags
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the Relative Card Address register
-+
-+  @function name: SDDEVICE_GET_CARD_RCA
-+  @prototype: UINT16 SDDEVICE_GET_CARD_RCA(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: register address
-+
-+  @notes: Implemented as a macro. Refer to SDIO spec for decoding.
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_CARD_RCA(pDev)        (pDev)->pHcd->CardProperties.RCA
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get operational bus clock
-+
-+  @function name: SDDEVICE_GET_OPER_CLOCK
-+  @prototype: SD_BUSCLOCK_RATE SDDEVICE_GET_OPER_CLOCK(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: clock rate
-+
-+  @notes: Implemented as a macro. Returns the current bus clock rate.
-+          This may be lower than reported by the card due to Host Controller,
-+          Bus driver, or power management limitations.
-+
-+  @see also: SDDEVICE_GET_MAX_CLOCK
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_OPER_CLOCK(pDev)      (pDev)->pHcd->CardProperties.OperBusClock
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get maximum bus clock
-+
-+  @function name: SDDEVICE_GET_MAX_CLOCK
-+  @prototype: SD_BUSCLOCK_RATE SDDEVICE_GET_MAX_CLOCK(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: clock rate
-+
-+  @notes: To obtain the current maximum clock rate use SDDEVICE_GET_OPER_CLOCK().
-+          This rate my be lower than the host controllers maximum obtained using
-+          SDDEVICE_GET_MAX_CLOCK().
-+
-+  @see also: SDDEVICE_GET_OPER_CLOCK
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_MAX_CLOCK(pDev)       (pDev)->pHcd->MaxClockRate
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get operational maximum block length.
-+
-+  @function name: SDDEVICE_GET_OPER_BLOCK_LEN
-+  @prototype: UINT16 SDDEVICE_GET_OPER_BLOCK_LEN(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: block size in bytes
-+
-+  @notes: Implemented as a macro. Returns the maximum current block length.
-+          This may be lower than reported by the card due to Host Controller,
-+          Bus driver, or power management limitations.
-+
-+  @see also: SDDEVICE_GET_MAX_BLOCK_LEN
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_OPER_BLOCK_LEN(pDev)  (pDev)->pHcd->CardProperties.OperBlockLenLimit
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get maximum block length.
-+
-+  @function name: SDDEVICE_GET_MAX_BLOCK_LEN
-+  @prototype: UINT16 SDDEVICE_GET_MAX_BLOCK_LEN(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: block size in bytes
-+
-+  @notes: Implemented as a macro. Use SDDEVICE_GET_OPER_BLOCK_LEN to obtain
-+          the current block length.
-+
-+  @see also: SDDEVICE_GET_OPER_BLOCK_LEN
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_MAX_BLOCK_LEN(pDev)   (pDev)->pHcd->MaxBytesPerBlock
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get operational maximum block count.
-+
-+  @function name: SDDEVICE_GET_OPER_BLOCKS
-+  @prototype: UINT16 SDDEVICE_GET_OPER_BLOCKS(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: maximum number of blocks per transaction.
-+
-+  @notes: Implemented as a macro. Returns the maximum current block count.
-+          This may be lower than reported by the card due to Host Controller,
-+          Bus driver, or power management limitations.
-+
-+  @see also: SDDEVICE_GET_MAX_BLOCK_LEN
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_OPER_BLOCKS(pDev)     (pDev)->pHcd->CardProperties.OperBlockCountLimit
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get maximum block count.
-+
-+  @function name: SDDEVICE_GET_MAX_BLOCKS
-+  @prototype: UINT16 SDDEVICE_GET_MAX_BLOCKS(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: maximum number of blocks per transaction.
-+
-+  @notes: Implemented as a macro. Use SDDEVICE_GET_OPER_BLOCKS to obtain
-+          the current block count.
-+
-+  @see also: SDDEVICE_GET_OPER_BLOCKS
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_MAX_BLOCKS(pDev)      (pDev)->pHcd->MaxBlocksPerTrans
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get applied slot voltage
-+
-+  @function name: SDDEVICE_GET_SLOT_VOLTAGE_MASK
-+  @prototype: SLOT_VOLTAGE_MASK SDDEVICE_GET_SLOT_VOLTAGE_MASK(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: slot voltage mask
-+
-+  @notes: This function returns the applied voltage on the slot. The voltage value is a
-+          mask having the following values:
-+          SLOT_POWER_3_3V
-+          SLOT_POWER_3_0V
-+          SLOT_POWER_2_8V
-+          SLOT_POWER_2_0V
-+          SLOT_POWER_1_8V
-+          SLOT_POWER_1_6V
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SLOT_VOLTAGE_MASK(pDev)   (pDev)->pHcd->CardProperties.CardVoltage
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the Card Specific Data Register.
-+
-+  @function name: SDDEVICE_GET_CARDCSD
-+  @prototype: PUINT8 SDDEVICE_GET_CARDCSD(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return:  UINT8 CardCSD[MAX_CARD_RESPONSE_BYTES] array of CSD data.
-+
-+  @notes: Implemented as a macro.
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_CARDCSD(pDev)         (pDev)->pHcd->CardProperties.CardCSD
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the bus mode flags
-+
-+  @function name: SDDEVICE_GET_BUSMODE_FLAGS
-+  @prototype: SD_BUSMODE_FLAGS SDDEVICE_GET_BUSMODE_FLAGS(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return:
-+
-+  @notes: Implemented as a macro.  This function returns the raw bus mode flags.  This
-+          is useful for function drivers that wish to override the bus clock without
-+          modifying the current bus mode.
-+
-+  @see also: SDDEVICE_GET_BUSWIDTH
-+  @see also: SDCONFIG_BUS_MODE_CTRL
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_BUSMODE_FLAGS(pDev)  (pDev)->pHcd->CardProperties.BusMode
-+
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the bus width.
-+
-+  @function name: SDDEVICE_GET_BUSWIDTH
-+  @prototype: UINT8 SDDEVICE_GET_BUSWIDTH(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return:  bus width: SDCONFIG_BUS_WIDTH_SPI, SDCONFIG_BUS_WIDTH_1_BIT, SDCONFIG_BUS_WIDTH_4_BIT
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_IS_BUSMODE_SPI
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_BUSWIDTH(pDev)        SDCONFIG_GET_BUSWIDTH((pDev)->pHcd->CardProperties.BusMode)
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Is bus in SPI mode.
-+
-+  @function name: SDDEVICE_IS_BUSMODE_SPI
-+  @prototype: BOOL SDDEVICE_IS_BUSMODE_SPI(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return:  TRUE, SPI mode.
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_GET_BUSWIDTH
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_IS_BUSMODE_SPI(pDev) (SDDEVICE_GET_BUSWIDTH(pDev) == SDCONFIG_BUS_WIDTH_SPI)
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Send a request to a device.
-+
-+  @function name: SDDEVICE_CALL_REQUEST_FUNC
-+  @prototype: SDIO_STATUS SDDEVICE_CALL_REQUEST_FUNC(PSDDEVICE pDevice, PSDREQUEST pRequest)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+  @input:  pRequest  - the request to be sent
-+
-+  @output: none
-+
-+  @return: SDIO_STATUS
-+
-+  @notes: Sends a request to the specified device. If the request is successfully sent, then
-+          the response flags can be checked to detemine the result of the request.
-+
-+  @example: Example of sending a request to a device:
-+    PSDREQUEST  pReq = NULL;
-+    //allocate a request
-+    pReq = SDDeviceAllocRequest(pDevice);
-+    if (NULL == pReq) {
-+        return SDIO_STATUS_NO_RESOURCES;
-+    }
-+    //initialize the request
-+    SDLIB_SetupCMD52Request(FuncNo, Address, Write, *pData, pReq);
-+    //send the request to the target
-+    status = SDDEVICE_CALL_REQUEST_FUNC(pDevice,pReq);
-+    if (!SDIO_SUCCESS(status)) {
-+        break;
-+    }
-+    //check the request response (based on the request type)
-+    if (SD_R5_GET_RESP_FLAGS(pReq->Response) & SD_R5_ERRORS) {
-+        ...
-+    }
-+    if (!Write) {
-+            // store the byte
-+        *pData =  SD_R5_GET_READ_DATA(pReq->Response);
-+    }
-+    //free the request
-+    SDDeviceFreeRequest(pDevice,pReq);
-+    ...
-+
-+  @see also: SDDeviceAllocRequest
-+  @see also: SDDEVICE_CALL_CONFIG_FUNC
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_CALL_REQUEST_FUNC(pDev,pReq)  (pDev)->pRequest((pDev),(pReq))
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Send configuration to a device.
-+
-+  @function name: SDDEVICE_CALL_CONFIG_FUNC
-+  @prototype: SDIO_STATUS SDDEVICE_CALL_CONFIG_FUNC(PSDDEVICE pDevice, PSDCONFIG pConfigure)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+  @input:  pConfigure - configuration request
-+
-+  @output: none
-+
-+  @return: SDIO_STATUS
-+
-+  @notes: Sends a configuration request to the specified device.
-+
-+  @example: Example of sending a request to a device:
-+        SDCONFIG  configHdr;
-+        SDCONFIG_FUNC_ENABLE_DISABLE_DATA fData;
-+        fData.EnableFlags = SDCONFIG_ENABLE_FUNC;
-+        fData.TimeOut = 500;
-+        SET_SDCONFIG_CMD_INFO(&configHdr, SDCONFIG_FUNC_ENABLE_DISABLE, fData, sizeof(fData));
-+        return SDDEVICE_CALL_CONFIG_FUNC(pDevice, &configHdr);
-+
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_CALL_CONFIG_FUNC(pDev,pCfg)   (pDev)->pConfigure((pDev),(pCfg))
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Allocate a request structure.
-+
-+  @function name: SDDeviceAllocRequest
-+  @prototype: PSDREQUEST SDDeviceAllocRequest(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: request pointer or NULL if not available.
-+
-+  @notes:  This function must not be called in a non-schedulable (interrupts off) context.
-+           Allocating memory on some OSes may block.
-+
-+  @see also: SDDEVICE_CALL_REQUEST_FUNC
-+  @see also: SDDeviceFreeRequest
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDeviceAllocRequest(pDev)        (pDev)->AllocRequest((pDev))
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Free a request structure.
-+
-+  @function name: SDDeviceFreeRequest
-+  @prototype: void SDDeviceFreeRequest(PSDDEVICE pDevice, PSDREQUEST pRequest)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+  @input:  pRequest  - request allocated by SDDeviceAllocRequest().
-+
-+  @output: none
-+
-+  @return: none
-+
-+  @notes: This function must not be called in a non-schedulable (interrupts off) context.
-+          Freeing memory on some OSes may block.
-+
-+  @see also: SDDEVICE_CALL_REQUEST_FUNC
-+  @see also: SDDeviceAllocRequest
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDeviceFreeRequest(pDev,pReq)    (pDev)->FreeRequest((pDev),pReq)
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Register an interrupt handler for a device.
-+
-+  @function name: SDDEVICE_SET_IRQ_HANDLER
-+  @prototype: void SDDEVICE_SET_IRQ_HANDLER(PSDDEVICE pDevice,
-+                                            void (*pIrqFunction)(PVOID pContext),
-+                                            PVOID pContext)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+  @input:  pIrqFunction  - the interrupt function to execute.
-+  @input:  pContext  - context value passed into interrupt routine.
-+
-+  @output: none
-+
-+  @return: none
-+
-+  @notes: The registered routine will be called upon each card interrupt.
-+          The interrupt function should acknowledge the interrupt when it is
-+          ready to handle more interrupts using:
-+          SDLIB_IssueConfig(pDevice, SDCONFIG_FUNC_ACK_IRQ, NULL, 0);
-+          The interrupt handler can perform synchronous request calls.
-+
-+  @see also: SDDEVICE_SET_ASYNC_IRQ_HANDLER
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_SET_IRQ_HANDLER(pDev,pFn,pContext)  \
-+{                                                    \
-+    (pDev)->pIrqFunction = (pFn);                    \
-+    (pDev)->IrqContext = (PVOID)(pContext);          \
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Register an asynchronous interrupt handler for a device.
-+
-+  @function name: SDDEVICE_SET_ASYNC_IRQ_HANDLER
-+  @prototype: void SDDEVICE_SET_ASYNC_IRQ_HANDLER(PSDDEVICE pDevice,
-+                                            void (*pIrqAsyncFunction)(PVOID pContext),
-+                                            PVOID pContext)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+  @input:  pIrqAsyncFunction  - the interrupt function to execute.
-+  @input:  pContext  - context value passed into interrupt routine.
-+
-+  @output: none
-+
-+  @return: none
-+
-+  @notes: The registered routine will be called upon each card interrupt.
-+          The interrupt function should acknowledge the interrupt when it is
-+          ready to handle more interrupts using:
-+          SDLIB_IssueConfig(pDevice, SDCONFIG_FUNC_ACK_IRQ, NULL, 0);
-+          The interrupt handler can not perform any synchronous request calls.
-+          Using this call provides a faster interrupt dispatch, but limits all
-+          requests to asynchronous mode.
-+
-+  @see also: SDDEVICE_SET_IRQ_HANDLER
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_SET_ASYNC_IRQ_HANDLER(pDev,pFn,pContext)  \
-+{                                                          \
-+    (pDev)->pIrqAsyncFunction = (pFn);                     \
-+    (pDev)->IrqAsyncContext = (PVOID)(pContext);           \
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the SDIO capabilities rgeister.
-+
-+  @function name: SDDEVICE_GET_SDIOCARD_CAPS
-+  @prototype: UINT8 SDDEVICE_GET_SDIOCARD_CAPS(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: SD capabilities
-+
-+  @notes: See SD specification for decoding of these capabilities.
-+
-+  @see also: SDDEVICE_GET_SDIO_CARD_CAPS
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SDIOCARD_CAPS(pDev) (pDev)->pHcd->CardProperties.SDIOCaps
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get HCD driver name
-+
-+  @function name: SDDEVICE_GET_HCDNAME
-+  @prototype: PTEXT SDDEVICE_GET_HCDNAME(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return:  pointer to a string containing the name of the underlying HCD
-+
-+  @notes: Implemented as a macro.
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_HCDNAME(pDev)  (pDev)->pHcd->pName
-+
-+
-+#define SDDEVICE_CALL_IRQ_HANDLER(pDev)       (pDev)->pIrqFunction((pDev)->IrqContext)
-+#define SDDEVICE_CALL_IRQ_ASYNC_HANDLER(pDev) (pDev)->pIrqAsyncFunction((pDev)->IrqAsyncContext)
-+
-+
-+#define SDDEVICE_SET_SDIO_FUNCNO(pDev,Num) (pDev)->pId[0].SDIO_FunctionNo = (Num)
-+#define SDDEVICE_IS_CARD_REMOVED(pDev)     ((pDev)->pHcd->CardProperties.CardState & \
-+                                             CARD_STATE_REMOVED)
-+
-+
-+typedef enum _SDHCD_IRQ_PROC_STATE {
-+    SDHCD_IDLE = 0,
-+    SDHCD_IRQ_PENDING = 1,
-+    SDHCD_IRQ_HELPER  = 2
-+}SDHCD_IRQ_PROC_STATE, *PSDHCD_IRQ_PROC_STATE;
-+
-+/* host controller bus driver registration structure */
-+typedef struct _SDHCD {
-+    CT_VERSION_CODE Version;    /* version code of the SDIO stack */
-+    SDLIST  SDList;             /* internal use list*/
-+    PTEXT   pName;              /* name of registering host/slot driver */
-+    UINT32  Attributes;         /* attributes of host controller */
-+    UINT16  MaxBytesPerBlock;   /* max bytes per block */
-+    UINT16  MaxBlocksPerTrans;  /* max blocks per transaction */
-+    SD_SLOT_CURRENT  MaxSlotCurrent;  /* max current per slot in milli-amps */
-+    UINT8   SlotNumber;         /* sequential slot number for this HCD, set by bus driver */
-+    SD_BUSCLOCK_RATE    MaxClockRate;         /* max clock rate in hz */
-+    SLOT_VOLTAGE_MASK   SlotVoltageCaps;      /* slot voltage capabilities */
-+    SLOT_VOLTAGE_MASK   SlotVoltagePreferred; /* preferred slot voltage */
-+    PVOID   pContext;                         /* host controller driver use data   */
-+    SDIO_STATUS (*pRequest)(struct _SDHCD *pHcd);
-+                                /* get/set configuration */
-+    SDIO_STATUS (*pConfigure)(struct _SDHCD *pHcd, PSDCONFIG pConfig);
-+        /* everything below this line is for bus driver use */
-+    OS_SEMAPHORE    ConfigureOpsSem;    /* semaphore to make specific configure ops atomic, internal use */
-+    OS_CRITICALSECTION HcdCritSection;  /* critical section to protect hcd data structures (internal use) */
-+    SDREQUESTQUEUE  RequestQueue;       /* request queue, internal use */
-+    PSDREQUEST      pCurrentRequest;    /* current request we are working on */
-+    CARD_PROPERTIES CardProperties;     /* properties for the currently inserted card*/
-+    OSKERNEL_HELPER SDIOIrqHelper;      /* synch IRQ helper, internal use */
-+    SDDEVICE        *pPseudoDev;        /* pseudo device used for initialization (internal use) */
-+    UINT8           PendingHelperIrqs;  /* IRQ helper pending IRQs */
-+    UINT8           PendingIrqAcks;     /* pending IRQ acks from function drivers */
-+    UINT8           IrqsEnabled;        /* current irq enabled mask */
-+    SDHCD_IRQ_PROC_STATE IrqProcState;  /* irq processing state */
-+    POS_DEVICE      pDevice;            /* device registration with base system */
-+    SD_SLOT_CURRENT SlotCurrentAllocated; /* slot current allocated (internal use ) */
-+    ATOMIC_FLAGS    HcdFlags;             /* HCD Flags */
-+#define HCD_REQUEST_CALL_BIT  0
-+#define HCD_IRQ_NO_PEND_CHECK 1           /* HCD flag to bypass interrupt pending register
-+                                             check, typically done on single function cards */
-+    SDREQUESTQUEUE  CompletedRequestQueue; /* completed request queue, internal use */
-+    PSDDMA_DESCRIPTION pDmaDescription; /* description of HCD's DMA capabilities */
-+    POS_MODULE         pModule;         /* OS-specific module information */
-+    INT                Recursion;       /* recursion level */
-+    PVOID              Reserved1;
-+    PVOID              Reserved2;
-+}SDHCD, *PSDHCD;
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get a pointer to the HCD's DMA description
-+
-+  @function name: SDGET_DMA_DESCRIPTION
-+  @prototype: PSDDMA_DESCRIPTION SDGET_DMA_DESCRIPTION(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice - device structure
-+
-+  @return: PSDDMA_DESCRIPTION or NULL if no DMA support
-+
-+  @notes: Implemented as a macro.
-+
-+  @example: getting the current request:
-+          PSDDMA_DESCRIPTION pDmaDescrp = SDGET_DMA_DESCRIPTION(pDevice);
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDGET_DMA_DESCRIPTION(pDevice)     (pDevice)->pHcd->pDmaDescription
-+
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the logical slot number the device is assigned to.
-+
-+  @function name: SDDEVICE_GET_SLOT_NUMBER
-+  @prototype: UINT8 SDDEVICE_GET_SLOT_NUMBER(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice - device structure
-+
-+  @return: unsigned number representing the slot number
-+
-+  @notes: Implemented as a macro. This value is unique for each physical slot in the system
-+          and assigned by the bus driver. Devices on a multi-function card will share the same
-+          slot number.
-+
-+  @example: getting the slot number:
-+          UINT8 thisSlot = SDDEVICE_GET_SLOT_NUMBER(pDevice);
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SLOT_NUMBER(pDevice) (pDevice)->pHcd->SlotNumber
-+
-+/* for function use */
-+SDIO_STATUS SDIO_RegisterFunction(PSDFUNCTION pFunction);
-+SDIO_STATUS SDIO_UnregisterFunction(PSDFUNCTION pFunction);
-+
-+#include "sdio_hcd_defs.h"
-+#endif /* __SDIO_BUSDRIVER_H___ */
-diff --git a/include/linux/sdio/sdio_hcd_defs.h b/include/linux/sdio/sdio_hcd_defs.h
-new file mode 100644
-index 0000000..1782469
---- /dev/null
-+++ b/include/linux/sdio/sdio_hcd_defs.h
-@@ -0,0 +1,219 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdio_hcd_defs.h
-+
-+@abstract: host controller driver definitions
-+
-+@notice: Copyright (c), 2005-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#ifndef __SDIO_HCD_DEFS_H___
-+#define __SDIO_HCD_DEFS_H___
-+
-+    /* write protect switch position data */
-+typedef UINT8 SDCONFIG_WP_VALUE;
-+
-+    /* HC commands */
-+#define SDCONFIG_SEND_INIT_CLOCKS  (SDCONFIG_FLAGS_HC_CONFIG | SDCONFIG_FLAGS_DATA_PUT  | 1)
-+#define SDCONFIG_SDIO_INT_CTRL     (SDCONFIG_FLAGS_HC_CONFIG | SDCONFIG_FLAGS_DATA_PUT  | 2)
-+#define SDCONFIG_SDIO_REARM_INT    (SDCONFIG_FLAGS_HC_CONFIG | SDCONFIG_FLAGS_DATA_NONE | 3)
-+#define SDCONFIG_BUS_MODE_CTRL     (SDCONFIG_FLAGS_HC_CONFIG | SDCONFIG_FLAGS_DATA_BOTH | 4)
-+#define SDCONFIG_POWER_CTRL        (SDCONFIG_FLAGS_HC_CONFIG | SDCONFIG_FLAGS_DATA_PUT  | 5)
-+#define SDCONFIG_GET_WP            (SDCONFIG_FLAGS_HC_CONFIG | SDCONFIG_FLAGS_DATA_GET  | 6)
-+
-+    /* slot init clocks control */
-+typedef struct _SDCONFIG_INIT_CLOCKS_DATA  {
-+    UINT16  NumberOfClocks;  /* number of clocks to issue in the current bus mode*/
-+}SDCONFIG_INIT_CLOCKS_DATA, *PSDCONFIG_INIT_CLOCKS_DATA;
-+
-+/* slot power control */
-+typedef struct _SDCONFIG_POWER_CTRL_DATA  {
-+    BOOL                SlotPowerEnable;            /* turn on/off slot power */
-+    SLOT_VOLTAGE_MASK   SlotPowerVoltageMask;       /* slot power voltage mask */
-+}SDCONFIG_POWER_CTRL_DATA, *PSDCONFIG_POWER_CTRL_DATA;
-+
-+typedef UINT8 SDIO_IRQ_MODE_FLAGS;
-+/* SDIO Interrupt control */
-+typedef struct _SDCONFIG_SDIO_INT_CTRL_DATA  {
-+    BOOL                  SlotIRQEnable;      /* turn on/off Slot IRQ detection */
-+    SDIO_IRQ_MODE_FLAGS   IRQDetectMode;      /* slot IRQ detect mode , only valid if Enabled = TRUE */
-+#define IRQ_DETECT_RAW       0x00
-+#define IRQ_DETECT_MULTI_BLK 0x01
-+#define IRQ_DETECT_4_BIT     0x02
-+#define IRQ_DETECT_1_BIT     0x04
-+#define IRQ_DETECT_SPI       0x08
-+}SDCONFIG_SDIO_INT_CTRL_DATA, *PSDCONFIG_SDIO_INT_CTRL_DATA;
-+
-+/* card insert */
-+#define EVENT_HCD_ATTACH               1
-+/* card remove */
-+#define EVENT_HCD_DETACH               2
-+/* card slot interrupt */
-+#define EVENT_HCD_SDIO_IRQ_PENDING     3
-+/* transfer done */
-+#define EVENT_HCD_TRANSFER_DONE        4
-+/* (internal use only) */
-+#define EVENT_HCD_CD_POLLING           5
-+/* NOP */
-+#define EVENT_HCD_NOP                  0
-+
-+/* attrib_flags */
-+#define SDHCD_ATTRIB_SUPPORTS_POWER   0x0001  /* host controller driver supports power managment */
-+#define SDHCD_ATTRIB_BUS_1BIT         0x0002  /* SD Native 1 - bit mode */
-+#define SDHCD_ATTRIB_BUS_4BIT         0x0004  /* SD Native 4 - bit mode */
-+#define SDHCD_ATTRIB_BUS_SPI          0x0008  /* SPI mode capable */
-+#define SDHCD_ATTRIB_READ_WAIT        0x0010  /* read wait supported (SD-only) */
-+#define SDHCD_ATTRIB_MULTI_BLK_IRQ    0x0020  /* interrupts between multi-block capable (SD-only) */
-+#define SDHCD_ATTRIB_BUS_MMC8BIT      0x0040  /* MMC  8-bit */
-+#define SDHCD_ATTRIB_SLOT_POLLING     0x0080  /* requires slot polling for Card Detect */
-+#define SDHCD_ATTRIB_POWER_SWITCH     0x0100  /* host has power switch control, must be set if SPI
-+                                                 mode can be switched to 1 or 4 bit mode */
-+#define SDHCD_ATTRIB_NO_SPI_CRC       0x0200  /* when in SPI mode,
-+                                                 host wants to run without SPI CRC */
-+#define SDHCD_ATTRIB_AUTO_CMD12       0x0400  /* host controller supports auto CMD12 */
-+#define SDHCD_ATTRIB_NO_4BIT_IRQ      0x0800  /* host controller does not support 4 bit IRQ mode*/
-+#define SDHCD_ATTRIB_RAW_MODE         0x1000  /* host controller is a raw mode hcd*/
-+#define SDHCD_ATTRIB_SD_HIGH_SPEED    0x2000  /* host controller supports SD high speed interface */
-+#define SDHCD_ATTRIB_MMC_HIGH_SPEED   0x4000  /* host controller supports MMC high speed interface */
-+
-+#define IS_CARD_PRESENT(pHcd)         ((pHcd)->CardProperties.Flags & CARD_TYPE_MASK)
-+#define SET_CURRENT_REQUEST(pHcd,Req) (pHcd)->pCurrentRequest = (Req)
-+#define IS_HCD_RAW(pHcd)              ((pHcd)->Attributes & SDHCD_ATTRIB_RAW_MODE)
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get a pointer to the current bus request for a host controller
-+
-+  @function name: GET_CURRENT_REQUEST
-+  @prototype: PSDREQUEST GET_CURRENT_REQUEST (PSDHCD pHcd)
-+  @category: HD_Reference
-+
-+  @input:  pHcd - host structure
-+
-+  @return: current SD/SDIO bus request being worked on
-+
-+  @notes: Implemented as a macro. This macro returns the current SD request that is
-+          being worked on.
-+
-+  @example: getting the current request:
-+          pReq = GET_CURRENT_REQUEST(&pHct->Hcd);
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define GET_CURRENT_REQUEST(pHcd)     (pHcd)->pCurrentRequest
-+#define GET_CURRENT_BUS_WIDTH(pHcd) SDCONFIG_GET_BUSWIDTH((pHcd)->CardProperties.BusMode)
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get host controller's current operational bus clock
-+
-+  @function name: SDHCD_GET_OPER_CLOCK
-+  @prototype: SD_BUSCLOCK_RATE SDHCD_GET_OPER_CLOCK(PSDHCD pHcd)
-+  @category: HD_Reference
-+
-+  @input:  pHcd   - the registered host structure
-+
-+  @output: none
-+
-+  @return: clock rate
-+
-+  @notes: Implemented as a macro. Returns the current bus clock rate.
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDHCD_GET_OPER_CLOCK(pHcd)      (pHcd)->CardProperties.OperBusClock
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Is host controller operating in SPI mode
-+
-+  @function name: IS_HCD_BUS_MODE_SPI
-+  @prototype: BOOL IS_HCD_BUS_MODE_SPI (PSDHCD pHcd)
-+  @category: HD_Reference
-+
-+  @input:  pHcd - host structure
-+
-+  @return: TRUE if in SPI mode
-+
-+  @notes: Implemented as a macro. Host controllers that operate in SPI mode
-+          dynamically can use this macro to check for SPI operation.
-+
-+  @example: testing for SPI mode:
-+          if (IS_HCD_BUS_MODE_SPI(&pHct->Hcd)) {
-+             .. in spi mode
-+          }
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define IS_HCD_BUS_MODE_SPI(pHcd)   (GET_CURRENT_BUS_WIDTH(pHcd) == SDCONFIG_BUS_WIDTH_SPI)
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Is host controller using SPI in non-CRC mode
-+
-+  @function name: IS_HCD_BUS_MODE_SPI_NO_CRC
-+  @prototype: BOOL IS_HCD_BUS_MODE_SPI_NO_CRC(PSDHCD pHcd)
-+  @category: HD_Reference
-+
-+  @input:  pHcd - host structure
-+
-+  @return: TRUE if CRC mode is off
-+
-+  @notes: Implemented as a macro. SPI-capable cards and systems can operate in
-+          non-CRC protected mode.  In this mode the host controller should ignore
-+          CRC fields and/or disable CRC generation when issuing command or data
-+          packets.  This option is useful for software based SPI mode where CRC
-+          should be turned off in order to reduce processing overhead.
-+
-+  @example: test for non-CRC SPI mode:
-+          if (IS_HCD_BUS_MODE_SPI_NO_CRC(&pHct->Hcd)) {
-+             .. disable CRC checking in hardware.
-+          }
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define IS_HCD_BUS_MODE_SPI_NO_CRC(pHcd)   ((pHcd)->CardProperties.BusMode & \
-+                                                        SDCONFIG_BUS_MODE_SPI_NO_CRC)
-+
-+typedef UINT8 SDHCD_RESPONSE_CHECK_MODE;
-+/* have SDIO core check the response token and see if it is okay to continue with
-+   * the data portion */
-+#define SDHCD_CHECK_DATA_TRANS_OK   0x01
-+/* have SDIO core check the SPI token received */
-+#define SDHCD_CHECK_SPI_TOKEN       0x02
-+
-+/* prototypes */
-+/* for HCD use */
-+SDIO_STATUS SDIO_RegisterHostController(PSDHCD pHcd);
-+SDIO_STATUS SDIO_UnregisterHostController(PSDHCD pHcd);
-+SDIO_STATUS SDIO_HandleHcdEvent(PSDHCD pHcd, HCD_EVENT Event);
-+SDIO_STATUS SDIO_CheckResponse(PSDHCD pHcd, PSDREQUEST pReq, SDHCD_RESPONSE_CHECK_MODE CheckMode);
-+SDIO_STATUS SDIO_BusAddOSDevice(PSDDMA_DESCRIPTION pDma, POS_PNPDRIVER pDriver, POS_PNPDEVICE pDevice);
-+void SDIO_BusRemoveOSDevice(POS_PNPDRIVER pDriver, POS_PNPDEVICE pDevice);
-+
-+#endif /* __SDIO_BUSDRIVER_H___ */
-diff --git a/include/linux/sdio/sdio_lib.h b/include/linux/sdio/sdio_lib.h
-new file mode 100644
-index 0000000..ac0cbd7
---- /dev/null
-+++ b/include/linux/sdio/sdio_lib.h
-@@ -0,0 +1,270 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdio_lib.h
-+
-+@abstract: SDIO Library include
-+
-+#notes:
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#ifndef __SDIO_LIB_H___
-+#define __SDIO_LIB_H___
-+
-+#ifdef UNDER_CE
-+#include "wince\sdio_lib_wince.h"
-+#endif /* WINCE */
-+
-+#define CMD52_DO_READ  FALSE
-+#define CMD52_DO_WRITE TRUE
-+
-+    /* read/write macros to any function */
-+#define Cmd52WriteByteFunc(pDev,Func,Address,pValue) \
-+                SDLIB_IssueCMD52((pDev),(Func),(Address),(pValue),1,CMD52_DO_WRITE)
-+#define Cmd52ReadByteFunc(pDev,Func,Address,pValue) \
-+                SDLIB_IssueCMD52((pDev),(Func),(Address),pValue,1,CMD52_DO_READ)
-+#define Cmd52ReadMultipleFunc(pDev,Func, Address, pBuf,length) \
-+                SDLIB_IssueCMD52((pDev),(Func),(Address),(pBuf),(length),CMD52_DO_READ)
-+
-+   /* macros to access common registers */
-+#define Cmd52WriteByteCommon(pDev, Address, pValue) \
-+                Cmd52WriteByteFunc((pDev),0,(Address),(pValue))
-+#define Cmd52ReadByteCommon(pDev, Address, pValue) \
-+                Cmd52ReadByteFunc((pDev),0,(Address),(pValue))
-+#define Cmd52ReadMultipleCommon(pDev, Address, pBuf,length) \
-+                Cmd52ReadMultipleFunc((pDev),0,(Address),(pBuf),(length))
-+
-+#define SDLIB_SetupCMD52RequestAsync(f,a,w,wd,pR)   \
-+{                                                   \
-+    SDLIB_SetupCMD52Request((f),(a),(w),(wd),(pR)); \
-+    (pR)->Flags |= SDREQ_FLAGS_TRANS_ASYNC;         \
-+}
-+
-+    /* a message block */
-+typedef struct _SDMESSAGE_BLOCK {
-+    SDLIST  SDList;                   /* list entry */
-+    INT     MessageLength;            /* number of bytes in this message */
-+    UINT8   MessageStart[1];          /* message start */
-+}SDMESSAGE_BLOCK, *PSDMESSAGE_BLOCK;
-+
-+    /* message queue */
-+typedef struct _SDMESSAGE_QUEUE {
-+    SDLIST          MessageList;        /* message list */
-+    OS_CRITICALSECTION MessageCritSection; /* message semaphore */
-+    SDLIST          FreeMessageList;    /* free message list */
-+    INT             MaxMessageLength;   /* max message block length */
-+}SDMESSAGE_QUEUE, *PSDMESSAGE_QUEUE;
-+
-+/* internal library prototypes that can be proxied */
-+SDIO_STATUS _SDLIB_IssueCMD52(PSDDEVICE     pDevice,
-+                        UINT8         FuncNo,
-+                        UINT32        Address,
-+                        PUINT8        pData,
-+                        INT           ByteCount,
-+                        BOOL          Write);
-+SDIO_STATUS _SDLIB_FindTuple(PSDDEVICE  pDevice,
-+                             UINT8      Tuple,
-+                             UINT32     *pTupleScanAddress,
-+                             PUINT8     pBuffer,
-+                             UINT8      *pLength);
-+SDIO_STATUS _SDLIB_IssueConfig(PSDDEVICE        pDevice,
-+                               SDCONFIG_COMMAND Command,
-+                               PVOID            pData,
-+                               INT              Length);
-+void _SDLIB_PrintBuffer(PUCHAR pBuffer, INT Length,PTEXT pDescription);
-+void _SDLIB_SetupCMD52Request(UINT8         FuncNo,
-+                              UINT32        Address,
-+                              BOOL          Write,
-+                              UINT8         WriteData,
-+                              PSDREQUEST    pRequest);
-+SDIO_STATUS _SDLIB_SetFunctionBlockSize(PSDDEVICE        pDevice,
-+                                        UINT16           BlockSize);
-+
-+SDIO_STATUS _SDLIB_GetDefaultOpCurrent(PSDDEVICE  pDevice,
-+                                       SD_SLOT_CURRENT *pOpCurrent);
-+PSDMESSAGE_QUEUE _CreateMessageQueue(INT MaxMessages, INT MaxMessageLength);
-+void _DeleteMessageQueue(PSDMESSAGE_QUEUE pQueue);
-+SDIO_STATUS _PostMessage(PSDMESSAGE_QUEUE pQueue, PVOID pMessage, INT MessageLength);
-+SDIO_STATUS _GetMessage(PSDMESSAGE_QUEUE pQueue, PVOID pData, INT *pBufferLength);
-+
-+#ifdef CTSYSTEM_NO_FUNCTION_PROXIES
-+    /* OS port requires no proxy functions, use methods directly from the library */
-+#define SDLIB_IssueCMD52        _SDLIB_IssueCMD52
-+#define SDLIB_SetupCMD52Request _SDLIB_SetupCMD52Request
-+#define SDLIB_FindTuple         _SDLIB_FindTuple
-+#define SDLIB_IssueConfig       _SDLIB_IssueConfig
-+#define SDLIB_SetFunctionBlockSize  _SDLIB_SetFunctionBlockSize
-+#define SDLIB_GetDefaultOpCurrent   _SDLIB_GetDefaultOpCurrent
-+#define SDLIB_CreateMessageQueue    _CreateMessageQueue
-+#define SDLIB_DeleteMessageQueue    _DeleteMessageQueue
-+#define SDLIB_PostMessage           _PostMessage
-+#define SDLIB_GetMessage            _GetMessage
-+#define SDLIB_PrintBuffer           _SDLIB_PrintBuffer
-+#else
-+
-+/* proxied versions */
-+SDIO_STATUS SDLIB_IssueCMD52(PSDDEVICE     pDevice,
-+                             UINT8         FuncNo,
-+                             UINT32        Address,
-+                             PUINT8        pData,
-+                             INT           ByteCount,
-+                             BOOL          Write);
-+
-+void SDLIB_SetupCMD52Request(UINT8         FuncNo,
-+                             UINT32        Address,
-+                             BOOL          Write,
-+                             UINT8         WriteData,
-+                             PSDREQUEST    pRequest);
-+
-+SDIO_STATUS SDLIB_FindTuple(PSDDEVICE  pDevice,
-+                        UINT8      Tuple,
-+                        UINT32     *pTupleScanAddress,
-+                        PUINT8     pBuffer,
-+                        UINT8      *pLength);
-+
-+SDIO_STATUS SDLIB_IssueConfig(PSDDEVICE        pDevice,
-+                              SDCONFIG_COMMAND Command,
-+                              PVOID            pData,
-+                              INT              Length);
-+
-+SDIO_STATUS SDLIB_SetFunctionBlockSize(PSDDEVICE        pDevice,
-+                                       UINT16           BlockSize);
-+
-+void SDLIB_PrintBuffer(PUCHAR pBuffer, INT Length,PTEXT pDescription);
-+
-+SDIO_STATUS SDLIB_GetDefaultOpCurrent(PSDDEVICE  pDevice, SD_SLOT_CURRENT *pOpCurrent);
-+
-+PSDMESSAGE_QUEUE SDLIB_CreateMessageQueue(INT MaxMessages, INT MaxMessageLength);
-+
-+void SDLIB_DeleteMessageQueue(PSDMESSAGE_QUEUE pQueue);
-+
-+SDIO_STATUS SDLIB_PostMessage(PSDMESSAGE_QUEUE pQueue, PVOID pMessage, INT MessageLength);
-+
-+SDIO_STATUS SDLIB_GetMessage(PSDMESSAGE_QUEUE pQueue, PVOID pData, INT *pBufferLength);
-+#endif /* CTSYSTEM_NO_FUNCTION_PROXIES */
-+
-+
-+SDIO_STATUS SDLIB_OSCreateHelper(POSKERNEL_HELPER pHelper,
-+                           PHELPER_FUNCTION pFunction,
-+                           PVOID            pContext);
-+
-+void SDLIB_OSDeleteHelper(POSKERNEL_HELPER pHelper);
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Check message queue is empty
-+
-+  @function name: SDLIB_IsQueueEmpty
-+  @prototype: BOOL SDLIB_IsQueueEmpty(PSDMESSAGE_QUEUE pQueue)
-+  @category: Support_Reference
-+
-+  @input: pQueue - message queue to check
-+
-+  @return: TRUE if empty else false
-+
-+  @see also: SDLIB_CreateMessageQueue
-+
-+  @example: Check message queue :
-+              if (SDLIB_IsQueueEmpty(pInstance->pQueue)) {
-+                   .. message queue is empty
-+              }
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static INLINE BOOL SDLIB_IsQueueEmpty(PSDMESSAGE_QUEUE pQueue) {
-+    return SDLIST_IS_EMPTY(&pQueue->MessageList);
-+}
-+
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Issue an I/O abort request
-+
-+  @function name: SDLIB_IssueIOAbort
-+  @prototype: SDIO_STATUS SDLIB_IssueIOAbort(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input: pDevice - the device that is the target of this request
-+
-+  @return: SDIO_STATUS
-+
-+  @notes: This procedure can be called to issue an I/O abort request to an I/O function.
-+          This procedure cannot be used to abort a data (block) transfer already in progress.
-+          It is intended to be used when a data (block) transfer completes with an error and only if
-+          the I/O function requires an abort action.  Some I/O functions may automatically
-+          recover from such failures and not require this action. This function issues
-+          the abort command synchronously and can potentially block.
-+          If an async request is required, you must allocate a request and use
-+          SDLIB_SetupIOAbortAsync() to prepare the request.
-+
-+  @example: Issuing I/O Abort synchronously :
-+              .. check status from last block operation:
-+              if (status == SDIO_STATUS_BUS_READ_TIMEOUT) {
-+                   .. on failure, issue I/O abort
-+                   status2 = SDLIB_IssueIOAbort(pDevice);
-+              }
-+            Issuing I/O Abort asynchronously:
-+                ... allocate a request
-+                ... setup the request:
-+                 SDLIB_SetupIOAbortAsync(pDevice,pReq);
-+                 pReq->pCompletion = myIOAbortCompletion;
-+                 pReq->pCompleteContext = pDevice;
-+                 status = SDDEVICE_CALL_REQUEST_FUNC(pDevice,pReq);
-+
-+   @see also: SDLIB_SetupIOAbortAsync
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static INLINE SDIO_STATUS SDLIB_IssueIOAbort(PSDDEVICE pDevice) {
-+    UINT8 value = SDDEVICE_GET_SDIO_FUNCNO(pDevice);
-+    return Cmd52WriteByteCommon(pDevice,0x06,&value);
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Setup an I/O abort request for async operation
-+
-+  @function name: SDLIB_SetupIOAbortAsync
-+  @prototype: SDLIB_SetupIOAbortAsync(PSDDEVICE pDevice, PSDREQUEST pRequest)
-+  @category: PD_Reference
-+
-+  @input: pDevice - the device that is the target of this request
-+          pRequest - the request to set up
-+
-+  @see also: SDLIB_IssueIOAbort
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDLIB_SetupIOAbortAsync(pDevice, pReq) \
-+        SDLIB_SetupCMD52RequestAsync(0,0x06,TRUE,SDDEVICE_GET_SDIO_FUNCNO(pDevice),(pReq))
-+
-+
-+#endif /* __SDIO_LIB_H___*/
-diff --git a/include/linux/sdio/sdlist.h b/include/linux/sdio/sdlist.h
-new file mode 100644
-index 0000000..dc35e1c
---- /dev/null
-+++ b/include/linux/sdio/sdlist.h
-@@ -0,0 +1,141 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdlist.h
-+
-+@abstract: OS independent list functions
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#ifndef __SDLIST_H___
-+#define __SDLIST_H___
-+
-+/* list functions */
-+/* pointers for the list */
-+typedef struct _SDLIST {
-+    struct _SDLIST *pPrev;
-+    struct _SDLIST *pNext;
-+}SDLIST, *PSDLIST;
-+/*
-+ * SDLIST_INIT , circular list
-+*/
-+#define SDLIST_INIT(pList)\
-+    {(pList)->pPrev = pList; (pList)->pNext = pList;}
-+#define SDLIST_INIT_DECLARE(List)\
-+    SDLIST List =   {&List, &List}
-+
-+
-+#define SDLIST_IS_EMPTY(pList) (((pList)->pPrev == (pList)) && ((pList)->pNext == (pList)))
-+#define SDLIST_GET_ITEM_AT_HEAD(pList) (pList)->pNext
-+#define SDLIST_GET_ITEM_AT_TAIL(pList) (pList)->pPrev
-+/*
-+ * SDITERATE_OVER_LIST pStart is the list, pTemp is a temp list member
-+ * NOT: do not use this function if the items in the list are deleted inside the
-+ * iteration loop
-+*/
-+#define SDITERATE_OVER_LIST(pStart, pTemp) \
-+    for((pTemp) =(pStart)->pNext; pTemp != (pStart); (pTemp) = (pTemp)->pNext)
-+
-+
-+/* safe iterate macro that allows the item to be removed from the list
-+ * the iteration continues to the next item in the list
-+ */
-+#define SDITERATE_OVER_LIST_ALLOW_REMOVE(pStart,pItem,st,offset)  \
-+{                                                       \
-+    PSDLIST  pTemp;                                     \
-+    pTemp = (pStart)->pNext;                            \
-+    while (pTemp != (pStart)) {                         \
-+        (pItem) = CONTAINING_STRUCT(pTemp,st,offset);   \
-+         pTemp = pTemp->pNext;                          \
-+
-+#define SDITERATE_END }}
-+
-+/*
-+ * SDListInsertTail - insert pAdd to the end of the list
-+*/
-+static INLINE PSDLIST SDListInsertTail(PSDLIST pList, PSDLIST pAdd) {
-+        /* this assert catches when an item is added twice */
-+    DBG_ASSERT(pAdd->pNext != pList);
-+        /* insert at tail */
-+    pAdd->pPrev = pList->pPrev;
-+    pAdd->pNext = pList;
-+    pList->pPrev->pNext = pAdd;
-+    pList->pPrev = pAdd;
-+    return pAdd;
-+}
-+
-+/*
-+ * SDListInsertHead - insert pAdd into the head of the list
-+*/
-+static INLINE PSDLIST SDListInsertHead(PSDLIST pList, PSDLIST pAdd) {
-+        /* this assert catches when an item is added twice */
-+    DBG_ASSERT(pAdd->pPrev != pList);
-+        /* insert at head */
-+    pAdd->pPrev = pList;
-+    pAdd->pNext = pList->pNext;
-+    pList->pNext->pPrev = pAdd;
-+    pList->pNext = pAdd;
-+    return pAdd;
-+}
-+
-+#define SDListAdd(pList,pItem) SDListInsertHead((pList),(pItem))
-+/*
-+ * SDListRemove - remove pDel from list
-+*/
-+static INLINE PSDLIST SDListRemove(PSDLIST pDel) {
-+    pDel->pNext->pPrev = pDel->pPrev;
-+    pDel->pPrev->pNext = pDel->pNext;
-+        /* point back to itself just to be safe, incase remove is called again */
-+    pDel->pNext = pDel;
-+    pDel->pPrev = pDel;
-+    return pDel;
-+}
-+
-+/*
-+ * SDListRemoveItemFromHead - get a list item from the head
-+*/
-+static INLINE PSDLIST SDListRemoveItemFromHead(PSDLIST pList) {
-+    PSDLIST pItem = NULL;
-+    if (pList->pNext != pList) {
-+        pItem = pList->pNext;
-+            /* remove the first item from head */
-+        SDListRemove(pItem);
-+    }
-+    return pItem;
-+}
-+#endif /* __SDLIST_H___ */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1066-fix-hwecc-2410.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1066-fix-hwecc-2410.patch.patch
deleted file mode 100644 (file)
index d75b2ec..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-From b6817bed9516a65276ee92437697cb46136df882 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:57 +0100
-Subject: [PATCH] fix-hwecc-2410.patch
- S3C24xx ECC mis-calculates the bit to flip:
- http://lists.infradead.org/pipermail/linux-mtd/2007-October/019586.html
- If the error couldn't be corrected, we returned "no problem" :-(
- http://lists.infradead.org/pipermail/linux-mtd/2007-October/019615.html
-
-Signed-off-by: Werner Almesberger <werner@openmoko.org>
----
- drivers/mtd/nand/s3c2410.c |   28 +++++++++++++---------------
- 1 files changed, 13 insertions(+), 15 deletions(-)
-
-diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
-index f83bed9..f7dd4e0 100644
---- a/drivers/mtd/nand/s3c2410.c
-+++ b/drivers/mtd/nand/s3c2410.c
-@@ -364,23 +364,21 @@ static int s3c2410_nand_correct_data(struct mtd_info *mtd, u_char *dat,
-           ((diff2 ^ (diff2 >> 1)) & 0x55) == 0x55) {
-               /* calculate the bit position of the error */
--              bit  = (diff2 >> 2) & 1;
--              bit |= (diff2 >> 3) & 2;
--              bit |= (diff2 >> 4) & 4;
-+              bit  = ((diff2 >> 3) & 1) |
-+                     ((diff2 >> 4) & 2) |
-+                     ((diff2 >> 5) & 4);
-               /* calculate the byte position of the error */
--              byte  = (diff1 << 1) & 0x80;
--              byte |= (diff1 << 2) & 0x40;
--              byte |= (diff1 << 3) & 0x20;
--              byte |= (diff1 << 4) & 0x10;
--
--              byte |= (diff0 >> 3) & 0x08;
--              byte |= (diff0 >> 2) & 0x04;
--              byte |= (diff0 >> 1) & 0x02;
--              byte |= (diff0 >> 0) & 0x01;
--
--              byte |= (diff2 << 8) & 0x100;
-+              byte = ((diff2 << 7) & 0x100) |
-+                     ((diff1 << 0) & 0x80)  |
-+                     ((diff1 << 1) & 0x40)  |
-+                     ((diff1 << 2) & 0x20)  |
-+                     ((diff1 << 3) & 0x10)  |
-+                     ((diff0 >> 4) & 0x08)  |
-+                     ((diff0 >> 3) & 0x04)  |
-+                     ((diff0 >> 2) & 0x02)  |
-+                     ((diff0 >> 1) & 0x01);
-               dev_dbg(info->device, "correcting error bit %d, byte %d\n",
-                       bit, byte);
-@@ -399,7 +397,7 @@ static int s3c2410_nand_correct_data(struct mtd_info *mtd, u_char *dat,
-       if ((diff0 & ~(1<<fls(diff0))) == 0)
-               return 1;
--      return 0;
-+      return -EBADMSG;
- }
- /* ECC functions
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1067-fix-pcf50606-LOWBAT-kill-init.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1067-fix-pcf50606-LOWBAT-kill-init.patch.patch
deleted file mode 100644 (file)
index f9263f9..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-From 530be0418a0d05cad538ff62ae16b43d2d4462e3 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:57 +0100
-Subject: [PATCH] fix-pcf50606-LOWBAT-kill-init.patch
-
----
- drivers/i2c/chips/pcf50606.c |   53 ++++++++++++++++++++++++++++++++++++-----
- 1 files changed, 46 insertions(+), 7 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
-index b530583..a1c92d3 100644
---- a/drivers/i2c/chips/pcf50606.c
-+++ b/drivers/i2c/chips/pcf50606.c
-@@ -654,8 +654,20 @@ static void pcf50606_work(struct work_struct *work)
-                       if (pcf->onkey_seconds >=
-                           pcf->pdata->onkey_seconds_required) {
-                               /* Ask init to do 'ctrlaltdel' */
--                              DEBUGPC("SIGINT(init) ");
--                              kill_proc(1, SIGINT, 1);
-+                              /*
-+                               * currently Linux reacts badly to issuing a
-+                               * signal to PID #1 before init is started.
-+                               * What happens is that the next kernel thread
-+                               * to start, which is the JFFS2 Garbage
-+                               * collector in our case, gets the signal
-+                               * instead and proceeds to fail to fork --
-+                               * which is very bad.  Therefore we confirm
-+                               * PID #1 exists before issuing the signal
-+                               */
-+                              if (find_task_by_pid(1)) {
-+                                      kill_proc(1, SIGINT, 1);
-+                                      DEBUGPC("SIGINT(init) ");
-+                              }
-                               /* FIXME: what to do if userspace doesn't
-                                * shut down? Do we want to force it? */
-                       }
-@@ -749,11 +761,38 @@ static void pcf50606_work(struct work_struct *work)
-       }
-       /* FIXME: TSCPRES */
-       if (pcfirq[2] & PCF50606_INT3_LOWBAT) {
--              /* Really low battery voltage, we have 8 seconds left */
--              DEBUGPC("LOWBAT ");
--              apm_queue_event(APM_LOW_BATTERY);
--              DEBUGPC("SIGPWR(init) ");
--              kill_proc(1, SIGPWR, 1);
-+              if (__reg_read(pcf, PCF50606_REG_OOCS) & PCF50606_OOCS_EXTON) {
-+                      /*
-+                       * hey no need to freak out, we have some kind of
-+                       * valid charger power
-+                       */
-+                      DEBUGPC("(NO)BAT ");
-+              } else {
-+                      /* Really low battery voltage, we have 8 seconds left */
-+                      DEBUGPC("LOWBAT ");
-+                      /*
-+                       * currently Linux reacts badly to issuing a signal to
-+                       * PID #1 before init is started.  What happens is that
-+                       * the next kernel thread to start, which is the JFFS2
-+                       * Garbage collector in our case, gets the signal
-+                       * instead and proceeds to fail to fork -- which is
-+                       * very bad.  Therefore we confirm PID #1 exists
-+                       * before issuing SPIGPWR
-+                       */
-+                      if (find_task_by_pid(1)) {
-+                              apm_queue_event(APM_LOW_BATTERY);
-+                              DEBUGPC("SIGPWR(init) ");
-+                              kill_proc(1, SIGPWR, 1);
-+                      } else
-+                              /*
-+                               * well, our situation is like this:  we do not
-+                               * have any external power, we have a low
-+                               * battery and since PID #1 doesn't exist yet,
-+                               * we are early in the boot, likely before
-+                               * rootfs mount.  We should just call it a day
-+                               */
-+                              apm_queue_event(APM_CRITICAL_SUSPEND);
-+              }
-               /* Tell PMU we are taking care of this */
-               reg_set_bit_mask(pcf, PCF50606_REG_OOCC1,
-                                PCF50606_OOCC1_TOTRST,
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1068-fix-pcf50633-LOWBAT-kill-init.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1068-fix-pcf50633-LOWBAT-kill-init.patch.patch
deleted file mode 100644 (file)
index 2bbc782..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-From 5a95dab616822e33d6526965b46eae98717537ea Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:58 +0100
-Subject: [PATCH] fix-pcf50633-LOWBAT-kill-init.patch
-
----
- drivers/i2c/chips/pcf50633.c |   56 ++++++++++++++++++++++++++++++++++++-----
- 1 files changed, 49 insertions(+), 7 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 0cf5e53..fc1262e 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -690,8 +690,20 @@ static void pcf50633_work(struct work_struct *work)
-                       if (pcf->onkey_seconds >=
-                           pcf->pdata->onkey_seconds_sig_init) {
-                               /* Ask init to do 'ctrlaltdel' */
--                              DEBUGPC("SIGINT(init) ");
--                              kill_proc(1, SIGINT, 1);
-+                              /*
-+                               * currently Linux reacts badly to issuing a
-+                               * signal to PID #1 before init is started.
-+                               * What happens is that the next kernel thread
-+                               * to start, which is the JFFS2 Garbage
-+                               * collector in our case, gets the signal
-+                               * instead and proceeds to fail to fork --
-+                               * which is very bad.  Therefore we confirm
-+                               * PID #1 exists before issuing the signal
-+                               */
-+                              if (find_task_by_pid(1)) {
-+                                      DEBUGPC("SIGINT(init) ");
-+                                      kill_proc(1, SIGINT, 1);
-+                              }
-                               /* FIXME: what if userspace doesn't shut down? */
-                       }
-                       if (pcf->onkey_seconds >=
-@@ -790,11 +802,41 @@ static void pcf50633_work(struct work_struct *work)
-       }
-       if (pcfirq[3] & (PCF50633_INT4_LOWBAT|PCF50633_INT4_LOWSYS)) {
--              /* Really low battery voltage, we have 8 seconds left */
--              DEBUGPC("LOWBAT ");
--              apm_queue_event(APM_LOW_BATTERY);
--              DEBUGPC("SIGPWR(init) ");
--              kill_proc(1, SIGPWR, 1);
-+              if ((__reg_read(pcf, PCF50633_REG_MBCS1) &
-+                  (PCF50633_MBCS1_USBPRES | PCF50633_MBCS1_USBOK)) ==
-+                  (PCF50633_MBCS1_USBPRES | PCF50633_MBCS1_USBOK)) {
-+                      /*
-+                       * hey no need to freak out, we have some kind of
-+                       * valid charger power
-+                       */
-+                      DEBUGPC("(NO)BAT ");
-+              } else {
-+                      /* Really low battery voltage, we have 8 seconds left */
-+                      DEBUGPC("LOWBAT ");
-+                      /*
-+                       * currently Linux reacts badly to issuing a signal to
-+                       * PID #1 before init is started.  What happens is that
-+                       * the next kernel thread to start, which is the JFFS2
-+                       * Garbage collector in our case, gets the signal
-+                       * instead and proceeds to fail to fork -- which is
-+                       * very bad.  Therefore we confirm PID #1 exists
-+                       * before issuing SPIGPWR
-+                       */
-+                      if (find_task_by_pid(1)) {
-+                              apm_queue_event(APM_LOW_BATTERY);
-+                              DEBUGPC("SIGPWR(init) ");
-+                              kill_proc(1, SIGPWR, 1);
-+                      } else
-+                              /*
-+                               * well, our situation is like this:  we do not
-+                               * have any external power, we have a low
-+                               * battery and since PID #1 doesn't exist yet,
-+                               * we are early in the boot, likely before
-+                               * rootfs mount.  We should just call it a day
-+                               */
-+                              apm_queue_event(APM_CRITICAL_SUSPEND);
-+              }
-+
-               /* Tell PMU we are taking care of this */
-               reg_set_bit_mask(pcf, PCF50633_REG_OOCSHDWN,
-                                PCF50633_OOCSHDWN_TOTRST,
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1069-gta01-dehang-printk.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1069-gta01-dehang-printk.patch.patch
deleted file mode 100644 (file)
index 35051bf..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From f76a7a9e4e1cf2224e028e78a6869d3e8375dbe3 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:58 +0100
-Subject: [PATCH] gta01-dehang-printk.patch
- This is a temporary work-around Mike Westerhof for this bug:
- http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=788
-
-See also
-http://lists.openmoko.org/pipermail/openmoko-kernel/2008-February/000804.html
-
-(It's the 2nd option.)
-
-We may settle on a different solution in the future, depending on
-feedback from upstream.
----
- drivers/serial/s3c2410.c |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
-index 6c93a1b..b566f42 100644
---- a/drivers/serial/s3c2410.c
-+++ b/drivers/serial/s3c2410.c
-@@ -1717,9 +1717,18 @@ static void
- s3c24xx_serial_console_putchar(struct uart_port *port, int ch)
- {
-       unsigned int ufcon = rd_regl(cons_uart, S3C2410_UFCON);
-+      unsigned int umcon = rd_regl(cons_uart, S3C2410_UMCON);
-+
-+      /* If auto HW flow control enabled, temporarily turn it off */
-+      if (umcon & S3C2410_UMCOM_AFC)
-+              wr_regl(port, S3C2410_UMCON, (umcon & !S3C2410_UMCOM_AFC));
-+
-       while (!s3c24xx_serial_console_txrdy(port, ufcon))
-               barrier();
-       wr_regb(cons_uart, S3C2410_UTXH, ch);
-+
-+      if (umcon & S3C2410_UMCOM_AFC)
-+              wr_regl(port, S3C2410_UMCON, umcon);
- }
- static void
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1070-kexec-atags.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1070-kexec-atags.patch.patch
deleted file mode 100644 (file)
index e3f2c2b..0000000
+++ /dev/null
@@ -1,316 +0,0 @@
-From 68bcfea9ab5d8947f711a97dcc291cb9da47c7da Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:59 +0100
-Subject: [PATCH] kexec-atags.patch
- Leapfrogged from upstream (ARM Linux)
- http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=4736/1
-
----
- arch/arm/Kconfig                  |    7 +++
- arch/arm/kernel/Makefile          |    1 +
- arch/arm/kernel/atags.c           |   86 +++++++++++++++++++++++++++++++++++++
- arch/arm/kernel/atags.h           |    5 ++
- arch/arm/kernel/machine_kexec.c   |    2 +
- arch/arm/kernel/relocate_kernel.S |   30 ++-----------
- arch/arm/kernel/setup.c           |   32 +-------------
- include/asm-arm/kexec.h           |    3 +
- 8 files changed, 110 insertions(+), 56 deletions(-)
- create mode 100644 arch/arm/kernel/atags.c
- create mode 100644 arch/arm/kernel/atags.h
-
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 23e3d6b..ef7b9ff 100644
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -865,6 +865,13 @@ config KEXEC
-         initially work for you.  It may help to enable device hotplugging
-         support.
-+config ATAGS_PROC
-+      bool "Export atags in procfs"
-+      default n
-+      help
-+        Should the atags used to boot the kernel be exported in an "atags"
-+        file in procfs. Useful with kexec.
-+
- endmenu
- if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX )
-diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
-index 593b565..5cf694c 100644
---- a/arch/arm/kernel/Makefile
-+++ b/arch/arm/kernel/Makefile
-@@ -19,6 +19,7 @@ obj-$(CONFIG_ISA_DMA)                += dma-isa.o
- obj-$(CONFIG_PCI)             += bios32.o isa.o
- obj-$(CONFIG_SMP)             += smp.o
- obj-$(CONFIG_KEXEC)           += machine_kexec.o relocate_kernel.o
-+obj-$(CONFIG_ATAGS_PROC)      += atags.o
- obj-$(CONFIG_OABI_COMPAT)     += sys_oabi-compat.o
- obj-$(CONFIG_CRUNCH)          += crunch.o crunch-bits.o
-diff --git a/arch/arm/kernel/atags.c b/arch/arm/kernel/atags.c
-new file mode 100644
-index 0000000..e2e934c
---- /dev/null
-+++ b/arch/arm/kernel/atags.c
-@@ -0,0 +1,86 @@
-+#include <linux/slab.h>
-+#include <linux/kexec.h>
-+#include <linux/proc_fs.h>
-+#include <asm/setup.h>
-+#include <asm/types.h>
-+#include <asm/page.h>
-+
-+struct buffer {
-+      size_t size;
-+      char *data;
-+};
-+static struct buffer tags_buffer;
-+
-+static int
-+read_buffer(char* page, char** start, off_t off, int count,
-+      int* eof, void* data)
-+{
-+      struct buffer *buffer = (struct buffer *)data;
-+
-+      if (off >= buffer->size) {
-+              *eof = 1;
-+              return 0;
-+      }
-+
-+      count = min((int) (buffer->size - off), count);
-+
-+      memcpy(page, &buffer->data[off], count);
-+
-+      return count;
-+}
-+
-+
-+static int
-+create_proc_entries(void)
-+{
-+      struct proc_dir_entry* tags_entry;
-+
-+      tags_entry = create_proc_read_entry("atags", 0400, &proc_root, read_buffer, &tags_buffer);
-+      if (!tags_entry)
-+              return -ENOMEM;
-+
-+      return 0;
-+}
-+
-+
-+static char __initdata atags_copy_buf[KEXEC_BOOT_PARAMS_SIZE];
-+static char __initdata *atags_copy;
-+
-+void __init save_atags(const struct tag *tags)
-+{
-+      atags_copy = atags_copy_buf;
-+      memcpy(atags_copy, tags, KEXEC_BOOT_PARAMS_SIZE);
-+}
-+
-+
-+static int __init init_atags_procfs(void)
-+{
-+      struct tag *tag;
-+      int error;
-+
-+      if (!atags_copy) {
-+              printk(KERN_WARNING "Exporting ATAGs: No saved tags found\n");
-+              return -EIO;
-+      }
-+
-+      for (tag = (struct tag *) atags_copy; tag->hdr.size; tag = tag_next(tag))
-+              ;
-+
-+      tags_buffer.size = ((char *) tag - atags_copy) + sizeof(tag->hdr);
-+      tags_buffer.data = kmalloc(tags_buffer.size, GFP_KERNEL);
-+      if (tags_buffer.data == NULL)
-+              return -ENOMEM;
-+      memcpy(tags_buffer.data, atags_copy, tags_buffer.size);
-+
-+      error = create_proc_entries();
-+      if (error) {
-+              printk(KERN_ERR "Exporting ATAGs: not enough memory\n");
-+              kfree(tags_buffer.data);
-+              tags_buffer.size = 0;
-+              tags_buffer.data = NULL;
-+      }
-+
-+      return error;
-+}
-+
-+arch_initcall(init_atags_procfs);
-diff --git a/arch/arm/kernel/atags.h b/arch/arm/kernel/atags.h
-new file mode 100644
-index 0000000..e5f028d
---- /dev/null
-+++ b/arch/arm/kernel/atags.h
-@@ -0,0 +1,5 @@
-+#ifdef CONFIG_ATAGS_PROC
-+extern void save_atags(struct tag *tags);
-+#else
-+static inline void save_atags(struct tag *tags) { }
-+#endif
-diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c
-index 863c664..db8f54a 100644
---- a/arch/arm/kernel/machine_kexec.c
-+++ b/arch/arm/kernel/machine_kexec.c
-@@ -21,6 +21,7 @@ extern void setup_mm_for_reboot(char mode);
- extern unsigned long kexec_start_address;
- extern unsigned long kexec_indirection_page;
- extern unsigned long kexec_mach_type;
-+extern unsigned long kexec_boot_atags;
- /*
-  * Provide a dummy crash_notes definition while crash dump arrives to arm.
-@@ -62,6 +63,7 @@ void machine_kexec(struct kimage *image)
-       kexec_start_address = image->start;
-       kexec_indirection_page = page_list;
-       kexec_mach_type = machine_arch_type;
-+      kexec_boot_atags = image->start - KEXEC_ARM_ZIMAGE_OFFSET + KEXEC_ARM_ATAGS_OFFSET;
-       /* copy our kernel relocation code to the control code page */
-       memcpy(reboot_code_buffer,
-diff --git a/arch/arm/kernel/relocate_kernel.S b/arch/arm/kernel/relocate_kernel.S
-index 062c111..61930eb 100644
---- a/arch/arm/kernel/relocate_kernel.S
-+++ b/arch/arm/kernel/relocate_kernel.S
-@@ -7,23 +7,6 @@
-       .globl relocate_new_kernel
- relocate_new_kernel:
--      /* Move boot params back to where the kernel expects them */
--
--      ldr     r0,kexec_boot_params_address
--      teq     r0,#0
--      beq     8f
--
--      ldr     r1,kexec_boot_params_copy
--      mov     r6,#KEXEC_BOOT_PARAMS_SIZE/4
--7:
--      ldr     r5,[r1],#4
--      str     r5,[r0],#4
--      subs    r6,r6,#1
--      bne     7b
--
--8:
--      /* Boot params moved, now go on with the kernel */
--
-       ldr     r0,kexec_indirection_page
-       ldr     r1,kexec_start_address
-@@ -67,7 +50,7 @@ relocate_new_kernel:
-       mov lr,r1
-       mov r0,#0
-       ldr r1,kexec_mach_type
--      ldr r2,kexec_boot_params_address
-+      ldr r2,kexec_boot_atags
-       mov pc,lr
-       .globl kexec_start_address
-@@ -82,14 +65,9 @@ kexec_indirection_page:
- kexec_mach_type:
-       .long   0x0
--      /* phy addr where new kernel will expect to find boot params */
--      .globl kexec_boot_params_address
--kexec_boot_params_address:
--      .long   0x0
--
--      /* phy addr where old kernel put a copy of orig boot params */
--      .globl kexec_boot_params_copy
--kexec_boot_params_copy:
-+      /* phy addr of the atags for the new kernel */
-+      .globl kexec_boot_atags
-+kexec_boot_atags:
-       .long   0x0
- relocate_new_kernel_end:
-diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
-index bf56eb3..ae3712d 100644
---- a/arch/arm/kernel/setup.c
-+++ b/arch/arm/kernel/setup.c
-@@ -24,7 +24,6 @@
- #include <linux/interrupt.h>
- #include <linux/smp.h>
- #include <linux/fs.h>
--#include <linux/kexec.h>
- #include <asm/cpu.h>
- #include <asm/elf.h>
-@@ -39,6 +38,7 @@
- #include <asm/mach/time.h>
- #include "compat.h"
-+#include "atags.h"
- #ifndef MEM_SIZE
- #define MEM_SIZE      (16*1024*1024)
-@@ -784,23 +784,6 @@ static int __init customize_machine(void)
- }
- arch_initcall(customize_machine);
--#ifdef CONFIG_KEXEC
--
--/* Physical addr of where the boot params should be for this machine */
--extern unsigned long kexec_boot_params_address;
--
--/* Physical addr of the buffer into which the boot params are copied */
--extern unsigned long kexec_boot_params_copy;
--
--/* Pointer to the boot params buffer, for manipulation and display */
--unsigned long kexec_boot_params;
--EXPORT_SYMBOL(kexec_boot_params);
--
--/* The buffer itself - make sure it is sized correctly */
--static unsigned long kexec_boot_params_buf[(KEXEC_BOOT_PARAMS_SIZE + 3) / 4];
--
--#endif
--
- void __init setup_arch(char **cmdline_p)
- {
-       struct tag *tags = (struct tag *)&init_tags;
-@@ -819,18 +802,6 @@ void __init setup_arch(char **cmdline_p)
-       else if (mdesc->boot_params)
-               tags = phys_to_virt(mdesc->boot_params);
--#ifdef CONFIG_KEXEC
--      kexec_boot_params_copy = virt_to_phys(kexec_boot_params_buf);
--      kexec_boot_params = (unsigned long)kexec_boot_params_buf;
--      if (__atags_pointer) {
--              kexec_boot_params_address = __atags_pointer;
--              memcpy((void *)kexec_boot_params, tags, KEXEC_BOOT_PARAMS_SIZE);
--      } else if (mdesc->boot_params) {
--              kexec_boot_params_address = mdesc->boot_params;
--              memcpy((void *)kexec_boot_params, tags, KEXEC_BOOT_PARAMS_SIZE);
--      }
--#endif
--
-       /*
-        * If we have the old style parameters, convert them to
-        * a tag list.
-@@ -846,6 +817,7 @@ void __init setup_arch(char **cmdline_p)
-       if (tags->hdr.tag == ATAG_CORE) {
-               if (meminfo.nr_banks != 0)
-                       squash_mem_tags(tags);
-+              save_atags(tags);
-               parse_tags(tags);
-       }
-diff --git a/include/asm-arm/kexec.h b/include/asm-arm/kexec.h
-index 46dcc4d..1ee17b6 100644
---- a/include/asm-arm/kexec.h
-+++ b/include/asm-arm/kexec.h
-@@ -16,6 +16,9 @@
- #define KEXEC_BOOT_PARAMS_SIZE 1536
-+#define KEXEC_ARM_ATAGS_OFFSET  0x1000
-+#define KEXEC_ARM_ZIMAGE_OFFSET 0x8000
-+
- #ifndef __ASSEMBLY__
- struct kimage;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1071-suspend-prelim1.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1071-suspend-prelim1.patch.patch
deleted file mode 100644 (file)
index cfafc42..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-From a3ce0f5da32538cdf96c1dc1d6dc8b7452b096d2 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:59 +0100
-Subject: [PATCH] suspend-prelim1.patch
-
----
- drivers/i2c/chips/pcf50633.c   |    5 +++++
- drivers/i2c/i2c-core.c         |   13 ++++++++++++-
- drivers/mfd/glamo/glamo-core.c |    2 ++
- 3 files changed, 19 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index fc1262e..e23c540 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1901,6 +1901,9 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-               }
-       }
-+      /* turn off the backlight */
-+      __reg_write(pcf, PCF50633_REG_LEDENA, 0x00);
-+
-       pcf->standby_regs.int1m = __reg_read(pcf, PCF50633_REG_INT1M);
-       pcf->standby_regs.int2m = __reg_read(pcf, PCF50633_REG_INT2M);
-       pcf->standby_regs.int3m = __reg_read(pcf, PCF50633_REG_INT3M);
-@@ -1925,6 +1928,8 @@ static int pcf50633_resume(struct device *dev)
-       mutex_lock(&pcf->lock);
-+      __reg_write(pcf, PCF50633_REG_LEDENA, 0x01);
-+
-       /* Resume all saved registers that don't "survive" standby state */
-       __reg_write(pcf, PCF50633_REG_INT1M, pcf->standby_regs.int1m);
-       __reg_write(pcf, PCF50633_REG_INT2M, pcf->standby_regs.int2m);
-diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
-index 2c802de..405c957 100644
---- a/drivers/i2c/i2c-core.c
-+++ b/drivers/i2c/i2c-core.c
-@@ -1,4 +1,3 @@
--/* i2c-core.c - a device driver for the iic-bus interface                  */
- /* ------------------------------------------------------------------------- */
- /*   Copyright (C) 1995-99 Simon G. Vogl
-@@ -136,10 +135,16 @@ static int i2c_device_suspend(struct device * dev, pm_message_t mesg)
-       if (!dev->driver)
-               return 0;
-+#if 0
-       driver = to_i2c_driver(dev->driver);
-       if (!driver->suspend)
-               return 0;
-       return driver->suspend(to_i2c_client(dev), mesg);
-+#else
-+      if (!dev->driver->suspend)
-+              return 0;
-+      return dev->driver->suspend(dev, mesg);
-+#endif
- }
- static int i2c_device_resume(struct device * dev)
-@@ -148,10 +153,16 @@ static int i2c_device_resume(struct device * dev)
-       if (!dev->driver)
-               return 0;
-+#if 0
-       driver = to_i2c_driver(dev->driver);
-       if (!driver->resume)
-               return 0;
-       return driver->resume(to_i2c_client(dev));
-+#else
-+      if (!dev->driver->resume)
-+              return 0;
-+      return dev->driver->resume(dev);
-+#endif
- }
- static void i2c_client_release(struct device *dev)
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index 8497de2..ffa4945 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -1125,11 +1125,13 @@ static int glamo_remove(struct platform_device *pdev)
- #ifdef CONFIG_PM
- static int glamo_suspend(struct platform_device *pdev, pm_message_t state)
- {
-+      glamo_power(glamo_handle, GLAMO_POWER_SUSPEND);
-       return 0;
- }
- static int glamo_resume(struct platform_device *pdev)
- {
-+      glamo_power(glamo_handle, GLAMO_POWER_ON);
-       return 0;
- }
- #else
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1072-gta02-sound-bandaid.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1072-gta02-sound-bandaid.patch.patch
deleted file mode 100644 (file)
index 0524d13..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From 627dc473972450148330e4c4c3c2dd43798c1c26 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:59 +0100
-Subject: [PATCH] gta02-sound-bandaid.patch
- http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=1172
-
-This patch seems to alleviate the symptoms but doesn't cure them.
-Keep it to keep development going, until we have a proper solution.
----
- sound/soc/codecs/wm8753.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
-index 3df5b44..e9ad1aa 100644
---- a/sound/soc/codecs/wm8753.c
-+++ b/sound/soc/codecs/wm8753.c
-@@ -1585,6 +1585,9 @@ static int wm8753_init(struct snd_soc_device *socdev)
-       schedule_delayed_work(&codec->delayed_work,
-               msecs_to_jiffies(caps_charge));
-+      /* Fix reg WM8753_ADCTL2 */
-+      wm8753_write(codec, WM8753_ADCTL2, 0x0000);
-+
-       /* set the update bits */
-       reg = wm8753_read_reg_cache(codec, WM8753_LDAC);
-       wm8753_write(codec, WM8753_LDAC, reg | 0x0100);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1073-glamo-cmdqueue-bandaid.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1073-glamo-cmdqueue-bandaid.patch.patch
deleted file mode 100644 (file)
index ff11714..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-From ce8eaeee7875e668be4c2888fa05a61a5af0dd98 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Sun, 13 Apr 2008 07:23:59 +0100
-Subject: [PATCH] glamo-cmdqueue-bandaid.patch
- [ Stop kernel from hanging every once in a while during Glamo
-   initialization. ]
-
-debug-glamo-fb-cmdqueue-wait-timeout.patch
-
-From: warmcat <andy@warmcat.com>
----
- drivers/mfd/glamo/glamo-fb.c |   30 +++++++++++++++++++++++++++---
- 1 files changed, 27 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c
-index 394a0ad..f0d7600 100644
---- a/drivers/mfd/glamo/glamo-fb.c
-+++ b/drivers/mfd/glamo/glamo-fb.c
-@@ -553,12 +553,20 @@ static inline int glamofb_cmdq_empty(struct glamofb_handle *gfb)
- void glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
- {
-+      int timeout = 2000;
-+
-       dev_dbg(gfb->dev, "glamofb_cmd_mode(gfb=%p, on=%d)\n", gfb, on);
-       if (on) {
-               dev_dbg(gfb->dev, "%s: waiting for cmdq empty: ",
-                       __FUNCTION__);
--              while (!glamofb_cmdq_empty(gfb))
-+              while ((!glamofb_cmdq_empty(gfb)) && (timeout--))
-                       yield();
-+              if (timeout < 0) {
-+                      printk(KERN_ERR"*************"
-+                                     "glamofb cmd_queue never got empty"
-+                                     "*************\n");
-+                      return;
-+              }
-               dev_dbg(gfb->dev, "empty!\n");
-               /* display the entire frame then switch to command */
-@@ -568,8 +576,16 @@ void glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
-               /* wait until LCD is idle */
-               dev_dbg(gfb->dev, "waiting for LCD idle: ");
--              while (!reg_read(gfb, GLAMO_REG_LCD_STATUS2) & (1 << 12))
-+              timeout = 2000;
-+              while ((!reg_read(gfb, GLAMO_REG_LCD_STATUS2) & (1 << 12)) &&
-+                    (timeout--))
-                       yield();
-+              if (timeout < 0) {
-+                      printk(KERN_ERR"*************"
-+                                     "glamofb lcd never idle"
-+                                     "*************\n");
-+                      return;
-+              }
-               dev_dbg(gfb->dev, "idle!\n");
-               msleep(90);
-@@ -589,10 +605,18 @@ EXPORT_SYMBOL_GPL(glamofb_cmd_mode);
- int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val)
- {
-+      int timeout = 2000;
-+
-       dev_dbg(gfb->dev, "%s: waiting for cmdq empty\n",
-               __FUNCTION__);
--      while (!glamofb_cmdq_empty(gfb))
-+      while ((!glamofb_cmdq_empty(gfb)) && (timeout--))
-               yield();
-+      if (timeout < 0) {
-+              printk(KERN_ERR"*************"
-+                              "glamofb cmd_queue never got empty"
-+                              "*************\n");
-+              return 1;
-+      }
-       dev_dbg(gfb->dev, "idle, writing 0x%04x\n", val);
-       reg_write(gfb, GLAMO_REG_LCD_COMMAND1, val);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1074-local-add-defconfig.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1074-local-add-defconfig.patch.patch
deleted file mode 100644 (file)
index f28c4b9..0000000
+++ /dev/null
@@ -1,1849 +0,0 @@
-From b58c89ed206269de1116a7b3f98f07bad902a566 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Sun, 13 Apr 2008 07:25:44 +0100
-Subject: [PATCH] local-add-defconfig.patch
-
-Adds svn defconfig
-
-From: warmcat <andy@warmcat.com>
----
- defconfig-2.6.22.5 | 1827 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 1827 insertions(+), 0 deletions(-)
- create mode 100644 defconfig-2.6.22.5
-
-diff --git a/defconfig-2.6.22.5 b/defconfig-2.6.22.5
-new file mode 100644
-index 0000000..e9e40fe
---- /dev/null
-+++ b/defconfig-2.6.22.5
-@@ -0,0 +1,1827 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.22.5
-+# Tue Nov 27 09:09:32 2007
-+#
-+CONFIG_ARM=y
-+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-+CONFIG_GENERIC_GPIO=y
-+# CONFIG_GENERIC_TIME is not set
-+# CONFIG_GENERIC_CLOCKEVENTS is not set
-+CONFIG_MMU=y
-+CONFIG_NO_IOPORT=y
-+CONFIG_GENERIC_HARDIRQS=y
-+CONFIG_STACKTRACE_SUPPORT=y
-+CONFIG_LOCKDEP_SUPPORT=y
-+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-+CONFIG_HARDIRQS_SW_RESEND=y
-+CONFIG_GENERIC_IRQ_PROBE=y
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_ZONE_DMA=y
-+CONFIG_VECTORS_BASE=0xffff0000
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# Code maturity level options
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_LOCK_KERNEL=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+
-+#
-+# General setup
-+#
-+CONFIG_LOCALVERSION="-moko11"
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+# CONFIG_IPC_NS is not set
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_UTS_NS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_SYSFS_DEPRECATED is not set
-+# CONFIG_RELAY is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+CONFIG_SYSCTL=y
-+# CONFIG_EMBEDDED is not set
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+
-+#
-+# Loadable module support
-+#
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+
-+#
-+# Block layer
-+#
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=m
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=m
-+# CONFIG_DEFAULT_AS is not set
-+CONFIG_DEFAULT_DEADLINE=y
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="deadline"
-+
-+#
-+# System Type
-+#
-+# CONFIG_ARCH_AAEC2000 is not set
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_REALVIEW is not set
-+# CONFIG_ARCH_VERSATILE is not set
-+# CONFIG_ARCH_AT91 is not set
-+# CONFIG_ARCH_CLPS7500 is not set
-+# CONFIG_ARCH_CLPS711X is not set
-+# CONFIG_ARCH_CO285 is not set
-+# CONFIG_ARCH_EBSA110 is not set
-+# CONFIG_ARCH_EP93XX is not set
-+# CONFIG_ARCH_FOOTBRIDGE is not set
-+# CONFIG_ARCH_NETX is not set
-+# CONFIG_ARCH_H720X is not set
-+# CONFIG_ARCH_IMX is not set
-+# CONFIG_ARCH_IOP13XX is not set
-+# CONFIG_ARCH_IOP32X is not set
-+# CONFIG_ARCH_IOP33X is not set
-+# CONFIG_ARCH_IXP23XX is not set
-+# CONFIG_ARCH_IXP2000 is not set
-+# CONFIG_ARCH_IXP4XX is not set
-+# CONFIG_ARCH_L7200 is not set
-+# CONFIG_ARCH_KS8695 is not set
-+# CONFIG_ARCH_NS9XXX is not set
-+# CONFIG_ARCH_PNX4008 is not set
-+# CONFIG_ARCH_PXA is not set
-+# CONFIG_ARCH_RPC is not set
-+# CONFIG_ARCH_SA1100 is not set
-+CONFIG_ARCH_S3C2410=y
-+# CONFIG_ARCH_SHARK is not set
-+# CONFIG_ARCH_LH7A40X is not set
-+# CONFIG_ARCH_DAVINCI is not set
-+# CONFIG_ARCH_OMAP is not set
-+CONFIG_PLAT_S3C24XX=y
-+CONFIG_CPU_S3C244X=y
-+# CONFIG_S3C2410_BOOT_WATCHDOG is not set
-+CONFIG_S3C2410_BOOT_ERROR_RESET=y
-+CONFIG_S3C2410_PM_DEBUG=y
-+# CONFIG_S3C2410_PM_CHECK is not set
-+CONFIG_S3C2410_LOWLEVEL_UART_PORT=0
-+CONFIG_S3C2410_DMA=y
-+# CONFIG_S3C2410_DMA_DEBUG is not set
-+CONFIG_MACH_SMDK=y
-+
-+#
-+# S3C2400 Machines
-+#
-+CONFIG_CPU_S3C2410=y
-+CONFIG_CPU_S3C2410_DMA=y
-+CONFIG_S3C2410_PM=y
-+CONFIG_S3C2410_GPIO=y
-+CONFIG_S3C2410_CLOCK=y
-+CONFIG_S3C2410_PWM=y
-+
-+#
-+# S3C2410 Machines
-+#
-+# CONFIG_ARCH_SMDK2410 is not set
-+# CONFIG_ARCH_H1940 is not set
-+# CONFIG_MACH_N30 is not set
-+# CONFIG_ARCH_BAST is not set
-+# CONFIG_MACH_OTOM is not set
-+# CONFIG_MACH_AML_M5900 is not set
-+# CONFIG_MACH_VR1000 is not set
-+CONFIG_MACH_QT2410=y
-+CONFIG_MACH_NEO1973_GTA01=y
-+
-+#
-+# S3C2412 Machines
-+#
-+# CONFIG_MACH_SMDK2413 is not set
-+# CONFIG_MACH_SMDK2412 is not set
-+# CONFIG_MACH_VSTMS is not set
-+CONFIG_CPU_S3C2440=y
-+CONFIG_S3C2440_DMA=y
-+
-+#
-+# S3C2440 Machines
-+#
-+# CONFIG_MACH_ANUBIS is not set
-+# CONFIG_MACH_OSIRIS is not set
-+# CONFIG_MACH_RX3715 is not set
-+CONFIG_ARCH_S3C2440=y
-+# CONFIG_MACH_NEXCODER_2440 is not set
-+CONFIG_SMDK2440_CPU2440=y
-+CONFIG_MACH_HXD8=y
-+CONFIG_MACH_NEO1973_GTA02=y
-+CONFIG_CPU_S3C2442=y
-+
-+#
-+# S3C2442 Machines
-+#
-+CONFIG_SMDK2440_CPU2442=y
-+
-+#
-+# S3C2443 Machines
-+#
-+# CONFIG_MACH_SMDK2443 is not set
-+
-+#
-+# Processor Type
-+#
-+CONFIG_CPU_32=y
-+CONFIG_CPU_ARM920T=y
-+CONFIG_CPU_32v4T=y
-+CONFIG_CPU_ABRT_EV4T=y
-+CONFIG_CPU_CACHE_V4WT=y
-+CONFIG_CPU_CACHE_VIVT=y
-+CONFIG_CPU_COPY_V4WB=y
-+CONFIG_CPU_TLB_V4WBI=y
-+CONFIG_CPU_CP15=y
-+CONFIG_CPU_CP15_MMU=y
-+
-+#
-+# Processor Features
-+#
-+CONFIG_ARM_THUMB=y
-+# CONFIG_CPU_ICACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-+# CONFIG_OUTER_CACHE is not set
-+
-+#
-+# Bus support
-+#
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+
-+#
-+# PCCARD (PCMCIA/CardBus) support
-+#
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Kernel Features
-+#
-+# CONFIG_TICK_ONESHOT is not set
-+CONFIG_PREEMPT=y
-+CONFIG_NO_IDLE_HZ=y
-+CONFIG_HZ=200
-+CONFIG_AEABI=y
-+CONFIG_OABI_COMPAT=y
-+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4096
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_ALIGNMENT_TRAP=y
-+
-+#
-+# Boot options
-+#
-+CONFIG_ZBOOT_ROM_TEXT=0x0
-+CONFIG_ZBOOT_ROM_BSS=0x0
-+CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
-+# CONFIG_XIP_KERNEL is not set
-+CONFIG_KEXEC=y
-+
-+#
-+# Floating point emulation
-+#
-+
-+#
-+# At least one emulation must be selected
-+#
-+CONFIG_FPE_NWFPE=y
-+# CONFIG_FPE_NWFPE_XP is not set
-+# CONFIG_FPE_FASTFPE is not set
-+
-+#
-+# Userspace binary formats
-+#
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+
-+#
-+# Power management options
-+#
-+CONFIG_PM=y
-+CONFIG_PM_LEGACY=y
-+CONFIG_PM_DEBUG=y
-+CONFIG_DISABLE_CONSOLE_SUSPEND=y
-+# CONFIG_PM_SYSFS_DEPRECATED is not set
-+CONFIG_APM_EMULATION=y
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=m
-+CONFIG_PACKET_MMAP=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+CONFIG_XFRM_MIGRATE=y
-+CONFIG_NET_KEY=m
-+CONFIG_NET_KEY_MIGRATE=y
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+# CONFIG_IP_ROUTE_MULTIPATH is not set
-+# CONFIG_IP_ROUTE_VERBOSE 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=m
-+CONFIG_NET_IPGRE=m
-+# CONFIG_NET_IPGRE_BROADCAST is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_XFRM_TUNNEL=m
-+CONFIG_INET_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET_XFRM_MODE_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_BEET=m
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+CONFIG_TCP_MD5SIG=y
-+# CONFIG_IP_VS is not set
-+CONFIG_IPV6=m
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_IPCOMP=m
-+# CONFIG_IPV6_MIP6 is not set
-+CONFIG_INET6_XFRM_TUNNEL=m
-+CONFIG_INET6_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET6_XFRM_MODE_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_BEET=m
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_TUNNEL=m
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+CONFIG_NETFILTER=y
-+# CONFIG_NETFILTER_DEBUG is not set
-+CONFIG_BRIDGE_NETFILTER=y
-+
-+#
-+# Core Netfilter Configuration
-+#
-+CONFIG_NETFILTER_NETLINK=m
-+CONFIG_NETFILTER_NETLINK_QUEUE=m
-+CONFIG_NETFILTER_NETLINK_LOG=m
-+CONFIG_NF_CONNTRACK_ENABLED=m
-+CONFIG_NF_CONNTRACK=m
-+CONFIG_NF_CT_ACCT=y
-+CONFIG_NF_CONNTRACK_MARK=y
-+CONFIG_NF_CONNTRACK_EVENTS=y
-+CONFIG_NF_CT_PROTO_GRE=m
-+CONFIG_NF_CT_PROTO_SCTP=m
-+# CONFIG_NF_CONNTRACK_AMANDA is not set
-+CONFIG_NF_CONNTRACK_FTP=m
-+CONFIG_NF_CONNTRACK_H323=m
-+CONFIG_NF_CONNTRACK_IRC=m
-+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-+CONFIG_NF_CONNTRACK_PPTP=m
-+CONFIG_NF_CONNTRACK_SANE=m
-+CONFIG_NF_CONNTRACK_SIP=m
-+CONFIG_NF_CONNTRACK_TFTP=m
-+CONFIG_NF_CT_NETLINK=m
-+CONFIG_NETFILTER_XTABLES=m
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-+CONFIG_NETFILTER_XT_TARGET_DSCP=m
-+CONFIG_NETFILTER_XT_TARGET_MARK=m
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+CONFIG_NETFILTER_XT_MATCH_DCCP=m
-+CONFIG_NETFILTER_XT_MATCH_DSCP=m
-+CONFIG_NETFILTER_XT_MATCH_ESP=m
-+CONFIG_NETFILTER_XT_MATCH_HELPER=m
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_MAC=m
-+CONFIG_NETFILTER_XT_MATCH_MARK=m
-+CONFIG_NETFILTER_XT_MATCH_POLICY=m
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-+CONFIG_NETFILTER_XT_MATCH_REALM=m
-+CONFIG_NETFILTER_XT_MATCH_SCTP=m
-+CONFIG_NETFILTER_XT_MATCH_STATE=m
-+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-+CONFIG_NETFILTER_XT_MATCH_STRING=m
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-+
-+#
-+# IP: Netfilter Configuration
-+#
-+CONFIG_NF_CONNTRACK_IPV4=m
-+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-+# CONFIG_IP_NF_QUEUE is not set
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_MATCH_IPRANGE=m
-+CONFIG_IP_NF_MATCH_TOS=m
-+# CONFIG_IP_NF_MATCH_RECENT is not set
-+CONFIG_IP_NF_MATCH_ECN=m
-+CONFIG_IP_NF_MATCH_AH=m
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_MATCH_OWNER=m
-+CONFIG_IP_NF_MATCH_ADDRTYPE=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_TARGET_LOG=m
-+CONFIG_IP_NF_TARGET_ULOG=m
-+CONFIG_NF_NAT=m
-+CONFIG_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_NF_NAT_SNMP_BASIC=m
-+CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_FTP=m
-+CONFIG_NF_NAT_IRC=m
-+CONFIG_NF_NAT_TFTP=m
-+# CONFIG_NF_NAT_AMANDA is not set
-+CONFIG_NF_NAT_PPTP=m
-+CONFIG_NF_NAT_H323=m
-+CONFIG_NF_NAT_SIP=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_IP_NF_TARGET_TOS=m
-+CONFIG_IP_NF_TARGET_ECN=m
-+CONFIG_IP_NF_TARGET_TTL=m
-+CONFIG_IP_NF_TARGET_CLUSTERIP=m
-+# CONFIG_IP_NF_RAW is not set
-+# CONFIG_IP_NF_ARPTABLES is not set
-+
-+#
-+# IPv6: Netfilter Configuration (EXPERIMENTAL)
-+#
-+CONFIG_NF_CONNTRACK_IPV6=m
-+# CONFIG_IP6_NF_QUEUE is not set
-+CONFIG_IP6_NF_IPTABLES=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_OWNER=m
-+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-+CONFIG_IP6_NF_MATCH_AH=m
-+CONFIG_IP6_NF_MATCH_MH=m
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_LOG=m
-+CONFIG_IP6_NF_TARGET_REJECT=m
-+CONFIG_IP6_NF_MANGLE=m
-+CONFIG_IP6_NF_TARGET_HL=m
-+# CONFIG_IP6_NF_RAW is not set
-+
-+#
-+# 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_BRIDGE_EBT_ULOG=m
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+CONFIG_BRIDGE=y
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+CONFIG_LLC=y
-+# 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+
-+#
-+# QoS and/or fair queueing
-+#
-+CONFIG_NET_SCHED=y
-+CONFIG_NET_SCH_FIFO=y
-+
-+#
-+# Queueing/Scheduling
-+#
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=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_NETEM=m
-+CONFIG_NET_SCH_INGRESS=m
-+
-+#
-+# Classification
-+#
-+CONFIG_NET_CLS=y
-+CONFIG_NET_CLS_BASIC=m
-+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_CLS_U32_PERF=y
-+CONFIG_CLS_U32_MARK=y
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
-+# CONFIG_NET_EMATCH is not set
-+# CONFIG_NET_CLS_ACT is not set
-+# CONFIG_NET_CLS_POLICE is not set
-+# CONFIG_NET_CLS_IND is not set
-+CONFIG_NET_ESTIMATOR=y
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_IRDA 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_HIDP=m
-+
-+#
-+# Bluetooth device drivers
-+#
-+CONFIG_BT_HCIUSB=m
-+CONFIG_BT_HCIUSB_SCO=y
-+# CONFIG_BT_HCIUART is not set
-+# CONFIG_BT_HCIBCM203X is not set
-+# CONFIG_BT_HCIBPA10X is not set
-+# CONFIG_BT_HCIBFUSB is not set
-+# CONFIG_BT_HCIVHCI is not set
-+# CONFIG_AF_RXRPC is not set
-+CONFIG_FIB_RULES=y
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=m
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+
-+#
-+# Connector - unified userspace <-> kernelspace linker
-+#
-+CONFIG_CONNECTOR=m
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_AFS_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+# CONFIG_MTD_CFI is not set
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+CONFIG_MTD_NAND=y
-+CONFIG_MTD_NAND_VERIFY_WRITE=y
-+# CONFIG_MTD_NAND_ECC_SMC is not set
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+CONFIG_MTD_NAND_IDS=y
-+CONFIG_MTD_NAND_S3C2410=y
-+CONFIG_MTD_NAND_S3C2410_BBT=y
-+# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
-+CONFIG_MTD_NAND_S3C2410_HWECC=y
-+# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+
-+#
-+# Parallel port support
-+#
-+# CONFIG_PARPORT is not set
-+
-+#
-+# Plug and Play support
-+#
-+# CONFIG_PNPACPI is not set
-+
-+#
-+# Block devices
-+#
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=m
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_UB=m
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=4096
-+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=m
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=m
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+CONFIG_BLK_DEV_SR=m
-+# CONFIG_BLK_DEV_SR_VENDOR is not set
-+CONFIG_CHR_DEV_SG=m
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+CONFIG_SCSI_SCAN_ASYNC=y
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+
-+#
-+# SCSI low-level drivers
-+#
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_ATA is not set
-+
-+#
-+# Multi-device support (RAID and LVM)
-+#
-+CONFIG_MD=y
-+# CONFIG_BLK_DEV_MD is not set
-+CONFIG_BLK_DEV_DM=m
-+# CONFIG_DM_DEBUG is not set
-+CONFIG_DM_CRYPT=m
-+CONFIG_DM_SNAPSHOT=m
-+# CONFIG_DM_MIRROR is not set
-+# CONFIG_DM_ZERO is not set
-+# CONFIG_DM_MULTIPATH is not set
-+# CONFIG_DM_DELAY is not set
-+
-+#
-+# Network device support
-+#
-+CONFIG_NETDEVICES=y
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_EQUALIZER is not set
-+CONFIG_TUN=m
-+# CONFIG_PHYLIB is not set
-+
-+#
-+# Ethernet (10 or 100Mbit)
-+#
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=m
-+# CONFIG_SMC91X is not set
-+# CONFIG_DM9000 is not set
-+CONFIG_NET_PCI=y
-+CONFIG_CS89x0=m
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+CONFIG_USB_CATC=m
-+CONFIG_USB_KAWETH=m
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+CONFIG_USB_USBNET_MII=m
-+CONFIG_USB_USBNET=m
-+CONFIG_USB_NET_AX8817X=m
-+CONFIG_USB_NET_CDCETHER=m
-+CONFIG_USB_NET_DM9601=m
-+CONFIG_USB_NET_GL620A=m
-+CONFIG_USB_NET_NET1080=m
-+CONFIG_USB_NET_PLUSB=m
-+CONFIG_USB_NET_MCS7830=m
-+CONFIG_USB_NET_RNDIS_HOST=m
-+CONFIG_USB_NET_CDC_SUBSET=m
-+CONFIG_USB_ALI_M5632=y
-+CONFIG_USB_AN2720=y
-+CONFIG_USB_BELKIN=y
-+CONFIG_USB_ARMLINUX=y
-+CONFIG_USB_EPSON2888=y
-+CONFIG_USB_KC2190=y
-+CONFIG_USB_NET_ZAURUS=m
-+# CONFIG_WAN is not set
-+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=m
-+CONFIG_PPP_MPPE=m
-+# CONFIG_PPPOE is not set
-+# CONFIG_SLIP is not set
-+CONFIG_SLHC=m
-+# CONFIG_SHAPER is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+
-+#
-+# ISDN subsystem
-+#
-+# CONFIG_ISDN is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_TSDEV is not set
-+CONFIG_INPUT_EVDEV=y
-+CONFIG_INPUT_EVBUG=m
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+# CONFIG_KEYBOARD_ATKBD is not set
-+# 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_KEYBOARD_STOWAWAY=m
-+CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_GTA01=y
-+CONFIG_KEYBOARD_QT2410=y
-+CONFIG_INPUT_MOUSE=y
-+# CONFIG_MOUSE_PS2 is not set
-+# CONFIG_MOUSE_SERIAL is not set
-+# CONFIG_MOUSE_APPLETOUCH is not set
-+# CONFIG_MOUSE_VSXXXAA is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+CONFIG_INPUT_TOUCHSCREEN=y
-+# CONFIG_TOUCHSCREEN_ADS7846 is not set
-+CONFIG_TOUCHSCREEN_S3C2410=y
-+# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
-+# CONFIG_TOUCHSCREEN_GUNZE is not set
-+# CONFIG_TOUCHSCREEN_ELO is not set
-+# CONFIG_TOUCHSCREEN_MTOUCH is not set
-+# CONFIG_TOUCHSCREEN_MK712 is not set
-+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-+# CONFIG_TOUCHSCREEN_UCB1400 is not set
-+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-+CONFIG_INPUT_MISC=y
-+# CONFIG_INPUT_ATI_REMOTE is not set
-+# CONFIG_INPUT_ATI_REMOTE2 is not set
-+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-+# CONFIG_INPUT_POWERMATE is not set
-+# CONFIG_INPUT_YEALINK is not set
-+CONFIG_INPUT_UINPUT=m
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+# CONFIG_SERIO_SERPORT is not set
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_NR_TTY_DEVICES=4
-+CONFIG_HW_CONSOLE=y
-+CONFIG_VT_HW_CONSOLE_BINDING=y
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_SERIAL_S3C2410=y
-+CONFIG_SERIAL_S3C2410_CONSOLE=y
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_LEGACY_PTYS is not set
-+
-+#
-+# IPMI
-+#
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_S3C2410_WATCHDOG=m
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+
-+#
-+# TPM devices
-+#
-+# CONFIG_TCG_TPM is not set
-+# CONFIG_TS0710_MUX is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_GPIO is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+CONFIG_I2C_S3C2410=y
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_TINY_USB is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_SENSORS_DS1337 is not set
-+# CONFIG_SENSORS_DS1374 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+CONFIG_SENSORS_PCF50606=y
-+CONFIG_SENSORS_PCF50633=y
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_SENSORS_PCA9539 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+CONFIG_SENSORS_TSL256X=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
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+# CONFIG_SPI_DEBUG is not set
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+CONFIG_SPI_S3C24XX=y
-+CONFIG_SPI_S3C24XX_GPIO=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+CONFIG_SPI_SLAVE_JBT6K74=y
-+# CONFIG_SPI_SLAVE_LIS302DL is not set
-+
-+#
-+# Dallas's 1-wire bus
-+#
-+# CONFIG_W1 is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_ABITUGURU is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ASB100 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_FSCHER is not set
-+# CONFIG_SENSORS_FSCPOS is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+# CONFIG_SENSORS_LM70 is not set
-+# CONFIG_SENSORS_LM75 is not set
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# CONFIG_SENSORS_LM87 is not set
-+# CONFIG_SENSORS_LM90 is not set
-+# CONFIG_SENSORS_LM92 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+
-+#
-+# Misc devices
-+#
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# LED devices
-+#
-+CONFIG_NEW_LEDS=y
-+CONFIG_LEDS_CLASS=y
-+
-+#
-+# LED drivers
-+#
-+CONFIG_LEDS_S3C24XX=m
-+CONFIG_LEDS_GTA01=y
-+# CONFIG_LEDS_GTA02 is not set
-+
-+#
-+# LED Triggers
-+#
-+CONFIG_LEDS_TRIGGERS=y
-+CONFIG_LEDS_TRIGGER_TIMER=y
-+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+CONFIG_BACKLIGHT_LCD_SUPPORT=y
-+CONFIG_BACKLIGHT_CLASS_DEVICE=y
-+CONFIG_LCD_CLASS_DEVICE=y
-+CONFIG_BACKLIGHT_GTA01=y
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_FB=y
-+# CONFIG_FIRMWARE_EDID is not set
-+# CONFIG_FB_DDC is not set
-+CONFIG_FB_CFB_FILLRECT=y
-+CONFIG_FB_CFB_COPYAREA=y
-+CONFIG_FB_CFB_IMAGEBLIT=y
-+# CONFIG_FB_SYS_FILLRECT is not set
-+# CONFIG_FB_SYS_COPYAREA is not set
-+# CONFIG_FB_SYS_IMAGEBLIT is not set
-+# CONFIG_FB_SYS_FOPS is not set
-+CONFIG_FB_DEFERRED_IO=y
-+# CONFIG_FB_SVGALIB is not set
-+# CONFIG_FB_MACMODES is not set
-+# CONFIG_FB_BACKLIGHT is not set
-+# CONFIG_FB_MODE_HELPERS is not set
-+# CONFIG_FB_TILEBLITTING is not set
-+
-+#
-+# Frame buffer hardware drivers
-+#
-+# CONFIG_FB_S1D13XXX is not set
-+CONFIG_FB_S3C2410=y
-+# CONFIG_FB_S3C2410_DEBUG is not set
-+CONFIG_GLAMO=y
-+CONFIG_FB_GLAMO=y
-+CONFIG_GLAMO_SPI_GPIO=y
-+CONFIG_FB_GLAMO_SPI=y
-+# CONFIG_FB_VIRTUAL is not set
-+
-+#
-+# Console display driver support
-+#
-+# CONFIG_VGA_CONSOLE is not set
-+CONFIG_DUMMY_CONSOLE=y
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-+CONFIG_FONTS=y
-+# CONFIG_FONT_8x8 is not set
-+# CONFIG_FONT_8x16 is not set
-+CONFIG_FONT_6x11=y
-+# CONFIG_FONT_7x14 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
-+# CONFIG_FONT_10x18 is not set
-+# CONFIG_LOGO is not set
-+
-+#
-+# Sound
-+#
-+CONFIG_SOUND=y
-+
-+#
-+# 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 is not set
-+CONFIG_SND_OSSEMUL=y
-+CONFIG_SND_MIXER_OSS=m
-+CONFIG_SND_PCM_OSS=m
-+CONFIG_SND_PCM_OSS_PLUGINS=y
-+# CONFIG_SND_DYNAMIC_MINORS is not set
-+CONFIG_SND_SUPPORT_OLD_API=y
-+CONFIG_SND_VERBOSE_PROCFS=y
-+# 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
-+
-+#
-+# ALSA ARM devices
-+#
-+
-+#
-+# USB devices
-+#
-+CONFIG_SND_USB_AUDIO=m
-+# CONFIG_SND_USB_CAIAQ is not set
-+
-+#
-+# System on Chip audio support
-+#
-+CONFIG_SND_SOC=m
-+CONFIG_SND_S3C24XX_SOC=m
-+CONFIG_SND_S3C24XX_SOC_I2S=m
-+CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
-+CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
-+
-+#
-+# SoC Audio support for SuperH
-+#
-+CONFIG_SND_SOC_WM8753=m
-+
-+#
-+# Open Sound System
-+#
-+# CONFIG_SOUND_PRIME is not set
-+
-+#
-+# HID Devices
-+#
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=m
-+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-+# CONFIG_HID_FF is not set
-+# CONFIG_USB_HIDDEV is not set
-+
-+#
-+# USB HID Boot Protocol drivers
-+#
-+# CONFIG_USB_KBD is not set
-+# CONFIG_USB_MOUSE is not set
-+
-+#
-+# USB support
-+#
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+CONFIG_USB_SUSPEND=y
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=m
-+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_SL811_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+CONFIG_USB_ACM=m
-+CONFIG_USB_PRINTER=m
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+CONFIG_USB_STORAGE=m
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+CONFIG_USB_STORAGE_DATAFAB=y
-+CONFIG_USB_STORAGE_FREECOM=y
-+CONFIG_USB_STORAGE_DPCM=y
-+CONFIG_USB_STORAGE_USBAT=y
-+CONFIG_USB_STORAGE_SDDR09=y
-+CONFIG_USB_STORAGE_SDDR55=y
-+CONFIG_USB_STORAGE_JUMPSHOT=y
-+CONFIG_USB_STORAGE_ALAUDA=y
-+CONFIG_USB_STORAGE_KARMA=y
-+CONFIG_USB_LIBUSUAL=y
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+
-+#
-+# USB Serial Converter support
-+#
-+CONFIG_USB_SERIAL=m
-+CONFIG_USB_SERIAL_GENERIC=y
-+CONFIG_USB_SERIAL_AIRCABLE=m
-+CONFIG_USB_SERIAL_AIRPRIME=m
-+CONFIG_USB_SERIAL_ARK3116=m
-+CONFIG_USB_SERIAL_BELKIN=m
-+CONFIG_USB_SERIAL_WHITEHEAT=m
-+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-+CONFIG_USB_SERIAL_CP2101=m
-+CONFIG_USB_SERIAL_CYPRESS_M8=m
-+CONFIG_USB_SERIAL_EMPEG=m
-+CONFIG_USB_SERIAL_FTDI_SIO=m
-+CONFIG_USB_SERIAL_FUNSOFT=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_GARMIN=m
-+CONFIG_USB_SERIAL_IPW=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_MOS7720=m
-+CONFIG_USB_SERIAL_MOS7840=m
-+CONFIG_USB_SERIAL_NAVMAN=m
-+CONFIG_USB_SERIAL_PL2303=m
-+CONFIG_USB_SERIAL_HP4X=m
-+CONFIG_USB_SERIAL_SAFE=m
-+CONFIG_USB_SERIAL_SAFE_PADDED=y
-+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-+CONFIG_USB_SERIAL_TI=m
-+CONFIG_USB_SERIAL_CYBERJACK=m
-+CONFIG_USB_SERIAL_XIRCOM=m
-+CONFIG_USB_SERIAL_OPTION=m
-+CONFIG_USB_SERIAL_OMNINET=m
-+# CONFIG_USB_SERIAL_DEBUG is not set
-+CONFIG_USB_EZUSB=y
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+CONFIG_USB_BERRY_CHARGE=m
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_LD is not set
-+CONFIG_USB_TRANCEVIBRATOR=m
-+CONFIG_USB_IOWARRIOR=m
-+# CONFIG_USB_TEST is not set
-+
-+#
-+# USB DSL modem support
-+#
-+
-+#
-+# USB Gadget Support
-+#
-+CONFIG_USB_GADGET=y
-+# CONFIG_USB_GADGET_DEBUG_FILES is not set
-+CONFIG_USB_GADGET_SELECTED=y
-+# CONFIG_USB_GADGET_FSL_USB2 is not set
-+# CONFIG_USB_GADGET_NET2280 is not set
-+# CONFIG_USB_GADGET_PXA2XX is not set
-+# CONFIG_USB_GADGET_GOKU is not set
-+# CONFIG_USB_GADGET_LH7A40X is not set
-+# CONFIG_USB_GADGET_OMAP is not set
-+CONFIG_USB_GADGET_S3C2410=y
-+CONFIG_USB_S3C2410=y
-+# CONFIG_USB_S3C2410_DEBUG is not set
-+# CONFIG_USB_GADGET_AT91 is not set
-+# CONFIG_USB_GADGET_DUMMY_HCD is not set
-+# CONFIG_USB_GADGET_DUALSPEED is not set
-+# CONFIG_USB_ZERO is not set
-+CONFIG_USB_ETH=y
-+CONFIG_USB_ETH_RNDIS=y
-+# CONFIG_USB_GADGETFS is not set
-+# CONFIG_USB_FILE_STORAGE is not set
-+# CONFIG_USB_G_SERIAL is not set
-+# CONFIG_USB_MIDI_GADGET is not set
-+CONFIG_MMC=y
-+# CONFIG_MMC_DEBUG is not set
-+CONFIG_MMC_UNSAFE_RESUME=y
-+
-+#
-+# MMC/SD Card Drivers
-+#
-+CONFIG_MMC_BLOCK=y
-+
-+#
-+# MMC/SD Host Controller Drivers
-+#
-+CONFIG_MMC_S3C=y
-+
-+#
-+# Real Time Clock
-+#
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+CONFIG_RTC_DEBUG=y
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+CONFIG_RTC_DRV_S3C=m
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=m
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+# CONFIG_EXT3_FS_XATTR is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+# CONFIG_JBD_DEBUG is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+CONFIG_FS_POSIX_ACL=y
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+# CONFIG_MINIX_FS is not set
-+CONFIG_ROMFS_FS=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+CONFIG_DNOTIFY=y
-+# CONFIG_AUTOFS_FS is not set
-+CONFIG_AUTOFS4_FS=m
-+CONFIG_FUSE_FS=m
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+CONFIG_ISO9660_FS=m
-+CONFIG_JOLIET=y
-+# CONFIG_ZISOFS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=m
-+CONFIG_MSDOS_FS=m
-+CONFIG_VFAT_FS=m
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+CONFIG_RAMFS=y
-+CONFIG_CONFIGFS_FS=m
-+
-+#
-+# 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_YAFFS_FS=y
-+CONFIG_YAFFS_YAFFS1=y
-+CONFIG_YAFFS_9BYTE_TAGS=y
-+CONFIG_YAFFS_YAFFS2=y
-+CONFIG_YAFFS_AUTO_YAFFS2=y
-+# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-+CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
-+# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-+# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
-+CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+CONFIG_JFFS2_SUMMARY=y
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# 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_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_DIRECTIO is not set
-+CONFIG_NFSD=m
-+CONFIG_NFSD_V3=y
-+# CONFIG_NFSD_V3_ACL is not set
-+CONFIG_NFSD_V4=y
-+CONFIG_NFSD_TCP=y
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_EXPORTFS=m
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+CONFIG_CIFS=m
-+# CONFIG_CIFS_STATS is not set
-+CONFIG_CIFS_WEAK_PW_HASH=y
-+# CONFIG_CIFS_XATTR is not set
-+# CONFIG_CIFS_DEBUG2 is not set
-+# CONFIG_CIFS_EXPERIMENTAL is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+# CONFIG_9P_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+
-+#
-+# Native Language Support
-+#
-+CONFIG_NLS=m
-+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 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=m
-+CONFIG_NLS_CODEPAGE_950=m
-+# 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=m
-+
-+#
-+# Distributed Lock Manager
-+#
-+# CONFIG_DLM is not set
-+
-+#
-+# Profiling support
-+#
-+# CONFIG_PROFILING is not set
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+# CONFIG_SCHEDSTATS is not set
-+CONFIG_TIMER_STATS=y
-+# CONFIG_DEBUG_SLAB is not set
-+CONFIG_DEBUG_PREEMPT=y
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_LOCK_ALLOC is not set
-+# CONFIG_PROVE_LOCKING is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+CONFIG_FRAME_POINTER=y
-+CONFIG_FORCED_INLINING=y
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_DEBUG_USER is not set
-+CONFIG_DEBUG_ERRORS=y
-+CONFIG_DEBUG_LL=y
-+# CONFIG_DEBUG_ICEDCC is not set
-+CONFIG_DEBUG_S3C2410_PORT=y
-+CONFIG_DEBUG_S3C2410_UART=0
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+
-+#
-+# Cryptographic options
-+#
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_HMAC=y
-+CONFIG_CRYPTO_XCBC=m
-+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_WP512=m
-+CONFIG_CRYPTO_TGR192=m
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+CONFIG_CRYPTO_LRW=m
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_FCRYPT=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_CAST6=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_KHAZAD=m
-+CONFIG_CRYPTO_ANUBIS=m
-+CONFIG_CRYPTO_DEFLATE=m
-+CONFIG_CRYPTO_MICHAEL_MIC=m
-+CONFIG_CRYPTO_CRC32C=m
-+CONFIG_CRYPTO_CAMELLIA=m
-+CONFIG_CRYPTO_TEST=m
-+
-+#
-+# Hardware crypto devices
-+#
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_CRC_CCITT=m
-+CONFIG_CRC16=m
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+CONFIG_LIBCRC32C=m
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_TEXTSEARCH=y
-+CONFIG_TEXTSEARCH_KMP=m
-+CONFIG_TEXTSEARCH_BM=m
-+CONFIG_TEXTSEARCH_FSM=m
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_DMA=y
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1075-local-build-scripts.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1075-local-build-scripts.patch.patch
deleted file mode 100644 (file)
index 02801d4..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-From 3801eb47f3ce58d2f8b64089ab01d85edf19f441 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Sun, 13 Apr 2008 07:25:44 +0100
-Subject: [PATCH] local-build-scripts.patch
-
-Add a couple of handy scripts to crossmake and send over dfu
-
-From: warmcat <andy@warmcat.com>
----
- build    |   14 ++++++++++++++
- dfu-kern |    9 +++++++++
- 2 files changed, 23 insertions(+), 0 deletions(-)
- create mode 100755 build
- create mode 100755 dfu-kern
-
-diff --git a/build b/build
-new file mode 100755
-index 0000000..7e61ea2
---- /dev/null
-+++ b/build
-@@ -0,0 +1,14 @@
-+#!/bin/sh
-+
-+set -x
-+
-+export CROSS_COMPILE=../../cross/bin/arm-angstrom-linux-gnueabi-
-+make ARCH=arm silentoldconfig
-+if make -j5 ARCH=arm; then
-+      ${CROSS_COMPILE}objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux linux.bin
-+      mkimage -A arm -O linux -T kernel -C none -a 30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973(GTA02)" -d linux.bin uImage.bin
-+      exit 0
-+else
-+      exit 1
-+fi
-+
-diff --git a/dfu-kern b/dfu-kern
-new file mode 100755
-index 0000000..990abdd
---- /dev/null
-+++ b/dfu-kern
-@@ -0,0 +1,9 @@
-+#!/bin/bash
-+../../dfu-util/src/dfu-util -a 3 -d 0x1457:0x5119 -D uImage.bin
-+if [ $? -eq 1 ] ; then
-+../../dfu-util/src/dfu-util -a 3 -d 0x1457:0x5120 -D uImage.bin
-+../../dfu-util/src/dfu-util -a 3 -d 0x1457:0x5119 -D uImage.bin
-+
-+fi
-+
-+
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1076-local-build-new-dfu-vid.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1076-local-build-new-dfu-vid.patch.patch
deleted file mode 100644 (file)
index 32985cc..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2f8f225597218a1b838f70dc8f7d9216c40cd4c0 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Sun, 13 Apr 2008 07:25:44 +0100
-Subject: [PATCH] local-build-new-dfu-vid.patch
-
-Update to new DFU VID for A5
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- dfu-kern |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/dfu-kern b/dfu-kern
-index 990abdd..b7ed2c3 100755
---- a/dfu-kern
-+++ b/dfu-kern
-@@ -1,8 +1,8 @@
- #!/bin/bash
--../../dfu-util/src/dfu-util -a 3 -d 0x1457:0x5119 -D uImage.bin
-+../../dfu-util/src/dfu-util -a 3 -d 0x1d50:0x5119 -D uImage.bin
- if [ $? -eq 1 ] ; then
--../../dfu-util/src/dfu-util -a 3 -d 0x1457:0x5120 -D uImage.bin
--../../dfu-util/src/dfu-util -a 3 -d 0x1457:0x5119 -D uImage.bin
-+../../dfu-util/src/dfu-util -a 3 -d 0x1d50:0x5120 -D uImage.bin
-+../../dfu-util/src/dfu-util -a 3 -d 0x1d50:0x5119 -D uImage.bin
- fi
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1077-local-update-defconfig-for-2.6-dev.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1077-local-update-defconfig-for-2.6-dev.patch.patch
deleted file mode 100644 (file)
index beb0396..0000000
+++ /dev/null
@@ -1,1836 +0,0 @@
-From d7f185674ade4b1a152c1cc142d07d47f13ce9cd Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Sun, 13 Apr 2008 07:25:45 +0100
-Subject: [PATCH] local-update-defconfig-for-2.6-dev.patch
-
-Make a defconfig for 2.6.24 out of the current 2.6.22.5 one
-
-From: warmcat <andy@warmcat.com>
----
- defconfig-2.6.24 | 1814 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 1814 insertions(+), 0 deletions(-)
- create mode 100644 defconfig-2.6.24
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-new file mode 100644
-index 0000000..48644ac
---- /dev/null
-+++ b/defconfig-2.6.24
-@@ -0,0 +1,1814 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.24-rc6
-+# Tue Jan  8 11:16:56 2008
-+#
-+CONFIG_ARM=y
-+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-+CONFIG_GENERIC_GPIO=y
-+# CONFIG_GENERIC_TIME is not set
-+# CONFIG_GENERIC_CLOCKEVENTS is not set
-+CONFIG_MMU=y
-+CONFIG_NO_IOPORT=y
-+CONFIG_GENERIC_HARDIRQS=y
-+CONFIG_STACKTRACE_SUPPORT=y
-+CONFIG_LOCKDEP_SUPPORT=y
-+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-+CONFIG_HARDIRQS_SW_RESEND=y
-+CONFIG_GENERIC_IRQ_PROBE=y
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_ZONE_DMA=y
-+CONFIG_VECTORS_BASE=0xffff0000
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_LOCK_KERNEL=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION="-mokodev"
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_FAIR_GROUP_SCHED=y
-+CONFIG_FAIR_USER_SCHED=y
-+# CONFIG_FAIR_CGROUP_SCHED is not set
-+# CONFIG_SYSFS_DEPRECATED is not set
-+# CONFIG_RELAY is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+CONFIG_SYSCTL=y
-+# CONFIG_EMBEDDED is not set
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=m
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=m
-+# CONFIG_DEFAULT_AS is not set
-+CONFIG_DEFAULT_DEADLINE=y
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="deadline"
-+
-+#
-+# System Type
-+#
-+# CONFIG_ARCH_AAEC2000 is not set
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_REALVIEW is not set
-+# CONFIG_ARCH_VERSATILE is not set
-+# CONFIG_ARCH_AT91 is not set
-+# CONFIG_ARCH_CLPS7500 is not set
-+# CONFIG_ARCH_CLPS711X is not set
-+# CONFIG_ARCH_CO285 is not set
-+# CONFIG_ARCH_EBSA110 is not set
-+# CONFIG_ARCH_EP93XX is not set
-+# CONFIG_ARCH_FOOTBRIDGE is not set
-+# CONFIG_ARCH_NETX is not set
-+# CONFIG_ARCH_H720X is not set
-+# CONFIG_ARCH_IMX is not set
-+# CONFIG_ARCH_IOP13XX is not set
-+# CONFIG_ARCH_IOP32X is not set
-+# CONFIG_ARCH_IOP33X is not set
-+# CONFIG_ARCH_IXP23XX is not set
-+# CONFIG_ARCH_IXP2000 is not set
-+# CONFIG_ARCH_IXP4XX is not set
-+# CONFIG_ARCH_L7200 is not set
-+# CONFIG_ARCH_KS8695 is not set
-+# CONFIG_ARCH_NS9XXX is not set
-+# CONFIG_ARCH_MXC is not set
-+# CONFIG_ARCH_PNX4008 is not set
-+# CONFIG_ARCH_PXA is not set
-+# CONFIG_ARCH_RPC is not set
-+# CONFIG_ARCH_SA1100 is not set
-+CONFIG_ARCH_S3C2410=y
-+# CONFIG_ARCH_SHARK is not set
-+# CONFIG_ARCH_LH7A40X is not set
-+# CONFIG_ARCH_DAVINCI is not set
-+# CONFIG_ARCH_OMAP is not set
-+CONFIG_PLAT_S3C24XX=y
-+CONFIG_CPU_S3C244X=y
-+CONFIG_S3C2410_DMA=y
-+# CONFIG_S3C2410_DMA_DEBUG is not set
-+CONFIG_MACH_SMDK=y
-+CONFIG_MACH_NEO1973=y
-+CONFIG_PLAT_S3C=y
-+CONFIG_CPU_LLSERIAL_S3C2410=y
-+CONFIG_CPU_LLSERIAL_S3C2440=y
-+
-+#
-+# Boot options
-+#
-+# CONFIG_S3C_BOOT_WATCHDOG is not set
-+# CONFIG_S3C_BOOT_ERROR_RESET is not set
-+
-+#
-+# Power management
-+#
-+CONFIG_S3C2410_PM_DEBUG=y
-+# CONFIG_S3C2410_PM_CHECK is not set
-+CONFIG_S3C_LOWLEVEL_UART_PORT=0
-+
-+#
-+# S3C2400 Machines
-+#
-+CONFIG_CPU_S3C2410=y
-+CONFIG_CPU_S3C2410_DMA=y
-+CONFIG_S3C2410_PM=y
-+CONFIG_S3C2410_GPIO=y
-+CONFIG_S3C2410_CLOCK=y
-+CONFIG_S3C2410_PWM=y
-+
-+#
-+# S3C2410 Machines
-+#
-+# CONFIG_ARCH_SMDK2410 is not set
-+# CONFIG_ARCH_H1940 is not set
-+# CONFIG_MACH_N30 is not set
-+# CONFIG_ARCH_BAST is not set
-+# CONFIG_MACH_OTOM is not set
-+# CONFIG_MACH_AML_M5900 is not set
-+# CONFIG_MACH_VR1000 is not set
-+CONFIG_MACH_QT2410=y
-+CONFIG_MACH_NEO1973_GTA01=y
-+
-+#
-+# S3C2412 Machines
-+#
-+# CONFIG_MACH_SMDK2413 is not set
-+# CONFIG_MACH_SMDK2412 is not set
-+# CONFIG_MACH_VSTMS is not set
-+CONFIG_CPU_S3C2440=y
-+CONFIG_S3C2440_DMA=y
-+
-+#
-+# S3C2440 Machines
-+#
-+# CONFIG_MACH_ANUBIS is not set
-+# CONFIG_MACH_OSIRIS is not set
-+# CONFIG_MACH_RX3715 is not set
-+CONFIG_ARCH_S3C2440=y
-+# CONFIG_MACH_NEXCODER_2440 is not set
-+CONFIG_SMDK2440_CPU2440=y
-+CONFIG_MACH_HXD8=y
-+CONFIG_MACH_NEO1973_GTA02=y
-+# CONFIG_NEO1973_GTA02_2440 is not set
-+CONFIG_CPU_S3C2442=y
-+
-+#
-+# S3C2442 Machines
-+#
-+CONFIG_SMDK2440_CPU2442=y
-+
-+#
-+# S3C2443 Machines
-+#
-+# CONFIG_MACH_SMDK2443 is not set
-+
-+#
-+# Processor Type
-+#
-+CONFIG_CPU_32=y
-+CONFIG_CPU_ARM920T=y
-+CONFIG_CPU_32v4T=y
-+CONFIG_CPU_ABRT_EV4T=y
-+CONFIG_CPU_CACHE_V4WT=y
-+CONFIG_CPU_CACHE_VIVT=y
-+CONFIG_CPU_COPY_V4WB=y
-+CONFIG_CPU_TLB_V4WBI=y
-+CONFIG_CPU_CP15=y
-+CONFIG_CPU_CP15_MMU=y
-+
-+#
-+# Processor Features
-+#
-+CONFIG_ARM_THUMB=y
-+# CONFIG_CPU_ICACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-+# CONFIG_OUTER_CACHE is not set
-+
-+#
-+# Bus support
-+#
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Kernel Features
-+#
-+# CONFIG_TICK_ONESHOT is not set
-+CONFIG_PREEMPT=y
-+CONFIG_NO_IDLE_HZ=y
-+CONFIG_HZ=200
-+CONFIG_AEABI=y
-+CONFIG_OABI_COMPAT=y
-+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4096
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_ALIGNMENT_TRAP=y
-+
-+#
-+# Boot options
-+#
-+CONFIG_ZBOOT_ROM_TEXT=0x0
-+CONFIG_ZBOOT_ROM_BSS=0x0
-+CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
-+# CONFIG_XIP_KERNEL is not set
-+CONFIG_KEXEC=y
-+
-+#
-+# Floating point emulation
-+#
-+
-+#
-+# At least one emulation must be selected
-+#
-+CONFIG_FPE_NWFPE=y
-+# CONFIG_FPE_NWFPE_XP is not set
-+# CONFIG_FPE_FASTFPE is not set
-+
-+#
-+# Userspace binary formats
-+#
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+
-+#
-+# Power management options
-+#
-+CONFIG_PM=y
-+CONFIG_PM_LEGACY=y
-+CONFIG_PM_DEBUG=y
-+# CONFIG_PM_VERBOSE is not set
-+CONFIG_PM_SLEEP=y
-+CONFIG_SUSPEND_UP_POSSIBLE=y
-+CONFIG_SUSPEND=y
-+CONFIG_APM_EMULATION=y
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=m
-+CONFIG_PACKET_MMAP=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+CONFIG_XFRM_MIGRATE=y
-+CONFIG_NET_KEY=m
-+CONFIG_NET_KEY_MIGRATE=y
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+# CONFIG_IP_ROUTE_MULTIPATH is not set
-+# CONFIG_IP_ROUTE_VERBOSE 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=m
-+CONFIG_NET_IPGRE=m
-+# CONFIG_NET_IPGRE_BROADCAST is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_XFRM_TUNNEL=m
-+CONFIG_INET_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET_XFRM_MODE_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_BEET=m
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+CONFIG_TCP_MD5SIG=y
-+# CONFIG_IP_VS is not set
-+CONFIG_IPV6=m
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_IPCOMP=m
-+# CONFIG_IPV6_MIP6 is not set
-+CONFIG_INET6_XFRM_TUNNEL=m
-+CONFIG_INET6_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET6_XFRM_MODE_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_BEET=m
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_TUNNEL=m
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+CONFIG_NETFILTER=y
-+# CONFIG_NETFILTER_DEBUG is not set
-+CONFIG_BRIDGE_NETFILTER=y
-+
-+#
-+# Core Netfilter Configuration
-+#
-+CONFIG_NETFILTER_NETLINK=m
-+CONFIG_NETFILTER_NETLINK_QUEUE=m
-+CONFIG_NETFILTER_NETLINK_LOG=m
-+CONFIG_NF_CONNTRACK_ENABLED=m
-+CONFIG_NF_CONNTRACK=m
-+CONFIG_NF_CT_ACCT=y
-+CONFIG_NF_CONNTRACK_MARK=y
-+CONFIG_NF_CONNTRACK_EVENTS=y
-+CONFIG_NF_CT_PROTO_GRE=m
-+CONFIG_NF_CT_PROTO_SCTP=m
-+# CONFIG_NF_CT_PROTO_UDPLITE is not set
-+# CONFIG_NF_CONNTRACK_AMANDA is not set
-+CONFIG_NF_CONNTRACK_FTP=m
-+CONFIG_NF_CONNTRACK_H323=m
-+CONFIG_NF_CONNTRACK_IRC=m
-+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-+CONFIG_NF_CONNTRACK_PPTP=m
-+CONFIG_NF_CONNTRACK_SANE=m
-+CONFIG_NF_CONNTRACK_SIP=m
-+CONFIG_NF_CONNTRACK_TFTP=m
-+CONFIG_NF_CT_NETLINK=m
-+CONFIG_NETFILTER_XTABLES=m
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-+CONFIG_NETFILTER_XT_TARGET_DSCP=m
-+CONFIG_NETFILTER_XT_TARGET_MARK=m
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+CONFIG_NETFILTER_XT_MATCH_DCCP=m
-+CONFIG_NETFILTER_XT_MATCH_DSCP=m
-+CONFIG_NETFILTER_XT_MATCH_ESP=m
-+CONFIG_NETFILTER_XT_MATCH_HELPER=m
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_MAC=m
-+CONFIG_NETFILTER_XT_MATCH_MARK=m
-+CONFIG_NETFILTER_XT_MATCH_POLICY=m
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-+CONFIG_NETFILTER_XT_MATCH_REALM=m
-+CONFIG_NETFILTER_XT_MATCH_SCTP=m
-+CONFIG_NETFILTER_XT_MATCH_STATE=m
-+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-+CONFIG_NETFILTER_XT_MATCH_STRING=m
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-+
-+#
-+# IP: Netfilter Configuration
-+#
-+CONFIG_NF_CONNTRACK_IPV4=m
-+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-+# CONFIG_IP_NF_QUEUE is not set
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_MATCH_IPRANGE=m
-+CONFIG_IP_NF_MATCH_TOS=m
-+# CONFIG_IP_NF_MATCH_RECENT is not set
-+CONFIG_IP_NF_MATCH_ECN=m
-+CONFIG_IP_NF_MATCH_AH=m
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_MATCH_OWNER=m
-+CONFIG_IP_NF_MATCH_ADDRTYPE=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_TARGET_LOG=m
-+CONFIG_IP_NF_TARGET_ULOG=m
-+CONFIG_NF_NAT=m
-+CONFIG_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_NF_NAT_SNMP_BASIC=m
-+CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_FTP=m
-+CONFIG_NF_NAT_IRC=m
-+CONFIG_NF_NAT_TFTP=m
-+# CONFIG_NF_NAT_AMANDA is not set
-+CONFIG_NF_NAT_PPTP=m
-+CONFIG_NF_NAT_H323=m
-+CONFIG_NF_NAT_SIP=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_IP_NF_TARGET_TOS=m
-+CONFIG_IP_NF_TARGET_ECN=m
-+CONFIG_IP_NF_TARGET_TTL=m
-+CONFIG_IP_NF_TARGET_CLUSTERIP=m
-+# CONFIG_IP_NF_RAW is not set
-+# CONFIG_IP_NF_ARPTABLES is not set
-+
-+#
-+# IPv6: Netfilter Configuration (EXPERIMENTAL)
-+#
-+CONFIG_NF_CONNTRACK_IPV6=m
-+# CONFIG_IP6_NF_QUEUE is not set
-+CONFIG_IP6_NF_IPTABLES=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_OWNER=m
-+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-+CONFIG_IP6_NF_MATCH_AH=m
-+CONFIG_IP6_NF_MATCH_MH=m
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_LOG=m
-+CONFIG_IP6_NF_TARGET_REJECT=m
-+CONFIG_IP6_NF_MANGLE=m
-+CONFIG_IP6_NF_TARGET_HL=m
-+# CONFIG_IP6_NF_RAW is not set
-+
-+#
-+# 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_BRIDGE_EBT_ULOG=m
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+CONFIG_BRIDGE=y
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+CONFIG_LLC=y
-+# 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+CONFIG_NET_SCHED=y
-+
-+#
-+# Queueing/Scheduling
-+#
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=m
-+CONFIG_NET_SCH_PRIO=m
-+# CONFIG_NET_SCH_RR is not set
-+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_NETEM=m
-+CONFIG_NET_SCH_INGRESS=m
-+
-+#
-+# Classification
-+#
-+CONFIG_NET_CLS=y
-+CONFIG_NET_CLS_BASIC=m
-+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_CLS_U32_PERF=y
-+CONFIG_CLS_U32_MARK=y
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
-+# CONFIG_NET_EMATCH is not set
-+# CONFIG_NET_CLS_ACT is not set
-+# CONFIG_NET_CLS_POLICE is not set
-+# CONFIG_NET_CLS_IND is not set
-+CONFIG_NET_SCH_FIFO=y
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_IRDA 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_HIDP=m
-+
-+#
-+# Bluetooth device drivers
-+#
-+CONFIG_BT_HCIUSB=m
-+CONFIG_BT_HCIUSB_SCO=y
-+# CONFIG_BT_HCIBTSDIO is not set
-+# CONFIG_BT_HCIUART is not set
-+# CONFIG_BT_HCIBCM203X is not set
-+# CONFIG_BT_HCIBPA10X is not set
-+# CONFIG_BT_HCIBFUSB is not set
-+# CONFIG_BT_HCIVHCI is not set
-+# CONFIG_AF_RXRPC is not set
-+CONFIG_FIB_RULES=y
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=m
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=m
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+CONFIG_MTD_CONCAT=y
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_AFS_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+CONFIG_MTD_CFI_INTELEXT=y
-+# CONFIG_MTD_CFI_AMDSTD is not set
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+CONFIG_MTD_ROM=y
-+CONFIG_MTD_ABSENT=y
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+CONFIG_MTD_PHYSMAP=y
-+CONFIG_MTD_PHYSMAP_START=0x0
-+CONFIG_MTD_PHYSMAP_LEN=0
-+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-+# CONFIG_MTD_ARM_INTEGRATOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+CONFIG_MTD_NAND=y
-+CONFIG_MTD_NAND_VERIFY_WRITE=y
-+# CONFIG_MTD_NAND_ECC_SMC is not set
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+CONFIG_MTD_NAND_IDS=y
-+CONFIG_MTD_NAND_S3C2410=y
-+CONFIG_MTD_NAND_S3C2410_DEBUG=y
-+CONFIG_MTD_NAND_S3C2410_HWECC=y
-+# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ALAUDA is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=m
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_UB=m
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=4096
-+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=m
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=m
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+CONFIG_BLK_DEV_SR=m
-+# CONFIG_BLK_DEV_SR_VENDOR is not set
-+CONFIG_CHR_DEV_SG=m
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+CONFIG_SCSI_SCAN_ASYNC=y
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_ATA is not set
-+CONFIG_MD=y
-+# CONFIG_BLK_DEV_MD is not set
-+CONFIG_BLK_DEV_DM=m
-+# CONFIG_DM_DEBUG is not set
-+CONFIG_DM_CRYPT=m
-+CONFIG_DM_SNAPSHOT=m
-+# CONFIG_DM_MIRROR is not set
-+# CONFIG_DM_ZERO is not set
-+# CONFIG_DM_MULTIPATH is not set
-+# CONFIG_DM_DELAY is not set
-+# CONFIG_DM_UEVENT is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+CONFIG_TUN=m
-+# CONFIG_VETH is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=m
-+# CONFIG_AX88796 is not set
-+# CONFIG_SMC91X is not set
-+# CONFIG_DM9000 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_B44 is not set
-+CONFIG_CS89x0=m
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+CONFIG_USB_CATC=m
-+CONFIG_USB_KAWETH=m
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+CONFIG_USB_USBNET=m
-+CONFIG_USB_NET_AX8817X=m
-+CONFIG_USB_NET_CDCETHER=m
-+CONFIG_USB_NET_DM9601=m
-+CONFIG_USB_NET_GL620A=m
-+CONFIG_USB_NET_NET1080=m
-+CONFIG_USB_NET_PLUSB=m
-+CONFIG_USB_NET_MCS7830=m
-+CONFIG_USB_NET_RNDIS_HOST=m
-+CONFIG_USB_NET_CDC_SUBSET=m
-+CONFIG_USB_ALI_M5632=y
-+CONFIG_USB_AN2720=y
-+CONFIG_USB_BELKIN=y
-+CONFIG_USB_ARMLINUX=y
-+CONFIG_USB_EPSON2888=y
-+CONFIG_USB_KC2190=y
-+CONFIG_USB_NET_ZAURUS=m
-+# CONFIG_WAN is not set
-+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=m
-+CONFIG_PPP_MPPE=m
-+# CONFIG_PPPOE is not set
-+# CONFIG_PPPOL2TP is not set
-+# CONFIG_SLIP is not set
-+CONFIG_SLHC=m
-+# CONFIG_SHAPER is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
-+# CONFIG_INPUT_JOYDEV is not set
-+CONFIG_INPUT_EVDEV=y
-+CONFIG_INPUT_EVBUG=m
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+# CONFIG_KEYBOARD_ATKBD is not set
-+# 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_KEYBOARD_STOWAWAY=m
-+CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_NEO1973=y
-+CONFIG_KEYBOARD_QT2410=y
-+CONFIG_INPUT_MOUSE=y
-+# CONFIG_MOUSE_PS2 is not set
-+# CONFIG_MOUSE_SERIAL is not set
-+# CONFIG_MOUSE_APPLETOUCH is not set
-+# CONFIG_MOUSE_VSXXXAA is not set
-+# CONFIG_MOUSE_GPIO is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+CONFIG_INPUT_TOUCHSCREEN=y
-+# CONFIG_TOUCHSCREEN_ADS7846 is not set
-+# CONFIG_TOUCHSCREEN_FUJITSU is not set
-+CONFIG_TOUCHSCREEN_S3C2410=y
-+# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
-+# CONFIG_TOUCHSCREEN_GUNZE is not set
-+# CONFIG_TOUCHSCREEN_ELO is not set
-+# CONFIG_TOUCHSCREEN_MTOUCH is not set
-+# CONFIG_TOUCHSCREEN_MK712 is not set
-+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-+# CONFIG_TOUCHSCREEN_UCB1400 is not set
-+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-+CONFIG_INPUT_MISC=y
-+# CONFIG_INPUT_ATI_REMOTE is not set
-+# CONFIG_INPUT_ATI_REMOTE2 is not set
-+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-+# CONFIG_INPUT_POWERMATE is not set
-+# CONFIG_INPUT_YEALINK is not set
-+CONFIG_INPUT_UINPUT=m
-+CONFIG_INPUT_LIS302DL=y
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+# CONFIG_SERIO_SERPORT is not set
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_NR_TTY_DEVICES=4
-+CONFIG_HW_CONSOLE=y
-+CONFIG_VT_HW_CONSOLE_BINDING=y
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_SERIAL_S3C2410=y
-+CONFIG_SERIAL_S3C2410_CONSOLE=y
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_LEGACY_PTYS is not set
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_GPIO is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+CONFIG_I2C_S3C2410=y
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_TINY_USB is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_SENSORS_DS1337 is not set
-+# CONFIG_SENSORS_DS1374 is not set
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+CONFIG_SENSORS_PCF50606=y
-+CONFIG_SENSORS_PCF50633=y
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_SENSORS_PCA9539 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+CONFIG_SENSORS_TSL256X=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
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+# CONFIG_SPI_DEBUG is not set
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+CONFIG_SPI_S3C24XX=y
-+CONFIG_SPI_S3C24XX_GPIO=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_W1 is not set
-+CONFIG_POWER_SUPPLY=y
-+CONFIG_POWER_SUPPLY_DEBUG=y
-+CONFIG_PDA_POWER=y
-+CONFIG_APM_POWER=y
-+# CONFIG_BATTERY_DS2760 is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+# CONFIG_SENSORS_LM70 is not set
-+# CONFIG_SENSORS_LM75 is not set
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# CONFIG_SENSORS_LM87 is not set
-+# CONFIG_SENSORS_LM90 is not set
-+# CONFIG_SENSORS_LM92 is not set
-+# CONFIG_SENSORS_LM93 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_DME1737 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_S3C2410_WATCHDOG=m
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+CONFIG_MFD_GLAMO=y
-+CONFIG_MFD_GLAMO_FB=y
-+CONFIG_MFD_GLAMO_SPI_GPIO=y
-+CONFIG_MFD_GLAMO_SPI_FB=y
-+CONFIG_MFD_GLAMO_MCI=y
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+CONFIG_FB=y
-+# CONFIG_FIRMWARE_EDID is not set
-+# CONFIG_FB_DDC is not set
-+CONFIG_FB_CFB_FILLRECT=y
-+CONFIG_FB_CFB_COPYAREA=y
-+CONFIG_FB_CFB_IMAGEBLIT=y
-+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-+# CONFIG_FB_SYS_FILLRECT is not set
-+# CONFIG_FB_SYS_COPYAREA is not set
-+# CONFIG_FB_SYS_IMAGEBLIT is not set
-+# CONFIG_FB_SYS_FOPS is not set
-+CONFIG_FB_DEFERRED_IO=y
-+# CONFIG_FB_SVGALIB is not set
-+# CONFIG_FB_MACMODES is not set
-+# CONFIG_FB_BACKLIGHT is not set
-+# CONFIG_FB_MODE_HELPERS is not set
-+# CONFIG_FB_TILEBLITTING is not set
-+
-+#
-+# Frame buffer hardware drivers
-+#
-+# CONFIG_FB_UVESA is not set
-+# CONFIG_FB_S1D13XXX is not set
-+CONFIG_FB_S3C2410=y
-+# CONFIG_FB_S3C2410_DEBUG is not set
-+# CONFIG_FB_VIRTUAL is not set
-+CONFIG_BACKLIGHT_LCD_SUPPORT=y
-+CONFIG_LCD_CLASS_DEVICE=y
-+CONFIG_LCD_LTV350QV=y
-+CONFIG_BACKLIGHT_CLASS_DEVICE=y
-+# CONFIG_BACKLIGHT_CORGI is not set
-+CONFIG_BACKLIGHT_GTA01=y
-+
-+#
-+# Display device support
-+#
-+CONFIG_DISPLAY_SUPPORT=y
-+
-+#
-+# Display hardware drivers
-+#
-+CONFIG_DISPLAY_JBT6K74=y
-+
-+#
-+# Console display driver support
-+#
-+# CONFIG_VGA_CONSOLE is not set
-+CONFIG_DUMMY_CONSOLE=y
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-+CONFIG_FONTS=y
-+# CONFIG_FONT_8x8 is not set
-+# CONFIG_FONT_8x16 is not set
-+CONFIG_FONT_6x11=y
-+# CONFIG_FONT_7x14 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
-+# CONFIG_FONT_10x18 is not set
-+# CONFIG_LOGO is not set
-+
-+#
-+# Sound
-+#
-+CONFIG_SOUND=y
-+
-+#
-+# 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 is not set
-+CONFIG_SND_OSSEMUL=y
-+CONFIG_SND_MIXER_OSS=m
-+CONFIG_SND_PCM_OSS=m
-+CONFIG_SND_PCM_OSS_PLUGINS=y
-+# CONFIG_SND_DYNAMIC_MINORS is not set
-+CONFIG_SND_SUPPORT_OLD_API=y
-+CONFIG_SND_VERBOSE_PROCFS=y
-+# 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
-+
-+#
-+# ALSA ARM devices
-+#
-+
-+#
-+# SPI devices
-+#
-+
-+#
-+# USB devices
-+#
-+CONFIG_SND_USB_AUDIO=m
-+# CONFIG_SND_USB_CAIAQ is not set
-+
-+#
-+# System on Chip audio support
-+#
-+CONFIG_SND_SOC=m
-+CONFIG_SND_S3C24XX_SOC=m
-+CONFIG_SND_S3C24XX_SOC_I2S=m
-+CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
-+CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
-+
-+#
-+# SoC Audio support for SuperH
-+#
-+CONFIG_SND_SOC_WM8753=m
-+
-+#
-+# Open Sound System
-+#
-+# CONFIG_SOUND_PRIME is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=m
-+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-+# CONFIG_HID_FF is not set
-+# CONFIG_USB_HIDDEV is not set
-+
-+#
-+# USB HID Boot Protocol drivers
-+#
-+# CONFIG_USB_KBD is not set
-+# CONFIG_USB_MOUSE is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+CONFIG_USB_SUSPEND=y
-+CONFIG_USB_PERSIST=y
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=m
-+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+CONFIG_USB_ACM=m
-+CONFIG_USB_PRINTER=m
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+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 is not set
-+CONFIG_USB_STORAGE_DPCM=y
-+CONFIG_USB_STORAGE_USBAT=y
-+CONFIG_USB_STORAGE_SDDR09=y
-+CONFIG_USB_STORAGE_SDDR55=y
-+CONFIG_USB_STORAGE_JUMPSHOT=y
-+CONFIG_USB_STORAGE_ALAUDA=y
-+CONFIG_USB_STORAGE_KARMA=y
-+CONFIG_USB_LIBUSUAL=y
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+
-+#
-+# USB Serial Converter support
-+#
-+CONFIG_USB_SERIAL=m
-+CONFIG_USB_SERIAL_GENERIC=y
-+CONFIG_USB_SERIAL_AIRCABLE=m
-+CONFIG_USB_SERIAL_AIRPRIME=m
-+CONFIG_USB_SERIAL_ARK3116=m
-+CONFIG_USB_SERIAL_BELKIN=m
-+# CONFIG_USB_SERIAL_CH341 is not set
-+CONFIG_USB_SERIAL_WHITEHEAT=m
-+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-+CONFIG_USB_SERIAL_CP2101=m
-+CONFIG_USB_SERIAL_CYPRESS_M8=m
-+CONFIG_USB_SERIAL_EMPEG=m
-+CONFIG_USB_SERIAL_FTDI_SIO=m
-+CONFIG_USB_SERIAL_FUNSOFT=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_GARMIN=m
-+CONFIG_USB_SERIAL_IPW=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_MOS7720=m
-+CONFIG_USB_SERIAL_MOS7840=m
-+CONFIG_USB_SERIAL_NAVMAN=m
-+CONFIG_USB_SERIAL_PL2303=m
-+# CONFIG_USB_SERIAL_OTI6858 is not set
-+CONFIG_USB_SERIAL_HP4X=m
-+CONFIG_USB_SERIAL_SAFE=m
-+CONFIG_USB_SERIAL_SAFE_PADDED=y
-+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-+CONFIG_USB_SERIAL_TI=m
-+CONFIG_USB_SERIAL_CYBERJACK=m
-+CONFIG_USB_SERIAL_XIRCOM=m
-+CONFIG_USB_SERIAL_OPTION=m
-+CONFIG_USB_SERIAL_OMNINET=m
-+# CONFIG_USB_SERIAL_DEBUG is not set
-+CONFIG_USB_EZUSB=y
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+CONFIG_USB_BERRY_CHARGE=m
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_LD is not set
-+CONFIG_USB_TRANCEVIBRATOR=m
-+CONFIG_USB_IOWARRIOR=m
-+# CONFIG_USB_TEST is not set
-+
-+#
-+# USB DSL modem support
-+#
-+
-+#
-+# USB Gadget Support
-+#
-+CONFIG_USB_GADGET=y
-+# CONFIG_USB_GADGET_DEBUG is not set
-+# CONFIG_USB_GADGET_DEBUG_FILES is not set
-+CONFIG_USB_GADGET_SELECTED=y
-+# CONFIG_USB_GADGET_AMD5536UDC is not set
-+# CONFIG_USB_GADGET_ATMEL_USBA is not set
-+# CONFIG_USB_GADGET_FSL_USB2 is not set
-+# CONFIG_USB_GADGET_NET2280 is not set
-+# CONFIG_USB_GADGET_PXA2XX is not set
-+# CONFIG_USB_GADGET_M66592 is not set
-+# CONFIG_USB_GADGET_GOKU is not set
-+# CONFIG_USB_GADGET_LH7A40X is not set
-+# CONFIG_USB_GADGET_OMAP is not set
-+CONFIG_USB_GADGET_S3C2410=y
-+CONFIG_USB_S3C2410=y
-+# CONFIG_USB_S3C2410_DEBUG is not set
-+# CONFIG_USB_GADGET_AT91 is not set
-+# CONFIG_USB_GADGET_DUMMY_HCD is not set
-+# CONFIG_USB_GADGET_DUALSPEED is not set
-+# CONFIG_USB_ZERO is not set
-+CONFIG_USB_ETH=y
-+CONFIG_USB_ETH_RNDIS=y
-+# CONFIG_USB_GADGETFS is not set
-+# CONFIG_USB_FILE_STORAGE is not set
-+# CONFIG_USB_G_SERIAL is not set
-+# CONFIG_USB_MIDI_GADGET is not set
-+CONFIG_MMC=y
-+# CONFIG_MMC_DEBUG is not set
-+# CONFIG_MMC_UNSAFE_RESUME is not set
-+
-+#
-+# MMC/SD Card Drivers
-+#
-+CONFIG_MMC_BLOCK=y
-+# CONFIG_MMC_BLOCK_BOUNCE is not set
-+# CONFIG_SDIO_UART is not set
-+
-+#
-+# MMC/SD Host Controller Drivers
-+#
-+# CONFIG_MMC_SPI is not set
-+# CONFIG_MMC_S3C is not set
-+CONFIG_MMC_GLAMO=y
-+CONFIG_NEW_LEDS=y
-+CONFIG_LEDS_CLASS=y
-+
-+#
-+# LED drivers
-+#
-+CONFIG_LEDS_S3C24XX=m
-+CONFIG_LEDS_GPIO=y
-+CONFIG_LEDS_NEO1973_VIBRATOR=y
-+CONFIG_LEDS_NEO1973_GTA02=y
-+
-+#
-+# LED Triggers
-+#
-+CONFIG_LEDS_TRIGGERS=y
-+CONFIG_LEDS_TRIGGER_TIMER=y
-+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+CONFIG_RTC_DEBUG=y
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+CONFIG_RTC_DRV_S3C=m
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=m
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+# CONFIG_EXT3_FS_XATTR is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+# CONFIG_MINIX_FS is not set
-+CONFIG_ROMFS_FS=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+CONFIG_DNOTIFY=y
-+# CONFIG_AUTOFS_FS is not set
-+CONFIG_AUTOFS4_FS=m
-+CONFIG_FUSE_FS=m
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+CONFIG_ISO9660_FS=m
-+CONFIG_JOLIET=y
-+# CONFIG_ZISOFS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=m
-+CONFIG_MSDOS_FS=m
-+CONFIG_VFAT_FS=m
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+CONFIG_CONFIGFS_FS=m
-+
-+#
-+# 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_YAFFS_FS=y
-+CONFIG_YAFFS_YAFFS1=y
-+CONFIG_YAFFS_9BYTE_TAGS=y
-+CONFIG_YAFFS_YAFFS2=y
-+CONFIG_YAFFS_AUTO_YAFFS2=y
-+# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-+CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
-+# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-+# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
-+CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+CONFIG_JFFS2_SUMMARY=y
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# 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
-+# CONFIG_NETWORK_FILESYSTEMS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+CONFIG_NLS=m
-+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 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=m
-+CONFIG_NLS_CODEPAGE_950=m
-+# 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=m
-+# CONFIG_DLM is not set
-+CONFIG_INSTRUMENTATION=y
-+# CONFIG_PROFILING is not set
-+CONFIG_MARKERS=y
-+
-+#
-+# Kernel hacking
-+#
-+CONFIG_PRINTK_TIME=y
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+CONFIG_DEBUG_SHIRQ=y
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+CONFIG_TIMER_STATS=y
-+# CONFIG_DEBUG_SLAB is not set
-+CONFIG_DEBUG_PREEMPT=y
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+CONFIG_DEBUG_SPINLOCK=y
-+CONFIG_DEBUG_MUTEXES=y
-+CONFIG_DEBUG_LOCK_ALLOC=y
-+# CONFIG_PROVE_LOCKING is not set
-+CONFIG_LOCKDEP=y
-+CONFIG_LOCK_STAT=y
-+CONFIG_DEBUG_LOCKDEP=y
-+CONFIG_DEBUG_SPINLOCK_SLEEP=y
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+CONFIG_STACKTRACE=y
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+CONFIG_DEBUG_SG=y
-+CONFIG_FRAME_POINTER=y
-+CONFIG_FORCED_INLINING=y
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_USER is not set
-+CONFIG_DEBUG_ERRORS=y
-+CONFIG_DEBUG_LL=y
-+# CONFIG_DEBUG_ICEDCC is not set
-+# CONFIG_DEBUG_S3C_PORT is not set
-+CONFIG_DEBUG_S3C_UART=0
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_HMAC=y
-+CONFIG_CRYPTO_XCBC=m
-+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_WP512=m
-+CONFIG_CRYPTO_TGR192=m
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+CONFIG_CRYPTO_LRW=m
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_FCRYPT=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_CAST6=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_KHAZAD=m
-+CONFIG_CRYPTO_ANUBIS=m
-+# CONFIG_CRYPTO_SEED is not set
-+CONFIG_CRYPTO_DEFLATE=m
-+CONFIG_CRYPTO_MICHAEL_MIC=m
-+CONFIG_CRYPTO_CRC32C=m
-+CONFIG_CRYPTO_CAMELLIA=m
-+CONFIG_CRYPTO_TEST=m
-+# CONFIG_CRYPTO_AUTHENC is not set
-+CONFIG_CRYPTO_HW=y
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_CRC_CCITT=m
-+CONFIG_CRC16=m
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+CONFIG_LIBCRC32C=m
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_TEXTSEARCH=y
-+CONFIG_TEXTSEARCH_KMP=m
-+CONFIG_TEXTSEARCH_BM=m
-+CONFIG_TEXTSEARCH_FSM=m
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_DMA=y
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1078-local-config-add-vfat-nls-to-kern.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1078-local-config-add-vfat-nls-to-kern.patch.patch
deleted file mode 100644 (file)
index 43a4750..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-From fb75c4b67418f06a86a1a8f07614c618e496bc14 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Sun, 13 Apr 2008 07:25:45 +0100
-Subject: [PATCH] local-config-add-vfat-nls-to-kern.patch
-
-SD Card / VFAT in monolithic kernel
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- defconfig-2.6.24 |   18 +++++++++---------
- 1 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index 48644ac..b0ef327 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
--# Linux kernel version: 2.6.24-rc6
--# Tue Jan  8 11:16:56 2008
-+# Linux kernel version: 2.6.24-rc7
-+# Sun Jan 13 21:40:55 2008
- #
- CONFIG_ARM=y
- CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-@@ -1034,7 +1034,7 @@ CONFIG_SPI_MASTER=y
- #
- CONFIG_SPI_BITBANG=y
- CONFIG_SPI_S3C24XX=y
--CONFIG_SPI_S3C24XX_GPIO=y
-+# CONFIG_SPI_S3C24XX_GPIO is not set
- #
- # SPI Protocol Masters
-@@ -1587,9 +1587,9 @@ CONFIG_JOLIET=y
- #
- # DOS/FAT/NT Filesystems
- #
--CONFIG_FAT_FS=m
--CONFIG_MSDOS_FS=m
--CONFIG_VFAT_FS=m
-+CONFIG_FAT_FS=y
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
- CONFIG_FAT_DEFAULT_CODEPAGE=437
- CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
- # CONFIG_NTFS_FS is not set
-@@ -1649,9 +1649,9 @@ CONFIG_CRAMFS=y
- #
- # CONFIG_PARTITION_ADVANCED is not set
- CONFIG_MSDOS_PARTITION=y
--CONFIG_NLS=m
-+CONFIG_NLS=y
- CONFIG_NLS_DEFAULT="iso8859-1"
--CONFIG_NLS_CODEPAGE_437=m
-+CONFIG_NLS_CODEPAGE_437=y
- # CONFIG_NLS_CODEPAGE_737 is not set
- # CONFIG_NLS_CODEPAGE_775 is not set
- CONFIG_NLS_CODEPAGE_850=m
-@@ -1675,7 +1675,7 @@ CONFIG_NLS_CODEPAGE_950=m
- # 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_1=y
- # CONFIG_NLS_ISO8859_2 is not set
- # CONFIG_NLS_ISO8859_3 is not set
- # CONFIG_NLS_ISO8859_4 is not set
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1079-local-config-add-bluetooth-monolithic.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1079-local-config-add-bluetooth-monolithic.patch.patch
deleted file mode 100644 (file)
index d5e5130..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From 7eb5d3249a17af091630b6fa8392ed1e268962f6 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@openmoko.com>
-Date: Sun, 13 Apr 2008 07:25:45 +0100
-Subject: [PATCH] local-config-add-bluetooth-monolithic.patch
-
-Add Bluetooth in monolithic kernel
----
- defconfig-2.6.24 |   10 ++--------
- 1 files changed, 2 insertions(+), 8 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index b0ef327..5b3e5e9 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -1275,16 +1275,10 @@ CONFIG_HID=y
- #
- # USB Input Devices
- #
--CONFIG_USB_HID=m
-+CONFIG_USB_HID=y
- # CONFIG_USB_HIDINPUT_POWERBOOK is not set
- # CONFIG_HID_FF is not set
- # CONFIG_USB_HIDDEV is not set
--
--#
--# USB HID Boot Protocol drivers
--#
--# CONFIG_USB_KBD is not set
--# CONFIG_USB_MOUSE is not set
- CONFIG_USB_SUPPORT=y
- CONFIG_USB_ARCH_HAS_HCD=y
- CONFIG_USB_ARCH_HAS_OHCI=y
-@@ -1306,7 +1300,7 @@ CONFIG_USB_PERSIST=y
- # USB Host Controller Drivers
- #
- # CONFIG_USB_ISP116X_HCD is not set
--CONFIG_USB_OHCI_HCD=m
-+CONFIG_USB_OHCI_HCD=y
- # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
- # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
- CONFIG_USB_OHCI_LITTLE_ENDIAN=y
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1080-local-config-wlan-config-changes.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1080-local-config-wlan-config-changes.patch.patch
deleted file mode 100644 (file)
index 0063be2..0000000
+++ /dev/null
@@ -1,155 +0,0 @@
-From e1f4e75f4f146f534f659f2c9cf525387d4d734a Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Sun, 13 Apr 2008 07:25:46 +0100
-Subject: [PATCH] local-config-wlan-config-changes.patch
-
----
- defconfig-2.6.24 |   47 ++++++++++++++++++++++++++++++++---------------
- 1 files changed, 32 insertions(+), 15 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index 5b3e5e9..140fbfa 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
--# Linux kernel version: 2.6.24-rc7
--# Sun Jan 13 21:40:55 2008
-+# Linux kernel version: 2.6.24-rc8
-+# Tue Jan 22 11:47:25 2008
- #
- CONFIG_ARM=y
- CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-@@ -322,7 +322,7 @@ CONFIG_NET=y
- #
- # Networking options
- #
--CONFIG_PACKET=m
-+CONFIG_PACKET=y
- CONFIG_PACKET_MMAP=y
- CONFIG_UNIX=y
- CONFIG_XFRM=y
-@@ -595,20 +595,20 @@ CONFIG_NET_SCH_FIFO=y
- # CONFIG_NET_PKTGEN is not set
- # CONFIG_HAMRADIO is not set
- # CONFIG_IRDA is not set
--CONFIG_BT=m
--CONFIG_BT_L2CAP=m
--CONFIG_BT_SCO=m
--CONFIG_BT_RFCOMM=m
-+CONFIG_BT=y
-+CONFIG_BT_L2CAP=y
-+CONFIG_BT_SCO=y
-+CONFIG_BT_RFCOMM=y
- CONFIG_BT_RFCOMM_TTY=y
--CONFIG_BT_BNEP=m
-+CONFIG_BT_BNEP=y
- CONFIG_BT_BNEP_MC_FILTER=y
- CONFIG_BT_BNEP_PROTO_FILTER=y
--CONFIG_BT_HIDP=m
-+CONFIG_BT_HIDP=y
- #
- # Bluetooth device drivers
- #
--CONFIG_BT_HCIUSB=m
-+CONFIG_BT_HCIUSB=y
- CONFIG_BT_HCIUSB_SCO=y
- # CONFIG_BT_HCIBTSDIO is not set
- # CONFIG_BT_HCIUART is not set
-@@ -623,7 +623,7 @@ CONFIG_FIB_RULES=y
- # Wireless
- #
- # CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
-+CONFIG_WIRELESS_EXT=y
- # CONFIG_MAC80211 is not set
- # CONFIG_IEEE80211 is not set
- # CONFIG_RFKILL is not set
-@@ -737,6 +737,13 @@ CONFIG_MTD_NAND_S3C2410_HWECC=y
- #
- # CONFIG_MTD_UBI is not set
- # CONFIG_PARPORT is not set
-+CONFIG_PNP=y
-+CONFIG_PNP_DEBUG=y
-+
-+#
-+# Protocols
-+#
-+# CONFIG_PNPACPI is not set
- CONFIG_BLK_DEV=y
- # CONFIG_BLK_DEV_COW_COMMON is not set
- CONFIG_BLK_DEV_LOOP=m
-@@ -814,9 +821,10 @@ CONFIG_NETDEVICES=y
- # CONFIG_EQUALIZER is not set
- CONFIG_TUN=m
- # CONFIG_VETH is not set
-+# CONFIG_NET_SB1000 is not set
- # CONFIG_PHYLIB is not set
- CONFIG_NET_ETHERNET=y
--CONFIG_MII=m
-+CONFIG_MII=y
- # CONFIG_AX88796 is not set
- # CONFIG_SMC91X is not set
- # CONFIG_DM9000 is not set
-@@ -843,7 +851,7 @@ CONFIG_USB_CATC=m
- CONFIG_USB_KAWETH=m
- CONFIG_USB_PEGASUS=m
- CONFIG_USB_RTL8150=m
--CONFIG_USB_USBNET=m
-+CONFIG_USB_USBNET=y
- CONFIG_USB_NET_AX8817X=m
- CONFIG_USB_NET_CDCETHER=m
- CONFIG_USB_NET_DM9601=m
-@@ -1436,6 +1444,7 @@ CONFIG_USB_IOWARRIOR=m
- CONFIG_USB_GADGET=y
- # CONFIG_USB_GADGET_DEBUG is not set
- # CONFIG_USB_GADGET_DEBUG_FILES is not set
-+# CONFIG_USB_GADGET_DEBUG_FS is not set
- CONFIG_USB_GADGET_SELECTED=y
- # CONFIG_USB_GADGET_AMD5536UDC is not set
- # CONFIG_USB_GADGET_ATMEL_USBA is not set
-@@ -1459,6 +1468,14 @@ CONFIG_USB_ETH_RNDIS=y
- # CONFIG_USB_FILE_STORAGE is not set
- # CONFIG_USB_G_SERIAL is not set
- # CONFIG_USB_MIDI_GADGET is not set
-+
-+#
-+# SDIO support
-+#
-+CONFIG_SDIO=y
-+CONFIG_SDIO_S3C24XX=y
-+CONFIG_SDIO_S3C24XX_DMA=y
-+CONFIG_SDIO_AR6000_WLAN=y
- CONFIG_MMC=y
- # CONFIG_MMC_DEBUG is not set
- # CONFIG_MMC_UNSAFE_RESUME is not set
-@@ -1475,7 +1492,6 @@ CONFIG_MMC_BLOCK=y
- #
- # CONFIG_MMC_SPI is not set
- # CONFIG_MMC_S3C is not set
--CONFIG_MMC_GLAMO=y
- CONFIG_NEW_LEDS=y
- CONFIG_LEDS_CLASS=y
-@@ -1554,6 +1570,7 @@ CONFIG_EXT3_FS=y
- # CONFIG_EXT3_FS_XATTR is not set
- # CONFIG_EXT4DEV_FS is not set
- CONFIG_JBD=y
-+# CONFIG_JBD_DEBUG is not set
- # CONFIG_REISERFS_FS is not set
- # CONFIG_JFS_FS is not set
- # CONFIG_FS_POSIX_ACL is not set
-@@ -1696,7 +1713,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
- CONFIG_ENABLE_MUST_CHECK=y
- CONFIG_MAGIC_SYSRQ=y
- # CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
-+CONFIG_DEBUG_FS=y
- # CONFIG_HEADERS_CHECK is not set
- CONFIG_DEBUG_KERNEL=y
- CONFIG_DEBUG_SHIRQ=y
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1081-local-config-defconfig-motion-sensor-gpio.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1081-local-config-defconfig-motion-sensor-gpio.patch.patch
deleted file mode 100644 (file)
index e47d4d7..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From b0eec76126c38ed02f0af80ebf65801d46e6e261 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@openmoko.com>
-Date: Sun, 13 Apr 2008 07:25:46 +0100
-Subject: [PATCH] local-config-defconfig-motion-sensor-gpio.patch
-
----
- defconfig-2.6.24 |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index 140fbfa..8b428b1 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.24-rc8
--# Tue Jan 22 11:47:25 2008
-+# Wed Jan 23 10:00:57 2008
- #
- CONFIG_ARM=y
- CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-@@ -1041,8 +1041,8 @@ CONFIG_SPI_MASTER=y
- # SPI Master Controller Drivers
- #
- CONFIG_SPI_BITBANG=y
--CONFIG_SPI_S3C24XX=y
--# CONFIG_SPI_S3C24XX_GPIO is not set
-+# CONFIG_SPI_S3C24XX is not set
-+CONFIG_SPI_S3C24XX_GPIO=y
- #
- # SPI Protocol Masters
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1082-local-config-pmu.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1082-local-config-pmu.patch.patch
deleted file mode 100644 (file)
index dcf1bd9..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5c6c019690dac8b5f8d76732c8fd387ff7a27f2d Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Sun, 13 Apr 2008 07:25:46 +0100
-Subject: [PATCH] local-config-pmu.patch
-
----
- defconfig-2.6.24 |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index 8b428b1..270c4f9 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -308,7 +308,7 @@ CONFIG_BINFMT_ELF=y
- CONFIG_PM=y
- CONFIG_PM_LEGACY=y
- CONFIG_PM_DEBUG=y
--# CONFIG_PM_VERBOSE is not set
-+CONFIG_PM_VERBOSE=y
- CONFIG_PM_SLEEP=y
- CONFIG_SUSPEND_UP_POSSIBLE=y
- CONFIG_SUSPEND=y
-@@ -1056,6 +1056,8 @@ CONFIG_POWER_SUPPLY_DEBUG=y
- CONFIG_PDA_POWER=y
- CONFIG_APM_POWER=y
- # CONFIG_BATTERY_DS2760 is not set
-+CONFIG_BATTERY_BQ27000_HDQ=y
-+CONFIG_GTA02_HDQ=y
- CONFIG_HWMON=y
- # CONFIG_HWMON_VID is not set
- # CONFIG_SENSORS_AD7418 is not set
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1083-local-config-ext2.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1083-local-config-ext2.patch.patch
deleted file mode 100644 (file)
index c1dbdc8..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9f90b78f834e3d18520c03af4644ff239a2e891b Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Sun, 13 Apr 2008 07:25:46 +0100
-Subject: [PATCH] local-config-ext2.patch
-
----
- defconfig-2.6.24 |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index 270c4f9..833e15e 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -1565,7 +1565,7 @@ CONFIG_RTC_DRV_S3C=m
- #
- # File systems
- #
--CONFIG_EXT2_FS=m
-+CONFIG_EXT2_FS=y
- # CONFIG_EXT2_FS_XATTR is not set
- # CONFIG_EXT2_FS_XIP is not set
- CONFIG_EXT3_FS=y
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1084-contrib-fix-chgstate-array-bloat.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1084-contrib-fix-chgstate-array-bloat.patch.patch
deleted file mode 100644 (file)
index aa51b4e..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-From 293025ae0e971da194ecb58be304835f246b6c9e Mon Sep 17 00:00:00 2001
-From: Mike Montour <mail@mmontour.net>
-Date: Sun, 13 Apr 2008 07:25:47 +0100
-Subject: [PATCH] contrib-fix-chgstate-array-bloat.patch
-
---- linux-2.6.22/drivers/i2c/chips/pcf50606.c.orig     2008-01-17 22:30:16.000000000 -0800
-+++ linux-2.6.22/drivers/i2c/chips/pcf50606.c  2008-01-17 22:31:43.000000000 -0800
-@@ -71,12 +71,19 @@
-
- I2C_CLIENT_INSMOD_1(pcf50606);
-
--#define PCF50606_F_CHG_FAST   0x00000001      /* Charger Fast allowed */
--#define PCF50606_F_CHG_PRESENT        0x00000002      /* Charger present */
--#define PCF50606_F_CHG_FOK    0x00000004      /* Fast OK for battery */
--#define PCF50606_F_CHG_ERR    0x00000008      /* Charger Error */
--#define PCF50606_F_CHG_PROT   0x00000010      /* Charger Protection */
--#define PCF50606_F_CHG_READY  0x00000020      /* Charging completed */
-+#define PCF50606_B_CHG_FAST   0       /* Charger Fast allowed */
-+#define PCF50606_B_CHG_PRESENT        1       /* Charger present */
-+#define PCF50606_B_CHG_FOK    2       /* Fast OK for battery */
-+#define PCF50606_B_CHG_ERR    3       /* Charger Error */
-+#define PCF50606_B_CHG_PROT   4       /* Charger Protection */
-+#define PCF50606_B_CHG_READY  5       /* Charging completed */
-+
-+#define PCF50606_F_CHG_FAST   (1<<PCF50606_B_CHG_FAST)        /* Charger Fast allowed */
-+#define PCF50606_F_CHG_PRESENT        (1<<PCF50606_B_CHG_PRESENT)     /* Charger present */
-+#define PCF50606_F_CHG_FOK    (1<<PCF50606_B_CHG_FOK) /* Fast OK for battery */
-+#define PCF50606_F_CHG_ERR    (1<<PCF50606_B_CHG_ERR) /* Charger Error */
-+#define PCF50606_F_CHG_PROT   (1<<PCF50606_B_CHG_PROT)        /* Charger Protection */
-+#define PCF50606_F_CHG_READY  (1<<PCF50606_B_CHG_READY)       /* Charging completed */
- #define PCF50606_F_CHG_MASK   0x000000fc
-
- #define PCF50606_F_PWR_PRESSED        0x00000100
-@@ -1026,12 +1033,12 @@
- static DEVICE_ATTR(chgmode, S_IRUGO | S_IWUSR, show_chgmode, set_chgmode);
-
- static const char *chgstate_names[] = {
--      [PCF50606_F_CHG_FAST]                   = "fast_enabled",
--      [PCF50606_F_CHG_PRESENT]                = "present",
--      [PCF50606_F_CHG_FOK]                    = "fast_ok",
--      [PCF50606_F_CHG_ERR]                    = "error",
--      [PCF50606_F_CHG_PROT]                   = "protection",
--      [PCF50606_F_CHG_READY]                  = "ready",
-+      [PCF50606_B_CHG_FAST]                   = "fast_enabled",
-+      [PCF50606_B_CHG_PRESENT]                = "present",
-+      [PCF50606_B_CHG_FOK]                    = "fast_ok",
-+      [PCF50606_B_CHG_ERR]                    = "error",
-+      [PCF50606_B_CHG_PROT]                   = "protection",
-+      [PCF50606_B_CHG_READY]                  = "ready",
- };
-
- static ssize_t show_chgstate(struct device *dev, struct device_attribute *attr,
----
- drivers/i2c/chips/pcf50606.c |   31 +++++++++++++++++++------------
- 1 files changed, 19 insertions(+), 12 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
-index a1c92d3..aaec6e8 100644
---- a/drivers/i2c/chips/pcf50606.c
-+++ b/drivers/i2c/chips/pcf50606.c
-@@ -72,12 +72,19 @@ static unsigned short normal_i2c[] = { 0x08, I2C_CLIENT_END };
- I2C_CLIENT_INSMOD_1(pcf50606);
--#define PCF50606_F_CHG_FAST   0x00000001      /* Charger Fast allowed */
--#define PCF50606_F_CHG_PRESENT        0x00000002      /* Charger present */
--#define PCF50606_F_CHG_FOK    0x00000004      /* Fast OK for battery */
--#define PCF50606_F_CHG_ERR    0x00000008      /* Charger Error */
--#define PCF50606_F_CHG_PROT   0x00000010      /* Charger Protection */
--#define PCF50606_F_CHG_READY  0x00000020      /* Charging completed */
-+#define PCF50606_B_CHG_FAST   0       /* Charger Fast allowed */
-+#define PCF50606_B_CHG_PRESENT        1       /* Charger present */
-+#define PCF50606_B_CHG_FOK    2       /* Fast OK for battery */
-+#define PCF50606_B_CHG_ERR    3       /* Charger Error */
-+#define PCF50606_B_CHG_PROT   4       /* Charger Protection */
-+#define PCF50606_B_CHG_READY  5       /* Charging completed */
-+
-+#define PCF50606_F_CHG_FAST   (1<<PCF50606_B_CHG_FAST)        /* Charger Fast allowed */
-+#define PCF50606_F_CHG_PRESENT        (1<<PCF50606_B_CHG_PRESENT)     /* Charger present */
-+#define PCF50606_F_CHG_FOK    (1<<PCF50606_B_CHG_FOK) /* Fast OK for battery */
-+#define PCF50606_F_CHG_ERR    (1<<PCF50606_B_CHG_ERR) /* Charger Error */
-+#define PCF50606_F_CHG_PROT   (1<<PCF50606_B_CHG_PROT)        /* Charger Protection */
-+#define PCF50606_F_CHG_READY  (1<<PCF50606_B_CHG_READY)       /* Charging completed */
- #define PCF50606_F_CHG_MASK   0x000000fc
- #define PCF50606_F_PWR_PRESSED        0x00000100
-@@ -1087,12 +1094,12 @@ static ssize_t set_chgmode(struct device *dev, struct device_attribute *attr,
- static DEVICE_ATTR(chgmode, S_IRUGO | S_IWUSR, show_chgmode, set_chgmode);
- static const char *chgstate_names[] = {
--      [PCF50606_F_CHG_FAST]                   = "fast_enabled",
--      [PCF50606_F_CHG_PRESENT]                = "present",
--      [PCF50606_F_CHG_FOK]                    = "fast_ok",
--      [PCF50606_F_CHG_ERR]                    = "error",
--      [PCF50606_F_CHG_PROT]                   = "protection",
--      [PCF50606_F_CHG_READY]                  = "ready",
-+      [PCF50606_B_CHG_FAST]                   = "fast_enabled",
-+      [PCF50606_B_CHG_PRESENT]                = "present",
-+      [PCF50606_B_CHG_FOK]                    = "fast_ok",
-+      [PCF50606_B_CHG_ERR]                    = "error",
-+      [PCF50606_B_CHG_PROT]                   = "protection",
-+      [PCF50606_B_CHG_READY]                  = "ready",
- };
- static ssize_t show_chgstate(struct device *dev, struct device_attribute *attr,
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1085-bugfix-deglitch-gpio-output-enable.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1085-bugfix-deglitch-gpio-output-enable.patch.patch
deleted file mode 100644 (file)
index 75846bf..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-From e05285e4b6a3fa1134d40e91c5a345392e7efba0 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@openmoko.com>
-Date: Sun, 13 Apr 2008 07:25:47 +0100
-Subject: [PATCH] bugfix-deglitch-gpio-output-enable.patch
-
----
- arch/arm/mach-s3c2440/mach-gta02.c |   10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 3816ea5..e32294b 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1258,9 +1258,9 @@ static void __init gta02_machine_init(void)
-               s3c2410_gpio_setpin(GTA02_CHIP_PWD, 0);
-               break;
-       default:
--              s3c2410_gpio_cfgpin(GTA02_GPIO_nWLAN_RESET, S3C2410_GPIO_OUTPUT);
-               /* Chip is in reset state */
-               s3c2410_gpio_setpin(GTA02_GPIO_nWLAN_RESET, 0);
-+              s3c2410_gpio_cfgpin(GTA02_GPIO_nWLAN_RESET, S3C2410_GPIO_OUTPUT);
-               mdelay(100);
-               /* Power is up */
-               s3c2410_gpio_setpin(GTA02_CHIP_PWD, 0);
-@@ -1300,8 +1300,14 @@ static void __init gta02_machine_init(void)
-       s3c2410_pm_init();
-       /* Set LCD_RESET / XRES to high */
--      s3c2410_gpio_cfgpin(GTA01_GPIO_LCD_RESET, S3C2410_GPIO_OUTPUT);
-       s3c2410_gpio_setpin(GTA01_GPIO_LCD_RESET, 1);
-+      s3c2410_gpio_cfgpin(GTA01_GPIO_LCD_RESET, S3C2410_GPIO_OUTPUT);
-+
-+      s3c2410_gpio_setpin(S3C2410_GPD12, 1);
-+      s3c2410_gpio_cfgpin(S3C2410_GPD12, S3C2410_GPIO_OUTPUT);
-+
-+      s3c2410_gpio_setpin(S3C2410_GPD13, 1);
-+      s3c2410_gpio_cfgpin(S3C2410_GPD13, S3C2410_GPIO_OUTPUT);
-       /* Make sure the modem can wake us up */
-       set_irq_type(GTA02_IRQ_MODEM, IRQT_RISING);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1086-clean-snip-gpio-reinit.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1086-clean-snip-gpio-reinit.patch.patch
deleted file mode 100644 (file)
index 6c6fb03..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-From 41b2c45d068da0467272ca843e05a13f0e262be6 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@openmoko.com>
-Date: Sun, 13 Apr 2008 07:25:47 +0100
-Subject: [PATCH] clean-snip-gpio-reinit.patch
- These are initialized already
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |    6 ------
- 1 files changed, 0 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index e32294b..f2b1b66 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1303,12 +1303,6 @@ static void __init gta02_machine_init(void)
-       s3c2410_gpio_setpin(GTA01_GPIO_LCD_RESET, 1);
-       s3c2410_gpio_cfgpin(GTA01_GPIO_LCD_RESET, S3C2410_GPIO_OUTPUT);
--      s3c2410_gpio_setpin(S3C2410_GPD12, 1);
--      s3c2410_gpio_cfgpin(S3C2410_GPD12, S3C2410_GPIO_OUTPUT);
--
--      s3c2410_gpio_setpin(S3C2410_GPD13, 1);
--      s3c2410_gpio_cfgpin(S3C2410_GPD13, S3C2410_GPIO_OUTPUT);
--
-       /* Make sure the modem can wake us up */
-       set_irq_type(GTA02_IRQ_MODEM, IRQT_RISING);
-       rc = request_irq(GTA02_IRQ_MODEM, gta02_modem_irq, IRQF_DISABLED,
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1087-introduce-fiq-hdq.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1087-introduce-fiq-hdq.patch.patch
deleted file mode 100644 (file)
index ada6b7c..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-From ab6e925546e3d3361ab59c2b090eccf0cb411c7b Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 13 Apr 2008 07:25:48 +0100
-Subject: [PATCH] introduce-fiq-hdq.patch
-
-This adds a platform driver and device which performs HDQ
-battery protocol using a single GPIO pin which is set
-through platform data.
-
-HDQ has some hard latency requirements which can't
-be met if interrupts are enabled, so normally using
-a GPIO for this will require blocking out all other
-interrupts and processes for several milliseconds
-per register being read or written.
-
-This HDQ protocol engine is a FSM implemented inside the
-the FIQ ISR and regulated by timer interrupts happening
-at 20us intervals.  The path through the FSM on any
-"clock" is very short and should be over with in ~
-1us.  Because FIQ has guaranteed latencies of <1us,
-it means we can service the HDQ protocol without
-blocking interrupts or any other process other than
-the caller that is waiting for the result. It's pretty
-cool performance from 1 GPIO ;-)
-
-Due to it being hard to do locking from the FIQ ISR
-the code simply sleeps 10ms or whatever the scheduler
-gives it and checks if the transfer took place yet.
-
-This platform driver doesn't have any knowledge about
-the device it is talking to, it just knows it is a
-HDQ device.  It exports three functions for read, write
-and confirming HDQ is initialized.  It also exports two
-/sys nodes that are usable by humans, one dumps the whole
-127 register HDQ register space
-
-# cat /sys/devices/platform/gta02-hdq.0/hdq/dump
-00 44 55 00 00 00 ba 04 a2 0d 50 00 00 00 00 00
-00 00 9a 1a 00 00 ff ff ff ff 29 00 00 00 80 2b
-00 00 00 00 00 00 ff ff 00 00 00 00 00 32 af 06
-a0 d8 37 4e 00 00 00 00 00 00 00 34 2e 03 b4 e7
-00 00 06 00 41 00 4c 02 00 00 00 00 00 00 00 00
-83 02 00 00 94 09 59 b9 a5 0d 7f 21 00 00 7a ff
-df ff 62 ff a7 04 2e 05 00 00 00 01 00 07 00 00
-2a 78 36 67 7b b5 1b a9 af 19 38 89 63 57 42 7c
-#
-
-and the other allows to set one register
-
-# echo 2 170 > /sys/devices/platform/gta02-hdq.0/hdq/write
-
-writes 0xAA into register 2.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- defconfig-2.6.24      |    1 +
- drivers/power/Kconfig |    8 ++++++++
- 2 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index 833e15e..6d750a5 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -1825,3 +1825,4 @@ CONFIG_TEXTSEARCH_FSM=m
- CONFIG_PLIST=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_DMA=y
-+CONFIG_GTA02_HDQ=y
-diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
-index feb8b0a..5ace872 100644
---- a/drivers/power/Kconfig
-+++ b/drivers/power/Kconfig
-@@ -63,3 +63,11 @@ config GTA02_HDQ
-         at least BATTERY_BQ27000_HDQ as well
- endif # POWER_SUPPLY
-+
-+config GTA02_HDQ
-+      tristate "Neo Freerunner HDQ"
-+      depends on MACH_NEO1973_GTA02 && FIQ && S3C2440_C_FIQ
-+      help
-+        Say Y to enable support for communicating with an HDQ battery
-+        on the Neo Freerunner.  You probably want to select
-+        at least BATTERY_BQ27000_HDQ as well
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1088-introduce-bq27000-battery-driver.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1088-introduce-bq27000-battery-driver.patch.patch
deleted file mode 100644 (file)
index a7ff641..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-From 7b70de51df68659d3789481cf2446f8bc01e5387 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 13 Apr 2008 07:25:48 +0100
-Subject: [PATCH] introduce-bq27000-battery-driver.patch
-
-This is a driver for the bq27000 found in the Highcell A5
-battery, and the platform device stuff for it for GTA02.  It
-is a Power Supply Class battery device.
-
-The driver doesn't contain an HDQ engine but accepts pointers
-from the platform data to the HDQ action routines; our
-platform data plugs it into the FIQ HDQ engine stuff.
-
-The Power Supply class exposes the battery down /sys so you
-can find out battery status by doing the equivalent of this
-bash command
-
-for i in capacity charge_full current_now present status technology temp time_to_empty_now time_to_full_now type voltage_now ; do echo -n "$i    " ; cat /sys/devices/platform/bq27000-battery.0/power_supply/bat/$i ; done
-
-Here is the kind of result you get from a battery discharging
-
-capacity    0
-charge_full    1215585
-current_now    183375
-present    1
-status    Discharging
-technology    Li-ion
-temp    276
-time_to_empty_now    0
-time_to_full_now    3932100
-type    Battery
-voltage_now    2761000
-
-Note that temp is in 1/10 degrees C, other values are in uV,
-uA, uW.  The time_to_* reported are bogus, but that is what
-the battery actually reports.
-
-We can make more mappings to entries in power_supply class
-but this is enough to get started with.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- defconfig-2.6.24      |    1 +
- drivers/power/Kconfig |    7 -------
- 2 files changed, 1 insertions(+), 7 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index 6d750a5..9467f4b 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -1826,3 +1826,4 @@ CONFIG_PLIST=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_DMA=y
- CONFIG_GTA02_HDQ=y
-+CONFIG_BATTERY_BQ27000_HDQ=y
-diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
-index 5ace872..8c50ecb 100644
---- a/drivers/power/Kconfig
-+++ b/drivers/power/Kconfig
-@@ -64,10 +64,3 @@ config GTA02_HDQ
- endif # POWER_SUPPLY
--config GTA02_HDQ
--      tristate "Neo Freerunner HDQ"
--      depends on MACH_NEO1973_GTA02 && FIQ && S3C2440_C_FIQ
--      help
--        Say Y to enable support for communicating with an HDQ battery
--        on the Neo Freerunner.  You probably want to select
--        at least BATTERY_BQ27000_HDQ as well
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1089-debug-suspend-dump-gpio-states-add-GPA.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1089-debug-suspend-dump-gpio-states-add-GPA.patch.patch
deleted file mode 100644 (file)
index 276fa25..0000000
+++ /dev/null
@@ -1,451 +0,0 @@
-From 475826b7d7ef66e80b64d97ea9e8aca56d97e313 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 13 Apr 2008 07:25:49 +0100
-Subject: [PATCH] debug-suspend-dump-gpio-states-add-GPA.patch
-
-Add support for GPA[] GPIO bus since we have some NCs
-but they seem to output-only IO cells so no matter
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/plat-s3c24xx/gpio.c |  420 ++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 420 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/gpio.c b/arch/arm/plat-s3c24xx/gpio.c
-index ec3a09c..7cab212 100644
---- a/arch/arm/plat-s3c24xx/gpio.c
-+++ b/arch/arm/plat-s3c24xx/gpio.c
-@@ -32,6 +32,7 @@
- #include <asm/io.h>
- #include <asm/arch/regs-gpio.h>
-+#include <asm/arch/regs-gpioj.h>
- void s3c2410_gpio_cfgpin(unsigned int pin, unsigned int function)
- {
-@@ -186,3 +187,422 @@ int s3c2410_gpio_getirq(unsigned int pin)
- }
- EXPORT_SYMBOL(s3c2410_gpio_getirq);
-+
-+static void pretty_dump(u32 cfg, u32 state, u32 pull,
-+                      const char ** function_names_2,
-+                      const char ** function_names_3,
-+                      const char * prefix,
-+                      int count)
-+{
-+      int n;
-+      const char *tag_type = NULL,
-+                 *tag_state = NULL,
-+                 *tag_pulldown = NULL,
-+                 * level0 = "0",
-+                 * level1 = "1";
-+
-+      for (n = 0; n < count; n++) {
-+              switch ((cfg >> (2 * n)) & 3) {
-+              case 0:
-+                      tag_type = "input      ";
-+                      break;
-+              case 1:
-+                      tag_type = "OUTPUT     ";
-+                      break;
-+              case 2:
-+                      if (function_names_2) {
-+                              if (function_names_2[n])
-+                                      tag_type = function_names_2[n];
-+                              else
-+                                      tag_type = "*** ILLEGAL CFG (2) *** ";
-+                      } else
-+                              tag_type = "(function) ";
-+                      break;
-+              default:
-+                      if (function_names_3) {
-+                              if (function_names_3[n])
-+                                      tag_type = function_names_3[n];
-+                              else
-+                                      tag_type = "*** ILLEGAL CFG (3) *** ";
-+                      } else
-+                              tag_type = "(function) ";
-+                      break;
-+              }
-+              if ((state >> n) & 1)
-+                      tag_state = level1;
-+              else
-+                      tag_state = level0;
-+
-+              if (((pull >> n) & 1))
-+                      tag_pulldown = "";
-+              else
-+                      tag_pulldown = "(pulldown)";
-+
-+              printk(KERN_INFO"%s%02d: %s %s %s\n", prefix, n, tag_type,
-+                                                    tag_state, tag_pulldown);
-+      }
-+      printk(KERN_INFO"\n");
-+}
-+
-+static void pretty_dump_a(u32 cfg, u32 state,
-+                        const char ** function_names,
-+                        const char * prefix,
-+                        int count)
-+{
-+      int n;
-+      const char *tag_type = NULL,
-+                 *tag_state = NULL,
-+                 * level0 = "0",
-+                 * level1 = "1";
-+
-+      for (n = 0; n < count; n++) {
-+              switch ((cfg >> n) & 1) {
-+              case 0:
-+                      tag_type = "OUTPUT     ";
-+                      break;
-+              default:
-+                      if (function_names) {
-+                              if (function_names[n])
-+                                      tag_type = function_names[n];
-+                              else
-+                                      tag_type = "*** ILLEGAL CFG *** ";
-+                      } else
-+                              tag_type = "(function) ";
-+                      break;
-+              }
-+              if ((state >> n) & 1)
-+                      tag_state = level1;
-+              else
-+                      tag_state = level0;
-+
-+              printk(KERN_INFO"%s%02d: %s %s\n", prefix, n, tag_type,
-+                                                 tag_state);
-+      }
-+      printk(KERN_INFO"\n");
-+}
-+
-+static const char * funcs_a[] = {
-+      "ADDR0      ",
-+      "ADDR16     ",
-+      "ADDR17     ",
-+      "ADDR18     ",
-+      "ADDR19     ",
-+      "ADDR20     ",
-+      "ADDR21     ",
-+      "ADDR22     ",
-+      "ADDR23     ",
-+      "ADDR24     ",
-+      "ADDR25     ",
-+      "ADDR26     ",
-+      "nGCS[1]    ",
-+      "nGCS[2]    ",
-+      "nGCS[3]    ",
-+      "nGCS[4]    ",
-+      "nGCS[5]    ",
-+      "CLE        ",
-+      "ALE        ",
-+      "nFWE       ",
-+      "nFRE       ",
-+      "nRSTOUT    ",
-+      "nFCE       ",
-+      NULL,
-+      NULL
-+};
-+
-+
-+static const char * funcs_b2[] = {
-+      "TOUT0      ",
-+      "TOUT1      ",
-+      "TOUT2      ",
-+      "TOUT3      ",
-+      "TCLK[0]    ",
-+      "nXBACK     ",
-+      "nXBREQ     ",
-+      "nXDACK1    ",
-+      "nXDREQ1    ",
-+      "nXDACK0    ",
-+      "nXDREQ0    ",
-+};
-+static const char * funcs_b3[] = {
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+};
-+
-+static const char * funcs_c2[] = {
-+      "LEND       ",
-+      "VCLK       ",
-+      "VLINE      ",
-+      "VFRAME     ",
-+      "VM         ",
-+      "LCD_LPCOE  ",
-+      "LCD_LPCREV ",
-+      "LCD_LPCREVB",
-+      "VD[0]      ",
-+      "VD[1]      ",
-+      "VD[2]      ",
-+      "VD[3]      ",
-+      "VD[4]      ",
-+      "VD[5]      ",
-+      "VD[6]      ",
-+      "VD[7]      ",
-+};
-+static const char * funcs_c3[] = {
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      "I2SSDI     ",
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+};
-+
-+static const char * funcs_d2[] = {
-+      "VD[8]      ",
-+      "VD[9]      ",
-+      "VD[10]     ",
-+      "VD[11]     ",
-+      "VD[12]     ",
-+      "VD[13]     ",
-+      "VD[14]     ",
-+      "VD[15]     ",
-+      "VD[16]     ",
-+      "VD[17]     ",
-+      "VD[18]     ",
-+      "VD[19]     ",
-+      "VD[20]     ",
-+      "VD[21]     ",
-+      "VD[22]     ",
-+      "VD[23]     ",
-+};
-+static const char * funcs_d3[] = {
-+      "nSPICS1    ",
-+      "SPICLK1    ",
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      "SPIMISO1   ",
-+      "SPIMOSI1   ",
-+      "SPICLK1    ",
-+      NULL,
-+      NULL,
-+      NULL,
-+      "nSS1       ",
-+      "nSS0       ",
-+};
-+
-+static const char * funcs_e2[] = {
-+      "I2SLRCK    ",
-+      "I2SSCLK    ",
-+      "CDCLK      ",
-+      "I2SDI      ",
-+      "I2SDO      ",
-+      "SDCLK      ",
-+      "SDCMD      ",
-+      "SDDAT0     ",
-+      "SDDAT1     ",
-+      "SDDAT2     ",
-+      "SDDAT3     ",
-+      "SPIMISO0   ",
-+      "SPIMOSI0   ",
-+      "SPICLK0    ",
-+      "IICSCL     ",
-+      "IICSDA     ",
-+};
-+static const char * funcs_e3[] = {
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+};
-+
-+static const char * funcs_f2[] = {
-+      "EINT[0]    ",
-+      "EINT[1]    ",
-+      "EINT[2]    ",
-+      "EINT[3]    ",
-+      "EINT[4]    ",
-+      "EINT[5]    ",
-+      "EINT[6]    ",
-+      "EINT[7]    ",
-+};
-+static const char * funcs_f3[] = {
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+};
-+
-+
-+static const char * funcs_g2[] = {
-+      "EINT[8]    ",
-+      "EINT[9]    ",
-+      "EINT[10]   ",
-+      "EINT[11]   ",
-+      "EINT[12]   ",
-+      "EINT[13]   ",
-+      "EINT[14]   ",
-+      "EINT[15]   ",
-+      "EINT[16]   ",
-+      "EINT[17]   ",
-+      "EINT[18]   ",
-+      "EINT[19]   ",
-+      "EINT[20]   ",
-+      "EINT[21]   ",
-+      "EINT[22]   ",
-+      "EINT[23]   ",
-+};
-+static const char * funcs_g3[] = {
-+      NULL,
-+      NULL,
-+      "nSS0       ",
-+      "nSS1       ",
-+      "LCD_PWRDN  ",
-+      "SPIMISO1   ",
-+      "SPIMOSI1   ",
-+      "SPICLK1    ",
-+      NULL,
-+      "nRTS1      ",
-+      "nCTS1      ",
-+      "TCLK[1]    ",
-+      "nSPICS0    ",
-+      NULL,
-+      NULL,
-+      NULL,
-+};
-+
-+static const char * funcs_h2[] = {
-+      "nCTS0      ",
-+      "nRTS0      ",
-+      "TXD[0]     ",
-+      "RXD[0]     ",
-+      "TXD[1]     ",
-+      "RXD[1]     ",
-+      "TXD[2]     ",
-+      "RXD[2]     ",
-+      "UEXTCLK    ",
-+      "CLKOUT0    ",
-+      "CLKOUT1    ",
-+};
-+static const char * funcs_h3[] = {
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      "nRTS1      ",
-+      "nCTS1      ",
-+      NULL,
-+      "nSPICS0    ",
-+      NULL,
-+};
-+
-+static const char * funcs_j2[] = {
-+      "CAMDATA[0] ",
-+      "CAMDATA[1] ",
-+      "CAMDATA[2] ",
-+      "CAMDATA[3] ",
-+      "CAMDATA[4] ",
-+      "CAMDATA[5] ",
-+      "CAMDATA[6] ",
-+      "CAMDATA[7] ",
-+      "CAMPCLK    ",
-+      "CAMVSYNC   ",
-+      "CAMHREF    ",
-+      "CAMCLKOUT  ",
-+      "CAMRESET   ",
-+};
-+static const char * funcs_j3[] = {
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+};
-+
-+/* used to dump GPIO states at suspend */
-+void s3c24xx_dump_gpio_states(void)
-+{
-+      pretty_dump_a(__raw_readl(S3C2410_GPACON),
-+                    __raw_readl(S3C2410_GPADAT),
-+                    funcs_a, "GPA", 25);
-+      pretty_dump(__raw_readl(S3C2410_GPBCON),
-+                  __raw_readl(S3C2410_GPBDAT),
-+                  __raw_readl(S3C2410_GPBUP),
-+                  funcs_b2, funcs_b3, "GPB", 11);
-+      pretty_dump(__raw_readl(S3C2410_GPCCON),
-+                  __raw_readl(S3C2410_GPCDAT),
-+                  __raw_readl(S3C2410_GPCUP),
-+                  funcs_c2, funcs_c3, "GPC", 16);
-+      pretty_dump(__raw_readl(S3C2410_GPDCON),
-+                  __raw_readl(S3C2410_GPDDAT),
-+                  __raw_readl(S3C2410_GPDUP),
-+                  funcs_d2, funcs_d3, "GPD", 16);
-+      pretty_dump(__raw_readl(S3C2410_GPECON),
-+                  __raw_readl(S3C2410_GPEDAT),
-+                  __raw_readl(S3C2410_GPEUP),
-+                  funcs_e2, funcs_e3, "GPE", 16);
-+      pretty_dump(__raw_readl(S3C2410_GPFCON),
-+                  __raw_readl(S3C2410_GPFDAT),
-+                  __raw_readl(S3C2410_GPFUP),
-+                  funcs_f2, funcs_f3, "GPF", 8);
-+      pretty_dump(__raw_readl(S3C2410_GPGCON),
-+                  __raw_readl(S3C2410_GPGDAT),
-+                  __raw_readl(S3C2410_GPGUP),
-+                  funcs_g2, funcs_g3, "GPG", 16);
-+      pretty_dump(__raw_readl(S3C2410_GPHCON),
-+                  __raw_readl(S3C2410_GPHDAT),
-+                  __raw_readl(S3C2410_GPHUP),
-+                  funcs_h2, funcs_h3, "GPH", 11);
-+      pretty_dump(__raw_readl(S3C2440_GPJCON),
-+                  __raw_readl(S3C2440_GPJDAT),
-+                  __raw_readl(S3C2440_GPJUP),
-+                  funcs_j2, funcs_j3, "GPJ", 13);
-+
-+}
-+EXPORT_SYMBOL(s3c24xx_dump_gpio_states);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1090-fix-s3c2410_timer_setup-resume-BUG.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1090-fix-s3c2410_timer_setup-resume-BUG.patch.patch
deleted file mode 100644 (file)
index 6457bbf..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-From 6ce7c9b239314f4ee9f86164da8aaf5f78c0d1f1 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Sun, 13 Apr 2008 07:25:49 +0100
-Subject: [PATCH] fix-s3c2410_timer_setup-resume-BUG.patch
-
----
- arch/arm/plat-s3c24xx/time.c |   33 +++++++++++++++++++++++++++++++++
- drivers/i2c/chips/pcf50633.c |    9 +++++++--
- 2 files changed, 40 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/time.c b/arch/arm/plat-s3c24xx/time.c
-index c11d0dd..6989eea 100644
---- a/arch/arm/plat-s3c24xx/time.c
-+++ b/arch/arm/plat-s3c24xx/time.c
-@@ -42,6 +42,7 @@
- static unsigned long timer_startval;
- static unsigned long timer_usec_ticks;
-+static struct work_struct resume_work;
- #define TIMER_USEC_SHIFT 16
-@@ -201,9 +202,12 @@ static void s3c2410_timer_setup (void)
-               pclk = clk_get_rate(clk);
-+              printk("pclk = %d\n", pclk);
-+
-               /* configure clock tick */
-               timer_usec_ticks = timer_mask_usec_ticks(6, pclk);
-+              printk("timer_usec_ticks = %d\n", timer_usec_ticks);
-               tcfg1 &= ~S3C2410_TCFG1_MUX4_MASK;
-               tcfg1 |= S3C2410_TCFG1_MUX4_DIV2;
-@@ -212,6 +216,11 @@ static void s3c2410_timer_setup (void)
-               tcfg0 |= ((6 - 1) / 2) << S3C2410_TCFG_PRESCALER1_SHIFT;
-               tcnt = (pclk / 6) / HZ;
-+
-+              /* start the timer running */
-+              tcon |= S3C2410_TCON_T4START | S3C2410_TCON_T4RELOAD;
-+              tcon &= ~S3C2410_TCON_T4MANUALUPD;
-+              __raw_writel(tcon, S3C2410_TCON);
-       }
-       /* timers reload after counting zero, so reduce the count by 1 */
-@@ -247,10 +256,34 @@ static void s3c2410_timer_setup (void)
-       tcon |= S3C2410_TCON_T4START;
-       tcon &= ~S3C2410_TCON_T4MANUALUPD;
-       __raw_writel(tcon, S3C2410_TCON);
-+
-+      __raw_writel(__raw_readl(S3C2410_INTMSK) & (~(1UL << 14)),
-+                   S3C2410_INTMSK);
-+
-+}
-+
-+static void timer_resume_work(struct work_struct *work)
-+{
-+      s3c2410_timer_setup();
-+}
-+
-+/* ooh a nasty situation arises if we try to call s3c2410_timer_setup() from
-+ * the resume handler.  It is called in atomic context but the clock APIs
-+ * try to lock a mutex which may sleep.  We are in a bit of an unusual
-+ * situation because we don't have a tick source right now, but it should be
-+ * okay to try to schedule a work item... hopefully
-+ */
-+
-+static void s3c2410_timer_resume_atomic(void)
-+{
-+      int ret = schedule_work(&resume_work);
-+      if (!ret)
-+              printk(KERN_INFO"Failed to schedule_work tick ctr (%d)\n", ret);
- }
- static void __init s3c2410_timer_init (void)
- {
-+      INIT_WORK(&resume_work, timer_resume_work);
-       s3c2410_timer_setup();
-       setup_irq(IRQ_TIMER4, &s3c2410_timer_irq);
- }
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index e23c540..91b9ac3 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1926,9 +1926,11 @@ static int pcf50633_resume(struct device *dev)
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-       int i;
--      mutex_lock(&pcf->lock);
-+      printk(KERN_INFO"a\n");
-+      /* mutex_lock(&pcf->lock); */  /* resume in atomic context */
-       __reg_write(pcf, PCF50633_REG_LEDENA, 0x01);
-+      printk(KERN_INFO"b\n");
-       /* Resume all saved registers that don't "survive" standby state */
-       __reg_write(pcf, PCF50633_REG_INT1M, pcf->standby_regs.int1m);
-@@ -1936,6 +1938,7 @@ static int pcf50633_resume(struct device *dev)
-       __reg_write(pcf, PCF50633_REG_INT3M, pcf->standby_regs.int3m);
-       __reg_write(pcf, PCF50633_REG_INT4M, pcf->standby_regs.int4m);
-       __reg_write(pcf, PCF50633_REG_INT5M, pcf->standby_regs.int5m);
-+      printk(KERN_INFO"c\n");
-       __reg_write(pcf, PCF50633_REG_OOCTIM2, pcf->standby_regs.ooctim2);
-       __reg_write(pcf, PCF50633_REG_AUTOOUT, pcf->standby_regs.autoout);
-@@ -1949,14 +1952,16 @@ static int pcf50633_resume(struct device *dev)
-       __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.ledout);
-       __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.ledena);
-       __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.leddim);
-+      printk(KERN_INFO"d\n");
-       /* FIXME: one big read? */
-       for (i = 0; i < 7; i++) {
-               u_int8_t reg_out = PCF50633_REG_LDO1OUT + 2*i;
-               __reg_write(pcf, reg_out, pcf->standby_regs.ldo[i].out);
-               __reg_write(pcf, reg_out+1, pcf->standby_regs.ldo[i].ena);
-       }
-+      printk(KERN_INFO"e\n");
--      mutex_unlock(&pcf->lock);
-+      /* mutex_unlock(&pcf->lock); */ /* resume in atomic context */
-       pcf50633_irq(pcf->irq, pcf);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1091-config-add-alsa.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1091-config-add-alsa.patch.patch
deleted file mode 100644 (file)
index d3ceb8c..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-From f5cedbb7cda510235de0783fea77ad8e028d1002 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Sun, 13 Apr 2008 07:25:49 +0100
-Subject: [PATCH] config-add-alsa.patch
-
----
- defconfig-2.6.24 |   34 +++++++++++++++++-----------------
- 1 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index 9467f4b..e57081a 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
--# Linux kernel version: 2.6.24-rc8
--# Wed Jan 23 10:00:57 2008
-+# Linux kernel version: 2.6.24
-+# Fri Feb 22 22:38:48 2008
- #
- CONFIG_ARM=y
- CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-@@ -22,6 +22,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
- CONFIG_ZONE_DMA=y
-+CONFIG_FIQ=y
- CONFIG_VECTORS_BASE=0xffff0000
- CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-@@ -44,7 +45,7 @@ CONFIG_SYSVIPC_SYSCTL=y
- # CONFIG_PID_NS is not set
- # CONFIG_AUDIT is not set
- # CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
-+CONFIG_LOG_BUF_SHIFT=16
- # CONFIG_CGROUPS is not set
- CONFIG_FAIR_GROUP_SCHED=y
- CONFIG_FAIR_USER_SCHED=y
-@@ -195,6 +196,7 @@ CONFIG_MACH_NEO1973_GTA01=y
- # CONFIG_MACH_VSTMS is not set
- CONFIG_CPU_S3C2440=y
- CONFIG_S3C2440_DMA=y
-+CONFIG_S3C2440_C_FIQ=y
- #
- # S3C2440 Machines
-@@ -1221,15 +1223,15 @@ CONFIG_SOUND=y
- #
- # 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=y
-+CONFIG_SND_TIMER=y
-+CONFIG_SND_PCM=y
-+CONFIG_SND_HWDEP=y
-+CONFIG_SND_RAWMIDI=y
- # CONFIG_SND_SEQUENCER is not set
- CONFIG_SND_OSSEMUL=y
--CONFIG_SND_MIXER_OSS=m
--CONFIG_SND_PCM_OSS=m
-+CONFIG_SND_MIXER_OSS=y
-+CONFIG_SND_PCM_OSS=y
- CONFIG_SND_PCM_OSS_PLUGINS=y
- # CONFIG_SND_DYNAMIC_MINORS is not set
- CONFIG_SND_SUPPORT_OLD_API=y
-@@ -1262,11 +1264,11 @@ CONFIG_SND_USB_AUDIO=m
- #
- # System on Chip audio support
- #
--CONFIG_SND_SOC=m
--CONFIG_SND_S3C24XX_SOC=m
--CONFIG_SND_S3C24XX_SOC_I2S=m
--CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
--CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
-+CONFIG_SND_SOC=y
-+CONFIG_SND_S3C24XX_SOC=y
-+CONFIG_SND_S3C24XX_SOC_I2S=y
-+CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=y
-+CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=y
- #
- # SoC Audio support for SuperH
-@@ -1825,5 +1827,3 @@ CONFIG_TEXTSEARCH_FSM=m
- CONFIG_PLIST=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_DMA=y
--CONFIG_GTA02_HDQ=y
--CONFIG_BATTERY_BQ27000_HDQ=y
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1092-fix-glamo-mci-defeat-ops-during-suspend.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1092-fix-glamo-mci-defeat-ops-during-suspend.patch.patch
deleted file mode 100644 (file)
index 1713acc..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-From 99fbe6e31e09c9000668b50a87b3bbb834a145d0 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 13 Apr 2008 07:25:50 +0100
-Subject: [PATCH] fix-glamo-mci-defeat-ops-during-suspend.patch
-
-We need to be able to use the config option CONFIG_MMC_UNSAFE_RESUME that allows the rootfs
-to live on SD.  But when we use this, it tries to send a reset command to the SD card during
-suspend -- and unfortunately many things like Power have suspended by then.
-
-This patch again rejects IO on the MMC device during suspend of the MMC device, and it
-gives the result the rootfs on SD card works okay.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-mci.c |   14 ++++++++++++++
- drivers/mfd/glamo/glamo-mci.h |    2 ++
- 2 files changed, 16 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index f559e5e..bbbbe4d 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -406,6 +406,14 @@ static void glamo_mci_send_request(struct mmc_host *mmc)
-       u16 status;
-       int n;
-+      if (host->suspending) {
-+              cmd->error = -EIO;
-+              if (cmd->data)
-+                      cmd->data->error = -EIO;
-+              mmc_request_done(mmc, mrq);
-+              return;
-+      }
-+
-       host->ccnt++;
-       /*
-        * somehow 2.6.24 MCI manages to issue MMC_WRITE_BLOCK *without* the
-@@ -792,6 +800,9 @@ static int glamo_mci_remove(struct platform_device *pdev)
- static int glamo_mci_suspend(struct platform_device *dev, pm_message_t state)
- {
-       struct mmc_host *mmc = platform_get_drvdata(dev);
-+      struct glamo_mci_host   *host = mmc_priv(mmc);
-+
-+      host->suspending++;
-       return  mmc_suspend_host(mmc, state);
- }
-@@ -799,6 +810,9 @@ static int glamo_mci_suspend(struct platform_device *dev, pm_message_t state)
- static int glamo_mci_resume(struct platform_device *dev)
- {
-       struct mmc_host *mmc = platform_get_drvdata(dev);
-+      struct glamo_mci_host   *host = mmc_priv(mmc);
-+
-+      host->suspending--;
-       return mmc_resume_host(mmc);
- }
-diff --git a/drivers/mfd/glamo/glamo-mci.h b/drivers/mfd/glamo/glamo-mci.h
-index 40c3e24..55852e7 100644
---- a/drivers/mfd/glamo/glamo-mci.h
-+++ b/drivers/mfd/glamo/glamo-mci.h
-@@ -34,6 +34,8 @@ struct glamo_mci_host {
-       int                     dma;
-       int                     data_max_size;
-+      int                     suspending;
-+
-       int                     power_mode_current;
-       unsigned int            vdd_current;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1093-fix-lcm-reinit-post-resume.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1093-fix-lcm-reinit-post-resume.patch.patch
deleted file mode 100644 (file)
index 1f41acf..0000000
+++ /dev/null
@@ -1,286 +0,0 @@
-From bcf06c774c2c55fbd05b74ea01f1a2a6b3de2dc7 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Sun, 13 Apr 2008 07:25:50 +0100
-Subject: [PATCH] fix-lcm-reinit-post-resume.patch
-
----
- arch/arm/mach-s3c2440/mach-gta02.c |   12 +++++++++
- drivers/mfd/glamo/glamo-core.c     |   15 ++++++++++-
- drivers/mfd/glamo/glamo-spi-gpio.c |   38 ++++++++++++++++++++++++++--
- drivers/video/display/jbt6k74.c    |   47 ++++++++++++++++++++++++++++++++----
- include/linux/glamofb.h            |    1 +
- include/linux/jbt6k74.h            |    8 ++++++
- 6 files changed, 111 insertions(+), 10 deletions(-)
- create mode 100644 include/linux/jbt6k74.h
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index f2b1b66..750fd97 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -76,6 +76,7 @@
- #include <asm/plat-s3c24xx/cpu.h>
- #include <asm/plat-s3c24xx/pm.h>
- #include <asm/plat-s3c24xx/udc.h>
-+#include <linux/jbt6k74.h>
- #include <linux/glamofb.h>
-@@ -756,10 +757,21 @@ static struct s3c2410_ts_mach_info gta02_ts_cfg = {
- /* SPI: LCM control interface attached to Glamo3362 */
-+void gta02_jbt6k74_reset(int devidx, int level)
-+{
-+      glamo_lcm_reset(level);
-+}
-+
-+
-+const struct jbt6k74_platform_data jbt6k74_pdata = {
-+      .reset          = gta02_jbt6k74_reset,
-+};
-+
- static struct spi_board_info gta02_spi_board_info[] = {
-       {
-               .modalias       = "jbt6k74",
-               /* platform_data */
-+              .platform_data  = &jbt6k74_pdata,
-               /* controller_data */
-               /* irq */
-               .max_speed_hz   = 10 * 1000 * 1000,
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index ffa4945..2076e61 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -513,6 +513,17 @@ void glamo_engine_reset(struct glamo_core *glamo, enum glamo_engine engine)
- }
- EXPORT_SYMBOL_GPL(glamo_engine_reset);
-+void glamo_lcm_reset(int level)
-+{
-+      if (!glamo_handle)
-+              return;
-+
-+      glamo_gpio_setpin(glamo_handle, GLAMO_GPIO4, level);
-+      glamo_gpio_cfgpin(glamo_handle, GLAMO_GPIO4_OUTPUT);
-+
-+}
-+EXPORT_SYMBOL_GPL(glamo_lcm_reset);
-+
- enum glamo_pll {
-       GLAMO_PLL1,
-       GLAMO_PLL2,
-@@ -1142,8 +1153,8 @@ static int glamo_resume(struct platform_device *pdev)
- static struct platform_driver glamo_driver = {
-       .probe          = glamo_probe,
-       .remove         = glamo_remove,
--      .suspend        = glamo_suspend,
--      .resume         = glamo_resume,
-+      .suspend_late   = glamo_suspend,
-+      .resume_early   = glamo_resume,
-       .driver         = {
-               .name   = "glamo3362",
-               .owner  = THIS_MODULE,
-diff --git a/drivers/mfd/glamo/glamo-spi-gpio.c b/drivers/mfd/glamo/glamo-spi-gpio.c
-index 73926bd..eda7322 100644
---- a/drivers/mfd/glamo/glamo-spi-gpio.c
-+++ b/drivers/mfd/glamo/glamo-spi-gpio.c
-@@ -224,14 +224,46 @@ static int glamo_spigpio_remove(struct platform_device *pdev)
-       return 0;
- }
--#define glamo_spigpio_suspend NULL
-+/*#define glamo_spigpio_suspend NULL
- #define glamo_spigpio_resume NULL
-+*/
-+
-+
-+#ifdef CONFIG_PM
-+static int glamo_spigpio_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+      return 0;
-+}
-+
-+static int glamo_spigpio_resume(struct platform_device *pdev)
-+{
-+      struct glamo_spigpio *sp = platform_get_drvdata(pdev);
-+
-+      if (!sp)
-+              return 0;
-+
-+      /* set state of spi pins */
-+      glamo_gpio_setpin(sp->glamo, sp->info->pin_clk, 0);
-+      glamo_gpio_setpin(sp->glamo, sp->info->pin_mosi, 0);
-+      glamo_gpio_setpin(sp->glamo, sp->info->pin_cs, 1);
-+
-+      glamo_gpio_cfgpin(sp->glamo, sp->info->pin_clk);
-+      glamo_gpio_cfgpin(sp->glamo, sp->info->pin_mosi);
-+      glamo_gpio_cfgpin(sp->glamo, sp->info->pin_cs);
-+      if (sp->info->pin_miso)
-+              glamo_gpio_cfgpin(sp->glamo, sp->info->pin_miso);
-+
-+      return 0;
-+}
-+#endif
- static struct platform_driver glamo_spi_drv = {
-       .probe          = glamo_spigpio_probe,
-       .remove         = glamo_spigpio_remove,
--      .suspend        = glamo_spigpio_suspend,
--      .resume         = glamo_spigpio_resume,
-+#ifdef CONFIG_PM
-+      .suspend_late   = glamo_spigpio_suspend,
-+      .resume_early   = glamo_spigpio_resume,
-+#endif
-       .driver         = {
-               .name   = "glamo-spi-gpio",
-               .owner  = THIS_MODULE,
-diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c
-index d021d7e..d7e9442 100644
---- a/drivers/video/display/jbt6k74.c
-+++ b/drivers/video/display/jbt6k74.c
-@@ -27,6 +27,8 @@
- #include <linux/device.h>
- #include <linux/platform_device.h>
- #include <linux/delay.h>
-+#include <linux/workqueue.h>
-+#include <linux/jbt6k74.h>
- #include <linux/spi/spi.h>
-@@ -114,11 +116,15 @@ struct jbt_info {
-       struct mutex lock;              /* protects tx_buf and reg_cache */
-       u16 tx_buf[8];
-       u16 reg_cache[0xEE];
-+      struct work_struct work;
- };
- #define JBT_COMMAND   0x000
- #define JBT_DATA      0x100
-+static void jbt_resume_work(struct work_struct *work);
-+
-+
- static int jbt_reg_write_nodata(struct jbt_info *jbt, u8 reg)
- {
-       int rc;
-@@ -130,6 +136,9 @@ static int jbt_reg_write_nodata(struct jbt_info *jbt, u8 reg)
-                      1*sizeof(u16));
-       if (rc == 0)
-               jbt->reg_cache[reg] = 0;
-+      else
-+              printk(KERN_ERR"jbt_reg_write_nodata spi_write ret %d\n",
-+                     rc);
-       mutex_unlock(&jbt->lock);
-@@ -149,6 +158,8 @@ static int jbt_reg_write(struct jbt_info *jbt, u8 reg, u8 data)
-                      2*sizeof(u16));
-       if (rc == 0)
-               jbt->reg_cache[reg] = data;
-+      else
-+              printk(KERN_ERR"jbt_reg_write spi_write ret %d\n", rc);
-       mutex_unlock(&jbt->lock);
-@@ -169,6 +180,8 @@ static int jbt_reg_write16(struct jbt_info *jbt, u8 reg, u16 data)
-                      3*sizeof(u16));
-       if (rc == 0)
-               jbt->reg_cache[reg] = data;
-+      else
-+              printk(KERN_ERR"jbt_reg_write16 spi_write ret %d\n", rc);
-       mutex_unlock(&jbt->lock);
-@@ -563,6 +576,8 @@ static int __devinit jbt_probe(struct spi_device *spi)
-       if (!jbt)
-               return -ENOMEM;
-+      INIT_WORK(&jbt->work, jbt_resume_work);
-+
-       jbt->spi_dev = spi;
-       jbt->state = JBT_STATE_DEEP_STANDBY;
-       mutex_init(&jbt->lock);
-@@ -618,28 +633,50 @@ static int __devexit jbt_remove(struct spi_device *spi)
- static int jbt_suspend(struct spi_device *spi, pm_message_t state)
- {
-       struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-+      struct jbt6k74_platform_data *jbt6k74_pdata = spi->dev.platform_data;
-       /* Save mode for resume */
-       jbt->last_state = jbt->state;
-       jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);
-+      (jbt6k74_pdata->reset)(0, 0);
-+
-       return 0;
- }
--static int jbt_resume(struct spi_device *spi)
-+static void jbt_resume_work(struct work_struct *work)
- {
--      struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-+      struct jbt_info *jbt = container_of(work, struct jbt_info, work);
-+
-+      printk(KERN_INFO"jbt_resume_work waiting...\n");
-+      msleep(2000);
-+      printk(KERN_INFO"jbt_resume_work GO...\n");
--      jbt6k74_enter_state(jbt, jbt->last_state);
-+      jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);
-+      msleep(100);
-       switch (jbt->last_state) {
--      case JBT_STATE_NORMAL:
-       case JBT_STATE_QVGA_NORMAL:
--              jbt6k74_display_onoff(jbt, 1);
-+              jbt6k74_enter_state(jbt, JBT_STATE_QVGA_NORMAL);
-               break;
-       default:
-+              jbt6k74_enter_state(jbt, JBT_STATE_NORMAL);
-               break;
-       }
-+      jbt6k74_display_onoff(jbt, 1);
-+
-+      printk(KERN_INFO"jbt_resume_work done...\n");
-+}
-+
-+static int jbt_resume(struct spi_device *spi)
-+{
-+      struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-+      struct jbt6k74_platform_data *jbt6k74_pdata = spi->dev.platform_data;
-+
-+      (jbt6k74_pdata->reset)(0, 1);
-+
-+      if (!schedule_work(&jbt->work))
-+              dev_err(&spi->dev, "Unable to schedule LCM wakeup work\n");
-       return 0;
- }
-diff --git a/include/linux/glamofb.h b/include/linux/glamofb.h
-index 24742a2..75eefef 100644
---- a/include/linux/glamofb.h
-+++ b/include/linux/glamofb.h
-@@ -35,5 +35,6 @@ struct glamofb_platform_data {
- void glamofb_cmd_mode(struct glamofb_handle *gfb, int on);
- int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val);
-+void glamo_lcm_reset(int level);
- #endif
-diff --git a/include/linux/jbt6k74.h b/include/linux/jbt6k74.h
-new file mode 100644
-index 0000000..3fbe178
---- /dev/null
-+++ b/include/linux/jbt6k74.h
-@@ -0,0 +1,8 @@
-+#ifndef __JBT6K74_H__
-+#define __JBT6K74_H__
-+
-+struct jbt6k74_platform_data {
-+      void (* reset)(int devindex, int level);
-+};
-+
-+#endif
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1094-fix-glamo-mci-fake-reset-opcode-in-suspend.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1094-fix-glamo-mci-fake-reset-opcode-in-suspend.patch.patch
deleted file mode 100644 (file)
index 1bb6668..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-From a8ee32310d3ed6fe66e639314ccae72d2fbbc886 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Sun, 13 Apr 2008 07:25:50 +0100
-Subject: [PATCH] fix-glamo-mci-fake-reset-opcode-in-suspend.patch
-
----
- arch/arm/mach-s3c2440/mach-gta02.c |    4 ++--
- drivers/mfd/glamo/glamo-core.c     |   16 +++++++++-------
- drivers/mfd/glamo/glamo-mci.c      |   29 +++++++++++++++++++++--------
- 3 files changed, 32 insertions(+), 17 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 750fd97..f18c8fd 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1281,6 +1281,8 @@ static void __init gta02_machine_init(void)
-               s3c2410_gpio_setpin(GTA02_GPIO_nWLAN_RESET, 1);
-               break;
-       }
-+      mangle_glamo_res_by_system_rev();
-+      platform_device_register(&gta02_glamo_dev);
-       platform_device_register(&s3c_device_spi_acc);
-       platform_device_register(&gta01_button_dev);
-@@ -1291,8 +1293,6 @@ static void __init gta02_machine_init(void)
-       platform_device_register(&gta01_led_dev);
-       platform_device_register(&gta02_led_dev);
--      mangle_glamo_res_by_system_rev();
--      platform_device_register(&gta02_glamo_dev);
-       platform_device_register(&gta02_sdio_dev);
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index 2076e61..4d8e47f 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -822,6 +822,8 @@ static void glamo_power(struct glamo_core *glamo,
- {
-       spin_lock(&glamo->lock);
-+      dev_dbg(&glamo->pdev->dev, "***** glamo_power -> %d\n", new_state);
-+
-       switch (new_state) {
-       case GLAMO_POWER_ON:
-               /* power up PLL1 and PLL2 */
-@@ -1026,13 +1028,6 @@ static int __init glamo_probe(struct platform_device *pdev)
-       glamo_mci_def_pdata.glamo_irq_is_wired =
-                                       glamo->pdata->glamo_irq_is_wired;
--      glamo_mmc_dev.dev.parent = &pdev->dev;
--      /* we need it later to give to the engine enable and disable */
--      glamo_mci_def_pdata.pglamo = glamo;
--      mangle_mem_resources(glamo_mmc_dev.resource,
--                           glamo_mmc_dev.num_resources, glamo->mem);
--      platform_device_register(&glamo_mmc_dev);
--
-       glamo_2d_dev.dev.parent = &pdev->dev;
-       mangle_mem_resources(glamo_2d_dev.resource,
-                            glamo_2d_dev.num_resources, glamo->mem);
-@@ -1065,6 +1060,13 @@ static int __init glamo_probe(struct platform_device *pdev)
-       glamo_spigpio_dev.dev.platform_data = glamo->pdata->spigpio_info;
-       platform_device_register(&glamo_spigpio_dev);
-+      glamo_mmc_dev.dev.parent = &pdev->dev;
-+      /* we need it later to give to the engine enable and disable */
-+      glamo_mci_def_pdata.pglamo = glamo;
-+      mangle_mem_resources(glamo_mmc_dev.resource,
-+                           glamo_mmc_dev.num_resources, glamo->mem);
-+      platform_device_register(&glamo_mmc_dev);
-+
-       /* only request the generic, hostbus and memory controller MMIO */
-       glamo->mem = request_mem_region(glamo->mem->start,
-                                       GLAMO_REGOFS_VIDCAP, "glamo-core");
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index bbbbe4d..d8847c5 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -405,11 +405,11 @@ static void glamo_mci_send_request(struct mmc_host *mmc)
-       u16 * reg_resp = (u16 *)(host->base + GLAMO_REG_MMC_CMD_RSP1);
-       u16 status;
-       int n;
-+      int timeout = 100000000;
-       if (host->suspending) {
--              cmd->error = -EIO;
--              if (cmd->data)
--                      cmd->data->error = -EIO;
-+              dev_err(&host->pdev->dev, "faking cmd %d "
-+                      "during suspend\n", cmd->opcode);
-               mmc_request_done(mmc, mrq);
-               return;
-       }
-@@ -502,10 +502,23 @@ static void glamo_mci_send_request(struct mmc_host *mmc)
-        * our own INT# line"
-        */
-       if (!glamo_mci_def_pdata.pglamo->irq_works) {
--              /* we have faith we will get an "interrupt"... */
--              while (!(readw_dly(glamo_mci_def_pdata.pglamo->base +
--                       GLAMO_REG_IRQ_STATUS) & GLAMO_IRQ_MMC))
-+              /*
-+               * we have faith we will get an "interrupt"...
-+               * but something insane like suspend problems can mean
-+               * we spin here forever, so we timeout after a LONG time
-+               */
-+              while ((!(readw_dly(glamo_mci_def_pdata.pglamo->base +
-+                       GLAMO_REG_IRQ_STATUS) & GLAMO_IRQ_MMC)) &&
-+                     (timeout--))
-                       ;
-+
-+              if (timeout < 0) {
-+                      if (cmd->data->error)
-+                              cmd->data->error = -ETIMEDOUT;
-+                      dev_err(&host->pdev->dev, "Payload timeout\n");
-+                      return;
-+              }
-+
-               /* yay we are an interrupt controller! -- call the ISR */
-               glamo_mci_irq(IRQ_GLAMO(GLAMO_IRQIDX_MMC),
-                             irq_desc + IRQ_GLAMO(GLAMO_IRQIDX_MMC));
-@@ -529,6 +542,7 @@ static void glamo_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)
- static void glamo_mci_reset(struct glamo_mci_host *host)
- {
-+      dev_dbg(&host->pdev->dev, "******* glamo_mci_reset\n");
-       /* reset MMC controller */
-       writew_dly(GLAMO_CLOCK_MMC_RESET | GLAMO_CLOCK_MMC_DG_TCLK |
-                  GLAMO_CLOCK_MMC_EN_TCLK | GLAMO_CLOCK_MMC_DG_M9CLK |
-@@ -803,8 +817,7 @@ static int glamo_mci_suspend(struct platform_device *dev, pm_message_t state)
-       struct glamo_mci_host   *host = mmc_priv(mmc);
-       host->suspending++;
--
--      return  mmc_suspend_host(mmc, state);
-+      return mmc_suspend_host(mmc, state);
- }
- static int glamo_mci_resume(struct platform_device *dev)
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1095-use-gpio-control-leds.patch b/target/linux/s3c24xx/patches-2.6.24/1095-use-gpio-control-leds.patch
deleted file mode 100644 (file)
index 9d19a16..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-From a320183ac1d4bd8a430ef9f3e3b957ed4177454b Mon Sep 17 00:00:00 2001
-From: Willie <willie_chen@openmoko.com>
-Date: Sun, 13 Apr 2008 07:25:50 +0100
-Subject: [PATCH] use gpio control leds
-
----
- drivers/leds/leds-neo1973-gta02.c |    9 ++++-----
- 1 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/leds/leds-neo1973-gta02.c b/drivers/leds/leds-neo1973-gta02.c
-index bf1d540..e442e48 100644
---- a/drivers/leds/leds-neo1973-gta02.c
-+++ b/drivers/leds/leds-neo1973-gta02.c
-@@ -127,22 +127,22 @@ static int __init gta02led_probe(struct platform_device *pdev)
-               switch (lp->gpio) {
-               case S3C2410_GPB0:
--                      lp->has_pwm = 1;
-+                      lp->has_pwm = 0;
-                       lp->pwm.timerid = PWM0;
-                       s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB0_TOUT0);
-                       break;
-               case S3C2410_GPB1:
--                      lp->has_pwm = 1;
-+                      lp->has_pwm = 0;
-                       lp->pwm.timerid = PWM1;
-                       s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB1_TOUT1);
-                       break;
-               case S3C2410_GPB2:
--                      lp->has_pwm = 1;
-+                      lp->has_pwm = 0;
-                       lp->pwm.timerid = PWM2;
-                       s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB2_TOUT2);
-                       break;
-               case S3C2410_GPB3:
--                      lp->has_pwm = 1;
-+                      lp->has_pwm = 0;
-                       lp->pwm.timerid = PWM3;
-                       s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB3_TOUT3);
-                       break;
-@@ -167,7 +167,6 @@ static int __init gta02led_probe(struct platform_device *pdev)
-                       break;
-               default:
-                       break;
--              }
-               mutex_init(&lp->mutex);
-               rc = led_classdev_register(&pdev->dev, &lp->cdev);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1096-fix-gpio-led-patch-still-pwm-t3.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1096-fix-gpio-led-patch-still-pwm-t3.patch.patch
deleted file mode 100644 (file)
index a3c3c29..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-From 565f2987435711c4ac154e7cc12a03eedce2bfdb Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Sun, 13 Apr 2008 07:25:50 +0100
-Subject: [PATCH] fix-gpio-led-patch-still-pwm-t3.patch
-
-Starting up all the PWMs seems to be needed for PWM3 operation
-and FIQ / HDQ / VIB operation.  But after starting, turn the
-LEDs to GPIO-only.
-
-Applies on top of Willie's patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/leds/leds-neo1973-gta02.c |    9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/leds/leds-neo1973-gta02.c b/drivers/leds/leds-neo1973-gta02.c
-index e442e48..bf1d540 100644
---- a/drivers/leds/leds-neo1973-gta02.c
-+++ b/drivers/leds/leds-neo1973-gta02.c
-@@ -127,22 +127,22 @@ static int __init gta02led_probe(struct platform_device *pdev)
-               switch (lp->gpio) {
-               case S3C2410_GPB0:
--                      lp->has_pwm = 0;
-+                      lp->has_pwm = 1;
-                       lp->pwm.timerid = PWM0;
-                       s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB0_TOUT0);
-                       break;
-               case S3C2410_GPB1:
--                      lp->has_pwm = 0;
-+                      lp->has_pwm = 1;
-                       lp->pwm.timerid = PWM1;
-                       s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB1_TOUT1);
-                       break;
-               case S3C2410_GPB2:
--                      lp->has_pwm = 0;
-+                      lp->has_pwm = 1;
-                       lp->pwm.timerid = PWM2;
-                       s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB2_TOUT2);
-                       break;
-               case S3C2410_GPB3:
--                      lp->has_pwm = 0;
-+                      lp->has_pwm = 1;
-                       lp->pwm.timerid = PWM3;
-                       s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB3_TOUT3);
-                       break;
-@@ -167,6 +167,7 @@ static int __init gta02led_probe(struct platform_device *pdev)
-                       break;
-               default:
-                       break;
-+              }
-               mutex_init(&lp->mutex);
-               rc = led_classdev_register(&pdev->dev, &lp->cdev);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1097-introduce-usb-host-power-control.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1097-introduce-usb-host-power-control.patch.patch
deleted file mode 100644 (file)
index 0192df4..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-From 20369a802d4df104489daeb85388554f79e7e281 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 13 Apr 2008 07:25:51 +0100
-Subject: [PATCH] introduce-usb-host-power-control.patch
-
-Unless I really really missed the point, there is no support for enabling
-USB Host power for USB host mode.  This patch adds a /sys node for GTA02
-that allows control of the charge pump for 5V out on the USB mini connector
-It doesn't change any logical mode in the CPU, just enables (1) and disables
-(0) USB host power.
-
-# cat /sys/devices/platform/neo1973-pm-host.0/hostmode
-0
-# echo 1 > /sys/devices/platform/neo1973-pm-host.0/hostmode
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c      |    6 ++
- arch/arm/plat-s3c24xx/Makefile          |    2 +-
- arch/arm/plat-s3c24xx/neo1973_pm_host.c |  101 +++++++++++++++++++++++++++++++
- 3 files changed, 108 insertions(+), 1 deletions(-)
- create mode 100644 arch/arm/plat-s3c24xx/neo1973_pm_host.c
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index f18c8fd..5bd68a6 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1030,6 +1030,11 @@ static struct platform_device gta01_pm_gsm_dev = {
-       .name           = "neo1973-pm-gsm",
- };
-+static struct platform_device gta02_pm_usbhost_dev = {
-+      .name           = "neo1973-pm-host",
-+};
-+
-+
- /* USB */
- static struct s3c2410_hcd_info gta02_usb_info = {
-       .port[0]        = {
-@@ -1287,6 +1292,7 @@ static void __init gta02_machine_init(void)
-       platform_device_register(&s3c_device_spi_acc);
-       platform_device_register(&gta01_button_dev);
-       platform_device_register(&gta01_pm_gsm_dev);
-+      platform_device_register(&gta02_pm_usbhost_dev);
-       mangle_pmu_pdata_by_system_rev();
-       platform_device_register(&gta02_pmu_dev);
-diff --git a/arch/arm/plat-s3c24xx/Makefile b/arch/arm/plat-s3c24xx/Makefile
-index 7192912..e1686a0 100644
---- a/arch/arm/plat-s3c24xx/Makefile
-+++ b/arch/arm/plat-s3c24xx/Makefile
-@@ -28,4 +28,4 @@ obj-$(CONFIG_PM)             += pm.o
- obj-$(CONFIG_PM)              += sleep.o
- obj-$(CONFIG_S3C2410_DMA)     += dma.o
- obj-$(CONFIG_MACH_SMDK)               += common-smdk.o
--obj-$(CONFIG_MACH_NEO1973)    += neo1973_pm_gsm.o neo1973_pm_gps.o neo1973_pm_bt.o
-+obj-$(CONFIG_MACH_NEO1973)    += neo1973_pm_host.o neo1973_pm_gsm.o neo1973_pm_gps.o neo1973_pm_bt.o
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_host.c b/arch/arm/plat-s3c24xx/neo1973_pm_host.c
-new file mode 100644
-index 0000000..4eae341
---- /dev/null
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_host.c
-@@ -0,0 +1,101 @@
-+/*
-+ * Bluetooth PM code for the FIC Neo1973 GSM Phone
-+ *
-+ * (C) 2007 by OpenMoko Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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 version 2 as
-+ * published by the Free Software Foundation
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/mach-types.h>
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+#include <asm/arch/gta02.h>
-+#include <linux/pcf50633.h>
-+
-+static ssize_t pm_host_read(struct device *dev, struct device_attribute *attr,
-+                          char *buf)
-+{
-+      return sprintf(buf, "%d\n",
-+                     pcf50633_gpio_get(pcf50633_global, PCF50633_GPO));
-+}
-+
-+static ssize_t pm_host_write(struct device *dev, struct device_attribute *attr,
-+                           const char *buf, size_t count)
-+{
-+      unsigned long on = simple_strtoul(buf, NULL, 10);
-+
-+      pcf50633_gpio_set(pcf50633_global, PCF50633_GPO, on);
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(hostmode, 0644, pm_host_read, pm_host_write);
-+
-+static struct attribute *neo1973_pm_host_sysfs_entries[] = {
-+      &dev_attr_hostmode.attr,
-+      NULL
-+};
-+
-+static struct attribute_group neo1973_pm_host_attr_group = {
-+      .name   = NULL,
-+      .attrs  = neo1973_pm_host_sysfs_entries,
-+};
-+
-+static int __init neo1973_pm_host_probe(struct platform_device *pdev)
-+{
-+      dev_info(&pdev->dev, "starting\n");
-+
-+      switch (machine_arch_type) {
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+      case MACH_TYPE_NEO1973_GTA01:
-+              return -EINVAL;
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+      default:
-+              break;
-+      }
-+
-+      return sysfs_create_group(&pdev->dev.kobj, &neo1973_pm_host_attr_group);
-+}
-+
-+static int neo1973_pm_host_remove(struct platform_device *pdev)
-+{
-+      sysfs_remove_group(&pdev->dev.kobj, &neo1973_pm_host_attr_group);
-+      return 0;
-+}
-+
-+static struct platform_driver neo1973_pm_host_driver = {
-+      .probe          = neo1973_pm_host_probe,
-+      .remove         = neo1973_pm_host_remove,
-+      .driver         = {
-+              .name           = "neo1973-pm-host",
-+      },
-+};
-+
-+static int __devinit neo1973_pm_host_init(void)
-+{
-+      return platform_driver_register(&neo1973_pm_host_driver);
-+}
-+
-+static void neo1973_pm_host_exit(void)
-+{
-+      platform_driver_unregister(&neo1973_pm_host_driver);
-+}
-+
-+module_init(neo1973_pm_host_init);
-+module_exit(neo1973_pm_host_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
-+MODULE_DESCRIPTION("Neo1973 USB Host Power Management");
-+#endif
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1098-fix-charging-deassert-host-power-1a-detect.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1098-fix-charging-deassert-host-power-1a-detect.patch.patch
deleted file mode 100644 (file)
index 6876fa9..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From b32caff43b040be34c206962402e881e4235c5a9 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 13 Apr 2008 07:25:51 +0100
-Subject: [PATCH] fix-charging-deassert-host-power-1a-detect.patch
-
-We don't take care to stop driving generated USB host power even
-when we have a 1A charger connected on the same pins.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 91b9ac3..c14fad0 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -523,6 +523,15 @@ static void configure_pmu_for_charger(struct pcf50633_data *pcf,
-               break;
-       case CHARGER_TYPE_1A:
-               __reg_write(pcf, PCF50633_REG_MBCC7, PCF50633_MBCC7_USB_1000mA);
-+              /*
-+               * stop GPO / EN_HOSTUSB power driving out on the same
-+               * USB power pins we have a 1A charger on right now!
-+               */
-+              dev_info(&pcf->client.dev, "Charger -> CHARGER_TYPE_1A\n");
-+              __reg_write(pcf, PCF50633_GPO - PCF50633_GPIO1 +
-+                               PCF50633_REG_GPIO1CFG,
-+                               __reg_read(pcf, PCF50633_GPO - PCF50633_GPIO1 +
-+                                               PCF50633_REG_GPIO1CFG) & 0xf0);
-               break;
-       }
- }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1099-add-pcf50633-06-RTC_AIE-ioctl.patch b/target/linux/s3c24xx/patches-2.6.24/1099-add-pcf50633-06-RTC_AIE-ioctl.patch
deleted file mode 100644 (file)
index 0d968db..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From 24df87afae6f246622251b8d6f326493bcc206bd Mon Sep 17 00:00:00 2001
-From: Holger Hans Peter Freyther <zecke@openmoko.org>
-Date: Sun, 13 Apr 2008 07:25:51 +0100
-Subject: [PATCH] add-pcf50633-06-RTC_AIE-ioctl
-
-Hey,
-
-the legacy application 'atd' from Russ Nelson/Nils Faerber, used by Qtopia, to
-schedule alarms currently fails to start as the the above ioctl is failing.
-The other drivers in drivers/rtc implement the above ioctl and we can
-implement it too.
-
-The code to mask/unmask the RTC alarm is copied from the set_alarm routine and
-adapted to use the reg_set_bit_mask and reg_set_clear_mask.
-
-It is compiling, so it must work. Please welcome me the lkml way ;)
-
-
-Signed-Off-by: Holger Hans Peter Freyther <zecke@openmoko.org>
----
- drivers/i2c/chips/pcf50606.c |   10 ++++++++++
- drivers/i2c/chips/pcf50633.c |   10 ++++++++++
- 2 files changed, 20 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
-index aaec6e8..03805be 100644
---- a/drivers/i2c/chips/pcf50606.c
-+++ b/drivers/i2c/chips/pcf50606.c
-@@ -1191,7 +1191,17 @@ static int pcf50606_rtc_ioctl(struct device *dev, unsigned int cmd,
- {
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+
-       switch (cmd) {
-+      case RTC_AIE_OFF:
-+              /* disable the alarm interrupt */
-+              reg_set_bit_mask(pcf, PCF50606_REG_INT1M,
-+                               PCF50606_INT1_ALARM, PCF50606_INT1_ALARM);
-+              return 0;
-+      case RTC_AIE_ON:
-+              /* enable the alarm interrupt */
-+              reg_clear_bits(pcf, PCF50606_REG_INT1M, PCF50606_INT1_ALARM);
-+              return 0;
-       case RTC_PIE_OFF:
-               /* disable periodic interrupt (hz tick) */
-               pcf->flags &= ~PCF50606_F_RTC_SECOND;
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index c14fad0..b5cd2cb 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1297,7 +1297,17 @@ static int pcf50633_rtc_ioctl(struct device *dev, unsigned int cmd,
- {
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+
-       switch (cmd) {
-+      case RTC_AIE_OFF:
-+              /* disable the alarm interrupt */
-+              reg_set_bit_mask(pcf, PCF50633_REG_INT1M,
-+                               PCF50633_INT1_ALARM, PCF50633_INT1_ALARM);
-+              return 0;
-+      case RTC_AIE_ON:
-+              /* enable the alarm interrupt */
-+              reg_clear_bits(pcf, PCF50633_REG_INT1M, PCF50633_INT1_ALARM);
-+              return 0;
-       case RTC_PIE_OFF:
-               /* disable periodic interrupt (hz tick) */
-               pcf->flags &= ~PCF50633_F_RTC_SECOND;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1100-fix-lis302dl-suspend-gpio.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1100-fix-lis302dl-suspend-gpio.patch.patch
deleted file mode 100644 (file)
index 3a60351..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-From b1f47a12474fdb7c00e2234a8a02a7e1a2031a1e Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 13 Apr 2008 07:25:51 +0100
-Subject: [PATCH] fix-lis302dl-suspend-gpio.patch
- Add platform stuff to deal with going in and out of suspend
- so the motion sensor IO is not driving high into unpowered sensors
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   28 +++++++++++++++++++++++++++-
- drivers/input/misc/lis302dl.c      |   15 +++++++++++++++
- include/linux/lis302dl.h           |    1 +
- 3 files changed, 43 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 5bd68a6..99206ee 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -887,7 +887,31 @@ void gat02_lis302dl_bitbang_read(struct lis302dl_info *lis)
- }
--struct lis302dl_platform_data lis302_pdata[] = {
-+void gat02_lis302dl_suspend_io(struct lis302dl_info *lis, int resume)
-+{
-+      struct lis302dl_platform_data *pdata = lis->pdata;
-+
-+      if (!resume) {
-+               /*
-+               * we don't want to power them with a high level
-+               * because GSENSOR_3V3 is not up during suspend
-+               */
-+              s3c2410_gpio_setpin(pdata->pin_chip_select, 0);
-+              s3c2410_gpio_setpin(pdata->pin_clk, 0);
-+              s3c2410_gpio_setpin(pdata->pin_mosi, 0);
-+              /* misnomer: it is a pullDOWN in 2442 */
-+              s3c2410_gpio_pullup(pdata->pin_miso, 1);
-+              return;
-+      }
-+
-+      /* back to normal */
-+      s3c2410_gpio_setpin(pdata->pin_chip_select, 1);
-+      s3c2410_gpio_setpin(pdata->pin_clk, 1);
-+      /* misnomer: it is a pullDOWN in 2442 */
-+      s3c2410_gpio_pullup(pdata->pin_miso, 0);
-+}
-+
-+const struct lis302dl_platform_data lis302_pdata[] = {
-       {
-               .name           = "lis302-1 (top)",
-               .pin_chip_select= S3C2410_GPD12,
-@@ -896,6 +920,7 @@ struct lis302dl_platform_data lis302_pdata[] = {
-               .pin_miso       = S3C2410_GPG5,
-               .open_drain     = 1, /* altered at runtime by PCB rev */
-               .lis302dl_bitbang_read = gat02_lis302dl_bitbang_read,
-+              .lis302dl_suspend_io = gat02_lis302dl_suspend_io,
-       }, {
-               .name           = "lis302-2 (bottom)",
-               .pin_chip_select= S3C2410_GPD13,
-@@ -904,6 +929,7 @@ struct lis302dl_platform_data lis302_pdata[] = {
-               .pin_miso       = S3C2410_GPG5,
-               .open_drain     = 1, /* altered at runtime by PCB rev */
-               .lis302dl_bitbang_read = gat02_lis302dl_bitbang_read,
-+              .lis302dl_suspend_io = gat02_lis302dl_suspend_io,
-       },
- };
-diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
-index 36bdcf7..2be816a 100644
---- a/drivers/input/misc/lis302dl.c
-+++ b/drivers/input/misc/lis302dl.c
-@@ -428,6 +428,15 @@ static int lis302dl_suspend(struct spi_device *spi, pm_message_t state)
-       disable_irq(lis->spi_dev->irq);
-       local_save_flags(flags);
-+      /*
-+       * When we share SPI over multiple sensors, there is a race here
-+       * that one or more sensors will lose.  In that case, the shared
-+       * SPI bus GPIO will be in sleep mode and partially pulled down.  So
-+       * we explicitly put our IO into "wake" mode here before the final
-+       * traffic to the sensor.
-+       */
-+      (lis->pdata->lis302dl_suspend_io)(lis, 1);
-+
-       /* save registers */
-       lis->regs[LIS302DL_REG_CTRL1] = reg_read(lis, LIS302DL_REG_CTRL1);
-       lis->regs[LIS302DL_REG_CTRL2] = reg_read(lis, LIS302DL_REG_CTRL2);
-@@ -467,6 +476,9 @@ static int lis302dl_suspend(struct spi_device *spi, pm_message_t state)
-               reg_write(lis, LIS302DL_REG_CTRL1, tmp);
-       }
-+      /* place our IO to the device in sleep-compatible states */
-+      (lis->pdata->lis302dl_suspend_io)(lis, 0);
-+
-       local_irq_restore(flags);
-       return 0;
-@@ -479,6 +491,9 @@ static int lis302dl_resume(struct spi_device *spi)
-       local_save_flags(flags);
-+      /* get our IO to the device back in operational states */
-+      (lis->pdata->lis302dl_suspend_io)(lis, 1);
-+
-       /* restore registers after resume */
-       reg_write(lis, LIS302DL_REG_CTRL1, lis->regs[LIS302DL_REG_CTRL1]);
-       reg_write(lis, LIS302DL_REG_CTRL2, lis->regs[LIS302DL_REG_CTRL2]);
-diff --git a/include/linux/lis302dl.h b/include/linux/lis302dl.h
-index 2dea813..0d6b4c4 100644
---- a/include/linux/lis302dl.h
-+++ b/include/linux/lis302dl.h
-@@ -16,6 +16,7 @@ struct lis302dl_platform_data {
-       unsigned long pin_miso;
-       int open_drain;
-       void (*lis302dl_bitbang_read)(struct lis302dl_info *);
-+      void (*lis302dl_suspend_io)(struct lis302dl_info *, int resuming);
- };
- struct lis302dl_info {
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1101-fix-suspend-gps-tx-level.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1101-fix-suspend-gps-tx-level.patch.patch
deleted file mode 100644 (file)
index 62d72f2..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From 0df922c0e1c6cdbfb8b2d2d0f7b474d09d121510 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Sun, 13 Apr 2008 07:25:51 +0100
-Subject: [PATCH] fix-suspend-gps-tx-level.patch
-
-We used to drive output high into GPS unit in suspend
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gps.c |   14 ++++++++++++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-index 6bd8054..e8cfb96 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-@@ -485,6 +485,12 @@ static int gta01_pm_gps_suspend(struct platform_device *pdev,
- #ifdef CONFIG_MACH_NEO1973_GTA02
-       if (machine_is_neo1973_gta02()) {
-+              /* take care not to power unpowered GPS from GPIO */
-+              s3c2410_gpio_cfgpin(S3C2410_GPH4, S3C2410_GPH4_OUTP);
-+              s3c2410_gpio_setpin(S3C2410_GPH4, 0);
-+              /* don't let RX from unpowered GPS float */
-+              s3c2410_gpio_pullup(S3C2410_GPH5, 1);
-+
-               /* FIXME */
-               pcf50633_onoff_set(pcf50633_global,
-                       PCF50633_REGULATOR_LDO5, 0);
-@@ -505,6 +511,14 @@ static int gta01_pm_gps_resume(struct platform_device *pdev)
- #ifdef CONFIG_MACH_NEO1973_GTA02
-       if (machine_is_neo1973_gta02()) {
-+              /*
-+               * resume TXD1 function since we power GPS now... er..
-+               * WTF?  FIXME We always power GPS on resume ??
-+               */
-+              s3c2410_gpio_cfgpin(S3C2410_GPH4, S3C2410_GPH4_TXD1);
-+              /* remove pulldown now it won't be floating any more */
-+              s3c2410_gpio_pullup(S3C2410_GPH5, 0);
-+
-               /* FIXME */
-               pcf50633_onoff_set(pcf50633_global,
-                       PCF50633_REGULATOR_LDO5, 1);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1102-Do-not-send-low-level-debugging-to-the-modem.patch b/target/linux/s3c24xx/patches-2.6.24/1102-Do-not-send-low-level-debugging-to-the-modem.patch
deleted file mode 100644 (file)
index 3a2a076..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-From a178e6a9426d258926af1ef86108648a0a47b808 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Sun, 13 Apr 2008 07:25:52 +0100
-Subject: [PATCH] Do not send low level debugging to the modem
-
-Hey,
-
-I see no reason to send LL debugging messages to the modem. This can happen if
-we compile the Samsung SoC with PM debugging as in andy's git branch.
-
-
-
-From 452c17990dfeb9c2eb2ffa7ded4d24ddb1bcd4b2 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Sun, 23 Mar 2008 00:57:28 +0100
-Subject: [PATCH] Never ever send debug messages to the modem. The serial
-console is
- on UART2, send the messages for decompressing  and low level debugging
- there.
-
-Signed-Off-by: Holger Freyther <zecke@openmoko.org>
----
- defconfig-2.6.24 |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index e57081a..cce3737 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -163,7 +163,7 @@ CONFIG_CPU_LLSERIAL_S3C2440=y
- #
- CONFIG_S3C2410_PM_DEBUG=y
- # CONFIG_S3C2410_PM_CHECK is not set
--CONFIG_S3C_LOWLEVEL_UART_PORT=0
-+CONFIG_S3C_LOWLEVEL_UART_PORT=2
- #
- # S3C2400 Machines
-@@ -1756,7 +1756,7 @@ CONFIG_DEBUG_ERRORS=y
- CONFIG_DEBUG_LL=y
- # CONFIG_DEBUG_ICEDCC is not set
- # CONFIG_DEBUG_S3C_PORT is not set
--CONFIG_DEBUG_S3C_UART=0
-+CONFIG_DEBUG_S3C_UART=2
- #
- # Security options
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1103-add-gta02-pcb-revision-detect.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1103-add-gta02-pcb-revision-detect.patch.patch
deleted file mode 100644 (file)
index 523edf0..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-From b8d251412bc4c420f33920c2d9492076fc7b9624 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 13 Apr 2008 07:25:52 +0100
-Subject: [PATCH] add-gta02-pcb-revision-detect.patch
-
-Add function
-
-int gta02_get_pcb_revision(void)
-
-which returns state of GTA02 PCB revision pins.  It is also called
-and logged during boot with KERN_INFO.  The results look like:
-
-b9    b8        b2    b1    b0
- GPD4  GPD3     GPD0  GPC15 GPC13
-
- GTA02 A5 and before:  0x000
- GTA02 A6           :  0x001
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c   |   55 +++++++++++++++++++++++++++++++++-
- include/asm-arm/arch-s3c2410/gta02.h |    9 +++++
- 2 files changed, 63 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 99206ee..a2a63fe 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -320,6 +320,59 @@ FIQ_HANDLER_ENTRY(256, 512)
- FIQ_HANDLER_END()
-+/**
-+ * returns PCB revision information in b9,b8 and b2,b1,b0
-+ * Pre-GTA02 A6 returns 0x000
-+ *     GTA02 A6 returns 0x101
-+ *     ...
-+ */
-+
-+int gta02_get_pcb_revision(void)
-+{
-+      int n;
-+      int u = 0;
-+      static unsigned long pinlist[] = {
-+              GTA02_PCB_ID1_0,
-+              GTA02_PCB_ID1_1,
-+              GTA02_PCB_ID1_2,
-+              GTA02_PCB_ID2_0,
-+              GTA02_PCB_ID2_1,
-+      };
-+      static int pin_offset[] = {
-+              0, 1, 2, 8, 9
-+      };
-+
-+      for (n = 0 ; n < ARRAY_SIZE(pinlist); n++) {
-+              /*
-+               * set the PCB version GPIO to be pulled-down input
-+               * force low briefly first
-+               */
-+              s3c2410_gpio_cfgpin(pinlist[n], S3C2410_GPIO_OUTPUT);
-+              s3c2410_gpio_setpin(pinlist[n], 0);
-+              /* misnomer: it is a pullDOWN in 2442 */
-+              s3c2410_gpio_pullup(pinlist[n], 1);
-+              s3c2410_gpio_cfgpin(pinlist[n], S3C2410_GPIO_INPUT);
-+
-+              udelay(10);
-+
-+              if (s3c2410_gpio_getpin(pinlist[n]))
-+                      u |= 1 << pin_offset[n];
-+
-+              /*
-+              * when not being interrogated, all of the revision GPIO
-+              * are set to output HIGH without pulldown so no current flows
-+              * if they are NC or pulled up.
-+              */
-+              s3c2410_gpio_setpin(pinlist[n], 1);
-+              s3c2410_gpio_cfgpin(pinlist[n], S3C2410_GPIO_OUTPUT);
-+              /* misnomer: it is a pullDOWN in 2442 */
-+              s3c2410_gpio_pullup(pinlist[n], 0);
-+      }
-+
-+      return u;
-+}
-+
-+
- static struct map_desc gta02_iodesc[] __initdata = {
-       {
-               .virtual        = 0xe0000000,
-@@ -911,7 +964,7 @@ void gat02_lis302dl_suspend_io(struct lis302dl_info *lis, int resume)
-       s3c2410_gpio_pullup(pdata->pin_miso, 0);
- }
--const struct lis302dl_platform_data lis302_pdata[] = {
-+struct lis302dl_platform_data lis302_pdata[] = {
-       {
-               .name           = "lis302-1 (top)",
-               .pin_chip_select= S3C2410_GPD12,
-diff --git a/include/asm-arm/arch-s3c2410/gta02.h b/include/asm-arm/arch-s3c2410/gta02.h
-index f686a7a..791ea4f 100644
---- a/include/asm-arm/arch-s3c2410/gta02.h
-+++ b/include/asm-arm/arch-s3c2410/gta02.h
-@@ -97,4 +97,13 @@
- #define GTA02v3_IRQ_nUSB_FLT  IRQ_EINT18      /* v3 + v4 only */
- #define GTA02v3_IRQ_nGSM_OC   IRQ_EINT19      /* v3 + v4 only */
-+/* returns 00 000 on GTA02 A5 and earlier, A6 returns 01 001 */
-+#define GTA02_PCB_ID1_0               S3C2410_GPC13
-+#define GTA02_PCB_ID1_1               S3C2410_GPC15
-+#define GTA02_PCB_ID1_2               S3C2410_GPD0
-+#define GTA02_PCB_ID2_0               S3C2410_GPD3
-+#define GTA02_PCB_ID2_1               S3C2410_GPD4
-+
-+int gta02_get_pcb_revision(void);
-+
- #endif /* _GTA02_H */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1104-debug-glamo-dump-regs.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1104-debug-glamo-dump-regs.patch.patch
deleted file mode 100644 (file)
index 8e1c07d..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-From dda4110e4b365da5a520e8c2e3964d556206881d Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Sun, 13 Apr 2008 07:25:52 +0100
-Subject: [PATCH] debug-glamo-dump-regs.patch
- From: Andy Green <andy@openmoko.com>
-
-Sigend-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-core.c |   91 +++++++++++++++++++++++++++++++++++++++-
- 1 files changed, 90 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index 4d8e47f..accd933 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -977,10 +977,92 @@ static int glamo_supported(struct glamo_core *glamo)
-       return 1;
- }
-+static ssize_t regs_write(struct device *dev, struct device_attribute *attr,
-+                         const char *buf, size_t count)
-+{
-+      unsigned long reg = simple_strtoul(buf, NULL, 10);
-+      struct glamo_core *glamo = dev_get_drvdata(dev);
-+
-+      while (*buf && (*buf != ' '))
-+              buf++;
-+      if (*buf != ' ')
-+              return -EINVAL;
-+      while (*buf && (*buf == ' '))
-+              buf++;
-+      if (!*buf)
-+              return -EINVAL;
-+
-+      printk(KERN_INFO"reg 0x%02lX <-- 0x%04lX\n",
-+             reg, simple_strtoul(buf, NULL, 10));
-+
-+      __reg_write(glamo, reg, simple_strtoul(buf, NULL, 10));
-+
-+      return count;
-+}
-+
-+static ssize_t regs_read(struct device *dev, struct device_attribute *attr,
-+                      char *buf)
-+{
-+      struct glamo_core *glamo = dev_get_drvdata(dev);
-+      int n, n1 = 0, r;
-+      char * end = buf;
-+      struct reg_range {
-+              int start;
-+              int count;
-+              char * name;
-+      };
-+      struct reg_range reg_range[] = {
-+              { 0x0000, 0x200, "General" },
-+              { 0x0200, 0x100, "Host Bus" },
-+              { 0x0300, 0x100, "Memory" },
-+/*            { 0x0400, 0x100, "Sensor" },
-+              { 0x0500, 0x300, "ISP" },
-+              { 0x0800, 0x400, "JPEG" },
-+              { 0x0c00, 0x500, "MPEG" },
-+              { 0x1100, 0x400, "LCD" },
-+              { 0x1500, 0x080, "MPU 0" },
-+              { 0x1580, 0x080, "MPU 1" },
-+              { 0x1600, 0x080, "Command Queue" },
-+              { 0x1680, 0x080, "RISC CPU" },
-+              { 0x1700, 0x400, "2D Unit" },
-+              { 0x1b00, 0x900, "3D Unit" },
-+*/
-+      };
-+
-+      spin_lock(&glamo->lock);
-+
-+      for (r = 0; r < ARRAY_SIZE(reg_range); r++) {
-+              n1 = 0;
-+              end += sprintf(end, "\n%s\n\n", reg_range[r].name);
-+              for (n = reg_range[r].start;
-+                   n < reg_range[r].start + reg_range[r].count; n += 2) {
-+                      if (((n1++) & 7) == 0)
-+                              end += sprintf(end, "\n%04X:  ",
-+                                             n + reg_range[r].start);
-+                      end += sprintf(end, "%04x ", __reg_read(glamo, n));
-+              }
-+              end += sprintf(end, "\n");
-+      }
-+      spin_unlock(&glamo->lock);
-+
-+      return end - buf;
-+}
-+
-+static DEVICE_ATTR(regs, 0644, regs_read, regs_write);
-+static struct attribute *glamo_sysfs_entries[] = {
-+      &dev_attr_regs.attr,
-+      NULL
-+};
-+static struct attribute_group glamo_attr_group = {
-+      .name   = NULL,
-+      .attrs  = glamo_sysfs_entries,
-+};
-+
-+
- static int __init glamo_probe(struct platform_device *pdev)
- {
--      int rc, irq;
-+      int rc = 0, irq;
-       struct glamo_core *glamo;
-       if (glamo_handle) {
-@@ -1080,6 +1162,12 @@ static int __init glamo_probe(struct platform_device *pdev)
-               goto out_free;
-       }
-+      rc = sysfs_create_group(&pdev->dev.kobj, &glamo_attr_group);
-+      if (rc < 0) {
-+              dev_err(&pdev->dev, "cannot create sysfs group\n");
-+              goto out_free;
-+      }
-+
-       platform_set_drvdata(pdev, glamo);
-       dev_dbg(&glamo->pdev->dev, "running init script\n");
-@@ -1103,6 +1191,7 @@ static int __init glamo_probe(struct platform_device *pdev)
-               glamo->irq_works = 1;
-       } else
-               glamo->irq_works = 0;
-+
-       return 0;
- out_free:
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1105-add-pcb-rev-sysfs.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1105-add-pcb-rev-sysfs.patch.patch
deleted file mode 100644 (file)
index e068071..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-From b20fa9e7d54d8dfc40be78ccb4c5bafdfaf2ad15 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 13 Apr 2008 07:25:52 +0100
-Subject: [PATCH] add-pcb-rev-sysfs.patch
- Signed-off-by: Andy Green <andy@openmoko.com>
-
----
- arch/arm/mach-s3c2440/mach-gta02.c      |    6 ++
- arch/arm/plat-s3c24xx/Makefile          |    6 ++-
- arch/arm/plat-s3c24xx/neo1973_version.c |   90 +++++++++++++++++++++++++++++++
- 3 files changed, 101 insertions(+), 1 deletions(-)
- create mode 100644 arch/arm/plat-s3c24xx/neo1973_version.c
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index a2a63fe..3574375 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -372,6 +372,11 @@ int gta02_get_pcb_revision(void)
-       return u;
- }
-+struct platform_device gta02_version_device = {
-+      .name           = "neo1973-version",
-+      .num_resources  = 0,
-+};
-+
- static struct map_desc gta02_iodesc[] __initdata = {
-       {
-@@ -724,6 +729,7 @@ static struct platform_device *gta02_devices[] __initdata = {
-       &s3c_device_ts,
-       &gta02_nor_flash,
-       &sc32440_fiq_device,
-+      &gta02_version_device,
- };
- static struct s3c2410_nand_set gta02_nand_sets[] = {
-diff --git a/arch/arm/plat-s3c24xx/Makefile b/arch/arm/plat-s3c24xx/Makefile
-index e1686a0..e667105 100644
---- a/arch/arm/plat-s3c24xx/Makefile
-+++ b/arch/arm/plat-s3c24xx/Makefile
-@@ -28,4 +28,8 @@ obj-$(CONFIG_PM)             += pm.o
- obj-$(CONFIG_PM)              += sleep.o
- obj-$(CONFIG_S3C2410_DMA)     += dma.o
- obj-$(CONFIG_MACH_SMDK)               += common-smdk.o
--obj-$(CONFIG_MACH_NEO1973)    += neo1973_pm_host.o neo1973_pm_gsm.o neo1973_pm_gps.o neo1973_pm_bt.o
-+obj-$(CONFIG_MACH_NEO1973)    += neo1973_version.o \
-+                                 neo1973_pm_host.o \
-+                                 neo1973_pm_gsm.o \
-+                                 neo1973_pm_gps.o \
-+                                 neo1973_pm_bt.o
-diff --git a/arch/arm/plat-s3c24xx/neo1973_version.c b/arch/arm/plat-s3c24xx/neo1973_version.c
-new file mode 100644
-index 0000000..ad41a0f
---- /dev/null
-+++ b/arch/arm/plat-s3c24xx/neo1973_version.c
-@@ -0,0 +1,90 @@
-+/*
-+ * PCB version sysfs for the FIC Neo1973 GSM Phone
-+ *
-+ * (C) 2007 by OpenMoko Inc.
-+ * Author: Andy Green <andy@openmoko.com>
-+ * 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 version 2 as
-+ * published by the Free Software Foundation
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/mach-types.h>
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+#include <asm/arch/gta02.h>
-+
-+static ssize_t version_read(struct device *dev, struct device_attribute *attr,
-+                          char *buf)
-+{
-+      return sprintf(buf, "0x%03X\n", gta02_get_pcb_revision());
-+}
-+
-+
-+static DEVICE_ATTR(pcb, 0644, version_read, NULL);
-+
-+static struct attribute *neo1973_version_sysfs_entries[] = {
-+      &dev_attr_pcb.attr,
-+      NULL
-+};
-+
-+static struct attribute_group neo1973_version_attr_group = {
-+      .name   = NULL,
-+      .attrs  = neo1973_version_sysfs_entries,
-+};
-+
-+static int __init neo1973_version_probe(struct platform_device *pdev)
-+{
-+      dev_info(&pdev->dev, "starting\n");
-+
-+      switch (machine_arch_type) {
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+      case MACH_TYPE_NEO1973_GTA01:
-+              return -EINVAL;
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+      default:
-+              break;
-+      }
-+
-+      return sysfs_create_group(&pdev->dev.kobj, &neo1973_version_attr_group);
-+}
-+
-+static int neo1973_version_remove(struct platform_device *pdev)
-+{
-+      sysfs_remove_group(&pdev->dev.kobj, &neo1973_version_attr_group);
-+      return 0;
-+}
-+
-+static struct platform_driver neo1973_version_driver = {
-+      .probe          = neo1973_version_probe,
-+      .remove         = neo1973_version_remove,
-+      .driver         = {
-+              .name           = "neo1973-version",
-+      },
-+};
-+
-+static int __devinit neo1973_version_init(void)
-+{
-+      return platform_driver_register(&neo1973_version_driver);
-+}
-+
-+static void neo1973_version_exit(void)
-+{
-+      platform_driver_unregister(&neo1973_version_driver);
-+}
-+
-+module_init(neo1973_version_init);
-+module_exit(neo1973_version_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
-+MODULE_DESCRIPTION("Neo1973 PCB version");
-+#endif
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1106-Simplify-the-code-there-is-no-need-for-a-branch.-Th.patch b/target/linux/s3c24xx/patches-2.6.24/1106-Simplify-the-code-there-is-no-need-for-a-branch.-Th.patch
deleted file mode 100644 (file)
index 31560f8..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-From d5964d963a8b486d3b78fd4a135ee400bbf93bd1 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Sun, 13 Apr 2008 07:25:52 +0100
-Subject: [PATCH] Simplify the code, there is no need for a branch. The code for
- GTA01_GPIO_AUX_KEY looks odd.
-
-Signed-Off-by: Holger Freyther <zecke@openmoko.org>
----
- drivers/input/keyboard/neo1973kbd.c |   24 +++++++-----------------
- 1 files changed, 7 insertions(+), 17 deletions(-)
-
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-index 917d5ae..99ca9c3 100644
---- a/drivers/input/keyboard/neo1973kbd.c
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -37,11 +37,8 @@ static irqreturn_t neo1973kbd_aux_irq(int irq, void *dev_id)
-       struct neo1973kbd *neo1973kbd_data = dev_id;
-       /* FIXME: use GPIO from platform_dev resources */
--      if (s3c2410_gpio_getpin(GTA01_GPIO_AUX_KEY))
--              input_report_key(neo1973kbd_data->input, KEY_PHONE, 0);
--      else
--              input_report_key(neo1973kbd_data->input, KEY_PHONE, 1);
--
-+      int key_pressed = !s3c2410_gpio_getpin(GTA01_GPIO_AUX_KEY);
-+      input_report_key(neo1973kbd_data->input, KEY_PHONE, key_pressed);
-       input_sync(neo1973kbd_data->input);
-       return IRQ_HANDLED;
-@@ -52,11 +49,8 @@ static irqreturn_t neo1973kbd_hold_irq(int irq, void *dev_id)
-       struct neo1973kbd *neo1973kbd_data = dev_id;
-       /* FIXME: use GPIO from platform_dev resources */
--      if (s3c2410_gpio_getpin(GTA01_GPIO_HOLD_KEY))
--              input_report_key(neo1973kbd_data->input, KEY_PAUSE, 1);
--      else
--              input_report_key(neo1973kbd_data->input, KEY_PAUSE, 0);
--
-+      int key_pressed = 3c2410_gpio_getpin(GTA01_GPIO_HOLD_KEY);
-+      input_report_key(neo1973kbd_data->input, KEY_PAUSE, key_pressed);
-       input_sync(neo1973kbd_data->input);
-       return IRQ_HANDLED;
-@@ -67,13 +61,9 @@ static irqreturn_t neo1973kbd_headphone_irq(int irq, void *dev_id)
-       struct neo1973kbd *neo1973kbd_data = dev_id;
-       /* FIXME: use GPIO from platform_dev resources */
--      if (s3c2410_gpio_getpin(GTA01_GPIO_JACK_INSERT))
--              input_report_switch(neo1973kbd_data->input,
--                                  SW_HEADPHONE_INSERT, 1);
--      else
--              input_report_switch(neo1973kbd_data->input,
--                                  SW_HEADPHONE_INSERT, 0);
--
-+      int key_pressed = s3c2410_gpio_getpin(GTA01_GPIO_JACK_INSERT);
-+      input_report_switch(neo1973kbd_data->input,
-+                          SW_HEADPHONE_INSERT, key_pressed);
-       input_sync(neo1973kbd_data->input);
-       return IRQ_HANDLED;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1107-Remove-dead-code.patch b/target/linux/s3c24xx/patches-2.6.24/1107-Remove-dead-code.patch
deleted file mode 100644 (file)
index dfc63fa..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9f60f7625fe32037c9ce6467737cb510666b5a7a Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Sun, 13 Apr 2008 07:25:53 +0100
-Subject: [PATCH] Remove dead code
-
-Signed-Off-by: Holger Freyther <zecke@openmoko.org>
----
- drivers/input/keyboard/neo1973kbd.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-index 99ca9c3..30f324d 100644
---- a/drivers/input/keyboard/neo1973kbd.c
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -29,7 +29,6 @@
- struct neo1973kbd {
-       struct input_dev *input;
-       unsigned int suspended;
--      unsigned long suspend_jiffies;
- };
- static irqreturn_t neo1973kbd_aux_irq(int irq, void *dev_id)
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1108-Fix-the-FIXME-store-the-GPIO-value-for-now.patch b/target/linux/s3c24xx/patches-2.6.24/1108-Fix-the-FIXME-store-the-GPIO-value-for-now.patch
deleted file mode 100644 (file)
index 3f91d3a..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-From 897d69be643b8a8616b1c912444993a54f095917 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Sun, 13 Apr 2008 07:25:53 +0100
-Subject: [PATCH] Fix the FIXME, store the GPIO value for now
-
-Signed-Off-by: Holger Freyther <zecke@openmoko.org>
----
- drivers/input/keyboard/neo1973kbd.c |   23 +++++++++++++----------
- 1 files changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-index 30f324d..a77d8c0 100644
---- a/drivers/input/keyboard/neo1973kbd.c
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -23,20 +23,21 @@
- #include <linux/slab.h>
- #include <asm/hardware.h>
--#include <asm/arch/gta01.h>
- #include <asm/mach-types.h>
- struct neo1973kbd {
-       struct input_dev *input;
-       unsigned int suspended;
-+      int gpio_aux;
-+      int gpio_hold;
-+      int gpio_jack;    
- };
- static irqreturn_t neo1973kbd_aux_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--      /* FIXME: use GPIO from platform_dev resources */
--      int key_pressed = !s3c2410_gpio_getpin(GTA01_GPIO_AUX_KEY);
-+      int key_pressed = !s3c2410_gpio_getpin(neo1973kbd_data->gpio_aux);
-       input_report_key(neo1973kbd_data->input, KEY_PHONE, key_pressed);
-       input_sync(neo1973kbd_data->input);
-@@ -47,8 +48,7 @@ static irqreturn_t neo1973kbd_hold_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--      /* FIXME: use GPIO from platform_dev resources */
--      int key_pressed = 3c2410_gpio_getpin(GTA01_GPIO_HOLD_KEY);
-+      int key_pressed = s3c2410_gpio_getpin(neo1973kbd_data->gpio_hold);
-       input_report_key(neo1973kbd_data->input, KEY_PAUSE, key_pressed);
-       input_sync(neo1973kbd_data->input);
-@@ -59,8 +59,7 @@ static irqreturn_t neo1973kbd_headphone_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--      /* FIXME: use GPIO from platform_dev resources */
--      int key_pressed = s3c2410_gpio_getpin(GTA01_GPIO_JACK_INSERT);
-+      int key_pressed = s3c2410_gpio_getpin(neo1973kbd_data->gpio_jack);
-       input_report_switch(neo1973kbd_data->input,
-                           SW_HEADPHONE_INSERT, key_pressed);
-       input_sync(neo1973kbd_data->input);
-@@ -108,15 +107,19 @@ static int neo1973kbd_probe(struct platform_device *pdev)
-       if (pdev->resource[0].flags != 0)
-               return -EINVAL;
--      irq_aux = s3c2410_gpio_getirq(pdev->resource[0].start);
-+      neo1973kbd->gpio_aux = pdev->resource[0].start;
-+      neo1973kbd->gpio_hold = pdev->resource[1].start;
-+      neo1973kbd->gpio_jack = pdev->resource[2].start;
-+
-+      irq_aux = s3c2410_gpio_getirq(neo1973kbd->gpio_aux);
-       if (irq_aux < 0)
-               return -EINVAL;
--      irq_hold = s3c2410_gpio_getirq(pdev->resource[1].start);
-+      irq_hold = s3c2410_gpio_getirq(neo1973kbd->gpio_hold);
-       if (irq_hold < 0)
-               return -EINVAL;
--      irq_jack = s3c2410_gpio_getirq(pdev->resource[2].start);
-+      irq_jack = s3c2410_gpio_getirq(neo1973kbd->gpio_jack);
-       if (irq_jack < 0)
-               return -EINVAL;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1109-Convert-the-driver-to-the-generic-GPIO-framework.patch b/target/linux/s3c24xx/patches-2.6.24/1109-Convert-the-driver-to-the-generic-GPIO-framework.patch
deleted file mode 100644 (file)
index b2487c2..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-From 382b211cbde80703444333900dbdc0cf63d3ffab Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Sun, 13 Apr 2008 07:25:54 +0100
-Subject: [PATCH] Convert the driver to the generic GPIO framework
-
-Signed-Off-by: Holger Freyther <zecke@openmoko.org>
----
- drivers/input/keyboard/neo1973kbd.c |   20 ++++++++++----------
- 1 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-index a77d8c0..b413bc8 100644
---- a/drivers/input/keyboard/neo1973kbd.c
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -22,7 +22,7 @@
- #include <linux/module.h>
- #include <linux/slab.h>
--#include <asm/hardware.h>
-+#include <asm/gpio.h>
- #include <asm/mach-types.h>
- struct neo1973kbd {
-@@ -37,7 +37,7 @@ static irqreturn_t neo1973kbd_aux_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--      int key_pressed = !s3c2410_gpio_getpin(neo1973kbd_data->gpio_aux);
-+      int key_pressed = !gpio_get_value(neo1973kbd_data->gpio_aux);
-       input_report_key(neo1973kbd_data->input, KEY_PHONE, key_pressed);
-       input_sync(neo1973kbd_data->input);
-@@ -48,7 +48,7 @@ static irqreturn_t neo1973kbd_hold_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--      int key_pressed = s3c2410_gpio_getpin(neo1973kbd_data->gpio_hold);
-+      int key_pressed = gpio_get_value(neo1973kbd_data->gpio_hold);
-       input_report_key(neo1973kbd_data->input, KEY_PAUSE, key_pressed);
-       input_sync(neo1973kbd_data->input);
-@@ -59,7 +59,7 @@ static irqreturn_t neo1973kbd_headphone_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--      int key_pressed = s3c2410_gpio_getpin(neo1973kbd_data->gpio_jack);
-+      int key_pressed = gpio_get_value(neo1973kbd_data->gpio_jack);
-       input_report_switch(neo1973kbd_data->input,
-                           SW_HEADPHONE_INSERT, key_pressed);
-       input_sync(neo1973kbd_data->input);
-@@ -111,15 +111,15 @@ static int neo1973kbd_probe(struct platform_device *pdev)
-       neo1973kbd->gpio_hold = pdev->resource[1].start;
-       neo1973kbd->gpio_jack = pdev->resource[2].start;
--      irq_aux = s3c2410_gpio_getirq(neo1973kbd->gpio_aux);
-+      irq_aux = gpio_to_irq(neo1973kbd->gpio_aux);
-       if (irq_aux < 0)
-               return -EINVAL;
--      irq_hold = s3c2410_gpio_getirq(neo1973kbd->gpio_hold);
-+      irq_hold = gpio_to_irq(neo1973kbd->gpio_hold);
-       if (irq_hold < 0)
-               return -EINVAL;
--      irq_jack = s3c2410_gpio_getirq(neo1973kbd->gpio_jack);
-+      irq_jack = gpio_to_irq(neo1973kbd->gpio_jack);
-       if (irq_jack < 0)
-               return -EINVAL;
-@@ -194,9 +194,9 @@ static int neo1973kbd_remove(struct platform_device *pdev)
- {
-       struct neo1973kbd *neo1973kbd = platform_get_drvdata(pdev);
--      free_irq(s3c2410_gpio_getirq(pdev->resource[2].start), neo1973kbd);
--      free_irq(s3c2410_gpio_getirq(pdev->resource[1].start), neo1973kbd);
--      free_irq(s3c2410_gpio_getirq(pdev->resource[0].start), neo1973kbd);
-+      free_irq(gpio_to_irq(pdev->resource[2].start), neo1973kbd);
-+      free_irq(gpio_to_irq(pdev->resource[1].start), neo1973kbd);
-+      free_irq(gpio_to_irq(pdev->resource[0].start), neo1973kbd);
-       input_unregister_device(neo1973kbd->input);
-       input_free_device(neo1973kbd->input);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1110-Add-GPIO-IRQ-for-the-s3c2410-and-add-irq_to_gpio.patch b/target/linux/s3c24xx/patches-2.6.24/1110-Add-GPIO-IRQ-for-the-s3c2410-and-add-irq_to_gpio.patch
deleted file mode 100644 (file)
index 4b94d76..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-From 5134afd82f568f1eae133069bc9298e731546bc1 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Sun, 13 Apr 2008 07:25:54 +0100
-Subject: [PATCH] Add GPIO -> IRQ for the s3c2410 and add irq_to_gpio to the gpio.h of the Samsung SoC
-
-Use this irq_to_gpio in the neo1973 keyboard driver
----
- arch/arm/plat-s3c24xx/gpio.c            |   17 +++++++++++++++++
- drivers/input/keyboard/neo1973kbd.c     |   19 ++++++-------------
- include/asm-arm/arch-s3c2410/gpio.h     |    1 +
- include/asm-arm/arch-s3c2410/hardware.h |    2 ++
- 4 files changed, 26 insertions(+), 13 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/gpio.c b/arch/arm/plat-s3c24xx/gpio.c
-index 7cab212..dfdb33a 100644
---- a/arch/arm/plat-s3c24xx/gpio.c
-+++ b/arch/arm/plat-s3c24xx/gpio.c
-@@ -188,6 +188,23 @@ int s3c2410_gpio_getirq(unsigned int pin)
- EXPORT_SYMBOL(s3c2410_gpio_getirq);
-+int s3c2410_irq_to_gpio(unsigned int irq)
-+{
-+      /* not valid interrupts */
-+      if (irq > 15 + IRQ_EINT8)
-+              return -1;
-+
-+      if (irq < IRQ_EINT4)
-+              return (irq - IRQ_EINT0) + S3C2410_GPF0;
-+
-+      if (irq < IRQ_EINT8)
-+              return (irq - IRQ_EINT4) + S3C2410_GPF4;
-+
-+      return (irq - IRQ_EINT8) + S3C2410_GPG0;
-+}
-+
-+EXPORT_SYMBOL(s3c2410_irq_to_gpio);
-+
- static void pretty_dump(u32 cfg, u32 state, u32 pull,
-                       const char ** function_names_2,
-                       const char ** function_names_3,
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-index b413bc8..06fa8e0 100644
---- a/drivers/input/keyboard/neo1973kbd.c
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -28,16 +28,13 @@
- struct neo1973kbd {
-       struct input_dev *input;
-       unsigned int suspended;
--      int gpio_aux;
--      int gpio_hold;
--      int gpio_jack;    
- };
- static irqreturn_t neo1973kbd_aux_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--      int key_pressed = !gpio_get_value(neo1973kbd_data->gpio_aux);
-+      int key_pressed = !gpio_get_value(irq_to_gpio(irq));
-       input_report_key(neo1973kbd_data->input, KEY_PHONE, key_pressed);
-       input_sync(neo1973kbd_data->input);
-@@ -48,7 +45,7 @@ static irqreturn_t neo1973kbd_hold_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--      int key_pressed = gpio_get_value(neo1973kbd_data->gpio_hold);
-+      int key_pressed = gpio_get_value(irq_to_gpio(irq));
-       input_report_key(neo1973kbd_data->input, KEY_PAUSE, key_pressed);
-       input_sync(neo1973kbd_data->input);
-@@ -59,7 +56,7 @@ static irqreturn_t neo1973kbd_headphone_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--      int key_pressed = gpio_get_value(neo1973kbd_data->gpio_jack);
-+      int key_pressed = gpio_get_value(irq_to_gpio(irq));
-       input_report_switch(neo1973kbd_data->input,
-                           SW_HEADPHONE_INSERT, key_pressed);
-       input_sync(neo1973kbd_data->input);
-@@ -107,19 +104,15 @@ static int neo1973kbd_probe(struct platform_device *pdev)
-       if (pdev->resource[0].flags != 0)
-               return -EINVAL;
--      neo1973kbd->gpio_aux = pdev->resource[0].start;
--      neo1973kbd->gpio_hold = pdev->resource[1].start;
--      neo1973kbd->gpio_jack = pdev->resource[2].start;
--
--      irq_aux = gpio_to_irq(neo1973kbd->gpio_aux);
-+      irq_aux = gpio_to_irq(pdev->resource[0].start);
-       if (irq_aux < 0)
-               return -EINVAL;
--      irq_hold = gpio_to_irq(neo1973kbd->gpio_hold);
-+      irq_hold = gpio_to_irq(pdev->resource[1].start);
-       if (irq_hold < 0)
-               return -EINVAL;
--      irq_jack = gpio_to_irq(neo1973kbd->gpio_jack);
-+      irq_jack = gpio_to_irq(pdev->resource[2].start);
-       if (irq_jack < 0)
-               return -EINVAL;
-diff --git a/include/asm-arm/arch-s3c2410/gpio.h b/include/asm-arm/arch-s3c2410/gpio.h
-index 7583895..9c8a338 100644
---- a/include/asm-arm/arch-s3c2410/gpio.h
-+++ b/include/asm-arm/arch-s3c2410/gpio.h
-@@ -61,6 +61,7 @@ static inline int gpio_direction_output(unsigned gpio, int value)
- #define gpio_to_irq(gpio)             s3c2400_gpio_getirq(gpio)
- #else
- #define gpio_to_irq(gpio)             s3c2410_gpio_getirq(gpio)
-+#define irq_to_gpio(irq)              s3c2410_irq_to_gpio(irq)
- #endif
- /* FIXME implement irq_to_gpio() */
-diff --git a/include/asm-arm/arch-s3c2410/hardware.h b/include/asm-arm/arch-s3c2410/hardware.h
-index 6dadf58..caea511 100644
---- a/include/asm-arm/arch-s3c2410/hardware.h
-+++ b/include/asm-arm/arch-s3c2410/hardware.h
-@@ -50,6 +50,8 @@ extern unsigned int s3c2410_gpio_getcfg(unsigned int pin);
- extern int s3c2410_gpio_getirq(unsigned int pin);
-+extern int s3c2410_irq_to_gpio(unsigned int irq);
-+
- #ifdef CONFIG_CPU_S3C2400
- extern int s3c2400_gpio_getirq(unsigned int pin);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1111-This-is-gta02-and-not-gta01.-Do-not-call-the-vibrato.patch b/target/linux/s3c24xx/patches-2.6.24/1111-This-is-gta02-and-not-gta01.-Do-not-call-the-vibrato.patch
deleted file mode 100644 (file)
index 2cd7253..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-From ba854ad9250eca9dc665507f0a4a80cbc6449ff5 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Sun, 13 Apr 2008 07:25:54 +0100
-Subject: [PATCH] This is gta02 and not gta01. Do not call the vibrator led.
-
-Signed-Off-by: Holger Freyther <zecke@openmoko.org>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   25 ++++++++++++-------------
- 1 files changed, 12 insertions(+), 13 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 3574375..bd2888a 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -67,7 +67,6 @@
- #include <asm/arch/spi-gpio.h>
- #include <asm/arch/usb-control.h>
--#include <asm/arch/gta01.h>
- #include <asm/arch/gta02.h>
- #include <asm/plat-s3c/regs-serial.h>
-@@ -855,17 +854,17 @@ static struct glamo_spigpio_info glamo_spigpio_cfg = {
-       .board_info     = gta02_spi_board_info,
- };
--static struct resource gta01_led_resources[] = {
-+static struct resource gta02_vibrator_resources[] = {
-       [0] = {
-               .start  = GTA02_GPIO_VIBRATOR_ON,
-               .end    = GTA02_GPIO_VIBRATOR_ON,
-       },
- };
--static struct platform_device gta01_led_dev = {
-+static struct platform_device gta02_vibrator_dev = {
-       .name           = "neo1973-vibrator",
--      .num_resources  = ARRAY_SIZE(gta01_led_resources),
--      .resource       = gta01_led_resources,
-+      .num_resources  = ARRAY_SIZE(gta02_vibrator_resources),
-+      .resource       = gta02_vibrator_resources,
- };
- /* SPI: Accelerometers attached to SPI of s3c244x */
-@@ -1090,7 +1089,7 @@ struct platform_device gta02_led_dev = {
-       .resource       = gta02_led_resources,
- };
--static struct resource gta01_button_resources[] = {
-+static struct resource gta02_button_resources[] = {
-       [0] = {
-               .start = GTA02_GPIO_AUX_KEY,
-               .end   = GTA02_GPIO_AUX_KEY,
-@@ -1105,13 +1104,13 @@ static struct resource gta01_button_resources[] = {
-       },
- };
--static struct platform_device gta01_button_dev = {
-+static struct platform_device gta02_button_dev = {
-       .name           = "neo1973-button",
--      .num_resources  = ARRAY_SIZE(gta01_button_resources),
--      .resource       = gta01_button_resources,
-+      .num_resources  = ARRAY_SIZE(gta02_button_resources),
-+      .resource       = gta02_button_resources,
- };
--static struct platform_device gta01_pm_gsm_dev = {
-+static struct platform_device gta02_pm_gsm_dev = {
-       .name           = "neo1973-pm-gsm",
- };
-@@ -1375,13 +1374,13 @@ static void __init gta02_machine_init(void)
-       platform_device_register(&gta02_glamo_dev);
-       platform_device_register(&s3c_device_spi_acc);
--      platform_device_register(&gta01_button_dev);
--      platform_device_register(&gta01_pm_gsm_dev);
-+      platform_device_register(&gta02_button_dev);
-+      platform_device_register(&gta02_pm_gsm_dev);
-       platform_device_register(&gta02_pm_usbhost_dev);
-       mangle_pmu_pdata_by_system_rev();
-       platform_device_register(&gta02_pmu_dev);
--      platform_device_register(&gta01_led_dev);
-+      platform_device_register(&gta02_vibrator_dev);
-       platform_device_register(&gta02_led_dev);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1112-Fix-spelling.-flaoting-floating.patch b/target/linux/s3c24xx/patches-2.6.24/1112-Fix-spelling.-flaoting-floating.patch
deleted file mode 100644 (file)
index 75d8a0e..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From 69998884e413697ea6b57a1deedb7ca5fde520ac Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Sun, 13 Apr 2008 07:25:54 +0100
-Subject: [PATCH] Fix spelling. flaoting => floating
-
-Signed-Off-by: Holger Freyther <zecke@openmoko.org>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index 13cb45b..1123d7d 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -161,7 +161,7 @@ static int gta01_gsm_suspend(struct platform_device *pdev, pm_message_t state)
-       /* GPIO state is saved/restored by S3C2410 core GPIO driver, so we
-        * don't need to do anything here */
--      /* disable DL GSM to prevent jack_insert becoming flaoting */
-+      /* disable DL GSM to prevent jack_insert becoming floating */
-       if (machine_is_neo1973_gta02())
-               s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, 1);
-       return 0;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1113-Fix-the-firing-of-Jack-Interrupts-after-resume-whe.patch b/target/linux/s3c24xx/patches-2.6.24/1113-Fix-the-firing-of-Jack-Interrupts-after-resume-whe.patch
deleted file mode 100644 (file)
index fad3585..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-From d6c8d6b85864edd5bb616f9fda0d2e9c1f74de42 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Sun, 13 Apr 2008 07:25:54 +0100
-Subject: [PATCH] Fix the firing of "Jack"-Interrupts after resume when the modem is powered on.
-
-GTA02_GPIO_nDL_GSM defaults to high/1. On resume do not enable the DL_GSM if
-it was not enabled before. This is stopping the storm of interrupts.
-
-Fix the logic in the download file handling. Downloads are disabled (0) when
-the GTA02_GPIO_nDL_GSM is high (1). To enable downloading set
-GTA02_GPIO_nDL_GSM to low (0, !on). Disable the jack interrupt while download
-the is active. When disabling download we will get a couple of jack interrupts
-but this is hardly avoidable.
-
-Avoid reading the GPIO value if we do not even have a console set.
-
-Signed-Off-by: Holger Freyther <zecke@openmoko.org>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |   35 +++++++++++++++++++++++--------
- 1 files changed, 26 insertions(+), 9 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index 1123d7d..b4ea8ba 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -17,8 +17,9 @@
- #include <linux/platform_device.h>
- #include <linux/console.h>
- #include <linux/errno.h>
-+#include <linux/interrupt.h>
--#include <asm/hardware.h>
-+#include <asm/gpio.h>
- #include <asm/mach-types.h>
- #include <asm/arch/gta01.h>
-@@ -30,6 +31,7 @@
- struct gta01pm_priv {
-       int gpio_ngsm_en;
-+        int gpio_ndl_gsm;
-       struct console *con;
- };
-@@ -68,7 +70,7 @@ static ssize_t gsm_read(struct device *dev, struct device_attribute *attr,
- #endif
- #ifdef CONFIG_MACH_NEO1973_GTA02
-               if (machine_is_neo1973_gta02())
--                      if (s3c2410_gpio_getpin(GTA02_GPIO_nDL_GSM))
-+                      if (!s3c2410_gpio_getpin(GTA02_GPIO_nDL_GSM))
-                               goto out_1;
- #endif
-       }
-@@ -143,8 +145,18 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-                       s3c2410_gpio_setpin(GTA01_GPIO_MODEM_DNLOAD, on);
- #endif
- #ifdef CONFIG_MACH_NEO1973_GTA02
--              if (machine_is_neo1973_gta02())
--                      s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, on);
-+              if (machine_is_neo1973_gta02()) {
-+                      /* FIXME: Layering violation, we know how this relates to
-+                       * the Jack-IRQ. And we assume the keyboard driver to be
-+                       * around. */
-+                      if (on)
-+                          disable_irq(gpio_to_irq(GTA02_GPIO_JACK_INSERT));
-+                      else
-+                          enable_irq(gpio_to_irq(GTA02_GPIO_JACK_INSERT));
-+
-+                      gta01_gsm.gpio_ndl_gsm = !on;
-+                      s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, !on);
-+              }
- #endif
-       }
-@@ -159,26 +171,29 @@ static DEVICE_ATTR(download, 0644, gsm_read, gsm_write);
- static int gta01_gsm_suspend(struct platform_device *pdev, pm_message_t state)
- {
-       /* GPIO state is saved/restored by S3C2410 core GPIO driver, so we
--       * don't need to do anything here */
-+       * don't need to do much here. */
-+
--      /* disable DL GSM to prevent jack_insert becoming floating */
-+      /* disable DL GSM to prevent jack_insert becoming 'floating' */
-       if (machine_is_neo1973_gta02())
-               s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, 1);
-+
-       return 0;
- }
- static int gta01_gsm_resume(struct platform_device *pdev)
- {
-       /* GPIO state is saved/restored by S3C2410 core GPIO driver, so we
--       * don't need to do anything here */
-+       * don't need to do much here. */
-       /* Make sure that the kernel console on the serial port is still
-        * disabled. FIXME: resume ordering race with serial driver! */
--      if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_ON) && gta01_gsm.con)
-+      if (gta01_gsm.con && s3c2410_gpio_getpin(GTA01_GPIO_MODEM_ON))
-               console_stop(gta01_gsm.con);
-       if (machine_is_neo1973_gta02())
--              s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, 0);
-+              s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, gta01_gsm.gpio_ndl_gsm);
-+
-       return 0;
- }
- #else
-@@ -248,6 +263,8 @@ static int __init gta01_gsm_probe(struct platform_device *pdev)
-       } else
-               gta01_gsm.con = NULL;
-+      gta01_gsm.gpio_ndl_gsm = 1;
-+
-       return sysfs_create_group(&pdev->dev.kobj, &gta01_gsm_attr_group);
- }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1114-Enable-GPS-only-if-it-was-powered-on-before-suspendi.patch b/target/linux/s3c24xx/patches-2.6.24/1114-Enable-GPS-only-if-it-was-powered-on-before-suspendi.patch
deleted file mode 100644 (file)
index 4ba9ea3..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-From d685e208663ffc9bd454af6698cb2945e60a3ba8 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Sun, 13 Apr 2008 07:25:55 +0100
-Subject: [PATCH] Enable GPS only if it was powered on before suspending the device
-
-    Similar to the neo1974_pm_gsm.c keep a static struct around. On suspend
-    we will save the current power state, on resume we will use this
-    information to enable power of the GPS only when it was powered on before.
-    This is passing basic tests with screen /dev/ttySAC1 on suspend and resume.
-
-    Only do this for the GTA02 as I don't have a gllin setup for the GTA01
-
-    I wonder why the suspend and resume code is not using gps_pwron_set and why
-    for the GTA02 we need to keep the state of the GPIOs, this should be done
-    by the s3c code.
-
-Signed-Off-by: Holger Frether <zecke@openmoko.org>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gps.c |   22 ++++++++++++++--------
- 1 files changed, 14 insertions(+), 8 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-index e8cfb96..b12f7bc 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-@@ -30,6 +30,12 @@
- #include <linux/pcf50633.h>
- #endif
-+struct neo1973_pm_gps_data {
-+      int power_was_on;
-+};
-+
-+static struct neo1973_pm_gps_data neo1973_gps;
-+
- /* This is the 2.8V supply for the RTC crystal, the mail clock crystal and
-  * the input to VDD_RF */
- static void gps_power_2v8_set(int on)
-@@ -266,8 +272,8 @@ static void gps_pwron_set(int on)
-               if (on)
-                       pcf50633_voltage_set(pcf50633_global,
-                               PCF50633_REGULATOR_LDO5, 3000);
--                      pcf50633_onoff_set(pcf50633_global,
--                              PCF50633_REGULATOR_LDO5, on);
-+              pcf50633_onoff_set(pcf50633_global,
-+                      PCF50633_REGULATOR_LDO5, on);
-       }
- #endif /* CONFIG_MACH_NEO1973_GTA02 */
- }
-@@ -476,6 +482,9 @@ static DEVICE_ATTR(power_sequence, 0644, power_sequence_read,
- static int gta01_pm_gps_suspend(struct platform_device *pdev,
-                               pm_message_t state)
- {
-+
-+      neo1973_gps.power_was_on = gps_pwron_get();
-+
- #ifdef CONFIG_MACH_NEO1973_GTA01
-       if (machine_is_neo1973_gta01()) {
-               /* FIXME */
-@@ -491,9 +500,7 @@ static int gta01_pm_gps_suspend(struct platform_device *pdev,
-               /* don't let RX from unpowered GPS float */
-               s3c2410_gpio_pullup(S3C2410_GPH5, 1);
--              /* FIXME */
--              pcf50633_onoff_set(pcf50633_global,
--                      PCF50633_REGULATOR_LDO5, 0);
-+              gps_pwron_set(0);
-       }
- #endif /* CONFIG_MACH_NEO1973_GTA02 */
-@@ -519,9 +526,8 @@ static int gta01_pm_gps_resume(struct platform_device *pdev)
-               /* remove pulldown now it won't be floating any more */
-               s3c2410_gpio_pullup(S3C2410_GPH5, 0);
--              /* FIXME */
--              pcf50633_onoff_set(pcf50633_global,
--                      PCF50633_REGULATOR_LDO5, 1);
-+              if (neo1973_gps.power_was_on)
-+                  gps_pwron_set(1);
- #endif /* CONFIG_MACH_NEO1973_GTA02 */
-       }
-       return 0;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1115-fix-wlan-disable.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1115-fix-wlan-disable.patch.patch
deleted file mode 100644 (file)
index e2eaed9..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-From e5b19d7219195af3496f3f3904e62d75d300156f Mon Sep 17 00:00:00 2001
-From: Sameo <sameo@openedhand.com>
-Date: Sun, 13 Apr 2008 07:25:55 +0100
-Subject: [PATCH] fix-wlan-disable.patch
-
-see
-http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=1288
----
- .../sdio/function/wlan/ar6000/ar6000/ar6000_drv.c  |    1 +
- .../sdio/function/wlan/ar6000/ar6000/ar6000_drv.h  |    1 +
- .../function/wlan/ar6000/ar6000/wireless_ext.c     |   19 +++++++++--
- .../sdio/function/wlan/ar6000/include/wmi_api.h    |    1 +
- drivers/sdio/function/wlan/ar6000/wmi/wmi.c        |   33 ++++++++++++++++++++
- 5 files changed, 52 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-index bb9ef55..d35f31c 100644
---- a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-@@ -704,6 +704,7 @@ ar6000_avail_ev(HTC_HANDLE HTCHandle)
-     ar->arHtcTarget          = HTCHandle;
-     ar->arHifDevice          = HTCGetHifDevice(HTCHandle);
-     ar->arWlanState          = WLAN_ENABLED;
-+    ar->arRadioSwitch        = WLAN_ENABLED;
-     ar->arDeviceIndex        = device_index;
-     A_INIT_TIMER(&ar->arHBChallengeResp.timer, ar6000_detect_error, dev);
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h
-index c7b6ec4..655288b 100644
---- a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h
-@@ -201,6 +201,7 @@ typedef struct ar6_softc {
-     A_BOOL                  arWmiEnabled;
-     A_BOOL                  arWmiReady;
-     A_BOOL                  arConnected;
-+    A_BOOL                  arRadioSwitch;
-     HTC_HANDLE              arHtcTarget;
-     void                    *arHifDevice;
-     spinlock_t              arLock;
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c b/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
-index d775e4d..db749e2 100644
---- a/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
-@@ -649,8 +649,16 @@ ar6000_ioctl_siwtxpow(struct net_device *dev,
-         return -EIO;
-     }
--    if (rrq->disabled) {
--        return -EOPNOTSUPP;
-+    if (ar->arRadioSwitch == WLAN_ENABLED
-+      && rrq->disabled) {
-+          if (wmi_switch_radio(ar->arWmi, WLAN_DISABLED) < 0)
-+                  return -EIO;
-+          ar->arRadioSwitch = WLAN_DISABLED;
-+    } else if (ar->arRadioSwitch == WLAN_DISABLED
-+             && !rrq->disabled) {
-+          if (wmi_switch_radio(ar->arWmi, WLAN_ENABLED) < 0)
-+                  return -EIO;
-+          ar->arRadioSwitch = WLAN_ENABLED;
-     }
-     if (rrq->fixed) {
-@@ -686,6 +694,11 @@ ar6000_ioctl_giwtxpow(struct net_device *dev,
-         return -EIO;
-     }
-+    if (ar->arRadioSwitch == WLAN_DISABLED) {
-+          rrq->disabled = 1;
-+          return 0;
-+    }
-+
-     if (down_interruptible(&ar->arSem)) {
-         return -ERESTARTSYS;
-     }
-@@ -1610,7 +1623,7 @@ ar6000_ioctl_giwrange(struct net_device *dev,
-     data->length = sizeof(struct iw_range);
-     A_MEMZERO(range, sizeof(struct iw_range));
--    range->txpower_capa = 0;
-+    range->txpower_capa = IW_TXPOW_DBM;
-     range->min_pmp = 1 * 1024;
-     range->max_pmp = 65535 * 1024;
-diff --git a/drivers/sdio/function/wlan/ar6000/include/wmi_api.h b/drivers/sdio/function/wlan/ar6000/include/wmi_api.h
-index aa9a9c6..267edfd 100644
---- a/drivers/sdio/function/wlan/ar6000/include/wmi_api.h
-+++ b/drivers/sdio/function/wlan/ar6000/include/wmi_api.h
-@@ -168,6 +168,7 @@ A_STATUS wmi_set_pmkid_list_cmd(struct wmi_t *wmip,
-                                 WMI_SET_PMKID_LIST_CMD *pmkInfo);
- A_STATUS wmi_set_txPwr_cmd(struct wmi_t *wmip, A_UINT8 dbM);
- A_STATUS wmi_get_txPwr_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_switch_radio(struct wmi_t *wmip, A_UINT8 on);
- A_STATUS wmi_addBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex, A_UINT8 *bssid);
- A_STATUS wmi_deleteBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex);
- A_STATUS wmi_set_tkip_countermeasures_cmd(struct wmi_t *wmip, A_BOOL en);
-diff --git a/drivers/sdio/function/wlan/ar6000/wmi/wmi.c b/drivers/sdio/function/wlan/ar6000/wmi/wmi.c
-index 0e0e6ba..d322cf3 100644
---- a/drivers/sdio/function/wlan/ar6000/wmi/wmi.c
-+++ b/drivers/sdio/function/wlan/ar6000/wmi/wmi.c
-@@ -2990,6 +2990,39 @@ wmi_get_txPwr_cmd(struct wmi_t *wmip)
-     return (wmi_cmd_send(wmip, osbuf, WMI_GET_TX_PWR_CMDID, NO_SYNC_WMIFLAG));
- }
-+A_STATUS
-+wmi_switch_radio(struct wmi_t *wmip, A_UINT8 on)
-+{
-+      WMI_SCAN_PARAMS_CMD scParams = {0, 0, 0, 0, 0,
-+                                      WMI_SHORTSCANRATIO_DEFAULT,
-+                                      DEFAULT_SCAN_CTRL_FLAGS,
-+                                      0};
-+
-+      if (on) {
-+              /* Enable foreground scanning */
-+                if (wmi_scanparams_cmd(wmip, scParams.fg_start_period,
-+                                       scParams.fg_end_period,
-+                                       scParams.bg_period,
-+                                       scParams.minact_chdwell_time,
-+                                       scParams.maxact_chdwell_time,
-+                                       scParams.pas_chdwell_time,
-+                                       scParams.shortScanRatio,
-+                                       scParams.scanCtrlFlags,
-+                                       scParams.max_dfsch_act_time) != A_OK) {
-+                      return -EIO;
-+              }
-+      } else {
-+              wmi_disconnect_cmd(wmip);
-+              if (wmi_scanparams_cmd(wmip, 0xFFFF, 0, 0, 0,
-+                                     0, 0, 0, 0xFF, 0) != A_OK) {
-+                      return -EIO;
-+              }
-+      }
-+
-+      return A_OK;
-+}
-+
-+
- A_UINT16
- wmi_get_mapped_qos_queue(struct wmi_t *wmip, A_UINT8 trafficClass)
- {
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1116-defconfig-audio.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1116-defconfig-audio.patch.patch
deleted file mode 100644 (file)
index 1c2f4ca..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From 11264214bbe864fb6e55fe2ab988d6bd37f2f705 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Sun, 13 Apr 2008 07:25:55 +0100
-Subject: [PATCH] defconfig-audio.patch
- Add in some audio config needed
- Signed-off-by: Andy Green <andy@openmoko.com>
-
----
- defconfig-2.6.24 |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index cce3737..4df10bf 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.24
--# Fri Feb 22 22:38:48 2008
-+# Sat Mar  1 11:36:29 2008
- #
- CONFIG_ARM=y
- CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-@@ -285,6 +285,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
- CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
- # CONFIG_XIP_KERNEL is not set
- CONFIG_KEXEC=y
-+CONFIG_ATAGS_PROC=y
- #
- # Floating point emulation
-@@ -1273,7 +1274,7 @@ CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=y
- #
- # SoC Audio support for SuperH
- #
--CONFIG_SND_SOC_WM8753=m
-+CONFIG_SND_SOC_WM8753=y
- #
- # Open Sound System
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1117-audio-tickless-timeout.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1117-audio-tickless-timeout.patch.patch
deleted file mode 100644 (file)
index 1c74f1b..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-From 5d6f04132cb5bd8fa8f1c9c9c3dc337aeae18f4c Mon Sep 17 00:00:00 2001
-From: Werner Almesberger <werner@openmoko.org>
-Date: Sun, 13 Apr 2008 07:25:55 +0100
-Subject: [PATCH] audio-tickless-timeout.patch
-
-When we resume, we can end up in
-sound/soc/s3c24xx/s3c24xx-i2s.c:s3c24xx_snd_lrsync
-with the timer tick still disabled, and the LR signal never happening.
-Thus, we loop forever.
-
-The patch below changes the timeout mechanism to use udelay, which
-doesn't need timer ticks.
-
-Note that this code is in a module, so to get the fix, you have to
-build the modules, and update them.
-
-The kernel now resumes but does the ugly GSM modem ticking. I'll have
-to find a good place to turn that one off ...
-
-- Werner
-
----------------------------------- cut here -----------------------------------
-
-- sound/soc/s3c24xx/s3c24xx-i2s.c (s3c24xx_snd_lrsync): in resume, we may
-  call s3c24xx_snd_lrsync with timer ticks disabled, thus jiffies never
-  change. Use udelay to avoid this problem.
----
- sound/soc/s3c24xx/s3c24xx-i2s.c |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c
-index 4d74cc0..43fd25a 100644
---- a/sound/soc/s3c24xx/s3c24xx-i2s.c
-+++ b/sound/soc/s3c24xx/s3c24xx-i2s.c
-@@ -180,7 +180,7 @@ static void s3c24xx_snd_rxctrl(int on)
- static int s3c24xx_snd_lrsync(void)
- {
-       u32 iiscon;
--      unsigned long timeout = jiffies + msecs_to_jiffies(5);
-+      int timeout = 50; /* 5ms */
-       DBG("Entered %s\n", __FUNCTION__);
-@@ -189,8 +189,9 @@ static int s3c24xx_snd_lrsync(void)
-               if (iiscon & S3C2410_IISCON_LRINDEX)
-                       break;
--              if (timeout < jiffies)
-+              if (!--timeout)
-                       return -ETIMEDOUT;
-+              udelay(100);
-       }
-       return 0;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1118-fix-gsm-download-irq-balance-issue.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1118-fix-gsm-download-irq-balance-issue.patch.patch
deleted file mode 100644 (file)
index 8b3f376..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-From 129f349dc3ee75dfb0580436d82fd0d6633ba2c4 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Sun, 13 Apr 2008 07:25:55 +0100
-Subject: [PATCH] fix-gsm-download-irq-balance-issue.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |   28 +++++++++++++++++++++-------
- 1 files changed, 21 insertions(+), 7 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index b4ea8ba..c3292b8 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -146,13 +146,24 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
- #endif
- #ifdef CONFIG_MACH_NEO1973_GTA02
-               if (machine_is_neo1973_gta02()) {
--                      /* FIXME: Layering violation, we know how this relates to
--                       * the Jack-IRQ. And we assume the keyboard driver to be
--                       * around. */
--                      if (on)
--                          disable_irq(gpio_to_irq(GTA02_GPIO_JACK_INSERT));
--                      else
--                          enable_irq(gpio_to_irq(GTA02_GPIO_JACK_INSERT));
-+                      /*
-+                       * the keyboard / buttons driver requests and enables
-+                       * the JACK_INSERT IRQ.  We have to take care about
-+                       * not enabling and disabling the IRQ when it was
-+                       * already in that state or we get "unblanaced IRQ"
-+                       * kernel warnings and stack dumps.  So we use the
-+                       * copy of the ndl_gsm state to figure out if we should
-+                       * enable or disable the jack interrupt
-+                       */
-+                      if (on) {
-+                              if (gta01_gsm.gpio_ndl_gsm)
-+                                      disable_irq(gpio_to_irq(
-+                                                     GTA02_GPIO_JACK_INSERT));
-+                      } else {
-+                              if (!gta01_gsm.gpio_ndl_gsm)
-+                                      enable_irq(gpio_to_irq(
-+                                                     GTA02_GPIO_JACK_INSERT));
-+                      }
-                       gta01_gsm.gpio_ndl_gsm = !on;
-                       s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, !on);
-@@ -263,7 +274,10 @@ static int __init gta01_gsm_probe(struct platform_device *pdev)
-       } else
-               gta01_gsm.con = NULL;
-+      /* note that download initially disabled, and enforce that */
-       gta01_gsm.gpio_ndl_gsm = 1;
-+      if (machine_is_neo1973_gta02())
-+              s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, 1);
-       return sysfs_create_group(&pdev->dev.kobj, &gta01_gsm_attr_group);
- }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1119-add-modules-defconfig.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1119-add-modules-defconfig.patch.patch
deleted file mode 100644 (file)
index dedc248..0000000
+++ /dev/null
@@ -1,5376 +0,0 @@
-From 1b5fe5baf3d57244221823402164bc6b016c0d5c Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Sun, 13 Apr 2008 07:25:56 +0100
-Subject: [PATCH] add-modules-defconfig.patch
- From: Andy Green <andy@openmoko.com>
-
-Add in the svn "mostly modules" config and GTA01 / 02 split
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- build                             |    1 +
- defconfig-2.6.24-maxmodules       | 1769 +++++++++++++++++++++++++++++++++++++
- defconfig-gta01                   | 1769 +++++++++++++++++++++++++++++++++++++
- defconfig-gta02                   | 1769 +++++++++++++++++++++++++++++++++++++
- synthesize-gta-module-configs.mak |    9 +
- 5 files changed, 5317 insertions(+), 0 deletions(-)
- create mode 100644 defconfig-2.6.24-maxmodules
- create mode 100644 defconfig-gta01
- create mode 100644 defconfig-gta02
- create mode 100644 synthesize-gta-module-configs.mak
-
-diff --git a/build b/build
-index 7e61ea2..728454d 100755
---- a/build
-+++ b/build
-@@ -3,6 +3,7 @@
- set -x
- export CROSS_COMPILE=../../cross/bin/arm-angstrom-linux-gnueabi-
-+make -f synthesize-gta-module-configs.mak
- make ARCH=arm silentoldconfig
- if make -j5 ARCH=arm; then
-       ${CROSS_COMPILE}objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux linux.bin
-diff --git a/defconfig-2.6.24-maxmodules b/defconfig-2.6.24-maxmodules
-new file mode 100644
-index 0000000..6f6243e
---- /dev/null
-+++ b/defconfig-2.6.24-maxmodules
-@@ -0,0 +1,1769 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.24
-+# Mon Feb 25 07:03:56 2008
-+#
-+CONFIG_ARM=y
-+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-+CONFIG_GENERIC_GPIO=y
-+# CONFIG_GENERIC_TIME is not set
-+# CONFIG_GENERIC_CLOCKEVENTS is not set
-+CONFIG_MMU=y
-+CONFIG_NO_IOPORT=y
-+CONFIG_GENERIC_HARDIRQS=y
-+CONFIG_STACKTRACE_SUPPORT=y
-+CONFIG_LOCKDEP_SUPPORT=y
-+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-+CONFIG_HARDIRQS_SW_RESEND=y
-+CONFIG_GENERIC_IRQ_PROBE=y
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_ZONE_DMA=y
-+CONFIG_FIQ=y
-+CONFIG_VECTORS_BASE=0xffff0000
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_LOCK_KERNEL=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_SYSFS_DEPRECATED is not set
-+# CONFIG_RELAY is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+CONFIG_SYSCTL=y
-+# CONFIG_EMBEDDED is not set
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=m
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=m
-+# CONFIG_DEFAULT_AS is not set
-+CONFIG_DEFAULT_DEADLINE=y
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="deadline"
-+
-+#
-+# System Type
-+#
-+# CONFIG_ARCH_AAEC2000 is not set
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_REALVIEW is not set
-+# CONFIG_ARCH_VERSATILE is not set
-+# CONFIG_ARCH_AT91 is not set
-+# CONFIG_ARCH_CLPS7500 is not set
-+# CONFIG_ARCH_CLPS711X is not set
-+# CONFIG_ARCH_CO285 is not set
-+# CONFIG_ARCH_EBSA110 is not set
-+# CONFIG_ARCH_EP93XX is not set
-+# CONFIG_ARCH_FOOTBRIDGE is not set
-+# CONFIG_ARCH_NETX is not set
-+# CONFIG_ARCH_H720X is not set
-+# CONFIG_ARCH_IMX is not set
-+# CONFIG_ARCH_IOP13XX is not set
-+# CONFIG_ARCH_IOP32X is not set
-+# CONFIG_ARCH_IOP33X is not set
-+# CONFIG_ARCH_IXP23XX is not set
-+# CONFIG_ARCH_IXP2000 is not set
-+# CONFIG_ARCH_IXP4XX is not set
-+# CONFIG_ARCH_L7200 is not set
-+# CONFIG_ARCH_KS8695 is not set
-+# CONFIG_ARCH_NS9XXX is not set
-+# CONFIG_ARCH_MXC is not set
-+# CONFIG_ARCH_PNX4008 is not set
-+# CONFIG_ARCH_PXA is not set
-+# CONFIG_ARCH_RPC is not set
-+# CONFIG_ARCH_SA1100 is not set
-+CONFIG_ARCH_S3C2410=y
-+# CONFIG_ARCH_SHARK is not set
-+# CONFIG_ARCH_LH7A40X is not set
-+# CONFIG_ARCH_DAVINCI is not set
-+# CONFIG_ARCH_OMAP is not set
-+CONFIG_PLAT_S3C24XX=y
-+CONFIG_CPU_S3C244X=y
-+CONFIG_S3C2410_DMA=y
-+# CONFIG_S3C2410_DMA_DEBUG is not set
-+CONFIG_MACH_SMDK=y
-+CONFIG_MACH_NEO1973=y
-+CONFIG_PLAT_S3C=y
-+CONFIG_CPU_LLSERIAL_S3C2410=y
-+CONFIG_CPU_LLSERIAL_S3C2440=y
-+
-+#
-+# Boot options
-+#
-+# CONFIG_S3C_BOOT_WATCHDOG is not set
-+# CONFIG_S3C_BOOT_ERROR_RESET is not set
-+
-+#
-+# Power management
-+#
-+CONFIG_S3C2410_PM_DEBUG=y
-+# CONFIG_S3C2410_PM_CHECK is not set
-+CONFIG_S3C_LOWLEVEL_UART_PORT=0
-+
-+#
-+# S3C2400 Machines
-+#
-+CONFIG_CPU_S3C2410=y
-+CONFIG_CPU_S3C2410_DMA=y
-+CONFIG_S3C2410_PM=y
-+CONFIG_S3C2410_GPIO=y
-+CONFIG_S3C2410_CLOCK=y
-+CONFIG_S3C2410_PWM=y
-+
-+#
-+# S3C2410 Machines
-+#
-+# CONFIG_ARCH_SMDK2410 is not set
-+# CONFIG_ARCH_H1940 is not set
-+# CONFIG_MACH_N30 is not set
-+# CONFIG_ARCH_BAST is not set
-+# CONFIG_MACH_OTOM is not set
-+# CONFIG_MACH_AML_M5900 is not set
-+# CONFIG_MACH_VR1000 is not set
-+CONFIG_MACH_QT2410=y
-+CONFIG_MACH_NEO1973_GTA01=y
-+
-+#
-+# S3C2412 Machines
-+#
-+# CONFIG_MACH_SMDK2413 is not set
-+# CONFIG_MACH_SMDK2412 is not set
-+# CONFIG_MACH_VSTMS is not set
-+CONFIG_CPU_S3C2440=y
-+CONFIG_S3C2440_DMA=y
-+CONFIG_S3C2440_C_FIQ=y
-+
-+#
-+# S3C2440 Machines
-+#
-+# CONFIG_MACH_ANUBIS is not set
-+# CONFIG_MACH_OSIRIS is not set
-+# CONFIG_MACH_RX3715 is not set
-+CONFIG_ARCH_S3C2440=y
-+# CONFIG_MACH_NEXCODER_2440 is not set
-+CONFIG_SMDK2440_CPU2440=y
-+CONFIG_MACH_HXD8=y
-+CONFIG_MACH_NEO1973_GTA02=y
-+# CONFIG_NEO1973_GTA02_2440 is not set
-+CONFIG_CPU_S3C2442=y
-+
-+#
-+# S3C2442 Machines
-+#
-+CONFIG_SMDK2440_CPU2442=y
-+
-+#
-+# S3C2443 Machines
-+#
-+# CONFIG_MACH_SMDK2443 is not set
-+
-+#
-+# Processor Type
-+#
-+CONFIG_CPU_32=y
-+CONFIG_CPU_ARM920T=y
-+CONFIG_CPU_32v4T=y
-+CONFIG_CPU_ABRT_EV4T=y
-+CONFIG_CPU_CACHE_V4WT=y
-+CONFIG_CPU_CACHE_VIVT=y
-+CONFIG_CPU_COPY_V4WB=y
-+CONFIG_CPU_TLB_V4WBI=y
-+CONFIG_CPU_CP15=y
-+CONFIG_CPU_CP15_MMU=y
-+
-+#
-+# Processor Features
-+#
-+CONFIG_ARM_THUMB=y
-+# CONFIG_CPU_ICACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-+# CONFIG_OUTER_CACHE is not set
-+
-+#
-+# Bus support
-+#
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Kernel Features
-+#
-+# CONFIG_TICK_ONESHOT is not set
-+CONFIG_PREEMPT=y
-+CONFIG_NO_IDLE_HZ=y
-+CONFIG_HZ=200
-+CONFIG_AEABI=y
-+CONFIG_OABI_COMPAT=y
-+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4096
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_ALIGNMENT_TRAP=y
-+
-+#
-+# Boot options
-+#
-+CONFIG_ZBOOT_ROM_TEXT=0x0
-+CONFIG_ZBOOT_ROM_BSS=0x0
-+CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
-+# CONFIG_XIP_KERNEL is not set
-+CONFIG_KEXEC=y
-+CONFIG_ATAGS_PROC=y
-+
-+#
-+# Floating point emulation
-+#
-+
-+#
-+# At least one emulation must be selected
-+#
-+CONFIG_FPE_NWFPE=y
-+# CONFIG_FPE_NWFPE_XP is not set
-+# CONFIG_FPE_FASTFPE is not set
-+
-+#
-+# Userspace binary formats
-+#
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+
-+#
-+# Power management options
-+#
-+CONFIG_PM=y
-+CONFIG_PM_LEGACY=y
-+CONFIG_PM_DEBUG=y
-+# CONFIG_PM_VERBOSE is not set
-+CONFIG_PM_SLEEP=y
-+CONFIG_SUSPEND_UP_POSSIBLE=y
-+CONFIG_SUSPEND=y
-+CONFIG_APM_EMULATION=y
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+CONFIG_PACKET_MMAP=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+CONFIG_XFRM_MIGRATE=y
-+CONFIG_NET_KEY=m
-+CONFIG_NET_KEY_MIGRATE=y
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+# CONFIG_IP_ROUTE_MULTIPATH is not set
-+# CONFIG_IP_ROUTE_VERBOSE 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=m
-+CONFIG_NET_IPGRE=m
-+# CONFIG_NET_IPGRE_BROADCAST is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_XFRM_TUNNEL=m
-+CONFIG_INET_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET_XFRM_MODE_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_BEET=m
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+CONFIG_TCP_MD5SIG=y
-+# CONFIG_IP_VS is not set
-+CONFIG_IPV6=m
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_IPCOMP=m
-+# CONFIG_IPV6_MIP6 is not set
-+CONFIG_INET6_XFRM_TUNNEL=m
-+CONFIG_INET6_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET6_XFRM_MODE_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_BEET=m
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_TUNNEL=m
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+CONFIG_NETFILTER=y
-+# CONFIG_NETFILTER_DEBUG is not set
-+
-+#
-+# Core Netfilter Configuration
-+#
-+CONFIG_NETFILTER_NETLINK=m
-+CONFIG_NETFILTER_NETLINK_QUEUE=m
-+CONFIG_NETFILTER_NETLINK_LOG=m
-+CONFIG_NF_CONNTRACK_ENABLED=m
-+CONFIG_NF_CONNTRACK=m
-+CONFIG_NF_CT_ACCT=y
-+CONFIG_NF_CONNTRACK_MARK=y
-+CONFIG_NF_CONNTRACK_EVENTS=y
-+CONFIG_NF_CT_PROTO_GRE=m
-+CONFIG_NF_CT_PROTO_SCTP=m
-+# CONFIG_NF_CT_PROTO_UDPLITE is not set
-+# CONFIG_NF_CONNTRACK_AMANDA is not set
-+CONFIG_NF_CONNTRACK_FTP=m
-+CONFIG_NF_CONNTRACK_H323=m
-+CONFIG_NF_CONNTRACK_IRC=m
-+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-+CONFIG_NF_CONNTRACK_PPTP=m
-+CONFIG_NF_CONNTRACK_SANE=m
-+CONFIG_NF_CONNTRACK_SIP=m
-+CONFIG_NF_CONNTRACK_TFTP=m
-+CONFIG_NF_CT_NETLINK=m
-+CONFIG_NETFILTER_XTABLES=m
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-+CONFIG_NETFILTER_XT_TARGET_DSCP=m
-+CONFIG_NETFILTER_XT_TARGET_MARK=m
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+CONFIG_NETFILTER_XT_MATCH_DCCP=m
-+CONFIG_NETFILTER_XT_MATCH_DSCP=m
-+CONFIG_NETFILTER_XT_MATCH_ESP=m
-+CONFIG_NETFILTER_XT_MATCH_HELPER=m
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_MAC=m
-+CONFIG_NETFILTER_XT_MATCH_MARK=m
-+CONFIG_NETFILTER_XT_MATCH_POLICY=m
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-+CONFIG_NETFILTER_XT_MATCH_REALM=m
-+CONFIG_NETFILTER_XT_MATCH_SCTP=m
-+CONFIG_NETFILTER_XT_MATCH_STATE=m
-+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-+CONFIG_NETFILTER_XT_MATCH_STRING=m
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-+
-+#
-+# IP: Netfilter Configuration
-+#
-+CONFIG_NF_CONNTRACK_IPV4=m
-+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-+# CONFIG_IP_NF_QUEUE is not set
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_MATCH_IPRANGE=m
-+CONFIG_IP_NF_MATCH_TOS=m
-+# CONFIG_IP_NF_MATCH_RECENT is not set
-+CONFIG_IP_NF_MATCH_ECN=m
-+CONFIG_IP_NF_MATCH_AH=m
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_MATCH_OWNER=m
-+CONFIG_IP_NF_MATCH_ADDRTYPE=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_TARGET_LOG=m
-+CONFIG_IP_NF_TARGET_ULOG=m
-+CONFIG_NF_NAT=m
-+CONFIG_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_NF_NAT_SNMP_BASIC=m
-+CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_FTP=m
-+CONFIG_NF_NAT_IRC=m
-+CONFIG_NF_NAT_TFTP=m
-+# CONFIG_NF_NAT_AMANDA is not set
-+CONFIG_NF_NAT_PPTP=m
-+CONFIG_NF_NAT_H323=m
-+CONFIG_NF_NAT_SIP=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_IP_NF_TARGET_TOS=m
-+CONFIG_IP_NF_TARGET_ECN=m
-+CONFIG_IP_NF_TARGET_TTL=m
-+CONFIG_IP_NF_TARGET_CLUSTERIP=m
-+# CONFIG_IP_NF_RAW is not set
-+# CONFIG_IP_NF_ARPTABLES is not set
-+
-+#
-+# IPv6: Netfilter Configuration (EXPERIMENTAL)
-+#
-+CONFIG_NF_CONNTRACK_IPV6=m
-+# CONFIG_IP6_NF_QUEUE is not set
-+CONFIG_IP6_NF_IPTABLES=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_OWNER=m
-+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-+CONFIG_IP6_NF_MATCH_AH=m
-+CONFIG_IP6_NF_MATCH_MH=m
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_LOG=m
-+CONFIG_IP6_NF_TARGET_REJECT=m
-+CONFIG_IP6_NF_MANGLE=m
-+CONFIG_IP6_NF_TARGET_HL=m
-+# CONFIG_IP6_NF_RAW is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+CONFIG_NET_SCHED=y
-+
-+#
-+# Queueing/Scheduling
-+#
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=m
-+CONFIG_NET_SCH_PRIO=m
-+# CONFIG_NET_SCH_RR is not set
-+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_NETEM=m
-+CONFIG_NET_SCH_INGRESS=m
-+
-+#
-+# Classification
-+#
-+CONFIG_NET_CLS=y
-+CONFIG_NET_CLS_BASIC=m
-+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_CLS_U32_PERF=y
-+CONFIG_CLS_U32_MARK=y
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
-+# CONFIG_NET_EMATCH is not set
-+# CONFIG_NET_CLS_ACT is not set
-+# CONFIG_NET_CLS_POLICE is not set
-+# CONFIG_NET_CLS_IND is not set
-+CONFIG_NET_SCH_FIFO=y
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_IRDA 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_HIDP=m
-+
-+#
-+# Bluetooth device drivers
-+#
-+CONFIG_BT_HCIUSB=m
-+CONFIG_BT_HCIUSB_SCO=y
-+# CONFIG_BT_HCIBTSDIO is not set
-+# CONFIG_BT_HCIUART is not set
-+# CONFIG_BT_HCIBCM203X is not set
-+# CONFIG_BT_HCIBPA10X is not set
-+# CONFIG_BT_HCIBFUSB is not set
-+# CONFIG_BT_HCIVHCI is not set
-+# CONFIG_AF_RXRPC is not set
-+CONFIG_FIB_RULES=y
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+CONFIG_WIRELESS_EXT=y
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=m
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=m
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_AFS_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+CONFIG_MTD_CFI_INTELEXT=y
-+# CONFIG_MTD_CFI_AMDSTD is not set
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+CONFIG_MTD_ABSENT=y
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+CONFIG_MTD_PHYSMAP=y
-+CONFIG_MTD_PHYSMAP_START=0x8000000
-+CONFIG_MTD_PHYSMAP_LEN=0
-+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-+# CONFIG_MTD_ARM_INTEGRATOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+CONFIG_MTD_NAND=y
-+CONFIG_MTD_NAND_VERIFY_WRITE=y
-+# CONFIG_MTD_NAND_ECC_SMC is not set
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+CONFIG_MTD_NAND_IDS=y
-+CONFIG_MTD_NAND_S3C2410=y
-+# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
-+CONFIG_MTD_NAND_S3C2410_HWECC=y
-+# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ALAUDA is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+# CONFIG_PARPORT is not set
-+CONFIG_PNP=y
-+CONFIG_PNP_DEBUG=y
-+
-+#
-+# Protocols
-+#
-+# CONFIG_PNPACPI is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=m
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_UB=m
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=4096
-+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=m
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=m
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+CONFIG_BLK_DEV_SR=m
-+# CONFIG_BLK_DEV_SR_VENDOR is not set
-+CONFIG_CHR_DEV_SG=m
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+CONFIG_SCSI_SCAN_ASYNC=y
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+CONFIG_TUN=m
-+# CONFIG_VETH is not set
-+# CONFIG_NET_SB1000 is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_AX88796 is not set
-+# CONFIG_SMC91X is not set
-+# CONFIG_DM9000 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_B44 is not set
-+CONFIG_CS89x0=m
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+CONFIG_USB_CATC=m
-+CONFIG_USB_KAWETH=m
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+CONFIG_USB_USBNET=y
-+CONFIG_USB_NET_AX8817X=m
-+CONFIG_USB_NET_CDCETHER=m
-+CONFIG_USB_NET_DM9601=m
-+CONFIG_USB_NET_GL620A=m
-+CONFIG_USB_NET_NET1080=m
-+CONFIG_USB_NET_PLUSB=m
-+CONFIG_USB_NET_MCS7830=m
-+CONFIG_USB_NET_RNDIS_HOST=m
-+CONFIG_USB_NET_CDC_SUBSET=m
-+CONFIG_USB_ALI_M5632=y
-+CONFIG_USB_AN2720=y
-+CONFIG_USB_BELKIN=y
-+CONFIG_USB_ARMLINUX=y
-+CONFIG_USB_EPSON2888=y
-+CONFIG_USB_KC2190=y
-+CONFIG_USB_NET_ZAURUS=m
-+# CONFIG_WAN is not set
-+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=m
-+CONFIG_PPP_MPPE=m
-+# CONFIG_PPPOE is not set
-+# CONFIG_PPPOL2TP is not set
-+# CONFIG_SLIP is not set
-+CONFIG_SLHC=m
-+# CONFIG_SHAPER is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
-+# CONFIG_INPUT_JOYDEV is not set
-+CONFIG_INPUT_EVDEV=y
-+CONFIG_INPUT_EVBUG=m
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+# CONFIG_KEYBOARD_ATKBD is not set
-+# 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_KEYBOARD_STOWAWAY=m
-+CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_NEO1973=y
-+CONFIG_KEYBOARD_QT2410=y
-+CONFIG_INPUT_MOUSE=y
-+# CONFIG_MOUSE_PS2 is not set
-+# CONFIG_MOUSE_SERIAL is not set
-+# CONFIG_MOUSE_APPLETOUCH is not set
-+# CONFIG_MOUSE_VSXXXAA is not set
-+# CONFIG_MOUSE_GPIO is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+CONFIG_INPUT_TOUCHSCREEN=y
-+# CONFIG_TOUCHSCREEN_ADS7846 is not set
-+# CONFIG_TOUCHSCREEN_FUJITSU is not set
-+CONFIG_TOUCHSCREEN_S3C2410=y
-+# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
-+# CONFIG_TOUCHSCREEN_GUNZE is not set
-+# CONFIG_TOUCHSCREEN_ELO is not set
-+# CONFIG_TOUCHSCREEN_MTOUCH is not set
-+# CONFIG_TOUCHSCREEN_MK712 is not set
-+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-+# CONFIG_TOUCHSCREEN_UCB1400 is not set
-+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-+CONFIG_INPUT_MISC=y
-+# CONFIG_INPUT_ATI_REMOTE is not set
-+# CONFIG_INPUT_ATI_REMOTE2 is not set
-+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-+# CONFIG_INPUT_POWERMATE is not set
-+# CONFIG_INPUT_YEALINK is not set
-+CONFIG_INPUT_UINPUT=m
-+CONFIG_INPUT_LIS302DL=y
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+# CONFIG_SERIO_SERPORT is not set
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_NR_TTY_DEVICES=4
-+CONFIG_HW_CONSOLE=y
-+CONFIG_VT_HW_CONSOLE_BINDING=y
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_SERIAL_S3C2410=y
-+CONFIG_SERIAL_S3C2410_CONSOLE=y
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_LEGACY_PTYS is not set
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_GPIO is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+CONFIG_I2C_S3C2410=y
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_TINY_USB is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_SENSORS_DS1337 is not set
-+# CONFIG_SENSORS_DS1374 is not set
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+CONFIG_SENSORS_PCF50606=y
-+CONFIG_SENSORS_PCF50633=y
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_SENSORS_PCA9539 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+CONFIG_SENSORS_TSL256X=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
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+# CONFIG_SPI_DEBUG is not set
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+CONFIG_SPI_S3C24XX=y
-+CONFIG_SPI_S3C24XX_GPIO=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_W1 is not set
-+CONFIG_POWER_SUPPLY=y
-+# CONFIG_POWER_SUPPLY_DEBUG is not set
-+# CONFIG_PDA_POWER is not set
-+# CONFIG_APM_POWER is not set
-+# CONFIG_BATTERY_DS2760 is not set
-+CONFIG_BATTERY_BQ27000_HDQ=y
-+CONFIG_GTA02_HDQ=y
-+# CONFIG_HWMON is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_S3C2410_WATCHDOG=m
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+CONFIG_MFD_GLAMO=y
-+CONFIG_MFD_GLAMO_FB=y
-+CONFIG_MFD_GLAMO_SPI_GPIO=y
-+CONFIG_MFD_GLAMO_SPI_FB=y
-+CONFIG_MFD_GLAMO_MCI=y
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+CONFIG_FB=y
-+# CONFIG_FIRMWARE_EDID is not set
-+# CONFIG_FB_DDC is not set
-+CONFIG_FB_CFB_FILLRECT=y
-+CONFIG_FB_CFB_COPYAREA=y
-+CONFIG_FB_CFB_IMAGEBLIT=y
-+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-+# CONFIG_FB_SYS_FILLRECT is not set
-+# CONFIG_FB_SYS_COPYAREA is not set
-+# CONFIG_FB_SYS_IMAGEBLIT is not set
-+# CONFIG_FB_SYS_FOPS is not set
-+CONFIG_FB_DEFERRED_IO=y
-+# CONFIG_FB_SVGALIB is not set
-+# CONFIG_FB_MACMODES is not set
-+# CONFIG_FB_BACKLIGHT is not set
-+# CONFIG_FB_MODE_HELPERS is not set
-+# CONFIG_FB_TILEBLITTING is not set
-+
-+#
-+# Frame buffer hardware drivers
-+#
-+# CONFIG_FB_UVESA is not set
-+# CONFIG_FB_S1D13XXX is not set
-+CONFIG_FB_S3C2410=y
-+# CONFIG_FB_S3C2410_DEBUG is not set
-+# CONFIG_FB_VIRTUAL is not set
-+CONFIG_BACKLIGHT_LCD_SUPPORT=y
-+CONFIG_LCD_CLASS_DEVICE=y
-+# CONFIG_LCD_LTV350QV is not set
-+CONFIG_BACKLIGHT_CLASS_DEVICE=y
-+# CONFIG_BACKLIGHT_CORGI is not set
-+CONFIG_BACKLIGHT_GTA01=y
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+CONFIG_DISPLAY_JBT6K74=y
-+
-+#
-+# Console display driver support
-+#
-+# CONFIG_VGA_CONSOLE is not set
-+CONFIG_DUMMY_CONSOLE=y
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-+CONFIG_FONTS=y
-+# CONFIG_FONT_8x8 is not set
-+# CONFIG_FONT_8x16 is not set
-+CONFIG_FONT_6x11=y
-+# CONFIG_FONT_7x14 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
-+# CONFIG_FONT_10x18 is not set
-+# CONFIG_LOGO is not set
-+
-+#
-+# Sound
-+#
-+CONFIG_SOUND=y
-+
-+#
-+# Advanced Linux Sound Architecture
-+#
-+CONFIG_SND=m
-+CONFIG_SND_TIMER=m
-+CONFIG_SND_PCM=m
-+# CONFIG_SND_SEQUENCER is not set
-+CONFIG_SND_OSSEMUL=y
-+CONFIG_SND_MIXER_OSS=m
-+CONFIG_SND_PCM_OSS=m
-+CONFIG_SND_PCM_OSS_PLUGINS=y
-+# CONFIG_SND_DYNAMIC_MINORS is not set
-+CONFIG_SND_SUPPORT_OLD_API=y
-+CONFIG_SND_VERBOSE_PROCFS=y
-+# 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
-+
-+#
-+# ALSA ARM devices
-+#
-+
-+#
-+# SPI devices
-+#
-+
-+#
-+# USB devices
-+#
-+# CONFIG_SND_USB_AUDIO is not set
-+# CONFIG_SND_USB_CAIAQ is not set
-+
-+#
-+# System on Chip audio support
-+#
-+CONFIG_SND_SOC=m
-+CONFIG_SND_S3C24XX_SOC=m
-+CONFIG_SND_S3C24XX_SOC_I2S=m
-+CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
-+CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
-+
-+#
-+# SoC Audio support for SuperH
-+#
-+CONFIG_SND_SOC_WM8753=m
-+
-+#
-+# Open Sound System
-+#
-+# CONFIG_SOUND_PRIME is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=m
-+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-+# CONFIG_HID_FF is not set
-+# CONFIG_USB_HIDDEV is not set
-+
-+#
-+# USB HID Boot Protocol drivers
-+#
-+# CONFIG_USB_KBD is not set
-+# CONFIG_USB_MOUSE is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+CONFIG_USB_SUSPEND=y
-+# CONFIG_USB_PERSIST is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=m
-+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+CONFIG_USB_ACM=m
-+CONFIG_USB_PRINTER=m
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+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 is not set
-+CONFIG_USB_STORAGE_DPCM=y
-+CONFIG_USB_STORAGE_USBAT=y
-+CONFIG_USB_STORAGE_SDDR09=y
-+CONFIG_USB_STORAGE_SDDR55=y
-+CONFIG_USB_STORAGE_JUMPSHOT=y
-+CONFIG_USB_STORAGE_ALAUDA=y
-+CONFIG_USB_STORAGE_KARMA=y
-+CONFIG_USB_LIBUSUAL=y
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+
-+#
-+# USB Serial Converter support
-+#
-+CONFIG_USB_SERIAL=m
-+CONFIG_USB_SERIAL_GENERIC=y
-+CONFIG_USB_SERIAL_AIRCABLE=m
-+CONFIG_USB_SERIAL_AIRPRIME=m
-+CONFIG_USB_SERIAL_ARK3116=m
-+CONFIG_USB_SERIAL_BELKIN=m
-+# CONFIG_USB_SERIAL_CH341 is not set
-+CONFIG_USB_SERIAL_WHITEHEAT=m
-+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-+CONFIG_USB_SERIAL_CP2101=m
-+CONFIG_USB_SERIAL_CYPRESS_M8=m
-+CONFIG_USB_SERIAL_EMPEG=m
-+CONFIG_USB_SERIAL_FTDI_SIO=m
-+CONFIG_USB_SERIAL_FUNSOFT=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_GARMIN=m
-+CONFIG_USB_SERIAL_IPW=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_MOS7720=m
-+CONFIG_USB_SERIAL_MOS7840=m
-+CONFIG_USB_SERIAL_NAVMAN=m
-+CONFIG_USB_SERIAL_PL2303=m
-+# CONFIG_USB_SERIAL_OTI6858 is not set
-+CONFIG_USB_SERIAL_HP4X=m
-+CONFIG_USB_SERIAL_SAFE=m
-+CONFIG_USB_SERIAL_SAFE_PADDED=y
-+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-+CONFIG_USB_SERIAL_TI=m
-+CONFIG_USB_SERIAL_CYBERJACK=m
-+CONFIG_USB_SERIAL_XIRCOM=m
-+CONFIG_USB_SERIAL_OPTION=m
-+CONFIG_USB_SERIAL_OMNINET=m
-+# CONFIG_USB_SERIAL_DEBUG is not set
-+CONFIG_USB_EZUSB=y
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+CONFIG_USB_BERRY_CHARGE=m
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_LD is not set
-+CONFIG_USB_TRANCEVIBRATOR=m
-+CONFIG_USB_IOWARRIOR=m
-+# CONFIG_USB_TEST is not set
-+
-+#
-+# USB DSL modem support
-+#
-+
-+#
-+# USB Gadget Support
-+#
-+CONFIG_USB_GADGET=y
-+# CONFIG_USB_GADGET_DEBUG is not set
-+# CONFIG_USB_GADGET_DEBUG_FILES is not set
-+CONFIG_USB_GADGET_SELECTED=y
-+# CONFIG_USB_GADGET_AMD5536UDC is not set
-+# CONFIG_USB_GADGET_ATMEL_USBA is not set
-+# CONFIG_USB_GADGET_FSL_USB2 is not set
-+# CONFIG_USB_GADGET_NET2280 is not set
-+# CONFIG_USB_GADGET_PXA2XX is not set
-+# CONFIG_USB_GADGET_M66592 is not set
-+# CONFIG_USB_GADGET_GOKU is not set
-+# CONFIG_USB_GADGET_LH7A40X is not set
-+# CONFIG_USB_GADGET_OMAP is not set
-+CONFIG_USB_GADGET_S3C2410=y
-+CONFIG_USB_S3C2410=y
-+# CONFIG_USB_S3C2410_DEBUG is not set
-+# CONFIG_USB_GADGET_AT91 is not set
-+# CONFIG_USB_GADGET_DUMMY_HCD is not set
-+# CONFIG_USB_GADGET_DUALSPEED is not set
-+# CONFIG_USB_ZERO is not set
-+CONFIG_USB_ETH=y
-+CONFIG_USB_ETH_RNDIS=y
-+# CONFIG_USB_GADGETFS is not set
-+# CONFIG_USB_FILE_STORAGE is not set
-+# CONFIG_USB_G_SERIAL is not set
-+# CONFIG_USB_MIDI_GADGET is not set
-+
-+#
-+# SDIO support
-+#
-+CONFIG_SDIO=y
-+CONFIG_SDIO_S3C24XX=y
-+CONFIG_SDIO_S3C24XX_DMA=y
-+CONFIG_SDIO_AR6000_WLAN=y
-+CONFIG_MMC=y
-+CONFIG_MMC_DEBUG=y
-+CONFIG_MMC_UNSAFE_RESUME=y
-+
-+#
-+# MMC/SD Card Drivers
-+#
-+CONFIG_MMC_BLOCK=y
-+CONFIG_MMC_BLOCK_BOUNCE=y
-+# CONFIG_SDIO_UART is not set
-+
-+#
-+# MMC/SD Host Controller Drivers
-+#
-+# CONFIG_MMC_SPI is not set
-+CONFIG_MMC_S3C=y
-+CONFIG_NEW_LEDS=y
-+CONFIG_LEDS_CLASS=y
-+
-+#
-+# LED drivers
-+#
-+CONFIG_LEDS_S3C24XX=m
-+# CONFIG_LEDS_GPIO is not set
-+CONFIG_LEDS_NEO1973_VIBRATOR=y
-+CONFIG_LEDS_NEO1973_GTA02=y
-+
-+#
-+# LED Triggers
-+#
-+CONFIG_LEDS_TRIGGERS=y
-+CONFIG_LEDS_TRIGGER_TIMER=y
-+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+CONFIG_RTC_DEBUG=y
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+CONFIG_RTC_DRV_S3C=m
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=m
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+# CONFIG_EXT3_FS_XATTR is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+CONFIG_FS_POSIX_ACL=y
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+# CONFIG_MINIX_FS is not set
-+CONFIG_ROMFS_FS=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+CONFIG_DNOTIFY=y
-+# CONFIG_AUTOFS_FS is not set
-+CONFIG_AUTOFS4_FS=m
-+CONFIG_FUSE_FS=m
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+CONFIG_ISO9660_FS=m
-+CONFIG_JOLIET=y
-+# CONFIG_ZISOFS 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_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+CONFIG_CONFIGFS_FS=m
-+
-+#
-+# 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_YAFFS_FS=y
-+CONFIG_YAFFS_YAFFS1=y
-+CONFIG_YAFFS_9BYTE_TAGS=y
-+CONFIG_YAFFS_YAFFS2=y
-+CONFIG_YAFFS_AUTO_YAFFS2=y
-+# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-+CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
-+# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-+# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
-+CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+CONFIG_JFFS2_SUMMARY=y
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# 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
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_DIRECTIO is not set
-+CONFIG_NFSD=m
-+CONFIG_NFSD_V3=y
-+# CONFIG_NFSD_V3_ACL is not set
-+CONFIG_NFSD_V4=y
-+CONFIG_NFSD_TCP=y
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_EXPORTFS=m
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+CONFIG_CIFS=m
-+# CONFIG_CIFS_STATS is not set
-+CONFIG_CIFS_WEAK_PW_HASH=y
-+# CONFIG_CIFS_XATTR is not set
-+# CONFIG_CIFS_DEBUG2 is not set
-+# CONFIG_CIFS_EXPERIMENTAL 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
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=y
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+CONFIG_NLS_CODEPAGE_850=m
-+# 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=m
-+CONFIG_NLS_CODEPAGE_950=m
-+# 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=y
-+# 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=m
-+# CONFIG_DLM is not set
-+CONFIG_INSTRUMENTATION=y
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+# CONFIG_SCHED_DEBUG is not set
-+# CONFIG_SCHEDSTATS is not set
-+CONFIG_TIMER_STATS=y
-+# CONFIG_DEBUG_SLAB is not set
-+CONFIG_DEBUG_PREEMPT=y
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_LOCK_ALLOC is not set
-+# CONFIG_PROVE_LOCKING is not set
-+# CONFIG_LOCK_STAT is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+CONFIG_FRAME_POINTER=y
-+CONFIG_FORCED_INLINING=y
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_USER is not set
-+CONFIG_DEBUG_ERRORS=y
-+CONFIG_DEBUG_LL=y
-+# CONFIG_DEBUG_ICEDCC is not set
-+CONFIG_DEBUG_S3C_PORT=y
-+CONFIG_DEBUG_S3C_UART=0
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_HMAC=y
-+CONFIG_CRYPTO_XCBC=m
-+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_WP512=m
-+CONFIG_CRYPTO_TGR192=m
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+CONFIG_CRYPTO_LRW=m
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_FCRYPT=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_CAST6=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_KHAZAD=m
-+CONFIG_CRYPTO_ANUBIS=m
-+# CONFIG_CRYPTO_SEED is not set
-+CONFIG_CRYPTO_DEFLATE=m
-+CONFIG_CRYPTO_MICHAEL_MIC=m
-+CONFIG_CRYPTO_CRC32C=m
-+CONFIG_CRYPTO_CAMELLIA=m
-+CONFIG_CRYPTO_TEST=m
-+# CONFIG_CRYPTO_AUTHENC is not set
-+CONFIG_CRYPTO_HW=y
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_CRC_CCITT=m
-+CONFIG_CRC16=m
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+CONFIG_LIBCRC32C=m
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_TEXTSEARCH=y
-+CONFIG_TEXTSEARCH_KMP=m
-+CONFIG_TEXTSEARCH_BM=m
-+CONFIG_TEXTSEARCH_FSM=m
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_DMA=y
-diff --git a/defconfig-gta01 b/defconfig-gta01
-new file mode 100644
-index 0000000..6f6243e
---- /dev/null
-+++ b/defconfig-gta01
-@@ -0,0 +1,1769 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.24
-+# Mon Feb 25 07:03:56 2008
-+#
-+CONFIG_ARM=y
-+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-+CONFIG_GENERIC_GPIO=y
-+# CONFIG_GENERIC_TIME is not set
-+# CONFIG_GENERIC_CLOCKEVENTS is not set
-+CONFIG_MMU=y
-+CONFIG_NO_IOPORT=y
-+CONFIG_GENERIC_HARDIRQS=y
-+CONFIG_STACKTRACE_SUPPORT=y
-+CONFIG_LOCKDEP_SUPPORT=y
-+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-+CONFIG_HARDIRQS_SW_RESEND=y
-+CONFIG_GENERIC_IRQ_PROBE=y
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_ZONE_DMA=y
-+CONFIG_FIQ=y
-+CONFIG_VECTORS_BASE=0xffff0000
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_LOCK_KERNEL=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_SYSFS_DEPRECATED is not set
-+# CONFIG_RELAY is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+CONFIG_SYSCTL=y
-+# CONFIG_EMBEDDED is not set
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=m
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=m
-+# CONFIG_DEFAULT_AS is not set
-+CONFIG_DEFAULT_DEADLINE=y
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="deadline"
-+
-+#
-+# System Type
-+#
-+# CONFIG_ARCH_AAEC2000 is not set
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_REALVIEW is not set
-+# CONFIG_ARCH_VERSATILE is not set
-+# CONFIG_ARCH_AT91 is not set
-+# CONFIG_ARCH_CLPS7500 is not set
-+# CONFIG_ARCH_CLPS711X is not set
-+# CONFIG_ARCH_CO285 is not set
-+# CONFIG_ARCH_EBSA110 is not set
-+# CONFIG_ARCH_EP93XX is not set
-+# CONFIG_ARCH_FOOTBRIDGE is not set
-+# CONFIG_ARCH_NETX is not set
-+# CONFIG_ARCH_H720X is not set
-+# CONFIG_ARCH_IMX is not set
-+# CONFIG_ARCH_IOP13XX is not set
-+# CONFIG_ARCH_IOP32X is not set
-+# CONFIG_ARCH_IOP33X is not set
-+# CONFIG_ARCH_IXP23XX is not set
-+# CONFIG_ARCH_IXP2000 is not set
-+# CONFIG_ARCH_IXP4XX is not set
-+# CONFIG_ARCH_L7200 is not set
-+# CONFIG_ARCH_KS8695 is not set
-+# CONFIG_ARCH_NS9XXX is not set
-+# CONFIG_ARCH_MXC is not set
-+# CONFIG_ARCH_PNX4008 is not set
-+# CONFIG_ARCH_PXA is not set
-+# CONFIG_ARCH_RPC is not set
-+# CONFIG_ARCH_SA1100 is not set
-+CONFIG_ARCH_S3C2410=y
-+# CONFIG_ARCH_SHARK is not set
-+# CONFIG_ARCH_LH7A40X is not set
-+# CONFIG_ARCH_DAVINCI is not set
-+# CONFIG_ARCH_OMAP is not set
-+CONFIG_PLAT_S3C24XX=y
-+CONFIG_CPU_S3C244X=y
-+CONFIG_S3C2410_DMA=y
-+# CONFIG_S3C2410_DMA_DEBUG is not set
-+CONFIG_MACH_SMDK=y
-+CONFIG_MACH_NEO1973=y
-+CONFIG_PLAT_S3C=y
-+CONFIG_CPU_LLSERIAL_S3C2410=y
-+CONFIG_CPU_LLSERIAL_S3C2440=y
-+
-+#
-+# Boot options
-+#
-+# CONFIG_S3C_BOOT_WATCHDOG is not set
-+# CONFIG_S3C_BOOT_ERROR_RESET is not set
-+
-+#
-+# Power management
-+#
-+CONFIG_S3C2410_PM_DEBUG=y
-+# CONFIG_S3C2410_PM_CHECK is not set
-+CONFIG_S3C_LOWLEVEL_UART_PORT=0
-+
-+#
-+# S3C2400 Machines
-+#
-+CONFIG_CPU_S3C2410=y
-+CONFIG_CPU_S3C2410_DMA=y
-+CONFIG_S3C2410_PM=y
-+CONFIG_S3C2410_GPIO=y
-+CONFIG_S3C2410_CLOCK=y
-+CONFIG_S3C2410_PWM=y
-+
-+#
-+# S3C2410 Machines
-+#
-+# CONFIG_ARCH_SMDK2410 is not set
-+# CONFIG_ARCH_H1940 is not set
-+# CONFIG_MACH_N30 is not set
-+# CONFIG_ARCH_BAST is not set
-+# CONFIG_MACH_OTOM is not set
-+# CONFIG_MACH_AML_M5900 is not set
-+# CONFIG_MACH_VR1000 is not set
-+CONFIG_MACH_QT2410=y
-+CONFIG_MACH_NEO1973_GTA01=y
-+
-+#
-+# S3C2412 Machines
-+#
-+# CONFIG_MACH_SMDK2413 is not set
-+# CONFIG_MACH_SMDK2412 is not set
-+# CONFIG_MACH_VSTMS is not set
-+CONFIG_CPU_S3C2440=y
-+CONFIG_S3C2440_DMA=y
-+CONFIG_S3C2440_C_FIQ=y
-+
-+#
-+# S3C2440 Machines
-+#
-+# CONFIG_MACH_ANUBIS is not set
-+# CONFIG_MACH_OSIRIS is not set
-+# CONFIG_MACH_RX3715 is not set
-+CONFIG_ARCH_S3C2440=y
-+# CONFIG_MACH_NEXCODER_2440 is not set
-+CONFIG_SMDK2440_CPU2440=y
-+CONFIG_MACH_HXD8=y
-+CONFIG_MACH_NEO1973_GTA02=y
-+# CONFIG_NEO1973_GTA02_2440 is not set
-+CONFIG_CPU_S3C2442=y
-+
-+#
-+# S3C2442 Machines
-+#
-+CONFIG_SMDK2440_CPU2442=y
-+
-+#
-+# S3C2443 Machines
-+#
-+# CONFIG_MACH_SMDK2443 is not set
-+
-+#
-+# Processor Type
-+#
-+CONFIG_CPU_32=y
-+CONFIG_CPU_ARM920T=y
-+CONFIG_CPU_32v4T=y
-+CONFIG_CPU_ABRT_EV4T=y
-+CONFIG_CPU_CACHE_V4WT=y
-+CONFIG_CPU_CACHE_VIVT=y
-+CONFIG_CPU_COPY_V4WB=y
-+CONFIG_CPU_TLB_V4WBI=y
-+CONFIG_CPU_CP15=y
-+CONFIG_CPU_CP15_MMU=y
-+
-+#
-+# Processor Features
-+#
-+CONFIG_ARM_THUMB=y
-+# CONFIG_CPU_ICACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-+# CONFIG_OUTER_CACHE is not set
-+
-+#
-+# Bus support
-+#
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Kernel Features
-+#
-+# CONFIG_TICK_ONESHOT is not set
-+CONFIG_PREEMPT=y
-+CONFIG_NO_IDLE_HZ=y
-+CONFIG_HZ=200
-+CONFIG_AEABI=y
-+CONFIG_OABI_COMPAT=y
-+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4096
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_ALIGNMENT_TRAP=y
-+
-+#
-+# Boot options
-+#
-+CONFIG_ZBOOT_ROM_TEXT=0x0
-+CONFIG_ZBOOT_ROM_BSS=0x0
-+CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
-+# CONFIG_XIP_KERNEL is not set
-+CONFIG_KEXEC=y
-+CONFIG_ATAGS_PROC=y
-+
-+#
-+# Floating point emulation
-+#
-+
-+#
-+# At least one emulation must be selected
-+#
-+CONFIG_FPE_NWFPE=y
-+# CONFIG_FPE_NWFPE_XP is not set
-+# CONFIG_FPE_FASTFPE is not set
-+
-+#
-+# Userspace binary formats
-+#
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+
-+#
-+# Power management options
-+#
-+CONFIG_PM=y
-+CONFIG_PM_LEGACY=y
-+CONFIG_PM_DEBUG=y
-+# CONFIG_PM_VERBOSE is not set
-+CONFIG_PM_SLEEP=y
-+CONFIG_SUSPEND_UP_POSSIBLE=y
-+CONFIG_SUSPEND=y
-+CONFIG_APM_EMULATION=y
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+CONFIG_PACKET_MMAP=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+CONFIG_XFRM_MIGRATE=y
-+CONFIG_NET_KEY=m
-+CONFIG_NET_KEY_MIGRATE=y
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+# CONFIG_IP_ROUTE_MULTIPATH is not set
-+# CONFIG_IP_ROUTE_VERBOSE 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=m
-+CONFIG_NET_IPGRE=m
-+# CONFIG_NET_IPGRE_BROADCAST is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_XFRM_TUNNEL=m
-+CONFIG_INET_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET_XFRM_MODE_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_BEET=m
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+CONFIG_TCP_MD5SIG=y
-+# CONFIG_IP_VS is not set
-+CONFIG_IPV6=m
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_IPCOMP=m
-+# CONFIG_IPV6_MIP6 is not set
-+CONFIG_INET6_XFRM_TUNNEL=m
-+CONFIG_INET6_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET6_XFRM_MODE_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_BEET=m
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_TUNNEL=m
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+CONFIG_NETFILTER=y
-+# CONFIG_NETFILTER_DEBUG is not set
-+
-+#
-+# Core Netfilter Configuration
-+#
-+CONFIG_NETFILTER_NETLINK=m
-+CONFIG_NETFILTER_NETLINK_QUEUE=m
-+CONFIG_NETFILTER_NETLINK_LOG=m
-+CONFIG_NF_CONNTRACK_ENABLED=m
-+CONFIG_NF_CONNTRACK=m
-+CONFIG_NF_CT_ACCT=y
-+CONFIG_NF_CONNTRACK_MARK=y
-+CONFIG_NF_CONNTRACK_EVENTS=y
-+CONFIG_NF_CT_PROTO_GRE=m
-+CONFIG_NF_CT_PROTO_SCTP=m
-+# CONFIG_NF_CT_PROTO_UDPLITE is not set
-+# CONFIG_NF_CONNTRACK_AMANDA is not set
-+CONFIG_NF_CONNTRACK_FTP=m
-+CONFIG_NF_CONNTRACK_H323=m
-+CONFIG_NF_CONNTRACK_IRC=m
-+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-+CONFIG_NF_CONNTRACK_PPTP=m
-+CONFIG_NF_CONNTRACK_SANE=m
-+CONFIG_NF_CONNTRACK_SIP=m
-+CONFIG_NF_CONNTRACK_TFTP=m
-+CONFIG_NF_CT_NETLINK=m
-+CONFIG_NETFILTER_XTABLES=m
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-+CONFIG_NETFILTER_XT_TARGET_DSCP=m
-+CONFIG_NETFILTER_XT_TARGET_MARK=m
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+CONFIG_NETFILTER_XT_MATCH_DCCP=m
-+CONFIG_NETFILTER_XT_MATCH_DSCP=m
-+CONFIG_NETFILTER_XT_MATCH_ESP=m
-+CONFIG_NETFILTER_XT_MATCH_HELPER=m
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_MAC=m
-+CONFIG_NETFILTER_XT_MATCH_MARK=m
-+CONFIG_NETFILTER_XT_MATCH_POLICY=m
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-+CONFIG_NETFILTER_XT_MATCH_REALM=m
-+CONFIG_NETFILTER_XT_MATCH_SCTP=m
-+CONFIG_NETFILTER_XT_MATCH_STATE=m
-+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-+CONFIG_NETFILTER_XT_MATCH_STRING=m
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-+
-+#
-+# IP: Netfilter Configuration
-+#
-+CONFIG_NF_CONNTRACK_IPV4=m
-+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-+# CONFIG_IP_NF_QUEUE is not set
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_MATCH_IPRANGE=m
-+CONFIG_IP_NF_MATCH_TOS=m
-+# CONFIG_IP_NF_MATCH_RECENT is not set
-+CONFIG_IP_NF_MATCH_ECN=m
-+CONFIG_IP_NF_MATCH_AH=m
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_MATCH_OWNER=m
-+CONFIG_IP_NF_MATCH_ADDRTYPE=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_TARGET_LOG=m
-+CONFIG_IP_NF_TARGET_ULOG=m
-+CONFIG_NF_NAT=m
-+CONFIG_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_NF_NAT_SNMP_BASIC=m
-+CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_FTP=m
-+CONFIG_NF_NAT_IRC=m
-+CONFIG_NF_NAT_TFTP=m
-+# CONFIG_NF_NAT_AMANDA is not set
-+CONFIG_NF_NAT_PPTP=m
-+CONFIG_NF_NAT_H323=m
-+CONFIG_NF_NAT_SIP=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_IP_NF_TARGET_TOS=m
-+CONFIG_IP_NF_TARGET_ECN=m
-+CONFIG_IP_NF_TARGET_TTL=m
-+CONFIG_IP_NF_TARGET_CLUSTERIP=m
-+# CONFIG_IP_NF_RAW is not set
-+# CONFIG_IP_NF_ARPTABLES is not set
-+
-+#
-+# IPv6: Netfilter Configuration (EXPERIMENTAL)
-+#
-+CONFIG_NF_CONNTRACK_IPV6=m
-+# CONFIG_IP6_NF_QUEUE is not set
-+CONFIG_IP6_NF_IPTABLES=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_OWNER=m
-+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-+CONFIG_IP6_NF_MATCH_AH=m
-+CONFIG_IP6_NF_MATCH_MH=m
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_LOG=m
-+CONFIG_IP6_NF_TARGET_REJECT=m
-+CONFIG_IP6_NF_MANGLE=m
-+CONFIG_IP6_NF_TARGET_HL=m
-+# CONFIG_IP6_NF_RAW is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+CONFIG_NET_SCHED=y
-+
-+#
-+# Queueing/Scheduling
-+#
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=m
-+CONFIG_NET_SCH_PRIO=m
-+# CONFIG_NET_SCH_RR is not set
-+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_NETEM=m
-+CONFIG_NET_SCH_INGRESS=m
-+
-+#
-+# Classification
-+#
-+CONFIG_NET_CLS=y
-+CONFIG_NET_CLS_BASIC=m
-+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_CLS_U32_PERF=y
-+CONFIG_CLS_U32_MARK=y
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
-+# CONFIG_NET_EMATCH is not set
-+# CONFIG_NET_CLS_ACT is not set
-+# CONFIG_NET_CLS_POLICE is not set
-+# CONFIG_NET_CLS_IND is not set
-+CONFIG_NET_SCH_FIFO=y
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_IRDA 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_HIDP=m
-+
-+#
-+# Bluetooth device drivers
-+#
-+CONFIG_BT_HCIUSB=m
-+CONFIG_BT_HCIUSB_SCO=y
-+# CONFIG_BT_HCIBTSDIO is not set
-+# CONFIG_BT_HCIUART is not set
-+# CONFIG_BT_HCIBCM203X is not set
-+# CONFIG_BT_HCIBPA10X is not set
-+# CONFIG_BT_HCIBFUSB is not set
-+# CONFIG_BT_HCIVHCI is not set
-+# CONFIG_AF_RXRPC is not set
-+CONFIG_FIB_RULES=y
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+CONFIG_WIRELESS_EXT=y
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=m
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=m
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_AFS_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+CONFIG_MTD_CFI_INTELEXT=y
-+# CONFIG_MTD_CFI_AMDSTD is not set
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+CONFIG_MTD_ABSENT=y
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+CONFIG_MTD_PHYSMAP=y
-+CONFIG_MTD_PHYSMAP_START=0x8000000
-+CONFIG_MTD_PHYSMAP_LEN=0
-+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-+# CONFIG_MTD_ARM_INTEGRATOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+CONFIG_MTD_NAND=y
-+CONFIG_MTD_NAND_VERIFY_WRITE=y
-+# CONFIG_MTD_NAND_ECC_SMC is not set
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+CONFIG_MTD_NAND_IDS=y
-+CONFIG_MTD_NAND_S3C2410=y
-+# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
-+CONFIG_MTD_NAND_S3C2410_HWECC=y
-+# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ALAUDA is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+# CONFIG_PARPORT is not set
-+CONFIG_PNP=y
-+CONFIG_PNP_DEBUG=y
-+
-+#
-+# Protocols
-+#
-+# CONFIG_PNPACPI is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=m
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_UB=m
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=4096
-+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=m
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=m
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+CONFIG_BLK_DEV_SR=m
-+# CONFIG_BLK_DEV_SR_VENDOR is not set
-+CONFIG_CHR_DEV_SG=m
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+CONFIG_SCSI_SCAN_ASYNC=y
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+CONFIG_TUN=m
-+# CONFIG_VETH is not set
-+# CONFIG_NET_SB1000 is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_AX88796 is not set
-+# CONFIG_SMC91X is not set
-+# CONFIG_DM9000 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_B44 is not set
-+CONFIG_CS89x0=m
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+CONFIG_USB_CATC=m
-+CONFIG_USB_KAWETH=m
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+CONFIG_USB_USBNET=y
-+CONFIG_USB_NET_AX8817X=m
-+CONFIG_USB_NET_CDCETHER=m
-+CONFIG_USB_NET_DM9601=m
-+CONFIG_USB_NET_GL620A=m
-+CONFIG_USB_NET_NET1080=m
-+CONFIG_USB_NET_PLUSB=m
-+CONFIG_USB_NET_MCS7830=m
-+CONFIG_USB_NET_RNDIS_HOST=m
-+CONFIG_USB_NET_CDC_SUBSET=m
-+CONFIG_USB_ALI_M5632=y
-+CONFIG_USB_AN2720=y
-+CONFIG_USB_BELKIN=y
-+CONFIG_USB_ARMLINUX=y
-+CONFIG_USB_EPSON2888=y
-+CONFIG_USB_KC2190=y
-+CONFIG_USB_NET_ZAURUS=m
-+# CONFIG_WAN is not set
-+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=m
-+CONFIG_PPP_MPPE=m
-+# CONFIG_PPPOE is not set
-+# CONFIG_PPPOL2TP is not set
-+# CONFIG_SLIP is not set
-+CONFIG_SLHC=m
-+# CONFIG_SHAPER is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
-+# CONFIG_INPUT_JOYDEV is not set
-+CONFIG_INPUT_EVDEV=y
-+CONFIG_INPUT_EVBUG=m
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+# CONFIG_KEYBOARD_ATKBD is not set
-+# 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_KEYBOARD_STOWAWAY=m
-+CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_NEO1973=y
-+CONFIG_KEYBOARD_QT2410=y
-+CONFIG_INPUT_MOUSE=y
-+# CONFIG_MOUSE_PS2 is not set
-+# CONFIG_MOUSE_SERIAL is not set
-+# CONFIG_MOUSE_APPLETOUCH is not set
-+# CONFIG_MOUSE_VSXXXAA is not set
-+# CONFIG_MOUSE_GPIO is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+CONFIG_INPUT_TOUCHSCREEN=y
-+# CONFIG_TOUCHSCREEN_ADS7846 is not set
-+# CONFIG_TOUCHSCREEN_FUJITSU is not set
-+CONFIG_TOUCHSCREEN_S3C2410=y
-+# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
-+# CONFIG_TOUCHSCREEN_GUNZE is not set
-+# CONFIG_TOUCHSCREEN_ELO is not set
-+# CONFIG_TOUCHSCREEN_MTOUCH is not set
-+# CONFIG_TOUCHSCREEN_MK712 is not set
-+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-+# CONFIG_TOUCHSCREEN_UCB1400 is not set
-+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-+CONFIG_INPUT_MISC=y
-+# CONFIG_INPUT_ATI_REMOTE is not set
-+# CONFIG_INPUT_ATI_REMOTE2 is not set
-+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-+# CONFIG_INPUT_POWERMATE is not set
-+# CONFIG_INPUT_YEALINK is not set
-+CONFIG_INPUT_UINPUT=m
-+CONFIG_INPUT_LIS302DL=y
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+# CONFIG_SERIO_SERPORT is not set
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_NR_TTY_DEVICES=4
-+CONFIG_HW_CONSOLE=y
-+CONFIG_VT_HW_CONSOLE_BINDING=y
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_SERIAL_S3C2410=y
-+CONFIG_SERIAL_S3C2410_CONSOLE=y
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_LEGACY_PTYS is not set
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_GPIO is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+CONFIG_I2C_S3C2410=y
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_TINY_USB is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_SENSORS_DS1337 is not set
-+# CONFIG_SENSORS_DS1374 is not set
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+CONFIG_SENSORS_PCF50606=y
-+CONFIG_SENSORS_PCF50633=y
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_SENSORS_PCA9539 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+CONFIG_SENSORS_TSL256X=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
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+# CONFIG_SPI_DEBUG is not set
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+CONFIG_SPI_S3C24XX=y
-+CONFIG_SPI_S3C24XX_GPIO=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_W1 is not set
-+CONFIG_POWER_SUPPLY=y
-+# CONFIG_POWER_SUPPLY_DEBUG is not set
-+# CONFIG_PDA_POWER is not set
-+# CONFIG_APM_POWER is not set
-+# CONFIG_BATTERY_DS2760 is not set
-+CONFIG_BATTERY_BQ27000_HDQ=y
-+CONFIG_GTA02_HDQ=y
-+# CONFIG_HWMON is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_S3C2410_WATCHDOG=m
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+CONFIG_MFD_GLAMO=y
-+CONFIG_MFD_GLAMO_FB=y
-+CONFIG_MFD_GLAMO_SPI_GPIO=y
-+CONFIG_MFD_GLAMO_SPI_FB=y
-+CONFIG_MFD_GLAMO_MCI=y
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+CONFIG_FB=y
-+# CONFIG_FIRMWARE_EDID is not set
-+# CONFIG_FB_DDC is not set
-+CONFIG_FB_CFB_FILLRECT=y
-+CONFIG_FB_CFB_COPYAREA=y
-+CONFIG_FB_CFB_IMAGEBLIT=y
-+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-+# CONFIG_FB_SYS_FILLRECT is not set
-+# CONFIG_FB_SYS_COPYAREA is not set
-+# CONFIG_FB_SYS_IMAGEBLIT is not set
-+# CONFIG_FB_SYS_FOPS is not set
-+CONFIG_FB_DEFERRED_IO=y
-+# CONFIG_FB_SVGALIB is not set
-+# CONFIG_FB_MACMODES is not set
-+# CONFIG_FB_BACKLIGHT is not set
-+# CONFIG_FB_MODE_HELPERS is not set
-+# CONFIG_FB_TILEBLITTING is not set
-+
-+#
-+# Frame buffer hardware drivers
-+#
-+# CONFIG_FB_UVESA is not set
-+# CONFIG_FB_S1D13XXX is not set
-+CONFIG_FB_S3C2410=y
-+# CONFIG_FB_S3C2410_DEBUG is not set
-+# CONFIG_FB_VIRTUAL is not set
-+CONFIG_BACKLIGHT_LCD_SUPPORT=y
-+CONFIG_LCD_CLASS_DEVICE=y
-+# CONFIG_LCD_LTV350QV is not set
-+CONFIG_BACKLIGHT_CLASS_DEVICE=y
-+# CONFIG_BACKLIGHT_CORGI is not set
-+CONFIG_BACKLIGHT_GTA01=y
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+CONFIG_DISPLAY_JBT6K74=y
-+
-+#
-+# Console display driver support
-+#
-+# CONFIG_VGA_CONSOLE is not set
-+CONFIG_DUMMY_CONSOLE=y
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-+CONFIG_FONTS=y
-+# CONFIG_FONT_8x8 is not set
-+# CONFIG_FONT_8x16 is not set
-+CONFIG_FONT_6x11=y
-+# CONFIG_FONT_7x14 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
-+# CONFIG_FONT_10x18 is not set
-+# CONFIG_LOGO is not set
-+
-+#
-+# Sound
-+#
-+CONFIG_SOUND=y
-+
-+#
-+# Advanced Linux Sound Architecture
-+#
-+CONFIG_SND=m
-+CONFIG_SND_TIMER=m
-+CONFIG_SND_PCM=m
-+# CONFIG_SND_SEQUENCER is not set
-+CONFIG_SND_OSSEMUL=y
-+CONFIG_SND_MIXER_OSS=m
-+CONFIG_SND_PCM_OSS=m
-+CONFIG_SND_PCM_OSS_PLUGINS=y
-+# CONFIG_SND_DYNAMIC_MINORS is not set
-+CONFIG_SND_SUPPORT_OLD_API=y
-+CONFIG_SND_VERBOSE_PROCFS=y
-+# 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
-+
-+#
-+# ALSA ARM devices
-+#
-+
-+#
-+# SPI devices
-+#
-+
-+#
-+# USB devices
-+#
-+# CONFIG_SND_USB_AUDIO is not set
-+# CONFIG_SND_USB_CAIAQ is not set
-+
-+#
-+# System on Chip audio support
-+#
-+CONFIG_SND_SOC=m
-+CONFIG_SND_S3C24XX_SOC=m
-+CONFIG_SND_S3C24XX_SOC_I2S=m
-+CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
-+CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
-+
-+#
-+# SoC Audio support for SuperH
-+#
-+CONFIG_SND_SOC_WM8753=m
-+
-+#
-+# Open Sound System
-+#
-+# CONFIG_SOUND_PRIME is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=m
-+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-+# CONFIG_HID_FF is not set
-+# CONFIG_USB_HIDDEV is not set
-+
-+#
-+# USB HID Boot Protocol drivers
-+#
-+# CONFIG_USB_KBD is not set
-+# CONFIG_USB_MOUSE is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+CONFIG_USB_SUSPEND=y
-+# CONFIG_USB_PERSIST is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=m
-+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+CONFIG_USB_ACM=m
-+CONFIG_USB_PRINTER=m
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+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 is not set
-+CONFIG_USB_STORAGE_DPCM=y
-+CONFIG_USB_STORAGE_USBAT=y
-+CONFIG_USB_STORAGE_SDDR09=y
-+CONFIG_USB_STORAGE_SDDR55=y
-+CONFIG_USB_STORAGE_JUMPSHOT=y
-+CONFIG_USB_STORAGE_ALAUDA=y
-+CONFIG_USB_STORAGE_KARMA=y
-+CONFIG_USB_LIBUSUAL=y
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+
-+#
-+# USB Serial Converter support
-+#
-+CONFIG_USB_SERIAL=m
-+CONFIG_USB_SERIAL_GENERIC=y
-+CONFIG_USB_SERIAL_AIRCABLE=m
-+CONFIG_USB_SERIAL_AIRPRIME=m
-+CONFIG_USB_SERIAL_ARK3116=m
-+CONFIG_USB_SERIAL_BELKIN=m
-+# CONFIG_USB_SERIAL_CH341 is not set
-+CONFIG_USB_SERIAL_WHITEHEAT=m
-+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-+CONFIG_USB_SERIAL_CP2101=m
-+CONFIG_USB_SERIAL_CYPRESS_M8=m
-+CONFIG_USB_SERIAL_EMPEG=m
-+CONFIG_USB_SERIAL_FTDI_SIO=m
-+CONFIG_USB_SERIAL_FUNSOFT=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_GARMIN=m
-+CONFIG_USB_SERIAL_IPW=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_MOS7720=m
-+CONFIG_USB_SERIAL_MOS7840=m
-+CONFIG_USB_SERIAL_NAVMAN=m
-+CONFIG_USB_SERIAL_PL2303=m
-+# CONFIG_USB_SERIAL_OTI6858 is not set
-+CONFIG_USB_SERIAL_HP4X=m
-+CONFIG_USB_SERIAL_SAFE=m
-+CONFIG_USB_SERIAL_SAFE_PADDED=y
-+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-+CONFIG_USB_SERIAL_TI=m
-+CONFIG_USB_SERIAL_CYBERJACK=m
-+CONFIG_USB_SERIAL_XIRCOM=m
-+CONFIG_USB_SERIAL_OPTION=m
-+CONFIG_USB_SERIAL_OMNINET=m
-+# CONFIG_USB_SERIAL_DEBUG is not set
-+CONFIG_USB_EZUSB=y
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+CONFIG_USB_BERRY_CHARGE=m
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_LD is not set
-+CONFIG_USB_TRANCEVIBRATOR=m
-+CONFIG_USB_IOWARRIOR=m
-+# CONFIG_USB_TEST is not set
-+
-+#
-+# USB DSL modem support
-+#
-+
-+#
-+# USB Gadget Support
-+#
-+CONFIG_USB_GADGET=y
-+# CONFIG_USB_GADGET_DEBUG is not set
-+# CONFIG_USB_GADGET_DEBUG_FILES is not set
-+CONFIG_USB_GADGET_SELECTED=y
-+# CONFIG_USB_GADGET_AMD5536UDC is not set
-+# CONFIG_USB_GADGET_ATMEL_USBA is not set
-+# CONFIG_USB_GADGET_FSL_USB2 is not set
-+# CONFIG_USB_GADGET_NET2280 is not set
-+# CONFIG_USB_GADGET_PXA2XX is not set
-+# CONFIG_USB_GADGET_M66592 is not set
-+# CONFIG_USB_GADGET_GOKU is not set
-+# CONFIG_USB_GADGET_LH7A40X is not set
-+# CONFIG_USB_GADGET_OMAP is not set
-+CONFIG_USB_GADGET_S3C2410=y
-+CONFIG_USB_S3C2410=y
-+# CONFIG_USB_S3C2410_DEBUG is not set
-+# CONFIG_USB_GADGET_AT91 is not set
-+# CONFIG_USB_GADGET_DUMMY_HCD is not set
-+# CONFIG_USB_GADGET_DUALSPEED is not set
-+# CONFIG_USB_ZERO is not set
-+CONFIG_USB_ETH=y
-+CONFIG_USB_ETH_RNDIS=y
-+# CONFIG_USB_GADGETFS is not set
-+# CONFIG_USB_FILE_STORAGE is not set
-+# CONFIG_USB_G_SERIAL is not set
-+# CONFIG_USB_MIDI_GADGET is not set
-+
-+#
-+# SDIO support
-+#
-+CONFIG_SDIO=y
-+CONFIG_SDIO_S3C24XX=y
-+CONFIG_SDIO_S3C24XX_DMA=y
-+CONFIG_SDIO_AR6000_WLAN=y
-+CONFIG_MMC=y
-+CONFIG_MMC_DEBUG=y
-+CONFIG_MMC_UNSAFE_RESUME=y
-+
-+#
-+# MMC/SD Card Drivers
-+#
-+CONFIG_MMC_BLOCK=y
-+CONFIG_MMC_BLOCK_BOUNCE=y
-+# CONFIG_SDIO_UART is not set
-+
-+#
-+# MMC/SD Host Controller Drivers
-+#
-+# CONFIG_MMC_SPI is not set
-+CONFIG_MMC_S3C=y
-+CONFIG_NEW_LEDS=y
-+CONFIG_LEDS_CLASS=y
-+
-+#
-+# LED drivers
-+#
-+CONFIG_LEDS_S3C24XX=m
-+# CONFIG_LEDS_GPIO is not set
-+CONFIG_LEDS_NEO1973_VIBRATOR=y
-+CONFIG_LEDS_NEO1973_GTA02=y
-+
-+#
-+# LED Triggers
-+#
-+CONFIG_LEDS_TRIGGERS=y
-+CONFIG_LEDS_TRIGGER_TIMER=y
-+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+CONFIG_RTC_DEBUG=y
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+CONFIG_RTC_DRV_S3C=m
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=m
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+# CONFIG_EXT3_FS_XATTR is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+CONFIG_FS_POSIX_ACL=y
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+# CONFIG_MINIX_FS is not set
-+CONFIG_ROMFS_FS=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+CONFIG_DNOTIFY=y
-+# CONFIG_AUTOFS_FS is not set
-+CONFIG_AUTOFS4_FS=m
-+CONFIG_FUSE_FS=m
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+CONFIG_ISO9660_FS=m
-+CONFIG_JOLIET=y
-+# CONFIG_ZISOFS 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_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+CONFIG_CONFIGFS_FS=m
-+
-+#
-+# 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_YAFFS_FS=y
-+CONFIG_YAFFS_YAFFS1=y
-+CONFIG_YAFFS_9BYTE_TAGS=y
-+CONFIG_YAFFS_YAFFS2=y
-+CONFIG_YAFFS_AUTO_YAFFS2=y
-+# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-+CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
-+# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-+# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
-+CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+CONFIG_JFFS2_SUMMARY=y
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# 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
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_DIRECTIO is not set
-+CONFIG_NFSD=m
-+CONFIG_NFSD_V3=y
-+# CONFIG_NFSD_V3_ACL is not set
-+CONFIG_NFSD_V4=y
-+CONFIG_NFSD_TCP=y
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_EXPORTFS=m
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+CONFIG_CIFS=m
-+# CONFIG_CIFS_STATS is not set
-+CONFIG_CIFS_WEAK_PW_HASH=y
-+# CONFIG_CIFS_XATTR is not set
-+# CONFIG_CIFS_DEBUG2 is not set
-+# CONFIG_CIFS_EXPERIMENTAL 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
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=y
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+CONFIG_NLS_CODEPAGE_850=m
-+# 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=m
-+CONFIG_NLS_CODEPAGE_950=m
-+# 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=y
-+# 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=m
-+# CONFIG_DLM is not set
-+CONFIG_INSTRUMENTATION=y
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+# CONFIG_SCHED_DEBUG is not set
-+# CONFIG_SCHEDSTATS is not set
-+CONFIG_TIMER_STATS=y
-+# CONFIG_DEBUG_SLAB is not set
-+CONFIG_DEBUG_PREEMPT=y
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_LOCK_ALLOC is not set
-+# CONFIG_PROVE_LOCKING is not set
-+# CONFIG_LOCK_STAT is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+CONFIG_FRAME_POINTER=y
-+CONFIG_FORCED_INLINING=y
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_USER is not set
-+CONFIG_DEBUG_ERRORS=y
-+CONFIG_DEBUG_LL=y
-+# CONFIG_DEBUG_ICEDCC is not set
-+CONFIG_DEBUG_S3C_PORT=y
-+CONFIG_DEBUG_S3C_UART=0
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_HMAC=y
-+CONFIG_CRYPTO_XCBC=m
-+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_WP512=m
-+CONFIG_CRYPTO_TGR192=m
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+CONFIG_CRYPTO_LRW=m
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_FCRYPT=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_CAST6=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_KHAZAD=m
-+CONFIG_CRYPTO_ANUBIS=m
-+# CONFIG_CRYPTO_SEED is not set
-+CONFIG_CRYPTO_DEFLATE=m
-+CONFIG_CRYPTO_MICHAEL_MIC=m
-+CONFIG_CRYPTO_CRC32C=m
-+CONFIG_CRYPTO_CAMELLIA=m
-+CONFIG_CRYPTO_TEST=m
-+# CONFIG_CRYPTO_AUTHENC is not set
-+CONFIG_CRYPTO_HW=y
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_CRC_CCITT=m
-+CONFIG_CRC16=m
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+CONFIG_LIBCRC32C=m
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_TEXTSEARCH=y
-+CONFIG_TEXTSEARCH_KMP=m
-+CONFIG_TEXTSEARCH_BM=m
-+CONFIG_TEXTSEARCH_FSM=m
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_DMA=y
-diff --git a/defconfig-gta02 b/defconfig-gta02
-new file mode 100644
-index 0000000..4d040ff
---- /dev/null
-+++ b/defconfig-gta02
-@@ -0,0 +1,1769 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.24
-+# Mon Feb 25 07:03:56 2008
-+#
-+CONFIG_ARM=y
-+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-+CONFIG_GENERIC_GPIO=y
-+# CONFIG_GENERIC_TIME is not set
-+# CONFIG_GENERIC_CLOCKEVENTS is not set
-+CONFIG_MMU=y
-+CONFIG_NO_IOPORT=y
-+CONFIG_GENERIC_HARDIRQS=y
-+CONFIG_STACKTRACE_SUPPORT=y
-+CONFIG_LOCKDEP_SUPPORT=y
-+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-+CONFIG_HARDIRQS_SW_RESEND=y
-+CONFIG_GENERIC_IRQ_PROBE=y
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_ZONE_DMA=y
-+CONFIG_FIQ=y
-+CONFIG_VECTORS_BASE=0xffff0000
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_LOCK_KERNEL=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_SYSFS_DEPRECATED is not set
-+# CONFIG_RELAY is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+CONFIG_SYSCTL=y
-+# CONFIG_EMBEDDED is not set
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=m
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=m
-+# CONFIG_DEFAULT_AS is not set
-+CONFIG_DEFAULT_DEADLINE=y
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="deadline"
-+
-+#
-+# System Type
-+#
-+# CONFIG_ARCH_AAEC2000 is not set
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_REALVIEW is not set
-+# CONFIG_ARCH_VERSATILE is not set
-+# CONFIG_ARCH_AT91 is not set
-+# CONFIG_ARCH_CLPS7500 is not set
-+# CONFIG_ARCH_CLPS711X is not set
-+# CONFIG_ARCH_CO285 is not set
-+# CONFIG_ARCH_EBSA110 is not set
-+# CONFIG_ARCH_EP93XX is not set
-+# CONFIG_ARCH_FOOTBRIDGE is not set
-+# CONFIG_ARCH_NETX is not set
-+# CONFIG_ARCH_H720X is not set
-+# CONFIG_ARCH_IMX is not set
-+# CONFIG_ARCH_IOP13XX is not set
-+# CONFIG_ARCH_IOP32X is not set
-+# CONFIG_ARCH_IOP33X is not set
-+# CONFIG_ARCH_IXP23XX is not set
-+# CONFIG_ARCH_IXP2000 is not set
-+# CONFIG_ARCH_IXP4XX is not set
-+# CONFIG_ARCH_L7200 is not set
-+# CONFIG_ARCH_KS8695 is not set
-+# CONFIG_ARCH_NS9XXX is not set
-+# CONFIG_ARCH_MXC is not set
-+# CONFIG_ARCH_PNX4008 is not set
-+# CONFIG_ARCH_PXA is not set
-+# CONFIG_ARCH_RPC is not set
-+# CONFIG_ARCH_SA1100 is not set
-+CONFIG_ARCH_S3C2410=y
-+# CONFIG_ARCH_SHARK is not set
-+# CONFIG_ARCH_LH7A40X is not set
-+# CONFIG_ARCH_DAVINCI is not set
-+# CONFIG_ARCH_OMAP is not set
-+CONFIG_PLAT_S3C24XX=y
-+CONFIG_CPU_S3C244X=y
-+CONFIG_S3C2410_DMA=y
-+# CONFIG_S3C2410_DMA_DEBUG is not set
-+CONFIG_MACH_SMDK=y
-+CONFIG_MACH_NEO1973=y
-+CONFIG_PLAT_S3C=y
-+CONFIG_CPU_LLSERIAL_S3C2410=y
-+CONFIG_CPU_LLSERIAL_S3C2440=y
-+
-+#
-+# Boot options
-+#
-+# CONFIG_S3C_BOOT_WATCHDOG is not set
-+# CONFIG_S3C_BOOT_ERROR_RESET is not set
-+
-+#
-+# Power management
-+#
-+CONFIG_S3C2410_PM_DEBUG=y
-+# CONFIG_S3C2410_PM_CHECK is not set
-+CONFIG_S3C_LOWLEVEL_UART_PORT=2
-+
-+#
-+# S3C2400 Machines
-+#
-+CONFIG_CPU_S3C2410=y
-+CONFIG_CPU_S3C2410_DMA=y
-+CONFIG_S3C2410_PM=y
-+CONFIG_S3C2410_GPIO=y
-+CONFIG_S3C2410_CLOCK=y
-+CONFIG_S3C2410_PWM=y
-+
-+#
-+# S3C2410 Machines
-+#
-+# CONFIG_ARCH_SMDK2410 is not set
-+# CONFIG_ARCH_H1940 is not set
-+# CONFIG_MACH_N30 is not set
-+# CONFIG_ARCH_BAST is not set
-+# CONFIG_MACH_OTOM is not set
-+# CONFIG_MACH_AML_M5900 is not set
-+# CONFIG_MACH_VR1000 is not set
-+CONFIG_MACH_QT2410=y
-+CONFIG_MACH_NEO1973_GTA01=y
-+
-+#
-+# S3C2412 Machines
-+#
-+# CONFIG_MACH_SMDK2413 is not set
-+# CONFIG_MACH_SMDK2412 is not set
-+# CONFIG_MACH_VSTMS is not set
-+CONFIG_CPU_S3C2440=y
-+CONFIG_S3C2440_DMA=y
-+CONFIG_S3C2440_C_FIQ=y
-+
-+#
-+# S3C2440 Machines
-+#
-+# CONFIG_MACH_ANUBIS is not set
-+# CONFIG_MACH_OSIRIS is not set
-+# CONFIG_MACH_RX3715 is not set
-+CONFIG_ARCH_S3C2440=y
-+# CONFIG_MACH_NEXCODER_2440 is not set
-+CONFIG_SMDK2440_CPU2440=y
-+CONFIG_MACH_HXD8=y
-+CONFIG_MACH_NEO1973_GTA02=y
-+# CONFIG_NEO1973_GTA02_2440 is not set
-+CONFIG_CPU_S3C2442=y
-+
-+#
-+# S3C2442 Machines
-+#
-+CONFIG_SMDK2440_CPU2442=y
-+
-+#
-+# S3C2443 Machines
-+#
-+# CONFIG_MACH_SMDK2443 is not set
-+
-+#
-+# Processor Type
-+#
-+CONFIG_CPU_32=y
-+CONFIG_CPU_ARM920T=y
-+CONFIG_CPU_32v4T=y
-+CONFIG_CPU_ABRT_EV4T=y
-+CONFIG_CPU_CACHE_V4WT=y
-+CONFIG_CPU_CACHE_VIVT=y
-+CONFIG_CPU_COPY_V4WB=y
-+CONFIG_CPU_TLB_V4WBI=y
-+CONFIG_CPU_CP15=y
-+CONFIG_CPU_CP15_MMU=y
-+
-+#
-+# Processor Features
-+#
-+CONFIG_ARM_THUMB=y
-+# CONFIG_CPU_ICACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-+# CONFIG_OUTER_CACHE is not set
-+
-+#
-+# Bus support
-+#
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Kernel Features
-+#
-+# CONFIG_TICK_ONESHOT is not set
-+CONFIG_PREEMPT=y
-+CONFIG_NO_IDLE_HZ=y
-+CONFIG_HZ=200
-+CONFIG_AEABI=y
-+CONFIG_OABI_COMPAT=y
-+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4096
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_ALIGNMENT_TRAP=y
-+
-+#
-+# Boot options
-+#
-+CONFIG_ZBOOT_ROM_TEXT=0x0
-+CONFIG_ZBOOT_ROM_BSS=0x0
-+CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
-+# CONFIG_XIP_KERNEL is not set
-+CONFIG_KEXEC=y
-+CONFIG_ATAGS_PROC=y
-+
-+#
-+# Floating point emulation
-+#
-+
-+#
-+# At least one emulation must be selected
-+#
-+CONFIG_FPE_NWFPE=y
-+# CONFIG_FPE_NWFPE_XP is not set
-+# CONFIG_FPE_FASTFPE is not set
-+
-+#
-+# Userspace binary formats
-+#
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+
-+#
-+# Power management options
-+#
-+CONFIG_PM=y
-+CONFIG_PM_LEGACY=y
-+CONFIG_PM_DEBUG=y
-+# CONFIG_PM_VERBOSE is not set
-+CONFIG_PM_SLEEP=y
-+CONFIG_SUSPEND_UP_POSSIBLE=y
-+CONFIG_SUSPEND=y
-+CONFIG_APM_EMULATION=y
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+CONFIG_PACKET_MMAP=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+CONFIG_XFRM_MIGRATE=y
-+CONFIG_NET_KEY=m
-+CONFIG_NET_KEY_MIGRATE=y
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+# CONFIG_IP_ROUTE_MULTIPATH is not set
-+# CONFIG_IP_ROUTE_VERBOSE 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=m
-+CONFIG_NET_IPGRE=m
-+# CONFIG_NET_IPGRE_BROADCAST is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_XFRM_TUNNEL=m
-+CONFIG_INET_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET_XFRM_MODE_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_BEET=m
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+CONFIG_TCP_MD5SIG=y
-+# CONFIG_IP_VS is not set
-+CONFIG_IPV6=m
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_IPCOMP=m
-+# CONFIG_IPV6_MIP6 is not set
-+CONFIG_INET6_XFRM_TUNNEL=m
-+CONFIG_INET6_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET6_XFRM_MODE_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_BEET=m
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_TUNNEL=m
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+CONFIG_NETFILTER=y
-+# CONFIG_NETFILTER_DEBUG is not set
-+
-+#
-+# Core Netfilter Configuration
-+#
-+CONFIG_NETFILTER_NETLINK=m
-+CONFIG_NETFILTER_NETLINK_QUEUE=m
-+CONFIG_NETFILTER_NETLINK_LOG=m
-+CONFIG_NF_CONNTRACK_ENABLED=m
-+CONFIG_NF_CONNTRACK=m
-+CONFIG_NF_CT_ACCT=y
-+CONFIG_NF_CONNTRACK_MARK=y
-+CONFIG_NF_CONNTRACK_EVENTS=y
-+CONFIG_NF_CT_PROTO_GRE=m
-+CONFIG_NF_CT_PROTO_SCTP=m
-+# CONFIG_NF_CT_PROTO_UDPLITE is not set
-+# CONFIG_NF_CONNTRACK_AMANDA is not set
-+CONFIG_NF_CONNTRACK_FTP=m
-+CONFIG_NF_CONNTRACK_H323=m
-+CONFIG_NF_CONNTRACK_IRC=m
-+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-+CONFIG_NF_CONNTRACK_PPTP=m
-+CONFIG_NF_CONNTRACK_SANE=m
-+CONFIG_NF_CONNTRACK_SIP=m
-+CONFIG_NF_CONNTRACK_TFTP=m
-+CONFIG_NF_CT_NETLINK=m
-+CONFIG_NETFILTER_XTABLES=m
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-+CONFIG_NETFILTER_XT_TARGET_DSCP=m
-+CONFIG_NETFILTER_XT_TARGET_MARK=m
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+CONFIG_NETFILTER_XT_MATCH_DCCP=m
-+CONFIG_NETFILTER_XT_MATCH_DSCP=m
-+CONFIG_NETFILTER_XT_MATCH_ESP=m
-+CONFIG_NETFILTER_XT_MATCH_HELPER=m
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_MAC=m
-+CONFIG_NETFILTER_XT_MATCH_MARK=m
-+CONFIG_NETFILTER_XT_MATCH_POLICY=m
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-+CONFIG_NETFILTER_XT_MATCH_REALM=m
-+CONFIG_NETFILTER_XT_MATCH_SCTP=m
-+CONFIG_NETFILTER_XT_MATCH_STATE=m
-+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-+CONFIG_NETFILTER_XT_MATCH_STRING=m
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-+
-+#
-+# IP: Netfilter Configuration
-+#
-+CONFIG_NF_CONNTRACK_IPV4=m
-+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-+# CONFIG_IP_NF_QUEUE is not set
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_MATCH_IPRANGE=m
-+CONFIG_IP_NF_MATCH_TOS=m
-+# CONFIG_IP_NF_MATCH_RECENT is not set
-+CONFIG_IP_NF_MATCH_ECN=m
-+CONFIG_IP_NF_MATCH_AH=m
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_MATCH_OWNER=m
-+CONFIG_IP_NF_MATCH_ADDRTYPE=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_TARGET_LOG=m
-+CONFIG_IP_NF_TARGET_ULOG=m
-+CONFIG_NF_NAT=m
-+CONFIG_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_NF_NAT_SNMP_BASIC=m
-+CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_FTP=m
-+CONFIG_NF_NAT_IRC=m
-+CONFIG_NF_NAT_TFTP=m
-+# CONFIG_NF_NAT_AMANDA is not set
-+CONFIG_NF_NAT_PPTP=m
-+CONFIG_NF_NAT_H323=m
-+CONFIG_NF_NAT_SIP=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_IP_NF_TARGET_TOS=m
-+CONFIG_IP_NF_TARGET_ECN=m
-+CONFIG_IP_NF_TARGET_TTL=m
-+CONFIG_IP_NF_TARGET_CLUSTERIP=m
-+# CONFIG_IP_NF_RAW is not set
-+# CONFIG_IP_NF_ARPTABLES is not set
-+
-+#
-+# IPv6: Netfilter Configuration (EXPERIMENTAL)
-+#
-+CONFIG_NF_CONNTRACK_IPV6=m
-+# CONFIG_IP6_NF_QUEUE is not set
-+CONFIG_IP6_NF_IPTABLES=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_OWNER=m
-+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-+CONFIG_IP6_NF_MATCH_AH=m
-+CONFIG_IP6_NF_MATCH_MH=m
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_LOG=m
-+CONFIG_IP6_NF_TARGET_REJECT=m
-+CONFIG_IP6_NF_MANGLE=m
-+CONFIG_IP6_NF_TARGET_HL=m
-+# CONFIG_IP6_NF_RAW is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+CONFIG_NET_SCHED=y
-+
-+#
-+# Queueing/Scheduling
-+#
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=m
-+CONFIG_NET_SCH_PRIO=m
-+# CONFIG_NET_SCH_RR is not set
-+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_NETEM=m
-+CONFIG_NET_SCH_INGRESS=m
-+
-+#
-+# Classification
-+#
-+CONFIG_NET_CLS=y
-+CONFIG_NET_CLS_BASIC=m
-+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_CLS_U32_PERF=y
-+CONFIG_CLS_U32_MARK=y
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
-+# CONFIG_NET_EMATCH is not set
-+# CONFIG_NET_CLS_ACT is not set
-+# CONFIG_NET_CLS_POLICE is not set
-+# CONFIG_NET_CLS_IND is not set
-+CONFIG_NET_SCH_FIFO=y
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_IRDA 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_HIDP=m
-+
-+#
-+# Bluetooth device drivers
-+#
-+CONFIG_BT_HCIUSB=m
-+CONFIG_BT_HCIUSB_SCO=y
-+# CONFIG_BT_HCIBTSDIO is not set
-+# CONFIG_BT_HCIUART is not set
-+# CONFIG_BT_HCIBCM203X is not set
-+# CONFIG_BT_HCIBPA10X is not set
-+# CONFIG_BT_HCIBFUSB is not set
-+# CONFIG_BT_HCIVHCI is not set
-+# CONFIG_AF_RXRPC is not set
-+CONFIG_FIB_RULES=y
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+CONFIG_WIRELESS_EXT=y
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=m
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=m
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_AFS_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+CONFIG_MTD_CFI_INTELEXT=y
-+# CONFIG_MTD_CFI_AMDSTD is not set
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+CONFIG_MTD_ABSENT=y
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+CONFIG_MTD_PHYSMAP=y
-+CONFIG_MTD_PHYSMAP_START=0x8000000
-+CONFIG_MTD_PHYSMAP_LEN=0
-+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-+# CONFIG_MTD_ARM_INTEGRATOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+CONFIG_MTD_NAND=y
-+CONFIG_MTD_NAND_VERIFY_WRITE=y
-+# CONFIG_MTD_NAND_ECC_SMC is not set
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+CONFIG_MTD_NAND_IDS=y
-+CONFIG_MTD_NAND_S3C2410=y
-+# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
-+CONFIG_MTD_NAND_S3C2410_HWECC=y
-+# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ALAUDA is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+# CONFIG_PARPORT is not set
-+CONFIG_PNP=y
-+CONFIG_PNP_DEBUG=y
-+
-+#
-+# Protocols
-+#
-+# CONFIG_PNPACPI is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=m
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_UB=m
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=4096
-+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=m
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=m
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+CONFIG_BLK_DEV_SR=m
-+# CONFIG_BLK_DEV_SR_VENDOR is not set
-+CONFIG_CHR_DEV_SG=m
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+CONFIG_SCSI_SCAN_ASYNC=y
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+CONFIG_TUN=m
-+# CONFIG_VETH is not set
-+# CONFIG_NET_SB1000 is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_AX88796 is not set
-+# CONFIG_SMC91X is not set
-+# CONFIG_DM9000 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_B44 is not set
-+CONFIG_CS89x0=m
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+CONFIG_USB_CATC=m
-+CONFIG_USB_KAWETH=m
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+CONFIG_USB_USBNET=y
-+CONFIG_USB_NET_AX8817X=m
-+CONFIG_USB_NET_CDCETHER=m
-+CONFIG_USB_NET_DM9601=m
-+CONFIG_USB_NET_GL620A=m
-+CONFIG_USB_NET_NET1080=m
-+CONFIG_USB_NET_PLUSB=m
-+CONFIG_USB_NET_MCS7830=m
-+CONFIG_USB_NET_RNDIS_HOST=m
-+CONFIG_USB_NET_CDC_SUBSET=m
-+CONFIG_USB_ALI_M5632=y
-+CONFIG_USB_AN2720=y
-+CONFIG_USB_BELKIN=y
-+CONFIG_USB_ARMLINUX=y
-+CONFIG_USB_EPSON2888=y
-+CONFIG_USB_KC2190=y
-+CONFIG_USB_NET_ZAURUS=m
-+# CONFIG_WAN is not set
-+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=m
-+CONFIG_PPP_MPPE=m
-+# CONFIG_PPPOE is not set
-+# CONFIG_PPPOL2TP is not set
-+# CONFIG_SLIP is not set
-+CONFIG_SLHC=m
-+# CONFIG_SHAPER is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
-+# CONFIG_INPUT_JOYDEV is not set
-+CONFIG_INPUT_EVDEV=y
-+CONFIG_INPUT_EVBUG=m
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+# CONFIG_KEYBOARD_ATKBD is not set
-+# 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_KEYBOARD_STOWAWAY=m
-+CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_NEO1973=y
-+CONFIG_KEYBOARD_QT2410=y
-+CONFIG_INPUT_MOUSE=y
-+# CONFIG_MOUSE_PS2 is not set
-+# CONFIG_MOUSE_SERIAL is not set
-+# CONFIG_MOUSE_APPLETOUCH is not set
-+# CONFIG_MOUSE_VSXXXAA is not set
-+# CONFIG_MOUSE_GPIO is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+CONFIG_INPUT_TOUCHSCREEN=y
-+# CONFIG_TOUCHSCREEN_ADS7846 is not set
-+# CONFIG_TOUCHSCREEN_FUJITSU is not set
-+CONFIG_TOUCHSCREEN_S3C2410=y
-+# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
-+# CONFIG_TOUCHSCREEN_GUNZE is not set
-+# CONFIG_TOUCHSCREEN_ELO is not set
-+# CONFIG_TOUCHSCREEN_MTOUCH is not set
-+# CONFIG_TOUCHSCREEN_MK712 is not set
-+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-+# CONFIG_TOUCHSCREEN_UCB1400 is not set
-+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-+CONFIG_INPUT_MISC=y
-+# CONFIG_INPUT_ATI_REMOTE is not set
-+# CONFIG_INPUT_ATI_REMOTE2 is not set
-+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-+# CONFIG_INPUT_POWERMATE is not set
-+# CONFIG_INPUT_YEALINK is not set
-+CONFIG_INPUT_UINPUT=m
-+CONFIG_INPUT_LIS302DL=y
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+# CONFIG_SERIO_SERPORT is not set
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_NR_TTY_DEVICES=4
-+CONFIG_HW_CONSOLE=y
-+CONFIG_VT_HW_CONSOLE_BINDING=y
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_SERIAL_S3C2410=y
-+CONFIG_SERIAL_S3C2410_CONSOLE=y
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_LEGACY_PTYS is not set
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_GPIO is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+CONFIG_I2C_S3C2410=y
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_TINY_USB is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_SENSORS_DS1337 is not set
-+# CONFIG_SENSORS_DS1374 is not set
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+CONFIG_SENSORS_PCF50606=y
-+CONFIG_SENSORS_PCF50633=y
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_SENSORS_PCA9539 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+CONFIG_SENSORS_TSL256X=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
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+# CONFIG_SPI_DEBUG is not set
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+CONFIG_SPI_S3C24XX=y
-+CONFIG_SPI_S3C24XX_GPIO=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_W1 is not set
-+CONFIG_POWER_SUPPLY=y
-+# CONFIG_POWER_SUPPLY_DEBUG is not set
-+# CONFIG_PDA_POWER is not set
-+# CONFIG_APM_POWER is not set
-+# CONFIG_BATTERY_DS2760 is not set
-+CONFIG_BATTERY_BQ27000_HDQ=y
-+CONFIG_GTA02_HDQ=y
-+# CONFIG_HWMON is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_S3C2410_WATCHDOG=m
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+CONFIG_MFD_GLAMO=y
-+CONFIG_MFD_GLAMO_FB=y
-+CONFIG_MFD_GLAMO_SPI_GPIO=y
-+CONFIG_MFD_GLAMO_SPI_FB=y
-+CONFIG_MFD_GLAMO_MCI=y
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+CONFIG_FB=y
-+# CONFIG_FIRMWARE_EDID is not set
-+# CONFIG_FB_DDC is not set
-+CONFIG_FB_CFB_FILLRECT=y
-+CONFIG_FB_CFB_COPYAREA=y
-+CONFIG_FB_CFB_IMAGEBLIT=y
-+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-+# CONFIG_FB_SYS_FILLRECT is not set
-+# CONFIG_FB_SYS_COPYAREA is not set
-+# CONFIG_FB_SYS_IMAGEBLIT is not set
-+# CONFIG_FB_SYS_FOPS is not set
-+CONFIG_FB_DEFERRED_IO=y
-+# CONFIG_FB_SVGALIB is not set
-+# CONFIG_FB_MACMODES is not set
-+# CONFIG_FB_BACKLIGHT is not set
-+# CONFIG_FB_MODE_HELPERS is not set
-+# CONFIG_FB_TILEBLITTING is not set
-+
-+#
-+# Frame buffer hardware drivers
-+#
-+# CONFIG_FB_UVESA is not set
-+# CONFIG_FB_S1D13XXX is not set
-+CONFIG_FB_S3C2410=y
-+# CONFIG_FB_S3C2410_DEBUG is not set
-+# CONFIG_FB_VIRTUAL is not set
-+CONFIG_BACKLIGHT_LCD_SUPPORT=y
-+CONFIG_LCD_CLASS_DEVICE=y
-+# CONFIG_LCD_LTV350QV is not set
-+CONFIG_BACKLIGHT_CLASS_DEVICE=y
-+# CONFIG_BACKLIGHT_CORGI is not set
-+CONFIG_BACKLIGHT_GTA01=y
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+CONFIG_DISPLAY_JBT6K74=y
-+
-+#
-+# Console display driver support
-+#
-+# CONFIG_VGA_CONSOLE is not set
-+CONFIG_DUMMY_CONSOLE=y
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-+CONFIG_FONTS=y
-+# CONFIG_FONT_8x8 is not set
-+# CONFIG_FONT_8x16 is not set
-+CONFIG_FONT_6x11=y
-+# CONFIG_FONT_7x14 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
-+# CONFIG_FONT_10x18 is not set
-+# CONFIG_LOGO is not set
-+
-+#
-+# Sound
-+#
-+CONFIG_SOUND=y
-+
-+#
-+# Advanced Linux Sound Architecture
-+#
-+CONFIG_SND=m
-+CONFIG_SND_TIMER=m
-+CONFIG_SND_PCM=m
-+# CONFIG_SND_SEQUENCER is not set
-+CONFIG_SND_OSSEMUL=y
-+CONFIG_SND_MIXER_OSS=m
-+CONFIG_SND_PCM_OSS=m
-+CONFIG_SND_PCM_OSS_PLUGINS=y
-+# CONFIG_SND_DYNAMIC_MINORS is not set
-+CONFIG_SND_SUPPORT_OLD_API=y
-+CONFIG_SND_VERBOSE_PROCFS=y
-+# 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
-+
-+#
-+# ALSA ARM devices
-+#
-+
-+#
-+# SPI devices
-+#
-+
-+#
-+# USB devices
-+#
-+# CONFIG_SND_USB_AUDIO is not set
-+# CONFIG_SND_USB_CAIAQ is not set
-+
-+#
-+# System on Chip audio support
-+#
-+CONFIG_SND_SOC=m
-+CONFIG_SND_S3C24XX_SOC=m
-+CONFIG_SND_S3C24XX_SOC_I2S=m
-+CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
-+CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
-+
-+#
-+# SoC Audio support for SuperH
-+#
-+CONFIG_SND_SOC_WM8753=m
-+
-+#
-+# Open Sound System
-+#
-+# CONFIG_SOUND_PRIME is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=m
-+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-+# CONFIG_HID_FF is not set
-+# CONFIG_USB_HIDDEV is not set
-+
-+#
-+# USB HID Boot Protocol drivers
-+#
-+# CONFIG_USB_KBD is not set
-+# CONFIG_USB_MOUSE is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+CONFIG_USB_SUSPEND=y
-+# CONFIG_USB_PERSIST is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=m
-+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+CONFIG_USB_ACM=m
-+CONFIG_USB_PRINTER=m
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+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 is not set
-+CONFIG_USB_STORAGE_DPCM=y
-+CONFIG_USB_STORAGE_USBAT=y
-+CONFIG_USB_STORAGE_SDDR09=y
-+CONFIG_USB_STORAGE_SDDR55=y
-+CONFIG_USB_STORAGE_JUMPSHOT=y
-+CONFIG_USB_STORAGE_ALAUDA=y
-+CONFIG_USB_STORAGE_KARMA=y
-+CONFIG_USB_LIBUSUAL=y
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+
-+#
-+# USB Serial Converter support
-+#
-+CONFIG_USB_SERIAL=m
-+CONFIG_USB_SERIAL_GENERIC=y
-+CONFIG_USB_SERIAL_AIRCABLE=m
-+CONFIG_USB_SERIAL_AIRPRIME=m
-+CONFIG_USB_SERIAL_ARK3116=m
-+CONFIG_USB_SERIAL_BELKIN=m
-+# CONFIG_USB_SERIAL_CH341 is not set
-+CONFIG_USB_SERIAL_WHITEHEAT=m
-+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-+CONFIG_USB_SERIAL_CP2101=m
-+CONFIG_USB_SERIAL_CYPRESS_M8=m
-+CONFIG_USB_SERIAL_EMPEG=m
-+CONFIG_USB_SERIAL_FTDI_SIO=m
-+CONFIG_USB_SERIAL_FUNSOFT=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_GARMIN=m
-+CONFIG_USB_SERIAL_IPW=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_MOS7720=m
-+CONFIG_USB_SERIAL_MOS7840=m
-+CONFIG_USB_SERIAL_NAVMAN=m
-+CONFIG_USB_SERIAL_PL2303=m
-+# CONFIG_USB_SERIAL_OTI6858 is not set
-+CONFIG_USB_SERIAL_HP4X=m
-+CONFIG_USB_SERIAL_SAFE=m
-+CONFIG_USB_SERIAL_SAFE_PADDED=y
-+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-+CONFIG_USB_SERIAL_TI=m
-+CONFIG_USB_SERIAL_CYBERJACK=m
-+CONFIG_USB_SERIAL_XIRCOM=m
-+CONFIG_USB_SERIAL_OPTION=m
-+CONFIG_USB_SERIAL_OMNINET=m
-+# CONFIG_USB_SERIAL_DEBUG is not set
-+CONFIG_USB_EZUSB=y
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+CONFIG_USB_BERRY_CHARGE=m
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_LD is not set
-+CONFIG_USB_TRANCEVIBRATOR=m
-+CONFIG_USB_IOWARRIOR=m
-+# CONFIG_USB_TEST is not set
-+
-+#
-+# USB DSL modem support
-+#
-+
-+#
-+# USB Gadget Support
-+#
-+CONFIG_USB_GADGET=y
-+# CONFIG_USB_GADGET_DEBUG is not set
-+# CONFIG_USB_GADGET_DEBUG_FILES is not set
-+CONFIG_USB_GADGET_SELECTED=y
-+# CONFIG_USB_GADGET_AMD5536UDC is not set
-+# CONFIG_USB_GADGET_ATMEL_USBA is not set
-+# CONFIG_USB_GADGET_FSL_USB2 is not set
-+# CONFIG_USB_GADGET_NET2280 is not set
-+# CONFIG_USB_GADGET_PXA2XX is not set
-+# CONFIG_USB_GADGET_M66592 is not set
-+# CONFIG_USB_GADGET_GOKU is not set
-+# CONFIG_USB_GADGET_LH7A40X is not set
-+# CONFIG_USB_GADGET_OMAP is not set
-+CONFIG_USB_GADGET_S3C2410=y
-+CONFIG_USB_S3C2410=y
-+# CONFIG_USB_S3C2410_DEBUG is not set
-+# CONFIG_USB_GADGET_AT91 is not set
-+# CONFIG_USB_GADGET_DUMMY_HCD is not set
-+# CONFIG_USB_GADGET_DUALSPEED is not set
-+# CONFIG_USB_ZERO is not set
-+CONFIG_USB_ETH=y
-+CONFIG_USB_ETH_RNDIS=y
-+# CONFIG_USB_GADGETFS is not set
-+# CONFIG_USB_FILE_STORAGE is not set
-+# CONFIG_USB_G_SERIAL is not set
-+# CONFIG_USB_MIDI_GADGET is not set
-+
-+#
-+# SDIO support
-+#
-+CONFIG_SDIO=y
-+CONFIG_SDIO_S3C24XX=y
-+CONFIG_SDIO_S3C24XX_DMA=y
-+CONFIG_SDIO_AR6000_WLAN=y
-+CONFIG_MMC=y
-+CONFIG_MMC_DEBUG=y
-+CONFIG_MMC_UNSAFE_RESUME=y
-+
-+#
-+# MMC/SD Card Drivers
-+#
-+CONFIG_MMC_BLOCK=y
-+CONFIG_MMC_BLOCK_BOUNCE=y
-+# CONFIG_SDIO_UART is not set
-+
-+#
-+# MMC/SD Host Controller Drivers
-+#
-+# CONFIG_MMC_SPI is not set
-+CONFIG_MMC_S3C=y
-+CONFIG_NEW_LEDS=y
-+CONFIG_LEDS_CLASS=y
-+
-+#
-+# LED drivers
-+#
-+CONFIG_LEDS_S3C24XX=m
-+# CONFIG_LEDS_GPIO is not set
-+CONFIG_LEDS_NEO1973_VIBRATOR=y
-+CONFIG_LEDS_NEO1973_GTA02=y
-+
-+#
-+# LED Triggers
-+#
-+CONFIG_LEDS_TRIGGERS=y
-+CONFIG_LEDS_TRIGGER_TIMER=y
-+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+CONFIG_RTC_DEBUG=y
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+CONFIG_RTC_DRV_S3C=m
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=m
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+# CONFIG_EXT3_FS_XATTR is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+CONFIG_FS_POSIX_ACL=y
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+# CONFIG_MINIX_FS is not set
-+CONFIG_ROMFS_FS=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+CONFIG_DNOTIFY=y
-+# CONFIG_AUTOFS_FS is not set
-+CONFIG_AUTOFS4_FS=m
-+CONFIG_FUSE_FS=m
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+CONFIG_ISO9660_FS=m
-+CONFIG_JOLIET=y
-+# CONFIG_ZISOFS 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_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+CONFIG_CONFIGFS_FS=m
-+
-+#
-+# 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_YAFFS_FS=y
-+CONFIG_YAFFS_YAFFS1=y
-+CONFIG_YAFFS_9BYTE_TAGS=y
-+CONFIG_YAFFS_YAFFS2=y
-+CONFIG_YAFFS_AUTO_YAFFS2=y
-+# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-+CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
-+# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-+# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
-+CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+CONFIG_JFFS2_SUMMARY=y
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# 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
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_DIRECTIO is not set
-+CONFIG_NFSD=m
-+CONFIG_NFSD_V3=y
-+# CONFIG_NFSD_V3_ACL is not set
-+CONFIG_NFSD_V4=y
-+CONFIG_NFSD_TCP=y
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_EXPORTFS=m
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+CONFIG_CIFS=m
-+# CONFIG_CIFS_STATS is not set
-+CONFIG_CIFS_WEAK_PW_HASH=y
-+# CONFIG_CIFS_XATTR is not set
-+# CONFIG_CIFS_DEBUG2 is not set
-+# CONFIG_CIFS_EXPERIMENTAL 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
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=y
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+CONFIG_NLS_CODEPAGE_850=m
-+# 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=m
-+CONFIG_NLS_CODEPAGE_950=m
-+# 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=y
-+# 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=m
-+# CONFIG_DLM is not set
-+CONFIG_INSTRUMENTATION=y
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+# CONFIG_SCHED_DEBUG is not set
-+# CONFIG_SCHEDSTATS is not set
-+CONFIG_TIMER_STATS=y
-+# CONFIG_DEBUG_SLAB is not set
-+CONFIG_DEBUG_PREEMPT=y
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_LOCK_ALLOC is not set
-+# CONFIG_PROVE_LOCKING is not set
-+# CONFIG_LOCK_STAT is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+CONFIG_FRAME_POINTER=y
-+CONFIG_FORCED_INLINING=y
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_USER is not set
-+CONFIG_DEBUG_ERRORS=y
-+CONFIG_DEBUG_LL=y
-+# CONFIG_DEBUG_ICEDCC is not set
-+CONFIG_DEBUG_S3C_PORT=y
-+CONFIG_DEBUG_S3C_UART=2
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_HMAC=y
-+CONFIG_CRYPTO_XCBC=m
-+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_WP512=m
-+CONFIG_CRYPTO_TGR192=m
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+CONFIG_CRYPTO_LRW=m
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_FCRYPT=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_CAST6=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_KHAZAD=m
-+CONFIG_CRYPTO_ANUBIS=m
-+# CONFIG_CRYPTO_SEED is not set
-+CONFIG_CRYPTO_DEFLATE=m
-+CONFIG_CRYPTO_MICHAEL_MIC=m
-+CONFIG_CRYPTO_CRC32C=m
-+CONFIG_CRYPTO_CAMELLIA=m
-+CONFIG_CRYPTO_TEST=m
-+# CONFIG_CRYPTO_AUTHENC is not set
-+CONFIG_CRYPTO_HW=y
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_CRC_CCITT=m
-+CONFIG_CRC16=m
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+CONFIG_LIBCRC32C=m
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_TEXTSEARCH=y
-+CONFIG_TEXTSEARCH_KMP=m
-+CONFIG_TEXTSEARCH_BM=m
-+CONFIG_TEXTSEARCH_FSM=m
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_DMA=y
-diff --git a/synthesize-gta-module-configs.mak b/synthesize-gta-module-configs.mak
-new file mode 100644
-index 0000000..f2454dd
---- /dev/null
-+++ b/synthesize-gta-module-configs.mak
-@@ -0,0 +1,9 @@
-+all:          defconfig-gta01 defconfig-gta02
-+
-+defconfig-gta01: \
-+              defconfig-2.6.24-maxmodules
-+              cp $< $@
-+
-+defconfig-gta02: \
-+              defconfig-2.6.24-maxmodules
-+              sed '/UART.*=0$$/s/=0/=2/' <$< >$@ || { rm -f $@; exit 1; }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1120-fix-glamofb-cmdqueue-timeout.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1120-fix-glamofb-cmdqueue-timeout.patch.patch
deleted file mode 100644 (file)
index c6255af..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-From e9c1588c44daa953240f7fedbf8100cf840414f5 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 13 Apr 2008 07:25:56 +0100
-Subject: [PATCH] fix-glamofb-cmdqueue-timeout.patch
-
-loglevl=9 can cause failure to init glamo-fb
-problem seems to be too low timeout when text scrolling can
-delay commandqueue going empty
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-fb.c |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c
-index f0d7600..87c7420 100644
---- a/drivers/mfd/glamo/glamo-fb.c
-+++ b/drivers/mfd/glamo/glamo-fb.c
-@@ -548,12 +548,13 @@ static int glamofb_cursor(struct fb_info *info, struct fb_cursor *cursor)
- static inline int glamofb_cmdq_empty(struct glamofb_handle *gfb)
- {
-+      /* DGCMdQempty -- 1 == command queue is empty */
-       return reg_read(gfb, GLAMO_REG_LCD_STATUS1) & (1 << 15);
- }
- void glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
- {
--      int timeout = 2000;
-+      int timeout = 20000;
-       dev_dbg(gfb->dev, "glamofb_cmd_mode(gfb=%p, on=%d)\n", gfb, on);
-       if (on) {
-@@ -605,7 +606,7 @@ EXPORT_SYMBOL_GPL(glamofb_cmd_mode);
- int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val)
- {
--      int timeout = 2000;
-+      int timeout = 20000;
-       dev_dbg(gfb->dev, "%s: waiting for cmdq empty\n",
-               __FUNCTION__);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1121-fix-usb-ethernet-mwester.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1121-fix-usb-ethernet-mwester.patch.patch
deleted file mode 100644 (file)
index 3bf5bc7..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From 2c96fcfe5037e1078c24f824a0c84050cf54532b Mon Sep 17 00:00:00 2001
-From: Mike Wester <mwester@dis.net>
-Date: Sun, 13 Apr 2008 07:25:56 +0100
-Subject: [PATCH] fix-usb-ethernet-mwester.patch
-
-This is a kernel bug affecting all platforms, introduced in some code cleanup in
-2.6.23.  Patch will be posted as soon as I test it.
-
-NOTE: Do not submit upstream; this patch or something very similar is already
-in process for 2.6.25.
----
- drivers/usb/gadget/ether.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
-index 6efbb44..758fd27 100644
---- a/drivers/usb/gadget/ether.c
-+++ b/drivers/usb/gadget/ether.c
-@@ -1558,6 +1558,7 @@ done_set_intf:
-                               memcpy(req->buf, buf, n);
-                               req->complete = rndis_response_complete;
-                               rndis_free_response(dev->rndis_config, buf);
-+                              value = n;
-                       }
-                       /* else stalls ... spec says to avoid that */
-               }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1122-fix-glamofb-cmd-mode-locking.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1122-fix-glamofb-cmd-mode-locking.patch.patch
deleted file mode 100644 (file)
index 58eecf3..0000000
+++ /dev/null
@@ -1,320 +0,0 @@
-From f2cf4e5f204e981a02a0edaccab4ca39f868ac0f Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 13 Apr 2008 07:25:56 +0100
-Subject: [PATCH] fix-glamofb-cmd-mode-locking.patch
-
-Glamo "cmd mode" is modal, but nothing took care about locking.
-Also cmd mode was entered recursively in rotate_lcd().
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-core.c |    2 +-
- drivers/mfd/glamo/glamo-fb.c   |  106 +++++++++++++++++++++++++--------------
- include/linux/glamofb.h        |    2 +-
- 3 files changed, 70 insertions(+), 40 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index accd933..19ca363 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -588,7 +588,7 @@ int glamo_engine_reclock(struct glamo_core *glamo,
-       if (val) {
-               val--;
-               reg_set_bit_mask(glamo, reg, mask, val);
--              msleep(5); /* wait some time to stabilize */
-+              mdelay(5); /* wait some time to stabilize */
-               return 0;
-       } else {
-diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c
-index 87c7420..8633e44 100644
---- a/drivers/mfd/glamo/glamo-fb.c
-+++ b/drivers/mfd/glamo/glamo-fb.c
-@@ -36,6 +36,7 @@
- #include <linux/wait.h>
- #include <linux/platform_device.h>
- #include <linux/clk.h>
-+#include <linux/spinlock.h>
- #include <asm/io.h>
- #include <asm/uaccess.h>
-@@ -50,7 +51,7 @@
- #include "glamo-regs.h"
- #include "glamo-core.h"
--#ifdef DEBUG
-+#ifndef DEBUG
- #define GLAMO_LOG(...)
- #else
- #define GLAMO_LOG(...) \
-@@ -72,6 +73,7 @@ struct glamofb_handle {
-       struct glamofb_platform_data *mach_info;
-       char __iomem *cursor_addr;
-       u_int32_t pseudo_pal[16];
-+      spinlock_t lock_cmd;
- };
- /* 'sibling' spi device for lcm init */
-@@ -237,6 +239,7 @@ static void rotate_lcd(struct glamofb_handle *glamo,
-                        __u32 rotation)
- {
-       int glamo_rot;
-+      unsigned long flags;
-       switch (rotation) {
-               case FB_ROTATE_UR:
-@@ -255,7 +258,15 @@ static void rotate_lcd(struct glamofb_handle *glamo,
-                       glamo_rot = GLAMO_LCD_ROT_MODE_0;
-                       break;
-       }
--      glamofb_cmd_mode(glamo, 1);
-+
-+      /*
-+       * ha ha we are only called when we are in cmd mode already
-+       * printk(KERN_ERR"rotate_lcd spin_lock_irqsave\n");
-+       * spin_lock_irqsave(&glamo->lock_cmd, flags);
-+       *
-+       * if (glamofb_cmd_mode(glamo, 1))
-+       *              goto out_unlock;
-+       */
-       reg_set_bit_mask(glamo,
-                        GLAMO_REG_LCD_WIDTH,
-                        GLAMO_LCD_ROT_MODE_MASK,
-@@ -265,17 +276,19 @@ static void rotate_lcd(struct glamofb_handle *glamo,
-                        GLAMO_LCD_MODE1_ROTATE_EN,
-                        (glamo_rot != GLAMO_LCD_ROT_MODE_0)?
-                                GLAMO_LCD_MODE1_ROTATE_EN : 0);
--      glamofb_cmd_mode(glamo, 0);
-+/*    glamofb_cmd_mode(glamo, 0);
-+
-+out_unlock:
-+      printk(KERN_ERR"rotate_lcd spin_unlock_irqrestore\n");
-+      spin_unlock_irqrestore(&glamo->lock_cmd, flags);
-+*/
- }
- static enum orientation get_orientation(struct fb_var_screeninfo *var)
- {
--      GLAMO_LOG("mark\n")
--      if (var->xres <= var->yres) {
--              GLAMO_LOG("portrait\n")
-+      if (var->xres <= var->yres)
-               return ORIENTATION_PORTRAIT;
--      }
--      GLAMO_LOG("landscape\n")
-+
-       return ORIENTATION_LANDSCAPE;
- }
-@@ -299,12 +312,18 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
-                                         struct fb_var_screeninfo *var)
- {
-       int sync, bp, disp, fp, total, xres, yres, pitch, orientation_changing;
-+      unsigned long flags;
--      GLAMO_LOG("enter: glamo:%#x, var:%#x\n", (unsigned)glamo, (unsigned)var);
-+/*    GLAMO_LOG("enter: glamo:%#x, var:%#x\n", (unsigned)glamo, (unsigned)var);
-+*/
-       if (!glamo || !var)
-               return;
--      glamofb_cmd_mode(glamo, 1);
-+      printk(KERN_ERR"glamofb_update_lcd_controller spin_lock_irqsave\n");
-+      spin_lock_irqsave(&glamo->lock_cmd, flags);
-+
-+      if (glamofb_cmd_mode(glamo, 1))
-+              goto out_unlock;
-       if (var->pixclock)
-               glamo_engine_reclock(glamo->mach_info->glamo,
-@@ -313,14 +332,14 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
-       xres = var->xres;
-       yres = var->yres;
--      GLAMO_LOG("xres:%d, yres:%d, rotate:%d\n", xres, yres, var->rotate);
--
-+/*    GLAMO_LOG("xres:%d, yres:%d, rotate:%d\n", xres, yres, var->rotate);
-+*/
-       /*
-        * figure out if orientation is going to change
-        */
-       orientation_changing = will_orientation_change(var);
--      GLAMO_LOG("orientation_changing:%d\n", orientation_changing);
--
-+/*    GLAMO_LOG("orientation_changing:%d\n", orientation_changing);
-+*/
-         /*
-          * adjust the pitch according to new orientation to come
-          */
-@@ -329,8 +348,8 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
-         } else {
-               pitch = var->xres * var->bits_per_pixel / 8;
-         }
--      GLAMO_LOG("pitch:%d\n", pitch);
--
-+/*    GLAMO_LOG("pitch:%d\n", pitch);
-+*/
-       /*
-        * set the awaiten LCD geometry
-        */
-@@ -347,7 +366,7 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
-                        GLAMO_LCD_PITCH_MASK,
-                        pitch);
--      GLAMO_LOG("mark:\n");
-+/*    GLAMO_LOG("mark:\n");*/
-       /*
-        * honour the rotation request
-        */
-@@ -365,7 +384,8 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
-               var->yres_virtual = var->yres = yres;
-       }
--      GLAMO_LOG("reported res:(%d,%d)\n", var->xres, var->yres);
-+/*    GLAMO_LOG("reported res:(%d,%d)\n", var->xres, var->yres);
-+*/
-       /*
-        * update scannout timings
-        */
-@@ -386,8 +406,8 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
-       reg_set_bit_mask(glamo, GLAMO_REG_LCD_HORIZ_DISP_END,
-                        GLAMO_LCD_HV_RETR_DISP_END_MASK, fp);
--      GLAMO_LOG("mark:\n");
--
-+/*    GLAMO_LOG("mark:\n");
-+*/
-       sync = 0;
-       bp = sync + var->vsync_len;
-       disp = bp + var->upper_margin;
-@@ -405,10 +425,13 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
-       reg_set_bit_mask(glamo, GLAMO_REG_LCD_VERT_DISP_END,
-                        GLAMO_LCD_HV_RETR_DISP_END_MASK, fp);
--      GLAMO_LOG("mark:\n");
-+/*    GLAMO_LOG("mark:\n"); */
-       glamofb_cmd_mode(glamo, 0);
--      GLAMO_LOG("leave:\n");
-+/*    GLAMO_LOG("leave:\n"); */
-+out_unlock:
-+      printk(KERN_ERR"glamofb_update_lcd_controller spin_unlock_irqrestore\n");
-+      spin_unlock_irqrestore(&glamo->lock_cmd, flags);
- }
- static int glamofb_set_par(struct fb_info *info)
-@@ -552,23 +575,25 @@ static inline int glamofb_cmdq_empty(struct glamofb_handle *gfb)
-       return reg_read(gfb, GLAMO_REG_LCD_STATUS1) & (1 << 15);
- }
--void glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
-+/* call holding gfb->lock_cmd  when locking, until you unlock */
-+
-+int glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
- {
--      int timeout = 20000;
-+      int timeout = 200000;
--      dev_dbg(gfb->dev, "glamofb_cmd_mode(gfb=%p, on=%d)\n", gfb, on);
-+/*    dev_dbg(gfb->dev, "glamofb_cmd_mode(gfb=%p, on=%d)\n", gfb, on); */
-       if (on) {
--              dev_dbg(gfb->dev, "%s: waiting for cmdq empty: ",
--                      __FUNCTION__);
-+/*            dev_dbg(gfb->dev, "%s: waiting for cmdq empty: ",
-+                      __FUNCTION__); */
-               while ((!glamofb_cmdq_empty(gfb)) && (timeout--))
-                       yield();
-               if (timeout < 0) {
-                       printk(KERN_ERR"*************"
-                                      "glamofb cmd_queue never got empty"
-                                      "*************\n");
--                      return;
-+                      return -EIO;
-               }
--              dev_dbg(gfb->dev, "empty!\n");
-+/*            dev_dbg(gfb->dev, "empty!\n"); */
-               /* display the entire frame then switch to command */
-               reg_write(gfb, GLAMO_REG_LCD_COMMAND1,
-@@ -576,8 +601,8 @@ void glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
-                         GLAMO_LCD_CMD_DATA_FIRE_VSYNC);
-               /* wait until LCD is idle */
--              dev_dbg(gfb->dev, "waiting for LCD idle: ");
--              timeout = 2000;
-+/*            dev_dbg(gfb->dev, "waiting for LCD idle: "); */
-+              timeout = 200000;
-               while ((!reg_read(gfb, GLAMO_REG_LCD_STATUS2) & (1 << 12)) &&
-                     (timeout--))
-                       yield();
-@@ -585,11 +610,11 @@ void glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
-                       printk(KERN_ERR"*************"
-                                      "glamofb lcd never idle"
-                                      "*************\n");
--                      return;
-+                      return -EIO;
-               }
--              dev_dbg(gfb->dev, "idle!\n");
-+/*            dev_dbg(gfb->dev, "idle!\n"); */
--              msleep(90);
-+              mdelay(100);
-       } else {
-               /* RGB interface needs vsync/hsync */
-               if (reg_read(gfb, GLAMO_REG_LCD_MODE3) & GLAMO_LCD_MODE3_RGB)
-@@ -601,15 +626,17 @@ void glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
-                         GLAMO_LCD_CMD_TYPE_DISP |
-                         GLAMO_LCD_CMD_DATA_DISP_FIRE);
-       }
-+
-+      return 0;
- }
- EXPORT_SYMBOL_GPL(glamofb_cmd_mode);
- int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val)
- {
--      int timeout = 20000;
-+      int timeout = 200000;
--      dev_dbg(gfb->dev, "%s: waiting for cmdq empty\n",
--              __FUNCTION__);
-+/*    dev_dbg(gfb->dev, "%s: waiting for cmdq empty\n",
-+              __FUNCTION__); */
-       while ((!glamofb_cmdq_empty(gfb)) && (timeout--))
-               yield();
-       if (timeout < 0) {
-@@ -618,7 +645,7 @@ int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val)
-                               "*************\n");
-               return 1;
-       }
--      dev_dbg(gfb->dev, "idle, writing 0x%04x\n", val);
-+/*    dev_dbg(gfb->dev, "idle, writing 0x%04x\n", val); */
-       reg_write(gfb, GLAMO_REG_LCD_COMMAND1, val);
-@@ -758,6 +785,9 @@ static int __init glamofb_probe(struct platform_device *pdev)
-       glamo_engine_enable(mach_info->glamo, GLAMO_ENGINE_LCD);
-       glamo_engine_reset(mach_info->glamo, GLAMO_ENGINE_LCD);
-+
-+      printk(KERN_ERR"spin_lock_init\n");
-+      spin_lock_init(&glamofb->lock_cmd);
-       glamofb_init_regs(glamofb);
-       rc = register_framebuffer(fbinfo);
-diff --git a/include/linux/glamofb.h b/include/linux/glamofb.h
-index 75eefef..51bf593 100644
---- a/include/linux/glamofb.h
-+++ b/include/linux/glamofb.h
-@@ -33,7 +33,7 @@ struct glamofb_platform_data {
-       int             (*glamo_irq_is_wired)(void);
- };
--void glamofb_cmd_mode(struct glamofb_handle *gfb, int on);
-+int glamofb_cmd_mode(struct glamofb_handle *gfb, int on);
- int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val);
- void glamo_lcm_reset(int level);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1123-fix-jack-debounce.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1123-fix-jack-debounce.patch.patch
deleted file mode 100644 (file)
index 45d4a07..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-From 9a5d2d81c0bf5c8fe2ac58d267033876904ed925 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 13 Apr 2008 07:25:57 +0100
-Subject: [PATCH] fix-jack-debounce.patch
-
-Headphone jack detection is bouncy, it can trigger multiple interrupts
-on insertion or removal.  This patch adds a workqueue that waits out the
-interrupt spew in 100ms units, and if it sees no more interrupts for 100ms
-only then samples and reports the jack state.  I was unable to get a bounce
-after 20 or so tries after this.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/input/keyboard/neo1973kbd.c |   63 ++++++++++++++++++++++++++++++++--
- 1 files changed, 59 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-index 06fa8e0..6c96660 100644
---- a/drivers/input/keyboard/neo1973kbd.c
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -21,6 +21,7 @@
- #include <linux/jiffies.h>
- #include <linux/module.h>
- #include <linux/slab.h>
-+#include <linux/workqueue.h>
- #include <asm/gpio.h>
- #include <asm/mach-types.h>
-@@ -28,6 +29,11 @@
- struct neo1973kbd {
-       struct input_dev *input;
-       unsigned int suspended;
-+      struct work_struct work;
-+      int work_in_progress;
-+      int hp_irq_count_in_work;
-+      int hp_irq_count;
-+      int jack_irq;
- };
- static irqreturn_t neo1973kbd_aux_irq(int irq, void *dev_id)
-@@ -52,14 +58,61 @@ static irqreturn_t neo1973kbd_hold_irq(int irq, void *dev_id)
-       return IRQ_HANDLED;
- }
-+
-+static void neo1973kbd_debounce_jack(struct work_struct *work)
-+{
-+      struct neo1973kbd *kbd = container_of(work, struct neo1973kbd, work);
-+
-+      /* we wait out any multiple interrupt stuttering in 100ms lumps */
-+
-+      do {
-+              kbd->hp_irq_count_in_work = kbd->hp_irq_count;
-+              msleep(100);
-+      } while (kbd->hp_irq_count != kbd->hp_irq_count_in_work);
-+
-+      /* no new interrupts on jack for 100ms... ok we will report it */
-+
-+      input_report_switch(kbd->input,
-+                          SW_HEADPHONE_INSERT,
-+                          gpio_get_value(irq_to_gpio(kbd->jack_irq)));
-+      input_sync(kbd->input);
-+
-+      /* next time we get an interrupt on jack we need new work action */
-+      kbd->work_in_progress = 0;
-+}
-+
-+
-+
- static irqreturn_t neo1973kbd_headphone_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--      int key_pressed = gpio_get_value(irq_to_gpio(irq));
--      input_report_switch(neo1973kbd_data->input,
--                          SW_HEADPHONE_INSERT, key_pressed);
--      input_sync(neo1973kbd_data->input);
-+      /*
-+       * this interrupt is prone to bouncing and userspace doesn't like
-+       * to have to deal with that kind of thing.  So we do not accept
-+       * that a jack interrupt is equal to a jack event.  Instead we fire
-+       * some work on the first interrupt, and it hangs about in 100ms units
-+       * until no more interrupts come.  Then it accepts the state it finds
-+       * for jack insert and reports it once
-+       */
-+
-+      neo1973kbd_data->hp_irq_count++;
-+      /*
-+       * the first interrupt we see for a while, we fire the work item
-+       * and record the interrupt count when we did that.  If more interrupts
-+       * come in the meanwhile, we can tell by the difference in that
-+       * stored count and hp_irq_count which increments every interrupt
-+       */
-+      if (!neo1973kbd_data->work_in_progress) {
-+              neo1973kbd_data->jack_irq = irq;
-+              neo1973kbd_data->hp_irq_count_in_work =
-+                                              neo1973kbd_data->hp_irq_count;
-+              if (!schedule_work(&neo1973kbd_data->work))
-+                      printk(KERN_ERR
-+                              "Unable to schedule headphone debounce\n");
-+              else
-+                      neo1973kbd_data->work_in_progress = 1;
-+      }
-       return IRQ_HANDLED;
- }
-@@ -120,6 +173,8 @@ static int neo1973kbd_probe(struct platform_device *pdev)
-       neo1973kbd->input = input_dev;
-+      INIT_WORK(&neo1973kbd->work, neo1973kbd_debounce_jack);
-+
-       input_dev->name = "Neo1973 Buttons";
-       input_dev->phys = "neo1973kbd/input0";
-       input_dev->id.bustype = BUS_HOST;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1124-OpenMoko-Openmoko.patch b/target/linux/s3c24xx/patches-2.6.24/1124-OpenMoko-Openmoko.patch
deleted file mode 100644 (file)
index 885ef42..0000000
+++ /dev/null
@@ -1,538 +0,0 @@
-From f761294475ddac8ecb74b5ef6c7cb7b0e7f71e0b Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Sun, 13 Apr 2008 07:25:57 +0100
-Subject: [PATCH] OpenMoko => Openmoko
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- arch/arm/mach-s3c2410/mach-gta01.c       |    2 +-
- arch/arm/mach-s3c2410/mach-qt2410.c      |    2 +-
- arch/arm/mach-s3c2410/pwm.c              |    2 +-
- arch/arm/mach-s3c2440/Kconfig            |    2 +-
- arch/arm/mach-s3c2440/mach-gta02.c       |    2 +-
- arch/arm/mach-s3c2440/mach-hxd8.c        |    2 +-
- arch/arm/plat-s3c24xx/neo1973_pm_bt.c    |    2 +-
- arch/arm/plat-s3c24xx/neo1973_pm_gps.c   |    2 +-
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c   |    2 +-
- arch/arm/plat-s3c24xx/neo1973_pm_host.c  |    2 +-
- arch/arm/plat-s3c24xx/neo1973_version.c  |    2 +-
- build                                    |    2 +-
- drivers/i2c/chips/pcf50606.c             |    2 +-
- drivers/i2c/chips/pcf50606.h             |    2 +-
- drivers/i2c/chips/pcf50633.c             |    2 +-
- drivers/i2c/chips/pcf50633.h             |    2 +-
- drivers/input/keyboard/neo1973kbd.c      |    2 +-
- drivers/input/keyboard/qt2410kbd.c       |    2 +-
- drivers/input/misc/lis302dl.c            |    2 +-
- drivers/leds/leds-neo1973-gta02.c        |    2 +-
- drivers/leds/leds-neo1973-vibrator.c     |    2 +-
- drivers/mfd/glamo/Kconfig                |    2 +-
- drivers/mfd/glamo/glamo-core.c           |    2 +-
- drivers/mfd/glamo/glamo-fb.c             |    4 ++--
- drivers/mfd/glamo/glamo-lcm-spi.c        |    2 +-
- drivers/mfd/glamo/glamo-mci.c            |    4 ++--
- drivers/mfd/glamo/glamo-mci.h            |    2 +-
- drivers/mfd/glamo/glamo-regs.h           |    2 +-
- drivers/mfd/glamo/glamo-spi-gpio.c       |    2 +-
- drivers/power/gta02_hdq.c                |    2 +-
- drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c   |    2 +-
- drivers/video/backlight/gta01_bl.c       |    2 +-
- drivers/video/display/Kconfig            |    2 +-
- drivers/video/display/jbt6k74.c          |    2 +-
- drivers/video/logo/Kconfig               |    2 +-
- drivers/video/logo/logo.c                |    2 +-
- sound/soc/s3c24xx/neo1973_gta02_wm8753.c |    2 +-
- 37 files changed, 39 insertions(+), 39 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index 0543daa..8c1a402 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -3,7 +3,7 @@
-  *
-  * S3C2410 Machine Support for the FIC Neo1973 GTA01
-  *
-- * Copyright (C) 2006-2007 by OpenMoko, Inc.
-+ * Copyright (C) 2006-2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c
-index daf94cd..f446996 100644
---- a/arch/arm/mach-s3c2410/mach-qt2410.c
-+++ b/arch/arm/mach-s3c2410/mach-qt2410.c
-@@ -1,6 +1,6 @@
- /* linux/arch/arm/mach-s3c2410/mach-qt2410.c
-  *
-- * Copyright (C) 2006 by OpenMoko, Inc.
-+ * Copyright (C) 2006 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/arch/arm/mach-s3c2410/pwm.c b/arch/arm/mach-s3c2410/pwm.c
-index 8a07359..23738c1 100644
---- a/arch/arm/mach-s3c2410/pwm.c
-+++ b/arch/arm/mach-s3c2410/pwm.c
-@@ -2,7 +2,7 @@
-  * arch/arm/mach-s3c2410/3c2410-pwm.c
-  *
-  * Copyright (c) by Javi Roman <javiroman@kernel-labs.org>
-- *             for the OpenMoko Project.
-+ *             for the Openmoko Project.
-  *
-  *     S3C2410A SoC PWM support
-  *
-diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
-index 71719ac..c40aaca 100644
---- a/arch/arm/mach-s3c2440/Kconfig
-+++ b/arch/arm/mach-s3c2440/Kconfig
-@@ -96,7 +96,7 @@ config NEO1973_GTA02_2440
-       select CPU_S3C2440
-       help
-          Say Y here if you are using an early hardware revision
--         of the FIC/OpenMoko Neo1973 GTA02 GSM Phone.
-+         of the FIC/Openmoko Neo1973 GTA02 GSM Phone.
- endmenu
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index bd2888a..f9e00d5 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -3,7 +3,7 @@
-  *
-  * S3C2440 Machine Support for the FIC GTA02 (Neo1973)
-  *
-- * Copyright (C) 2006-2007 by OpenMoko, Inc.
-+ * Copyright (C) 2006-2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/arch/arm/mach-s3c2440/mach-hxd8.c b/arch/arm/mach-s3c2440/mach-hxd8.c
-index 3400ed3..6690931 100644
---- a/arch/arm/mach-s3c2440/mach-hxd8.c
-+++ b/arch/arm/mach-s3c2440/mach-hxd8.c
-@@ -2,7 +2,7 @@
-  *
-  * S3C2440 Machine Support for the FIC HXD8
-  *
-- * Copyright (c) 2007 OpenMoko, Inc.
-+ * Copyright (c) 2007 Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-index 8f5be88..a9694b4 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-@@ -1,7 +1,7 @@
- /*
-  * Bluetooth PM code for the FIC Neo1973 GSM Phone
-  *
-- * (C) 2007 by OpenMoko Inc.
-+ * (C) 2007 by Openmoko Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-index b12f7bc..d882f7b 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-@@ -1,7 +1,7 @@
- /*
-  * GPS Power Management code for the FIC Neo1973 GSM Phone
-  *
-- * (C) 2007 by OpenMoko Inc.
-+ * (C) 2007 by Openmoko Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index c3292b8..f22cad8 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -1,7 +1,7 @@
- /*
-  * GSM Management code for the FIC Neo1973 GSM Phone
-  *
-- * (C) 2007 by OpenMoko Inc.
-+ * (C) 2007 by Openmoko Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_host.c b/arch/arm/plat-s3c24xx/neo1973_pm_host.c
-index 4eae341..8aee609 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_host.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_host.c
-@@ -1,7 +1,7 @@
- /*
-  * Bluetooth PM code for the FIC Neo1973 GSM Phone
-  *
-- * (C) 2007 by OpenMoko Inc.
-+ * (C) 2007 by Openmoko Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/arch/arm/plat-s3c24xx/neo1973_version.c b/arch/arm/plat-s3c24xx/neo1973_version.c
-index ad41a0f..ab4805b 100644
---- a/arch/arm/plat-s3c24xx/neo1973_version.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_version.c
-@@ -1,7 +1,7 @@
- /*
-  * PCB version sysfs for the FIC Neo1973 GSM Phone
-  *
-- * (C) 2007 by OpenMoko Inc.
-+ * (C) 2007 by Openmoko Inc.
-  * Author: Andy Green <andy@openmoko.com>
-  * All rights reserved.
-  *
-diff --git a/build b/build
-index 728454d..12e06bf 100755
---- a/build
-+++ b/build
-@@ -7,7 +7,7 @@ make -f synthesize-gta-module-configs.mak
- make ARCH=arm silentoldconfig
- if make -j5 ARCH=arm; then
-       ${CROSS_COMPILE}objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux linux.bin
--      mkimage -A arm -O linux -T kernel -C none -a 30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973(GTA02)" -d linux.bin uImage.bin
-+      mkimage -A arm -O linux -T kernel -C none -a 30008000 -e 30008000 -n "Openmoko Kernel Image Neo1973(GTA02)" -d linux.bin uImage.bin
-       exit 0
- else
-       exit 1
-diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
-index 03805be..6f71e6c 100644
---- a/drivers/i2c/chips/pcf50606.c
-+++ b/drivers/i2c/chips/pcf50606.c
-@@ -1,6 +1,6 @@
- /* Philips/NXP PCF50606 Power Management Unit (PMU) driver
-  *
-- * (C) 2006-2007 by OpenMoko, Inc.
-+ * (C) 2006-2007 by Openmoko, Inc.
-  * Authors: Harald Welte <laforge@openmoko.org>,
-  *        Matt Hsu <matt@openmoko.org>
-  * All rights reserved.
-diff --git a/drivers/i2c/chips/pcf50606.h b/drivers/i2c/chips/pcf50606.h
-index 15b350f..5eded96 100644
---- a/drivers/i2c/chips/pcf50606.h
-+++ b/drivers/i2c/chips/pcf50606.h
-@@ -2,7 +2,7 @@
- #define _PCF50606_H
- /* Philips PCF50606 Power Managemnt Unit (PMU) driver
-- * (C) 2006-2007 by OpenMoko, Inc.
-+ * (C) 2006-2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  *
-  */
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index b5cd2cb..09d5cfd 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1,6 +1,6 @@
- /* Philips PCF50633 Power Management Unit (PMU) driver
-  *
-- * (C) 2006-2007 by OpenMoko, Inc.
-+ * (C) 2006-2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/drivers/i2c/chips/pcf50633.h b/drivers/i2c/chips/pcf50633.h
-index 9aad206..93dfd99 100644
---- a/drivers/i2c/chips/pcf50633.h
-+++ b/drivers/i2c/chips/pcf50633.h
-@@ -2,7 +2,7 @@
- #define _PCF50633_H
- /* Philips PCF50633 Power Managemnt Unit (PMU) driver
-- * (C) 2006-2007 by OpenMoko, Inc.
-+ * (C) 2006-2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  *
-  */
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-index 6c96660..a1fc7a3 100644
---- a/drivers/input/keyboard/neo1973kbd.c
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -1,7 +1,7 @@
- /*
-  * Keyboard driver for FIC Neo1973 GSM phone
-  *
-- * (C) 2006-2007 by OpenMoko, Inc.
-+ * (C) 2006-2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/drivers/input/keyboard/qt2410kbd.c b/drivers/input/keyboard/qt2410kbd.c
-index 4d497a3..fa4bf32 100644
---- a/drivers/input/keyboard/qt2410kbd.c
-+++ b/drivers/input/keyboard/qt2410kbd.c
-@@ -1,7 +1,7 @@
- /*
-  * Keyboard driver for Armzone QT2410
-  *
-- * (C) 2006 by OpenMoko, Inc.
-+ * (C) 2006 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
-index 2be816a..6067dba 100644
---- a/drivers/input/misc/lis302dl.c
-+++ b/drivers/input/misc/lis302dl.c
-@@ -1,6 +1,6 @@
- /* Linux kernel driver for the ST LIS302D 3-axis accelerometer
-  *
-- * Copyright (C) 2007 by OpenMoko, Inc.
-+ * Copyright (C) 2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/drivers/leds/leds-neo1973-gta02.c b/drivers/leds/leds-neo1973-gta02.c
-index bf1d540..8678670 100644
---- a/drivers/leds/leds-neo1973-gta02.c
-+++ b/drivers/leds/leds-neo1973-gta02.c
-@@ -1,7 +1,7 @@
- /*
-  * LED driver for the FIC Neo1973 GTA02 GSM phone
-  *
-- * (C) 2006-2007 by OpenMoko, Inc.
-+ * (C) 2006-2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/drivers/leds/leds-neo1973-vibrator.c b/drivers/leds/leds-neo1973-vibrator.c
-index 36ed216..f31302d 100644
---- a/drivers/leds/leds-neo1973-vibrator.c
-+++ b/drivers/leds/leds-neo1973-vibrator.c
-@@ -1,7 +1,7 @@
- /*
-  * LED driver for the vibrator of the FIC Neo1973 GSM Phone
-  *
-- * (C) 2006-2007 by OpenMoko, Inc.
-+ * (C) 2006-2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/drivers/mfd/glamo/Kconfig b/drivers/mfd/glamo/Kconfig
-index ec2ae3d..86a7c40 100644
---- a/drivers/mfd/glamo/Kconfig
-+++ b/drivers/mfd/glamo/Kconfig
-@@ -38,7 +38,7 @@ config MFD_GLAMO_MCI
-       depends on MFD_GLAMO && MMC
-       help
-         This selects a driver for the MCI interface found in
--        the S-Media GLAMO chip, as used in OpenMoko
-+        the S-Media GLAMO chip, as used in Openmoko
-         neo1973 GTA-02.
-         If unsure, say N.
-\ No newline at end of file
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index 19ca363..34b2a01 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -1,6 +1,6 @@
- /* Smedia Glamo 336x/337x driver
-  *
-- * (C) 2007 by OpenMoko, Inc.
-+ * (C) 2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c
-index 8633e44..edc6d9c 100644
---- a/drivers/mfd/glamo/glamo-fb.c
-+++ b/drivers/mfd/glamo/glamo-fb.c
-@@ -1,6 +1,6 @@
- /* Smedia Glamo 336x/337x driver
-  *
-- * (C) 2007 by OpenMoko, Inc.
-+ * (C) 2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-@@ -684,7 +684,7 @@ static int __init glamofb_probe(struct platform_device *pdev)
-       struct glamofb_platform_data *mach_info = pdev->dev.platform_data;
-       printk(KERN_INFO "SMEDIA Glamo frame buffer driver (C) 2007 "
--              "OpenMoko, Inc.\n");
-+              "Openmoko, Inc.\n");
-       fbinfo = framebuffer_alloc(sizeof(struct glamofb_handle), &pdev->dev);
-       if (!fbinfo)
-diff --git a/drivers/mfd/glamo/glamo-lcm-spi.c b/drivers/mfd/glamo/glamo-lcm-spi.c
-index 92cabe4..874fb0e 100644
---- a/drivers/mfd/glamo/glamo-lcm-spi.c
-+++ b/drivers/mfd/glamo/glamo-lcm-spi.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2007 OpenMoko, Inc.
-+ * Copyright (C) 2007 Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  *
-  * Smedia Glamo GPIO based SPI driver
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index d8847c5..05bbfc4 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -1,7 +1,7 @@
- /*
-  *  linux/drivers/mmc/host/glamo-mmc.c - Glamo MMC driver
-  *
-- *  Copyright (C) 2007 OpenMoko, Inc,  Andy Green <andy@openmoko.com>
-+ *  Copyright (C) 2007 Openmoko, Inc,  Andy Green <andy@openmoko.com>
-  *  Based on S3C MMC driver that was:
-  *  Copyright (C) 2004-2006 maintech GmbH, Thomas Kleffel <tk@maintech.de>
-  *
-@@ -661,7 +661,7 @@ static int glamo_mci_probe(struct platform_device *pdev)
-       struct glamo_mci_host   *host;
-       int ret;
--      dev_info(&pdev->dev, "glamo_mci driver (C)2007 OpenMoko, Inc\n");
-+      dev_info(&pdev->dev, "glamo_mci driver (C)2007 Openmoko, Inc\n");
-       mmc = mmc_alloc_host(sizeof(struct glamo_mci_host), &pdev->dev);
-       if (!mmc) {
-diff --git a/drivers/mfd/glamo/glamo-mci.h b/drivers/mfd/glamo/glamo-mci.h
-index 55852e7..f3f170e 100644
---- a/drivers/mfd/glamo/glamo-mci.h
-+++ b/drivers/mfd/glamo/glamo-mci.h
-@@ -1,7 +1,7 @@
- /*
-  *  linux/drivers/mmc/host/glamo-mmc.h - GLAMO MCI driver
-  *
-- *  Copyright (C) 2007-2008 OpenMoko, Inc, Andy Green <andy@openmoko.com>
-+ *  Copyright (C) 2007-2008 Openmoko, Inc, Andy Green <andy@openmoko.com>
-  *   based on S3C MMC driver -->
-  *  Copyright (C) 2004-2006 Thomas Kleffel, All Rights Reserved.
-  *
-diff --git a/drivers/mfd/glamo/glamo-regs.h b/drivers/mfd/glamo/glamo-regs.h
-index 8f6c45c..32411e3 100644
---- a/drivers/mfd/glamo/glamo-regs.h
-+++ b/drivers/mfd/glamo/glamo-regs.h
-@@ -3,7 +3,7 @@
- /* Smedia Glamo 336x/337x driver
-  *
-- * (C) 2007 by OpenMoko, Inc.
-+ * (C) 2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/drivers/mfd/glamo/glamo-spi-gpio.c b/drivers/mfd/glamo/glamo-spi-gpio.c
-index eda7322..ece5750 100644
---- a/drivers/mfd/glamo/glamo-spi-gpio.c
-+++ b/drivers/mfd/glamo/glamo-spi-gpio.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2007 OpenMoko, Inc.
-+ * Copyright (C) 2007 Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  *
-  * Smedia Glamo GPIO based SPI driver
-diff --git a/drivers/power/gta02_hdq.c b/drivers/power/gta02_hdq.c
-index 12c742e..5a79fd6 100644
---- a/drivers/power/gta02_hdq.c
-+++ b/drivers/power/gta02_hdq.c
-@@ -1,7 +1,7 @@
- /*
-  * HDQ driver for the FIC Neo1973 GTA02 GSM phone
-  *
-- * (C) 2006-2007 by OpenMoko, Inc.
-+ * (C) 2006-2007 by Openmoko, Inc.
-  * Author: Andy Green <andy@openmoko.com>
-  * All rights reserved.
-  *
-diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-index 3c4758b..8c3bbbc 100644
---- a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-+++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-@@ -1,7 +1,7 @@
- /*
-  * s3c24xx_hcd.c - Samsung S3C MCI driver, Atheros SDIO API compatible.
-  *
-- * Copyright (C) 2007 by OpenMoko, Inc.
-+ * Copyright (C) 2007 by Openmoko, Inc.
-  * Written by Samuel Ortiz <sameo@openedhand.com>
-  * All Rights Reserved
-  *
-diff --git a/drivers/video/backlight/gta01_bl.c b/drivers/video/backlight/gta01_bl.c
-index c2bf0c9..bd7d41f 100644
---- a/drivers/video/backlight/gta01_bl.c
-+++ b/drivers/video/backlight/gta01_bl.c
-@@ -1,7 +1,7 @@
- /*
-  *  Backlight Driver for FIC GTA01 (Neo1973) GSM Phone
-  *
-- * Copyright (C) 2006-2007 by OpenMoko, Inc.
-+ * Copyright (C) 2006-2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/drivers/video/display/Kconfig b/drivers/video/display/Kconfig
-index f0da483..674dc2c 100644
---- a/drivers/video/display/Kconfig
-+++ b/drivers/video/display/Kconfig
-@@ -27,7 +27,7 @@ config DISPLAY_JBT6K74
-       help
-         SPI driver for the control interface of TFT panels containing
-         the TPO JBT6K74-AS controller ASIC, such as the TPO TD028TTEC1
--        TFT diplay module used in the FIC/OpenMoko Neo1973 GSM phones.
-+        TFT diplay module used in the FIC/Openmoko Neo1973 GSM phones.
-         The control interface is required for display operation, as it
-         controls power management, display timing and gamma calibration.
-diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c
-index d7e9442..7e11da7 100644
---- a/drivers/video/display/jbt6k74.c
-+++ b/drivers/video/display/jbt6k74.c
-@@ -1,6 +1,6 @@
- /* Linux kernel driver for the tpo JBT6K74-AS LCM ASIC
-  *
-- * Copyright (C) 2006-2007 by OpenMoko, Inc.
-+ * Copyright (C) 2006-2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>,
-  *       Stefan Schmidt <stefan@openmoko.org>
-  * All rights reserved.
-diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
-index 6d97d00..def3167 100644
---- a/drivers/video/logo/Kconfig
-+++ b/drivers/video/logo/Kconfig
-@@ -68,7 +68,7 @@ config LOGO_SUPERH_CLUT224
-       default y
- config LOGO_OPENMOKO_CLUT224
--      bool "224-color OpenMoko Linux logo"
-+      bool "224-color Openmoko Linux logo"
-       depends on MACH_NEO1973_GTA01 || MACH_NEO1973_GTA02
-       default y
-diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c
-index 541fd97..4f026f8 100644
---- a/drivers/video/logo/logo.c
-+++ b/drivers/video/logo/logo.c
-@@ -107,7 +107,7 @@ const struct linux_logo * __init_refok fb_find_logo(int depth)
-               logo = &logo_m32r_clut224;
- #endif
- #ifdef CONFIG_LOGO_OPENMOKO_CLUT224
--              /* OpenMoko Linux logo */
-+              /* Openmoko Linux logo */
-               logo = &logo_openmoko_clut224;
- #endif
-       }
-diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
-index f32cba3..dbc9c18 100644
---- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
-+++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
-@@ -1,7 +1,7 @@
- /*
-  * neo1973_gta02_wm8753.c  --  SoC audio for Neo1973
-  *
-- * Copyright 2007 OpenMoko Inc
-+ * Copyright 2007 Openmoko Inc
-  * Author: Graeme Gregory <graeme@openmoko.org>
-  * Copyright 2007 Wolfson Microelectronics PLC.
-  * Author: Graeme Gregory <linux@wolfsonmicro.com>
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1125-fix-gta01-spi-resume-patch.patch b/target/linux/s3c24xx/patches-2.6.24/1125-fix-gta01-spi-resume-patch.patch
deleted file mode 100644 (file)
index 324f003..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From f8759e3c3b99e15d4b182e3240d0990590e6cc36 Mon Sep 17 00:00:00 2001
-From: Mike Wester <mwester@dis.net>
-Date: Sun, 13 Apr 2008 07:25:57 +0100
-Subject: [PATCH] fix-gta01-spi-resume-patch
-
-Patch to register the SPI device and thus the save/resume for the display
-
-This patch does *NOT* resolve this problem, but it does make things a bit
-better.  The SPI device name changed with 2.6.24, and the change was made for
-the gta02 but never propagated to the gta01.  With this change, you'll now see
-the entries for the spi bus and the display controller in /sys; and the display
-controller suspend/resume functions will be called.
-
-(via BZ 79)
-
-Signed-off-by: Mike Wester <mwester@dis.net>
----
- arch/arm/mach-s3c2410/mach-gta01.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index 8c1a402..a948311 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -529,6 +529,7 @@ static struct s3c2410_spigpio_info spi_gpio_cfg = {
-       .board_size     = ARRAY_SIZE(gta01_spi_board_info),
-       .board_info     = gta01_spi_board_info,
-       .chip_select    = &spi_gpio_cs,
-+      .num_chipselect = 2,   /*** Should be 1 or 2 for gta01? ***/
- };
- static struct resource s3c_spi_lcm_resource[] = {
-@@ -551,7 +552,7 @@ static struct resource s3c_spi_lcm_resource[] = {
- };
- struct platform_device s3c_device_spi_lcm = {
--      .name             = "s3c24xx-spi-gpio",
-+      .name             = "spi_s3c24xx_gpio",
-       .id               = 1,
-       .num_resources    = ARRAY_SIZE(s3c_spi_lcm_resource),
-       .resource         = s3c_spi_lcm_resource,
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1126-Remove-not-needed-ifdef-as-machine_is_-is-always-de.patch b/target/linux/s3c24xx/patches-2.6.24/1126-Remove-not-needed-ifdef-as-machine_is_-is-always-de.patch
deleted file mode 100644 (file)
index 8670c15..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-From cab66f63cd7e36a576d3ae53fef466df4e3391d8 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Sun, 13 Apr 2008 07:25:57 +0100
-Subject: [PATCH] Remove not needed #ifdef as machine_is_ is always defined.
-     If we build a kernel without gta01/gta02 the
-     machine_is_ macro will expand to (0) and the compiler will
-     optimize the if (0) {} away.
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |   14 ++++----------
- 1 files changed, 4 insertions(+), 10 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index f22cad8..cde3dd8 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -63,16 +63,13 @@ static ssize_t gsm_read(struct device *dev, struct device_attribute *attr,
-               if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_RST))
-                       goto out_1;
-       } else if (!strcmp(attr->attr.name, "download")) {
--#ifdef CONFIG_MACH_NEO1973_GTA01
--              if (machine_is_neo1973_gta01())
-+              if (machine_is_neo1973_gta01()) {
-                       if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_DNLOAD))
-                               goto out_1;
--#endif
--#ifdef CONFIG_MACH_NEO1973_GTA02
--              if (machine_is_neo1973_gta02())
-+              } else if (machine_is_neo1973_gta02()) {
-                       if (!s3c2410_gpio_getpin(GTA02_GPIO_nDL_GSM))
-                               goto out_1;
--#endif
-+              }
-       }
-       return strlcpy(buf, "0\n", 3);
-@@ -140,11 +137,9 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-       } else if (!strcmp(attr->attr.name, "reset")) {
-               s3c2410_gpio_setpin(GTA01_GPIO_MODEM_RST, on);
-       } else if (!strcmp(attr->attr.name, "download")) {
--#ifdef CONFIG_MACH_NEO1973_GTA01
-               if (machine_is_neo1973_gta01())
-                       s3c2410_gpio_setpin(GTA01_GPIO_MODEM_DNLOAD, on);
--#endif
--#ifdef CONFIG_MACH_NEO1973_GTA02
-+
-               if (machine_is_neo1973_gta02()) {
-                       /*
-                        * the keyboard / buttons driver requests and enables
-@@ -168,7 +163,6 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-                       gta01_gsm.gpio_ndl_gsm = !on;
-                       s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, !on);
-               }
--#endif
-       }
-       return count;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1127--leds-We-would-enable-PWM-for-all-four-timers-disa.patch b/target/linux/s3c24xx/patches-2.6.24/1127--leds-We-would-enable-PWM-for-all-four-timers-disa.patch
deleted file mode 100644 (file)
index b79df55..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5c701da7eb3f9fdd3d9cb410c6e1699f862277ea Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Sun, 13 Apr 2008 07:25:57 +0100
-Subject: [PATCH] [leds] We would enable PWM for all four timers, disable it for all four as well
-
-Currently we do not use the PWM code to drive the LEDS. We have enabled the PWM
-for four timer sources but disable it only for three, fix that up.
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- drivers/leds/leds-neo1973-gta02.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/leds/leds-neo1973-gta02.c b/drivers/leds/leds-neo1973-gta02.c
-index 8678670..fbb62c4 100644
---- a/drivers/leds/leds-neo1973-gta02.c
-+++ b/drivers/leds/leds-neo1973-gta02.c
-@@ -161,6 +161,7 @@ static int __init gta02led_probe(struct platform_device *pdev)
-               case S3C2410_GPB0:
-               case S3C2410_GPB1:
-               case S3C2410_GPB2:
-+              case S3C2410_GPB3:
-                       lp->has_pwm = 0;
-                       s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPIO_OUTPUT);
-                       s3c2410_gpio_setpin(lp->gpio, 0);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1128--led-Misc-fixes-in-the-driver-code.patch b/target/linux/s3c24xx/patches-2.6.24/1128--led-Misc-fixes-in-the-driver-code.patch
deleted file mode 100644 (file)
index 2031019..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-From 218ecc6801019388f1856547875635bfbb671342 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Sun, 13 Apr 2008 07:25:58 +0100
-Subject: [PATCH] [led] Misc fixes in the driver code
-     to_bundle returned the wrong data. The platform_device is the
-     parent of the class_device used by the LED device class. Return
-     the correct class.
-
-    num_leds was not set to the correct number of registered LEDs. All
-    loops using num_leds (e.g. module unloading) were not executed at
-    all.
-
-    On removal of the module disable all LEDs.
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- drivers/leds/leds-neo1973-gta02.c |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/leds/leds-neo1973-gta02.c b/drivers/leds/leds-neo1973-gta02.c
-index fbb62c4..343550a 100644
---- a/drivers/leds/leds-neo1973-gta02.c
-+++ b/drivers/leds/leds-neo1973-gta02.c
-@@ -46,7 +46,7 @@ static inline struct gta02_led_priv *to_priv(struct led_classdev *led_cdev)
- static inline struct gta02_led_bundle *to_bundle(struct led_classdev *led_cdev)
- {
--      return dev_get_drvdata(led_cdev->dev);
-+      return dev_get_drvdata(led_cdev->dev->parent);
- }
- static void gta02led_set(struct led_classdev *led_cdev,
-@@ -174,6 +174,8 @@ static int __init gta02led_probe(struct platform_device *pdev)
-               rc = led_classdev_register(&pdev->dev, &lp->cdev);
-       }
-+      bundle->num_leds = i;
-+
-       return 0;
- }
-@@ -186,6 +188,8 @@ static int gta02led_remove(struct platform_device *pdev)
-               struct gta02_led_priv *lp = &bundle->led[i];
-               if (lp->has_pwm)
-                       s3c2410_pwm_disable(&lp->pwm);
-+              else
-+                      gta02led_set(&lp->cdev, 0);
-               led_classdev_unregister(&lp->cdev);
-               mutex_destroy(&lp->mutex);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1129--neo-bluetooth-GTA01_GPIO_MODEM_RST-GTA02_GPIO_M.patch b/target/linux/s3c24xx/patches-2.6.24/1129--neo-bluetooth-GTA01_GPIO_MODEM_RST-GTA02_GPIO_M.patch
deleted file mode 100644 (file)
index 5bd2562..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-From 3beacb9939b07b974a9150a0a5848e0fbdb07df9 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Sun, 13 Apr 2008 07:25:58 +0100
-Subject: [PATCH] [neo bluetooth] GTA01_GPIO_MODEM_RST != GTA02_GPIO_MODEM_RST
-     The bluetooth enable and modem reset switched the order in
-     gta02. Do not poke the bluetooth dongle when we want to reset
-     the modem.
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |    9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index cde3dd8..5ad942e 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -60,7 +60,9 @@ static ssize_t gsm_read(struct device *dev, struct device_attribute *attr,
-               if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_ON))
-                       goto out_1;
-       } else if (!strcmp(attr->attr.name, "reset")) {
--              if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_RST))
-+              if (machine_is_neo1973_gta01() && s3c2410_gpio_getpin(GTA01_GPIO_MODEM_RST))
-+                      goto out_1;
-+              else if (machine_is_neo1973_gta02() && s3c2410_gpio_getpin(GTA02_GPIO_MODEM_RST))
-                       goto out_1;
-       } else if (!strcmp(attr->attr.name, "download")) {
-               if (machine_is_neo1973_gta01()) {
-@@ -135,7 +137,10 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-                       }
-               }
-       } else if (!strcmp(attr->attr.name, "reset")) {
--              s3c2410_gpio_setpin(GTA01_GPIO_MODEM_RST, on);
-+              if (machine_is_neo1973_gta01())
-+                      s3c2410_gpio_setpin(GTA01_GPIO_MODEM_RST, on);
-+              else if (machine_is_neo1973_gta02())
-+                      s3c2410_gpio_setpin(GTA02_GPIO_MODEM_RST, on);
-       } else if (!strcmp(attr->attr.name, "download")) {
-               if (machine_is_neo1973_gta01())
-                       s3c2410_gpio_setpin(GTA01_GPIO_MODEM_DNLOAD, on);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1130--neo-Every-access-to-GPIO-bank-B-has-to-go-through.patch b/target/linux/s3c24xx/patches-2.6.24/1130--neo-Every-access-to-GPIO-bank-B-has-to-go-through.patch
deleted file mode 100644 (file)
index 5089f9b..0000000
+++ /dev/null
@@ -1,497 +0,0 @@
-From eb020c73e01bc31c9ae8500fa07ecfafcd35d2c8 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Sun, 13 Apr 2008 07:25:58 +0100
-Subject: [PATCH] [neo] Every access to GPIO bank B has to go through the shadow code
-
-    - Any setting of any PIN on bank B will undo the LED setting.
-      Introduce neo1973_gpb_set_pin to set the PIN in a way not losing
-      the LED or any other shadowed setting.
-    - Update users of GPBXY for gta01 and gta02.
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- arch/arm/mach-s3c2410/mach-gta01.c     |    9 ++--
- arch/arm/mach-s3c2440/mach-gta02.c     |   10 ++--
- arch/arm/plat-s3c24xx/Makefile         |    4 +-
- arch/arm/plat-s3c24xx/neo1973_pm_bt.c  |   15 +++---
- arch/arm/plat-s3c24xx/neo1973_pm_gps.c |    5 ++-
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |    9 ++--
- arch/arm/plat-s3c24xx/neo1973_shadow.c |   86 ++++++++++++++++++++++++++++++++
- drivers/leds/leds-neo1973-gta02.c      |   12 ++--
- drivers/leds/leds-neo1973-vibrator.c   |    7 ++-
- drivers/video/backlight/gta01_bl.c     |    9 ++--
- include/asm-arm/plat-s3c24xx/neo1973.h |   33 ++++++++++++
- 11 files changed, 165 insertions(+), 34 deletions(-)
- create mode 100644 arch/arm/plat-s3c24xx/neo1973_shadow.c
- create mode 100644 include/asm-arm/plat-s3c24xx/neo1973.h
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index a948311..ff08449 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -72,6 +72,7 @@
- #include <asm/plat-s3c24xx/cpu.h>
- #include <asm/plat-s3c24xx/pm.h>
- #include <asm/plat-s3c24xx/udc.h>
-+#include <asm/plat-s3c24xx/neo1973.h>
- static struct map_desc gta01_iodesc[] __initdata = {
-       {
-@@ -416,10 +417,10 @@ static void gta01_mmc_set_power(unsigned char power_mode, unsigned short vdd)
-       case GTA01Bv4_SYSTEM_REV:
-               switch (power_mode) {
-               case MMC_POWER_OFF:
--                      s3c2410_gpio_setpin(GTA01_GPIO_SDMMC_ON, 1);
-+                      neo1973_gpb_setpin(GTA01_GPIO_SDMMC_ON, 1);
-                       break;
-               case MMC_POWER_ON:
--                      s3c2410_gpio_setpin(GTA01_GPIO_SDMMC_ON, 0);
-+                      neo1973_gpb_setpin(GTA01_GPIO_SDMMC_ON, 0);
-                       break;
-               }
-               break;
-@@ -442,10 +443,10 @@ static void gta01_udc_command(enum s3c2410_udc_cmd_e cmd)
-       switch (cmd) {
-       case S3C2410_UDC_P_ENABLE:
--              s3c2410_gpio_setpin(GTA01_GPIO_USB_PULLUP, 1);
-+              neo1973_gpb_setpin(GTA01_GPIO_USB_PULLUP, 1);
-               break;
-       case S3C2410_UDC_P_DISABLE:
--              s3c2410_gpio_setpin(GTA01_GPIO_USB_PULLUP, 0);
-+              neo1973_gpb_setpin(GTA01_GPIO_USB_PULLUP, 0);
-               break;
-       default:
-               break;
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index f9e00d5..27babc9 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -75,6 +75,7 @@
- #include <asm/plat-s3c24xx/cpu.h>
- #include <asm/plat-s3c24xx/pm.h>
- #include <asm/plat-s3c24xx/udc.h>
-+#include <asm/plat-s3c24xx/neo1973.h>
- #include <linux/jbt6k74.h>
- #include <linux/glamofb.h>
-@@ -127,11 +128,11 @@ FIQ_HANDLER_ENTRY(256, 512)
-       if (fiq_ipc.vib_pwm_latched || fiq_ipc.vib_pwm) { /* not idle */
-               if (((u8)_fiq_count_fiqs) == fiq_ipc.vib_pwm_latched)
--                      s3c2410_gpio_setpin(fiq_ipc.vib_gpio_pin, 0);
-+                      neo1973_gpb_setpin(fiq_ipc.vib_gpio_pin, 0);
-               if (((u8)_fiq_count_fiqs) == 0) {
-                       fiq_ipc.vib_pwm_latched = fiq_ipc.vib_pwm;
-                       if (fiq_ipc.vib_pwm_latched)
--                              s3c2410_gpio_setpin(fiq_ipc.vib_gpio_pin, 1);
-+                              neo1973_gpb_setpin(fiq_ipc.vib_gpio_pin, 1);
-               }
-               divisor = FIQ_DIVISOR_VIBRATOR;
-       }
-@@ -319,6 +320,7 @@ FIQ_HANDLER_ENTRY(256, 512)
- FIQ_HANDLER_END()
-+
- /**
-  * returns PCB revision information in b9,b8 and b2,b1,b0
-  * Pre-GTA02 A6 returns 0x000
-@@ -763,10 +765,10 @@ static void gta02_udc_command(enum s3c2410_udc_cmd_e cmd)
-       switch (cmd) {
-       case S3C2410_UDC_P_ENABLE:
--              s3c2410_gpio_setpin(GTA02_GPIO_USB_PULLUP, 1);
-+              neo1973_gpb_setpin(GTA02_GPIO_USB_PULLUP, 1);
-               break;
-       case S3C2410_UDC_P_DISABLE:
--              s3c2410_gpio_setpin(GTA02_GPIO_USB_PULLUP, 0);
-+              neo1973_gpb_setpin(GTA02_GPIO_USB_PULLUP, 0);
-               break;
-       case S3C2410_UDC_P_RESET:
-               /* FIXME! */
-diff --git a/arch/arm/plat-s3c24xx/Makefile b/arch/arm/plat-s3c24xx/Makefile
-index e667105..0efcc15 100644
---- a/arch/arm/plat-s3c24xx/Makefile
-+++ b/arch/arm/plat-s3c24xx/Makefile
-@@ -32,4 +32,6 @@ obj-$(CONFIG_MACH_NEO1973)   += neo1973_version.o \
-                                  neo1973_pm_host.o \
-                                  neo1973_pm_gsm.o \
-                                  neo1973_pm_gps.o \
--                                 neo1973_pm_bt.o
-+                                 neo1973_pm_bt.o  \
-+                                 neo1973_shadow.o
-+
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-index a9694b4..dfc9ae8 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-@@ -18,6 +18,7 @@
- #include <asm/hardware.h>
- #include <asm/mach-types.h>
-+#include <asm/plat-s3c24xx/neo1973.h>
- #ifdef CONFIG_MACH_NEO1973_GTA01
- #include <asm/arch/gta01.h>
-@@ -95,20 +96,20 @@ static ssize_t bt_write(struct device *dev, struct device_attribute *attr,
-                       /* if we are powering up, assert reset, then power,
-                        * then release reset */
-                       if (on) {
--                              s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
-+                              neo1973_gpb_setpin(GTA01_GPIO_BT_EN, 0);
-                               pcf50606_voltage_set(pcf50606_global,
-                                                    PCF50606_REGULATOR_D1REG,
-                                                    3100);
-                       }
-                       pcf50606_onoff_set(pcf50606_global,
-                                          PCF50606_REGULATOR_D1REG, on);
--                      s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on);
-+                      neo1973_gpb_setpin(GTA01_GPIO_BT_EN, on);
-                       break;
- #endif /* CONFIG_MACH_NEO1973_GTA01 */
- #ifdef CONFIG_MACH_NEO1973_GTA02
-               case MACH_TYPE_NEO1973_GTA02:
--                      s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, on ? 0 : 1);
-+                      neo1973_gpb_setpin(GTA02_GPIO_BT_EN, on ? 0 : 1);
-                       if (on)
-                               pcf50633_voltage_set(pcf50633_global,
-                                       PCF50633_REGULATOR_LDO4, 3200);
-@@ -127,13 +128,13 @@ static ssize_t bt_write(struct device *dev, struct device_attribute *attr,
- #ifdef CONFIG_MACH_NEO1973_GTA01
-               case MACH_TYPE_NEO1973_GTA01:
--                      s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1);
-+                      neo1973_gpb_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1);
-                       break;
- #endif /* CONFIG_MACH_NEO1973_GTA01 */
- #ifdef CONFIG_MACH_NEO1973_GTA02
-               case MACH_TYPE_NEO1973_GTA02:
--                      s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, on ? 0 : 1);
-+                      neo1973_gpb_setpin(GTA02_GPIO_BT_EN, on ? 0 : 1);
-                       break;
- #endif /* CONFIG_MACH_NEO1973_GTA02 */
-@@ -192,7 +193,7 @@ static int __init gta01_bt_probe(struct platform_device *pdev)
-                                  PCF50606_REGULATOR_D1REG, 0);
-               /* we pull reset to low to make sure that the chip doesn't
-                * drain power through the reset line */
--              s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
-+              neo1973_gpb_setpin(GTA01_GPIO_BT_EN, 0);
-               break;
- #endif /* CONFIG_MACH_NEO1973_GTA01 */
-@@ -203,7 +204,7 @@ static int __init gta01_bt_probe(struct platform_device *pdev)
-                                    PCF50633_REGULATOR_LDO4, 0);
-               /* we pull reset to low to make sure that the chip doesn't
-                * drain power through the reset line */
--              s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, 0);
-+              neo1973_gpb_setpin(GTA02_GPIO_BT_EN, 0);
-               break;
- #endif /* CONFIG_MACH_NEO1973_GTA02 */
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-index d882f7b..d020f8d 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-@@ -20,6 +20,9 @@
- #include <asm/hardware.h>
- #include <asm/mach-types.h>
-+
-+#include <asm/plat-s3c24xx/neo1973.h>
-+
- #ifdef CONFIG_MACH_NEO1973_GTA01
- #include <asm/arch/gta01.h>
- #include <linux/pcf50606.h>
-@@ -264,7 +267,7 @@ static void gps_pwron_set(int on)
- {
- #ifdef CONFIG_MACH_NEO1973_GTA01
-       if (machine_is_neo1973_gta01())
--              s3c2410_gpio_setpin(GTA01_GPIO_GPS_PWRON, on);
-+              neo1973_gpb_setpin(GTA01_GPIO_GPS_PWRON, on);
- #endif /* CONFIG_MACH_NEO1973_GTA01 */
- #ifdef CONFIG_MACH_NEO1973_GTA02
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index 5ad942e..149b866 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -22,6 +22,7 @@
- #include <asm/gpio.h>
- #include <asm/mach-types.h>
- #include <asm/arch/gta01.h>
-+#include <asm/plat-s3c24xx/neo1973.h>
- #ifdef CONFIG_MACH_NEO1973_GTA02
- #include <asm/arch/gta02.h>
-@@ -109,9 +110,9 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
- #endif
-                       }
--                      s3c2410_gpio_setpin(GTA01_GPIO_MODEM_ON, 1);
-+                      neo1973_gpb_setpin(GTA01_GPIO_MODEM_ON, 1);
-               } else {
--                      s3c2410_gpio_setpin(GTA01_GPIO_MODEM_ON, 0);
-+                      neo1973_gpb_setpin(GTA01_GPIO_MODEM_ON, 0);
-                       switch (system_rev) {
- #ifdef CONFIG_MACH_NEO1973_GTA02
-@@ -138,9 +139,9 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-               }
-       } else if (!strcmp(attr->attr.name, "reset")) {
-               if (machine_is_neo1973_gta01())
--                      s3c2410_gpio_setpin(GTA01_GPIO_MODEM_RST, on);
-+                      neo1973_gpb_setpin(GTA01_GPIO_MODEM_RST, on);
-               else if (machine_is_neo1973_gta02())
--                      s3c2410_gpio_setpin(GTA02_GPIO_MODEM_RST, on);
-+                      neo1973_gpb_setpin(GTA02_GPIO_MODEM_RST, on);
-       } else if (!strcmp(attr->attr.name, "download")) {
-               if (machine_is_neo1973_gta01())
-                       s3c2410_gpio_setpin(GTA01_GPIO_MODEM_DNLOAD, on);
-diff --git a/arch/arm/plat-s3c24xx/neo1973_shadow.c b/arch/arm/plat-s3c24xx/neo1973_shadow.c
-new file mode 100644
-index 0000000..09667da
---- /dev/null
-+++ b/arch/arm/plat-s3c24xx/neo1973_shadow.c
-@@ -0,0 +1,86 @@
-+/*
-+ * include/asm-arm/plat-s3c24xx/neo1973.h
-+ *
-+ * Common utility code for GTA01 and GTA02
-+ *
-+ * Copyright (C) 2008 by Openmoko, Inc.
-+ * Author: Holger Hans Peter Freyther <freyther@openmoko.org>
-+ * 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
-+ *
-+ */
-+
-+#include <linux/io.h>
-+#include <linux/irq.h>
-+
-+#include <asm/gpio.h>
-+#include <asm/plat-s3c24xx/neo1973.h>
-+
-+/**
-+ * Shadow GPIO bank B handling. For the LEDs we need to keep track of the state
-+ * in software. The s3c2410_gpio_setpin must not be used for GPIOs on bank B
-+ */
-+static unsigned long gpb_mask;
-+static unsigned long gpb_state;
-+
-+void neo1973_gpb_add_shadow_gpio(unsigned int gpio)
-+{
-+      unsigned long offset = S3C2410_GPIO_OFFSET(gpio);
-+      unsigned long flags;
-+
-+      local_irq_save(flags);
-+      gpb_mask |= 1L << offset;
-+      local_irq_restore(flags);
-+}
-+EXPORT_SYMBOL(neo1973_gpb_add_shadow_gpio);
-+
-+static void set_shadow_gpio(unsigned long offset, unsigned int value)
-+{
-+      unsigned long state = value != 0;
-+
-+      gpb_state &= ~(1L << offset);
-+      gpb_state |= state << offset;
-+}
-+
-+void neo1973_gpb_setpin(unsigned int pin, unsigned to)
-+{
-+      void __iomem *base = S3C24XX_GPIO_BASE(S3C2410_GPB0);
-+      unsigned long offset = S3C2410_GPIO_OFFSET(pin);
-+      unsigned long flags;
-+      unsigned long dat;
-+
-+      BUG_ON(base != S3C24XX_GPIO_BASE(pin));
-+
-+      local_irq_save(flags);
-+      dat = __raw_readl(base + 0x04);
-+
-+      /* Add the shadow values */
-+      dat &= ~gpb_mask;
-+      dat |= gpb_state;
-+
-+      /* Do the operation like s3c2410_gpio_setpin */
-+      dat &= ~(1L << offset);
-+      dat |= to << offset;
-+
-+      /* Update the shadow state */
-+      if ((1L << offset) & gpb_mask)
-+              set_shadow_gpio(offset, to);
-+
-+      __raw_writel(dat, base + 0x04);
-+      local_irq_restore(flags);
-+}
-+EXPORT_SYMBOL(neo1973_gpb_setpin);
-diff --git a/drivers/leds/leds-neo1973-gta02.c b/drivers/leds/leds-neo1973-gta02.c
-index 343550a..952ad69 100644
---- a/drivers/leds/leds-neo1973-gta02.c
-+++ b/drivers/leds/leds-neo1973-gta02.c
-@@ -20,6 +20,7 @@
- #include <asm/arch/pwm.h>
- #include <asm/arch/gta02.h>
- #include <asm/plat-s3c/regs-timer.h>
-+#include <asm/plat-s3c24xx/neo1973.h>
- #define MAX_LEDS 3
- #define COUNTER 256
-@@ -60,14 +61,13 @@ static void gta02led_set(struct led_classdev *led_cdev,
-        * value == 0 -> 0% duty cycle (zero power)
-        */
-       mutex_lock(&lp->mutex);
-+
-       if (lp->has_pwm) {
--                      s3c2410_pwm_duty_cycle(value, &lp->pwm);
-+              s3c2410_pwm_duty_cycle(value, &lp->pwm);
-       } else {
--              if (value)
--                      s3c2410_gpio_setpin(lp->gpio, 1);
--              else
--                      s3c2410_gpio_setpin(lp->gpio, 0);
-+              neo1973_gpb_setpin(lp->gpio, value ? 1 : 0);
-       }
-+
-       mutex_unlock(&lp->mutex);
- }
-@@ -164,7 +164,7 @@ static int __init gta02led_probe(struct platform_device *pdev)
-               case S3C2410_GPB3:
-                       lp->has_pwm = 0;
-                       s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPIO_OUTPUT);
--                      s3c2410_gpio_setpin(lp->gpio, 0);
-+                      neo1973_gpb_add_shadow_gpio(lp->gpio);
-                       break;
-               default:
-                       break;
-diff --git a/drivers/leds/leds-neo1973-vibrator.c b/drivers/leds/leds-neo1973-vibrator.c
-index f31302d..647e860 100644
---- a/drivers/leds/leds-neo1973-vibrator.c
-+++ b/drivers/leds/leds-neo1973-vibrator.c
-@@ -24,6 +24,7 @@
- #include <asm/plat-s3c/regs-timer.h>
- #include <asm/arch-s3c2410/fiq_ipc_gta02.h>
-+#include <asm/plat-s3c24xx/neo1973.h>
- #define COUNTER 64
-@@ -56,9 +57,9 @@ static void neo1973_vib_vib_set(struct led_classdev *led_cdev,
-               s3c2410_pwm_duty_cycle(value / 4, &vp->pwm);
-       else {
-               if (value)
--                      s3c2410_gpio_setpin(vp->gpio, 1);
-+                      neo1973_gpb_setpin(vp->gpio, 1);
-               else
--                      s3c2410_gpio_setpin(vp->gpio, 0);
-+                      neo1973_gpb_setpin(vp->gpio, 0);
-       }
-       mutex_unlock(&vp->mutex);
-@@ -131,7 +132,7 @@ static int __init neo1973_vib_probe(struct platform_device *pdev)
-       platform_set_drvdata(pdev, &neo1973_vib_led);
-       if (machine_is_neo1973_gta02()) { /* use FIQ to control GPIO */
--              s3c2410_gpio_setpin(neo1973_vib_led.gpio, 0); /* off */
-+              neo1973_gpb_setpin(neo1973_vib_led.gpio, 0); /* off */
-               s3c2410_gpio_cfgpin(neo1973_vib_led.gpio, S3C2410_GPIO_OUTPUT);
-               /* safe, kmalloc'd copy needed for FIQ ISR */
-               fiq_ipc.vib_gpio_pin = neo1973_vib_led.gpio;
-diff --git a/drivers/video/backlight/gta01_bl.c b/drivers/video/backlight/gta01_bl.c
-index bd7d41f..301ec9c 100644
---- a/drivers/video/backlight/gta01_bl.c
-+++ b/drivers/video/backlight/gta01_bl.c
-@@ -40,6 +40,7 @@
- #include <asm/arch/pwm.h>
- #include <asm/plat-s3c/regs-timer.h>
-+#include <asm/plat-s3c24xx/neo1973.h>
- static struct backlight_properties gta01bl_prop;
- static struct backlight_device *gta01_backlight_device;
-@@ -83,12 +84,12 @@ static int gta01bl_send_intensity(struct backlight_device *bd)
-       mutex_lock(&gta01bl.mutex);
- #ifdef GTA01_BACKLIGHT_ONOFF_ONLY
-       if (intensity)
--              s3c2410_gpio_setpin(GTA01_GPIO_BACKLIGHT, 1);
-+              neo1973_gpb_setpin(GTA01_GPIO_BACKLIGHT, 1);
-       else
--              s3c2410_gpio_setpin(GTA01_GPIO_BACKLIGHT, 0);
-+              neo1973_gpb_setpin(GTA01_GPIO_BACKLIGHT, 0);
- #else
-       if (intensity == bd->props.max_brightness) {
--              s3c2410_gpio_setpin(GTA01_GPIO_BACKLIGHT, 1);
-+              neo1973_gpb_setpin(GTA01_GPIO_BACKLIGHT, 1);
-               s3c2410_gpio_cfgpin(GTA01_GPIO_BACKLIGHT, S3C2410_GPIO_OUTPUT);
-       } else  {
-               s3c2410_pwm_duty_cycle(intensity & 0xffff, &gta01bl.pwm);
-@@ -222,7 +223,7 @@ static int gta01bl_remove(struct platform_device *dev)
-       mutex_destroy(&gta01bl.mutex);
-       s3c2410_gpio_cfgpin(GTA01_GPIO_BACKLIGHT, S3C2410_GPIO_OUTPUT);
--      s3c2410_gpio_setpin(GTA01_GPIO_BACKLIGHT, 1);
-+      neo1973_gpb_setpin(GTA01_GPIO_BACKLIGHT, 1);
-       return 0;
- }
-diff --git a/include/asm-arm/plat-s3c24xx/neo1973.h b/include/asm-arm/plat-s3c24xx/neo1973.h
-new file mode 100644
-index 0000000..63297de
---- /dev/null
-+++ b/include/asm-arm/plat-s3c24xx/neo1973.h
-@@ -0,0 +1,33 @@
-+/*
-+ * include/asm-arm/plat-s3c24xx/neo1973.h
-+ *
-+ * Common utility code for GTA01 and GTA02
-+ *
-+ * Copyright (C) 2008 by Openmoko, Inc.
-+ * Author: Holger Hans Peter Freyther <freyther@openmoko.org>
-+ * 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
-+ *
-+ */
-+
-+#ifndef NEO1973_H
-+#define NEO1973_H
-+
-+void neo1973_gpb_add_shadow_gpio(unsigned int gpio);
-+void neo1973_gpb_setpin(unsigned int pin, unsigned to);
-+
-+#endif
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1131-fix-jack-interrupt-debounce-loss-window.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1131-fix-jack-interrupt-debounce-loss-window.patch.patch
deleted file mode 100644 (file)
index b2a49ed..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-From 4c445577b8f471612389007e5265c7dbfb2c487b Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 13 Apr 2008 07:25:59 +0100
-Subject: [PATCH] fix-jack-interrupt-debounce-loss-window.patch
-
-Make sure we can't lose a jack interrupt in debounce, despite it is
-a one-in-a-million thing that just needs replug to clear
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/input/keyboard/neo1973kbd.c |   50 +++++++++++++++++++++++-----------
- 1 files changed, 34 insertions(+), 16 deletions(-)
-
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-index a1fc7a3..8b9a420 100644
---- a/drivers/input/keyboard/neo1973kbd.c
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -62,27 +62,45 @@ static irqreturn_t neo1973kbd_hold_irq(int irq, void *dev_id)
- static void neo1973kbd_debounce_jack(struct work_struct *work)
- {
-       struct neo1973kbd *kbd = container_of(work, struct neo1973kbd, work);
--
--      /* we wait out any multiple interrupt stuttering in 100ms lumps */
-+      unsigned long flags;
-+      int loop = 0;
-       do {
--              kbd->hp_irq_count_in_work = kbd->hp_irq_count;
--              msleep(100);
--      } while (kbd->hp_irq_count != kbd->hp_irq_count_in_work);
--
--      /* no new interrupts on jack for 100ms... ok we will report it */
--
--      input_report_switch(kbd->input,
--                          SW_HEADPHONE_INSERT,
--                          gpio_get_value(irq_to_gpio(kbd->jack_irq)));
--      input_sync(kbd->input);
--
--      /* next time we get an interrupt on jack we need new work action */
--      kbd->work_in_progress = 0;
-+              /*
-+               * we wait out any multiple interrupt
-+               * stuttering in 100ms lumps
-+               */
-+              do {
-+                      kbd->hp_irq_count_in_work = kbd->hp_irq_count;
-+                      msleep(100);
-+              } while (kbd->hp_irq_count != kbd->hp_irq_count_in_work);
-+              /*
-+               * no new interrupts on jack for 100ms...
-+               * ok we will report it
-+               */
-+              input_report_switch(kbd->input, SW_HEADPHONE_INSERT,
-+                                  gpio_get_value(irq_to_gpio(kbd->jack_irq)));
-+              input_sync(kbd->input);
-+              /*
-+               * we go around the outer loop again if we detect that more
-+               * interrupts came while we are servicing here.  But we have
-+               * to sequence it carefully with interrupts off
-+               */
-+              local_save_flags(flags);
-+              /* no interrupts during this work means we can exit the work */
-+              loop = !!(kbd->hp_irq_count != kbd->hp_irq_count_in_work);
-+              if (!loop)
-+                      kbd->work_in_progress = 0;
-+              local_irq_restore(flags);
-+              /*
-+               * interrupt that comes here will either queue a new work action
-+               * since work_in_progress is cleared now, or be dealt with
-+               * when we loop.
-+               */
-+      } while (loop);
- }
--
- static irqreturn_t neo1973kbd_headphone_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1132-fix-gta01-pmu-irq-edge-lost-on-resume.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1132-fix-gta01-pmu-irq-edge-lost-on-resume.patch.patch
deleted file mode 100644 (file)
index 7ce89c0..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From f54af99850ae25da80e491b1864bb90e14c80b1f Mon Sep 17 00:00:00 2001
-From: Mike Wester <mwester@dis.net>
-Date: Sun, 13 Apr 2008 07:25:59 +0100
-Subject: [PATCH] fix-gta01-pmu-irq-edge-lost-on-resume.patch
-
-GTA01 -only
-
-Restore power button functionality after resume operation
-
-Per Werner's suggestion, run the PMU interrupt handler immediately after resume
-to clear/handle any pending interrupts from that device.  This appears to
-resolve the  dead-powerbutton-after-resume problem.  This is not well-tested;
-need feedback to see if there are any side-effects or other problems.
-
-From BZ 1313
-
-Signed-off-by: Mike Wester <mwester@dis.net>
----
- drivers/i2c/chips/pcf50606.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
-index 6f71e6c..aa841e3 100644
---- a/drivers/i2c/chips/pcf50606.c
-+++ b/drivers/i2c/chips/pcf50606.c
-@@ -1957,6 +1957,9 @@ static int pcf50606_resume(struct device *dev)
-       mutex_unlock(&pcf->lock);
-+      /* Hack to fix the gta01 power button problem on resume */
-+      pcf50606_irq(0, pcf);
-+
-       return 0;
- }
- #else
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1133-gta01-fix-jbt-platform-missing-members.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1133-gta01-fix-jbt-platform-missing-members.patch.patch
deleted file mode 100644 (file)
index bc8b31e..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-From 64ec7be81097f2c02ecffadbb2eef22ccf4c7e7b Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Wed, 16 Apr 2008 20:51:17 +0100
-Subject: [PATCH] gta01-fix-jbt-platform-missing-members.patch
-
-Created an attachment (id=594) / BZ#79
-Add missing platform_data that caused the GTA01 to crash on suspend/resume
-
-The interface to the jbt6k74 driver changed slightly; this patch adds the
-missing platform_data for the GTA01.  This prevents a crash while suspending.
-This patch also makes some minor changes to cleanup and clarify some debug
-messages.
-Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- arch/arm/mach-s3c2410/mach-gta01.c |   21 ++++++++++++++++-----
- 1 files changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index ff08449..a77ed3d 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -73,6 +73,7 @@
- #include <asm/plat-s3c24xx/pm.h>
- #include <asm/plat-s3c24xx/udc.h>
- #include <asm/plat-s3c24xx/neo1973.h>
-+#include <linux/jbt6k74.h>
- static struct map_desc gta01_iodesc[] __initdata = {
-       {
-@@ -389,7 +390,7 @@ static void gta01_mmc_set_power(unsigned char power_mode, unsigned short vdd)
-       int bit;
-       int mv = 1700; /* 1.7V for MMC_VDD_165_195 */
--      printk(KERN_DEBUG "mmc_set_power(power_mode=%u, vdd=%u\n",
-+      printk(KERN_DEBUG "mmc_set_power(power_mode=%u, vdd=%u)\n",
-              power_mode, vdd);
-       switch (system_rev) {
-@@ -499,10 +500,20 @@ static struct s3c2410_ts_mach_info gta01_ts_cfg = {
- /* SPI */
-+void gta01_jbt6k74_reset(int devidx, int level)
-+{
-+      /* empty place holder; gta01 does not yet use this */
-+      printk(KERN_DEBUG "gta01_jbt6k74_reset\n");
-+}
-+
-+const struct jbt6k74_platform_data gta01_jbt6k74_pdata = {
-+      .reset          = gta01_jbt6k74_reset,
-+};
-+
- static struct spi_board_info gta01_spi_board_info[] = {
-       {
-               .modalias       = "jbt6k74",
--              /* platform_data */
-+              .platform_data  = &gta01_jbt6k74_pdata,
-               /* controller_data */
-               /* irq */
-               .max_speed_hz   = 10 * 1000 * 1000,
-@@ -641,7 +652,7 @@ static void __init gta01_map_io(void)
- static irqreturn_t gta01_modem_irq(int irq, void *param)
- {
--      printk(KERN_DEBUG "modem wakeup interrupt\n");
-+      printk(KERN_DEBUG "GSM wakeup interrupt (IRQ %d)\n", irq);
-       return IRQ_HANDLED;
- }
-@@ -709,9 +720,9 @@ static void __init gta01_machine_init(void)
-       set_irq_type(GTA01_IRQ_MODEM, IRQT_RISING);
-       rc = request_irq(GTA01_IRQ_MODEM, gta01_modem_irq, IRQF_DISABLED,
-                        "modem", NULL);
--      if (!rc)
--              printk(KERN_ERR  "GTA01: can't request GSM modem wakeup IRQ\n");
-       enable_irq_wake(GTA01_IRQ_MODEM);
-+      printk(KERN_DEBUG  "Enabled GSM wakeup IRQ %d (rc=%d)\n",
-+             GTA01_IRQ_MODEM, rc);
- }
- MACHINE_START(NEO1973_GTA01, "GTA01")
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1134-gta01-fix-resume-redo-par.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1134-gta01-fix-resume-redo-par.patch.patch
deleted file mode 100644 (file)
index 5b6cfb6..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0e45ee0b0c6b165d0ceb60a30e2f3a83e9273c6f Mon Sep 17 00:00:00 2001
-From: Reddog <reddog@mastersword.de>
-Date: Wed, 16 Apr 2008 20:51:25 +0100
-Subject: [PATCH] gta01-fix-resume-redo-par.patch
-
- --> (http://bugzilla.openmoko.org/cgi-bin/bugzilla/attachment.cgi?id=595&action=view)
-fix resume of fbdev  BZ#79
-
-I played a bit with the fbdev resume. With this patch the neo doesn't get this
-white screen on resume from console and from X.
-
-Signed-off-by: Reddog <reddog@mastersword.de>
----
- drivers/video/s3c2410fb.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
-index b3c31d9..1905135 100644
---- a/drivers/video/s3c2410fb.c
-+++ b/drivers/video/s3c2410fb.c
-@@ -1028,6 +1028,8 @@ static int s3c2410fb_resume(struct platform_device *dev)
-       s3c2410fb_init_registers(fbinfo);
-+      s3c2410fb_set_par(fbinfo);
-+
-       return 0;
- }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1135-gta01-gps-power-state-resume-preserve.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1135-gta01-gps-power-state-resume-preserve.patch.patch
deleted file mode 100644 (file)
index 1540a74..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5ccaca2adb1c37b5955a4733f68ae08a755e3d78 Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Wed, 16 Apr 2008 20:51:31 +0100
-Subject: [PATCH] gta01-gps-power-state-resume-preserve.patch
-
-Created an attachment (id=593) / from BZ#79
-Updated patch to preserve the power state of the GPS on the GTA01
-
-Currently the GPS is powered up after a suspend/resume occurs.  This patch will
-only power the GPS back up if it was powered up when the GTA01 suspended.
-
-Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gps.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-index d020f8d..9c6adfa 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-@@ -514,8 +514,8 @@ static int gta01_pm_gps_resume(struct platform_device *pdev)
- {
- #ifdef CONFIG_MACH_NEO1973_GTA01
-       if (machine_is_neo1973_gta01()) {
--              /* FIXME */
--              gps_power_sequence_up();
-+              if (neo1973_gps.power_was_on)
-+                      gps_power_sequence_up();
-       }
- #endif /* CONFIG_MACH_NEO1973_GTA01 */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1136-This-fixes-the-exit-function-so-that-the-module-can.patch b/target/linux/s3c24xx/patches-2.6.24/1136-This-fixes-the-exit-function-so-that-the-module-can.patch
deleted file mode 100644 (file)
index 320ad91..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From b22975802d893a8cc600757436d5dd4dcd5cf469 Mon Sep 17 00:00:00 2001
-From: Tim Niemeyer <reddog@mastersword.de>
-Date: Mon, 21 Apr 2008 21:08:40 +0100
-Subject: [PATCH] This-fixes-the-exit-function-so-that-the-module-can.patch
- Subject: [PATCH] This fixes the exit function, so that the module can be removed.
-  Signed-off-by: Tim Niemeyer <reddog@mastersword.de>
-
----
- sound/soc/s3c24xx/neo1973_wm8753.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c
-index 65a4060..09641cc 100644
---- a/sound/soc/s3c24xx/neo1973_wm8753.c
-+++ b/sound/soc/s3c24xx/neo1973_wm8753.c
-@@ -698,6 +698,7 @@ static int __init neo1973_init(void)
- static void __exit neo1973_exit(void)
- {
-+      i2c_del_driver(&lm4857_i2c_driver);
-       platform_device_unregister(neo1973_snd_device);
- }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1137-This-adds-some-debug-messages-to-the-Neo1937-sound-d.patch b/target/linux/s3c24xx/patches-2.6.24/1137-This-adds-some-debug-messages-to-the-Neo1937-sound-d.patch
deleted file mode 100644 (file)
index 04f03fc..0000000
+++ /dev/null
@@ -1,284 +0,0 @@
-From 1796e3d226fd1b119b09130478c781e25b7f5770 Mon Sep 17 00:00:00 2001
-From: Tim Niemeyer <reddog@mastersword.de>
-Date: Mon, 21 Apr 2008 21:09:37 +0100
-Subject: [PATCH] This-adds-some-debug-messages-to-the-Neo1937-sound-d.patch
- Subject: [PATCH] This adds some debug messages to the Neo1937 sound driver.
-
-Signed-off-by: Tim Niemeyer <reddog@mastersword.de>
----
- sound/soc/s3c24xx/Kconfig          |    6 ++++
- sound/soc/s3c24xx/neo1973_wm8753.c |   51 ++++++++++++++++++++++++++++++++++++
- sound/soc/s3c24xx/s3c24xx-i2s.c    |    4 ++-
- sound/soc/s3c24xx/s3c24xx-pcm.c    |    2 +-
- 4 files changed, 61 insertions(+), 2 deletions(-)
-
-diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig
-index 4146ac4..17caf67 100644
---- a/sound/soc/s3c24xx/Kconfig
-+++ b/sound/soc/s3c24xx/Kconfig
-@@ -25,6 +25,12 @@ config SND_S3C24XX_SOC_NEO1973_WM8753
-         Say Y if you want to add support for SoC audio on smdk2440
-         with the WM8753.
-+config SND_S3C24XX_SOC_NEO1973_WM8753_DEBUG
-+      bool "SoC I2S Audio support for NEO1973 - WM8753 debug"
-+      depends on SND_S3C24XX_SOC_NEO1973_WM8753
-+      help
-+        Enable debugging output for the SoC I2S Audio code.
-+
- config SND_S3C24XX_SOC_NEO1973_GTA02_WM8753
-       tristate "SoC I2S Audio support for NEO1973 GTA02 - WM8753"
-       depends on SND_S3C24XX_SOC && MACH_NEO1973_GTA02
-diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c
-index 09641cc..d7e031b 100644
---- a/sound/soc/s3c24xx/neo1973_wm8753.c
-+++ b/sound/soc/s3c24xx/neo1973_wm8753.c
-@@ -44,6 +44,15 @@
- #include "s3c24xx-pcm.h"
- #include "s3c24xx-i2s.h"
-+/* Debugging stuff */
-+#ifdef SND_S3C24XX_SOC_NEO1973_WM8753_DEBUG
-+static int debug        = 1;
-+#else
-+static int debug        = 0;
-+#endif
-+
-+#define dprintk(msg...) if (debug) { printk(KERN_DEBUG "wm8753: " msg); }
-+
- /* define the scenarios */
- #define NEO_AUDIO_OFF                 0
- #define NEO_GSM_CALL_AUDIO_HANDSET    1
-@@ -68,6 +77,8 @@ static int neo1973_hifi_hw_params(struct snd_pcm_substream *substream,
-       int ret = 0;
-       unsigned long iis_clkrate;
-+      dprintk("Entered %s\n", __FUNCTION__);
-+
-       iis_clkrate = s3c24xx_i2s_get_clockrate();
-       switch (params_rate(params)) {
-@@ -152,6 +163,8 @@ static int neo1973_hifi_hw_free(struct snd_pcm_substream *substream)
-       struct snd_soc_pcm_runtime *rtd = substream->private_data;
-       struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai;
-+      dprintk("Entered %s\n", __FUNCTION__);
-+
-       /* disable the PLL */
-       return codec_dai->dai_ops.set_pll(codec_dai, WM8753_PLL1, 0, 0);
- }
-@@ -173,6 +186,8 @@ static int neo1973_voice_hw_params(struct snd_pcm_substream *substream,
-       int ret = 0;
-       unsigned long iis_clkrate;
-+      dprintk("Entered %s\n", __FUNCTION__);
-+
-       iis_clkrate = s3c24xx_i2s_get_clockrate();
-       if (params_rate(params) != 8000)
-@@ -214,6 +229,8 @@ static int neo1973_voice_hw_free(struct snd_pcm_substream *substream)
-       struct snd_soc_pcm_runtime *rtd = substream->private_data;
-       struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai;
-+      dprintk("Entered %s\n", __FUNCTION__);
-+
-       /* disable the PLL */
-       return codec_dai->dai_ops.set_pll(codec_dai, WM8753_PLL2, 0, 0);
- }
-@@ -228,12 +245,16 @@ static int neo1973_scenario = 0;
- static int neo1973_get_scenario(struct snd_kcontrol *kcontrol,
-       struct snd_ctl_elem_value *ucontrol)
- {
-+      dprintk("Entered %s\n", __FUNCTION__);
-+
-       ucontrol->value.integer.value[0] = neo1973_scenario;
-       return 0;
- }
- static int set_scenario_endpoints(struct snd_soc_codec *codec, int scenario)
- {
-+      dprintk("Entered %s\n", __FUNCTION__);
-+
-       switch(neo1973_scenario) {
-       case NEO_AUDIO_OFF:
-               snd_soc_dapm_set_endpoint(codec, "Audio Out",    0);
-@@ -316,6 +337,8 @@ static int neo1973_set_scenario(struct snd_kcontrol *kcontrol,
- {
-       struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+      dprintk("Entered %s\n", __FUNCTION__);
-+
-       if (neo1973_scenario == ucontrol->value.integer.value[0])
-               return 0;
-@@ -328,6 +351,8 @@ static u8 lm4857_regs[4] = {0x00, 0x40, 0x80, 0xC0};
- static void lm4857_write_regs(void)
- {
-+      dprintk("Entered %s\n", __FUNCTION__);
-+
-       if (i2c_master_send(i2c, lm4857_regs, 4) != 4)
-               printk(KERN_ERR "lm4857: i2c write failed\n");
- }
-@@ -339,6 +364,8 @@ static int lm4857_get_reg(struct snd_kcontrol *kcontrol,
-       int shift = (kcontrol->private_value >> 8) & 0x0F;
-       int mask = (kcontrol->private_value >> 16) & 0xFF;
-+      dprintk("Entered %s\n", __FUNCTION__);
-+
-       ucontrol->value.integer.value[0] = (lm4857_regs[reg] >> shift) & mask;
-       return 0;
- }
-@@ -350,6 +377,8 @@ static int lm4857_set_reg(struct snd_kcontrol *kcontrol,
-       int shift = (kcontrol->private_value >> 8) & 0x0F;
-       int mask = (kcontrol->private_value >> 16) & 0xFF;
-+      dprintk("Entered %s\n", __FUNCTION__);
-+
-       if (((lm4857_regs[reg] >> shift ) & mask) ==
-               ucontrol->value.integer.value[0])
-               return 0;
-@@ -365,6 +394,8 @@ static int lm4857_get_mode(struct snd_kcontrol *kcontrol,
- {
-       u8 value = lm4857_regs[LM4857_CTRL] & 0x0F;
-+      dprintk("Entered %s\n", __FUNCTION__);
-+
-       if (value)
-               value -= 5;
-@@ -377,6 +408,8 @@ static int lm4857_set_mode(struct snd_kcontrol *kcontrol,
- {
-       u8 value = ucontrol->value.integer.value[0];
-+      dprintk("Entered %s\n", __FUNCTION__);
-+
-       if (value)
-               value += 5;
-@@ -484,6 +517,8 @@ static int neo1973_wm8753_init(struct snd_soc_codec *codec)
- {
-       int i, err;
-+      dprintk("Entered %s\n", __FUNCTION__);
-+
-       /* set up NC codec pins */
-       snd_soc_dapm_set_endpoint(codec, "LOUT2", 0);
-       snd_soc_dapm_set_endpoint(codec, "ROUT2", 0);
-@@ -584,6 +619,8 @@ static int lm4857_amp_probe(struct i2c_adapter *adap, int addr, int kind)
- {
-       int ret;
-+      dprintk("Entered %s\n", __FUNCTION__);
-+
-       client_template.adapter = adap;
-       client_template.addr = addr;
-@@ -607,6 +644,8 @@ exit_err:
- static int lm4857_i2c_detach(struct i2c_client *client)
- {
-+      dprintk("Entered %s\n", __FUNCTION__);
-+
-       i2c_detach_client(client);
-       kfree(client);
-       return 0;
-@@ -614,6 +653,8 @@ static int lm4857_i2c_detach(struct i2c_client *client)
- static int lm4857_i2c_attach(struct i2c_adapter *adap)
- {
-+      dprintk("Entered %s\n", __FUNCTION__);
-+
-       return i2c_probe(adap, &addr_data, lm4857_amp_probe);
- }
-@@ -621,6 +662,8 @@ static u8 lm4857_state;
- static int lm4857_suspend(struct i2c_client *dev, pm_message_t state)
- {
-+      dprintk("Entered %s\n", __FUNCTION__);
-+
-       dev_dbg(&dev->dev, "lm4857_suspend\n");
-       lm4857_state = lm4857_regs[LM4857_CTRL] & 0xf;
-       if (lm4857_state) {
-@@ -632,6 +675,8 @@ static int lm4857_suspend(struct i2c_client *dev, pm_message_t state)
- static int lm4857_resume(struct i2c_client *dev)
- {
-+      dprintk("Entered %s\n", __FUNCTION__);
-+
-       if (lm4857_state) {
-               lm4857_regs[LM4857_CTRL] |= (lm4857_state & 0x0f);
-               lm4857_write_regs();
-@@ -641,6 +686,8 @@ static int lm4857_resume(struct i2c_client *dev)
- static void lm4857_shutdown(struct i2c_client *dev)
- {
-+      dprintk("Entered %s\n", __FUNCTION__);
-+
-       dev_dbg(&dev->dev, "lm4857_shutdown\n");
-       lm4857_regs[LM4857_CTRL] &= 0xf0;
-       lm4857_write_regs();
-@@ -672,6 +719,8 @@ static int __init neo1973_init(void)
- {
-       int ret;
-+      dprintk("Entered %s\n", __FUNCTION__);
-+
-       if (!machine_is_neo1973_gta01()) {
-               printk(KERN_INFO
-                      "Only GTA01 hardware supported by ASoc driver\n");
-@@ -698,6 +747,8 @@ static int __init neo1973_init(void)
- static void __exit neo1973_exit(void)
- {
-+      dprintk("Entered %s\n", __FUNCTION__);
-+
-       i2c_del_driver(&lm4857_i2c_driver);
-       platform_device_unregister(neo1973_snd_device);
- }
-diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c
-index 43fd25a..7b6cca7 100644
---- a/sound/soc/s3c24xx/s3c24xx-i2s.c
-+++ b/sound/soc/s3c24xx/s3c24xx-i2s.c
-@@ -46,7 +46,7 @@
- #define S3C24XX_I2S_DEBUG 0
- #if S3C24XX_I2S_DEBUG
--#define DBG(x...) printk(KERN_DEBUG x)
-+#define DBG(x...) printk(KERN_DEBUG "s3c24xx-i2s: " x)
- #else
- #define DBG(x...)
- #endif
-@@ -415,6 +415,7 @@ static int s3c24xx_i2s_probe(struct platform_device *pdev)
- int s3c24xx_i2s_suspend(struct platform_device *pdev,
-                 struct snd_soc_cpu_dai *cpu_dai)
- {
-+      DBG("Entered %s\n", __FUNCTION__);
-       s3c24xx_i2s.iiscon = readl(s3c24xx_i2s.regs + S3C2410_IISCON);
-       s3c24xx_i2s.iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD);
-       s3c24xx_i2s.iisfcon = readl(s3c24xx_i2s.regs + S3C2410_IISFCON);
-@@ -428,6 +429,7 @@ int s3c24xx_i2s_suspend(struct platform_device *pdev,
- int s3c24xx_i2s_resume(struct platform_device *pdev,
-                 struct snd_soc_cpu_dai *cpu_dai)
- {
-+      DBG("Entered %s\n", __FUNCTION__);
-       clk_enable(s3c24xx_i2s.iis_clk);
-         writel(s3c24xx_i2s.iiscon, s3c24xx_i2s.regs + S3C2410_IISCON);
-diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c
-index e9f3b60..57b0c74 100644
---- a/sound/soc/s3c24xx/s3c24xx-pcm.c
-+++ b/sound/soc/s3c24xx/s3c24xx-pcm.c
-@@ -40,7 +40,7 @@
- #define S3C24XX_PCM_DEBUG 0
- #if S3C24XX_PCM_DEBUG
--#define DBG(x...) printk(KERN_DEBUG x)
-+#define DBG(x...) printk(KERN_DEBUG "s3c24xx-pcm: " x)
- #else
- #define DBG(x...)
- #endif
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1138-From-cc08b5986dfd8d971ee46ce7045fb7863f99a92a-Mon-Se.patch b/target/linux/s3c24xx/patches-2.6.24/1138-From-cc08b5986dfd8d971ee46ce7045fb7863f99a92a-Mon-Se.patch
deleted file mode 100644 (file)
index 5c09ff7..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-From 463f236121c752e434de713f6b141ed885c5fc5b Mon Sep 17 00:00:00 2001
-From: Matt Hsu <matt_hsu@openmoko.org>
-Date: Wed, 30 Apr 2008 13:33:58 +0100
-Subject: [PATCH] From cc08b5986dfd8d971ee46ce7045fb7863f99a92a Mon Sep 17 00:00:00 2001
- Subject: [PATCH] - add suspend/resume function of s3c24xx_hcd driver
-
-Signed-off-by: Matt Hsu <matt_hsu@openmoko.org>
----
- drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c |   65 ++++++++++++++++++++++++++++++++
- drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h |   14 +++++++
- 2 files changed, 79 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-index 8c3bbbc..7ead7b7 100644
---- a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-+++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-@@ -1364,11 +1364,76 @@ static int s3c24xx_hcd_remove(struct platform_device * pdev) {
-       return 0;
- }
-+#ifdef CONFIG_PM 
-+
-+static int s3c24xx_hcd_suspend(struct platform_device * pdev)
-+{
-+      struct s3c24xx_hcd_context * context = &hcd_context;    
-+      unsigned long flags;
-+
-+      spin_lock_irqsave(&context->lock, flags);
-+
-+      context->suspend_regs.con       = readl(context->base + S3C2410_SDICON);
-+      context->suspend_regs.pre       = readl(context->base + S3C2410_SDIPRE);
-+      context->suspend_regs.cmdarg    = readl(context->base + S3C2410_SDICMDARG);
-+      context->suspend_regs.cmdcon    = readl(context->base + S3C2410_SDICMDCON);
-+      context->suspend_regs.cmdsta    = readl(context->base + S3C2410_SDICMDSTAT);
-+      context->suspend_regs.r0        = readl(context->base + S3C2410_SDIRSP0);
-+      context->suspend_regs.r1        = readl(context->base + S3C2410_SDIRSP1);
-+      context->suspend_regs.r2        = readl(context->base + S3C2410_SDIRSP2);
-+      context->suspend_regs.r3        = readl(context->base + S3C2410_SDIRSP3);
-+      context->suspend_regs.timer     = readl(context->base + S3C2410_SDITIMER);
-+      context->suspend_regs.bsize     = readl(context->base + S3C2410_SDIBSIZE);
-+      context->suspend_regs.datcon    = readl(context->base + S3C2410_SDIDCON);
-+      context->suspend_regs.datcnt    = readl(context->base + S3C2410_SDIDCNT);
-+      context->suspend_regs.datsta    = readl(context->base + S3C2410_SDIDSTA);
-+      context->suspend_regs.fsta      = readl(context->base + S3C2410_SDIFSTA);
-+      context->suspend_regs.imask   = readl(context->base + S3C2440_SDIIMSK);
-+      
-+      spin_unlock_irqrestore(&context->lock, flags);
-+      return 0;
-+}
-+
-+static int s3c24xx_hcd_resume(struct platform_device * pdev)
-+{     
-+      struct s3c24xx_hcd_context * context = &hcd_context;
-+      unsigned long flags;
-+
-+      spin_lock_irqsave(&context->lock, flags);
-+      
-+      writel(context->suspend_regs.con, context->base + S3C2410_SDICON);
-+      writel(context->suspend_regs.pre, context->base + S3C2410_SDIPRE);
-+      writel(context->suspend_regs.cmdarg, context->base + S3C2410_SDICMDARG);
-+      writel(context->suspend_regs.cmdcon, context->base + S3C2410_SDICMDCON);
-+      writel(context->suspend_regs.cmdsta, context->base + S3C2410_SDICMDSTAT);
-+      writel(context->suspend_regs.r0, context->base + S3C2410_SDIRSP0);
-+      writel(context->suspend_regs.r1, context->base + S3C2410_SDIRSP1);
-+      writel(context->suspend_regs.r2, context->base + S3C2410_SDIRSP2);
-+      writel(context->suspend_regs.r3, context->base + S3C2410_SDIRSP3);
-+      writel(context->suspend_regs.timer, context->base + S3C2410_SDITIMER);
-+      writel(context->suspend_regs.bsize, context->base + S3C2410_SDIBSIZE);
-+      writel(context->suspend_regs.datcon, context->base + S3C2410_SDIDCON);
-+      writel(context->suspend_regs.datcnt, context->base + S3C2410_SDIDCNT);
-+      writel(context->suspend_regs.datsta, context->base + S3C2410_SDIDSTA);
-+      writel(context->suspend_regs.fsta, context->base + S3C2410_SDIFSTA);
-+      writel(context->suspend_regs.imask, context->base + S3C2440_SDIIMSK);
-+
-+      spin_unlock_irqrestore(&context->lock, flags);
-+      return 0;
-+}
-+
-+#else
-+#define s3c24xx_hcd_suspend = NULL
-+#define s3c24xx_hcd_resume  = NULL
-+#endif
-+
- static struct platform_driver s3c24xx_hcd_sdio =
- {
-       .driver.name    = "s3c24xx-sdio",
-       .probe          = s3c24xx_hcd_probe,
-       .remove         = s3c24xx_hcd_remove,
-+      .suspend    = s3c24xx_hcd_suspend,
-+      .resume         = s3c24xx_hcd_resume,
- };
- #ifdef CONFIG_DEBUG_FS
-diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
-index eb262fc..47fdd33 100644
---- a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
-+++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
-@@ -57,6 +57,20 @@ struct s3c24xx_hcd_context {
-       struct work_struct        io_work;
-       struct work_struct        irq_work;
-+
-+#ifdef CONFIG_PM
-+      struct {
-+              UINT32          con;
-+              UINT32          pre;
-+              UINT32          cmdarg, cmdcon, cmdsta;
-+              UINT32          r0, r1, r2, r3;
-+              UINT32          timer;
-+              UINT32          bsize;
-+              UINT32          datcon, datcnt, datsta;
-+              UINT32          fsta;
-+              UINT32          imask;  
-+      } suspend_regs;
-+#endif
- };
- SDIO_STATUS s3c24xx_hcd_config(PSDHCD hcd, PSDCONFIG config);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1139-clean-sdio-hcd-suspend.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1139-clean-sdio-hcd-suspend.patch.patch
deleted file mode 100644 (file)
index 6ba7ae9..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-From 401eb535cb94e53ba4ff1a04caafe96b7d4d1981 Mon Sep 17 00:00:00 2001
-From: Andy Green <agreen@localhost.localdomain>
-Date: Wed, 30 Apr 2008 13:34:14 +0100
-Subject: [PATCH] clean-sdio-hcd-suspend.patch
-
-fix trailing whitespace and function args for suspend.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-index 7ead7b7..1292020 100644
---- a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-+++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-@@ -1364,11 +1364,11 @@ static int s3c24xx_hcd_remove(struct platform_device * pdev) {
-       return 0;
- }
--#ifdef CONFIG_PM 
-+#ifdef CONFIG_PM
--static int s3c24xx_hcd_suspend(struct platform_device * pdev)
-+static int s3c24xx_hcd_suspend(struct platform_device * pdev, pm_message_t state)
- {
--      struct s3c24xx_hcd_context * context = &hcd_context;    
-+      struct s3c24xx_hcd_context * context = &hcd_context;
-       unsigned long flags;
-       spin_lock_irqsave(&context->lock, flags);
-@@ -1389,18 +1389,18 @@ static int s3c24xx_hcd_suspend(struct platform_device * pdev)
-       context->suspend_regs.datsta    = readl(context->base + S3C2410_SDIDSTA);
-       context->suspend_regs.fsta      = readl(context->base + S3C2410_SDIFSTA);
-       context->suspend_regs.imask   = readl(context->base + S3C2440_SDIIMSK);
--      
-+
-       spin_unlock_irqrestore(&context->lock, flags);
-       return 0;
- }
- static int s3c24xx_hcd_resume(struct platform_device * pdev)
--{     
-+{
-       struct s3c24xx_hcd_context * context = &hcd_context;
-       unsigned long flags;
-       spin_lock_irqsave(&context->lock, flags);
--      
-+
-       writel(context->suspend_regs.con, context->base + S3C2410_SDICON);
-       writel(context->suspend_regs.pre, context->base + S3C2410_SDIPRE);
-       writel(context->suspend_regs.cmdarg, context->base + S3C2410_SDICMDARG);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1140-Stop-GTA01-MMC-Debugging-messages.patch b/target/linux/s3c24xx/patches-2.6.24/1140-Stop-GTA01-MMC-Debugging-messages.patch
deleted file mode 100644 (file)
index c486fb8..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 32a457c1616086e434bab03c24920ff6bd39e15a Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Wed, 30 Apr 2008 14:50:12 +0100
-Subject: [PATCH] Stop GTA01 MMC Debugging messages
-
-Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- defconfig-2.6.24-maxmodules |    2 +-
- defconfig-gta01             |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/defconfig-2.6.24-maxmodules b/defconfig-2.6.24-maxmodules
-index 6f6243e..f574da5 100644
---- a/defconfig-2.6.24-maxmodules
-+++ b/defconfig-2.6.24-maxmodules
-@@ -1395,7 +1395,7 @@ CONFIG_SDIO_S3C24XX=y
- CONFIG_SDIO_S3C24XX_DMA=y
- CONFIG_SDIO_AR6000_WLAN=y
- CONFIG_MMC=y
--CONFIG_MMC_DEBUG=y
-+# CONFIG_MMC_DEBUG is not set
- CONFIG_MMC_UNSAFE_RESUME=y
- #
-diff --git a/defconfig-gta01 b/defconfig-gta01
-index 6f6243e..f574da5 100644
---- a/defconfig-gta01
-+++ b/defconfig-gta01
-@@ -1395,7 +1395,7 @@ CONFIG_SDIO_S3C24XX=y
- CONFIG_SDIO_S3C24XX_DMA=y
- CONFIG_SDIO_AR6000_WLAN=y
- CONFIG_MMC=y
--CONFIG_MMC_DEBUG=y
-+# CONFIG_MMC_DEBUG is not set
- CONFIG_MMC_UNSAFE_RESUME=y
- #
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1141-fix-KEY_PHONE-up-down-inversion.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1141-fix-KEY_PHONE-up-down-inversion.patch.patch
deleted file mode 100644 (file)
index 57704bd..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From bb7abab607e71a3cc1e8a4ebfa7619d872827353 Mon Sep 17 00:00:00 2001
-From: Sean McNeil <sean@mcneil.com>
-Date: Thu, 8 May 2008 09:24:45 +0100
-Subject: [PATCH] fix-KEY_PHONE-up-down-inversion.patch
-
-the KEY_PHONE is backwards. It returns up when pushed and down when
-released. The following change fixes it:
-
-Signed-off-by: Sean McNeil <sean@mcneil.com>
----
- drivers/input/keyboard/neo1973kbd.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-index 8b9a420..868d0a7 100644
---- a/drivers/input/keyboard/neo1973kbd.c
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -40,7 +40,7 @@ static irqreturn_t neo1973kbd_aux_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--      int key_pressed = !gpio_get_value(irq_to_gpio(irq));
-+      int key_pressed = !!gpio_get_value(irq_to_gpio(irq));
-       input_report_key(neo1973kbd_data->input, KEY_PHONE, key_pressed);
-       input_sync(neo1973kbd_data->input);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1142-s3c24xx-pwm-platform-driver.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1142-s3c24xx-pwm-platform-driver.patch.patch
deleted file mode 100644 (file)
index 4e23331..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-From 966a29020932751ba6a1a137b0e1e25ac0708be7 Mon Sep 17 00:00:00 2001
-From: matt_hsu <matt_hsu@openmoko.org>
-Date: Thu, 8 May 2008 10:23:07 +0100
-Subject: [PATCH] s3c24xx-pwm-platform-driver.patch
-
-This patch is to register pwm as platform driver to keep the PWM-related
-config when system is in suspend/resume. This could fix the following
-issue after resume:
-
-- HDQ read timeout
-- LEDs blinked abnormally(if LEDs is driven by PWM)
-
-Signed-off-by: Matt Hsu <matt_hsu@openmoko.org>
----
- arch/arm/mach-s3c2410/pwm.c        |   63 ++++++++++++++++++++++++++++++++++++
- arch/arm/mach-s3c2440/mach-gta02.c |    6 +++
- 2 files changed, 69 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/pwm.c b/arch/arm/mach-s3c2410/pwm.c
-index 23738c1..86a4faa 100644
---- a/arch/arm/mach-s3c2410/pwm.c
-+++ b/arch/arm/mach-s3c2410/pwm.c
-@@ -20,10 +20,17 @@
- #include <linux/kernel.h>
- #include <linux/init.h>
- #include <linux/clk.h>
-+#include <linux/device.h>
- #include <asm/hardware.h>
- #include <asm/plat-s3c/regs-timer.h>
- #include <asm/arch/pwm.h>
-+#ifdef CONFIG_PM
-+      static unsigned long standby_reg_tcon;
-+      static unsigned long standby_reg_tcfg0;
-+      static unsigned long standby_reg_tcfg1;
-+#endif
-+
- int s3c2410_pwm_disable(struct s3c2410_pwm *pwm)
- {
-       unsigned long tcon;
-@@ -212,3 +219,59 @@ int s3c2410_pwm_dumpregs(void)
-       return 0;
- }
- EXPORT_SYMBOL_GPL(s3c2410_pwm_dumpregs);
-+
-+static int __init s3c24xx_pwm_probe(struct platform_device *pdev)
-+{
-+      dev_info(&pdev->dev, "s3c24xx_pwm is registered \n");
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int s3c24xx_pwm_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+      /* PWM config should be kept in suspending */
-+      standby_reg_tcon = __raw_readl(S3C2410_TCON);
-+      standby_reg_tcfg0 = __raw_readl(S3C2410_TCFG0);
-+      standby_reg_tcfg1 = __raw_readl(S3C2410_TCFG1);
-+
-+      return 0;
-+}
-+
-+static int s3c24xx_pwm_resume(struct platform_device *pdev)
-+{
-+      __raw_writel(standby_reg_tcon, S3C2410_TCON);
-+      __raw_writel(standby_reg_tcfg0, S3C2410_TCFG0);
-+      __raw_writel(standby_reg_tcfg1, S3C2410_TCFG1);
-+
-+      return 0;
-+}
-+#else
-+#define sc32440_pwm_suspend   NULL
-+#define sc32440_pwm_resume    NULL
-+#endif
-+
-+static struct platform_driver s3c24xx_pwm_driver = {
-+      .driver = {
-+              .name   = "s3c24xx_pwm",
-+              .owner  = THIS_MODULE,
-+      },
-+      .probe   = s3c24xx_pwm_probe,
-+      .suspend = s3c24xx_pwm_suspend,
-+      .resume  = s3c24xx_pwm_resume,
-+};
-+
-+static int __init s3c24xx_pwm_init(void)
-+{
-+      return platform_driver_register(&s3c24xx_pwm_driver);
-+}
-+
-+static void __exit s3c24xx_pwm_exit(void)
-+{
-+}
-+
-+MODULE_AUTHOR("Javi Roman <javiroman@kernel-labs.org>");
-+MODULE_LICENSE("GPL");
-+
-+module_init(s3c24xx_pwm_init);
-+module_exit(s3c24xx_pwm_exit);
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 27babc9..1954121 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -719,6 +719,11 @@ static struct platform_device gta02_sdio_dev = {
-         .num_resources  = ARRAY_SIZE(gta02_sdio_resources),
- };
-+struct platform_device s3c24xx_pwm_device = {
-+      .name           = "s3c24xx_pwm",
-+      .num_resources  = 0,
-+};
-+
- static struct platform_device *gta02_devices[] __initdata = {
-       &s3c_device_usb,
-       &s3c_device_wdt,
-@@ -731,6 +736,7 @@ static struct platform_device *gta02_devices[] __initdata = {
-       &gta02_nor_flash,
-       &sc32440_fiq_device,
-       &gta02_version_device,
-+      &s3c24xx_pwm_device,
- };
- static struct s3c2410_nand_set gta02_nand_sets[] = {
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1143-fix-wep-needs-keys-before-ap.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1143-fix-wep-needs-keys-before-ap.patch.patch
deleted file mode 100644 (file)
index e1bac78..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-From ada5962807036b786fee00fd4462009c179181b6 Mon Sep 17 00:00:00 2001
-From: Sean McNeil <sean@mcneil.com>
-Date: Tue, 13 May 2008 10:54:45 +0100
-Subject: [PATCH] fix-wep-needs-keys-before-ap.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- .../function/wlan/ar6000/ar6000/wireless_ext.c     |   20 +++++++-------------
- 1 files changed, 7 insertions(+), 13 deletions(-)
-
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c b/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
-index db749e2..ede8e62 100644
---- a/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
-@@ -424,10 +424,6 @@ ar6000_ioctl_giwessid(struct net_device *dev,
-         return -EIO;
-     }
--    if (!ar->arSsidLen) {
--        return -EINVAL;
--    }
--
-     data->flags = 1;
-     data->length = ar->arSsidLen;
-     A_MEMCPY(essid, ar->arSsid, ar->arSsidLen);
-@@ -818,12 +814,6 @@ ar6000_ioctl_siwencode(struct net_device *dev,
-     AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-     int index;
-     A_INT32 auth = ar->arDot11AuthMode;
--    /*
--     *  Static WEP Keys should be configured before setting the SSID
--     */
--    if (ar->arSsidLen) {
--        return -EIO;
--    }
-     if (ar->arWlanState == WLAN_DISABLED) {
-         return -EIO;
-@@ -894,6 +884,7 @@ ar6000_ioctl_siwencode(struct net_device *dev,
-      * profile has changed.  Erase ssid to signal change
-      */
-     A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
-+    ar->arSsidLen = 0;
-     return 0;
- }
-@@ -1096,8 +1087,10 @@ static int ar6000_ioctl_siwauth(struct net_device *dev,
-               return -EOPNOTSUPP;
-       }
--      if (reset)
--              memset(ar->arSsid, 0, sizeof(ar->arSsid));
-+      if (reset) {
-+              A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
-+              ar->arSsidLen = 0;
-+      }
-       return 0;
- }
-@@ -1335,7 +1328,8 @@ ar6000_ioctl_setparam(struct net_device *dev,
-         /*
-          * profile has changed.  Erase ssid to signal change
-          */
--        A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
-+      A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
-+      ar->arSsidLen = 0;
-     }
-     return ret;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1144-config-add-back-MMC_UNSAFE_RESUME.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1144-config-add-back-MMC_UNSAFE_RESUME.patch.patch
deleted file mode 100644 (file)
index 165c772..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-From 45366d2500116c0b745a5b97f20a15c624eedf11 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Tue, 13 May 2008 18:53:39 +0100
-Subject: [PATCH] config-add-back-MMC_UNSAFE_RESUME.patch
-
-After LL debug disable, "unsafe" resume allows resume from SD card
-rootfs without corruption, WAH
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- defconfig-2.6.24 |    2 +-
- defconfig-gta02  |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index 4df10bf..d091489 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -1483,7 +1483,7 @@ CONFIG_SDIO_S3C24XX_DMA=y
- CONFIG_SDIO_AR6000_WLAN=y
- CONFIG_MMC=y
- # CONFIG_MMC_DEBUG is not set
--# CONFIG_MMC_UNSAFE_RESUME is not set
-+CONFIG_MMC_UNSAFE_RESUME=y
- #
- # MMC/SD Card Drivers
-diff --git a/defconfig-gta02 b/defconfig-gta02
-index 4d040ff..1fa2d80 100644
---- a/defconfig-gta02
-+++ b/defconfig-gta02
-@@ -1395,7 +1395,7 @@ CONFIG_SDIO_S3C24XX=y
- CONFIG_SDIO_S3C24XX_DMA=y
- CONFIG_SDIO_AR6000_WLAN=y
- CONFIG_MMC=y
--CONFIG_MMC_DEBUG=y
-+# CONFIG_MMC_DEBUG is not set
- CONFIG_MMC_UNSAFE_RESUME=y
- #
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1145-fix-suspend-backlight-timing-pm-debug.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1145-fix-suspend-backlight-timing-pm-debug.patch.patch
deleted file mode 100644 (file)
index b6803b5..0000000
+++ /dev/null
@@ -1,269 +0,0 @@
-From dcb5fd2c195981557237e3f91598a6b19f7fe929 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Tue, 13 May 2008 18:53:39 +0100
-Subject: [PATCH] fix-suspend-backlight-timing-pm-debug.patch
-
-This patch improves the smoothness of suspend and resume action.
-
-Taking out CONFIG_PM_DEBUG allows much more rapid resume (the low level
-serial traffic appears to be synchronous)
-
-Added a platform callback in jbt driver and support in pcf50633 so we
-can defer bringing up the backlight until the LCM is able to process
-video again (which must happen after the glamo is up and producing
-video beacuse the LCM is hooked to glamo SPI)
-
-GTA01 should not be affected by all this as the callback will default
-to null and it is on pcf50606
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |    8 ++++++
- defconfig-2.6.24                   |    4 +-
- drivers/i2c/chips/pcf50633.c       |   50 ++++++++++++++++++++++++++---------
- drivers/video/display/jbt6k74.c    |   12 ++++++++-
- include/linux/jbt6k74.h            |    3 +-
- include/linux/pcf50633.h           |    6 ++++
- 6 files changed, 66 insertions(+), 17 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 1954121..e1984a9 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -532,6 +532,7 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-                       },
-               },
-       },
-+      .defer_resume_backlight = 1,
- };
- #if 0 /* currently unused */
-@@ -828,9 +829,16 @@ void gta02_jbt6k74_reset(int devidx, int level)
-       glamo_lcm_reset(level);
- }
-+/* finally bring up deferred backlight resume now LCM is resumed itself */
-+
-+void gta02_jbt6k74_resuming(int devidx)
-+{
-+      pcf50633_backlight_resume(pcf50633_global);
-+}
- const struct jbt6k74_platform_data jbt6k74_pdata = {
-       .reset          = gta02_jbt6k74_reset,
-+      .resuming       = gta02_jbt6k74_resuming,
- };
- static struct spi_board_info gta02_spi_board_info[] = {
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index d091489..0bcf50a 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -161,7 +161,7 @@ CONFIG_CPU_LLSERIAL_S3C2440=y
- #
- # Power management
- #
--CONFIG_S3C2410_PM_DEBUG=y
-+# CONFIG_S3C2410_PM_DEBUG is not set
- # CONFIG_S3C2410_PM_CHECK is not set
- CONFIG_S3C_LOWLEVEL_UART_PORT=2
-@@ -1754,7 +1754,7 @@ CONFIG_FORCED_INLINING=y
- # CONFIG_SAMPLES is not set
- # CONFIG_DEBUG_USER is not set
- CONFIG_DEBUG_ERRORS=y
--CONFIG_DEBUG_LL=y
-+# CONFIG_DEBUG_LL is not set
- # CONFIG_DEBUG_ICEDCC is not set
- # CONFIG_DEBUG_S3C_PORT is not set
- CONFIG_DEBUG_S3C_UART=2
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 09d5cfd..b7b4921 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1466,7 +1466,7 @@ static int pcf50633bl_set_intensity(struct backlight_device *bd)
-       struct pcf50633_data *pcf = bl_get_data(bd);
-       int intensity = bd->props.brightness;
-       int old_intensity = reg_read(pcf, PCF50633_REG_LEDOUT);
--      u_int8_t ledena;
-+      u_int8_t ledena = 2;
-       int ret;
-       if (bd->props.power != FB_BLANK_UNBLANK)
-@@ -1474,16 +1474,19 @@ static int pcf50633bl_set_intensity(struct backlight_device *bd)
-       if (bd->props.fb_blank != FB_BLANK_UNBLANK)
-               intensity = 0;
--      /* The PCF50633 seems to have some kind of oddity (bug?) when
--       * the intensity was 0, you need to completely switch it off
--       * and re-enable it, before it produces any output voltage again */
-+      /* The PCF50633 cannot handle LEDOUT = 0 (datasheet p60)
-+       * if seen, you have to re-enable the LED unit
-+       */
-       if (intensity != 0 && old_intensity == 0) {
-               ledena = reg_read(pcf, PCF50633_REG_LEDENA);
-               reg_write(pcf, PCF50633_REG_LEDENA, 0x00);
-       }
--      ret = reg_set_bit_mask(pcf, PCF50633_REG_LEDOUT, 0x3f,
-+      if (!intensity) /* illegal to set LEDOUT to 0 */
-+              ret = reg_set_bit_mask(pcf, PCF50633_REG_LEDOUT, 0x3f, 2);
-+      else
-+              ret = reg_set_bit_mask(pcf, PCF50633_REG_LEDOUT, 0x3f,
-                              intensity);
-       if (intensity != 0 && old_intensity == 0)
-@@ -1921,6 +1924,8 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       }
-       /* turn off the backlight */
-+      __reg_write(pcf, PCF50633_REG_LEDDIM, 0);
-+      __reg_write(pcf, PCF50633_REG_LEDOUT, 2);
-       __reg_write(pcf, PCF50633_REG_LEDENA, 0x00);
-       pcf->standby_regs.int1m = __reg_read(pcf, PCF50633_REG_INT1M);
-@@ -1939,17 +1944,30 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       return 0;
- }
-+/*
-+ * if backlight resume is selected to be deferred by platform, then it
-+ * can call this to finally reset backlight status (after LCM is resumed
-+ * for example
-+ */
-+
-+void pcf50633_backlight_resume(struct pcf50633_data *pcf)
-+{
-+      __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.ledout);
-+      __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.ledena);
-+      __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.leddim);
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_backlight_resume);
-+
-+
- static int pcf50633_resume(struct device *dev)
- {
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-       int i;
--      printk(KERN_INFO"a\n");
-       /* mutex_lock(&pcf->lock); */  /* resume in atomic context */
-       __reg_write(pcf, PCF50633_REG_LEDENA, 0x01);
--      printk(KERN_INFO"b\n");
-       /* Resume all saved registers that don't "survive" standby state */
-       __reg_write(pcf, PCF50633_REG_INT1M, pcf->standby_regs.int1m);
-@@ -1957,7 +1975,6 @@ static int pcf50633_resume(struct device *dev)
-       __reg_write(pcf, PCF50633_REG_INT3M, pcf->standby_regs.int3m);
-       __reg_write(pcf, PCF50633_REG_INT4M, pcf->standby_regs.int4m);
-       __reg_write(pcf, PCF50633_REG_INT5M, pcf->standby_regs.int5m);
--      printk(KERN_INFO"c\n");
-       __reg_write(pcf, PCF50633_REG_OOCTIM2, pcf->standby_regs.ooctim2);
-       __reg_write(pcf, PCF50633_REG_AUTOOUT, pcf->standby_regs.autoout);
-@@ -1968,17 +1985,24 @@ static int pcf50633_resume(struct device *dev)
-       __reg_write(pcf, PCF50633_REG_DOWN2ENA, pcf->standby_regs.down2ena);
-       __reg_write(pcf, PCF50633_REG_MEMLDOOUT, pcf->standby_regs.memldoout);
-       __reg_write(pcf, PCF50633_REG_MEMLDOENA, pcf->standby_regs.memldoena);
--      __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.ledout);
--      __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.ledena);
--      __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.leddim);
--      printk(KERN_INFO"d\n");
-+
-+      /* platform can choose to defer backlight bringup */
-+      if (!pcf->pdata->defer_resume_backlight) {
-+              __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.ledout);
-+              __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.ledena);
-+              __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.leddim);
-+      } else { /* force backlight down, platform will restore later */
-+              __reg_write(pcf, PCF50633_REG_LEDOUT, 2);
-+              __reg_write(pcf, PCF50633_REG_LEDENA, 0x20);
-+              __reg_write(pcf, PCF50633_REG_LEDDIM, 1);
-+      }
-+
-       /* FIXME: one big read? */
-       for (i = 0; i < 7; i++) {
-               u_int8_t reg_out = PCF50633_REG_LDO1OUT + 2*i;
-               __reg_write(pcf, reg_out, pcf->standby_regs.ldo[i].out);
-               __reg_write(pcf, reg_out+1, pcf->standby_regs.ldo[i].ena);
-       }
--      printk(KERN_INFO"e\n");
-       /* mutex_unlock(&pcf->lock); */ /* resume in atomic context */
-diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c
-index 7e11da7..178e2da 100644
---- a/drivers/video/display/jbt6k74.c
-+++ b/drivers/video/display/jbt6k74.c
-@@ -647,9 +647,14 @@ static int jbt_suspend(struct spi_device *spi, pm_message_t state)
- static void jbt_resume_work(struct work_struct *work)
- {
-       struct jbt_info *jbt = container_of(work, struct jbt_info, work);
-+      struct jbt6k74_platform_data *jbt6k74_pdata =
-+                                              jbt->spi_dev->dev.platform_data;
-       printk(KERN_INFO"jbt_resume_work waiting...\n");
--      msleep(2000);
-+      /* 100ms is not enough here 2008-05-08 andy@openmoko.com
-+       * if CONFIG_PM_DEBUG is enabled 2000ms is required
-+       */
-+      msleep(400);
-       printk(KERN_INFO"jbt_resume_work GO...\n");
-       jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);
-@@ -665,6 +670,11 @@ static void jbt_resume_work(struct work_struct *work)
-       }
-       jbt6k74_display_onoff(jbt, 1);
-+      /* this gives the platform a chance to bring up backlight now */
-+
-+      if (jbt6k74_pdata->resuming)
-+              (jbt6k74_pdata->resuming)(0);
-+
-       printk(KERN_INFO"jbt_resume_work done...\n");
- }
-diff --git a/include/linux/jbt6k74.h b/include/linux/jbt6k74.h
-index 3fbe178..0ac9124 100644
---- a/include/linux/jbt6k74.h
-+++ b/include/linux/jbt6k74.h
-@@ -2,7 +2,8 @@
- #define __JBT6K74_H__
- struct jbt6k74_platform_data {
--      void (* reset)(int devindex, int level);
-+      void (*reset)(int devindex, int level);
-+      void (*resuming)(int devindex); /* called when LCM is resumed */
- };
- #endif
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index b6a67ee..f427985 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -61,6 +61,9 @@ pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma);
- extern void
- pcf50633_charge_enable(struct pcf50633_data *pcf, int on);
-+extern void
-+pcf50633_backlight_resume(struct pcf50633_data *pcf);
-+
- #define PCF50633_FEAT_EXTON   0x00000001      /* not yet supported */
- #define PCF50633_FEAT_MBC     0x00000002
- #define PCF50633_FEAT_BBC     0x00000004      /* not yet supported */
-@@ -89,6 +92,9 @@ struct pcf50633_platform_data {
-               u_int8_t mbcc3; /* charger voltage / current */
-       } charger;
-       pmu_cb *cb;
-+
-+      /* post-resume backlight bringup */
-+      int defer_resume_backlight;
- };
- #endif /* _PCF50633_H */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1146-quench-glamofb-err-lock-and-mmc-debug.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1146-quench-glamofb-err-lock-and-mmc-debug.patch.patch
deleted file mode 100644 (file)
index 8f20f91..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-From 782e7e4ec713c4f3bde792b5dd26b720f1383aa3 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Tue, 13 May 2008 18:53:39 +0100
-Subject: [PATCH] quench-glamofb-err-lock-and-mmc-debug.patch
-
-Remove debugging noise
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-fb.c  |    3 ---
- drivers/mfd/glamo/glamo-mci.c |    4 ++--
- 2 files changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c
-index edc6d9c..e5410f9 100644
---- a/drivers/mfd/glamo/glamo-fb.c
-+++ b/drivers/mfd/glamo/glamo-fb.c
-@@ -319,7 +319,6 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
-       if (!glamo || !var)
-               return;
--      printk(KERN_ERR"glamofb_update_lcd_controller spin_lock_irqsave\n");
-       spin_lock_irqsave(&glamo->lock_cmd, flags);
-       if (glamofb_cmd_mode(glamo, 1))
-@@ -430,7 +429,6 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
- /*    GLAMO_LOG("leave:\n"); */
- out_unlock:
--      printk(KERN_ERR"glamofb_update_lcd_controller spin_unlock_irqrestore\n");
-       spin_unlock_irqrestore(&glamo->lock_cmd, flags);
- }
-@@ -786,7 +784,6 @@ static int __init glamofb_probe(struct platform_device *pdev)
-       glamo_engine_enable(mach_info->glamo, GLAMO_ENGINE_LCD);
-       glamo_engine_reset(mach_info->glamo, GLAMO_ENGINE_LCD);
--      printk(KERN_ERR"spin_lock_init\n");
-       spin_lock_init(&glamofb->lock_cmd);
-       glamofb_init_regs(glamofb);
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index 05bbfc4..7869325 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -195,7 +195,7 @@ static void glamo_mci_irq(unsigned int irq, struct irq_desc *desc)
-                     GLAMO_STAT1_MMC_BRERR))
-               cmd->error = -EILSEQ;
-       if (cmd->error) {
--              dev_err(&host->pdev->dev, "Error after cmd: 0x%x\n", status);
-+              dev_info(&host->pdev->dev, "Error after cmd: 0x%x\n", status);
-               goto done;
-       }
-@@ -467,7 +467,7 @@ static void glamo_mci_send_request(struct mmc_host *mmc)
-               return;
-       if (cmd->error) {
--              dev_err(&host->pdev->dev, "Error after cmd: 0x%x\n", status);
-+              dev_info(&host->pdev->dev, "Error after cmd: 0x%x\n", status);
-               goto done;
-       }
-       /*
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1147-add-force-backlight-up-on-resume.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1147-add-force-backlight-up-on-resume.patch.patch
deleted file mode 100644 (file)
index a4f1074..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From 56ba558ac343476a19a360fe139a6896bfc0b9e3 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Tue, 13 May 2008 18:53:39 +0100
-Subject: [PATCH] add-force-backlight-up-on-resume.patch
-
-The backlight status is restored during resume action, if it was
-off then it resumes like that.
-
-This patch forces it on after resume.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index b7b4921..dc4ea0a 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1952,8 +1952,9 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
- void pcf50633_backlight_resume(struct pcf50633_data *pcf)
- {
--      __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.ledout);
--      __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.ledena);
-+      /* we force the backlight on in fact */
-+      __reg_write(pcf, PCF50633_REG_LEDOUT, 0x3f);
-+      __reg_write(pcf, PCF50633_REG_LEDENA, 0x21);
-       __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.leddim);
- }
- EXPORT_SYMBOL_GPL(pcf50633_backlight_resume);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1148-fix-backlight-disable-on-zero-intensity.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1148-fix-backlight-disable-on-zero-intensity.patch.patch
deleted file mode 100644 (file)
index d3e1a51..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-From c9d44c8b43d29dd500c1dd711e490bdcd47f2830 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Tue, 13 May 2008 18:53:40 +0100
-Subject: [PATCH] fix-backlight-disable-on-zero-intensity.patch
-
-It's never right to put 0 intensity into LEDOUT according to datasheet
-But having a floor at intensity 2 means backlight isn't properly off
-when "dimmed".  So change to intensity 0 --> disable backlight.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |   34 +++++++++++++++++++++-------------
- 1 files changed, 21 insertions(+), 13 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index dc4ea0a..205f4e3 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1458,6 +1458,9 @@ static int pcf50633bl_get_intensity(struct backlight_device *bd)
-       struct pcf50633_data *pcf = bl_get_data(bd);
-       int intensity = reg_read(pcf, PCF50633_REG_LEDOUT);
-+      if (!(reg_read(pcf, PCF50633_REG_LEDOUT) & 1))
-+              intensity = 0;
-+
-       return intensity & 0x3f;
- }
-@@ -1466,31 +1469,36 @@ static int pcf50633bl_set_intensity(struct backlight_device *bd)
-       struct pcf50633_data *pcf = bl_get_data(bd);
-       int intensity = bd->props.brightness;
-       int old_intensity = reg_read(pcf, PCF50633_REG_LEDOUT);
--      u_int8_t ledena = 2;
-       int ret;
--      if (bd->props.power != FB_BLANK_UNBLANK)
--              intensity = 0;
--      if (bd->props.fb_blank != FB_BLANK_UNBLANK)
-+      if (!(reg_read(pcf, PCF50633_REG_LEDOUT) & 1))
-+              old_intensity = 0;
-+
-+      if ((bd->props.power != FB_BLANK_UNBLANK) ||
-+          (bd->props.fb_blank != FB_BLANK_UNBLANK))
-               intensity = 0;
--      /* The PCF50633 cannot handle LEDOUT = 0 (datasheet p60)
-+      /*
-+       * The PCF50633 cannot handle LEDOUT = 0 (datasheet p60)
-        * if seen, you have to re-enable the LED unit
-+       * we treat intensity 0 as disable
-        */
--      if (intensity != 0 && old_intensity == 0) {
--              ledena = reg_read(pcf, PCF50633_REG_LEDENA);
--              reg_write(pcf, PCF50633_REG_LEDENA, 0x00);
-+      if (intensity && !old_intensity) {
-+              ret = reg_set_bit_mask(pcf, PCF50633_REG_LEDENA, 0x01, 0x00);
-+              if (ret)
-+                      return ret;
-       }
-       if (!intensity) /* illegal to set LEDOUT to 0 */
--              ret = reg_set_bit_mask(pcf, PCF50633_REG_LEDOUT, 0x3f, 2);
--      else
-+              ret = reg_set_bit_mask(pcf, PCF50633_REG_LEDENA, 0x01, 0x00);
-+      else {
-               ret = reg_set_bit_mask(pcf, PCF50633_REG_LEDOUT, 0x3f,
-                              intensity);
--
--      if (intensity != 0 && old_intensity == 0)
--              reg_write(pcf, PCF50633_REG_LEDENA, ledena);
-+              if (ret)
-+                      return ret;
-+              ret = reg_set_bit_mask(pcf, PCF50633_REG_LEDENA, 0x01, 0x01);
-+      }
-       return ret;
- }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1149-Re-PATCH-6-7-fix-suppress-cpu-suspend-save-restor.patch b/target/linux/s3c24xx/patches-2.6.24/1149-Re-PATCH-6-7-fix-suppress-cpu-suspend-save-restor.patch
deleted file mode 100644 (file)
index 4844104..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-From 624dadf2c300d9e5e439c07e1244babcef2fedca Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Tue, 13 May 2008 18:53:40 +0100
-Subject: [PATCH] Re: [PATCH 6/7] fix-suppress-cpu-suspend-save-restore-messages.patch
-
-Andy Green <andy@...> writes:
-
-
-I kind of dislike commenting out code. Is this any better?
----
- arch/arm/plat-s3c24xx/pm.c |    9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/pm.c b/arch/arm/plat-s3c24xx/pm.c
-index 4fdb311..ae8efaf 100644
---- a/arch/arm/plat-s3c24xx/pm.c
-+++ b/arch/arm/plat-s3c24xx/pm.c
-@@ -169,8 +169,15 @@ static void s3c2410_pm_debug_init(void)
- }
- #define DBG(fmt...) pm_dbg(fmt)
-+#define RESTORE_DBG(fmt...) printk(KERN_DEBUG fmt)
- #else
-+#if 0
- #define DBG(fmt...) printk(KERN_DEBUG fmt)
-+#define RESTORE_DBG(fmt...) printk(KERN_DEBUG fmt)
-+#else
-+#define DBG(fmt...) do { } while (0)
-+#define RESTORE_DBG(fmt...) do { } while (0)
-+#endif
- #define s3c2410_pm_debug_init() do { } while(0)
-@@ -392,7 +399,7 @@ void s3c2410_pm_do_save(struct sleep_save *ptr, int count)
- void s3c2410_pm_do_restore(struct sleep_save *ptr, int count)
- {
-       for (; count > 0; count--, ptr++) {
--              printk(KERN_DEBUG "restore %p (restore %08lx, was %08x)\n",
-+              RESTORE_DBG("restore %p (restore %08lx, was %08x)\n",
-                      ptr->reg, ptr->val, __raw_readl(ptr->reg));
-               __raw_writel(ptr->val, ptr->reg);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1150-Explain-why-we-want-SECOND-to-kick.patch b/target/linux/s3c24xx/patches-2.6.24/1150-Explain-why-we-want-SECOND-to-kick.patch
deleted file mode 100644 (file)
index dec34bd..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From 88d3c5010a207c651d1940856d0d26935434e3c2 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <ich@tamarin.(none)>
-Date: Tue, 13 May 2008 18:53:40 +0100
-Subject: [PATCH] Explain why we want SECOND to kick.
-     We do not mask the SECOND interrupt to make sure that we get
-     a interrupt at the beginning. We use this for the coldplug_done
-     initisalisation.
-     So pcf->flags and INT1M is out of sync at the beginning but after the
-     first SECOND interrupt it will be put into sync.
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- drivers/i2c/chips/pcf50633.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 205f4e3..1c10c42 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1755,7 +1755,8 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-               goto exit_sysfs;
-       /* configure interrupt mask */
--      reg_write(data, PCF50633_REG_INT1M, 0x00); /* we want SECOND to kick */
-+      /* we want SECOND to kick for the coldplug initialisation */
-+      reg_write(data, PCF50633_REG_INT1M, 0x00);
-       reg_write(data, PCF50633_REG_INT2M, 0x00);
-       reg_write(data, PCF50633_REG_INT3M, 0x00);
-       reg_write(data, PCF50633_REG_INT4M, 0x00);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1151--pcf50633-Print-less-debugging-messages.patch b/target/linux/s3c24xx/patches-2.6.24/1151--pcf50633-Print-less-debugging-messages.patch
deleted file mode 100644 (file)
index f936207..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0a6457836918f0aba88f861b7be65bfb883e6780 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <ich@tamarin.(none)>
-Date: Tue, 13 May 2008 18:53:40 +0100
-Subject: [PATCH] [pcf50633] Print less debugging messages
-     According to the comments in the code we have to read
-     INT1 - INT5 in case of any interrupt. So even if we have masked
-     out the periodic timer interrupt we were able to see that it
-     fired. Only print that we got a SECOND interrupt if we are actually
-     interested in the periodic tick. From a brief look at the datasheet there
-     is no way to stop the periodic tick.
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- drivers/i2c/chips/pcf50633.c |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 1c10c42..b354a9c 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -686,9 +686,10 @@ static void pcf50633_work(struct work_struct *work)
-                       rtc_update_irq(pcf->rtc, 1, RTC_AF | RTC_IRQF);
-       }
-       if (pcfirq[0] & PCF50633_INT1_SECOND) {
--              DEBUGPC("SECOND ");
--              if (pcf->flags & PCF50633_F_RTC_SECOND)
-+              if (pcf->flags & PCF50633_F_RTC_SECOND) {
-+                      DEBUGPC("SECOND ");
-                       rtc_update_irq(pcf->rtc, 1, RTC_PF | RTC_IRQF);
-+              }
-               if (pcf->onkey_seconds >= 0 &&
-                   pcf->flags & PCF50633_F_PWR_PRESSED) {
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1152--pcf50633-Add-exported-symbol-to-the-header-file.patch b/target/linux/s3c24xx/patches-2.6.24/1152--pcf50633-Add-exported-symbol-to-the-header-file.patch
deleted file mode 100644 (file)
index 0eefbb7..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From 555ac92637a4343511a38cd4ff70d1aab6284d60 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <ich@tamarin.(none)>
-Date: Tue, 13 May 2008 18:53:40 +0100
-Subject: [PATCH] [pcf50633] Add exported symbol to the header file
-     Reading the battery volt using the ADC was an exported symbol
-     but not in the header file, add it.
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- include/linux/pcf50633.h |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index f427985..05b55f3 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -64,6 +64,9 @@ pcf50633_charge_enable(struct pcf50633_data *pcf, int on);
- extern void
- pcf50633_backlight_resume(struct pcf50633_data *pcf);
-+extern u_int16_t
-+pcf50633_battvolt(struct pcf50633_data *pcf);
-+
- #define PCF50633_FEAT_EXTON   0x00000001      /* not yet supported */
- #define PCF50633_FEAT_MBC     0x00000002
- #define PCF50633_FEAT_BBC     0x00000004      /* not yet supported */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1153--pcf50633-Assume-that-all-gta02-s-have-a-battery-wi.patch b/target/linux/s3c24xx/patches-2.6.24/1153--pcf50633-Assume-that-all-gta02-s-have-a-battery-wi.patch
deleted file mode 100644 (file)
index ffa6e46..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 32d41ab91e5844ad6df1eea353c61a8fefc0c81e Mon Sep 17 00:00:00 2001
-From: Holger Freyther <ich@tamarin.(none)>
-Date: Tue, 13 May 2008 18:53:40 +0100
-Subject: [PATCH] [pcf50633] Assume that all gta02's have a battery with coulumb counter
-     For the gta02 and the bq27000 battery it does not make sense to use the
-     ADC to get the current voltage. Under the assumption that all mass
-     production gta02's have such batteries it does not make any sense to
-     forward this value to APM.
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- drivers/i2c/chips/pcf50633.c |    5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index b354a9c..66ca16f 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1797,16 +1797,15 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-               backlight_update_status(data->backlight);
-       }
--      apm_get_power_status = pcf50633_get_power_status;
--#ifdef CONFIG_MACH_NEO1973_GTA02
-       if (machine_is_neo1973_gta02()) {
-               gta01_pm_gps_dev.dev.parent = &new_client->dev;
-               gta01_pm_bt_dev.dev.parent = &new_client->dev;
-               platform_device_register(&gta01_pm_bt_dev);
-               platform_device_register(&gta01_pm_gps_dev);
-+      } else {
-+              apm_get_power_status = pcf50633_get_power_status;
-       }
--#endif
-       return 0;
- exit_rtc:
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1154--pcf50633-Disable-debugging-statements-as-the-drive.patch b/target/linux/s3c24xx/patches-2.6.24/1154--pcf50633-Disable-debugging-statements-as-the-drive.patch
deleted file mode 100644 (file)
index d635285..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From 946aaea37e36e9f9fe16981a0f20f5f545fcd3b4 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Tue, 13 May 2008 18:53:40 +0100
-Subject: [PATCH] [pcf50633] Disable debugging statements as the driver is working well
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- drivers/i2c/chips/pcf50633.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 66ca16f..db0589e 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -53,7 +53,7 @@
- #include "pcf50633.h"
--#if 1
-+#if 0
- #define DEBUGP(x, args ...) printk("%s: " x, __FUNCTION__, ## args)
- #define DEBUGPC(x, args ...) printk(x, ## args)
- #else
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1155--power-Use-the-bq27000-battery-to-provide-charging.patch b/target/linux/s3c24xx/patches-2.6.24/1155--power-Use-the-bq27000-battery-to-provide-charging.patch
deleted file mode 100644 (file)
index d7fc6ee..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-From 368be2e8a4290da9e49c5625ed207885d345cfcf Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Tue, 13 May 2008 18:53:40 +0100
-Subject: [PATCH] [power] Use the bq27000 battery to provide charging values for apm
-     Built the apm emulation for gta02 and say that the gta02 battery
-     is supposed to be used for this apm emulation.
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- defconfig-gta02                 |    2 +-
- drivers/power/bq27000_battery.c |    1 +
- 2 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/defconfig-gta02 b/defconfig-gta02
-index 1fa2d80..c4947b7 100644
---- a/defconfig-gta02
-+++ b/defconfig-gta02
-@@ -1018,7 +1018,7 @@ CONFIG_SPI_S3C24XX_GPIO=y
- CONFIG_POWER_SUPPLY=y
- # CONFIG_POWER_SUPPLY_DEBUG is not set
- # CONFIG_PDA_POWER is not set
--# CONFIG_APM_POWER is not set
-+CONFIG_APM_POWER=y
- # CONFIG_BATTERY_DS2760 is not set
- CONFIG_BATTERY_BQ27000_HDQ=y
- CONFIG_GTA02_HDQ=y
-diff --git a/drivers/power/bq27000_battery.c b/drivers/power/bq27000_battery.c
-index d19186a..cf57dcf 100644
---- a/drivers/power/bq27000_battery.c
-+++ b/drivers/power/bq27000_battery.c
-@@ -299,6 +299,7 @@ static int bq27000_battery_probe(struct platform_device *pdev)
-       di->bat.get_property   = bq27000_battery_get_property;
-       di->bat.external_power_changed =
-                                 bq27000_battery_external_power_changed;
-+      di->bat.use_for_apm = 1;
-       di->hdq_read = pdata->hdq_read;
-       di->hdq_write = pdata->hdq_write;
-       di->rsense_mohms = pdata->rsense_mohms;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1156-Disable-low-level-debugging-make-the-s3c24xx-PM-deb.patch b/target/linux/s3c24xx/patches-2.6.24/1156-Disable-low-level-debugging-make-the-s3c24xx-PM-deb.patch
deleted file mode 100644 (file)
index 96efad2..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-From 6b346561de958cd995c920d998bc6429bff39ce8 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Tue, 13 May 2008 18:54:13 +0100
-Subject: [PATCH] Disable low level debugging, make the s3c24xx PM debug code depend on DEBUG_LL
-
-Hey,
-where are slowly getting into the product state, low level debugging is
-supposed to be turned off there. :)
-
-z
-
-
-
-From 6448f0a521c05c5ba6672f5908c55583974ce1ed Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 9 May 2008 19:56:31 +0200
-Subject: [PATCH] [debug] Disable low level debugging for the product
-     Disable low level debugging in the defconfig-gta02 and
-     the s3c pm code used printascii which is only available
-     with low level debugging, update the Kconfig entry for
-     this pm debugging support to depend on low level debugging
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- arch/arm/plat-s3c/Kconfig |    2 +-
- defconfig-gta02           |    5 +----
- 2 files changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm/plat-s3c/Kconfig b/arch/arm/plat-s3c/Kconfig
-index 31656c3..73bbff3 100644
---- a/arch/arm/plat-s3c/Kconfig
-+++ b/arch/arm/plat-s3c/Kconfig
-@@ -61,7 +61,7 @@ comment "Power management"
- config S3C2410_PM_DEBUG
-       bool "S3C2410 PM Suspend debug"
--      depends on PLAT_S3C && PM
-+      depends on PLAT_S3C && PM && DEBUG_LL
-       help
-         Say Y here if you want verbose debugging from the PM Suspend and
-         Resume code. See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>
-diff --git a/defconfig-gta02 b/defconfig-gta02
-index c4947b7..13670ee 100644
---- a/defconfig-gta02
-+++ b/defconfig-gta02
-@@ -159,7 +159,6 @@ CONFIG_CPU_LLSERIAL_S3C2440=y
- #
- # Power management
- #
--CONFIG_S3C2410_PM_DEBUG=y
- # CONFIG_S3C2410_PM_CHECK is not set
- CONFIG_S3C_LOWLEVEL_UART_PORT=2
-@@ -1693,9 +1692,7 @@ CONFIG_FORCED_INLINING=y
- # CONFIG_SAMPLES is not set
- # CONFIG_DEBUG_USER is not set
- CONFIG_DEBUG_ERRORS=y
--CONFIG_DEBUG_LL=y
--# CONFIG_DEBUG_ICEDCC is not set
--CONFIG_DEBUG_S3C_PORT=y
-+# CONFIG_DEBUG_LL is not set
- CONFIG_DEBUG_S3C_UART=2
- #
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1157-clean-remove-build-noise.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1157-clean-remove-build-noise.patch.patch
deleted file mode 100644 (file)
index 8bc7343..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-From e9beab2f041679bac20ac3d66ae7e8efe03fcf66 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Tue, 13 May 2008 18:54:28 +0100
-Subject: [PATCH] clean-remove-build-noise.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-fb.c      |    4 +++-
- drivers/mfd/glamo/glamo-lcm-spi.c |    1 -
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c
-index e5410f9..44b1947 100644
---- a/drivers/mfd/glamo/glamo-fb.c
-+++ b/drivers/mfd/glamo/glamo-fb.c
-@@ -239,7 +239,7 @@ static void rotate_lcd(struct glamofb_handle *glamo,
-                        __u32 rotation)
- {
-       int glamo_rot;
--      unsigned long flags;
-+/*    unsigned long flags; */
-       switch (rotation) {
-               case FB_ROTATE_UR:
-@@ -495,6 +495,7 @@ static int glamofb_setcolreg(unsigned regno,
-       return 0;
- }
-+#ifdef NOT_CURRENTLY_USED
- static int glamofb_cursor(struct fb_info *info, struct fb_cursor *cursor)
- {
-       struct glamofb_handle *glamo = info->par;
-@@ -566,6 +567,7 @@ static int glamofb_cursor(struct fb_info *info, struct fb_cursor *cursor)
-               }
-       }
- }
-+#endif
- static inline int glamofb_cmdq_empty(struct glamofb_handle *gfb)
- {
-diff --git a/drivers/mfd/glamo/glamo-lcm-spi.c b/drivers/mfd/glamo/glamo-lcm-spi.c
-index 874fb0e..4b17c11 100644
---- a/drivers/mfd/glamo/glamo-lcm-spi.c
-+++ b/drivers/mfd/glamo/glamo-lcm-spi.c
-@@ -49,7 +49,6 @@ static inline struct glamo_spi *to_gs(struct spi_device *spi)
- static int glamo_spi_setupxfer(struct spi_device *spi, struct spi_transfer *t)
- {
--      struct glamo_spi *gs = to_gs(spi);
-       unsigned int bpw;
-       bpw = t ? t->bits_per_word : spi->bits_per_word;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1158-minor-problem-with-LCD.patch b/target/linux/s3c24xx/patches-2.6.24/1158-minor-problem-with-LCD.patch
deleted file mode 100644 (file)
index d9f36d5..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-From 123f9e43f721a11e1b70c49b05cacb8f6edd7eaf Mon Sep 17 00:00:00 2001
-From: Sean McNeil <sean@mcneil.com>
-Date: Tue, 13 May 2008 18:54:41 +0100
-Subject: [PATCH] minor problem with LCD
-
-Looking at wrong register to see if the LCD is turned off?
----
- drivers/i2c/chips/pcf50633.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index db0589e..e3f0271 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1459,7 +1459,7 @@ static int pcf50633bl_get_intensity(struct backlight_device *bd)
-       struct pcf50633_data *pcf = bl_get_data(bd);
-       int intensity = reg_read(pcf, PCF50633_REG_LEDOUT);
--      if (!(reg_read(pcf, PCF50633_REG_LEDOUT) & 1))
-+      if (!(reg_read(pcf, PCF50633_REG_LEDENA) & 1))
-               intensity = 0;
-       return intensity & 0x3f;
-@@ -1472,7 +1472,7 @@ static int pcf50633bl_set_intensity(struct backlight_device *bd)
-       int old_intensity = reg_read(pcf, PCF50633_REG_LEDOUT);
-       int ret;
--      if (!(reg_read(pcf, PCF50633_REG_LEDOUT) & 1))
-+      if (!(reg_read(pcf, PCF50633_REG_LEDENA) & 1))
-               old_intensity = 0;
-       if ((bd->props.power != FB_BLANK_UNBLANK) ||
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1159-Fixup-hang-on-resume-caused-by-the-s3c2410-touch-scr.patch b/target/linux/s3c24xx/patches-2.6.24/1159-Fixup-hang-on-resume-caused-by-the-s3c2410-touch-scr.patch
deleted file mode 100644 (file)
index 2a53a95..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7b7d70785f1b3c1421d56ee8140578fea3b90f9c Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Thu, 15 May 2008 21:47:56 +0100
-Subject: [PATCH] Fixup hang on resume caused by the s3c2410 touch screen driver
-
-From dc6d335b467646d802a21ea6b925ee97e83e07be Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Thu, 15 May 2008 01:16:23 +0200
-Subject: [PATCH] Do not use msleep in the resume path of s3c2410_ts as it
-might lockup
-
-For some reason msleep might set the only task running into a suspended
-state and no timer will ever wake it up. Use mdelay to avoid this. I was not
-able to understand the reasoning of sleeping after enabling the clock. So we
-might just remove the msleep/mdelay at all and be fine.
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- drivers/input/touchscreen/s3c2410_ts.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
-index 68071c2..6d395ca 100644
---- a/drivers/input/touchscreen/s3c2410_ts.c
-+++ b/drivers/input/touchscreen/s3c2410_ts.c
-@@ -356,7 +356,7 @@ static int s3c2410ts_resume(struct platform_device *pdev)
-               ( struct s3c2410_ts_mach_info *)pdev->dev.platform_data;
-       clk_enable(adc_clock);
--      msleep(1);
-+      mdelay(1);
-       enable_irq(IRQ_ADC);
-       enable_irq(IRQ_TC);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1160-fix-motion-sensor-corruption.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1160-fix-motion-sensor-corruption.patch.patch
deleted file mode 100644 (file)
index 57d61df..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-From e93ec75e2a9c85e5a92af9e1b754fa711bd864b6 Mon Sep 17 00:00:00 2001
-From: Andy Green <agreen@localhost.localdomain>
-Date: Thu, 15 May 2008 21:47:56 +0100
-Subject: [PATCH] fix-motion-sensor-corruption.patch
-
----
- arch/arm/mach-s3c2440/mach-gta02.c |   35 ++++++++++++++++++++++++++++++++---
- 1 files changed, 32 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index e1984a9..9e8fae7 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -905,31 +905,58 @@ static struct platform_device gta02_vibrator_dev = {
- /* #define DEBUG_SPEW_MS */
- #define MG_PER_SAMPLE 18
-+struct lis302dl_platform_data lis302_pdata[];
-+
- void gat02_lis302dl_bitbang_read(struct lis302dl_info *lis)
- {
-       struct lis302dl_platform_data *pdata = lis->pdata;
-       u8 shifter = 0xc0 | LIS302DL_REG_OUT_X; /* read, autoincrement */
-       int n, n1;
-+      unsigned long other_cs;
-       unsigned long flags;
- #ifdef DEBUG_SPEW_MS
-       s8 x, y, z;
- #endif
--      spin_lock_irqsave(&motion_irq_lock, flags);
-+      local_save_flags(flags);
-+
-+      /*
-+       * Huh.. "quirk"... CS on this device is not really "CS" like you can
-+       * expect.  Instead when 1 it selects I2C interface mode.  Because we
-+       * have 2 devices on one interface, the "disabled" device when we talk
-+       * to an "enabled" device sees the clocks as I2C clocks, creating
-+       * havoc.
-+       * I2C sees MOSI going LOW while CLK HIGH as a START action, we must
-+       * ensure this is never issued.
-+       */
-+
-+      if (&lis302_pdata[0] == pdata)
-+              other_cs = lis302_pdata[1].pin_chip_select;
-+      else
-+              other_cs = lis302_pdata[0].pin_chip_select;
-+
-+      s3c2410_gpio_setpin(other_cs, 1);
-+      s3c2410_gpio_setpin(pdata->pin_chip_select, 1);
-+      s3c2410_gpio_setpin(pdata->pin_clk, 1);
-       s3c2410_gpio_setpin(pdata->pin_chip_select, 0);
-       for (n = 0; n < 8; n++) { /* write the r/w, inc and address */
-               s3c2410_gpio_setpin(pdata->pin_clk, 0);
-               s3c2410_gpio_setpin(pdata->pin_mosi, (shifter >> 7) & 1);
-+              s3c2410_gpio_setpin(pdata->pin_clk, 0);
-+              s3c2410_gpio_setpin(pdata->pin_clk, 1);
-               s3c2410_gpio_setpin(pdata->pin_clk, 1);
-               shifter <<= 1;
-       }
-+
-       for (n = 0; n < 5; n++) { /* 5 consequetive registers */
-               for (n1 = 0; n1 < 8; n1++) { /* 8 bits each */
-                       s3c2410_gpio_setpin(pdata->pin_clk, 0);
--                      s3c2410_gpio_setpin(pdata->pin_clk, 1);
-+                      s3c2410_gpio_setpin(pdata->pin_clk, 0);
-                       shifter <<= 1;
-                       if (s3c2410_gpio_getpin(pdata->pin_miso))
-                               shifter |= 1;
-+                      s3c2410_gpio_setpin(pdata->pin_clk, 1);
-+                      s3c2410_gpio_setpin(pdata->pin_clk, 1);
-               }
-               switch (n) {
-               case 0:
-@@ -953,7 +980,9 @@ void gat02_lis302dl_bitbang_read(struct lis302dl_info *lis)
-               }
-       }
-       s3c2410_gpio_setpin(pdata->pin_chip_select, 1);
--      spin_unlock_irqrestore(&motion_irq_lock, flags);
-+      s3c2410_gpio_setpin(other_cs, 1);
-+      local_irq_restore(flags);
-+
-       input_sync(lis->input_dev);
- #ifdef DEBUG_SPEW_MS
-       printk("%s: %d %d %d\n", pdata->name, x, y, z);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1161-add-resume-reason-sysfs.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1161-add-resume-reason-sysfs.patch.patch
deleted file mode 100644 (file)
index 9a6f783..0000000
+++ /dev/null
@@ -1,384 +0,0 @@
-From 595053e2185b896afe50af6bb48c082e3adcdd31 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Mon, 26 May 2008 12:39:29 +0100
-Subject: [PATCH] add-resume-reason-sysfs.patch
-
-If you have U-Boot with uboot-add-find-wake-reason.patch, this
-patch will get you a wake reason report from
-
-cat /sys/devices/platform/neo1973-resume.0/resume_reason
-
-it looks like this:
-
-  EINT00_ACCEL1
-  EINT01_GSM
-  EINT02_BLUETOOTH
-  EINT03_DEBUGBRD
-  EINT04_JACK
-  EINT05_WLAN
-  EINT06_AUXKEY
-  EINT07_HOLDKEY
-  EINT08_ACCEL2
-* EINT09_PMU
-    adpins
-    adprem
-    usbins
-    usbrem
-    rtcalarm
-    second
-    onkeyr
-    onkeyf
-    exton1r
-    exton1f
-    exton2r
-    exton2f
-    exton3r
-    exton3f
-  * batfull
-    chghalt
-    thlimon
-    thlimoff
-    usblimon
-    usblimoff
-    adcrdy
-    onkey1s
-    lowsys
-    lowbat
-    hightmp
-    autopwrfail
-    dwn1pwrfail
-    dwn2pwrfail
-    ledpwrfail
-    ledovp
-    ldo1pwrfail
-    ldo2pwrfail
-    ldo3pwrfail
-    ldo4pwrfail
-    ldo5pwrfail
-    ldo6pwrfail
-    hcidopwrfail
-    hcidoovl
-  EINT10_NULL
-  EINT11_NULL
-  EINT12_GLAMO
-  EINT13_NULL
-  EINT14_NULL
-  EINT15_NULL
-
-This shows a problem, false wake from suspend due to battery full
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c               |    5 +
- arch/arm/plat-s3c24xx/Makefile                   |    4 +-
- arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c |  134 ++++++++++++++++++++++
- drivers/i2c/chips/pcf50633.c                     |   80 +++++++++++++
- include/linux/pcf50633.h                         |    4 +
- 5 files changed, 225 insertions(+), 2 deletions(-)
- create mode 100644 arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 9e8fae7..90b62c1 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -378,6 +378,10 @@ struct platform_device gta02_version_device = {
-       .num_resources  = 0,
- };
-+struct platform_device gta02_resume_reason_device = {
-+      .name           = "neo1973-resume",
-+      .num_resources  = 0,
-+};
- static struct map_desc gta02_iodesc[] __initdata = {
-       {
-@@ -737,6 +741,7 @@ static struct platform_device *gta02_devices[] __initdata = {
-       &gta02_nor_flash,
-       &sc32440_fiq_device,
-       &gta02_version_device,
-+      &gta02_resume_reason_device,
-       &s3c24xx_pwm_device,
- };
-diff --git a/arch/arm/plat-s3c24xx/Makefile b/arch/arm/plat-s3c24xx/Makefile
-index 0efcc15..21f5159 100644
---- a/arch/arm/plat-s3c24xx/Makefile
-+++ b/arch/arm/plat-s3c24xx/Makefile
-@@ -33,5 +33,5 @@ obj-$(CONFIG_MACH_NEO1973)   += neo1973_version.o \
-                                  neo1973_pm_gsm.o \
-                                  neo1973_pm_gps.o \
-                                  neo1973_pm_bt.o  \
--                                 neo1973_shadow.o
--
-+                                 neo1973_shadow.o \
-+                                 neo1973_pm_resume_reason.o
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c b/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c
-new file mode 100644
-index 0000000..cca42dc
---- /dev/null
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c
-@@ -0,0 +1,134 @@
-+/*
-+ * Resume reason sysfs for the FIC Neo1973 GSM Phone
-+ *
-+ * (C) 2008 by Openmoko Inc.
-+ * Author: Andy Green <andy@openmoko.com>
-+ * 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 resume_reason 2 as
-+ * published by the Free Software Foundation
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+#include <linux/io.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/mach-types.h>
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+#include <asm/arch/gta02.h>
-+#include <linux/pcf50633.h>
-+
-+
-+static unsigned int *gstatus4_mapped;
-+static char *resume_reasons[] = {
-+      "EINT00_ACCEL1",
-+      "EINT01_GSM",
-+      "EINT02_BLUETOOTH",
-+      "EINT03_DEBUGBRD",
-+      "EINT04_JACK",
-+      "EINT05_WLAN",
-+      "EINT06_AUXKEY",
-+      "EINT07_HOLDKEY",
-+      "EINT08_ACCEL2",
-+      "EINT09_PMU",
-+      "EINT10_NULL",
-+      "EINT11_NULL",
-+      "EINT12_GLAMO",
-+      "EINT13_NULL",
-+      "EINT14_NULL",
-+      "EINT15_NULL",
-+      NULL
-+};
-+
-+static ssize_t resume_reason_read(struct device *dev,
-+                                struct device_attribute *attr,
-+                                char *buf)
-+{
-+      int bit = 0;
-+      char *end = buf;
-+
-+      for (bit = 0; resume_reasons[bit]; bit++) {
-+              if ((*gstatus4_mapped) & (1 << bit))
-+                      end += sprintf(end, "* %s\n", resume_reasons[bit]);
-+              else
-+                      end += sprintf(end, "  %s\n", resume_reasons[bit]);
-+
-+              if (bit == 9) /* PMU */
-+                      end += pcf50633_report_resumers(pcf50633_global, end);
-+      }
-+
-+      return end - buf;
-+}
-+
-+
-+static DEVICE_ATTR(resume_reason, 0644, resume_reason_read, NULL);
-+
-+static struct attribute *neo1973_resume_reason_sysfs_entries[] = {
-+      &dev_attr_resume_reason.attr,
-+      NULL
-+};
-+
-+static struct attribute_group neo1973_resume_reason_attr_group = {
-+      .name   = NULL,
-+      .attrs  = neo1973_resume_reason_sysfs_entries,
-+};
-+
-+static int __init neo1973_resume_reason_probe(struct platform_device *pdev)
-+{
-+      dev_info(&pdev->dev, "starting\n");
-+
-+      switch (machine_arch_type) {
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+      case MACH_TYPE_NEO1973_GTA01:
-+              return -EINVAL;
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+      default:
-+              gstatus4_mapped = ioremap(0x560000BC, 0x4);
-+              if (!gstatus4_mapped) {
-+                      dev_err(&pdev->dev, "failed to ioremap() memory region\n");
-+                      return -EINVAL;
-+              }
-+              break;
-+      }
-+
-+      return sysfs_create_group(&pdev->dev.kobj, &neo1973_resume_reason_attr_group);
-+}
-+
-+static int neo1973_resume_reason_remove(struct platform_device *pdev)
-+{
-+      sysfs_remove_group(&pdev->dev.kobj, &neo1973_resume_reason_attr_group);
-+      iounmap(gstatus4_mapped);
-+      return 0;
-+}
-+
-+static struct platform_driver neo1973_resume_reason_driver = {
-+      .probe          = neo1973_resume_reason_probe,
-+      .remove         = neo1973_resume_reason_remove,
-+      .driver         = {
-+              .name           = "neo1973-resume",
-+      },
-+};
-+
-+static int __devinit neo1973_resume_reason_init(void)
-+{
-+      return platform_driver_register(&neo1973_resume_reason_driver);
-+}
-+
-+static void neo1973_resume_reason_exit(void)
-+{
-+      platform_driver_unregister(&neo1973_resume_reason_driver);
-+}
-+
-+module_init(neo1973_resume_reason_init);
-+module_exit(neo1973_resume_reason_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
-+MODULE_DESCRIPTION("Neo1973 resume_reason");
-+#endif
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index e3f0271..6d07aa5 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -120,6 +120,8 @@ struct pcf50633_data {
-       int allow_close;
-       int onkey_seconds;
-       int irq;
-+      int have_been_suspended;
-+      unsigned char pcfirq_resume[5];
-       int coldplug_done; /* cleared by probe, set by first work service */
-       int flag_bat_voltage_read; /* ipc to /sys batt voltage read func */
-@@ -597,6 +599,17 @@ static void pcf50633_work(struct work_struct *work)
-               return;
-       }
-+      /* hey did we just resume? */
-+
-+      if (pcf->have_been_suspended) {
-+              pcf->have_been_suspended = 0;
-+              /*
-+               * grab a copy of resume interrupt reasons
-+               * from pcf50633 POV
-+               */
-+              memcpy(pcf->pcfirq_resume, pcfirq, sizeof(pcf->pcfirq_resume));
-+      }
-+
-       if (!pcf->coldplug_done) {
-               DEBUGP("PMU Coldplug init\n");
-@@ -1866,6 +1879,71 @@ static int pcf50633_detach_client(struct i2c_client *client)
-       return 0;
- }
-+/* you're going to need >300 bytes in buf */
-+
-+int pcf50633_report_resumers(struct pcf50633_data *pcf, char *buf)
-+{
-+      static char *int_names[] = {
-+              "adpins",
-+              "adprem",
-+              "usbins",
-+              "usbrem",
-+              NULL,
-+              NULL,
-+              "rtcalarm",
-+              "second",
-+
-+              "onkeyr",
-+              "onkeyf",
-+              "exton1r",
-+              "exton1f",
-+              "exton2r",
-+              "exton2f",
-+              "exton3r",
-+              "exton3f",
-+
-+              "batfull",
-+              "chghalt",
-+              "thlimon",
-+              "thlimoff",
-+              "usblimon",
-+              "usblimoff",
-+              "adcrdy",
-+              "onkey1s",
-+
-+              "lowsys",
-+              "lowbat",
-+              "hightmp",
-+              "autopwrfail",
-+              "dwn1pwrfail",
-+              "dwn2pwrfail",
-+              "ledpwrfail",
-+              "ledovp",
-+
-+              "ldo1pwrfail",
-+              "ldo2pwrfail",
-+              "ldo3pwrfail",
-+              "ldo4pwrfail",
-+              "ldo5pwrfail",
-+              "ldo6pwrfail",
-+              "hcidopwrfail",
-+              "hcidoovl"
-+      };
-+      char *end = buf;
-+      int n;
-+
-+      for (n = 0; n < 40; n++)
-+              if (int_names[n]) {
-+                      if (pcf->pcfirq_resume[n >> 3] & (1 >> (n & 7)))
-+                              end += sprintf(end, "  * %s\n", int_names[n]);
-+                      else
-+                              end += sprintf(end, "    %s\n", int_names[n]);
-+              }
-+      
-+      return end - buf;
-+}
-+
-+
- #ifdef CONFIG_PM
- #define INT1M_RESUMERS        (PCF50633_INT1_ADPINS           | \
-                        PCF50633_INT1_ADPREM           | \
-@@ -1948,6 +2026,8 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       __reg_write(pcf, PCF50633_REG_INT4M, ~INT4M_RESUMERS & 0xff);
-       __reg_write(pcf, PCF50633_REG_INT5M, ~INT5M_RESUMERS & 0xff);
-+      pcf->have_been_suspended = 1;
-+
-       mutex_unlock(&pcf->lock);
-       return 0;
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index 05b55f3..be3957f 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -67,6 +67,10 @@ pcf50633_backlight_resume(struct pcf50633_data *pcf);
- extern u_int16_t
- pcf50633_battvolt(struct pcf50633_data *pcf);
-+extern int
-+pcf50633_report_resumers(struct pcf50633_data *pcf, char *buf);
-+
-+
- #define PCF50633_FEAT_EXTON   0x00000001      /* not yet supported */
- #define PCF50633_FEAT_MBC     0x00000002
- #define PCF50633_FEAT_BBC     0x00000004      /* not yet supported */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1162-fix-reduce-wake-reasons-in-pcf50633.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1162-fix-reduce-wake-reasons-in-pcf50633.patch.patch
deleted file mode 100644 (file)
index d9b8468..0000000
+++ /dev/null
@@ -1,237 +0,0 @@
-From 57351c5a1f03e9ae884b094ddbde27b1ad6ed8e0 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Mon, 26 May 2008 12:39:29 +0100
-Subject: [PATCH] fix-reduce-wake-reasons-in-pcf50633.patch
-
-Currently we are willing to wake from sleep from
-pcf50633 interrupts we don't actually do anything about
-even when we wake (somewhat puzzled).
-
-Let's disable some of these wake sources.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   20 +++++++++++++
- drivers/i2c/chips/pcf50633.c       |   28 ++++--------------
- drivers/i2c/chips/pcf50633.h       |   53 ----------------------------------
- include/linux/pcf50633.h           |   56 ++++++++++++++++++++++++++++++++++++
- 4 files changed, 82 insertions(+), 75 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 90b62c1..601f7bc 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -462,6 +462,26 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-       .r_fix_batt     = 10000,
-       .r_fix_batt_par = 10000,
-       .r_sense_milli  = 220,
-+      .resumers = {
-+              [0] = /* PCF50633_INT1_ADPINS   | */
-+                /* PCF50633_INT1_ADPREM       | */
-+                PCF50633_INT1_USBINS          |
-+                PCF50633_INT1_USBREM          |
-+                PCF50633_INT1_ALARM,
-+              [1] = PCF50633_INT2_ONKEYF,
-+              [2] =  /* PCF50633_INT3_BATFULL | */
-+                /* PCF50633_INT3_CHGHALT      | */
-+                /* PCF50633_INT3_THLIMON      | */
-+                /* PCF50633_INT3_THLIMOFF     | */
-+                /* PCF50633_INT3_USBLIMON     | */
-+                /* PCF50633_INT3_USBLIMOFF    | */
-+                PCF50633_INT3_ONKEY1S ,
-+              [3] = 0                         /* |
-+                   PCF50633_INT4_LOWSYS       | */
-+                /* PCF50633_INT4_LOWBAT       | */
-+                /* PCF50633_INT4_HIGHTMP */,
-+              [4] = 0
-+      },
-       .rails  = {
-               [PCF50633_REGULATOR_AUTO] = {
-                       .name           = "io_3v3",
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 6d07aa5..2878baa 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1945,23 +1945,7 @@ int pcf50633_report_resumers(struct pcf50633_data *pcf, char *buf)
- #ifdef CONFIG_PM
--#define INT1M_RESUMERS        (PCF50633_INT1_ADPINS           | \
--                       PCF50633_INT1_ADPREM           | \
--                       PCF50633_INT1_USBINS           | \
--                       PCF50633_INT1_USBREM           | \
--                       PCF50633_INT1_ALARM)
--#define INT2M_RESUMERS        (PCF50633_INT2_ONKEYF)
--#define INT3M_RESUMERS        (PCF50633_INT3_BATFULL          | \
--                       PCF50633_INT3_CHGHALT          | \
--                       PCF50633_INT3_THLIMON          | \
--                       PCF50633_INT3_THLIMOFF         | \
--                       PCF50633_INT3_USBLIMON         | \
--                       PCF50633_INT3_USBLIMOFF        | \
--                       PCF50633_INT3_ONKEY1S)
--#define INT4M_RESUMERS        (PCF50633_INT4_LOWSYS           | \
--                       PCF50633_INT4_LOWBAT           | \
--                       PCF50633_INT4_HIGHTMP)
--#define INT5M_RESUMERS        (0)
-+
- static int pcf50633_suspend(struct device *dev, pm_message_t state)
- {
-@@ -2020,11 +2004,11 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       pcf->standby_regs.int3m = __reg_read(pcf, PCF50633_REG_INT3M);
-       pcf->standby_regs.int4m = __reg_read(pcf, PCF50633_REG_INT4M);
-       pcf->standby_regs.int5m = __reg_read(pcf, PCF50633_REG_INT5M);
--      __reg_write(pcf, PCF50633_REG_INT1M, ~INT1M_RESUMERS & 0xff);
--      __reg_write(pcf, PCF50633_REG_INT2M, ~INT2M_RESUMERS & 0xff);
--      __reg_write(pcf, PCF50633_REG_INT3M, ~INT3M_RESUMERS & 0xff);
--      __reg_write(pcf, PCF50633_REG_INT4M, ~INT4M_RESUMERS & 0xff);
--      __reg_write(pcf, PCF50633_REG_INT5M, ~INT5M_RESUMERS & 0xff);
-+      __reg_write(pcf, PCF50633_REG_INT1M, ~pcf->pdata->resumers[0]);
-+      __reg_write(pcf, PCF50633_REG_INT2M, ~pcf->pdata->resumers[1]);
-+      __reg_write(pcf, PCF50633_REG_INT3M, ~pcf->pdata->resumers[2]);
-+      __reg_write(pcf, PCF50633_REG_INT4M, ~pcf->pdata->resumers[3]);
-+      __reg_write(pcf, PCF50633_REG_INT5M, ~pcf->pdata->resumers[4]);
-       pcf->have_been_suspended = 1;
-diff --git a/drivers/i2c/chips/pcf50633.h b/drivers/i2c/chips/pcf50633.h
-index 93dfd99..5d54131 100644
---- a/drivers/i2c/chips/pcf50633.h
-+++ b/drivers/i2c/chips/pcf50633.h
-@@ -125,59 +125,6 @@ enum pfc50633_regs {
-       __NUM_PCF50633_REGS
- };
--enum pcf50633_reg_int1 {
--      PCF50633_INT1_ADPINS    = 0x01, /* Adapter inserted */
--      PCF50633_INT1_ADPREM    = 0x02, /* Adapter removed */
--      PCF50633_INT1_USBINS    = 0x04, /* USB inserted */
--      PCF50633_INT1_USBREM    = 0x08, /* USB removed */
--      /* reserved */
--      PCF50633_INT1_ALARM     = 0x40, /* RTC alarm time is reached */
--      PCF50633_INT1_SECOND    = 0x80, /* RTC periodic second interrupt */
--};
--
--enum pcf50633_reg_int2 {
--      PCF50633_INT2_ONKEYR    = 0x01, /* ONKEY rising edge */
--      PCF50633_INT2_ONKEYF    = 0x02, /* ONKEY falling edge */
--      PCF50633_INT2_EXTON1R   = 0x04, /* EXTON1 rising edge */
--      PCF50633_INT2_EXTON1F   = 0x08, /* EXTON1 falling edge */
--      PCF50633_INT2_EXTON2R   = 0x10, /* EXTON2 rising edge */
--      PCF50633_INT2_EXTON2F   = 0x20, /* EXTON2 falling edge */
--      PCF50633_INT2_EXTON3R   = 0x40, /* EXTON3 rising edge */
--      PCF50633_INT2_EXTON3F   = 0x80, /* EXTON3 falling edge */
--};
--
--enum pcf50633_reg_int3 {
--      PCF50633_INT3_BATFULL   = 0x01, /* Battery full */
--      PCF50633_INT3_CHGHALT   = 0x02, /* Charger halt */
--      PCF50633_INT3_THLIMON   = 0x04,
--      PCF50633_INT3_THLIMOFF  = 0x08,
--      PCF50633_INT3_USBLIMON  = 0x10,
--      PCF50633_INT3_USBLIMOFF = 0x20,
--      PCF50633_INT3_ADCRDY    = 0x40, /* ADC conversion finished */
--      PCF50633_INT3_ONKEY1S   = 0x80, /* ONKEY pressed 1 second */
--};
--
--enum pcf50633_reg_int4 {
--      PCF50633_INT4_LOWSYS            = 0x01,
--      PCF50633_INT4_LOWBAT            = 0x02,
--      PCF50633_INT4_HIGHTMP           = 0x04,
--      PCF50633_INT4_AUTOPWRFAIL       = 0x08,
--      PCF50633_INT4_DWN1PWRFAIL       = 0x10,
--      PCF50633_INT4_DWN2PWRFAIL       = 0x20,
--      PCF50633_INT4_LEDPWRFAIL        = 0x40,
--      PCF50633_INT4_LEDOVP            = 0x80,
--};
--
--enum pcf50633_reg_int5 {
--      PCF50633_INT5_LDO1PWRFAIL       = 0x01,
--      PCF50633_INT5_LDO2PWRFAIL       = 0x02,
--      PCF50633_INT5_LDO3PWRFAIL       = 0x04,
--      PCF50633_INT5_LDO4PWRFAIL       = 0x08,
--      PCF50633_INT5_LDO5PWRFAIL       = 0x10,
--      PCF50633_INT5_LDO6PWRFAIL       = 0x20,
--      PCF50633_INT5_HCLDOPWRFAIL      = 0x40,
--      PCF50633_INT5_HCLDOOVL          = 0x80,
--};
- enum pcf50633_reg_oocshdwn {
-       PCF50633_OOCSHDWN_GOSTDBY       = 0x01,
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index be3957f..837037e 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -20,6 +20,60 @@ enum pcf50633_regulator_id {
-       __NUM_PCF50633_REGULATORS
- };
-+enum pcf50633_reg_int1 {
-+      PCF50633_INT1_ADPINS    = 0x01, /* Adapter inserted */
-+      PCF50633_INT1_ADPREM    = 0x02, /* Adapter removed */
-+      PCF50633_INT1_USBINS    = 0x04, /* USB inserted */
-+      PCF50633_INT1_USBREM    = 0x08, /* USB removed */
-+      /* reserved */
-+      PCF50633_INT1_ALARM     = 0x40, /* RTC alarm time is reached */
-+      PCF50633_INT1_SECOND    = 0x80, /* RTC periodic second interrupt */
-+};
-+
-+enum pcf50633_reg_int2 {
-+      PCF50633_INT2_ONKEYR    = 0x01, /* ONKEY rising edge */
-+      PCF50633_INT2_ONKEYF    = 0x02, /* ONKEY falling edge */
-+      PCF50633_INT2_EXTON1R   = 0x04, /* EXTON1 rising edge */
-+      PCF50633_INT2_EXTON1F   = 0x08, /* EXTON1 falling edge */
-+      PCF50633_INT2_EXTON2R   = 0x10, /* EXTON2 rising edge */
-+      PCF50633_INT2_EXTON2F   = 0x20, /* EXTON2 falling edge */
-+      PCF50633_INT2_EXTON3R   = 0x40, /* EXTON3 rising edge */
-+      PCF50633_INT2_EXTON3F   = 0x80, /* EXTON3 falling edge */
-+};
-+
-+enum pcf50633_reg_int3 {
-+      PCF50633_INT3_BATFULL   = 0x01, /* Battery full */
-+      PCF50633_INT3_CHGHALT   = 0x02, /* Charger halt */
-+      PCF50633_INT3_THLIMON   = 0x04,
-+      PCF50633_INT3_THLIMOFF  = 0x08,
-+      PCF50633_INT3_USBLIMON  = 0x10,
-+      PCF50633_INT3_USBLIMOFF = 0x20,
-+      PCF50633_INT3_ADCRDY    = 0x40, /* ADC conversion finished */
-+      PCF50633_INT3_ONKEY1S   = 0x80, /* ONKEY pressed 1 second */
-+};
-+
-+enum pcf50633_reg_int4 {
-+      PCF50633_INT4_LOWSYS            = 0x01,
-+      PCF50633_INT4_LOWBAT            = 0x02,
-+      PCF50633_INT4_HIGHTMP           = 0x04,
-+      PCF50633_INT4_AUTOPWRFAIL       = 0x08,
-+      PCF50633_INT4_DWN1PWRFAIL       = 0x10,
-+      PCF50633_INT4_DWN2PWRFAIL       = 0x20,
-+      PCF50633_INT4_LEDPWRFAIL        = 0x40,
-+      PCF50633_INT4_LEDOVP            = 0x80,
-+};
-+
-+enum pcf50633_reg_int5 {
-+      PCF50633_INT5_LDO1PWRFAIL       = 0x01,
-+      PCF50633_INT5_LDO2PWRFAIL       = 0x02,
-+      PCF50633_INT5_LDO3PWRFAIL       = 0x04,
-+      PCF50633_INT5_LDO4PWRFAIL       = 0x08,
-+      PCF50633_INT5_LDO5PWRFAIL       = 0x10,
-+      PCF50633_INT5_LDO6PWRFAIL       = 0x20,
-+      PCF50633_INT5_HCLDOPWRFAIL      = 0x40,
-+      PCF50633_INT5_HCLDOOVL          = 0x80,
-+};
-+
- struct pcf50633_data;
- extern struct pcf50633_data *pcf50633_global;
-@@ -95,6 +149,8 @@ struct pcf50633_platform_data {
-       unsigned int r_fix_batt_par;
-       unsigned int r_sense_milli;
-+      unsigned char resumers[5];
-+
-       struct {
-               u_int8_t mbcc3; /* charger voltage / current */
-       } charger;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1163-Fix-possible-null-pointer-dereference-in-s3c24xx_i2c.patch b/target/linux/s3c24xx/patches-2.6.24/1163-Fix-possible-null-pointer-dereference-in-s3c24xx_i2c.patch
deleted file mode 100644 (file)
index 8161aae..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7d34adf0df1f105c73c6ecdee50a7ad6a6dbfd2b Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Tue, 3 Jun 2008 10:46:48 +0100
-Subject: [PATCH] Fix possible null pointer dereference in s3c24xx_i2c_resume
-
-From 0b9bae6aed5268707b348e48a01411ba420844e1 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Tue, 27 May 2008 14:41:35 +0200
-Subject: [PATCH] [janitor] Fix possible null pointer dereference
-     Judging by the control flow of the resume method i2c->suspended++ could
-     lead to a null pointer dereference.
----
- drivers/i2c/busses/i2c-s3c2410.c |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
-index 5ac8309..bd69127 100644
---- a/drivers/i2c/busses/i2c-s3c2410.c
-+++ b/drivers/i2c/busses/i2c-s3c2410.c
-@@ -919,10 +919,10 @@ static int s3c24xx_i2c_resume(struct platform_device *dev)
- {
-       struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);
--      if (i2c != NULL)
-+      if (i2c != NULL) {
-               s3c24xx_i2c_init(i2c);
--
--      i2c->suspended--;
-+              i2c->suspended--;
-+      }
-       return 0;
- }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1164-Make-ar6k-not-print-soooo-much-to-my-console.patch b/target/linux/s3c24xx/patches-2.6.24/1164-Make-ar6k-not-print-soooo-much-to-my-console.patch
deleted file mode 100644 (file)
index aa32339..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From de09d927ffcba8c9fc77608f0e71f889287580a1 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Tue, 3 Jun 2008 10:46:59 +0100
-Subject: [PATCH] Make ar6k not print soooo much to my console
-
-From 4cb4c308fde9c1f3598046ff98191d14b62bc609 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Thu, 29 May 2008 00:09:32 +0200
-Subject: [PATCH] [ar6k] silent++, removing -DDEBUG from the Makefile does not
-work
----
- .../sdio/function/wlan/ar6000/ar6000/ar6000_drv.c  |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-index d35f31c..a854c7c 100644
---- a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-@@ -2422,7 +2422,7 @@ ar6000_targetStats_event(AR_SOFTC_T *ar,  WMI_TARGET_STATS *pTarget)
-     TARGET_STATS *pStats = &ar->arTargetStats;
-     A_UINT8 ac;
--    A_PRINTF("AR6000 updating target stats\n");
-+    /*A_PRINTF("AR6000 updating target stats\n");*/
-     pStats->tx_packets          += pTarget->txrxStats.tx_stats.tx_packets;
-     pStats->tx_bytes            += pTarget->txrxStats.tx_stats.tx_bytes;
-     pStats->tx_unicast_pkts     += pTarget->txrxStats.tx_stats.tx_unicast_pkts;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1165-Remove-GTA01-PM-debug.patch b/target/linux/s3c24xx/patches-2.6.24/1165-Remove-GTA01-PM-debug.patch
deleted file mode 100644 (file)
index 599db07..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From 421ed0bdd5b468d9de3ba571f49e7b840a8032e3 Mon Sep 17 00:00:00 2001
-From: No Attribution <dunno@dunno.org>
-Date: Tue, 3 Jun 2008 10:49:55 +0100
-Subject: [PATCH] Remove GTA01 PM debug
-
----
- defconfig-gta01 |    6 ++----
- 1 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/defconfig-gta01 b/defconfig-gta01
-index f574da5..ab84e8b 100644
---- a/defconfig-gta01
-+++ b/defconfig-gta01
-@@ -159,7 +159,7 @@ CONFIG_CPU_LLSERIAL_S3C2440=y
- #
- # Power management
- #
--CONFIG_S3C2410_PM_DEBUG=y
-+# CONFIG_S3C2410_PM_DEBUG is not set
- # CONFIG_S3C2410_PM_CHECK is not set
- CONFIG_S3C_LOWLEVEL_UART_PORT=0
-@@ -1693,9 +1693,7 @@ CONFIG_FORCED_INLINING=y
- # CONFIG_SAMPLES is not set
- # CONFIG_DEBUG_USER is not set
- CONFIG_DEBUG_ERRORS=y
--CONFIG_DEBUG_LL=y
--# CONFIG_DEBUG_ICEDCC is not set
--CONFIG_DEBUG_S3C_PORT=y
-+# CONFIG_DEBUG_LL is not set
- CONFIG_DEBUG_S3C_UART=0
- #
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1166-Subject-PATCH-a6k-Everyone-calls-SET_NET_DEV-an.patch b/target/linux/s3c24xx/patches-2.6.24/1166-Subject-PATCH-a6k-Everyone-calls-SET_NET_DEV-an.patch
deleted file mode 100644 (file)
index 5d5fbe9..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-From 9250c1fc7d6f62075d14ad8f396748490a55d61e Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Thu, 19 Jun 2008 22:13:31 +0100
-Subject: [PATCH] Subject: [PATCH] [a6k] Everyone calls SET_NET_DEV and hald needs that too,
- make it happy
-      Call SET_NET_DEV to set a parent device. All other net drivers
-      are doing this and hald needs a parent to add the network device.
-
----
- .../sdio/function/wlan/ar6000/ar6000/ar6000_drv.c  |    1 +
- drivers/sdio/function/wlan/ar6000/hif/hif.c        |    6 ++++++
- drivers/sdio/function/wlan/ar6000/include/hif.h    |    5 +++++
- 3 files changed, 12 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-index a854c7c..dacc00a 100644
---- a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-@@ -830,6 +830,7 @@ ar6000_avail_ev(HTC_HANDLE HTCHandle)
-         sizeof(WMI_DATA_HDR) + HTC_HEADER_LEN;
-     /* This runs the init function */
-+    SET_NETDEV_DEV(dev, HIFGetOSDevice(ar->arHifDevice));
-     if (register_netdev(dev)) {
-         AR_DEBUG_PRINTF("ar6000_avail: register_netdev failed\n");
-         ar6000_destroy(dev, 0);
-diff --git a/drivers/sdio/function/wlan/ar6000/hif/hif.c b/drivers/sdio/function/wlan/ar6000/hif/hif.c
-index f5a0986..3d6d792 100644
---- a/drivers/sdio/function/wlan/ar6000/hif/hif.c
-+++ b/drivers/sdio/function/wlan/ar6000/hif/hif.c
-@@ -779,6 +779,12 @@ delHifDevice(SDDEVICE *handle)
-     hifDevice[0].handle = NULL;
- }
-+struct device*
-+HIFGetOSDevice(HIF_DEVICE *device)
-+{
-+    return &device->handle->Device.dev;
-+}
-+
- static void ResetAllCards(void)
- {
-     UINT8       data;
-diff --git a/drivers/sdio/function/wlan/ar6000/include/hif.h b/drivers/sdio/function/wlan/ar6000/include/hif.h
-index f32388c..846a69f 100644
---- a/drivers/sdio/function/wlan/ar6000/include/hif.h
-+++ b/drivers/sdio/function/wlan/ar6000/include/hif.h
-@@ -284,6 +284,11 @@ HIFConfigureDevice(HIF_DEVICE *device, HIF_DEVICE_CONFIG_OPCODE opcode,
-                    void *config, A_UINT32 configLen);
-+struct device;
-+struct device*
-+HIFGetOSDevice(HIF_DEVICE *device);
-+
-+
- #ifdef __cplusplus
- }
- #endif
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1167-add-gta01-resume-sysfs.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1167-add-gta01-resume-sysfs.patch.patch
deleted file mode 100644 (file)
index 6232ae8..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-From 2a48642ac0347c70f105997392f50b1ce8df45a3 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:36:10 +0100
-Subject: [PATCH] add-gta01-resume-sysfs.patch
-
-Adds the somewhat simpler resume source support for GTA01
-since PMU is not a wake source
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c |   53 +++++++++++++--------
- 1 files changed, 33 insertions(+), 20 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c b/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c
-index cca42dc..145556b 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c
-@@ -23,10 +23,28 @@
- #ifdef CONFIG_MACH_NEO1973_GTA02
- #include <asm/arch/gta02.h>
- #include <linux/pcf50633.h>
--
-+#endif
- static unsigned int *gstatus4_mapped;
--static char *resume_reasons[] = {
-+static char *resume_reasons[][17] = { { /* GTA01 */
-+      "EINT00_NULL",
-+      "EINT01_GSM",
-+      "EINT02_NULL",
-+      "EINT03_NULL",
-+      "EINT04_JACK",
-+      "EINT05_SDCARD",
-+      "EINT06_AUXKEY",
-+      "EINT07_HOLDKEY",
-+      "EINT08_NULL",
-+      "EINT09_NULL",
-+      "EINT10_NULL",
-+      "EINT11_NULL",
-+      "EINT12_NULL",
-+      "EINT13_NULL",
-+      "EINT14_NULL",
-+      "EINT15_NULL",
-+      NULL
-+}, { /* GTA02 */
-       "EINT00_ACCEL1",
-       "EINT01_GSM",
-       "EINT02_BLUETOOTH",
-@@ -44,7 +62,7 @@ static char *resume_reasons[] = {
-       "EINT14_NULL",
-       "EINT15_NULL",
-       NULL
--};
-+} };
- static ssize_t resume_reason_read(struct device *dev,
-                                 struct device_attribute *attr,
-@@ -52,15 +70,18 @@ static ssize_t resume_reason_read(struct device *dev,
- {
-       int bit = 0;
-       char *end = buf;
-+      int gta = !!machine_is_neo1973_gta02();
--      for (bit = 0; resume_reasons[bit]; bit++) {
-+      for (bit = 0; resume_reasons[gta][bit]; bit++) {
-               if ((*gstatus4_mapped) & (1 << bit))
--                      end += sprintf(end, "* %s\n", resume_reasons[bit]);
-+                      end += sprintf(end, "* %s\n", resume_reasons[gta][bit]);
-               else
--                      end += sprintf(end, "  %s\n", resume_reasons[bit]);
-+                      end += sprintf(end, "  %s\n", resume_reasons[gta][bit]);
--              if (bit == 9) /* PMU */
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+              if ((gta) && (bit == 9)) /* PMU */
-                       end += pcf50633_report_resumers(pcf50633_global, end);
-+#endif
-       }
-       return end - buf;
-@@ -83,21 +104,14 @@ static int __init neo1973_resume_reason_probe(struct platform_device *pdev)
- {
-       dev_info(&pdev->dev, "starting\n");
--      switch (machine_arch_type) {
--#ifdef CONFIG_MACH_NEO1973_GTA01
--      case MACH_TYPE_NEO1973_GTA01:
-+      gstatus4_mapped = ioremap(0x560000BC /* GSTATUS4 */, 0x4);
-+      if (!gstatus4_mapped) {
-+              dev_err(&pdev->dev, "failed to ioremap() memory region\n");
-               return -EINVAL;
--#endif /* CONFIG_MACH_NEO1973_GTA01 */
--      default:
--              gstatus4_mapped = ioremap(0x560000BC, 0x4);
--              if (!gstatus4_mapped) {
--                      dev_err(&pdev->dev, "failed to ioremap() memory region\n");
--                      return -EINVAL;
--              }
--              break;
-       }
--      return sysfs_create_group(&pdev->dev.kobj, &neo1973_resume_reason_attr_group);
-+      return sysfs_create_group(&pdev->dev.kobj,
-+                                          &neo1973_resume_reason_attr_group);
- }
- static int neo1973_resume_reason_remove(struct platform_device *pdev)
-@@ -131,4 +145,3 @@ module_exit(neo1973_resume_reason_exit);
- MODULE_LICENSE("GPL");
- MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
- MODULE_DESCRIPTION("Neo1973 resume_reason");
--#endif
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1168-introduce-samsung-camera-unit-driver.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1168-introduce-samsung-camera-unit-driver.patch.patch
deleted file mode 100644 (file)
index cf93029..0000000
+++ /dev/null
@@ -1,5899 +0,0 @@
-From 8602650d636b32c01fd11337dffc1df310f024e6 Mon Sep 17 00:00:00 2001
-From: SW.LEE <hitchcar@samsung.com>
-Date: Wed, 2 Jul 2008 22:36:46 +0100
-Subject: [PATCH] introduce-samsung-camera-unit-driver.patch
-
-This is the kernel side of an old (2004) samsung camera driver for 2440
-It doesn't compile on modern kernel yet, this patch introduces it into the
-kernel tree without gross mods, so it is broken code we can start to work on
----
- arch/arm/mach-s3c2440/Kconfig               |    4 +-
- arch/arm/mach-s3c2440/Makefile              |   26 +-
- arch/arm/mach-s3c2440/camera/Kconfig        |    7 +
- arch/arm/mach-s3c2440/camera/Makefile       |    9 +
- arch/arm/mach-s3c2440/camera/bits.h         |   48 ++
- arch/arm/mach-s3c2440/camera/cam_reg.h      |  220 ++++++
- arch/arm/mach-s3c2440/camera/camif.c        |  978 +++++++++++++++++++++++++++
- arch/arm/mach-s3c2440/camera/camif.h        |  304 +++++++++
- arch/arm/mach-s3c2440/camera/camif_fsm.c    |  427 ++++++++++++
- arch/arm/mach-s3c2440/camera/imgsensor.c    |  255 +++++++
- arch/arm/mach-s3c2440/camera/miscdevice.h   |   18 +
- arch/arm/mach-s3c2440/camera/qt-driver.c    |  169 +++++
- arch/arm/mach-s3c2440/camera/qt.h           |   18 +
- arch/arm/mach-s3c2440/camera/s5x532.h       |  143 ++++
- arch/arm/mach-s3c2440/camera/s5x532_rev36.h |  208 ++++++
- arch/arm/mach-s3c2440/camera/sensor.h       |   20 +
- arch/arm/mach-s3c2440/camera/sxga.h         |  504 ++++++++++++++
- arch/arm/mach-s3c2440/camera/userapp.h      |   44 ++
- arch/arm/mach-s3c2440/camera/v4l2_api.c     |  311 +++++++++
- arch/arm/mach-s3c2440/camera/video-driver.c |  591 ++++++++++++++++
- arch/arm/mach-s3c2440/camera/videodev.c     |  342 ++++++++++
- arch/arm/mach-s3c2440/camera/videodev.h     |  110 +++
- arch/arm/mach-s3c2440/camera/videodev2.h    |  938 +++++++++++++++++++++++++
- 23 files changed, 5668 insertions(+), 26 deletions(-)
- create mode 100644 arch/arm/mach-s3c2440/camera/Kconfig
- create mode 100644 arch/arm/mach-s3c2440/camera/Makefile
- create mode 100644 arch/arm/mach-s3c2440/camera/bits.h
- create mode 100644 arch/arm/mach-s3c2440/camera/cam_reg.h
- create mode 100644 arch/arm/mach-s3c2440/camera/camif.c
- create mode 100644 arch/arm/mach-s3c2440/camera/camif.h
- create mode 100644 arch/arm/mach-s3c2440/camera/camif_fsm.c
- create mode 100644 arch/arm/mach-s3c2440/camera/imgsensor.c
- create mode 100644 arch/arm/mach-s3c2440/camera/miscdevice.h
- create mode 100644 arch/arm/mach-s3c2440/camera/qt-driver.c
- create mode 100644 arch/arm/mach-s3c2440/camera/qt.h
- create mode 100644 arch/arm/mach-s3c2440/camera/s5x532.h
- create mode 100644 arch/arm/mach-s3c2440/camera/s5x532_rev36.h
- create mode 100644 arch/arm/mach-s3c2440/camera/sensor.h
- create mode 100644 arch/arm/mach-s3c2440/camera/sxga.h
- create mode 100644 arch/arm/mach-s3c2440/camera/userapp.h
- create mode 100644 arch/arm/mach-s3c2440/camera/v4l2_api.c
- create mode 100644 arch/arm/mach-s3c2440/camera/video-driver.c
- create mode 100644 arch/arm/mach-s3c2440/camera/videodev.c
- create mode 100644 arch/arm/mach-s3c2440/camera/videodev.h
- create mode 100644 arch/arm/mach-s3c2440/camera/videodev2.h
-
-diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
-index c40aaca..c350511 100644
---- a/arch/arm/mach-s3c2440/Kconfig
-+++ b/arch/arm/mach-s3c2440/Kconfig
-@@ -30,6 +30,9 @@ config S3C2440_C_FIQ
-         Support for S3C2440 FIQ support in C -- see
-         ./arch/arm/macs3c2440/fiq_c_isr.c
-+source "arch/arm/mach-s3c2440/camera/Kconfig"
-+
-+
- menu "S3C2440 Machines"
- config MACH_ANUBIS
-@@ -99,4 +102,3 @@ config NEO1973_GTA02_2440
-          of the FIC/Openmoko Neo1973 GTA02 GSM Phone.
- endmenu
--
-diff --git a/arch/arm/mach-s3c2440/Makefile b/arch/arm/mach-s3c2440/Makefile
-index e3ca9e3..7112231 100644
---- a/arch/arm/mach-s3c2440/Makefile
-+++ b/arch/arm/mach-s3c2440/Makefile
-@@ -1,26 +1,2 @@
--# arch/arm/mach-s3c2440/Makefile
--#
--# Copyright 2007 Simtec Electronics
--#
--# Licensed under GPLv2
-+obj-y                           += camera/
--obj-y                         :=
--obj-m                         :=
--obj-n                         :=
--obj-                          :=
--
--obj-$(CONFIG_CPU_S3C2440)     += s3c2440.o dsc.o
--obj-$(CONFIG_CPU_S3C2440)     += irq.o
--obj-$(CONFIG_CPU_S3C2440)     += clock.o
--obj-$(CONFIG_S3C2440_DMA)     += dma.o
--obj-$(CONFIG_S3C2440_C_FIQ)   += fiq_c_isr.o
--
--# Machine support
--
--obj-$(CONFIG_MACH_ANUBIS)     += mach-anubis.o
--obj-$(CONFIG_MACH_OSIRIS)     += mach-osiris.o
--obj-$(CONFIG_MACH_RX3715)     += mach-rx3715.o
--obj-$(CONFIG_ARCH_S3C2440)    += mach-smdk2440.o
--obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
--obj-$(CONFIG_MACH_HXD8)               += mach-hxd8.o
--obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
-diff --git a/arch/arm/mach-s3c2440/camera/Kconfig b/arch/arm/mach-s3c2440/camera/Kconfig
-new file mode 100644
-index 0000000..36f127d
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/Kconfig
-@@ -0,0 +1,7 @@
-+
-+config S3C2440_CAMERA
-+      bool "S3C24xx Camera interface"
-+      depends on ARCH_S3C2410
-+      help
-+        Camera driver for S3C2440 camera unit
-+
-diff --git a/arch/arm/mach-s3c2440/camera/Makefile b/arch/arm/mach-s3c2440/camera/Makefile
-new file mode 100644
-index 0000000..a46d3be
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/Makefile
-@@ -0,0 +1,9 @@
-+obj-$(CONFIG_S3C2440_CAMERA) += \
-+      videodev.o \
-+      imgsensor.o \
-+      videodrv.o \
-+      video-driver.o \
-+      camif.o \
-+      camif_fsm.o \
-+      qt-driver.o
-+
-diff --git a/arch/arm/mach-s3c2440/camera/bits.h b/arch/arm/mach-s3c2440/camera/bits.h
-new file mode 100644
-index 0000000..8d83c2e
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/bits.h
-@@ -0,0 +1,48 @@
-+/*
-+ *  Copyright (C) Samsung Electroincs  2003
-+ *  Author: SW.LEE <hitchcar@samsung.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 __SW_BITS_H
-+#define __SW_BITS_H
-+
-+#define BIT0                            0x00000001
-+#define BIT1                            0x00000002
-+#define BIT2                            0x00000004
-+#define BIT3                            0x00000008
-+#define BIT4                            0x00000010
-+#define BIT5                            0x00000020
-+#define BIT6                            0x00000040
-+#define BIT7                            0x00000080
-+#define BIT8                            0x00000100
-+#define BIT9                            0x00000200
-+#define BIT10                           0x00000400
-+#define BIT11                           0x00000800
-+#define BIT12                           0x00001000
-+#define BIT13                           0x00002000
-+#define BIT14                           0x00004000
-+#define BIT15                           0x00008000
-+#define BIT16                           0x00010000
-+#define BIT17                           0x00020000
-+#define BIT18                           0x00040000
-+#define BIT19                           0x00080000
-+#define BIT20                           0x00100000
-+#define BIT21                           0x00200000
-+#define BIT22                           0x00400000
-+#define BIT23                           0x00800000
-+#define BIT24                           0x01000000
-+#define BIT25                           0x02000000
-+#define BIT26                           0x04000000
-+#define BIT27                           0x08000000
-+#define BIT28                           0x10000000
-+#define BIT29                           0x20000000
-+#define BIT30                           0x40000000
-+#define BIT31                           0x80000000
-+
-+#endif
-diff --git a/arch/arm/mach-s3c2440/camera/cam_reg.h b/arch/arm/mach-s3c2440/camera/cam_reg.h
-new file mode 100644
-index 0000000..7247a4e
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/cam_reg.h
-@@ -0,0 +1,220 @@
-+ /*----------------------------------------------------------
-+  *   (C) 2004 Samsung Electronics
-+  *   SW.LEE < hitchcar@samsung.com>
-+  * 
-+  ----------------------------------------------------------- */
-+
-+#ifndef __FIMC20_CAMERA_H__
-+#define __FIMC20_CAMERA_H__
-+
-+
-+#ifdef CONFIG_ARCH_S3C24A0
-+#define CAM_BASE_ADD             0x48000000
-+#else /* S3C2440A */
-+#define CAM_BASE_ADD             0x4F000000
-+#endif
-+
-+
-+/*
-+ * CAMERA IP
-+ * P-port is used as RGB Capturing device which including scale and crop 
-+ *  those who want to see(preview ) the image on display needs RGB image.
-+ *
-+ * C-port is used as YCbCr(4:2:0, 4:2:2) Capturing device which including the scale and crop
-+ *   the prefix of C-port have the meaning of "Codec" ex. mpeg4, h263.. which requries the
-+     YCBCB format not RGB 
-+ */ 
-+
-+#define CISRCFMT            __REG(CAM_BASE_ADD+0x00) // RW Input Source Format
-+#define CIWDOFST            __REG(CAM_BASE_ADD+0x04) // Window offset register
-+#define CIGCTRL             __REG(CAM_BASE_ADD+0x08) // Global control register
-+#define CICOYSA0            __REG(CAM_BASE_ADD+0x18) // Y 1 st frame start address 
-+#define CICOYSA1            __REG(CAM_BASE_ADD+0x1C) // Y 2 nd frame start address 
-+#define CICOYSA2            __REG(CAM_BASE_ADD+0x20) // Y 3 rd frame start address 
-+#define CICOYSA3            __REG(CAM_BASE_ADD+0x24) // Y 4 th frame start address 
-+#define CICOCBSA0           __REG(CAM_BASE_ADD+0x28) // Cb 1 st frame start address 
-+#define CICOCBSA1           __REG(CAM_BASE_ADD+0x2C) // Cb 2 nd frame start address 
-+#define CICOCBSA2           __REG(CAM_BASE_ADD+0x30) // Cb 3 rd frame start address 
-+#define CICOCBSA3           __REG(CAM_BASE_ADD+0x34) // Cb 4 th frame start address 
-+#define CICOCRSA0           __REG(CAM_BASE_ADD+0x38) // Cr 1 st frame start address 
-+#define CICOCRSA1           __REG(CAM_BASE_ADD+0x3C) // Cr 2 nd frame start address 
-+#define CICOCRSA2           __REG(CAM_BASE_ADD+0x40) // Cr 3 rd frame start address 
-+#define CICOCRSA3           __REG(CAM_BASE_ADD+0x44) // Cr 4 th frame start address 
-+#define CICOTRGFMT          __REG(CAM_BASE_ADD+0x48) // Target image format of codec
-+#define CICOCTRL            __REG(CAM_BASE_ADD+0x4C) // Codec DMA control related
-+#define CICOSCPRERATIO      __REG(CAM_BASE_ADD+0x50) // Codec pre-scaler ratio control
-+#define CICOSCPREDST        __REG(CAM_BASE_ADD+0x54) // Codec pre-scaler destination
-+#define CICOSCCTRL          __REG(CAM_BASE_ADD+0x58) // Codec main-scaler control
-+#define CICOTAREA           __REG(CAM_BASE_ADD+0x5C) // Codec pre-scaler destination
-+#define CICOSTATUS          __REG(CAM_BASE_ADD+0x64) // Codec path status
-+#define CIPRCLRSA0          __REG(CAM_BASE_ADD+0x6C) // RGB 1 st frame start address 
-+#define CIPRCLRSA1          __REG(CAM_BASE_ADD+0x70) // RGB 2 nd frame start address 
-+#define CIPRCLRSA2          __REG(CAM_BASE_ADD+0x74) // RGB 3 rd frame start address 
-+#define CIPRCLRSA3          __REG(CAM_BASE_ADD+0x78) // RGB 4 th frame start address 
-+#define CIPRTRGFMT          __REG(CAM_BASE_ADD+0x7C) // Target image format of preview
-+#define CIPRCTRL            __REG(CAM_BASE_ADD+0x80) // Preview DMA control related
-+#define CIPRSCPRERATIO      __REG(CAM_BASE_ADD+0x84) // Preview pre-scaler ratio control
-+#define CIPRSCPREDST        __REG(CAM_BASE_ADD+0x88) // Preview pre-scaler destination
-+#define CIPRSCCTRL          __REG(CAM_BASE_ADD+0x8C) // Preview main-scaler control
-+#define CIPRTAREA           __REG(CAM_BASE_ADD+0x90) // Preview pre-scaler destination
-+#define CIPRSTATUS          __REG(CAM_BASE_ADD+0x98) // Preview path status
-+#define CIIMGCPT            __REG(CAM_BASE_ADD+0xA0) // Image capture enable command
-+
-+#define CICOYSA(__x)        __REG(CAM_BASE_ADD+0x18 + (__x)*4 ) 
-+#define CICOCBSA(__x)       __REG(CAM_BASE_ADD+0x28 + (__x)*4 )
-+#define CICOCRSA(__x)       __REG(CAM_BASE_ADD+0x38 + (__x)*4 ) 
-+#define CIPRCLRSA(__x)      __REG(CAM_BASE_ADD+0x6C + (__x)*4 )
-+
-+/* CISRCFMT BitField */
-+#define SRCFMT_ITU601       BIT31
-+#define SRCFMT_ITU656       0
-+#define SRCFMT_UVOFFSET_128 BIT30
-+#define fCAM_SIZE_H         Fld(13, 16)
-+#define fCAM_SIZE_V         Fld(13, 0)
-+#define SOURCE_HSIZE(x)     FInsrt((x), fCAM_SIZE_H)
-+#define SOURCE_VSIZE(x)     FInsrt((x), fCAM_SIZE_V)
-+
-+
-+/* Window Option Register */
-+#define WINOFEN             BIT31
-+#define CO_FIFO_Y           BIT30
-+#define CO_FIFO_CB          BIT15
-+#define CO_FIFO_CR          BIT14
-+#define PR_FIFO_CB          BIT13
-+#define PR_FIFO_CR          BIT12
-+#define fWINHOR             Fld(11, 16)
-+#define fWINVER             Fld(11, 0)
-+#define WINHOROFST(x)       FInsrt((x), fWINHOR)
-+#define WINVEROFST(x)       FInsrt((x), fWINVER)
-+
-+/* Global Control Register */
-+#define GC_SWRST            BIT31
-+#define GC_CAMRST           BIT30
-+#define GC_INVPOLPCLK       BIT26
-+#define GC_INVPOLVSYNC      BIT25
-+#define GC_INVPOLHREF       BIT24
-+
-+/*--------------------------------------------------
-+                REGISTER BIT FIELD DEFINITION TO 
-+                          YCBCR and RGB 
-+----------------------------------------------------*/
-+/* Codec Target Format Register */
-+#define IN_YCBCR420         0
-+#define IN_YCBCR422         BIT31
-+#define OUT_YCBCR420        0
-+#define OUT_YCBCR422        BIT30
-+
-+#if 0
-+#define FLIP_NORMAL       0
-+#define FLIP_X              (BIT14)
-+#define FLIP_Y              (BIT15)
-+#define FLIP_MIRROR         (BIT14|BIT15)
-+#endif
-+
-+/**  BEGIN    ************************************/
-+/* Cotents: Common in both P and C port          */
-+#define fTARGET_HSIZE       Fld(13,16)
-+#define TARGET_HSIZE(x)     FInsrt((x), fTARGET_HSIZE)
-+#define fTARGET_VSIZE       Fld(13,0)
-+#define TARGET_VSIZE(x)     FInsrt((x), fTARGET_VSIZE)
-+#define FLIP_X_MIRROR       BIT14           
-+#define FLIP_Y_MIRROR       BIT15           
-+#define FLIP_180_MIRROR     (BIT14 | BIT15) 
-+/**  END     *************************************/
-+
-+/* Codec DMA Control Register */
-+#define fYBURST_M           Fld(5,19)
-+#define fYBURST_R           Fld(5,14)
-+#define fCBURST_M           Fld(5,9)
-+#define fCBURST_R           Fld(5,4)
-+#define YBURST_M(x)         FInsrt((x), fYBURST_M)
-+#define CBURST_M(x)         FInsrt((x), fCBURST_M)
-+#define YBURST_R(x)         FInsrt((x), fYBURST_R)
-+#define CBURST_R(x)         FInsrt((x), fCBURST_R)
-+#define LAST_IRQ_EN         BIT2              /* Common in both P and C port */
-+/*
-+ *  Check the done signal of capturing image for JPEG 
-+ *  !!! AutoClear Bit 
-+ */
-+
-+
-+/* (Codec, Preview ) Pre-Scaler Control Register 1 */
-+#define fSHIFT              Fld(4,28)
-+#define PRE_SHIFT(x)        FInsrt((x), fSHIFT)
-+#define fRATIO_H            Fld(7,16)
-+#define PRE_HRATIO(x)       FInsrt((x), fRATIO_H)
-+#define fRATIO_V            Fld(7,0)
-+#define PRE_VRATIO(x)       FInsrt((x), fRATIO_V)
-+
-+/* (Codec, Preview ) Pre-Scaler Control Register 2*/
-+#define fDST_WIDTH          Fld(12,16)
-+#define fDST_HEIGHT         Fld(12,0)
-+#define PRE_DST_WIDTH(x)    FInsrt((x), fDST_WIDTH)
-+#define PRE_DST_HEIGHT(x)   FInsrt((x), fDST_HEIGHT)
-+
-+
-+/* (Codec, Preview) Main-scaler control Register */
-+#define S_METHOD            BIT31  /* Sampling method only for P-port */
-+#define SCALERSTART         BIT15 
-+/* Codec scaler bypass for upper 2048x2048 
-+   where ImgCptEn_CoSC and ImgCptEn_PrSC should be 0 
-+*/
-+
-+#define SCALERBYPASS        BIT31  
-+#define RGB_FMT24           BIT30
-+#define RGB_FMT16           0
-+
-+/*
-+#define SCALE_UP_H          BIT29
-+#define SCALE_UP_V          BIT28
-+*/
-+
-+#define fMAIN_HRATIO        Fld(9, 16)
-+#define MAIN_HRATIO(x)      FInsrt((x), fMAIN_HRATIO)
-+
-+#define SCALER_START        BIT15
-+
-+#define fMAIN_VRATIO        Fld(9, 0)
-+#define MAIN_VRATIO(x)      FInsrt((x), fMAIN_VRATIO)
-+
-+/* (Codec, Preview ) DMA Target AREA Register */
-+#define fCICOTAREA          Fld(26,0)
-+#define TARGET_DMA_AREA(x)  FInsrt((x), fCICOTAREA)
-+
-+/* Preview DMA Control Register */
-+#define fRGBURST_M          Fld(5,19)
-+#define fRGBURST_R          Fld(5,14)
-+#define RGBURST_M(x)        FInsrt((x), fRGBURST_M)
-+#define RGBURST_R(x)        FInsrt((x), fRGBURST_R)
-+
-+
-+/* (Codec, Preview) Status Register */
-+#define CO_OVERFLOW_Y       BIT31
-+#define CO_OVERFLOW_CB      BIT30
-+#define CO_OVERFLOW_CR      BIT29
-+#define PR_OVERFLOW_CB      BIT31
-+#define PR_OVERFLOW_CR      BIT30
-+
-+#define VSYNC               BIT28
-+
-+#define fFRAME_CNT          Fld(2,26)
-+#define FRAME_CNT(x)        FExtr((x),fFRAME_CNT) 
-+           
-+#define WIN_OFF_EN          BIT25
-+#define fFLIP_MODE          Fld(2,23)
-+#define FLIP_MODE(x)        EExtr((x), fFLIP_MODE)
-+#define CAP_STATUS_CAMIF    BIT22
-+#define CAP_STATUS_CODEC    BIT21
-+#define CAP_STATUS_PREVIEW  BIT21
-+#define VSYNC_A             BIT20
-+#define VSYNC_B             BIT19
-+
-+/* Image Capture Enable Regiser */
-+#define       CAMIF_CAP_ON         BIT31
-+#define CAMIF_CAP_CODEC_ON   BIT30
-+#define CAMIF_CAP_PREVIEW_ON BIT29
-+
-+
-+
-+
-+#endif /* S3C2440_CAMER_H */
-diff --git a/arch/arm/mach-s3c2440/camera/camif.c b/arch/arm/mach-s3c2440/camera/camif.c
-new file mode 100644
-index 0000000..36d4ccc
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/camif.c
-@@ -0,0 +1,978 @@
-+/*
-+ *   Copyright (C) 2004 Samsung Electronics 
-+ *       SW.LEE <hitchcar@samsung.com>
-+ *   
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License 2. See the file COPYING in the main directory of this archive
-+ * for more details.
-+ */
-+
-+#include <linux/config.h>
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/sched.h>
-+#include <linux/irq.h>
-+#include <linux/tqueue.h>
-+#include <linux/locks.h>
-+#include <linux/completion.h>
-+#include <linux/delay.h>
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+#include <linux/miscdevice.h>
-+#include <linux/wait.h>
-+#include <linux/miscdevice.h>
-+#include <asm/io.h>
-+#include <asm/semaphore.h>
-+#include <asm/hardware.h>
-+#include <asm/uaccess.h>
-+
-+#ifdef CONFIG_ARCH_S3C24A0A
-+#include <asm/arch/S3C24A0.h>
-+#include <asm/arch/clocks.h>
-+#else
-+#include <asm/arch/S3C2440.h>
-+#include <asm/arch/clocks.h>
-+#endif
-+
-+#include "cam_reg.h"
-+//#define SW_DEBUG
-+#include "camif.h"
-+#include "videodev.h"
-+#include "miscdevice.h"
-+
-+
-+static int camif_dma_burst(camif_cfg_t *);
-+static int camif_scaler(camif_cfg_t *);
-+
-+static const char *camif_version =
-+        "$Id: camif.c,v 1.10 2004/06/04 04:24:14 swlee Exp $";
-+      
-+/* For SXGA Image */
-+#define RESERVE_MEM  15*1024*1024
-+#define YUV_MEM      10*1024*1024
-+#define RGB_MEM      (RESERVE_MEM - YUV_MEM)
-+
-+static int camif_malloc(camif_cfg_t *cfg)
-+{
-+      unsigned int t_size;
-+      unsigned int daon = cfg->target_x *cfg->target_y;
-+
-+      if(cfg->dma_type & CAMIF_CODEC) {
-+              if (cfg->fmt & CAMIF_OUT_YCBCR420) {
-+                      t_size = daon * 3 / 2 ;
-+              }
-+              else  { t_size = daon * 2; /* CAMIF_OUT_YCBCR422 */ }
-+              t_size = t_size *cfg->pp_num;
-+
-+#ifndef SAMSUNG_SXGA_CAM
-+              cfg->pp_virt_buf = consistent_alloc(GFP_KERNEL, t_size, &cfg->pp_phys_buf);
-+#else
-+              printk(KERN_INFO "Reserving High RAM Addresses \n");
-+              cfg->pp_phys_buf = PHYS_OFFSET + (MEM_SIZE - RESERVE_MEM);
-+              cfg->pp_virt_buf = ioremap_nocache(cfg->pp_phys_buf,YUV_MEM);
-+#endif
-+
-+              if ( !cfg->pp_virt_buf ) {
-+                      printk(KERN_ERR"CAMERA:Failed to request YCBCR MEM\n");
-+                      return -ENOMEM;
-+              }
-+              memset(cfg->pp_virt_buf, 0, t_size);
-+              cfg->pp_totalsize = t_size;
-+              return 0;
-+      }
-+      if ( cfg->dma_type & CAMIF_PREVIEW ) {
-+              if (cfg->fmt & CAMIF_RGB16) 
-+                      t_size = daon * 2; /*  4byte per two pixel*/
-+              else {
-+                      assert(cfg->fmt & CAMIF_RGB24);
-+                      t_size = daon * 4; /* 4byte per one pixel */
-+              }
-+              t_size = t_size * cfg->pp_num;
-+#ifndef SAMSUNG_SXGA_CAM
-+              cfg->pp_virt_buf = consistent_alloc(GFP_KERNEL, t_size, &cfg->pp_phys_buf);
-+#else
-+              printk(KERN_INFO "Reserving High RAM Addresses \n");
-+              cfg->pp_phys_buf = PHYS_OFFSET + (MEM_SIZE - RESERVE_MEM ) + YUV_MEM;
-+              cfg->pp_virt_buf = ioremap_nocache(cfg->pp_phys_buf,RGB_MEM);
-+#endif
-+              if ( !cfg->pp_virt_buf ) { 
-+                      printk(KERN_ERR"CAMERA:Failed to request RGB MEM\n");
-+                      return -ENOMEM;
-+              }
-+              memset(cfg->pp_virt_buf, 0, t_size);
-+              cfg->pp_totalsize = t_size;
-+              return 0;
-+      }
-+
-+      return 0;               /* Never come. */
-+}
-+
-+static int camif_demalloc(camif_cfg_t *cfg)
-+{
-+#ifndef SAMSUNG_SXGA_CAM
-+      if ( cfg->pp_virt_buf ) {
-+              consistent_free(cfg->pp_virt_buf,cfg->pp_totalsize,cfg->pp_phys_buf);
-+              cfg->pp_virt_buf = 0;
-+      }
-+#else
-+      iounmap(cfg->pp_virt_buf);
-+      cfg->pp_virt_buf = 0;
-+#endif
-+      return 0;
-+}
-+
-+/* 
-+ * advise a person to use this func in ISR 
-+ * index value indicates the next frame count to be used 
-+ */
-+int camif_g_frame_num(camif_cfg_t *cfg)
-+{
-+      int index = 0;
-+
-+      if (cfg->dma_type & CAMIF_CODEC ) {
-+              index = FRAME_CNT(CICOSTATUS);
-+              DPRINTK("CAMIF_CODEC frame %d \n", index);
-+      }
-+      else {
-+              assert(cfg->dma_type & CAMIF_PREVIEW );
-+              index = FRAME_CNT(CIPRSTATUS);
-+              DPRINTK("CAMIF_PREVIEW frame %d  0x%08X \n", index, CIPRSTATUS);
-+      }
-+      cfg->now_frame_num = (index + 2) % 4; /* When 4 PingPong */
-+      return index; /* meaningless */
-+}
-+
-+static int camif_pp_codec(camif_cfg_t *cfg)
-+{
-+      u32 i, c_size; /* Cb,Cr size */
-+      u32 one_p_size;
-+      u32 daon = cfg->target_x * cfg->target_y;
-+      if (cfg->fmt & CAMIF_OUT_YCBCR420) {
-+              c_size = daon /4;
-+      }
-+      else {
-+              assert(cfg->fmt & CAMIF_OUT_YCBCR422);
-+              c_size = daon /2;
-+      }
-+      switch ( cfg->pp_num ) {
-+              case 1 :
-+                      for ( i =0 ; i < 4; i=i+1) {
-+                              cfg->img_buf[i].virt_y = cfg->pp_virt_buf;
-+                              cfg->img_buf[i].phys_y = cfg->pp_phys_buf;
-+                              cfg->img_buf[i].virt_cb = cfg->pp_virt_buf + daon; 
-+                              cfg->img_buf[i].phys_cb = cfg->pp_phys_buf + daon;
-+                              cfg->img_buf[i].virt_cr = cfg->pp_virt_buf + daon + c_size;
-+                              cfg->img_buf[i].phys_cr = cfg->pp_phys_buf + daon + c_size;
-+                              CICOYSA(i)  =  cfg->img_buf[i].phys_y;
-+                              CICOCBSA(i) =  cfg->img_buf[i].phys_cb;
-+                              CICOCRSA(i) =  cfg->img_buf[i].phys_cr;
-+                      }
-+                      break;
-+              case 2:
-+#define  TRY   (( i%2 ) ? 1 :0)
-+                      one_p_size = daon + 2*c_size;
-+                      for (i = 0; i < 4  ; i++) {
-+                              cfg->img_buf[i].virt_y = cfg->pp_virt_buf + TRY * one_p_size;
-+                              cfg->img_buf[i].phys_y = cfg->pp_phys_buf + TRY * one_p_size;
-+                              cfg->img_buf[i].virt_cb = cfg->pp_virt_buf + daon + TRY * one_p_size;
-+                              cfg->img_buf[i].phys_cb = cfg->pp_phys_buf + daon + TRY * one_p_size;
-+                              cfg->img_buf[i].virt_cr = cfg->pp_virt_buf + daon + c_size + TRY * one_p_size;
-+                              cfg->img_buf[i].phys_cr = cfg->pp_phys_buf + daon + c_size + TRY * one_p_size;
-+                              CICOYSA(i)  = cfg->img_buf[i].phys_y;
-+                              CICOCBSA(i) = cfg->img_buf[i].phys_cb;
-+                              CICOCRSA(i) = cfg->img_buf[i].phys_cr;
-+                      }
-+                      break;
-+              case 4: 
-+                      one_p_size = daon + 2*c_size;
-+                      for (i = 0; i < 4 ; i++) {
-+                              cfg->img_buf[i].virt_y = cfg->pp_virt_buf + i * one_p_size;
-+                              cfg->img_buf[i].phys_y = cfg->pp_phys_buf + i * one_p_size;
-+                              cfg->img_buf[i].virt_cb = cfg->pp_virt_buf + daon + i * one_p_size;
-+                              cfg->img_buf[i].phys_cb = cfg->pp_phys_buf + daon + i * one_p_size;
-+                              cfg->img_buf[i].virt_cr = cfg->pp_virt_buf + daon + c_size + i * one_p_size;
-+                              cfg->img_buf[i].phys_cr = cfg->pp_phys_buf + daon + c_size + i * one_p_size;
-+                              CICOYSA(i)  =  cfg->img_buf[i].phys_y;
-+                              CICOCBSA(i) =  cfg->img_buf[i].phys_cb;
-+                              CICOCRSA(i) =  cfg->img_buf[i].phys_cr;
-+                      }
-+                      break;
-+              default:
-+                      printk("Invalid PingPong Number %d \n",cfg->pp_num);
-+                      panic("halt\n");
-+      }
-+      return 0;
-+}
-+
-+/* RGB Buffer Allocation */
-+static int camif_pp_preview(camif_cfg_t *cfg)
-+{
-+      int i;
-+      u32 daon = cfg->target_x * cfg->target_y;
-+
-+      if(cfg->fmt & CAMIF_RGB24)  
-+              daon = daon * 4 ;
-+      else {
-+              assert (cfg->fmt & CAMIF_RGB16);
-+              daon = daon *2;
-+      }  
-+      switch ( cfg->pp_num ) {
-+              case 1:
-+                      for ( i = 0; i < 4 ; i++ ) {
-+                              cfg->img_buf[i].virt_rgb = cfg->pp_virt_buf ;
-+                              cfg->img_buf[i].phys_rgb = cfg->pp_phys_buf ;
-+                              CIPRCLRSA(i) = cfg->img_buf[i].phys_rgb;
-+                      }
-+                      break;
-+              case 2:
-+                      for ( i = 0; i < 4 ; i++) {
-+                              cfg->img_buf[i].virt_rgb = cfg->pp_virt_buf + TRY * daon;
-+                              cfg->img_buf[i].phys_rgb = cfg->pp_phys_buf + TRY * daon;
-+                              CIPRCLRSA(i) = cfg->img_buf[i].phys_rgb;
-+                      }
-+                      break;
-+              case 4:
-+                      for ( i = 0; i < 4 ; i++) {
-+                              cfg->img_buf[i].virt_rgb = cfg->pp_virt_buf + i * daon;
-+                              cfg->img_buf[i].phys_rgb = cfg->pp_phys_buf + i * daon;
-+                              CIPRCLRSA(i) = cfg->img_buf[i].phys_rgb;
-+                      }
-+                      break;
-+              default:
-+                      printk("Invalid PingPong Number %d \n",cfg->pp_num);
-+                      panic("halt\n");
-+      }
-+      return 0;
-+}
-+
-+static int camif_pingpong(camif_cfg_t *cfg)
-+{
-+      if (cfg->dma_type & CAMIF_CODEC ) {
-+              camif_pp_codec(cfg);
-+      }
-+
-+      if ( cfg->dma_type & CAMIF_PREVIEW) {
-+              camif_pp_preview(cfg);
-+      }
-+      return 0;
-+}
-+
-+
-+/***********       Image Convert *******************************/
-+/*  Return Format 
-+ *  Supported by Hardware
-+ *  V4L2_PIX_FMT_YUV420,
-+ *  V4L2_PIX_FMT_YUV422P,
-+ *  V4L2_PIX_FMT_BGR32 (BGR4)
-+ * -----------------------------------
-+ *  V4L2_PIX_FMT_RGB565(X) 
-+ *  Currenly 2byte --> BGR656 Format
-+ *  S3C2440A,S3C24A0 supports vairants with reversed FMT_RGB565 
-+    i.e  blue toward the least, red towards the most significant bit 
-+    --  by SW.LEE
-+ */
-+
-+
-+/* 
-+ * After calling camif_g_frame_num,
-+ * this func must be called 
-+ */
-+u8 * camif_g_frame(camif_cfg_t *cfg)
-+{
-+      u8 * ret = NULL;
-+      int cnt = cfg->now_frame_num;
-+
-+      if(cfg->dma_type & CAMIF_PREVIEW) {
-+              ret = cfg->img_buf[cnt].virt_rgb;
-+      }
-+      if (cfg->dma_type & CAMIF_CODEC) {
-+              ret = cfg->img_buf[cnt].virt_y;
-+      }
-+      return ret;
-+}
-+
-+/* This function must be called in module initial time */
-+static int camif_source_fmt(camif_gc_t *gc) 
-+{
-+      u32 cmd = 0;
-+
-+      /* Configure CISRCFMT --Source Format */
-+      if (gc->itu_fmt & CAMIF_ITU601) {
-+              cmd = CAMIF_ITU601;
-+      }
-+      else {
-+              assert ( gc->itu_fmt & CAMIF_ITU656);
-+              cmd = CAMIF_ITU656;
-+      }
-+      cmd  |= SOURCE_HSIZE(gc->source_x)| SOURCE_VSIZE(gc->source_y);
-+      /* Order422 */
-+      cmd |=  gc->order422;
-+      CISRCFMT = cmd;
-+
-+      return 0 ;
-+}
-+
-+
-+/* 
-+ * Codec Input YCBCR422 will be Fixed 
-+ */
-+static int camif_target_fmt(camif_cfg_t *cfg)
-+{
-+      u32 cmd = 0;
-+
-+      if (cfg->dma_type & CAMIF_CODEC) {
-+              /* YCBCR setting */  
-+              cmd = TARGET_HSIZE(cfg->target_x)| TARGET_VSIZE(cfg->target_y);
-+              if ( cfg->fmt & CAMIF_OUT_YCBCR420 ) {
-+                      cmd |= OUT_YCBCR420|IN_YCBCR422;
-+              }
-+              else { 
-+                      assert(cfg->fmt & CAMIF_OUT_YCBCR422);
-+                      cmd |= OUT_YCBCR422|IN_YCBCR422;
-+              }
-+              CICOTRGFMT = cmd | cfg->flip;
-+      } 
-+      else {
-+              assert(cfg->dma_type & CAMIF_PREVIEW);
-+              CIPRTRGFMT = 
-+                      TARGET_HSIZE(cfg->target_x)|TARGET_VSIZE(cfg->target_y)|cfg->flip;
-+      }
-+      return 0;
-+}
-+
-+void camif_change_flip(camif_cfg_t *cfg)
-+{
-+      u32 cmd = 0;
-+
-+      if (cfg->dma_type & CAMIF_CODEC ) {
-+              /* YCBCR setting */  
-+              cmd  = CICOTRGFMT;
-+              cmd &= ~(BIT14|BIT15); /* Clear FLIP Mode */
-+              cmd |= cfg->flip; 
-+              CICOTRGFMT = cmd;
-+      } 
-+      else {
-+              cmd  = CIPRTRGFMT;
-+              cmd &= ~(BIT14|BIT15);
-+              cmd |= cfg->flip;
-+              CICOTRGFMT = cmd; 
-+      }
-+}
-+
-+
-+
-+/* Must:
-+ * Before calling this function,
-+ * you must use "camif_dynamic_open"
-+ * If you want to enable both CODEC and preview
-+ *  you must do it at the same time.
-+ */
-+int camif_capture_start(camif_cfg_t *cfg)
-+{
-+      u32 n_cmd = 0;          /* Next Command */
-+
-+      switch(cfg->exec) {
-+              case CAMIF_BOTH_DMA_ON:
-+                      camif_reset(CAMIF_RESET,0); /* Flush Camera Core Buffer */              
-+                      CIPRSCCTRL |= SCALERSTART;
-+                      CICOSCCTRL |= SCALERSTART;
-+                      n_cmd = CAMIF_CAP_PREVIEW_ON|CAMIF_CAP_CODEC_ON;
-+                      break;
-+              case CAMIF_DMA_ON:
-+                      camif_reset(CAMIF_RESET,0); /* Flush Camera Core Buffer */              
-+                      if (cfg->dma_type&CAMIF_CODEC) {
-+                              CICOSCCTRL |= SCALERSTART;
-+                              n_cmd = CAMIF_CAP_CODEC_ON;
-+                      }else {
-+                              CIPRSCCTRL |= SCALERSTART;
-+                              n_cmd = CAMIF_CAP_PREVIEW_ON;
-+                      }
-+
-+                      /* wait until Sync Time expires */
-+                      /* First settting, to wait VSYNC fall  */
-+                      /* By VESA spec,in 640x480 @60Hz 
-+                         MAX Delay Time is around 64us which "while" has.*/ 
-+                      while(VSYNC & CICOSTATUS);
-+                      break;
-+              default:
-+                      break;
-+      }
-+      CIIMGCPT = n_cmd|CAMIF_CAP_ON;
-+      return 0;
-+}
-+
-+
-+int camif_capture_stop(camif_cfg_t *cfg)
-+{
-+      u32 n_cmd = CIIMGCPT;   /* Next Command */
-+
-+      switch(cfg->exec) {
-+              case CAMIF_BOTH_DMA_OFF:
-+                      CIPRSCCTRL &= ~SCALERSTART;
-+                      CICOSCCTRL &= ~SCALERSTART;
-+                      n_cmd = 0;
-+                      break;
-+              case CAMIF_DMA_OFF_L_IRQ: /* fall thru */
-+              case CAMIF_DMA_OFF:
-+                      if (cfg->dma_type&CAMIF_CODEC) {
-+                              CICOSCCTRL &= ~SCALERSTART;
-+                              n_cmd &= ~CAMIF_CAP_CODEC_ON;
-+                              if (!(n_cmd & CAMIF_CAP_PREVIEW_ON))
-+                                      n_cmd = 0;
-+                      }else {
-+                              CIPRSCCTRL &= ~SCALERSTART;
-+                              n_cmd &= ~CAMIF_CAP_PREVIEW_ON;
-+                              if (!(n_cmd & CAMIF_CAP_CODEC_ON))
-+                                      n_cmd = 0;
-+                      }
-+                      break;
-+              default:
-+                      panic("Unexpected \n");
-+      }
-+      CIIMGCPT = n_cmd;
-+      if(cfg->exec == CAMIF_DMA_OFF_L_IRQ) { /* Last IRQ  */
-+              if (cfg->dma_type & CAMIF_CODEC) 
-+                      CICOCTRL |= LAST_IRQ_EN;
-+              else 
-+                      CIPRCTRL |= LAST_IRQ_EN;
-+      } 
-+#if 0
-+      else {                          /* to make internal state machine of CAMERA stop */
-+              camif_reset(CAMIF_RESET, 0);
-+      }
-+#endif
-+      return 0;
-+}
-+
-+
-+/* LastIRQEn is autoclear */
-+void camif_last_irq_en(camif_cfg_t *cfg)
-+{
-+      if(cfg->exec == CAMIF_BOTH_DMA_ON) {
-+              CIPRCTRL |= LAST_IRQ_EN;
-+              CICOCTRL |= LAST_IRQ_EN;
-+      }
-+      else {
-+              if (cfg->dma_type & CAMIF_CODEC) 
-+                      CICOCTRL |= LAST_IRQ_EN;
-+              else 
-+                      CIPRCTRL |= LAST_IRQ_EN;
-+      }
-+}
-+
-+static int  
-+camif_scaler_internal(u32 srcWidth, u32 dstWidth, u32 *ratio, u32 *shift)
-+{
-+      if(srcWidth>=64*dstWidth){
-+              printk(KERN_ERR"CAMERA:out of prescaler range: srcWidth /dstWidth = %d(< 64)\n",
-+                       srcWidth/dstWidth);
-+              return 1;
-+      }
-+      else if(srcWidth>=32*dstWidth){
-+              *ratio=32;
-+              *shift=5;
-+      }
-+      else if(srcWidth>=16*dstWidth){
-+              *ratio=16;
-+              *shift=4;
-+      }
-+      else if(srcWidth>=8*dstWidth){
-+              *ratio=8;
-+              *shift=3;
-+      }
-+      else if(srcWidth>=4*dstWidth){
-+              *ratio=4;
-+              *shift=2;
-+      }
-+      else if(srcWidth>=2*dstWidth){
-+              *ratio=2;
-+              *shift=1;
-+      }
-+      else {
-+              *ratio=1;
-+              *shift=0;
-+      }  
-+      return 0;
-+}
-+
-+
-+int camif_g_fifo_status(camif_cfg_t *cfg) 
-+{
-+      u32 reg;
-+
-+      if (cfg->dma_type & CAMIF_CODEC) {
-+              u32 flag = CO_OVERFLOW_Y|CO_OVERFLOW_CB|CO_OVERFLOW_CR;
-+              reg = CICOSTATUS;
-+              if (reg & flag) {
-+                      printk("CODEC: FIFO error(0x%08x) and corrected\n",reg);
-+                      /* FIFO Error Count ++  */
-+                      CIWDOFST |= CO_FIFO_Y|CO_FIFO_CB|CO_FIFO_CR;
-+                      CIWDOFST &= ~(CO_FIFO_Y|CO_FIFO_CB|CO_FIFO_CR);
-+                      return 1; /* Error */
-+              }
-+      }
-+      if (cfg->dma_type & CAMIF_PREVIEW) {
-+              u32 flag = PR_OVERFLOW_CB|PR_OVERFLOW_CR;
-+              reg = CIPRSTATUS;
-+              if (reg & flag) {
-+                      printk("PREVIEW:FIFO error(0x%08x) and corrected\n",reg);
-+                      CIWDOFST |= PR_FIFO_CB|PR_FIFO_CR;
-+                      CIWDOFST &= ~(CO_FIFO_Y|CO_FIFO_CB|CO_FIFO_CR);
-+                      /* FIFO Error Count ++  */
-+                      return 1; /* Error */
-+              }
-+      }
-+      return 0;               /* No Error */
-+}
-+
-+
-+/* Policy:
-+ * if codec or preview define the win offset,
-+ *    other must follow that value.
-+ */
-+int camif_win_offset(camif_gc_t *gc )
-+{
-+      u32 h = gc->win_hor_ofst;
-+      u32 v = gc->win_ver_ofst;
-+
-+      /*Clear Overflow */
-+      CIWDOFST = CO_FIFO_Y|CO_FIFO_CB|CO_FIFO_CR|PR_FIFO_CB|PR_FIFO_CB;
-+      CIWDOFST = 0;           /* ? Dummy */
-+      if (!h && !v)   {
-+              CIWDOFST = 0;
-+              return 0;
-+      }
-+      CIWDOFST = WINOFEN | WINHOROFST(h) | WINVEROFST(v);
-+      return 0;
-+}
-+
-+/*  
-+ * when you change the resolution in a specific camera,
-+ * sometimes, it is necessary to change the polarity 
-+ *                                       -- SW.LEE
-+ */
-+static void camif_polarity(camif_gc_t *gc)
-+{
-+      u32 cmd = CIGCTRL;
-+      
-+      cmd = cmd & ~(BIT26|BIT25|BIT24); /* clear polarity */
-+      if (gc->polarity_pclk)
-+              cmd |= GC_INVPOLPCLK;
-+      if (gc->polarity_vsync)
-+              cmd |= GC_INVPOLVSYNC;
-+      if (gc->polarity_href)
-+              cmd |= GC_INVPOLHREF;
-+      CIGCTRL |= cmd;
-+}
-+
-+
-+int camif_dynamic_open(camif_cfg_t *cfg)
-+{
-+      camif_win_offset(cfg->gc);
-+      camif_polarity(cfg->gc);
-+      
-+      if(camif_scaler(cfg)) {
-+              printk(KERN_ERR "CAMERA:Preview Scaler, Change WinHorOfset or Target Size\n");
-+              return 1;
-+      }
-+      camif_target_fmt(cfg);
-+      if (camif_dma_burst(cfg)) {
-+              printk(KERN_ERR "CAMERA:DMA Busrt Length Error \n");
-+              return 1;
-+      }
-+      if(camif_malloc(cfg) ) {
-+              printk(KERN_ERR "    Instead of using consistent_alloc()\n"
-+                              "    lease use dedicated memory allocation for DMA memory\n");
-+              return -1;
-+      }
-+      camif_pingpong(cfg);
-+      return 0;
-+}
-+
-+int camif_dynamic_close(camif_cfg_t *cfg)
-+{
-+      camif_demalloc(cfg);
-+      return 0;
-+}
-+
-+static int camif_target_area(camif_cfg_t *cfg) 
-+{
-+      u32 rect = cfg->target_x * cfg->target_y;
-+      if (cfg->dma_type & CAMIF_CODEC ) {
-+              CICOTAREA = rect;
-+      }
-+      if (cfg->dma_type & CAMIF_PREVIEW) {
-+              CIPRTAREA = rect;
-+      }
-+      return 0;
-+}
-+
-+static int inline camif_hw_reg(camif_cfg_t *cfg)
-+{
-+      u32 cmd = 0;
-+
-+      if (cfg->dma_type & CAMIF_CODEC) {
-+              CICOSCPRERATIO = PRE_SHIFT(cfg->sc.shfactor)
-+                      |PRE_HRATIO(cfg->sc.prehratio)|PRE_VRATIO(cfg->sc.prevratio);
-+              CICOSCPREDST = 
-+                      PRE_DST_WIDTH(cfg->sc.predst_x)|PRE_DST_HEIGHT(cfg->sc.predst_y);
-+
-+              /* Differ from Preview */
-+              if (cfg->sc.scalerbypass)
-+                      cmd |= SCALERBYPASS;
-+              if (cfg->sc.scaleup_h & cfg->sc.scaleup_v)
-+                      cmd |= BIT30|BIT29;
-+              CICOSCCTRL = cmd | MAIN_HRATIO(cfg->sc.mainhratio)
-+                      |MAIN_VRATIO(cfg->sc.mainvratio);
-+              return 0;
-+      }
-+      else if (cfg->dma_type & CAMIF_PREVIEW) {
-+              CIPRSCPRERATIO = PRE_SHIFT(cfg->sc.shfactor)
-+                      |PRE_HRATIO(cfg->sc.prehratio)|PRE_VRATIO(cfg->sc.prevratio);
-+              CIPRSCPREDST = 
-+                      PRE_DST_WIDTH(cfg->sc.predst_x)|PRE_DST_HEIGHT(cfg->sc.predst_y);
-+              /* Differ from Codec */
-+              if (cfg->fmt & CAMIF_RGB24) {
-+                      cmd |= RGB_FMT24;  
-+              }
-+              else {
-+                      /* RGB16 */;
-+              }               
-+              if (cfg->sc.scaleup_h & cfg->sc.scaleup_v)
-+                      cmd |= BIT29|BIT28;
-+              CIPRSCCTRL = cmd |MAIN_HRATIO(cfg->sc.mainhratio)|S_METHOD
-+                      |MAIN_VRATIO(cfg->sc.mainvratio);
-+      }else {
-+              panic("CAMERA:DMA_TYPE Wrong \n");
-+      }
-+
-+      return 0;
-+}
-+
-+
-+/* Configure Pre-scaler control  & main scaler control register */
-+static int camif_scaler(camif_cfg_t *cfg)
-+{
-+      int tx = cfg->target_x,ty=cfg->target_y;
-+      int sx, sy;
-+
-+      if (tx <= 0 || ty<= 0)  panic("CAMERA: Invalid target size \n");
-+
-+      sx = cfg->gc->source_x - 2*cfg->gc->win_hor_ofst;
-+      sy = cfg->gc->source_y - 2*cfg->gc->win_ver_ofst;       
-+      if (sx <= 0 || sy<= 0)  panic("CAMERA: Invalid source size \n");
-+      cfg->sc.modified_src_x = sx;
-+      cfg->sc.modified_src_y = sy;
-+
-+      /* Pre-scaler control register 1 */
-+      camif_scaler_internal(sx,tx,&cfg->sc.prehratio,&cfg->sc.hfactor);
-+      camif_scaler_internal(sy,ty,&cfg->sc.prevratio,&cfg->sc.vfactor);
-+
-+      if (cfg->dma_type & CAMIF_PREVIEW) {
-+              if ( (sx /cfg->sc.prehratio) <= 640 ) {}
-+              else {
-+                      printk(KERN_INFO "CAMERA: Internal Preview line buffer is 640 pixels\n");
-+                      return 1; /* Error */
-+              }
-+      }
-+
-+      cfg->sc.shfactor = 10-(cfg->sc.hfactor+cfg->sc.vfactor);
-+      /* Pre-scaler control register 2 */
-+      cfg->sc.predst_x = sx / cfg->sc.prehratio;
-+      cfg->sc.predst_y = sy / cfg->sc.prevratio;
-+
-+      /* Main-scaler control register */
-+      cfg->sc.mainhratio = (sx << 8)/(tx << cfg->sc.hfactor);
-+      cfg->sc.mainvratio = (sy << 8)/(ty << cfg->sc.vfactor);
-+      DPRINTK(" sx %d, sy %d tx %d ty %d  \n",sx,sy,tx,ty);
-+      DPRINTK(" hfactor %d  vfactor %d \n",cfg->sc.hfactor,cfg->sc.vfactor);
-+
-+      cfg->sc.scaleup_h  = (sx <= tx) ? 1: 0;
-+      cfg->sc.scaleup_v  = (sy <= ty) ? 1: 0;
-+      if ( cfg->sc.scaleup_h != cfg->sc.scaleup_v) 
-+              printk(KERN_ERR "scaleup_h must be same to scaleup_v \n");
-+      camif_hw_reg(cfg);
-+      camif_target_area(cfg);
-+      return 0;
-+}
-+
-+/******************************************************
-+ CalculateBurstSize - Calculate the busrt lengths
-+ Description:
-+ - dstHSize: the number of the byte of H Size.
-+********************************************************/
-+static void camif_g_bsize(u32 hsize, u32 *mburst, u32 *rburst)
-+{
-+      u32 tmp;
-+
-+      tmp = (hsize/4) % 16;
-+      switch(tmp) {
-+              case 0:
-+                      *mburst=16;
-+                      *rburst=16;
-+                      break;
-+              case 4:
-+                      *mburst=16;
-+                      *rburst=4;
-+                      break;
-+              case 8:
-+                      *mburst=16;
-+                      *rburst=8;
-+                      break;
-+              default:
-+                      tmp=(hsize/4)%8;
-+                      switch(tmp) {
-+                              case 0:
-+                                      *mburst=8;
-+                                      *rburst=8;
-+                                      break;
-+                              case 4:
-+                                      *mburst=8;
-+                                      *rburst=4;
-+                              default:
-+                                      *mburst=4;
-+                                      tmp=(hsize/4)%4;
-+                                      *rburst= (tmp) ? tmp: 4;
-+                                      break;
-+                      }
-+                      break;
-+      }
-+}
-+
-+/* SXGA 1028x1024*/
-+/* XGA 1024x768 */
-+/* SVGA 800x600 */
-+/* VGA 640x480 */
-+/* CIF 352x288 */
-+/* QVGA 320x240 */
-+/* QCIF 176x144 */
-+/* ret val 
-+        1 : DMA Size Error 
-+*/
-+#define BURST_ERR 1 
-+static int camif_dma_burst(camif_cfg_t *cfg)
-+{
-+      int width = cfg->target_x;
-+
-+      if (cfg->dma_type & CAMIF_CODEC ) {
-+              u32 yburst_m, yburst_r;
-+              u32 cburst_m, cburst_r;
-+              /* CODEC DMA WIDHT is multiple of 16 */
-+              if (width %16 != 0 )  return BURST_ERR;   /* DMA Burst Length Error */
-+              camif_g_bsize(width,&yburst_m,&yburst_r);
-+              camif_g_bsize(width/2,&cburst_m,&cburst_r);
-+              CICOCTRL =YBURST_M(yburst_m)|CBURST_M(cburst_m)
-+                      |YBURST_R(yburst_r)|CBURST_R(cburst_r);
-+      }
-+
-+      if (cfg->dma_type & CAMIF_PREVIEW) {
-+              u32 rgburst_m, rgburst_r;
-+              if(cfg->fmt == CAMIF_RGB24) {
-+                      if (width %2 != 0 )  return BURST_ERR;   /* DMA Burst Length Error */
-+                      camif_g_bsize(width*4,&rgburst_m,&rgburst_r);
-+              }
-+              else {          /* CAMIF_RGB16 */
-+                      if ((width/2) %2 != 0 )  return BURST_ERR; /* DMA Burst Length Error */
-+                      camif_g_bsize(width*2,&rgburst_m,&rgburst_r);  
-+              }
-+                      CIPRCTRL = RGBURST_M(rgburst_m) | RGBURST_R(rgburst_r);
-+      }
-+      return 0;
-+}
-+
-+static int camif_gpio_init(void)
-+{
-+#ifdef CONFIG_ARCH_S3C24A0A
-+      /* S3C24A0A has the dedicated signal pins for Camera */
-+#else
-+      set_gpio_ctrl(GPIO_CAMDATA0);
-+      set_gpio_ctrl(GPIO_CAMDATA1);
-+      set_gpio_ctrl(GPIO_CAMDATA2);
-+      set_gpio_ctrl(GPIO_CAMDATA3);
-+      set_gpio_ctrl(GPIO_CAMDATA4);
-+      set_gpio_ctrl(GPIO_CAMDATA5);
-+      set_gpio_ctrl(GPIO_CAMDATA6);
-+      set_gpio_ctrl(GPIO_CAMDATA7);
-+      set_gpio_ctrl(GPIO_CAMPCLKIN);
-+      set_gpio_ctrl(GPIO_CAMVSYNC);
-+      set_gpio_ctrl(GPIO_CAMHREF);
-+      set_gpio_ctrl(GPIO_CAMPCLKOUT);
-+      set_gpio_ctrl(GPIO_CAMRESET);
-+#endif
-+        return 0;
-+}
-+
-+
-+#define ROUND_ADD 0x100000
-+
-+#ifdef CONFIG_ARCH_S3C24A0A
-+int camif_clock_init(camif_gc_t *gc)
-+{
-+      unsigned int upll, camclk_div, camclk;
-+
-+      if (!gc) camclk = 24000000;
-+      else  {
-+              camclk = gc->camclk;
-+              if (camclk > 48000000)
-+                      printk(KERN_ERR "Wrong Camera Clock\n");
-+      }
-+
-+      CLKCON |= CLKCON_CAM_UPLL | CLKCON_CAM_HCLK;
-+      upll = get_bus_clk(GET_UPLL);
-+      printk(KERN_INFO "CAMERA:Default UPLL %08d and Assing 96Mhz to UPLL\n",upll);   
-+      UPLLCON = FInsrt(56, fPLL_MDIV) | FInsrt(2, fPLL_PDIV)| FInsrt(1, fPLL_SDIV);
-+      upll = get_bus_clk(GET_UPLL);
-+
-+      camclk_div = (upll+ROUND_ADD) / camclk - 1;
-+      CLKDIVN = (CLKDIVN & 0xFF) | CLKDIVN_CAM(camclk_div);
-+      printk(KERN_INFO"CAMERA:upll %d MACRO 0x%08X CLKDIVN 0x%08X \n",
-+                              upll, CLKDIVN_CAM(camclk_div),CLKDIVN);
-+      CIIMGCPT = 0;           /* Dummy ? */
-+      return 0;
-+}
-+#else
-+int camif_clock_init(camif_gc_t *gc)
-+{
-+      unsigned int upll, camclk_div, camclk;
-+      if (!gc) camclk = 24000000;
-+      else  {
-+              camclk = gc->camclk;
-+              if (camclk > 48000000)
-+                      printk(KERN_ERR "Wrong Camera Clock\n");
-+      }
-+
-+      CLKCON |= CLKCON_CAMIF;
-+      upll = elfin_get_bus_clk(GET_UPLL);
-+      printk(KERN_INFO "CAMERA:Default UPLL %08d and Assing 96Mhz to UPLL\n",upll);   
-+      {
-+              UPLLCON = FInsrt(60, fPLL_MDIV) | FInsrt(4, fPLL_PDIV)| FInsrt(1, fPLL_SDIV);
-+              CLKDIVN |= DIVN_UPLL;   /* For USB */
-+              upll = elfin_get_bus_clk(GET_UPLL);
-+      }
-+
-+      camclk_div = (upll+ROUND_ADD) /(camclk * 2) -1;
-+      CAMDIVN = CAMCLK_SET_DIV|(camclk_div&0xf);
-+      printk(KERN_INFO "CAMERA:upll %08d  cam_clk %08d CAMDIVN 0x%08x \n",upll,camclk, CAMDIVN);
-+      CIIMGCPT = 0;           /* Dummy ? */
-+      return 0;
-+}
-+#endif
-+
-+/* 
-+   Reset Camera IP in CPU
-+   Reset External Sensor 
-+ */
-+void camif_reset(int is, int delay)
-+{
-+      switch (is) {
-+              case CAMIF_RESET:
-+                      CIGCTRL |= GC_SWRST;
-+                      mdelay(1);
-+                      CIGCTRL &= ~GC_SWRST;
-+                      break;
-+              case CAMIF_EX_RESET_AH: /*Active High */
-+                      CIGCTRL &= ~GC_CAMRST; 
-+                      udelay(200);
-+                      CIGCTRL |= GC_CAMRST;
-+                      udelay(delay);
-+                      CIGCTRL &= ~GC_CAMRST;
-+                      break;
-+              case CAMIF_EX_RESET_AL: /*Active Low */
-+                      CIGCTRL |=  GC_CAMRST;
-+                      udelay(200);
-+                      CIGCTRL &= ~GC_CAMRST;
-+                      udelay(delay);
-+                      CIGCTRL |= GC_CAMRST;
-+                      break;
-+              default:
-+                      break;
-+      }
-+}
-+              
-+/* For Camera Operation,
-+ * we can give the high priority to REQ2 of ARBITER1 
-+ */
-+
-+/* Please move me into proper place 
-+ *  camif_gc_t is not because "rmmod imgsenor" will delete the instance of camif_gc_t  
-+ */
-+static u32 old_priority; 
-+
-+static void camif_bus_priority(int flag)
-+{
-+      if (flag) {
-+#ifdef CONFIG_ARCH_S3C24A0A
-+              old_priority = PRIORITY0;
-+              PRIORITY0 = PRIORITY_I_FIX;
-+              PRIORITY1 = PRIORITY_I_FIX;
-+
-+#else
-+              old_priority = PRIORITY;        
-+              PRIORITY &= ~(3<<7);
-+              PRIORITY |=  (1<<7); /* Arbiter 1, REQ2 first */
-+              PRIORITY &= ~(1<<1); /* Disable Priority Rotate */
-+#endif
-+      } 
-+      else {
-+#ifdef CONFIG_ARCH_S3C24A0A
-+              PRIORITY0 = old_priority;
-+              PRIORITY1 = old_priority;
-+#else
-+              PRIORITY = old_priority;
-+#endif
-+      }
-+}
-+
-+static void inline camif_clock_off(void)
-+{
-+      CIIMGCPT = 0;
-+#if defined (CONFIG_ARCH_S3C24A0A)
-+      CLKCON &= ~CLKCON_CAM_UPLL;
-+      CLKCON &= ~CLKCON_CAM_HCLK;
-+#else
-+      CLKCON &= ~CLKCON_CAMIF;
-+#endif
-+}
-+
-+
-+/* Init external image sensor 
-+ *  Before make some value into image senor,
-+ *  you must set up the pixel clock.
-+ */
-+void camif_setup_sensor(void)
-+{
-+      camif_reset(CAMIF_RESET, 0);
-+      camif_gpio_init();
-+      camif_clock_init(NULL);
-+/* Sometimes ,Before loading I2C module, we need the reset signal */
-+#ifdef CONFIG_ARCH_S3C24A0A
-+      camif_reset(CAMIF_EX_RESET_AL,1000);
-+#else
-+      camif_reset(CAMIF_EX_RESET_AH,1000);
-+#endif
-+}
-+
-+void camif_hw_close(camif_cfg_t *cfg)
-+{
-+      camif_bus_priority(0);
-+      camif_clock_off();
-+}
-+
-+void camif_hw_open(camif_gc_t *gc)
-+{
-+      camif_source_fmt(gc);
-+      camif_win_offset(gc);
-+      camif_bus_priority(1);
-+}
-+
-+
-+
-+/* 
-+ * Local variables:
-+ * tab-width: 8
-+ *  c-indent-level: 8
-+ *  c-basic-offset: 8
-+ *  c-set-style: "K&R"
-+ * End:
-+ */
-diff --git a/arch/arm/mach-s3c2440/camera/camif.h b/arch/arm/mach-s3c2440/camera/camif.h
-new file mode 100644
-index 0000000..8b4f9aa
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/camif.h
-@@ -0,0 +1,304 @@
-+/*
-+    FIMC2.0  Camera Header File
-+
-+    Copyright (C) 2003 Samsung Electronics (SW.LEE: hitchcar@samsung.com)
-+
-+      Author : SW.LEE <hitchcar@samsung.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 __FIMC20_CAMIF_H_
-+#define __FIMC20_CAMIF_H_
-+
-+#ifdef __KERNEL__
-+
-+#include "bits.h"
-+#include "videodev.h"
-+#include <asm/types.h>
-+#include <linux/i2c.h>
-+
-+#endif  /* __KERNEL__ */
-+
-+#ifndef O_NONCAP
-+#define O_NONCAP O_TRUNC
-+#endif
-+
-+/* Codec or Preview Status */
-+#define CAMIF_STARTED         BIT1
-+#define CAMIF_STOPPED         BIT2
-+#define CAMIF_INT_HAPPEN      BIT3
-+
-+/* Codec or Preview  : Interrupt FSM */
-+#define CAMIF_1nd_INT         BIT7
-+#define CAMIF_Xnd_INT         BIT8
-+#define CAMIF_Ynd_INT         BIT9 
-+#define CAMIF_Znd_INT         BIT10
-+#define CAMIF_NORMAL_INT      BIT11
-+#define CAMIF_DUMMY_INT       BIT12
-+#define CAMIF_PENDING_INT     0
-+
-+
-+/* CAMIF RESET Definition */
-+#define CAMIF_RESET           BIT0
-+#define CAMIF_EX_RESET_AL     BIT1    /* Active Low */
-+#define CAMIF_EX_RESET_AH     BIT2    /* Active High */
-+
-+
-+enum camif_itu_fmt {
-+      CAMIF_ITU601 = BIT31,
-+      CAMIF_ITU656 = 0
-+};
-+
-+/* It is possbie to use two device simultaneously */
-+enum camif_dma_type {
-+       CAMIF_PREVIEW = BIT0,
-+       CAMIF_CODEC   = BIT1,
-+};
-+
-+enum camif_order422 {
-+       CAMIF_YCBYCR = 0,
-+       CAMIF_YCRYCB = BIT14,
-+       CAMIF_CBYCRY = BIT15,
-+       CAMIF_CRYCBY = BIT14 | BIT15
-+};
-+
-+enum flip_mode {
-+        CAMIF_FLIP   = 0,
-+        CAMIF_FLIP_X = BIT14,
-+        CAMIF_FLIP_Y = BIT15,
-+        CAMIF_FLIP_MIRROR = BIT14 |BIT15,
-+};
-+
-+enum camif_codec_fmt {
-+      /* Codec part */
-+        CAMIF_IN_YCBCR420  = BIT0, /* Currently IN_YCBCR format fixed */
-+        CAMIF_IN_YCBCR422  = BIT1,
-+        CAMIF_OUT_YCBCR420 = BIT4,
-+        CAMIF_OUT_YCBCR422 = BIT5,
-+      /* Preview Part */
-+      CAMIF_RGB16        = BIT2,
-+      CAMIF_RGB24        = BIT3,
-+};
-+
-+enum camif_capturing {
-+        CAMIF_BOTH_DMA_ON  = BIT4,
-+      CAMIF_DMA_ON       = BIT3,
-+      CAMIF_BOTH_DMA_OFF = BIT1,
-+      CAMIF_DMA_OFF      = BIT0,
-+      /*------------------------*/
-+      CAMIF_DMA_OFF_L_IRQ= BIT5,
-+};
-+
-+typedef struct camif_performance
-+{
-+      int     frames;
-+      int     framesdropped;
-+      __u64   bytesin;
-+      __u64   bytesout;
-+      __u32   reserved[4];
-+} camif_perf_t;
-+
-+
-+typedef struct {
-+        dma_addr_t  phys_y;
-+        dma_addr_t  phys_cb;
-+        dma_addr_t  phys_cr;
-+        u8          *virt_y;  
-+        u8          *virt_cb;
-+        u8          *virt_cr;
-+        dma_addr_t  phys_rgb;
-+        u8          *virt_rgb;
-+}img_buf_t;
-+
-+
-+/* this structure convers the CIWDOFFST, prescaler, mainscaler */
-+typedef struct {
-+      u32 modified_src_x;     /* After windows applyed to source_x */
-+      u32 modified_src_y;
-+      u32 hfactor;
-+      u32 vfactor;
-+      u32 shfactor;           /* SHfactor = 10 - ( hfactor + vfactor ) */
-+      u32 prehratio;
-+      u32 prevratio;
-+      u32 predst_x;
-+      u32 predst_y;
-+      u32 scaleup_h;          
-+      u32 scaleup_v;
-+      u32 mainhratio;
-+      u32 mainvratio;
-+      u32 scalerbypass;       /* only codec */
-+} scaler_t;
-+
-+
-+enum v4l2_status {
-+        CAMIF_V4L2_INIT    = BIT0,
-+        CAMIF_v4L2_DIRTY   = BIT1,
-+};
-+
-+
-+/* Global Status Definition */
-+#define PWANT2START   BIT0
-+#define CWANT2START   BIT1
-+#define BOTH_STARTED  (PWANT2START|CWANT2START)
-+#define PNOTWORKING   BIT4
-+#define C_WORKING     BIT5
-+
-+typedef struct {
-+      struct semaphore         lock;
-+        enum camif_itu_fmt       itu_fmt;
-+        enum camif_order422      order422;
-+      u32                      win_hor_ofst;
-+      u32                      win_ver_ofst;
-+        u32                      camclk;  /* External Image Sensor Camera Clock */
-+        u32                      source_x;
-+        u32                      source_y;
-+      u32                      polarity_pclk;
-+      u32                      polarity_vsync;
-+      u32                      polarity_href;
-+      struct i2c_client        *sensor;
-+      u32                      user; /* MAX 2 (codec, preview) */
-+      u32                      old_priority; /* BUS PRIORITY register */
-+      u32                      status;
-+      u32                      init_sensor;/* initializing sensor */
-+      void                     *other;    /* Codec camif_cfg_t */
-+      u32                      reset_type;    /* External Sensor Reset  Type */
-+      u32                      reset_udelay;  
-+} camif_gc_t;                 /* gobal control register */
-+
-+
-+/* when  App want to change v4l2 parameter,
-+ * we instantly store it into v4l2_t v2 
-+ * and then reflect it to hardware
-+ */   
-+typedef struct v4l2 {
-+      struct v4l2_fmtdesc     *fmtdesc;
-+      struct v4l2_pix_format   fmt; /* current pixel format */
-+      struct v4l2_input        input;
-+        struct video_picture     picture;
-+      enum v4l2_status         status;
-+      int     used_fmt ;      /* used format index  */
-+} v4l2_t;
-+
-+
-+typedef struct camif_c_t {
-+        struct video_device      *v;
-+      /* V4L2 param only for v4l2 driver */
-+      v4l2_t                    v2;
-+      camif_gc_t               *gc; /* Common between Codec and Preview */
-+      /* logical parameter */
-+      wait_queue_head_t        waitq;
-+      u32                      status; /* Start/Stop */
-+      u32                      fsm; /* Start/Stop */
-+      u32                      open_count; /* duplicated */
-+      int                      irq;
-+      char                     shortname[16];
-+        u32                      target_x;
-+        u32                      target_y;
-+      scaler_t                 sc;
-+      enum flip_mode           flip;
-+        enum camif_dma_type      dma_type;
-+       /* 4 pingpong Frame memory */
-+        u8                       *pp_virt_buf;
-+        dma_addr_t               pp_phys_buf;
-+        u32                      pp_totalsize;
-+      u32                      pp_num; /* used pingpong memory number */
-+        img_buf_t                img_buf[4];
-+        enum camif_codec_fmt     fmt;
-+        enum camif_capturing     exec;
-+      camif_perf_t             perf;
-+      u32                      now_frame_num;
-+      u32                      auto_restart; /* Only For Preview */
-+} camif_cfg_t;
-+
-+#ifdef SW_DEBUG
-+#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args)
-+#else
-+#define DPRINTK(fmt, args...)
-+#endif
-+
-+
-+#ifdef SW_DEBUG
-+#define assert(expr) \
-+        if(!(expr)) {                                   \
-+        printk( "Assertion failed! %s,%s,%s,line=%d\n", \
-+        #expr,__FILE__,__FUNCTION__,__LINE__);          \
-+        }
-+#else
-+#define assert(expr)
-+#endif
-+
-+
-+
-+extern int camif_capture_start(camif_cfg_t *);
-+extern int camif_capture_stop(camif_cfg_t *);
-+extern int camif_g_frame_num(camif_cfg_t *);
-+extern u8 * camif_g_frame(camif_cfg_t *);
-+extern int  camif_win_offset(camif_gc_t *);
-+extern void camif_hw_open(camif_gc_t *);
-+extern void camif_hw_close(camif_cfg_t *);
-+extern int camif_dynamic_open(camif_cfg_t *);
-+extern int camif_dynamic_close(camif_cfg_t *);
-+extern void camif_reset(int,int);
-+extern void camif_setup_sensor(void);
-+extern int camif_g_fifo_status(camif_cfg_t *);
-+extern void camif_last_irq_en(camif_cfg_t *);
-+extern void camif_change_flip(camif_cfg_t *);
-+
-+
-+/* Todo
-+ *  API Interface function to both Character and V4L2 Drivers
-+ */
-+extern int camif_do_write(struct file *,const char *, size_t, loff_t *);
-+extern int camif_do_ioctl(struct inode *, struct file *,unsigned int, void *);
-+
-+
-+/* 
-+ * API for Decoder (S5x532, OV7620..) 
-+ */
-+void camif_register_decoder(struct i2c_client *);
-+void camif_unregister_decoder(struct i2c_client*);
-+
-+
-+
-+/* API for FSM */
-+#define INSTANT_SKIP 0 
-+#define INSTANT_GO   1 
-+
-+extern ssize_t camif_p_1fsm_start(camif_cfg_t *);
-+extern ssize_t camif_p_2fsm_start(camif_cfg_t *);
-+extern ssize_t camif_4fsm_start(camif_cfg_t *);
-+extern ssize_t camif_p_stop(camif_cfg_t *);
-+extern int camif_enter_p_4fsm(camif_cfg_t *);
-+extern int camif_enter_c_4fsm(camif_cfg_t *);
-+extern int camif_enter_2fsm(camif_cfg_t *);
-+extern int camif_enter_1fsm(camif_cfg_t *);
-+extern int camif_check_preview(camif_cfg_t *);
-+extern int camif_callback_start(camif_cfg_t *);
-+extern int camif_clock_init(camif_gc_t *);
-+
-+/* 
-+ *  V4L2 Part
-+ */
-+#define VID_HARDWARE_SAMSUNG_FIMC20   236
-+
-+
-+
-+
-+
-+#endif
-+
-+
-+/* 
-+ * Local variables:
-+ * tab-width: 8
-+ *  c-indent-level: 8
-+ *  c-basic-offset: 8
-+ *  c-set-style: "K&R"
-+ * End:
-+ */
-diff --git a/arch/arm/mach-s3c2440/camera/camif_fsm.c b/arch/arm/mach-s3c2440/camera/camif_fsm.c
-new file mode 100644
-index 0000000..3e2b71a
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/camif_fsm.c
-@@ -0,0 +1,427 @@
-+/*  
-+    Copyright (C) 2004 Samsung Electronics 
-+                     SW.LEE <hitchcar@sec.samsung.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/version.h>
-+#include <linux/module.h>
-+#include <linux/delay.h>
-+#include <linux/errno.h>
-+#include <linux/fs.h>
-+#include <linux/kernel.h>
-+#include <linux/major.h>
-+#include <linux/slab.h>
-+#include <linux/poll.h>
-+#include <linux/signal.h>
-+#include <linux/ioport.h>
-+#include <linux/sched.h>
-+#include <linux/types.h>
-+#include <linux/interrupt.h>
-+#include <linux/kmod.h>
-+#include <linux/vmalloc.h>
-+#include <linux/init.h>
-+#include <linux/pagemap.h>
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <asm/semaphore.h>
-+#include <linux/miscdevice.h>
-+
-+//#define SW_DEBUG 
-+
-+#include "camif.h"
-+const char *fsm_version =
-+        "$Id: camif_fsm.c,v 1.3 2004/04/27 10:26:28 swlee Exp $";
-+
-+
-+/* 
-+ * FSM function is the place where Synchronization in not necessary
-+ * because IRS calls this functions.
-+ */
-+
-+ssize_t camif_p_1fsm_start(camif_cfg_t *cfg)
-+{
-+      //camif_reset(CAMIF_RESET,0);
-+      cfg->exec = CAMIF_DMA_ON;
-+      camif_capture_start(cfg);
-+      camif_last_irq_en(cfg);
-+      cfg->status = CAMIF_STARTED;
-+      cfg->fsm = CAMIF_1nd_INT;
-+      return 0;
-+}
-+
-+
-+ssize_t camif_p_2fsm_start(camif_cfg_t *cfg)
-+{
-+      camif_reset(CAMIF_RESET,0);/* FIFO Count goes to zero */
-+      cfg->exec = CAMIF_DMA_ON;
-+      camif_capture_start(cfg);
-+      cfg->status = CAMIF_STARTED;
-+      cfg->fsm = CAMIF_1nd_INT;
-+      return 0;
-+}
-+
-+
-+ssize_t camif_4fsm_start(camif_cfg_t *cfg)
-+{
-+      camif_reset(CAMIF_RESET,0); /* FIFO Count goes to zero */
-+      cfg->exec = CAMIF_DMA_ON;
-+      camif_capture_start(cfg);
-+      cfg->status = CAMIF_STARTED;
-+      cfg->fsm = CAMIF_1nd_INT;
-+      cfg->perf.frames = 0;
-+      return 0;
-+}
-+
-+
-+/* Policy:  
-+     cfg->perf.frames  set in camif_fsm.c
-+     cfg->status set in video-driver.c
-+ */
-+
-+/* 
-+ * Don't insert camif_reset(CAM_RESET, 0 ) into this func 
-+ */
-+ssize_t camif_p_stop(camif_cfg_t *cfg)
-+{
-+      cfg->exec = CAMIF_DMA_OFF;
-+//    cfg->status = CAMIF_STOPPED;
-+      camif_capture_stop(cfg);
-+      cfg->perf.frames = 0;   /* Dupplicated ? */
-+      return 0;
-+}
-+
-+/* When C working, P asks C to play togehter */
-+/* Only P must call this function */
-+void camif_start_c_with_p (camif_cfg_t *cfg, camif_cfg_t *other)
-+{
-+//    cfg->gc->other = get_camif(CODEC_MINOR);
-+      cfg->gc->other = other;
-+      camif_start_p_with_c(cfg);
-+}
-+
-+static void camif_start_p_with_c(camif_cfg_t *cfg)
-+{
-+      camif_cfg_t *other = (camif_cfg_t *)cfg->gc->other;
-+      /* Preview Stop */
-+      cfg->exec = CAMIF_DMA_OFF;
-+      camif_capture_stop(cfg);
-+      /* Start P and C */
-+      camif_reset(CAMIF_RESET, 0);
-+      cfg->exec =CAMIF_BOTH_DMA_ON;
-+      camif_capture_start(cfg);
-+      cfg->fsm = CAMIF_1nd_INT; /* For Preview */
-+      if(!other) panic("Unexpected Error \n");
-+      other->fsm = CAMIF_1nd_INT; /* For Preview */
-+}
-+
-+static void camif_auto_restart(camif_cfg_t *cfg)
-+{     
-+//    if (cfg->dma_type & CAMIF_CODEC) return;
-+      if (cfg->auto_restart)
-+              camif_start_p_with_c(cfg);
-+}
-+
-+
-+/* Supposed that PREVIEW already running 
-+ * request PREVIEW to start with Codec 
-+ */
-+static int camif_check_global(camif_cfg_t *cfg)
-+{
-+      int ret = 0;
-+       
-+        if (down_interruptible(&cfg->gc->lock)) 
-+                       return -ERESTARTSYS;
-+        if ( cfg->gc->status & CWANT2START ) {
-+              cfg->gc->status &= ~CWANT2START;
-+              cfg->auto_restart = 1;
-+              ret = 1;
-+      }
-+      else {
-+              ret = 0; /* There is no codec */
-+              cfg->auto_restart = 0; /* Duplicated ..Dummy */
-+      }
-+
-+      up(&cfg->gc->lock);
-+
-+        return ret;
-+}
-+
-+/*
-+ *    1nd INT : Start Interrupt
-+ *    Xnd INT : enable Last IRQ : pingpong get the valid data
-+ *    Ynd INT : Stop Codec or Preview : pingpong get the valid data
-+ *    Znd INT : Last IRQ : valid data 
-+ */
-+#define CHECK_FREQ 5
-+int camif_enter_p_4fsm(camif_cfg_t *cfg)
-+{
-+      int ret = 0;
-+
-+      cfg->perf.frames++;
-+      if (cfg->fsm == CAMIF_NORMAL_INT)
-+      if (cfg->perf.frames % CHECK_FREQ == 0) 
-+              ret = camif_check_global(cfg);
-+      if (ret > 0) cfg->fsm = CAMIF_Xnd_INT; /* Codec wait for Preview */
-+      
-+      switch (cfg->fsm) {
-+              case CAMIF_1nd_INT:           /* Start IRQ */
-+                      cfg->fsm = CAMIF_NORMAL_INT;
-+                      ret = INSTANT_SKIP;
-+                      DPRINTK(KERN_INFO "1nd INT \n");        
-+                      break;
-+              case CAMIF_NORMAL_INT:          
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      cfg->fsm = CAMIF_NORMAL_INT;
-+                      ret = INSTANT_GO;
-+                      DPRINTK(KERN_INFO "NORMAL INT \n");     
-+                      break;
-+              case CAMIF_Xnd_INT:             
-+                      camif_last_irq_en(cfg);/* IRQ for Enabling LAST IRQ */
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      cfg->fsm = CAMIF_Ynd_INT;
-+                      ret = INSTANT_GO;
-+                      DPRINTK(KERN_INFO "Xnd INT \n");        
-+                      break;  
-+              case CAMIF_Ynd_INT:        /* Capture Stop */
-+                      cfg->exec = CAMIF_DMA_OFF;
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      camif_capture_stop(cfg);
-+                      cfg->fsm = CAMIF_Znd_INT;
-+                      ret = INSTANT_GO;
-+                      DPRINTK(KERN_INFO "Ynd INT \n");        
-+                      break;
-+              case CAMIF_Znd_INT:             /*  LAST IRQ (Dummy IRQ */
-+                      cfg->fsm = CAMIF_DUMMY_INT;
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      ret = INSTANT_GO;
-+                      camif_auto_restart(cfg);  /* Automatically Restart Camera */
-+                      DPRINTK(KERN_INFO "Znd INT \n");
-+                      break;  
-+              case CAMIF_DUMMY_INT:
-+                      cfg->status = CAMIF_STOPPED; /* Dupplicate ? */
-+                      ret = INSTANT_SKIP;
-+//                    DPRINTK(KERN_INFO "Dummy INT \n"); 
-+                      break;
-+              default:
-+                      printk(KERN_INFO "Unexpect INT %d \n",cfg->fsm); 
-+                      ret = INSTANT_SKIP;
-+                      break;
-+      }
-+      return ret;
-+}
-+
-+
-+/* 
-+ * NO autorestart included in this function 
-+ */
-+int camif_enter_c_4fsm(camif_cfg_t *cfg)
-+{
-+      int ret;
-+      
-+      cfg->perf.frames++;
-+#if 0
-+      if (   (cfg->fsm==CAMIF_NORMAL_INT)
-+          && (cfg->perf.frames>cfg->restart_limit-1)
-+         ) 
-+              cfg->fsm = CAMIF_Xnd_INT;
-+#endif
-+      switch (cfg->fsm) {
-+              case CAMIF_1nd_INT:           /* Start IRQ */
-+                      cfg->fsm = CAMIF_NORMAL_INT;
-+//                    cfg->status = CAMIF_STARTED; /* need this to meet auto-restart */
-+                      ret = INSTANT_SKIP;
-+                      DPRINTK(KERN_INFO "1nd INT \n");
-+                      break;
-+              case CAMIF_NORMAL_INT:          
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      cfg->fsm = CAMIF_NORMAL_INT;
-+                      ret = INSTANT_GO;
-+                      DPRINTK(KERN_INFO "NORMALd INT \n");
-+                      break;
-+              case CAMIF_Xnd_INT:             
-+                      camif_last_irq_en(cfg);/* IRQ for Enabling LAST IRQ */
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      cfg->fsm = CAMIF_Ynd_INT;
-+                      ret = INSTANT_GO;
-+                      DPRINTK(KERN_INFO "Xnd INT \n");
-+                      break;  
-+              case CAMIF_Ynd_INT:        /* Capture Stop */
-+                      cfg->exec = CAMIF_DMA_OFF;
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      camif_capture_stop(cfg);
-+                      cfg->fsm = CAMIF_Znd_INT;
-+                      ret = INSTANT_GO;
-+                      DPRINTK(KERN_INFO "Ynd INT \n");
-+                      break;
-+              case CAMIF_Znd_INT:             /*  LAST IRQ (Dummy IRQ */
-+                      cfg->fsm = CAMIF_DUMMY_INT;
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      ret = INSTANT_GO;
-+                      DPRINTK(KERN_INFO "Znd INT \n");
-+                      break;  
-+              case CAMIF_DUMMY_INT:
-+                      cfg->status = CAMIF_STOPPED; /* Dupplicate ? */
-+                      ret = INSTANT_SKIP;
-+                      break;
-+              default:
-+                      printk(KERN_INFO "Unexpect INT %d \n",cfg->fsm); 
-+                      ret = INSTANT_SKIP;
-+                      break;
-+      }
-+      return ret;
-+}
-+
-+/* 4 Interrups State Machine is for two pingpong  
-+ *    1nd INT : Start Interrupt
-+ *    Xnd INT : enable Last IRQ : pingpong get the valid data
-+ *    Ynd INT : Stop Codec or Preview : pingpong get the valid data
-+ *    Znd INT : Last IRQ : valid data 
-+ *    
-+ * Note:
-+ *    Before calling this func, you must call camif_reset
-+ */
-+
-+int camif_enter_2fsm(camif_cfg_t *cfg) /* Codec FSM */
-+{
-+      int ret;
-+
-+      cfg->perf.frames++;
-+      switch (cfg->fsm) {
-+              case CAMIF_1nd_INT:           /* Start IRQ */
-+                      cfg->fsm = CAMIF_Xnd_INT;
-+                      ret = INSTANT_SKIP;
-+//                    printk(KERN_INFO "1nd INT \n"); 
-+                      break;
-+              case CAMIF_Xnd_INT:             
-+                      camif_last_irq_en(cfg);/* IRQ for Enabling LAST IRQ */
-+                      cfg->now_frame_num = 0;
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      cfg->fsm = CAMIF_Ynd_INT;
-+                      ret = INSTANT_GO;
-+//                    printk(KERN_INFO "2nd INT \n"); 
-+                      break;  
-+              case CAMIF_Ynd_INT:        /* Capture Stop */
-+                      cfg->exec = CAMIF_DMA_OFF;
-+                      cfg->now_frame_num = 1;
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      camif_capture_stop(cfg);
-+                      cfg->fsm = CAMIF_Znd_INT;
-+                      ret = INSTANT_GO;
-+//                    printk(KERN_INFO "Ynd INT \n"); 
-+                      break;
-+              case CAMIF_Znd_INT:             /*  LAST IRQ (Dummy IRQ */
-+                      cfg->now_frame_num = 0;
-+//                    cfg->fsm = CAMIF_DUMMY_INT;
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      ret = INSTANT_GO;
-+//                    printk(KERN_INFO "Znd INT \n");
-+                      break;  
-+              case CAMIF_DUMMY_INT:
-+                      cfg->status = CAMIF_STOPPED; /* Dupplicate ? */
-+                      ret = INSTANT_SKIP;
-+                      printk(KERN_INFO "Dummy INT \n"); 
-+                      break;
-+              default:  /* CAMIF_PENDING_INT */
-+                      printk(KERN_INFO "Unexpect INT \n"); 
-+                      ret = INSTANT_SKIP;
-+                      break;
-+      }
-+      return ret;
-+}
-+
-+
-+/* 2 Interrups State Machine is for one pingpong  
-+ *    1nd INT : Stop Codec or Preview : pingpong get the valid data
-+ *    2nd INT : Last IRQ : dummy data 
-+ */
-+int camif_enter_1fsm(camif_cfg_t *cfg) /* Codec FSM */
-+{
-+      int ret;
-+
-+      cfg->perf.frames++;
-+      switch (cfg->fsm) {
-+              case CAMIF_Ynd_INT:             /* IRQ for Enabling LAST IRQ */
-+                      cfg->exec = CAMIF_DMA_OFF;
-+                      camif_capture_stop(cfg);
-+                      cfg->fsm = CAMIF_Znd_INT;
-+                      ret = INSTANT_SKIP;
-+      //              printk(KERN_INFO "Ynd INT \n"); 
-+                      break;  
-+              case CAMIF_Znd_INT:             /*  LAST IRQ (Dummy IRQ */
-+                      cfg->fsm = CAMIF_DUMMY_INT;
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      ret = INSTANT_GO;
-+      //              printk(KERN_INFO "Znd INT \n"); 
-+                      break;
-+              case CAMIF_DUMMY_INT:
-+                      cfg->status = CAMIF_STOPPED; /* Dupplicate ? */
-+                      ret = INSTANT_SKIP;
-+                      printk(KERN_INFO "Dummy INT \n"); 
-+                      break;
-+              default:
-+                      printk(KERN_INFO "Unexpect INT \n"); 
-+                      ret = INSTANT_SKIP;
-+                      break;
-+      }
-+      return ret;
-+}
-+
-+
-+/*
-+ *  GLOBAL STATUS CONTROL FUNCTION
-+ *
-+ */
-+
-+
-+/* Supposed that PREVIEW already running 
-+ * request PREVIEW to start with Codec 
-+ */
-+int camif_callback_start(camif_cfg_t *cfg)
-+{
-+        int  doit = 1;
-+        while (doit) {
-+                if (down_interruptible(&cfg->gc->lock)) {
-+                        return -ERESTARTSYS;
-+                }
-+                cfg->gc->status = CWANT2START;
-+                cfg->gc->other = cfg;
-+                up(&cfg->gc->lock);
-+                doit = 0;
-+        }
-+        return 0;
-+}
-+
-+/*
-+ * Return status of Preview Machine
-+  ret value :
-+      0: Preview is not working
-+      X: Codec must follow PREVIEW start
-+*/
-+int camif_check_preview(camif_cfg_t *cfg)
-+{
-+        int ret = 0;
-+
-+        if (down_interruptible(&cfg->gc->lock)) {
-+                        ret = -ERESTARTSYS;
-+                        return ret;
-+        }
-+        if (cfg->gc->user == 1) ret = 0;
-+     //   else if (cfg->gc->status & PNOTWORKING) ret = 0;
-+        else ret = 1;
-+        up(&cfg->gc->lock);
-+        return ret;
-+}
-+
-+
-+
-+
-+/*
-+ * Local variables:
-+ * c-basic-offset: 8
-+ * End:
-+ */
-diff --git a/arch/arm/mach-s3c2440/camera/imgsensor.c b/arch/arm/mach-s3c2440/camera/imgsensor.c
-new file mode 100644
-index 0000000..44b7bee
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/imgsensor.c
-@@ -0,0 +1,255 @@
-+/*
-+ *  Copyright (C) 2004 Samsung Electronics 
-+ *             SW.LEE <hitchcar@samsung.com>
-+ *
-+ *  Copyright (C) 2000 Russell King : pcf8583.c
-+ *
-+ * 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 FIMC20 Camera Decoder 
-+ */
-+
-+#include <linux/config.h>
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/i2c.h>
-+#include <linux/slab.h>
-+#include <linux/string.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+
-+
-+#ifdef CONFIG_ARCH_S3C24A0A
-+#else
-+#include <asm/arch/S3C2440.h>
-+#endif
-+
-+#define SW_DEBUG
-+#include "camif.h"
-+#include "sensor.h"
-+
-+#ifndef SAMSUNG_SXGA_CAM
-+#include "s5x532_rev36.h"
-+#else
-+#include "sxga.h"
-+#endif
-+
-+static const char *sensor_version =
-+        "$Id: imgsensor.c,v 1.11 2004/06/10 12:45:40 swlee Exp $";
-+
-+
-+static struct i2c_driver s5x532_driver;
-+static camif_gc_t data = {
-+      itu_fmt:      CAMIF_ITU601,
-+      order422:     CAMIF_YCBYCR,
-+      camclk:       24000000,
-+#ifndef SAMSUNG_SXGA_CAM
-+      source_x:     640,
-+      source_y:     480,
-+      win_hor_ofst: 112,
-+      win_ver_ofst: 20,
-+#else
-+      source_x:     1280,
-+      source_y:     1024,
-+      win_hor_ofst: 0,
-+      win_ver_ofst: 0,
-+#endif
-+      polarity_pclk:1,
-+      polarity_href:0,
-+#ifdef CONFIG_ARCH_S3C24A0A
-+      reset_type:CAMIF_EX_RESET_AL, /* Active Low */
-+#else
-+      reset_type:CAMIF_EX_RESET_AH, /* Ref board has inverted signal */
-+#endif
-+      reset_udelay:2000,
-+};
-+
-+#define CAM_ID 0x5a
-+
-+static unsigned short ignore[] = { I2C_CLIENT_END };
-+static unsigned short normal_addr[] = { (CAM_ID>>1), I2C_CLIENT_END };
-+static struct i2c_client_address_data addr_data = {
-+      normal_i2c:             normal_addr,
-+      normal_i2c_range:       ignore,
-+      probe:                  ignore,
-+      probe_range:            ignore,
-+      ignore:                 ignore,
-+      ignore_range:           ignore,
-+      force:                  ignore,
-+};
-+
-+s5x532_t s5x532_regs_mirror[S5X532_REGS];
-+
-+unsigned char 
-+s5x532_read(struct i2c_client *client,unsigned char subaddr)
-+{
-+      int ret;
-+      unsigned char buf[1];
-+      struct i2c_msg msg ={ client->addr, 0, 1, buf};
-+      buf[0] = subaddr;
-+
-+      ret = i2c_transfer(client->adapter,&msg, 1) == 1 ? 0 : -EIO;
-+      if (ret == -EIO) {
-+        printk(" I2C write Error \n");
-+        return -EIO;
-+      }
-+      
-+      msg.flags = I2C_M_RD;
-+      ret = i2c_transfer(client->adapter, &msg, 1) == 1 ? 0 : -EIO;
-+
-+      return buf[0];
-+}
-+
-+
-+static int
-+s5x532_write(struct i2c_client *client,
-+                unsigned char subaddr, unsigned char val)
-+{
-+       unsigned char buf[2];
-+       struct i2c_msg msg = { client->addr, 0, 2, buf};
-+
-+       buf[0]= subaddr;
-+       buf[1]= val;
-+
-+       return i2c_transfer(client->adapter, &msg, 1) == 1 ? 0 : -EIO;
-+}
-+
-+void inline s5x532_init(struct i2c_client *sam_client)
-+{
-+      int i;
-+
-+      printk(KERN_ERR "s5x532_init  \n");
-+      for (i = 0; i < S5X532_INIT_REGS; i++) {
-+              s5x532_write(sam_client,
-+                            s5x532_reg[i].subaddr, s5x532_reg[i].value );
-+      }
-+
-+#ifdef YOU_WANT_TO_CHECK_IMG_SENSOR 
-+      for (i = 0; i < S5X532_INIT_REGS;i++) {
-+              if ( s5x532_reg[i].subaddr == PAGE_ADDRESS ) { 
-+                      s5x532_write(sam_client,
-+                            s5x532_reg[i].subaddr, s5x532_reg[i].value);
-+
-+                      printk(KERN_ERR "Page: Subaddr %02x = 0x%02x\n", 
-+                             s5x532_reg[i].subaddr, s5x532_regs_mirror[i].value);
-+      
-+
-+              } else 
-+              {      
-+                      s5x532_regs_mirror[i].subaddr = s5x532_reg[i].subaddr; 
-+                      s5x532_regs_mirror[i].value = 
-+                      s5x532_read(sam_client,s5x532_reg[i].subaddr);
-+                      printk(KERN_ERR "Subaddr %02x = 0x%02x\n", 
-+                             s5x532_reg[i].subaddr, s5x532_regs_mirror[i].value);
-+              }
-+      }
-+#endif
-+       
-+}
-+
-+static int
-+s5x532_attach(struct i2c_adapter *adap, int addr, unsigned short flags,int kind)
-+{
-+      struct i2c_client *c;
-+
-+      c = kmalloc(sizeof(*c), GFP_KERNEL);
-+      if (!c) return -ENOMEM;
-+
-+      strcpy(c->name, "S5X532");
-+      c->id           = s5x532_driver.id;
-+      c->flags        = I2C_CLIENT_ALLOW_USE;
-+      c->addr         = addr;
-+      c->adapter      = adap;
-+      c->driver       = &s5x532_driver;
-+      c->data         = &data;
-+      data.sensor     = c; 
-+
-+      camif_register_decoder(c);
-+      return i2c_attach_client(c);
-+}
-+
-+static int s5x532_probe(struct i2c_adapter *adap)
-+{ 
-+      return i2c_probe(adap, &addr_data, s5x532_attach);
-+}
-+
-+static int s5x532_detach(struct i2c_client *client)
-+{
-+      i2c_detach_client(client);
-+      camif_unregister_decoder(client);
-+      return 0;
-+}
-+
-+static int
-+s5x532_command(struct i2c_client *client, unsigned int cmd, void *arg)
-+{
-+        switch (cmd) {
-+        case SENSOR_INIT:
-+                 s5x532_init(client);
-+               printk(KERN_INFO "CAMERA: S5X532 Sensor initialized\n");
-+               break;
-+      case USER_ADD:
-+              MOD_INC_USE_COUNT;
-+              break;
-+      case USER_EXIT:
-+              MOD_DEC_USE_COUNT;
-+              break;
-+/* Todo
-+      case SENSOR_BRIGHTNESS:
-+              change_sensor();
-+              break;
-+*/
-+      default:        
-+              panic("Unexpect Sensor Command \n");
-+              break;
-+        }
-+      return 0;
-+}
-+
-+static struct i2c_driver s5x532_driver = {
-+      name:           "S5X532",
-+      id:             I2C_ALGO_S3C,
-+      flags:          I2C_DF_NOTIFY,
-+      attach_adapter: s5x532_probe,
-+      detach_client:  s5x532_detach,
-+      command:        s5x532_command
-+};
-+
-+static void iic_gpio_port(void) 
-+{
-+#ifdef CONFIG_ARCH_S3C24A0A
-+#else
-+      GPECON &=  ~(0xf <<28);
-+      GPECON |=    0xa <<28;
-+#endif
-+}
-+
-+static __init int camif_sensor_init(void)
-+{
-+        iic_gpio_port();
-+      return i2c_add_driver(&s5x532_driver);
-+}
-+
-+
-+static __init void camif_sensor_exit(void)
-+{
-+      i2c_del_driver(&s5x532_driver);
-+}
-+
-+module_init(camif_sensor_init)
-+module_exit(camif_sensor_exit)
-+
-+MODULE_AUTHOR("SW.LEE <hitchcar@sec.samsung.com>");
-+MODULE_DESCRIPTION("I2C Client Driver For Fimc2.0 MISC Driver");
-+MODULE_LICENSE("GPL");
-+
-+
-+
-+/*
-+ * Local variables:
-+ * c-basic-offset: 8
-+ * End:
-+ */
-diff --git a/arch/arm/mach-s3c2440/camera/miscdevice.h b/arch/arm/mach-s3c2440/camera/miscdevice.h
-new file mode 100644
-index 0000000..2e1cfbc
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/miscdevice.h
-@@ -0,0 +1,18 @@
-+
-+ /*----------------------------------------------------------
-+  *   (C) 2004 Samsung Electronics
-+  *   SW.LEE < hitchcar@samsung.com>
-+  * 
-+  ----------------------------------------------------------- */
-+
-+#ifndef _LINUX_S3C_MISCDEVICE_H
-+#define _LINUX_S3C_MISCDEVICE_H
-+
-+#define CODEC_MINOR 212
-+#define PREVIEW_MINOR 213
-+
-+
-+
-+
-+
-+#endif
-diff --git a/arch/arm/mach-s3c2440/camera/qt-driver.c b/arch/arm/mach-s3c2440/camera/qt-driver.c
-new file mode 100644
-index 0000000..0c5dd40
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/qt-driver.c
-@@ -0,0 +1,169 @@
-+/*
-+ * SW.LEE <hitchcar@samsung.com>
-+ *   
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License 2. See the file COPYING in the main directory of this archive
-+ * for more details.
-+ */
-+
-+#include <linux/version.h>
-+#include <linux/module.h>
-+#include <linux/delay.h>
-+#include <linux/errno.h>
-+#include <linux/fs.h>
-+#include <linux/kernel.h>
-+#include <linux/major.h>
-+#include <linux/slab.h>
-+#include <linux/poll.h>
-+#include <linux/signal.h>
-+#include <linux/ioport.h>
-+#include <linux/sched.h>
-+#include <linux/types.h>
-+#include <linux/interrupt.h>
-+#include <linux/kmod.h>
-+#include <linux/vmalloc.h>
-+#include <linux/init.h>
-+#include <asm/io.h>
-+#include <asm/page.h>
-+#include <asm/irq.h>
-+#include <asm/semaphore.h>
-+#include <linux/miscdevice.h>
-+                                                                                                           
-+//#define SW_DEBUG
-+                                                                                                           
-+#include "camif.h"
-+#include "videodev.h"
-+#include "miscdevice.h"
-+#include "cam_reg.h"
-+#include "sensor.h"
-+#include "userapp.h"
-+                                                                                                           
-+
-+/************************* Sharp Zarus API **************************
-+* refering to Camera Driver API for SL-5000D/SL-5600 revision 1.00 
-+*                             April 11, 2002.
-+  SW.LEE <hitchcar@sec.samsung.com>
-+              I want to use Sharp Camera Application. 
-+*
-+*/
-+
-+#define READ_MODE_STATUS      0x1
-+#define READ_MODE_IMAGE               0x0
-+#define CAPTURE_SPEED
-+#define       H_FLIP  
-+#define V_FLIP
-+typedef enum sharp_readmode 
-+{
-+        IMAGE = 0, STATUS = 1,
-+        FASTER = 0, BETTER = 2,
-+        XNOFLIP = 0, XFLIP = 4,
-+        YNOFLIP = 0, YFLIP = 8,
-+        AUTOMATICFLIP = -1
-+} ReadMode_t;
-+
-+
-+static struct sharp_param_t {
-+      ReadMode_t readMode;
-+      char CameraStatus[4];
-+} sharp_param = { STATUS, {'s','m','c','A'}};
-+
-+
-+camif_param_t qt_parm = { 640,480,240,320,16,0};
-+      
-+static void setReadMode(const char *b,size_t count)
-+{
-+      int i =   *(b+2) - 48 ;
-+      if ( 4 == count ) {
-+              i = (*(b+3) - 48)  + i * 10;
-+      }
-+
-+      //      DPRINTK(" setReadMode %s conversion value %d \n",b , i); 
-+      if ( i & STATUS ) { 
-+      //      DPRINTK(" STATUS MODE \n");
-+              sharp_param.readMode = i;
-+      }
-+      else  {
-+      //      DPRINTK(" IMAGE MODE \n");
-+              sharp_param.readMode = i;
-+      }
-+}
-+
-+
-+
-+
-+extern ssize_t camif_p_read(struct file *, char *, size_t , loff_t *);
-+
-+ssize_t z_read(struct file *f, char *buf, size_t count, loff_t *pos)
-+{
-+      size_t end;
-+
-+      if (sharp_param.readMode & STATUS ) {
-+              buf[0] = sharp_param.CameraStatus[0];
-+              buf[1] = sharp_param.CameraStatus[1];
-+              buf[2] = sharp_param.CameraStatus[2];
-+              buf[3] = sharp_param.CameraStatus[3];
-+              end = 4;
-+              return end;
-+      } 
-+      else {  /* Image ReadMode */
-+              /*
-+              if (( sharp_param.readMode & (BETTER|X  FLIP|YFLIP)))
-+                      DPRINTK("  Not Supporting BETTER|XFLIP|YFLIP\n");
-+              */
-+              return camif_p_read(f,buf,count,pos);
-+      }
-+}
-+
-+static void z_config(camif_cfg_t *cfg,int x, int y)
-+{
-+      cfg->target_x = x;
-+      cfg->target_y = y;
-+      cfg->fmt = CAMIF_RGB16;
-+      if (camif_dynamic_open(cfg)) {
-+              panic(" Eror Happens \n");
-+      }
-+}
-+
-+
-+ssize_t z_write(struct file *f, const char *b, size_t c, loff_t *pos)
-+{
-+      int array[5];
-+      int zoom = 1;
-+      camif_cfg_t *cfg;
-+
-+      cfg = get_camif(MINOR(f->f_dentry->d_inode->i_rdev));
-+//    DPRINTK(" param %s count %d \n",b, c );
-+
-+      switch(*b) {
-+      case 'M':       
-+              setReadMode(b, c);
-+              break;
-+      case 'B':       /* Clear the latch flag of shutter button */
-+              DPRINTK("  clear latch flag of camera's shutter button\n");
-+              sharp_param.CameraStatus[0]='s';
-+              break;
-+      case 'Y':       /* I don't know how to set Shutter pressed */   
-+              DPRINTK("  set latch flag n");
-+              sharp_param.CameraStatus[0]='S';
-+              break;
-+      case 'S':       /* Camera Image Resolution */
-+      case 'R':       /* Donot support Rotation */
-+      DPRINTK(" param %s count %d \n",b, c );
-+              get_options((char *)(b+2), 5, array);
-+              if ( array[3] == 512 ) zoom = 2;
-+              z_config(cfg, array[1] * zoom , array[2] * zoom );
-+              camif_4fsm_start(cfg);
-+              break;
-+      case 'C':
-+      DPRINTK(" param %s count %d \n",b, c );
-+              DPRINTK("  Start the camera to capture \n");
-+              sharp_param.CameraStatus[2]='C';
-+              camif_4fsm_start(cfg);
-+              break;
-+      default:
-+              printk("Unexpected  param %s count %d \n",b, c );
-+      }
-+
-+      return c;
-+}
-+
-diff --git a/arch/arm/mach-s3c2440/camera/qt.h b/arch/arm/mach-s3c2440/camera/qt.h
-new file mode 100644
-index 0000000..e58368a
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/qt.h
-@@ -0,0 +1,18 @@
-+/*
-+ * SW.LEE <hitchcar@samsung.com>
-+ *   
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License 2. See the file COPYING in the main directory of this archive
-+ * for more details.
-+ */
-+
-+#ifndef __Z_API_H_
-+#define __Z_API_H_
-+
-+extern ssize_t z_read(struct file *f, char *buf, size_t count, loff_t *pos);
-+extern ssize_t z_write(struct file *f, const char *b, size_t c, loff_t *pos);
-+
-+
-+
-+#endif
-+
-diff --git a/arch/arm/mach-s3c2440/camera/s5x532.h b/arch/arm/mach-s3c2440/camera/s5x532.h
-new file mode 100644
-index 0000000..12725f4
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/s5x532.h
-@@ -0,0 +1,143 @@
-+/*
-+ * 2004 (C) Samsung Electronics 
-+ *  SW.LEE <hitchcar@sec.samsung.com>
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License 2. See the file COPYING in the main directory of this archive
-+ * for more details.
-+ */
-+
-+
-+#ifndef _SMDK2440_S5X532_H_
-+#define _SMDK2440_S5X532_H_
-+
-+
-+#define CHIP_DELAY 0xFF
-+
-+typedef struct samsung_t{
-+      unsigned char subaddr;
-+      unsigned char value;
-+      unsigned char page;     
-+} s5x532_t;
-+
-+s5x532_t s5x532_reg[] = {
-+      // page 5
-+      {0xec,0x05},
-+      {0x08,0x55,0x5},
-+      {0x0a,0x75,0x5},
-+      {0x0c,0x90,0x5},
-+      {0x0e,0x18,0x5},
-+      {0x12,0x09,0x5},
-+      {0x14,0x9d,0x5},
-+      {0x16,0x90,0x5},
-+      {0x1a,0x18,0x5},
-+      {0x1c,0x0c,0x5},
-+      {0x1e,0x09,0x5},
-+      {0x20,0x06,0x5},
-+      {0x22,0x20,0x5},
-+      {0x2a,0x00,0x5},
-+      {0x2d,0x04,0x5},
-+      {0x12,0x24,0x5},
-+      // page 3
-+      {0xec,0x03,0x3},
-+      {0x0c,0x09,0x3},
-+      {0x6c,0x09,0x3},
-+      {0x2b,0x10,0x3}, // momo clock inversion
-+      // page 2
-+      {0xec,0x02,0x2},
-+      {0x03,0x09,0x2},
-+      {0x05,0x08,0x2},
-+      {0x06,0x01,0x2},
-+      {0x07,0xf8,0x2},
-+      {0x15,0x25,0x2},
-+      {0x30,0x29,0x2},
-+      {0x36,0x12,0x2},
-+      {0x38,0x04,0x2},
-+      {0x1b,0x77,0x2}, // 24MHz : 0x77, 12MHz : 0x22
-+      {0x1c,0x77,0x2}, // 24MHz : 0x77, 12MHz : 0x22
-+      // page 1
-+      {0xec,0x01,0x1},
-+      {0x00,0x03,0x1}, // 
-+      {0x0a,0x08,0x1}, // 0x0-QQVGA, 0x06-CIF, 0x02-QCIF, 0x08-VGA, 0x04-QVGA, 0x0a-SXGA
-+      {0x0c,0x00,0x1}, // Pattern selectio. 0-CIS, 1-Color bar, 2-Ramp, 3-Blue screen
-+      {0x10,0x27,0x1},
-+      // 0x21-ITU-R656(CrYCbY), 0x25-ITU-R601(CrYCbY), 0x26-ITU-R601(YCbYCr)
-+      {0x50,0x21,0x1},                // Hblank
-+      {0x51,0x00,0x1},                // Hblank
-+      {0x52,0xA1,0x1},                // Hblank
-+      {0x53,0x02,0x1},                // Hblank
-+      {0x54,0x01,0x1},                // Vblank
-+      {0x55,0x00,0x1},                // Vblank
-+      {0x56,0xE1,0x1},                // Vblank               
-+      {0x57,0x01,0x1},                // Vblank
-+      {0x58,0x21,0x1},                // Hsync
-+      {0x59,0x00,0x1},                // Hsync
-+      {0x5a,0xA1,0x1},                // Hsync
-+      {0x5b,0x02,0x1},                // Hsync
-+      {0x5c,0x03,0x1},                // Vref
-+      {0x5d,0x00,0x1},                // Vref
-+      {0x5e,0x05,0x1},                // Vref
-+      {0x5f,0x00,0x1},                // Vref 
-+      {0x70,0x0E,0x1},
-+      {0x71,0xD6,0x1},
-+      {0x72,0x30,0x1},
-+      {0x73,0xDB,0x1},
-+      {0x74,0x0E,0x1},
-+      {0x75,0xD6,0x1},
-+      {0x76,0x18,0x1},
-+      {0x77,0xF5,0x1},
-+      {0x78,0x0E,0x1},
-+      {0x79,0xD6,0x1},
-+      {0x7a,0x28,0x1},
-+      {0x7b,0xE6,0x1},
-+      {0x50,0x00,0x1},
-+      {0x5c,0x00,0x1},
-+
-+      // page 0
-+      {0xec,0x00,0x0},
-+      {0x79,0x01,0x0},
-+      {0x58,0x90,0x0},
-+      {0x59,0xA0,0x0},
-+      {0x5a,0x50,0x0},
-+      {0x5b,0x70,0x0},
-+      {0x5c,0xD0,0x0},
-+      {0x5d,0xC0,0x0},
-+      {0x5e,0x28,0x0},
-+      {0x5f,0x08,0x0},
-+      {0x50,0x90,0x0},
-+      {0x51,0xA0,0x0},
-+      {0x52,0x50,0x0},
-+      {0x53,0x70,0x0},
-+      {0x54,0xD0,0x0},
-+      {0x55,0xC0,0x0},
-+      {0x56,0x28,0x0},
-+      {0x57,0x00,0x0},
-+      {0x48,0x90,0x0},
-+      {0x49,0xA0,0x0},
-+      {0x4a,0x50,0x0},
-+      {0x4b,0x70,0x0},
-+      {0x4c,0xD0,0x0},
-+      {0x4d,0xC0,0x0},
-+      {0x4e,0x28,0x0},
-+      {0x4f,0x08,0x0},
-+      {0x72,0x82,0x0}, // main clock = 24MHz:0xd2, 16M:0x82, 12M:0x54
-+      {0x75,0x05,0x0} // absolute vertical mirror.  junon
-+
-+};
-+
-+
-+#define S5X532_INIT_REGS (sizeof(s5x532_reg)/sizeof(s5x532_reg[0]))
-+#define S5X532_RISC_REGS 0xEB  
-+#define S5X532_ISP_REGS 0xFB /* S5C7323X */
-+#define S5X532_CIS_REGS 0x2F /* S5K437LA03 */
-+
-+
-+#define PAGE_ADDRESS      0xEC
-+
-+//#define S5X532_REGS (S5X532_RISC_REGS+S5X532_ISP_REGS+S5X532_CIS_REGS)
-+#define S5X532_REGS (0x1000)
-+
-+
-+
-+#endif
-+
-+
-diff --git a/arch/arm/mach-s3c2440/camera/s5x532_rev36.h b/arch/arm/mach-s3c2440/camera/s5x532_rev36.h
-new file mode 100644
-index 0000000..b662e9c
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/s5x532_rev36.h
-@@ -0,0 +1,208 @@
-+/*
-+ * 2004 (C) Samsung Electronics 
-+ *  SW.LEE <hitchcar@sec.samsung.com>
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License 2. See the file COPYING in the main directory of this archive
-+ * for more details.
-+ */
-+
-+
-+#ifndef _SMDK2440_S5X532_H_
-+#define _SMDK2440_S5X532_H_
-+
-+
-+#define CHIP_DELAY 0xFF
-+
-+typedef struct samsung_t{
-+      unsigned char subaddr;
-+      unsigned char value;
-+      unsigned char page;     
-+} s5x532_t;
-+
-+s5x532_t s5x532_reg[] = {
-+
-+      //=============== page0 ===============//
-+      {0xec,0x00,0x00},
-+      {0x02,0x00,0x00},
-+      {0x14,0x60,0x00},
-+      {0x15,0x60,0x00},
-+      {0x16,0x60,0x00},
-+      {0x1b,0x20,0x00},
-+      {0x1c,0x20,0x00},
-+      {0x1d,0x20,0x00},
-+      {0x1e,0x20,0x00},
-+      {0x72,0xdc,0x00},
-+      {0x73,0x11,0x00},
-+      {0x76,0x82,0x00},
-+      {0x77,0x90,0x00},
-+      {0x78,0x6c,0x00},
-+      {0x0a,0x02,0x00},
-+      {0x34,0x0d,0x00},
-+      {0x35,0x0a,0x00},
-+      {0x36,0x05,0x00},
-+      {0x37,0x05,0x00},
-+      {0x38,0x06,0x00},
-+      {0x39,0x08,0x00},
-+      {0x3A,0x0d,0x00},
-+      {0x3B,0x0d,0x00},
-+      {0x3C,0x18,0x00},
-+      {0x3D,0xE0,0x00},
-+      {0x3E,0x20,0x00},
-+      {0x66,0x02,0x00},
-+      {0x6c,0x40,0x00},
-+      {0x7c,0x01,0x00},
-+      {0x0D,0x24,0x00},
-+      {0x40,0x1B,0x00},
-+      {0x41,0x4F,0x00},
-+      {0x42,0x24,0x00},
-+      {0x43,0x3E,0x00},
-+      {0x44,0x32,0x00},
-+      {0x45,0x30,0x00},
-+      {0x48,0xa0,0x00},
-+      {0x49,0xd0,0x00},
-+      {0x4A,0x28,0x00},
-+      {0x4B,0x7d,0x00},
-+      {0x4C,0xd0,0x00},
-+      {0x4D,0xe0,0x00},
-+      {0x4E,0x1a,0x00},
-+      {0x4F,0xa0,0x00},
-+      {0x50,0xc0,0x00},
-+      {0x51,0xc0,0x00},
-+      {0x52,0x42,0x00},
-+      {0x53,0x7e,0x00},
-+      {0x54,0xc0,0x00},
-+      {0x55,0xf0,0x00},
-+      {0x56,0x1e,0x00},
-+      {0x57,0xe0,0x00},
-+      {0x58,0xc0,0x00},
-+      {0x59,0xa0,0x00},
-+      {0x5A,0x4a,0x00},
-+      {0x5B,0x7e,0x00},
-+      {0x5C,0xc0,0x00},
-+      {0x5D,0xf0,0x00},
-+      {0x5E,0x2a,0x00},
-+      {0x5F,0x10,0x00},
-+      {0x79,0x00,0x00},          
-+      {0x7a,0x00,0x00},
-+      {0xe0,0x0f,0x00},
-+      {0xe3,0x14,0x00}, 
-+      {0xe5,0x48,0x00},
-+      {0xe7,0x58,0x00},
-+
-+      //=============== page1 ===============//
-+      {0xec,0x01,0x01},
-+      {0x10,0x05,0x01},
-+      {0x20,0xde,0x01},
-+      {0x0b,0x06,0x01},
-+      {0x30,0x00,0x01},
-+      {0x31,0x00,0x01},
-+      {0x32,0x00,0x01},
-+      {0x24,0x28,0x01},
-+      {0x25,0x3F,0x01},
-+      {0x26,0x65,0x01},
-+      {0x27,0xA1,0x01},
-+      {0x28,0xFF,0x01},
-+      {0x29,0x96,0x01},
-+      {0x2A,0x85,0x01},
-+      {0x2B,0xFF,0x01},
-+      {0x2C,0x00,0x01},
-+      {0x2D,0x1B,0x01},
-+      {0xB0,0x28,0x01},
-+      {0xB1,0x3F,0x01},
-+      {0xB2,0x65,0x01},
-+      {0xB3,0xA1,0x01},
-+      {0xB4,0xFF,0x01},
-+      {0xB5,0x96,0x01},
-+      {0xB6,0x85,0x01},
-+      {0xB7,0xFF,0x01},
-+      {0xB8,0x00,0x01},
-+      {0xB9,0x1B,0x01},
-+      {0x15,0x15,0x01},
-+      {0x18,0x85,0x01},
-+      {0x1f,0x05,0x01},
-+      {0x87,0x40,0x01},
-+      {0x37,0x60,0x01},
-+      {0x38,0xd5,0x01},
-+      {0x48,0xa0,0x01},
-+      {0x61,0x54,0x01},
-+      {0x62,0x54,0x01},
-+      {0x63,0x14,0x01},
-+      {0x64,0x14,0x01},
-+      {0x6d,0x12,0x01},
-+      {0x78,0x09,0x01},
-+      {0x79,0xD7,0x01},
-+      {0x7A,0x14,0x01},
-+      {0x7B,0xEE,0x01},
-+                       
-+      //=============== page2 ===============//
-+      {0xec,0x02,0x02},
-+      {0x2c,0x76,0x02},
-+      {0x25,0x25,0x02},
-+      {0x27,0x27,0x02},
-+      {0x30,0x29,0x02},
-+      {0x36,0x08,0x02},
-+      {0x38,0x04,0x02},
-+
-+      //=============== page3 ===============//
-+      {0xec,0x03,0x03},
-+      {0x08,0x00,0x03},
-+      {0x09,0x33,0x03},
-+
-+      //=============== page4 ===============//
-+      {0xec,0x04,0x04},
-+      {0x00,0x21,0x04},
-+      {0x01,0x00,0x04},            
-+      {0x02,0x9d,0x04},            
-+      {0x03,0x02,0x04},            
-+      {0x04,0x04,0x04},         
-+      {0x05,0x00,0x04},            
-+      {0x06,0x1f,0x04},          
-+      {0x07,0x02,0x04},            
-+      {0x08,0x21,0x04},            
-+      {0x09,0x00,0x04},            
-+      {0x0a,0x9d,0x04},           
-+      {0x0b,0x02,0x04},            
-+      {0x0c,0x04,0x04},             
-+      {0x0d,0x00,0x04},            
-+      {0x0e,0x20,0x04},            
-+      {0x0f,0x02,0x04},            
-+      {0x1b,0x3c,0x04},            
-+      {0x1c,0x3c,0x04},            
-+
-+      //=============== page5 ===============//
-+      {0xec,0x05,0x05},                               
-+      {0x1f,0x00,0x05},                               
-+      {0x08,0x59,0x05},            
-+      {0x0a,0x71,0x05},            
-+      {0x1e,0x23,0x05},            
-+      {0x0e,0x3c,0x05},            
-+
-+      //=============== page7 ===============//
-+      {0xec,0x07,0x07},
-+      {0x11,0xfe,0x07},
-+
-+      // added by junon
-+      {0xec,0x01,0x07}, 
-+      {0x10,0x26,0x07},
-+      // 0x21-ITU-R656(CbYCrY), 0x25-ITU-R601(CbYCrY), 0x26-ITU-R601(YCrYCb)
-+
-+
-+};
-+
-+
-+#define S5X532_INIT_REGS (sizeof(s5x532_reg)/sizeof(s5x532_reg[0]))
-+#define S5X532_RISC_REGS 0xEB  
-+#define S5X532_ISP_REGS 0xFB /* S5C7323X */
-+#define S5X532_CIS_REGS 0x2F /* S5K437LA03 */
-+
-+
-+#define PAGE_ADDRESS      0xEC
-+
-+//#define S5X532_REGS (S5X532_RISC_REGS+S5X532_ISP_REGS+S5X532_CIS_REGS)
-+#define S5X532_REGS (0x1000)
-+
-+
-+
-+#endif
-+
-+
-diff --git a/arch/arm/mach-s3c2440/camera/sensor.h b/arch/arm/mach-s3c2440/camera/sensor.h
-new file mode 100644
-index 0000000..e28d01c
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/sensor.h
-@@ -0,0 +1,20 @@
-+/*
-+ *
-+ *  Copyright (C) 2004 Samsung Electronics
-+ *            SW.LEE <hitchcar@sec.samsung.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.
-+ */
-+
-+#ifndef __SENSOR_CMD_H_
-+#define __SENSOR_CMD_H_
-+
-+#include "bits.h"
-+
-+#define SENSOR_INIT   BIT0
-+#define USER_ADD        BIT1
-+#define USER_EXIT       BIT2
-+
-+#endif
-diff --git a/arch/arm/mach-s3c2440/camera/sxga.h b/arch/arm/mach-s3c2440/camera/sxga.h
-new file mode 100644
-index 0000000..b41305a
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/sxga.h
-@@ -0,0 +1,504 @@
-+/*
-+ * 2004 (C) Samsung Electronics 
-+ *  SW.LEE <hitchcar@sec.samsung.com>
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License 2. See the file COPYING in the main directory of this archive
-+ * for more details.
-+ */
-+
-+
-+#ifndef _SAMSUNG_SXGA_H_
-+#define _SAMSUNG_SXGA_H_
-+
-+
-+#define CHIP_DELAY 0xFF
-+
-+typedef struct samsung_t{
-+      unsigned char subaddr;
-+      unsigned char value;
-+      unsigned char page;     
-+} s5x532_t;
-+
-+s5x532_t s5x532_reg[] = {
-+      // page 0
-+      {0xec,0x00,0x0},
-+      {0x0c,0x38,0x0},
-+      {0x0d,0x24,0x0},
-+      {0x13,0x10,0x0},
-+      {0x14,0x10,0x0},
-+      {0x15,0x10,0x0},
-+      {0x16,0x10,0x0},
-+      {0x17,0x20,0x0},
-+      {0x18,0x30,0x0},
-+      {0x19,0x30,0x0},
-+      {0x1a,0x10,0x0},
-+      {0x1b,0x10,0x0},
-+      
-+      {0x2d,0x40,0x0},
-+      {0x3e,0x10,0x0},
-+      {0x34,0x0a,0x0},
-+      {0x39,0x04,0x0},
-+      {0x3a,0x02,0x0},
-+      {0x31,0x05,0x0},
-+
-+      {0x40,0x1d,0x0},
-+      {0x41,0x50,0x0},
-+      {0x42,0x24,0x0},
-+      {0x43,0x3f,0x0},
-+      {0x44,0x30,0x0},
-+      {0x45,0x31,0x0},
-+
-+      {0x48,0xa0,0x0},
-+      {0x49,0xc0,0x0},
-+      {0x4a,0x58,0x0},
-+      {0x4b,0x50,0x0},
-+      {0x4c,0xb0,0x0},
-+      {0x4d,0xc0,0x0},
-+      {0x4e,0x30,0x0},
-+      {0x4f,0x20,0x0},
-+
-+      {0x50,0xa0,0x0},
-+      {0x51,0xc0,0x0},
-+      {0x52,0x50,0x0},
-+      {0x53,0x60,0x0},
-+      {0x54,0xb0,0x0},
-+      {0x55,0xc0,0x0},
-+      {0x56,0x20,0x0},
-+      {0x57,0x08,0x0},
-+//    {0x72,0x50,0x0}, // Clock 16
-+      {0x72,0x78,0x0}, // Clock 24Mhz
-+//    {0x72,0xf0,0x0}, // Clock 48Mhz
-+      // page 1
-+      {0xec,0x01,0x1},
-+      {0x10,0x17,0x1}, // ITU-R601
-+                       /* 
-+                         [3:2] : out_sel 
-+                           00 : 656
-+                           01 : 601
-+                           10 : RGB
-+                           11 : CIS
-+                         [1] : YC_SEL  
-+                         [0] : CBCR_SEL
-+                       */
-+
-+      {0x0b,0x06,0x1}, // 6
-+      {0x20,0xa8,0x1}, //b0); // Highlight C Supp 040215 
-+      {0x22,0x26,0x1}, //2f); 040225
-+  
-+      {0x24,0x08,0x1}, //00); //1F); 040226
-+      {0x25,0x10,0x1}, //10); //34);
-+      {0x26,0x40,0x1}, //56);
-+      {0x27,0x80,0x1}, //8D);
-+      {0x28,0x2c,0x1}, //E7);
-+      {0x29,0xd6,0x1}, //7C);
-+      {0x2A,0x0c,0x1}, //70);
-+      {0x2B,0xFF,0x1}, //FF);
-+      {0x2C,0x00,0x1}, //00);
-+      {0x2D,0x5f,0x1}, //1B);
-+      //    
-+      {0xB0,0x08,0x1}, //00); //1F); 040226
-+      {0xB1,0x10,0x1}, //10); //34);50
-+      {0xB2,0x40,0x1}, //36); 
-+      {0xB3,0x80,0x1}, //6D);
-+      {0xB4,0x2c,0x1}, //b7);
-+      {0xB5,0xd6,0x1}, //7C);
-+      {0xB6,0x0c,0x1}, //70);
-+      {0xB7,0xFF,0x1}, //FF);
-+      {0xB8,0x00,0x1}, //00);
-+      {0xB9,0x5f,0x1}, //1B);
-+
-+
-+      {0xc2,0x01,0x1}, // shading On
-+      {0xc3,0x80,0x1},
-+      {0xc4,0x02,0x1},
-+      {0xc5,0x00,0x1},
-+      {0xc6,0x01,0x1},
-+      {0xc7,0x00,0x1},
-+      {0xc8,0x05,0x1},
-+      {0xc9,0x00,0x1},
-+      {0xca,0x04,0x1},
-+ 
-+      // shading 5
-+      {0xd0,0xb5,0x1},
-+      {0xd1,0x9c,0x1},
-+      {0xd2,0x8d,0x1},
-+      {0xd3,0x84,0x1},
-+      {0xd4,0x84,0x1},
-+      {0xd5,0x91,0x1},
-+      {0xd6,0xa0,0x1},
-+      {0xd7,0xb5,0x1},
-+
-+      {0xd8,0xc0,0x1},
-+      {0xd9,0xa6,0x1},
-+      {0xda,0x93,0x1},
-+      {0xdb,0x85,0x1},
-+      {0xdc,0x85,0x1},
-+      {0xdd,0x90,0x1},
-+      {0xde,0xa0,0x1},
-+      {0xdf,0xb8,0x1},
-+
-+      // Page 2
-+      {0xec,0x02,0x02},
-+
-+      {0x2d,0x02,0x02},
-+      {0x20,0x13,0x02},
-+      {0x21,0x13,0x2},
-+      {0x22,0x13,0x2},
-+      {0x23,0x13,0x2},
-+      {0x2e,0x85,0x2},
-+      {0x2f,0x34,0x2},
-+      {0x30,0x00,0x2},
-+      {0x28,0x94,0x2},
-+
-+                                                                                
-+      // page 3
-+      {0xec,0x03,0x03},
-+      {0x10,0x00,0x3},
-+      {0x20,0x00,0x3},
-+      {0x21,0x20,0x3},
-+      {0x22,0x00,0x3},
-+      {0x23,0x00,0x3},
-+      {0x40,0x20,0x3},
-+      {0x41,0x20,0x3},
-+      {0x42,0x20,0x3},
-+      {0x43,0x20,0x3},
-+      {0x60,0x00,0x3},
-+      {0x61,0x00,0x3},
-+      {0x62,0x00,0x3},
-+      {0x63,0x00,0x3},
-+      {0x64,0x04,0x3},
-+      {0x65,0x1C,0x3},
-+      {0x66,0x05,0x3},
-+      {0x67,0x1C,0x3},
-+      {0x68,0x00,0x3},
-+      {0x69,0x2D,0x3},
-+      {0x6a,0x00,0x3},
-+      {0x6b,0x72,0x3},
-+      {0x6c,0x00,0x3},
-+      {0x6d,0x00,0x3},
-+      {0x6e,0x16,0x3}, // 2.38
-+      {0x6f,0x16,0x3}, // 2.38
-+      {0x70,0x00,0x3},
-+      {0x71,0x00,0x3},
-+      {0x72,0x45,0x3},
-+      {0x73,0x00,0x3},
-+      {0x74,0x1C,0x3},
-+      {0x75,0x05,0x3},
-+                                                                                
-+      {0x80,0x00,0x3},  //for 0.02 _ 44
-+      {0x81,0x00,0x3},
-+      {0x82,0x00,0x3},
-+      {0x83,0x00,0x3},
-+      {0x84,0x04,0x3},
-+      {0x85,0x1c,0x3},
-+      {0x86,0x05,0x3},
-+      {0x87,0x1c,0x3},
-+      {0x88,0x00,0x3},
-+      {0x89,0x2d,0x3},
-+      {0x8a,0x00,0x3},
-+      {0x8b,0xcc,0x3},
-+      {0x8c,0x00,0x3},
-+      {0x8d,0x00,0x3},
-+      {0x8e,0x08,0x3},
-+      {0x8f,0x08,0x3},
-+      {0x90,0x01,0x3},
-+      {0x91,0x00,0x3},
-+      {0x92,0x91,0x3},
-+      {0x93,0x00,0x3},
-+      {0x94,0x88,0x3},
-+      {0x95,0x02,0x3},
-+
-+
-+      
-+      // page 4
-+      {0xec,0x04,0x04},
-+      {0x3f,0x09,0x04}, // VGA : old board :0x08 , new board ; 0X09
-+      {0x18,0x00,0x04},  // sxga
-+      {0x1c,0x41,0x04},
-+      {0x20,0x41,0x04}, // vga center 040215
-+      {0x22,0xc1,0x04},// a1);
-+      {0x23,0x02,0x04},
-+      {0x28,0x41,0x04},
-+      {0x2a,0xc1,0x04},// a1);
-+      {0x2b,0x02,0x04},
-+
-+      {0x3c,0x0b,0x04}, //f);  // vga 
-+      {0x58,0x11,0x04},
-+      {0x5c,0x14,0x04},
-+      {0x60,0x21,0x04},
-+      {0x61,0x00,0x04},
-+      {0x62,0xB1,0x04},
-+      {0x63,0x02,0x04},
-+      {0x64,0x01,0x04},
-+      {0x65,0x00,0x04},
-+      {0x66,0x01,0x04},
-+      {0x67,0x02,0x04},
-+      {0x68,0x21,0x04},
-+      {0x69,0x00,0x04},
-+      {0x6a,0xB1,0x04},
-+      {0x6b,0x02,0x04},
-+      {0x6c,0x01,0x04},
-+      {0x6d,0x00,0x04},
-+      {0x6e,0x01,0x04},
-+      {0x6f,0x02,0x04},
-+      {0x70,0x2D,0x04},
-+      {0x71,0x00,0x04},
-+      {0x72,0xd3,0x04}, // 14
-+      {0x73,0x05,0x04}, // 15
-+      {0x74,0x1C,0x04},
-+      {0x75,0x05,0x04},
-+      {0x76,0x1b,0x04}, // HendL
-+      {0x77,0x0b,0x04}, // HendH
-+      {0x78,0x01,0x04}, // 5.00
-+      {0x79,0x80,0x04}, // 5.2a
-+      {0x7a,0x33,0x04},
-+      {0x7b,0x00,0x04},
-+      {0x7c,0x38,0x04}, // 5.0e
-+      {0x7d,0x03,0x04},
-+      {0x7e,0x00,0x04},
-+      {0x7f,0x0A,0x04},
-+      
-+      {0x80,0x2e,0x04},
-+      {0x81,0x00,0x04},
-+      {0x82,0xae,0x04},
-+      {0x83,0x02,0x04},
-+      {0x84,0x00,0x04},
-+      {0x85,0x00,0x04},
-+      {0x86,0x01,0x04},
-+      {0x87,0x02,0x04},
-+      {0x88,0x2e,0x04},
-+      {0x89,0x00,0x04},
-+      {0x8a,0xae,0x04},
-+      {0x8b,0x02,0x04},
-+      {0x8c,0x1c,0x04},
-+      {0x8d,0x00,0x04},
-+      {0x8e,0x04,0x04},
-+      {0x8f,0x02,0x04},
-+      {0x90,0x2d,0x04},
-+      {0x91,0x00,0x04},
-+      {0x92,0xa5,0x04},
-+      {0x93,0x00,0x04},
-+      {0x94,0x88,0x04},
-+      {0x95,0x02,0x04},
-+      {0x96,0xb3,0x04},
-+      {0x97,0x06,0x04},
-+      {0x98,0x01,0x04},
-+      {0x99,0x00,0x04},
-+      {0x9a,0x33,0x04},
-+      {0x9b,0x30,0x04},
-+      {0x9c,0x50,0x04},
-+      {0x9d,0x30,0x04},
-+      {0x9e,0x01,0x04},
-+      {0x9f,0x08,0x04},
-+
-+      // page 5
-+      {0xec,0x05,0x05},
-+      {0x5a,0x22,0x05},
-+
-+      // page 6
-+      {0xec,0x06,0x06},
-+      {0x14,0x1e,0x06}, 
-+      {0x15,0xb4,0x04},
-+      {0x16,0x25,0x04},
-+      {0x17,0x74,0x04}, 
-+
-+      {0x10,0x48,0x04},
-+      {0x11,0xa0,0x04},
-+      {0x12,0x40,0x04},  // 040216  AE1 window ÁÙÀÓ
-+      {0x13,0x70,0x04},
-+
-+      {0x1a,0x29,0x04},  // 040217  AWB window ÁÙÀÓ
-+      {0x30,0x40,0x04},
-+      {0x31,0xa2,0x04},
-+      {0x32,0x50,0x04},
-+      {0x33,0xbc,0x04},
-+      {0x34,0x10,0x04},
-+      {0x35,0xd2,0x04},
-+      {0x36,0x18,0x04},
-+      {0x37,0xf5,0x04},
-+      {0x38,0x10,0x04},
-+      {0x39,0xd3,0x04},
-+      {0x3a,0x1a,0x04},
-+      {0x3b,0xf0,0x04},
-+
-+      // page 7
-+      {0xec,0x07,0x07},
-+      {0x08,0xff,0x7},
-+      {0x38,0x01,0x7}, //07); 040315
-+      {0x39,0x01,0x7}, //02); //4);  040223   040315
-+      {0x11,0xfe,0x7},  //fe);   // green -2  040303
-+      {0x2a,0x20,0x7},
-+      {0x2b,0x20,0x7},
-+      {0x2c,0x10,0x7},
-+      {0x2d,0x00,0x7},
-+      {0x2e,0xf0,0x7},
-+      {0x2f,0xd0,0x7},
-+      {0x3a,0xf0,0x7},
-+      {0x23,0x07,0x7},  //  for ESD   
-+
-+      // page 0
-+      {0xec,0x00,0x00},
-+      {0x8a,0x04,0x00},
-+
-+      // page 1
-+      {0xec,0x01,0x01},       
-+      {0xe5,0xb0,0x01},
-+      {0xe5,0xb0,0x01},
-+      {0xc2,0x01,0x01},
-+
-+      {0x61,0x7b,0x01},
-+      {0x62,0x7b,0x01},
-+      {0x63,0x1b,0x01},
-+      {0x64,0x1b,0x01},
-+
-+      // page 0
-+      {0xec,0x00,0x00},
-+      {0x7e,0x04,0x00},
-+
-+      // page 4
-+      {0xec,0x04,0x04},
-+      {0x04,0x02,0x04},
-+      {0x06,0x02,0x04},
-+
-+      // page 1
-+      {0xec,0x01,0x01},       
-+      {0x10,0x05,0x01},
-+      {0x54,0x02,0x01},
-+      {0x56,0x02,0x01},
-+
-+      // page 3
-+      {0xec,0x03,0x03},
-+      {0x0e,0x08,0x03},
-+      {0x0f,0x08,0x03},
-+
-+      // page 4
-+      {0xec,0x04,0x04},
-+      {0x00,0x30,0x04},
-+      {0x0a,0x30,0x04},
-+
-+      // page 5
-+      {0xec,0x05,0x05},
-+      {0x08,0x33,0x05},
-+
-+      // page 0
-+      {0xec,0x00,0x00},
-+      {0x02,0x00,0x00},
-+
-+      // page 4
-+//scale out
-+      {0xec,0x04,0x04},
-+      {0x02,0x20,0x04},
-+      {0x1c,0x4f,0x04},
-+
-+      // page 1
-+      {0xec,0x01,0x01},
-+      {0x52,0x20,0x01},
-+
-+      // page 5
-+      {0xec,0x05,0x05},
-+      {0x0e,0x4f,0x05},
-+
-+//ae speed
-+      // page 0
-+      {0xec,0x00,0x00},
-+      {0x92,0x80,0x00},
-+      {0x93,0x02,0x00},
-+      {0x94,0x04,0x00},
-+      {0x95,0x04,0x00},
-+      {0x96,0x04,0x00},
-+      {0x97,0x04,0x00},
-+      {0x9b,0x47,0x00},
-+
-+      {0xec,0x00,0x00},
-+      {0x40,0x17,0x00},
-+      {0x41,0x4c,0x00},
-+      {0x42,0x1d,0x00},
-+      {0x43,0x3e,0x00},
-+      {0x44,0x2a,0x00},
-+      {0x45,0x2d,0x00},
-+
-+      {0xec,0x01,0x01},
-+      {0x20,0xd0,0x01},   //high light color reference
-+
-+      {0xec,0x00,0x00},
-+      {0x7e,0x00,0x00},
-+      {0x73,0x11,0x00}, // 41
-+      {0x78,0x78,0x00},
-+
-+      {0xec,0x07,0x07},
-+      {0x1b,0x3e,0x07},
-+
-+      {0xec,0x00,0x00},
-+      {0x48,0xA0,0x00}, //s48C0
-+      {0x49,0xB0,0x00}, //s49B0
-+      {0x4a,0x30,0x00}, //s4a20
-+      {0x4b,0x70,0x00}, //s4b70
-+      {0x4c,0xD0,0x00}, //s4cA0
-+      {0x4d,0xB0,0x00}, //s4dB0
-+      {0x4e,0x30,0x00}, //s4e30
-+      {0x4f,0xF0,0x00}, //s4fF0
-+      {0x50,0xA0,0x00}, //s50D0
-+      {0x51,0xB0,0x00}, //s51B0
-+      {0x52,0x25,0x00}, //s5210
-+      {0x53,0x70,0x00}, //s5370
-+      {0x54,0xD0,0x00}, //s5490
-+      {0x55,0xD0,0x00}, //s55B0
-+      {0x56,0x3A,0x00}, //s5640
-+      {0x57,0xD0,0x00}, //s57D0
-+      {0x58,0xA0,0x00}, //s58D0
-+      {0x59,0xA0,0x00}, //s59B0
-+      {0x5a,0x32,0x00}, //s5a0A
-+      {0x5b,0x7A,0x00}, //s5b7A
-+      {0x5c,0xB0,0x00}, //s5c90
-+      {0x5d,0xC0,0x00}, //s5dC0
-+      {0x5e,0x3E,0x00}, //s5e4A
-+      {0x5f,0xfa,0x00}, //s5fD0
-+
-+      // gamma
-+      {0xec,0x01,0x01},
-+      {0x24,0x31,0x01},
-+      {0x25,0x4C,0x01},
-+      {0x26,0x75,0x01},
-+      {0x27,0xB5,0x01},
-+      {0x28,0x17,0x01},
-+      {0x29,0xAE,0x01},
-+      {0x2A,0x97,0x01},
-+      {0x2B,0xFF,0x01},
-+      {0x2C,0x00,0x01},
-+      {0x2D,0x5B,0x01},
-+
-+      {0xB0,0x31,0x01},
-+      {0xB1,0x4C,0x01},
-+      {0xB2,0x75,0x01},
-+      {0xB3,0xB5,0x01},
-+      {0xB4,0x17,0x01},
-+      {0xB5,0xAE,0x01},
-+      {0xB6,0x97,0x01},
-+      {0xB7,0xFF,0x01},
-+      {0xB8,0x00,0x01},
-+      {0xB9,0x5B,0x01},
-+
-+      {0xec,0x00,0x00},
-+      {0x77,0xb0,0x00},
-+      {0x39,0x06,0x00},
-+      {0x3a,0x08,0x00},
-+
-+};
-+
-+
-+#define S5X532_INIT_REGS (sizeof(s5x532_reg)/sizeof(s5x532_reg[0]))
-+#define S5X532_RISC_REGS 0xEB  
-+#define S5X532_ISP_REGS 0xFB /* S5C7323X */
-+#define S5X532_CIS_REGS 0x2F /* S5K437LA03 */
-+
-+
-+#define PAGE_ADDRESS      0xEC
-+
-+//#define S5X532_REGS (S5X532_RISC_REGS+S5X532_ISP_REGS+S5X532_CIS_REGS)
-+#define S5X532_REGS (0x1000)
-+
-+
-+
-+#endif
-+
-+
-diff --git a/arch/arm/mach-s3c2440/camera/userapp.h b/arch/arm/mach-s3c2440/camera/userapp.h
-new file mode 100644
-index 0000000..9203378
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/userapp.h
-@@ -0,0 +1,44 @@
-+/*
-+    Character Driver API Interface
-+
-+    Copyright (C) 2003 Samsung Electronics (SW.LEE: hitchcar@samsung.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 __FIMC20_CAMIF_USR_APP_H_
-+#define __FIMC20_CAMIF_USR_APP_H_
-+
-+
-+/* 
-+ * IOCTL Command for Character Driver
-+ */ 
-+
-+#define CMD_CAMERA_INIT   0x23
-+/*  Test Application Usage */
-+typedef struct {
-+        int src_x;
-+        int src_y;
-+        int dst_x;
-+        int dst_y;
-+        int bpp;
-+        int flip;
-+} camif_param_t;
-+
-+
-+
-+#endif
-+
-+
-+/* 
-+ * Local variables:
-+ * tab-width: 8
-+ *  c-indent-level: 8
-+ *  c-basic-offset: 8
-+ *  c-set-style: "K&R"
-+ * End:
-+ */
-diff --git a/arch/arm/mach-s3c2440/camera/v4l2_api.c b/arch/arm/mach-s3c2440/camera/v4l2_api.c
-new file mode 100644
-index 0000000..13aed36
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/v4l2_api.c
-@@ -0,0 +1,311 @@
-+/*
-+ * . 2004-01-03: SW.LEE <hitchcar@sec.samsung.com>
-+ *   
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License 2. See the file COPYING in the main directory of this archive
-+ * for more details.
-+ */
-+
-+#include <linux/config.h>
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/sched.h>
-+#include <linux/irq.h>
-+#include <linux/tqueue.h>
-+#include <linux/locks.h>
-+#include <linux/completion.h>
-+#include <linux/delay.h>
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+#include <linux/miscdevice.h>
-+#include <linux/wait.h>
-+
-+#include <asm/io.h>
-+#include <asm/semaphore.h>
-+#include <asm/hardware.h>
-+#include <asm/uaccess.h>
-+
-+#include <asm/arch/cpu_s3c2440.h>
-+#include <asm/arch/S3C2440.h>
-+
-+#include "camif.h"
-+#include "videodev.h"
-+
-+/* 
-+  Codec_formats/Preview_format[0] must be same to initial value of 
-+  preview_init_param/codec_init_param 
-+*/
-+
-+const struct v4l2_fmtdesc codec_formats[] = {
-+      {
-+              .index     = 0,
-+              .type      = V4L2_BUF_TYPE_VIDEO_CAPTURE,
-+//            .flags     = FORMAT_FLAGS_PLANAR,
-+              .description = "4:2:2, planar, Y-Cb-Cr",
-+              .pixelformat = V4L2_PIX_FMT_YUV422P,
-+
-+      },{
-+              .index    = 1,
-+              .type     = V4L2_BUF_TYPE_VIDEO_CAPTURE,
-+//            .flags    = FORMAT_FLAGS_PLANAR,
-+              .name     = "4:2:0, planar, Y-Cb-Cr",
-+              .fourcc   = V4L2_PIX_FMT_YUV420,
-+      }
-+};
-+
-+
-+/* Todo
-+   FIMC V4L2_PIX_FMT_RGB565 is not same to that of V4L2spec 
-+   and so we need image convert to FIMC V4l2_PIX_FMT_RGB565.
-+*/
-+const struct v4l2_fmtdesc preview_formats[] = {
-+      {
-+              .index    = 1,
-+              .type     = V4L2_BUF_TYPE_VIDEO_CAPTURE,
-+              .description = "16 bpp RGB, le",
-+              .fourcc   = V4L2_PIX_FMT_RGB565,
-+//            .flags    = FORMAT_FLAGS_PACKED,
-+      },
-+      {
-+              .index    = 0,
-+              .type     = V4L2_BUF_TYPE_VIDEO_CAPTURE,
-+//            .flags    = FORMAT_FLAGS_PACKED,
-+              .description = "32 bpp RGB, le",
-+              .fourcc   = V4L2_PIX_FMT_BGR32,
-+      }
-+}
-+
-+#define NUM_F       ARRARY_SIZE(preview_formats)
-+
-+
-+/* 
-+ * This function and v4l2 structure made for V4L2 API functions 
-+ *     App <--> v4l2 <--> logical param <--> hardware
-+ */
-+static int camif_get_v4l2(camif_cfg_t *cfg)
-+{
-+      return 0;
-+}
-+
-+
-+/*
-+** Gives the depth of a video4linux2 fourcc aka pixel format in bits.
-+*/
-+static int pixfmt2depth(int pixfmt,int *fmtptr)
-+{
-+      int fmt, depth;    
-+      
-+      switch (pixfmt) {
-+      case V4L2_PIX_FMT_RGB565:
-+      case V4L2_PIX_FMT_RGB565X:
-+              fmt = CAMIF_RGB_16;
-+              depth = 16;
-+              break;
-+      case V4L2_PIX_FMT_BGR24: /* Not tested */
-+      case V4L2_PIX_FMT_RGB24:
-+              fmt = CAMIF_RGB_24;
-+              depth = 24;
-+              break;
-+      case V4L2_PIX_FMT_BGR32:
-+      case V4L2_PIX_FMT_RGB32:
-+              fmt = CAMIF_RGB_24;
-+              depth 32;
-+              break;
-+      case V4L2_PIX_FMT_GREY: /* Not tested  */
-+              fmt = CAMIF_OUT_YCBCR420;
-+              depth = 8;
-+              break;
-+      case V4L2_PIX_FMT_YUYV:
-+      case V4L2_PIX_FMT_UYVY:
-+      case V4L2_PIX_FMT_YUV422P:
-+              fmt = CAMIF_OUT_YCBCR422;
-+              depth = 16;
-+              break;
-+      case V4L2_PIX_FMT_YUV420:
-+              fmt = CAMIF_OUT_YCBCR420;
-+              depth = 12;
-+              break;
-+      }
-+      if (fmtptr) *fmtptr = fmt;              
-+      return depth;
-+}
-+
-+
-+
-+static int camif_s_v4l2(camif_cfg_t *cfg)
-+{
-+      int num = cfg->v2.used_fmt;
-+
-+      if ( !(cfg->v2.status&CAMIF_V4L2_INIT)) {
-+              int depth;
-+              int fourcc = v2.fmtdesc[num].pixelformat;
-+
-+              /* To define v4l2_fmtsdesc */
-+              if (cfg->dma_type == CAMIF_CODEC)
-+                      cfg->v2->fmtdesc = codec_formats;
-+              else
-+                      cfg->v2->fmtdesc = preview_formats;
-+
-+              /* To define v4l2_format used currently */
-+              cfg->v2.fmt.width    = cfg->target_x;
-+              cfg->v2.fmt.height   = cfg->target_y;
-+              cfg->v2.fmt.field    = V4L2_FIELD_NONE;
-+              cfg->v2.fmt.pixelformat = fourcc;
-+              depth       = pixfmt2depth(fourcc,NULL);
-+              cfg->v2.fmt.bytesperline= cfg->v2.fmt.width*depth >> 3;
-+              cfg->v2.fmt.sizeimage = 
-+                       cfg->v2.fmt.height * cfg->v2.fmt.bytesperline;
-+
-+              /* To define v4l2_input */
-+              cfg->v2.input.index  = 0;
-+              if (cfg->dma_type == CAMIF_CODEC)
-+                      snprintf(cfg->v2.input.name, 31, "CAMIF CODEC");
-+              else
-+                      snprintf(cfg->v2.input.name, 31, "CAMIF PREVIEW");
-+              cfg->v2.input.type = V4L2_INPUT_TYPE_CAMERA;
-+                      
-+              /* Write the Status of v4l2 machine */
-+              cfg->v2.status |= CAMIF_V4L2_INIT;
-+       }
-+      return 0;
-+}
-+
-+
-+static int camif_g_fmt(camif_cfg_t *cfg, struct v4l2_format *f)
-+{
-+      int size = sizeof(struct v4l2_pix_format);
-+
-+      switch (f->type) {
-+      case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-+              memset(&f->fmt.pix,0,size);
-+              memcpy(&f->fmt.pix,&cfg->v2.fmt,size);
-+              return 0;
-+      default:
-+              return -EINVAL;
-+      }
-+}
-+
-+
-+/* Copy v4l2 parameter into other element of camif_cfg_t */
-+static int camif_s_try(camif_cfg_t *cfg, int f)
-+{
-+      int fmt;
-+      cfg->target_x = cfg->v2.fmt.width;
-+      cfg->target_y = cfg->v2.fmt.height;
-+      pixfmt2depth(cfg->v2.fmt.pixelformat,&fmt);
-+      cfg->fmt = fmt;
-+      camif_dynamic_conf(cfg);
-+}
-+
-+
-+static int camif_s_fmt(camif_cfg_t *cfg, struct v4l2_format *f)
-+{
-+      int retval;
-+      
-+      switch (f->type) {
-+      case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-+      {
-+              /* update our state informations */
-+//            down(&fh->cap.lock);
-+              cfg->v2.fmt          = f->pix;
-+              cfg->v2.status       |= CAMIF_v4L2_DIRTY;
-+              camif_dynamic_conf(cfg);
-+              cfg->v2.status      &= ~CAMIF_v4L2_DIRTY; /* dummy ? */
-+//            up(&fh->cap.lock);
-+              
-+              return 0;
-+      }
-+      default:
-+              return -EINVAL;
-+      }
-+
-+}
-+
-+/* Refer ioctl of  videodeX.c  and bttv-driver.c */
-+int camif_do_ioctl
-+(struct inode *inode, struct file *file,unsigned int cmd, void * arg)
-+{
-+      camif_cfg_t *cfg = file->private_data;
-+      int ret = 0;
-+
-+      switch (cmd) {
-+        case VIDIOC_QUERYCAP:
-+              {
-+                      struct v4l2_capability *cap = arg;
-+                                                                                                      
-+                      strcpy(cap->driver,"Fimc Camera");
-+                      strlcpy(cap->card,cfg->v->name,sizeof(cap->card));
-+                      sprintf(cap->bus_info,"FIMC 2.0 AHB Bus");
-+                      cap->version = 0;
-+                      cap->capabilities =
-+                              V4L2_CAP_VIDEO_CAPTURE |V4L2_CAP_READWRITE;
-+                      return 0;
-+              }
-+      case VIDIOC_G_FMT:
-+              {
-+                      struct v4l2_format *f = arg;
-+                      return camif_g_fmt(cfg,f);
-+              }
-+      case VIDIOC_S_FMT:
-+              {
-+                      struct v4l2_format *f = arg;
-+                      return camif_s_fmt(cfg,f);
-+              }
-+
-+      case VIDIOC_ENUM_FMT:
-+              {
-+                      struct v4l2_fmtdesc *f = arg;
-+                      enum v4l2_buf_type type = f->type;
-+                      int index = f->index;
-+
-+                      if (index >= NUM_F) 
-+                              return -EINVAL;
-+                      switch (f->type) {
-+                      case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-+                              break;
-+                      case V4L2_BUF_TYPE_VIDEO_OVERLAY:
-+                      case V4L2_BUF_TYPE_VBI_CAPTURE:
-+                                      default:
-+                      return -EINVAL;
-+                      }
-+                      memset(f,0,sizeof(*f));
-+                      memcpy(f,cfg->v2.fmtdesc+index,sizeof(*f));
-+                      return 0;
-+              }
-+      case VIDIOC_G_INPUT:
-+              {
-+                      u32 *i = arg;
-+                      *i = cfg->v2.input;
-+                      return 0;
-+              }
-+      case VIDIOC_S_INPUT:
-+              {
-+                      int index = *((int *)arg);
-+                      if (index != 0) 
-+                              return -EINVAL;
-+                      cfg->v2.input.index = index;
-+                      return 0;
-+              }
-+              
-+      default:
-+              return -ENOIOCTLCMD; /* errno.h */
-+      } /* End of Switch  */
-+
-+
-+}
-+
-+
-+
-+
-+
-+
-+
-+/* 
-+ * Local variables:
-+ * tab-width: 8
-+ *  c-indent-level: 8
-+ *  c-basic-offset: 8
-+ *  c-set-style: "K&R"
-+ * End:
-+ */
-diff --git a/arch/arm/mach-s3c2440/camera/video-driver.c b/arch/arm/mach-s3c2440/camera/video-driver.c
-new file mode 100644
-index 0000000..fe9130c
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/video-driver.c
-@@ -0,0 +1,591 @@
-+/*  
-+    Copyright (C) 2004 Samsung Electronics 
-+                     SW.LEE <hitchcar@sec.samsung.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/version.h>
-+#include <linux/module.h>
-+#include <linux/delay.h>
-+#include <linux/errno.h>
-+#include <linux/fs.h>
-+#include <linux/kernel.h>
-+#include <linux/major.h>
-+#include <linux/slab.h>
-+#include <linux/poll.h>
-+#include <linux/signal.h>
-+#include <linux/ioport.h>
-+#include <linux/sched.h>
-+#include <linux/types.h>
-+#include <linux/interrupt.h>
-+#include <linux/kmod.h>
-+#include <linux/vmalloc.h>
-+#include <linux/init.h>
-+#include <asm/io.h>
-+#include <asm/page.h>
-+#include <asm/irq.h>
-+#include <asm/semaphore.h>
-+#include <linux/miscdevice.h>
-+
-+//#define SW_DEBUG 
-+
-+#include "camif.h"
-+#include "videodev.h"
-+#include "miscdevice.h"
-+#include "cam_reg.h"
-+#include "sensor.h"
-+#include "userapp.h"
-+
-+#ifdef Z_API
-+#include "qt.h"
-+#endif
-+
-+/* Codec and Preview */
-+#define CAMIF_NUM  2
-+static camif_cfg_t  fimc[CAMIF_NUM];
-+
-+static const char *driver_version = 
-+      "$Id: video-driver.c,v 1.9 2004/06/02 03:10:36 swlee Exp $";
-+extern const char *fimc_version;
-+extern const char *fsm_version;
-+
-+
-+camif_cfg_t * get_camif(int nr)
-+{
-+      camif_cfg_t *ret = NULL;
-+      switch(nr) {
-+      case CODEC_MINOR:
-+              ret = &fimc[0];
-+              break;
-+      case PREVIEW_MINOR:
-+              ret = &fimc[1];
-+              break;
-+      default:
-+              panic("Unknow Minor Number \n");
-+      }
-+      return ret;
-+}
-+
-+
-+static int camif_codec_start(camif_cfg_t *cfg)
-+{
-+      int  ret = 0;
-+      ret =camif_check_preview(cfg);
-+      switch(ret) {
-+      case 0:                 /* Play alone */
-+              DPRINTK("Start Alone \n");
-+              camif_4fsm_start(cfg);
-+              cfg->gc->status |= C_WORKING;
-+              break;
-+      case -ERESTARTSYS:       /* Busy , retry */
-+              //DPRINTK("Error \n");
-+              printk("Error \n");
-+              break; 
-+      case 1:
-+              DPRINTK("need callback \n");
-+              ret = camif_callback_start(cfg);
-+              if(ret < 0 ) {
-+                      printk(KERN_INFO "Busy RESTART \n");
-+                      return ret; /* Busy, retry */
-+              }
-+              break;
-+      }
-+      return ret;
-+}
-+
-+
-+ssize_t camif_write (struct file *f, const char *b, size_t c,loff_t *offset)
-+{
-+      camif_cfg_t *cfg;
-+
-+      c = 0;                  /* return value */
-+      DPRINTK("\n");
-+      cfg = get_camif(MINOR(f->f_dentry->d_inode->i_rdev));
-+      switch (*b) {
-+              case 'O':
-+                      if (cfg->dma_type & CAMIF_PREVIEW) {
-+                              if (cfg->gc->status & C_WORKING) {
-+                                      camif_start_c_with_p(cfg,get_camif(CODEC_MINOR));
-+                              }       
-+                              else  {
-+                                      camif_4fsm_start(cfg);
-+                              }
-+                      }
-+                      else{
-+                              c = camif_codec_start(cfg);
-+                              if(c < 0) c = 1; /* Error and neet to retry */
-+                      }
-+
-+                      break;
-+              case 'X':
-+                      camif_p_stop(cfg);
-+                      break;
-+              default:
-+                      panic("CAMERA:camif_write: Unexpected Param\n");
-+      }
-+      DPRINTK("end\n");
-+
-+      return c;
-+}
-+
-+
-+ssize_t camif_p_read(struct file *file, char *buf, size_t count, loff_t *pos)
-+{
-+      camif_cfg_t *cfg = NULL;
-+      size_t end;
-+
-+      cfg = get_camif(MINOR(file->f_dentry->d_inode->i_rdev));
-+      cfg->status = CAMIF_STARTED;
-+
-+      if (wait_event_interruptible(cfg->waitq,cfg->status == CAMIF_INT_HAPPEN))
-+              return -ERESTARTSYS;
-+
-+      cfg->status = CAMIF_STOPPED;
-+      end = min_t(size_t, cfg->pp_totalsize /cfg->pp_num, count);
-+      if (copy_to_user(buf, camif_g_frame(cfg), end))
-+              return -EFAULT;
-+
-+      return end;
-+}
-+
-+
-+static ssize_t 
-+camif_c_read(struct file *file, char *buf, size_t count, loff_t *pos)
-+{
-+      camif_cfg_t *cfg = NULL;
-+      size_t end;
-+
-+      /* cfg = file->private_data; */
-+      cfg = get_camif(MINOR(file->f_dentry->d_inode->i_rdev));
-+#if 0
-+      if(file->f_flags & O_NONBLOCK) {
-+              printk(KERN_ERR"Don't Support NON_BLOCK \n");
-+      }
-+#endif                
-+
-+      /* Change the below wait_event_interruptible func */
-+       if (wait_event_interruptible(cfg->waitq,cfg->status == CAMIF_INT_HAPPEN))
-+             return -ERESTARTSYS;
-+       cfg->status = CAMIF_STOPPED;
-+       end = min_t(size_t, cfg->pp_totalsize /cfg->pp_num, count);
-+       if (copy_to_user(buf, camif_g_frame(cfg), end))
-+             return -EFAULT;
-+       return end;
-+}
-+
-+
-+static void camif_c_irq(int irq, void *dev_id, struct pt_regs *regs)
-+{
-+        camif_cfg_t *cfg = (camif_cfg_t *)dev_id;
-+      DPRINTK("\n");
-+      camif_g_fifo_status(cfg);
-+      camif_g_frame_num(cfg);
-+      if(camif_enter_c_4fsm(cfg) == INSTANT_SKIP) return;
-+      wake_up_interruptible(&cfg->waitq);
-+}
-+
-+static void camif_p_irq(int irq, void *dev_id, struct pt_regs * regs)
-+{
-+        camif_cfg_t *cfg = (camif_cfg_t *)dev_id;
-+      DPRINTK("\n");
-+      camif_g_fifo_status(cfg);
-+      camif_g_frame_num(cfg);
-+      if(camif_enter_p_4fsm(cfg) == INSTANT_SKIP) return;
-+      wake_up_interruptible(&cfg->waitq);
-+#if 0
-+      if( (cfg->perf.frames % 5) == 0)
-+              DPRINTK("5\n");
-+#endif
-+}
-+
-+static void camif_release_irq(camif_cfg_t *cfg)
-+{
-+      disable_irq(cfg->irq);
-+      free_irq(cfg->irq, cfg);
-+}
-+
-+static int camif_irq_request(camif_cfg_t *cfg)
-+{
-+      int ret = 0;
-+
-+      if (cfg->dma_type & CAMIF_CODEC) {
-+              if ((ret = request_irq(cfg->irq, camif_c_irq, 
-+                             SA_INTERRUPT,cfg->shortname, cfg))) {
-+                      printk("request_irq(CAM_C) failed.\n");
-+              }
-+      }
-+      if (cfg->dma_type & CAMIF_PREVIEW) {
-+              if ((ret = request_irq(cfg->irq, camif_p_irq,
-+                             SA_INTERRUPT,cfg->shortname, cfg))) {
-+                      printk("request_irq(CAM_P) failed.\n");
-+              }
-+      }
-+      return 0;
-+}
-+
-+static void camif_init_sensor(camif_cfg_t *cfg)
-+{
-+      camif_gc_t *gc =  cfg->gc;
-+      if (!gc->sensor) 
-+              panic("CAMERA:I2C Client(Img Sensor)Not registered\n");
-+      if(!gc->init_sensor) {
-+              camif_reset(gc->reset_type, gc->reset_udelay);
-+              gc->sensor->driver->command(gc->sensor,SENSOR_INIT,NULL);
-+              gc->init_sensor = 1; /*sensor init done */
-+      }
-+      gc->sensor->driver->command(gc->sensor, USER_ADD, NULL);
-+}
-+
-+static int camif_open(struct inode *inode, struct file *file)
-+{
-+      int err;
-+      camif_cfg_t * cfg = get_camif(MINOR(inode->i_rdev));
-+
-+      if(cfg->dma_type & CAMIF_PREVIEW) {
-+              if(down_interruptible(&cfg->gc->lock))
-+                      return -ERESTARTSYS;
-+              if (cfg->dma_type & CAMIF_PREVIEW) {
-+                      cfg->gc->status &= ~PNOTWORKING;
-+              }
-+              up(&cfg->gc->lock);
-+      }
-+      err = video_exclusive_open(inode,file);
-+      cfg->gc->user++;
-+      cfg->status = CAMIF_STOPPED;
-+      if (err < 0)  return err;
-+      if (file->f_flags & O_NONCAP ) {
-+              printk("Don't Support Non-capturing open \n");
-+              return 0;
-+      }
-+      file->private_data = cfg;
-+      camif_irq_request(cfg);
-+      camif_init_sensor(cfg);
-+      return 0;
-+}
-+
-+#if 0
-+static void print_pregs(void)
-+{
-+      printk(" CISRCFMT 0x%08X  \n", CISRCFMT);
-+      printk(" CIWDOFST 0x%08X  \n", CIWDOFST);
-+      printk(" CIGCTRL  0x%08X  \n", CIGCTRL);
-+      printk(" CIPRTRGFMT 0x%08X  \n", CIPRTRGFMT);
-+      printk(" CIPRCTRL 0x%08X  \n", CIPRCTRL);
-+      printk(" CIPRSCPRERATIO 0x%08X  \n", CIPRSCPRERATIO);
-+      printk(" CIPRSCPREDST 0x%08X  \n", CIPRSCPREDST);
-+      printk(" CIPRSCCTRL 0x%08X  \n", CIPRSCCTRL);
-+      printk(" CIPRTAREA 0x%08X  \n", CIPRTAREA);
-+      printk(" CIPRSTATUS 0x%08X  \n", CIPRSTATUS);
-+      printk(" CIIMGCPT 0x%08X  \n", CIIMGCPT);
-+}
-+
-+static void print_cregs(void)
-+{
-+      printk(" CISRCFMT 0x%08X  \n", CISRCFMT);
-+      printk(" CIWDOFST 0x%08X  \n", CIWDOFST);
-+      printk(" CIGCTRL  0x%08X  \n", CIGCTRL);
-+      printk(" CICOCTRL 0x%8X   \n", CICOCTRL);
-+      printk(" CICOSCPRERATIO 0x%08X  \n", CICOSCPRERATIO);
-+      printk(" CICOSCPREDST 0x%08X  \n", CICOSCPREDST);
-+      printk(" CICOSCCTRL 0x%08X  \n", CICOSCCTRL);
-+      printk(" CICOTAREA 0x%08X  \n", CICOTAREA);
-+      printk(" CICOSTATUS 0x%8X \n", CICOSTATUS);
-+      printk(" CIIMGCPT 0x%08X  \n", CIIMGCPT);
-+}
-+#endif
-+
-+
-+static int camif_release(struct inode *inode, struct file *file)
-+{
-+      camif_cfg_t * cfg = get_camif(MINOR(inode->i_rdev));
-+
-+      //DPRINTK(" cfg->status 0x%0X cfg->gc->status 0x%0X \n", cfg->status,cfg->gc->status );
-+      if (cfg->dma_type & CAMIF_PREVIEW) {
-+              if(down_interruptible(&cfg->gc->lock))
-+                      return -ERESTARTSYS;
-+              cfg->gc->status &= ~PWANT2START;
-+              cfg->gc->status |= PNOTWORKING;
-+              up(&cfg->gc->lock);
-+      } 
-+      else {
-+              cfg->gc->status &= ~CWANT2START; /* No need semaphore */
-+      }
-+      camif_dynamic_close(cfg);
-+      camif_release_irq(cfg);
-+      video_exclusive_release(inode,file);
-+      camif_p_stop(cfg);
-+      cfg->gc->sensor->driver->command(cfg->gc->sensor, USER_EXIT, NULL);
-+      cfg->gc->user--;
-+      cfg->status = CAMIF_STOPPED;
-+      return 0;
-+}
-+
-+static void fimc_config(camif_cfg_t *cfg,u32 x, u32 y, int bpp)
-+{
-+      cfg->target_x = x;
-+      cfg->target_y = y;
-+
-+      switch (bpp) {
-+      case 16:
-+              cfg->fmt = CAMIF_RGB16;
-+              break;
-+      case 24:
-+              cfg->fmt = CAMIF_RGB24;
-+              break;
-+      case 420:
-+              cfg->fmt = CAMIF_IN_YCBCR422|CAMIF_OUT_YCBCR420; 
-+              break;
-+      case 422:
-+              cfg->fmt = CAMIF_IN_YCBCR422|CAMIF_OUT_YCBCR422; 
-+              break;
-+      default: 
-+              panic("Wrong BPP \n");
-+      }
-+}
-+
-+
-+static int 
-+camif_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
-+{
-+      int ret = 0;
-+      camif_cfg_t *cfg  = file->private_data;
-+      camif_param_t par;
-+
-+      switch (cmd) {
-+              case CMD_CAMERA_INIT:
-+                      if (copy_from_user(&par,(camif_param_t *)arg,
-+                                              sizeof(camif_param_t)))
-+                              return -EFAULT;
-+                      fimc_config(cfg,par.dst_x, par.dst_y, par.bpp);
-+                      if (camif_dynamic_open(cfg)) {
-+                              printk(" Eror Happens \n");
-+                              ret = -1;
-+                      }
-+
-+                      switch (par.flip) {
-+                      case 3 : 
-+                              cfg->flip = CAMIF_FLIP_MIRROR;
-+                              break;
-+                      case 1 : 
-+                              cfg->flip = CAMIF_FLIP_X;
-+                              break;
-+                      case 2 : 
-+                              cfg->flip = CAMIF_FLIP_Y;
-+                              break;
-+                      case 0 : 
-+                      default:
-+                              cfg->flip = CAMIF_FLIP;
-+                      }
-+                      break;
-+      /* Todo
-+              case CMD_SENSOR_BRIGHTNESS:
-+                      cfg->gc->sensor->driver->command(cfg->gc->sensor, SENSOR_BRIGHTNESS, NULL);
-+                      break;
-+      */
-+              default:
-+                      ret = -EINVAL;
-+                      break;
-+      }
-+
-+      return ret;
-+}
-+
-+
-+#if 0
-+static int camif_ioctl(struct inode *inode, struct file *file,
-+                    unsigned int cmd, unsigned long arg)
-+{
-+//    camif_cfg_t *cfg  = file->private_data;
-+
-+
-+      switch (cmd) {
-+/*    case Some_other_action */
-+      default:
-+              return video_usercopy(inode, file, cmd, arg, camif_do_ioctl);
-+      }
-+}
-+#endif
-+
-+static struct file_operations camif_c_fops =
-+{
-+      .owner    = THIS_MODULE,
-+      .open     = camif_open,
-+      .release  = camif_release,
-+      .ioctl    = camif_ioctl,
-+      .read     = camif_c_read,
-+      .write    = camif_write,
-+};
-+
-+static struct file_operations camif_p_fops =
-+{
-+      .owner    = THIS_MODULE,
-+      .open     = camif_open,
-+      .release  = camif_release,
-+      .ioctl    = camif_ioctl,
-+#ifdef Z_API
-+      .read     = z_read,
-+      .write    = z_write,
-+#else
-+      .read     = camif_p_read,
-+      .write    = camif_write,
-+#endif
-+};
-+
-+static struct video_device codec_template =
-+{
-+      .name     = "CODEC_IF",
-+      .type     = VID_TYPE_CAPTURE|VID_TYPE_CLIPPING|VID_TYPE_SCALES,
-+      .hardware = VID_HARDWARE_SAMSUNG_FIMC20,
-+      .fops     = &camif_c_fops,
-+//    .release  = camif_release
-+      .minor    = -1,
-+};
-+
-+static struct video_device preview_template =
-+{
-+      .name     = "PREVIEW_IF",
-+      .type     = VID_TYPE_CAPTURE|VID_TYPE_CLIPPING|VID_TYPE_SCALES,
-+      .hardware = VID_HARDWARE_SAMSUNG_FIMC20,
-+      .fops     = &camif_p_fops,
-+      .minor    = -1,
-+};
-+
-+static int preview_init(camif_cfg_t *cfg)
-+{
-+      char name[16]="CAM_PREVIEW";
-+
-+      memset(cfg, 0, sizeof(camif_cfg_t));
-+      cfg->target_x = 640;
-+      cfg->target_y = 480;
-+      cfg->pp_num   = 4;
-+      cfg->dma_type = CAMIF_PREVIEW;
-+      cfg->fmt      = CAMIF_RGB16;
-+      cfg->flip     = CAMIF_FLIP_Y;
-+      cfg->v        = &preview_template;
-+      init_MUTEX(&cfg->v->lock);
-+      cfg->irq       = IRQ_CAM_P;
-+      
-+      strcpy(cfg->shortname,name);
-+        init_waitqueue_head(&cfg->waitq);
-+      cfg->status = CAMIF_STOPPED;
-+      return cfg->status;
-+}
-+
-+static int codec_init(camif_cfg_t *cfg)
-+{
-+      char name[16]="CAM_CODEC";
-+
-+      memset(cfg, 0, sizeof(camif_cfg_t));
-+      cfg->target_x = 176;
-+      cfg->target_y = 144;
-+      cfg->pp_num   = 4; 
-+      cfg->dma_type = CAMIF_CODEC;
-+      cfg->fmt      = CAMIF_IN_YCBCR422|CAMIF_OUT_YCBCR420;
-+      cfg->flip     = CAMIF_FLIP_X;
-+      cfg->v         = &codec_template;
-+      init_MUTEX(&cfg->v->lock);
-+      cfg->irq       = IRQ_CAM_C;
-+      strcpy(cfg->shortname,name);
-+      init_waitqueue_head(&cfg->waitq);
-+      cfg->status = CAMIF_STOPPED;
-+      return cfg->status;
-+}
-+
-+static void camif_init(void)
-+{
-+      camif_setup_sensor();
-+}
-+
-+
-+
-+static void print_version(void)
-+{
-+      printk(KERN_INFO"FIMC built:"__DATE__ " "__TIME__"\n%s\n%s\n%s\n", 
-+                                      fimc_version, driver_version,fsm_version);
-+}
-+
-+
-+static int camif_m_in(void)
-+{
-+      int ret = 0;
-+      camif_cfg_t * cfg;
-+
-+      camif_init();           
-+      cfg = get_camif(CODEC_MINOR);
-+      codec_init(cfg);
-+
-+      if (video_register_device(cfg->v,0,CODEC_MINOR)!=0) {
-+                      DPRINTK("Couldn't register codec driver.\n");
-+                      return 0;
-+      }
-+      cfg = get_camif(PREVIEW_MINOR);
-+      preview_init(cfg);
-+      if (video_register_device(cfg->v,0,PREVIEW_MINOR)!=0) {
-+                      DPRINTK("Couldn't register preview driver.\n");
-+                      return 0;
-+      }
-+      
-+      print_version();
-+      return ret;
-+}
-+
-+static void unconfig_device(camif_cfg_t *cfg)
-+{
-+      video_unregister_device(cfg->v);
-+      camif_hw_close(cfg);
-+      //memset(cfg, 0, sizeof(camif_cfg_t));
-+}
-+
-+static void camif_m_out(void) /* module out */
-+{
-+      camif_cfg_t *cfg;
-+
-+      cfg = get_camif(CODEC_MINOR);
-+      unconfig_device(cfg);
-+      cfg = get_camif(PREVIEW_MINOR);
-+      unconfig_device(cfg);
-+      return;
-+}
-+
-+void camif_register_decoder(struct i2c_client *ptr)
-+{
-+      camif_cfg_t *cfg;
-+
-+      cfg =get_camif(CODEC_MINOR);
-+      cfg->gc = (camif_gc_t *)(ptr->data);
-+
-+      cfg =get_camif(PREVIEW_MINOR);
-+      cfg->gc = (camif_gc_t *)(ptr->data);
-+
-+      sema_init(&cfg->gc->lock,1); /* global lock for both Codec and Preview */
-+      cfg->gc->status |= PNOTWORKING; /* Default Value */
-+      camif_hw_open(cfg->gc);
-+}
-+
-+void camif_unregister_decoder(struct i2c_client *ptr)
-+{
-+      camif_gc_t *gc;
-+              
-+      gc = (camif_gc_t *)(ptr->data); 
-+      gc->init_sensor = 0; /* need to modify */
-+}
-+
-+module_init(camif_m_in);
-+module_exit(camif_m_out);
-+
-+EXPORT_SYMBOL(camif_register_decoder);
-+EXPORT_SYMBOL(camif_unregister_decoder);
-+
-+MODULE_AUTHOR("SW.LEE <hitchcar@sec.samsung.com>");
-+MODULE_DESCRIPTION("Video-Driver For Fimc2.0 MISC Drivers");
-+MODULE_LICENSE("GPL");
-+
-+
-+/*
-+ * Local variables:
-+ * c-basic-offset: 8
-+ * End:
-+ */
-diff --git a/arch/arm/mach-s3c2440/camera/videodev.c b/arch/arm/mach-s3c2440/camera/videodev.c
-new file mode 100644
-index 0000000..0b3498f
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/videodev.c
-@@ -0,0 +1,342 @@
-+/*
-+ * Video capture interface for Linux Character Device Driver.
-+ *              based on  
-+ *              Alan Cox, <alan@redhat.com> video4linux 
-+ *
-+ * Author:      SW.LEE <hitchcar@samsung.com>        
-+ *              2004 (C) Samsung Electronics 
-+ *              Modified for S3C2440/S3C24A0 Interface
-+ *
-+ * This file is released under the GPLv2
-+ */
-+
-+
-+#include <linux/module.h>
-+#include <linux/types.h>
-+#include <linux/kernel.h>
-+#include <linux/sched.h>
-+#include <linux/smp_lock.h>
-+#include <linux/mm.h>
-+#include <linux/string.h>
-+#include <linux/errno.h>
-+#include <linux/init.h>
-+#include <linux/kmod.h>
-+#include <linux/slab.h>
-+#include <linux/devfs_fs_kernel.h>
-+#include <linux/miscdevice.h>
-+#include <asm/uaccess.h>
-+#include <asm/system.h>
-+#include <asm/semaphore.h>
-+
-+
-+
-+#include "camif.h"
-+#include "videodev.h"
-+#include "miscdevice.h"
-+
-+
-+static DECLARE_MUTEX(videodev_lock);
-+
-+const char *fimc_version = "$Id: videodev.c,v 1.1.1.1 2004/04/27 03:52:50 swlee Exp $";
-+
-+#define VIDEO_NAME              "video4linux"
-+
-+
-+static inline unsigned iminor(struct inode *inode)
-+{
-+        return MINOR(inode->i_rdev);
-+}
-+
-+static inline unsigned imajor(struct inode *inode)
-+{
-+        return MAJOR(inode->i_rdev);
-+}
-+
-+
-+#define VIDEO_NUM_DEVICES     2 
-+static struct video_device *video_device[VIDEO_NUM_DEVICES];
-+
-+static inline struct video_device * get_vd(int nr)
-+{
-+      if ( nr == CODEC_MINOR)
-+              return video_device[0];
-+      else {
-+              assert ( nr & PREVIEW_MINOR);
-+              return video_device[1];
-+      }
-+}
-+
-+static inline void set_vd ( struct video_device * vd, int nr)
-+{
-+      if ( nr == CODEC_MINOR)
-+              video_device[0] = vd;
-+      else {
-+              assert ( nr & PREVIEW_MINOR);
-+              video_device[1] = vd;
-+      }
-+}
-+
-+static inline int video_release(struct inode *inode, struct file *f)
-+{
-+      int minor = MINOR(inode->i_rdev);
-+      struct video_device *vfd;
-+
-+      vfd = get_vd(minor);
-+#if 1 /* needed until all drivers are fixed */
-+      if (!vfd->release)
-+              return 0;
-+#endif
-+      vfd->release(vfd);
-+      return 0;
-+}
-+
-+struct video_device* video_devdata(struct file *file)
-+{
-+      return video_device[iminor(file->f_dentry->d_inode)];
-+}
-+
-+
-+/*
-+ *    Open a video device.
-+ */
-+static int video_open(struct inode *inode, struct file *file)
-+{
-+      int minor = MINOR(inode->i_rdev);
-+      int err = 0;
-+      struct video_device *vfl;
-+      struct file_operations *old_fops;
-+      
-+      down(&videodev_lock);
-+
-+      vfl = get_vd(minor);
-+
-+      old_fops = file->f_op;
-+      file->f_op = fops_get(vfl->fops);
-+      if(file->f_op->open)
-+              err = file->f_op->open(inode,file);
-+      if (err) {
-+              fops_put(file->f_op);
-+              file->f_op = fops_get(old_fops);
-+      }
-+      fops_put(old_fops);
-+      up(&videodev_lock);
-+      return err;
-+}
-+
-+/*
-+ * open/release helper functions -- handle exclusive opens
-+ */
-+extern int video_exclusive_open(struct inode *inode, struct file *file)
-+{
-+      struct  video_device *vfl = get_vd(MINOR(inode->i_rdev));
-+      int retval = 0;
-+
-+      down(&vfl->lock);
-+      if (vfl->users) {
-+              retval = -EBUSY;
-+      } else {
-+              vfl->users++;
-+      }
-+      up(&vfl->lock);
-+      return retval;
-+}
-+
-+extern int video_exclusive_release(struct inode *inode, struct file *file)
-+{
-+      struct  video_device *vfl = get_vd(MINOR(inode->i_rdev));
-+      vfl->users--;
-+      return 0;
-+}
-+
-+int
-+video_usercopy(struct inode *inode, struct file *file,
-+             unsigned int cmd, unsigned long arg,
-+             int (*func)(struct inode *inode, struct file *file,
-+                         unsigned int cmd, void *arg))
-+{
-+      char    sbuf[128];
-+      void    *mbuf = NULL;
-+      void    *parg = NULL;
-+      int     err  = -EINVAL;
-+
-+      //      cmd = video_fix_command(cmd);
-+
-+      /*  Copy arguments into temp kernel buffer  */
-+      switch (_IOC_DIR(cmd)) {
-+      case _IOC_NONE:
-+              parg = (void *)arg;
-+              break;
-+      case _IOC_READ:
-+      case _IOC_WRITE:
-+      case (_IOC_WRITE | _IOC_READ):
-+              if (_IOC_SIZE(cmd) <= sizeof(sbuf)) {
-+                      parg = sbuf;
-+              } else {
-+                      /* too big to allocate from stack */
-+                      mbuf = kmalloc(_IOC_SIZE(cmd),GFP_KERNEL);
-+                      if (NULL == mbuf)
-+                              return -ENOMEM;
-+                      parg = mbuf;
-+              }
-+              
-+              err = -EFAULT;
-+              if (_IOC_DIR(cmd) & _IOC_WRITE)
-+                      if (copy_from_user(parg, (void *)arg, _IOC_SIZE(cmd)))
-+                              goto out;
-+              break;
-+      }
-+
-+      /* call driver */
-+      err = func(inode, file, cmd, parg);
-+      if (err == -ENOIOCTLCMD)
-+              err = -EINVAL;
-+      if (err < 0)
-+              goto out;
-+
-+      /*  Copy results into user buffer  */
-+      switch (_IOC_DIR(cmd))
-+      {
-+      case _IOC_READ:
-+      case (_IOC_WRITE | _IOC_READ):
-+              if (copy_to_user((void *)arg, parg, _IOC_SIZE(cmd)))
-+                      err = -EFAULT;
-+              break;
-+      }
-+
-+out:
-+      if (mbuf)
-+              kfree(mbuf);
-+      return err;
-+}
-+
-+
-+static struct file_operations video_fops=
-+{
-+      .owner          = THIS_MODULE,
-+      .llseek         = no_llseek,
-+      .open           = video_open,
-+      .release        = video_release,
-+};
-+
-+static struct miscdevice codec_dev = {
-+      minor: CODEC_MINOR,
-+      name : "codec",
-+      fops : &video_fops
-+};
-+
-+static struct miscdevice preview_dev = {
-+      minor: PREVIEW_MINOR,
-+      name : "preview",
-+      fops : &video_fops
-+};
-+
-+
-+/**
-+ *    video_register_device - register video4linux devices
-+ *    @vfd:  video device structure we want to register
-+ *    @type: type of device to register
-+ *    @nr:   minor number 
-+ *    
-+ *    Zero is returned on success.
-+ *      type : ignored.
-+ *      nr : 
-+ *           0 Codec index
-+ *           1 Preview index
-+ */
-+int video_register_device(struct video_device *vfd, int type, int nr)
-+{
-+      int ret=0;
-+
-+      /* pick a minor number */
-+      down(&videodev_lock);
-+      set_vd (vfd, nr);
-+      vfd->minor=nr;
-+      up(&videodev_lock);
-+
-+      switch (vfd->minor) {
-+              case CODEC_MINOR:
-+                      ret = misc_register(&codec_dev);
-+                      if (ret) {
-+                              printk(KERN_ERR 
-+                                              "can't misc_register : codec on minor=%d\n", CODEC_MINOR);
-+                              panic(" Give me misc codec \n");
-+                      }
-+                      break;
-+              case PREVIEW_MINOR:
-+                      ret = misc_register(&preview_dev);
-+                      if (ret) {
-+                              printk(KERN_ERR 
-+                                              "can't misc_register (preview) on minor=%d\n", PREVIEW_MINOR);
-+                              panic(" Give me misc codec \n");
-+                      }
-+                      break;
-+      }
-+
-+#if 0 /* needed until all drivers are fixed */
-+      if (!vfd->release)
-+              printk(KERN_WARNING "videodev: \"%s\" has no release callback. "
-+                              "Please fix your driver for proper sysfs support, see "
-+                              "http://lwn.net/Articles/36850/\n", vfd->name);
-+#endif
-+      return 0;
-+}
-+
-+/**
-+ *    video_unregister_device - unregister a video4linux device
-+ *    @vfd: the device to unregister
-+ *
-+ *    This unregisters the passed device and deassigns the minor
-+ *    number. Future open calls will be met with errors.
-+ */
-+ 
-+void video_unregister_device(struct video_device *vfd)
-+{
-+      down(&videodev_lock);
-+
-+      if(get_vd(vfd->minor)!=vfd)
-+              panic("videodev: bad unregister");
-+
-+      if (vfd->minor== CODEC_MINOR)
-+              misc_deregister(&codec_dev);
-+      else
-+              misc_deregister(&preview_dev);
-+      set_vd (NULL, vfd->minor);
-+      up(&videodev_lock);
-+}
-+
-+
-+/*
-+ *    Initialise video for linux
-+ */
-+ 
-+static int __init videodev_init(void)
-+{
-+//    printk(KERN_INFO "FIMC2.0 Built:"__DATE__" "__TIME__"\n%s\n",fimc_version);
-+      return 0;
-+}
-+
-+static void __exit videodev_exit(void)
-+{
-+}
-+
-+module_init(videodev_init)
-+module_exit(videodev_exit)
-+
-+EXPORT_SYMBOL(video_register_device);
-+EXPORT_SYMBOL(fimc_version);
-+EXPORT_SYMBOL(video_unregister_device);
-+EXPORT_SYMBOL(video_usercopy);
-+EXPORT_SYMBOL(video_exclusive_open);
-+EXPORT_SYMBOL(video_exclusive_release);
-+
-+
-+MODULE_AUTHOR("SW.LEE <hitchcar@sec.samsung.com>");
-+MODULE_DESCRIPTION("VideoDev For FIMC2.0 MISC Drivers");
-+MODULE_LICENSE("GPL");
-+
-+
-+/*
-+ * Local variables:
-+ * c-basic-offset: 8
-+ * End:
-+ */
-diff --git a/arch/arm/mach-s3c2440/camera/videodev.h b/arch/arm/mach-s3c2440/camera/videodev.h
-new file mode 100644
-index 0000000..f12db43
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/videodev.h
-@@ -0,0 +1,110 @@
-+#ifndef __LINUX_S3C_VIDEODEV_H
-+#define __LINUX_S3C_VIDEODEV_H
-+
-+#include <linux/types.h>
-+#include <linux/version.h>
-+#include "videodev2.h"
-+
-+
-+struct video_device
-+{
-+      /* device info */
-+      //      struct device *dev;
-+      char name[32];
-+      int type;       /* v4l1 */
-+      int type2;      /* v4l2 */
-+      int hardware;
-+      int minor;
-+
-+      /* device ops + callbacks */
-+      struct file_operations *fops;
-+      void (*release)(struct video_device *vfd);
-+
-+
-+#if 1 /* to be removed in 2.7.x */
-+      /* obsolete -- fops->owner is used instead */
-+      struct module *owner;
-+      /* dev->driver_data will be used instead some day.
-+       * Use the video_{get|set}_drvdata() helper functions,
-+       * so the switch over will be transparent for you.
-+       * Or use {pci|usb}_{get|set}_drvdata() directly. */
-+      void *priv;
-+#endif
-+
-+      /* for videodev.c intenal usage -- please don't touch */
-+      int users;                     /* video_exclusive_{open|close} ... */
-+      struct semaphore lock;         /* ... helper function uses these   */
-+      char devfs_name[64];           /* devfs */
-+      //      struct class_device class_dev; /* sysfs */
-+};
-+
-+#define VIDEO_MAJOR   81
-+
-+#define VFL_TYPE_GRABBER      0
-+
-+
-+extern int video_register_device(struct video_device *, int type, int nr);
-+extern void video_unregister_device(struct video_device *);
-+extern struct video_device* video_devdata(struct file*);
-+
-+
-+
-+struct video_picture
-+{
-+        __u16   brightness;
-+        __u16   hue;
-+        __u16   colour;
-+        __u16   contrast;
-+        __u16   whiteness;      /* Black and white only */
-+        __u16   depth;          /* Capture depth */
-+        __u16   palette;        /* Palette in use */
-+#define VIDEO_PALETTE_GREY      1       /* Linear greyscale */
-+#define VIDEO_PALETTE_HI240     2       /* High 240 cube (BT848) */
-+#define VIDEO_PALETTE_RGB565    3       /* 565 16 bit RGB */
-+#define VIDEO_PALETTE_RGB24     4       /* 24bit RGB */
-+#define VIDEO_PALETTE_RGB32     5       /* 32bit RGB */
-+#define VIDEO_PALETTE_RGB555    6       /* 555 15bit RGB */
-+#define VIDEO_PALETTE_YUV422    7       /* YUV422 capture */
-+#define VIDEO_PALETTE_YUYV      8
-+#define VIDEO_PALETTE_UYVY      9       /* The great thing about standards is ... */
-+#define VIDEO_PALETTE_YUV420    10
-+#define VIDEO_PALETTE_YUV411    11      /* YUV411 capture */
-+#define VIDEO_PALETTE_RAW       12      /* RAW capture (BT848) */
-+#define VIDEO_PALETTE_YUV422P   13      /* YUV 4:2:2 Planar */
-+#define VIDEO_PALETTE_YUV411P   14      /* YUV 4:1:1 Planar */
-+#define VIDEO_PALETTE_YUV420P   15      /* YUV 4:2:0 Planar */
-+#define VIDEO_PALETTE_YUV410P   16      /* YUV 4:1:0 Planar */
-+#define VIDEO_PALETTE_PLANAR    13      /* start of planar entries */
-+#define VIDEO_PALETTE_COMPONENT 7       /* start of component entries */
-+};
-+
-+extern int video_exclusive_open(struct inode *inode, struct file *file);
-+extern int video_exclusive_release(struct inode *inode, struct file *file);
-+extern int video_usercopy(struct inode *inode, struct file *file,
-+                          unsigned int cmd, unsigned long arg,
-+                          int (*func)(struct inode *inode, struct file *file,
-+                                      unsigned int cmd, void *arg));
-+
-+
-+
-+                                                                                                          
-+#define VID_TYPE_CAPTURE        1       /* Can capture */
-+#define VID_TYPE_CLIPPING       32      /* Can clip */
-+#define VID_TYPE_FRAMERAM       64      /* Uses the frame buffer memory */
-+#define VID_TYPE_SCALES         128     /* Scalable */
-+#define VID_TYPE_SUBCAPTURE     512     /* Can capture subareas of the image */
-+
-+
-+
-+#define VID_HARDWARE_SAMSUNG_FIMC  255    
-+
-+
-+
-+#endif 
-+
-+
-+/*
-+ * Local variables:
-+ * c-basic-offset: 8
-+ * End:
-+ */
-diff --git a/arch/arm/mach-s3c2440/camera/videodev2.h b/arch/arm/mach-s3c2440/camera/videodev2.h
-new file mode 100644
-index 0000000..1bfc45a
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/videodev2.h
-@@ -0,0 +1,938 @@
-+#ifndef __LINUX_VIDEODEV2_H
-+#define __LINUX_VIDEODEV2_H
-+/*
-+ *    Video for Linux Two
-+ *
-+ *    Header file for v4l or V4L2 drivers and applications, for
-+ *    Linux kernels 2.2.x or 2.4.x.
-+ *
-+ *    See http://bytesex.org/v4l/ for API specs and other
-+ *    v4l2 documentation.
-+ *
-+ *    Author: Bill Dirks <bdirks@pacbell.net>
-+ *            Justin Schoeman
-+ *            et al.
-+ */
-+#ifdef __KERNEL__
-+#include <linux/time.h> /* need struct timeval */
-+#endif
-+
-+/*
-+ *    M I S C E L L A N E O U S
-+ */
-+
-+/*  Four-character-code (FOURCC) */
-+#define v4l2_fourcc(a,b,c,d)\
-+        (((__u32)(a)<<0)|((__u32)(b)<<8)|((__u32)(c)<<16)|((__u32)(d)<<24))
-+
-+/*
-+ *    E N U M S
-+ */
-+enum v4l2_field {
-+      V4L2_FIELD_ANY        = 0, /* driver can choose from none,
-+                                    top, bottom, interlaced
-+                                    depending on whatever it thinks
-+                                    is approximate ... */
-+      V4L2_FIELD_NONE       = 1, /* this device has no fields ... */
-+      V4L2_FIELD_TOP        = 2, /* top field only */
-+      V4L2_FIELD_BOTTOM     = 3, /* bottom field only */
-+      V4L2_FIELD_INTERLACED = 4, /* both fields interlaced */
-+      V4L2_FIELD_SEQ_TB     = 5, /* both fields sequential into one
-+                                    buffer, top-bottom order */
-+      V4L2_FIELD_SEQ_BT     = 6, /* same as above + bottom-top order */
-+      V4L2_FIELD_ALTERNATE  = 7, /* both fields alternating into
-+                                    separate buffers */
-+};
-+#define V4L2_FIELD_HAS_TOP(field)     \
-+      ((field) == V4L2_FIELD_TOP      ||\
-+       (field) == V4L2_FIELD_INTERLACED ||\
-+       (field) == V4L2_FIELD_SEQ_TB   ||\
-+       (field) == V4L2_FIELD_SEQ_BT)
-+#define V4L2_FIELD_HAS_BOTTOM(field)  \
-+      ((field) == V4L2_FIELD_BOTTOM   ||\
-+       (field) == V4L2_FIELD_INTERLACED ||\
-+       (field) == V4L2_FIELD_SEQ_TB   ||\
-+       (field) == V4L2_FIELD_SEQ_BT)
-+#define V4L2_FIELD_HAS_BOTH(field)    \
-+      ((field) == V4L2_FIELD_INTERLACED ||\
-+       (field) == V4L2_FIELD_SEQ_TB   ||\
-+       (field) == V4L2_FIELD_SEQ_BT)
-+
-+enum v4l2_buf_type {
-+      V4L2_BUF_TYPE_VIDEO_CAPTURE  = 1,
-+      V4L2_BUF_TYPE_VIDEO_OUTPUT   = 2,
-+      V4L2_BUF_TYPE_VIDEO_OVERLAY  = 3,
-+      V4L2_BUF_TYPE_VBI_CAPTURE    = 4,
-+      V4L2_BUF_TYPE_VBI_OUTPUT     = 5,
-+      V4L2_BUF_TYPE_PRIVATE        = 0x80,
-+};
-+
-+enum v4l2_ctrl_type {
-+      V4L2_CTRL_TYPE_INTEGER       = 1,
-+      V4L2_CTRL_TYPE_BOOLEAN       = 2,
-+      V4L2_CTRL_TYPE_MENU          = 3,
-+      V4L2_CTRL_TYPE_BUTTON        = 4,
-+};
-+
-+enum v4l2_tuner_type {
-+      V4L2_TUNER_RADIO             = 1,
-+      V4L2_TUNER_ANALOG_TV         = 2,
-+};
-+
-+enum v4l2_memory {
-+      V4L2_MEMORY_MMAP             = 1,
-+      V4L2_MEMORY_USERPTR          = 2,
-+      V4L2_MEMORY_OVERLAY          = 3,
-+};
-+
-+/* see also http://vektor.theorem.ca/graphics/ycbcr/ */
-+enum v4l2_colorspace {
-+      /* ITU-R 601 -- broadcast NTSC/PAL */
-+      V4L2_COLORSPACE_SMPTE170M     = 1,
-+
-+      /* 1125-Line (US) HDTV */
-+      V4L2_COLORSPACE_SMPTE240M     = 2,
-+
-+      /* HD and modern captures. */
-+      V4L2_COLORSPACE_REC709        = 3,
-+      
-+      /* broken BT878 extents (601, luma range 16-253 instead of 16-235) */
-+      V4L2_COLORSPACE_BT878         = 4,
-+      
-+      /* These should be useful.  Assume 601 extents. */
-+      V4L2_COLORSPACE_470_SYSTEM_M  = 5,
-+      V4L2_COLORSPACE_470_SYSTEM_BG = 6,
-+      
-+      /* I know there will be cameras that send this.  So, this is
-+       * unspecified chromaticities and full 0-255 on each of the
-+       * Y'CbCr components
-+       */
-+      V4L2_COLORSPACE_JPEG          = 7,
-+      
-+      /* For RGB colourspaces, this is probably a good start. */
-+      V4L2_COLORSPACE_SRGB          = 8,
-+};
-+
-+enum v4l2_priority {
-+      V4L2_PRIORITY_UNSET       = 0,  /* not initialized */
-+      V4L2_PRIORITY_BACKGROUND  = 1,
-+      V4L2_PRIORITY_INTERACTIVE = 2,
-+      V4L2_PRIORITY_RECORD      = 3,
-+      V4L2_PRIORITY_DEFAULT     = V4L2_PRIORITY_INTERACTIVE,
-+};
-+
-+struct v4l2_rect {
-+      __s32   left;
-+      __s32   top;
-+      __s32   width;
-+      __s32   height;
-+};
-+
-+struct v4l2_fract {
-+      __u32   numerator;
-+      __u32   denominator;
-+};
-+
-+/*
-+ *    D R I V E R   C A P A B I L I T I E S
-+ */
-+struct v4l2_capability
-+{
-+      __u8    driver[16];     /* i.e. "bttv" */
-+      __u8    card[32];       /* i.e. "Hauppauge WinTV" */
-+      __u8    bus_info[32];   /* "PCI:" + pci_name(pci_dev) */
-+      __u32   version;        /* should use KERNEL_VERSION() */
-+      __u32   capabilities;   /* Device capabilities */
-+      __u32   reserved[4];
-+};
-+
-+/* Values for 'capabilities' field */
-+#define V4L2_CAP_VIDEO_CAPTURE        0x00000001  /* Is a video capture device */
-+#define V4L2_CAP_VIDEO_OUTPUT 0x00000002  /* Is a video output device */
-+#define V4L2_CAP_VIDEO_OVERLAY        0x00000004  /* Can do video overlay */
-+#define V4L2_CAP_VBI_CAPTURE  0x00000010  /* Is a VBI capture device */
-+#define V4L2_CAP_VBI_OUTPUT   0x00000020  /* Is a VBI output device */
-+#define V4L2_CAP_RDS_CAPTURE  0x00000100  /* RDS data capture */
-+
-+#define V4L2_CAP_TUNER                0x00010000  /* has a tuner */
-+#define V4L2_CAP_AUDIO                0x00020000  /* has audio support */
-+#define V4L2_CAP_RADIO                0x00040000  /* is a radio device */
-+
-+#define V4L2_CAP_READWRITE      0x01000000  /* read/write systemcalls */
-+#define V4L2_CAP_ASYNCIO        0x02000000  /* async I/O */
-+#define V4L2_CAP_STREAMING      0x04000000  /* streaming I/O ioctls */
-+
-+/*
-+ *    V I D E O   I M A G E   F O R M A T
-+ */
-+
-+struct v4l2_pix_format
-+{
-+      __u32                   width;
-+      __u32                   height;
-+      __u32                   pixelformat;
-+      enum v4l2_field         field;
-+      __u32                   bytesperline;   /* for padding, zero if unused */
-+      __u32                   sizeimage;
-+        enum v4l2_colorspace  colorspace;
-+      __u32                   priv;           /* private data, depends on pixelformat */
-+};
-+
-+/*           Pixel format    FOURCC                  depth  Description   */
-+#define V4L2_PIX_FMT_RGB332  v4l2_fourcc('R','G','B','1') /*  8  RGB-3-3-2     */
-+#define V4L2_PIX_FMT_RGB555  v4l2_fourcc('R','G','B','O') /* 16  RGB-5-5-5     */
-+#define V4L2_PIX_FMT_RGB565  v4l2_fourcc('R','G','B','P') /* 16  RGB-5-6-5     */
-+#define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R','G','B','Q') /* 16  RGB-5-5-5 BE  */
-+#define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R','G','B','R') /* 16  RGB-5-6-5 BE  */
-+#define V4L2_PIX_FMT_BGR24   v4l2_fourcc('B','G','R','3') /* 24  BGR-8-8-8     */
-+#define V4L2_PIX_FMT_RGB24   v4l2_fourcc('R','G','B','3') /* 24  RGB-8-8-8     */
-+#define V4L2_PIX_FMT_BGR32   v4l2_fourcc('B','G','R','4') /* 32  BGR-8-8-8-8   */
-+#define V4L2_PIX_FMT_RGB32   v4l2_fourcc('R','G','B','4') /* 32  RGB-8-8-8-8   */
-+#define V4L2_PIX_FMT_GREY    v4l2_fourcc('G','R','E','Y') /*  8  Greyscale     */
-+#define V4L2_PIX_FMT_YVU410  v4l2_fourcc('Y','V','U','9') /*  9  YVU 4:1:0     */
-+#define V4L2_PIX_FMT_YVU420  v4l2_fourcc('Y','V','1','2') /* 12  YVU 4:2:0     */
-+#define V4L2_PIX_FMT_YUYV    v4l2_fourcc('Y','U','Y','V') /* 16  YUV 4:2:2     */
-+#define V4L2_PIX_FMT_UYVY    v4l2_fourcc('U','Y','V','Y') /* 16  YUV 4:2:2     */
-+#define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4','2','2','P') /* 16  YVU422 planar */
-+#define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4','1','1','P') /* 16  YVU411 planar */
-+#define V4L2_PIX_FMT_Y41P    v4l2_fourcc('Y','4','1','P') /* 12  YUV 4:1:1     */
-+
-+/* two planes -- one Y, one Cr + Cb interleaved  */
-+#define V4L2_PIX_FMT_NV12    v4l2_fourcc('N','V','1','2') /* 12  Y/CbCr 4:2:0  */
-+#define V4L2_PIX_FMT_NV21    v4l2_fourcc('N','V','2','1') /* 12  Y/CrCb 4:2:0  */
-+
-+/*  The following formats are not defined in the V4L2 specification */
-+#define V4L2_PIX_FMT_YUV410  v4l2_fourcc('Y','U','V','9') /*  9  YUV 4:1:0     */
-+#define V4L2_PIX_FMT_YUV420  v4l2_fourcc('Y','U','1','2') /* 12  YUV 4:2:0     */
-+#define V4L2_PIX_FMT_YYUV    v4l2_fourcc('Y','Y','U','V') /* 16  YUV 4:2:2     */
-+#define V4L2_PIX_FMT_HI240   v4l2_fourcc('H','I','2','4') /*  8  8-bit color   */
-+
-+/* compressed formats */
-+#define V4L2_PIX_FMT_MJPEG    v4l2_fourcc('M','J','P','G') /* Motion-JPEG   */
-+#define V4L2_PIX_FMT_JPEG     v4l2_fourcc('J','P','E','G') /* JFIF JPEG     */
-+#define V4L2_PIX_FMT_DV       v4l2_fourcc('d','v','s','d') /* 1394          */
-+#define V4L2_PIX_FMT_MPEG     v4l2_fourcc('M','P','E','G') /* MPEG          */
-+
-+/*  Vendor-specific formats   */
-+#define V4L2_PIX_FMT_WNVA     v4l2_fourcc('W','N','V','A') /* Winnov hw compress */
-+
-+/*
-+ *    F O R M A T   E N U M E R A T I O N
-+ */
-+struct v4l2_fmtdesc
-+{
-+      __u32               index;             /* Format number      */
-+      enum v4l2_buf_type  type;              /* buffer type        */
-+      __u32               flags;
-+      __u8                description[32];   /* Description string */
-+      __u32               pixelformat;       /* Format fourcc      */
-+      __u32               reserved[4];
-+};
-+
-+#define V4L2_FMT_FLAG_COMPRESSED 0x0001
-+
-+
-+/*
-+ *    T I M E C O D E
-+ */
-+struct v4l2_timecode
-+{
-+      __u32   type;
-+      __u32   flags;
-+      __u8    frames;
-+      __u8    seconds;
-+      __u8    minutes;
-+      __u8    hours;
-+      __u8    userbits[4];
-+};
-+
-+/*  Type  */
-+#define V4L2_TC_TYPE_24FPS            1
-+#define V4L2_TC_TYPE_25FPS            2
-+#define V4L2_TC_TYPE_30FPS            3
-+#define V4L2_TC_TYPE_50FPS            4
-+#define V4L2_TC_TYPE_60FPS            5
-+
-+/*  Flags  */
-+#define V4L2_TC_FLAG_DROPFRAME                0x0001 /* "drop-frame" mode */
-+#define V4L2_TC_FLAG_COLORFRAME               0x0002
-+#define V4L2_TC_USERBITS_field                0x000C
-+#define V4L2_TC_USERBITS_USERDEFINED  0x0000
-+#define V4L2_TC_USERBITS_8BITCHARS    0x0008
-+/* The above is based on SMPTE timecodes */
-+
-+
-+/*
-+ *    C O M P R E S S I O N   P A R A M E T E R S
-+ */
-+#if 0
-+/* ### generic compression settings don't work, there is too much
-+ * ### codec-specific stuff.  Maybe reuse that for MPEG codec settings
-+ * ### later ... */
-+struct v4l2_compression
-+{
-+      __u32   quality;
-+      __u32   keyframerate;
-+      __u32   pframerate;
-+      __u32   reserved[5];
-+
-+/*  what we'll need for MPEG, extracted from some postings on
-+    the v4l list (Gert Vervoort, PlasmaJohn).
-+
-+system stream:
-+  - type: elementary stream(ES), packatised elementary stream(s) (PES)
-+    program stream(PS), transport stream(TS)
-+  - system bitrate
-+  - PS packet size (DVD: 2048 bytes, VCD: 2324 bytes)
-+  - TS video PID
-+  - TS audio PID
-+  - TS PCR PID
-+  - TS system information tables (PAT, PMT, CAT, NIT and SIT)
-+  - (MPEG-1 systems stream vs. MPEG-2 program stream (TS not supported
-+    by MPEG-1 systems)
-+
-+audio:
-+  - type: MPEG (+Layer I,II,III), AC-3, LPCM
-+  - bitrate
-+  - sampling frequency (DVD: 48 Khz, VCD: 44.1 KHz, 32 kHz)
-+  - Trick Modes? (ff, rew)
-+  - Copyright
-+  - Inverse Telecine
-+
-+video:
-+  - picturesize (SIF, 1/2 D1, 2/3 D1, D1) and PAL/NTSC norm can be set
-+    through excisting V4L2 controls
-+  - noise reduction, parameters encoder specific?
-+  - MPEG video version: MPEG-1, MPEG-2
-+  - GOP (Group Of Pictures) definition:
-+    - N: number of frames per GOP
-+    - M: distance between reference (I,P) frames
-+    - open/closed GOP
-+  - quantiser matrix: inter Q matrix (64 bytes) and intra Q matrix (64 bytes)
-+  - quantiser scale: linear or logarithmic
-+  - scanning: alternate or zigzag
-+  - bitrate mode: CBR (constant bitrate) or VBR (variable bitrate).
-+  - target video bitrate for CBR
-+  - target video bitrate for VBR
-+  - maximum video bitrate for VBR - min. quantiser value for VBR
-+  - max. quantiser value for VBR
-+  - adaptive quantisation value
-+  - return the number of bytes per GOP or bitrate for bitrate monitoring
-+
-+*/
-+};
-+#endif
-+
-+struct v4l2_jpegcompression
-+{
-+      int quality;
-+
-+      int  APPn;              /* Number of APP segment to be written,
-+                               * must be 0..15 */
-+      int  APP_len;           /* Length of data in JPEG APPn segment */
-+      char APP_data[60];      /* Data in the JPEG APPn segment. */
-+      
-+      int  COM_len;           /* Length of data in JPEG COM segment */
-+      char COM_data[60];      /* Data in JPEG COM segment */
-+      
-+      __u32 jpeg_markers;     /* Which markers should go into the JPEG
-+                               * output. Unless you exactly know what
-+                               * you do, leave them untouched.
-+                               * Inluding less markers will make the
-+                               * resulting code smaller, but there will
-+                               * be fewer aplications which can read it.
-+                               * The presence of the APP and COM marker
-+                               * is influenced by APP_len and COM_len
-+                               * ONLY, not by this property! */
-+      
-+#define V4L2_JPEG_MARKER_DHT (1<<3)    /* Define Huffman Tables */
-+#define V4L2_JPEG_MARKER_DQT (1<<4)    /* Define Quantization Tables */
-+#define V4L2_JPEG_MARKER_DRI (1<<5)    /* Define Restart Interval */
-+#define V4L2_JPEG_MARKER_COM (1<<6)    /* Comment segment */
-+#define V4L2_JPEG_MARKER_APP (1<<7)    /* App segment, driver will
-+                                        * allways use APP0 */
-+};
-+
-+
-+/*
-+ *    M E M O R Y - M A P P I N G   B U F F E R S
-+ */
-+struct v4l2_requestbuffers
-+{
-+      __u32                   count;
-+      enum v4l2_buf_type      type;
-+      enum v4l2_memory        memory;
-+      __u32                   reserved[2];
-+};
-+
-+struct v4l2_buffer
-+{
-+      __u32                   index;
-+      enum v4l2_buf_type      type;
-+      __u32                   bytesused;
-+      __u32                   flags;
-+      enum v4l2_field         field;
-+      struct timeval          timestamp;
-+      struct v4l2_timecode    timecode;
-+      __u32                   sequence;
-+
-+      /* memory location */
-+      enum v4l2_memory        memory;
-+      union {
-+              __u32           offset;
-+              unsigned long   userptr;
-+      } m;
-+      __u32                   length;
-+
-+      __u32                   reserved[2];
-+};
-+
-+/*  Flags for 'flags' field */
-+#define V4L2_BUF_FLAG_MAPPED  0x0001  /* Buffer is mapped (flag) */
-+#define V4L2_BUF_FLAG_QUEUED  0x0002  /* Buffer is queued for processing */
-+#define V4L2_BUF_FLAG_DONE    0x0004  /* Buffer is ready */
-+#define V4L2_BUF_FLAG_KEYFRAME        0x0008  /* Image is a keyframe (I-frame) */
-+#define V4L2_BUF_FLAG_PFRAME  0x0010  /* Image is a P-frame */
-+#define V4L2_BUF_FLAG_BFRAME  0x0020  /* Image is a B-frame */
-+#define V4L2_BUF_FLAG_TIMECODE        0x0100  /* timecode field is valid */
-+
-+/*
-+ *    O V E R L A Y   P R E V I E W
-+ */
-+struct v4l2_framebuffer
-+{
-+      __u32                   capability;
-+      __u32                   flags;
-+/* FIXME: in theory we should pass something like PCI device + memory
-+ * region + offset instead of some physical address */
-+      void*                   base;
-+      struct v4l2_pix_format  fmt;
-+};
-+/*  Flags for the 'capability' field. Read only */
-+#define V4L2_FBUF_CAP_EXTERNOVERLAY   0x0001
-+#define V4L2_FBUF_CAP_CHROMAKEY               0x0002
-+#define V4L2_FBUF_CAP_LIST_CLIPPING     0x0004
-+#define V4L2_FBUF_CAP_BITMAP_CLIPPING 0x0008
-+/*  Flags for the 'flags' field. */
-+#define V4L2_FBUF_FLAG_PRIMARY                0x0001
-+#define V4L2_FBUF_FLAG_OVERLAY                0x0002
-+#define V4L2_FBUF_FLAG_CHROMAKEY      0x0004
-+
-+struct v4l2_clip
-+{
-+      struct v4l2_rect        c;
-+      struct v4l2_clip        *next;
-+};
-+
-+struct v4l2_window
-+{
-+      struct v4l2_rect        w;
-+      enum v4l2_field         field;
-+      __u32                   chromakey;
-+      struct v4l2_clip        *clips;
-+      __u32                   clipcount;
-+      void                    *bitmap;
-+};
-+
-+
-+/*
-+ *    C A P T U R E   P A R A M E T E R S
-+ */
-+struct v4l2_captureparm
-+{
-+      __u32              capability;    /*  Supported modes */
-+      __u32              capturemode;   /*  Current mode */
-+      struct v4l2_fract  timeperframe;  /*  Time per frame in .1us units */
-+      __u32              extendedmode;  /*  Driver-specific extensions */
-+      __u32              readbuffers;   /*  # of buffers for read */
-+      __u32              reserved[4];
-+};
-+/*  Flags for 'capability' and 'capturemode' fields */
-+#define V4L2_MODE_HIGHQUALITY 0x0001  /*  High quality imaging mode */
-+#define V4L2_CAP_TIMEPERFRAME 0x1000  /*  timeperframe field is supported */
-+
-+struct v4l2_outputparm
-+{
-+      __u32              capability;   /*  Supported modes */
-+      __u32              outputmode;   /*  Current mode */
-+      struct v4l2_fract  timeperframe; /*  Time per frame in seconds */
-+      __u32              extendedmode; /*  Driver-specific extensions */
-+      __u32              writebuffers; /*  # of buffers for write */
-+      __u32              reserved[4];
-+};
-+
-+/*
-+ *    I N P U T   I M A G E   C R O P P I N G
-+ */
-+
-+struct v4l2_cropcap {
-+      enum v4l2_buf_type      type;   
-+        struct v4l2_rect        bounds;
-+        struct v4l2_rect        defrect;
-+        struct v4l2_fract       pixelaspect;
-+};
-+
-+struct v4l2_crop {
-+      enum v4l2_buf_type      type;
-+      struct v4l2_rect        c;
-+};
-+
-+/*
-+ *      A N A L O G   V I D E O   S T A N D A R D
-+ */
-+
-+typedef __u64 v4l2_std_id;
-+
-+/* one bit for each */
-+#define V4L2_STD_PAL_B          ((v4l2_std_id)0x00000001)
-+#define V4L2_STD_PAL_B1         ((v4l2_std_id)0x00000002)
-+#define V4L2_STD_PAL_G          ((v4l2_std_id)0x00000004)
-+#define V4L2_STD_PAL_H          ((v4l2_std_id)0x00000008)
-+#define V4L2_STD_PAL_I          ((v4l2_std_id)0x00000010)
-+#define V4L2_STD_PAL_D          ((v4l2_std_id)0x00000020)
-+#define V4L2_STD_PAL_D1         ((v4l2_std_id)0x00000040)
-+#define V4L2_STD_PAL_K          ((v4l2_std_id)0x00000080)
-+
-+#define V4L2_STD_PAL_M          ((v4l2_std_id)0x00000100)
-+#define V4L2_STD_PAL_N          ((v4l2_std_id)0x00000200)
-+#define V4L2_STD_PAL_Nc         ((v4l2_std_id)0x00000400)
-+#define V4L2_STD_PAL_60         ((v4l2_std_id)0x00000800)
-+
-+#define V4L2_STD_NTSC_M         ((v4l2_std_id)0x00001000)
-+#define V4L2_STD_NTSC_M_JP      ((v4l2_std_id)0x00002000)
-+
-+#define V4L2_STD_SECAM_B        ((v4l2_std_id)0x00010000)
-+#define V4L2_STD_SECAM_D        ((v4l2_std_id)0x00020000)
-+#define V4L2_STD_SECAM_G        ((v4l2_std_id)0x00040000)
-+#define V4L2_STD_SECAM_H        ((v4l2_std_id)0x00080000)
-+#define V4L2_STD_SECAM_K        ((v4l2_std_id)0x00100000)
-+#define V4L2_STD_SECAM_K1       ((v4l2_std_id)0x00200000)
-+#define V4L2_STD_SECAM_L        ((v4l2_std_id)0x00400000)
-+
-+/* ATSC/HDTV */
-+#define V4L2_STD_ATSC_8_VSB     ((v4l2_std_id)0x01000000)
-+#define V4L2_STD_ATSC_16_VSB    ((v4l2_std_id)0x02000000)
-+
-+/* some common needed stuff */
-+#define V4L2_STD_PAL_BG               (V4L2_STD_PAL_B         |\
-+                               V4L2_STD_PAL_B1        |\
-+                               V4L2_STD_PAL_G)
-+#define V4L2_STD_PAL_DK               (V4L2_STD_PAL_D         |\
-+                               V4L2_STD_PAL_D1        |\
-+                               V4L2_STD_PAL_K)
-+#define V4L2_STD_PAL          (V4L2_STD_PAL_BG        |\
-+                               V4L2_STD_PAL_DK        |\
-+                               V4L2_STD_PAL_H         |\
-+                               V4L2_STD_PAL_I)
-+#define V4L2_STD_NTSC           (V4L2_STD_NTSC_M      |\
-+                               V4L2_STD_NTSC_M_JP)
-+#define V4L2_STD_SECAM                (V4L2_STD_SECAM_B       |\
-+                               V4L2_STD_SECAM_D       |\
-+                               V4L2_STD_SECAM_G       |\
-+                               V4L2_STD_SECAM_H       |\
-+                               V4L2_STD_SECAM_K       |\
-+                               V4L2_STD_SECAM_K1      |\
-+                               V4L2_STD_SECAM_L)
-+
-+#define V4L2_STD_525_60               (V4L2_STD_PAL_M         |\
-+                               V4L2_STD_PAL_60        |\
-+                               V4L2_STD_NTSC)
-+#define V4L2_STD_625_50               (V4L2_STD_PAL           |\
-+                               V4L2_STD_PAL_N         |\
-+                               V4L2_STD_PAL_Nc        |\
-+                               V4L2_STD_SECAM)
-+
-+#define V4L2_STD_UNKNOWN        0
-+#define V4L2_STD_ALL            (V4L2_STD_525_60      |\
-+                               V4L2_STD_625_50)
-+
-+struct v4l2_standard
-+{
-+      __u32                index;
-+      v4l2_std_id          id;
-+      __u8                 name[24];
-+      struct v4l2_fract    frameperiod; /* Frames, not fields */
-+      __u32                framelines;
-+      __u32                reserved[4];
-+};
-+
-+
-+/*
-+ *    V I D E O   I N P U T S
-+ */
-+struct v4l2_input
-+{
-+      __u32        index;             /*  Which input */
-+      __u8         name[32];          /*  Label */
-+      __u32        type;              /*  Type of input */
-+      __u32        audioset;          /*  Associated audios (bitfield) */
-+      __u32        tuner;             /*  Associated tuner */
-+      v4l2_std_id  std;
-+      __u32        status;
-+      __u32        reserved[4];
-+};
-+/*  Values for the 'type' field */
-+#define V4L2_INPUT_TYPE_TUNER         1
-+#define V4L2_INPUT_TYPE_CAMERA                2
-+
-+/* field 'status' - general */
-+#define V4L2_IN_ST_NO_POWER    0x00000001  /* Attached device is off */
-+#define V4L2_IN_ST_NO_SIGNAL   0x00000002
-+#define V4L2_IN_ST_NO_COLOR    0x00000004
-+
-+/* field 'status' - analog */
-+#define V4L2_IN_ST_NO_H_LOCK   0x00000100  /* No horizontal sync lock */
-+#define V4L2_IN_ST_COLOR_KILL  0x00000200  /* Color killer is active */
-+
-+/* field 'status' - digital */
-+#define V4L2_IN_ST_NO_SYNC     0x00010000  /* No synchronization lock */
-+#define V4L2_IN_ST_NO_EQU      0x00020000  /* No equalizer lock */
-+#define V4L2_IN_ST_NO_CARRIER  0x00040000  /* Carrier recovery failed */
-+
-+/* field 'status' - VCR and set-top box */
-+#define V4L2_IN_ST_MACROVISION 0x01000000  /* Macrovision detected */
-+#define V4L2_IN_ST_NO_ACCESS   0x02000000  /* Conditional access denied */
-+#define V4L2_IN_ST_VTR         0x04000000  /* VTR time constant */
-+
-+/*
-+ *    V I D E O   O U T P U T S
-+ */
-+struct v4l2_output
-+{
-+      __u32        index;             /*  Which output */
-+      __u8         name[32];          /*  Label */
-+      __u32        type;              /*  Type of output */
-+      __u32        audioset;          /*  Associated audios (bitfield) */
-+      __u32        modulator;         /*  Associated modulator */
-+      v4l2_std_id  std;
-+      __u32        reserved[4];
-+};
-+/*  Values for the 'type' field */
-+#define V4L2_OUTPUT_TYPE_MODULATOR            1
-+#define V4L2_OUTPUT_TYPE_ANALOG                       2
-+#define V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY     3
-+
-+/*
-+ *    C O N T R O L S
-+ */
-+struct v4l2_control
-+{
-+      __u32                id;
-+      __s32                value;
-+};
-+
-+/*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
-+struct v4l2_queryctrl
-+{
-+      __u32                id;
-+      enum v4l2_ctrl_type  type;
-+      __u8                 name[32];  /* Whatever */
-+      __s32                minimum;   /* Note signedness */
-+      __s32                maximum;
-+      __s32                step;
-+      __s32                default_value;
-+      __u32                flags;
-+      __u32                reserved[2];
-+};
-+
-+/*  Used in the VIDIOC_QUERYMENU ioctl for querying menu items */
-+struct v4l2_querymenu
-+{
-+      __u32           id;
-+      __u32           index;
-+      __u8            name[32];       /* Whatever */
-+      __u32           reserved;
-+};
-+
-+/*  Control flags  */
-+#define V4L2_CTRL_FLAG_DISABLED               0x0001
-+#define V4L2_CTRL_FLAG_GRABBED                0x0002
-+
-+/*  Control IDs defined by V4L2 */
-+#define V4L2_CID_BASE                 0x00980900
-+/*  IDs reserved for driver specific controls */
-+#define V4L2_CID_PRIVATE_BASE         0x08000000
-+
-+#define V4L2_CID_BRIGHTNESS           (V4L2_CID_BASE+0)
-+#define V4L2_CID_CONTRAST             (V4L2_CID_BASE+1)
-+#define V4L2_CID_SATURATION           (V4L2_CID_BASE+2)
-+#define V4L2_CID_HUE                  (V4L2_CID_BASE+3)
-+#define V4L2_CID_AUDIO_VOLUME         (V4L2_CID_BASE+5)
-+#define V4L2_CID_AUDIO_BALANCE                (V4L2_CID_BASE+6)
-+#define V4L2_CID_AUDIO_BASS           (V4L2_CID_BASE+7)
-+#define V4L2_CID_AUDIO_TREBLE         (V4L2_CID_BASE+8)
-+#define V4L2_CID_AUDIO_MUTE           (V4L2_CID_BASE+9)
-+#define V4L2_CID_AUDIO_LOUDNESS               (V4L2_CID_BASE+10)
-+#define V4L2_CID_BLACK_LEVEL          (V4L2_CID_BASE+11)
-+#define V4L2_CID_AUTO_WHITE_BALANCE   (V4L2_CID_BASE+12)
-+#define V4L2_CID_DO_WHITE_BALANCE     (V4L2_CID_BASE+13)
-+#define V4L2_CID_RED_BALANCE          (V4L2_CID_BASE+14)
-+#define V4L2_CID_BLUE_BALANCE         (V4L2_CID_BASE+15)
-+#define V4L2_CID_GAMMA                        (V4L2_CID_BASE+16)
-+#define V4L2_CID_WHITENESS            (V4L2_CID_GAMMA) /* ? Not sure */
-+#define V4L2_CID_EXPOSURE             (V4L2_CID_BASE+17)
-+#define V4L2_CID_AUTOGAIN             (V4L2_CID_BASE+18)
-+#define V4L2_CID_GAIN                 (V4L2_CID_BASE+19)
-+#define V4L2_CID_HFLIP                        (V4L2_CID_BASE+20)
-+#define V4L2_CID_VFLIP                        (V4L2_CID_BASE+21)
-+#define V4L2_CID_HCENTER              (V4L2_CID_BASE+22)
-+#define V4L2_CID_VCENTER              (V4L2_CID_BASE+23)
-+#define V4L2_CID_LASTP1                       (V4L2_CID_BASE+24) /* last CID + 1 */
-+
-+/*
-+ *    T U N I N G
-+ */
-+struct v4l2_tuner
-+{
-+      __u32                   index;
-+      __u8                    name[32];
-+      enum v4l2_tuner_type    type;
-+      __u32                   capability;
-+      __u32                   rangelow;
-+      __u32                   rangehigh;
-+      __u32                   rxsubchans;
-+      __u32                   audmode;
-+      __s32                   signal;
-+      __s32                   afc;
-+      __u32                   reserved[4];
-+};
-+
-+struct v4l2_modulator
-+{
-+      __u32                   index;
-+      __u8                    name[32];
-+      __u32                   capability;
-+      __u32                   rangelow;
-+      __u32                   rangehigh;
-+      __u32                   txsubchans;
-+      __u32                   reserved[4];
-+};
-+
-+/*  Flags for the 'capability' field */
-+#define V4L2_TUNER_CAP_LOW            0x0001
-+#define V4L2_TUNER_CAP_NORM           0x0002
-+#define V4L2_TUNER_CAP_STEREO         0x0010
-+#define V4L2_TUNER_CAP_LANG2          0x0020
-+#define V4L2_TUNER_CAP_SAP            0x0020
-+#define V4L2_TUNER_CAP_LANG1          0x0040
-+
-+/*  Flags for the 'rxsubchans' field */
-+#define V4L2_TUNER_SUB_MONO           0x0001
-+#define V4L2_TUNER_SUB_STEREO         0x0002
-+#define V4L2_TUNER_SUB_LANG2          0x0004
-+#define V4L2_TUNER_SUB_SAP            0x0004
-+#define V4L2_TUNER_SUB_LANG1          0x0008
-+
-+/*  Values for the 'audmode' field */
-+#define V4L2_TUNER_MODE_MONO          0x0000
-+#define V4L2_TUNER_MODE_STEREO                0x0001
-+#define V4L2_TUNER_MODE_LANG2         0x0002
-+#define V4L2_TUNER_MODE_SAP           0x0002
-+#define V4L2_TUNER_MODE_LANG1         0x0003
-+
-+struct v4l2_frequency
-+{
-+      __u32                 tuner;
-+      enum v4l2_tuner_type  type;
-+        __u32               frequency;
-+      __u32                 reserved[8];
-+};
-+
-+/*
-+ *    A U D I O
-+ */
-+struct v4l2_audio
-+{
-+      __u32   index;
-+      __u8    name[32];
-+      __u32   capability;
-+      __u32   mode;
-+      __u32   reserved[2];
-+};
-+/*  Flags for the 'capability' field */
-+#define V4L2_AUDCAP_STEREO            0x00001
-+#define V4L2_AUDCAP_AVL                       0x00002
-+
-+/*  Flags for the 'mode' field */
-+#define V4L2_AUDMODE_AVL              0x00001
-+
-+struct v4l2_audioout
-+{
-+      __u32   index;
-+      __u8    name[32];
-+      __u32   capability;
-+      __u32   mode;
-+      __u32   reserved[2];
-+};
-+
-+/*
-+ *    D A T A   S E R V I C E S   ( V B I )
-+ *
-+ *    Data services API by Michael Schimek
-+ */
-+
-+struct v4l2_vbi_format
-+{
-+      __u32   sampling_rate;          /* in 1 Hz */
-+      __u32   offset;
-+      __u32   samples_per_line;
-+      __u32   sample_format;          /* V4L2_PIX_FMT_* */
-+      __s32   start[2];
-+      __u32   count[2];
-+      __u32   flags;                  /* V4L2_VBI_* */
-+      __u32   reserved[2];            /* must be zero */
-+};
-+
-+/*  VBI flags  */
-+#define V4L2_VBI_UNSYNC               (1<< 0)
-+#define V4L2_VBI_INTERLACED   (1<< 1)
-+
-+
-+/*
-+ *    A G G R E G A T E   S T R U C T U R E S
-+ */
-+
-+/*    Stream data format
-+ */
-+struct v4l2_format
-+{
-+      enum v4l2_buf_type type;
-+      union
-+      {
-+              struct v4l2_pix_format  pix;  // V4L2_BUF_TYPE_VIDEO_CAPTURE
-+              struct v4l2_window      win;  // V4L2_BUF_TYPE_VIDEO_OVERLAY
-+              struct v4l2_vbi_format  vbi;  // V4L2_BUF_TYPE_VBI_CAPTURE
-+              __u8    raw_data[200];        // user-defined
-+      } fmt;
-+};
-+
-+
-+/*    Stream type-dependent parameters
-+ */
-+struct v4l2_streamparm
-+{
-+      enum v4l2_buf_type type;
-+      union
-+      {
-+              struct v4l2_captureparm capture;
-+              struct v4l2_outputparm  output;
-+              __u8    raw_data[200];  /* user-defined */
-+      } parm;
-+};
-+
-+
-+
-+/*
-+ *    I O C T L   C O D E S   F O R   V I D E O   D E V I C E S
-+ *
-+ */
-+#define VIDIOC_QUERYCAP               _IOR  ('V',  0, struct v4l2_capability)
-+#define VIDIOC_RESERVED               _IO   ('V',  1)
-+#define VIDIOC_ENUM_FMT         _IOWR ('V',  2, struct v4l2_fmtdesc)
-+#define VIDIOC_G_FMT          _IOWR ('V',  4, struct v4l2_format)
-+#define VIDIOC_S_FMT          _IOWR ('V',  5, struct v4l2_format)
-+#if 0
-+#define VIDIOC_G_COMP         _IOR  ('V',  6, struct v4l2_compression)
-+#define VIDIOC_S_COMP         _IOW  ('V',  7, struct v4l2_compression)
-+#endif
-+#define VIDIOC_REQBUFS                _IOWR ('V',  8, struct v4l2_requestbuffers)
-+#define VIDIOC_QUERYBUF               _IOWR ('V',  9, struct v4l2_buffer)
-+#define VIDIOC_G_FBUF         _IOR  ('V', 10, struct v4l2_framebuffer)
-+#define VIDIOC_S_FBUF         _IOW  ('V', 11, struct v4l2_framebuffer)
-+#define VIDIOC_OVERLAY                _IOW  ('V', 14, int)
-+#define VIDIOC_QBUF           _IOWR ('V', 15, struct v4l2_buffer)
-+#define VIDIOC_DQBUF          _IOWR ('V', 17, struct v4l2_buffer)
-+#define VIDIOC_STREAMON               _IOW  ('V', 18, int)
-+#define VIDIOC_STREAMOFF      _IOW  ('V', 19, int)
-+#define VIDIOC_G_PARM         _IOWR ('V', 21, struct v4l2_streamparm)
-+#define VIDIOC_S_PARM         _IOWR ('V', 22, struct v4l2_streamparm)
-+#define VIDIOC_G_STD          _IOR  ('V', 23, v4l2_std_id)
-+#define VIDIOC_S_STD          _IOW  ('V', 24, v4l2_std_id)
-+#define VIDIOC_ENUMSTD                _IOWR ('V', 25, struct v4l2_standard)
-+#define VIDIOC_ENUMINPUT      _IOWR ('V', 26, struct v4l2_input)
-+#define VIDIOC_G_CTRL         _IOWR ('V', 27, struct v4l2_control)
-+#define VIDIOC_S_CTRL         _IOWR ('V', 28, struct v4l2_control)
-+#define VIDIOC_G_TUNER                _IOWR ('V', 29, struct v4l2_tuner)
-+#define VIDIOC_S_TUNER                _IOW  ('V', 30, struct v4l2_tuner)
-+#define VIDIOC_G_AUDIO                _IOR  ('V', 33, struct v4l2_audio)
-+#define VIDIOC_S_AUDIO                _IOW  ('V', 34, struct v4l2_audio)
-+#define VIDIOC_QUERYCTRL      _IOWR ('V', 36, struct v4l2_queryctrl)
-+#define VIDIOC_QUERYMENU      _IOWR ('V', 37, struct v4l2_querymenu)
-+#define VIDIOC_G_INPUT                _IOR  ('V', 38, int)
-+#define VIDIOC_S_INPUT                _IOWR ('V', 39, int)
-+#define VIDIOC_G_OUTPUT               _IOR  ('V', 46, int)
-+#define VIDIOC_S_OUTPUT               _IOWR ('V', 47, int)
-+#define VIDIOC_ENUMOUTPUT     _IOWR ('V', 48, struct v4l2_output)
-+#define VIDIOC_G_AUDOUT               _IOR  ('V', 49, struct v4l2_audioout)
-+#define VIDIOC_S_AUDOUT               _IOW  ('V', 50, struct v4l2_audioout)
-+#define VIDIOC_G_MODULATOR    _IOWR ('V', 54, struct v4l2_modulator)
-+#define VIDIOC_S_MODULATOR    _IOW  ('V', 55, struct v4l2_modulator)
-+#define VIDIOC_G_FREQUENCY    _IOWR ('V', 56, struct v4l2_frequency)
-+#define VIDIOC_S_FREQUENCY    _IOW  ('V', 57, struct v4l2_frequency)
-+#define VIDIOC_CROPCAP                _IOR  ('V', 58, struct v4l2_cropcap)
-+#define VIDIOC_G_CROP         _IOWR ('V', 59, struct v4l2_crop)
-+#define VIDIOC_S_CROP         _IOW  ('V', 60, struct v4l2_crop)
-+#define VIDIOC_G_JPEGCOMP     _IOR  ('V', 61, struct v4l2_jpegcompression)
-+#define VIDIOC_S_JPEGCOMP     _IOW  ('V', 62, struct v4l2_jpegcompression)
-+#define VIDIOC_QUERYSTD       _IOR  ('V', 63, v4l2_std_id)
-+#define VIDIOC_TRY_FMT        _IOWR ('V', 64, struct v4l2_format)
-+#define VIDIOC_ENUMAUDIO      _IOWR ('V', 65, struct v4l2_audio)
-+#define VIDIOC_ENUMAUDOUT     _IOWR ('V', 66, struct v4l2_audioout)
-+#define VIDIOC_G_PRIORITY       _IOR  ('V', 67, enum v4l2_priority)
-+#define VIDIOC_S_PRIORITY       _IOW  ('V', 68, enum v4l2_priority)
-+
-+/* for compatibility, will go away some day */
-+#define VIDIOC_OVERLAY_OLD            _IOWR ('V', 14, int)
-+#define VIDIOC_S_PARM_OLD             _IOW  ('V', 22, struct v4l2_streamparm)
-+#define VIDIOC_S_CTRL_OLD             _IOW  ('V', 28, struct v4l2_control)
-+#define VIDIOC_G_AUDIO_OLD            _IOWR ('V', 33, struct v4l2_audio)
-+#define VIDIOC_G_AUDOUT_OLD           _IOWR ('V', 49, struct v4l2_audioout)
-+
-+#define BASE_VIDIOC_PRIVATE   192             /* 192-255 are private */
-+
-+
-+#ifdef __KERNEL__
-+/*
-+ *
-+ *    V 4 L 2   D R I V E R   H E L P E R   A P I
-+ *
-+ *    Some commonly needed functions for drivers (v4l2-common.o module)
-+ */
-+#include <linux/fs.h>
-+
-+/*  Video standard functions  */
-+extern unsigned int v4l2_video_std_fps(struct v4l2_standard *vs);
-+extern int v4l2_video_std_construct(struct v4l2_standard *vs,
-+                                  int id, char *name);
-+
-+/* prority handling */
-+struct v4l2_prio_state {
-+      atomic_t prios[4];
-+};
-+int v4l2_prio_init(struct v4l2_prio_state *global);
-+int v4l2_prio_change(struct v4l2_prio_state *global, enum v4l2_priority *local,
-+                   enum v4l2_priority new);
-+int v4l2_prio_open(struct v4l2_prio_state *global, enum v4l2_priority *local);
-+int v4l2_prio_close(struct v4l2_prio_state *global, enum v4l2_priority *local);
-+enum v4l2_priority v4l2_prio_max(struct v4l2_prio_state *global);
-+int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority *local);
-+
-+/* names for fancy debug output */
-+extern char *v4l2_field_names[];
-+extern char *v4l2_type_names[];
-+extern char *v4l2_ioctl_names[];
-+
-+/*  Compatibility layer interface  --  v4l1-compat module */
-+typedef int (*v4l2_kioctl)(struct inode *inode, struct file *file,
-+                         unsigned int cmd, void *arg);
-+int v4l_compat_translate_ioctl(struct inode *inode, struct file *file,
-+                             int cmd, void *arg, v4l2_kioctl driver_ioctl);
-+
-+#endif /* __KERNEL__ */
-+#endif /* __LINUX_VIDEODEV2_H */
-+
-+/*
-+ * Local variables:
-+ * c-basic-offset: 8
-+ * End:
-+ */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1169-uplevel-samsung-camera-unit.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1169-uplevel-samsung-camera-unit.patch.patch
deleted file mode 100644 (file)
index b1e983d..0000000
+++ /dev/null
@@ -1,1699 +0,0 @@
-From 1ccc3052a80284d3d7fbdfc0badadf6ae4236f79 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@opennoko.com>
-Date: Wed, 2 Jul 2008 22:37:38 +0100
-Subject: [PATCH] uplevel-samsung-camera-unit.patch
-
-Update this old code to clk API, I2C changes, official GPIO API
-various struct changes, explicit readl() writel(), DMA API changes.
-Still not ready for actual use (eg, I2C) but a LOT closer.
-
-Compiles on 2.6.24 without errors or warnings now.
-
-Use CONFIG_S3C2440_CAMERA=y in .config
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/Kconfig               |    5 +-
- arch/arm/mach-s3c2440/Makefile              |   26 +-
- arch/arm/mach-s3c2440/camera/Makefile       |    1 -
- arch/arm/mach-s3c2440/camera/cam_reg.h      |   92 +++--
- arch/arm/mach-s3c2440/camera/camif.c        |  633 +++++++++++++++------------
- arch/arm/mach-s3c2440/camera/camif_fsm.c    |    5 +
- arch/arm/mach-s3c2440/camera/imgsensor.c    |   43 +-
- arch/arm/mach-s3c2440/camera/qt-driver.c    |    5 +-
- arch/arm/mach-s3c2440/camera/video-driver.c |   87 +++--
- arch/arm/mach-s3c2440/camera/videodev.c     |   24 +-
- arch/arm/mach-s3c2440/camera/videodev.h     |   16 +-
- 11 files changed, 533 insertions(+), 404 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
-index c350511..4a211d8 100644
---- a/arch/arm/mach-s3c2440/Kconfig
-+++ b/arch/arm/mach-s3c2440/Kconfig
-@@ -30,9 +30,6 @@ config S3C2440_C_FIQ
-         Support for S3C2440 FIQ support in C -- see
-         ./arch/arm/macs3c2440/fiq_c_isr.c
--source "arch/arm/mach-s3c2440/camera/Kconfig"
--
--
- menu "S3C2440 Machines"
- config MACH_ANUBIS
-@@ -102,3 +99,5 @@ config NEO1973_GTA02_2440
-          of the FIC/Openmoko Neo1973 GTA02 GSM Phone.
- endmenu
-+
-+#source "arch/arm/mach-s3c2440/camera/Kconfig"
-diff --git a/arch/arm/mach-s3c2440/Makefile b/arch/arm/mach-s3c2440/Makefile
-index 7112231..e3ca9e3 100644
---- a/arch/arm/mach-s3c2440/Makefile
-+++ b/arch/arm/mach-s3c2440/Makefile
-@@ -1,2 +1,26 @@
--obj-y                           += camera/
-+# arch/arm/mach-s3c2440/Makefile
-+#
-+# Copyright 2007 Simtec Electronics
-+#
-+# Licensed under GPLv2
-+obj-y                         :=
-+obj-m                         :=
-+obj-n                         :=
-+obj-                          :=
-+
-+obj-$(CONFIG_CPU_S3C2440)     += s3c2440.o dsc.o
-+obj-$(CONFIG_CPU_S3C2440)     += irq.o
-+obj-$(CONFIG_CPU_S3C2440)     += clock.o
-+obj-$(CONFIG_S3C2440_DMA)     += dma.o
-+obj-$(CONFIG_S3C2440_C_FIQ)   += fiq_c_isr.o
-+
-+# Machine support
-+
-+obj-$(CONFIG_MACH_ANUBIS)     += mach-anubis.o
-+obj-$(CONFIG_MACH_OSIRIS)     += mach-osiris.o
-+obj-$(CONFIG_MACH_RX3715)     += mach-rx3715.o
-+obj-$(CONFIG_ARCH_S3C2440)    += mach-smdk2440.o
-+obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
-+obj-$(CONFIG_MACH_HXD8)               += mach-hxd8.o
-+obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
-diff --git a/arch/arm/mach-s3c2440/camera/Makefile b/arch/arm/mach-s3c2440/camera/Makefile
-index a46d3be..9cd6d79 100644
---- a/arch/arm/mach-s3c2440/camera/Makefile
-+++ b/arch/arm/mach-s3c2440/camera/Makefile
-@@ -1,7 +1,6 @@
- obj-$(CONFIG_S3C2440_CAMERA) += \
-       videodev.o \
-       imgsensor.o \
--      videodrv.o \
-       video-driver.o \
-       camif.o \
-       camif_fsm.o \
-diff --git a/arch/arm/mach-s3c2440/camera/cam_reg.h b/arch/arm/mach-s3c2440/camera/cam_reg.h
-index 7247a4e..93d59b8 100644
---- a/arch/arm/mach-s3c2440/camera/cam_reg.h
-+++ b/arch/arm/mach-s3c2440/camera/cam_reg.h
-@@ -7,6 +7,7 @@
- #ifndef __FIMC20_CAMERA_H__
- #define __FIMC20_CAMERA_H__
-+extern u32 * camregs;
- #ifdef CONFIG_ARCH_S3C24A0
- #define CAM_BASE_ADD             0x48000000
-@@ -14,10 +15,23 @@
- #define CAM_BASE_ADD             0x4F000000
- #endif
-+#if ! defined(FExtr)
-+#define UData(Data)     ((unsigned long) (Data))
-+#define FExtr(Data, Field) \
-+                        ((UData (Data) >> FShft (Field)) & FAlnMsk (Field))
-+#define FInsrt(Value, Field) \
-+                        (UData (Value) << FShft (Field))
-+#define FSize(Field)    ((Field) >> 16)
-+#define FShft(Field)    ((Field) & 0x0000FFFF)
-+#define FMsk(Field)     (((UData (1) << FSize (Field)) - 1) << FShft (Field))
-+#define FAlnMsk(Field)  ((UData (1) << FSize (Field)) - 1)
-+#define F1stBit(Field)  (UData (1) << FShft (Field))
-+#define Fld(Size, Shft) (((Size) << 16) + (Shft))
-+#endif
- /*
-  * CAMERA IP
-- * P-port is used as RGB Capturing device which including scale and crop 
-+ * P-port is used as RGB Capturing device which including scale and crop
-  *  those who want to see(preview ) the image on display needs RGB image.
-  *
-  * C-port is used as YCbCr(4:2:0, 4:2:2) Capturing device which including the scale and crop
-@@ -25,45 +39,45 @@
-      YCBCB format not RGB 
-  */ 
--#define CISRCFMT            __REG(CAM_BASE_ADD+0x00) // RW Input Source Format
--#define CIWDOFST            __REG(CAM_BASE_ADD+0x04) // Window offset register
--#define CIGCTRL             __REG(CAM_BASE_ADD+0x08) // Global control register
--#define CICOYSA0            __REG(CAM_BASE_ADD+0x18) // Y 1 st frame start address 
--#define CICOYSA1            __REG(CAM_BASE_ADD+0x1C) // Y 2 nd frame start address 
--#define CICOYSA2            __REG(CAM_BASE_ADD+0x20) // Y 3 rd frame start address 
--#define CICOYSA3            __REG(CAM_BASE_ADD+0x24) // Y 4 th frame start address 
--#define CICOCBSA0           __REG(CAM_BASE_ADD+0x28) // Cb 1 st frame start address 
--#define CICOCBSA1           __REG(CAM_BASE_ADD+0x2C) // Cb 2 nd frame start address 
--#define CICOCBSA2           __REG(CAM_BASE_ADD+0x30) // Cb 3 rd frame start address 
--#define CICOCBSA3           __REG(CAM_BASE_ADD+0x34) // Cb 4 th frame start address 
--#define CICOCRSA0           __REG(CAM_BASE_ADD+0x38) // Cr 1 st frame start address 
--#define CICOCRSA1           __REG(CAM_BASE_ADD+0x3C) // Cr 2 nd frame start address 
--#define CICOCRSA2           __REG(CAM_BASE_ADD+0x40) // Cr 3 rd frame start address 
--#define CICOCRSA3           __REG(CAM_BASE_ADD+0x44) // Cr 4 th frame start address 
--#define CICOTRGFMT          __REG(CAM_BASE_ADD+0x48) // Target image format of codec
--#define CICOCTRL            __REG(CAM_BASE_ADD+0x4C) // Codec DMA control related
--#define CICOSCPRERATIO      __REG(CAM_BASE_ADD+0x50) // Codec pre-scaler ratio control
--#define CICOSCPREDST        __REG(CAM_BASE_ADD+0x54) // Codec pre-scaler destination
--#define CICOSCCTRL          __REG(CAM_BASE_ADD+0x58) // Codec main-scaler control
--#define CICOTAREA           __REG(CAM_BASE_ADD+0x5C) // Codec pre-scaler destination
--#define CICOSTATUS          __REG(CAM_BASE_ADD+0x64) // Codec path status
--#define CIPRCLRSA0          __REG(CAM_BASE_ADD+0x6C) // RGB 1 st frame start address 
--#define CIPRCLRSA1          __REG(CAM_BASE_ADD+0x70) // RGB 2 nd frame start address 
--#define CIPRCLRSA2          __REG(CAM_BASE_ADD+0x74) // RGB 3 rd frame start address 
--#define CIPRCLRSA3          __REG(CAM_BASE_ADD+0x78) // RGB 4 th frame start address 
--#define CIPRTRGFMT          __REG(CAM_BASE_ADD+0x7C) // Target image format of preview
--#define CIPRCTRL            __REG(CAM_BASE_ADD+0x80) // Preview DMA control related
--#define CIPRSCPRERATIO      __REG(CAM_BASE_ADD+0x84) // Preview pre-scaler ratio control
--#define CIPRSCPREDST        __REG(CAM_BASE_ADD+0x88) // Preview pre-scaler destination
--#define CIPRSCCTRL          __REG(CAM_BASE_ADD+0x8C) // Preview main-scaler control
--#define CIPRTAREA           __REG(CAM_BASE_ADD+0x90) // Preview pre-scaler destination
--#define CIPRSTATUS          __REG(CAM_BASE_ADD+0x98) // Preview path status
--#define CIIMGCPT            __REG(CAM_BASE_ADD+0xA0) // Image capture enable command
--
--#define CICOYSA(__x)        __REG(CAM_BASE_ADD+0x18 + (__x)*4 ) 
--#define CICOCBSA(__x)       __REG(CAM_BASE_ADD+0x28 + (__x)*4 )
--#define CICOCRSA(__x)       __REG(CAM_BASE_ADD+0x38 + (__x)*4 ) 
--#define CIPRCLRSA(__x)      __REG(CAM_BASE_ADD+0x6C + (__x)*4 )
-+#define S3C2440_CAM_REG_CISRCFMT            (0x00) // RW Input Source Format
-+#define S3C2440_CAM_REG_CIWDOFST            (0x04) // Window offset register
-+#define S3C2440_CAM_REG_CIGCTRL             (0x08) // Global control register
-+#define S3C2440_CAM_REG_CICOYSA0            (0x18) // Y 1 st frame start ads
-+#define S3C2440_CAM_REG_CICOYSA1            (0x1C) // Y 2 nd frame start ads
-+#define S3C2440_CAM_REG_CICOYSA2            (0x20) // Y 3 rd frame start ads
-+#define S3C2440_CAM_REG_CICOYSA3            (0x24) // Y 4 th frame start ads
-+#define S3C2440_CAM_REG_CICOCBSA0           (0x28) // Cb 1 st frame start ads
-+#define S3C2440_CAM_REG_CICOCBSA1           (0x2C) // Cb 2 nd frame start ads
-+#define S3C2440_CAM_REG_CICOCBSA2           (0x30) // Cb 3 rd frame start ads
-+#define S3C2440_CAM_REG_CICOCBSA3           (0x34) // Cb 4 th frame start ads
-+#define S3C2440_CAM_REG_CICOCRSA0           (0x38) // Cr 1 st frame start ads
-+#define S3C2440_CAM_REG_CICOCRSA1           (0x3C) // Cr 2 nd frame start ads
-+#define S3C2440_CAM_REG_CICOCRSA2           (0x40) // Cr 3 rd frame start ads
-+#define S3C2440_CAM_REG_CICOCRSA3           (0x44) // Cr 4 th frame start ads
-+#define S3C2440_CAM_REG_CICOTRGFMT          (0x48) // Target img format of codec
-+#define S3C2440_CAM_REG_CICOCTRL            (0x4C) // Codec DMA control related
-+#define S3C2440_CAM_REG_CICOSCPRERATIO      (0x50) // Codec pre-scaler ratio
-+#define S3C2440_CAM_REG_CICOSCPREDST        (0x54) // Codec pre-scaler dest
-+#define S3C2440_CAM_REG_CICOSCCTRL          (0x58) // Codec main-scaler control
-+#define S3C2440_CAM_REG_CICOTAREA           (0x5C) // Codec pre-scaler dest
-+#define S3C2440_CAM_REG_CICOSTATUS          (0x64) // Codec path status
-+#define S3C2440_CAM_REG_CIPRCLRSA0          (0x6C) // RGB 1 st frame start ads
-+#define S3C2440_CAM_REG_CIPRCLRSA1          (0x70) // RGB 2 nd frame start ads
-+#define S3C2440_CAM_REG_CIPRCLRSA2          (0x74) // RGB 3 rd frame start ads
-+#define S3C2440_CAM_REG_CIPRCLRSA3          (0x78) // RGB 4 th frame start ads
-+#define S3C2440_CAM_REG_CIPRTRGFMT          (0x7C) // Target img fmt of preview
-+#define S3C2440_CAM_REG_CIPRCTRL            (0x80) // Preview DMA ctl related
-+#define S3C2440_CAM_REG_CIPRSCPRERATIO      (0x84) // Preview pre-scaler ratio
-+#define S3C2440_CAM_REG_CIPRSCPREDST        (0x88) // Preview pre-scaler dest
-+#define S3C2440_CAM_REG_CIPRSCCTRL          (0x8C) // Preview main-scaler ctl
-+#define S3C2440_CAM_REG_CIPRTAREA           (0x90) // Preview pre-scaler dest
-+#define S3C2440_CAM_REG_CIPRSTATUS          (0x98) // Preview path status
-+#define S3C2440_CAM_REG_CIIMGCPT            (0xA0) // Image capture enable cmd
-+
-+#define S3C2440_CAM_REG_CICOYSA(__x)        (0x18 + (__x)*4 )
-+#define S3C2440_CAM_REG_CICOCBSA(__x)       (0x28 + (__x)*4 )
-+#define S3C2440_CAM_REG_CICOCRSA(__x)       (0x38 + (__x)*4 )
-+#define S3C2440_CAM_REG_CIPRCLRSA(__x)      (0x6C + (__x)*4 )
- /* CISRCFMT BitField */
- #define SRCFMT_ITU601       BIT31
-diff --git a/arch/arm/mach-s3c2440/camera/camif.c b/arch/arm/mach-s3c2440/camera/camif.c
-index 36d4ccc..2e97e21 100644
---- a/arch/arm/mach-s3c2440/camera/camif.c
-+++ b/arch/arm/mach-s3c2440/camera/camif.c
-@@ -7,14 +7,11 @@
-  * for more details.
-  */
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/init.h>
- #include <linux/sched.h>
- #include <linux/irq.h>
--#include <linux/tqueue.h>
--#include <linux/locks.h>
- #include <linux/completion.h>
- #include <linux/delay.h>
- #include <linux/slab.h>
-@@ -26,28 +23,29 @@
- #include <asm/semaphore.h>
- #include <asm/hardware.h>
- #include <asm/uaccess.h>
-+#include <linux/device.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/clk.h>
- #ifdef CONFIG_ARCH_S3C24A0A
- #include <asm/arch/S3C24A0.h>
- #include <asm/arch/clocks.h>
- #else
--#include <asm/arch/S3C2440.h>
--#include <asm/arch/clocks.h>
-+#include <asm/arch/regs-gpio.h>
-+#include <asm/arch/regs-gpioj.h>
-+#include <asm/arch/regs-irq.h>
- #endif
- #include "cam_reg.h"
- //#define SW_DEBUG
-+#define CONFIG_VIDEO_V4L1_COMPAT
-+#include <linux/videodev.h>
- #include "camif.h"
--#include "videodev.h"
- #include "miscdevice.h"
--
- static int camif_dma_burst(camif_cfg_t *);
- static int camif_scaler(camif_cfg_t *);
--static const char *camif_version =
--        "$Id: camif.c,v 1.10 2004/06/04 04:24:14 swlee Exp $";
--      
- /* For SXGA Image */
- #define RESERVE_MEM  15*1024*1024
- #define YUV_MEM      10*1024*1024
-@@ -66,11 +64,13 @@ static int camif_malloc(camif_cfg_t *cfg)
-               t_size = t_size *cfg->pp_num;
- #ifndef SAMSUNG_SXGA_CAM
--              cfg->pp_virt_buf = consistent_alloc(GFP_KERNEL, t_size, &cfg->pp_phys_buf);
-+              cfg->pp_virt_buf = dma_alloc_coherent(cfg->v->dev,
-+                                                    t_size, &cfg->pp_phys_buf,
-+                                                    GFP_KERNEL);
- #else
-               printk(KERN_INFO "Reserving High RAM Addresses \n");
-               cfg->pp_phys_buf = PHYS_OFFSET + (MEM_SIZE - RESERVE_MEM);
--              cfg->pp_virt_buf = ioremap_nocache(cfg->pp_phys_buf,YUV_MEM);
-+              cfg->pp_virt_buf = ioremap_nocache(cfg->pp_phys_buf, YUV_MEM);
- #endif
-               if ( !cfg->pp_virt_buf ) {
-@@ -90,7 +90,9 @@ static int camif_malloc(camif_cfg_t *cfg)
-               }
-               t_size = t_size * cfg->pp_num;
- #ifndef SAMSUNG_SXGA_CAM
--              cfg->pp_virt_buf = consistent_alloc(GFP_KERNEL, t_size, &cfg->pp_phys_buf);
-+              cfg->pp_virt_buf = dma_alloc_coherent(cfg->v->dev,
-+                                                    t_size, &cfg->pp_phys_buf,
-+                                                    GFP_KERNEL);
- #else
-               printk(KERN_INFO "Reserving High RAM Addresses \n");
-               cfg->pp_phys_buf = PHYS_OFFSET + (MEM_SIZE - RESERVE_MEM ) + YUV_MEM;
-@@ -112,7 +114,8 @@ static int camif_demalloc(camif_cfg_t *cfg)
- {
- #ifndef SAMSUNG_SXGA_CAM
-       if ( cfg->pp_virt_buf ) {
--              consistent_free(cfg->pp_virt_buf,cfg->pp_totalsize,cfg->pp_phys_buf);
-+              dma_free_coherent(cfg->v->dev, cfg->pp_totalsize,
-+                                cfg->pp_virt_buf, cfg->pp_phys_buf);
-               cfg->pp_virt_buf = 0;
-       }
- #else
-@@ -131,13 +134,14 @@ int camif_g_frame_num(camif_cfg_t *cfg)
-       int index = 0;
-       if (cfg->dma_type & CAMIF_CODEC ) {
--              index = FRAME_CNT(CICOSTATUS);
-+              index = FRAME_CNT(readl(camregs + S3C2440_CAM_REG_CICOSTATUS));
-               DPRINTK("CAMIF_CODEC frame %d \n", index);
-       }
-       else {
-               assert(cfg->dma_type & CAMIF_PREVIEW );
--              index = FRAME_CNT(CIPRSTATUS);
--              DPRINTK("CAMIF_PREVIEW frame %d  0x%08X \n", index, CIPRSTATUS);
-+              index = FRAME_CNT(readl(camregs + S3C2440_CAM_REG_CIPRSTATUS));
-+              DPRINTK("CAMIF_PREVIEW frame %d  0x%08X \n", index,
-+                      readl(camregs + S3C2440_CAM_REG_CIPRSTATUS));
-       }
-       cfg->now_frame_num = (index + 2) % 4; /* When 4 PingPong */
-       return index; /* meaningless */
-@@ -148,60 +152,59 @@ static int camif_pp_codec(camif_cfg_t *cfg)
-       u32 i, c_size; /* Cb,Cr size */
-       u32 one_p_size;
-       u32 daon = cfg->target_x * cfg->target_y;
--      if (cfg->fmt & CAMIF_OUT_YCBCR420) {
--              c_size = daon /4;
--      }
-+      if (cfg->fmt & CAMIF_OUT_YCBCR420)
-+              c_size = daon / 4;
-       else {
-               assert(cfg->fmt & CAMIF_OUT_YCBCR422);
--              c_size = daon /2;
-+              c_size = daon / 2;
-       }
-       switch ( cfg->pp_num ) {
--              case 1 :
--                      for ( i =0 ; i < 4; i=i+1) {
--                              cfg->img_buf[i].virt_y = cfg->pp_virt_buf;
--                              cfg->img_buf[i].phys_y = cfg->pp_phys_buf;
--                              cfg->img_buf[i].virt_cb = cfg->pp_virt_buf + daon; 
--                              cfg->img_buf[i].phys_cb = cfg->pp_phys_buf + daon;
--                              cfg->img_buf[i].virt_cr = cfg->pp_virt_buf + daon + c_size;
--                              cfg->img_buf[i].phys_cr = cfg->pp_phys_buf + daon + c_size;
--                              CICOYSA(i)  =  cfg->img_buf[i].phys_y;
--                              CICOCBSA(i) =  cfg->img_buf[i].phys_cb;
--                              CICOCRSA(i) =  cfg->img_buf[i].phys_cr;
--                      }
--                      break;
--              case 2:
-+      case 1 :
-+              for (i =0 ; i < 4; i++) {
-+                      cfg->img_buf[i].virt_y = cfg->pp_virt_buf;
-+                      cfg->img_buf[i].phys_y = cfg->pp_phys_buf;
-+                      cfg->img_buf[i].virt_cb = cfg->pp_virt_buf + daon;
-+                      cfg->img_buf[i].phys_cb = cfg->pp_phys_buf + daon;
-+                      cfg->img_buf[i].virt_cr = cfg->pp_virt_buf + daon + c_size;
-+                      cfg->img_buf[i].phys_cr = cfg->pp_phys_buf + daon + c_size;
-+                      writel(cfg->img_buf[i].phys_y, camregs + S3C2440_CAM_REG_CICOYSA(i));
-+                      writel(cfg->img_buf[i].phys_cb, camregs + S3C2440_CAM_REG_CICOCBSA(i));
-+                      writel(cfg->img_buf[i].phys_cr, camregs + S3C2440_CAM_REG_CICOCRSA(i));
-+              }
-+              break;
-+      case 2:
- #define  TRY   (( i%2 ) ? 1 :0)
--                      one_p_size = daon + 2*c_size;
--                      for (i = 0; i < 4  ; i++) {
--                              cfg->img_buf[i].virt_y = cfg->pp_virt_buf + TRY * one_p_size;
--                              cfg->img_buf[i].phys_y = cfg->pp_phys_buf + TRY * one_p_size;
--                              cfg->img_buf[i].virt_cb = cfg->pp_virt_buf + daon + TRY * one_p_size;
--                              cfg->img_buf[i].phys_cb = cfg->pp_phys_buf + daon + TRY * one_p_size;
--                              cfg->img_buf[i].virt_cr = cfg->pp_virt_buf + daon + c_size + TRY * one_p_size;
--                              cfg->img_buf[i].phys_cr = cfg->pp_phys_buf + daon + c_size + TRY * one_p_size;
--                              CICOYSA(i)  = cfg->img_buf[i].phys_y;
--                              CICOCBSA(i) = cfg->img_buf[i].phys_cb;
--                              CICOCRSA(i) = cfg->img_buf[i].phys_cr;
--                      }
--                      break;
--              case 4: 
--                      one_p_size = daon + 2*c_size;
--                      for (i = 0; i < 4 ; i++) {
--                              cfg->img_buf[i].virt_y = cfg->pp_virt_buf + i * one_p_size;
--                              cfg->img_buf[i].phys_y = cfg->pp_phys_buf + i * one_p_size;
--                              cfg->img_buf[i].virt_cb = cfg->pp_virt_buf + daon + i * one_p_size;
--                              cfg->img_buf[i].phys_cb = cfg->pp_phys_buf + daon + i * one_p_size;
--                              cfg->img_buf[i].virt_cr = cfg->pp_virt_buf + daon + c_size + i * one_p_size;
--                              cfg->img_buf[i].phys_cr = cfg->pp_phys_buf + daon + c_size + i * one_p_size;
--                              CICOYSA(i)  =  cfg->img_buf[i].phys_y;
--                              CICOCBSA(i) =  cfg->img_buf[i].phys_cb;
--                              CICOCRSA(i) =  cfg->img_buf[i].phys_cr;
--                      }
--                      break;
--              default:
--                      printk("Invalid PingPong Number %d \n",cfg->pp_num);
--                      panic("halt\n");
--      }
-+              one_p_size = daon + 2*c_size;
-+              for (i = 0; i < 4  ; i++) {
-+                      cfg->img_buf[i].virt_y = cfg->pp_virt_buf + TRY * one_p_size;
-+                      cfg->img_buf[i].phys_y = cfg->pp_phys_buf + TRY * one_p_size;
-+                      cfg->img_buf[i].virt_cb = cfg->pp_virt_buf + daon + TRY * one_p_size;
-+                      cfg->img_buf[i].phys_cb = cfg->pp_phys_buf + daon + TRY * one_p_size;
-+                      cfg->img_buf[i].virt_cr = cfg->pp_virt_buf + daon + c_size + TRY * one_p_size;
-+                      cfg->img_buf[i].phys_cr = cfg->pp_phys_buf + daon + c_size + TRY * one_p_size;
-+                      writel(cfg->img_buf[i].phys_y, camregs + S3C2440_CAM_REG_CICOYSA(i));
-+                      writel(cfg->img_buf[i].phys_cb, camregs + S3C2440_CAM_REG_CICOCBSA(i));
-+                      writel(cfg->img_buf[i].phys_cr, camregs + S3C2440_CAM_REG_CICOCRSA(i));
-+              }
-+              break;
-+      case 4:
-+              one_p_size = daon + 2*c_size;
-+              for (i = 0; i < 4 ; i++) {
-+                      cfg->img_buf[i].virt_y = cfg->pp_virt_buf + i * one_p_size;
-+                      cfg->img_buf[i].phys_y = cfg->pp_phys_buf + i * one_p_size;
-+                      cfg->img_buf[i].virt_cb = cfg->pp_virt_buf + daon + i * one_p_size;
-+                      cfg->img_buf[i].phys_cb = cfg->pp_phys_buf + daon + i * one_p_size;
-+                      cfg->img_buf[i].virt_cr = cfg->pp_virt_buf + daon + c_size + i * one_p_size;
-+                      cfg->img_buf[i].phys_cr = cfg->pp_phys_buf + daon + c_size + i * one_p_size;
-+                      writel(cfg->img_buf[i].phys_y, camregs + S3C2440_CAM_REG_CICOYSA(i));
-+                      writel(cfg->img_buf[i].phys_cb, camregs + S3C2440_CAM_REG_CICOCBSA(i));
-+                      writel(cfg->img_buf[i].phys_cr, camregs + S3C2440_CAM_REG_CICOCRSA(i));
-+              }
-+              break;
-+      default:
-+              printk("Invalid PingPong Number %d \n",cfg->pp_num);
-+              panic("halt\n");
-+}
-       return 0;
- }
-@@ -222,21 +225,21 @@ static int camif_pp_preview(camif_cfg_t *cfg)
-                       for ( i = 0; i < 4 ; i++ ) {
-                               cfg->img_buf[i].virt_rgb = cfg->pp_virt_buf ;
-                               cfg->img_buf[i].phys_rgb = cfg->pp_phys_buf ;
--                              CIPRCLRSA(i) = cfg->img_buf[i].phys_rgb;
-+                              writel(cfg->img_buf[i].phys_rgb, camregs + S3C2440_CAM_REG_CICOCRSA(i));
-                       }
-                       break;
-               case 2:
-                       for ( i = 0; i < 4 ; i++) {
-                               cfg->img_buf[i].virt_rgb = cfg->pp_virt_buf + TRY * daon;
-                               cfg->img_buf[i].phys_rgb = cfg->pp_phys_buf + TRY * daon;
--                              CIPRCLRSA(i) = cfg->img_buf[i].phys_rgb;
-+                              writel(cfg->img_buf[i].phys_rgb, camregs + S3C2440_CAM_REG_CICOCRSA(i));
-                       }
-                       break;
-               case 4:
-                       for ( i = 0; i < 4 ; i++) {
-                               cfg->img_buf[i].virt_rgb = cfg->pp_virt_buf + i * daon;
-                               cfg->img_buf[i].phys_rgb = cfg->pp_phys_buf + i * daon;
--                              CIPRCLRSA(i) = cfg->img_buf[i].phys_rgb;
-+                              writel(cfg->img_buf[i].phys_rgb, camregs + S3C2440_CAM_REG_CICOCRSA(i));
-                       }
-                       break;
-               default:
-@@ -308,7 +311,7 @@ static int camif_source_fmt(camif_gc_t *gc)
-       cmd  |= SOURCE_HSIZE(gc->source_x)| SOURCE_VSIZE(gc->source_y);
-       /* Order422 */
-       cmd |=  gc->order422;
--      CISRCFMT = cmd;
-+      writel(cmd, camregs + S3C2440_CAM_REG_CISRCFMT);
-       return 0 ;
- }
-@@ -331,33 +334,24 @@ static int camif_target_fmt(camif_cfg_t *cfg)
-                       assert(cfg->fmt & CAMIF_OUT_YCBCR422);
-                       cmd |= OUT_YCBCR422|IN_YCBCR422;
-               }
--              CICOTRGFMT = cmd | cfg->flip;
--      } 
--      else {
-+              writel(cmd | cfg->flip, camregs + S3C2440_CAM_REG_CICOTRGFMT);
-+
-+      } else {
-               assert(cfg->dma_type & CAMIF_PREVIEW);
--              CIPRTRGFMT = 
--                      TARGET_HSIZE(cfg->target_x)|TARGET_VSIZE(cfg->target_y)|cfg->flip;
-+              writel(TARGET_HSIZE(cfg->target_x)|TARGET_VSIZE(cfg->target_y)|cfg->flip,
-+                      camregs + S3C2440_CAM_REG_CIPRTRGFMT); 
-       }
-       return 0;
- }
- void camif_change_flip(camif_cfg_t *cfg)
- {
--      u32 cmd = 0;
-+      u32 cmd = readl(camregs + S3C2440_CAM_REG_CICOTRGFMT);
--      if (cfg->dma_type & CAMIF_CODEC ) {
--              /* YCBCR setting */  
--              cmd  = CICOTRGFMT;
--              cmd &= ~(BIT14|BIT15); /* Clear FLIP Mode */
--              cmd |= cfg->flip; 
--              CICOTRGFMT = cmd;
--      } 
--      else {
--              cmd  = CIPRTRGFMT;
--              cmd &= ~(BIT14|BIT15);
--              cmd |= cfg->flip;
--              CICOTRGFMT = cmd; 
--      }
-+      cmd &= ~(BIT14|BIT15);
-+      cmd |= cfg->flip;
-+
-+      writel(cmd, camregs + S3C2440_CAM_REG_CICOTRGFMT);
- }
-@@ -373,70 +367,81 @@ int camif_capture_start(camif_cfg_t *cfg)
-       u32 n_cmd = 0;          /* Next Command */
-       switch(cfg->exec) {
--              case CAMIF_BOTH_DMA_ON:
--                      camif_reset(CAMIF_RESET,0); /* Flush Camera Core Buffer */              
--                      CIPRSCCTRL |= SCALERSTART;
--                      CICOSCCTRL |= SCALERSTART;
--                      n_cmd = CAMIF_CAP_PREVIEW_ON|CAMIF_CAP_CODEC_ON;
--                      break;
--              case CAMIF_DMA_ON:
--                      camif_reset(CAMIF_RESET,0); /* Flush Camera Core Buffer */              
--                      if (cfg->dma_type&CAMIF_CODEC) {
--                              CICOSCCTRL |= SCALERSTART;
--                              n_cmd = CAMIF_CAP_CODEC_ON;
--                      }else {
--                              CIPRSCCTRL |= SCALERSTART;
--                              n_cmd = CAMIF_CAP_PREVIEW_ON;
--                      }
-+      case CAMIF_BOTH_DMA_ON:
-+              camif_reset(CAMIF_RESET, 0); /* Flush Camera Core Buffer */
-+              writel(readl(camregs + S3C2440_CAM_REG_CIPRSCCTRL) |
-+                           SCALERSTART, camregs + S3C2440_CAM_REG_CIPRSCCTRL);
-+              writel(readl(camregs + S3C2440_CAM_REG_CICOSCCTRL) |
-+                           SCALERSTART, camregs + S3C2440_CAM_REG_CICOSCCTRL);
-+              n_cmd = CAMIF_CAP_PREVIEW_ON | CAMIF_CAP_CODEC_ON;
-+              break;
-+      case CAMIF_DMA_ON:
-+              camif_reset(CAMIF_RESET, 0); /* Flush Camera Core Buffer */
-+              if (cfg->dma_type&CAMIF_CODEC) {
-+                      writel(readl(camregs + S3C2440_CAM_REG_CICOSCCTRL) |
-+                           SCALERSTART, camregs + S3C2440_CAM_REG_CICOSCCTRL);
-+                      n_cmd = CAMIF_CAP_CODEC_ON;
-+              } else {
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIPRSCCTRL) |
-+                           SCALERSTART, camregs + S3C2440_CAM_REG_CIPRSCCTRL);
-+                      n_cmd = CAMIF_CAP_PREVIEW_ON;
-+              }
--                      /* wait until Sync Time expires */
--                      /* First settting, to wait VSYNC fall  */
--                      /* By VESA spec,in 640x480 @60Hz 
--                         MAX Delay Time is around 64us which "while" has.*/ 
--                      while(VSYNC & CICOSTATUS);
--                      break;
--              default:
--                      break;
--      }
--      CIIMGCPT = n_cmd|CAMIF_CAP_ON;
-+              /* wait until Sync Time expires */
-+              /* First settting, to wait VSYNC fall  */
-+              /* By VESA spec,in 640x480 @60Hz
-+                      MAX Delay Time is around 64us which "while" has.*/
-+              while(VSYNC & readl(camregs + S3C2440_CAM_REG_CICOSTATUS));
-+              break;
-+      default:
-+              break;
-+}
-+      writel(n_cmd | CAMIF_CAP_ON, camregs + S3C2440_CAM_REG_CIIMGCPT); 
-       return 0;
- }
- int camif_capture_stop(camif_cfg_t *cfg)
- {
--      u32 n_cmd = CIIMGCPT;   /* Next Command */
-+      u32 n_cmd = readl(camregs + S3C2440_CAM_REG_CIIMGCPT);  /* Next Command */
-       switch(cfg->exec) {
--              case CAMIF_BOTH_DMA_OFF:
--                      CIPRSCCTRL &= ~SCALERSTART;
--                      CICOSCCTRL &= ~SCALERSTART;
--                      n_cmd = 0;
--                      break;
--              case CAMIF_DMA_OFF_L_IRQ: /* fall thru */
--              case CAMIF_DMA_OFF:
--                      if (cfg->dma_type&CAMIF_CODEC) {
--                              CICOSCCTRL &= ~SCALERSTART;
--                              n_cmd &= ~CAMIF_CAP_CODEC_ON;
--                              if (!(n_cmd & CAMIF_CAP_PREVIEW_ON))
--                                      n_cmd = 0;
--                      }else {
--                              CIPRSCCTRL &= ~SCALERSTART;
--                              n_cmd &= ~CAMIF_CAP_PREVIEW_ON;
--                              if (!(n_cmd & CAMIF_CAP_CODEC_ON))
--                                      n_cmd = 0;
--                      }
--                      break;
--              default:
--                      panic("Unexpected \n");
--      }
--      CIIMGCPT = n_cmd;
--      if(cfg->exec == CAMIF_DMA_OFF_L_IRQ) { /* Last IRQ  */
--              if (cfg->dma_type & CAMIF_CODEC) 
--                      CICOCTRL |= LAST_IRQ_EN;
--              else 
--                      CIPRCTRL |= LAST_IRQ_EN;
--      } 
-+      case CAMIF_BOTH_DMA_OFF:
-+              writel(readl(camregs + S3C2440_CAM_REG_CIPRSCCTRL) &
-+                      ~SCALERSTART, camregs + S3C2440_CAM_REG_CIPRSCCTRL);
-+              writel(readl(camregs + S3C2440_CAM_REG_CICOSCCTRL) &
-+                      ~SCALERSTART, camregs + S3C2440_CAM_REG_CICOSCCTRL);
-+              n_cmd = 0;
-+              break;
-+      case CAMIF_DMA_OFF_L_IRQ: /* fall thru */
-+      case CAMIF_DMA_OFF:
-+              if (cfg->dma_type&CAMIF_CODEC) {
-+                      writel(readl(camregs + S3C2440_CAM_REG_CICOSCCTRL) &
-+                          ~SCALERSTART, camregs + S3C2440_CAM_REG_CICOSCCTRL);
-+                      n_cmd &= ~CAMIF_CAP_CODEC_ON;
-+                      if (!(n_cmd & CAMIF_CAP_PREVIEW_ON))
-+                              n_cmd = 0;
-+              } else {
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIPRSCCTRL) &
-+                          ~SCALERSTART, camregs + S3C2440_CAM_REG_CIPRSCCTRL);
-+                      n_cmd &= ~CAMIF_CAP_PREVIEW_ON;
-+                      if (!(n_cmd & CAMIF_CAP_CODEC_ON))
-+                              n_cmd = 0;
-+              }
-+              break;
-+      default:
-+              panic("Unexpected \n");
-+      }
-+      writel(n_cmd, camregs + S3C2440_CAM_REG_CIIMGCPT);
-+
-+      if (cfg->exec == CAMIF_DMA_OFF_L_IRQ) { /* Last IRQ  */
-+              if (cfg->dma_type & CAMIF_CODEC)
-+                      writel(readl(camregs + S3C2440_CAM_REG_CICOCTRL) |
-+                           LAST_IRQ_EN, camregs + S3C2440_CAM_REG_CICOCTRL);
-+              else
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIPRCTRL) |
-+                           LAST_IRQ_EN, camregs + S3C2440_CAM_REG_CIPRCTRL);
-+      }
- #if 0
-       else {                          /* to make internal state machine of CAMERA stop */
-               camif_reset(CAMIF_RESET, 0);
-@@ -449,16 +454,13 @@ int camif_capture_stop(camif_cfg_t *cfg)
- /* LastIRQEn is autoclear */
- void camif_last_irq_en(camif_cfg_t *cfg)
- {
--      if(cfg->exec == CAMIF_BOTH_DMA_ON) {
--              CIPRCTRL |= LAST_IRQ_EN;
--              CICOCTRL |= LAST_IRQ_EN;
--      }
--      else {
--              if (cfg->dma_type & CAMIF_CODEC) 
--                      CICOCTRL |= LAST_IRQ_EN;
--              else 
--                      CIPRCTRL |= LAST_IRQ_EN;
--      }
-+      if ((cfg->exec == CAMIF_BOTH_DMA_ON) || (cfg->dma_type & CAMIF_CODEC))
-+              writel(readl(camregs + S3C2440_CAM_REG_CICOCTRL) |
-+                      LAST_IRQ_EN, camregs + S3C2440_CAM_REG_CICOCTRL);
-+
-+      if ((cfg->exec == CAMIF_BOTH_DMA_ON) || !(cfg->dma_type & CAMIF_CODEC))
-+              writel(readl(camregs + S3C2440_CAM_REG_CIPRCTRL) |
-+                      LAST_IRQ_EN, camregs + S3C2440_CAM_REG_CIPRCTRL);
- }
- static int  
-@@ -502,23 +504,33 @@ int camif_g_fifo_status(camif_cfg_t *cfg)
-       u32 reg;
-       if (cfg->dma_type & CAMIF_CODEC) {
--              u32 flag = CO_OVERFLOW_Y|CO_OVERFLOW_CB|CO_OVERFLOW_CR;
--              reg = CICOSTATUS;
-+              u32 flag = CO_OVERFLOW_Y | CO_OVERFLOW_CB | CO_OVERFLOW_CR;
-+              reg = readl(camregs + S3C2440_CAM_REG_CICOSTATUS);
-               if (reg & flag) {
-                       printk("CODEC: FIFO error(0x%08x) and corrected\n",reg);
-                       /* FIFO Error Count ++  */
--                      CIWDOFST |= CO_FIFO_Y|CO_FIFO_CB|CO_FIFO_CR;
--                      CIWDOFST &= ~(CO_FIFO_Y|CO_FIFO_CB|CO_FIFO_CR);
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIWDOFST) |
-+                              CO_FIFO_Y | CO_FIFO_CB | CO_FIFO_CR,
-+                              camregs + S3C2440_CAM_REG_CIWDOFST);
-+
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIWDOFST) &
-+                              ~(CO_FIFO_Y | CO_FIFO_CB | CO_FIFO_CR),
-+                              camregs + S3C2440_CAM_REG_CIWDOFST);
-                       return 1; /* Error */
-               }
-       }
-       if (cfg->dma_type & CAMIF_PREVIEW) {
--              u32 flag = PR_OVERFLOW_CB|PR_OVERFLOW_CR;
--              reg = CIPRSTATUS;
-+              u32 flag = PR_OVERFLOW_CB | PR_OVERFLOW_CR;
-+              reg = readl(camregs + S3C2440_CAM_REG_CIPRSTATUS);
-               if (reg & flag) {
-                       printk("PREVIEW:FIFO error(0x%08x) and corrected\n",reg);
--                      CIWDOFST |= PR_FIFO_CB|PR_FIFO_CR;
--                      CIWDOFST &= ~(CO_FIFO_Y|CO_FIFO_CB|CO_FIFO_CR);
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIWDOFST) |
-+                              CO_FIFO_CB | CO_FIFO_CR,
-+                              camregs + S3C2440_CAM_REG_CIWDOFST);
-+
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIWDOFST) &
-+                              ~(CO_FIFO_Y | CO_FIFO_CB | CO_FIFO_CR),
-+                              camregs + S3C2440_CAM_REG_CIWDOFST);
-                       /* FIFO Error Count ++  */
-                       return 1; /* Error */
-               }
-@@ -537,13 +549,16 @@ int camif_win_offset(camif_gc_t *gc )
-       u32 v = gc->win_ver_ofst;
-       /*Clear Overflow */
--      CIWDOFST = CO_FIFO_Y|CO_FIFO_CB|CO_FIFO_CR|PR_FIFO_CB|PR_FIFO_CB;
--      CIWDOFST = 0;           /* ? Dummy */
-+      writel(CO_FIFO_Y | CO_FIFO_CB | CO_FIFO_CR | PR_FIFO_CB | PR_FIFO_CB,
-+              camregs + S3C2440_CAM_REG_CIWDOFST);
-+      writel(0, camregs + S3C2440_CAM_REG_CIWDOFST);
-+
-       if (!h && !v)   {
--              CIWDOFST = 0;
-+              writel(0, camregs + S3C2440_CAM_REG_CIWDOFST);
-               return 0;
-       }
--      CIWDOFST = WINOFEN | WINHOROFST(h) | WINVEROFST(v);
-+
-+      writel(WINOFEN | WINHOROFST(h) | WINVEROFST(v), camregs + S3C2440_CAM_REG_CIWDOFST);
-       return 0;
- }
-@@ -554,7 +569,7 @@ int camif_win_offset(camif_gc_t *gc )
-  */
- static void camif_polarity(camif_gc_t *gc)
- {
--      u32 cmd = CIGCTRL;
-+      u32 cmd = readl(camregs + S3C2440_CAM_REG_CIGCTRL);;
-       
-       cmd = cmd & ~(BIT26|BIT25|BIT24); /* clear polarity */
-       if (gc->polarity_pclk)
-@@ -563,7 +578,8 @@ static void camif_polarity(camif_gc_t *gc)
-               cmd |= GC_INVPOLVSYNC;
-       if (gc->polarity_href)
-               cmd |= GC_INVPOLHREF;
--      CIGCTRL |= cmd;
-+      writel(readl(camregs + S3C2440_CAM_REG_CIGCTRL) |
-+             cmd, camregs + S3C2440_CAM_REG_CIGCTRL);
- }
-@@ -599,12 +615,13 @@ int camif_dynamic_close(camif_cfg_t *cfg)
- static int camif_target_area(camif_cfg_t *cfg) 
- {
-       u32 rect = cfg->target_x * cfg->target_y;
--      if (cfg->dma_type & CAMIF_CODEC ) {
--              CICOTAREA = rect;
--      }
--      if (cfg->dma_type & CAMIF_PREVIEW) {
--              CIPRTAREA = rect;
--      }
-+
-+      if (cfg->dma_type & CAMIF_CODEC)
-+              writel(rect, camregs + S3C2440_CAM_REG_CICOTAREA);
-+
-+      if (cfg->dma_type & CAMIF_PREVIEW)
-+              writel(rect, camregs + S3C2440_CAM_REG_CIPRTAREA);
-+
-       return 0;
- }
-@@ -613,40 +630,44 @@ static int inline camif_hw_reg(camif_cfg_t *cfg)
-       u32 cmd = 0;
-       if (cfg->dma_type & CAMIF_CODEC) {
--              CICOSCPRERATIO = PRE_SHIFT(cfg->sc.shfactor)
--                      |PRE_HRATIO(cfg->sc.prehratio)|PRE_VRATIO(cfg->sc.prevratio);
--              CICOSCPREDST = 
--                      PRE_DST_WIDTH(cfg->sc.predst_x)|PRE_DST_HEIGHT(cfg->sc.predst_y);
-+              writel(PRE_SHIFT(cfg->sc.shfactor) |
-+                     PRE_HRATIO(cfg->sc.prehratio) |
-+                     PRE_VRATIO(cfg->sc.prevratio),
-+                     camregs + S3C2440_CAM_REG_CICOSCPRERATIO);
-+              writel(PRE_DST_WIDTH(cfg->sc.predst_x) |
-+                     PRE_DST_HEIGHT(cfg->sc.predst_y),
-+                     camregs + S3C2440_CAM_REG_CICOSCPREDST);
-               /* Differ from Preview */
-               if (cfg->sc.scalerbypass)
-                       cmd |= SCALERBYPASS;
-               if (cfg->sc.scaleup_h & cfg->sc.scaleup_v)
-                       cmd |= BIT30|BIT29;
--              CICOSCCTRL = cmd | MAIN_HRATIO(cfg->sc.mainhratio)
--                      |MAIN_VRATIO(cfg->sc.mainvratio);
-+              writel(cmd | MAIN_HRATIO(cfg->sc.mainhratio) |
-+                     MAIN_VRATIO(cfg->sc.mainvratio),
-+                     camregs + S3C2440_CAM_REG_CICOSCCTRL);
-               return 0;
-       }
--      else if (cfg->dma_type & CAMIF_PREVIEW) {
--              CIPRSCPRERATIO = PRE_SHIFT(cfg->sc.shfactor)
--                      |PRE_HRATIO(cfg->sc.prehratio)|PRE_VRATIO(cfg->sc.prevratio);
--              CIPRSCPREDST = 
--                      PRE_DST_WIDTH(cfg->sc.predst_x)|PRE_DST_HEIGHT(cfg->sc.predst_y);
-+      if (cfg->dma_type & CAMIF_PREVIEW) {
-+              writel(PRE_SHIFT(cfg->sc.shfactor) |
-+                     PRE_HRATIO(cfg->sc.prehratio) |
-+                     PRE_VRATIO(cfg->sc.prevratio),
-+                     camregs + S3C2440_CAM_REG_CIPRSCPRERATIO);
-+              writel(PRE_DST_WIDTH(cfg->sc.predst_x) |
-+                     PRE_DST_HEIGHT(cfg->sc.predst_y),
-+                     camregs + S3C2440_CAM_REG_CIPRSCPREDST);
-               /* Differ from Codec */
--              if (cfg->fmt & CAMIF_RGB24) {
-+              if (cfg->fmt & CAMIF_RGB24)
-                       cmd |= RGB_FMT24;  
--              }
--              else {
--                      /* RGB16 */;
--              }               
-               if (cfg->sc.scaleup_h & cfg->sc.scaleup_v)
--                      cmd |= BIT29|BIT28;
--              CIPRSCCTRL = cmd |MAIN_HRATIO(cfg->sc.mainhratio)|S_METHOD
--                      |MAIN_VRATIO(cfg->sc.mainvratio);
--      }else {
--              panic("CAMERA:DMA_TYPE Wrong \n");
-+                      cmd |= BIT29 | BIT28;
-+              writel(cmd | MAIN_HRATIO(cfg->sc.mainhratio) | S_METHOD |
-+                     MAIN_VRATIO(cfg->sc.mainvratio),
-+                     camregs + S3C2440_CAM_REG_CIPRSCCTRL);
-+              return 0;
-       }
-+      panic("CAMERA:DMA_TYPE Wrong \n");
-       return 0;
- }
-@@ -654,46 +675,50 @@ static int inline camif_hw_reg(camif_cfg_t *cfg)
- /* Configure Pre-scaler control  & main scaler control register */
- static int camif_scaler(camif_cfg_t *cfg)
- {
--      int tx = cfg->target_x,ty=cfg->target_y;
-+      int tx = cfg->target_x, ty = cfg->target_y;
-       int sx, sy;
--      if (tx <= 0 || ty<= 0)  panic("CAMERA: Invalid target size \n");
-+      if (tx <= 0 || ty <= 0)
-+              panic("CAMERA: Invalid target size \n");
-+
-+      sx = cfg->gc->source_x - 2 * cfg->gc->win_hor_ofst;
-+      sy = cfg->gc->source_y - 2 * cfg->gc->win_ver_ofst;     
-+      if (sx <= 0 || sy <= 0)
-+              panic("CAMERA: Invalid source size \n");
--      sx = cfg->gc->source_x - 2*cfg->gc->win_hor_ofst;
--      sy = cfg->gc->source_y - 2*cfg->gc->win_ver_ofst;       
--      if (sx <= 0 || sy<= 0)  panic("CAMERA: Invalid source size \n");
-       cfg->sc.modified_src_x = sx;
-       cfg->sc.modified_src_y = sy;
-       /* Pre-scaler control register 1 */
--      camif_scaler_internal(sx,tx,&cfg->sc.prehratio,&cfg->sc.hfactor);
--      camif_scaler_internal(sy,ty,&cfg->sc.prevratio,&cfg->sc.vfactor);
-+      camif_scaler_internal(sx, tx, &cfg->sc.prehratio, &cfg->sc.hfactor);
-+      camif_scaler_internal(sy, ty, &cfg->sc.prevratio, &cfg->sc.vfactor);
--      if (cfg->dma_type & CAMIF_PREVIEW) {
--              if ( (sx /cfg->sc.prehratio) <= 640 ) {}
--              else {
--                      printk(KERN_INFO "CAMERA: Internal Preview line buffer is 640 pixels\n");
-+      if (cfg->dma_type & CAMIF_PREVIEW)
-+              if ((sx / cfg->sc.prehratio) > 640) {
-+                      printk(KERN_INFO "CAMERA: Internal Preview line "
-+                                       "buffer is 640 pixels\n");
-                       return 1; /* Error */
-               }
--      }
--      cfg->sc.shfactor = 10-(cfg->sc.hfactor+cfg->sc.vfactor);
-+      cfg->sc.shfactor = 10 - (cfg->sc.hfactor + cfg->sc.vfactor);
-       /* Pre-scaler control register 2 */
-       cfg->sc.predst_x = sx / cfg->sc.prehratio;
-       cfg->sc.predst_y = sy / cfg->sc.prevratio;
-       /* Main-scaler control register */
--      cfg->sc.mainhratio = (sx << 8)/(tx << cfg->sc.hfactor);
--      cfg->sc.mainvratio = (sy << 8)/(ty << cfg->sc.vfactor);
--      DPRINTK(" sx %d, sy %d tx %d ty %d  \n",sx,sy,tx,ty);
--      DPRINTK(" hfactor %d  vfactor %d \n",cfg->sc.hfactor,cfg->sc.vfactor);
-+      cfg->sc.mainhratio = (sx << 8) / (tx << cfg->sc.hfactor);
-+      cfg->sc.mainvratio = (sy << 8) / (ty << cfg->sc.vfactor);
-+      DPRINTK(" sx %d, sy %d tx %d ty %d  \n", sx, sy, tx, ty);
-+      DPRINTK(" hfactor %d  vfactor %d \n",cfg->sc.hfactor, cfg->sc.vfactor);
-       cfg->sc.scaleup_h  = (sx <= tx) ? 1: 0;
-       cfg->sc.scaleup_v  = (sy <= ty) ? 1: 0;
--      if ( cfg->sc.scaleup_h != cfg->sc.scaleup_v) 
-+      if (cfg->sc.scaleup_h != cfg->sc.scaleup_v)
-               printk(KERN_ERR "scaleup_h must be same to scaleup_v \n");
-+
-       camif_hw_reg(cfg);
-       camif_target_area(cfg);
-+
-       return 0;
- }
-@@ -706,38 +731,38 @@ static void camif_g_bsize(u32 hsize, u32 *mburst, u32 *rburst)
- {
-       u32 tmp;
--      tmp = (hsize/4) % 16;
-+      tmp = (hsize / 4) % 16;
-       switch(tmp) {
-+      case 0:
-+              *mburst=16;
-+              *rburst=16;
-+              break;
-+      case 4:
-+              *mburst=16;
-+              *rburst=4;
-+              break;
-+      case 8:
-+              *mburst=16;
-+              *rburst=8;
-+              break;
-+      default:
-+              tmp=(hsize / 4) % 8;
-+              switch(tmp) {
-               case 0:
--                      *mburst=16;
--                      *rburst=16;
-+                      *mburst = 8;
-+                      *rburst = 8;
-                       break;
-               case 4:
--                      *mburst=16;
--                      *rburst=4;
--                      break;
--              case 8:
--                      *mburst=16;
--                      *rburst=8;
--                      break;
-+                      *mburst = 8;
-+                      *rburst = 4;
-               default:
--                      tmp=(hsize/4)%8;
--                      switch(tmp) {
--                              case 0:
--                                      *mburst=8;
--                                      *rburst=8;
--                                      break;
--                              case 4:
--                                      *mburst=8;
--                                      *rburst=4;
--                              default:
--                                      *mburst=4;
--                                      tmp=(hsize/4)%4;
--                                      *rburst= (tmp) ? tmp: 4;
--                                      break;
--                      }
-+                      *mburst = 4;
-+                      tmp = (hsize / 4) % 4;
-+                      *rburst= (tmp) ? tmp: 4;
-                       break;
-       }
-+              break;
-+      }
- }
- /* SXGA 1028x1024*/
-@@ -759,24 +784,30 @@ static int camif_dma_burst(camif_cfg_t *cfg)
-               u32 yburst_m, yburst_r;
-               u32 cburst_m, cburst_r;
-               /* CODEC DMA WIDHT is multiple of 16 */
--              if (width %16 != 0 )  return BURST_ERR;   /* DMA Burst Length Error */
--              camif_g_bsize(width,&yburst_m,&yburst_r);
--              camif_g_bsize(width/2,&cburst_m,&cburst_r);
--              CICOCTRL =YBURST_M(yburst_m)|CBURST_M(cburst_m)
--                      |YBURST_R(yburst_r)|CBURST_R(cburst_r);
-+              if (width % 16)
-+                      return BURST_ERR;   /* DMA Burst Length Error */
-+              camif_g_bsize(width, &yburst_m, &yburst_r);
-+              camif_g_bsize(width / 2, &cburst_m, &cburst_r);
-+
-+              writel(YBURST_M(yburst_m) | CBURST_M(cburst_m) |
-+                     YBURST_R(yburst_r) | CBURST_R(cburst_r),
-+                     camregs + S3C2440_CAM_REG_CICOCTRL);
-       }
-       if (cfg->dma_type & CAMIF_PREVIEW) {
-               u32 rgburst_m, rgburst_r;
-               if(cfg->fmt == CAMIF_RGB24) {
--                      if (width %2 != 0 )  return BURST_ERR;   /* DMA Burst Length Error */
-+                      if (width % 2)
-+                              return BURST_ERR;   /* DMA Burst Length Error */
-                       camif_g_bsize(width*4,&rgburst_m,&rgburst_r);
--              }
--              else {          /* CAMIF_RGB16 */
--                      if ((width/2) %2 != 0 )  return BURST_ERR; /* DMA Burst Length Error */
-+              } else {                /* CAMIF_RGB16 */
-+                      if ((width / 2) %2)
-+                              return BURST_ERR; /* DMA Burst Length Error */
-                       camif_g_bsize(width*2,&rgburst_m,&rgburst_r);  
-               }
--                      CIPRCTRL = RGBURST_M(rgburst_m) | RGBURST_R(rgburst_r);
-+
-+              writel(RGBURST_M(rgburst_m) | RGBURST_R(rgburst_r),
-+                     camregs + S3C2440_CAM_REG_CIPRCTRL);
-       }
-       return 0;
- }
-@@ -786,19 +817,20 @@ static int camif_gpio_init(void)
- #ifdef CONFIG_ARCH_S3C24A0A
-       /* S3C24A0A has the dedicated signal pins for Camera */
- #else
--      set_gpio_ctrl(GPIO_CAMDATA0);
--      set_gpio_ctrl(GPIO_CAMDATA1);
--      set_gpio_ctrl(GPIO_CAMDATA2);
--      set_gpio_ctrl(GPIO_CAMDATA3);
--      set_gpio_ctrl(GPIO_CAMDATA4);
--      set_gpio_ctrl(GPIO_CAMDATA5);
--      set_gpio_ctrl(GPIO_CAMDATA6);
--      set_gpio_ctrl(GPIO_CAMDATA7);
--      set_gpio_ctrl(GPIO_CAMPCLKIN);
--      set_gpio_ctrl(GPIO_CAMVSYNC);
--      set_gpio_ctrl(GPIO_CAMHREF);
--      set_gpio_ctrl(GPIO_CAMPCLKOUT);
--      set_gpio_ctrl(GPIO_CAMRESET);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ0, S3C2440_GPJ0_CAMDATA0);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ1, S3C2440_GPJ1_CAMDATA1);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ2, S3C2440_GPJ2_CAMDATA2);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ3, S3C2440_GPJ3_CAMDATA3);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ4, S3C2440_GPJ4_CAMDATA4);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ5, S3C2440_GPJ5_CAMDATA5);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ6, S3C2440_GPJ6_CAMDATA6);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ7, S3C2440_GPJ7_CAMDATA7);
-+
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ8, S3C2440_GPJ8_CAMPCLK);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ9, S3C2440_GPJ9_CAMVSYNC);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ10, S3C2440_GPJ10_CAMHREF);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ11, S3C2440_GPJ11_CAMCLKOUT);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ12, S3C2440_GPJ12_CAMRESET);
- #endif
-         return 0;
- }
-@@ -827,21 +859,33 @@ int camif_clock_init(camif_gc_t *gc)
-       camclk_div = (upll+ROUND_ADD) / camclk - 1;
-       CLKDIVN = (CLKDIVN & 0xFF) | CLKDIVN_CAM(camclk_div);
-       printk(KERN_INFO"CAMERA:upll %d MACRO 0x%08X CLKDIVN 0x%08X \n",
--                              upll, CLKDIVN_CAM(camclk_div),CLKDIVN);
--      CIIMGCPT = 0;           /* Dummy ? */
-+                              upll, CLKDIVN_CAM(camclk_div), CLKDIVN);
-+      writel(0, camregs + S3C2440_CAM_REG_CIIMGCPT);  /* Dummy ? */
-+
-       return 0;
- }
- #else
- int camif_clock_init(camif_gc_t *gc)
- {
--      unsigned int upll, camclk_div, camclk;
--      if (!gc) camclk = 24000000;
--      else  {
-+      unsigned int camclk;
-+      struct clk *clk_camif = clk_get(NULL, "camif");
-+      struct clk *clk_camif_upll = clk_get(NULL, "camif-upll");
-+
-+      if (!gc)
-+              camclk = 24000000;
-+      else {
-               camclk = gc->camclk;
-               if (camclk > 48000000)
-                       printk(KERN_ERR "Wrong Camera Clock\n");
-       }
-+      clk_set_rate(clk_camif, camclk);
-+
-+      clk_enable(clk_camif);
-+      clk_enable(clk_camif_upll);
-+      
-+
-+#if 0
-       CLKCON |= CLKCON_CAMIF;
-       upll = elfin_get_bus_clk(GET_UPLL);
-       printk(KERN_INFO "CAMERA:Default UPLL %08d and Assing 96Mhz to UPLL\n",upll);   
-@@ -854,7 +898,9 @@ int camif_clock_init(camif_gc_t *gc)
-       camclk_div = (upll+ROUND_ADD) /(camclk * 2) -1;
-       CAMDIVN = CAMCLK_SET_DIV|(camclk_div&0xf);
-       printk(KERN_INFO "CAMERA:upll %08d  cam_clk %08d CAMDIVN 0x%08x \n",upll,camclk, CAMDIVN);
--      CIIMGCPT = 0;           /* Dummy ? */
-+#endif
-+      writel(0, camregs + S3C2440_CAM_REG_CIIMGCPT);  /* Dummy ? */
-+
-       return 0;
- }
- #endif
-@@ -867,23 +913,39 @@ void camif_reset(int is, int delay)
- {
-       switch (is) {
-               case CAMIF_RESET:
--                      CIGCTRL |= GC_SWRST;
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIGCTRL) |
-+                             GC_SWRST,
-+                             camregs + S3C2440_CAM_REG_CIGCTRL);
-                       mdelay(1);
--                      CIGCTRL &= ~GC_SWRST;
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIGCTRL) &
-+                             ~GC_SWRST,
-+                             camregs + S3C2440_CAM_REG_CIGCTRL);
-                       break;
-               case CAMIF_EX_RESET_AH: /*Active High */
--                      CIGCTRL &= ~GC_CAMRST; 
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIGCTRL) &
-+                             ~GC_CAMRST,
-+                             camregs + S3C2440_CAM_REG_CIGCTRL);
-                       udelay(200);
--                      CIGCTRL |= GC_CAMRST;
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIGCTRL) |
-+                             GC_CAMRST,
-+                             camregs + S3C2440_CAM_REG_CIGCTRL);
-                       udelay(delay);
--                      CIGCTRL &= ~GC_CAMRST;
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIGCTRL) &
-+                             ~GC_CAMRST,
-+                             camregs + S3C2440_CAM_REG_CIGCTRL);
-                       break;
-               case CAMIF_EX_RESET_AL: /*Active Low */
--                      CIGCTRL |=  GC_CAMRST;
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIGCTRL) |
-+                             GC_CAMRST,
-+                             camregs + S3C2440_CAM_REG_CIGCTRL);
-                       udelay(200);
--                      CIGCTRL &= ~GC_CAMRST;
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIGCTRL) &
-+                             ~GC_CAMRST,
-+                             camregs + S3C2440_CAM_REG_CIGCTRL);
-                       udelay(delay);
--                      CIGCTRL |= GC_CAMRST;
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIGCTRL) |
-+                             GC_CAMRST,
-+                             camregs + S3C2440_CAM_REG_CIGCTRL);
-                       break;
-               default:
-                       break;
-@@ -908,10 +970,10 @@ static void camif_bus_priority(int flag)
-               PRIORITY1 = PRIORITY_I_FIX;
- #else
--              old_priority = PRIORITY;        
--              PRIORITY &= ~(3<<7);
--              PRIORITY |=  (1<<7); /* Arbiter 1, REQ2 first */
--              PRIORITY &= ~(1<<1); /* Disable Priority Rotate */
-+              old_priority = readl(S3C2410_PRIORITY);
-+              writel(readl(S3C2410_PRIORITY) & ~(3<<7), S3C2410_PRIORITY);
-+              writel(readl(S3C2410_PRIORITY) |  (1<<7), S3C2410_PRIORITY); /* Arbiter 1, REQ2 first */
-+              writel(readl(S3C2410_PRIORITY) & ~(1<<1), S3C2410_PRIORITY); /* Disable Priority Rotate */
- #endif
-       } 
-       else {
-@@ -919,19 +981,26 @@ static void camif_bus_priority(int flag)
-               PRIORITY0 = old_priority;
-               PRIORITY1 = old_priority;
- #else
--              PRIORITY = old_priority;
-+              writel(old_priority, S3C2410_PRIORITY);
- #endif
-       }
- }
- static void inline camif_clock_off(void)
- {
--      CIIMGCPT = 0;
- #if defined (CONFIG_ARCH_S3C24A0A)
-+      writel(0, camregs + S3C2440_CAM_REG_CIIMGCPT);
-+
-       CLKCON &= ~CLKCON_CAM_UPLL;
-       CLKCON &= ~CLKCON_CAM_HCLK;
- #else
--      CLKCON &= ~CLKCON_CAMIF;
-+      struct clk *clk_camif = clk_get(NULL, "camif");
-+      struct clk *clk_camif_upll = clk_get(NULL, "camif-upll");
-+
-+      writel(0, camregs + S3C2440_CAM_REG_CIIMGCPT);
-+
-+      clk_disable(clk_camif);
-+      clk_disable(clk_camif_upll);
- #endif
- }
-diff --git a/arch/arm/mach-s3c2440/camera/camif_fsm.c b/arch/arm/mach-s3c2440/camera/camif_fsm.c
-index 3e2b71a..b534aca 100644
---- a/arch/arm/mach-s3c2440/camera/camif_fsm.c
-+++ b/arch/arm/mach-s3c2440/camera/camif_fsm.c
-@@ -31,7 +31,12 @@
- #include <asm/semaphore.h>
- #include <linux/miscdevice.h>
-+#define CONFIG_VIDEO_V4L1_COMPAT
-+#include <linux/videodev.h>
-+#include "camif.h"
-+
- //#define SW_DEBUG 
-+static void camif_start_p_with_c(camif_cfg_t *cfg);
- #include "camif.h"
- const char *fsm_version =
-diff --git a/arch/arm/mach-s3c2440/camera/imgsensor.c b/arch/arm/mach-s3c2440/camera/imgsensor.c
-index 44b7bee..2099b69 100644
---- a/arch/arm/mach-s3c2440/camera/imgsensor.c
-+++ b/arch/arm/mach-s3c2440/camera/imgsensor.c
-@@ -11,7 +11,7 @@
-  *  Driver for FIMC20 Camera Decoder 
-  */
--#include <linux/config.h>
-+
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/init.h>
-@@ -24,10 +24,12 @@
- #ifdef CONFIG_ARCH_S3C24A0A
- #else
--#include <asm/arch/S3C2440.h>
-+//#include <asm/arch/S3C2440.h>
- #endif
- #define SW_DEBUG
-+#define CONFIG_VIDEO_V4L1_COMPAT
-+#include <linux/videodev.h>
- #include "camif.h"
- #include "sensor.h"
-@@ -37,10 +39,6 @@
- #include "sxga.h"
- #endif
--static const char *sensor_version =
--        "$Id: imgsensor.c,v 1.11 2004/06/10 12:45:40 swlee Exp $";
--
--
- static struct i2c_driver s5x532_driver;
- static camif_gc_t data = {
-       itu_fmt:      CAMIF_ITU601,
-@@ -69,22 +67,18 @@ static camif_gc_t data = {
- #define CAM_ID 0x5a
--static unsigned short ignore[] = { I2C_CLIENT_END };
-+static unsigned short ignore = I2C_CLIENT_END;
- static unsigned short normal_addr[] = { (CAM_ID>>1), I2C_CLIENT_END };
- static struct i2c_client_address_data addr_data = {
-       normal_i2c:             normal_addr,
--      normal_i2c_range:       ignore,
--      probe:                  ignore,
--      probe_range:            ignore,
--      ignore:                 ignore,
--      ignore_range:           ignore,
--      force:                  ignore,
-+      probe:                  &ignore,
-+      ignore:                 &ignore,
- };
- s5x532_t s5x532_regs_mirror[S5X532_REGS];
- unsigned char 
--s5x532_read(struct i2c_client *client,unsigned char subaddr)
-+s5x532_read(struct i2c_client *client, unsigned char subaddr)
- {
-       int ret;
-       unsigned char buf[1];
-@@ -151,7 +145,7 @@ void inline s5x532_init(struct i2c_client *sam_client)
- }
- static int
--s5x532_attach(struct i2c_adapter *adap, int addr, unsigned short flags,int kind)
-+s5x532_attach(struct i2c_adapter *adap, int addr, int kind)
- {
-       struct i2c_client *c;
-@@ -159,13 +153,13 @@ s5x532_attach(struct i2c_adapter *adap, int addr, unsigned short flags,int kind)
-       if (!c) return -ENOMEM;
-       strcpy(c->name, "S5X532");
--      c->id           = s5x532_driver.id;
--      c->flags        = I2C_CLIENT_ALLOW_USE;
-+//    c->id           = s5x532_driver.id;
-+      c->flags        = 0 /* I2C_CLIENT_ALLOW_USE */;
-       c->addr         = addr;
-       c->adapter      = adap;
-       c->driver       = &s5x532_driver;
--      c->data         = &data;
--      data.sensor     = c; 
-+      data.sensor     = c;
-+      i2c_set_clientdata(c, &data);
-       camif_register_decoder(c);
-       return i2c_attach_client(c);
-@@ -192,10 +186,10 @@ s5x532_command(struct i2c_client *client, unsigned int cmd, void *arg)
-                printk(KERN_INFO "CAMERA: S5X532 Sensor initialized\n");
-                break;
-       case USER_ADD:
--              MOD_INC_USE_COUNT;
-+              /* MOD_INC_USE_COUNT; uh.. 2.6 deals with this, old-timer */
-               break;
-       case USER_EXIT:
--              MOD_DEC_USE_COUNT;
-+              /* MOD_DEC_USE_COUNT; */
-               break;
- /* Todo
-       case SENSOR_BRIGHTNESS:
-@@ -210,9 +204,8 @@ s5x532_command(struct i2c_client *client, unsigned int cmd, void *arg)
- }
- static struct i2c_driver s5x532_driver = {
--      name:           "S5X532",
--      id:             I2C_ALGO_S3C,
--      flags:          I2C_DF_NOTIFY,
-+      driver:         { name:         "S5X532" },
-+      id:             0, /* optional in i2c-id.h I2C_ALGO_S3C, */
-       attach_adapter: s5x532_probe,
-       detach_client:  s5x532_detach,
-       command:        s5x532_command
-@@ -220,11 +213,13 @@ static struct i2c_driver s5x532_driver = {
- static void iic_gpio_port(void) 
- {
-+/*    FIXME: no gpio config for i2c !!!
- #ifdef CONFIG_ARCH_S3C24A0A
- #else
-       GPECON &=  ~(0xf <<28);
-       GPECON |=    0xa <<28;
- #endif
-+*/
- }
- static __init int camif_sensor_init(void)
-diff --git a/arch/arm/mach-s3c2440/camera/qt-driver.c b/arch/arm/mach-s3c2440/camera/qt-driver.c
-index 0c5dd40..cbf8565 100644
---- a/arch/arm/mach-s3c2440/camera/qt-driver.c
-+++ b/arch/arm/mach-s3c2440/camera/qt-driver.c
-@@ -31,12 +31,15 @@
-                                                                                                            
- //#define SW_DEBUG
-                                                                                                            
-+#define CONFIG_VIDEO_V4L1_COMPAT
-+#include <linux/videodev.h>
- #include "camif.h"
--#include "videodev.h"
- #include "miscdevice.h"
- #include "cam_reg.h"
- #include "sensor.h"
- #include "userapp.h"
-+
-+extern camif_cfg_t * get_camif(int nr);
-                                                                                                            
- /************************* Sharp Zarus API **************************
-diff --git a/arch/arm/mach-s3c2440/camera/video-driver.c b/arch/arm/mach-s3c2440/camera/video-driver.c
-index fe9130c..9c77475 100644
---- a/arch/arm/mach-s3c2440/camera/video-driver.c
-+++ b/arch/arm/mach-s3c2440/camera/video-driver.c
-@@ -29,11 +29,12 @@
- #include <asm/irq.h>
- #include <asm/semaphore.h>
- #include <linux/miscdevice.h>
-+#include <asm/arch/irqs.h>
- //#define SW_DEBUG 
--
-+#define CONFIG_VIDEO_V4L1_COMPAT
-+#include <linux/videodev.h>
- #include "camif.h"
--#include "videodev.h"
- #include "miscdevice.h"
- #include "cam_reg.h"
- #include "sensor.h"
-@@ -46,12 +47,14 @@
- /* Codec and Preview */
- #define CAMIF_NUM  2
- static camif_cfg_t  fimc[CAMIF_NUM];
-+u32 *camregs;
- static const char *driver_version = 
-       "$Id: video-driver.c,v 1.9 2004/06/02 03:10:36 swlee Exp $";
- extern const char *fimc_version;
- extern const char *fsm_version;
-+extern void camif_start_c_with_p (camif_cfg_t *cfg, camif_cfg_t *other);
- camif_cfg_t * get_camif(int nr)
- {
-@@ -177,28 +180,34 @@ camif_c_read(struct file *file, char *buf, size_t count, loff_t *pos)
- }
--static void camif_c_irq(int irq, void *dev_id, struct pt_regs *regs)
-+static irqreturn_t camif_c_irq(int irq, void *dev_id)
- {
-         camif_cfg_t *cfg = (camif_cfg_t *)dev_id;
-+
-       DPRINTK("\n");
-       camif_g_fifo_status(cfg);
-       camif_g_frame_num(cfg);
--      if(camif_enter_c_4fsm(cfg) == INSTANT_SKIP) return;
--      wake_up_interruptible(&cfg->waitq);
-+      if(camif_enter_c_4fsm(cfg) != INSTANT_SKIP)
-+              wake_up_interruptible(&cfg->waitq);
-+
-+      return IRQ_HANDLED;
- }
--static void camif_p_irq(int irq, void *dev_id, struct pt_regs * regs)
-+static irqreturn_t camif_p_irq(int irq, void *dev_id)
- {
-         camif_cfg_t *cfg = (camif_cfg_t *)dev_id;
-+
-       DPRINTK("\n");
-       camif_g_fifo_status(cfg);
-       camif_g_frame_num(cfg);
--      if(camif_enter_p_4fsm(cfg) == INSTANT_SKIP) return;
--      wake_up_interruptible(&cfg->waitq);
-+      if(camif_enter_p_4fsm(cfg) != INSTANT_SKIP)
-+              wake_up_interruptible(&cfg->waitq);
- #if 0
-       if( (cfg->perf.frames % 5) == 0)
-               DPRINTK("5\n");
- #endif
-+
-+      return IRQ_HANDLED;
- }
- static void camif_release_irq(camif_cfg_t *cfg)
-@@ -213,13 +222,13 @@ static int camif_irq_request(camif_cfg_t *cfg)
-       if (cfg->dma_type & CAMIF_CODEC) {
-               if ((ret = request_irq(cfg->irq, camif_c_irq, 
--                             SA_INTERRUPT,cfg->shortname, cfg))) {
-+                             0, cfg->shortname, cfg))) {
-                       printk("request_irq(CAM_C) failed.\n");
-               }
-       }
-       if (cfg->dma_type & CAMIF_PREVIEW) {
-               if ((ret = request_irq(cfg->irq, camif_p_irq,
--                             SA_INTERRUPT,cfg->shortname, cfg))) {
-+                             0, cfg->shortname, cfg))) {
-                       printk("request_irq(CAM_P) failed.\n");
-               }
-       }
-@@ -438,7 +447,7 @@ static struct video_device codec_template =
- {
-       .name     = "CODEC_IF",
-       .type     = VID_TYPE_CAPTURE|VID_TYPE_CLIPPING|VID_TYPE_SCALES,
--      .hardware = VID_HARDWARE_SAMSUNG_FIMC20,
-+/*    .hardware = VID_HARDWARE_SAMSUNG_FIMC20, */
-       .fops     = &camif_c_fops,
- //    .release  = camif_release
-       .minor    = -1,
-@@ -448,7 +457,7 @@ static struct video_device preview_template =
- {
-       .name     = "PREVIEW_IF",
-       .type     = VID_TYPE_CAPTURE|VID_TYPE_CLIPPING|VID_TYPE_SCALES,
--      .hardware = VID_HARDWARE_SAMSUNG_FIMC20,
-+/*    .hardware = VID_HARDWARE_SAMSUNG_FIMC20, */
-       .fops     = &camif_p_fops,
-       .minor    = -1,
- };
-@@ -465,8 +474,8 @@ static int preview_init(camif_cfg_t *cfg)
-       cfg->fmt      = CAMIF_RGB16;
-       cfg->flip     = CAMIF_FLIP_Y;
-       cfg->v        = &preview_template;
--      init_MUTEX(&cfg->v->lock);
--      cfg->irq       = IRQ_CAM_P;
-+      mutex_init(&cfg->v->lock);
-+      cfg->irq       = IRQ_S3C2440_CAM_P;
-       
-       strcpy(cfg->shortname,name);
-         init_waitqueue_head(&cfg->waitq);
-@@ -486,8 +495,8 @@ static int codec_init(camif_cfg_t *cfg)
-       cfg->fmt      = CAMIF_IN_YCBCR422|CAMIF_OUT_YCBCR420;
-       cfg->flip     = CAMIF_FLIP_X;
-       cfg->v         = &codec_template;
--      init_MUTEX(&cfg->v->lock);
--      cfg->irq       = IRQ_CAM_C;
-+      mutex_init(&cfg->v->lock);
-+      cfg->irq       = IRQ_S3C2440_CAM_C;
-       strcpy(cfg->shortname,name);
-       init_waitqueue_head(&cfg->waitq);
-       cfg->status = CAMIF_STOPPED;
-@@ -510,25 +519,44 @@ static void print_version(void)
- static int camif_m_in(void)
- {
--      int ret = 0;
-+      int ret = -EINVAL;
-       camif_cfg_t * cfg;
-+      printk(KERN_INFO"Starting S3C2440 Camera Driver\n");
-+
-+      camregs = ioremap(CAM_BASE_ADD, 0x100);
-+      if (!camregs) {
-+              printk(KERN_ERR"Unable to map camera regs\n");
-+              ret = -ENOMEM;
-+              goto bail1;
-+      }
-+
-       camif_init();           
-       cfg = get_camif(CODEC_MINOR);
-       codec_init(cfg);
--      if (video_register_device(cfg->v,0,CODEC_MINOR)!=0) {
--                      DPRINTK("Couldn't register codec driver.\n");
--                      return 0;
-+      ret = video_register_device(cfg->v,0,CODEC_MINOR);
-+      if (ret) {
-+                      printk(KERN_ERR"Couldn't register codec driver.\n");
-+                      goto bail2;
-       }
-       cfg = get_camif(PREVIEW_MINOR);
-       preview_init(cfg);
--      if (video_register_device(cfg->v,0,PREVIEW_MINOR)!=0) {
--                      DPRINTK("Couldn't register preview driver.\n");
--                      return 0;
-+      ret = video_register_device(cfg->v,0,PREVIEW_MINOR);
-+      if (ret) {
-+                      printk(KERN_ERR"Couldn't register preview driver.\n");
-+                      goto bail3; /* hm seems it us unregistered the once */
-       }
-       
-       print_version();
-+      return 0;
-+
-+bail3:
-+      video_unregister_device(cfg->v);
-+bail2:
-+      iounmap(camregs);
-+      camregs = NULL;
-+bail1:
-       return ret;
- }
-@@ -536,7 +564,9 @@ static void unconfig_device(camif_cfg_t *cfg)
- {
-       video_unregister_device(cfg->v);
-       camif_hw_close(cfg);
-+      iounmap(camregs);
-       //memset(cfg, 0, sizeof(camif_cfg_t));
-+      camregs = NULL;
- }
- static void camif_m_out(void) /* module out */
-@@ -547,20 +577,22 @@ static void camif_m_out(void)    /* module out */
-       unconfig_device(cfg);
-       cfg = get_camif(PREVIEW_MINOR);
-       unconfig_device(cfg);
-+
-       return;
- }
- void camif_register_decoder(struct i2c_client *ptr)
- {
-       camif_cfg_t *cfg;
-+      void * data = i2c_get_clientdata(ptr);
-       cfg =get_camif(CODEC_MINOR);
--      cfg->gc = (camif_gc_t *)(ptr->data);
-+      cfg->gc = (camif_gc_t *)(data);
-       cfg =get_camif(PREVIEW_MINOR);
--      cfg->gc = (camif_gc_t *)(ptr->data);
-+      cfg->gc = (camif_gc_t *)(data);
--      sema_init(&cfg->gc->lock,1); /* global lock for both Codec and Preview */
-+      sema_init(&cfg->gc->lock, 1); /* global lock for both Codec and Preview */
-       cfg->gc->status |= PNOTWORKING; /* Default Value */
-       camif_hw_open(cfg->gc);
- }
-@@ -568,8 +600,9 @@ void camif_register_decoder(struct i2c_client *ptr)
- void camif_unregister_decoder(struct i2c_client *ptr)
- {
-       camif_gc_t *gc;
-+      void * data = i2c_get_clientdata(ptr);
-               
--      gc = (camif_gc_t *)(ptr->data); 
-+      gc = (camif_gc_t *)(data);
-       gc->init_sensor = 0; /* need to modify */
- }
-diff --git a/arch/arm/mach-s3c2440/camera/videodev.c b/arch/arm/mach-s3c2440/camera/videodev.c
-index 0b3498f..6f862e4 100644
---- a/arch/arm/mach-s3c2440/camera/videodev.c
-+++ b/arch/arm/mach-s3c2440/camera/videodev.c
-@@ -22,7 +22,7 @@
- #include <linux/init.h>
- #include <linux/kmod.h>
- #include <linux/slab.h>
--#include <linux/devfs_fs_kernel.h>
-+/* #include <linux/devfs_fs_kernel.h> */
- #include <linux/miscdevice.h>
- #include <asm/uaccess.h>
- #include <asm/system.h>
-@@ -30,8 +30,9 @@
-+#define CONFIG_VIDEO_V4L1_COMPAT
-+#include <linux/videodev.h>
- #include "camif.h"
--#include "videodev.h"
- #include "miscdevice.h"
-@@ -42,18 +43,7 @@ const char *fimc_version = "$Id: videodev.c,v 1.1.1.1 2004/04/27 03:52:50 swlee
- #define VIDEO_NAME              "video4linux"
--static inline unsigned iminor(struct inode *inode)
--{
--        return MINOR(inode->i_rdev);
--}
--
--static inline unsigned imajor(struct inode *inode)
--{
--        return MAJOR(inode->i_rdev);
--}
--
--
--#define VIDEO_NUM_DEVICES     2 
-+#define VIDEO_NUM_DEVICES     2
- static struct video_device *video_device[VIDEO_NUM_DEVICES];
- static inline struct video_device * get_vd(int nr)
-@@ -104,7 +94,7 @@ static int video_open(struct inode *inode, struct file *file)
-       int minor = MINOR(inode->i_rdev);
-       int err = 0;
-       struct video_device *vfl;
--      struct file_operations *old_fops;
-+      struct file_operations const *old_fops;
-       
-       down(&videodev_lock);
-@@ -131,13 +121,13 @@ extern int video_exclusive_open(struct inode *inode, struct file *file)
-       struct  video_device *vfl = get_vd(MINOR(inode->i_rdev));
-       int retval = 0;
--      down(&vfl->lock);
-+      mutex_lock(&vfl->lock);
-       if (vfl->users) {
-               retval = -EBUSY;
-       } else {
-               vfl->users++;
-       }
--      up(&vfl->lock);
-+      mutex_unlock(&vfl->lock);
-       return retval;
- }
-diff --git a/arch/arm/mach-s3c2440/camera/videodev.h b/arch/arm/mach-s3c2440/camera/videodev.h
-index f12db43..1c2e35a 100644
---- a/arch/arm/mach-s3c2440/camera/videodev.h
-+++ b/arch/arm/mach-s3c2440/camera/videodev.h
-@@ -1,11 +1,11 @@
--#ifndef __LINUX_S3C_VIDEODEV_H
--#define __LINUX_S3C_VIDEODEV_H
-+//#ifndef __LINUX_S3C_VIDEODEV_H
-+//#define __LINUX_S3C_VIDEODEV_H
- #include <linux/types.h>
- #include <linux/version.h>
--#include "videodev2.h"
--
-+#include <media/v4l2-dev.h>
-+#if 0
- struct video_device
- {
-       /* device info */
-@@ -96,12 +96,10 @@ extern int video_usercopy(struct inode *inode, struct file *file,
--#define VID_HARDWARE_SAMSUNG_FIMC  255    
--
--
--
--#endif 
-+#endif
-+//#endif 
-+#define VID_HARDWARE_SAMSUNG_FIMC  255
- /*
-  * Local variables:
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1170-introduce-charging-led-behaviour.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1170-introduce-charging-led-behaviour.patch.patch
deleted file mode 100644 (file)
index c2833bd..0000000
+++ /dev/null
@@ -1,423 +0,0 @@
-From bf74b8891e80dfceb72002f12c7d3c9978631dc0 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:37:47 +0100
-Subject: [PATCH] introduce-charging-led-behaviour.patch
-
-Creates a new behaviour requested by Will that the red LED on GTA02
-is lit during battery charging.and goes out when the battery is full.
-
-This is done by leveraging the PMU interrupts, but in one scenario
-there is no interrupt that occurs, when the battery is replaced after
-being removed with the USB power in all the while.  So a sleepy work
-function is started under those circumstances to watch for battery
-reinsertion or USB cable pull.
-
-100mA limit was not being observed under some conditions so this was
-fixed and tested with a USB cable with D+/D- disconnected.  1A
-charger behaviour was also tested.
-
-Showing the charging action exposes some inconsistency in pcf50633
-charging action.  If your battery is nearly full, it will keep
-charging it at decreasing current even after it thinks it is at
-100% capacity for a long while.  But if you pull that same battery
-and re-insert it, the charger state machine in pcf50633 believe it is
-full and won't charge it.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |    8 ++
- drivers/i2c/chips/pcf50633.c       |  212 ++++++++++++++++++++++++++++++++++--
- include/linux/pcf506xx.h           |    2 +
- 3 files changed, 214 insertions(+), 8 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 601f7bc..d7882ea 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -437,6 +437,14 @@ static int pmu_callback(struct device *dev, unsigned int feature,
-               case PMU_EVT_USB_REMOVE:
-                       pcf50633_charge_enable(pcf50633_global, 0);
-                       break;
-+              case PMU_EVT_CHARGER_IDLE:
-+                      /* printk(KERN_ERR"PMU_EVT_CHARGER_IDLE\n"); */
-+                      neo1973_gpb_setpin(GTA02_GPIO_AUX_LED, 0);
-+                      break;
-+              case PMU_EVT_CHARGER_ACTIVE:
-+                      /* printk(KERN_ERR"PMU_EVT_CHARGER_ACTIVE\n"); */
-+                      neo1973_gpb_setpin(GTA02_GPIO_AUX_LED, 1);
-+                      break;
-               default:
-                       break;
-               }
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 2878baa..2ed6dc0 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -47,6 +47,7 @@
- #include <linux/platform_device.h>
- #include <linux/pcf50633.h>
- #include <linux/apm-emulation.h>
-+#include <linux/jiffies.h>
- #include <asm/mach-types.h>
- #include <asm/arch/gta02.h>
-@@ -121,8 +122,23 @@ struct pcf50633_data {
-       int onkey_seconds;
-       int irq;
-       int have_been_suspended;
-+      int usb_removal_count;
-       unsigned char pcfirq_resume[5];
-+      /* if he pulls battery while charging, we notice that and correctly
-+       * report that the charger is idle.  But there is no interrupt that
-+       * fires if he puts a battery back in and charging resumes.  So when
-+       * the battery is pulled, we run this work function looking for
-+       * either charger resumption or USB cable pull
-+       */
-+      struct mutex working_lock_nobat;
-+      struct work_struct work_nobat;
-+      int working_nobat;
-+      int usb_removal_count_nobat;
-+      int jiffies_last_bat_ins;
-+
-+      int last_curlim_set;
-+
-       int coldplug_done; /* cleared by probe, set by first work service */
-       int flag_bat_voltage_read; /* ipc to /sys batt voltage read func */
-@@ -259,6 +275,8 @@ static u_int16_t async_adc_complete(struct pcf50633_data *pcf)
-                       (__reg_read(pcf, PCF50633_REG_ADCS3) &
-                                                 PCF50633_ADCS3_ADCDAT1L_MASK);
-+      DEBUGPC("adc result = %d\n", ret);
-+
-       return ret;
- }
-@@ -512,8 +530,7 @@ static void configure_pmu_for_charger(struct pcf50633_data *pcf,
- {
-       switch (type) {
-       case CHARGER_TYPE_NONE:
--              __reg_write(pcf, PCF50633_REG_MBCC7,
--                                                  PCF50633_MBCC7_USB_SUSPEND);
-+              pcf50633_usb_curlim_set(pcf, 0);
-               break;
-       /*
-        * the PCF50633 has a feature that it will supply only excess current
-@@ -521,10 +538,19 @@ static void configure_pmu_for_charger(struct pcf50633_data *pcf,
-        * 500mA setting is "up to 500mA" according to that.
-        */
-       case CHARGER_TYPE_HOSTUSB:
--              __reg_write(pcf, PCF50633_REG_MBCC7, PCF50633_MBCC7_USB_500mA);
-+              /* USB subsystem should call pcf50633_usb_curlim_set to set
-+               * what was negotiated with the host when it is enumerated
-+               * successfully.  If we get called again after a good
-+               * negotiation, we keep what was negotiated.  (Removal of
-+               * USB plug destroys pcf->last_curlim_set to 0)
-+               */
-+              if (pcf->last_curlim_set > 100)
-+                      pcf50633_usb_curlim_set(pcf, pcf->last_curlim_set);
-+              else
-+                      pcf50633_usb_curlim_set(pcf, 100);
-               break;
-       case CHARGER_TYPE_1A:
--              __reg_write(pcf, PCF50633_REG_MBCC7, PCF50633_MBCC7_USB_1000mA);
-+              pcf50633_usb_curlim_set(pcf, 1000);
-               /*
-                * stop GPO / EN_HOSTUSB power driving out on the same
-                * USB power pins we have a 1A charger on right now!
-@@ -536,6 +562,12 @@ static void configure_pmu_for_charger(struct pcf50633_data *pcf,
-                                                PCF50633_REG_GPIO1CFG) & 0xf0);
-               break;
-       }
-+
-+      /* max out USB fast charge current -- actual current drawn is
-+       * additionally limited by USB limit so no worries
-+       */
-+      __reg_write(pcf, PCF50633_REG_MBCC5, 0xff);
-+
- }
- static void trigger_next_adc_job_if_any(struct pcf50633_data *pcf)
-@@ -562,6 +594,49 @@ static void add_request_to_adc_queue(struct pcf50633_data *pcf,
-               trigger_next_adc_job_if_any(pcf);
- }
-+/* we are run when we see a NOBAT situation, because there is no interrupt
-+ * source in pcf50633 that triggers on resuming charging.  It watches to see
-+ * if charging resumes, it reassesses the charging source if it does.  If the
-+ * USB power disappears, it is also a sign there must be a battery and it is
-+ * NOT being charged, so it exits since the next move must be USB insertion for
-+ * change of charger state
-+ */
-+
-+static void pcf50633_work_nobat(struct work_struct *work)
-+{
-+      struct pcf50633_data *pcf =
-+                      container_of(work, struct pcf50633_data, work_nobat);
-+
-+      mutex_lock(&pcf->working_lock_nobat);
-+      pcf->working_nobat = 1;
-+      mutex_unlock(&pcf->working_lock_nobat);
-+
-+      while (1) {
-+              msleep(1000);
-+
-+              /* there's a battery in there now? */
-+              if (reg_read(pcf, PCF50633_REG_MBCS3) & 0x40) {
-+
-+                      pcf->jiffies_last_bat_ins = jiffies;
-+
-+                      /* figure out our charging stance */
-+                      add_request_to_adc_queue(pcf, PCF50633_ADCC1_MUX_ADCIN1,
-+                                                   PCF50633_ADCC1_AVERAGE_16);
-+                      goto bail;
-+              }
-+
-+              /* he pulled USB cable since we were started?  exit then */
-+              if (pcf->usb_removal_count_nobat != pcf->usb_removal_count)
-+                      goto bail;
-+      }
-+
-+bail:
-+      mutex_lock(&pcf->working_lock_nobat);
-+      pcf->working_nobat = 0;
-+      mutex_unlock(&pcf->working_lock_nobat);
-+}
-+
-+
- static void pcf50633_work(struct work_struct *work)
- {
-       struct pcf50633_data *pcf =
-@@ -674,20 +749,29 @@ static void pcf50633_work(struct work_struct *work)
-               if (pcf->pdata->cb)
-                       pcf->pdata->cb(&pcf->client.dev,
-                                      PCF50633_FEAT_MBC, PMU_EVT_USB_INSERT);
-+              msleep(500); /* debounce, allow to see any ID resistor */
-               /* completion irq will figure out our charging stance */
-               add_request_to_adc_queue(pcf, PCF50633_ADCC1_MUX_ADCIN1,
-                                    PCF50633_ADCC1_AVERAGE_16);
-       }
-       if (pcfirq[0] & PCF50633_INT1_USBREM) {
-               DEBUGPC("USBREM ");
-+
-+              pcf->usb_removal_count++;
-+
-               /* only deal if we had understood it was in */
-               if (pcf->flags & PCF50633_F_USB_PRESENT) {
-                       input_report_key(pcf->input_dev, KEY_POWER2, 0);
-                       apm_queue_event(APM_POWER_STATUS_CHANGE);
-                       pcf->flags &= ~PCF50633_F_USB_PRESENT;
-+
-                       if (pcf->pdata->cb)
-                               pcf->pdata->cb(&pcf->client.dev,
-                                       PCF50633_FEAT_MBC, PMU_EVT_USB_REMOVE);
-+
-+                      /* destroy any memory of grant of power from host */
-+                      pcf->last_curlim_set = 0;
-+
-                       /* completion irq will figure out our charging stance */
-                       add_request_to_adc_queue(pcf, PCF50633_ADCC1_MUX_ADCIN1,
-                                       PCF50633_ADCC1_AVERAGE_16);
-@@ -760,6 +844,33 @@ static void pcf50633_work(struct work_struct *work)
-       if (pcfirq[2] & PCF50633_INT3_BATFULL) {
-               DEBUGPC("BATFULL ");
-+
-+              /* the problem is, we get a false BATFULL if we inserted battery
-+               * while USB powered.  Defeat BATFULL if we recently inserted
-+               * battery
-+               */
-+
-+              if ((jiffies - pcf->jiffies_last_bat_ins) < (HZ * 2)) {
-+
-+                      DEBUGPC("*** Ignoring BATFULL ***\n");
-+
-+                      ret = reg_read(pcf, PCF50633_REG_MBCC7) &
-+                                      PCF56033_MBCC7_USB_MASK;
-+
-+
-+                      reg_set_bit_mask(pcf, PCF50633_REG_MBCC7,
-+                                       PCF56033_MBCC7_USB_MASK,
-+                                       PCF50633_MBCC7_USB_SUSPEND);
-+
-+                      reg_set_bit_mask(pcf, PCF50633_REG_MBCC7,
-+                                       PCF56033_MBCC7_USB_MASK,
-+                                       ret);
-+              } else {
-+                      if (pcf->pdata->cb)
-+                              pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50633_FEAT_MBC, PMU_EVT_CHARGER_IDLE);
-+              }
-+
-               /* FIXME: signal this to userspace */
-       }
-       if (pcfirq[2] & PCF50633_INT3_CHGHALT) {
-@@ -797,8 +908,7 @@ static void pcf50633_work(struct work_struct *work)
-               switch (pcf->adc_queue_mux[tail]) {
-               case PCF50633_ADCC1_MUX_BATSNS_RES: /* battery voltage */
--                      pcf->flag_bat_voltage_read =
--                                                async_adc_complete(pcf);
-+                      pcf->flag_bat_voltage_read = async_adc_complete(pcf);
-                       break;
-               case PCF50633_ADCC1_MUX_ADCIN1: /* charger type */
-                       pcf->charger_adc_result_raw = async_adc_complete(pcf);
-@@ -830,8 +940,37 @@ static void pcf50633_work(struct work_struct *work)
-                   (PCF50633_MBCS1_USBPRES | PCF50633_MBCS1_USBOK)) {
-                       /*
-                        * hey no need to freak out, we have some kind of
--                       * valid charger power
-+                       * valid charger power to keep us going -- but note that
-+                       * we are not actually charging anything
-+                       */
-+                      if (pcf->pdata->cb)
-+                              pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50633_FEAT_MBC, PMU_EVT_CHARGER_IDLE);
-+
-+                      reg_set_bit_mask(pcf, PCF50633_REG_MBCC1,
-+                                      PCF50633_MBCC1_RESUME,
-+                                      PCF50633_MBCC1_RESUME);
-+      
-+                      /*
-+                       * Well, we are not charging anything right this second
-+                       * ... however in the next ~30s before we get the next
-+                       * NOBAT, he might insert a battery.  So we schedule a
-+                       * work function checking to see if
-+                       * we started charging something during that time.
-+                       * USB removal as well as charging terminates the work
-+                       * function so we can't get terminally confused
-                        */
-+                      mutex_lock(&pcf->working_lock_nobat);
-+                      if (!pcf->working_nobat) {
-+                              pcf->usb_removal_count_nobat =
-+                                                      pcf->usb_removal_count;
-+
-+                              if (!schedule_work(&pcf->work_nobat))
-+                                      DEBUGPC("failed to schedule nobat\n");
-+                      }
-+                      mutex_unlock(&pcf->working_lock_nobat);
-+
-+
-                       DEBUGPC("(NO)BAT ");
-               } else {
-                       /* Really low battery voltage, we have 8 seconds left */
-@@ -1064,10 +1203,13 @@ void pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma)
- {
-       u_int8_t bits;
-+      pcf->last_curlim_set = ma;
-+
-       dev_dbg(&pcf->client.dev, "setting usb current limit to %d ma", ma);
--      if (ma >= 1000)
-+      if (ma >= 1000) {
-               bits = PCF50633_MBCC7_USB_1000mA;
-+      }
-       else if (ma >= 500)
-               bits = PCF50633_MBCC7_USB_500mA;
-       else if (ma >= 100)
-@@ -1075,8 +1217,40 @@ void pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma)
-       else
-               bits = PCF50633_MBCC7_USB_SUSPEND;
-+      DEBUGPC("pcf50633_usb_curlim_set -> %dmA\n", ma);
-+
-+      if (!pcf->pdata->cb)
-+              goto set_it;
-+
-+      switch (bits) {
-+      case PCF50633_MBCC7_USB_100mA:
-+      case PCF50633_MBCC7_USB_SUSPEND:
-+               /* no charging is gonna be happening */
-+              pcf->pdata->cb(&pcf->client.dev,
-+                             PCF50633_FEAT_MBC, PMU_EVT_CHARGER_IDLE);
-+              break;
-+      default: /* right charging context that if there is power, we charge */
-+              if (pcf->flags & PCF50633_F_USB_PRESENT)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                             PCF50633_FEAT_MBC, PMU_EVT_CHARGER_ACTIVE);
-+              break;
-+      }
-+
-+set_it:
-       reg_set_bit_mask(pcf, PCF50633_REG_MBCC7, PCF56033_MBCC7_USB_MASK,
-                        bits);
-+
-+      /* clear batfull */
-+      reg_set_bit_mask(pcf, PCF50633_REG_MBCC1,
-+                              PCF50633_MBCC1_AUTORES,
-+                              0);
-+      reg_set_bit_mask(pcf, PCF50633_REG_MBCC1,
-+                              PCF50633_MBCC1_RESUME,
-+                              PCF50633_MBCC1_RESUME);
-+      reg_set_bit_mask(pcf, PCF50633_REG_MBCC1,
-+                              PCF50633_MBCC1_AUTORES,
-+                              PCF50633_MBCC1_AUTORES);
-+
- }
- EXPORT_SYMBOL_GPL(pcf50633_usb_curlim_set);
-@@ -1106,16 +1280,36 @@ static DEVICE_ATTR(usb_curlim, S_IRUGO | S_IWUSR, show_usblim, NULL);
- void pcf50633_charge_enable(struct pcf50633_data *pcf, int on)
- {
-       u_int8_t bits;
-+      u_int8_t usblim;
-       if (!(pcf->pdata->used_features & PCF50633_FEAT_MBC))
-               return;
-+      DEBUGPC("pcf50633_charge_enable %d\n", on);
-+
-       if (on) {
-               pcf->flags |= PCF50633_F_CHG_ENABLED;
-               bits = PCF50633_MBCC1_CHGENA;
-+              usblim = reg_read(pcf, PCF50633_REG_MBCC7) &
-+                                                      PCF56033_MBCC7_USB_MASK;
-+              switch (usblim) {
-+              case PCF50633_MBCC7_USB_1000mA:
-+              case PCF50633_MBCC7_USB_500mA:
-+                      if (pcf->flags & PCF50633_F_USB_PRESENT)
-+                              if (pcf->pdata->cb)
-+                                      pcf->pdata->cb(&pcf->client.dev,
-+                                                     PCF50633_FEAT_MBC,
-+                                                     PMU_EVT_CHARGER_ACTIVE);
-+                      break;
-+              default:
-+                      break;
-+              }
-       } else {
-               pcf->flags &= ~PCF50633_F_CHG_ENABLED;
-               bits = 0;
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50633_FEAT_MBC, PMU_EVT_CHARGER_IDLE);
-       }
-       reg_set_bit_mask(pcf, PCF50633_REG_MBCC1, PCF50633_MBCC1_CHGENA,
-                        bits);
-@@ -1712,7 +1906,9 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-       mutex_init(&data->lock);
-       mutex_init(&data->working_lock);
-+      mutex_init(&data->working_lock_nobat);
-       INIT_WORK(&data->work, pcf50633_work);
-+      INIT_WORK(&data->work_nobat, pcf50633_work_nobat);
-       data->irq = irq;
-       data->working = 0;
-       data->onkey_seconds = -1;
-diff --git a/include/linux/pcf506xx.h b/include/linux/pcf506xx.h
-index 33be73e..9069bd4 100644
---- a/include/linux/pcf506xx.h
-+++ b/include/linux/pcf506xx.h
-@@ -21,6 +21,8 @@ enum pmu_event {
-       PMU_EVT_USB_INSERT,
-       PMU_EVT_USB_REMOVE,
- #endif
-+      PMU_EVT_CHARGER_ACTIVE,
-+      PMU_EVT_CHARGER_IDLE,
-       __NUM_PMU_EVTS
- };
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1171-introduce-resume-dependency.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1171-introduce-resume-dependency.patch.patch
deleted file mode 100644 (file)
index f652e4f..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-From f07f917faa2f85625277f4d2f5294a630a6b0fb1 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:37:58 +0100
-Subject: [PATCH] introduce-resume-dependency.patch
-
-Defines a way for drivers to defer execution of resume callbacks
-until one or more other driver they are dependent on has itself
-resumed.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- include/linux/resume-dependency.h |   78 +++++++++++++++++++++++++++++++++++++
- 1 files changed, 78 insertions(+), 0 deletions(-)
- create mode 100644 include/linux/resume-dependency.h
-
-diff --git a/include/linux/resume-dependency.h b/include/linux/resume-dependency.h
-new file mode 100644
-index 0000000..b13aa3e
---- /dev/null
-+++ b/include/linux/resume-dependency.h
-@@ -0,0 +1,78 @@
-+#ifndef __RESUME_DEPENDENCY_H__
-+#define __RESUME_DEPENDENCY_H__
-+
-+/* Resume dependency framework
-+ *
-+ * (C) 2008 Openmoko, Inc.
-+ * Author: Andy Green <andy@openmoko.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; version 2.1.
-+ *
-+ * 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/list.h>
-+
-+struct resume_dependency {
-+      struct list_head list;
-+
-+      void (*callback)(void *); /* called with context as arg */
-+      void * context;
-+      int called_flag; /* set to 1 after called, use for multi dep */
-+};
-+
-+/* if you are a driver accept to have other drivers as dependencies, you need to
-+ * instantiate a struct resume_dependency above, then initialize it by invoking
-+ * init_resume_dependency_list() on it
-+ */
-+
-+#define init_resume_dependency_list(_head) \
-+      INIT_LIST_HEAD(&_head.list);
-+
-+
-+/* if your resume function depends on something else being resumed first, you
-+ * can register the dependency by calling this in your suspend function with
-+ * head being the list held by the thing you are dependent on, and dep being
-+ * your struct resume_dependency
-+ */
-+
-+#define register_resume_dependency(_head, _dep) { \
-+      _dep->called_flag = 0; \
-+      list_add(&_dep->list, &_head->list); \
-+}
-+
-+/* In the resume function that things can be dependent on, at the end you
-+ * invoke this macro.  This calls back the dependent resumes now it is safe to
-+ * use the resumed thing they were dependent on.
-+ */
-+
-+#define callback_all_resume_dependencies(_head) { \
-+      struct list_head *_pos, *_q; \
-+      struct resume_dependency *_dep; \
-+\
-+      list_for_each_safe(pos, _q, &_head.list) { \
-+              _dep = list_entry(_pos, struct resume_dependency, list); \
-+              _dep->called_flag = 1; \
-+              (_dep->callback)(dep->context); \
-+              list_del(_pos); \
-+      } \
-+}
-+
-+/* if your resume action is dependent on multiple drivers being resumed already,
-+ * register the same callback with each driver you are dependent on, and check
-+ * .called_flag for all of the struct resume_dependency.  When they are all 1
-+ * you know it is the last callback and you can resume, otherwise just return
-+ */
-+
-+#endif
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1172-introduce-pcf50633-resume-dependency-list.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1172-introduce-pcf50633-resume-dependency-list.patch.patch
deleted file mode 100644 (file)
index ac90c58..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-From bf63ca6b17328413611a9d7594ca2c2f710a1def Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:38:06 +0100
-Subject: [PATCH] introduce-pcf50633-resume-dependency-list.patch
-
-Adds resume dependency support to pcf50633
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |   26 ++++++++++++++++++++++++--
- include/linux/pcf50633.h     |    5 +++++
- 2 files changed, 29 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 2ed6dc0..ec6b9f1 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -53,6 +53,7 @@
- #include <asm/arch/gta02.h>
- #include "pcf50633.h"
-+#include <linux/resume-dependency.h>
- #if 0
- #define DEBUGP(x, args ...) printk("%s: " x, __FUNCTION__, ## args)
-@@ -167,6 +168,9 @@ struct pcf50633_data {
-                       u_int8_t ena;
-               } ldo[__NUM_PCF50633_REGS];
-       } standby_regs;
-+
-+      struct resume_dependency resume_dependency;
-+
- #endif
- };
-@@ -1933,6 +1937,8 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-       pcf50633_global = data;
-+      init_resume_dependency_list(data->resume_dependency);
-+
-       populate_sysfs_group(data);
-       err = sysfs_create_group(&new_client->dev.kobj, &pcf_attr_group);
-@@ -2142,6 +2148,17 @@ int pcf50633_report_resumers(struct pcf50633_data *pcf, char *buf)
- #ifdef CONFIG_PM
-+/*
-+ * we need to export this because pcf50633_data is kept opaque
-+ */
-+
-+void pcf50633_register_resume_dependency(struct pcf50633_data *pcf,
-+                                      struct pcf50633_resume_dependency *dep)
-+{
-+      register_resume_dependency(pcf->resume_dependency, dep);
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_register_resume_dep);
-+
- static int pcf50633_suspend(struct device *dev, pm_message_t state)
- {
-@@ -2234,8 +2251,11 @@ static int pcf50633_resume(struct device *dev)
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-       int i;
-+      struct list_head *pos, *q;
-+      struct pcf50633_resume_dependency *dep;
-+
--      /* mutex_lock(&pcf->lock); */  /* resume in atomic context */
-+      mutex_lock(&pcf->lock);
-       __reg_write(pcf, PCF50633_REG_LEDENA, 0x01);
-@@ -2274,10 +2294,12 @@ static int pcf50633_resume(struct device *dev)
-               __reg_write(pcf, reg_out+1, pcf->standby_regs.ldo[i].ena);
-       }
--      /* mutex_unlock(&pcf->lock); */ /* resume in atomic context */
-+      mutex_unlock(&pcf->lock);
-       pcf50633_irq(pcf->irq, pcf);
-+      callback_all_resume_dependencies(pcf->resume_dependency);
-+
-       return 0;
- }
- #else
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index 837037e..2bef616 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -2,6 +2,7 @@
- #define _LINUX_PCF50633_H
- #include <linux/pcf506xx.h>
-+#include <linux/resume-dependency.h>
- /* public in-kernel pcf50633 api */
-@@ -124,6 +125,10 @@ pcf50633_battvolt(struct pcf50633_data *pcf);
- extern int
- pcf50633_report_resumers(struct pcf50633_data *pcf, char *buf);
-+extern void
-+pcf50633_register_resume_dependency(struct pcf50633_data *pcf,
-+                                      struct pcf50633_resume_dependency *dep);
-+
- #define PCF50633_FEAT_EXTON   0x00000001      /* not yet supported */
- #define PCF50633_FEAT_MBC     0x00000002
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1173-add-use-pcf50633-resume-callback-jbt6k74.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1173-add-use-pcf50633-resume-callback-jbt6k74.patch.patch
deleted file mode 100644 (file)
index 9171612..0000000
+++ /dev/null
@@ -1,438 +0,0 @@
-From de64d8449b10dc39eebdee6bc01409cd0197e38a Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:38:15 +0100
-Subject: [PATCH] add-use-pcf50633-resume-callback-jbt6k74.patch
-
-Adds the resume callback stuff to glamo, then changes
-jbt6k74 to no longer use a sleeping workqueue, but to
-make its resume actions dependent on pcf50633 and
-glamo resume (for backlight and communication to LCM
-respectively)
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   39 ++++++++++++++++++++-
- drivers/i2c/chips/pcf50633.c       |   17 +++------
- drivers/mfd/glamo/glamo-core.c     |   16 ++++++++
- drivers/mfd/glamo/glamo-core.h     |    3 +-
- drivers/video/display/jbt6k74.c    |   67 +++++++++++++++++++-----------------
- include/linux/glamofb.h            |    3 ++
- include/linux/jbt6k74.h            |    4 ++
- include/linux/pcf50633.h           |    2 +-
- include/linux/resume-dependency.h  |   10 +++---
- 9 files changed, 108 insertions(+), 53 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index d7882ea..9ba1036 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -88,6 +88,12 @@
- /* arbitrates which sensor IRQ owns the shared SPI bus */
- static spinlock_t motion_irq_lock;
-+/* the dependency of jbt / LCM on pcf50633 resume */
-+struct resume_dependency resume_dep_jbt_pcf;
-+/* the dependency of jbt / LCM on glamo resume */
-+struct resume_dependency resume_dep_jbt_glamo;
-+
-+
- /* define FIQ IPC struct */
- /*
-  * contains stuff FIQ ISR modifies and normal kernel code can see and use
-@@ -857,21 +863,50 @@ static struct s3c2410_ts_mach_info gta02_ts_cfg = {
- /* SPI: LCM control interface attached to Glamo3362 */
--void gta02_jbt6k74_reset(int devidx, int level)
-+static void gta02_jbt6k74_reset(int devidx, int level)
- {
-       glamo_lcm_reset(level);
- }
- /* finally bring up deferred backlight resume now LCM is resumed itself */
--void gta02_jbt6k74_resuming(int devidx)
-+static void gta02_jbt6k74_resuming(int devidx)
- {
-       pcf50633_backlight_resume(pcf50633_global);
- }
-+static int gta02_jbt6k74_all_dependencies_resumed(int devidx)
-+{
-+      if (!resume_dep_jbt_pcf.called_flag)
-+              return 0;
-+
-+      if (!resume_dep_jbt_glamo.called_flag)
-+              return 0;
-+
-+      return 1;
-+}
-+
-+/* register jbt resume action to be dependent on pcf50633 and glamo resume */
-+
-+static void gta02_jbt6k74_suspending(int devindex, struct spi_device *spi)
-+{
-+      void jbt6k74_resume(void *spi); /* little white lies about types */
-+
-+      resume_dep_jbt_pcf.callback = jbt6k74_resume;
-+      resume_dep_jbt_pcf.context = (void *)spi;
-+      pcf50633_register_resume_dependency(pcf50633_global,
-+                                                         &resume_dep_jbt_pcf);
-+      resume_dep_jbt_glamo.callback = jbt6k74_resume;
-+      resume_dep_jbt_glamo.context = (void *)spi;
-+      glamo_register_resume_dependency(&resume_dep_jbt_glamo);
-+}
-+
-+
- const struct jbt6k74_platform_data jbt6k74_pdata = {
-       .reset          = gta02_jbt6k74_reset,
-       .resuming       = gta02_jbt6k74_resuming,
-+      .suspending     = gta02_jbt6k74_suspending,
-+      .all_dependencies_resumed = gta02_jbt6k74_all_dependencies_resumed,
- };
- static struct spi_board_info gta02_spi_board_info[] = {
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index ec6b9f1..2f9b9e1 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1937,7 +1937,7 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-       pcf50633_global = data;
--      init_resume_dependency_list(data->resume_dependency);
-+      init_resume_dependency_list(&data->resume_dependency);
-       populate_sysfs_group(data);
-@@ -2153,11 +2153,11 @@ int pcf50633_report_resumers(struct pcf50633_data *pcf, char *buf)
-  */
- void pcf50633_register_resume_dependency(struct pcf50633_data *pcf,
--                                      struct pcf50633_resume_dependency *dep)
-+                                      struct resume_dependency *dep)
- {
--      register_resume_dependency(pcf->resume_dependency, dep);
-+      register_resume_dependency(&pcf->resume_dependency, dep);
- }
--EXPORT_SYMBOL_GPL(pcf50633_register_resume_dep);
-+EXPORT_SYMBOL_GPL(pcf50633_register_resume_dependency);
- static int pcf50633_suspend(struct device *dev, pm_message_t state)
-@@ -2251,9 +2251,6 @@ static int pcf50633_resume(struct device *dev)
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-       int i;
--      struct list_head *pos, *q;
--      struct pcf50633_resume_dependency *dep;
--
-       mutex_lock(&pcf->lock);
-@@ -2281,10 +2278,6 @@ static int pcf50633_resume(struct device *dev)
-               __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.ledout);
-               __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.ledena);
-               __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.leddim);
--      } else { /* force backlight down, platform will restore later */
--              __reg_write(pcf, PCF50633_REG_LEDOUT, 2);
--              __reg_write(pcf, PCF50633_REG_LEDENA, 0x20);
--              __reg_write(pcf, PCF50633_REG_LEDDIM, 1);
-       }
-       /* FIXME: one big read? */
-@@ -2298,7 +2291,7 @@ static int pcf50633_resume(struct device *dev)
-       pcf50633_irq(pcf->irq, pcf);
--      callback_all_resume_dependencies(pcf->resume_dependency);
-+      callback_all_resume_dependencies(&pcf->resume_dependency);
-       return 0;
- }
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index 34b2a01..4925e62 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -1087,6 +1087,8 @@ static int __init glamo_probe(struct platform_device *pdev)
-               goto out_free;
-       }
-+      init_resume_dependency_list(&glamo->resume_dependency);
-+
-       /* register a number of sibling devices whoise IOMEM resources
-        * are siblings of pdev's IOMEM resource */
- #if 0
-@@ -1225,6 +1227,18 @@ static int glamo_remove(struct platform_device *pdev)
- }
- #ifdef CONFIG_PM
-+
-+/* have to export this because struct glamo_core is opaque */
-+
-+void glamo_register_resume_dependency(struct resume_dependency *
-+                                                            resume_dependency)
-+{
-+      register_resume_dependency(&glamo_handle->resume_dependency,
-+                                                           resume_dependency);
-+}
-+EXPORT_SYMBOL_GPL(glamo_register_resume_dependency);
-+
-+
- static int glamo_suspend(struct platform_device *pdev, pm_message_t state)
- {
-       glamo_power(glamo_handle, GLAMO_POWER_SUSPEND);
-@@ -1234,6 +1248,8 @@ static int glamo_suspend(struct platform_device *pdev, pm_message_t state)
- static int glamo_resume(struct platform_device *pdev)
- {
-       glamo_power(glamo_handle, GLAMO_POWER_ON);
-+      callback_all_resume_dependencies(&glamo_handle->resume_dependency);
-+
-       return 0;
- }
- #else
-diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h
-index cf89f03..1fee059 100644
---- a/drivers/mfd/glamo/glamo-core.h
-+++ b/drivers/mfd/glamo/glamo-core.h
-@@ -2,7 +2,7 @@
- #define __GLAMO_CORE_H
- #include <asm/system.h>
--
-+#include <linux/resume-dependency.h>
- /* for the time being, we put the on-screen framebuffer into the lowest
-  * VRAM space.  This should make the code easily compatible with the various
-@@ -29,6 +29,7 @@ struct glamo_core {
-       u_int16_t type;
-       u_int16_t revision;
-       spinlock_t lock;
-+      struct resume_dependency resume_dependency;
- };
- struct glamo_script {
-diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c
-index 178e2da..8e7bf36 100644
---- a/drivers/video/display/jbt6k74.c
-+++ b/drivers/video/display/jbt6k74.c
-@@ -27,11 +27,8 @@
- #include <linux/device.h>
- #include <linux/platform_device.h>
- #include <linux/delay.h>
--#include <linux/workqueue.h>
- #include <linux/jbt6k74.h>
--#include <linux/spi/spi.h>
--
- enum jbt_register {
-       JBT_REG_SLEEP_IN                = 0x10,
-       JBT_REG_SLEEP_OUT               = 0x11,
-@@ -116,14 +113,12 @@ struct jbt_info {
-       struct mutex lock;              /* protects tx_buf and reg_cache */
-       u16 tx_buf[8];
-       u16 reg_cache[0xEE];
--      struct work_struct work;
-+      int have_resumed;
- };
- #define JBT_COMMAND   0x000
- #define JBT_DATA      0x100
--static void jbt_resume_work(struct work_struct *work);
--
- static int jbt_reg_write_nodata(struct jbt_info *jbt, u8 reg)
- {
-@@ -576,8 +571,6 @@ static int __devinit jbt_probe(struct spi_device *spi)
-       if (!jbt)
-               return -ENOMEM;
--      INIT_WORK(&jbt->work, jbt_resume_work);
--
-       jbt->spi_dev = spi;
-       jbt->state = JBT_STATE_DEEP_STANDBY;
-       mutex_init(&jbt->lock);
-@@ -635,27 +628,48 @@ static int jbt_suspend(struct spi_device *spi, pm_message_t state)
-       struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-       struct jbt6k74_platform_data *jbt6k74_pdata = spi->dev.platform_data;
-+      /* platform needs to register resume dependencies here */
-+      if (jbt6k74_pdata->suspending)
-+              (jbt6k74_pdata->suspending)(0, spi);
-+
-       /* Save mode for resume */
-       jbt->last_state = jbt->state;
-       jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);
--      (jbt6k74_pdata->reset)(0, 0);
-+      jbt->have_resumed = 0;
-+
-+//    (jbt6k74_pdata->reset)(0, 0);
-       return 0;
- }
--static void jbt_resume_work(struct work_struct *work)
-+int jbt6k74_resume(struct spi_device *spi)
- {
--      struct jbt_info *jbt = container_of(work, struct jbt_info, work);
--      struct jbt6k74_platform_data *jbt6k74_pdata =
--                                              jbt->spi_dev->dev.platform_data;
-+      struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-+      struct jbt6k74_platform_data *jbt6k74_pdata = spi->dev.platform_data;
-+
-+      /* if we still wait on dependencies, exit because we will get called
-+       * again.  This guy will get called once by core resume action, and
-+       * should be set as resume_dependency callback for any dependencies
-+       * set by platform code.
-+       */
--      printk(KERN_INFO"jbt_resume_work waiting...\n");
--      /* 100ms is not enough here 2008-05-08 andy@openmoko.com
--       * if CONFIG_PM_DEBUG is enabled 2000ms is required
-+      if (jbt6k74_pdata->all_dependencies_resumed)
-+              if (!(jbt6k74_pdata->all_dependencies_resumed)(0))
-+                      return 0;
-+
-+      /* we can get called twice with all dependencies resumed if our core
-+       * resume callback is last of all.  Protect against going twice
-        */
--      msleep(400);
--      printk(KERN_INFO"jbt_resume_work GO...\n");
-+      if (jbt->have_resumed)
-+              return 0;
-+
-+      jbt->have_resumed = 1;
-+
-+      /* OK we are sure all devices we depend on for operation are up now */
-+
-+      /* even this needs glamo up on GTA02 :-/ */
-+      (jbt6k74_pdata->reset)(0, 1);
-       jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);
-       msleep(100);
-@@ -675,21 +689,10 @@ static void jbt_resume_work(struct work_struct *work)
-       if (jbt6k74_pdata->resuming)
-               (jbt6k74_pdata->resuming)(0);
--      printk(KERN_INFO"jbt_resume_work done...\n");
--}
--
--static int jbt_resume(struct spi_device *spi)
--{
--      struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
--      struct jbt6k74_platform_data *jbt6k74_pdata = spi->dev.platform_data;
--
--      (jbt6k74_pdata->reset)(0, 1);
--
--      if (!schedule_work(&jbt->work))
--              dev_err(&spi->dev, "Unable to schedule LCM wakeup work\n");
--
-       return 0;
- }
-+EXPORT_SYMBOL_GPL(jbt6k74_resume);
-+
- #else
- #define jbt_suspend   NULL
- #define jbt_resume    NULL
-@@ -704,7 +707,7 @@ static struct spi_driver jbt6k74_driver = {
-       .probe   = jbt_probe,
-       .remove  = __devexit_p(jbt_remove),
-       .suspend = jbt_suspend,
--      .resume  = jbt_resume,
-+      .resume  = jbt6k74_resume,
- };
- static int __init jbt_init(void)
-diff --git a/include/linux/glamofb.h b/include/linux/glamofb.h
-index 51bf593..bb4ed0a 100644
---- a/include/linux/glamofb.h
-+++ b/include/linux/glamofb.h
-@@ -2,6 +2,7 @@
- #define _LINUX_GLAMOFB_H
- #include <linux/spi/glamo.h>
-+#include <linux/resume-dependency.h>
- struct glamofb_val {
-       unsigned int defval;
-@@ -36,5 +37,7 @@ struct glamofb_platform_data {
- int glamofb_cmd_mode(struct glamofb_handle *gfb, int on);
- int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val);
- void glamo_lcm_reset(int level);
-+extern void
-+glamo_register_resume_dependency(struct resume_dependency * resume_dependency);
- #endif
-diff --git a/include/linux/jbt6k74.h b/include/linux/jbt6k74.h
-index 0ac9124..f0eaf39 100644
---- a/include/linux/jbt6k74.h
-+++ b/include/linux/jbt6k74.h
-@@ -1,9 +1,13 @@
- #ifndef __JBT6K74_H__
- #define __JBT6K74_H__
-+#include <linux/spi/spi.h>
-+
- struct jbt6k74_platform_data {
-       void (*reset)(int devindex, int level);
-       void (*resuming)(int devindex); /* called when LCM is resumed */
-+      void (*suspending)(int devindex, struct spi_device *spi);
-+      int (*all_dependencies_resumed)(int devindex);
- };
- #endif
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index 2bef616..8a75b28 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -127,7 +127,7 @@ pcf50633_report_resumers(struct pcf50633_data *pcf, char *buf);
- extern void
- pcf50633_register_resume_dependency(struct pcf50633_data *pcf,
--                                      struct pcf50633_resume_dependency *dep);
-+                                      struct resume_dependency *dep);
- #define PCF50633_FEAT_EXTON   0x00000001      /* not yet supported */
-diff --git a/include/linux/resume-dependency.h b/include/linux/resume-dependency.h
-index b13aa3e..e0c0f33 100644
---- a/include/linux/resume-dependency.h
-+++ b/include/linux/resume-dependency.h
-@@ -38,7 +38,7 @@ struct resume_dependency {
-  */
- #define init_resume_dependency_list(_head) \
--      INIT_LIST_HEAD(&_head.list);
-+      INIT_LIST_HEAD(&(_head)->list);
- /* if your resume function depends on something else being resumed first, you
-@@ -48,8 +48,8 @@ struct resume_dependency {
-  */
- #define register_resume_dependency(_head, _dep) { \
--      _dep->called_flag = 0; \
--      list_add(&_dep->list, &_head->list); \
-+      (_dep)->called_flag = 0; \
-+      list_add(&(_dep)->list, &(_head)->list); \
- }
- /* In the resume function that things can be dependent on, at the end you
-@@ -61,10 +61,10 @@ struct resume_dependency {
-       struct list_head *_pos, *_q; \
-       struct resume_dependency *_dep; \
- \
--      list_for_each_safe(pos, _q, &_head.list) { \
-+      list_for_each_safe(_pos, _q, &((_head)->list)) { \
-               _dep = list_entry(_pos, struct resume_dependency, list); \
-               _dep->called_flag = 1; \
--              (_dep->callback)(dep->context); \
-+              (_dep->callback)(_dep->context); \
-               list_del(_pos); \
-       } \
- }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1174-fix-remove-unused-model-name-bq27000.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1174-fix-remove-unused-model-name-bq27000.patch.patch
deleted file mode 100644 (file)
index abef92f..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From e2a0bda68cf6f2511f6faabf922183c2454f84fa Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:38:26 +0100
-Subject: [PATCH] fix-remove-unused-model-name-bq27000.patch
-
-Model name isn't in the bq27000 register set, remove the
-claim that we can deliver it
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/power/bq27000_battery.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/power/bq27000_battery.c b/drivers/power/bq27000_battery.c
-index cf57dcf..4511e9c 100644
---- a/drivers/power/bq27000_battery.c
-+++ b/drivers/power/bq27000_battery.c
-@@ -269,7 +269,6 @@ static enum power_supply_property bq27000_battery_props[] = {
-       POWER_SUPPLY_PROP_PRESENT,
-       POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW,
-       POWER_SUPPLY_PROP_TIME_TO_FULL_NOW,
--      POWER_SUPPLY_PROP_MODEL_NAME,
-       POWER_SUPPLY_PROP_CAPACITY
- };
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1175-Subject-PATCH-Build-fixes.patch b/target/linux/s3c24xx/patches-2.6.24/1175-Subject-PATCH-Build-fixes.patch
deleted file mode 100644 (file)
index e5e82b1..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-From 727d8f48ab606e44af8afee03b87f0cfdc1f8bf5 Mon Sep 17 00:00:00 2001
-From: Andrzej Zaborowski <balrog@zabor.org>
-Date: Wed, 2 Jul 2008 22:38:36 +0100
-Subject: [PATCH] Subject: [PATCH] Build fixes.
-
----
- arch/arm/mach-s3c2442/Kconfig           |    3 ++-
- arch/arm/plat-s3c24xx/Kconfig           |    2 +-
- arch/arm/plat-s3c24xx/time.c            |    4 ++--
- include/asm-arm/arch-s3c2410/regs-dsc.h |    4 ++--
- include/asm-arm/kexec.h                 |    4 ++--
- include/linux/kexec.h                   |    3 ++-
- 6 files changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig
-index 6cc68a1..f9aa91c 100644
---- a/arch/arm/mach-s3c2442/Kconfig
-+++ b/arch/arm/mach-s3c2442/Kconfig
-@@ -6,10 +6,11 @@
- config CPU_S3C2442
-       bool
--      depends on ARCH_S3C2440
-+      depends on CPU_S3C2440
-       select S3C2410_CLOCK
-       select S3C2410_GPIO
-       select S3C2410_PM if PM
-+      select S3C2440_DMA if S3C2410_DMA
-       select CPU_S3C244X
-       select CPU_LLSERIAL_S3C2440
-       help
-diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig
-index 7ee4b82..9e1691f 100644
---- a/arch/arm/plat-s3c24xx/Kconfig
-+++ b/arch/arm/plat-s3c24xx/Kconfig
-@@ -16,7 +16,7 @@ if PLAT_S3C24XX
- config CPU_S3C244X
-       bool
--      depends on ARCH_S3C2410 && (CPU_S3C2440 || CPU_S3C2442)
-+      default y if CPU_S3C2440 || CPU_S3C2442
-       help
-         Support for S3C2440 and S3C2442 Samsung Mobile CPU based systems.
-diff --git a/arch/arm/plat-s3c24xx/time.c b/arch/arm/plat-s3c24xx/time.c
-index 6989eea..39fc33d 100644
---- a/arch/arm/plat-s3c24xx/time.c
-+++ b/arch/arm/plat-s3c24xx/time.c
-@@ -202,12 +202,12 @@ static void s3c2410_timer_setup (void)
-               pclk = clk_get_rate(clk);
--              printk("pclk = %d\n", pclk);
-+              printk("pclk = %lu\n", pclk);
-               /* configure clock tick */
-               timer_usec_ticks = timer_mask_usec_ticks(6, pclk);
--              printk("timer_usec_ticks = %d\n", timer_usec_ticks);
-+              printk("timer_usec_ticks = %lu\n", timer_usec_ticks);
-               tcfg1 &= ~S3C2410_TCFG1_MUX4_MASK;
-               tcfg1 |= S3C2410_TCFG1_MUX4_DIV2;
-diff --git a/include/asm-arm/arch-s3c2410/regs-dsc.h b/include/asm-arm/arch-s3c2410/regs-dsc.h
-index c074851..f9d0c3d 100644
---- a/include/asm-arm/arch-s3c2410/regs-dsc.h
-+++ b/include/asm-arm/arch-s3c2410/regs-dsc.h
-@@ -19,7 +19,7 @@
- #define S3C2412_DSC1     S3C2410_GPIOREG(0xe0)
- #endif
--#if defined(CONFIG_CPU_S3C2440)
-+#if defined(CONFIG_CPU_S3C244X)
- #define S3C2440_DSC0     S3C2410_GPIOREG(0xc4)
- #define S3C2440_DSC1     S3C2410_GPIOREG(0xc8)
-@@ -178,7 +178,7 @@
- #define S3C2440_DSC1_CS0_4mA    (3<<0)
- #define S3C2440_DSC1_CS0_MASK   (3<<0)
--#endif /* CONFIG_CPU_S3C2440 */
-+#endif /* CONFIG_CPU_S3C244X */
- #endif        /* __ASM_ARCH_REGS_DSC_H */
-diff --git a/include/asm-arm/kexec.h b/include/asm-arm/kexec.h
-index 1ee17b6..0fb508b 100644
---- a/include/asm-arm/kexec.h
-+++ b/include/asm-arm/kexec.h
-@@ -1,8 +1,6 @@
- #ifndef _ARM_KEXEC_H
- #define _ARM_KEXEC_H
--#ifdef CONFIG_KEXEC
--
- /* Maximum physical address we can use pages from */
- #define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)
- /* Maximum address we can reach in physical address mode */
-@@ -16,6 +14,8 @@
- #define KEXEC_BOOT_PARAMS_SIZE 1536
-+#ifdef CONFIG_KEXEC
-+
- #define KEXEC_ARM_ATAGS_OFFSET  0x1000
- #define KEXEC_ARM_ZIMAGE_OFFSET 0x8000
-diff --git a/include/linux/kexec.h b/include/linux/kexec.h
-index 2d9c448..9f1a644 100644
---- a/include/linux/kexec.h
-+++ b/include/linux/kexec.h
-@@ -1,7 +1,6 @@
- #ifndef LINUX_KEXEC_H
- #define LINUX_KEXEC_H
--#ifdef CONFIG_KEXEC
- #include <linux/types.h>
- #include <linux/list.h>
- #include <linux/linkage.h>
-@@ -11,6 +10,8 @@
- #include <linux/elf.h>
- #include <asm/kexec.h>
-+#ifdef CONFIG_KEXEC
-+
- /* Verify architecture specific macros are defined */
- #ifndef KEXEC_SOURCE_MEMORY_LIMIT
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1176-Subject-PATCH-Hardware-glamo-fb-cursor-some-clea.patch b/target/linux/s3c24xx/patches-2.6.24/1176-Subject-PATCH-Hardware-glamo-fb-cursor-some-clea.patch
deleted file mode 100644 (file)
index 907eb5e..0000000
+++ /dev/null
@@ -1,279 +0,0 @@
-From b058131775abbc1ceedb5ad537014e4f9beed5ac Mon Sep 17 00:00:00 2001
-From: Andrzej Zaborowski <balrog@zabor.org>
-Date: Wed, 2 Jul 2008 22:38:46 +0100
-Subject: [PATCH] Subject: [PATCH] Hardware glamo-fb cursor, some clean-up.
-
----
- drivers/mfd/glamo/glamo-fb.c |  105 +++++++++++++++++++++---------------------
- include/linux/fb.h           |    1 +
- 2 files changed, 54 insertions(+), 52 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c
-index 44b1947..16e9d2e 100644
---- a/drivers/mfd/glamo/glamo-fb.c
-+++ b/drivers/mfd/glamo/glamo-fb.c
-@@ -117,6 +117,8 @@ static struct glamo_script glamo_regs[] = {
-          * 01 00 0 100 0 000 01 0 0 */
-       { GLAMO_REG_LCD_A_BASE1, 0x0000 }, /* display A base address 15:0 */
-       { GLAMO_REG_LCD_A_BASE2, 0x0000 }, /* display A base address 22:16 */
-+      { GLAMO_REG_LCD_CURSOR_BASE1, 0x0000 }, /* cursor base address 15:0 */
-+      { GLAMO_REG_LCD_CURSOR_BASE2, 0x000f }, /* cursor base address 22:16 */
- };
- static int glamofb_run_script(struct glamofb_handle *glamo,
-@@ -200,7 +202,6 @@ static int glamofb_check_var(struct fb_var_screeninfo *var,
-               printk(KERN_ERR
-                      "Smedia driver does not [yet?] support 24/32bpp\n");
-               return -EINVAL;
--              break;
-       }
-       return 0;
-@@ -495,23 +496,19 @@ static int glamofb_setcolreg(unsigned regno,
-       return 0;
- }
--#ifdef NOT_CURRENTLY_USED
-+#ifdef CONFIG_MFD_GLAMO_HWACCEL
- static int glamofb_cursor(struct fb_info *info, struct fb_cursor *cursor)
- {
-       struct glamofb_handle *glamo = info->par;
--      u_int16_t reg;
-+      unsigned long flags;
-       if (cursor->image.depth > 2)
-               return -EINVAL;
--      reg = reg_read(glamo, GLAMO_REG_LCD_MODE1);
-+      spin_lock_irqsave(&glamo->lock_cmd, flags);
--      if (cursor->enable)
--              reg_write(glamo, GLAMO_REG_LCD_MODE1,
--                        reg | GLAMO_LCD_MODE1_CURSOR_EN);
--      else
--              reg_write(glamo, GLAMO_REG_LCD_MODE1,
--                        reg & ~GLAMO_LCD_MODE1_CURSOR_EN);
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_MODE1,
-+                      GLAMO_LCD_MODE1_CURSOR_EN, 0);
-       if (cursor->set & FB_CUR_SETPOS) {
-               reg_write(glamo, GLAMO_REG_LCD_CURSOR_X_POS,
-@@ -521,29 +518,36 @@ static int glamofb_cursor(struct fb_info *info, struct fb_cursor *cursor)
-       }
-       if (cursor->set & FB_CUR_SETCMAP) {
--              /* FIXME */
-+              uint16_t fg = cursor->image.fg_color;
-+              uint16_t bg = cursor->image.bg_color;
-+
-+              reg_write(glamo, GLAMO_REG_LCD_CURSOR_FG_COLOR, fg);
-+              reg_write(glamo, GLAMO_REG_LCD_CURSOR_BG_COLOR, bg);
-+              reg_write(glamo, GLAMO_REG_LCD_CURSOR_DST_COLOR, bg);
-       }
--      if (cursor->set & FB_CUR_SETSIZE ||
--          cursor->set & (FB_CUR_SETIMAGE | FB_CUR_SETSHAPE)) {
--              int x, y, op;
-+      if (cursor->set & FB_CUR_SETHOT)
-+              reg_write(glamo, GLAMO_REG_LCD_CURSOR_PRESET,
-+                              (cursor->hot.x << 8) | cursor->hot.y);
-+
-+      if ((cursor->set & FB_CUR_SETSIZE) ||
-+          (cursor->set & (FB_CUR_SETIMAGE | FB_CUR_SETSHAPE))) {
-+              int x, y, pitch;
-               const unsigned char *pcol = cursor->image.data;
-               const unsigned char *pmsk = cursor->mask;
-               void __iomem *dst = glamo->cursor_addr;
-               unsigned char dcol = 0;
-               unsigned char dmsk = 0;
-+              unsigned char byte = 0;
-+              pitch = (cursor->image.width + 3) >> 2;
-               reg_write(glamo, GLAMO_REG_LCD_CURSOR_X_SIZE,
-                         cursor->image.width);
-               reg_write(glamo, GLAMO_REG_LCD_CURSOR_PITCH,
--                        cursor->image.width * 2);
-+                        pitch);
-               reg_write(glamo, GLAMO_REG_LCD_CURSOR_Y_SIZE,
-                         cursor->image.height);
--              for (op = 0; op < (cursor->image.width *
--                                 cursor->image.height * 2)/8; op += 4)
--                      writel(0x0, dst + op);
--
-               for (y = 0; y < cursor->image.height; y++) {
-                       for (x = 0; x < cursor->image.width; x++) {
-                               if ((x % 8) == 0) {
-@@ -558,14 +562,27 @@ static int glamofb_cursor(struct fb_info *info, struct fb_cursor *cursor)
-                                       unsigned int op;
-                                       op = (dcol & 1) ? 1 : 3;
--                                      op <<= ((x % 4) * 2);
-+                                      byte |= op << ((x % 4) * 2);
-+                              }
--                                      op |= readb(dst + (x / 4));
--                                      writeb(op, dst + (x / 4));
-+                              if ((x % 4) == 0) {
-+                                      writeb(byte, dst + x / 4);
-+                                      byte = 0;
-                               }
-                       }
-+
-+                      dst += pitch;
-               }
-       }
-+
-+      if (cursor->enable)
-+              reg_set_bit_mask(glamo, GLAMO_REG_LCD_MODE1,
-+                              GLAMO_LCD_MODE1_CURSOR_EN,
-+                              GLAMO_LCD_MODE1_CURSOR_EN);
-+
-+      spin_unlock_irqrestore(&glamo->lock_cmd, flags);
-+
-+      return 0;
- }
- #endif
-@@ -576,15 +593,14 @@ static inline int glamofb_cmdq_empty(struct glamofb_handle *gfb)
- }
- /* call holding gfb->lock_cmd  when locking, until you unlock */
--
- int glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
- {
-       int timeout = 200000;
--/*    dev_dbg(gfb->dev, "glamofb_cmd_mode(gfb=%p, on=%d)\n", gfb, on); */
-+      dev_dbg(gfb->dev, "glamofb_cmd_mode(gfb=%p, on=%d)\n", gfb, on);
-       if (on) {
--/*            dev_dbg(gfb->dev, "%s: waiting for cmdq empty: ",
--                      __FUNCTION__); */
-+              dev_dbg(gfb->dev, "%s: waiting for cmdq empty: ",
-+                      __FUNCTION__);
-               while ((!glamofb_cmdq_empty(gfb)) && (timeout--))
-                       yield();
-               if (timeout < 0) {
-@@ -593,7 +609,7 @@ int glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
-                                      "*************\n");
-                       return -EIO;
-               }
--/*            dev_dbg(gfb->dev, "empty!\n"); */
-+              dev_dbg(gfb->dev, "empty!\n");
-               /* display the entire frame then switch to command */
-               reg_write(gfb, GLAMO_REG_LCD_COMMAND1,
-@@ -601,7 +617,7 @@ int glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
-                         GLAMO_LCD_CMD_DATA_FIRE_VSYNC);
-               /* wait until LCD is idle */
--/*            dev_dbg(gfb->dev, "waiting for LCD idle: "); */
-+              dev_dbg(gfb->dev, "waiting for LCD idle: ");
-               timeout = 200000;
-               while ((!reg_read(gfb, GLAMO_REG_LCD_STATUS2) & (1 << 12)) &&
-                     (timeout--))
-@@ -612,7 +628,7 @@ int glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
-                                      "*************\n");
-                       return -EIO;
-               }
--/*            dev_dbg(gfb->dev, "idle!\n"); */
-+              dev_dbg(gfb->dev, "idle!\n");
-               mdelay(100);
-       } else {
-@@ -635,8 +651,7 @@ int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val)
- {
-       int timeout = 200000;
--/*    dev_dbg(gfb->dev, "%s: waiting for cmdq empty\n",
--              __FUNCTION__); */
-+      dev_dbg(gfb->dev, "%s: waiting for cmdq empty\n", __FUNCTION__);
-       while ((!glamofb_cmdq_empty(gfb)) && (timeout--))
-               yield();
-       if (timeout < 0) {
-@@ -645,7 +660,7 @@ int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val)
-                               "*************\n");
-               return 1;
-       }
--/*    dev_dbg(gfb->dev, "idle, writing 0x%04x\n", val); */
-+      dev_dbg(gfb->dev, "idle, writing 0x%04x\n", val);
-       reg_write(gfb, GLAMO_REG_LCD_COMMAND1, val);
-@@ -659,7 +674,9 @@ static struct fb_ops glamofb_ops = {
-       .fb_set_par     = glamofb_set_par,
-       .fb_blank       = glamofb_blank,
-       .fb_setcolreg   = glamofb_setcolreg,
--      //.fb_cursor    = glamofb_cursor,
-+#ifdef CONFIG_MFD_GLAMO_HWACCEL
-+      .fb_cursor      = glamofb_cursor,
-+#endif
-       .fb_fillrect    = cfb_fillrect,
-       .fb_copyarea    = cfb_copyarea,
-       .fb_imageblit   = cfb_imageblit,
-@@ -743,6 +760,7 @@ static int __init glamofb_probe(struct platform_device *pdev)
-               dev_err(&pdev->dev, "failed to ioremap() vram memory\n");
-               goto out_release_fb;
-       }
-+      glamofb->cursor_addr = fbinfo->screen_base + 0xf0000;
-       platform_set_drvdata(pdev, fbinfo);
-@@ -754,13 +772,13 @@ static int __init glamofb_probe(struct platform_device *pdev)
-       fbinfo->fix.xpanstep = 0;
-       fbinfo->fix.ypanstep = 0;
-       fbinfo->fix.ywrapstep = 0;
--      fbinfo->fix.accel = FB_ACCEL_NONE; /* FIXME */
-+      fbinfo->fix.accel = FB_ACCEL_GLAMO;
-       fbinfo->var.nonstd = 0;
-       fbinfo->var.activate = FB_ACTIVATE_NOW;
-       fbinfo->var.height = mach_info->height;
-       fbinfo->var.width = mach_info->width;
--      fbinfo->var.accel_flags = 0;
-+      fbinfo->var.accel_flags = 0;    /* FIXME */
-       fbinfo->var.vmode = FB_VMODE_NONINTERLACED;
-       fbinfo->fbops = &glamofb_ops;
-@@ -832,26 +850,9 @@ static int glamofb_remove(struct platform_device *pdev)
-       return 0;
- }
--#ifdef CONFIG_PM
--static int glamofb_suspend(struct platform_device *pdev, pm_message_t state)
--{
--      return 0;
--}
--
--static int glamofb_resume(struct platform_device *pdev)
--{
--      return 0;
--}
--#else
--#define glamofb_suspend NULL
--#define glamofb_resume  NULL
--#endif
--
- static struct platform_driver glamofb_driver = {
-       .probe          = glamofb_probe,
-       .remove         = glamofb_remove,
--      .suspend        = glamofb_suspend,
--      .resume         = glamofb_resume,
-       .driver         = {
-               .name   = "glamo-fb",
-               .owner  = THIS_MODULE,
-diff --git a/include/linux/fb.h b/include/linux/fb.h
-index 58c57a3..c114328 100644
---- a/include/linux/fb.h
-+++ b/include/linux/fb.h
-@@ -120,6 +120,7 @@ struct dentry;
- #define FB_ACCEL_XGI_VOLARI_V 47      /* XGI Volari V3XT, V5, V8      */
- #define FB_ACCEL_XGI_VOLARI_Z 48      /* XGI Volari Z7                */
- #define FB_ACCEL_OMAP1610     49      /* TI OMAP16xx                  */
-+#define FB_ACCEL_GLAMO                50      /* SMedia Glamo                 */
- #define FB_ACCEL_NEOMAGIC_NM2070 90   /* NeoMagic NM2070              */
- #define FB_ACCEL_NEOMAGIC_NM2090 91   /* NeoMagic NM2090              */
- #define FB_ACCEL_NEOMAGIC_NM2093 92   /* NeoMagic NM2093              */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1177-The-following-is-a-minor-cleanup-of-backlight-resume.patch b/target/linux/s3c24xx/patches-2.6.24/1177-The-following-is-a-minor-cleanup-of-backlight-resume.patch
deleted file mode 100644 (file)
index af103fd..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-From 50ea11a2a5397c72427a153a1327c6c433754df8 Mon Sep 17 00:00:00 2001
-From: Sean McNeil <sean@mcneil.com>
-Date: Wed, 2 Jul 2008 22:38:54 +0100
-Subject: [PATCH] The following is a minor cleanup of backlight resume:
-
----
- drivers/i2c/chips/pcf50633.c |   13 ++++---------
- 1 files changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 2f9b9e1..aabf412 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -2239,8 +2239,8 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
- void pcf50633_backlight_resume(struct pcf50633_data *pcf)
- {
-       /* we force the backlight on in fact */
--      __reg_write(pcf, PCF50633_REG_LEDOUT, 0x3f);
--      __reg_write(pcf, PCF50633_REG_LEDENA, 0x21);
-+      __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.ledout);
-+      __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.ledena | 0x01);
-       __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.leddim);
- }
- EXPORT_SYMBOL_GPL(pcf50633_backlight_resume);
-@@ -2254,8 +2254,6 @@ static int pcf50633_resume(struct device *dev)
-       mutex_lock(&pcf->lock);
--      __reg_write(pcf, PCF50633_REG_LEDENA, 0x01);
--
-       /* Resume all saved registers that don't "survive" standby state */
-       __reg_write(pcf, PCF50633_REG_INT1M, pcf->standby_regs.int1m);
-       __reg_write(pcf, PCF50633_REG_INT2M, pcf->standby_regs.int2m);
-@@ -2274,11 +2272,8 @@ static int pcf50633_resume(struct device *dev)
-       __reg_write(pcf, PCF50633_REG_MEMLDOENA, pcf->standby_regs.memldoena);
-       /* platform can choose to defer backlight bringup */
--      if (!pcf->pdata->defer_resume_backlight) {
--              __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.ledout);
--              __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.ledena);
--              __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.leddim);
--      }
-+      if (!pcf->pdata->defer_resume_backlight)
-+              pcf50633_backlight_resume(pcf);
-       /* FIXME: one big read? */
-       for (i = 0; i < 7; i++) {
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1178-debug-codec-register-setting-sysfs.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1178-debug-codec-register-setting-sysfs.patch.patch
deleted file mode 100644 (file)
index 0fd0008..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-From 79b99f7d65cce0730998a84d2fb615ae5ad0cff5 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:39:01 +0100
-Subject: [PATCH] debug-codec-register-setting-sysfs.patch
- Allow direct setting of codec registers for super mega meddling power
- Signed-off-by: Andy Green <andy@openmoko.com>
-
----
- sound/soc/soc-core.c |   35 +++++++++++++++++++++++++++++++++++
- 1 files changed, 35 insertions(+), 0 deletions(-)
-
-diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
-index 25f7818..9e20333 100644
---- a/sound/soc/soc-core.c
-+++ b/sound/soc/soc-core.c
-@@ -928,6 +928,38 @@ static ssize_t codec_reg_show(struct device *dev,
- }
- static DEVICE_ATTR(codec_reg, 0444, codec_reg_show, NULL);
-+
-+static ssize_t codec_reg_write(struct device *dev,
-+                             struct device_attribute *attr,
-+                             const char *buf, size_t count)
-+{
-+      u32 address;
-+      u32 data;
-+      char * end;
-+      size_t left = count;
-+      struct snd_soc_device *devdata = dev_get_drvdata(dev);
-+      struct snd_soc_codec *codec = devdata->codec;
-+
-+      address = simple_strtoul(buf, &end, 16);
-+      left -= (int)(end - buf);
-+      while ((*end == ' ') && (left)) {
-+              end++;
-+              left--;
-+      }
-+      if (!left)
-+              return count;
-+      data = simple_strtoul(end, &end, 16);
-+
-+      printk(KERN_INFO"user writes Codec reg 0x%02X with Data 0x%04X\n",
-+                                                              address, data);
-+
-+      codec->write(codec, address, data);
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(codec_reg_write, 0644, NULL, codec_reg_write);
-+
- /**
-  * snd_soc_new_ac97_codec - initailise AC97 device
-  * @codec: audio codec
-@@ -1139,6 +1171,9 @@ int snd_soc_register_card(struct snd_soc_device *socdev)
-       err = device_create_file(socdev->dev, &dev_attr_codec_reg);
-       if (err < 0)
-               printk(KERN_WARNING "asoc: failed to add codec sysfs entries\n");
-+      err = device_create_file(socdev->dev, &dev_attr_codec_reg_write);
-+      if (err < 0)
-+              printk(KERN_WARNING "asoc: failed to add codec sysfs entries\n");
- out:
-       mutex_unlock(&codec->mutex);
-       return ret;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1179-fix-pcf50633-suspend-resume-onehit-i2c-other-meddlin.patch b/target/linux/s3c24xx/patches-2.6.24/1179-fix-pcf50633-suspend-resume-onehit-i2c-other-meddlin.patch
deleted file mode 100644 (file)
index b9b718b..0000000
+++ /dev/null
@@ -1,204 +0,0 @@
-From 83636af17dab41d313411543c57984b5834cfcf2 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:39:10 +0100
-Subject: [PATCH] fix-pcf50633-suspend-resume-onehit-i2c-other-meddling.patch
-
- - speed up suspend and resume by using one hit i2c bulk transactions
- - don't bother storing int mask set on suspend, the default one is
-   what we use anyway
- - put stack_trace() on pcf50633 low level access that fire if we
-   try to touch them before we resumed
- - cosmetic source cleanup
- - reduces resume time for pcf50633 from 450ms to 255ms
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   21 ++-------
- drivers/i2c/chips/pcf50633.c       |   83 +++++++++++++++++++----------------
- 2 files changed, 49 insertions(+), 55 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 9ba1036..22de181 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -477,24 +477,11 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-       .r_fix_batt_par = 10000,
-       .r_sense_milli  = 220,
-       .resumers = {
--              [0] = /* PCF50633_INT1_ADPINS   | */
--                /* PCF50633_INT1_ADPREM       | */
--                PCF50633_INT1_USBINS          |
--                PCF50633_INT1_USBREM          |
--                PCF50633_INT1_ALARM,
-+              [0] = PCF50633_INT1_USBINS |
-+                    PCF50633_INT1_USBREM |
-+                    PCF50633_INT1_ALARM,
-               [1] = PCF50633_INT2_ONKEYF,
--              [2] =  /* PCF50633_INT3_BATFULL | */
--                /* PCF50633_INT3_CHGHALT      | */
--                /* PCF50633_INT3_THLIMON      | */
--                /* PCF50633_INT3_THLIMOFF     | */
--                /* PCF50633_INT3_USBLIMON     | */
--                /* PCF50633_INT3_USBLIMOFF    | */
--                PCF50633_INT3_ONKEY1S ,
--              [3] = 0                         /* |
--                   PCF50633_INT4_LOWSYS       | */
--                /* PCF50633_INT4_LOWBAT       | */
--                /* PCF50633_INT4_HIGHTMP */,
--              [4] = 0
-+              [2] = PCF50633_INT3_ONKEY1S
-       },
-       .rails  = {
-               [PCF50633_REGULATOR_AUTO] = {
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index aabf412..8cb6156 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -163,10 +163,7 @@ struct pcf50633_data {
-               u_int8_t down2out, down2ena;
-               u_int8_t memldoout, memldoena;
-               u_int8_t ledout, ledena, leddim;
--              struct {
--                      u_int8_t out;
--                      u_int8_t ena;
--              } ldo[__NUM_PCF50633_REGS];
-+              u_int8_t ldo[__NUM_PCF50633_REGS][2];
-       } standby_regs;
-       struct resume_dependency resume_dependency;
-@@ -187,6 +184,10 @@ static struct platform_device *pcf50633_pdev;
- static int __reg_write(struct pcf50633_data *pcf, u_int8_t reg, u_int8_t val)
- {
-+      if (pcf->have_been_suspended == 1) {
-+              dev_err(&pcf->client.dev, "__reg_write while suspended\n");
-+              dump_stack();
-+      }
-       return i2c_smbus_write_byte_data(&pcf->client, reg, val);
- }
-@@ -205,6 +206,10 @@ static int32_t __reg_read(struct pcf50633_data *pcf, u_int8_t reg)
- {
-       int32_t ret;
-+      if (pcf->have_been_suspended == 1) {
-+              dev_err(&pcf->client.dev, "__reg_read while suspended\n");
-+              dump_stack();
-+      }
-       ret = i2c_smbus_read_byte_data(&pcf->client, reg);
-       return ret;
-@@ -2165,6 +2170,13 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-       int i;
-+      int ret;
-+      u_int8_t tmp;
-+
-+      /* we suspend once (!) as late as possible in the suspend sequencing */
-+
-+      if ((state.event != PM_EVENT_SUSPEND) || (pcf->have_been_suspended))
-+              return 0;
-       /* The general idea is to power down all unused power supplies,
-        * and then mask all PCF50606 interrup sources but EXTONR, ONKEYF
-@@ -2186,25 +2198,25 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       pcf->standby_regs.ledout = __reg_read(pcf, PCF50633_REG_LEDOUT);
-       pcf->standby_regs.ledena = __reg_read(pcf, PCF50633_REG_LEDENA);
-       pcf->standby_regs.leddim = __reg_read(pcf, PCF50633_REG_LEDDIM);
--      /* FIXME: one big read? */
--      for (i = 0; i < 7; i++) {
--              u_int8_t reg_out = PCF50633_REG_LDO1OUT + 2*i;
--              pcf->standby_regs.ldo[i].out = __reg_read(pcf, reg_out);
--              pcf->standby_regs.ldo[i].ena = __reg_read(pcf, reg_out+1);
--      }
-+
-+      /* regulator voltages and enable states */
-+      ret = i2c_smbus_read_i2c_block_data(&pcf->client,
-+                                          PCF50633_REG_LDO1OUT, 14,
-+                                          &pcf->standby_regs.ldo[0][0]);
-+      if (ret != 14)
-+              dev_err(dev, "Failed to save LDO levels and enables :-(\n");
-       /* switch off power supplies that are not needed during suspend */
-       for (i = 0; i < __NUM_PCF50633_REGULATORS; i++) {
--              if (!(pcf->pdata->rails[i].flags & PMU_VRAIL_F_SUSPEND_ON)) {
--                      u_int8_t tmp;
--
--                      DEBUGP("disabling pcf50633 regulator %u\n", i);
--                      /* we cannot use pcf50633_onoff_set() because we're
--                       * already under the mutex */
--                      tmp = __reg_read(pcf, regulator_registers[i]+1);
--                      tmp &= 0xfe;
--                      __reg_write(pcf, regulator_registers[i]+1, tmp);
--              }
-+              if ((pcf->pdata->rails[i].flags & PMU_VRAIL_F_SUSPEND_ON))
-+                      continue;
-+
-+              dev_dbg(dev, "disabling regulator %u\n", i);
-+              /* we cannot use pcf50633_onoff_set() because we're
-+               * already under the mutex */
-+              tmp = __reg_read(pcf, regulator_registers[i]+1);
-+              tmp &= 0xfe;
-+              __reg_write(pcf, regulator_registers[i]+1, tmp);
-       }
-       /* turn off the backlight */
-@@ -2212,11 +2224,9 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       __reg_write(pcf, PCF50633_REG_LEDOUT, 2);
-       __reg_write(pcf, PCF50633_REG_LEDENA, 0x00);
--      pcf->standby_regs.int1m = __reg_read(pcf, PCF50633_REG_INT1M);
--      pcf->standby_regs.int2m = __reg_read(pcf, PCF50633_REG_INT2M);
--      pcf->standby_regs.int3m = __reg_read(pcf, PCF50633_REG_INT3M);
--      pcf->standby_regs.int4m = __reg_read(pcf, PCF50633_REG_INT4M);
--      pcf->standby_regs.int5m = __reg_read(pcf, PCF50633_REG_INT5M);
-+      /* set interrupt masks so only those sources we want to wake
-+       * us are able to
-+       */
-       __reg_write(pcf, PCF50633_REG_INT1M, ~pcf->pdata->resumers[0]);
-       __reg_write(pcf, PCF50633_REG_INT2M, ~pcf->pdata->resumers[1]);
-       __reg_write(pcf, PCF50633_REG_INT3M, ~pcf->pdata->resumers[2]);
-@@ -2250,16 +2260,13 @@ static int pcf50633_resume(struct device *dev)
- {
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
--      int i;
-+      int ret;
-       mutex_lock(&pcf->lock);
--      /* Resume all saved registers that don't "survive" standby state */
--      __reg_write(pcf, PCF50633_REG_INT1M, pcf->standby_regs.int1m);
--      __reg_write(pcf, PCF50633_REG_INT2M, pcf->standby_regs.int2m);
--      __reg_write(pcf, PCF50633_REG_INT3M, pcf->standby_regs.int3m);
--      __reg_write(pcf, PCF50633_REG_INT4M, pcf->standby_regs.int4m);
--      __reg_write(pcf, PCF50633_REG_INT5M, pcf->standby_regs.int5m);
-+      pcf->have_been_suspended = 2; /* resuming */
-+
-+      /* these guys get reset while pcf50633 is suspend state, refresh */
-       __reg_write(pcf, PCF50633_REG_OOCTIM2, pcf->standby_regs.ooctim2);
-       __reg_write(pcf, PCF50633_REG_AUTOOUT, pcf->standby_regs.autoout);
-@@ -2275,12 +2282,12 @@ static int pcf50633_resume(struct device *dev)
-       if (!pcf->pdata->defer_resume_backlight)
-               pcf50633_backlight_resume(pcf);
--      /* FIXME: one big read? */
--      for (i = 0; i < 7; i++) {
--              u_int8_t reg_out = PCF50633_REG_LDO1OUT + 2*i;
--              __reg_write(pcf, reg_out, pcf->standby_regs.ldo[i].out);
--              __reg_write(pcf, reg_out+1, pcf->standby_regs.ldo[i].ena);
--      }
-+      /* regulator voltages and enable states */
-+      ret = i2c_smbus_write_i2c_block_data(&pcf->client,
-+                                          PCF50633_REG_LDO1OUT, 14,
-+                                          &pcf->standby_regs.ldo[0][0]);
-+      if (ret)
-+              dev_err(dev, "Failed to restore LDOs :-( %d\n", ret);
-       mutex_unlock(&pcf->lock);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1180-fix-glamo-mci-relationship-with-pcf50633-suspend-res.patch b/target/linux/s3c24xx/patches-2.6.24/1180-fix-glamo-mci-relationship-with-pcf50633-suspend-res.patch
deleted file mode 100644 (file)
index 12fd291..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-From ecb5c96f7da9b081efe3c731a0c7b052c2411536 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:39:17 +0100
-Subject: [PATCH] fix-glamo-mci-relationship-with-pcf50633-suspend-resume.patch
-
-After protecting pcf50633 read and write primitives against
-operation after suspend or before resume (by blowing a
-stack_trace()) I saw glamo-mci was trying to use pcf50633
-at these bad times on its own suspend and resume.  Since that
-part was already done via platform callback, I added an
-export in pcf50633 that tells you if it is ready or busy,
-and used it to defer (resume power on case) or ignore
-(suspend power off case, since pcf50633 already did it)
-the mci power call.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   17 ++++++++++-------
- drivers/i2c/chips/pcf50633.c       |   14 ++++++++++++++
- include/linux/pcf50633.h           |    5 +++++
- 3 files changed, 29 insertions(+), 7 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 22de181..5980ea9 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1277,13 +1277,12 @@ gta02_glamo_mmc_set_power(unsigned char power_mode, unsigned short vdd)
-       case GTA02v4_SYSTEM_REV:
-       case GTA02v5_SYSTEM_REV:
-       case GTA02v6_SYSTEM_REV:
--              /* depend on pcf50633 driver init */
--              if (!pcf50633_global)
--                      while (!pcf50633_global)
--                              msleep(10);
-               switch (power_mode) {
-               case MMC_POWER_ON:
-               case MMC_POWER_UP:
-+                      /* depend on pcf50633 driver init + not suspended */
-+                      while (pcf50633_ready(pcf50633_global))
-+                              msleep(1);
-                       /* select and set the voltage */
-                       if (vdd > 7) {
-                               mv += 300 + 100 * (vdd - 8);
-@@ -1292,15 +1291,19 @@ gta02_glamo_mmc_set_power(unsigned char power_mode, unsigned short vdd)
-                       }
-                       pcf50633_voltage_set(pcf50633_global,
-                                            PCF50633_REGULATOR_HCLDO, mv);
--                      msleep(10);
-                       pcf50633_onoff_set(pcf50633_global,
-                                          PCF50633_REGULATOR_HCLDO, 1);
--                      msleep(1);
-                       break;
-               case MMC_POWER_OFF:
-+                      /* power off happens during suspend, when pcf50633 can
-+                       * be already gone and not coming back... just forget
-+                       * the action then because pcf50633 suspend already
-+                       * dealt with it, otherwise we spin forever
-+                       */
-+                      if (pcf50633_ready(pcf50633_global))
-+                              return;
-                       pcf50633_onoff_set(pcf50633_global,
-                                          PCF50633_REGULATOR_HCLDO, 0);
--                      msleep(1);
-                       break;
-               }
-               break;
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 8cb6156..4d92c84 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -2240,6 +2240,20 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       return 0;
- }
-+
-+int pcf50633_ready(struct pcf50633_data *pcf)
-+{
-+      if (!pcf)
-+              return -EBUSY;
-+
-+      if (pcf->have_been_suspended)
-+              return -EBUSY;
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_ready);
-+
-+
- /*
-  * if backlight resume is selected to be deferred by platform, then it
-  * can call this to finally reset backlight status (after LCM is resumed
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index 8a75b28..0522d92 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -129,6 +129,11 @@ extern void
- pcf50633_register_resume_dependency(struct pcf50633_data *pcf,
-                                       struct resume_dependency *dep);
-+/* 0 = initialized and resumed and ready to roll, !=0 = either not
-+ * initialized or not resumed yet
-+ */
-+extern int
-+pcf50633_ready(struct pcf50633_data *pcf);
- #define PCF50633_FEAT_EXTON   0x00000001      /* not yet supported */
- #define PCF50633_FEAT_MBC     0x00000002
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1181-fix-jbt6k74-force-reset-suspend.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1181-fix-jbt6k74-force-reset-suspend.patch.patch
deleted file mode 100644 (file)
index 2f7f835..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From 5917872c144260bd6d74f35b6dadf0a98a53df07 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:39:25 +0100
-Subject: [PATCH] fix-jbt6k74-force-reset-suspend.patch
- Sean McNeil reports that without the reset for LCM in suspend, he
- gets a monochromatic mode on it somehow.
- Signed-off-by: Andy Green <andy@openmoko.com>
-
----
- drivers/video/display/jbt6k74.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c
-index 8e7bf36..7cc00ad 100644
---- a/drivers/video/display/jbt6k74.c
-+++ b/drivers/video/display/jbt6k74.c
-@@ -638,7 +638,7 @@ static int jbt_suspend(struct spi_device *spi, pm_message_t state)
-       jbt->have_resumed = 0;
--//    (jbt6k74_pdata->reset)(0, 0);
-+      (jbt6k74_pdata->reset)(0, 0);
-       return 0;
- }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1182-ASoC-Don-t-block-system-resume.patch b/target/linux/s3c24xx/patches-2.6.24/1182-ASoC-Don-t-block-system-resume.patch
deleted file mode 100644 (file)
index 347dbfb..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-From 2219855aa7835e082ec134fafd9ddba84589d345 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:39:33 +0100
-Subject: [PATCH] ASoC: Don't block system resume
-
-On OpenMoko soc-audio resume is taking 700ms of the whole resume time of
-1.3s, dominated by writes to the codec over I2C.  This patch shunts the
-resume guts into a workqueue which then is done asynchronously.
-
-The "card" is locked using the ALSA power state APIs as suggested by
-Mark Brown.
-
-[Added fix for race with resume to suspend and fixed a couple of nits
-from checkpatch -- broonie.]
-
-Signed-off-by: Andy Green <andy@openmoko.com>
-Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
----
- include/sound/soc.h  |    1 +
- sound/soc/soc-core.c |   52 ++++++++++++++++++++++++++++++++++++++++++++-----
- 2 files changed, 47 insertions(+), 6 deletions(-)
-
-diff --git a/include/sound/soc.h b/include/sound/soc.h
-index aedb348..2d6c0eb 100644
---- a/include/sound/soc.h
-+++ b/include/sound/soc.h
-@@ -442,6 +442,7 @@ struct snd_soc_device {
-       struct snd_soc_codec *codec;
-       struct snd_soc_codec_device *codec_dev;
-       struct delayed_work delayed_work;
-+      struct work_struct deferred_resume_work;
-       void *codec_data;
- };
-diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
-index 9e20333..e96930e 100644
---- a/sound/soc/soc-core.c
-+++ b/sound/soc/soc-core.c
-@@ -632,6 +632,16 @@ static int soc_suspend(struct platform_device *pdev, pm_message_t state)
-       struct snd_soc_codec *codec = socdev->codec;
-       int i;
-+      /* Due to the resume being scheduled into a workqueue we could
-+      * suspend before that's finished - wait for it to complete.
-+       */
-+      snd_power_lock(codec->card);
-+      snd_power_wait(codec->card, SNDRV_CTL_POWER_D0);
-+      snd_power_unlock(codec->card);
-+
-+      /* we're going to block userspace touching us until resume completes */
-+      snd_power_change_state(codec->card, SNDRV_CTL_POWER_D3hot);
-+
-       /* mute any active DAC's */
-       for(i = 0; i < machine->num_links; i++) {
-               struct snd_soc_codec_dai *dai = machine->dai_link[i].codec_dai;
-@@ -684,16 +694,27 @@ static int soc_suspend(struct platform_device *pdev, pm_message_t state)
-       return 0;
- }
--/* powers up audio subsystem after a suspend */
--static int soc_resume(struct platform_device *pdev)
-+/* deferred resume work, so resume can complete before we finished
-+ * setting our codec back up, which can be very slow on I2C
-+ */
-+static void soc_resume_deferred(struct work_struct *work)
- {
--      struct snd_soc_device *socdev = platform_get_drvdata(pdev);
--      struct snd_soc_machine *machine = socdev->machine;
--      struct snd_soc_platform *platform = socdev->platform;
--      struct snd_soc_codec_device *codec_dev = socdev->codec_dev;
-+      struct snd_soc_device *socdev = container_of(work,
-+                                                   struct snd_soc_device,
-+                                                   deferred_resume_work);
-+      struct snd_soc_machine *machine = socdev->machine;
-+      struct snd_soc_platform *platform = socdev->platform;
-+      struct snd_soc_codec_device *codec_dev = socdev->codec_dev;
-       struct snd_soc_codec *codec = socdev->codec;
-+      struct platform_device *pdev = to_platform_device(socdev->dev);
-       int i;
-+      /* our power state is still SNDRV_CTL_POWER_D3hot from suspend time,
-+       * so userspace apps are blocked from touching us
-+       */
-+
-+      dev_info(socdev->dev, "starting resume work\n");
-+
-       if (machine->resume_pre)
-               machine->resume_pre(pdev);
-@@ -735,6 +756,22 @@ static int soc_resume(struct platform_device *pdev)
-       if (machine->resume_post)
-               machine->resume_post(pdev);
-+      dev_info(socdev->dev, "resume work completed\n");
-+
-+      /* userspace can access us now we are back as we were before */
-+      snd_power_change_state(codec->card, SNDRV_CTL_POWER_D0);
-+}
-+
-+/* powers up audio subsystem after a suspend */
-+static int soc_resume(struct platform_device *pdev)
-+{
-+      struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-+
-+      dev_info(socdev->dev, "scheduling resume work\n");
-+
-+      if (!schedule_work(&socdev->deferred_resume_work))
-+              dev_err(socdev->dev, "work item may be lost\n");
-+
-       return 0;
- }
-@@ -781,6 +818,9 @@ static int soc_probe(struct platform_device *pdev)
-       /* DAPM stream work */
-       INIT_DELAYED_WORK(&socdev->delayed_work, close_delayed_work);
-+      /* deferred resume work */
-+      INIT_WORK(&socdev->deferred_resume_work, soc_resume_deferred);
-+
-       return 0;
- platform_err:
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1183-fix-glamo-mci-power-setting-timeout-waiting-for-pcf5.patch b/target/linux/s3c24xx/patches-2.6.24/1183-fix-glamo-mci-power-setting-timeout-waiting-for-pcf5.patch
deleted file mode 100644 (file)
index 843c53d..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From 8f4ffd81a902d5499228ce79fcf38c90df52f0e4 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:39:41 +0100
-Subject: [PATCH] fix-glamo-mci-power-setting-timeout-waiting-for-pcf50633.patch
-
-Glamo MCI power setting stuff spins on pcf50633
-but it won't hurt if it gives up after a second or
-two instead of stalling the resume silently.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   11 +++++++++--
- 1 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 5980ea9..69a952a 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1265,6 +1265,7 @@ static void
- gta02_glamo_mmc_set_power(unsigned char power_mode, unsigned short vdd)
- {
-       int mv = 1650;
-+      int timeout = 100;
-       printk(KERN_DEBUG "mmc_set_power(power_mode=%u, vdd=%u\n",
-              power_mode, vdd);
-@@ -1281,8 +1282,14 @@ gta02_glamo_mmc_set_power(unsigned char power_mode, unsigned short vdd)
-               case MMC_POWER_ON:
-               case MMC_POWER_UP:
-                       /* depend on pcf50633 driver init + not suspended */
--                      while (pcf50633_ready(pcf50633_global))
--                              msleep(1);
-+                      while (pcf50633_ready(pcf50633_global) && (timeout--))
-+                              msleep(5);
-+
-+                      if (!timeout) {
-+                              printk(KERN_ERR"gta02_glamo_mmc_set_power "
-+                                           "BAILING on timeout\n");
-+                              return;
-+                      }
-                       /* select and set the voltage */
-                       if (vdd > 7) {
-                               mv += 300 + 100 * (vdd - 8);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1184-fix-glamo-mci-resume-dependency-on-pcf50633.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1184-fix-glamo-mci-resume-dependency-on-pcf50633.patch.patch
deleted file mode 100644 (file)
index d532467..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-From b73e3db4efa3409bd3c559d848e71e1519960d07 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:39:48 +0100
-Subject: [PATCH] fix-glamo-mci-resume-dependency-on-pcf50633.patch
-
-Glamo MCI has a resume order dependncy on pcf50633, it has to be able to
-power the SD slot via it.
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   25 +++++++++++++++++++++++++
- drivers/mfd/glamo/glamo-core.c     |    8 ++++++++
- drivers/mfd/glamo/glamo-core.h     |    3 +++
- drivers/mfd/glamo/glamo-mci.c      |   11 ++++++++++-
- include/linux/glamofb.h            |    2 ++
- 5 files changed, 48 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 69a952a..64d275d 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -92,6 +92,8 @@ static spinlock_t motion_irq_lock;
- struct resume_dependency resume_dep_jbt_pcf;
- /* the dependency of jbt / LCM on glamo resume */
- struct resume_dependency resume_dep_jbt_glamo;
-+/* the dependency of Glamo MCI on pcf50633 resume (has to power SD slot) */
-+struct resume_dependency resume_dep_glamo_mci_pcf;
- /* define FIQ IPC struct */
-@@ -1317,6 +1319,26 @@ gta02_glamo_mmc_set_power(unsigned char power_mode, unsigned short vdd)
-       }
- }
-+
-+static int gta02_glamo_mci_all_dependencies_resumed(struct platform_device *dev)
-+{
-+      return resume_dep_glamo_mci_pcf.called_flag;
-+}
-+
-+/* register jbt resume action to be dependent on pcf50633 and glamo resume */
-+
-+static void gta02_glamo_mci_suspending(struct platform_device *dev)
-+{
-+      void glamo_mci_resume(void *dev); /* little white lies about types */
-+
-+      resume_dep_glamo_mci_pcf.callback = glamo_mci_resume;
-+      resume_dep_glamo_mci_pcf.context = (void *)dev;
-+      pcf50633_register_resume_dependency(pcf50633_global,
-+                                                   &resume_dep_glamo_mci_pcf);
-+}
-+
-+
-+
- /* Smedia Glamo 3362 */
- static struct glamofb_platform_data gta02_glamo_pdata = {
-@@ -1352,6 +1374,9 @@ static struct glamofb_platform_data gta02_glamo_pdata = {
-       /* glamo MMC function platform data */
-       .glamo_set_mci_power = gta02_glamo_mmc_set_power,
-       .glamo_irq_is_wired = glamo_irq_is_wired,
-+      .mci_suspending = gta02_glamo_mci_suspending,
-+      .mci_all_dependencies_resumed =
-+                                    gta02_glamo_mci_all_dependencies_resumed,
- };
- static struct resource gta02_glamo_resources[] = {
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index 4925e62..608721e 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -270,6 +270,8 @@ struct glamo_mci_pdata glamo_mci_def_pdata = {
-       .glamo_set_mci_power    = NULL, /* filled in from MFD platform data */
-       .ocr_avail              = MMC_VDD_32_33,
-       .glamo_irq_is_wired     = NULL, /* filled in from MFD platform data */
-+      .mci_suspending = NULL, /* filled in from MFD platform data */
-+      .mci_all_dependencies_resumed = NULL, /* filled in from MFD platform data */
- };
- EXPORT_SYMBOL_GPL(glamo_mci_def_pdata);
-@@ -1111,6 +1113,10 @@ static int __init glamo_probe(struct platform_device *pdev)
-                                       glamo->pdata->glamo_set_mci_power;
-       glamo_mci_def_pdata.glamo_irq_is_wired =
-                                       glamo->pdata->glamo_irq_is_wired;
-+      glamo_mci_def_pdata.mci_suspending =
-+                                      glamo->pdata->mci_suspending;
-+      glamo_mci_def_pdata.mci_all_dependencies_resumed =
-+                              glamo->pdata->mci_all_dependencies_resumed;
-       glamo_2d_dev.dev.parent = &pdev->dev;
-       mangle_mem_resources(glamo_2d_dev.resource,
-@@ -1180,6 +1186,8 @@ static int __init glamo_probe(struct platform_device *pdev)
-                glamo_pll_rate(glamo, GLAMO_PLL1),
-                glamo_pll_rate(glamo, GLAMO_PLL2));
-+      glamo_lcm_reset(1);
-+
-       for (irq = IRQ_GLAMO(0); irq <= IRQ_GLAMO(8); irq++) {
-               set_irq_chip(irq, &glamo_irq_chip);
-               set_irq_handler(irq, handle_level_irq);
-diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h
-index 1fee059..b1531b3 100644
---- a/drivers/mfd/glamo/glamo-core.h
-+++ b/drivers/mfd/glamo/glamo-core.h
-@@ -71,6 +71,9 @@ struct glamo_mci_pdata {
-       void            (*glamo_set_mci_power)(unsigned char power_mode,
-                                    unsigned short vdd);
-       int             (*glamo_irq_is_wired)(void);
-+      void            (*mci_suspending)(struct platform_device *dev);
-+      int             (*mci_all_dependencies_resumed)(struct platform_device *dev);
-+
- };
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index 7869325..f264a6c 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -817,18 +817,27 @@ static int glamo_mci_suspend(struct platform_device *dev, pm_message_t state)
-       struct glamo_mci_host   *host = mmc_priv(mmc);
-       host->suspending++;
-+      if (host->pdata->mci_all_dependencies_resumed)
-+              (host->pdata->mci_suspending)(dev);
-+
-       return mmc_suspend_host(mmc, state);
- }
--static int glamo_mci_resume(struct platform_device *dev)
-+int glamo_mci_resume(struct platform_device *dev)
- {
-       struct mmc_host *mmc = platform_get_drvdata(dev);
-       struct glamo_mci_host   *host = mmc_priv(mmc);
-+      if (host->pdata->mci_all_dependencies_resumed)
-+              if (!(host->pdata->mci_all_dependencies_resumed)(dev))
-+                      return 0;
-+
-       host->suspending--;
-       return mmc_resume_host(mmc);
- }
-+EXPORT_SYMBOL_GPL(glamo_mci_resume);
-+
- #else /* CONFIG_PM */
- #define glamo_mci_suspend NULL
-diff --git a/include/linux/glamofb.h b/include/linux/glamofb.h
-index bb4ed0a..bb1a398 100644
---- a/include/linux/glamofb.h
-+++ b/include/linux/glamofb.h
-@@ -32,6 +32,8 @@ struct glamofb_platform_data {
-       void            (*glamo_set_mci_power)(unsigned char power_mode,
-                                    unsigned short vdd);
-       int             (*glamo_irq_is_wired)(void);
-+      void            (*mci_suspending)(struct platform_device *dev);
-+      int             (*mci_all_dependencies_resumed)(struct platform_device *dev);
- };
- int glamofb_cmd_mode(struct glamofb_handle *gfb, int on);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1185-fix-pcf50633-interrupt-work-enforce-wait-on-resume-c.patch b/target/linux/s3c24xx/patches-2.6.24/1185-fix-pcf50633-interrupt-work-enforce-wait-on-resume-c.patch
deleted file mode 100644 (file)
index be03e13..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-From ac949375c7ef5882e8d3ea4f4a165b2fce943f21 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:39:56 +0100
-Subject: [PATCH] fix-pcf50633-interrupt-work-enforce-wait-on-resume-completion.patch
-
-Improve pcf50633 interrupt service scheduling to enforce only servicing
-when resume action is completed
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |   67 ++++++++++++++++++++++++++++++------------
- 1 files changed, 48 insertions(+), 19 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 4d92c84..33e2eaf 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -656,6 +656,26 @@ static void pcf50633_work(struct work_struct *work)
-       mutex_lock(&pcf->working_lock);
-       pcf->working = 1;
-+
-+      dev_info(&pcf->client.dev, "pcf50633_work called with suspended = %d\n",
-+                                 pcf->have_been_suspended);
-+
-+      /*
-+       * If we are inside suspend -> resume completion time we don't attempt
-+       * service until we have fully resumed.  Although we could talk to the
-+       * device as soon as I2C is up, the regs in the device which we might
-+       * choose to modify as part of the service action have not been
-+       * reloaded with their pre-suspend states yet.  Therefore we will
-+       * defer our service if we are called like that until our resume has
-+       * completed.
-+       */
-+
-+      if (pcf->have_been_suspended && (pcf->have_been_suspended < 2)) {
-+              dev_info(&pcf->client.dev, "rescheduling,  suspended = %d\n",
-+                                         pcf->have_been_suspended);
-+              goto reschedule;
-+      }
-+
-       /*
-        * datasheet says we have to read the five IRQ
-        * status regs in one transaction
-@@ -663,30 +683,25 @@ static void pcf50633_work(struct work_struct *work)
-       ret = i2c_smbus_read_i2c_block_data(&pcf->client, PCF50633_REG_INT1, 5,
-                                           pcfirq);
-       if (ret != 5) {
--              DEBUGP("Oh crap PMU IRQ register read failed -- "
--                     "retrying later %d\n", ret);
-+              dev_info(&pcf->client.dev,
-+                       "Oh crap PMU IRQ register read failed -- "
-+                       "retrying later %d\n", ret);
-               /*
--               * this situation can happen during resume, just defer
--               * handling the interrupt until enough I2C is up we can
--               * actually talk to the PMU.  We can't just ignore this
--               * because we are on a falling edge interrupt and our
--               * PMU interrupt source does not clear until we read these
--               * interrupt source registers.
-+               * it shouldn't fail, we no longer attempt to use I2C while
-+               * it can be suspended.  But we don't have much option but to
-+               * retry if if it ever did fail, because if we don't service
-+               * the interrupt to clear it, we will never see another PMU
-+               * interrupt edge.
-                */
--              if (!schedule_work(&pcf->work) && !pcf->working)
--                      dev_dbg(&pcf->client.dev, "work item may be lost\n");
--
--              /* we don't put the device here, hold it for next time */
--              mutex_unlock(&pcf->working_lock);
--              /* don't spew, delaying whatever else is happening */
--              msleep(1);
--              return;
-+              goto reschedule;
-       }
-       /* hey did we just resume? */
-       if (pcf->have_been_suspended) {
-+              /* resume is officially over now then */
-               pcf->have_been_suspended = 0;
-+
-               /*
-                * grab a copy of resume interrupt reasons
-                * from pcf50633 POV
-@@ -1045,6 +1060,19 @@ static void pcf50633_work(struct work_struct *work)
-       input_sync(pcf->input_dev);
-       put_device(&pcf->client.dev);
-       mutex_unlock(&pcf->working_lock);
-+
-+      return;
-+
-+reschedule:
-+      /* don't spew, delaying whatever else is happening */
-+      msleep(100);
-+
-+      dev_info(&pcf->client.dev, "rescheduling interrupt service\n");
-+      if (!schedule_work(&pcf->work))
-+              dev_err(&pcf->client.dev, "int service reschedule failed\n");
-+
-+      /* we don't put the device here, hold it for next time */
-+      mutex_unlock(&pcf->working_lock);
- }
- static irqreturn_t pcf50633_irq(int irq, void *_pcf)
-@@ -1052,10 +1080,11 @@ static irqreturn_t pcf50633_irq(int irq, void *_pcf)
-       struct pcf50633_data *pcf = _pcf;
-       DEBUGP("entering(irq=%u, pcf=%p): scheduling work\n", irq, _pcf);
-+      dev_info(&pcf->client.dev, "pcf50633_irq scheduling work\n");
-       get_device(&pcf->client.dev);
-       if (!schedule_work(&pcf->work) && !pcf->working)
--              dev_dbg(&pcf->client.dev, "work item may be lost\n");
-+              dev_err(&pcf->client.dev, "work item may be lost\n");
-       return IRQ_HANDLED;
- }
-@@ -2244,9 +2273,9 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
- int pcf50633_ready(struct pcf50633_data *pcf)
- {
-       if (!pcf)
--              return -EBUSY;
-+              return -EACCES;
--      if (pcf->have_been_suspended)
-+      if (pcf->have_been_suspended && (pcf->have_been_suspended < 3))
-               return -EBUSY;
-       return 0;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1186-fix-pcf50633-rtc-i2c-bulk-autoincrement-simplify.pat.patch b/target/linux/s3c24xx/patches-2.6.24/1186-fix-pcf50633-rtc-i2c-bulk-autoincrement-simplify.pat.patch
deleted file mode 100644 (file)
index 19c2079..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
-From d22227eec7efd4b2f40e51ea3c3bc025299efc93 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:40:04 +0100
-Subject: [PATCH] fix-pcf50633-rtc-i2c-bulk-autoincrement-simplify.patch
-
-More pcf50633 major time saving by using i2c bulk autoincrement.  Code
-reduction too by using array for time elements.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |  134 ++++++++++++++++++++++++------------------
- 1 files changed, 77 insertions(+), 57 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 33e2eaf..1f88c32 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1505,37 +1505,42 @@ static void pcf50633_get_power_status(struct apm_power_info *info)
- /***********************************************************************
-  * RTC
-  ***********************************************************************/
-+enum pcf50633_time_indexes {
-+      PCF50633_TI_SEC = 0,
-+      PCF50633_TI_MIN,
-+      PCF50633_TI_HOUR,
-+      PCF50633_TI_WKDAY,
-+      PCF50633_TI_DAY,
-+      PCF50633_TI_MONTH,
-+      PCF50633_TI_YEAR,
-+      PCF50633_TI_EXTENT /* always last */
-+};
-+
- struct pcf50633_time {
--      u_int8_t sec;
--      u_int8_t min;
--      u_int8_t hour;
--      u_int8_t wkday;
--      u_int8_t day;
--      u_int8_t month;
--      u_int8_t year;
-+      u_int8_t time[PCF50633_TI_EXTENT];
- };
- static void pcf2rtc_time(struct rtc_time *rtc, struct pcf50633_time *pcf)
- {
--      rtc->tm_sec = BCD2BIN(pcf->sec);
--      rtc->tm_min = BCD2BIN(pcf->min);
--      rtc->tm_hour = BCD2BIN(pcf->hour);
--      rtc->tm_wday = BCD2BIN(pcf->wkday);
--      rtc->tm_mday = BCD2BIN(pcf->day);
--      rtc->tm_mon = BCD2BIN(pcf->month);
--      rtc->tm_year = BCD2BIN(pcf->year) + 100;
-+      rtc->tm_sec = BCD2BIN(pcf->time[PCF50633_TI_SEC]);
-+      rtc->tm_min = BCD2BIN(pcf->time[PCF50633_TI_MIN]);
-+      rtc->tm_hour = BCD2BIN(pcf->time[PCF50633_TI_HOUR]);
-+      rtc->tm_wday = BCD2BIN(pcf->time[PCF50633_TI_WKDAY]);
-+      rtc->tm_mday = BCD2BIN(pcf->time[PCF50633_TI_DAY]);
-+      rtc->tm_mon = BCD2BIN(pcf->time[PCF50633_TI_MONTH]);
-+      rtc->tm_year = BCD2BIN(pcf->time[PCF50633_TI_YEAR]) + 100;
- }
- static void rtc2pcf_time(struct pcf50633_time *pcf, struct rtc_time *rtc)
- {
--      pcf->sec = BIN2BCD(rtc->tm_sec);
--      pcf->min = BIN2BCD(rtc->tm_min);
--      pcf->hour = BIN2BCD(rtc->tm_hour);
--      pcf->wkday = BIN2BCD(rtc->tm_wday);
--      pcf->day = BIN2BCD(rtc->tm_mday);
--      pcf->month = BIN2BCD(rtc->tm_mon);
--      pcf->year = BIN2BCD(rtc->tm_year - 100);
-+      pcf->time[PCF50633_TI_SEC] = BIN2BCD(rtc->tm_sec);
-+      pcf->time[PCF50633_TI_MIN] = BIN2BCD(rtc->tm_min);
-+      pcf->time[PCF50633_TI_HOUR] = BIN2BCD(rtc->tm_hour);
-+      pcf->time[PCF50633_TI_WKDAY] = BIN2BCD(rtc->tm_wday);
-+      pcf->time[PCF50633_TI_DAY] = BIN2BCD(rtc->tm_mday);
-+      pcf->time[PCF50633_TI_MONTH] = BIN2BCD(rtc->tm_mon);
-+      pcf->time[PCF50633_TI_YEAR] = BIN2BCD(rtc->tm_year - 100);
- }
- static int pcf50633_rtc_ioctl(struct device *dev, unsigned int cmd,
-@@ -1574,24 +1579,30 @@ static int pcf50633_rtc_read_time(struct device *dev, struct rtc_time *tm)
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-       struct pcf50633_time pcf_tm;
-+      int ret;
-       mutex_lock(&pcf->lock);
--      pcf_tm.sec = __reg_read(pcf, PCF50633_REG_RTCSC);
--      pcf_tm.min = __reg_read(pcf, PCF50633_REG_RTCMN);
--      pcf_tm.hour = __reg_read(pcf, PCF50633_REG_RTCHR);
--      pcf_tm.wkday = __reg_read(pcf, PCF50633_REG_RTCWD);
--      pcf_tm.day = __reg_read(pcf, PCF50633_REG_RTCDT);
--      pcf_tm.month = __reg_read(pcf, PCF50633_REG_RTCMT);
--      pcf_tm.year = __reg_read(pcf, PCF50633_REG_RTCYR);
-+
-+      ret = i2c_smbus_read_i2c_block_data(&pcf->client,
-+                                          PCF50633_REG_RTCSC,
-+                                          PCF50633_TI_EXTENT,
-+                                          &pcf_tm.time[0]);
-+      if (ret != PCF50633_TI_EXTENT)
-+              dev_err(dev, "Failed to read time :-(\n");
-+
-       mutex_unlock(&pcf->lock);
--      DEBUGP("PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
--              pcf_tm.day, pcf_tm.month, pcf_tm.year,
--              pcf_tm.hour, pcf_tm.min, pcf_tm.sec);
-+      dev_info(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
-+              pcf_tm.time[PCF50633_TI_DAY],
-+              pcf_tm.time[PCF50633_TI_MONTH],
-+              pcf_tm.time[PCF50633_TI_YEAR],
-+              pcf_tm.time[PCF50633_TI_HOUR],
-+              pcf_tm.time[PCF50633_TI_MIN],
-+              pcf_tm.time[PCF50633_TI_SEC]);
-       pcf2rtc_time(tm, &pcf_tm);
--      DEBUGP("RTC_TIME: %u.%u.%u %u:%u:%u\n",
-+      dev_info(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
-               tm->tm_mday, tm->tm_mon, tm->tm_year,
-               tm->tm_hour, tm->tm_min, tm->tm_sec);
-@@ -1603,24 +1614,30 @@ static int pcf50633_rtc_set_time(struct device *dev, struct rtc_time *tm)
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-       struct pcf50633_time pcf_tm;
-+      int ret;
--      DEBUGP("RTC_TIME: %u.%u.%u %u:%u:%u\n",
-+      dev_info(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
-               tm->tm_mday, tm->tm_mon, tm->tm_year,
-               tm->tm_hour, tm->tm_min, tm->tm_sec);
-       rtc2pcf_time(&pcf_tm, tm);
--      DEBUGP("PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
--              pcf_tm.day, pcf_tm.month, pcf_tm.year,
--              pcf_tm.hour, pcf_tm.min, pcf_tm.sec);
-+      dev_info(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
-+              pcf_tm.time[PCF50633_TI_DAY],
-+              pcf_tm.time[PCF50633_TI_MONTH],
-+              pcf_tm.time[PCF50633_TI_YEAR],
-+              pcf_tm.time[PCF50633_TI_HOUR],
-+              pcf_tm.time[PCF50633_TI_MIN],
-+              pcf_tm.time[PCF50633_TI_SEC]);
-       mutex_lock(&pcf->lock);
-       /* FIXME: disable second interrupt */
--      __reg_write(pcf, PCF50633_REG_RTCSC, pcf_tm.sec);
--      __reg_write(pcf, PCF50633_REG_RTCMN, pcf_tm.min);
--      __reg_write(pcf, PCF50633_REG_RTCHR, pcf_tm.hour);
--      __reg_write(pcf, PCF50633_REG_RTCWD, pcf_tm.wkday);
--      __reg_write(pcf, PCF50633_REG_RTCDT, pcf_tm.day);
--      __reg_write(pcf, PCF50633_REG_RTCMT, pcf_tm.month);
--      __reg_write(pcf, PCF50633_REG_RTCYR, pcf_tm.year);
-+
-+      ret = i2c_smbus_write_i2c_block_data(&pcf->client,
-+                                           PCF50633_REG_RTCSC,
-+                                           PCF50633_TI_EXTENT,
-+                                           &pcf_tm.time[0]);
-+      if (ret)
-+              dev_err(dev, "Failed to set time %d\n", ret);
-+
-       /* FIXME: re-enable second interrupt */
-       mutex_unlock(&pcf->lock);
-@@ -1632,17 +1649,20 @@ static int pcf50633_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-       struct pcf50633_time pcf_tm;
-+      int ret;
-       mutex_lock(&pcf->lock);
-+
-       alrm->enabled =
-            __reg_read(pcf, PCF50633_REG_INT1M) & PCF50633_INT1_ALARM ? 0 : 1;
--      pcf_tm.sec = __reg_read(pcf, PCF50633_REG_RTCSCA);
--      pcf_tm.min = __reg_read(pcf, PCF50633_REG_RTCMNA);
--      pcf_tm.hour = __reg_read(pcf, PCF50633_REG_RTCHRA);
--      pcf_tm.wkday = __reg_read(pcf, PCF50633_REG_RTCWDA);
--      pcf_tm.day = __reg_read(pcf, PCF50633_REG_RTCDTA);
--      pcf_tm.month = __reg_read(pcf, PCF50633_REG_RTCMTA);
--      pcf_tm.year = __reg_read(pcf, PCF50633_REG_RTCYRA);
-+
-+      ret = i2c_smbus_read_i2c_block_data(&pcf->client,
-+                                          PCF50633_REG_RTCSCA,
-+                                          PCF50633_TI_EXTENT,
-+                                          &pcf_tm.time[0]);
-+      if (ret != PCF50633_TI_EXTENT)
-+              dev_err(dev, "Failed to read Alarm time :-(\n");
-+
-       mutex_unlock(&pcf->lock);
-       pcf2rtc_time(&alrm->time, &pcf_tm);
-@@ -1656,6 +1676,7 @@ static int pcf50633_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-       struct pcf50633_time pcf_tm;
-       u_int8_t irqmask;
-+      int ret;
-       rtc2pcf_time(&pcf_tm, &alrm->time);
-@@ -1666,13 +1687,12 @@ static int pcf50633_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
-       irqmask |= PCF50633_INT1_ALARM;
-       __reg_write(pcf, PCF50633_REG_INT1M, irqmask);
--      __reg_write(pcf, PCF50633_REG_RTCSCA, pcf_tm.sec);
--      __reg_write(pcf, PCF50633_REG_RTCMNA, pcf_tm.min);
--      __reg_write(pcf, PCF50633_REG_RTCHRA, pcf_tm.hour);
--      __reg_write(pcf, PCF50633_REG_RTCWDA, pcf_tm.wkday);
--      __reg_write(pcf, PCF50633_REG_RTCDTA, pcf_tm.day);
--      __reg_write(pcf, PCF50633_REG_RTCMTA, pcf_tm.month);
--      __reg_write(pcf, PCF50633_REG_RTCYRA, pcf_tm.year);
-+      ret = i2c_smbus_write_i2c_block_data(&pcf->client,
-+                                           PCF50633_REG_RTCSCA,
-+                                           PCF50633_TI_EXTENT,
-+                                           &pcf_tm.time[0]);
-+      if (ret)
-+              dev_err(dev, "Failed to write alarm time :-( %d\n", ret);
-       if (alrm->enabled) {
-               /* (re-)enaable alarm interrupt */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1187-fix-pcf50633-use-i2c-bulk-autoincrement.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1187-fix-pcf50633-use-i2c-bulk-autoincrement.patch.patch
deleted file mode 100644 (file)
index b04e60d..0000000
+++ /dev/null
@@ -1,222 +0,0 @@
-From 8a2d04c222684e3278dd28d11f57a05fe0865183 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:40:12 +0100
-Subject: [PATCH] fix-pcf50633-use-i2c-bulk-autoincrement.patch
-
-Simplify and speed up bulk sequential I2C actions in pcf50633
-the time savings are pretty considerable and so is the simplification
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |  117 +++++++++++++++++++++++++-----------------
- 1 files changed, 70 insertions(+), 47 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 1f88c32..96857a3 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -156,14 +156,14 @@ struct pcf50633_data {
- #ifdef CONFIG_PM
-       struct {
--              u_int8_t int1m, int2m, int3m, int4m, int5m;
-               u_int8_t ooctim2;
--              u_int8_t autoout, autoena, automxc;
--              u_int8_t down1out, down1mxc;
--              u_int8_t down2out, down2ena;
--              u_int8_t memldoout, memldoena;
--              u_int8_t ledout, ledena, leddim;
--              u_int8_t ldo[__NUM_PCF50633_REGS][2];
-+              /* enables are always [1] below
-+               * I2C has limit of 32 sequential regs, so done in two lumps
-+               * because it covers 33 register extent otherwise
-+               */
-+              u_int8_t misc[PCF50633_REG_LEDDIM - PCF50633_REG_AUTOOUT + 1];
-+              /*  skip 1 reserved reg here */
-+              u_int8_t ldo[PCF50633_REG_HCLDOENA - PCF50633_REG_LDO1OUT + 1];
-       } standby_regs;
-       struct resume_dependency resume_dependency;
-@@ -1737,6 +1737,8 @@ static int pcf50633bl_set_intensity(struct backlight_device *bd)
-       int old_intensity = reg_read(pcf, PCF50633_REG_LEDOUT);
-       int ret;
-+      dev_info(&pcf->client.dev, "pcf50633bl_set_intensity\n");
-+
-       if (!(reg_read(pcf, PCF50633_REG_LEDENA) & 1))
-               old_intensity = 0;
-@@ -2221,6 +2223,9 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       int i;
-       int ret;
-       u_int8_t tmp;
-+      u_int8_t res[5];
-+
-+      dev_err(dev, "pcf50633_suspend\n");
-       /* we suspend once (!) as late as possible in the suspend sequencing */
-@@ -2228,30 +2233,26 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-               return 0;
-       /* The general idea is to power down all unused power supplies,
--       * and then mask all PCF50606 interrup sources but EXTONR, ONKEYF
-+       * and then mask all PCF50633 interrupt sources but EXTONR, ONKEYF
-        * and ALARM */
-       mutex_lock(&pcf->lock);
-       /* Save all registers that don't "survive" standby state */
-       pcf->standby_regs.ooctim2 = __reg_read(pcf, PCF50633_REG_OOCTIM2);
--      pcf->standby_regs.autoout = __reg_read(pcf, PCF50633_REG_AUTOOUT);
--      pcf->standby_regs.autoena = __reg_read(pcf, PCF50633_REG_AUTOENA);
--      pcf->standby_regs.automxc = __reg_read(pcf, PCF50633_REG_AUTOMXC);
--      pcf->standby_regs.down1out = __reg_read(pcf, PCF50633_REG_DOWN1OUT);
--      pcf->standby_regs.down1mxc = __reg_read(pcf, PCF50633_REG_DOWN1MXC);
--      pcf->standby_regs.down2out = __reg_read(pcf, PCF50633_REG_DOWN2OUT);
--      pcf->standby_regs.down2ena = __reg_read(pcf, PCF50633_REG_DOWN2ENA);
--      pcf->standby_regs.memldoout = __reg_read(pcf, PCF50633_REG_MEMLDOOUT);
--      pcf->standby_regs.memldoena = __reg_read(pcf, PCF50633_REG_MEMLDOENA);
--      pcf->standby_regs.ledout = __reg_read(pcf, PCF50633_REG_LEDOUT);
--      pcf->standby_regs.ledena = __reg_read(pcf, PCF50633_REG_LEDENA);
--      pcf->standby_regs.leddim = __reg_read(pcf, PCF50633_REG_LEDDIM);
-+
-+      ret = i2c_smbus_read_i2c_block_data(&pcf->client,
-+                                          PCF50633_REG_AUTOOUT,
-+                                          sizeof(pcf->standby_regs.misc),
-+                                          &pcf->standby_regs.misc[0]);
-+      if (ret != 18)
-+              dev_err(dev, "Failed to save misc levels and enables :-(\n");
-       /* regulator voltages and enable states */
-       ret = i2c_smbus_read_i2c_block_data(&pcf->client,
--                                          PCF50633_REG_LDO1OUT, 14,
--                                          &pcf->standby_regs.ldo[0][0]);
-+                                          PCF50633_REG_LDO1OUT,
-+                                          sizeof(pcf->standby_regs.ldo),
-+                                          &pcf->standby_regs.ldo[0]);
-       if (ret != 14)
-               dev_err(dev, "Failed to save LDO levels and enables :-(\n");
-@@ -2261,11 +2262,16 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-                       continue;
-               dev_dbg(dev, "disabling regulator %u\n", i);
--              /* we cannot use pcf50633_onoff_set() because we're
--               * already under the mutex */
--              tmp = __reg_read(pcf, regulator_registers[i]+1);
--              tmp &= 0xfe;
--              __reg_write(pcf, regulator_registers[i]+1, tmp);
-+
-+              /* we can save ourselves the read part of a read-modify-write
-+               * here because we captured all these already
-+               */
-+              if (i < 4)
-+                      tmp = pcf->standby_regs.misc[i * 4 + 1];
-+              else
-+                      tmp = pcf->standby_regs.ldo[(i - 4) * 2 + 1];
-+
-+              __reg_write(pcf, regulator_registers[i] + 1, tmp & 0xfe);
-       }
-       /* turn off the backlight */
-@@ -2276,11 +2282,14 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       /* set interrupt masks so only those sources we want to wake
-        * us are able to
-        */
--      __reg_write(pcf, PCF50633_REG_INT1M, ~pcf->pdata->resumers[0]);
--      __reg_write(pcf, PCF50633_REG_INT2M, ~pcf->pdata->resumers[1]);
--      __reg_write(pcf, PCF50633_REG_INT3M, ~pcf->pdata->resumers[2]);
--      __reg_write(pcf, PCF50633_REG_INT4M, ~pcf->pdata->resumers[3]);
--      __reg_write(pcf, PCF50633_REG_INT5M, ~pcf->pdata->resumers[4]);
-+      for (i = 0; i < 5; i++)
-+              res[i] = ~pcf->pdata->resumers[i];
-+
-+      ret = i2c_smbus_write_i2c_block_data(&pcf->client,
-+                                           PCF50633_REG_INT1M,
-+                                           5, &res[0]);
-+      if (ret)
-+              dev_err(dev, "Failed to set wake masks :-( %d\n", ret);
-       pcf->have_been_suspended = 1;
-@@ -2312,9 +2321,12 @@ EXPORT_SYMBOL_GPL(pcf50633_ready);
- void pcf50633_backlight_resume(struct pcf50633_data *pcf)
- {
-       /* we force the backlight on in fact */
--      __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.ledout);
--      __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.ledena | 0x01);
--      __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.leddim);
-+      __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.misc[
-+                                 PCF50633_REG_LEDOUT - PCF50633_REG_AUTOOUT]);
-+      __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.misc[
-+                             PCF50633_REG_LEDENA - PCF50633_REG_AUTOOUT] | 1);
-+      __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.misc[
-+                                 PCF50633_REG_LEDDIM - PCF50633_REG_AUTOOUT]);
- }
- EXPORT_SYMBOL_GPL(pcf50633_backlight_resume);
-@@ -2324,7 +2336,10 @@ static int pcf50633_resume(struct device *dev)
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-       int ret;
-+      u8 res[5];
-+      dev_info(dev, "pcf50633_resume suspended on entry = %d\n",
-+                                                    pcf->have_been_suspended);
-       mutex_lock(&pcf->lock);
-       pcf->have_been_suspended = 2; /* resuming */
-@@ -2332,14 +2347,14 @@ static int pcf50633_resume(struct device *dev)
-       /* these guys get reset while pcf50633 is suspend state, refresh */
-       __reg_write(pcf, PCF50633_REG_OOCTIM2, pcf->standby_regs.ooctim2);
--      __reg_write(pcf, PCF50633_REG_AUTOOUT, pcf->standby_regs.autoout);
--      __reg_write(pcf, PCF50633_REG_AUTOMXC, pcf->standby_regs.automxc);
--      __reg_write(pcf, PCF50633_REG_DOWN1OUT, pcf->standby_regs.down1out);
--      __reg_write(pcf, PCF50633_REG_DOWN1MXC, pcf->standby_regs.down1mxc);
--      __reg_write(pcf, PCF50633_REG_DOWN2OUT, pcf->standby_regs.down2out);
--      __reg_write(pcf, PCF50633_REG_DOWN2ENA, pcf->standby_regs.down2ena);
--      __reg_write(pcf, PCF50633_REG_MEMLDOOUT, pcf->standby_regs.memldoout);
--      __reg_write(pcf, PCF50633_REG_MEMLDOENA, pcf->standby_regs.memldoena);
-+
-+      /* regulator voltages and enable states */
-+      ret = i2c_smbus_write_i2c_block_data(&pcf->client,
-+                                           PCF50633_REG_AUTOOUT,
-+                                           sizeof(pcf->standby_regs.misc) - 4,
-+                                           &pcf->standby_regs.misc[0]);
-+      if (ret)
-+              dev_err(dev, "Failed to restore misc :-( %d\n", ret);
-       /* platform can choose to defer backlight bringup */
-       if (!pcf->pdata->defer_resume_backlight)
-@@ -2347,14 +2362,22 @@ static int pcf50633_resume(struct device *dev)
-       /* regulator voltages and enable states */
-       ret = i2c_smbus_write_i2c_block_data(&pcf->client,
--                                          PCF50633_REG_LDO1OUT, 14,
--                                          &pcf->standby_regs.ldo[0][0]);
-+                                           PCF50633_REG_LDO1OUT,
-+                                           sizeof(pcf->standby_regs.ldo),
-+                                           &pcf->standby_regs.ldo[0]);
-       if (ret)
-               dev_err(dev, "Failed to restore LDOs :-( %d\n", ret);
--      mutex_unlock(&pcf->lock);
-+      memset(res, 0, sizeof(res));
-+      ret = i2c_smbus_write_i2c_block_data(&pcf->client,
-+                                           PCF50633_REG_INT1M,
-+                                           5, &res[0]);
-+      if (ret)
-+              dev_err(dev, "Failed to set int masks :-( %d\n", ret);
--      pcf50633_irq(pcf->irq, pcf);
-+      pcf->have_been_suspended = 3; /* resume completed */
-+
-+      mutex_unlock(&pcf->lock);
-       callback_all_resume_dependencies(&pcf->resume_dependency);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1188-fix-pcf50633-usb-curlim-workqueue-migration.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1188-fix-pcf50633-usb-curlim-workqueue-migration.patch.patch
deleted file mode 100644 (file)
index 72acf66..0000000
+++ /dev/null
@@ -1,227 +0,0 @@
-From 553cc686ad357fc169a95733c51f7ae3466bb248 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:40:21 +0100
-Subject: [PATCH] fix-pcf50633-usb-curlim-workqueue-migration.patch
-
-pcf50633 needs to take responsibility for managing current limit
-changes asycnhrnously, ie, from USB stack enumeration.  It's a feature of
-pcf50633 not mach-gta02.c, and we can do better with taking care about
-keeping it from firing at a bad time in there too.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   23 +--------
- drivers/i2c/chips/pcf50633.c       |   99 +++++++++++++++++++++++++++++++++++-
- include/linux/pcf50633.h           |    5 ++
- 3 files changed, 104 insertions(+), 23 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 64d275d..accdbc5 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -813,29 +813,11 @@ static void gta02_udc_command(enum s3c2410_udc_cmd_e cmd)
-       }
- }
--/* use a work queue, since I2C API inherently schedules
-- * and we get called in hardirq context from UDC driver */
--
--struct vbus_draw {
--      struct work_struct work;
--      int ma;
--};
--static struct vbus_draw gta02_udc_vbus_drawer;
--
--static void __gta02_udc_vbus_draw(struct work_struct *work)
--{
--      if (!pcf50633_global) {
--              printk(KERN_ERR  "pcf50633 not initialized yet, can't change "
--                     "vbus_draw\n");
--              return;
--      }
--      pcf50633_usb_curlim_set(pcf50633_global, gta02_udc_vbus_drawer.ma);
--}
-+/* get PMU to set USB current limit accordingly */
- static void gta02_udc_vbus_draw(unsigned int ma)
- {
--      gta02_udc_vbus_drawer.ma = ma;
--      schedule_work(&gta02_udc_vbus_drawer.work);
-+      pcf50633_notify_usb_current_limit_change(pcf50633_global, ma);
- }
- static struct s3c2410_udc_mach_info gta02_udc_cfg = {
-@@ -1478,7 +1460,6 @@ static void __init gta02_machine_init(void)
-       s3c2410_gpio_setpin(S3C2410_GPD13, 1);
-       s3c2410_gpio_cfgpin(S3C2410_GPD13, S3C2410_GPIO_OUTPUT);
--      INIT_WORK(&gta02_udc_vbus_drawer.work, __gta02_udc_vbus_draw);
-       s3c24xx_udc_set_platdata(&gta02_udc_cfg);
-       set_s3c2410ts_info(&gta02_ts_cfg);
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 96857a3..e53bec0 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -125,6 +125,7 @@ struct pcf50633_data {
-       int have_been_suspended;
-       int usb_removal_count;
-       unsigned char pcfirq_resume[5];
-+      int probe_completed;
-       /* if he pulls battery while charging, we notice that and correctly
-        * report that the charger is idle.  But there is no interrupt that
-@@ -138,6 +139,12 @@ struct pcf50633_data {
-       int usb_removal_count_nobat;
-       int jiffies_last_bat_ins;
-+      /* current limit notification handler stuff */
-+      struct mutex working_lock_usb_curlimit;
-+      struct work_struct work_usb_curlimit;
-+      int pending_curlimit;
-+      int usb_removal_count_usb_curlimit;
-+
-       int last_curlim_set;
-       int coldplug_done; /* cleared by probe, set by first work service */
-@@ -603,6 +610,92 @@ static void add_request_to_adc_queue(struct pcf50633_data *pcf,
-               trigger_next_adc_job_if_any(pcf);
- }
-+/*
-+ * we get run to handle servicing the async notification from USB stack that
-+ * we got enumerated and allowed to draw a particular amount of current
-+ */
-+
-+static void pcf50633_work_usbcurlim(struct work_struct *work)
-+{
-+      struct pcf50633_data *pcf =
-+                  container_of(work, struct pcf50633_data, work_usb_curlimit);
-+
-+      mutex_lock(&pcf->working_lock_usb_curlimit);
-+
-+      dev_info(&pcf->client.dev, "pcf50633_work_usbcurlim\n");
-+
-+      if (!pcf->probe_completed)
-+              goto reschedule;
-+
-+      /* we got a notification from USB stack before we completed resume...
-+       * that can only make trouble, reschedule for a retry
-+       */
-+      if (pcf->have_been_suspended && (pcf->have_been_suspended < 3))
-+              goto reschedule;
-+
-+      /*
-+       * did he pull USB before we managed to set the limit?
-+       */
-+      if (pcf->usb_removal_count_usb_curlimit != pcf->usb_removal_count)
-+              goto bail;
-+
-+      /* OK let's set the requested limit and finish */
-+
-+      dev_info(&pcf->client.dev, "pcf50633_work_usbcurlim setting %dmA\n",
-+                                                       pcf->pending_curlimit);
-+      pcf50633_usb_curlim_set(pcf, pcf->pending_curlimit);
-+
-+bail:
-+      mutex_unlock(&pcf->working_lock_usb_curlimit);
-+      return;
-+
-+reschedule:
-+      dev_info(&pcf->client.dev, "pcf50633_work_usbcurlim rescheduling\n");
-+      if (!schedule_work(&pcf->work_usb_curlimit))
-+              dev_err(&pcf->client.dev, "work item may be lost\n");
-+
-+      mutex_unlock(&pcf->working_lock_usb_curlimit);
-+      /* don't spew, delaying whatever else is happening */
-+      msleep(1);
-+}
-+
-+
-+/* this is an export to allow machine to set USB current limit according to
-+ * notifications of USB stack about enumeration state.  We spawn a work
-+ * function to handle the actual setting, because suspend / resume and such
-+ * can be in a bad state since this gets called externally asychronous to
-+ * anything else going on in pcf50633.
-+ */
-+
-+int pcf50633_notify_usb_current_limit_change(struct pcf50633_data *pcf,
-+                                                              unsigned int ma)
-+{
-+      /* can happen if he calls with pcf50633_global before probe
-+       * have to bail with error since we can't even schedule the work
-+       */
-+      if (!pcf) {
-+              dev_err(&pcf->client.dev,
-+                      "pcf50633_notify_usb_current_limit_change "
-+                      "called with NULL pcf\n");
-+              return -EBUSY;
-+      }
-+
-+      dev_info(&pcf->client.dev,
-+               "pcf50633_notify_usb_current_limit_change %dmA\n", ma);
-+
-+      /* prepare to detect USB power removal before we complete */
-+      pcf->usb_removal_count_usb_curlimit = pcf->usb_removal_count;
-+
-+      pcf->pending_curlimit = ma;
-+
-+      if (!schedule_work(&pcf->work_usb_curlimit))
-+              dev_err(&pcf->client.dev, "work item may be lost\n");
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_notify_usb_current_limit_change);
-+
-+
- /* we are run when we see a NOBAT situation, because there is no interrupt
-  * source in pcf50633 that triggers on resuming charging.  It watches to see
-  * if charging resumes, it reassesses the charging source if it does.  If the
-@@ -1967,8 +2060,10 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-       mutex_init(&data->lock);
-       mutex_init(&data->working_lock);
-       mutex_init(&data->working_lock_nobat);
-+      mutex_init(&data->working_lock_usb_curlimit);
-       INIT_WORK(&data->work, pcf50633_work);
-       INIT_WORK(&data->work_nobat, pcf50633_work_nobat);
-+      INIT_WORK(&data->work_usb_curlimit, pcf50633_work_usbcurlim);
-       data->irq = irq;
-       data->working = 0;
-       data->onkey_seconds = -1;
-@@ -2068,15 +2163,15 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-               backlight_update_status(data->backlight);
-       }
-+      data->probe_completed = 1;
-       if (machine_is_neo1973_gta02()) {
-               gta01_pm_gps_dev.dev.parent = &new_client->dev;
-               gta01_pm_bt_dev.dev.parent = &new_client->dev;
-               platform_device_register(&gta01_pm_bt_dev);
-               platform_device_register(&gta01_pm_gps_dev);
--      } else {
-+      } else
-               apm_get_power_status = pcf50633_get_power_status;
--      }
-       return 0;
- exit_rtc:
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index 0522d92..fa1c7e8 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -129,6 +129,11 @@ extern void
- pcf50633_register_resume_dependency(struct pcf50633_data *pcf,
-                                       struct resume_dependency *dep);
-+extern int
-+pcf50633_notify_usb_current_limit_change(struct pcf50633_data *pcf,
-+                                                             unsigned int ma);
-+
-+
- /* 0 = initialized and resumed and ready to roll, !=0 = either not
-  * initialized or not resumed yet
-  */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1189-change-lcm-keep-power-faster-resume.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1189-change-lcm-keep-power-faster-resume.patch.patch
deleted file mode 100644 (file)
index ef648f2..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-From 897135bb5ce881419ee6e7c97875293b3e74330c Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:40:28 +0100
-Subject: [PATCH] change-lcm-keep-power-faster-resume.patch
-
-The LCM spins for 100ms during resume for not much reason.  Leave it powered
-(it is meant to pull uA when suspended) and get nice fast resume to video.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |    1 +
- drivers/video/display/jbt6k74.c    |   24 ++++--------------------
- 2 files changed, 5 insertions(+), 20 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index accdbc5..d5841d7 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -553,6 +553,7 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-               },
-               [PCF50633_REGULATOR_LDO6] = {
-                       .name           = "user1",
-+                      .flags = PMU_VRAIL_F_SUSPEND_ON,
-                       .voltage        = {
-                               .init   = 0,
-                               .max    = 3300,
-diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c
-index 7cc00ad..6fa1fe7 100644
---- a/drivers/video/display/jbt6k74.c
-+++ b/drivers/video/display/jbt6k74.c
-@@ -628,7 +628,7 @@ static int jbt_suspend(struct spi_device *spi, pm_message_t state)
-       struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-       struct jbt6k74_platform_data *jbt6k74_pdata = spi->dev.platform_data;
--      /* platform needs to register resume dependencies here */
-+      /* platform can register resume dependencies here, if any */
-       if (jbt6k74_pdata->suspending)
-               (jbt6k74_pdata->suspending)(0, spi);
-@@ -638,7 +638,7 @@ static int jbt_suspend(struct spi_device *spi, pm_message_t state)
-       jbt->have_resumed = 0;
--      (jbt6k74_pdata->reset)(0, 0);
-+/*    (jbt6k74_pdata->reset)(0, 0); */
-       return 0;
- }
-@@ -648,31 +648,17 @@ int jbt6k74_resume(struct spi_device *spi)
-       struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-       struct jbt6k74_platform_data *jbt6k74_pdata = spi->dev.platform_data;
--      /* if we still wait on dependencies, exit because we will get called
--       * again.  This guy will get called once by core resume action, and
--       * should be set as resume_dependency callback for any dependencies
--       * set by platform code.
--       */
--
-       if (jbt6k74_pdata->all_dependencies_resumed)
-               if (!(jbt6k74_pdata->all_dependencies_resumed)(0))
-                       return 0;
-       /* we can get called twice with all dependencies resumed if our core
--       * resume callback is last of all.  Protect against going twice
-+       * resume callback is last of all.  Protect against doing anything twice
-        */
-       if (jbt->have_resumed)
-               return 0;
--      jbt->have_resumed = 1;
--
--      /* OK we are sure all devices we depend on for operation are up now */
--
--      /* even this needs glamo up on GTA02 :-/ */
--      (jbt6k74_pdata->reset)(0, 1);
--
--      jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);
--      msleep(100);
-+      jbt->have_resumed |= 1;
-       switch (jbt->last_state) {
-       case JBT_STATE_QVGA_NORMAL:
-@@ -684,8 +670,6 @@ int jbt6k74_resume(struct spi_device *spi)
-       }
-       jbt6k74_display_onoff(jbt, 1);
--      /* this gives the platform a chance to bring up backlight now */
--
-       if (jbt6k74_pdata->resuming)
-               (jbt6k74_pdata->resuming)(0);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1190-fix-gta02-mach-remove-gta01-lcd-reset.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1190-fix-gta02-mach-remove-gta01-lcd-reset.patch.patch
deleted file mode 100644 (file)
index ff6208a..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From 913b141d09400c05fa4a6e69f325a6504ce1fe40 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:40:36 +0100
-Subject: [PATCH] fix-gta02-mach-remove-gta01-lcd-reset.patch
- Signed-off-by: Andy Green <andy@openmoko.com>
-
----
- arch/arm/mach-s3c2440/mach-gta02.c |    4 ----
- 1 files changed, 0 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index d5841d7..654dc8f 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1518,10 +1518,6 @@ static void __init gta02_machine_init(void)
- #endif
-       s3c2410_pm_init();
--      /* Set LCD_RESET / XRES to high */
--      s3c2410_gpio_setpin(GTA01_GPIO_LCD_RESET, 1);
--      s3c2410_gpio_cfgpin(GTA01_GPIO_LCD_RESET, S3C2410_GPIO_OUTPUT);
--
-       /* Make sure the modem can wake us up */
-       set_irq_type(GTA02_IRQ_MODEM, IRQT_RISING);
-       rc = request_irq(GTA02_IRQ_MODEM, gta02_modem_irq, IRQF_DISABLED,
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1191-add-remote-install-sdcard-script.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1191-add-remote-install-sdcard-script.patch.patch
deleted file mode 100644 (file)
index e7f39a4..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From 5007c46ae31856ddac45e0e59bb54cd37c51fe78 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:40:43 +0100
-Subject: [PATCH] add-remote-install-sdcard-script.patch
-
-If you boot from SDCARD, this helper script for the build host
-mounts SD card part 1, copies the new uImage.bin, umounts it and
-then remounts SD card part 2 as ro, before doing a reboot all
-in one step.  Read the instructions inside the script for adding
-your public key to the GTAxx rootfs for really really simple and
-nice automatic update and reboot action.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- remote_install_sdcard |   20 ++++++++++++++++++++
- 1 files changed, 20 insertions(+), 0 deletions(-)
- create mode 100755 remote_install_sdcard
-
-diff --git a/remote_install_sdcard b/remote_install_sdcard
-new file mode 100755
-index 0000000..c84b6ae
---- /dev/null
-+++ b/remote_install_sdcard
-@@ -0,0 +1,20 @@
-+#!/bin/sh
-+
-+# automatic kernel updater and reboot - Andy Green <andy@openmoko.com>
-+
-+GTA_DEVICE_IP=192.168.0.202
-+GTA_MOUNTPOINT=/mnt
-+
-+# you should set up key-based auth on dropbear if you want
-+# to play this game.
-+#
-+# 1) mkdir /home/root/.ssh
-+# 2) chown root:root / /home /home/root
-+# 3) chmod 700 /home/root /home/root/.ssh
-+# 4) copy your id_*.pub into /home/root/.ssh/authorized_keys
-+# 5) chmod 600 /home/root/.ssh/*
-+
-+ssh root@$GTA_DEVICE_IP "mount /dev/mmcblk0p1 $GTA_MOUNTPOINT"
-+scp uImage.bin root@$GTA_DEVICE_IP:$GTA_MOUNTPOINT
-+ssh root@$GTA_DEVICE_IP "umount $GTA_MOUNTPOINT ; mount /dev/mmcblk0p2 / -oremount,ro ; reboot -if &"
-+
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1192-fix-pcf50633-require-resume-level-3-for-irq-work.pat.patch b/target/linux/s3c24xx/patches-2.6.24/1192-fix-pcf50633-require-resume-level-3-for-irq-work.pat.patch
deleted file mode 100644 (file)
index 537bcc4..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2d0f061cbf1ae256c9c91ee45bc4d09c2a8b1cdf Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:40:51 +0100
-Subject: [PATCH] fix-pcf50633-require-resume-level-3-for-irq-work.patch
- Signed-off-by: Andy Green <andy@openmoko.com>
-
----
- drivers/i2c/chips/pcf50633.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index e53bec0..6e50ae8 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -763,7 +763,7 @@ static void pcf50633_work(struct work_struct *work)
-        * completed.
-        */
--      if (pcf->have_been_suspended && (pcf->have_been_suspended < 2)) {
-+      if (pcf->have_been_suspended && (pcf->have_been_suspended < 3)) {
-               dev_info(&pcf->client.dev, "rescheduling,  suspended = %d\n",
-                                          pcf->have_been_suspended);
-               goto reschedule;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1193-fix-pcf50633-add-back-gratuitous-isr-work-call-in-re.patch b/target/linux/s3c24xx/patches-2.6.24/1193-fix-pcf50633-add-back-gratuitous-isr-work-call-in-re.patch
deleted file mode 100644 (file)
index d8af830..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From b6aa20d6e44fccefba7ca933d11befba3611a68a Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:40:58 +0100
-Subject: [PATCH] fix-pcf50633-add-back-gratuitous-isr-work-call-in-resume.patch
-
-Sean McNeil reports that he doesn't get pcf50633 interrupts any
-more after resume.  This adds back the call to ISR work in
-the resume, removal of which is probably to do with it.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |   10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 6e50ae8..037ae04 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -2474,6 +2474,16 @@ static int pcf50633_resume(struct device *dev)
-       mutex_unlock(&pcf->lock);
-+      /* gratuitous call to PCF work function, in the case that the PCF
-+       * interrupt edge was missed during resume, this forces the pending
-+       * register clear and lifts the interrupt back high again.  In the
-+       * case nothing is waiting for service, no harm done.
-+       */
-+
-+      get_device(&pcf->client.dev);
-+      if (!schedule_work(&pcf->work) && !pcf->working)
-+              dev_err(&pcf->client.dev, "resume work item may be lost\n");
-+
-       callback_all_resume_dependencies(&pcf->resume_dependency);
-       return 0;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1194-cosmetic-checkpatch-complaints.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1194-cosmetic-checkpatch-complaints.patch.patch
deleted file mode 100644 (file)
index 81e27ef..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-From 22669f5d3422bca55eb247759d570306c1d6f1ae Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:41:07 +0100
-Subject: [PATCH] cosmetic-checkpatch-complaints.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c   |    2 +-
- drivers/mfd/glamo/glamo-core.c |    2 +-
- drivers/mfd/glamo/glamo-core.h |    3 ++-
- include/linux/glamofb.h        |    3 ++-
- 4 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 037ae04..2f144bc 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -778,7 +778,7 @@ static void pcf50633_work(struct work_struct *work)
-       if (ret != 5) {
-               dev_info(&pcf->client.dev,
-                        "Oh crap PMU IRQ register read failed -- "
--                       "retrying later %d\n", ret);
-+                       "retrying later %d\n", ret);
-               /*
-                * it shouldn't fail, we no longer attempt to use I2C while
-                * it can be suspended.  But we don't have much option but to
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index 608721e..2a02f9c 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -271,7 +271,7 @@ struct glamo_mci_pdata glamo_mci_def_pdata = {
-       .ocr_avail              = MMC_VDD_32_33,
-       .glamo_irq_is_wired     = NULL, /* filled in from MFD platform data */
-       .mci_suspending = NULL, /* filled in from MFD platform data */
--      .mci_all_dependencies_resumed = NULL, /* filled in from MFD platform data */
-+      .mci_all_dependencies_resumed = NULL, /* filled in from MFD plat data */
- };
- EXPORT_SYMBOL_GPL(glamo_mci_def_pdata);
-diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h
-index b1531b3..82b95f5 100644
---- a/drivers/mfd/glamo/glamo-core.h
-+++ b/drivers/mfd/glamo/glamo-core.h
-@@ -72,7 +72,8 @@ struct glamo_mci_pdata {
-                                    unsigned short vdd);
-       int             (*glamo_irq_is_wired)(void);
-       void            (*mci_suspending)(struct platform_device *dev);
--      int             (*mci_all_dependencies_resumed)(struct platform_device *dev);
-+      int             (*mci_all_dependencies_resumed)(struct platform_device
-+                                                                        *dev);
- };
-diff --git a/include/linux/glamofb.h b/include/linux/glamofb.h
-index bb1a398..efd315b 100644
---- a/include/linux/glamofb.h
-+++ b/include/linux/glamofb.h
-@@ -33,7 +33,8 @@ struct glamofb_platform_data {
-                                    unsigned short vdd);
-       int             (*glamo_irq_is_wired)(void);
-       void            (*mci_suspending)(struct platform_device *dev);
--      int             (*mci_all_dependencies_resumed)(struct platform_device *dev);
-+      int             (*mci_all_dependencies_resumed)(struct platform_device
-+                                                                        *dev);
- };
- int glamofb_cmd_mode(struct glamofb_handle *gfb, int on);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1195-fix-pcf50633-kill-white-splash-of-death-on-suspend.p.patch b/target/linux/s3c24xx/patches-2.6.24/1195-fix-pcf50633-kill-white-splash-of-death-on-suspend.p.patch
deleted file mode 100644 (file)
index 9b66ef1..0000000
+++ /dev/null
@@ -1,263 +0,0 @@
-From 358429b39b6801f4856e7c80d2c58ac7be4bd0bc Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:41:14 +0100
-Subject: [PATCH] fix-pcf50633-kill-white-splash-of-death-on-suspend.patch
-
-mach-gta02 meddles with the regulator platform struct after
-it is defined, leading to LCM power getting lost in suspend
-despite I set it to be left up.  Fixing this finally removes
-the incredibly stubborn white LCM on suspend "flash".
-
-This is also going to be implicated in Sean McNeil's
-experience of monochromatic LCM after resume, which was
-previously attacked by resetting and re-initing the LCM
-from scratch.
-
-In addition, I realized that we take down core_1v3 in
-pcf50633 suspend action, this is happening near the
-start of suspend, so we are in a meta-race to finish
-suspend in a controlled way before the caps on core_1v3
-run out (I only saw 23.3uF total).  If it's true, this
-is where the weirdo sensitivity to timing during
-suspend is coming from.
-
-Therefore in this patch we also remove sleeps and
-dev_info() etc (which have to flush on serial console)
-from the pc50633 isr workqueue if we are in pcf50633
-driver suspend state 1, ie, suspending... because we
-don't have time for it.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   43 ++++++++++++++++++++++++++----------
- drivers/i2c/chips/pcf50633.c       |   29 ++++++++++++-----------
- drivers/mfd/glamo/glamo-core.c     |    2 +
- drivers/video/display/jbt6k74.c    |    1 +
- 4 files changed, 49 insertions(+), 26 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 654dc8f..0bacafa 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -485,6 +485,9 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-               [1] = PCF50633_INT2_ONKEYF,
-               [2] = PCF50633_INT3_ONKEY1S
-       },
-+      /* warning: these get rewritten during machine init below
-+       * depending on pcb variant
-+       */
-       .rails  = {
-               [PCF50633_REGULATOR_AUTO] = {
-                       .name           = "io_3v3",
-@@ -496,6 +499,12 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-               },
-               [PCF50633_REGULATOR_DOWN1] = {
-                       .name           = "core_1v3",
-+                      /* Wow, when we are going into suspend, after pcf50633
-+                       * runs its suspend (which happens real early since it
-+                       * is an i2c device) we are running out of the 22uF cap
-+                       * on core_1v3 rail !!!!
-+                       */
-+                      .flags          = PMU_VRAIL_F_SUSPEND_ON,
-                       .voltage        = {
-                               .init   = 1300,
-                               .max    = 1600,
-@@ -503,6 +512,7 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-               },
-               [PCF50633_REGULATOR_DOWN2] = {
-                       .name           = "core_1v8",
-+                      .flags          = PMU_VRAIL_F_SUSPEND_ON,
-                       .voltage        = {
-                               .init   = 1800,
-                               .max    = 1800,
-@@ -516,8 +526,7 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-                       },
-               },
-               [PCF50633_REGULATOR_LDO1] = {
--                      .name           = "stby_1v3",
--                      .flags          = PMU_VRAIL_F_SUSPEND_ON,
-+                      .name           = "gsensor_3v3",
-                       .voltage        = {
-                               .init   = 1300,
-                               .max    = 1330,
-@@ -531,7 +540,7 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-                       },
-               },
-               [PCF50633_REGULATOR_LDO3] = {
--                      .name           = "lcm_3v",
-+                      .name           = "unused3",
-                       .voltage        = {
-                               .init   = 3000,
-                               .max    = 3000,
-@@ -545,20 +554,28 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-                       },
-               },
-               [PCF50633_REGULATOR_LDO5] = {
--                      .name           = "gl_1v5",
-+                      .name           = "rf3v",
-                       .voltage        = {
-                               .init   = 1500,
-                               .max    = 1500,
-                       },
-               },
-               [PCF50633_REGULATOR_LDO6] = {
--                      .name           = "user1",
-+                      .name           = "lcm_3v",
-                       .flags = PMU_VRAIL_F_SUSPEND_ON,
-                       .voltage        = {
-                               .init   = 0,
-                               .max    = 3300,
-                       },
-               },
-+              [PCF50633_REGULATOR_MEMLDO] = {
-+                      .name           = "memldo",
-+                      .flags = PMU_VRAIL_F_SUSPEND_ON,
-+                      .voltage        = {
-+                              .init   = 1800,
-+                              .max    = 1800,
-+                      },
-+              },
-       },
-       .defer_resume_backlight = 1,
- };
-@@ -611,13 +628,15 @@ static void mangle_pmu_pdata_by_system_rev(void)
-                                                               .max = 3000,
-                                                       }
-                                               });
--              gta02_pcf_pdata.rails[PCF50633_REGULATOR_LDO6] = ((struct pmu_voltage_rail) {
--                                                      .name = "lcm_3v",
--                                                      .voltage = {
--                                                              .init = 3000,
--                                                              .max = 3000,
--                                                      }
--                                              });
-+              gta02_pcf_pdata.rails[PCF50633_REGULATOR_LDO6] =
-+                                      ((struct pmu_voltage_rail) {
-+                                              .name = "lcm_3v",
-+                                              .flags = PMU_VRAIL_F_SUSPEND_ON,
-+                                              .voltage = {
-+                                                      .init = 3000,
-+                                                      .max = 3000,
-+                                              }
-+                                      });
-               break;
-       default:
-               break;
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 2f144bc..2e5981d 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -750,9 +750,6 @@ static void pcf50633_work(struct work_struct *work)
-       mutex_lock(&pcf->working_lock);
-       pcf->working = 1;
--      dev_info(&pcf->client.dev, "pcf50633_work called with suspended = %d\n",
--                                 pcf->have_been_suspended);
--
-       /*
-        * If we are inside suspend -> resume completion time we don't attempt
-        * service until we have fully resumed.  Although we could talk to the
-@@ -763,11 +760,8 @@ static void pcf50633_work(struct work_struct *work)
-        * completed.
-        */
--      if (pcf->have_been_suspended && (pcf->have_been_suspended < 3)) {
--              dev_info(&pcf->client.dev, "rescheduling,  suspended = %d\n",
--                                         pcf->have_been_suspended);
-+      if (pcf->have_been_suspended && (pcf->have_been_suspended < 3))
-               goto reschedule;
--      }
-       /*
-        * datasheet says we have to read the five IRQ
-@@ -1158,9 +1152,13 @@ static void pcf50633_work(struct work_struct *work)
- reschedule:
-       /* don't spew, delaying whatever else is happening */
--      msleep(100);
--
--      dev_info(&pcf->client.dev, "rescheduling interrupt service\n");
-+      /* EXCEPTION: if we are in the middle of suspending, we don't have
-+       * time to hang around since we may be turned off core 1V3 already
-+       */
-+      if (pcf->have_been_suspended != 1) {
-+              msleep(50);
-+              dev_info(&pcf->client.dev, "rescheduling interrupt service\n");
-+      }
-       if (!schedule_work(&pcf->work))
-               dev_err(&pcf->client.dev, "int service reschedule failed\n");
-@@ -2340,7 +2338,7 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-                                           PCF50633_REG_AUTOOUT,
-                                           sizeof(pcf->standby_regs.misc),
-                                           &pcf->standby_regs.misc[0]);
--      if (ret != 18)
-+      if (ret != sizeof(pcf->standby_regs.misc))
-               dev_err(dev, "Failed to save misc levels and enables :-(\n");
-       /* regulator voltages and enable states */
-@@ -2348,7 +2346,7 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-                                           PCF50633_REG_LDO1OUT,
-                                           sizeof(pcf->standby_regs.ldo),
-                                           &pcf->standby_regs.ldo[0]);
--      if (ret != 14)
-+      if (ret != sizeof(pcf->standby_regs.ldo))
-               dev_err(dev, "Failed to save LDO levels and enables :-(\n");
-       /* switch off power supplies that are not needed during suspend */
-@@ -2356,8 +2354,6 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-               if ((pcf->pdata->rails[i].flags & PMU_VRAIL_F_SUSPEND_ON))
-                       continue;
--              dev_dbg(dev, "disabling regulator %u\n", i);
--
-               /* we can save ourselves the read part of a read-modify-write
-                * here because we captured all these already
-                */
-@@ -2366,6 +2362,11 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-               else
-                       tmp = pcf->standby_regs.ldo[(i - 4) * 2 + 1];
-+              dev_info(dev, "disabling reg %s by setting ENA %d to 0x%02X\n",
-+                            pcf->pdata->rails[i].name,
-+                            regulator_registers[i] + 1, tmp & 0xfe);
-+
-+              /* associated enable is always +1 from OUT reg */
-               __reg_write(pcf, regulator_registers[i] + 1, tmp & 0xfe);
-       }
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index 2a02f9c..2412b7d 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -848,6 +848,7 @@ static void glamo_power(struct glamo_core *glamo,
-                                ARRAY_SIZE(glamo_resume_script), 0);
-               break;
-+
-       case GLAMO_POWER_STANDBY:
-               /* enable memory self-refresh */
-               __reg_set_bit_mask(glamo, GLAMO_REG_MEM_DRAM1,
-@@ -859,6 +860,7 @@ static void glamo_power(struct glamo_core *glamo,
-               __reg_set_bit_mask(glamo, GLAMO_REG_PLL_GEN3, 0x2000, 0xffff);
-               __reg_set_bit_mask(glamo, GLAMO_REG_DFT_GEN5, 0x0001, 0xffff);
-               break;
-+
-       case GLAMO_POWER_SUSPEND:
-               __reg_set_bit_mask(glamo, GLAMO_REG_MEM_DRAM2,
-                                  GLAMO_MEM_DRAM2_DEEP_PWRDOWN, 0xffff);
-diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c
-index 6fa1fe7..b406298 100644
---- a/drivers/video/display/jbt6k74.c
-+++ b/drivers/video/display/jbt6k74.c
-@@ -634,6 +634,7 @@ static int jbt_suspend(struct spi_device *spi, pm_message_t state)
-       /* Save mode for resume */
-       jbt->last_state = jbt->state;
-+
-       jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);
-       jbt->have_resumed = 0;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1196-fix-allow-core-1v3-to-go-down.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1196-fix-allow-core-1v3-to-go-down.patch.patch
deleted file mode 100644 (file)
index 763b920..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-From 56cb6e3d90e4fea9cefe133a7b0e2ce0f29ea379 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:41:22 +0100
-Subject: [PATCH] fix-allow-core-1v3-to-go-down.patch
-
-Whoops left it up in suspend
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 0bacafa..297b792 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -504,7 +504,6 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-                        * is an i2c device) we are running out of the 22uF cap
-                        * on core_1v3 rail !!!!
-                        */
--                      .flags          = PMU_VRAIL_F_SUSPEND_ON,
-                       .voltage        = {
-                               .init   = 1300,
-                               .max    = 1600,
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1197-debug-i2c-s3c2410-dump-stack-on-suspended-tranfer.pa.patch b/target/linux/s3c24xx/patches-2.6.24/1197-debug-i2c-s3c2410-dump-stack-on-suspended-tranfer.pa.patch
deleted file mode 100644 (file)
index 3e3c19b..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6588d2e1ca2092e37781cfa17aea741165e01f7e Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:41:30 +0100
-Subject: [PATCH] debug-i2c-s3c2410-dump-stack-on-suspended-tranfer.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/busses/i2c-s3c2410.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
-index bd69127..b56ab58 100644
---- a/drivers/i2c/busses/i2c-s3c2410.c
-+++ b/drivers/i2c/busses/i2c-s3c2410.c
-@@ -516,6 +516,7 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int
-               dev_err(i2c->dev,
-                   "Hey I am still asleep (suspended: %d), retry later\n",
-                   i2c->suspended);
-+              dump_stack();
-               ret = -EAGAIN;
-               goto out;
-       }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1198-fix-pcf50633-suspend-state-as-enum.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1198-fix-pcf50633-suspend-state-as-enum.patch.patch
deleted file mode 100644 (file)
index 9bae449..0000000
+++ /dev/null
@@ -1,197 +0,0 @@
-From dd7ff306b150c36950fa0f9dd718a1745a984d38 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:41:38 +0100
-Subject: [PATCH] fix-pcf50633-suspend-state-as-enum.patch
-
-Use an enum to define pcf50633 suspend / resume state.
-Add PCF50633_SS_RESUMING_BUT_NOT_US_YET to be the state
-early in resume: add platform driver resume function just
-to set this state so we can differentiate between early
-resume and late suspend.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |   73 ++++++++++++++++++++++++++++++++++--------
- 1 files changed, 59 insertions(+), 14 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 2e5981d..c014384 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -108,6 +108,16 @@ enum charger_type {
- #define MAX_ADC_FIFO_DEPTH 8
-+enum pcf50633_suspend_states {
-+      PCF50633_SS_RUNNING,
-+      PCF50633_SS_STARTING_SUSPEND,
-+      PCF50633_SS_COMPLETED_SUSPEND,
-+      PCF50633_SS_RESUMING_BUT_NOT_US_YET,
-+      PCF50633_SS_STARTING_RESUME,
-+      PCF50633_SS_COMPLETED_RESUME,
-+};
-+
-+
- struct pcf50633_data {
-       struct i2c_client client;
-       struct pcf50633_platform_data *pdata;
-@@ -122,9 +132,9 @@ struct pcf50633_data {
-       int allow_close;
-       int onkey_seconds;
-       int irq;
--      int have_been_suspended;
-+      enum pcf50633_suspend_states suspend_state;
-       int usb_removal_count;
--      unsigned char pcfirq_resume[5];
-+      u8 pcfirq_resume[5];
-       int probe_completed;
-       /* if he pulls battery while charging, we notice that and correctly
-@@ -191,7 +201,7 @@ static struct platform_device *pcf50633_pdev;
- static int __reg_write(struct pcf50633_data *pcf, u_int8_t reg, u_int8_t val)
- {
--      if (pcf->have_been_suspended == 1) {
-+      if (pcf->suspend_state == PCF50633_SS_COMPLETED_SUSPEND) {
-               dev_err(&pcf->client.dev, "__reg_write while suspended\n");
-               dump_stack();
-       }
-@@ -213,7 +223,7 @@ static int32_t __reg_read(struct pcf50633_data *pcf, u_int8_t reg)
- {
-       int32_t ret;
--      if (pcf->have_been_suspended == 1) {
-+      if (pcf->suspend_state == PCF50633_SS_COMPLETED_SUSPEND) {
-               dev_err(&pcf->client.dev, "__reg_read while suspended\n");
-               dump_stack();
-       }
-@@ -630,7 +640,8 @@ static void pcf50633_work_usbcurlim(struct work_struct *work)
-       /* we got a notification from USB stack before we completed resume...
-        * that can only make trouble, reschedule for a retry
-        */
--      if (pcf->have_been_suspended && (pcf->have_been_suspended < 3))
-+      if (pcf->suspend_state &&
-+                   (pcf->suspend_state < PCF50633_SS_COMPLETED_RESUME))
-               goto reschedule;
-       /*
-@@ -751,6 +762,21 @@ static void pcf50633_work(struct work_struct *work)
-       pcf->working = 1;
-       /*
-+       * if we are presently suspending, we are not in a position to deal
-+       * with pcf50633 interrupts at all.
-+       *
-+       * Because we didn't clear the int pending registers, there will be
-+       * no edge / interrupt waiting for us when we wake.  But it is OK
-+       * because at the end of our resume, we call this workqueue function
-+       * gratuitously, clearing the pending register and re-enabling
-+       * servicing this interrupt.
-+       */
-+
-+      if ((pcf->suspend_state == PCF50633_SS_STARTING_SUSPEND) ||
-+          (pcf->suspend_state == PCF50633_SS_COMPLETED_SUSPEND))
-+              goto bail;
-+
-+      /*
-        * If we are inside suspend -> resume completion time we don't attempt
-        * service until we have fully resumed.  Although we could talk to the
-        * device as soon as I2C is up, the regs in the device which we might
-@@ -1155,8 +1181,9 @@ reschedule:
-       /* EXCEPTION: if we are in the middle of suspending, we don't have
-        * time to hang around since we may be turned off core 1V3 already
-        */
--      if (pcf->have_been_suspended != 1) {
--              msleep(50);
-+      if ((pcf->suspend_state != PCF50633_SS_STARTING_SUSPEND) &&
-+          (pcf->suspend_state != PCF50633_SS_COMPLETED_SUSPEND)) {
-+              msleep(10);
-               dev_info(&pcf->client.dev, "rescheduling interrupt service\n");
-       }
-       if (!schedule_work(&pcf->work))
-@@ -2322,8 +2349,9 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       /* we suspend once (!) as late as possible in the suspend sequencing */
--      if ((state.event != PM_EVENT_SUSPEND) || (pcf->have_been_suspended))
--              return 0;
-+      if ((state.event != PM_EVENT_SUSPEND) ||
-+          (pcf->suspend_state != PCF50633_SS_RUNNING))
-+              return -EBUSY;
-       /* The general idea is to power down all unused power supplies,
-        * and then mask all PCF50633 interrupt sources but EXTONR, ONKEYF
-@@ -2387,7 +2415,7 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       if (ret)
-               dev_err(dev, "Failed to set wake masks :-( %d\n", ret);
--      pcf->have_been_suspended = 1;
-+      pcf->suspend_state = PCF50633_SS_COMPLETED_SUSPEND;
-       mutex_unlock(&pcf->lock);
-@@ -2400,7 +2428,8 @@ int pcf50633_ready(struct pcf50633_data *pcf)
-       if (!pcf)
-               return -EACCES;
--      if (pcf->have_been_suspended && (pcf->have_been_suspended < 3))
-+      if ((pcf->suspend_state != PCF50633_SS_RUNNING) &&
-+          (pcf->suspend_state < PCF50633_SS_COMPLETED_RESUME))
-               return -EBUSY;
-       return 0;
-@@ -2435,10 +2464,10 @@ static int pcf50633_resume(struct device *dev)
-       u8 res[5];
-       dev_info(dev, "pcf50633_resume suspended on entry = %d\n",
--                                                    pcf->have_been_suspended);
-+                                               (int)pcf->suspend_state);
-       mutex_lock(&pcf->lock);
--      pcf->have_been_suspended = 2; /* resuming */
-+      pcf->suspend_state = PCF50633_SS_STARTING_RESUME;
-       /* these guys get reset while pcf50633 is suspend state, refresh */
-@@ -2471,7 +2500,7 @@ static int pcf50633_resume(struct device *dev)
-       if (ret)
-               dev_err(dev, "Failed to set int masks :-( %d\n", ret);
--      pcf->have_been_suspended = 3; /* resume completed */
-+      pcf->suspend_state = PCF50633_SS_COMPLETED_RESUME;
-       mutex_unlock(&pcf->lock);
-@@ -2505,6 +2534,21 @@ static struct i2c_driver pcf50633_driver = {
-       .detach_client  = pcf50633_detach_client,
- };
-+/* we have this purely to capture an early indication that we are coming out
-+ * of suspend, before our device resume got called; async interrupt service is
-+ * interested in this
-+ */
-+
-+static int pcf50633_plat_resume(struct platform_device *pdev)
-+{
-+      /* i2c_get_clientdata(to_i2c_client(&pdev->dev)) returns NULL at this
-+       * early resume time so we have to use pcf50633_global
-+       */
-+      pcf50633_global->suspend_state = PCF50633_SS_RESUMING_BUT_NOT_US_YET;
-+
-+      return 0;
-+}
-+
- /* platform driver, since i2c devices don't have platform_data */
- static int __init pcf50633_plat_probe(struct platform_device *pdev)
- {
-@@ -2526,6 +2570,7 @@ static int pcf50633_plat_remove(struct platform_device *pdev)
- static struct platform_driver pcf50633_plat_driver = {
-       .probe  = pcf50633_plat_probe,
-       .remove = pcf50633_plat_remove,
-+      .resume_early = pcf50633_plat_resume,
-       .driver = {
-               .owner  = THIS_MODULE,
-               .name   = "pcf50633",
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1199-fix-pcf50633-disable-irq-from-suspend-until-resume.p.patch b/target/linux/s3c24xx/patches-2.6.24/1199-fix-pcf50633-disable-irq-from-suspend-until-resume.p.patch
deleted file mode 100644 (file)
index a6ca94e..0000000
+++ /dev/null
@@ -1,236 +0,0 @@
-From eaa55efc0b559abebbcf2acea6ce267cea4c26f2 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:41:52 +0100
-Subject: [PATCH] fix-pcf50633-disable-irq-from-suspend-until-resume.patch
-
-Disable pcf interrupt (not for wake, just as interrupt) in
-suspend, re-enable it again just before we force-call the
-workqueue function at end of pcf resume, which leads to
-pcf interrupt source registers getting cleared so it can
-signal an interrupt normally again.
-
-This change ends the uncontrolled appearance of pcf interrupts
-during resume time which previously caused the work to attempt
-to use the I2C stuff before i2c host device had itself resumed.
-Now the isr work is only queued, and the isr work function called,
-definitively after pcf resume completes.
-
-In suspend time, the work function may have been queued some
-time before and be pending, and it could still show up at a
-bad time.  Therefore if the work function sees that it is
-coming since the start of pcf50633 suspend function, it
-aborts without attempting to read the pcf interrupt regs,
-leaving them for resume to take care of.
-
-USB current limit and no battery work functions are also made
-aware of suspend state and act accordingly.
-
-Lastly I noticed that in early resume, i2c_get_clientdata(&pcf->client)
-returns NULL, presumably because i2c device is still suspended.  This
-could easily make trouble for async events like interrupt work,
-since pcf pointer is the client data.  Disabling appearance of the
-work until after pcf50633 resume will also avoid that.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |   93 +++++++++++++++++++++++++++++-------------
- 1 files changed, 65 insertions(+), 28 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index c014384..120fdbc 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -632,6 +632,11 @@ static void pcf50633_work_usbcurlim(struct work_struct *work)
-       mutex_lock(&pcf->working_lock_usb_curlimit);
-+      /* just can't cope with it if we are suspending, don't reschedule */
-+      if ((pcf->suspend_state == PCF50633_SS_STARTING_SUSPEND) ||
-+          (pcf->suspend_state == PCF50633_SS_COMPLETED_SUSPEND))
-+              goto bail;
-+
-       dev_info(&pcf->client.dev, "pcf50633_work_usbcurlim\n");
-       if (!pcf->probe_completed)
-@@ -663,7 +668,8 @@ bail:
- reschedule:
-       dev_info(&pcf->client.dev, "pcf50633_work_usbcurlim rescheduling\n");
-       if (!schedule_work(&pcf->work_usb_curlimit))
--              dev_err(&pcf->client.dev, "work item may be lost\n");
-+              dev_err(&pcf->client.dev, "curlim reschedule work "
-+                                                          "already queued\n");
-       mutex_unlock(&pcf->working_lock_usb_curlimit);
-       /* don't spew, delaying whatever else is happening */
-@@ -700,7 +706,7 @@ int pcf50633_notify_usb_current_limit_change(struct pcf50633_data *pcf,
-       pcf->pending_curlimit = ma;
-       if (!schedule_work(&pcf->work_usb_curlimit))
--              dev_err(&pcf->client.dev, "work item may be lost\n");
-+              dev_err(&pcf->client.dev, "curlim work item already queued\n");
-       return 0;
- }
-@@ -727,6 +733,9 @@ static void pcf50633_work_nobat(struct work_struct *work)
-       while (1) {
-               msleep(1000);
-+              if (pcf->suspend_state != PCF50633_SS_RUNNING)
-+                      continue;
-+
-               /* there's a battery in there now? */
-               if (reg_read(pcf, PCF50633_REG_MBCS3) & 0x40) {
-@@ -761,6 +770,10 @@ static void pcf50633_work(struct work_struct *work)
-       mutex_lock(&pcf->working_lock);
-       pcf->working = 1;
-+      /* sanity */
-+      if (!&pcf->client.dev)
-+              goto bail;
-+
-       /*
-        * if we are presently suspending, we are not in a position to deal
-        * with pcf50633 interrupts at all.
-@@ -784,42 +797,55 @@ static void pcf50633_work(struct work_struct *work)
-        * reloaded with their pre-suspend states yet.  Therefore we will
-        * defer our service if we are called like that until our resume has
-        * completed.
-+       *
-+       * This shouldn't happen any more because we disable servicing this
-+       * interrupt in suspend and don't re-enable it until resume is
-+       * completed.
-        */
--      if (pcf->have_been_suspended && (pcf->have_been_suspended < 3))
-+      if (pcf->suspend_state &&
-+              (pcf->suspend_state != PCF50633_SS_COMPLETED_RESUME))
-+              goto reschedule;
-+
-+      /* this is the case early in resume! Sanity check! */
-+      if (i2c_get_clientdata(&pcf->client) == NULL)
-               goto reschedule;
-       /*
--       * datasheet says we have to read the five IRQ
--       * status regs in one transaction
--       */
--      ret = i2c_smbus_read_i2c_block_data(&pcf->client, PCF50633_REG_INT1, 5,
--                                          pcfirq);
--      if (ret != 5) {
-+      * datasheet says we have to read the five IRQ
-+      * status regs in one transaction
-+      */
-+      ret = i2c_smbus_read_i2c_block_data(&pcf->client,
-+                                              PCF50633_REG_INT1,
-+                                              sizeof(pcfirq),
-+                                              pcfirq);
-+      if (ret != sizeof(pcfirq)) {
-               dev_info(&pcf->client.dev,
--                       "Oh crap PMU IRQ register read failed -- "
--                       "retrying later %d\n", ret);
-+                      "Oh crap PMU IRQ register read failed -- "
-+                      "retrying later %d\n", ret);
-               /*
--               * it shouldn't fail, we no longer attempt to use I2C while
--               * it can be suspended.  But we don't have much option but to
--               * retry if if it ever did fail, because if we don't service
--               * the interrupt to clear it, we will never see another PMU
--               * interrupt edge.
-+               * it shouldn't fail, we no longer attempt to use
-+               * I2C while it can be suspended.  But we don't have
-+               * much option but to retry if if it ever did fail,
-+               * because if we don't service the interrupt to clear
-+               * it, we will never see another PMU interrupt edge.
-                */
-               goto reschedule;
-       }
--      /* hey did we just resume? */
--
--      if (pcf->have_been_suspended) {
--              /* resume is officially over now then */
--              pcf->have_been_suspended = 0;
-+      /* hey did we just resume? (because we don't get here unless we are
-+       * running normally or the first call after resumption)
-+       */
-+      if (pcf->suspend_state != PCF50633_SS_RUNNING) {
-               /*
--               * grab a copy of resume interrupt reasons
--               * from pcf50633 POV
--               */
-+              * grab a copy of resume interrupt reasons
-+              * from pcf50633 POV
-+              */
-               memcpy(pcf->pcfirq_resume, pcfirq, sizeof(pcf->pcfirq_resume));
-+
-+              /* pcf50633 resume is really really over now then */
-+              pcf->suspend_state = PCF50633_SS_RUNNING;
-       }
-       if (!pcf->coldplug_done) {
-@@ -1169,6 +1195,7 @@ static void pcf50633_work(struct work_struct *work)
-       DEBUGPC("\n");
-+bail:
-       pcf->working = 0;
-       input_sync(pcf->input_dev);
-       put_device(&pcf->client.dev);
-@@ -1202,7 +1229,7 @@ static irqreturn_t pcf50633_irq(int irq, void *_pcf)
-       get_device(&pcf->client.dev);
-       if (!schedule_work(&pcf->work) && !pcf->working)
--              dev_err(&pcf->client.dev, "work item may be lost\n");
-+              dev_err(&pcf->client.dev, "pcf irq work already queued\n");
-       return IRQ_HANDLED;
- }
-@@ -2310,7 +2337,7 @@ int pcf50633_report_resumers(struct pcf50633_data *pcf, char *buf)
-       char *end = buf;
-       int n;
--      for (n = 0; n < 40; n++)
-+      for (n = 0; n < ARRAY_SIZE(int_names); n++)
-               if (int_names[n]) {
-                       if (pcf->pcfirq_resume[n >> 3] & (1 >> (n & 7)))
-                               end += sprintf(end, "  * %s\n", int_names[n]);
-@@ -2359,6 +2386,15 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       mutex_lock(&pcf->lock);
-+      pcf->suspend_state = PCF50633_SS_STARTING_SUSPEND;
-+
-+      /* we are not going to service any further interrupts until we
-+       * resume.  If the IRQ workqueue is still pending in the background,
-+       * it will bail when it sees we set suspend state above
-+       */
-+
-+      disable_irq(pcf->irq);
-+
-       /* Save all registers that don't "survive" standby state */
-       pcf->standby_regs.ooctim2 = __reg_read(pcf, PCF50633_REG_OOCTIM2);
-@@ -2502,6 +2538,8 @@ static int pcf50633_resume(struct device *dev)
-       pcf->suspend_state = PCF50633_SS_COMPLETED_RESUME;
-+      enable_irq(pcf->irq);
-+
-       mutex_unlock(&pcf->lock);
-       /* gratuitous call to PCF work function, in the case that the PCF
-@@ -2511,8 +2549,7 @@ static int pcf50633_resume(struct device *dev)
-        */
-       get_device(&pcf->client.dev);
--      if (!schedule_work(&pcf->work) && !pcf->working)
--              dev_err(&pcf->client.dev, "resume work item may be lost\n");
-+      pcf50633_work(&pcf->work);
-       callback_all_resume_dependencies(&pcf->resume_dependency);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1200-debug-backtrace-not-choke-on-null-dev_blah.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1200-debug-backtrace-not-choke-on-null-dev_blah.patch.patch
deleted file mode 100644 (file)
index 6d83e19..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From 91edf710900c85d081f2f56ad23d85f65674d316 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:41:59 +0100
-Subject: [PATCH] debug-backtrace-not-choke-on-null-dev_blah.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/base/core.c |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/base/core.c b/drivers/base/core.c
-index 2683eac..49fdee2 100644
---- a/drivers/base/core.c
-+++ b/drivers/base/core.c
-@@ -42,6 +42,11 @@ int (*platform_notify_remove)(struct device * dev) = NULL;
-  */
- const char *dev_driver_string(struct device *dev)
- {
-+      if (!dev) {
-+              printk(KERN_ERR"Null dev to dev_driver_string\n");
-+              dump_stack();
-+              return "*NULL*";
-+      }
-       return dev->driver ? dev->driver->name :
-                       (dev->bus ? dev->bus->name :
-                       (dev->class ? dev->class->name : ""));
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1201-fix-pcf50633-really-defer-backlight-on-resume.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1201-fix-pcf50633-really-defer-backlight-on-resume.patch.patch
deleted file mode 100644 (file)
index fe67ee1..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From 0c734eb8a3a41ca9f9b452d0d1a7211de6c146dd Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:42:07 +0100
-Subject: [PATCH] fix-pcf50633-really-defer-backlight-on-resume.patch
-
-Backlight wasn't off by default on resume, so it was never really
-deferred (until LCM is initialized).  This fixes that and so removes
-the brief white screen between pcf50633 resume and LCM init.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |   23 +++++++++++++++++------
- 1 files changed, 17 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 120fdbc..875a5ee 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -2481,13 +2481,14 @@ EXPORT_SYMBOL_GPL(pcf50633_ready);
- void pcf50633_backlight_resume(struct pcf50633_data *pcf)
- {
-+      dev_info(&pcf->client.dev, "pcf50633_backlight_resume\n");
-+
-       /* we force the backlight on in fact */
--      __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.misc[
-+      reg_write(pcf, PCF50633_REG_LEDDIM, 1);
-+      reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.misc[
-                                  PCF50633_REG_LEDOUT - PCF50633_REG_AUTOOUT]);
--      __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.misc[
-+      reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.misc[
-                              PCF50633_REG_LEDENA - PCF50633_REG_AUTOOUT] | 1);
--      __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.misc[
--                                 PCF50633_REG_LEDDIM - PCF50633_REG_AUTOOUT]);
- }
- EXPORT_SYMBOL_GPL(pcf50633_backlight_resume);
-@@ -2498,6 +2499,7 @@ static int pcf50633_resume(struct device *dev)
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-       int ret;
-       u8 res[5];
-+      u8 misc[PCF50633_REG_LEDDIM - PCF50633_REG_AUTOOUT + 1];
-       dev_info(dev, "pcf50633_resume suspended on entry = %d\n",
-                                                (int)pcf->suspend_state);
-@@ -2509,11 +2511,20 @@ static int pcf50633_resume(struct device *dev)
-       __reg_write(pcf, PCF50633_REG_OOCTIM2, pcf->standby_regs.ooctim2);
-+      memcpy(misc, pcf->standby_regs.misc, sizeof(pcf->standby_regs.misc));
-+
-+      if (pcf->pdata->defer_resume_backlight) {
-+              misc[PCF50633_REG_LEDOUT - PCF50633_REG_AUTOOUT] = 1;
-+              misc[PCF50633_REG_LEDENA - PCF50633_REG_AUTOOUT] = 0x20;
-+              misc[PCF50633_REG_LEDCTL - PCF50633_REG_AUTOOUT] = 1;
-+              misc[PCF50633_REG_LEDDIM - PCF50633_REG_AUTOOUT] = 1;
-+      }
-+
-       /* regulator voltages and enable states */
-       ret = i2c_smbus_write_i2c_block_data(&pcf->client,
-                                            PCF50633_REG_AUTOOUT,
--                                           sizeof(pcf->standby_regs.misc) - 4,
--                                           &pcf->standby_regs.misc[0]);
-+                                           sizeof(misc),
-+                                           &misc[0]);
-       if (ret)
-               dev_err(dev, "Failed to restore misc :-( %d\n", ret);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1202-fix-pcf50633-platform-backlight-resume-ramp-setting.patch b/target/linux/s3c24xx/patches-2.6.24/1202-fix-pcf50633-platform-backlight-resume-ramp-setting.patch
deleted file mode 100644 (file)
index 389e48d..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-From 31afa68418678eef1885db656a935b24d51dce9b Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:42:29 +0100
-Subject: [PATCH] fix-pcf50633-platform-backlight-resume-ramp-setting.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |    1 +
- drivers/i2c/chips/pcf50633.c       |    6 ++++--
- include/linux/pcf50633.h           |    1 +
- 3 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 297b792..309e484 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -577,6 +577,7 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-               },
-       },
-       .defer_resume_backlight = 1,
-+      .resume_backlight_ramp_speed = 5
- };
- #if 0 /* currently unused */
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 875a5ee..a697ee1 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -2483,10 +2483,12 @@ void pcf50633_backlight_resume(struct pcf50633_data *pcf)
- {
-       dev_info(&pcf->client.dev, "pcf50633_backlight_resume\n");
--      /* we force the backlight on in fact */
--      reg_write(pcf, PCF50633_REG_LEDDIM, 1);
-+      /* platform defines resume ramp speed */
-+      reg_write(pcf, PCF50633_REG_LEDDIM,
-+                                     pcf->pdata->resume_backlight_ramp_speed);
-       reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.misc[
-                                  PCF50633_REG_LEDOUT - PCF50633_REG_AUTOOUT]);
-+      /* we force the backlight on in fact */
-       reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.misc[
-                              PCF50633_REG_LEDENA - PCF50633_REG_AUTOOUT] | 1);
- }
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index fa1c7e8..b94b72a 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -173,6 +173,7 @@ struct pcf50633_platform_data {
-       /* post-resume backlight bringup */
-       int defer_resume_backlight;
-+      u8 resume_backlight_ramp_speed;
- };
- #endif /* _PCF50633_H */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1203-fix-pcf50633-migrate-gta02-peripherals-out.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1203-fix-pcf50633-migrate-gta02-peripherals-out.patch.patch
deleted file mode 100644 (file)
index 726f5d5..0000000
+++ /dev/null
@@ -1,219 +0,0 @@
-From 80b4a26a51a75a92ddbb64b342068b741ef88416 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:42:39 +0100
-Subject: [PATCH] fix-pcf50633-migrate-gta02-peripherals-out.patch
-
-pcf50633.c shouldn't know GTAxx at all.  Move to using a
-platform callback to allow definition of platform devices
-with pcf50633 as parent device (good for enforcing suspend /
-resume ordering).  Remove all code references to GTAxx from
-the sources (one string left for compatability).
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   30 +++++++++++++++++++-
- drivers/i2c/chips/pcf50633.c       |   54 ++++++++++++++++++-----------------
- include/linux/pcf50633.h           |    9 +++++-
- 3 files changed, 65 insertions(+), 28 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 309e484..fd746fd 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -464,6 +464,29 @@ static int pmu_callback(struct device *dev, unsigned int feature,
-       return 0;
- }
-+static struct platform_device gta01_pm_gps_dev = {
-+      .name           = "neo1973-pm-gps",
-+};
-+
-+static struct platform_device gta01_pm_bt_dev = {
-+      .name           = "neo1973-pm-bt",
-+};
-+
-+/* this is called when pc50633 is probed, unfortunately quite late in the
-+ * day since it is an I2C bus device.  Here we can belatedly define some
-+ * platform devices with the advantage that we can mark the pcf50633 as the
-+ * parent.  This makes them get suspended and resumed with their parent
-+ * the pcf50633 still around.
-+ */
-+
-+static void gta02_pcf50633_attach_child_devices(struct device *parent_device)
-+{
-+      gta01_pm_gps_dev.dev.parent = parent_device;
-+      gta01_pm_bt_dev.dev.parent = parent_device;
-+      platform_device_register(&gta01_pm_bt_dev);
-+      platform_device_register(&gta01_pm_gps_dev);
-+}
-+
- static struct pcf50633_platform_data gta02_pcf_pdata = {
-       .used_features  = PCF50633_FEAT_MBC |
-                         PCF50633_FEAT_BBC |
-@@ -478,6 +501,7 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-       .r_fix_batt     = 10000,
-       .r_fix_batt_par = 10000,
-       .r_sense_milli  = 220,
-+      .flag_use_apm_emulation = 0,
-       .resumers = {
-               [0] = PCF50633_INT1_USBINS |
-                     PCF50633_INT1_USBREM |
-@@ -577,7 +601,9 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-               },
-       },
-       .defer_resume_backlight = 1,
--      .resume_backlight_ramp_speed = 5
-+      .resume_backlight_ramp_speed = 5,
-+      .attach_child_devices = gta02_pcf50633_attach_child_devices
-+
- };
- #if 0 /* currently unused */
-@@ -772,6 +798,7 @@ struct platform_device s3c24xx_pwm_device = {
-       .num_resources  = 0,
- };
-+
- static struct platform_device *gta02_devices[] __initdata = {
-       &s3c_device_usb,
-       &s3c_device_wdt,
-@@ -786,6 +813,7 @@ static struct platform_device *gta02_devices[] __initdata = {
-       &gta02_version_device,
-       &gta02_resume_reason_device,
-       &s3c24xx_pwm_device,
-+
- };
- static struct s3c2410_nand_set gta02_nand_sets[] = {
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index a697ee1..0f40f3f 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -50,7 +50,6 @@
- #include <linux/jiffies.h>
- #include <asm/mach-types.h>
--#include <asm/arch/gta02.h>
- #include "pcf50633.h"
- #include <linux/resume-dependency.h>
-@@ -2011,18 +2010,6 @@ static DEVICE_ATTR(dump_regs, 0400, show_dump_regs, NULL);
-  * Driver initialization
-  ***********************************************************************/
--#ifdef CONFIG_MACH_NEO1973_GTA02
--/* We currently place those platform devices here to make sure the device
-- * suspend/resume order is correct */
--static struct platform_device gta01_pm_gps_dev = {
--      .name           = "neo1973-pm-gps",
--};
--
--static struct platform_device gta01_pm_bt_dev = {
--      .name           = "neo1973-pm-bt",
--};
--#endif
--
- /*
-  * CARE!  This table is modified at runtime!
-  */
-@@ -2217,14 +2204,16 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-       data->probe_completed = 1;
--      if (machine_is_neo1973_gta02()) {
--              gta01_pm_gps_dev.dev.parent = &new_client->dev;
--              gta01_pm_bt_dev.dev.parent = &new_client->dev;
--              platform_device_register(&gta01_pm_bt_dev);
--              platform_device_register(&gta01_pm_gps_dev);
--      } else
-+      if (data->pdata->flag_use_apm_emulation)
-               apm_get_power_status = pcf50633_get_power_status;
-+      /* if platform was interested, give him a chance to register
-+       * platform devices that switch power with us as the parent
-+       * at registration time -- ensures suspend / resume ordering
-+       */
-+      if (data->pdata->attach_child_devices)
-+              (data->pdata->attach_child_devices)(&new_client->dev);
-+
-       return 0;
- exit_rtc:
-       if (data->pdata->used_features & PCF50633_FEAT_RTC)
-@@ -2268,13 +2257,6 @@ static int pcf50633_detach_client(struct i2c_client *client)
-       if (pcf->pdata->used_features & PCF50633_FEAT_RTC)
-               rtc_device_unregister(pcf->rtc);
--#ifdef CONFIG_MACH_NEO1973_GTA02
--      if (machine_is_neo1973_gta02()) {
--              platform_device_unregister(&gta01_pm_bt_dev);
--              platform_device_unregister(&gta01_pm_gps_dev);
--      }
--#endif
--
-       sysfs_remove_group(&client->dev.kobj, &pcf_attr_group);
-       pm_power_off = NULL;
-@@ -2472,6 +2454,26 @@ int pcf50633_ready(struct pcf50633_data *pcf)
- }
- EXPORT_SYMBOL_GPL(pcf50633_ready);
-+int pcf50633_wait_for_ready(struct pcf50633_data *pcf, int timeout_ms,
-+                                                              char *name)
-+{
-+      /* so we always go once */
-+      timeout_ms += 5;
-+
-+      while ((timeout_ms >= 5) && (pcf50633_ready(pcf))) {
-+              timeout_ms -= 5; /* well, it isn't very accurate, but OK */
-+              msleep(5);
-+      }
-+
-+      if (timeout_ms < 5) {
-+              printk(KERN_ERR"pcf50633_wait_for_ready: "
-+                                      "%s BAILING on timeout\n", name);
-+              return -EBUSY;
-+      }
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_wait_for_ready);
- /*
-  * if backlight resume is selected to be deferred by platform, then it
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index b94b72a..4653285 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -132,7 +132,9 @@ pcf50633_register_resume_dependency(struct pcf50633_data *pcf,
- extern int
- pcf50633_notify_usb_current_limit_change(struct pcf50633_data *pcf,
-                                                              unsigned int ma);
--
-+extern int
-+pcf50633_wait_for_ready(struct pcf50633_data *pcf, int timeout_ms,
-+                                                              char *name);
- /* 0 = initialized and resumed and ready to roll, !=0 = either not
-  * initialized or not resumed yet
-@@ -155,6 +157,10 @@ struct pcf50633_platform_data {
-       unsigned int onkey_seconds_sig_init;
-       unsigned int onkey_seconds_shutdown;
-+      /* callback to attach platform children (to enforce suspend / resume
-+       * ordering */
-+      void (*attach_child_devices)(struct device *parent_device);
-+
-       /* voltage regulator related */
-       struct pmu_voltage_rail rails[__NUM_PCF50633_REGULATORS];
-       unsigned int used_regulators;
-@@ -163,6 +169,7 @@ struct pcf50633_platform_data {
-       unsigned int r_fix_batt;
-       unsigned int r_fix_batt_par;
-       unsigned int r_sense_milli;
-+      int flag_use_apm_emulation;
-       unsigned char resumers[5];
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1204-fix-pcf50633-use-pcf-not-data-in-probe-for-context.p.patch b/target/linux/s3c24xx/patches-2.6.24/1204-fix-pcf50633-use-pcf-not-data-in-probe-for-context.p.patch
deleted file mode 100644 (file)
index d46de69..0000000
+++ /dev/null
@@ -1,218 +0,0 @@
-From d67dac178e8f4badacb161ad9505a3fbd6a2246e Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:42:48 +0100
-Subject: [PATCH] fix-pcf50633-use-pcf-not-data-in-probe-for-context.patch
-
-Everywhere in the sources except the probe function the context
-pointer is called "pcf"... in there it's called "data" for some
-reason.  This stops confusion by changing it to be "pcf" in there
-as well.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |  115 +++++++++++++++++++++---------------------
- 1 files changed, 58 insertions(+), 57 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 0f40f3f..4d19dae 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -2070,7 +2070,7 @@ static void populate_sysfs_group(struct pcf50633_data *pcf)
- static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
- {
-       struct i2c_client *new_client;
--      struct pcf50633_data *data;
-+      struct pcf50633_data *pcf;
-       int err = 0;
-       int irq;
-@@ -2093,23 +2093,24 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-               return -EBUSY;
-       }
--      if (!(data = kzalloc(sizeof(*data), GFP_KERNEL)))
-+      pcf = kzalloc(sizeof(*pcf), GFP_KERNEL);
-+      if (!pcf)
-               return -ENOMEM;
--      mutex_init(&data->lock);
--      mutex_init(&data->working_lock);
--      mutex_init(&data->working_lock_nobat);
--      mutex_init(&data->working_lock_usb_curlimit);
--      INIT_WORK(&data->work, pcf50633_work);
--      INIT_WORK(&data->work_nobat, pcf50633_work_nobat);
--      INIT_WORK(&data->work_usb_curlimit, pcf50633_work_usbcurlim);
--      data->irq = irq;
--      data->working = 0;
--      data->onkey_seconds = -1;
--      data->pdata = pcf50633_pdev->dev.platform_data;
--
--      new_client = &data->client;
--      i2c_set_clientdata(new_client, data);
-+      mutex_init(&pcf->lock);
-+      mutex_init(&pcf->working_lock);
-+      mutex_init(&pcf->working_lock_nobat);
-+      mutex_init(&pcf->working_lock_usb_curlimit);
-+      INIT_WORK(&pcf->work, pcf50633_work);
-+      INIT_WORK(&pcf->work_nobat, pcf50633_work_nobat);
-+      INIT_WORK(&pcf->work_usb_curlimit, pcf50633_work_usbcurlim);
-+      pcf->irq = irq;
-+      pcf->working = 0;
-+      pcf->onkey_seconds = -1;
-+      pcf->pdata = pcf50633_pdev->dev.platform_data;
-+
-+      new_client = &pcf->client;
-+      i2c_set_clientdata(new_client, pcf);
-       new_client->addr = address;
-       new_client->adapter = adapter;
-       new_client->driver = &pcf50633_driver;
-@@ -2125,11 +2126,11 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-               goto exit_free;
-       }
--      pcf50633_global = data;
-+      pcf50633_global = pcf;
--      init_resume_dependency_list(&data->resume_dependency);
-+      init_resume_dependency_list(&pcf->resume_dependency);
--      populate_sysfs_group(data);
-+      populate_sysfs_group(pcf);
-       err = sysfs_create_group(&new_client->dev.kobj, &pcf_attr_group);
-       if (err) {
-@@ -2142,34 +2143,34 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-       /* register power off handler with core power management */
-       pm_power_off = &pcf50633_go_standby;
--      data->input_dev = input_allocate_device();
--      if (!data->input_dev)
-+      pcf->input_dev = input_allocate_device();
-+      if (!pcf->input_dev)
-               goto exit_sysfs;
--      data->input_dev->name = "GTA02 PMU events";
--      data->input_dev->phys = "FIXME";
--      data->input_dev->id.bustype = BUS_I2C;
--      data->input_dev->cdev.dev = &new_client->dev;
-+      pcf->input_dev->name = "GTA02 PMU events";
-+      pcf->input_dev->phys = "FIXME";
-+      pcf->input_dev->id.bustype = BUS_I2C;
-+      pcf->input_dev->cdev.dev = &new_client->dev;
--      data->input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_PWR);
--      set_bit(KEY_POWER, data->input_dev->keybit);
--      set_bit(KEY_POWER2, data->input_dev->keybit);
--      set_bit(KEY_BATTERY, data->input_dev->keybit);
-+      pcf->input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_PWR);
-+      set_bit(KEY_POWER, pcf->input_dev->keybit);
-+      set_bit(KEY_POWER2, pcf->input_dev->keybit);
-+      set_bit(KEY_BATTERY, pcf->input_dev->keybit);
--      err = input_register_device(data->input_dev);
-+      err = input_register_device(pcf->input_dev);
-       if (err)
-               goto exit_sysfs;
-       /* configure interrupt mask */
-       /* we want SECOND to kick for the coldplug initialisation */
--      reg_write(data, PCF50633_REG_INT1M, 0x00);
--      reg_write(data, PCF50633_REG_INT2M, 0x00);
--      reg_write(data, PCF50633_REG_INT3M, 0x00);
--      reg_write(data, PCF50633_REG_INT4M, 0x00);
--      reg_write(data, PCF50633_REG_INT5M, 0x00);
-+      reg_write(pcf, PCF50633_REG_INT1M, 0x00);
-+      reg_write(pcf, PCF50633_REG_INT2M, 0x00);
-+      reg_write(pcf, PCF50633_REG_INT3M, 0x00);
-+      reg_write(pcf, PCF50633_REG_INT4M, 0x00);
-+      reg_write(pcf, PCF50633_REG_INT5M, 0x00);
-       err = request_irq(irq, pcf50633_irq, IRQF_TRIGGER_FALLING,
--                        "pcf50633", data);
-+                        "pcf50633", pcf);
-       if (err < 0)
-               goto exit_input;
-@@ -2177,58 +2178,58 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-               dev_err(&new_client->dev, "IRQ %u cannot be enabled as wake-up"
-                       "source in this hardware revision!", irq);
--      if (data->pdata->used_features & PCF50633_FEAT_RTC) {
--              data->rtc = rtc_device_register("pcf50633", &new_client->dev,
-+      if (pcf->pdata->used_features & PCF50633_FEAT_RTC) {
-+              pcf->rtc = rtc_device_register("pcf50633", &new_client->dev,
-                                               &pcf50633_rtc_ops, THIS_MODULE);
--              if (IS_ERR(data->rtc)) {
--                      err = PTR_ERR(data->rtc);
-+              if (IS_ERR(pcf->rtc)) {
-+                      err = PTR_ERR(pcf->rtc);
-                       goto exit_irq;
-               }
-       }
--      if (data->pdata->used_features & PCF50633_FEAT_PWM_BL) {
--              data->backlight = backlight_device_register("pcf50633-bl",
-+      if (pcf->pdata->used_features & PCF50633_FEAT_PWM_BL) {
-+              pcf->backlight = backlight_device_register("pcf50633-bl",
-                                                           &new_client->dev,
--                                                          data,
-+                                                          pcf,
-                                                           &pcf50633bl_ops);
--              if (!data->backlight)
-+              if (!pcf->backlight)
-                       goto exit_rtc;
-               /* FIXME: are we sure we want default == off? */
--              data->backlight->props.max_brightness = 0x3f;
--              data->backlight->props.power = FB_BLANK_UNBLANK;
--              data->backlight->props.fb_blank = FB_BLANK_UNBLANK;
--              data->backlight->props.brightness =
--                                      data->backlight->props.max_brightness;
--              backlight_update_status(data->backlight);
-+              pcf->backlight->props.max_brightness = 0x3f;
-+              pcf->backlight->props.power = FB_BLANK_UNBLANK;
-+              pcf->backlight->props.fb_blank = FB_BLANK_UNBLANK;
-+              pcf->backlight->props.brightness =
-+                                      pcf->backlight->props.max_brightness;
-+              backlight_update_status(pcf->backlight);
-       }
--      data->probe_completed = 1;
-+      pcf->probe_completed = 1;
--      if (data->pdata->flag_use_apm_emulation)
-+      if (pcf->pdata->flag_use_apm_emulation)
-               apm_get_power_status = pcf50633_get_power_status;
-       /* if platform was interested, give him a chance to register
-        * platform devices that switch power with us as the parent
-        * at registration time -- ensures suspend / resume ordering
-        */
--      if (data->pdata->attach_child_devices)
--              (data->pdata->attach_child_devices)(&new_client->dev);
-+      if (pcf->pdata->attach_child_devices)
-+              (pcf->pdata->attach_child_devices)(&new_client->dev);
-       return 0;
- exit_rtc:
--      if (data->pdata->used_features & PCF50633_FEAT_RTC)
-+      if (pcf->pdata->used_features & PCF50633_FEAT_RTC)
-               rtc_device_unregister(pcf50633_global->rtc);
- exit_irq:
-       free_irq(pcf50633_global->irq, pcf50633_global);
- exit_input:
--      input_unregister_device(data->input_dev);
-+      input_unregister_device(pcf->input_dev);
- exit_sysfs:
-       pm_power_off = NULL;
-       sysfs_remove_group(&new_client->dev.kobj, &pcf_attr_group);
- exit_detach:
-       i2c_detach_client(new_client);
- exit_free:
--      kfree(data);
-+      kfree(pcf);
-       pcf50633_global = NULL;
-       return err;
- }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1205-workaround-s3c24xx-i2s-stop-live-stream-stall-on-res.patch b/target/linux/s3c24xx/patches-2.6.24/1205-workaround-s3c24xx-i2s-stop-live-stream-stall-on-res.patch
deleted file mode 100644 (file)
index 16087f4..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-From edd4b9c7128495063fb529282ebbf165a20f7a23 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:42:56 +0100
-Subject: [PATCH] workaround-s3c24xx-i2s-stop-live-stream-stall-on-resume.patch
- Reported-by: Graeme Gregory <graeme@openmoko.org>
- Basically-solved-by: Graeme Gregory <graeme@openmoko.org>
-
-Graeme found a while back that on resume, IISCON register in
-s3c2442 does not show LRCK toggling in LRINDEX bit any more,
-causing s3c24xx_snd_lrsync() to timeout and return an error,
-aborting restart of any live stream that was playing at
-suspend.
-
-I confirmed it was true, meddled around for a bit looking
-for some magic to restart LRCK or at least the reporting of
-it, and in the end worked around it using the method noted
-by Graeme: just ignore LRCK sync if it timed out.  The worst
-that could happen would be L and R swap for the duration of
-stream that was suspended into but probably not even that.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- sound/soc/s3c24xx/s3c24xx-i2s.c |   15 +++++++++------
- 1 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c
-index 7b6cca7..4ec37ef 100644
---- a/sound/soc/s3c24xx/s3c24xx-i2s.c
-+++ b/sound/soc/s3c24xx/s3c24xx-i2s.c
-@@ -180,7 +180,7 @@ static void s3c24xx_snd_rxctrl(int on)
- static int s3c24xx_snd_lrsync(void)
- {
-       u32 iiscon;
--      int timeout = 50; /* 5ms */
-+      int timeout = 5; /* 500us, 125 should be enough at 8kHz */
-       DBG("Entered %s\n", __FUNCTION__);
-@@ -285,11 +285,14 @@ static int s3c24xx_i2s_trigger(struct snd_pcm_substream *substream, int cmd)
-       case SNDRV_PCM_TRIGGER_START:
-       case SNDRV_PCM_TRIGGER_RESUME:
-       case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
--              if (!s3c24xx_snd_is_clkmaster()) {
--                      ret = s3c24xx_snd_lrsync();
--                      if (ret)
--                              goto exit_err;
--              }
-+              if (!s3c24xx_snd_is_clkmaster())
-+                      /* we ignore the return code, if it sync'd then fine,
-+                       * if it didn't sync, which happens after resume the
-+                       * first time when there was a live stream at suspend,
-+                       * just let it timeout, the stream picks up OK after
-+                       * that and LRCK is evidently working again.
-+                       */
-+                      s3c24xx_snd_lrsync();
-               if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
-                       s3c24xx_snd_rxctrl(1);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1206-Subject-PATCH-a6k-Everyone-calls-SET_NET_DEV-an.patch b/target/linux/s3c24xx/patches-2.6.24/1206-Subject-PATCH-a6k-Everyone-calls-SET_NET_DEV-an.patch
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/target/linux/s3c24xx/patches-2.6.24/1207-Subject-PATCH-glamo-Don-t-disable-hwcursor-for-b.patch b/target/linux/s3c24xx/patches-2.6.24/1207-Subject-PATCH-glamo-Don-t-disable-hwcursor-for-b.patch
deleted file mode 100644 (file)
index bc73a99..0000000
+++ /dev/null
@@ -1,191 +0,0 @@
-From 57df1041409b50f2cc3137a820254fa982c49c45 Mon Sep 17 00:00:00 2001
-From: Andrzej Zaborowski <balrog@zabor.org>
-Date: Wed, 2 Jul 2008 22:43:11 +0100
-Subject: [PATCH] Subject: [PATCH] glamo: Don't disable hwcursor for blinking and use vsync-wait.
-
----
- drivers/mfd/glamo/glamo-fb.c |  109 +++++++++++++++++++++++++++++-------------
- 1 files changed, 76 insertions(+), 33 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c
-index 16e9d2e..7feef32 100644
---- a/drivers/mfd/glamo/glamo-fb.c
-+++ b/drivers/mfd/glamo/glamo-fb.c
-@@ -72,6 +72,7 @@ struct glamofb_handle {
-       char __iomem *base;
-       struct glamofb_platform_data *mach_info;
-       char __iomem *cursor_addr;
-+      int cursor_on;
-       u_int32_t pseudo_pal[16];
-       spinlock_t lock_cmd;
- };
-@@ -497,18 +498,53 @@ static int glamofb_setcolreg(unsigned regno,
- }
- #ifdef CONFIG_MFD_GLAMO_HWACCEL
-+static inline void glamofb_vsync_wait(struct glamofb_handle *glamo,
-+              int line, int size, int range)
-+{
-+      int count[2];
-+
-+      do {
-+              count[0] = reg_read(glamo, GLAMO_REG_LCD_STATUS2) & 0x3ff;
-+              count[1] = reg_read(glamo, GLAMO_REG_LCD_STATUS2) & 0x3ff;
-+      } while (count[0] != count[1] ||
-+                      (line < count[0] + range &&
-+                       size > count[0] - range) ||
-+                      count[0] < range * 2);
-+}
-+
-+/*
-+ * Enable/disable the hardware cursor mode altogether
-+ * (for blinking and such, use glamofb_cursor()).
-+ */
-+static void glamofb_cursor_onoff(struct glamofb_handle *glamo, int on)
-+{
-+      int y, size;
-+
-+      if (glamo->cursor_on) {
-+              y = reg_read(glamo, GLAMO_REG_LCD_CURSOR_Y_POS);
-+              size = reg_read(glamo, GLAMO_REG_LCD_CURSOR_Y_SIZE);
-+
-+              glamofb_vsync_wait(glamo, y, size, 30);
-+      }
-+
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_MODE1,
-+                      GLAMO_LCD_MODE1_CURSOR_EN,
-+                      on ? GLAMO_LCD_MODE1_CURSOR_EN : 0);
-+      glamo->cursor_on = on;
-+
-+      /* Hide the cursor by default */
-+      reg_write(glamo, GLAMO_REG_LCD_CURSOR_X_SIZE, 0);
-+}
-+
- static int glamofb_cursor(struct fb_info *info, struct fb_cursor *cursor)
- {
-       struct glamofb_handle *glamo = info->par;
-       unsigned long flags;
--      if (cursor->image.depth > 2)
--              return -EINVAL;
--
-       spin_lock_irqsave(&glamo->lock_cmd, flags);
--      reg_set_bit_mask(glamo, GLAMO_REG_LCD_MODE1,
--                      GLAMO_LCD_MODE1_CURSOR_EN, 0);
-+      reg_write(glamo, GLAMO_REG_LCD_CURSOR_X_SIZE,
-+                      cursor->enable ? cursor->image.width : 0);
-       if (cursor->set & FB_CUR_SETPOS) {
-               reg_write(glamo, GLAMO_REG_LCD_CURSOR_X_POS,
-@@ -518,12 +554,12 @@ static int glamofb_cursor(struct fb_info *info, struct fb_cursor *cursor)
-       }
-       if (cursor->set & FB_CUR_SETCMAP) {
--              uint16_t fg = cursor->image.fg_color;
--              uint16_t bg = cursor->image.bg_color;
-+              uint16_t fg = glamo->pseudo_pal[cursor->image.fg_color];
-+              uint16_t bg = glamo->pseudo_pal[cursor->image.bg_color];
-               reg_write(glamo, GLAMO_REG_LCD_CURSOR_FG_COLOR, fg);
-               reg_write(glamo, GLAMO_REG_LCD_CURSOR_BG_COLOR, bg);
--              reg_write(glamo, GLAMO_REG_LCD_CURSOR_DST_COLOR, bg);
-+              reg_write(glamo, GLAMO_REG_LCD_CURSOR_DST_COLOR, fg);
-       }
-       if (cursor->set & FB_CUR_SETHOT)
-@@ -532,23 +568,27 @@ static int glamofb_cursor(struct fb_info *info, struct fb_cursor *cursor)
-       if ((cursor->set & FB_CUR_SETSIZE) ||
-           (cursor->set & (FB_CUR_SETIMAGE | FB_CUR_SETSHAPE))) {
--              int x, y, pitch;
--              const unsigned char *pcol = cursor->image.data;
--              const unsigned char *pmsk = cursor->mask;
--              void __iomem *dst = glamo->cursor_addr;
--              unsigned char dcol = 0;
--              unsigned char dmsk = 0;
--              unsigned char byte = 0;
--
--              pitch = (cursor->image.width + 3) >> 2;
--              reg_write(glamo, GLAMO_REG_LCD_CURSOR_X_SIZE,
--                        cursor->image.width);
-+              int x, y, pitch, op;
-+              const uint8_t *pcol = cursor->image.data;
-+              const uint8_t *pmsk = cursor->mask;
-+              uint8_t __iomem *dst = glamo->cursor_addr;
-+              uint8_t dcol = 0;
-+              uint8_t dmsk = 0;
-+              uint8_t byte = 0;
-+
-+              if (cursor->image.depth > 1) {
-+                      spin_unlock_irqrestore(&glamo->lock_cmd, flags);
-+                      return -EINVAL;
-+              }
-+
-+              pitch = ((cursor->image.width + 7) >> 2) & ~1;
-               reg_write(glamo, GLAMO_REG_LCD_CURSOR_PITCH,
--                        pitch);
-+                      pitch);
-               reg_write(glamo, GLAMO_REG_LCD_CURSOR_Y_SIZE,
--                        cursor->image.height);
-+                      cursor->image.height);
-               for (y = 0; y < cursor->image.height; y++) {
-+                      byte = 0;
-                       for (x = 0; x < cursor->image.width; x++) {
-                               if ((x % 8) == 0) {
-                                       dcol = *pcol++;
-@@ -558,28 +598,28 @@ static int glamofb_cursor(struct fb_info *info, struct fb_cursor *cursor)
-                                       dmsk >>= 1;
-                               }
--                              if (dmsk & 1) {
--                                      unsigned int op;
-+                              if (cursor->rop == ROP_COPY)
-+                                      op = (dmsk & 1) ?
-+                                              (dcol & 1) ? 1 : 3 : 0;
-+                              else
-+                                      op = ((dmsk & 1) << 1) |
-+                                              ((dcol & 1) << 0);
-+                              byte |= op << ((x & 3) << 1);
--                                      op = (dcol & 1) ? 1 : 3;
--                                      byte |= op << ((x % 4) * 2);
--                              }
--
--                              if ((x % 4) == 0) {
-+                              if (x % 4 == 3) {
-                                       writeb(byte, dst + x / 4);
-                                       byte = 0;
-                               }
-                       }
-+                      if (x % 4) {
-+                              writeb(byte, dst + x / 4);
-+                              byte = 0;
-+                      }
-                       dst += pitch;
-               }
-       }
--      if (cursor->enable)
--              reg_set_bit_mask(glamo, GLAMO_REG_LCD_MODE1,
--                              GLAMO_LCD_MODE1_CURSOR_EN,
--                              GLAMO_LCD_MODE1_CURSOR_EN);
--
-       spin_unlock_irqrestore(&glamo->lock_cmd, flags);
-       return 0;
-@@ -806,6 +846,9 @@ static int __init glamofb_probe(struct platform_device *pdev)
-       spin_lock_init(&glamofb->lock_cmd);
-       glamofb_init_regs(glamofb);
-+#ifdef CONFIG_MFD_GLAMO_HWACCEL
-+      glamofb_cursor_onoff(glamofb, 1);
-+#endif
-       rc = register_framebuffer(fbinfo);
-       if (rc < 0) {
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1208-introduce-panic-blink-led-not-using-userspace-omfg.p.patch b/target/linux/s3c24xx/patches-2.6.24/1208-introduce-panic-blink-led-not-using-userspace-omfg.p.patch
deleted file mode 100644 (file)
index 7f41308..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-From 0e049b8ff8ad37e3749121519fe96d357e0754f4 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:43:20 +0100
-Subject: [PATCH] introduce-panic-blink-led-not-using-userspace-omfg.patch
-
-A panic is silent on GTA02, it would be good if we got a little hint
-if we are crashing (eg, in suspend / resume) from a panic instead of
-a deadlock, etc.  On a normal PC i8042 blinks the keyboard lights if
-we panic, this patch causes AUX to flash at 5Hz in event of a panic.
-
-Tested by giving kernel fake root= that didn't exist.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   24 ++++++++++++++++++++++++
- 1 files changed, 24 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index fd746fd..c32bb2a 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -328,6 +328,27 @@ FIQ_HANDLER_ENTRY(256, 512)
- FIQ_HANDLER_END()
-+/*
-+ * this gets called every 1ms when we paniced.
-+ */
-+
-+static long gta02_panic_blink(long count)
-+{
-+      long delay = 0;
-+      static long last_blink;
-+      static char led;
-+
-+      if (count - last_blink < 100) /* 200ms period, fast blink */
-+              return 0;
-+
-+      led ^= 1;
-+      s3c2410_gpio_cfgpin(GTA02_GPIO_AUX_LED, S3C2410_GPIO_OUTPUT);
-+      neo1973_gpb_setpin(GTA02_GPIO_AUX_LED, led);
-+
-+      last_blink = count;
-+      return delay;
-+}
-+
- /**
-  * returns PCB revision information in b9,b8 and b2,b1,b0
-@@ -1476,6 +1497,9 @@ static void __init gta02_machine_init(void)
- {
-       int rc;
-+      /* set the panic callback to make AUX blink fast */
-+      panic_blink = gta02_panic_blink;
-+
-       switch (system_rev) {
-       case GTA02v6_SYSTEM_REV:
-               /* we need push-pull interrupt from motion sensors */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1209-touchscreen-meddling.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1209-touchscreen-meddling.patch.patch
deleted file mode 100644 (file)
index 10dda15..0000000
+++ /dev/null
@@ -1,505 +0,0 @@
-From cf7096e6f6e24d8a362ad05f768d609a2921f479 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:43:31 +0100
-Subject: [PATCH] touchscreen-meddling.patch
-
-Touchscreen on GTA01-02 experiences noise on the channel that serves the
-"tall axis" of the LCM.  The sample quality of the other axis is good.
-The bad samples have a characteristic of one shot excursions that can
-reach +/- 20% or more of the sample average.
-
-Previously, we had a simple averaging scheme going in the touchscreen
-driver that summed up 32 x and ys and then divided it by 32.  This patch
-first tidies up the existing code for style, then adds a new "running
-average" concept with a FIFO.  The running average is separate from the
-summing average mentioned above, and is accurate for the last n samples
-sample-by-sample, where n is set by 1 << excursion_filter_len_bits in the
-machine / platform stuff.
-
-The heuristic the patch implements for the filtering is to accept all
-samples, but tag the *previous* sample with a flag if it differed from
-the running average by more than reject_threshold_vs_avg in either
-axis.  The next sample time, a beauty contest is held if the flag was
-set to decide if we think the previous sample was a one-shot excursion
-(detected by the new sample being closer to the average than to the
-flagged previous sample), or if we believe we are moving (detected by
-the new sample being closer to the flagged previous sample than the
-average.  In the case that we believe the previous sample was an
-excursion, we simply overwrite it with the new data and adjust the
-summing average to use the new data instead of the excursion data.
-
-I only tested this by eyeballing the output of ts_print_raw, but it
-seemed to be quite a bit better.  Gross movement appeared to be
-tracked fine too.  If folks want to try different heuristics on top
-of this patch, be my guest; either way feedback on what it looks like
-with a graphical app would be good.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c     |   10 +-
- drivers/input/touchscreen/s3c2410_ts.c |  256 ++++++++++++++++++++++++--------
- include/asm-arm/arch-s3c2410/ts.h      |    8 +-
- 3 files changed, 205 insertions(+), 69 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index c32bb2a..afe8039 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -897,10 +897,18 @@ static struct s3c2410_udc_mach_info gta02_udc_cfg = {
- static struct s3c2410_ts_mach_info gta02_ts_cfg = {
-       .delay = 10000,
--      .presc = 65,
-+      .presc = 50000000 / 1000000, /* 50 MHz PCLK / 1MHz */
-+      /* simple averaging, 2^n samples */
-       .oversampling_shift = 5,
-+       /* averaging filter length, 2^n */
-+      .excursion_filter_len_bits = 5,
-+      /* flagged for beauty contest on next sample if differs from
-+       * average more than this
-+       */
-+      .reject_threshold_vs_avg = 2,
- };
-+
- /* SPI: LCM control interface attached to Glamo3362 */
- static void gta02_jbt6k74_reset(int devidx, int level)
-diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
-index 6d395ca..83e7aff 100644
---- a/drivers/input/touchscreen/s3c2410_ts.c
-+++ b/drivers/input/touchscreen/s3c2410_ts.c
-@@ -36,6 +36,9 @@
-  *
-  * 2007-05-23: Harald Welte <laforge@openmoko.org>
-  *    - Add proper support for S32440
-+ *
-+ * 2008-06-18: Andy Green <andy@openmoko.com>
-+ *      - Outlier removal
-  */
- #include <linux/errno.h>
-@@ -62,11 +65,16 @@
- #define TSC_SLEEP  (S3C2410_ADCTSC_PULL_UP_DISABLE | S3C2410_ADCTSC_XY_PST(0))
- #define WAIT4INT(x)  (((x)<<8) | \
--                   S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \
-+                   S3C2410_ADCTSC_YM_SEN | \
-+                   S3C2410_ADCTSC_YP_SEN | \
-+                   S3C2410_ADCTSC_XP_SEN | \
-                    S3C2410_ADCTSC_XY_PST(3))
--#define AUTOPST            (S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \
--                   S3C2410_ADCTSC_AUTO_PST | S3C2410_ADCTSC_XY_PST(0))
-+#define AUTOPST            (S3C2410_ADCTSC_YM_SEN | \
-+                    S3C2410_ADCTSC_YP_SEN | \
-+                    S3C2410_ADCTSC_XP_SEN | \
-+                    S3C2410_ADCTSC_AUTO_PST | \
-+                    S3C2410_ADCTSC_XY_PST(0))
- #define DEBUG_LVL    KERN_DEBUG
-@@ -85,17 +93,46 @@ static char *s3c2410ts_name = "s3c2410 TouchScreen";
-  * Per-touchscreen data.
-  */
-+struct s3c2410ts_sample {
-+      int x;
-+      int y;
-+};
-+
- struct s3c2410ts {
-       struct input_dev *dev;
-       long xp;
-       long yp;
-       int count;
-       int shift;
-+      int extent;  /* 1 << shift */
-+
-+      /* the raw sample fifo is a lightweight way to track a running average
-+       * of all taken samples.  "running average" here means that it gives
-+       * correct average for each sample, not only at the end of block of
-+       * samples
-+       */
-+      int excursion_filter_len;
-+      struct s3c2410ts_sample *raw_sample_fifo;
-+      int head_raw_fifo;
-+      int tail_raw_fifo;
-+      struct s3c2410ts_sample raw_running_avg;
-+      int reject_threshold_vs_avg;
-+      int flag_previous_exceeded_threshold;
- };
- static struct s3c2410ts ts;
- static void __iomem *base_addr;
-+static void clear_raw_fifo(void)
-+{
-+      ts.head_raw_fifo = 0;
-+      ts.tail_raw_fifo = 0;
-+      ts.raw_running_avg.x = 0;
-+      ts.raw_running_avg.y = 0;
-+      ts.flag_previous_exceeded_threshold = 0;
-+}
-+
-+
- static inline void s3c2410_ts_connect(void)
- {
-       s3c2410_gpio_cfgpin(S3C2410_GPG12, S3C2410_GPG12_XMON);
-@@ -110,47 +147,52 @@ static void touch_timer_fire(unsigned long data)
-       unsigned long data1;
-       int updown;
--      data0 = readl(base_addr+S3C2410_ADCDAT0);
--      data1 = readl(base_addr+S3C2410_ADCDAT1);
-+      data0 = readl(base_addr + S3C2410_ADCDAT0);
-+      data1 = readl(base_addr + S3C2410_ADCDAT1);
--      updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN));
-+      updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) &&
-+                                          (!(data1 & S3C2410_ADCDAT0_UPDOWN));
--      if (updown) {
--              if (ts.count != 0) {
--                      ts.xp >>= ts.shift;
--                      ts.yp >>= ts.shift;
-+      if (updown) {
-+              if (ts.count != 0) {
-+                      ts.xp >>= ts.shift;
-+                      ts.yp >>= ts.shift;
- #ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG
--                      {
--                              struct timeval tv;
--                              do_gettimeofday(&tv);
--                              printk(DEBUG_LVL "T: %06d, X: %03ld, Y: %03ld\n", (int)tv.tv_usec, ts.xp, ts.yp);
--                      }
-+                      {
-+                              struct timeval tv;
-+
-+                              do_gettimeofday(&tv);
-+                              printk(DEBUG_LVL "T:%06d, X:%03ld, Y:%03ld\n",
-+                                               (int)tv.tv_usec, ts.xp, ts.yp);
-+                      }
- #endif
--                      input_report_abs(ts.dev, ABS_X, ts.xp);
--                      input_report_abs(ts.dev, ABS_Y, ts.yp);
-+                      input_report_abs(ts.dev, ABS_X, ts.xp);
-+                      input_report_abs(ts.dev, ABS_Y, ts.yp);
--                      input_report_key(ts.dev, BTN_TOUCH, 1);
--                      input_report_abs(ts.dev, ABS_PRESSURE, 1);
--                      input_sync(ts.dev);
--              }
-+                      input_report_key(ts.dev, BTN_TOUCH, 1);
-+                      input_report_abs(ts.dev, ABS_PRESSURE, 1);
-+                      input_sync(ts.dev);
-+              }
--              ts.xp = 0;
--              ts.yp = 0;
--              ts.count = 0;
-+              ts.xp = 0;
-+              ts.yp = 0;
-+              ts.count = 0;
--              writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC);
--              writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON);
--      } else {
--              ts.count = 0;
-+              writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST,
-+                                                    base_addr+S3C2410_ADCTSC);
-+              writel(readl(base_addr+S3C2410_ADCCON) |
-+                       S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON);
-+      } else {
-+              ts.count = 0;
--              input_report_key(ts.dev, BTN_TOUCH, 0);
--              input_report_abs(ts.dev, ABS_PRESSURE, 0);
--              input_sync(ts.dev);
-+              input_report_key(ts.dev, BTN_TOUCH, 0);
-+              input_report_abs(ts.dev, ABS_PRESSURE, 0);
-+              input_sync(ts.dev);
--              writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC);
--      }
-+              writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC);
-+      }
- }
- static struct timer_list touch_timer =
-@@ -165,7 +207,8 @@ static irqreturn_t stylus_updown(int irq, void *dev_id)
-       data0 = readl(base_addr+S3C2410_ADCDAT0);
-       data1 = readl(base_addr+S3C2410_ADCDAT1);
--      updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN));
-+      updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) &&
-+                                          (!(data1 & S3C2410_ADCDAT0_UPDOWN));
-       /* TODO we should never get an interrupt with updown set while
-        * the timer is running, but maybe we ought to verify that the
-@@ -180,24 +223,94 @@ static irqreturn_t stylus_updown(int irq, void *dev_id)
- static irqreturn_t stylus_action(int irq, void *dev_id)
- {
--      unsigned long data0;
--      unsigned long data1;
--
--      data0 = readl(base_addr+S3C2410_ADCDAT0);
--      data1 = readl(base_addr+S3C2410_ADCDAT1);
-+      unsigned long x;
-+      unsigned long y;
-+      int length = (ts.head_raw_fifo - ts.tail_raw_fifo) & (ts.extent - 1);
-+      int scaled_avg_x = ts.raw_running_avg.x / length;
-+      int scaled_avg_y = ts.raw_running_avg.y / length;
-+
-+      x = readl(base_addr + S3C2410_ADCDAT0) & S3C2410_ADCDAT0_XPDATA_MASK;
-+      y = readl(base_addr + S3C2410_ADCDAT1) & S3C2410_ADCDAT1_YPDATA_MASK;
-+
-+      /* we appear to accept every sample into both the running average FIFO
-+       * and the summing average.  BUT, if the last sample crossed a
-+       * machine-set threshold, each time we do a beauty contest
-+       * on the new sample comparing if it is closer to the running
-+       * average and the previous sample.  If it is closer to the previous
-+       * suspicious sample, we assume the change is real and accept both
-+       * if the new sample has returned to being closer to the average than
-+       * the previous sample, we take the previous sample as an excursion
-+       * and overwrite it in both the running average and summing average.
-+       */
-+
-+      if (ts.flag_previous_exceeded_threshold)
-+              /* new one closer to "nonconformist" previous, or average?
-+               * Pythagoras?  Who?  Don't need it because large excursion
-+               * will be accounted for correctly this way
-+               */
-+              if ((abs(x - scaled_avg_x) + abs(y - scaled_avg_y)) <
-+                  (abs(x - ts.raw_sample_fifo[(ts.head_raw_fifo - 1) &
-+                                                        (ts.extent - 1)].x) +
-+                   abs(y - ts.raw_sample_fifo[(ts.head_raw_fifo - 1) &
-+                                                       (ts.extent - 1)].y))) {
-+                      /* it's closer to average, reject previous as a one-
-+                       * shot excursion, by overwriting it
-+                       */
-+                      ts.xp += x - ts.raw_sample_fifo[(ts.head_raw_fifo - 1) &
-+                                                           (ts.extent - 1)].x;
-+                      ts.yp += y - ts.raw_sample_fifo[(ts.head_raw_fifo - 1) &
-+                                                           (ts.extent - 1)].y;
-+                      ts.raw_sample_fifo[(ts.head_raw_fifo - 1) &
-+                                                       (ts.extent - 1)].x = x;
-+                      ts.raw_sample_fifo[(ts.head_raw_fifo - 1) &
-+                                                       (ts.extent - 1)].y = y;
-+                      /* no new sample: replaced previous, so we are done */
-+                      goto completed;
-+              }
-+              /* else it was closer to nonconformist previous: it's likely
-+               * a genuine consistent move then.
-+               * Keep previous and add new guy.
-+               */
-+
-+      if ((x >= scaled_avg_x - ts.reject_threshold_vs_avg) &&
-+          (x <= scaled_avg_x + ts.reject_threshold_vs_avg) &&
-+          (y >= scaled_avg_y - ts.reject_threshold_vs_avg) &&
-+          (y <= scaled_avg_y + ts.reject_threshold_vs_avg))
-+              ts.flag_previous_exceeded_threshold = 0;
-+      else
-+              ts.flag_previous_exceeded_threshold = 1;
--      ts.xp += data0 & S3C2410_ADCDAT0_XPDATA_MASK;
--      ts.yp += data1 & S3C2410_ADCDAT1_YPDATA_MASK;
-+      /* accepted */
-+      ts.xp += x;
-+      ts.yp += y;
-       ts.count++;
--        if (ts.count < (1<<ts.shift)) {
--              writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC);
--              writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON);
--      } else {
--              mod_timer(&touch_timer, jiffies+1);
-+      /* remove oldest sample from avg when we have full pipeline */
-+      if (((ts.head_raw_fifo + 1) & (ts.extent - 1)) == ts.tail_raw_fifo) {
-+              ts.raw_running_avg.x -= ts.raw_sample_fifo[ts.tail_raw_fifo].x;
-+              ts.raw_running_avg.y -= ts.raw_sample_fifo[ts.tail_raw_fifo].y;
-+              ts.tail_raw_fifo = (ts.tail_raw_fifo + 1) & (ts.extent - 1);
-+      }
-+      /* always add current sample to fifo and average */
-+      ts.raw_sample_fifo[ts.head_raw_fifo].x = x;
-+      ts.raw_sample_fifo[ts.head_raw_fifo].y = y;
-+      ts.raw_running_avg.x += x;
-+      ts.raw_running_avg.y += y;
-+      ts.head_raw_fifo = (ts.head_raw_fifo + 1) & (ts.extent - 1);
-+
-+completed:
-+      if (ts.count >= (1 << ts.shift)) {
-+              mod_timer(&touch_timer, jiffies + 1);
-               writel(WAIT4INT(1), base_addr+S3C2410_ADCTSC);
-+              goto bail;
-       }
-+      writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST,
-+                                                    base_addr+S3C2410_ADCTSC);
-+      writel(readl(base_addr+S3C2410_ADCCON) |
-+                       S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON);
-+
-+bail:
-       return IRQ_HANDLED;
- }
-@@ -213,11 +326,11 @@ static int __init s3c2410ts_probe(struct platform_device *pdev)
-       struct s3c2410_ts_mach_info *info;
-       struct input_dev *input_dev;
--      info = ( struct s3c2410_ts_mach_info *)pdev->dev.platform_data;
-+      info = (struct s3c2410_ts_mach_info *)pdev->dev.platform_data;
-       if (!info)
-       {
--              printk(KERN_ERR "Hm... too bad : no platform data for ts\n");
-+              dev_err(&pdev->dev, "Hm... too bad: no platform data for ts\n");
-               return -EINVAL;
-       }
-@@ -227,7 +340,7 @@ static int __init s3c2410ts_probe(struct platform_device *pdev)
-       adc_clock = clk_get(NULL, "adc");
-       if (!adc_clock) {
--              printk(KERN_ERR "failed to get adc clock source\n");
-+              dev_err(&pdev->dev, "failed to get adc clock source\n");
-               return -ENOENT;
-       }
-       clk_enable(adc_clock);
-@@ -238,7 +351,7 @@ static int __init s3c2410ts_probe(struct platform_device *pdev)
-       base_addr = ioremap(S3C2410_PA_ADC,0x20);
-       if (base_addr == NULL) {
--              printk(KERN_ERR "Failed to remap register block\n");
-+              dev_err(&pdev->dev, "Failed to remap register block\n");
-               return -ENOMEM;
-       }
-@@ -247,25 +360,26 @@ static int __init s3c2410ts_probe(struct platform_device *pdev)
-       if (!strcmp(pdev->name, "s3c2410-ts"))
-               s3c2410_ts_connect();
--      if ((info->presc&0xff) > 0)
--              writel(S3C2410_ADCCON_PRSCEN | S3C2410_ADCCON_PRSCVL(info->presc&0xFF),\
--                           base_addr+S3C2410_ADCCON);
-+      if ((info->presc & 0xff) > 0)
-+              writel(S3C2410_ADCCON_PRSCEN |
-+                     S3C2410_ADCCON_PRSCVL(info->presc&0xFF),
-+                                                  base_addr + S3C2410_ADCCON);
-       else
--              writel(0,base_addr+S3C2410_ADCCON);
-+              writel(0, base_addr+S3C2410_ADCCON);
-       /* Initialise registers */
--      if ((info->delay&0xffff) > 0)
--              writel(info->delay & 0xffff,  base_addr+S3C2410_ADCDLY);
-+      if ((info->delay & 0xffff) > 0)
-+              writel(info->delay & 0xffff,  base_addr + S3C2410_ADCDLY);
--      writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC);
-+      writel(WAIT4INT(0), base_addr + S3C2410_ADCTSC);
-       /* Initialise input stuff */
-       memset(&ts, 0, sizeof(struct s3c2410ts));
-       input_dev = input_allocate_device();
-       if (!input_dev) {
--              printk(KERN_ERR "Unable to allocate the input device !!\n");
-+              dev_err(&pdev->dev, "Unable to allocate the input device\n");
-               return -ENOMEM;
-       }
-@@ -285,23 +399,30 @@ static int __init s3c2410ts_probe(struct platform_device *pdev)
-       ts.dev->id.version = S3C2410TSVERSION;
-       ts.shift = info->oversampling_shift;
-+      ts.extent = 1 << info->oversampling_shift;
-+      ts.reject_threshold_vs_avg = info->reject_threshold_vs_avg;
-+      ts.excursion_filter_len = 1 << info->excursion_filter_len_bits;
-+
-+      ts.raw_sample_fifo = kmalloc(sizeof(struct s3c2410ts_sample) *
-+                                         ts.excursion_filter_len, GFP_KERNEL);
-+      clear_raw_fifo();
-       /* Get irqs */
-       if (request_irq(IRQ_ADC, stylus_action, IRQF_SAMPLE_RANDOM,
--              "s3c2410_action", ts.dev)) {
--              printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_ADC !\n");
-+                                                  "s3c2410_action", ts.dev)) {
-+              dev_err(&pdev->dev, "Could not allocate ts IRQ_ADC !\n");
-               iounmap(base_addr);
-               return -EIO;
-       }
-       if (request_irq(IRQ_TC, stylus_updown, IRQF_SAMPLE_RANDOM,
-                       "s3c2410_action", ts.dev)) {
--              printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_TC !\n");
-+              dev_err(&pdev->dev, "Could not allocate ts IRQ_TC !\n");
-               free_irq(IRQ_ADC, ts.dev);
-               iounmap(base_addr);
-               return -EIO;
-       }
--      printk(KERN_INFO "%s successfully loaded\n", s3c2410ts_name);
-+      dev_info(&pdev->dev, "successfully loaded\n");
-       /* All went ok, so register to the input system */
-       rc = input_register_device(ts.dev);
-@@ -329,6 +450,8 @@ static int s3c2410ts_remove(struct platform_device *pdev)
-               adc_clock = NULL;
-       }
-+      kfree(ts.raw_sample_fifo);
-+
-       input_unregister_device(ts.dev);
-       iounmap(base_addr);
-@@ -358,17 +481,20 @@ static int s3c2410ts_resume(struct platform_device *pdev)
-       clk_enable(adc_clock);
-       mdelay(1);
-+      clear_raw_fifo();
-+
-       enable_irq(IRQ_ADC);
-       enable_irq(IRQ_TC);
-       if ((info->presc&0xff) > 0)
--              writel(S3C2410_ADCCON_PRSCEN | S3C2410_ADCCON_PRSCVL(info->presc&0xFF),\
--                           base_addr+S3C2410_ADCCON);
-+              writel(S3C2410_ADCCON_PRSCEN |
-+                     S3C2410_ADCCON_PRSCVL(info->presc&0xFF),
-+                                                    base_addr+S3C2410_ADCCON);
-       else
-               writel(0,base_addr+S3C2410_ADCCON);
-       /* Initialise registers */
--      if ((info->delay&0xffff) > 0)
-+      if ((info->delay & 0xffff) > 0)
-               writel(info->delay & 0xffff,  base_addr+S3C2410_ADCDLY);
-       writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC);
-diff --git a/include/asm-arm/arch-s3c2410/ts.h b/include/asm-arm/arch-s3c2410/ts.h
-index 593632a..44c1e4b 100644
---- a/include/asm-arm/arch-s3c2410/ts.h
-+++ b/include/asm-arm/arch-s3c2410/ts.h
-@@ -17,9 +17,11 @@
- #define __ASM_ARM_TS_H
- struct s3c2410_ts_mach_info {
--       int             delay;
--       int             presc;
--       int             oversampling_shift;
-+      int             delay;
-+      int             presc;
-+      int             oversampling_shift;
-+      int             excursion_filter_len_bits;
-+      int             reject_threshold_vs_avg;
- };
- void set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1210-fix-touchscreen-meddling-divde.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1210-fix-touchscreen-meddling-divde.patch.patch
deleted file mode 100644 (file)
index 2348784..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-From e0dc30dfda233d4ebe6f88cd1162e5952fc69027 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:43:38 +0100
-Subject: [PATCH] fix-touchscreen-meddling-divde.patch
- Reported-by: Holger Freyther <zecke@openmoko.org>
-
-length can be zero... blowing a divide by zero exception...
-which somehow I don't get (?)  Anyway the code is wrong and
-this should fix it.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/input/touchscreen/s3c2410_ts.c |   12 +++++++++---
- 1 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
-index 83e7aff..9fb95c1 100644
---- a/drivers/input/touchscreen/s3c2410_ts.c
-+++ b/drivers/input/touchscreen/s3c2410_ts.c
-@@ -226,12 +226,18 @@ static irqreturn_t stylus_action(int irq, void *dev_id)
-       unsigned long x;
-       unsigned long y;
-       int length = (ts.head_raw_fifo - ts.tail_raw_fifo) & (ts.extent - 1);
--      int scaled_avg_x = ts.raw_running_avg.x / length;
--      int scaled_avg_y = ts.raw_running_avg.y / length;
-+      int scaled_avg_x;
-+      int scaled_avg_y;
-       x = readl(base_addr + S3C2410_ADCDAT0) & S3C2410_ADCDAT0_XPDATA_MASK;
-       y = readl(base_addr + S3C2410_ADCDAT1) & S3C2410_ADCDAT1_YPDATA_MASK;
-+      if (!length)
-+              goto store_sample;
-+
-+      scaled_avg_x = ts.raw_running_avg.x / length;
-+      scaled_avg_y = ts.raw_running_avg.y / length;
-+
-       /* we appear to accept every sample into both the running average FIFO
-        * and the summing average.  BUT, if the last sample crossed a
-        * machine-set threshold, each time we do a beauty contest
-@@ -280,7 +286,7 @@ static irqreturn_t stylus_action(int irq, void *dev_id)
-       else
-               ts.flag_previous_exceeded_threshold = 1;
--      /* accepted */
-+store_sample:
-       ts.xp += x;
-       ts.yp += y;
-       ts.count++;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1211-fix-lis302dl-resume-and-init-reload-boot-coefficient.patch b/target/linux/s3c24xx/patches-2.6.24/1211-fix-lis302dl-resume-and-init-reload-boot-coefficient.patch
deleted file mode 100644 (file)
index bbc4190..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-From b70bd0433a197f93f927f7b5720efe889aa4b430 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:43:45 +0100
-Subject: [PATCH] fix-lis302dl-resume-and-init-reload-boot-coefficients.patch
- Reported-by: John Lee <john_lee@openmoko.com>
-
-We don't reset the devices either at init or resume, where init
-means use the BOOT bit to reload device calibration coefficients
-from internal EEPROM.  John Lee saw brain-damaged behaviour after
-resume and sometimes after boot (since it may not have lost power
-to force a BOOT itself that makes sense).
-
-This patch
-
- - adds a diagnostic dump feature down /sys
- - forces BOOT action on init and resume, and waits for
-   completion
- - makes sure XYZ capture is enabled on resume
- - adds some constants in the .h and removes some magic numbers
-   in the code by using them
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/input/misc/lis302dl.c |   78 +++++++++++++++++++++++++++++++++++++++--
- include/linux/lis302dl.h      |    9 +++++
- 2 files changed, 84 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
-index 6067dba..de8478d 100644
---- a/drivers/input/misc/lis302dl.c
-+++ b/drivers/input/misc/lis302dl.c
-@@ -221,9 +221,37 @@ static ssize_t set_scale(struct device *dev, struct device_attribute *attr,
- static DEVICE_ATTR(full_scale, S_IRUGO | S_IWUSR, show_scale, set_scale);
-+static ssize_t lis302dl_dump(struct device *dev, struct device_attribute *attr,
-+                        char *buf)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(dev);
-+      int n = 0;
-+      u8 reg[0x40];
-+      char *end = buf;
-+      unsigned long flags;
-+
-+      local_save_flags(flags);
-+
-+      for (n = 0; n < sizeof(reg); n++)
-+              reg[n] = reg_read(lis, n);
-+
-+      local_irq_restore(flags);
-+
-+      for (n = 0; n < sizeof(reg); n += 16) {
-+              hex_dump_to_buffer(reg + n, 16, 16, 1, end, 128, 0);
-+              end += strlen(end);
-+              *end++ = '\n';
-+              *end++ = '\0';
-+      }
-+
-+      return end - buf;
-+}
-+static DEVICE_ATTR(dump, S_IRUGO, lis302dl_dump, NULL);
-+
- static struct attribute *lis302dl_sysfs_entries[] = {
-       &dev_attr_sample_rate.attr,
-       &dev_attr_full_scale.attr,
-+      &dev_attr_dump.attr,
-       NULL
- };
-@@ -276,6 +304,24 @@ static void lis302dl_input_close(struct input_dev *inp)
-       local_irq_restore(flags);
- }
-+/* get the device to reload its coefficients from EEPROM and wait for it
-+ * to complete
-+ */
-+
-+static int __lis302dl_reset_device(struct lis302dl_info *lis)
-+{
-+      int timeout = 10;
-+
-+      reg_write(lis, LIS302DL_REG_CTRL2, LIS302DL_CTRL2_BOOT |
-+                                                          LIS302DL_CTRL2_FDS);
-+
-+      while ((reg_read(lis, LIS302DL_REG_CTRL2) & LIS302DL_CTRL2_BOOT) &&
-+                                                                  (timeout--))
-+              mdelay(1);
-+
-+      return !!(timeout < 0);
-+}
-+
- static int __devinit lis302dl_probe(struct spi_device *spi)
- {
-       int rc;
-@@ -347,12 +393,24 @@ static int __devinit lis302dl_probe(struct spi_device *spi)
-               goto bail_inp_dev;
-       }
--      reg_write(lis, LIS302DL_REG_CTRL1, 0x47);
--      reg_write(lis, LIS302DL_REG_CTRL3, 0xc0);
-+      if (__lis302dl_reset_device(lis))
-+              dev_err(&spi->dev, "device BOOT reload failed\n");
-+
-+      /* force us powered */
-+      reg_write(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD |
-+                                         LIS302DL_CTRL1_Xen |
-+                                         LIS302DL_CTRL1_Yen |
-+                                         LIS302DL_CTRL1_Zen);
-+      mdelay(1);
-+
-+      reg_write(lis, LIS302DL_REG_CTRL2, 0);
-+      reg_write(lis, LIS302DL_REG_CTRL3, LIS302DL_CTRL3_PP_OD |
-+                                                          LIS302DL_CTRL3_IHL);
-       reg_write(lis, LIS302DL_REG_FF_WU_THS_1, 0x14);
-       reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1, 0x00);
-       reg_write(lis, LIS302DL_REG_FF_WU_CFG_1, 0x95);
-+      /* start off in powered down mode; we power up when someone opens us */
-       reg_write(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_Xen |
-                                          LIS302DL_CTRL1_Yen |
-                                          LIS302DL_CTRL1_Zen);
-@@ -494,8 +552,22 @@ static int lis302dl_resume(struct spi_device *spi)
-       /* get our IO to the device back in operational states */
-       (lis->pdata->lis302dl_suspend_io)(lis, 1);
-+      /* resume from powerdown first! */
-+      reg_write(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD |
-+                                         LIS302DL_CTRL1_Xen |
-+                                         LIS302DL_CTRL1_Yen |
-+                                         LIS302DL_CTRL1_Zen);
-+      mdelay(1);
-+
-+      if (__lis302dl_reset_device(lis))
-+              dev_err(&spi->dev, "device BOOT reload failed\n");
-+
-       /* restore registers after resume */
--      reg_write(lis, LIS302DL_REG_CTRL1, lis->regs[LIS302DL_REG_CTRL1]);
-+      reg_write(lis, LIS302DL_REG_CTRL1, lis->regs[LIS302DL_REG_CTRL1] |
-+                                              LIS302DL_CTRL1_PD |
-+                                              LIS302DL_CTRL1_Xen |
-+                                              LIS302DL_CTRL1_Yen |
-+                                              LIS302DL_CTRL1_Zen);
-       reg_write(lis, LIS302DL_REG_CTRL2, lis->regs[LIS302DL_REG_CTRL2]);
-       reg_write(lis, LIS302DL_REG_CTRL3, lis->regs[LIS302DL_REG_CTRL3]);
-       reg_write(lis, LIS302DL_REG_FF_WU_CFG_1,
-diff --git a/include/linux/lis302dl.h b/include/linux/lis302dl.h
-index 0d6b4c4..4d8ded9 100644
---- a/include/linux/lis302dl.h
-+++ b/include/linux/lis302dl.h
-@@ -66,6 +66,15 @@ enum lis302dl_reg_ctrl1 {
-       LIS302DL_CTRL1_DR               = 0x80,
- };
-+enum lis302dl_reg_ctrl2 {
-+      LIS302DL_CTRL2_HPC1             = 0x01,
-+      LIS302DL_CTRL2_HPC2             = 0x02,
-+      LIS302DL_CTRL2_HPFF1            = 0x04,
-+      LIS302DL_CTRL2_HPFF2            = 0x08,
-+      LIS302DL_CTRL2_FDS              = 0x10,
-+      LIS302DL_CTRL2_BOOT             = 0x40,
-+      LIS302DL_CTRL2_SIM              = 0x80,
-+};
- enum lis302dl_reg_ctrl3 {
-       LIS302DL_CTRL3_PP_OD            = 0x40,
-       LIS302DL_CTRL3_IHL              = 0x80,
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1212-fix-gsm-resume-problems.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1212-fix-gsm-resume-problems.patch.patch
deleted file mode 100644 (file)
index 8c6d68e..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-From 2a1042fc56273fac721207597968af313751c17b Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:43:53 +0100
-Subject: [PATCH] fix-gsm-resume-problems.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |   32 ++++++++++++++++++++++++++++++++
- drivers/serial/s3c2410.c               |   17 +++++++++++++++++
- 2 files changed, 49 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index 149b866..d70a481 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -18,6 +18,7 @@
- #include <linux/console.h>
- #include <linux/errno.h>
- #include <linux/interrupt.h>
-+#include <linux/resume-dependency.h>
- #include <asm/gpio.h>
- #include <asm/mach-types.h>
-@@ -33,9 +34,12 @@
- struct gta01pm_priv {
-       int gpio_ngsm_en;
-         int gpio_ndl_gsm;
-+
-       struct console *con;
- };
-+struct resume_dependency resume_dep_gsm_uart;
-+
- static struct gta01pm_priv gta01_gsm;
- static struct console *find_s3c24xx_console(void)
-@@ -179,6 +183,21 @@ static DEVICE_ATTR(reset, 0644, gsm_read, gsm_write);
- static DEVICE_ATTR(download, 0644, gsm_read, gsm_write);
- #ifdef CONFIG_PM
-+static void gsm_resume_work(struct work_struct *w)
-+{
-+      printk(KERN_INFO "%s: waiting...\n", __FUNCTION__);
-+      if (gsm_autounlock_delay)
-+              msleep(gsm_autounlock_delay);
-+      if (gsm_auto_flowcontrolled) {
-+              if (machine_is_neo1973_gta01())
-+                      s3c24xx_fake_rx_interrupt(10000);
-+              s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPH1_nRTS0);
-+              gsm_auto_flowcontrolled = 0;
-+      }
-+      printk(KERN_INFO "%s: done.\n", __FUNCTION__);
-+}
-+
-+static int gta01_gsm_resume(struct platform_device *pdev);
- static int gta01_gsm_suspend(struct platform_device *pdev, pm_message_t state)
- {
-       /* GPIO state is saved/restored by S3C2410 core GPIO driver, so we
-@@ -189,11 +208,22 @@ static int gta01_gsm_suspend(struct platform_device *pdev, pm_message_t state)
-       if (machine_is_neo1973_gta02())
-               s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, 1);
-+      /* register our resume dependency on the appropriate UART being up */
-+      resume_dep_gsm_uart.callback = gta01_gsm_resume;
-+      resume_dep_gsm_uart.context = (void *)pdev;
-+
-+      s3c24xx_serial_register_resume_dependency(&resume_dep_gsm_uart, 0);
-+
-       return 0;
- }
- static int gta01_gsm_resume(struct platform_device *pdev)
- {
-+      if (resume_dep_gsm_uart.called_flag != 1)
-+              return 0;
-+
-+      resume_dep_gsm_uart.called_flag++; /* only run once */
-+
-       /* GPIO state is saved/restored by S3C2410 core GPIO driver, so we
-        * don't need to do much here. */
-@@ -279,6 +309,8 @@ static int __init gta01_gsm_probe(struct platform_device *pdev)
-       if (machine_is_neo1973_gta02())
-               s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, 1);
-+      init_resume_dependency_list(&resume_dep_gsm_uart);
-+
-       return sysfs_create_group(&pdev->dev.kobj, &gta01_gsm_attr_group);
- }
-diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
-index b566f42..bc6736d 100644
---- a/drivers/serial/s3c2410.c
-+++ b/drivers/serial/s3c2410.c
-@@ -72,6 +72,7 @@
- #include <linux/serial.h>
- #include <linux/delay.h>
- #include <linux/clk.h>
-+#include <linux/resume-dependency.h>
- #include <asm/io.h>
- #include <asm/irq.h>
-@@ -112,6 +113,8 @@ struct s3c24xx_uart_port {
-       struct clk                      *clk;
-       struct clk                      *baudclk;
-       struct uart_port                port;
-+
-+      struct resume_dependency        resume_dependency;
- };
-@@ -1085,6 +1088,8 @@ static int s3c24xx_serial_probe(struct platform_device *dev,
-       ourport = &s3c24xx_serial_ports[probe_index];
-       probe_index++;
-+      init_resume_dependency_list(&ourport->resume_dependency);
-+
-       dbg("%s: initialising port %p...\n", __FUNCTION__, ourport);
-       ret = s3c24xx_serial_init_port(ourport, info, dev);
-@@ -1125,6 +1130,16 @@ static int s3c24xx_serial_suspend(struct platform_device *dev, pm_message_t stat
-       return 0;
- }
-+void s3c24xx_serial_register_resume_dependency(struct resume_dependency *
-+                                            resume_dependency, int uart_index)
-+{
-+      struct s3c24xx_uart_port *ourport = &s3c24xx_serial_ports[uart_index];
-+
-+      register_resume_dependency(&ourport->resume_dependency,
-+                                                           resume_dependency);
-+}
-+EXPORT_SYMBOL(s3c24xx_serial_register_resume_dependency);
-+
- static int s3c24xx_serial_resume(struct platform_device *dev)
- {
-       struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);
-@@ -1138,6 +1153,8 @@ static int s3c24xx_serial_resume(struct platform_device *dev)
-               uart_resume_port(&s3c24xx_uart_drv, port);
-       }
-+      callback_all_resume_dependencies(&ourport->resume_dependency);
-+
-       return 0;
- }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1213-clean-gsm-flow-control.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1213-clean-gsm-flow-control.patch.patch
deleted file mode 100644 (file)
index 4d491e3..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-From 6da7929da1b46bccaae0f53bf7a26cdd74a3b70a Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Wed, 2 Jul 2008 22:44:01 +0100
-Subject: [PATCH] clean-gsm-flow-control.patch
-
-Signed-off-by: Mike Westerhof <mwester@dls.net>
-
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |   52 +-------
- drivers/serial/s3c2410.c               |  204 +++-----------------------------
- 2 files changed, 24 insertions(+), 232 deletions(-)
----
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |   32 ++++++++++++++++++--------------
- drivers/serial/s3c2410.c               |    3 ++-
- 2 files changed, 20 insertions(+), 15 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index d70a481..f3c9504 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -31,6 +31,18 @@
- #include <asm/arch/regs-gpioj.h>
- #endif
-+extern void s3c24xx_serial_register_resume_dependency(struct resume_dependency *
-+                                           resume_dependency, int uart_index);
-+
-+/* flag set if we flow-controlled the GSM in our suspend routine */
-+int gsm_auto_flowcontrolled;
-+
-+int gta01_gsm_enabled;
-+EXPORT_SYMBOL(gta01_gsm_enabled);
-+
-+int gta_gsm_interrupts;
-+EXPORT_SYMBOL(gta_gsm_interrupts);
-+
- struct gta01pm_priv {
-       int gpio_ngsm_en;
-         int gpio_ndl_gsm;
-@@ -183,20 +195,6 @@ static DEVICE_ATTR(reset, 0644, gsm_read, gsm_write);
- static DEVICE_ATTR(download, 0644, gsm_read, gsm_write);
- #ifdef CONFIG_PM
--static void gsm_resume_work(struct work_struct *w)
--{
--      printk(KERN_INFO "%s: waiting...\n", __FUNCTION__);
--      if (gsm_autounlock_delay)
--              msleep(gsm_autounlock_delay);
--      if (gsm_auto_flowcontrolled) {
--              if (machine_is_neo1973_gta01())
--                      s3c24xx_fake_rx_interrupt(10000);
--              s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPH1_nRTS0);
--              gsm_auto_flowcontrolled = 0;
--      }
--      printk(KERN_INFO "%s: done.\n", __FUNCTION__);
--}
--
- static int gta01_gsm_resume(struct platform_device *pdev);
- static int gta01_gsm_suspend(struct platform_device *pdev, pm_message_t state)
- {
-@@ -235,6 +233,12 @@ static int gta01_gsm_resume(struct platform_device *pdev)
-       if (machine_is_neo1973_gta02())
-               s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, gta01_gsm.gpio_ndl_gsm);
-+      /* If we forced flow-control on the GSM, we should also release it */
-+      if (gsm_auto_flowcontrolled) {
-+              s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPH1_nRTS0);
-+              gsm_auto_flowcontrolled = 0;
-+      }
-+
-       return 0;
- }
- #else
-diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
-index bc6736d..73c6284 100644
---- a/drivers/serial/s3c2410.c
-+++ b/drivers/serial/s3c2410.c
-@@ -385,7 +385,8 @@ s3c24xx_serial_rx_chars(int irq, void *dev_id)
-               if (uart_handle_sysrq_char(port, ch))
-                       goto ignore_char;
--              uart_insert_char(port, uerstat, S3C2410_UERSTAT_OVERRUN, ch, flag);
-+              uart_insert_char(port, uerstat, S3C2410_UERSTAT_OVERRUN, ch,
-+                                                                        flag);
-       ignore_char:
-               continue;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1214-introduce-resume-exception-capture.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1214-introduce-resume-exception-capture.patch.patch
deleted file mode 100644 (file)
index e5900e0..0000000
+++ /dev/null
@@ -1,264 +0,0 @@
-From 8e18a9db5f895f654b06000d7bd10528e6b795f3 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:44:11 +0100
-Subject: [PATCH] introduce-resume-exception-capture.patch
-
-This patch introduces a new resume debugging concept: if we
-get an OOPS inbetween starting suspend and finishing resume, it
-uses a new "emergency spew" device similar to BUT NOT REQUIRING
-CONFIG_DEBUG_LL to dump the syslog buffer and then the OOPS
-on the debug device defined by the existing CONFIG_DEBUG_S3C_UART
-index.  But neither CONFIG_DEBUG_LL nor the S3C low level configs
-are needed to use this feature.
-
-Another difference between this feature and CONFIG_DEBUG_LL is that
-it does not affect resume timing, ordering or UART traffic UNLESS
-there is an OOPS during resume.
-
-The patch adds three global exports, one to say if we are inside
-suspend / resume, and two callbacks for printk() to use to init
-and dump the emergency data.  The callbacks are set in s3c serial
-device init, but the whole structure is arch independent.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/serial/s3c2410.c |   69 ++++++++++++++++++++++++++++++++++++++++++++++
- include/linux/kernel.h   |    2 +
- include/linux/suspend.h  |    6 ++++
- kernel/power/main.c      |   10 ++++++-
- kernel/printk.c          |   41 +++++++++++++++++++++++++++
- 5 files changed, 127 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
-index 73c6284..fef3c8f 100644
---- a/drivers/serial/s3c2410.c
-+++ b/drivers/serial/s3c2410.c
-@@ -81,6 +81,7 @@
- #include <asm/plat-s3c/regs-serial.h>
- #include <asm/arch/regs-gpio.h>
-+#include <asm/arch/regs-clock.h>
- /* structures */
-@@ -992,6 +993,69 @@ static struct s3c24xx_uart_port s3c24xx_serial_ports[NR_PORTS] = {
- #endif
- };
-+static void s3c24xx_serial_force_debug_port_up(void)
-+{
-+      struct s3c24xx_uart_port *ourport = &s3c24xx_serial_ports[
-+                                                       CONFIG_DEBUG_S3C_UART];
-+      struct s3c24xx_uart_clksrc *clksrc = NULL;
-+      struct clk *clk = NULL;
-+      unsigned long tmp;
-+
-+      s3c24xx_serial_getclk(&ourport->port, &clksrc, &clk, 115200);
-+
-+      tmp = __raw_readl(S3C2410_CLKCON);
-+
-+      /* re-start uart clocks */
-+      tmp |= S3C2410_CLKCON_UART0;
-+      tmp |= S3C2410_CLKCON_UART1;
-+      tmp |= S3C2410_CLKCON_UART2;
-+
-+      __raw_writel(tmp, S3C2410_CLKCON);
-+      udelay(10);
-+
-+      s3c24xx_serial_setsource(&ourport->port, clksrc);
-+
-+      if (ourport->baudclk != NULL && !IS_ERR(ourport->baudclk)) {
-+              clk_disable(ourport->baudclk);
-+              ourport->baudclk  = NULL;
-+      }
-+
-+      clk_enable(clk);
-+
-+      ourport->clksrc = clksrc;
-+      ourport->baudclk = clk;
-+}
-+
-+static void s3c2410_printascii(const char *sz)
-+{
-+      struct s3c24xx_uart_port *ourport = &s3c24xx_serial_ports[
-+                                                       CONFIG_DEBUG_S3C_UART];
-+      struct uart_port *port = &ourport->port;
-+
-+      /* 8 N 1 */
-+      wr_regl(port, S3C2410_ULCON, (rd_regl(port, S3C2410_ULCON)) | 3);
-+      /* polling mode */
-+      wr_regl(port, S3C2410_UCON, (rd_regl(port, S3C2410_UCON) & ~0xc0f) | 5);
-+      /* disable FIFO */
-+      wr_regl(port, S3C2410_UFCON, (rd_regl(port, S3C2410_UFCON) & ~0x01));
-+      /* fix baud rate */
-+      wr_regl(port, S3C2410_UBRDIV, 26);
-+
-+      while (*sz) {
-+              int timeout = 10000000;
-+
-+              /* spin on it being busy */
-+              while ((!(rd_regl(port, S3C2410_UTRSTAT) & 2)) && timeout--)
-+                      ;
-+
-+              /* transmit register */
-+              wr_regl(port, S3C2410_UTXH, *sz);
-+
-+              sz++;
-+      }
-+}
-+
-+
- /* s3c24xx_serial_resetport
-  *
-  * wrapper to call the specific reset for this port (reset the fifos
-@@ -1167,6 +1231,11 @@ static int s3c24xx_serial_resume(struct platform_device *dev)
- static int s3c24xx_serial_init(struct platform_driver *drv,
-                              struct s3c24xx_uart_info *info)
- {
-+      /* set up the emergency debug UART functions */
-+
-+      printk_emergency_debug_spew_init = s3c24xx_serial_force_debug_port_up;
-+      printk_emergency_debug_spew_send_string = s3c2410_printascii;
-+
-       dbg("s3c24xx_serial_init(%p,%p)\n", drv, info);
-       return platform_driver_register(drv);
- }
-diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index 94bc996..8e565b4 100644
---- a/include/linux/kernel.h
-+++ b/include/linux/kernel.h
-@@ -182,6 +182,8 @@ asmlinkage int printk(const char * fmt, ...)
- extern int log_buf_get_len(void);
- extern int log_buf_read(int idx);
- extern int log_buf_copy(char *dest, int idx, int len);
-+extern void (*printk_emergency_debug_spew_init)(void);
-+extern void (*printk_emergency_debug_spew_send_string)(const char *);
- #else
- static inline int vprintk(const char *s, va_list args)
-       __attribute__ ((format (printf, 1, 0)));
-diff --git a/include/linux/suspend.h b/include/linux/suspend.h
-index 4360e08..7186eef 100644
---- a/include/linux/suspend.h
-+++ b/include/linux/suspend.h
-@@ -122,6 +122,12 @@ struct pbe {
-       struct pbe *next;
- };
-+/**
-+ * global indication we are somewhere between start of suspend and end of
-+ * resume, nonzero is true
-+ */
-+extern int global_inside_suspend;
-+
- /* mm/page_alloc.c */
- extern void drain_local_pages(void);
- extern void mark_free_pages(struct zone *zone);
-diff --git a/kernel/power/main.c b/kernel/power/main.c
-index f71c950..d87bf0d 100644
---- a/kernel/power/main.c
-+++ b/kernel/power/main.c
-@@ -31,6 +31,10 @@ DEFINE_MUTEX(pm_mutex);
- unsigned int pm_flags;
- EXPORT_SYMBOL(pm_flags);
-+int global_inside_suspend;
-+EXPORT_SYMBOL(global_inside_suspend);
-+
-+
- #ifdef CONFIG_SUSPEND
- /* This is just an arbitrary number */
-@@ -156,10 +160,12 @@ int suspend_devices_and_enter(suspend_state_t state)
-       if (!suspend_ops)
-               return -ENOSYS;
-+      global_inside_suspend = 1;
-+
-       if (suspend_ops->set_target) {
-               error = suspend_ops->set_target(state);
-               if (error)
--                      return error;
-+                      goto bail;
-       }
-       suspend_console();
-       error = device_suspend(PMSG_SUSPEND);
-@@ -183,6 +189,8 @@ int suspend_devices_and_enter(suspend_state_t state)
-       device_resume();
-  Resume_console:
-       resume_console();
-+bail:
-+      global_inside_suspend = 0;
-       return error;
- }
-diff --git a/kernel/printk.c b/kernel/printk.c
-index 89011bf..c8691bc 100644
---- a/kernel/printk.c
-+++ b/kernel/printk.c
-@@ -33,8 +33,11 @@
- #include <linux/bootmem.h>
- #include <linux/syscalls.h>
- #include <linux/jiffies.h>
-+#include <linux/suspend.h>
- #include <asm/uaccess.h>
-+#include <asm/plat-s3c24xx/neo1973.h>
-+#include <asm/arch/gta02.h>
- #define __LOG_BUF_LEN (1 << CONFIG_LOG_BUF_SHIFT)
-@@ -61,6 +64,12 @@ int console_printk[4] = {
- int oops_in_progress;
- EXPORT_SYMBOL(oops_in_progress);
-+void (*printk_emergency_debug_spew_init)(void) = NULL;
-+EXPORT_SYMBOL(printk_emergency_debug_spew_init);
-+
-+void (*printk_emergency_debug_spew_send_string)(const char *) = NULL;
-+EXPORT_SYMBOL(printk_emergency_debug_spew_send_string);
-+
- /*
-  * console_sem protects the console_drivers list, and also
-  * provides serialisation for access to the entire console
-@@ -653,6 +662,38 @@ asmlinkage int vprintk(const char *fmt, va_list args)
-       /* Emit the output into the temporary buffer */
-       printed_len = vscnprintf(printk_buf, sizeof(printk_buf), fmt, args);
-+      /* if you're debugging resume, the normal methods can change resume
-+       * ordering behaviours because their debugging output is synchronous
-+       * (ie, CONFIG_DEBUG_LL).  If your problem is an OOPS, this code
-+       * will not affect the speed and duration and ordering of resume
-+       * actions, but will give you a chance to read the full undumped
-+       * syslog AND the OOPS data when it happens
-+       *
-+       * if you support it, your debug device init can override the exported
-+       * emergency_debug_spew_init and emergency_debug_spew_send_string to
-+       * usually force polling or bitbanging on your debug console device
-+       */
-+      if (oops_in_progress && global_inside_suspend &&
-+          printk_emergency_debug_spew_init &&
-+          printk_emergency_debug_spew_send_string) {
-+              unsigned long cur_index;
-+              char ch[2];
-+
-+              if (global_inside_suspend == 1) {
-+                      (printk_emergency_debug_spew_init)();
-+
-+                      ch[1] = '\0';
-+                      cur_index = con_start;
-+                      while (cur_index != log_end) {
-+                              ch[0] = LOG_BUF(cur_index);
-+                              (printk_emergency_debug_spew_send_string)(ch);
-+                              cur_index++;
-+                      }
-+                      global_inside_suspend++; /* only once */
-+              }
-+              (printk_emergency_debug_spew_send_string)(printk_buf);
-+      }
-+
-       /*
-        * Copy the output into log_buf.  If the caller didn't provide
-        * appropriate log level tags, we insert them here
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1215-From-119f4e02ba81cffe4dbc88d8ff667048ad28d925-Mon-Se.patch b/target/linux/s3c24xx/patches-2.6.24/1215-From-119f4e02ba81cffe4dbc88d8ff667048ad28d925-Mon-Se.patch
deleted file mode 100644 (file)
index b3f0170..0000000
+++ /dev/null
@@ -1,322 +0,0 @@
-From e2303161c93a90b966679b84c18838398b847d2c Mon Sep 17 00:00:00 2001
-From: Andrzej Zaborowski <balrog@zabor.org>
-Date: Wed, 2 Jul 2008 22:44:22 +0100
-Subject: [PATCH] From 119f4e02ba81cffe4dbc88d8ff667048ad28d925 Mon Sep 17 00:00:00 2001
- Subject: [PATCH] Hacky CONFIG_NO_IDLE_HZ (dyn-tick) support for S3C24xx.
-
----
- arch/arm/plat-s3c24xx/time.c |  247 +++++++++++++++++++++++++++++++++++-------
- 1 files changed, 209 insertions(+), 38 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/time.c b/arch/arm/plat-s3c24xx/time.c
-index 39fc33d..42d7111 100644
---- a/arch/arm/plat-s3c24xx/time.c
-+++ b/arch/arm/plat-s3c24xx/time.c
-@@ -3,6 +3,8 @@
-  * Copyright (C) 2003-2005 Simtec Electronics
-  *    Ben Dooks, <ben@simtec.co.uk>
-  *
-+ * dyn_tick support by Andrzej Zaborowski based on omap_dyn_tick_timer.
-+ *
-  * 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
-@@ -44,6 +46,9 @@ static unsigned long timer_startval;
- static unsigned long timer_usec_ticks;
- static struct work_struct resume_work;
-+unsigned long pclk;
-+struct clk *clk;
-+
- #define TIMER_USEC_SHIFT 16
- /* we use the shifted arithmetic to work out the ratio of timer ticks
-@@ -180,11 +185,7 @@ static void s3c2410_timer_setup (void)
-               tcfg1 &= ~S3C2410_TCFG1_MUX4_MASK;
-               tcfg1 |= S3C2410_TCFG1_MUX4_TCLK1;
-       } else {
--              unsigned long pclk;
--              struct clk *clk;
--
--              /* for the h1940 (and others), we use the pclk from the core
--               * to generate the timer values. since values around 50 to
-+              /* since values around 50 to
-                * 70MHz are not values we can directly generate the timer
-                * value from, we need to pre-scale and divide before using it.
-                *
-@@ -192,20 +193,7 @@ static void s3c2410_timer_setup (void)
-                * (8.45 ticks per usec)
-                */
--              /* this is used as default if no other timer can be found */
--
--              clk = clk_get(NULL, "timers");
--              if (IS_ERR(clk))
--                      panic("failed to get clock for system timer");
--
--              clk_enable(clk);
--
--              pclk = clk_get_rate(clk);
--
--              printk("pclk = %lu\n", pclk);
--
-               /* configure clock tick */
--
-               timer_usec_ticks = timer_mask_usec_ticks(6, pclk);
-               printk("timer_usec_ticks = %lu\n", timer_usec_ticks);
-@@ -216,11 +204,6 @@ static void s3c2410_timer_setup (void)
-               tcfg0 |= ((6 - 1) / 2) << S3C2410_TCFG_PRESCALER1_SHIFT;
-               tcnt = (pclk / 6) / HZ;
--
--              /* start the timer running */
--              tcon |= S3C2410_TCON_T4START | S3C2410_TCON_T4RELOAD;
--              tcon &= ~S3C2410_TCON_T4MANUALUPD;
--              __raw_writel(tcon, S3C2410_TCON);
-       }
-       /* timers reload after counting zero, so reduce the count by 1 */
-@@ -262,27 +245,37 @@ static void s3c2410_timer_setup (void)
- }
-+struct sys_timer s3c24xx_timer;
- static void timer_resume_work(struct work_struct *work)
- {
--      s3c2410_timer_setup();
--}
--
--/* ooh a nasty situation arises if we try to call s3c2410_timer_setup() from
-- * the resume handler.  It is called in atomic context but the clock APIs
-- * try to lock a mutex which may sleep.  We are in a bit of an unusual
-- * situation because we don't have a tick source right now, but it should be
-- * okay to try to schedule a work item... hopefully
-- */
--
--static void s3c2410_timer_resume_atomic(void)
--{
--      int ret = schedule_work(&resume_work);
--      if (!ret)
--              printk(KERN_INFO"Failed to schedule_work tick ctr (%d)\n", ret);
-+      clk_enable(clk);
-+
-+#ifdef CONFIG_NO_IDLE_HZ
-+      if (s3c24xx_timer.dyn_tick->state & DYN_TICK_ENABLED)
-+              s3c24xx_timer.dyn_tick->enable();
-+      else
-+#endif
-+              s3c2410_timer_setup();
- }
- static void __init s3c2410_timer_init (void)
- {
-+      if (!use_tclk1_12()) {
-+              /* for the h1940 (and others), we use the pclk from the core
-+               * to generate the timer values.
-+               */
-+
-+              /* this is used as default if no other timer can be found */
-+              clk = clk_get(NULL, "timers");
-+              if (IS_ERR(clk))
-+                      panic("failed to get clock for system timer");
-+
-+              clk_enable(clk);
-+
-+              pclk = clk_get_rate(clk);
-+              printk("pclk = %lu\n", pclk);
-+      }
-+
-       INIT_WORK(&resume_work, timer_resume_work);
-       s3c2410_timer_setup();
-       setup_irq(IRQ_TIMER4, &s3c2410_timer_irq);
-@@ -304,8 +297,186 @@ static void s3c2410_timer_resume(void)
-                   "s3c2410_timer_resume_work already queued ???\n");
- }
-+#ifdef CONFIG_NO_IDLE_HZ
-+/*
-+ * We'll set a constant prescaler so we don't have to bother setting it
-+ * when reprogramming and so that we avoid costly divisions.
-+ *
-+ * (2 * HZ) << INPUT_FREQ_SHIFT is the desired frequency after prescaler.
-+ * At HZ == 200, HZ * 1024 should work for PCLKs of up to ~53.5 MHz.
-+ */
-+#define INPUT_FREQ_SHIFT      9
-+
-+static int ticks_last;
-+static int ticks_left;
-+static uint32_t tcnto_last;
-+
-+static inline int s3c24xx_timer_read(void)
-+{
-+      uint32_t tcnto = __raw_readl(S3C2410_TCNTO(4));
-+
-+      /*
-+       * WARNING: sometimes we get called before TCNTB has been
-+       * loaded into the counter and TCNTO then returns its previous
-+       * value and kill us, so don't do anything before counter is
-+       * reloaded.
-+       */
-+      if (unlikely(tcnto == tcnto_last))
-+              return ticks_last;
-+
-+      tcnto_last = -1;
-+      return tcnto <<
-+              ((__raw_readl(S3C2410_TCFG1) >> S3C2410_TCFG1_MUX4_SHIFT) & 3);
-+}
-+
-+static inline void s3c24xx_timer_program(int ticks)
-+{
-+      uint32_t tcon = __raw_readl(S3C2410_TCON) & ~(7 << 20);
-+      uint32_t tcfg1 = __raw_readl(S3C2410_TCFG1) & ~S3C2410_TCFG1_MUX4_MASK;
-+
-+      /* Just make sure the timer is stopped.  */
-+      __raw_writel(tcon, S3C2410_TCON);
-+
-+      /* TODO: add likely()ies / unlikely()ies */
-+      if (ticks >> 18) {
-+              ticks_last = min(ticks, 0xffff << 3);
-+              ticks_left = ticks - ticks_last;
-+              __raw_writel(tcfg1 | S3C2410_TCFG1_MUX4_DIV16, S3C2410_TCFG1);
-+              __raw_writel(ticks_last >> 3, S3C2410_TCNTB(4));
-+      } else if (ticks >> 17) {
-+              ticks_last = ticks;
-+              ticks_left = 0;
-+              __raw_writel(tcfg1 | S3C2410_TCFG1_MUX4_DIV8, S3C2410_TCFG1);
-+              __raw_writel(ticks_last >> 2, S3C2410_TCNTB(4));
-+      } else if (ticks >> 16) {
-+              ticks_last = ticks;
-+              ticks_left = 0;
-+              __raw_writel(tcfg1 | S3C2410_TCFG1_MUX4_DIV4, S3C2410_TCFG1);
-+              __raw_writel(ticks_last >> 1, S3C2410_TCNTB(4));
-+      } else {
-+              ticks_last = ticks;
-+              ticks_left = 0;
-+              __raw_writel(tcfg1 | S3C2410_TCFG1_MUX4_DIV2, S3C2410_TCFG1);
-+              __raw_writel(ticks_last >> 0, S3C2410_TCNTB(4));
-+      }
-+
-+      tcnto_last = __raw_readl(S3C2410_TCNTO(4));
-+      __raw_writel(tcon | S3C2410_TCON_T4MANUALUPD,
-+                      S3C2410_TCON);
-+      __raw_writel(tcon | S3C2410_TCON_T4START,
-+                      S3C2410_TCON);
-+}
-+
-+/*
-+ * If we have already waited all the time we were supposed to wait,
-+ * kick the timer, setting the longest allowed timeout value just
-+ * for time-keeping.
-+ */
-+static inline void s3c24xx_timer_program_idle(void)
-+{
-+      s3c24xx_timer_program(0xffff << 3);
-+}
-+
-+static inline void s3c24xx_timer_update(int restart)
-+{
-+      int ticks_cur = s3c24xx_timer_read();
-+      int jiffies_elapsed = (ticks_last - ticks_cur) >> INPUT_FREQ_SHIFT;
-+      int subjiffy = ticks_last - (jiffies_elapsed << INPUT_FREQ_SHIFT);
-+
-+      if (restart) {
-+              if (ticks_left >= (1 << INPUT_FREQ_SHIFT))
-+                      s3c24xx_timer_program(ticks_left);
-+              else
-+                      s3c24xx_timer_program_idle();
-+              ticks_last += subjiffy;
-+      } else
-+              ticks_last = subjiffy;
-+
-+      while (jiffies_elapsed --)
-+              timer_tick();
-+}
-+
-+/* Called when the timer expires.  */
-+static irqreturn_t s3c24xx_timer_handler(int irq, void *dev_id)
-+{
-+      tcnto_last = -1;
-+      s3c24xx_timer_update(1);
-+
-+      return IRQ_HANDLED;
-+}
-+
-+/* Called to update jiffies with time elapsed.  */
-+static irqreturn_t s3c24xx_timer_handler_dyn_tick(int irq, void *dev_id)
-+{
-+      s3c24xx_timer_update(0);
-+
-+      return IRQ_HANDLED;
-+}
-+
-+/*
-+ * Programs the next timer interrupt needed.  Called when dynamic tick is
-+ * enabled, and to reprogram the ticks to skip from pm_idle.  The CPU goes
-+ * to sleep directly after this.
-+ */
-+static void s3c24xx_timer_reprogram_dyn_tick(unsigned long next_jiffies)
-+{
-+      int subjiffy_left = ticks_last - s3c24xx_timer_read();
-+
-+      s3c24xx_timer_program(max((int) next_jiffies, 1) << INPUT_FREQ_SHIFT);
-+      ticks_last += subjiffy_left;
-+}
-+
-+static unsigned long s3c24xx_timer_offset_dyn_tick(void)
-+{
-+      /* TODO */
-+      return 0;
-+}
-+
-+static int s3c24xx_timer_enable_dyn_tick(void)
-+{
-+      /* Set our constant prescaler.  */
-+      uint32_t tcfg0 = __raw_readl(S3C2410_TCFG0);
-+      int prescaler =
-+              max(min(256, (int) pclk / (HZ << (INPUT_FREQ_SHIFT + 1))), 1);
-+
-+      tcfg0 &= ~S3C2410_TCFG_PRESCALER1_MASK;
-+      tcfg0 |= (prescaler - 1) << S3C2410_TCFG_PRESCALER1_SHIFT;
-+      __raw_writel(tcfg0, S3C2410_TCFG0);
-+
-+      /* Override handlers.  */
-+      s3c2410_timer_irq.handler = s3c24xx_timer_handler;
-+      s3c24xx_timer.offset = s3c24xx_timer_offset_dyn_tick;
-+
-+      printk(KERN_INFO "dyn_tick enabled on s3c24xx timer 4, "
-+                      "%li Hz pclk with prescaler %i\n", pclk, prescaler);
-+
-+      s3c24xx_timer_program_idle();
-+
-+      return 0;
-+}
-+
-+static int s3c24xx_timer_disable_dyn_tick(void)
-+{
-+      s3c2410_timer_irq.handler = s3c2410_timer_interrupt;
-+      s3c24xx_timer.offset = s3c2410_gettimeoffset;
-+      s3c2410_timer_setup();
-+
-+      return 0;
-+}
-+
-+static struct dyn_tick_timer s3c24xx_dyn_tick_timer = {
-+      .enable         = s3c24xx_timer_enable_dyn_tick,
-+      .disable        = s3c24xx_timer_disable_dyn_tick,
-+      .reprogram      = s3c24xx_timer_reprogram_dyn_tick,
-+      .handler        = s3c24xx_timer_handler_dyn_tick,
-+};
-+#endif        /* CONFIG_NO_IDLE_HZ */
-+
- struct sys_timer s3c24xx_timer = {
-       .init           = s3c2410_timer_init,
-       .offset         = s3c2410_gettimeoffset,
-       .resume         = s3c2410_timer_resume,
-+#ifdef CONFIG_NO_IDLE_HZ
-+      .dyn_tick       = &s3c24xx_dyn_tick_timer,
-+#endif
- };
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1216-From-ae3f72fc608fcd0a98a980a335ac4dc7ad95b221-Mon-Se.patch b/target/linux/s3c24xx/patches-2.6.24/1216-From-ae3f72fc608fcd0a98a980a335ac4dc7ad95b221-Mon-Se.patch
deleted file mode 100644 (file)
index 3be04d7..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From 40581b00b3de51e2234e0e46a69287ab1e74bf75 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Wed, 2 Jul 2008 22:44:32 +0100
-Subject: [PATCH] From ae3f72fc608fcd0a98a980a335ac4dc7ad95b221 Mon Sep 17 00:00:00 2001
- Subject: [PATCH] [bq27000] Make the checkpatch.pl happy
-
----
- drivers/power/bq27000_battery.c |    7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/power/bq27000_battery.c b/drivers/power/bq27000_battery.c
-index 4511e9c..c87e26d 100644
---- a/drivers/power/bq27000_battery.c
-+++ b/drivers/power/bq27000_battery.c
-@@ -179,7 +179,9 @@ static int bq27000_battery_get_property(struct power_supply *psy,
-               v = hdq_read16(di, BQ27000_AI_L);
-               if (v < 0)
-                       return v;
--              if (v < 2) { /* no real activity on the battery */
-+
-+              /* no real activity on the battery */
-+              if (v < 2) {
-                       if (!hdq_read16(di, BQ27000_TTF_L))
-                               val->intval = POWER_SUPPLY_STATUS_FULL;
-                       else
-@@ -199,7 +201,8 @@ static int bq27000_battery_get_property(struct power_supply *psy,
-               v = hdq_read16(di, BQ27000_VOLT_L);
-               if (v < 0)
-                       return v;
--              val->intval = v * 1000; /* mV -> uV */
-+              /* mV -> uV */
-+              val->intval = v * 1000;
-               break;
-       case POWER_SUPPLY_PROP_CURRENT_NOW:
-               v = (di->hdq_read)(BQ27000_FLAGS);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1217-From-683ef8067815f6ba0ede73fa71973823726213a3-Mon-Se.patch b/target/linux/s3c24xx/patches-2.6.24/1217-From-683ef8067815f6ba0ede73fa71973823726213a3-Mon-Se.patch
deleted file mode 100644 (file)
index 16b864f..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From abd6565704cadc8d0968b6fede8d445f84c870d3 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Wed, 2 Jul 2008 22:44:41 +0100
-Subject: [PATCH] From 683ef8067815f6ba0ede73fa71973823726213a3 Mon Sep 17 00:00:00 2001
- Subject: [PATCH] [janitor] Make checkpatch happy on the header files
-
----
- include/linux/pcf50606.h |    2 +-
- include/linux/pcf50633.h |    2 +-
- include/linux/pcf506xx.h |    2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/linux/pcf50606.h b/include/linux/pcf50606.h
-index 167328f..b17d35b 100644
---- a/include/linux/pcf50606.h
-+++ b/include/linux/pcf50606.h
-@@ -85,7 +85,7 @@ struct pcf50606_platform_data {
-       struct {
-               u_int8_t mbcc3; /* charger voltage / current */
-       } charger;
--      pmu_cb *cb;
-+      pmu_cb cb;
- };
- #endif
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index 4653285..b4d65dc 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -176,7 +176,7 @@ struct pcf50633_platform_data {
-       struct {
-               u_int8_t mbcc3; /* charger voltage / current */
-       } charger;
--      pmu_cb *cb;
-+      pmu_cb cb;
-       /* post-resume backlight bringup */
-       int defer_resume_backlight;
-diff --git a/include/linux/pcf506xx.h b/include/linux/pcf506xx.h
-index 9069bd4..a1365e0 100644
---- a/include/linux/pcf506xx.h
-+++ b/include/linux/pcf506xx.h
-@@ -26,7 +26,7 @@ enum pmu_event {
-       __NUM_PMU_EVTS
- };
--typedef int pmu_cb(struct device *dev, unsigned int feature,
-+typedef int (*pmu_cb)(struct device *dev, unsigned int feature,
-                  enum pmu_event event);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1218-From-000450f1ad2c713d2345a872fdf44f5dd3702e1b-Mon-Se.patch b/target/linux/s3c24xx/patches-2.6.24/1218-From-000450f1ad2c713d2345a872fdf44f5dd3702e1b-Mon-Se.patch
deleted file mode 100644 (file)
index dd80794..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-From b496d7ecfb1964a508f4aa2dfb8b27099e7777fc Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Wed, 2 Jul 2008 22:44:49 +0100
-Subject: [PATCH] From 000450f1ad2c713d2345a872fdf44f5dd3702e1b Mon Sep 17 00:00:00 2001
- Subject: [PATCH] [janitor] make checkpatch.pl happy
-
----
- drivers/i2c/chips/pcf50606.c |   25 ++++++++++++++-----------
- 1 files changed, 14 insertions(+), 11 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
-index aa841e3..ddba1c7 100644
---- a/drivers/i2c/chips/pcf50606.c
-+++ b/drivers/i2c/chips/pcf50606.c
-@@ -79,12 +79,12 @@ I2C_CLIENT_INSMOD_1(pcf50606);
- #define PCF50606_B_CHG_PROT   4       /* Charger Protection */
- #define PCF50606_B_CHG_READY  5       /* Charging completed */
--#define PCF50606_F_CHG_FAST   (1<<PCF50606_B_CHG_FAST)        /* Charger Fast allowed */
--#define PCF50606_F_CHG_PRESENT        (1<<PCF50606_B_CHG_PRESENT)     /* Charger present */
--#define PCF50606_F_CHG_FOK    (1<<PCF50606_B_CHG_FOK) /* Fast OK for battery */
--#define PCF50606_F_CHG_ERR    (1<<PCF50606_B_CHG_ERR) /* Charger Error */
--#define PCF50606_F_CHG_PROT   (1<<PCF50606_B_CHG_PROT)        /* Charger Protection */
--#define PCF50606_F_CHG_READY  (1<<PCF50606_B_CHG_READY)       /* Charging completed */
-+#define PCF50606_F_CHG_FAST   (1<<PCF50606_B_CHG_FAST)
-+#define PCF50606_F_CHG_PRESENT        (1<<PCF50606_B_CHG_PRESENT)
-+#define PCF50606_F_CHG_FOK    (1<<PCF50606_B_CHG_FOK)
-+#define PCF50606_F_CHG_ERR    (1<<PCF50606_B_CHG_ERR)
-+#define PCF50606_F_CHG_PROT   (1<<PCF50606_B_CHG_PROT)
-+#define PCF50606_F_CHG_READY  (1<<PCF50606_B_CHG_READY)
- #define PCF50606_F_CHG_MASK   0x000000fc
- #define PCF50606_F_PWR_PRESSED        0x00000100
-@@ -598,7 +598,8 @@ static void pcf50606_work(struct work_struct *work)
-                       pcf->flags |= PCF50606_F_CHG_PRESENT;
-                       if (pcf->pdata->cb)
-                               pcf->pdata->cb(&pcf->client.dev,
--                                      PCF50606_FEAT_MBC, PMU_EVT_INSERT);
-+                                              PCF50606_FEAT_MBC,
-+                                              PMU_EVT_INSERT);
-               }
-               pcf->coldplug_done = 1;
-@@ -988,7 +989,8 @@ EXPORT_SYMBOL_GPL(pcf50606_charge_fast);
- static inline u_int16_t adc_to_rntc(struct pcf50606_data *pcf, u_int16_t adc)
- {
--      u_int32_t r_ntc = (adc * (u_int32_t)pcf->pdata->r_fix_batt) / (1023 - adc);
-+      u_int32_t r_ntc = (adc * (u_int32_t)pcf->pdata->r_fix_batt)
-+              / (1023 - adc);
-       return r_ntc;
- }
-@@ -1290,8 +1292,9 @@ static int pcf50606_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
-       struct pcf50606_time pcf_tm;
-       mutex_lock(&pcf->lock);
--      alrm->enabled = 
--             __reg_read(pcf, PCF50606_REG_INT1M) & PCF50606_INT1_ALARM ? 0 : 1;
-+      alrm->enabled =
-+              __reg_read(pcf, PCF50606_REG_INT1M) & PCF50606_INT1_ALARM
-+              ? 0 : 1;
-       pcf_tm.sec = __reg_read(pcf, PCF50606_REG_RTCSCA);
-       pcf_tm.min = __reg_read(pcf, PCF50606_REG_RTCMNA);
-       pcf_tm.hour = __reg_read(pcf, PCF50606_REG_RTCHRA);
-@@ -1665,7 +1668,7 @@ static int pcf50606_detect(struct i2c_adapter *adapter, int address, int kind)
-               return -ENOMEM;
-       mutex_init(&data->lock);
--      mutex_init(&data->working_lock);
-+      mutex_init(&data->working_lock);
-       INIT_WORK(&data->work, pcf50606_work);
-       data->irq = irq;
-       data->working = 0;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1219-From-5718bde77ed1a75e0fd2cdf5e099e66121d10c0a-Mon-Se.patch b/target/linux/s3c24xx/patches-2.6.24/1219-From-5718bde77ed1a75e0fd2cdf5e099e66121d10c0a-Mon-Se.patch
deleted file mode 100644 (file)
index 06bbe30..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-From d869fe11c6acbc3466abcdae741376b2c71bca69 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Wed, 2 Jul 2008 22:44:59 +0100
-Subject: [PATCH] From 5718bde77ed1a75e0fd2cdf5e099e66121d10c0a Mon Sep 17 00:00:00 2001
- Subject: [PATCH] [battery] Make the bq27000 send an uevent when the charging state possible changed
-      Remove the todo entries from the pcf50633, make the mach-gta02
-      call the bq27000 driver from the pmu callback.
-
----
- arch/arm/mach-s3c2440/mach-gta02.c |   36 +++++++++++++++++++-----------------
- drivers/i2c/chips/pcf50633.c       |    4 ----
- drivers/power/bq27000_battery.c    |   11 +++++++++++
- include/linux/bq27000_battery.h    |    2 ++
- 4 files changed, 32 insertions(+), 21 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index afe8039..e66498b 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -450,6 +450,24 @@ static struct s3c2410_uartcfg gta02_uartcfgs[] = {
- };
-+/* BQ27000 Battery */
-+
-+struct bq27000_platform_data bq27000_pdata = {
-+      .name = "bat",
-+      .rsense_mohms = 20,
-+      .hdq_read = gta02hdq_read,
-+      .hdq_write = gta02hdq_write,
-+      .hdq_initialized = gta02hdq_initialized,
-+};
-+
-+struct platform_device bq27000_battery_device = {
-+      .name           = "bq27000-battery",
-+      .dev = {
-+              .platform_data = &bq27000_pdata,
-+      },
-+};
-+
-+
- /* PMU driver info */
- static int pmu_callback(struct device *dev, unsigned int feature,
-@@ -482,6 +500,7 @@ static int pmu_callback(struct device *dev, unsigned int feature,
-               break;
-       }
-+      bq27000_charging_state_change(&bq27000_battery_device);
-       return 0;
- }
-@@ -740,23 +759,6 @@ struct platform_device gta02_hdq_device = {
- };
- #endif
--/* BQ27000 Battery */
--
--struct bq27000_platform_data bq27000_pdata = {
--      .name = "bat",
--      .rsense_mohms = 20,
--      .hdq_read = gta02hdq_read,
--      .hdq_write = gta02hdq_write,
--      .hdq_initialized = gta02hdq_initialized,
--};
--
--struct platform_device bq27000_battery_device = {
--      .name           = "bq27000-battery",
--      .dev = {
--              .platform_data = &bq27000_pdata,
--      },
--};
--
- /* NOR Flash */
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 4d19dae..8a27925 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -888,8 +888,6 @@ static void pcf50633_work(struct work_struct *work)
-               if (pcf->pdata->cb)
-                       pcf->pdata->cb(&pcf->client.dev,
-                                      PCF50633_FEAT_MBC, PMU_EVT_INSERT);
--              /* FIXME: signal this to userspace */
--              //kobject_uevent( ,KOBJ_ADD);
-       }
-       if (pcfirq[0] & PCF50633_INT1_ADPREM) {
-               /* Charger removed */
-@@ -900,8 +898,6 @@ static void pcf50633_work(struct work_struct *work)
-               if (pcf->pdata->cb)
-                       pcf->pdata->cb(&pcf->client.dev,
-                                      PCF50633_FEAT_MBC, PMU_EVT_REMOVE);
--              /* FIXME: signal this to userspace */
--              //kobject_uevent( ,KOBJ_ADD);
-       }
-       if (pcfirq[0] & PCF50633_INT1_USBINS) {
-               DEBUGPC("USBINS ");
-diff --git a/drivers/power/bq27000_battery.c b/drivers/power/bq27000_battery.c
-index c87e26d..4855d5a 100644
---- a/drivers/power/bq27000_battery.c
-+++ b/drivers/power/bq27000_battery.c
-@@ -330,6 +330,17 @@ static int bq27000_battery_remove(struct platform_device *pdev)
-       return 0;
- }
-+void bq27000_charging_state_change(struct platform_device *pdev)
-+{
-+      struct bq27000_device_info *di = platform_get_drvdata(pdev);
-+
-+      if (!di)
-+          return;
-+
-+      power_supply_changed(&di->bat);
-+}
-+EXPORT_SYMBOL_GPL(bq27000_charging_state_change);
-+
- #ifdef CONFIG_PM
- static int bq27000_battery_suspend(struct platform_device *pdev,
-diff --git a/include/linux/bq27000_battery.h b/include/linux/bq27000_battery.h
-index 36b4f20..fed4287 100644
---- a/include/linux/bq27000_battery.h
-+++ b/include/linux/bq27000_battery.h
-@@ -1,6 +1,8 @@
- #ifndef __BQ27000_BATTERY_H__
- #define __BQ27000_BATTERY_H__
-+void bq27000_charging_state_change(struct platform_device *pdev);
-+
- struct bq27000_platform_data {
-       const char      *name;
-       int             rsense_mohms;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1220-From-c221bb27c8e22daa451e26353140777223d397d2-Mon-Se.patch b/target/linux/s3c24xx/patches-2.6.24/1220-From-c221bb27c8e22daa451e26353140777223d397d2-Mon-Se.patch
deleted file mode 100644 (file)
index 54b1281..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-From 618097c906c68f2df5fb03ace81e6295be6ded42 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Wed, 2 Jul 2008 22:45:07 +0100
-Subject: [PATCH] From c221bb27c8e22daa451e26353140777223d397d2 Mon Sep 17 00:00:00 2001
- Subject: [PATCH] [pcf50633] Report more events to userspace using the default callback
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- drivers/i2c/chips/pcf50633.c |   20 +++++++++++++++-----
- include/linux/pcf506xx.h     |    1 +
- 2 files changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 8a27925..10934f7 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1037,25 +1037,35 @@ static void pcf50633_work(struct work_struct *work)
-                * this is really "battery not pulling current" -- it can
-                * appear with no battery attached
-                */
--              /* FIXME: signal this to userspace */
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50633_FEAT_MBC, PMU_EVT_CHARGER_CHANGE);
-       }
-       if (pcfirq[2] & PCF50633_INT3_THLIMON) {
-               DEBUGPC("THLIMON ");
-               pcf->flags |= PCF50633_F_CHG_PROT;
--              /* FIXME: signal this to userspace */
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50633_FEAT_MBC, PMU_EVT_CHARGER_CHANGE);
-       }
-       if (pcfirq[2] & PCF50633_INT3_THLIMOFF) {
-               DEBUGPC("THLIMOFF ");
-               pcf->flags &= ~PCF50633_F_CHG_PROT;
--              /* FIXME: signal this to userspace */
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50633_FEAT_MBC, PMU_EVT_CHARGER_CHANGE);
-       }
-       if (pcfirq[2] & PCF50633_INT3_USBLIMON) {
-               DEBUGPC("USBLIMON ");
--              /* FIXME: signal this to userspace */
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50633_FEAT_MBC, PMU_EVT_CHARGER_CHANGE);
-       }
-       if (pcfirq[2] & PCF50633_INT3_USBLIMOFF) {
-               DEBUGPC("USBLIMOFF ");
--              /* FIXME: signal this to userspace */
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50633_FEAT_MBC, PMU_EVT_CHARGER_CHANGE);
-       }
-       if (pcfirq[2] & PCF50633_INT3_ADCRDY) {
-               /* ADC result ready */
-diff --git a/include/linux/pcf506xx.h b/include/linux/pcf506xx.h
-index a1365e0..459b160 100644
---- a/include/linux/pcf506xx.h
-+++ b/include/linux/pcf506xx.h
-@@ -23,6 +23,7 @@ enum pmu_event {
- #endif
-       PMU_EVT_CHARGER_ACTIVE,
-       PMU_EVT_CHARGER_IDLE,
-+      PMU_EVT_CHARGER_CHANGE,
-       __NUM_PMU_EVTS
- };
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1221-change-remove-kernel-charging-led-drive.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1221-change-remove-kernel-charging-led-drive.patch.patch
deleted file mode 100644 (file)
index 413be3b..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From e86a397ab500cda75e7e0b7a27011f5dedee8338 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 2 Jul 2008 22:45:15 +0100
-Subject: [PATCH] change-remove-kernel-charging-led-drive.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |    5 -----
- 1 files changed, 0 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index e66498b..686291b 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -485,12 +485,7 @@ static int pmu_callback(struct device *dev, unsigned int feature,
-                       pcf50633_charge_enable(pcf50633_global, 0);
-                       break;
-               case PMU_EVT_CHARGER_IDLE:
--                      /* printk(KERN_ERR"PMU_EVT_CHARGER_IDLE\n"); */
--                      neo1973_gpb_setpin(GTA02_GPIO_AUX_LED, 0);
--                      break;
-               case PMU_EVT_CHARGER_ACTIVE:
--                      /* printk(KERN_ERR"PMU_EVT_CHARGER_ACTIVE\n"); */
--                      neo1973_gpb_setpin(GTA02_GPIO_AUX_LED, 1);
-                       break;
-               default:
-                       break;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1222-add-ar6k-wake-interrupt.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1222-add-ar6k-wake-interrupt.patch.patch
deleted file mode 100644 (file)
index f3a6eec..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-From 0f565eebf6f9a52a66053348aa710e05732f934e Mon Sep 17 00:00:00 2001
-From: Matt <matt_hsu@openmoko.org>
-Date: Wed, 2 Jul 2008 23:02:14 +0100
-Subject: [PATCH] add-ar6k-wake-interrupt.patch
-
-Signed-off-by: Matt Hsu <matt_hsu@openmoko.org>
-
-- add an interrupt for ar6k wifi module
----
- arch/arm/mach-s3c2440/mach-gta02.c |   15 +++++++++++++++
- 1 files changed, 15 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 686291b..7118332 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1498,6 +1498,12 @@ static irqreturn_t gta02_modem_irq(int irq, void *param)
-       return IRQ_HANDLED;
- }
-+static irqreturn_t ar6000_wow_irq(int irq, void *param)
-+{
-+      printk(KERN_DEBUG "ar6000_wow interrupt\n");
-+      return IRQ_HANDLED;
-+}
-+
- static void __init gta02_machine_init(void)
- {
-       int rc;
-@@ -1601,6 +1607,15 @@ static void __init gta02_machine_init(void)
-       if (rc < 0)
-               printk(KERN_ERR "GTA02: can't request GSM modem wakeup IRQ\n");
-       enable_irq_wake(GTA02_IRQ_MODEM);
-+
-+      /* Make sure the wifi module can wake us up*/
-+      set_irq_type(GTA02_IRQ_WLAN_GPIO1, IRQT_RISING);
-+      rc = request_irq(GTA02_IRQ_WLAN_GPIO1, ar6000_wow_irq, IRQF_DISABLED,
-+                      "ar6000", NULL);
-+
-+      if (rc < 0)
-+              printk(KERN_ERR "GTA02: can't request ar6k wakeup IRQ\n");
-+      enable_irq_wake(GTA02_IRQ_WLAN_GPIO1);
- }
- MACHINE_START(NEO1973_GTA02, "GTA02")
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1223-Remove-some-bits-of-nspy-GSM-flow-control-patches.patch b/target/linux/s3c24xx/patches-2.6.24/1223-Remove-some-bits-of-nspy-GSM-flow-control-patches.patch
deleted file mode 100644 (file)
index a0b1523..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From f5d2660aaa6b05397714ffb48e2e71c71cef0bdd Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Fri, 4 Jul 2008 08:24:25 +0100
-Subject: [PATCH] Remove some bits of nspy + GSM flow control patches that leaked into stable
-
-Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |   15 ---------------
- 1 files changed, 0 insertions(+), 15 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index f3c9504..5ef23d1 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -34,15 +34,6 @@
- extern void s3c24xx_serial_register_resume_dependency(struct resume_dependency *
-                                            resume_dependency, int uart_index);
--/* flag set if we flow-controlled the GSM in our suspend routine */
--int gsm_auto_flowcontrolled;
--
--int gta01_gsm_enabled;
--EXPORT_SYMBOL(gta01_gsm_enabled);
--
--int gta_gsm_interrupts;
--EXPORT_SYMBOL(gta_gsm_interrupts);
--
- struct gta01pm_priv {
-       int gpio_ngsm_en;
-         int gpio_ndl_gsm;
-@@ -233,12 +224,6 @@ static int gta01_gsm_resume(struct platform_device *pdev)
-       if (machine_is_neo1973_gta02())
-               s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, gta01_gsm.gpio_ndl_gsm);
--      /* If we forced flow-control on the GSM, we should also release it */
--      if (gsm_auto_flowcontrolled) {
--              s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPH1_nRTS0);
--              gsm_auto_flowcontrolled = 0;
--      }
--
-       return 0;
- }
- #else
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1224-commit-5f42e24d361cd83178fe8da9d68efbf41a011483.patch b/target/linux/s3c24xx/patches-2.6.24/1224-commit-5f42e24d361cd83178fe8da9d68efbf41a011483.patch
deleted file mode 100644 (file)
index 22fe8e9..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9af61cea8871d2303e06c5e71a121245d5fdc283 Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Sun, 6 Jul 2008 10:39:39 +0100
-Subject: [PATCH] commit 5f42e24d361cd83178fe8da9d68efbf41a011483
-
-    Add missing initialization for the touchscreen driver for the
-    gta01 platform.
-
-    Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- arch/arm/mach-s3c2410/mach-gta01.c |    9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index a77ed3d..e518de7 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -494,8 +494,15 @@ static struct s3c2410_udc_mach_info gta01_udc_cfg = {
- static struct s3c2410_ts_mach_info gta01_ts_cfg = {
-       .delay = 10000,
--      .presc = 65,
-+      .presc = 50000000 / 1000000, /* 50 MHz PCLK / 1MHz */
-+      /* simple averaging, 2^n samples */
-       .oversampling_shift = 5,
-+      /* averaging filter length, 2^n */
-+      .excursion_filter_len_bits = 5,
-+      /* flagged for beauty contest on next sample if differs from
-+       * average more than this
-+       */
-+      .reject_threshold_vs_avg = 2,
- };
- /* SPI */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1225-From-cede5c6c9b06ecbb0f7f2df7b7070092b87ddaf8-Mon-Se.patch b/target/linux/s3c24xx/patches-2.6.24/1225-From-cede5c6c9b06ecbb0f7f2df7b7070092b87ddaf8-Mon-Se.patch
deleted file mode 100644 (file)
index d1f2618..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From e4b81c966e03ee280492e75cdd569f8495cb2a06 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Tue, 8 Jul 2008 18:38:16 +0100
-Subject: [PATCH] From cede5c6c9b06ecbb0f7f2df7b7070092b87ddaf8 Mon Sep 17 00:00:00 2001
- Subject: [PATCH] [pcf50633] Avoid ooops on start with inserted usb cable
-     The pcf50633_global might not be initialized when we get the first
-     usb interrupt. We would oops inside the dev_err because we made up
-     a struct device.
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- arch/arm/mach-s3c2440/mach-gta02.c |    3 +++
- drivers/i2c/chips/pcf50633.c       |    4 +---
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 7118332..b3d3797 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -883,6 +883,9 @@ static void gta02_udc_command(enum s3c2410_udc_cmd_e cmd)
- static void gta02_udc_vbus_draw(unsigned int ma)
- {
-+        if (!pcf50633_global)
-+              return;
-+
-       pcf50633_notify_usb_current_limit_change(pcf50633_global, ma);
- }
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 10934f7..64de9bf 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -690,9 +690,7 @@ int pcf50633_notify_usb_current_limit_change(struct pcf50633_data *pcf,
-        * have to bail with error since we can't even schedule the work
-        */
-       if (!pcf) {
--              dev_err(&pcf->client.dev,
--                      "pcf50633_notify_usb_current_limit_change "
--                      "called with NULL pcf\n");
-+              printk(KERN_ERR "pcf50633_notify_usb_current_limit called with NULL pcf\n");
-               return -EBUSY;
-       }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1226-From-3a32be40f78404d5f1185f0b3d6b5632381cb33f-Mon-Se.patch b/target/linux/s3c24xx/patches-2.6.24/1226-From-3a32be40f78404d5f1185f0b3d6b5632381cb33f-Mon-Se.patch
deleted file mode 100644 (file)
index 6bca9e3..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-From 9c058ff0d2641df3c36fc3300acb72078d2c41d4 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Tue, 8 Jul 2008 18:38:19 +0100
-Subject: [PATCH] From 3a32be40f78404d5f1185f0b3d6b5632381cb33f Mon Sep 17 00:00:00 2001
- Subject: [PATCH] [neo1973 leds] Move from mutex to spinlock because we may not use mutexes
-     The led triggers may call set_brightness from atomic contexts. As
-     mutex_lock calls might_sleep and sleeping is not allowed in atomic contexts
-     we have to switch to spinlocks here.
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- drivers/leds/leds-neo1973-gta02.c |   10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/leds/leds-neo1973-gta02.c b/drivers/leds/leds-neo1973-gta02.c
-index 952ad69..8fe817b 100644
---- a/drivers/leds/leds-neo1973-gta02.c
-+++ b/drivers/leds/leds-neo1973-gta02.c
-@@ -27,7 +27,7 @@
- struct gta02_led_priv
- {
--      struct mutex mutex;
-+      spinlock_t lock;
-       struct led_classdev cdev;
-       struct s3c2410_pwm pwm;
-       unsigned int gpio;
-@@ -53,6 +53,7 @@ static inline struct gta02_led_bundle *to_bundle(struct led_classdev *led_cdev)
- static void gta02led_set(struct led_classdev *led_cdev,
-               enum led_brightness value)
- {
-+      unsigned long flags;
-       struct gta02_led_priv *lp = to_priv(led_cdev);
-       /*
-@@ -60,7 +61,7 @@ static void gta02led_set(struct led_classdev *led_cdev,
-        * value == 128 -> 50% duty cycle (medium power)
-        * value == 0 -> 0% duty cycle (zero power)
-        */
--      mutex_lock(&lp->mutex);
-+      spin_lock_irqsave(&lp->lock, flags);
-       if (lp->has_pwm) {
-               s3c2410_pwm_duty_cycle(value, &lp->pwm);
-@@ -68,7 +69,7 @@ static void gta02led_set(struct led_classdev *led_cdev,
-               neo1973_gpb_setpin(lp->gpio, value ? 1 : 0);
-       }
--      mutex_unlock(&lp->mutex);
-+      spin_unlock_irqrestore(&lp->lock, flags);
- }
- #ifdef CONFIG_PM
-@@ -170,7 +171,7 @@ static int __init gta02led_probe(struct platform_device *pdev)
-                       break;
-               }
--              mutex_init(&lp->mutex);
-+              spin_lock_init(&lp->lock);
-               rc = led_classdev_register(&pdev->dev, &lp->cdev);
-       }
-@@ -192,7 +193,6 @@ static int gta02led_remove(struct platform_device *pdev)
-                       gta02led_set(&lp->cdev, 0);
-               led_classdev_unregister(&lp->cdev);
--              mutex_destroy(&lp->mutex);
-       }
-       platform_set_drvdata(pdev, NULL);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1227-fix-pcf50633-mask-second-on-resume.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1227-fix-pcf50633-mask-second-on-resume.patch.patch
deleted file mode 100644 (file)
index c14b58d..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From 691febd6e3dcf7b4e3fde786b1c6de2c1d978eb5 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 13 Jul 2008 20:30:15 +0100
-Subject: [PATCH] fix-pcf50633-mask-second-on-resume.patch
-
-We leave SECOND unmasked on resume, it's like the
-situation at probe() time, but there it makes us
-turn SECOND off after coldplug action.  So we need
-to act like after that has happened, not exactly
-like what we do at probe / init time.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 64de9bf..a116f9f 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -2550,6 +2550,8 @@ static int pcf50633_resume(struct device *dev)
-               dev_err(dev, "Failed to restore LDOs :-( %d\n", ret);
-       memset(res, 0, sizeof(res));
-+      /* not interested in second on resume */
-+      res[0] = PCF50633_INT1_SECOND;
-       ret = i2c_smbus_write_i2c_block_data(&pcf->client,
-                                            PCF50633_REG_INT1M,
-                                            5, &res[0]);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1228-fix-aux-key-level-by-gtaxx.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1228-fix-aux-key-level-by-gtaxx.patch.patch
deleted file mode 100644 (file)
index 07704f1..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-From 18ca5bd67840d6b2e21edb86057db10b2f21892d Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 13 Jul 2008 20:30:20 +0100
-Subject: [PATCH] fix-aux-key-level-by-gtaxx.patch
- Reported-by: Mickey Lauer <mickey@openmoko.org>
-
-AUX level detection is inverted based on GTA01 or 02
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/input/keyboard/neo1973kbd.c |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-index 868d0a7..2ea6846 100644
---- a/drivers/input/keyboard/neo1973kbd.c
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -39,8 +39,11 @@ struct neo1973kbd {
- static irqreturn_t neo1973kbd_aux_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
-+      int key_pressed = !gpio_get_value(irq_to_gpio(irq));
--      int key_pressed = !!gpio_get_value(irq_to_gpio(irq));
-+      /* GTA02 has inverted sense level compared to GTA01 */
-+      if (machine_is_neo1973_gta02())
-+              key_pressed = !key_pressed;
-       input_report_key(neo1973kbd_data->input, KEY_PHONE, key_pressed);
-       input_sync(neo1973kbd_data->input);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1229-add-pcf50633-allow-force-charger-type.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1229-add-pcf50633-allow-force-charger-type.patch.patch
deleted file mode 100644 (file)
index 582d893..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-From f96aab45a604cb0f46a6ca3aa286a821c2462fda Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 13 Jul 2008 20:30:31 +0100
-Subject: [PATCH] add-pcf50633-allow-force-charger-type.patch
-
-This patch adds a sysfs node:
-
-/sys/class/i2c-adapter/i2c-0/0-0073/force_usb_limit_dangerous
-
-it allows to force the charging limit regardless of the one chosen
-by pcf50633 kernel driver.  As such, if you write a charging limit
-here that is not suitable for the power source, and the power source
-is not current limited on its side, it could draw more current than
-your power source can handle, burn down you house, etc.
-
-If you're certain that your power supply can handle it, you can use
-this on your own responsibility to make the amount drawn by the
-PMU match what you believed your power supply could handle.
-
-Example usage, in case where you have a dumb 500mA USB charger that
-does not have the ID resistor:
-
-# cat /sys/class/i2c-adapter/i2c-0/0-0073/charger_type
-host/500mA usb mode 100mA   <=== dumb charger does not ennumerate us
-# echo 500 > /sys/class/i2c-adapter/i2c-0/0-0073/force_usb_limit_dangerous
-# cat /sys/class/i2c-adapter/i2c-0/0-0073/charger_type
-host/500mA usb mode 500mA
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |   15 +++++++++++++++
- 1 files changed, 15 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index a116f9f..9f98ba1 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1953,6 +1953,20 @@ static ssize_t show_charger_type(struct device *dev,
- static DEVICE_ATTR(charger_type, 0444, show_charger_type, NULL);
-+static ssize_t force_usb_limit_dangerous(struct device *dev,
-+                 struct device_attribute *attr, const char *buf, size_t count)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      int ma = simple_strtoul(buf, NULL, 10);
-+
-+      pcf50633_usb_curlim_set(pcf, ma);
-+      return count;
-+}
-+
-+static DEVICE_ATTR(force_usb_limit_dangerous, 0600,
-+                                             NULL, force_usb_limit_dangerous);
-+
- /*
-  * Charger adc
-  */
-@@ -2030,6 +2044,7 @@ static struct attribute *pcf_sysfs_entries[] = {
-       &dev_attr_voltage_ldo6.attr,
-       &dev_attr_voltage_hcldo.attr,
-       &dev_attr_charger_type.attr,
-+      &dev_attr_force_usb_limit_dangerous.attr,
-       &dev_attr_charger_adc.attr,
-       &dev_attr_dump_regs.attr,
-       NULL, /* going to add things at this point! */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1230-fix-no-uart-leak-when-gps-off.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1230-fix-no-uart-leak-when-gps-off.patch.patch
deleted file mode 100644 (file)
index 088f017..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-From abb5807e67398d10a3014cc001897b11cc214ec9 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 13 Jul 2008 20:31:04 +0100
-Subject: [PATCH] fix-no-uart-leak-when-gps-off.patch
-
-During the suspend current reduction campaign on suspend I
-forced the GPS UART to be GPIO and to drive 0 into the GPS
-unit so we would not burn current there.  On resume it lets
-the pins act as UARTs again.  But really, we should do this
-all the time that the GPS unit is off, lest we leak it
-enough power to hold internal state and make trouble.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gps.c |   57 +++++++++++++------------------
- 1 files changed, 24 insertions(+), 33 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-index 9c6adfa..8cd583d 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-@@ -272,9 +272,23 @@ static void gps_pwron_set(int on)
- #ifdef CONFIG_MACH_NEO1973_GTA02
-       if (machine_is_neo1973_gta02()) {
--              if (on)
-+              if (on) {
-                       pcf50633_voltage_set(pcf50633_global,
-                               PCF50633_REGULATOR_LDO5, 3000);
-+                      /* return UART pins to being UART pins */
-+                      s3c2410_gpio_cfgpin(S3C2410_GPH4, S3C2410_GPH4_TXD1);
-+                      /* remove pulldown now it won't be floating any more */
-+                      s3c2410_gpio_pullup(S3C2410_GPH5, 0);
-+              } else {
-+                      /*
-+                       * take care not to power unpowered GPS from UART TX
-+                       * return them to GPIO and force low
-+                       */
-+                      s3c2410_gpio_cfgpin(S3C2410_GPH4, S3C2410_GPH4_OUTP);
-+                      s3c2410_gpio_setpin(S3C2410_GPH4, 0);
-+                      /* don't let RX from unpowered GPS float */
-+                      s3c2410_gpio_pullup(S3C2410_GPH5, 1);
-+              }
-               pcf50633_onoff_set(pcf50633_global,
-                       PCF50633_REGULATOR_LDO5, on);
-       }
-@@ -284,21 +298,14 @@ static void gps_pwron_set(int on)
- static int gps_pwron_get(void)
- {
- #ifdef CONFIG_MACH_NEO1973_GTA01
--      if (machine_is_neo1973_gta01()) {
--              if (s3c2410_gpio_getpin(GTA01_GPIO_GPS_PWRON))
--                      return 1;
--              else
--                      return 0;
--      }
-+      if (machine_is_neo1973_gta01())
-+              return !!s3c2410_gpio_getpin(GTA01_GPIO_GPS_PWRON);
- #endif /* CONFIG_MACH_NEO1973_GTA01 */
- #ifdef CONFIG_MACH_NEO1973_GTA02
--      if (machine_is_neo1973_gta02()) {
--              if (pcf50633_onoff_get(pcf50633_global, PCF50633_REGULATOR_LDO5))
--                      return 1;
--              else
--                      return 0;
--      }
-+      if (machine_is_neo1973_gta02())
-+              return !!pcf50633_onoff_get(pcf50633_global,
-+                                                     PCF50633_REGULATOR_LDO5);
- #endif /* CONFIG_MACH_NEO1973_GTA02 */
-       return -1;
- }
-@@ -496,15 +503,8 @@ static int gta01_pm_gps_suspend(struct platform_device *pdev,
- #endif /* CONFIG_MACH_NEO1973_GTA01 */
- #ifdef CONFIG_MACH_NEO1973_GTA02
--      if (machine_is_neo1973_gta02()) {
--              /* take care not to power unpowered GPS from GPIO */
--              s3c2410_gpio_cfgpin(S3C2410_GPH4, S3C2410_GPH4_OUTP);
--              s3c2410_gpio_setpin(S3C2410_GPH4, 0);
--              /* don't let RX from unpowered GPS float */
--              s3c2410_gpio_pullup(S3C2410_GPH5, 1);
--
-+      if (machine_is_neo1973_gta02())
-               gps_pwron_set(0);
--      }
- #endif /* CONFIG_MACH_NEO1973_GTA02 */
-       return 0;
-@@ -513,26 +513,17 @@ static int gta01_pm_gps_suspend(struct platform_device *pdev,
- static int gta01_pm_gps_resume(struct platform_device *pdev)
- {
- #ifdef CONFIG_MACH_NEO1973_GTA01
--      if (machine_is_neo1973_gta01()) {
-+      if (machine_is_neo1973_gta01())
-               if (neo1973_gps.power_was_on)
-                       gps_power_sequence_up();
--      }
- #endif /* CONFIG_MACH_NEO1973_GTA01 */
- #ifdef CONFIG_MACH_NEO1973_GTA02
--      if (machine_is_neo1973_gta02()) {
--              /*
--               * resume TXD1 function since we power GPS now... er..
--               * WTF?  FIXME We always power GPS on resume ??
--               */
--              s3c2410_gpio_cfgpin(S3C2410_GPH4, S3C2410_GPH4_TXD1);
--              /* remove pulldown now it won't be floating any more */
--              s3c2410_gpio_pullup(S3C2410_GPH5, 0);
--
-+      if (machine_is_neo1973_gta02())
-               if (neo1973_gps.power_was_on)
-                   gps_pwron_set(1);
- #endif /* CONFIG_MACH_NEO1973_GTA02 */
--      }
-+
-       return 0;
- }
- #else
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1231-fix-glamo-suspend-resume-dram-and-engines.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1231-fix-glamo-suspend-resume-dram-and-engines.patch.patch
deleted file mode 100644 (file)
index 58070a6..0000000
+++ /dev/null
@@ -1,428 +0,0 @@
-From e1673170182af199be7c6a2a346d8bad7e4dc532 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Tue, 15 Jul 2008 09:04:00 +0100
-Subject: [PATCH] fix-glamo-suspend-resume-dram-and-engines.patch
-
-Two issues... we never took care to take down engines in suspend
-and bring them back in resume.  This was part of the display
-corruption that could be seen briefly on resume.  The other issue
-that made the "noise" corruption was bad ordering of resume steps.
-
-This patch simplifies (removing needless re-init) resume actions
-and makes explicit the suspend and resume steps.  It also adds
-code to track which engines are up and push them down in suspend
-and bring them back in resume.
-
-The result is no more corruption of display buffer in suspend, it
-comes back completely clean.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-core.c |  266 +++++++++++++++++++---------------------
- drivers/mfd/glamo/glamo-core.h |    2 +
- drivers/mfd/glamo/glamo-regs.h |    6 +-
- 3 files changed, 135 insertions(+), 139 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index 2412b7d..bea0387 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -54,6 +54,8 @@
- #define RESSIZE(ressource) (((ressource)->end - (ressource)->start)+1)
-+#define GLAMO_MEM_REFRESH_COUNT 0x100
-+
- static struct glamo_core *glamo_handle;
- static inline void __reg_write(struct glamo_core *glamo,
-@@ -381,9 +383,8 @@ out_unlock:
-  * 'engine' support
-  ***********************************************************************/
--int glamo_engine_enable(struct glamo_core *glamo, enum glamo_engine engine)
-+int __glamo_engine_enable(struct glamo_core *glamo, enum glamo_engine engine)
- {
--      spin_lock(&glamo->lock);
-       switch (engine) {
-       case GLAMO_ENGINE_LCD:
-               __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_LCD,
-@@ -432,27 +433,59 @@ int glamo_engine_enable(struct glamo_core *glamo, enum glamo_engine engine)
-       default:
-               break;
-       }
--      spin_unlock(&glamo->lock);
-+
-+      glamo->engine_enabled_bitfield |= 1 << engine;
-       return 0;
- }
--EXPORT_SYMBOL_GPL(glamo_engine_enable);
--int glamo_engine_disable(struct glamo_core *glamo, enum glamo_engine engine)
-+int glamo_engine_enable(struct glamo_core *glamo, enum glamo_engine engine)
- {
-+      int ret;
-+
-       spin_lock(&glamo->lock);
-+
-+      ret = __glamo_engine_enable(glamo, engine);
-+
-+      spin_unlock(&glamo->lock);
-+
-+      return ret;
-+}
-+EXPORT_SYMBOL_GPL(glamo_engine_enable);
-+
-+int __glamo_engine_disable(struct glamo_core *glamo, enum glamo_engine engine)
-+{
-       switch (engine) {
-+      case GLAMO_ENGINE_LCD:
-+              /* remove pixel clock to LCM */
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_LCD,
-+                          GLAMO_CLOCK_LCD_EN_DCLK, 0);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_LCD,
-+                          GLAMO_CLOCK_LCD_EN_DHCLK |
-+                          GLAMO_CLOCK_LCD_EN_DMCLK, 0);
-+              /* kill memory clock */
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_LCD,
-+                          GLAMO_CLOCK_LCD_EN_M5CLK, 0);
-+              /* stop dividing the clocks */
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_GEN5_1,
-+                          GLAMO_CLOCK_GEN51_EN_DIV_DHCLK |
-+                          GLAMO_CLOCK_GEN51_EN_DIV_DMCLK |
-+                          GLAMO_CLOCK_GEN51_EN_DIV_DCLK, 0);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_HOSTBUS(2),
-+                          GLAMO_HOSTBUS2_MMIO_EN_LCD, 0);
-+              break;
-+
-       case GLAMO_ENGINE_MMC:
-               __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_MMC, 0,
-                                                  GLAMO_CLOCK_MMC_EN_M9CLK |
-                                                  GLAMO_CLOCK_MMC_EN_TCLK |
-                                                  GLAMO_CLOCK_MMC_DG_M9CLK |
-                                                  GLAMO_CLOCK_MMC_DG_TCLK);
--              __reg_set_bit_mask(glamo, GLAMO_REG_HOSTBUS(2), 0,
--                                                 GLAMO_HOSTBUS2_MMIO_EN_MMC);
-               /* disable the TCLK divider clk input */
-               __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_GEN5_1, 0,
-                                               GLAMO_CLOCK_GEN51_EN_DIV_TCLK);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_HOSTBUS(2), 0,
-+                                                 GLAMO_HOSTBUS2_MMIO_EN_MMC);
-               /* good idea to hold the thing in reset when we power it off? */
- /*            writew(readw(glamo->base + GLAMO_REG_CLOCK_MMC) |
-                     GLAMO_CLOCK_MMC_RESET, glamo->base + GLAMO_REG_CLOCK_MMC);
-@@ -461,10 +494,23 @@ int glamo_engine_disable(struct glamo_core *glamo, enum glamo_engine engine)
-       default:
-               break;
-       }
--      spin_unlock(&glamo->lock);
-+
-+      glamo->engine_enabled_bitfield &= ~(1 << engine);
-       return 0;
- }
-+int glamo_engine_disable(struct glamo_core *glamo, enum glamo_engine engine)
-+{
-+      int ret;
-+
-+      spin_lock(&glamo->lock);
-+
-+      ret = __glamo_engine_disable(glamo, engine);
-+
-+      spin_unlock(&glamo->lock);
-+
-+      return ret;
-+}
- EXPORT_SYMBOL_GPL(glamo_engine_disable);
- struct glamo_script reset_regs[] = {
-@@ -618,7 +664,7 @@ int glamo_run_script(struct glamo_core *glamo, struct glamo_script *script,
-                       if (may_sleep)
-                               msleep(line->val);
-                       else
--                              mdelay(line->val);
-+                              mdelay(line->val * 4);
-                       break;
-               case 0xfffd:
-                       /* spin until PLLs lock */
-@@ -717,111 +763,17 @@ static struct glamo_script glamo_init_script[] = {
-       { GLAMO_REG_CLOCK_MEMORY,       0x000b },
- };
--static struct glamo_script glamo_resume_script[] = {
--      { GLAMO_REG_IRQ_ENABLE,         0x01ff },
--      { GLAMO_REG_CLOCK_GEN6,         0x2000 },
--      { GLAMO_REG_CLOCK_GEN7,         0x0001 }, /* 0101 */
--      { GLAMO_REG_CLOCK_GEN8,         0x0100 },
--      { GLAMO_REG_CLOCK_HOST,         0x000d },
--      { 0x200,        0x0ef0 },
--      { 0x202,        0x07ff },
--      { 0x212,        0x0000 },
--      { 0x214,        0x4000 },
--      { 0x216,        0xf00e },
--      { GLAMO_REG_MEM_TYPE,           0x0874 }, /* 8MB, 16 word pg wr+rd */
--      { GLAMO_REG_MEM_GEN,            0xafaf }, /* 63 grants min + max */
--
--      { GLAMO_REG_MEM_TIMING1,        0x0108 },
--      { GLAMO_REG_MEM_TIMING2,        0x0010 }, /* Taa = 3 MCLK */
--      { GLAMO_REG_MEM_TIMING3,        0x0000 },
--      { GLAMO_REG_MEM_TIMING4,        0x0000 }, /* CE1# delay fall/rise */
--      { GLAMO_REG_MEM_TIMING5,        0x0000 }, /* UB# LB# */
--      { GLAMO_REG_MEM_TIMING6,        0x0000 }, /* OE# */
--      { GLAMO_REG_MEM_TIMING7,        0x0000 }, /* WE# */
--      { GLAMO_REG_MEM_TIMING8,        0x1002 }, /* MCLK delay, was 0x1000 */
--      { GLAMO_REG_MEM_TIMING9,        0x6006 },
--      { GLAMO_REG_MEM_TIMING10,       0x00ff },
--      { GLAMO_REG_MEM_TIMING11,       0x0001 },
--      { GLAMO_REG_MEM_POWER1,         0x0020 },
--      { GLAMO_REG_MEM_POWER2,         0x0000 },
--      { GLAMO_REG_MEM_DRAM1,          0x0000 },
--              { 0xfffe, 1 },
--      { GLAMO_REG_MEM_DRAM1,          0xc100 },
--              { 0xfffe, 1 },
--      { GLAMO_REG_MEM_DRAM1,          0xe100 },
--      { GLAMO_REG_MEM_DRAM2,          0x01d6 },
--      { GLAMO_REG_CLOCK_MEMORY,       0x000b },
--};
--
--#if 0 /* MM370 */
--static const struct glamo_script regs_vram_2mb = {
--      { GLAMO_REG_CLOCK_MEMORY,       0x3aaa },
--              { 0xfffe, 50 },
--      { GLAMO_REG_CLOCK_MEMORY,       0x0aaa },
--              { 0xfffe, 3 },
--      { GLAMO_REG_MEM_POWER1,         0x0020 },
--      { 0x033a,                       0x0000 },
--      { 0x033c,                       0x0000 },
--      { 0x033e,                       0x0000 },
--      { 0x0340,                       0x0000 },
--      { 0x0342,                       0x0000 },
--      { 0x0344,                       0x0000 },
--      { 0x0346,                       0x0240 },
--      { GLAMO_REG_MEM_TIMING8,        0x1016 },
--      { GLAMO_REG_MEM_TIMING9,        0x6067 },
--      { GLAMO_REG_MEM_TIMING10,       0x00ff },
--      { GLAMO_REG_MEM_TIMING11,       0x0030 },
--      { GLAMO_REG_MEM_GEN,            0x3fff },
--      { GLAMO_REG_MEM_GEN,            0xafaf },
--      { GLAMO_REG_MEM_TIMING1,        0x0108 },
--      { GLAMO_REG_MEM_TIMING2,        0x0010 },
--      { GLAMO_REG_MEM_DRAM1,          0x0a00 },
--              { 0xfffe, 3 },
--      { GLAMO_REG_MEM_DRAM1,          0xe200 },
--              { 0xfffe, 1 },
--};
--
--static const struct glamo_script regs_vram_8mb = {
--      { GLAMO_REG_CLOCK_MEMORY,       0x3aaa },
--              { 0xfffe, 50 },
--      { GLAMO_REG_CLOCK_MEMORY,       0x0aaa },
--              { 0xfffe, 3 },
--      { GLAMO_REG_MEM_POWER1,         0x0020 },
--      { 0x033a,                       0x45cf },
--      { 0x033c,                       0x4240 },
--      { 0x033e,                       0x53e0 },
--      { 0x0340,                       0x1401 },
--      { 0x0342,                       0x0c44 },
--      { 0x0344,                       0x1d0b },
--      { 0x0346,                       0x25ac },
--      { 0x0348,                       0x1953 },
--              { 0xfffe, 1 },
--      { GLAMO_REG_MEM_TYPE,           0x087a },
--      { GLAMO_REG_MEM_DRAM2,          0x01d6 },
--      { GLAMO_REG_MEM_TIMING8,        0x1060 },
--      { GLAMO_REG_MEM_TIMING9,        0x6067 },
--      { GLAMO_REG_MEM_TIMING10,       0x00ff },
--      { GLAMO_REG_MEM_TIMING11,       0x0030 },
--      { GLAMO_REG_MEM_GEN,            0x3fff },
--      { GLAMO_REG_MEM_GEN,            0xafaf },
--      { GLAMO_REG_MEM_TIMING1,        0x3108 },
--      { GLAMO_REG_MEM_TIMING2,        0x0010 },
--      { GLAMO_REG_MEM_DRAM1,          0x0a00 },
--              { 0xfffe, 3 },
--      { GLAMO_REG_MEM_DRAM1,          0xe200 },
--              { 0xfffe, 1 },
--};
--#endif
- enum glamo_power {
-       GLAMO_POWER_ON,
--      GLAMO_POWER_STANDBY,
-       GLAMO_POWER_SUSPEND,
- };
- static void glamo_power(struct glamo_core *glamo,
-                       enum glamo_power new_state)
- {
-+      int n;
-+
-       spin_lock(&glamo->lock);
-       dev_dbg(&glamo->pdev->dev, "***** glamo_power -> %d\n", new_state);
-@@ -836,37 +788,76 @@ static void glamo_power(struct glamo_core *glamo,
-               while ((__reg_read(glamo, GLAMO_REG_PLL_GEN5) & 3) != 3)
-                       ;
--              /* enable memory clock and get it out of deep pwrdown */
--              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_MEMORY,
--                                 GLAMO_CLOCK_MEM_EN_MOCACLK, 0xffff);
--              __reg_set_bit_mask(glamo, GLAMO_REG_MEM_DRAM2,
--                                 GLAMO_MEM_DRAM2_DEEP_PWRDOWN, 0x0000);
--              __reg_set_bit_mask(glamo, GLAMO_REG_MEM_DRAM1,
--                                 GLAMO_MEM_DRAM1_SELF_REFRESH, 0x0000);
--
--              glamo_run_script(glamo, glamo_resume_script,
--                               ARRAY_SIZE(glamo_resume_script), 0);
--
--              break;
--
--      case GLAMO_POWER_STANDBY:
--              /* enable memory self-refresh */
--              __reg_set_bit_mask(glamo, GLAMO_REG_MEM_DRAM1,
--                                 GLAMO_MEM_DRAM1_SELF_REFRESH, 0xffff);
--              /* stop memory clock */
--              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_MEMORY,
--                                 GLAMO_CLOCK_MEM_EN_MOCACLK, 0x0000);
--              /* power down PLL2 and then PLL1 */
--              __reg_set_bit_mask(glamo, GLAMO_REG_PLL_GEN3, 0x2000, 0xffff);
--              __reg_set_bit_mask(glamo, GLAMO_REG_DFT_GEN5, 0x0001, 0xffff);
-+              /* Get memory out of deep powerdown */
-+
-+              __reg_write(glamo, GLAMO_REG_MEM_DRAM2,
-+                                      (7 << 6) | /* tRC */
-+                                      (1 << 4) | /* tRP */
-+                                      (1 << 2) | /* tRCD */
-+                                      2); /* CAS latency */
-+
-+              /* Stop self-refresh */
-+
-+              __reg_write(glamo, GLAMO_REG_MEM_DRAM1,
-+                                      GLAMO_MEM_DRAM1_EN_DRAM_REFRESH |
-+                                      GLAMO_MEM_DRAM1_EN_GATE_CKE |
-+                                      GLAMO_MEM_REFRESH_COUNT);
-+              __reg_write(glamo, GLAMO_REG_MEM_DRAM1,
-+                                      GLAMO_MEM_DRAM1_EN_MODEREG_SET |
-+                                      GLAMO_MEM_DRAM1_EN_DRAM_REFRESH |
-+                                      GLAMO_MEM_DRAM1_EN_GATE_CKE |
-+                                      GLAMO_MEM_REFRESH_COUNT);
-+
-+              /* re-enable clocks to memory */
-+
-+              __reg_write(glamo, GLAMO_REG_CLOCK_MEMORY,
-+                                      GLAMO_CLOCK_MEM_EN_MOCACLK |
-+                                      GLAMO_CLOCK_MEM_EN_M1CLK |
-+                                      GLAMO_CLOCK_MEM_DG_M1CLK);
-+
-+              /* restore each engine that was up before suspend */
-+              for (n = 0; n < __NUM_GLAMO_ENGINES; n++)
-+                      if (glamo->engine_enabled_bitfield_suspend & (1 << n))
-+                              __glamo_engine_enable(glamo, n);
-               break;
-       case GLAMO_POWER_SUSPEND:
--              __reg_set_bit_mask(glamo, GLAMO_REG_MEM_DRAM2,
--                                 GLAMO_MEM_DRAM2_DEEP_PWRDOWN, 0xffff);
--              /* stop memory clock */
--              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_MEMORY,
--                                 GLAMO_CLOCK_MEM_EN_MOCACLK, 0x0000);
-+              /* stash a copy of which engines were running */
-+              glamo->engine_enabled_bitfield_suspend =
-+                                               glamo->engine_enabled_bitfield;
-+
-+              /* take down each engine before we kill mem and pll */
-+              for (n = 0; n < __NUM_GLAMO_ENGINES; n++)
-+                      if (glamo->engine_enabled_bitfield & (1 << n))
-+                              __glamo_engine_disable(glamo, n);
-+
-+              /* enable self-refresh */
-+
-+              __reg_write(glamo, GLAMO_REG_MEM_DRAM1,
-+                                      GLAMO_MEM_DRAM1_EN_DRAM_REFRESH |
-+                                      GLAMO_MEM_DRAM1_EN_GATE_CKE |
-+                                      GLAMO_MEM_DRAM1_SELF_REFRESH |
-+                                      GLAMO_MEM_REFRESH_COUNT);
-+              __reg_write(glamo, GLAMO_REG_MEM_DRAM1,
-+                                      GLAMO_MEM_DRAM1_EN_MODEREG_SET |
-+                                      GLAMO_MEM_DRAM1_EN_DRAM_REFRESH |
-+                                      GLAMO_MEM_DRAM1_EN_GATE_CKE |
-+                                      GLAMO_MEM_DRAM1_SELF_REFRESH |
-+                                      GLAMO_MEM_REFRESH_COUNT);
-+
-+              /* force RAM into deep powerdown */
-+
-+              __reg_write(glamo, GLAMO_REG_MEM_DRAM2,
-+                                      GLAMO_MEM_DRAM2_DEEP_PWRDOWN |
-+                                      (7 << 6) | /* tRC */
-+                                      (1 << 4) | /* tRP */
-+                                      (1 << 2) | /* tRCD */
-+                                      2); /* CAS latency */
-+
-+              /* kill clocks to memory */
-+
-+              __reg_write(glamo, GLAMO_REG_CLOCK_MEMORY, 0);
-+
-               /* power down PLL2 and then PLL1 */
-               __reg_set_bit_mask(glamo, GLAMO_REG_PLL_GEN3, 0x2000, 0xffff);
-               __reg_set_bit_mask(glamo, GLAMO_REG_DFT_GEN5, 0x0001, 0xffff);
-@@ -1016,9 +1007,9 @@ static ssize_t regs_read(struct device *dev, struct device_attribute *attr,
-               char * name;
-       };
-       struct reg_range reg_range[] = {
--              { 0x0000, 0x200, "General" },
-+              { 0x0000, 0x76, "General" },
-               { 0x0200, 0x100, "Host Bus" },
--              { 0x0300, 0x100, "Memory" },
-+              { 0x0300, 0x38, "Memory" },
- /*            { 0x0400, 0x100, "Sensor" },
-               { 0x0500, 0x300, "ISP" },
-               { 0x0800, 0x400, "JPEG" },
-@@ -1037,12 +1028,11 @@ static ssize_t regs_read(struct device *dev, struct device_attribute *attr,
-       for (r = 0; r < ARRAY_SIZE(reg_range); r++) {
-               n1 = 0;
--              end += sprintf(end, "\n%s\n\n", reg_range[r].name);
-+              end += sprintf(end, "\n%s\n", reg_range[r].name);
-               for (n = reg_range[r].start;
-                    n < reg_range[r].start + reg_range[r].count; n += 2) {
-                       if (((n1++) & 7) == 0)
--                              end += sprintf(end, "\n%04X:  ",
--                                             n + reg_range[r].start);
-+                              end += sprintf(end, "\n%04X:  ", n);
-                       end += sprintf(end, "%04x ", __reg_read(glamo, n));
-               }
-               end += sprintf(end, "\n");
-diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h
-index 82b95f5..8d647ec 100644
---- a/drivers/mfd/glamo/glamo-core.h
-+++ b/drivers/mfd/glamo/glamo-core.h
-@@ -30,6 +30,8 @@ struct glamo_core {
-       u_int16_t revision;
-       spinlock_t lock;
-       struct resume_dependency resume_dependency;
-+      u32 engine_enabled_bitfield;
-+      u32 engine_enabled_bitfield_suspend;
- };
- struct glamo_script {
-diff --git a/drivers/mfd/glamo/glamo-regs.h b/drivers/mfd/glamo/glamo-regs.h
-index 32411e3..2328b8a 100644
---- a/drivers/mfd/glamo/glamo-regs.h
-+++ b/drivers/mfd/glamo/glamo-regs.h
-@@ -142,8 +142,12 @@ enum glamo_register_mem {
- #define GLAMO_MEM_TYPE_MASK   0x03
- enum glamo_reg_mem_dram1 {
--      GLAMO_MEM_DRAM1_EN_SDRAM_CLK    = (1 << 11),
-+      /* b0 - b10 == refresh period, 1 -> 2048 clocks */
-+      GLAMO_MEM_DRAM1_EN_GATE_CLK     = (1 << 11),
-       GLAMO_MEM_DRAM1_SELF_REFRESH    = (1 << 12),
-+      GLAMO_MEM_DRAM1_EN_GATE_CKE     = (1 << 13),
-+      GLAMO_MEM_DRAM1_EN_DRAM_REFRESH = (1 << 14),
-+      GLAMO_MEM_DRAM1_EN_MODEREG_SET  = (1 << 15),
- };
- enum glamo_reg_mem_dram2 {
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1232-change-backlight-level-not-forced-up-on-resume.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1232-change-backlight-level-not-forced-up-on-resume.patch.patch
deleted file mode 100644 (file)
index ea05e90..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-From db07519c1dfe916bcf9644bfdc4d7c03707a979e Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Tue, 15 Jul 2008 09:04:05 +0100
-Subject: [PATCH] change-backlight-level-not-forced-up-on-resume.patch
-
-We at least always enabled backlight on resume, this patch
-changes us to set backlight back to last requested backlight
-brightness level on resume.  Note it means that you can
-resume with screen blanked, but it should come back if that
-happened with touchscreen action as usual.
-
-/sys/class/backlight/pcf50633-bl/actual_brightness
-and
-/sys/class/backlight/pcf50633-bl/brightness
-
-seem to agree after resume when reportedly they didn't before.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |   29 +++++++++++++++--------------
- 1 files changed, 15 insertions(+), 14 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 9f98ba1..f461378 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1878,22 +1878,14 @@ static int pcf50633bl_get_intensity(struct backlight_device *bd)
-       return intensity & 0x3f;
- }
--static int pcf50633bl_set_intensity(struct backlight_device *bd)
-+static int __pcf50633bl_set_intensity(struct pcf50633_data *pcf, int intensity)
- {
--      struct pcf50633_data *pcf = bl_get_data(bd);
--      int intensity = bd->props.brightness;
-       int old_intensity = reg_read(pcf, PCF50633_REG_LEDOUT);
-       int ret;
--      dev_info(&pcf->client.dev, "pcf50633bl_set_intensity\n");
--
-       if (!(reg_read(pcf, PCF50633_REG_LEDENA) & 1))
-               old_intensity = 0;
--      if ((bd->props.power != FB_BLANK_UNBLANK) ||
--          (bd->props.fb_blank != FB_BLANK_UNBLANK))
--              intensity = 0;
--
-       /*
-        * The PCF50633 cannot handle LEDOUT = 0 (datasheet p60)
-        * if seen, you have to re-enable the LED unit
-@@ -1919,6 +1911,18 @@ static int pcf50633bl_set_intensity(struct backlight_device *bd)
-       return ret;
- }
-+static int pcf50633bl_set_intensity(struct backlight_device *bd)
-+{
-+      struct pcf50633_data *pcf = bl_get_data(bd);
-+      int intensity = bd->props.brightness;
-+
-+      if ((bd->props.power != FB_BLANK_UNBLANK) ||
-+          (bd->props.fb_blank != FB_BLANK_UNBLANK))
-+              intensity = 0;
-+
-+      return __pcf50633bl_set_intensity(pcf, intensity);
-+}
-+
- static struct backlight_ops pcf50633bl_ops = {
-       .get_brightness = pcf50633bl_get_intensity,
-       .update_status  = pcf50633bl_set_intensity,
-@@ -2508,11 +2512,8 @@ void pcf50633_backlight_resume(struct pcf50633_data *pcf)
-       /* platform defines resume ramp speed */
-       reg_write(pcf, PCF50633_REG_LEDDIM,
-                                      pcf->pdata->resume_backlight_ramp_speed);
--      reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.misc[
--                                 PCF50633_REG_LEDOUT - PCF50633_REG_AUTOOUT]);
--      /* we force the backlight on in fact */
--      reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.misc[
--                             PCF50633_REG_LEDENA - PCF50633_REG_AUTOOUT] | 1);
-+
-+      __pcf50633bl_set_intensity(pcf, pcf->backlight->props.brightness);
- }
- EXPORT_SYMBOL_GPL(pcf50633_backlight_resume);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1233-introduce-BANKCON-meddling-sysfs.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1233-introduce-BANKCON-meddling-sysfs.patch.patch
deleted file mode 100644 (file)
index e4c5dee..0000000
+++ /dev/null
@@ -1,300 +0,0 @@
-From fd25f90517322fc6c07bfb8d34752d3cb41cb4b6 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Tue, 15 Jul 2008 09:04:11 +0100
-Subject: [PATCH] introduce-BANKCON-meddling-sysfs.patch
-
-A few questions have been flying around about how optimal
-our waitstates are for various things including Glamo.
-
-This patch introduces new sysfs nodes
-
-/sys/devices/platform/neo1973-memconfig.0/BANKCON0
-...
-/sys/devices/platform/neo1973-memconfig.0/BANKCON7
-
-If you cat them you get translated info about bus speed on
-that chip select, eg,
-
-# cat /sys/devices/platform/neo1973-memconfig.0/BANKCON1
-BANKCON1 = 0x00000A40
- Type = ROM / SRAM
- PMC  = normal (1 data)
- Tacp = 2 clocks
- Tcah = 0 clocks
- Tcoh = 1 clock
- Tacc = 3 clocks
- Tcos = 1 clock
- Tacs = 0 clocks
-
-You can write them in hex too
-
-# echo 0x200 > /sys/devices/platform/neo1973-memconfig.0/BANKCON1
-
-The write format for BANKCON0 - 5 looks like this
-
- b1..b0   PMC  Page Mode Config
- b3..b2   Tacp Page Mode Access Cycle
- b5..b4   Tcah Address hold after CS deasserted
- b7..b6   Tcoh CS hold after OE deasserted
- b10..b8  Tacc Access Cycle Period
- b12..b11 Tcos CS setup before OE asserted
- b14..b13 Tacs Address setup before CS asserted
-
-BANKCON 6 and 7 have two extra bits
-
- b16..b15  MT  Memory type (00=ROM/SRAM, 11=DRAM)
-
-If it's ROM/SRAM, the rest of the bits are as described above.
-For DRAM
-
- b1..b0   SCAN Column address number
- b3..b2   RAS to CAS delay
-
-The patch is intended to let people experiement on their own.  But
-of course you will crash things for sure if the timing is wrong, and
-you can also trash SD Card data if you make Glamo unstable, so remove
-it or remount ro first.  Other horrible things are possible, but
-because the settings aren't sticky, you should always be able to
-recover by either normal reboot usually or at worst NOR boot and then
-dfu.  Most likely you will just crash your session and have to reboot
-if your settings are bad, but consider yourself warned bad things are
-possible. :-)
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c        |    6 +
- arch/arm/plat-s3c24xx/Makefile            |    3 +-
- arch/arm/plat-s3c24xx/neo1973_memconfig.c |  186 +++++++++++++++++++++++++++++
- 3 files changed, 194 insertions(+), 1 deletions(-)
- create mode 100644 arch/arm/plat-s3c24xx/neo1973_memconfig.c
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index b3d3797..f30abb6 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -412,6 +412,11 @@ struct platform_device gta02_resume_reason_device = {
-       .num_resources  = 0,
- };
-+struct platform_device gta02_memconfig_device = {
-+      .name           = "neo1973-memconfig",
-+      .num_resources  = 0,
-+};
-+
- static struct map_desc gta02_iodesc[] __initdata = {
-       {
-               .virtual        = 0xe0000000,
-@@ -829,6 +834,7 @@ static struct platform_device *gta02_devices[] __initdata = {
-       &gta02_nor_flash,
-       &sc32440_fiq_device,
-       &gta02_version_device,
-+      &gta02_memconfig_device,
-       &gta02_resume_reason_device,
-       &s3c24xx_pwm_device,
-diff --git a/arch/arm/plat-s3c24xx/Makefile b/arch/arm/plat-s3c24xx/Makefile
-index 21f5159..d638fc0 100644
---- a/arch/arm/plat-s3c24xx/Makefile
-+++ b/arch/arm/plat-s3c24xx/Makefile
-@@ -34,4 +34,5 @@ obj-$(CONFIG_MACH_NEO1973)   += neo1973_version.o \
-                                  neo1973_pm_gps.o \
-                                  neo1973_pm_bt.o  \
-                                  neo1973_shadow.o \
--                                 neo1973_pm_resume_reason.o
-+                                 neo1973_pm_resume_reason.o \
-+                                 neo1973_memconfig.o
-diff --git a/arch/arm/plat-s3c24xx/neo1973_memconfig.c b/arch/arm/plat-s3c24xx/neo1973_memconfig.c
-new file mode 100644
-index 0000000..55d85fc
---- /dev/null
-+++ b/arch/arm/plat-s3c24xx/neo1973_memconfig.c
-@@ -0,0 +1,186 @@
-+/*
-+ * Memory access timing control sysfs for the s3c24xx based device
-+ *
-+ * (C) 2008 by Openmoko Inc.
-+ * Author: Andy Green <andy@openmoko.com>
-+ * 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 version 2 as
-+ * published by the Free Software Foundation
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/mach-types.h>
-+#include <asm/arch/regs-mem.h>
-+
-+static ssize_t neo1973_memconfig_read(struct device *dev,
-+                                     struct device_attribute *attr, char *buf)
-+{
-+      int index = attr->attr.name[strlen(attr->attr.name) - 1] - '0';
-+      u32 reg = *((u32 *)(S3C2410_MEMREG(((index + 1) << 2))));
-+      static const char *meaning[][8] = {
-+              {
-+                      [0] = "normal (1 data)",
-+                      [1] = "4 data",
-+                      [2] = "8 data",
-+                      [3] = "16 data",
-+              }, {
-+                      [0] = "2 clocks",
-+                      [1] = "3 clocks",
-+                      [2] = "4 clocks",
-+                      [3] = "6 clocks",
-+              }, {
-+                      [0] = "0 clocks",
-+                      [1] = "1 clock",
-+                      [2] = "2 clocks",
-+                      [3] = "4 clocks",
-+              }, {
-+                      [0] = "1 clock",
-+                      [1] = "2 clocks",
-+                      [2] = "3 clocks",
-+                      [3] = "4 clocks",
-+                      [4] = "6 clocks",
-+                      [5] = "8 clocks",
-+                      [6] = "10 clocks",
-+                      [7] = "14 clocks",
-+              }, { /* after this, only for CS6 and CS7 */
-+                      [0] = "ROM / SRAM",
-+                      [1] = "(illegal)",
-+                      [2] = "(illegal)",
-+                      [3] = "Sync DRAM",
-+              }, {
-+                      [0] = "8 Column bits",
-+                      [1] = "9 Column bits",
-+                      [2] = "10 Column bits",
-+                      [3] = "(illegal)",
-+              }, {
-+                      [0] = "2 clocks",
-+                      [1] = "3 clocks",
-+                      [2] = "4 clocks",
-+                      [3] = "(illegal)",
-+              }
-+      };
-+
-+      if (index >= 6)
-+              if (((reg >> 15) & 3) == 3) /* DRAM */
-+                      return sprintf(buf, "BANKCON%d = 0x%08X\n DRAM:\n"
-+                                          "  Trcd = %s\n  SCAN = %s\n", index,
-+                                          reg, meaning[5][reg & 3],
-+                                          meaning[1][(reg >> 2) & 3]);
-+
-+      return sprintf(buf, "BANKCON%d = 0x%08X\n Type = %s\n PMC  = %s\n"
-+                          " Tacp = %s\n Tcah = %s\n Tcoh = %s\n Tacc = %s\n"
-+                          " Tcos = %s\n Tacs = %s\n",
-+                          index, reg, meaning[4][(reg >> 15) & 3],
-+                          meaning[0][reg & 3],
-+                          meaning[1][(reg >> 2) & 3],
-+                          meaning[2][(reg >> 4) & 3],
-+                          meaning[2][(reg >> 6) & 3],
-+                          meaning[3][(reg >> 8) & 7],
-+                          meaning[2][(reg >> 11) & 3],
-+                          meaning[2][(reg >> 13) & 3]);
-+}
-+
-+static ssize_t neo1973_memconfig_write(struct device *dev,
-+                 struct device_attribute *attr, const char *buf, size_t count)
-+{
-+      int index = attr->attr.name[strlen(attr->attr.name) - 1] - '0';
-+      unsigned long val = simple_strtoul(buf, NULL, 16);
-+
-+      dev_info(dev, "setting BANKCON%d <- 0x%08X\n", index, (u32)val);
-+
-+      *((u32 *)(S3C2410_MEMREG(((index + 1) << 2)))) = (u32)val;
-+
-+      return count;
-+}
-+
-+
-+static DEVICE_ATTR(BANKCON0, 0644, neo1973_memconfig_read,
-+                                                     neo1973_memconfig_write);
-+static DEVICE_ATTR(BANKCON1, 0644, neo1973_memconfig_read,
-+                                                     neo1973_memconfig_write);
-+static DEVICE_ATTR(BANKCON2, 0644, neo1973_memconfig_read,
-+                                                     neo1973_memconfig_write);
-+static DEVICE_ATTR(BANKCON3, 0644, neo1973_memconfig_read,
-+                                                     neo1973_memconfig_write);
-+static DEVICE_ATTR(BANKCON4, 0644, neo1973_memconfig_read,
-+                                                     neo1973_memconfig_write);
-+static DEVICE_ATTR(BANKCON5, 0644, neo1973_memconfig_read,
-+                                                     neo1973_memconfig_write);
-+static DEVICE_ATTR(BANKCON6, 0644, neo1973_memconfig_read,
-+                                                     neo1973_memconfig_write);
-+static DEVICE_ATTR(BANKCON7, 0644, neo1973_memconfig_read,
-+                                                     neo1973_memconfig_write);
-+
-+static struct attribute *neo1973_memconfig_sysfs_entries[] = {
-+      &dev_attr_BANKCON0.attr,
-+      &dev_attr_BANKCON1.attr,
-+      &dev_attr_BANKCON2.attr,
-+      &dev_attr_BANKCON3.attr,
-+      &dev_attr_BANKCON4.attr,
-+      &dev_attr_BANKCON5.attr,
-+      &dev_attr_BANKCON6.attr,
-+      &dev_attr_BANKCON7.attr,
-+      NULL
-+};
-+
-+static struct attribute_group neo1973_memconfig_attr_group = {
-+      .name   = NULL,
-+      .attrs  = neo1973_memconfig_sysfs_entries,
-+};
-+
-+static int __init neo1973_memconfig_probe(struct platform_device *pdev)
-+{
-+      dev_info(&pdev->dev, "starting\n");
-+
-+      switch (machine_arch_type) {
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+      case MACH_TYPE_NEO1973_GTA01:
-+              return -EINVAL;
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+      default:
-+              break;
-+      }
-+
-+      return sysfs_create_group(&pdev->dev.kobj,
-+                                               &neo1973_memconfig_attr_group);
-+}
-+
-+static int neo1973_memconfig_remove(struct platform_device *pdev)
-+{
-+      sysfs_remove_group(&pdev->dev.kobj, &neo1973_memconfig_attr_group);
-+      return 0;
-+}
-+
-+static struct platform_driver neo1973_memconfig_driver = {
-+      .probe          = neo1973_memconfig_probe,
-+      .remove         = neo1973_memconfig_remove,
-+      .driver         = {
-+              .name           = "neo1973-memconfig",
-+      },
-+};
-+
-+static int __devinit neo1973_memconfig_init(void)
-+{
-+      return platform_driver_register(&neo1973_memconfig_driver);
-+}
-+
-+static void neo1973_memconfig_exit(void)
-+{
-+      platform_driver_unregister(&neo1973_memconfig_driver);
-+}
-+
-+module_init(neo1973_memconfig_init);
-+module_exit(neo1973_memconfig_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
-+MODULE_DESCRIPTION("neo1973 memconfig");
-+
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1234-sdio-use-interruptible-sleep-in-kthread-main-loops.patch b/target/linux/s3c24xx/patches-2.6.24/1234-sdio-use-interruptible-sleep-in-kthread-main-loops.patch
deleted file mode 100644 (file)
index 0eae52f..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-From 287b292cf95edbd82dc63085ae5f0167a6e8141f Mon Sep 17 00:00:00 2001
-From: Jason Uhlenkott <jasonuhl@jasonuhl.org>
-Date: Tue, 15 Jul 2008 11:37:45 +0100
-Subject: [PATCH] sdio: use interruptible sleep in kthread main loops
-
-My FreeRunner's load average was leveling off at 2.00 as a result of
-these two kernel threads:
-
-SDIO Helper   D c02b4500     0   255      2
-[<c02b4298>] (schedule+0x0/0x2d4) from [<c02b4040>] (__down+0x100/0x158)
-[<c02b3f40>] (__down+0x0/0x158) from [<c02b3e2c>] (__down_failed+0xc/0x20)
- r7:00000000 r6:c01fbd64 r5:c7cb7134 r4:c7d58000
-[<c01fa6fc>] (CardDetectHelperFunction+0x0/0x1ac) from [<c01fbd80>] (HelperLaunch+0x1c/0x28)
- r5:c7cb7134 r4:c7cb7134
-[<c01fbd64>] (HelperLaunch+0x0/0x28) from [<c005bbd0>] (kthread+0x60/0x94)
- r4:c7d58000
-[<c005bb70>] (kthread+0x0/0x94) from [<c0048f7c>] (do_exit+0x0/0x744)
- r6:00000000 r5:00000000 r4:00000000
-
-SDIO Helper   D c02b4500     0   259      2
-[<c02b4298>] (schedule+0x0/0x2d4) from [<c02b4040>] (__down+0x100/0x158)
-[<c02b3f40>] (__down+0x0/0x158) from [<c02b3e2c>] (__down_failed+0xc/0x20)
- r7:c0382bb4 r6:c0382b34 r5:c7d5a000 r4:00000001
-[<c01f9104>] (SDIOIrqHelperFunction+0x0/0x29c) from [<c01fbd80>] (HelperLaunch+0x1c/0x28)
- r8:00000000 r7:00000000 r6:c01fbd64 r5:c0382bb4 r4:c0382bb4
-[<c01fbd64>] (HelperLaunch+0x0/0x28) from [<c005bbd0>] (kthread+0x60/0x94)
- r4:c7d5a000
-[<c005bb70>] (kthread+0x0/0x94) from [<c0048f7c>] (do_exit+0x0/0x744)
- r6:00000000 r5:00000000 r4:00000000
-
-This fixes them to use interruptible sleep primitives while waiting in
-their main loops, as is conventional for kernel threads.  They can't
-actually be interrupted since kernel threads ignore all signals, but
-by sleeping this way they get classified as long term waiters, and
-don't get counted as running for purposes of load average calculation.
-
-This is intended as a minimal fix.  In the longer term, it'd probably
-make sense to replace the semaphores with completions or something,
-and to do away with some of these StudlyCapped wrapper functions.
-
-Signed-off-by: Jason Uhlenkott <jasonuhl@jasonuhl.org>
---
-
-This is untested, but what could possibly go wrong?  ;)
----
- include/linux/sdio/ctsystem_linux.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/include/linux/sdio/ctsystem_linux.h b/include/linux/sdio/ctsystem_linux.h
-index 0de89a6..c9e44f2 100644
---- a/include/linux/sdio/ctsystem_linux.h
-+++ b/include/linux/sdio/ctsystem_linux.h
-@@ -968,7 +968,7 @@ typedef struct _OSKERNEL_HELPER {
-         }
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
--#define SD_WAIT_FOR_WAKEUP(p)   SignalWait(&(p)->WakeSignal);
-+#define SD_WAIT_FOR_WAKEUP(p)   SignalWaitInterruptible(&(p)->WakeSignal);
- #define CT_LE16_TO_CPU_ENDIAN(x) __le16_to_cpu(x)
- #define CT_LE32_TO_CPU_ENDIAN(x) __le32_to_cpu(x)
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1235-fix-force-sdcard-clk-off-when-idle.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1235-fix-force-sdcard-clk-off-when-idle.patch.patch
deleted file mode 100644 (file)
index 327b450..0000000
+++ /dev/null
@@ -1,240 +0,0 @@
-From 5d70edcbe3ff5f6d5aef54ee9e278ad1ce431fd5 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Thu, 17 Jul 2008 10:02:19 +0100
-Subject: [PATCH] fix-force-sdcard-clk-off-when-idle.patch
-
-Existing Glamo bit for stopping SD Card Clock when there is no
-transfer taking place does not work.  This patch adds stuff around
-the transfer code to force the SD clock up when something is going on
-and down when it is idle.  This'll save a little power and noise ;-)
-
-I tested it briefly and was able to SD Boot normally on Sandisk 512M.
-Wider testing is appreciated.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-mci.c |  126 +++++++++++++++++++++++++++++------------
- 1 files changed, 89 insertions(+), 37 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index f264a6c..350b47d 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -20,6 +20,7 @@
- #include <linux/pcf50633.h>
- #include <linux/delay.h>
- #include <linux/interrupt.h>
-+#include <linux/spinlock.h>
- #include <asm/dma.h>
- #include <asm/dma-mapping.h>
-@@ -32,6 +33,7 @@
- /* from glamo-core.c */
- extern struct glamo_mci_pdata glamo_mci_def_pdata;
-+static spinlock_t clock_lock;
- #define DRIVER_NAME "glamo-mci"
- #define RESSIZE(ressource) (((ressource)->end - (ressource)->start) + 1)
-@@ -164,6 +166,67 @@ static int do_pio_write(struct glamo_mci_host *host)
-       return err;
- }
-+static void __glamo_mci_fix_card_div(struct glamo_mci_host *host, int div)
-+{
-+      unsigned long flags;
-+
-+      spin_lock_irqsave(&clock_lock, flags);
-+
-+      if (div < 0) {
-+              /* stop clock - remove clock from divider input */
-+              writew(readw(glamo_mci_def_pdata.pglamo->base +
-+                   GLAMO_REG_CLOCK_GEN5_1) & (~GLAMO_CLOCK_GEN51_EN_DIV_TCLK),
-+                   glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN5_1);
-+      } else {
-+              /* set the nearest prescaler factor
-+              *
-+              * register shared with SCLK divisor -- no chance of race because
-+              * we don't use sensor interface
-+              */
-+              writew_dly((readw(glamo_mci_def_pdata.pglamo->base +
-+                              GLAMO_REG_CLOCK_GEN8) & 0xff00) | div,
-+                     glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN8);
-+              /* enable clock to divider input */
-+              writew_dly(readw(glamo_mci_def_pdata.pglamo->base +
-+                      GLAMO_REG_CLOCK_GEN5_1) | GLAMO_CLOCK_GEN51_EN_DIV_TCLK,
-+                   glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN5_1);
-+      }
-+
-+      spin_unlock_irqrestore(&clock_lock, flags);
-+}
-+
-+static int __glamo_mci_set_card_clock(struct glamo_mci_host *host, int freq,
-+                                                                int *division)
-+{
-+      int div = 0;
-+      int real_rate = 0;
-+
-+      if (freq) {
-+              /* Set clock */
-+              for (div = 0; div < 256; div++) {
-+                      real_rate = host->clk_rate / (div + 1);
-+                      if (real_rate <= freq)
-+                              break;
-+              }
-+              if (div > 255)
-+                      div = 255;
-+
-+              if (division)
-+                      *division = div;
-+
-+              __glamo_mci_fix_card_div(host, div);
-+
-+      } else {
-+              /* stop clock */
-+              if (division)
-+                      *division = 0xff;
-+
-+              __glamo_mci_fix_card_div(host, -1); /* clock off */
-+      }
-+
-+      return real_rate;
-+}
-+
- static void glamo_mci_irq(unsigned int irq, struct irq_desc *desc)
- {
-       struct glamo_mci_host *host = (struct glamo_mci_host *)
-@@ -212,6 +275,10 @@ static void glamo_mci_irq(unsigned int irq, struct irq_desc *desc)
-               glamo_mci_send_request(host->mmc);
-               host->cmd_is_stop = 0;
-       }
-+
-+      /* clock off */
-+      __glamo_mci_fix_card_div(host, -1);
-+
- done:
-       host->complete_what = COMPLETION_NONE;
-       host->mrq = NULL;
-@@ -441,8 +508,11 @@ static void glamo_mci_send_request(struct mmc_host *mmc)
-                cmd->opcode, cmd->arg, cmd->data, cmd->mrq->stop,
-                cmd->flags);
-+      /* resume requested clock rate */
-+      __glamo_mci_fix_card_div(host, host->clk_div);
-+
-       if (glamo_mci_send_command(host, cmd))
--              return;
-+              goto bail;
-       /*
-        * we must spin until response is ready or timed out
-        * -- we don't get interrupts unless there is a bulk rx
-@@ -464,7 +534,7 @@ static void glamo_mci_send_request(struct mmc_host *mmc)
-               cmd->error = -EILSEQ;
-       if (host->cmd_is_stop)
--              return;
-+              goto bail;
-       if (cmd->error) {
-               dev_info(&host->pdev->dev, "Error after cmd: 0x%x\n", status);
-@@ -516,10 +586,12 @@ static void glamo_mci_send_request(struct mmc_host *mmc)
-                       if (cmd->data->error)
-                               cmd->data->error = -ETIMEDOUT;
-                       dev_err(&host->pdev->dev, "Payload timeout\n");
--                      return;
-+                      goto bail;
-               }
--              /* yay we are an interrupt controller! -- call the ISR */
-+              /* yay we are an interrupt controller! -- call the ISR
-+               * it will stop clock to card
-+               */
-               glamo_mci_irq(IRQ_GLAMO(GLAMO_IRQIDX_MMC),
-                             irq_desc + IRQ_GLAMO(GLAMO_IRQIDX_MMC));
-       }
-@@ -529,6 +601,12 @@ done:
-       host->complete_what = COMPLETION_NONE;
-       host->mrq = NULL;
-       mmc_request_done(host->mmc, cmd->mrq);
-+      return;
-+
-+bail:
-+      /* stop the clock to card */
-+      __glamo_mci_fix_card_div(host, -1);
-+      return;
- }
- static void glamo_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)
-@@ -556,11 +634,12 @@ static void glamo_mci_reset(struct glamo_mci_host *host)
-                  glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_MMC);
- }
-+
- static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
- {
-       struct glamo_mci_host *host = mmc_priv(mmc);
--      int mci_psc = 0;
-       int n = 0;
-+      int div;
-       /* Set power */
-       switch(ios->power_mode) {
-@@ -590,43 +669,15 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-       }
-       host->power_mode_current = ios->power_mode;
--       /* Set clock */
--/*    if (ios->clock) { */
--      for (mci_psc = 0; mci_psc < 256; mci_psc++) {
--              host->real_rate = host->clk_rate / (mci_psc + 1);
--              if (host->real_rate <= ios->clock)
--                      break;
--      }
--      if (mci_psc > 255)
--              mci_psc = 255;
--      host->clk_div = mci_psc;
--      /* set the nearest prescaler factor
--      *
--      * register shared with SCLK divisor -- no chance of race because
--      * we don't use sensor interface
--      */
--      writew_dly((readw(glamo_mci_def_pdata.pglamo->base +
--                      GLAMO_REG_CLOCK_GEN8) & 0xff00) | host->clk_div,
--              glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN8);
--      /* enable clock to divider input */
--      writew_dly(readw(glamo_mci_def_pdata.pglamo->base +
--              GLAMO_REG_CLOCK_GEN5_1) | GLAMO_CLOCK_GEN51_EN_DIV_TCLK,
--              glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN5_1);
--#if 0
--      } else { /* stop clock */
--              host->real_rate = 0;
--              /* remove clock from divider input */
--              writew(readw(glamo_mci_def_pdata.pglamo->base +
--                   GLAMO_REG_CLOCK_GEN5_1) & (~GLAMO_CLOCK_GEN51_EN_DIV_TCLK),
--                   glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN5_1);
--      }
--#endif
-+      host->real_rate = __glamo_mci_set_card_clock(host, ios->clock, &div);
-+      host->clk_div = div;
-+
-       if ((ios->power_mode == MMC_POWER_ON) ||
-           (ios->power_mode == MMC_POWER_UP)) {
-               dev_info(&host->pdev->dev,
-                       "powered (vdd = %d) clk: %lukHz div=%d (req: %ukHz). "
-                       "Bus width=%d\n",ios->vdd,
--                      host->real_rate / 1000, mci_psc,
-+                      host->real_rate / 1000, host->real_rate,
-                       ios->clock / 1000, ios->bus_width);
-       } else
-               dev_info(&host->pdev->dev, "glamo_mci_set_ios: power down.\n");
-@@ -856,6 +907,7 @@ static struct platform_driver glamo_mci_driver =
- static int __init glamo_mci_init(void)
- {
-+      spin_lock_init(&clock_lock);
-       platform_driver_register(&glamo_mci_driver);
-       return 0;
- }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1236-add-limit-sdcard-clk-cmdline.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1236-add-limit-sdcard-clk-cmdline.patch.patch
deleted file mode 100644 (file)
index 01200c4..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-From ef2376d29e996d9d21a9e5798cb88aa73f734c83 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Thu, 17 Jul 2008 10:02:35 +0100
-Subject: [PATCH] add-limit-sdcard-clk-cmdline.patch
-
-This patch allows you to control the maximum clock rate that will
-be selected for SD Card access, from the kernel commandline using
-
- glamo_mci.sd_max_clk=10000000
-
-and also from
-
- echo 10000000 > /sys/module/glamo_mci/parameters/sd_max_clk
-
-although you have to suspend and resume to make the limit operational
-on the actual SD_CLK line.
-
-Clocks that are possible are divided down from ~50MHz, so 25000000,
-16666666, 12500000, 10000000, etc.  With Freerunner A5 revision that
-has 100R series resistors in SD Card signals, I didn't get reliable
-operation above 16MHz.  With A6 revision the series resistors went
-down to 75R, maybe it can work at 25MHz.
-
-Reducing the clock rate is something to try if you find that your
-SD Card is not communicating properly with the default speed.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-mci.c |   38 +++++++++++++++++++++++++++++---------
- 1 files changed, 29 insertions(+), 9 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index 350b47d..6729244 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -40,6 +40,24 @@ static spinlock_t clock_lock;
- static void glamo_mci_send_request(struct mmc_host *mmc);
-+/*
-+ * Max SD clock rate
-+ *
-+ * held at /(3 + 1) due to concerns of 100R recommended series resistor
-+ * allows 16MHz @ 4-bit --> 8MBytes/sec raw
-+ *
-+ * you can override this on kernel commandline using
-+ *
-+ *   glamo_mci.sd_max_clk=10000000
-+ *
-+ * for example
-+ */
-+
-+static int sd_max_clk = 50000000 / 3;
-+module_param(sd_max_clk, int, 0644);
-+
-+
-+
- unsigned char CRC7(u8 * pu8, int cnt)
- {
-       u8 crc = 0;
-@@ -676,9 +694,9 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-           (ios->power_mode == MMC_POWER_UP)) {
-               dev_info(&host->pdev->dev,
-                       "powered (vdd = %d) clk: %lukHz div=%d (req: %ukHz). "
--                      "Bus width=%d\n",ios->vdd,
--                      host->real_rate / 1000, host->real_rate,
--                      ios->clock / 1000, ios->bus_width);
-+                      "Bus width=%d\n",(int)ios->vdd,
-+                      host->real_rate / 1000, (int)host->clk_div,
-+                      ios->clock / 1000, (int)ios->bus_width);
-       } else
-               dev_info(&host->pdev->dev, "glamo_mci_set_ios: power down.\n");
-@@ -800,11 +818,7 @@ static int glamo_mci_probe(struct platform_device *pdev)
-                         MMC_CAP_MMC_HIGHSPEED |
-                         MMC_CAP_SD_HIGHSPEED;
-       mmc->f_min      = host->clk_rate / 256;
--      /*
--       * held at /4 due to concerns of 100R recommended series resistor
--       * allows 16MHz @ 4-bit --> 8MBytes/sec raw
--       */
--      mmc->f_max      = host->clk_rate / 3;
-+      mmc->f_max      = sd_max_clk;
-       mmc->max_blk_count      = (1 << 16) - 1; /* GLAMO_REG_MMC_RB_BLKCNT */
-       mmc->max_blk_size       = (1 << 12) - 1; /* GLAMO_REG_MMC_RB_BLKLEN */
-@@ -866,12 +880,18 @@ static int glamo_mci_suspend(struct platform_device *dev, pm_message_t state)
- {
-       struct mmc_host *mmc = platform_get_drvdata(dev);
-       struct glamo_mci_host   *host = mmc_priv(mmc);
-+      int ret;
-       host->suspending++;
-       if (host->pdata->mci_all_dependencies_resumed)
-               (host->pdata->mci_suspending)(dev);
--      return mmc_suspend_host(mmc, state);
-+      ret = mmc_suspend_host(mmc, state);
-+
-+      /* so that when we resume, we use any modified max rate */
-+      mmc->f_max = sd_max_clk;
-+
-+      return ret;
- }
- int glamo_mci_resume(struct platform_device *dev)
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1237-defconfig-enable-ext2-ext3-gtaxx.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1237-defconfig-enable-ext2-ext3-gtaxx.patch.patch
deleted file mode 100644 (file)
index 8343db6..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From 642cbda5f3b7e7a61512426e1d30a41ab4691123 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Thu, 17 Jul 2008 12:21:53 +0100
-Subject: [PATCH] defconfig-enable-ext2-ext3-gtaxx.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- defconfig-2.6.24-maxmodules |    2 +-
- defconfig-gta01             |    2 +-
- defconfig-gta02             |    2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/defconfig-2.6.24-maxmodules b/defconfig-2.6.24-maxmodules
-index f574da5..39019b4 100644
---- a/defconfig-2.6.24-maxmodules
-+++ b/defconfig-2.6.24-maxmodules
-@@ -1481,7 +1481,7 @@ CONFIG_RTC_DRV_S3C=m
- #
- # File systems
- #
--CONFIG_EXT2_FS=m
-+CONFIG_EXT2_FS=y
- # CONFIG_EXT2_FS_XATTR is not set
- # CONFIG_EXT2_FS_XIP is not set
- CONFIG_EXT3_FS=y
-diff --git a/defconfig-gta01 b/defconfig-gta01
-index ab84e8b..aa0bf4b 100644
---- a/defconfig-gta01
-+++ b/defconfig-gta01
-@@ -1481,7 +1481,7 @@ CONFIG_RTC_DRV_S3C=m
- #
- # File systems
- #
--CONFIG_EXT2_FS=m
-+CONFIG_EXT2_FS=y
- # CONFIG_EXT2_FS_XATTR is not set
- # CONFIG_EXT2_FS_XIP is not set
- CONFIG_EXT3_FS=y
-diff --git a/defconfig-gta02 b/defconfig-gta02
-index 13670ee..9d0dd56 100644
---- a/defconfig-gta02
-+++ b/defconfig-gta02
-@@ -1480,7 +1480,7 @@ CONFIG_RTC_DRV_S3C=m
- #
- # File systems
- #
--CONFIG_EXT2_FS=m
-+CONFIG_EXT2_FS=y
- # CONFIG_EXT2_FS_XATTR is not set
- # CONFIG_EXT2_FS_XIP is not set
- CONFIG_EXT3_FS=y
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1238-fix-scard-stop-on-resume.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1238-fix-scard-stop-on-resume.patch.patch
deleted file mode 100644 (file)
index 1ec34d8..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-From 6ec7d69f08cfb772fdf5d7c55ed9da2273677a4d Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 20 Jul 2008 18:43:15 +0100
-Subject: [PATCH] fix-scard-stop-on-resume.patch
- Reported-by: Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>
-
-The reporter noticed SD Card clock is running again after resume.  After
-looking at the code I saw I missed two tricks, this will force it off
-after resume and will do better generally depending on what the last SD Card
-packet was.
-
-Since bulk read packet is normally last action (which set the clock off even
-without this) the old patch worked for normal cases.  But after resume, the last
-packet on the wire was not a bulk transfer and we didn't take care about the
-clock then.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-mci.c |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index 6729244..2318e6f 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -619,12 +619,9 @@ done:
-       host->complete_what = COMPLETION_NONE;
-       host->mrq = NULL;
-       mmc_request_done(host->mmc, cmd->mrq);
--      return;
--
- bail:
-       /* stop the clock to card */
-       __glamo_mci_fix_card_div(host, -1);
--      return;
- }
- static void glamo_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)
-@@ -690,6 +687,9 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-       host->real_rate = __glamo_mci_set_card_clock(host, ios->clock, &div);
-       host->clk_div = div;
-+      /* stop the clock to card, because we are idle until transfer */
-+      __glamo_mci_fix_card_div(host, -1);
-+
-       if ((ios->power_mode == MMC_POWER_ON) ||
-           (ios->power_mode == MMC_POWER_UP)) {
-               dev_info(&host->pdev->dev,
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1239-debug-move-dev-info-to-dbg.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1239-debug-move-dev-info-to-dbg.patch.patch
deleted file mode 100644 (file)
index 2499eaf..0000000
+++ /dev/null
@@ -1,179 +0,0 @@
-From 7588286c13ce04de9ce9b9a844033e07d0e71c93 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Mon, 21 Jul 2008 00:51:15 +0100
-Subject: [PATCH] debug-move-dev-info-to-dbg.patch
- Suggested-by: Sean McNeil <sean@mcneil.com>
-
-To see if some subtle race is involved, Sean has tried
-removing syslog traffic during resume and found he was
-not seeing the resume crash any more.  We're giving it
-a try to see if it changes the behaviour for anyone
-else.  It would mean we have a pretty fine race in there
-somewhere.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |    4 ++--
- drivers/i2c/chips/pcf50633.c           |   30 +++++++++++++++---------------
- 2 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index 5ef23d1..dd63506 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -95,7 +95,7 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-       if (!strcmp(attr->attr.name, "power_on")) {
-               if (on) {
-                       if (gta01_gsm.con) {
--                              dev_info(dev, "powering up GSM, thus "
-+                              dev_dbg(dev, "powering up GSM, thus "
-                                        "disconnecting serial console\n");
-                               console_stop(gta01_gsm.con);
-@@ -140,7 +140,7 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-                       if (gta01_gsm.con) {
-                               console_start(gta01_gsm.con);
--                              dev_info(dev, "powered down GSM, thus enabling "
-+                              dev_dbg(dev, "powered down GSM, thus enabling "
-                                        "serial console\n");
-                       }
-               }
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index f461378..af36e33 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -580,7 +580,7 @@ static void configure_pmu_for_charger(struct pcf50633_data *pcf,
-                * stop GPO / EN_HOSTUSB power driving out on the same
-                * USB power pins we have a 1A charger on right now!
-                */
--              dev_info(&pcf->client.dev, "Charger -> CHARGER_TYPE_1A\n");
-+              dev_dbg(&pcf->client.dev, "Charger -> CHARGER_TYPE_1A\n");
-               __reg_write(pcf, PCF50633_GPO - PCF50633_GPIO1 +
-                                PCF50633_REG_GPIO1CFG,
-                                __reg_read(pcf, PCF50633_GPO - PCF50633_GPIO1 +
-@@ -636,7 +636,7 @@ static void pcf50633_work_usbcurlim(struct work_struct *work)
-           (pcf->suspend_state == PCF50633_SS_COMPLETED_SUSPEND))
-               goto bail;
--      dev_info(&pcf->client.dev, "pcf50633_work_usbcurlim\n");
-+      dev_dbg(&pcf->client.dev, "pcf50633_work_usbcurlim\n");
-       if (!pcf->probe_completed)
-               goto reschedule;
-@@ -656,7 +656,7 @@ static void pcf50633_work_usbcurlim(struct work_struct *work)
-       /* OK let's set the requested limit and finish */
--      dev_info(&pcf->client.dev, "pcf50633_work_usbcurlim setting %dmA\n",
-+      dev_dbg(&pcf->client.dev, "pcf50633_work_usbcurlim setting %dmA\n",
-                                                        pcf->pending_curlimit);
-       pcf50633_usb_curlim_set(pcf, pcf->pending_curlimit);
-@@ -665,7 +665,7 @@ bail:
-       return;
- reschedule:
--      dev_info(&pcf->client.dev, "pcf50633_work_usbcurlim rescheduling\n");
-+      dev_dbg(&pcf->client.dev, "pcf50633_work_usbcurlim rescheduling\n");
-       if (!schedule_work(&pcf->work_usb_curlimit))
-               dev_err(&pcf->client.dev, "curlim reschedule work "
-                                                           "already queued\n");
-@@ -694,7 +694,7 @@ int pcf50633_notify_usb_current_limit_change(struct pcf50633_data *pcf,
-               return -EBUSY;
-       }
--      dev_info(&pcf->client.dev,
-+      dev_dbg(&pcf->client.dev,
-                "pcf50633_notify_usb_current_limit_change %dmA\n", ma);
-       /* prepare to detect USB power removal before we complete */
-@@ -817,7 +817,7 @@ static void pcf50633_work(struct work_struct *work)
-                                               sizeof(pcfirq),
-                                               pcfirq);
-       if (ret != sizeof(pcfirq)) {
--              dev_info(&pcf->client.dev,
-+              dev_dbg(&pcf->client.dev,
-                       "Oh crap PMU IRQ register read failed -- "
-                       "retrying later %d\n", ret);
-               /*
-@@ -1214,7 +1214,7 @@ reschedule:
-       if ((pcf->suspend_state != PCF50633_SS_STARTING_SUSPEND) &&
-           (pcf->suspend_state != PCF50633_SS_COMPLETED_SUSPEND)) {
-               msleep(10);
--              dev_info(&pcf->client.dev, "rescheduling interrupt service\n");
-+              dev_dbg(&pcf->client.dev, "rescheduling interrupt service\n");
-       }
-       if (!schedule_work(&pcf->work))
-               dev_err(&pcf->client.dev, "int service reschedule failed\n");
-@@ -1228,7 +1228,7 @@ static irqreturn_t pcf50633_irq(int irq, void *_pcf)
-       struct pcf50633_data *pcf = _pcf;
-       DEBUGP("entering(irq=%u, pcf=%p): scheduling work\n", irq, _pcf);
--      dev_info(&pcf->client.dev, "pcf50633_irq scheduling work\n");
-+      dev_dbg(&pcf->client.dev, "pcf50633_irq scheduling work\n");
-       get_device(&pcf->client.dev);
-       if (!schedule_work(&pcf->work) && !pcf->working)
-@@ -1740,7 +1740,7 @@ static int pcf50633_rtc_read_time(struct device *dev, struct rtc_time *tm)
-       mutex_unlock(&pcf->lock);
--      dev_info(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
-+      dev_dbg(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
-               pcf_tm.time[PCF50633_TI_DAY],
-               pcf_tm.time[PCF50633_TI_MONTH],
-               pcf_tm.time[PCF50633_TI_YEAR],
-@@ -1750,7 +1750,7 @@ static int pcf50633_rtc_read_time(struct device *dev, struct rtc_time *tm)
-       pcf2rtc_time(tm, &pcf_tm);
--      dev_info(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
-+      dev_dbg(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
-               tm->tm_mday, tm->tm_mon, tm->tm_year,
-               tm->tm_hour, tm->tm_min, tm->tm_sec);
-@@ -1764,11 +1764,11 @@ static int pcf50633_rtc_set_time(struct device *dev, struct rtc_time *tm)
-       struct pcf50633_time pcf_tm;
-       int ret;
--      dev_info(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
-+      dev_dbg(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
-               tm->tm_mday, tm->tm_mon, tm->tm_year,
-               tm->tm_hour, tm->tm_min, tm->tm_sec);
-       rtc2pcf_time(&pcf_tm, tm);
--      dev_info(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
-+      dev_dbg(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
-               pcf_tm.time[PCF50633_TI_DAY],
-               pcf_tm.time[PCF50633_TI_MONTH],
-               pcf_tm.time[PCF50633_TI_YEAR],
-@@ -2432,7 +2432,7 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-               else
-                       tmp = pcf->standby_regs.ldo[(i - 4) * 2 + 1];
--              dev_info(dev, "disabling reg %s by setting ENA %d to 0x%02X\n",
-+              dev_dbg(dev, "disabling reg %s by setting ENA %d to 0x%02X\n",
-                             pcf->pdata->rails[i].name,
-                             regulator_registers[i] + 1, tmp & 0xfe);
-@@ -2507,7 +2507,7 @@ EXPORT_SYMBOL_GPL(pcf50633_wait_for_ready);
- void pcf50633_backlight_resume(struct pcf50633_data *pcf)
- {
--      dev_info(&pcf->client.dev, "pcf50633_backlight_resume\n");
-+      dev_dbg(&pcf->client.dev, "pcf50633_backlight_resume\n");
-       /* platform defines resume ramp speed */
-       reg_write(pcf, PCF50633_REG_LEDDIM,
-@@ -2526,7 +2526,7 @@ static int pcf50633_resume(struct device *dev)
-       u8 res[5];
-       u8 misc[PCF50633_REG_LEDDIM - PCF50633_REG_AUTOOUT + 1];
--      dev_info(dev, "pcf50633_resume suspended on entry = %d\n",
-+      dev_dbg(dev, "pcf50633_resume suspended on entry = %d\n",
-                                                (int)pcf->suspend_state);
-       mutex_lock(&pcf->lock);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1240-debug-add-glamo-drive-strength-module-param.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1240-debug-add-glamo-drive-strength-module-param.patch.patch
deleted file mode 100644 (file)
index 04e28ad..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-From 1d04b142ffeaa15129f046751f1366b0f0614f47 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Mon, 21 Jul 2008 00:51:30 +0100
-Subject: [PATCH] debug-add-glamo-drive-strength-module-param.patch
- Suggested-by: Werner Almesberger <werner@openmoko.org>
-
-This patch allows users to control two additional settings
-in Glamo MCI driver from kernel commandline or module
-parameters.
-
-
-First is Glamo drive strength on SD IOs including CLK.
-This ranges from 0 (weakest) to 3 (strongest).
-
-echo 0 > /sys/module/glamo_mci/parameters/sd_drive
-
-(Changes to this take effect on next SD Card transaction)
-
-or, from kernel commandline
-
-glamo_mci.sd_drive=0
-
-On tests here with 0 strength, communication to SD card
-(shipped 512MB Sandisk) seemed fine, and a dd of 10MB
-urandom had the same md5 when written to cache as after
-a reboot.  I set the default to 2.
-
-
-Second is whether we allow SD_CLK when the SD interface
-is idle.
-
-# stop the clock when we are idle (default)
-echo 0 > /sys/module/glamo_mci/parameters/sd_idleclk
-
-# run the SD clock all the time
-echo 1 > /sys/module/glamo_mci/parameters/sd_idleclk
-
-(changes take effect on next SD Card transaction)
-
-From kernel commandline, eg:
-
-glamo_mci.sd_idleclk=1
-
-Normally you don't want to run the SD Clock all the time.
-
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-mci.c |   59 +++++++++++++++++++++++++++++++---------
- 1 files changed, 45 insertions(+), 14 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index 2318e6f..6585821 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -56,6 +56,32 @@ static void glamo_mci_send_request(struct mmc_host *mmc);
- static int sd_max_clk = 50000000 / 3;
- module_param(sd_max_clk, int, 0644);
-+/*
-+ * SD Signal drive strength
-+ *
-+ * you can override this on kernel commandline using
-+ *
-+ *   glamo_mci.sd_drive=0
-+ *
-+ * for example
-+ */
-+
-+static int sd_drive = 2;
-+module_param(sd_drive, int, 0644);
-+
-+/*
-+ * SD allow SD clock to run while idle
-+ *
-+ * you can override this on kernel commandline using
-+ *
-+ *   glamo_mci.sd_idleclk=0
-+ *
-+ * for example
-+ */
-+
-+static int sd_idleclk = 0; /* disallow idle clock by default */
-+module_param(sd_idleclk, int, 0644);
-+
- unsigned char CRC7(u8 * pu8, int cnt)
-@@ -239,7 +265,9 @@ static int __glamo_mci_set_card_clock(struct glamo_mci_host *host, int freq,
-               if (division)
-                       *division = 0xff;
--              __glamo_mci_fix_card_div(host, -1); /* clock off */
-+              if (!sd_idleclk)
-+                      /* clock off */
-+                      __glamo_mci_fix_card_div(host, -1);
-       }
-       return real_rate;
-@@ -294,8 +322,9 @@ static void glamo_mci_irq(unsigned int irq, struct irq_desc *desc)
-               host->cmd_is_stop = 0;
-       }
--      /* clock off */
--      __glamo_mci_fix_card_div(host, -1);
-+      if (!sd_idleclk)
-+              /* clock off */
-+              __glamo_mci_fix_card_div(host, -1);
- done:
-       host->complete_what = COMPLETION_NONE;
-@@ -428,12 +457,10 @@ static int glamo_mci_send_command(struct glamo_mci_host *host,
-       } else
-               writew(0xfff, host->base + GLAMO_REG_MMC_TIMEOUT);
--      /* Generate interrupt on txfer; drive strength max */
--      writew_dly((readw_dly(host->base + GLAMO_REG_MMC_BASIC) & 0xfe) |
-+      /* Generate interrupt on txfer */
-+      writew_dly((readw_dly(host->base + GLAMO_REG_MMC_BASIC) & 0x3e) |
-                  0x0800 | GLAMO_BASIC_MMC_NO_CLK_RD_WAIT |
--                 GLAMO_BASIC_MMC_EN_COMPL_INT |
--                 GLAMO_BASIC_MMC_EN_DR_STR0 |
--                 GLAMO_BASIC_MMC_EN_DR_STR1,
-+                 GLAMO_BASIC_MMC_EN_COMPL_INT | (sd_drive << 6),
-                  host->base + GLAMO_REG_MMC_BASIC);
-       /* send the command out on the wire */
-@@ -620,8 +647,9 @@ done:
-       host->mrq = NULL;
-       mmc_request_done(host->mmc, cmd->mrq);
- bail:
--      /* stop the clock to card */
--      __glamo_mci_fix_card_div(host, -1);
-+      if (!sd_idleclk)
-+              /* stop the clock to card */
-+              __glamo_mci_fix_card_div(host, -1);
- }
- static void glamo_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)
-@@ -687,8 +715,9 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-       host->real_rate = __glamo_mci_set_card_clock(host, ios->clock, &div);
-       host->clk_div = div;
--      /* stop the clock to card, because we are idle until transfer */
--      __glamo_mci_fix_card_div(host, -1);
-+      if (!sd_idleclk)
-+              /* stop the clock to card, because we are idle until transfer */
-+              __glamo_mci_fix_card_div(host, -1);
-       if ((ios->power_mode == MMC_POWER_ON) ||
-           (ios->power_mode == MMC_POWER_UP)) {
-@@ -705,8 +734,10 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-       if (host->bus_width == MMC_BUS_WIDTH_4)
-               n = GLAMO_BASIC_MMC_EN_4BIT_DATA;
-       writew_dly((readw_dly(host->base + GLAMO_REG_MMC_BASIC) &
--                                        (~GLAMO_BASIC_MMC_EN_4BIT_DATA)) | n,
--                                            host->base + GLAMO_REG_MMC_BASIC);
-+                                        (~(GLAMO_BASIC_MMC_EN_4BIT_DATA |
-+                                           GLAMO_BASIC_MMC_EN_DR_STR0 |
-+                                           GLAMO_BASIC_MMC_EN_DR_STR1))) | n |
-+                             sd_drive << 6, host->base + GLAMO_REG_MMC_BASIC);
- }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1241-fix-pcf50633-move-charger-enable-decision-to-pcf5063.patch b/target/linux/s3c24xx/patches-2.6.24/1241-fix-pcf50633-move-charger-enable-decision-to-pcf5063.patch
deleted file mode 100644 (file)
index 4296ed3..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-From 2eab6880861e27126d059251f88de92ac3e75eb1 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Tue, 22 Jul 2008 13:16:07 +0100
-Subject: [PATCH] fix-pcf50633-move-charger-enable-decision-to-pcf50633_usb_curlim_set.patch
-
-At the moment we ended up enabling and disabling the charger
-at the time we service USBINS and USBREM events in the ISR.
-
-We did that in machine specific code, but really it is PMU
-specific decision, so this patch moves it into PMU code.
-
-We enabled and disabled the charge immediately we saw the
-interrupt event from PMU, yet we deferred setting charging
-state based on ID and USB enumeration until at least after a
-PMU ADC read that was handled in a second interrupt later.
-
-Now the timing is unified to after we determined the charger
-type and we enable and disable right there.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |    8 ++------
- drivers/i2c/chips/pcf50633.c       |    2 ++
- 2 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index f30abb6..59ba890 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -481,16 +481,12 @@ static int pmu_callback(struct device *dev, unsigned int feature,
-       switch (feature) {
-       case PCF50633_FEAT_MBC:
-               switch (event) {
--              case PMU_EVT_INSERT:
-               case PMU_EVT_USB_INSERT:
--                      pcf50633_charge_enable(pcf50633_global, 1);
--                      break;
--              case PMU_EVT_REMOVE:
-               case PMU_EVT_USB_REMOVE:
--                      pcf50633_charge_enable(pcf50633_global, 0);
--                      break;
-               case PMU_EVT_CHARGER_IDLE:
-               case PMU_EVT_CHARGER_ACTIVE:
-+              case PMU_EVT_INSERT: /* adapter */
-+              case PMU_EVT_REMOVE: /* adapter */
-                       break;
-               default:
-                       break;
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index af36e33..d9b78d8 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1414,11 +1414,13 @@ void pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma)
-                /* no charging is gonna be happening */
-               pcf->pdata->cb(&pcf->client.dev,
-                              PCF50633_FEAT_MBC, PMU_EVT_CHARGER_IDLE);
-+              pcf50633_charge_enable(pcf50633_global, 0);
-               break;
-       default: /* right charging context that if there is power, we charge */
-               if (pcf->flags & PCF50633_F_USB_PRESENT)
-                       pcf->pdata->cb(&pcf->client.dev,
-                              PCF50633_FEAT_MBC, PMU_EVT_CHARGER_ACTIVE);
-+              pcf50633_charge_enable(pcf50633_global, 1);
-               break;
-       }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1242-fix-bq27000-charger-state-tracking.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1242-fix-bq27000-charger-state-tracking.patch.patch
deleted file mode 100644 (file)
index 20442ad..0000000
+++ /dev/null
@@ -1,280 +0,0 @@
-From 46159c9a3fba291d106625092fd62358548894e0 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Tue, 22 Jul 2008 13:16:16 +0100
-Subject: [PATCH] fix-bq27000-charger-state-tracking.patch
-
-Charger trigger stuff goes and asks for POWER_SUPPLY_PROP_STATUS
-to figure out what the charger state is.  But until now, we only
-reported there what we found out from HDQ, and the HDQ registers
-are not updated very often in the coulomb counter, it can be 4
-or more second lag before it tells us about what it experiences.
-
-When we react to USB insertion and only after 500ms debounce tell
-power_supply stuff that something changed, it most times will
-see old pre-USB-insertion state from bq27000 over HDQ at that time
-and will report it ain't charging, buggering up the LED trigger
-tracking.
-
-This patch maintains distance between bq27000 and pcf50633 by
-having platform callbacks in bq27000 that it can use to ask about
-definitive charger "online" presence and "activity", whether the
-charger says it is charging.  If these callbacks are implemented
-(and we implement them in this patch up in mach_gta02.c) then
-this information is used in preference to what is found from
-HDQ.
-
-Result is if you set the LED trigger like this:
-
-echo bat-charging > /sys/devices/platform/gta02-led.0/leds/gta02-aux:red/trigger
-
-then it lights up properly on USB insertion now, goes away on
-removal properly, as as far as I saw, when charging stops too.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   32 +++++++++++++++--
- drivers/power/bq27000_battery.c    |   65 ++++++++++++++++++++++++-----------
- include/linux/bq27000_battery.h    |    2 +
- 3 files changed, 74 insertions(+), 25 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 59ba890..1fcd3fd 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -96,6 +96,9 @@ struct resume_dependency resume_dep_jbt_glamo;
- struct resume_dependency resume_dep_glamo_mci_pcf;
-+static int gta02_charger_online_status;
-+static int gta02_charger_active_status;
-+
- /* define FIQ IPC struct */
- /*
-  * contains stuff FIQ ISR modifies and normal kernel code can see and use
-@@ -457,12 +460,25 @@ static struct s3c2410_uartcfg gta02_uartcfgs[] = {
- /* BQ27000 Battery */
-+static int gta02_get_charger_online_status(void)
-+{
-+      return gta02_charger_online_status;
-+}
-+
-+static int gta02_get_charger_active_status(void)
-+{
-+      return gta02_charger_active_status;
-+}
-+
-+
- struct bq27000_platform_data bq27000_pdata = {
-       .name = "bat",
-       .rsense_mohms = 20,
-       .hdq_read = gta02hdq_read,
-       .hdq_write = gta02hdq_write,
-       .hdq_initialized = gta02hdq_initialized,
-+      .get_charger_online_status = gta02_get_charger_online_status,
-+      .get_charger_active_status = gta02_get_charger_active_status
- };
- struct platform_device bq27000_battery_device = {
-@@ -481,12 +497,20 @@ static int pmu_callback(struct device *dev, unsigned int feature,
-       switch (feature) {
-       case PCF50633_FEAT_MBC:
-               switch (event) {
--              case PMU_EVT_USB_INSERT:
--              case PMU_EVT_USB_REMOVE:
-               case PMU_EVT_CHARGER_IDLE:
-+                      gta02_charger_active_status = 0;
-+                      break;
-               case PMU_EVT_CHARGER_ACTIVE:
--              case PMU_EVT_INSERT: /* adapter */
--              case PMU_EVT_REMOVE: /* adapter */
-+                      gta02_charger_active_status = 1;
-+                      break;
-+              case PMU_EVT_USB_INSERT:
-+                      gta02_charger_online_status = 1;
-+                      break;
-+              case PMU_EVT_USB_REMOVE:
-+                      gta02_charger_online_status = 0;
-+                      break;
-+              case PMU_EVT_INSERT: /* adapter is unsused */
-+              case PMU_EVT_REMOVE: /* adapter is unused */
-                       break;
-               default:
-                       break;
-diff --git a/drivers/power/bq27000_battery.c b/drivers/power/bq27000_battery.c
-index 4855d5a..7020608 100644
---- a/drivers/power/bq27000_battery.c
-+++ b/drivers/power/bq27000_battery.c
-@@ -113,12 +113,7 @@ enum bq27000_status_flags {
- struct bq27000_device_info {
-       struct device *dev;
-       struct power_supply bat;
--
--      int rsense_mohms;               /* from platform */
--
--      int (*hdq_initialized)(void); /* from platform */
--      int (*hdq_read)(int); /* from platform */
--      int (*hdq_write)(int, u8); /* from platform */
-+      struct bq27000_platform_data *pdata;
- };
- /*
-@@ -136,16 +131,16 @@ static int hdq_read16(struct bq27000_device_info *di, int address)
-       while (retries--) {
--              high = (di->hdq_read)(address + 1); /* high part */
-+              high = (di->pdata->hdq_read)(address + 1); /* high part */
-               if (high < 0)
-                       return high;
--              acc = (di->hdq_read)(address);
-+              acc = (di->pdata->hdq_read)(address);
-               if (acc < 0)
-                       return acc;
-               /* confirm high didn't change between reading it and low */
--              if (high == (di->hdq_read)(address + 1))
-+              if (high == (di->pdata->hdq_read)(address + 1))
-                       return (high << 8) | acc;
-       }
-@@ -170,12 +165,36 @@ static int bq27000_battery_get_property(struct power_supply *psy,
-       int v, n;
-       struct bq27000_device_info *di = to_bq27000_device_info(psy);
--      if (!(di->hdq_initialized)())
-+      if (!(di->pdata->hdq_initialized)())
-               return -EINVAL;
-       switch (psp) {
-       case POWER_SUPPLY_PROP_STATUS:
-               val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
-+
-+              if (!di->pdata->get_charger_online_status)
-+                      goto use_bat;
-+              if ((di->pdata->get_charger_online_status)()) {
-+                      /*
-+                       * charger is definitively present
-+                       * we report our state in terms of what it says it
-+                       * is doing
-+                       */
-+                      if (!di->pdata->get_charger_active_status)
-+                              goto use_bat;
-+                      if ((di->pdata->get_charger_active_status)())
-+                              val->intval = POWER_SUPPLY_STATUS_CHARGING;
-+                      else
-+                              val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
-+                      break;
-+              }
-+use_bat:
-+              /*
-+               * either the charger is not connected, or the
-+               * platform doesn't give info about charger, use battery state
-+               * but... battery state can be out of date by 4 seconds or
-+               * so... use the platform callbacks if possible.
-+               */
-               v = hdq_read16(di, BQ27000_AI_L);
-               if (v < 0)
-                       return v;
-@@ -189,7 +208,7 @@ static int bq27000_battery_get_property(struct power_supply *psy,
-                       break;
-               }
-               /* power is actually going in or out... */
--              v = (di->hdq_read)(BQ27000_FLAGS);
-+              v = (di->pdata->hdq_read)(BQ27000_FLAGS);
-               if (v < 0)
-                       return v;
-               if (v & BQ27000_STATUS_CHGS)
-@@ -205,7 +224,7 @@ static int bq27000_battery_get_property(struct power_supply *psy,
-               val->intval = v * 1000;
-               break;
-       case POWER_SUPPLY_PROP_CURRENT_NOW:
--              v = (di->hdq_read)(BQ27000_FLAGS);
-+              v = (di->pdata->hdq_read)(BQ27000_FLAGS);
-               if (v < 0)
-                       return v;
-               if (v & BQ27000_STATUS_CHGS)
-@@ -215,13 +234,13 @@ static int bq27000_battery_get_property(struct power_supply *psy,
-               v = hdq_read16(di, BQ27000_AI_L);
-               if (v < 0)
-                       return v;
--              val->intval = (v * n) / di->rsense_mohms;
-+              val->intval = (v * n) / di->pdata->rsense_mohms;
-               break;
-       case POWER_SUPPLY_PROP_CHARGE_FULL:
-               v = hdq_read16(di, BQ27000_LMD_L);
-               if (v < 0)
-                       return v;
--              val->intval = (v * 3570) / di->rsense_mohms;
-+              val->intval = (v * 3570) / di->pdata->rsense_mohms;
-               break;
-       case POWER_SUPPLY_PROP_TEMP:
-               v = hdq_read16(di, BQ27000_TEMP_L);
-@@ -235,12 +254,12 @@ static int bq27000_battery_get_property(struct power_supply *psy,
-               val->intval = POWER_SUPPLY_TECHNOLOGY_LION;
-               break;
-       case POWER_SUPPLY_PROP_CAPACITY:
--              val->intval = (di->hdq_read)(BQ27000_RSOC);
-+              val->intval = (di->pdata->hdq_read)(BQ27000_RSOC);
-               if (val->intval < 0)
-                       return val->intval;
-               break;
-       case POWER_SUPPLY_PROP_PRESENT:
--              v = (di->hdq_read)(BQ27000_RSOC);
-+              v = (di->pdata->hdq_read)(BQ27000_RSOC);
-               val->intval = !(v < 0);
-               break;
-       case POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW:
-@@ -255,6 +274,12 @@ static int bq27000_battery_get_property(struct power_supply *psy,
-                       return v;
-               val->intval = 60 * v;
-               break;
-+      case POWER_SUPPLY_PROP_ONLINE:
-+              if (di->pdata->get_charger_online_status)
-+                      val->intval = (di->pdata->get_charger_online_status)();
-+              else
-+                      return -EINVAL;
-+              break;
-       default:
-               return -EINVAL;
-       }
-@@ -272,7 +297,8 @@ static enum power_supply_property bq27000_battery_props[] = {
-       POWER_SUPPLY_PROP_PRESENT,
-       POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW,
-       POWER_SUPPLY_PROP_TIME_TO_FULL_NOW,
--      POWER_SUPPLY_PROP_CAPACITY
-+      POWER_SUPPLY_PROP_CAPACITY,
-+      POWER_SUPPLY_PROP_ONLINE
- };
- static int bq27000_battery_probe(struct platform_device *pdev)
-@@ -302,10 +328,7 @@ static int bq27000_battery_probe(struct platform_device *pdev)
-       di->bat.external_power_changed =
-                                 bq27000_battery_external_power_changed;
-       di->bat.use_for_apm = 1;
--      di->hdq_read = pdata->hdq_read;
--      di->hdq_write = pdata->hdq_write;
--      di->rsense_mohms = pdata->rsense_mohms;
--      di->hdq_initialized = pdata->hdq_initialized;
-+      di->pdata = pdata;
-       retval = power_supply_register(&pdev->dev, &di->bat);
-       if (retval) {
-diff --git a/include/linux/bq27000_battery.h b/include/linux/bq27000_battery.h
-index fed4287..a617466 100644
---- a/include/linux/bq27000_battery.h
-+++ b/include/linux/bq27000_battery.h
-@@ -9,6 +9,8 @@ struct bq27000_platform_data {
-       int (*hdq_read)(int);
-       int (*hdq_write)(int, u8);
-       int (*hdq_initialized)(void);
-+      int (*get_charger_online_status)(void);
-+      int (*get_charger_active_status)(void);
- };
- #endif
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1243-fix-glamo-mci-set-default-drive-level-0.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1243-fix-glamo-mci-set-default-drive-level-0.patch.patch
deleted file mode 100644 (file)
index f436a56..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-From 66a83c97c4545ce4f07e0d90998f906fae49caf2 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Tue, 22 Jul 2008 13:16:29 +0100
-Subject: [PATCH] fix-glamo-mci-set-default-drive-level-0.patch
-
-Tests on access to SD Card with Glamo drive level "0" show
-that it reduces SD_CLK energy at 1.5GHz by 24dBm compared to
-drive level 3.  This puts it only 6dB above the background
-noise floor compared to 30dB and should make a solution for
-GPS trouble with SD Card in.
-
-SD card communication seems unaffected so far on the Sandisk
-512MB card we ship.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-mci.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index 6585821..45b0afc 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -66,7 +66,7 @@ module_param(sd_max_clk, int, 0644);
-  * for example
-  */
--static int sd_drive = 2;
-+static int sd_drive;
- module_param(sd_drive, int, 0644);
- /*
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1244-fix-pcf50633-remove-charger-curlim-and-enable-apis-f.patch b/target/linux/s3c24xx/patches-2.6.24/1244-fix-pcf50633-remove-charger-curlim-and-enable-apis-f.patch
deleted file mode 100644 (file)
index ef44360..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-From 3574745cad910ce45db692baadf1fe233bc383b5 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Tue, 22 Jul 2008 22:17:04 +0100
-Subject: [PATCH] fix-pcf50633-remove-charger-curlim-and-enable-apis-from-export.patch
-
-Setting the current limit directly and enabling the charger
-isn't anyone's business except pcf50633 driver itself, so these
-two functions should not be exported and become static.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |   10 ++++++----
- include/linux/pcf50633.h     |    6 ------
- 2 files changed, 6 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index d9b78d8..bd47ebc 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -194,6 +194,10 @@ EXPORT_SYMBOL_GPL(pcf50633_global);
- static struct platform_device *pcf50633_pdev;
-+static void pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma);
-+static void pcf50633_charge_enable(struct pcf50633_data *pcf, int on);
-+
-+
- /***********************************************************************
-  * Low-Level routines
-  ***********************************************************************/
-@@ -1385,7 +1389,7 @@ static DEVICE_ATTR(voltage_hcldo, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-  ***********************************************************************/
- /* Set maximum USB current limit */
--void pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma)
-+static void pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma)
- {
-       u_int8_t bits;
-@@ -1440,7 +1444,6 @@ set_it:
-                               PCF50633_MBCC1_AUTORES);
- }
--EXPORT_SYMBOL_GPL(pcf50633_usb_curlim_set);
- static ssize_t show_usblim(struct device *dev, struct device_attribute *attr,
-                          char *buf)
-@@ -1465,7 +1468,7 @@ static ssize_t show_usblim(struct device *dev, struct device_attribute *attr,
- static DEVICE_ATTR(usb_curlim, S_IRUGO | S_IWUSR, show_usblim, NULL);
- /* Enable/disable charging */
--void pcf50633_charge_enable(struct pcf50633_data *pcf, int on)
-+static void pcf50633_charge_enable(struct pcf50633_data *pcf, int on)
- {
-       u_int8_t bits;
-       u_int8_t usblim;
-@@ -1502,7 +1505,6 @@ void pcf50633_charge_enable(struct pcf50633_data *pcf, int on)
-       reg_set_bit_mask(pcf, PCF50633_REG_MBCC1, PCF50633_MBCC1_CHGENA,
-                        bits);
- }
--EXPORT_SYMBOL_GPL(pcf50633_charge_enable);
- #if 0
- #define ONE                   1000000
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index b4d65dc..c11a637 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -111,12 +111,6 @@ pcf50633_onoff_set(struct pcf50633_data *pcf,
-                  enum pcf50633_regulator_id reg, int on);
- extern void
--pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma);
--
--extern void
--pcf50633_charge_enable(struct pcf50633_data *pcf, int on);
--
--extern void
- pcf50633_backlight_resume(struct pcf50633_data *pcf);
- extern u_int16_t
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1245-fix-pcf50633-only-do-platform-callback-once-per-even.patch b/target/linux/s3c24xx/patches-2.6.24/1245-fix-pcf50633-only-do-platform-callback-once-per-even.patch
deleted file mode 100644 (file)
index c0418b5..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-From be0f111b3d1570dec174ff301d08bad995ccf1e6 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Tue, 22 Jul 2008 22:17:15 +0100
-Subject: [PATCH] fix-pcf50633-only-do-platform-callback-once-per-event.patch
- Reported-by: Holger Freyther <zecke@openmoko.org>
-
-We harmlessly repeated PMU platform callbacks about charging state twice.
-Clean it up and leave it to pcf50633_charge_enable() to report once.
-
-Also tidies the sequencing so we set current limit before we enable
-charger now.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |   35 ++++++++++++++++-------------------
- 1 files changed, 16 insertions(+), 19 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index bd47ebc..98c254c 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1392,6 +1392,7 @@ static DEVICE_ATTR(voltage_hcldo, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
- static void pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma)
- {
-       u_int8_t bits;
-+      int active = 0;
-       pcf->last_curlim_set = ma;
-@@ -1407,30 +1408,26 @@ static void pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma)
-       else
-               bits = PCF50633_MBCC7_USB_SUSPEND;
--      DEBUGPC("pcf50633_usb_curlim_set -> %dmA\n", ma);
--
--      if (!pcf->pdata->cb)
--              goto set_it;
-+      /* set the nearest charging limit */
-+      reg_set_bit_mask(pcf, PCF50633_REG_MBCC7, PCF56033_MBCC7_USB_MASK,
-+                       bits);
-+      /* with this charging limit, is charging actually meaningful? */
-       switch (bits) {
--      case PCF50633_MBCC7_USB_100mA:
--      case PCF50633_MBCC7_USB_SUSPEND:
--               /* no charging is gonna be happening */
--              pcf->pdata->cb(&pcf->client.dev,
--                             PCF50633_FEAT_MBC, PMU_EVT_CHARGER_IDLE);
--              pcf50633_charge_enable(pcf50633_global, 0);
-+      case PCF50633_MBCC7_USB_500mA:
-+      case PCF50633_MBCC7_USB_1000mA:
-+              /* yes with this charging limit, we can do real charging */
-+              active = 1;
-               break;
--      default: /* right charging context that if there is power, we charge */
--              if (pcf->flags & PCF50633_F_USB_PRESENT)
--                      pcf->pdata->cb(&pcf->client.dev,
--                             PCF50633_FEAT_MBC, PMU_EVT_CHARGER_ACTIVE);
--              pcf50633_charge_enable(pcf50633_global, 1);
-+      default:
-+              /* no charging is gonna be happening */
-               break;
-       }
--
--set_it:
--      reg_set_bit_mask(pcf, PCF50633_REG_MBCC7, PCF56033_MBCC7_USB_MASK,
--                       bits);
-+      /*
-+       * enable or disable charging according to current limit -- this will
-+       * also throw a platform notification callback about it
-+       */
-+      pcf50633_charge_enable(pcf50633_global, active);
-       /* clear batfull */
-       reg_set_bit_mask(pcf, PCF50633_REG_MBCC1,
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1246-fix-glamo-mci-possible-timeout-overflow.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1246-fix-glamo-mci-possible-timeout-overflow.patch.patch
deleted file mode 100644 (file)
index 36ada8d..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-From 87ffb9bd9691230e919a306979217e572fd02690 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Thu, 24 Jul 2008 00:04:44 +0100
-Subject: [PATCH] fix-glamo-mci-possible-timeout-overflow.patch
-
-The MMC stack hands us a timeout calibrated in SD_CLK clocks, but the
-Glamo can only deal with up to 65520 clocks of timeout.  If the stack
-handed us a request bigger than this, it would just wrap and the
-timeout we actually used would be way too short.
-
-With this patch if that happens, we use the longest timeout we can,
-65520 clocks and give it our best shot.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-mci.c |   19 ++++++++++---------
- 1 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index 45b0afc..264a6bc 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -338,6 +338,7 @@ static int glamo_mci_send_command(struct glamo_mci_host *host,
- {
-       u8 u8a[6];
-       u16 fire = 0;
-+      u16 timeout = 0xfff; /* max glamo MMC timeout, in units of 16 clocks */
-       /* if we can't do it, reject as busy */
-       if (!readw_dly(host->base + GLAMO_REG_MMC_RB_STAT1) &
-@@ -447,15 +448,15 @@ static int glamo_mci_send_command(struct glamo_mci_host *host,
-               fire |= GLAMO_FIRE_MMC_CC_BASIC; /* "basic command" */
-               break;
-       }
--      /* enforce timeout */
--      if (cmd->data) {
--              if (cmd->data->timeout_clks)
--                      writew_dly(cmd->data->timeout_clks >> 4, /* / 16 clks */
--                                      host->base + GLAMO_REG_MMC_TIMEOUT);
--              else
--                      writew_dly(0xfff, host->base + GLAMO_REG_MMC_TIMEOUT);
--      } else
--              writew(0xfff, host->base + GLAMO_REG_MMC_TIMEOUT);
-+      /* enforce timeout, clipping at default 65520 clocks if larger */
-+      if (cmd->data)
-+              /* so long as there is one... */
-+              if (cmd->data->timeout_clks &&
-+                  /* ... and it is not longer than we can handle */
-+                  (cmd->data->timeout_clks <= 0xffff))
-+                      timeout = cmd->data->timeout_clks >> 4; /* / 16 clks */
-+
-+      writew(timeout, host->base + GLAMO_REG_MMC_TIMEOUT);
-       /* Generate interrupt on txfer */
-       writew_dly((readw_dly(host->base + GLAMO_REG_MMC_BASIC) & 0x3e) |
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1247-fix-glamo-mci-ensure-more-than-74-clocks-after-power.patch b/target/linux/s3c24xx/patches-2.6.24/1247-fix-glamo-mci-ensure-more-than-74-clocks-after-power.patch
deleted file mode 100644 (file)
index defef57..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-From 8533927964761f4e2078ccd8607b90f5acc60b93 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Thu, 24 Jul 2008 00:04:54 +0100
-Subject: [PATCH] fix-glamo-mci-ensure-more-than-74-clocks-after-power.patch
-
-We are meant to run SD_CLK a little while after power-on for the SD
-Card, but with the no idle clock changes we didn't take care about it.
-
-This makes us sleep a little bit before disabling clock if we just
-powered up the SD Card.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-mci.c |    8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index 264a6bc..c2351e2 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -684,6 +684,7 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-       struct glamo_mci_host *host = mmc_priv(mmc);
-       int n = 0;
-       int div;
-+      int powering = 0;
-       /* Set power */
-       switch(ios->power_mode) {
-@@ -699,6 +700,7 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-               glamo_engine_enable(glamo_mci_def_pdata.pglamo,
-                                                       GLAMO_ENGINE_MMC);
-               glamo_mci_reset(host);
-+              powering = 1;
-               break;
-       case MMC_POWER_OFF:
-@@ -716,6 +718,12 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-       host->real_rate = __glamo_mci_set_card_clock(host, ios->clock, &div);
-       host->clk_div = div;
-+      /* after power-up, we are meant to give it >= 74 clocks so it can
-+       * initialize itself.  Doubt any modern cards need it but anyway...
-+       */
-+      if (powering)
-+              msleep(1);
-+
-       if (!sd_idleclk)
-               /* stop the clock to card, because we are idle until transfer */
-               __glamo_mci_fix_card_div(host, -1);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1248-fix-allow-full-sd-voltage-range-selection.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1248-fix-allow-full-sd-voltage-range-selection.patch.patch
deleted file mode 100644 (file)
index d355fcc..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-From 00e20ff234e6d35a6df7e86c043fdda7da06bf04 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 30 Jul 2008 12:43:25 +0100
-Subject: [PATCH] fix-allow-full-sd-voltage-range-selection.patch
-
-Until now we just drove the SD Card at 3.3V all the time.  But in
-fact we can do better, and use a voltage negotiated with the
-SD Card itself.
-
-With the shipping 512MB Sandisk SD Card, 2.7V is negotiated which
-gives 1.7dBm reduction in power on all the SD Card lines and should
-further reduce GPS perturbation during SD Card usage.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   10 ++++------
- drivers/mfd/glamo/glamo-core.c     |   13 ++++++++++++-
- 2 files changed, 16 insertions(+), 7 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 1fcd3fd..382837d 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -604,7 +604,7 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-               [PCF50633_REGULATOR_HCLDO] = {
-                       .name           = "sd_3v3",
-                       .voltage        = {
--                              .init   = 3300,
-+                              .init   = 2000,
-                               .max    = 3300,
-                       },
-               },
-@@ -1378,11 +1378,9 @@ gta02_glamo_mmc_set_power(unsigned char power_mode, unsigned short vdd)
-                               return;
-                       }
-                       /* select and set the voltage */
--                      if (vdd > 7) {
--                              mv += 300 + 100 * (vdd - 8);
--                              if (mv > 3500)
--                                      mv = 3500;
--                      }
-+                      if (vdd > 7)
-+                              mv += 350 + 100 * (vdd - 8);
-+                      printk(KERN_INFO "SD power -> %dmV\n", mv);
-                       pcf50633_voltage_set(pcf50633_global,
-                                            PCF50633_REGULATOR_HCLDO, mv);
-                       pcf50633_onoff_set(pcf50633_global,
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index bea0387..f411446 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -270,7 +270,18 @@ static struct platform_device glamo_mmc_dev = {
- struct glamo_mci_pdata glamo_mci_def_pdata = {
-       .gpio_detect            = 0,
-       .glamo_set_mci_power    = NULL, /* filled in from MFD platform data */
--      .ocr_avail              = MMC_VDD_32_33,
-+      .ocr_avail      = MMC_VDD_20_21 |
-+                        MMC_VDD_21_22 |
-+                        MMC_VDD_22_23 |
-+                        MMC_VDD_23_24 |
-+                        MMC_VDD_24_25 |
-+                        MMC_VDD_25_26 |
-+                        MMC_VDD_26_27 |
-+                        MMC_VDD_27_28 |
-+                        MMC_VDD_28_29 |
-+                        MMC_VDD_29_30 |
-+                        MMC_VDD_30_31 |
-+                        MMC_VDD_32_33,
-       .glamo_irq_is_wired     = NULL, /* filled in from MFD platform data */
-       .mci_suspending = NULL, /* filled in from MFD platform data */
-       .mci_all_dependencies_resumed = NULL, /* filled in from MFD plat data */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1249-fix-glamo-mci-dont-filter-voltage-change.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1249-fix-glamo-mci-dont-filter-voltage-change.patch.patch
deleted file mode 100644 (file)
index f3fe7c8..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 792fb6dd55c282de25005a1399ffaa084ece4b1c Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 30 Jul 2008 12:46:34 +0100
-Subject: [PATCH] fix-glamo-mci-dont-filter-voltage-change.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-mci.c |   11 +++++------
- 1 files changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index c2351e2..54ba613 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -690,17 +690,16 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-       switch(ios->power_mode) {
-       case MMC_POWER_ON:
-       case MMC_POWER_UP:
--              if (host->power_mode_current != MMC_POWER_OFF)
--                      break;
-               if (host->vdd_current != ios->vdd) {
-                       host->pdata->glamo_set_mci_power(ios->power_mode,
-                                                        ios->vdd);
-                       host->vdd_current = ios->vdd;
-               }
--              glamo_engine_enable(glamo_mci_def_pdata.pglamo,
--                                                      GLAMO_ENGINE_MMC);
--              glamo_mci_reset(host);
--              powering = 1;
-+              if (host->power_mode_current == MMC_POWER_OFF) {
-+                      glamo_engine_enable(glamo_mci_def_pdata.pglamo,
-+                                                            GLAMO_ENGINE_MMC);
-+                      powering = 1;
-+              }
-               break;
-       case MMC_POWER_OFF:
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1250-add-glamo-mci-slower-clocking-dynamic-switching.patc.patch b/target/linux/s3c24xx/patches-2.6.24/1250-add-glamo-mci-slower-clocking-dynamic-switching.patc.patch
deleted file mode 100644 (file)
index dec9b7d..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-From 6d8e14dc4253f3921aff1bbbeb3caf073aa6a7b2 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 30 Jul 2008 12:46:44 +0100
-Subject: [PATCH] add-glamo-mci-slower-clocking-dynamic-switching.patch
-
-This patch gives glamo-mci a concept of a platform-defined
-dynamic clock slowing callback.  It means that platform code
-can associate some completely external state to decide if
-we run the SD clock at normal rate or a rate divided by a
-module parameter "sd_slow_ratio", which you can set on
-kernel commandline like this:
-
-glamo_mci.sd_slow_ratio=8
-
-you can also change it at runtime by
-
-echo 8 > /sys/module/glamo_mci/parameters/sd_slow_ratio
-
-If no platform callback is defined, then no slow mode
-is used.  If it is defined, then the default division
-action is / 8, eg, 16MHz normal -> 2MHz slow mode.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-core.c |    2 ++
- drivers/mfd/glamo/glamo-core.h |    2 ++
- drivers/mfd/glamo/glamo-mci.c  |   30 ++++++++++++++++++++++++++++--
- include/linux/glamofb.h        |    2 ++
- 4 files changed, 34 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index f411446..c094a8c 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -1114,6 +1114,8 @@ static int __init glamo_probe(struct platform_device *pdev)
-       /* bring MCI specific stuff over from our MFD platform data */
-       glamo_mci_def_pdata.glamo_set_mci_power =
-                                       glamo->pdata->glamo_set_mci_power;
-+      glamo_mci_def_pdata.glamo_mci_use_slow =
-+                                      glamo->pdata->glamo_mci_use_slow;
-       glamo_mci_def_pdata.glamo_irq_is_wired =
-                                       glamo->pdata->glamo_irq_is_wired;
-       glamo_mci_def_pdata.mci_suspending =
-diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h
-index 8d647ec..d3f4309 100644
---- a/drivers/mfd/glamo/glamo-core.h
-+++ b/drivers/mfd/glamo/glamo-core.h
-@@ -72,6 +72,8 @@ struct glamo_mci_pdata {
-       unsigned long   ocr_avail;
-       void            (*glamo_set_mci_power)(unsigned char power_mode,
-                                    unsigned short vdd);
-+      /* glamo-mci asking if it should use the slow clock to card */
-+      int             (*glamo_mci_use_slow)(void);
-       int             (*glamo_irq_is_wired)(void);
-       void            (*mci_suspending)(struct platform_device *dev);
-       int             (*mci_all_dependencies_resumed)(struct platform_device
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index 54ba613..577021e 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -57,6 +57,23 @@ static int sd_max_clk = 50000000 / 3;
- module_param(sd_max_clk, int, 0644);
- /*
-+ * Slow SD clock rate
-+ *
-+ * you can override this on kernel commandline using
-+ *
-+ *   glamo_mci.sd_slow_ratio=8
-+ *
-+ * for example
-+ *
-+ * platform callback is used to decide effective clock rate, if not
-+ * defined then max is used, if defined and returns nonzero, rate is
-+ * divided by this factor
-+ */
-+
-+static int sd_slow_ratio = 8;
-+module_param(sd_slow_ratio, int, 0644);
-+
-+/*
-  * SD Signal drive strength
-  *
-  * you can override this on kernel commandline using
-@@ -554,8 +571,17 @@ static void glamo_mci_send_request(struct mmc_host *mmc)
-                cmd->opcode, cmd->arg, cmd->data, cmd->mrq->stop,
-                cmd->flags);
--      /* resume requested clock rate */
--      __glamo_mci_fix_card_div(host, host->clk_div);
-+      /* resume requested clock rate
-+       * scale it down by sd_slow_ratio if platform requests it
-+       */
-+      if (host->pdata->glamo_mci_use_slow)
-+              if ((host->pdata->glamo_mci_use_slow)())
-+                      __glamo_mci_fix_card_div(host, host->clk_div *
-+                                                               sd_slow_ratio);
-+              else
-+                      __glamo_mci_fix_card_div(host, host->clk_div);
-+      else
-+              __glamo_mci_fix_card_div(host, host->clk_div);
-       if (glamo_mci_send_command(host, cmd))
-               goto bail;
-diff --git a/include/linux/glamofb.h b/include/linux/glamofb.h
-index efd315b..b101e9c 100644
---- a/include/linux/glamofb.h
-+++ b/include/linux/glamofb.h
-@@ -31,6 +31,8 @@ struct glamofb_platform_data {
-       /* glamo mmc platform specific info */
-       void            (*glamo_set_mci_power)(unsigned char power_mode,
-                                    unsigned short vdd);
-+      /* glamo-mci asking if it should use the slow clock to card */
-+      int             (*glamo_mci_use_slow)(void);
-       int             (*glamo_irq_is_wired)(void);
-       void            (*mci_suspending)(struct platform_device *dev);
-       int             (*mci_all_dependencies_resumed)(struct platform_device
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1251-use-gta02-glamo-mci-sd-dynamic-clock.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1251-use-gta02-glamo-mci-sd-dynamic-clock.patch.patch
deleted file mode 100644 (file)
index 88071db..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-From d4b28ec4e2818207cc0e48b90dbce581e0b779e7 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 30 Jul 2008 12:46:56 +0100
-Subject: [PATCH] use-gta02-glamo-mci-sd-dynamic-clock.patch
-
-This patch uses the new glamo-mci slow clock ratio
-patch in order to dynamically reduce SD Card clock
-rate when the GPS unit is powered on GTA02.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c     |   12 ++++++++++++
- arch/arm/plat-s3c24xx/neo1973_pm_gps.c |   12 +++++++++---
- 2 files changed, 21 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 382837d..8e43c4a 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -85,6 +85,8 @@
- #include <linux/gta02_hdq.h>
- #include <linux/bq27000_battery.h>
-+#include "../plat-s3c24xx/neo1973_pm_gps.h"
-+
- /* arbitrates which sensor IRQ owns the shared SPI bus */
- static spinlock_t motion_irq_lock;
-@@ -1424,6 +1426,15 @@ static void gta02_glamo_mci_suspending(struct platform_device *dev)
- /* Smedia Glamo 3362 */
-+/*
-+ * we crank down SD Card clock dynamically when GPS is powered
-+ */
-+
-+static int gta02_glamo_mci_use_slow(void)
-+{
-+      return neo1973_pm_gps_is_on();
-+}
-+
- static struct glamofb_platform_data gta02_glamo_pdata = {
-       .width          = 43,
-       .height         = 58,
-@@ -1456,6 +1467,7 @@ static struct glamofb_platform_data gta02_glamo_pdata = {
-       /* glamo MMC function platform data */
-       .glamo_set_mci_power = gta02_glamo_mmc_set_power,
-+      .glamo_mci_use_slow = gta02_glamo_mci_use_slow,
-       .glamo_irq_is_wired = glamo_irq_is_wired,
-       .mci_suspending = gta02_glamo_mci_suspending,
-       .mci_all_dependencies_resumed =
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-index 8cd583d..a21b763 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-@@ -39,6 +39,12 @@ struct neo1973_pm_gps_data {
- static struct neo1973_pm_gps_data neo1973_gps;
-+int neo1973_pm_gps_is_on(void)
-+{
-+      return neo1973_gps.power_was_on;
-+}
-+EXPORT_SYMBOL_GPL(neo1973_pm_gps_is_on);
-+
- /* This is the 2.8V supply for the RTC crystal, the mail clock crystal and
-  * the input to VDD_RF */
- static void gps_power_2v8_set(int on)
-@@ -265,6 +271,9 @@ static int gps_power_1v5_get(void)
- /* This is the POWERON pin */
- static void gps_pwron_set(int on)
- {
-+
-+      neo1973_gps.power_was_on = !!on;
-+
- #ifdef CONFIG_MACH_NEO1973_GTA01
-       if (machine_is_neo1973_gta01())
-               neo1973_gpb_setpin(GTA01_GPIO_GPS_PWRON, on);
-@@ -492,9 +501,6 @@ static DEVICE_ATTR(power_sequence, 0644, power_sequence_read,
- static int gta01_pm_gps_suspend(struct platform_device *pdev,
-                               pm_message_t state)
- {
--
--      neo1973_gps.power_was_on = gps_pwron_get();
--
- #ifdef CONFIG_MACH_NEO1973_GTA01
-       if (machine_is_neo1973_gta01()) {
-               /* FIXME */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1252-fix-add-missing-include.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1252-fix-add-missing-include.patch.patch
deleted file mode 100644 (file)
index bae24ed..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-From b42ea86dd85d5766607848283b0ad27adbb8743f Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Thu, 31 Jul 2008 09:44:58 +0100
-Subject: [PATCH] fix-add-missing-include.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gps.h |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
- create mode 100644 arch/arm/plat-s3c24xx/neo1973_pm_gps.h
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.h b/arch/arm/plat-s3c24xx/neo1973_pm_gps.h
-new file mode 100644
-index 0000000..42d385a
---- /dev/null
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.h
-@@ -0,0 +1 @@
-+extern int neo1973_pm_gps_is_on(void);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1253-config-usb-over-ethernet-module.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1253-config-usb-over-ethernet-module.patch.patch
deleted file mode 100644 (file)
index 51a7ae5..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-From 1a95efdc23966343a3b432ceef2f6c24dc0e2052 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Thu, 31 Jul 2008 10:20:53 +0100
-Subject: [PATCH] config-usb-over-ethernet-module.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- defconfig-2.6.24-maxmodules |   12 ++++++------
- defconfig-gta01             |   12 ++++++------
- defconfig-gta02             |   12 ++++++------
- 3 files changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/defconfig-2.6.24-maxmodules b/defconfig-2.6.24-maxmodules
-index 39019b4..ec94668 100644
---- a/defconfig-2.6.24-maxmodules
-+++ b/defconfig-2.6.24-maxmodules
-@@ -1380,12 +1380,12 @@ CONFIG_USB_S3C2410=y
- # CONFIG_USB_GADGET_DUMMY_HCD is not set
- # CONFIG_USB_GADGET_DUALSPEED is not set
- # CONFIG_USB_ZERO is not set
--CONFIG_USB_ETH=y
--CONFIG_USB_ETH_RNDIS=y
--# CONFIG_USB_GADGETFS is not set
--# CONFIG_USB_FILE_STORAGE is not set
--# CONFIG_USB_G_SERIAL is not set
--# CONFIG_USB_MIDI_GADGET is not set
-+CONFIG_USB_ETH=m
-+CONFIG_USB_ETH_RNDIS=m
-+CONFIG_USB_GADGETFS=m
-+CONFIG_USB_FILE_STORAGE=m
-+CONFIG_USB_G_SERIAL=m
-+CONFIG_USB_MIDI_GADGET=m
- #
- # SDIO support
-diff --git a/defconfig-gta01 b/defconfig-gta01
-index aa0bf4b..3320560 100644
---- a/defconfig-gta01
-+++ b/defconfig-gta01
-@@ -1380,12 +1380,12 @@ CONFIG_USB_S3C2410=y
- # CONFIG_USB_GADGET_DUMMY_HCD is not set
- # CONFIG_USB_GADGET_DUALSPEED is not set
- # CONFIG_USB_ZERO is not set
--CONFIG_USB_ETH=y
--CONFIG_USB_ETH_RNDIS=y
--# CONFIG_USB_GADGETFS is not set
--# CONFIG_USB_FILE_STORAGE is not set
--# CONFIG_USB_G_SERIAL is not set
--# CONFIG_USB_MIDI_GADGET is not set
-+CONFIG_USB_ETH=m
-+CONFIG_USB_ETH_RNDIS=m
-+CONFIG_USB_GADGETFS=m
-+CONFIG_USB_FILE_STORAGE=m
-+CONFIG_USB_G_SERIAL=m
-+CONFIG_USB_MIDI_GADGET=m
- #
- # SDIO support
-diff --git a/defconfig-gta02 b/defconfig-gta02
-index 9d0dd56..376d53e 100644
---- a/defconfig-gta02
-+++ b/defconfig-gta02
-@@ -1379,12 +1379,12 @@ CONFIG_USB_S3C2410=y
- # CONFIG_USB_GADGET_DUMMY_HCD is not set
- # CONFIG_USB_GADGET_DUALSPEED is not set
- # CONFIG_USB_ZERO is not set
--CONFIG_USB_ETH=y
--CONFIG_USB_ETH_RNDIS=y
--# CONFIG_USB_GADGETFS is not set
--# CONFIG_USB_FILE_STORAGE is not set
--# CONFIG_USB_G_SERIAL is not set
--# CONFIG_USB_MIDI_GADGET is not set
-+CONFIG_USB_ETH=m
-+CONFIG_USB_ETH_RNDIS=m
-+CONFIG_USB_GADGETFS=m
-+CONFIG_USB_FILE_STORAGE=m
-+CONFIG_USB_G_SERIAL=m
-+CONFIG_USB_MIDI_GADGET=m
- #
- # SDIO support
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1254-fix-pcf50633-usbrem-charging-led.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1254-fix-pcf50633-usbrem-charging-led.patch.patch
deleted file mode 100644 (file)
index 2434ee0..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From 27fc8d82e365c47065f3a9240bfe21e67a50edf2 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 6 Aug 2008 15:08:34 +0100
-Subject: [PATCH] fix-pcf50633-usbrem-charging-led.patch
-
-If the charger was removed, we fell through back to old
-hdq-driven code with normally wrong but slightly random
-results for charging LED behaviour in that circumstance
-
-This patch makes us use the tracked charger status
-callbacks alone if they are defined in the platform
-data.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/power/bq27000_battery.c |   12 ++++++++----
- 1 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/power/bq27000_battery.c b/drivers/power/bq27000_battery.c
-index 7020608..4c7e862 100644
---- a/drivers/power/bq27000_battery.c
-+++ b/drivers/power/bq27000_battery.c
-@@ -182,12 +182,16 @@ static int bq27000_battery_get_property(struct power_supply *psy,
-                        */
-                       if (!di->pdata->get_charger_active_status)
-                               goto use_bat;
--                      if ((di->pdata->get_charger_active_status)())
-+
-+                      if ((di->pdata->get_charger_active_status)()) {
-                               val->intval = POWER_SUPPLY_STATUS_CHARGING;
--                      else
--                              val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
--                      break;
-+                              break;
-+                      }
-               }
-+
-+              val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
-+              break;
-+
- use_bat:
-               /*
-                * either the charger is not connected, or the
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1255-add-build-git-head-info.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1255-add-build-git-head-info.patch.patch
deleted file mode 100644 (file)
index 9479193..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-From 0c67caf29d655f9ce1c53f8e1433c59d86e04193 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 6 Aug 2008 20:27:23 +0100
-Subject: [PATCH] add-build-git-head-info.patch
-
-This patch adds the branch and truncated head has to the version of the
-kernel
-
-# cat /proc/version
-Linux version 2.6.26-andy-2.6.26:2b3bf342baac52b9-mokodev (agreen@pads.home.warmcat.com) (gcc version 4.1.2) #878 PREEMPT Sun Jul 27 14:45:25 BST 2008
-
-Note this versioning is visible down /lib/modules
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- Makefile |    2 +-
- build    |   10 +++++++++-
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 189d8ef..e6f7941 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- VERSION = 2
- PATCHLEVEL = 6
- SUBLEVEL = 24
--EXTRAVERSION =
-+EXTRAVERSION +=
- NAME = Arr Matey! A Hairy Bilge Rat!
- # *DOCUMENTATION*
-diff --git a/build b/build
-index 12e06bf..9c2d561 100755
---- a/build
-+++ b/build
-@@ -5,7 +5,15 @@ set -x
- export CROSS_COMPILE=../../cross/bin/arm-angstrom-linux-gnueabi-
- make -f synthesize-gta-module-configs.mak
- make ARCH=arm silentoldconfig
--if make -j5 ARCH=arm; then
-+
-+VERSION=
-+if [ -d .git ] ; then
-+ HEAD=`git show --pretty=oneline | head -n1 | cut -d' ' -f1 | cut -b1-16`
-+ BRANCH=`git branch | grep ^\* | cut -d' ' -f2`
-+ VERSION=-$BRANCH:$HEAD
-+fi
-+
-+if make -j5 ARCH=arm EXTRAVERSION=$VERSION; then
-       ${CROSS_COMPILE}objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux linux.bin
-       mkimage -A arm -O linux -T kernel -C none -a 30008000 -e 30008000 -n "Openmoko Kernel Image Neo1973(GTA02)" -d linux.bin uImage.bin
-       exit 0
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1256-add-buildkeep-hash-named-copy.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1256-add-buildkeep-hash-named-copy.patch.patch
deleted file mode 100644 (file)
index 94e20cb..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From b79f79448a70b5718db2428939e00150315b5eda Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 6 Aug 2008 20:46:42 +0100
-Subject: [PATCH] add-buildkeep-hash-named-copy.patch
-
-Keep a copy of last "moredrivers" config kernel built stamped with
-branch and git head at build time.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- build |   10 +++++++++-
- 1 files changed, 9 insertions(+), 1 deletions(-)
-
-diff --git a/build b/build
-index 9c2d561..63bb0fc 100755
---- a/build
-+++ b/build
-@@ -15,7 +15,15 @@ fi
- if make -j5 ARCH=arm EXTRAVERSION=$VERSION; then
-       ${CROSS_COMPILE}objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux linux.bin
--      mkimage -A arm -O linux -T kernel -C none -a 30008000 -e 30008000 -n "Openmoko Kernel Image Neo1973(GTA02)" -d linux.bin uImage.bin
-+      mkimage -A arm -O linux -T kernel -C none -a 30008000 -e 30008000 -n "Openmoko Freerunner Kernel" -d linux.bin uImage.bin
-+
-+      # we can see if it is an "moredrivers" build by looking for USB Eth gadget
-+      # if it is then keep a stamped copy of last build
-+
-+      if [ ! -z "`grep CONFIG_USB_ETH=y .config`" ] ; then
-+              rm -f uImage-moredrivers*
-+              cp uImage.bin uImage-moredrivers$VERSION.bin
-+      fi
-       exit 0
- else
-       exit 1
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1257-fix-build-hash-name-no-colon-separator.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1257-fix-build-hash-name-no-colon-separator.patch.patch
deleted file mode 100644 (file)
index d9e8c85..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2c55337cb0cde08203df321a108409b7e33e6904 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 6 Aug 2008 23:13:28 +0100
-Subject: [PATCH] fix-build-hash-name-no-colon-separator.patch
- Suggested-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
-
-Colons are not very friendly for tar... scp has trouble too but
-you can override that by prepending any path like ./ ... still
-better to dilute the colon down to a _ avoiding - because it can
-appear in branch names we use.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- build |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/build b/build
-index 63bb0fc..9fda9c7 100755
---- a/build
-+++ b/build
-@@ -10,7 +10,7 @@ VERSION=
- if [ -d .git ] ; then
-  HEAD=`git show --pretty=oneline | head -n1 | cut -d' ' -f1 | cut -b1-16`
-  BRANCH=`git branch | grep ^\* | cut -d' ' -f2`
-- VERSION=-$BRANCH:$HEAD
-+ VERSION=-$BRANCH\_$HEAD
- fi
- if make -j5 ARCH=arm EXTRAVERSION=$VERSION; then
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1258-add-build-makerecovery.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1258-add-build-makerecovery.patch.patch
deleted file mode 100644 (file)
index f41a796..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-From c596d9067aa789a62e51df89917680eabe6453e2 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Thu, 7 Aug 2008 12:20:37 +0100
-Subject: [PATCH] add-build-makerecovery.patch
-
-This patch adds a script that creates a "recovery kernel" image
-from a recovery-uImage-moredrivers-... image.  The use of these
-recovery images is explained here:
-
-http://wiki.openmoko.org/wiki/Freerunner_backup_kernel
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- makerecovery |   17 +++++++++++++++++
- 1 files changed, 17 insertions(+), 0 deletions(-)
- create mode 100755 makerecovery
-
-diff --git a/makerecovery b/makerecovery
-new file mode 100755
-index 0000000..e158638
---- /dev/null
-+++ b/makerecovery
-@@ -0,0 +1,17 @@
-+#!/bin/sh
-+#
-+# make 6MB recovery image from two moredrivers type kernels
-+# placed at start and at +4MBytes
-+
-+if [ -z "$1" ] ; then
-+ echo "Usage: $0 uImage-moredrivers-..."
-+ exit 1
-+fi
-+cat $1 > recovery-$1
-+SIZE=`ls -l $1 | tr -s ' ' ' ' | cut -d' ' -f5`
-+SPACE=$(( 4 * 1024 * 1024 - $SIZE ))
-+dd if=/dev/zero of=_spacer bs=1 count=$SPACE
-+cat _spacer >> recovery-$1
-+rm -f _spacer
-+cat $1 >> recovery-$1
-+
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1259-From-fa269b44512a03523b164c3cebc20312748c524b-Mon-Se.patch b/target/linux/s3c24xx/patches-2.6.24/1259-From-fa269b44512a03523b164c3cebc20312748c524b-Mon-Se.patch
deleted file mode 100644 (file)
index 58b7249..0000000
+++ /dev/null
@@ -1,195 +0,0 @@
-From 2f36cf3d6a324af5c43f9d6bfded95d7c1a9c532 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Thu, 7 Aug 2008 16:27:12 +0100
-Subject: [PATCH] From fa269b44512a03523b164c3cebc20312748c524b Mon Sep 17 00:00:00 2001
- Subject: [PATCH] [ar6k] Build the wireless driver without DEBUG
-     - Remove DEBUG from the Makefile
-
-    - Do not send events through netlink to userspace. We might
-      need to reevaluate this. But we seem to use wireless_send_event
-      at the right places.
-      (SEND_EVENT_TO_APP)
-
-    - Do not report debug logs to apps
-      (REPORT_DEBUG_LOGS_TO_APP)
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- drivers/sdio/function/wlan/ar6000/Makefile         |    4 ++--
- .../sdio/function/wlan/ar6000/ar6000/ar6000_drv.c  |   13 +++++++++++++
- .../sdio/function/wlan/ar6000/ar6000/debug_linux.h |    2 +-
- drivers/sdio/function/wlan/ar6000/hif/hif.c        |    2 +-
- drivers/sdio/function/wlan/ar6000/htc/htc_send.c   |    2 ++
- drivers/sdio/stack/busdriver/_busdriver.h          |    2 +-
- drivers/sdio/stack/busdriver/sdio_bus_misc.c       |    2 +-
- include/linux/sdio/ctsystem_linux.h                |    2 --
- 8 files changed, 21 insertions(+), 8 deletions(-)
-
-diff --git a/drivers/sdio/function/wlan/ar6000/Makefile b/drivers/sdio/function/wlan/ar6000/Makefile
-index 810dab6..4dc5109 100644
---- a/drivers/sdio/function/wlan/ar6000/Makefile
-+++ b/drivers/sdio/function/wlan/ar6000/Makefile
-@@ -4,8 +4,8 @@ PWD := $(shell pwd)
- EXTRA_CFLAGS += -I$(src)/include
--EXTRA_CFLAGS += -DLINUX -DDEBUG -D__KERNEL__ -DHTC_RAW_INTERFACE\
--                -DTCMD -DSEND_EVENT_TO_APP -DUSER_KEYS \
-+EXTRA_CFLAGS += -DLINUX -D__KERNEL__ -DHTC_RAW_INTERFACE\
-+                -DTCMD -DUSER_KEYS \
-                 -DNO_SYNC_FLUSH #\
-                 -DMULTIPLE_FRAMES_PER_INTERRUPT -DAR6000REV$(REV) \
-                 -DBLOCK_TX_PATH_FLAG \
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-index dacc00a..93ed978 100644
---- a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-@@ -155,6 +155,9 @@ MODULE_PARM(txcreditintrenable, "0-3i");
- MODULE_PARM(txcreditintrenableaggregate, "0-3i");
- #endif
-+#else
-+unsigned int resetok = 1;
-+
- #endif /* DEBUG */
- unsigned int tx_attempt[HTC_MAILBOX_NUM_MAX] = {0};
-@@ -265,7 +268,9 @@ static struct ar_cookie s_ar_cookie_mem[MAX_COOKIE_NUM];
-  * Flag to govern whether the debug logs should be parsed in the kernel
-  * or reported to the application.
-  */
-+#ifdef DEBUG
- #define REPORT_DEBUG_LOGS_TO_APP
-+#endif
- A_STATUS
- ar6000_set_host_app_area(AR_SOFTC_T *ar)
-@@ -874,9 +879,11 @@ static void ar6000_target_failure(void *Instance, A_STATUS Status)
-             sip = TRUE;
-             errEvent.errorVal = WMI_TARGET_COM_ERR |
-                                 WMI_TARGET_FATAL_ERR;
-+#ifdef SEND_EVENT_TO_APP
-             ar6000_send_event_to_app(ar, WMI_ERROR_REPORT_EVENTID,
-                                      (A_UINT8 *)&errEvent,
-                                      sizeof(WMI_TARGET_ERROR_REPORT_EVENT));
-+#endif
-         }
-     }
- }
-@@ -1026,9 +1033,11 @@ static void ar6000_detect_error(unsigned long ptr)
-         ar->arHBChallengeResp.seqNum = 0;
-         errEvent.errorVal = WMI_TARGET_COM_ERR | WMI_TARGET_FATAL_ERR;
-         AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+#ifdef SEND_EVENT_TO_APP
-         ar6000_send_event_to_app(ar, WMI_ERROR_REPORT_EVENTID,
-                                  (A_UINT8 *)&errEvent,
-                                  sizeof(WMI_TARGET_ERROR_REPORT_EVENT));
-+#endif
-         return;
-     }
-@@ -2500,7 +2509,9 @@ ar6000_rssiThreshold_event(AR_SOFTC_T *ar,  WMI_RSSI_THRESHOLD_VAL newThreshold,
-     userRssiThold.tag = rssi_map[newThreshold].tag;
-     userRssiThold.rssi = rssi;
-     AR_DEBUG2_PRINTF("rssi Threshold range = %d tag = %d  rssi = %d\n", newThreshold, userRssiThold.tag, rssi);
-+#ifdef SEND_EVENT_TO_APP
-     ar6000_send_event_to_app(ar, WMI_RSSI_THRESHOLD_EVENTID,(A_UINT8 *)&userRssiThold, sizeof(USER_RSSI_THOLD));
-+#endif
- }
-@@ -2509,8 +2520,10 @@ ar6000_hbChallengeResp_event(AR_SOFTC_T *ar, A_UINT32 cookie, A_UINT32 source)
- {
-     if (source == APP_HB_CHALLENGE) {
-         /* Report it to the app in case it wants a positive acknowledgement */
-+#ifdef SEND_EVENT_TO_APP
-         ar6000_send_event_to_app(ar, WMIX_HB_CHALLENGE_RESP_EVENTID,
-                                  (A_UINT8 *)&cookie, sizeof(cookie));
-+#endif
-     } else {
-         /* This would ignore the replys that come in after their due time */
-         if (cookie == ar->arHBChallengeResp.seqNum) {
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h b/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h
-index e62e960..c74e1df 100644
---- a/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h
-@@ -77,7 +77,7 @@ enum {
- extern int debughtc;
- #else
- #define AR_DEBUG_PRINTF(flags, args)
--#define AR_DEBUG_PRINTBUF(buffer, length)
-+#define AR_DEBUG_PRINTBUF(buffer, length, desc)
- #define AR_DEBUG_ASSERT(test)
- #define AR_DEBUG_LVL_CHECK(lvl) 0
- #define A_DPRINTF(f, a)
-diff --git a/drivers/sdio/function/wlan/ar6000/hif/hif.c b/drivers/sdio/function/wlan/ar6000/hif/hif.c
-index 3d6d792..469b5cc 100644
---- a/drivers/sdio/function/wlan/ar6000/hif/hif.c
-+++ b/drivers/sdio/function/wlan/ar6000/hif/hif.c
-@@ -86,9 +86,9 @@ static BUS_REQUEST *s_busRequestFreeQueue = NULL;
- OS_CRITICALSECTION lock;
- extern A_UINT32 onebitmode;
- extern A_UINT32 busspeedlow;
--extern A_UINT32 debughif;
- #ifdef DEBUG
-+extern A_UINT32 debughif;
- #define ATH_DEBUG_ERROR 1
- #define ATH_DEBUG_WARN  2
- #define ATH_DEBUG_TRACE 3
-diff --git a/drivers/sdio/function/wlan/ar6000/htc/htc_send.c b/drivers/sdio/function/wlan/ar6000/htc/htc_send.c
-index 7792dd6..fd5ef6e 100644
---- a/drivers/sdio/function/wlan/ar6000/htc/htc_send.c
-+++ b/drivers/sdio/function/wlan/ar6000/htc/htc_send.c
-@@ -425,7 +425,9 @@ static void HTCFlushEndpointTX(HTC_TARGET *target, HTC_ENDPOINT *pEndpoint, HTC_
- void DumpCreditDist(HTC_ENDPOINT_CREDIT_DIST *pEPDist)
- {
-+#ifdef DEBUG
-     HTC_ENDPOINT *pEndpoint = (HTC_ENDPOINT *)pEPDist->pHTCReserved;
-+#endif
-     AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("--- EP : %d  ServiceID: 0x%X    --------------\n",
-                         pEPDist->Endpoint, pEPDist->ServiceID));
-diff --git a/drivers/sdio/stack/busdriver/_busdriver.h b/drivers/sdio/stack/busdriver/_busdriver.h
-index a85aed1..28d3960 100644
---- a/drivers/sdio/stack/busdriver/_busdriver.h
-+++ b/drivers/sdio/stack/busdriver/_busdriver.h
-@@ -301,7 +301,7 @@ static INLINE SDIO_STATUS CallHcdRequest(PSDHCD pHcd) {
-             pHcd->pCurrentRequest->Flags |= SDREQ_FLAGS_FORCE_DEFERRED_COMPLETE;
-         }
-     }
-- #if DEBUG
-+ #ifdef DEBUG
-     {
-         SDIO_STATUS status;
-         BOOL forceDeferred;
-diff --git a/drivers/sdio/stack/busdriver/sdio_bus_misc.c b/drivers/sdio/stack/busdriver/sdio_bus_misc.c
-index c5c7381..d89a596 100644
---- a/drivers/sdio/stack/busdriver/sdio_bus_misc.c
-+++ b/drivers/sdio/stack/busdriver/sdio_bus_misc.c
-@@ -1977,7 +1977,7 @@ SDIO_STATUS SDQuerySDMMCInfo(PSDDEVICE pDevice)
-         } else {
-             pDevice->pId[0].SDMMC_ManfacturerID = GET_SD_CID_MANFID(CID);
-             pDevice->pId[0].SDMMC_OEMApplicationID = GET_SD_CID_OEMID(CID);
--#if DEBUG
-+#ifdef DEBUG
-             {
-                 char pBuf[7];
-diff --git a/include/linux/sdio/ctsystem_linux.h b/include/linux/sdio/ctsystem_linux.h
-index c9e44f2..2aa4de3 100644
---- a/include/linux/sdio/ctsystem_linux.h
-+++ b/include/linux/sdio/ctsystem_linux.h
-@@ -202,8 +202,6 @@ typedef struct scatterlist SDDMA_DESCRIPTOR, *PSDDMA_DESCRIPTOR;
- #define DBG_SDIO_MASK (DBG_MASK_NONE | DBG_LEVEL_DEBUG)
--#define DEBUG 1
--
- #ifdef DEBUG
- #define DBG_ASSERT(test) \
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1260-config-remove-evbug-module.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1260-config-remove-evbug-module.patch.patch
deleted file mode 100644 (file)
index a0dae7b..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-From e8780c02d307380e9e08d1b85888a599d53078ac Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Thu, 7 Aug 2008 16:27:21 +0100
-Subject: [PATCH] config-remove-evbug-module.patch
-
-Carsten mentioned that evbug module is getting modprobed in
-to ASU somehow and making havoc.  This patch stops us building
-it because there's no time to figure out why it gets modprobed
-in and it doesn't seem to do anything but spew syslog -- and we
-never needed it before now.
-
-Reported-by: Carsten Haitzler <raster@openmoko.org>
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- defconfig-2.6.24            |    2 +-
- defconfig-2.6.24-maxmodules |    2 +-
- defconfig-gta01             |    2 +-
- defconfig-gta02             |    2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index 0bcf50a..52d5e45 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -906,7 +906,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
- CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
- # CONFIG_INPUT_JOYDEV is not set
- CONFIG_INPUT_EVDEV=y
--CONFIG_INPUT_EVBUG=m
-+# CONFIG_INPUT_EVBUG is not set
- #
- # Input Device Drivers
-diff --git a/defconfig-2.6.24-maxmodules b/defconfig-2.6.24-maxmodules
-index ec94668..d4c1988 100644
---- a/defconfig-2.6.24-maxmodules
-+++ b/defconfig-2.6.24-maxmodules
-@@ -867,7 +867,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
- CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
- # CONFIG_INPUT_JOYDEV is not set
- CONFIG_INPUT_EVDEV=y
--CONFIG_INPUT_EVBUG=m
-+# CONFIG_INPUT_EVBUG is not set
- #
- # Input Device Drivers
-diff --git a/defconfig-gta01 b/defconfig-gta01
-index 3320560..6f36712 100644
---- a/defconfig-gta01
-+++ b/defconfig-gta01
-@@ -867,7 +867,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
- CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
- # CONFIG_INPUT_JOYDEV is not set
- CONFIG_INPUT_EVDEV=y
--CONFIG_INPUT_EVBUG=m
-+# CONFIG_INPUT_EVBUG is not set
- #
- # Input Device Drivers
-diff --git a/defconfig-gta02 b/defconfig-gta02
-index 376d53e..0838dad 100644
---- a/defconfig-gta02
-+++ b/defconfig-gta02
-@@ -866,7 +866,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
- CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
- # CONFIG_INPUT_JOYDEV is not set
- CONFIG_INPUT_EVDEV=y
--CONFIG_INPUT_EVBUG=m
-+# CONFIG_INPUT_EVBUG is not set
- #
- # Input Device Drivers
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1261-config-add-udf-support.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1261-config-add-udf-support.patch.patch
deleted file mode 100644 (file)
index 801aa3e..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-From 436204281bcd1fe5999ad6589ea7ab1b5360c352 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Thu, 7 Aug 2008 16:27:33 +0100
-Subject: [PATCH] config-add-udf-support.patch
-
-Timo noticed that his compound USB device wasn't getting recognized properly,
-it was stuck on the CD-ROM class part of it.  This was accepted by the GTA02
-but no scsi device was spawned for it.  He figured out in the end that it is
-the lack of a UDF filesystem module that was the problem.
-
-This patch adds UDF and CDROM as a built-in on defconfig-2.6.24, for the
-modular configs it just adds it as a module.
-
-Reported-by: Timo Drick <timo@drick.de>
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- defconfig-2.6.24            |    8 ++++----
- defconfig-2.6.24-maxmodules |    2 +-
- defconfig-gta01             |    2 +-
- defconfig-gta02             |    2 +-
- 4 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index 52d5e45..cfe7f57 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -1361,7 +1361,7 @@ CONFIG_USB_MON=y
- #
- # USB Serial Converter support
- #
--CONFIG_USB_SERIAL=m
-+CONFIG_USB_SERIAL=y
- CONFIG_USB_SERIAL_GENERIC=y
- CONFIG_USB_SERIAL_AIRCABLE=m
- CONFIG_USB_SERIAL_AIRPRIME=m
-@@ -1411,7 +1411,7 @@ CONFIG_USB_SERIAL_SIERRAWIRELESS=m
- CONFIG_USB_SERIAL_TI=m
- CONFIG_USB_SERIAL_CYBERJACK=m
- CONFIG_USB_SERIAL_XIRCOM=m
--CONFIG_USB_SERIAL_OPTION=m
-+CONFIG_USB_SERIAL_OPTION=y
- CONFIG_USB_SERIAL_OMNINET=m
- # CONFIG_USB_SERIAL_DEBUG is not set
- CONFIG_USB_EZUSB=y
-@@ -1595,10 +1595,10 @@ CONFIG_FUSE_FS=m
- #
- # CD-ROM/DVD Filesystems
- #
--CONFIG_ISO9660_FS=m
-+CONFIG_ISO9660_FS=y
- CONFIG_JOLIET=y
- # CONFIG_ZISOFS is not set
--# CONFIG_UDF_FS is not set
-+CONFIG_UDF_FS=y
- #
- # DOS/FAT/NT Filesystems
-diff --git a/defconfig-2.6.24-maxmodules b/defconfig-2.6.24-maxmodules
-index d4c1988..e773649 100644
---- a/defconfig-2.6.24-maxmodules
-+++ b/defconfig-2.6.24-maxmodules
-@@ -1510,7 +1510,7 @@ CONFIG_FUSE_FS=m
- CONFIG_ISO9660_FS=m
- CONFIG_JOLIET=y
- # CONFIG_ZISOFS is not set
--# CONFIG_UDF_FS is not set
-+CONFIG_UDF_FS=m
- #
- # DOS/FAT/NT Filesystems
-diff --git a/defconfig-gta01 b/defconfig-gta01
-index 6f36712..3b567b7 100644
---- a/defconfig-gta01
-+++ b/defconfig-gta01
-@@ -1510,7 +1510,7 @@ CONFIG_FUSE_FS=m
- CONFIG_ISO9660_FS=m
- CONFIG_JOLIET=y
- # CONFIG_ZISOFS is not set
--# CONFIG_UDF_FS is not set
-+CONFIG_UDF_FS=m
- #
- # DOS/FAT/NT Filesystems
-diff --git a/defconfig-gta02 b/defconfig-gta02
-index 0838dad..2096f95 100644
---- a/defconfig-gta02
-+++ b/defconfig-gta02
-@@ -1509,7 +1509,7 @@ CONFIG_FUSE_FS=m
- CONFIG_ISO9660_FS=m
- CONFIG_JOLIET=y
- # CONFIG_ZISOFS is not set
--# CONFIG_UDF_FS is not set
-+CONFIG_UDF_FS=m
- #
- # DOS/FAT/NT Filesystems
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1262-gta0x-add-minimal-GSM-flowcontrol.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1262-gta0x-add-minimal-GSM-flowcontrol.patch.patch
deleted file mode 100644 (file)
index 263bc47..0000000
+++ /dev/null
@@ -1,154 +0,0 @@
-From 7e5f528cb1448ac31a4e3a45c7c953ea95869d4d Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Fri, 8 Aug 2008 13:08:03 +0100
-Subject: [PATCH] gta0x-add-minimal-GSM-flowcontrol.patch
-
-    Add the basic GSM flowcontrol code.
-
-Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- arch/arm/mach-s3c2410/mach-gta01.c     |    3 ++
- arch/arm/mach-s3c2440/mach-gta02.c     |    3 ++
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |   36 ++++++++++++++++++++++++++++++++
- 3 files changed, 42 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index e518de7..f3f87cf 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -657,9 +657,12 @@ static void __init gta01_map_io(void)
-       s3c24xx_init_uarts(gta01_uartcfgs, ARRAY_SIZE(gta01_uartcfgs));
- }
-+extern int gta_gsm_interrupts;
-+
- static irqreturn_t gta01_modem_irq(int irq, void *param)
- {
-       printk(KERN_DEBUG "GSM wakeup interrupt (IRQ %d)\n", irq);
-+      gta_gsm_interrupts++;
-       return IRQ_HANDLED;
- }
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 8e43c4a..1d7d262 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1531,9 +1531,12 @@ static void __init gta02_map_io(void)
-       s3c24xx_init_uarts(gta02_uartcfgs, ARRAY_SIZE(gta02_uartcfgs));
- }
-+extern int gta_gsm_interrupts;
-+
- static irqreturn_t gta02_modem_irq(int irq, void *param)
- {
-       printk(KERN_DEBUG "modem wakeup interrupt\n");
-+      gta_gsm_interrupts++;
-       return IRQ_HANDLED;
- }
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index dd63506..0543905 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -34,6 +34,9 @@
- extern void s3c24xx_serial_register_resume_dependency(struct resume_dependency *
-                                            resume_dependency, int uart_index);
-+int gta_gsm_interrupts;
-+EXPORT_SYMBOL(gta_gsm_interrupts);
-+
- struct gta01pm_priv {
-       int gpio_ngsm_en;
-         int gpio_ndl_gsm;
-@@ -80,6 +83,9 @@ static ssize_t gsm_read(struct device *dev, struct device_attribute *attr,
-                       if (!s3c2410_gpio_getpin(GTA02_GPIO_nDL_GSM))
-                               goto out_1;
-               }
-+      } else if (!strcmp(attr->attr.name, "flowcontrolled")) {
-+              if (s3c2410_gpio_getcfg(S3C2410_GPH1) == S3C2410_GPIO_OUTPUT)
-+                      goto out_1;
-       }
-       return strlcpy(buf, "0\n", 3);
-@@ -176,6 +182,13 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-                       gta01_gsm.gpio_ndl_gsm = !on;
-                       s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, !on);
-               }
-+      } else if (!strcmp(attr->attr.name, "flowcontrolled")) {
-+              if (on) {
-+                      gta_gsm_interrupts = 0;
-+                      s3c2410_gpio_setpin(S3C2410_GPH1, 1);
-+                      s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPH1_OUTP);
-+              } else
-+                      s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPH1_nRTS0);
-       }
-       return count;
-@@ -184,6 +197,7 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
- static DEVICE_ATTR(power_on, 0644, gsm_read, gsm_write);
- static DEVICE_ATTR(reset, 0644, gsm_read, gsm_write);
- static DEVICE_ATTR(download, 0644, gsm_read, gsm_write);
-+static DEVICE_ATTR(flowcontrolled, 0644, gsm_read, gsm_write);
- #ifdef CONFIG_PM
- static int gta01_gsm_resume(struct platform_device *pdev);
-@@ -192,6 +206,11 @@ static int gta01_gsm_suspend(struct platform_device *pdev, pm_message_t state)
-       /* GPIO state is saved/restored by S3C2410 core GPIO driver, so we
-        * don't need to do much here. */
-+      /* If flowcontrol asserted, abort if GSM already interrupted */
-+      if (s3c2410_gpio_getcfg(S3C2410_GPH1) == S3C2410_GPIO_OUTPUT) {
-+              if (gta_gsm_interrupts)
-+                      goto busy;
-+      }
-       /* disable DL GSM to prevent jack_insert becoming 'floating' */
-       if (machine_is_neo1973_gta02())
-@@ -204,6 +223,20 @@ static int gta01_gsm_suspend(struct platform_device *pdev, pm_message_t state)
-       s3c24xx_serial_register_resume_dependency(&resume_dep_gsm_uart, 0);
-       return 0;
-+
-+busy:
-+      return -EBUSY;
-+}
-+
-+static int
-+gta01_gsm_suspend_late(struct platform_device *pdev, pm_message_t state)
-+{
-+      /* Last chance: abort if GSM already interrupted */
-+      if (s3c2410_gpio_getcfg(S3C2410_GPH1) == S3C2410_GPIO_OUTPUT) {
-+              if (gta_gsm_interrupts)
-+                      return -EBUSY;
-+      }
-+      return 0;
- }
- static int gta01_gsm_resume(struct platform_device *pdev)
-@@ -228,6 +261,7 @@ static int gta01_gsm_resume(struct platform_device *pdev)
- }
- #else
- #define gta01_gsm_suspend     NULL
-+#define gta01_gsm_suspend_late        NULL
- #define gta01_gsm_resume      NULL
- #endif
-@@ -235,6 +269,7 @@ static struct attribute *gta01_gsm_sysfs_entries[] = {
-       &dev_attr_power_on.attr,
-       &dev_attr_reset.attr,
-       &dev_attr_download.attr,
-+      &dev_attr_flowcontrolled.attr,
-       NULL
- };
-@@ -314,6 +349,7 @@ static struct platform_driver gta01_gsm_driver = {
-       .probe          = gta01_gsm_probe,
-       .remove         = gta01_gsm_remove,
-       .suspend        = gta01_gsm_suspend,
-+      .suspend_late   = gta01_gsm_suspend_late,
-       .resume         = gta01_gsm_resume,
-       .driver         = {
-               .name           = "neo1973-pm-gsm",
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1263-commit-830ea3d0c27c0c750b7bf1b56c002ee7943f3edc.patch b/target/linux/s3c24xx/patches-2.6.24/1263-commit-830ea3d0c27c0c750b7bf1b56c002ee7943f3edc.patch
deleted file mode 100644 (file)
index 17531ed..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-From 749594928cc1a0e452c4c791fcbea2f8f4a7e259 Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Fri, 8 Aug 2008 13:08:03 +0100
-Subject: [PATCH] commit 830ea3d0c27c0c750b7bf1b56c002ee7943f3edc
-
-    gta0x-log-serial-rx-error.patch
-
-    This patch causes a KERN_DEBUG message to be printed each time an
-    error status is read from a UART.  This is intended to facilitate
-    the reporting of more useful problem and bug reports from users
-    in the field.
-
-    Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- drivers/serial/s3c2410.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
-index fef3c8f..5652905 100644
---- a/drivers/serial/s3c2410.c
-+++ b/drivers/serial/s3c2410.c
-@@ -357,7 +357,7 @@ s3c24xx_serial_rx_chars(int irq, void *dev_id)
-               port->icount.rx++;
-               if (unlikely(uerstat & S3C2410_UERSTAT_ANY)) {
--                      dbg("rxerr: port ch=0x%02x, rxs=0x%08x\n",
-+                      printk(KERN_DEBUG "rxerr: port ch=0x%02x, rxs=0x%08x\n",
-                           ch, uerstat);
-                       /* check for break */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1264-silence-serial-console-gta01.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1264-silence-serial-console-gta01.patch.patch
deleted file mode 100644 (file)
index 7713c47..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-From bea12b6beb76a483145b07d30602b0dd18ff2484 Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Fri, 8 Aug 2008 13:10:18 +0100
-Subject: [PATCH] silence-serial-console-gta01.patch
-
-    This patch ensures that no console data will go the UART while
-    the GSM mux is switched to the GSM.  This is necessary despite
-    the code that disables the console due to the fact that the
-    console resumes before the neo1973_pm_gsm driver, and consoles
-    always resume in the "on" state.
-
-Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |    3 +++
- drivers/serial/s3c2410.c               |   10 ++++++++++
- 2 files changed, 13 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index 0543905..68b7111 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -31,6 +31,7 @@
- #include <asm/arch/regs-gpioj.h>
- #endif
-+extern void s3c24xx_serial_console_set_silence(int silence);
- extern void s3c24xx_serial_register_resume_dependency(struct resume_dependency *
-                                            resume_dependency, int uart_index);
-@@ -105,6 +106,7 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-                                        "disconnecting serial console\n");
-                               console_stop(gta01_gsm.con);
-+                              s3c24xx_serial_console_set_silence(1);
-                       }
-                       if (gta01_gsm.gpio_ngsm_en)
-@@ -144,6 +146,7 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-                               s3c2410_gpio_setpin(gta01_gsm.gpio_ngsm_en, 1);
-                       if (gta01_gsm.con) {
-+                              s3c24xx_serial_console_set_silence(0);
-                               console_start(gta01_gsm.con);
-                               dev_dbg(dev, "powered down GSM, thus enabling "
-diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
-index 5652905..2a388cf 100644
---- a/drivers/serial/s3c2410.c
-+++ b/drivers/serial/s3c2410.c
-@@ -1780,6 +1780,13 @@ module_exit(s3c24xx_serial_modexit);
- #ifdef CONFIG_SERIAL_S3C2410_CONSOLE
- static struct uart_port *cons_uart;
-+static int cons_silenced;
-+
-+void s3c24xx_serial_console_set_silence(int silenced)
-+{
-+      cons_silenced = silenced;
-+}
-+EXPORT_SYMBOL(s3c24xx_serial_console_set_silence);
- static int
- s3c24xx_serial_console_txrdy(struct uart_port *port, unsigned int ufcon)
-@@ -1806,6 +1813,9 @@ s3c24xx_serial_console_putchar(struct uart_port *port, int ch)
-       unsigned int ufcon = rd_regl(cons_uart, S3C2410_UFCON);
-       unsigned int umcon = rd_regl(cons_uart, S3C2410_UMCON);
-+      if (cons_silenced)
-+              return;
-+
-       /* If auto HW flow control enabled, temporarily turn it off */
-       if (umcon & S3C2410_UMCOM_AFC)
-               wr_regl(port, S3C2410_UMCON, (umcon & !S3C2410_UMCOM_AFC));
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1265-gta01-pcf50606-disable-irq-from-suspend-until-resume.patch b/target/linux/s3c24xx/patches-2.6.24/1265-gta01-pcf50606-disable-irq-from-suspend-until-resume.patch
deleted file mode 100644 (file)
index 4a34114..0000000
+++ /dev/null
@@ -1,287 +0,0 @@
-From 0c136b451381e760c056a7683b7fc28901f54da4 Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Fri, 8 Aug 2008 13:10:59 +0100
-Subject: [PATCH] gta01-pcf50606-disable-irq-from-suspend-until-resume.patch
-
-    This patch is the pcf50606 equivalent of the pcf50633 patch that
-    disables interrupts from the chip until after resume is complete.
-    In order to ensure no data is lost, the work function is called
-    post-resume to process any pending interrupts.
-
-    Most of the code was quite literally re-used from Andy Green's
-    original patch.
-
-Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- drivers/i2c/chips/pcf50606.c |  148 ++++++++++++++++++++++++++++++++++++++++--
- 1 files changed, 142 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
-index ddba1c7..18263fb 100644
---- a/drivers/i2c/chips/pcf50606.c
-+++ b/drivers/i2c/chips/pcf50606.c
-@@ -38,6 +38,7 @@
- #include <linux/interrupt.h>
- #include <linux/irq.h>
- #include <linux/workqueue.h>
-+#include <linux/delay.h>
- #include <linux/rtc.h>
- #include <linux/bcd.h>
- #include <linux/watchdog.h>
-@@ -95,6 +96,15 @@ enum close_state {
-       CLOSE_STATE_ALLOW = 0x2342,
- };
-+enum pcf50606_suspend_states {
-+      PCF50606_SS_RUNNING,
-+      PCF50606_SS_STARTING_SUSPEND,
-+      PCF50606_SS_COMPLETED_SUSPEND,
-+      PCF50606_SS_RESUMING_BUT_NOT_US_YET,
-+      PCF50606_SS_STARTING_RESUME,
-+      PCF50606_SS_COMPLETED_RESUME,
-+};
-+
- struct pcf50606_data {
-       struct i2c_client client;
-       struct pcf50606_platform_data *pdata;
-@@ -110,6 +120,7 @@ struct pcf50606_data {
-       int onkey_seconds;
-       int irq;
-       int coldplug_done;
-+      enum pcf50606_suspend_states suspend_state;
- #ifdef CONFIG_PM
-       struct {
-               u_int8_t dcdc1, dcdc2;
-@@ -160,6 +171,10 @@ static const u_int16_t ntc_table_10k_3370B[] = {
- static inline int __reg_write(struct pcf50606_data *pcf, u_int8_t reg,
-                             u_int8_t val)
- {
-+      if (pcf->suspend_state == PCF50606_SS_COMPLETED_SUSPEND) {
-+              dev_err(&pcf->client.dev, "__reg_write while suspended.\n");
-+              dump_stack();
-+      }
-       return i2c_smbus_write_byte_data(&pcf->client, reg, val);
- }
-@@ -178,6 +193,10 @@ static inline int32_t __reg_read(struct pcf50606_data *pcf, u_int8_t reg)
- {
-       int32_t ret;
-+      if (pcf->suspend_state == PCF50606_SS_COMPLETED_SUSPEND) {
-+              dev_err(&pcf->client.dev, "__reg_read while suspended.\n");
-+              dump_stack();
-+      }
-       ret = i2c_smbus_read_byte_data(&pcf->client, reg);
-       return ret;
-@@ -569,6 +588,48 @@ static void pcf50606_work(struct work_struct *work)
-       mutex_lock(&pcf->working_lock);
-       pcf->working = 1;
-+
-+      /* sanity */
-+      if (!&pcf->client.dev)
-+              goto bail;
-+
-+      /*
-+       * if we are presently suspending, we are not in a position to deal
-+       * with pcf50606 interrupts at all.
-+       *
-+       * Because we didn't clear the int pending registers, there will be
-+       * no edge / interrupt waiting for us when we wake.  But it is OK
-+       * because at the end of our resume, we call this workqueue function
-+       * gratuitously, clearing the pending register and re-enabling
-+       * servicing this interrupt.
-+       */
-+
-+      if ((pcf->suspend_state == PCF50606_SS_STARTING_SUSPEND) ||
-+          (pcf->suspend_state == PCF50606_SS_COMPLETED_SUSPEND))
-+              goto bail;
-+
-+      /*
-+       * If we are inside suspend -> resume completion time we don't attempt
-+       * service until we have fully resumed.  Although we could talk to the
-+       * device as soon as I2C is up, the regs in the device which we might
-+       * choose to modify as part of the service action have not been
-+       * reloaded with their pre-suspend states yet.  Therefore we will
-+       * defer our service if we are called like that until our resume has
-+       * completed.
-+       *
-+       * This shouldn't happen any more because we disable servicing this
-+       * interrupt in suspend and don't re-enable it until resume is
-+       * completed.
-+       */
-+
-+      if (pcf->suspend_state &&
-+              (pcf->suspend_state != PCF50606_SS_COMPLETED_RESUME))
-+              goto reschedule;
-+
-+      /* this is the case early in resume! Sanity check! */
-+      if (i2c_get_clientdata(&pcf->client) == NULL)
-+              goto reschedule;
-+
-       /*
-        * p35 pcf50606 datasheet rev 2.2:
-        * ''The system controller shall read all interrupt registers in
-@@ -576,10 +637,27 @@ static void pcf50606_work(struct work_struct *work)
-        * because if you don't INT# gets stuck asserted forever after a
-        * while
-        */
--      ret = i2c_smbus_read_i2c_block_data(&pcf->client, PCF50606_REG_INT1, 3,
--                                          pcfirq);
--      if (ret != 3)
-+      ret = i2c_smbus_read_i2c_block_data(&pcf->client, PCF50606_REG_INT1,
-+                                          sizeof(pcfirq), pcfirq);
-+      if (ret != sizeof(pcfirq)) {
-               DEBUGPC("Oh crap PMU IRQ register read failed %d\n", ret);
-+              /*
-+               * it shouldn't fail, we no longer attempt to use
-+               * I2C while it can be suspended.  But we don't have
-+               * much option but to retry if if it ever did fail,
-+               * because if we don't service the interrupt to clear
-+               * it, we will never see another PMU interrupt edge.
-+               */
-+              goto reschedule;
-+      }
-+
-+      /* hey did we just resume? (because we don't get here unless we are
-+       * running normally or the first call after resumption)
-+       *
-+       * pcf50606 resume is really really over now then.
-+       */
-+      if (pcf->suspend_state != PCF50606_SS_RUNNING)
-+              pcf->suspend_state = PCF50606_SS_RUNNING;
-       if (!pcf->coldplug_done) {
-               DEBUGPC("PMU Coldplug init\n");
-@@ -814,10 +892,26 @@ static void pcf50606_work(struct work_struct *work)
-       DEBUGPC("\n");
-+bail:
-       pcf->working = 0;
-       input_sync(pcf->input_dev);
-       put_device(&pcf->client.dev);
-       mutex_unlock(&pcf->working_lock);
-+
-+      return;
-+
-+reschedule:
-+
-+      if ((pcf->suspend_state != PCF50606_SS_STARTING_SUSPEND) &&
-+          (pcf->suspend_state != PCF50606_SS_COMPLETED_SUSPEND)) {
-+              msleep(10);
-+              dev_info(&pcf->client.dev, "rescheduling interrupt service\n");
-+      }
-+      if (!schedule_work(&pcf->work))
-+              dev_err(&pcf->client.dev, "int service reschedule failed\n");
-+
-+      /* we don't put the device here, hold it for next time */
-+      mutex_unlock(&pcf->working_lock);
- }
- static irqreturn_t pcf50606_irq(int irq, void *_pcf)
-@@ -828,7 +922,7 @@ static irqreturn_t pcf50606_irq(int irq, void *_pcf)
-               irq, _pcf);
-       get_device(&pcf->client.dev);
-       if (!schedule_work(&pcf->work) && !pcf->working)
--              dev_dbg(&pcf->client.dev, "work item may be lost\n");
-+              dev_err(&pcf->client.dev, "pcf irq work already queued.\n");
-       return IRQ_HANDLED;
- }
-@@ -1882,12 +1976,27 @@ static int pcf50606_suspend(struct device *dev, pm_message_t state)
-       struct pcf50606_data *pcf = i2c_get_clientdata(client);
-       int i;
-+      /* we suspend once (!) as late as possible in the suspend sequencing */
-+
-+      if ((state.event != PM_EVENT_SUSPEND) ||
-+          (pcf->suspend_state != PCF50606_SS_RUNNING))
-+              return -EBUSY;
-+
-       /* The general idea is to power down all unused power supplies,
-        * and then mask all PCF50606 interrup sources but EXTONR, ONKEYF
-        * and ALARM */
-       mutex_lock(&pcf->lock);
-+      pcf->suspend_state = PCF50606_SS_STARTING_SUSPEND;
-+
-+      /* we are not going to service any further interrupts until we
-+       * resume.  If the IRQ workqueue is still pending in the background,
-+       * it will bail when it sees we set suspend state above.
-+       */
-+
-+      disable_irq(pcf->irq);
-+
-       /* Save all registers that don't "survive" standby state */
-       pcf->standby_regs.dcdc1 = __reg_read(pcf, PCF50606_REG_DCDC1);
-       pcf->standby_regs.dcdc2 = __reg_read(pcf, PCF50606_REG_DCDC2);
-@@ -1928,6 +2037,8 @@ static int pcf50606_suspend(struct device *dev, pm_message_t state)
-       __reg_write(pcf, PCF50606_REG_INT2M, ~INT2M_RESUMERS & 0xff);
-       __reg_write(pcf, PCF50606_REG_INT3M, ~INT3M_RESUMERS & 0xff);
-+      pcf->suspend_state = PCF50606_SS_COMPLETED_SUSPEND;
-+
-       mutex_unlock(&pcf->lock);
-       return 0;
-@@ -1940,6 +2051,8 @@ static int pcf50606_resume(struct device *dev)
-       mutex_lock(&pcf->lock);
-+      pcf->suspend_state = PCF50606_SS_STARTING_RESUME;
-+
-       /* Resume all saved registers that don't "survive" standby state */
-       __reg_write(pcf, PCF50606_REG_INT1M, pcf->standby_regs.int1m);
-       __reg_write(pcf, PCF50606_REG_INT2M, pcf->standby_regs.int2m);
-@@ -1958,10 +2071,17 @@ static int pcf50606_resume(struct device *dev)
-       __reg_write(pcf, PCF50606_REG_ADCC2, pcf->standby_regs.adcc2);
-       __reg_write(pcf, PCF50606_REG_PWMC1, pcf->standby_regs.pwmc1);
-+      pcf->suspend_state = PCF50606_SS_COMPLETED_RESUME;
-+
-+      enable_irq(pcf->irq);
-+
-       mutex_unlock(&pcf->lock);
--      /* Hack to fix the gta01 power button problem on resume */
--      pcf50606_irq(0, pcf);
-+      /* Call PCF work function; this fixes an issue on the gta01 where
-+       * the power button "goes away" if it is used to wake the device.
-+       */
-+      get_device(&pcf->client.dev);
-+      pcf50606_work(&pcf->work);
-       return 0;
- }
-@@ -1999,9 +2119,25 @@ static int pcf50606_plat_remove(struct platform_device *pdev)
-       return 0;
- }
-+/* We have this purely to capture an early indication that we are coming out
-+ * of suspend, before our device resume got called; async interrupt service is
-+ * interested in this.
-+ */
-+
-+static int pcf50606_plat_resume(struct platform_device *pdev)
-+{
-+      /* i2c_get_clientdata(to_i2c_client(&pdev->dev)) returns NULL at this
-+       * early resume time so we have to use pcf50606_global
-+       */
-+      pcf50606_global->suspend_state = PCF50606_SS_RESUMING_BUT_NOT_US_YET;
-+
-+      return 0;
-+}
-+
- static struct platform_driver pcf50606_plat_driver = {
-       .probe  = pcf50606_plat_probe,
-       .remove = pcf50606_plat_remove,
-+      .resume_early = pcf50606_plat_resume,
-       .driver = {
-               .owner  = THIS_MODULE,
-               .name   = "pcf50606",
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1266-fix-suspend-backlight-timing-gta01.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1266-fix-suspend-backlight-timing-gta01.patch.patch
deleted file mode 100644 (file)
index d48c134..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-From 9ee405d79609106ea330b21d54f30b853e262296 Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Fri, 8 Aug 2008 13:10:59 +0100
-Subject: [PATCH] fix-suspend-backlight-timing-gta01.patch
-
-    This patch adds the gta01 backlight callback that defers the
-    restoring of the backlight until after the jbt driver has
-    resumed.  This doesn't eliminate the flashing of the LCD on
-    the gta01, but it reduces it considerably.
-
-Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- arch/arm/mach-s3c2410/mach-gta01.c   |    9 ++++++++-
- drivers/video/backlight/gta01_bl.c   |   15 ++++++++++++++-
- include/asm-arm/arch-s3c2410/gta01.h |    4 ++++
- 3 files changed, 26 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index f3f87cf..9e42df0 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -507,14 +507,20 @@ static struct s3c2410_ts_mach_info gta01_ts_cfg = {
- /* SPI */
--void gta01_jbt6k74_reset(int devidx, int level)
-+static void gta01_jbt6k74_reset(int devidx, int level)
- {
-       /* empty place holder; gta01 does not yet use this */
-       printk(KERN_DEBUG "gta01_jbt6k74_reset\n");
- }
-+static void gta01_jbt6k74_resuming(int devidx)
-+{
-+      gta01bl_deferred_resume();
-+}
-+
- const struct jbt6k74_platform_data gta01_jbt6k74_pdata = {
-       .reset          = gta01_jbt6k74_reset,
-+      .resuming       = gta01_jbt6k74_resuming,
- };
- static struct spi_board_info gta01_spi_board_info[] = {
-@@ -584,6 +590,7 @@ static struct gta01bl_machinfo backlight_machinfo = {
-       .default_intensity      = 1,
-       .max_intensity          = 1,
-       .limit_mask             = 1,
-+      .defer_resume_backlight = 1,
- };
- static struct resource gta01_bl_resources[] = {
-diff --git a/drivers/video/backlight/gta01_bl.c b/drivers/video/backlight/gta01_bl.c
-index 301ec9c..34c19c8 100644
---- a/drivers/video/backlight/gta01_bl.c
-+++ b/drivers/video/backlight/gta01_bl.c
-@@ -57,6 +57,8 @@ struct gta01bl_data {
- static struct gta01bl_data gta01bl;
-+static int gta01bl_defer_resume_backlight;
-+
- #define GTA01BL_SUSPENDED     0x01
- #define GTA01BL_BATTLOW       0x02
-@@ -132,10 +134,12 @@ static int gta01bl_suspend(struct platform_device *dev, pm_message_t state)
- {
-       gta01bl_flags |= GTA01BL_SUSPENDED;
-       gta01bl_send_intensity(gta01_backlight_device);
-+      neo1973_gpb_setpin(GTA01_GPIO_BACKLIGHT, 0);
-+      s3c2410_gpio_cfgpin(GTA01_GPIO_BACKLIGHT, S3C2410_GPIO_OUTPUT);
-       return 0;
- }
--static int gta01bl_resume(struct platform_device *dev)
-+void gta01bl_deferred_resume(void)
- {
-       mutex_lock(&gta01bl.mutex);
-       gta01bl_init_hw();
-@@ -143,6 +147,13 @@ static int gta01bl_resume(struct platform_device *dev)
-       gta01bl_flags &= ~GTA01BL_SUSPENDED;
-       gta01bl_send_intensity(gta01_backlight_device);
-+}
-+EXPORT_SYMBOL_GPL(gta01bl_deferred_resume);
-+
-+static int gta01bl_resume(struct platform_device *dev)
-+{
-+      if (! gta01bl_defer_resume_backlight)
-+              gta01bl_deferred_resume();
-       return 0;
- }
- #else
-@@ -199,6 +210,8 @@ static int __init gta01bl_probe(struct platform_device *pdev)
-       if (!machinfo->limit_mask)
-               machinfo->limit_mask = -1;
-+      gta01bl_defer_resume_backlight = machinfo->defer_resume_backlight;
-+
-       gta01_backlight_device = backlight_device_register("gta01-bl",
-                                                          &pdev->dev, NULL,
-                                                          &gta01bl_ops);
-diff --git a/include/asm-arm/arch-s3c2410/gta01.h b/include/asm-arm/arch-s3c2410/gta01.h
-index 1cc2099..989aa55 100644
---- a/include/asm-arm/arch-s3c2410/gta01.h
-+++ b/include/asm-arm/arch-s3c2410/gta01.h
-@@ -12,10 +12,14 @@
- #define GTA01Bv4_SYSTEM_REV   0x00000240
- /* Backlight */
-+
-+extern void gta01bl_deferred_resume(void);
-+
- struct gta01bl_machinfo {
-       unsigned int default_intensity;
-       unsigned int max_intensity;
-       unsigned int limit_mask;
-+      unsigned int defer_resume_backlight;
- };
- /* Definitions common to all revisions */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1267-gta01-uart-fifo-trigger-sooner.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1267-gta01-uart-fifo-trigger-sooner.patch.patch
deleted file mode 100644 (file)
index 115e2b8..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2d68fa06d5cfcf38ce9bd551b478dab408141cce Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Fri, 8 Aug 2008 13:25:02 +0100
-Subject: [PATCH] gta01-uart-fifo-trigger-sooner.patch
-
-    Set the UART FIFO to trigger earlier on the GTA01 device to minimize
-    UART overruns from the GSM.
-
-    Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- arch/arm/mach-s3c2410/mach-gta01.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index 9e42df0..4927cd4 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -87,6 +87,8 @@ static struct map_desc gta01_iodesc[] __initdata = {
- #define UCON S3C2410_UCON_DEFAULT
- #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
- #define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
-+/* UFCON for the gta01 sets the FIFO trigger level at 4, not 8 */
-+#define UFCON_GTA01_PORT0 S3C2410_UFCON_FIFOMODE
- static struct s3c2410_uartcfg gta01_uartcfgs[] = {
-       [0] = {
-@@ -94,7 +96,7 @@ static struct s3c2410_uartcfg gta01_uartcfgs[] = {
-               .flags       = 0,
-               .ucon        = UCON,
-               .ulcon       = ULCON,
--              .ufcon       = UFCON,
-+              .ufcon       = UFCON_GTA01_PORT0,
-       },
-       [1] = {
-               .hwport      = 1,
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1268-checkpatch-fixes.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1268-checkpatch-fixes.patch.patch
deleted file mode 100644 (file)
index 079bb4d..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-From 56b0a181e5339ac0f3758581d3d6f2367194dc21 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 8 Aug 2008 13:57:54 +0100
-Subject: [PATCH] checkpatch-fixes.patch
-
-This cleans out some random externs in C files that checkpatch does not like
-and introduces a couple of .h files to contain them.  Plus some other minor
-checkpatch style complaints.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2410/mach-gta01.c     |    4 ++--
- arch/arm/mach-s3c2440/mach-gta02.c     |    4 ++--
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |    6 +-----
- drivers/video/backlight/gta01_bl.c     |    2 +-
- 4 files changed, 6 insertions(+), 10 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index 4927cd4..a364b76 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -73,6 +73,8 @@
- #include <asm/plat-s3c24xx/pm.h>
- #include <asm/plat-s3c24xx/udc.h>
- #include <asm/plat-s3c24xx/neo1973.h>
-+#include <asm/arch-s3c2410/neo1973-pm-gsm.h>
-+
- #include <linux/jbt6k74.h>
- static struct map_desc gta01_iodesc[] __initdata = {
-@@ -666,8 +668,6 @@ static void __init gta01_map_io(void)
-       s3c24xx_init_uarts(gta01_uartcfgs, ARRAY_SIZE(gta01_uartcfgs));
- }
--extern int gta_gsm_interrupts;
--
- static irqreturn_t gta01_modem_irq(int irq, void *param)
- {
-       printk(KERN_DEBUG "GSM wakeup interrupt (IRQ %d)\n", irq);
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 1d7d262..f991f9a 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -76,6 +76,8 @@
- #include <asm/plat-s3c24xx/pm.h>
- #include <asm/plat-s3c24xx/udc.h>
- #include <asm/plat-s3c24xx/neo1973.h>
-+#include <asm/arch-s3c2410/neo1973-pm-gsm.h>
-+
- #include <linux/jbt6k74.h>
- #include <linux/glamofb.h>
-@@ -1531,8 +1533,6 @@ static void __init gta02_map_io(void)
-       s3c24xx_init_uarts(gta02_uartcfgs, ARRAY_SIZE(gta02_uartcfgs));
- }
--extern int gta_gsm_interrupts;
--
- static irqreturn_t gta02_modem_irq(int irq, void *param)
- {
-       printk(KERN_DEBUG "modem wakeup interrupt\n");
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index 68b7111..c15998d 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -18,12 +18,12 @@
- #include <linux/console.h>
- #include <linux/errno.h>
- #include <linux/interrupt.h>
--#include <linux/resume-dependency.h>
- #include <asm/gpio.h>
- #include <asm/mach-types.h>
- #include <asm/arch/gta01.h>
- #include <asm/plat-s3c24xx/neo1973.h>
-+#include <asm/arch/s3c24xx-serial.h>
- #ifdef CONFIG_MACH_NEO1973_GTA02
- #include <asm/arch/gta02.h>
-@@ -31,10 +31,6 @@
- #include <asm/arch/regs-gpioj.h>
- #endif
--extern void s3c24xx_serial_console_set_silence(int silence);
--extern void s3c24xx_serial_register_resume_dependency(struct resume_dependency *
--                                           resume_dependency, int uart_index);
--
- int gta_gsm_interrupts;
- EXPORT_SYMBOL(gta_gsm_interrupts);
-diff --git a/drivers/video/backlight/gta01_bl.c b/drivers/video/backlight/gta01_bl.c
-index 34c19c8..a7170df 100644
---- a/drivers/video/backlight/gta01_bl.c
-+++ b/drivers/video/backlight/gta01_bl.c
-@@ -152,7 +152,7 @@ EXPORT_SYMBOL_GPL(gta01bl_deferred_resume);
- static int gta01bl_resume(struct platform_device *dev)
- {
--      if (! gta01bl_defer_resume_backlight)
-+      if (!gta01bl_defer_resume_backlight)
-               gta01bl_deferred_resume();
-       return 0;
- }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1269-add-includes-from-checkpatch-fixes.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1269-add-includes-from-checkpatch-fixes.patch.patch
deleted file mode 100644 (file)
index 0d61447..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From 241f69c55ee8f5dd067ebd2d51aa9fdedb212759 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 8 Aug 2008 14:08:00 +0100
-Subject: [PATCH] add-includes-from-checkpatch-fixes.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- include/asm-arm/arch-s3c2410/neo1973-pm-gsm.h |    1 +
- include/asm-arm/arch-s3c2410/s3c24xx-serial.h |    5 +++++
- 2 files changed, 6 insertions(+), 0 deletions(-)
- create mode 100644 include/asm-arm/arch-s3c2410/neo1973-pm-gsm.h
- create mode 100644 include/asm-arm/arch-s3c2410/s3c24xx-serial.h
-
-diff --git a/include/asm-arm/arch-s3c2410/neo1973-pm-gsm.h b/include/asm-arm/arch-s3c2410/neo1973-pm-gsm.h
-new file mode 100644
-index 0000000..07c0728
---- /dev/null
-+++ b/include/asm-arm/arch-s3c2410/neo1973-pm-gsm.h
-@@ -0,0 +1 @@
-+extern int gta_gsm_interrupts;
-diff --git a/include/asm-arm/arch-s3c2410/s3c24xx-serial.h b/include/asm-arm/arch-s3c2410/s3c24xx-serial.h
-new file mode 100644
-index 0000000..4a95d7d
---- /dev/null
-+++ b/include/asm-arm/arch-s3c2410/s3c24xx-serial.h
-@@ -0,0 +1,5 @@
-+#include <linux/resume-dependency.h>
-+
-+extern void s3c24xx_serial_console_set_silence(int silence);
-+extern void s3c24xx_serial_register_resume_dependency(struct resume_dependency *
-+                                           resume_dependency, int uart_index);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1270-fix-no-discharging.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1270-fix-no-discharging.patch.patch
deleted file mode 100644 (file)
index 5d878c2..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-From 2438a8c74c495c95f5b78301a44ed8e8d0b267d5 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sat, 9 Aug 2008 09:43:32 +0100
-Subject: [PATCH] fix-no-discharging.patch
-
-We failed to report status of "discharging", instead reporting
-"not charging" even if we knew that the charger was not present.
-
-This patch corrects it and reports "discharging" when charger
-is absent.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/power/bq27000_battery.c |   10 +++++++++-
- 1 files changed, 9 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/power/bq27000_battery.c b/drivers/power/bq27000_battery.c
-index 4c7e862..cd4968e 100644
---- a/drivers/power/bq27000_battery.c
-+++ b/drivers/power/bq27000_battery.c
-@@ -187,9 +187,17 @@ static int bq27000_battery_get_property(struct power_supply *psy,
-                               val->intval = POWER_SUPPLY_STATUS_CHARGING;
-                               break;
-                       }
-+                      val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
-+                      break;
-               }
--              val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
-+              /*
-+               * platform provided definite indication of charger presence,
-+               * and it is telling us it isn't there... but we are on so we
-+               * must be running from battery --->
-+               */
-+
-+              val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
-               break;
- use_bat:
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1271-always-call-resume-dependencies.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1271-always-call-resume-dependencies.patch.patch
deleted file mode 100644 (file)
index f484734..0000000
+++ /dev/null
@@ -1,255 +0,0 @@
-From 36879992de8774cbf8686740bbda383cc6fbdcbb Mon Sep 17 00:00:00 2001
-From: \\\\\\\"Mike (mwester)\\\\\\ <mwester@dls.net>
-Date: Mon, 11 Aug 2008 20:16:09 +0100
-Subject: [PATCH] always-call-resume-dependencies.patch
-
-Attached is a patch that has greatly reduced the frequency of failures
-to resume (due to an oops from the glamo resume handler), and the
-dreaded "white screen after resume".  I can't say that it fixes all of
-these, although I have yet to see the white-screen since applying this
-patch and suspending/resuming several hundred times (with the 30-second
-suspend on the 2008.8 image and the endless stream of GSM error messages
-generated by something in that image, it has proved to be very useful to
-do an automated stress test!)
-
-This patch will apply to stable, and should make stable slightly more,
-well, "stable".
-
-[Feel free to remove the debug messages if someone feels strongly about
-that; I left them in because I think they might be useful in triaging
-further crashes; I'm not at all convinced that this patch will fix all
-the cases of resume failures.]
-
-[[And, yes, this is ugly, really ugly.]]
-
-[[[Oh yeah - there's still one extreme case that will result in an oops:
- if a dependent driver is built as a module, and it is unloaded, and it
-happened that the preceding suspend/resume was aborted, and that abort
-happened between the dependent driver and the driver upon which it is
-dependent, then a list entry will be left behind referencing the
-unloaded module.  There's just no good way to fix that given the way the
-resume dependency plumbing is connected up right now, so just avoid
-using modules for any of the drivers involved in the resume dependency
-stuff.]]]
-
-Regards,
-Mike (mwester)
-commit 905d2fc9c45f622418ce9ef4e67c23453aab7571
-Author: Mike Westerhof <mwester@dls.net>
-Date:   Mon Aug 11 11:11:25 2008 -0500
-
-    always-call-resume-dependencies.patch
-
-    Ensure that a dependent resume handler is always executed,
-    even if the resume handler for driver upon which it is
-    dependent never suspends (and therefore never resumes either).
-    Also make sure that we do not end up with duplicate
-    dependencies registered, something that can happen if the
-    suspend is aborted due to driver failure or an early resume
-    (such as occurs when the GSM interrupts during suspend).
-
-    Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- drivers/i2c/chips/pcf50633.c      |    6 +++++
- drivers/mfd/glamo/glamo-core.c    |    5 ++++
- drivers/mfd/glamo/glamo-core.h    |    1 +
- drivers/serial/s3c2410.c          |    7 ++++++
- include/linux/resume-dependency.h |   38 ++++++++++++++++++++++++++++++++++++-
- 5 files changed, 56 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 98c254c..b90ea8c 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -183,6 +183,7 @@ struct pcf50633_data {
-       } standby_regs;
-       struct resume_dependency resume_dependency;
-+      int is_suspended;
- #endif
- };
-@@ -2366,6 +2367,8 @@ void pcf50633_register_resume_dependency(struct pcf50633_data *pcf,
-                                       struct resume_dependency *dep)
- {
-       register_resume_dependency(&pcf->resume_dependency, dep);
-+      if (pcf->is_suspended)
-+              activate_all_resume_dependencies(&pcf->resume_dependency);
- }
- EXPORT_SYMBOL_GPL(pcf50633_register_resume_dependency);
-@@ -2462,6 +2465,8 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       mutex_unlock(&pcf->lock);
-+      pcf->is_suspended = 1;
-+      activate_all_resume_dependencies(&pcf->resume_dependency);
-       return 0;
- }
-@@ -2590,6 +2595,7 @@ static int pcf50633_resume(struct device *dev)
-       get_device(&pcf->client.dev);
-       pcf50633_work(&pcf->work);
-+      pcf->is_suspended = 0;
-       callback_all_resume_dependencies(&pcf->resume_dependency);
-       return 0;
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index c094a8c..e310382 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -1248,6 +1248,8 @@ void glamo_register_resume_dependency(struct resume_dependency *
- {
-       register_resume_dependency(&glamo_handle->resume_dependency,
-                                                            resume_dependency);
-+      if (glamo_handle->is_suspended)
-+              activate_all_resume_dependencies(&glamo_handle->resume_dependency);
- }
- EXPORT_SYMBOL_GPL(glamo_register_resume_dependency);
-@@ -1255,12 +1257,15 @@ EXPORT_SYMBOL_GPL(glamo_register_resume_dependency);
- static int glamo_suspend(struct platform_device *pdev, pm_message_t state)
- {
-       glamo_power(glamo_handle, GLAMO_POWER_SUSPEND);
-+      glamo_handle->is_suspended = 1;
-+      activate_all_resume_dependencies(&glamo_handle->resume_dependency);
-       return 0;
- }
- static int glamo_resume(struct platform_device *pdev)
- {
-       glamo_power(glamo_handle, GLAMO_POWER_ON);
-+      glamo_handle->is_suspended = 0;
-       callback_all_resume_dependencies(&glamo_handle->resume_dependency);
-       return 0;
-diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h
-index d3f4309..ac5eacf 100644
---- a/drivers/mfd/glamo/glamo-core.h
-+++ b/drivers/mfd/glamo/glamo-core.h
-@@ -32,6 +32,7 @@ struct glamo_core {
-       struct resume_dependency resume_dependency;
-       u32 engine_enabled_bitfield;
-       u32 engine_enabled_bitfield_suspend;
-+      int is_suspended;
- };
- struct glamo_script {
-diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
-index 2a388cf..3b1c07b 100644
---- a/drivers/serial/s3c2410.c
-+++ b/drivers/serial/s3c2410.c
-@@ -116,6 +116,7 @@ struct s3c24xx_uart_port {
-       struct uart_port                port;
-       struct resume_dependency        resume_dependency;
-+      int                             is_suspended;
- };
-@@ -1188,10 +1189,13 @@ static int s3c24xx_serial_remove(struct platform_device *dev)
- static int s3c24xx_serial_suspend(struct platform_device *dev, pm_message_t state)
- {
-       struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);
-+      struct s3c24xx_uart_port *ourport = to_ourport(port);
-       if (port)
-               uart_suspend_port(&s3c24xx_uart_drv, port);
-+      activate_all_resume_dependencies(&ourport->resume_dependency);
-+      ourport->is_suspended = 1;
-       return 0;
- }
-@@ -1202,6 +1206,8 @@ void s3c24xx_serial_register_resume_dependency(struct resume_dependency *
-       register_resume_dependency(&ourport->resume_dependency,
-                                                            resume_dependency);
-+      if (ourport->is_suspended)
-+              activate_all_resume_dependencies(&ourport->resume_dependency);
- }
- EXPORT_SYMBOL(s3c24xx_serial_register_resume_dependency);
-@@ -1218,6 +1224,7 @@ static int s3c24xx_serial_resume(struct platform_device *dev)
-               uart_resume_port(&s3c24xx_uart_drv, port);
-       }
-+      ourport->is_suspended = 0;
-       callback_all_resume_dependencies(&ourport->resume_dependency);
-       return 0;
-diff --git a/include/linux/resume-dependency.h b/include/linux/resume-dependency.h
-index e0c0f33..959cadd 100644
---- a/include/linux/resume-dependency.h
-+++ b/include/linux/resume-dependency.h
-@@ -38,6 +38,7 @@ struct resume_dependency {
-  */
- #define init_resume_dependency_list(_head) \
-+      printk(KERN_ERR "##### init_resume_dependency_list(head=%p)\n", (_head)); \
-       INIT_LIST_HEAD(&(_head)->list);
-@@ -48,7 +49,18 @@ struct resume_dependency {
-  */
- #define register_resume_dependency(_head, _dep) { \
--      (_dep)->called_flag = 0; \
-+      struct list_head *_pos, *_q; \
-+      struct resume_dependency *_d; \
-+\
-+      printk(KERN_ERR "##### register_resume_dependency(head=%p, dep=%p)\n", (_head), (_dep)); \
-+      (_dep)->called_flag = 1; \
-+      list_for_each_safe(_pos, _q, &((_head)->list)) { \
-+              _d = list_entry(_pos, struct resume_dependency, list); \
-+              if (_d == (_dep)) { \
-+                      list_del(_pos); \
-+                      printk(KERN_ERR "#####   duplicate dependency removed first\n"); \
-+              } \
-+      } \
-       list_add(&(_dep)->list, &(_head)->list); \
- }
-@@ -61,14 +73,38 @@ struct resume_dependency {
-       struct list_head *_pos, *_q; \
-       struct resume_dependency *_dep; \
- \
-+      printk(KERN_ERR "##### callback_all_resume_dependencies(head=%p)\n", (_head)); \
-       list_for_each_safe(_pos, _q, &((_head)->list)) { \
-               _dep = list_entry(_pos, struct resume_dependency, list); \
-+              printk(KERN_ERR "#####   callback list entry (head=%p, dep=%p)\n", (_head), (_dep)); \
-               _dep->called_flag = 1; \
-+              printk(KERN_ERR "#####      callback=%p(context=%p))\n", (_dep->callback),(_dep->context)); \
-               (_dep->callback)(_dep->context); \
-               list_del(_pos); \
-       } \
- }
-+/* When a dependency is added, it is not actually active; the dependent resume
-+ * handler will function as normal.  The dependency is activated by the suspend
-+ * handler for the driver that will be doing the callbacks.  This ensures that
-+ * if the suspend is aborted for any reason (error, driver busy, etc), that all
-+ * suspended drivers will resume, even if the driver upon which they are dependent
-+ * did not suspend, and hence will not resume, and thus would be unable to perform
-+ * the callbacks.
-+ */
-+
-+#define activate_all_resume_dependencies(_head) { \
-+      struct list_head *_pos, *_q; \
-+      struct resume_dependency *_dep; \
-+\
-+      printk(KERN_ERR "##### activate_all_resume_dependencies(head=%p)\n", (_head)); \
-+      list_for_each_safe(_pos, _q, &((_head)->list)) { \
-+              _dep = list_entry(_pos, struct resume_dependency, list); \
-+              printk(KERN_ERR "#####   activating callback list entry (head=%p, dep=%p)\n", (_head), (_dep)); \
-+              _dep->called_flag = 0; \
-+      } \
-+}
-+
- /* if your resume action is dependent on multiple drivers being resumed already,
-  * register the same callback with each driver you are dependent on, and check
-  * .called_flag for all of the struct resume_dependency.  When they are all 1
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1272-clean-remove-suspend-dependencies-syslog.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1272-clean-remove-suspend-dependencies-syslog.patch.patch
deleted file mode 100644 (file)
index 5501426..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-From 04c9c142a341af62081e856d32149d9f544dbfbe Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Mon, 11 Aug 2008 20:49:56 +0100
-Subject: [PATCH] clean-remove-suspend-dependencies-syslog.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- include/linux/resume-dependency.h |   17 ++++-------------
- 1 files changed, 4 insertions(+), 13 deletions(-)
-
-diff --git a/include/linux/resume-dependency.h b/include/linux/resume-dependency.h
-index 959cadd..e284739 100644
---- a/include/linux/resume-dependency.h
-+++ b/include/linux/resume-dependency.h
-@@ -38,7 +38,6 @@ struct resume_dependency {
-  */
- #define init_resume_dependency_list(_head) \
--      printk(KERN_ERR "##### init_resume_dependency_list(head=%p)\n", (_head)); \
-       INIT_LIST_HEAD(&(_head)->list);
-@@ -52,14 +51,11 @@ struct resume_dependency {
-       struct list_head *_pos, *_q; \
-       struct resume_dependency *_d; \
- \
--      printk(KERN_ERR "##### register_resume_dependency(head=%p, dep=%p)\n", (_head), (_dep)); \
-       (_dep)->called_flag = 1; \
-       list_for_each_safe(_pos, _q, &((_head)->list)) { \
-               _d = list_entry(_pos, struct resume_dependency, list); \
--              if (_d == (_dep)) { \
-+              if (_d == (_dep)) \
-                       list_del(_pos); \
--                      printk(KERN_ERR "#####   duplicate dependency removed first\n"); \
--              } \
-       } \
-       list_add(&(_dep)->list, &(_head)->list); \
- }
-@@ -73,12 +69,9 @@ struct resume_dependency {
-       struct list_head *_pos, *_q; \
-       struct resume_dependency *_dep; \
- \
--      printk(KERN_ERR "##### callback_all_resume_dependencies(head=%p)\n", (_head)); \
-       list_for_each_safe(_pos, _q, &((_head)->list)) { \
-               _dep = list_entry(_pos, struct resume_dependency, list); \
--              printk(KERN_ERR "#####   callback list entry (head=%p, dep=%p)\n", (_head), (_dep)); \
-               _dep->called_flag = 1; \
--              printk(KERN_ERR "#####      callback=%p(context=%p))\n", (_dep->callback),(_dep->context)); \
-               (_dep->callback)(_dep->context); \
-               list_del(_pos); \
-       } \
-@@ -88,19 +81,17 @@ struct resume_dependency {
-  * handler will function as normal.  The dependency is activated by the suspend
-  * handler for the driver that will be doing the callbacks.  This ensures that
-  * if the suspend is aborted for any reason (error, driver busy, etc), that all
-- * suspended drivers will resume, even if the driver upon which they are dependent
-- * did not suspend, and hence will not resume, and thus would be unable to perform
-- * the callbacks.
-+ * suspended drivers will resume, even if the driver upon which they are
-+ * dependent did not suspend, and hence will not resume, and thus would be
-+ * unable to perform the callbacks.
-  */
- #define activate_all_resume_dependencies(_head) { \
-       struct list_head *_pos, *_q; \
-       struct resume_dependency *_dep; \
- \
--      printk(KERN_ERR "##### activate_all_resume_dependencies(head=%p)\n", (_head)); \
-       list_for_each_safe(_pos, _q, &((_head)->list)) { \
-               _dep = list_entry(_pos, struct resume_dependency, list); \
--              printk(KERN_ERR "#####   activating callback list entry (head=%p, dep=%p)\n", (_head), (_dep)); \
-               _dep->called_flag = 0; \
-       } \
- }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1273-clean-checkpatch-gsm-resume-dep.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1273-clean-checkpatch-gsm-resume-dep.patch.patch
deleted file mode 100644 (file)
index ef4fb87..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-From 88bf43840b9df0eb0a077a1394eb564be80a412e Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Mon, 11 Aug 2008 20:50:05 +0100
-Subject: [PATCH] clean-checkpatch-gsm-resume-dep.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-core.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index e310382..b30ec9f 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -1249,7 +1249,8 @@ void glamo_register_resume_dependency(struct resume_dependency *
-       register_resume_dependency(&glamo_handle->resume_dependency,
-                                                            resume_dependency);
-       if (glamo_handle->is_suspended)
--              activate_all_resume_dependencies(&glamo_handle->resume_dependency);
-+              activate_all_resume_dependencies(
-+                                            &glamo_handle->resume_dependency);
- }
- EXPORT_SYMBOL_GPL(glamo_register_resume_dependency);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1274-mach-gta02-spell-fixes.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1274-mach-gta02-spell-fixes.patch.patch
deleted file mode 100644 (file)
index d5bf3d7..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-From d2703a13c696b5e4befbd17469bc6afd3d0a0066 Mon Sep 17 00:00:00 2001
-From: Simon Kagstrom <simon.kagstrom@gmail.com>
-Date: Wed, 13 Aug 2008 11:27:04 +0100
-Subject: [PATCH] mach-gta02-spell-fixes.patch
-
-Fix spelling error on function name
-
-Signed-off-by: Simon Kagstrom <simon.kagstrom@gmail.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index f991f9a..ff3c3c0 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1053,7 +1053,7 @@ static struct platform_device gta02_vibrator_dev = {
- struct lis302dl_platform_data lis302_pdata[];
--void gat02_lis302dl_bitbang_read(struct lis302dl_info *lis)
-+void gta02_lis302dl_bitbang_read(struct lis302dl_info *lis)
- {
-       struct lis302dl_platform_data *pdata = lis->pdata;
-       u8 shifter = 0xc0 | LIS302DL_REG_OUT_X; /* read, autoincrement */
-@@ -1136,7 +1136,7 @@ void gat02_lis302dl_bitbang_read(struct lis302dl_info *lis)
- }
--void gat02_lis302dl_suspend_io(struct lis302dl_info *lis, int resume)
-+void gta02_lis302dl_suspend_io(struct lis302dl_info *lis, int resume)
- {
-       struct lis302dl_platform_data *pdata = lis->pdata;
-@@ -1168,8 +1168,8 @@ struct lis302dl_platform_data lis302_pdata[] = {
-               .pin_mosi       = S3C2410_GPG6,
-               .pin_miso       = S3C2410_GPG5,
-               .open_drain     = 1, /* altered at runtime by PCB rev */
--              .lis302dl_bitbang_read = gat02_lis302dl_bitbang_read,
--              .lis302dl_suspend_io = gat02_lis302dl_suspend_io,
-+              .lis302dl_bitbang_read = gta02_lis302dl_bitbang_read,
-+              .lis302dl_suspend_io = gta02_lis302dl_suspend_io,
-       }, {
-               .name           = "lis302-2 (bottom)",
-               .pin_chip_select= S3C2410_GPD13,
-@@ -1177,8 +1177,8 @@ struct lis302dl_platform_data lis302_pdata[] = {
-               .pin_mosi       = S3C2410_GPG6,
-               .pin_miso       = S3C2410_GPG5,
-               .open_drain     = 1, /* altered at runtime by PCB rev */
--              .lis302dl_bitbang_read = gat02_lis302dl_bitbang_read,
--              .lis302dl_suspend_io = gat02_lis302dl_suspend_io,
-+              .lis302dl_bitbang_read = gta02_lis302dl_bitbang_read,
-+              .lis302dl_suspend_io = gta02_lis302dl_suspend_io,
-       },
- };
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1275-lis302dl-allow-unloading-module.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1275-lis302dl-allow-unloading-module.patch.patch
deleted file mode 100644 (file)
index fb7d233..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From 399efd68e115b6548fe943a7a9fbf04753970e61 Mon Sep 17 00:00:00 2001
-From: Simon Kagstrom <simon.kagstrom@gmail.com>
-Date: Wed, 13 Aug 2008 11:27:11 +0100
-Subject: [PATCH] lis302dl-allow-unloading-module.patch
-
-This patch fixes module unloading for the accelerometer (actually module
-loading failed before). The two problems were that the interrupt was not
-unregistered, and that the device was left in a "strange" state.
-
-Signed-off-by: Simon Kagstrom <simon.kagstrom@gmail.com>
----
- drivers/input/misc/lis302dl.c |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
-index de8478d..b97cae7 100644
---- a/drivers/input/misc/lis302dl.c
-+++ b/drivers/input/misc/lis302dl.c
-@@ -462,11 +462,15 @@ static int __devexit lis302dl_remove(struct spi_device *spi)
-       struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-       unsigned long flags;
--      /* power down the device */
-+      /* Reset and power down the device */
-       local_save_flags(flags);
-+      reg_write(lis, LIS302DL_REG_CTRL3, 0x00);
-+      reg_write(lis, LIS302DL_REG_CTRL2, 0x00);
-       reg_write(lis, LIS302DL_REG_CTRL1, 0x00);
-       local_irq_restore(flags);
-+      /* Cleanup resources */
-+      free_irq(lis->spi_dev->irq, lis);
-       sysfs_remove_group(&spi->dev.kobj, &lis302dl_attr_group);
-       input_unregister_device(lis->input_dev);
-       if (lis->input_dev)
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1276-lis302dl-add-wakeup-defs.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1276-lis302dl-add-wakeup-defs.patch.patch
deleted file mode 100644 (file)
index 22a1371..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-From 163a30f5ffcc4e7af9781bd6695fdc7b27d254f9 Mon Sep 17 00:00:00 2001
-From: Simon Kagstrom <simon.kagstrom@gmail.com>
-Date: Wed, 13 Aug 2008 11:27:24 +0100
-Subject: [PATCH] lis302dl-add-wakeup-defs.patch
-
-Add definitions for the rest of the wakeup defs and also change FFWUSRC1
-to FFWUSRC - there are two of these which are identical.
-
-Signed-off-by: Simon Kagstrom <simon.kagstrom@gmail.com>
----
- include/linux/lis302dl.h |   32 ++++++++++++++++++++++++--------
- 1 files changed, 24 insertions(+), 8 deletions(-)
-
-diff --git a/include/linux/lis302dl.h b/include/linux/lis302dl.h
-index 4d8ded9..e4a44f5 100644
---- a/include/linux/lis302dl.h
-+++ b/include/linux/lis302dl.h
-@@ -91,14 +91,30 @@ enum lis302dl_reg_status {
-       LIS302DL_STATUS_XYZOR           = 0x80,
- };
--enum lis302dl_reg_ffwusrc1 {
--      LIS302DL_FFWUSRC1_XL            = 0x01,
--      LIS302DL_FFWUSRC1_XH            = 0x02,
--      LIS302DL_FFWUSRC1_YL            = 0x04,
--      LIS302DL_FFWUSRC1_YH            = 0x08,
--      LIS302DL_FFWUSRC1_ZL            = 0x10,
--      LIS302DL_FFWUSRC1_ZH            = 0x20,
--      LIS302DL_FFWUSRC1_IA            = 0x40,
-+/* Wakeup/freefall interrupt defs */
-+enum lis302dl_reg_ffwucfg {
-+      LIS302DL_FFWUCFG_XLIE           = 0x01,
-+      LIS302DL_FFWUCFG_XHIE           = 0x02,
-+      LIS302DL_FFWUCFG_YLIE           = 0x04,
-+      LIS302DL_FFWUCFG_YHIE           = 0x08,
-+      LIS302DL_FFWUCFG_ZLIE           = 0x10,
-+      LIS302DL_FFWUCFG_ZHIE           = 0x20,
-+      LIS302DL_FFWUCFG_LIR            = 0x40,
-+      LIS302DL_FFWUCFG_AOI            = 0x80,
-+};
-+
-+enum lis302dl_reg_ffwuths {
-+      LIS302DL_FFWUTHS_DCRM           = 0x80,
-+};
-+
-+enum lis302dl_reg_ffwusrc {
-+      LIS302DL_FFWUSRC_XL             = 0x01,
-+      LIS302DL_FFWUSRC_XH             = 0x02,
-+      LIS302DL_FFWUSRC_YL             = 0x04,
-+      LIS302DL_FFWUSRC_YH             = 0x08,
-+      LIS302DL_FFWUSRC_ZL             = 0x10,
-+      LIS302DL_FFWUSRC_ZH             = 0x20,
-+      LIS302DL_FFWUSRC_IA             = 0x40,
- };
- enum lis302dl_reg_cloik_src {
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1277-From-98d97ee93af676f7d6d0bf55aaae17e11304598a-Mon-Se.patch b/target/linux/s3c24xx/patches-2.6.24/1277-From-98d97ee93af676f7d6d0bf55aaae17e11304598a-Mon-Se.patch
deleted file mode 100644 (file)
index 500419c..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-From dca223223da5ebcea80f04b90e2fd7665bed5fb2 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Wed, 13 Aug 2008 11:27:37 +0100
-Subject: [PATCH] From 98d97ee93af676f7d6d0bf55aaae17e11304598a Mon Sep 17 00:00:00 2001
- Subject: [PATCH] Revert "s3c2440-nand-disable-hwecc.patch"
-
-This reverts commit 1d89da736ed33d3f7c398fb9f8dfddecb7c7c7a9.
----
- drivers/mtd/nand/s3c2410.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
-index f7dd4e0..495381c 100644
---- a/drivers/mtd/nand/s3c2410.c
-+++ b/drivers/mtd/nand/s3c2410.c
-@@ -656,7 +656,7 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,
-       nmtd->mtd.owner    = THIS_MODULE;
-       nmtd->set          = set;
--      if (info->cpu_type == TYPE_S3C2410 && hardware_ecc) {
-+      if (hardware_ecc) {
-               chip->ecc.calculate = s3c2410_nand_calculate_ecc;
-               chip->ecc.correct   = s3c2410_nand_correct_data;
-               chip->ecc.mode      = NAND_ECC_HW;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1278-From-ca800f8b234299c56530e56018c031957c5c7ffb-Mon-Se.patch b/target/linux/s3c24xx/patches-2.6.24/1278-From-ca800f8b234299c56530e56018c031957c5c7ffb-Mon-Se.patch
deleted file mode 100644 (file)
index 269d8ea..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From ddf2ace51e940559c1fdc0e265624236fbe59ad5 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Wed, 13 Aug 2008 11:27:47 +0100
-Subject: [PATCH] From ca800f8b234299c56530e56018c031957c5c7ffb Mon Sep 17 00:00:00 2001
- Subject: [PATCH] [gta02] Disable the NAND debugging as it would print every hardware ECC
-
----
- defconfig-2.6.24 |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index cfe7f57..b875979 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -726,7 +726,7 @@ CONFIG_MTD_NAND_VERIFY_WRITE=y
- # CONFIG_MTD_NAND_MUSEUM_IDS is not set
- CONFIG_MTD_NAND_IDS=y
- CONFIG_MTD_NAND_S3C2410=y
--CONFIG_MTD_NAND_S3C2410_DEBUG=y
-+# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
- CONFIG_MTD_NAND_S3C2410_HWECC=y
- # CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
- # CONFIG_MTD_NAND_DISKONCHIP is not set
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1279-From-5ee1ee9e1c8a652b0f9cde72ad5e547db87d4d67-Mon-Se.patch b/target/linux/s3c24xx/patches-2.6.24/1279-From-5ee1ee9e1c8a652b0f9cde72ad5e547db87d4d67-Mon-Se.patch
deleted file mode 100644 (file)
index 2c364e3..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-From cb3cc53a76c7f1f7c827d048db7a849e77071515 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Wed, 13 Aug 2008 11:28:00 +0100
-Subject: [PATCH] From 5ee1ee9e1c8a652b0f9cde72ad5e547db87d4d67 Mon Sep 17 00:00:00 2001
- Subject: [PATCH] [gta02] Disable hardware ECC unless we get instructed to enable it
-      This is restoring the old behavior in regard to ECC. Even if
-      hardware ECC was compiled in we didn't use it. Make this a runtime
-      option. If the bootloader passes hardware_ecc we will enable the
-      hardware ECC for real.
-
----
- arch/arm/mach-s3c2440/mach-gta02.c |   19 +++++++++++++++++++
- drivers/mtd/nand/s3c2410.c         |    2 +-
- include/asm-arm/plat-s3c/nand.h    |    3 +++
- 3 files changed, 23 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index ff3c3c0..7d4cc67 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -882,6 +882,7 @@ static struct s3c2410_platform_nand gta02_nand_info = {
-       .twrph1         = 20,
-       .nr_sets        = ARRAY_SIZE(gta02_nand_sets),
-       .sets           = gta02_nand_sets,
-+      .software_ecc   = 1,
- };
- static struct s3c24xx_mci_pdata gta02_mmc_cfg = {
-@@ -1546,6 +1547,20 @@ static irqreturn_t ar6000_wow_irq(int irq, void *param)
-       return IRQ_HANDLED;
- }
-+/*
-+ * hardware_ecc=1|0
-+ */
-+static char hardware_ecc_str[4] __initdata = "";
-+
-+static int __init hardware_ecc_setup(char *str)
-+{
-+      if (str)
-+              strlcpy(hardware_ecc_str, str, sizeof(hardware_ecc_str));
-+      return 1;
-+}
-+
-+__setup("hardware_ecc=", hardware_ecc_setup);
-+
- static void __init gta02_machine_init(void)
- {
-       int rc;
-@@ -1565,6 +1580,10 @@ static void __init gta02_machine_init(void)
-       spin_lock_init(&motion_irq_lock);
-+      /* do not force soft ecc if we are asked to use hardware_ecc */
-+      if (hardware_ecc_str[0] == '1')
-+              gta02_nand_info.software_ecc = 0;
-+
-       s3c_device_usb.dev.platform_data = &gta02_usb_info;
-       s3c_device_nand.dev.platform_data = &gta02_nand_info;
-       s3c_device_sdi.dev.platform_data = &gta02_mmc_cfg;
-diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
-index 495381c..4413d76 100644
---- a/drivers/mtd/nand/s3c2410.c
-+++ b/drivers/mtd/nand/s3c2410.c
-@@ -656,7 +656,7 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,
-       nmtd->mtd.owner    = THIS_MODULE;
-       nmtd->set          = set;
--      if (hardware_ecc) {
-+      if (!info->platform->software_ecc && hardware_ecc) {
-               chip->ecc.calculate = s3c2410_nand_calculate_ecc;
-               chip->ecc.correct   = s3c2410_nand_correct_data;
-               chip->ecc.mode      = NAND_ECC_HW;
-diff --git a/include/asm-arm/plat-s3c/nand.h b/include/asm-arm/plat-s3c/nand.h
-index cb87f9e..676a061 100644
---- a/include/asm-arm/plat-s3c/nand.h
-+++ b/include/asm-arm/plat-s3c/nand.h
-@@ -42,6 +42,9 @@ struct s3c2410_platform_nand {
-       int                     nr_sets;
-       struct s3c2410_nand_set *sets;
-+      /* force software_ecc at runtime */
-+      int     software_ecc;
-+
-       void                    (*select_chip)(struct s3c2410_nand_set *,
-                                              int chip);
- };
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1280-interface-for-configuring-freefall-wakeup-interrupts.patch b/target/linux/s3c24xx/patches-2.6.24/1280-interface-for-configuring-freefall-wakeup-interrupts.patch
deleted file mode 100644 (file)
index 3831831..0000000
+++ /dev/null
@@ -1,372 +0,0 @@
-From 69acbd477fb7024d2cfa3702036b92ecb6c8e7b5 Mon Sep 17 00:00:00 2001
-From: Simon Kagstrom <simon.kagstrom@gmail.com>
-Date: Fri, 15 Aug 2008 11:50:56 +0100
-Subject: [PATCH] interface for configuring freefall/wakeup interrupts for the accelerometers
-
-Hi!
-
-First: Unfortunately, the freerunner currently wakes up immediately on
-suspend when the accelerometer IRQ is selected as a wakeup source. I'm
-posting this for comments and if someone else wants to have a look at
-this problem.
-
-The patch should be safe to apply even though the sleep portion doesn't
-work - as long as it's configured it will not disturb anything.
-
-// Simon
---
-lis302dl-configure-wakeup-interrupts.patch
-
-From: simon.kagstrom <simon.kagstrom@gmail.com>
-
-First: Unfortunately, the freerunner currently wakes up immediately on
-suspend when the accelerometer IRQ is selected as a wakeup source.
-
-
-Add configuration of wakeup/freefall interrupts through a sysfs
-interface. Configuration is done through echoing a value of the
-form
-
-   X Y Z THRESHOLD DURATION SPEC
-
-to freefall_wakeup_1/2. X, Y and Z are threshold values, given as a
-value > 0, < 0 or 0 to specify if an interrupt should be generated for
-high or low thresholds or neither (off). THRESHOLD specifies the
-threshold that must be exceeded. DURATION specifies the time in
-milliseconds for which the acceleration should be measured. SPEC is
-either '1' or '0' and specifies if the thresholds should be taken all
-together or one at a time ('and' or 'or' mode).
-
-Echoing '0' to the file turns off the interrupts.
-
-Example:
-
-  echo "1 1 1 60 60 0" > freefall_wakeup_1   # Turn on x,y,z, 60ms/60 threshold, or-mode
-  echo "0" > freefall_wakeup_1 # Turn off interrupt
-
-The hardware supports two simulataneous wakeup sources to be configured,
-but the freerunner only connects one of the interrupt outputs. The patch
-exports both. Similarly, only the "top" accelerometer can be used as a
-wake-up source, and it's not possible to generate DATA_READY interrupts
-while the wakeup interrupts are active.
-
-Signed-off-by: Simon Kagstrom <simon.kagstrom@gmail.com>
----
- drivers/input/misc/lis302dl.c |  232 +++++++++++++++++++++++++++++++++++++++--
- include/linux/lis302dl.h      |    8 +-
- 2 files changed, 227 insertions(+), 13 deletions(-)
-
-diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
-index b97cae7..3f6d0eb 100644
---- a/drivers/input/misc/lis302dl.c
-+++ b/drivers/input/misc/lis302dl.c
-@@ -248,10 +248,212 @@ static ssize_t lis302dl_dump(struct device *dev, struct device_attribute *attr,
- }
- static DEVICE_ATTR(dump, S_IRUGO, lis302dl_dump, NULL);
-+static int freefall_ms_to_duration(struct lis302dl_info *lis, int ms)
-+{
-+      u_int8_t r = reg_read(lis, LIS302DL_REG_CTRL1);
-+
-+      /* If we have 400 ms sampling rate, the stepping is 2.5 ms,
-+       * on 100 ms the stepping is 10ms */
-+      if ( r & LIS302DL_CTRL1_DR ) {
-+              /* Too large */
-+              if (ms > 637)
-+                      return -1;
-+
-+              return (ms * 10) / 25;
-+      }
-+
-+      /* Too large value */
-+      if (ms > 2550)
-+                      return -1;
-+      return ms / 10;
-+}
-+
-+static int freefall_duration_to_ms(struct lis302dl_info *lis, int duration)
-+{
-+      u_int8_t r = reg_read(lis, LIS302DL_REG_CTRL1);
-+
-+      if ( r & LIS302DL_CTRL1_DR )
-+              return (duration * 25) / 10;
-+
-+      return duration * 10;
-+}
-+
-+/* Configure freefall/wakeup interrupts */
-+static ssize_t set_freefall_common(int which, struct device *dev, struct device_attribute *attr,
-+                       const char *buf, size_t count)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(dev);
-+      u_int8_t x_lo, y_lo, z_lo;
-+      u_int8_t x_hi, y_hi, z_hi;
-+      int duration;
-+      int threshold;
-+      int and_events;
-+      int r_ths = LIS302DL_REG_FF_WU_THS_1; /* registers, assume first pin */
-+      int r_duration = LIS302DL_REG_FF_WU_DURATION_1;
-+      int r_cfg = LIS302DL_REG_FF_WU_CFG_1;
-+      int flag_mask = LIS302DL_F_WUP_FF_1;
-+      int intmode = LIS302DL_INTMODE_FF_WU_1;
-+      int x, y, z;
-+      int ms;
-+      unsigned long flags;
-+
-+      /* Configure for second freefall/wakeup pin */
-+      if (which == 2) {
-+              r_ths = LIS302DL_REG_FF_WU_THS_2;
-+              r_duration = LIS302DL_REG_FF_WU_DURATION_2;
-+              r_cfg = LIS302DL_REG_FF_WU_CFG_2;
-+              flag_mask = LIS302DL_F_WUP_FF_2;
-+              intmode = LIS302DL_INTMODE_FF_WU_2;
-+
-+              printk(KERN_WARNING "Configuring second freefall / wakeup interrupt\n");
-+      }
-+
-+      /* Parse the input */
-+      if (strcmp(buf, "0\n") == 0)
-+      {
-+              /* Turn off the interrupt */
-+              local_save_flags(flags);
-+              if ( (lis->flags & LIS302DL_F_IRQ_WAKE) != 0 )
-+                      disable_irq_wake(lis->spi_dev->irq);
-+              lis302dl_int_mode(lis->spi_dev, which, LIS302DL_INTMODE_DATA_READY);
-+              lis->flags &= ~(flag_mask | LIS302DL_F_IRQ_WAKE);
-+
-+              reg_write(lis, r_cfg, 0);
-+              reg_write(lis, r_ths, 0);
-+              reg_write(lis, r_duration, 0);
-+
-+              /* Power off unless the input subsystem is using the device */
-+              if ( (lis->flags & LIS302DL_F_INPUT_OPEN) == 0 )
-+                      reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD, 0);
-+
-+              local_irq_restore(flags);
-+
-+              return count;
-+      }
-+
-+      if (sscanf(buf, "%d %d %d %d %d %d", &x, &y, &z, &threshold, &ms, &and_events) != 6)
-+              return -EINVAL;
-+
-+      duration = freefall_ms_to_duration(lis, ms);
-+      if (duration < 0)
-+              return -ERANGE;
-+
-+      /* 7 bits */
-+      if (threshold < 0 || threshold > 127)
-+              return -ERANGE;
-+
-+      /* Interrupt flags */
-+      x_lo = x < 0 ? LIS302DL_FFWUCFG_XLIE : 0;
-+      y_lo = y < 0 ? LIS302DL_FFWUCFG_YLIE : 0;
-+      z_lo = z < 0 ? LIS302DL_FFWUCFG_ZLIE : 0;
-+      x_hi = x > 0 ? LIS302DL_FFWUCFG_XHIE : 0;
-+      y_hi = y > 0 ? LIS302DL_FFWUCFG_YHIE : 0;
-+      z_hi = z > 0 ? LIS302DL_FFWUCFG_ZHIE : 0;
-+
-+      /* Setup the configuration registers */
-+      local_save_flags(flags);
-+      reg_write(lis, r_cfg, 0); /* First zero to get to a known state */
-+      reg_write(lis, r_cfg,
-+              (and_events ? LIS302DL_FFWUCFG_AOI : 0) |
-+              x_lo | x_hi | y_lo | y_hi | z_lo | z_hi);
-+      reg_write(lis, r_ths, threshold & ~LIS302DL_FFWUTHS_DCRM);
-+      reg_write(lis, r_duration, duration);
-+
-+      /* Route the interrupt for wakeup */
-+      lis302dl_int_mode(lis->spi_dev, which, intmode);
-+
-+      /* Power up the device and note that we want to wake up from
-+       * this interrupt */
-+      if ( (lis->flags & LIS302DL_F_IRQ_WAKE) == 0 )
-+              enable_irq_wake(lis->spi_dev->irq);
-+
-+      lis->flags |= flag_mask | LIS302DL_F_IRQ_WAKE;
-+      reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD,
-+                      LIS302DL_CTRL1_PD);
-+      local_irq_restore(flags);
-+
-+      return count;
-+}
-+
-+static ssize_t set_freefall_1(struct device *dev, struct device_attribute *attr,
-+                       const char *buf, size_t count)
-+{
-+      return set_freefall_common(1, dev, attr, buf, count);
-+}
-+static ssize_t set_freefall_2(struct device *dev, struct device_attribute *attr,
-+                       const char *buf, size_t count)
-+{
-+      return set_freefall_common(2, dev, attr, buf, count);
-+}
-+
-+
-+static ssize_t show_freefall_common(int which, struct device *dev,
-+              struct device_attribute *attr, char *buf)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(dev);
-+      u_int8_t duration;
-+      u_int8_t threshold;
-+      u_int8_t config;
-+      u_int8_t r4;
-+      u_int8_t r5;
-+      int r_ths = LIS302DL_REG_FF_WU_THS_1; /* registers, assume first pin */
-+      int r_duration = LIS302DL_REG_FF_WU_DURATION_1;
-+      int r_cfg = LIS302DL_REG_FF_WU_CFG_1;
-+      int r_src = LIS302DL_REG_FF_WU_SRC_1;
-+
-+      /* Configure second freefall/wakeup pin */
-+      if (which == 2) {
-+              r_ths = LIS302DL_REG_FF_WU_THS_2;
-+              r_duration = LIS302DL_REG_FF_WU_DURATION_2;
-+              r_cfg = LIS302DL_REG_FF_WU_CFG_2;
-+              r_src = LIS302DL_REG_FF_WU_SRC_2;
-+      }
-+      config = reg_read(lis, r_cfg);
-+      threshold = reg_read(lis, r_ths);
-+      duration = reg_read(lis, r_duration);
-+      r4 = reg_read(lis, r_src);
-+      r5 = reg_read(lis, LIS302DL_REG_CTRL3);
-+
-+      /* All events off? */
-+      if ((config & (LIS302DL_FFWUCFG_XLIE | LIS302DL_FFWUCFG_XHIE |
-+                      LIS302DL_FFWUCFG_YLIE | LIS302DL_FFWUCFG_YHIE |
-+                      LIS302DL_FFWUCFG_ZLIE | LIS302DL_FFWUCFG_ZHIE)) == 0)
-+              return sprintf(buf, "off\n");
-+
-+      return sprintf(buf,"%s events, %s interrupt, duration %d, threshold %d, "
-+                      "enabled: %s %s %s %s %s %s\n",
-+                      (config & LIS302DL_FFWUCFG_AOI) == 0 ? "or" : "and",
-+                      (config & LIS302DL_FFWUCFG_LIR) == 0 ? "don't latch" : "latch",
-+                      freefall_duration_to_ms(lis, duration), threshold,
-+                      (config & LIS302DL_FFWUCFG_XLIE) == 0 ? "---" : "xlo",
-+                      (config & LIS302DL_FFWUCFG_XHIE) == 0 ? "---" : "xhi",
-+                      (config & LIS302DL_FFWUCFG_YLIE) == 0 ? "---" : "ylo",
-+                      (config & LIS302DL_FFWUCFG_YHIE) == 0 ? "---" : "yhi",
-+                      (config & LIS302DL_FFWUCFG_ZLIE) == 0 ? "---" : "zlo",
-+                      (config & LIS302DL_FFWUCFG_ZHIE) == 0 ? "---" : "zhi");
-+}
-+
-+static ssize_t show_freefall_1(struct device *dev,
-+              struct device_attribute *attr, char *buf)
-+{
-+      return show_freefall_common(1, dev, attr, buf);
-+}
-+
-+static ssize_t show_freefall_2(struct device *dev,
-+              struct device_attribute *attr, char *buf)
-+{
-+      return show_freefall_common(2, dev, attr, buf);
-+}
-+
-+static DEVICE_ATTR(freefall_wakeup_1, S_IRUGO | S_IWUSR, show_freefall_1, set_freefall_1);
-+static DEVICE_ATTR(freefall_wakeup_2, S_IRUGO | S_IWUSR, show_freefall_2, set_freefall_2);
-+
- static struct attribute *lis302dl_sysfs_entries[] = {
-       &dev_attr_sample_rate.attr,
-       &dev_attr_full_scale.attr,
-       &dev_attr_dump.attr,
-+      &dev_attr_freefall_wakeup_1.attr,
-+      &dev_attr_freefall_wakeup_2.attr,
-       NULL
- };
-@@ -274,6 +476,8 @@ static int lis302dl_input_open(struct input_dev *inp)
-       reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, ctrl1, ctrl1);
-       local_irq_restore(flags);
-+      lis->flags |= LIS302DL_F_INPUT_OPEN;
-+
-       /* kick it off -- since we are edge triggered, if we missed the edge
-        * permanent low interrupt is death for us */
-       (lis->pdata->lis302dl_bitbang_read)(lis);
-@@ -294,6 +498,7 @@ static void lis302dl_input_close(struct input_dev *inp)
-        * only see close() for the close of the last user, we can safely
-        * disable the data ready events */
-       reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, ctrl1, 0x00);
-+      lis->flags &= ~LIS302DL_F_INPUT_OPEN;
-       /* however, don't power down the whole device if still needed */
-       if (!(lis->flags & LIS302DL_F_WUP_FF ||
-@@ -406,9 +611,9 @@ static int __devinit lis302dl_probe(struct spi_device *spi)
-       reg_write(lis, LIS302DL_REG_CTRL2, 0);
-       reg_write(lis, LIS302DL_REG_CTRL3, LIS302DL_CTRL3_PP_OD |
-                                                           LIS302DL_CTRL3_IHL);
--      reg_write(lis, LIS302DL_REG_FF_WU_THS_1, 0x14);
-+      reg_write(lis, LIS302DL_REG_FF_WU_THS_1, 0x0);
-       reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1, 0x00);
--      reg_write(lis, LIS302DL_REG_FF_WU_CFG_1, 0x95);
-+      reg_write(lis, LIS302DL_REG_FF_WU_CFG_1, 0x0);
-       /* start off in powered down mode; we power up when someone opens us */
-       reg_write(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_Xen |
-@@ -486,6 +691,12 @@ static int lis302dl_suspend(struct spi_device *spi, pm_message_t state)
- {
-       struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-       unsigned long flags;
-+      u_int8_t tmp;
-+
-+      /* determine if we want to wake up from the accel. */
-+      if (lis->flags & LIS302DL_F_WUP_FF ||
-+              lis->flags & LIS302DL_F_WUP_CLICK)
-+              return 0;
-       disable_irq(lis->spi_dev->irq);
-       local_save_flags(flags);
-@@ -528,15 +739,10 @@ static int lis302dl_suspend(struct spi_device *spi, pm_message_t state)
-       lis->regs[LIS302DL_REG_CLICK_WINDOW] =
-                               reg_read(lis, LIS302DL_REG_CLICK_WINDOW);
--      /* determine if we want to wake up from the accel. */
--      if (!(lis->flags & LIS302DL_F_WUP_FF ||
--            lis->flags & LIS302DL_F_WUP_CLICK)) {
--              /* power down */
--              u_int8_t tmp;
--              tmp = reg_read(lis, LIS302DL_REG_CTRL1);
--              tmp &= ~LIS302DL_CTRL1_PD;
--              reg_write(lis, LIS302DL_REG_CTRL1, tmp);
--      }
-+      /* power down */
-+      tmp = reg_read(lis, LIS302DL_REG_CTRL1);
-+      tmp &= ~LIS302DL_CTRL1_PD;
-+      reg_write(lis, LIS302DL_REG_CTRL1, tmp);
-       /* place our IO to the device in sleep-compatible states */
-       (lis->pdata->lis302dl_suspend_io)(lis, 0);
-@@ -551,6 +757,10 @@ static int lis302dl_resume(struct spi_device *spi)
-       struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-       unsigned long flags;
-+      if (lis->flags & LIS302DL_F_WUP_FF ||
-+              lis->flags & LIS302DL_F_WUP_CLICK)
-+              return 0;
-+
-       local_save_flags(flags);
-       /* get our IO to the device back in operational states */
-diff --git a/include/linux/lis302dl.h b/include/linux/lis302dl.h
-index e4a44f5..7daa8b3 100644
---- a/include/linux/lis302dl.h
-+++ b/include/linux/lis302dl.h
-@@ -129,10 +129,14 @@ enum lis302dl_reg_cloik_src {
- #define LIS302DL_WHO_AM_I_MAGIC               0x3b
--#define LIS302DL_F_WUP_FF             0x0001  /* wake up from free fall */
--#define LIS302DL_F_WUP_CLICK          0x0002
-+#define LIS302DL_F_WUP_FF_1           0x0001  /* wake up from free fall */
-+#define LIS302DL_F_WUP_FF_2           0x0002
-+#define LIS302DL_F_WUP_FF             0x0003
-+#define LIS302DL_F_WUP_CLICK  0x0004
- #define LIS302DL_F_POWER              0x0010
- #define LIS302DL_F_FS                 0x0020  /* ADC full scale */
-+#define LIS302DL_F_INPUT_OPEN         0x0040  /* Set if input device is opened */
-+#define LIS302DL_F_IRQ_WAKE   0x0080  /* IRQ is setup in wake mode */
- #endif /* _LINUX_LIS302DL_H */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1281-checkpatch-accel-fixes.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1281-checkpatch-accel-fixes.patch.patch
deleted file mode 100644 (file)
index 9b57c87..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-From 2d61a7406ec89893cdb4246d3f0144818278a5d8 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 15 Aug 2008 11:51:04 +0100
-Subject: [PATCH] checkpatch-accel-fixes.patch
-
-style cleanups for accel threshold setting patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/input/misc/lis302dl.c |   43 +++++++++++++++++++++++-----------------
- 1 files changed, 25 insertions(+), 18 deletions(-)
-
-diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
-index 3f6d0eb..7df31af 100644
---- a/drivers/input/misc/lis302dl.c
-+++ b/drivers/input/misc/lis302dl.c
-@@ -254,7 +254,7 @@ static int freefall_ms_to_duration(struct lis302dl_info *lis, int ms)
-       /* If we have 400 ms sampling rate, the stepping is 2.5 ms,
-        * on 100 ms the stepping is 10ms */
--      if ( r & LIS302DL_CTRL1_DR ) {
-+      if (r & LIS302DL_CTRL1_DR) {
-               /* Too large */
-               if (ms > 637)
-                       return -1;
-@@ -272,15 +272,15 @@ static int freefall_duration_to_ms(struct lis302dl_info *lis, int duration)
- {
-       u_int8_t r = reg_read(lis, LIS302DL_REG_CTRL1);
--      if ( r & LIS302DL_CTRL1_DR )
-+      if (r & LIS302DL_CTRL1_DR)
-               return (duration * 25) / 10;
-       return duration * 10;
- }
- /* Configure freefall/wakeup interrupts */
--static ssize_t set_freefall_common(int which, struct device *dev, struct device_attribute *attr,
--                       const char *buf, size_t count)
-+static ssize_t set_freefall_common(int which, struct device *dev,
-+                 struct device_attribute *attr, const char *buf, size_t count)
- {
-       struct lis302dl_info *lis = dev_get_drvdata(dev);
-       u_int8_t x_lo, y_lo, z_lo;
-@@ -305,17 +305,18 @@ static ssize_t set_freefall_common(int which, struct device *dev, struct device_
-               flag_mask = LIS302DL_F_WUP_FF_2;
-               intmode = LIS302DL_INTMODE_FF_WU_2;
--              printk(KERN_WARNING "Configuring second freefall / wakeup interrupt\n");
-+              printk(KERN_WARNING
-+                          "Configuring second freefall / wakeup interrupt\n");
-       }
-       /* Parse the input */
--      if (strcmp(buf, "0\n") == 0)
--      {
-+      if (strcmp(buf, "0\n") == 0) {
-               /* Turn off the interrupt */
-               local_save_flags(flags);
--              if ( (lis->flags & LIS302DL_F_IRQ_WAKE) != 0 )
-+              if (lis->flags & LIS302DL_F_IRQ_WAKE)
-                       disable_irq_wake(lis->spi_dev->irq);
--              lis302dl_int_mode(lis->spi_dev, which, LIS302DL_INTMODE_DATA_READY);
-+              lis302dl_int_mode(lis->spi_dev, which,
-+                                                 LIS302DL_INTMODE_DATA_READY);
-               lis->flags &= ~(flag_mask | LIS302DL_F_IRQ_WAKE);
-               reg_write(lis, r_cfg, 0);
-@@ -323,15 +324,17 @@ static ssize_t set_freefall_common(int which, struct device *dev, struct device_
-               reg_write(lis, r_duration, 0);
-               /* Power off unless the input subsystem is using the device */
--              if ( (lis->flags & LIS302DL_F_INPUT_OPEN) == 0 )
--                      reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD, 0);
-+              if (!(lis->flags & LIS302DL_F_INPUT_OPEN))
-+                      reg_set_bit_mask(lis, LIS302DL_REG_CTRL1,
-+                                                        LIS302DL_CTRL1_PD, 0);
-               local_irq_restore(flags);
-               return count;
-       }
--      if (sscanf(buf, "%d %d %d %d %d %d", &x, &y, &z, &threshold, &ms, &and_events) != 6)
-+      if (sscanf(buf, "%d %d %d %d %d %d", &x, &y, &z, &threshold, &ms,
-+                                                            &and_events) != 6)
-               return -EINVAL;
-       duration = freefall_ms_to_duration(lis, ms);
-@@ -364,7 +367,7 @@ static ssize_t set_freefall_common(int which, struct device *dev, struct device_
-       /* Power up the device and note that we want to wake up from
-        * this interrupt */
--      if ( (lis->flags & LIS302DL_F_IRQ_WAKE) == 0 )
-+      if (!(lis->flags & LIS302DL_F_IRQ_WAKE))
-               enable_irq_wake(lis->spi_dev->irq);
-       lis->flags |= flag_mask | LIS302DL_F_IRQ_WAKE;
-@@ -420,10 +423,12 @@ static ssize_t show_freefall_common(int which, struct device *dev,
-                       LIS302DL_FFWUCFG_ZLIE | LIS302DL_FFWUCFG_ZHIE)) == 0)
-               return sprintf(buf, "off\n");
--      return sprintf(buf,"%s events, %s interrupt, duration %d, threshold %d, "
-+      return sprintf(buf,
-+                      "%s events, %s interrupt, duration %d, threshold %d, "
-                       "enabled: %s %s %s %s %s %s\n",
-                       (config & LIS302DL_FFWUCFG_AOI) == 0 ? "or" : "and",
--                      (config & LIS302DL_FFWUCFG_LIR) == 0 ? "don't latch" : "latch",
-+                      (config & LIS302DL_FFWUCFG_LIR) == 0 ?
-+                                                      "don't latch" : "latch",
-                       freefall_duration_to_ms(lis, duration), threshold,
-                       (config & LIS302DL_FFWUCFG_XLIE) == 0 ? "---" : "xlo",
-                       (config & LIS302DL_FFWUCFG_XHIE) == 0 ? "---" : "xhi",
-@@ -445,8 +450,10 @@ static ssize_t show_freefall_2(struct device *dev,
-       return show_freefall_common(2, dev, attr, buf);
- }
--static DEVICE_ATTR(freefall_wakeup_1, S_IRUGO | S_IWUSR, show_freefall_1, set_freefall_1);
--static DEVICE_ATTR(freefall_wakeup_2, S_IRUGO | S_IWUSR, show_freefall_2, set_freefall_2);
-+static DEVICE_ATTR(freefall_wakeup_1, S_IRUGO | S_IWUSR, show_freefall_1,
-+                                                              set_freefall_1);
-+static DEVICE_ATTR(freefall_wakeup_2, S_IRUGO | S_IWUSR, show_freefall_2,
-+                                                              set_freefall_2);
- static struct attribute *lis302dl_sysfs_entries[] = {
-       &dev_attr_sample_rate.attr,
-@@ -618,7 +625,7 @@ static int __devinit lis302dl_probe(struct spi_device *spi)
-       /* start off in powered down mode; we power up when someone opens us */
-       reg_write(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_Xen |
-                                          LIS302DL_CTRL1_Yen |
--                                         LIS302DL_CTRL1_Zen);
-+                                         LIS302DL_CTRL1_Zen);
-       if (pdata->open_drain)
-               /* switch interrupt to open collector, active-low */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1282-From-Andrzej-Zaborowski-balrogg-gmail.com.patch b/target/linux/s3c24xx/patches-2.6.24/1282-From-Andrzej-Zaborowski-balrogg-gmail.com.patch
deleted file mode 100644 (file)
index 4f05bbd..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From 4a728e4772d53767fcbccd0b2b7e7278c961ce34 Mon Sep 17 00:00:00 2001
-From: Andy Green <agreen@pads.home.warmcat.com>
-Date: Sat, 23 Aug 2008 11:01:25 +0100
-Subject: [PATCH] From: Andrzej Zaborowski <balrogg@gmail.com>
-
-fix-accel-irq-mismatch.patch
-
-I just found a while to start doing something cool with the
-accelerometers but I hit #1613 (both accelerometer nodes can't be read
-concurrently for longer than a moment). Turns out to be very silly.
-I'll continue the cool stuff another day,
-Cheers
----
- arch/arm/mach-s3c2440/mach-gta02.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 7d4cc67..eadf88a 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1065,7 +1065,7 @@ void gta02_lis302dl_bitbang_read(struct lis302dl_info *lis)
-       s8 x, y, z;
- #endif
--      local_save_flags(flags);
-+      local_irq_save(flags);
-       /*
-        * Huh.. "quirk"... CS on this device is not really "CS" like you can
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1283-gta02-accel-isr-fix-more.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1283-gta02-accel-isr-fix-more.patch.patch
deleted file mode 100644 (file)
index f52e694..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-From a1e97c611253511ffc2d8c45e3e6d6894fa03fa3 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sat, 23 Aug 2008 11:01:50 +0100
-Subject: [PATCH] gta02-accel-isr-fix-more.patch
-
-Fix all of the mismatches Andrzej put us on to.
-
-Found-by: Andrzej Zaborowski <balrogg@gmail.com>
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/input/misc/lis302dl.c |   18 +++++++++---------
- 1 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
-index 7df31af..b01ca04 100644
---- a/drivers/input/misc/lis302dl.c
-+++ b/drivers/input/misc/lis302dl.c
-@@ -230,7 +230,7 @@ static ssize_t lis302dl_dump(struct device *dev, struct device_attribute *attr,
-       char *end = buf;
-       unsigned long flags;
--      local_save_flags(flags);
-+      local_irq_save(flags);
-       for (n = 0; n < sizeof(reg); n++)
-               reg[n] = reg_read(lis, n);
-@@ -312,7 +312,7 @@ static ssize_t set_freefall_common(int which, struct device *dev,
-       /* Parse the input */
-       if (strcmp(buf, "0\n") == 0) {
-               /* Turn off the interrupt */
--              local_save_flags(flags);
-+              local_irq_save(flags);
-               if (lis->flags & LIS302DL_F_IRQ_WAKE)
-                       disable_irq_wake(lis->spi_dev->irq);
-               lis302dl_int_mode(lis->spi_dev, which,
-@@ -354,7 +354,7 @@ static ssize_t set_freefall_common(int which, struct device *dev,
-       z_hi = z > 0 ? LIS302DL_FFWUCFG_ZHIE : 0;
-       /* Setup the configuration registers */
--      local_save_flags(flags);
-+      local_irq_save(flags);
-       reg_write(lis, r_cfg, 0); /* First zero to get to a known state */
-       reg_write(lis, r_cfg,
-               (and_events ? LIS302DL_FFWUCFG_AOI : 0) |
-@@ -478,7 +478,7 @@ static int lis302dl_input_open(struct input_dev *inp)
-                        LIS302DL_CTRL1_Yen | LIS302DL_CTRL1_Zen;
-       unsigned long flags;
--      local_save_flags(flags);
-+      local_irq_save(flags);
-       /* make sure we're powered up and generate data ready */
-       reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, ctrl1, ctrl1);
-       local_irq_restore(flags);
-@@ -499,7 +499,7 @@ static void lis302dl_input_close(struct input_dev *inp)
-                        LIS302DL_CTRL1_Zen;
-       unsigned long flags;
--      local_save_flags(flags);
-+      local_irq_save(flags);
-       /* since the input core already serializes access and makes sure we
-        * only see close() for the close of the last user, we can safely
-@@ -546,7 +546,7 @@ static int __devinit lis302dl_probe(struct spi_device *spi)
-       if (!lis)
-               return -ENOMEM;
--      local_save_flags(flags);
-+      local_irq_save(flags);
-       mutex_init(&lis->lock);
-       lis->spi_dev = spi;
-@@ -675,7 +675,7 @@ static int __devexit lis302dl_remove(struct spi_device *spi)
-       unsigned long flags;
-       /* Reset and power down the device */
--      local_save_flags(flags);
-+      local_irq_save(flags);
-       reg_write(lis, LIS302DL_REG_CTRL3, 0x00);
-       reg_write(lis, LIS302DL_REG_CTRL2, 0x00);
-       reg_write(lis, LIS302DL_REG_CTRL1, 0x00);
-@@ -706,7 +706,7 @@ static int lis302dl_suspend(struct spi_device *spi, pm_message_t state)
-               return 0;
-       disable_irq(lis->spi_dev->irq);
--      local_save_flags(flags);
-+      local_irq_save(flags);
-       /*
-        * When we share SPI over multiple sensors, there is a race here
-@@ -768,7 +768,7 @@ static int lis302dl_resume(struct spi_device *spi)
-               lis->flags & LIS302DL_F_WUP_CLICK)
-               return 0;
--      local_save_flags(flags);
-+      local_irq_save(flags);
-       /* get our IO to the device back in operational states */
-       (lis->pdata->lis302dl_suspend_io)(lis, 1);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1284-fix-one-mmc-race.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1284-fix-one-mmc-race.patch.patch
deleted file mode 100644 (file)
index 7acd823..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-From d744c88c149269b95ec068c8615e492375415d6d Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 27 Aug 2008 04:09:30 +0900
-Subject: [PATCH] fix-one-mmc-race.patch
-
-Some boots from Qi trigger a symptom from this interesting race -->
-
-[    2.730000] Unable to handle kernel NULL pointer dereference at virtual address 00000248
-[    2.730000] pgd = c0004000
-[    2.735000] [00000248] *pgd=00000000
-[    2.735000] Internal error: Oops: 5 [#1] PREEMPT
-[    2.735000] Modules linked in:
-[    2.735000] CPU: 0    Not tainted  (2.6.24-stable10_0c1587137aaf0ee3-mokodev #1071)
-[    2.735000] PC is at pcf50633_voltage_set+0x1c/0xfc
-[    2.735000] LR is at gta02_glamo_mmc_set_power+0xdc/0x128
-[    2.735000] pc : [<c01df570>]    lr : [<c0034324>]    psr: 60000013
-[    2.735000] sp : c7c57eb0  ip : c7c57ec8  fp : c7c57ec4
-[    2.735000] r10: c7cfca28  r9 : 00000000  r8 : c7c57f68
-[    2.735000] r7 : c7cfca68  r6 : c7cfcae0  r5 : 00000c80  r4 : 00000000
-[    2.735000] r3 : 00000000  r2 : 00000c80  r1 : 0000000a  r0 : 00000c80
-[    2.735000] Flags: nZCv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment kernel
-[    2.735000] Control: c000717f  Table: 30004000  DAC: 00000017
-[    2.735000] Process kmmcd (pid: 102, stack limit = 0xc7c56268)
-[    2.735000] Stack: (0xc7c57eb0 to 0xc7c58000)
-[    2.735000] 7ea0:                                     c0608c58 00000c80 c7c57edc c7c57ec8
-[    2.735000] 7ec0: c0034324 c01df564 c7cfca28 c7cfc800 c7c57f1c c7c57ee0 c0194de0 c0034258
-[    2.735000] 7ee0: c7c57f34 c7c57ef0 c01e6230 c005de5c 60000013 c7cfca28 c7cfc800 60000013
-[    2.735000] 7f00: c7cfca68 c7c57f68 00000000 c01e6778 c7c57f34 c7c57f20 c01e5d68 c0194da8
-[    2.735000] 7f20: c7cfc800 c7cfca08 c7c57f5c c7c57f38 c01e6810 c01e5cbc c0059278 c7c57f48
-[    2.735000] 7f40: c02d2ba0 00000002 c7c44420 c7c56000 c7c57f9c c7c57f60 c00592e0 c01e6788
-[    2.735000] 7f60: 00000002 c0059278 c0608d74 c04321cc c036e16c 00000000 c7c57fb0 c7c44420
-[    2.735000] 7f80: c7c56000 00000000 00000000 00000000 c7c57fd4 c7c57fa0 c005a068 c00591ec
-[    2.735000] 7fa0: c02d0624 00000000 c7c4c0e0 c005dc2c c7c57fb0 c7c57fb0 00000000 c7c56000
-[    2.735000] 7fc0: c7c44420 c0059f84 c7c57ff4 c7c57fd8 c005db28 c0059f94 00000000 00000000
-[    2.735000] 7fe0: 00000000 00000000 00000000 c7c57ff8 c004b170 c005dad8 ffffffff ffffffff
-[    2.735000] Backtrace:
-[    2.735000] [<c01df554>] (pcf50633_voltage_set+0x0/0xfc) from [<c0034324>] (gta02_glamo_mmc_set_power+0xdc/0x128)
-[    2.735000]  r5:00000c80 r4:c0608c58
-[    2.735000] [<c0034248>] (gta02_glamo_mmc_set_power+0x0/0x128) from [<c0194de0>] (glamo_mci_set_ios+0x48/0x254)
-[    2.735000]  r5:c7cfc800 r4:c7cfca28
-[    2.735000] [<c0194d98>] (glamo_mci_set_ios+0x0/0x254) from [<c01e5d68>] (mmc_power_up+0xbc/0x100)
-[    2.735000] [<c01e5cac>] (mmc_power_up+0x0/0x100) from [<c01e6810>] (mmc_rescan+0x98/0x1a8)
-[    2.735000]  r5:c7cfca08 r4:c7cfc800
-[    2.735000] [<c01e6778>] (mmc_rescan+0x0/0x1a8) from [<c00592e0>] (run_workqueue+0x104/0x208)
-[    2.735000]  r6:c7c56000 r5:c7c44420 r4:00000002
-[    2.735000] [<c00591dc>] (run_workqueue+0x0/0x208) from [<c005a068>] (worker_thread+0xe4/0xf8)
-[    2.735000] [<c0059f84>] (worker_thread+0x0/0xf8) from [<c005db28>] (kthread+0x60/0x94)
-[    2.735000]  r6:c0059f84 r5:c7c44420 r4:c7c56000
-[    2.735000] [<c005dac8>] (kthread+0x0/0x94) from [<c004b170>] (do_exit+0x0/0x6f4)
-[    2.735000]  r6:00000000 r5:00000000 r4:00000000
-[    2.735000] Code: e351000a e1a04000 e1a00002 8a000032 (e5943248)
-[    2.745000] ---[ end trace 123ec1d286354824 ]---
-
-This problem was caused by insufficient timeout waiting for pcf50633 to resume
-and broken code to detect timeout exhaustion.
-
-Although I'd like to think it has something to do with mmc resume woes it should make a panic
-and subsequent emergency spew on UART2 if that had been the case.
-
-Took the opportunity to move the stuff to show completion of probe to later in the
-pcf50633 probe and tighten readiness test.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |    4 ++--
- drivers/i2c/chips/pcf50633.c       |   12 ++++++++----
- 2 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index eadf88a..c15f072 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1357,7 +1357,7 @@ static void
- gta02_glamo_mmc_set_power(unsigned char power_mode, unsigned short vdd)
- {
-       int mv = 1650;
--      int timeout = 100;
-+      int timeout = 500;
-       printk(KERN_DEBUG "mmc_set_power(power_mode=%u, vdd=%u\n",
-              power_mode, vdd);
-@@ -1377,7 +1377,7 @@ gta02_glamo_mmc_set_power(unsigned char power_mode, unsigned short vdd)
-                       while (pcf50633_ready(pcf50633_global) && (timeout--))
-                               msleep(5);
--                      if (!timeout) {
-+                      if (timeout < 0) {
-                               printk(KERN_ERR"gta02_glamo_mmc_set_power "
-                                            "BAILING on timeout\n");
-                               return;
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index b90ea8c..bac307e 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -2151,8 +2151,6 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-               goto exit_free;
-       }
--      pcf50633_global = pcf;
--
-       init_resume_dependency_list(&pcf->resume_dependency);
-       populate_sysfs_group(pcf);
-@@ -2228,11 +2226,13 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-               backlight_update_status(pcf->backlight);
-       }
--      pcf->probe_completed = 1;
--
-       if (pcf->pdata->flag_use_apm_emulation)
-               apm_get_power_status = pcf50633_get_power_status;
-+      pcf->probe_completed = 1;
-+      pcf50633_global = pcf;
-+      dev_info(&new_client->dev, "probe completed\n");
-+
-       /* if platform was interested, give him a chance to register
-        * platform devices that switch power with us as the parent
-        * at registration time -- ensures suspend / resume ordering
-@@ -2476,6 +2476,10 @@ int pcf50633_ready(struct pcf50633_data *pcf)
-       if (!pcf)
-               return -EACCES;
-+      /* this was seen during boot with Qi, mmc_rescan racing us */
-+      if (!pcf->probe_completed)
-+              return -EACCES;
-+
-       if ((pcf->suspend_state != PCF50633_SS_RUNNING) &&
-           (pcf->suspend_state < PCF50633_SS_COMPLETED_RESUME))
-               return -EBUSY;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1285-fix-glamo-idleclock-around-suspend.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1285-fix-glamo-idleclock-around-suspend.patch.patch
deleted file mode 100644 (file)
index 0f1c0a0..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-From ca19d156400f817960efe0d14680324b2ea34171 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 3 Sep 2008 19:39:47 +0800
-Subject: [PATCH] fix-glamo-idleclock-around-suspend.patch
-
-Possible implementation of SD Card corruption workaround reported here
-
-https://docs.openmoko.org/trac/ticket/1802#comment:5
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-mci.c |   31 ++++++++++++++++++++++++++++++-
- 1 files changed, 30 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index 577021e..3eece08 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -99,6 +99,8 @@ module_param(sd_drive, int, 0644);
- static int sd_idleclk = 0; /* disallow idle clock by default */
- module_param(sd_idleclk, int, 0644);
-+/* used to stash real idleclk state in suspend: we force it to run in there */
-+static int suspend_sd_idleclk;
- unsigned char CRC7(u8 * pu8, int cnt)
-@@ -947,6 +949,27 @@ static int glamo_mci_suspend(struct platform_device *dev, pm_message_t state)
-       struct glamo_mci_host   *host = mmc_priv(mmc);
-       int ret;
-+      /*
-+       * possible workaround for SD corruption during suspend - resume
-+       * make sure the clock was running during suspend and consequently
-+       * resume
-+       */
-+      if (host->pdata->glamo_mci_use_slow)
-+              if ((host->pdata->glamo_mci_use_slow)())
-+                      __glamo_mci_fix_card_div(host, host->clk_div *
-+                                                               sd_slow_ratio);
-+              else
-+                      __glamo_mci_fix_card_div(host, host->clk_div);
-+      else
-+              __glamo_mci_fix_card_div(host, host->clk_div);
-+
-+      /* we are going to do more commands to override this in
-+       * mmc_suspend_host(), so we need to change sd_idleclk for the
-+       * duration as well
-+       */
-+      suspend_sd_idleclk = sd_idleclk;
-+      sd_idleclk = 1;
-+
-       host->suspending++;
-       if (host->pdata->mci_all_dependencies_resumed)
-               (host->pdata->mci_suspending)(dev);
-@@ -963,6 +986,7 @@ int glamo_mci_resume(struct platform_device *dev)
- {
-       struct mmc_host *mmc = platform_get_drvdata(dev);
-       struct glamo_mci_host   *host = mmc_priv(mmc);
-+      int ret;
-       if (host->pdata->mci_all_dependencies_resumed)
-               if (!(host->pdata->mci_all_dependencies_resumed)(dev))
-@@ -970,7 +994,12 @@ int glamo_mci_resume(struct platform_device *dev)
-       host->suspending--;
--      return mmc_resume_host(mmc);
-+      ret = mmc_resume_host(mmc);
-+
-+      /* put sd_idleclk back to pre-suspend state */
-+      sd_idleclk = suspend_sd_idleclk;
-+
-+      return ret;
- }
- EXPORT_SYMBOL_GPL(glamo_mci_resume);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1286-fix-glamo-crank-memory-to-90MHz.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1286-fix-glamo-crank-memory-to-90MHz.patch.patch
deleted file mode 100644 (file)
index 7942bb2..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From 8846830e0f7b5ea2721e3d8b2bd517fa1a11c628 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Thu, 11 Sep 2008 20:38:46 +0800
-Subject: [PATCH] fix-glamo-crank-memory-to-90MHz.patch
-
-This changes Glamo memory and now host bus PLL to 90MHz from
-80MHz, as recommended by S-Media.  Bandwidth should go up
-by 12.5% by this in raw terms anyway.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-core.c |    9 ++++++---
- 1 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index b30ec9f..2619c5f 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -729,8 +729,8 @@ static struct glamo_script glamo_init_script[] = {
-       { GLAMO_REG_CLOCK_MPEG,         0x0000 },
- #endif
-       { GLAMO_REG_PLL_GEN1,           0x05db },       /* 48MHz */
--      { GLAMO_REG_PLL_GEN3,           0x09c3 },       /* 80MHz */
--              { 0xfffd, 0 },
-+      { GLAMO_REG_PLL_GEN3,           0x0aba },       /* 90MHz */
-+      { 0xfffd, 0 },
-       /*
-        * b9 of this register MUST be zero to get any interrupts on INT#
-        * the other set bits enable all the engine interrupt sources
-@@ -745,7 +745,10 @@ static struct glamo_script glamo_init_script[] = {
-       { 0x212,        0x0000 },
-       { 0x214,        0x4000 },
-       { 0x216,        0xf00e },
--      { GLAMO_REG_MEM_TYPE,           0x0874 }, /* 8MB, 16 word pg wr+rd */
-+
-+      /* S-Media recommended "set tiling mode to 512 mode for memory access
-+       * more efficiency when 640x480" */
-+      { GLAMO_REG_MEM_TYPE,           0x0c74 }, /* 8MB, 16 word pg wr+rd */
-       { GLAMO_REG_MEM_GEN,            0xafaf }, /* 63 grants min + max */
-       /*
-        * the register below originally 0x0108 makes unreliable Glamo MMC
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1287-soft_tap.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1287-soft_tap.patch.patch
deleted file mode 100644 (file)
index c73dd5e..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-From eff39cde0d3cdd2afd5e1b4be5a8eb6cf195543e Mon Sep 17 00:00:00 2001
-From: Dima Kogan <dkogan@cds.caltech.edu>
-Date: Thu, 11 Sep 2008 20:38:55 +0800
-Subject: [PATCH] soft_tap.patch
-
-Hi all.
-
-I'm seeing a behavior in my freerunner where light taps on the
-touchscreen are not registered as clicks by the kernel even though the
-base hardware does report clicking events. I'm seeing the kernel
-generate extra "unclick" events in these cases. It looks like in the
-driver, an unclick event is processed before the click event, thus
-suppressing the click from ever being generated. I'm attaching a patch
-that addresses this. I'm now able to type much faster on the matchbox
-keyboard, even when using my fingertips instead of fingernails.
-
-Dima
-
-Signed-off-by: Dima Kogan <dkogan@cds.caltech.edu>
----
- drivers/input/touchscreen/s3c2410_ts.c |   17 +++++++++++++++++
- 1 files changed, 17 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
-index 9fb95c1..fc1c500 100644
---- a/drivers/input/touchscreen/s3c2410_ts.c
-+++ b/drivers/input/touchscreen/s3c2410_ts.c
-@@ -118,6 +118,7 @@ struct s3c2410ts {
-       struct s3c2410ts_sample raw_running_avg;
-       int reject_threshold_vs_avg;
-       int flag_previous_exceeded_threshold;
-+      int flag_first_touch_sent;
- };
- static struct s3c2410ts ts;
-@@ -130,6 +131,7 @@ static void clear_raw_fifo(void)
-       ts.raw_running_avg.x = 0;
-       ts.raw_running_avg.y = 0;
-       ts.flag_previous_exceeded_threshold = 0;
-+      ts.flag_first_touch_sent = 0;
- }
-@@ -153,6 +155,19 @@ static void touch_timer_fire(unsigned long data)
-       updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) &&
-                                           (!(data1 & S3C2410_ADCDAT0_UPDOWN));
-+      // if we need to send an untouch event, but we haven't yet sent the
-+      // touch event (this happens if the touchscreen was tapped lightly),
-+      // send the touch event first
-+      if (!updown && !ts.flag_first_touch_sent && ts.count != 0) {
-+              input_report_abs(ts.dev, ABS_X, ts.xp >> ts.shift);
-+              input_report_abs(ts.dev, ABS_Y, ts.yp >> ts.shift);
-+
-+              input_report_key(ts.dev, BTN_TOUCH, 1);
-+              input_report_abs(ts.dev, ABS_PRESSURE, 1);
-+              input_sync(ts.dev);
-+              ts.flag_first_touch_sent = 1;
-+      }
-+
-       if (updown) {
-               if (ts.count != 0) {
-                       ts.xp >>= ts.shift;
-@@ -174,6 +189,7 @@ static void touch_timer_fire(unsigned long data)
-                       input_report_key(ts.dev, BTN_TOUCH, 1);
-                       input_report_abs(ts.dev, ABS_PRESSURE, 1);
-                       input_sync(ts.dev);
-+                      ts.flag_first_touch_sent = 1;
-               }
-               ts.xp = 0;
-@@ -190,6 +206,7 @@ static void touch_timer_fire(unsigned long data)
-               input_report_key(ts.dev, BTN_TOUCH, 0);
-               input_report_abs(ts.dev, ABS_PRESSURE, 0);
-               input_sync(ts.dev);
-+              ts.flag_first_touch_sent = 0;
-               writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC);
-       }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1288-newline_after_disconnect_msg.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1288-newline_after_disconnect_msg.patch.patch
deleted file mode 100644 (file)
index 781a505..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 1b6ea684646a9a793543ca54c8d937d5fa25cc3f Mon Sep 17 00:00:00 2001
-From: mattb <mattb@openmoko-trac.invalid>
-Date: Thu, 11 Sep 2008 20:39:08 +0800
-Subject: [PATCH] newline_after_disconnect_msg.patch
-
-This is purely cosmetic, but annoying.
-
- The ar6k wifi driver does not print a newline after the informational message when disconnecting from an AP. This leads to cluttered dmesg output like the following:
-
- AR6000 disconnected from 00:02:cf:85:c6:08 AR6000 connected event on freq 2412 with bssid 00:02:cf:85:c6:08 listenInterval=100, beaconInterval = 100, beaconIeLen = 0 assocReqLen=27 assocRespLen =22
-
- What is expected, is something like:
-
- AR6000 disconnected from 00:02:cf:85:c6:08
- AR6000 connected event on freq 2412 with bssid 00:02:cf:85:c6:08 listenInterval=100, beaconInterval = 100, beaconIeLen = 0 assocReqLen=27 assocRespLen =22
-
- The upside of this is that it gives me a nice simple patch to send in as my first contribution to OpenMoko?.
-
- Cheers
-
-Signed-off-by:  mattb <mattb@openmoko-trac.invalid>
----
- .../sdio/function/wlan/ar6000/ar6000/ar6000_drv.c  |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-index 93ed978..5dd1651 100644
---- a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-@@ -2311,6 +2311,7 @@ ar6000_disconnect_event(AR_SOFTC_T *ar, A_UINT8 reason, A_UINT8 *bssid,
-         A_PRINTF(" from %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x ",
-                  bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5]);
-     }
-+    A_PRINTF("\n");
-     AR_DEBUG_PRINTF("\nDisconnect Reason is %d", reason);
-     AR_DEBUG_PRINTF("\nProtocol Reason/Status Code is %d", protocolReasonStatus);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1289-ar6k-essid-one-and-32.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1289-ar6k-essid-one-and-32.patch.patch
deleted file mode 100644 (file)
index 38fde19..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From 89e2c1f006e4d5936a8e0edec74d64b71063e3c1 Mon Sep 17 00:00:00 2001
-From: Werner Almesberger <werner@openmoko.org>
-Date: Tue, 16 Sep 2008 08:54:07 +0100
-Subject: [PATCH] ar6k-essid-one-and-32.patch
-
-This patch allows ESSID with length 1, which were rejected because the
-stack assumed iwconfig used a different format in the ioctl's payload.
-
-It also refuses ESSIDs longer than 31 bytes, because there is some
-buffer overrun issue buried somewhere else in the stack. In principle,
-32 bytes should be fine.
-
-Open issue:
-- where is the 32 bytes overrun ?
-
-Signed-off-by: Werner Almesberger <werner@openmoko.org>
----
- .../function/wlan/ar6000/ar6000/wireless_ext.c     |    9 ++++-----
- 1 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c b/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
-index ede8e62..56ceb2e 100644
---- a/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
-@@ -264,12 +264,11 @@ ar6000_ioctl_siwessid(struct net_device *dev,
-     }
-     /*
--     * iwconfig passes a null terminated string with length including this
--     * so we need to account for this
-+     * iwconfig passes a string with length excluding any trailing NUL.
-+     * FIXME: we should be able to set an ESSID of 32 bytes, yet things fall
-+     * over badly if we do. So we limit the ESSID to 31 bytes.
-      */
--    if (data->flags && (!data->length || (data->length == 1) ||
--        ((data->length - 1) > sizeof(ar->arSsid))))
--    {
-+    if (data->flags && (!data->length || data->length >= sizeof(ar->arSsid))) {
-         /*
-          * ssid is invalid
-          */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1290-Subject-PATCH-rework-to-make-USBINS-USBREM-exclus.patch b/target/linux/s3c24xx/patches-2.6.24/1290-Subject-PATCH-rework-to-make-USBINS-USBREM-exclus.patch
deleted file mode 100644 (file)
index 43c0e85..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From 853fcd2329b427788677d11431e6165d108f935b Mon Sep 17 00:00:00 2001
-From: Matt Hsu <matt_hsu@openmoko.org>
-Date: Wed, 17 Sep 2008 16:10:43 +0100
-Subject: [PATCH] Subject: [PATCH] rework-to-make-USBINS-USBREM-exclusive.patch
-
-This patch is a work-around solution to correct charging indication logic.
-
-Signed-off-by: Matt Hsu <matt_hsu@openmoko.org>
----
- drivers/i2c/chips/pcf50633.c |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index bac307e..c186fdb 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -915,7 +915,11 @@ static void pcf50633_work(struct work_struct *work)
-               add_request_to_adc_queue(pcf, PCF50633_ADCC1_MUX_ADCIN1,
-                                    PCF50633_ADCC1_AVERAGE_16);
-       }
--      if (pcfirq[0] & PCF50633_INT1_USBREM) {
-+      if (pcfirq[0] & PCF50633_INT1_USBREM &&
-+                              !(pcfirq[0] & PCF50633_INT1_USBINS)) {
-+              /* the occurrence of USBINS and USBREM
-+               * should be exclusive in one schedule work
-+               */
-               DEBUGPC("USBREM ");
-               pcf->usb_removal_count++;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1291-gta03-pca9632.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1291-gta03-pca9632.patch.patch
deleted file mode 100644 (file)
index cf4df2a..0000000
+++ /dev/null
@@ -1,650 +0,0 @@
-From f6b1f49300a24c329f5d1049031f711c6268be95 Mon Sep 17 00:00:00 2001
-From: Matt Hsu <matt_hsu@openmoko.org>
-Date: Thu, 18 Sep 2008 11:14:50 +0100
-Subject: [PATCH] gta03-pca9632.patch
-
- - pca9632 is a LED driver which will be adopted in gta03.
-
-Signed-off-by: Matt Hsu <matt_hsu@openmoko.org>
----
- drivers/i2c/chips/Kconfig   |    9 +
- drivers/i2c/chips/Makefile  |    1 +
- drivers/i2c/chips/pca9632.c |  551 +++++++++++++++++++++++++++++++++++++++++++
- drivers/i2c/chips/pca9632.h |   24 ++
- include/linux/i2c-id.h      |    1 +
- 5 files changed, 586 insertions(+), 0 deletions(-)
- create mode 100644 drivers/i2c/chips/pca9632.c
- create mode 100644 drivers/i2c/chips/pca9632.h
-
-diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
-index 1d6d36f..9af3c62 100644
---- a/drivers/i2c/chips/Kconfig
-+++ b/drivers/i2c/chips/Kconfig
-@@ -193,4 +193,13 @@ config SENSORS_TSL256X
-         This driver can also be built as a module.  If so, the module
-         will be called tsl256x.
-+config PCA9632
-+      tristate "Philips/NXP PCA9632 low power LED driver"
-+      depends on I2C
-+      help
-+        If you say yes here you get support for the Philips/NXP PCA9632
-+        LED driver.
-+
-+        This driver can also be built as a module.  If so, the module
-+        will be called pca9632.
- endmenu
-diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
-index 4b6ba04..67cd1e5 100644
---- a/drivers/i2c/chips/Makefile
-+++ b/drivers/i2c/chips/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_TPS65010)               += tps65010.o
- obj-$(CONFIG_MENELAUS)                += menelaus.o
- obj-$(CONFIG_SENSORS_TSL2550) += tsl2550.o
- obj-$(CONFIG_SENSORS_TSL256X) += tsl256x.o
-+obj-$(CONFIG_PCA9632)         += pca9632.o
- ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
- EXTRA_CFLAGS += -DDEBUG
-diff --git a/drivers/i2c/chips/pca9632.c b/drivers/i2c/chips/pca9632.c
-new file mode 100644
-index 0000000..deda6a1
---- /dev/null
-+++ b/drivers/i2c/chips/pca9632.c
-@@ -0,0 +1,551 @@
-+/*
-+ *  Philips/NXP PCA9632 low power LED driver.
-+ *  Copyright (C) 2008 Matt Hsu <matt_hsu@openmoko.org>
-+ *
-+ *  low_level implementation are based on pcf50606 driver
-+ *
-+ *  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; version 2 of the License.
-+ *
-+ *  TODO:
-+ *  - attach ledclass??
-+ *  - add platform data
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/i2c.h>
-+#include <linux/platform_device.h>
-+
-+#include "pca9632.h"
-+
-+/* Addresses to scan */
-+static unsigned short normal_i2c[] = { 0x62, I2C_CLIENT_END };
-+
-+/* Insmod parameters */
-+I2C_CLIENT_INSMOD_1(pca9632);
-+
-+enum pca9632_pwr_state {
-+      PCA9632_NORMAL,
-+      PCA9632_SLEEP,
-+};
-+
-+enum pca9632_led_output {
-+      PCA9632_OFF,
-+      PCA9632_ON,
-+      PCA9632_CTRL_BY_PWM,
-+      PCA9632_CTRL_BY_PWM_GRPPWM,
-+};
-+
-+static const char *led_output_name[] = {
-+      [PCA9632_OFF]                   = "off",
-+      [PCA9632_ON]                    = "fully-on",
-+      [PCA9632_CTRL_BY_PWM]           = "ctrl-by-pwm",
-+      [PCA9632_CTRL_BY_PWM_GRPPWM]    = "ctrl-by-pwm-grppwm",
-+};
-+
-+struct pca9632_data {
-+      struct i2c_client client;
-+      struct mutex lock;
-+};
-+
-+static struct i2c_driver pca9632_driver;
-+static struct platform_device *pca9632_pdev;
-+
-+static int pca9632_attach_adapter(struct i2c_adapter *adapter);
-+static int pca9632_detach_client(struct i2c_client *client);
-+
-+static int __reg_write(struct pca9632_data *pca, u_int8_t reg, u_int8_t val)
-+{
-+      return i2c_smbus_write_byte_data(&pca->client, reg, val);
-+}
-+
-+static int reg_write(struct pca9632_data *pca, u_int8_t reg, u_int8_t val)
-+{
-+      int ret;
-+
-+      mutex_lock(&pca->lock);
-+      ret = __reg_write(pca, reg, val);
-+      mutex_unlock(&pca->lock);
-+
-+      return ret;
-+}
-+
-+static int32_t __reg_read(struct pca9632_data *pca, u_int8_t reg)
-+{
-+      int32_t ret;
-+
-+      ret = i2c_smbus_read_byte_data(&pca->client, reg);
-+
-+      return ret;
-+}
-+
-+static u_int8_t reg_read(struct pca9632_data *pca, u_int8_t reg)
-+{
-+      int32_t ret;
-+
-+      mutex_lock(&pca->lock);
-+      ret = __reg_read(pca, reg);
-+      mutex_unlock(&pca->lock);
-+
-+      return ret & 0xff;
-+}
-+
-+static int reg_set_bit_mask(struct pca9632_data *pca,
-+                          u_int8_t reg, u_int8_t mask, u_int8_t val)
-+{
-+      int ret;
-+      u_int8_t tmp;
-+
-+      val &= mask;
-+
-+      mutex_lock(&pca->lock);
-+
-+      tmp = __reg_read(pca, reg);
-+      tmp &= ~mask;
-+      tmp |= val;
-+      ret = __reg_write(pca, reg, tmp);
-+
-+      mutex_unlock(&pca->lock);
-+
-+      return ret;
-+}
-+
-+static inline int calc_dc(uint8_t idc)
-+{
-+      return (idc * 100) / 256;
-+}
-+
-+/*
-+ * Software reset
-+ */
-+static int software_rst(struct i2c_adapter *adapter)
-+{
-+      u8 buf[] = { 0xa5, 0x5a };
-+
-+      struct i2c_msg msg[] = {
-+              {
-+                      .addr = 0x3,
-+                      .flags = 0,
-+                      .buf = &buf,
-+                      .len = sizeof(buf)
-+              }
-+      };
-+
-+      return i2c_transfer(adapter, msg, 1);
-+}
-+
-+/*
-+ * Group dmblnk control
-+ */
-+static void config_group_dmblnk(struct pca9632_data *pca, int group_dmblnk_mode)
-+{
-+      reg_set_bit_mask(pca, PCA9632_REG_MODE2, 0x20,
-+                      group_dmblnk_mode << PCA9632_DMBLNK_SHIFT);
-+}
-+
-+static int get_group_dmblnk(struct pca9632_data *pca)
-+{
-+      return reg_read(pca, PCA9632_REG_MODE2) >> PCA9632_DMBLNK_SHIFT;
-+}
-+
-+static ssize_t show_group_dmblnk(struct device *dev, struct device_attribute
-+                                      *attr, char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pca9632_data *pca = i2c_get_clientdata(client);
-+
-+      if (get_group_dmblnk(pca))
-+              return sprintf(buf, "blinking\n");
-+      else
-+              return sprintf(buf, "dimming\n");
-+}
-+
-+static ssize_t set_group_dmblnk(struct device *dev, struct device_attribute
-+                                      *attr, const char *buf, size_t count)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pca9632_data *pca = i2c_get_clientdata(client);
-+      unsigned int mode = simple_strtoul(buf, NULL, 10);
-+
-+      if (mode)
-+              dev_info(&pca->client.dev, "blinking\n");
-+      else
-+              dev_info(&pca->client.dev, "dimming\n");
-+
-+      config_group_dmblnk(pca, mode);
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(group_dmblnk, S_IRUGO | S_IWUSR, show_group_dmblnk,
-+                                                      set_group_dmblnk);
-+
-+static int reg_id_by_name(const char *name)
-+{
-+      int reg_id = -1;
-+
-+      if (!strncmp(name, "led0", 4))
-+              reg_id = PCA9632_REG_PWM0;
-+      else if (!strncmp(name, "led1", 4))
-+              reg_id = PCA9632_REG_PWM1;
-+      else if (!strncmp(name, "led2", 4))
-+              reg_id = PCA9632_REG_PWM2;
-+      else if (!strncmp(name, "led3", 4))
-+              reg_id = PCA9632_REG_PWM3;
-+
-+      return reg_id;
-+}
-+
-+static int get_led_output(struct pca9632_data *pca, int ldrx)
-+{
-+      u_int8_t led_state;
-+
-+      ldrx = ldrx - 2;
-+      led_state = reg_read(pca, PCA9632_REG_LEDOUT);
-+      led_state = (led_state >> (2 * ldrx)) & 0x03;
-+
-+      return led_state;
-+}
-+
-+static void config_led_output(struct pca9632_data *pca, int ldrx,
-+                                      enum pca9632_led_output led_output)
-+{
-+      u_int8_t mask;
-+      int tmp;
-+
-+      ldrx = ldrx - 2;
-+      mask = 0x03 << (2 * ldrx);
-+      tmp = reg_set_bit_mask(pca, PCA9632_REG_LEDOUT,
-+                                      mask, led_output << (2 * ldrx));
-+}
-+
-+/*
-+ * Individual brightness control
-+ */
-+static ssize_t show_brightness(struct device *dev, struct device_attribute
-+                                      *attr, char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pca9632_data *pca = i2c_get_clientdata(client);
-+      int ldrx;
-+
-+      ldrx = reg_id_by_name(attr->attr.name);
-+
-+      switch (get_led_output(pca, ldrx)) {
-+
-+      case PCA9632_OFF:
-+      case PCA9632_ON:
-+              return sprintf(buf, "%s",
-+                      led_output_name[get_led_output(pca, ldrx)]);
-+
-+      case PCA9632_CTRL_BY_PWM:
-+              return sprintf(buf, "%d%% \n", calc_dc(reg_read(pca, ldrx)));
-+
-+      case PCA9632_CTRL_BY_PWM_GRPPWM:
-+              /* check group dmblnk */
-+              if (get_group_dmblnk(pca))
-+                      return sprintf(buf, "%d%% \n",
-+                              calc_dc(reg_read(pca, ldrx)));
-+              return sprintf(buf, "%d%% \n",
-+                                       calc_dc((reg_read(pca, ldrx) & 0xfc)));
-+      default:
-+              break;
-+      }
-+
-+      return sprintf(buf, "invalid argument\n");
-+}
-+
-+static ssize_t set_brightness(struct device *dev, struct device_attribute *attr,
-+                      const char *buf, size_t count)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pca9632_data *pca = i2c_get_clientdata(client);
-+      unsigned int pwm = simple_strtoul(buf, NULL, 10);
-+      int ldrx;
-+
-+      ldrx = reg_id_by_name(attr->attr.name);
-+      reg_set_bit_mask(pca, ldrx, 0xff, pwm);
-+
-+      return count;
-+}
-+
-+static
-+DEVICE_ATTR(led0_pwm, S_IRUGO | S_IWUSR, show_brightness, set_brightness);
-+static
-+DEVICE_ATTR(led1_pwm, S_IRUGO | S_IWUSR, show_brightness, set_brightness);
-+static
-+DEVICE_ATTR(led2_pwm, S_IRUGO | S_IWUSR, show_brightness, set_brightness);
-+static
-+DEVICE_ATTR(led3_pwm, S_IRUGO | S_IWUSR, show_brightness, set_brightness);
-+
-+/*
-+ * Group frequency control
-+ */
-+static ssize_t show_group_freq(struct device *dev, struct device_attribute
-+                              *attr, char *buf)
-+{
-+      uint32_t period;
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pca9632_data *pca = i2c_get_clientdata(client);
-+
-+      period = ((reg_read(pca, PCA9632_REG_GRPFREQ) + 1) * 1000) / 24;
-+
-+      return sprintf(buf, "%d ms\n", period);
-+}
-+
-+static ssize_t set_group_freq(struct device *dev, struct device_attribute *attr,
-+                      const char *buf, size_t count)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pca9632_data *pca = i2c_get_clientdata(client);
-+
-+      unsigned int freq = simple_strtoul(buf, NULL, 10);
-+      reg_write(pca, PCA9632_REG_GRPFREQ, freq);
-+      return count;
-+}
-+
-+static
-+DEVICE_ATTR(group_freq, S_IRUGO | S_IWUSR, show_group_freq, set_group_freq);
-+
-+/*
-+ * Group duty cycle tonrol*
-+ */
-+static ssize_t show_group_dc(struct device *dev, struct device_attribute *attr,
-+                           char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pca9632_data *pca = i2c_get_clientdata(client);
-+
-+      if (get_group_dmblnk(pca)) {
-+
-+              if (reg_read(pca, PCA9632_REG_GRPFREQ) <= 0x03)
-+                      return sprintf(buf, "%d%% \n",
-+                           calc_dc(reg_read(pca, PCA9632_REG_GRPPWM) & 0xfc));
-+
-+              return sprintf(buf, "%d%% \n", calc_dc(reg_read(pca,
-+                                                        PCA9632_REG_GRPPWM)));
-+      }
-+
-+      return sprintf(buf, "%d%% \n", calc_dc(reg_read(pca,
-+                                                 PCA9632_REG_GRPPWM) & 0xf0));
-+}
-+
-+static ssize_t set_group_dc(struct device *dev, struct device_attribute *attr,
-+                      const char *buf, size_t count)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pca9632_data *pca = i2c_get_clientdata(client);
-+
-+      unsigned int dc = simple_strtoul(buf, NULL, 10);
-+
-+      reg_set_bit_mask(pca, PCA9632_REG_GRPPWM, 0xff, dc);
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(group_dc, S_IRUGO | S_IWUSR, show_group_dc, set_group_dc);
-+
-+/*
-+ * LED driver output
-+ */
-+static ssize_t show_led_output(struct device *dev, struct device_attribute
-+                                      *attr, char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pca9632_data *pca = i2c_get_clientdata(client);
-+      int ldrx;
-+
-+      ldrx = reg_id_by_name(attr->attr.name);
-+
-+      return sprintf(buf, "%s \n",
-+                                  led_output_name[get_led_output(pca, ldrx)]);
-+
-+}
-+static ssize_t set_led_output(struct device *dev, struct device_attribute *attr,
-+                      const char *buf, size_t count)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pca9632_data *pca = i2c_get_clientdata(client);
-+      enum pca9632_led_output led_output;
-+      int ldrx;
-+
-+      led_output = simple_strtoul(buf, NULL, 10);
-+      ldrx = reg_id_by_name(attr->attr.name);
-+      config_led_output(pca, ldrx, led_output);
-+
-+      return count;
-+}
-+
-+static
-+DEVICE_ATTR(led0_output, S_IRUGO | S_IWUSR, show_led_output, set_led_output);
-+static
-+DEVICE_ATTR(led1_output, S_IRUGO | S_IWUSR, show_led_output, set_led_output);
-+static
-+DEVICE_ATTR(led2_output, S_IRUGO | S_IWUSR, show_led_output, set_led_output);
-+static
-+DEVICE_ATTR(led3_output, S_IRUGO | S_IWUSR, show_led_output, set_led_output);
-+
-+static struct attribute *pca_sysfs_entries[] = {
-+      &dev_attr_group_dmblnk.attr,
-+      &dev_attr_led0_pwm.attr,
-+      &dev_attr_led1_pwm.attr,
-+      &dev_attr_led2_pwm.attr,
-+      &dev_attr_led3_pwm.attr,
-+      &dev_attr_group_dc.attr,
-+      &dev_attr_group_freq.attr,
-+      &dev_attr_led0_output.attr,
-+      &dev_attr_led1_output.attr,
-+      &dev_attr_led2_output.attr,
-+      &dev_attr_led3_output.attr,
-+      NULL
-+};
-+
-+static struct attribute_group pca_attr_group = {
-+      .name   = NULL,                 /* put in device directory */
-+      .attrs  = pca_sysfs_entries,
-+};
-+
-+#ifdef CONFIG_PM
-+static int pca9632_suspend(struct device *dev, pm_message_t state)
-+{
-+      /* FIXME: Not implemented */
-+      return 0;
-+}
-+
-+static int pca9632_resume(struct device *dev)
-+{
-+      /* FIXME: Not implemented */
-+      return 0;
-+}
-+#else
-+#define pca9632_suspend NULL
-+#define pca9632_resume NULL
-+#endif
-+
-+static struct i2c_driver pca9632_driver = {
-+      .driver = {
-+              .name    = "pca9632",
-+              .suspend = pca9632_suspend,
-+              .resume  = pca9632_resume,
-+      },
-+      .id             = I2C_DRIVERID_PCA9632,
-+      .attach_adapter = pca9632_attach_adapter,
-+      .detach_client  = pca9632_detach_client,
-+};
-+
-+static int pca9632_detect(struct i2c_adapter *adapter, int address, int kind)
-+{
-+      struct i2c_client *new_client;
-+      struct pca9632_data *pca;
-+      int err;
-+
-+      pca = kzalloc(sizeof(struct pca9632_data), GFP_KERNEL);
-+      if (!pca)
-+              return -ENOMEM;
-+
-+      mutex_init(&pca->lock);
-+
-+      new_client = &pca->client;
-+      i2c_set_clientdata(new_client, pca);
-+      new_client->addr = address;
-+      new_client->adapter = adapter;
-+      new_client->driver = &pca9632_driver;
-+      new_client->flags = 0;
-+
-+      strlcpy(new_client->name, "pca9632", I2C_NAME_SIZE);
-+
-+      /* register with i2c core */
-+      err = i2c_attach_client(new_client);
-+      if (err)
-+              goto exit_kfree;
-+
-+      err = sysfs_create_group(&new_client->dev.kobj, &pca_attr_group);
-+      if (err)
-+              goto exit_detach;
-+
-+      /* software reset */
-+      if (!software_rst(adapter))
-+              dev_info(&pca->client.dev, "pca9632 sw-rst done\n");
-+
-+      /* enter normal mode */
-+      reg_set_bit_mask(pca, PCA9632_REG_MODE1, 0x10, PCA9632_NORMAL);
-+
-+      return 0;
-+
-+exit_detach:
-+      i2c_detach_client(new_client);
-+exit_kfree:
-+      kfree(pca);
-+
-+      return err;
-+}
-+
-+static int pca9632_attach_adapter(struct i2c_adapter *adapter)
-+{
-+      return i2c_probe(adapter, &addr_data, pca9632_detect);
-+}
-+
-+static int pca9632_detach_client(struct i2c_client *client)
-+{
-+      int err;
-+
-+      sysfs_remove_group(&client->dev.kobj, &pca_attr_group);
-+      err = i2c_detach_client(client);
-+
-+      if (err)
-+              return err;
-+
-+      kfree(i2c_get_clientdata(client));
-+
-+      return 0;
-+}
-+
-+static int __init pca9632_plat_probe(struct platform_device *pdev)
-+{
-+      /* FIXME: platform data should be attached here */
-+      pca9632_pdev = pdev;
-+
-+      return 0;
-+}
-+
-+static int pca9632_plat_remove(struct platform_device *pdev)
-+{
-+      return 0;
-+}
-+
-+static struct platform_driver pca9632_plat_driver = {
-+      .probe  = pca9632_plat_probe,
-+      .remove = pca9632_plat_remove,
-+      .driver = {
-+              .owner  = THIS_MODULE,
-+              .name   = "pca9632",
-+      },
-+};
-+
-+static int __init pca9632_init(void)
-+{
-+      int rc;
-+
-+      rc = platform_driver_register(&pca9632_plat_driver);
-+      if (!rc)
-+              i2c_add_driver(&pca9632_driver);
-+
-+      return rc;
-+}
-+
-+static void __exit pca9632_exit(void)
-+{
-+      i2c_del_driver(&pca9632_driver);
-+
-+      platform_driver_unregister(&pca9632_plat_driver);
-+}
-+
-+MODULE_AUTHOR("Matt Hsu <matt_hsu@openmoko.org>");
-+MODULE_DESCRIPTION("NXP PCA9632 driver");
-+MODULE_LICENSE("GPL");
-+
-+module_init(pca9632_init);
-+module_exit(pca9632_exit);
-diff --git a/drivers/i2c/chips/pca9632.h b/drivers/i2c/chips/pca9632.h
-new file mode 100644
-index 0000000..be2892e
---- /dev/null
-+++ b/drivers/i2c/chips/pca9632.h
-@@ -0,0 +1,24 @@
-+#ifndef _PCA9632_H
-+#define _PCA9632_H
-+
-+
-+enum pca9632_regs{
-+
-+      PCA9632_REG_MODE1       = 0x00,
-+      PCA9632_REG_MODE2       = 0x01,
-+      PCA9632_REG_PWM0        = 0x02,
-+      PCA9632_REG_PWM1        = 0x03,
-+      PCA9632_REG_PWM2        = 0x04,
-+      PCA9632_REG_PWM3        = 0x05,
-+      PCA9632_REG_GRPPWM      = 0x06,
-+      PCA9632_REG_GRPFREQ     = 0x07,
-+      PCA9632_REG_LEDOUT      = 0x08,
-+      PCA9632_REG_SUBADDR1    = 0x09,
-+      PCA9632_REG_SUBADDR2    = 0x0a,
-+      PCA9632_REG_SUBADDR3    = 0x0b,
-+      PCA9632_REG_ALLCALLADR1 = 0x0c,
-+};
-+
-+#define PCA9632_DMBLNK_SHIFT  5
-+
-+#endif /* _PCA9632_H */
-diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
-index ee60156..d5a63fe 100644
---- a/include/linux/i2c-id.h
-+++ b/include/linux/i2c-id.h
-@@ -170,6 +170,7 @@
- #define I2C_DRIVERID_PCF50606 1049
- #define I2C_DRIVERID_TSL256X 1050
- #define I2C_DRIVERID_PCF50633 1051
-+#define I2C_DRIVERID_PCA9632  1052
- /*
-  * ---- Adapter types ----------------------------------------------------
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1292-fix-glamo-mci-slow-clock-until-first-bulk.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1292-fix-glamo-mci-slow-clock-until-first-bulk.patch.patch
deleted file mode 100644 (file)
index 642f545..0000000
+++ /dev/null
@@ -1,261 +0,0 @@
-From 9e7ba57b104e9293f746342b7450b10d5fa0c4cd Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Mon, 22 Sep 2008 22:38:03 +0100
-Subject: [PATCH] fix-glamo-mci-slow-clock-until-first-bulk.patch
-
-This patch adds another module parameter to glamo-mci which sets the
-SD Card clock rate used inbetween powering the card and the completion of
-the first bulk transfer.  You can set it from kernel commandline like this.
-
-glamo_mci.sd_post_power_clock=1000000
-
-The period between changing the power state and the first bulk transfer
-completion is critical because larger SDHC cards take longer to initialize
-before they can service the bulk transfer, and the Glamo MMC unit has a
-fixed timeout length of a maximum of 4095 x 16 x SD Card clocks.  Large
-cards like 8GB Sandisk SDHC are not ready before this timeout is used up
-at default 16MHz.
-
-Subsequently, the card can handle 16MHz SD Clock and timeout durations
-okay.
-
-By default this patch operates the SD Clock at only 1MHz until the first
-bulk transfer is completed after each powerup action from the MCI stack.  It
-also keeps the SD Clock running during this time, and disables the SD Clock
-if the card is not present and the MCI stack removes power.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-mci.c |  108 +++++++++++++++++++++++++----------------
- drivers/mfd/glamo/glamo-mci.h |    2 +
- 2 files changed, 68 insertions(+), 42 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index 3eece08..cff43db 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -74,6 +74,23 @@ static int sd_slow_ratio = 8;
- module_param(sd_slow_ratio, int, 0644);
- /*
-+ * Post-power SD clock rate
-+ *
-+ * you can override this on kernel commandline using
-+ *
-+ *   glamo_mci.sd_post_power_clock=1000000
-+ *
-+ * for example
-+ *
-+ * After changing power to card, clock is held at this rate until first bulk
-+ * transfer completes
-+ */
-+
-+static int sd_post_power_clock = 1000000;
-+module_param(sd_post_power_clock, int, 0644);
-+
-+
-+/*
-  * SD Signal drive strength
-  *
-  * you can override this on kernel commandline using
-@@ -240,21 +257,35 @@ static void __glamo_mci_fix_card_div(struct glamo_mci_host *host, int div)
-               writew(readw(glamo_mci_def_pdata.pglamo->base +
-                    GLAMO_REG_CLOCK_GEN5_1) & (~GLAMO_CLOCK_GEN51_EN_DIV_TCLK),
-                    glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN5_1);
--      } else {
--              /* set the nearest prescaler factor
--              *
--              * register shared with SCLK divisor -- no chance of race because
--              * we don't use sensor interface
--              */
--              writew_dly((readw(glamo_mci_def_pdata.pglamo->base +
--                              GLAMO_REG_CLOCK_GEN8) & 0xff00) | div,
--                     glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN8);
--              /* enable clock to divider input */
--              writew_dly(readw(glamo_mci_def_pdata.pglamo->base +
--                      GLAMO_REG_CLOCK_GEN5_1) | GLAMO_CLOCK_GEN51_EN_DIV_TCLK,
--                   glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN5_1);
-+
-+              goto done;
-       }
-+      if (host->force_slow_during_powerup)
-+              div = host->clk_rate / sd_post_power_clock;
-+      else
-+              if (host->pdata->glamo_mci_use_slow)
-+                      if ((host->pdata->glamo_mci_use_slow)())
-+                              div = div * sd_slow_ratio;
-+
-+      if (div > 255)
-+              div = 255;
-+
-+      /*
-+       * set the nearest prescaler factor
-+       *
-+       * register shared with SCLK divisor -- no chance of race because
-+       * we don't use sensor interface
-+       */
-+      writew_dly((readw(glamo_mci_def_pdata.pglamo->base +
-+                      GLAMO_REG_CLOCK_GEN8) & 0xff00) | div,
-+              glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN8);
-+      /* enable clock to divider input */
-+      writew_dly(readw(glamo_mci_def_pdata.pglamo->base +
-+              GLAMO_REG_CLOCK_GEN5_1) | GLAMO_CLOCK_GEN51_EN_DIV_TCLK,
-+              glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN5_1);
-+
-+done:
-       spin_unlock_irqrestore(&clock_lock, flags);
- }
-@@ -284,7 +315,7 @@ static int __glamo_mci_set_card_clock(struct glamo_mci_host *host, int freq,
-               if (division)
-                       *division = 0xff;
--              if (!sd_idleclk)
-+              if (!sd_idleclk && !host->force_slow_during_powerup)
-                       /* clock off */
-                       __glamo_mci_fix_card_div(host, -1);
-       }
-@@ -327,6 +358,10 @@ static void glamo_mci_irq(unsigned int irq, struct irq_desc *desc)
-               goto done;
-       }
-+      /* disable the initial slow start after first bulk transfer */
-+      if (host->force_slow_during_powerup)
-+              host->force_slow_during_powerup--;
-+
-       if (host->pio_active == XFER_READ)
-               do_pio_read(host);
-@@ -341,7 +376,7 @@ static void glamo_mci_irq(unsigned int irq, struct irq_desc *desc)
-               host->cmd_is_stop = 0;
-       }
--      if (!sd_idleclk)
-+      if (!sd_idleclk && !host->force_slow_during_powerup)
-               /* clock off */
-               __glamo_mci_fix_card_div(host, -1);
-@@ -357,7 +392,6 @@ static int glamo_mci_send_command(struct glamo_mci_host *host,
- {
-       u8 u8a[6];
-       u16 fire = 0;
--      u16 timeout = 0xfff; /* max glamo MMC timeout, in units of 16 clocks */
-       /* if we can't do it, reject as busy */
-       if (!readw_dly(host->base + GLAMO_REG_MMC_RB_STAT1) &
-@@ -467,15 +501,9 @@ static int glamo_mci_send_command(struct glamo_mci_host *host,
-               fire |= GLAMO_FIRE_MMC_CC_BASIC; /* "basic command" */
-               break;
-       }
--      /* enforce timeout, clipping at default 65520 clocks if larger */
--      if (cmd->data)
--              /* so long as there is one... */
--              if (cmd->data->timeout_clks &&
--                  /* ... and it is not longer than we can handle */
--                  (cmd->data->timeout_clks <= 0xffff))
--                      timeout = cmd->data->timeout_clks >> 4; /* / 16 clks */
--      writew(timeout, host->base + GLAMO_REG_MMC_TIMEOUT);
-+      /* always largest timeout */
-+      writew(0xfff, host->base + GLAMO_REG_MMC_TIMEOUT);
-       /* Generate interrupt on txfer */
-       writew_dly((readw_dly(host->base + GLAMO_REG_MMC_BASIC) & 0x3e) |
-@@ -576,14 +604,7 @@ static void glamo_mci_send_request(struct mmc_host *mmc)
-       /* resume requested clock rate
-        * scale it down by sd_slow_ratio if platform requests it
-        */
--      if (host->pdata->glamo_mci_use_slow)
--              if ((host->pdata->glamo_mci_use_slow)())
--                      __glamo_mci_fix_card_div(host, host->clk_div *
--                                                               sd_slow_ratio);
--              else
--                      __glamo_mci_fix_card_div(host, host->clk_div);
--      else
--              __glamo_mci_fix_card_div(host, host->clk_div);
-+      __glamo_mci_fix_card_div(host, host->clk_div);
-       if (glamo_mci_send_command(host, cmd))
-               goto bail;
-@@ -633,6 +654,7 @@ static void glamo_mci_send_request(struct mmc_host *mmc)
-               goto done;
-       if (!(cmd->data->flags & (MMC_DATA_READ | MMC_DATA_WRITE)))
-               goto done;
-+
-       /*
-        * Otherwise can can use the interrupt as async completion --
-        * if there is read data coming, or we wait for write data to complete,
-@@ -676,7 +698,7 @@ done:
-       host->mrq = NULL;
-       mmc_request_done(host->mmc, cmd->mrq);
- bail:
--      if (!sd_idleclk)
-+      if (!sd_idleclk && !host->force_slow_during_powerup)
-               /* stop the clock to card */
-               __glamo_mci_fix_card_div(host, -1);
- }
-@@ -718,6 +740,12 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-       switch(ios->power_mode) {
-       case MMC_POWER_ON:
-       case MMC_POWER_UP:
-+              /*
-+               * we should use very slow clock until first bulk
-+               * transfer completes OK
-+               */
-+              host->force_slow_during_powerup = 1;
-+
-               if (host->vdd_current != ios->vdd) {
-                       host->pdata->glamo_set_mci_power(ios->power_mode,
-                                                        ios->vdd);
-@@ -734,6 +762,9 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-       default:
-               if (host->power_mode_current == MMC_POWER_OFF)
-                       break;
-+              /* never want clocking with dead card */
-+              __glamo_mci_fix_card_div(host, -1);
-+
-               glamo_engine_disable(glamo_mci_def_pdata.pglamo,
-                                    GLAMO_ENGINE_MMC);
-               host->pdata->glamo_set_mci_power(MMC_POWER_OFF, 0);
-@@ -751,7 +782,7 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-       if (powering)
-               msleep(1);
--      if (!sd_idleclk)
-+      if (!sd_idleclk && !host->force_slow_during_powerup)
-               /* stop the clock to card, because we are idle until transfer */
-               __glamo_mci_fix_card_div(host, -1);
-@@ -954,14 +985,7 @@ static int glamo_mci_suspend(struct platform_device *dev, pm_message_t state)
-        * make sure the clock was running during suspend and consequently
-        * resume
-        */
--      if (host->pdata->glamo_mci_use_slow)
--              if ((host->pdata->glamo_mci_use_slow)())
--                      __glamo_mci_fix_card_div(host, host->clk_div *
--                                                               sd_slow_ratio);
--              else
--                      __glamo_mci_fix_card_div(host, host->clk_div);
--      else
--              __glamo_mci_fix_card_div(host, host->clk_div);
-+      __glamo_mci_fix_card_div(host, host->clk_div);
-       /* we are going to do more commands to override this in
-        * mmc_suspend_host(), so we need to change sd_idleclk for the
-diff --git a/drivers/mfd/glamo/glamo-mci.h b/drivers/mfd/glamo/glamo-mci.h
-index f3f170e..38f6376 100644
---- a/drivers/mfd/glamo/glamo-mci.h
-+++ b/drivers/mfd/glamo/glamo-mci.h
-@@ -44,6 +44,8 @@ struct glamo_mci_host {
-       unsigned long           real_rate;
-       u8                      prescaler;
-+      int                     force_slow_during_powerup;
-+
-       unsigned                sdiimsk;
-       int                     dodma;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1293-fix-build-with-no-CONFIG_MMC.patch b/target/linux/s3c24xx/patches-2.6.24/1293-fix-build-with-no-CONFIG_MMC.patch
deleted file mode 100644 (file)
index 68a2d98..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-From 968c41d0c32099d78927849a71e2ef3143cc05e7 Mon Sep 17 00:00:00 2001
-From: Andrzej Zaborowski <balrog@zabor.org>
-Date: Mon, 22 Sep 2008 23:01:47 +0100
-Subject: [PATCH] fix-build-with-no-CONFIG_MMC
-
-I hit this when updating to 2.6.26.  Also if CONFIG_MMC is enabled this
-patch converts this horrible horrible hack into a horrible hack by using
-dev->resume() (untested).
-
-Signed-off-by: Andrzej Zaborowski <balrog@zabor.org>
----
- arch/arm/mach-s3c2440/mach-gta02.c |    6 +++---
- drivers/mfd/glamo/glamo-mci.c      |    4 +---
- 2 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index c15f072..435378a 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1417,12 +1417,12 @@ static int gta02_glamo_mci_all_dependencies_resumed(struct platform_device *dev)
- static void gta02_glamo_mci_suspending(struct platform_device *dev)
- {
--      void glamo_mci_resume(void *dev); /* little white lies about types */
--
--      resume_dep_glamo_mci_pcf.callback = glamo_mci_resume;
-+#if defined(CONFIG_MFD_GLAMO_MCI) && defined(CONFIG_PM)
-+      resume_dep_glamo_mci_pcf.callback = (void *)dev->dev.driver->resume;
-       resume_dep_glamo_mci_pcf.context = (void *)dev;
-       pcf50633_register_resume_dependency(pcf50633_global,
-                                                    &resume_dep_glamo_mci_pcf);
-+#endif
- }
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index cff43db..d5099a0 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -1006,7 +1006,7 @@ static int glamo_mci_suspend(struct platform_device *dev, pm_message_t state)
-       return ret;
- }
--int glamo_mci_resume(struct platform_device *dev)
-+static int glamo_mci_resume(struct platform_device *dev)
- {
-       struct mmc_host *mmc = platform_get_drvdata(dev);
-       struct glamo_mci_host   *host = mmc_priv(mmc);
-@@ -1025,8 +1025,6 @@ int glamo_mci_resume(struct platform_device *dev)
-       return ret;
- }
--EXPORT_SYMBOL_GPL(glamo_mci_resume);
--
- #else /* CONFIG_PM */
- #define glamo_mci_suspend NULL
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1294-revert-fix-build-with-no-config_mmc-glamo-resume-cal.patch b/target/linux/s3c24xx/patches-2.6.24/1294-revert-fix-build-with-no-config_mmc-glamo-resume-cal.patch
deleted file mode 100644 (file)
index 6f36d7f..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-From bc2caff9cdef8a16297a2cb196306f88fa5ea2c2 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Thu, 2 Oct 2008 12:40:10 +0100
-Subject: [PATCH] revert-fix-build-with-no-config_mmc-glamo-resume-callback-part.patch
-
-Thomas White noticed that the recent patch from Andrzej cleaning up a
-nasty cast in the resume_dependency stuff for Glamo broke resume.  The
-problem was that the wrong resume callback was arrived at by the new
-code, the one in the device's device_driver struct rather than the
-struct platform_driver that actually holds the right pointer.
-
-Since this code will be gone in 2.6.26, I reverted this part of Andrzej's
-patch, tidying the cast a bit anyway.
-
-Reported-by: Thomas White <taw27@cam.ac.uk>
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |    4 +++-
- drivers/mfd/glamo/glamo-mci.c      |    3 ++-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 435378a..467c417 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1417,8 +1417,10 @@ static int gta02_glamo_mci_all_dependencies_resumed(struct platform_device *dev)
- static void gta02_glamo_mci_suspending(struct platform_device *dev)
- {
-+      int glamo_mci_resume(struct platform_device *dev);
-+      
- #if defined(CONFIG_MFD_GLAMO_MCI) && defined(CONFIG_PM)
--      resume_dep_glamo_mci_pcf.callback = (void *)dev->dev.driver->resume;
-+      resume_dep_glamo_mci_pcf.callback = (void (*)(void *))glamo_mci_resume;
-       resume_dep_glamo_mci_pcf.context = (void *)dev;
-       pcf50633_register_resume_dependency(pcf50633_global,
-                                                    &resume_dep_glamo_mci_pcf);
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index d5099a0..fb6224d 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -1006,7 +1006,7 @@ static int glamo_mci_suspend(struct platform_device *dev, pm_message_t state)
-       return ret;
- }
--static int glamo_mci_resume(struct platform_device *dev)
-+int glamo_mci_resume(struct platform_device *dev)
- {
-       struct mmc_host *mmc = platform_get_drvdata(dev);
-       struct glamo_mci_host   *host = mmc_priv(mmc);
-@@ -1025,6 +1025,7 @@ static int glamo_mci_resume(struct platform_device *dev)
-       return ret;
- }
-+EXPORT_SYMBOL_GPL(glamo_mci_resume);
- #else /* CONFIG_PM */
- #define glamo_mci_suspend NULL
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1295-This-patch-adds-a-framebuffer-notifier-in-order-to-d.patch b/target/linux/s3c24xx/patches-2.6.24/1295-This-patch-adds-a-framebuffer-notifier-in-order-to-d.patch
deleted file mode 100644 (file)
index f698c82..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-From 9aa87d67df2e59eea15f70c4e58f8bde10e5953b Mon Sep 17 00:00:00 2001
-From: Harald Welte <laforge@openmoko.org>
-Date: Wed, 8 Oct 2008 11:13:46 +0100
-Subject: [PATCH] This patch adds a framebuffer notifier in order to detect
- FB_BLANK events and switch the JBT6K74 LCM controller into
- its power saving mode.
-
-This has the potential of saving something like 50mW during screen blank.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- drivers/video/display/jbt6k74.c |   48 +++++++++++++++++++++++++++++++++++++++
- 1 files changed, 48 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c
-index b406298..9570543 100644
---- a/drivers/video/display/jbt6k74.c
-+++ b/drivers/video/display/jbt6k74.c
-@@ -3,6 +3,7 @@
-  * Copyright (C) 2006-2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>,
-  *       Stefan Schmidt <stefan@openmoko.org>
-+ * Copyright (C) 2008 by Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-  * This program is free software; you can redistribute it and/or
-@@ -21,6 +22,7 @@
-  * MA 02111-1307 USA
-  *
-  */
-+
- #include <linux/kernel.h>
- #include <linux/types.h>
- #include <linux/module.h>
-@@ -28,6 +30,7 @@
- #include <linux/platform_device.h>
- #include <linux/delay.h>
- #include <linux/jbt6k74.h>
-+#include <linux/fb.h>
- enum jbt_register {
-       JBT_REG_SLEEP_IN                = 0x10,
-@@ -111,6 +114,7 @@ struct jbt_info {
-       enum jbt_state state, last_state;
-       struct spi_device *spi_dev;
-       struct mutex lock;              /* protects tx_buf and reg_cache */
-+      struct notifier_block fb_notif;
-       u16 tx_buf[8];
-       u16 reg_cache[0xEE];
-       int have_resumed;
-@@ -548,6 +552,40 @@ static struct attribute_group jbt_attr_group = {
-       .attrs  = jbt_sysfs_entries,
- };
-+static int fb_notifier_callback(struct notifier_block *self,
-+                              unsigned long event, void *data)
-+{
-+      struct jbt_info *jbt;
-+      struct fb_event *evdata = data;
-+      int fb_blank;
-+
-+      if (event != FB_EVENT_BLANK && event != FB_EVENT_CONBLANK)
-+              return 0;
-+
-+      fb_blank = *(int *)evdata->data;
-+      jbt = container_of(self, struct jbt_info, fb_notif);
-+
-+      switch (fb_blank) {
-+      case FB_BLANK_UNBLANK:
-+      case FB_BLANK_NORMAL:
-+              jbt6k74_enter_state(jbt, JBT_STATE_NORMAL);
-+              jbt6k74_display_onoff(jbt, 1);
-+              break;
-+      case FB_BLANK_VSYNC_SUSPEND:
-+      case FB_BLANK_HSYNC_SUSPEND:
-+              /* FIXME: we disable SLEEP since it would result in
-+               * a visible artefact (white screen) before the backlight
-+               * is dimmed to a dark enough level */
-+              /* jbt6k74_enter_state(jbt, JBT_STATE_SLEEP); */
-+              break;
-+      case FB_BLANK_POWERDOWN:
-+              jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);
-+              break;
-+      }
-+
-+      return 0;
-+}
-+
- /* linux device model infrastructure */
- static int __devinit jbt_probe(struct spi_device *spi)
-@@ -595,8 +633,17 @@ static int __devinit jbt_probe(struct spi_device *spi)
-               goto err_off;
-       }
-+      jbt->fb_notif.notifier_call = fb_notifier_callback;
-+      rc = fb_register_client(&jbt->fb_notif);
-+      if (rc < 0) {
-+              dev_err(&spi->dev, "cannot register notifier\n");
-+              goto err_sysfs;
-+      }
-+
-       return 0;
-+err_sysfs:
-+      sysfs_remove_group(&spi->dev.kobj, &jbt_attr_group);
- err_off:
-       jbt6k74_display_onoff(jbt, 0);
- err_standby:
-@@ -615,6 +662,7 @@ static int __devexit jbt_remove(struct spi_device *spi)
-       /* We don't want to switch off the display in case the user
-        * accidentially onloads the module (whose use count normally is 0) */
-+      fb_unregister_client(&jbt->fb_notif);
-       sysfs_remove_group(&spi->dev.kobj, &jbt_attr_group);
-       dev_set_drvdata(&spi->dev, NULL);
-       kfree(jbt);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1296-config-remove-gta01-wm8752-from-gta02-defconfig.patc.patch b/target/linux/s3c24xx/patches-2.6.24/1296-config-remove-gta01-wm8752-from-gta02-defconfig.patc.patch
deleted file mode 100644 (file)
index 962d73c..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From 2a6788eaaf0185f8db56353777e8f3f5dab1d665 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 8 Oct 2008 14:28:01 +0100
-Subject: [PATCH] config-remove-gta01-wm8752-from-gta02-defconfig.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- defconfig-2.6.24 |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index b875979..7273973 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -1268,7 +1268,7 @@ CONFIG_SND_USB_AUDIO=m
- CONFIG_SND_SOC=y
- CONFIG_SND_S3C24XX_SOC=y
- CONFIG_SND_S3C24XX_SOC_I2S=y
--CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=y
-+# CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753 is not set
- CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=y
- #
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1297-glamo_fb-Cosmetic-cleanup.patch b/target/linux/s3c24xx/patches-2.6.24/1297-glamo_fb-Cosmetic-cleanup.patch
deleted file mode 100644 (file)
index 04381df..0000000
+++ /dev/null
@@ -1,196 +0,0 @@
-From 3817f491a41455d4a97f5d86217520816c2b6111 Mon Sep 17 00:00:00 2001
-From: Harald Welte <laforge@openmoko.org>
-Date: Wed, 8 Oct 2008 21:35:56 +0100
-Subject: [PATCH] glamo_fb: Cosmetic cleanup
-
-Remove dead code and coding style fixes. Purely cosmetic.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- drivers/mfd/glamo/glamo-fb.c |   78 +++++++++++------------------------------
- 1 files changed, 21 insertions(+), 57 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c
-index 7feef32..aa901dd 100644
---- a/drivers/mfd/glamo/glamo-fb.c
-+++ b/drivers/mfd/glamo/glamo-fb.c
-@@ -1,6 +1,6 @@
- /* Smedia Glamo 336x/337x driver
-  *
-- * (C) 2007 by Openmoko, Inc.
-+ * (C) 2007-2008 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-@@ -237,11 +237,10 @@ enum orientation {
- };
--static void rotate_lcd(struct glamofb_handle *glamo,
--                       __u32 rotation)
-+/* the caller has to enxure lock_cmd is held and we are in cmd mode */
-+static void __rotate_lcd(struct glamofb_handle *glamo, __u32 rotation)
- {
-       int glamo_rot;
--/*    unsigned long flags; */
-       switch (rotation) {
-               case FB_ROTATE_UR:
-@@ -261,14 +260,6 @@ static void rotate_lcd(struct glamofb_handle *glamo,
-                       break;
-       }
--      /*
--       * ha ha we are only called when we are in cmd mode already
--       * printk(KERN_ERR"rotate_lcd spin_lock_irqsave\n");
--       * spin_lock_irqsave(&glamo->lock_cmd, flags);
--       *
--       * if (glamofb_cmd_mode(glamo, 1))
--       *              goto out_unlock;
--       */
-       reg_set_bit_mask(glamo,
-                        GLAMO_REG_LCD_WIDTH,
-                        GLAMO_LCD_ROT_MODE_MASK,
-@@ -278,12 +269,6 @@ static void rotate_lcd(struct glamofb_handle *glamo,
-                        GLAMO_LCD_MODE1_ROTATE_EN,
-                        (glamo_rot != GLAMO_LCD_ROT_MODE_0)?
-                                GLAMO_LCD_MODE1_ROTATE_EN : 0);
--/*    glamofb_cmd_mode(glamo, 0);
--
--out_unlock:
--      printk(KERN_ERR"rotate_lcd spin_unlock_irqrestore\n");
--      spin_unlock_irqrestore(&glamo->lock_cmd, flags);
--*/
- }
- static enum orientation get_orientation(struct fb_var_screeninfo *var)
-@@ -296,14 +281,17 @@ static enum orientation get_orientation(struct fb_var_screeninfo *var)
- static int will_orientation_change(struct fb_var_screeninfo *var)
- {
--      enum  orientation orient = get_orientation(var);
-+      enum orientation orient = get_orientation(var);
-+
-       switch (orient) {
-               case ORIENTATION_LANDSCAPE:
--                      if (var->rotate == FB_ROTATE_UR || var->rotate == FB_ROTATE_UD)
-+                      if (var->rotate == FB_ROTATE_UR ||
-+                          var->rotate == FB_ROTATE_UD)
-                               return 1;
-                       break;
-               case ORIENTATION_PORTRAIT:
--                      if (var->rotate == FB_ROTATE_CW || var->rotate == FB_ROTATE_CCW)
-+                      if (var->rotate == FB_ROTATE_CW ||
-+                          var->rotate == FB_ROTATE_CCW)
-                               return 1;
-                       break;
-       }
-@@ -316,8 +304,6 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
-       int sync, bp, disp, fp, total, xres, yres, pitch, orientation_changing;
-       unsigned long flags;
--/*    GLAMO_LOG("enter: glamo:%#x, var:%#x\n", (unsigned)glamo, (unsigned)var);
--*/
-       if (!glamo || !var)
-               return;
-@@ -333,27 +319,18 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
-       xres = var->xres;
-       yres = var->yres;
--/*    GLAMO_LOG("xres:%d, yres:%d, rotate:%d\n", xres, yres, var->rotate);
--*/
--      /*
--       * figure out if orientation is going to change
--       */
-+
-+      /* figure out if orientation is going to change */
-       orientation_changing = will_orientation_change(var);
--/*    GLAMO_LOG("orientation_changing:%d\n", orientation_changing);
--*/
--        /*
--         * adjust the pitch according to new orientation to come
--         */
-+
-+        /* adjust the pitch according to new orientation to come */
-         if (orientation_changing) {
-               pitch = var->yres * var->bits_per_pixel / 8;
-         } else {
-               pitch = var->xres * var->bits_per_pixel / 8;
-         }
--/*    GLAMO_LOG("pitch:%d\n", pitch);
--*/
--      /*
--       * set the awaiten LCD geometry
--       */
-+
-+      /* set the awaiten LCD geometry */
-       reg_set_bit_mask(glamo,
-                        GLAMO_REG_LCD_WIDTH,
-                        GLAMO_LCD_WIDTH_MASK,
-@@ -367,16 +344,10 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
-                        GLAMO_LCD_PITCH_MASK,
-                        pitch);
--/*    GLAMO_LOG("mark:\n");*/
--      /*
--       * honour the rotation request
--       */
--      rotate_lcd(glamo, var->rotate);
-+      /* honour the rotation request */
-+      __rotate_lcd(glamo, var->rotate);
--      /*
--       * update the reported geometry
--       * of the framebuffer.
--       */
-+      /* update the reported geometry of the framebuffer. */
-       if (orientation_changing) {
-               var->xres_virtual = var->xres = yres;
-               var->yres_virtual = var->yres = xres;
-@@ -385,11 +356,7 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
-               var->yres_virtual = var->yres = yres;
-       }
--/*    GLAMO_LOG("reported res:(%d,%d)\n", var->xres, var->yres);
--*/
--      /*
--       * update scannout timings
--       */
-+      /* update scannout timings */
-       sync = 0;
-       bp = sync + var->hsync_len;
-       disp = bp + var->left_margin;
-@@ -407,8 +374,6 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
-       reg_set_bit_mask(glamo, GLAMO_REG_LCD_HORIZ_DISP_END,
-                        GLAMO_LCD_HV_RETR_DISP_END_MASK, fp);
--/*    GLAMO_LOG("mark:\n");
--*/
-       sync = 0;
-       bp = sync + var->vsync_len;
-       disp = bp + var->upper_margin;
-@@ -426,10 +391,8 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
-       reg_set_bit_mask(glamo, GLAMO_REG_LCD_VERT_DISP_END,
-                        GLAMO_LCD_HV_RETR_DISP_END_MASK, fp);
--/*    GLAMO_LOG("mark:\n"); */
-       glamofb_cmd_mode(glamo, 0);
--/*    GLAMO_LOG("leave:\n"); */
- out_unlock:
-       spin_unlock_irqrestore(&glamo->lock_cmd, flags);
- }
-@@ -461,7 +424,8 @@ static int glamofb_blank(int blank_mode, struct fb_info *info)
-       return 0;
- }
--static inline unsigned int chan_to_field(unsigned int chan, struct fb_bitfield *bf)
-+static inline unsigned int chan_to_field(unsigned int chan,
-+                                       struct fb_bitfield *bf)
- {
-       chan &= 0xffff;
-       chan >>= 16 - bf->length;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1298-glamo_fb-sync-comment-with-code.patch b/target/linux/s3c24xx/patches-2.6.24/1298-glamo_fb-sync-comment-with-code.patch
deleted file mode 100644 (file)
index 651ac0b..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-From 407b8adb446122b550e517f37f182a872308d16f Mon Sep 17 00:00:00 2001
-From: Harald Welte <laforge@openmoko.org>
-Date: Wed, 8 Oct 2008 21:36:10 +0100
-Subject: [PATCH] glamo_fb: sync comment with code
-
-the comment claims that DHCLK is enabled, while the
-code actually disables it.
-
-No code change, purely cosmetic patch.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- drivers/mfd/glamo/glamo-fb.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c
-index aa901dd..8f5d6b1 100644
---- a/drivers/mfd/glamo/glamo-fb.c
-+++ b/drivers/mfd/glamo/glamo-fb.c
-@@ -104,7 +104,7 @@ static struct glamo_script glamo_regs[] = {
-        * no TVCLK, no partial display, hw dest color from fb,
-        * no partial display mode, LCD1, software flip,  */
-       { GLAMO_REG_LCD_MODE2, 0x1020 },
--        /* no video flip, no ptr, no ptr, dhclk,
-+        /* no video flip, no ptr, no ptr, dhclk off,
-          * normal mode,  no cpuif,
-          * res, serial msb first, single fb, no fr ctrl,
-          * cpu if bits all zero, no crc
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1299-glamo_fb-Implement-screen-blanking.patch b/target/linux/s3c24xx/patches-2.6.24/1299-glamo_fb-Implement-screen-blanking.patch
deleted file mode 100644 (file)
index 3004a83..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-From a2ef813d2f439a3e9f377d33a2e5baad098afb7e Mon Sep 17 00:00:00 2001
-From: Harald Welte <laforge@openmoko.org>
-Date: Wed, 8 Oct 2008 21:36:23 +0100
-Subject: [PATCH] glamo_fb: Implement screen blanking
-
-This patch implements fb_blank() for the glamo-fb driver, which switches off
-the pixel clock (DCLK) for power saving.
-
-We currently delay the actual pixel clock switch until we enter
-FB_BLANK_POWERDOWN, since the backlight fade is slow and we don't want the
-user to see artefacts on the screen while the backlight is fading out.
-
-So since the X server first sends FB_BLANK_{V,H}SYNC_SUSPEND, we start the
-backlight fade here, and only once we get FB_BLANK_POWERDOWN the pixel clock is
-disabled.
-
-There are no measurements yet, but the power savings should be double, since
-there is no longer any  generation of the high-frequency LCM signals, and
-there are no video-related SDRAM accesses anymore.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- drivers/mfd/glamo/glamo-core.c |   32 ++++++++++++++++++++++++++++++++
- drivers/mfd/glamo/glamo-core.h |    6 ++++++
- drivers/mfd/glamo/glamo-fb.c   |   29 ++++++++++++++++++++++++++++-
- 3 files changed, 66 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index 2619c5f..58ee3e2 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -524,6 +524,38 @@ int glamo_engine_disable(struct glamo_core *glamo, enum glamo_engine engine)
- }
- EXPORT_SYMBOL_GPL(glamo_engine_disable);
-+static const u_int16_t engine_clock_regs[__NUM_GLAMO_ENGINES] = {
-+      [GLAMO_ENGINE_LCD]      = GLAMO_REG_CLOCK_LCD,
-+      [GLAMO_ENGINE_MMC]      = GLAMO_REG_CLOCK_MMC,
-+      [GLAMO_ENGINE_ISP]      = GLAMO_REG_CLOCK_ISP,
-+      [GLAMO_ENGINE_JPEG]     = GLAMO_REG_CLOCK_JPEG,
-+      [GLAMO_ENGINE_3D]       = GLAMO_REG_CLOCK_3D,
-+      [GLAMO_ENGINE_2D]       = GLAMO_REG_CLOCK_2D,
-+      [GLAMO_ENGINE_MPEG_ENC] = GLAMO_REG_CLOCK_MPEG,
-+      [GLAMO_ENGINE_MPEG_DEC] = GLAMO_REG_CLOCK_MPEG,
-+};
-+
-+void glamo_engine_clkreg_set(struct glamo_core *glamo,
-+                           enum glamo_engine engine,
-+                           u_int16_t mask, u_int16_t val)
-+{
-+      reg_set_bit_mask(glamo, engine_clock_regs[engine], mask, val);
-+}
-+EXPORT_SYMBOL_GPL(glamo_engine_clkreg_set);
-+
-+u_int16_t glamo_engine_clkreg_get(struct glamo_core *glamo,
-+                                enum glamo_engine engine)
-+{
-+      u_int16_t val;
-+
-+      spin_lock(&glamo->lock);
-+      val = __reg_read(glamo, engine_clock_regs[engine]);
-+      spin_unlock(&glamo->lock);
-+
-+      return val;
-+}
-+EXPORT_SYMBOL_GPL(glamo_engine_clkreg_get);
-+
- struct glamo_script reset_regs[] = {
-       [GLAMO_ENGINE_LCD] = {
-               GLAMO_REG_CLOCK_LCD, GLAMO_CLOCK_LCD_RESET
-diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h
-index ac5eacf..fb5f0f6 100644
---- a/drivers/mfd/glamo/glamo-core.h
-+++ b/drivers/mfd/glamo/glamo-core.h
-@@ -98,4 +98,10 @@ void glamo_engine_reset(struct glamo_core *glamo, enum glamo_engine engine);
- int glamo_engine_reclock(struct glamo_core *glamo,
-                        enum glamo_engine engine, int ps);
-+void glamo_engine_clkreg_set(struct glamo_core *glamo,
-+                           enum glamo_engine engine,
-+                           u_int16_t mask, u_int16_t val);
-+
-+u_int16_t glamo_engine_clkreg_get(struct glamo_core *glamo,
-+                                enum glamo_engine engine);
- #endif /* __GLAMO_CORE_H */
-diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c
-index 8f5d6b1..5cd6e05 100644
---- a/drivers/mfd/glamo/glamo-fb.c
-+++ b/drivers/mfd/glamo/glamo-fb.c
-@@ -420,7 +420,34 @@ static int glamofb_set_par(struct fb_info *info)
- static int glamofb_blank(int blank_mode, struct fb_info *info)
- {
--      /* FIXME */
-+      struct glamofb_handle *gfb = info->par;
-+      struct glamo_core *gcore = gfb->mach_info->glamo;
-+
-+      dev_dbg(gfb->dev, "glamofb_blank(%u)\n", blank_mode);
-+
-+      switch (blank_mode) {
-+      case FB_BLANK_VSYNC_SUSPEND:
-+      case FB_BLANK_HSYNC_SUSPEND:
-+              /* FIXME: add pdata hook/flag to indicate whether
-+               * we should already switch off pixel clock here */
-+              break;
-+      case FB_BLANK_POWERDOWN:
-+              /* disable the pixel clock */
-+              glamo_engine_clkreg_set(gcore, GLAMO_ENGINE_LCD,
-+                                      GLAMO_CLOCK_LCD_EN_DCLK, 0);
-+              break;
-+      case FB_BLANK_UNBLANK:
-+      case FB_BLANK_NORMAL:
-+              /* enable the pixel clock */
-+              glamo_engine_clkreg_set(gcore, GLAMO_ENGINE_LCD,
-+                                      GLAMO_CLOCK_LCD_EN_DCLK,
-+                                      GLAMO_CLOCK_LCD_EN_DCLK);
-+              break;
-+      }
-+
-+      /* FIXME: once we have proper clock management in glamo-core,
-+       * we can determine if other units need MCLK1 or the PLL, and
-+       * disable it if not used. */
-       return 0;
- }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1300-fix-gcc-4.3-false-modulo-optimization.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1300-fix-gcc-4.3-false-modulo-optimization.patch.patch
deleted file mode 100644 (file)
index 3ff0c07..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-From f5b973489beb1a1239dfad53e3ad6e36ff7ee958 Mon Sep 17 00:00:00 2001
-From: Segher Boessenkool <segher@kernel.crashing.org>
-Date: Thu, 9 Oct 2008 21:18:27 +0100
-Subject: [PATCH] fix-gcc-4.3-false-modulo-optimization.patch
-
-I tried to compile the current stable kernel
-(a2ef813d2f439a3e9f377d33a2e5baad098afb7e)
-and get the following errors:
-
-kernel/built-in.o: In function `timespec_add_ns':
-/mnt/data/Freerunner/Gentoo/rootinstall/usr/src/linux/include/linux/time.h:174:
-undefined reference to `__aeabi_uldivmod'
-/mnt/data/Freerunner/Gentoo/rootinstall/usr/src/linux/include/linux/time.h:179:
-undefined reference to `__aeabi_uldivmod'
-/mnt/data/Freerunner/Gentoo/rootinstall/usr/src/linux/include/linux/time.h:174:
-undefined reference to `__aeabi_uldivmod'
-/mnt/data/Freerunner/Gentoo/rootinstall/usr/src/linux/include/linux/time.h:179:
-undefined reference to `__aeabi_uldivmod'
-
-applying the following patch solved the problem:
---------
-Prevent gcc-4.3 form "optimizing" the while loop into a costly modulo operation.
-Patch found at http://lkml.org/lkml/2008/2/22/464.
-
-Reported-by: Sven Rebhan <odinshorse@googlemail.com>
-Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
----
- include/linux/time.h |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/include/linux/time.h b/include/linux/time.h
-index b04136d..3e8fd9e 100644
---- a/include/linux/time.h
-+++ b/include/linux/time.h
-@@ -173,6 +173,10 @@ static inline void timespec_add_ns(struct timespec *a, u64 ns)
- {
-       ns += a->tv_nsec;
-       while(unlikely(ns >= NSEC_PER_SEC)) {
-+              /* The following asm() prevents the compiler from
-+               * optimising this loop into a modulo operation.  */
-+              asm("" : "+r"(ns));
-+
-               ns -= NSEC_PER_SEC;
-               a->tv_sec++;
-       }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1301-clean-move-defconfigs-stable.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1301-clean-move-defconfigs-stable.patch.patch
deleted file mode 100644 (file)
index d6cbce9..0000000
+++ /dev/null
@@ -1,9083 +0,0 @@
-From f43814abe0f52033d5915881016408bd1da29d2b Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sat, 11 Oct 2008 11:46:01 +0100
-Subject: [PATCH] clean-move-defconfigs-stable.patch
-
-This patch changes stable to delete defconfig-2.6.22.5 and defconfig-2.6.24-maxmodules,
-and move defconfig-2.6.24 to arch/arm/gta02-moredrivers-defconfig
-
-What's left in toplevel is defconfig-gta01 and defconfig-gta02, which we can imagine
-is not that "confusing".
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/gta02-maxmodules-defconfig  | 1769 ++++++++++++++++++++++++++++++++
- arch/arm/gta02-moredrivers-defconfig | 1830 ++++++++++++++++++++++++++++++++++
- defconfig-2.6.22.5                   | 1827 ---------------------------------
- defconfig-2.6.24                     | 1830 ----------------------------------
- defconfig-2.6.24-maxmodules          | 1769 --------------------------------
- 5 files changed, 3599 insertions(+), 5426 deletions(-)
- create mode 100644 arch/arm/gta02-maxmodules-defconfig
- create mode 100644 arch/arm/gta02-moredrivers-defconfig
- delete mode 100644 defconfig-2.6.22.5
- delete mode 100644 defconfig-2.6.24
- delete mode 100644 defconfig-2.6.24-maxmodules
-
-diff --git a/arch/arm/gta02-maxmodules-defconfig b/arch/arm/gta02-maxmodules-defconfig
-new file mode 100644
-index 0000000..e773649
---- /dev/null
-+++ b/arch/arm/gta02-maxmodules-defconfig
-@@ -0,0 +1,1769 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.24
-+# Mon Feb 25 07:03:56 2008
-+#
-+CONFIG_ARM=y
-+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-+CONFIG_GENERIC_GPIO=y
-+# CONFIG_GENERIC_TIME is not set
-+# CONFIG_GENERIC_CLOCKEVENTS is not set
-+CONFIG_MMU=y
-+CONFIG_NO_IOPORT=y
-+CONFIG_GENERIC_HARDIRQS=y
-+CONFIG_STACKTRACE_SUPPORT=y
-+CONFIG_LOCKDEP_SUPPORT=y
-+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-+CONFIG_HARDIRQS_SW_RESEND=y
-+CONFIG_GENERIC_IRQ_PROBE=y
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_ZONE_DMA=y
-+CONFIG_FIQ=y
-+CONFIG_VECTORS_BASE=0xffff0000
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_LOCK_KERNEL=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_SYSFS_DEPRECATED is not set
-+# CONFIG_RELAY is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+CONFIG_SYSCTL=y
-+# CONFIG_EMBEDDED is not set
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=m
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=m
-+# CONFIG_DEFAULT_AS is not set
-+CONFIG_DEFAULT_DEADLINE=y
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="deadline"
-+
-+#
-+# System Type
-+#
-+# CONFIG_ARCH_AAEC2000 is not set
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_REALVIEW is not set
-+# CONFIG_ARCH_VERSATILE is not set
-+# CONFIG_ARCH_AT91 is not set
-+# CONFIG_ARCH_CLPS7500 is not set
-+# CONFIG_ARCH_CLPS711X is not set
-+# CONFIG_ARCH_CO285 is not set
-+# CONFIG_ARCH_EBSA110 is not set
-+# CONFIG_ARCH_EP93XX is not set
-+# CONFIG_ARCH_FOOTBRIDGE is not set
-+# CONFIG_ARCH_NETX is not set
-+# CONFIG_ARCH_H720X is not set
-+# CONFIG_ARCH_IMX is not set
-+# CONFIG_ARCH_IOP13XX is not set
-+# CONFIG_ARCH_IOP32X is not set
-+# CONFIG_ARCH_IOP33X is not set
-+# CONFIG_ARCH_IXP23XX is not set
-+# CONFIG_ARCH_IXP2000 is not set
-+# CONFIG_ARCH_IXP4XX is not set
-+# CONFIG_ARCH_L7200 is not set
-+# CONFIG_ARCH_KS8695 is not set
-+# CONFIG_ARCH_NS9XXX is not set
-+# CONFIG_ARCH_MXC is not set
-+# CONFIG_ARCH_PNX4008 is not set
-+# CONFIG_ARCH_PXA is not set
-+# CONFIG_ARCH_RPC is not set
-+# CONFIG_ARCH_SA1100 is not set
-+CONFIG_ARCH_S3C2410=y
-+# CONFIG_ARCH_SHARK is not set
-+# CONFIG_ARCH_LH7A40X is not set
-+# CONFIG_ARCH_DAVINCI is not set
-+# CONFIG_ARCH_OMAP is not set
-+CONFIG_PLAT_S3C24XX=y
-+CONFIG_CPU_S3C244X=y
-+CONFIG_S3C2410_DMA=y
-+# CONFIG_S3C2410_DMA_DEBUG is not set
-+CONFIG_MACH_SMDK=y
-+CONFIG_MACH_NEO1973=y
-+CONFIG_PLAT_S3C=y
-+CONFIG_CPU_LLSERIAL_S3C2410=y
-+CONFIG_CPU_LLSERIAL_S3C2440=y
-+
-+#
-+# Boot options
-+#
-+# CONFIG_S3C_BOOT_WATCHDOG is not set
-+# CONFIG_S3C_BOOT_ERROR_RESET is not set
-+
-+#
-+# Power management
-+#
-+CONFIG_S3C2410_PM_DEBUG=y
-+# CONFIG_S3C2410_PM_CHECK is not set
-+CONFIG_S3C_LOWLEVEL_UART_PORT=0
-+
-+#
-+# S3C2400 Machines
-+#
-+CONFIG_CPU_S3C2410=y
-+CONFIG_CPU_S3C2410_DMA=y
-+CONFIG_S3C2410_PM=y
-+CONFIG_S3C2410_GPIO=y
-+CONFIG_S3C2410_CLOCK=y
-+CONFIG_S3C2410_PWM=y
-+
-+#
-+# S3C2410 Machines
-+#
-+# CONFIG_ARCH_SMDK2410 is not set
-+# CONFIG_ARCH_H1940 is not set
-+# CONFIG_MACH_N30 is not set
-+# CONFIG_ARCH_BAST is not set
-+# CONFIG_MACH_OTOM is not set
-+# CONFIG_MACH_AML_M5900 is not set
-+# CONFIG_MACH_VR1000 is not set
-+CONFIG_MACH_QT2410=y
-+CONFIG_MACH_NEO1973_GTA01=y
-+
-+#
-+# S3C2412 Machines
-+#
-+# CONFIG_MACH_SMDK2413 is not set
-+# CONFIG_MACH_SMDK2412 is not set
-+# CONFIG_MACH_VSTMS is not set
-+CONFIG_CPU_S3C2440=y
-+CONFIG_S3C2440_DMA=y
-+CONFIG_S3C2440_C_FIQ=y
-+
-+#
-+# S3C2440 Machines
-+#
-+# CONFIG_MACH_ANUBIS is not set
-+# CONFIG_MACH_OSIRIS is not set
-+# CONFIG_MACH_RX3715 is not set
-+CONFIG_ARCH_S3C2440=y
-+# CONFIG_MACH_NEXCODER_2440 is not set
-+CONFIG_SMDK2440_CPU2440=y
-+CONFIG_MACH_HXD8=y
-+CONFIG_MACH_NEO1973_GTA02=y
-+# CONFIG_NEO1973_GTA02_2440 is not set
-+CONFIG_CPU_S3C2442=y
-+
-+#
-+# S3C2442 Machines
-+#
-+CONFIG_SMDK2440_CPU2442=y
-+
-+#
-+# S3C2443 Machines
-+#
-+# CONFIG_MACH_SMDK2443 is not set
-+
-+#
-+# Processor Type
-+#
-+CONFIG_CPU_32=y
-+CONFIG_CPU_ARM920T=y
-+CONFIG_CPU_32v4T=y
-+CONFIG_CPU_ABRT_EV4T=y
-+CONFIG_CPU_CACHE_V4WT=y
-+CONFIG_CPU_CACHE_VIVT=y
-+CONFIG_CPU_COPY_V4WB=y
-+CONFIG_CPU_TLB_V4WBI=y
-+CONFIG_CPU_CP15=y
-+CONFIG_CPU_CP15_MMU=y
-+
-+#
-+# Processor Features
-+#
-+CONFIG_ARM_THUMB=y
-+# CONFIG_CPU_ICACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-+# CONFIG_OUTER_CACHE is not set
-+
-+#
-+# Bus support
-+#
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Kernel Features
-+#
-+# CONFIG_TICK_ONESHOT is not set
-+CONFIG_PREEMPT=y
-+CONFIG_NO_IDLE_HZ=y
-+CONFIG_HZ=200
-+CONFIG_AEABI=y
-+CONFIG_OABI_COMPAT=y
-+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4096
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_ALIGNMENT_TRAP=y
-+
-+#
-+# Boot options
-+#
-+CONFIG_ZBOOT_ROM_TEXT=0x0
-+CONFIG_ZBOOT_ROM_BSS=0x0
-+CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
-+# CONFIG_XIP_KERNEL is not set
-+CONFIG_KEXEC=y
-+CONFIG_ATAGS_PROC=y
-+
-+#
-+# Floating point emulation
-+#
-+
-+#
-+# At least one emulation must be selected
-+#
-+CONFIG_FPE_NWFPE=y
-+# CONFIG_FPE_NWFPE_XP is not set
-+# CONFIG_FPE_FASTFPE is not set
-+
-+#
-+# Userspace binary formats
-+#
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+
-+#
-+# Power management options
-+#
-+CONFIG_PM=y
-+CONFIG_PM_LEGACY=y
-+CONFIG_PM_DEBUG=y
-+# CONFIG_PM_VERBOSE is not set
-+CONFIG_PM_SLEEP=y
-+CONFIG_SUSPEND_UP_POSSIBLE=y
-+CONFIG_SUSPEND=y
-+CONFIG_APM_EMULATION=y
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+CONFIG_PACKET_MMAP=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+CONFIG_XFRM_MIGRATE=y
-+CONFIG_NET_KEY=m
-+CONFIG_NET_KEY_MIGRATE=y
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+# CONFIG_IP_ROUTE_MULTIPATH is not set
-+# CONFIG_IP_ROUTE_VERBOSE 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=m
-+CONFIG_NET_IPGRE=m
-+# CONFIG_NET_IPGRE_BROADCAST is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_XFRM_TUNNEL=m
-+CONFIG_INET_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET_XFRM_MODE_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_BEET=m
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+CONFIG_TCP_MD5SIG=y
-+# CONFIG_IP_VS is not set
-+CONFIG_IPV6=m
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_IPCOMP=m
-+# CONFIG_IPV6_MIP6 is not set
-+CONFIG_INET6_XFRM_TUNNEL=m
-+CONFIG_INET6_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET6_XFRM_MODE_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_BEET=m
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_TUNNEL=m
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+CONFIG_NETFILTER=y
-+# CONFIG_NETFILTER_DEBUG is not set
-+
-+#
-+# Core Netfilter Configuration
-+#
-+CONFIG_NETFILTER_NETLINK=m
-+CONFIG_NETFILTER_NETLINK_QUEUE=m
-+CONFIG_NETFILTER_NETLINK_LOG=m
-+CONFIG_NF_CONNTRACK_ENABLED=m
-+CONFIG_NF_CONNTRACK=m
-+CONFIG_NF_CT_ACCT=y
-+CONFIG_NF_CONNTRACK_MARK=y
-+CONFIG_NF_CONNTRACK_EVENTS=y
-+CONFIG_NF_CT_PROTO_GRE=m
-+CONFIG_NF_CT_PROTO_SCTP=m
-+# CONFIG_NF_CT_PROTO_UDPLITE is not set
-+# CONFIG_NF_CONNTRACK_AMANDA is not set
-+CONFIG_NF_CONNTRACK_FTP=m
-+CONFIG_NF_CONNTRACK_H323=m
-+CONFIG_NF_CONNTRACK_IRC=m
-+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-+CONFIG_NF_CONNTRACK_PPTP=m
-+CONFIG_NF_CONNTRACK_SANE=m
-+CONFIG_NF_CONNTRACK_SIP=m
-+CONFIG_NF_CONNTRACK_TFTP=m
-+CONFIG_NF_CT_NETLINK=m
-+CONFIG_NETFILTER_XTABLES=m
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-+CONFIG_NETFILTER_XT_TARGET_DSCP=m
-+CONFIG_NETFILTER_XT_TARGET_MARK=m
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+CONFIG_NETFILTER_XT_MATCH_DCCP=m
-+CONFIG_NETFILTER_XT_MATCH_DSCP=m
-+CONFIG_NETFILTER_XT_MATCH_ESP=m
-+CONFIG_NETFILTER_XT_MATCH_HELPER=m
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_MAC=m
-+CONFIG_NETFILTER_XT_MATCH_MARK=m
-+CONFIG_NETFILTER_XT_MATCH_POLICY=m
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-+CONFIG_NETFILTER_XT_MATCH_REALM=m
-+CONFIG_NETFILTER_XT_MATCH_SCTP=m
-+CONFIG_NETFILTER_XT_MATCH_STATE=m
-+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-+CONFIG_NETFILTER_XT_MATCH_STRING=m
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-+
-+#
-+# IP: Netfilter Configuration
-+#
-+CONFIG_NF_CONNTRACK_IPV4=m
-+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-+# CONFIG_IP_NF_QUEUE is not set
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_MATCH_IPRANGE=m
-+CONFIG_IP_NF_MATCH_TOS=m
-+# CONFIG_IP_NF_MATCH_RECENT is not set
-+CONFIG_IP_NF_MATCH_ECN=m
-+CONFIG_IP_NF_MATCH_AH=m
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_MATCH_OWNER=m
-+CONFIG_IP_NF_MATCH_ADDRTYPE=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_TARGET_LOG=m
-+CONFIG_IP_NF_TARGET_ULOG=m
-+CONFIG_NF_NAT=m
-+CONFIG_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_NF_NAT_SNMP_BASIC=m
-+CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_FTP=m
-+CONFIG_NF_NAT_IRC=m
-+CONFIG_NF_NAT_TFTP=m
-+# CONFIG_NF_NAT_AMANDA is not set
-+CONFIG_NF_NAT_PPTP=m
-+CONFIG_NF_NAT_H323=m
-+CONFIG_NF_NAT_SIP=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_IP_NF_TARGET_TOS=m
-+CONFIG_IP_NF_TARGET_ECN=m
-+CONFIG_IP_NF_TARGET_TTL=m
-+CONFIG_IP_NF_TARGET_CLUSTERIP=m
-+# CONFIG_IP_NF_RAW is not set
-+# CONFIG_IP_NF_ARPTABLES is not set
-+
-+#
-+# IPv6: Netfilter Configuration (EXPERIMENTAL)
-+#
-+CONFIG_NF_CONNTRACK_IPV6=m
-+# CONFIG_IP6_NF_QUEUE is not set
-+CONFIG_IP6_NF_IPTABLES=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_OWNER=m
-+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-+CONFIG_IP6_NF_MATCH_AH=m
-+CONFIG_IP6_NF_MATCH_MH=m
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_LOG=m
-+CONFIG_IP6_NF_TARGET_REJECT=m
-+CONFIG_IP6_NF_MANGLE=m
-+CONFIG_IP6_NF_TARGET_HL=m
-+# CONFIG_IP6_NF_RAW is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+CONFIG_NET_SCHED=y
-+
-+#
-+# Queueing/Scheduling
-+#
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=m
-+CONFIG_NET_SCH_PRIO=m
-+# CONFIG_NET_SCH_RR is not set
-+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_NETEM=m
-+CONFIG_NET_SCH_INGRESS=m
-+
-+#
-+# Classification
-+#
-+CONFIG_NET_CLS=y
-+CONFIG_NET_CLS_BASIC=m
-+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_CLS_U32_PERF=y
-+CONFIG_CLS_U32_MARK=y
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
-+# CONFIG_NET_EMATCH is not set
-+# CONFIG_NET_CLS_ACT is not set
-+# CONFIG_NET_CLS_POLICE is not set
-+# CONFIG_NET_CLS_IND is not set
-+CONFIG_NET_SCH_FIFO=y
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_IRDA 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_HIDP=m
-+
-+#
-+# Bluetooth device drivers
-+#
-+CONFIG_BT_HCIUSB=m
-+CONFIG_BT_HCIUSB_SCO=y
-+# CONFIG_BT_HCIBTSDIO is not set
-+# CONFIG_BT_HCIUART is not set
-+# CONFIG_BT_HCIBCM203X is not set
-+# CONFIG_BT_HCIBPA10X is not set
-+# CONFIG_BT_HCIBFUSB is not set
-+# CONFIG_BT_HCIVHCI is not set
-+# CONFIG_AF_RXRPC is not set
-+CONFIG_FIB_RULES=y
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+CONFIG_WIRELESS_EXT=y
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=m
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=m
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_AFS_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+CONFIG_MTD_CFI_INTELEXT=y
-+# CONFIG_MTD_CFI_AMDSTD is not set
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+CONFIG_MTD_ABSENT=y
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+CONFIG_MTD_PHYSMAP=y
-+CONFIG_MTD_PHYSMAP_START=0x8000000
-+CONFIG_MTD_PHYSMAP_LEN=0
-+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-+# CONFIG_MTD_ARM_INTEGRATOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+CONFIG_MTD_NAND=y
-+CONFIG_MTD_NAND_VERIFY_WRITE=y
-+# CONFIG_MTD_NAND_ECC_SMC is not set
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+CONFIG_MTD_NAND_IDS=y
-+CONFIG_MTD_NAND_S3C2410=y
-+# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
-+CONFIG_MTD_NAND_S3C2410_HWECC=y
-+# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ALAUDA is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+# CONFIG_PARPORT is not set
-+CONFIG_PNP=y
-+CONFIG_PNP_DEBUG=y
-+
-+#
-+# Protocols
-+#
-+# CONFIG_PNPACPI is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=m
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_UB=m
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=4096
-+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=m
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=m
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+CONFIG_BLK_DEV_SR=m
-+# CONFIG_BLK_DEV_SR_VENDOR is not set
-+CONFIG_CHR_DEV_SG=m
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+CONFIG_SCSI_SCAN_ASYNC=y
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+CONFIG_TUN=m
-+# CONFIG_VETH is not set
-+# CONFIG_NET_SB1000 is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_AX88796 is not set
-+# CONFIG_SMC91X is not set
-+# CONFIG_DM9000 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_B44 is not set
-+CONFIG_CS89x0=m
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+CONFIG_USB_CATC=m
-+CONFIG_USB_KAWETH=m
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+CONFIG_USB_USBNET=y
-+CONFIG_USB_NET_AX8817X=m
-+CONFIG_USB_NET_CDCETHER=m
-+CONFIG_USB_NET_DM9601=m
-+CONFIG_USB_NET_GL620A=m
-+CONFIG_USB_NET_NET1080=m
-+CONFIG_USB_NET_PLUSB=m
-+CONFIG_USB_NET_MCS7830=m
-+CONFIG_USB_NET_RNDIS_HOST=m
-+CONFIG_USB_NET_CDC_SUBSET=m
-+CONFIG_USB_ALI_M5632=y
-+CONFIG_USB_AN2720=y
-+CONFIG_USB_BELKIN=y
-+CONFIG_USB_ARMLINUX=y
-+CONFIG_USB_EPSON2888=y
-+CONFIG_USB_KC2190=y
-+CONFIG_USB_NET_ZAURUS=m
-+# CONFIG_WAN is not set
-+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=m
-+CONFIG_PPP_MPPE=m
-+# CONFIG_PPPOE is not set
-+# CONFIG_PPPOL2TP is not set
-+# CONFIG_SLIP is not set
-+CONFIG_SLHC=m
-+# CONFIG_SHAPER is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
-+# CONFIG_INPUT_JOYDEV is not set
-+CONFIG_INPUT_EVDEV=y
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+# CONFIG_KEYBOARD_ATKBD is not set
-+# 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_KEYBOARD_STOWAWAY=m
-+CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_NEO1973=y
-+CONFIG_KEYBOARD_QT2410=y
-+CONFIG_INPUT_MOUSE=y
-+# CONFIG_MOUSE_PS2 is not set
-+# CONFIG_MOUSE_SERIAL is not set
-+# CONFIG_MOUSE_APPLETOUCH is not set
-+# CONFIG_MOUSE_VSXXXAA is not set
-+# CONFIG_MOUSE_GPIO is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+CONFIG_INPUT_TOUCHSCREEN=y
-+# CONFIG_TOUCHSCREEN_ADS7846 is not set
-+# CONFIG_TOUCHSCREEN_FUJITSU is not set
-+CONFIG_TOUCHSCREEN_S3C2410=y
-+# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
-+# CONFIG_TOUCHSCREEN_GUNZE is not set
-+# CONFIG_TOUCHSCREEN_ELO is not set
-+# CONFIG_TOUCHSCREEN_MTOUCH is not set
-+# CONFIG_TOUCHSCREEN_MK712 is not set
-+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-+# CONFIG_TOUCHSCREEN_UCB1400 is not set
-+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-+CONFIG_INPUT_MISC=y
-+# CONFIG_INPUT_ATI_REMOTE is not set
-+# CONFIG_INPUT_ATI_REMOTE2 is not set
-+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-+# CONFIG_INPUT_POWERMATE is not set
-+# CONFIG_INPUT_YEALINK is not set
-+CONFIG_INPUT_UINPUT=m
-+CONFIG_INPUT_LIS302DL=y
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+# CONFIG_SERIO_SERPORT is not set
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_NR_TTY_DEVICES=4
-+CONFIG_HW_CONSOLE=y
-+CONFIG_VT_HW_CONSOLE_BINDING=y
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_SERIAL_S3C2410=y
-+CONFIG_SERIAL_S3C2410_CONSOLE=y
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_LEGACY_PTYS is not set
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_GPIO is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+CONFIG_I2C_S3C2410=y
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_TINY_USB is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_SENSORS_DS1337 is not set
-+# CONFIG_SENSORS_DS1374 is not set
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+CONFIG_SENSORS_PCF50606=y
-+CONFIG_SENSORS_PCF50633=y
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_SENSORS_PCA9539 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+CONFIG_SENSORS_TSL256X=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
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+# CONFIG_SPI_DEBUG is not set
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+CONFIG_SPI_S3C24XX=y
-+CONFIG_SPI_S3C24XX_GPIO=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_W1 is not set
-+CONFIG_POWER_SUPPLY=y
-+# CONFIG_POWER_SUPPLY_DEBUG is not set
-+# CONFIG_PDA_POWER is not set
-+# CONFIG_APM_POWER is not set
-+# CONFIG_BATTERY_DS2760 is not set
-+CONFIG_BATTERY_BQ27000_HDQ=y
-+CONFIG_GTA02_HDQ=y
-+# CONFIG_HWMON is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_S3C2410_WATCHDOG=m
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+CONFIG_MFD_GLAMO=y
-+CONFIG_MFD_GLAMO_FB=y
-+CONFIG_MFD_GLAMO_SPI_GPIO=y
-+CONFIG_MFD_GLAMO_SPI_FB=y
-+CONFIG_MFD_GLAMO_MCI=y
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+CONFIG_FB=y
-+# CONFIG_FIRMWARE_EDID is not set
-+# CONFIG_FB_DDC is not set
-+CONFIG_FB_CFB_FILLRECT=y
-+CONFIG_FB_CFB_COPYAREA=y
-+CONFIG_FB_CFB_IMAGEBLIT=y
-+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-+# CONFIG_FB_SYS_FILLRECT is not set
-+# CONFIG_FB_SYS_COPYAREA is not set
-+# CONFIG_FB_SYS_IMAGEBLIT is not set
-+# CONFIG_FB_SYS_FOPS is not set
-+CONFIG_FB_DEFERRED_IO=y
-+# CONFIG_FB_SVGALIB is not set
-+# CONFIG_FB_MACMODES is not set
-+# CONFIG_FB_BACKLIGHT is not set
-+# CONFIG_FB_MODE_HELPERS is not set
-+# CONFIG_FB_TILEBLITTING is not set
-+
-+#
-+# Frame buffer hardware drivers
-+#
-+# CONFIG_FB_UVESA is not set
-+# CONFIG_FB_S1D13XXX is not set
-+CONFIG_FB_S3C2410=y
-+# CONFIG_FB_S3C2410_DEBUG is not set
-+# CONFIG_FB_VIRTUAL is not set
-+CONFIG_BACKLIGHT_LCD_SUPPORT=y
-+CONFIG_LCD_CLASS_DEVICE=y
-+# CONFIG_LCD_LTV350QV is not set
-+CONFIG_BACKLIGHT_CLASS_DEVICE=y
-+# CONFIG_BACKLIGHT_CORGI is not set
-+CONFIG_BACKLIGHT_GTA01=y
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+CONFIG_DISPLAY_JBT6K74=y
-+
-+#
-+# Console display driver support
-+#
-+# CONFIG_VGA_CONSOLE is not set
-+CONFIG_DUMMY_CONSOLE=y
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-+CONFIG_FONTS=y
-+# CONFIG_FONT_8x8 is not set
-+# CONFIG_FONT_8x16 is not set
-+CONFIG_FONT_6x11=y
-+# CONFIG_FONT_7x14 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
-+# CONFIG_FONT_10x18 is not set
-+# CONFIG_LOGO is not set
-+
-+#
-+# Sound
-+#
-+CONFIG_SOUND=y
-+
-+#
-+# Advanced Linux Sound Architecture
-+#
-+CONFIG_SND=m
-+CONFIG_SND_TIMER=m
-+CONFIG_SND_PCM=m
-+# CONFIG_SND_SEQUENCER is not set
-+CONFIG_SND_OSSEMUL=y
-+CONFIG_SND_MIXER_OSS=m
-+CONFIG_SND_PCM_OSS=m
-+CONFIG_SND_PCM_OSS_PLUGINS=y
-+# CONFIG_SND_DYNAMIC_MINORS is not set
-+CONFIG_SND_SUPPORT_OLD_API=y
-+CONFIG_SND_VERBOSE_PROCFS=y
-+# 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
-+
-+#
-+# ALSA ARM devices
-+#
-+
-+#
-+# SPI devices
-+#
-+
-+#
-+# USB devices
-+#
-+# CONFIG_SND_USB_AUDIO is not set
-+# CONFIG_SND_USB_CAIAQ is not set
-+
-+#
-+# System on Chip audio support
-+#
-+CONFIG_SND_SOC=m
-+CONFIG_SND_S3C24XX_SOC=m
-+CONFIG_SND_S3C24XX_SOC_I2S=m
-+CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
-+CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
-+
-+#
-+# SoC Audio support for SuperH
-+#
-+CONFIG_SND_SOC_WM8753=m
-+
-+#
-+# Open Sound System
-+#
-+# CONFIG_SOUND_PRIME is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=m
-+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-+# CONFIG_HID_FF is not set
-+# CONFIG_USB_HIDDEV is not set
-+
-+#
-+# USB HID Boot Protocol drivers
-+#
-+# CONFIG_USB_KBD is not set
-+# CONFIG_USB_MOUSE is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+CONFIG_USB_SUSPEND=y
-+# CONFIG_USB_PERSIST is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=m
-+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+CONFIG_USB_ACM=m
-+CONFIG_USB_PRINTER=m
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+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 is not set
-+CONFIG_USB_STORAGE_DPCM=y
-+CONFIG_USB_STORAGE_USBAT=y
-+CONFIG_USB_STORAGE_SDDR09=y
-+CONFIG_USB_STORAGE_SDDR55=y
-+CONFIG_USB_STORAGE_JUMPSHOT=y
-+CONFIG_USB_STORAGE_ALAUDA=y
-+CONFIG_USB_STORAGE_KARMA=y
-+CONFIG_USB_LIBUSUAL=y
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+
-+#
-+# USB Serial Converter support
-+#
-+CONFIG_USB_SERIAL=m
-+CONFIG_USB_SERIAL_GENERIC=y
-+CONFIG_USB_SERIAL_AIRCABLE=m
-+CONFIG_USB_SERIAL_AIRPRIME=m
-+CONFIG_USB_SERIAL_ARK3116=m
-+CONFIG_USB_SERIAL_BELKIN=m
-+# CONFIG_USB_SERIAL_CH341 is not set
-+CONFIG_USB_SERIAL_WHITEHEAT=m
-+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-+CONFIG_USB_SERIAL_CP2101=m
-+CONFIG_USB_SERIAL_CYPRESS_M8=m
-+CONFIG_USB_SERIAL_EMPEG=m
-+CONFIG_USB_SERIAL_FTDI_SIO=m
-+CONFIG_USB_SERIAL_FUNSOFT=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_GARMIN=m
-+CONFIG_USB_SERIAL_IPW=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_MOS7720=m
-+CONFIG_USB_SERIAL_MOS7840=m
-+CONFIG_USB_SERIAL_NAVMAN=m
-+CONFIG_USB_SERIAL_PL2303=m
-+# CONFIG_USB_SERIAL_OTI6858 is not set
-+CONFIG_USB_SERIAL_HP4X=m
-+CONFIG_USB_SERIAL_SAFE=m
-+CONFIG_USB_SERIAL_SAFE_PADDED=y
-+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-+CONFIG_USB_SERIAL_TI=m
-+CONFIG_USB_SERIAL_CYBERJACK=m
-+CONFIG_USB_SERIAL_XIRCOM=m
-+CONFIG_USB_SERIAL_OPTION=m
-+CONFIG_USB_SERIAL_OMNINET=m
-+# CONFIG_USB_SERIAL_DEBUG is not set
-+CONFIG_USB_EZUSB=y
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+CONFIG_USB_BERRY_CHARGE=m
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_LD is not set
-+CONFIG_USB_TRANCEVIBRATOR=m
-+CONFIG_USB_IOWARRIOR=m
-+# CONFIG_USB_TEST is not set
-+
-+#
-+# USB DSL modem support
-+#
-+
-+#
-+# USB Gadget Support
-+#
-+CONFIG_USB_GADGET=y
-+# CONFIG_USB_GADGET_DEBUG is not set
-+# CONFIG_USB_GADGET_DEBUG_FILES is not set
-+CONFIG_USB_GADGET_SELECTED=y
-+# CONFIG_USB_GADGET_AMD5536UDC is not set
-+# CONFIG_USB_GADGET_ATMEL_USBA is not set
-+# CONFIG_USB_GADGET_FSL_USB2 is not set
-+# CONFIG_USB_GADGET_NET2280 is not set
-+# CONFIG_USB_GADGET_PXA2XX is not set
-+# CONFIG_USB_GADGET_M66592 is not set
-+# CONFIG_USB_GADGET_GOKU is not set
-+# CONFIG_USB_GADGET_LH7A40X is not set
-+# CONFIG_USB_GADGET_OMAP is not set
-+CONFIG_USB_GADGET_S3C2410=y
-+CONFIG_USB_S3C2410=y
-+# CONFIG_USB_S3C2410_DEBUG is not set
-+# CONFIG_USB_GADGET_AT91 is not set
-+# CONFIG_USB_GADGET_DUMMY_HCD is not set
-+# CONFIG_USB_GADGET_DUALSPEED is not set
-+# CONFIG_USB_ZERO is not set
-+CONFIG_USB_ETH=m
-+CONFIG_USB_ETH_RNDIS=m
-+CONFIG_USB_GADGETFS=m
-+CONFIG_USB_FILE_STORAGE=m
-+CONFIG_USB_G_SERIAL=m
-+CONFIG_USB_MIDI_GADGET=m
-+
-+#
-+# SDIO support
-+#
-+CONFIG_SDIO=y
-+CONFIG_SDIO_S3C24XX=y
-+CONFIG_SDIO_S3C24XX_DMA=y
-+CONFIG_SDIO_AR6000_WLAN=y
-+CONFIG_MMC=y
-+# CONFIG_MMC_DEBUG is not set
-+CONFIG_MMC_UNSAFE_RESUME=y
-+
-+#
-+# MMC/SD Card Drivers
-+#
-+CONFIG_MMC_BLOCK=y
-+CONFIG_MMC_BLOCK_BOUNCE=y
-+# CONFIG_SDIO_UART is not set
-+
-+#
-+# MMC/SD Host Controller Drivers
-+#
-+# CONFIG_MMC_SPI is not set
-+CONFIG_MMC_S3C=y
-+CONFIG_NEW_LEDS=y
-+CONFIG_LEDS_CLASS=y
-+
-+#
-+# LED drivers
-+#
-+CONFIG_LEDS_S3C24XX=m
-+# CONFIG_LEDS_GPIO is not set
-+CONFIG_LEDS_NEO1973_VIBRATOR=y
-+CONFIG_LEDS_NEO1973_GTA02=y
-+
-+#
-+# LED Triggers
-+#
-+CONFIG_LEDS_TRIGGERS=y
-+CONFIG_LEDS_TRIGGER_TIMER=y
-+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+CONFIG_RTC_DEBUG=y
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+CONFIG_RTC_DRV_S3C=m
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+# CONFIG_EXT3_FS_XATTR is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+CONFIG_FS_POSIX_ACL=y
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+# CONFIG_MINIX_FS is not set
-+CONFIG_ROMFS_FS=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+CONFIG_DNOTIFY=y
-+# CONFIG_AUTOFS_FS is not set
-+CONFIG_AUTOFS4_FS=m
-+CONFIG_FUSE_FS=m
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+CONFIG_ISO9660_FS=m
-+CONFIG_JOLIET=y
-+# CONFIG_ZISOFS is not set
-+CONFIG_UDF_FS=m
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=y
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+CONFIG_CONFIGFS_FS=m
-+
-+#
-+# 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_YAFFS_FS=y
-+CONFIG_YAFFS_YAFFS1=y
-+CONFIG_YAFFS_9BYTE_TAGS=y
-+CONFIG_YAFFS_YAFFS2=y
-+CONFIG_YAFFS_AUTO_YAFFS2=y
-+# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-+CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
-+# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-+# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
-+CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+CONFIG_JFFS2_SUMMARY=y
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# 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
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_DIRECTIO is not set
-+CONFIG_NFSD=m
-+CONFIG_NFSD_V3=y
-+# CONFIG_NFSD_V3_ACL is not set
-+CONFIG_NFSD_V4=y
-+CONFIG_NFSD_TCP=y
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_EXPORTFS=m
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+CONFIG_CIFS=m
-+# CONFIG_CIFS_STATS is not set
-+CONFIG_CIFS_WEAK_PW_HASH=y
-+# CONFIG_CIFS_XATTR is not set
-+# CONFIG_CIFS_DEBUG2 is not set
-+# CONFIG_CIFS_EXPERIMENTAL 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
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=y
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+CONFIG_NLS_CODEPAGE_850=m
-+# 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=m
-+CONFIG_NLS_CODEPAGE_950=m
-+# 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=y
-+# 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=m
-+# CONFIG_DLM is not set
-+CONFIG_INSTRUMENTATION=y
-+# CONFIG_PROFILING is not set
-+# CONFIG_MARKERS is not set
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+# CONFIG_SCHED_DEBUG is not set
-+# CONFIG_SCHEDSTATS is not set
-+CONFIG_TIMER_STATS=y
-+# CONFIG_DEBUG_SLAB is not set
-+CONFIG_DEBUG_PREEMPT=y
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_LOCK_ALLOC is not set
-+# CONFIG_PROVE_LOCKING is not set
-+# CONFIG_LOCK_STAT is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+CONFIG_FRAME_POINTER=y
-+CONFIG_FORCED_INLINING=y
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_USER is not set
-+CONFIG_DEBUG_ERRORS=y
-+CONFIG_DEBUG_LL=y
-+# CONFIG_DEBUG_ICEDCC is not set
-+CONFIG_DEBUG_S3C_PORT=y
-+CONFIG_DEBUG_S3C_UART=0
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_HMAC=y
-+CONFIG_CRYPTO_XCBC=m
-+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_WP512=m
-+CONFIG_CRYPTO_TGR192=m
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+CONFIG_CRYPTO_LRW=m
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_FCRYPT=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_CAST6=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_KHAZAD=m
-+CONFIG_CRYPTO_ANUBIS=m
-+# CONFIG_CRYPTO_SEED is not set
-+CONFIG_CRYPTO_DEFLATE=m
-+CONFIG_CRYPTO_MICHAEL_MIC=m
-+CONFIG_CRYPTO_CRC32C=m
-+CONFIG_CRYPTO_CAMELLIA=m
-+CONFIG_CRYPTO_TEST=m
-+# CONFIG_CRYPTO_AUTHENC is not set
-+CONFIG_CRYPTO_HW=y
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_CRC_CCITT=m
-+CONFIG_CRC16=m
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+CONFIG_LIBCRC32C=m
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_TEXTSEARCH=y
-+CONFIG_TEXTSEARCH_KMP=m
-+CONFIG_TEXTSEARCH_BM=m
-+CONFIG_TEXTSEARCH_FSM=m
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_DMA=y
-diff --git a/arch/arm/gta02-moredrivers-defconfig b/arch/arm/gta02-moredrivers-defconfig
-new file mode 100644
-index 0000000..7273973
---- /dev/null
-+++ b/arch/arm/gta02-moredrivers-defconfig
-@@ -0,0 +1,1830 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.24
-+# Sat Mar  1 11:36:29 2008
-+#
-+CONFIG_ARM=y
-+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-+CONFIG_GENERIC_GPIO=y
-+# CONFIG_GENERIC_TIME is not set
-+# CONFIG_GENERIC_CLOCKEVENTS is not set
-+CONFIG_MMU=y
-+CONFIG_NO_IOPORT=y
-+CONFIG_GENERIC_HARDIRQS=y
-+CONFIG_STACKTRACE_SUPPORT=y
-+CONFIG_LOCKDEP_SUPPORT=y
-+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-+CONFIG_HARDIRQS_SW_RESEND=y
-+CONFIG_GENERIC_IRQ_PROBE=y
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_ZONE_DMA=y
-+CONFIG_FIQ=y
-+CONFIG_VECTORS_BASE=0xffff0000
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_LOCK_KERNEL=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION="-mokodev"
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=16
-+# CONFIG_CGROUPS is not set
-+CONFIG_FAIR_GROUP_SCHED=y
-+CONFIG_FAIR_USER_SCHED=y
-+# CONFIG_FAIR_CGROUP_SCHED is not set
-+# CONFIG_SYSFS_DEPRECATED is not set
-+# CONFIG_RELAY is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+CONFIG_SYSCTL=y
-+# CONFIG_EMBEDDED is not set
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=m
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=m
-+# CONFIG_DEFAULT_AS is not set
-+CONFIG_DEFAULT_DEADLINE=y
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="deadline"
-+
-+#
-+# System Type
-+#
-+# CONFIG_ARCH_AAEC2000 is not set
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_REALVIEW is not set
-+# CONFIG_ARCH_VERSATILE is not set
-+# CONFIG_ARCH_AT91 is not set
-+# CONFIG_ARCH_CLPS7500 is not set
-+# CONFIG_ARCH_CLPS711X is not set
-+# CONFIG_ARCH_CO285 is not set
-+# CONFIG_ARCH_EBSA110 is not set
-+# CONFIG_ARCH_EP93XX is not set
-+# CONFIG_ARCH_FOOTBRIDGE is not set
-+# CONFIG_ARCH_NETX is not set
-+# CONFIG_ARCH_H720X is not set
-+# CONFIG_ARCH_IMX is not set
-+# CONFIG_ARCH_IOP13XX is not set
-+# CONFIG_ARCH_IOP32X is not set
-+# CONFIG_ARCH_IOP33X is not set
-+# CONFIG_ARCH_IXP23XX is not set
-+# CONFIG_ARCH_IXP2000 is not set
-+# CONFIG_ARCH_IXP4XX is not set
-+# CONFIG_ARCH_L7200 is not set
-+# CONFIG_ARCH_KS8695 is not set
-+# CONFIG_ARCH_NS9XXX is not set
-+# CONFIG_ARCH_MXC is not set
-+# CONFIG_ARCH_PNX4008 is not set
-+# CONFIG_ARCH_PXA is not set
-+# CONFIG_ARCH_RPC is not set
-+# CONFIG_ARCH_SA1100 is not set
-+CONFIG_ARCH_S3C2410=y
-+# CONFIG_ARCH_SHARK is not set
-+# CONFIG_ARCH_LH7A40X is not set
-+# CONFIG_ARCH_DAVINCI is not set
-+# CONFIG_ARCH_OMAP is not set
-+CONFIG_PLAT_S3C24XX=y
-+CONFIG_CPU_S3C244X=y
-+CONFIG_S3C2410_DMA=y
-+# CONFIG_S3C2410_DMA_DEBUG is not set
-+CONFIG_MACH_SMDK=y
-+CONFIG_MACH_NEO1973=y
-+CONFIG_PLAT_S3C=y
-+CONFIG_CPU_LLSERIAL_S3C2410=y
-+CONFIG_CPU_LLSERIAL_S3C2440=y
-+
-+#
-+# Boot options
-+#
-+# CONFIG_S3C_BOOT_WATCHDOG is not set
-+# CONFIG_S3C_BOOT_ERROR_RESET is not set
-+
-+#
-+# Power management
-+#
-+# CONFIG_S3C2410_PM_DEBUG is not set
-+# CONFIG_S3C2410_PM_CHECK is not set
-+CONFIG_S3C_LOWLEVEL_UART_PORT=2
-+
-+#
-+# S3C2400 Machines
-+#
-+CONFIG_CPU_S3C2410=y
-+CONFIG_CPU_S3C2410_DMA=y
-+CONFIG_S3C2410_PM=y
-+CONFIG_S3C2410_GPIO=y
-+CONFIG_S3C2410_CLOCK=y
-+CONFIG_S3C2410_PWM=y
-+
-+#
-+# S3C2410 Machines
-+#
-+# CONFIG_ARCH_SMDK2410 is not set
-+# CONFIG_ARCH_H1940 is not set
-+# CONFIG_MACH_N30 is not set
-+# CONFIG_ARCH_BAST is not set
-+# CONFIG_MACH_OTOM is not set
-+# CONFIG_MACH_AML_M5900 is not set
-+# CONFIG_MACH_VR1000 is not set
-+CONFIG_MACH_QT2410=y
-+CONFIG_MACH_NEO1973_GTA01=y
-+
-+#
-+# S3C2412 Machines
-+#
-+# CONFIG_MACH_SMDK2413 is not set
-+# CONFIG_MACH_SMDK2412 is not set
-+# CONFIG_MACH_VSTMS is not set
-+CONFIG_CPU_S3C2440=y
-+CONFIG_S3C2440_DMA=y
-+CONFIG_S3C2440_C_FIQ=y
-+
-+#
-+# S3C2440 Machines
-+#
-+# CONFIG_MACH_ANUBIS is not set
-+# CONFIG_MACH_OSIRIS is not set
-+# CONFIG_MACH_RX3715 is not set
-+CONFIG_ARCH_S3C2440=y
-+# CONFIG_MACH_NEXCODER_2440 is not set
-+CONFIG_SMDK2440_CPU2440=y
-+CONFIG_MACH_HXD8=y
-+CONFIG_MACH_NEO1973_GTA02=y
-+# CONFIG_NEO1973_GTA02_2440 is not set
-+CONFIG_CPU_S3C2442=y
-+
-+#
-+# S3C2442 Machines
-+#
-+CONFIG_SMDK2440_CPU2442=y
-+
-+#
-+# S3C2443 Machines
-+#
-+# CONFIG_MACH_SMDK2443 is not set
-+
-+#
-+# Processor Type
-+#
-+CONFIG_CPU_32=y
-+CONFIG_CPU_ARM920T=y
-+CONFIG_CPU_32v4T=y
-+CONFIG_CPU_ABRT_EV4T=y
-+CONFIG_CPU_CACHE_V4WT=y
-+CONFIG_CPU_CACHE_VIVT=y
-+CONFIG_CPU_COPY_V4WB=y
-+CONFIG_CPU_TLB_V4WBI=y
-+CONFIG_CPU_CP15=y
-+CONFIG_CPU_CP15_MMU=y
-+
-+#
-+# Processor Features
-+#
-+CONFIG_ARM_THUMB=y
-+# CONFIG_CPU_ICACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-+# CONFIG_OUTER_CACHE is not set
-+
-+#
-+# Bus support
-+#
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Kernel Features
-+#
-+# CONFIG_TICK_ONESHOT is not set
-+CONFIG_PREEMPT=y
-+CONFIG_NO_IDLE_HZ=y
-+CONFIG_HZ=200
-+CONFIG_AEABI=y
-+CONFIG_OABI_COMPAT=y
-+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4096
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_ALIGNMENT_TRAP=y
-+
-+#
-+# Boot options
-+#
-+CONFIG_ZBOOT_ROM_TEXT=0x0
-+CONFIG_ZBOOT_ROM_BSS=0x0
-+CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
-+# CONFIG_XIP_KERNEL is not set
-+CONFIG_KEXEC=y
-+CONFIG_ATAGS_PROC=y
-+
-+#
-+# Floating point emulation
-+#
-+
-+#
-+# At least one emulation must be selected
-+#
-+CONFIG_FPE_NWFPE=y
-+# CONFIG_FPE_NWFPE_XP is not set
-+# CONFIG_FPE_FASTFPE is not set
-+
-+#
-+# Userspace binary formats
-+#
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+
-+#
-+# Power management options
-+#
-+CONFIG_PM=y
-+CONFIG_PM_LEGACY=y
-+CONFIG_PM_DEBUG=y
-+CONFIG_PM_VERBOSE=y
-+CONFIG_PM_SLEEP=y
-+CONFIG_SUSPEND_UP_POSSIBLE=y
-+CONFIG_SUSPEND=y
-+CONFIG_APM_EMULATION=y
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+CONFIG_PACKET_MMAP=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+CONFIG_XFRM_MIGRATE=y
-+CONFIG_NET_KEY=m
-+CONFIG_NET_KEY_MIGRATE=y
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+# CONFIG_IP_ROUTE_MULTIPATH is not set
-+# CONFIG_IP_ROUTE_VERBOSE 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=m
-+CONFIG_NET_IPGRE=m
-+# CONFIG_NET_IPGRE_BROADCAST is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_XFRM_TUNNEL=m
-+CONFIG_INET_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET_XFRM_MODE_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_BEET=m
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+CONFIG_TCP_MD5SIG=y
-+# CONFIG_IP_VS is not set
-+CONFIG_IPV6=m
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_IPCOMP=m
-+# CONFIG_IPV6_MIP6 is not set
-+CONFIG_INET6_XFRM_TUNNEL=m
-+CONFIG_INET6_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET6_XFRM_MODE_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_BEET=m
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_TUNNEL=m
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+CONFIG_NETFILTER=y
-+# CONFIG_NETFILTER_DEBUG is not set
-+CONFIG_BRIDGE_NETFILTER=y
-+
-+#
-+# Core Netfilter Configuration
-+#
-+CONFIG_NETFILTER_NETLINK=m
-+CONFIG_NETFILTER_NETLINK_QUEUE=m
-+CONFIG_NETFILTER_NETLINK_LOG=m
-+CONFIG_NF_CONNTRACK_ENABLED=m
-+CONFIG_NF_CONNTRACK=m
-+CONFIG_NF_CT_ACCT=y
-+CONFIG_NF_CONNTRACK_MARK=y
-+CONFIG_NF_CONNTRACK_EVENTS=y
-+CONFIG_NF_CT_PROTO_GRE=m
-+CONFIG_NF_CT_PROTO_SCTP=m
-+# CONFIG_NF_CT_PROTO_UDPLITE is not set
-+# CONFIG_NF_CONNTRACK_AMANDA is not set
-+CONFIG_NF_CONNTRACK_FTP=m
-+CONFIG_NF_CONNTRACK_H323=m
-+CONFIG_NF_CONNTRACK_IRC=m
-+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-+CONFIG_NF_CONNTRACK_PPTP=m
-+CONFIG_NF_CONNTRACK_SANE=m
-+CONFIG_NF_CONNTRACK_SIP=m
-+CONFIG_NF_CONNTRACK_TFTP=m
-+CONFIG_NF_CT_NETLINK=m
-+CONFIG_NETFILTER_XTABLES=m
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-+CONFIG_NETFILTER_XT_TARGET_DSCP=m
-+CONFIG_NETFILTER_XT_TARGET_MARK=m
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+CONFIG_NETFILTER_XT_MATCH_DCCP=m
-+CONFIG_NETFILTER_XT_MATCH_DSCP=m
-+CONFIG_NETFILTER_XT_MATCH_ESP=m
-+CONFIG_NETFILTER_XT_MATCH_HELPER=m
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_MAC=m
-+CONFIG_NETFILTER_XT_MATCH_MARK=m
-+CONFIG_NETFILTER_XT_MATCH_POLICY=m
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-+CONFIG_NETFILTER_XT_MATCH_REALM=m
-+CONFIG_NETFILTER_XT_MATCH_SCTP=m
-+CONFIG_NETFILTER_XT_MATCH_STATE=m
-+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-+CONFIG_NETFILTER_XT_MATCH_STRING=m
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-+
-+#
-+# IP: Netfilter Configuration
-+#
-+CONFIG_NF_CONNTRACK_IPV4=m
-+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-+# CONFIG_IP_NF_QUEUE is not set
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_MATCH_IPRANGE=m
-+CONFIG_IP_NF_MATCH_TOS=m
-+# CONFIG_IP_NF_MATCH_RECENT is not set
-+CONFIG_IP_NF_MATCH_ECN=m
-+CONFIG_IP_NF_MATCH_AH=m
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_MATCH_OWNER=m
-+CONFIG_IP_NF_MATCH_ADDRTYPE=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_TARGET_LOG=m
-+CONFIG_IP_NF_TARGET_ULOG=m
-+CONFIG_NF_NAT=m
-+CONFIG_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_NF_NAT_SNMP_BASIC=m
-+CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_FTP=m
-+CONFIG_NF_NAT_IRC=m
-+CONFIG_NF_NAT_TFTP=m
-+# CONFIG_NF_NAT_AMANDA is not set
-+CONFIG_NF_NAT_PPTP=m
-+CONFIG_NF_NAT_H323=m
-+CONFIG_NF_NAT_SIP=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_IP_NF_TARGET_TOS=m
-+CONFIG_IP_NF_TARGET_ECN=m
-+CONFIG_IP_NF_TARGET_TTL=m
-+CONFIG_IP_NF_TARGET_CLUSTERIP=m
-+# CONFIG_IP_NF_RAW is not set
-+# CONFIG_IP_NF_ARPTABLES is not set
-+
-+#
-+# IPv6: Netfilter Configuration (EXPERIMENTAL)
-+#
-+CONFIG_NF_CONNTRACK_IPV6=m
-+# CONFIG_IP6_NF_QUEUE is not set
-+CONFIG_IP6_NF_IPTABLES=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_OWNER=m
-+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-+CONFIG_IP6_NF_MATCH_AH=m
-+CONFIG_IP6_NF_MATCH_MH=m
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_LOG=m
-+CONFIG_IP6_NF_TARGET_REJECT=m
-+CONFIG_IP6_NF_MANGLE=m
-+CONFIG_IP6_NF_TARGET_HL=m
-+# CONFIG_IP6_NF_RAW is not set
-+
-+#
-+# 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_BRIDGE_EBT_ULOG=m
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+CONFIG_BRIDGE=y
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+CONFIG_LLC=y
-+# 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+CONFIG_NET_SCHED=y
-+
-+#
-+# Queueing/Scheduling
-+#
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=m
-+CONFIG_NET_SCH_PRIO=m
-+# CONFIG_NET_SCH_RR is not set
-+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_NETEM=m
-+CONFIG_NET_SCH_INGRESS=m
-+
-+#
-+# Classification
-+#
-+CONFIG_NET_CLS=y
-+CONFIG_NET_CLS_BASIC=m
-+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_CLS_U32_PERF=y
-+CONFIG_CLS_U32_MARK=y
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
-+# CONFIG_NET_EMATCH is not set
-+# CONFIG_NET_CLS_ACT is not set
-+# CONFIG_NET_CLS_POLICE is not set
-+# CONFIG_NET_CLS_IND is not set
-+CONFIG_NET_SCH_FIFO=y
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_IRDA is not set
-+CONFIG_BT=y
-+CONFIG_BT_L2CAP=y
-+CONFIG_BT_SCO=y
-+CONFIG_BT_RFCOMM=y
-+CONFIG_BT_RFCOMM_TTY=y
-+CONFIG_BT_BNEP=y
-+CONFIG_BT_BNEP_MC_FILTER=y
-+CONFIG_BT_BNEP_PROTO_FILTER=y
-+CONFIG_BT_HIDP=y
-+
-+#
-+# Bluetooth device drivers
-+#
-+CONFIG_BT_HCIUSB=y
-+CONFIG_BT_HCIUSB_SCO=y
-+# CONFIG_BT_HCIBTSDIO is not set
-+# CONFIG_BT_HCIUART is not set
-+# CONFIG_BT_HCIBCM203X is not set
-+# CONFIG_BT_HCIBPA10X is not set
-+# CONFIG_BT_HCIBFUSB is not set
-+# CONFIG_BT_HCIVHCI is not set
-+# CONFIG_AF_RXRPC is not set
-+CONFIG_FIB_RULES=y
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+CONFIG_WIRELESS_EXT=y
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=m
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=m
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+CONFIG_MTD_CONCAT=y
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_AFS_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+CONFIG_MTD_CFI_INTELEXT=y
-+# CONFIG_MTD_CFI_AMDSTD is not set
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+CONFIG_MTD_ROM=y
-+CONFIG_MTD_ABSENT=y
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+CONFIG_MTD_PHYSMAP=y
-+CONFIG_MTD_PHYSMAP_START=0x0
-+CONFIG_MTD_PHYSMAP_LEN=0
-+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-+# CONFIG_MTD_ARM_INTEGRATOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+CONFIG_MTD_NAND=y
-+CONFIG_MTD_NAND_VERIFY_WRITE=y
-+# CONFIG_MTD_NAND_ECC_SMC is not set
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+CONFIG_MTD_NAND_IDS=y
-+CONFIG_MTD_NAND_S3C2410=y
-+# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
-+CONFIG_MTD_NAND_S3C2410_HWECC=y
-+# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ALAUDA is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+# CONFIG_PARPORT is not set
-+CONFIG_PNP=y
-+CONFIG_PNP_DEBUG=y
-+
-+#
-+# Protocols
-+#
-+# CONFIG_PNPACPI is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=m
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_UB=m
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=4096
-+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=m
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=m
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+CONFIG_BLK_DEV_SR=m
-+# CONFIG_BLK_DEV_SR_VENDOR is not set
-+CONFIG_CHR_DEV_SG=m
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+CONFIG_SCSI_SCAN_ASYNC=y
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_ATA is not set
-+CONFIG_MD=y
-+# CONFIG_BLK_DEV_MD is not set
-+CONFIG_BLK_DEV_DM=m
-+# CONFIG_DM_DEBUG is not set
-+CONFIG_DM_CRYPT=m
-+CONFIG_DM_SNAPSHOT=m
-+# CONFIG_DM_MIRROR is not set
-+# CONFIG_DM_ZERO is not set
-+# CONFIG_DM_MULTIPATH is not set
-+# CONFIG_DM_DELAY is not set
-+# CONFIG_DM_UEVENT is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+CONFIG_TUN=m
-+# CONFIG_VETH is not set
-+# CONFIG_NET_SB1000 is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_AX88796 is not set
-+# CONFIG_SMC91X is not set
-+# CONFIG_DM9000 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_B44 is not set
-+CONFIG_CS89x0=m
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+CONFIG_USB_CATC=m
-+CONFIG_USB_KAWETH=m
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+CONFIG_USB_USBNET=y
-+CONFIG_USB_NET_AX8817X=m
-+CONFIG_USB_NET_CDCETHER=m
-+CONFIG_USB_NET_DM9601=m
-+CONFIG_USB_NET_GL620A=m
-+CONFIG_USB_NET_NET1080=m
-+CONFIG_USB_NET_PLUSB=m
-+CONFIG_USB_NET_MCS7830=m
-+CONFIG_USB_NET_RNDIS_HOST=m
-+CONFIG_USB_NET_CDC_SUBSET=m
-+CONFIG_USB_ALI_M5632=y
-+CONFIG_USB_AN2720=y
-+CONFIG_USB_BELKIN=y
-+CONFIG_USB_ARMLINUX=y
-+CONFIG_USB_EPSON2888=y
-+CONFIG_USB_KC2190=y
-+CONFIG_USB_NET_ZAURUS=m
-+# CONFIG_WAN is not set
-+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=m
-+CONFIG_PPP_MPPE=m
-+# CONFIG_PPPOE is not set
-+# CONFIG_PPPOL2TP is not set
-+# CONFIG_SLIP is not set
-+CONFIG_SLHC=m
-+# CONFIG_SHAPER is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
-+# CONFIG_INPUT_JOYDEV is not set
-+CONFIG_INPUT_EVDEV=y
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+# CONFIG_KEYBOARD_ATKBD is not set
-+# 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_KEYBOARD_STOWAWAY=m
-+CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_NEO1973=y
-+CONFIG_KEYBOARD_QT2410=y
-+CONFIG_INPUT_MOUSE=y
-+# CONFIG_MOUSE_PS2 is not set
-+# CONFIG_MOUSE_SERIAL is not set
-+# CONFIG_MOUSE_APPLETOUCH is not set
-+# CONFIG_MOUSE_VSXXXAA is not set
-+# CONFIG_MOUSE_GPIO is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+CONFIG_INPUT_TOUCHSCREEN=y
-+# CONFIG_TOUCHSCREEN_ADS7846 is not set
-+# CONFIG_TOUCHSCREEN_FUJITSU is not set
-+CONFIG_TOUCHSCREEN_S3C2410=y
-+# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
-+# CONFIG_TOUCHSCREEN_GUNZE is not set
-+# CONFIG_TOUCHSCREEN_ELO is not set
-+# CONFIG_TOUCHSCREEN_MTOUCH is not set
-+# CONFIG_TOUCHSCREEN_MK712 is not set
-+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-+# CONFIG_TOUCHSCREEN_UCB1400 is not set
-+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-+CONFIG_INPUT_MISC=y
-+# CONFIG_INPUT_ATI_REMOTE is not set
-+# CONFIG_INPUT_ATI_REMOTE2 is not set
-+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-+# CONFIG_INPUT_POWERMATE is not set
-+# CONFIG_INPUT_YEALINK is not set
-+CONFIG_INPUT_UINPUT=m
-+CONFIG_INPUT_LIS302DL=y
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+# CONFIG_SERIO_SERPORT is not set
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_NR_TTY_DEVICES=4
-+CONFIG_HW_CONSOLE=y
-+CONFIG_VT_HW_CONSOLE_BINDING=y
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_SERIAL_S3C2410=y
-+CONFIG_SERIAL_S3C2410_CONSOLE=y
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_LEGACY_PTYS is not set
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_GPIO is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+CONFIG_I2C_S3C2410=y
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_TINY_USB is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_SENSORS_DS1337 is not set
-+# CONFIG_SENSORS_DS1374 is not set
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+CONFIG_SENSORS_PCF50606=y
-+CONFIG_SENSORS_PCF50633=y
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_SENSORS_PCA9539 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+CONFIG_SENSORS_TSL256X=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
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+# CONFIG_SPI_DEBUG is not set
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+# CONFIG_SPI_S3C24XX is not set
-+CONFIG_SPI_S3C24XX_GPIO=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_W1 is not set
-+CONFIG_POWER_SUPPLY=y
-+CONFIG_POWER_SUPPLY_DEBUG=y
-+CONFIG_PDA_POWER=y
-+CONFIG_APM_POWER=y
-+# CONFIG_BATTERY_DS2760 is not set
-+CONFIG_BATTERY_BQ27000_HDQ=y
-+CONFIG_GTA02_HDQ=y
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+# CONFIG_SENSORS_LM70 is not set
-+# CONFIG_SENSORS_LM75 is not set
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# CONFIG_SENSORS_LM87 is not set
-+# CONFIG_SENSORS_LM90 is not set
-+# CONFIG_SENSORS_LM92 is not set
-+# CONFIG_SENSORS_LM93 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_DME1737 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_S3C2410_WATCHDOG=m
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+CONFIG_MFD_GLAMO=y
-+CONFIG_MFD_GLAMO_FB=y
-+CONFIG_MFD_GLAMO_SPI_GPIO=y
-+CONFIG_MFD_GLAMO_SPI_FB=y
-+CONFIG_MFD_GLAMO_MCI=y
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+CONFIG_FB=y
-+# CONFIG_FIRMWARE_EDID is not set
-+# CONFIG_FB_DDC is not set
-+CONFIG_FB_CFB_FILLRECT=y
-+CONFIG_FB_CFB_COPYAREA=y
-+CONFIG_FB_CFB_IMAGEBLIT=y
-+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-+# CONFIG_FB_SYS_FILLRECT is not set
-+# CONFIG_FB_SYS_COPYAREA is not set
-+# CONFIG_FB_SYS_IMAGEBLIT is not set
-+# CONFIG_FB_SYS_FOPS is not set
-+CONFIG_FB_DEFERRED_IO=y
-+# CONFIG_FB_SVGALIB is not set
-+# CONFIG_FB_MACMODES is not set
-+# CONFIG_FB_BACKLIGHT is not set
-+# CONFIG_FB_MODE_HELPERS is not set
-+# CONFIG_FB_TILEBLITTING is not set
-+
-+#
-+# Frame buffer hardware drivers
-+#
-+# CONFIG_FB_UVESA is not set
-+# CONFIG_FB_S1D13XXX is not set
-+CONFIG_FB_S3C2410=y
-+# CONFIG_FB_S3C2410_DEBUG is not set
-+# CONFIG_FB_VIRTUAL is not set
-+CONFIG_BACKLIGHT_LCD_SUPPORT=y
-+CONFIG_LCD_CLASS_DEVICE=y
-+CONFIG_LCD_LTV350QV=y
-+CONFIG_BACKLIGHT_CLASS_DEVICE=y
-+# CONFIG_BACKLIGHT_CORGI is not set
-+CONFIG_BACKLIGHT_GTA01=y
-+
-+#
-+# Display device support
-+#
-+CONFIG_DISPLAY_SUPPORT=y
-+
-+#
-+# Display hardware drivers
-+#
-+CONFIG_DISPLAY_JBT6K74=y
-+
-+#
-+# Console display driver support
-+#
-+# CONFIG_VGA_CONSOLE is not set
-+CONFIG_DUMMY_CONSOLE=y
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-+CONFIG_FONTS=y
-+# CONFIG_FONT_8x8 is not set
-+# CONFIG_FONT_8x16 is not set
-+CONFIG_FONT_6x11=y
-+# CONFIG_FONT_7x14 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
-+# CONFIG_FONT_10x18 is not set
-+# CONFIG_LOGO is not set
-+
-+#
-+# Sound
-+#
-+CONFIG_SOUND=y
-+
-+#
-+# Advanced Linux Sound Architecture
-+#
-+CONFIG_SND=y
-+CONFIG_SND_TIMER=y
-+CONFIG_SND_PCM=y
-+CONFIG_SND_HWDEP=y
-+CONFIG_SND_RAWMIDI=y
-+# CONFIG_SND_SEQUENCER is not set
-+CONFIG_SND_OSSEMUL=y
-+CONFIG_SND_MIXER_OSS=y
-+CONFIG_SND_PCM_OSS=y
-+CONFIG_SND_PCM_OSS_PLUGINS=y
-+# CONFIG_SND_DYNAMIC_MINORS is not set
-+CONFIG_SND_SUPPORT_OLD_API=y
-+CONFIG_SND_VERBOSE_PROCFS=y
-+# 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
-+
-+#
-+# ALSA ARM devices
-+#
-+
-+#
-+# SPI devices
-+#
-+
-+#
-+# USB devices
-+#
-+CONFIG_SND_USB_AUDIO=m
-+# CONFIG_SND_USB_CAIAQ is not set
-+
-+#
-+# System on Chip audio support
-+#
-+CONFIG_SND_SOC=y
-+CONFIG_SND_S3C24XX_SOC=y
-+CONFIG_SND_S3C24XX_SOC_I2S=y
-+# CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753 is not set
-+CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=y
-+
-+#
-+# SoC Audio support for SuperH
-+#
-+CONFIG_SND_SOC_WM8753=y
-+
-+#
-+# Open Sound System
-+#
-+# CONFIG_SOUND_PRIME is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=y
-+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-+# CONFIG_HID_FF is not set
-+# CONFIG_USB_HIDDEV is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+CONFIG_USB_SUSPEND=y
-+CONFIG_USB_PERSIST=y
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=y
-+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+CONFIG_USB_ACM=m
-+CONFIG_USB_PRINTER=m
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+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 is not set
-+CONFIG_USB_STORAGE_DPCM=y
-+CONFIG_USB_STORAGE_USBAT=y
-+CONFIG_USB_STORAGE_SDDR09=y
-+CONFIG_USB_STORAGE_SDDR55=y
-+CONFIG_USB_STORAGE_JUMPSHOT=y
-+CONFIG_USB_STORAGE_ALAUDA=y
-+CONFIG_USB_STORAGE_KARMA=y
-+CONFIG_USB_LIBUSUAL=y
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+
-+#
-+# USB Serial Converter support
-+#
-+CONFIG_USB_SERIAL=y
-+CONFIG_USB_SERIAL_GENERIC=y
-+CONFIG_USB_SERIAL_AIRCABLE=m
-+CONFIG_USB_SERIAL_AIRPRIME=m
-+CONFIG_USB_SERIAL_ARK3116=m
-+CONFIG_USB_SERIAL_BELKIN=m
-+# CONFIG_USB_SERIAL_CH341 is not set
-+CONFIG_USB_SERIAL_WHITEHEAT=m
-+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-+CONFIG_USB_SERIAL_CP2101=m
-+CONFIG_USB_SERIAL_CYPRESS_M8=m
-+CONFIG_USB_SERIAL_EMPEG=m
-+CONFIG_USB_SERIAL_FTDI_SIO=m
-+CONFIG_USB_SERIAL_FUNSOFT=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_GARMIN=m
-+CONFIG_USB_SERIAL_IPW=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_MOS7720=m
-+CONFIG_USB_SERIAL_MOS7840=m
-+CONFIG_USB_SERIAL_NAVMAN=m
-+CONFIG_USB_SERIAL_PL2303=m
-+# CONFIG_USB_SERIAL_OTI6858 is not set
-+CONFIG_USB_SERIAL_HP4X=m
-+CONFIG_USB_SERIAL_SAFE=m
-+CONFIG_USB_SERIAL_SAFE_PADDED=y
-+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-+CONFIG_USB_SERIAL_TI=m
-+CONFIG_USB_SERIAL_CYBERJACK=m
-+CONFIG_USB_SERIAL_XIRCOM=m
-+CONFIG_USB_SERIAL_OPTION=y
-+CONFIG_USB_SERIAL_OMNINET=m
-+# CONFIG_USB_SERIAL_DEBUG is not set
-+CONFIG_USB_EZUSB=y
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+CONFIG_USB_BERRY_CHARGE=m
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_LD is not set
-+CONFIG_USB_TRANCEVIBRATOR=m
-+CONFIG_USB_IOWARRIOR=m
-+# CONFIG_USB_TEST is not set
-+
-+#
-+# USB DSL modem support
-+#
-+
-+#
-+# USB Gadget Support
-+#
-+CONFIG_USB_GADGET=y
-+# CONFIG_USB_GADGET_DEBUG is not set
-+# CONFIG_USB_GADGET_DEBUG_FILES is not set
-+# CONFIG_USB_GADGET_DEBUG_FS is not set
-+CONFIG_USB_GADGET_SELECTED=y
-+# CONFIG_USB_GADGET_AMD5536UDC is not set
-+# CONFIG_USB_GADGET_ATMEL_USBA is not set
-+# CONFIG_USB_GADGET_FSL_USB2 is not set
-+# CONFIG_USB_GADGET_NET2280 is not set
-+# CONFIG_USB_GADGET_PXA2XX is not set
-+# CONFIG_USB_GADGET_M66592 is not set
-+# CONFIG_USB_GADGET_GOKU is not set
-+# CONFIG_USB_GADGET_LH7A40X is not set
-+# CONFIG_USB_GADGET_OMAP is not set
-+CONFIG_USB_GADGET_S3C2410=y
-+CONFIG_USB_S3C2410=y
-+# CONFIG_USB_S3C2410_DEBUG is not set
-+# CONFIG_USB_GADGET_AT91 is not set
-+# CONFIG_USB_GADGET_DUMMY_HCD is not set
-+# CONFIG_USB_GADGET_DUALSPEED is not set
-+# CONFIG_USB_ZERO is not set
-+CONFIG_USB_ETH=y
-+CONFIG_USB_ETH_RNDIS=y
-+# CONFIG_USB_GADGETFS is not set
-+# CONFIG_USB_FILE_STORAGE is not set
-+# CONFIG_USB_G_SERIAL is not set
-+# CONFIG_USB_MIDI_GADGET is not set
-+
-+#
-+# SDIO support
-+#
-+CONFIG_SDIO=y
-+CONFIG_SDIO_S3C24XX=y
-+CONFIG_SDIO_S3C24XX_DMA=y
-+CONFIG_SDIO_AR6000_WLAN=y
-+CONFIG_MMC=y
-+# CONFIG_MMC_DEBUG is not set
-+CONFIG_MMC_UNSAFE_RESUME=y
-+
-+#
-+# MMC/SD Card Drivers
-+#
-+CONFIG_MMC_BLOCK=y
-+# CONFIG_MMC_BLOCK_BOUNCE is not set
-+# CONFIG_SDIO_UART is not set
-+
-+#
-+# MMC/SD Host Controller Drivers
-+#
-+# CONFIG_MMC_SPI is not set
-+# CONFIG_MMC_S3C is not set
-+CONFIG_NEW_LEDS=y
-+CONFIG_LEDS_CLASS=y
-+
-+#
-+# LED drivers
-+#
-+CONFIG_LEDS_S3C24XX=m
-+CONFIG_LEDS_GPIO=y
-+CONFIG_LEDS_NEO1973_VIBRATOR=y
-+CONFIG_LEDS_NEO1973_GTA02=y
-+
-+#
-+# LED Triggers
-+#
-+CONFIG_LEDS_TRIGGERS=y
-+CONFIG_LEDS_TRIGGER_TIMER=y
-+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+CONFIG_RTC_DEBUG=y
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+CONFIG_RTC_DRV_S3C=m
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+# CONFIG_EXT3_FS_XATTR is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+# CONFIG_JBD_DEBUG is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+# CONFIG_MINIX_FS is not set
-+CONFIG_ROMFS_FS=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+CONFIG_DNOTIFY=y
-+# CONFIG_AUTOFS_FS is not set
-+CONFIG_AUTOFS4_FS=m
-+CONFIG_FUSE_FS=m
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+CONFIG_ISO9660_FS=y
-+CONFIG_JOLIET=y
-+# CONFIG_ZISOFS is not set
-+CONFIG_UDF_FS=y
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=y
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+CONFIG_CONFIGFS_FS=m
-+
-+#
-+# 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_YAFFS_FS=y
-+CONFIG_YAFFS_YAFFS1=y
-+CONFIG_YAFFS_9BYTE_TAGS=y
-+CONFIG_YAFFS_YAFFS2=y
-+CONFIG_YAFFS_AUTO_YAFFS2=y
-+# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-+CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
-+# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-+# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
-+CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+CONFIG_JFFS2_SUMMARY=y
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# 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
-+# CONFIG_NETWORK_FILESYSTEMS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=y
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+CONFIG_NLS_CODEPAGE_850=m
-+# 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=m
-+CONFIG_NLS_CODEPAGE_950=m
-+# 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=y
-+# 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=m
-+# CONFIG_DLM is not set
-+CONFIG_INSTRUMENTATION=y
-+# CONFIG_PROFILING is not set
-+CONFIG_MARKERS=y
-+
-+#
-+# Kernel hacking
-+#
-+CONFIG_PRINTK_TIME=y
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+CONFIG_DEBUG_SHIRQ=y
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+CONFIG_TIMER_STATS=y
-+# CONFIG_DEBUG_SLAB is not set
-+CONFIG_DEBUG_PREEMPT=y
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+CONFIG_DEBUG_SPINLOCK=y
-+CONFIG_DEBUG_MUTEXES=y
-+CONFIG_DEBUG_LOCK_ALLOC=y
-+# CONFIG_PROVE_LOCKING is not set
-+CONFIG_LOCKDEP=y
-+CONFIG_LOCK_STAT=y
-+CONFIG_DEBUG_LOCKDEP=y
-+CONFIG_DEBUG_SPINLOCK_SLEEP=y
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+CONFIG_STACKTRACE=y
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+CONFIG_DEBUG_SG=y
-+CONFIG_FRAME_POINTER=y
-+CONFIG_FORCED_INLINING=y
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_USER is not set
-+CONFIG_DEBUG_ERRORS=y
-+# CONFIG_DEBUG_LL is not set
-+# CONFIG_DEBUG_ICEDCC is not set
-+# CONFIG_DEBUG_S3C_PORT is not set
-+CONFIG_DEBUG_S3C_UART=2
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_HMAC=y
-+CONFIG_CRYPTO_XCBC=m
-+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_WP512=m
-+CONFIG_CRYPTO_TGR192=m
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+CONFIG_CRYPTO_LRW=m
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_FCRYPT=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_CAST6=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_KHAZAD=m
-+CONFIG_CRYPTO_ANUBIS=m
-+# CONFIG_CRYPTO_SEED is not set
-+CONFIG_CRYPTO_DEFLATE=m
-+CONFIG_CRYPTO_MICHAEL_MIC=m
-+CONFIG_CRYPTO_CRC32C=m
-+CONFIG_CRYPTO_CAMELLIA=m
-+CONFIG_CRYPTO_TEST=m
-+# CONFIG_CRYPTO_AUTHENC is not set
-+CONFIG_CRYPTO_HW=y
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_CRC_CCITT=m
-+CONFIG_CRC16=m
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+CONFIG_LIBCRC32C=m
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_TEXTSEARCH=y
-+CONFIG_TEXTSEARCH_KMP=m
-+CONFIG_TEXTSEARCH_BM=m
-+CONFIG_TEXTSEARCH_FSM=m
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_DMA=y
-diff --git a/defconfig-2.6.22.5 b/defconfig-2.6.22.5
-deleted file mode 100644
-index e9e40fe..0000000
---- a/defconfig-2.6.22.5
-+++ /dev/null
-@@ -1,1827 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.22.5
--# Tue Nov 27 09:09:32 2007
--#
--CONFIG_ARM=y
--CONFIG_SYS_SUPPORTS_APM_EMULATION=y
--CONFIG_GENERIC_GPIO=y
--# CONFIG_GENERIC_TIME is not set
--# CONFIG_GENERIC_CLOCKEVENTS is not set
--CONFIG_MMU=y
--CONFIG_NO_IOPORT=y
--CONFIG_GENERIC_HARDIRQS=y
--CONFIG_STACKTRACE_SUPPORT=y
--CONFIG_LOCKDEP_SUPPORT=y
--CONFIG_TRACE_IRQFLAGS_SUPPORT=y
--CONFIG_HARDIRQS_SW_RESEND=y
--CONFIG_GENERIC_IRQ_PROBE=y
--CONFIG_RWSEM_GENERIC_SPINLOCK=y
--# CONFIG_ARCH_HAS_ILOG2_U32 is not set
--# CONFIG_ARCH_HAS_ILOG2_U64 is not set
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_ZONE_DMA=y
--CONFIG_VECTORS_BASE=0xffff0000
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# Code maturity level options
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_LOCK_KERNEL=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--
--#
--# General setup
--#
--CONFIG_LOCALVERSION="-moko11"
--# CONFIG_LOCALVERSION_AUTO is not set
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--# CONFIG_IPC_NS is not set
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_UTS_NS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_SYSFS_DEPRECATED is not set
--# CONFIG_RELAY is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--CONFIG_CC_OPTIMIZE_FOR_SIZE=y
--CONFIG_SYSCTL=y
--# CONFIG_EMBEDDED is not set
--CONFIG_UID16=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--# CONFIG_KALLSYMS_ALL is not set
--# CONFIG_KALLSYMS_EXTRA_PASS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_TIMERFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLAB=y
--# CONFIG_SLUB is not set
--# CONFIG_SLOB is not set
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--
--#
--# Loadable module support
--#
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--CONFIG_MODULE_FORCE_UNLOAD=y
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--
--#
--# Block layer
--#
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=m
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=m
--# CONFIG_DEFAULT_AS is not set
--CONFIG_DEFAULT_DEADLINE=y
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="deadline"
--
--#
--# System Type
--#
--# CONFIG_ARCH_AAEC2000 is not set
--# CONFIG_ARCH_INTEGRATOR is not set
--# CONFIG_ARCH_REALVIEW is not set
--# CONFIG_ARCH_VERSATILE is not set
--# CONFIG_ARCH_AT91 is not set
--# CONFIG_ARCH_CLPS7500 is not set
--# CONFIG_ARCH_CLPS711X is not set
--# CONFIG_ARCH_CO285 is not set
--# CONFIG_ARCH_EBSA110 is not set
--# CONFIG_ARCH_EP93XX is not set
--# CONFIG_ARCH_FOOTBRIDGE is not set
--# CONFIG_ARCH_NETX is not set
--# CONFIG_ARCH_H720X is not set
--# CONFIG_ARCH_IMX is not set
--# CONFIG_ARCH_IOP13XX is not set
--# CONFIG_ARCH_IOP32X is not set
--# CONFIG_ARCH_IOP33X is not set
--# CONFIG_ARCH_IXP23XX is not set
--# CONFIG_ARCH_IXP2000 is not set
--# CONFIG_ARCH_IXP4XX is not set
--# CONFIG_ARCH_L7200 is not set
--# CONFIG_ARCH_KS8695 is not set
--# CONFIG_ARCH_NS9XXX is not set
--# CONFIG_ARCH_PNX4008 is not set
--# CONFIG_ARCH_PXA is not set
--# CONFIG_ARCH_RPC is not set
--# CONFIG_ARCH_SA1100 is not set
--CONFIG_ARCH_S3C2410=y
--# CONFIG_ARCH_SHARK is not set
--# CONFIG_ARCH_LH7A40X is not set
--# CONFIG_ARCH_DAVINCI is not set
--# CONFIG_ARCH_OMAP is not set
--CONFIG_PLAT_S3C24XX=y
--CONFIG_CPU_S3C244X=y
--# CONFIG_S3C2410_BOOT_WATCHDOG is not set
--CONFIG_S3C2410_BOOT_ERROR_RESET=y
--CONFIG_S3C2410_PM_DEBUG=y
--# CONFIG_S3C2410_PM_CHECK is not set
--CONFIG_S3C2410_LOWLEVEL_UART_PORT=0
--CONFIG_S3C2410_DMA=y
--# CONFIG_S3C2410_DMA_DEBUG is not set
--CONFIG_MACH_SMDK=y
--
--#
--# S3C2400 Machines
--#
--CONFIG_CPU_S3C2410=y
--CONFIG_CPU_S3C2410_DMA=y
--CONFIG_S3C2410_PM=y
--CONFIG_S3C2410_GPIO=y
--CONFIG_S3C2410_CLOCK=y
--CONFIG_S3C2410_PWM=y
--
--#
--# S3C2410 Machines
--#
--# CONFIG_ARCH_SMDK2410 is not set
--# CONFIG_ARCH_H1940 is not set
--# CONFIG_MACH_N30 is not set
--# CONFIG_ARCH_BAST is not set
--# CONFIG_MACH_OTOM is not set
--# CONFIG_MACH_AML_M5900 is not set
--# CONFIG_MACH_VR1000 is not set
--CONFIG_MACH_QT2410=y
--CONFIG_MACH_NEO1973_GTA01=y
--
--#
--# S3C2412 Machines
--#
--# CONFIG_MACH_SMDK2413 is not set
--# CONFIG_MACH_SMDK2412 is not set
--# CONFIG_MACH_VSTMS is not set
--CONFIG_CPU_S3C2440=y
--CONFIG_S3C2440_DMA=y
--
--#
--# S3C2440 Machines
--#
--# CONFIG_MACH_ANUBIS is not set
--# CONFIG_MACH_OSIRIS is not set
--# CONFIG_MACH_RX3715 is not set
--CONFIG_ARCH_S3C2440=y
--# CONFIG_MACH_NEXCODER_2440 is not set
--CONFIG_SMDK2440_CPU2440=y
--CONFIG_MACH_HXD8=y
--CONFIG_MACH_NEO1973_GTA02=y
--CONFIG_CPU_S3C2442=y
--
--#
--# S3C2442 Machines
--#
--CONFIG_SMDK2440_CPU2442=y
--
--#
--# S3C2443 Machines
--#
--# CONFIG_MACH_SMDK2443 is not set
--
--#
--# Processor Type
--#
--CONFIG_CPU_32=y
--CONFIG_CPU_ARM920T=y
--CONFIG_CPU_32v4T=y
--CONFIG_CPU_ABRT_EV4T=y
--CONFIG_CPU_CACHE_V4WT=y
--CONFIG_CPU_CACHE_VIVT=y
--CONFIG_CPU_COPY_V4WB=y
--CONFIG_CPU_TLB_V4WBI=y
--CONFIG_CPU_CP15=y
--CONFIG_CPU_CP15_MMU=y
--
--#
--# Processor Features
--#
--CONFIG_ARM_THUMB=y
--# CONFIG_CPU_ICACHE_DISABLE is not set
--# CONFIG_CPU_DCACHE_DISABLE is not set
--# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
--# CONFIG_OUTER_CACHE is not set
--
--#
--# Bus support
--#
--# CONFIG_ARCH_SUPPORTS_MSI is not set
--
--#
--# PCCARD (PCMCIA/CardBus) support
--#
--# CONFIG_PCCARD is not set
--
--#
--# Kernel Features
--#
--# CONFIG_TICK_ONESHOT is not set
--CONFIG_PREEMPT=y
--CONFIG_NO_IDLE_HZ=y
--CONFIG_HZ=200
--CONFIG_AEABI=y
--CONFIG_OABI_COMPAT=y
--# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4096
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_ALIGNMENT_TRAP=y
--
--#
--# Boot options
--#
--CONFIG_ZBOOT_ROM_TEXT=0x0
--CONFIG_ZBOOT_ROM_BSS=0x0
--CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
--# CONFIG_XIP_KERNEL is not set
--CONFIG_KEXEC=y
--
--#
--# Floating point emulation
--#
--
--#
--# At least one emulation must be selected
--#
--CONFIG_FPE_NWFPE=y
--# CONFIG_FPE_NWFPE_XP is not set
--# CONFIG_FPE_FASTFPE is not set
--
--#
--# Userspace binary formats
--#
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_AOUT is not set
--# CONFIG_BINFMT_MISC is not set
--
--#
--# Power management options
--#
--CONFIG_PM=y
--CONFIG_PM_LEGACY=y
--CONFIG_PM_DEBUG=y
--CONFIG_DISABLE_CONSOLE_SUSPEND=y
--# CONFIG_PM_SYSFS_DEPRECATED is not set
--CONFIG_APM_EMULATION=y
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=m
--CONFIG_PACKET_MMAP=y
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--CONFIG_XFRM_MIGRATE=y
--CONFIG_NET_KEY=m
--CONFIG_NET_KEY_MIGRATE=y
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--CONFIG_IP_ADVANCED_ROUTER=y
--CONFIG_ASK_IP_FIB_HASH=y
--# CONFIG_IP_FIB_TRIE is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_MULTIPLE_TABLES=y
--# CONFIG_IP_ROUTE_MULTIPATH is not set
--# CONFIG_IP_ROUTE_VERBOSE 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=m
--CONFIG_NET_IPGRE=m
--# CONFIG_NET_IPGRE_BROADCAST is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--CONFIG_INET_AH=m
--CONFIG_INET_ESP=m
--CONFIG_INET_IPCOMP=m
--CONFIG_INET_XFRM_TUNNEL=m
--CONFIG_INET_TUNNEL=m
--CONFIG_INET_XFRM_MODE_TRANSPORT=m
--CONFIG_INET_XFRM_MODE_TUNNEL=m
--CONFIG_INET_XFRM_MODE_BEET=m
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--CONFIG_TCP_MD5SIG=y
--# CONFIG_IP_VS is not set
--CONFIG_IPV6=m
--# CONFIG_IPV6_PRIVACY is not set
--# CONFIG_IPV6_ROUTER_PREF is not set
--# CONFIG_IPV6_OPTIMISTIC_DAD is not set
--CONFIG_INET6_AH=m
--CONFIG_INET6_ESP=m
--CONFIG_INET6_IPCOMP=m
--# CONFIG_IPV6_MIP6 is not set
--CONFIG_INET6_XFRM_TUNNEL=m
--CONFIG_INET6_TUNNEL=m
--CONFIG_INET6_XFRM_MODE_TRANSPORT=m
--CONFIG_INET6_XFRM_MODE_TUNNEL=m
--CONFIG_INET6_XFRM_MODE_BEET=m
--# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
--CONFIG_IPV6_SIT=m
--CONFIG_IPV6_TUNNEL=m
--# CONFIG_IPV6_MULTIPLE_TABLES is not set
--# CONFIG_NETWORK_SECMARK is not set
--CONFIG_NETFILTER=y
--# CONFIG_NETFILTER_DEBUG is not set
--CONFIG_BRIDGE_NETFILTER=y
--
--#
--# Core Netfilter Configuration
--#
--CONFIG_NETFILTER_NETLINK=m
--CONFIG_NETFILTER_NETLINK_QUEUE=m
--CONFIG_NETFILTER_NETLINK_LOG=m
--CONFIG_NF_CONNTRACK_ENABLED=m
--CONFIG_NF_CONNTRACK=m
--CONFIG_NF_CT_ACCT=y
--CONFIG_NF_CONNTRACK_MARK=y
--CONFIG_NF_CONNTRACK_EVENTS=y
--CONFIG_NF_CT_PROTO_GRE=m
--CONFIG_NF_CT_PROTO_SCTP=m
--# CONFIG_NF_CONNTRACK_AMANDA is not set
--CONFIG_NF_CONNTRACK_FTP=m
--CONFIG_NF_CONNTRACK_H323=m
--CONFIG_NF_CONNTRACK_IRC=m
--CONFIG_NF_CONNTRACK_NETBIOS_NS=m
--CONFIG_NF_CONNTRACK_PPTP=m
--CONFIG_NF_CONNTRACK_SANE=m
--CONFIG_NF_CONNTRACK_SIP=m
--CONFIG_NF_CONNTRACK_TFTP=m
--CONFIG_NF_CT_NETLINK=m
--CONFIG_NETFILTER_XTABLES=m
--CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
--CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
--CONFIG_NETFILTER_XT_TARGET_DSCP=m
--CONFIG_NETFILTER_XT_TARGET_MARK=m
--CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
--CONFIG_NETFILTER_XT_TARGET_NFLOG=m
--CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
--# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
--CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
--CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
--CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
--CONFIG_NETFILTER_XT_MATCH_DCCP=m
--CONFIG_NETFILTER_XT_MATCH_DSCP=m
--CONFIG_NETFILTER_XT_MATCH_ESP=m
--CONFIG_NETFILTER_XT_MATCH_HELPER=m
--CONFIG_NETFILTER_XT_MATCH_LENGTH=m
--CONFIG_NETFILTER_XT_MATCH_LIMIT=m
--CONFIG_NETFILTER_XT_MATCH_MAC=m
--CONFIG_NETFILTER_XT_MATCH_MARK=m
--CONFIG_NETFILTER_XT_MATCH_POLICY=m
--CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
--CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
--CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
--CONFIG_NETFILTER_XT_MATCH_QUOTA=m
--CONFIG_NETFILTER_XT_MATCH_REALM=m
--CONFIG_NETFILTER_XT_MATCH_SCTP=m
--CONFIG_NETFILTER_XT_MATCH_STATE=m
--CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
--CONFIG_NETFILTER_XT_MATCH_STRING=m
--CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
--CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
--
--#
--# IP: Netfilter Configuration
--#
--CONFIG_NF_CONNTRACK_IPV4=m
--CONFIG_NF_CONNTRACK_PROC_COMPAT=y
--# CONFIG_IP_NF_QUEUE is not set
--CONFIG_IP_NF_IPTABLES=m
--CONFIG_IP_NF_MATCH_IPRANGE=m
--CONFIG_IP_NF_MATCH_TOS=m
--# CONFIG_IP_NF_MATCH_RECENT is not set
--CONFIG_IP_NF_MATCH_ECN=m
--CONFIG_IP_NF_MATCH_AH=m
--CONFIG_IP_NF_MATCH_TTL=m
--CONFIG_IP_NF_MATCH_OWNER=m
--CONFIG_IP_NF_MATCH_ADDRTYPE=m
--CONFIG_IP_NF_FILTER=m
--CONFIG_IP_NF_TARGET_REJECT=m
--CONFIG_IP_NF_TARGET_LOG=m
--CONFIG_IP_NF_TARGET_ULOG=m
--CONFIG_NF_NAT=m
--CONFIG_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_NF_NAT_SNMP_BASIC=m
--CONFIG_NF_NAT_PROTO_GRE=m
--CONFIG_NF_NAT_FTP=m
--CONFIG_NF_NAT_IRC=m
--CONFIG_NF_NAT_TFTP=m
--# CONFIG_NF_NAT_AMANDA is not set
--CONFIG_NF_NAT_PPTP=m
--CONFIG_NF_NAT_H323=m
--CONFIG_NF_NAT_SIP=m
--CONFIG_IP_NF_MANGLE=m
--CONFIG_IP_NF_TARGET_TOS=m
--CONFIG_IP_NF_TARGET_ECN=m
--CONFIG_IP_NF_TARGET_TTL=m
--CONFIG_IP_NF_TARGET_CLUSTERIP=m
--# CONFIG_IP_NF_RAW is not set
--# CONFIG_IP_NF_ARPTABLES is not set
--
--#
--# IPv6: Netfilter Configuration (EXPERIMENTAL)
--#
--CONFIG_NF_CONNTRACK_IPV6=m
--# CONFIG_IP6_NF_QUEUE is not set
--CONFIG_IP6_NF_IPTABLES=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_OWNER=m
--CONFIG_IP6_NF_MATCH_IPV6HEADER=m
--CONFIG_IP6_NF_MATCH_AH=m
--CONFIG_IP6_NF_MATCH_MH=m
--CONFIG_IP6_NF_MATCH_EUI64=m
--CONFIG_IP6_NF_FILTER=m
--CONFIG_IP6_NF_TARGET_LOG=m
--CONFIG_IP6_NF_TARGET_REJECT=m
--CONFIG_IP6_NF_MANGLE=m
--CONFIG_IP6_NF_TARGET_HL=m
--# CONFIG_IP6_NF_RAW is not set
--
--#
--# 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_BRIDGE_EBT_ULOG=m
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--CONFIG_BRIDGE=y
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--CONFIG_LLC=y
--# 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--
--#
--# QoS and/or fair queueing
--#
--CONFIG_NET_SCHED=y
--CONFIG_NET_SCH_FIFO=y
--
--#
--# Queueing/Scheduling
--#
--CONFIG_NET_SCH_CBQ=m
--CONFIG_NET_SCH_HTB=m
--CONFIG_NET_SCH_HFSC=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_NETEM=m
--CONFIG_NET_SCH_INGRESS=m
--
--#
--# Classification
--#
--CONFIG_NET_CLS=y
--CONFIG_NET_CLS_BASIC=m
--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_CLS_U32_PERF=y
--CONFIG_CLS_U32_MARK=y
--CONFIG_NET_CLS_RSVP=m
--CONFIG_NET_CLS_RSVP6=m
--# CONFIG_NET_EMATCH is not set
--# CONFIG_NET_CLS_ACT is not set
--# CONFIG_NET_CLS_POLICE is not set
--# CONFIG_NET_CLS_IND is not set
--CONFIG_NET_ESTIMATOR=y
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_IRDA 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_HIDP=m
--
--#
--# Bluetooth device drivers
--#
--CONFIG_BT_HCIUSB=m
--CONFIG_BT_HCIUSB_SCO=y
--# CONFIG_BT_HCIUART is not set
--# CONFIG_BT_HCIBCM203X is not set
--# CONFIG_BT_HCIBPA10X is not set
--# CONFIG_BT_HCIBFUSB is not set
--# CONFIG_BT_HCIVHCI is not set
--# CONFIG_AF_RXRPC is not set
--CONFIG_FIB_RULES=y
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=m
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--
--#
--# Connector - unified userspace <-> kernelspace linker
--#
--CONFIG_CONNECTOR=m
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--# CONFIG_MTD_AFS_PARTS is not set
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=y
--CONFIG_MTD_BLOCK=y
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--# CONFIG_MTD_CFI is not set
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--# CONFIG_MTD_RAM is not set
--# CONFIG_MTD_ROM is not set
--# CONFIG_MTD_ABSENT is not set
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_DATAFLASH is not set
--# CONFIG_MTD_M25P80 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_BLOCK2MTD is not set
--
--#
--# Disk-On-Chip Device Drivers
--#
--# CONFIG_MTD_DOC2000 is not set
--# CONFIG_MTD_DOC2001 is not set
--# CONFIG_MTD_DOC2001PLUS is not set
--CONFIG_MTD_NAND=y
--CONFIG_MTD_NAND_VERIFY_WRITE=y
--# CONFIG_MTD_NAND_ECC_SMC is not set
--# CONFIG_MTD_NAND_MUSEUM_IDS is not set
--CONFIG_MTD_NAND_IDS=y
--CONFIG_MTD_NAND_S3C2410=y
--CONFIG_MTD_NAND_S3C2410_BBT=y
--# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
--CONFIG_MTD_NAND_S3C2410_HWECC=y
--# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
--# CONFIG_MTD_NAND_DISKONCHIP is not set
--# CONFIG_MTD_NAND_NANDSIM is not set
--# CONFIG_MTD_NAND_PLATFORM is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--
--#
--# Parallel port support
--#
--# CONFIG_PARPORT is not set
--
--#
--# Plug and Play support
--#
--# CONFIG_PNPACPI is not set
--
--#
--# Block devices
--#
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=m
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--CONFIG_BLK_DEV_UB=m
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=4096
--CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=m
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--CONFIG_BLK_DEV_SD=m
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--CONFIG_BLK_DEV_SR=m
--# CONFIG_BLK_DEV_SR_VENDOR is not set
--CONFIG_CHR_DEV_SG=m
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--CONFIG_SCSI_SCAN_ASYNC=y
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--# CONFIG_SCSI_SPI_ATTRS is not set
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--
--#
--# SCSI low-level drivers
--#
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_ATA is not set
--
--#
--# Multi-device support (RAID and LVM)
--#
--CONFIG_MD=y
--# CONFIG_BLK_DEV_MD is not set
--CONFIG_BLK_DEV_DM=m
--# CONFIG_DM_DEBUG is not set
--CONFIG_DM_CRYPT=m
--CONFIG_DM_SNAPSHOT=m
--# CONFIG_DM_MIRROR is not set
--# CONFIG_DM_ZERO is not set
--# CONFIG_DM_MULTIPATH is not set
--# CONFIG_DM_DELAY is not set
--
--#
--# Network device support
--#
--CONFIG_NETDEVICES=y
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_EQUALIZER is not set
--CONFIG_TUN=m
--# CONFIG_PHYLIB is not set
--
--#
--# Ethernet (10 or 100Mbit)
--#
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=m
--# CONFIG_SMC91X is not set
--# CONFIG_DM9000 is not set
--CONFIG_NET_PCI=y
--CONFIG_CS89x0=m
--# CONFIG_NETDEV_1000 is not set
--# CONFIG_NETDEV_10000 is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--
--#
--# USB Network Adapters
--#
--CONFIG_USB_CATC=m
--CONFIG_USB_KAWETH=m
--CONFIG_USB_PEGASUS=m
--CONFIG_USB_RTL8150=m
--CONFIG_USB_USBNET_MII=m
--CONFIG_USB_USBNET=m
--CONFIG_USB_NET_AX8817X=m
--CONFIG_USB_NET_CDCETHER=m
--CONFIG_USB_NET_DM9601=m
--CONFIG_USB_NET_GL620A=m
--CONFIG_USB_NET_NET1080=m
--CONFIG_USB_NET_PLUSB=m
--CONFIG_USB_NET_MCS7830=m
--CONFIG_USB_NET_RNDIS_HOST=m
--CONFIG_USB_NET_CDC_SUBSET=m
--CONFIG_USB_ALI_M5632=y
--CONFIG_USB_AN2720=y
--CONFIG_USB_BELKIN=y
--CONFIG_USB_ARMLINUX=y
--CONFIG_USB_EPSON2888=y
--CONFIG_USB_KC2190=y
--CONFIG_USB_NET_ZAURUS=m
--# CONFIG_WAN is not set
--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=m
--CONFIG_PPP_MPPE=m
--# CONFIG_PPPOE is not set
--# CONFIG_SLIP is not set
--CONFIG_SLHC=m
--# CONFIG_SHAPER is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--
--#
--# ISDN subsystem
--#
--# CONFIG_ISDN is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--CONFIG_INPUT_MOUSEDEV=y
--# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
--CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
--CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
--# CONFIG_INPUT_JOYDEV is not set
--# CONFIG_INPUT_TSDEV is not set
--CONFIG_INPUT_EVDEV=y
--CONFIG_INPUT_EVBUG=m
--
--#
--# Input Device Drivers
--#
--CONFIG_INPUT_KEYBOARD=y
--# CONFIG_KEYBOARD_ATKBD is not set
--# 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_KEYBOARD_STOWAWAY=m
--CONFIG_KEYBOARD_GPIO=m
--CONFIG_KEYBOARD_GTA01=y
--CONFIG_KEYBOARD_QT2410=y
--CONFIG_INPUT_MOUSE=y
--# CONFIG_MOUSE_PS2 is not set
--# CONFIG_MOUSE_SERIAL is not set
--# CONFIG_MOUSE_APPLETOUCH is not set
--# CONFIG_MOUSE_VSXXXAA is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--CONFIG_INPUT_TOUCHSCREEN=y
--# CONFIG_TOUCHSCREEN_ADS7846 is not set
--CONFIG_TOUCHSCREEN_S3C2410=y
--# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
--# CONFIG_TOUCHSCREEN_GUNZE is not set
--# CONFIG_TOUCHSCREEN_ELO is not set
--# CONFIG_TOUCHSCREEN_MTOUCH is not set
--# CONFIG_TOUCHSCREEN_MK712 is not set
--# CONFIG_TOUCHSCREEN_PENMOUNT is not set
--# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
--# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
--# CONFIG_TOUCHSCREEN_UCB1400 is not set
--# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
--CONFIG_INPUT_MISC=y
--# CONFIG_INPUT_ATI_REMOTE is not set
--# CONFIG_INPUT_ATI_REMOTE2 is not set
--# CONFIG_INPUT_KEYSPAN_REMOTE is not set
--# CONFIG_INPUT_POWERMATE is not set
--# CONFIG_INPUT_YEALINK is not set
--CONFIG_INPUT_UINPUT=m
--
--#
--# Hardware I/O ports
--#
--CONFIG_SERIO=y
--# CONFIG_SERIO_SERPORT is not set
--# CONFIG_SERIO_RAW is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--CONFIG_VT=y
--CONFIG_VT_CONSOLE=y
--CONFIG_NR_TTY_DEVICES=4
--CONFIG_HW_CONSOLE=y
--CONFIG_VT_HW_CONSOLE_BINDING=y
--# CONFIG_SERIAL_NONSTANDARD is not set
--
--#
--# Serial drivers
--#
--# CONFIG_SERIAL_8250 is not set
--
--#
--# Non-8250 serial port support
--#
--CONFIG_SERIAL_S3C2410=y
--CONFIG_SERIAL_S3C2410_CONSOLE=y
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--CONFIG_UNIX98_PTYS=y
--# CONFIG_LEGACY_PTYS is not set
--
--#
--# IPMI
--#
--# CONFIG_IPMI_HANDLER is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_S3C2410_WATCHDOG=m
--
--#
--# USB-based Watchdog Cards
--#
--# CONFIG_USBPCWATCHDOG is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_R3964 is not set
--# CONFIG_RAW_DRIVER is not set
--
--#
--# TPM devices
--#
--# CONFIG_TCG_TPM is not set
--# CONFIG_TS0710_MUX is not set
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_GPIO is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--CONFIG_I2C_S3C2410=y
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_STUB is not set
--# CONFIG_I2C_TINY_USB is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_SENSORS_DS1337 is not set
--# CONFIG_SENSORS_DS1374 is not set
--# CONFIG_SENSORS_EEPROM is not set
--CONFIG_SENSORS_PCF50606=y
--CONFIG_SENSORS_PCF50633=y
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_SENSORS_PCA9539 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--CONFIG_SENSORS_TSL256X=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
--
--#
--# SPI support
--#
--CONFIG_SPI=y
--# CONFIG_SPI_DEBUG is not set
--CONFIG_SPI_MASTER=y
--
--#
--# SPI Master Controller Drivers
--#
--CONFIG_SPI_BITBANG=y
--CONFIG_SPI_S3C24XX=y
--CONFIG_SPI_S3C24XX_GPIO=y
--
--#
--# SPI Protocol Masters
--#
--# CONFIG_SPI_AT25 is not set
--# CONFIG_SPI_SPIDEV is not set
--CONFIG_SPI_SLAVE_JBT6K74=y
--# CONFIG_SPI_SLAVE_LIS302DL is not set
--
--#
--# Dallas's 1-wire bus
--#
--# CONFIG_W1 is not set
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_ABITUGURU is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ASB100 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_FSCHER is not set
--# CONFIG_SENSORS_FSCPOS is not set
--# CONFIG_SENSORS_GL518SM is not set
--# CONFIG_SENSORS_GL520SM is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_LM63 is not set
--# CONFIG_SENSORS_LM70 is not set
--# CONFIG_SENSORS_LM75 is not set
--# CONFIG_SENSORS_LM77 is not set
--# CONFIG_SENSORS_LM78 is not set
--# CONFIG_SENSORS_LM80 is not set
--# CONFIG_SENSORS_LM83 is not set
--# CONFIG_SENSORS_LM85 is not set
--# CONFIG_SENSORS_LM87 is not set
--# CONFIG_SENSORS_LM90 is not set
--# CONFIG_SENSORS_LM92 is not set
--# CONFIG_SENSORS_MAX1619 is not set
--# CONFIG_SENSORS_MAX6650 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47M192 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--
--#
--# Misc devices
--#
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--
--#
--# LED devices
--#
--CONFIG_NEW_LEDS=y
--CONFIG_LEDS_CLASS=y
--
--#
--# LED drivers
--#
--CONFIG_LEDS_S3C24XX=m
--CONFIG_LEDS_GTA01=y
--# CONFIG_LEDS_GTA02 is not set
--
--#
--# LED Triggers
--#
--CONFIG_LEDS_TRIGGERS=y
--CONFIG_LEDS_TRIGGER_TIMER=y
--# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--# CONFIG_USB_DABUSB is not set
--
--#
--# Graphics support
--#
--CONFIG_BACKLIGHT_LCD_SUPPORT=y
--CONFIG_BACKLIGHT_CLASS_DEVICE=y
--CONFIG_LCD_CLASS_DEVICE=y
--CONFIG_BACKLIGHT_GTA01=y
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--# CONFIG_VGASTATE is not set
--CONFIG_FB=y
--# CONFIG_FIRMWARE_EDID is not set
--# CONFIG_FB_DDC is not set
--CONFIG_FB_CFB_FILLRECT=y
--CONFIG_FB_CFB_COPYAREA=y
--CONFIG_FB_CFB_IMAGEBLIT=y
--# CONFIG_FB_SYS_FILLRECT is not set
--# CONFIG_FB_SYS_COPYAREA is not set
--# CONFIG_FB_SYS_IMAGEBLIT is not set
--# CONFIG_FB_SYS_FOPS is not set
--CONFIG_FB_DEFERRED_IO=y
--# CONFIG_FB_SVGALIB is not set
--# CONFIG_FB_MACMODES is not set
--# CONFIG_FB_BACKLIGHT is not set
--# CONFIG_FB_MODE_HELPERS is not set
--# CONFIG_FB_TILEBLITTING is not set
--
--#
--# Frame buffer hardware drivers
--#
--# CONFIG_FB_S1D13XXX is not set
--CONFIG_FB_S3C2410=y
--# CONFIG_FB_S3C2410_DEBUG is not set
--CONFIG_GLAMO=y
--CONFIG_FB_GLAMO=y
--CONFIG_GLAMO_SPI_GPIO=y
--CONFIG_FB_GLAMO_SPI=y
--# CONFIG_FB_VIRTUAL is not set
--
--#
--# Console display driver support
--#
--# CONFIG_VGA_CONSOLE is not set
--CONFIG_DUMMY_CONSOLE=y
--CONFIG_FRAMEBUFFER_CONSOLE=y
--# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
--CONFIG_FONTS=y
--# CONFIG_FONT_8x8 is not set
--# CONFIG_FONT_8x16 is not set
--CONFIG_FONT_6x11=y
--# CONFIG_FONT_7x14 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
--# CONFIG_FONT_10x18 is not set
--# CONFIG_LOGO is not set
--
--#
--# Sound
--#
--CONFIG_SOUND=y
--
--#
--# 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 is not set
--CONFIG_SND_OSSEMUL=y
--CONFIG_SND_MIXER_OSS=m
--CONFIG_SND_PCM_OSS=m
--CONFIG_SND_PCM_OSS_PLUGINS=y
--# CONFIG_SND_DYNAMIC_MINORS is not set
--CONFIG_SND_SUPPORT_OLD_API=y
--CONFIG_SND_VERBOSE_PROCFS=y
--# 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
--
--#
--# ALSA ARM devices
--#
--
--#
--# USB devices
--#
--CONFIG_SND_USB_AUDIO=m
--# CONFIG_SND_USB_CAIAQ is not set
--
--#
--# System on Chip audio support
--#
--CONFIG_SND_SOC=m
--CONFIG_SND_S3C24XX_SOC=m
--CONFIG_SND_S3C24XX_SOC_I2S=m
--CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
--CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
--
--#
--# SoC Audio support for SuperH
--#
--CONFIG_SND_SOC_WM8753=m
--
--#
--# Open Sound System
--#
--# CONFIG_SOUND_PRIME is not set
--
--#
--# HID Devices
--#
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--
--#
--# USB Input Devices
--#
--CONFIG_USB_HID=m
--# CONFIG_USB_HIDINPUT_POWERBOOK is not set
--# CONFIG_HID_FF is not set
--# CONFIG_USB_HIDDEV is not set
--
--#
--# USB HID Boot Protocol drivers
--#
--# CONFIG_USB_KBD is not set
--# CONFIG_USB_MOUSE is not set
--
--#
--# USB support
--#
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--# CONFIG_USB_ARCH_HAS_EHCI is not set
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--
--#
--# Miscellaneous USB options
--#
--CONFIG_USB_DEVICEFS=y
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--CONFIG_USB_SUSPEND=y
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--# CONFIG_USB_ISP116X_HCD is not set
--CONFIG_USB_OHCI_HCD=m
--# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
--# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
--CONFIG_USB_OHCI_LITTLE_ENDIAN=y
--# CONFIG_USB_SL811_HCD is not set
--
--#
--# USB Device Class drivers
--#
--CONFIG_USB_ACM=m
--CONFIG_USB_PRINTER=m
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# may also be needed; see USB_STORAGE Help for more information
--#
--CONFIG_USB_STORAGE=m
--# CONFIG_USB_STORAGE_DEBUG is not set
--CONFIG_USB_STORAGE_DATAFAB=y
--CONFIG_USB_STORAGE_FREECOM=y
--CONFIG_USB_STORAGE_DPCM=y
--CONFIG_USB_STORAGE_USBAT=y
--CONFIG_USB_STORAGE_SDDR09=y
--CONFIG_USB_STORAGE_SDDR55=y
--CONFIG_USB_STORAGE_JUMPSHOT=y
--CONFIG_USB_STORAGE_ALAUDA=y
--CONFIG_USB_STORAGE_KARMA=y
--CONFIG_USB_LIBUSUAL=y
--
--#
--# USB Imaging devices
--#
--# CONFIG_USB_MDC800 is not set
--# CONFIG_USB_MICROTEK is not set
--CONFIG_USB_MON=y
--
--#
--# USB port drivers
--#
--
--#
--# USB Serial Converter support
--#
--CONFIG_USB_SERIAL=m
--CONFIG_USB_SERIAL_GENERIC=y
--CONFIG_USB_SERIAL_AIRCABLE=m
--CONFIG_USB_SERIAL_AIRPRIME=m
--CONFIG_USB_SERIAL_ARK3116=m
--CONFIG_USB_SERIAL_BELKIN=m
--CONFIG_USB_SERIAL_WHITEHEAT=m
--CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
--CONFIG_USB_SERIAL_CP2101=m
--CONFIG_USB_SERIAL_CYPRESS_M8=m
--CONFIG_USB_SERIAL_EMPEG=m
--CONFIG_USB_SERIAL_FTDI_SIO=m
--CONFIG_USB_SERIAL_FUNSOFT=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_GARMIN=m
--CONFIG_USB_SERIAL_IPW=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_MOS7720=m
--CONFIG_USB_SERIAL_MOS7840=m
--CONFIG_USB_SERIAL_NAVMAN=m
--CONFIG_USB_SERIAL_PL2303=m
--CONFIG_USB_SERIAL_HP4X=m
--CONFIG_USB_SERIAL_SAFE=m
--CONFIG_USB_SERIAL_SAFE_PADDED=y
--CONFIG_USB_SERIAL_SIERRAWIRELESS=m
--CONFIG_USB_SERIAL_TI=m
--CONFIG_USB_SERIAL_CYBERJACK=m
--CONFIG_USB_SERIAL_XIRCOM=m
--CONFIG_USB_SERIAL_OPTION=m
--CONFIG_USB_SERIAL_OMNINET=m
--# CONFIG_USB_SERIAL_DEBUG is not set
--CONFIG_USB_EZUSB=y
--
--#
--# USB Miscellaneous drivers
--#
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
--# CONFIG_USB_ADUTUX is not set
--# CONFIG_USB_AUERSWALD is not set
--# CONFIG_USB_RIO500 is not set
--# CONFIG_USB_LEGOTOWER is not set
--# CONFIG_USB_LCD is not set
--CONFIG_USB_BERRY_CHARGE=m
--# CONFIG_USB_LED is not set
--# CONFIG_USB_CYPRESS_CY7C63 is not set
--# CONFIG_USB_CYTHERM is not set
--# CONFIG_USB_PHIDGET is not set
--# CONFIG_USB_IDMOUSE is not set
--# CONFIG_USB_FTDI_ELAN is not set
--# CONFIG_USB_APPLEDISPLAY is not set
--# CONFIG_USB_LD is not set
--CONFIG_USB_TRANCEVIBRATOR=m
--CONFIG_USB_IOWARRIOR=m
--# CONFIG_USB_TEST is not set
--
--#
--# USB DSL modem support
--#
--
--#
--# USB Gadget Support
--#
--CONFIG_USB_GADGET=y
--# CONFIG_USB_GADGET_DEBUG_FILES is not set
--CONFIG_USB_GADGET_SELECTED=y
--# CONFIG_USB_GADGET_FSL_USB2 is not set
--# CONFIG_USB_GADGET_NET2280 is not set
--# CONFIG_USB_GADGET_PXA2XX is not set
--# CONFIG_USB_GADGET_GOKU is not set
--# CONFIG_USB_GADGET_LH7A40X is not set
--# CONFIG_USB_GADGET_OMAP is not set
--CONFIG_USB_GADGET_S3C2410=y
--CONFIG_USB_S3C2410=y
--# CONFIG_USB_S3C2410_DEBUG is not set
--# CONFIG_USB_GADGET_AT91 is not set
--# CONFIG_USB_GADGET_DUMMY_HCD is not set
--# CONFIG_USB_GADGET_DUALSPEED is not set
--# CONFIG_USB_ZERO is not set
--CONFIG_USB_ETH=y
--CONFIG_USB_ETH_RNDIS=y
--# CONFIG_USB_GADGETFS is not set
--# CONFIG_USB_FILE_STORAGE is not set
--# CONFIG_USB_G_SERIAL is not set
--# CONFIG_USB_MIDI_GADGET is not set
--CONFIG_MMC=y
--# CONFIG_MMC_DEBUG is not set
--CONFIG_MMC_UNSAFE_RESUME=y
--
--#
--# MMC/SD Card Drivers
--#
--CONFIG_MMC_BLOCK=y
--
--#
--# MMC/SD Host Controller Drivers
--#
--CONFIG_MMC_S3C=y
--
--#
--# Real Time Clock
--#
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--CONFIG_RTC_DEBUG=y
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--# CONFIG_RTC_DRV_DS1307 is not set
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--
--#
--# SPI RTC drivers
--#
--# CONFIG_RTC_DRV_RS5C348 is not set
--# CONFIG_RTC_DRV_MAX6902 is not set
--
--#
--# Platform RTC drivers
--#
--# CONFIG_RTC_DRV_CMOS is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--CONFIG_RTC_DRV_S3C=m
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=m
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--# CONFIG_EXT3_FS_XATTR is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--# CONFIG_JBD_DEBUG is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--CONFIG_FS_POSIX_ACL=y
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--# CONFIG_MINIX_FS is not set
--CONFIG_ROMFS_FS=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--CONFIG_DNOTIFY=y
--# CONFIG_AUTOFS_FS is not set
--CONFIG_AUTOFS4_FS=m
--CONFIG_FUSE_FS=m
--
--#
--# CD-ROM/DVD Filesystems
--#
--CONFIG_ISO9660_FS=m
--CONFIG_JOLIET=y
--# CONFIG_ZISOFS is not set
--# CONFIG_UDF_FS is not set
--
--#
--# DOS/FAT/NT Filesystems
--#
--CONFIG_FAT_FS=m
--CONFIG_MSDOS_FS=m
--CONFIG_VFAT_FS=m
--CONFIG_FAT_DEFAULT_CODEPAGE=437
--CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--CONFIG_RAMFS=y
--CONFIG_CONFIGFS_FS=m
--
--#
--# 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_YAFFS_FS=y
--CONFIG_YAFFS_YAFFS1=y
--CONFIG_YAFFS_9BYTE_TAGS=y
--CONFIG_YAFFS_YAFFS2=y
--CONFIG_YAFFS_AUTO_YAFFS2=y
--# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
--CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
--# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
--# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
--CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
--CONFIG_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--CONFIG_JFFS2_SUMMARY=y
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--CONFIG_CRAMFS=y
--# 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_V3_ACL is not set
--CONFIG_NFS_V4=y
--# CONFIG_NFS_DIRECTIO is not set
--CONFIG_NFSD=m
--CONFIG_NFSD_V3=y
--# CONFIG_NFSD_V3_ACL is not set
--CONFIG_NFSD_V4=y
--CONFIG_NFSD_TCP=y
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_EXPORTFS=m
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--CONFIG_CIFS=m
--# CONFIG_CIFS_STATS is not set
--CONFIG_CIFS_WEAK_PW_HASH=y
--# CONFIG_CIFS_XATTR is not set
--# CONFIG_CIFS_DEBUG2 is not set
--# CONFIG_CIFS_EXPERIMENTAL is not set
--# CONFIG_NCP_FS is not set
--# CONFIG_CODA_FS is not set
--# CONFIG_AFS_FS is not set
--# CONFIG_9P_FS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--
--#
--# Native Language Support
--#
--CONFIG_NLS=m
--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 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=m
--CONFIG_NLS_CODEPAGE_950=m
--# 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=m
--
--#
--# Distributed Lock Manager
--#
--# CONFIG_DLM is not set
--
--#
--# Profiling support
--#
--# CONFIG_PROFILING is not set
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--# CONFIG_SCHEDSTATS is not set
--CONFIG_TIMER_STATS=y
--# CONFIG_DEBUG_SLAB is not set
--CONFIG_DEBUG_PREEMPT=y
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_LOCK_ALLOC is not set
--# CONFIG_PROVE_LOCKING is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--CONFIG_DEBUG_BUGVERBOSE=y
--CONFIG_DEBUG_INFO=y
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--CONFIG_FRAME_POINTER=y
--CONFIG_FORCED_INLINING=y
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_DEBUG_USER is not set
--CONFIG_DEBUG_ERRORS=y
--CONFIG_DEBUG_LL=y
--# CONFIG_DEBUG_ICEDCC is not set
--CONFIG_DEBUG_S3C2410_PORT=y
--CONFIG_DEBUG_S3C2410_UART=0
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--
--#
--# Cryptographic options
--#
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--CONFIG_CRYPTO_HASH=y
--CONFIG_CRYPTO_MANAGER=y
--CONFIG_CRYPTO_HMAC=y
--CONFIG_CRYPTO_XCBC=m
--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_WP512=m
--CONFIG_CRYPTO_TGR192=m
--CONFIG_CRYPTO_GF128MUL=m
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--CONFIG_CRYPTO_LRW=m
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--CONFIG_CRYPTO_FCRYPT=m
--CONFIG_CRYPTO_BLOWFISH=m
--CONFIG_CRYPTO_TWOFISH=m
--CONFIG_CRYPTO_TWOFISH_COMMON=m
--CONFIG_CRYPTO_SERPENT=m
--CONFIG_CRYPTO_AES=m
--CONFIG_CRYPTO_CAST5=m
--CONFIG_CRYPTO_CAST6=m
--CONFIG_CRYPTO_TEA=m
--CONFIG_CRYPTO_ARC4=m
--CONFIG_CRYPTO_KHAZAD=m
--CONFIG_CRYPTO_ANUBIS=m
--CONFIG_CRYPTO_DEFLATE=m
--CONFIG_CRYPTO_MICHAEL_MIC=m
--CONFIG_CRYPTO_CRC32C=m
--CONFIG_CRYPTO_CAMELLIA=m
--CONFIG_CRYPTO_TEST=m
--
--#
--# Hardware crypto devices
--#
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--CONFIG_CRC_CCITT=m
--CONFIG_CRC16=m
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--CONFIG_LIBCRC32C=m
--CONFIG_ZLIB_INFLATE=y
--CONFIG_ZLIB_DEFLATE=y
--CONFIG_TEXTSEARCH=y
--CONFIG_TEXTSEARCH_KMP=m
--CONFIG_TEXTSEARCH_BM=m
--CONFIG_TEXTSEARCH_FSM=m
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_DMA=y
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-deleted file mode 100644
-index 7273973..0000000
---- a/defconfig-2.6.24
-+++ /dev/null
-@@ -1,1830 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.24
--# Sat Mar  1 11:36:29 2008
--#
--CONFIG_ARM=y
--CONFIG_SYS_SUPPORTS_APM_EMULATION=y
--CONFIG_GENERIC_GPIO=y
--# CONFIG_GENERIC_TIME is not set
--# CONFIG_GENERIC_CLOCKEVENTS is not set
--CONFIG_MMU=y
--CONFIG_NO_IOPORT=y
--CONFIG_GENERIC_HARDIRQS=y
--CONFIG_STACKTRACE_SUPPORT=y
--CONFIG_LOCKDEP_SUPPORT=y
--CONFIG_TRACE_IRQFLAGS_SUPPORT=y
--CONFIG_HARDIRQS_SW_RESEND=y
--CONFIG_GENERIC_IRQ_PROBE=y
--CONFIG_RWSEM_GENERIC_SPINLOCK=y
--# CONFIG_ARCH_HAS_ILOG2_U32 is not set
--# CONFIG_ARCH_HAS_ILOG2_U64 is not set
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_ZONE_DMA=y
--CONFIG_FIQ=y
--CONFIG_VECTORS_BASE=0xffff0000
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_LOCK_KERNEL=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION="-mokodev"
--# CONFIG_LOCALVERSION_AUTO is not set
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_USER_NS is not set
--# CONFIG_PID_NS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=16
--# CONFIG_CGROUPS is not set
--CONFIG_FAIR_GROUP_SCHED=y
--CONFIG_FAIR_USER_SCHED=y
--# CONFIG_FAIR_CGROUP_SCHED is not set
--# CONFIG_SYSFS_DEPRECATED is not set
--# CONFIG_RELAY is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--CONFIG_CC_OPTIMIZE_FOR_SIZE=y
--CONFIG_SYSCTL=y
--# CONFIG_EMBEDDED is not set
--CONFIG_UID16=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--CONFIG_KALLSYMS_ALL=y
--# CONFIG_KALLSYMS_EXTRA_PASS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLAB=y
--# CONFIG_SLUB is not set
--# CONFIG_SLOB is not set
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--CONFIG_MODULE_FORCE_UNLOAD=y
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=m
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=m
--# CONFIG_DEFAULT_AS is not set
--CONFIG_DEFAULT_DEADLINE=y
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="deadline"
--
--#
--# System Type
--#
--# CONFIG_ARCH_AAEC2000 is not set
--# CONFIG_ARCH_INTEGRATOR is not set
--# CONFIG_ARCH_REALVIEW is not set
--# CONFIG_ARCH_VERSATILE is not set
--# CONFIG_ARCH_AT91 is not set
--# CONFIG_ARCH_CLPS7500 is not set
--# CONFIG_ARCH_CLPS711X is not set
--# CONFIG_ARCH_CO285 is not set
--# CONFIG_ARCH_EBSA110 is not set
--# CONFIG_ARCH_EP93XX is not set
--# CONFIG_ARCH_FOOTBRIDGE is not set
--# CONFIG_ARCH_NETX is not set
--# CONFIG_ARCH_H720X is not set
--# CONFIG_ARCH_IMX is not set
--# CONFIG_ARCH_IOP13XX is not set
--# CONFIG_ARCH_IOP32X is not set
--# CONFIG_ARCH_IOP33X is not set
--# CONFIG_ARCH_IXP23XX is not set
--# CONFIG_ARCH_IXP2000 is not set
--# CONFIG_ARCH_IXP4XX is not set
--# CONFIG_ARCH_L7200 is not set
--# CONFIG_ARCH_KS8695 is not set
--# CONFIG_ARCH_NS9XXX is not set
--# CONFIG_ARCH_MXC is not set
--# CONFIG_ARCH_PNX4008 is not set
--# CONFIG_ARCH_PXA is not set
--# CONFIG_ARCH_RPC is not set
--# CONFIG_ARCH_SA1100 is not set
--CONFIG_ARCH_S3C2410=y
--# CONFIG_ARCH_SHARK is not set
--# CONFIG_ARCH_LH7A40X is not set
--# CONFIG_ARCH_DAVINCI is not set
--# CONFIG_ARCH_OMAP is not set
--CONFIG_PLAT_S3C24XX=y
--CONFIG_CPU_S3C244X=y
--CONFIG_S3C2410_DMA=y
--# CONFIG_S3C2410_DMA_DEBUG is not set
--CONFIG_MACH_SMDK=y
--CONFIG_MACH_NEO1973=y
--CONFIG_PLAT_S3C=y
--CONFIG_CPU_LLSERIAL_S3C2410=y
--CONFIG_CPU_LLSERIAL_S3C2440=y
--
--#
--# Boot options
--#
--# CONFIG_S3C_BOOT_WATCHDOG is not set
--# CONFIG_S3C_BOOT_ERROR_RESET is not set
--
--#
--# Power management
--#
--# CONFIG_S3C2410_PM_DEBUG is not set
--# CONFIG_S3C2410_PM_CHECK is not set
--CONFIG_S3C_LOWLEVEL_UART_PORT=2
--
--#
--# S3C2400 Machines
--#
--CONFIG_CPU_S3C2410=y
--CONFIG_CPU_S3C2410_DMA=y
--CONFIG_S3C2410_PM=y
--CONFIG_S3C2410_GPIO=y
--CONFIG_S3C2410_CLOCK=y
--CONFIG_S3C2410_PWM=y
--
--#
--# S3C2410 Machines
--#
--# CONFIG_ARCH_SMDK2410 is not set
--# CONFIG_ARCH_H1940 is not set
--# CONFIG_MACH_N30 is not set
--# CONFIG_ARCH_BAST is not set
--# CONFIG_MACH_OTOM is not set
--# CONFIG_MACH_AML_M5900 is not set
--# CONFIG_MACH_VR1000 is not set
--CONFIG_MACH_QT2410=y
--CONFIG_MACH_NEO1973_GTA01=y
--
--#
--# S3C2412 Machines
--#
--# CONFIG_MACH_SMDK2413 is not set
--# CONFIG_MACH_SMDK2412 is not set
--# CONFIG_MACH_VSTMS is not set
--CONFIG_CPU_S3C2440=y
--CONFIG_S3C2440_DMA=y
--CONFIG_S3C2440_C_FIQ=y
--
--#
--# S3C2440 Machines
--#
--# CONFIG_MACH_ANUBIS is not set
--# CONFIG_MACH_OSIRIS is not set
--# CONFIG_MACH_RX3715 is not set
--CONFIG_ARCH_S3C2440=y
--# CONFIG_MACH_NEXCODER_2440 is not set
--CONFIG_SMDK2440_CPU2440=y
--CONFIG_MACH_HXD8=y
--CONFIG_MACH_NEO1973_GTA02=y
--# CONFIG_NEO1973_GTA02_2440 is not set
--CONFIG_CPU_S3C2442=y
--
--#
--# S3C2442 Machines
--#
--CONFIG_SMDK2440_CPU2442=y
--
--#
--# S3C2443 Machines
--#
--# CONFIG_MACH_SMDK2443 is not set
--
--#
--# Processor Type
--#
--CONFIG_CPU_32=y
--CONFIG_CPU_ARM920T=y
--CONFIG_CPU_32v4T=y
--CONFIG_CPU_ABRT_EV4T=y
--CONFIG_CPU_CACHE_V4WT=y
--CONFIG_CPU_CACHE_VIVT=y
--CONFIG_CPU_COPY_V4WB=y
--CONFIG_CPU_TLB_V4WBI=y
--CONFIG_CPU_CP15=y
--CONFIG_CPU_CP15_MMU=y
--
--#
--# Processor Features
--#
--CONFIG_ARM_THUMB=y
--# CONFIG_CPU_ICACHE_DISABLE is not set
--# CONFIG_CPU_DCACHE_DISABLE is not set
--# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
--# CONFIG_OUTER_CACHE is not set
--
--#
--# Bus support
--#
--# CONFIG_PCI_SYSCALL is not set
--# CONFIG_ARCH_SUPPORTS_MSI is not set
--# CONFIG_PCCARD is not set
--
--#
--# Kernel Features
--#
--# CONFIG_TICK_ONESHOT is not set
--CONFIG_PREEMPT=y
--CONFIG_NO_IDLE_HZ=y
--CONFIG_HZ=200
--CONFIG_AEABI=y
--CONFIG_OABI_COMPAT=y
--# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4096
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_ALIGNMENT_TRAP=y
--
--#
--# Boot options
--#
--CONFIG_ZBOOT_ROM_TEXT=0x0
--CONFIG_ZBOOT_ROM_BSS=0x0
--CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
--# CONFIG_XIP_KERNEL is not set
--CONFIG_KEXEC=y
--CONFIG_ATAGS_PROC=y
--
--#
--# Floating point emulation
--#
--
--#
--# At least one emulation must be selected
--#
--CONFIG_FPE_NWFPE=y
--# CONFIG_FPE_NWFPE_XP is not set
--# CONFIG_FPE_FASTFPE is not set
--
--#
--# Userspace binary formats
--#
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_AOUT is not set
--# CONFIG_BINFMT_MISC is not set
--
--#
--# Power management options
--#
--CONFIG_PM=y
--CONFIG_PM_LEGACY=y
--CONFIG_PM_DEBUG=y
--CONFIG_PM_VERBOSE=y
--CONFIG_PM_SLEEP=y
--CONFIG_SUSPEND_UP_POSSIBLE=y
--CONFIG_SUSPEND=y
--CONFIG_APM_EMULATION=y
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--CONFIG_PACKET_MMAP=y
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--CONFIG_XFRM_MIGRATE=y
--CONFIG_NET_KEY=m
--CONFIG_NET_KEY_MIGRATE=y
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--CONFIG_IP_ADVANCED_ROUTER=y
--CONFIG_ASK_IP_FIB_HASH=y
--# CONFIG_IP_FIB_TRIE is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_MULTIPLE_TABLES=y
--# CONFIG_IP_ROUTE_MULTIPATH is not set
--# CONFIG_IP_ROUTE_VERBOSE 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=m
--CONFIG_NET_IPGRE=m
--# CONFIG_NET_IPGRE_BROADCAST is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--CONFIG_INET_AH=m
--CONFIG_INET_ESP=m
--CONFIG_INET_IPCOMP=m
--CONFIG_INET_XFRM_TUNNEL=m
--CONFIG_INET_TUNNEL=m
--CONFIG_INET_XFRM_MODE_TRANSPORT=m
--CONFIG_INET_XFRM_MODE_TUNNEL=m
--CONFIG_INET_XFRM_MODE_BEET=m
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--CONFIG_TCP_MD5SIG=y
--# CONFIG_IP_VS is not set
--CONFIG_IPV6=m
--# CONFIG_IPV6_PRIVACY is not set
--# CONFIG_IPV6_ROUTER_PREF is not set
--# CONFIG_IPV6_OPTIMISTIC_DAD is not set
--CONFIG_INET6_AH=m
--CONFIG_INET6_ESP=m
--CONFIG_INET6_IPCOMP=m
--# CONFIG_IPV6_MIP6 is not set
--CONFIG_INET6_XFRM_TUNNEL=m
--CONFIG_INET6_TUNNEL=m
--CONFIG_INET6_XFRM_MODE_TRANSPORT=m
--CONFIG_INET6_XFRM_MODE_TUNNEL=m
--CONFIG_INET6_XFRM_MODE_BEET=m
--# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
--CONFIG_IPV6_SIT=m
--CONFIG_IPV6_TUNNEL=m
--# CONFIG_IPV6_MULTIPLE_TABLES is not set
--# CONFIG_NETWORK_SECMARK is not set
--CONFIG_NETFILTER=y
--# CONFIG_NETFILTER_DEBUG is not set
--CONFIG_BRIDGE_NETFILTER=y
--
--#
--# Core Netfilter Configuration
--#
--CONFIG_NETFILTER_NETLINK=m
--CONFIG_NETFILTER_NETLINK_QUEUE=m
--CONFIG_NETFILTER_NETLINK_LOG=m
--CONFIG_NF_CONNTRACK_ENABLED=m
--CONFIG_NF_CONNTRACK=m
--CONFIG_NF_CT_ACCT=y
--CONFIG_NF_CONNTRACK_MARK=y
--CONFIG_NF_CONNTRACK_EVENTS=y
--CONFIG_NF_CT_PROTO_GRE=m
--CONFIG_NF_CT_PROTO_SCTP=m
--# CONFIG_NF_CT_PROTO_UDPLITE is not set
--# CONFIG_NF_CONNTRACK_AMANDA is not set
--CONFIG_NF_CONNTRACK_FTP=m
--CONFIG_NF_CONNTRACK_H323=m
--CONFIG_NF_CONNTRACK_IRC=m
--CONFIG_NF_CONNTRACK_NETBIOS_NS=m
--CONFIG_NF_CONNTRACK_PPTP=m
--CONFIG_NF_CONNTRACK_SANE=m
--CONFIG_NF_CONNTRACK_SIP=m
--CONFIG_NF_CONNTRACK_TFTP=m
--CONFIG_NF_CT_NETLINK=m
--CONFIG_NETFILTER_XTABLES=m
--CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
--CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
--CONFIG_NETFILTER_XT_TARGET_DSCP=m
--CONFIG_NETFILTER_XT_TARGET_MARK=m
--CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
--CONFIG_NETFILTER_XT_TARGET_NFLOG=m
--CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
--# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
--CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
--# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
--CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
--CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
--CONFIG_NETFILTER_XT_MATCH_DCCP=m
--CONFIG_NETFILTER_XT_MATCH_DSCP=m
--CONFIG_NETFILTER_XT_MATCH_ESP=m
--CONFIG_NETFILTER_XT_MATCH_HELPER=m
--CONFIG_NETFILTER_XT_MATCH_LENGTH=m
--CONFIG_NETFILTER_XT_MATCH_LIMIT=m
--CONFIG_NETFILTER_XT_MATCH_MAC=m
--CONFIG_NETFILTER_XT_MATCH_MARK=m
--CONFIG_NETFILTER_XT_MATCH_POLICY=m
--CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
--CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
--CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
--CONFIG_NETFILTER_XT_MATCH_QUOTA=m
--CONFIG_NETFILTER_XT_MATCH_REALM=m
--CONFIG_NETFILTER_XT_MATCH_SCTP=m
--CONFIG_NETFILTER_XT_MATCH_STATE=m
--CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
--CONFIG_NETFILTER_XT_MATCH_STRING=m
--CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
--# CONFIG_NETFILTER_XT_MATCH_TIME is not set
--# CONFIG_NETFILTER_XT_MATCH_U32 is not set
--CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
--
--#
--# IP: Netfilter Configuration
--#
--CONFIG_NF_CONNTRACK_IPV4=m
--CONFIG_NF_CONNTRACK_PROC_COMPAT=y
--# CONFIG_IP_NF_QUEUE is not set
--CONFIG_IP_NF_IPTABLES=m
--CONFIG_IP_NF_MATCH_IPRANGE=m
--CONFIG_IP_NF_MATCH_TOS=m
--# CONFIG_IP_NF_MATCH_RECENT is not set
--CONFIG_IP_NF_MATCH_ECN=m
--CONFIG_IP_NF_MATCH_AH=m
--CONFIG_IP_NF_MATCH_TTL=m
--CONFIG_IP_NF_MATCH_OWNER=m
--CONFIG_IP_NF_MATCH_ADDRTYPE=m
--CONFIG_IP_NF_FILTER=m
--CONFIG_IP_NF_TARGET_REJECT=m
--CONFIG_IP_NF_TARGET_LOG=m
--CONFIG_IP_NF_TARGET_ULOG=m
--CONFIG_NF_NAT=m
--CONFIG_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_NF_NAT_SNMP_BASIC=m
--CONFIG_NF_NAT_PROTO_GRE=m
--CONFIG_NF_NAT_FTP=m
--CONFIG_NF_NAT_IRC=m
--CONFIG_NF_NAT_TFTP=m
--# CONFIG_NF_NAT_AMANDA is not set
--CONFIG_NF_NAT_PPTP=m
--CONFIG_NF_NAT_H323=m
--CONFIG_NF_NAT_SIP=m
--CONFIG_IP_NF_MANGLE=m
--CONFIG_IP_NF_TARGET_TOS=m
--CONFIG_IP_NF_TARGET_ECN=m
--CONFIG_IP_NF_TARGET_TTL=m
--CONFIG_IP_NF_TARGET_CLUSTERIP=m
--# CONFIG_IP_NF_RAW is not set
--# CONFIG_IP_NF_ARPTABLES is not set
--
--#
--# IPv6: Netfilter Configuration (EXPERIMENTAL)
--#
--CONFIG_NF_CONNTRACK_IPV6=m
--# CONFIG_IP6_NF_QUEUE is not set
--CONFIG_IP6_NF_IPTABLES=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_OWNER=m
--CONFIG_IP6_NF_MATCH_IPV6HEADER=m
--CONFIG_IP6_NF_MATCH_AH=m
--CONFIG_IP6_NF_MATCH_MH=m
--CONFIG_IP6_NF_MATCH_EUI64=m
--CONFIG_IP6_NF_FILTER=m
--CONFIG_IP6_NF_TARGET_LOG=m
--CONFIG_IP6_NF_TARGET_REJECT=m
--CONFIG_IP6_NF_MANGLE=m
--CONFIG_IP6_NF_TARGET_HL=m
--# CONFIG_IP6_NF_RAW is not set
--
--#
--# 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_BRIDGE_EBT_ULOG=m
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--CONFIG_BRIDGE=y
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--CONFIG_LLC=y
--# 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--CONFIG_NET_SCHED=y
--
--#
--# Queueing/Scheduling
--#
--CONFIG_NET_SCH_CBQ=m
--CONFIG_NET_SCH_HTB=m
--CONFIG_NET_SCH_HFSC=m
--CONFIG_NET_SCH_PRIO=m
--# CONFIG_NET_SCH_RR is not set
--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_NETEM=m
--CONFIG_NET_SCH_INGRESS=m
--
--#
--# Classification
--#
--CONFIG_NET_CLS=y
--CONFIG_NET_CLS_BASIC=m
--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_CLS_U32_PERF=y
--CONFIG_CLS_U32_MARK=y
--CONFIG_NET_CLS_RSVP=m
--CONFIG_NET_CLS_RSVP6=m
--# CONFIG_NET_EMATCH is not set
--# CONFIG_NET_CLS_ACT is not set
--# CONFIG_NET_CLS_POLICE is not set
--# CONFIG_NET_CLS_IND is not set
--CONFIG_NET_SCH_FIFO=y
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_IRDA is not set
--CONFIG_BT=y
--CONFIG_BT_L2CAP=y
--CONFIG_BT_SCO=y
--CONFIG_BT_RFCOMM=y
--CONFIG_BT_RFCOMM_TTY=y
--CONFIG_BT_BNEP=y
--CONFIG_BT_BNEP_MC_FILTER=y
--CONFIG_BT_BNEP_PROTO_FILTER=y
--CONFIG_BT_HIDP=y
--
--#
--# Bluetooth device drivers
--#
--CONFIG_BT_HCIUSB=y
--CONFIG_BT_HCIUSB_SCO=y
--# CONFIG_BT_HCIBTSDIO is not set
--# CONFIG_BT_HCIUART is not set
--# CONFIG_BT_HCIBCM203X is not set
--# CONFIG_BT_HCIBPA10X is not set
--# CONFIG_BT_HCIBFUSB is not set
--# CONFIG_BT_HCIVHCI is not set
--# CONFIG_AF_RXRPC is not set
--CONFIG_FIB_RULES=y
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--CONFIG_WIRELESS_EXT=y
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=m
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=m
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--CONFIG_MTD_CONCAT=y
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--# CONFIG_MTD_AFS_PARTS is not set
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=y
--CONFIG_MTD_BLOCK=y
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--CONFIG_MTD_CFI_INTELEXT=y
--# CONFIG_MTD_CFI_AMDSTD is not set
--# CONFIG_MTD_CFI_STAA is not set
--CONFIG_MTD_CFI_UTIL=y
--# CONFIG_MTD_RAM is not set
--CONFIG_MTD_ROM=y
--CONFIG_MTD_ABSENT=y
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--CONFIG_MTD_PHYSMAP=y
--CONFIG_MTD_PHYSMAP_START=0x0
--CONFIG_MTD_PHYSMAP_LEN=0
--CONFIG_MTD_PHYSMAP_BANKWIDTH=2
--# CONFIG_MTD_ARM_INTEGRATOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_DATAFLASH is not set
--# CONFIG_MTD_M25P80 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_BLOCK2MTD is not set
--
--#
--# Disk-On-Chip Device Drivers
--#
--# CONFIG_MTD_DOC2000 is not set
--# CONFIG_MTD_DOC2001 is not set
--# CONFIG_MTD_DOC2001PLUS is not set
--CONFIG_MTD_NAND=y
--CONFIG_MTD_NAND_VERIFY_WRITE=y
--# CONFIG_MTD_NAND_ECC_SMC is not set
--# CONFIG_MTD_NAND_MUSEUM_IDS is not set
--CONFIG_MTD_NAND_IDS=y
--CONFIG_MTD_NAND_S3C2410=y
--# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
--CONFIG_MTD_NAND_S3C2410_HWECC=y
--# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
--# CONFIG_MTD_NAND_DISKONCHIP is not set
--# CONFIG_MTD_NAND_NANDSIM is not set
--# CONFIG_MTD_NAND_PLATFORM is not set
--# CONFIG_MTD_ALAUDA is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--# CONFIG_PARPORT is not set
--CONFIG_PNP=y
--CONFIG_PNP_DEBUG=y
--
--#
--# Protocols
--#
--# CONFIG_PNPACPI is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=m
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--CONFIG_BLK_DEV_UB=m
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=4096
--CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=m
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--CONFIG_BLK_DEV_SD=m
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--CONFIG_BLK_DEV_SR=m
--# CONFIG_BLK_DEV_SR_VENDOR is not set
--CONFIG_CHR_DEV_SG=m
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--CONFIG_SCSI_SCAN_ASYNC=y
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--# CONFIG_SCSI_SPI_ATTRS is not set
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_ATA is not set
--CONFIG_MD=y
--# CONFIG_BLK_DEV_MD is not set
--CONFIG_BLK_DEV_DM=m
--# CONFIG_DM_DEBUG is not set
--CONFIG_DM_CRYPT=m
--CONFIG_DM_SNAPSHOT=m
--# CONFIG_DM_MIRROR is not set
--# CONFIG_DM_ZERO is not set
--# CONFIG_DM_MULTIPATH is not set
--# CONFIG_DM_DELAY is not set
--# CONFIG_DM_UEVENT is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--CONFIG_TUN=m
--# CONFIG_VETH is not set
--# CONFIG_NET_SB1000 is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_AX88796 is not set
--# CONFIG_SMC91X is not set
--# CONFIG_DM9000 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--CONFIG_NET_PCI=y
--# CONFIG_B44 is not set
--CONFIG_CS89x0=m
--# CONFIG_NETDEV_1000 is not set
--# CONFIG_NETDEV_10000 is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--
--#
--# USB Network Adapters
--#
--CONFIG_USB_CATC=m
--CONFIG_USB_KAWETH=m
--CONFIG_USB_PEGASUS=m
--CONFIG_USB_RTL8150=m
--CONFIG_USB_USBNET=y
--CONFIG_USB_NET_AX8817X=m
--CONFIG_USB_NET_CDCETHER=m
--CONFIG_USB_NET_DM9601=m
--CONFIG_USB_NET_GL620A=m
--CONFIG_USB_NET_NET1080=m
--CONFIG_USB_NET_PLUSB=m
--CONFIG_USB_NET_MCS7830=m
--CONFIG_USB_NET_RNDIS_HOST=m
--CONFIG_USB_NET_CDC_SUBSET=m
--CONFIG_USB_ALI_M5632=y
--CONFIG_USB_AN2720=y
--CONFIG_USB_BELKIN=y
--CONFIG_USB_ARMLINUX=y
--CONFIG_USB_EPSON2888=y
--CONFIG_USB_KC2190=y
--CONFIG_USB_NET_ZAURUS=m
--# CONFIG_WAN is not set
--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=m
--CONFIG_PPP_MPPE=m
--# CONFIG_PPPOE is not set
--# CONFIG_PPPOL2TP is not set
--# CONFIG_SLIP is not set
--CONFIG_SLHC=m
--# CONFIG_SHAPER is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--CONFIG_INPUT_MOUSEDEV=y
--# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
--CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
--CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
--# CONFIG_INPUT_JOYDEV is not set
--CONFIG_INPUT_EVDEV=y
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--CONFIG_INPUT_KEYBOARD=y
--# CONFIG_KEYBOARD_ATKBD is not set
--# 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_KEYBOARD_STOWAWAY=m
--CONFIG_KEYBOARD_GPIO=m
--CONFIG_KEYBOARD_NEO1973=y
--CONFIG_KEYBOARD_QT2410=y
--CONFIG_INPUT_MOUSE=y
--# CONFIG_MOUSE_PS2 is not set
--# CONFIG_MOUSE_SERIAL is not set
--# CONFIG_MOUSE_APPLETOUCH is not set
--# CONFIG_MOUSE_VSXXXAA is not set
--# CONFIG_MOUSE_GPIO is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--CONFIG_INPUT_TOUCHSCREEN=y
--# CONFIG_TOUCHSCREEN_ADS7846 is not set
--# CONFIG_TOUCHSCREEN_FUJITSU is not set
--CONFIG_TOUCHSCREEN_S3C2410=y
--# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
--# CONFIG_TOUCHSCREEN_GUNZE is not set
--# CONFIG_TOUCHSCREEN_ELO is not set
--# CONFIG_TOUCHSCREEN_MTOUCH is not set
--# CONFIG_TOUCHSCREEN_MK712 is not set
--# CONFIG_TOUCHSCREEN_PENMOUNT is not set
--# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
--# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
--# CONFIG_TOUCHSCREEN_UCB1400 is not set
--# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
--CONFIG_INPUT_MISC=y
--# CONFIG_INPUT_ATI_REMOTE is not set
--# CONFIG_INPUT_ATI_REMOTE2 is not set
--# CONFIG_INPUT_KEYSPAN_REMOTE is not set
--# CONFIG_INPUT_POWERMATE is not set
--# CONFIG_INPUT_YEALINK is not set
--CONFIG_INPUT_UINPUT=m
--CONFIG_INPUT_LIS302DL=y
--
--#
--# Hardware I/O ports
--#
--CONFIG_SERIO=y
--# CONFIG_SERIO_SERPORT is not set
--# CONFIG_SERIO_RAW is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--CONFIG_VT=y
--CONFIG_VT_CONSOLE=y
--CONFIG_NR_TTY_DEVICES=4
--CONFIG_HW_CONSOLE=y
--CONFIG_VT_HW_CONSOLE_BINDING=y
--# CONFIG_SERIAL_NONSTANDARD is not set
--
--#
--# Serial drivers
--#
--# CONFIG_SERIAL_8250 is not set
--
--#
--# Non-8250 serial port support
--#
--CONFIG_SERIAL_S3C2410=y
--CONFIG_SERIAL_S3C2410_CONSOLE=y
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--CONFIG_UNIX98_PTYS=y
--# CONFIG_LEGACY_PTYS is not set
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_R3964 is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_GPIO is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--CONFIG_I2C_S3C2410=y
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--# CONFIG_I2C_TINY_USB is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_SENSORS_DS1337 is not set
--# CONFIG_SENSORS_DS1374 is not set
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--CONFIG_SENSORS_PCF50606=y
--CONFIG_SENSORS_PCF50633=y
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_SENSORS_PCA9539 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--CONFIG_SENSORS_TSL256X=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
--
--#
--# SPI support
--#
--CONFIG_SPI=y
--# CONFIG_SPI_DEBUG is not set
--CONFIG_SPI_MASTER=y
--
--#
--# SPI Master Controller Drivers
--#
--CONFIG_SPI_BITBANG=y
--# CONFIG_SPI_S3C24XX is not set
--CONFIG_SPI_S3C24XX_GPIO=y
--
--#
--# SPI Protocol Masters
--#
--# CONFIG_SPI_AT25 is not set
--# CONFIG_SPI_SPIDEV is not set
--# CONFIG_SPI_TLE62X0 is not set
--# CONFIG_W1 is not set
--CONFIG_POWER_SUPPLY=y
--CONFIG_POWER_SUPPLY_DEBUG=y
--CONFIG_PDA_POWER=y
--CONFIG_APM_POWER=y
--# CONFIG_BATTERY_DS2760 is not set
--CONFIG_BATTERY_BQ27000_HDQ=y
--CONFIG_GTA02_HDQ=y
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S is not set
--# CONFIG_SENSORS_GL518SM is not set
--# CONFIG_SENSORS_GL520SM is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_LM63 is not set
--# CONFIG_SENSORS_LM70 is not set
--# CONFIG_SENSORS_LM75 is not set
--# CONFIG_SENSORS_LM77 is not set
--# CONFIG_SENSORS_LM78 is not set
--# CONFIG_SENSORS_LM80 is not set
--# CONFIG_SENSORS_LM83 is not set
--# CONFIG_SENSORS_LM85 is not set
--# CONFIG_SENSORS_LM87 is not set
--# CONFIG_SENSORS_LM90 is not set
--# CONFIG_SENSORS_LM92 is not set
--# CONFIG_SENSORS_LM93 is not set
--# CONFIG_SENSORS_MAX1619 is not set
--# CONFIG_SENSORS_MAX6650 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_DME1737 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47M192 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_S3C2410_WATCHDOG=m
--
--#
--# USB-based Watchdog Cards
--#
--# CONFIG_USBPCWATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--CONFIG_MFD_GLAMO=y
--CONFIG_MFD_GLAMO_FB=y
--CONFIG_MFD_GLAMO_SPI_GPIO=y
--CONFIG_MFD_GLAMO_SPI_FB=y
--CONFIG_MFD_GLAMO_MCI=y
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--# CONFIG_USB_DABUSB is not set
--
--#
--# Graphics support
--#
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=y
--CONFIG_FB=y
--# CONFIG_FIRMWARE_EDID is not set
--# CONFIG_FB_DDC is not set
--CONFIG_FB_CFB_FILLRECT=y
--CONFIG_FB_CFB_COPYAREA=y
--CONFIG_FB_CFB_IMAGEBLIT=y
--# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
--# CONFIG_FB_SYS_FILLRECT is not set
--# CONFIG_FB_SYS_COPYAREA is not set
--# CONFIG_FB_SYS_IMAGEBLIT is not set
--# CONFIG_FB_SYS_FOPS is not set
--CONFIG_FB_DEFERRED_IO=y
--# CONFIG_FB_SVGALIB is not set
--# CONFIG_FB_MACMODES is not set
--# CONFIG_FB_BACKLIGHT is not set
--# CONFIG_FB_MODE_HELPERS is not set
--# CONFIG_FB_TILEBLITTING is not set
--
--#
--# Frame buffer hardware drivers
--#
--# CONFIG_FB_UVESA is not set
--# CONFIG_FB_S1D13XXX is not set
--CONFIG_FB_S3C2410=y
--# CONFIG_FB_S3C2410_DEBUG is not set
--# CONFIG_FB_VIRTUAL is not set
--CONFIG_BACKLIGHT_LCD_SUPPORT=y
--CONFIG_LCD_CLASS_DEVICE=y
--CONFIG_LCD_LTV350QV=y
--CONFIG_BACKLIGHT_CLASS_DEVICE=y
--# CONFIG_BACKLIGHT_CORGI is not set
--CONFIG_BACKLIGHT_GTA01=y
--
--#
--# Display device support
--#
--CONFIG_DISPLAY_SUPPORT=y
--
--#
--# Display hardware drivers
--#
--CONFIG_DISPLAY_JBT6K74=y
--
--#
--# Console display driver support
--#
--# CONFIG_VGA_CONSOLE is not set
--CONFIG_DUMMY_CONSOLE=y
--CONFIG_FRAMEBUFFER_CONSOLE=y
--# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
--# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
--CONFIG_FONTS=y
--# CONFIG_FONT_8x8 is not set
--# CONFIG_FONT_8x16 is not set
--CONFIG_FONT_6x11=y
--# CONFIG_FONT_7x14 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
--# CONFIG_FONT_10x18 is not set
--# CONFIG_LOGO is not set
--
--#
--# Sound
--#
--CONFIG_SOUND=y
--
--#
--# Advanced Linux Sound Architecture
--#
--CONFIG_SND=y
--CONFIG_SND_TIMER=y
--CONFIG_SND_PCM=y
--CONFIG_SND_HWDEP=y
--CONFIG_SND_RAWMIDI=y
--# CONFIG_SND_SEQUENCER is not set
--CONFIG_SND_OSSEMUL=y
--CONFIG_SND_MIXER_OSS=y
--CONFIG_SND_PCM_OSS=y
--CONFIG_SND_PCM_OSS_PLUGINS=y
--# CONFIG_SND_DYNAMIC_MINORS is not set
--CONFIG_SND_SUPPORT_OLD_API=y
--CONFIG_SND_VERBOSE_PROCFS=y
--# 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
--
--#
--# ALSA ARM devices
--#
--
--#
--# SPI devices
--#
--
--#
--# USB devices
--#
--CONFIG_SND_USB_AUDIO=m
--# CONFIG_SND_USB_CAIAQ is not set
--
--#
--# System on Chip audio support
--#
--CONFIG_SND_SOC=y
--CONFIG_SND_S3C24XX_SOC=y
--CONFIG_SND_S3C24XX_SOC_I2S=y
--# CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753 is not set
--CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=y
--
--#
--# SoC Audio support for SuperH
--#
--CONFIG_SND_SOC_WM8753=y
--
--#
--# Open Sound System
--#
--# CONFIG_SOUND_PRIME is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--
--#
--# USB Input Devices
--#
--CONFIG_USB_HID=y
--# CONFIG_USB_HIDINPUT_POWERBOOK is not set
--# CONFIG_HID_FF is not set
--# CONFIG_USB_HIDDEV is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--# CONFIG_USB_ARCH_HAS_EHCI is not set
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--
--#
--# Miscellaneous USB options
--#
--CONFIG_USB_DEVICEFS=y
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--CONFIG_USB_SUSPEND=y
--CONFIG_USB_PERSIST=y
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--# CONFIG_USB_ISP116X_HCD is not set
--CONFIG_USB_OHCI_HCD=y
--# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
--# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
--CONFIG_USB_OHCI_LITTLE_ENDIAN=y
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# USB Device Class drivers
--#
--CONFIG_USB_ACM=m
--CONFIG_USB_PRINTER=m
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# may also be needed; see USB_STORAGE Help for more information
--#
--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 is not set
--CONFIG_USB_STORAGE_DPCM=y
--CONFIG_USB_STORAGE_USBAT=y
--CONFIG_USB_STORAGE_SDDR09=y
--CONFIG_USB_STORAGE_SDDR55=y
--CONFIG_USB_STORAGE_JUMPSHOT=y
--CONFIG_USB_STORAGE_ALAUDA=y
--CONFIG_USB_STORAGE_KARMA=y
--CONFIG_USB_LIBUSUAL=y
--
--#
--# USB Imaging devices
--#
--# CONFIG_USB_MDC800 is not set
--# CONFIG_USB_MICROTEK is not set
--CONFIG_USB_MON=y
--
--#
--# USB port drivers
--#
--
--#
--# USB Serial Converter support
--#
--CONFIG_USB_SERIAL=y
--CONFIG_USB_SERIAL_GENERIC=y
--CONFIG_USB_SERIAL_AIRCABLE=m
--CONFIG_USB_SERIAL_AIRPRIME=m
--CONFIG_USB_SERIAL_ARK3116=m
--CONFIG_USB_SERIAL_BELKIN=m
--# CONFIG_USB_SERIAL_CH341 is not set
--CONFIG_USB_SERIAL_WHITEHEAT=m
--CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
--CONFIG_USB_SERIAL_CP2101=m
--CONFIG_USB_SERIAL_CYPRESS_M8=m
--CONFIG_USB_SERIAL_EMPEG=m
--CONFIG_USB_SERIAL_FTDI_SIO=m
--CONFIG_USB_SERIAL_FUNSOFT=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_GARMIN=m
--CONFIG_USB_SERIAL_IPW=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_MOS7720=m
--CONFIG_USB_SERIAL_MOS7840=m
--CONFIG_USB_SERIAL_NAVMAN=m
--CONFIG_USB_SERIAL_PL2303=m
--# CONFIG_USB_SERIAL_OTI6858 is not set
--CONFIG_USB_SERIAL_HP4X=m
--CONFIG_USB_SERIAL_SAFE=m
--CONFIG_USB_SERIAL_SAFE_PADDED=y
--CONFIG_USB_SERIAL_SIERRAWIRELESS=m
--CONFIG_USB_SERIAL_TI=m
--CONFIG_USB_SERIAL_CYBERJACK=m
--CONFIG_USB_SERIAL_XIRCOM=m
--CONFIG_USB_SERIAL_OPTION=y
--CONFIG_USB_SERIAL_OMNINET=m
--# CONFIG_USB_SERIAL_DEBUG is not set
--CONFIG_USB_EZUSB=y
--
--#
--# USB Miscellaneous drivers
--#
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
--# CONFIG_USB_ADUTUX is not set
--# CONFIG_USB_AUERSWALD is not set
--# CONFIG_USB_RIO500 is not set
--# CONFIG_USB_LEGOTOWER is not set
--# CONFIG_USB_LCD is not set
--CONFIG_USB_BERRY_CHARGE=m
--# CONFIG_USB_LED is not set
--# CONFIG_USB_CYPRESS_CY7C63 is not set
--# CONFIG_USB_CYTHERM is not set
--# CONFIG_USB_PHIDGET is not set
--# CONFIG_USB_IDMOUSE is not set
--# CONFIG_USB_FTDI_ELAN is not set
--# CONFIG_USB_APPLEDISPLAY is not set
--# CONFIG_USB_LD is not set
--CONFIG_USB_TRANCEVIBRATOR=m
--CONFIG_USB_IOWARRIOR=m
--# CONFIG_USB_TEST is not set
--
--#
--# USB DSL modem support
--#
--
--#
--# USB Gadget Support
--#
--CONFIG_USB_GADGET=y
--# CONFIG_USB_GADGET_DEBUG is not set
--# CONFIG_USB_GADGET_DEBUG_FILES is not set
--# CONFIG_USB_GADGET_DEBUG_FS is not set
--CONFIG_USB_GADGET_SELECTED=y
--# CONFIG_USB_GADGET_AMD5536UDC is not set
--# CONFIG_USB_GADGET_ATMEL_USBA is not set
--# CONFIG_USB_GADGET_FSL_USB2 is not set
--# CONFIG_USB_GADGET_NET2280 is not set
--# CONFIG_USB_GADGET_PXA2XX is not set
--# CONFIG_USB_GADGET_M66592 is not set
--# CONFIG_USB_GADGET_GOKU is not set
--# CONFIG_USB_GADGET_LH7A40X is not set
--# CONFIG_USB_GADGET_OMAP is not set
--CONFIG_USB_GADGET_S3C2410=y
--CONFIG_USB_S3C2410=y
--# CONFIG_USB_S3C2410_DEBUG is not set
--# CONFIG_USB_GADGET_AT91 is not set
--# CONFIG_USB_GADGET_DUMMY_HCD is not set
--# CONFIG_USB_GADGET_DUALSPEED is not set
--# CONFIG_USB_ZERO is not set
--CONFIG_USB_ETH=y
--CONFIG_USB_ETH_RNDIS=y
--# CONFIG_USB_GADGETFS is not set
--# CONFIG_USB_FILE_STORAGE is not set
--# CONFIG_USB_G_SERIAL is not set
--# CONFIG_USB_MIDI_GADGET is not set
--
--#
--# SDIO support
--#
--CONFIG_SDIO=y
--CONFIG_SDIO_S3C24XX=y
--CONFIG_SDIO_S3C24XX_DMA=y
--CONFIG_SDIO_AR6000_WLAN=y
--CONFIG_MMC=y
--# CONFIG_MMC_DEBUG is not set
--CONFIG_MMC_UNSAFE_RESUME=y
--
--#
--# MMC/SD Card Drivers
--#
--CONFIG_MMC_BLOCK=y
--# CONFIG_MMC_BLOCK_BOUNCE is not set
--# CONFIG_SDIO_UART is not set
--
--#
--# MMC/SD Host Controller Drivers
--#
--# CONFIG_MMC_SPI is not set
--# CONFIG_MMC_S3C is not set
--CONFIG_NEW_LEDS=y
--CONFIG_LEDS_CLASS=y
--
--#
--# LED drivers
--#
--CONFIG_LEDS_S3C24XX=m
--CONFIG_LEDS_GPIO=y
--CONFIG_LEDS_NEO1973_VIBRATOR=y
--CONFIG_LEDS_NEO1973_GTA02=y
--
--#
--# LED Triggers
--#
--CONFIG_LEDS_TRIGGERS=y
--CONFIG_LEDS_TRIGGER_TIMER=y
--# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--CONFIG_RTC_DEBUG=y
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--# CONFIG_RTC_DRV_DS1307 is not set
--# CONFIG_RTC_DRV_DS1374 is not set
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--
--#
--# SPI RTC drivers
--#
--# CONFIG_RTC_DRV_RS5C348 is not set
--# CONFIG_RTC_DRV_MAX6902 is not set
--
--#
--# Platform RTC drivers
--#
--# CONFIG_RTC_DRV_CMOS is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--CONFIG_RTC_DRV_S3C=m
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--# CONFIG_EXT3_FS_XATTR is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--# CONFIG_JBD_DEBUG is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--# CONFIG_MINIX_FS is not set
--CONFIG_ROMFS_FS=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--CONFIG_DNOTIFY=y
--# CONFIG_AUTOFS_FS is not set
--CONFIG_AUTOFS4_FS=m
--CONFIG_FUSE_FS=m
--
--#
--# CD-ROM/DVD Filesystems
--#
--CONFIG_ISO9660_FS=y
--CONFIG_JOLIET=y
--# CONFIG_ZISOFS is not set
--CONFIG_UDF_FS=y
--
--#
--# DOS/FAT/NT Filesystems
--#
--CONFIG_FAT_FS=y
--CONFIG_MSDOS_FS=y
--CONFIG_VFAT_FS=y
--CONFIG_FAT_DEFAULT_CODEPAGE=437
--CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--CONFIG_CONFIGFS_FS=m
--
--#
--# 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_YAFFS_FS=y
--CONFIG_YAFFS_YAFFS1=y
--CONFIG_YAFFS_9BYTE_TAGS=y
--CONFIG_YAFFS_YAFFS2=y
--CONFIG_YAFFS_AUTO_YAFFS2=y
--# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
--CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
--# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
--# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
--CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
--CONFIG_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--CONFIG_JFFS2_SUMMARY=y
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--CONFIG_CRAMFS=y
--# 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
--# CONFIG_NETWORK_FILESYSTEMS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--CONFIG_NLS=y
--CONFIG_NLS_DEFAULT="iso8859-1"
--CONFIG_NLS_CODEPAGE_437=y
--# CONFIG_NLS_CODEPAGE_737 is not set
--# CONFIG_NLS_CODEPAGE_775 is not set
--CONFIG_NLS_CODEPAGE_850=m
--# 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=m
--CONFIG_NLS_CODEPAGE_950=m
--# 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=y
--# 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=m
--# CONFIG_DLM is not set
--CONFIG_INSTRUMENTATION=y
--# CONFIG_PROFILING is not set
--CONFIG_MARKERS=y
--
--#
--# Kernel hacking
--#
--CONFIG_PRINTK_TIME=y
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--CONFIG_DEBUG_SHIRQ=y
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--CONFIG_TIMER_STATS=y
--# CONFIG_DEBUG_SLAB is not set
--CONFIG_DEBUG_PREEMPT=y
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--CONFIG_DEBUG_SPINLOCK=y
--CONFIG_DEBUG_MUTEXES=y
--CONFIG_DEBUG_LOCK_ALLOC=y
--# CONFIG_PROVE_LOCKING is not set
--CONFIG_LOCKDEP=y
--CONFIG_LOCK_STAT=y
--CONFIG_DEBUG_LOCKDEP=y
--CONFIG_DEBUG_SPINLOCK_SLEEP=y
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--CONFIG_STACKTRACE=y
--# CONFIG_DEBUG_KOBJECT is not set
--CONFIG_DEBUG_BUGVERBOSE=y
--CONFIG_DEBUG_INFO=y
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--CONFIG_DEBUG_SG=y
--CONFIG_FRAME_POINTER=y
--CONFIG_FORCED_INLINING=y
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_USER is not set
--CONFIG_DEBUG_ERRORS=y
--# CONFIG_DEBUG_LL is not set
--# CONFIG_DEBUG_ICEDCC is not set
--# CONFIG_DEBUG_S3C_PORT is not set
--CONFIG_DEBUG_S3C_UART=2
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--CONFIG_CRYPTO_HASH=y
--CONFIG_CRYPTO_MANAGER=y
--CONFIG_CRYPTO_HMAC=y
--CONFIG_CRYPTO_XCBC=m
--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_WP512=m
--CONFIG_CRYPTO_TGR192=m
--CONFIG_CRYPTO_GF128MUL=m
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--CONFIG_CRYPTO_LRW=m
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--CONFIG_CRYPTO_FCRYPT=m
--CONFIG_CRYPTO_BLOWFISH=m
--CONFIG_CRYPTO_TWOFISH=m
--CONFIG_CRYPTO_TWOFISH_COMMON=m
--CONFIG_CRYPTO_SERPENT=m
--CONFIG_CRYPTO_AES=m
--CONFIG_CRYPTO_CAST5=m
--CONFIG_CRYPTO_CAST6=m
--CONFIG_CRYPTO_TEA=m
--CONFIG_CRYPTO_ARC4=m
--CONFIG_CRYPTO_KHAZAD=m
--CONFIG_CRYPTO_ANUBIS=m
--# CONFIG_CRYPTO_SEED is not set
--CONFIG_CRYPTO_DEFLATE=m
--CONFIG_CRYPTO_MICHAEL_MIC=m
--CONFIG_CRYPTO_CRC32C=m
--CONFIG_CRYPTO_CAMELLIA=m
--CONFIG_CRYPTO_TEST=m
--# CONFIG_CRYPTO_AUTHENC is not set
--CONFIG_CRYPTO_HW=y
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--CONFIG_CRC_CCITT=m
--CONFIG_CRC16=m
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--CONFIG_LIBCRC32C=m
--CONFIG_ZLIB_INFLATE=y
--CONFIG_ZLIB_DEFLATE=y
--CONFIG_TEXTSEARCH=y
--CONFIG_TEXTSEARCH_KMP=m
--CONFIG_TEXTSEARCH_BM=m
--CONFIG_TEXTSEARCH_FSM=m
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_DMA=y
-diff --git a/defconfig-2.6.24-maxmodules b/defconfig-2.6.24-maxmodules
-deleted file mode 100644
-index e773649..0000000
---- a/defconfig-2.6.24-maxmodules
-+++ /dev/null
-@@ -1,1769 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.24
--# Mon Feb 25 07:03:56 2008
--#
--CONFIG_ARM=y
--CONFIG_SYS_SUPPORTS_APM_EMULATION=y
--CONFIG_GENERIC_GPIO=y
--# CONFIG_GENERIC_TIME is not set
--# CONFIG_GENERIC_CLOCKEVENTS is not set
--CONFIG_MMU=y
--CONFIG_NO_IOPORT=y
--CONFIG_GENERIC_HARDIRQS=y
--CONFIG_STACKTRACE_SUPPORT=y
--CONFIG_LOCKDEP_SUPPORT=y
--CONFIG_TRACE_IRQFLAGS_SUPPORT=y
--CONFIG_HARDIRQS_SW_RESEND=y
--CONFIG_GENERIC_IRQ_PROBE=y
--CONFIG_RWSEM_GENERIC_SPINLOCK=y
--# CONFIG_ARCH_HAS_ILOG2_U32 is not set
--# CONFIG_ARCH_HAS_ILOG2_U64 is not set
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_ZONE_DMA=y
--CONFIG_FIQ=y
--CONFIG_VECTORS_BASE=0xffff0000
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_LOCK_KERNEL=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--# CONFIG_LOCALVERSION_AUTO is not set
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_USER_NS is not set
--# CONFIG_PID_NS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_SYSFS_DEPRECATED is not set
--# CONFIG_RELAY is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--CONFIG_CC_OPTIMIZE_FOR_SIZE=y
--CONFIG_SYSCTL=y
--# CONFIG_EMBEDDED is not set
--CONFIG_UID16=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--# CONFIG_KALLSYMS_ALL is not set
--# CONFIG_KALLSYMS_EXTRA_PASS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLAB=y
--# CONFIG_SLUB is not set
--# CONFIG_SLOB is not set
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--CONFIG_MODULE_FORCE_UNLOAD=y
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=m
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=m
--# CONFIG_DEFAULT_AS is not set
--CONFIG_DEFAULT_DEADLINE=y
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="deadline"
--
--#
--# System Type
--#
--# CONFIG_ARCH_AAEC2000 is not set
--# CONFIG_ARCH_INTEGRATOR is not set
--# CONFIG_ARCH_REALVIEW is not set
--# CONFIG_ARCH_VERSATILE is not set
--# CONFIG_ARCH_AT91 is not set
--# CONFIG_ARCH_CLPS7500 is not set
--# CONFIG_ARCH_CLPS711X is not set
--# CONFIG_ARCH_CO285 is not set
--# CONFIG_ARCH_EBSA110 is not set
--# CONFIG_ARCH_EP93XX is not set
--# CONFIG_ARCH_FOOTBRIDGE is not set
--# CONFIG_ARCH_NETX is not set
--# CONFIG_ARCH_H720X is not set
--# CONFIG_ARCH_IMX is not set
--# CONFIG_ARCH_IOP13XX is not set
--# CONFIG_ARCH_IOP32X is not set
--# CONFIG_ARCH_IOP33X is not set
--# CONFIG_ARCH_IXP23XX is not set
--# CONFIG_ARCH_IXP2000 is not set
--# CONFIG_ARCH_IXP4XX is not set
--# CONFIG_ARCH_L7200 is not set
--# CONFIG_ARCH_KS8695 is not set
--# CONFIG_ARCH_NS9XXX is not set
--# CONFIG_ARCH_MXC is not set
--# CONFIG_ARCH_PNX4008 is not set
--# CONFIG_ARCH_PXA is not set
--# CONFIG_ARCH_RPC is not set
--# CONFIG_ARCH_SA1100 is not set
--CONFIG_ARCH_S3C2410=y
--# CONFIG_ARCH_SHARK is not set
--# CONFIG_ARCH_LH7A40X is not set
--# CONFIG_ARCH_DAVINCI is not set
--# CONFIG_ARCH_OMAP is not set
--CONFIG_PLAT_S3C24XX=y
--CONFIG_CPU_S3C244X=y
--CONFIG_S3C2410_DMA=y
--# CONFIG_S3C2410_DMA_DEBUG is not set
--CONFIG_MACH_SMDK=y
--CONFIG_MACH_NEO1973=y
--CONFIG_PLAT_S3C=y
--CONFIG_CPU_LLSERIAL_S3C2410=y
--CONFIG_CPU_LLSERIAL_S3C2440=y
--
--#
--# Boot options
--#
--# CONFIG_S3C_BOOT_WATCHDOG is not set
--# CONFIG_S3C_BOOT_ERROR_RESET is not set
--
--#
--# Power management
--#
--CONFIG_S3C2410_PM_DEBUG=y
--# CONFIG_S3C2410_PM_CHECK is not set
--CONFIG_S3C_LOWLEVEL_UART_PORT=0
--
--#
--# S3C2400 Machines
--#
--CONFIG_CPU_S3C2410=y
--CONFIG_CPU_S3C2410_DMA=y
--CONFIG_S3C2410_PM=y
--CONFIG_S3C2410_GPIO=y
--CONFIG_S3C2410_CLOCK=y
--CONFIG_S3C2410_PWM=y
--
--#
--# S3C2410 Machines
--#
--# CONFIG_ARCH_SMDK2410 is not set
--# CONFIG_ARCH_H1940 is not set
--# CONFIG_MACH_N30 is not set
--# CONFIG_ARCH_BAST is not set
--# CONFIG_MACH_OTOM is not set
--# CONFIG_MACH_AML_M5900 is not set
--# CONFIG_MACH_VR1000 is not set
--CONFIG_MACH_QT2410=y
--CONFIG_MACH_NEO1973_GTA01=y
--
--#
--# S3C2412 Machines
--#
--# CONFIG_MACH_SMDK2413 is not set
--# CONFIG_MACH_SMDK2412 is not set
--# CONFIG_MACH_VSTMS is not set
--CONFIG_CPU_S3C2440=y
--CONFIG_S3C2440_DMA=y
--CONFIG_S3C2440_C_FIQ=y
--
--#
--# S3C2440 Machines
--#
--# CONFIG_MACH_ANUBIS is not set
--# CONFIG_MACH_OSIRIS is not set
--# CONFIG_MACH_RX3715 is not set
--CONFIG_ARCH_S3C2440=y
--# CONFIG_MACH_NEXCODER_2440 is not set
--CONFIG_SMDK2440_CPU2440=y
--CONFIG_MACH_HXD8=y
--CONFIG_MACH_NEO1973_GTA02=y
--# CONFIG_NEO1973_GTA02_2440 is not set
--CONFIG_CPU_S3C2442=y
--
--#
--# S3C2442 Machines
--#
--CONFIG_SMDK2440_CPU2442=y
--
--#
--# S3C2443 Machines
--#
--# CONFIG_MACH_SMDK2443 is not set
--
--#
--# Processor Type
--#
--CONFIG_CPU_32=y
--CONFIG_CPU_ARM920T=y
--CONFIG_CPU_32v4T=y
--CONFIG_CPU_ABRT_EV4T=y
--CONFIG_CPU_CACHE_V4WT=y
--CONFIG_CPU_CACHE_VIVT=y
--CONFIG_CPU_COPY_V4WB=y
--CONFIG_CPU_TLB_V4WBI=y
--CONFIG_CPU_CP15=y
--CONFIG_CPU_CP15_MMU=y
--
--#
--# Processor Features
--#
--CONFIG_ARM_THUMB=y
--# CONFIG_CPU_ICACHE_DISABLE is not set
--# CONFIG_CPU_DCACHE_DISABLE is not set
--# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
--# CONFIG_OUTER_CACHE is not set
--
--#
--# Bus support
--#
--# CONFIG_PCI_SYSCALL is not set
--# CONFIG_ARCH_SUPPORTS_MSI is not set
--# CONFIG_PCCARD is not set
--
--#
--# Kernel Features
--#
--# CONFIG_TICK_ONESHOT is not set
--CONFIG_PREEMPT=y
--CONFIG_NO_IDLE_HZ=y
--CONFIG_HZ=200
--CONFIG_AEABI=y
--CONFIG_OABI_COMPAT=y
--# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4096
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_ALIGNMENT_TRAP=y
--
--#
--# Boot options
--#
--CONFIG_ZBOOT_ROM_TEXT=0x0
--CONFIG_ZBOOT_ROM_BSS=0x0
--CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
--# CONFIG_XIP_KERNEL is not set
--CONFIG_KEXEC=y
--CONFIG_ATAGS_PROC=y
--
--#
--# Floating point emulation
--#
--
--#
--# At least one emulation must be selected
--#
--CONFIG_FPE_NWFPE=y
--# CONFIG_FPE_NWFPE_XP is not set
--# CONFIG_FPE_FASTFPE is not set
--
--#
--# Userspace binary formats
--#
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_AOUT is not set
--# CONFIG_BINFMT_MISC is not set
--
--#
--# Power management options
--#
--CONFIG_PM=y
--CONFIG_PM_LEGACY=y
--CONFIG_PM_DEBUG=y
--# CONFIG_PM_VERBOSE is not set
--CONFIG_PM_SLEEP=y
--CONFIG_SUSPEND_UP_POSSIBLE=y
--CONFIG_SUSPEND=y
--CONFIG_APM_EMULATION=y
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--CONFIG_PACKET_MMAP=y
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--CONFIG_XFRM_MIGRATE=y
--CONFIG_NET_KEY=m
--CONFIG_NET_KEY_MIGRATE=y
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--CONFIG_IP_ADVANCED_ROUTER=y
--CONFIG_ASK_IP_FIB_HASH=y
--# CONFIG_IP_FIB_TRIE is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_MULTIPLE_TABLES=y
--# CONFIG_IP_ROUTE_MULTIPATH is not set
--# CONFIG_IP_ROUTE_VERBOSE 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=m
--CONFIG_NET_IPGRE=m
--# CONFIG_NET_IPGRE_BROADCAST is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--CONFIG_INET_AH=m
--CONFIG_INET_ESP=m
--CONFIG_INET_IPCOMP=m
--CONFIG_INET_XFRM_TUNNEL=m
--CONFIG_INET_TUNNEL=m
--CONFIG_INET_XFRM_MODE_TRANSPORT=m
--CONFIG_INET_XFRM_MODE_TUNNEL=m
--CONFIG_INET_XFRM_MODE_BEET=m
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--CONFIG_TCP_MD5SIG=y
--# CONFIG_IP_VS is not set
--CONFIG_IPV6=m
--# CONFIG_IPV6_PRIVACY is not set
--# CONFIG_IPV6_ROUTER_PREF is not set
--# CONFIG_IPV6_OPTIMISTIC_DAD is not set
--CONFIG_INET6_AH=m
--CONFIG_INET6_ESP=m
--CONFIG_INET6_IPCOMP=m
--# CONFIG_IPV6_MIP6 is not set
--CONFIG_INET6_XFRM_TUNNEL=m
--CONFIG_INET6_TUNNEL=m
--CONFIG_INET6_XFRM_MODE_TRANSPORT=m
--CONFIG_INET6_XFRM_MODE_TUNNEL=m
--CONFIG_INET6_XFRM_MODE_BEET=m
--# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
--CONFIG_IPV6_SIT=m
--CONFIG_IPV6_TUNNEL=m
--# CONFIG_IPV6_MULTIPLE_TABLES is not set
--# CONFIG_NETWORK_SECMARK is not set
--CONFIG_NETFILTER=y
--# CONFIG_NETFILTER_DEBUG is not set
--
--#
--# Core Netfilter Configuration
--#
--CONFIG_NETFILTER_NETLINK=m
--CONFIG_NETFILTER_NETLINK_QUEUE=m
--CONFIG_NETFILTER_NETLINK_LOG=m
--CONFIG_NF_CONNTRACK_ENABLED=m
--CONFIG_NF_CONNTRACK=m
--CONFIG_NF_CT_ACCT=y
--CONFIG_NF_CONNTRACK_MARK=y
--CONFIG_NF_CONNTRACK_EVENTS=y
--CONFIG_NF_CT_PROTO_GRE=m
--CONFIG_NF_CT_PROTO_SCTP=m
--# CONFIG_NF_CT_PROTO_UDPLITE is not set
--# CONFIG_NF_CONNTRACK_AMANDA is not set
--CONFIG_NF_CONNTRACK_FTP=m
--CONFIG_NF_CONNTRACK_H323=m
--CONFIG_NF_CONNTRACK_IRC=m
--CONFIG_NF_CONNTRACK_NETBIOS_NS=m
--CONFIG_NF_CONNTRACK_PPTP=m
--CONFIG_NF_CONNTRACK_SANE=m
--CONFIG_NF_CONNTRACK_SIP=m
--CONFIG_NF_CONNTRACK_TFTP=m
--CONFIG_NF_CT_NETLINK=m
--CONFIG_NETFILTER_XTABLES=m
--CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
--CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
--CONFIG_NETFILTER_XT_TARGET_DSCP=m
--CONFIG_NETFILTER_XT_TARGET_MARK=m
--CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
--CONFIG_NETFILTER_XT_TARGET_NFLOG=m
--CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
--# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
--CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
--# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
--CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
--CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
--CONFIG_NETFILTER_XT_MATCH_DCCP=m
--CONFIG_NETFILTER_XT_MATCH_DSCP=m
--CONFIG_NETFILTER_XT_MATCH_ESP=m
--CONFIG_NETFILTER_XT_MATCH_HELPER=m
--CONFIG_NETFILTER_XT_MATCH_LENGTH=m
--CONFIG_NETFILTER_XT_MATCH_LIMIT=m
--CONFIG_NETFILTER_XT_MATCH_MAC=m
--CONFIG_NETFILTER_XT_MATCH_MARK=m
--CONFIG_NETFILTER_XT_MATCH_POLICY=m
--CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
--CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
--CONFIG_NETFILTER_XT_MATCH_QUOTA=m
--CONFIG_NETFILTER_XT_MATCH_REALM=m
--CONFIG_NETFILTER_XT_MATCH_SCTP=m
--CONFIG_NETFILTER_XT_MATCH_STATE=m
--CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
--CONFIG_NETFILTER_XT_MATCH_STRING=m
--CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
--# CONFIG_NETFILTER_XT_MATCH_TIME is not set
--# CONFIG_NETFILTER_XT_MATCH_U32 is not set
--CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
--
--#
--# IP: Netfilter Configuration
--#
--CONFIG_NF_CONNTRACK_IPV4=m
--CONFIG_NF_CONNTRACK_PROC_COMPAT=y
--# CONFIG_IP_NF_QUEUE is not set
--CONFIG_IP_NF_IPTABLES=m
--CONFIG_IP_NF_MATCH_IPRANGE=m
--CONFIG_IP_NF_MATCH_TOS=m
--# CONFIG_IP_NF_MATCH_RECENT is not set
--CONFIG_IP_NF_MATCH_ECN=m
--CONFIG_IP_NF_MATCH_AH=m
--CONFIG_IP_NF_MATCH_TTL=m
--CONFIG_IP_NF_MATCH_OWNER=m
--CONFIG_IP_NF_MATCH_ADDRTYPE=m
--CONFIG_IP_NF_FILTER=m
--CONFIG_IP_NF_TARGET_REJECT=m
--CONFIG_IP_NF_TARGET_LOG=m
--CONFIG_IP_NF_TARGET_ULOG=m
--CONFIG_NF_NAT=m
--CONFIG_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_NF_NAT_SNMP_BASIC=m
--CONFIG_NF_NAT_PROTO_GRE=m
--CONFIG_NF_NAT_FTP=m
--CONFIG_NF_NAT_IRC=m
--CONFIG_NF_NAT_TFTP=m
--# CONFIG_NF_NAT_AMANDA is not set
--CONFIG_NF_NAT_PPTP=m
--CONFIG_NF_NAT_H323=m
--CONFIG_NF_NAT_SIP=m
--CONFIG_IP_NF_MANGLE=m
--CONFIG_IP_NF_TARGET_TOS=m
--CONFIG_IP_NF_TARGET_ECN=m
--CONFIG_IP_NF_TARGET_TTL=m
--CONFIG_IP_NF_TARGET_CLUSTERIP=m
--# CONFIG_IP_NF_RAW is not set
--# CONFIG_IP_NF_ARPTABLES is not set
--
--#
--# IPv6: Netfilter Configuration (EXPERIMENTAL)
--#
--CONFIG_NF_CONNTRACK_IPV6=m
--# CONFIG_IP6_NF_QUEUE is not set
--CONFIG_IP6_NF_IPTABLES=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_OWNER=m
--CONFIG_IP6_NF_MATCH_IPV6HEADER=m
--CONFIG_IP6_NF_MATCH_AH=m
--CONFIG_IP6_NF_MATCH_MH=m
--CONFIG_IP6_NF_MATCH_EUI64=m
--CONFIG_IP6_NF_FILTER=m
--CONFIG_IP6_NF_TARGET_LOG=m
--CONFIG_IP6_NF_TARGET_REJECT=m
--CONFIG_IP6_NF_MANGLE=m
--CONFIG_IP6_NF_TARGET_HL=m
--# CONFIG_IP6_NF_RAW is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--CONFIG_NET_SCHED=y
--
--#
--# Queueing/Scheduling
--#
--CONFIG_NET_SCH_CBQ=m
--CONFIG_NET_SCH_HTB=m
--CONFIG_NET_SCH_HFSC=m
--CONFIG_NET_SCH_PRIO=m
--# CONFIG_NET_SCH_RR is not set
--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_NETEM=m
--CONFIG_NET_SCH_INGRESS=m
--
--#
--# Classification
--#
--CONFIG_NET_CLS=y
--CONFIG_NET_CLS_BASIC=m
--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_CLS_U32_PERF=y
--CONFIG_CLS_U32_MARK=y
--CONFIG_NET_CLS_RSVP=m
--CONFIG_NET_CLS_RSVP6=m
--# CONFIG_NET_EMATCH is not set
--# CONFIG_NET_CLS_ACT is not set
--# CONFIG_NET_CLS_POLICE is not set
--# CONFIG_NET_CLS_IND is not set
--CONFIG_NET_SCH_FIFO=y
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_IRDA 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_HIDP=m
--
--#
--# Bluetooth device drivers
--#
--CONFIG_BT_HCIUSB=m
--CONFIG_BT_HCIUSB_SCO=y
--# CONFIG_BT_HCIBTSDIO is not set
--# CONFIG_BT_HCIUART is not set
--# CONFIG_BT_HCIBCM203X is not set
--# CONFIG_BT_HCIBPA10X is not set
--# CONFIG_BT_HCIBFUSB is not set
--# CONFIG_BT_HCIVHCI is not set
--# CONFIG_AF_RXRPC is not set
--CONFIG_FIB_RULES=y
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--CONFIG_WIRELESS_EXT=y
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=m
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=m
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--# CONFIG_MTD_AFS_PARTS is not set
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=y
--CONFIG_MTD_BLOCK=y
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--CONFIG_MTD_CFI_INTELEXT=y
--# CONFIG_MTD_CFI_AMDSTD is not set
--# CONFIG_MTD_CFI_STAA is not set
--CONFIG_MTD_CFI_UTIL=y
--# CONFIG_MTD_RAM is not set
--# CONFIG_MTD_ROM is not set
--CONFIG_MTD_ABSENT=y
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--CONFIG_MTD_PHYSMAP=y
--CONFIG_MTD_PHYSMAP_START=0x8000000
--CONFIG_MTD_PHYSMAP_LEN=0
--CONFIG_MTD_PHYSMAP_BANKWIDTH=2
--# CONFIG_MTD_ARM_INTEGRATOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_DATAFLASH is not set
--# CONFIG_MTD_M25P80 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_BLOCK2MTD is not set
--
--#
--# Disk-On-Chip Device Drivers
--#
--# CONFIG_MTD_DOC2000 is not set
--# CONFIG_MTD_DOC2001 is not set
--# CONFIG_MTD_DOC2001PLUS is not set
--CONFIG_MTD_NAND=y
--CONFIG_MTD_NAND_VERIFY_WRITE=y
--# CONFIG_MTD_NAND_ECC_SMC is not set
--# CONFIG_MTD_NAND_MUSEUM_IDS is not set
--CONFIG_MTD_NAND_IDS=y
--CONFIG_MTD_NAND_S3C2410=y
--# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
--CONFIG_MTD_NAND_S3C2410_HWECC=y
--# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
--# CONFIG_MTD_NAND_DISKONCHIP is not set
--# CONFIG_MTD_NAND_NANDSIM is not set
--# CONFIG_MTD_NAND_PLATFORM is not set
--# CONFIG_MTD_ALAUDA is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--# CONFIG_PARPORT is not set
--CONFIG_PNP=y
--CONFIG_PNP_DEBUG=y
--
--#
--# Protocols
--#
--# CONFIG_PNPACPI is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=m
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--CONFIG_BLK_DEV_UB=m
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=4096
--CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=m
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--CONFIG_BLK_DEV_SD=m
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--CONFIG_BLK_DEV_SR=m
--# CONFIG_BLK_DEV_SR_VENDOR is not set
--CONFIG_CHR_DEV_SG=m
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--CONFIG_SCSI_SCAN_ASYNC=y
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--# CONFIG_SCSI_SPI_ATTRS is not set
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--CONFIG_TUN=m
--# CONFIG_VETH is not set
--# CONFIG_NET_SB1000 is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_AX88796 is not set
--# CONFIG_SMC91X is not set
--# CONFIG_DM9000 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--CONFIG_NET_PCI=y
--# CONFIG_B44 is not set
--CONFIG_CS89x0=m
--# CONFIG_NETDEV_1000 is not set
--# CONFIG_NETDEV_10000 is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--
--#
--# USB Network Adapters
--#
--CONFIG_USB_CATC=m
--CONFIG_USB_KAWETH=m
--CONFIG_USB_PEGASUS=m
--CONFIG_USB_RTL8150=m
--CONFIG_USB_USBNET=y
--CONFIG_USB_NET_AX8817X=m
--CONFIG_USB_NET_CDCETHER=m
--CONFIG_USB_NET_DM9601=m
--CONFIG_USB_NET_GL620A=m
--CONFIG_USB_NET_NET1080=m
--CONFIG_USB_NET_PLUSB=m
--CONFIG_USB_NET_MCS7830=m
--CONFIG_USB_NET_RNDIS_HOST=m
--CONFIG_USB_NET_CDC_SUBSET=m
--CONFIG_USB_ALI_M5632=y
--CONFIG_USB_AN2720=y
--CONFIG_USB_BELKIN=y
--CONFIG_USB_ARMLINUX=y
--CONFIG_USB_EPSON2888=y
--CONFIG_USB_KC2190=y
--CONFIG_USB_NET_ZAURUS=m
--# CONFIG_WAN is not set
--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=m
--CONFIG_PPP_MPPE=m
--# CONFIG_PPPOE is not set
--# CONFIG_PPPOL2TP is not set
--# CONFIG_SLIP is not set
--CONFIG_SLHC=m
--# CONFIG_SHAPER is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--CONFIG_INPUT_MOUSEDEV=y
--# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
--CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
--CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
--# CONFIG_INPUT_JOYDEV is not set
--CONFIG_INPUT_EVDEV=y
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--CONFIG_INPUT_KEYBOARD=y
--# CONFIG_KEYBOARD_ATKBD is not set
--# 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_KEYBOARD_STOWAWAY=m
--CONFIG_KEYBOARD_GPIO=m
--CONFIG_KEYBOARD_NEO1973=y
--CONFIG_KEYBOARD_QT2410=y
--CONFIG_INPUT_MOUSE=y
--# CONFIG_MOUSE_PS2 is not set
--# CONFIG_MOUSE_SERIAL is not set
--# CONFIG_MOUSE_APPLETOUCH is not set
--# CONFIG_MOUSE_VSXXXAA is not set
--# CONFIG_MOUSE_GPIO is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--CONFIG_INPUT_TOUCHSCREEN=y
--# CONFIG_TOUCHSCREEN_ADS7846 is not set
--# CONFIG_TOUCHSCREEN_FUJITSU is not set
--CONFIG_TOUCHSCREEN_S3C2410=y
--# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
--# CONFIG_TOUCHSCREEN_GUNZE is not set
--# CONFIG_TOUCHSCREEN_ELO is not set
--# CONFIG_TOUCHSCREEN_MTOUCH is not set
--# CONFIG_TOUCHSCREEN_MK712 is not set
--# CONFIG_TOUCHSCREEN_PENMOUNT is not set
--# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
--# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
--# CONFIG_TOUCHSCREEN_UCB1400 is not set
--# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
--CONFIG_INPUT_MISC=y
--# CONFIG_INPUT_ATI_REMOTE is not set
--# CONFIG_INPUT_ATI_REMOTE2 is not set
--# CONFIG_INPUT_KEYSPAN_REMOTE is not set
--# CONFIG_INPUT_POWERMATE is not set
--# CONFIG_INPUT_YEALINK is not set
--CONFIG_INPUT_UINPUT=m
--CONFIG_INPUT_LIS302DL=y
--
--#
--# Hardware I/O ports
--#
--CONFIG_SERIO=y
--# CONFIG_SERIO_SERPORT is not set
--# CONFIG_SERIO_RAW is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--CONFIG_VT=y
--CONFIG_VT_CONSOLE=y
--CONFIG_NR_TTY_DEVICES=4
--CONFIG_HW_CONSOLE=y
--CONFIG_VT_HW_CONSOLE_BINDING=y
--# CONFIG_SERIAL_NONSTANDARD is not set
--
--#
--# Serial drivers
--#
--# CONFIG_SERIAL_8250 is not set
--
--#
--# Non-8250 serial port support
--#
--CONFIG_SERIAL_S3C2410=y
--CONFIG_SERIAL_S3C2410_CONSOLE=y
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--CONFIG_UNIX98_PTYS=y
--# CONFIG_LEGACY_PTYS is not set
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_R3964 is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_GPIO is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--CONFIG_I2C_S3C2410=y
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--# CONFIG_I2C_TINY_USB is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_SENSORS_DS1337 is not set
--# CONFIG_SENSORS_DS1374 is not set
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--CONFIG_SENSORS_PCF50606=y
--CONFIG_SENSORS_PCF50633=y
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_SENSORS_PCA9539 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--CONFIG_SENSORS_TSL256X=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
--
--#
--# SPI support
--#
--CONFIG_SPI=y
--# CONFIG_SPI_DEBUG is not set
--CONFIG_SPI_MASTER=y
--
--#
--# SPI Master Controller Drivers
--#
--CONFIG_SPI_BITBANG=y
--CONFIG_SPI_S3C24XX=y
--CONFIG_SPI_S3C24XX_GPIO=y
--
--#
--# SPI Protocol Masters
--#
--# CONFIG_SPI_AT25 is not set
--# CONFIG_SPI_SPIDEV is not set
--# CONFIG_SPI_TLE62X0 is not set
--# CONFIG_W1 is not set
--CONFIG_POWER_SUPPLY=y
--# CONFIG_POWER_SUPPLY_DEBUG is not set
--# CONFIG_PDA_POWER is not set
--# CONFIG_APM_POWER is not set
--# CONFIG_BATTERY_DS2760 is not set
--CONFIG_BATTERY_BQ27000_HDQ=y
--CONFIG_GTA02_HDQ=y
--# CONFIG_HWMON is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_S3C2410_WATCHDOG=m
--
--#
--# USB-based Watchdog Cards
--#
--# CONFIG_USBPCWATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--CONFIG_MFD_GLAMO=y
--CONFIG_MFD_GLAMO_FB=y
--CONFIG_MFD_GLAMO_SPI_GPIO=y
--CONFIG_MFD_GLAMO_SPI_FB=y
--CONFIG_MFD_GLAMO_MCI=y
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--# CONFIG_USB_DABUSB is not set
--
--#
--# Graphics support
--#
--# CONFIG_VGASTATE is not set
--# CONFIG_VIDEO_OUTPUT_CONTROL is not set
--CONFIG_FB=y
--# CONFIG_FIRMWARE_EDID is not set
--# CONFIG_FB_DDC is not set
--CONFIG_FB_CFB_FILLRECT=y
--CONFIG_FB_CFB_COPYAREA=y
--CONFIG_FB_CFB_IMAGEBLIT=y
--# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
--# CONFIG_FB_SYS_FILLRECT is not set
--# CONFIG_FB_SYS_COPYAREA is not set
--# CONFIG_FB_SYS_IMAGEBLIT is not set
--# CONFIG_FB_SYS_FOPS is not set
--CONFIG_FB_DEFERRED_IO=y
--# CONFIG_FB_SVGALIB is not set
--# CONFIG_FB_MACMODES is not set
--# CONFIG_FB_BACKLIGHT is not set
--# CONFIG_FB_MODE_HELPERS is not set
--# CONFIG_FB_TILEBLITTING is not set
--
--#
--# Frame buffer hardware drivers
--#
--# CONFIG_FB_UVESA is not set
--# CONFIG_FB_S1D13XXX is not set
--CONFIG_FB_S3C2410=y
--# CONFIG_FB_S3C2410_DEBUG is not set
--# CONFIG_FB_VIRTUAL is not set
--CONFIG_BACKLIGHT_LCD_SUPPORT=y
--CONFIG_LCD_CLASS_DEVICE=y
--# CONFIG_LCD_LTV350QV is not set
--CONFIG_BACKLIGHT_CLASS_DEVICE=y
--# CONFIG_BACKLIGHT_CORGI is not set
--CONFIG_BACKLIGHT_GTA01=y
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--CONFIG_DISPLAY_JBT6K74=y
--
--#
--# Console display driver support
--#
--# CONFIG_VGA_CONSOLE is not set
--CONFIG_DUMMY_CONSOLE=y
--CONFIG_FRAMEBUFFER_CONSOLE=y
--# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
--# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
--CONFIG_FONTS=y
--# CONFIG_FONT_8x8 is not set
--# CONFIG_FONT_8x16 is not set
--CONFIG_FONT_6x11=y
--# CONFIG_FONT_7x14 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
--# CONFIG_FONT_10x18 is not set
--# CONFIG_LOGO is not set
--
--#
--# Sound
--#
--CONFIG_SOUND=y
--
--#
--# Advanced Linux Sound Architecture
--#
--CONFIG_SND=m
--CONFIG_SND_TIMER=m
--CONFIG_SND_PCM=m
--# CONFIG_SND_SEQUENCER is not set
--CONFIG_SND_OSSEMUL=y
--CONFIG_SND_MIXER_OSS=m
--CONFIG_SND_PCM_OSS=m
--CONFIG_SND_PCM_OSS_PLUGINS=y
--# CONFIG_SND_DYNAMIC_MINORS is not set
--CONFIG_SND_SUPPORT_OLD_API=y
--CONFIG_SND_VERBOSE_PROCFS=y
--# 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
--
--#
--# ALSA ARM devices
--#
--
--#
--# SPI devices
--#
--
--#
--# USB devices
--#
--# CONFIG_SND_USB_AUDIO is not set
--# CONFIG_SND_USB_CAIAQ is not set
--
--#
--# System on Chip audio support
--#
--CONFIG_SND_SOC=m
--CONFIG_SND_S3C24XX_SOC=m
--CONFIG_SND_S3C24XX_SOC_I2S=m
--CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
--CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
--
--#
--# SoC Audio support for SuperH
--#
--CONFIG_SND_SOC_WM8753=m
--
--#
--# Open Sound System
--#
--# CONFIG_SOUND_PRIME is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--
--#
--# USB Input Devices
--#
--CONFIG_USB_HID=m
--# CONFIG_USB_HIDINPUT_POWERBOOK is not set
--# CONFIG_HID_FF is not set
--# CONFIG_USB_HIDDEV is not set
--
--#
--# USB HID Boot Protocol drivers
--#
--# CONFIG_USB_KBD is not set
--# CONFIG_USB_MOUSE is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--# CONFIG_USB_ARCH_HAS_EHCI is not set
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--
--#
--# Miscellaneous USB options
--#
--CONFIG_USB_DEVICEFS=y
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--CONFIG_USB_SUSPEND=y
--# CONFIG_USB_PERSIST is not set
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--# CONFIG_USB_ISP116X_HCD is not set
--CONFIG_USB_OHCI_HCD=m
--# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
--# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
--CONFIG_USB_OHCI_LITTLE_ENDIAN=y
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# USB Device Class drivers
--#
--CONFIG_USB_ACM=m
--CONFIG_USB_PRINTER=m
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# may also be needed; see USB_STORAGE Help for more information
--#
--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 is not set
--CONFIG_USB_STORAGE_DPCM=y
--CONFIG_USB_STORAGE_USBAT=y
--CONFIG_USB_STORAGE_SDDR09=y
--CONFIG_USB_STORAGE_SDDR55=y
--CONFIG_USB_STORAGE_JUMPSHOT=y
--CONFIG_USB_STORAGE_ALAUDA=y
--CONFIG_USB_STORAGE_KARMA=y
--CONFIG_USB_LIBUSUAL=y
--
--#
--# USB Imaging devices
--#
--# CONFIG_USB_MDC800 is not set
--# CONFIG_USB_MICROTEK is not set
--CONFIG_USB_MON=y
--
--#
--# USB port drivers
--#
--
--#
--# USB Serial Converter support
--#
--CONFIG_USB_SERIAL=m
--CONFIG_USB_SERIAL_GENERIC=y
--CONFIG_USB_SERIAL_AIRCABLE=m
--CONFIG_USB_SERIAL_AIRPRIME=m
--CONFIG_USB_SERIAL_ARK3116=m
--CONFIG_USB_SERIAL_BELKIN=m
--# CONFIG_USB_SERIAL_CH341 is not set
--CONFIG_USB_SERIAL_WHITEHEAT=m
--CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
--CONFIG_USB_SERIAL_CP2101=m
--CONFIG_USB_SERIAL_CYPRESS_M8=m
--CONFIG_USB_SERIAL_EMPEG=m
--CONFIG_USB_SERIAL_FTDI_SIO=m
--CONFIG_USB_SERIAL_FUNSOFT=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_GARMIN=m
--CONFIG_USB_SERIAL_IPW=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_MOS7720=m
--CONFIG_USB_SERIAL_MOS7840=m
--CONFIG_USB_SERIAL_NAVMAN=m
--CONFIG_USB_SERIAL_PL2303=m
--# CONFIG_USB_SERIAL_OTI6858 is not set
--CONFIG_USB_SERIAL_HP4X=m
--CONFIG_USB_SERIAL_SAFE=m
--CONFIG_USB_SERIAL_SAFE_PADDED=y
--CONFIG_USB_SERIAL_SIERRAWIRELESS=m
--CONFIG_USB_SERIAL_TI=m
--CONFIG_USB_SERIAL_CYBERJACK=m
--CONFIG_USB_SERIAL_XIRCOM=m
--CONFIG_USB_SERIAL_OPTION=m
--CONFIG_USB_SERIAL_OMNINET=m
--# CONFIG_USB_SERIAL_DEBUG is not set
--CONFIG_USB_EZUSB=y
--
--#
--# USB Miscellaneous drivers
--#
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
--# CONFIG_USB_ADUTUX is not set
--# CONFIG_USB_AUERSWALD is not set
--# CONFIG_USB_RIO500 is not set
--# CONFIG_USB_LEGOTOWER is not set
--# CONFIG_USB_LCD is not set
--CONFIG_USB_BERRY_CHARGE=m
--# CONFIG_USB_LED is not set
--# CONFIG_USB_CYPRESS_CY7C63 is not set
--# CONFIG_USB_CYTHERM is not set
--# CONFIG_USB_PHIDGET is not set
--# CONFIG_USB_IDMOUSE is not set
--# CONFIG_USB_FTDI_ELAN is not set
--# CONFIG_USB_APPLEDISPLAY is not set
--# CONFIG_USB_LD is not set
--CONFIG_USB_TRANCEVIBRATOR=m
--CONFIG_USB_IOWARRIOR=m
--# CONFIG_USB_TEST is not set
--
--#
--# USB DSL modem support
--#
--
--#
--# USB Gadget Support
--#
--CONFIG_USB_GADGET=y
--# CONFIG_USB_GADGET_DEBUG is not set
--# CONFIG_USB_GADGET_DEBUG_FILES is not set
--CONFIG_USB_GADGET_SELECTED=y
--# CONFIG_USB_GADGET_AMD5536UDC is not set
--# CONFIG_USB_GADGET_ATMEL_USBA is not set
--# CONFIG_USB_GADGET_FSL_USB2 is not set
--# CONFIG_USB_GADGET_NET2280 is not set
--# CONFIG_USB_GADGET_PXA2XX is not set
--# CONFIG_USB_GADGET_M66592 is not set
--# CONFIG_USB_GADGET_GOKU is not set
--# CONFIG_USB_GADGET_LH7A40X is not set
--# CONFIG_USB_GADGET_OMAP is not set
--CONFIG_USB_GADGET_S3C2410=y
--CONFIG_USB_S3C2410=y
--# CONFIG_USB_S3C2410_DEBUG is not set
--# CONFIG_USB_GADGET_AT91 is not set
--# CONFIG_USB_GADGET_DUMMY_HCD is not set
--# CONFIG_USB_GADGET_DUALSPEED is not set
--# CONFIG_USB_ZERO is not set
--CONFIG_USB_ETH=m
--CONFIG_USB_ETH_RNDIS=m
--CONFIG_USB_GADGETFS=m
--CONFIG_USB_FILE_STORAGE=m
--CONFIG_USB_G_SERIAL=m
--CONFIG_USB_MIDI_GADGET=m
--
--#
--# SDIO support
--#
--CONFIG_SDIO=y
--CONFIG_SDIO_S3C24XX=y
--CONFIG_SDIO_S3C24XX_DMA=y
--CONFIG_SDIO_AR6000_WLAN=y
--CONFIG_MMC=y
--# CONFIG_MMC_DEBUG is not set
--CONFIG_MMC_UNSAFE_RESUME=y
--
--#
--# MMC/SD Card Drivers
--#
--CONFIG_MMC_BLOCK=y
--CONFIG_MMC_BLOCK_BOUNCE=y
--# CONFIG_SDIO_UART is not set
--
--#
--# MMC/SD Host Controller Drivers
--#
--# CONFIG_MMC_SPI is not set
--CONFIG_MMC_S3C=y
--CONFIG_NEW_LEDS=y
--CONFIG_LEDS_CLASS=y
--
--#
--# LED drivers
--#
--CONFIG_LEDS_S3C24XX=m
--# CONFIG_LEDS_GPIO is not set
--CONFIG_LEDS_NEO1973_VIBRATOR=y
--CONFIG_LEDS_NEO1973_GTA02=y
--
--#
--# LED Triggers
--#
--CONFIG_LEDS_TRIGGERS=y
--CONFIG_LEDS_TRIGGER_TIMER=y
--# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--CONFIG_RTC_DEBUG=y
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--# CONFIG_RTC_DRV_DS1307 is not set
--# CONFIG_RTC_DRV_DS1374 is not set
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--
--#
--# SPI RTC drivers
--#
--# CONFIG_RTC_DRV_RS5C348 is not set
--# CONFIG_RTC_DRV_MAX6902 is not set
--
--#
--# Platform RTC drivers
--#
--# CONFIG_RTC_DRV_CMOS is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--CONFIG_RTC_DRV_S3C=m
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--# CONFIG_EXT3_FS_XATTR is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--CONFIG_FS_POSIX_ACL=y
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--# CONFIG_MINIX_FS is not set
--CONFIG_ROMFS_FS=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--CONFIG_DNOTIFY=y
--# CONFIG_AUTOFS_FS is not set
--CONFIG_AUTOFS4_FS=m
--CONFIG_FUSE_FS=m
--
--#
--# CD-ROM/DVD Filesystems
--#
--CONFIG_ISO9660_FS=m
--CONFIG_JOLIET=y
--# CONFIG_ZISOFS is not set
--CONFIG_UDF_FS=m
--
--#
--# DOS/FAT/NT Filesystems
--#
--CONFIG_FAT_FS=y
--CONFIG_MSDOS_FS=y
--CONFIG_VFAT_FS=y
--CONFIG_FAT_DEFAULT_CODEPAGE=437
--CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--CONFIG_CONFIGFS_FS=m
--
--#
--# 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_YAFFS_FS=y
--CONFIG_YAFFS_YAFFS1=y
--CONFIG_YAFFS_9BYTE_TAGS=y
--CONFIG_YAFFS_YAFFS2=y
--CONFIG_YAFFS_AUTO_YAFFS2=y
--# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
--CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
--# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
--# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
--CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
--CONFIG_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--CONFIG_JFFS2_SUMMARY=y
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--CONFIG_CRAMFS=y
--# 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
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--CONFIG_NFS_V4=y
--# CONFIG_NFS_DIRECTIO is not set
--CONFIG_NFSD=m
--CONFIG_NFSD_V3=y
--# CONFIG_NFSD_V3_ACL is not set
--CONFIG_NFSD_V4=y
--CONFIG_NFSD_TCP=y
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_EXPORTFS=m
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--CONFIG_CIFS=m
--# CONFIG_CIFS_STATS is not set
--CONFIG_CIFS_WEAK_PW_HASH=y
--# CONFIG_CIFS_XATTR is not set
--# CONFIG_CIFS_DEBUG2 is not set
--# CONFIG_CIFS_EXPERIMENTAL 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
--CONFIG_NLS=y
--CONFIG_NLS_DEFAULT="iso8859-1"
--CONFIG_NLS_CODEPAGE_437=y
--# CONFIG_NLS_CODEPAGE_737 is not set
--# CONFIG_NLS_CODEPAGE_775 is not set
--CONFIG_NLS_CODEPAGE_850=m
--# 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=m
--CONFIG_NLS_CODEPAGE_950=m
--# 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=y
--# 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=m
--# CONFIG_DLM is not set
--CONFIG_INSTRUMENTATION=y
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--# CONFIG_SCHED_DEBUG is not set
--# CONFIG_SCHEDSTATS is not set
--CONFIG_TIMER_STATS=y
--# CONFIG_DEBUG_SLAB is not set
--CONFIG_DEBUG_PREEMPT=y
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_LOCK_ALLOC is not set
--# CONFIG_PROVE_LOCKING is not set
--# CONFIG_LOCK_STAT is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--CONFIG_DEBUG_BUGVERBOSE=y
--CONFIG_DEBUG_INFO=y
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--CONFIG_FRAME_POINTER=y
--CONFIG_FORCED_INLINING=y
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_USER is not set
--CONFIG_DEBUG_ERRORS=y
--CONFIG_DEBUG_LL=y
--# CONFIG_DEBUG_ICEDCC is not set
--CONFIG_DEBUG_S3C_PORT=y
--CONFIG_DEBUG_S3C_UART=0
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--CONFIG_CRYPTO_HASH=y
--CONFIG_CRYPTO_MANAGER=y
--CONFIG_CRYPTO_HMAC=y
--CONFIG_CRYPTO_XCBC=m
--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_WP512=m
--CONFIG_CRYPTO_TGR192=m
--CONFIG_CRYPTO_GF128MUL=m
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--CONFIG_CRYPTO_LRW=m
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--CONFIG_CRYPTO_FCRYPT=m
--CONFIG_CRYPTO_BLOWFISH=m
--CONFIG_CRYPTO_TWOFISH=m
--CONFIG_CRYPTO_TWOFISH_COMMON=m
--CONFIG_CRYPTO_SERPENT=m
--CONFIG_CRYPTO_AES=m
--CONFIG_CRYPTO_CAST5=m
--CONFIG_CRYPTO_CAST6=m
--CONFIG_CRYPTO_TEA=m
--CONFIG_CRYPTO_ARC4=m
--CONFIG_CRYPTO_KHAZAD=m
--CONFIG_CRYPTO_ANUBIS=m
--# CONFIG_CRYPTO_SEED is not set
--CONFIG_CRYPTO_DEFLATE=m
--CONFIG_CRYPTO_MICHAEL_MIC=m
--CONFIG_CRYPTO_CRC32C=m
--CONFIG_CRYPTO_CAMELLIA=m
--CONFIG_CRYPTO_TEST=m
--# CONFIG_CRYPTO_AUTHENC is not set
--CONFIG_CRYPTO_HW=y
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--CONFIG_CRC_CCITT=m
--CONFIG_CRC16=m
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--CONFIG_LIBCRC32C=m
--CONFIG_ZLIB_INFLATE=y
--CONFIG_ZLIB_DEFLATE=y
--CONFIG_TEXTSEARCH=y
--CONFIG_TEXTSEARCH_KMP=m
--CONFIG_TEXTSEARCH_BM=m
--CONFIG_TEXTSEARCH_FSM=m
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_DMA=y
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1302-fix-defconfig-path.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1302-fix-defconfig-path.patch.patch
deleted file mode 100644 (file)
index 19b6af7..0000000
+++ /dev/null
@@ -1,5468 +0,0 @@
-From 73a16ab06c18ae6da52178c8997f097363ca0a17 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 12 Oct 2008 13:01:44 +0100
-Subject: [PATCH] fix-defconfig-path.patch
-
-Managed to miss off .../configs/ from new path, this corrects it and deletes
-the maxmodules config (use the defconfig-gtaxx ones)
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/configs/gta02-moredrivers-defconfig | 1830 ++++++++++++++++++++++++++
- arch/arm/gta02-maxmodules-defconfig          | 1769 -------------------------
- arch/arm/gta02-moredrivers-defconfig         | 1830 --------------------------
- 3 files changed, 1830 insertions(+), 3599 deletions(-)
- create mode 100644 arch/arm/configs/gta02-moredrivers-defconfig
- delete mode 100644 arch/arm/gta02-maxmodules-defconfig
- delete mode 100644 arch/arm/gta02-moredrivers-defconfig
-
-diff --git a/arch/arm/configs/gta02-moredrivers-defconfig b/arch/arm/configs/gta02-moredrivers-defconfig
-new file mode 100644
-index 0000000..7273973
---- /dev/null
-+++ b/arch/arm/configs/gta02-moredrivers-defconfig
-@@ -0,0 +1,1830 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.24
-+# Sat Mar  1 11:36:29 2008
-+#
-+CONFIG_ARM=y
-+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-+CONFIG_GENERIC_GPIO=y
-+# CONFIG_GENERIC_TIME is not set
-+# CONFIG_GENERIC_CLOCKEVENTS is not set
-+CONFIG_MMU=y
-+CONFIG_NO_IOPORT=y
-+CONFIG_GENERIC_HARDIRQS=y
-+CONFIG_STACKTRACE_SUPPORT=y
-+CONFIG_LOCKDEP_SUPPORT=y
-+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-+CONFIG_HARDIRQS_SW_RESEND=y
-+CONFIG_GENERIC_IRQ_PROBE=y
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_ZONE_DMA=y
-+CONFIG_FIQ=y
-+CONFIG_VECTORS_BASE=0xffff0000
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_LOCK_KERNEL=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION="-mokodev"
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=16
-+# CONFIG_CGROUPS is not set
-+CONFIG_FAIR_GROUP_SCHED=y
-+CONFIG_FAIR_USER_SCHED=y
-+# CONFIG_FAIR_CGROUP_SCHED is not set
-+# CONFIG_SYSFS_DEPRECATED is not set
-+# CONFIG_RELAY is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+CONFIG_SYSCTL=y
-+# CONFIG_EMBEDDED is not set
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=m
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=m
-+# CONFIG_DEFAULT_AS is not set
-+CONFIG_DEFAULT_DEADLINE=y
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="deadline"
-+
-+#
-+# System Type
-+#
-+# CONFIG_ARCH_AAEC2000 is not set
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_REALVIEW is not set
-+# CONFIG_ARCH_VERSATILE is not set
-+# CONFIG_ARCH_AT91 is not set
-+# CONFIG_ARCH_CLPS7500 is not set
-+# CONFIG_ARCH_CLPS711X is not set
-+# CONFIG_ARCH_CO285 is not set
-+# CONFIG_ARCH_EBSA110 is not set
-+# CONFIG_ARCH_EP93XX is not set
-+# CONFIG_ARCH_FOOTBRIDGE is not set
-+# CONFIG_ARCH_NETX is not set
-+# CONFIG_ARCH_H720X is not set
-+# CONFIG_ARCH_IMX is not set
-+# CONFIG_ARCH_IOP13XX is not set
-+# CONFIG_ARCH_IOP32X is not set
-+# CONFIG_ARCH_IOP33X is not set
-+# CONFIG_ARCH_IXP23XX is not set
-+# CONFIG_ARCH_IXP2000 is not set
-+# CONFIG_ARCH_IXP4XX is not set
-+# CONFIG_ARCH_L7200 is not set
-+# CONFIG_ARCH_KS8695 is not set
-+# CONFIG_ARCH_NS9XXX is not set
-+# CONFIG_ARCH_MXC is not set
-+# CONFIG_ARCH_PNX4008 is not set
-+# CONFIG_ARCH_PXA is not set
-+# CONFIG_ARCH_RPC is not set
-+# CONFIG_ARCH_SA1100 is not set
-+CONFIG_ARCH_S3C2410=y
-+# CONFIG_ARCH_SHARK is not set
-+# CONFIG_ARCH_LH7A40X is not set
-+# CONFIG_ARCH_DAVINCI is not set
-+# CONFIG_ARCH_OMAP is not set
-+CONFIG_PLAT_S3C24XX=y
-+CONFIG_CPU_S3C244X=y
-+CONFIG_S3C2410_DMA=y
-+# CONFIG_S3C2410_DMA_DEBUG is not set
-+CONFIG_MACH_SMDK=y
-+CONFIG_MACH_NEO1973=y
-+CONFIG_PLAT_S3C=y
-+CONFIG_CPU_LLSERIAL_S3C2410=y
-+CONFIG_CPU_LLSERIAL_S3C2440=y
-+
-+#
-+# Boot options
-+#
-+# CONFIG_S3C_BOOT_WATCHDOG is not set
-+# CONFIG_S3C_BOOT_ERROR_RESET is not set
-+
-+#
-+# Power management
-+#
-+# CONFIG_S3C2410_PM_DEBUG is not set
-+# CONFIG_S3C2410_PM_CHECK is not set
-+CONFIG_S3C_LOWLEVEL_UART_PORT=2
-+
-+#
-+# S3C2400 Machines
-+#
-+CONFIG_CPU_S3C2410=y
-+CONFIG_CPU_S3C2410_DMA=y
-+CONFIG_S3C2410_PM=y
-+CONFIG_S3C2410_GPIO=y
-+CONFIG_S3C2410_CLOCK=y
-+CONFIG_S3C2410_PWM=y
-+
-+#
-+# S3C2410 Machines
-+#
-+# CONFIG_ARCH_SMDK2410 is not set
-+# CONFIG_ARCH_H1940 is not set
-+# CONFIG_MACH_N30 is not set
-+# CONFIG_ARCH_BAST is not set
-+# CONFIG_MACH_OTOM is not set
-+# CONFIG_MACH_AML_M5900 is not set
-+# CONFIG_MACH_VR1000 is not set
-+CONFIG_MACH_QT2410=y
-+CONFIG_MACH_NEO1973_GTA01=y
-+
-+#
-+# S3C2412 Machines
-+#
-+# CONFIG_MACH_SMDK2413 is not set
-+# CONFIG_MACH_SMDK2412 is not set
-+# CONFIG_MACH_VSTMS is not set
-+CONFIG_CPU_S3C2440=y
-+CONFIG_S3C2440_DMA=y
-+CONFIG_S3C2440_C_FIQ=y
-+
-+#
-+# S3C2440 Machines
-+#
-+# CONFIG_MACH_ANUBIS is not set
-+# CONFIG_MACH_OSIRIS is not set
-+# CONFIG_MACH_RX3715 is not set
-+CONFIG_ARCH_S3C2440=y
-+# CONFIG_MACH_NEXCODER_2440 is not set
-+CONFIG_SMDK2440_CPU2440=y
-+CONFIG_MACH_HXD8=y
-+CONFIG_MACH_NEO1973_GTA02=y
-+# CONFIG_NEO1973_GTA02_2440 is not set
-+CONFIG_CPU_S3C2442=y
-+
-+#
-+# S3C2442 Machines
-+#
-+CONFIG_SMDK2440_CPU2442=y
-+
-+#
-+# S3C2443 Machines
-+#
-+# CONFIG_MACH_SMDK2443 is not set
-+
-+#
-+# Processor Type
-+#
-+CONFIG_CPU_32=y
-+CONFIG_CPU_ARM920T=y
-+CONFIG_CPU_32v4T=y
-+CONFIG_CPU_ABRT_EV4T=y
-+CONFIG_CPU_CACHE_V4WT=y
-+CONFIG_CPU_CACHE_VIVT=y
-+CONFIG_CPU_COPY_V4WB=y
-+CONFIG_CPU_TLB_V4WBI=y
-+CONFIG_CPU_CP15=y
-+CONFIG_CPU_CP15_MMU=y
-+
-+#
-+# Processor Features
-+#
-+CONFIG_ARM_THUMB=y
-+# CONFIG_CPU_ICACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-+# CONFIG_OUTER_CACHE is not set
-+
-+#
-+# Bus support
-+#
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Kernel Features
-+#
-+# CONFIG_TICK_ONESHOT is not set
-+CONFIG_PREEMPT=y
-+CONFIG_NO_IDLE_HZ=y
-+CONFIG_HZ=200
-+CONFIG_AEABI=y
-+CONFIG_OABI_COMPAT=y
-+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4096
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_ALIGNMENT_TRAP=y
-+
-+#
-+# Boot options
-+#
-+CONFIG_ZBOOT_ROM_TEXT=0x0
-+CONFIG_ZBOOT_ROM_BSS=0x0
-+CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
-+# CONFIG_XIP_KERNEL is not set
-+CONFIG_KEXEC=y
-+CONFIG_ATAGS_PROC=y
-+
-+#
-+# Floating point emulation
-+#
-+
-+#
-+# At least one emulation must be selected
-+#
-+CONFIG_FPE_NWFPE=y
-+# CONFIG_FPE_NWFPE_XP is not set
-+# CONFIG_FPE_FASTFPE is not set
-+
-+#
-+# Userspace binary formats
-+#
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+
-+#
-+# Power management options
-+#
-+CONFIG_PM=y
-+CONFIG_PM_LEGACY=y
-+CONFIG_PM_DEBUG=y
-+CONFIG_PM_VERBOSE=y
-+CONFIG_PM_SLEEP=y
-+CONFIG_SUSPEND_UP_POSSIBLE=y
-+CONFIG_SUSPEND=y
-+CONFIG_APM_EMULATION=y
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+CONFIG_PACKET_MMAP=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+CONFIG_XFRM_MIGRATE=y
-+CONFIG_NET_KEY=m
-+CONFIG_NET_KEY_MIGRATE=y
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+# CONFIG_IP_ROUTE_MULTIPATH is not set
-+# CONFIG_IP_ROUTE_VERBOSE 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=m
-+CONFIG_NET_IPGRE=m
-+# CONFIG_NET_IPGRE_BROADCAST is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_XFRM_TUNNEL=m
-+CONFIG_INET_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET_XFRM_MODE_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_BEET=m
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+CONFIG_TCP_MD5SIG=y
-+# CONFIG_IP_VS is not set
-+CONFIG_IPV6=m
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_IPCOMP=m
-+# CONFIG_IPV6_MIP6 is not set
-+CONFIG_INET6_XFRM_TUNNEL=m
-+CONFIG_INET6_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET6_XFRM_MODE_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_BEET=m
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_TUNNEL=m
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+CONFIG_NETFILTER=y
-+# CONFIG_NETFILTER_DEBUG is not set
-+CONFIG_BRIDGE_NETFILTER=y
-+
-+#
-+# Core Netfilter Configuration
-+#
-+CONFIG_NETFILTER_NETLINK=m
-+CONFIG_NETFILTER_NETLINK_QUEUE=m
-+CONFIG_NETFILTER_NETLINK_LOG=m
-+CONFIG_NF_CONNTRACK_ENABLED=m
-+CONFIG_NF_CONNTRACK=m
-+CONFIG_NF_CT_ACCT=y
-+CONFIG_NF_CONNTRACK_MARK=y
-+CONFIG_NF_CONNTRACK_EVENTS=y
-+CONFIG_NF_CT_PROTO_GRE=m
-+CONFIG_NF_CT_PROTO_SCTP=m
-+# CONFIG_NF_CT_PROTO_UDPLITE is not set
-+# CONFIG_NF_CONNTRACK_AMANDA is not set
-+CONFIG_NF_CONNTRACK_FTP=m
-+CONFIG_NF_CONNTRACK_H323=m
-+CONFIG_NF_CONNTRACK_IRC=m
-+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-+CONFIG_NF_CONNTRACK_PPTP=m
-+CONFIG_NF_CONNTRACK_SANE=m
-+CONFIG_NF_CONNTRACK_SIP=m
-+CONFIG_NF_CONNTRACK_TFTP=m
-+CONFIG_NF_CT_NETLINK=m
-+CONFIG_NETFILTER_XTABLES=m
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-+CONFIG_NETFILTER_XT_TARGET_DSCP=m
-+CONFIG_NETFILTER_XT_TARGET_MARK=m
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+CONFIG_NETFILTER_XT_MATCH_DCCP=m
-+CONFIG_NETFILTER_XT_MATCH_DSCP=m
-+CONFIG_NETFILTER_XT_MATCH_ESP=m
-+CONFIG_NETFILTER_XT_MATCH_HELPER=m
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_MAC=m
-+CONFIG_NETFILTER_XT_MATCH_MARK=m
-+CONFIG_NETFILTER_XT_MATCH_POLICY=m
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-+CONFIG_NETFILTER_XT_MATCH_REALM=m
-+CONFIG_NETFILTER_XT_MATCH_SCTP=m
-+CONFIG_NETFILTER_XT_MATCH_STATE=m
-+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-+CONFIG_NETFILTER_XT_MATCH_STRING=m
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-+
-+#
-+# IP: Netfilter Configuration
-+#
-+CONFIG_NF_CONNTRACK_IPV4=m
-+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-+# CONFIG_IP_NF_QUEUE is not set
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_MATCH_IPRANGE=m
-+CONFIG_IP_NF_MATCH_TOS=m
-+# CONFIG_IP_NF_MATCH_RECENT is not set
-+CONFIG_IP_NF_MATCH_ECN=m
-+CONFIG_IP_NF_MATCH_AH=m
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_MATCH_OWNER=m
-+CONFIG_IP_NF_MATCH_ADDRTYPE=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_TARGET_LOG=m
-+CONFIG_IP_NF_TARGET_ULOG=m
-+CONFIG_NF_NAT=m
-+CONFIG_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_NF_NAT_SNMP_BASIC=m
-+CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_FTP=m
-+CONFIG_NF_NAT_IRC=m
-+CONFIG_NF_NAT_TFTP=m
-+# CONFIG_NF_NAT_AMANDA is not set
-+CONFIG_NF_NAT_PPTP=m
-+CONFIG_NF_NAT_H323=m
-+CONFIG_NF_NAT_SIP=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_IP_NF_TARGET_TOS=m
-+CONFIG_IP_NF_TARGET_ECN=m
-+CONFIG_IP_NF_TARGET_TTL=m
-+CONFIG_IP_NF_TARGET_CLUSTERIP=m
-+# CONFIG_IP_NF_RAW is not set
-+# CONFIG_IP_NF_ARPTABLES is not set
-+
-+#
-+# IPv6: Netfilter Configuration (EXPERIMENTAL)
-+#
-+CONFIG_NF_CONNTRACK_IPV6=m
-+# CONFIG_IP6_NF_QUEUE is not set
-+CONFIG_IP6_NF_IPTABLES=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_OWNER=m
-+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-+CONFIG_IP6_NF_MATCH_AH=m
-+CONFIG_IP6_NF_MATCH_MH=m
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_LOG=m
-+CONFIG_IP6_NF_TARGET_REJECT=m
-+CONFIG_IP6_NF_MANGLE=m
-+CONFIG_IP6_NF_TARGET_HL=m
-+# CONFIG_IP6_NF_RAW is not set
-+
-+#
-+# 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_BRIDGE_EBT_ULOG=m
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+CONFIG_BRIDGE=y
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+CONFIG_LLC=y
-+# 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+CONFIG_NET_SCHED=y
-+
-+#
-+# Queueing/Scheduling
-+#
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=m
-+CONFIG_NET_SCH_PRIO=m
-+# CONFIG_NET_SCH_RR is not set
-+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_NETEM=m
-+CONFIG_NET_SCH_INGRESS=m
-+
-+#
-+# Classification
-+#
-+CONFIG_NET_CLS=y
-+CONFIG_NET_CLS_BASIC=m
-+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_CLS_U32_PERF=y
-+CONFIG_CLS_U32_MARK=y
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
-+# CONFIG_NET_EMATCH is not set
-+# CONFIG_NET_CLS_ACT is not set
-+# CONFIG_NET_CLS_POLICE is not set
-+# CONFIG_NET_CLS_IND is not set
-+CONFIG_NET_SCH_FIFO=y
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_IRDA is not set
-+CONFIG_BT=y
-+CONFIG_BT_L2CAP=y
-+CONFIG_BT_SCO=y
-+CONFIG_BT_RFCOMM=y
-+CONFIG_BT_RFCOMM_TTY=y
-+CONFIG_BT_BNEP=y
-+CONFIG_BT_BNEP_MC_FILTER=y
-+CONFIG_BT_BNEP_PROTO_FILTER=y
-+CONFIG_BT_HIDP=y
-+
-+#
-+# Bluetooth device drivers
-+#
-+CONFIG_BT_HCIUSB=y
-+CONFIG_BT_HCIUSB_SCO=y
-+# CONFIG_BT_HCIBTSDIO is not set
-+# CONFIG_BT_HCIUART is not set
-+# CONFIG_BT_HCIBCM203X is not set
-+# CONFIG_BT_HCIBPA10X is not set
-+# CONFIG_BT_HCIBFUSB is not set
-+# CONFIG_BT_HCIVHCI is not set
-+# CONFIG_AF_RXRPC is not set
-+CONFIG_FIB_RULES=y
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+CONFIG_WIRELESS_EXT=y
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=m
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=m
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+CONFIG_MTD_CONCAT=y
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_AFS_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+CONFIG_MTD_CFI_INTELEXT=y
-+# CONFIG_MTD_CFI_AMDSTD is not set
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+CONFIG_MTD_ROM=y
-+CONFIG_MTD_ABSENT=y
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+CONFIG_MTD_PHYSMAP=y
-+CONFIG_MTD_PHYSMAP_START=0x0
-+CONFIG_MTD_PHYSMAP_LEN=0
-+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-+# CONFIG_MTD_ARM_INTEGRATOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+CONFIG_MTD_NAND=y
-+CONFIG_MTD_NAND_VERIFY_WRITE=y
-+# CONFIG_MTD_NAND_ECC_SMC is not set
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+CONFIG_MTD_NAND_IDS=y
-+CONFIG_MTD_NAND_S3C2410=y
-+# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
-+CONFIG_MTD_NAND_S3C2410_HWECC=y
-+# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ALAUDA is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+# CONFIG_PARPORT is not set
-+CONFIG_PNP=y
-+CONFIG_PNP_DEBUG=y
-+
-+#
-+# Protocols
-+#
-+# CONFIG_PNPACPI is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=m
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_UB=m
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=4096
-+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=m
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=m
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+CONFIG_BLK_DEV_SR=m
-+# CONFIG_BLK_DEV_SR_VENDOR is not set
-+CONFIG_CHR_DEV_SG=m
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+CONFIG_SCSI_SCAN_ASYNC=y
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_ATA is not set
-+CONFIG_MD=y
-+# CONFIG_BLK_DEV_MD is not set
-+CONFIG_BLK_DEV_DM=m
-+# CONFIG_DM_DEBUG is not set
-+CONFIG_DM_CRYPT=m
-+CONFIG_DM_SNAPSHOT=m
-+# CONFIG_DM_MIRROR is not set
-+# CONFIG_DM_ZERO is not set
-+# CONFIG_DM_MULTIPATH is not set
-+# CONFIG_DM_DELAY is not set
-+# CONFIG_DM_UEVENT is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+CONFIG_TUN=m
-+# CONFIG_VETH is not set
-+# CONFIG_NET_SB1000 is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_AX88796 is not set
-+# CONFIG_SMC91X is not set
-+# CONFIG_DM9000 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_B44 is not set
-+CONFIG_CS89x0=m
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+CONFIG_USB_CATC=m
-+CONFIG_USB_KAWETH=m
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+CONFIG_USB_USBNET=y
-+CONFIG_USB_NET_AX8817X=m
-+CONFIG_USB_NET_CDCETHER=m
-+CONFIG_USB_NET_DM9601=m
-+CONFIG_USB_NET_GL620A=m
-+CONFIG_USB_NET_NET1080=m
-+CONFIG_USB_NET_PLUSB=m
-+CONFIG_USB_NET_MCS7830=m
-+CONFIG_USB_NET_RNDIS_HOST=m
-+CONFIG_USB_NET_CDC_SUBSET=m
-+CONFIG_USB_ALI_M5632=y
-+CONFIG_USB_AN2720=y
-+CONFIG_USB_BELKIN=y
-+CONFIG_USB_ARMLINUX=y
-+CONFIG_USB_EPSON2888=y
-+CONFIG_USB_KC2190=y
-+CONFIG_USB_NET_ZAURUS=m
-+# CONFIG_WAN is not set
-+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=m
-+CONFIG_PPP_MPPE=m
-+# CONFIG_PPPOE is not set
-+# CONFIG_PPPOL2TP is not set
-+# CONFIG_SLIP is not set
-+CONFIG_SLHC=m
-+# CONFIG_SHAPER is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
-+# CONFIG_INPUT_JOYDEV is not set
-+CONFIG_INPUT_EVDEV=y
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+# CONFIG_KEYBOARD_ATKBD is not set
-+# 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_KEYBOARD_STOWAWAY=m
-+CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_NEO1973=y
-+CONFIG_KEYBOARD_QT2410=y
-+CONFIG_INPUT_MOUSE=y
-+# CONFIG_MOUSE_PS2 is not set
-+# CONFIG_MOUSE_SERIAL is not set
-+# CONFIG_MOUSE_APPLETOUCH is not set
-+# CONFIG_MOUSE_VSXXXAA is not set
-+# CONFIG_MOUSE_GPIO is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+CONFIG_INPUT_TOUCHSCREEN=y
-+# CONFIG_TOUCHSCREEN_ADS7846 is not set
-+# CONFIG_TOUCHSCREEN_FUJITSU is not set
-+CONFIG_TOUCHSCREEN_S3C2410=y
-+# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
-+# CONFIG_TOUCHSCREEN_GUNZE is not set
-+# CONFIG_TOUCHSCREEN_ELO is not set
-+# CONFIG_TOUCHSCREEN_MTOUCH is not set
-+# CONFIG_TOUCHSCREEN_MK712 is not set
-+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-+# CONFIG_TOUCHSCREEN_UCB1400 is not set
-+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-+CONFIG_INPUT_MISC=y
-+# CONFIG_INPUT_ATI_REMOTE is not set
-+# CONFIG_INPUT_ATI_REMOTE2 is not set
-+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-+# CONFIG_INPUT_POWERMATE is not set
-+# CONFIG_INPUT_YEALINK is not set
-+CONFIG_INPUT_UINPUT=m
-+CONFIG_INPUT_LIS302DL=y
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+# CONFIG_SERIO_SERPORT is not set
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_NR_TTY_DEVICES=4
-+CONFIG_HW_CONSOLE=y
-+CONFIG_VT_HW_CONSOLE_BINDING=y
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_SERIAL_S3C2410=y
-+CONFIG_SERIAL_S3C2410_CONSOLE=y
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_LEGACY_PTYS is not set
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_GPIO is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+CONFIG_I2C_S3C2410=y
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_TINY_USB is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_SENSORS_DS1337 is not set
-+# CONFIG_SENSORS_DS1374 is not set
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+CONFIG_SENSORS_PCF50606=y
-+CONFIG_SENSORS_PCF50633=y
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_SENSORS_PCA9539 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+CONFIG_SENSORS_TSL256X=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
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+# CONFIG_SPI_DEBUG is not set
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+# CONFIG_SPI_S3C24XX is not set
-+CONFIG_SPI_S3C24XX_GPIO=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_W1 is not set
-+CONFIG_POWER_SUPPLY=y
-+CONFIG_POWER_SUPPLY_DEBUG=y
-+CONFIG_PDA_POWER=y
-+CONFIG_APM_POWER=y
-+# CONFIG_BATTERY_DS2760 is not set
-+CONFIG_BATTERY_BQ27000_HDQ=y
-+CONFIG_GTA02_HDQ=y
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+# CONFIG_SENSORS_LM70 is not set
-+# CONFIG_SENSORS_LM75 is not set
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# CONFIG_SENSORS_LM87 is not set
-+# CONFIG_SENSORS_LM90 is not set
-+# CONFIG_SENSORS_LM92 is not set
-+# CONFIG_SENSORS_LM93 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_DME1737 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_S3C2410_WATCHDOG=m
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+CONFIG_MFD_GLAMO=y
-+CONFIG_MFD_GLAMO_FB=y
-+CONFIG_MFD_GLAMO_SPI_GPIO=y
-+CONFIG_MFD_GLAMO_SPI_FB=y
-+CONFIG_MFD_GLAMO_MCI=y
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+CONFIG_FB=y
-+# CONFIG_FIRMWARE_EDID is not set
-+# CONFIG_FB_DDC is not set
-+CONFIG_FB_CFB_FILLRECT=y
-+CONFIG_FB_CFB_COPYAREA=y
-+CONFIG_FB_CFB_IMAGEBLIT=y
-+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-+# CONFIG_FB_SYS_FILLRECT is not set
-+# CONFIG_FB_SYS_COPYAREA is not set
-+# CONFIG_FB_SYS_IMAGEBLIT is not set
-+# CONFIG_FB_SYS_FOPS is not set
-+CONFIG_FB_DEFERRED_IO=y
-+# CONFIG_FB_SVGALIB is not set
-+# CONFIG_FB_MACMODES is not set
-+# CONFIG_FB_BACKLIGHT is not set
-+# CONFIG_FB_MODE_HELPERS is not set
-+# CONFIG_FB_TILEBLITTING is not set
-+
-+#
-+# Frame buffer hardware drivers
-+#
-+# CONFIG_FB_UVESA is not set
-+# CONFIG_FB_S1D13XXX is not set
-+CONFIG_FB_S3C2410=y
-+# CONFIG_FB_S3C2410_DEBUG is not set
-+# CONFIG_FB_VIRTUAL is not set
-+CONFIG_BACKLIGHT_LCD_SUPPORT=y
-+CONFIG_LCD_CLASS_DEVICE=y
-+CONFIG_LCD_LTV350QV=y
-+CONFIG_BACKLIGHT_CLASS_DEVICE=y
-+# CONFIG_BACKLIGHT_CORGI is not set
-+CONFIG_BACKLIGHT_GTA01=y
-+
-+#
-+# Display device support
-+#
-+CONFIG_DISPLAY_SUPPORT=y
-+
-+#
-+# Display hardware drivers
-+#
-+CONFIG_DISPLAY_JBT6K74=y
-+
-+#
-+# Console display driver support
-+#
-+# CONFIG_VGA_CONSOLE is not set
-+CONFIG_DUMMY_CONSOLE=y
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-+CONFIG_FONTS=y
-+# CONFIG_FONT_8x8 is not set
-+# CONFIG_FONT_8x16 is not set
-+CONFIG_FONT_6x11=y
-+# CONFIG_FONT_7x14 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
-+# CONFIG_FONT_10x18 is not set
-+# CONFIG_LOGO is not set
-+
-+#
-+# Sound
-+#
-+CONFIG_SOUND=y
-+
-+#
-+# Advanced Linux Sound Architecture
-+#
-+CONFIG_SND=y
-+CONFIG_SND_TIMER=y
-+CONFIG_SND_PCM=y
-+CONFIG_SND_HWDEP=y
-+CONFIG_SND_RAWMIDI=y
-+# CONFIG_SND_SEQUENCER is not set
-+CONFIG_SND_OSSEMUL=y
-+CONFIG_SND_MIXER_OSS=y
-+CONFIG_SND_PCM_OSS=y
-+CONFIG_SND_PCM_OSS_PLUGINS=y
-+# CONFIG_SND_DYNAMIC_MINORS is not set
-+CONFIG_SND_SUPPORT_OLD_API=y
-+CONFIG_SND_VERBOSE_PROCFS=y
-+# 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
-+
-+#
-+# ALSA ARM devices
-+#
-+
-+#
-+# SPI devices
-+#
-+
-+#
-+# USB devices
-+#
-+CONFIG_SND_USB_AUDIO=m
-+# CONFIG_SND_USB_CAIAQ is not set
-+
-+#
-+# System on Chip audio support
-+#
-+CONFIG_SND_SOC=y
-+CONFIG_SND_S3C24XX_SOC=y
-+CONFIG_SND_S3C24XX_SOC_I2S=y
-+# CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753 is not set
-+CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=y
-+
-+#
-+# SoC Audio support for SuperH
-+#
-+CONFIG_SND_SOC_WM8753=y
-+
-+#
-+# Open Sound System
-+#
-+# CONFIG_SOUND_PRIME is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=y
-+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-+# CONFIG_HID_FF is not set
-+# CONFIG_USB_HIDDEV is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+CONFIG_USB_SUSPEND=y
-+CONFIG_USB_PERSIST=y
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=y
-+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+CONFIG_USB_ACM=m
-+CONFIG_USB_PRINTER=m
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+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 is not set
-+CONFIG_USB_STORAGE_DPCM=y
-+CONFIG_USB_STORAGE_USBAT=y
-+CONFIG_USB_STORAGE_SDDR09=y
-+CONFIG_USB_STORAGE_SDDR55=y
-+CONFIG_USB_STORAGE_JUMPSHOT=y
-+CONFIG_USB_STORAGE_ALAUDA=y
-+CONFIG_USB_STORAGE_KARMA=y
-+CONFIG_USB_LIBUSUAL=y
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+
-+#
-+# USB Serial Converter support
-+#
-+CONFIG_USB_SERIAL=y
-+CONFIG_USB_SERIAL_GENERIC=y
-+CONFIG_USB_SERIAL_AIRCABLE=m
-+CONFIG_USB_SERIAL_AIRPRIME=m
-+CONFIG_USB_SERIAL_ARK3116=m
-+CONFIG_USB_SERIAL_BELKIN=m
-+# CONFIG_USB_SERIAL_CH341 is not set
-+CONFIG_USB_SERIAL_WHITEHEAT=m
-+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-+CONFIG_USB_SERIAL_CP2101=m
-+CONFIG_USB_SERIAL_CYPRESS_M8=m
-+CONFIG_USB_SERIAL_EMPEG=m
-+CONFIG_USB_SERIAL_FTDI_SIO=m
-+CONFIG_USB_SERIAL_FUNSOFT=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_GARMIN=m
-+CONFIG_USB_SERIAL_IPW=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_MOS7720=m
-+CONFIG_USB_SERIAL_MOS7840=m
-+CONFIG_USB_SERIAL_NAVMAN=m
-+CONFIG_USB_SERIAL_PL2303=m
-+# CONFIG_USB_SERIAL_OTI6858 is not set
-+CONFIG_USB_SERIAL_HP4X=m
-+CONFIG_USB_SERIAL_SAFE=m
-+CONFIG_USB_SERIAL_SAFE_PADDED=y
-+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-+CONFIG_USB_SERIAL_TI=m
-+CONFIG_USB_SERIAL_CYBERJACK=m
-+CONFIG_USB_SERIAL_XIRCOM=m
-+CONFIG_USB_SERIAL_OPTION=y
-+CONFIG_USB_SERIAL_OMNINET=m
-+# CONFIG_USB_SERIAL_DEBUG is not set
-+CONFIG_USB_EZUSB=y
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+CONFIG_USB_BERRY_CHARGE=m
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_LD is not set
-+CONFIG_USB_TRANCEVIBRATOR=m
-+CONFIG_USB_IOWARRIOR=m
-+# CONFIG_USB_TEST is not set
-+
-+#
-+# USB DSL modem support
-+#
-+
-+#
-+# USB Gadget Support
-+#
-+CONFIG_USB_GADGET=y
-+# CONFIG_USB_GADGET_DEBUG is not set
-+# CONFIG_USB_GADGET_DEBUG_FILES is not set
-+# CONFIG_USB_GADGET_DEBUG_FS is not set
-+CONFIG_USB_GADGET_SELECTED=y
-+# CONFIG_USB_GADGET_AMD5536UDC is not set
-+# CONFIG_USB_GADGET_ATMEL_USBA is not set
-+# CONFIG_USB_GADGET_FSL_USB2 is not set
-+# CONFIG_USB_GADGET_NET2280 is not set
-+# CONFIG_USB_GADGET_PXA2XX is not set
-+# CONFIG_USB_GADGET_M66592 is not set
-+# CONFIG_USB_GADGET_GOKU is not set
-+# CONFIG_USB_GADGET_LH7A40X is not set
-+# CONFIG_USB_GADGET_OMAP is not set
-+CONFIG_USB_GADGET_S3C2410=y
-+CONFIG_USB_S3C2410=y
-+# CONFIG_USB_S3C2410_DEBUG is not set
-+# CONFIG_USB_GADGET_AT91 is not set
-+# CONFIG_USB_GADGET_DUMMY_HCD is not set
-+# CONFIG_USB_GADGET_DUALSPEED is not set
-+# CONFIG_USB_ZERO is not set
-+CONFIG_USB_ETH=y
-+CONFIG_USB_ETH_RNDIS=y
-+# CONFIG_USB_GADGETFS is not set
-+# CONFIG_USB_FILE_STORAGE is not set
-+# CONFIG_USB_G_SERIAL is not set
-+# CONFIG_USB_MIDI_GADGET is not set
-+
-+#
-+# SDIO support
-+#
-+CONFIG_SDIO=y
-+CONFIG_SDIO_S3C24XX=y
-+CONFIG_SDIO_S3C24XX_DMA=y
-+CONFIG_SDIO_AR6000_WLAN=y
-+CONFIG_MMC=y
-+# CONFIG_MMC_DEBUG is not set
-+CONFIG_MMC_UNSAFE_RESUME=y
-+
-+#
-+# MMC/SD Card Drivers
-+#
-+CONFIG_MMC_BLOCK=y
-+# CONFIG_MMC_BLOCK_BOUNCE is not set
-+# CONFIG_SDIO_UART is not set
-+
-+#
-+# MMC/SD Host Controller Drivers
-+#
-+# CONFIG_MMC_SPI is not set
-+# CONFIG_MMC_S3C is not set
-+CONFIG_NEW_LEDS=y
-+CONFIG_LEDS_CLASS=y
-+
-+#
-+# LED drivers
-+#
-+CONFIG_LEDS_S3C24XX=m
-+CONFIG_LEDS_GPIO=y
-+CONFIG_LEDS_NEO1973_VIBRATOR=y
-+CONFIG_LEDS_NEO1973_GTA02=y
-+
-+#
-+# LED Triggers
-+#
-+CONFIG_LEDS_TRIGGERS=y
-+CONFIG_LEDS_TRIGGER_TIMER=y
-+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+CONFIG_RTC_DEBUG=y
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+CONFIG_RTC_DRV_S3C=m
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+# CONFIG_EXT3_FS_XATTR is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+# CONFIG_JBD_DEBUG is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+# CONFIG_MINIX_FS is not set
-+CONFIG_ROMFS_FS=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+CONFIG_DNOTIFY=y
-+# CONFIG_AUTOFS_FS is not set
-+CONFIG_AUTOFS4_FS=m
-+CONFIG_FUSE_FS=m
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+CONFIG_ISO9660_FS=y
-+CONFIG_JOLIET=y
-+# CONFIG_ZISOFS is not set
-+CONFIG_UDF_FS=y
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=y
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+CONFIG_CONFIGFS_FS=m
-+
-+#
-+# 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_YAFFS_FS=y
-+CONFIG_YAFFS_YAFFS1=y
-+CONFIG_YAFFS_9BYTE_TAGS=y
-+CONFIG_YAFFS_YAFFS2=y
-+CONFIG_YAFFS_AUTO_YAFFS2=y
-+# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-+CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
-+# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-+# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
-+CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+CONFIG_JFFS2_SUMMARY=y
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# 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
-+# CONFIG_NETWORK_FILESYSTEMS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=y
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+CONFIG_NLS_CODEPAGE_850=m
-+# 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=m
-+CONFIG_NLS_CODEPAGE_950=m
-+# 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=y
-+# 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=m
-+# CONFIG_DLM is not set
-+CONFIG_INSTRUMENTATION=y
-+# CONFIG_PROFILING is not set
-+CONFIG_MARKERS=y
-+
-+#
-+# Kernel hacking
-+#
-+CONFIG_PRINTK_TIME=y
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+CONFIG_DEBUG_SHIRQ=y
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+CONFIG_TIMER_STATS=y
-+# CONFIG_DEBUG_SLAB is not set
-+CONFIG_DEBUG_PREEMPT=y
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+CONFIG_DEBUG_SPINLOCK=y
-+CONFIG_DEBUG_MUTEXES=y
-+CONFIG_DEBUG_LOCK_ALLOC=y
-+# CONFIG_PROVE_LOCKING is not set
-+CONFIG_LOCKDEP=y
-+CONFIG_LOCK_STAT=y
-+CONFIG_DEBUG_LOCKDEP=y
-+CONFIG_DEBUG_SPINLOCK_SLEEP=y
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+CONFIG_STACKTRACE=y
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+CONFIG_DEBUG_SG=y
-+CONFIG_FRAME_POINTER=y
-+CONFIG_FORCED_INLINING=y
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_USER is not set
-+CONFIG_DEBUG_ERRORS=y
-+# CONFIG_DEBUG_LL is not set
-+# CONFIG_DEBUG_ICEDCC is not set
-+# CONFIG_DEBUG_S3C_PORT is not set
-+CONFIG_DEBUG_S3C_UART=2
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_HMAC=y
-+CONFIG_CRYPTO_XCBC=m
-+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_WP512=m
-+CONFIG_CRYPTO_TGR192=m
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+CONFIG_CRYPTO_LRW=m
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_FCRYPT=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_CAST6=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_KHAZAD=m
-+CONFIG_CRYPTO_ANUBIS=m
-+# CONFIG_CRYPTO_SEED is not set
-+CONFIG_CRYPTO_DEFLATE=m
-+CONFIG_CRYPTO_MICHAEL_MIC=m
-+CONFIG_CRYPTO_CRC32C=m
-+CONFIG_CRYPTO_CAMELLIA=m
-+CONFIG_CRYPTO_TEST=m
-+# CONFIG_CRYPTO_AUTHENC is not set
-+CONFIG_CRYPTO_HW=y
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_CRC_CCITT=m
-+CONFIG_CRC16=m
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+CONFIG_LIBCRC32C=m
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_TEXTSEARCH=y
-+CONFIG_TEXTSEARCH_KMP=m
-+CONFIG_TEXTSEARCH_BM=m
-+CONFIG_TEXTSEARCH_FSM=m
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_DMA=y
-diff --git a/arch/arm/gta02-maxmodules-defconfig b/arch/arm/gta02-maxmodules-defconfig
-deleted file mode 100644
-index e773649..0000000
---- a/arch/arm/gta02-maxmodules-defconfig
-+++ /dev/null
-@@ -1,1769 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.24
--# Mon Feb 25 07:03:56 2008
--#
--CONFIG_ARM=y
--CONFIG_SYS_SUPPORTS_APM_EMULATION=y
--CONFIG_GENERIC_GPIO=y
--# CONFIG_GENERIC_TIME is not set
--# CONFIG_GENERIC_CLOCKEVENTS is not set
--CONFIG_MMU=y
--CONFIG_NO_IOPORT=y
--CONFIG_GENERIC_HARDIRQS=y
--CONFIG_STACKTRACE_SUPPORT=y
--CONFIG_LOCKDEP_SUPPORT=y
--CONFIG_TRACE_IRQFLAGS_SUPPORT=y
--CONFIG_HARDIRQS_SW_RESEND=y
--CONFIG_GENERIC_IRQ_PROBE=y
--CONFIG_RWSEM_GENERIC_SPINLOCK=y
--# CONFIG_ARCH_HAS_ILOG2_U32 is not set
--# CONFIG_ARCH_HAS_ILOG2_U64 is not set
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_ZONE_DMA=y
--CONFIG_FIQ=y
--CONFIG_VECTORS_BASE=0xffff0000
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_LOCK_KERNEL=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION=""
--# CONFIG_LOCALVERSION_AUTO is not set
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_USER_NS is not set
--# CONFIG_PID_NS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
--# CONFIG_CGROUPS is not set
--# CONFIG_FAIR_GROUP_SCHED is not set
--# CONFIG_SYSFS_DEPRECATED is not set
--# CONFIG_RELAY is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--CONFIG_CC_OPTIMIZE_FOR_SIZE=y
--CONFIG_SYSCTL=y
--# CONFIG_EMBEDDED is not set
--CONFIG_UID16=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--# CONFIG_KALLSYMS_ALL is not set
--# CONFIG_KALLSYMS_EXTRA_PASS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLAB=y
--# CONFIG_SLUB is not set
--# CONFIG_SLOB is not set
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--CONFIG_MODULE_FORCE_UNLOAD=y
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=m
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=m
--# CONFIG_DEFAULT_AS is not set
--CONFIG_DEFAULT_DEADLINE=y
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="deadline"
--
--#
--# System Type
--#
--# CONFIG_ARCH_AAEC2000 is not set
--# CONFIG_ARCH_INTEGRATOR is not set
--# CONFIG_ARCH_REALVIEW is not set
--# CONFIG_ARCH_VERSATILE is not set
--# CONFIG_ARCH_AT91 is not set
--# CONFIG_ARCH_CLPS7500 is not set
--# CONFIG_ARCH_CLPS711X is not set
--# CONFIG_ARCH_CO285 is not set
--# CONFIG_ARCH_EBSA110 is not set
--# CONFIG_ARCH_EP93XX is not set
--# CONFIG_ARCH_FOOTBRIDGE is not set
--# CONFIG_ARCH_NETX is not set
--# CONFIG_ARCH_H720X is not set
--# CONFIG_ARCH_IMX is not set
--# CONFIG_ARCH_IOP13XX is not set
--# CONFIG_ARCH_IOP32X is not set
--# CONFIG_ARCH_IOP33X is not set
--# CONFIG_ARCH_IXP23XX is not set
--# CONFIG_ARCH_IXP2000 is not set
--# CONFIG_ARCH_IXP4XX is not set
--# CONFIG_ARCH_L7200 is not set
--# CONFIG_ARCH_KS8695 is not set
--# CONFIG_ARCH_NS9XXX is not set
--# CONFIG_ARCH_MXC is not set
--# CONFIG_ARCH_PNX4008 is not set
--# CONFIG_ARCH_PXA is not set
--# CONFIG_ARCH_RPC is not set
--# CONFIG_ARCH_SA1100 is not set
--CONFIG_ARCH_S3C2410=y
--# CONFIG_ARCH_SHARK is not set
--# CONFIG_ARCH_LH7A40X is not set
--# CONFIG_ARCH_DAVINCI is not set
--# CONFIG_ARCH_OMAP is not set
--CONFIG_PLAT_S3C24XX=y
--CONFIG_CPU_S3C244X=y
--CONFIG_S3C2410_DMA=y
--# CONFIG_S3C2410_DMA_DEBUG is not set
--CONFIG_MACH_SMDK=y
--CONFIG_MACH_NEO1973=y
--CONFIG_PLAT_S3C=y
--CONFIG_CPU_LLSERIAL_S3C2410=y
--CONFIG_CPU_LLSERIAL_S3C2440=y
--
--#
--# Boot options
--#
--# CONFIG_S3C_BOOT_WATCHDOG is not set
--# CONFIG_S3C_BOOT_ERROR_RESET is not set
--
--#
--# Power management
--#
--CONFIG_S3C2410_PM_DEBUG=y
--# CONFIG_S3C2410_PM_CHECK is not set
--CONFIG_S3C_LOWLEVEL_UART_PORT=0
--
--#
--# S3C2400 Machines
--#
--CONFIG_CPU_S3C2410=y
--CONFIG_CPU_S3C2410_DMA=y
--CONFIG_S3C2410_PM=y
--CONFIG_S3C2410_GPIO=y
--CONFIG_S3C2410_CLOCK=y
--CONFIG_S3C2410_PWM=y
--
--#
--# S3C2410 Machines
--#
--# CONFIG_ARCH_SMDK2410 is not set
--# CONFIG_ARCH_H1940 is not set
--# CONFIG_MACH_N30 is not set
--# CONFIG_ARCH_BAST is not set
--# CONFIG_MACH_OTOM is not set
--# CONFIG_MACH_AML_M5900 is not set
--# CONFIG_MACH_VR1000 is not set
--CONFIG_MACH_QT2410=y
--CONFIG_MACH_NEO1973_GTA01=y
--
--#
--# S3C2412 Machines
--#
--# CONFIG_MACH_SMDK2413 is not set
--# CONFIG_MACH_SMDK2412 is not set
--# CONFIG_MACH_VSTMS is not set
--CONFIG_CPU_S3C2440=y
--CONFIG_S3C2440_DMA=y
--CONFIG_S3C2440_C_FIQ=y
--
--#
--# S3C2440 Machines
--#
--# CONFIG_MACH_ANUBIS is not set
--# CONFIG_MACH_OSIRIS is not set
--# CONFIG_MACH_RX3715 is not set
--CONFIG_ARCH_S3C2440=y
--# CONFIG_MACH_NEXCODER_2440 is not set
--CONFIG_SMDK2440_CPU2440=y
--CONFIG_MACH_HXD8=y
--CONFIG_MACH_NEO1973_GTA02=y
--# CONFIG_NEO1973_GTA02_2440 is not set
--CONFIG_CPU_S3C2442=y
--
--#
--# S3C2442 Machines
--#
--CONFIG_SMDK2440_CPU2442=y
--
--#
--# S3C2443 Machines
--#
--# CONFIG_MACH_SMDK2443 is not set
--
--#
--# Processor Type
--#
--CONFIG_CPU_32=y
--CONFIG_CPU_ARM920T=y
--CONFIG_CPU_32v4T=y
--CONFIG_CPU_ABRT_EV4T=y
--CONFIG_CPU_CACHE_V4WT=y
--CONFIG_CPU_CACHE_VIVT=y
--CONFIG_CPU_COPY_V4WB=y
--CONFIG_CPU_TLB_V4WBI=y
--CONFIG_CPU_CP15=y
--CONFIG_CPU_CP15_MMU=y
--
--#
--# Processor Features
--#
--CONFIG_ARM_THUMB=y
--# CONFIG_CPU_ICACHE_DISABLE is not set
--# CONFIG_CPU_DCACHE_DISABLE is not set
--# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
--# CONFIG_OUTER_CACHE is not set
--
--#
--# Bus support
--#
--# CONFIG_PCI_SYSCALL is not set
--# CONFIG_ARCH_SUPPORTS_MSI is not set
--# CONFIG_PCCARD is not set
--
--#
--# Kernel Features
--#
--# CONFIG_TICK_ONESHOT is not set
--CONFIG_PREEMPT=y
--CONFIG_NO_IDLE_HZ=y
--CONFIG_HZ=200
--CONFIG_AEABI=y
--CONFIG_OABI_COMPAT=y
--# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4096
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_ALIGNMENT_TRAP=y
--
--#
--# Boot options
--#
--CONFIG_ZBOOT_ROM_TEXT=0x0
--CONFIG_ZBOOT_ROM_BSS=0x0
--CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
--# CONFIG_XIP_KERNEL is not set
--CONFIG_KEXEC=y
--CONFIG_ATAGS_PROC=y
--
--#
--# Floating point emulation
--#
--
--#
--# At least one emulation must be selected
--#
--CONFIG_FPE_NWFPE=y
--# CONFIG_FPE_NWFPE_XP is not set
--# CONFIG_FPE_FASTFPE is not set
--
--#
--# Userspace binary formats
--#
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_AOUT is not set
--# CONFIG_BINFMT_MISC is not set
--
--#
--# Power management options
--#
--CONFIG_PM=y
--CONFIG_PM_LEGACY=y
--CONFIG_PM_DEBUG=y
--# CONFIG_PM_VERBOSE is not set
--CONFIG_PM_SLEEP=y
--CONFIG_SUSPEND_UP_POSSIBLE=y
--CONFIG_SUSPEND=y
--CONFIG_APM_EMULATION=y
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--CONFIG_PACKET_MMAP=y
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--CONFIG_XFRM_MIGRATE=y
--CONFIG_NET_KEY=m
--CONFIG_NET_KEY_MIGRATE=y
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--CONFIG_IP_ADVANCED_ROUTER=y
--CONFIG_ASK_IP_FIB_HASH=y
--# CONFIG_IP_FIB_TRIE is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_MULTIPLE_TABLES=y
--# CONFIG_IP_ROUTE_MULTIPATH is not set
--# CONFIG_IP_ROUTE_VERBOSE 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=m
--CONFIG_NET_IPGRE=m
--# CONFIG_NET_IPGRE_BROADCAST is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--CONFIG_INET_AH=m
--CONFIG_INET_ESP=m
--CONFIG_INET_IPCOMP=m
--CONFIG_INET_XFRM_TUNNEL=m
--CONFIG_INET_TUNNEL=m
--CONFIG_INET_XFRM_MODE_TRANSPORT=m
--CONFIG_INET_XFRM_MODE_TUNNEL=m
--CONFIG_INET_XFRM_MODE_BEET=m
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--CONFIG_TCP_MD5SIG=y
--# CONFIG_IP_VS is not set
--CONFIG_IPV6=m
--# CONFIG_IPV6_PRIVACY is not set
--# CONFIG_IPV6_ROUTER_PREF is not set
--# CONFIG_IPV6_OPTIMISTIC_DAD is not set
--CONFIG_INET6_AH=m
--CONFIG_INET6_ESP=m
--CONFIG_INET6_IPCOMP=m
--# CONFIG_IPV6_MIP6 is not set
--CONFIG_INET6_XFRM_TUNNEL=m
--CONFIG_INET6_TUNNEL=m
--CONFIG_INET6_XFRM_MODE_TRANSPORT=m
--CONFIG_INET6_XFRM_MODE_TUNNEL=m
--CONFIG_INET6_XFRM_MODE_BEET=m
--# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
--CONFIG_IPV6_SIT=m
--CONFIG_IPV6_TUNNEL=m
--# CONFIG_IPV6_MULTIPLE_TABLES is not set
--# CONFIG_NETWORK_SECMARK is not set
--CONFIG_NETFILTER=y
--# CONFIG_NETFILTER_DEBUG is not set
--
--#
--# Core Netfilter Configuration
--#
--CONFIG_NETFILTER_NETLINK=m
--CONFIG_NETFILTER_NETLINK_QUEUE=m
--CONFIG_NETFILTER_NETLINK_LOG=m
--CONFIG_NF_CONNTRACK_ENABLED=m
--CONFIG_NF_CONNTRACK=m
--CONFIG_NF_CT_ACCT=y
--CONFIG_NF_CONNTRACK_MARK=y
--CONFIG_NF_CONNTRACK_EVENTS=y
--CONFIG_NF_CT_PROTO_GRE=m
--CONFIG_NF_CT_PROTO_SCTP=m
--# CONFIG_NF_CT_PROTO_UDPLITE is not set
--# CONFIG_NF_CONNTRACK_AMANDA is not set
--CONFIG_NF_CONNTRACK_FTP=m
--CONFIG_NF_CONNTRACK_H323=m
--CONFIG_NF_CONNTRACK_IRC=m
--CONFIG_NF_CONNTRACK_NETBIOS_NS=m
--CONFIG_NF_CONNTRACK_PPTP=m
--CONFIG_NF_CONNTRACK_SANE=m
--CONFIG_NF_CONNTRACK_SIP=m
--CONFIG_NF_CONNTRACK_TFTP=m
--CONFIG_NF_CT_NETLINK=m
--CONFIG_NETFILTER_XTABLES=m
--CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
--CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
--CONFIG_NETFILTER_XT_TARGET_DSCP=m
--CONFIG_NETFILTER_XT_TARGET_MARK=m
--CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
--CONFIG_NETFILTER_XT_TARGET_NFLOG=m
--CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
--# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
--CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
--# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
--CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
--CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
--CONFIG_NETFILTER_XT_MATCH_DCCP=m
--CONFIG_NETFILTER_XT_MATCH_DSCP=m
--CONFIG_NETFILTER_XT_MATCH_ESP=m
--CONFIG_NETFILTER_XT_MATCH_HELPER=m
--CONFIG_NETFILTER_XT_MATCH_LENGTH=m
--CONFIG_NETFILTER_XT_MATCH_LIMIT=m
--CONFIG_NETFILTER_XT_MATCH_MAC=m
--CONFIG_NETFILTER_XT_MATCH_MARK=m
--CONFIG_NETFILTER_XT_MATCH_POLICY=m
--CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
--CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
--CONFIG_NETFILTER_XT_MATCH_QUOTA=m
--CONFIG_NETFILTER_XT_MATCH_REALM=m
--CONFIG_NETFILTER_XT_MATCH_SCTP=m
--CONFIG_NETFILTER_XT_MATCH_STATE=m
--CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
--CONFIG_NETFILTER_XT_MATCH_STRING=m
--CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
--# CONFIG_NETFILTER_XT_MATCH_TIME is not set
--# CONFIG_NETFILTER_XT_MATCH_U32 is not set
--CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
--
--#
--# IP: Netfilter Configuration
--#
--CONFIG_NF_CONNTRACK_IPV4=m
--CONFIG_NF_CONNTRACK_PROC_COMPAT=y
--# CONFIG_IP_NF_QUEUE is not set
--CONFIG_IP_NF_IPTABLES=m
--CONFIG_IP_NF_MATCH_IPRANGE=m
--CONFIG_IP_NF_MATCH_TOS=m
--# CONFIG_IP_NF_MATCH_RECENT is not set
--CONFIG_IP_NF_MATCH_ECN=m
--CONFIG_IP_NF_MATCH_AH=m
--CONFIG_IP_NF_MATCH_TTL=m
--CONFIG_IP_NF_MATCH_OWNER=m
--CONFIG_IP_NF_MATCH_ADDRTYPE=m
--CONFIG_IP_NF_FILTER=m
--CONFIG_IP_NF_TARGET_REJECT=m
--CONFIG_IP_NF_TARGET_LOG=m
--CONFIG_IP_NF_TARGET_ULOG=m
--CONFIG_NF_NAT=m
--CONFIG_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_NF_NAT_SNMP_BASIC=m
--CONFIG_NF_NAT_PROTO_GRE=m
--CONFIG_NF_NAT_FTP=m
--CONFIG_NF_NAT_IRC=m
--CONFIG_NF_NAT_TFTP=m
--# CONFIG_NF_NAT_AMANDA is not set
--CONFIG_NF_NAT_PPTP=m
--CONFIG_NF_NAT_H323=m
--CONFIG_NF_NAT_SIP=m
--CONFIG_IP_NF_MANGLE=m
--CONFIG_IP_NF_TARGET_TOS=m
--CONFIG_IP_NF_TARGET_ECN=m
--CONFIG_IP_NF_TARGET_TTL=m
--CONFIG_IP_NF_TARGET_CLUSTERIP=m
--# CONFIG_IP_NF_RAW is not set
--# CONFIG_IP_NF_ARPTABLES is not set
--
--#
--# IPv6: Netfilter Configuration (EXPERIMENTAL)
--#
--CONFIG_NF_CONNTRACK_IPV6=m
--# CONFIG_IP6_NF_QUEUE is not set
--CONFIG_IP6_NF_IPTABLES=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_OWNER=m
--CONFIG_IP6_NF_MATCH_IPV6HEADER=m
--CONFIG_IP6_NF_MATCH_AH=m
--CONFIG_IP6_NF_MATCH_MH=m
--CONFIG_IP6_NF_MATCH_EUI64=m
--CONFIG_IP6_NF_FILTER=m
--CONFIG_IP6_NF_TARGET_LOG=m
--CONFIG_IP6_NF_TARGET_REJECT=m
--CONFIG_IP6_NF_MANGLE=m
--CONFIG_IP6_NF_TARGET_HL=m
--# CONFIG_IP6_NF_RAW is not set
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--CONFIG_NET_SCHED=y
--
--#
--# Queueing/Scheduling
--#
--CONFIG_NET_SCH_CBQ=m
--CONFIG_NET_SCH_HTB=m
--CONFIG_NET_SCH_HFSC=m
--CONFIG_NET_SCH_PRIO=m
--# CONFIG_NET_SCH_RR is not set
--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_NETEM=m
--CONFIG_NET_SCH_INGRESS=m
--
--#
--# Classification
--#
--CONFIG_NET_CLS=y
--CONFIG_NET_CLS_BASIC=m
--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_CLS_U32_PERF=y
--CONFIG_CLS_U32_MARK=y
--CONFIG_NET_CLS_RSVP=m
--CONFIG_NET_CLS_RSVP6=m
--# CONFIG_NET_EMATCH is not set
--# CONFIG_NET_CLS_ACT is not set
--# CONFIG_NET_CLS_POLICE is not set
--# CONFIG_NET_CLS_IND is not set
--CONFIG_NET_SCH_FIFO=y
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_IRDA 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_HIDP=m
--
--#
--# Bluetooth device drivers
--#
--CONFIG_BT_HCIUSB=m
--CONFIG_BT_HCIUSB_SCO=y
--# CONFIG_BT_HCIBTSDIO is not set
--# CONFIG_BT_HCIUART is not set
--# CONFIG_BT_HCIBCM203X is not set
--# CONFIG_BT_HCIBPA10X is not set
--# CONFIG_BT_HCIBFUSB is not set
--# CONFIG_BT_HCIVHCI is not set
--# CONFIG_AF_RXRPC is not set
--CONFIG_FIB_RULES=y
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--CONFIG_WIRELESS_EXT=y
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=m
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=m
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--# CONFIG_MTD_CONCAT is not set
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--# CONFIG_MTD_AFS_PARTS is not set
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=y
--CONFIG_MTD_BLOCK=y
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--CONFIG_MTD_CFI_INTELEXT=y
--# CONFIG_MTD_CFI_AMDSTD is not set
--# CONFIG_MTD_CFI_STAA is not set
--CONFIG_MTD_CFI_UTIL=y
--# CONFIG_MTD_RAM is not set
--# CONFIG_MTD_ROM is not set
--CONFIG_MTD_ABSENT=y
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--CONFIG_MTD_PHYSMAP=y
--CONFIG_MTD_PHYSMAP_START=0x8000000
--CONFIG_MTD_PHYSMAP_LEN=0
--CONFIG_MTD_PHYSMAP_BANKWIDTH=2
--# CONFIG_MTD_ARM_INTEGRATOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_DATAFLASH is not set
--# CONFIG_MTD_M25P80 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_BLOCK2MTD is not set
--
--#
--# Disk-On-Chip Device Drivers
--#
--# CONFIG_MTD_DOC2000 is not set
--# CONFIG_MTD_DOC2001 is not set
--# CONFIG_MTD_DOC2001PLUS is not set
--CONFIG_MTD_NAND=y
--CONFIG_MTD_NAND_VERIFY_WRITE=y
--# CONFIG_MTD_NAND_ECC_SMC is not set
--# CONFIG_MTD_NAND_MUSEUM_IDS is not set
--CONFIG_MTD_NAND_IDS=y
--CONFIG_MTD_NAND_S3C2410=y
--# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
--CONFIG_MTD_NAND_S3C2410_HWECC=y
--# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
--# CONFIG_MTD_NAND_DISKONCHIP is not set
--# CONFIG_MTD_NAND_NANDSIM is not set
--# CONFIG_MTD_NAND_PLATFORM is not set
--# CONFIG_MTD_ALAUDA is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--# CONFIG_PARPORT is not set
--CONFIG_PNP=y
--CONFIG_PNP_DEBUG=y
--
--#
--# Protocols
--#
--# CONFIG_PNPACPI is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=m
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--CONFIG_BLK_DEV_UB=m
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=4096
--CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=m
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--CONFIG_BLK_DEV_SD=m
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--CONFIG_BLK_DEV_SR=m
--# CONFIG_BLK_DEV_SR_VENDOR is not set
--CONFIG_CHR_DEV_SG=m
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--CONFIG_SCSI_SCAN_ASYNC=y
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--# CONFIG_SCSI_SPI_ATTRS is not set
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_ATA is not set
--# CONFIG_MD is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--CONFIG_TUN=m
--# CONFIG_VETH is not set
--# CONFIG_NET_SB1000 is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_AX88796 is not set
--# CONFIG_SMC91X is not set
--# CONFIG_DM9000 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--CONFIG_NET_PCI=y
--# CONFIG_B44 is not set
--CONFIG_CS89x0=m
--# CONFIG_NETDEV_1000 is not set
--# CONFIG_NETDEV_10000 is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--
--#
--# USB Network Adapters
--#
--CONFIG_USB_CATC=m
--CONFIG_USB_KAWETH=m
--CONFIG_USB_PEGASUS=m
--CONFIG_USB_RTL8150=m
--CONFIG_USB_USBNET=y
--CONFIG_USB_NET_AX8817X=m
--CONFIG_USB_NET_CDCETHER=m
--CONFIG_USB_NET_DM9601=m
--CONFIG_USB_NET_GL620A=m
--CONFIG_USB_NET_NET1080=m
--CONFIG_USB_NET_PLUSB=m
--CONFIG_USB_NET_MCS7830=m
--CONFIG_USB_NET_RNDIS_HOST=m
--CONFIG_USB_NET_CDC_SUBSET=m
--CONFIG_USB_ALI_M5632=y
--CONFIG_USB_AN2720=y
--CONFIG_USB_BELKIN=y
--CONFIG_USB_ARMLINUX=y
--CONFIG_USB_EPSON2888=y
--CONFIG_USB_KC2190=y
--CONFIG_USB_NET_ZAURUS=m
--# CONFIG_WAN is not set
--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=m
--CONFIG_PPP_MPPE=m
--# CONFIG_PPPOE is not set
--# CONFIG_PPPOL2TP is not set
--# CONFIG_SLIP is not set
--CONFIG_SLHC=m
--# CONFIG_SHAPER is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--CONFIG_INPUT_MOUSEDEV=y
--# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
--CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
--CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
--# CONFIG_INPUT_JOYDEV is not set
--CONFIG_INPUT_EVDEV=y
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--CONFIG_INPUT_KEYBOARD=y
--# CONFIG_KEYBOARD_ATKBD is not set
--# 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_KEYBOARD_STOWAWAY=m
--CONFIG_KEYBOARD_GPIO=m
--CONFIG_KEYBOARD_NEO1973=y
--CONFIG_KEYBOARD_QT2410=y
--CONFIG_INPUT_MOUSE=y
--# CONFIG_MOUSE_PS2 is not set
--# CONFIG_MOUSE_SERIAL is not set
--# CONFIG_MOUSE_APPLETOUCH is not set
--# CONFIG_MOUSE_VSXXXAA is not set
--# CONFIG_MOUSE_GPIO is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--CONFIG_INPUT_TOUCHSCREEN=y
--# CONFIG_TOUCHSCREEN_ADS7846 is not set
--# CONFIG_TOUCHSCREEN_FUJITSU is not set
--CONFIG_TOUCHSCREEN_S3C2410=y
--# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
--# CONFIG_TOUCHSCREEN_GUNZE is not set
--# CONFIG_TOUCHSCREEN_ELO is not set
--# CONFIG_TOUCHSCREEN_MTOUCH is not set
--# CONFIG_TOUCHSCREEN_MK712 is not set
--# CONFIG_TOUCHSCREEN_PENMOUNT is not set
--# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
--# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
--# CONFIG_TOUCHSCREEN_UCB1400 is not set
--# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
--CONFIG_INPUT_MISC=y
--# CONFIG_INPUT_ATI_REMOTE is not set
--# CONFIG_INPUT_ATI_REMOTE2 is not set
--# CONFIG_INPUT_KEYSPAN_REMOTE is not set
--# CONFIG_INPUT_POWERMATE is not set
--# CONFIG_INPUT_YEALINK is not set
--CONFIG_INPUT_UINPUT=m
--CONFIG_INPUT_LIS302DL=y
--
--#
--# Hardware I/O ports
--#
--CONFIG_SERIO=y
--# CONFIG_SERIO_SERPORT is not set
--# CONFIG_SERIO_RAW is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--CONFIG_VT=y
--CONFIG_VT_CONSOLE=y
--CONFIG_NR_TTY_DEVICES=4
--CONFIG_HW_CONSOLE=y
--CONFIG_VT_HW_CONSOLE_BINDING=y
--# CONFIG_SERIAL_NONSTANDARD is not set
--
--#
--# Serial drivers
--#
--# CONFIG_SERIAL_8250 is not set
--
--#
--# Non-8250 serial port support
--#
--CONFIG_SERIAL_S3C2410=y
--CONFIG_SERIAL_S3C2410_CONSOLE=y
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--CONFIG_UNIX98_PTYS=y
--# CONFIG_LEGACY_PTYS is not set
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_R3964 is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_GPIO is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--CONFIG_I2C_S3C2410=y
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--# CONFIG_I2C_TINY_USB is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_SENSORS_DS1337 is not set
--# CONFIG_SENSORS_DS1374 is not set
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--CONFIG_SENSORS_PCF50606=y
--CONFIG_SENSORS_PCF50633=y
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_SENSORS_PCA9539 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--CONFIG_SENSORS_TSL256X=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
--
--#
--# SPI support
--#
--CONFIG_SPI=y
--# CONFIG_SPI_DEBUG is not set
--CONFIG_SPI_MASTER=y
--
--#
--# SPI Master Controller Drivers
--#
--CONFIG_SPI_BITBANG=y
--CONFIG_SPI_S3C24XX=y
--CONFIG_SPI_S3C24XX_GPIO=y
--
--#
--# SPI Protocol Masters
--#
--# CONFIG_SPI_AT25 is not set
--# CONFIG_SPI_SPIDEV is not set
--# CONFIG_SPI_TLE62X0 is not set
--# CONFIG_W1 is not set
--CONFIG_POWER_SUPPLY=y
--# CONFIG_POWER_SUPPLY_DEBUG is not set
--# CONFIG_PDA_POWER is not set
--# CONFIG_APM_POWER is not set
--# CONFIG_BATTERY_DS2760 is not set
--CONFIG_BATTERY_BQ27000_HDQ=y
--CONFIG_GTA02_HDQ=y
--# CONFIG_HWMON is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_S3C2410_WATCHDOG=m
--
--#
--# USB-based Watchdog Cards
--#
--# CONFIG_USBPCWATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--CONFIG_MFD_GLAMO=y
--CONFIG_MFD_GLAMO_FB=y
--CONFIG_MFD_GLAMO_SPI_GPIO=y
--CONFIG_MFD_GLAMO_SPI_FB=y
--CONFIG_MFD_GLAMO_MCI=y
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--# CONFIG_USB_DABUSB is not set
--
--#
--# Graphics support
--#
--# CONFIG_VGASTATE is not set
--# CONFIG_VIDEO_OUTPUT_CONTROL is not set
--CONFIG_FB=y
--# CONFIG_FIRMWARE_EDID is not set
--# CONFIG_FB_DDC is not set
--CONFIG_FB_CFB_FILLRECT=y
--CONFIG_FB_CFB_COPYAREA=y
--CONFIG_FB_CFB_IMAGEBLIT=y
--# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
--# CONFIG_FB_SYS_FILLRECT is not set
--# CONFIG_FB_SYS_COPYAREA is not set
--# CONFIG_FB_SYS_IMAGEBLIT is not set
--# CONFIG_FB_SYS_FOPS is not set
--CONFIG_FB_DEFERRED_IO=y
--# CONFIG_FB_SVGALIB is not set
--# CONFIG_FB_MACMODES is not set
--# CONFIG_FB_BACKLIGHT is not set
--# CONFIG_FB_MODE_HELPERS is not set
--# CONFIG_FB_TILEBLITTING is not set
--
--#
--# Frame buffer hardware drivers
--#
--# CONFIG_FB_UVESA is not set
--# CONFIG_FB_S1D13XXX is not set
--CONFIG_FB_S3C2410=y
--# CONFIG_FB_S3C2410_DEBUG is not set
--# CONFIG_FB_VIRTUAL is not set
--CONFIG_BACKLIGHT_LCD_SUPPORT=y
--CONFIG_LCD_CLASS_DEVICE=y
--# CONFIG_LCD_LTV350QV is not set
--CONFIG_BACKLIGHT_CLASS_DEVICE=y
--# CONFIG_BACKLIGHT_CORGI is not set
--CONFIG_BACKLIGHT_GTA01=y
--
--#
--# Display device support
--#
--# CONFIG_DISPLAY_SUPPORT is not set
--CONFIG_DISPLAY_JBT6K74=y
--
--#
--# Console display driver support
--#
--# CONFIG_VGA_CONSOLE is not set
--CONFIG_DUMMY_CONSOLE=y
--CONFIG_FRAMEBUFFER_CONSOLE=y
--# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
--# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
--CONFIG_FONTS=y
--# CONFIG_FONT_8x8 is not set
--# CONFIG_FONT_8x16 is not set
--CONFIG_FONT_6x11=y
--# CONFIG_FONT_7x14 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
--# CONFIG_FONT_10x18 is not set
--# CONFIG_LOGO is not set
--
--#
--# Sound
--#
--CONFIG_SOUND=y
--
--#
--# Advanced Linux Sound Architecture
--#
--CONFIG_SND=m
--CONFIG_SND_TIMER=m
--CONFIG_SND_PCM=m
--# CONFIG_SND_SEQUENCER is not set
--CONFIG_SND_OSSEMUL=y
--CONFIG_SND_MIXER_OSS=m
--CONFIG_SND_PCM_OSS=m
--CONFIG_SND_PCM_OSS_PLUGINS=y
--# CONFIG_SND_DYNAMIC_MINORS is not set
--CONFIG_SND_SUPPORT_OLD_API=y
--CONFIG_SND_VERBOSE_PROCFS=y
--# 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
--
--#
--# ALSA ARM devices
--#
--
--#
--# SPI devices
--#
--
--#
--# USB devices
--#
--# CONFIG_SND_USB_AUDIO is not set
--# CONFIG_SND_USB_CAIAQ is not set
--
--#
--# System on Chip audio support
--#
--CONFIG_SND_SOC=m
--CONFIG_SND_S3C24XX_SOC=m
--CONFIG_SND_S3C24XX_SOC_I2S=m
--CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
--CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
--
--#
--# SoC Audio support for SuperH
--#
--CONFIG_SND_SOC_WM8753=m
--
--#
--# Open Sound System
--#
--# CONFIG_SOUND_PRIME is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--
--#
--# USB Input Devices
--#
--CONFIG_USB_HID=m
--# CONFIG_USB_HIDINPUT_POWERBOOK is not set
--# CONFIG_HID_FF is not set
--# CONFIG_USB_HIDDEV is not set
--
--#
--# USB HID Boot Protocol drivers
--#
--# CONFIG_USB_KBD is not set
--# CONFIG_USB_MOUSE is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--# CONFIG_USB_ARCH_HAS_EHCI is not set
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--
--#
--# Miscellaneous USB options
--#
--CONFIG_USB_DEVICEFS=y
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--CONFIG_USB_SUSPEND=y
--# CONFIG_USB_PERSIST is not set
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--# CONFIG_USB_ISP116X_HCD is not set
--CONFIG_USB_OHCI_HCD=m
--# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
--# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
--CONFIG_USB_OHCI_LITTLE_ENDIAN=y
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# USB Device Class drivers
--#
--CONFIG_USB_ACM=m
--CONFIG_USB_PRINTER=m
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# may also be needed; see USB_STORAGE Help for more information
--#
--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 is not set
--CONFIG_USB_STORAGE_DPCM=y
--CONFIG_USB_STORAGE_USBAT=y
--CONFIG_USB_STORAGE_SDDR09=y
--CONFIG_USB_STORAGE_SDDR55=y
--CONFIG_USB_STORAGE_JUMPSHOT=y
--CONFIG_USB_STORAGE_ALAUDA=y
--CONFIG_USB_STORAGE_KARMA=y
--CONFIG_USB_LIBUSUAL=y
--
--#
--# USB Imaging devices
--#
--# CONFIG_USB_MDC800 is not set
--# CONFIG_USB_MICROTEK is not set
--CONFIG_USB_MON=y
--
--#
--# USB port drivers
--#
--
--#
--# USB Serial Converter support
--#
--CONFIG_USB_SERIAL=m
--CONFIG_USB_SERIAL_GENERIC=y
--CONFIG_USB_SERIAL_AIRCABLE=m
--CONFIG_USB_SERIAL_AIRPRIME=m
--CONFIG_USB_SERIAL_ARK3116=m
--CONFIG_USB_SERIAL_BELKIN=m
--# CONFIG_USB_SERIAL_CH341 is not set
--CONFIG_USB_SERIAL_WHITEHEAT=m
--CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
--CONFIG_USB_SERIAL_CP2101=m
--CONFIG_USB_SERIAL_CYPRESS_M8=m
--CONFIG_USB_SERIAL_EMPEG=m
--CONFIG_USB_SERIAL_FTDI_SIO=m
--CONFIG_USB_SERIAL_FUNSOFT=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_GARMIN=m
--CONFIG_USB_SERIAL_IPW=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_MOS7720=m
--CONFIG_USB_SERIAL_MOS7840=m
--CONFIG_USB_SERIAL_NAVMAN=m
--CONFIG_USB_SERIAL_PL2303=m
--# CONFIG_USB_SERIAL_OTI6858 is not set
--CONFIG_USB_SERIAL_HP4X=m
--CONFIG_USB_SERIAL_SAFE=m
--CONFIG_USB_SERIAL_SAFE_PADDED=y
--CONFIG_USB_SERIAL_SIERRAWIRELESS=m
--CONFIG_USB_SERIAL_TI=m
--CONFIG_USB_SERIAL_CYBERJACK=m
--CONFIG_USB_SERIAL_XIRCOM=m
--CONFIG_USB_SERIAL_OPTION=m
--CONFIG_USB_SERIAL_OMNINET=m
--# CONFIG_USB_SERIAL_DEBUG is not set
--CONFIG_USB_EZUSB=y
--
--#
--# USB Miscellaneous drivers
--#
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
--# CONFIG_USB_ADUTUX is not set
--# CONFIG_USB_AUERSWALD is not set
--# CONFIG_USB_RIO500 is not set
--# CONFIG_USB_LEGOTOWER is not set
--# CONFIG_USB_LCD is not set
--CONFIG_USB_BERRY_CHARGE=m
--# CONFIG_USB_LED is not set
--# CONFIG_USB_CYPRESS_CY7C63 is not set
--# CONFIG_USB_CYTHERM is not set
--# CONFIG_USB_PHIDGET is not set
--# CONFIG_USB_IDMOUSE is not set
--# CONFIG_USB_FTDI_ELAN is not set
--# CONFIG_USB_APPLEDISPLAY is not set
--# CONFIG_USB_LD is not set
--CONFIG_USB_TRANCEVIBRATOR=m
--CONFIG_USB_IOWARRIOR=m
--# CONFIG_USB_TEST is not set
--
--#
--# USB DSL modem support
--#
--
--#
--# USB Gadget Support
--#
--CONFIG_USB_GADGET=y
--# CONFIG_USB_GADGET_DEBUG is not set
--# CONFIG_USB_GADGET_DEBUG_FILES is not set
--CONFIG_USB_GADGET_SELECTED=y
--# CONFIG_USB_GADGET_AMD5536UDC is not set
--# CONFIG_USB_GADGET_ATMEL_USBA is not set
--# CONFIG_USB_GADGET_FSL_USB2 is not set
--# CONFIG_USB_GADGET_NET2280 is not set
--# CONFIG_USB_GADGET_PXA2XX is not set
--# CONFIG_USB_GADGET_M66592 is not set
--# CONFIG_USB_GADGET_GOKU is not set
--# CONFIG_USB_GADGET_LH7A40X is not set
--# CONFIG_USB_GADGET_OMAP is not set
--CONFIG_USB_GADGET_S3C2410=y
--CONFIG_USB_S3C2410=y
--# CONFIG_USB_S3C2410_DEBUG is not set
--# CONFIG_USB_GADGET_AT91 is not set
--# CONFIG_USB_GADGET_DUMMY_HCD is not set
--# CONFIG_USB_GADGET_DUALSPEED is not set
--# CONFIG_USB_ZERO is not set
--CONFIG_USB_ETH=m
--CONFIG_USB_ETH_RNDIS=m
--CONFIG_USB_GADGETFS=m
--CONFIG_USB_FILE_STORAGE=m
--CONFIG_USB_G_SERIAL=m
--CONFIG_USB_MIDI_GADGET=m
--
--#
--# SDIO support
--#
--CONFIG_SDIO=y
--CONFIG_SDIO_S3C24XX=y
--CONFIG_SDIO_S3C24XX_DMA=y
--CONFIG_SDIO_AR6000_WLAN=y
--CONFIG_MMC=y
--# CONFIG_MMC_DEBUG is not set
--CONFIG_MMC_UNSAFE_RESUME=y
--
--#
--# MMC/SD Card Drivers
--#
--CONFIG_MMC_BLOCK=y
--CONFIG_MMC_BLOCK_BOUNCE=y
--# CONFIG_SDIO_UART is not set
--
--#
--# MMC/SD Host Controller Drivers
--#
--# CONFIG_MMC_SPI is not set
--CONFIG_MMC_S3C=y
--CONFIG_NEW_LEDS=y
--CONFIG_LEDS_CLASS=y
--
--#
--# LED drivers
--#
--CONFIG_LEDS_S3C24XX=m
--# CONFIG_LEDS_GPIO is not set
--CONFIG_LEDS_NEO1973_VIBRATOR=y
--CONFIG_LEDS_NEO1973_GTA02=y
--
--#
--# LED Triggers
--#
--CONFIG_LEDS_TRIGGERS=y
--CONFIG_LEDS_TRIGGER_TIMER=y
--# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--CONFIG_RTC_DEBUG=y
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--# CONFIG_RTC_DRV_DS1307 is not set
--# CONFIG_RTC_DRV_DS1374 is not set
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--
--#
--# SPI RTC drivers
--#
--# CONFIG_RTC_DRV_RS5C348 is not set
--# CONFIG_RTC_DRV_MAX6902 is not set
--
--#
--# Platform RTC drivers
--#
--# CONFIG_RTC_DRV_CMOS is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--CONFIG_RTC_DRV_S3C=m
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--# CONFIG_EXT3_FS_XATTR is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--CONFIG_FS_POSIX_ACL=y
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--# CONFIG_MINIX_FS is not set
--CONFIG_ROMFS_FS=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--CONFIG_DNOTIFY=y
--# CONFIG_AUTOFS_FS is not set
--CONFIG_AUTOFS4_FS=m
--CONFIG_FUSE_FS=m
--
--#
--# CD-ROM/DVD Filesystems
--#
--CONFIG_ISO9660_FS=m
--CONFIG_JOLIET=y
--# CONFIG_ZISOFS is not set
--CONFIG_UDF_FS=m
--
--#
--# DOS/FAT/NT Filesystems
--#
--CONFIG_FAT_FS=y
--CONFIG_MSDOS_FS=y
--CONFIG_VFAT_FS=y
--CONFIG_FAT_DEFAULT_CODEPAGE=437
--CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--CONFIG_CONFIGFS_FS=m
--
--#
--# 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_YAFFS_FS=y
--CONFIG_YAFFS_YAFFS1=y
--CONFIG_YAFFS_9BYTE_TAGS=y
--CONFIG_YAFFS_YAFFS2=y
--CONFIG_YAFFS_AUTO_YAFFS2=y
--# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
--CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
--# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
--# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
--CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
--CONFIG_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--CONFIG_JFFS2_SUMMARY=y
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--CONFIG_CRAMFS=y
--# 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
--CONFIG_NETWORK_FILESYSTEMS=y
--CONFIG_NFS_FS=y
--CONFIG_NFS_V3=y
--# CONFIG_NFS_V3_ACL is not set
--CONFIG_NFS_V4=y
--# CONFIG_NFS_DIRECTIO is not set
--CONFIG_NFSD=m
--CONFIG_NFSD_V3=y
--# CONFIG_NFSD_V3_ACL is not set
--CONFIG_NFSD_V4=y
--CONFIG_NFSD_TCP=y
--CONFIG_ROOT_NFS=y
--CONFIG_LOCKD=y
--CONFIG_LOCKD_V4=y
--CONFIG_EXPORTFS=m
--CONFIG_NFS_COMMON=y
--CONFIG_SUNRPC=y
--CONFIG_SUNRPC_GSS=y
--# CONFIG_SUNRPC_BIND34 is not set
--CONFIG_RPCSEC_GSS_KRB5=y
--# CONFIG_RPCSEC_GSS_SPKM3 is not set
--# CONFIG_SMB_FS is not set
--CONFIG_CIFS=m
--# CONFIG_CIFS_STATS is not set
--CONFIG_CIFS_WEAK_PW_HASH=y
--# CONFIG_CIFS_XATTR is not set
--# CONFIG_CIFS_DEBUG2 is not set
--# CONFIG_CIFS_EXPERIMENTAL 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
--CONFIG_NLS=y
--CONFIG_NLS_DEFAULT="iso8859-1"
--CONFIG_NLS_CODEPAGE_437=y
--# CONFIG_NLS_CODEPAGE_737 is not set
--# CONFIG_NLS_CODEPAGE_775 is not set
--CONFIG_NLS_CODEPAGE_850=m
--# 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=m
--CONFIG_NLS_CODEPAGE_950=m
--# 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=y
--# 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=m
--# CONFIG_DLM is not set
--CONFIG_INSTRUMENTATION=y
--# CONFIG_PROFILING is not set
--# CONFIG_MARKERS is not set
--
--#
--# Kernel hacking
--#
--# CONFIG_PRINTK_TIME is not set
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--# CONFIG_DEBUG_SHIRQ is not set
--CONFIG_DETECT_SOFTLOCKUP=y
--# CONFIG_SCHED_DEBUG is not set
--# CONFIG_SCHEDSTATS is not set
--CONFIG_TIMER_STATS=y
--# CONFIG_DEBUG_SLAB is not set
--CONFIG_DEBUG_PREEMPT=y
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--# CONFIG_DEBUG_SPINLOCK is not set
--# CONFIG_DEBUG_MUTEXES is not set
--# CONFIG_DEBUG_LOCK_ALLOC is not set
--# CONFIG_PROVE_LOCKING is not set
--# CONFIG_LOCK_STAT is not set
--# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--# CONFIG_DEBUG_KOBJECT is not set
--CONFIG_DEBUG_BUGVERBOSE=y
--CONFIG_DEBUG_INFO=y
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--# CONFIG_DEBUG_SG is not set
--CONFIG_FRAME_POINTER=y
--CONFIG_FORCED_INLINING=y
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_USER is not set
--CONFIG_DEBUG_ERRORS=y
--CONFIG_DEBUG_LL=y
--# CONFIG_DEBUG_ICEDCC is not set
--CONFIG_DEBUG_S3C_PORT=y
--CONFIG_DEBUG_S3C_UART=0
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--CONFIG_CRYPTO_HASH=y
--CONFIG_CRYPTO_MANAGER=y
--CONFIG_CRYPTO_HMAC=y
--CONFIG_CRYPTO_XCBC=m
--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_WP512=m
--CONFIG_CRYPTO_TGR192=m
--CONFIG_CRYPTO_GF128MUL=m
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--CONFIG_CRYPTO_LRW=m
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--CONFIG_CRYPTO_FCRYPT=m
--CONFIG_CRYPTO_BLOWFISH=m
--CONFIG_CRYPTO_TWOFISH=m
--CONFIG_CRYPTO_TWOFISH_COMMON=m
--CONFIG_CRYPTO_SERPENT=m
--CONFIG_CRYPTO_AES=m
--CONFIG_CRYPTO_CAST5=m
--CONFIG_CRYPTO_CAST6=m
--CONFIG_CRYPTO_TEA=m
--CONFIG_CRYPTO_ARC4=m
--CONFIG_CRYPTO_KHAZAD=m
--CONFIG_CRYPTO_ANUBIS=m
--# CONFIG_CRYPTO_SEED is not set
--CONFIG_CRYPTO_DEFLATE=m
--CONFIG_CRYPTO_MICHAEL_MIC=m
--CONFIG_CRYPTO_CRC32C=m
--CONFIG_CRYPTO_CAMELLIA=m
--CONFIG_CRYPTO_TEST=m
--# CONFIG_CRYPTO_AUTHENC is not set
--CONFIG_CRYPTO_HW=y
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--CONFIG_CRC_CCITT=m
--CONFIG_CRC16=m
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--CONFIG_LIBCRC32C=m
--CONFIG_ZLIB_INFLATE=y
--CONFIG_ZLIB_DEFLATE=y
--CONFIG_TEXTSEARCH=y
--CONFIG_TEXTSEARCH_KMP=m
--CONFIG_TEXTSEARCH_BM=m
--CONFIG_TEXTSEARCH_FSM=m
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_DMA=y
-diff --git a/arch/arm/gta02-moredrivers-defconfig b/arch/arm/gta02-moredrivers-defconfig
-deleted file mode 100644
-index 7273973..0000000
---- a/arch/arm/gta02-moredrivers-defconfig
-+++ /dev/null
-@@ -1,1830 +0,0 @@
--#
--# Automatically generated make config: don't edit
--# Linux kernel version: 2.6.24
--# Sat Mar  1 11:36:29 2008
--#
--CONFIG_ARM=y
--CONFIG_SYS_SUPPORTS_APM_EMULATION=y
--CONFIG_GENERIC_GPIO=y
--# CONFIG_GENERIC_TIME is not set
--# CONFIG_GENERIC_CLOCKEVENTS is not set
--CONFIG_MMU=y
--CONFIG_NO_IOPORT=y
--CONFIG_GENERIC_HARDIRQS=y
--CONFIG_STACKTRACE_SUPPORT=y
--CONFIG_LOCKDEP_SUPPORT=y
--CONFIG_TRACE_IRQFLAGS_SUPPORT=y
--CONFIG_HARDIRQS_SW_RESEND=y
--CONFIG_GENERIC_IRQ_PROBE=y
--CONFIG_RWSEM_GENERIC_SPINLOCK=y
--# CONFIG_ARCH_HAS_ILOG2_U32 is not set
--# CONFIG_ARCH_HAS_ILOG2_U64 is not set
--CONFIG_GENERIC_HWEIGHT=y
--CONFIG_GENERIC_CALIBRATE_DELAY=y
--CONFIG_ZONE_DMA=y
--CONFIG_FIQ=y
--CONFIG_VECTORS_BASE=0xffff0000
--CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
--
--#
--# General setup
--#
--CONFIG_EXPERIMENTAL=y
--CONFIG_BROKEN_ON_SMP=y
--CONFIG_LOCK_KERNEL=y
--CONFIG_INIT_ENV_ARG_LIMIT=32
--CONFIG_LOCALVERSION="-mokodev"
--# CONFIG_LOCALVERSION_AUTO is not set
--CONFIG_SWAP=y
--CONFIG_SYSVIPC=y
--CONFIG_SYSVIPC_SYSCTL=y
--# CONFIG_POSIX_MQUEUE is not set
--# CONFIG_BSD_PROCESS_ACCT is not set
--# CONFIG_TASKSTATS is not set
--# CONFIG_USER_NS is not set
--# CONFIG_PID_NS is not set
--# CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=16
--# CONFIG_CGROUPS is not set
--CONFIG_FAIR_GROUP_SCHED=y
--CONFIG_FAIR_USER_SCHED=y
--# CONFIG_FAIR_CGROUP_SCHED is not set
--# CONFIG_SYSFS_DEPRECATED is not set
--# CONFIG_RELAY is not set
--CONFIG_BLK_DEV_INITRD=y
--CONFIG_INITRAMFS_SOURCE=""
--CONFIG_CC_OPTIMIZE_FOR_SIZE=y
--CONFIG_SYSCTL=y
--# CONFIG_EMBEDDED is not set
--CONFIG_UID16=y
--CONFIG_SYSCTL_SYSCALL=y
--CONFIG_KALLSYMS=y
--CONFIG_KALLSYMS_ALL=y
--# CONFIG_KALLSYMS_EXTRA_PASS is not set
--CONFIG_HOTPLUG=y
--CONFIG_PRINTK=y
--CONFIG_BUG=y
--CONFIG_ELF_CORE=y
--CONFIG_BASE_FULL=y
--CONFIG_FUTEX=y
--CONFIG_ANON_INODES=y
--CONFIG_EPOLL=y
--CONFIG_SIGNALFD=y
--CONFIG_EVENTFD=y
--CONFIG_SHMEM=y
--CONFIG_VM_EVENT_COUNTERS=y
--CONFIG_SLAB=y
--# CONFIG_SLUB is not set
--# CONFIG_SLOB is not set
--CONFIG_SLABINFO=y
--CONFIG_RT_MUTEXES=y
--# CONFIG_TINY_SHMEM is not set
--CONFIG_BASE_SMALL=0
--CONFIG_MODULES=y
--CONFIG_MODULE_UNLOAD=y
--CONFIG_MODULE_FORCE_UNLOAD=y
--# CONFIG_MODVERSIONS is not set
--# CONFIG_MODULE_SRCVERSION_ALL is not set
--CONFIG_KMOD=y
--CONFIG_BLOCK=y
--# CONFIG_LBD is not set
--# CONFIG_BLK_DEV_IO_TRACE is not set
--# CONFIG_LSF is not set
--# CONFIG_BLK_DEV_BSG is not set
--
--#
--# IO Schedulers
--#
--CONFIG_IOSCHED_NOOP=y
--CONFIG_IOSCHED_AS=m
--CONFIG_IOSCHED_DEADLINE=y
--CONFIG_IOSCHED_CFQ=m
--# CONFIG_DEFAULT_AS is not set
--CONFIG_DEFAULT_DEADLINE=y
--# CONFIG_DEFAULT_CFQ is not set
--# CONFIG_DEFAULT_NOOP is not set
--CONFIG_DEFAULT_IOSCHED="deadline"
--
--#
--# System Type
--#
--# CONFIG_ARCH_AAEC2000 is not set
--# CONFIG_ARCH_INTEGRATOR is not set
--# CONFIG_ARCH_REALVIEW is not set
--# CONFIG_ARCH_VERSATILE is not set
--# CONFIG_ARCH_AT91 is not set
--# CONFIG_ARCH_CLPS7500 is not set
--# CONFIG_ARCH_CLPS711X is not set
--# CONFIG_ARCH_CO285 is not set
--# CONFIG_ARCH_EBSA110 is not set
--# CONFIG_ARCH_EP93XX is not set
--# CONFIG_ARCH_FOOTBRIDGE is not set
--# CONFIG_ARCH_NETX is not set
--# CONFIG_ARCH_H720X is not set
--# CONFIG_ARCH_IMX is not set
--# CONFIG_ARCH_IOP13XX is not set
--# CONFIG_ARCH_IOP32X is not set
--# CONFIG_ARCH_IOP33X is not set
--# CONFIG_ARCH_IXP23XX is not set
--# CONFIG_ARCH_IXP2000 is not set
--# CONFIG_ARCH_IXP4XX is not set
--# CONFIG_ARCH_L7200 is not set
--# CONFIG_ARCH_KS8695 is not set
--# CONFIG_ARCH_NS9XXX is not set
--# CONFIG_ARCH_MXC is not set
--# CONFIG_ARCH_PNX4008 is not set
--# CONFIG_ARCH_PXA is not set
--# CONFIG_ARCH_RPC is not set
--# CONFIG_ARCH_SA1100 is not set
--CONFIG_ARCH_S3C2410=y
--# CONFIG_ARCH_SHARK is not set
--# CONFIG_ARCH_LH7A40X is not set
--# CONFIG_ARCH_DAVINCI is not set
--# CONFIG_ARCH_OMAP is not set
--CONFIG_PLAT_S3C24XX=y
--CONFIG_CPU_S3C244X=y
--CONFIG_S3C2410_DMA=y
--# CONFIG_S3C2410_DMA_DEBUG is not set
--CONFIG_MACH_SMDK=y
--CONFIG_MACH_NEO1973=y
--CONFIG_PLAT_S3C=y
--CONFIG_CPU_LLSERIAL_S3C2410=y
--CONFIG_CPU_LLSERIAL_S3C2440=y
--
--#
--# Boot options
--#
--# CONFIG_S3C_BOOT_WATCHDOG is not set
--# CONFIG_S3C_BOOT_ERROR_RESET is not set
--
--#
--# Power management
--#
--# CONFIG_S3C2410_PM_DEBUG is not set
--# CONFIG_S3C2410_PM_CHECK is not set
--CONFIG_S3C_LOWLEVEL_UART_PORT=2
--
--#
--# S3C2400 Machines
--#
--CONFIG_CPU_S3C2410=y
--CONFIG_CPU_S3C2410_DMA=y
--CONFIG_S3C2410_PM=y
--CONFIG_S3C2410_GPIO=y
--CONFIG_S3C2410_CLOCK=y
--CONFIG_S3C2410_PWM=y
--
--#
--# S3C2410 Machines
--#
--# CONFIG_ARCH_SMDK2410 is not set
--# CONFIG_ARCH_H1940 is not set
--# CONFIG_MACH_N30 is not set
--# CONFIG_ARCH_BAST is not set
--# CONFIG_MACH_OTOM is not set
--# CONFIG_MACH_AML_M5900 is not set
--# CONFIG_MACH_VR1000 is not set
--CONFIG_MACH_QT2410=y
--CONFIG_MACH_NEO1973_GTA01=y
--
--#
--# S3C2412 Machines
--#
--# CONFIG_MACH_SMDK2413 is not set
--# CONFIG_MACH_SMDK2412 is not set
--# CONFIG_MACH_VSTMS is not set
--CONFIG_CPU_S3C2440=y
--CONFIG_S3C2440_DMA=y
--CONFIG_S3C2440_C_FIQ=y
--
--#
--# S3C2440 Machines
--#
--# CONFIG_MACH_ANUBIS is not set
--# CONFIG_MACH_OSIRIS is not set
--# CONFIG_MACH_RX3715 is not set
--CONFIG_ARCH_S3C2440=y
--# CONFIG_MACH_NEXCODER_2440 is not set
--CONFIG_SMDK2440_CPU2440=y
--CONFIG_MACH_HXD8=y
--CONFIG_MACH_NEO1973_GTA02=y
--# CONFIG_NEO1973_GTA02_2440 is not set
--CONFIG_CPU_S3C2442=y
--
--#
--# S3C2442 Machines
--#
--CONFIG_SMDK2440_CPU2442=y
--
--#
--# S3C2443 Machines
--#
--# CONFIG_MACH_SMDK2443 is not set
--
--#
--# Processor Type
--#
--CONFIG_CPU_32=y
--CONFIG_CPU_ARM920T=y
--CONFIG_CPU_32v4T=y
--CONFIG_CPU_ABRT_EV4T=y
--CONFIG_CPU_CACHE_V4WT=y
--CONFIG_CPU_CACHE_VIVT=y
--CONFIG_CPU_COPY_V4WB=y
--CONFIG_CPU_TLB_V4WBI=y
--CONFIG_CPU_CP15=y
--CONFIG_CPU_CP15_MMU=y
--
--#
--# Processor Features
--#
--CONFIG_ARM_THUMB=y
--# CONFIG_CPU_ICACHE_DISABLE is not set
--# CONFIG_CPU_DCACHE_DISABLE is not set
--# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
--# CONFIG_OUTER_CACHE is not set
--
--#
--# Bus support
--#
--# CONFIG_PCI_SYSCALL is not set
--# CONFIG_ARCH_SUPPORTS_MSI is not set
--# CONFIG_PCCARD is not set
--
--#
--# Kernel Features
--#
--# CONFIG_TICK_ONESHOT is not set
--CONFIG_PREEMPT=y
--CONFIG_NO_IDLE_HZ=y
--CONFIG_HZ=200
--CONFIG_AEABI=y
--CONFIG_OABI_COMPAT=y
--# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
--CONFIG_SELECT_MEMORY_MODEL=y
--CONFIG_FLATMEM_MANUAL=y
--# CONFIG_DISCONTIGMEM_MANUAL is not set
--# CONFIG_SPARSEMEM_MANUAL is not set
--CONFIG_FLATMEM=y
--CONFIG_FLAT_NODE_MEM_MAP=y
--# CONFIG_SPARSEMEM_STATIC is not set
--# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
--CONFIG_SPLIT_PTLOCK_CPUS=4096
--# CONFIG_RESOURCES_64BIT is not set
--CONFIG_ZONE_DMA_FLAG=1
--CONFIG_BOUNCE=y
--CONFIG_VIRT_TO_BUS=y
--CONFIG_ALIGNMENT_TRAP=y
--
--#
--# Boot options
--#
--CONFIG_ZBOOT_ROM_TEXT=0x0
--CONFIG_ZBOOT_ROM_BSS=0x0
--CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
--# CONFIG_XIP_KERNEL is not set
--CONFIG_KEXEC=y
--CONFIG_ATAGS_PROC=y
--
--#
--# Floating point emulation
--#
--
--#
--# At least one emulation must be selected
--#
--CONFIG_FPE_NWFPE=y
--# CONFIG_FPE_NWFPE_XP is not set
--# CONFIG_FPE_FASTFPE is not set
--
--#
--# Userspace binary formats
--#
--CONFIG_BINFMT_ELF=y
--# CONFIG_BINFMT_AOUT is not set
--# CONFIG_BINFMT_MISC is not set
--
--#
--# Power management options
--#
--CONFIG_PM=y
--CONFIG_PM_LEGACY=y
--CONFIG_PM_DEBUG=y
--CONFIG_PM_VERBOSE=y
--CONFIG_PM_SLEEP=y
--CONFIG_SUSPEND_UP_POSSIBLE=y
--CONFIG_SUSPEND=y
--CONFIG_APM_EMULATION=y
--
--#
--# Networking
--#
--CONFIG_NET=y
--
--#
--# Networking options
--#
--CONFIG_PACKET=y
--CONFIG_PACKET_MMAP=y
--CONFIG_UNIX=y
--CONFIG_XFRM=y
--# CONFIG_XFRM_USER is not set
--# CONFIG_XFRM_SUB_POLICY is not set
--CONFIG_XFRM_MIGRATE=y
--CONFIG_NET_KEY=m
--CONFIG_NET_KEY_MIGRATE=y
--CONFIG_INET=y
--CONFIG_IP_MULTICAST=y
--CONFIG_IP_ADVANCED_ROUTER=y
--CONFIG_ASK_IP_FIB_HASH=y
--# CONFIG_IP_FIB_TRIE is not set
--CONFIG_IP_FIB_HASH=y
--CONFIG_IP_MULTIPLE_TABLES=y
--# CONFIG_IP_ROUTE_MULTIPATH is not set
--# CONFIG_IP_ROUTE_VERBOSE 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=m
--CONFIG_NET_IPGRE=m
--# CONFIG_NET_IPGRE_BROADCAST is not set
--# CONFIG_IP_MROUTE is not set
--# CONFIG_ARPD is not set
--CONFIG_SYN_COOKIES=y
--CONFIG_INET_AH=m
--CONFIG_INET_ESP=m
--CONFIG_INET_IPCOMP=m
--CONFIG_INET_XFRM_TUNNEL=m
--CONFIG_INET_TUNNEL=m
--CONFIG_INET_XFRM_MODE_TRANSPORT=m
--CONFIG_INET_XFRM_MODE_TUNNEL=m
--CONFIG_INET_XFRM_MODE_BEET=m
--# CONFIG_INET_LRO is not set
--CONFIG_INET_DIAG=y
--CONFIG_INET_TCP_DIAG=y
--# CONFIG_TCP_CONG_ADVANCED is not set
--CONFIG_TCP_CONG_CUBIC=y
--CONFIG_DEFAULT_TCP_CONG="cubic"
--CONFIG_TCP_MD5SIG=y
--# CONFIG_IP_VS is not set
--CONFIG_IPV6=m
--# CONFIG_IPV6_PRIVACY is not set
--# CONFIG_IPV6_ROUTER_PREF is not set
--# CONFIG_IPV6_OPTIMISTIC_DAD is not set
--CONFIG_INET6_AH=m
--CONFIG_INET6_ESP=m
--CONFIG_INET6_IPCOMP=m
--# CONFIG_IPV6_MIP6 is not set
--CONFIG_INET6_XFRM_TUNNEL=m
--CONFIG_INET6_TUNNEL=m
--CONFIG_INET6_XFRM_MODE_TRANSPORT=m
--CONFIG_INET6_XFRM_MODE_TUNNEL=m
--CONFIG_INET6_XFRM_MODE_BEET=m
--# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
--CONFIG_IPV6_SIT=m
--CONFIG_IPV6_TUNNEL=m
--# CONFIG_IPV6_MULTIPLE_TABLES is not set
--# CONFIG_NETWORK_SECMARK is not set
--CONFIG_NETFILTER=y
--# CONFIG_NETFILTER_DEBUG is not set
--CONFIG_BRIDGE_NETFILTER=y
--
--#
--# Core Netfilter Configuration
--#
--CONFIG_NETFILTER_NETLINK=m
--CONFIG_NETFILTER_NETLINK_QUEUE=m
--CONFIG_NETFILTER_NETLINK_LOG=m
--CONFIG_NF_CONNTRACK_ENABLED=m
--CONFIG_NF_CONNTRACK=m
--CONFIG_NF_CT_ACCT=y
--CONFIG_NF_CONNTRACK_MARK=y
--CONFIG_NF_CONNTRACK_EVENTS=y
--CONFIG_NF_CT_PROTO_GRE=m
--CONFIG_NF_CT_PROTO_SCTP=m
--# CONFIG_NF_CT_PROTO_UDPLITE is not set
--# CONFIG_NF_CONNTRACK_AMANDA is not set
--CONFIG_NF_CONNTRACK_FTP=m
--CONFIG_NF_CONNTRACK_H323=m
--CONFIG_NF_CONNTRACK_IRC=m
--CONFIG_NF_CONNTRACK_NETBIOS_NS=m
--CONFIG_NF_CONNTRACK_PPTP=m
--CONFIG_NF_CONNTRACK_SANE=m
--CONFIG_NF_CONNTRACK_SIP=m
--CONFIG_NF_CONNTRACK_TFTP=m
--CONFIG_NF_CT_NETLINK=m
--CONFIG_NETFILTER_XTABLES=m
--CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
--CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
--CONFIG_NETFILTER_XT_TARGET_DSCP=m
--CONFIG_NETFILTER_XT_TARGET_MARK=m
--CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
--CONFIG_NETFILTER_XT_TARGET_NFLOG=m
--CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
--# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
--CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
--# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
--CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
--CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
--CONFIG_NETFILTER_XT_MATCH_DCCP=m
--CONFIG_NETFILTER_XT_MATCH_DSCP=m
--CONFIG_NETFILTER_XT_MATCH_ESP=m
--CONFIG_NETFILTER_XT_MATCH_HELPER=m
--CONFIG_NETFILTER_XT_MATCH_LENGTH=m
--CONFIG_NETFILTER_XT_MATCH_LIMIT=m
--CONFIG_NETFILTER_XT_MATCH_MAC=m
--CONFIG_NETFILTER_XT_MATCH_MARK=m
--CONFIG_NETFILTER_XT_MATCH_POLICY=m
--CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
--CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
--CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
--CONFIG_NETFILTER_XT_MATCH_QUOTA=m
--CONFIG_NETFILTER_XT_MATCH_REALM=m
--CONFIG_NETFILTER_XT_MATCH_SCTP=m
--CONFIG_NETFILTER_XT_MATCH_STATE=m
--CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
--CONFIG_NETFILTER_XT_MATCH_STRING=m
--CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
--# CONFIG_NETFILTER_XT_MATCH_TIME is not set
--# CONFIG_NETFILTER_XT_MATCH_U32 is not set
--CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
--
--#
--# IP: Netfilter Configuration
--#
--CONFIG_NF_CONNTRACK_IPV4=m
--CONFIG_NF_CONNTRACK_PROC_COMPAT=y
--# CONFIG_IP_NF_QUEUE is not set
--CONFIG_IP_NF_IPTABLES=m
--CONFIG_IP_NF_MATCH_IPRANGE=m
--CONFIG_IP_NF_MATCH_TOS=m
--# CONFIG_IP_NF_MATCH_RECENT is not set
--CONFIG_IP_NF_MATCH_ECN=m
--CONFIG_IP_NF_MATCH_AH=m
--CONFIG_IP_NF_MATCH_TTL=m
--CONFIG_IP_NF_MATCH_OWNER=m
--CONFIG_IP_NF_MATCH_ADDRTYPE=m
--CONFIG_IP_NF_FILTER=m
--CONFIG_IP_NF_TARGET_REJECT=m
--CONFIG_IP_NF_TARGET_LOG=m
--CONFIG_IP_NF_TARGET_ULOG=m
--CONFIG_NF_NAT=m
--CONFIG_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_NF_NAT_SNMP_BASIC=m
--CONFIG_NF_NAT_PROTO_GRE=m
--CONFIG_NF_NAT_FTP=m
--CONFIG_NF_NAT_IRC=m
--CONFIG_NF_NAT_TFTP=m
--# CONFIG_NF_NAT_AMANDA is not set
--CONFIG_NF_NAT_PPTP=m
--CONFIG_NF_NAT_H323=m
--CONFIG_NF_NAT_SIP=m
--CONFIG_IP_NF_MANGLE=m
--CONFIG_IP_NF_TARGET_TOS=m
--CONFIG_IP_NF_TARGET_ECN=m
--CONFIG_IP_NF_TARGET_TTL=m
--CONFIG_IP_NF_TARGET_CLUSTERIP=m
--# CONFIG_IP_NF_RAW is not set
--# CONFIG_IP_NF_ARPTABLES is not set
--
--#
--# IPv6: Netfilter Configuration (EXPERIMENTAL)
--#
--CONFIG_NF_CONNTRACK_IPV6=m
--# CONFIG_IP6_NF_QUEUE is not set
--CONFIG_IP6_NF_IPTABLES=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_OWNER=m
--CONFIG_IP6_NF_MATCH_IPV6HEADER=m
--CONFIG_IP6_NF_MATCH_AH=m
--CONFIG_IP6_NF_MATCH_MH=m
--CONFIG_IP6_NF_MATCH_EUI64=m
--CONFIG_IP6_NF_FILTER=m
--CONFIG_IP6_NF_TARGET_LOG=m
--CONFIG_IP6_NF_TARGET_REJECT=m
--CONFIG_IP6_NF_MANGLE=m
--CONFIG_IP6_NF_TARGET_HL=m
--# CONFIG_IP6_NF_RAW is not set
--
--#
--# 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_BRIDGE_EBT_ULOG=m
--# CONFIG_IP_DCCP is not set
--# CONFIG_IP_SCTP is not set
--# CONFIG_TIPC is not set
--# CONFIG_ATM is not set
--CONFIG_BRIDGE=y
--# CONFIG_VLAN_8021Q is not set
--# CONFIG_DECNET is not set
--CONFIG_LLC=y
--# 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_ECONET is not set
--# CONFIG_WAN_ROUTER is not set
--CONFIG_NET_SCHED=y
--
--#
--# Queueing/Scheduling
--#
--CONFIG_NET_SCH_CBQ=m
--CONFIG_NET_SCH_HTB=m
--CONFIG_NET_SCH_HFSC=m
--CONFIG_NET_SCH_PRIO=m
--# CONFIG_NET_SCH_RR is not set
--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_NETEM=m
--CONFIG_NET_SCH_INGRESS=m
--
--#
--# Classification
--#
--CONFIG_NET_CLS=y
--CONFIG_NET_CLS_BASIC=m
--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_CLS_U32_PERF=y
--CONFIG_CLS_U32_MARK=y
--CONFIG_NET_CLS_RSVP=m
--CONFIG_NET_CLS_RSVP6=m
--# CONFIG_NET_EMATCH is not set
--# CONFIG_NET_CLS_ACT is not set
--# CONFIG_NET_CLS_POLICE is not set
--# CONFIG_NET_CLS_IND is not set
--CONFIG_NET_SCH_FIFO=y
--
--#
--# Network testing
--#
--# CONFIG_NET_PKTGEN is not set
--# CONFIG_HAMRADIO is not set
--# CONFIG_IRDA is not set
--CONFIG_BT=y
--CONFIG_BT_L2CAP=y
--CONFIG_BT_SCO=y
--CONFIG_BT_RFCOMM=y
--CONFIG_BT_RFCOMM_TTY=y
--CONFIG_BT_BNEP=y
--CONFIG_BT_BNEP_MC_FILTER=y
--CONFIG_BT_BNEP_PROTO_FILTER=y
--CONFIG_BT_HIDP=y
--
--#
--# Bluetooth device drivers
--#
--CONFIG_BT_HCIUSB=y
--CONFIG_BT_HCIUSB_SCO=y
--# CONFIG_BT_HCIBTSDIO is not set
--# CONFIG_BT_HCIUART is not set
--# CONFIG_BT_HCIBCM203X is not set
--# CONFIG_BT_HCIBPA10X is not set
--# CONFIG_BT_HCIBFUSB is not set
--# CONFIG_BT_HCIVHCI is not set
--# CONFIG_AF_RXRPC is not set
--CONFIG_FIB_RULES=y
--
--#
--# Wireless
--#
--# CONFIG_CFG80211 is not set
--CONFIG_WIRELESS_EXT=y
--# CONFIG_MAC80211 is not set
--# CONFIG_IEEE80211 is not set
--# CONFIG_RFKILL is not set
--# CONFIG_NET_9P is not set
--
--#
--# Device Drivers
--#
--
--#
--# Generic Driver Options
--#
--CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
--CONFIG_STANDALONE=y
--CONFIG_PREVENT_FIRMWARE_BUILD=y
--CONFIG_FW_LOADER=m
--# CONFIG_DEBUG_DRIVER is not set
--# CONFIG_DEBUG_DEVRES is not set
--# CONFIG_SYS_HYPERVISOR is not set
--CONFIG_CONNECTOR=m
--CONFIG_MTD=y
--# CONFIG_MTD_DEBUG is not set
--CONFIG_MTD_CONCAT=y
--CONFIG_MTD_PARTITIONS=y
--# CONFIG_MTD_REDBOOT_PARTS is not set
--CONFIG_MTD_CMDLINE_PARTS=y
--# CONFIG_MTD_AFS_PARTS is not set
--
--#
--# User Modules And Translation Layers
--#
--CONFIG_MTD_CHAR=y
--CONFIG_MTD_BLKDEVS=y
--CONFIG_MTD_BLOCK=y
--# CONFIG_FTL is not set
--# CONFIG_NFTL is not set
--# CONFIG_INFTL is not set
--# CONFIG_RFD_FTL is not set
--# CONFIG_SSFDC is not set
--# CONFIG_MTD_OOPS is not set
--
--#
--# RAM/ROM/Flash chip drivers
--#
--CONFIG_MTD_CFI=y
--# CONFIG_MTD_JEDECPROBE is not set
--CONFIG_MTD_GEN_PROBE=y
--# CONFIG_MTD_CFI_ADV_OPTIONS is not set
--CONFIG_MTD_MAP_BANK_WIDTH_1=y
--CONFIG_MTD_MAP_BANK_WIDTH_2=y
--CONFIG_MTD_MAP_BANK_WIDTH_4=y
--# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
--# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
--CONFIG_MTD_CFI_I1=y
--CONFIG_MTD_CFI_I2=y
--# CONFIG_MTD_CFI_I4 is not set
--# CONFIG_MTD_CFI_I8 is not set
--CONFIG_MTD_CFI_INTELEXT=y
--# CONFIG_MTD_CFI_AMDSTD is not set
--# CONFIG_MTD_CFI_STAA is not set
--CONFIG_MTD_CFI_UTIL=y
--# CONFIG_MTD_RAM is not set
--CONFIG_MTD_ROM=y
--CONFIG_MTD_ABSENT=y
--
--#
--# Mapping drivers for chip access
--#
--# CONFIG_MTD_COMPLEX_MAPPINGS is not set
--CONFIG_MTD_PHYSMAP=y
--CONFIG_MTD_PHYSMAP_START=0x0
--CONFIG_MTD_PHYSMAP_LEN=0
--CONFIG_MTD_PHYSMAP_BANKWIDTH=2
--# CONFIG_MTD_ARM_INTEGRATOR is not set
--# CONFIG_MTD_PLATRAM is not set
--
--#
--# Self-contained MTD device drivers
--#
--# CONFIG_MTD_DATAFLASH is not set
--# CONFIG_MTD_M25P80 is not set
--# CONFIG_MTD_SLRAM is not set
--# CONFIG_MTD_PHRAM is not set
--# CONFIG_MTD_MTDRAM is not set
--# CONFIG_MTD_BLOCK2MTD is not set
--
--#
--# Disk-On-Chip Device Drivers
--#
--# CONFIG_MTD_DOC2000 is not set
--# CONFIG_MTD_DOC2001 is not set
--# CONFIG_MTD_DOC2001PLUS is not set
--CONFIG_MTD_NAND=y
--CONFIG_MTD_NAND_VERIFY_WRITE=y
--# CONFIG_MTD_NAND_ECC_SMC is not set
--# CONFIG_MTD_NAND_MUSEUM_IDS is not set
--CONFIG_MTD_NAND_IDS=y
--CONFIG_MTD_NAND_S3C2410=y
--# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
--CONFIG_MTD_NAND_S3C2410_HWECC=y
--# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
--# CONFIG_MTD_NAND_DISKONCHIP is not set
--# CONFIG_MTD_NAND_NANDSIM is not set
--# CONFIG_MTD_NAND_PLATFORM is not set
--# CONFIG_MTD_ALAUDA is not set
--# CONFIG_MTD_ONENAND is not set
--
--#
--# UBI - Unsorted block images
--#
--# CONFIG_MTD_UBI is not set
--# CONFIG_PARPORT is not set
--CONFIG_PNP=y
--CONFIG_PNP_DEBUG=y
--
--#
--# Protocols
--#
--# CONFIG_PNPACPI is not set
--CONFIG_BLK_DEV=y
--# CONFIG_BLK_DEV_COW_COMMON is not set
--CONFIG_BLK_DEV_LOOP=m
--# CONFIG_BLK_DEV_CRYPTOLOOP is not set
--# CONFIG_BLK_DEV_NBD is not set
--CONFIG_BLK_DEV_UB=m
--CONFIG_BLK_DEV_RAM=y
--CONFIG_BLK_DEV_RAM_COUNT=16
--CONFIG_BLK_DEV_RAM_SIZE=4096
--CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
--# CONFIG_CDROM_PKTCDVD is not set
--# CONFIG_ATA_OVER_ETH is not set
--CONFIG_MISC_DEVICES=y
--# CONFIG_EEPROM_93CX6 is not set
--# CONFIG_IDE is not set
--
--#
--# SCSI device support
--#
--# CONFIG_RAID_ATTRS is not set
--CONFIG_SCSI=m
--CONFIG_SCSI_DMA=y
--# CONFIG_SCSI_TGT is not set
--# CONFIG_SCSI_NETLINK is not set
--CONFIG_SCSI_PROC_FS=y
--
--#
--# SCSI support type (disk, tape, CD-ROM)
--#
--CONFIG_BLK_DEV_SD=m
--# CONFIG_CHR_DEV_ST is not set
--# CONFIG_CHR_DEV_OSST is not set
--CONFIG_BLK_DEV_SR=m
--# CONFIG_BLK_DEV_SR_VENDOR is not set
--CONFIG_CHR_DEV_SG=m
--# CONFIG_CHR_DEV_SCH is not set
--
--#
--# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
--#
--# CONFIG_SCSI_MULTI_LUN is not set
--# CONFIG_SCSI_CONSTANTS is not set
--# CONFIG_SCSI_LOGGING is not set
--CONFIG_SCSI_SCAN_ASYNC=y
--CONFIG_SCSI_WAIT_SCAN=m
--
--#
--# SCSI Transports
--#
--# CONFIG_SCSI_SPI_ATTRS is not set
--# CONFIG_SCSI_FC_ATTRS is not set
--# CONFIG_SCSI_ISCSI_ATTRS is not set
--# CONFIG_SCSI_SAS_LIBSAS is not set
--# CONFIG_SCSI_SRP_ATTRS is not set
--CONFIG_SCSI_LOWLEVEL=y
--# CONFIG_ISCSI_TCP is not set
--# CONFIG_SCSI_DEBUG is not set
--# CONFIG_ATA is not set
--CONFIG_MD=y
--# CONFIG_BLK_DEV_MD is not set
--CONFIG_BLK_DEV_DM=m
--# CONFIG_DM_DEBUG is not set
--CONFIG_DM_CRYPT=m
--CONFIG_DM_SNAPSHOT=m
--# CONFIG_DM_MIRROR is not set
--# CONFIG_DM_ZERO is not set
--# CONFIG_DM_MULTIPATH is not set
--# CONFIG_DM_DELAY is not set
--# CONFIG_DM_UEVENT is not set
--CONFIG_NETDEVICES=y
--# CONFIG_NETDEVICES_MULTIQUEUE is not set
--# CONFIG_DUMMY is not set
--# CONFIG_BONDING is not set
--# CONFIG_MACVLAN is not set
--# CONFIG_EQUALIZER is not set
--CONFIG_TUN=m
--# CONFIG_VETH is not set
--# CONFIG_NET_SB1000 is not set
--# CONFIG_PHYLIB is not set
--CONFIG_NET_ETHERNET=y
--CONFIG_MII=y
--# CONFIG_AX88796 is not set
--# CONFIG_SMC91X is not set
--# CONFIG_DM9000 is not set
--# CONFIG_IBM_NEW_EMAC_ZMII is not set
--# CONFIG_IBM_NEW_EMAC_RGMII is not set
--# CONFIG_IBM_NEW_EMAC_TAH is not set
--# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
--CONFIG_NET_PCI=y
--# CONFIG_B44 is not set
--CONFIG_CS89x0=m
--# CONFIG_NETDEV_1000 is not set
--# CONFIG_NETDEV_10000 is not set
--
--#
--# Wireless LAN
--#
--# CONFIG_WLAN_PRE80211 is not set
--# CONFIG_WLAN_80211 is not set
--
--#
--# USB Network Adapters
--#
--CONFIG_USB_CATC=m
--CONFIG_USB_KAWETH=m
--CONFIG_USB_PEGASUS=m
--CONFIG_USB_RTL8150=m
--CONFIG_USB_USBNET=y
--CONFIG_USB_NET_AX8817X=m
--CONFIG_USB_NET_CDCETHER=m
--CONFIG_USB_NET_DM9601=m
--CONFIG_USB_NET_GL620A=m
--CONFIG_USB_NET_NET1080=m
--CONFIG_USB_NET_PLUSB=m
--CONFIG_USB_NET_MCS7830=m
--CONFIG_USB_NET_RNDIS_HOST=m
--CONFIG_USB_NET_CDC_SUBSET=m
--CONFIG_USB_ALI_M5632=y
--CONFIG_USB_AN2720=y
--CONFIG_USB_BELKIN=y
--CONFIG_USB_ARMLINUX=y
--CONFIG_USB_EPSON2888=y
--CONFIG_USB_KC2190=y
--CONFIG_USB_NET_ZAURUS=m
--# CONFIG_WAN is not set
--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=m
--CONFIG_PPP_MPPE=m
--# CONFIG_PPPOE is not set
--# CONFIG_PPPOL2TP is not set
--# CONFIG_SLIP is not set
--CONFIG_SLHC=m
--# CONFIG_SHAPER is not set
--# CONFIG_NETCONSOLE is not set
--# CONFIG_NETPOLL is not set
--# CONFIG_NET_POLL_CONTROLLER is not set
--# CONFIG_ISDN is not set
--
--#
--# Input device support
--#
--CONFIG_INPUT=y
--# CONFIG_INPUT_FF_MEMLESS is not set
--# CONFIG_INPUT_POLLDEV is not set
--
--#
--# Userland interfaces
--#
--CONFIG_INPUT_MOUSEDEV=y
--# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
--CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
--CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
--# CONFIG_INPUT_JOYDEV is not set
--CONFIG_INPUT_EVDEV=y
--# CONFIG_INPUT_EVBUG is not set
--
--#
--# Input Device Drivers
--#
--CONFIG_INPUT_KEYBOARD=y
--# CONFIG_KEYBOARD_ATKBD is not set
--# 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_KEYBOARD_STOWAWAY=m
--CONFIG_KEYBOARD_GPIO=m
--CONFIG_KEYBOARD_NEO1973=y
--CONFIG_KEYBOARD_QT2410=y
--CONFIG_INPUT_MOUSE=y
--# CONFIG_MOUSE_PS2 is not set
--# CONFIG_MOUSE_SERIAL is not set
--# CONFIG_MOUSE_APPLETOUCH is not set
--# CONFIG_MOUSE_VSXXXAA is not set
--# CONFIG_MOUSE_GPIO is not set
--# CONFIG_INPUT_JOYSTICK is not set
--# CONFIG_INPUT_TABLET is not set
--CONFIG_INPUT_TOUCHSCREEN=y
--# CONFIG_TOUCHSCREEN_ADS7846 is not set
--# CONFIG_TOUCHSCREEN_FUJITSU is not set
--CONFIG_TOUCHSCREEN_S3C2410=y
--# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
--# CONFIG_TOUCHSCREEN_GUNZE is not set
--# CONFIG_TOUCHSCREEN_ELO is not set
--# CONFIG_TOUCHSCREEN_MTOUCH is not set
--# CONFIG_TOUCHSCREEN_MK712 is not set
--# CONFIG_TOUCHSCREEN_PENMOUNT is not set
--# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
--# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
--# CONFIG_TOUCHSCREEN_UCB1400 is not set
--# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
--CONFIG_INPUT_MISC=y
--# CONFIG_INPUT_ATI_REMOTE is not set
--# CONFIG_INPUT_ATI_REMOTE2 is not set
--# CONFIG_INPUT_KEYSPAN_REMOTE is not set
--# CONFIG_INPUT_POWERMATE is not set
--# CONFIG_INPUT_YEALINK is not set
--CONFIG_INPUT_UINPUT=m
--CONFIG_INPUT_LIS302DL=y
--
--#
--# Hardware I/O ports
--#
--CONFIG_SERIO=y
--# CONFIG_SERIO_SERPORT is not set
--# CONFIG_SERIO_RAW is not set
--# CONFIG_GAMEPORT is not set
--
--#
--# Character devices
--#
--CONFIG_VT=y
--CONFIG_VT_CONSOLE=y
--CONFIG_NR_TTY_DEVICES=4
--CONFIG_HW_CONSOLE=y
--CONFIG_VT_HW_CONSOLE_BINDING=y
--# CONFIG_SERIAL_NONSTANDARD is not set
--
--#
--# Serial drivers
--#
--# CONFIG_SERIAL_8250 is not set
--
--#
--# Non-8250 serial port support
--#
--CONFIG_SERIAL_S3C2410=y
--CONFIG_SERIAL_S3C2410_CONSOLE=y
--CONFIG_SERIAL_CORE=y
--CONFIG_SERIAL_CORE_CONSOLE=y
--CONFIG_UNIX98_PTYS=y
--# CONFIG_LEGACY_PTYS is not set
--# CONFIG_IPMI_HANDLER is not set
--# CONFIG_HW_RANDOM is not set
--# CONFIG_NVRAM is not set
--# CONFIG_R3964 is not set
--# CONFIG_RAW_DRIVER is not set
--# CONFIG_TCG_TPM is not set
--CONFIG_I2C=y
--CONFIG_I2C_BOARDINFO=y
--CONFIG_I2C_CHARDEV=y
--
--#
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
--# I2C Hardware Bus support
--#
--# CONFIG_I2C_GPIO is not set
--# CONFIG_I2C_OCORES is not set
--# CONFIG_I2C_PARPORT_LIGHT is not set
--CONFIG_I2C_S3C2410=y
--# CONFIG_I2C_SIMTEC is not set
--# CONFIG_I2C_TAOS_EVM is not set
--# CONFIG_I2C_STUB is not set
--# CONFIG_I2C_TINY_USB is not set
--
--#
--# Miscellaneous I2C Chip support
--#
--# CONFIG_SENSORS_DS1337 is not set
--# CONFIG_SENSORS_DS1374 is not set
--# CONFIG_DS1682 is not set
--# CONFIG_SENSORS_EEPROM is not set
--CONFIG_SENSORS_PCF50606=y
--CONFIG_SENSORS_PCF50633=y
--# CONFIG_SENSORS_PCF8574 is not set
--# CONFIG_SENSORS_PCA9539 is not set
--# CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_SENSORS_MAX6875 is not set
--# CONFIG_SENSORS_TSL2550 is not set
--CONFIG_SENSORS_TSL256X=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
--
--#
--# SPI support
--#
--CONFIG_SPI=y
--# CONFIG_SPI_DEBUG is not set
--CONFIG_SPI_MASTER=y
--
--#
--# SPI Master Controller Drivers
--#
--CONFIG_SPI_BITBANG=y
--# CONFIG_SPI_S3C24XX is not set
--CONFIG_SPI_S3C24XX_GPIO=y
--
--#
--# SPI Protocol Masters
--#
--# CONFIG_SPI_AT25 is not set
--# CONFIG_SPI_SPIDEV is not set
--# CONFIG_SPI_TLE62X0 is not set
--# CONFIG_W1 is not set
--CONFIG_POWER_SUPPLY=y
--CONFIG_POWER_SUPPLY_DEBUG=y
--CONFIG_PDA_POWER=y
--CONFIG_APM_POWER=y
--# CONFIG_BATTERY_DS2760 is not set
--CONFIG_BATTERY_BQ27000_HDQ=y
--CONFIG_GTA02_HDQ=y
--CONFIG_HWMON=y
--# CONFIG_HWMON_VID is not set
--# CONFIG_SENSORS_AD7418 is not set
--# CONFIG_SENSORS_ADM1021 is not set
--# CONFIG_SENSORS_ADM1025 is not set
--# CONFIG_SENSORS_ADM1026 is not set
--# CONFIG_SENSORS_ADM1029 is not set
--# CONFIG_SENSORS_ADM1031 is not set
--# CONFIG_SENSORS_ADM9240 is not set
--# CONFIG_SENSORS_ADT7470 is not set
--# CONFIG_SENSORS_ATXP1 is not set
--# CONFIG_SENSORS_DS1621 is not set
--# CONFIG_SENSORS_F71805F is not set
--# CONFIG_SENSORS_F71882FG is not set
--# CONFIG_SENSORS_F75375S is not set
--# CONFIG_SENSORS_GL518SM is not set
--# CONFIG_SENSORS_GL520SM is not set
--# CONFIG_SENSORS_IT87 is not set
--# CONFIG_SENSORS_LM63 is not set
--# CONFIG_SENSORS_LM70 is not set
--# CONFIG_SENSORS_LM75 is not set
--# CONFIG_SENSORS_LM77 is not set
--# CONFIG_SENSORS_LM78 is not set
--# CONFIG_SENSORS_LM80 is not set
--# CONFIG_SENSORS_LM83 is not set
--# CONFIG_SENSORS_LM85 is not set
--# CONFIG_SENSORS_LM87 is not set
--# CONFIG_SENSORS_LM90 is not set
--# CONFIG_SENSORS_LM92 is not set
--# CONFIG_SENSORS_LM93 is not set
--# CONFIG_SENSORS_MAX1619 is not set
--# CONFIG_SENSORS_MAX6650 is not set
--# CONFIG_SENSORS_PC87360 is not set
--# CONFIG_SENSORS_PC87427 is not set
--# CONFIG_SENSORS_DME1737 is not set
--# CONFIG_SENSORS_SMSC47M1 is not set
--# CONFIG_SENSORS_SMSC47M192 is not set
--# CONFIG_SENSORS_SMSC47B397 is not set
--# CONFIG_SENSORS_THMC50 is not set
--# CONFIG_SENSORS_VT1211 is not set
--# CONFIG_SENSORS_W83781D is not set
--# CONFIG_SENSORS_W83791D is not set
--# CONFIG_SENSORS_W83792D is not set
--# CONFIG_SENSORS_W83793 is not set
--# CONFIG_SENSORS_W83L785TS is not set
--# CONFIG_SENSORS_W83627HF is not set
--# CONFIG_SENSORS_W83627EHF is not set
--# CONFIG_HWMON_DEBUG_CHIP is not set
--CONFIG_WATCHDOG=y
--# CONFIG_WATCHDOG_NOWAYOUT is not set
--
--#
--# Watchdog Device Drivers
--#
--# CONFIG_SOFT_WATCHDOG is not set
--CONFIG_S3C2410_WATCHDOG=m
--
--#
--# USB-based Watchdog Cards
--#
--# CONFIG_USBPCWATCHDOG is not set
--
--#
--# Sonics Silicon Backplane
--#
--CONFIG_SSB_POSSIBLE=y
--# CONFIG_SSB is not set
--
--#
--# Multifunction device drivers
--#
--# CONFIG_MFD_SM501 is not set
--CONFIG_MFD_GLAMO=y
--CONFIG_MFD_GLAMO_FB=y
--CONFIG_MFD_GLAMO_SPI_GPIO=y
--CONFIG_MFD_GLAMO_SPI_FB=y
--CONFIG_MFD_GLAMO_MCI=y
--
--#
--# Multimedia devices
--#
--# CONFIG_VIDEO_DEV is not set
--# CONFIG_DVB_CORE is not set
--CONFIG_DAB=y
--# CONFIG_USB_DABUSB is not set
--
--#
--# Graphics support
--#
--# CONFIG_VGASTATE is not set
--CONFIG_VIDEO_OUTPUT_CONTROL=y
--CONFIG_FB=y
--# CONFIG_FIRMWARE_EDID is not set
--# CONFIG_FB_DDC is not set
--CONFIG_FB_CFB_FILLRECT=y
--CONFIG_FB_CFB_COPYAREA=y
--CONFIG_FB_CFB_IMAGEBLIT=y
--# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
--# CONFIG_FB_SYS_FILLRECT is not set
--# CONFIG_FB_SYS_COPYAREA is not set
--# CONFIG_FB_SYS_IMAGEBLIT is not set
--# CONFIG_FB_SYS_FOPS is not set
--CONFIG_FB_DEFERRED_IO=y
--# CONFIG_FB_SVGALIB is not set
--# CONFIG_FB_MACMODES is not set
--# CONFIG_FB_BACKLIGHT is not set
--# CONFIG_FB_MODE_HELPERS is not set
--# CONFIG_FB_TILEBLITTING is not set
--
--#
--# Frame buffer hardware drivers
--#
--# CONFIG_FB_UVESA is not set
--# CONFIG_FB_S1D13XXX is not set
--CONFIG_FB_S3C2410=y
--# CONFIG_FB_S3C2410_DEBUG is not set
--# CONFIG_FB_VIRTUAL is not set
--CONFIG_BACKLIGHT_LCD_SUPPORT=y
--CONFIG_LCD_CLASS_DEVICE=y
--CONFIG_LCD_LTV350QV=y
--CONFIG_BACKLIGHT_CLASS_DEVICE=y
--# CONFIG_BACKLIGHT_CORGI is not set
--CONFIG_BACKLIGHT_GTA01=y
--
--#
--# Display device support
--#
--CONFIG_DISPLAY_SUPPORT=y
--
--#
--# Display hardware drivers
--#
--CONFIG_DISPLAY_JBT6K74=y
--
--#
--# Console display driver support
--#
--# CONFIG_VGA_CONSOLE is not set
--CONFIG_DUMMY_CONSOLE=y
--CONFIG_FRAMEBUFFER_CONSOLE=y
--# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
--# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
--CONFIG_FONTS=y
--# CONFIG_FONT_8x8 is not set
--# CONFIG_FONT_8x16 is not set
--CONFIG_FONT_6x11=y
--# CONFIG_FONT_7x14 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
--# CONFIG_FONT_10x18 is not set
--# CONFIG_LOGO is not set
--
--#
--# Sound
--#
--CONFIG_SOUND=y
--
--#
--# Advanced Linux Sound Architecture
--#
--CONFIG_SND=y
--CONFIG_SND_TIMER=y
--CONFIG_SND_PCM=y
--CONFIG_SND_HWDEP=y
--CONFIG_SND_RAWMIDI=y
--# CONFIG_SND_SEQUENCER is not set
--CONFIG_SND_OSSEMUL=y
--CONFIG_SND_MIXER_OSS=y
--CONFIG_SND_PCM_OSS=y
--CONFIG_SND_PCM_OSS_PLUGINS=y
--# CONFIG_SND_DYNAMIC_MINORS is not set
--CONFIG_SND_SUPPORT_OLD_API=y
--CONFIG_SND_VERBOSE_PROCFS=y
--# 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
--
--#
--# ALSA ARM devices
--#
--
--#
--# SPI devices
--#
--
--#
--# USB devices
--#
--CONFIG_SND_USB_AUDIO=m
--# CONFIG_SND_USB_CAIAQ is not set
--
--#
--# System on Chip audio support
--#
--CONFIG_SND_SOC=y
--CONFIG_SND_S3C24XX_SOC=y
--CONFIG_SND_S3C24XX_SOC_I2S=y
--# CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753 is not set
--CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=y
--
--#
--# SoC Audio support for SuperH
--#
--CONFIG_SND_SOC_WM8753=y
--
--#
--# Open Sound System
--#
--# CONFIG_SOUND_PRIME is not set
--CONFIG_HID_SUPPORT=y
--CONFIG_HID=y
--# CONFIG_HID_DEBUG is not set
--# CONFIG_HIDRAW is not set
--
--#
--# USB Input Devices
--#
--CONFIG_USB_HID=y
--# CONFIG_USB_HIDINPUT_POWERBOOK is not set
--# CONFIG_HID_FF is not set
--# CONFIG_USB_HIDDEV is not set
--CONFIG_USB_SUPPORT=y
--CONFIG_USB_ARCH_HAS_HCD=y
--CONFIG_USB_ARCH_HAS_OHCI=y
--# CONFIG_USB_ARCH_HAS_EHCI is not set
--CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
--
--#
--# Miscellaneous USB options
--#
--CONFIG_USB_DEVICEFS=y
--CONFIG_USB_DEVICE_CLASS=y
--# CONFIG_USB_DYNAMIC_MINORS is not set
--CONFIG_USB_SUSPEND=y
--CONFIG_USB_PERSIST=y
--# CONFIG_USB_OTG is not set
--
--#
--# USB Host Controller Drivers
--#
--# CONFIG_USB_ISP116X_HCD is not set
--CONFIG_USB_OHCI_HCD=y
--# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
--# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
--CONFIG_USB_OHCI_LITTLE_ENDIAN=y
--# CONFIG_USB_SL811_HCD is not set
--# CONFIG_USB_R8A66597_HCD is not set
--
--#
--# USB Device Class drivers
--#
--CONFIG_USB_ACM=m
--CONFIG_USB_PRINTER=m
--
--#
--# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
--#
--
--#
--# may also be needed; see USB_STORAGE Help for more information
--#
--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 is not set
--CONFIG_USB_STORAGE_DPCM=y
--CONFIG_USB_STORAGE_USBAT=y
--CONFIG_USB_STORAGE_SDDR09=y
--CONFIG_USB_STORAGE_SDDR55=y
--CONFIG_USB_STORAGE_JUMPSHOT=y
--CONFIG_USB_STORAGE_ALAUDA=y
--CONFIG_USB_STORAGE_KARMA=y
--CONFIG_USB_LIBUSUAL=y
--
--#
--# USB Imaging devices
--#
--# CONFIG_USB_MDC800 is not set
--# CONFIG_USB_MICROTEK is not set
--CONFIG_USB_MON=y
--
--#
--# USB port drivers
--#
--
--#
--# USB Serial Converter support
--#
--CONFIG_USB_SERIAL=y
--CONFIG_USB_SERIAL_GENERIC=y
--CONFIG_USB_SERIAL_AIRCABLE=m
--CONFIG_USB_SERIAL_AIRPRIME=m
--CONFIG_USB_SERIAL_ARK3116=m
--CONFIG_USB_SERIAL_BELKIN=m
--# CONFIG_USB_SERIAL_CH341 is not set
--CONFIG_USB_SERIAL_WHITEHEAT=m
--CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
--CONFIG_USB_SERIAL_CP2101=m
--CONFIG_USB_SERIAL_CYPRESS_M8=m
--CONFIG_USB_SERIAL_EMPEG=m
--CONFIG_USB_SERIAL_FTDI_SIO=m
--CONFIG_USB_SERIAL_FUNSOFT=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_GARMIN=m
--CONFIG_USB_SERIAL_IPW=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_MOS7720=m
--CONFIG_USB_SERIAL_MOS7840=m
--CONFIG_USB_SERIAL_NAVMAN=m
--CONFIG_USB_SERIAL_PL2303=m
--# CONFIG_USB_SERIAL_OTI6858 is not set
--CONFIG_USB_SERIAL_HP4X=m
--CONFIG_USB_SERIAL_SAFE=m
--CONFIG_USB_SERIAL_SAFE_PADDED=y
--CONFIG_USB_SERIAL_SIERRAWIRELESS=m
--CONFIG_USB_SERIAL_TI=m
--CONFIG_USB_SERIAL_CYBERJACK=m
--CONFIG_USB_SERIAL_XIRCOM=m
--CONFIG_USB_SERIAL_OPTION=y
--CONFIG_USB_SERIAL_OMNINET=m
--# CONFIG_USB_SERIAL_DEBUG is not set
--CONFIG_USB_EZUSB=y
--
--#
--# USB Miscellaneous drivers
--#
--# CONFIG_USB_EMI62 is not set
--# CONFIG_USB_EMI26 is not set
--# CONFIG_USB_ADUTUX is not set
--# CONFIG_USB_AUERSWALD is not set
--# CONFIG_USB_RIO500 is not set
--# CONFIG_USB_LEGOTOWER is not set
--# CONFIG_USB_LCD is not set
--CONFIG_USB_BERRY_CHARGE=m
--# CONFIG_USB_LED is not set
--# CONFIG_USB_CYPRESS_CY7C63 is not set
--# CONFIG_USB_CYTHERM is not set
--# CONFIG_USB_PHIDGET is not set
--# CONFIG_USB_IDMOUSE is not set
--# CONFIG_USB_FTDI_ELAN is not set
--# CONFIG_USB_APPLEDISPLAY is not set
--# CONFIG_USB_LD is not set
--CONFIG_USB_TRANCEVIBRATOR=m
--CONFIG_USB_IOWARRIOR=m
--# CONFIG_USB_TEST is not set
--
--#
--# USB DSL modem support
--#
--
--#
--# USB Gadget Support
--#
--CONFIG_USB_GADGET=y
--# CONFIG_USB_GADGET_DEBUG is not set
--# CONFIG_USB_GADGET_DEBUG_FILES is not set
--# CONFIG_USB_GADGET_DEBUG_FS is not set
--CONFIG_USB_GADGET_SELECTED=y
--# CONFIG_USB_GADGET_AMD5536UDC is not set
--# CONFIG_USB_GADGET_ATMEL_USBA is not set
--# CONFIG_USB_GADGET_FSL_USB2 is not set
--# CONFIG_USB_GADGET_NET2280 is not set
--# CONFIG_USB_GADGET_PXA2XX is not set
--# CONFIG_USB_GADGET_M66592 is not set
--# CONFIG_USB_GADGET_GOKU is not set
--# CONFIG_USB_GADGET_LH7A40X is not set
--# CONFIG_USB_GADGET_OMAP is not set
--CONFIG_USB_GADGET_S3C2410=y
--CONFIG_USB_S3C2410=y
--# CONFIG_USB_S3C2410_DEBUG is not set
--# CONFIG_USB_GADGET_AT91 is not set
--# CONFIG_USB_GADGET_DUMMY_HCD is not set
--# CONFIG_USB_GADGET_DUALSPEED is not set
--# CONFIG_USB_ZERO is not set
--CONFIG_USB_ETH=y
--CONFIG_USB_ETH_RNDIS=y
--# CONFIG_USB_GADGETFS is not set
--# CONFIG_USB_FILE_STORAGE is not set
--# CONFIG_USB_G_SERIAL is not set
--# CONFIG_USB_MIDI_GADGET is not set
--
--#
--# SDIO support
--#
--CONFIG_SDIO=y
--CONFIG_SDIO_S3C24XX=y
--CONFIG_SDIO_S3C24XX_DMA=y
--CONFIG_SDIO_AR6000_WLAN=y
--CONFIG_MMC=y
--# CONFIG_MMC_DEBUG is not set
--CONFIG_MMC_UNSAFE_RESUME=y
--
--#
--# MMC/SD Card Drivers
--#
--CONFIG_MMC_BLOCK=y
--# CONFIG_MMC_BLOCK_BOUNCE is not set
--# CONFIG_SDIO_UART is not set
--
--#
--# MMC/SD Host Controller Drivers
--#
--# CONFIG_MMC_SPI is not set
--# CONFIG_MMC_S3C is not set
--CONFIG_NEW_LEDS=y
--CONFIG_LEDS_CLASS=y
--
--#
--# LED drivers
--#
--CONFIG_LEDS_S3C24XX=m
--CONFIG_LEDS_GPIO=y
--CONFIG_LEDS_NEO1973_VIBRATOR=y
--CONFIG_LEDS_NEO1973_GTA02=y
--
--#
--# LED Triggers
--#
--CONFIG_LEDS_TRIGGERS=y
--CONFIG_LEDS_TRIGGER_TIMER=y
--# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
--CONFIG_RTC_LIB=y
--CONFIG_RTC_CLASS=y
--CONFIG_RTC_HCTOSYS=y
--CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
--CONFIG_RTC_DEBUG=y
--
--#
--# RTC interfaces
--#
--CONFIG_RTC_INTF_SYSFS=y
--CONFIG_RTC_INTF_PROC=y
--CONFIG_RTC_INTF_DEV=y
--# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
--# CONFIG_RTC_DRV_TEST is not set
--
--#
--# I2C RTC drivers
--#
--# CONFIG_RTC_DRV_DS1307 is not set
--# CONFIG_RTC_DRV_DS1374 is not set
--# CONFIG_RTC_DRV_DS1672 is not set
--# CONFIG_RTC_DRV_MAX6900 is not set
--# CONFIG_RTC_DRV_RS5C372 is not set
--# CONFIG_RTC_DRV_ISL1208 is not set
--# CONFIG_RTC_DRV_X1205 is not set
--# CONFIG_RTC_DRV_PCF8563 is not set
--# CONFIG_RTC_DRV_PCF8583 is not set
--# CONFIG_RTC_DRV_M41T80 is not set
--
--#
--# SPI RTC drivers
--#
--# CONFIG_RTC_DRV_RS5C348 is not set
--# CONFIG_RTC_DRV_MAX6902 is not set
--
--#
--# Platform RTC drivers
--#
--# CONFIG_RTC_DRV_CMOS is not set
--# CONFIG_RTC_DRV_DS1553 is not set
--# CONFIG_RTC_DRV_STK17TA8 is not set
--# CONFIG_RTC_DRV_DS1742 is not set
--# CONFIG_RTC_DRV_M48T86 is not set
--# CONFIG_RTC_DRV_M48T59 is not set
--# CONFIG_RTC_DRV_V3020 is not set
--
--#
--# on-CPU RTC drivers
--#
--CONFIG_RTC_DRV_S3C=m
--
--#
--# File systems
--#
--CONFIG_EXT2_FS=y
--# CONFIG_EXT2_FS_XATTR is not set
--# CONFIG_EXT2_FS_XIP is not set
--CONFIG_EXT3_FS=y
--# CONFIG_EXT3_FS_XATTR is not set
--# CONFIG_EXT4DEV_FS is not set
--CONFIG_JBD=y
--# CONFIG_JBD_DEBUG is not set
--# CONFIG_REISERFS_FS is not set
--# CONFIG_JFS_FS is not set
--# CONFIG_FS_POSIX_ACL is not set
--# CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
--# CONFIG_OCFS2_FS is not set
--# CONFIG_MINIX_FS is not set
--CONFIG_ROMFS_FS=y
--CONFIG_INOTIFY=y
--CONFIG_INOTIFY_USER=y
--# CONFIG_QUOTA is not set
--CONFIG_DNOTIFY=y
--# CONFIG_AUTOFS_FS is not set
--CONFIG_AUTOFS4_FS=m
--CONFIG_FUSE_FS=m
--
--#
--# CD-ROM/DVD Filesystems
--#
--CONFIG_ISO9660_FS=y
--CONFIG_JOLIET=y
--# CONFIG_ZISOFS is not set
--CONFIG_UDF_FS=y
--
--#
--# DOS/FAT/NT Filesystems
--#
--CONFIG_FAT_FS=y
--CONFIG_MSDOS_FS=y
--CONFIG_VFAT_FS=y
--CONFIG_FAT_DEFAULT_CODEPAGE=437
--CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
--# CONFIG_NTFS_FS is not set
--
--#
--# Pseudo filesystems
--#
--CONFIG_PROC_FS=y
--CONFIG_PROC_SYSCTL=y
--CONFIG_SYSFS=y
--CONFIG_TMPFS=y
--# CONFIG_TMPFS_POSIX_ACL is not set
--# CONFIG_HUGETLB_PAGE is not set
--CONFIG_CONFIGFS_FS=m
--
--#
--# 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_YAFFS_FS=y
--CONFIG_YAFFS_YAFFS1=y
--CONFIG_YAFFS_9BYTE_TAGS=y
--CONFIG_YAFFS_YAFFS2=y
--CONFIG_YAFFS_AUTO_YAFFS2=y
--# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
--CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
--# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
--# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
--CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
--CONFIG_JFFS2_FS=y
--CONFIG_JFFS2_FS_DEBUG=0
--CONFIG_JFFS2_FS_WRITEBUFFER=y
--# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
--CONFIG_JFFS2_SUMMARY=y
--# CONFIG_JFFS2_FS_XATTR is not set
--# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
--CONFIG_JFFS2_ZLIB=y
--# CONFIG_JFFS2_LZO is not set
--CONFIG_JFFS2_RTIME=y
--# CONFIG_JFFS2_RUBIN is not set
--CONFIG_CRAMFS=y
--# 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
--# CONFIG_NETWORK_FILESYSTEMS is not set
--
--#
--# Partition Types
--#
--# CONFIG_PARTITION_ADVANCED is not set
--CONFIG_MSDOS_PARTITION=y
--CONFIG_NLS=y
--CONFIG_NLS_DEFAULT="iso8859-1"
--CONFIG_NLS_CODEPAGE_437=y
--# CONFIG_NLS_CODEPAGE_737 is not set
--# CONFIG_NLS_CODEPAGE_775 is not set
--CONFIG_NLS_CODEPAGE_850=m
--# 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=m
--CONFIG_NLS_CODEPAGE_950=m
--# 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=y
--# 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=m
--# CONFIG_DLM is not set
--CONFIG_INSTRUMENTATION=y
--# CONFIG_PROFILING is not set
--CONFIG_MARKERS=y
--
--#
--# Kernel hacking
--#
--CONFIG_PRINTK_TIME=y
--CONFIG_ENABLE_WARN_DEPRECATED=y
--CONFIG_ENABLE_MUST_CHECK=y
--CONFIG_MAGIC_SYSRQ=y
--# CONFIG_UNUSED_SYMBOLS is not set
--CONFIG_DEBUG_FS=y
--# CONFIG_HEADERS_CHECK is not set
--CONFIG_DEBUG_KERNEL=y
--CONFIG_DEBUG_SHIRQ=y
--CONFIG_DETECT_SOFTLOCKUP=y
--CONFIG_SCHED_DEBUG=y
--# CONFIG_SCHEDSTATS is not set
--CONFIG_TIMER_STATS=y
--# CONFIG_DEBUG_SLAB is not set
--CONFIG_DEBUG_PREEMPT=y
--# CONFIG_DEBUG_RT_MUTEXES is not set
--# CONFIG_RT_MUTEX_TESTER is not set
--CONFIG_DEBUG_SPINLOCK=y
--CONFIG_DEBUG_MUTEXES=y
--CONFIG_DEBUG_LOCK_ALLOC=y
--# CONFIG_PROVE_LOCKING is not set
--CONFIG_LOCKDEP=y
--CONFIG_LOCK_STAT=y
--CONFIG_DEBUG_LOCKDEP=y
--CONFIG_DEBUG_SPINLOCK_SLEEP=y
--# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
--CONFIG_STACKTRACE=y
--# CONFIG_DEBUG_KOBJECT is not set
--CONFIG_DEBUG_BUGVERBOSE=y
--CONFIG_DEBUG_INFO=y
--# CONFIG_DEBUG_VM is not set
--# CONFIG_DEBUG_LIST is not set
--CONFIG_DEBUG_SG=y
--CONFIG_FRAME_POINTER=y
--CONFIG_FORCED_INLINING=y
--# CONFIG_BOOT_PRINTK_DELAY is not set
--# CONFIG_RCU_TORTURE_TEST is not set
--# CONFIG_FAULT_INJECTION is not set
--# CONFIG_SAMPLES is not set
--# CONFIG_DEBUG_USER is not set
--CONFIG_DEBUG_ERRORS=y
--# CONFIG_DEBUG_LL is not set
--# CONFIG_DEBUG_ICEDCC is not set
--# CONFIG_DEBUG_S3C_PORT is not set
--CONFIG_DEBUG_S3C_UART=2
--
--#
--# Security options
--#
--# CONFIG_KEYS is not set
--# CONFIG_SECURITY is not set
--# CONFIG_SECURITY_FILE_CAPABILITIES is not set
--CONFIG_CRYPTO=y
--CONFIG_CRYPTO_ALGAPI=y
--CONFIG_CRYPTO_BLKCIPHER=y
--CONFIG_CRYPTO_HASH=y
--CONFIG_CRYPTO_MANAGER=y
--CONFIG_CRYPTO_HMAC=y
--CONFIG_CRYPTO_XCBC=m
--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_WP512=m
--CONFIG_CRYPTO_TGR192=m
--CONFIG_CRYPTO_GF128MUL=m
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--CONFIG_CRYPTO_LRW=m
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--CONFIG_CRYPTO_FCRYPT=m
--CONFIG_CRYPTO_BLOWFISH=m
--CONFIG_CRYPTO_TWOFISH=m
--CONFIG_CRYPTO_TWOFISH_COMMON=m
--CONFIG_CRYPTO_SERPENT=m
--CONFIG_CRYPTO_AES=m
--CONFIG_CRYPTO_CAST5=m
--CONFIG_CRYPTO_CAST6=m
--CONFIG_CRYPTO_TEA=m
--CONFIG_CRYPTO_ARC4=m
--CONFIG_CRYPTO_KHAZAD=m
--CONFIG_CRYPTO_ANUBIS=m
--# CONFIG_CRYPTO_SEED is not set
--CONFIG_CRYPTO_DEFLATE=m
--CONFIG_CRYPTO_MICHAEL_MIC=m
--CONFIG_CRYPTO_CRC32C=m
--CONFIG_CRYPTO_CAMELLIA=m
--CONFIG_CRYPTO_TEST=m
--# CONFIG_CRYPTO_AUTHENC is not set
--CONFIG_CRYPTO_HW=y
--
--#
--# Library routines
--#
--CONFIG_BITREVERSE=y
--CONFIG_CRC_CCITT=m
--CONFIG_CRC16=m
--# CONFIG_CRC_ITU_T is not set
--CONFIG_CRC32=y
--# CONFIG_CRC7 is not set
--CONFIG_LIBCRC32C=m
--CONFIG_ZLIB_INFLATE=y
--CONFIG_ZLIB_DEFLATE=y
--CONFIG_TEXTSEARCH=y
--CONFIG_TEXTSEARCH_KMP=m
--CONFIG_TEXTSEARCH_BM=m
--CONFIG_TEXTSEARCH_FSM=m
--CONFIG_PLIST=y
--CONFIG_HAS_IOMEM=y
--CONFIG_HAS_DMA=y
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1303-fix-lid302dl-bitbang-all-the-way-baby.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1303-fix-lid302dl-bitbang-all-the-way-baby.patch.patch
deleted file mode 100644 (file)
index 852faae..0000000
+++ /dev/null
@@ -1,1184 +0,0 @@
-From 1c6f5a92c816db43128444606c26507ebe6e5a43 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Mon, 13 Oct 2008 12:01:05 +0100
-Subject: [PATCH] fix-lid302dl-bitbang-all-the-way-baby.patch
-
-This large patch removes motion sensor from Linux SPI bitbang driver.
-Previously, some access was done through Linux SPI protected
-by a mutex, and the ISR access was done by platform bitbang code due
-to inability of Linux SPI driver to work in the interrupt context.
-
-Now all access is done by bitbang callbacks in mach_gta02.c and are
-protected by single scheme of interrupt lockout for the duration --
-I line-by-line'd the driver to confirm that best I could, adding
-protection and taking more care on several /sys related paths.
-
-Because this is no longer a Linux SPI bus driver, the path for various
-/sys things have changed.  They can now be found down, eg,
-
-/sys/devices/platform/lis302dl.1/sample_rate
-
-lis302dl.1 is the top sensor and .2 the bottom.  The names of the input
-susbsytem paths remain the same as before.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |  233 +++++++++----------
- drivers/input/misc/lis302dl.c      |  437 ++++++++++++++++--------------------
- include/linux/lis302dl.h           |    9 +-
- 3 files changed, 315 insertions(+), 364 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 467c417..b19632c 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1052,20 +1052,21 @@ static struct platform_device gta02_vibrator_dev = {
- /* #define DEBUG_SPEW_MS */
- #define MG_PER_SAMPLE 18
--struct lis302dl_platform_data lis302_pdata[];
-+struct lis302dl_platform_data lis302_pdata_top;
-+struct lis302dl_platform_data lis302_pdata_bottom;
--void gta02_lis302dl_bitbang_read(struct lis302dl_info *lis)
-+/*
-+ * generic SPI RX and TX bitbang
-+ * only call with interrupts off!
-+ */
-+
-+static void __gta02_lis302dl_bitbang(struct lis302dl_info *lis, u8 *tx,
-+                                           int tx_bytes, u8 *rx, int rx_bytes)
- {
-       struct lis302dl_platform_data *pdata = lis->pdata;
--      u8 shifter = 0xc0 | LIS302DL_REG_OUT_X; /* read, autoincrement */
--      int n, n1;
-+      int n;
-+      u8 shifter = 0;
-       unsigned long other_cs;
--      unsigned long flags;
--#ifdef DEBUG_SPEW_MS
--      s8 x, y, z;
--#endif
--
--      local_irq_save(flags);
-       /*
-        * Huh.. "quirk"... CS on this device is not really "CS" like you can
-@@ -1073,20 +1074,25 @@ void gta02_lis302dl_bitbang_read(struct lis302dl_info *lis)
-        * have 2 devices on one interface, the "disabled" device when we talk
-        * to an "enabled" device sees the clocks as I2C clocks, creating
-        * havoc.
-+       *
-        * I2C sees MOSI going LOW while CLK HIGH as a START action, we must
-        * ensure this is never issued.
-        */
--      if (&lis302_pdata[0] == pdata)
--              other_cs = lis302_pdata[1].pin_chip_select;
-+      if (&lis302_pdata_top == pdata)
-+              other_cs = lis302_pdata_bottom.pin_chip_select;
-       else
--              other_cs = lis302_pdata[0].pin_chip_select;
-+              other_cs = lis302_pdata_top.pin_chip_select;
-       s3c2410_gpio_setpin(other_cs, 1);
-       s3c2410_gpio_setpin(pdata->pin_chip_select, 1);
-       s3c2410_gpio_setpin(pdata->pin_clk, 1);
-       s3c2410_gpio_setpin(pdata->pin_chip_select, 0);
--      for (n = 0; n < 8; n++) { /* write the r/w, inc and address */
-+
-+      /* send the register index, r/w and autoinc bits */
-+      for (n = 0; n < (tx_bytes << 3); n++) {
-+              if (!(n & 7))
-+                      shifter = tx[n >> 3];
-               s3c2410_gpio_setpin(pdata->pin_clk, 0);
-               s3c2410_gpio_setpin(pdata->pin_mosi, (shifter >> 7) & 1);
-               s3c2410_gpio_setpin(pdata->pin_clk, 0);
-@@ -1095,44 +1101,71 @@ void gta02_lis302dl_bitbang_read(struct lis302dl_info *lis)
-               shifter <<= 1;
-       }
--      for (n = 0; n < 5; n++) { /* 5 consequetive registers */
--              for (n1 = 0; n1 < 8; n1++) { /* 8 bits each */
--                      s3c2410_gpio_setpin(pdata->pin_clk, 0);
--                      s3c2410_gpio_setpin(pdata->pin_clk, 0);
--                      shifter <<= 1;
--                      if (s3c2410_gpio_getpin(pdata->pin_miso))
--                              shifter |= 1;
--                      s3c2410_gpio_setpin(pdata->pin_clk, 1);
--                      s3c2410_gpio_setpin(pdata->pin_clk, 1);
--              }
--              switch (n) {
--              case 0:
--#ifdef DEBUG_SPEW_MS
--                      x = shifter;
--#endif
--                      input_report_rel(lis->input_dev, REL_X, MG_PER_SAMPLE * (s8)shifter);
--                      break;
--              case 2:
--#ifdef DEBUG_SPEW_MS
--                      y = shifter;
--#endif
--                      input_report_rel(lis->input_dev, REL_Y, MG_PER_SAMPLE * (s8)shifter);
--                      break;
--              case 4:
--#ifdef DEBUG_SPEW_MS
--                      z = shifter;
--#endif
--                      input_report_rel(lis->input_dev, REL_Z, MG_PER_SAMPLE * (s8)shifter);
--                      break;
--              }
-+      for (n = 0; n < (rx_bytes << 3); n++) { /* 8 bits each */
-+              s3c2410_gpio_setpin(pdata->pin_clk, 0);
-+              s3c2410_gpio_setpin(pdata->pin_clk, 0);
-+              shifter <<= 1;
-+              if (s3c2410_gpio_getpin(pdata->pin_miso))
-+                      shifter |= 1;
-+              if ((n & 7) == 7)
-+                      rx[n >> 3] = shifter;
-+              s3c2410_gpio_setpin(pdata->pin_clk, 1);
-+              s3c2410_gpio_setpin(pdata->pin_clk, 1);
-       }
-       s3c2410_gpio_setpin(pdata->pin_chip_select, 1);
-       s3c2410_gpio_setpin(other_cs, 1);
-+}
-+
-+
-+static int gta02_lis302dl_bitbang_read_reg(struct lis302dl_info *lis, u8 reg)
-+{
-+      u8 data = 0xc0 | reg; /* read, autoincrement */
-+      unsigned long flags;
-+
-+      local_irq_save(flags);
-+
-+      __gta02_lis302dl_bitbang(lis, &data, 1, &data, 1);
-+
-+      local_irq_restore(flags);
-+
-+      return data;
-+}
-+
-+static void gta02_lis302dl_bitbang_write_reg(struct lis302dl_info *lis, u8 reg,
-+                                                                       u8 val)
-+{
-+      u8 data[2] = { 0x00 | reg, val }; /* write, no autoincrement */
-+      unsigned long flags;
-+
-+      local_irq_save(flags);
-+
-+      __gta02_lis302dl_bitbang(lis, &data[0], 2, NULL, 0);
-+
-       local_irq_restore(flags);
-+}
-+
-+
-+static void gta02_lis302dl_bitbang_sample(struct lis302dl_info *lis)
-+{
-+      u8 data = 0xc0 | LIS302DL_REG_OUT_X; /* read, autoincrement */
-+      u8 read[5];
-+      unsigned long flags;
-+
-+      local_irq_save(flags);
-+
-+      __gta02_lis302dl_bitbang(lis, &data, 1, &read[0], 5);
-+
-+      local_irq_restore(flags);
-+
-+      input_report_rel(lis->input_dev, REL_X, MG_PER_SAMPLE * (s8)read[0]);
-+      input_report_rel(lis->input_dev, REL_Y, MG_PER_SAMPLE * (s8)read[2]);
-+      input_report_rel(lis->input_dev, REL_Z, MG_PER_SAMPLE * (s8)read[4]);
-+
-       input_sync(lis->input_dev);
- #ifdef DEBUG_SPEW_MS
--      printk("%s: %d %d %d\n", pdata->name, x, y, z);
-+      printk(KERN_INFO "%s: %d %d %d\n", pdata->name, read[0], read[2],
-+                                                                     read[4]);
- #endif
- }
-@@ -1159,103 +1192,58 @@ void gta02_lis302dl_suspend_io(struct lis302dl_info *lis, int resume)
-       s3c2410_gpio_setpin(pdata->pin_clk, 1);
-       /* misnomer: it is a pullDOWN in 2442 */
-       s3c2410_gpio_pullup(pdata->pin_miso, 0);
-+
-+      s3c2410_gpio_cfgpin(pdata->pin_chip_select, S3C2410_GPIO_OUTPUT);
-+      s3c2410_gpio_cfgpin(pdata->pin_clk, S3C2410_GPIO_OUTPUT);
-+      s3c2410_gpio_cfgpin(pdata->pin_mosi, S3C2410_GPIO_OUTPUT);
-+      s3c2410_gpio_cfgpin(pdata->pin_miso, S3C2410_GPIO_INPUT);
-+
- }
--struct lis302dl_platform_data lis302_pdata[] = {
--      {
-+
-+
-+struct lis302dl_platform_data lis302_pdata_top = {
-               .name           = "lis302-1 (top)",
-               .pin_chip_select= S3C2410_GPD12,
-               .pin_clk        = S3C2410_GPG7,
-               .pin_mosi       = S3C2410_GPG6,
-               .pin_miso       = S3C2410_GPG5,
-+              .interrupt      = GTA02_IRQ_GSENSOR_1,
-               .open_drain     = 1, /* altered at runtime by PCB rev */
--              .lis302dl_bitbang_read = gta02_lis302dl_bitbang_read,
-+              .lis302dl_bitbang_read_sample = gta02_lis302dl_bitbang_sample,
-+              .lis302dl_bitbang_reg_read = gta02_lis302dl_bitbang_read_reg,
-+              .lis302dl_bitbang_reg_write = gta02_lis302dl_bitbang_write_reg,
-               .lis302dl_suspend_io = gta02_lis302dl_suspend_io,
--      }, {
-+};
-+
-+struct lis302dl_platform_data lis302_pdata_bottom = {
-               .name           = "lis302-2 (bottom)",
-               .pin_chip_select= S3C2410_GPD13,
-               .pin_clk        = S3C2410_GPG7,
-               .pin_mosi       = S3C2410_GPG6,
-               .pin_miso       = S3C2410_GPG5,
-+              .interrupt      = GTA02_IRQ_GSENSOR_2,
-               .open_drain     = 1, /* altered at runtime by PCB rev */
--              .lis302dl_bitbang_read = gta02_lis302dl_bitbang_read,
-+              .lis302dl_bitbang_read_sample = gta02_lis302dl_bitbang_sample,
-+              .lis302dl_bitbang_reg_read = gta02_lis302dl_bitbang_read_reg,
-+              .lis302dl_bitbang_reg_write = gta02_lis302dl_bitbang_write_reg,
-               .lis302dl_suspend_io = gta02_lis302dl_suspend_io,
--      },
- };
--static struct spi_board_info gta02_spi_acc_bdinfo[] = {
--      {
--              .modalias       = "lis302dl",
--              .platform_data  = &lis302_pdata[0],
--              .irq            = GTA02_IRQ_GSENSOR_1,
--              .max_speed_hz   = 10 * 1000 * 1000,
--              .bus_num        = 1,
--              .chip_select    = 0,
--              .mode           = SPI_MODE_3,
--      },
--      {
--              .modalias       = "lis302dl",
--              .platform_data  = &lis302_pdata[1],
--              .irq            = GTA02_IRQ_GSENSOR_2,
--              .max_speed_hz   = 10 * 1000 * 1000,
--              .bus_num        = 1,
--              .chip_select    = 1,
--              .mode           = SPI_MODE_3,
--      },
--};
--
--static void spi_acc_cs(struct s3c2410_spigpio_info *spigpio_info,
--                     int csid, int cs)
--{
--      struct lis302dl_platform_data * plat_data =
--                              (struct lis302dl_platform_data *)spigpio_info->
--                                                   board_info->platform_data;
--      switch (cs) {
--      case BITBANG_CS_ACTIVE:
--              s3c2410_gpio_setpin(plat_data[csid].pin_chip_select, 0);
--              break;
--      case BITBANG_CS_INACTIVE:
--              s3c2410_gpio_setpin(plat_data[csid].pin_chip_select, 1);
--              break;
--      }
--}
--static struct s3c2410_spigpio_info spi_gpio_cfg = {
--      .pin_clk        = S3C2410_GPG7,
--      .pin_mosi       = S3C2410_GPG6,
--      .pin_miso       = S3C2410_GPG5,
--      .board_size     = ARRAY_SIZE(gta02_spi_acc_bdinfo),
--      .board_info     = gta02_spi_acc_bdinfo,
--      .chip_select    = &spi_acc_cs,
--      .num_chipselect = 2,
--};
--
--static struct resource s3c_spi_acc_resource[] = {
--      [0] = {
--              .start = S3C2410_GPG3,
--              .end   = S3C2410_GPG3,
--      },
--      [1] = {
--              .start = S3C2410_GPG5,
--              .end   = S3C2410_GPG5,
--      },
--      [2] = {
--              .start = S3C2410_GPG6,
--              .end   = S3C2410_GPG6,
--      },
--      [3] = {
--              .start = S3C2410_GPG7,
--              .end   = S3C2410_GPG7,
-+static struct platform_device s3c_device_spi_acc1 = {
-+      .name             = "lis302dl",
-+      .id               = 1,
-+      .dev = {
-+              .platform_data = &lis302_pdata_top,
-       },
- };
--static struct platform_device s3c_device_spi_acc = {
--      .name             = "spi_s3c24xx_gpio",
--      .id               = 1,
--      .num_resources    = ARRAY_SIZE(s3c_spi_acc_resource),
--      .resource         = s3c_spi_acc_resource,
-+static struct platform_device s3c_device_spi_acc2 = {
-+      .name             = "lis302dl",
-+      .id               = 2,
-       .dev = {
--              .platform_data = &spi_gpio_cfg,
-+              .platform_data = &lis302_pdata_bottom,
-       },
- };
-@@ -1573,8 +1561,8 @@ static void __init gta02_machine_init(void)
-       switch (system_rev) {
-       case GTA02v6_SYSTEM_REV:
-               /* we need push-pull interrupt from motion sensors */
--              lis302_pdata[0].open_drain = 0;
--              lis302_pdata[1].open_drain = 0;
-+              lis302_pdata_top.open_drain = 0;
-+              lis302_pdata_bottom.open_drain = 0;
-               break;
-       default:
-               break;
-@@ -1635,7 +1623,8 @@ static void __init gta02_machine_init(void)
-       mangle_glamo_res_by_system_rev();
-       platform_device_register(&gta02_glamo_dev);
--      platform_device_register(&s3c_device_spi_acc);
-+      platform_device_register(&s3c_device_spi_acc1);
-+      platform_device_register(&s3c_device_spi_acc2);
-       platform_device_register(&gta02_button_dev);
-       platform_device_register(&gta02_pm_gsm_dev);
-       platform_device_register(&gta02_pm_usbhost_dev);
-diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
-index b01ca04..1d5781d 100644
---- a/drivers/input/misc/lis302dl.c
-+++ b/drivers/input/misc/lis302dl.c
-@@ -1,7 +1,9 @@
- /* Linux kernel driver for the ST LIS302D 3-axis accelerometer
-  *
-- * Copyright (C) 2007 by Openmoko, Inc.
-+ * Copyright (C) 2007-2008 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-+ *         converted to private bitbang by:
-+ *         Andy Green <andy@openmoko.com>
-  * All rights reserved.
-  *
-  * This program is free software; you can redistribute it and/or
-@@ -39,78 +41,19 @@
- #include <linux/lis302dl.h>
--/* lowlevel register access functions */
--#define READ_BIT              0x80
--#define READ_BIT_INC_ADS      0xc0
--#define       ADDR_MASK               0x3f
--static u_int8_t __reg_read(struct lis302dl_info *lis, u_int8_t reg)
-+static void __reg_set_bit_mask(struct lis302dl_info *lis, u8 reg, u8 mask,
-+                                                                       u8 val)
- {
--      int rc;
--      u_int8_t cmd;
--
--      BUG_ON(reg & ~ADDR_MASK);
--
--      cmd = reg | READ_BIT;
--
--      rc = spi_w8r8(lis->spi_dev, cmd);
--
--      return rc;
--}
--
--static u_int8_t reg_read(struct lis302dl_info *lis, u_int8_t reg)
--{
--      u_int8_t ret;
--
--      mutex_lock(&lis->lock);
--      ret = __reg_read(lis, reg);
--      mutex_unlock(&lis->lock);
--
--      return ret;
--}
--
--static int __reg_write(struct lis302dl_info *lis, u_int8_t reg, u_int8_t val)
--{
--      u_int8_t buf[2];
--
--      BUG_ON(reg & ~ADDR_MASK);
--
--      buf[0] = reg;
--      buf[1] = val;
--
--      return spi_write(lis->spi_dev, buf, sizeof(buf));
--}
--
--static int reg_write(struct lis302dl_info *lis, u_int8_t reg, u_int8_t val)
--{
--      int ret;
--
--      mutex_lock(&lis->lock);
--      ret = __reg_write(lis, reg, val);
--      mutex_unlock(&lis->lock);
--
--      return ret;
--}
--
--static int reg_set_bit_mask(struct lis302dl_info *lis,
--                          u_int8_t reg, u_int8_t mask, u_int8_t val)
--{
--      int ret;
-       u_int8_t tmp;
-       val &= mask;
--      mutex_lock(&lis->lock);
--
--      tmp = __reg_read(lis, reg);
-+      tmp = (lis->pdata->lis302dl_bitbang_reg_read)(lis, reg);
-       tmp &= ~mask;
-       tmp |= val;
--      ret = __reg_write(lis, reg, tmp);
--
--      mutex_unlock(&lis->lock);
--
--      return ret;
-+      (lis->pdata->lis302dl_bitbang_reg_write)(lis, reg, tmp);
- }
- /* interrupt handling related */
-@@ -124,17 +67,17 @@ enum lis302dl_intmode {
-       LIS302DL_INTMODE_CLICK          = 0x07,
- };
--static void lis302dl_int_mode(struct spi_device *spi, int int_pin,
-+static void __lis302dl_int_mode(struct device *dev, int int_pin,
-                             enum lis302dl_intmode mode)
- {
--      struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-+      struct lis302dl_info *lis = dev_get_drvdata(dev);
-       switch (int_pin) {
-       case 1:
--              reg_set_bit_mask(lis, LIS302DL_REG_CTRL3, 0x07, mode);
-+              __reg_set_bit_mask(lis, LIS302DL_REG_CTRL3, 0x07, mode);
-               break;
-       case 2:
--              reg_set_bit_mask(lis, LIS302DL_REG_CTRL3, 0x38, mode << 3);
-+              __reg_set_bit_mask(lis, LIS302DL_REG_CTRL3, 0x38, mode << 3);
-               break;
-       default:
-               BUG();
-@@ -165,7 +108,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *_lis)
- {
-       struct lis302dl_info *lis = _lis;
--      (lis->pdata->lis302dl_bitbang_read)(lis);
-+      (lis->pdata->lis302dl_bitbang_read_sample)(lis);
-       return IRQ_HANDLED;
- }
-@@ -175,7 +118,13 @@ static ssize_t show_rate(struct device *dev, struct device_attribute *attr,
-                        char *buf)
- {
-       struct lis302dl_info *lis = dev_get_drvdata(dev);
--      u_int8_t ctrl1 = reg_read(lis, LIS302DL_REG_CTRL1);
-+      u8 ctrl1;
-+      unsigned long flags;
-+
-+      local_irq_save(flags);
-+      ctrl1 = (lis->pdata->lis302dl_bitbang_reg_read)
-+                                                    (lis, LIS302DL_REG_CTRL1);
-+      local_irq_restore(flags);
-       return sprintf(buf, "%d\n", ctrl1 & LIS302DL_CTRL1_DR ? 400 : 100);
- }
-@@ -184,12 +133,17 @@ static ssize_t set_rate(struct device *dev, struct device_attribute *attr,
-                       const char *buf, size_t count)
- {
-       struct lis302dl_info *lis = dev_get_drvdata(dev);
-+      unsigned long flags;
-+
-+      local_irq_save(flags);
-       if (!strcmp(buf, "400\n"))
--              reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_DR,
-+              __reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_DR,
-                                LIS302DL_CTRL1_DR);
-       else
--              reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_DR, 0);
-+              __reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_DR,
-+                                                                           0);
-+      local_irq_restore(flags);
-       return count;
- }
-@@ -200,7 +154,13 @@ static ssize_t show_scale(struct device *dev, struct device_attribute *attr,
-                         char *buf)
- {
-       struct lis302dl_info *lis = dev_get_drvdata(dev);
--      u_int8_t ctrl1 = reg_read(lis, LIS302DL_REG_CTRL1);
-+      u_int8_t ctrl1;
-+      unsigned long flags;
-+
-+      local_irq_save(flags);
-+      ctrl1 = (lis->pdata->lis302dl_bitbang_reg_read)(lis,
-+                                                          LIS302DL_REG_CTRL1);
-+      local_irq_restore(flags);
-       return sprintf(buf, "%s\n", ctrl1 & LIS302DL_CTRL1_FS ? "9.2" : "2.3");
- }
-@@ -209,12 +169,18 @@ static ssize_t set_scale(struct device *dev, struct device_attribute *attr,
-                        const char *buf, size_t count)
- {
-       struct lis302dl_info *lis = dev_get_drvdata(dev);
-+      unsigned long flags;
-+
-+      local_irq_save(flags);
-       if (!strcmp(buf, "9.2\n"))
--              reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_FS,
-+              __reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_FS,
-                                LIS302DL_CTRL1_FS);
-       else
--              reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_FS, 0);
-+              __reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_FS,
-+                                                                           0);
-+
-+      local_irq_restore(flags);
-       return count;
- }
-@@ -222,7 +188,7 @@ static ssize_t set_scale(struct device *dev, struct device_attribute *attr,
- static DEVICE_ATTR(full_scale, S_IRUGO | S_IWUSR, show_scale, set_scale);
- static ssize_t lis302dl_dump(struct device *dev, struct device_attribute *attr,
--                        char *buf)
-+                                                                    char *buf)
- {
-       struct lis302dl_info *lis = dev_get_drvdata(dev);
-       int n = 0;
-@@ -233,7 +199,7 @@ static ssize_t lis302dl_dump(struct device *dev, struct device_attribute *attr,
-       local_irq_save(flags);
-       for (n = 0; n < sizeof(reg); n++)
--              reg[n] = reg_read(lis, n);
-+              reg[n] = (lis->pdata->lis302dl_bitbang_reg_read)(lis, n);
-       local_irq_restore(flags);
-@@ -248,9 +214,9 @@ static ssize_t lis302dl_dump(struct device *dev, struct device_attribute *attr,
- }
- static DEVICE_ATTR(dump, S_IRUGO, lis302dl_dump, NULL);
--static int freefall_ms_to_duration(struct lis302dl_info *lis, int ms)
-+static int __freefall_ms_to_duration(struct lis302dl_info *lis, int ms)
- {
--      u_int8_t r = reg_read(lis, LIS302DL_REG_CTRL1);
-+      u8 r = (lis->pdata->lis302dl_bitbang_reg_read)(lis, LIS302DL_REG_CTRL1);
-       /* If we have 400 ms sampling rate, the stepping is 2.5 ms,
-        * on 100 ms the stepping is 10ms */
-@@ -268,9 +234,9 @@ static int freefall_ms_to_duration(struct lis302dl_info *lis, int ms)
-       return ms / 10;
- }
--static int freefall_duration_to_ms(struct lis302dl_info *lis, int duration)
-+static int __freefall_duration_to_ms(struct lis302dl_info *lis, int duration)
- {
--      u_int8_t r = reg_read(lis, LIS302DL_REG_CTRL1);
-+      u8 r = (lis->pdata->lis302dl_bitbang_reg_read)(lis, LIS302DL_REG_CTRL1);
-       if (r & LIS302DL_CTRL1_DR)
-               return (duration * 25) / 10;
-@@ -314,18 +280,18 @@ static ssize_t set_freefall_common(int which, struct device *dev,
-               /* Turn off the interrupt */
-               local_irq_save(flags);
-               if (lis->flags & LIS302DL_F_IRQ_WAKE)
--                      disable_irq_wake(lis->spi_dev->irq);
--              lis302dl_int_mode(lis->spi_dev, which,
-+                      disable_irq_wake(lis->pdata->interrupt);
-+              __lis302dl_int_mode(lis->dev, which,
-                                                  LIS302DL_INTMODE_DATA_READY);
-               lis->flags &= ~(flag_mask | LIS302DL_F_IRQ_WAKE);
--              reg_write(lis, r_cfg, 0);
--              reg_write(lis, r_ths, 0);
--              reg_write(lis, r_duration, 0);
-+              (lis->pdata->lis302dl_bitbang_reg_write)(lis, r_cfg, 0);
-+              (lis->pdata->lis302dl_bitbang_reg_write)(lis, r_ths, 0);
-+              (lis->pdata->lis302dl_bitbang_reg_write)(lis, r_duration, 0);
-               /* Power off unless the input subsystem is using the device */
-               if (!(lis->flags & LIS302DL_F_INPUT_OPEN))
--                      reg_set_bit_mask(lis, LIS302DL_REG_CTRL1,
-+                      __reg_set_bit_mask(lis, LIS302DL_REG_CTRL1,
-                                                         LIS302DL_CTRL1_PD, 0);
-               local_irq_restore(flags);
-@@ -337,7 +303,10 @@ static ssize_t set_freefall_common(int which, struct device *dev,
-                                                             &and_events) != 6)
-               return -EINVAL;
--      duration = freefall_ms_to_duration(lis, ms);
-+      local_irq_save(flags);
-+      duration = __freefall_ms_to_duration(lis, ms);
-+      local_irq_save(flags);
-+
-       if (duration < 0)
-               return -ERANGE;
-@@ -355,23 +324,25 @@ static ssize_t set_freefall_common(int which, struct device *dev,
-       /* Setup the configuration registers */
-       local_irq_save(flags);
--      reg_write(lis, r_cfg, 0); /* First zero to get to a known state */
--      reg_write(lis, r_cfg,
-+      /* First zero to get to a known state */
-+      (lis->pdata->lis302dl_bitbang_reg_write)(lis, r_cfg, 0);
-+      (lis->pdata->lis302dl_bitbang_reg_write)(lis, r_cfg,
-               (and_events ? LIS302DL_FFWUCFG_AOI : 0) |
-               x_lo | x_hi | y_lo | y_hi | z_lo | z_hi);
--      reg_write(lis, r_ths, threshold & ~LIS302DL_FFWUTHS_DCRM);
--      reg_write(lis, r_duration, duration);
-+      (lis->pdata->lis302dl_bitbang_reg_write)(lis, r_ths,
-+                                          threshold & ~LIS302DL_FFWUTHS_DCRM);
-+      (lis->pdata->lis302dl_bitbang_reg_write)(lis, r_duration, duration);
-       /* Route the interrupt for wakeup */
--      lis302dl_int_mode(lis->spi_dev, which, intmode);
-+      __lis302dl_int_mode(lis->dev, which, intmode);
-       /* Power up the device and note that we want to wake up from
-        * this interrupt */
-       if (!(lis->flags & LIS302DL_F_IRQ_WAKE))
--              enable_irq_wake(lis->spi_dev->irq);
-+              enable_irq_wake(lis->pdata->interrupt);
-       lis->flags |= flag_mask | LIS302DL_F_IRQ_WAKE;
--      reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD,
-+      __reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD,
-                       LIS302DL_CTRL1_PD);
-       local_irq_restore(flags);
-@@ -403,6 +374,8 @@ static ssize_t show_freefall_common(int which, struct device *dev,
-       int r_duration = LIS302DL_REG_FF_WU_DURATION_1;
-       int r_cfg = LIS302DL_REG_FF_WU_CFG_1;
-       int r_src = LIS302DL_REG_FF_WU_SRC_1;
-+      unsigned long flags;
-+      int ms;
-       /* Configure second freefall/wakeup pin */
-       if (which == 2) {
-@@ -411,11 +384,15 @@ static ssize_t show_freefall_common(int which, struct device *dev,
-               r_cfg = LIS302DL_REG_FF_WU_CFG_2;
-               r_src = LIS302DL_REG_FF_WU_SRC_2;
-       }
--      config = reg_read(lis, r_cfg);
--      threshold = reg_read(lis, r_ths);
--      duration = reg_read(lis, r_duration);
--      r4 = reg_read(lis, r_src);
--      r5 = reg_read(lis, LIS302DL_REG_CTRL3);
-+
-+      local_irq_save(flags);
-+      config = (lis->pdata->lis302dl_bitbang_reg_read)(lis, r_cfg);
-+      threshold = (lis->pdata->lis302dl_bitbang_reg_read)(lis, r_ths);
-+      duration = (lis->pdata->lis302dl_bitbang_reg_read)(lis, r_duration);
-+      r4 = (lis->pdata->lis302dl_bitbang_reg_read)(lis, r_src);
-+      r5 = (lis->pdata->lis302dl_bitbang_reg_read)(lis, LIS302DL_REG_CTRL3);
-+      ms = __freefall_duration_to_ms(lis, duration);
-+      local_irq_restore(flags);
-       /* All events off? */
-       if ((config & (LIS302DL_FFWUCFG_XLIE | LIS302DL_FFWUCFG_XHIE |
-@@ -423,13 +400,14 @@ static ssize_t show_freefall_common(int which, struct device *dev,
-                       LIS302DL_FFWUCFG_ZLIE | LIS302DL_FFWUCFG_ZHIE)) == 0)
-               return sprintf(buf, "off\n");
-+
-       return sprintf(buf,
-                       "%s events, %s interrupt, duration %d, threshold %d, "
-                       "enabled: %s %s %s %s %s %s\n",
-                       (config & LIS302DL_FFWUCFG_AOI) == 0 ? "or" : "and",
-                       (config & LIS302DL_FFWUCFG_LIR) == 0 ?
-                                                       "don't latch" : "latch",
--                      freefall_duration_to_ms(lis, duration), threshold,
-+                      ms, threshold,
-                       (config & LIS302DL_FFWUCFG_XLIE) == 0 ? "---" : "xlo",
-                       (config & LIS302DL_FFWUCFG_XHIE) == 0 ? "---" : "xhi",
-                       (config & LIS302DL_FFWUCFG_YLIE) == 0 ? "---" : "ylo",
-@@ -480,14 +458,15 @@ static int lis302dl_input_open(struct input_dev *inp)
-       local_irq_save(flags);
-       /* make sure we're powered up and generate data ready */
--      reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, ctrl1, ctrl1);
--      local_irq_restore(flags);
-+      __reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, ctrl1, ctrl1);
-       lis->flags |= LIS302DL_F_INPUT_OPEN;
-       /* kick it off -- since we are edge triggered, if we missed the edge
-        * permanent low interrupt is death for us */
--      (lis->pdata->lis302dl_bitbang_read)(lis);
-+      (lis->pdata->lis302dl_bitbang_read_sample)(lis);
-+
-+      local_irq_restore(flags);
-       return 0;
- }
-@@ -504,13 +483,13 @@ static void lis302dl_input_close(struct input_dev *inp)
-       /* since the input core already serializes access and makes sure we
-        * only see close() for the close of the last user, we can safely
-        * disable the data ready events */
--      reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, ctrl1, 0x00);
-+      __reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, ctrl1, 0x00);
-       lis->flags &= ~LIS302DL_F_INPUT_OPEN;
-       /* however, don't power down the whole device if still needed */
-       if (!(lis->flags & LIS302DL_F_WUP_FF ||
-             lis->flags & LIS302DL_F_WUP_CLICK)) {
--              reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD,
-+              __reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD,
-                                0x00);
-       }
-       local_irq_restore(flags);
-@@ -524,23 +503,23 @@ static int __lis302dl_reset_device(struct lis302dl_info *lis)
- {
-       int timeout = 10;
--      reg_write(lis, LIS302DL_REG_CTRL2, LIS302DL_CTRL2_BOOT |
--                                                          LIS302DL_CTRL2_FDS);
-+      (lis->pdata->lis302dl_bitbang_reg_write)(lis, LIS302DL_REG_CTRL2,
-+                                    LIS302DL_CTRL2_BOOT | LIS302DL_CTRL2_FDS);
--      while ((reg_read(lis, LIS302DL_REG_CTRL2) & LIS302DL_CTRL2_BOOT) &&
--                                                                  (timeout--))
-+      while (((lis->pdata->lis302dl_bitbang_reg_read)(lis, LIS302DL_REG_CTRL2)
-+                                        & LIS302DL_CTRL2_BOOT) && (timeout--))
-               mdelay(1);
-       return !!(timeout < 0);
- }
--static int __devinit lis302dl_probe(struct spi_device *spi)
-+static int __devinit lis302dl_probe(struct platform_device *pdev)
- {
-       int rc;
-       struct lis302dl_info *lis;
-       u_int8_t wai;
-       unsigned long flags;
--      struct lis302dl_platform_data *pdata;
-+      struct lis302dl_platform_data *pdata = pdev->dev.platform_data;
-       lis = kzalloc(sizeof(*lis), GFP_KERNEL);
-       if (!lis)
-@@ -548,38 +527,34 @@ static int __devinit lis302dl_probe(struct spi_device *spi)
-       local_irq_save(flags);
--      mutex_init(&lis->lock);
--      lis->spi_dev = spi;
-+      lis->dev = &pdev->dev;
--      spi_set_drvdata(spi, lis);
-+      dev_set_drvdata(lis->dev, lis);
--      pdata = spi->dev.platform_data;
-+      lis->pdata = pdata;
--      rc = spi_setup(spi);
--      if (rc < 0) {
--              dev_err(&spi->dev, "error during spi_setup\n");
--              dev_set_drvdata(&spi->dev, NULL);
--              goto bail_free_lis;
--      }
-+      /* Configure our IO */
-+      (lis->pdata->lis302dl_suspend_io)(lis, 1);
--      wai = reg_read(lis, LIS302DL_REG_WHO_AM_I);
-+      wai = (lis->pdata->lis302dl_bitbang_reg_read)(lis,
-+                                                       LIS302DL_REG_WHO_AM_I);
-       if (wai != LIS302DL_WHO_AM_I_MAGIC) {
--              dev_err(&spi->dev, "unknown who_am_i signature 0x%02x\n", wai);
--              dev_set_drvdata(&spi->dev, NULL);
-+              dev_err(lis->dev, "unknown who_am_i signature 0x%02x\n", wai);
-+              dev_set_drvdata(lis->dev, NULL);
-               rc = -ENODEV;
-               goto bail_free_lis;
-       }
--      rc = sysfs_create_group(&spi->dev.kobj, &lis302dl_attr_group);
-+      rc = sysfs_create_group(&lis->dev->kobj, &lis302dl_attr_group);
-       if (rc) {
--              dev_err(&spi->dev, "error creating sysfs group\n");
-+              dev_err(lis->dev, "error creating sysfs group\n");
-               goto bail_free_lis;
-       }
-       /* initialize input layer details */
-       lis->input_dev = input_allocate_device();
-       if (!lis->input_dev) {
--              dev_err(&spi->dev, "Unable to allocate input device\n");
-+              dev_err(lis->dev, "Unable to allocate input device\n");
-               goto bail_sysfs;
-       }
-@@ -601,57 +576,64 @@ static int __devinit lis302dl_probe(struct spi_device *spi)
-       rc = input_register_device(lis->input_dev);
-       if (rc) {
--              dev_err(&spi->dev, "error %d registering input device\n", rc);
-+              dev_err(lis->dev, "error %d registering input device\n", rc);
-               goto bail_inp_dev;
-       }
-       if (__lis302dl_reset_device(lis))
--              dev_err(&spi->dev, "device BOOT reload failed\n");
-+              dev_err(lis->dev, "device BOOT reload failed\n");
-       /* force us powered */
--      reg_write(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD |
--                                         LIS302DL_CTRL1_Xen |
--                                         LIS302DL_CTRL1_Yen |
--                                         LIS302DL_CTRL1_Zen);
-+      (lis->pdata->lis302dl_bitbang_reg_write)(lis, LIS302DL_REG_CTRL1,
-+                                                    LIS302DL_CTRL1_PD |
-+                                                    LIS302DL_CTRL1_Xen |
-+                                                    LIS302DL_CTRL1_Yen |
-+                                                    LIS302DL_CTRL1_Zen);
-       mdelay(1);
--      reg_write(lis, LIS302DL_REG_CTRL2, 0);
--      reg_write(lis, LIS302DL_REG_CTRL3, LIS302DL_CTRL3_PP_OD |
--                                                          LIS302DL_CTRL3_IHL);
--      reg_write(lis, LIS302DL_REG_FF_WU_THS_1, 0x0);
--      reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1, 0x00);
--      reg_write(lis, LIS302DL_REG_FF_WU_CFG_1, 0x0);
-+      (lis->pdata->lis302dl_bitbang_reg_write)(lis, LIS302DL_REG_CTRL2, 0);
-+      (lis->pdata->lis302dl_bitbang_reg_write)(lis, LIS302DL_REG_CTRL3,
-+                                   LIS302DL_CTRL3_PP_OD | LIS302DL_CTRL3_IHL);
-+      (lis->pdata->lis302dl_bitbang_reg_write)(lis,
-+                                               LIS302DL_REG_FF_WU_THS_1, 0x0);
-+      (lis->pdata->lis302dl_bitbang_reg_write)(lis,
-+                                         LIS302DL_REG_FF_WU_DURATION_1, 0x00);
-+      (lis->pdata->lis302dl_bitbang_reg_write)(lis,
-+                                               LIS302DL_REG_FF_WU_CFG_1, 0x0);
-       /* start off in powered down mode; we power up when someone opens us */
--      reg_write(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_Xen |
--                                         LIS302DL_CTRL1_Yen |
--                                         LIS302DL_CTRL1_Zen);
-+      (lis->pdata->lis302dl_bitbang_reg_write)(lis, LIS302DL_REG_CTRL1,
-+                                                      LIS302DL_CTRL1_Xen |
-+                                                      LIS302DL_CTRL1_Yen |
-+                                                      LIS302DL_CTRL1_Zen);
-       if (pdata->open_drain)
-               /* switch interrupt to open collector, active-low */
--              reg_write(lis, LIS302DL_REG_CTRL3, LIS302DL_CTRL3_PP_OD |
--                                                 LIS302DL_CTRL3_IHL);
-+              (lis->pdata->lis302dl_bitbang_reg_write)(lis,
-+                      LIS302DL_REG_CTRL3, LIS302DL_CTRL3_PP_OD |
-+                                          LIS302DL_CTRL3_IHL);
-       else
-               /* push-pull, active-low */
--              reg_write(lis, LIS302DL_REG_CTRL3, LIS302DL_CTRL3_IHL);
-+              (lis->pdata->lis302dl_bitbang_reg_write)(lis,
-+                                      LIS302DL_REG_CTRL3, LIS302DL_CTRL3_IHL);
--      lis302dl_int_mode(spi, 1, LIS302DL_INTMODE_DATA_READY);
--      lis302dl_int_mode(spi, 2, LIS302DL_INTMODE_DATA_READY);
-+      __lis302dl_int_mode(lis->dev, 1, LIS302DL_INTMODE_DATA_READY);
-+      __lis302dl_int_mode(lis->dev, 2, LIS302DL_INTMODE_DATA_READY);
--      reg_read(lis, LIS302DL_REG_STATUS);
--      reg_read(lis, LIS302DL_REG_FF_WU_SRC_1);
--      reg_read(lis, LIS302DL_REG_FF_WU_SRC_2);
--      reg_read(lis, LIS302DL_REG_CLICK_SRC);
-+      (lis->pdata->lis302dl_bitbang_reg_read)(lis, LIS302DL_REG_STATUS);
-+      (lis->pdata->lis302dl_bitbang_reg_read)(lis, LIS302DL_REG_FF_WU_SRC_1);
-+      (lis->pdata->lis302dl_bitbang_reg_read)(lis, LIS302DL_REG_FF_WU_SRC_2);
-+      (lis->pdata->lis302dl_bitbang_reg_read)(lis, LIS302DL_REG_CLICK_SRC);
--      dev_info(&spi->dev, "Found %s\n", pdata->name);
-+      dev_info(lis->dev, "Found %s\n", pdata->name);
-       lis->pdata = pdata;
--      rc = request_irq(lis->spi_dev->irq, lis302dl_interrupt,
-+      rc = request_irq(pdata->interrupt, lis302dl_interrupt,
-                        IRQF_TRIGGER_FALLING, "lis302dl", lis);
-       if (rc < 0) {
--              dev_err(&spi->dev, "error requesting IRQ %d\n",
--                      lis->spi_dev->irq);
-+              dev_err(lis->dev, "error requesting IRQ %d\n",
-+                      lis->pdata->interrupt);
-               goto bail_inp_reg;
-       }
-       local_irq_restore(flags);
-@@ -662,50 +644,71 @@ bail_inp_reg:
- bail_inp_dev:
-       input_free_device(lis->input_dev);
- bail_sysfs:
--      sysfs_remove_group(&spi->dev.kobj, &lis302dl_attr_group);
-+      sysfs_remove_group(&lis->dev->kobj, &lis302dl_attr_group);
- bail_free_lis:
-       kfree(lis);
-       local_irq_restore(flags);
-       return rc;
- }
--static int __devexit lis302dl_remove(struct spi_device *spi)
-+static int __devexit lis302dl_remove(struct platform_device *pdev)
- {
--      struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-+      struct lis302dl_info *lis = dev_get_drvdata(&pdev->dev);
-       unsigned long flags;
-       /* Reset and power down the device */
-       local_irq_save(flags);
--      reg_write(lis, LIS302DL_REG_CTRL3, 0x00);
--      reg_write(lis, LIS302DL_REG_CTRL2, 0x00);
--      reg_write(lis, LIS302DL_REG_CTRL1, 0x00);
-+      (lis->pdata->lis302dl_bitbang_reg_write)(lis, LIS302DL_REG_CTRL3, 0x00);
-+      (lis->pdata->lis302dl_bitbang_reg_write)(lis, LIS302DL_REG_CTRL2, 0x00);
-+      (lis->pdata->lis302dl_bitbang_reg_write)(lis, LIS302DL_REG_CTRL1, 0x00);
-       local_irq_restore(flags);
-       /* Cleanup resources */
--      free_irq(lis->spi_dev->irq, lis);
--      sysfs_remove_group(&spi->dev.kobj, &lis302dl_attr_group);
-+      free_irq(lis->pdata->interrupt, lis);
-+      sysfs_remove_group(&pdev->dev.kobj, &lis302dl_attr_group);
-       input_unregister_device(lis->input_dev);
-       if (lis->input_dev)
-               input_free_device(lis->input_dev);
--      dev_set_drvdata(&spi->dev, NULL);
-+      dev_set_drvdata(lis->dev, NULL);
-       kfree(lis);
-       return 0;
- }
- #ifdef CONFIG_PM
--static int lis302dl_suspend(struct spi_device *spi, pm_message_t state)
-+
-+static u8 regs_to_save[] = {
-+      LIS302DL_REG_CTRL1,
-+      LIS302DL_REG_CTRL2,
-+      LIS302DL_REG_CTRL3,
-+      LIS302DL_REG_FF_WU_CFG_1,
-+      LIS302DL_REG_FF_WU_THS_1,
-+      LIS302DL_REG_FF_WU_DURATION_1,
-+      LIS302DL_REG_FF_WU_CFG_2,
-+      LIS302DL_REG_FF_WU_THS_2,
-+      LIS302DL_REG_FF_WU_DURATION_2,
-+      LIS302DL_REG_CLICK_CFG,
-+      LIS302DL_REG_CLICK_THSY_X,
-+      LIS302DL_REG_CLICK_THSZ,
-+      LIS302DL_REG_CLICK_TIME_LIMIT,
-+      LIS302DL_REG_CLICK_LATENCY,
-+      LIS302DL_REG_CLICK_WINDOW,
-+
-+};
-+
-+static int lis302dl_suspend(struct platform_device *pdev, pm_message_t state)
- {
--      struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-+      struct lis302dl_info *lis = dev_get_drvdata(&pdev->dev);
-       unsigned long flags;
-       u_int8_t tmp;
-+      int n;
-       /* determine if we want to wake up from the accel. */
-       if (lis->flags & LIS302DL_F_WUP_FF ||
-               lis->flags & LIS302DL_F_WUP_CLICK)
-               return 0;
--      disable_irq(lis->spi_dev->irq);
-+      disable_irq(lis->pdata->interrupt);
-       local_irq_save(flags);
-       /*
-@@ -718,38 +721,15 @@ static int lis302dl_suspend(struct spi_device *spi, pm_message_t state)
-       (lis->pdata->lis302dl_suspend_io)(lis, 1);
-       /* save registers */
--      lis->regs[LIS302DL_REG_CTRL1] = reg_read(lis, LIS302DL_REG_CTRL1);
--      lis->regs[LIS302DL_REG_CTRL2] = reg_read(lis, LIS302DL_REG_CTRL2);
--      lis->regs[LIS302DL_REG_CTRL3] = reg_read(lis, LIS302DL_REG_CTRL3);
--      lis->regs[LIS302DL_REG_FF_WU_CFG_1] =
--                              reg_read(lis, LIS302DL_REG_FF_WU_CFG_1);
--      lis->regs[LIS302DL_REG_FF_WU_THS_1] =
--                              reg_read(lis, LIS302DL_REG_FF_WU_THS_1);
--      lis->regs[LIS302DL_REG_FF_WU_DURATION_1] =
--                              reg_read(lis, LIS302DL_REG_FF_WU_DURATION_1);
--      lis->regs[LIS302DL_REG_FF_WU_CFG_2] =
--                              reg_read(lis, LIS302DL_REG_FF_WU_CFG_2);
--      lis->regs[LIS302DL_REG_FF_WU_THS_2] =
--                              reg_read(lis, LIS302DL_REG_FF_WU_THS_2);
--      lis->regs[LIS302DL_REG_FF_WU_DURATION_2] =
--                              reg_read(lis, LIS302DL_REG_FF_WU_DURATION_2);
--      lis->regs[LIS302DL_REG_CLICK_CFG] =
--                              reg_read(lis, LIS302DL_REG_CLICK_CFG);
--      lis->regs[LIS302DL_REG_CLICK_THSY_X] =
--                              reg_read(lis, LIS302DL_REG_CLICK_THSY_X);
--      lis->regs[LIS302DL_REG_CLICK_THSZ] =
--                              reg_read(lis, LIS302DL_REG_CLICK_THSZ);
--      lis->regs[LIS302DL_REG_CLICK_TIME_LIMIT] =
--                              reg_read(lis, LIS302DL_REG_CLICK_TIME_LIMIT);
--      lis->regs[LIS302DL_REG_CLICK_LATENCY] =
--                              reg_read(lis, LIS302DL_REG_CLICK_LATENCY);
--      lis->regs[LIS302DL_REG_CLICK_WINDOW] =
--                              reg_read(lis, LIS302DL_REG_CLICK_WINDOW);
-+      for (n = 0; n < ARRAY_SIZE(regs_to_save); n++)
-+              lis->regs[regs_to_save[n]] =
-+                      (lis->pdata->lis302dl_bitbang_reg_read)(lis,
-+                                                             regs_to_save[n]);
-       /* power down */
--      tmp = reg_read(lis, LIS302DL_REG_CTRL1);
-+      tmp = (lis->pdata->lis302dl_bitbang_reg_read)(lis, LIS302DL_REG_CTRL1);
-       tmp &= ~LIS302DL_CTRL1_PD;
--      reg_write(lis, LIS302DL_REG_CTRL1, tmp);
-+      (lis->pdata->lis302dl_bitbang_reg_write)(lis, LIS302DL_REG_CTRL1, tmp);
-       /* place our IO to the device in sleep-compatible states */
-       (lis->pdata->lis302dl_suspend_io)(lis, 0);
-@@ -759,10 +739,11 @@ static int lis302dl_suspend(struct spi_device *spi, pm_message_t state)
-       return 0;
- }
--static int lis302dl_resume(struct spi_device *spi)
-+static int lis302dl_resume(struct platform_device *pdev)
- {
--      struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-+      struct lis302dl_info *lis = dev_get_drvdata(&pdev->dev);
-       unsigned long flags;
-+      int n;
-       if (lis->flags & LIS302DL_F_WUP_FF ||
-               lis->flags & LIS302DL_F_WUP_CLICK)
-@@ -774,50 +755,28 @@ static int lis302dl_resume(struct spi_device *spi)
-       (lis->pdata->lis302dl_suspend_io)(lis, 1);
-       /* resume from powerdown first! */
--      reg_write(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD |
--                                         LIS302DL_CTRL1_Xen |
--                                         LIS302DL_CTRL1_Yen |
--                                         LIS302DL_CTRL1_Zen);
-+      (lis->pdata->lis302dl_bitbang_reg_write)(lis, LIS302DL_REG_CTRL1,
-+                                                    LIS302DL_CTRL1_PD |
-+                                                    LIS302DL_CTRL1_Xen |
-+                                                    LIS302DL_CTRL1_Yen |
-+                                                    LIS302DL_CTRL1_Zen);
-       mdelay(1);
-       if (__lis302dl_reset_device(lis))
--              dev_err(&spi->dev, "device BOOT reload failed\n");
-+              dev_err(&pdev->dev, "device BOOT reload failed\n");
--      /* restore registers after resume */
--      reg_write(lis, LIS302DL_REG_CTRL1, lis->regs[LIS302DL_REG_CTRL1] |
--                                              LIS302DL_CTRL1_PD |
-+      lis->regs[LIS302DL_REG_CTRL1] |=        LIS302DL_CTRL1_PD |
-                                               LIS302DL_CTRL1_Xen |
-                                               LIS302DL_CTRL1_Yen |
--                                              LIS302DL_CTRL1_Zen);
--      reg_write(lis, LIS302DL_REG_CTRL2, lis->regs[LIS302DL_REG_CTRL2]);
--      reg_write(lis, LIS302DL_REG_CTRL3, lis->regs[LIS302DL_REG_CTRL3]);
--      reg_write(lis, LIS302DL_REG_FF_WU_CFG_1,
--                lis->regs[LIS302DL_REG_FF_WU_CFG_1]);
--      reg_write(lis, LIS302DL_REG_FF_WU_THS_1,
--                lis->regs[LIS302DL_REG_FF_WU_THS_1]);
--      reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1,
--                lis->regs[LIS302DL_REG_FF_WU_DURATION_1]);
--      reg_write(lis, LIS302DL_REG_FF_WU_CFG_2,
--                lis->regs[LIS302DL_REG_FF_WU_CFG_2]);
--      reg_write(lis, LIS302DL_REG_FF_WU_THS_2,
--                lis->regs[LIS302DL_REG_FF_WU_THS_2]);
--      reg_write(lis, LIS302DL_REG_FF_WU_DURATION_2,
--                lis->regs[LIS302DL_REG_FF_WU_DURATION_2]);
--      reg_write(lis, LIS302DL_REG_CLICK_CFG,
--                lis->regs[LIS302DL_REG_CLICK_CFG]);
--      reg_write(lis, LIS302DL_REG_CLICK_THSY_X,
--                lis->regs[LIS302DL_REG_CLICK_THSY_X]);
--      reg_write(lis, LIS302DL_REG_CLICK_THSZ,
--                lis->regs[LIS302DL_REG_CLICK_THSZ]);
--      reg_write(lis, LIS302DL_REG_CLICK_TIME_LIMIT,
--                lis->regs[LIS302DL_REG_CLICK_TIME_LIMIT]);
--      reg_write(lis, LIS302DL_REG_CLICK_LATENCY,
--                lis->regs[LIS302DL_REG_CLICK_LATENCY]);
--      reg_write(lis, LIS302DL_REG_CLICK_WINDOW,
--                lis->regs[LIS302DL_REG_CLICK_WINDOW]);
-+                                              LIS302DL_CTRL1_Zen;
-+
-+      /* restore registers after resume */
-+      for (n = 0; n < ARRAY_SIZE(regs_to_save); n++)
-+              (lis->pdata->lis302dl_bitbang_reg_write)(lis,
-+                                 regs_to_save[n], lis->regs[regs_to_save[n]]);
-       local_irq_restore(flags);
--      enable_irq(lis->spi_dev->irq);
-+      enable_irq(lis->pdata->interrupt);
-       return 0;
- }
-@@ -826,7 +785,7 @@ static int lis302dl_resume(struct spi_device *spi)
- #define lis302dl_resume               NULL
- #endif
--static struct spi_driver lis302dl_driver = {
-+static struct platform_driver lis302dl_driver = {
-       .driver = {
-               .name   = "lis302dl",
-               .owner  = THIS_MODULE,
-@@ -838,14 +797,14 @@ static struct spi_driver lis302dl_driver = {
-       .resume  = lis302dl_resume,
- };
--static int __init lis302dl_init(void)
-+static int __devinit lis302dl_init(void)
- {
--      return spi_register_driver(&lis302dl_driver);
-+      return platform_driver_register(&lis302dl_driver);
- }
- static void __exit lis302dl_exit(void)
- {
--      spi_unregister_driver(&lis302dl_driver);
-+      platform_driver_unregister(&lis302dl_driver);
- }
- MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-diff --git a/include/linux/lis302dl.h b/include/linux/lis302dl.h
-index 7daa8b3..4578db4 100644
---- a/include/linux/lis302dl.h
-+++ b/include/linux/lis302dl.h
-@@ -15,15 +15,18 @@ struct lis302dl_platform_data {
-       unsigned long pin_mosi;
-       unsigned long pin_miso;
-       int open_drain;
--      void (*lis302dl_bitbang_read)(struct lis302dl_info *);
-+      int interrupt;
-+      void (*lis302dl_bitbang_read_sample)(struct lis302dl_info *);
-       void (*lis302dl_suspend_io)(struct lis302dl_info *, int resuming);
-+      int (*lis302dl_bitbang_reg_read)(struct lis302dl_info *, u8 reg);
-+      void (*lis302dl_bitbang_reg_write)(struct lis302dl_info *, u8 reg,
-+                                                                      u8 val);
- };
- struct lis302dl_info {
-       struct lis302dl_platform_data *pdata;
--      struct spi_device *spi_dev;
-+      struct device *dev;
-       struct input_dev *input_dev;
--      struct mutex lock;
-       unsigned int flags;
-       u_int8_t regs[0x40];
- };
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1304--Acceleration-threshold-configuration-lis302dl-con.patch b/target/linux/s3c24xx/patches-2.6.24/1304--Acceleration-threshold-configuration-lis302dl-con.patch
deleted file mode 100644 (file)
index 5e9eb2a..0000000
+++ /dev/null
@@ -1,298 +0,0 @@
-From 35d910f40ce2c7c959edfbaa671f88e8da5fa6b1 Mon Sep 17 00:00:00 2001
-From: Simon Kagstrom <simon.kagstrom@gmail.com>
-Date: Mon, 13 Oct 2008 12:47:12 +0100
-Subject: [PATCH] : Acceleration threshold configuration: lis302dl-configure-threshold-on-bitbang.patch
-
-Configure threshold for accelerometer input
-
-From: Simon Kagstrom <simon.kagstrom@gmail.com>
-
-This patch, based on bitbang-all-the-way from the andy branch,
-implements a configurable acceleration threshold that need to be
-exceeded for the accelerometer to generate input data. The threshold can
-be set in sysfs:
-
-   cd /sys/devices/.../lis302dl.1/
-   echo 10 > threshold
-
-A value of 10 (180 mg, from the lis302dl application note) seems
-empirically good to keep the accelerometers quiet while riding a (calm)
-train.
-
-
-The patch moves the sample reading for the accelerometers from
-mach-gta02.c to lis302dl.c and instead exports the generic
-lis302dl_bitbang function. This is to easier support both "raw" data
-reading and reading with a threshold in the future (not yet implemented).
-
-Signed-off-by: Simon Kagstrom <simon.kagstrom@gmail.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   35 ++-------------
- drivers/input/misc/lis302dl.c      |   83 ++++++++++++++++++++++++++++++++++--
- include/linux/lis302dl.h           |    3 +
- 3 files changed, 87 insertions(+), 34 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index b19632c..1a9d823 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1050,7 +1050,6 @@ static struct platform_device gta02_vibrator_dev = {
-  */
- /* #define DEBUG_SPEW_MS */
--#define MG_PER_SAMPLE 18
- struct lis302dl_platform_data lis302_pdata_top;
- struct lis302dl_platform_data lis302_pdata_bottom;
-@@ -1060,7 +1059,7 @@ struct lis302dl_platform_data lis302_pdata_bottom;
-  * only call with interrupts off!
-  */
--static void __gta02_lis302dl_bitbang(struct lis302dl_info *lis, u8 *tx,
-+static void gta02_lis302dl_bitbang(struct lis302dl_info *lis, u8 *tx,
-                                            int tx_bytes, u8 *rx, int rx_bytes)
- {
-       struct lis302dl_platform_data *pdata = lis->pdata;
-@@ -1124,7 +1123,7 @@ static int gta02_lis302dl_bitbang_read_reg(struct lis302dl_info *lis, u8 reg)
-       local_irq_save(flags);
--      __gta02_lis302dl_bitbang(lis, &data, 1, &data, 1);
-+      gta02_lis302dl_bitbang(lis, &data, 1, &data, 1);
-       local_irq_restore(flags);
-@@ -1139,37 +1138,13 @@ static void gta02_lis302dl_bitbang_write_reg(struct lis302dl_info *lis, u8 reg,
-       local_irq_save(flags);
--      __gta02_lis302dl_bitbang(lis, &data[0], 2, NULL, 0);
-+      gta02_lis302dl_bitbang(lis, &data[0], 2, NULL, 0);
-       local_irq_restore(flags);
- }
--static void gta02_lis302dl_bitbang_sample(struct lis302dl_info *lis)
--{
--      u8 data = 0xc0 | LIS302DL_REG_OUT_X; /* read, autoincrement */
--      u8 read[5];
--      unsigned long flags;
--
--      local_irq_save(flags);
--
--      __gta02_lis302dl_bitbang(lis, &data, 1, &read[0], 5);
--
--      local_irq_restore(flags);
--
--      input_report_rel(lis->input_dev, REL_X, MG_PER_SAMPLE * (s8)read[0]);
--      input_report_rel(lis->input_dev, REL_Y, MG_PER_SAMPLE * (s8)read[2]);
--      input_report_rel(lis->input_dev, REL_Z, MG_PER_SAMPLE * (s8)read[4]);
--
--      input_sync(lis->input_dev);
--#ifdef DEBUG_SPEW_MS
--      printk(KERN_INFO "%s: %d %d %d\n", pdata->name, read[0], read[2],
--                                                                     read[4]);
--#endif
--}
--
--
- void gta02_lis302dl_suspend_io(struct lis302dl_info *lis, int resume)
- {
-       struct lis302dl_platform_data *pdata = lis->pdata;
-@@ -1210,7 +1185,7 @@ struct lis302dl_platform_data lis302_pdata_top = {
-               .pin_miso       = S3C2410_GPG5,
-               .interrupt      = GTA02_IRQ_GSENSOR_1,
-               .open_drain     = 1, /* altered at runtime by PCB rev */
--              .lis302dl_bitbang_read_sample = gta02_lis302dl_bitbang_sample,
-+              .lis302dl_bitbang = gta02_lis302dl_bitbang,
-               .lis302dl_bitbang_reg_read = gta02_lis302dl_bitbang_read_reg,
-               .lis302dl_bitbang_reg_write = gta02_lis302dl_bitbang_write_reg,
-               .lis302dl_suspend_io = gta02_lis302dl_suspend_io,
-@@ -1224,7 +1199,7 @@ struct lis302dl_platform_data lis302_pdata_bottom = {
-               .pin_miso       = S3C2410_GPG5,
-               .interrupt      = GTA02_IRQ_GSENSOR_2,
-               .open_drain     = 1, /* altered at runtime by PCB rev */
--              .lis302dl_bitbang_read_sample = gta02_lis302dl_bitbang_sample,
-+              .lis302dl_bitbang = gta02_lis302dl_bitbang,
-               .lis302dl_bitbang_reg_read = gta02_lis302dl_bitbang_read_reg,
-               .lis302dl_bitbang_reg_write = gta02_lis302dl_bitbang_write_reg,
-               .lis302dl_suspend_io = gta02_lis302dl_suspend_io,
-diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
-index 1d5781d..1013f4a 100644
---- a/drivers/input/misc/lis302dl.c
-+++ b/drivers/input/misc/lis302dl.c
-@@ -4,6 +4,8 @@
-  * Author: Harald Welte <laforge@openmoko.org>
-  *         converted to private bitbang by:
-  *         Andy Green <andy@openmoko.com>
-+ *         ability to set acceleration threshold added by:
-+ *         Simon Kagstrom <simon.kagstrom@gmail.com>
-  * All rights reserved.
-  *
-  * This program is free software; you can redistribute it and/or
-@@ -67,6 +69,31 @@ enum lis302dl_intmode {
-       LIS302DL_INTMODE_CLICK          = 0x07,
- };
-+#define MG_PER_SAMPLE 18
-+
-+static void lis302dl_bitbang_read_sample(struct lis302dl_info *lis)
-+{
-+      u8 data = 0xc0 | LIS302DL_REG_OUT_X; /* read, autoincrement */
-+      u8 read[5];
-+      unsigned long flags;
-+
-+      local_irq_save(flags);
-+
-+      (lis->pdata->lis302dl_bitbang)(lis, &data, 1, &read[0], 5);
-+
-+      local_irq_restore(flags);
-+
-+      input_report_rel(lis->input_dev, REL_X, MG_PER_SAMPLE * (s8)read[0]);
-+      input_report_rel(lis->input_dev, REL_Y, MG_PER_SAMPLE * (s8)read[2]);
-+      input_report_rel(lis->input_dev, REL_Z, MG_PER_SAMPLE * (s8)read[4]);
-+
-+      input_sync(lis->input_dev);
-+
-+      /* Reset the HP filter */
-+      (lis->pdata->lis302dl_bitbang_reg_read)(lis,
-+                      LIS302DL_REG_HP_FILTER_RESET);
-+}
-+
- static void __lis302dl_int_mode(struct device *dev, int int_pin,
-                             enum lis302dl_intmode mode)
- {
-@@ -108,7 +135,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *_lis)
- {
-       struct lis302dl_info *lis = _lis;
--      (lis->pdata->lis302dl_bitbang_read_sample)(lis);
-+      lis302dl_bitbang_read_sample(lis);
-       return IRQ_HANDLED;
- }
-@@ -187,6 +214,36 @@ static ssize_t set_scale(struct device *dev, struct device_attribute *attr,
- static DEVICE_ATTR(full_scale, S_IRUGO | S_IWUSR, show_scale, set_scale);
-+static ssize_t show_threshold(struct device *dev, struct device_attribute *attr,
-+               char *buf)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(dev);
-+
-+      return sprintf(buf, "%d\n", lis->threshold);
-+}
-+
-+static ssize_t set_threshold(struct device *dev, struct device_attribute *attr,
-+               const char *buf, size_t count)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(dev);
-+      u32 val;
-+
-+      if (sscanf(buf, "%d\n", &val) != 1)
-+              return -EINVAL;
-+      if (val < 0 || val > 255)
-+              return -ERANGE;
-+
-+      /* Set the threshold and write it out if the device is used */
-+      lis->threshold = val;
-+      if (lis->flags & LIS302DL_F_INPUT_OPEN)
-+              (lis->pdata->lis302dl_bitbang_reg_write)(lis,
-+                              LIS302DL_REG_FF_WU_THS_1, lis->threshold);
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(threshold, S_IRUGO | S_IWUSR, show_threshold, set_threshold);
-+
- static ssize_t lis302dl_dump(struct device *dev, struct device_attribute *attr,
-                                                                     char *buf)
- {
-@@ -436,6 +493,7 @@ static DEVICE_ATTR(freefall_wakeup_2, S_IRUGO | S_IWUSR, show_freefall_2,
- static struct attribute *lis302dl_sysfs_entries[] = {
-       &dev_attr_sample_rate.attr,
-       &dev_attr_full_scale.attr,
-+      &dev_attr_threshold.attr,
-       &dev_attr_dump.attr,
-       &dev_attr_freefall_wakeup_1.attr,
-       &dev_attr_freefall_wakeup_2.attr,
-@@ -454,17 +512,32 @@ static int lis302dl_input_open(struct input_dev *inp)
-       struct lis302dl_info *lis = inp->private;
-       u_int8_t ctrl1 = LIS302DL_CTRL1_PD | LIS302DL_CTRL1_Xen |
-                        LIS302DL_CTRL1_Yen | LIS302DL_CTRL1_Zen;
-+      u_int8_t ctrl2 = LIS302DL_CTRL2_HPFF1;
-       unsigned long flags;
-       local_irq_save(flags);
-       /* make sure we're powered up and generate data ready */
-       __reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, ctrl1, ctrl1);
-+      (lis->pdata->lis302dl_bitbang_reg_write)(lis, LIS302DL_REG_CTRL2,
-+                      ctrl2);
-+      (lis->pdata->lis302dl_bitbang_reg_write)(lis,
-+                      LIS302DL_REG_FF_WU_THS_1, lis->threshold);
-+      (lis->pdata->lis302dl_bitbang_reg_write)(lis,
-+                      LIS302DL_REG_FF_WU_DURATION_1, 0);
-+
-+      /* Clear the HP filter "starting point" */
-+      (lis->pdata->lis302dl_bitbang_reg_read)(lis,
-+                      LIS302DL_REG_HP_FILTER_RESET);
-+      (lis->pdata->lis302dl_bitbang_reg_write)(lis,
-+                      LIS302DL_REG_FF_WU_CFG_1, LIS302DL_FFWUCFG_XHIE |
-+                      LIS302DL_FFWUCFG_YHIE | LIS302DL_FFWUCFG_ZHIE);
-+
-       lis->flags |= LIS302DL_F_INPUT_OPEN;
-       /* kick it off -- since we are edge triggered, if we missed the edge
-        * permanent low interrupt is death for us */
--      (lis->pdata->lis302dl_bitbang_read_sample)(lis);
-+      lis302dl_bitbang_read_sample(lis);
-       local_irq_restore(flags);
-@@ -567,6 +640,8 @@ static int __devinit lis302dl_probe(struct platform_device *pdev)
-       set_bit(BTN_Y, lis->input_dev->keybit);
-       set_bit(BTN_Z, lis->input_dev->keybit);
- */
-+      lis->threshold = 1;
-+
-       lis->input_dev->private = lis;
-       lis->input_dev->name = pdata->name;
-        /* SPI Bus not defined as a valid bus for input subsystem*/
-@@ -617,8 +692,8 @@ static int __devinit lis302dl_probe(struct platform_device *pdev)
-               (lis->pdata->lis302dl_bitbang_reg_write)(lis,
-                                       LIS302DL_REG_CTRL3, LIS302DL_CTRL3_IHL);
--      __lis302dl_int_mode(lis->dev, 1, LIS302DL_INTMODE_DATA_READY);
--      __lis302dl_int_mode(lis->dev, 2, LIS302DL_INTMODE_DATA_READY);
-+      __lis302dl_int_mode(lis->dev, 1, LIS302DL_INTMODE_FF_WU_12);
-+      __lis302dl_int_mode(lis->dev, 2, LIS302DL_INTMODE_FF_WU_12);
-       (lis->pdata->lis302dl_bitbang_reg_read)(lis, LIS302DL_REG_STATUS);
-       (lis->pdata->lis302dl_bitbang_reg_read)(lis, LIS302DL_REG_FF_WU_SRC_1);
-diff --git a/include/linux/lis302dl.h b/include/linux/lis302dl.h
-index 4578db4..f3f994d 100644
---- a/include/linux/lis302dl.h
-+++ b/include/linux/lis302dl.h
-@@ -16,6 +16,8 @@ struct lis302dl_platform_data {
-       unsigned long pin_miso;
-       int open_drain;
-       int interrupt;
-+      void (*lis302dl_bitbang)(struct lis302dl_info *lis, u8 *tx,
-+                      int tx_bytes, u8 *rx, int rx_bytes);
-       void (*lis302dl_bitbang_read_sample)(struct lis302dl_info *);
-       void (*lis302dl_suspend_io)(struct lis302dl_info *, int resuming);
-       int (*lis302dl_bitbang_reg_read)(struct lis302dl_info *, u8 reg);
-@@ -28,6 +30,7 @@ struct lis302dl_info {
-       struct device *dev;
-       struct input_dev *input_dev;
-       unsigned int flags;
-+      unsigned int threshold;
-       u_int8_t regs[0x40];
- };
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1305-suppress-onkey-events-on-resume-Was-Re-Where-ar.patch b/target/linux/s3c24xx/patches-2.6.24/1305-suppress-onkey-events-on-resume-Was-Re-Where-ar.patch
deleted file mode 100644 (file)
index 174c1c0..0000000
+++ /dev/null
@@ -1,176 +0,0 @@
-From 71f219082f5c04a80f9b143fc92a51a3de5c6683 Mon Sep 17 00:00:00 2001
-From: \\\\\\\"Mike (mwester)\\\\\\ <mwester@dls.net>
-Date: Tue, 14 Oct 2008 05:46:34 +0100
-Subject: [PATCH] suppress "onkey" events on resume [Was: Re: Where are actions configured for buttons in FSO?]
-
-Michael 'Mickey' Lauer wrote:
-...
-> The problem is (and this is the reason why I'm crossposting this to the
-> kernel mailing list), the kernel is not swallowing the power button
-> presses that triggers the resume, so you need some "real" programming
-> (as opposed to the expressional complexity of our rules) in order to
-> prevent falling asleep right after resume.
->
-> Kernel-guys, can we change that?
-
-suppress-resume-onkey-event.patch
-
-This suppresses the key press and key release events from the
-power button, in the case where the power button is the wake
-event for the GTA01 or GTA02 device.
-
-Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- drivers/i2c/chips/pcf50606.c |   34 +++++++++++++++++++++++++++++-----
- drivers/i2c/chips/pcf50633.c |   30 ++++++++++++++++++++++++++----
- 2 files changed, 55 insertions(+), 9 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
-index 18263fb..706ce6d 100644
---- a/drivers/i2c/chips/pcf50606.c
-+++ b/drivers/i2c/chips/pcf50606.c
-@@ -120,6 +120,7 @@ struct pcf50606_data {
-       int onkey_seconds;
-       int irq;
-       int coldplug_done;
-+      int suppress_onkey_events;
-       enum pcf50606_suspend_states suspend_state;
- #ifdef CONFIG_PM
-       struct {
-@@ -656,9 +657,21 @@ static void pcf50606_work(struct work_struct *work)
-        *
-        * pcf50606 resume is really really over now then.
-        */
--      if (pcf->suspend_state != PCF50606_SS_RUNNING)
-+      if (pcf->suspend_state != PCF50606_SS_RUNNING) {
-               pcf->suspend_state = PCF50606_SS_RUNNING;
-+              /* peek at the IRQ reason, if power button then set a flag
-+               * so that we do not signal the event to userspace
-+               */
-+              if (pcfirq[0] & (PCF50606_INT1_ONKEYF | PCF50606_INT1_ONKEYR)) {
-+                      pcf->suppress_onkey_events = 1;
-+                      dev_dbg(&pcf->client.dev,
-+                              "Wake by ONKEY, suppressing ONKEY events");
-+              } else {
-+                      pcf->suppress_onkey_events = 0;
-+              }
-+      }
-+
-       if (!pcf->coldplug_done) {
-               DEBUGPC("PMU Coldplug init\n");
-@@ -689,9 +702,13 @@ static void pcf50606_work(struct work_struct *work)
-       if (pcfirq[0] & PCF50606_INT1_ONKEYF) {
-               /* ONKEY falling edge (start of button press) */
--              DEBUGPC("ONKEYF ");
-               pcf->flags |= PCF50606_F_PWR_PRESSED;
--              input_report_key(pcf->input_dev, KEY_POWER, 1);
-+              if (!pcf->suppress_onkey_events) {
-+                      DEBUGPC("ONKEYF ");
-+                      input_report_key(pcf->input_dev, KEY_POWER, 1);
-+              } else {
-+                      DEBUGPC("ONKEYF(unreported) ");
-+              }
-       }
-       if (pcfirq[0] & PCF50606_INT1_ONKEY1S) {
-               /* ONKEY pressed for more than 1 second */
-@@ -706,10 +723,16 @@ static void pcf50606_work(struct work_struct *work)
-       }
-       if (pcfirq[0] & PCF50606_INT1_ONKEYR) {
-               /* ONKEY rising edge (end of button press) */
--              DEBUGPC("ONKEYR ");
-               pcf->flags &= ~PCF50606_F_PWR_PRESSED;
-               pcf->onkey_seconds = -1;
--              input_report_key(pcf->input_dev, KEY_POWER, 0);
-+              if (!pcf->suppress_onkey_events) {
-+                      DEBUGPC("ONKEYR ");
-+                      input_report_key(pcf->input_dev, KEY_POWER, 0);
-+              } else {
-+                      DEBUGPC("ONKEYR(suppressed) ");
-+                      /* don't suppress any more power button events */
-+                      pcf->suppress_onkey_events = 0;
-+              }
-               /* disable SECOND interrupt in case RTC didn't
-                * request it */
-               if (!(pcf->flags & PCF50606_F_RTC_SECOND))
-@@ -1766,6 +1789,7 @@ static int pcf50606_detect(struct i2c_adapter *adapter, int address, int kind)
-       INIT_WORK(&data->work, pcf50606_work);
-       data->irq = irq;
-       data->working = 0;
-+      data->suppress_onkey_events = 0;
-       data->onkey_seconds = -1;
-       data->pdata = pcf50606_pdev->dev.platform_data;
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index c186fdb..490e34d 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -135,6 +135,7 @@ struct pcf50633_data {
-       int usb_removal_count;
-       u8 pcfirq_resume[5];
-       int probe_completed;
-+      int suppress_onkey_events;
-       /* if he pulls battery while charging, we notice that and correctly
-        * report that the charger is idle.  But there is no interrupt that
-@@ -848,6 +849,16 @@ static void pcf50633_work(struct work_struct *work)
-               /* pcf50633 resume is really really over now then */
-               pcf->suspend_state = PCF50633_SS_RUNNING;
-+
-+              /* peek at the IRQ reason, if power button then set a flag
-+               * so that we do not signal the event to userspace
-+               */
-+              if (pcfirq[1] & (PCF50633_INT2_ONKEYF | PCF50633_INT2_ONKEYR)) {
-+                      pcf->suppress_onkey_events = 1;
-+                      DEBUGP("Wake by ONKEY, suppressing ONKEY event");
-+              } else {
-+                      pcf->suppress_onkey_events = 0;
-+              }
-       }
-       if (!pcf->coldplug_done) {
-@@ -988,16 +999,26 @@ static void pcf50633_work(struct work_struct *work)
-       if (pcfirq[1] & PCF50633_INT2_ONKEYF) {
-               /* ONKEY falling edge (start of button press) */
--              DEBUGPC("ONKEYF ");
-               pcf->flags |= PCF50633_F_PWR_PRESSED;
--              input_report_key(pcf->input_dev, KEY_POWER, 1);
-+              if (!pcf->suppress_onkey_events) {
-+                      DEBUGPC("ONKEYF ");
-+                      input_report_key(pcf->input_dev, KEY_POWER, 1);
-+              } else {
-+                      DEBUGPC("ONKEYF(unreported) ");
-+              }
-       }
-       if (pcfirq[1] & PCF50633_INT2_ONKEYR) {
-               /* ONKEY rising edge (end of button press) */
--              DEBUGPC("ONKEYR ");
-               pcf->flags &= ~PCF50633_F_PWR_PRESSED;
-               pcf->onkey_seconds = -1;
--              input_report_key(pcf->input_dev, KEY_POWER, 0);
-+              if (!pcf->suppress_onkey_events) {
-+                      DEBUGPC("ONKEYR ");
-+                      input_report_key(pcf->input_dev, KEY_POWER, 0);
-+              } else {
-+                      DEBUGPC("ONKEYR(unreported) ");
-+                      /* don't suppress any more power button events */
-+                      pcf->suppress_onkey_events = 0;
-+              }
-               /* disable SECOND interrupt in case RTC didn't
-                * request it */
-               if (!(pcf->flags & PCF50633_F_RTC_SECOND))
-@@ -2135,6 +2156,7 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-       INIT_WORK(&pcf->work_usb_curlimit, pcf50633_work_usbcurlim);
-       pcf->irq = irq;
-       pcf->working = 0;
-+      pcf->suppress_onkey_events = 0;
-       pcf->onkey_seconds = -1;
-       pcf->pdata = pcf50633_pdev->dev.platform_data;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1306--lis302dl-refactor-and-cleanup.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1306--lis302dl-refactor-and-cleanup.patch.patch
deleted file mode 100644 (file)
index 452b2aa..0000000
+++ /dev/null
@@ -1,478 +0,0 @@
-From 3318a7cb3165a33046e122294e1878e3bd6555d8 Mon Sep 17 00:00:00 2001
-From: Simon Kagstrom <simon.kagstrom@gmail.com>
-Date: Thu, 16 Oct 2008 01:19:20 +0100
-Subject: [PATCH] : lis302dl-refactor-and-cleanup.patch
-
-Some code refactoring.
-
-From: Simon Kagstrom <simon.kagstrom@gmail.com>
-
-Re-added __reg_read and __reg_write and re-indent the code according to
-these. Move some input-related functions to get a more "logical" order,
-e.g., in the future we might want to support clicks again and call these
-from read_sample. Removed unused function pointer in the structure
-
-Signed-off-by: Simon Kagstrom <simon.kagstrom@gmail.com>
----
- drivers/input/misc/lis302dl.c |  260 ++++++++++++++++++++---------------------
- include/linux/lis302dl.h      |    1 -
- 2 files changed, 125 insertions(+), 136 deletions(-)
-
-diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
-index 1013f4a..300918d 100644
---- a/drivers/input/misc/lis302dl.c
-+++ b/drivers/input/misc/lis302dl.c
-@@ -43,19 +43,58 @@
- #include <linux/lis302dl.h>
-+/* Utility functions */
-+static u8 __reg_read(struct lis302dl_info *lis, u8 reg)
-+{
-+      return (lis->pdata->lis302dl_bitbang_reg_read)(lis, reg);
-+}
-+static void __reg_write(struct lis302dl_info *lis, u8 reg, u8 val)
-+{
-+      (lis->pdata->lis302dl_bitbang_reg_write)(lis, reg, val);
-+}
- static void __reg_set_bit_mask(struct lis302dl_info *lis, u8 reg, u8 mask,
--                                                                       u8 val)
-+              u8 val)
- {
-       u_int8_t tmp;
-       val &= mask;
--      tmp = (lis->pdata->lis302dl_bitbang_reg_read)(lis, reg);
-+      tmp = __reg_read(lis, reg);
-       tmp &= ~mask;
-       tmp |= val;
--      (lis->pdata->lis302dl_bitbang_reg_write)(lis, reg, tmp);
-+      __reg_write(lis, reg, tmp);
-+}
-+
-+static int __ms_to_duration(struct lis302dl_info *lis, int ms)
-+{
-+      u8 r = __reg_read(lis, LIS302DL_REG_CTRL1);
-+
-+      /* If we have 400 ms sampling rate, the stepping is 2.5 ms,
-+       * on 100 ms the stepping is 10ms */
-+      if (r & LIS302DL_CTRL1_DR) {
-+              /* Too large */
-+              if (ms > 637)
-+                      return -1;
-+
-+              return (ms * 10) / 25;
-+      }
-+
-+      /* Too large value */
-+      if (ms > 2550)
-+                      return -1;
-+      return ms / 10;
-+}
-+
-+static int __duration_to_ms(struct lis302dl_info *lis, int duration)
-+{
-+      u8 r = __reg_read(lis, LIS302DL_REG_CTRL1);
-+
-+      if (r & LIS302DL_CTRL1_DR)
-+              return (duration * 25) / 10;
-+
-+      return duration * 10;
- }
- /* interrupt handling related */
-@@ -69,30 +108,6 @@ enum lis302dl_intmode {
-       LIS302DL_INTMODE_CLICK          = 0x07,
- };
--#define MG_PER_SAMPLE 18
--
--static void lis302dl_bitbang_read_sample(struct lis302dl_info *lis)
--{
--      u8 data = 0xc0 | LIS302DL_REG_OUT_X; /* read, autoincrement */
--      u8 read[5];
--      unsigned long flags;
--
--      local_irq_save(flags);
--
--      (lis->pdata->lis302dl_bitbang)(lis, &data, 1, &read[0], 5);
--
--      local_irq_restore(flags);
--
--      input_report_rel(lis->input_dev, REL_X, MG_PER_SAMPLE * (s8)read[0]);
--      input_report_rel(lis->input_dev, REL_Y, MG_PER_SAMPLE * (s8)read[2]);
--      input_report_rel(lis->input_dev, REL_Z, MG_PER_SAMPLE * (s8)read[4]);
--
--      input_sync(lis->input_dev);
--
--      /* Reset the HP filter */
--      (lis->pdata->lis302dl_bitbang_reg_read)(lis,
--                      LIS302DL_REG_HP_FILTER_RESET);
--}
- static void __lis302dl_int_mode(struct device *dev, int int_pin,
-                             enum lis302dl_intmode mode)
-@@ -110,6 +125,7 @@ static void __lis302dl_int_mode(struct device *dev, int int_pin,
-               BUG();
-       }
- }
-+
- #if 0
- static void _report_btn_single(struct input_dev *inp, int btn)
- {
-@@ -130,6 +146,29 @@ static void _report_btn_double(struct input_dev *inp, int btn)
- }
- #endif
-+#define MG_PER_SAMPLE 18
-+
-+static void lis302dl_bitbang_read_sample(struct lis302dl_info *lis)
-+{
-+      u8 data = 0xc0 | LIS302DL_REG_OUT_X; /* read, autoincrement */
-+      u8 read[5];
-+      unsigned long flags;
-+
-+      local_irq_save(flags);
-+
-+      (lis->pdata->lis302dl_bitbang)(lis, &data, 1, &read[0], 5);
-+
-+      local_irq_restore(flags);
-+
-+      input_report_rel(lis->input_dev, REL_X, MG_PER_SAMPLE * (s8)read[0]);
-+      input_report_rel(lis->input_dev, REL_Y, MG_PER_SAMPLE * (s8)read[2]);
-+      input_report_rel(lis->input_dev, REL_Z, MG_PER_SAMPLE * (s8)read[4]);
-+
-+      input_sync(lis->input_dev);
-+
-+      /* Reset the HP filter */
-+      __reg_read(lis, LIS302DL_REG_HP_FILTER_RESET);
-+}
- static irqreturn_t lis302dl_interrupt(int irq, void *_lis)
- {
-@@ -149,8 +188,7 @@ static ssize_t show_rate(struct device *dev, struct device_attribute *attr,
-       unsigned long flags;
-       local_irq_save(flags);
--      ctrl1 = (lis->pdata->lis302dl_bitbang_reg_read)
--                                                    (lis, LIS302DL_REG_CTRL1);
-+      ctrl1 = __reg_read(lis, LIS302DL_REG_CTRL1);
-       local_irq_restore(flags);
-       return sprintf(buf, "%d\n", ctrl1 & LIS302DL_CTRL1_DR ? 400 : 100);
-@@ -185,8 +223,7 @@ static ssize_t show_scale(struct device *dev, struct device_attribute *attr,
-       unsigned long flags;
-       local_irq_save(flags);
--      ctrl1 = (lis->pdata->lis302dl_bitbang_reg_read)(lis,
--                                                          LIS302DL_REG_CTRL1);
-+      ctrl1 = __reg_read(lis, LIS302DL_REG_CTRL1);
-       local_irq_restore(flags);
-       return sprintf(buf, "%s\n", ctrl1 & LIS302DL_CTRL1_FS ? "9.2" : "2.3");
-@@ -236,8 +273,7 @@ static ssize_t set_threshold(struct device *dev, struct device_attribute *attr,
-       /* Set the threshold and write it out if the device is used */
-       lis->threshold = val;
-       if (lis->flags & LIS302DL_F_INPUT_OPEN)
--              (lis->pdata->lis302dl_bitbang_reg_write)(lis,
--                              LIS302DL_REG_FF_WU_THS_1, lis->threshold);
-+              __reg_write(lis, LIS302DL_REG_FF_WU_THS_1, lis->threshold);
-       return count;
- }
-@@ -256,7 +292,7 @@ static ssize_t lis302dl_dump(struct device *dev, struct device_attribute *attr,
-       local_irq_save(flags);
-       for (n = 0; n < sizeof(reg); n++)
--              reg[n] = (lis->pdata->lis302dl_bitbang_reg_read)(lis, n);
-+              reg[n] = __reg_read(lis, n);
-       local_irq_restore(flags);
-@@ -271,36 +307,6 @@ static ssize_t lis302dl_dump(struct device *dev, struct device_attribute *attr,
- }
- static DEVICE_ATTR(dump, S_IRUGO, lis302dl_dump, NULL);
--static int __freefall_ms_to_duration(struct lis302dl_info *lis, int ms)
--{
--      u8 r = (lis->pdata->lis302dl_bitbang_reg_read)(lis, LIS302DL_REG_CTRL1);
--
--      /* If we have 400 ms sampling rate, the stepping is 2.5 ms,
--       * on 100 ms the stepping is 10ms */
--      if (r & LIS302DL_CTRL1_DR) {
--              /* Too large */
--              if (ms > 637)
--                      return -1;
--
--              return (ms * 10) / 25;
--      }
--
--      /* Too large value */
--      if (ms > 2550)
--                      return -1;
--      return ms / 10;
--}
--
--static int __freefall_duration_to_ms(struct lis302dl_info *lis, int duration)
--{
--      u8 r = (lis->pdata->lis302dl_bitbang_reg_read)(lis, LIS302DL_REG_CTRL1);
--
--      if (r & LIS302DL_CTRL1_DR)
--              return (duration * 25) / 10;
--
--      return duration * 10;
--}
--
- /* Configure freefall/wakeup interrupts */
- static ssize_t set_freefall_common(int which, struct device *dev,
-                  struct device_attribute *attr, const char *buf, size_t count)
-@@ -342,9 +348,9 @@ static ssize_t set_freefall_common(int which, struct device *dev,
-                                                  LIS302DL_INTMODE_DATA_READY);
-               lis->flags &= ~(flag_mask | LIS302DL_F_IRQ_WAKE);
--              (lis->pdata->lis302dl_bitbang_reg_write)(lis, r_cfg, 0);
--              (lis->pdata->lis302dl_bitbang_reg_write)(lis, r_ths, 0);
--              (lis->pdata->lis302dl_bitbang_reg_write)(lis, r_duration, 0);
-+              __reg_write(lis, r_cfg, 0);
-+              __reg_write(lis, r_ths, 0);
-+              __reg_write(lis, r_duration, 0);
-               /* Power off unless the input subsystem is using the device */
-               if (!(lis->flags & LIS302DL_F_INPUT_OPEN))
-@@ -361,7 +367,7 @@ static ssize_t set_freefall_common(int which, struct device *dev,
-               return -EINVAL;
-       local_irq_save(flags);
--      duration = __freefall_ms_to_duration(lis, ms);
-+      duration = __ms_to_duration(lis, ms);
-       local_irq_save(flags);
-       if (duration < 0)
-@@ -382,13 +388,12 @@ static ssize_t set_freefall_common(int which, struct device *dev,
-       /* Setup the configuration registers */
-       local_irq_save(flags);
-       /* First zero to get to a known state */
--      (lis->pdata->lis302dl_bitbang_reg_write)(lis, r_cfg, 0);
--      (lis->pdata->lis302dl_bitbang_reg_write)(lis, r_cfg,
-+      __reg_write(lis, r_cfg, 0);
-+      __reg_write(lis, r_cfg,
-               (and_events ? LIS302DL_FFWUCFG_AOI : 0) |
-               x_lo | x_hi | y_lo | y_hi | z_lo | z_hi);
--      (lis->pdata->lis302dl_bitbang_reg_write)(lis, r_ths,
--                                          threshold & ~LIS302DL_FFWUTHS_DCRM);
--      (lis->pdata->lis302dl_bitbang_reg_write)(lis, r_duration, duration);
-+      __reg_write(lis, r_ths, threshold & ~LIS302DL_FFWUTHS_DCRM);
-+      __reg_write(lis, r_duration, duration);
-       /* Route the interrupt for wakeup */
-       __lis302dl_int_mode(lis->dev, which, intmode);
-@@ -443,12 +448,12 @@ static ssize_t show_freefall_common(int which, struct device *dev,
-       }
-       local_irq_save(flags);
--      config = (lis->pdata->lis302dl_bitbang_reg_read)(lis, r_cfg);
--      threshold = (lis->pdata->lis302dl_bitbang_reg_read)(lis, r_ths);
--      duration = (lis->pdata->lis302dl_bitbang_reg_read)(lis, r_duration);
--      r4 = (lis->pdata->lis302dl_bitbang_reg_read)(lis, r_src);
--      r5 = (lis->pdata->lis302dl_bitbang_reg_read)(lis, LIS302DL_REG_CTRL3);
--      ms = __freefall_duration_to_ms(lis, duration);
-+      config = __reg_read(lis, r_cfg);
-+      threshold = __reg_read(lis, r_ths);
-+      duration = __reg_read(lis, r_duration);
-+      r4 = __reg_read(lis, r_src);
-+      r5 = __reg_read(lis, LIS302DL_REG_CTRL3);
-+      ms = __duration_to_ms(lis, duration);
-       local_irq_restore(flags);
-       /* All events off? */
-@@ -519,18 +524,14 @@ static int lis302dl_input_open(struct input_dev *inp)
-       /* make sure we're powered up and generate data ready */
-       __reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, ctrl1, ctrl1);
--      (lis->pdata->lis302dl_bitbang_reg_write)(lis, LIS302DL_REG_CTRL2,
-+      __reg_write(lis, LIS302DL_REG_CTRL2,
-                       ctrl2);
--      (lis->pdata->lis302dl_bitbang_reg_write)(lis,
--                      LIS302DL_REG_FF_WU_THS_1, lis->threshold);
--      (lis->pdata->lis302dl_bitbang_reg_write)(lis,
--                      LIS302DL_REG_FF_WU_DURATION_1, 0);
-+      __reg_write(lis, LIS302DL_REG_FF_WU_THS_1, lis->threshold);
-+      __reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1, 0);
-       /* Clear the HP filter "starting point" */
--      (lis->pdata->lis302dl_bitbang_reg_read)(lis,
--                      LIS302DL_REG_HP_FILTER_RESET);
--      (lis->pdata->lis302dl_bitbang_reg_write)(lis,
--                      LIS302DL_REG_FF_WU_CFG_1, LIS302DL_FFWUCFG_XHIE |
-+      __reg_read(lis, LIS302DL_REG_HP_FILTER_RESET);
-+      __reg_write(lis, LIS302DL_REG_FF_WU_CFG_1, LIS302DL_FFWUCFG_XHIE |
-                       LIS302DL_FFWUCFG_YHIE | LIS302DL_FFWUCFG_ZHIE);
-       lis->flags |= LIS302DL_F_INPUT_OPEN;
-@@ -576,11 +577,11 @@ static int __lis302dl_reset_device(struct lis302dl_info *lis)
- {
-       int timeout = 10;
--      (lis->pdata->lis302dl_bitbang_reg_write)(lis, LIS302DL_REG_CTRL2,
--                                    LIS302DL_CTRL2_BOOT | LIS302DL_CTRL2_FDS);
-+      __reg_write(lis, LIS302DL_REG_CTRL2,
-+                      LIS302DL_CTRL2_BOOT | LIS302DL_CTRL2_FDS);
--      while (((lis->pdata->lis302dl_bitbang_reg_read)(lis, LIS302DL_REG_CTRL2)
--                                        & LIS302DL_CTRL2_BOOT) && (timeout--))
-+      while ((__reg_read(lis, LIS302DL_REG_CTRL2)
-+                      & LIS302DL_CTRL2_BOOT) && (timeout--))
-               mdelay(1);
-       return !!(timeout < 0);
-@@ -609,8 +610,7 @@ static int __devinit lis302dl_probe(struct platform_device *pdev)
-       /* Configure our IO */
-       (lis->pdata->lis302dl_suspend_io)(lis, 1);
--      wai = (lis->pdata->lis302dl_bitbang_reg_read)(lis,
--                                                       LIS302DL_REG_WHO_AM_I);
-+      wai = __reg_read(lis, LIS302DL_REG_WHO_AM_I);
-       if (wai != LIS302DL_WHO_AM_I_MAGIC) {
-               dev_err(lis->dev, "unknown who_am_i signature 0x%02x\n", wai);
-               dev_set_drvdata(lis->dev, NULL);
-@@ -659,46 +659,38 @@ static int __devinit lis302dl_probe(struct platform_device *pdev)
-               dev_err(lis->dev, "device BOOT reload failed\n");
-       /* force us powered */
--      (lis->pdata->lis302dl_bitbang_reg_write)(lis, LIS302DL_REG_CTRL1,
--                                                    LIS302DL_CTRL1_PD |
--                                                    LIS302DL_CTRL1_Xen |
--                                                    LIS302DL_CTRL1_Yen |
--                                                    LIS302DL_CTRL1_Zen);
-+      __reg_write(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD |
-+                      LIS302DL_CTRL1_Xen |
-+                      LIS302DL_CTRL1_Yen |
-+                      LIS302DL_CTRL1_Zen);
-       mdelay(1);
--      (lis->pdata->lis302dl_bitbang_reg_write)(lis, LIS302DL_REG_CTRL2, 0);
--      (lis->pdata->lis302dl_bitbang_reg_write)(lis, LIS302DL_REG_CTRL3,
--                                   LIS302DL_CTRL3_PP_OD | LIS302DL_CTRL3_IHL);
--      (lis->pdata->lis302dl_bitbang_reg_write)(lis,
--                                               LIS302DL_REG_FF_WU_THS_1, 0x0);
--      (lis->pdata->lis302dl_bitbang_reg_write)(lis,
--                                         LIS302DL_REG_FF_WU_DURATION_1, 0x00);
--      (lis->pdata->lis302dl_bitbang_reg_write)(lis,
--                                               LIS302DL_REG_FF_WU_CFG_1, 0x0);
-+      __reg_write(lis, LIS302DL_REG_CTRL2, 0);
-+      __reg_write(lis, LIS302DL_REG_CTRL3,
-+                      LIS302DL_CTRL3_PP_OD | LIS302DL_CTRL3_IHL);
-+      __reg_write(lis, LIS302DL_REG_FF_WU_THS_1, 0x0);
-+      __reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1, 0x00);
-+      __reg_write(lis, LIS302DL_REG_FF_WU_CFG_1, 0x0);
-       /* start off in powered down mode; we power up when someone opens us */
--      (lis->pdata->lis302dl_bitbang_reg_write)(lis, LIS302DL_REG_CTRL1,
--                                                      LIS302DL_CTRL1_Xen |
--                                                      LIS302DL_CTRL1_Yen |
--                                                      LIS302DL_CTRL1_Zen);
-+      __reg_write(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_Xen |
-+                      LIS302DL_CTRL1_Yen | LIS302DL_CTRL1_Zen);
-       if (pdata->open_drain)
-               /* switch interrupt to open collector, active-low */
--              (lis->pdata->lis302dl_bitbang_reg_write)(lis,
--                      LIS302DL_REG_CTRL3, LIS302DL_CTRL3_PP_OD |
--                                          LIS302DL_CTRL3_IHL);
-+              __reg_write(lis, LIS302DL_REG_CTRL3,
-+                              LIS302DL_CTRL3_PP_OD | LIS302DL_CTRL3_IHL);
-       else
-               /* push-pull, active-low */
--              (lis->pdata->lis302dl_bitbang_reg_write)(lis,
--                                      LIS302DL_REG_CTRL3, LIS302DL_CTRL3_IHL);
-+              __reg_write(lis, LIS302DL_REG_CTRL3, LIS302DL_CTRL3_IHL);
-       __lis302dl_int_mode(lis->dev, 1, LIS302DL_INTMODE_FF_WU_12);
-       __lis302dl_int_mode(lis->dev, 2, LIS302DL_INTMODE_FF_WU_12);
--      (lis->pdata->lis302dl_bitbang_reg_read)(lis, LIS302DL_REG_STATUS);
--      (lis->pdata->lis302dl_bitbang_reg_read)(lis, LIS302DL_REG_FF_WU_SRC_1);
--      (lis->pdata->lis302dl_bitbang_reg_read)(lis, LIS302DL_REG_FF_WU_SRC_2);
--      (lis->pdata->lis302dl_bitbang_reg_read)(lis, LIS302DL_REG_CLICK_SRC);
-+      __reg_read(lis, LIS302DL_REG_STATUS);
-+      __reg_read(lis, LIS302DL_REG_FF_WU_SRC_1);
-+      __reg_read(lis, LIS302DL_REG_FF_WU_SRC_2);
-+      __reg_read(lis, LIS302DL_REG_CLICK_SRC);
-       dev_info(lis->dev, "Found %s\n", pdata->name);
-@@ -733,9 +725,9 @@ static int __devexit lis302dl_remove(struct platform_device *pdev)
-       /* Reset and power down the device */
-       local_irq_save(flags);
--      (lis->pdata->lis302dl_bitbang_reg_write)(lis, LIS302DL_REG_CTRL3, 0x00);
--      (lis->pdata->lis302dl_bitbang_reg_write)(lis, LIS302DL_REG_CTRL2, 0x00);
--      (lis->pdata->lis302dl_bitbang_reg_write)(lis, LIS302DL_REG_CTRL1, 0x00);
-+      __reg_write(lis, LIS302DL_REG_CTRL3, 0x00);
-+      __reg_write(lis, LIS302DL_REG_CTRL2, 0x00);
-+      __reg_write(lis, LIS302DL_REG_CTRL1, 0x00);
-       local_irq_restore(flags);
-       /* Cleanup resources */
-@@ -798,13 +790,12 @@ static int lis302dl_suspend(struct platform_device *pdev, pm_message_t state)
-       /* save registers */
-       for (n = 0; n < ARRAY_SIZE(regs_to_save); n++)
-               lis->regs[regs_to_save[n]] =
--                      (lis->pdata->lis302dl_bitbang_reg_read)(lis,
--                                                             regs_to_save[n]);
-+                      __reg_read(lis, regs_to_save[n]);
-       /* power down */
--      tmp = (lis->pdata->lis302dl_bitbang_reg_read)(lis, LIS302DL_REG_CTRL1);
-+      tmp = __reg_read(lis, LIS302DL_REG_CTRL1);
-       tmp &= ~LIS302DL_CTRL1_PD;
--      (lis->pdata->lis302dl_bitbang_reg_write)(lis, LIS302DL_REG_CTRL1, tmp);
-+      __reg_write(lis, LIS302DL_REG_CTRL1, tmp);
-       /* place our IO to the device in sleep-compatible states */
-       (lis->pdata->lis302dl_suspend_io)(lis, 0);
-@@ -830,11 +821,11 @@ static int lis302dl_resume(struct platform_device *pdev)
-       (lis->pdata->lis302dl_suspend_io)(lis, 1);
-       /* resume from powerdown first! */
--      (lis->pdata->lis302dl_bitbang_reg_write)(lis, LIS302DL_REG_CTRL1,
--                                                    LIS302DL_CTRL1_PD |
--                                                    LIS302DL_CTRL1_Xen |
--                                                    LIS302DL_CTRL1_Yen |
--                                                    LIS302DL_CTRL1_Zen);
-+      __reg_write(lis, LIS302DL_REG_CTRL1,
-+                      LIS302DL_CTRL1_PD |
-+                      LIS302DL_CTRL1_Xen |
-+                      LIS302DL_CTRL1_Yen |
-+                      LIS302DL_CTRL1_Zen);
-       mdelay(1);
-       if (__lis302dl_reset_device(lis))
-@@ -847,8 +838,7 @@ static int lis302dl_resume(struct platform_device *pdev)
-       /* restore registers after resume */
-       for (n = 0; n < ARRAY_SIZE(regs_to_save); n++)
--              (lis->pdata->lis302dl_bitbang_reg_write)(lis,
--                                 regs_to_save[n], lis->regs[regs_to_save[n]]);
-+              __reg_write(lis, regs_to_save[n], lis->regs[regs_to_save[n]]);
-       local_irq_restore(flags);
-       enable_irq(lis->pdata->interrupt);
-diff --git a/include/linux/lis302dl.h b/include/linux/lis302dl.h
-index f3f994d..a756f55 100644
---- a/include/linux/lis302dl.h
-+++ b/include/linux/lis302dl.h
-@@ -18,7 +18,6 @@ struct lis302dl_platform_data {
-       int interrupt;
-       void (*lis302dl_bitbang)(struct lis302dl_info *lis, u8 *tx,
-                       int tx_bytes, u8 *rx, int rx_bytes);
--      void (*lis302dl_bitbang_read_sample)(struct lis302dl_info *);
-       void (*lis302dl_suspend_io)(struct lis302dl_info *, int resuming);
-       int (*lis302dl_bitbang_reg_read)(struct lis302dl_info *, u8 reg);
-       void (*lis302dl_bitbang_reg_write)(struct lis302dl_info *, u8 reg,
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1307--lis302dl-threshold-configuration-in-mg.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1307--lis302dl-threshold-configuration-in-mg.patch.patch
deleted file mode 100644 (file)
index 9aa9a3a..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-From 5e2b5ddaf95985744e0e0c28ba6dac83c093fd15 Mon Sep 17 00:00:00 2001
-From: Simon Kagstrom <simon.kagstrom@gmail.com>
-Date: Thu, 16 Oct 2008 01:19:29 +0100
-Subject: [PATCH] : lis302dl-threshold-configuration-in-mg.patch
-
-Change the threshold configuration to be set in mg instead
-
-From: Simon Kagstrom <simon.kagstrom@gmail.com>
-
-This patch changes the threshold sysfs file to handle values in mg
-instead of the device-values. Overrun values have also been corrected
-and the sampler function now honors the FS bit.
-
-Signed-off-by: Simon Kagstrom <simon.kagstrom@gmail.com>
----
- drivers/input/misc/lis302dl.c |   49 ++++++++++++++++++++++++++++++++--------
- 1 files changed, 39 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
-index 300918d..c1b1d67 100644
---- a/drivers/input/misc/lis302dl.c
-+++ b/drivers/input/misc/lis302dl.c
-@@ -97,6 +97,24 @@ static int __duration_to_ms(struct lis302dl_info *lis, int duration)
-       return duration * 10;
- }
-+static u8 __mg_to_threshold(struct lis302dl_info *lis, int mg)
-+{
-+      /* If FS is set each bit is 71mg, otherwise 18mg. The THS register
-+       * has 7 bits for the threshold value */
-+      if (lis->flags & LIS302DL_F_FS)
-+              return min(mg / 71, 127);
-+
-+      return min(mg / 18, 127);
-+}
-+
-+static int __threshold_to_mg(struct lis302dl_info *lis, u8 threshold)
-+{
-+      if (lis->flags & LIS302DL_F_FS)
-+              return threshold * 71;
-+
-+      return threshold * 18;
-+}
-+
- /* interrupt handling related */
- enum lis302dl_intmode {
-@@ -146,23 +164,24 @@ static void _report_btn_double(struct input_dev *inp, int btn)
- }
- #endif
--#define MG_PER_SAMPLE 18
- static void lis302dl_bitbang_read_sample(struct lis302dl_info *lis)
- {
-       u8 data = 0xc0 | LIS302DL_REG_OUT_X; /* read, autoincrement */
-       u8 read[5];
-       unsigned long flags;
-+      int mg_per_sample;
-       local_irq_save(flags);
-+      mg_per_sample = __threshold_to_mg(lis, 1);
-       (lis->pdata->lis302dl_bitbang)(lis, &data, 1, &read[0], 5);
-       local_irq_restore(flags);
--      input_report_rel(lis->input_dev, REL_X, MG_PER_SAMPLE * (s8)read[0]);
--      input_report_rel(lis->input_dev, REL_Y, MG_PER_SAMPLE * (s8)read[2]);
--      input_report_rel(lis->input_dev, REL_Z, MG_PER_SAMPLE * (s8)read[4]);
-+      input_report_rel(lis->input_dev, REL_X, mg_per_sample * (s8)read[0]);
-+      input_report_rel(lis->input_dev, REL_Y, mg_per_sample * (s8)read[2]);
-+      input_report_rel(lis->input_dev, REL_Z, mg_per_sample * (s8)read[4]);
-       input_sync(lis->input_dev);
-@@ -234,15 +253,24 @@ static ssize_t set_scale(struct device *dev, struct device_attribute *attr,
- {
-       struct lis302dl_info *lis = dev_get_drvdata(dev);
-       unsigned long flags;
-+      int threshold_mg = __threshold_to_mg(lis, lis->threshold);
-       local_irq_save(flags);
--      if (!strcmp(buf, "9.2\n"))
-+      if (!strcmp(buf, "9.2\n")) {
-               __reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_FS,
-                                LIS302DL_CTRL1_FS);
--      else
-+              lis->flags |= LIS302DL_F_FS;
-+      } else {
-               __reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_FS,
--                                                                           0);
-+                              0);
-+              lis->flags &= ~LIS302DL_F_FS;
-+      }
-+
-+      /* Adjust the threshold */
-+      lis->threshold = __mg_to_threshold(lis, threshold_mg);
-+      if (lis->flags & LIS302DL_F_INPUT_OPEN)
-+              __reg_write(lis, LIS302DL_REG_FF_WU_THS_1, lis->threshold);
-       local_irq_restore(flags);
-@@ -256,7 +284,7 @@ static ssize_t show_threshold(struct device *dev, struct device_attribute *attr,
- {
-       struct lis302dl_info *lis = dev_get_drvdata(dev);
--      return sprintf(buf, "%d\n", lis->threshold);
-+      return sprintf(buf, "%d\n", __threshold_to_mg(lis, lis->threshold));
- }
- static ssize_t set_threshold(struct device *dev, struct device_attribute *attr,
-@@ -267,11 +295,12 @@ static ssize_t set_threshold(struct device *dev, struct device_attribute *attr,
-       if (sscanf(buf, "%d\n", &val) != 1)
-               return -EINVAL;
--      if (val < 0 || val > 255)
-+      /* 8g is the maximum if FS is 1 */
-+      if (val < 0 || val > 8000)
-               return -ERANGE;
-       /* Set the threshold and write it out if the device is used */
--      lis->threshold = val;
-+      lis->threshold = __mg_to_threshold(lis, val);
-       if (lis->flags & LIS302DL_F_INPUT_OPEN)
-               __reg_write(lis, LIS302DL_REG_FF_WU_THS_1, lis->threshold);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1308--lis302dl-configure-duration.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1308--lis302dl-configure-duration.patch.patch
deleted file mode 100644 (file)
index dbe08b4..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-From d3c59382c7e8429e2c86eb92cc2518dce26c4a69 Mon Sep 17 00:00:00 2001
-From: Simon Kagstrom <simon.kagstrom@gmail.com>
-Date: Thu, 16 Oct 2008 01:19:39 +0100
-Subject: [PATCH] : lis302dl-configure-duration.patch
-
-Allow configuration of the duration for thresholds
-
-From: Simon Kagstrom <simon.kagstrom@gmail.com>
-
-This patch allows the configuration of duration used when generating
-filtered data (see the lis302dl application note). Also set a flag when
-the DR bit in the ctrl1 register is set to change the data rate and
-simplify the ms_to_duration utility functions.
-
-The sysfs 'duration' file is used for this.
-
-Signed-off-by: Simon Kagstrom <simon.kagstrom@gmail.com>
----
- drivers/input/misc/lis302dl.c |   63 ++++++++++++++++++++++++++++-------------
- include/linux/lis302dl.h      |    2 +
- 2 files changed, 45 insertions(+), 20 deletions(-)
-
-diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
-index c1b1d67..d738199 100644
---- a/drivers/input/misc/lis302dl.c
-+++ b/drivers/input/misc/lis302dl.c
-@@ -69,29 +69,17 @@ static void __reg_set_bit_mask(struct lis302dl_info *lis, u8 reg, u8 mask,
- static int __ms_to_duration(struct lis302dl_info *lis, int ms)
- {
--      u8 r = __reg_read(lis, LIS302DL_REG_CTRL1);
--
-       /* If we have 400 ms sampling rate, the stepping is 2.5 ms,
-        * on 100 ms the stepping is 10ms */
--      if (r & LIS302DL_CTRL1_DR) {
--              /* Too large */
--              if (ms > 637)
--                      return -1;
--
--              return (ms * 10) / 25;
--      }
-+      if (lis->flags & LIS302DL_F_DR)
-+              return min((ms * 10) / 25, 637);
--      /* Too large value */
--      if (ms > 2550)
--                      return -1;
--      return ms / 10;
-+      return min(ms / 10, 2550);
- }
- static int __duration_to_ms(struct lis302dl_info *lis, int duration)
- {
--      u8 r = __reg_read(lis, LIS302DL_REG_CTRL1);
--
--      if (r & LIS302DL_CTRL1_DR)
-+      if (lis->flags & LIS302DL_F_DR)
-               return (duration * 25) / 10;
-       return duration * 10;
-@@ -218,15 +206,20 @@ static ssize_t set_rate(struct device *dev, struct device_attribute *attr,
- {
-       struct lis302dl_info *lis = dev_get_drvdata(dev);
-       unsigned long flags;
-+      int duration_ms = __duration_to_ms(lis, lis->duration);
-       local_irq_save(flags);
--      if (!strcmp(buf, "400\n"))
-+      if (!strcmp(buf, "400\n")) {
-               __reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_DR,
-                                LIS302DL_CTRL1_DR);
--      else
-+              lis->flags |= LIS302DL_F_DR;
-+      } else {
-               __reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_DR,
--                                                                           0);
-+                              0);
-+              lis->flags &= ~LIS302DL_F_DR;
-+      }
-+      lis->duration = __ms_to_duration(lis, duration_ms);
-       local_irq_restore(flags);
-       return count;
-@@ -309,6 +302,34 @@ static ssize_t set_threshold(struct device *dev, struct device_attribute *attr,
- static DEVICE_ATTR(threshold, S_IRUGO | S_IWUSR, show_threshold, set_threshold);
-+static ssize_t show_duration(struct device *dev, struct device_attribute *attr,
-+               char *buf)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(dev);
-+
-+      return sprintf(buf, "%d\n", __duration_to_ms(lis, lis->duration));
-+}
-+
-+static ssize_t set_duration(struct device *dev, struct device_attribute *attr,
-+               const char *buf, size_t count)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(dev);
-+      u32 val;
-+
-+      if (sscanf(buf, "%d\n", &val) != 1)
-+              return -EINVAL;
-+      if (val < 0 || val > 2550)
-+              return -ERANGE;
-+
-+      lis->duration = __ms_to_duration(lis, val);
-+      if (lis->flags & LIS302DL_F_INPUT_OPEN)
-+              __reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1, lis->duration);
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(duration, S_IRUGO | S_IWUSR, show_duration, set_duration);
-+
- static ssize_t lis302dl_dump(struct device *dev, struct device_attribute *attr,
-                                                                     char *buf)
- {
-@@ -528,6 +549,7 @@ static struct attribute *lis302dl_sysfs_entries[] = {
-       &dev_attr_sample_rate.attr,
-       &dev_attr_full_scale.attr,
-       &dev_attr_threshold.attr,
-+      &dev_attr_duration.attr,
-       &dev_attr_dump.attr,
-       &dev_attr_freefall_wakeup_1.attr,
-       &dev_attr_freefall_wakeup_2.attr,
-@@ -556,7 +578,7 @@ static int lis302dl_input_open(struct input_dev *inp)
-       __reg_write(lis, LIS302DL_REG_CTRL2,
-                       ctrl2);
-       __reg_write(lis, LIS302DL_REG_FF_WU_THS_1, lis->threshold);
--      __reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1, 0);
-+      __reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1, lis->duration);
-       /* Clear the HP filter "starting point" */
-       __reg_read(lis, LIS302DL_REG_HP_FILTER_RESET);
-@@ -670,6 +692,7 @@ static int __devinit lis302dl_probe(struct platform_device *pdev)
-       set_bit(BTN_Z, lis->input_dev->keybit);
- */
-       lis->threshold = 1;
-+      lis->duration = 0;
-       lis->input_dev->private = lis;
-       lis->input_dev->name = pdata->name;
-diff --git a/include/linux/lis302dl.h b/include/linux/lis302dl.h
-index a756f55..f7aa956 100644
---- a/include/linux/lis302dl.h
-+++ b/include/linux/lis302dl.h
-@@ -30,6 +30,7 @@ struct lis302dl_info {
-       struct input_dev *input_dev;
-       unsigned int flags;
-       unsigned int threshold;
-+      unsigned int duration;
-       u_int8_t regs[0x40];
- };
-@@ -142,6 +143,7 @@ enum lis302dl_reg_cloik_src {
- #define LIS302DL_F_FS                 0x0020  /* ADC full scale */
- #define LIS302DL_F_INPUT_OPEN         0x0040  /* Set if input device is opened */
- #define LIS302DL_F_IRQ_WAKE   0x0080  /* IRQ is setup in wake mode */
-+#define LIS302DL_F_DR                 0x0100  /* Data rate, 400Hz/100Hz */
- #endif /* _LINUX_LIS302DL_H */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1309--lis302dl-open-floodgates-on-zero-threshold.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1309--lis302dl-open-floodgates-on-zero-threshold.patch.patch
deleted file mode 100644 (file)
index bae3a54..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-From ca57dbb5effd245e2619f4b730f8247f7279f954 Mon Sep 17 00:00:00 2001
-From: Simon Kagstrom <simon.kagstrom@gmail.com>
-Date: Thu, 16 Oct 2008 01:19:47 +0100
-Subject: [PATCH] : lis302dl-open-floodgates-on-zero-threshold.patch
-
-Generate data ready interrupts if threshold is zero
-
-From: Simon Kagstrom <simon.kagstrom@gmail.com>
-
-If the threshold is set to zero, enable the data ready interrupt
-(generated one interrupt per datum). Otherwise use the freefall
-interrupt as source.
-
-Signed-off-by: Simon Kagstrom <simon.kagstrom@gmail.com>
----
- drivers/input/misc/lis302dl.c |   64 +++++++++++++++++++++++++++-------------
- 1 files changed, 43 insertions(+), 21 deletions(-)
-
-diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
-index d738199..e404a45 100644
---- a/drivers/input/misc/lis302dl.c
-+++ b/drivers/input/misc/lis302dl.c
-@@ -44,6 +44,7 @@
- #include <linux/lis302dl.h>
- /* Utility functions */
-+
- static u8 __reg_read(struct lis302dl_info *lis, u8 reg)
- {
-       return (lis->pdata->lis302dl_bitbang_reg_read)(lis, reg);
-@@ -132,6 +133,36 @@ static void __lis302dl_int_mode(struct device *dev, int int_pin,
-       }
- }
-+static void __enable_data_collection(struct lis302dl_info *lis)
-+{
-+      u_int8_t ctrl1 = LIS302DL_CTRL1_PD | LIS302DL_CTRL1_Xen |
-+                       LIS302DL_CTRL1_Yen | LIS302DL_CTRL1_Zen;
-+
-+      /* make sure we're powered up and generate data ready */
-+      __reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, ctrl1, ctrl1);
-+
-+      /* If the threshold is zero, let the device generated an interrupt
-+       * on each datum */
-+      if (lis->threshold == 0) {
-+              __reg_write(lis, LIS302DL_REG_CTRL2, 0);
-+              __lis302dl_int_mode(lis->dev, 1, LIS302DL_INTMODE_DATA_READY);
-+              __lis302dl_int_mode(lis->dev, 2, LIS302DL_INTMODE_DATA_READY);
-+      } else {
-+              __reg_write(lis, LIS302DL_REG_CTRL2,
-+                              LIS302DL_CTRL2_HPFF1);
-+              __reg_write(lis, LIS302DL_REG_FF_WU_THS_1, lis->threshold);
-+              __reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1, lis->duration);
-+
-+              /* Clear the HP filter "starting point" */
-+              __reg_read(lis, LIS302DL_REG_HP_FILTER_RESET);
-+              __reg_write(lis, LIS302DL_REG_FF_WU_CFG_1,
-+                              LIS302DL_FFWUCFG_XHIE | LIS302DL_FFWUCFG_YHIE |
-+                              LIS302DL_FFWUCFG_ZHIE);
-+              __lis302dl_int_mode(lis->dev, 1, LIS302DL_INTMODE_FF_WU_12);
-+              __lis302dl_int_mode(lis->dev, 2, LIS302DL_INTMODE_FF_WU_12);
-+      }
-+}
-+
- #if 0
- static void _report_btn_single(struct input_dev *inp, int btn)
- {
-@@ -263,7 +294,7 @@ static ssize_t set_scale(struct device *dev, struct device_attribute *attr,
-       /* Adjust the threshold */
-       lis->threshold = __mg_to_threshold(lis, threshold_mg);
-       if (lis->flags & LIS302DL_F_INPUT_OPEN)
--              __reg_write(lis, LIS302DL_REG_FF_WU_THS_1, lis->threshold);
-+              __enable_data_collection(lis);
-       local_irq_restore(flags);
-@@ -294,8 +325,14 @@ static ssize_t set_threshold(struct device *dev, struct device_attribute *attr,
-       /* Set the threshold and write it out if the device is used */
-       lis->threshold = __mg_to_threshold(lis, val);
--      if (lis->flags & LIS302DL_F_INPUT_OPEN)
--              __reg_write(lis, LIS302DL_REG_FF_WU_THS_1, lis->threshold);
-+
-+      if (lis->flags & LIS302DL_F_INPUT_OPEN) {
-+              unsigned long flags;
-+
-+              local_irq_save(flags);
-+              __enable_data_collection(lis);
-+              local_irq_restore(flags);
-+      }
-       return count;
- }
-@@ -562,29 +599,14 @@ static struct attribute_group lis302dl_attr_group = {
- };
- /* input device handling and driver core interaction */
--
- static int lis302dl_input_open(struct input_dev *inp)
- {
-       struct lis302dl_info *lis = inp->private;
--      u_int8_t ctrl1 = LIS302DL_CTRL1_PD | LIS302DL_CTRL1_Xen |
--                       LIS302DL_CTRL1_Yen | LIS302DL_CTRL1_Zen;
--      u_int8_t ctrl2 = LIS302DL_CTRL2_HPFF1;
-       unsigned long flags;
-       local_irq_save(flags);
--      /* make sure we're powered up and generate data ready */
--      __reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, ctrl1, ctrl1);
--
--      __reg_write(lis, LIS302DL_REG_CTRL2,
--                      ctrl2);
--      __reg_write(lis, LIS302DL_REG_FF_WU_THS_1, lis->threshold);
--      __reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1, lis->duration);
--
--      /* Clear the HP filter "starting point" */
--      __reg_read(lis, LIS302DL_REG_HP_FILTER_RESET);
--      __reg_write(lis, LIS302DL_REG_FF_WU_CFG_1, LIS302DL_FFWUCFG_XHIE |
--                      LIS302DL_FFWUCFG_YHIE | LIS302DL_FFWUCFG_ZHIE);
-+      __enable_data_collection(lis);
-       lis->flags |= LIS302DL_F_INPUT_OPEN;
-       /* kick it off -- since we are edge triggered, if we missed the edge
-@@ -736,8 +758,8 @@ static int __devinit lis302dl_probe(struct platform_device *pdev)
-               /* push-pull, active-low */
-               __reg_write(lis, LIS302DL_REG_CTRL3, LIS302DL_CTRL3_IHL);
--      __lis302dl_int_mode(lis->dev, 1, LIS302DL_INTMODE_FF_WU_12);
--      __lis302dl_int_mode(lis->dev, 2, LIS302DL_INTMODE_FF_WU_12);
-+      __lis302dl_int_mode(lis->dev, 1, LIS302DL_INTMODE_GND);
-+      __lis302dl_int_mode(lis->dev, 2, LIS302DL_INTMODE_GND);
-       __reg_read(lis, LIS302DL_REG_STATUS);
-       __reg_read(lis, LIS302DL_REG_FF_WU_SRC_1);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1310--lis302dl-wakeup-configuration.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1310--lis302dl-wakeup-configuration.patch.patch
deleted file mode 100644 (file)
index bea01b9..0000000
+++ /dev/null
@@ -1,366 +0,0 @@
-From 933f18caaf8f96d1094f064312d416a2fe0b4337 Mon Sep 17 00:00:00 2001
-From: Simon Kagstrom <simon.kagstrom@gmail.com>
-Date: Thu, 16 Oct 2008 01:19:56 +0100
-Subject: [PATCH] : lis302dl-wakeup-configuration.patch
-
-Setup accelerometer interrupt to wake the device up
-
-From: Simon Kagstrom <simon.kagstrom@gmail.com>
-
-The threshold implementation recently broke this functionality. This
-patch reinstates it again and simplifies the code a bit. It only
-supports one of the two lis302dl interrupt sources now (which is the
-only connected one on the openmoko). If you need to configure both, buy
-an Iphone!
-
-(Or flame this patch)
-
-
-Note that, as before, the device immediately wakes up when put to sleep
-with the wakeup configured. The interface is therefore not currently
-very useful, but to use it do e.g.,
-
-   echo 1 1 1 180 0 1 > wakeup
-
-The value is of the form
-
-   X Y Z THRESHOLD DURATION SPEC
-
-X, Y and Z are threshold values, given as a value > 0, < 0 or 0 to
-specify if an interrupt should be generated for high or low thresholds
-or neither (off). THRESHOLD specifies the threshold that must be
-exceeded, in mg. DURATION specifies the time in milliseconds for which
-the acceleration should be measured. SPEC is either '1' or '0' and
-specifies if the thresholds should be taken all together or one at a
-time ('and' or 'or' mode).
-
-Echoing '0' to the file turns off the interrupts.
-
-Signed-off-by: Simon Kagstrom <simon.kagstrom@gmail.com>
----
- drivers/input/misc/lis302dl.c |  204 ++++++++++++-----------------------------
- include/linux/lis302dl.h      |    6 +
- 2 files changed, 63 insertions(+), 147 deletions(-)
-
-diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
-index e404a45..f743a24 100644
---- a/drivers/input/misc/lis302dl.c
-+++ b/drivers/input/misc/lis302dl.c
-@@ -133,6 +133,23 @@ static void __lis302dl_int_mode(struct device *dev, int int_pin,
-       }
- }
-+static void __enable_wakeup(struct lis302dl_info *lis)
-+{
-+      /* First zero to get to a known state */
-+      __reg_write(lis, LIS302DL_REG_FF_WU_CFG_1,
-+                      lis->wakeup.cfg);
-+      __reg_write(lis, LIS302DL_REG_FF_WU_THS_1,
-+                      lis->wakeup.threshold);
-+      __reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1,
-+                      lis->wakeup.duration);
-+
-+      /* Route the interrupt for wakeup */
-+      __lis302dl_int_mode(lis->dev, 1,
-+                      LIS302DL_INTMODE_FF_WU_1);
-+
-+      __reg_write(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD);
-+}
-+
- static void __enable_data_collection(struct lis302dl_info *lis)
- {
-       u_int8_t ctrl1 = LIS302DL_CTRL1_PD | LIS302DL_CTRL1_Xen |
-@@ -395,73 +412,33 @@ static ssize_t lis302dl_dump(struct device *dev, struct device_attribute *attr,
- static DEVICE_ATTR(dump, S_IRUGO, lis302dl_dump, NULL);
- /* Configure freefall/wakeup interrupts */
--static ssize_t set_freefall_common(int which, struct device *dev,
--                 struct device_attribute *attr, const char *buf, size_t count)
-+static ssize_t set_wakeup(struct device *dev, struct device_attribute *attr,
-+                       const char *buf, size_t count)
- {
-       struct lis302dl_info *lis = dev_get_drvdata(dev);
-       u_int8_t x_lo, y_lo, z_lo;
-       u_int8_t x_hi, y_hi, z_hi;
--      int duration;
--      int threshold;
--      int and_events;
--      int r_ths = LIS302DL_REG_FF_WU_THS_1; /* registers, assume first pin */
--      int r_duration = LIS302DL_REG_FF_WU_DURATION_1;
--      int r_cfg = LIS302DL_REG_FF_WU_CFG_1;
--      int flag_mask = LIS302DL_F_WUP_FF_1;
--      int intmode = LIS302DL_INTMODE_FF_WU_1;
-+      int duration, threshold, and_events;
-       int x, y, z;
--      int ms;
--      unsigned long flags;
--
--      /* Configure for second freefall/wakeup pin */
--      if (which == 2) {
--              r_ths = LIS302DL_REG_FF_WU_THS_2;
--              r_duration = LIS302DL_REG_FF_WU_DURATION_2;
--              r_cfg = LIS302DL_REG_FF_WU_CFG_2;
--              flag_mask = LIS302DL_F_WUP_FF_2;
--              intmode = LIS302DL_INTMODE_FF_WU_2;
--              printk(KERN_WARNING
--                          "Configuring second freefall / wakeup interrupt\n");
--      }
--
--      /* Parse the input */
-+      /* Zero turns the feature off */
-       if (strcmp(buf, "0\n") == 0) {
--              /* Turn off the interrupt */
--              local_irq_save(flags);
--              if (lis->flags & LIS302DL_F_IRQ_WAKE)
--                      disable_irq_wake(lis->pdata->interrupt);
--              __lis302dl_int_mode(lis->dev, which,
--                                                 LIS302DL_INTMODE_DATA_READY);
--              lis->flags &= ~(flag_mask | LIS302DL_F_IRQ_WAKE);
--
--              __reg_write(lis, r_cfg, 0);
--              __reg_write(lis, r_ths, 0);
--              __reg_write(lis, r_duration, 0);
-+              lis->wakeup.active = 0;
--              /* Power off unless the input subsystem is using the device */
--              if (!(lis->flags & LIS302DL_F_INPUT_OPEN))
--                      __reg_set_bit_mask(lis, LIS302DL_REG_CTRL1,
--                                                        LIS302DL_CTRL1_PD, 0);
--
--              local_irq_restore(flags);
-+              if (lis->flags & LIS302DL_F_IRQ_WAKE) {
-+                      disable_irq_wake(lis->pdata->interrupt);
-+                      lis->flags &= ~LIS302DL_F_IRQ_WAKE;
-+              }
-               return count;
-       }
--      if (sscanf(buf, "%d %d %d %d %d %d", &x, &y, &z, &threshold, &ms,
--                                                            &and_events) != 6)
-+      if (sscanf(buf, "%d %d %d %d %d %d", &x, &y, &z, &threshold, &duration,
-+                      &and_events) != 6)
-               return -EINVAL;
--      local_irq_save(flags);
--      duration = __ms_to_duration(lis, ms);
--      local_irq_save(flags);
--
--      if (duration < 0)
--              return -ERANGE;
--
--      /* 7 bits */
--      if (threshold < 0 || threshold > 127)
-+      if (duration < 0 || duration > 2550 ||
-+                      threshold < 0 || threshold > 8000)
-               return -ERANGE;
-       /* Interrupt flags */
-@@ -472,91 +449,38 @@ static ssize_t set_freefall_common(int which, struct device *dev,
-       y_hi = y > 0 ? LIS302DL_FFWUCFG_YHIE : 0;
-       z_hi = z > 0 ? LIS302DL_FFWUCFG_ZHIE : 0;
--      /* Setup the configuration registers */
--      local_irq_save(flags);
--      /* First zero to get to a known state */
--      __reg_write(lis, r_cfg, 0);
--      __reg_write(lis, r_cfg,
--              (and_events ? LIS302DL_FFWUCFG_AOI : 0) |
--              x_lo | x_hi | y_lo | y_hi | z_lo | z_hi);
--      __reg_write(lis, r_ths, threshold & ~LIS302DL_FFWUTHS_DCRM);
--      __reg_write(lis, r_duration, duration);
-+      lis->wakeup.duration = __ms_to_duration(lis, duration);
-+      lis->wakeup.threshold = __mg_to_threshold(lis, threshold);
-+      lis->wakeup.cfg = (and_events ? LIS302DL_FFWUCFG_AOI : 0) |
-+              x_lo | x_hi | y_lo | y_hi | z_lo | z_hi;
--      /* Route the interrupt for wakeup */
--      __lis302dl_int_mode(lis->dev, which, intmode);
--
--      /* Power up the device and note that we want to wake up from
--       * this interrupt */
--      if (!(lis->flags & LIS302DL_F_IRQ_WAKE))
-+      if (!(lis->flags & LIS302DL_F_IRQ_WAKE)) {
-               enable_irq_wake(lis->pdata->interrupt);
--
--      lis->flags |= flag_mask | LIS302DL_F_IRQ_WAKE;
--      __reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD,
--                      LIS302DL_CTRL1_PD);
--      local_irq_restore(flags);
-+              lis->flags |= LIS302DL_F_IRQ_WAKE;
-+      }
-+      lis->wakeup.active = 1;
-       return count;
- }
--static ssize_t set_freefall_1(struct device *dev, struct device_attribute *attr,
--                       const char *buf, size_t count)
--{
--      return set_freefall_common(1, dev, attr, buf, count);
--}
--static ssize_t set_freefall_2(struct device *dev, struct device_attribute *attr,
--                       const char *buf, size_t count)
--{
--      return set_freefall_common(2, dev, attr, buf, count);
--}
--
--
--static ssize_t show_freefall_common(int which, struct device *dev,
-+static ssize_t show_wakeup(struct device *dev,
-               struct device_attribute *attr, char *buf)
- {
-       struct lis302dl_info *lis = dev_get_drvdata(dev);
--      u_int8_t duration;
--      u_int8_t threshold;
--      u_int8_t config;
--      u_int8_t r4;
--      u_int8_t r5;
--      int r_ths = LIS302DL_REG_FF_WU_THS_1; /* registers, assume first pin */
--      int r_duration = LIS302DL_REG_FF_WU_DURATION_1;
--      int r_cfg = LIS302DL_REG_FF_WU_CFG_1;
--      int r_src = LIS302DL_REG_FF_WU_SRC_1;
--      unsigned long flags;
--      int ms;
--
--      /* Configure second freefall/wakeup pin */
--      if (which == 2) {
--              r_ths = LIS302DL_REG_FF_WU_THS_2;
--              r_duration = LIS302DL_REG_FF_WU_DURATION_2;
--              r_cfg = LIS302DL_REG_FF_WU_CFG_2;
--              r_src = LIS302DL_REG_FF_WU_SRC_2;
--      }
--
--      local_irq_save(flags);
--      config = __reg_read(lis, r_cfg);
--      threshold = __reg_read(lis, r_ths);
--      duration = __reg_read(lis, r_duration);
--      r4 = __reg_read(lis, r_src);
--      r5 = __reg_read(lis, LIS302DL_REG_CTRL3);
--      ms = __duration_to_ms(lis, duration);
--      local_irq_restore(flags);
-+      u8 config;
-       /* All events off? */
--      if ((config & (LIS302DL_FFWUCFG_XLIE | LIS302DL_FFWUCFG_XHIE |
--                      LIS302DL_FFWUCFG_YLIE | LIS302DL_FFWUCFG_YHIE |
--                      LIS302DL_FFWUCFG_ZLIE | LIS302DL_FFWUCFG_ZHIE)) == 0)
-+      if (!lis->wakeup.active)
-               return sprintf(buf, "off\n");
-+      config = lis->wakeup.cfg;
-       return sprintf(buf,
--                      "%s events, %s interrupt, duration %d, threshold %d, "
-+                      "%s events, duration %d, threshold %d, "
-                       "enabled: %s %s %s %s %s %s\n",
-                       (config & LIS302DL_FFWUCFG_AOI) == 0 ? "or" : "and",
--                      (config & LIS302DL_FFWUCFG_LIR) == 0 ?
--                                                      "don't latch" : "latch",
--                      ms, threshold,
-+                      __duration_to_ms(lis, lis->wakeup.duration),
-+                      __threshold_to_mg(lis, lis->wakeup.threshold),
-                       (config & LIS302DL_FFWUCFG_XLIE) == 0 ? "---" : "xlo",
-                       (config & LIS302DL_FFWUCFG_XHIE) == 0 ? "---" : "xhi",
-                       (config & LIS302DL_FFWUCFG_YLIE) == 0 ? "---" : "ylo",
-@@ -565,22 +489,7 @@ static ssize_t show_freefall_common(int which, struct device *dev,
-                       (config & LIS302DL_FFWUCFG_ZHIE) == 0 ? "---" : "zhi");
- }
--static ssize_t show_freefall_1(struct device *dev,
--              struct device_attribute *attr, char *buf)
--{
--      return show_freefall_common(1, dev, attr, buf);
--}
--
--static ssize_t show_freefall_2(struct device *dev,
--              struct device_attribute *attr, char *buf)
--{
--      return show_freefall_common(2, dev, attr, buf);
--}
--
--static DEVICE_ATTR(freefall_wakeup_1, S_IRUGO | S_IWUSR, show_freefall_1,
--                                                              set_freefall_1);
--static DEVICE_ATTR(freefall_wakeup_2, S_IRUGO | S_IWUSR, show_freefall_2,
--                                                              set_freefall_2);
-+static DEVICE_ATTR(wakeup, S_IRUGO | S_IWUSR, show_wakeup, set_wakeup);
- static struct attribute *lis302dl_sysfs_entries[] = {
-       &dev_attr_sample_rate.attr,
-@@ -588,8 +497,7 @@ static struct attribute *lis302dl_sysfs_entries[] = {
-       &dev_attr_threshold.attr,
-       &dev_attr_duration.attr,
-       &dev_attr_dump.attr,
--      &dev_attr_freefall_wakeup_1.attr,
--      &dev_attr_freefall_wakeup_2.attr,
-+      &dev_attr_wakeup.attr,
-       NULL
- };
-@@ -715,6 +623,7 @@ static int __devinit lis302dl_probe(struct platform_device *pdev)
- */
-       lis->threshold = 1;
-       lis->duration = 0;
-+      memset(&lis->wakeup, 0, sizeof(lis->wakeup));
-       lis->input_dev->private = lis;
-       lis->input_dev->name = pdata->name;
-@@ -845,8 +754,7 @@ static int lis302dl_suspend(struct platform_device *pdev, pm_message_t state)
-       int n;
-       /* determine if we want to wake up from the accel. */
--      if (lis->flags & LIS302DL_F_WUP_FF ||
--              lis->flags & LIS302DL_F_WUP_CLICK)
-+      if (lis->flags & LIS302DL_F_WUP_CLICK)
-               return 0;
-       disable_irq(lis->pdata->interrupt);
-@@ -866,10 +774,13 @@ static int lis302dl_suspend(struct platform_device *pdev, pm_message_t state)
-               lis->regs[regs_to_save[n]] =
-                       __reg_read(lis, regs_to_save[n]);
--      /* power down */
--      tmp = __reg_read(lis, LIS302DL_REG_CTRL1);
--      tmp &= ~LIS302DL_CTRL1_PD;
--      __reg_write(lis, LIS302DL_REG_CTRL1, tmp);
-+      /* power down or enable wakeup */
-+      if (!lis->wakeup.active) {
-+              tmp = __reg_read(lis, LIS302DL_REG_CTRL1);
-+              tmp &= ~LIS302DL_CTRL1_PD;
-+              __reg_write(lis, LIS302DL_REG_CTRL1, tmp);
-+      } else
-+              __enable_wakeup(lis);
-       /* place our IO to the device in sleep-compatible states */
-       (lis->pdata->lis302dl_suspend_io)(lis, 0);
-@@ -885,8 +796,7 @@ static int lis302dl_resume(struct platform_device *pdev)
-       unsigned long flags;
-       int n;
--      if (lis->flags & LIS302DL_F_WUP_FF ||
--              lis->flags & LIS302DL_F_WUP_CLICK)
-+      if (lis->flags & LIS302DL_F_WUP_CLICK)
-               return 0;
-       local_irq_save(flags);
-diff --git a/include/linux/lis302dl.h b/include/linux/lis302dl.h
-index f7aa956..f4121d9 100644
---- a/include/linux/lis302dl.h
-+++ b/include/linux/lis302dl.h
-@@ -31,6 +31,12 @@ struct lis302dl_info {
-       unsigned int flags;
-       unsigned int threshold;
-       unsigned int duration;
-+      struct {
-+              u8 cfg;
-+              u8 threshold;
-+              u8 duration;
-+              int active;
-+      } wakeup;
-       u_int8_t regs[0x40];
- };
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1311-config-enable-oprofile-gta01-gta02.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1311-config-enable-oprofile-gta01-gta02.patch.patch
deleted file mode 100644 (file)
index 2630553..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-From 3936a3ad5354645e716b9f2933cfad2555029c6f Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Tue, 21 Oct 2008 00:21:25 +0100
-Subject: [PATCH] config-enable-oprofile-gta01-gta02.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/configs/gta02-moredrivers-defconfig |    3 ++-
- defconfig-gta01                              |    3 ++-
- defconfig-gta02                              |    3 ++-
- 3 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/configs/gta02-moredrivers-defconfig b/arch/arm/configs/gta02-moredrivers-defconfig
-index 7273973..c337ecf 100644
---- a/arch/arm/configs/gta02-moredrivers-defconfig
-+++ b/arch/arm/configs/gta02-moredrivers-defconfig
-@@ -1707,7 +1707,8 @@ CONFIG_NLS_ISO8859_1=y
- CONFIG_NLS_UTF8=m
- # CONFIG_DLM is not set
- CONFIG_INSTRUMENTATION=y
--# CONFIG_PROFILING is not set
-+CONFIG_PROFILING=y
-+CONFIG_OPROFILE=m
- CONFIG_MARKERS=y
- #
-diff --git a/defconfig-gta01 b/defconfig-gta01
-index 3b567b7..0914d93 100644
---- a/defconfig-gta01
-+++ b/defconfig-gta01
-@@ -1649,7 +1649,8 @@ CONFIG_NLS_ISO8859_1=y
- CONFIG_NLS_UTF8=m
- # CONFIG_DLM is not set
- CONFIG_INSTRUMENTATION=y
--# CONFIG_PROFILING is not set
-+CONFIG_PROFILING=y
-+CONFIG_OPROFILE=m
- # CONFIG_MARKERS is not set
- #
-diff --git a/defconfig-gta02 b/defconfig-gta02
-index 2096f95..91d3140 100644
---- a/defconfig-gta02
-+++ b/defconfig-gta02
-@@ -1648,7 +1648,8 @@ CONFIG_NLS_ISO8859_1=y
- CONFIG_NLS_UTF8=m
- # CONFIG_DLM is not set
- CONFIG_INSTRUMENTATION=y
--# CONFIG_PROFILING is not set
-+CONFIG_PROFILING=y
-+CONFIG_OPROFILE=m
- # CONFIG_MARKERS is not set
- #
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1312-GTA02-Improve-NAND-timings.patch b/target/linux/s3c24xx/patches-2.6.24/1312-GTA02-Improve-NAND-timings.patch
deleted file mode 100644 (file)
index 67f867f..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From e144bf41b8674bce731e1afebcd04030a85b4a5b Mon Sep 17 00:00:00 2001
-From: Harald Welte <laforge@openmoko.org>
-Date: Tue, 21 Oct 2008 08:13:09 +0100
-Subject: [PATCH] GTA02: Improve NAND timings
-
-Rather than using conservative default timings for the NAND flash,
-use the timings as specified in the S3C2442B MCP data sheet.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 1a9d823..b1aa95b 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -872,14 +872,14 @@ static struct s3c2410_nand_set gta02_nand_sets[] = {
-       },
- };
--/* choose a set of timings which should suit most 512Mbit
-- * chips and beyond.
-+/* choose a set of timings derived from S3C@2442B MCP54 
-+ * data sheet (K5D2G13ACM-D075 MCP Memory)
-  */
- static struct s3c2410_platform_nand gta02_nand_info = {
--      .tacls          = 20,
--      .twrph0         = 60,
--      .twrph1         = 20,
-+      .tacls          = 0,
-+      .twrph0         = 25,
-+      .twrph1         = 15,
-       .nr_sets        = ARRAY_SIZE(gta02_nand_sets),
-       .sets           = gta02_nand_sets,
-       .software_ecc   = 1,
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1313-S3C24xx-NAND-allow-for-faster-timings.patch b/target/linux/s3c24xx/patches-2.6.24/1313-S3C24xx-NAND-allow-for-faster-timings.patch
deleted file mode 100644 (file)
index 640c9b3..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From 54524f4531c8b262431b794fea610d81bb351c86 Mon Sep 17 00:00:00 2001
-From: Harald Welte <laforge@openmoko.org>
-Date: Tue, 21 Oct 2008 08:17:07 +0100
-Subject: [PATCH] S3C24xx NAND: allow for faster timings
-
-Tacls can actually be zero with some NAND flash devices, so we need
-to permit this.
-
-Also, the TACLS register actually specifies the actual number of
-HCLK clocks, where the TWRPH0 and TWRPH1 registers are auto-incremented
-by one HCLK clock in hardware.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- drivers/mtd/nand/s3c2410.c |   13 +++++++------
- 1 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
-index 4413d76..eeb48ed 100644
---- a/drivers/mtd/nand/s3c2410.c
-+++ b/drivers/mtd/nand/s3c2410.c
-@@ -158,6 +158,10 @@ static int s3c_nand_calc_rate(int wanted, unsigned long clk, int max)
- {
-       int result;
-+      /* Tacls can be 0ns in some cases */
-+      if (wanted == 0)
-+              return 0;
-+
-       result = (wanted * clk) / NS_IN_KHZ;
-       result++;
-@@ -168,9 +172,6 @@ static int s3c_nand_calc_rate(int wanted, unsigned long clk, int max)
-               return -1;
-       }
--      if (result < 1)
--              result = 1;
--
-       return result;
- }
-@@ -202,7 +203,7 @@ static int s3c2410_nand_inithw(struct s3c2410_nand_info *info,
-               twrph1 = 8;
-       }
--      if (tacls < 0 || twrph0 < 0 || twrph1 < 0) {
-+      if (tacls < 0 || twrph0 < 1 || twrph1 < 1) {
-               dev_err(info->device, "cannot get suitable timings\n");
-               return -EINVAL;
-       }
-@@ -213,14 +214,14 @@ static int s3c2410_nand_inithw(struct s3c2410_nand_info *info,
-       switch (info->cpu_type) {
-       case TYPE_S3C2410:
-               cfg = S3C2410_NFCONF_EN;
--              cfg |= S3C2410_NFCONF_TACLS(tacls - 1);
-+              cfg |= S3C2410_NFCONF_TACLS(tacls);
-               cfg |= S3C2410_NFCONF_TWRPH0(twrph0 - 1);
-               cfg |= S3C2410_NFCONF_TWRPH1(twrph1 - 1);
-               break;
-       case TYPE_S3C2440:
-       case TYPE_S3C2412:
--              cfg = S3C2440_NFCONF_TACLS(tacls - 1);
-+              cfg = S3C2440_NFCONF_TACLS(tacls);
-               cfg |= S3C2440_NFCONF_TWRPH0(twrph0 - 1);
-               cfg |= S3C2440_NFCONF_TWRPH1(twrph1 - 1);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1314-palliate_touch_screen_jitter.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1314-palliate_touch_screen_jitter.patch.patch
deleted file mode 100644 (file)
index 751d464..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-From abe8f448547d1bd69ac2963e07e2657f27b79691 Mon Sep 17 00:00:00 2001
-From: I-Fan Chen <tick@openmoko.com>
-Date: Wed, 29 Oct 2008 03:15:18 +0000
-Subject: [PATCH] palliate_touch_screen_jitter.patch
-
-    S3C24XX touchscreen: To palliate the data jitter from touchpanel
-       Thanks to Dima Kogan patch eff39cde0d3cdd2afd5e1b4be5a8eb6cf195543e,
-       in which try to balence the up/down events, and inspired this patch.
-       We can observe a serious up/down jitter phenomenon when touching the touchscreen lightly.
-       This only happens when the press  pressure is pretty light:
-               eg. large scale light touch,
-               starting to touch,
-               or going to move finger from touch panel.
-       This will make user space library think it got extra click events.
-       In order to palliate with this phenomenon, we delayed the up event for a while,
-       and see if it is a jitter or not.
-       The threshold is crucial. If it is too long, multiple clicks will be filtered out.
-       If it is too short we did not filter anything out.
-       From the log and some survey we can see that the interval of two clicks is generally over 0.1 sec.
-       And Most jitter events happens in 0.3 sec.
-       And the longest duration of vision is about 1/16 sec, and it's not easy for human to notice.
-       So I choose 1/16 sec as the threshold.
-       This filters out most (not all) jitter events, and preserves the normal behavior we expected.
-
-Signed-off-by: I-Fan Chen <tick@openmoko.com>
----
- drivers/input/touchscreen/s3c2410_ts.c |   47 +++++++++++++++++---------------
- 1 files changed, 25 insertions(+), 22 deletions(-)
-
-diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
-index fc1c500..95672ff 100644
---- a/drivers/input/touchscreen/s3c2410_ts.c
-+++ b/drivers/input/touchscreen/s3c2410_ts.c
-@@ -78,6 +78,12 @@
- #define DEBUG_LVL    KERN_DEBUG
-+#define TOUCH_STANDBY_FLAG 0
-+#define TOUCH_PRESSED_FLAG 1
-+#define TOUCH_RELEASE_FLAG 2
-+
-+#define TOUCH_RELEASE_TIMEOUT (HZ >> 4)
-+
- MODULE_AUTHOR("Arnaud Patard <arnaud.patard@rtp-net.org>");
- MODULE_DESCRIPTION("s3c2410 touchscreen driver");
- MODULE_LICENSE("GPL");
-@@ -131,7 +137,7 @@ static void clear_raw_fifo(void)
-       ts.raw_running_avg.x = 0;
-       ts.raw_running_avg.y = 0;
-       ts.flag_previous_exceeded_threshold = 0;
--      ts.flag_first_touch_sent = 0;
-+      ts.flag_first_touch_sent = TOUCH_STANDBY_FLAG;
- }
-@@ -143,6 +149,10 @@ static inline void s3c2410_ts_connect(void)
-       s3c2410_gpio_cfgpin(S3C2410_GPG15, S3C2410_GPG15_nYPON);
- }
-+static void touch_timer_fire(unsigned long data);
-+static struct timer_list touch_timer =
-+              TIMER_INITIALIZER(touch_timer_fire, 0, 0);
-+
- static void touch_timer_fire(unsigned long data)
- {
-       unsigned long data0;
-@@ -155,18 +165,9 @@ static void touch_timer_fire(unsigned long data)
-       updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) &&
-                                           (!(data1 & S3C2410_ADCDAT0_UPDOWN));
--      // if we need to send an untouch event, but we haven't yet sent the
--      // touch event (this happens if the touchscreen was tapped lightly),
--      // send the touch event first
--      if (!updown && !ts.flag_first_touch_sent && ts.count != 0) {
--              input_report_abs(ts.dev, ABS_X, ts.xp >> ts.shift);
--              input_report_abs(ts.dev, ABS_Y, ts.yp >> ts.shift);
--
--              input_report_key(ts.dev, BTN_TOUCH, 1);
--              input_report_abs(ts.dev, ABS_PRESSURE, 1);
--              input_sync(ts.dev);
--              ts.flag_first_touch_sent = 1;
--      }
-+        if ( updown && ts.flag_first_touch_sent == TOUCH_RELEASE_FLAG ) {
-+              ts.flag_first_touch_sent = TOUCH_PRESSED_FLAG;
-+        }
-       if (updown) {
-               if (ts.count != 0) {
-@@ -189,7 +190,7 @@ static void touch_timer_fire(unsigned long data)
-                       input_report_key(ts.dev, BTN_TOUCH, 1);
-                       input_report_abs(ts.dev, ABS_PRESSURE, 1);
-                       input_sync(ts.dev);
--                      ts.flag_first_touch_sent = 1;
-+                      ts.flag_first_touch_sent = TOUCH_PRESSED_FLAG;
-               }
-               ts.xp = 0;
-@@ -202,19 +203,21 @@ static void touch_timer_fire(unsigned long data)
-                        S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON);
-       } else {
-               ts.count = 0;
--
--              input_report_key(ts.dev, BTN_TOUCH, 0);
--              input_report_abs(ts.dev, ABS_PRESSURE, 0);
--              input_sync(ts.dev);
--              ts.flag_first_touch_sent = 0;
-+                
-+                if ( ts.flag_first_touch_sent == TOUCH_RELEASE_FLAG ) {
-+                      input_report_key(ts.dev, BTN_TOUCH, 0);
-+                      input_report_abs(ts.dev, ABS_PRESSURE, 0);
-+                      input_sync(ts.dev);
-+                      ts.flag_first_touch_sent = TOUCH_STANDBY_FLAG;
-+                } if ( ts.flag_first_touch_sent == TOUCH_PRESSED_FLAG ) {
-+                      ts.flag_first_touch_sent = TOUCH_RELEASE_FLAG;
-+                      mod_timer(&touch_timer, jiffies + TOUCH_RELEASE_TIMEOUT);
-+                }
-               writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC);
-       }
- }
--static struct timer_list touch_timer =
--              TIMER_INITIALIZER(touch_timer_fire, 0, 0);
--
- static irqreturn_t stylus_updown(int irq, void *dev_id)
- {
-       unsigned long data0;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1315-config-allow-gta02-usb-hiddev.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1315-config-allow-gta02-usb-hiddev.patch.patch
deleted file mode 100644 (file)
index 5093821..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-From 6e2a723ef54ee2e739c34786981b2c508db803c1 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 29 Oct 2008 03:24:18 +0000
-Subject: [PATCH] config-allow-gta02-usb-hiddev.patch
-
-Tick requested that we allow USB HIDDEV config on GTA02
-so he can strap one on some robot legs he is working on.
-He found that having it as a module broke gadget support
-somehow (?) so HID and HIDDEV are changed to in-kernel
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/configs/gta02-moredrivers-defconfig |    2 +-
- defconfig-gta02                              |    4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/configs/gta02-moredrivers-defconfig b/arch/arm/configs/gta02-moredrivers-defconfig
-index c337ecf..add419a 100644
---- a/arch/arm/configs/gta02-moredrivers-defconfig
-+++ b/arch/arm/configs/gta02-moredrivers-defconfig
-@@ -1291,7 +1291,7 @@ CONFIG_HID=y
- CONFIG_USB_HID=y
- # CONFIG_USB_HIDINPUT_POWERBOOK is not set
- # CONFIG_HID_FF is not set
--# CONFIG_USB_HIDDEV is not set
-+CONFIG_USB_HIDDEV=y
- CONFIG_USB_SUPPORT=y
- CONFIG_USB_ARCH_HAS_HCD=y
- CONFIG_USB_ARCH_HAS_OHCI=y
-diff --git a/defconfig-gta02 b/defconfig-gta02
-index 91d3140..70bdc3e 100644
---- a/defconfig-gta02
-+++ b/defconfig-gta02
-@@ -1195,10 +1195,10 @@ CONFIG_HID=y
- #
- # USB Input Devices
- #
--CONFIG_USB_HID=m
-+CONFIG_USB_HID=y
- # CONFIG_USB_HIDINPUT_POWERBOOK is not set
- # CONFIG_HID_FF is not set
--# CONFIG_USB_HIDDEV is not set
-+CONFIG_USB_HIDDEV=y
- #
- # USB HID Boot Protocol drivers
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1316-jffs2-choke-gc-thread.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1316-jffs2-choke-gc-thread.patch.patch
deleted file mode 100644 (file)
index b3d5c0c..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-From 9706327002caebe6633c93e605882ea37172ec57 Mon Sep 17 00:00:00 2001
-From: Andres Salomon <dilinger@debian.org>
-Date: Mon, 3 Nov 2008 01:08:25 +0000
-Subject: [PATCH] jffs2-choke-gc-thread.patch
-
-I've noticed some pretty poor behavior on OLPC machines after bootup, when
-gdm/X are starting.  The GCD monopolizes the scheduler (which in turns means
-it gets to do more nand i/o), which results in processes taking much much
-longer than they should to start.
-
-As an example, on an OLPC machine going from OFW to a usable X (via auto-login
-gdm) takes 2m 30s.  The majority of this time is consumed by the switch into
-graphical mode.  With this patch, we cut a full 60s off of bootup time.  After
-bootup, things are much snappier as well.
-
-Note that we have seen a CRC node error with this patch that causes the machine
-to fail to boot, but we've also seen that problem without this patch.
-
-Signed-off-by: Andres Salomon <dilinger@debian.org>
----
- fs/jffs2/background.c |   18 +++++++++++-------
- 1 files changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/fs/jffs2/background.c b/fs/jffs2/background.c
-index 8adebd3..f38d557 100644
---- a/fs/jffs2/background.c
-+++ b/fs/jffs2/background.c
-@@ -95,13 +95,17 @@ static int jffs2_garbage_collect_thread(void *_c)
-                       schedule();
-               }
--              /* This thread is purely an optimisation. But if it runs when
--                 other things could be running, it actually makes things a
--                 lot worse. Use yield() and put it at the back of the runqueue
--                 every time. Especially during boot, pulling an inode in
--                 with read_inode() is much preferable to having the GC thread
--                 get there first. */
--              yield();
-+              /* Problem - immediately after bootup, the GCD spends a lot
-+               * of time in places like jffs2_kill_fragtree(); so much so
-+               * that userspace processes (like gdm and X) are starved
-+               * despite plenty of cond_resched()s and renicing.  Yield()
-+               * doesn't help, either (presumably because userspace and GCD
-+               * are generally competing for a higher latency resource -
-+               * disk).
-+               * This forces the GCD to slow the hell down.   Pulling an
-+               * inode in with read_inode() is much preferable to having
-+               * the GC thread get there first. */
-+              schedule_timeout_interruptible(msecs_to_jiffies(50));
-               /* Put_super will send a SIGKILL and then wait on the sem.
-                */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1317-fix-gta02-defconfig-uplevel.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1317-fix-gta02-defconfig-uplevel.patch.patch
deleted file mode 100644 (file)
index a2cf882..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-From 96849f57004444e54a03ff0575811d32af143979 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 12 Nov 2008 09:12:35 +0000
-Subject: [PATCH] fix-gta02-defconfig-uplevel.patch
-
-Update packaging config to silence questions on oldconfig
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- defconfig-gta02 |   25 +++++++------------------
- 1 files changed, 7 insertions(+), 18 deletions(-)
-
-diff --git a/defconfig-gta02 b/defconfig-gta02
-index 70bdc3e..c505296 100644
---- a/defconfig-gta02
-+++ b/defconfig-gta02
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.24
--# Mon Feb 25 07:03:56 2008
-+# Wed Nov 12 09:11:19 2008
- #
- CONFIG_ARM=y
- CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-@@ -988,6 +988,7 @@ CONFIG_SENSORS_PCF50633=y
- # CONFIG_SENSORS_MAX6875 is not set
- # CONFIG_SENSORS_TSL2550 is not set
- CONFIG_SENSORS_TSL256X=m
-+# CONFIG_PCA9632 is not set
- # CONFIG_I2C_DEBUG_CORE is not set
- # CONFIG_I2C_DEBUG_ALGO is not set
- # CONFIG_I2C_DEBUG_BUS is not set
-@@ -1136,6 +1137,7 @@ CONFIG_SOUND=y
- CONFIG_SND=m
- CONFIG_SND_TIMER=m
- CONFIG_SND_PCM=m
-+CONFIG_SND_RAWMIDI=m
- # CONFIG_SND_SEQUENCER is not set
- CONFIG_SND_OSSEMUL=y
- CONFIG_SND_MIXER_OSS=m
-@@ -1176,6 +1178,7 @@ CONFIG_SND_SOC=m
- CONFIG_SND_S3C24XX_SOC=m
- CONFIG_SND_S3C24XX_SOC_I2S=m
- CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
-+# CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753_DEBUG is not set
- CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
- #
-@@ -1199,12 +1202,6 @@ CONFIG_USB_HID=y
- # CONFIG_USB_HIDINPUT_POWERBOOK is not set
- # CONFIG_HID_FF is not set
- CONFIG_USB_HIDDEV=y
--
--#
--# USB HID Boot Protocol drivers
--#
--# CONFIG_USB_KBD is not set
--# CONFIG_USB_MOUSE is not set
- CONFIG_USB_SUPPORT=y
- CONFIG_USB_ARCH_HAS_HCD=y
- CONFIG_USB_ARCH_HAS_OHCI=y
-@@ -1380,9 +1377,10 @@ CONFIG_USB_S3C2410=y
- # CONFIG_USB_GADGET_DUALSPEED is not set
- # CONFIG_USB_ZERO is not set
- CONFIG_USB_ETH=m
--CONFIG_USB_ETH_RNDIS=m
-+CONFIG_USB_ETH_RNDIS=y
- CONFIG_USB_GADGETFS=m
- CONFIG_USB_FILE_STORAGE=m
-+# CONFIG_USB_FILE_STORAGE_TEST is not set
- CONFIG_USB_G_SERIAL=m
- CONFIG_USB_MIDI_GADGET=m
-@@ -1510,6 +1508,7 @@ CONFIG_ISO9660_FS=m
- CONFIG_JOLIET=y
- # CONFIG_ZISOFS is not set
- CONFIG_UDF_FS=m
-+CONFIG_UDF_NLS=y
- #
- # DOS/FAT/NT Filesystems
-@@ -1542,16 +1541,6 @@ CONFIG_CONFIGFS_FS=m
- # CONFIG_BEFS_FS is not set
- # CONFIG_BFS_FS is not set
- # CONFIG_EFS_FS is not set
--CONFIG_YAFFS_FS=y
--CONFIG_YAFFS_YAFFS1=y
--CONFIG_YAFFS_9BYTE_TAGS=y
--CONFIG_YAFFS_YAFFS2=y
--CONFIG_YAFFS_AUTO_YAFFS2=y
--# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
--CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
--# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
--# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
--CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
- CONFIG_JFFS2_FS=y
- CONFIG_JFFS2_FS_DEBUG=0
- CONFIG_JFFS2_FS_WRITEBUFFER=y
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1318-config-enable-storing-config-in-kernel.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1318-config-enable-storing-config-in-kernel.patch.patch
deleted file mode 100644 (file)
index 7178362..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From cacca01e497a6c3f608ada27968c0361b86a99ae Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 12 Nov 2008 17:50:01 +0000
-Subject: [PATCH] config-enable-storing-config-in-kernel.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/configs/gta02-moredrivers-defconfig |    2 +-
- defconfig-gta01                              |    2 +-
- defconfig-gta02                              |    2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/configs/gta02-moredrivers-defconfig b/arch/arm/configs/gta02-moredrivers-defconfig
-index add419a..bfa8abe 100644
---- a/arch/arm/configs/gta02-moredrivers-defconfig
-+++ b/arch/arm/configs/gta02-moredrivers-defconfig
-@@ -44,7 +44,7 @@ CONFIG_SYSVIPC_SYSCTL=y
- # CONFIG_USER_NS is not set
- # CONFIG_PID_NS is not set
- # CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
-+CONFIG_IKCONFIG=y
- CONFIG_LOG_BUF_SHIFT=16
- # CONFIG_CGROUPS is not set
- CONFIG_FAIR_GROUP_SCHED=y
-diff --git a/defconfig-gta01 b/defconfig-gta01
-index 0914d93..e8970e2 100644
---- a/defconfig-gta01
-+++ b/defconfig-gta01
-@@ -44,7 +44,7 @@ CONFIG_SYSVIPC_SYSCTL=y
- # CONFIG_USER_NS is not set
- # CONFIG_PID_NS is not set
- # CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
-+CONFIG_IKCONFIG=y
- CONFIG_LOG_BUF_SHIFT=14
- # CONFIG_CGROUPS is not set
- # CONFIG_FAIR_GROUP_SCHED is not set
-diff --git a/defconfig-gta02 b/defconfig-gta02
-index c505296..69ac3b7 100644
---- a/defconfig-gta02
-+++ b/defconfig-gta02
-@@ -44,7 +44,7 @@ CONFIG_SYSVIPC_SYSCTL=y
- # CONFIG_USER_NS is not set
- # CONFIG_PID_NS is not set
- # CONFIG_AUDIT is not set
--# CONFIG_IKCONFIG is not set
-+CONFIG_IKCONFIG=y
- CONFIG_LOG_BUF_SHIFT=14
- # CONFIG_CGROUPS is not set
- # CONFIG_FAIR_GROUP_SCHED is not set
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1319-config-enable-ikconfig-proc.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1319-config-enable-ikconfig-proc.patch.patch
deleted file mode 100644 (file)
index 02656dd..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-From f3e8ed238670ce89fed082862d920fd98733a9c0 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 12 Nov 2008 18:05:29 +0000
-Subject: [PATCH] config-enable-ikconfig-proc.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/configs/gta02-moredrivers-defconfig |    1 +
- defconfig-gta01                              |    1 +
- defconfig-gta02                              |    1 +
- 3 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/configs/gta02-moredrivers-defconfig b/arch/arm/configs/gta02-moredrivers-defconfig
-index bfa8abe..113eaec 100644
---- a/arch/arm/configs/gta02-moredrivers-defconfig
-+++ b/arch/arm/configs/gta02-moredrivers-defconfig
-@@ -45,6 +45,7 @@ CONFIG_SYSVIPC_SYSCTL=y
- # CONFIG_PID_NS is not set
- # CONFIG_AUDIT is not set
- CONFIG_IKCONFIG=y
-+CONFIG_IKCONFIG_PROC=y
- CONFIG_LOG_BUF_SHIFT=16
- # CONFIG_CGROUPS is not set
- CONFIG_FAIR_GROUP_SCHED=y
-diff --git a/defconfig-gta01 b/defconfig-gta01
-index e8970e2..cecb57f 100644
---- a/defconfig-gta01
-+++ b/defconfig-gta01
-@@ -45,6 +45,7 @@ CONFIG_SYSVIPC_SYSCTL=y
- # CONFIG_PID_NS is not set
- # CONFIG_AUDIT is not set
- CONFIG_IKCONFIG=y
-+CONFIG_IKCONFIG_PROC=y
- CONFIG_LOG_BUF_SHIFT=14
- # CONFIG_CGROUPS is not set
- # CONFIG_FAIR_GROUP_SCHED is not set
-diff --git a/defconfig-gta02 b/defconfig-gta02
-index 69ac3b7..619f7f2 100644
---- a/defconfig-gta02
-+++ b/defconfig-gta02
-@@ -45,6 +45,7 @@ CONFIG_SYSVIPC_SYSCTL=y
- # CONFIG_PID_NS is not set
- # CONFIG_AUDIT is not set
- CONFIG_IKCONFIG=y
-+CONFIG_IKCONFIG_PROC=y
- CONFIG_LOG_BUF_SHIFT=14
- # CONFIG_CGROUPS is not set
- # CONFIG_FAIR_GROUP_SCHED is not set
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1320--ARM-S3C24xx-Add-preliminary-E-TEN-glofiish-M800-s.patch b/target/linux/s3c24xx/patches-2.6.24/1320--ARM-S3C24xx-Add-preliminary-E-TEN-glofiish-M800-s.patch
deleted file mode 100644 (file)
index 44ef8fb..0000000
+++ /dev/null
@@ -1,165 +0,0 @@
-From eee43706c5969f5d99096dddefae3be0c41a6ed2 Mon Sep 17 00:00:00 2001
-From: Harald Welte <laforge@gnumonks.org>
-Date: Thu, 13 Nov 2008 08:29:11 +0000
-Subject: [PATCH] [ARM] S3C24xx: Add preliminary E-TEN glofiish M800 support
-
-This patch adds preliminary support for the M800.  If booted
-through haret, the system has the following working components:
-* NAND read support
-* framebuffer / LCM (no jbt6k74 power management yet)
-* USB device controller (incl. Pullup)
-* microSD card (incl. card-detect)
-* backlight brightness control (using gta01-bl.c)
-* input event device for power, camera and record button
-* input event device for keyboard slide event
-* bluetooth power control (using gta01-pm-bt)
-
-Many things are still missing, like
-* NAND write support
-* GPS power control
-* GSM/3G modem interface
-* capsense buttons, joystick and querty-keyboard
-* camera
-* audio
-
-Signed-off-by: Harald Welte <laforge@gnumonks.org>
----
- arch/arm/mach-s3c2440/Kconfig         |    7 +++++++
- arch/arm/mach-s3c2440/Makefile        |    1 +
- arch/arm/plat-s3c24xx/neo1973_pm_bt.c |   17 +++++++++++++++++
- arch/arm/tools/mach-types             |    1 +
- drivers/input/keyboard/Kconfig        |   11 +++++++++++
- drivers/input/keyboard/Makefile       |    1 +
- drivers/mtd/nand/nand_bbt.c           |    2 ++
- 7 files changed, 40 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
-index 4a211d8..4c3b6b2 100644
---- a/arch/arm/mach-s3c2440/Kconfig
-+++ b/arch/arm/mach-s3c2440/Kconfig
-@@ -98,6 +98,13 @@ config NEO1973_GTA02_2440
-          Say Y here if you are using an early hardware revision
-          of the FIC/Openmoko Neo1973 GTA02 GSM Phone.
-+config MACH_M800
-+      bool "E-TEN glofiish M800/X800"
-+      select CPU_S3C2442
-+      help
-+         Say Y here if you are using the E-TEN glofiish M800/X800.
-+
-+
- endmenu
- #source "arch/arm/mach-s3c2440/camera/Kconfig"
-diff --git a/arch/arm/mach-s3c2440/Makefile b/arch/arm/mach-s3c2440/Makefile
-index e3ca9e3..8617820 100644
---- a/arch/arm/mach-s3c2440/Makefile
-+++ b/arch/arm/mach-s3c2440/Makefile
-@@ -24,3 +24,4 @@ obj-$(CONFIG_ARCH_S3C2440)   += mach-smdk2440.o
- obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
- obj-$(CONFIG_MACH_HXD8)               += mach-hxd8.o
- obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
-+obj-$(CONFIG_MACH_M800)               += mach-glofiish.o
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-index dfc9ae8..dcb251b 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-@@ -30,6 +30,9 @@
- #include <linux/pcf50633.h>
- #endif
-+#ifdef CONFIG_MACH_M800
-+#include <asm/arch/glofiish.h>
-+#endif
- #define DRVMSG "FIC Neo1973 Bluetooth Power Management"
-@@ -56,6 +59,14 @@ static ssize_t bt_read(struct device *dev, struct device_attribute *attr,
-                       break;
- #endif /* CONFIG_MACH_NEO1973_GTA02 */
-+#ifdef CONFIG_MACH_M800
-+              case MACH_TYPE_M800:
-+                      if (s3c2410_gpio_getpin(M800_GPIO_BT_POWER_1) &&
-+                          s3c2410_gpio_getpin(M800_GPIO_BT_POWER_2))
-+                              goto out_1;
-+                      break;
-+#endif /* CONFIG_MACH_M800 */
-+
-               }
-       } else if (!strcmp(attr->attr.name, "reset")) {
-               switch (machine_arch_type) {
-@@ -121,6 +132,12 @@ static ssize_t bt_write(struct device *dev, struct device_attribute *attr,
-                       break;
- #endif /* CONFIG_MACH_NEO1973_GTA02 */
-+#ifdef CONFIG_MACH_M800
-+              case MACH_TYPE_M800:
-+                      s3c2410_gpio_setpin(M800_GPIO_BT_POWER_1, on);
-+                      s3c2410_gpio_setpin(M800_GPIO_BT_POWER_2, on);
-+                      break;
-+#endif /* CONFIG_MACH_M800 */
-               }
-       } else if (!strcmp(attr->attr.name, "reset")) {
-               /* reset is low-active, so we need to invert */
-diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
-index 0a9a5e7..2578091 100644
---- a/arch/arm/tools/mach-types
-+++ b/arch/arm/tools/mach-types
-@@ -1367,3 +1367,4 @@ db88f5281                MACH_DB88F5281          DB88F5281               1358
- csb726                        MACH_CSB726             CSB726                  1359
- tik27                 MACH_TIK27              TIK27                   1360
- mx_uc7420             MACH_MX_UC7420          MX_UC7420               1361
-+m800                  MACH_M800               M800                    1772
-diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
-index a61ca45..68a893f 100644
---- a/drivers/input/keyboard/Kconfig
-+++ b/drivers/input/keyboard/Kconfig
-@@ -304,6 +304,17 @@ config KEYBOARD_NEO1973
-         To compile this driver as a module, choose M here: the
-         module will be called neo1973kbd.
-+config KEYBOARD_M800
-+      tristate "E-TEN glofiish M800 buttons"
-+      depends on MACH_M800
-+      default y
-+      help
-+        Say Y here to enable the buttons on the E-TEN glofiish
-+        M800 GSM phone.
-+
-+        To compile this driver as a module, choose M here: the
-+        module will be called m800kbd.
-+
- config KEYBOARD_QT2410
-       tristate "QT2410 buttons"
-       depends on MACH_QT2410
-diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
-index 34bfc33..005a050 100644
---- a/drivers/input/keyboard/Makefile
-+++ b/drivers/input/keyboard/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_KEYBOARD_NEWTON)                += newtonkbd.o
- obj-$(CONFIG_KEYBOARD_STOWAWAY)               += stowaway.o
- obj-$(CONFIG_KEYBOARD_CORGI)          += corgikbd.o
- obj-$(CONFIG_KEYBOARD_NEO1973)                += neo1973kbd.o
-+obj-$(CONFIG_KEYBOARD_M800)           += m800kbd.o
- obj-$(CONFIG_KEYBOARD_QT2410)         += qt2410kbd.o
- obj-$(CONFIG_KEYBOARD_SPITZ)          += spitzkbd.o
- obj-$(CONFIG_KEYBOARD_HIL)            += hil_kbd.o
-diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
-index 5e121ce..7e20816 100644
---- a/drivers/mtd/nand/nand_bbt.c
-+++ b/drivers/mtd/nand/nand_bbt.c
-@@ -430,8 +430,10 @@ static int create_bbt(struct mtd_info *mtd, uint8_t *buf,
-               if (ret) {
-                       this->bbt[i >> 3] |= 0x03 << (i & 0x6);
-+#if 0
-                       printk(KERN_WARNING "Bad eraseblock %d at 0x%08x\n",
-                              i >> 1, (unsigned int)from);
-+#endif
-                       mtd->ecc_stats.badblocks++;
-               }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1321-fix-s3c2410-usb-controller-mode-change-always-EINVAL.patch b/target/linux/s3c24xx/patches-2.6.24/1321-fix-s3c2410-usb-controller-mode-change-always-EINVAL.patch
deleted file mode 100644 (file)
index 0fe12da..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-From a5dcecfb817b256b0e36f3c48605f79e35dd3e57 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Thu, 13 Nov 2008 20:28:59 +0000
-Subject: [PATCH] fix-s3c2410-usb-controller-mode-change-always-EINVAL.patch
-
-We always return -EINVAL when changing s3c2410 USB host and device modes
-due to lack of { }.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/usb/host/ohci-s3c2410.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
-index 68f5689..1c41202 100644
---- a/drivers/usb/host/ohci-s3c2410.c
-+++ b/drivers/usb/host/ohci-s3c2410.c
-@@ -335,9 +335,11 @@ static ssize_t set_usb_mode(struct device *dev, struct device_attribute *attr,
-               printk("s3c2410: changing usb to device\n");
-               s3c2410_modify_misccr(S3C2410_MISCCR_USBHOST, 0);
-               s3c2410_gpio_setpin(S3C2410_GPB9, 1);
--      } else
-+      } else {
-               printk("s3c2410: unknown mode\n");
-               return -EINVAL;
-+      }
-+
-       return count;
- }
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1322-fix-gta01-s3c-mci-stop-clock-when-idle.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1322-fix-gta01-s3c-mci-stop-clock-when-idle.patch.patch
deleted file mode 100644 (file)
index 7717199..0000000
+++ /dev/null
@@ -1,211 +0,0 @@
-From ff31834cfaac386f94ddd65fab8b87d090c69bcc Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Thu, 13 Nov 2008 20:38:35 +0000
-Subject: [PATCH] fix-gta01-s3c-mci-stop-clock-when-idle.patch
-
-This patch, based on the work done by Andy Green for the Glamo mci
-driver, makes sure that the SD clock only runs during data transfers.
-This can be overridden on the kernel command line if desired.  Also
-added is the ability for the maximum SD clock speed to be limited.
-
-Signed-off-by: Mike Westerhof (mwester@dls.net)
----
- drivers/mmc/host/s3cmci.c |  113 +++++++++++++++++++++++++++++++++++++++++++--
- 1 files changed, 109 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
-index edba055..8f88721 100644
---- a/drivers/mmc/host/s3cmci.c
-+++ b/drivers/mmc/host/s3cmci.c
-@@ -15,6 +15,8 @@
- #include <linux/mmc/host.h>
- #include <linux/platform_device.h>
- #include <linux/irq.h>
-+#include <linux/delay.h>
-+#include <linux/spinlock.h>
- #include <asm/dma.h>
- #include <asm/dma-mapping.h>
-@@ -29,6 +31,37 @@
- #define DRIVER_NAME "s3c-mci"
-+static spinlock_t clock_lock;
-+
-+/*
-+ * Max SD clock rate (in Hz)
-+ *
-+ * you can override this on the kernel command line using
-+ *
-+ * s3cmci.sd_max_clk=10000000
-+ *
-+ * for example.
-+ */
-+
-+static int sd_max_clk = 25000000;
-+module_param(sd_max_clk, int, 0644);
-+
-+/*
-+ * SD allow SD clock to run while idle
-+ *
-+ * you can override this on kernel commandline using
-+ *
-+ *  s3cmci.sd_idleclk=0
-+ *
-+ * for example.
-+ */
-+
-+static int sd_idleclk;         /* disallow idle clock by default */
-+module_param(sd_idleclk, int, 0644);
-+
-+/* used to stash real idleclk state in suspend: we force it to run in there */
-+static int suspend_sd_idleclk;
-+
- enum dbg_channels {
-       dbg_err   = (1 << 0),
-       dbg_debug = (1 << 1),
-@@ -368,6 +401,40 @@ static void pio_tasklet(unsigned long data)
-               enable_irq(host->irq);
- }
-+static void __s3cmci_enable_clock(struct s3cmci_host *host)
-+{
-+      u32 mci_con;
-+      unsigned long flags;
-+
-+      /* enable the clock if clock rate is > 0 */
-+      if (host->real_rate) {
-+              spin_lock_irqsave(&clock_lock, flags);
-+
-+              mci_con = readl(host->base + S3C2410_SDICON);
-+              mci_con |= S3C2410_SDICON_CLOCKTYPE;
-+              writel(mci_con, host->base + S3C2410_SDICON);
-+
-+              spin_unlock_irqrestore(&clock_lock, flags);
-+      }
-+}
-+
-+static void __s3cmci_disable_clock(struct s3cmci_host *host)
-+{
-+      u32 mci_con;
-+      unsigned long flags;
-+
-+      if (!sd_idleclk) {
-+              spin_lock_irqsave(&clock_lock, flags);
-+
-+              mci_con = readl(host->base + S3C2410_SDICON);
-+              mci_con &= ~S3C2410_SDICON_CLOCKTYPE;
-+              writel(mci_con, host->base + S3C2410_SDICON);
-+
-+              spin_unlock_irqrestore(&clock_lock, flags);
-+      }
-+}
-+
-+
- /*
-  * ISR for SDI Interface IRQ
-  * Communication between driver and ISR works as follows:
-@@ -749,6 +816,7 @@ static void finalize_request(struct s3cmci_host *host)
-       }
- request_done:
-+      __s3cmci_disable_clock(host);
-       host->complete_what = COMPLETION_NONE;
-       host->mrq = NULL;
-       mmc_request_done(host->mmc, mrq);
-@@ -1005,6 +1073,7 @@ static void s3cmci_send_request(struct mmc_host *mmc)
-       }
-+      __s3cmci_enable_clock(host);
-       s3cmci_send_command(host, cmd);
-       enable_irq(host->irq);
- }
-@@ -1087,14 +1156,30 @@ static void s3cmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-       if ((ios->power_mode == MMC_POWER_ON)
-               || (ios->power_mode == MMC_POWER_UP)) {
--              dbg(host, dbg_conf, "running at %lukHz (requested: %ukHz).\n",
--                  host->real_rate/1000, ios->clock/1000);
-+              dbg(host, dbg_conf,
-+                  "powered (vdd: %d), clk: %lukHz div=%lu (req: %ukHz),"
-+                  " bus width: %d\n", ios->vdd, host->real_rate / 1000,
-+                  host->clk_div * (host->prescaler + 1),
-+                  ios->clock / 1000, ios->bus_width);
-+
-+              /* After power-up, we need to give the card 74 clocks to
-+               * initialize, so sleep just a moment before we disable
-+               * the clock again.
-+               */
-+              if (ios->clock)
-+                      msleep(1);
-+
-       } else {
-               dbg(host, dbg_conf, "powered down.\n");
-       }
-       host->bus_width = ios->bus_width;
-+      /* No need to run the clock until we have data to move */
-+      if (!sd_idleclk) {
-+              __s3cmci_disable_clock(host);
-+              dbg(host, dbg_conf, "SD clock disabled when idle.\n");
-+      }
- }
- static void s3cmci_reset(struct s3cmci_host *host)
-@@ -1267,7 +1352,7 @@ static int s3cmci_probe(struct platform_device *pdev, int is2440)
-       mmc->ocr_avail  = host->pdata->ocr_avail;
-       mmc->caps       = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ;
-       mmc->f_min      = host->clk_rate / (host->clk_div * 256);
--      mmc->f_max      = host->clk_rate / host->clk_div;
-+      mmc->f_max      = sd_max_clk;
-       mmc->max_blk_count      = 4095;
-       mmc->max_blk_size       = 4095;
-@@ -1354,14 +1439,33 @@ static int s3cmci_probe_2440(struct platform_device *dev)
- static int s3cmci_suspend(struct platform_device *dev, pm_message_t state)
- {
-       struct mmc_host *mmc = platform_get_drvdata(dev);
-+      struct s3cmci_host *host = mmc_priv(mmc);
-+      int ret;
-+
-+      /* Ensure clock is running so it will be running on resume */
-+      __s3cmci_enable_clock(host);
--      return  mmc_suspend_host(mmc, state);
-+      /* We will do more commands, make sure the clock stays running,
-+       * and save our state so that we can restore it on resume.
-+       */
-+      suspend_sd_idleclk = sd_idleclk;
-+      sd_idleclk = 1;
-+
-+      ret = mmc_suspend_host(mmc, state);
-+
-+      /* so that when we resume, we use any modified max rate */
-+      mmc->f_max = sd_max_clk;
-+
-+      return ret;
- }
- static int s3cmci_resume(struct platform_device *dev)
- {
-       struct mmc_host *mmc = platform_get_drvdata(dev);
-+      /* Put the sd_idleclk state back to what it was */
-+      sd_idleclk = suspend_sd_idleclk;
-+
-       return mmc_resume_host(mmc);
- }
-@@ -1398,6 +1502,7 @@ static struct platform_driver s3cmci_driver_2440 = {
- static int __init s3cmci_init(void)
- {
-+      spin_lock_init(&clock_lock);
-       platform_driver_register(&s3cmci_driver_2410);
-       platform_driver_register(&s3cmci_driver_2412);
-       platform_driver_register(&s3cmci_driver_2440);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1323-GTA01-use-slow-SD-clock-when-gps-on.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1323-GTA01-use-slow-SD-clock-when-gps-on.patch.patch
deleted file mode 100644 (file)
index 3e16c6e..0000000
+++ /dev/null
@@ -1,161 +0,0 @@
-From d944934bbddc281938fb1905a69e35c0581937c2 Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Thu, 13 Nov 2008 20:39:36 +0000
-Subject: [PATCH] GTA01-use-slow-SD-clock-when-gps-on.patch
-
-This patch implements Andy Green's SD clock slow-down code
-for the GTA01 device.
-
-Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- arch/arm/mach-s3c2410/mach-gta01.c |    8 ++++++
- drivers/mmc/host/s3cmci.c          |   43 ++++++++++++++++++++++++++++++++++-
- drivers/mmc/host/s3cmci.h          |    1 +
- include/asm-arm/arch-s3c2410/mci.h |    1 +
- 4 files changed, 51 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index a364b76..c0817dc 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -75,6 +75,8 @@
- #include <asm/plat-s3c24xx/neo1973.h>
- #include <asm/arch-s3c2410/neo1973-pm-gsm.h>
-+#include "../plat-s3c24xx/neo1973_pm_gps.h"
-+
- #include <linux/jbt6k74.h>
- static struct map_desc gta01_iodesc[] __initdata = {
-@@ -432,9 +434,15 @@ static void gta01_mmc_set_power(unsigned char power_mode, unsigned short vdd)
-       }
- }
-+static int gta01_mmc_use_slow(void)
-+{
-+      return neo1973_pm_gps_is_on();
-+}
-+
- static struct s3c24xx_mci_pdata gta01_mmc_cfg = {
-       .gpio_detect    = GTA01_GPIO_nSD_DETECT,
-       .set_power      = &gta01_mmc_set_power,
-+      .use_slow       = &gta01_mmc_use_slow,
-       .ocr_avail      = MMC_VDD_165_195|MMC_VDD_20_21|
-                         MMC_VDD_21_22|MMC_VDD_22_23|MMC_VDD_23_24|
-                         MMC_VDD_24_25|MMC_VDD_25_26|MMC_VDD_26_27|
-diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
-index 8f88721..87d24b2 100644
---- a/drivers/mmc/host/s3cmci.c
-+++ b/drivers/mmc/host/s3cmci.c
-@@ -59,6 +59,23 @@ module_param(sd_max_clk, int, 0644);
- static int sd_idleclk;         /* disallow idle clock by default */
- module_param(sd_idleclk, int, 0644);
-+/*
-+ * Slow SD clock rate
-+ *
-+ * you can override this on kernel commandline using
-+ *
-+ *  s3cmci.sd_slow_ratio=8
-+ *
-+ * for example.
-+ *
-+ * A platform callback is used to decide effective clock rate.  If not
-+ * defined, then the max is used, if defined and the callback returns
-+ * nonzero, the rate is divided by this factor.
-+ */
-+
-+static int sd_slow_ratio = 8;
-+module_param(sd_slow_ratio, int, 0644);
-+
- /* used to stash real idleclk state in suspend: we force it to run in there */
- static int suspend_sd_idleclk;
-@@ -252,7 +269,7 @@ static inline void do_pio_read(struct s3cmci_host *host)
-       void __iomem *from_ptr;
-       /* write real prescaler to host, it might be set slow to fix */
--      writel(host->prescaler, host->base + S3C2410_SDIPRE);
-+      writel(host->sdipre, host->base + S3C2410_SDIPRE);
-       from_ptr = host->base + host->sdidata;
-@@ -755,7 +772,7 @@ static void finalize_request(struct s3cmci_host *host)
-       cmd->resp[3] = readl(host->base + S3C2410_SDIRSP3);
-       /* reset clock speed, as it could still be set low for */
--      writel(host->prescaler, host->base + S3C2410_SDIPRE);
-+      writel(host->sdipre, host->base + S3C2410_SDIPRE);
-       if (cmd->error)
-               debug_as_failure = 1;
-@@ -1032,6 +1049,7 @@ static void s3cmci_send_request(struct mmc_host *mmc)
-       struct s3cmci_host *host = mmc_priv(mmc);
-       struct mmc_request *mrq = host->mrq;
-       struct mmc_command *cmd = host->cmd_is_stop?mrq->stop:mrq->cmd;
-+      int pre;
-       host->ccnt++;
- #ifdef CONFIG_MMC_DEBUG
-@@ -1073,6 +1091,26 @@ static void s3cmci_send_request(struct mmc_host *mmc)
-       }
-+      /* establish the correct prescaler depending on the sd_slow_ratio */
-+
-+      if ((sd_slow_ratio > 1) &&
-+          host->pdata->use_slow && (host->pdata->use_slow)()) {
-+              /* compute the slower speed */
-+              pre = host->prescaler * sd_slow_ratio;
-+              if (pre > 255)
-+                      pre = 255;
-+      } else {
-+              /* use the normal speed */
-+              pre = host->prescaler;
-+      }
-+
-+      if (host->sdipre != pre) {
-+              dbg(host, dbg_conf, "prescaler changed: %d -> %d\n",
-+                  (int)host->sdipre, pre);
-+              host->sdipre = pre;
-+              writel(host->sdipre, host->base + S3C2410_SDIPRE);
-+      }
-+
-       __s3cmci_enable_clock(host);
-       s3cmci_send_command(host, cmd);
-       enable_irq(host->irq);
-@@ -1138,6 +1176,7 @@ static void s3cmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-       if (mci_psc > 255)
-               mci_psc = 255;
-       host->prescaler = mci_psc;
-+      host->sdipre = mci_psc;
-       writel(host->prescaler, host->base + S3C2410_SDIPRE);
-diff --git a/drivers/mmc/host/s3cmci.h b/drivers/mmc/host/s3cmci.h
-index 9644b45..11974ff 100644
---- a/drivers/mmc/host/s3cmci.h
-+++ b/drivers/mmc/host/s3cmci.h
-@@ -32,6 +32,7 @@ struct s3cmci_host {
-       unsigned long           clk_div;
-       unsigned long           real_rate;
-       u8                      prescaler;
-+      u8                      sdipre;
-       int                     is2440;
-       unsigned                sdiimsk;
-diff --git a/include/asm-arm/arch-s3c2410/mci.h b/include/asm-arm/arch-s3c2410/mci.h
-index 24e6cd1..f087229 100644
---- a/include/asm-arm/arch-s3c2410/mci.h
-+++ b/include/asm-arm/arch-s3c2410/mci.h
-@@ -8,6 +8,7 @@ struct s3c24xx_mci_pdata {
-       unsigned int    do_dma;
-       void            (*set_power)(unsigned char power_mode,
-                                    unsigned short vdd);
-+      int             (*use_slow)(void);
- };
- #endif /* _ARCH_NCI_H */
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1324-gta01-battery-driver.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1324-gta01-battery-driver.patch.patch
deleted file mode 100644 (file)
index c98373c..0000000
+++ /dev/null
@@ -1,326 +0,0 @@
-From 8aefbe43a7864e611dca9821daec3e10009e7171 Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Thu, 13 Nov 2008 20:50:55 +0000
-Subject: [PATCH] gta01-battery-driver.patch
-
-Adds a simple pass-through battery driver module for the GTA01.
-This will simplify user-space by providing the same sysfs API
-on both GTA01 and GTA02, and is a first step towards eliminating
-the need for APM emulation.
-
-Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- arch/arm/configs/gta02-moredrivers-defconfig |    1 +
- defconfig-gta01                              |    1 +
- defconfig-gta02                              |    1 +
- drivers/i2c/chips/pcf50606.c                 |   96 +++++++++++++++++++++++++
- drivers/power/Kconfig                        |    6 ++
- drivers/power/Makefile                       |    1 +
- drivers/power/gta01_battery.c                |   97 ++++++++++++++++++++++++++
- 7 files changed, 203 insertions(+), 0 deletions(-)
- create mode 100644 drivers/power/gta01_battery.c
-
-diff --git a/arch/arm/configs/gta02-moredrivers-defconfig b/arch/arm/configs/gta02-moredrivers-defconfig
-index 113eaec..5e1547e 100644
---- a/arch/arm/configs/gta02-moredrivers-defconfig
-+++ b/arch/arm/configs/gta02-moredrivers-defconfig
-@@ -1060,6 +1060,7 @@ CONFIG_POWER_SUPPLY_DEBUG=y
- CONFIG_PDA_POWER=y
- CONFIG_APM_POWER=y
- # CONFIG_BATTERY_DS2760 is not set
-+# CONFIG_BATTERY_GTA01 is not set
- CONFIG_BATTERY_BQ27000_HDQ=y
- CONFIG_GTA02_HDQ=y
- CONFIG_HWMON=y
-diff --git a/defconfig-gta01 b/defconfig-gta01
-index cecb57f..e2e4330 100644
---- a/defconfig-gta01
-+++ b/defconfig-gta01
-@@ -1021,6 +1021,7 @@ CONFIG_POWER_SUPPLY=y
- # CONFIG_PDA_POWER is not set
- # CONFIG_APM_POWER is not set
- # CONFIG_BATTERY_DS2760 is not set
-+CONFIG_BATTERY_GTA01=y
- CONFIG_BATTERY_BQ27000_HDQ=y
- CONFIG_GTA02_HDQ=y
- # CONFIG_HWMON is not set
-diff --git a/defconfig-gta02 b/defconfig-gta02
-index 619f7f2..2a6e398 100644
---- a/defconfig-gta02
-+++ b/defconfig-gta02
-@@ -1021,6 +1021,7 @@ CONFIG_POWER_SUPPLY=y
- # CONFIG_PDA_POWER is not set
- CONFIG_APM_POWER=y
- # CONFIG_BATTERY_DS2760 is not set
-+# CONFIG_BATTERY_GTA01 is not set
- CONFIG_BATTERY_BQ27000_HDQ=y
- CONFIG_GTA02_HDQ=y
- # CONFIG_HWMON is not set
-diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
-index 706ce6d..f585013 100644
---- a/drivers/i2c/chips/pcf50606.c
-+++ b/drivers/i2c/chips/pcf50606.c
-@@ -50,6 +50,7 @@
- #include <linux/platform_device.h>
- #include <linux/pcf50606.h>
- #include <linux/apm-emulation.h>
-+#include <linux/power_supply.h>
- #include <asm/mach-types.h>
- #include <asm/arch/gta01.h>
-@@ -141,6 +142,12 @@ struct pcf50606_data {
- static struct i2c_driver pcf50606_driver;
-+/* This global is set by the pcf50606 driver to the correct callback
-+ * for the gta01 battery driver. */
-+int (*pmu_bat_get_property)(struct power_supply *, enum power_supply_property,
-+                          union power_supply_propval *);
-+EXPORT_SYMBOL(pmu_bat_get_property);
-+
- /* This is an ugly construct on how to access the (currently single/global)
-  * pcf50606 handle from other code in the kernel.  I didn't really come up with
-  * a more decent method of dynamically resolving this */
-@@ -1270,6 +1277,92 @@ static void pcf50606_get_power_status(struct apm_power_info *info)
- }
- /***********************************************************************
-+ * Battery driver interface
-+ ***********************************************************************/
-+static int pcf50606_bat_get_property(struct power_supply *psy,
-+                                   enum power_supply_property psp,
-+                                   union power_supply_propval *val)
-+{
-+      u_int16_t adc, adc_adcin1;
-+      u_int8_t mbcc1, chgmod;
-+      struct pcf50606_data *pcf = pcf50606_global;
-+      int ret = 0;
-+
-+      switch (psp) {
-+
-+      case POWER_SUPPLY_PROP_STATUS:
-+              if (!(reg_read(pcf, PCF50606_REG_OOCS) & PCF50606_OOCS_EXTON)) {
-+                      /* No charger, clearly we're discharging then */
-+                      val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
-+              } else {
-+
-+                      /* We have a charger present, get charge mode */
-+                      mbcc1 = reg_read(pcf, PCF50606_REG_MBCC1);
-+                      chgmod = (mbcc1 & PCF50606_MBCC1_CHGMOD_MASK);
-+                      switch (chgmod) {
-+
-+                      /* TODO: How to determine POWER_SUPPLY_STATUS_FULL? */
-+
-+                      case PCF50606_MBCC1_CHGMOD_QUAL:
-+                      case PCF50606_MBCC1_CHGMOD_PRE:
-+                      case PCF50606_MBCC1_CHGMOD_IDLE:
-+                              val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
-+                              break;
-+
-+                      case PCF50606_MBCC1_CHGMOD_TRICKLE:
-+                      case PCF50606_MBCC1_CHGMOD_FAST_CCCV:
-+                      case PCF50606_MBCC1_CHGMOD_FAST_NOCC:
-+                      case PCF50606_MBCC1_CHGMOD_FAST_NOCV:
-+                      case PCF50606_MBCC1_CHGMOD_FAST_SW:
-+                              val->intval = POWER_SUPPLY_STATUS_CHARGING;
-+                              break;
-+
-+                      default:
-+                              val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
-+                              break;
-+
-+                      }
-+              }
-+
-+      case POWER_SUPPLY_PROP_PRESENT:
-+              val->intval = 1;   /* Must be, or the magic smoke comes out */
-+              break;
-+
-+      case POWER_SUPPLY_PROP_ONLINE:
-+              val->intval = !!(reg_read(pcf, PCF50606_REG_OOCS) &
-+                               PCF50606_OOCS_EXTON);
-+              break;
-+
-+      case POWER_SUPPLY_PROP_VOLTAGE_NOW:
-+              adc = adc_read(pcf, PCF50606_ADCMUX_BATVOLT_RES, NULL);
-+              /* (adc * 6000000) / 1024 ==  (adc * 46875) / 8 */
-+              val->intval = (adc * 46875) / 8;
-+              break;
-+
-+      case POWER_SUPPLY_PROP_CURRENT_NOW:
-+              adc = adc_read(pcf, PCF50606_ADCMUX_BATVOLT_ADCIN1,
-+                             &adc_adcin1);
-+              val->intval = adc_to_chg_milliamps(pcf, adc_adcin1, adc) * 1000;
-+              break;
-+
-+      case POWER_SUPPLY_PROP_TEMP:
-+              adc = adc_read(pcf, PCF50606_ADCMUX_BATTEMP, NULL);
-+              val->intval = rntc_to_temp(adc_to_rntc(pcf, adc)) * 10;
-+              break;
-+
-+      case POWER_SUPPLY_PROP_CAPACITY:
-+              val->intval = battvolt_scale(pcf50606_battvolt(pcf));
-+              break;
-+
-+      default:
-+              ret = -EINVAL;
-+              break;
-+      }
-+
-+      return ret;
-+}
-+
-+/***********************************************************************
-  * RTC
-  ***********************************************************************/
-@@ -1900,6 +1993,7 @@ static int pcf50606_detect(struct i2c_adapter *adapter, int address, int kind)
-       }
-       apm_get_power_status = pcf50606_get_power_status;
-+      pmu_bat_get_property = pcf50606_bat_get_property;
- #ifdef CONFIG_MACH_NEO1973_GTA01
-       if (machine_is_neo1973_gta01()) {
-@@ -1962,6 +2056,8 @@ static int pcf50606_detach_client(struct i2c_client *client)
-       struct pcf50606_data *pcf = i2c_get_clientdata(client);
-       apm_get_power_status = NULL;
-+      pmu_bat_get_property = NULL;
-+
-       input_unregister_device(pcf->input_dev);
-       if (pcf->pdata->used_features & PCF50606_FEAT_PWM_BL)
-diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
-index 8c50ecb..470e08c 100644
---- a/drivers/power/Kconfig
-+++ b/drivers/power/Kconfig
-@@ -62,5 +62,11 @@ config GTA02_HDQ
-         on the Neo Freerunner.  You probably want to select
-         at least BATTERY_BQ27000_HDQ as well
-+config BATTERY_GTA01
-+      tristate "Neo GTA01 battery"
-+      depends on MACH_NEO1973_GTA01
-+      help
-+        Say Y to enable support for the battery on the Neo GTA01
-+
- endif # POWER_SUPPLY
-diff --git a/drivers/power/Makefile b/drivers/power/Makefile
-index d7e87ad..2013e89 100644
---- a/drivers/power/Makefile
-+++ b/drivers/power/Makefile
-@@ -21,5 +21,6 @@ obj-$(CONFIG_BATTERY_DS2760) += ds2760_battery.o
- obj-$(CONFIG_BATTERY_PMU)     += pmu_battery.o
- obj-$(CONFIG_BATTERY_OLPC)    += olpc_battery.o
- obj-$(CONFIG_BATTERY_BQ27000_HDQ)     += bq27000_battery.o
-+obj-$(CONFIG_BATTERY_GTA01)   += gta01_battery.o
- obj-$(CONFIG_GTA02_HDQ)               += gta02_hdq.o
-diff --git a/drivers/power/gta01_battery.c b/drivers/power/gta01_battery.c
-new file mode 100644
-index 0000000..5acb45c
---- /dev/null
-+++ b/drivers/power/gta01_battery.c
-@@ -0,0 +1,97 @@
-+/*
-+ * Battery driver for the Openmoko GTA01 device, using the pcf50606 chip.
-+ *
-+ * This is nothing more than a write-thru interface to the real logic,
-+ * which is part of the pcf50606.c multifunction chip driver.
-+ *    Copyright Â© 2008  Mike Westerhof <mwester@dls.net>
-+ *
-+ *
-+ * Portions liberally borrowed from olpc_battery.c, copyright below:
-+ *    Copyright Â© 2006  David Woodhouse <dwmw2@infradead.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.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/err.h>
-+#include <linux/platform_device.h>
-+#include <linux/power_supply.h>
-+#include <linux/jiffies.h>
-+#include <linux/sched.h>
-+
-+/*********************************************************************
-+ * This global is set by the pcf50606 driver to the correct callback
-+ *********************************************************************/
-+
-+extern int (*pmu_bat_get_property)(struct power_supply *,
-+                                 enum power_supply_property,
-+                                 union power_supply_propval *);
-+
-+
-+/*********************************************************************
-+ *            Battery properties
-+ *********************************************************************/
-+static int gta01_bat_get_property(struct power_supply *psy,
-+                                enum power_supply_property psp,
-+                                union power_supply_propval *val)
-+{
-+      if (pmu_bat_get_property)
-+              return (pmu_bat_get_property)(psy, psp, val);
-+      else
-+              return -ENODEV;
-+}
-+
-+static enum power_supply_property gta01_bat_props[] = {
-+      POWER_SUPPLY_PROP_STATUS,
-+      POWER_SUPPLY_PROP_PRESENT,
-+      POWER_SUPPLY_PROP_ONLINE,
-+      POWER_SUPPLY_PROP_VOLTAGE_NOW,
-+      POWER_SUPPLY_PROP_CURRENT_NOW,
-+      POWER_SUPPLY_PROP_TEMP,
-+      POWER_SUPPLY_PROP_CAPACITY,
-+};
-+
-+/*********************************************************************
-+ *            Initialisation
-+ *********************************************************************/
-+
-+static struct platform_device *bat_pdev;
-+
-+static struct power_supply gta01_bat = {
-+      .properties = gta01_bat_props,
-+      .num_properties = ARRAY_SIZE(gta01_bat_props),
-+      .get_property = gta01_bat_get_property,
-+      .use_for_apm = 0,  /* pcf50606 driver has its own apm driver */
-+};
-+
-+static int __init gta01_bat_init(void)
-+{
-+      int ret;
-+
-+      bat_pdev = platform_device_register_simple("gta01-battery", 0, NULL, 0);
-+      if (IS_ERR(bat_pdev))
-+              return PTR_ERR(bat_pdev);
-+
-+      gta01_bat.name = bat_pdev->name;
-+
-+      ret = power_supply_register(&bat_pdev->dev, &gta01_bat);
-+      if (ret)
-+              platform_device_unregister(bat_pdev);
-+
-+      return ret;
-+}
-+
-+static void __exit gta01_bat_exit(void)
-+{
-+      power_supply_unregister(&gta01_bat);
-+      platform_device_unregister(bat_pdev);
-+}
-+
-+module_init(gta01_bat_init);
-+module_exit(gta01_bat_exit);
-+
-+MODULE_AUTHOR("Mike Westerhof <mwester@dls.net>");
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("Battery driver for GTA01");
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1325-fix-missing-new-files-glofiish.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1325-fix-missing-new-files-glofiish.patch.patch
deleted file mode 100644 (file)
index bcf912a..0000000
+++ /dev/null
@@ -1,2764 +0,0 @@
-From 3f12f6b0b863453038bc4b7435b5bab06be30f45 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Tue, 18 Nov 2008 12:11:13 +0000
-Subject: [PATCH] fix-missing-new-files-glofiish.patch
-
-Add in uncommitted local files after Harald's patch
-
-Reported-by: Stefan Schmidt <stefan@openmoko.org>
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/configs/glofiish_defconfig     | 1728 +++++++++++++++++++++++++++++++
- arch/arm/mach-s3c2440/mach-glofiish.c   |  620 +++++++++++
- drivers/input/keyboard/m800kbd.c        |  330 ++++++
- include/asm-arm/arch-s3c2410/glofiish.h |   39 +
- 4 files changed, 2717 insertions(+), 0 deletions(-)
- create mode 100644 arch/arm/configs/glofiish_defconfig
- create mode 100644 arch/arm/mach-s3c2440/mach-glofiish.c
- create mode 100644 drivers/input/keyboard/m800kbd.c
- create mode 100644 include/asm-arm/arch-s3c2410/glofiish.h
-
-diff --git a/arch/arm/configs/glofiish_defconfig b/arch/arm/configs/glofiish_defconfig
-new file mode 100644
-index 0000000..808d61f
---- /dev/null
-+++ b/arch/arm/configs/glofiish_defconfig
-@@ -0,0 +1,1728 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.24
-+# Wed Nov 12 00:27:24 2008
-+#
-+CONFIG_ARM=y
-+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-+CONFIG_GENERIC_GPIO=y
-+# CONFIG_GENERIC_TIME is not set
-+# CONFIG_GENERIC_CLOCKEVENTS is not set
-+CONFIG_MMU=y
-+CONFIG_NO_IOPORT=y
-+CONFIG_GENERIC_HARDIRQS=y
-+CONFIG_STACKTRACE_SUPPORT=y
-+CONFIG_LOCKDEP_SUPPORT=y
-+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-+CONFIG_HARDIRQS_SW_RESEND=y
-+CONFIG_GENERIC_IRQ_PROBE=y
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_ZONE_DMA=y
-+CONFIG_VECTORS_BASE=0xffff0000
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_LOCK_KERNEL=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION=""
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+# CONFIG_FAIR_GROUP_SCHED is not set
-+# CONFIG_SYSFS_DEPRECATED is not set
-+# CONFIG_RELAY is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+CONFIG_SYSCTL=y
-+# CONFIG_EMBEDDED is not set
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=m
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=m
-+# CONFIG_DEFAULT_AS is not set
-+CONFIG_DEFAULT_DEADLINE=y
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="deadline"
-+
-+#
-+# System Type
-+#
-+# CONFIG_ARCH_AAEC2000 is not set
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_REALVIEW is not set
-+# CONFIG_ARCH_VERSATILE is not set
-+# CONFIG_ARCH_AT91 is not set
-+# CONFIG_ARCH_CLPS7500 is not set
-+# CONFIG_ARCH_CLPS711X is not set
-+# CONFIG_ARCH_CO285 is not set
-+# CONFIG_ARCH_EBSA110 is not set
-+# CONFIG_ARCH_EP93XX is not set
-+# CONFIG_ARCH_FOOTBRIDGE is not set
-+# CONFIG_ARCH_NETX is not set
-+# CONFIG_ARCH_H720X is not set
-+# CONFIG_ARCH_IMX is not set
-+# CONFIG_ARCH_IOP13XX is not set
-+# CONFIG_ARCH_IOP32X is not set
-+# CONFIG_ARCH_IOP33X is not set
-+# CONFIG_ARCH_IXP23XX is not set
-+# CONFIG_ARCH_IXP2000 is not set
-+# CONFIG_ARCH_IXP4XX is not set
-+# CONFIG_ARCH_L7200 is not set
-+# CONFIG_ARCH_KS8695 is not set
-+# CONFIG_ARCH_NS9XXX is not set
-+# CONFIG_ARCH_MXC is not set
-+# CONFIG_ARCH_PNX4008 is not set
-+# CONFIG_ARCH_PXA is not set
-+# CONFIG_ARCH_RPC is not set
-+# CONFIG_ARCH_SA1100 is not set
-+CONFIG_ARCH_S3C2410=y
-+# CONFIG_ARCH_SHARK is not set
-+# CONFIG_ARCH_LH7A40X is not set
-+# CONFIG_ARCH_DAVINCI is not set
-+# CONFIG_ARCH_OMAP is not set
-+CONFIG_PLAT_S3C24XX=y
-+CONFIG_CPU_S3C244X=y
-+CONFIG_S3C2410_DMA=y
-+# CONFIG_S3C2410_DMA_DEBUG is not set
-+CONFIG_MACH_SMDK=y
-+CONFIG_PLAT_S3C=y
-+CONFIG_CPU_LLSERIAL_S3C2410=y
-+CONFIG_CPU_LLSERIAL_S3C2440=y
-+
-+#
-+# Boot options
-+#
-+# CONFIG_S3C_BOOT_WATCHDOG is not set
-+# CONFIG_S3C_BOOT_ERROR_RESET is not set
-+
-+#
-+# Power management
-+#
-+# CONFIG_S3C2410_PM_CHECK is not set
-+CONFIG_S3C_LOWLEVEL_UART_PORT=2
-+
-+#
-+# S3C2400 Machines
-+#
-+CONFIG_CPU_S3C2410=y
-+CONFIG_CPU_S3C2410_DMA=y
-+CONFIG_S3C2410_PM=y
-+CONFIG_S3C2410_GPIO=y
-+CONFIG_S3C2410_CLOCK=y
-+CONFIG_S3C2410_PWM=y
-+
-+#
-+# S3C2410 Machines
-+#
-+# CONFIG_ARCH_SMDK2410 is not set
-+# CONFIG_ARCH_H1940 is not set
-+# CONFIG_MACH_N30 is not set
-+# CONFIG_ARCH_BAST is not set
-+# CONFIG_MACH_OTOM is not set
-+# CONFIG_MACH_AML_M5900 is not set
-+# CONFIG_MACH_VR1000 is not set
-+CONFIG_MACH_QT2410=y
-+# CONFIG_MACH_NEO1973_GTA01 is not set
-+
-+#
-+# S3C2412 Machines
-+#
-+# CONFIG_MACH_SMDK2413 is not set
-+# CONFIG_MACH_SMDK2412 is not set
-+# CONFIG_MACH_VSTMS is not set
-+CONFIG_CPU_S3C2440=y
-+CONFIG_S3C2440_DMA=y
-+# CONFIG_S3C2440_C_FIQ is not set
-+
-+#
-+# S3C2440 Machines
-+#
-+# CONFIG_MACH_ANUBIS is not set
-+# CONFIG_MACH_OSIRIS is not set
-+# CONFIG_MACH_RX3715 is not set
-+CONFIG_ARCH_S3C2440=y
-+# CONFIG_MACH_NEXCODER_2440 is not set
-+CONFIG_SMDK2440_CPU2440=y
-+# CONFIG_MACH_HXD8 is not set
-+# CONFIG_MACH_NEO1973_GTA02 is not set
-+CONFIG_MACH_M800=y
-+CONFIG_CPU_S3C2442=y
-+
-+#
-+# S3C2442 Machines
-+#
-+CONFIG_SMDK2440_CPU2442=y
-+
-+#
-+# S3C2443 Machines
-+#
-+# CONFIG_MACH_SMDK2443 is not set
-+
-+#
-+# Processor Type
-+#
-+CONFIG_CPU_32=y
-+CONFIG_CPU_ARM920T=y
-+CONFIG_CPU_32v4T=y
-+CONFIG_CPU_ABRT_EV4T=y
-+CONFIG_CPU_CACHE_V4WT=y
-+CONFIG_CPU_CACHE_VIVT=y
-+CONFIG_CPU_COPY_V4WB=y
-+CONFIG_CPU_TLB_V4WBI=y
-+CONFIG_CPU_CP15=y
-+CONFIG_CPU_CP15_MMU=y
-+
-+#
-+# Processor Features
-+#
-+CONFIG_ARM_THUMB=y
-+# CONFIG_CPU_ICACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-+# CONFIG_OUTER_CACHE is not set
-+
-+#
-+# Bus support
-+#
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Kernel Features
-+#
-+# CONFIG_TICK_ONESHOT is not set
-+CONFIG_PREEMPT=y
-+CONFIG_NO_IDLE_HZ=y
-+CONFIG_HZ=200
-+CONFIG_AEABI=y
-+CONFIG_OABI_COMPAT=y
-+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4096
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_ALIGNMENT_TRAP=y
-+
-+#
-+# Boot options
-+#
-+CONFIG_ZBOOT_ROM_TEXT=0x0
-+CONFIG_ZBOOT_ROM_BSS=0x0
-+CONFIG_CMDLINE="root=/dev/mmcblk0p1 rootdelay=5"
-+# CONFIG_XIP_KERNEL is not set
-+CONFIG_KEXEC=y
-+CONFIG_ATAGS_PROC=y
-+
-+#
-+# Floating point emulation
-+#
-+
-+#
-+# At least one emulation must be selected
-+#
-+CONFIG_FPE_NWFPE=y
-+# CONFIG_FPE_NWFPE_XP is not set
-+# CONFIG_FPE_FASTFPE is not set
-+
-+#
-+# Userspace binary formats
-+#
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+
-+#
-+# Power management options
-+#
-+CONFIG_PM=y
-+CONFIG_PM_LEGACY=y
-+CONFIG_PM_DEBUG=y
-+# CONFIG_PM_VERBOSE is not set
-+CONFIG_PM_SLEEP=y
-+CONFIG_SUSPEND_UP_POSSIBLE=y
-+CONFIG_SUSPEND=y
-+CONFIG_APM_EMULATION=y
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+CONFIG_PACKET_MMAP=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+CONFIG_XFRM_MIGRATE=y
-+CONFIG_NET_KEY=m
-+CONFIG_NET_KEY_MIGRATE=y
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+# CONFIG_IP_ROUTE_MULTIPATH is not set
-+# CONFIG_IP_ROUTE_VERBOSE 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=m
-+CONFIG_NET_IPGRE=m
-+# CONFIG_NET_IPGRE_BROADCAST is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_XFRM_TUNNEL=m
-+CONFIG_INET_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET_XFRM_MODE_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_BEET=m
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+CONFIG_TCP_MD5SIG=y
-+# CONFIG_IP_VS is not set
-+CONFIG_IPV6=m
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_IPCOMP=m
-+# CONFIG_IPV6_MIP6 is not set
-+CONFIG_INET6_XFRM_TUNNEL=m
-+CONFIG_INET6_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET6_XFRM_MODE_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_BEET=m
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_TUNNEL=m
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+CONFIG_NETFILTER=y
-+# CONFIG_NETFILTER_DEBUG is not set
-+
-+#
-+# Core Netfilter Configuration
-+#
-+CONFIG_NETFILTER_NETLINK=m
-+CONFIG_NETFILTER_NETLINK_QUEUE=m
-+CONFIG_NETFILTER_NETLINK_LOG=m
-+CONFIG_NF_CONNTRACK_ENABLED=m
-+CONFIG_NF_CONNTRACK=m
-+CONFIG_NF_CT_ACCT=y
-+CONFIG_NF_CONNTRACK_MARK=y
-+CONFIG_NF_CONNTRACK_EVENTS=y
-+CONFIG_NF_CT_PROTO_GRE=m
-+CONFIG_NF_CT_PROTO_SCTP=m
-+# CONFIG_NF_CT_PROTO_UDPLITE is not set
-+# CONFIG_NF_CONNTRACK_AMANDA is not set
-+CONFIG_NF_CONNTRACK_FTP=m
-+CONFIG_NF_CONNTRACK_H323=m
-+CONFIG_NF_CONNTRACK_IRC=m
-+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-+CONFIG_NF_CONNTRACK_PPTP=m
-+CONFIG_NF_CONNTRACK_SANE=m
-+CONFIG_NF_CONNTRACK_SIP=m
-+CONFIG_NF_CONNTRACK_TFTP=m
-+CONFIG_NF_CT_NETLINK=m
-+CONFIG_NETFILTER_XTABLES=m
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-+CONFIG_NETFILTER_XT_TARGET_DSCP=m
-+CONFIG_NETFILTER_XT_TARGET_MARK=m
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+CONFIG_NETFILTER_XT_MATCH_DCCP=m
-+CONFIG_NETFILTER_XT_MATCH_DSCP=m
-+CONFIG_NETFILTER_XT_MATCH_ESP=m
-+CONFIG_NETFILTER_XT_MATCH_HELPER=m
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_MAC=m
-+CONFIG_NETFILTER_XT_MATCH_MARK=m
-+CONFIG_NETFILTER_XT_MATCH_POLICY=m
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-+CONFIG_NETFILTER_XT_MATCH_REALM=m
-+CONFIG_NETFILTER_XT_MATCH_SCTP=m
-+CONFIG_NETFILTER_XT_MATCH_STATE=m
-+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-+CONFIG_NETFILTER_XT_MATCH_STRING=m
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-+
-+#
-+# IP: Netfilter Configuration
-+#
-+CONFIG_NF_CONNTRACK_IPV4=m
-+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-+# CONFIG_IP_NF_QUEUE is not set
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_MATCH_IPRANGE=m
-+CONFIG_IP_NF_MATCH_TOS=m
-+# CONFIG_IP_NF_MATCH_RECENT is not set
-+CONFIG_IP_NF_MATCH_ECN=m
-+CONFIG_IP_NF_MATCH_AH=m
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_MATCH_OWNER=m
-+CONFIG_IP_NF_MATCH_ADDRTYPE=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_TARGET_LOG=m
-+CONFIG_IP_NF_TARGET_ULOG=m
-+CONFIG_NF_NAT=m
-+CONFIG_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_NF_NAT_SNMP_BASIC=m
-+CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_FTP=m
-+CONFIG_NF_NAT_IRC=m
-+CONFIG_NF_NAT_TFTP=m
-+# CONFIG_NF_NAT_AMANDA is not set
-+CONFIG_NF_NAT_PPTP=m
-+CONFIG_NF_NAT_H323=m
-+CONFIG_NF_NAT_SIP=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_IP_NF_TARGET_TOS=m
-+CONFIG_IP_NF_TARGET_ECN=m
-+CONFIG_IP_NF_TARGET_TTL=m
-+CONFIG_IP_NF_TARGET_CLUSTERIP=m
-+# CONFIG_IP_NF_RAW is not set
-+# CONFIG_IP_NF_ARPTABLES is not set
-+
-+#
-+# IPv6: Netfilter Configuration (EXPERIMENTAL)
-+#
-+CONFIG_NF_CONNTRACK_IPV6=m
-+# CONFIG_IP6_NF_QUEUE is not set
-+CONFIG_IP6_NF_IPTABLES=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_OWNER=m
-+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-+CONFIG_IP6_NF_MATCH_AH=m
-+CONFIG_IP6_NF_MATCH_MH=m
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_LOG=m
-+CONFIG_IP6_NF_TARGET_REJECT=m
-+CONFIG_IP6_NF_MANGLE=m
-+CONFIG_IP6_NF_TARGET_HL=m
-+# CONFIG_IP6_NF_RAW is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+CONFIG_NET_SCHED=y
-+
-+#
-+# Queueing/Scheduling
-+#
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=m
-+CONFIG_NET_SCH_PRIO=m
-+# CONFIG_NET_SCH_RR is not set
-+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_NETEM=m
-+CONFIG_NET_SCH_INGRESS=m
-+
-+#
-+# Classification
-+#
-+CONFIG_NET_CLS=y
-+CONFIG_NET_CLS_BASIC=m
-+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_CLS_U32_PERF=y
-+CONFIG_CLS_U32_MARK=y
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
-+# CONFIG_NET_EMATCH is not set
-+# CONFIG_NET_CLS_ACT is not set
-+# CONFIG_NET_CLS_POLICE is not set
-+# CONFIG_NET_CLS_IND is not set
-+CONFIG_NET_SCH_FIFO=y
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_IRDA 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_HIDP=m
-+
-+#
-+# Bluetooth device drivers
-+#
-+CONFIG_BT_HCIUSB=m
-+CONFIG_BT_HCIUSB_SCO=y
-+# CONFIG_BT_HCIBTSDIO is not set
-+# CONFIG_BT_HCIUART is not set
-+# CONFIG_BT_HCIBCM203X is not set
-+# CONFIG_BT_HCIBPA10X is not set
-+# CONFIG_BT_HCIBFUSB is not set
-+# CONFIG_BT_HCIVHCI is not set
-+# CONFIG_AF_RXRPC is not set
-+CONFIG_FIB_RULES=y
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+CONFIG_WIRELESS_EXT=y
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=m
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=m
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_AFS_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+CONFIG_MTD_CFI_INTELEXT=y
-+# CONFIG_MTD_CFI_AMDSTD is not set
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+CONFIG_MTD_ABSENT=y
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+CONFIG_MTD_PHYSMAP=y
-+CONFIG_MTD_PHYSMAP_START=0x8000000
-+CONFIG_MTD_PHYSMAP_LEN=0
-+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-+# CONFIG_MTD_ARM_INTEGRATOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+CONFIG_MTD_NAND=y
-+CONFIG_MTD_NAND_VERIFY_WRITE=y
-+# CONFIG_MTD_NAND_ECC_SMC is not set
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+CONFIG_MTD_NAND_IDS=y
-+CONFIG_MTD_NAND_S3C2410=y
-+# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
-+CONFIG_MTD_NAND_S3C2410_HWECC=y
-+# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ALAUDA is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=m
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_UB=m
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=4096
-+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_IDE is not set
-+
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=m
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=m
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+CONFIG_BLK_DEV_SR=m
-+# CONFIG_BLK_DEV_SR_VENDOR is not set
-+CONFIG_CHR_DEV_SG=m
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+CONFIG_SCSI_SCAN_ASYNC=y
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_ATA is not set
-+# CONFIG_MD is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+CONFIG_TUN=m
-+# CONFIG_VETH is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_AX88796 is not set
-+# CONFIG_SMC91X is not set
-+# CONFIG_DM9000 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_B44 is not set
-+CONFIG_CS89x0=m
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+CONFIG_USB_CATC=m
-+CONFIG_USB_KAWETH=m
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+CONFIG_USB_USBNET=y
-+CONFIG_USB_NET_AX8817X=m
-+CONFIG_USB_NET_CDCETHER=m
-+CONFIG_USB_NET_DM9601=m
-+CONFIG_USB_NET_GL620A=m
-+CONFIG_USB_NET_NET1080=m
-+CONFIG_USB_NET_PLUSB=m
-+CONFIG_USB_NET_MCS7830=m
-+CONFIG_USB_NET_RNDIS_HOST=m
-+CONFIG_USB_NET_CDC_SUBSET=m
-+CONFIG_USB_ALI_M5632=y
-+CONFIG_USB_AN2720=y
-+CONFIG_USB_BELKIN=y
-+CONFIG_USB_ARMLINUX=y
-+CONFIG_USB_EPSON2888=y
-+CONFIG_USB_KC2190=y
-+CONFIG_USB_NET_ZAURUS=m
-+# CONFIG_WAN is not set
-+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=m
-+CONFIG_PPP_MPPE=m
-+# CONFIG_PPPOE is not set
-+# CONFIG_PPPOL2TP is not set
-+# CONFIG_SLIP is not set
-+CONFIG_SLHC=m
-+# CONFIG_SHAPER is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
-+# CONFIG_INPUT_JOYDEV is not set
-+CONFIG_INPUT_EVDEV=y
-+# CONFIG_INPUT_EVBUG is not set
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+# CONFIG_KEYBOARD_ATKBD is not set
-+# 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_KEYBOARD_STOWAWAY=m
-+CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_M800=y
-+CONFIG_KEYBOARD_QT2410=y
-+CONFIG_INPUT_MOUSE=y
-+# CONFIG_MOUSE_PS2 is not set
-+# CONFIG_MOUSE_SERIAL is not set
-+# CONFIG_MOUSE_APPLETOUCH is not set
-+# CONFIG_MOUSE_VSXXXAA is not set
-+# CONFIG_MOUSE_GPIO is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+CONFIG_INPUT_TOUCHSCREEN=y
-+# CONFIG_TOUCHSCREEN_ADS7846 is not set
-+# CONFIG_TOUCHSCREEN_FUJITSU is not set
-+CONFIG_TOUCHSCREEN_S3C2410=y
-+# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
-+# CONFIG_TOUCHSCREEN_GUNZE is not set
-+# CONFIG_TOUCHSCREEN_ELO is not set
-+# CONFIG_TOUCHSCREEN_MTOUCH is not set
-+# CONFIG_TOUCHSCREEN_MK712 is not set
-+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-+# CONFIG_TOUCHSCREEN_UCB1400 is not set
-+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-+CONFIG_INPUT_MISC=y
-+# CONFIG_INPUT_ATI_REMOTE is not set
-+# CONFIG_INPUT_ATI_REMOTE2 is not set
-+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-+# CONFIG_INPUT_POWERMATE is not set
-+# CONFIG_INPUT_YEALINK is not set
-+CONFIG_INPUT_UINPUT=m
-+CONFIG_INPUT_LIS302DL=y
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+# CONFIG_SERIO_SERPORT is not set
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_NR_TTY_DEVICES=4
-+CONFIG_HW_CONSOLE=y
-+CONFIG_VT_HW_CONSOLE_BINDING=y
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_SERIAL_S3C2410=y
-+CONFIG_SERIAL_S3C2410_CONSOLE=y
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_LEGACY_PTYS is not set
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_GPIO is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+CONFIG_I2C_S3C2410=y
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_TINY_USB is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_SENSORS_DS1337 is not set
-+# CONFIG_SENSORS_DS1374 is not set
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+CONFIG_SENSORS_PCF50606=y
-+CONFIG_SENSORS_PCF50633=y
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_SENSORS_PCA9539 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+CONFIG_SENSORS_TSL256X=m
-+# CONFIG_PCA9632 is not set
-+# 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
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+# CONFIG_SPI_DEBUG is not set
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+CONFIG_SPI_S3C24XX=y
-+CONFIG_SPI_S3C24XX_GPIO=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_W1 is not set
-+CONFIG_POWER_SUPPLY=y
-+# CONFIG_POWER_SUPPLY_DEBUG is not set
-+# CONFIG_PDA_POWER is not set
-+CONFIG_APM_POWER=y
-+# CONFIG_BATTERY_DS2760 is not set
-+CONFIG_BATTERY_BQ27000_HDQ=y
-+# CONFIG_HWMON is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_S3C2410_WATCHDOG=m
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+# CONFIG_MFD_GLAMO is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+# CONFIG_DAB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-+CONFIG_FB=y
-+# CONFIG_FIRMWARE_EDID is not set
-+# CONFIG_FB_DDC is not set
-+CONFIG_FB_CFB_FILLRECT=y
-+CONFIG_FB_CFB_COPYAREA=y
-+CONFIG_FB_CFB_IMAGEBLIT=y
-+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-+# CONFIG_FB_SYS_FILLRECT is not set
-+# CONFIG_FB_SYS_COPYAREA is not set
-+# CONFIG_FB_SYS_IMAGEBLIT is not set
-+# CONFIG_FB_SYS_FOPS is not set
-+CONFIG_FB_DEFERRED_IO=y
-+# CONFIG_FB_SVGALIB is not set
-+# CONFIG_FB_MACMODES is not set
-+# CONFIG_FB_BACKLIGHT is not set
-+# CONFIG_FB_MODE_HELPERS is not set
-+# CONFIG_FB_TILEBLITTING is not set
-+
-+#
-+# Frame buffer hardware drivers
-+#
-+# CONFIG_FB_UVESA is not set
-+# CONFIG_FB_S1D13XXX is not set
-+CONFIG_FB_S3C2410=y
-+# CONFIG_FB_S3C2410_DEBUG is not set
-+# CONFIG_FB_VIRTUAL is not set
-+CONFIG_BACKLIGHT_LCD_SUPPORT=y
-+CONFIG_LCD_CLASS_DEVICE=y
-+# CONFIG_LCD_LTV350QV is not set
-+CONFIG_BACKLIGHT_CLASS_DEVICE=y
-+# CONFIG_BACKLIGHT_CORGI is not set
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+CONFIG_DISPLAY_JBT6K74=y
-+
-+#
-+# Console display driver support
-+#
-+# CONFIG_VGA_CONSOLE is not set
-+CONFIG_DUMMY_CONSOLE=y
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-+CONFIG_FONTS=y
-+# CONFIG_FONT_8x8 is not set
-+# CONFIG_FONT_8x16 is not set
-+CONFIG_FONT_6x11=y
-+# CONFIG_FONT_7x14 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
-+# CONFIG_FONT_10x18 is not set
-+# CONFIG_LOGO is not set
-+
-+#
-+# Sound
-+#
-+CONFIG_SOUND=y
-+
-+#
-+# Advanced Linux Sound Architecture
-+#
-+CONFIG_SND=m
-+CONFIG_SND_TIMER=m
-+CONFIG_SND_PCM=m
-+CONFIG_SND_RAWMIDI=m
-+# CONFIG_SND_SEQUENCER is not set
-+CONFIG_SND_OSSEMUL=y
-+CONFIG_SND_MIXER_OSS=m
-+CONFIG_SND_PCM_OSS=m
-+CONFIG_SND_PCM_OSS_PLUGINS=y
-+# CONFIG_SND_DYNAMIC_MINORS is not set
-+CONFIG_SND_SUPPORT_OLD_API=y
-+CONFIG_SND_VERBOSE_PROCFS=y
-+# 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
-+
-+#
-+# ALSA ARM devices
-+#
-+
-+#
-+# SPI devices
-+#
-+
-+#
-+# USB devices
-+#
-+# CONFIG_SND_USB_AUDIO is not set
-+# CONFIG_SND_USB_CAIAQ is not set
-+
-+#
-+# System on Chip audio support
-+#
-+CONFIG_SND_SOC=m
-+CONFIG_SND_S3C24XX_SOC=m
-+
-+#
-+# SoC Audio support for SuperH
-+#
-+
-+#
-+# Open Sound System
-+#
-+# CONFIG_SOUND_PRIME is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=y
-+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-+# CONFIG_HID_FF is not set
-+CONFIG_USB_HIDDEV=y
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+CONFIG_USB_SUSPEND=y
-+# CONFIG_USB_PERSIST is not set
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=m
-+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+CONFIG_USB_ACM=m
-+CONFIG_USB_PRINTER=m
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+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 is not set
-+CONFIG_USB_STORAGE_DPCM=y
-+CONFIG_USB_STORAGE_USBAT=y
-+CONFIG_USB_STORAGE_SDDR09=y
-+CONFIG_USB_STORAGE_SDDR55=y
-+CONFIG_USB_STORAGE_JUMPSHOT=y
-+CONFIG_USB_STORAGE_ALAUDA=y
-+CONFIG_USB_STORAGE_KARMA=y
-+CONFIG_USB_LIBUSUAL=y
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+
-+#
-+# USB Serial Converter support
-+#
-+CONFIG_USB_SERIAL=m
-+CONFIG_USB_SERIAL_GENERIC=y
-+CONFIG_USB_SERIAL_AIRCABLE=m
-+CONFIG_USB_SERIAL_AIRPRIME=m
-+CONFIG_USB_SERIAL_ARK3116=m
-+CONFIG_USB_SERIAL_BELKIN=m
-+# CONFIG_USB_SERIAL_CH341 is not set
-+CONFIG_USB_SERIAL_WHITEHEAT=m
-+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-+CONFIG_USB_SERIAL_CP2101=m
-+CONFIG_USB_SERIAL_CYPRESS_M8=m
-+CONFIG_USB_SERIAL_EMPEG=m
-+CONFIG_USB_SERIAL_FTDI_SIO=m
-+CONFIG_USB_SERIAL_FUNSOFT=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_GARMIN=m
-+CONFIG_USB_SERIAL_IPW=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_MOS7720=m
-+CONFIG_USB_SERIAL_MOS7840=m
-+CONFIG_USB_SERIAL_NAVMAN=m
-+CONFIG_USB_SERIAL_PL2303=m
-+# CONFIG_USB_SERIAL_OTI6858 is not set
-+CONFIG_USB_SERIAL_HP4X=m
-+CONFIG_USB_SERIAL_SAFE=m
-+CONFIG_USB_SERIAL_SAFE_PADDED=y
-+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-+CONFIG_USB_SERIAL_TI=m
-+CONFIG_USB_SERIAL_CYBERJACK=m
-+CONFIG_USB_SERIAL_XIRCOM=m
-+CONFIG_USB_SERIAL_OPTION=m
-+CONFIG_USB_SERIAL_OMNINET=m
-+# CONFIG_USB_SERIAL_DEBUG is not set
-+CONFIG_USB_EZUSB=y
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+# CONFIG_USB_BERRY_CHARGE is not set
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_LD is not set
-+# CONFIG_USB_TRANCEVIBRATOR is not set
-+# CONFIG_USB_IOWARRIOR is not set
-+# CONFIG_USB_TEST is not set
-+
-+#
-+# USB DSL modem support
-+#
-+
-+#
-+# USB Gadget Support
-+#
-+CONFIG_USB_GADGET=y
-+# CONFIG_USB_GADGET_DEBUG is not set
-+# CONFIG_USB_GADGET_DEBUG_FILES is not set
-+CONFIG_USB_GADGET_SELECTED=y
-+# CONFIG_USB_GADGET_AMD5536UDC is not set
-+# CONFIG_USB_GADGET_ATMEL_USBA is not set
-+# CONFIG_USB_GADGET_FSL_USB2 is not set
-+# CONFIG_USB_GADGET_NET2280 is not set
-+# CONFIG_USB_GADGET_PXA2XX is not set
-+# CONFIG_USB_GADGET_M66592 is not set
-+# CONFIG_USB_GADGET_GOKU is not set
-+# CONFIG_USB_GADGET_LH7A40X is not set
-+# CONFIG_USB_GADGET_OMAP is not set
-+CONFIG_USB_GADGET_S3C2410=y
-+CONFIG_USB_S3C2410=y
-+# CONFIG_USB_S3C2410_DEBUG is not set
-+# CONFIG_USB_GADGET_AT91 is not set
-+# CONFIG_USB_GADGET_DUMMY_HCD is not set
-+# CONFIG_USB_GADGET_DUALSPEED is not set
-+# CONFIG_USB_ZERO is not set
-+CONFIG_USB_ETH=y
-+CONFIG_USB_ETH_RNDIS=y
-+# CONFIG_USB_GADGETFS is not set
-+# CONFIG_USB_FILE_STORAGE is not set
-+# CONFIG_USB_G_SERIAL is not set
-+CONFIG_USB_MIDI_GADGET=m
-+
-+#
-+# SDIO support
-+#
-+# CONFIG_SDIO is not set
-+CONFIG_MMC=y
-+# CONFIG_MMC_DEBUG is not set
-+CONFIG_MMC_UNSAFE_RESUME=y
-+
-+#
-+# MMC/SD Card Drivers
-+#
-+CONFIG_MMC_BLOCK=y
-+CONFIG_MMC_BLOCK_BOUNCE=y
-+CONFIG_SDIO_UART=m
-+
-+#
-+# MMC/SD Host Controller Drivers
-+#
-+# CONFIG_MMC_SPI is not set
-+CONFIG_MMC_S3C=y
-+CONFIG_NEW_LEDS=y
-+CONFIG_LEDS_CLASS=y
-+
-+#
-+# LED drivers
-+#
-+CONFIG_LEDS_S3C24XX=m
-+# CONFIG_LEDS_GPIO is not set
-+
-+#
-+# LED Triggers
-+#
-+CONFIG_LEDS_TRIGGERS=y
-+CONFIG_LEDS_TRIGGER_TIMER=y
-+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+CONFIG_RTC_DEBUG=y
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+CONFIG_RTC_DRV_S3C=m
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+# CONFIG_EXT3_FS_XATTR is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+CONFIG_FS_POSIX_ACL=y
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+# CONFIG_MINIX_FS is not set
-+CONFIG_ROMFS_FS=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+CONFIG_DNOTIFY=y
-+# CONFIG_AUTOFS_FS is not set
-+CONFIG_AUTOFS4_FS=m
-+CONFIG_FUSE_FS=m
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+CONFIG_ISO9660_FS=m
-+CONFIG_JOLIET=y
-+# CONFIG_ZISOFS is not set
-+CONFIG_UDF_FS=m
-+CONFIG_UDF_NLS=y
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=y
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+CONFIG_CONFIGFS_FS=m
-+
-+#
-+# 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_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+CONFIG_JFFS2_SUMMARY=y
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# 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
-+CONFIG_NETWORK_FILESYSTEMS=y
-+CONFIG_NFS_FS=y
-+CONFIG_NFS_V3=y
-+# CONFIG_NFS_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_DIRECTIO is not set
-+CONFIG_NFSD=m
-+CONFIG_NFSD_V3=y
-+# CONFIG_NFSD_V3_ACL is not set
-+CONFIG_NFSD_V4=y
-+CONFIG_NFSD_TCP=y
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_EXPORTFS=m
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+CONFIG_CIFS=m
-+# CONFIG_CIFS_STATS is not set
-+CONFIG_CIFS_WEAK_PW_HASH=y
-+# CONFIG_CIFS_XATTR is not set
-+# CONFIG_CIFS_DEBUG2 is not set
-+# CONFIG_CIFS_EXPERIMENTAL 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
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=y
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+CONFIG_NLS_CODEPAGE_850=m
-+# 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=m
-+CONFIG_NLS_CODEPAGE_950=m
-+# 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=y
-+# 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=m
-+# CONFIG_DLM is not set
-+CONFIG_INSTRUMENTATION=y
-+CONFIG_PROFILING=y
-+CONFIG_OPROFILE=m
-+# CONFIG_MARKERS is not set
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+# CONFIG_SCHED_DEBUG is not set
-+# CONFIG_SCHEDSTATS is not set
-+CONFIG_TIMER_STATS=y
-+# CONFIG_DEBUG_SLAB is not set
-+CONFIG_DEBUG_PREEMPT=y
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_LOCK_ALLOC is not set
-+# CONFIG_PROVE_LOCKING is not set
-+# CONFIG_LOCK_STAT is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+# CONFIG_DEBUG_SG is not set
-+CONFIG_FRAME_POINTER=y
-+CONFIG_FORCED_INLINING=y
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_USER is not set
-+CONFIG_DEBUG_ERRORS=y
-+# CONFIG_DEBUG_LL is not set
-+CONFIG_DEBUG_S3C_UART=2
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_HMAC=y
-+CONFIG_CRYPTO_XCBC=m
-+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_WP512=m
-+CONFIG_CRYPTO_TGR192=m
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+CONFIG_CRYPTO_LRW=m
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_FCRYPT=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_CAST6=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_KHAZAD=m
-+CONFIG_CRYPTO_ANUBIS=m
-+# CONFIG_CRYPTO_SEED is not set
-+CONFIG_CRYPTO_DEFLATE=m
-+CONFIG_CRYPTO_MICHAEL_MIC=m
-+CONFIG_CRYPTO_CRC32C=m
-+CONFIG_CRYPTO_CAMELLIA=m
-+CONFIG_CRYPTO_TEST=m
-+# CONFIG_CRYPTO_AUTHENC is not set
-+CONFIG_CRYPTO_HW=y
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_CRC_CCITT=m
-+CONFIG_CRC16=m
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+CONFIG_LIBCRC32C=m
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_TEXTSEARCH=y
-+CONFIG_TEXTSEARCH_KMP=m
-+CONFIG_TEXTSEARCH_BM=m
-+CONFIG_TEXTSEARCH_FSM=m
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-diff --git a/arch/arm/mach-s3c2440/mach-glofiish.c b/arch/arm/mach-s3c2440/mach-glofiish.c
-new file mode 100644
-index 0000000..ee97110
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/mach-glofiish.c
-@@ -0,0 +1,620 @@
-+/*
-+ * linux/arch/arm/mach-s3c2440/mach-glofiish.c
-+ *
-+ * S3C2440 Machine Support for the E-TEN glofiish X800/M800
-+ *
-+ * Copyright (C) 2008 by Harald Welte <laforge@gnumonks.org>
-+ * 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
-+ *
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/types.h>
-+#include <linux/interrupt.h>
-+#include <linux/list.h>
-+#include <linux/delay.h>
-+#include <linux/timer.h>
-+#include <linux/init.h>
-+#include <linux/workqueue.h>
-+#include <linux/platform_device.h>
-+#include <linux/serial_core.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/spi_bitbang.h>
-+#include <linux/mmc/host.h>
-+
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/nand.h>
-+#include <linux/mtd/nand_ecc.h>
-+#include <linux/mtd/partitions.h>
-+#include <linux/mtd/physmap.h>
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/map.h>
-+#include <asm/mach/irq.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <asm/mach-types.h>
-+
-+#include <asm/arch-s3c2410/regs-irq.h>
-+#include <asm/arch/regs-gpio.h>
-+#include <asm/arch/regs-gpioj.h>
-+#include <asm/arch/fb.h>
-+#include <asm/arch/mci.h>
-+#include <asm/arch/ts.h>
-+#include <asm/arch/spi.h>
-+#include <asm/arch/spi-gpio.h>
-+#include <asm/arch/usb-control.h>
-+
-+#include <asm/arch/glofiish.h>
-+#include <asm/arch/gta01.h>
-+
-+#include <asm/plat-s3c/regs-serial.h>
-+#include <asm/plat-s3c/nand.h>
-+#include <asm/plat-s3c24xx/devs.h>
-+#include <asm/plat-s3c24xx/cpu.h>
-+#include <asm/plat-s3c24xx/pm.h>
-+#include <asm/plat-s3c24xx/udc.h>
-+
-+#include <linux/jbt6k74.h>
-+
-+/*
-+ * this gets called every 1ms when we paniced.
-+ */
-+
-+static long glofiish_panic_blink(long count)
-+{
-+      long delay = 0;
-+      static long last_blink;
-+      static char led;
-+
-+      if (count - last_blink < 100) /* 200ms period, fast blink */
-+              return 0;
-+
-+      /* FIXME */
-+#if 0
-+      led ^= 1;
-+      s3c2410_gpio_cfgpin(GTA02_GPIO_AUX_LED, S3C2410_GPIO_OUTPUT);
-+      neo1973_gpb_setpin(GTA02_GPIO_AUX_LED, led);
-+
-+      last_blink = count;
-+#endif
-+      return delay;
-+}
-+
-+struct platform_device gta02_version_device = {
-+      .name           = "neo1973-version",
-+      .num_resources  = 0,
-+};
-+
-+struct platform_device gta02_resume_reason_device = {
-+      .name           = "neo1973-resume",
-+      .num_resources  = 0,
-+};
-+
-+struct platform_device gta02_memconfig_device = {
-+      .name           = "neo1973-memconfig",
-+      .num_resources  = 0,
-+};
-+
-+static struct map_desc m800_iodesc[] __initdata = {
-+      {
-+              .virtual        = 0xe0000000,
-+              .pfn            = __phys_to_pfn(S3C2410_CS3+0x01000000),
-+              .length         = SZ_1M,
-+              .type           = MT_DEVICE
-+      },
-+};
-+
-+#define UCON S3C2410_UCON_DEFAULT
-+#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
-+#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
-+
-+static struct s3c2410_uartcfg m800_uartcfgs[] = {
-+      [0] = {
-+              .hwport      = 0,
-+              .flags       = 0,
-+              .ucon        = UCON,
-+              .ulcon       = ULCON,
-+              .ufcon       = UFCON,
-+      },
-+      [1] = {
-+              .hwport      = 1,
-+              .flags       = 0,
-+              .ucon        = UCON,
-+              .ulcon       = ULCON,
-+              .ufcon       = UFCON,
-+      },
-+      [2] = {
-+              .hwport      = 2,
-+              .flags       = 0,
-+              .ucon        = UCON,
-+              .ulcon       = ULCON,
-+              .ufcon       = UFCON,
-+      },
-+
-+};
-+
-+/* Configuration for 480x640 toppoly TD028TTEC1.
-+ * Do not mark this as __initdata or it will break! */
-+static struct s3c2410fb_display glofiish_displays[] =  {
-+      {
-+              .type           = S3C2410_LCDCON1_TFT,
-+              .width          = 43,
-+              .height         = 58,
-+              .xres           = 480,
-+              .yres           = 640,
-+              .bpp            = 16,
-+
-+              .pixclock       = 40000,        /* HCLK/4 */
-+              .left_margin    = 2,
-+              .right_margin   = 2,
-+              .hsync_len      = 2,
-+              .upper_margin   = 2,
-+              .lower_margin   = 66,
-+              .vsync_len      = 2,
-+              .lcdcon5        = S3C2410_LCDCON5_FRM565 |
-+                                S3C2410_LCDCON5_INVVCLK |
-+                                S3C2410_LCDCON5_INVVLINE |
-+                                S3C2410_LCDCON5_INVVFRAME |
-+                                S3C2410_LCDCON5_PWREN |
-+                                S3C2410_LCDCON5_HWSWP,
-+      },
-+      {
-+              .type           = S3C2410_LCDCON1_TFT,
-+              .width          = 43,
-+              .height         = 58,
-+              .xres           = 480,
-+              .yres           = 640,
-+              .bpp            = 32,
-+
-+              .pixclock       = 40000,        /* HCLK/4 */
-+              .left_margin    = 104,
-+              .right_margin   = 8,
-+              .hsync_len      = 8,
-+              .upper_margin   = 2,
-+              .lower_margin   = 16,
-+              .vsync_len      = 2,
-+              .lcdcon5        = S3C2410_LCDCON5_FRM565 |
-+                                S3C2410_LCDCON5_INVVCLK |
-+                                S3C2410_LCDCON5_INVVLINE |
-+                                S3C2410_LCDCON5_INVVFRAME |
-+                                S3C2410_LCDCON5_PWREN |
-+                                S3C2410_LCDCON5_HWSWP,
-+      },
-+      {
-+              .type           = S3C2410_LCDCON1_TFT,
-+              .width          = 43,
-+              .height         = 58,
-+              .xres           = 240,
-+              .yres           = 320,
-+              .bpp            = 16,
-+
-+              .pixclock       = 40000,        /* HCLK/4 */
-+              .left_margin    = 104,
-+              .right_margin   = 8,
-+              .hsync_len      = 8,
-+              .upper_margin   = 2,
-+              .lower_margin   = 16,
-+              .vsync_len      = 2,
-+              .lcdcon5        = S3C2410_LCDCON5_FRM565 |
-+                                S3C2410_LCDCON5_INVVCLK |
-+                                S3C2410_LCDCON5_INVVLINE |
-+                                S3C2410_LCDCON5_INVVFRAME |
-+                                S3C2410_LCDCON5_PWREN |
-+                                S3C2410_LCDCON5_HWSWP,
-+      },
-+};
-+
-+static struct s3c2410fb_mach_info glofiish_lcd_cfg __initdata = {
-+      .displays       = glofiish_displays,
-+      .num_displays   = ARRAY_SIZE(glofiish_displays),
-+      .default_display = 0,
-+
-+      .lpcsel         = ((0xCE6) & ~7) | 1<<4,
-+};
-+
-+
-+static struct resource m800_sdio_resources[] = {
-+      [0] = {
-+              .flags  = IORESOURCE_IRQ,
-+              .start  = IRQ_SDI,
-+              .end    = IRQ_SDI,
-+      },
-+      [1] = {
-+              .flags = IORESOURCE_MEM,
-+              .start = S3C2410_PA_SDI,
-+              .end   = S3C2410_PA_SDI + S3C24XX_SZ_SDI - 1,
-+      },
-+      [2] = {
-+              .flags = IORESOURCE_DMA,
-+              .start = 0, /* Channel 0 for SDI */
-+              .end = 0,
-+      },
-+};
-+
-+static struct platform_device *glofiish_devices[] __initdata = {
-+      &s3c_device_usb,
-+      &s3c_device_lcd,
-+      &s3c_device_wdt,
-+      &s3c_device_i2c,
-+      &s3c_device_iis,
-+      &s3c_device_sdi,
-+      &s3c_device_usbgadget,
-+      &s3c_device_nand,
-+      &s3c_device_ts,
-+};
-+
-+static struct s3c2410_nand_set glofiish_nand_sets[] = {
-+      [0] = {
-+              .name           = "glofiish-nand",
-+              .nr_chips       = 1,
-+              .flags          = S3C2410_NAND_BBT,
-+      },
-+};
-+
-+/* choose a set of timings derived from S3C@2442B MCP54 
-+ * data sheet (K5D2G13ACM-D075 MCP Memory)
-+ */
-+
-+static struct s3c2410_platform_nand glofiish_nand_info = {
-+      .tacls          = 0,
-+      .twrph0         = 25,
-+      .twrph1         = 15,
-+      .nr_sets        = ARRAY_SIZE(glofiish_nand_sets),
-+      .sets           = glofiish_nand_sets,
-+      .software_ecc   = 1,
-+};
-+
-+static struct s3c24xx_mci_pdata glofiish_mmc_cfg = {
-+      .gpio_detect    = M800_GPIO_nSD_DETECT,
-+      .set_power      = NULL,
-+      .ocr_avail      = MMC_VDD_32_33,
-+};
-+
-+static void glofiish_udc_command(enum s3c2410_udc_cmd_e cmd)
-+{
-+      printk(KERN_DEBUG "%s(%d)\n", __func__, cmd);
-+
-+      switch (cmd) {
-+      case S3C2410_UDC_P_ENABLE:
-+              s3c2410_gpio_setpin(M800_GPIO_USB_PULLUP, 1);
-+              break;
-+      case S3C2410_UDC_P_DISABLE:
-+              s3c2410_gpio_setpin(M800_GPIO_USB_PULLUP, 0);
-+              break;
-+      case S3C2410_UDC_P_RESET:
-+              /* FIXME! */
-+              break;
-+      default:
-+              break;
-+      }
-+}
-+
-+/* get PMU to set USB current limit accordingly */
-+
-+static void glofiish_udc_vbus_draw(unsigned int ma)
-+{
-+      //pcf50633_notify_usb_current_limit_change(pcf50633_global, ma);
-+}
-+
-+static struct s3c2410_udc_mach_info glofiish_udc_cfg = {
-+      .vbus_draw      = glofiish_udc_vbus_draw,
-+      .udc_command    = glofiish_udc_command,
-+
-+};
-+
-+static struct s3c2410_ts_mach_info glofiish_ts_cfg = {
-+      .delay = 10000,
-+      .presc = 50000000 / 1000000, /* 50 MHz PCLK / 1MHz */
-+      /* simple averaging, 2^n samples */
-+      .oversampling_shift = 5,
-+       /* averaging filter length, 2^n */
-+      .excursion_filter_len_bits = 5,
-+      /* flagged for beauty contest on next sample if differs from
-+       * average more than this
-+       */
-+      .reject_threshold_vs_avg = 2,
-+};
-+
-+
-+/* SPI: LCM control interface attached to Glamo3362 */
-+
-+static void m800_jbt6k74_reset(int devidx, int level)
-+{
-+      //glamo_lcm_reset(level);
-+      printk(KERN_DEBUG "gta01_jbt6k74_reset\n");
-+}
-+
-+/* finally bring up deferred backlight resume now LCM is resumed itself */
-+
-+static void m800_jbt6k74_resuming(int devidx)
-+{
-+      //pcf50633_backlight_resume(pcf50633_global);
-+      //gta01bl_deferred_resume();
-+}
-+
-+const struct jbt6k74_platform_data jbt6k74_pdata = {
-+      .reset          = m800_jbt6k74_reset,
-+      .resuming       = m800_jbt6k74_resuming,
-+};
-+
-+static struct spi_board_info glofiish_spi_board_info[] = {
-+      {
-+              .modalias       = "jbt6k74",
-+              /* platform_data */
-+              .platform_data  = &jbt6k74_pdata,
-+              /* controller_data */
-+              /* irq */
-+              .max_speed_hz   = 10 * 1000 * 1000,
-+              .bus_num        = 2,
-+              /* chip_select */
-+      },
-+};
-+
-+static void spi_gpio_cs(struct s3c2410_spigpio_info *spi, int csidx, int cs)
-+{
-+      switch (cs) {
-+      case BITBANG_CS_ACTIVE:
-+              s3c2410_gpio_setpin(S3C2410_GPG3, 0);
-+              break;
-+      case BITBANG_CS_INACTIVE:
-+              s3c2410_gpio_setpin(S3C2410_GPG3, 1);
-+              break;
-+      }
-+}
-+
-+static struct s3c2410_spigpio_info spi_gpio_cfg = {
-+      .pin_clk        = S3C2410_GPG7,
-+      .pin_mosi       = S3C2410_GPG6,
-+      .pin_miso       = S3C2410_GPG5,
-+      .board_size     = ARRAY_SIZE(glofiish_spi_board_info),
-+      .board_info     = glofiish_spi_board_info,
-+      .chip_select    = &spi_gpio_cs,
-+      .num_chipselect = 2,   /*** Should be 1 or 2 for gta01? ***/
-+};
-+
-+static struct resource s3c_spi_lcm_resource[] = {
-+      [0] = {
-+              .start = S3C2410_GPG3,
-+              .end   = S3C2410_GPG3,
-+      },
-+      [1] = {
-+              .start = S3C2410_GPG5,
-+              .end   = S3C2410_GPG5,
-+      },
-+      [2] = {
-+              .start = S3C2410_GPG6,
-+              .end   = S3C2410_GPG6,
-+      },
-+      [3] = {
-+              .start = S3C2410_GPG7,
-+              .end   = S3C2410_GPG7,
-+      },
-+};
-+
-+struct platform_device s3c_device_spi_lcm = {
-+      .name             = "spi_s3c24xx_gpio",
-+      .id               = 1,
-+      .num_resources    = ARRAY_SIZE(s3c_spi_lcm_resource),
-+      .resource         = s3c_spi_lcm_resource,
-+      .dev = {
-+              .platform_data = &spi_gpio_cfg,
-+      },
-+};
-+
-+static struct gta01bl_machinfo backlight_machinfo = {
-+      .default_intensity      = 1,
-+      .max_intensity          = 1,
-+      .limit_mask             = 1,
-+      .defer_resume_backlight = 1,
-+};
-+
-+static struct resource gta01_bl_resources[] = {
-+      [0] = {
-+              .start  = M800_GPIO_BACKLIGHT,
-+              .end    = M800_GPIO_BACKLIGHT,
-+      },
-+};
-+
-+struct platform_device gta01_bl_dev = {
-+      .name           = "gta01-bl",
-+      .num_resources  = ARRAY_SIZE(gta01_bl_resources),
-+      .resource       = gta01_bl_resources,
-+      .dev            = {
-+              .platform_data = &backlight_machinfo,
-+      },
-+};
-+
-+
-+#if 0 /* currently this is not used and we use gpio spi */
-+static struct glamo_spi_info glamo_spi_cfg = {
-+      .board_size     = ARRAY_SIZE(gta02_spi_board_info),
-+      .board_info     = gta02_spi_board_info,
-+};
-+#endif /* 0 */
-+
-+#if 0
-+static struct resource gta02_vibrator_resources[] = {
-+      [0] = {
-+              .start  = GTA02_GPIO_VIBRATOR_ON,
-+              .end    = GTA02_GPIO_VIBRATOR_ON,
-+      },
-+};
-+
-+static struct platform_device gta02_vibrator_dev = {
-+      .name           = "neo1973-vibrator",
-+      .num_resources  = ARRAY_SIZE(gta02_vibrator_resources),
-+      .resource       = gta02_vibrator_resources,
-+};
-+
-+static struct resource gta02_led_resources[] = {
-+      {
-+              .name   = "gta02-power:orange",
-+              .start  = GTA02_GPIO_PWR_LED1,
-+              .end    = GTA02_GPIO_PWR_LED1,
-+      }, {
-+              .name   = "gta02-power:blue",
-+              .start  = GTA02_GPIO_PWR_LED2,
-+              .end    = GTA02_GPIO_PWR_LED2,
-+      }, {
-+              .name   = "gta02-aux:red",
-+              .start  = GTA02_GPIO_AUX_LED,
-+              .end    = GTA02_GPIO_AUX_LED,
-+      },
-+};
-+
-+struct platform_device gta02_led_dev = {
-+      .name           = "gta02-led",
-+      .num_resources  = ARRAY_SIZE(gta02_led_resources),
-+      .resource       = gta02_led_resources,
-+};
-+
-+static struct resource gta02_button_resources[] = {
-+      [0] = {
-+              .start = GTA02_GPIO_AUX_KEY,
-+              .end   = GTA02_GPIO_AUX_KEY,
-+      },
-+      [1] = {
-+              .start = GTA02_GPIO_HOLD_KEY,
-+              .end   = GTA02_GPIO_HOLD_KEY,
-+      },
-+      [2] = {
-+              .start = GTA02_GPIO_JACK_INSERT,
-+              .end   = GTA02_GPIO_JACK_INSERT,
-+      },
-+};
-+
-+static struct platform_device gta02_button_dev = {
-+      .name           = "neo1973-button",
-+      .num_resources  = ARRAY_SIZE(gta02_button_resources),
-+      .resource       = gta02_button_resources,
-+};
-+#endif
-+
-+/* USB */
-+static struct s3c2410_hcd_info glofiish_usb_info = {
-+      .port[0]        = {
-+              .flags  = S3C_HCDFLG_USED,
-+      },
-+      .port[1]        = {
-+              .flags  = 0,
-+      },
-+};
-+
-+static struct resource m800_button_resources[] = {
-+      [0] = {
-+              .start = M800_GPIO_nKEY_POWER,
-+              .end   = M800_GPIO_nKEY_POWER,
-+      },
-+      [1] = {
-+              .start = M800_GPIO_nKEY_CAMERA,
-+              .end   = M800_GPIO_nKEY_CAMERA,
-+      },
-+      [3] = {
-+              .start = M800_GPIO_nKEY_RECORD,
-+              .end   = M800_GPIO_nKEY_RECORD,
-+      },
-+      [2] = {
-+              .start = M800_GPIO_SLIDE,
-+              .end   = M800_GPIO_SLIDE,
-+      },
-+};
-+
-+static struct platform_device m800_button_dev = {
-+      .name           = "m800-button",
-+      .num_resources  = ARRAY_SIZE(m800_button_resources),
-+      .resource       = m800_button_resources,
-+};
-+
-+static struct platform_device m800_pm_bt_dev = {
-+      .name           = "neo1973-pm-bt",
-+};
-+
-+static void __init glofiish_map_io(void)
-+{
-+      s3c24xx_init_io(m800_iodesc, ARRAY_SIZE(m800_iodesc));
-+      s3c24xx_init_clocks(16934400);
-+      s3c24xx_init_uarts(m800_uartcfgs, ARRAY_SIZE(m800_uartcfgs));
-+}
-+
-+static irqreturn_t gta02_modem_irq(int irq, void *param)
-+{
-+      printk(KERN_DEBUG "modem wakeup interrupt\n");
-+      return IRQ_HANDLED;
-+}
-+
-+static irqreturn_t ar6000_wow_irq(int irq, void *param)
-+{
-+      printk(KERN_DEBUG "ar6000_wow interrupt\n");
-+      return IRQ_HANDLED;
-+}
-+
-+/*
-+ * hardware_ecc=1|0
-+ */
-+static char hardware_ecc_str[4] __initdata = "";
-+
-+static int __init hardware_ecc_setup(char *str)
-+{
-+      if (str)
-+              strlcpy(hardware_ecc_str, str, sizeof(hardware_ecc_str));
-+      return 1;
-+}
-+
-+__setup("hardware_ecc=", hardware_ecc_setup);
-+
-+static void __init glofiish_machine_init(void)
-+{
-+      int rc;
-+
-+      /* set the panic callback to make AUX blink fast */
-+      panic_blink = glofiish_panic_blink;
-+
-+      /* do not force soft ecc if we are asked to use hardware_ecc */
-+      if (hardware_ecc_str[0] == '1')
-+              glofiish_nand_info.software_ecc = 0;
-+
-+      s3c_device_usb.dev.platform_data = &glofiish_usb_info;
-+      s3c_device_nand.dev.platform_data = &glofiish_nand_info;
-+      s3c_device_sdi.dev.platform_data = &glofiish_mmc_cfg;
-+
-+      s3c24xx_fb_set_platdata(&glofiish_lcd_cfg);
-+      s3c24xx_udc_set_platdata(&glofiish_udc_cfg);
-+      set_s3c2410ts_info(&glofiish_ts_cfg);
-+
-+      platform_device_register(&gta01_bl_dev);
-+      platform_device_register(&m800_pm_bt_dev);
-+      platform_device_register(&m800_button_dev);
-+      platform_device_register(&s3c_device_spi_lcm);
-+
-+      platform_add_devices(glofiish_devices, ARRAY_SIZE(glofiish_devices));
-+
-+      s3c2410_pm_init();
-+}
-+
-+MACHINE_START(M800, "Glofiish M800")
-+      .phys_io        = S3C2410_PA_UART,
-+      .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
-+      .boot_params    = S3C2410_SDRAM_PA + 0x100,
-+      .map_io         = glofiish_map_io,
-+      .init_irq       = s3c24xx_init_irq,
-+      .init_machine   = glofiish_machine_init,
-+      .timer          = &s3c24xx_timer,
-+MACHINE_END
-diff --git a/drivers/input/keyboard/m800kbd.c b/drivers/input/keyboard/m800kbd.c
-new file mode 100644
-index 0000000..22f1aab
---- /dev/null
-+++ b/drivers/input/keyboard/m800kbd.c
-@@ -0,0 +1,330 @@
-+/*
-+ * Keyboard driver for E-TEN M800 GSM phone
-+ *
-+ * (C) 2008 by Harald Welte <laforge@gnumonks.org>
-+ * All rights reserved.
-+ *
-+ * inspired by corkgbd.c by Richard Purdie
-+ *
-+ * 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/platform_device.h>
-+#include <linux/init.h>
-+#include <linux/input.h>
-+#include <linux/interrupt.h>
-+#include <linux/jiffies.h>
-+#include <linux/module.h>
-+#include <linux/slab.h>
-+#include <linux/workqueue.h>
-+
-+#include <asm/gpio.h>
-+#include <asm/mach-types.h>
-+
-+struct m800kbd {
-+      struct input_dev *input;
-+      unsigned int suspended;
-+      struct work_struct work;
-+      int work_in_progress;
-+      int hp_irq_count_in_work;
-+      int hp_irq_count;
-+      int jack_irq;
-+};
-+
-+static irqreturn_t m800kbd_power_irq(int irq, void *dev_id)
-+{
-+      struct m800kbd *m800kbd_data = dev_id;
-+      int key_pressed = !gpio_get_value(irq_to_gpio(irq));
-+
-+      input_report_key(m800kbd_data->input, KEY_POWER, key_pressed);
-+      input_sync(m800kbd_data->input);
-+
-+      return IRQ_HANDLED;
-+}
-+
-+static irqreturn_t m800kbd_cam_irq(int irq, void *dev_id)
-+{
-+      struct m800kbd *m800kbd_data = dev_id;
-+
-+      int key_pressed = !gpio_get_value(irq_to_gpio(irq));
-+      input_report_key(m800kbd_data->input, KEY_CAMERA, key_pressed);
-+      input_sync(m800kbd_data->input);
-+
-+      return IRQ_HANDLED;
-+}
-+
-+static irqreturn_t m800kbd_rec_irq(int irq, void *dev_id)
-+{
-+      struct m800kbd *m800kbd_data = dev_id;
-+
-+      int key_pressed = !gpio_get_value(irq_to_gpio(irq));
-+      input_report_key(m800kbd_data->input, KEY_RECORD, key_pressed);
-+      input_sync(m800kbd_data->input);
-+
-+      return IRQ_HANDLED;
-+}
-+
-+static irqreturn_t m800kbd_slide_irq(int irq, void *dev_id)
-+{
-+      struct m800kbd *m800kbd_data = dev_id;
-+
-+      int key_pressed = gpio_get_value(irq_to_gpio(irq));
-+      input_report_key(m800kbd_data->input, SW_LID, key_pressed);
-+      input_sync(m800kbd_data->input);
-+
-+      return IRQ_HANDLED;
-+}
-+
-+#if 0
-+static void m800kbd_debounce_jack(struct work_struct *work)
-+{
-+      struct m800kbd *kbd = container_of(work, struct m800kbd, work);
-+      unsigned long flags;
-+      int loop = 0;
-+
-+      do {
-+              /*
-+               * we wait out any multiple interrupt
-+               * stuttering in 100ms lumps
-+               */
-+              do {
-+                      kbd->hp_irq_count_in_work = kbd->hp_irq_count;
-+                      msleep(100);
-+              } while (kbd->hp_irq_count != kbd->hp_irq_count_in_work);
-+              /*
-+               * no new interrupts on jack for 100ms...
-+               * ok we will report it
-+               */
-+              input_report_switch(kbd->input, SW_HEADPHONE_INSERT,
-+                                  gpio_get_value(irq_to_gpio(kbd->jack_irq)));
-+              input_sync(kbd->input);
-+              /*
-+               * we go around the outer loop again if we detect that more
-+               * interrupts came while we are servicing here.  But we have
-+               * to sequence it carefully with interrupts off
-+               */
-+              local_save_flags(flags);
-+              /* no interrupts during this work means we can exit the work */
-+              loop = !!(kbd->hp_irq_count != kbd->hp_irq_count_in_work);
-+              if (!loop)
-+                      kbd->work_in_progress = 0;
-+              local_irq_restore(flags);
-+              /*
-+               * interrupt that comes here will either queue a new work action
-+               * since work_in_progress is cleared now, or be dealt with
-+               * when we loop.
-+               */
-+      } while (loop);
-+}
-+
-+
-+static irqreturn_t m800kbd_headphone_irq(int irq, void *dev_id)
-+{
-+      struct m800kbd *m800kbd_data = dev_id;
-+
-+      /*
-+       * this interrupt is prone to bouncing and userspace doesn't like
-+       * to have to deal with that kind of thing.  So we do not accept
-+       * that a jack interrupt is equal to a jack event.  Instead we fire
-+       * some work on the first interrupt, and it hangs about in 100ms units
-+       * until no more interrupts come.  Then it accepts the state it finds
-+       * for jack insert and reports it once
-+       */
-+
-+      m800kbd_data->hp_irq_count++;
-+      /*
-+       * the first interrupt we see for a while, we fire the work item
-+       * and record the interrupt count when we did that.  If more interrupts
-+       * come in the meanwhile, we can tell by the difference in that
-+       * stored count and hp_irq_count which increments every interrupt
-+       */
-+      if (!m800kbd_data->work_in_progress) {
-+              m800kbd_data->jack_irq = irq;
-+              m800kbd_data->hp_irq_count_in_work =
-+                                              m800kbd_data->hp_irq_count;
-+              if (!schedule_work(&m800kbd_data->work))
-+                      printk(KERN_ERR
-+                              "Unable to schedule headphone debounce\n");
-+              else
-+                      m800kbd_data->work_in_progress = 1;
-+      }
-+
-+      return IRQ_HANDLED;
-+}
-+#endif
-+
-+#ifdef CONFIG_PM
-+static int m800kbd_suspend(struct platform_device *dev, pm_message_t state)
-+{
-+      struct m800kbd *m800kbd = platform_get_drvdata(dev);
-+
-+      m800kbd->suspended = 1;
-+
-+      return 0;
-+}
-+
-+static int m800kbd_resume(struct platform_device *dev)
-+{
-+      struct m800kbd *m800kbd = platform_get_drvdata(dev);
-+
-+      m800kbd->suspended = 0;
-+
-+      return 0;
-+}
-+#else
-+#define m800kbd_suspend       NULL
-+#define m800kbd_resume        NULL
-+#endif
-+
-+static int m800kbd_probe(struct platform_device *pdev)
-+{
-+      struct m800kbd *m800kbd;
-+      struct input_dev *input_dev;
-+      int rc, irq_power, irq_cam, irq_rec, irq_slide;
-+
-+      m800kbd = kzalloc(sizeof(struct m800kbd), GFP_KERNEL);
-+      input_dev = input_allocate_device();
-+      if (!m800kbd || !input_dev) {
-+              kfree(m800kbd);
-+              input_free_device(input_dev);
-+              return -ENOMEM;
-+      }
-+
-+      if (pdev->resource[0].flags != 0)
-+              return -EINVAL;
-+
-+      irq_power = gpio_to_irq(pdev->resource[0].start);
-+      if (irq_power < 0)
-+              return -EINVAL;
-+
-+      irq_cam = gpio_to_irq(pdev->resource[1].start);
-+      if (irq_cam < 0)
-+              return -EINVAL;
-+
-+      irq_rec = gpio_to_irq(pdev->resource[2].start);
-+      if (irq_rec < 0)
-+              return -EINVAL;
-+
-+      irq_slide = gpio_to_irq(pdev->resource[3].start);
-+      if (irq_slide < 0)
-+              return -EINVAL;
-+
-+      platform_set_drvdata(pdev, m800kbd);
-+
-+      m800kbd->input = input_dev;
-+
-+      //INIT_WORK(&m800kbd->work, m800kbd_debounce_jack);
-+
-+      input_dev->name = "M800 Buttons";
-+      input_dev->phys = "m800kbd/input0";
-+      input_dev->id.bustype = BUS_HOST;
-+      input_dev->id.vendor = 0x0001;
-+      input_dev->id.product = 0x0001;
-+      input_dev->id.version = 0x0100;
-+      input_dev->cdev.dev = &pdev->dev;
-+      input_dev->private = m800kbd;
-+
-+      input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_SW);
-+      set_bit(SW_HEADPHONE_INSERT, input_dev->swbit);
-+      set_bit(SW_LID, input_dev->swbit);
-+      set_bit(KEY_POWER, input_dev->keybit);
-+      set_bit(KEY_CAMERA, input_dev->keybit);
-+      set_bit(KEY_RECORD, input_dev->keybit);
-+
-+      rc = input_register_device(m800kbd->input);
-+      if (rc)
-+              goto out_register;
-+
-+      if (request_irq(irq_power, m800kbd_power_irq, IRQF_DISABLED |
-+                      IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-+                      "M800 Power button", m800kbd)) {
-+              dev_err(&pdev->dev, "Can't get IRQ %u\n", irq_power);
-+              goto out_aux;
-+      }
-+
-+      enable_irq_wake(irq_power);
-+
-+      if (request_irq(irq_cam, m800kbd_cam_irq, IRQF_DISABLED |
-+                      IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-+                      "M800 Camera button", m800kbd)) {
-+              dev_err(&pdev->dev, "Can't get IRQ %u\n", irq_cam);
-+              goto out_hold;
-+      }
-+
-+      if (request_irq(irq_rec, m800kbd_rec_irq, IRQF_DISABLED |
-+                      IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-+                      "M800 Record button", m800kbd)) {
-+              dev_err(&pdev->dev, "Can't get IRQ %u\n", irq_rec);
-+              goto out_hold;
-+      }
-+
-+      if (request_irq(irq_slide, m800kbd_slide_irq, IRQF_DISABLED |
-+                      IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-+                      "M800 Slide", m800kbd)) {
-+              dev_err(&pdev->dev, "Can't get IRQ %u\n", irq_slide);
-+              goto out_jack;
-+      }
-+      enable_irq_wake(irq_slide);
-+
-+      return 0;
-+
-+out_jack:
-+      free_irq(irq_cam, m800kbd);
-+out_hold:
-+      free_irq(irq_power, m800kbd);
-+out_aux:
-+      input_unregister_device(m800kbd->input);
-+out_register:
-+      input_free_device(m800kbd->input);
-+      platform_set_drvdata(pdev, NULL);
-+      kfree(m800kbd);
-+
-+      return -ENODEV;
-+}
-+
-+static int m800kbd_remove(struct platform_device *pdev)
-+{
-+      struct m800kbd *m800kbd = platform_get_drvdata(pdev);
-+
-+      free_irq(gpio_to_irq(pdev->resource[2].start), m800kbd);
-+      free_irq(gpio_to_irq(pdev->resource[1].start), m800kbd);
-+      free_irq(gpio_to_irq(pdev->resource[0].start), m800kbd);
-+
-+      input_unregister_device(m800kbd->input);
-+      input_free_device(m800kbd->input);
-+      platform_set_drvdata(pdev, NULL);
-+      kfree(m800kbd);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver m800kbd_driver = {
-+      .probe          = m800kbd_probe,
-+      .remove         = m800kbd_remove,
-+      .suspend        = m800kbd_suspend,
-+      .resume         = m800kbd_resume,
-+      .driver         = {
-+              .name   = "m800-button",
-+      },
-+};
-+
-+static int __devinit m800kbd_init(void)
-+{
-+      return platform_driver_register(&m800kbd_driver);
-+}
-+
-+static void __exit m800kbd_exit(void)
-+{
-+      platform_driver_unregister(&m800kbd_driver);
-+}
-+
-+module_init(m800kbd_init);
-+module_exit(m800kbd_exit);
-+
-+MODULE_AUTHOR("Harald Welte <laforge@gnumonks.org>");
-+MODULE_DESCRIPTION("E-TEN glofiish M800 GPIO buttons input driver");
-+MODULE_LICENSE("GPL");
-diff --git a/include/asm-arm/arch-s3c2410/glofiish.h b/include/asm-arm/arch-s3c2410/glofiish.h
-new file mode 100644
-index 0000000..1d0586f
---- /dev/null
-+++ b/include/asm-arm/arch-s3c2410/glofiish.h
-@@ -0,0 +1,39 @@
-+#ifndef _GLOFIISH_H
-+#define _GLOFIISH_H
-+
-+#include <asm/arch/regs-gpio.h>
-+
-+#define M800_GPIO_USB_PULLUP  S3C2410_GPA21
-+
-+#define M800_GPIO_BACKLIGHT   S3C2410_GPB0
-+#define M800_GPIO_KBDLIGHT    S3C2410_GPB1
-+#define M800_GPIO_GPS_POWER   S3C2410_GPB6
-+
-+#define M800_GPIO_BT_POWER_1  S3C2410_GPC8
-+#define M800_GPIO_BT_POWER_2  S3C2410_GPC9
-+
-+#define M800_GPIO_nKEY_POWER  S3C2410_GPF0
-+#define M800_GPIO_CPLD                S3C2410_GPF2
-+#define M800_GPIO_USB_ATTACH  S3C2410_GPF3
-+#define M800_GPIO_WIFI_1      S3C2410_GPF5
-+#define M800_GPIO_WIFI_2      S3C2410_GPF7
-+
-+#define M800_GPIO_FMRADIO     S3C2410_GPG0
-+#define M800_GPIO_nKEY_CAMERA S3C2410_GPG2
-+#define M800_GPIO_nKEY_RECORD S3C2410_GPG4
-+#define M800_GPIO_SLIDE               S3C2410_GPG6
-+#define M800_GPIO_nSD_DETECT  S3C2410_GPG7
-+
-+#define M800_IRQ_nKEY_POWER   IRQ_EINT0
-+#define M800_IRQ_CPLD_KEY     IRQ_EINT2
-+#define M800_IRQ_USB_ATTACH   IRQ_EINT3
-+#define M800_IRQ_WIFI_1               IRQ_EINT5
-+#define M800_IRQ_WIFI_2               IRQ_EINT7
-+#define M800_IRQ_FMRADIO      IRQ_EINT8
-+#define M800_IRQ_nKEY_CAMERA  IRQ_EINT10
-+#define M800_IRQ_nKEY_RECORD  IRQ_EINT12
-+#define M800_IRQ_CAPSENSE     IRQ_EINT13
-+#define M800_IRQ_KBD_SLIDE    IRQ_EINT14
-+#define M800_IRQ_nSD_DETECT   IRQ_EINT15
-+
-+#endif
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1326-change-gta01-battery-driver-name.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1326-change-gta01-battery-driver-name.patch.patch
deleted file mode 100644 (file)
index 9bc0f50..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From cfea911c6c57eebdfc1358ee47b3730514da6cf3 Mon Sep 17 00:00:00 2001
-From: \\\"Mike (mwester)\\ <mwester@dls.net>
-Date: Wed, 19 Nov 2008 13:11:56 +0000
-Subject: [PATCH] change-gta01-battery-driver-name.patch
-
-[Can this be added to "stable" please?  Thanks!  Simple, short,
-non-descriptive names seem to be the norm for the nodes beneath
-/sys/classes/power_supply, so there seems to be no reason to do
-differently for the GTA01, especially when doing so adds an
-unnecessary incompatibility.]
-
-    change-gta01-battery-driver-name.patch
-
-    This patch changes the name of the gta01 battery driver to "bat"
-    in order to maintain compatability with the gta02 device.
-
-    Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- drivers/power/gta01_battery.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/power/gta01_battery.c b/drivers/power/gta01_battery.c
-index 5acb45c..2267ecf 100644
---- a/drivers/power/gta01_battery.c
-+++ b/drivers/power/gta01_battery.c
-@@ -70,7 +70,7 @@ static int __init gta01_bat_init(void)
- {
-       int ret;
--      bat_pdev = platform_device_register_simple("gta01-battery", 0, NULL, 0);
-+      bat_pdev = platform_device_register_simple("bat", 0, NULL, 0);
-       if (IS_ERR(bat_pdev))
-               return PTR_ERR(bat_pdev);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1327-jbt6k74_no_deep_sleep.patch.patch b/target/linux/s3c24xx/patches-2.6.24/1327-jbt6k74_no_deep_sleep.patch.patch
deleted file mode 100644 (file)
index 35a29bf..0000000
+++ /dev/null
@@ -1,276 +0,0 @@
-From 62b3330f97b940c715a8931abc7161c99362abaa Mon Sep 17 00:00:00 2001
-From: Nicolas Dufresne <nicolas.dufresne@gmail.com>
-Date: Thu, 4 Dec 2008 17:49:02 +0000
-Subject: [PATCH] jbt6k74_no_deep_sleep.patch
-
-This patch from
-
-https://docs.openmoko.org/trac/ticket/1841
-
-defeats deep sleep on the LCM ASIC and is reported to stop the WSOD
-behaviour on LCMs that exhibit it.
----
- drivers/video/display/jbt6k74.c |  114 ++++++++++++++++++++++-----------------
- 1 files changed, 65 insertions(+), 49 deletions(-)
-
-diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c
-index 9570543..0635823 100644
---- a/drivers/video/display/jbt6k74.c
-+++ b/drivers/video/display/jbt6k74.c
-@@ -252,22 +252,36 @@ static int jbt_init_regs(struct jbt_info *jbt, int qvga)
-       return rc ? -EIO : 0;
- }
--static int standby_to_sleep(struct jbt_info *jbt)
-+int jbt6k74_display_onoff(struct jbt_info *jbt, int on)
- {
--      int rc;
--
--      /* three times command zero */
--      rc = jbt_reg_write_nodata(jbt, 0x00);
--      mdelay(1);
--      rc |= jbt_reg_write_nodata(jbt, 0x00);
--      mdelay(1);
--      rc |= jbt_reg_write_nodata(jbt, 0x00);
--      mdelay(1);
--
--      /* deep standby out */
--      rc |= jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x17);
-+      if (on)
-+              return jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_ON);
-+      else
-+              return jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_OFF);
-+}
-+EXPORT_SYMBOL_GPL(jbt6k74_display_onoff);
--      return rc ? -EIO : 0;
-+static int standby_to_sleep(struct jbt_info *jbt)
-+{
-+    static int once = 0;
-+    if (!once++) {
-+        int rc;
-+
-+        /* three times command zero */
-+        rc = jbt_reg_write_nodata(jbt, 0x00);
-+        mdelay(1);
-+        rc |= jbt_reg_write_nodata(jbt, 0x00);
-+        mdelay(1);
-+        rc |= jbt_reg_write_nodata(jbt, 0x00);
-+        mdelay(1);
-+
-+        /* deep standby out */
-+        rc |= jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x17);
-+
-+        return rc ? -EIO : 0;
-+    }
-+    else 
-+        return 0;
- }
- static int sleep_to_normal(struct jbt_info *jbt)
-@@ -292,6 +306,9 @@ static int sleep_to_normal(struct jbt_info *jbt)
-       /* initialize register set */
-       rc |= jbt_init_regs(jbt, 0);
-+      /* Turn on display */
-+      rc |= jbt6k74_display_onoff(jbt, 1);
-+
-       return rc ? -EIO : 0;
- }
-@@ -317,6 +334,9 @@ static int sleep_to_qvga_normal(struct jbt_info *jbt)
-       /* initialize register set for qvga*/
-       rc |= jbt_init_regs(jbt, 1);
-+      /* Turn on display */
-+      rc |= jbt6k74_display_onoff(jbt, 1);
-+
-       return rc ? -EIO : 0;
- }
-@@ -324,7 +344,8 @@ static int normal_to_sleep(struct jbt_info *jbt)
- {
-       int rc;
--      rc = jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_OFF);
-+      rc = jbt6k74_display_onoff(jbt, 0);
-+      rc |= jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_OFF);
-       rc |= jbt_reg_write16(jbt, JBT_REG_OUTPUT_CONTROL, 0x8002);
-       rc |= jbt_reg_write_nodata(jbt, JBT_REG_SLEEP_IN);
-@@ -333,7 +354,11 @@ static int normal_to_sleep(struct jbt_info *jbt)
- static int sleep_to_standby(struct jbt_info *jbt)
- {
-+#if 0
-       return jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x00);
-+#else
-+    return 0;
-+#endif
- }
- /* frontend function */
-@@ -436,6 +461,7 @@ int jbt6k74_enter_state(struct jbt_info *jbt, enum jbt_state new_state)
-               }
-               break;
-       }
-+      
-       if (rc == 0)
-               jbt->state = new_state;
-@@ -443,15 +469,6 @@ int jbt6k74_enter_state(struct jbt_info *jbt, enum jbt_state new_state)
- }
- EXPORT_SYMBOL_GPL(jbt6k74_enter_state);
--int jbt6k74_display_onoff(struct jbt_info *jbt, int on)
--{
--      if (on)
--              return jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_ON);
--      else
--              return jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_OFF);
--}
--EXPORT_SYMBOL_GPL(jbt6k74_display_onoff);
--
- static ssize_t state_read(struct device *dev, struct device_attribute *attr,
-                         char *buf)
- {
-@@ -475,17 +492,6 @@ static ssize_t state_write(struct device *dev, struct device_attribute *attr,
-                       rc = jbt6k74_enter_state(jbt, i);
-                       if (rc)
-                               return rc;
--                      switch (i) {
--                      case JBT_STATE_NORMAL:
--                      case JBT_STATE_QVGA_NORMAL:
--                              /* Enable display again after deep-standby */
--                              rc = jbt6k74_display_onoff(jbt, 1);
--                              if (rc)
--                                      return rc;
--                              break;
--                      default:
--                              break;
--                      }
-                       return count;
-               }
-       }
-@@ -528,6 +534,8 @@ static ssize_t gamma_write(struct device *dev, struct device_attribute *attr,
-       int reg = reg_by_string(attr->attr.name);
-       unsigned long val = simple_strtoul(buf, NULL, 10);
-+      dev_info(dev, "**** jbt6k74 writing gama %lu\n", val & 0xff);
-+
-       jbt_reg_write(jbt, reg, val & 0xff);
-       return count;
-@@ -567,19 +575,27 @@ static int fb_notifier_callback(struct notifier_block *self,
-       switch (fb_blank) {
-       case FB_BLANK_UNBLANK:
-+              dev_info(&jbt->spi_dev->dev, "**** jbt6k74 unblank\n");
-+              break;
-       case FB_BLANK_NORMAL:
--              jbt6k74_enter_state(jbt, JBT_STATE_NORMAL);
--              jbt6k74_display_onoff(jbt, 1);
-+              dev_info(&jbt->spi_dev->dev, "**** jbt6k74 normal\n");
-+              /*jbt6k74_enter_state(jbt, JBT_STATE_NORMAL);
-+              jbt6k74_display_onoff(jbt, 1); */
-               break;
-       case FB_BLANK_VSYNC_SUSPEND:
-+              dev_info(&jbt->spi_dev->dev, "**** jbt6k74 vsync suspend\n");
-+              break;
-       case FB_BLANK_HSYNC_SUSPEND:
-+              dev_info(&jbt->spi_dev->dev, "**** jbt6k74 hsync suspend\n");
-               /* FIXME: we disable SLEEP since it would result in
-                * a visible artefact (white screen) before the backlight
-                * is dimmed to a dark enough level */
-               /* jbt6k74_enter_state(jbt, JBT_STATE_SLEEP); */
-+              /*jbt6k74_display_onoff(jbt, 0);*/
-               break;
-       case FB_BLANK_POWERDOWN:
--              jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);
-+              dev_info(&jbt->spi_dev->dev, "**** jbt6k74 powerdown\n");
-+              /*jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);*/
-               break;
-       }
-@@ -621,16 +637,10 @@ static int __devinit jbt_probe(struct spi_device *spi)
-               goto err_free_drvdata;
-       }
--      rc = jbt6k74_display_onoff(jbt, 1);
--      if (rc < 0) {
--              dev_err(&spi->dev, "cannot switch display on\n");
--              goto err_standby;
--      }
--
-       rc = sysfs_create_group(&spi->dev.kobj, &jbt_attr_group);
-       if (rc < 0) {
-               dev_err(&spi->dev, "cannot create sysfs group\n");
--              goto err_off;
-+              goto err_standby;
-       }
-       jbt->fb_notif.notifier_call = fb_notifier_callback;
-@@ -644,8 +654,6 @@ static int __devinit jbt_probe(struct spi_device *spi)
- err_sysfs:
-       sysfs_remove_group(&spi->dev.kobj, &jbt_attr_group);
--err_off:
--      jbt6k74_display_onoff(jbt, 0);
- err_standby:
-       jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);
- err_free_drvdata:
-@@ -676,6 +684,8 @@ static int jbt_suspend(struct spi_device *spi, pm_message_t state)
-       struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-       struct jbt6k74_platform_data *jbt6k74_pdata = spi->dev.platform_data;
-+      dev_info(&spi->dev, "**** jbt6k74 suspend start\n");
-+
-       /* platform can register resume dependencies here, if any */
-       if (jbt6k74_pdata->suspending)
-               (jbt6k74_pdata->suspending)(0, spi);
-@@ -689,6 +699,8 @@ static int jbt_suspend(struct spi_device *spi, pm_message_t state)
- /*    (jbt6k74_pdata->reset)(0, 0); */
-+      dev_info(&spi->dev, "**** jbt6k74 suspend end\n");
-+
-       return 0;
- }
-@@ -697,6 +709,7 @@ int jbt6k74_resume(struct spi_device *spi)
-       struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-       struct jbt6k74_platform_data *jbt6k74_pdata = spi->dev.platform_data;
-+      dev_info(&spi->dev, "**** jbt6k74 resume start\n");
-       if (jbt6k74_pdata->all_dependencies_resumed)
-               if (!(jbt6k74_pdata->all_dependencies_resumed)(0))
-                       return 0;
-@@ -704,8 +717,10 @@ int jbt6k74_resume(struct spi_device *spi)
-       /* we can get called twice with all dependencies resumed if our core
-        * resume callback is last of all.  Protect against doing anything twice
-        */
--      if (jbt->have_resumed)
-+      if (jbt->have_resumed) {
-+              dev_info(&spi->dev, "**** jbt6k74 already resumed\n");
-               return 0;
-+      }
-       jbt->have_resumed |= 1;
-@@ -717,11 +732,12 @@ int jbt6k74_resume(struct spi_device *spi)
-               jbt6k74_enter_state(jbt, JBT_STATE_NORMAL);
-               break;
-       }
--      jbt6k74_display_onoff(jbt, 1);
-       if (jbt6k74_pdata->resuming)
-               (jbt6k74_pdata->resuming)(0);
-+      dev_info(&spi->dev, "**** jbt6k74 resume end\n");
-+
-       return 0;
- }
- EXPORT_SYMBOL_GPL(jbt6k74_resume);
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.24/1328-.patch b/target/linux/s3c24xx/patches-2.6.24/1328-.patch
deleted file mode 100644 (file)
index 115bcea..0000000
+++ /dev/null
@@ -1,152 +0,0 @@
-From fb42ce6724576fc173faf8abfb04aa2c36d213b7 Mon Sep 17 00:00:00 2001
-From: Andy Green <agreen@pads.home.warmcat.com>
-Date: Fri, 5 Dec 2008 11:03:59 +0000
-Subject: [PATCH]
-
----
- drivers/video/display/jbt6k74.c |   68 ++++++++++++++-------------------------
- 1 files changed, 24 insertions(+), 44 deletions(-)
-
-diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c
-index 0635823..b1b5b1e 100644
---- a/drivers/video/display/jbt6k74.c
-+++ b/drivers/video/display/jbt6k74.c
-@@ -252,36 +252,22 @@ static int jbt_init_regs(struct jbt_info *jbt, int qvga)
-       return rc ? -EIO : 0;
- }
--int jbt6k74_display_onoff(struct jbt_info *jbt, int on)
--{
--      if (on)
--              return jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_ON);
--      else
--              return jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_OFF);
--}
--EXPORT_SYMBOL_GPL(jbt6k74_display_onoff);
--
- static int standby_to_sleep(struct jbt_info *jbt)
- {
--    static int once = 0;
--    if (!once++) {
--        int rc;
--
--        /* three times command zero */
--        rc = jbt_reg_write_nodata(jbt, 0x00);
--        mdelay(1);
--        rc |= jbt_reg_write_nodata(jbt, 0x00);
--        mdelay(1);
--        rc |= jbt_reg_write_nodata(jbt, 0x00);
--        mdelay(1);
--
--        /* deep standby out */
--        rc |= jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x17);
--
--        return rc ? -EIO : 0;
--    }
--    else 
--        return 0;
-+      int rc;
-+
-+      /* three times command zero */
-+      rc = jbt_reg_write_nodata(jbt, 0x00);
-+      mdelay(1);
-+      rc |= jbt_reg_write_nodata(jbt, 0x00);
-+      mdelay(1);
-+      rc |= jbt_reg_write_nodata(jbt, 0x00);
-+      mdelay(1);
-+
-+      /* deep standby out */
-+      rc |= jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x17);
-+
-+      return rc ? -EIO : 0;
- }
- static int sleep_to_normal(struct jbt_info *jbt)
-@@ -307,7 +293,7 @@ static int sleep_to_normal(struct jbt_info *jbt)
-       rc |= jbt_init_regs(jbt, 0);
-       /* Turn on display */
--      rc |= jbt6k74_display_onoff(jbt, 1);
-+      rc |= jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_ON);
-       return rc ? -EIO : 0;
- }
-@@ -335,7 +321,7 @@ static int sleep_to_qvga_normal(struct jbt_info *jbt)
-       rc |= jbt_init_regs(jbt, 1);
-       /* Turn on display */
--      rc |= jbt6k74_display_onoff(jbt, 1);
-+      rc |= jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_ON);
-       return rc ? -EIO : 0;
- }
-@@ -344,8 +330,7 @@ static int normal_to_sleep(struct jbt_info *jbt)
- {
-       int rc;
--      rc = jbt6k74_display_onoff(jbt, 0);
--      rc |= jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_OFF);
-+      rc = jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_OFF);
-       rc |= jbt_reg_write16(jbt, JBT_REG_OUTPUT_CONTROL, 0x8002);
-       rc |= jbt_reg_write_nodata(jbt, JBT_REG_SLEEP_IN);
-@@ -354,11 +339,7 @@ static int normal_to_sleep(struct jbt_info *jbt)
- static int sleep_to_standby(struct jbt_info *jbt)
- {
--#if 0
-       return jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x00);
--#else
--    return 0;
--#endif
- }
- /* frontend function */
-@@ -576,11 +557,10 @@ static int fb_notifier_callback(struct notifier_block *self,
-       switch (fb_blank) {
-       case FB_BLANK_UNBLANK:
-               dev_info(&jbt->spi_dev->dev, "**** jbt6k74 unblank\n");
-+              jbt6k74_enter_state(jbt, JBT_STATE_NORMAL);
-               break;
-       case FB_BLANK_NORMAL:
-               dev_info(&jbt->spi_dev->dev, "**** jbt6k74 normal\n");
--              /*jbt6k74_enter_state(jbt, JBT_STATE_NORMAL);
--              jbt6k74_display_onoff(jbt, 1); */
-               break;
-       case FB_BLANK_VSYNC_SUSPEND:
-               dev_info(&jbt->spi_dev->dev, "**** jbt6k74 vsync suspend\n");
-@@ -591,11 +571,12 @@ static int fb_notifier_callback(struct notifier_block *self,
-                * a visible artefact (white screen) before the backlight
-                * is dimmed to a dark enough level */
-               /* jbt6k74_enter_state(jbt, JBT_STATE_SLEEP); */
--              /*jbt6k74_display_onoff(jbt, 0);*/
-               break;
-       case FB_BLANK_POWERDOWN:
-               dev_info(&jbt->spi_dev->dev, "**** jbt6k74 powerdown\n");
--              /*jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);*/
-+      /* FIXME: deep standby causes WSOD on certain devices. We use
-+       * sleep as workaround */
-+              jbt6k74_enter_state(jbt, JBT_STATE_SLEEP);
-               break;
-       }
-@@ -692,13 +673,12 @@ static int jbt_suspend(struct spi_device *spi, pm_message_t state)
-       /* Save mode for resume */
-       jbt->last_state = jbt->state;
--
--      jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);
-+      /* FIXME: deep standby causes WSOD on certain devices. We use
-+       * sleep as workaround */
-+      jbt6k74_enter_state(jbt, JBT_STATE_SLEEP);
-       jbt->have_resumed = 0;
--/*    (jbt6k74_pdata->reset)(0, 0); */
--
-       dev_info(&spi->dev, "**** jbt6k74 suspend end\n");
-       return 0;
--- 
-1.5.6.5
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/0100-revert-openwrt-patches-921-922-923.patch b/target/linux/s3c24xx/patches-2.6.26/0100-revert-openwrt-patches-921-922-923.patch
deleted file mode 100755 (executable)
index c82f524..0000000
+++ /dev/null
@@ -1,1247 +0,0 @@
-Index: linux-2.6.26/Documentation/gpiommc.txt
-===================================================================
---- linux-2.6.26.orig/Documentation/gpiommc.txt        2008-12-12 21:55:07.000000000 +0100
-+++ /dev/null  1970-01-01 00:00:00.000000000 +0000
-@@ -1,97 +0,0 @@
--GPIOMMC - Driver for an MMC/SD card on a bitbanging GPIO SPI bus
--================================================================
--
--The gpiommc module hooks up the mmc_spi and spi_gpio modules for running an
--MMC or SD card on GPIO pins.
--
--Two interfaces for registering a new MMC/SD card device are provided:
--A static platform-device based mechanism and a dynamic configfs based interface.
--
--
--Registering devices via platform-device
--=======================================
--
--The platform-device interface is used for registering MMC/SD devices that are
--part of the hardware platform. This is most useful only for embedded machines
--with MMC/SD devices statically connected to the platform GPIO bus.
--
--The data structures are declared in <linux/mmc/gpiommc.h>.
--
--To register a new device, define an instance of struct gpiommc_platform_data.
--This structure holds any information about how the device is hooked up to the
--GPIO pins and what hardware modes the device supports. See the docbook-style
--documentation in the header file for more information on the struct fields.
--
--Then allocate a new instance of a platform device by doing:
--
--      pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME, gpiommc_next_id());
--
--This will allocate the platform device data structures and hook it up to the
--gpiommc driver.
--Then add the gpiommc_platform_data to the platform device.
--
--      err = platform_device_add_data(pdev, pdata, sizeof(struct gpiommc_platform_data));
--
--You may free the local instance of struct gpiommc_platform_data now. (So the
--struct may be allocated on the stack, too).
--Now simply register the platform device.
--
--      err = platform_device_add(pdev);
--
--Done. The gpiommc probe routine will be invoked now and you should see a kernel
--log message for the added device.
--
--
--Registering devices via configfs
--================================
--
--MMC/SD cards connected via GPIO often are a pretty dynamic thing, as for example
--selfmade hacks for soldering an MMC/SD card to standard GPIO pins on embedded
--hardware are a common situation.
--So we provide a dynamic interface to conveniently handle adding and removing
--devices from userspace, without the need to recompile the kernel.
--
--The "gpiommc" subdirectory at the configfs mountpoint is used for handling
--the dynamic configuration.
--
--To create a new device, it must first be allocated with mkdir.
--The following command will allocate a device named "my_mmc":
--      mkdir /config/gpiommc/my_mmc
--
--There are several configuration files available in the new
--/config/gpiommc/my_mmc/ directory:
--
--gpio_data_in                  = The SPI data-IN GPIO pin number.
--gpio_data_out                 = The SPI data-OUT GPIO pin number.
--gpio_clock                    = The SPI Clock GPIO pin number.
--gpio_chipselect                       = The SPI Chipselect GPIO pin number.
--gpio_chipselect_activelow     = Boolean. If 0, Chipselect is active-HIGH.
--                                If 1, Chipselect is active-LOW.
--spi_mode                      = The SPI data mode. Can be 0-3.
--spi_delay                     = Enable all delays in the lowlevel bitbanging.
--max_bus_speed                 = The maximum SPI bus speed. In Hertz.
--
--register                      = Not a configuration parameter.
--                                Used to register the configured card
--                                with the kernel.
--
--The device must first get configured and then registered by writing "1" to
--the "register" file.
--The configuration parameters "gpio_data_in", "gpio_data_out", "gpio_clock"
--and "gpio_chipselect" are essential and _must_ be configured before writing
--"1" to the "register" file. The registration will fail, otherwise.
--
--The default values for the other parameters are:
--gpio_chipselect_activelow     = 1             (CS active-LOW)
--spi_mode                      = 0             (SPI_MODE_0)
--spi_delay                     = 1             (enabled)
--max_bus_speed                 = 5000000       (5 Mhz)
--
--Configuration values can not be changed after registration. To unregister
--the device, write a "0" to the "register" file. The configuration can be
--changed again after unregistering.
--
--To completely remove the device, simply rmdir the directory
--(/config/gpiommc/my_mmc in this example).
--There's no need to first unregister the device before removing it. That will
--be done automatically.
-Index: linux-2.6.26/drivers/mmc/host/gpiommc.c
-===================================================================
---- linux-2.6.26.orig/drivers/mmc/host/gpiommc.c       2008-12-12 21:55:07.000000000 +0100
-+++ /dev/null  1970-01-01 00:00:00.000000000 +0000
-@@ -1,624 +0,0 @@
--/*
-- * Driver an MMC/SD card on a bitbanging GPIO SPI bus.
-- * This module hooks up the mmc_spi and spi_gpio modules and also
-- * provides a configfs interface.
-- *
-- * Copyright 2008 Michael Buesch <mb@bu3sch.de>
-- *
-- * Licensed under the GNU/GPL. See COPYING for details.
-- */
--
--#include <linux/platform_device.h>
--#include <linux/list.h>
--#include <linux/mutex.h>
--#include <linux/mmc/gpiommc.h>
--#include <linux/mmc/host.h>
--#include <linux/spi/spi_gpio.h>
--#include <linux/spi/mmc_spi.h>
--#include <linux/configfs.h>
--#include <linux/gpio.h>
--#include <asm/atomic.h>
--
--
--#define PFX                           "gpio-mmc: "
--
--
--struct gpiommc_device {
--      struct platform_device *pdev;
--      struct platform_device *spi_pdev;
--      struct spi_board_info boardinfo;
--      struct mmc_spi_platform_data mmc_spi_data;
--};
--
--
--MODULE_DESCRIPTION("GPIO based MMC driver");
--MODULE_AUTHOR("Michael Buesch");
--MODULE_LICENSE("GPL");
--
--
--static int gpiommc_boardinfo_setup(struct spi_board_info *bi,
--                                 struct spi_master *master,
--                                 void *data)
--{
--      struct gpiommc_device *d = data;
--      struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
--
--      /* Bind the SPI master to the MMC-SPI host driver. */
--      strlcpy(bi->modalias, "mmc_spi", sizeof(bi->modalias));
--
--      bi->max_speed_hz = pdata->max_bus_speed;
--      bi->bus_num = master->bus_num;
--      bi->mode = pdata->mode;
--      bi->platform_data = &d->mmc_spi_data;
--
--      return 0;
--}
--
--static int gpiommc_probe(struct platform_device *pdev)
--{
--      struct gpiommc_platform_data *mmc_pdata = pdev->dev.platform_data;
--      struct spi_gpio_platform_data spi_pdata;
--      struct gpiommc_device *d;
--      int err;
--
--      err = -ENXIO;
--      if (!mmc_pdata)
--              goto error;
--
--#ifdef CONFIG_MMC_SPI_MODULE
--      err = request_module("mmc_spi");
--      if (err) {
--              printk(KERN_WARNING PFX
--                     "Failed to request mmc_spi module.\n");
--      }
--#endif /* CONFIG_MMC_SPI_MODULE */
--
--      /* Allocate the GPIO-MMC device */
--      err = -ENOMEM;
--      d = kzalloc(sizeof(*d), GFP_KERNEL);
--      if (!d)
--              goto error;
--      d->pdev = pdev;
--      d->mmc_spi_data.ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34;
--
--      /* Create the SPI-GPIO device */
--      d->spi_pdev = platform_device_alloc(SPI_GPIO_PLATDEV_NAME,
--                                          spi_gpio_next_id());
--      if (!d->spi_pdev)
--              goto err_free_d;
--
--      memset(&spi_pdata, 0, sizeof(spi_pdata));
--      spi_pdata.pin_clk = mmc_pdata->pins.gpio_clk;
--      spi_pdata.pin_miso = mmc_pdata->pins.gpio_do;
--      spi_pdata.pin_mosi = mmc_pdata->pins.gpio_di;
--      spi_pdata.pin_cs = mmc_pdata->pins.gpio_cs;
--      spi_pdata.cs_activelow = mmc_pdata->pins.cs_activelow;
--      spi_pdata.no_spi_delay = mmc_pdata->no_spi_delay;
--      spi_pdata.boardinfo_setup = gpiommc_boardinfo_setup;
--      spi_pdata.boardinfo_setup_data = d;
--
--      err = platform_device_add_data(d->spi_pdev, &spi_pdata,
--                                     sizeof(spi_pdata));
--      if (err)
--              goto err_free_pdev;
--      err = platform_device_add(d->spi_pdev);
--      if (err)
--              goto err_free_pdata;
--      platform_set_drvdata(pdev, d);
--
--      printk(KERN_INFO PFX "MMC-Card \"%s\" "
--             "attached to GPIO pins di=%u, do=%u, clk=%u, cs=%u\n",
--             mmc_pdata->name, mmc_pdata->pins.gpio_di,
--             mmc_pdata->pins.gpio_do,
--             mmc_pdata->pins.gpio_clk,
--             mmc_pdata->pins.gpio_cs);
--
--      return 0;
--
--err_free_pdata:
--      kfree(d->spi_pdev->dev.platform_data);
--      d->spi_pdev->dev.platform_data = NULL;
--err_free_pdev:
--      platform_device_put(d->spi_pdev);
--err_free_d:
--      kfree(d);
--error:
--      return err;
--}
--
--static int gpiommc_remove(struct platform_device *pdev)
--{
--      struct gpiommc_device *d = platform_get_drvdata(pdev);
--      struct gpiommc_platform_data *pdata = d->pdev->dev.platform_data;
--
--      platform_device_unregister(d->spi_pdev);
--      printk(KERN_INFO PFX "GPIO based MMC-Card \"%s\" removed\n",
--             pdata->name);
--      platform_device_put(d->spi_pdev);
--
--      return 0;
--}
--
--#ifdef CONFIG_GPIOMMC_CONFIGFS
--
--/* A device that was created through configfs */
--struct gpiommc_configfs_device {
--      struct config_item item;
--      /* The platform device, after registration. */
--      struct platform_device *pdev;
--      /* The configuration */
--      struct gpiommc_platform_data pdata;
--      /* Mutex to protect this structure */
--      struct mutex mutex;
--};
--
--#define GPIO_INVALID  -1
--
--static inline bool gpiommc_is_registered(struct gpiommc_configfs_device *dev)
--{
--      return (dev->pdev != NULL);
--}
--
--static inline struct gpiommc_configfs_device *ci_to_gpiommc(struct config_item *item)
--{
--      return item ? container_of(item, struct gpiommc_configfs_device, item) : NULL;
--}
--
--static struct configfs_attribute gpiommc_attr_DI = {
--      .ca_owner = THIS_MODULE,
--      .ca_name = "gpio_data_in",
--      .ca_mode = S_IRUGO | S_IWUSR,
--};
--
--static struct configfs_attribute gpiommc_attr_DO = {
--      .ca_owner = THIS_MODULE,
--      .ca_name = "gpio_data_out",
--      .ca_mode = S_IRUGO | S_IWUSR,
--};
--
--static struct configfs_attribute gpiommc_attr_CLK = {
--      .ca_owner = THIS_MODULE,
--      .ca_name = "gpio_clock",
--      .ca_mode = S_IRUGO | S_IWUSR,
--};
--
--static struct configfs_attribute gpiommc_attr_CS = {
--      .ca_owner = THIS_MODULE,
--      .ca_name = "gpio_chipselect",
--      .ca_mode = S_IRUGO | S_IWUSR,
--};
--
--static struct configfs_attribute gpiommc_attr_CS_activelow = {
--      .ca_owner = THIS_MODULE,
--      .ca_name = "gpio_chipselect_activelow",
--      .ca_mode = S_IRUGO | S_IWUSR,
--};
--
--static struct configfs_attribute gpiommc_attr_spimode = {
--      .ca_owner = THIS_MODULE,
--      .ca_name = "spi_mode",
--      .ca_mode = S_IRUGO | S_IWUSR,
--};
--
--static struct configfs_attribute gpiommc_attr_spidelay = {
--      .ca_owner = THIS_MODULE,
--      .ca_name = "spi_delay",
--      .ca_mode = S_IRUGO | S_IWUSR,
--};
--
--static struct configfs_attribute gpiommc_attr_max_bus_speed = {
--      .ca_owner = THIS_MODULE,
--      .ca_name = "max_bus_speed",
--      .ca_mode = S_IRUGO | S_IWUSR,
--};
--
--static struct configfs_attribute gpiommc_attr_register = {
--      .ca_owner = THIS_MODULE,
--      .ca_name = "register",
--      .ca_mode = S_IRUGO | S_IWUSR,
--};
--
--static struct configfs_attribute *gpiommc_config_attrs[] = {
--      &gpiommc_attr_DI,
--      &gpiommc_attr_DO,
--      &gpiommc_attr_CLK,
--      &gpiommc_attr_CS,
--      &gpiommc_attr_CS_activelow,
--      &gpiommc_attr_spimode,
--      &gpiommc_attr_spidelay,
--      &gpiommc_attr_max_bus_speed,
--      &gpiommc_attr_register,
--      NULL,
--};
--
--static ssize_t gpiommc_config_attr_show(struct config_item *item,
--                                      struct configfs_attribute *attr,
--                                      char *page)
--{
--      struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
--      ssize_t count = 0;
--      unsigned int gpio;
--      int err = 0;
--
--      mutex_lock(&dev->mutex);
--
--      if (attr == &gpiommc_attr_DI) {
--              gpio = dev->pdata.pins.gpio_di;
--              if (gpio == GPIO_INVALID)
--                      count = snprintf(page, PAGE_SIZE, "not configured\n");
--              else
--                      count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
--              goto out;
--      }
--      if (attr == &gpiommc_attr_DO) {
--              gpio = dev->pdata.pins.gpio_do;
--              if (gpio == GPIO_INVALID)
--                      count = snprintf(page, PAGE_SIZE, "not configured\n");
--              else
--                      count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
--              goto out;
--      }
--      if (attr == &gpiommc_attr_CLK) {
--              gpio = dev->pdata.pins.gpio_clk;
--              if (gpio == GPIO_INVALID)
--                      count = snprintf(page, PAGE_SIZE, "not configured\n");
--              else
--                      count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
--              goto out;
--      }
--      if (attr == &gpiommc_attr_CS) {
--              gpio = dev->pdata.pins.gpio_cs;
--              if (gpio == GPIO_INVALID)
--                      count = snprintf(page, PAGE_SIZE, "not configured\n");
--              else
--                      count = snprintf(page, PAGE_SIZE, "%u\n", gpio);
--              goto out;
--      }
--      if (attr == &gpiommc_attr_CS_activelow) {
--              count = snprintf(page, PAGE_SIZE, "%u\n",
--                               dev->pdata.pins.cs_activelow);
--              goto out;
--      }
--      if (attr == &gpiommc_attr_spimode) {
--              count = snprintf(page, PAGE_SIZE, "%u\n",
--                               dev->pdata.mode);
--              goto out;
--      }
--      if (attr == &gpiommc_attr_spidelay) {
--              count = snprintf(page, PAGE_SIZE, "%u\n",
--                               !dev->pdata.no_spi_delay);
--              goto out;
--      }
--      if (attr == &gpiommc_attr_max_bus_speed) {
--              count = snprintf(page, PAGE_SIZE, "%u\n",
--                               dev->pdata.max_bus_speed);
--              goto out;
--      }
--      if (attr == &gpiommc_attr_register) {
--              count = snprintf(page, PAGE_SIZE, "%u\n",
--                               gpiommc_is_registered(dev));
--              goto out;
--      }
--      WARN_ON(1);
--      err = -ENOSYS;
--out:
--      mutex_unlock(&dev->mutex);
--
--      return err ? err : count;
--}
--
--static int gpiommc_do_register(struct gpiommc_configfs_device *dev,
--                             const char *name)
--{
--      int err;
--
--      if (gpiommc_is_registered(dev))
--              return 0;
--
--      if (!gpio_is_valid(dev->pdata.pins.gpio_di) ||
--          !gpio_is_valid(dev->pdata.pins.gpio_do) ||
--          !gpio_is_valid(dev->pdata.pins.gpio_clk) ||
--          !gpio_is_valid(dev->pdata.pins.gpio_cs)) {
--              printk(KERN_ERR PFX
--                     "configfs: Invalid GPIO pin number(s)\n");
--              return -EINVAL;
--      }
--
--      strlcpy(dev->pdata.name, name,
--              sizeof(dev->pdata.name));
--
--      dev->pdev = platform_device_alloc(GPIOMMC_PLATDEV_NAME,
--                                        gpiommc_next_id());
--      if (!dev->pdev)
--              return -ENOMEM;
--      err = platform_device_add_data(dev->pdev, &dev->pdata,
--                                     sizeof(dev->pdata));
--      if (err) {
--              platform_device_put(dev->pdev);
--              return err;
--      }
--      err = platform_device_add(dev->pdev);
--      if (err) {
--              platform_device_put(dev->pdev);
--              return err;
--      }
--
--      return 0;
--}
--
--static void gpiommc_do_unregister(struct gpiommc_configfs_device *dev)
--{
--      if (!gpiommc_is_registered(dev))
--              return;
--
--      platform_device_unregister(dev->pdev);
--      dev->pdev = NULL;
--}
--
--static ssize_t gpiommc_config_attr_store(struct config_item *item,
--                                       struct configfs_attribute *attr,
--                                       const char *page, size_t count)
--{
--      struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
--      int err = -EINVAL;
--      unsigned long data;
--
--      mutex_lock(&dev->mutex);
--
--      if (attr == &gpiommc_attr_register) {
--              err = strict_strtoul(page, 10, &data);
--              if (err)
--                      goto out;
--              err = -EINVAL;
--              if (data == 1)
--                      err = gpiommc_do_register(dev, item->ci_name);
--              if (data == 0) {
--                      gpiommc_do_unregister(dev);
--                      err = 0;
--              }
--              goto out;
--      }
--
--      if (gpiommc_is_registered(dev)) {
--              /* The rest of the config parameters can only be set
--               * as long as the device is not registered, yet. */
--              err = -EBUSY;
--              goto out;
--      }
--
--      if (attr == &gpiommc_attr_DI) {
--              err = strict_strtoul(page, 10, &data);
--              if (err)
--                      goto out;
--              err = -EINVAL;
--              if (!gpio_is_valid(data))
--                      goto out;
--              dev->pdata.pins.gpio_di = data;
--              err = 0;
--              goto out;
--      }
--      if (attr == &gpiommc_attr_DO) {
--              err = strict_strtoul(page, 10, &data);
--              if (err)
--                      goto out;
--              err = -EINVAL;
--              if (!gpio_is_valid(data))
--                      goto out;
--              dev->pdata.pins.gpio_do = data;
--              err = 0;
--              goto out;
--      }
--      if (attr == &gpiommc_attr_CLK) {
--              err = strict_strtoul(page, 10, &data);
--              if (err)
--                      goto out;
--              err = -EINVAL;
--              if (!gpio_is_valid(data))
--                      goto out;
--              dev->pdata.pins.gpio_clk = data;
--              err = 0;
--              goto out;
--      }
--      if (attr == &gpiommc_attr_CS) {
--              err = strict_strtoul(page, 10, &data);
--              if (err)
--                      goto out;
--              err = -EINVAL;
--              if (!gpio_is_valid(data))
--                      goto out;
--              dev->pdata.pins.gpio_cs = data;
--              err = 0;
--              goto out;
--      }
--      if (attr == &gpiommc_attr_CS_activelow) {
--              err = strict_strtoul(page, 10, &data);
--              if (err)
--                      goto out;
--              err = -EINVAL;
--              if (data != 0 && data != 1)
--                      goto out;
--              dev->pdata.pins.cs_activelow = data;
--              err = 0;
--              goto out;
--      }
--      if (attr == &gpiommc_attr_spimode) {
--              err = strict_strtoul(page, 10, &data);
--              if (err)
--                      goto out;
--              err = -EINVAL;
--              switch (data) {
--              case 0:
--                      dev->pdata.mode = SPI_MODE_0;
--                      break;
--              case 1:
--                      dev->pdata.mode = SPI_MODE_1;
--                      break;
--              case 2:
--                      dev->pdata.mode = SPI_MODE_2;
--                      break;
--              case 3:
--                      dev->pdata.mode = SPI_MODE_3;
--                      break;
--              default:
--                      goto out;
--              }
--              err = 0;
--              goto out;
--      }
--      if (attr == &gpiommc_attr_spidelay) {
--              err = strict_strtoul(page, 10, &data);
--              if (err)
--                      goto out;
--              err = -EINVAL;
--              if (data != 0 && data != 1)
--                      goto out;
--              dev->pdata.no_spi_delay = !data;
--              err = 0;
--              goto out;
--      }
--      if (attr == &gpiommc_attr_max_bus_speed) {
--              err = strict_strtoul(page, 10, &data);
--              if (err)
--                      goto out;
--              err = -EINVAL;
--              if (data > UINT_MAX)
--                      goto out;
--              dev->pdata.max_bus_speed = data;
--              err = 0;
--              goto out;
--      }
--      WARN_ON(1);
--      err = -ENOSYS;
--out:
--      mutex_unlock(&dev->mutex);
--
--      return err ? err : count;
--}
--
--static void gpiommc_config_item_release(struct config_item *item)
--{
--      struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
--
--      kfree(dev);
--}
--
--static struct configfs_item_operations gpiommc_config_item_ops = {
--      .release                = gpiommc_config_item_release,
--      .show_attribute         = gpiommc_config_attr_show,
--      .store_attribute        = gpiommc_config_attr_store,
--};
--
--static struct config_item_type gpiommc_dev_ci_type = {
--      .ct_item_ops    = &gpiommc_config_item_ops,
--      .ct_attrs       = gpiommc_config_attrs,
--      .ct_owner       = THIS_MODULE,
--};
--
--static struct config_item *gpiommc_make_item(struct config_group *group,
--                                           const char *name)
--{
--      struct gpiommc_configfs_device *dev;
--
--      if (strlen(name) > GPIOMMC_MAX_NAMELEN) {
--              printk(KERN_ERR PFX "configfs: device name too long\n");
--              return NULL;
--      }
--
--      dev = kzalloc(sizeof(*dev), GFP_KERNEL);
--      if (!dev)
--              return NULL;
--
--      mutex_init(&dev->mutex);
--      config_item_init_type_name(&dev->item, name,
--                                 &gpiommc_dev_ci_type);
--
--      /* Assign default configuration */
--      dev->pdata.pins.gpio_di = GPIO_INVALID;
--      dev->pdata.pins.gpio_do = GPIO_INVALID;
--      dev->pdata.pins.gpio_clk = GPIO_INVALID;
--      dev->pdata.pins.gpio_cs = GPIO_INVALID;
--      dev->pdata.pins.cs_activelow = 1;
--      dev->pdata.mode = SPI_MODE_0;
--      dev->pdata.no_spi_delay = 0;
--      dev->pdata.max_bus_speed = 5000000; /* 5 MHz */
--
--      return &(dev->item);
--}
--
--static void gpiommc_drop_item(struct config_group *group,
--                            struct config_item *item)
--{
--      struct gpiommc_configfs_device *dev = ci_to_gpiommc(item);
--
--      gpiommc_do_unregister(dev);
--      kfree(dev);
--}
--
--static struct configfs_group_operations gpiommc_ct_group_ops = {
--      .make_item      = gpiommc_make_item,
--      .drop_item      = gpiommc_drop_item,
--};
--
--static struct config_item_type gpiommc_ci_type = {
--      .ct_group_ops   = &gpiommc_ct_group_ops,
--      .ct_owner       = THIS_MODULE,
--};
--
--static struct configfs_subsystem gpiommc_subsys = {
--      .su_group = {
--              .cg_item = {
--                      .ci_namebuf = GPIOMMC_PLATDEV_NAME,
--                      .ci_type = &gpiommc_ci_type,
--              },
--      },
--      .su_mutex = __MUTEX_INITIALIZER(gpiommc_subsys.su_mutex),
--};
--
--#endif /* CONFIG_GPIOMMC_CONFIGFS */
--
--static struct platform_driver gpiommc_plat_driver = {
--      .probe  = gpiommc_probe,
--      .remove = gpiommc_remove,
--      .driver = {
--              .name   = GPIOMMC_PLATDEV_NAME,
--              .owner  = THIS_MODULE,
--      },
--};
--
--int gpiommc_next_id(void)
--{
--      static atomic_t counter = ATOMIC_INIT(-1);
--
--      return atomic_inc_return(&counter);
--}
--EXPORT_SYMBOL(gpiommc_next_id);
--
--static int __init gpiommc_modinit(void)
--{
--      int err;
--
--      err = platform_driver_register(&gpiommc_plat_driver);
--      if (err)
--              return err;
--
--#ifdef CONFIG_GPIOMMC_CONFIGFS
--      config_group_init(&gpiommc_subsys.su_group);
--      err = configfs_register_subsystem(&gpiommc_subsys);
--      if (err) {
--              platform_driver_unregister(&gpiommc_plat_driver);
--              return err;
--      }
--#endif /* CONFIG_GPIOMMC_CONFIGFS */
--
--      return 0;
--}
--module_init(gpiommc_modinit);
--
--static void __exit gpiommc_modexit(void)
--{
--#ifdef CONFIG_GPIOMMC_CONFIGFS
--      configfs_unregister_subsystem(&gpiommc_subsys);
--#endif
--      platform_driver_unregister(&gpiommc_plat_driver);
--}
--module_exit(gpiommc_modexit);
-Index: linux-2.6.26/drivers/mmc/host/Kconfig
-===================================================================
---- linux-2.6.26.orig/drivers/mmc/host/Kconfig 2008-12-12 21:55:07.000000000 +0100
-+++ linux-2.6.26/drivers/mmc/host/Kconfig      2008-12-12 21:55:25.000000000 +0100
-@@ -130,27 +130,3 @@ config MMC_SPI
-         If unsure, or if your system has no SPI master driver, say N.
--config GPIOMMC
--      tristate "MMC/SD over GPIO-based SPI"
--      depends on MMC && MMC_SPI && SPI_GPIO
--      help
--        This driver hooks up the mmc_spi and spi_gpio modules so that
--        MMC/SD cards can be used on a GPIO based bus by bitbanging
--        the SPI protocol in software.
--
--        This driver provides a configfs interface to dynamically create
--        and destroy GPIO-based MMC/SD card devices. It also provides
--        a platform device interface API.
--        See Documentation/gpiommc.txt for details.
--
--        The module will be called gpiommc.
--
--        If unsure, say N.
--
--config GPIOMMC_CONFIGFS
--      bool
--      depends on GPIOMMC && CONFIGFS_FS
--      default y
--      help
--        This option automatically enables configfs support for gpiommc
--        if configfs is available.
-Index: linux-2.6.26/drivers/mmc/host/Makefile
-===================================================================
---- linux-2.6.26.orig/drivers/mmc/host/Makefile        2008-12-12 21:55:07.000000000 +0100
-+++ linux-2.6.26/drivers/mmc/host/Makefile     2008-12-12 21:55:25.000000000 +0100
-@@ -17,4 +17,4 @@ obj-$(CONFIG_MMC_OMAP)               += omap.o
- obj-$(CONFIG_MMC_AT91)                += at91_mci.o
- obj-$(CONFIG_MMC_TIFM_SD)     += tifm_sd.o
- obj-$(CONFIG_MMC_SPI)         += mmc_spi.o
--obj-$(CONFIG_GPIOMMC)         += gpiommc.o
-+
-Index: linux-2.6.26/drivers/spi/Kconfig
-===================================================================
---- linux-2.6.26.orig/drivers/spi/Kconfig      2008-12-12 21:55:07.000000000 +0100
-+++ linux-2.6.26/drivers/spi/Kconfig   2008-12-12 21:55:25.000000000 +0100
-@@ -100,19 +100,6 @@ config SPI_BUTTERFLY
-         inexpensive battery powered microcontroller evaluation board.
-         This same cable can be used to flash new firmware.
--config SPI_GPIO
--      tristate "GPIO API based bitbanging SPI controller"
--      depends on SPI_MASTER && GENERIC_GPIO
--      select SPI_BITBANG
--      help
--        This is a platform driver that can be used for bitbanging
--        an SPI bus over GPIO pins.
--        Select this if you have any SPI device that is connected via
--        GPIO pins.
--        The module will be called spi_gpio.
--
--        If unsure, say N.
--
- config SPI_IMX
-       tristate "Freescale iMX SPI controller"
-       depends on SPI_MASTER && ARCH_IMX && EXPERIMENTAL
-Index: linux-2.6.26/drivers/spi/Makefile
-===================================================================
---- linux-2.6.26.orig/drivers/spi/Makefile     2008-12-12 21:55:07.000000000 +0100
-+++ linux-2.6.26/drivers/spi/Makefile  2008-12-12 21:55:25.000000000 +0100
-@@ -16,7 +16,6 @@ obj-$(CONFIG_SPI_BFIN)                       += spi_bfin5xx.
- obj-$(CONFIG_SPI_BITBANG)             += spi_bitbang.o
- obj-$(CONFIG_SPI_AU1550)              += au1550_spi.o
- obj-$(CONFIG_SPI_BUTTERFLY)           += spi_butterfly.o
--obj-$(CONFIG_SPI_GPIO)                        += spi_gpio.o
- obj-$(CONFIG_SPI_IMX)                 += spi_imx.o
- obj-$(CONFIG_SPI_LM70_LLP)            += spi_lm70llp.o
- obj-$(CONFIG_SPI_PXA2XX)              += pxa2xx_spi.o
-Index: linux-2.6.26/drivers/spi/spi_gpio.c
-===================================================================
---- linux-2.6.26.orig/drivers/spi/spi_gpio.c   2008-12-12 21:55:07.000000000 +0100
-+++ /dev/null  1970-01-01 00:00:00.000000000 +0000
-@@ -1,251 +0,0 @@
--/*
-- * Bitbanging SPI bus driver using GPIO API
-- *
-- * Copyright (c) 2008 Piotr Skamruk
-- * Copyright (c) 2008 Michael Buesch
-- *
-- * based on spi_s3c2410_gpio.c
-- *   Copyright (c) 2006 Ben Dooks
-- *   Copyright (c) 2006 Simtec Electronics
-- * and on i2c-gpio.c
-- *   Copyright (C) 2007 Atmel Corporation
-- *
-- * 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/init.h>
--#include <linux/delay.h>
--#include <linux/spinlock.h>
--#include <linux/workqueue.h>
--#include <linux/module.h>
--#include <linux/platform_device.h>
--#include <linux/spi/spi.h>
--#include <linux/spi/spi_bitbang.h>
--#include <linux/spi/spi_gpio.h>
--#include <linux/gpio.h>
--#include <asm/atomic.h>
--
--
--struct spi_gpio {
--      struct spi_bitbang bitbang;
--      struct spi_gpio_platform_data *info;
--      struct platform_device *pdev;
--      struct spi_board_info bi;
--};
--
--
--static inline struct spi_gpio *spidev_to_sg(struct spi_device *dev)
--{
--      return dev->controller_data;
--}
--
--static inline void setsck(struct spi_device *dev, int val)
--{
--      struct spi_gpio *sp = spidev_to_sg(dev);
--      gpio_set_value(sp->info->pin_clk, val ? 1 : 0);
--}
--
--static inline void setmosi(struct spi_device *dev, int val)
--{
--      struct spi_gpio *sp = spidev_to_sg(dev);
--      gpio_set_value(sp->info->pin_mosi, val ? 1 : 0);
--}
--
--static inline u32 getmiso(struct spi_device *dev)
--{
--      struct spi_gpio *sp = spidev_to_sg(dev);
--      return gpio_get_value(sp->info->pin_miso) ? 1 : 0;
--}
--
--static inline void do_spidelay(struct spi_device *dev, unsigned nsecs)
--{
--      struct spi_gpio *sp = spidev_to_sg(dev);
--
--      if (!sp->info->no_spi_delay)
--              ndelay(nsecs);
--}
--
--#define spidelay(nsecs) do {                                  \
--      /* Steal the spi_device pointer from our caller.        \
--       * The bitbang-API should probably get fixed here... */ \
--      do_spidelay(spi, nsecs);                                \
--  } while (0)
--
--#define EXPAND_BITBANG_TXRX
--#include <linux/spi/spi_bitbang.h>
--
--static u32 spi_gpio_txrx_mode0(struct spi_device *spi,
--                             unsigned nsecs, u32 word, u8 bits)
--{
--      return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);
--}
--
--static u32 spi_gpio_txrx_mode1(struct spi_device *spi,
--                             unsigned nsecs, u32 word, u8 bits)
--{
--      return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, bits);
--}
--
--static u32 spi_gpio_txrx_mode2(struct spi_device *spi,
--                             unsigned nsecs, u32 word, u8 bits)
--{
--      return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, bits);
--}
--
--static u32 spi_gpio_txrx_mode3(struct spi_device *spi,
--                             unsigned nsecs, u32 word, u8 bits)
--{
--      return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, bits);
--}
--
--static void spi_gpio_chipselect(struct spi_device *dev, int on)
--{
--      struct spi_gpio *sp = spidev_to_sg(dev);
--
--      if (sp->info->cs_activelow)
--              on = !on;
--      gpio_set_value(sp->info->pin_cs, on ? 1 : 0);
--}
--
--static int spi_gpio_probe(struct platform_device *pdev)
--{
--      struct spi_master *master;
--      struct spi_gpio_platform_data *pdata;
--      struct spi_gpio *sp;
--      struct spi_device *spidev;
--      int err;
--
--      pdata = pdev->dev.platform_data;
--      if (!pdata)
--              return -ENXIO;
--
--      err = -ENOMEM;
--      master = spi_alloc_master(&pdev->dev, sizeof(struct spi_gpio));
--      if (!master)
--              goto err_alloc_master;
--
--      sp = spi_master_get_devdata(master);
--      platform_set_drvdata(pdev, sp);
--      sp->info = pdata;
--
--      err = gpio_request(pdata->pin_clk, "spi_clock");
--      if (err)
--              goto err_request_clk;
--      err = gpio_request(pdata->pin_mosi, "spi_mosi");
--      if (err)
--              goto err_request_mosi;
--      err = gpio_request(pdata->pin_miso, "spi_miso");
--      if (err)
--              goto err_request_miso;
--      err = gpio_request(pdata->pin_cs, "spi_cs");
--      if (err)
--              goto err_request_cs;
--
--      sp->bitbang.master = spi_master_get(master);
--      sp->bitbang.master->bus_num = -1;
--      sp->bitbang.master->num_chipselect = 1;
--      sp->bitbang.chipselect = spi_gpio_chipselect;
--      sp->bitbang.txrx_word[SPI_MODE_0] = spi_gpio_txrx_mode0;
--      sp->bitbang.txrx_word[SPI_MODE_1] = spi_gpio_txrx_mode1;
--      sp->bitbang.txrx_word[SPI_MODE_2] = spi_gpio_txrx_mode2;
--      sp->bitbang.txrx_word[SPI_MODE_3] = spi_gpio_txrx_mode3;
--
--      gpio_direction_output(pdata->pin_clk, 0);
--      gpio_direction_output(pdata->pin_mosi, 0);
--      gpio_direction_output(pdata->pin_cs,
--                            pdata->cs_activelow ? 1 : 0);
--      gpio_direction_input(pdata->pin_miso);
--
--      err = spi_bitbang_start(&sp->bitbang);
--      if (err)
--              goto err_no_bitbang;
--      err = pdata->boardinfo_setup(&sp->bi, master,
--                                   pdata->boardinfo_setup_data);
--      if (err)
--              goto err_bi_setup;
--      sp->bi.controller_data = sp;
--      spidev = spi_new_device(master, &sp->bi);
--      if (!spidev)
--              goto err_new_dev;
--
--      return 0;
--
--err_new_dev:
--err_bi_setup:
--      spi_bitbang_stop(&sp->bitbang);
--err_no_bitbang:
--      spi_master_put(sp->bitbang.master);
--      gpio_free(pdata->pin_cs);
--err_request_cs:
--      gpio_free(pdata->pin_miso);
--err_request_miso:
--      gpio_free(pdata->pin_mosi);
--err_request_mosi:
--      gpio_free(pdata->pin_clk);
--err_request_clk:
--      kfree(master);
--
--err_alloc_master:
--      return err;
--}
--
--static int __devexit spi_gpio_remove(struct platform_device *pdev)
--{
--      struct spi_gpio *sp;
--      struct spi_gpio_platform_data *pdata;
--
--      pdata = pdev->dev.platform_data;
--      sp = platform_get_drvdata(pdev);
--
--      gpio_free(pdata->pin_clk);
--      gpio_free(pdata->pin_mosi);
--      gpio_free(pdata->pin_miso);
--      gpio_free(pdata->pin_cs);
--      spi_bitbang_stop(&sp->bitbang);
--      spi_master_put(sp->bitbang.master);
--
--      return 0;
--}
--
--static struct platform_driver spi_gpio_driver = {
--      .driver         = {
--              .name   = SPI_GPIO_PLATDEV_NAME,
--              .owner  = THIS_MODULE,
--      },
--      .probe          = spi_gpio_probe,
--      .remove         = __devexit_p(spi_gpio_remove),
--};
--
--int spi_gpio_next_id(void)
--{
--      static atomic_t counter = ATOMIC_INIT(-1);
--
--      return atomic_inc_return(&counter);
--}
--EXPORT_SYMBOL(spi_gpio_next_id);
--
--static int __init spi_gpio_init(void)
--{
--      int err;
--
--      err = platform_driver_register(&spi_gpio_driver);
--      if (err)
--              printk(KERN_ERR "spi-gpio: register failed: %d\n", err);
--
--      return err;
--}
--module_init(spi_gpio_init);
--
--static void __exit spi_gpio_exit(void)
--{
--      platform_driver_unregister(&spi_gpio_driver);
--}
--module_exit(spi_gpio_exit);
--
--MODULE_AUTHOR("Piot Skamruk <piotr.skamruk at gmail.com>");
--MODULE_AUTHOR("Michael Buesch");
--MODULE_DESCRIPTION("Platform independent GPIO bitbanging SPI driver");
--MODULE_LICENSE("GPL v2");
-Index: linux-2.6.26/include/linux/mmc/gpiommc.h
-===================================================================
---- linux-2.6.26.orig/include/linux/mmc/gpiommc.h      2008-12-12 21:55:07.000000000 +0100
-+++ /dev/null  1970-01-01 00:00:00.000000000 +0000
-@@ -1,71 +0,0 @@
--/*
-- * Device driver for MMC/SD cards driven over a GPIO bus.
-- *
-- * Copyright (c) 2008 Michael Buesch
-- *
-- * Licensed under the GNU/GPL version 2.
-- */
--#ifndef LINUX_GPIOMMC_H_
--#define LINUX_GPIOMMC_H_
--
--#include <linux/types.h>
--
--
--#define GPIOMMC_MAX_NAMELEN           15
--#define GPIOMMC_MAX_NAMELEN_STR               __stringify(GPIOMMC_MAX_NAMELEN)
--
--/**
-- * struct gpiommc_pins - Hardware pin assignments
-- *
-- * @gpio_di: The GPIO number of the DATA IN pin
-- * @gpio_do: The GPIO number of the DATA OUT pin
-- * @gpio_clk: The GPIO number of the CLOCK pin
-- * @gpio_cs: The GPIO number of the CHIPSELECT pin
-- * @cs_activelow: If true, the chip is considered selected if @gpio_cs is low.
-- */
--struct gpiommc_pins {
--      unsigned int gpio_di;
--      unsigned int gpio_do;
--      unsigned int gpio_clk;
--      unsigned int gpio_cs;
--      bool cs_activelow;
--};
--
--/**
-- * struct gpiommc_platform_data - Platform data for a MMC-over-SPI-GPIO device.
-- *
-- * @name: The unique name string of the device.
-- * @pins: The hardware pin assignments.
-- * @mode: The hardware mode. This is either SPI_MODE_0,
-- *        SPI_MODE_1, SPI_MODE_2 or SPI_MODE_3. See the SPI documentation.
-- * @no_spi_delay: Do not use delays in the lowlevel SPI bitbanging code.
-- *                This is not standards compliant, but may be required for some
-- *                embedded machines to gain reasonable speed.
-- * @max_bus_speed: The maximum speed of the SPI bus, in Hertz.
-- */
--struct gpiommc_platform_data {
--      char name[GPIOMMC_MAX_NAMELEN + 1];
--      struct gpiommc_pins pins;
--      u8 mode;
--      bool no_spi_delay;
--      unsigned int max_bus_speed;
--};
--
--/**
-- * GPIOMMC_PLATDEV_NAME - The platform device name string.
-- *
-- * The name string that has to be used for platform_device_alloc
-- * when allocating a gpiommc device.
-- */
--#define GPIOMMC_PLATDEV_NAME  "gpiommc"
--
--/**
-- * gpiommc_next_id - Get another platform device ID number.
-- *
-- * This returns the next platform device ID number that has to be used
-- * for platform_device_alloc. The ID is opaque and should not be used for
-- * anything else.
-- */
--int gpiommc_next_id(void);
--
--#endif /* LINUX_GPIOMMC_H_ */
-Index: linux-2.6.26/include/linux/spi/spi_gpio.h
-===================================================================
---- linux-2.6.26.orig/include/linux/spi/spi_gpio.h     2008-12-12 21:55:07.000000000 +0100
-+++ /dev/null  1970-01-01 00:00:00.000000000 +0000
-@@ -1,73 +0,0 @@
--/*
-- * spi_gpio interface to platform code
-- *
-- * Copyright (c) 2008 Piotr Skamruk
-- * Copyright (c) 2008 Michael Buesch
-- *
-- * 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 _LINUX_SPI_SPI_GPIO
--#define _LINUX_SPI_SPI_GPIO
--
--#include <linux/types.h>
--#include <linux/spi/spi.h>
--
--
--/**
-- * struct spi_gpio_platform_data - Data definitions for a SPI-GPIO device.
-- *
-- * This structure holds information about a GPIO-based SPI device.
-- *
-- * @pin_clk: The GPIO pin number of the CLOCK pin.
-- *
-- * @pin_miso: The GPIO pin number of the MISO pin.
-- *
-- * @pin_mosi: The GPIO pin number of the MOSI pin.
-- *
-- * @pin_cs: The GPIO pin number of the CHIPSELECT pin.
-- *
-- * @cs_activelow: If true, the chip is selected when the CS line is low.
-- *
-- * @no_spi_delay: If true, no delay is done in the lowlevel bitbanging.
-- *                Note that doing no delay is not standards compliant,
-- *                but it might be needed to speed up transfers on some
-- *                slow embedded machines.
-- *
-- * @boardinfo_setup: This callback is called after the
-- *                   SPI master device was registered, but before the
-- *                   device is registered.
-- * @boardinfo_setup_data: Data argument passed to boardinfo_setup().
-- */
--struct spi_gpio_platform_data {
--      unsigned int pin_clk;
--      unsigned int pin_miso;
--      unsigned int pin_mosi;
--      unsigned int pin_cs;
--      bool cs_activelow;
--      bool no_spi_delay;
--      int (*boardinfo_setup)(struct spi_board_info *bi,
--                             struct spi_master *master,
--                             void *data);
--      void *boardinfo_setup_data;
--};
--
--/**
-- * SPI_GPIO_PLATDEV_NAME - The platform device name string.
-- *
-- * The name string that has to be used for platform_device_alloc
-- * when allocating a spi-gpio device.
-- */
--#define SPI_GPIO_PLATDEV_NAME "spi-gpio"
--
--/**
-- * spi_gpio_next_id - Get another platform device ID number.
-- *
-- * This returns the next platform device ID number that has to be used
-- * for platform_device_alloc. The ID is opaque and should not be used for
-- * anything else.
-- */
--int spi_gpio_next_id(void);
--
--#endif /* _LINUX_SPI_SPI_GPIO */
-Index: linux-2.6.26/MAINTAINERS
-===================================================================
---- linux-2.6.26.orig/MAINTAINERS      2008-12-12 21:55:07.000000000 +0100
-+++ linux-2.6.26/MAINTAINERS   2008-12-12 21:55:25.000000000 +0100
-@@ -1818,11 +1818,6 @@ L:      gigaset307x-common@lists.sourceforge.
- W:    http://gigaset307x.sourceforge.net/
- S:    Maintained
--GPIOMMC DRIVER
--P:    Michael Buesch
--M:    mb@bu3sch.de
--S:    Maintained
--
- HARDWARE MONITORING
- P:    Mark M. Hoffman
- M:    mhoffman@lightlink.com
-@@ -3800,11 +3795,6 @@ L:      cbe-oss-dev@ozlabs.org
- W:    http://www.ibm.com/developerworks/power/cell/
- S:    Supported
--SPI GPIO MASTER DRIVER
--P:    Michael Buesch
--M:    mb@bu3sch.de
--S:    Maintained
--
- STABLE BRANCH:
- P:    Greg Kroah-Hartman
- M:    greg@kroah.com
diff --git a/target/linux/s3c24xx/patches-2.6.26/0500-call-preinit-instead-of-init.patch b/target/linux/s3c24xx/patches-2.6.26/0500-call-preinit-instead-of-init.patch
deleted file mode 100644 (file)
index 7b43ea4..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: linux-2.6.26/init/main.c
-===================================================================
---- linux-2.6.26.orig/init/main.c      2008-12-29 19:55:54.000000000 +0100
-+++ linux-2.6.26/init/main.c   2008-12-29 20:14:45.000000000 +0100
-@@ -827,6 +827,7 @@ static int noinline init_post(void)
-               printk(KERN_WARNING "Failed to execute %s.  Attempting "
-                                       "defaults...\n", execute_command);
-       }
-+      run_init_process("/etc/preinit");
-       run_init_process("/sbin/init");
-       run_init_process("/etc/init");
-       run_init_process("/bin/init");
diff --git a/target/linux/s3c24xx/patches-2.6.26/1001-explicitly-link-notes-section.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1001-explicitly-link-notes-section.patch.patch
deleted file mode 100755 (executable)
index fb9ba11..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0fa9c1c2fe923ca4f36573ca6e6b97e555d0802d Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:10 +0100
-Subject: [PATCH] explicitly-link-notes-section.patch
-
-Since 2.6.23 kbuild produces a 3GB arch/arm/boot/Image because it includes a
-.note.gnu.build-id section at address 0 which is followed by 3GB of 0x00.
-The --build-id option is set in the toplevel Makefile.
-This patch explicitly puts the notes section after the TEXT section.
----
- arch/arm/kernel/vmlinux.lds.S |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
-index 4898bdc..b835564 100644
---- a/arch/arm/kernel/vmlinux.lds.S
-+++ b/arch/arm/kernel/vmlinux.lds.S
-@@ -106,6 +106,8 @@ SECTIONS
-               *(.got)                 /* Global offset table          */
-       }
-+      NOTES
-+
-       RODATA
-       _etext = .;                     /* End of text and rodata section */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1002-gta01-no_nand_partitions.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1002-gta01-no_nand_partitions.patch.patch
deleted file mode 100755 (executable)
index d011ef9..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-From 1ef4af1f96284576aa9b7f4490c791350c99fffd Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:10 +0100
-Subject: [PATCH] gta01-no_nand_partitions.patch
- [PATCH] support mtd NAND commandline partitions for S3C2410
-
-This patch adds support for the mtd NAND core standard method of passing
-partition table information from the bootloader into the kernel by using
-the kernel commandline.
-
-The board specific code can still manually override and provide a fixed
-partition table, so this patch will behave backwards compatible.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
-Acked-byt: Ben Dooks <ben-linux@fluff.org>
----
- drivers/mtd/nand/s3c2410.c |   18 ++++++++++++++++--
- 1 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
-index b34a460..101b6b5 100644
---- a/drivers/mtd/nand/s3c2410.c
-+++ b/drivers/mtd/nand/s3c2410.c
-@@ -566,17 +566,31 @@ static int s3c2410_nand_remove(struct platform_device *pdev)
- }
- #ifdef CONFIG_MTD_PARTITIONS
-+const char *part_probes[] = { "cmdlinepart", NULL };
- static int s3c2410_nand_add_partition(struct s3c2410_nand_info *info,
-                                     struct s3c2410_nand_mtd *mtd,
-                                     struct s3c2410_nand_set *set)
- {
-+      struct mtd_partition *part_info;
-+      int nr_part = 0;
-+
-       if (set == NULL)
-               return add_mtd_device(&mtd->mtd);
--      if (set->nr_partitions > 0 && set->partitions != NULL) {
--              return add_mtd_partitions(&mtd->mtd, set->partitions, set->nr_partitions);
-+      if (set->nr_partitions == 0) {
-+              mtd->mtd.name = set->name;
-+              nr_part = parse_mtd_partitions(&mtd->mtd, part_probes,
-+                                              &part_info, 0);
-+      } else {
-+              if (set->nr_partitions > 0 && set->partitions != NULL) {
-+                      nr_part = set->nr_partitions;
-+                      part_info = set->partitions;
-+              }
-       }
-+      if (nr_part > 0 && part_info)
-+              return add_mtd_partitions(&mtd->mtd, part_info, nr_part);
-+
-       return add_mtd_device(&mtd->mtd);
- }
- #else
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1003-fix-i2c-s3c2410-resume-race.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1003-fix-i2c-s3c2410-resume-race.patch.patch
deleted file mode 100755 (executable)
index 77e6e9c..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-From eb5cadc7ff0e6c3aedfec3323146d7bb6bdfe0f0 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:10 +0100
-Subject: [PATCH] fix-i2c-s3c2410-resume-race.patch
- fix-i2c-s3c2410-resume-race.patch
-
-There is a nasty race between i2c-s3c2410 resume and resume of I2C
-driver and the client drivers -- the watchdog device actually gets to
-use the dead I2C bus before it is reinitialized by the I2C driver
-resume!  This patch makes sure any customers get turned away until
-the shopkeeper has woken up.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/busses/i2c-s3c2410.c |   33 +++++++++++++++++++++++++++++++++
- 1 files changed, 33 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
-index 9e8c875..02459d7 100644
---- a/drivers/i2c/busses/i2c-s3c2410.c
-+++ b/drivers/i2c/busses/i2c-s3c2410.c
-@@ -71,6 +71,8 @@ struct s3c24xx_i2c {
-       struct resource         *irq;
-       struct resource         *ioarea;
-       struct i2c_adapter      adap;
-+
-+      int                     suspended;
- };
- /* default platform data to use if not supplied in the platform_device
-@@ -156,6 +158,14 @@ static inline void s3c24xx_i2c_disable_irq(struct s3c24xx_i2c *i2c)
-       unsigned long tmp;
-       
-       tmp = readl(i2c->regs + S3C2410_IICCON);
-+
-+/* S3c2442 datasheet
-+ *
-+ * If the IICCON[5]=0, IICCON[4] does not operate correctly.
-+ * So, It is recommended that you should set IICCON[5]=1,
-+ * although you does not use the IIC interrupt.
-+ */
-+
-       writel(tmp & ~S3C2410_IICCON_IRQEN, i2c->regs + S3C2410_IICCON);
- }
-@@ -501,6 +511,14 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int
-       unsigned long timeout;
-       int ret;
-+      if (i2c->suspended) {
-+              dev_err(i2c->dev,
-+                  "Hey I am still asleep (suspended: %d), retry later\n",
-+                  i2c->suspended);
-+              ret = -EAGAIN;
-+              goto out;
-+      }
-+
-       ret = s3c24xx_i2c_set_master(i2c);
-       if (ret != 0) {
-               dev_err(i2c->dev, "cannot get bus (error %d)\n", ret);
-@@ -885,6 +903,17 @@ static int s3c24xx_i2c_remove(struct platform_device *pdev)
- }
- #ifdef CONFIG_PM
-+
-+static int s3c24xx_i2c_suspend(struct platform_device *dev, pm_message_t state)
-+{
-+      struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);
-+
-+      if (i2c != NULL)
-+              i2c->suspended++;
-+
-+      return 0;
-+}
-+
- static int s3c24xx_i2c_resume(struct platform_device *dev)
- {
-       struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);
-@@ -892,6 +921,8 @@ static int s3c24xx_i2c_resume(struct platform_device *dev)
-       if (i2c != NULL)
-               s3c24xx_i2c_init(i2c);
-+      i2c->suspended--;
-+
-       return 0;
- }
-@@ -904,6 +935,7 @@ static int s3c24xx_i2c_resume(struct platform_device *dev)
- static struct platform_driver s3c2410_i2c_driver = {
-       .probe          = s3c24xx_i2c_probe,
-       .remove         = s3c24xx_i2c_remove,
-+      .suspend        = s3c24xx_i2c_suspend,
-       .resume         = s3c24xx_i2c_resume,
-       .driver         = {
-               .owner  = THIS_MODULE,
-@@ -914,6 +946,7 @@ static struct platform_driver s3c2410_i2c_driver = {
- static struct platform_driver s3c2440_i2c_driver = {
-       .probe          = s3c24xx_i2c_probe,
-       .remove         = s3c24xx_i2c_remove,
-+      .suspend        = s3c24xx_i2c_suspend,
-       .resume         = s3c24xx_i2c_resume,
-       .driver         = {
-               .owner  = THIS_MODULE,
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1004-resume-timers-wq.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1004-resume-timers-wq.patch.patch
deleted file mode 100755 (executable)
index a67a5fe..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-From 62bc0d984e5c2778e09094ba2e4d885903c6c35b Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:10 +0100
-Subject: [PATCH] resume-timers-wq.patch
- The initialization of clocks uses mutexes, but we execute the resume in
- an interrupt context. We therefore have to hand this task to a non-interrupt.
-
-Adapted from a patch by Andy Green.
----
- arch/arm/plat-s3c24xx/time.c |   18 +++++++++++++++++-
- 1 files changed, 17 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/time.c b/arch/arm/plat-s3c24xx/time.c
-index 766473b..f8d307b 100644
---- a/arch/arm/plat-s3c24xx/time.c
-+++ b/arch/arm/plat-s3c24xx/time.c
-@@ -253,8 +253,24 @@ static void __init s3c2410_timer_init (void)
-       setup_irq(IRQ_TIMER4, &s3c2410_timer_irq);
- }
-+static void s3c2410_timer_resume_work(struct work_struct *work)
-+{
-+      s3c2410_timer_setup();
-+}
-+
-+static void s3c2410_timer_resume(void)
-+{
-+      static DECLARE_WORK(work, s3c2410_timer_resume_work);
-+      int res;
-+
-+      res = schedule_work(&work);
-+      if (!res)
-+              printk(KERN_ERR
-+                  "s3c2410_timer_resume_work already queued ???\n");
-+}
-+
- struct sys_timer s3c24xx_timer = {
-       .init           = s3c2410_timer_init,
-       .offset         = s3c2410_gettimeoffset,
--      .resume         = s3c2410_timer_setup
-+      .resume         = s3c2410_timer_resume,
- };
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1005-s3c2410-bbt.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1005-s3c2410-bbt.patch.patch
deleted file mode 100755 (executable)
index 598c4bb..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-From ee782e877d8c50f3ed775aee8934565699a5fc99 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:10 +0100
-Subject: [PATCH] s3c2410-bbt.patch
- [PATCH] Add Kconfig option to enable NAND bad-block-table support for s3c2410
-
-This patch adds a new CONFIG_MTD_NAND_S3C2410_BBT which, if enabled,
-asks the mtd NAND core to use a bad-block table.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- drivers/mtd/nand/s3c2410.c      |    6 +++++-
- include/asm-arm/plat-s3c/nand.h |    3 +++
- 2 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
-index 101b6b5..cd2e1da 100644
---- a/drivers/mtd/nand/s3c2410.c
-+++ b/drivers/mtd/nand/s3c2410.c
-@@ -619,9 +619,13 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,
-       chip->select_chip  = s3c2410_nand_select_chip;
-       chip->chip_delay   = 50;
-       chip->priv         = nmtd;
--      chip->options      = 0;
-       chip->controller   = &info->controller;
-+      if (set->flags & S3C2410_NAND_BBT)
-+              chip->options      = NAND_USE_FLASH_BBT;
-+      else
-+              chip->options      = 0;
-+
-       switch (info->cpu_type) {
-       case TYPE_S3C2410:
-               chip->IO_ADDR_W = regs + S3C2410_NFDATA;
-diff --git a/include/asm-arm/plat-s3c/nand.h b/include/asm-arm/plat-s3c/nand.h
-index ad6bbe9..54f479e 100644
---- a/include/asm-arm/plat-s3c/nand.h
-+++ b/include/asm-arm/plat-s3c/nand.h
-@@ -21,11 +21,14 @@
-  * partitions  = mtd partition list
- */
-+#define S3C2410_NAND_BBT      0x0001
-+
- struct s3c2410_nand_set {
-       unsigned int            disable_ecc : 1;
-       int                     nr_chips;
-       int                     nr_partitions;
-+      unsigned int            flags;
-       char                    *name;
-       int                     *nr_map;
-       struct mtd_partition    *partitions;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1006-gta01-pcf50606.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1006-gta01-pcf50606.patch.patch
deleted file mode 100755 (executable)
index 6b99dfb..0000000
+++ /dev/null
@@ -1,2443 +0,0 @@
-From cb7ab7ce6ad690be5f71bde73a9369d3640985e8 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:11 +0100
-Subject: [PATCH] gta01-pcf50606.patch
- This is a NXP PCF50606 power management unit driver.
-
-The PCF50606 is used in the FIC/OpenMoko Neo1973 GTA01 GSM phone.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- drivers/i2c/chips/Kconfig    |   11 +
- drivers/i2c/chips/Makefile   |    1 +
- drivers/i2c/chips/pcf50606.c | 1945 ++++++++++++++++++++++++++++++++++++++++++
- drivers/i2c/chips/pcf50606.h |  302 +++++++
- include/linux/i2c-id.h       |    1 +
- include/linux/pcf50606.h     |  108 +++
- 6 files changed, 2368 insertions(+), 0 deletions(-)
- create mode 100644 drivers/i2c/chips/pcf50606.c
- create mode 100644 drivers/i2c/chips/pcf50606.h
- create mode 100644 include/linux/pcf50606.h
-
-diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
-index 2da2edf..e8e64aa 100644
---- a/drivers/i2c/chips/Kconfig
-+++ b/drivers/i2c/chips/Kconfig
-@@ -25,6 +25,17 @@ config SENSORS_EEPROM
-         This driver can also be built as a module.  If so, the module
-         will be called eeprom.
-+config SENSORS_PCF50606
-+      tristate "Philips/NXP PCF50606"
-+      depends on I2C
-+      help
-+        If you say yes here you get support for Philips/NXP PCF50606
-+        PMU (Power Management Unit) chips.
-+
-+        This driver can also be built as a module.  If so, the module
-+        will be called pcf50606.
-+
-+
- config SENSORS_PCF8574
-       tristate "Philips PCF8574 and PCF8574A"
-       depends on EXPERIMENTAL
-diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
-index e47aca0..60d3d5a 100644
---- a/drivers/i2c/chips/Makefile
-+++ b/drivers/i2c/chips/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_DS1682)         += ds1682.o
- obj-$(CONFIG_SENSORS_EEPROM)  += eeprom.o
- obj-$(CONFIG_SENSORS_MAX6875) += max6875.o
- obj-$(CONFIG_SENSORS_PCA9539) += pca9539.o
-+obj-$(CONFIG_SENSORS_PCF50606)        += pcf50606.o
- obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o
- obj-$(CONFIG_PCF8575)         += pcf8575.o
- obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o
-diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
-new file mode 100644
-index 0000000..6626c68
---- /dev/null
-+++ b/drivers/i2c/chips/pcf50606.c
-@@ -0,0 +1,1945 @@
-+/* Philips/NXP PCF50606 Power Management Unit (PMU) driver
-+ *
-+ * (C) 2006-2007 by OpenMoko, Inc.
-+ * Authors: Harald Welte <laforge@openmoko.org>,
-+ *        Matt Hsu <matt@openmoko.org>
-+ * 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
-+ *
-+ * This driver is a monster ;) It provides the following features
-+ * - voltage control for a dozen different voltage domains
-+ * - charging control for main and backup battery
-+ * - rtc / alarm
-+ * - watchdog
-+ * - adc driver (hw_sensors like)
-+ * - pwm driver
-+ * - backlight
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/i2c.h>
-+#include <linux/types.h>
-+#include <linux/interrupt.h>
-+#include <linux/irq.h>
-+#include <linux/workqueue.h>
-+#include <linux/rtc.h>
-+#include <linux/bcd.h>
-+#include <linux/watchdog.h>
-+#include <linux/miscdevice.h>
-+#include <linux/input.h>
-+#include <linux/fb.h>
-+#include <linux/backlight.h>
-+#include <linux/sched.h>
-+#include <linux/platform_device.h>
-+#include <linux/pcf50606.h>
-+#include <linux/apm-emulation.h>
-+
-+#include <asm/mach-types.h>
-+#include <asm/arch/gta01.h>
-+
-+#include "pcf50606.h"
-+
-+/* we use dev_dbg() throughout the code, but sometimes don't want to
-+ * write an entire line of debug related information.  This DEBUGPC
-+ * macro is a continuation for dev_dbg() */
-+#ifdef DEBUG
-+#define DEBUGPC(x, args ...) printk(x, ## args)
-+#else
-+#define DEBUGPC(x, args ...)
-+#endif
-+
-+/***********************************************************************
-+ * Static data / structures
-+ ***********************************************************************/
-+
-+static unsigned short normal_i2c[] = { 0x08, I2C_CLIENT_END };
-+
-+I2C_CLIENT_INSMOD_1(pcf50606);
-+
-+#define PCF50606_F_CHG_FAST   0x00000001      /* Charger Fast allowed */
-+#define PCF50606_F_CHG_PRESENT        0x00000002      /* Charger present */
-+#define PCF50606_F_CHG_FOK    0x00000004      /* Fast OK for battery */
-+#define PCF50606_F_CHG_ERR    0x00000008      /* Charger Error */
-+#define PCF50606_F_CHG_PROT   0x00000010      /* Charger Protection */
-+#define PCF50606_F_CHG_READY  0x00000020      /* Charging completed */
-+#define PCF50606_F_CHG_MASK   0x000000fc
-+
-+#define PCF50606_F_PWR_PRESSED        0x00000100
-+#define PCF50606_F_RTC_SECOND 0x00000200
-+
-+enum close_state {
-+      CLOSE_STATE_NOT,
-+      CLOSE_STATE_ALLOW = 0x2342,
-+};
-+
-+struct pcf50606_data {
-+      struct i2c_client client;
-+      struct pcf50606_platform_data *pdata;
-+      struct backlight_device *backlight;
-+      struct mutex lock;
-+      unsigned int flags;
-+      unsigned int working;
-+      struct mutex working_lock;
-+      struct work_struct work;
-+      struct rtc_device *rtc;
-+      struct input_dev *input_dev;
-+      int allow_close;
-+      int onkey_seconds;
-+      int irq;
-+#ifdef CONFIG_PM
-+      struct {
-+              u_int8_t dcdc1, dcdc2;
-+              u_int8_t dcdec1;
-+              u_int8_t dcudc1;
-+              u_int8_t ioregc;
-+              u_int8_t d1regc1;
-+              u_int8_t d2regc1;
-+              u_int8_t d3regc1;
-+              u_int8_t lpregc1;
-+              u_int8_t adcc1, adcc2;
-+              u_int8_t pwmc1;
-+              u_int8_t int1m, int2m, int3m;
-+      } standby_regs;
-+#endif
-+};
-+
-+static struct i2c_driver pcf50606_driver;
-+
-+/* This is an ugly construct on how to access the (currently single/global)
-+ * pcf50606 handle from other code in the kernel.  I didn't really come up with
-+ * a more decent method of dynamically resolving this */
-+struct pcf50606_data *pcf50606_global;
-+EXPORT_SYMBOL_GPL(pcf50606_global);
-+
-+static struct platform_device *pcf50606_pdev;
-+
-+/* This is a 10k, B=3370 NTC Thermistor -10..79 centigrade */
-+/* Table entries are offset by +0.5C so a properly rounded value is generated */
-+static const u_int16_t ntc_table_10k_3370B[] = {
-+      /* -10 */
-+      43888, 41819, 39862, 38010, 36257, 34596, 33024, 31534, 30121, 28781,
-+      27510, 26304, 25159, 24071, 23038, 22056, 21122, 20234, 19390, 18586,
-+      17821, 17093, 16399, 15738, 15107, 14506, 13933, 13387, 12865, 12367,
-+      11891, 11437, 11003, 10588, 10192, 9813, 9450, 9103, 8771, 8453,
-+      8149, 7857, 7578, 7310, 7054, 6808, 6572, 6346, 6129, 5920,
-+      5720, 5528, 5344, 5167, 4996, 4833, 4675, 4524, 4379, 4239,
-+      4104, 3975, 3850, 3730, 3614, 3503, 3396, 3292, 3193, 3097,
-+      3004, 2915, 2829, 2745, 2665, 2588, 2513, 2441, 2371, 2304,
-+      2239, 2176, 2116, 2057, 2000, 1945, 1892, 1841, 1791, 1743,
-+};
-+
-+
-+/***********************************************************************
-+ * Low-Level routines
-+ ***********************************************************************/
-+
-+static inline int __reg_write(struct pcf50606_data *pcf, u_int8_t reg,
-+                            u_int8_t val)
-+{
-+      return i2c_smbus_write_byte_data(&pcf->client, reg, val);
-+}
-+
-+static int reg_write(struct pcf50606_data *pcf, u_int8_t reg, u_int8_t val)
-+{
-+      int ret;
-+
-+      mutex_lock(&pcf->lock);
-+      ret = __reg_write(pcf, reg, val);
-+      mutex_unlock(&pcf->lock);
-+
-+      return ret;
-+}
-+
-+static inline int32_t __reg_read(struct pcf50606_data *pcf, u_int8_t reg)
-+{
-+      int32_t ret;
-+
-+      ret = i2c_smbus_read_byte_data(&pcf->client, reg);
-+
-+      return ret;
-+}
-+
-+static u_int8_t reg_read(struct pcf50606_data *pcf, u_int8_t reg)
-+{
-+      int32_t ret;
-+
-+      mutex_lock(&pcf->lock);
-+      ret = __reg_read(pcf, reg);
-+      mutex_unlock(&pcf->lock);
-+
-+      return ret & 0xff;
-+}
-+
-+static int reg_set_bit_mask(struct pcf50606_data *pcf,
-+                          u_int8_t reg, u_int8_t mask, u_int8_t val)
-+{
-+      int ret;
-+      u_int8_t tmp;
-+
-+      val &= mask;
-+
-+      mutex_lock(&pcf->lock);
-+
-+      tmp = __reg_read(pcf, reg);
-+      tmp &= ~mask;
-+      tmp |= val;
-+      ret = __reg_write(pcf, reg, tmp);
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      return ret;
-+}
-+
-+static int reg_clear_bits(struct pcf50606_data *pcf, u_int8_t reg, u_int8_t val)
-+{
-+      int ret;
-+      u_int8_t tmp;
-+
-+      mutex_lock(&pcf->lock);
-+
-+      tmp = __reg_read(pcf, reg);
-+      tmp &= ~val;
-+      ret = __reg_write(pcf, reg, tmp);
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      return ret;
-+}
-+
-+/* synchronously read one ADC channel (busy-wait for result to be complete) */
-+static u_int16_t adc_read(struct pcf50606_data *pcf,  int channel,
-+                        u_int16_t *data2)
-+{
-+      u_int8_t adcs2, adcs1;
-+      u_int16_t ret;
-+
-+      dev_dbg(&pcf->client.dev, "entering (pcf=%p, channel=%u, data2=%p)\n",
-+              pcf, channel, data2);
-+
-+      channel &= PCF50606_ADCC2_ADCMUX_MASK;
-+
-+      mutex_lock(&pcf->lock);
-+
-+      /* start ADC conversion of selected channel */
-+      __reg_write(pcf, PCF50606_REG_ADCC2, channel |
-+                  PCF50606_ADCC2_ADCSTART | PCF50606_ADCC2_RES_10BIT);
-+
-+      do {
-+              adcs2 = __reg_read(pcf, PCF50606_REG_ADCS2);
-+      } while (!(adcs2 & PCF50606_ADCS2_ADCRDY));
-+
-+      adcs1 = __reg_read(pcf, PCF50606_REG_ADCS1);
-+      ret = (adcs1 << 2) | (adcs2 & 0x03);
-+
-+      if (data2) {
-+              adcs1 = __reg_read(pcf, PCF50606_REG_ADCS3);
-+              *data2 = (adcs1 << 2) | ((adcs2 & 0x0c) >> 2);
-+      }
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      dev_dbg(&pcf->client.dev, "returning %u %u\n", ret,
-+              data2 ? *data2 : 0);
-+
-+      return ret;
-+}
-+
-+/***********************************************************************
-+ * Voltage / ADC
-+ ***********************************************************************/
-+
-+static u_int8_t dcudc_voltage(unsigned int millivolts)
-+{
-+      if (millivolts < 900)
-+              return 0;
-+      if (millivolts > 5500)
-+              return 0x1f;
-+      if (millivolts <= 3300) {
-+              millivolts -= 900;
-+              return millivolts/300;
-+      }
-+      if (millivolts < 4000)
-+              return 0x0f;
-+      else {
-+              millivolts -= 4000;
-+              return millivolts/100;
-+      }
-+}
-+
-+static unsigned int dcudc_2voltage(u_int8_t bits)
-+{
-+      bits &= 0x1f;
-+      if (bits < 0x08)
-+              return 900 + bits * 300;
-+      else if (bits < 0x10)
-+              return 3300;
-+      else
-+              return 4000 + bits * 100;
-+}
-+
-+static u_int8_t dcdec_voltage(unsigned int millivolts)
-+{
-+      if (millivolts < 900)
-+              return 0;
-+      else if (millivolts > 3300)
-+              return 0x0f;
-+
-+      millivolts -= 900;
-+      return millivolts/300;
-+}
-+
-+static unsigned int dcdec_2voltage(u_int8_t bits)
-+{
-+      bits &= 0x0f;
-+      return 900 + bits*300;
-+}
-+
-+static u_int8_t dcdc_voltage(unsigned int millivolts)
-+{
-+      if (millivolts < 900)
-+              return 0;
-+      else if (millivolts > 3600)
-+              return 0x1f;
-+
-+      if (millivolts < 1500) {
-+              millivolts -= 900;
-+              return millivolts/25;
-+      } else {
-+              millivolts -= 1500;
-+              return 0x18 + millivolts/300;
-+      }
-+}
-+
-+static unsigned int dcdc_2voltage(u_int8_t bits)
-+{
-+      bits &= 0x1f;
-+      if ((bits & 0x18) == 0x18)
-+              return 1500 + ((bits & 0x7) * 300);
-+      else
-+              return 900 + (bits * 25);
-+}
-+
-+static u_int8_t dx_voltage(unsigned int millivolts)
-+{
-+      if (millivolts < 900)
-+              return 0;
-+      else if (millivolts > 3300)
-+              return 0x18;
-+
-+      millivolts -= 900;
-+      return millivolts/100;
-+}
-+
-+static unsigned int dx_2voltage(u_int8_t bits)
-+{
-+      bits &= 0x1f;
-+      return 900 + (bits * 100);
-+}
-+
-+static const u_int8_t regulator_registers[__NUM_PCF50606_REGULATORS] = {
-+      [PCF50606_REGULATOR_DCD]        = PCF50606_REG_DCDC1,
-+      [PCF50606_REGULATOR_DCDE]       = PCF50606_REG_DCDEC1,
-+      [PCF50606_REGULATOR_DCUD]       = PCF50606_REG_DCUDC1,
-+      [PCF50606_REGULATOR_D1REG]      = PCF50606_REG_D1REGC1,
-+      [PCF50606_REGULATOR_D2REG]      = PCF50606_REG_D2REGC1,
-+      [PCF50606_REGULATOR_D3REG]      = PCF50606_REG_D3REGC1,
-+      [PCF50606_REGULATOR_LPREG]      = PCF50606_REG_LPREGC1,
-+      [PCF50606_REGULATOR_IOREG]      = PCF50606_REG_IOREGC,
-+};
-+
-+int pcf50606_onoff_set(struct pcf50606_data *pcf,
-+                     enum pcf50606_regulator_id reg, int on)
-+{
-+      u_int8_t addr;
-+
-+      if (reg >= __NUM_PCF50606_REGULATORS)
-+              return -EINVAL;
-+
-+      /* IOREG cannot be powered off since it powers the PMU I2C */
-+      if (reg == PCF50606_REGULATOR_IOREG)
-+              return -EIO;
-+
-+      addr = regulator_registers[reg];
-+
-+      if (on == 0)
-+              reg_set_bit_mask(pcf, addr, 0xe0, 0x00);
-+      else
-+              reg_set_bit_mask(pcf, addr, 0xe0, 0xe0);
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(pcf50606_onoff_set);
-+
-+int pcf50606_onoff_get(struct pcf50606_data *pcf,
-+                     enum pcf50606_regulator_id reg)
-+{
-+      u_int8_t val, addr;
-+
-+      if (reg >= __NUM_PCF50606_REGULATORS)
-+              return -EINVAL;
-+
-+      addr = regulator_registers[reg];
-+      val = (reg_read(pcf, addr) & 0xe0) >> 5;
-+
-+      /* PWREN1 = 1, PWREN2 = 1, see table 16 of datasheet */
-+      switch (val) {
-+      case 0:
-+      case 5:
-+              return 0;
-+      default:
-+              return 1;
-+      }
-+}
-+EXPORT_SYMBOL_GPL(pcf50606_onoff_get);
-+
-+int pcf50606_voltage_set(struct pcf50606_data *pcf,
-+                       enum pcf50606_regulator_id reg,
-+                       unsigned int millivolts)
-+{
-+      u_int8_t volt_bits;
-+      u_int8_t regnr;
-+      int rc;
-+
-+      dev_dbg(&pcf->client.dev, "pcf=%p, reg=%d, mvolts=%d\n", pcf, reg,
-+              millivolts);
-+
-+      if (reg >= __NUM_PCF50606_REGULATORS)
-+              return -EINVAL;
-+
-+      if (millivolts > pcf->pdata->rails[reg].voltage.max)
-+              return -EINVAL;
-+
-+      switch (reg) {
-+      case PCF50606_REGULATOR_DCD:
-+              volt_bits = dcdc_voltage(millivolts);
-+              rc = reg_set_bit_mask(pcf, PCF50606_REG_DCDC1, 0x1f,
-+                                    volt_bits);
-+              break;
-+      case PCF50606_REGULATOR_DCDE:
-+              volt_bits = dcdec_voltage(millivolts);
-+              rc = reg_set_bit_mask(pcf, PCF50606_REG_DCDEC1, 0x0f,
-+                                    volt_bits);
-+              break;
-+      case PCF50606_REGULATOR_DCUD:
-+              volt_bits = dcudc_voltage(millivolts);
-+              rc = reg_set_bit_mask(pcf, PCF50606_REG_DCUDC1, 0x1f,
-+                                    volt_bits);
-+              break;
-+      case PCF50606_REGULATOR_D1REG:
-+      case PCF50606_REGULATOR_D2REG:
-+      case PCF50606_REGULATOR_D3REG:
-+              regnr = PCF50606_REG_D1REGC1 + (reg - PCF50606_REGULATOR_D1REG);
-+              volt_bits = dx_voltage(millivolts);
-+              rc = reg_set_bit_mask(pcf, regnr, 0x1f, volt_bits);
-+              break;
-+      case PCF50606_REGULATOR_LPREG:
-+              volt_bits = dx_voltage(millivolts);
-+              rc = reg_set_bit_mask(pcf, PCF50606_REG_LPREGC1, 0x1f,
-+                                    volt_bits);
-+              break;
-+      case PCF50606_REGULATOR_IOREG:
-+              if (millivolts < 1800)
-+                      return -EINVAL;
-+              volt_bits = dx_voltage(millivolts);
-+              rc = reg_set_bit_mask(pcf, PCF50606_REG_IOREGC, 0x1f,
-+                                    volt_bits);
-+              break;
-+      default:
-+              return -EINVAL;
-+      }
-+
-+      return rc;
-+}
-+EXPORT_SYMBOL_GPL(pcf50606_voltage_set);
-+
-+unsigned int pcf50606_voltage_get(struct pcf50606_data *pcf,
-+                       enum pcf50606_regulator_id reg)
-+{
-+      u_int8_t volt_bits;
-+      u_int8_t regnr;
-+      unsigned int rc = 0;
-+
-+      if (reg >= __NUM_PCF50606_REGULATORS)
-+              return -EINVAL;
-+
-+      switch (reg) {
-+      case PCF50606_REGULATOR_DCD:
-+              volt_bits = reg_read(pcf, PCF50606_REG_DCDC1) & 0x1f;
-+              rc = dcdc_2voltage(volt_bits);
-+              break;
-+      case PCF50606_REGULATOR_DCDE:
-+              volt_bits = reg_read(pcf, PCF50606_REG_DCDEC1) & 0x0f;
-+              rc = dcdec_2voltage(volt_bits);
-+              break;
-+      case PCF50606_REGULATOR_DCUD:
-+              volt_bits = reg_read(pcf, PCF50606_REG_DCUDC1) & 0x1f;
-+              rc = dcudc_2voltage(volt_bits);
-+              break;
-+      case PCF50606_REGULATOR_D1REG:
-+      case PCF50606_REGULATOR_D2REG:
-+      case PCF50606_REGULATOR_D3REG:
-+              regnr = PCF50606_REG_D1REGC1 + (reg - PCF50606_REGULATOR_D1REG);
-+              volt_bits = reg_read(pcf, regnr) & 0x1f;
-+              if (volt_bits > 0x18)
-+                      volt_bits = 0x18;
-+              rc = dx_2voltage(volt_bits);
-+              break;
-+      case PCF50606_REGULATOR_LPREG:
-+              volt_bits = reg_read(pcf, PCF50606_REG_LPREGC1) & 0x1f;
-+              if (volt_bits > 0x18)
-+                      volt_bits = 0x18;
-+              rc = dx_2voltage(volt_bits);
-+              break;
-+      case PCF50606_REGULATOR_IOREG:
-+              volt_bits = reg_read(pcf, PCF50606_REG_IOREGC) & 0x1f;
-+              if (volt_bits > 0x18)
-+                      volt_bits = 0x18;
-+              rc = dx_2voltage(volt_bits);
-+              break;
-+      default:
-+              return -EINVAL;
-+      }
-+
-+      return rc;
-+}
-+EXPORT_SYMBOL_GPL(pcf50606_voltage_get);
-+
-+/* go into 'STANDBY' mode, i.e. power off the main CPU and peripherals */
-+void pcf50606_go_standby(void)
-+{
-+      reg_write(pcf50606_global, PCF50606_REG_OOCC1,
-+                PCF50606_OOCC1_GOSTDBY);
-+}
-+EXPORT_SYMBOL_GPL(pcf50606_go_standby);
-+
-+void pcf50606_gpo0_set(struct pcf50606_data *pcf, int on)
-+{
-+      u_int8_t val;
-+
-+      if (on)
-+              val = 0x07;
-+      else
-+              val = 0x0f;
-+
-+      reg_set_bit_mask(pcf, PCF50606_REG_GPOC1, 0x0f, val);
-+}
-+EXPORT_SYMBOL_GPL(pcf50606_gpo0_set);
-+
-+int pcf50606_gpo0_get(struct pcf50606_data *pcf)
-+{
-+      u_int8_t reg = reg_read(pcf, PCF50606_REG_GPOC1) & 0x0f;
-+
-+      if (reg == 0x07 || reg == 0x08)
-+              return 1;
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(pcf50606_gpo0_get);
-+
-+static void pcf50606_work(struct work_struct *work)
-+{
-+      struct pcf50606_data *pcf =
-+                      container_of(work, struct pcf50606_data, work);
-+      u_int8_t pcfirq[3];
-+      int ret;
-+
-+      mutex_lock(&pcf->working_lock);
-+      pcf->working = 1;
-+      /*
-+       * p35 pcf50606 datasheet rev 2.2:
-+       * ''The system controller shall read all interrupt registers in
-+       *   one I2C read action''
-+       * because if you don't INT# gets stuck asserted forever after a
-+       * while
-+       */
-+      ret = i2c_smbus_read_i2c_block_data(&pcf->client, PCF50606_REG_INT1, 3,
-+                                          pcfirq);
-+      if (ret != 3)
-+              DEBUGPC("Oh crap PMU IRQ register read failed %d\n", ret);
-+
-+      dev_dbg(&pcf->client.dev, "INT1=0x%02x INT2=0x%02x INT3=0x%02x:",
-+              pcfirq[0], pcfirq[1], pcfirq[2]);
-+
-+      if (pcfirq[0] & PCF50606_INT1_ONKEYF) {
-+              /* ONKEY falling edge (start of button press) */
-+              DEBUGPC("ONKEYF ");
-+              pcf->flags |= PCF50606_F_PWR_PRESSED;
-+              input_report_key(pcf->input_dev, KEY_POWER, 1);
-+      }
-+      if (pcfirq[0] & PCF50606_INT1_ONKEY1S) {
-+              /* ONKEY pressed for more than 1 second */
-+              pcf->onkey_seconds = 0;
-+              DEBUGPC("ONKEY1S ");
-+              /* Tell PMU we are taking care of this */
-+              reg_set_bit_mask(pcf, PCF50606_REG_OOCC1,
-+                               PCF50606_OOCC1_TOTRST,
-+                               PCF50606_OOCC1_TOTRST);
-+              /* enable SECOND interrupt (hz tick) */
-+              reg_clear_bits(pcf, PCF50606_REG_INT1M, PCF50606_INT1_SECOND);
-+      }
-+      if (pcfirq[0] & PCF50606_INT1_ONKEYR) {
-+              /* ONKEY rising edge (end of button press) */
-+              DEBUGPC("ONKEYR ");
-+              pcf->flags &= ~PCF50606_F_PWR_PRESSED;
-+              pcf->onkey_seconds = -1;
-+              input_report_key(pcf->input_dev, KEY_POWER, 0);
-+              /* disable SECOND interrupt in case RTC didn't
-+               * request it */
-+              if (!(pcf->flags & PCF50606_F_RTC_SECOND))
-+                      reg_set_bit_mask(pcf, PCF50606_REG_INT1M,
-+                                       PCF50606_INT1_SECOND,
-+                                       PCF50606_INT1_SECOND);
-+      }
-+      if (pcfirq[0] & PCF50606_INT1_EXTONR) {
-+              DEBUGPC("EXTONR ");
-+              input_report_key(pcf->input_dev, KEY_POWER2, 1);
-+      }
-+      if (pcfirq[0] & PCF50606_INT1_EXTONF) {
-+              DEBUGPC("EXTONF ");
-+              input_report_key(pcf->input_dev, KEY_POWER2, 0);
-+      }
-+      if (pcfirq[0] & PCF50606_INT1_SECOND) {
-+              DEBUGPC("SECOND ");
-+              if (pcf->flags & PCF50606_F_RTC_SECOND)
-+                      rtc_update_irq(pcf->rtc, 1,
-+                                     RTC_PF | RTC_IRQF);
-+
-+              if (pcf->onkey_seconds >= 0 &&
-+                  pcf->flags & PCF50606_F_PWR_PRESSED) {
-+                      DEBUGPC("ONKEY_SECONDS(%u, OOCC1=0x%02x) ",
-+                              pcf->onkey_seconds,
-+                              reg_read(pcf, PCF50606_REG_OOCC1));
-+                      pcf->onkey_seconds++;
-+                      if (pcf->onkey_seconds >=
-+                          pcf->pdata->onkey_seconds_required) {
-+                              /* Ask init to do 'ctrlaltdel' */
-+                              DEBUGPC("SIGINT(init) ");
-+                              kill_proc(1, SIGINT, 1);
-+                              /* FIXME: what to do if userspace doesn't
-+                               * shut down? Do we want to force it? */
-+                      }
-+              }
-+      }
-+      if (pcfirq[0] & PCF50606_INT1_ALARM) {
-+              DEBUGPC("ALARM ");
-+              if (pcf->pdata->used_features & PCF50606_FEAT_RTC)
-+                      rtc_update_irq(pcf->rtc, 1,
-+                                     RTC_AF | RTC_IRQF);
-+      }
-+
-+      if (pcfirq[1] & PCF50606_INT2_CHGINS) {
-+              /* Charger inserted */
-+              DEBUGPC("CHGINS ");
-+              input_report_key(pcf->input_dev, KEY_BATTERY, 1);
-+              apm_queue_event(APM_POWER_STATUS_CHANGE);
-+              pcf->flags |= PCF50606_F_CHG_PRESENT;
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50606_FEAT_MBC, PMU_EVT_INSERT);
-+              /* FIXME: how to signal this to userspace */
-+      }
-+      if (pcfirq[1] & PCF50606_INT2_CHGRM) {
-+              /* Charger removed */
-+              DEBUGPC("CHGRM ");
-+              input_report_key(pcf->input_dev, KEY_BATTERY, 0);
-+              apm_queue_event(APM_POWER_STATUS_CHANGE);
-+              pcf->flags &= ~(PCF50606_F_CHG_MASK|PCF50606_F_CHG_PRESENT);
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50606_FEAT_MBC, PMU_EVT_INSERT);
-+              /* FIXME: how signal this to userspace */
-+      }
-+      if (pcfirq[1] & PCF50606_INT2_CHGFOK) {
-+              /* Battery ready for fast charging */
-+              DEBUGPC("CHGFOK ");
-+              pcf->flags |= PCF50606_F_CHG_FOK;
-+              /* FIXME: how to signal this to userspace */
-+      }
-+      if (pcfirq[1] & PCF50606_INT2_CHGERR) {
-+              /* Error in charge mode */
-+              DEBUGPC("CHGERR ");
-+              pcf->flags |= PCF50606_F_CHG_ERR;
-+              pcf->flags &= ~(PCF50606_F_CHG_FOK|PCF50606_F_CHG_READY);
-+              /* FIXME: how to signal this to userspace */
-+      }
-+      if (pcfirq[1] & PCF50606_INT2_CHGFRDY) {
-+              /* Fast charge completed */
-+              DEBUGPC("CHGFRDY ");
-+              pcf->flags |= PCF50606_F_CHG_READY;
-+              pcf->flags &= ~PCF50606_F_CHG_FOK;
-+              /* FIXME: how to signal this to userspace */
-+      }
-+      if (pcfirq[1] & PCF50606_INT2_CHGPROT) {
-+              /* Charging protection interrupt */
-+              DEBUGPC("CHGPROT ");
-+              pcf->flags &= ~(PCF50606_F_CHG_FOK|PCF50606_F_CHG_READY);
-+              /* FIXME: signal this to userspace */
-+      }
-+      if (pcfirq[1] & PCF50606_INT2_CHGWD10S) {
-+              /* Charger watchdog will expire in 10 seconds */
-+              DEBUGPC("CHGWD10S ");
-+              reg_set_bit_mask(pcf, PCF50606_REG_OOCC1,
-+                               PCF50606_OOCC1_WDTRST,
-+                               PCF50606_OOCC1_WDTRST);
-+      }
-+      if (pcfirq[1] & PCF50606_INT2_CHGWDEXP) {
-+              /* Charger watchdog expires */
-+              DEBUGPC("CHGWDEXP ");
-+              /* FIXME: how to signal this to userspace */
-+      }
-+
-+      if (pcfirq[2] & PCF50606_INT3_ADCRDY) {
-+              /* ADC result ready */
-+              DEBUGPC("ADCRDY ");
-+      }
-+      if (pcfirq[2] & PCF50606_INT3_ACDINS) {
-+              /* Accessory insertion detected */
-+              DEBUGPC("ACDINS ");
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50606_FEAT_ACD, PMU_EVT_INSERT);
-+      }
-+      if (pcfirq[2] & PCF50606_INT3_ACDREM) {
-+              /* Accessory removal detected */
-+              DEBUGPC("ACDREM ");
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50606_FEAT_ACD, PMU_EVT_REMOVE);
-+      }
-+      /* FIXME: TSCPRES */
-+      if (pcfirq[2] & PCF50606_INT3_LOWBAT) {
-+              /* Really low battery voltage, we have 8 seconds left */
-+              DEBUGPC("LOWBAT ");
-+              apm_queue_event(APM_LOW_BATTERY);
-+              DEBUGPC("SIGPWR(init) ");
-+              kill_proc(1, SIGPWR, 1);
-+              /* Tell PMU we are taking care of this */
-+              reg_set_bit_mask(pcf, PCF50606_REG_OOCC1,
-+                               PCF50606_OOCC1_TOTRST,
-+                               PCF50606_OOCC1_TOTRST);
-+      }
-+      if (pcfirq[2] & PCF50606_INT3_HIGHTMP) {
-+              /* High temperature */
-+              DEBUGPC("HIGHTMP ");
-+              apm_queue_event(APM_CRITICAL_SUSPEND);
-+      }
-+
-+      DEBUGPC("\n");
-+
-+      pcf->working = 0;
-+      input_sync(pcf->input_dev);
-+      put_device(&pcf->client.dev);
-+      mutex_unlock(&pcf->working_lock);
-+}
-+
-+static irqreturn_t pcf50606_irq(int irq, void *_pcf)
-+{
-+      struct pcf50606_data *pcf = _pcf;
-+
-+      dev_dbg(&pcf->client.dev, "entering(irq=%u, pcf=%p): scheduling work\n",
-+              irq, _pcf);
-+      get_device(&pcf->client.dev);
-+      if (!schedule_work(&pcf->work) && !pcf->working)
-+              dev_dbg(&pcf->client.dev, "work item may be lost\n");
-+
-+      return IRQ_HANDLED;
-+}
-+
-+static u_int16_t adc_to_batt_millivolts(u_int16_t adc)
-+{
-+      u_int16_t mvolts;
-+
-+      mvolts = (adc * 6000) / 1024;
-+
-+      return mvolts;
-+}
-+
-+#define BATTVOLT_SCALE_START 2800
-+#define BATTVOLT_SCALE_END 4200
-+#define BATTVOLT_SCALE_DIVIDER ((BATTVOLT_SCALE_END - BATTVOLT_SCALE_START)/100)
-+
-+static u_int8_t battvolt_scale(u_int16_t battvolt)
-+{
-+      /* FIXME: this linear scale is completely bogus */
-+      u_int16_t battvolt_relative = battvolt - BATTVOLT_SCALE_START;
-+      unsigned int percent = battvolt_relative / BATTVOLT_SCALE_DIVIDER;
-+
-+      return percent;
-+}
-+
-+u_int16_t pcf50606_battvolt(struct pcf50606_data *pcf)
-+{
-+      u_int16_t adc;
-+      adc = adc_read(pcf, PCF50606_ADCMUX_BATVOLT_RES, NULL);
-+
-+      return adc_to_batt_millivolts(adc);
-+}
-+EXPORT_SYMBOL_GPL(pcf50606_battvolt);
-+
-+static ssize_t show_battvolt(struct device *dev, struct device_attribute *attr,
-+                           char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+
-+      return sprintf(buf, "%u\n", pcf50606_battvolt(pcf));
-+}
-+static DEVICE_ATTR(battvolt, S_IRUGO | S_IWUSR, show_battvolt, NULL);
-+
-+static int reg_id_by_name(const char *name)
-+{
-+      int reg_id;
-+
-+      if (!strcmp(name, "voltage_dcd"))
-+              reg_id = PCF50606_REGULATOR_DCD;
-+      else if (!strcmp(name, "voltage_dcde"))
-+              reg_id = PCF50606_REGULATOR_DCDE;
-+      else if (!strcmp(name, "voltage_dcud"))
-+              reg_id = PCF50606_REGULATOR_DCUD;
-+      else if (!strcmp(name, "voltage_d1reg"))
-+              reg_id = PCF50606_REGULATOR_D1REG;
-+      else if (!strcmp(name, "voltage_d2reg"))
-+              reg_id = PCF50606_REGULATOR_D2REG;
-+      else if (!strcmp(name, "voltage_d3reg"))
-+              reg_id = PCF50606_REGULATOR_D3REG;
-+      else if (!strcmp(name, "voltage_lpreg"))
-+              reg_id = PCF50606_REGULATOR_LPREG;
-+      else if (!strcmp(name, "voltage_ioreg"))
-+              reg_id = PCF50606_REGULATOR_IOREG;
-+      else
-+              reg_id = -1;
-+
-+      return reg_id;
-+}
-+
-+static ssize_t show_vreg(struct device *dev, struct device_attribute *attr,
-+                       char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      unsigned int reg_id;
-+
-+      reg_id = reg_id_by_name(attr->attr.name);
-+      if (reg_id < 0)
-+              return 0;
-+
-+      if (pcf50606_onoff_get(pcf, reg_id) > 0)
-+              return sprintf(buf, "%u\n", pcf50606_voltage_get(pcf, reg_id));
-+      else
-+              return strlcpy(buf, "0\n", PAGE_SIZE);
-+}
-+
-+static ssize_t set_vreg(struct device *dev, struct device_attribute *attr,
-+                      const char *buf, size_t count)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      unsigned long mvolts = simple_strtoul(buf, NULL, 10);
-+      unsigned int reg_id;
-+
-+      reg_id = reg_id_by_name(attr->attr.name);
-+      if (reg_id < 0)
-+              return -EIO;
-+
-+      dev_dbg(dev, "attempting to set %s(%d) to %lu mvolts\n",
-+              attr->attr.name, reg_id, mvolts);
-+
-+      if (mvolts == 0) {
-+              pcf50606_onoff_set(pcf, reg_id, 0);
-+      } else {
-+              if (pcf50606_voltage_set(pcf, reg_id, mvolts) < 0) {
-+                      dev_warn(dev, "refusing to set %s(%d) to %lu mvolts "
-+                               "(max=%u)\n", attr->attr.name, reg_id, mvolts,
-+                               pcf->pdata->rails[reg_id].voltage.max);
-+                      return -EINVAL;
-+              }
-+              pcf50606_onoff_set(pcf, reg_id, 1);
-+      }
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(voltage_dcd, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_dcde, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_dcud, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_d1reg, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_d2reg, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_d3reg, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_lpreg, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_ioreg, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+
-+/***********************************************************************
-+ * Charger Control
-+ ***********************************************************************/
-+
-+/* Enable/disable fast charging (500mA in the GTA01) */
-+void pcf50606_charge_fast(struct pcf50606_data *pcf, int on)
-+{
-+      if (!(pcf->pdata->used_features & PCF50606_FEAT_MBC))
-+              return;
-+
-+      if (on) {
-+              /* We can allow PCF to automatically charge
-+               * using Ifast */
-+              pcf->flags |= PCF50606_F_CHG_FAST;
-+              reg_set_bit_mask(pcf, PCF50606_REG_MBCC1,
-+                               PCF50606_MBCC1_AUTOFST,
-+                               PCF50606_MBCC1_AUTOFST);
-+      } else {
-+              pcf->flags &= ~PCF50606_F_CHG_FAST;
-+              /* disable automatic fast-charge */
-+              reg_clear_bits(pcf, PCF50606_REG_MBCC1,
-+                              PCF50606_MBCC1_AUTOFST);
-+              /* switch to idle mode to abort existing charge
-+               * process */
-+              reg_set_bit_mask(pcf, PCF50606_REG_MBCC1,
-+                               PCF50606_MBCC1_CHGMOD_MASK,
-+                               PCF50606_MBCC1_CHGMOD_IDLE);
-+      }
-+}
-+EXPORT_SYMBOL_GPL(pcf50606_charge_fast);
-+
-+static inline u_int16_t adc_to_rntc(struct pcf50606_data *pcf, u_int16_t adc)
-+{
-+      u_int32_t r_ntc = (adc * (u_int32_t)pcf->pdata->r_fix_batt) / (1023 - adc);
-+
-+      return r_ntc;
-+}
-+
-+static inline int16_t rntc_to_temp(u_int16_t rntc)
-+{
-+      int i;
-+
-+      for (i = 0; i < ARRAY_SIZE(ntc_table_10k_3370B); i++) {
-+              if (rntc > ntc_table_10k_3370B[i])
-+                      return i - 10;  /* First element is -10 */
-+      }
-+      return -99;     /* Below our range */
-+}
-+
-+static ssize_t show_battemp(struct device *dev, struct device_attribute *attr,
-+                          char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      u_int16_t adc;
-+
-+      adc = adc_read(pcf, PCF50606_ADCMUX_BATTEMP, NULL);
-+
-+      return sprintf(buf, "%d\n", rntc_to_temp(adc_to_rntc(pcf, adc)));
-+}
-+static DEVICE_ATTR(battemp, S_IRUGO | S_IWUSR, show_battemp, NULL);
-+
-+static inline int16_t adc_to_chg_milliamps(struct pcf50606_data *pcf,
-+                                           u_int16_t adc_adcin1,
-+                                           u_int16_t adc_batvolt)
-+{
-+      int32_t res = (adc_adcin1 - adc_batvolt) * 2400;
-+      return (res * 1000) / (pcf->pdata->r_sense_milli * 1024);
-+}
-+
-+static ssize_t show_chgcur(struct device *dev, struct device_attribute *attr,
-+                         char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      u_int16_t adc_batvolt, adc_adcin1;
-+      int16_t ma;
-+
-+      adc_batvolt = adc_read(pcf, PCF50606_ADCMUX_BATVOLT_ADCIN1,
-+                             &adc_adcin1);
-+      ma = adc_to_chg_milliamps(pcf, adc_adcin1, adc_batvolt);
-+
-+      return sprintf(buf, "%d\n", ma);
-+}
-+static DEVICE_ATTR(chgcur, S_IRUGO | S_IWUSR, show_chgcur, NULL);
-+
-+static const char *chgmode_names[] = {
-+      [PCF50606_MBCC1_CHGMOD_QUAL]            = "qualification",
-+      [PCF50606_MBCC1_CHGMOD_PRE]             = "pre",
-+      [PCF50606_MBCC1_CHGMOD_TRICKLE]         = "trickle",
-+      [PCF50606_MBCC1_CHGMOD_FAST_CCCV]       = "fast_cccv",
-+      [PCF50606_MBCC1_CHGMOD_FAST_NOCC]       = "fast_nocc",
-+      [PCF50606_MBCC1_CHGMOD_FAST_NOCV]       = "fast_nocv",
-+      [PCF50606_MBCC1_CHGMOD_FAST_SW]         = "fast_switch",
-+      [PCF50606_MBCC1_CHGMOD_IDLE]            = "idle",
-+};
-+
-+static ssize_t show_chgmode(struct device *dev, struct device_attribute *attr,
-+                          char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      u_int8_t mbcc1 = reg_read(pcf, PCF50606_REG_MBCC1);
-+      u_int8_t chgmod = (mbcc1 & PCF50606_MBCC1_CHGMOD_MASK);
-+
-+      return sprintf(buf, "%s\n", chgmode_names[chgmod]);
-+}
-+
-+static ssize_t set_chgmode(struct device *dev, struct device_attribute *attr,
-+                         const char *buf, size_t count)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      u_int8_t mbcc1 = reg_read(pcf, PCF50606_REG_MBCC1);
-+
-+      mbcc1 &= ~PCF50606_MBCC1_CHGMOD_MASK;
-+
-+      if (!strcmp(buf, "qualification"))
-+              mbcc1 |= PCF50606_MBCC1_CHGMOD_QUAL;
-+      else if (!strcmp(buf, "pre"))
-+              mbcc1 |= PCF50606_MBCC1_CHGMOD_PRE;
-+      else if (!strcmp(buf, "trickle"))
-+              mbcc1 |= PCF50606_MBCC1_CHGMOD_TRICKLE;
-+      else if (!strcmp(buf, "fast_cccv"))
-+              mbcc1 |= PCF50606_MBCC1_CHGMOD_FAST_CCCV;
-+      /* We don't allow the other fast modes for security reasons */
-+      else if (!strcmp(buf, "idle"))
-+              mbcc1 |= PCF50606_MBCC1_CHGMOD_IDLE;
-+      else
-+              return -EINVAL;
-+
-+      reg_write(pcf, PCF50606_REG_MBCC1, mbcc1);
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(chgmode, S_IRUGO | S_IWUSR, show_chgmode, set_chgmode);
-+
-+static const char *chgstate_names[] = {
-+      [PCF50606_F_CHG_FAST]                   = "fast_enabled",
-+      [PCF50606_F_CHG_PRESENT]                = "present",
-+      [PCF50606_F_CHG_FOK]                    = "fast_ok",
-+      [PCF50606_F_CHG_ERR]                    = "error",
-+      [PCF50606_F_CHG_PROT]                   = "protection",
-+      [PCF50606_F_CHG_READY]                  = "ready",
-+};
-+
-+static ssize_t show_chgstate(struct device *dev, struct device_attribute *attr,
-+                          char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      char *b = buf;
-+      int i;
-+
-+      for (i = 0; i < 32; i++)
-+              if (pcf->flags & (1 << i) && i < ARRAY_SIZE(chgstate_names))
-+                      b += sprintf(b, "%s ", chgstate_names[i]);
-+
-+      if (b > buf)
-+              b += sprintf(b, "\n");
-+
-+      return b - buf;
-+}
-+static DEVICE_ATTR(chgstate, S_IRUGO | S_IWUSR, show_chgstate, NULL);
-+
-+/***********************************************************************
-+ * APM emulation
-+ ***********************************************************************/
-+
-+static void pcf50606_get_power_status(struct apm_power_info *info)
-+{
-+      struct pcf50606_data *pcf = pcf50606_global;
-+      u_int8_t mbcc1 = reg_read(pcf, PCF50606_REG_MBCC1);
-+      u_int8_t chgmod = mbcc1 & PCF50606_MBCC1_CHGMOD_MASK;
-+      u_int16_t battvolt = pcf50606_battvolt(pcf);
-+
-+      if (reg_read(pcf, PCF50606_REG_OOCS) & PCF50606_OOCS_EXTON)
-+              info->ac_line_status = APM_AC_ONLINE;
-+      else
-+              info->ac_line_status = APM_AC_OFFLINE;
-+
-+      switch (chgmod) {
-+      case PCF50606_MBCC1_CHGMOD_QUAL:
-+      case PCF50606_MBCC1_CHGMOD_PRE:
-+      case PCF50606_MBCC1_CHGMOD_IDLE:
-+              info->battery_life = battvolt_scale(battvolt);
-+              break;
-+      default:
-+              info->battery_status = APM_BATTERY_STATUS_CHARGING;
-+              info->battery_flag = APM_BATTERY_FLAG_CHARGING;
-+              break;
-+      }
-+}
-+
-+/***********************************************************************
-+ * RTC
-+ ***********************************************************************/
-+
-+struct pcf50606_time {
-+      u_int8_t sec;
-+      u_int8_t min;
-+      u_int8_t hour;
-+      u_int8_t wkday;
-+      u_int8_t day;
-+      u_int8_t month;
-+      u_int8_t year;
-+};
-+
-+static void pcf2rtc_time(struct rtc_time *rtc, struct pcf50606_time *pcf)
-+{
-+      rtc->tm_sec = BCD2BIN(pcf->sec);
-+      rtc->tm_min = BCD2BIN(pcf->min);
-+      rtc->tm_hour = BCD2BIN(pcf->hour);
-+      rtc->tm_wday = BCD2BIN(pcf->wkday);
-+      rtc->tm_mday = BCD2BIN(pcf->day);
-+      rtc->tm_mon = BCD2BIN(pcf->month);
-+      rtc->tm_year = BCD2BIN(pcf->year) + 100;
-+}
-+
-+static void rtc2pcf_time(struct pcf50606_time *pcf, struct rtc_time *rtc)
-+{
-+      pcf->sec = BIN2BCD(rtc->tm_sec);
-+      pcf->min = BIN2BCD(rtc->tm_min);
-+      pcf->hour = BIN2BCD(rtc->tm_hour);
-+      pcf->wkday = BIN2BCD(rtc->tm_wday);
-+      pcf->day = BIN2BCD(rtc->tm_mday);
-+      pcf->month = BIN2BCD(rtc->tm_mon);
-+      pcf->year = BIN2BCD(rtc->tm_year - 100);
-+}
-+
-+static int pcf50606_rtc_ioctl(struct device *dev, unsigned int cmd,
-+                            unsigned long arg)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      switch (cmd) {
-+      case RTC_PIE_OFF:
-+              /* disable periodic interrupt (hz tick) */
-+              pcf->flags &= ~PCF50606_F_RTC_SECOND;
-+              reg_set_bit_mask(pcf, PCF50606_REG_INT1M,
-+                               PCF50606_INT1_SECOND, PCF50606_INT1_SECOND);
-+              return 0;
-+      case RTC_PIE_ON:
-+              /* ensable periodic interrupt (hz tick) */
-+              pcf->flags |= PCF50606_F_RTC_SECOND;
-+              reg_clear_bits(pcf, PCF50606_REG_INT1M, PCF50606_INT1_SECOND);
-+              return 0;
-+      }
-+      return -ENOIOCTLCMD;
-+}
-+
-+static int pcf50606_rtc_read_time(struct device *dev, struct rtc_time *tm)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      struct pcf50606_time pcf_tm;
-+
-+      mutex_lock(&pcf->lock);
-+      pcf_tm.sec = __reg_read(pcf, PCF50606_REG_RTCSC);
-+      pcf_tm.min = __reg_read(pcf, PCF50606_REG_RTCMN);
-+      pcf_tm.hour = __reg_read(pcf, PCF50606_REG_RTCHR);
-+      pcf_tm.wkday = __reg_read(pcf, PCF50606_REG_RTCWD);
-+      pcf_tm.day = __reg_read(pcf, PCF50606_REG_RTCDT);
-+      pcf_tm.month = __reg_read(pcf, PCF50606_REG_RTCMT);
-+      pcf_tm.year = __reg_read(pcf, PCF50606_REG_RTCYR);
-+      mutex_unlock(&pcf->lock);
-+
-+      dev_dbg(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
-+              pcf_tm.day, pcf_tm.month, pcf_tm.year,
-+              pcf_tm.hour, pcf_tm.min, pcf_tm.sec);
-+
-+      pcf2rtc_time(tm, &pcf_tm);
-+
-+      dev_dbg(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
-+              tm->tm_mday, tm->tm_mon, tm->tm_year,
-+              tm->tm_hour, tm->tm_min, tm->tm_sec);
-+
-+      return 0;
-+}
-+
-+static int pcf50606_rtc_set_time(struct device *dev, struct rtc_time *tm)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      struct pcf50606_time pcf_tm;
-+      u_int8_t int1m;
-+
-+      dev_dbg(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
-+              tm->tm_mday, tm->tm_mon, tm->tm_year,
-+              tm->tm_hour, tm->tm_min, tm->tm_sec);
-+      rtc2pcf_time(&pcf_tm, tm);
-+      dev_dbg(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
-+              pcf_tm.day, pcf_tm.month, pcf_tm.year,
-+              pcf_tm.hour, pcf_tm.min, pcf_tm.sec);
-+
-+      mutex_lock(&pcf->lock);
-+
-+      /* disable SECOND interrupt */
-+      int1m = __reg_read(pcf, PCF50606_REG_INT1M);
-+      __reg_write(pcf, PCF50606_REG_INT1M, int1m | PCF50606_INT1_SECOND);
-+
-+      __reg_write(pcf, PCF50606_REG_RTCSC, pcf_tm.sec);
-+      __reg_write(pcf, PCF50606_REG_RTCMN, pcf_tm.min);
-+      __reg_write(pcf, PCF50606_REG_RTCHR, pcf_tm.hour);
-+      __reg_write(pcf, PCF50606_REG_RTCWD, pcf_tm.wkday);
-+      __reg_write(pcf, PCF50606_REG_RTCDT, pcf_tm.day);
-+      __reg_write(pcf, PCF50606_REG_RTCMT, pcf_tm.month);
-+      __reg_write(pcf, PCF50606_REG_RTCYR, pcf_tm.year);
-+
-+      /* restore INT1M, potentially re-enable SECOND interrupt */
-+      __reg_write(pcf, PCF50606_REG_INT1M, int1m);
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      return 0;
-+}
-+
-+static int pcf50606_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      struct pcf50606_time pcf_tm;
-+
-+      mutex_lock(&pcf->lock);
-+      alrm->enabled = 
-+             __reg_read(pcf, PCF50606_REG_INT1M) & PCF50606_INT1_ALARM ? 0 : 1;
-+      pcf_tm.sec = __reg_read(pcf, PCF50606_REG_RTCSCA);
-+      pcf_tm.min = __reg_read(pcf, PCF50606_REG_RTCMNA);
-+      pcf_tm.hour = __reg_read(pcf, PCF50606_REG_RTCHRA);
-+      pcf_tm.wkday = __reg_read(pcf, PCF50606_REG_RTCWDA);
-+      pcf_tm.day = __reg_read(pcf, PCF50606_REG_RTCDTA);
-+      pcf_tm.month = __reg_read(pcf, PCF50606_REG_RTCMTA);
-+      pcf_tm.year = __reg_read(pcf, PCF50606_REG_RTCYRA);
-+      mutex_unlock(&pcf->lock);
-+
-+      pcf2rtc_time(&alrm->time, &pcf_tm);
-+
-+      return 0;
-+}
-+
-+static int pcf50606_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      struct pcf50606_time pcf_tm;
-+      u_int8_t irqmask;
-+
-+      rtc2pcf_time(&pcf_tm, &alrm->time);
-+
-+      mutex_lock(&pcf->lock);
-+
-+      /* disable alarm interrupt */
-+      irqmask = __reg_read(pcf, PCF50606_REG_INT1M);
-+      irqmask |= PCF50606_INT1_ALARM;
-+      __reg_write(pcf, PCF50606_REG_INT1M, irqmask);
-+
-+      __reg_write(pcf, PCF50606_REG_RTCSCA, pcf_tm.sec);
-+      __reg_write(pcf, PCF50606_REG_RTCMNA, pcf_tm.min);
-+      __reg_write(pcf, PCF50606_REG_RTCHRA, pcf_tm.hour);
-+      __reg_write(pcf, PCF50606_REG_RTCWDA, pcf_tm.wkday);
-+      __reg_write(pcf, PCF50606_REG_RTCDTA, pcf_tm.day);
-+      __reg_write(pcf, PCF50606_REG_RTCMTA, pcf_tm.month);
-+      __reg_write(pcf, PCF50606_REG_RTCYRA, pcf_tm.year);
-+
-+      if (alrm->enabled) {
-+              /* (re-)enaable alarm interrupt */
-+              irqmask = __reg_read(pcf, PCF50606_REG_INT1M);
-+              irqmask &= ~PCF50606_INT1_ALARM;
-+              __reg_write(pcf, PCF50606_REG_INT1M, irqmask);
-+      }
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      /* FIXME */
-+      return 0;
-+}
-+
-+static struct rtc_class_ops pcf50606_rtc_ops = {
-+      .ioctl          = pcf50606_rtc_ioctl,
-+      .read_time      = pcf50606_rtc_read_time,
-+      .set_time       = pcf50606_rtc_set_time,
-+      .read_alarm     = pcf50606_rtc_read_alarm,
-+      .set_alarm      = pcf50606_rtc_set_alarm,
-+};
-+
-+/***********************************************************************
-+ * Watchdog
-+ ***********************************************************************/
-+
-+static void pcf50606_wdt_start(struct pcf50606_data *pcf)
-+{
-+      reg_set_bit_mask(pcf, PCF50606_REG_OOCC1, PCF50606_OOCC1_WDTRST,
-+                       PCF50606_OOCC1_WDTRST);
-+}
-+
-+static void pcf50606_wdt_stop(struct pcf50606_data *pcf)
-+{
-+      reg_clear_bits(pcf, PCF50606_REG_OOCS, PCF50606_OOCS_WDTEXP);
-+}
-+
-+static void pcf50606_wdt_keepalive(struct pcf50606_data *pcf)
-+{
-+      pcf50606_wdt_start(pcf);
-+}
-+
-+static int pcf50606_wdt_open(struct inode *inode, struct file *file)
-+{
-+      struct pcf50606_data *pcf = pcf50606_global;
-+
-+      file->private_data = pcf;
-+
-+      /* start the timer */
-+      pcf50606_wdt_start(pcf);
-+
-+      return nonseekable_open(inode, file);
-+}
-+
-+static int pcf50606_wdt_release(struct inode *inode, struct file *file)
-+{
-+      struct pcf50606_data *pcf = file->private_data;
-+
-+      if (pcf->allow_close == CLOSE_STATE_ALLOW)
-+              pcf50606_wdt_stop(pcf);
-+      else {
-+              printk(KERN_CRIT "Unexpected close, not stopping watchdog!\n");
-+              pcf50606_wdt_keepalive(pcf);
-+      }
-+
-+      pcf->allow_close = CLOSE_STATE_NOT;
-+
-+      return 0;
-+}
-+
-+static ssize_t pcf50606_wdt_write(struct file *file, const char __user *data,
-+                                size_t len, loff_t *ppos)
-+{
-+      struct pcf50606_data *pcf = file->private_data;
-+      if (len) {
-+              size_t i;
-+
-+              for (i = 0; i != len; i++) {
-+                      char c;
-+                      if (get_user(c, data + i))
-+                              return -EFAULT;
-+                      if (c == 'V')
-+                              pcf->allow_close = CLOSE_STATE_ALLOW;
-+              }
-+              pcf50606_wdt_keepalive(pcf);
-+      }
-+
-+      return len;
-+}
-+
-+static struct watchdog_info pcf50606_wdt_ident = {
-+      .options        = WDIOF_MAGICCLOSE,
-+      .firmware_version = 0,
-+      .identity       = "PCF50606 Watchdog",
-+};
-+
-+static int pcf50606_wdt_ioctl(struct inode *inode, struct file *file,
-+                            unsigned int cmd, unsigned long arg)
-+{
-+      struct pcf50606_data *pcf = file->private_data;
-+      void __user *argp = (void __user *)arg;
-+      int __user *p = argp;
-+
-+      switch (cmd) {
-+      case WDIOC_GETSUPPORT:
-+              return copy_to_user(argp, &pcf50606_wdt_ident,
-+                                  sizeof(pcf50606_wdt_ident)) ? -EFAULT : 0;
-+              break;
-+      case WDIOC_GETSTATUS:
-+      case WDIOC_GETBOOTSTATUS:
-+              return put_user(0, p);
-+      case WDIOC_KEEPALIVE:
-+              pcf50606_wdt_keepalive(pcf);
-+              return 0;
-+      case WDIOC_GETTIMEOUT:
-+              return put_user(8, p);
-+      default:
-+              return -ENOIOCTLCMD;
-+      }
-+}
-+
-+static struct file_operations pcf50606_wdt_fops = {
-+      .owner          = THIS_MODULE,
-+      .llseek         = no_llseek,
-+      .write          = &pcf50606_wdt_write,
-+      .ioctl          = &pcf50606_wdt_ioctl,
-+      .open           = &pcf50606_wdt_open,
-+      .release        = &pcf50606_wdt_release,
-+};
-+
-+static struct miscdevice pcf50606_wdt_miscdev = {
-+      .minor          = WATCHDOG_MINOR,
-+      .name           = "watchdog",
-+      .fops           = &pcf50606_wdt_fops,
-+};
-+
-+/***********************************************************************
-+ * PWM
-+ ***********************************************************************/
-+
-+static const char *pwm_dc_table[] = {
-+      "0/16", "1/16", "2/16", "3/16",
-+      "4/16", "5/16", "6/16", "7/16",
-+      "8/16", "9/16", "10/16", "11/16",
-+      "12/16", "13/16", "14/16", "15/16",
-+};
-+
-+static ssize_t show_pwm_dc(struct device *dev, struct device_attribute *attr,
-+                         char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      u_int8_t val;
-+
-+      val = reg_read(pcf, PCF50606_REG_PWMC1) >> PCF50606_PWMC1_DC_SHIFT;
-+      val &= 0xf;
-+
-+      return sprintf(buf, "%s\n", pwm_dc_table[val]);
-+}
-+
-+static ssize_t set_pwm_dc(struct device *dev, struct device_attribute *attr,
-+                        const char *buf, size_t count)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      u_int8_t i;
-+
-+      for (i = 0; i < ARRAY_SIZE(pwm_dc_table); i++) {
-+              if (!strncmp(buf, pwm_dc_table[i], strlen(pwm_dc_table[i]))) {
-+                      dev_dbg(dev, "setting pwm dc %s\n\r", pwm_dc_table[i]);
-+                      reg_set_bit_mask(pcf, PCF50606_REG_PWMC1, 0x1e,
-+                                       (i << PCF50606_PWMC1_DC_SHIFT));
-+              }
-+      }
-+      return count;
-+}
-+
-+static DEVICE_ATTR(pwm_dc, S_IRUGO | S_IWUSR, show_pwm_dc, set_pwm_dc);
-+
-+static const char *pwm_clk_table[] = {
-+      "512", "256", "128", "64",
-+      "56300", "28100", "14100", "7000",
-+};
-+
-+static ssize_t show_pwm_clk(struct device *dev, struct device_attribute *attr,
-+                          char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      u_int8_t val;
-+
-+      val = reg_read(pcf, PCF50606_REG_PWMC1) >> PCF50606_PWMC1_CLK_SHIFT;
-+      val &= 0x7;
-+
-+      return sprintf(buf, "%s\n", pwm_clk_table[val]);
-+}
-+
-+static ssize_t set_pwm_clk(struct device *dev, struct device_attribute *attr,
-+                         const char *buf, size_t count)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      u_int8_t i;
-+
-+      for (i = 0; i < ARRAY_SIZE(pwm_clk_table); i++) {
-+              if (!strncmp(buf, pwm_clk_table[i], strlen(pwm_clk_table[i]))) {
-+                      dev_dbg(dev, "setting pwm clk %s\n\r",
-+                              pwm_clk_table[i]);
-+                      reg_set_bit_mask(pcf, PCF50606_REG_PWMC1, 0xe0,
-+                                       (i << PCF50606_PWMC1_CLK_SHIFT));
-+              }
-+      }
-+      return count;
-+}
-+
-+static DEVICE_ATTR(pwm_clk, S_IRUGO | S_IWUSR, show_pwm_clk, set_pwm_clk);
-+
-+static int pcf50606bl_get_intensity(struct backlight_device *bd)
-+{
-+      struct pcf50606_data *pcf = bl_get_data(bd);
-+      int intensity = reg_read(pcf, PCF50606_REG_PWMC1);
-+      intensity = (intensity >> PCF50606_PWMC1_DC_SHIFT);
-+
-+      return intensity & 0xf;
-+}
-+
-+static int pcf50606bl_set_intensity(struct backlight_device *bd)
-+{
-+      struct pcf50606_data *pcf = bl_get_data(bd);
-+      int intensity = bd->props.brightness;
-+
-+      if (bd->props.power != FB_BLANK_UNBLANK)
-+              intensity = 0;
-+      if (bd->props.fb_blank != FB_BLANK_UNBLANK)
-+              intensity = 0;
-+
-+      return reg_set_bit_mask(pcf, PCF50606_REG_PWMC1, 0x1e,
-+                              (intensity << PCF50606_PWMC1_DC_SHIFT));
-+}
-+
-+static struct backlight_ops pcf50606bl_ops = {
-+      .get_brightness = pcf50606bl_get_intensity,
-+      .update_status  = pcf50606bl_set_intensity,
-+};
-+
-+/***********************************************************************
-+ * Driver initialization
-+ ***********************************************************************/
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+/* We currently place those platform devices here to make sure the device
-+ * suspend/resume order is correct */
-+static struct platform_device gta01_pm_gps_dev = {
-+      .name           = "neo1973-pm-gps",
-+};
-+
-+static struct platform_device gta01_pm_bt_dev = {
-+      .name           = "neo1973-pm-bt",
-+};
-+#endif
-+
-+static struct attribute *pcf_sysfs_entries[16] = {
-+      &dev_attr_voltage_dcd.attr,
-+      &dev_attr_voltage_dcde.attr,
-+      &dev_attr_voltage_dcud.attr,
-+      &dev_attr_voltage_d1reg.attr,
-+      &dev_attr_voltage_d2reg.attr,
-+      &dev_attr_voltage_d3reg.attr,
-+      &dev_attr_voltage_lpreg.attr,
-+      &dev_attr_voltage_ioreg.attr,
-+      NULL
-+};
-+
-+static struct attribute_group pcf_attr_group = {
-+      .name   = NULL,                 /* put in device directory */
-+      .attrs  = pcf_sysfs_entries,
-+};
-+
-+static void populate_sysfs_group(struct pcf50606_data *pcf)
-+{
-+      int i = 0;
-+      struct attribute **attr;
-+
-+      for (attr = pcf_sysfs_entries; *attr; attr++)
-+              i++;
-+
-+      if (pcf->pdata->used_features & PCF50606_FEAT_MBC) {
-+              pcf_sysfs_entries[i++] = &dev_attr_chgstate.attr;
-+              pcf_sysfs_entries[i++] = &dev_attr_chgmode.attr;
-+      }
-+
-+      if (pcf->pdata->used_features & PCF50606_FEAT_CHGCUR)
-+              pcf_sysfs_entries[i++] = &dev_attr_chgcur.attr;
-+
-+      if (pcf->pdata->used_features & PCF50606_FEAT_BATVOLT)
-+              pcf_sysfs_entries[i++] = &dev_attr_battvolt.attr;
-+
-+      if (pcf->pdata->used_features & PCF50606_FEAT_BATTEMP)
-+              pcf_sysfs_entries[i++] = &dev_attr_battemp.attr;
-+
-+      if (pcf->pdata->used_features & PCF50606_FEAT_PWM) {
-+              pcf_sysfs_entries[i++] = &dev_attr_pwm_dc.attr;
-+              pcf_sysfs_entries[i++] = &dev_attr_pwm_clk.attr;
-+      }
-+}
-+
-+static int pcf50606_detect(struct i2c_adapter *adapter, int address, int kind)
-+{
-+      struct i2c_client *new_client;
-+      struct pcf50606_data *data;
-+      int err = 0;
-+      int irq;
-+
-+      if (!pcf50606_pdev) {
-+              printk(KERN_ERR "pcf50606: driver needs a platform_device!\n");
-+              return -EIO;
-+      }
-+
-+      irq = platform_get_irq(pcf50606_pdev, 0);
-+      if (irq < 0) {
-+              dev_err(&pcf50606_pdev->dev, "no irq in platform resources!\n");
-+              return -EIO;
-+      }
-+
-+      /* At the moment, we only support one PCF50606 in a system */
-+      if (pcf50606_global) {
-+              dev_err(&pcf50606_pdev->dev,
-+                      "currently only one chip supported\n");
-+              return -EBUSY;
-+      }
-+
-+      data = kzalloc(sizeof(*data), GFP_KERNEL);
-+      if (!data)
-+              return -ENOMEM;
-+
-+      mutex_init(&data->lock);
-+      mutex_init(&data->working_lock);
-+      INIT_WORK(&data->work, pcf50606_work);
-+      data->irq = irq;
-+      data->working = 0;
-+      data->onkey_seconds = -1;
-+      data->pdata = pcf50606_pdev->dev.platform_data;
-+
-+      new_client = &data->client;
-+      i2c_set_clientdata(new_client, data);
-+      new_client->addr = address;
-+      new_client->adapter = adapter;
-+      new_client->driver = &pcf50606_driver;
-+      new_client->flags = 0;
-+      strlcpy(new_client->name, "pcf50606", I2C_NAME_SIZE);
-+
-+      /* now we try to detect the chip */
-+
-+      /* register with i2c core */
-+      err = i2c_attach_client(new_client);
-+      if (err) {
-+              dev_err(&new_client->dev,
-+                      "error during i2c_attach_client()\n");
-+              goto exit_free;
-+      }
-+
-+      populate_sysfs_group(data);
-+
-+      err = sysfs_create_group(&new_client->dev.kobj, &pcf_attr_group);
-+      if (err) {
-+              dev_err(&new_client->dev, "error creating sysfs group\n");
-+              goto exit_detach;
-+      }
-+
-+      /* create virtual charger 'device' */
-+
-+      /* input device registration */
-+      data->input_dev = input_allocate_device();
-+      if (!data->input_dev)
-+              goto exit_sysfs;
-+
-+      data->input_dev->name = "FIC Neo1973 PMU events";
-+      data->input_dev->phys = "I2C";
-+      data->input_dev->id.bustype = BUS_I2C;
-+      data->input_dev->cdev.dev = &new_client->dev;
-+
-+      data->input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_PWR);
-+      set_bit(KEY_POWER, data->input_dev->keybit);
-+      set_bit(KEY_POWER2, data->input_dev->keybit);
-+      set_bit(KEY_BATTERY, data->input_dev->keybit);
-+
-+      err = input_register_device(data->input_dev);
-+      if (err)
-+              goto exit_sysfs;
-+
-+      /* register power off handler with core power management */
-+      pm_power_off = &pcf50606_go_standby;
-+
-+      /* configure interrupt mask */
-+      reg_write(data, PCF50606_REG_INT1M, PCF50606_INT1_SECOND);
-+      reg_write(data, PCF50606_REG_INT2M, 0x00);
-+      reg_write(data, PCF50606_REG_INT3M, PCF50606_INT3_TSCPRES);
-+
-+      err = request_irq(irq, pcf50606_irq, IRQF_TRIGGER_FALLING,
-+                        "pcf50606", data);
-+      if (err < 0)
-+              goto exit_input;
-+
-+      if (enable_irq_wake(irq) < 0)
-+              dev_err(&new_client->dev, "IRQ %u cannot be enabled as wake-up"
-+                      "source in this hardware revision!", irq);
-+
-+      pcf50606_global = data;
-+
-+      if (data->pdata->used_features & PCF50606_FEAT_RTC) {
-+              data->rtc = rtc_device_register("pcf50606", &new_client->dev,
-+                                              &pcf50606_rtc_ops, THIS_MODULE);
-+              if (IS_ERR(data->rtc)) {
-+                      err = PTR_ERR(data->rtc);
-+                      goto exit_irq;
-+              }
-+      }
-+
-+      if (data->pdata->used_features & PCF50606_FEAT_WDT) {
-+              err = misc_register(&pcf50606_wdt_miscdev);
-+              if (err) {
-+                      dev_err(&new_client->dev, "cannot register miscdev on "
-+                             "minor=%d (%d)\n", WATCHDOG_MINOR, err);
-+                      goto exit_rtc;
-+              }
-+      }
-+
-+      if (data->pdata->used_features & PCF50606_FEAT_PWM) {
-+              /* enable PWM controller */
-+              reg_set_bit_mask(data, PCF50606_REG_PWMC1,
-+                               PCF50606_PWMC1_ACTSET,
-+                               PCF50606_PWMC1_ACTSET);
-+      }
-+
-+      if (data->pdata->used_features & PCF50606_FEAT_PWM_BL) {
-+              data->backlight = backlight_device_register("pcf50606-bl",
-+                                                          &new_client->dev,
-+                                                          data,
-+                                                          &pcf50606bl_ops);
-+              if (!data->backlight)
-+                      goto exit_misc;
-+              data->backlight->props.max_brightness = 16;
-+              data->backlight->props.power = FB_BLANK_UNBLANK;
-+              data->backlight->props.brightness =
-+                                      data->pdata->init_brightness;
-+              backlight_update_status(data->backlight);
-+      }
-+
-+      apm_get_power_status = pcf50606_get_power_status;
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+      if (machine_is_neo1973_gta01()) {
-+              gta01_pm_gps_dev.dev.parent = &new_client->dev;
-+              switch (system_rev) {
-+              case GTA01Bv2_SYSTEM_REV:
-+              case GTA01Bv3_SYSTEM_REV:
-+              case GTA01Bv4_SYSTEM_REV:
-+                      gta01_pm_bt_dev.dev.parent = &new_client->dev;
-+                      platform_device_register(&gta01_pm_bt_dev);
-+                      break;
-+              }
-+              platform_device_register(&gta01_pm_gps_dev);
-+              /* a link for gllin compatibility */
-+              err = sysfs_create_link(&platform_bus_type.devices.kobj,
-+                  &gta01_pm_gps_dev.dev.kobj, "gta01-pm-gps.0");
-+              if (err)
-+                      printk(KERN_ERR
-+                          "sysfs_create_link (gta01-pm-gps.0): %d\n", err);
-+      }
-+#endif
-+
-+      if (data->pdata->used_features & PCF50606_FEAT_ACD)
-+              reg_set_bit_mask(data, PCF50606_REG_ACDC1,
-+                               PCF50606_ACDC1_ACDAPE, PCF50606_ACDC1_ACDAPE);
-+      else
-+              reg_clear_bits(data, PCF50606_REG_ACDC1,
-+                             PCF50606_ACDC1_ACDAPE);
-+
-+      return 0;
-+
-+exit_misc:
-+      if (data->pdata->used_features & PCF50606_FEAT_WDT)
-+              misc_deregister(&pcf50606_wdt_miscdev);
-+exit_rtc:
-+      if (data->pdata->used_features & PCF50606_FEAT_RTC)
-+              rtc_device_unregister(pcf50606_global->rtc);
-+exit_irq:
-+      free_irq(pcf50606_global->irq, pcf50606_global);
-+      pcf50606_global = NULL;
-+exit_input:
-+      pm_power_off = NULL;
-+      input_unregister_device(data->input_dev);
-+exit_sysfs:
-+      sysfs_remove_group(&new_client->dev.kobj, &pcf_attr_group);
-+exit_detach:
-+      i2c_detach_client(new_client);
-+exit_free:
-+      kfree(data);
-+      return err;
-+}
-+
-+static int pcf50606_attach_adapter(struct i2c_adapter *adapter)
-+{
-+      return i2c_probe(adapter, &addr_data, &pcf50606_detect);
-+}
-+
-+static int pcf50606_detach_client(struct i2c_client *client)
-+{
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+
-+      apm_get_power_status = NULL;
-+      input_unregister_device(pcf->input_dev);
-+
-+      if (pcf->pdata->used_features & PCF50606_FEAT_PWM_BL)
-+              backlight_device_unregister(pcf->backlight);
-+
-+      if (pcf->pdata->used_features & PCF50606_FEAT_WDT)
-+              misc_deregister(&pcf50606_wdt_miscdev);
-+
-+      if (pcf->pdata->used_features & PCF50606_FEAT_RTC)
-+              rtc_device_unregister(pcf->rtc);
-+
-+      free_irq(pcf->irq, pcf);
-+
-+      sysfs_remove_group(&client->dev.kobj, &pcf_attr_group);
-+
-+      pm_power_off = NULL;
-+
-+      kfree(pcf);
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+#define INT1M_RESUMERS        (PCF50606_INT1_ALARM | \
-+                       PCF50606_INT1_ONKEYF | \
-+                       PCF50606_INT1_EXTONR)
-+#define INT2M_RESUMERS        (PCF50606_INT2_CHGWD10S | \
-+                       PCF50606_INT2_CHGPROT | \
-+                       PCF50606_INT2_CHGERR)
-+#define INT3M_RESUMERS        (PCF50606_INT3_LOWBAT | \
-+                       PCF50606_INT3_HIGHTMP | \
-+                       PCF50606_INT3_ACDINS)
-+static int pcf50606_suspend(struct device *dev, pm_message_t state)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+      int i;
-+
-+      /* The general idea is to power down all unused power supplies,
-+       * and then mask all PCF50606 interrup sources but EXTONR, ONKEYF
-+       * and ALARM */
-+
-+      mutex_lock(&pcf->lock);
-+
-+      /* Save all registers that don't "survive" standby state */
-+      pcf->standby_regs.dcdc1 = __reg_read(pcf, PCF50606_REG_DCDC1);
-+      pcf->standby_regs.dcdc2 = __reg_read(pcf, PCF50606_REG_DCDC2);
-+      pcf->standby_regs.dcdec1 = __reg_read(pcf, PCF50606_REG_DCDEC1);
-+      pcf->standby_regs.dcudc1 = __reg_read(pcf, PCF50606_REG_DCUDC1);
-+      pcf->standby_regs.ioregc = __reg_read(pcf, PCF50606_REG_IOREGC);
-+      pcf->standby_regs.d1regc1 = __reg_read(pcf, PCF50606_REG_D1REGC1);
-+      pcf->standby_regs.d2regc1 = __reg_read(pcf, PCF50606_REG_D2REGC1);
-+      pcf->standby_regs.d3regc1 = __reg_read(pcf, PCF50606_REG_D3REGC1);
-+      pcf->standby_regs.lpregc1 = __reg_read(pcf, PCF50606_REG_LPREGC1);
-+      pcf->standby_regs.adcc1 = __reg_read(pcf, PCF50606_REG_ADCC1);
-+      pcf->standby_regs.adcc2 = __reg_read(pcf, PCF50606_REG_ADCC2);
-+      pcf->standby_regs.pwmc1 = __reg_read(pcf, PCF50606_REG_PWMC1);
-+
-+      /* switch off power supplies that are not needed during suspend */
-+      for (i = 0; i < __NUM_PCF50606_REGULATORS; i++) {
-+              if (!(pcf->pdata->rails[i].flags & PMU_VRAIL_F_SUSPEND_ON)) {
-+                      u_int8_t tmp;
-+
-+                      /* IOREG powers the I@C interface so we cannot switch
-+                       * it off */
-+                      if (i == PCF50606_REGULATOR_IOREG)
-+                              continue;
-+
-+                      dev_dbg(dev, "disabling pcf50606 regulator %u\n", i);
-+                      /* we cannot use pcf50606_onoff_set() because we're
-+                       * already under the mutex */
-+                      tmp = __reg_read(pcf, regulator_registers[i]);
-+                      tmp &= 0x1f;
-+                      __reg_write(pcf, regulator_registers[i], tmp);
-+              }
-+      }
-+
-+      pcf->standby_regs.int1m = __reg_read(pcf, PCF50606_REG_INT1M);
-+      pcf->standby_regs.int2m = __reg_read(pcf, PCF50606_REG_INT2M);
-+      pcf->standby_regs.int3m = __reg_read(pcf, PCF50606_REG_INT3M);
-+      __reg_write(pcf, PCF50606_REG_INT1M, ~INT1M_RESUMERS & 0xff);
-+      __reg_write(pcf, PCF50606_REG_INT2M, ~INT2M_RESUMERS & 0xff);
-+      __reg_write(pcf, PCF50606_REG_INT3M, ~INT3M_RESUMERS & 0xff);
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      return 0;
-+}
-+
-+static int pcf50606_resume(struct device *dev)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+
-+      mutex_lock(&pcf->lock);
-+
-+      /* Resume all saved registers that don't "survive" standby state */
-+      __reg_write(pcf, PCF50606_REG_INT1M, pcf->standby_regs.int1m);
-+      __reg_write(pcf, PCF50606_REG_INT2M, pcf->standby_regs.int2m);
-+      __reg_write(pcf, PCF50606_REG_INT3M, pcf->standby_regs.int3m);
-+
-+      __reg_write(pcf, PCF50606_REG_DCDC1, pcf->standby_regs.dcdc1);
-+      __reg_write(pcf, PCF50606_REG_DCDC2, pcf->standby_regs.dcdc2);
-+      __reg_write(pcf, PCF50606_REG_DCDEC1, pcf->standby_regs.dcdec1);
-+      __reg_write(pcf, PCF50606_REG_DCUDC1, pcf->standby_regs.dcudc1);
-+      __reg_write(pcf, PCF50606_REG_IOREGC, pcf->standby_regs.ioregc);
-+      __reg_write(pcf, PCF50606_REG_D1REGC1, pcf->standby_regs.d1regc1);
-+      __reg_write(pcf, PCF50606_REG_D2REGC1, pcf->standby_regs.d2regc1);
-+      __reg_write(pcf, PCF50606_REG_D3REGC1, pcf->standby_regs.d3regc1);
-+      __reg_write(pcf, PCF50606_REG_LPREGC1, pcf->standby_regs.lpregc1);
-+      __reg_write(pcf, PCF50606_REG_ADCC1, pcf->standby_regs.adcc1);
-+      __reg_write(pcf, PCF50606_REG_ADCC2, pcf->standby_regs.adcc2);
-+      __reg_write(pcf, PCF50606_REG_PWMC1, pcf->standby_regs.pwmc1);
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      return 0;
-+}
-+#else
-+#define pcf50606_suspend NULL
-+#define pcf50606_resume NULL
-+#endif
-+
-+static struct i2c_driver pcf50606_driver = {
-+      .driver = {
-+              .name    = "pcf50606",
-+              .suspend = pcf50606_suspend,
-+              .resume  = pcf50606_resume,
-+      },
-+      .id             = I2C_DRIVERID_PCF50606,
-+      .attach_adapter = pcf50606_attach_adapter,
-+      .detach_client  = pcf50606_detach_client,
-+};
-+
-+/* platform driver, since i2c devices don't have platform_data */
-+static int __init pcf50606_plat_probe(struct platform_device *pdev)
-+{
-+      struct pcf50606_platform_data *pdata = pdev->dev.platform_data;
-+
-+      if (!pdata)
-+              return -ENODEV;
-+
-+      pcf50606_pdev = pdev;
-+
-+      return 0;
-+}
-+
-+static int pcf50606_plat_remove(struct platform_device *pdev)
-+{
-+      return 0;
-+}
-+
-+static struct platform_driver pcf50606_plat_driver = {
-+      .probe  = pcf50606_plat_probe,
-+      .remove = pcf50606_plat_remove,
-+      .driver = {
-+              .owner  = THIS_MODULE,
-+              .name   = "pcf50606",
-+      },
-+};
-+
-+static int __init pcf50606_init(void)
-+{
-+      int rc;
-+
-+      rc = platform_driver_register(&pcf50606_plat_driver);
-+      if (!rc)
-+              rc = i2c_add_driver(&pcf50606_driver);
-+
-+      return rc;
-+}
-+
-+static void pcf50606_exit(void)
-+{
-+      i2c_del_driver(&pcf50606_driver);
-+      platform_driver_unregister(&pcf50606_plat_driver);
-+}
-+
-+MODULE_DESCRIPTION("I2C chip driver for NXP PCF50606 power management unit");
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_LICENSE("GPL");
-+
-+module_init(pcf50606_init);
-+module_exit(pcf50606_exit);
-diff --git a/drivers/i2c/chips/pcf50606.h b/drivers/i2c/chips/pcf50606.h
-new file mode 100644
-index 0000000..15b350f
---- /dev/null
-+++ b/drivers/i2c/chips/pcf50606.h
-@@ -0,0 +1,302 @@
-+#ifndef _PCF50606_H
-+#define _PCF50606_H
-+
-+/* Philips PCF50606 Power Managemnt Unit (PMU) driver
-+ * (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ *
-+ */
-+
-+enum pfc50606_regs {
-+      PCF50606_REG_ID         = 0x00,
-+      PCF50606_REG_OOCS       = 0x01,
-+      PCF50606_REG_INT1       = 0x02, /* Interrupt Status */
-+      PCF50606_REG_INT2       = 0x03, /* Interrupt Status */
-+      PCF50606_REG_INT3       = 0x04, /* Interrupt Status */
-+      PCF50606_REG_INT1M      = 0x05, /* Interrupt Mask */
-+      PCF50606_REG_INT2M      = 0x06, /* Interrupt Mask */
-+      PCF50606_REG_INT3M      = 0x07, /* Interrupt Mask */
-+      PCF50606_REG_OOCC1      = 0x08,
-+      PCF50606_REG_OOCC2      = 0x09,
-+      PCF50606_REG_RTCSC      = 0x0a, /* Second */
-+      PCF50606_REG_RTCMN      = 0x0b, /* Minute */
-+      PCF50606_REG_RTCHR      = 0x0c, /* Hour */
-+      PCF50606_REG_RTCWD      = 0x0d, /* Weekday */
-+      PCF50606_REG_RTCDT      = 0x0e, /* Day */
-+      PCF50606_REG_RTCMT      = 0x0f, /* Month */
-+      PCF50606_REG_RTCYR      = 0x10, /* Year */
-+      PCF50606_REG_RTCSCA     = 0x11, /* Alarm Second */
-+      PCF50606_REG_RTCMNA     = 0x12, /* Alarm Minute */
-+      PCF50606_REG_RTCHRA     = 0x13, /* Alarm Hour */
-+      PCF50606_REG_RTCWDA     = 0x14, /* Alarm Weekday */
-+      PCF50606_REG_RTCDTA     = 0x15, /* Alarm Day */
-+      PCF50606_REG_RTCMTA     = 0x16, /* Alarm Month */
-+      PCF50606_REG_RTCYRA     = 0x17, /* Alarm Year */
-+      PCF50606_REG_PSSC       = 0x18, /* Power sequencing */
-+      PCF50606_REG_PWROKM     = 0x19, /* PWROK mask */
-+      PCF50606_REG_PWROKS     = 0x1a, /* PWROK status */
-+      PCF50606_REG_DCDC1      = 0x1b,
-+      PCF50606_REG_DCDC2      = 0x1c,
-+      PCF50606_REG_DCDC3      = 0x1d,
-+      PCF50606_REG_DCDC4      = 0x1e,
-+      PCF50606_REG_DCDEC1     = 0x1f,
-+      PCF50606_REG_DCDEC2     = 0x20,
-+      PCF50606_REG_DCUDC1     = 0x21,
-+      PCF50606_REG_DCUDC2     = 0x22,
-+      PCF50606_REG_IOREGC     = 0x23,
-+      PCF50606_REG_D1REGC1    = 0x24,
-+      PCF50606_REG_D2REGC1    = 0x25,
-+      PCF50606_REG_D3REGC1    = 0x26,
-+      PCF50606_REG_LPREGC1    = 0x27,
-+      PCF50606_REG_LPREGC2    = 0x28,
-+      PCF50606_REG_MBCC1      = 0x29,
-+      PCF50606_REG_MBCC2      = 0x2a,
-+      PCF50606_REG_MBCC3      = 0x2b,
-+      PCF50606_REG_MBCS1      = 0x2c,
-+      PCF50606_REG_BBCC       = 0x2d,
-+      PCF50606_REG_ADCC1      = 0x2e,
-+      PCF50606_REG_ADCC2      = 0x2f,
-+      PCF50606_REG_ADCS1      = 0x30,
-+      PCF50606_REG_ADCS2      = 0x31,
-+      PCF50606_REG_ADCS3      = 0x32,
-+      PCF50606_REG_ACDC1      = 0x33,
-+      PCF50606_REG_BVMC       = 0x34,
-+      PCF50606_REG_PWMC1      = 0x35,
-+      PCF50606_REG_LEDC1      = 0x36,
-+      PCF50606_REG_LEDC2      = 0x37,
-+      PCF50606_REG_GPOC1      = 0x38,
-+      PCF50606_REG_GPOC2      = 0x39,
-+      PCF50606_REG_GPOC3      = 0x3a,
-+      PCF50606_REG_GPOC4      = 0x3b,
-+      PCF50606_REG_GPOC5      = 0x3c,
-+      __NUM_PCF50606_REGS
-+};
-+
-+enum pcf50606_reg_oocs {
-+      PFC50606_OOCS_ONKEY     = 0x01,
-+      PCF50606_OOCS_EXTON     = 0x02,
-+      PCF50606_OOCS_PWROKRST  = 0x04,
-+      PCF50606_OOCS_BATOK     = 0x08,
-+      PCF50606_OOCS_BACKOK    = 0x10,
-+      PCF50606_OOCS_CHGOK     = 0x20,
-+      PCF50606_OOCS_TEMPOK    = 0x40,
-+      PCF50606_OOCS_WDTEXP    = 0x80,
-+};
-+
-+enum pcf50606_reg_oocc1 {
-+      PCF50606_OOCC1_GOSTDBY  = 0x01,
-+      PCF50606_OOCC1_TOTRST   = 0x02,
-+      PCF50606_OOCC1_CLK32ON  = 0x04,
-+      PCF50606_OOCC1_WDTRST   = 0x08,
-+      PCF50606_OOCC1_RTCWAK   = 0x10,
-+      PCF50606_OOCC1_CHGWAK   = 0x20,
-+      PCF50606_OOCC1_EXTONWAK_HIGH    = 0x40,
-+      PCF50606_OOCC1_EXTONWAK_LOW     = 0x80,
-+};
-+
-+enum pcf50606_reg_oocc2 {
-+      PCF50606_OOCC2_ONKEYDB_NONE     = 0x00,
-+      PCF50606_OOCC2_ONKEYDB_14ms     = 0x01,
-+      PCF50606_OOCC2_ONKEYDB_62ms     = 0x02,
-+      PCF50606_OOCC2_ONKEYDB_500ms    = 0x03,
-+      PCF50606_OOCC2_EXTONDB_NONE     = 0x00,
-+      PCF50606_OOCC2_EXTONDB_14ms     = 0x04,
-+      PCF50606_OOCC2_EXTONDB_62ms     = 0x08,
-+      PCF50606_OOCC2_EXTONDB_500ms    = 0x0c,
-+};
-+
-+enum pcf50606_reg_int1 {
-+      PCF50606_INT1_ONKEYR    = 0x01, /* ONKEY rising edge */
-+      PCF50606_INT1_ONKEYF    = 0x02, /* ONKEY falling edge */
-+      PCF50606_INT1_ONKEY1S   = 0x04, /* OMKEY at least 1sec low */
-+      PCF50606_INT1_EXTONR    = 0x08, /* EXTON rising edge */
-+      PCF50606_INT1_EXTONF    = 0x10, /* EXTON falling edge */
-+      PCF50606_INT1_SECOND    = 0x40, /* RTC periodic second interrupt */
-+      PCF50606_INT1_ALARM     = 0x80, /* RTC alarm time is reached */
-+};
-+
-+enum pcf50606_reg_int2 {
-+      PCF50606_INT2_CHGINS    = 0x01, /* Charger inserted */
-+      PCF50606_INT2_CHGRM     = 0x02, /* Charger removed */
-+      PCF50606_INT2_CHGFOK    = 0x04, /* Fast charging OK */
-+      PCF50606_INT2_CHGERR    = 0x08, /* Error in charging mode */
-+      PCF50606_INT2_CHGFRDY   = 0x10, /* Fast charge completed */
-+      PCF50606_INT2_CHGPROT   = 0x20, /* Charging protection interrupt */
-+      PCF50606_INT2_CHGWD10S  = 0x40, /* Charger watchdig expires in 10s */
-+      PCF50606_INT2_CHGWDEXP  = 0x80, /* Charger watchdog expires */
-+};
-+
-+enum pcf50606_reg_int3 {
-+      PCF50606_INT3_ADCRDY    = 0x01, /* ADC conversion finished */
-+      PCF50606_INT3_ACDINS    = 0x02, /* Accessory inserted */
-+      PCF50606_INT3_ACDREM    = 0x04, /* Accessory removed */
-+      PCF50606_INT3_TSCPRES   = 0x08, /* Touch screen pressed */
-+      PCF50606_INT3_LOWBAT    = 0x40, /* Low battery voltage */
-+      PCF50606_INT3_HIGHTMP   = 0x80, /* High temperature */
-+};
-+
-+/* used by PSSC, PWROKM, PWROKS, */
-+enum pcf50606_regu {
-+      PCF50606_REGU_DCD       = 0x01, /* DCD in phase 2 */
-+      PCF50606_REGU_DCDE      = 0x02, /* DCDE in phase 2 */
-+      PCF50606_REGU_DCUD      = 0x04, /* DCDU in phase 2 */
-+      PCF50606_REGU_IO        = 0x08, /* IO in phase 2 */
-+      PCF50606_REGU_D1        = 0x10, /* D1 in phase 2 */
-+      PCF50606_REGU_D2        = 0x20, /* D2 in phase 2 */
-+      PCF50606_REGU_D3        = 0x40, /* D3 in phase 2 */
-+      PCF50606_REGU_LP        = 0x80, /* LP in phase 2 */
-+};
-+
-+enum pcf50606_reg_dcdc4 {
-+      PCF50606_DCDC4_MODE_AUTO        = 0x00,
-+      PCF50606_DCDC4_MODE_PWM         = 0x01,
-+      PCF50606_DCDC4_MODE_PCF         = 0x02,
-+      PCF50606_DCDC4_OFF_FLOAT        = 0x00,
-+      PCF50606_DCDC4_OFF_BYPASS       = 0x04,
-+      PCF50606_DCDC4_OFF_PULLDOWN     = 0x08,
-+      PCF50606_DCDC4_CURLIM_500mA     = 0x00,
-+      PCF50606_DCDC4_CURLIM_750mA     = 0x10,
-+      PCF50606_DCDC4_CURLIM_1000mA    = 0x20,
-+      PCF50606_DCDC4_CURLIM_1250mA    = 0x30,
-+      PCF50606_DCDC4_TOGGLE           = 0x40,
-+      PCF50606_DCDC4_REGSEL_DCDC2     = 0x80,
-+};
-+
-+enum pcf50606_reg_dcdec2 {
-+      PCF50606_DCDEC2_MODE_AUTO       = 0x00,
-+      PCF50606_DCDEC2_MODE_PWM        = 0x01,
-+      PCF50606_DCDEC2_MODE_PCF        = 0x02,
-+      PCF50606_DCDEC2_OFF_FLOAT       = 0x00,
-+      PCF50606_DCDEC2_OFF_BYPASS      = 0x04,
-+};
-+
-+enum pcf50606_reg_dcudc2 {
-+      PCF50606_DCUDC2_MODE_AUTO       = 0x00,
-+      PCF50606_DCUDC2_MODE_PWM        = 0x01,
-+      PCF50606_DCUDC2_MODE_PCF        = 0x02,
-+      PCF50606_DCUDC2_OFF_FLOAT       = 0x00,
-+      PCF50606_DCUDC2_OFF_BYPASS      = 0x04,
-+};
-+
-+enum pcf50606_reg_adcc1 {
-+      PCF50606_ADCC1_TSCMODACT        = 0x01,
-+      PCF50606_ADCC1_TSCMODSTB        = 0x02,
-+      PCF50606_ADCC1_TRATSET          = 0x04,
-+      PCF50606_ADCC1_NTCSWAPE         = 0x08,
-+      PCF50606_ADCC1_NTCSWAOFF        = 0x10,
-+      PCF50606_ADCC1_EXTSYNCBREAK     = 0x20,
-+      /* reserved */
-+      PCF50606_ADCC1_TSCINT           = 0x80,
-+};
-+
-+enum pcf50606_reg_adcc2 {
-+      PCF50606_ADCC2_ADCSTART         = 0x01,
-+      /* see enum pcf50606_adcc2_adcmux */
-+      PCF50606_ADCC2_SYNC_NONE        = 0x00,
-+      PCF50606_ADCC2_SYNC_TXON        = 0x20,
-+      PCF50606_ADCC2_SYNC_PWREN1      = 0x40,
-+      PCF50606_ADCC2_SYNC_PWREN2      = 0x60,
-+      PCF50606_ADCC2_RES_10BIT        = 0x00,
-+      PCF50606_ADCC2_RES_8BIT         = 0x80,
-+};
-+
-+#define PCF50606_ADCC2_ADCMUX_MASK    (0xf << 1)
-+
-+#define ADCMUX_SHIFT  1
-+enum pcf50606_adcc2_adcmux {
-+      PCF50606_ADCMUX_BATVOLT_RES     = 0x0 << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_BATVOLT_SUBTR   = 0x1 << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_ADCIN1_RES      = 0x2 << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_ADCIN1_SUBTR    = 0x3 << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_BATTEMP         = 0x4 << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_ADCIN2          = 0x5 << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_ADCIN3          = 0x6 << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_ADCIN3_RATIO    = 0x7 << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_XPOS            = 0x8 << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_YPOS            = 0x9 << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_P1              = 0xa << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_P2              = 0xb << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_BATVOLT_ADCIN1  = 0xc << ADCMUX_SHIFT,
-+      PCF50606_ADCMUX_XY_SEQUENCE     = 0xe << ADCMUX_SHIFT,
-+      PCF50606_P1_P2_RESISTANCE       = 0xf << ADCMUX_SHIFT,
-+};
-+
-+enum pcf50606_adcs2 {
-+      PCF50606_ADCS2_ADCRDY           = 0x80,
-+};
-+
-+enum pcf50606_reg_mbcc1 {
-+      PCF50606_MBCC1_CHGAPE           = 0x01,
-+      PCF50606_MBCC1_AUTOFST          = 0x02,
-+#define       PCF50606_MBCC1_CHGMOD_MASK        0x1c
-+#define       PCF50606_MBCC1_CHGMOD_SHIFT       2
-+      PCF50606_MBCC1_CHGMOD_QUAL      = 0x00,
-+      PCF50606_MBCC1_CHGMOD_PRE       = 0x04,
-+      PCF50606_MBCC1_CHGMOD_TRICKLE   = 0x08,
-+      PCF50606_MBCC1_CHGMOD_FAST_CCCV = 0x0c,
-+      PCF50606_MBCC1_CHGMOD_FAST_NOCC = 0x10,
-+      PCF50606_MBCC1_CHGMOD_FAST_NOCV = 0x14,
-+      PCF50606_MBCC1_CHGMOD_FAST_SW   = 0x18,
-+      PCF50606_MBCC1_CHGMOD_IDLE      = 0x1c,
-+      PCF50606_MBCC1_DETMOD_LOWCHG    = 0x20,
-+      PCF50606_MBCC1_DETMOD_WDRST     = 0x40,
-+};
-+
-+enum pcf50606_reg_acdc1 {
-+      PCF50606_ACDC1_ACDDET           = 0x01,
-+      PCF50606_ACDC1_THRSHLD_1V0      = 0x00,
-+      PCF50606_ACDC1_THRSHLD_1V2      = 0x02,
-+      PCF50606_ACDC1_THRSHLD_1V4      = 0x04,
-+      PCF50606_ACDC1_THRSHLD_1V6      = 0x06,
-+      PCF50606_ACDC1_THRSHLD_1V8      = 0x08,
-+      PCF50606_ACDC1_THRSHLD_2V0      = 0x0a,
-+      PCF50606_ACDC1_THRSHLD_2V2      = 0x0c,
-+      PCF50606_ACDC1_THRSHLD_2V4      = 0x0e,
-+      PCF50606_ACDC1_DISDB            = 0x10,
-+      PCF50606_ACDC1_ACDAPE           = 0x80,
-+};
-+
-+enum pcf50606_reg_bvmc {
-+      PCF50606_BVMC_LOWBAT            = 0x01,
-+      PCF50606_BVMC_THRSHLD_NULL      = 0x00,
-+      PCF50606_BVMC_THRSHLD_2V8       = 0x02,
-+      PCF50606_BVMC_THRSHLD_2V9       = 0x04,
-+      PCF50606_BVMC_THRSHLD_3V        = 0x08,
-+      PCF50606_BVMC_THRSHLD_3V1       = 0x08,
-+      PCF50606_BVMC_THRSHLD_3V2       = 0x0a,
-+      PCF50606_BVMC_THRSHLD_3V3       = 0x0c,
-+      PCF50606_BVMC_THRSHLD_3V4       = 0x0e,
-+      PCF50606_BVMC_DISDB             = 0x10,
-+};
-+
-+enum pcf50606_reg_pwmc1 {
-+      PCF50606_PWMC1_ACTSET           = 0x01,
-+      PCF50606_PWMC1_PWMDC_0_16       = 0x00,
-+      PCF50606_PWMC1_PWMDC_1_16       = 0x02,
-+      PCF50606_PWMC1_PWMDC_2_16       = 0x04,
-+      PCF50606_PWMC1_PWMDC_3_16       = 0x06,
-+      PCF50606_PWMC1_PWMDC_4_16       = 0x08,
-+      PCF50606_PWMC1_PWMDC_5_16       = 0x0a,
-+      PCF50606_PWMC1_PWMDC_6_16       = 0x0c,
-+      PCF50606_PWMC1_PWMDC_7_16       = 0x0e,
-+      PCF50606_PWMC1_PWMDC_8_16       = 0x10,
-+      PCF50606_PWMC1_PWMDC_9_16       = 0x12,
-+      PCF50606_PWMC1_PWMDC_10_16      = 0x14,
-+      PCF50606_PWMC1_PWMDC_11_16      = 0x16,
-+      PCF50606_PWMC1_PWMDC_12_16      = 0x18,
-+      PCF50606_PWMC1_PWMDC_13_16      = 0x1a,
-+      PCF50606_PWMC1_PWMDC_14_16      = 0x1c,
-+      PCF50606_PWMC1_PWMDC_15_16      = 0x1e,
-+      PCF50606_PWMC1_PRESC_512Hz      = 0x20,
-+      PCF50606_PWMC1_PRESC_256Hz      = 0x40,
-+      PCF50606_PWMC1_PRESC_64Hz       = 0x60,
-+      PCF50606_PWMC1_PRESC_56kHz      = 0x80,
-+      PCF50606_PWMC1_PRESC_28kHz      = 0xa0,
-+      PCF50606_PWMC1_PRESC_14kHz      = 0xc0,
-+      PCF50606_PWMC1_PRESC_7kHz       = 0xe0,
-+};
-+#define PCF50606_PWMC1_CLK_SHIFT      5
-+#define PCF50606_PWMC1_DC_SHIFT               1
-+
-+#endif /* _PCF50606_H */
-+
-diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
-index 580acc9..2cda699 100644
---- a/include/linux/i2c-id.h
-+++ b/include/linux/i2c-id.h
-@@ -94,6 +94,7 @@
- #define I2C_DRIVERID_I2CDEV   900
- #define I2C_DRIVERID_OV7670 1048      /* Omnivision 7670 camera */
-+#define I2C_DRIVERID_PCF50606 1049
- /*
-  * ---- Adapter types ----------------------------------------------------
-diff --git a/include/linux/pcf50606.h b/include/linux/pcf50606.h
-new file mode 100644
-index 0000000..bc98e47
---- /dev/null
-+++ b/include/linux/pcf50606.h
-@@ -0,0 +1,108 @@
-+#ifndef _LINUX_PCF50606_H
-+#define _LINUX_PCF50606_H
-+
-+/* public in-kernel pcf50606 api */
-+enum pcf50606_regulator_id {
-+      PCF50606_REGULATOR_DCD,
-+      PCF50606_REGULATOR_DCDE,
-+      PCF50606_REGULATOR_DCUD,
-+      PCF50606_REGULATOR_D1REG,
-+      PCF50606_REGULATOR_D2REG,
-+      PCF50606_REGULATOR_D3REG,
-+      PCF50606_REGULATOR_LPREG,
-+      PCF50606_REGULATOR_IOREG,
-+      __NUM_PCF50606_REGULATORS
-+};
-+
-+struct pcf50606_data;
-+
-+/* This is an ugly construct on how to access the (currently single/global)
-+ * pcf50606 handle from other code in the kernel.  I didn't really come up with
-+ * a more decent method of dynamically resolving this */
-+extern struct pcf50606_data *pcf50606_global;
-+
-+extern void
-+pcf50606_go_standby(void);
-+
-+extern void
-+pcf50606_gpo0_set(struct pcf50606_data *pcf, int on);
-+
-+extern int
-+pcf50606_gpo0_get(struct pcf50606_data *pcf);
-+
-+extern int
-+pcf50606_voltage_set(struct pcf50606_data *pcf,
-+                   enum pcf50606_regulator_id reg,
-+                   unsigned int millivolts);
-+extern unsigned int
-+pcf50606_voltage_get(struct pcf50606_data *pcf,
-+                   enum pcf50606_regulator_id reg);
-+extern int
-+pcf50606_onoff_get(struct pcf50606_data *pcf,
-+                 enum pcf50606_regulator_id reg);
-+
-+extern int
-+pcf50606_onoff_set(struct pcf50606_data *pcf,
-+                 enum pcf50606_regulator_id reg, int on);
-+
-+extern void
-+pcf50606_charge_fast(struct pcf50606_data *pcf, int on);
-+
-+#define PMU_VRAIL_F_SUSPEND_ON        0x00000001      /* Remains on during suspend */
-+#define PMU_VRAIL_F_UNUSED    0x00000002      /* This rail is not used */
-+struct pmu_voltage_rail {
-+      char *name;
-+      unsigned int flags;
-+      struct {
-+              unsigned int init;
-+              unsigned int max;
-+      } voltage;
-+};
-+
-+enum pmu_event {
-+      PMU_EVT_NONE,
-+      PMU_EVT_INSERT,
-+      PMU_EVT_REMOVE,
-+      __NUM_PMU_EVTS
-+};
-+
-+typedef int pmu_cb(struct device *dev, unsigned int feature,
-+                 enum pmu_event event);
-+
-+#define PCF50606_FEAT_EXTON   0x00000001      /* not yet supported */
-+#define PCF50606_FEAT_MBC     0x00000002
-+#define PCF50606_FEAT_BBC     0x00000004      /* not yet supported */
-+#define PCF50606_FEAT_TSC     0x00000008      /* not yet supported */
-+#define PCF50606_FEAT_WDT     0x00000010
-+#define PCF50606_FEAT_ACD     0x00000020
-+#define PCF50606_FEAT_RTC     0x00000040
-+#define PCF50606_FEAT_PWM     0x00000080
-+#define PCF50606_FEAT_CHGCUR  0x00000100
-+#define PCF50606_FEAT_BATVOLT 0x00000200
-+#define PCF50606_FEAT_BATTEMP 0x00000400
-+#define PCF50606_FEAT_PWM_BL  0x00000800
-+
-+struct pcf50606_platform_data {
-+      /* general */
-+      unsigned int used_features;
-+      unsigned int onkey_seconds_required;
-+
-+      /* voltage regulator related */
-+      struct pmu_voltage_rail rails[__NUM_PCF50606_REGULATORS];
-+      unsigned int used_regulators;
-+
-+      /* charger related */
-+      unsigned int r_fix_batt;
-+      unsigned int r_fix_batt_par;
-+      unsigned int r_sense_milli;
-+
-+      /* backlight related */
-+      unsigned int init_brightness;
-+
-+      struct {
-+              u_int8_t mbcc3; /* charger voltage / current */
-+      } charger;
-+      pmu_cb *cb;
-+};
-+
-+#endif
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1007-gta01-core.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1007-gta01-core.patch.patch
deleted file mode 100755 (executable)
index 7acdfb5..0000000
+++ /dev/null
@@ -1,831 +0,0 @@
-From 821c65f3420494eadf5260e48b54b9f59e6e865c Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:42 +0100
-Subject: [PATCH] gta01-core.patch
- This patch adds support for the FIC Neo1973 GTA01 machine type to the ARM port
- of the Linux kernel.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- MAINTAINERS                          |    8 +
- arch/arm/mach-s3c2410/Kconfig        |    8 +
- arch/arm/mach-s3c2410/Makefile       |   10 +
- arch/arm/mach-s3c2410/mach-gta01.c   |  658 ++++++++++++++++++++++++++++++++++
- arch/arm/plat-s3c24xx/Kconfig        |    5 +
- include/asm-arm/arch-s3c2410/gta01.h |   70 ++++
- 6 files changed, 759 insertions(+), 0 deletions(-)
- create mode 100644 arch/arm/mach-s3c2410/mach-gta01.c
- create mode 100644 include/asm-arm/arch-s3c2410/gta01.h
-
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 56a2f67..9c1a796 100644
---- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -1664,6 +1664,14 @@ P:      Akinobu Mita
- M:    akinobu.mita@gmail.com
- S:    Supported
-+FIC/OPENMOKO NEO1973 GSM PHONE
-+P:    Harald Welte
-+M:    laforge@openmoko.org
-+L:    openmoko-kernel@lists.openmoko.org
-+W:    http://wiki.openmoko.org/wiki/Kernel
-+W:    http://wiki.openmoko.org/wiki/Neo1973
-+S:    Maintained
-+
- FRAMEBUFFER LAYER
- P:    Antonino Daplas
- M:    adaplas@gmail.com
-diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
-index cd3dc08..7e3a1a2 100644
---- a/arch/arm/mach-s3c2410/Kconfig
-+++ b/arch/arm/mach-s3c2410/Kconfig
-@@ -117,5 +117,13 @@ config MACH_QT2410
-       help
-          Say Y here if you are using the Armzone QT2410
-+config MACH_NEO1973_GTA01
-+      bool "FIC Neo1973 GSM Phone (GTA01 Hardware)"
-+      select CPU_S3C2410
-+      select MACH_NEO1973
-+      select SENSORS_PCF50606
-+      help
-+         Say Y here if you are using the FIC Neo1973 GSM Phone
-+
- endmenu
-diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile
-index cabc13c..b73562f 100644
---- a/arch/arm/mach-s3c2410/Makefile
-+++ b/arch/arm/mach-s3c2410/Makefile
-@@ -30,3 +30,13 @@ obj-$(CONFIG_BAST_PC104_IRQ)        += bast-irq.o
- obj-$(CONFIG_MACH_TCT_HAMMER) += mach-tct_hammer.o
- obj-$(CONFIG_MACH_VR1000)     += mach-vr1000.o usb-simtec.o
- obj-$(CONFIG_MACH_QT2410)     += mach-qt2410.o
-+
-+# Common bits of machine support
-+
-+obj-$(CONFIG_SIMTEC_NOR)      += nor-simtec.o
-+
-+# machine additions
-+
-+obj-$(CONFIG_MACH_BAST_IDE)   += bast-ide.o
-+obj-$(CONFIG_MACH_NEO1973_GTA01)+= mach-gta01.o
-+
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-new file mode 100644
-index 0000000..e690ed7
---- /dev/null
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -0,0 +1,658 @@
-+/*
-+ * linux/arch/arm/mach-s3c2410/mach-gta01.c
-+ *
-+ * S3C2410 Machine Support for the FIC Neo1973 GTA01
-+ *
-+ * Copyright (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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
-+ *
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/types.h>
-+#include <linux/interrupt.h>
-+#include <linux/list.h>
-+#include <linux/timer.h>
-+#include <linux/init.h>
-+#include <linux/workqueue.h>
-+#include <linux/platform_device.h>
-+#include <linux/serial_core.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/spi_bitbang.h>
-+#include <linux/mmc/mmc.h>
-+#include <linux/mmc/host.h>
-+
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/nand.h>
-+#include <linux/mtd/nand_ecc.h>
-+#include <linux/mtd/partitions.h>
-+
-+#include <linux/mmc/host.h>
-+
-+#include <linux/pcf50606.h>
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/map.h>
-+#include <asm/mach/irq.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <asm/mach-types.h>
-+
-+#include <asm/arch/regs-gpio.h>
-+#include <asm/arch/fb.h>
-+#include <asm/arch/spi.h>
-+#include <asm/arch/spi-gpio.h>
-+#include <asm/arch/usb-control.h>
-+
-+#include <asm/arch/gta01.h>
-+
-+#include <asm/plat-s3c/regs-serial.h>
-+#include <asm/plat-s3c/nand.h>
-+#include <asm/plat-s3c24xx/devs.h>
-+#include <asm/plat-s3c24xx/cpu.h>
-+#include <asm/plat-s3c24xx/pm.h>
-+#include <asm/plat-s3c24xx/udc.h>
-+
-+static struct map_desc gta01_iodesc[] __initdata = {
-+      {
-+              .virtual        = 0xe0000000,
-+              .pfn            = __phys_to_pfn(S3C2410_CS3+0x01000000),
-+              .length         = SZ_1M,
-+              .type           = MT_DEVICE
-+      },
-+};
-+
-+#define UCON S3C2410_UCON_DEFAULT
-+#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
-+#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
-+
-+static struct s3c2410_uartcfg gta01_uartcfgs[] = {
-+      [0] = {
-+              .hwport      = 0,
-+              .flags       = 0,
-+              .ucon        = UCON,
-+              .ulcon       = ULCON,
-+              .ufcon       = UFCON,
-+      },
-+      [1] = {
-+              .hwport      = 1,
-+              .flags       = 0,
-+              .ucon        = UCON,
-+              .ulcon       = ULCON,
-+              .ufcon       = UFCON,
-+      },
-+};
-+
-+/* PMU driver info */
-+
-+static int pmu_callback(struct device *dev, unsigned int feature,
-+                      enum pmu_event event)
-+{
-+      switch (feature) {
-+      case PCF50606_FEAT_ACD:
-+              switch (event) {
-+              case PMU_EVT_INSERT:
-+                      pcf50606_charge_fast(pcf50606_global, 1);
-+                      break;
-+              case PMU_EVT_REMOVE:
-+                      pcf50606_charge_fast(pcf50606_global, 0);
-+                      break;
-+              default:
-+                      break;
-+              }
-+              break;
-+      default:
-+              break;
-+      }
-+
-+      return 0;
-+}
-+
-+static struct pcf50606_platform_data gta01_pcf_pdata = {
-+      .used_features  = PCF50606_FEAT_EXTON |
-+                        PCF50606_FEAT_MBC |
-+                        PCF50606_FEAT_BBC |
-+                        PCF50606_FEAT_RTC |
-+                        PCF50606_FEAT_WDT |
-+                        PCF50606_FEAT_CHGCUR |
-+                        PCF50606_FEAT_BATVOLT |
-+                        PCF50606_FEAT_BATTEMP,
-+      .onkey_seconds_required = 3,
-+      .cb             = &pmu_callback,
-+      .r_fix_batt     = 10000,
-+      .r_fix_batt_par = 10000,
-+      .r_sense_milli  = 220,
-+      .rails  = {
-+              [PCF50606_REGULATOR_D1REG] = {
-+                      .name           = "bt_3v15",
-+                      .voltage        = {
-+                              .init   = 3150,
-+                              .max    = 3150,
-+                      },
-+              },
-+              [PCF50606_REGULATOR_D2REG] = {
-+                      .name           = "gl_2v5",
-+                      .voltage        = {
-+                              .init   = 2500,
-+                              .max    = 2500,
-+                      },
-+              },
-+              [PCF50606_REGULATOR_D3REG] = {
-+                      .name           = "stby_1v8",
-+                      .flags          = PMU_VRAIL_F_SUSPEND_ON,
-+                      .voltage        = {
-+                              .init   = 1800,
-+                              .max    = 2100,
-+                      },
-+              },
-+              [PCF50606_REGULATOR_DCD] = {
-+                      .name           = "gl_1v5",
-+                      .voltage        = {
-+                              .init   = 1500,
-+                              .max    = 1500,
-+                      },
-+              },
-+              [PCF50606_REGULATOR_DCDE] = {
-+                      .name           = "io_3v3",
-+                      .flags          = PMU_VRAIL_F_SUSPEND_ON,
-+                      .voltage        = {
-+                              .init   = 3300,
-+                              .max    = 3330,
-+                      },
-+              },
-+              [PCF50606_REGULATOR_DCUD] = {
-+                      .name           = "core_1v8",
-+                      .flags          = PMU_VRAIL_F_SUSPEND_ON,
-+                      .voltage        = {
-+                              .init   = 2100,
-+                              .max    = 2100,
-+                      },
-+              },
-+              [PCF50606_REGULATOR_IOREG] = {
-+                      .name           = "codec_3v3",
-+                      .voltage        = {
-+                              .init   = 3300,
-+                              .max    = 3300,
-+                      },
-+              },
-+              [PCF50606_REGULATOR_LPREG] = {
-+                      .name           = "lcm_3v3",
-+                      .voltage        = {
-+                              .init   = 3300,
-+                              .max    = 3300,
-+                      },
-+              }
-+      },
-+};
-+
-+static void cfg_pmu_vrail(struct pmu_voltage_rail *vrail, char *name,
-+                        unsigned int flags, unsigned int init,
-+                        unsigned int max)
-+{
-+      vrail->name = name;
-+      vrail->flags = flags;
-+      vrail->voltage.init = init;
-+      vrail->voltage.max = max;
-+}
-+
-+static void mangle_pmu_pdata_by_system_rev(void)
-+{
-+      switch (system_rev) {
-+      case GTA01Bv4_SYSTEM_REV:
-+              gta01_pcf_pdata.used_features |= PCF50606_FEAT_ACD;
-+              break;
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+              gta01_pcf_pdata.rails[PCF50606_REGULATOR_D3REG]
-+                                      .name = "user1";
-+              gta01_pcf_pdata.rails[PCF50606_REGULATOR_D3REG]
-+                                      .flags &= ~PMU_VRAIL_F_SUSPEND_ON;
-+              gta01_pcf_pdata.rails[PCF50606_REGULATOR_D3REG]
-+                                      .flags = PMU_VRAIL_F_UNUSED;
-+              break;
-+      case GTA01v4_SYSTEM_REV:
-+              cfg_pmu_vrail(&gta01_pcf_pdata.rails[PCF50606_REGULATOR_DCUD],
-+                            "core_1v8", PMU_VRAIL_F_SUSPEND_ON, 1800, 1800);
-+              cfg_pmu_vrail(&gta01_pcf_pdata.rails[PCF50606_REGULATOR_D1REG],
-+                            "vrf_3v", 0, 3000, 3000);
-+              cfg_pmu_vrail(&gta01_pcf_pdata.rails[PCF50606_REGULATOR_D3REG],
-+                            "vtcxo_2v8", 0, 2800, 2800);
-+              cfg_pmu_vrail(&gta01_pcf_pdata.rails[PCF50606_REGULATOR_DCD],
-+                            "gl_3v5", 0, 3500, 3500);
-+              break;
-+      case GTA01v3_SYSTEM_REV:
-+              cfg_pmu_vrail(&gta01_pcf_pdata.rails[PCF50606_REGULATOR_D1REG],
-+                            "vrf_3v", 0, 3000, 3000);
-+              cfg_pmu_vrail(&gta01_pcf_pdata.rails[PCF50606_REGULATOR_D2REG],
-+                            "sd_3v3", 0, 3300, 3300);
-+              cfg_pmu_vrail(&gta01_pcf_pdata.rails[PCF50606_REGULATOR_D3REG],
-+                            "codec_3v3", 0, 3300, 3300);
-+              cfg_pmu_vrail(&gta01_pcf_pdata.rails[PCF50606_REGULATOR_DCD],
-+                            "gpsio_3v3", 0, 3300, 3300);
-+              cfg_pmu_vrail(&gta01_pcf_pdata.rails[PCF50606_REGULATOR_DCUD],
-+                            "core_1v8", PMU_VRAIL_F_SUSPEND_ON, 1800, 1800);
-+              cfg_pmu_vrail(&gta01_pcf_pdata.rails[PCF50606_REGULATOR_IOREG],
-+                            "vtcxo_2v8", 0, 2800, 2800);
-+              break;
-+      }
-+}
-+
-+static struct resource gta01_pmu_resources[] = {
-+      [0] = {
-+              .flags  = IORESOURCE_IRQ,
-+              .start  = GTA01_IRQ_PCF50606,
-+              .end    = GTA01_IRQ_PCF50606,
-+      },
-+};
-+
-+struct platform_device gta01_pmu_dev = {
-+      .name           = "pcf50606",
-+      .num_resources  = ARRAY_SIZE(gta01_pmu_resources),
-+      .resource       = gta01_pmu_resources,
-+      .dev            = {
-+              .platform_data = &gta01_pcf_pdata,
-+      },
-+};
-+
-+/* LCD driver info */
-+
-+/* Configuration for 480x640 toppoly TD028TTEC1.
-+ * Do not mark this as __initdata or it will break! */
-+static struct s3c2410fb_display gta01_displays[] =  {
-+      {
-+              .type           = S3C2410_LCDCON1_TFT,
-+              .width          = 43,
-+              .height         = 58,
-+              .xres           = 480,
-+              .yres           = 640,
-+              .bpp            = 16,
-+
-+              .pixclock       = 40000,        /* HCLK/4 */
-+              .left_margin    = 104,
-+              .right_margin   = 8,
-+              .hsync_len      = 8,
-+              .upper_margin   = 2,
-+              .lower_margin   = 16,
-+              .vsync_len      = 2,
-+              .lcdcon5        = S3C2410_LCDCON5_FRM565 |
-+                                S3C2410_LCDCON5_INVVCLK |
-+                                S3C2410_LCDCON5_INVVLINE |
-+                                S3C2410_LCDCON5_INVVFRAME |
-+                                S3C2410_LCDCON5_PWREN |
-+                                S3C2410_LCDCON5_HWSWP,
-+      },
-+      {
-+              .type           = S3C2410_LCDCON1_TFT,
-+              .width          = 43,
-+              .height         = 58,
-+              .xres           = 480,
-+              .yres           = 640,
-+              .bpp            = 32,
-+
-+              .pixclock       = 40000,        /* HCLK/4 */
-+              .left_margin    = 104,
-+              .right_margin   = 8,
-+              .hsync_len      = 8,
-+              .upper_margin   = 2,
-+              .lower_margin   = 16,
-+              .vsync_len      = 2,
-+              .lcdcon5        = S3C2410_LCDCON5_FRM565 |
-+                                S3C2410_LCDCON5_INVVCLK |
-+                                S3C2410_LCDCON5_INVVLINE |
-+                                S3C2410_LCDCON5_INVVFRAME |
-+                                S3C2410_LCDCON5_PWREN |
-+                                S3C2410_LCDCON5_HWSWP,
-+      },
-+      {
-+              .type           = S3C2410_LCDCON1_TFT,
-+              .width          = 43,
-+              .height         = 58,
-+              .xres           = 240,
-+              .yres           = 320,
-+              .bpp            = 16,
-+
-+              .pixclock       = 40000,        /* HCLK/4 */
-+              .left_margin    = 104,
-+              .right_margin   = 8,
-+              .hsync_len      = 8,
-+              .upper_margin   = 2,
-+              .lower_margin   = 16,
-+              .vsync_len      = 2,
-+              .lcdcon5        = S3C2410_LCDCON5_FRM565 |
-+                                S3C2410_LCDCON5_INVVCLK |
-+                                S3C2410_LCDCON5_INVVLINE |
-+                                S3C2410_LCDCON5_INVVFRAME |
-+                                S3C2410_LCDCON5_PWREN |
-+                                S3C2410_LCDCON5_HWSWP,
-+      },
-+};
-+
-+static struct s3c2410fb_mach_info gta01_lcd_cfg __initdata = {
-+      .displays       = gta01_displays,
-+      .num_displays   = ARRAY_SIZE(gta01_displays),
-+      .default_display = 0,
-+
-+      .lpcsel         = ((0xCE6) & ~7) | 1<<4,
-+};
-+
-+static struct platform_device *gta01_devices[] __initdata = {
-+      &s3c_device_usb,
-+      &s3c_device_lcd,
-+      &s3c_device_wdt,
-+      &s3c_device_i2c,
-+      &s3c_device_iis,
-+      &s3c_device_sdi,
-+      &s3c_device_usbgadget,
-+      &s3c_device_nand,
-+};
-+
-+static struct s3c2410_nand_set gta01_nand_sets[] = {
-+      [0] = {
-+              .name           = "neo1973-nand",
-+              .nr_chips       = 1,
-+              .flags          = S3C2410_NAND_BBT,
-+      },
-+};
-+
-+static struct s3c2410_platform_nand gta01_nand_info = {
-+      .tacls          = 20,
-+      .twrph0         = 60,
-+      .twrph1         = 20,
-+      .nr_sets        = ARRAY_SIZE(gta01_nand_sets),
-+      .sets           = gta01_nand_sets,
-+};
-+
-+static void gta01_udc_command(enum s3c2410_udc_cmd_e cmd)
-+{
-+      printk(KERN_DEBUG "%s(%d)\n", __func__, cmd);
-+
-+      switch (cmd) {
-+      case S3C2410_UDC_P_ENABLE:
-+              s3c2410_gpio_setpin(GTA01_GPIO_USB_PULLUP, 1);
-+              break;
-+      case S3C2410_UDC_P_DISABLE:
-+              s3c2410_gpio_setpin(GTA01_GPIO_USB_PULLUP, 0);
-+              break;
-+      default:
-+              break;
-+      }
-+}
-+
-+/* use a work queue, since I2C API inherently schedules
-+ * and we get called in hardirq context from UDC driver */
-+
-+struct vbus_draw {
-+      struct work_struct work;
-+      int ma;
-+};
-+static struct vbus_draw gta01_udc_vbus_drawer;
-+
-+static void __gta01_udc_vbus_draw(struct work_struct *work)
-+{
-+      /* this is a fix to work around boot-time ordering problems if the
-+       * s3c2410_udc is initialized before the pcf50606 driver has defined
-+       * pcf50606_global */
-+      if (!pcf50606_global)
-+              return;
-+
-+      if (gta01_udc_vbus_drawer.ma >= 500) {
-+              /* enable fast charge */
-+              printk(KERN_DEBUG "udc: enabling fast charge\n");
-+              pcf50606_charge_fast(pcf50606_global, 1);
-+      } else {
-+              /* disable fast charge */
-+              printk(KERN_DEBUG "udc: disabling fast charge\n");
-+              pcf50606_charge_fast(pcf50606_global, 0);
-+      }
-+}
-+
-+static void gta01_udc_vbus_draw(unsigned int ma)
-+{
-+      gta01_udc_vbus_drawer.ma = ma;
-+      schedule_work(&gta01_udc_vbus_drawer.work);
-+}
-+
-+static struct s3c2410_udc_mach_info gta01_udc_cfg = {
-+      .vbus_draw      = gta01_udc_vbus_draw,
-+};
-+
-+/* SPI */
-+
-+static struct spi_board_info gta01_spi_board_info[] = {
-+      {
-+              .modalias       = "jbt6k74",
-+              /* platform_data */
-+              /* controller_data */
-+              /* irq */
-+              .max_speed_hz   = 10 * 1000 * 1000,
-+              .bus_num        = 1,
-+              /* chip_select */
-+      },
-+};
-+
-+static void spi_gpio_cs(struct s3c2410_spigpio_info *spi, int cs)
-+{
-+      switch (cs) {
-+      case BITBANG_CS_ACTIVE:
-+              s3c2410_gpio_setpin(S3C2410_GPG3, 0);
-+              break;
-+      case BITBANG_CS_INACTIVE:
-+              s3c2410_gpio_setpin(S3C2410_GPG3, 1);
-+              break;
-+      }
-+}
-+
-+static struct s3c2410_spigpio_info spi_gpio_cfg = {
-+      .pin_clk        = S3C2410_GPG7,
-+      .pin_mosi       = S3C2410_GPG6,
-+      .pin_miso       = S3C2410_GPG5,
-+      .board_size     = ARRAY_SIZE(gta01_spi_board_info),
-+      .board_info     = gta01_spi_board_info,
-+      .chip_select    = &spi_gpio_cs,
-+};
-+
-+static struct resource s3c_spi_lcm_resource[] = {
-+      [0] = {
-+              .start = S3C2410_GPG3,
-+              .end   = S3C2410_GPG3,
-+      },
-+      [1] = {
-+              .start = S3C2410_GPG5,
-+              .end   = S3C2410_GPG5,
-+      },
-+      [2] = {
-+              .start = S3C2410_GPG6,
-+              .end   = S3C2410_GPG6,
-+      },
-+      [3] = {
-+              .start = S3C2410_GPG7,
-+              .end   = S3C2410_GPG7,
-+      },
-+};
-+
-+struct platform_device s3c_device_spi_lcm = {
-+      .name             = "s3c24xx-spi-gpio",
-+      .id               = 1,
-+      .num_resources    = ARRAY_SIZE(s3c_spi_lcm_resource),
-+      .resource         = s3c_spi_lcm_resource,
-+      .dev = {
-+              .platform_data = &spi_gpio_cfg,
-+      },
-+};
-+
-+static struct gta01bl_machinfo backlight_machinfo = {
-+      .default_intensity      = 1,
-+      .max_intensity          = 1,
-+      .limit_mask             = 1,
-+};
-+
-+static struct resource gta01_bl_resources[] = {
-+      [0] = {
-+              .start  = GTA01_GPIO_BACKLIGHT,
-+              .end    = GTA01_GPIO_BACKLIGHT,
-+      },
-+};
-+
-+struct platform_device gta01_bl_dev = {
-+      .name           = "gta01-bl",
-+      .num_resources  = ARRAY_SIZE(gta01_bl_resources),
-+      .resource       = gta01_bl_resources,
-+      .dev            = {
-+              .platform_data = &backlight_machinfo,
-+      },
-+};
-+
-+static struct resource gta01_led_resources[] = {
-+      [0] = {
-+              .start  = GTA01_GPIO_VIBRATOR_ON,
-+              .end    = GTA01_GPIO_VIBRATOR_ON,
-+      },
-+};
-+
-+struct platform_device gta01_led_dev = {
-+      .name           = "neo1973-vibrator",
-+      .num_resources  = ARRAY_SIZE(gta01_led_resources),
-+      .resource       = gta01_led_resources,
-+};
-+
-+static struct resource gta01_button_resources[] = {
-+      [0] = {
-+              .start = GTA01_GPIO_AUX_KEY,
-+              .end   = GTA01_GPIO_AUX_KEY,
-+      },
-+      [1] = {
-+              .start = GTA01_GPIO_HOLD_KEY,
-+              .end   = GTA01_GPIO_HOLD_KEY,
-+      },
-+      [2] = {
-+              .start = GTA01_GPIO_JACK_INSERT,
-+              .end   = GTA01_GPIO_JACK_INSERT,
-+      },
-+};
-+
-+struct platform_device gta01_button_dev = {
-+      .name           = "neo1973-button",
-+      .num_resources  = ARRAY_SIZE(gta01_button_resources),
-+      .resource       = gta01_button_resources,
-+};
-+
-+static struct platform_device gta01_pm_gsm_dev = {
-+      .name           = "neo1973-pm-gsm",
-+};
-+
-+/* USB */
-+static struct s3c2410_hcd_info gta01_usb_info = {
-+      .port[0]        = {
-+              .flags  = S3C_HCDFLG_USED,
-+      },
-+      .port[1]        = {
-+              .flags  = 0,
-+      },
-+};
-+
-+static void __init gta01_map_io(void)
-+{
-+      s3c24xx_init_io(gta01_iodesc, ARRAY_SIZE(gta01_iodesc));
-+      s3c24xx_init_clocks(12*1000*1000);
-+      s3c24xx_init_uarts(gta01_uartcfgs, ARRAY_SIZE(gta01_uartcfgs));
-+}
-+
-+static irqreturn_t gta01_modem_irq(int irq, void *param)
-+{
-+      printk(KERN_DEBUG "modem wakeup interrupt\n");
-+      return IRQ_HANDLED;
-+}
-+
-+static void __init gta01_machine_init(void)
-+{
-+      int rc;
-+
-+      if (system_rev == GTA01v4_SYSTEM_REV ||
-+          system_rev == GTA01Bv2_SYSTEM_REV ||
-+          system_rev == GTA01Bv3_SYSTEM_REV ||
-+          system_rev == GTA01Bv4_SYSTEM_REV) {
-+              gta01_udc_cfg.udc_command = gta01_udc_command;
-+      }
-+
-+      s3c_device_usb.dev.platform_data = &gta01_usb_info;
-+      s3c_device_nand.dev.platform_data = &gta01_nand_info;
-+
-+      s3c24xx_fb_set_platdata(&gta01_lcd_cfg);
-+
-+      INIT_WORK(&gta01_udc_vbus_drawer.work, __gta01_udc_vbus_draw);
-+      s3c24xx_udc_set_platdata(&gta01_udc_cfg);
-+
-+      /* Set LCD_RESET / XRES to high */
-+      s3c2410_gpio_cfgpin(S3C2410_GPC6, S3C2410_GPIO_OUTPUT);
-+      s3c2410_gpio_setpin(S3C2410_GPC6, 1);
-+
-+      /* SPI chip select is gpio output */
-+      s3c2410_gpio_cfgpin(S3C2410_GPG3, S3C2410_GPIO_OUTPUT);
-+      s3c2410_gpio_setpin(S3C2410_GPG3, 1);
-+      platform_device_register(&s3c_device_spi_lcm);
-+
-+      platform_device_register(&gta01_bl_dev);
-+      platform_device_register(&gta01_button_dev);
-+      platform_device_register(&gta01_pm_gsm_dev);
-+
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+      case GTA01v4_SYSTEM_REV:
-+              /* just use the default (GTA01_IRQ_PCF50606) */
-+              break;
-+      case GTA01Bv2_SYSTEM_REV:
-+      case GTA01Bv3_SYSTEM_REV:
-+              /* just use the default (GTA01_IRQ_PCF50606) */
-+              gta01_led_resources[0].start =
-+                      gta01_led_resources[0].end = GTA01Bv2_GPIO_VIBRATOR_ON;
-+              break;
-+      case GTA01Bv4_SYSTEM_REV:
-+              gta01_pmu_resources[0].start =
-+                      gta01_pmu_resources[0].end = GTA01Bv4_IRQ_PCF50606;
-+              gta01_led_resources[0].start =
-+                      gta01_led_resources[0].end = GTA01Bv4_GPIO_VIBRATOR_ON;
-+              break;
-+      }
-+      mangle_pmu_pdata_by_system_rev();
-+      platform_device_register(&gta01_pmu_dev);
-+      platform_device_register(&gta01_led_dev);
-+
-+      platform_add_devices(gta01_devices, ARRAY_SIZE(gta01_devices));
-+
-+      s3c2410_pm_init();
-+
-+      set_irq_type(GTA01_IRQ_MODEM, IRQT_RISING);
-+      rc = request_irq(GTA01_IRQ_MODEM, gta01_modem_irq, IRQF_DISABLED,
-+                       "modem", NULL);
-+      if (!rc)
-+              printk(KERN_ERR  "GTA01: can't request GSM modem wakeup IRQ\n");
-+      enable_irq_wake(GTA01_IRQ_MODEM);
-+}
-+
-+MACHINE_START(NEO1973_GTA01, "GTA01")
-+      .phys_io        = S3C2410_PA_UART,
-+      .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
-+      .boot_params    = S3C2410_SDRAM_PA + 0x100,
-+      .map_io         = gta01_map_io,
-+      .init_irq       = s3c24xx_init_irq,
-+      .init_machine   = gta01_machine_init,
-+      .timer          = &s3c24xx_timer,
-+MACHINE_END
-diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig
-index b66fb3c..7ee4b82 100644
---- a/arch/arm/plat-s3c24xx/Kconfig
-+++ b/arch/arm/plat-s3c24xx/Kconfig
-@@ -46,4 +46,9 @@ config MACH_SMDK
-       help
-         Common machine code for SMDK2410 and SMDK2440
-+config MACH_NEO1973
-+      bool
-+      help
-+        Common machine code for Neo1973 hardware
-+
- endif
-diff --git a/include/asm-arm/arch-s3c2410/gta01.h b/include/asm-arm/arch-s3c2410/gta01.h
-new file mode 100644
-index 0000000..1cc2099
---- /dev/null
-+++ b/include/asm-arm/arch-s3c2410/gta01.h
-@@ -0,0 +1,70 @@
-+#ifndef _GTA01_H
-+#define _GTA01_H
-+
-+#include <asm/arch/regs-gpio.h>
-+#include <asm/arch/irqs.h>
-+
-+/* Different hardware revisions, passed in ATAG_REVISION by u-boot */
-+#define GTA01v3_SYSTEM_REV    0x00000130
-+#define GTA01v4_SYSTEM_REV    0x00000140
-+#define GTA01Bv2_SYSTEM_REV   0x00000220
-+#define GTA01Bv3_SYSTEM_REV   0x00000230
-+#define GTA01Bv4_SYSTEM_REV   0x00000240
-+
-+/* Backlight */
-+struct gta01bl_machinfo {
-+      unsigned int default_intensity;
-+      unsigned int max_intensity;
-+      unsigned int limit_mask;
-+};
-+
-+/* Definitions common to all revisions */
-+#define GTA01_GPIO_BACKLIGHT  S3C2410_GPB0
-+#define GTA01_GPIO_GPS_PWRON  S3C2410_GPB1
-+#define GTA01_GPIO_MODEM_RST  S3C2410_GPB6
-+#define GTA01_GPIO_MODEM_ON   S3C2410_GPB7
-+#define GTA01_GPIO_LCD_RESET  S3C2410_GPC6
-+#define GTA01_GPIO_PMU_IRQ    S3C2410_GPG8
-+#define GTA01_GPIO_JACK_INSERT        S3C2410_GPF4
-+#define GTA01_GPIO_nSD_DETECT S3C2410_GPF5
-+#define GTA01_GPIO_AUX_KEY    S3C2410_GPF6
-+#define GTA01_GPIO_HOLD_KEY   S3C2410_GPF7
-+#define GTA01_GPIO_VIBRATOR_ON        S3C2410_GPG11
-+
-+#define GTA01_IRQ_MODEM               IRQ_EINT1
-+#define GTA01_IRQ_JACK_INSERT IRQ_EINT4
-+#define GTA01_IRQ_nSD_DETECT  IRQ_EINT5
-+#define GTA01_IRQ_AUX_KEY     IRQ_EINT6
-+#define GTA01_IRQ_PCF50606      IRQ_EINT16
-+
-+/* GTA01v3 */
-+#define GTA01v3_GPIO_nGSM_EN  S3C2410_GPG9
-+
-+/* GTA01v4 */
-+#define GTA01_GPIO_MODEM_DNLOAD       S3C2410_GPG0
-+
-+/* GTA01Bv2 */
-+#define GTA01Bv2_GPIO_nGSM_EN S3C2410_GPF2
-+#define GTA01Bv2_GPIO_VIBRATOR_ON S3C2410_GPB10
-+
-+/* GTA01Bv3 */
-+#define GTA01_GPIO_GPS_EN_3V3 S3C2410_GPG9
-+
-+#define GTA01_GPIO_SDMMC_ON   S3C2410_GPB2
-+#define GTA01_GPIO_BT_EN      S3C2410_GPB5
-+#define GTA01_GPIO_AB_DETECT  S3C2410_GPB8
-+#define GTA01_GPIO_USB_PULLUP S3C2410_GPB9
-+#define GTA01_GPIO_USB_ATTACH S3C2410_GPB10
-+
-+#define GTA01_GPIO_GPS_EN_2V8 S3C2410_GPG9
-+#define GTA01_GPIO_GPS_EN_3V  S3C2410_GPG10
-+#define GTA01_GPIO_GPS_RESET  S3C2410_GPC0
-+
-+/* GTA01Bv4 */
-+#define GTA01Bv4_GPIO_nNAND_WP        S3C2410_GPA16
-+#define GTA01Bv4_GPIO_VIBRATOR_ON S3C2410_GPB3
-+#define GTA01Bv4_GPIO_PMU_IRQ S3C2410_GPG1
-+
-+#define GTA01Bv4_IRQ_PCF50606 IRQ_EINT9
-+
-+#endif /* _GTA01_H */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1008-gta01-jbt6k74.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1008-gta01-jbt6k74.patch.patch
deleted file mode 100755 (executable)
index f5ea55e..0000000
+++ /dev/null
@@ -1,748 +0,0 @@
-From 5b0814282e6878f7f2f07b98cc8b0128e7ea423d Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:48 +0100
-Subject: [PATCH] gta01-jbt6k74.patch
- This driver adds support for the SPI-based control interface of the LCM (LCD
- Panel) found on the FIC GTA01 hardware.
-
-The specific panel in this hardware is a TPO TD028TTEC1, but the driver should
-be able to drive any other diplay based on the JBT6K74-AS controller ASIC.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- arch/arm/mach-s3c2410/Kconfig   |    1 +
- drivers/video/display/Kconfig   |   11 +
- drivers/video/display/Makefile  |    1 +
- drivers/video/display/jbt6k74.c |  678 +++++++++++++++++++++++++++++++++++++++
- 4 files changed, 691 insertions(+), 0 deletions(-)
- create mode 100644 drivers/video/display/jbt6k74.c
-
-diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
-index 7e3a1a2..58519e6 100644
---- a/arch/arm/mach-s3c2410/Kconfig
-+++ b/arch/arm/mach-s3c2410/Kconfig
-@@ -114,6 +114,7 @@ config MACH_VR1000
- config MACH_QT2410
-       bool "QT2410"
-       select CPU_S3C2410
-+      select DISPLAY_JBT6K74
-       help
-          Say Y here if you are using the Armzone QT2410
-diff --git a/drivers/video/display/Kconfig b/drivers/video/display/Kconfig
-index f99af93..f0da483 100644
---- a/drivers/video/display/Kconfig
-+++ b/drivers/video/display/Kconfig
-@@ -21,4 +21,15 @@ config DISPLAY_SUPPORT
- comment "Display hardware drivers"
-       depends on DISPLAY_SUPPORT
-+config DISPLAY_JBT6K74
-+      tristate "TPO JBT6K74-AS TFT display ASIC control interface"
-+      depends on SPI_MASTER && SYSFS
-+      help
-+        SPI driver for the control interface of TFT panels containing
-+        the TPO JBT6K74-AS controller ASIC, such as the TPO TD028TTEC1
-+        TFT diplay module used in the FIC/OpenMoko Neo1973 GSM phones.
-+
-+        The control interface is required for display operation, as it
-+        controls power management, display timing and gamma calibration.
-+
- endmenu
-diff --git a/drivers/video/display/Makefile b/drivers/video/display/Makefile
-index c0ea832..011b69d 100644
---- a/drivers/video/display/Makefile
-+++ b/drivers/video/display/Makefile
-@@ -3,4 +3,5 @@
- display-objs                          := display-sysfs.o
- obj-$(CONFIG_DISPLAY_SUPPORT)         += display.o
-+obj-$(CONFIG_DISPLAY_JBT6K74)         += jbt6k74.o
-diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c
-new file mode 100644
-index 0000000..d021d7e
---- /dev/null
-+++ b/drivers/video/display/jbt6k74.c
-@@ -0,0 +1,678 @@
-+/* Linux kernel driver for the tpo JBT6K74-AS LCM ASIC
-+ *
-+ * Copyright (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>,
-+ *       Stefan Schmidt <stefan@openmoko.org>
-+ * 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
-+ *
-+ */
-+#include <linux/kernel.h>
-+#include <linux/types.h>
-+#include <linux/module.h>
-+#include <linux/device.h>
-+#include <linux/platform_device.h>
-+#include <linux/delay.h>
-+
-+#include <linux/spi/spi.h>
-+
-+enum jbt_register {
-+      JBT_REG_SLEEP_IN                = 0x10,
-+      JBT_REG_SLEEP_OUT               = 0x11,
-+
-+      JBT_REG_DISPLAY_OFF             = 0x28,
-+      JBT_REG_DISPLAY_ON              = 0x29,
-+
-+      JBT_REG_RGB_FORMAT              = 0x3a,
-+      JBT_REG_QUAD_RATE               = 0x3b,
-+
-+      JBT_REG_POWER_ON_OFF            = 0xb0,
-+      JBT_REG_BOOSTER_OP              = 0xb1,
-+      JBT_REG_BOOSTER_MODE            = 0xb2,
-+      JBT_REG_BOOSTER_FREQ            = 0xb3,
-+      JBT_REG_OPAMP_SYSCLK            = 0xb4,
-+      JBT_REG_VSC_VOLTAGE             = 0xb5,
-+      JBT_REG_VCOM_VOLTAGE            = 0xb6,
-+      JBT_REG_EXT_DISPL               = 0xb7,
-+      JBT_REG_OUTPUT_CONTROL          = 0xb8,
-+      JBT_REG_DCCLK_DCEV              = 0xb9,
-+      JBT_REG_DISPLAY_MODE1           = 0xba,
-+      JBT_REG_DISPLAY_MODE2           = 0xbb,
-+      JBT_REG_DISPLAY_MODE            = 0xbc,
-+      JBT_REG_ASW_SLEW                = 0xbd,
-+      JBT_REG_DUMMY_DISPLAY           = 0xbe,
-+      JBT_REG_DRIVE_SYSTEM            = 0xbf,
-+
-+      JBT_REG_SLEEP_OUT_FR_A          = 0xc0,
-+      JBT_REG_SLEEP_OUT_FR_B          = 0xc1,
-+      JBT_REG_SLEEP_OUT_FR_C          = 0xc2,
-+      JBT_REG_SLEEP_IN_LCCNT_D        = 0xc3,
-+      JBT_REG_SLEEP_IN_LCCNT_E        = 0xc4,
-+      JBT_REG_SLEEP_IN_LCCNT_F        = 0xc5,
-+      JBT_REG_SLEEP_IN_LCCNT_G        = 0xc6,
-+
-+      JBT_REG_GAMMA1_FINE_1           = 0xc7,
-+      JBT_REG_GAMMA1_FINE_2           = 0xc8,
-+      JBT_REG_GAMMA1_INCLINATION      = 0xc9,
-+      JBT_REG_GAMMA1_BLUE_OFFSET      = 0xca,
-+
-+      /* VGA */
-+      JBT_REG_BLANK_CONTROL           = 0xcf,
-+      JBT_REG_BLANK_TH_TV             = 0xd0,
-+      JBT_REG_CKV_ON_OFF              = 0xd1,
-+      JBT_REG_CKV_1_2                 = 0xd2,
-+      JBT_REG_OEV_TIMING              = 0xd3,
-+      JBT_REG_ASW_TIMING_1            = 0xd4,
-+      JBT_REG_ASW_TIMING_2            = 0xd5,
-+
-+      /* QVGA */
-+      JBT_REG_BLANK_CONTROL_QVGA      = 0xd6,
-+      JBT_REG_BLANK_TH_TV_QVGA        = 0xd7,
-+      JBT_REG_CKV_ON_OFF_QVGA         = 0xd8,
-+      JBT_REG_CKV_1_2_QVGA            = 0xd9,
-+      JBT_REG_OEV_TIMING_QVGA         = 0xde,
-+      JBT_REG_ASW_TIMING_1_QVGA       = 0xdf,
-+      JBT_REG_ASW_TIMING_2_QVGA       = 0xe0,
-+
-+
-+      JBT_REG_HCLOCK_VGA              = 0xec,
-+      JBT_REG_HCLOCK_QVGA             = 0xed,
-+
-+};
-+
-+enum jbt_state {
-+      JBT_STATE_DEEP_STANDBY,
-+      JBT_STATE_SLEEP,
-+      JBT_STATE_NORMAL,
-+      JBT_STATE_QVGA_NORMAL,
-+};
-+
-+static const char *jbt_state_names[] = {
-+      [JBT_STATE_DEEP_STANDBY]        = "deep-standby",
-+      [JBT_STATE_SLEEP]               = "sleep",
-+      [JBT_STATE_NORMAL]              = "normal",
-+      [JBT_STATE_QVGA_NORMAL]         = "qvga-normal",
-+};
-+
-+struct jbt_info {
-+      enum jbt_state state, last_state;
-+      struct spi_device *spi_dev;
-+      struct mutex lock;              /* protects tx_buf and reg_cache */
-+      u16 tx_buf[8];
-+      u16 reg_cache[0xEE];
-+};
-+
-+#define JBT_COMMAND   0x000
-+#define JBT_DATA      0x100
-+
-+static int jbt_reg_write_nodata(struct jbt_info *jbt, u8 reg)
-+{
-+      int rc;
-+
-+      mutex_lock(&jbt->lock);
-+
-+      jbt->tx_buf[0] = JBT_COMMAND | reg;
-+      rc = spi_write(jbt->spi_dev, (u8 *)jbt->tx_buf,
-+                     1*sizeof(u16));
-+      if (rc == 0)
-+              jbt->reg_cache[reg] = 0;
-+
-+      mutex_unlock(&jbt->lock);
-+
-+      return rc;
-+}
-+
-+
-+static int jbt_reg_write(struct jbt_info *jbt, u8 reg, u8 data)
-+{
-+      int rc;
-+
-+      mutex_lock(&jbt->lock);
-+
-+      jbt->tx_buf[0] = JBT_COMMAND | reg;
-+      jbt->tx_buf[1] = JBT_DATA | data;
-+      rc = spi_write(jbt->spi_dev, (u8 *)jbt->tx_buf,
-+                     2*sizeof(u16));
-+      if (rc == 0)
-+              jbt->reg_cache[reg] = data;
-+
-+      mutex_unlock(&jbt->lock);
-+
-+      return rc;
-+}
-+
-+static int jbt_reg_write16(struct jbt_info *jbt, u8 reg, u16 data)
-+{
-+      int rc;
-+
-+      mutex_lock(&jbt->lock);
-+
-+      jbt->tx_buf[0] = JBT_COMMAND | reg;
-+      jbt->tx_buf[1] = JBT_DATA | (data >> 8);
-+      jbt->tx_buf[2] = JBT_DATA | (data & 0xff);
-+
-+      rc = spi_write(jbt->spi_dev, (u8 *)jbt->tx_buf,
-+                     3*sizeof(u16));
-+      if (rc == 0)
-+              jbt->reg_cache[reg] = data;
-+
-+      mutex_unlock(&jbt->lock);
-+
-+      return rc;
-+}
-+
-+static int jbt_init_regs(struct jbt_info *jbt, int qvga)
-+{
-+      int rc;
-+
-+      dev_dbg(&jbt->spi_dev->dev, "entering %cVGA mode\n", qvga ? 'Q' : ' ');
-+
-+      rc = jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE1, 0x01);
-+      rc |= jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE2, 0x00);
-+      rc |= jbt_reg_write(jbt, JBT_REG_RGB_FORMAT, 0x60);
-+      rc |= jbt_reg_write(jbt, JBT_REG_DRIVE_SYSTEM, 0x10);
-+      rc |= jbt_reg_write(jbt, JBT_REG_BOOSTER_OP, 0x56);
-+      rc |= jbt_reg_write(jbt, JBT_REG_BOOSTER_MODE, 0x33);
-+      rc |= jbt_reg_write(jbt, JBT_REG_BOOSTER_FREQ, 0x11);
-+      rc |= jbt_reg_write(jbt, JBT_REG_OPAMP_SYSCLK, 0x02);
-+      rc |= jbt_reg_write(jbt, JBT_REG_VSC_VOLTAGE, 0x2b);
-+      rc |= jbt_reg_write(jbt, JBT_REG_VCOM_VOLTAGE, 0x40);
-+      rc |= jbt_reg_write(jbt, JBT_REG_EXT_DISPL, 0x03);
-+      rc |= jbt_reg_write(jbt, JBT_REG_DCCLK_DCEV, 0x04);
-+      /*
-+       * default of 0x02 in JBT_REG_ASW_SLEW responsible for 72Hz requirement
-+       * to avoid red / blue flicker
-+       */
-+      rc |= jbt_reg_write(jbt, JBT_REG_ASW_SLEW, 0x04);
-+      rc |= jbt_reg_write(jbt, JBT_REG_DUMMY_DISPLAY, 0x00);
-+
-+      rc |= jbt_reg_write(jbt, JBT_REG_SLEEP_OUT_FR_A, 0x11);
-+      rc |= jbt_reg_write(jbt, JBT_REG_SLEEP_OUT_FR_B, 0x11);
-+      rc |= jbt_reg_write(jbt, JBT_REG_SLEEP_OUT_FR_C, 0x11);
-+      rc |= jbt_reg_write16(jbt, JBT_REG_SLEEP_IN_LCCNT_D, 0x2040);
-+      rc |= jbt_reg_write16(jbt, JBT_REG_SLEEP_IN_LCCNT_E, 0x60c0);
-+      rc |= jbt_reg_write16(jbt, JBT_REG_SLEEP_IN_LCCNT_F, 0x1020);
-+      rc |= jbt_reg_write16(jbt, JBT_REG_SLEEP_IN_LCCNT_G, 0x60c0);
-+
-+      rc |= jbt_reg_write16(jbt, JBT_REG_GAMMA1_FINE_1, 0x5533);
-+      rc |= jbt_reg_write(jbt, JBT_REG_GAMMA1_FINE_2, 0x00);
-+      rc |= jbt_reg_write(jbt, JBT_REG_GAMMA1_INCLINATION, 0x00);
-+      rc |= jbt_reg_write(jbt, JBT_REG_GAMMA1_BLUE_OFFSET, 0x00);
-+
-+      if (!qvga) {
-+              rc |= jbt_reg_write16(jbt, JBT_REG_HCLOCK_VGA, 0x1f0);
-+              rc |= jbt_reg_write(jbt, JBT_REG_BLANK_CONTROL, 0x02);
-+              rc |= jbt_reg_write16(jbt, JBT_REG_BLANK_TH_TV, 0x0804);
-+
-+              rc |= jbt_reg_write(jbt, JBT_REG_CKV_ON_OFF, 0x01);
-+              rc |= jbt_reg_write16(jbt, JBT_REG_CKV_1_2, 0x0000);
-+
-+              rc |= jbt_reg_write16(jbt, JBT_REG_OEV_TIMING, 0x0d0e);
-+              rc |= jbt_reg_write16(jbt, JBT_REG_ASW_TIMING_1, 0x11a4);
-+              rc |= jbt_reg_write(jbt, JBT_REG_ASW_TIMING_2, 0x0e);
-+      } else {
-+              rc |= jbt_reg_write16(jbt, JBT_REG_HCLOCK_QVGA, 0x00ff);
-+              rc |= jbt_reg_write(jbt, JBT_REG_BLANK_CONTROL_QVGA, 0x02);
-+              rc |= jbt_reg_write16(jbt, JBT_REG_BLANK_TH_TV_QVGA, 0x0804);
-+
-+              rc |= jbt_reg_write(jbt, JBT_REG_CKV_ON_OFF_QVGA, 0x01);
-+              rc |= jbt_reg_write16(jbt, JBT_REG_CKV_1_2_QVGA, 0x0008);
-+
-+              rc |= jbt_reg_write16(jbt, JBT_REG_OEV_TIMING_QVGA, 0x050a);
-+              rc |= jbt_reg_write16(jbt, JBT_REG_ASW_TIMING_1_QVGA, 0x0a19);
-+              rc |= jbt_reg_write(jbt, JBT_REG_ASW_TIMING_2_QVGA, 0x0a);
-+      }
-+
-+      return rc ? -EIO : 0;
-+}
-+
-+static int standby_to_sleep(struct jbt_info *jbt)
-+{
-+      int rc;
-+
-+      /* three times command zero */
-+      rc = jbt_reg_write_nodata(jbt, 0x00);
-+      mdelay(1);
-+      rc |= jbt_reg_write_nodata(jbt, 0x00);
-+      mdelay(1);
-+      rc |= jbt_reg_write_nodata(jbt, 0x00);
-+      mdelay(1);
-+
-+      /* deep standby out */
-+      rc |= jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x17);
-+
-+      return rc ? -EIO : 0;
-+}
-+
-+static int sleep_to_normal(struct jbt_info *jbt)
-+{
-+      int rc;
-+
-+      /* RGB I/F on, RAM wirte off, QVGA through, SIGCON enable */
-+      rc = jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE, 0x80);
-+
-+      /* Quad mode off */
-+      rc |= jbt_reg_write(jbt, JBT_REG_QUAD_RATE, 0x00);
-+
-+      /* AVDD on, XVDD on */
-+      rc |= jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x16);
-+
-+      /* Output control */
-+      rc |= jbt_reg_write16(jbt, JBT_REG_OUTPUT_CONTROL, 0xfff9);
-+
-+      /* Sleep mode off */
-+      rc |= jbt_reg_write_nodata(jbt, JBT_REG_SLEEP_OUT);
-+
-+      /* initialize register set */
-+      rc |= jbt_init_regs(jbt, 0);
-+
-+      return rc ? -EIO : 0;
-+}
-+
-+static int sleep_to_qvga_normal(struct jbt_info *jbt)
-+{
-+      int rc;
-+
-+      /* RGB I/F on, RAM wirte off, QVGA through, SIGCON enable */
-+      rc = jbt_reg_write(jbt, JBT_REG_DISPLAY_MODE, 0x81);
-+
-+      /* Quad mode on */
-+      rc |= jbt_reg_write(jbt, JBT_REG_QUAD_RATE, 0x22);
-+
-+      /* AVDD on, XVDD on */
-+      rc |= jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x16);
-+
-+      /* Output control */
-+      rc |= jbt_reg_write16(jbt, JBT_REG_OUTPUT_CONTROL, 0xfff9);
-+
-+      /* Sleep mode off */
-+      rc |= jbt_reg_write_nodata(jbt, JBT_REG_SLEEP_OUT);
-+
-+      /* initialize register set for qvga*/
-+      rc |= jbt_init_regs(jbt, 1);
-+
-+      return rc ? -EIO : 0;
-+}
-+
-+static int normal_to_sleep(struct jbt_info *jbt)
-+{
-+      int rc;
-+
-+      rc = jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_OFF);
-+      rc |= jbt_reg_write16(jbt, JBT_REG_OUTPUT_CONTROL, 0x8002);
-+      rc |= jbt_reg_write_nodata(jbt, JBT_REG_SLEEP_IN);
-+
-+      return rc ? -EIO : 0;
-+}
-+
-+static int sleep_to_standby(struct jbt_info *jbt)
-+{
-+      return jbt_reg_write(jbt, JBT_REG_POWER_ON_OFF, 0x00);
-+}
-+
-+/* frontend function */
-+int jbt6k74_enter_state(struct jbt_info *jbt, enum jbt_state new_state)
-+{
-+      int rc = -EINVAL;
-+
-+      dev_dbg(&jbt->spi_dev->dev, "entering (old_state=%u, "
-+              "new_state=%u)\n", jbt->state, new_state);
-+
-+      switch (jbt->state) {
-+      case JBT_STATE_DEEP_STANDBY:
-+              switch (new_state) {
-+              case JBT_STATE_DEEP_STANDBY:
-+                      rc = 0;
-+                      break;
-+              case JBT_STATE_SLEEP:
-+                      rc = standby_to_sleep(jbt);
-+                      break;
-+              case JBT_STATE_NORMAL:
-+                      /* first transition into sleep */
-+                      rc = standby_to_sleep(jbt);
-+                      /* then transition into normal */
-+                      rc |= sleep_to_normal(jbt);
-+                      break;
-+              case JBT_STATE_QVGA_NORMAL:
-+                      /* first transition into sleep */
-+                      rc = standby_to_sleep(jbt);
-+                      /* then transition into normal */
-+                      rc |= sleep_to_qvga_normal(jbt);
-+                      break;
-+              }
-+              break;
-+      case JBT_STATE_SLEEP:
-+              switch (new_state) {
-+              case JBT_STATE_SLEEP:
-+                      rc = 0;
-+                      break;
-+              case JBT_STATE_DEEP_STANDBY:
-+                      rc = sleep_to_standby(jbt);
-+                      break;
-+              case JBT_STATE_NORMAL:
-+                      rc = sleep_to_normal(jbt);
-+                      break;
-+              case JBT_STATE_QVGA_NORMAL:
-+                      rc = sleep_to_qvga_normal(jbt);
-+                      break;
-+              }
-+              break;
-+      case JBT_STATE_NORMAL:
-+              switch (new_state) {
-+              case JBT_STATE_NORMAL:
-+                      rc = 0;
-+                      break;
-+              case JBT_STATE_DEEP_STANDBY:
-+                      /* first transition into sleep */
-+                      rc = normal_to_sleep(jbt);
-+                      /* then transition into deep standby */
-+                      rc |= sleep_to_standby(jbt);
-+                      break;
-+              case JBT_STATE_SLEEP:
-+                      rc = normal_to_sleep(jbt);
-+                      break;
-+              case JBT_STATE_QVGA_NORMAL:
-+                      /* first transition into sleep */
-+                      rc = normal_to_sleep(jbt);
-+                      /* second transition into deep standby */
-+                      rc |= sleep_to_standby(jbt);
-+                      /* third transition into sleep */
-+                      rc |= standby_to_sleep(jbt);
-+                      /* fourth transition into normal */
-+                      rc |= sleep_to_qvga_normal(jbt);
-+                      break;
-+              }
-+              break;
-+      case JBT_STATE_QVGA_NORMAL:
-+              switch (new_state) {
-+              case JBT_STATE_QVGA_NORMAL:
-+                      rc = 0;
-+                      break;
-+              case JBT_STATE_DEEP_STANDBY:
-+                      /* first transition into sleep */
-+                      rc = normal_to_sleep(jbt);
-+                      /* then transition into deep standby */
-+                      rc |= sleep_to_standby(jbt);
-+                      break;
-+              case JBT_STATE_SLEEP:
-+                      rc = normal_to_sleep(jbt);
-+                      break;
-+              case JBT_STATE_NORMAL:
-+                      /* first transition into sleep */
-+                      rc = normal_to_sleep(jbt);
-+                      /* second transition into deep standby */
-+                      rc |= sleep_to_standby(jbt);
-+                      /* third transition into sleep */
-+                      rc |= standby_to_sleep(jbt);
-+                      /* fourth transition into normal */
-+                      rc |= sleep_to_normal(jbt);
-+                      break;
-+              }
-+              break;
-+      }
-+      if (rc == 0)
-+              jbt->state = new_state;
-+
-+      return rc;
-+}
-+EXPORT_SYMBOL_GPL(jbt6k74_enter_state);
-+
-+int jbt6k74_display_onoff(struct jbt_info *jbt, int on)
-+{
-+      if (on)
-+              return jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_ON);
-+      else
-+              return jbt_reg_write_nodata(jbt, JBT_REG_DISPLAY_OFF);
-+}
-+EXPORT_SYMBOL_GPL(jbt6k74_display_onoff);
-+
-+static ssize_t state_read(struct device *dev, struct device_attribute *attr,
-+                        char *buf)
-+{
-+      struct jbt_info *jbt = dev_get_drvdata(dev);
-+
-+      if (jbt->state >= ARRAY_SIZE(jbt_state_names))
-+              return -EIO;
-+
-+      return sprintf(buf, "%s\n", jbt_state_names[jbt->state]);
-+}
-+
-+static ssize_t state_write(struct device *dev, struct device_attribute *attr,
-+                         const char *buf, size_t count)
-+{
-+      struct jbt_info *jbt = dev_get_drvdata(dev);
-+      int i, rc;
-+
-+      for (i = 0; i < ARRAY_SIZE(jbt_state_names); i++) {
-+              if (!strncmp(buf, jbt_state_names[i],
-+                           strlen(jbt_state_names[i]))) {
-+                      rc = jbt6k74_enter_state(jbt, i);
-+                      if (rc)
-+                              return rc;
-+                      switch (i) {
-+                      case JBT_STATE_NORMAL:
-+                      case JBT_STATE_QVGA_NORMAL:
-+                              /* Enable display again after deep-standby */
-+                              rc = jbt6k74_display_onoff(jbt, 1);
-+                              if (rc)
-+                                      return rc;
-+                              break;
-+                      default:
-+                              break;
-+                      }
-+                      return count;
-+              }
-+      }
-+
-+      return -EINVAL;
-+}
-+
-+static DEVICE_ATTR(state, 0644, state_read, state_write);
-+
-+static int reg_by_string(const char *name)
-+{
-+      if (!strcmp(name, "gamma_fine1"))
-+              return JBT_REG_GAMMA1_FINE_1;
-+      else if (!strcmp(name, "gamma_fine2"))
-+              return JBT_REG_GAMMA1_FINE_2;
-+      else if (!strcmp(name, "gamma_inclination"))
-+              return JBT_REG_GAMMA1_INCLINATION;
-+      else
-+              return JBT_REG_GAMMA1_BLUE_OFFSET;
-+}
-+
-+static ssize_t gamma_read(struct device *dev, struct device_attribute *attr,
-+                        char *buf)
-+{
-+      struct jbt_info *jbt = dev_get_drvdata(dev);
-+      int reg = reg_by_string(attr->attr.name);
-+      u16 val;
-+
-+      mutex_lock(&jbt->lock);
-+      val = jbt->reg_cache[reg];
-+      mutex_unlock(&jbt->lock);
-+
-+      return sprintf(buf, "0x%04x\n", val);
-+}
-+
-+static ssize_t gamma_write(struct device *dev, struct device_attribute *attr,
-+                         const char *buf, size_t count)
-+{
-+      struct jbt_info *jbt = dev_get_drvdata(dev);
-+      int reg = reg_by_string(attr->attr.name);
-+      unsigned long val = simple_strtoul(buf, NULL, 10);
-+
-+      jbt_reg_write(jbt, reg, val & 0xff);
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(gamma_fine1, 0644, gamma_read, gamma_write);
-+static DEVICE_ATTR(gamma_fine2, 0644, gamma_read, gamma_write);
-+static DEVICE_ATTR(gamma_inclination, 0644, gamma_read, gamma_write);
-+static DEVICE_ATTR(gamma_blue_offset, 0644, gamma_read, gamma_write);
-+
-+static struct attribute *jbt_sysfs_entries[] = {
-+      &dev_attr_state.attr,
-+      &dev_attr_gamma_fine1.attr,
-+      &dev_attr_gamma_fine2.attr,
-+      &dev_attr_gamma_inclination.attr,
-+      &dev_attr_gamma_blue_offset.attr,
-+      NULL,
-+};
-+
-+static struct attribute_group jbt_attr_group = {
-+      .name   = NULL,
-+      .attrs  = jbt_sysfs_entries,
-+};
-+
-+/* linux device model infrastructure */
-+
-+static int __devinit jbt_probe(struct spi_device *spi)
-+{
-+      int rc;
-+      struct jbt_info *jbt;
-+
-+      /* the controller doesn't have a MISO pin; we can't do detection */
-+
-+      spi->mode = SPI_CPOL | SPI_CPHA;
-+      spi->bits_per_word = 9;
-+
-+      rc = spi_setup(spi);
-+      if (rc < 0) {
-+              dev_err(&spi->dev,
-+                      "error during spi_setup of jbt6k74 driver\n");
-+              return rc;
-+      }
-+
-+      jbt = kzalloc(sizeof(*jbt), GFP_KERNEL);
-+      if (!jbt)
-+              return -ENOMEM;
-+
-+      jbt->spi_dev = spi;
-+      jbt->state = JBT_STATE_DEEP_STANDBY;
-+      mutex_init(&jbt->lock);
-+
-+      dev_set_drvdata(&spi->dev, jbt);
-+
-+      rc = jbt6k74_enter_state(jbt, JBT_STATE_NORMAL);
-+      if (rc < 0) {
-+              dev_err(&spi->dev, "cannot enter NORMAL state\n");
-+              goto err_free_drvdata;
-+      }
-+
-+      rc = jbt6k74_display_onoff(jbt, 1);
-+      if (rc < 0) {
-+              dev_err(&spi->dev, "cannot switch display on\n");
-+              goto err_standby;
-+      }
-+
-+      rc = sysfs_create_group(&spi->dev.kobj, &jbt_attr_group);
-+      if (rc < 0) {
-+              dev_err(&spi->dev, "cannot create sysfs group\n");
-+              goto err_off;
-+      }
-+
-+      return 0;
-+
-+err_off:
-+      jbt6k74_display_onoff(jbt, 0);
-+err_standby:
-+      jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);
-+err_free_drvdata:
-+      dev_set_drvdata(&spi->dev, NULL);
-+      kfree(jbt);
-+
-+      return rc;
-+}
-+
-+static int __devexit jbt_remove(struct spi_device *spi)
-+{
-+      struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-+
-+      /* We don't want to switch off the display in case the user
-+       * accidentially onloads the module (whose use count normally is 0) */
-+
-+      sysfs_remove_group(&spi->dev.kobj, &jbt_attr_group);
-+      dev_set_drvdata(&spi->dev, NULL);
-+      kfree(jbt);
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int jbt_suspend(struct spi_device *spi, pm_message_t state)
-+{
-+      struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-+
-+      /* Save mode for resume */
-+      jbt->last_state = jbt->state;
-+      jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);
-+
-+      return 0;
-+}
-+
-+static int jbt_resume(struct spi_device *spi)
-+{
-+      struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-+
-+      jbt6k74_enter_state(jbt, jbt->last_state);
-+
-+      switch (jbt->last_state) {
-+      case JBT_STATE_NORMAL:
-+      case JBT_STATE_QVGA_NORMAL:
-+              jbt6k74_display_onoff(jbt, 1);
-+              break;
-+      default:
-+              break;
-+      }
-+
-+      return 0;
-+}
-+#else
-+#define jbt_suspend   NULL
-+#define jbt_resume    NULL
-+#endif
-+
-+static struct spi_driver jbt6k74_driver = {
-+      .driver = {
-+              .name   = "jbt6k74",
-+              .owner  = THIS_MODULE,
-+      },
-+
-+      .probe   = jbt_probe,
-+      .remove  = __devexit_p(jbt_remove),
-+      .suspend = jbt_suspend,
-+      .resume  = jbt_resume,
-+};
-+
-+static int __init jbt_init(void)
-+{
-+      return spi_register_driver(&jbt6k74_driver);
-+}
-+
-+static void __exit jbt_exit(void)
-+{
-+      spi_unregister_driver(&jbt6k74_driver);
-+}
-+
-+MODULE_DESCRIPTION("SPI driver for tpo JBT6K74-AS LCM control interface");
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_LICENSE("GPL");
-+
-+module_init(jbt_init);
-+module_exit(jbt_exit);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1009-gta01-inputdevice.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1009-gta01-inputdevice.patch.patch
deleted file mode 100755 (executable)
index ef8cb7f..0000000
+++ /dev/null
@@ -1,298 +0,0 @@
-From db36b757a45cf8d9088727d975d93917021b1171 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:48 +0100
-Subject: [PATCH] gta01-inputdevice.patch
- This provides support for the GTA01 keyboard
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- drivers/input/keyboard/Kconfig      |   12 ++
- drivers/input/keyboard/Makefile     |    1 +
- drivers/input/keyboard/neo1973kbd.c |  242 +++++++++++++++++++++++++++++++++++
- 3 files changed, 255 insertions(+), 0 deletions(-)
- create mode 100644 drivers/input/keyboard/neo1973kbd.c
-
-diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
-index efd70a9..b8ecca9 100644
---- a/drivers/input/keyboard/Kconfig
-+++ b/drivers/input/keyboard/Kconfig
-@@ -323,4 +323,16 @@ config KEYBOARD_SH_KEYSC
-         To compile this driver as a module, choose M here: the
-         module will be called sh_keysc.
-+config KEYBOARD_NEO1973
-+      tristate "FIC Neo1973 buttons"
-+      depends on MACH_NEO1973
-+      default y
-+      help
-+        Say Y here to enable the buttons on the FIC Neo1973
-+        GSM phone.
-+
-+        To compile this driver as a module, choose M here: the
-+        module will be called neo1973kbd.
-+
-+
- endif
-diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
-index 0edc8f2..b3aa339 100644
---- a/drivers/input/keyboard/Makefile
-+++ b/drivers/input/keyboard/Makefile
-@@ -14,6 +14,7 @@ obj-$(CONFIG_KEYBOARD_LOCOMO)                += locomokbd.o
- obj-$(CONFIG_KEYBOARD_NEWTON)         += newtonkbd.o
- obj-$(CONFIG_KEYBOARD_STOWAWAY)               += stowaway.o
- obj-$(CONFIG_KEYBOARD_CORGI)          += corgikbd.o
-+obj-$(CONFIG_KEYBOARD_NEO1973)                += neo1973kbd.o
- obj-$(CONFIG_KEYBOARD_SPITZ)          += spitzkbd.o
- obj-$(CONFIG_KEYBOARD_TOSA)           += tosakbd.o
- obj-$(CONFIG_KEYBOARD_HIL)            += hil_kbd.o
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-new file mode 100644
-index 0000000..917d5ae
---- /dev/null
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -0,0 +1,242 @@
-+/*
-+ * Keyboard driver for FIC Neo1973 GSM phone
-+ *
-+ * (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * All rights reserved.
-+ *
-+ * inspired by corkgbd.c by Richard Purdie
-+ *
-+ * 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/platform_device.h>
-+#include <linux/init.h>
-+#include <linux/input.h>
-+#include <linux/interrupt.h>
-+#include <linux/jiffies.h>
-+#include <linux/module.h>
-+#include <linux/slab.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/arch/gta01.h>
-+#include <asm/mach-types.h>
-+
-+struct neo1973kbd {
-+      struct input_dev *input;
-+      unsigned int suspended;
-+      unsigned long suspend_jiffies;
-+};
-+
-+static irqreturn_t neo1973kbd_aux_irq(int irq, void *dev_id)
-+{
-+      struct neo1973kbd *neo1973kbd_data = dev_id;
-+
-+      /* FIXME: use GPIO from platform_dev resources */
-+      if (s3c2410_gpio_getpin(GTA01_GPIO_AUX_KEY))
-+              input_report_key(neo1973kbd_data->input, KEY_PHONE, 0);
-+      else
-+              input_report_key(neo1973kbd_data->input, KEY_PHONE, 1);
-+
-+      input_sync(neo1973kbd_data->input);
-+
-+      return IRQ_HANDLED;
-+}
-+
-+static irqreturn_t neo1973kbd_hold_irq(int irq, void *dev_id)
-+{
-+      struct neo1973kbd *neo1973kbd_data = dev_id;
-+
-+      /* FIXME: use GPIO from platform_dev resources */
-+      if (s3c2410_gpio_getpin(GTA01_GPIO_HOLD_KEY))
-+              input_report_key(neo1973kbd_data->input, KEY_PAUSE, 1);
-+      else
-+              input_report_key(neo1973kbd_data->input, KEY_PAUSE, 0);
-+
-+      input_sync(neo1973kbd_data->input);
-+
-+      return IRQ_HANDLED;
-+}
-+
-+static irqreturn_t neo1973kbd_headphone_irq(int irq, void *dev_id)
-+{
-+      struct neo1973kbd *neo1973kbd_data = dev_id;
-+
-+      /* FIXME: use GPIO from platform_dev resources */
-+      if (s3c2410_gpio_getpin(GTA01_GPIO_JACK_INSERT))
-+              input_report_switch(neo1973kbd_data->input,
-+                                  SW_HEADPHONE_INSERT, 1);
-+      else
-+              input_report_switch(neo1973kbd_data->input,
-+                                  SW_HEADPHONE_INSERT, 0);
-+
-+      input_sync(neo1973kbd_data->input);
-+
-+      return IRQ_HANDLED;
-+}
-+
-+#ifdef CONFIG_PM
-+static int neo1973kbd_suspend(struct platform_device *dev, pm_message_t state)
-+{
-+      struct neo1973kbd *neo1973kbd = platform_get_drvdata(dev);
-+
-+      neo1973kbd->suspended = 1;
-+
-+      return 0;
-+}
-+
-+static int neo1973kbd_resume(struct platform_device *dev)
-+{
-+      struct neo1973kbd *neo1973kbd = platform_get_drvdata(dev);
-+
-+      neo1973kbd->suspended = 0;
-+
-+      return 0;
-+}
-+#else
-+#define neo1973kbd_suspend    NULL
-+#define neo1973kbd_resume     NULL
-+#endif
-+
-+static int neo1973kbd_probe(struct platform_device *pdev)
-+{
-+      struct neo1973kbd *neo1973kbd;
-+      struct input_dev *input_dev;
-+      int rc, irq_aux, irq_hold, irq_jack;
-+
-+      neo1973kbd = kzalloc(sizeof(struct neo1973kbd), GFP_KERNEL);
-+      input_dev = input_allocate_device();
-+      if (!neo1973kbd || !input_dev) {
-+              kfree(neo1973kbd);
-+              input_free_device(input_dev);
-+              return -ENOMEM;
-+      }
-+
-+      if (pdev->resource[0].flags != 0)
-+              return -EINVAL;
-+
-+      irq_aux = s3c2410_gpio_getirq(pdev->resource[0].start);
-+      if (irq_aux < 0)
-+              return -EINVAL;
-+
-+      irq_hold = s3c2410_gpio_getirq(pdev->resource[1].start);
-+      if (irq_hold < 0)
-+              return -EINVAL;
-+
-+      irq_jack = s3c2410_gpio_getirq(pdev->resource[2].start);
-+      if (irq_jack < 0)
-+              return -EINVAL;
-+
-+      platform_set_drvdata(pdev, neo1973kbd);
-+
-+      neo1973kbd->input = input_dev;
-+
-+      input_dev->name = "Neo1973 Buttons";
-+      input_dev->phys = "neo1973kbd/input0";
-+      input_dev->id.bustype = BUS_HOST;
-+      input_dev->id.vendor = 0x0001;
-+      input_dev->id.product = 0x0001;
-+      input_dev->id.version = 0x0100;
-+      input_dev->cdev.dev = &pdev->dev;
-+      input_dev->private = neo1973kbd;
-+
-+      input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_SW);
-+      set_bit(SW_HEADPHONE_INSERT, input_dev->swbit);
-+      set_bit(KEY_PHONE, input_dev->keybit);
-+      set_bit(KEY_PAUSE, input_dev->keybit);
-+
-+      rc = input_register_device(neo1973kbd->input);
-+      if (rc)
-+              goto out_register;
-+
-+      if (request_irq(irq_aux, neo1973kbd_aux_irq, IRQF_DISABLED |
-+                      IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-+                      "Neo1973 AUX button", neo1973kbd)) {
-+              dev_err(&pdev->dev, "Can't get IRQ %u\n", irq_aux);
-+              goto out_aux;
-+      }
-+
-+      /*
-+       * GTA01 revisions before Bv4 can't be resumed by the PMU, so we use
-+       * resume by AUX.
-+       */
-+      if (machine_is_neo1973_gta01())
-+              enable_irq_wake(irq_aux);
-+
-+      if (request_irq(irq_hold, neo1973kbd_hold_irq, IRQF_DISABLED |
-+                      IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-+                      "Neo1973 HOLD button", neo1973kbd)) {
-+              dev_err(&pdev->dev, "Can't get IRQ %u\n", irq_hold);
-+              goto out_hold;
-+      }
-+
-+      if (request_irq(irq_jack, neo1973kbd_headphone_irq, IRQF_DISABLED |
-+                      IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-+                      "Neo1973 Headphone Jack", neo1973kbd)) {
-+              dev_err(&pdev->dev, "Can't get IRQ %u\n", irq_jack);
-+              goto out_jack;
-+      }
-+      enable_irq_wake(irq_jack);
-+
-+      return 0;
-+
-+out_jack:
-+      free_irq(irq_hold, neo1973kbd);
-+out_hold:
-+      free_irq(irq_aux, neo1973kbd);
-+out_aux:
-+      input_unregister_device(neo1973kbd->input);
-+out_register:
-+      input_free_device(neo1973kbd->input);
-+      platform_set_drvdata(pdev, NULL);
-+      kfree(neo1973kbd);
-+
-+      return -ENODEV;
-+}
-+
-+static int neo1973kbd_remove(struct platform_device *pdev)
-+{
-+      struct neo1973kbd *neo1973kbd = platform_get_drvdata(pdev);
-+
-+      free_irq(s3c2410_gpio_getirq(pdev->resource[2].start), neo1973kbd);
-+      free_irq(s3c2410_gpio_getirq(pdev->resource[1].start), neo1973kbd);
-+      free_irq(s3c2410_gpio_getirq(pdev->resource[0].start), neo1973kbd);
-+
-+      input_unregister_device(neo1973kbd->input);
-+      input_free_device(neo1973kbd->input);
-+      platform_set_drvdata(pdev, NULL);
-+      kfree(neo1973kbd);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver neo1973kbd_driver = {
-+      .probe          = neo1973kbd_probe,
-+      .remove         = neo1973kbd_remove,
-+      .suspend        = neo1973kbd_suspend,
-+      .resume         = neo1973kbd_resume,
-+      .driver         = {
-+              .name   = "neo1973-button",
-+      },
-+};
-+
-+static int __devinit neo1973kbd_init(void)
-+{
-+      return platform_driver_register(&neo1973kbd_driver);
-+}
-+
-+static void __exit neo1973kbd_exit(void)
-+{
-+      platform_driver_unregister(&neo1973kbd_driver);
-+}
-+
-+module_init(neo1973kbd_init);
-+module_exit(neo1973kbd_exit);
-+
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_DESCRIPTION("FIC Neo1973 buttons input driver");
-+MODULE_LICENSE("GPL");
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1010-gta01-power_control.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1010-gta01-power_control.patch.patch
deleted file mode 100755 (executable)
index 76d645f..0000000
+++ /dev/null
@@ -1,976 +0,0 @@
-From 0739383d85822b93831803abb207794c16eedd79 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:48 +0100
-Subject: [PATCH] gta01-power_control.patch
- [PATCH] Neo1973 GPS / GSM / Bluetooth power control via sysfs
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- arch/arm/plat-s3c24xx/Makefile         |    1 +
- arch/arm/plat-s3c24xx/neo1973_pm_bt.c  |  152 +++++++++
- arch/arm/plat-s3c24xx/neo1973_pm_gps.c |  560 ++++++++++++++++++++++++++++++++
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |  217 ++++++++++++
- 4 files changed, 930 insertions(+), 0 deletions(-)
- create mode 100644 arch/arm/plat-s3c24xx/neo1973_pm_bt.c
- create mode 100644 arch/arm/plat-s3c24xx/neo1973_pm_gps.c
- create mode 100644 arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-
-diff --git a/arch/arm/plat-s3c24xx/Makefile b/arch/arm/plat-s3c24xx/Makefile
-index 131d202..6f43aca 100644
---- a/arch/arm/plat-s3c24xx/Makefile
-+++ b/arch/arm/plat-s3c24xx/Makefile
-@@ -29,3 +29,4 @@ obj-$(CONFIG_PM)             += pm.o
- obj-$(CONFIG_PM)              += sleep.o
- obj-$(CONFIG_S3C2410_DMA)     += dma.o
- obj-$(CONFIG_MACH_SMDK)               += common-smdk.o
-+obj-$(CONFIG_MACH_NEO1973)    += neo1973_pm_gsm.o neo1973_pm_gps.o neo1973_pm_bt.o
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-new file mode 100644
-index 0000000..b1af441
---- /dev/null
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-@@ -0,0 +1,152 @@
-+/*
-+ * Bluetooth PM code for the FIC Neo1973 GSM Phone
-+ *
-+ * (C) 2007 by OpenMoko Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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 version 2 as
-+ * published by the Free Software Foundation
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+
-+#include <linux/pcf50606.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/arch/gta01.h>
-+
-+#define DRVMSG "FIC Neo1973 Bluetooth Power Management"
-+
-+static ssize_t bt_read(struct device *dev, struct device_attribute *attr,
-+                     char *buf)
-+{
-+      if (!strcmp(attr->attr.name, "power_on")) {
-+              if (pcf50606_onoff_get(pcf50606_global,
-+                                      PCF50606_REGULATOR_D1REG) &&
-+                  pcf50606_voltage_get(pcf50606_global,
-+                                       PCF50606_REGULATOR_D1REG) == 3100)
-+                      goto out_1;
-+      } else if (!strcmp(attr->attr.name, "reset")) {
-+              if (s3c2410_gpio_getpin(GTA01_GPIO_BT_EN) == 0)
-+                      goto out_1;
-+      }
-+
-+      return strlcpy(buf, "0\n", 3);
-+out_1:
-+      return strlcpy(buf, "1\n", 3);
-+}
-+
-+static ssize_t bt_write(struct device *dev, struct device_attribute *attr,
-+                      const char *buf, size_t count)
-+{
-+      unsigned long on = simple_strtoul(buf, NULL, 10);
-+
-+      if (!strcmp(attr->attr.name, "power_on")) {
-+              /* if we are powering up, assert reset, then power, then
-+               * release reset */
-+              if (on) {
-+                      s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
-+                      pcf50606_voltage_set(pcf50606_global,
-+                                           PCF50606_REGULATOR_D1REG,
-+                                           3100);
-+              }
-+              pcf50606_onoff_set(pcf50606_global,
-+                                 PCF50606_REGULATOR_D1REG, on);
-+              s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on);
-+      } else if (!strcmp(attr->attr.name, "reset")) {
-+              /* reset is low-active, so we need to invert */
-+              s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1);
-+      }
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(power_on, 0644, bt_read, bt_write);
-+static DEVICE_ATTR(reset, 0644, bt_read, bt_write);
-+
-+#ifdef CONFIG_PM
-+static int gta01_bt_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+      dev_dbg(&pdev->dev, DRVMSG ": suspending\n");
-+      /* FIXME: The PMU should save the PMU status, and the GPIO code should
-+       * preserve the GPIO level, so there shouldn't be anything left to do
-+       * for us, should there? */
-+
-+      return 0;
-+}
-+
-+static int gta01_bt_resume(struct platform_device *pdev)
-+{
-+      dev_dbg(&pdev->dev, DRVMSG ": resuming\n");
-+
-+      return 0;
-+}
-+#else
-+#define gta01_bt_suspend      NULL
-+#define gta01_bt_resume               NULL
-+#endif
-+
-+static struct attribute *gta01_bt_sysfs_entries[] = {
-+      &dev_attr_power_on.attr,
-+      &dev_attr_reset.attr,
-+      NULL
-+};
-+
-+static struct attribute_group gta01_bt_attr_group = {
-+      .name   = NULL,
-+      .attrs  = gta01_bt_sysfs_entries,
-+};
-+
-+static int __init gta01_bt_probe(struct platform_device *pdev)
-+{
-+      dev_info(&pdev->dev, DRVMSG ": starting\n");
-+
-+      /* we make sure that the voltage is off */
-+      pcf50606_onoff_set(pcf50606_global,
-+                         PCF50606_REGULATOR_D1REG, 0);
-+      /* we pull reset to low to make sure that the chip doesn't
-+       * drain power through the reset line */
-+      s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
-+
-+      return sysfs_create_group(&pdev->dev.kobj, &gta01_bt_attr_group);
-+}
-+
-+static int gta01_bt_remove(struct platform_device *pdev)
-+{
-+      sysfs_remove_group(&pdev->dev.kobj, &gta01_bt_attr_group);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver gta01_bt_driver = {
-+      .probe          = gta01_bt_probe,
-+      .remove         = gta01_bt_remove,
-+      .suspend        = gta01_bt_suspend,
-+      .resume         = gta01_bt_resume,
-+      .driver         = {
-+              .name           = "neo1973-pm-bt",
-+      },
-+};
-+
-+static int __devinit gta01_bt_init(void)
-+{
-+      return platform_driver_register(&gta01_bt_driver);
-+}
-+
-+static void gta01_bt_exit(void)
-+{
-+      platform_driver_unregister(&gta01_bt_driver);
-+}
-+
-+module_init(gta01_bt_init);
-+module_exit(gta01_bt_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_DESCRIPTION(DRVMSG);
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-new file mode 100644
-index 0000000..f8cf719
---- /dev/null
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-@@ -0,0 +1,560 @@
-+/*
-+ * GPS Power Management code for the FIC Neo1973 GSM Phone
-+ *
-+ * (C) 2007 by OpenMoko Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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 version 2 as
-+ * published by the Free Software Foundation
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/delay.h>
-+#include <linux/platform_device.h>
-+
-+#include <linux/pcf50606.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/arch/gta01.h>
-+
-+/* This is the 2.8V supply for the RTC crystal, the mail clock crystal and
-+ * the input to VDD_RF */
-+static void gps_power_2v8_set(int on)
-+{
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+      case GTA01v4_SYSTEM_REV:
-+              if (on)
-+                      pcf50606_voltage_set(pcf50606_global,
-+                                           PCF50606_REGULATOR_IOREG, 2800);
-+              pcf50606_onoff_set(pcf50606_global,
-+                                 PCF50606_REGULATOR_IOREG, on);
-+              break;
-+      case GTA01Bv2_SYSTEM_REV:
-+              s3c2410_gpio_setpin(GTA01_GPIO_GPS_EN_2V8, on);
-+                      break;
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              break;
-+      }
-+}
-+
-+static int gps_power_2v8_get(void)
-+{
-+      int ret = 0;
-+
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+      case GTA01v4_SYSTEM_REV:
-+              if (pcf50606_onoff_get(pcf50606_global,
-+                                      PCF50606_REGULATOR_IOREG) &&
-+                  pcf50606_voltage_get(pcf50606_global,
-+                                       PCF50606_REGULATOR_IOREG) == 2800)
-+                      ret = 1;
-+              break;
-+      case GTA01Bv2_SYSTEM_REV:
-+              if (s3c2410_gpio_getpin(GTA01_GPIO_GPS_EN_2V8))
-+                      ret = 1;
-+              break;
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              break;
-+      }
-+
-+      return ret;
-+}
-+
-+/* This is the 3V supply (AVDD) for the external RF frontend (LNA bias) */
-+static void gps_power_3v_set(int on)
-+{
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+      case GTA01v4_SYSTEM_REV:
-+              if (on)
-+                      pcf50606_voltage_set(pcf50606_global,
-+                                           PCF50606_REGULATOR_D1REG, 3000);
-+              pcf50606_onoff_set(pcf50606_global,
-+                                 PCF50606_REGULATOR_D1REG, on);
-+              break;
-+      case GTA01Bv2_SYSTEM_REV:
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              s3c2410_gpio_setpin(GTA01_GPIO_GPS_EN_3V, on);
-+              break;
-+      }
-+}
-+
-+static int gps_power_3v_get(void)
-+{
-+      int ret = 0;
-+
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+      case GTA01v4_SYSTEM_REV:
-+              if (pcf50606_onoff_get(pcf50606_global,
-+                                     PCF50606_REGULATOR_D1REG) &&
-+                  pcf50606_voltage_get(pcf50606_global,
-+                                       PCF50606_REGULATOR_D1REG) == 3000)
-+                      ret = 1;
-+              break;
-+      case GTA01Bv2_SYSTEM_REV:
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              if (s3c2410_gpio_getpin(GTA01_GPIO_GPS_EN_3V))
-+                      ret = 1;
-+              break;
-+      }
-+
-+      return ret;
-+}
-+
-+/* This is the 3.3V supply for VDD_IO and VDD_LPREG input */
-+static void gps_power_3v3_set(int on)
-+{
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+      case GTA01v4_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+              if (on)
-+                      pcf50606_voltage_set(pcf50606_global,
-+                                           PCF50606_REGULATOR_DCD, 3300);
-+              pcf50606_onoff_set(pcf50606_global,
-+                                 PCF50606_REGULATOR_DCD, on);
-+              break;
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              s3c2410_gpio_setpin(GTA01_GPIO_GPS_EN_3V3, on);
-+              break;
-+      }
-+}
-+
-+static int gps_power_3v3_get(void)
-+{
-+      int ret = 0;
-+
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+      case GTA01v4_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+              if (pcf50606_onoff_get(pcf50606_global,
-+                                     PCF50606_REGULATOR_DCD) &&
-+                  pcf50606_voltage_get(pcf50606_global,
-+                                       PCF50606_REGULATOR_DCD) == 3300)
-+                      ret = 1;
-+              break;
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              if (s3c2410_gpio_getpin(GTA01_GPIO_GPS_EN_3V3))
-+                      ret = 1;
-+              break;
-+      }
-+
-+      return ret;
-+}
-+
-+/* This is the 2.5V supply for VDD_PLLREG and VDD_COREREG input */
-+static void gps_power_2v5_set(int on)
-+{
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+              /* This is CORE_1V8 and cannot be disabled */
-+              break;
-+      case GTA01v4_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              if (on)
-+                      pcf50606_voltage_set(pcf50606_global,
-+                                           PCF50606_REGULATOR_D2REG, 2500);
-+              pcf50606_onoff_set(pcf50606_global,
-+                                 PCF50606_REGULATOR_D2REG, on);
-+              break;
-+      }
-+}
-+
-+static int gps_power_2v5_get(void)
-+{
-+      int ret = 0;
-+
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+              /* This is CORE_1V8 and cannot be disabled */
-+              ret = 1;
-+              break;
-+      case GTA01v4_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              if (pcf50606_onoff_get(pcf50606_global,
-+                                     PCF50606_REGULATOR_D2REG) &&
-+                  pcf50606_voltage_get(pcf50606_global,
-+                                       PCF50606_REGULATOR_D2REG) == 2500)
-+                      ret = 1;
-+              break;
-+      }
-+
-+      return ret;
-+}
-+
-+/* This is the 1.5V supply for VDD_CORE */
-+static void gps_power_1v5_set(int on)
-+{
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+      case GTA01v4_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+              /* This is switched via 2v5 */
-+              break;
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              if (on)
-+                      pcf50606_voltage_set(pcf50606_global,
-+                                           PCF50606_REGULATOR_DCD, 1500);
-+              pcf50606_onoff_set(pcf50606_global,
-+                                 PCF50606_REGULATOR_DCD, on);
-+              break;
-+      }
-+}
-+
-+static int gps_power_1v5_get(void)
-+{
-+      int ret = 0;
-+
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+      case GTA01v4_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+              /* This is switched via 2v5 */
-+              ret = 1;
-+              break;
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              if (pcf50606_onoff_get(pcf50606_global,
-+                                     PCF50606_REGULATOR_DCD) &&
-+                  pcf50606_voltage_get(pcf50606_global,
-+                                       PCF50606_REGULATOR_DCD) == 1500)
-+                      ret = 1;
-+              break;
-+      }
-+
-+      return ret;
-+}
-+
-+/* This is the POWERON pin */
-+static void gps_pwron_set(int on)
-+{
-+      s3c2410_gpio_setpin(GTA01_GPIO_GPS_PWRON, on);
-+}
-+
-+static int gps_pwron_get(void)
-+{
-+      if (s3c2410_gpio_getpin(GTA01_GPIO_GPS_PWRON))
-+              return 1;
-+      else
-+              return 0;
-+}
-+
-+/* This is the nRESET pin */
-+static void gps_rst_set(int on)
-+{
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+              pcf50606_gpo0_set(pcf50606_global, on);
-+              break;
-+      case GTA01v4_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              s3c2410_gpio_setpin(GTA01_GPIO_GPS_RESET, on);
-+              break;
-+      }
-+}
-+
-+static int gps_rst_get(void)
-+{
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+              if (pcf50606_gpo0_get(pcf50606_global))
-+                      return 1;
-+              break;
-+      case GTA01v4_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              if (s3c2410_gpio_getpin(GTA01_GPIO_GPS_RESET))
-+                      return 1;
-+              break;
-+      }
-+
-+      return 0;
-+}
-+
-+static ssize_t power_gps_read(struct device *dev,
-+                            struct device_attribute *attr, char *buf)
-+{
-+      int ret = 0;
-+
-+      if (!strcmp(attr->attr.name, "power_tcxo_2v8")) {
-+              ret = gps_power_2v8_get();
-+      } else if (!strcmp(attr->attr.name, "power_avdd_3v")) {
-+              ret = gps_power_3v_get();
-+      } else if (!strcmp(attr->attr.name, "pwron")) {
-+              ret = gps_pwron_get();
-+      } else if (!strcmp(attr->attr.name, "reset")) {
-+              ret = gps_rst_get();
-+      } else if (!strcmp(attr->attr.name, "power_lp_io_3v3")) {
-+              ret = gps_power_3v3_get();
-+      } else if (!strcmp(attr->attr.name, "power_pll_core_2v5")) {
-+              ret = gps_power_2v5_get();
-+      } else if (!strcmp(attr->attr.name, "power_core_1v5") ||
-+                 !strcmp(attr->attr.name, "power_vdd_core_1v5")) {
-+              ret = gps_power_1v5_get();
-+      }
-+
-+      if (ret)
-+              return strlcpy(buf, "1\n", 3);
-+      else
-+              return strlcpy(buf, "0\n", 3);
-+}
-+
-+static ssize_t power_gps_write(struct device *dev,
-+                             struct device_attribute *attr, const char *buf,
-+                             size_t count)
-+{
-+      unsigned long on = simple_strtoul(buf, NULL, 10);
-+
-+      if (!strcmp(attr->attr.name, "power_tcxo_2v8")) {
-+              gps_power_2v8_set(on);
-+      } else if (!strcmp(attr->attr.name, "power_avdd_3v")) {
-+              gps_power_3v_set(on);
-+      } else if (!strcmp(attr->attr.name, "pwron")) {
-+              gps_pwron_set(on);
-+      } else if (!strcmp(attr->attr.name, "reset")) {
-+              gps_rst_set(on);
-+      } else if (!strcmp(attr->attr.name, "power_lp_io_3v3")) {
-+              gps_power_3v3_set(on);
-+      } else if (!strcmp(attr->attr.name, "power_pll_core_2v5")) {
-+              gps_power_2v5_set(on);
-+      } else if (!strcmp(attr->attr.name, "power_core_1v5") ||
-+                 !strcmp(attr->attr.name, "power_vdd_core_1v5")) {
-+              gps_power_1v5_set(on);
-+      }
-+
-+      return count;
-+}
-+
-+static void gps_power_sequence_up(void)
-+{
-+      /* According to PMB2520 Data Sheet, Rev. 2006-06-05,
-+       * Chapter 4.2.2 */
-+
-+      /* nRESET must be asserted low */
-+      gps_rst_set(0);
-+
-+      /* POWERON must be de-asserted (low) */
-+      gps_pwron_set(0);
-+
-+      /* Apply VDD_IO and VDD_LPREG_IN */
-+      gps_power_3v3_set(1);
-+
-+      /* VDD_COREREG_IN, VDD_PLLREG_IN */
-+      gps_power_1v5_set(1);
-+      gps_power_2v5_set(1);
-+
-+      /* and VDD_RF may be applied */
-+      gps_power_2v8_set(1);
-+
-+      /* We need to enable AVDD, since in GTA01Bv3 it is
-+       * shared with RFREG_IN */
-+      gps_power_3v_set(1);
-+
-+      msleep(3);      /* Is 3ms enough? */
-+
-+      /* De-asert nRESET */
-+      gps_rst_set(1);
-+
-+      /* Switch power on */
-+      gps_pwron_set(1);
-+
-+}
-+
-+static void gps_power_sequence_down(void)
-+{
-+      /* According to PMB2520 Data Sheet, Rev. 2006-06-05,
-+       * Chapter 4.2.3.1 */
-+      gps_pwron_set(0);
-+
-+      /* Don't disable AVDD before PWRON is cleared, since
-+       * in GTA01Bv3, AVDD and RFREG_IN are shared */
-+      gps_power_3v_set(0);
-+
-+      /* Remove VDD_COREREG_IN, VDD_PLLREG_IN and VDD_REFREG_IN */
-+      gps_power_1v5_set(0);
-+      gps_power_2v5_set(0);
-+      gps_power_2v8_set(0);
-+
-+      /* Remove VDD_LPREG_IN and VDD_IO */
-+      gps_power_3v3_set(0);
-+}
-+
-+
-+static ssize_t power_sequence_read(struct device *dev,
-+                                 struct device_attribute *attr,
-+                                 char *buf)
-+{
-+      return strlcpy(buf, "power_up power_down\n", PAGE_SIZE);
-+}
-+
-+static ssize_t power_sequence_write(struct device *dev,
-+                                  struct device_attribute *attr,
-+                                  const char *buf, size_t count)
-+{
-+      dev_dbg(dev, "wrote: '%s'\n", buf);
-+
-+      if (!strncmp(buf, "power_up", 8))
-+              gps_power_sequence_up();
-+      else if (!strncmp(buf, "power_down", 10))
-+              gps_power_sequence_down();
-+      else
-+              return -EINVAL;
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(power_tcxo_2v8, 0644, power_gps_read, power_gps_write);
-+static DEVICE_ATTR(power_avdd_3v, 0644, power_gps_read, power_gps_write);
-+static DEVICE_ATTR(pwron, 0644, power_gps_read, power_gps_write);
-+static DEVICE_ATTR(reset, 0644, power_gps_read, power_gps_write);
-+static DEVICE_ATTR(power_lp_io_3v3, 0644, power_gps_read, power_gps_write);
-+static DEVICE_ATTR(power_pll_core_2v5, 0644, power_gps_read, power_gps_write);
-+static DEVICE_ATTR(power_core_1v5, 0644, power_gps_read, power_gps_write);
-+static DEVICE_ATTR(power_vdd_core_1v5, 0644, power_gps_read, power_gps_write);
-+static DEVICE_ATTR(power_sequence, 0644, power_sequence_read,
-+                 power_sequence_write);
-+
-+#ifdef CONFIG_PM
-+static int gta01_pm_gps_suspend(struct platform_device *pdev,
-+                              pm_message_t state)
-+{
-+      /* FIXME */
-+      gps_power_sequence_down();
-+
-+      return 0;
-+}
-+
-+static int gta01_pm_gps_resume(struct platform_device *pdev)
-+{
-+      /* FIXME */
-+      gps_power_sequence_up();
-+
-+      return 0;
-+}
-+#else
-+#define gta01_pm_gps_suspend  NULL
-+#define gta01_pm_gps_resume   NULL
-+#endif
-+
-+static struct attribute *gta01_gps_sysfs_entries[] = {
-+      &dev_attr_power_avdd_3v.attr,
-+      &dev_attr_pwron.attr,
-+      &dev_attr_reset.attr,
-+      &dev_attr_power_lp_io_3v3.attr,
-+      &dev_attr_power_pll_core_2v5.attr,
-+      &dev_attr_power_sequence.attr,
-+      NULL,   /* power_core_1v5 */
-+      NULL,   /* power_vdd_core_1v5 */
-+      NULL    /* terminating entry */
-+};
-+
-+static struct attribute_group gta01_gps_attr_group = {
-+      .name   = NULL,
-+      .attrs  = gta01_gps_sysfs_entries,
-+};
-+
-+static int __init gta01_pm_gps_probe(struct platform_device *pdev)
-+{
-+      s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_PWRON, S3C2410_GPIO_OUTPUT);
-+
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+              break;
-+      case GTA01v4_SYSTEM_REV:
-+              s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_RESET, S3C2410_GPIO_OUTPUT);
-+              break;
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_EN_3V3, S3C2410_GPIO_OUTPUT);
-+              /* fallthrough */
-+      case GTA01Bv2_SYSTEM_REV:
-+              s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_EN_2V8, S3C2410_GPIO_OUTPUT);
-+              s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_EN_3V, S3C2410_GPIO_OUTPUT);
-+              s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_RESET, S3C2410_GPIO_OUTPUT);
-+              break;
-+      default:
-+              dev_warn(&pdev->dev, "Unknown GTA01 Revision 0x%x, "
-+                       "AGPS PM features not available!!!\n",
-+                       system_rev);
-+              return -1;
-+              break;
-+      }
-+
-+      gps_power_sequence_down();
-+
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+      case GTA01v4_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+              gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-3] =
-+                                      &dev_attr_power_tcxo_2v8.attr;
-+              break;
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-3] =
-+                                      &dev_attr_power_core_1v5.attr;
-+              gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-2] =
-+                                      &dev_attr_power_vdd_core_1v5.attr;
-+              break;
-+      }
-+
-+      return sysfs_create_group(&pdev->dev.kobj, &gta01_gps_attr_group);
-+}
-+
-+static int gta01_pm_gps_remove(struct platform_device *pdev)
-+{
-+      gps_power_sequence_down();
-+      sysfs_remove_group(&pdev->dev.kobj, &gta01_gps_attr_group);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver gta01_pm_gps_driver = {
-+      .probe          = gta01_pm_gps_probe,
-+      .remove         = gta01_pm_gps_remove,
-+      .suspend        = gta01_pm_gps_suspend,
-+      .resume         = gta01_pm_gps_resume,
-+      .driver         = {
-+              .name           = "neo1973-pm-gps",
-+      },
-+};
-+
-+static int __devinit gta01_pm_gps_init(void)
-+{
-+      return platform_driver_register(&gta01_pm_gps_driver);
-+}
-+
-+static void gta01_pm_gps_exit(void)
-+{
-+      platform_driver_unregister(&gta01_pm_gps_driver);
-+}
-+
-+module_init(gta01_pm_gps_init);
-+module_exit(gta01_pm_gps_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_DESCRIPTION("FIC Neo1973 GPS Power Management");
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-new file mode 100644
-index 0000000..a1615f8
---- /dev/null
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -0,0 +1,217 @@
-+/*
-+ * GSM Management code for the FIC Neo1973 GSM Phone
-+ *
-+ * (C) 2007 by OpenMoko Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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 version 2 as
-+ * published by the Free Software Foundation
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+#include <linux/console.h>
-+#include <linux/errno.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/arch/gta01.h>
-+
-+struct gta01pm_priv {
-+      int gpio_ngsm_en;
-+      struct console *con;
-+};
-+
-+static struct gta01pm_priv gta01_gsm;
-+
-+static struct console *find_s3c24xx_console(void)
-+{
-+      struct console *con;
-+
-+      acquire_console_sem();
-+
-+      for (con = console_drivers; con; con = con->next) {
-+              if (!strcmp(con->name, "ttySAC"))
-+                      break;
-+      }
-+
-+      release_console_sem();
-+
-+      return con;
-+}
-+
-+static ssize_t gsm_read(struct device *dev, struct device_attribute *attr,
-+                      char *buf)
-+{
-+      if (!strcmp(attr->attr.name, "power_on")) {
-+              if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_ON))
-+                      goto out_1;
-+      } else if (!strcmp(attr->attr.name, "reset")) {
-+              if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_RST))
-+                      goto out_1;
-+      } else if (!strcmp(attr->attr.name, "download")) {
-+              if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_DNLOAD))
-+                      goto out_1;
-+      }
-+
-+      return strlcpy(buf, "0\n", 3);
-+out_1:
-+      return strlcpy(buf, "1\n", 3);
-+}
-+
-+static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-+                       const char *buf, size_t count)
-+{
-+      unsigned long on = simple_strtoul(buf, NULL, 10);
-+
-+      if (!strcmp(attr->attr.name, "power_on")) {
-+              if (on) {
-+                      dev_info(dev, "powering up GSM, thus disconnecting "
-+                               "serial console\n");
-+
-+                      if (gta01_gsm.con)
-+                              console_stop(gta01_gsm.con);
-+
-+                      if (gta01_gsm.gpio_ngsm_en)
-+                              s3c2410_gpio_setpin(gta01_gsm.gpio_ngsm_en, 0);
-+
-+                      s3c2410_gpio_setpin(GTA01_GPIO_MODEM_ON, 1);
-+              } else {
-+                      s3c2410_gpio_setpin(GTA01_GPIO_MODEM_ON, 0);
-+
-+                      if (gta01_gsm.gpio_ngsm_en)
-+                              s3c2410_gpio_setpin(gta01_gsm.gpio_ngsm_en, 1);
-+
-+                      if (gta01_gsm.con)
-+                              console_start(gta01_gsm.con);
-+
-+                      dev_info(dev, "powered down GSM, thus enabling "
-+                               "serial console\n");
-+              }
-+      } else if (!strcmp(attr->attr.name, "reset")) {
-+              s3c2410_gpio_setpin(GTA01_GPIO_MODEM_RST, on);
-+      } else if (!strcmp(attr->attr.name, "download")) {
-+              s3c2410_gpio_setpin(GTA01_GPIO_MODEM_DNLOAD, on);
-+      }
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(power_on, 0644, gsm_read, gsm_write);
-+static DEVICE_ATTR(reset, 0644, gsm_read, gsm_write);
-+static DEVICE_ATTR(download, 0644, gsm_read, gsm_write);
-+
-+#ifdef CONFIG_PM
-+static int gta01_gsm_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+      /* GPIO state is saved/restored by S3C2410 core GPIO driver, so we
-+       * don't need to do anything here */
-+
-+      return 0;
-+}
-+
-+static int gta01_gsm_resume(struct platform_device *pdev)
-+{
-+      /* GPIO state is saved/restored by S3C2410 core GPIO driver, so we
-+       * don't need to do anything here */
-+
-+      /* Make sure that the kernel console on the serial port is still
-+       * disabled. FIXME: resume ordering race with serial driver! */
-+      if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_ON) && gta01_gsm.con)
-+              console_stop(gta01_gsm.con);
-+
-+      return 0;
-+}
-+#else
-+#define gta01_gsm_suspend     NULL
-+#define gta01_gsm_resume      NULL
-+#endif
-+
-+static struct attribute *gta01_gsm_sysfs_entries[] = {
-+      &dev_attr_power_on.attr,
-+      &dev_attr_reset.attr,
-+      NULL,
-+      NULL
-+};
-+
-+static struct attribute_group gta01_gsm_attr_group = {
-+      .name   = NULL,
-+      .attrs  = gta01_gsm_sysfs_entries,
-+};
-+
-+static int __init gta01_gsm_probe(struct platform_device *pdev)
-+{
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+              gta01_gsm.gpio_ngsm_en = GTA01v3_GPIO_nGSM_EN;
-+              break;
-+      case GTA01v4_SYSTEM_REV:
-+              gta01_gsm.gpio_ngsm_en = 0;
-+              break;
-+      case GTA01Bv2_SYSTEM_REV:
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              gta01_gsm.gpio_ngsm_en = GTA01Bv2_GPIO_nGSM_EN;
-+              s3c2410_gpio_setpin(GTA01v3_GPIO_nGSM_EN, 0);
-+              break;
-+      default:
-+              dev_warn(&pdev->dev, "Unknown GTA01 Revision 0x%x, "
-+                       "some PM features not available!!!\n",
-+                       system_rev);
-+              break;
-+      }
-+
-+      switch (system_rev) {
-+      case GTA01v4_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+              gta01_gsm_sysfs_entries[ARRAY_SIZE(gta01_gsm_sysfs_entries)-2] =
-+                                                      &dev_attr_download.attr;
-+              break;
-+      default:
-+              break;
-+      }
-+
-+      gta01_gsm.con = find_s3c24xx_console();
-+      if (!gta01_gsm.con)
-+              dev_warn(&pdev->dev, "cannot find S3C24xx console driver\n");
-+
-+      return sysfs_create_group(&pdev->dev.kobj, &gta01_gsm_attr_group);
-+}
-+
-+static int gta01_gsm_remove(struct platform_device *pdev)
-+{
-+      sysfs_remove_group(&pdev->dev.kobj, &gta01_gsm_attr_group);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver gta01_gsm_driver = {
-+      .probe          = gta01_gsm_probe,
-+      .remove         = gta01_gsm_remove,
-+      .suspend        = gta01_gsm_suspend,
-+      .resume         = gta01_gsm_resume,
-+      .driver         = {
-+              .name           = "neo1973-pm-gsm",
-+      },
-+};
-+
-+static int __devinit gta01_gsm_init(void)
-+{
-+      return platform_driver_register(&gta01_gsm_driver);
-+}
-+
-+static void gta01_gsm_exit(void)
-+{
-+      platform_driver_unregister(&gta01_gsm_driver);
-+}
-+
-+module_init(gta01_gsm_init);
-+module_exit(gta01_gsm_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_DESCRIPTION("FIC Neo1973 GSM Power Management");
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1011-s3c2410-pwm.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1011-s3c2410-pwm.patch.patch
deleted file mode 100755 (executable)
index 2a22040..0000000
+++ /dev/null
@@ -1,323 +0,0 @@
-From 2b1ccb68bdc0e1454be0e769896862bf0c7f95f9 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:49 +0100
-Subject: [PATCH] s3c2410-pwm.patch
- This patch adds a PWM api abstraction for the S3C2410 SoC
-
-Signed-off-by: Javi Roman <javiroman@kernel-labs.org>
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- arch/arm/mach-s3c2410/Kconfig      |    7 +
- arch/arm/mach-s3c2410/Makefile     |    1 +
- arch/arm/mach-s3c2410/pwm.c        |  214 ++++++++++++++++++++++++++++++++++++
- include/asm-arm/arch-s3c2410/pwm.h |   40 +++++++
- 4 files changed, 262 insertions(+), 0 deletions(-)
- create mode 100644 arch/arm/mach-s3c2410/pwm.c
- create mode 100644 include/asm-arm/arch-s3c2410/pwm.h
-
-diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
-index 58519e6..3e9ec50 100644
---- a/arch/arm/mach-s3c2410/Kconfig
-+++ b/arch/arm/mach-s3c2410/Kconfig
-@@ -9,6 +9,7 @@ config CPU_S3C2410
-       depends on ARCH_S3C2410
-       select S3C2410_CLOCK
-       select S3C2410_GPIO
-+      select S3C2410_PWM
-       select CPU_LLSERIAL_S3C2410
-       select S3C2410_PM if PM
-       help
-@@ -38,6 +39,12 @@ config S3C2410_CLOCK
-         Clock code for the S3C2410, and similar processors
-+config S3C2410_PWM
-+      bool
-+      help
-+        PWM timer code for the S3C2410, and similar processors
-+
-+
- menu "S3C2410 Machines"
- config ARCH_SMDK2410
-diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile
-index b73562f..2a12a6a 100644
---- a/arch/arm/mach-s3c2410/Makefile
-+++ b/arch/arm/mach-s3c2410/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_CPU_S3C2410_DMA)        += dma.o
- obj-$(CONFIG_S3C2410_PM)      += pm.o sleep.o
- obj-$(CONFIG_S3C2410_GPIO)    += gpio.o
- obj-$(CONFIG_S3C2410_CLOCK)   += clock.o
-+obj-$(CONFIG_S3C2410_PWM)     += pwm.o
- # Machine support
-diff --git a/arch/arm/mach-s3c2410/pwm.c b/arch/arm/mach-s3c2410/pwm.c
-new file mode 100644
-index 0000000..8a07359
---- /dev/null
-+++ b/arch/arm/mach-s3c2410/pwm.c
-@@ -0,0 +1,214 @@
-+/*
-+ * arch/arm/mach-s3c2410/3c2410-pwm.c
-+ *
-+ * Copyright (c) by Javi Roman <javiroman@kernel-labs.org>
-+ *             for the OpenMoko Project.
-+ *
-+ *     S3C2410A SoC PWM 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.
-+ *
-+ * 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/clk.h>
-+#include <asm/hardware.h>
-+#include <asm/plat-s3c/regs-timer.h>
-+#include <asm/arch/pwm.h>
-+
-+int s3c2410_pwm_disable(struct s3c2410_pwm *pwm)
-+{
-+      unsigned long tcon;
-+
-+      /* stop timer */
-+      tcon = __raw_readl(S3C2410_TCON);
-+      tcon &= 0xffffff00;
-+      __raw_writel(tcon, S3C2410_TCON);
-+
-+      clk_disable(pwm->pclk);
-+      clk_put(pwm->pclk);
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(s3c2410_pwm_disable);
-+
-+int s3c2410_pwm_init(struct s3c2410_pwm *pwm)
-+{
-+      pwm->pclk = clk_get(NULL, "timers");
-+      if (IS_ERR(pwm->pclk))
-+              return PTR_ERR(pwm->pclk);
-+
-+      clk_enable(pwm->pclk);
-+      pwm->pclk_rate = clk_get_rate(pwm->pclk);
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(s3c2410_pwm_init);
-+
-+int s3c2410_pwm_enable(struct s3c2410_pwm *pwm)
-+{
-+      unsigned long tcfg0, tcfg1, tcnt, tcmp;
-+
-+      /* control registers bits */
-+      tcfg1 = __raw_readl(S3C2410_TCFG1);
-+      tcfg0 = __raw_readl(S3C2410_TCFG0);
-+
-+      /* divider & scaler slection */
-+      switch (pwm->timerid) {
-+      case PWM0:
-+              tcfg1 &= ~S3C2410_TCFG1_MUX0_MASK;
-+              tcfg0 &= ~S3C2410_TCFG_PRESCALER0_MASK;
-+              break;
-+      case PWM1:
-+              tcfg1 &= ~S3C2410_TCFG1_MUX1_MASK;
-+              tcfg0 &= ~S3C2410_TCFG_PRESCALER0_MASK;
-+              break;
-+      case PWM2:
-+              tcfg1 &= ~S3C2410_TCFG1_MUX2_MASK;
-+              tcfg0 &= ~S3C2410_TCFG_PRESCALER1_MASK;
-+              break;
-+      case PWM3:
-+              tcfg1 &= ~S3C2410_TCFG1_MUX3_MASK;
-+              tcfg0 &= ~S3C2410_TCFG_PRESCALER1_MASK;
-+              break;
-+      case PWM4:
-+              /* timer four is not capable of doing PWM */
-+              break;
-+      default:
-+              clk_disable(pwm->pclk);
-+              clk_put(pwm->pclk);
-+              return -1;
-+      }
-+
-+      /* divider & scaler values */
-+      tcfg1 |= pwm->divider;
-+      __raw_writel(tcfg1, S3C2410_TCFG1);
-+
-+      switch (pwm->timerid) {
-+      case PWM0:
-+      case PWM1:
-+              tcfg0 |= pwm->prescaler;
-+              __raw_writel(tcfg0, S3C2410_TCFG0);
-+              break;
-+      default:
-+              if ((tcfg0 | pwm->prescaler) != tcfg0) {
-+                      printk(KERN_WARNING "not changing prescaler of PWM %u,"
-+                             " since it's shared with timer4 (clock tick)\n",
-+                             pwm->timerid);
-+              }
-+              break;
-+      }
-+
-+      /* timer count and compare buffer initial values */
-+      tcnt = pwm->counter;
-+      tcmp = pwm->comparer;
-+
-+      __raw_writel(tcnt, S3C2410_TCNTB(pwm->timerid));
-+      __raw_writel(tcmp, S3C2410_TCMPB(pwm->timerid));
-+
-+      /* ensure timer is stopped */
-+      s3c2410_pwm_stop(pwm);
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(s3c2410_pwm_enable);
-+
-+int s3c2410_pwm_start(struct s3c2410_pwm *pwm)
-+{
-+      unsigned long tcon;
-+
-+      tcon = __raw_readl(S3C2410_TCON);
-+
-+      switch (pwm->timerid) {
-+      case PWM0:
-+              tcon |= S3C2410_TCON_T0START;
-+              tcon &= ~S3C2410_TCON_T0MANUALUPD;
-+              break;
-+      case PWM1:
-+              tcon |= S3C2410_TCON_T1START;
-+              tcon &= ~S3C2410_TCON_T1MANUALUPD;
-+              break;
-+      case PWM2:
-+              tcon |= S3C2410_TCON_T2START;
-+              tcon &= ~S3C2410_TCON_T2MANUALUPD;
-+              break;
-+      case PWM3:
-+              tcon |= S3C2410_TCON_T3START;
-+              tcon &= ~S3C2410_TCON_T3MANUALUPD;
-+              break;
-+      case PWM4:
-+              /* timer four is not capable of doing PWM */
-+      default:
-+              return -ENODEV;
-+      }
-+
-+      __raw_writel(tcon, S3C2410_TCON);
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(s3c2410_pwm_start);
-+
-+int s3c2410_pwm_stop(struct s3c2410_pwm *pwm)
-+{
-+      unsigned long tcon;
-+
-+      tcon = __raw_readl(S3C2410_TCON);
-+
-+      switch (pwm->timerid) {
-+      case PWM0:
-+              tcon &= ~0x00000000;
-+              tcon |= S3C2410_TCON_T0RELOAD;
-+              tcon |= S3C2410_TCON_T0MANUALUPD;
-+              break;
-+      case PWM1:
-+              tcon &= ~0x00000080;
-+              tcon |= S3C2410_TCON_T1RELOAD;
-+              tcon |= S3C2410_TCON_T1MANUALUPD;
-+              break;
-+      case PWM2:
-+              tcon &= ~0x00000800;
-+              tcon |= S3C2410_TCON_T2RELOAD;
-+              tcon |= S3C2410_TCON_T2MANUALUPD;
-+              break;
-+      case PWM3:
-+              tcon &= ~0x00008000;
-+              tcon |= S3C2410_TCON_T3RELOAD;
-+              tcon |= S3C2410_TCON_T3MANUALUPD;
-+              break;
-+      case PWM4:
-+              /* timer four is not capable of doing PWM */
-+      default:
-+              return -ENODEV;
-+      }
-+
-+      __raw_writel(tcon, S3C2410_TCON);
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(s3c2410_pwm_stop);
-+
-+int s3c2410_pwm_duty_cycle(int reg_value, struct s3c2410_pwm *pwm)
-+{
-+      __raw_writel(reg_value, S3C2410_TCMPB(pwm->timerid));
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(s3c2410_pwm_duty_cycle);
-+
-+int s3c2410_pwm_dumpregs(void)
-+{
-+      printk(KERN_INFO "TCON: %08lx, TCFG0: %08lx, TCFG1: %08lx\n",
-+                      (unsigned long) __raw_readl(S3C2410_TCON),
-+                      (unsigned long) __raw_readl(S3C2410_TCFG0),
-+                      (unsigned long) __raw_readl(S3C2410_TCFG1));
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(s3c2410_pwm_dumpregs);
-diff --git a/include/asm-arm/arch-s3c2410/pwm.h b/include/asm-arm/arch-s3c2410/pwm.h
-new file mode 100644
-index 0000000..a797ec3
---- /dev/null
-+++ b/include/asm-arm/arch-s3c2410/pwm.h
-@@ -0,0 +1,40 @@
-+#ifndef __S3C2410_PWM_H
-+#define __S3C2410_PWM_H
-+
-+#include <linux/err.h>
-+#include <linux/platform_device.h>
-+#include <linux/clk.h>
-+
-+#include <asm-arm/io.h>
-+#include <asm/arch/hardware.h>
-+#include <asm/mach-types.h>
-+#include <asm/plat-s3c/regs-timer.h>
-+#include <asm/arch/gta01.h>
-+
-+enum pwm_timer {
-+      PWM0,
-+      PWM1,
-+      PWM2,
-+      PWM3,
-+      PWM4
-+};
-+
-+struct s3c2410_pwm {
-+      enum pwm_timer timerid;
-+      struct clk *pclk;
-+      unsigned long pclk_rate;
-+      unsigned long prescaler;
-+      unsigned long divider;
-+      unsigned long counter;
-+      unsigned long comparer;
-+};
-+
-+int s3c2410_pwm_init(struct s3c2410_pwm *s3c2410_pwm);
-+int s3c2410_pwm_enable(struct s3c2410_pwm *s3c2410_pwm);
-+int s3c2410_pwm_disable(struct s3c2410_pwm *s3c2410_pwm);
-+int s3c2410_pwm_start(struct s3c2410_pwm *s3c2410_pwm);
-+int s3c2410_pwm_stop(struct s3c2410_pwm *s3c2410_pwm);
-+int s3c2410_pwm_duty_cycle(int reg_value, struct s3c2410_pwm *s3c2410_pwm);
-+int s3c2410_pwm_dumpregs(void);
-+
-+#endif /* __S3C2410_PWM_H */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1012-gta01-vibrator.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1012-gta01-vibrator.patch.patch
deleted file mode 100755 (executable)
index 836f78c..0000000
+++ /dev/null
@@ -1,244 +0,0 @@
-From 51990833d84bdff24a384119a9ba0cf815edd683 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:49 +0100
-Subject: [PATCH] gta01-vibrator.patch
- This patch adds driver support for the vibator device of the FIC/OpenMoko
- Neo1973 GSM phone. The driver uses the existing LED class driver framework,
- since there's a lot of similarity between the LED and the vibrator function.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- drivers/leds/Kconfig                 |    8 ++-
- drivers/leds/Makefile                |    1 +
- drivers/leds/leds-neo1973-vibrator.c |  181 ++++++++++++++++++++++++++++++++++
- 3 files changed, 189 insertions(+), 1 deletions(-)
- create mode 100644 drivers/leds/leds-neo1973-vibrator.c
-
-diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
-index 86a369b..8c7d949 100644
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -47,7 +47,7 @@ config LEDS_SPITZ
- config LEDS_S3C24XX
-       tristate "LED Support for Samsung S3C24XX GPIO LEDs"
--      depends on LEDS_CLASS && ARCH_S3C2410
-+      depends on LEDS_CLASS && ARCH_S3C2410 && S3C2410_PWM
-       help
-         This option enables support for LEDs connected to GPIO lines
-         on Samsung S3C24XX series CPUs, such as the S3C2410 and S3C2440.
-@@ -147,6 +147,12 @@ config LEDS_CLEVO_MAIL
-         To compile this driver as a module, choose M here: the
-         module will be called leds-clevo-mail.
-+config LEDS_NEO1973_VIBRATOR
-+      tristate "Vibrator Support for the FIC Neo1973 GSM phone"
-+      depends on LEDS_CLASS && MACH_NEO1973
-+      help
-+        This option enables support for the vibrator on the FIC Neo1973.
-+
- comment "LED Triggers"
- config LEDS_TRIGGERS
-diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
-index 973d626..148fe51 100644
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -21,6 +21,7 @@ obj-$(CONFIG_LEDS_CM_X270)              += leds-cm-x270.o
- obj-$(CONFIG_LEDS_CLEVO_MAIL)         += leds-clevo-mail.o
- obj-$(CONFIG_LEDS_HP6XX)              += leds-hp6xx.o
- obj-$(CONFIG_LEDS_FSG)                        += leds-fsg.o
-+obj-$(CONFIG_LEDS_NEO1973_VIBRATOR)   += leds-neo1973-vibrator.o
- # LED Triggers
- obj-$(CONFIG_LEDS_TRIGGER_TIMER)      += ledtrig-timer.o
-diff --git a/drivers/leds/leds-neo1973-vibrator.c b/drivers/leds/leds-neo1973-vibrator.c
-new file mode 100644
-index 0000000..0336e36
---- /dev/null
-+++ b/drivers/leds/leds-neo1973-vibrator.c
-@@ -0,0 +1,181 @@
-+/*
-+ * LED driver for the vibrator of the FIC Neo1973 GSM Phone
-+ *
-+ * (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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 version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * Javi Roman <javiroman@kernel-labs.org>:
-+ *    Implement PWM support for GTA01Bv4 and later
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/leds.h>
-+#include <asm/hardware.h>
-+#include <asm/mach-types.h>
-+#include <asm/arch/pwm.h>
-+#include <asm/arch/gta01.h>
-+#include <asm/plat-s3c/regs-timer.h>
-+
-+#define COUNTER 64
-+
-+struct neo1973_vib_priv {
-+      struct led_classdev cdev;
-+      unsigned int gpio;
-+      struct mutex mutex;
-+      unsigned int has_pwm;
-+      struct s3c2410_pwm pwm;
-+};
-+
-+static void neo1973_vib_vib_set(struct led_classdev *led_cdev,
-+              enum led_brightness value)
-+{
-+      struct neo1973_vib_priv *vp =
-+              container_of(led_cdev, struct neo1973_vib_priv, cdev);
-+
-+      /*
-+       * value == 255 -> 99% duty cycle (full power)
-+       * value == 128 -> 50% duty cycle (medium power)
-+       * value == 0 -> 0% duty cycle (zero power)
-+       */
-+      mutex_lock(&vp->mutex);
-+      if (vp->has_pwm)
-+              s3c2410_pwm_duty_cycle(value/4, &vp->pwm);
-+      else {
-+              if (value)
-+                      s3c2410_gpio_setpin(vp->gpio, 1);
-+              else
-+                      s3c2410_gpio_setpin(vp->gpio, 0);
-+      }
-+
-+      mutex_unlock(&vp->mutex);
-+}
-+
-+static struct neo1973_vib_priv neo1973_vib_led = {
-+      .cdev = {
-+              .name = "neo1973:vibrator",
-+              .brightness_set = neo1973_vib_vib_set,
-+      },
-+};
-+
-+static int neo1973_vib_init_hw(struct neo1973_vib_priv *vp)
-+{
-+      int rc;
-+
-+      rc = s3c2410_pwm_init(&vp->pwm);
-+      if (rc)
-+              return rc;
-+
-+      vp->pwm.timerid = PWM3;
-+      /* use same prescaler as arch/arm/plat-s3c24xx/time.c */
-+      vp->pwm.prescaler = (6 - 1) / 2;
-+      vp->pwm.divider = S3C2410_TCFG1_MUX3_DIV2;
-+      vp->pwm.counter = COUNTER;
-+      vp->pwm.comparer = COUNTER;
-+
-+      rc = s3c2410_pwm_enable(&vp->pwm);
-+      if (rc)
-+              return rc;
-+
-+      s3c2410_pwm_start(&vp->pwm);
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int neo1973_vib_suspend(struct platform_device *dev, pm_message_t state)
-+{
-+      led_classdev_suspend(&neo1973_vib_led.cdev);
-+      return 0;
-+}
-+
-+static int neo1973_vib_resume(struct platform_device *dev)
-+{
-+      struct neo1973_vib_priv *vp = platform_get_drvdata(dev);
-+
-+      if (vp->has_pwm)
-+              neo1973_vib_init_hw(vp);
-+
-+      led_classdev_resume(&neo1973_vib_led.cdev);
-+
-+      return 0;
-+}
-+#endif /* CONFIG_PM */
-+
-+static int __init neo1973_vib_probe(struct platform_device *pdev)
-+{
-+      struct resource *r;
-+      int rc;
-+
-+      if (!machine_is_neo1973_gta01())
-+              return -EIO;
-+
-+      r = platform_get_resource(pdev, 0, 0);
-+      if (!r || !r->start)
-+              return -EIO;
-+
-+      neo1973_vib_led.gpio = r->start;
-+      platform_set_drvdata(pdev, &neo1973_vib_led);
-+
-+      /* TOUT3 */
-+      if (neo1973_vib_led.gpio == S3C2410_GPB3) {
-+              rc = neo1973_vib_init_hw(&neo1973_vib_led);
-+              if (rc)
-+                      return rc;
-+
-+              s3c2410_pwm_duty_cycle(0, &neo1973_vib_led.pwm);
-+              s3c2410_gpio_cfgpin(neo1973_vib_led.gpio, S3C2410_GPB3_TOUT3);
-+              neo1973_vib_led.has_pwm = 1;
-+      }
-+
-+      mutex_init(&neo1973_vib_led.mutex);
-+
-+      return led_classdev_register(&pdev->dev, &neo1973_vib_led.cdev);
-+}
-+
-+static int neo1973_vib_remove(struct platform_device *pdev)
-+{
-+      if (neo1973_vib_led.has_pwm)
-+              s3c2410_pwm_disable(&neo1973_vib_led.pwm);
-+
-+      led_classdev_unregister(&neo1973_vib_led.cdev);
-+
-+      mutex_destroy(&neo1973_vib_led.mutex);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver neo1973_vib_driver = {
-+      .probe          = neo1973_vib_probe,
-+      .remove         = neo1973_vib_remove,
-+#ifdef CONFIG_PM
-+      .suspend        = neo1973_vib_suspend,
-+      .resume         = neo1973_vib_resume,
-+#endif
-+      .driver         = {
-+              .name           = "neo1973-vibrator",
-+      },
-+};
-+
-+static int __init neo1973_vib_init(void)
-+{
-+      return platform_driver_register(&neo1973_vib_driver);
-+}
-+
-+static void __exit neo1973_vib_exit(void)
-+{
-+      platform_driver_unregister(&neo1973_vib_driver);
-+}
-+
-+module_init(neo1973_vib_init);
-+module_exit(neo1973_vib_exit);
-+
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_DESCRIPTION("FIC Neo1973 vibrator driver");
-+MODULE_LICENSE("GPL");
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1013-gta01-backlight.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1013-gta01-backlight.patch.patch
deleted file mode 100755 (executable)
index df13abd..0000000
+++ /dev/null
@@ -1,308 +0,0 @@
-From deee418974cd5cc3b1aa9b1329d91b50f8bb7baf Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:49 +0100
-Subject: [PATCH] gta01-backlight.patch
- This is a backlight driver for the FIC/OpenMoko Neo1973 GTA01 GSM Phone
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- drivers/video/backlight/Kconfig    |    7 +
- drivers/video/backlight/Makefile   |    1 +
- drivers/video/backlight/gta01_bl.c |  255 ++++++++++++++++++++++++++++++++++++
- 3 files changed, 263 insertions(+), 0 deletions(-)
- create mode 100644 drivers/video/backlight/gta01_bl.c
-
-diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
-index dcd8073..475db76 100644
---- a/drivers/video/backlight/Kconfig
-+++ b/drivers/video/backlight/Kconfig
-@@ -89,6 +89,13 @@ config BACKLIGHT_OMAP1
-         the PWL module of OMAP1 processors.  Say Y if your board
-         uses this hardware.
-+config BACKLIGHT_GTA01
-+      tristate "FIC Neo1973 GTA01 Backlight Driver"
-+      depends on BACKLIGHT_CLASS_DEVICE && MACH_NEO1973_GTA01
-+      default y
-+      help
-+        If you have a FIC Neo1973 GTA01, say y to enable the backlight driver.
-+
- config BACKLIGHT_HP680
-       tristate "HP Jornada 680 Backlight Driver"
-       depends on BACKLIGHT_CLASS_DEVICE && SH_HP6XX
-diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
-index 33f6c7c..aee9f46 100644
---- a/drivers/video/backlight/Makefile
-+++ b/drivers/video/backlight/Makefile
-@@ -5,6 +5,7 @@ obj-$(CONFIG_LCD_LTV350QV)     += ltv350qv.o
- obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o
- obj-$(CONFIG_BACKLIGHT_CORGI) += corgi_bl.o
-+obj-$(CONFIG_BACKLIGHT_GTA01) += gta01_bl.o
- obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o
- obj-$(CONFIG_BACKLIGHT_LOCOMO)        += locomolcd.o
- obj-$(CONFIG_BACKLIGHT_OMAP1) += omap1_bl.o
-diff --git a/drivers/video/backlight/gta01_bl.c b/drivers/video/backlight/gta01_bl.c
-new file mode 100644
-index 0000000..c2bf0c9
---- /dev/null
-+++ b/drivers/video/backlight/gta01_bl.c
-@@ -0,0 +1,255 @@
-+/*
-+ *  Backlight Driver for FIC GTA01 (Neo1973) GSM Phone
-+ *
-+ * Copyright (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * All rights reserved.
-+ *
-+ *  based on corgi_cl.c, Copyright (c) 2004-2006 Richard Purdie
-+ *
-+ * 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, version 2.
-+ *
-+ * 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
-+ *
-+ * Javi Roman <javiroman@kernel-labs.org>:
-+ *    implement PWM, instead of simple on/off switching
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/mutex.h>
-+#include <linux/fb.h>
-+#include <linux/backlight.h>
-+#include <linux/clk.h>
-+
-+#include <asm/arch/hardware.h>
-+#include <asm/arch/gta01.h>
-+#include <asm/arch/pwm.h>
-+
-+#include <asm/plat-s3c/regs-timer.h>
-+
-+static struct backlight_properties gta01bl_prop;
-+static struct backlight_device *gta01_backlight_device;
-+static struct gta01bl_machinfo *bl_machinfo;
-+
-+static unsigned long gta01bl_flags;
-+
-+struct gta01bl_data {
-+      int intensity;
-+      struct mutex mutex;
-+      struct clk *clk;
-+      struct s3c2410_pwm pwm;
-+};
-+
-+static struct gta01bl_data gta01bl;
-+
-+#define GTA01BL_SUSPENDED     0x01
-+#define GTA01BL_BATTLOW       0x02
-+
-+/* On the GTA01 / Neo1973, we use a 50 or 66MHz PCLK, which gives
-+ * us a 6.25..8.25MHz DIV8 clock, which is further divided by a
-+ * prescaler of 4, resulting in a 1.56..2.06MHz tick.  This results in a
-+ * minimum frequency of 24..31Hz.  At 400Hz, we need to set the count
-+ * to something like 3906..5156, providing us a way sufficient resolution
-+ * for display brightness adjustment. */
-+#define GTA01BL_COUNTER 5156
-+
-+static int gta01bl_send_intensity(struct backlight_device *bd)
-+{
-+      int intensity = bd->props.brightness;
-+
-+      if (bd->props.power != FB_BLANK_UNBLANK)
-+              intensity = 0;
-+      if (bd->props.fb_blank != FB_BLANK_UNBLANK)
-+              intensity = 0;
-+      if (gta01bl_flags & GTA01BL_SUSPENDED)
-+              intensity = 0;
-+      if (gta01bl_flags & GTA01BL_BATTLOW)
-+              intensity &= bl_machinfo->limit_mask;
-+
-+      mutex_lock(&gta01bl.mutex);
-+#ifdef GTA01_BACKLIGHT_ONOFF_ONLY
-+      if (intensity)
-+              s3c2410_gpio_setpin(GTA01_GPIO_BACKLIGHT, 1);
-+      else
-+              s3c2410_gpio_setpin(GTA01_GPIO_BACKLIGHT, 0);
-+#else
-+      if (intensity == bd->props.max_brightness) {
-+              s3c2410_gpio_setpin(GTA01_GPIO_BACKLIGHT, 1);
-+              s3c2410_gpio_cfgpin(GTA01_GPIO_BACKLIGHT, S3C2410_GPIO_OUTPUT);
-+      } else  {
-+              s3c2410_pwm_duty_cycle(intensity & 0xffff, &gta01bl.pwm);
-+              s3c2410_gpio_cfgpin(GTA01_GPIO_BACKLIGHT, S3C2410_GPB0_TOUT0);
-+      }
-+#endif
-+      mutex_unlock(&gta01bl.mutex);
-+
-+      gta01bl.intensity = intensity;
-+      return 0;
-+}
-+
-+static int gta01bl_init_hw(void)
-+{
-+      int rc;
-+
-+      rc = s3c2410_pwm_init(&gta01bl.pwm);
-+      if (rc)
-+              return rc;
-+
-+      gta01bl.pwm.timerid = PWM0;
-+      gta01bl.pwm.prescaler = (4 - 1);
-+      gta01bl.pwm.divider = S3C2410_TCFG1_MUX0_DIV8;
-+      gta01bl.pwm.counter = GTA01BL_COUNTER;
-+      gta01bl.pwm.comparer = gta01bl.pwm.counter;
-+
-+      rc = s3c2410_pwm_enable(&gta01bl.pwm);
-+      if (rc)
-+              return rc;
-+
-+      s3c2410_pwm_start(&gta01bl.pwm);
-+
-+      gta01bl_prop.max_brightness = gta01bl.pwm.counter;
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int gta01bl_suspend(struct platform_device *dev, pm_message_t state)
-+{
-+      gta01bl_flags |= GTA01BL_SUSPENDED;
-+      gta01bl_send_intensity(gta01_backlight_device);
-+      return 0;
-+}
-+
-+static int gta01bl_resume(struct platform_device *dev)
-+{
-+      mutex_lock(&gta01bl.mutex);
-+      gta01bl_init_hw();
-+      mutex_unlock(&gta01bl.mutex);
-+
-+      gta01bl_flags &= ~GTA01BL_SUSPENDED;
-+      gta01bl_send_intensity(gta01_backlight_device);
-+      return 0;
-+}
-+#else
-+#define gta01bl_suspend       NULL
-+#define gta01bl_resume        NULL
-+#endif
-+
-+static int gta01bl_get_intensity(struct backlight_device *bd)
-+{
-+      return gta01bl.intensity;
-+}
-+
-+static int gta01bl_set_intensity(struct backlight_device *bd)
-+{
-+      gta01bl_send_intensity(gta01_backlight_device);
-+      return 0;
-+}
-+
-+/*
-+ * Called when the battery is low to limit the backlight intensity.
-+ * If limit==0 clear any limit, otherwise limit the intensity
-+ */
-+void gta01bl_limit_intensity(int limit)
-+{
-+      if (limit)
-+              gta01bl_flags |= GTA01BL_BATTLOW;
-+      else
-+              gta01bl_flags &= ~GTA01BL_BATTLOW;
-+      gta01bl_send_intensity(gta01_backlight_device);
-+}
-+EXPORT_SYMBOL_GPL(gta01bl_limit_intensity);
-+
-+
-+static struct backlight_ops gta01bl_ops = {
-+      .get_brightness = gta01bl_get_intensity,
-+      .update_status  = gta01bl_set_intensity,
-+};
-+
-+static int __init gta01bl_probe(struct platform_device *pdev)
-+{
-+      struct gta01bl_machinfo *machinfo = pdev->dev.platform_data;
-+      int rc;
-+
-+#ifdef GTA01_BACKLIGHT_ONOFF_ONLY
-+      s3c2410_gpio_cfgpin(GTA01_GPIO_BACKLIGHT, S3C2410_GPIO_OUTPUT);
-+      gta01bl_prop.max_brightness = 1;
-+#else
-+      rc = gta01bl_init_hw();
-+      if (rc < 0)
-+              return rc;
-+#endif
-+      mutex_init(&gta01bl.mutex);
-+
-+      if (!machinfo->limit_mask)
-+              machinfo->limit_mask = -1;
-+
-+      gta01_backlight_device = backlight_device_register("gta01-bl",
-+                                                         &pdev->dev, NULL,
-+                                                         &gta01bl_ops);
-+      if (IS_ERR(gta01_backlight_device))
-+              return PTR_ERR(gta01_backlight_device);
-+
-+      gta01bl_prop.power = FB_BLANK_UNBLANK;
-+      gta01bl_prop.brightness = gta01bl_prop.max_brightness;
-+      memcpy(&gta01_backlight_device->props,
-+             &gta01bl_prop, sizeof(gta01bl_prop));
-+      gta01bl_send_intensity(gta01_backlight_device);
-+
-+      return 0;
-+}
-+
-+static int gta01bl_remove(struct platform_device *dev)
-+{
-+#ifndef GTA01_BACKLIGHT_ONOFF_ONLY
-+      s3c2410_pwm_disable(&gta01bl.pwm);
-+#endif
-+      backlight_device_unregister(gta01_backlight_device);
-+      mutex_destroy(&gta01bl.mutex);
-+
-+      s3c2410_gpio_cfgpin(GTA01_GPIO_BACKLIGHT, S3C2410_GPIO_OUTPUT);
-+      s3c2410_gpio_setpin(GTA01_GPIO_BACKLIGHT, 1);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver gta01bl_driver = {
-+      .probe          = gta01bl_probe,
-+      .remove         = gta01bl_remove,
-+      .suspend        = gta01bl_suspend,
-+      .resume         = gta01bl_resume,
-+      .driver         = {
-+              .name   = "gta01-bl",
-+      },
-+};
-+
-+static int __init gta01bl_init(void)
-+{
-+      return platform_driver_register(&gta01bl_driver);
-+}
-+
-+static void __exit gta01bl_exit(void)
-+{
-+      platform_driver_unregister(&gta01bl_driver);
-+}
-+
-+module_init(gta01bl_init);
-+module_exit(gta01bl_exit);
-+
-+MODULE_DESCRIPTION("FIC GTA01 (Neo1973) Backlight Driver");
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_LICENSE("GPL");
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1014-s3c2410_touchscreen.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1014-s3c2410_touchscreen.patch.patch
deleted file mode 100755 (executable)
index 27c1a9c..0000000
+++ /dev/null
@@ -1,636 +0,0 @@
-From fc5d5366335469828d78898e2e74f8f80aa1d076 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:49 +0100
-Subject: [PATCH] s3c2410_touchscreen.patch
-
----
- arch/arm/mach-s3c2410/mach-h1940.c     |    8 +
- arch/arm/plat-s3c24xx/devs.c           |   18 ++
- arch/arm/plat-s3c24xx/s3c244x.c        |    1 +
- drivers/input/touchscreen/Kconfig      |   18 ++
- drivers/input/touchscreen/Makefile     |    1 +
- drivers/input/touchscreen/s3c2410_ts.c |  437 ++++++++++++++++++++++++++++++++
- include/asm-arm/arch-s3c2410/ts.h      |   28 ++
- include/asm-arm/plat-s3c24xx/devs.h    |    1 +
- 8 files changed, 512 insertions(+), 0 deletions(-)
- create mode 100644 drivers/input/touchscreen/s3c2410_ts.c
- create mode 100644 include/asm-arm/arch-s3c2410/ts.h
-
-diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c
-index 7c1145e..93cd8c8 100644
---- a/arch/arm/mach-s3c2410/mach-h1940.c
-+++ b/arch/arm/mach-s3c2410/mach-h1940.c
-@@ -38,6 +38,7 @@
- #include <asm/arch/h1940.h>
- #include <asm/arch/h1940-latch.h>
- #include <asm/arch/fb.h>
-+#include <asm/arch/tc.h>
- #include <asm/plat-s3c24xx/udc.h>
- #include <asm/plat-s3c24xx/clock.h>
-@@ -129,6 +130,11 @@ static struct s3c2410_udc_mach_info h1940_udc_cfg __initdata = {
-       .vbus_pin_inverted      = 1,
- };
-+static struct s3c2410_ts_mach_info h1940_ts_cfg __initdata = {
-+              .delay = 10000,
-+              .presc = 49,
-+              .oversampling_shift = 2,
-+};
- /**
-  * Set lcd on or off
-@@ -186,6 +192,7 @@ static struct platform_device *h1940_devices[] __initdata = {
-       &s3c_device_i2c,
-       &s3c_device_iis,
-       &s3c_device_usbgadget,
-+      &s3c_device_ts,
-       &s3c_device_leds,
-       &s3c_device_bluetooth,
- };
-@@ -214,6 +221,7 @@ static void __init h1940_init(void)
-       u32 tmp;
-       s3c24xx_fb_set_platdata(&h1940_fb_info);
-+      set_s3c2410ts_info(&h1940_ts_cfg);
-       s3c24xx_udc_set_platdata(&h1940_udc_cfg);
-       /* Turn off suspend on both USB ports, and switch the
-diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c
-index e546e93..c1fbe2d 100644
---- a/arch/arm/plat-s3c24xx/devs.c
-+++ b/arch/arm/plat-s3c24xx/devs.c
-@@ -24,6 +24,7 @@
- #include <asm/mach/map.h>
- #include <asm/mach/irq.h>
- #include <asm/arch/fb.h>
-+#include <asm/arch/ts.h>
- #include <asm/hardware.h>
- #include <asm/io.h>
- #include <asm/irq.h>
-@@ -207,6 +208,23 @@ struct platform_device s3c_device_nand = {
- EXPORT_SYMBOL(s3c_device_nand);
-+/* Touchscreen */
-+struct platform_device s3c_device_ts = {
-+      .name             = "s3c2410-ts",
-+      .id               = -1,
-+};
-+
-+EXPORT_SYMBOL(s3c_device_ts);
-+
-+static struct s3c2410_ts_mach_info s3c2410ts_info;
-+
-+void set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info)
-+{
-+      memcpy(&s3c2410ts_info,hard_s3c2410ts_info,sizeof(struct s3c2410_ts_mach_info));
-+      s3c_device_ts.dev.platform_data = &s3c2410ts_info;
-+}
-+EXPORT_SYMBOL(set_s3c2410ts_info);
-+
- /* USB Device (Gadget)*/
- static struct resource s3c_usbgadget_resource[] = {
-diff --git a/arch/arm/plat-s3c24xx/s3c244x.c b/arch/arm/plat-s3c24xx/s3c244x.c
-index 2f01af5..7a1a12d 100644
---- a/arch/arm/plat-s3c24xx/s3c244x.c
-+++ b/arch/arm/plat-s3c24xx/s3c244x.c
-@@ -68,6 +68,7 @@ void __init s3c244x_map_io(struct map_desc *mach_desc, int size)
-       s3c_device_sdi.name  = "s3c2440-sdi";
-       s3c_device_i2c.name  = "s3c2440-i2c";
-       s3c_device_nand.name = "s3c2440-nand";
-+      s3c_device_ts.name = "s3c2440-ts";
-       s3c_device_usbgadget.name = "s3c2440-usbgadget";
- }
-diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
-index 565ec71..52de2b0 100644
---- a/drivers/input/touchscreen/Kconfig
-+++ b/drivers/input/touchscreen/Kconfig
-@@ -67,6 +67,24 @@ config TOUCHSCREEN_FUJITSU
-         To compile this driver as a module, choose M here: the
-         module will be called fujitsu-ts.
-+config TOUCHSCREEN_S3C2410
-+      tristate "Samsung S3C2410 touchscreen input driver"
-+      depends on ARCH_S3C2410 && INPUT && INPUT_TOUCHSCREEN
-+      select SERIO
-+      help
-+        Say Y here if you have the s3c2410 touchscreen.
-+
-+        If unsure, say N.
-+
-+        To compile this driver as a module, choose M here: the
-+        module will be called s3c2410_ts.
-+
-+config TOUCHSCREEN_S3C2410_DEBUG
-+      boolean "Samsung S3C2410 touchscreen debug messages"
-+      depends on TOUCHSCREEN_S3C2410
-+      help
-+        Select this if you want debug messages
-+
- config TOUCHSCREEN_GUNZE
-       tristate "Gunze AHL-51S touchscreen"
-       select SERIO
-diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
-index 3c096d7..7c3bd1c 100644
---- a/drivers/input/touchscreen/Makefile
-+++ b/drivers/input/touchscreen/Makefile
-@@ -26,3 +26,4 @@ wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9705)       += wm9705.o
- wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9712)        += wm9712.o
- wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9713)        += wm9713.o
- obj-$(CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE)    += mainstone-wm97xx.o
-+obj-$(CONFIG_TOUCHSCREEN_S3C2410)     += s3c2410_ts.o
-diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
-new file mode 100644
-index 0000000..68071c2
---- /dev/null
-+++ b/drivers/input/touchscreen/s3c2410_ts.c
-@@ -0,0 +1,437 @@
-+/*
-+ * 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
-+ *
-+ * Copyright (c) 2004 Arnaud Patard <arnaud.patard@rtp-net.org>
-+ * iPAQ H1940 touchscreen support
-+ *
-+ * ChangeLog
-+ *
-+ * 2004-09-05: Herbert Pötzl <herbert@13thfloor.at>
-+ *    - added clock (de-)allocation code
-+ *
-+ * 2005-03-06: Arnaud Patard <arnaud.patard@rtp-net.org>
-+ *      - h1940_ -> s3c2410 (this driver is now also used on the n30
-+ *        machines :P)
-+ *      - Debug messages are now enabled with the config option
-+ *        TOUCHSCREEN_S3C2410_DEBUG
-+ *      - Changed the way the value are read
-+ *      - Input subsystem should now work
-+ *      - Use ioremap and readl/writel
-+ *
-+ * 2005-03-23: Arnaud Patard <arnaud.patard@rtp-net.org>
-+ *      - Make use of some undocumented features of the touchscreen
-+ *        controller
-+ *
-+ * 2007-05-23: Harald Welte <laforge@openmoko.org>
-+ *    - Add proper support for S32440
-+ */
-+
-+#include <linux/errno.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/slab.h>
-+#include <linux/input.h>
-+#include <linux/init.h>
-+#include <linux/serio.h>
-+#include <linux/delay.h>
-+#include <linux/platform_device.h>
-+#include <linux/clk.h>
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+
-+#include <asm/arch/regs-gpio.h>
-+#include <asm/arch/ts.h>
-+
-+#include <asm/plat-s3c/regs-adc.h>
-+
-+/* For ts.dev.id.version */
-+#define S3C2410TSVERSION      0x0101
-+
-+#define TSC_SLEEP  (S3C2410_ADCTSC_PULL_UP_DISABLE | S3C2410_ADCTSC_XY_PST(0))
-+
-+#define WAIT4INT(x)  (((x)<<8) | \
-+                   S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \
-+                   S3C2410_ADCTSC_XY_PST(3))
-+
-+#define AUTOPST            (S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \
-+                   S3C2410_ADCTSC_AUTO_PST | S3C2410_ADCTSC_XY_PST(0))
-+
-+#define DEBUG_LVL    KERN_DEBUG
-+
-+MODULE_AUTHOR("Arnaud Patard <arnaud.patard@rtp-net.org>");
-+MODULE_DESCRIPTION("s3c2410 touchscreen driver");
-+MODULE_LICENSE("GPL");
-+
-+/*
-+ * Definitions & global arrays.
-+ */
-+
-+
-+static char *s3c2410ts_name = "s3c2410 TouchScreen";
-+
-+/*
-+ * Per-touchscreen data.
-+ */
-+
-+struct s3c2410ts {
-+      struct input_dev *dev;
-+      long xp;
-+      long yp;
-+      int count;
-+      int shift;
-+};
-+
-+static struct s3c2410ts ts;
-+static void __iomem *base_addr;
-+
-+static inline void s3c2410_ts_connect(void)
-+{
-+      s3c2410_gpio_cfgpin(S3C2410_GPG12, S3C2410_GPG12_XMON);
-+      s3c2410_gpio_cfgpin(S3C2410_GPG13, S3C2410_GPG13_nXPON);
-+      s3c2410_gpio_cfgpin(S3C2410_GPG14, S3C2410_GPG14_YMON);
-+      s3c2410_gpio_cfgpin(S3C2410_GPG15, S3C2410_GPG15_nYPON);
-+}
-+
-+static void touch_timer_fire(unsigned long data)
-+{
-+      unsigned long data0;
-+      unsigned long data1;
-+      int updown;
-+
-+      data0 = readl(base_addr+S3C2410_ADCDAT0);
-+      data1 = readl(base_addr+S3C2410_ADCDAT1);
-+
-+      updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN));
-+
-+      if (updown) {
-+              if (ts.count != 0) {
-+                      ts.xp >>= ts.shift;
-+                      ts.yp >>= ts.shift;
-+
-+#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG
-+                      {
-+                              struct timeval tv;
-+                              do_gettimeofday(&tv);
-+                              printk(DEBUG_LVL "T: %06d, X: %03ld, Y: %03ld\n", (int)tv.tv_usec, ts.xp, ts.yp);
-+                      }
-+#endif
-+
-+                      input_report_abs(ts.dev, ABS_X, ts.xp);
-+                      input_report_abs(ts.dev, ABS_Y, ts.yp);
-+
-+                      input_report_key(ts.dev, BTN_TOUCH, 1);
-+                      input_report_abs(ts.dev, ABS_PRESSURE, 1);
-+                      input_sync(ts.dev);
-+              }
-+
-+              ts.xp = 0;
-+              ts.yp = 0;
-+              ts.count = 0;
-+
-+              writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC);
-+              writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON);
-+      } else {
-+              ts.count = 0;
-+
-+              input_report_key(ts.dev, BTN_TOUCH, 0);
-+              input_report_abs(ts.dev, ABS_PRESSURE, 0);
-+              input_sync(ts.dev);
-+
-+              writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC);
-+      }
-+}
-+
-+static struct timer_list touch_timer =
-+              TIMER_INITIALIZER(touch_timer_fire, 0, 0);
-+
-+static irqreturn_t stylus_updown(int irq, void *dev_id)
-+{
-+      unsigned long data0;
-+      unsigned long data1;
-+      int updown;
-+
-+      data0 = readl(base_addr+S3C2410_ADCDAT0);
-+      data1 = readl(base_addr+S3C2410_ADCDAT1);
-+
-+      updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN));
-+
-+      /* TODO we should never get an interrupt with updown set while
-+       * the timer is running, but maybe we ought to verify that the
-+       * timer isn't running anyways. */
-+
-+      if (updown)
-+              touch_timer_fire(0);
-+
-+      return IRQ_HANDLED;
-+}
-+
-+
-+static irqreturn_t stylus_action(int irq, void *dev_id)
-+{
-+      unsigned long data0;
-+      unsigned long data1;
-+
-+      data0 = readl(base_addr+S3C2410_ADCDAT0);
-+      data1 = readl(base_addr+S3C2410_ADCDAT1);
-+
-+      ts.xp += data0 & S3C2410_ADCDAT0_XPDATA_MASK;
-+      ts.yp += data1 & S3C2410_ADCDAT1_YPDATA_MASK;
-+      ts.count++;
-+
-+        if (ts.count < (1<<ts.shift)) {
-+              writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC);
-+              writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON);
-+      } else {
-+              mod_timer(&touch_timer, jiffies+1);
-+              writel(WAIT4INT(1), base_addr+S3C2410_ADCTSC);
-+      }
-+
-+      return IRQ_HANDLED;
-+}
-+
-+static struct clk     *adc_clock;
-+
-+/*
-+ * The functions for inserting/removing us as a module.
-+ */
-+
-+static int __init s3c2410ts_probe(struct platform_device *pdev)
-+{
-+      int rc;
-+      struct s3c2410_ts_mach_info *info;
-+      struct input_dev *input_dev;
-+
-+      info = ( struct s3c2410_ts_mach_info *)pdev->dev.platform_data;
-+
-+      if (!info)
-+      {
-+              printk(KERN_ERR "Hm... too bad : no platform data for ts\n");
-+              return -EINVAL;
-+      }
-+
-+#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG
-+      printk(DEBUG_LVL "Entering s3c2410ts_init\n");
-+#endif
-+
-+      adc_clock = clk_get(NULL, "adc");
-+      if (!adc_clock) {
-+              printk(KERN_ERR "failed to get adc clock source\n");
-+              return -ENOENT;
-+      }
-+      clk_enable(adc_clock);
-+
-+#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG
-+      printk(DEBUG_LVL "got and enabled clock\n");
-+#endif
-+
-+      base_addr = ioremap(S3C2410_PA_ADC,0x20);
-+      if (base_addr == NULL) {
-+              printk(KERN_ERR "Failed to remap register block\n");
-+              return -ENOMEM;
-+      }
-+
-+
-+      /* If we acutally are a S3C2410: Configure GPIOs */
-+      if (!strcmp(pdev->name, "s3c2410-ts"))
-+              s3c2410_ts_connect();
-+
-+      if ((info->presc&0xff) > 0)
-+              writel(S3C2410_ADCCON_PRSCEN | S3C2410_ADCCON_PRSCVL(info->presc&0xFF),\
-+                           base_addr+S3C2410_ADCCON);
-+      else
-+              writel(0,base_addr+S3C2410_ADCCON);
-+
-+
-+      /* Initialise registers */
-+      if ((info->delay&0xffff) > 0)
-+              writel(info->delay & 0xffff,  base_addr+S3C2410_ADCDLY);
-+
-+      writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC);
-+
-+      /* Initialise input stuff */
-+      memset(&ts, 0, sizeof(struct s3c2410ts));
-+      input_dev = input_allocate_device();
-+
-+      if (!input_dev) {
-+              printk(KERN_ERR "Unable to allocate the input device !!\n");
-+              return -ENOMEM;
-+      }
-+
-+      ts.dev = input_dev;
-+      ts.dev->evbit[0] = BIT_MASK(EV_SYN) | BIT_MASK(EV_KEY) |
-+                         BIT_MASK(EV_ABS);
-+      ts.dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
-+      input_set_abs_params(ts.dev, ABS_X, 0, 0x3FF, 0, 0);
-+      input_set_abs_params(ts.dev, ABS_Y, 0, 0x3FF, 0, 0);
-+      input_set_abs_params(ts.dev, ABS_PRESSURE, 0, 1, 0, 0);
-+
-+      ts.dev->private = &ts;
-+      ts.dev->name = s3c2410ts_name;
-+      ts.dev->id.bustype = BUS_RS232;
-+      ts.dev->id.vendor = 0xDEAD;
-+      ts.dev->id.product = 0xBEEF;
-+      ts.dev->id.version = S3C2410TSVERSION;
-+
-+      ts.shift = info->oversampling_shift;
-+
-+      /* Get irqs */
-+      if (request_irq(IRQ_ADC, stylus_action, IRQF_SAMPLE_RANDOM,
-+              "s3c2410_action", ts.dev)) {
-+              printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_ADC !\n");
-+              iounmap(base_addr);
-+              return -EIO;
-+      }
-+      if (request_irq(IRQ_TC, stylus_updown, IRQF_SAMPLE_RANDOM,
-+                      "s3c2410_action", ts.dev)) {
-+              printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_TC !\n");
-+              free_irq(IRQ_ADC, ts.dev);
-+              iounmap(base_addr);
-+              return -EIO;
-+      }
-+
-+      printk(KERN_INFO "%s successfully loaded\n", s3c2410ts_name);
-+
-+      /* All went ok, so register to the input system */
-+      rc = input_register_device(ts.dev);
-+      if (rc) {
-+              free_irq(IRQ_TC, ts.dev);
-+              free_irq(IRQ_ADC, ts.dev);
-+              clk_disable(adc_clock);
-+              iounmap(base_addr);
-+              return -EIO;
-+      }
-+
-+      return 0;
-+}
-+
-+static int s3c2410ts_remove(struct platform_device *pdev)
-+{
-+      disable_irq(IRQ_ADC);
-+      disable_irq(IRQ_TC);
-+      free_irq(IRQ_TC,ts.dev);
-+      free_irq(IRQ_ADC,ts.dev);
-+
-+      if (adc_clock) {
-+              clk_disable(adc_clock);
-+              clk_put(adc_clock);
-+              adc_clock = NULL;
-+      }
-+
-+      input_unregister_device(ts.dev);
-+      iounmap(base_addr);
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int s3c2410ts_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+      writel(TSC_SLEEP, base_addr+S3C2410_ADCTSC);
-+      writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_STDBM,
-+             base_addr+S3C2410_ADCCON);
-+
-+      disable_irq(IRQ_ADC);
-+      disable_irq(IRQ_TC);
-+
-+      clk_disable(adc_clock);
-+
-+      return 0;
-+}
-+
-+static int s3c2410ts_resume(struct platform_device *pdev)
-+{
-+      struct s3c2410_ts_mach_info *info =
-+              ( struct s3c2410_ts_mach_info *)pdev->dev.platform_data;
-+
-+      clk_enable(adc_clock);
-+      msleep(1);
-+
-+      enable_irq(IRQ_ADC);
-+      enable_irq(IRQ_TC);
-+
-+      if ((info->presc&0xff) > 0)
-+              writel(S3C2410_ADCCON_PRSCEN | S3C2410_ADCCON_PRSCVL(info->presc&0xFF),\
-+                           base_addr+S3C2410_ADCCON);
-+      else
-+              writel(0,base_addr+S3C2410_ADCCON);
-+
-+      /* Initialise registers */
-+      if ((info->delay&0xffff) > 0)
-+              writel(info->delay & 0xffff,  base_addr+S3C2410_ADCDLY);
-+
-+      writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC);
-+
-+      return 0;
-+}
-+
-+#else
-+#define s3c2410ts_suspend NULL
-+#define s3c2410ts_resume  NULL
-+#endif
-+
-+static struct platform_driver s3c2410ts_driver = {
-+       .driver         = {
-+             .name   = "s3c2410-ts",
-+             .owner  = THIS_MODULE,
-+       },
-+       .probe          = s3c2410ts_probe,
-+       .remove         = s3c2410ts_remove,
-+       .suspend        = s3c2410ts_suspend,
-+       .resume         = s3c2410ts_resume,
-+
-+};
-+
-+static struct platform_driver s3c2440ts_driver = {
-+       .driver         = {
-+             .name   = "s3c2440-ts",
-+             .owner  = THIS_MODULE,
-+       },
-+       .probe          = s3c2410ts_probe,
-+       .remove         = s3c2410ts_remove,
-+       .suspend        = s3c2410ts_suspend,
-+       .resume         = s3c2410ts_resume,
-+
-+};
-+
-+static int __init s3c2410ts_init(void)
-+{
-+      int rc;
-+
-+      rc = platform_driver_register(&s3c2410ts_driver);
-+      if (rc < 0)
-+              return rc;
-+
-+      rc = platform_driver_register(&s3c2440ts_driver);
-+      if (rc < 0)
-+              platform_driver_unregister(&s3c2410ts_driver);
-+
-+      return rc;
-+}
-+
-+static void __exit s3c2410ts_exit(void)
-+{
-+      platform_driver_unregister(&s3c2440ts_driver);
-+      platform_driver_unregister(&s3c2410ts_driver);
-+}
-+
-+module_init(s3c2410ts_init);
-+module_exit(s3c2410ts_exit);
-+
-+/*
-+    Local variables:
-+        compile-command: "make ARCH=arm CROSS_COMPILE=/usr/local/arm/3.3.2/bin/arm-linux- -k -C ../../.."
-+        c-basic-offset: 8
-+    End:
-+*/
-diff --git a/include/asm-arm/arch-s3c2410/ts.h b/include/asm-arm/arch-s3c2410/ts.h
-new file mode 100644
-index 0000000..593632a
---- /dev/null
-+++ b/include/asm-arm/arch-s3c2410/ts.h
-@@ -0,0 +1,28 @@
-+/* linux/include/asm/arch-s3c2410/ts.h
-+ *
-+ * Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.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.
-+ *
-+ *
-+ *  Changelog:
-+ *     24-Mar-2005     RTP     Created file
-+ *     03-Aug-2005     RTP     Renamed to ts.h
-+ */
-+
-+#ifndef __ASM_ARM_TS_H
-+#define __ASM_ARM_TS_H
-+
-+struct s3c2410_ts_mach_info {
-+       int             delay;
-+       int             presc;
-+       int             oversampling_shift;
-+};
-+
-+void set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info);
-+
-+#endif /* __ASM_ARM_TS_H */
-+
-diff --git a/include/asm-arm/plat-s3c24xx/devs.h b/include/asm-arm/plat-s3c24xx/devs.h
-index f9d6f03..43de9cc 100644
---- a/include/asm-arm/plat-s3c24xx/devs.h
-+++ b/include/asm-arm/plat-s3c24xx/devs.h
-@@ -42,6 +42,7 @@ extern struct platform_device s3c_device_timer2;
- extern struct platform_device s3c_device_timer3;
- extern struct platform_device s3c_device_usbgadget;
-+extern struct platform_device s3c_device_ts;
- /* s3c2440 specific devices */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1015-s3c2410_ts-gta01.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1015-s3c2410_ts-gta01.patch.patch
deleted file mode 100755 (executable)
index 5ff3328..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-From 4c5bb8608de01a165a32432a4091613bb12303fc Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:49 +0100
-Subject: [PATCH] s3c2410_ts-gta01.patch
-
----
- arch/arm/mach-s3c2410/mach-gta01.c |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index e690ed7..3462c7f 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -33,6 +33,7 @@
- #include <linux/workqueue.h>
- #include <linux/platform_device.h>
- #include <linux/serial_core.h>
-+#include <asm/arch/ts.h>
- #include <linux/spi/spi.h>
- #include <linux/spi/spi_bitbang.h>
- #include <linux/mmc/mmc.h>
-@@ -362,6 +363,7 @@ static struct platform_device *gta01_devices[] __initdata = {
-       &s3c_device_sdi,
-       &s3c_device_usbgadget,
-       &s3c_device_nand,
-+      &s3c_device_ts,
- };
- static struct s3c2410_nand_set gta01_nand_sets[] = {
-@@ -434,6 +436,12 @@ static struct s3c2410_udc_mach_info gta01_udc_cfg = {
-       .vbus_draw      = gta01_udc_vbus_draw,
- };
-+static struct s3c2410_ts_mach_info gta01_ts_cfg = {
-+      .delay = 10000,
-+      .presc = 65,
-+      .oversampling_shift = 5,
-+};
-+
- /* SPI */
- static struct spi_board_info gta01_spi_board_info[] = {
-@@ -599,6 +607,7 @@ static void __init gta01_machine_init(void)
-       INIT_WORK(&gta01_udc_vbus_drawer.work, __gta01_udc_vbus_draw);
-       s3c24xx_udc_set_platdata(&gta01_udc_cfg);
-+      set_s3c2410ts_info(&gta01_ts_cfg);
-       /* Set LCD_RESET / XRES to high */
-       s3c2410_gpio_cfgpin(S3C2410_GPC6, S3C2410_GPIO_OUTPUT);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1016-i2c-permit_invalid_addrs.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1016-i2c-permit_invalid_addrs.patch.patch
deleted file mode 100755 (executable)
index fda0473..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-From 839b25d6bcef4b1609aaa53d018cdbc59ea4efa7 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:50 +0100
-Subject: [PATCH] i2c-permit_invalid_addrs.patch
- We need this stupid workaround since our amplifier chip uses a 'reserved' I2C
- address
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- drivers/i2c/i2c-core.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
-index d0175f4..bb0c5e5 100644
---- a/drivers/i2c/i2c-core.c
-+++ b/drivers/i2c/i2c-core.c
-@@ -1026,11 +1026,11 @@ static int i2c_probe_address(struct i2c_adapter *adapter, int addr, int kind,
-       int err;
-       /* Make sure the address is valid */
--      if (addr < 0x03 || addr > 0x77) {
-+      /*if (addr < 0x03 || addr > 0x77) {
-               dev_warn(&adapter->dev, "Invalid probe address 0x%02x\n",
-                        addr);
-               return -EINVAL;
--      }
-+      }*/
-       /* Skip if already in use */
-       if (i2c_check_addr(adapter, addr))
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1017-g_ether-highpower.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1017-g_ether-highpower.patch.patch
deleted file mode 100755 (executable)
index f19607c..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From c03d30af20838833c54f9e9684f38b7048e369d3 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:50 +0100
-Subject: [PATCH] g_ether-highpower.patch
-
----
- drivers/usb/gadget/ether.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
-index 8d61ea6..066a3e7 100644
---- a/drivers/usb/gadget/ether.c
-+++ b/drivers/usb/gadget/ether.c
-@@ -464,7 +464,7 @@ eth_config = {
-       .bConfigurationValue =  DEV_CONFIG_VALUE,
-       .iConfiguration =       STRING_CDC,
-       .bmAttributes =         USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER,
--      .bMaxPower =            50,
-+      .bMaxPower =            250,
- };
- #ifdef        CONFIG_USB_ETH_RNDIS
-@@ -478,7 +478,7 @@ rndis_config = {
-       .bConfigurationValue =  DEV_RNDIS_CONFIG_VALUE,
-       .iConfiguration =       STRING_RNDIS,
-       .bmAttributes =         USB_CONFIG_ATT_ONE | USB_CONFIG_ATT_SELFPOWER,
--      .bMaxPower =            50,
-+      .bMaxPower =            250,
- };
- #endif
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1018-g_ether-vendor_product.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1018-g_ether-vendor_product.patch.patch
deleted file mode 100755 (executable)
index d81075c..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From 5ca57da3402b856986ac1e1ce316937207f6cbad Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:50 +0100
-Subject: [PATCH] g_ether-vendor_product.patch
- Use FIC's own USB Vendor ID rather than NetChip's
-
-Yes, we could solve this by some modprobe.conf parameters, but I'd like to
-rather not rely on this.
----
- drivers/usb/gadget/ether.c |   11 ++++-------
- 1 files changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
-index 066a3e7..a474b0d 100644
---- a/drivers/usb/gadget/ether.c
-+++ b/drivers/usb/gadget/ether.c
-@@ -134,11 +134,8 @@ struct eth_dev {
-  * Instead:  allocate your own, using normal USB-IF procedures.
-  */
--/* Thanks to NetChip Technologies for donating this product ID.
-- * It's for devices with only CDC Ethernet configurations.
-- */
--#define CDC_VENDOR_NUM        0x0525          /* NetChip */
--#define CDC_PRODUCT_NUM       0xa4a1          /* Linux-USB Ethernet Gadget */
-+#define CDC_VENDOR_NUM        0x1457          /* First International Computer */
-+#define CDC_PRODUCT_NUM       0x5117          /* Linux-USB Ethernet Gadget */
- /* For hardware that can't talk CDC, we use the same vendor ID that
-  * ARM Linux has used for ethernet-over-usb, both with sa1100 and
-@@ -159,8 +156,8 @@ struct eth_dev {
-  * used with CDC Ethernet, Linux 2.4 hosts will need updates to choose
-  * the non-RNDIS configuration.
-  */
--#define RNDIS_VENDOR_NUM      0x0525  /* NetChip */
--#define RNDIS_PRODUCT_NUM     0xa4a2  /* Ethernet/RNDIS Gadget */
-+#define RNDIS_VENDOR_NUM      0x1457  /* NetChip */
-+#define RNDIS_PRODUCT_NUM     0x5122  /* Ethernet/RNDIS Gadget */
- /* Some systems will want different product identifers published in the
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1019-s3c_mci.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1019-s3c_mci.patch.patch
deleted file mode 100755 (executable)
index 8f033d5..0000000
+++ /dev/null
@@ -1,1704 +0,0 @@
-From ed9a479d4e02e6415e4242211266845013ecad77 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:50 +0100
-Subject: [PATCH] s3c_mci.patch
- This is a MMC/SD driver for the Samsung S3C24xx SD/MMC controller, originally
- developed years ago by Thomas Kleffel <tk@maintech.de>.
-
-Due to time restraints, he had no time to further maintain the driver and
-follow the mainline Linux changes in the SD/MMC stack.
-
-With his authorization, I have taken over the task of making it compliant to
-the current mainline SD/MMC API and take care of the mainline kernel merge.
-
-After a potential kernel inclusion, we would co-maintain the driver.
-
-Acked-by: Thomas Kleffel <tk@maintech.de>
-Signed-off-by: Harald Welte <laforge@gnumonks.org>
----
- arch/arm/mach-s3c2412/s3c2412.c         |    3 +
- arch/arm/mach-s3c2440/s3c2440.c         |    3 +
- arch/arm/mach-s3c2442/s3c2442.c         |    4 +
- drivers/mmc/host/Kconfig                |   11 +
- drivers/mmc/host/Makefile               |    2 +-
- drivers/mmc/host/s3cmci.c               | 1419 +++++++++++++++++++++++++++++++
- drivers/mmc/host/s3cmci.h               |   69 ++
- include/asm-arm/arch-s3c2410/mci.h      |   13 +
- include/asm-arm/arch-s3c2410/regs-sdi.h |   22 +-
- 9 files changed, 1542 insertions(+), 4 deletions(-)
- create mode 100644 drivers/mmc/host/s3cmci.c
- create mode 100644 drivers/mmc/host/s3cmci.h
- create mode 100644 include/asm-arm/arch-s3c2410/mci.h
-
-diff --git a/arch/arm/mach-s3c2412/s3c2412.c b/arch/arm/mach-s3c2412/s3c2412.c
-index 98a0de9..ee4436d 100644
---- a/arch/arm/mach-s3c2412/s3c2412.c
-+++ b/arch/arm/mach-s3c2412/s3c2412.c
-@@ -216,5 +216,8 @@ int __init s3c2412_init(void)
- {
-       printk("S3C2412: Initialising architecture\n");
-+      /* make sure SD/MMC driver can distinguish 2412 from 2410 */
-+      s3c_device_sdi.name = "s3c2412-sdi";
-+
-       return sysdev_register(&s3c2412_sysdev);
- }
-diff --git a/arch/arm/mach-s3c2440/s3c2440.c b/arch/arm/mach-s3c2440/s3c2440.c
-index 90e1da6..6c18cbd 100644
---- a/arch/arm/mach-s3c2440/s3c2440.c
-+++ b/arch/arm/mach-s3c2440/s3c2440.c
-@@ -46,6 +46,9 @@ int __init s3c2440_init(void)
-       s3c_device_wdt.resource[1].start = IRQ_S3C2440_WDT;
-       s3c_device_wdt.resource[1].end   = IRQ_S3C2440_WDT;
-+      /* make sure SD/MMC driver can distinguish 2440 from 2410 */
-+      s3c_device_sdi.name = "s3c2440-sdi";
-+
-       /* register our system device for everything else */
-       return sysdev_register(&s3c2440_sysdev);
-diff --git a/arch/arm/mach-s3c2442/s3c2442.c b/arch/arm/mach-s3c2442/s3c2442.c
-index fbf8264..fbfb330 100644
---- a/arch/arm/mach-s3c2442/s3c2442.c
-+++ b/arch/arm/mach-s3c2442/s3c2442.c
-@@ -21,6 +21,7 @@
- #include <asm/plat-s3c24xx/s3c2442.h>
- #include <asm/plat-s3c24xx/cpu.h>
-+#include <asm/plat-s3c24xx/devs.h>
- static struct sys_device s3c2442_sysdev = {
-       .cls            = &s3c2442_sysclass,
-@@ -30,5 +31,8 @@ int __init s3c2442_init(void)
- {
-       printk("S3C2442: Initialising architecture\n");
-+      /* make sure SD/MMC driver can distinguish 2440 from 2410 */
-+      s3c_device_sdi.name = "s3c2440-sdi";
-+
-       return sysdev_register(&s3c2442_sysdev);
- }
-diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
-index dead617..fd59856 100644
---- a/drivers/mmc/host/Kconfig
-+++ b/drivers/mmc/host/Kconfig
-@@ -130,3 +130,14 @@ config MMC_SPI
-         If unsure, or if your system has no SPI master driver, say N.
-+config MMC_S3C
-+      tristate "Samsung S3C24xx SD/MMC Card Interface support"
-+      depends on ARCH_S3C2410 && MMC
-+      help
-+        This selects a driver for the MCI interface found in
-+        Samsung's S3C2410, S3C2412, S3C2440, S3C2442 CPUs.
-+        If you have a board based on one of those and a MMC/SD
-+        slot, say Y or M here.
-+
-+        If unsure, say N.
-+
-diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
-index 3877c87..071d256 100644
---- a/drivers/mmc/host/Makefile
-+++ b/drivers/mmc/host/Makefile
-@@ -17,4 +17,4 @@ obj-$(CONFIG_MMC_OMAP)               += omap.o
- obj-$(CONFIG_MMC_AT91)                += at91_mci.o
- obj-$(CONFIG_MMC_TIFM_SD)     += tifm_sd.o
- obj-$(CONFIG_MMC_SPI)         += mmc_spi.o
--
-+obj-$(CONFIG_MMC_S3C)         += s3cmci.o
-diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
-new file mode 100644
-index 0000000..edba055
---- /dev/null
-+++ b/drivers/mmc/host/s3cmci.c
-@@ -0,0 +1,1419 @@
-+/*
-+ *  linux/drivers/mmc/s3cmci.h - Samsung S3C MCI driver
-+ *
-+ *  Copyright (C) 2004-2006 maintech GmbH, Thomas Kleffel <tk@maintech.de>
-+ *  Copyright (C) 2007 Harald Welte <laforge@gnumonks.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.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/clk.h>
-+#include <linux/mmc/host.h>
-+#include <linux/platform_device.h>
-+#include <linux/irq.h>
-+
-+#include <asm/dma.h>
-+#include <asm/dma-mapping.h>
-+
-+#include <asm/io.h>
-+#include <asm/arch/regs-sdi.h>
-+#include <asm/arch/regs-gpio.h>
-+#include <asm/arch/mci.h>
-+#include <asm/arch/dma.h>
-+
-+#include "s3cmci.h"
-+
-+#define DRIVER_NAME "s3c-mci"
-+
-+enum dbg_channels {
-+      dbg_err   = (1 << 0),
-+      dbg_debug = (1 << 1),
-+      dbg_info  = (1 << 2),
-+      dbg_irq   = (1 << 3),
-+      dbg_sg    = (1 << 4),
-+      dbg_dma   = (1 << 5),
-+      dbg_pio   = (1 << 6),
-+      dbg_fail  = (1 << 7),
-+      dbg_conf  = (1 << 8),
-+};
-+
-+static const int dbgmap_err   = dbg_err | dbg_fail;
-+static const int dbgmap_info  = dbg_info | dbg_conf;
-+static const int dbgmap_debug = dbg_debug;
-+
-+#define dbg(host, channels, args...)           \
-+      do {                                     \
-+      if (dbgmap_err & channels)               \
-+              dev_err(&host->pdev->dev, args); \
-+      else if (dbgmap_info & channels)         \
-+              dev_info(&host->pdev->dev, args);\
-+      else if (dbgmap_debug & channels)        \
-+              dev_dbg(&host->pdev->dev, args); \
-+      } while (0)
-+
-+#define RESSIZE(ressource) (((ressource)->end - (ressource)->start)+1)
-+
-+static struct s3c2410_dma_client s3cmci_dma_client = {
-+      .name           = "s3c-mci",
-+};
-+
-+static void finalize_request(struct s3cmci_host *host);
-+static void s3cmci_send_request(struct mmc_host *mmc);
-+static void s3cmci_reset(struct s3cmci_host *host);
-+
-+#ifdef CONFIG_MMC_DEBUG
-+static inline void dbg_dumpregs(struct s3cmci_host *host, char *prefix)
-+{
-+      u32 con, pre, cmdarg, cmdcon, cmdsta, r0, r1, r2, r3, timer, bsize;
-+      u32 datcon, datcnt, datsta, fsta, imask;
-+
-+      con     = readl(host->base + S3C2410_SDICON);
-+      pre     = readl(host->base + S3C2410_SDIPRE);
-+      cmdarg  = readl(host->base + S3C2410_SDICMDARG);
-+      cmdcon  = readl(host->base + S3C2410_SDICMDCON);
-+      cmdsta  = readl(host->base + S3C2410_SDICMDSTAT);
-+      r0      = readl(host->base + S3C2410_SDIRSP0);
-+      r1      = readl(host->base + S3C2410_SDIRSP1);
-+      r2      = readl(host->base + S3C2410_SDIRSP2);
-+      r3      = readl(host->base + S3C2410_SDIRSP3);
-+      timer   = readl(host->base + S3C2410_SDITIMER);
-+      bsize   = readl(host->base + S3C2410_SDIBSIZE);
-+      datcon  = readl(host->base + S3C2410_SDIDCON);
-+      datcnt  = readl(host->base + S3C2410_SDIDCNT);
-+      datsta  = readl(host->base + S3C2410_SDIDSTA);
-+      fsta    = readl(host->base + S3C2410_SDIFSTA);
-+      imask   = readl(host->base + host->sdiimsk);
-+
-+      dbg(host, dbg_debug, "%s  CON:[%08x]  PRE:[%08x]  TMR:[%08x]\n",
-+                              prefix, con, pre, timer);
-+
-+      dbg(host, dbg_debug, "%s CCON:[%08x] CARG:[%08x] CSTA:[%08x]\n",
-+                              prefix, cmdcon, cmdarg, cmdsta);
-+
-+      dbg(host, dbg_debug, "%s DCON:[%08x] FSTA:[%08x]"
-+                             " DSTA:[%08x] DCNT:[%08x]\n",
-+                              prefix, datcon, fsta, datsta, datcnt);
-+
-+      dbg(host, dbg_debug, "%s   R0:[%08x]   R1:[%08x]"
-+                             "   R2:[%08x]   R3:[%08x]\n",
-+                              prefix, r0, r1, r2, r3);
-+}
-+
-+static void prepare_dbgmsg(struct s3cmci_host *host, struct mmc_command *cmd,
-+                                                              int stop)
-+{
-+      snprintf(host->dbgmsg_cmd, 300,
-+              "#%u%s op:CMD%d arg:0x%08x flags:0x08%x retries:%u",
-+              host->ccnt, (stop?" (STOP)":""), cmd->opcode,
-+              cmd->arg, cmd->flags, cmd->retries);
-+
-+      if (cmd->data) {
-+              snprintf(host->dbgmsg_dat, 300,
-+                      "#%u bsize:%u blocks:%u bytes:%u",
-+                      host->dcnt, cmd->data->blksz,
-+                      cmd->data->blocks,
-+                      cmd->data->blocks * cmd->data->blksz);
-+      } else {
-+              host->dbgmsg_dat[0] = '\0';
-+      }
-+}
-+
-+static void dbg_dumpcmd(struct s3cmci_host *host, struct mmc_command *cmd,
-+                                                              int fail)
-+{
-+      unsigned int dbglvl = fail?dbg_fail:dbg_debug;
-+
-+      if (!cmd)
-+              return;
-+
-+      if (cmd->error == 0)
-+              dbg(host, dbglvl, "CMD[OK] %s R0:0x%08x\n",
-+                      host->dbgmsg_cmd, cmd->resp[0]);
-+      else
-+              dbg(host, dbglvl, "CMD[FAIL(%d)] %s Status:%s\n",
-+                      cmd->error, host->dbgmsg_cmd, host->status);
-+
-+      if (!cmd->data)
-+              return;
-+
-+      if (cmd->data->error == 0)
-+              dbg(host, dbglvl, "DAT[OK] %s\n", host->dbgmsg_dat);
-+      else
-+              dbg(host, dbglvl, "DAT[FAIL(%d)] %s DCNT:0x%08x\n",
-+                      cmd->data->error, host->dbgmsg_dat,
-+                      readl(host->base + S3C2410_SDIDCNT));
-+}
-+#endif /* CONFIG_MMC_DEBUG */
-+
-+static inline u32 enable_imask(struct s3cmci_host *host, u32 imask)
-+{
-+      u32 newmask;
-+
-+      newmask = readl(host->base + host->sdiimsk);
-+      newmask |= imask;
-+
-+      writel(newmask, host->base + host->sdiimsk);
-+
-+      return newmask;
-+}
-+
-+static inline u32 disable_imask(struct s3cmci_host *host, u32 imask)
-+{
-+      u32 newmask;
-+
-+      newmask = readl(host->base + host->sdiimsk);
-+      newmask &= ~imask;
-+
-+      writel(newmask, host->base + host->sdiimsk);
-+
-+      return newmask;
-+}
-+
-+static inline void clear_imask(struct s3cmci_host *host)
-+{
-+      writel(0, host->base + host->sdiimsk);
-+}
-+
-+static inline int get_data_buffer(struct s3cmci_host *host,
-+                                u32 *bytes, u8 **pointer)
-+{
-+      struct scatterlist *sg;
-+
-+      if (host->pio_active == XFER_NONE)
-+              return -EINVAL;
-+
-+      if ((!host->mrq) || (!host->mrq->data))
-+              return -EINVAL;
-+
-+      if (host->pio_sgptr >= host->mrq->data->sg_len) {
-+              dbg(host, dbg_debug, "no more buffers (%i/%i)\n",
-+                    host->pio_sgptr, host->mrq->data->sg_len);
-+              return -EBUSY;
-+      }
-+      sg = &host->mrq->data->sg[host->pio_sgptr];
-+
-+      *bytes = sg->length;
-+      *pointer = page_address(sg_page(sg)) + sg->offset;
-+
-+      host->pio_sgptr++;
-+
-+      dbg(host, dbg_sg, "new buffer (%i/%i)\n",
-+            host->pio_sgptr, host->mrq->data->sg_len);
-+
-+      return 0;
-+}
-+
-+#define FIFO_FILL(host) (readl(host->base + S3C2410_SDIFSTA) &        \
-+                              S3C2410_SDIFSTA_COUNTMASK)
-+#define FIFO_FREE(host) (63 - (readl(host->base + S3C2410_SDIFSTA)    \
-+                              & S3C2410_SDIFSTA_COUNTMASK))
-+
-+static inline void do_pio_read(struct s3cmci_host *host)
-+{
-+      int res;
-+      int fifo;
-+      void __iomem *from_ptr;
-+
-+      /* write real prescaler to host, it might be set slow to fix */
-+      writel(host->prescaler, host->base + S3C2410_SDIPRE);
-+
-+      from_ptr = host->base + host->sdidata;
-+
-+      while ((fifo = FIFO_FILL(host))) {
-+              if (!host->pio_bytes) {
-+                      res = get_data_buffer(host, &host->pio_bytes,
-+                                                      &host->pio_ptr);
-+                      if (res) {
-+                              host->pio_active = XFER_NONE;
-+                              host->complete_what = COMPLETION_FINALIZE;
-+
-+                              dbg(host, dbg_pio, "pio_read(): "
-+                                  "complete (no more data).\n");
-+                              return;
-+                      }
-+
-+                      dbg(host, dbg_pio, "pio_read(): new target: "
-+                          "[%i]@[%p]\n", host->pio_bytes, host->pio_ptr);
-+              }
-+
-+              dbg(host, dbg_pio, "pio_read(): fifo:[%02i] "
-+                  "buffer:[%03i] dcnt:[%08X]\n", fifo, host->pio_bytes,
-+                  readl(host->base + S3C2410_SDIDCNT));
-+
-+              if (fifo > host->pio_bytes)
-+                      fifo = host->pio_bytes;
-+
-+              host->pio_bytes -= fifo;
-+              host->pio_count += fifo;
-+
-+              /* we might have an unaligned start of data */
-+              while (((unsigned long)host->pio_ptr & 0x03) && fifo) {
-+                      *(host->pio_ptr++) = readb(host->base + host->sdidata_b);
-+                      fifo--;
-+              }
-+
-+              /* and a major chunk of data in the middle */
-+              for (; fifo >= 4; fifo -=4) {
-+                      *(u32 *) host->pio_ptr = readl(from_ptr);
-+                      host->pio_ptr+= 4;
-+              }
-+
-+              /* as well as some non-modulo-four trailer */
-+              while (fifo) {
-+                      *(host->pio_ptr++) = readb(host->base + host->sdidata_b);
-+                      fifo--;
-+              }
-+      }
-+
-+      if (!host->pio_bytes) {
-+              res = get_data_buffer(host, &host->pio_bytes, &host->pio_ptr);
-+              if (res) {
-+                      dbg(host, dbg_pio, "pio_read(): "
-+                          "complete (no more buffers).\n");
-+                      host->pio_active = XFER_NONE;
-+                      host->complete_what = COMPLETION_FINALIZE;
-+
-+                      return;
-+              }
-+      }
-+
-+      enable_imask(host, S3C2410_SDIIMSK_RXFIFOHALF
-+                                              | S3C2410_SDIIMSK_RXFIFOLAST);
-+}
-+
-+static inline void do_pio_write(struct s3cmci_host *host)
-+{
-+      int res;
-+      int fifo;
-+
-+      void __iomem *to_ptr;
-+
-+      to_ptr = host->base + host->sdidata;
-+
-+      while ((fifo = FIFO_FREE(host))) {
-+              if (!host->pio_bytes) {
-+                      res = get_data_buffer(host, &host->pio_bytes,
-+                                                      &host->pio_ptr);
-+                      if (res) {
-+                              dbg(host, dbg_pio, "pio_write(): "
-+                                      "complete (no more data).\n");
-+                              host->pio_active = XFER_NONE;
-+
-+                              return;
-+                      }
-+
-+                      dbg(host, dbg_pio, "pio_write(): "
-+                              "new source: [%i]@[%p]\n",
-+                              host->pio_bytes, host->pio_ptr);
-+
-+              }
-+
-+              if (fifo > host->pio_bytes)
-+                      fifo = host->pio_bytes;
-+
-+              host->pio_bytes -= fifo;
-+              host->pio_count += fifo;
-+
-+              /* we might have an unaligned start of data */
-+              while (((unsigned long)host->pio_ptr & 0x03) && fifo) {
-+                      writeb(*(host->pio_ptr++), host->base + host->sdidata_b);
-+                      fifo--;
-+              }
-+
-+              /* and a major chunk of data in the middle */
-+              for (; fifo >= 4; fifo -=4) {
-+                      writel(*(u32 *) host->pio_ptr, to_ptr);
-+                      host->pio_ptr += 4;
-+              }
-+
-+              /* as well as some non-modulo-four trailer */
-+              while (fifo) {
-+                      writeb(*(host->pio_ptr++), host->base + host->sdidata_b);
-+                      fifo--;
-+              }
-+      }
-+
-+      enable_imask(host, S3C2410_SDIIMSK_TXFIFOHALF);
-+}
-+
-+static void pio_tasklet(unsigned long data)
-+{
-+      struct s3cmci_host *host = (struct s3cmci_host *) data;
-+
-+      disable_irq(host->irq);
-+
-+      if (host->pio_active == XFER_WRITE)
-+              do_pio_write(host);
-+
-+      if (host->pio_active == XFER_READ)
-+              do_pio_read(host);
-+
-+      if (host->complete_what == COMPLETION_FINALIZE) {
-+              clear_imask(host);
-+              if (host->pio_active != XFER_NONE) {
-+                      dbg(host, dbg_err, "unfinished %s "
-+                              "- pio_count:[%u] pio_bytes:[%u]\n",
-+                              (host->pio_active == XFER_READ)?"read":"write",
-+                              host->pio_count, host->pio_bytes);
-+
-+                      host->mrq->data->error = -EIO;
-+              }
-+
-+              finalize_request(host);
-+      } else
-+              enable_irq(host->irq);
-+}
-+
-+/*
-+ * ISR for SDI Interface IRQ
-+ * Communication between driver and ISR works as follows:
-+ *   host->mrq                        points to current request
-+ *   host->complete_what      tells ISR when the request is considered done
-+ *     COMPLETION_CMDSENT       when the command was sent
-+ *     COMPLETION_RSPFIN          when a response was received
-+ *     COMPLETION_XFERFINISH    when the data transfer is finished
-+ *     COMPLETION_XFERFINISH_RSPFIN both of the above.
-+ *   host->complete_request   is the completion-object the driver waits for
-+ *
-+ * 1) Driver sets up host->mrq and host->complete_what
-+ * 2) Driver prepares the transfer
-+ * 3) Driver enables interrupts
-+ * 4) Driver starts transfer
-+ * 5) Driver waits for host->complete_rquest
-+ * 6) ISR checks for request status (errors and success)
-+ * 6) ISR sets host->mrq->cmd->error and host->mrq->data->error
-+ * 7) ISR completes host->complete_request
-+ * 8) ISR disables interrupts
-+ * 9) Driver wakes up and takes care of the request
-+ *
-+ * Note: "->error"-fields are expected to be set to 0 before the request
-+ *       was issued by mmc.c - therefore they are only set, when an error
-+ *       contition comes up
-+ */
-+
-+static irqreturn_t s3cmci_irq(int irq, void *dev_id)
-+{
-+      struct s3cmci_host *host;
-+      struct mmc_command *cmd;
-+      u32 mci_csta, mci_dsta, mci_fsta, mci_dcnt, mci_imsk;
-+      u32 mci_cclear, mci_dclear;
-+      unsigned long iflags;
-+      int cardint = 0;
-+
-+      host = (struct s3cmci_host *)dev_id;
-+
-+      spin_lock_irqsave(&host->complete_lock, iflags);
-+
-+      mci_csta        = readl(host->base + S3C2410_SDICMDSTAT);
-+      mci_dsta        = readl(host->base + S3C2410_SDIDSTA);
-+      mci_dcnt        = readl(host->base + S3C2410_SDIDCNT);
-+      mci_fsta        = readl(host->base + S3C2410_SDIFSTA);
-+      mci_imsk        = readl(host->base + host->sdiimsk);
-+      mci_cclear      = 0;
-+      mci_dclear      = 0;
-+
-+      if ((host->complete_what == COMPLETION_NONE) ||
-+                      (host->complete_what == COMPLETION_FINALIZE)) {
-+              host->status = "nothing to complete";
-+              clear_imask(host);
-+              goto irq_out;
-+      }
-+
-+      if (!host->mrq) {
-+              host->status = "no active mrq";
-+              clear_imask(host);
-+              goto irq_out;
-+      }
-+
-+      cmd = host->cmd_is_stop?host->mrq->stop:host->mrq->cmd;
-+
-+      if (!cmd) {
-+              host->status = "no active cmd";
-+              clear_imask(host);
-+              goto irq_out;
-+      }
-+
-+      if (!host->dodma) {
-+              if ((host->pio_active == XFER_WRITE) &&
-+                              (mci_fsta & S3C2410_SDIFSTA_TFDET)) {
-+
-+                      disable_imask(host, S3C2410_SDIIMSK_TXFIFOHALF);
-+                      tasklet_schedule(&host->pio_tasklet);
-+                      host->status = "pio tx";
-+              }
-+
-+              if ((host->pio_active == XFER_READ) &&
-+                              (mci_fsta & S3C2410_SDIFSTA_RFDET)) {
-+
-+                      disable_imask(host, S3C2410_SDIIMSK_RXFIFOHALF |
-+                                              S3C2410_SDIIMSK_RXFIFOLAST);
-+
-+                      tasklet_schedule(&host->pio_tasklet);
-+                      host->status = "pio rx";
-+              }
-+      }
-+
-+      if (mci_csta & S3C2410_SDICMDSTAT_CMDTIMEOUT) {
-+              cmd->error = -ETIMEDOUT;
-+              host->status = "error: command timeout";
-+              goto fail_transfer;
-+      }
-+
-+      if (mci_csta & S3C2410_SDICMDSTAT_CMDSENT) {
-+              if (host->complete_what == COMPLETION_CMDSENT) {
-+                      host->status = "ok: command sent";
-+                      goto close_transfer;
-+              }
-+
-+              mci_cclear |= S3C2410_SDICMDSTAT_CMDSENT;
-+      }
-+
-+      if (mci_csta & S3C2410_SDICMDSTAT_CRCFAIL) {
-+              if (cmd->flags & MMC_RSP_CRC) {
-+                      if (host->mrq->cmd->flags & MMC_RSP_136) {
-+                              dbg(host, dbg_irq, "fixup for chip bug: "
-+                                  "ignore CRC fail with long rsp\n");
-+                      } else {
-+                              cmd->error = -EILSEQ;
-+                              host->status = "error: bad command crc";
-+                              goto fail_transfer;
-+                      }
-+              }
-+
-+              mci_cclear |= S3C2410_SDICMDSTAT_CRCFAIL;
-+      }
-+
-+      if (mci_csta & S3C2410_SDICMDSTAT_RSPFIN) {
-+              if (host->complete_what == COMPLETION_RSPFIN) {
-+                      host->status = "ok: command response received";
-+                      goto close_transfer;
-+              }
-+
-+              if (host->complete_what == COMPLETION_XFERFINISH_RSPFIN)
-+                      host->complete_what = COMPLETION_XFERFINISH;
-+
-+              mci_cclear |= S3C2410_SDICMDSTAT_RSPFIN;
-+      }
-+
-+      /* errors handled after this point are only relevant
-+         when a data transfer is in progress */
-+
-+      if (!cmd->data)
-+              goto clear_status_bits;
-+
-+      /* Check for FIFO failure */
-+      if (host->is2440) {
-+              if (mci_fsta & S3C2440_SDIFSTA_FIFOFAIL) {
-+                      host->mrq->data->error = -EIO;
-+                      host->status = "error: 2440 fifo failure";
-+                      goto fail_transfer;
-+              }
-+      } else {
-+              if (mci_dsta & S3C2410_SDIDSTA_FIFOFAIL) {
-+                      cmd->data->error = -EIO;
-+                      host->status = "error:  fifo failure";
-+                      goto fail_transfer;
-+              }
-+      }
-+
-+      if (mci_dsta & S3C2410_SDIDSTA_RXCRCFAIL) {
-+              cmd->data->error = -EILSEQ;
-+              host->status = "error: bad data crc (outgoing)";
-+              goto fail_transfer;
-+      }
-+
-+      if (mci_dsta & S3C2410_SDIDSTA_CRCFAIL) {
-+              cmd->data->error = -EIO;
-+              host->status = "error: bad data crc (incoming)";
-+              goto fail_transfer;
-+      }
-+
-+      if (mci_dsta & S3C2410_SDIDSTA_DATATIMEOUT) {
-+              cmd->data->error = -ETIMEDOUT;
-+              host->status = "error: data timeout";
-+              goto fail_transfer;
-+      }
-+
-+      if (mci_dsta & S3C2410_SDIDSTA_XFERFINISH) {
-+              if (host->complete_what == COMPLETION_XFERFINISH) {
-+                      host->status = "ok: data transfer completed";
-+                      goto close_transfer;
-+              }
-+
-+              if (host->complete_what == COMPLETION_XFERFINISH_RSPFIN)
-+                      host->complete_what = COMPLETION_RSPFIN;
-+
-+              mci_dclear |= S3C2410_SDIDSTA_XFERFINISH;
-+      }
-+
-+      if (mci_dsta & S3C2410_SDIDSTA_SDIOIRQDETECT) {
-+              cardint = 1;
-+              mci_dclear |= S3C2410_SDIDSTA_SDIOIRQDETECT;
-+      }
-+
-+clear_status_bits:
-+      writel(mci_cclear, host->base + S3C2410_SDICMDSTAT);
-+      writel(mci_dclear, host->base + S3C2410_SDIDSTA);
-+
-+      goto irq_out;
-+
-+fail_transfer:
-+      host->pio_active = XFER_NONE;
-+
-+close_transfer:
-+      host->complete_what = COMPLETION_FINALIZE;
-+
-+      clear_imask(host);
-+      tasklet_schedule(&host->pio_tasklet);
-+
-+      goto irq_out;
-+
-+irq_out:
-+      dbg(host, dbg_irq, "csta:0x%08x dsta:0x%08x "
-+                         "fsta:0x%08x dcnt:0x%08x status:%s.\n",
-+                              mci_csta, mci_dsta, mci_fsta,
-+                              mci_dcnt, host->status);
-+
-+      spin_unlock_irqrestore(&host->complete_lock, iflags);
-+
-+      /* We have to delay this as it calls back into the driver */
-+      if (cardint)
-+              mmc_signal_sdio_irq(host->mmc);
-+
-+      return IRQ_HANDLED;
-+
-+}
-+
-+/*
-+ * ISR for the CardDetect Pin
-+*/
-+
-+static irqreturn_t s3cmci_irq_cd(int irq, void *dev_id)
-+{
-+      struct s3cmci_host *host = (struct s3cmci_host *)dev_id;
-+
-+      dbg(host, dbg_irq, "card detect\n");
-+
-+      mmc_detect_change(host->mmc, 500);
-+
-+      return IRQ_HANDLED;
-+}
-+
-+void s3cmci_dma_done_callback(struct s3c2410_dma_chan *dma_ch, void *buf_id,
-+      int size, enum s3c2410_dma_buffresult result)
-+{
-+      unsigned long iflags;
-+      u32 mci_csta, mci_dsta, mci_fsta, mci_dcnt;
-+      struct s3cmci_host *host = (struct s3cmci_host *)buf_id;
-+
-+      mci_csta        = readl(host->base + S3C2410_SDICMDSTAT);
-+      mci_dsta        = readl(host->base + S3C2410_SDIDSTA);
-+      mci_fsta        = readl(host->base + S3C2410_SDIFSTA);
-+      mci_dcnt        = readl(host->base + S3C2410_SDIDCNT);
-+
-+      if ((!host->mrq) || (!host->mrq) || (!host->mrq->data))
-+              return;
-+
-+      if (!host->dmatogo)
-+              return;
-+
-+      spin_lock_irqsave(&host->complete_lock, iflags);
-+
-+      if (result != S3C2410_RES_OK) {
-+              dbg(host, dbg_fail, "DMA FAILED: csta=0x%08x dsta=0x%08x "
-+                      "fsta=0x%08x dcnt:0x%08x result:0x%08x toGo:%u\n",
-+                      mci_csta, mci_dsta, mci_fsta,
-+                      mci_dcnt, result, host->dmatogo);
-+
-+              goto fail_request;
-+      }
-+
-+      host->dmatogo--;
-+      if (host->dmatogo) {
-+              dbg(host, dbg_dma, "DMA DONE  Size:%i DSTA:[%08x] "
-+                      "DCNT:[%08x] toGo:%u\n",
-+                      size, mci_dsta, mci_dcnt, host->dmatogo);
-+
-+              goto out;
-+      }
-+
-+      dbg(host, dbg_dma, "DMA FINISHED Size:%i DSTA:%08x DCNT:%08x\n",
-+              size, mci_dsta, mci_dcnt);
-+
-+      host->complete_what = COMPLETION_FINALIZE;
-+
-+out:
-+      tasklet_schedule(&host->pio_tasklet);
-+      spin_unlock_irqrestore(&host->complete_lock, iflags);
-+      return;
-+
-+
-+fail_request:
-+      host->mrq->data->error = -EIO;
-+      host->complete_what = COMPLETION_FINALIZE;
-+      writel(0, host->base + host->sdiimsk);
-+      goto out;
-+
-+}
-+
-+static void finalize_request(struct s3cmci_host *host)
-+{
-+      struct mmc_request *mrq = host->mrq;
-+      struct mmc_command *cmd = host->cmd_is_stop?mrq->stop:mrq->cmd;
-+      int debug_as_failure = 0;
-+
-+      if (host->complete_what != COMPLETION_FINALIZE)
-+              return;
-+
-+      if (!mrq)
-+              return;
-+
-+      if (cmd->data && (cmd->error == 0) &&
-+                (cmd->data->error == 0)) {
-+
-+              if (host->dodma && (!host->dma_complete)) {
-+                      dbg(host, dbg_dma, "DMA Missing!\n");
-+                      return;
-+              }
-+      }
-+
-+      /* Read response */
-+      cmd->resp[0] = readl(host->base + S3C2410_SDIRSP0);
-+      cmd->resp[1] = readl(host->base + S3C2410_SDIRSP1);
-+      cmd->resp[2] = readl(host->base + S3C2410_SDIRSP2);
-+      cmd->resp[3] = readl(host->base + S3C2410_SDIRSP3);
-+
-+      /* reset clock speed, as it could still be set low for */
-+      writel(host->prescaler, host->base + S3C2410_SDIPRE);
-+
-+      if (cmd->error)
-+              debug_as_failure = 1;
-+
-+      if (cmd->data && cmd->data->error)
-+              debug_as_failure = 1;
-+
-+#ifdef CONFIG_MMC_DEBUG
-+      dbg_dumpcmd(host, cmd, debug_as_failure);
-+#endif
-+      /* Cleanup controller */
-+      writel(0, host->base + S3C2410_SDICMDARG);
-+      writel(S3C2410_SDIDCON_STOP, host->base + S3C2410_SDIDCON);
-+      writel(0, host->base + S3C2410_SDICMDCON);
-+      writel(0, host->base + host->sdiimsk);
-+
-+      if (cmd->data && cmd->error)
-+              cmd->data->error = cmd->error;
-+
-+      if (cmd->data && cmd->data->stop && (!host->cmd_is_stop)) {
-+              host->cmd_is_stop = 1;
-+              s3cmci_send_request(host->mmc);
-+              return;
-+      }
-+
-+      /* If we have no data transfer we are finished here */
-+      if (!mrq->data)
-+              goto request_done;
-+
-+      /* Calulate the amout of bytes transfer, but only if there was
-+       * no error */
-+      if (mrq->data->error == 0)
-+              mrq->data->bytes_xfered =
-+                      (mrq->data->blocks * mrq->data->blksz);
-+      else
-+              mrq->data->bytes_xfered = 0;
-+
-+      /* If we had an error while transfering data we flush the
-+       * DMA channel and the fifo to clear out any garbage */
-+      if (mrq->data->error) {
-+              if (host->dodma)
-+                      s3c2410_dma_ctrl(host->dma, S3C2410_DMAOP_FLUSH);
-+
-+              if (host->is2440) {
-+                      /* Clear failure register and reset fifo */
-+                      writel(S3C2440_SDIFSTA_FIFORESET |
-+                             S3C2440_SDIFSTA_FIFOFAIL,
-+                             host->base + S3C2410_SDIFSTA);
-+              } else {
-+                      u32 mci_con;
-+
-+                      /* reset fifo */
-+                      mci_con = readl(host->base + S3C2410_SDICON);
-+                      mci_con |= S3C2410_SDICON_FIFORESET;
-+
-+                      writel(mci_con, host->base + S3C2410_SDICON);
-+              }
-+      }
-+
-+request_done:
-+      host->complete_what = COMPLETION_NONE;
-+      host->mrq = NULL;
-+      mmc_request_done(host->mmc, mrq);
-+}
-+
-+
-+void s3cmci_dma_setup(struct s3cmci_host *host, enum s3c2410_dmasrc source)
-+{
-+      static int setup_ok;
-+      static enum s3c2410_dmasrc last_source = -1;
-+
-+      if (last_source == source)
-+              return;
-+
-+      last_source = source;
-+
-+      s3c2410_dma_devconfig(host->dma, source, 3,
-+              host->mem->start + host->sdidata);
-+
-+      if (!setup_ok) {
-+              s3c2410_dma_config(host->dma, 4,
-+                      (S3C2410_DCON_HWTRIG | S3C2410_DCON_CH0_SDI));
-+              s3c2410_dma_set_buffdone_fn(host->dma,
-+                                          s3cmci_dma_done_callback);
-+              s3c2410_dma_setflags(host->dma, S3C2410_DMAF_AUTOSTART);
-+              setup_ok = 1;
-+      }
-+}
-+
-+static void s3cmci_send_command(struct s3cmci_host *host,
-+                                      struct mmc_command *cmd)
-+{
-+      u32 ccon, imsk;
-+
-+      imsk  = S3C2410_SDIIMSK_CRCSTATUS | S3C2410_SDIIMSK_CMDTIMEOUT |
-+              S3C2410_SDIIMSK_RESPONSEND | S3C2410_SDIIMSK_CMDSENT |
-+              S3C2410_SDIIMSK_RESPONSECRC;
-+
-+      enable_imask(host, imsk);
-+
-+      if (cmd->data)
-+              host->complete_what = COMPLETION_XFERFINISH_RSPFIN;
-+      else if (cmd->flags & MMC_RSP_PRESENT)
-+              host->complete_what = COMPLETION_RSPFIN;
-+      else
-+              host->complete_what = COMPLETION_CMDSENT;
-+
-+      writel(cmd->arg, host->base + S3C2410_SDICMDARG);
-+
-+      ccon = cmd->opcode & S3C2410_SDICMDCON_INDEX;
-+      ccon |= S3C2410_SDICMDCON_SENDERHOST | S3C2410_SDICMDCON_CMDSTART;
-+
-+      if (cmd->flags & MMC_RSP_PRESENT)
-+              ccon |= S3C2410_SDICMDCON_WAITRSP;
-+
-+      if (cmd->flags & MMC_RSP_136)
-+              ccon |= S3C2410_SDICMDCON_LONGRSP;
-+
-+      writel(ccon, host->base + S3C2410_SDICMDCON);
-+}
-+
-+static int s3cmci_setup_data(struct s3cmci_host *host, struct mmc_data *data)
-+{
-+      u32 dcon, imsk, stoptries = 3;
-+
-+      /* write DCON register */
-+
-+      if (!data) {
-+              writel(0, host->base + S3C2410_SDIDCON);
-+              return 0;
-+      }
-+
-+      while (readl(host->base + S3C2410_SDIDSTA) &
-+              (S3C2410_SDIDSTA_TXDATAON | S3C2410_SDIDSTA_RXDATAON)) {
-+
-+              dbg(host, dbg_err,
-+                  "mci_setup_data() transfer stillin progress.\n");
-+
-+              writel(S3C2410_SDIDCON_STOP, host->base + S3C2410_SDIDCON);
-+              s3cmci_reset(host);
-+
-+              if (0 == (stoptries--)) {
-+#ifdef CONFIG_MMC_DEBUG
-+                      dbg_dumpregs(host, "DRF");
-+#endif
-+
-+                      return -EINVAL;
-+              }
-+      }
-+
-+      dcon  = data->blocks & S3C2410_SDIDCON_BLKNUM_MASK;
-+
-+      if (host->dodma)
-+              dcon |= S3C2410_SDIDCON_DMAEN;
-+
-+      if (host->bus_width == MMC_BUS_WIDTH_4)
-+              dcon |= S3C2410_SDIDCON_WIDEBUS;
-+
-+      if (!(data->flags & MMC_DATA_STREAM))
-+              dcon |= S3C2410_SDIDCON_BLOCKMODE;
-+
-+      if (data->flags & MMC_DATA_WRITE) {
-+              dcon |= S3C2410_SDIDCON_TXAFTERRESP;
-+              dcon |= S3C2410_SDIDCON_XFER_TXSTART;
-+      }
-+
-+      if (data->flags & MMC_DATA_READ) {
-+              dcon |= S3C2410_SDIDCON_RXAFTERCMD;
-+              dcon |= S3C2410_SDIDCON_XFER_RXSTART;
-+      }
-+
-+      if (host->is2440) {
-+              dcon |= S3C2440_SDIDCON_DS_WORD;
-+              dcon |= S3C2440_SDIDCON_DATSTART;
-+      }
-+
-+      writel(dcon, host->base + S3C2410_SDIDCON);
-+
-+      /* write BSIZE register */
-+
-+      writel(data->blksz, host->base + S3C2410_SDIBSIZE);
-+
-+      /* add to IMASK register */
-+      imsk =  S3C2410_SDIIMSK_FIFOFAIL | S3C2410_SDIIMSK_DATACRC |
-+              S3C2410_SDIIMSK_DATATIMEOUT | S3C2410_SDIIMSK_DATAFINISH;
-+
-+      enable_imask(host, imsk);
-+
-+      /* write TIMER register */
-+
-+      if (host->is2440) {
-+              writel(0x007FFFFF, host->base + S3C2410_SDITIMER);
-+      } else {
-+              writel(0x0000FFFF, host->base + S3C2410_SDITIMER);
-+
-+              /* FIX: set slow clock to prevent timeouts on read */
-+              if (data->flags & MMC_DATA_READ)
-+                      writel(0xFF, host->base + S3C2410_SDIPRE);
-+      }
-+
-+      return 0;
-+}
-+
-+static int s3cmci_prepare_pio(struct s3cmci_host *host, struct mmc_data *data)
-+{
-+      int rw = (data->flags & MMC_DATA_WRITE)?1:0;
-+
-+      if (rw != ((data->flags & MMC_DATA_READ)?0:1))
-+              return -EINVAL;
-+
-+      host->pio_sgptr = 0;
-+      host->pio_bytes = 0;
-+      host->pio_count = 0;
-+      host->pio_active = rw?XFER_WRITE:XFER_READ;
-+
-+      if (rw) {
-+              do_pio_write(host);
-+              enable_imask(host, S3C2410_SDIIMSK_TXFIFOHALF);
-+      } else {
-+              enable_imask(host, S3C2410_SDIIMSK_RXFIFOHALF
-+                      | S3C2410_SDIIMSK_RXFIFOLAST);
-+      }
-+
-+      return 0;
-+}
-+
-+static int s3cmci_prepare_dma(struct s3cmci_host *host, struct mmc_data *data)
-+{
-+      int dma_len, i;
-+
-+      int rw = (data->flags & MMC_DATA_WRITE)?1:0;
-+
-+      if (rw != ((data->flags & MMC_DATA_READ)?0:1))
-+              return -EINVAL;
-+
-+      s3cmci_dma_setup(host, rw?S3C2410_DMASRC_MEM:S3C2410_DMASRC_HW);
-+      s3c2410_dma_ctrl(host->dma, S3C2410_DMAOP_FLUSH);
-+
-+      dma_len = dma_map_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
-+                              (rw)?DMA_TO_DEVICE:DMA_FROM_DEVICE);
-+
-+
-+      if (dma_len == 0)
-+              return -ENOMEM;
-+
-+      host->dma_complete = 0;
-+      host->dmatogo = dma_len;
-+
-+      for (i = 0; i < dma_len; i++) {
-+              int res;
-+
-+              dbg(host, dbg_dma, "enqueue %i:%u@%u\n", i,
-+                      sg_dma_address(&data->sg[i]),
-+                      sg_dma_len(&data->sg[i]));
-+
-+              res = s3c2410_dma_enqueue(host->dma, (void *) host,
-+                              sg_dma_address(&data->sg[i]),
-+                              sg_dma_len(&data->sg[i]));
-+
-+              if (res) {
-+                      s3c2410_dma_ctrl(host->dma, S3C2410_DMAOP_FLUSH);
-+                      return -EBUSY;
-+              }
-+      }
-+
-+      s3c2410_dma_ctrl(host->dma, S3C2410_DMAOP_START);
-+
-+      return 0;
-+}
-+
-+static void s3cmci_send_request(struct mmc_host *mmc)
-+{
-+      struct s3cmci_host *host = mmc_priv(mmc);
-+      struct mmc_request *mrq = host->mrq;
-+      struct mmc_command *cmd = host->cmd_is_stop?mrq->stop:mrq->cmd;
-+
-+      host->ccnt++;
-+#ifdef CONFIG_MMC_DEBUG
-+      prepare_dbgmsg(host, cmd, host->cmd_is_stop);
-+#endif
-+      /* clear command, data and fifo status registers;
-+       * Fifo clear only necessary on 2440, but doesn't hurt on 2410 */
-+      writel(0xFFFFFFFF, host->base + S3C2410_SDICMDSTAT);
-+      writel(0xFFFFFFFF, host->base + S3C2410_SDIDSTA);
-+      writel(0xFFFFFFFF, host->base + S3C2410_SDIFSTA);
-+
-+      if (cmd->data) {
-+              int res;
-+              res = s3cmci_setup_data(host, cmd->data);
-+
-+              host->dcnt++;
-+
-+              if (res) {
-+                      cmd->error = -EIO;
-+                      cmd->data->error = -EIO;
-+
-+                      mmc_request_done(mmc, mrq);
-+                      return;
-+              }
-+
-+
-+              if (host->dodma)
-+                      res = s3cmci_prepare_dma(host, cmd->data);
-+              else
-+                      res = s3cmci_prepare_pio(host, cmd->data);
-+
-+              if (res) {
-+                      cmd->error = -EIO;
-+                      cmd->data->error = -EIO;
-+
-+                      mmc_request_done(mmc, mrq);
-+                      return;
-+              }
-+
-+      }
-+
-+      s3cmci_send_command(host, cmd);
-+      enable_irq(host->irq);
-+}
-+
-+static void s3cmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
-+{
-+      struct s3cmci_host *host = mmc_priv(mmc);
-+
-+      host->cmd_is_stop = 0;
-+      host->mrq = mrq;
-+
-+      s3cmci_send_request(mmc);
-+}
-+
-+static void s3cmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-+{
-+      struct s3cmci_host *host = mmc_priv(mmc);
-+      u32 mci_psc, mci_con;
-+
-+      /* Set power */
-+      mci_con = readl(host->base + S3C2410_SDICON);
-+      switch (ios->power_mode) {
-+      case MMC_POWER_ON:
-+      case MMC_POWER_UP:
-+              s3c2410_gpio_cfgpin(S3C2410_GPE5, S3C2410_GPE5_SDCLK);
-+              s3c2410_gpio_cfgpin(S3C2410_GPE6, S3C2410_GPE6_SDCMD);
-+              s3c2410_gpio_cfgpin(S3C2410_GPE7, S3C2410_GPE7_SDDAT0);
-+              s3c2410_gpio_cfgpin(S3C2410_GPE8, S3C2410_GPE8_SDDAT1);
-+              s3c2410_gpio_cfgpin(S3C2410_GPE9, S3C2410_GPE9_SDDAT2);
-+              s3c2410_gpio_cfgpin(S3C2410_GPE10, S3C2410_GPE10_SDDAT3);
-+
-+              if (host->pdata->set_power)
-+                      host->pdata->set_power(ios->power_mode, ios->vdd);
-+
-+              if (!host->is2440)
-+                      mci_con |= S3C2410_SDICON_FIFORESET;
-+
-+              break;
-+
-+      case MMC_POWER_OFF:
-+      default:
-+              s3c2410_gpio_setpin(S3C2410_GPE5, 0);
-+              s3c2410_gpio_cfgpin(S3C2410_GPE5, S3C2410_GPE5_OUTP);
-+
-+              if (host->pdata->set_power)
-+                      host->pdata->set_power(ios->power_mode, ios->vdd);
-+
-+              if (host->is2440)
-+                      mci_con |= S3C2440_SDICON_SDRESET;
-+
-+              break;
-+      }
-+
-+      /* Set clock */
-+      for (mci_psc = 0; mci_psc < 255; mci_psc++) {
-+              host->real_rate = host->clk_rate / (host->clk_div*(mci_psc+1));
-+
-+              if (host->real_rate <= ios->clock)
-+                      break;
-+      }
-+
-+      if (mci_psc > 255)
-+              mci_psc = 255;
-+      host->prescaler = mci_psc;
-+
-+      writel(host->prescaler, host->base + S3C2410_SDIPRE);
-+
-+      /* If requested clock is 0, real_rate will be 0, too */
-+      if (ios->clock == 0)
-+              host->real_rate = 0;
-+
-+      /* Set CLOCK_ENABLE */
-+      if (ios->clock)
-+              mci_con |= S3C2410_SDICON_CLOCKTYPE;
-+      else
-+              mci_con &= ~S3C2410_SDICON_CLOCKTYPE;
-+
-+      writel(mci_con, host->base + S3C2410_SDICON);
-+
-+      if ((ios->power_mode == MMC_POWER_ON)
-+              || (ios->power_mode == MMC_POWER_UP)) {
-+
-+              dbg(host, dbg_conf, "running at %lukHz (requested: %ukHz).\n",
-+                  host->real_rate/1000, ios->clock/1000);
-+      } else {
-+              dbg(host, dbg_conf, "powered down.\n");
-+      }
-+
-+      host->bus_width = ios->bus_width;
-+
-+}
-+
-+static void s3cmci_reset(struct s3cmci_host *host)
-+{
-+      u32 con = readl(host->base + S3C2410_SDICON);
-+
-+      con |= S3C2440_SDICON_SDRESET;
-+
-+      writel(con, host->base + S3C2410_SDICON);
-+}
-+
-+static int s3cmci_get_ro(struct mmc_host *mmc)
-+{
-+      struct s3cmci_host *host = mmc_priv(mmc);
-+
-+      if (host->pdata->gpio_wprotect == 0)
-+              return 0;
-+
-+      return s3c2410_gpio_getpin(host->pdata->gpio_wprotect);
-+}
-+
-+static void s3cmci_enable_sdio_irq(struct mmc_host *mmc, int enable)
-+{
-+      struct s3cmci_host *host = mmc_priv(mmc);
-+
-+      if (enable)
-+              enable_imask(host, S3C2410_SDIIMSK_SDIOIRQ);
-+      else
-+              disable_imask(host, S3C2410_SDIIMSK_SDIOIRQ);
-+}
-+
-+static struct mmc_host_ops s3cmci_ops = {
-+      .request        = s3cmci_request,
-+      .set_ios        = s3cmci_set_ios,
-+      .get_ro         = s3cmci_get_ro,
-+      .enable_sdio_irq = s3cmci_enable_sdio_irq,
-+};
-+
-+static struct s3c24xx_mci_pdata s3cmci_def_pdata = {
-+      .do_dma         = 0,
-+      .gpio_detect    = 0,
-+      .set_power      = NULL,
-+      .ocr_avail      = MMC_VDD_32_33,
-+};
-+
-+static int s3cmci_probe(struct platform_device *pdev, int is2440)
-+{
-+      struct mmc_host         *mmc;
-+      struct s3cmci_host      *host;
-+
-+      int ret;
-+
-+      mmc = mmc_alloc_host(sizeof(struct s3cmci_host), &pdev->dev);
-+      if (!mmc) {
-+              ret = -ENOMEM;
-+              goto probe_out;
-+      }
-+
-+      host = mmc_priv(mmc);
-+      host->mmc       = mmc;
-+      host->pdev      = pdev;
-+
-+      host->pdata = pdev->dev.platform_data;
-+      if (!host->pdata) {
-+              pdev->dev.platform_data = &s3cmci_def_pdata;
-+              host->pdata = &s3cmci_def_pdata;
-+      }
-+
-+      spin_lock_init(&host->complete_lock);
-+      tasklet_init(&host->pio_tasklet, pio_tasklet, (unsigned long) host);
-+      if (is2440) {
-+              host->is2440    = 1;
-+              host->sdiimsk   = S3C2440_SDIIMSK;
-+              host->sdidata   = S3C2440_SDIDATA;
-+              host->sdidata_b = S3C2440_SDIDATA_BYTE;
-+              host->clk_div   = 1;
-+      } else {
-+              host->is2440    = 0;
-+              host->sdiimsk   = S3C2410_SDIIMSK;
-+              host->sdidata   = S3C2410_SDIDATA;
-+              host->sdidata_b = S3C2410_SDIDATA_BYTE;
-+              host->clk_div   = 2;
-+      }
-+      host->dodma             = host->pdata->do_dma;
-+      host->complete_what     = COMPLETION_NONE;
-+      host->pio_active        = XFER_NONE;
-+
-+      host->dma               = DMACH_SDI;
-+      host->irq_cd = s3c2410_gpio_getirq(host->pdata->gpio_detect);
-+      s3c2410_gpio_cfgpin(host->pdata->gpio_detect, S3C2410_GPIO_IRQ);
-+
-+      host->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+      if (!host->mem) {
-+              dev_err(&pdev->dev,
-+                      "failed to get io memory region resouce.\n");
-+
-+              ret = -ENOENT;
-+              goto probe_free_host;
-+      }
-+
-+      host->mem = request_mem_region(host->mem->start,
-+              RESSIZE(host->mem), pdev->name);
-+
-+      if (!host->mem) {
-+              dev_err(&pdev->dev, "failed to request io memory region.\n");
-+              ret = -ENOENT;
-+              goto probe_free_host;
-+      }
-+
-+      host->base = ioremap(host->mem->start, RESSIZE(host->mem));
-+      if (host->base == 0) {
-+              dev_err(&pdev->dev, "failed to ioremap() io memory region.\n");
-+              ret = -EINVAL;
-+              goto probe_free_mem_region;
-+      }
-+
-+      host->irq = platform_get_irq(pdev, 0);
-+      if (host->irq == 0) {
-+              dev_err(&pdev->dev, "failed to get interrupt resouce.\n");
-+              ret = -EINVAL;
-+              goto probe_iounmap;
-+      }
-+
-+      if (request_irq(host->irq, s3cmci_irq, 0, DRIVER_NAME, host)) {
-+              dev_err(&pdev->dev, "failed to request mci interrupt.\n");
-+              ret = -ENOENT;
-+              goto probe_iounmap;
-+      }
-+
-+      disable_irq(host->irq);
-+
-+      s3c2410_gpio_cfgpin(host->pdata->gpio_detect, S3C2410_GPIO_IRQ);
-+      set_irq_type(host->irq_cd, IRQT_BOTHEDGE);
-+
-+      if (request_irq(host->irq_cd, s3cmci_irq_cd, 0, DRIVER_NAME, host)) {
-+              dev_err(&pdev->dev,
-+                      "failed to request card detect interrupt.\n");
-+
-+              ret = -ENOENT;
-+              goto probe_free_irq;
-+      }
-+
-+      if (host->pdata->gpio_wprotect)
-+              s3c2410_gpio_cfgpin(host->pdata->gpio_wprotect,
-+                                  S3C2410_GPIO_INPUT);
-+
-+      if (s3c2410_dma_request(host->dma, &s3cmci_dma_client, NULL)) {
-+              dev_err(&pdev->dev, "unable to get DMA channel.\n");
-+              ret = -EBUSY;
-+              goto probe_free_irq_cd;
-+      }
-+
-+      host->clk = clk_get(&pdev->dev, "sdi");
-+      if (IS_ERR(host->clk)) {
-+              dev_err(&pdev->dev, "failed to find clock source.\n");
-+              ret = PTR_ERR(host->clk);
-+              host->clk = NULL;
-+              goto probe_free_host;
-+      }
-+
-+      ret = clk_enable(host->clk);
-+      if (ret) {
-+              dev_err(&pdev->dev, "failed to enable clock source.\n");
-+              goto clk_free;
-+      }
-+
-+      host->clk_rate = clk_get_rate(host->clk);
-+
-+      mmc->ops        = &s3cmci_ops;
-+      mmc->ocr_avail  = host->pdata->ocr_avail;
-+      mmc->caps       = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ;
-+      mmc->f_min      = host->clk_rate / (host->clk_div * 256);
-+      mmc->f_max      = host->clk_rate / host->clk_div;
-+
-+      mmc->max_blk_count      = 4095;
-+      mmc->max_blk_size       = 4095;
-+      mmc->max_req_size       = 4095 * 512;
-+      mmc->max_seg_size       = mmc->max_req_size;
-+
-+      mmc->max_phys_segs      = 128;
-+      mmc->max_hw_segs        = 128;
-+
-+      dbg(host, dbg_debug, "probe: mode:%s mapped mci_base:%p irq:%u "
-+          "irq_cd:%u dma:%u.\n", (host->is2440?"2440":""),
-+          host->base, host->irq, host->irq_cd, host->dma);
-+
-+      ret = mmc_add_host(mmc);
-+      if (ret) {
-+              dev_err(&pdev->dev, "failed to add mmc host.\n");
-+              goto free_dmabuf;
-+      }
-+
-+      platform_set_drvdata(pdev, mmc);
-+
-+      dev_info(&pdev->dev, "initialisation done.\n");
-+      return 0;
-+
-+ free_dmabuf:
-+      clk_disable(host->clk);
-+
-+ clk_free:
-+      clk_put(host->clk);
-+
-+ probe_free_irq_cd:
-+      free_irq(host->irq_cd, host);
-+
-+ probe_free_irq:
-+      free_irq(host->irq, host);
-+
-+ probe_iounmap:
-+      iounmap(host->base);
-+
-+ probe_free_mem_region:
-+      release_mem_region(host->mem->start, RESSIZE(host->mem));
-+
-+ probe_free_host:
-+      mmc_free_host(mmc);
-+ probe_out:
-+      return ret;
-+}
-+
-+static int s3cmci_remove(struct platform_device *pdev)
-+{
-+      struct mmc_host         *mmc  = platform_get_drvdata(pdev);
-+      struct s3cmci_host      *host = mmc_priv(mmc);
-+
-+      mmc_remove_host(mmc);
-+      clk_disable(host->clk);
-+      clk_put(host->clk);
-+      s3c2410_dma_free(host->dma, &s3cmci_dma_client);
-+      free_irq(host->irq_cd, host);
-+      free_irq(host->irq, host);
-+      iounmap(host->base);
-+      release_mem_region(host->mem->start, RESSIZE(host->mem));
-+      mmc_free_host(mmc);
-+
-+      return 0;
-+}
-+
-+static int s3cmci_probe_2410(struct platform_device *dev)
-+{
-+      return s3cmci_probe(dev, 0);
-+}
-+
-+static int s3cmci_probe_2412(struct platform_device *dev)
-+{
-+      return s3cmci_probe(dev, 1);
-+}
-+
-+static int s3cmci_probe_2440(struct platform_device *dev)
-+{
-+      return s3cmci_probe(dev, 1);
-+}
-+
-+#ifdef CONFIG_PM
-+
-+static int s3cmci_suspend(struct platform_device *dev, pm_message_t state)
-+{
-+      struct mmc_host *mmc = platform_get_drvdata(dev);
-+
-+      return  mmc_suspend_host(mmc, state);
-+}
-+
-+static int s3cmci_resume(struct platform_device *dev)
-+{
-+      struct mmc_host *mmc = platform_get_drvdata(dev);
-+
-+      return mmc_resume_host(mmc);
-+}
-+
-+#else /* CONFIG_PM */
-+#define s3cmci_suspend NULL
-+#define s3cmci_resume NULL
-+#endif /* CONFIG_PM */
-+
-+
-+static struct platform_driver s3cmci_driver_2410 = {
-+      .driver.name    = "s3c2410-sdi",
-+      .probe          = s3cmci_probe_2410,
-+      .remove         = s3cmci_remove,
-+      .suspend        = s3cmci_suspend,
-+      .resume         = s3cmci_resume,
-+};
-+
-+static struct platform_driver s3cmci_driver_2412 = {
-+      .driver.name    = "s3c2412-sdi",
-+      .probe          = s3cmci_probe_2412,
-+      .remove         = s3cmci_remove,
-+      .suspend        = s3cmci_suspend,
-+      .resume         = s3cmci_resume,
-+};
-+
-+static struct platform_driver s3cmci_driver_2440 = {
-+      .driver.name    = "s3c2440-sdi",
-+      .probe          = s3cmci_probe_2440,
-+      .remove         = s3cmci_remove,
-+      .suspend        = s3cmci_suspend,
-+      .resume         = s3cmci_resume,
-+};
-+
-+
-+static int __init s3cmci_init(void)
-+{
-+      platform_driver_register(&s3cmci_driver_2410);
-+      platform_driver_register(&s3cmci_driver_2412);
-+      platform_driver_register(&s3cmci_driver_2440);
-+      return 0;
-+}
-+
-+static void __exit s3cmci_exit(void)
-+{
-+      platform_driver_unregister(&s3cmci_driver_2410);
-+      platform_driver_unregister(&s3cmci_driver_2412);
-+      platform_driver_unregister(&s3cmci_driver_2440);
-+}
-+
-+module_init(s3cmci_init);
-+module_exit(s3cmci_exit);
-+
-+MODULE_DESCRIPTION("Samsung S3C MMC/SD Card Interface driver");
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Thomas Kleffel <tk@maintech.de>");
-diff --git a/drivers/mmc/host/s3cmci.h b/drivers/mmc/host/s3cmci.h
-new file mode 100644
-index 0000000..9644b45
---- /dev/null
-+++ b/drivers/mmc/host/s3cmci.h
-@@ -0,0 +1,69 @@
-+/*
-+ *  linux/drivers/mmc/s3cmci.h - Samsung S3C MCI driver
-+ *
-+ *  Copyright (C) 2004-2006 Thomas Kleffel, 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 version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+enum s3cmci_waitfor {
-+      COMPLETION_NONE,
-+      COMPLETION_FINALIZE,
-+      COMPLETION_CMDSENT,
-+      COMPLETION_RSPFIN,
-+      COMPLETION_XFERFINISH,
-+      COMPLETION_XFERFINISH_RSPFIN,
-+};
-+
-+struct s3cmci_host {
-+      struct platform_device  *pdev;
-+      struct s3c24xx_mci_pdata *pdata;
-+      struct mmc_host         *mmc;
-+      struct resource         *mem;
-+      struct clk              *clk;
-+      void __iomem            *base;
-+      int                     irq;
-+      int                     irq_cd;
-+      int                     dma;
-+
-+      unsigned long           clk_rate;
-+      unsigned long           clk_div;
-+      unsigned long           real_rate;
-+      u8                      prescaler;
-+
-+      int                     is2440;
-+      unsigned                sdiimsk;
-+      unsigned                sdidata;
-+      unsigned                sdidata_b;
-+      int                     dodma;
-+
-+      int                     dmatogo;
-+
-+      struct mmc_request      *mrq;
-+      int                     cmd_is_stop;
-+
-+      spinlock_t              complete_lock;
-+      enum s3cmci_waitfor     complete_what;
-+
-+      int                     dma_complete;
-+
-+      u32                     pio_sgptr;
-+      u32                     pio_bytes;
-+      u32                     pio_count;
-+      u8                      *pio_ptr;
-+#define XFER_NONE 0
-+#define XFER_READ 1
-+#define XFER_WRITE 2
-+      u32                     pio_active;
-+
-+      int                     bus_width;
-+
-+      char                    dbgmsg_cmd[301];
-+      char                    dbgmsg_dat[301];
-+      char                    *status;
-+
-+      unsigned int            ccnt, dcnt;
-+      struct tasklet_struct   pio_tasklet;
-+};
-diff --git a/include/asm-arm/arch-s3c2410/mci.h b/include/asm-arm/arch-s3c2410/mci.h
-new file mode 100644
-index 0000000..24e6cd1
---- /dev/null
-+++ b/include/asm-arm/arch-s3c2410/mci.h
-@@ -0,0 +1,13 @@
-+#ifndef _ARCH_MCI_H
-+#define _ARCH_MCI_H
-+
-+struct s3c24xx_mci_pdata {
-+      unsigned int    gpio_detect;
-+      unsigned int    gpio_wprotect;
-+      unsigned long   ocr_avail;
-+      unsigned int    do_dma;
-+      void            (*set_power)(unsigned char power_mode,
-+                                   unsigned short vdd);
-+};
-+
-+#endif /* _ARCH_NCI_H */
-diff --git a/include/asm-arm/arch-s3c2410/regs-sdi.h b/include/asm-arm/arch-s3c2410/regs-sdi.h
-index bb9d30b..4bb1ec5 100644
---- a/include/asm-arm/arch-s3c2410/regs-sdi.h
-+++ b/include/asm-arm/arch-s3c2410/regs-sdi.h
-@@ -28,9 +28,17 @@
- #define S3C2410_SDIDCNT               (0x30)
- #define S3C2410_SDIDSTA               (0x34)
- #define S3C2410_SDIFSTA               (0x38)
-+
- #define S3C2410_SDIDATA               (0x3C)
-+#define S3C2410_SDIDATA_BYTE          (0x3C)
- #define S3C2410_SDIIMSK               (0x40)
-+#define S3C2440_SDIDATA               (0x40)
-+#define S3C2440_SDIDATA_BYTE          (0x48)
-+#define S3C2440_SDIIMSK               (0x3C)
-+
-+#define S3C2440_SDICON_SDRESET        (1<<8)
-+#define S3C2440_SDICON_MMCCLOCK       (1<<5)
- #define S3C2410_SDICON_BYTEORDER      (1<<4)
- #define S3C2410_SDICON_SDIOIRQ        (1<<3)
- #define S3C2410_SDICON_RWAITEN        (1<<2)
-@@ -42,7 +50,8 @@
- #define S3C2410_SDICMDCON_LONGRSP     (1<<10)
- #define S3C2410_SDICMDCON_WAITRSP     (1<<9)
- #define S3C2410_SDICMDCON_CMDSTART    (1<<8)
--#define S3C2410_SDICMDCON_INDEX       (0xff)
-+#define S3C2410_SDICMDCON_SENDERHOST  (1<<6)
-+#define S3C2410_SDICMDCON_INDEX       (0x3f)
- #define S3C2410_SDICMDSTAT_CRCFAIL    (1<<12)
- #define S3C2410_SDICMDSTAT_CMDSENT    (1<<11)
-@@ -51,6 +60,9 @@
- #define S3C2410_SDICMDSTAT_XFERING    (1<<8)
- #define S3C2410_SDICMDSTAT_INDEX      (0xff)
-+#define S3C2440_SDIDCON_DS_BYTE       (0<<22)
-+#define S3C2440_SDIDCON_DS_HALFWORD   (1<<22)
-+#define S3C2440_SDIDCON_DS_WORD       (2<<22)
- #define S3C2410_SDIDCON_IRQPERIOD     (1<<21)
- #define S3C2410_SDIDCON_TXAFTERRESP   (1<<20)
- #define S3C2410_SDIDCON_RXAFTERCMD    (1<<19)
-@@ -59,6 +71,7 @@
- #define S3C2410_SDIDCON_WIDEBUS       (1<<16)
- #define S3C2410_SDIDCON_DMAEN         (1<<15)
- #define S3C2410_SDIDCON_STOP          (1<<14)
-+#define S3C2440_SDIDCON_DATSTART      (1<<14)
- #define S3C2410_SDIDCON_DATMODE             (3<<12)
- #define S3C2410_SDIDCON_BLKNUM        (0x7ff)
-@@ -68,6 +81,7 @@
- #define S3C2410_SDIDCON_XFER_RXSTART  (2<<12)
- #define S3C2410_SDIDCON_XFER_TXSTART  (3<<12)
-+#define S3C2410_SDIDCON_BLKNUM_MASK   (0xFFF)
- #define S3C2410_SDIDCNT_BLKNUM_SHIFT  (12)
- #define S3C2410_SDIDSTA_RDYWAITREQ    (1<<10)
-@@ -82,10 +96,12 @@
- #define S3C2410_SDIDSTA_TXDATAON      (1<<1)
- #define S3C2410_SDIDSTA_RXDATAON      (1<<0)
-+#define S3C2440_SDIFSTA_FIFORESET      (1<<16)
-+#define S3C2440_SDIFSTA_FIFOFAIL       (3<<14)  /* 3 is correct (2 bits) */
- #define S3C2410_SDIFSTA_TFDET          (1<<13)
- #define S3C2410_SDIFSTA_RFDET          (1<<12)
--#define S3C2410_SDIFSTA_TXHALF         (1<<11)
--#define S3C2410_SDIFSTA_TXEMPTY        (1<<10)
-+#define S3C2410_SDIFSTA_TFHALF         (1<<11)
-+#define S3C2410_SDIFSTA_TFEMPTY        (1<<10)
- #define S3C2410_SDIFSTA_RFLAST         (1<<9)
- #define S3C2410_SDIFSTA_RFFULL         (1<<8)
- #define S3C2410_SDIFSTA_RFHALF         (1<<7)
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1020-s3c_mci-gta01.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1020-s3c_mci-gta01.patch.patch
deleted file mode 100755 (executable)
index 6b3dda4..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-From d63b12e946e83c7db8c9f94ae9d5d9d420a6f907 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:50 +0100
-Subject: [PATCH] s3c_mci-gta01.patch
-
----
- arch/arm/mach-s3c2410/mach-gta01.c |   56 ++++++++++++++++++++++++++++++++++++
- 1 files changed, 56 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index 3462c7f..87bb189 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -59,6 +59,7 @@
- #include <asm/arch/regs-gpio.h>
- #include <asm/arch/fb.h>
-+#include <asm/arch/mci.h>
- #include <asm/arch/spi.h>
- #include <asm/arch/spi-gpio.h>
- #include <asm/arch/usb-control.h>
-@@ -382,6 +383,59 @@ static struct s3c2410_platform_nand gta01_nand_info = {
-       .sets           = gta01_nand_sets,
- };
-+static void gta01_mmc_set_power(unsigned char power_mode, unsigned short vdd)
-+{
-+      int bit;
-+      int mv = 1700; /* 1.7V for MMC_VDD_165_195 */
-+
-+      printk(KERN_DEBUG "mmc_set_power(power_mode=%u, vdd=%u\n",
-+             power_mode, vdd);
-+
-+      switch (system_rev) {
-+      case GTA01v3_SYSTEM_REV:
-+              switch (power_mode) {
-+              case MMC_POWER_OFF:
-+                      pcf50606_onoff_set(pcf50606_global,
-+                                         PCF50606_REGULATOR_D2REG, 0);
-+                      break;
-+              case MMC_POWER_ON:
-+                      /* translate MMC_VDD_* VDD bit to mv */
-+                      for (bit = 8; bit != 24; bit++)
-+                              if (vdd == (1 << bit))
-+                                      mv += 100 * (bit - 4);
-+                      pcf50606_voltage_set(pcf50606_global,
-+                                           PCF50606_REGULATOR_D2REG, mv);
-+                      pcf50606_onoff_set(pcf50606_global,
-+                                         PCF50606_REGULATOR_D2REG, 1);
-+                      break;
-+              }
-+              break;
-+      case GTA01v4_SYSTEM_REV:
-+      case GTA01Bv2_SYSTEM_REV:
-+      case GTA01Bv3_SYSTEM_REV:
-+      case GTA01Bv4_SYSTEM_REV:
-+              switch (power_mode) {
-+              case MMC_POWER_OFF:
-+                      s3c2410_gpio_setpin(GTA01_GPIO_SDMMC_ON, 1);
-+                      break;
-+              case MMC_POWER_ON:
-+                      s3c2410_gpio_setpin(GTA01_GPIO_SDMMC_ON, 0);
-+                      break;
-+              }
-+              break;
-+      }
-+}
-+
-+static struct s3c24xx_mci_pdata gta01_mmc_cfg = {
-+      .gpio_detect    = GTA01_GPIO_nSD_DETECT,
-+      .set_power      = &gta01_mmc_set_power,
-+      .ocr_avail      = MMC_VDD_165_195|MMC_VDD_20_21|
-+                        MMC_VDD_21_22|MMC_VDD_22_23|MMC_VDD_23_24|
-+                        MMC_VDD_24_25|MMC_VDD_25_26|MMC_VDD_26_27|
-+                        MMC_VDD_27_28|MMC_VDD_28_29|MMC_VDD_29_30|
-+                        MMC_VDD_30_31|MMC_VDD_31_32|MMC_VDD_32_33,
-+};
-+
- static void gta01_udc_command(enum s3c2410_udc_cmd_e cmd)
- {
-       printk(KERN_DEBUG "%s(%d)\n", __func__, cmd);
-@@ -598,10 +652,12 @@ static void __init gta01_machine_init(void)
-           system_rev == GTA01Bv3_SYSTEM_REV ||
-           system_rev == GTA01Bv4_SYSTEM_REV) {
-               gta01_udc_cfg.udc_command = gta01_udc_command;
-+              gta01_mmc_cfg.ocr_avail = MMC_VDD_32_33;
-       }
-       s3c_device_usb.dev.platform_data = &gta01_usb_info;
-       s3c_device_nand.dev.platform_data = &gta01_nand_info;
-+      s3c_device_sdi.dev.platform_data = &gta01_mmc_cfg;
-       s3c24xx_fb_set_platdata(&gta01_lcd_cfg);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1021-s3c24xx-nand-largepage.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1021-s3c24xx-nand-largepage.patch.patch
deleted file mode 100755 (executable)
index 383ae6a..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-From 68108d95040732cebf06296affaaeaaf76029c3d Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:50 +0100
-Subject: [PATCH] s3c24xx-nand-largepage.patch
- MTD: S3C24XX large page NAND support
-
-This adds support for using large page NAND devices
-with the S3C24XX NAND controller. This also adds the
-file Documentation/arm/Samsung-S3C24XX/NAND.txt to
-describe the differences.
-
-Signed-off-by: Ben Dooks <ben-linux@fluff.org>
----
- drivers/mtd/nand/s3c2410.c |   28 ++++++++++++++++++++++++++++
- 1 files changed, 28 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
-index cd2e1da..6e7a5b9 100644
---- a/drivers/mtd/nand/s3c2410.c
-+++ b/drivers/mtd/nand/s3c2410.c
-@@ -726,6 +726,34 @@ static void s3c2410_nand_update_chip(struct s3c2410_nand_info *info,
-       }
- }
-+/* s3c2410_nand_update_chip
-+ *
-+ * post-probe chip update, to change any items, such as the
-+ * layout for large page nand
-+ */
-+
-+static void s3c2410_nand_update_chip(struct s3c2410_nand_info *info,
-+                                   struct s3c2410_nand_mtd *nmtd)
-+{
-+      struct nand_chip *chip = &nmtd->chip;
-+
-+      printk("%s: chip %p: %d\n", __func__, chip, chip->page_shift);
-+
-+      if (hardware_ecc) {
-+              /* change the behaviour depending on wether we are using
-+               * the large or small page nand device */
-+
-+              if (chip->page_shift > 10) {
-+                      chip->ecc.size      = 256;
-+                      chip->ecc.bytes     = 3;
-+              } else {
-+                      chip->ecc.size      = 512;
-+                      chip->ecc.bytes     = 3;
-+                      chip->ecc.layout    = &nand_hw_eccoob;
-+              }
-+      }
-+}
-+
- /* s3c2410_nand_probe
-  *
-  * called by device layer when it finds a device matching
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1022-s3c2410_udc-2440_dual_packet-workaround.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1022-s3c2410_udc-2440_dual_packet-workaround.patch.patch
deleted file mode 100755 (executable)
index 2ed8283..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-From 5207363cc9d50f99a2ad490eff5efa913b1c10ba Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:50 +0100
-Subject: [PATCH] s3c2410_udc-2440_dual_packet-workaround.patch
- This is a patch that seems to make the USB hangs on the S3C2440 go away. At
- least a good amount of ping torture didn't make them come back so far.
-
-The issue is that, if there are several back-to-back packets,
-sometimes no interrupt is generated for one of them. This
-seems to be caused by the mysterious dual packet mode, which
-the USB hardware enters automatically if the endpoint size is
-half that of the FIFO. (On the 2440, this is the normal
-situation for bulk data endpoints.)
-
-There is also a timing factor in this. I think what happens is
-that the USB hardware automatically sends an acknowledgement
-if there is only one packet in the FIFO (the FIFO has space
-for two). If another packet arrives before the host has
-retrieved and acknowledged the previous one, no interrupt is
-generated for that second one.
-
-However, there may be an indication. There is one undocumented
-bit (none of the 244x manuals document it), OUT_CRS1_REG[1],
-that seems to be set suspiciously often when this condition
-occurs. There is also CLR_DATA_TOGGLE, OUT_CRS1_REG[7], which
-may have a function related to this. (The Samsung manual is
-rather terse on that, as usual.)
-
-This needs to be examined further. For now, the patch seems to do the
-trick.
-
-Note that this is not a clean solution by any means, because we
-might potentially get stuck in that interrupt for quite a while.
----
- drivers/usb/gadget/s3c2410_udc.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c
-index 6b1ef48..c1a4379 100644
---- a/drivers/usb/gadget/s3c2410_udc.c
-+++ b/drivers/usb/gadget/s3c2410_udc.c
-@@ -845,6 +845,7 @@ static void s3c2410_udc_handle_ep(struct s3c2410_ep *ep)
-       u32                     ep_csr1;
-       u32                     idx;
-+handle_ep_again:
-       if (likely (!list_empty(&ep->queue)))
-               req = list_entry(ep->queue.next,
-                               struct s3c2410_request, queue);
-@@ -884,6 +885,8 @@ static void s3c2410_udc_handle_ep(struct s3c2410_ep *ep)
-               if ((ep_csr1 & S3C2410_UDC_OCSR1_PKTRDY) && req) {
-                       s3c2410_udc_read_fifo(ep,req);
-+                      if (s3c2410_udc_fifo_count_out())
-+                              goto handle_ep_again;
-               }
-       }
- }
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1023-s3c2442b-cpuid.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1023-s3c2442b-cpuid.patch.patch
deleted file mode 100755 (executable)
index 8bd3d65..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-From ca652d910f40692ce558d525b61911b66202d908 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:50 +0100
-Subject: [PATCH] s3c2442b-cpuid.patch
- Add the Samsung S3C2442B CPU idcode to the samsung s3c24xx platform code
- and fix a Kconfig typo related tot the 2442.
-
----
- arch/arm/mach-s3c2442/Kconfig |    2 +-
- arch/arm/plat-s3c24xx/cpu.c   |   10 ++++++++++
- 2 files changed, 11 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig
-index 26d131a..6cc68a1 100644
---- a/arch/arm/mach-s3c2442/Kconfig
-+++ b/arch/arm/mach-s3c2442/Kconfig
-@@ -6,7 +6,7 @@
- config CPU_S3C2442
-       bool
--      depends on ARCH_S3C2410
-+      depends on ARCH_S3C2440
-       select S3C2410_CLOCK
-       select S3C2410_GPIO
-       select S3C2410_PM if PM
-diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c
-index f5699ca..05fb61d 100644
---- a/arch/arm/plat-s3c24xx/cpu.c
-+++ b/arch/arm/plat-s3c24xx/cpu.c
-@@ -72,6 +72,7 @@ static const char name_s3c2410[]  = "S3C2410";
- static const char name_s3c2412[]  = "S3C2412";
- static const char name_s3c2440[]  = "S3C2440";
- static const char name_s3c2442[]  = "S3C2442";
-+static const char name_s3c2442b[]  = "S3C2442B";
- static const char name_s3c2443[]  = "S3C2443";
- static const char name_s3c2410a[] = "S3C2410A";
- static const char name_s3c2440a[] = "S3C2440A";
-@@ -123,6 +124,15 @@ static struct cpu_table cpu_ids[] __initdata = {
-               .name           = name_s3c2442
-       },
-       {
-+              .idcode         = 0x32440aab,
-+              .idmask         = 0xffffffff,
-+              .map_io         = s3c244x_map_io,
-+              .init_clocks    = s3c244x_init_clocks,
-+              .init_uarts     = s3c244x_init_uarts,
-+              .init           = s3c2442_init,
-+              .name           = name_s3c2442b
-+      },
-+      {
-               .idcode         = 0x32412001,
-               .idmask         = 0xffffffff,
-               .map_io         = s3c2412_map_io,
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1024-pcf50633.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1024-pcf50633.patch.patch
deleted file mode 100755 (executable)
index 7506dba..0000000
+++ /dev/null
@@ -1,2562 +0,0 @@
-From b04e2c56a057f288342a8ce8f88b7a1dfc88afa1 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:50 +0100
-Subject: [PATCH] pcf50633.patch
-
----
- drivers/i2c/chips/Kconfig    |    9 +
- drivers/i2c/chips/Makefile   |    1 +
- drivers/i2c/chips/pcf50633.c | 1964 ++++++++++++++++++++++++++++++++++++++++++
- drivers/i2c/chips/pcf50633.h |  402 +++++++++
- include/linux/i2c-id.h       |    1 +
- include/linux/pcf50633.h     |  114 +++
- 6 files changed, 2491 insertions(+), 0 deletions(-)
- create mode 100644 drivers/i2c/chips/pcf50633.c
- create mode 100644 drivers/i2c/chips/pcf50633.h
- create mode 100644 include/linux/pcf50633.h
-
-diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
-index e8e64aa..e38c006 100644
---- a/drivers/i2c/chips/Kconfig
-+++ b/drivers/i2c/chips/Kconfig
-@@ -35,6 +35,15 @@ config SENSORS_PCF50606
-         This driver can also be built as a module.  If so, the module
-         will be called pcf50606.
-+config SENSORS_PCF50633
-+      tristate "Philips PCF50633"
-+      depends on I2C
-+      help
-+        If you say yes here you get support for Philips PCF50633
-+        PMU (Power Management Unit) chips.
-+
-+        This driver can also be built as a module.  If so, the module
-+        will be called pcf50633.
- config SENSORS_PCF8574
-       tristate "Philips PCF8574 and PCF8574A"
-diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
-index 60d3d5a..9fa353d 100644
---- a/drivers/i2c/chips/Makefile
-+++ b/drivers/i2c/chips/Makefile
-@@ -14,6 +14,7 @@ obj-$(CONFIG_SENSORS_EEPROM) += eeprom.o
- obj-$(CONFIG_SENSORS_MAX6875) += max6875.o
- obj-$(CONFIG_SENSORS_PCA9539) += pca9539.o
- obj-$(CONFIG_SENSORS_PCF50606)        += pcf50606.o
-+obj-$(CONFIG_SENSORS_PCF50633)        += pcf50633.o
- obj-$(CONFIG_SENSORS_PCF8574) += pcf8574.o
- obj-$(CONFIG_PCF8575)         += pcf8575.o
- obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-new file mode 100644
-index 0000000..5488084
---- /dev/null
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -0,0 +1,1964 @@
-+/* Philips PCF50633 Power Management Unit (PMU) driver
-+ *
-+ * (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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
-+ *
-+ * This driver is a monster ;) It provides the following features
-+ * - voltage control for a dozen different voltage domains
-+ * - charging control for main and backup battery
-+ * - rtc / alarm
-+ * - adc driver (hw_sensors like)
-+ * - backlight
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/i2c.h>
-+#include <linux/types.h>
-+#include <linux/interrupt.h>
-+#include <linux/irq.h>
-+#include <linux/workqueue.h>
-+#include <linux/delay.h>
-+#include <linux/rtc.h>
-+#include <linux/bcd.h>
-+#include <linux/watchdog.h>
-+#include <linux/miscdevice.h>
-+#include <linux/input.h>
-+#include <linux/fb.h>
-+#include <linux/backlight.h>
-+#include <linux/sched.h>
-+#include <linux/platform_device.h>
-+#include <linux/pcf50633.h>
-+#include <linux/apm-emulation.h>
-+
-+#include <asm/mach-types.h>
-+#include <asm/arch/gta02.h>
-+
-+#include "pcf50633.h"
-+
-+#if 1
-+#define DEBUGP(x, args ...) printk("%s: " x, __FUNCTION__, ## args)
-+#define DEBUGPC(x, args ...) printk(x, ## args)
-+#else
-+#define DEBUGP(x, args ...)
-+#define DEBUGPC(x, args ...)
-+#endif
-+
-+/***********************************************************************
-+ * Static data / structures
-+ ***********************************************************************/
-+
-+static unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
-+
-+I2C_CLIENT_INSMOD_1(pcf50633);
-+
-+#define PCF50633_FIDX_CHG_ENABLED     0       /* Charger enabled */
-+#define PCF50633_FIDX_CHG_PRESENT     1       /* Charger present */
-+#define PCF50633_FIDX_CHG_ERR         3       /* Charger Error */
-+#define PCF50633_FIDX_CHG_PROT                4       /* Charger Protection */
-+#define PCF50633_FIDX_CHG_READY               5       /* Charging completed */
-+#define PCF50633_FIDX_PWR_PRESSED     8
-+#define PCF50633_FIDX_RTC_SECOND      9
-+#define PCF50633_FIDX_USB_PRESENT     10
-+
-+#define PCF50633_F_CHG_ENABLED        (1 << PCF50633_FIDX_CHG_ENABLED)
-+#define PCF50633_F_CHG_PRESENT        (1 << PCF50633_FIDX_CHG_PRESENT)
-+#define PCF50633_F_CHG_ERR    (1 << PCF50633_FIDX_CHG_ERR)
-+#define PCF50633_F_CHG_PROT   (1 << PCF50633_FIDX_CHG_PROT)
-+#define PCF50633_F_CHG_READY  (1 << PCF50633_FIDX_CHG_READY)
-+
-+#define PCF50633_F_CHG_MASK   0x000000fc
-+
-+#define PCF50633_F_PWR_PRESSED        (1 << PCF50633_FIDX_PWR_PRESSED)
-+#define PCF50633_F_RTC_SECOND (1 << PCF50633_FIDX_RTC_SECOND)
-+#define PCF50633_F_USB_PRESENT        (1 << PCF50633_FIDX_USB_PRESENT)
-+
-+enum close_state {
-+      CLOSE_STATE_NOT,
-+      CLOSE_STATE_ALLOW = 0x2342,
-+};
-+
-+enum charger_type {
-+      CHARGER_TYPE_NONE = 0,
-+      CHARGER_TYPE_HOSTUSB,
-+      CHARGER_TYPE_1A
-+};
-+
-+#define ADC_NOM_CHG_DETECT_1A 6
-+#define ADC_NOM_CHG_DETECT_NONE 43
-+
-+#define MAX_ADC_FIFO_DEPTH 8
-+
-+struct pcf50633_data {
-+      struct i2c_client client;
-+      struct pcf50633_platform_data *pdata;
-+      struct backlight_device *backlight;
-+      struct mutex lock;
-+      unsigned int flags;
-+      unsigned int working;
-+      struct mutex working_lock;
-+      struct work_struct work;
-+      struct rtc_device *rtc;
-+      struct input_dev *input_dev;
-+      int allow_close;
-+      int onkey_seconds;
-+      int irq;
-+
-+      int coldplug_done; /* cleared by probe, set by first work service */
-+      int flag_bat_voltage_read; /* ipc to /sys batt voltage read func */
-+
-+      int charger_adc_result_raw;
-+      enum charger_type charger_type;
-+
-+      /* we have a FIFO of ADC measurement requests that are used only by
-+       * the workqueue service code after the ADC completion interrupt
-+       */
-+      int adc_queue_mux[MAX_ADC_FIFO_DEPTH]; /* which ADC input to use */
-+      int adc_queue_avg[MAX_ADC_FIFO_DEPTH]; /* amount of averaging */
-+      int adc_queue_head; /* head owned by foreground code */
-+      int adc_queue_tail; /* tail owned by service code */
-+
-+#ifdef CONFIG_PM
-+      struct {
-+              u_int8_t int1m, int2m, int3m, int4m, int5m;
-+              u_int8_t ooctim2;
-+              u_int8_t autoout, autoena, automxc;
-+              u_int8_t down1out, down1mxc;
-+              u_int8_t down2out, down2ena;
-+              u_int8_t memldoout, memldoena;
-+              u_int8_t ledout, ledena, leddim;
-+              struct {
-+                      u_int8_t out;
-+                      u_int8_t ena;
-+              } ldo[__NUM_PCF50633_REGS];
-+      } standby_regs;
-+#endif
-+};
-+
-+static struct i2c_driver pcf50633_driver;
-+
-+struct pcf50633_data *pcf50633_global;
-+EXPORT_SYMBOL_GPL(pcf50633_global);
-+
-+static struct platform_device *pcf50633_pdev;
-+
-+/***********************************************************************
-+ * Low-Level routines
-+ ***********************************************************************/
-+
-+static int __reg_write(struct pcf50633_data *pcf, u_int8_t reg, u_int8_t val)
-+{
-+      return i2c_smbus_write_byte_data(&pcf->client, reg, val);
-+}
-+
-+static int reg_write(struct pcf50633_data *pcf, u_int8_t reg, u_int8_t val)
-+{
-+      int ret;
-+
-+      mutex_lock(&pcf->lock);
-+      ret = __reg_write(pcf, reg, val);
-+      mutex_unlock(&pcf->lock);
-+
-+      return ret;
-+}
-+
-+static int32_t __reg_read(struct pcf50633_data *pcf, u_int8_t reg)
-+{
-+      int32_t ret;
-+
-+      ret = i2c_smbus_read_byte_data(&pcf->client, reg);
-+
-+      return ret;
-+}
-+
-+static u_int8_t reg_read(struct pcf50633_data *pcf, u_int8_t reg)
-+{
-+      int32_t ret;
-+
-+      mutex_lock(&pcf->lock);
-+      ret = __reg_read(pcf, reg);
-+      mutex_unlock(&pcf->lock);
-+
-+      return ret & 0xff;
-+}
-+
-+static int reg_set_bit_mask(struct pcf50633_data *pcf,
-+                          u_int8_t reg, u_int8_t mask, u_int8_t val)
-+{
-+      int ret;
-+      u_int8_t tmp;
-+
-+      val &= mask;
-+
-+      mutex_lock(&pcf->lock);
-+
-+      tmp = __reg_read(pcf, reg);
-+      tmp &= ~mask;
-+      tmp |= val;
-+      ret = __reg_write(pcf, reg, tmp);
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      return ret;
-+}
-+
-+static int reg_clear_bits(struct pcf50633_data *pcf, u_int8_t reg, u_int8_t val)
-+{
-+      int ret;
-+      u_int8_t tmp;
-+
-+      mutex_lock(&pcf->lock);
-+
-+      tmp = __reg_read(pcf, reg);
-+      tmp &= ~val;
-+      ret = __reg_write(pcf, reg, tmp);
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      return ret;
-+}
-+
-+/* asynchronously setup reading one ADC channel */
-+static void async_adc_read_setup(struct pcf50633_data *pcf,
-+                               int channel, int avg)
-+{
-+      channel &= PCF50633_ADCC1_ADCMUX_MASK;
-+
-+      /* kill ratiometric, but enable ACCSW biasing */
-+      __reg_write(pcf, PCF50633_REG_ADCC2, 0x00);
-+      __reg_write(pcf, PCF50633_REG_ADCC3, 0x01);
-+
-+      /* start ADC conversion of selected channel */
-+      __reg_write(pcf, PCF50633_REG_ADCC1, channel | avg |
-+                  PCF50633_ADCC1_ADCSTART | PCF50633_ADCC1_RES_10BIT);
-+
-+}
-+
-+static u_int16_t async_adc_complete(struct pcf50633_data *pcf)
-+{
-+      u_int16_t ret = (__reg_read(pcf, PCF50633_REG_ADCS1) << 2) |
-+                      (__reg_read(pcf, PCF50633_REG_ADCS3) &
-+                                                PCF50633_ADCS3_ADCDAT1L_MASK);
-+
-+      return ret;
-+}
-+
-+
-+
-+
-+/***********************************************************************
-+ * Voltage / ADC
-+ ***********************************************************************/
-+
-+static u_int8_t auto_voltage(unsigned int millivolts)
-+{
-+      if (millivolts < 1800)
-+              return 0;
-+      if (millivolts > 3800)
-+              return 0xff;
-+
-+      millivolts -= 625;
-+      return millivolts/25;
-+}
-+
-+static unsigned int auto_2voltage(u_int8_t bits)
-+{
-+      if (bits < 0x2f)
-+              return 0;
-+      return 625 + (bits * 25);
-+}
-+
-+static u_int8_t down_voltage(unsigned int millivolts)
-+{
-+      if (millivolts < 625)
-+              return 0;
-+      else if (millivolts > 3000)
-+              return 0xff;
-+
-+      millivolts -= 625;
-+      return millivolts/25;
-+}
-+
-+static unsigned int down_2voltage(u_int8_t bits)
-+{
-+      return 625 + (bits*25);
-+}
-+
-+static u_int8_t ldo_voltage(unsigned int millivolts)
-+{
-+      if (millivolts < 900)
-+              return 0;
-+      else if (millivolts > 3600)
-+              return 0x1f;
-+
-+      millivolts -= 900;
-+      return millivolts/100;
-+}
-+
-+static unsigned int ldo_2voltage(u_int8_t bits)
-+{
-+      bits &= 0x1f;
-+      return 900 + (bits * 100);
-+}
-+
-+static const u_int8_t regulator_registers[__NUM_PCF50633_REGULATORS] = {
-+      [PCF50633_REGULATOR_AUTO]       = PCF50633_REG_AUTOOUT,
-+      [PCF50633_REGULATOR_DOWN1]      = PCF50633_REG_DOWN1OUT,
-+      [PCF50633_REGULATOR_DOWN2]      = PCF50633_REG_DOWN2OUT,
-+      [PCF50633_REGULATOR_MEMLDO]     = PCF50633_REG_MEMLDOOUT,
-+      [PCF50633_REGULATOR_LDO1]       = PCF50633_REG_LDO1OUT,
-+      [PCF50633_REGULATOR_LDO2]       = PCF50633_REG_LDO2OUT,
-+      [PCF50633_REGULATOR_LDO3]       = PCF50633_REG_LDO3OUT,
-+      [PCF50633_REGULATOR_LDO4]       = PCF50633_REG_LDO4OUT,
-+      [PCF50633_REGULATOR_LDO5]       = PCF50633_REG_LDO5OUT,
-+      [PCF50633_REGULATOR_LDO6]       = PCF50633_REG_LDO6OUT,
-+      [PCF50633_REGULATOR_HCLDO]      = PCF50633_REG_HCLDOOUT,
-+};
-+
-+int pcf50633_onoff_set(struct pcf50633_data *pcf,
-+                     enum pcf50633_regulator_id reg, int on)
-+{
-+      u_int8_t addr;
-+
-+      if (reg >= __NUM_PCF50633_REGULATORS)
-+              return -EINVAL;
-+
-+      /* the *ENA register is always one after the *OUT register */
-+      addr = regulator_registers[reg] + 1;
-+
-+      if (on == 0)
-+              reg_set_bit_mask(pcf, addr, PCF50633_REGULATOR_ON, 0);
-+      else
-+              reg_set_bit_mask(pcf, addr, PCF50633_REGULATOR_ON,
-+                               PCF50633_REGULATOR_ON);
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_onoff_set);
-+
-+int pcf50633_onoff_get(struct pcf50633_data *pcf,
-+                     enum pcf50633_regulator_id reg)
-+{
-+      u_int8_t val, addr;
-+
-+      if (reg >= __NUM_PCF50633_REGULATORS)
-+              return -EINVAL;
-+
-+      /* the *ENA register is always one after the *OUT register */
-+      addr = regulator_registers[reg] + 1;
-+      val = reg_read(pcf, addr) & PCF50633_REGULATOR_ON;
-+
-+      return val;
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_onoff_get);
-+
-+int pcf50633_voltage_set(struct pcf50633_data *pcf,
-+                       enum pcf50633_regulator_id reg,
-+                       unsigned int millivolts)
-+{
-+      u_int8_t volt_bits;
-+      u_int8_t regnr;
-+
-+      DEBUGP("pcf=%p, reg=%d, mvolts=%d\n", pcf, reg, millivolts);
-+
-+      if (reg >= __NUM_PCF50633_REGULATORS)
-+              return -EINVAL;
-+
-+      regnr = regulator_registers[reg];
-+
-+      if (millivolts > pcf->pdata->rails[reg].voltage.max)
-+              return -EINVAL;
-+
-+      switch (reg) {
-+      case PCF50633_REGULATOR_AUTO:
-+              volt_bits = auto_voltage(millivolts);
-+              break;
-+      case PCF50633_REGULATOR_DOWN1:
-+              volt_bits = down_voltage(millivolts);
-+              break;
-+      case PCF50633_REGULATOR_DOWN2:
-+              volt_bits = down_voltage(millivolts);
-+              break;
-+      case PCF50633_REGULATOR_LDO1:
-+      case PCF50633_REGULATOR_LDO2:
-+      case PCF50633_REGULATOR_LDO3:
-+      case PCF50633_REGULATOR_LDO4:
-+      case PCF50633_REGULATOR_LDO5:
-+      case PCF50633_REGULATOR_LDO6:
-+      case PCF50633_REGULATOR_HCLDO:
-+              volt_bits = ldo_voltage(millivolts);
-+              DEBUGP("ldo_voltage(0x%x)=%u\n", millivolts, volt_bits);
-+              break;
-+      default:
-+              return -EINVAL;
-+      }
-+
-+      return reg_write(pcf, regnr, volt_bits);
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_voltage_set);
-+
-+unsigned int pcf50633_voltage_get(struct pcf50633_data *pcf,
-+                       enum pcf50633_regulator_id reg)
-+{
-+      u_int8_t volt_bits;
-+      u_int8_t regnr;
-+      unsigned int rc = 0;
-+
-+      if (reg >= __NUM_PCF50633_REGULATORS)
-+              return -EINVAL;
-+
-+      regnr = regulator_registers[reg];
-+      volt_bits = reg_read(pcf, regnr);
-+
-+      switch (reg) {
-+      case PCF50633_REGULATOR_AUTO:
-+              rc = auto_2voltage(volt_bits);
-+              break;
-+      case PCF50633_REGULATOR_DOWN1:
-+              rc = down_2voltage(volt_bits);
-+              break;
-+      case PCF50633_REGULATOR_DOWN2:
-+              rc = down_2voltage(volt_bits);
-+              break;
-+      case PCF50633_REGULATOR_LDO1:
-+      case PCF50633_REGULATOR_LDO2:
-+      case PCF50633_REGULATOR_LDO3:
-+      case PCF50633_REGULATOR_LDO4:
-+      case PCF50633_REGULATOR_LDO5:
-+      case PCF50633_REGULATOR_LDO6:
-+      case PCF50633_REGULATOR_HCLDO:
-+              rc = ldo_2voltage(volt_bits);
-+              break;
-+      default:
-+              return -EINVAL;
-+      }
-+
-+      return rc;
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_voltage_get);
-+
-+/* go into 'STANDBY' mode, i.e. power off the main CPU and peripherals */
-+void pcf50633_go_standby(void)
-+{
-+      reg_set_bit_mask(pcf50633_global, PCF50633_REG_OOCSHDWN,
-+                PCF50633_OOCSHDWN_GOSTDBY, PCF50633_OOCSHDWN_GOSTDBY);
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_go_standby);
-+
-+void pcf50633_gpio_set(struct pcf50633_data *pcf, enum pcf50633_gpio gpio,
-+                      int on)
-+{
-+      u_int8_t reg = gpio - PCF50633_GPIO1 + PCF50633_REG_GPIO1CFG;
-+
-+      if (on)
-+              reg_set_bit_mask(pcf, reg, 0x0f, 0x07);
-+      else
-+              reg_set_bit_mask(pcf, reg, 0x0f, 0x00);
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_gpio_set);
-+
-+int pcf50633_gpio_get(struct pcf50633_data *pcf, enum pcf50633_gpio gpio)
-+{
-+      u_int8_t reg = gpio - PCF50633_GPIO1 + PCF50633_REG_GPIO1CFG;
-+      u_int8_t val = reg_read(pcf, reg) & 0x0f;
-+
-+      if (val == PCF50633_GPOCFG_GPOSEL_1 ||
-+          val == (PCF50633_GPOCFG_GPOSEL_0|PCF50633_GPOCFG_GPOSEL_INVERSE))
-+              return 1;
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_gpio_get);
-+
-+static int interpret_charger_type_from_adc(struct pcf50633_data *pcf,
-+                                         int sample)
-+{
-+      /* 1A capable charger? */
-+
-+      if (sample < ((ADC_NOM_CHG_DETECT_NONE + ADC_NOM_CHG_DETECT_1A) / 2))
-+              return CHARGER_TYPE_1A;
-+
-+      /* well then, nothing in the USB hole, or USB host / unk adapter */
-+
-+      if (pcf->flags & PCF50633_F_USB_PRESENT) /* ooh power is in there */
-+              return CHARGER_TYPE_HOSTUSB; /* HOSTUSB is the catchall */
-+
-+      return CHARGER_TYPE_NONE; /* no really -- nothing in there */
-+}
-+
-+
-+
-+static void configure_pmu_for_charger(struct pcf50633_data *pcf,
-+                                    enum charger_type type)
-+{
-+      switch (type) {
-+      case CHARGER_TYPE_NONE:
-+              __reg_write(pcf, PCF50633_REG_MBCC7,
-+                                                  PCF50633_MBCC7_USB_SUSPEND);
-+              break;
-+      /*
-+       * the PCF50633 has a feature that it will supply only excess current
-+       * from the charger that is not used to power the device.  So this
-+       * 500mA setting is "up to 500mA" according to that.
-+       */
-+      case CHARGER_TYPE_HOSTUSB:
-+              __reg_write(pcf, PCF50633_REG_MBCC7, PCF50633_MBCC7_USB_500mA);
-+              break;
-+      case CHARGER_TYPE_1A:
-+              __reg_write(pcf, PCF50633_REG_MBCC7, PCF50633_MBCC7_USB_1000mA);
-+              break;
-+      }
-+}
-+
-+static void trigger_next_adc_job_if_any(struct pcf50633_data *pcf)
-+{
-+      if (pcf->adc_queue_head == pcf->adc_queue_tail)
-+              return;
-+      async_adc_read_setup(pcf,
-+                           pcf->adc_queue_mux[pcf->adc_queue_tail],
-+                           pcf->adc_queue_avg[pcf->adc_queue_tail]);
-+}
-+
-+static void add_request_to_adc_queue(struct pcf50633_data *pcf,
-+                                   int mux, int avg)
-+{
-+      int old_head = pcf->adc_queue_head;
-+      pcf->adc_queue_mux[pcf->adc_queue_head] = mux;
-+      pcf->adc_queue_avg[pcf->adc_queue_head] = avg;
-+
-+      pcf->adc_queue_head = (pcf->adc_queue_head + 1) &
-+                            (MAX_ADC_FIFO_DEPTH - 1);
-+
-+      /* it was idle before we just added this?  we need to kick it then */
-+      if (old_head == pcf->adc_queue_tail)
-+              trigger_next_adc_job_if_any(pcf);
-+}
-+
-+static void pcf50633_work(struct work_struct *work)
-+{
-+      struct pcf50633_data *pcf =
-+                      container_of(work, struct pcf50633_data, work);
-+      u_int8_t pcfirq[5];
-+      int ret;
-+      int tail;
-+
-+      mutex_lock(&pcf->working_lock);
-+      pcf->working = 1;
-+      /*
-+       * datasheet says we have to read the five IRQ
-+       * status regs in one transaction
-+       */
-+      ret = i2c_smbus_read_i2c_block_data(&pcf->client, PCF50633_REG_INT1, 5,
-+                                          pcfirq);
-+      if (ret != 5)
-+              DEBUGP("Oh crap PMU IRQ register read failed %d\n", ret);
-+
-+      if (!pcf->coldplug_done) {
-+              DEBUGP("PMU Coldplug init\n");
-+
-+              /* we used SECOND to kick ourselves started -- turn it off */
-+              pcfirq[0] &= ~PCF50633_INT1_SECOND;
-+              reg_set_bit_mask(pcf, PCF50633_REG_INT1M,
-+                                      PCF50633_INT1_SECOND,
-+                                      PCF50633_INT1_SECOND);
-+
-+              /* coldplug the USB if present */
-+              if ((__reg_read(pcf, PCF50633_REG_MBCS1) &
-+                  (PCF50633_MBCS1_USBPRES | PCF50633_MBCS1_USBOK)) ==
-+                  (PCF50633_MBCS1_USBPRES | PCF50633_MBCS1_USBOK)) {
-+                      DEBUGPC("COLD USBINS\n");
-+                      input_report_key(pcf->input_dev, KEY_POWER2, 1);
-+                      apm_queue_event(APM_POWER_STATUS_CHANGE);
-+                      pcf->flags |= PCF50633_F_USB_PRESENT;
-+                      if (pcf->pdata->cb)
-+                              pcf->pdata->cb(&pcf->client.dev,
-+                                      PCF50633_FEAT_MBC, PMU_EVT_USB_INSERT);
-+              }
-+
-+              /* figure out our initial charging stance */
-+              add_request_to_adc_queue(pcf, PCF50633_ADCC1_MUX_ADCIN1,
-+                                            PCF50633_ADCC1_AVERAGE_16);
-+
-+              pcf->coldplug_done = 1;
-+      }
-+
-+      DEBUGP("INT1=0x%02x INT2=0x%02x INT3=0x%02x INT4=0x%02x INT5=0x%02x\n",
-+              pcfirq[0], pcfirq[1], pcfirq[2], pcfirq[3], pcfirq[4]);
-+
-+      if (pcfirq[0] & PCF50633_INT1_ADPINS) {
-+              /* Charger inserted */
-+              DEBUGPC("ADPINS ");
-+              input_report_key(pcf->input_dev, KEY_BATTERY, 1);
-+              apm_queue_event(APM_POWER_STATUS_CHANGE);
-+              pcf->flags |= PCF50633_F_CHG_PRESENT;
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50633_FEAT_MBC, PMU_EVT_INSERT);
-+              /* FIXME: signal this to userspace */
-+              //kobject_uevent( ,KOBJ_ADD);
-+      }
-+      if (pcfirq[0] & PCF50633_INT1_ADPREM) {
-+              /* Charger removed */
-+              DEBUGPC("ADPREM ");
-+              input_report_key(pcf->input_dev, KEY_BATTERY, 0);
-+              apm_queue_event(APM_POWER_STATUS_CHANGE);
-+              pcf->flags &= ~PCF50633_F_CHG_PRESENT;
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50633_FEAT_MBC, PMU_EVT_REMOVE);
-+              /* FIXME: signal this to userspace */
-+              //kobject_uevent( ,KOBJ_ADD);
-+      }
-+      if (pcfirq[0] & PCF50633_INT1_USBINS) {
-+              DEBUGPC("USBINS ");
-+              input_report_key(pcf->input_dev, KEY_POWER2, 1);
-+              apm_queue_event(APM_POWER_STATUS_CHANGE);
-+              pcf->flags |= PCF50633_F_USB_PRESENT;
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50633_FEAT_MBC, PMU_EVT_USB_INSERT);
-+              /* completion irq will figure out our charging stance */
-+              add_request_to_adc_queue(pcf, PCF50633_ADCC1_MUX_ADCIN1,
-+                                   PCF50633_ADCC1_AVERAGE_16);
-+      }
-+      if (pcfirq[0] & PCF50633_INT1_USBREM) {
-+              DEBUGPC("USBREM ");
-+              /* only deal if we had understood it was in */
-+              if (pcf->flags & PCF50633_F_USB_PRESENT) {
-+                      input_report_key(pcf->input_dev, KEY_POWER2, 0);
-+                      apm_queue_event(APM_POWER_STATUS_CHANGE);
-+                      pcf->flags &= ~PCF50633_F_USB_PRESENT;
-+                      if (pcf->pdata->cb)
-+                              pcf->pdata->cb(&pcf->client.dev,
-+                                      PCF50633_FEAT_MBC, PMU_EVT_USB_REMOVE);
-+                      /* completion irq will figure out our charging stance */
-+                      add_request_to_adc_queue(pcf, PCF50633_ADCC1_MUX_ADCIN1,
-+                                      PCF50633_ADCC1_AVERAGE_16);
-+              }
-+      }
-+      if (pcfirq[0] & PCF50633_INT1_ALARM) {
-+              DEBUGPC("ALARM ");
-+              if (pcf->pdata->used_features & PCF50633_FEAT_RTC)
-+                      rtc_update_irq(pcf->rtc, 1, RTC_AF | RTC_IRQF);
-+      }
-+      if (pcfirq[0] & PCF50633_INT1_SECOND) {
-+              DEBUGPC("SECOND ");
-+              if (pcf->flags & PCF50633_F_RTC_SECOND)
-+                      rtc_update_irq(pcf->rtc, 1, RTC_PF | RTC_IRQF);
-+
-+              if (pcf->onkey_seconds >= 0 &&
-+                  pcf->flags & PCF50633_F_PWR_PRESSED) {
-+                      DEBUGP("ONKEY_SECONDS(%u, OOCSTAT=0x%02x) ",
-+                              pcf->onkey_seconds,
-+                              reg_read(pcf, PCF50633_REG_OOCSTAT));
-+                      pcf->onkey_seconds++;
-+                      if (pcf->onkey_seconds >=
-+                          pcf->pdata->onkey_seconds_sig_init) {
-+                              /* Ask init to do 'ctrlaltdel' */
-+                              DEBUGPC("SIGINT(init) ");
-+                              kill_proc(1, SIGINT, 1);
-+                              /* FIXME: what if userspace doesn't shut down? */
-+                      }
-+                      if (pcf->onkey_seconds >=
-+                              pcf->pdata->onkey_seconds_shutdown) {
-+                              DEBUGPC("Power Off ");
-+                              pcf50633_go_standby();
-+                      }
-+              }
-+      }
-+
-+      if (pcfirq[1] & PCF50633_INT2_ONKEYF) {
-+              /* ONKEY falling edge (start of button press) */
-+              DEBUGPC("ONKEYF ");
-+              pcf->flags |= PCF50633_F_PWR_PRESSED;
-+              input_report_key(pcf->input_dev, KEY_POWER, 1);
-+      }
-+      if (pcfirq[1] & PCF50633_INT2_ONKEYR) {
-+              /* ONKEY rising edge (end of button press) */
-+              DEBUGPC("ONKEYR ");
-+              pcf->flags &= ~PCF50633_F_PWR_PRESSED;
-+              pcf->onkey_seconds = -1;
-+              input_report_key(pcf->input_dev, KEY_POWER, 0);
-+              /* disable SECOND interrupt in case RTC didn't
-+               * request it */
-+              if (!(pcf->flags & PCF50633_F_RTC_SECOND))
-+                      reg_set_bit_mask(pcf, PCF50633_REG_INT1M,
-+                                       PCF50633_INT1_SECOND,
-+                                       PCF50633_INT1_SECOND);
-+      }
-+      /* FIXME: we don't use EXTON1/2/3. thats why we skip it */
-+
-+      if (pcfirq[2] & PCF50633_INT3_BATFULL) {
-+              DEBUGPC("BATFULL ");
-+              /* FIXME: signal this to userspace */
-+      }
-+      if (pcfirq[2] & PCF50633_INT3_CHGHALT) {
-+              DEBUGPC("CHGHALT ");
-+              /*
-+               * this is really "battery not pulling current" -- it can
-+               * appear with no battery attached
-+               */
-+              /* FIXME: signal this to userspace */
-+      }
-+      if (pcfirq[2] & PCF50633_INT3_THLIMON) {
-+              DEBUGPC("THLIMON ");
-+              pcf->flags |= PCF50633_F_CHG_PROT;
-+              /* FIXME: signal this to userspace */
-+      }
-+      if (pcfirq[2] & PCF50633_INT3_THLIMOFF) {
-+              DEBUGPC("THLIMOFF ");
-+              pcf->flags &= ~PCF50633_F_CHG_PROT;
-+              /* FIXME: signal this to userspace */
-+      }
-+      if (pcfirq[2] & PCF50633_INT3_USBLIMON) {
-+              DEBUGPC("USBLIMON ");
-+              /* FIXME: signal this to userspace */
-+      }
-+      if (pcfirq[2] & PCF50633_INT3_USBLIMOFF) {
-+              DEBUGPC("USBLIMOFF ");
-+              /* FIXME: signal this to userspace */
-+      }
-+      if (pcfirq[2] & PCF50633_INT3_ADCRDY) {
-+              /* ADC result ready */
-+              DEBUGPC("ADCRDY ");
-+              tail = pcf->adc_queue_tail;
-+              pcf->adc_queue_tail = (pcf->adc_queue_tail + 1) &
-+                                    (MAX_ADC_FIFO_DEPTH - 1);
-+
-+              switch (pcf->adc_queue_mux[tail]) {
-+              case PCF50633_ADCC1_MUX_BATSNS_RES: /* battery voltage */
-+                      pcf->flag_bat_voltage_read =
-+                                                async_adc_complete(pcf);
-+                      break;
-+              case PCF50633_ADCC1_MUX_ADCIN1: /* charger type */
-+                      pcf->charger_adc_result_raw = async_adc_complete(pcf);
-+                      pcf->charger_type = interpret_charger_type_from_adc(
-+                                           pcf, pcf->charger_adc_result_raw);
-+                      configure_pmu_for_charger(pcf, pcf->charger_type);
-+                      break;
-+              default:
-+                      async_adc_complete(pcf);
-+                      break;
-+              }
-+              trigger_next_adc_job_if_any(pcf);
-+      }
-+      if (pcfirq[2] & PCF50633_INT3_ONKEY1S) {
-+              /* ONKEY pressed for more than 1 second */
-+              pcf->onkey_seconds = 0;
-+              DEBUGPC("ONKEY1S ");
-+              /* Tell PMU we are taking care of this */
-+              reg_set_bit_mask(pcf, PCF50633_REG_OOCSHDWN,
-+                               PCF50633_OOCSHDWN_TOTRST,
-+                               PCF50633_OOCSHDWN_TOTRST);
-+              /* enable SECOND interrupt (hz tick) */
-+              reg_clear_bits(pcf, PCF50633_REG_INT1M, PCF50633_INT1_SECOND);
-+      }
-+
-+      if (pcfirq[3] & (PCF50633_INT4_LOWBAT|PCF50633_INT4_LOWSYS)) {
-+              /* Really low battery voltage, we have 8 seconds left */
-+              DEBUGPC("LOWBAT ");
-+              apm_queue_event(APM_LOW_BATTERY);
-+              DEBUGPC("SIGPWR(init) ");
-+              kill_proc(1, SIGPWR, 1);
-+              /* Tell PMU we are taking care of this */
-+              reg_set_bit_mask(pcf, PCF50633_REG_OOCSHDWN,
-+                               PCF50633_OOCSHDWN_TOTRST,
-+                               PCF50633_OOCSHDWN_TOTRST);
-+      }
-+      if (pcfirq[3] & PCF50633_INT4_HIGHTMP) {
-+              /* High temperature */
-+              DEBUGPC("HIGHTMP ");
-+              apm_queue_event(APM_CRITICAL_SUSPEND);
-+      }
-+      if (pcfirq[3] & PCF50633_INT4_AUTOPWRFAIL) {
-+              DEBUGPC("PCF50633_INT4_AUTOPWRFAIL ");
-+              /* FIXME: deal with this */
-+      }
-+      if (pcfirq[3] & PCF50633_INT4_DWN1PWRFAIL) {
-+              DEBUGPC("PCF50633_INT4_DWN1PWRFAIL ");
-+              /* FIXME: deal with this */
-+      }
-+      if (pcfirq[3] & PCF50633_INT4_DWN2PWRFAIL) {
-+              DEBUGPC("PCF50633_INT4_DWN2PWRFAIL ");
-+              /* FIXME: deal with this */
-+      }
-+      if (pcfirq[3] & PCF50633_INT4_LEDPWRFAIL) {
-+              DEBUGPC("PCF50633_INT4_LEDPWRFAIL ");
-+              /* FIXME: deal with this */
-+      }
-+      if (pcfirq[3] & PCF50633_INT4_LEDOVP) {
-+              DEBUGPC("PCF50633_INT4_LEDOVP ");
-+              /* FIXME: deal with this */
-+      }
-+
-+      DEBUGPC("\n");
-+
-+      pcf->working = 0;
-+      input_sync(pcf->input_dev);
-+      put_device(&pcf->client.dev);
-+      mutex_unlock(&pcf->working_lock);
-+}
-+
-+static irqreturn_t pcf50633_irq(int irq, void *_pcf)
-+{
-+      struct pcf50633_data *pcf = _pcf;
-+
-+      DEBUGP("entering(irq=%u, pcf=%p): scheduling work\n", irq, _pcf);
-+
-+      get_device(&pcf->client.dev);
-+      if (!schedule_work(&pcf->work) && !pcf->working)
-+              dev_dbg(&pcf->client.dev, "work item may be lost\n");
-+
-+      return IRQ_HANDLED;
-+}
-+
-+static u_int16_t adc_to_batt_millivolts(u_int16_t adc)
-+{
-+      u_int16_t mvolts;
-+
-+      mvolts = (adc * 6000) / 1024;
-+
-+      return mvolts;
-+}
-+
-+#define BATTVOLT_SCALE_START 2800
-+#define BATTVOLT_SCALE_END 4200
-+#define BATTVOLT_SCALE_DIVIDER ((BATTVOLT_SCALE_END - BATTVOLT_SCALE_START)/100)
-+
-+static u_int8_t battvolt_scale(u_int16_t battvolt)
-+{
-+      /* FIXME: this linear scale is completely bogus */
-+      u_int16_t battvolt_relative = battvolt - BATTVOLT_SCALE_START;
-+      unsigned int percent = battvolt_relative / BATTVOLT_SCALE_DIVIDER;
-+
-+      return percent;
-+}
-+
-+u_int16_t pcf50633_battvolt(struct pcf50633_data *pcf)
-+{
-+      int count = 10;
-+
-+      pcf->flag_bat_voltage_read = -1;
-+      add_request_to_adc_queue(pcf, PCF50633_ADCC1_MUX_BATSNS_RES,
-+                                    PCF50633_ADCC1_AVERAGE_16);
-+
-+      while ((count--) && (pcf->flag_bat_voltage_read < 0))
-+              msleep(1);
-+
-+      if (count < 0) { /* timeout somehow */
-+              DEBUGPC("pcf50633_battvolt timeout :-(\n");
-+              return -1;
-+      }
-+
-+      return adc_to_batt_millivolts(pcf->flag_bat_voltage_read);
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_battvolt);
-+
-+static ssize_t show_battvolt(struct device *dev, struct device_attribute *attr,
-+                           char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+
-+      return sprintf(buf, "%u\n", pcf50633_battvolt(pcf));
-+}
-+static DEVICE_ATTR(battvolt, S_IRUGO | S_IWUSR, show_battvolt, NULL);
-+
-+static int reg_id_by_name(const char *name)
-+{
-+      int reg_id;
-+
-+      if (!strcmp(name, "voltage_auto"))
-+              reg_id = PCF50633_REGULATOR_AUTO;
-+      else if (!strcmp(name, "voltage_down1"))
-+              reg_id = PCF50633_REGULATOR_DOWN1;
-+      else if (!strcmp(name, "voltage_down2"))
-+              reg_id = PCF50633_REGULATOR_DOWN2;
-+      else if (!strcmp(name, "voltage_memldo"))
-+              reg_id = PCF50633_REGULATOR_MEMLDO;
-+      else if (!strcmp(name, "voltage_ldo1"))
-+              reg_id = PCF50633_REGULATOR_LDO1;
-+      else if (!strcmp(name, "voltage_ldo2"))
-+              reg_id = PCF50633_REGULATOR_LDO2;
-+      else if (!strcmp(name, "voltage_ldo3"))
-+              reg_id = PCF50633_REGULATOR_LDO3;
-+      else if (!strcmp(name, "voltage_ldo4"))
-+              reg_id = PCF50633_REGULATOR_LDO4;
-+      else if (!strcmp(name, "voltage_ldo5"))
-+              reg_id = PCF50633_REGULATOR_LDO5;
-+      else if (!strcmp(name, "voltage_ldo6"))
-+              reg_id = PCF50633_REGULATOR_LDO6;
-+      else if (!strcmp(name, "voltage_hcldo"))
-+              reg_id = PCF50633_REGULATOR_HCLDO;
-+      else
-+              reg_id = -1;
-+
-+      return reg_id;
-+}
-+
-+static ssize_t show_vreg(struct device *dev, struct device_attribute *attr,
-+                       char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      unsigned int reg_id;
-+
-+      reg_id = reg_id_by_name(attr->attr.name);
-+      if (reg_id < 0)
-+              return 0;
-+
-+      if (pcf50633_onoff_get(pcf, reg_id) > 0)
-+              return sprintf(buf, "%u\n", pcf50633_voltage_get(pcf, reg_id));
-+      else
-+              return strlcpy(buf, "0\n", PAGE_SIZE);
-+}
-+
-+static ssize_t set_vreg(struct device *dev, struct device_attribute *attr,
-+                      const char *buf, size_t count)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      unsigned long mvolts = simple_strtoul(buf, NULL, 10);
-+      unsigned int reg_id;
-+
-+      reg_id = reg_id_by_name(attr->attr.name);
-+      if (reg_id < 0)
-+              return -EIO;
-+
-+      DEBUGP("attempting to set %s(%d) to %lu mvolts\n", attr->attr.name,
-+              reg_id, mvolts);
-+
-+      if (mvolts == 0) {
-+              pcf50633_onoff_set(pcf, reg_id, 0);
-+      } else {
-+              if (pcf50633_voltage_set(pcf, reg_id, mvolts) < 0) {
-+                      dev_warn(dev, "refusing to set %s(%d) to %lu mvolts "
-+                               "(max=%u)\n", attr->attr.name, reg_id, mvolts,
-+                               pcf->pdata->rails[reg_id].voltage.max);
-+                      return -EINVAL;
-+              }
-+              pcf50633_onoff_set(pcf, reg_id, 1);
-+      }
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(voltage_auto, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_down1, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_down2, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_memldo, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_ldo1, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_ldo2, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_ldo3, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_ldo4, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_ldo5, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_ldo6, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+static DEVICE_ATTR(voltage_hcldo, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-+
-+/***********************************************************************
-+ * Charger Control
-+ ***********************************************************************/
-+
-+/* Set maximum USB current limit */
-+void pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma)
-+{
-+      u_int8_t bits;
-+
-+      dev_dbg(&pcf->client.dev, "setting usb current limit to %d ma", ma);
-+
-+      if (ma >= 1000)
-+              bits = PCF50633_MBCC7_USB_1000mA;
-+      else if (ma >= 500)
-+              bits = PCF50633_MBCC7_USB_500mA;
-+      else if (ma >= 100)
-+              bits = PCF50633_MBCC7_USB_100mA;
-+      else
-+              bits = PCF50633_MBCC7_USB_SUSPEND;
-+
-+      reg_set_bit_mask(pcf, PCF50633_REG_MBCC7, PCF56033_MBCC7_USB_MASK,
-+                       bits);
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_usb_curlim_set);
-+
-+static ssize_t show_usblim(struct device *dev, struct device_attribute *attr,
-+                         char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      u_int8_t usblim = reg_read(pcf, PCF50633_REG_MBCC7) &
-+                                              PCF56033_MBCC7_USB_MASK;
-+      unsigned int ma;
-+
-+      if (usblim == PCF50633_MBCC7_USB_1000mA)
-+              ma = 1000;
-+      else if (usblim == PCF50633_MBCC7_USB_500mA)
-+              ma = 500;
-+      else if (usblim == PCF50633_MBCC7_USB_100mA)
-+              ma = 100;
-+      else
-+              ma = 0;
-+
-+      return sprintf(buf, "%u\n", ma);
-+}
-+static DEVICE_ATTR(usb_curlim, S_IRUGO | S_IWUSR, show_usblim, NULL);
-+
-+/* Enable/disable charging */
-+void pcf50633_charge_enable(struct pcf50633_data *pcf, int on)
-+{
-+      u_int8_t bits;
-+
-+      if (!(pcf->pdata->used_features & PCF50633_FEAT_MBC))
-+              return;
-+
-+      if (on) {
-+              pcf->flags |= PCF50633_F_CHG_ENABLED;
-+              bits = PCF50633_MBCC1_CHGENA;
-+      } else {
-+              pcf->flags &= ~PCF50633_F_CHG_ENABLED;
-+              bits = 0;
-+      }
-+      reg_set_bit_mask(pcf, PCF50633_REG_MBCC1, PCF50633_MBCC1_CHGENA,
-+                       bits);
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_charge_enable);
-+
-+#if 0
-+#define ONE                   1000000
-+static u_int16_t adc_to_rntc(struct pcf50633_data *pcf, u_int16_t adc)
-+{
-+      u_int32_t r_batt = (adc * pcf->pdata->r_fix_batt) / (1023 - adc);
-+      u_int16_t r_ntc;
-+
-+      /* The battery NTC has a parallell 10kOhms resistor */
-+      r_ntc = ONE / ((ONE/r_batt) - (ONE/pcf->pdata->r_fix_batt_par));
-+
-+      return r_ntc;
-+}
-+#endif
-+static ssize_t show_battemp(struct device *dev, struct device_attribute *attr,
-+                          char *buf)
-+{
-+      return sprintf(buf, "\n");
-+}
-+static DEVICE_ATTR(battemp, S_IRUGO | S_IWUSR, show_battemp, NULL);
-+#if 0
-+static u_int16_t adc_to_chg_milliamps(struct pcf50633_data *pcf,
-+                                           u_int16_t adc_adcin1,
-+                                           u_int16_t adc_batvolt)
-+{
-+      u_int32_t res = ((adc_adcin1 - adc_batvolt) * 6000);
-+      return res / (pcf->pdata->r_sense_milli * 1024 / 1000);
-+}
-+#endif
-+static ssize_t show_chgcur(struct device *dev, struct device_attribute *attr,
-+                         char *buf)
-+{
-+      return sprintf(buf, "\n");
-+}
-+static DEVICE_ATTR(chgcur, S_IRUGO | S_IWUSR, show_chgcur, NULL);
-+
-+static const char *chgmode_names[] = {
-+      [PCF50633_MBCS2_MBC_PLAY]               = "play-only",
-+      [PCF50633_MBCS2_MBC_USB_PRE]            = "pre",
-+      [PCF50633_MBCS2_MBC_ADP_PRE]            = "pre",
-+      [PCF50633_MBCS2_MBC_USB_PRE_WAIT]       = "pre-wait",
-+      [PCF50633_MBCS2_MBC_ADP_PRE_WAIT]       = "pre-wait",
-+      [PCF50633_MBCS2_MBC_USB_FAST]           = "fast",
-+      [PCF50633_MBCS2_MBC_ADP_FAST]           = "fast",
-+      [PCF50633_MBCS2_MBC_USB_FAST_WAIT]      = "fast-wait",
-+      [PCF50633_MBCS2_MBC_ADP_FAST_WAIT]      = "fast-wait",
-+      [PCF50633_MBCS2_MBC_ADP_FAST_WAIT]      = "bat-full",
-+};
-+
-+static ssize_t show_chgmode(struct device *dev, struct device_attribute *attr,
-+                          char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      u_int8_t mbcs2 = reg_read(pcf, PCF50633_REG_MBCS2);
-+      u_int8_t chgmod = (mbcs2 & PCF50633_MBCS2_MBC_MASK);
-+
-+      return sprintf(buf, "%s\n", chgmode_names[chgmod]);
-+}
-+
-+static ssize_t set_chgmode(struct device *dev, struct device_attribute *attr,
-+                         const char *buf, size_t count)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+
-+      /* As opposed to the PCF50606, we can only enable or disable
-+       * charging and not directly jump into a certain mode! */
-+
-+      if (!strcmp(buf, "0\n"))
-+              pcf50633_charge_enable(pcf, 0);
-+      else
-+              pcf50633_charge_enable(pcf, 1);
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(chgmode, S_IRUGO | S_IWUSR, show_chgmode, set_chgmode);
-+
-+static const char *chgstate_names[] = {
-+      [PCF50633_FIDX_CHG_ENABLED]             = "enabled",
-+      [PCF50633_FIDX_CHG_PRESENT]             = "charger_present",
-+      [PCF50633_FIDX_USB_PRESENT]             = "usb_present",
-+      [PCF50633_FIDX_CHG_ERR]                 = "error",
-+      [PCF50633_FIDX_CHG_PROT]                = "protection",
-+      [PCF50633_FIDX_CHG_READY]               = "ready",
-+};
-+
-+static ssize_t show_chgstate(struct device *dev, struct device_attribute *attr,
-+                          char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+
-+      char *b = buf;
-+      int i;
-+
-+      for (i = 0; i < 32; i++)
-+              if (pcf->flags & (1 << i) && i < ARRAY_SIZE(chgstate_names))
-+                      b += sprintf(b, "%s ", chgstate_names[i]);
-+
-+      if (b > buf)
-+              b += sprintf(b, "\n");
-+
-+      return b - buf;
-+}
-+static DEVICE_ATTR(chgstate, S_IRUGO | S_IWUSR, show_chgstate, NULL);
-+
-+/***********************************************************************
-+ * APM emulation
-+ ***********************************************************************/
-+
-+extern void (*apm_get_power_status)(struct apm_power_info *);
-+
-+static void pcf50633_get_power_status(struct apm_power_info *info)
-+{
-+        struct pcf50633_data *pcf = pcf50633_global;
-+      u_int8_t chgmod = reg_read(pcf, PCF50633_REG_MBCS2) &
-+                                 PCF50633_MBCS2_MBC_MASK;
-+
-+      u_int16_t battvolt = pcf50633_battvolt(pcf);
-+
-+      if (reg_read(pcf, PCF50633_REG_MBCS1) &
-+                      (PCF50633_MBCS1_USBPRES|PCF50633_MBCS1_ADAPTPRES))
-+              info->ac_line_status = APM_AC_ONLINE;
-+      else
-+              info->ac_line_status = APM_AC_OFFLINE;
-+
-+      switch (chgmod) {
-+      case PCF50633_MBCS2_MBC_PLAY:
-+      case PCF50633_MBCS2_MBC_USB_PRE:
-+      case PCF50633_MBCS2_MBC_USB_PRE_WAIT:
-+      case PCF50633_MBCS2_MBC_USB_FAST_WAIT:
-+      case PCF50633_MBCS2_MBC_ADP_PRE:
-+      case PCF50633_MBCS2_MBC_ADP_PRE_WAIT:
-+      case PCF50633_MBCS2_MBC_ADP_FAST_WAIT:
-+      case PCF50633_MBCS2_MBC_BAT_FULL:
-+      case PCF50633_MBCS2_MBC_HALT:
-+              info->battery_life = battvolt_scale(battvolt);
-+              break;
-+      case PCF50633_MBCS2_MBC_USB_FAST:
-+      case PCF50633_MBCS2_MBC_ADP_FAST:
-+              info->battery_status = APM_BATTERY_STATUS_CHARGING;
-+              info->battery_flag = APM_BATTERY_FLAG_CHARGING;
-+      default:
-+              break;
-+      }
-+}
-+
-+/***********************************************************************
-+ * RTC
-+ ***********************************************************************/
-+
-+struct pcf50633_time {
-+      u_int8_t sec;
-+      u_int8_t min;
-+      u_int8_t hour;
-+      u_int8_t wkday;
-+      u_int8_t day;
-+      u_int8_t month;
-+      u_int8_t year;
-+};
-+
-+static void pcf2rtc_time(struct rtc_time *rtc, struct pcf50633_time *pcf)
-+{
-+      rtc->tm_sec = BCD2BIN(pcf->sec);
-+      rtc->tm_min = BCD2BIN(pcf->min);
-+      rtc->tm_hour = BCD2BIN(pcf->hour);
-+      rtc->tm_wday = BCD2BIN(pcf->wkday);
-+      rtc->tm_mday = BCD2BIN(pcf->day);
-+      rtc->tm_mon = BCD2BIN(pcf->month);
-+      rtc->tm_year = BCD2BIN(pcf->year) + 100;
-+}
-+
-+static void rtc2pcf_time(struct pcf50633_time *pcf, struct rtc_time *rtc)
-+{
-+      pcf->sec = BIN2BCD(rtc->tm_sec);
-+      pcf->min = BIN2BCD(rtc->tm_min);
-+      pcf->hour = BIN2BCD(rtc->tm_hour);
-+      pcf->wkday = BIN2BCD(rtc->tm_wday);
-+      pcf->day = BIN2BCD(rtc->tm_mday);
-+      pcf->month = BIN2BCD(rtc->tm_mon);
-+      pcf->year = BIN2BCD(rtc->tm_year - 100);
-+}
-+
-+static int pcf50633_rtc_ioctl(struct device *dev, unsigned int cmd,
-+                            unsigned long arg)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      switch (cmd) {
-+      case RTC_PIE_OFF:
-+              /* disable periodic interrupt (hz tick) */
-+              pcf->flags &= ~PCF50633_F_RTC_SECOND;
-+              reg_set_bit_mask(pcf, PCF50633_REG_INT1M,
-+                               PCF50633_INT1_SECOND, PCF50633_INT1_SECOND);
-+              return 0;
-+      case RTC_PIE_ON:
-+              /* ensable periodic interrupt (hz tick) */
-+              pcf->flags |= PCF50633_F_RTC_SECOND;
-+              reg_clear_bits(pcf, PCF50633_REG_INT1M, PCF50633_INT1_SECOND);
-+              return 0;
-+      }
-+      return -ENOIOCTLCMD;
-+}
-+
-+static int pcf50633_rtc_read_time(struct device *dev, struct rtc_time *tm)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      struct pcf50633_time pcf_tm;
-+
-+      mutex_lock(&pcf->lock);
-+      pcf_tm.sec = __reg_read(pcf, PCF50633_REG_RTCSC);
-+      pcf_tm.min = __reg_read(pcf, PCF50633_REG_RTCMN);
-+      pcf_tm.hour = __reg_read(pcf, PCF50633_REG_RTCHR);
-+      pcf_tm.wkday = __reg_read(pcf, PCF50633_REG_RTCWD);
-+      pcf_tm.day = __reg_read(pcf, PCF50633_REG_RTCDT);
-+      pcf_tm.month = __reg_read(pcf, PCF50633_REG_RTCMT);
-+      pcf_tm.year = __reg_read(pcf, PCF50633_REG_RTCYR);
-+      mutex_unlock(&pcf->lock);
-+
-+      DEBUGP("PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
-+              pcf_tm.day, pcf_tm.month, pcf_tm.year,
-+              pcf_tm.hour, pcf_tm.min, pcf_tm.sec);
-+
-+      pcf2rtc_time(tm, &pcf_tm);
-+
-+      DEBUGP("RTC_TIME: %u.%u.%u %u:%u:%u\n",
-+              tm->tm_mday, tm->tm_mon, tm->tm_year,
-+              tm->tm_hour, tm->tm_min, tm->tm_sec);
-+
-+      return 0;
-+}
-+
-+static int pcf50633_rtc_set_time(struct device *dev, struct rtc_time *tm)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      struct pcf50633_time pcf_tm;
-+
-+      DEBUGP("RTC_TIME: %u.%u.%u %u:%u:%u\n",
-+              tm->tm_mday, tm->tm_mon, tm->tm_year,
-+              tm->tm_hour, tm->tm_min, tm->tm_sec);
-+      rtc2pcf_time(&pcf_tm, tm);
-+      DEBUGP("PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
-+              pcf_tm.day, pcf_tm.month, pcf_tm.year,
-+              pcf_tm.hour, pcf_tm.min, pcf_tm.sec);
-+
-+      mutex_lock(&pcf->lock);
-+      /* FIXME: disable second interrupt */
-+      __reg_write(pcf, PCF50633_REG_RTCSC, pcf_tm.sec);
-+      __reg_write(pcf, PCF50633_REG_RTCMN, pcf_tm.min);
-+      __reg_write(pcf, PCF50633_REG_RTCHR, pcf_tm.hour);
-+      __reg_write(pcf, PCF50633_REG_RTCWD, pcf_tm.wkday);
-+      __reg_write(pcf, PCF50633_REG_RTCDT, pcf_tm.day);
-+      __reg_write(pcf, PCF50633_REG_RTCMT, pcf_tm.month);
-+      __reg_write(pcf, PCF50633_REG_RTCYR, pcf_tm.year);
-+      /* FIXME: re-enable second interrupt */
-+      mutex_unlock(&pcf->lock);
-+
-+      return 0;
-+}
-+
-+static int pcf50633_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      struct pcf50633_time pcf_tm;
-+
-+      mutex_lock(&pcf->lock);
-+      alrm->enabled =
-+           __reg_read(pcf, PCF50633_REG_INT1M) & PCF50633_INT1_ALARM ? 0 : 1;
-+      pcf_tm.sec = __reg_read(pcf, PCF50633_REG_RTCSCA);
-+      pcf_tm.min = __reg_read(pcf, PCF50633_REG_RTCMNA);
-+      pcf_tm.hour = __reg_read(pcf, PCF50633_REG_RTCHRA);
-+      pcf_tm.wkday = __reg_read(pcf, PCF50633_REG_RTCWDA);
-+      pcf_tm.day = __reg_read(pcf, PCF50633_REG_RTCDTA);
-+      pcf_tm.month = __reg_read(pcf, PCF50633_REG_RTCMTA);
-+      pcf_tm.year = __reg_read(pcf, PCF50633_REG_RTCYRA);
-+      mutex_unlock(&pcf->lock);
-+
-+      pcf2rtc_time(&alrm->time, &pcf_tm);
-+
-+      return 0;
-+}
-+
-+static int pcf50633_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      struct pcf50633_time pcf_tm;
-+      u_int8_t irqmask;
-+
-+      rtc2pcf_time(&pcf_tm, &alrm->time);
-+
-+      mutex_lock(&pcf->lock);
-+
-+      /* disable alarm interrupt */
-+      irqmask = __reg_read(pcf, PCF50633_REG_INT1M);
-+      irqmask |= PCF50633_INT1_ALARM;
-+      __reg_write(pcf, PCF50633_REG_INT1M, irqmask);
-+
-+      __reg_write(pcf, PCF50633_REG_RTCSCA, pcf_tm.sec);
-+      __reg_write(pcf, PCF50633_REG_RTCMNA, pcf_tm.min);
-+      __reg_write(pcf, PCF50633_REG_RTCHRA, pcf_tm.hour);
-+      __reg_write(pcf, PCF50633_REG_RTCWDA, pcf_tm.wkday);
-+      __reg_write(pcf, PCF50633_REG_RTCDTA, pcf_tm.day);
-+      __reg_write(pcf, PCF50633_REG_RTCMTA, pcf_tm.month);
-+      __reg_write(pcf, PCF50633_REG_RTCYRA, pcf_tm.year);
-+
-+      if (alrm->enabled) {
-+              /* (re-)enaable alarm interrupt */
-+              irqmask = __reg_read(pcf, PCF50633_REG_INT1M);
-+              irqmask &= ~PCF50633_INT1_ALARM;
-+              __reg_write(pcf, PCF50633_REG_INT1M, irqmask);
-+      }
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      /* FIXME */
-+      return 0;
-+}
-+
-+static struct rtc_class_ops pcf50633_rtc_ops = {
-+      .ioctl          = pcf50633_rtc_ioctl,
-+      .read_time      = pcf50633_rtc_read_time,
-+      .set_time       = pcf50633_rtc_set_time,
-+      .read_alarm     = pcf50633_rtc_read_alarm,
-+      .set_alarm      = pcf50633_rtc_set_alarm,
-+};
-+
-+/***********************************************************************
-+ * Backlight device
-+ ***********************************************************************/
-+
-+static int pcf50633bl_get_intensity(struct backlight_device *bd)
-+{
-+      struct pcf50633_data *pcf = bl_get_data(bd);
-+      int intensity = reg_read(pcf, PCF50633_REG_LEDOUT);
-+
-+      return intensity & 0x3f;
-+}
-+
-+static int pcf50633bl_set_intensity(struct backlight_device *bd)
-+{
-+      struct pcf50633_data *pcf = bl_get_data(bd);
-+      int intensity = bd->props.brightness;
-+      int old_intensity = reg_read(pcf, PCF50633_REG_LEDOUT);
-+      u_int8_t ledena;
-+      int ret;
-+
-+      if (bd->props.power != FB_BLANK_UNBLANK)
-+              intensity = 0;
-+      if (bd->props.fb_blank != FB_BLANK_UNBLANK)
-+              intensity = 0;
-+
-+      /* The PCF50633 seems to have some kind of oddity (bug?) when
-+       * the intensity was 0, you need to completely switch it off
-+       * and re-enable it, before it produces any output voltage again */
-+
-+      if (intensity != 0 && old_intensity == 0) {
-+              ledena = reg_read(pcf, PCF50633_REG_LEDENA);
-+              reg_write(pcf, PCF50633_REG_LEDENA, 0x00);
-+      }
-+
-+      ret = reg_set_bit_mask(pcf, PCF50633_REG_LEDOUT, 0x3f,
-+                             intensity);
-+
-+      if (intensity != 0 && old_intensity == 0)
-+              reg_write(pcf, PCF50633_REG_LEDENA, ledena);
-+
-+      return ret;
-+}
-+
-+static struct backlight_ops pcf50633bl_ops = {
-+      .get_brightness = pcf50633bl_get_intensity,
-+      .update_status  = pcf50633bl_set_intensity,
-+};
-+
-+/*
-+ * Charger type
-+ */
-+
-+static ssize_t show_charger_type(struct device *dev,
-+                               struct device_attribute *attr, char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      static const char *names_charger_type[] = {
-+              [CHARGER_TYPE_NONE]     = "none",
-+              [CHARGER_TYPE_HOSTUSB]  = "host/500mA usb",
-+              [CHARGER_TYPE_1A]       = "charger 1A",
-+      };
-+      static const char *names_charger_modes[] = {
-+              [PCF50633_MBCC7_USB_1000mA]     = "1A",
-+              [PCF50633_MBCC7_USB_500mA]      = "500mA",
-+              [PCF50633_MBCC7_USB_100mA]      = "100mA",
-+              [PCF50633_MBCC7_USB_SUSPEND]    = "suspend",
-+      };
-+      int mode = reg_read(pcf, PCF50633_REG_MBCC7) & PCF56033_MBCC7_USB_MASK;
-+
-+      return sprintf(buf, "%s mode %s\n",
-+                          names_charger_type[pcf->charger_type],
-+                          names_charger_modes[mode]);
-+}
-+
-+static DEVICE_ATTR(charger_type, 0444, show_charger_type, NULL);
-+
-+/*
-+ * Charger adc
-+ */
-+
-+static ssize_t show_charger_adc(struct device *dev,
-+                              struct device_attribute *attr, char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+
-+      return sprintf(buf, "%d\n", pcf->charger_adc_result_raw);
-+}
-+
-+static DEVICE_ATTR(charger_adc, 0444, show_charger_adc, NULL);
-+
-+/*
-+ * Dump regs
-+ */
-+
-+static ssize_t show_dump_regs(struct device *dev, struct device_attribute *attr,
-+                          char *buf)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      u8 dump[16];
-+      int n, n1, idx = 0;
-+      char *buf1 = buf;
-+      static u8 address_no_read[] = { /* must be ascending */
-+              PCF50633_REG_INT1,
-+              PCF50633_REG_INT2,
-+              PCF50633_REG_INT3,
-+              PCF50633_REG_INT4,
-+              PCF50633_REG_INT5,
-+              0 /* terminator */
-+      };
-+
-+      for (n = 0; n < 256; n += sizeof(dump)) {
-+
-+              for (n1 = 0; n1 < sizeof(dump); n1++)
-+                      if (n == address_no_read[idx]) {
-+                              idx++;
-+                              dump[n1] = 0x00;
-+                      } else
-+                              dump[n1] = reg_read(pcf, n + n1);
-+
-+              hex_dump_to_buffer(dump, sizeof(dump), 16, 1, buf1, 128, 0);
-+              buf1 += strlen(buf1);
-+              *buf1++ = '\n';
-+              *buf1 = '\0';
-+      }
-+
-+      return buf1 - buf;
-+}
-+
-+static DEVICE_ATTR(dump_regs, 0400, show_dump_regs, NULL);
-+
-+
-+/***********************************************************************
-+ * Driver initialization
-+ ***********************************************************************/
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+/* We currently place those platform devices here to make sure the device
-+ * suspend/resume order is correct */
-+static struct platform_device gta01_pm_gps_dev = {
-+      .name           = "neo1973-pm-gps",
-+};
-+
-+static struct platform_device gta01_pm_bt_dev = {
-+      .name           = "neo1973-pm-bt",
-+};
-+#endif
-+
-+/*
-+ * CARE!  This table is modified at runtime!
-+ */
-+static struct attribute *pcf_sysfs_entries[] = {
-+      &dev_attr_voltage_auto.attr,
-+      &dev_attr_voltage_down1.attr,
-+      &dev_attr_voltage_down2.attr,
-+      &dev_attr_voltage_memldo.attr,
-+      &dev_attr_voltage_ldo1.attr,
-+      &dev_attr_voltage_ldo2.attr,
-+      &dev_attr_voltage_ldo3.attr,
-+      &dev_attr_voltage_ldo4.attr,
-+      &dev_attr_voltage_ldo5.attr,
-+      &dev_attr_voltage_ldo6.attr,
-+      &dev_attr_voltage_hcldo.attr,
-+      &dev_attr_charger_type.attr,
-+      &dev_attr_charger_adc.attr,
-+      &dev_attr_dump_regs.attr,
-+      NULL, /* going to add things at this point! */
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+};
-+
-+static struct attribute_group pcf_attr_group = {
-+      .name   = NULL,                 /* put in device directory */
-+      .attrs  = pcf_sysfs_entries,
-+};
-+
-+static void populate_sysfs_group(struct pcf50633_data *pcf)
-+{
-+      int i = 0;
-+      struct attribute **attr;
-+
-+      for (attr = pcf_sysfs_entries; *attr; attr++)
-+              i++;
-+
-+      if (pcf->pdata->used_features & PCF50633_FEAT_MBC) {
-+              pcf_sysfs_entries[i++] = &dev_attr_chgstate.attr;
-+              pcf_sysfs_entries[i++] = &dev_attr_chgmode.attr;
-+              pcf_sysfs_entries[i++] = &dev_attr_usb_curlim.attr;
-+      }
-+
-+      if (pcf->pdata->used_features & PCF50633_FEAT_CHGCUR)
-+              pcf_sysfs_entries[i++] = &dev_attr_chgcur.attr;
-+
-+      if (pcf->pdata->used_features & PCF50633_FEAT_BATVOLT)
-+              pcf_sysfs_entries[i++] = &dev_attr_battvolt.attr;
-+
-+      if (pcf->pdata->used_features & PCF50633_FEAT_BATTEMP)
-+              pcf_sysfs_entries[i++] = &dev_attr_battemp.attr;
-+
-+}
-+
-+static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-+{
-+      struct i2c_client *new_client;
-+      struct pcf50633_data *data;
-+      int err = 0;
-+      int irq;
-+
-+      DEBUGP("entering\n");
-+      if (!pcf50633_pdev) {
-+              printk(KERN_ERR "pcf50633: driver needs a platform_device!\n");
-+              return -EIO;
-+      }
-+
-+      irq = platform_get_irq(pcf50633_pdev, 0);
-+      if (irq < 0) {
-+              dev_err(&pcf50633_pdev->dev, "no irq in platform resources!\n");
-+              return -EIO;
-+      }
-+
-+      /* At the moment, we only support one PCF50633 in a system */
-+      if (pcf50633_global) {
-+              dev_err(&pcf50633_pdev->dev,
-+                      "currently only one chip supported\n");
-+              return -EBUSY;
-+      }
-+
-+      if (!(data = kzalloc(sizeof(*data), GFP_KERNEL)))
-+              return -ENOMEM;
-+
-+      mutex_init(&data->lock);
-+      mutex_init(&data->working_lock);
-+      INIT_WORK(&data->work, pcf50633_work);
-+      data->irq = irq;
-+      data->working = 0;
-+      data->onkey_seconds = -1;
-+      data->pdata = pcf50633_pdev->dev.platform_data;
-+
-+      new_client = &data->client;
-+      i2c_set_clientdata(new_client, data);
-+      new_client->addr = address;
-+      new_client->adapter = adapter;
-+      new_client->driver = &pcf50633_driver;
-+      new_client->flags = 0;
-+      strlcpy(new_client->name, "pcf50633", I2C_NAME_SIZE);
-+
-+      /* now we try to detect the chip */
-+
-+      /* register with i2c core */
-+      if ((err = i2c_attach_client(new_client))) {
-+              dev_err(&new_client->dev,
-+                      "error during i2c_attach_client()\n");
-+              goto exit_free;
-+      }
-+
-+      pcf50633_global = data;
-+
-+      populate_sysfs_group(data);
-+
-+      err = sysfs_create_group(&new_client->dev.kobj, &pcf_attr_group);
-+      if (err) {
-+              dev_err(&new_client->dev, "error creating sysfs group\n");
-+              goto exit_detach;
-+      }
-+
-+      /* create virtual charger 'device' */
-+
-+      /* register power off handler with core power management */
-+      pm_power_off = &pcf50633_go_standby;
-+
-+      data->input_dev = input_allocate_device();
-+      if (!data->input_dev)
-+              goto exit_sysfs;
-+
-+      data->input_dev->name = "GTA02 PMU events";
-+      data->input_dev->phys = "FIXME";
-+      data->input_dev->id.bustype = BUS_I2C;
-+      data->input_dev->cdev.dev = &new_client->dev;
-+
-+      data->input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_PWR);
-+      set_bit(KEY_POWER, data->input_dev->keybit);
-+      set_bit(KEY_POWER2, data->input_dev->keybit);
-+      set_bit(KEY_BATTERY, data->input_dev->keybit);
-+
-+      err = input_register_device(data->input_dev);
-+      if (err)
-+              goto exit_sysfs;
-+
-+      /* configure interrupt mask */
-+      reg_write(data, PCF50633_REG_INT1M, 0x00); /* we want SECOND to kick */
-+      reg_write(data, PCF50633_REG_INT2M, 0x00);
-+      reg_write(data, PCF50633_REG_INT3M, 0x00);
-+      reg_write(data, PCF50633_REG_INT4M, 0x00);
-+      reg_write(data, PCF50633_REG_INT5M, 0x00);
-+
-+      err = request_irq(irq, pcf50633_irq, IRQF_TRIGGER_FALLING,
-+                        "pcf50633", data);
-+      if (err < 0)
-+              goto exit_input;
-+
-+      if (enable_irq_wake(irq) < 0)
-+              dev_err(&new_client->dev, "IRQ %u cannot be enabled as wake-up"
-+                      "source in this hardware revision!", irq);
-+
-+      if (data->pdata->used_features & PCF50633_FEAT_RTC) {
-+              data->rtc = rtc_device_register("pcf50633", &new_client->dev,
-+                                              &pcf50633_rtc_ops, THIS_MODULE);
-+              if (IS_ERR(data->rtc)) {
-+                      err = PTR_ERR(data->rtc);
-+                      goto exit_irq;
-+              }
-+      }
-+
-+      if (data->pdata->used_features & PCF50633_FEAT_PWM_BL) {
-+              data->backlight = backlight_device_register("pcf50633-bl",
-+                                                          &new_client->dev,
-+                                                          data,
-+                                                          &pcf50633bl_ops);
-+              if (!data->backlight)
-+                      goto exit_rtc;
-+              /* FIXME: are we sure we want default == off? */
-+              data->backlight->props.max_brightness = 0x3f;
-+              data->backlight->props.power = FB_BLANK_UNBLANK;
-+              data->backlight->props.fb_blank = FB_BLANK_UNBLANK;
-+              data->backlight->props.brightness =
-+                                      data->backlight->props.max_brightness;
-+              backlight_update_status(data->backlight);
-+      }
-+
-+      apm_get_power_status = pcf50633_get_power_status;
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+      if (machine_is_neo1973_gta02()) {
-+              gta01_pm_gps_dev.dev.parent = &new_client->dev;
-+              gta01_pm_bt_dev.dev.parent = &new_client->dev;
-+              platform_device_register(&gta01_pm_bt_dev);
-+              platform_device_register(&gta01_pm_gps_dev);
-+      }
-+#endif
-+
-+      return 0;
-+exit_rtc:
-+      if (data->pdata->used_features & PCF50633_FEAT_RTC)
-+              rtc_device_unregister(pcf50633_global->rtc);
-+exit_irq:
-+      free_irq(pcf50633_global->irq, pcf50633_global);
-+exit_input:
-+      input_unregister_device(data->input_dev);
-+exit_sysfs:
-+      pm_power_off = NULL;
-+      sysfs_remove_group(&new_client->dev.kobj, &pcf_attr_group);
-+exit_detach:
-+      i2c_detach_client(new_client);
-+exit_free:
-+      kfree(data);
-+      pcf50633_global = NULL;
-+      return err;
-+}
-+
-+static int pcf50633_attach_adapter(struct i2c_adapter *adapter)
-+{
-+      DEBUGP("entering, calling i2c_probe\n");
-+      return i2c_probe(adapter, &addr_data, &pcf50633_detect);
-+}
-+
-+static int pcf50633_detach_client(struct i2c_client *client)
-+{
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+
-+      DEBUGP("entering\n");
-+
-+      apm_get_power_status = NULL;
-+
-+      free_irq(pcf->irq, pcf);
-+
-+      input_unregister_device(pcf->input_dev);
-+
-+      if (pcf->pdata->used_features & PCF50633_FEAT_PWM_BL)
-+              backlight_device_unregister(pcf->backlight);
-+
-+      if (pcf->pdata->used_features & PCF50633_FEAT_RTC)
-+              rtc_device_unregister(pcf->rtc);
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+      if (machine_is_neo1973_gta02()) {
-+              platform_device_unregister(&gta01_pm_bt_dev);
-+              platform_device_unregister(&gta01_pm_gps_dev);
-+      }
-+#endif
-+
-+      sysfs_remove_group(&client->dev.kobj, &pcf_attr_group);
-+
-+      pm_power_off = NULL;
-+
-+      kfree(pcf);
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+#define INT1M_RESUMERS        (PCF50633_INT1_ADPINS           | \
-+                       PCF50633_INT1_ADPREM           | \
-+                       PCF50633_INT1_USBINS           | \
-+                       PCF50633_INT1_USBREM           | \
-+                       PCF50633_INT1_ALARM)
-+#define INT2M_RESUMERS        (PCF50633_INT2_ONKEYF)
-+#define INT3M_RESUMERS        (PCF50633_INT3_BATFULL          | \
-+                       PCF50633_INT3_CHGHALT          | \
-+                       PCF50633_INT3_THLIMON          | \
-+                       PCF50633_INT3_THLIMOFF         | \
-+                       PCF50633_INT3_USBLIMON         | \
-+                       PCF50633_INT3_USBLIMOFF        | \
-+                       PCF50633_INT3_ONKEY1S)
-+#define INT4M_RESUMERS        (PCF50633_INT4_LOWSYS           | \
-+                       PCF50633_INT4_LOWBAT           | \
-+                       PCF50633_INT4_HIGHTMP)
-+#define INT5M_RESUMERS        (0)
-+
-+static int pcf50633_suspend(struct device *dev, pm_message_t state)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      int i;
-+
-+      /* The general idea is to power down all unused power supplies,
-+       * and then mask all PCF50606 interrup sources but EXTONR, ONKEYF
-+       * and ALARM */
-+
-+      mutex_lock(&pcf->lock);
-+
-+      /* Save all registers that don't "survive" standby state */
-+      pcf->standby_regs.ooctim2 = __reg_read(pcf, PCF50633_REG_OOCTIM2);
-+      pcf->standby_regs.autoout = __reg_read(pcf, PCF50633_REG_AUTOOUT);
-+      pcf->standby_regs.autoena = __reg_read(pcf, PCF50633_REG_AUTOENA);
-+      pcf->standby_regs.automxc = __reg_read(pcf, PCF50633_REG_AUTOMXC);
-+      pcf->standby_regs.down1out = __reg_read(pcf, PCF50633_REG_DOWN1OUT);
-+      pcf->standby_regs.down1mxc = __reg_read(pcf, PCF50633_REG_DOWN1MXC);
-+      pcf->standby_regs.down2out = __reg_read(pcf, PCF50633_REG_DOWN2OUT);
-+      pcf->standby_regs.down2ena = __reg_read(pcf, PCF50633_REG_DOWN2ENA);
-+      pcf->standby_regs.memldoout = __reg_read(pcf, PCF50633_REG_MEMLDOOUT);
-+      pcf->standby_regs.memldoena = __reg_read(pcf, PCF50633_REG_MEMLDOENA);
-+      pcf->standby_regs.ledout = __reg_read(pcf, PCF50633_REG_LEDOUT);
-+      pcf->standby_regs.ledena = __reg_read(pcf, PCF50633_REG_LEDENA);
-+      pcf->standby_regs.leddim = __reg_read(pcf, PCF50633_REG_LEDDIM);
-+      /* FIXME: one big read? */
-+      for (i = 0; i < 7; i++) {
-+              u_int8_t reg_out = PCF50633_REG_LDO1OUT + 2*i;
-+              pcf->standby_regs.ldo[i].out = __reg_read(pcf, reg_out);
-+              pcf->standby_regs.ldo[i].ena = __reg_read(pcf, reg_out+1);
-+      }
-+
-+      /* switch off power supplies that are not needed during suspend */
-+      for (i = 0; i < __NUM_PCF50633_REGULATORS; i++) {
-+              if (!(pcf->pdata->rails[i].flags & PMU_VRAIL_F_SUSPEND_ON)) {
-+                      u_int8_t tmp;
-+
-+                      DEBUGP("disabling pcf50633 regulator %u\n", i);
-+                      /* we cannot use pcf50633_onoff_set() because we're
-+                       * already under the mutex */
-+                      tmp = __reg_read(pcf, regulator_registers[i]+1);
-+                      tmp &= 0xfe;
-+                      __reg_write(pcf, regulator_registers[i]+1, tmp);
-+              }
-+      }
-+
-+      pcf->standby_regs.int1m = __reg_read(pcf, PCF50633_REG_INT1M);
-+      pcf->standby_regs.int2m = __reg_read(pcf, PCF50633_REG_INT2M);
-+      pcf->standby_regs.int3m = __reg_read(pcf, PCF50633_REG_INT3M);
-+      pcf->standby_regs.int4m = __reg_read(pcf, PCF50633_REG_INT4M);
-+      pcf->standby_regs.int5m = __reg_read(pcf, PCF50633_REG_INT5M);
-+      __reg_write(pcf, PCF50633_REG_INT1M, ~INT1M_RESUMERS & 0xff);
-+      __reg_write(pcf, PCF50633_REG_INT2M, ~INT2M_RESUMERS & 0xff);
-+      __reg_write(pcf, PCF50633_REG_INT3M, ~INT3M_RESUMERS & 0xff);
-+      __reg_write(pcf, PCF50633_REG_INT4M, ~INT4M_RESUMERS & 0xff);
-+      __reg_write(pcf, PCF50633_REG_INT5M, ~INT5M_RESUMERS & 0xff);
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      return 0;
-+}
-+
-+static int pcf50633_resume(struct device *dev)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      int i;
-+
-+      mutex_lock(&pcf->lock);
-+
-+      /* Resume all saved registers that don't "survive" standby state */
-+      __reg_write(pcf, PCF50633_REG_INT1M, pcf->standby_regs.int1m);
-+      __reg_write(pcf, PCF50633_REG_INT2M, pcf->standby_regs.int2m);
-+      __reg_write(pcf, PCF50633_REG_INT3M, pcf->standby_regs.int3m);
-+      __reg_write(pcf, PCF50633_REG_INT4M, pcf->standby_regs.int4m);
-+      __reg_write(pcf, PCF50633_REG_INT5M, pcf->standby_regs.int5m);
-+
-+      __reg_write(pcf, PCF50633_REG_OOCTIM2, pcf->standby_regs.ooctim2);
-+      __reg_write(pcf, PCF50633_REG_AUTOOUT, pcf->standby_regs.autoout);
-+      __reg_write(pcf, PCF50633_REG_AUTOMXC, pcf->standby_regs.automxc);
-+      __reg_write(pcf, PCF50633_REG_DOWN1OUT, pcf->standby_regs.down1out);
-+      __reg_write(pcf, PCF50633_REG_DOWN1MXC, pcf->standby_regs.down1mxc);
-+      __reg_write(pcf, PCF50633_REG_DOWN2OUT, pcf->standby_regs.down2out);
-+      __reg_write(pcf, PCF50633_REG_DOWN2ENA, pcf->standby_regs.down2ena);
-+      __reg_write(pcf, PCF50633_REG_MEMLDOOUT, pcf->standby_regs.memldoout);
-+      __reg_write(pcf, PCF50633_REG_MEMLDOENA, pcf->standby_regs.memldoena);
-+      __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.ledout);
-+      __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.ledena);
-+      __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.leddim);
-+      /* FIXME: one big read? */
-+      for (i = 0; i < 7; i++) {
-+              u_int8_t reg_out = PCF50633_REG_LDO1OUT + 2*i;
-+              __reg_write(pcf, reg_out, pcf->standby_regs.ldo[i].out);
-+              __reg_write(pcf, reg_out+1, pcf->standby_regs.ldo[i].ena);
-+      }
-+
-+      mutex_unlock(&pcf->lock);
-+
-+      pcf50633_irq(pcf->irq, pcf);
-+
-+      return 0;
-+}
-+#else
-+#define pcf50633_suspend NULL
-+#define pcf50633_resume NULL
-+#endif
-+
-+static struct i2c_driver pcf50633_driver = {
-+      .driver = {
-+              .name   = "pcf50633",
-+              .suspend= pcf50633_suspend,
-+              .resume = pcf50633_resume,
-+      },
-+      .id             = I2C_DRIVERID_PCF50633,
-+      .attach_adapter = pcf50633_attach_adapter,
-+      .detach_client  = pcf50633_detach_client,
-+};
-+
-+/* platform driver, since i2c devices don't have platform_data */
-+static int __init pcf50633_plat_probe(struct platform_device *pdev)
-+{
-+      struct pcf50633_platform_data *pdata = pdev->dev.platform_data;
-+
-+      if (!pdata)
-+              return -ENODEV;
-+
-+      pcf50633_pdev = pdev;
-+
-+      return 0;
-+}
-+
-+static int pcf50633_plat_remove(struct platform_device *pdev)
-+{
-+      return 0;
-+}
-+
-+static struct platform_driver pcf50633_plat_driver = {
-+      .probe  = pcf50633_plat_probe,
-+      .remove = pcf50633_plat_remove,
-+      .driver = {
-+              .owner  = THIS_MODULE,
-+              .name   = "pcf50633",
-+      },
-+};
-+
-+static int __init pcf50633_init(void)
-+{
-+      int rc;
-+
-+      if (!(rc = platform_driver_register(&pcf50633_plat_driver)))
-+              rc = i2c_add_driver(&pcf50633_driver);
-+
-+      return rc;
-+}
-+
-+static void pcf50633_exit(void)
-+{
-+      i2c_del_driver(&pcf50633_driver);
-+      platform_driver_unregister(&pcf50633_plat_driver);
-+}
-+
-+MODULE_DESCRIPTION("I2C chip driver for NXP PCF50633 power management unit");
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_LICENSE("GPL");
-+
-+module_init(pcf50633_init);
-+module_exit(pcf50633_exit);
-diff --git a/drivers/i2c/chips/pcf50633.h b/drivers/i2c/chips/pcf50633.h
-new file mode 100644
-index 0000000..9aad206
---- /dev/null
-+++ b/drivers/i2c/chips/pcf50633.h
-@@ -0,0 +1,402 @@
-+#ifndef _PCF50633_H
-+#define _PCF50633_H
-+
-+/* Philips PCF50633 Power Managemnt Unit (PMU) driver
-+ * (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ *
-+ */
-+
-+enum pfc50633_regs {
-+      PCF50633_REG_VERSION    = 0x00,
-+      PCF50633_REG_VARIANT    = 0x01,
-+      PCF50633_REG_INT1       = 0x02, /* Interrupt Status */
-+      PCF50633_REG_INT2       = 0x03, /* Interrupt Status */
-+      PCF50633_REG_INT3       = 0x04, /* Interrupt Status */
-+      PCF50633_REG_INT4       = 0x05, /* Interrupt Status */
-+      PCF50633_REG_INT5       = 0x06, /* Interrupt Status */
-+      PCF50633_REG_INT1M      = 0x07, /* Interrupt Mask */
-+      PCF50633_REG_INT2M      = 0x08, /* Interrupt Mask */
-+      PCF50633_REG_INT3M      = 0x09, /* Interrupt Mask */
-+      PCF50633_REG_INT4M      = 0x0a, /* Interrupt Mask */
-+      PCF50633_REG_INT5M      = 0x0b, /* Interrupt Mask */
-+      PCF50633_REG_OOCSHDWN   = 0x0c,
-+      PCF50633_REG_OOCWAKE    = 0x0d,
-+      PCF50633_REG_OOCTIM1    = 0x0e,
-+      PCF50633_REG_OOCTIM2    = 0x0f,
-+      PCF50633_REG_OOCMODE    = 0x10,
-+      PCF50633_REG_OOCCTL     = 0x11,
-+      PCF50633_REG_OOCSTAT    = 0x12,
-+      PCF50633_REG_GPIOCTL    = 0x13,
-+      PCF50633_REG_GPIO1CFG   = 0x14,
-+      PCF50633_REG_GPIO2CFG   = 0x15,
-+      PCF50633_REG_GPIO3CFG   = 0x16,
-+      PCF50633_REG_GPOCFG     = 0x17,
-+      PCF50633_REG_BVMCTL     = 0x18,
-+      PCF50633_REG_SVMCTL     = 0x19,
-+      PCF50633_REG_AUTOOUT    = 0x1a,
-+      PCF50633_REG_AUTOENA    = 0x1b,
-+      PCF50633_REG_AUTOCTL    = 0x1c,
-+      PCF50633_REG_AUTOMXC    = 0x1d,
-+      PCF50633_REG_DOWN1OUT   = 0x1e,
-+      PCF50633_REG_DOWN1ENA   = 0x1f,
-+      PCF50633_REG_DOWN1CTL   = 0x20,
-+      PCF50633_REG_DOWN1MXC   = 0x21,
-+      PCF50633_REG_DOWN2OUT   = 0x22,
-+      PCF50633_REG_DOWN2ENA   = 0x23,
-+      PCF50633_REG_DOWN2CTL   = 0x24,
-+      PCF50633_REG_DOWN2MXC   = 0x25,
-+      PCF50633_REG_MEMLDOOUT  = 0x26,
-+      PCF50633_REG_MEMLDOENA  = 0x27,
-+      PCF50633_REG_LEDOUT     = 0x28,
-+      PCF50633_REG_LEDENA     = 0x29,
-+      PCF50633_REG_LEDCTL     = 0x2a,
-+      PCF50633_REG_LEDDIM     = 0x2b,
-+      /* reserved */
-+      PCF50633_REG_LDO1OUT    = 0x2d,
-+      PCF50633_REG_LDO1ENA    = 0x2e,
-+      PCF50633_REG_LDO2OUT    = 0x2f,
-+      PCF50633_REG_LDO2ENA    = 0x30,
-+      PCF50633_REG_LDO3OUT    = 0x31,
-+      PCF50633_REG_LDO3ENA    = 0x32,
-+      PCF50633_REG_LDO4OUT    = 0x33,
-+      PCF50633_REG_LDO4ENA    = 0x34,
-+      PCF50633_REG_LDO5OUT    = 0x35,
-+      PCF50633_REG_LDO5ENA    = 0x36,
-+      PCF50633_REG_LDO6OUT    = 0x37,
-+      PCF50633_REG_LDO6ENA    = 0x38,
-+      PCF50633_REG_HCLDOOUT   = 0x39,
-+      PCF50633_REG_HCLDOENA   = 0x3a,
-+      PCF50633_REG_STBYCTL1   = 0x3b,
-+      PCF50633_REG_STBYCTL2   = 0x3c,
-+      PCF50633_REG_DEBPF1     = 0x3d,
-+      PCF50633_REG_DEBPF2     = 0x3e,
-+      PCF50633_REG_DEBPF3     = 0x3f,
-+      PCF50633_REG_HCLDOOVL   = 0x40,
-+      PCF50633_REG_DCDCSTAT   = 0x41,
-+      PCF50633_REG_LDOSTAT    = 0x42,
-+      PCF50633_REG_MBCC1      = 0x43,
-+      PCF50633_REG_MBCC2      = 0x44,
-+      PCF50633_REG_MBCC3      = 0x45,
-+      PCF50633_REG_MBCC4      = 0x46,
-+      PCF50633_REG_MBCC5      = 0x47,
-+      PCF50633_REG_MBCC6      = 0x48,
-+      PCF50633_REG_MBCC7      = 0x49,
-+      PCF50633_REG_MBCC8      = 0x4a,
-+      PCF50633_REG_MBCS1      = 0x4b,
-+      PCF50633_REG_MBCS2      = 0x4c,
-+      PCF50633_REG_MBCS3      = 0x4d,
-+      PCF50633_REG_BBCCTL     = 0x4e,
-+      PCF50633_REG_ALMGAIN    = 0x4f,
-+      PCF50633_REG_ALMDATA    = 0x50,
-+      /* reserved */
-+      PCF50633_REG_ADCC3      = 0x52,
-+      PCF50633_REG_ADCC2      = 0x53,
-+      PCF50633_REG_ADCC1      = 0x54,
-+      PCF50633_REG_ADCS1      = 0x55,
-+      PCF50633_REG_ADCS2      = 0x56,
-+      PCF50633_REG_ADCS3      = 0x57,
-+      /* reserved */
-+      PCF50633_REG_RTCSC      = 0x59, /* Second */
-+      PCF50633_REG_RTCMN      = 0x5a, /* Minute */
-+      PCF50633_REG_RTCHR      = 0x5b, /* Hour */
-+      PCF50633_REG_RTCWD      = 0x5c, /* Weekday */
-+      PCF50633_REG_RTCDT      = 0x5d, /* Day */
-+      PCF50633_REG_RTCMT      = 0x5e, /* Month */
-+      PCF50633_REG_RTCYR      = 0x5f, /* Year */
-+      PCF50633_REG_RTCSCA     = 0x60, /* Alarm Second */
-+      PCF50633_REG_RTCMNA     = 0x61, /* Alarm Minute */
-+      PCF50633_REG_RTCHRA     = 0x62, /* Alarm Hour */
-+      PCF50633_REG_RTCWDA     = 0x63, /* Alarm Weekday */
-+      PCF50633_REG_RTCDTA     = 0x64, /* Alarm Day */
-+      PCF50633_REG_RTCMTA     = 0x65, /* Alarm Month */
-+      PCF50633_REG_RTCYRA     = 0x66, /* Alarm Year */
-+
-+      PCF50633_REG_MEMBYTE0   = 0x67,
-+      PCF50633_REG_MEMBYTE1   = 0x68,
-+      PCF50633_REG_MEMBYTE2   = 0x69,
-+      PCF50633_REG_MEMBYTE3   = 0x6a,
-+      PCF50633_REG_MEMBYTE4   = 0x6b,
-+      PCF50633_REG_MEMBYTE5   = 0x6c,
-+      PCF50633_REG_MEMBYTE6   = 0x6d,
-+      PCF50633_REG_MEMBYTE7   = 0x6e,
-+      /* reserved */
-+      PCF50633_REG_DCDCPFM    = 0x84,
-+      __NUM_PCF50633_REGS
-+};
-+
-+enum pcf50633_reg_int1 {
-+      PCF50633_INT1_ADPINS    = 0x01, /* Adapter inserted */
-+      PCF50633_INT1_ADPREM    = 0x02, /* Adapter removed */
-+      PCF50633_INT1_USBINS    = 0x04, /* USB inserted */
-+      PCF50633_INT1_USBREM    = 0x08, /* USB removed */
-+      /* reserved */
-+      PCF50633_INT1_ALARM     = 0x40, /* RTC alarm time is reached */
-+      PCF50633_INT1_SECOND    = 0x80, /* RTC periodic second interrupt */
-+};
-+
-+enum pcf50633_reg_int2 {
-+      PCF50633_INT2_ONKEYR    = 0x01, /* ONKEY rising edge */
-+      PCF50633_INT2_ONKEYF    = 0x02, /* ONKEY falling edge */
-+      PCF50633_INT2_EXTON1R   = 0x04, /* EXTON1 rising edge */
-+      PCF50633_INT2_EXTON1F   = 0x08, /* EXTON1 falling edge */
-+      PCF50633_INT2_EXTON2R   = 0x10, /* EXTON2 rising edge */
-+      PCF50633_INT2_EXTON2F   = 0x20, /* EXTON2 falling edge */
-+      PCF50633_INT2_EXTON3R   = 0x40, /* EXTON3 rising edge */
-+      PCF50633_INT2_EXTON3F   = 0x80, /* EXTON3 falling edge */
-+};
-+
-+enum pcf50633_reg_int3 {
-+      PCF50633_INT3_BATFULL   = 0x01, /* Battery full */
-+      PCF50633_INT3_CHGHALT   = 0x02, /* Charger halt */
-+      PCF50633_INT3_THLIMON   = 0x04,
-+      PCF50633_INT3_THLIMOFF  = 0x08,
-+      PCF50633_INT3_USBLIMON  = 0x10,
-+      PCF50633_INT3_USBLIMOFF = 0x20,
-+      PCF50633_INT3_ADCRDY    = 0x40, /* ADC conversion finished */
-+      PCF50633_INT3_ONKEY1S   = 0x80, /* ONKEY pressed 1 second */
-+};
-+
-+enum pcf50633_reg_int4 {
-+      PCF50633_INT4_LOWSYS            = 0x01,
-+      PCF50633_INT4_LOWBAT            = 0x02,
-+      PCF50633_INT4_HIGHTMP           = 0x04,
-+      PCF50633_INT4_AUTOPWRFAIL       = 0x08,
-+      PCF50633_INT4_DWN1PWRFAIL       = 0x10,
-+      PCF50633_INT4_DWN2PWRFAIL       = 0x20,
-+      PCF50633_INT4_LEDPWRFAIL        = 0x40,
-+      PCF50633_INT4_LEDOVP            = 0x80,
-+};
-+
-+enum pcf50633_reg_int5 {
-+      PCF50633_INT5_LDO1PWRFAIL       = 0x01,
-+      PCF50633_INT5_LDO2PWRFAIL       = 0x02,
-+      PCF50633_INT5_LDO3PWRFAIL       = 0x04,
-+      PCF50633_INT5_LDO4PWRFAIL       = 0x08,
-+      PCF50633_INT5_LDO5PWRFAIL       = 0x10,
-+      PCF50633_INT5_LDO6PWRFAIL       = 0x20,
-+      PCF50633_INT5_HCLDOPWRFAIL      = 0x40,
-+      PCF50633_INT5_HCLDOOVL          = 0x80,
-+};
-+
-+enum pcf50633_reg_oocshdwn {
-+      PCF50633_OOCSHDWN_GOSTDBY       = 0x01,
-+      PCF50633_OOCSHDWN_TOTRST        = 0x04,
-+      PCF50633_OOCSHDWN_COLDBOOT      = 0x08,
-+};
-+
-+enum pcf50633_reg_oocwake {
-+      PCF50633_OOCWAKE_ONKEY          = 0x01,
-+      PCF50633_OOCWAKE_EXTON1         = 0x02,
-+      PCF50633_OOCWAKE_EXTON2         = 0x04,
-+      PCF50633_OOCWAKE_EXTON3         = 0x08,
-+      PCF50633_OOCWAKE_RTC            = 0x10,
-+      /* reserved */
-+      PCF50633_OOCWAKE_USB            = 0x40,
-+      PCF50633_OOCWAKE_ADP            = 0x80,
-+};
-+
-+enum pcf50633_reg_mbcc1 {
-+      PCF50633_MBCC1_CHGENA           = 0x01, /* Charger enable */
-+      PCF50633_MBCC1_AUTOSTOP         = 0x02,
-+      PCF50633_MBCC1_AUTORES          = 0x04, /* automatic resume */
-+      PCF50633_MBCC1_RESUME           = 0x08, /* explicit resume cmd */
-+      PCF50633_MBCC1_RESTART          = 0x10, /* restart charging */
-+      PCF50633_MBCC1_PREWDTIME_60M    = 0x20, /* max. precharging time */
-+      PCF50633_MBCC1_WDTIME_1H        = 0x00,
-+      PCF50633_MBCC1_WDTIME_2H        = 0x40,
-+      PCF50633_MBCC1_WDTIME_4H        = 0x80,
-+      PCF50633_MBCC1_WDTIME_6H        = 0xc0,
-+};
-+#define PCF50633_MBCC1_WDTIME_MASK      0xc0
-+
-+enum pcf50633_reg_mbcc2 {
-+      PCF50633_MBCC2_VBATCOND_2V7     = 0x00,
-+      PCF50633_MBCC2_VBATCOND_2V85    = 0x01,
-+      PCF50633_MBCC2_VBATCOND_3V0     = 0x02,
-+      PCF50633_MBCC2_VBATCOND_3V15    = 0x03,
-+      PCF50633_MBCC2_VMAX_4V          = 0x00,
-+      PCF50633_MBCC2_VMAX_4V20        = 0x28,
-+      PCF50633_MBCC2_VRESDEBTIME_64S  = 0x80, /* debounce time (32/64sec) */
-+};
-+#define       PCF50633_MBCC2_VBATCOND_MASK      0x03
-+#define PCF50633_MBCC2_VMAX_MASK        0x3c
-+
-+enum pcf50633_reg_adcc1 {
-+      PCF50633_ADCC1_ADCSTART         = 0x01,
-+      PCF50633_ADCC1_RES_10BIT        = 0x02,
-+      PCF50633_ADCC1_AVERAGE_NO       = 0x00,
-+      PCF50633_ADCC1_AVERAGE_4        = 0x04,
-+      PCF50633_ADCC1_AVERAGE_8        = 0x08,
-+      PCF50633_ADCC1_AVERAGE_16       = 0x0c,
-+
-+      PCF50633_ADCC1_MUX_BATSNS_RES   = 0x00,
-+      PCF50633_ADCC1_MUX_BATSNS_SUBTR = 0x10,
-+      PCF50633_ADCC1_MUX_ADCIN2_RES   = 0x20,
-+      PCF50633_ADCC1_MUX_ADCIN2_SUBTR = 0x30,
-+      PCF50633_ADCC1_MUX_BATTEMP      = 0x60,
-+      PCF50633_ADCC1_MUX_ADCIN1       = 0x70,
-+};
-+#define PCF50633_ADCC1_AVERAGE_MASK   0x0c
-+#define       PCF50633_ADCC1_ADCMUX_MASK      0xf0
-+
-+enum pcf50633_reg_adcc2 {
-+      PCF50633_ADCC2_RATIO_NONE       = 0x00,
-+      PCF50633_ADCC2_RATIO_BATTEMP    = 0x01,
-+      PCF50633_ADCC2_RATIO_ADCIN1     = 0x02,
-+      PCF50633_ADCC2_RATIO_BOTH       = 0x03,
-+      PCF50633_ADCC2_RATIOSETTL_100US = 0x04,
-+};
-+#define PCF50633_ADCC2_RATIO_MASK     0x03
-+
-+enum pcf50633_reg_adcc3 {
-+      PCF50633_ADCC3_ACCSW_EN         = 0x01,
-+      PCF50633_ADCC3_NTCSW_EN         = 0x04,
-+      PCF50633_ADCC3_RES_DIV_TWO      = 0x10,
-+      PCF50633_ADCC3_RES_DIV_THREE    = 0x00,
-+};
-+
-+enum pcf50633_reg_adcs3 {
-+      PCF50633_ADCS3_REF_NTCSW        = 0x00,
-+      PCF50633_ADCS3_REF_ACCSW        = 0x10,
-+      PCF50633_ADCS3_REF_2V0          = 0x20,
-+      PCF50633_ADCS3_REF_VISA         = 0x30,
-+      PCF50633_ADCS3_REF_2V0_2        = 0x70,
-+      PCF50633_ADCS3_ADCRDY           = 0x80,
-+};
-+#define PCF50633_ADCS3_ADCDAT1L_MASK  0x03
-+#define PCF50633_ADCS3_ADCDAT2L_MASK  0x0c
-+#define PCF50633_ADCS3_ADCDAT2L_SHIFT 2
-+#define PCF50633_ASCS3_REF_MASK               0x70
-+
-+enum pcf50633_regulator_enable {
-+      PCF50633_REGULATOR_ON           = 0x01,
-+      PCF50633_REGULATOR_ON_GPIO1     = 0x02,
-+      PCF50633_REGULATOR_ON_GPIO2     = 0x04,
-+      PCF50633_REGULATOR_ON_GPIO3     = 0x08,
-+};
-+#define PCF50633_REGULATOR_ON_MASK    0x0f
-+
-+enum pcf50633_regulator_phase {
-+      PCF50633_REGULATOR_ACTPH1       = 0x00,
-+      PCF50633_REGULATOR_ACTPH2       = 0x10,
-+      PCF50633_REGULATOR_ACTPH3       = 0x20,
-+      PCF50633_REGULATOR_ACTPH4       = 0x30,
-+};
-+#define PCF50633_REGULATOR_ACTPH_MASK 0x30
-+
-+enum pcf50633_reg_gpocfg {
-+      PCF50633_GPOCFG_GPOSEL_0        = 0x00,
-+      PCF50633_GPOCFG_GPOSEL_LED_NFET = 0x01,
-+      PCF50633_GPOCFG_GPOSEL_SYSxOK   = 0x02,
-+      PCF50633_GPOCFG_GPOSEL_CLK32K   = 0x03,
-+      PCF50633_GPOCFG_GPOSEL_ADAPUSB  = 0x04,
-+      PCF50633_GPOCFG_GPOSEL_USBxOK   = 0x05,
-+      PCF50633_GPOCFG_GPOSEL_ACTPH4   = 0x06,
-+      PCF50633_GPOCFG_GPOSEL_1        = 0x07,
-+      PCF50633_GPOCFG_GPOSEL_INVERSE  = 0x08,
-+};
-+#define PCF50633_GPOCFG_GPOSEL_MASK   0x07
-+
-+#if 0
-+enum pcf50633_reg_mbcc1 {
-+      PCF50633_MBCC1_CHGENA           = 0x01,
-+      PCF50633_MBCC1_AUTOSTOP         = 0x02,
-+      PCF50633_MBCC1_AUTORES          = 0x04,
-+      PCF50633_MBCC1_RESUME           = 0x08,
-+      PCF50633_MBCC1_RESTART          = 0x10,
-+      PCF50633_MBCC1_PREWDTIME_30MIN  = 0x00,
-+      PCF50633_MBCC1_PREWDTIME_60MIN  = 0x20,
-+      PCF50633_MBCC1_WDTIME_2HRS      = 0x40,
-+      PCF50633_MBCC1_WDTIME_4HRS      = 0x80,
-+      PCF50633_MBCC1_WDTIME_6HRS      = 0xc0,
-+};
-+
-+enum pcf50633_reg_mbcc2 {
-+      PCF50633_MBCC2_VBATCOND_2V7     = 0x00,
-+      PCF50633_MBCC2_VBATCOND_2V85    = 0x01,
-+      PCF50633_MBCC2_VBATCOND_3V0     = 0x02,
-+      PCF50633_MBCC2_VBATCOND_3V15    = 0x03,
-+      PCF50633_MBCC2_VRESDEBTIME_64S  = 0x80,
-+};
-+#define PCF50633_MBCC2_VMAX_MASK      0x3c
-+#endif
-+
-+enum pcf50633_reg_mbcc7 {
-+      PCF50633_MBCC7_USB_100mA        = 0x00,
-+      PCF50633_MBCC7_USB_500mA        = 0x01,
-+      PCF50633_MBCC7_USB_1000mA       = 0x02,
-+      PCF50633_MBCC7_USB_SUSPEND      = 0x03,
-+      PCF50633_MBCC7_BATTEMP_EN       = 0x04,
-+      PCF50633_MBCC7_BATSYSIMAX_1A6   = 0x00,
-+      PCF50633_MBCC7_BATSYSIMAX_1A8   = 0x40,
-+      PCF50633_MBCC7_BATSYSIMAX_2A0   = 0x80,
-+      PCF50633_MBCC7_BATSYSIMAX_2A2   = 0xc0,
-+};
-+#define PCF56033_MBCC7_USB_MASK               0x03
-+
-+enum pcf50633_reg_mbcc8 {
-+      PCF50633_MBCC8_USBENASUS        = 0x10,
-+};
-+
-+enum pcf50633_reg_mbcs1 {
-+      PCF50633_MBCS1_USBPRES          = 0x01,
-+      PCF50633_MBCS1_USBOK            = 0x02,
-+      PCF50633_MBCS1_ADAPTPRES        = 0x04,
-+      PCF50633_MBCS1_ADAPTOK          = 0x08,
-+      PCF50633_MBCS1_TBAT_OK          = 0x00,
-+      PCF50633_MBCS1_TBAT_ABOVE       = 0x10,
-+      PCF50633_MBCS1_TBAT_BELOW       = 0x20,
-+      PCF50633_MBCS1_TBAT_UNDEF       = 0x30,
-+      PCF50633_MBCS1_PREWDTEXP        = 0x40,
-+      PCF50633_MBCS1_WDTEXP           = 0x80,
-+};
-+
-+enum pcf50633_reg_mbcs2_mbcmod {
-+      PCF50633_MBCS2_MBC_PLAY         = 0x00,
-+      PCF50633_MBCS2_MBC_USB_PRE      = 0x01,
-+      PCF50633_MBCS2_MBC_USB_PRE_WAIT = 0x02,
-+      PCF50633_MBCS2_MBC_USB_FAST     = 0x03,
-+      PCF50633_MBCS2_MBC_USB_FAST_WAIT= 0x04,
-+      PCF50633_MBCS2_MBC_USB_SUSPEND  = 0x05,
-+      PCF50633_MBCS2_MBC_ADP_PRE      = 0x06,
-+      PCF50633_MBCS2_MBC_ADP_PRE_WAIT = 0x07,
-+      PCF50633_MBCS2_MBC_ADP_FAST     = 0x08,
-+      PCF50633_MBCS2_MBC_ADP_FAST_WAIT= 0x09,
-+      PCF50633_MBCS2_MBC_BAT_FULL     = 0x0a,
-+      PCF50633_MBCS2_MBC_HALT         = 0x0b,
-+};
-+#define PCF50633_MBCS2_MBC_MASK               0x0f
-+enum pcf50633_reg_mbcs2_chgstat {
-+      PCF50633_MBCS2_CHGS_NONE        = 0x00,
-+      PCF50633_MBCS2_CHGS_ADAPTER     = 0x10,
-+      PCF50633_MBCS2_CHGS_USB         = 0x20,
-+      PCF50633_MBCS2_CHGS_BOTH        = 0x30,
-+};
-+#define PCF50633_MBCS2_RESSTAT_AUTO   0x40
-+
-+enum pcf50633_reg_mbcs3 {
-+      PCF50633_MBCS3_USBLIM_PLAY      = 0x01,
-+      PCF50633_MBCS3_USBLIM_CGH       = 0x02,
-+      PCF50633_MBCS3_TLIM_PLAY        = 0x04,
-+      PCF50633_MBCS3_TLIM_CHG         = 0x08,
-+      PCF50633_MBCS3_ILIM             = 0x10, /* 1: Ibat > Icutoff */
-+      PCF50633_MBCS3_VLIM             = 0x20, /* 1: Vbat == Vmax */
-+      PCF50633_MBCS3_VBATSTAT         = 0x40, /* 1: Vbat > Vbatcond */
-+      PCF50633_MBCS3_VRES             = 0x80, /* 1: Vbat > Vth(RES) */
-+};
-+
-+/* this is to be provided by the board implementation */
-+extern const u_int8_t pcf50633_initial_regs[__NUM_PCF50633_REGS];
-+
-+void pcf50633_reg_write(u_int8_t reg, u_int8_t val);
-+
-+u_int8_t pcf50633_reg_read(u_int8_t reg);
-+
-+void pcf50633_reg_set_bit_mask(u_int8_t reg, u_int8_t mask, u_int8_t val);
-+void pcf50633_reg_clear_bits(u_int8_t reg, u_int8_t bits);
-+
-+void pcf50633_charge_autofast(int on);
-+
-+#endif /* _PCF50606_H */
-+
-diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
-index 2cda699..90f53e1 100644
---- a/include/linux/i2c-id.h
-+++ b/include/linux/i2c-id.h
-@@ -95,6 +95,7 @@
- #define I2C_DRIVERID_OV7670 1048      /* Omnivision 7670 camera */
- #define I2C_DRIVERID_PCF50606 1049
-+#define I2C_DRIVERID_PCF50633 1051
- /*
-  * ---- Adapter types ----------------------------------------------------
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-new file mode 100644
-index 0000000..5f32004
---- /dev/null
-+++ b/include/linux/pcf50633.h
-@@ -0,0 +1,114 @@
-+#ifndef _LINUX_PCF50633_H
-+#define _LINUX_PCF50633_H
-+
-+/* public in-kernel pcf50633 api */
-+enum pcf50633_regulator_id {
-+      PCF50633_REGULATOR_AUTO,
-+      PCF50633_REGULATOR_DOWN1,
-+      PCF50633_REGULATOR_DOWN2,
-+      PCF50633_REGULATOR_MEMLDO,
-+      PCF50633_REGULATOR_LDO1,
-+      PCF50633_REGULATOR_LDO2,
-+      PCF50633_REGULATOR_LDO3,
-+      PCF50633_REGULATOR_LDO4,
-+      PCF50633_REGULATOR_LDO5,
-+      PCF50633_REGULATOR_LDO6,
-+      PCF50633_REGULATOR_HCLDO,
-+      __NUM_PCF50633_REGULATORS
-+};
-+
-+struct pcf50633_data;
-+extern struct pcf50633_data *pcf50633_global;
-+
-+extern void
-+pcf50633_go_standby(void);
-+
-+enum pcf50633_gpio {
-+      PCF50633_GPIO1 = 1,
-+      PCF50633_GPIO2 = 2,
-+      PCF50633_GPIO3 = 3,
-+      PCF50633_GPO = 4,
-+};
-+
-+extern void
-+pcf50633_gpio_set(struct pcf50633_data *pcf, enum pcf50633_gpio gpio, int on);
-+
-+extern int
-+pcf50633_gpio_get(struct pcf50633_data *pcf, enum pcf50633_gpio gpio);
-+
-+extern int
-+pcf50633_voltage_set(struct pcf50633_data *pcf,
-+                   enum pcf50633_regulator_id reg,
-+                   unsigned int millivolts);
-+extern unsigned int
-+pcf50633_voltage_get(struct pcf50633_data *pcf,
-+                   enum pcf50633_regulator_id reg);
-+extern int
-+pcf50633_onoff_get(struct pcf50633_data *pcf,
-+                 enum pcf50633_regulator_id reg);
-+
-+extern int
-+pcf50633_onoff_set(struct pcf50633_data *pcf,
-+                 enum pcf50633_regulator_id reg, int on);
-+
-+extern void
-+pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma);
-+
-+extern void
-+pcf50633_charge_enable(struct pcf50633_data *pcf, int on);
-+
-+/* FIXME: sharded with pcf50606 */
-+#define PMU_VRAIL_F_SUSPEND_ON        0x00000001      /* Remains on during suspend */
-+#define PMU_VRAIL_F_UNUSED    0x00000002      /* This rail is not used */
-+struct pmu_voltage_rail {
-+      char *name;
-+      unsigned int flags;
-+      struct {
-+              unsigned int init;
-+              unsigned int max;
-+      } voltage;
-+};
-+
-+enum pmu_event {
-+      PMU_EVT_NONE,
-+      PMU_EVT_INSERT,
-+      PMU_EVT_REMOVE,
-+      PMU_EVT_USB_INSERT,
-+      PMU_EVT_USB_REMOVE,
-+      __NUM_PMU_EVTS
-+};
-+
-+typedef int pmu_cb(struct device *dev, unsigned int feature,
-+                 enum pmu_event event);
-+
-+#define PCF50633_FEAT_EXTON   0x00000001      /* not yet supported */
-+#define PCF50633_FEAT_MBC     0x00000002
-+#define PCF50633_FEAT_BBC     0x00000004      /* not yet supported */
-+#define PCF50633_FEAT_RTC     0x00000040
-+#define PCF50633_FEAT_CHGCUR  0x00000100
-+#define PCF50633_FEAT_BATVOLT 0x00000200
-+#define PCF50633_FEAT_BATTEMP 0x00000400
-+#define PCF50633_FEAT_PWM_BL  0x00000800
-+
-+struct pcf50633_platform_data {
-+      /* general */
-+      unsigned int used_features;
-+      unsigned int onkey_seconds_sig_init;
-+      unsigned int onkey_seconds_shutdown;
-+
-+      /* voltage regulator related */
-+      struct pmu_voltage_rail rails[__NUM_PCF50633_REGULATORS];
-+      unsigned int used_regulators;
-+
-+      /* charger related */
-+      unsigned int r_fix_batt;
-+      unsigned int r_fix_batt_par;
-+      unsigned int r_sense_milli;
-+
-+      struct {
-+              u_int8_t mbcc3; /* charger voltage / current */
-+      } charger;
-+      pmu_cb *cb;
-+};
-+
-+#endif /* _PCF50633_H */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1025-pcf50633-suspend-hacks.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1025-pcf50633-suspend-hacks.patch.patch
deleted file mode 100755 (executable)
index a04e8fd..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-From c96b850a977e3b7018c5ef1b145a3c11cb160265 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:50 +0100
-Subject: [PATCH] pcf50633-suspend-hacks.patch
-
----
- drivers/i2c/chips/pcf50633.c |   22 ++++++++++++++++++++--
- 1 files changed, 20 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 5488084..0cf5e53 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -567,8 +567,26 @@ static void pcf50633_work(struct work_struct *work)
-        */
-       ret = i2c_smbus_read_i2c_block_data(&pcf->client, PCF50633_REG_INT1, 5,
-                                           pcfirq);
--      if (ret != 5)
--              DEBUGP("Oh crap PMU IRQ register read failed %d\n", ret);
-+      if (ret != 5) {
-+              DEBUGP("Oh crap PMU IRQ register read failed -- "
-+                     "retrying later %d\n", ret);
-+              /*
-+               * this situation can happen during resume, just defer
-+               * handling the interrupt until enough I2C is up we can
-+               * actually talk to the PMU.  We can't just ignore this
-+               * because we are on a falling edge interrupt and our
-+               * PMU interrupt source does not clear until we read these
-+               * interrupt source registers.
-+               */
-+              if (!schedule_work(&pcf->work) && !pcf->working)
-+                      dev_dbg(&pcf->client.dev, "work item may be lost\n");
-+
-+              /* we don't put the device here, hold it for next time */
-+              mutex_unlock(&pcf->working_lock);
-+              /* don't spew, delaying whatever else is happening */
-+              msleep(1);
-+              return;
-+      }
-       if (!pcf->coldplug_done) {
-               DEBUGP("PMU Coldplug init\n");
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1026-smedia-glamo.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1026-smedia-glamo.patch.patch
deleted file mode 100755 (executable)
index e647442..0000000
+++ /dev/null
@@ -1,3501 +0,0 @@
-From 7b73c5270e710d39dc45231087fe3e078d063225 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:50 +0100
-Subject: [PATCH] smedia-glamo.patch
- [ FIXME:
-  include/asm-arm/arch-s3c2410/irqs.h shouldn't contain device-specific
-  changes. ]
-
-This is a Linux kernel driver for the Smedia Glamo336x / Glamo337x
-multi-function peripheral device.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- drivers/mfd/Kconfig                 |    2 +
- drivers/mfd/Makefile                |    1 +
- drivers/mfd/glamo/Kconfig           |   35 ++
- drivers/mfd/glamo/Makefile          |   11 +
- drivers/mfd/glamo/glamo-core.c      | 1151 +++++++++++++++++++++++++++++++++++
- drivers/mfd/glamo/glamo-core.h      |   91 +++
- drivers/mfd/glamo/glamo-fb.c        |  822 +++++++++++++++++++++++++
- drivers/mfd/glamo/glamo-gpio.c      |   62 ++
- drivers/mfd/glamo/glamo-lcm-spi.c   |  241 ++++++++
- drivers/mfd/glamo/glamo-regs.h      |  477 +++++++++++++++
- drivers/mfd/glamo/glamo-spi-gpio.c  |  256 ++++++++
- include/asm-arm/arch-s3c2410/irqs.h |   32 +-
- include/linux/glamo-gpio.h          |   99 +++
- include/linux/glamofb.h             |   39 ++
- include/linux/spi/glamo.h           |   28 +
- 15 files changed, 3345 insertions(+), 2 deletions(-)
- create mode 100644 drivers/mfd/glamo/Kconfig
- create mode 100644 drivers/mfd/glamo/Makefile
- create mode 100644 drivers/mfd/glamo/glamo-core.c
- create mode 100644 drivers/mfd/glamo/glamo-core.h
- create mode 100644 drivers/mfd/glamo/glamo-fb.c
- create mode 100644 drivers/mfd/glamo/glamo-gpio.c
- create mode 100644 drivers/mfd/glamo/glamo-lcm-spi.c
- create mode 100644 drivers/mfd/glamo/glamo-regs.h
- create mode 100644 drivers/mfd/glamo/glamo-spi-gpio.c
- create mode 100644 include/linux/glamo-gpio.h
- create mode 100644 include/linux/glamofb.h
- create mode 100644 include/linux/spi/glamo.h
-
-diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
-index ae96bd6..79f934e 100644
---- a/drivers/mfd/Kconfig
-+++ b/drivers/mfd/Kconfig
-@@ -38,6 +38,8 @@ config HTC_PASIC3
-         HTC Magician devices, respectively. Actual functionality is
-         handled by the leds-pasic3 and ds1wm drivers.
-+source "drivers/mfd/glamo/Kconfig"
-+
- endmenu
- menu "Multimedia Capabilities Port drivers"
-diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
-index eef4e26..b172418 100644
---- a/drivers/mfd/Makefile
-+++ b/drivers/mfd/Makefile
-@@ -4,6 +4,7 @@
- obj-$(CONFIG_MFD_SM501)               += sm501.o
- obj-$(CONFIG_MFD_ASIC3)               += asic3.o
-+obj-$(CONFIG_MFD_GLAMO)               += glamo/
- obj-$(CONFIG_HTC_EGPIO)               += htc-egpio.o
- obj-$(CONFIG_HTC_PASIC3)      += htc-pasic3.o
-diff --git a/drivers/mfd/glamo/Kconfig b/drivers/mfd/glamo/Kconfig
-new file mode 100644
-index 0000000..b99f2b2
---- /dev/null
-+++ b/drivers/mfd/glamo/Kconfig
-@@ -0,0 +1,35 @@
-+config MFD_GLAMO
-+      bool "Smedia Glamo 336x/337x support"
-+      help
-+        This enables the core driver for the Smedia Glamo 336x/337x
-+        multi-function device.  It includes irq_chip demultiplex as
-+        well as clock / power management and GPIO support.
-+
-+config MFD_GLAMO_FB
-+      tristate "Smedia Glamo 336x/337x framebuffer support"
-+      depends on FB && MFD_GLAMO
-+      help
-+        Frame buffer driver for the LCD controller in the Smedia Glamo
-+        336x/337x.
-+
-+        This driver is also available as a module ( = code which can be
-+        inserted and removed from the running kernel whenever you want). The
-+        module will be called glamofb. If you want to compile it as a module,
-+        say M here and read <file:Documentation/modules.txt>.
-+
-+        If unsure, say N.
-+
-+config MFD_GLAMO_SPI_GPIO
-+       tristate "Glamo GPIO SPI bitbang support"
-+       depends on MFD_GLAMO
-+       help
-+         Enable a bitbanging SPI adapter driver for the Smedia Glamo.
-+
-+config MFD_GLAMO_SPI_FB
-+       tristate "Glamo LCM control channel SPI support"
-+       depends on MFD_GLAMO_FB
-+       help
-+         Enable a bitbanging SPI adapter driver for the Smedia Glamo LCM
-+       control channel.  This SPI interface is frequently used to
-+       interconnect the LCM control interface.
-+
-diff --git a/drivers/mfd/glamo/Makefile b/drivers/mfd/glamo/Makefile
-new file mode 100644
-index 0000000..fb53982
---- /dev/null
-+++ b/drivers/mfd/glamo/Makefile
-@@ -0,0 +1,11 @@
-+#
-+# Makefile for the Smedia Glamo framebuffer driver
-+#
-+
-+obj-$(CONFIG_MFD_GLAMO)                       += glamo-core.o glamo-gpio.o
-+obj-$(CONFIG_MFD_GLAMO_SPI)           += glamo-spi.o
-+obj-$(CONFIG_MFD_GLAMO_SPI_GPIO)      += glamo-spi-gpio.o
-+
-+obj-$(CONFIG_MFD_GLAMO_FB)            += glamo-fb.o
-+obj-$(CONFIG_MFD_GLAMO_SPI_FB)                += glamo-lcm-spi.o
-+
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-new file mode 100644
-index 0000000..acf545f
---- /dev/null
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -0,0 +1,1151 @@
-+/* Smedia Glamo 336x/337x driver
-+ *
-+ * (C) 2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/errno.h>
-+#include <linux/string.h>
-+#include <linux/mm.h>
-+#include <linux/tty.h>
-+#include <linux/slab.h>
-+#include <linux/delay.h>
-+#include <linux/fb.h>
-+#include <linux/init.h>
-+#include <linux/irq.h>
-+#include <linux/interrupt.h>
-+#include <linux/workqueue.h>
-+#include <linux/wait.h>
-+#include <linux/platform_device.h>
-+#include <linux/kernel_stat.h>
-+#include <linux/spinlock.h>
-+#include <linux/glamofb.h>
-+#include <linux/mmc/mmc.h>
-+#include <linux/mmc/host.h>
-+
-+#include <asm/io.h>
-+#include <asm/uaccess.h>
-+#include <asm/div64.h>
-+
-+#ifdef CONFIG_PM
-+#include <linux/pm.h>
-+#endif
-+
-+#include "glamo-regs.h"
-+#include "glamo-core.h"
-+
-+#define RESSIZE(ressource) (((ressource)->end - (ressource)->start)+1)
-+
-+static struct glamo_core *glamo_handle;
-+
-+static inline void __reg_write(struct glamo_core *glamo,
-+                              u_int16_t reg, u_int16_t val)
-+{
-+      writew(val, glamo->base + reg);
-+}
-+
-+static inline u_int16_t __reg_read(struct glamo_core *glamo,
-+                                 u_int16_t reg)
-+{
-+      return readw(glamo->base + reg);
-+}
-+
-+static void __reg_set_bit_mask(struct glamo_core *glamo,
-+                              u_int16_t reg, u_int16_t mask,
-+                              u_int16_t val)
-+{
-+      u_int16_t tmp;
-+
-+      val &= mask;
-+
-+      tmp = __reg_read(glamo, reg);
-+      tmp &= ~mask;
-+      tmp |= val;
-+      __reg_write(glamo, reg, tmp);
-+}
-+
-+static void reg_set_bit_mask(struct glamo_core *glamo,
-+                              u_int16_t reg, u_int16_t mask,
-+                              u_int16_t val)
-+{
-+      spin_lock(&glamo->lock);
-+      __reg_set_bit_mask(glamo, reg, mask, val);
-+      spin_unlock(&glamo->lock);
-+}
-+
-+static inline void __reg_set_bit(struct glamo_core *glamo,
-+                               u_int16_t reg, u_int16_t bit)
-+{
-+      __reg_set_bit_mask(glamo, reg, bit, 0xffff);
-+}
-+
-+static inline void __reg_clear_bit(struct glamo_core *glamo,
-+                                 u_int16_t reg, u_int16_t bit)
-+{
-+      __reg_set_bit_mask(glamo, reg, bit, 0);
-+}
-+
-+static inline void glamo_vmem_write(struct glamo_core *glamo, u_int32_t addr,
-+                                  u_int16_t *src, int len)
-+{
-+      if (addr & 0x0001 || (unsigned long)src & 0x0001 || len & 0x0001) {
-+              dev_err(&glamo->pdev->dev, "unaligned write(0x%08x, 0x%p, "
-+                      "0x%x)!!\n", addr, src, len);
-+      }
-+
-+}
-+
-+static inline void glamo_vmem_read(struct glamo_core *glamo, u_int16_t *buf,
-+                                 u_int32_t addr, int len)
-+{
-+      if (addr & 0x0001 || (unsigned long) buf & 0x0001 || len & 0x0001) {
-+              dev_err(&glamo->pdev->dev, "unaligned read(0x%p, 0x08%x, "
-+                      "0x%x)!!\n", buf, addr, len);
-+      }
-+
-+
-+}
-+
-+/***********************************************************************
-+ * resources of sibling devices
-+ ***********************************************************************/
-+
-+#if 0
-+static struct resource glamo_core_resources[] = {
-+      {
-+              .start  = GLAMO_REGOFS_GENERIC,
-+              .end    = GLAMO_REGOFS_GENERIC + 0x400,
-+              .flags  = IORESOURCE_MEM,
-+      }, {
-+              .start  = 0,
-+              .end    = 0,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct platform_device glamo_core_dev = {
-+      .name           = "glamo-core",
-+      .resource       = &glamo_core_resources,
-+      .num_resources  = ARRAY_SIZE(glamo_core_resources),
-+};
-+#endif
-+
-+static struct resource glamo_jpeg_resources[] = {
-+      {
-+              .start  = GLAMO_REGOFS_JPEG,
-+              .end    = GLAMO_REGOFS_MPEG - 1,
-+              .flags  = IORESOURCE_MEM,
-+      }, {
-+              .start  = IRQ_GLAMO_JPEG,
-+              .end    = IRQ_GLAMO_JPEG,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct platform_device glamo_jpeg_dev = {
-+      .name           = "glamo-jpeg",
-+      .resource       = glamo_jpeg_resources,
-+      .num_resources  = ARRAY_SIZE(glamo_jpeg_resources),
-+};
-+
-+static struct resource glamo_mpeg_resources[] = {
-+      {
-+              .start  = GLAMO_REGOFS_MPEG,
-+              .end    = GLAMO_REGOFS_LCD - 1,
-+              .flags  = IORESOURCE_MEM,
-+      }, {
-+              .start  = IRQ_GLAMO_MPEG,
-+              .end    = IRQ_GLAMO_MPEG,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct platform_device glamo_mpeg_dev = {
-+      .name           = "glamo-mpeg",
-+      .resource       = glamo_mpeg_resources,
-+      .num_resources  = ARRAY_SIZE(glamo_mpeg_resources),
-+};
-+
-+static struct resource glamo_2d_resources[] = {
-+      {
-+              .start  = GLAMO_REGOFS_2D,
-+              .end    = GLAMO_REGOFS_3D - 1,
-+              .flags  = IORESOURCE_MEM,
-+      }, {
-+              .start  = IRQ_GLAMO_2D,
-+              .end    = IRQ_GLAMO_2D,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+};
-+
-+static struct platform_device glamo_2d_dev = {
-+      .name           = "glamo-2d",
-+      .resource       = glamo_2d_resources,
-+      .num_resources  = ARRAY_SIZE(glamo_2d_resources),
-+};
-+
-+static struct resource glamo_3d_resources[] = {
-+      {
-+              .start  = GLAMO_REGOFS_3D,
-+              .end    = GLAMO_REGOFS_END - 1,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+};
-+
-+static struct platform_device glamo_3d_dev = {
-+      .name           = "glamo-3d",
-+      .resource       = glamo_3d_resources,
-+      .num_resources  = ARRAY_SIZE(glamo_3d_resources),
-+};
-+
-+static struct platform_device glamo_spigpio_dev = {
-+      .name           = "glamo-spi-gpio",
-+};
-+
-+static struct resource glamo_fb_resources[] = {
-+      /* FIXME: those need to be incremented by parent base */
-+      {
-+              .name   = "glamo-fb-regs",
-+              .start  = GLAMO_REGOFS_LCD,
-+              .end    = GLAMO_REGOFS_MMC - 1,
-+              .flags  = IORESOURCE_MEM,
-+      }, {
-+              .name   = "glamo-fb-mem",
-+              .start  = GLAMO_OFFSET_FB,
-+              .end    = GLAMO_OFFSET_FB + GLAMO_FB_SIZE - 1,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+};
-+
-+static struct platform_device glamo_fb_dev = {
-+      .name           = "glamo-fb",
-+      .resource       = glamo_fb_resources,
-+      .num_resources  = ARRAY_SIZE(glamo_fb_resources),
-+};
-+
-+static struct resource glamo_mmc_resources[] = {
-+      {
-+              /* FIXME: those need to be incremented by parent base */
-+              .start  = GLAMO_REGOFS_MMC,
-+              .end    = GLAMO_REGOFS_MPROC0 - 1,
-+              .flags  = IORESOURCE_MEM
-+      }, {
-+              .start  = IRQ_GLAMO_MMC,
-+              .end    = IRQ_GLAMO_MMC,
-+              .flags  = IORESOURCE_IRQ,
-+      }, { /* our data buffer for MMC transfers */
-+              .start  = GLAMO_OFFSET_FB + GLAMO_FB_SIZE,
-+              .end    = GLAMO_OFFSET_FB + GLAMO_FB_SIZE +
-+                                GLAMO_MMC_BUFFER_SIZE - 1,
-+              .flags  = IORESOURCE_MEM
-+      },
-+};
-+
-+static struct platform_device glamo_mmc_dev = {
-+      .name           = "glamo-mci",
-+      .resource       = glamo_mmc_resources,
-+      .num_resources  = ARRAY_SIZE(glamo_mmc_resources),
-+};
-+
-+struct glamo_mci_pdata glamo_mci_def_pdata = {
-+      .gpio_detect            = 0,
-+      .glamo_set_mci_power    = NULL, /* filled in from MFD platform data */
-+      .ocr_avail              = MMC_VDD_32_33,
-+      .glamo_irq_is_wired     = NULL, /* filled in from MFD platform data */
-+};
-+EXPORT_SYMBOL_GPL(glamo_mci_def_pdata);
-+
-+
-+
-+static void mangle_mem_resources(struct resource *res, int num_res,
-+                               struct resource *parent)
-+{
-+      int i;
-+
-+      for (i = 0; i < num_res; i++) {
-+              if (res[i].flags != IORESOURCE_MEM)
-+                      continue;
-+              res[i].start += parent->start;
-+              res[i].end += parent->start;
-+              res[i].parent = parent;
-+      }
-+}
-+
-+/***********************************************************************
-+ * IRQ demultiplexer
-+ ***********************************************************************/
-+#define irq2glamo(x)  (x - IRQ_GLAMO(0))
-+
-+static void glamo_ack_irq(unsigned int irq)
-+{
-+      /* clear interrupt source */
-+      __reg_write(glamo_handle, GLAMO_REG_IRQ_CLEAR,
-+                  1 << irq2glamo(irq));
-+}
-+
-+static void glamo_mask_irq(unsigned int irq)
-+{
-+      u_int16_t tmp;
-+
-+      /* clear bit in enable register */
-+      tmp = __reg_read(glamo_handle, GLAMO_REG_IRQ_ENABLE);
-+      tmp &= ~(1 << irq2glamo(irq));
-+      __reg_write(glamo_handle, GLAMO_REG_IRQ_ENABLE, tmp);
-+}
-+
-+static void glamo_unmask_irq(unsigned int irq)
-+{
-+      u_int16_t tmp;
-+
-+      /* set bit in enable register */
-+      tmp = __reg_read(glamo_handle, GLAMO_REG_IRQ_ENABLE);
-+      tmp |= (1 << irq2glamo(irq));
-+      __reg_write(glamo_handle, GLAMO_REG_IRQ_ENABLE, tmp);
-+}
-+
-+static struct irq_chip glamo_irq_chip = {
-+      .ack    = glamo_ack_irq,
-+      .mask   = glamo_mask_irq,
-+      .unmask = glamo_unmask_irq,
-+};
-+
-+static void glamo_irq_demux_handler(unsigned int irq, struct irq_desc *desc)
-+{
-+      const unsigned int cpu = smp_processor_id();
-+
-+      spin_lock(&desc->lock);
-+
-+      desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
-+
-+      if (unlikely(desc->status & IRQ_INPROGRESS)) {
-+              desc->status |= (IRQ_PENDING | IRQ_MASKED);
-+              desc->chip->mask(irq);
-+              desc->chip->ack(irq);
-+              goto out_unlock;
-+      }
-+
-+      kstat_cpu(cpu).irqs[irq]++;
-+      desc->chip->ack(irq);
-+      desc->status |= IRQ_INPROGRESS;
-+
-+      do {
-+              u_int16_t irqstatus;
-+              int i;
-+
-+              if (unlikely((desc->status &
-+                              (IRQ_PENDING | IRQ_MASKED | IRQ_DISABLED)) ==
-+                              (IRQ_PENDING | IRQ_MASKED))) {
-+                      /* dealing with pending IRQ, unmasking */
-+                      desc->chip->unmask(irq);
-+                      desc->status &= ~IRQ_MASKED;
-+              }
-+
-+              desc->status &= ~IRQ_PENDING;
-+
-+              /* read IRQ status register */
-+              irqstatus = __reg_read(glamo_handle, GLAMO_REG_IRQ_STATUS);
-+              for (i = 0; i < 9; i++)
-+                      if (irqstatus & (1 << i))
-+                              desc_handle_irq(IRQ_GLAMO(i),
-+                                  irq_desc+IRQ_GLAMO(i));
-+
-+      } while ((desc->status & (IRQ_PENDING | IRQ_DISABLED)) == IRQ_PENDING);
-+
-+      desc->status &= ~IRQ_INPROGRESS;
-+
-+out_unlock:
-+      spin_unlock(&desc->lock);
-+}
-+
-+/***********************************************************************
-+ * 'engine' support
-+ ***********************************************************************/
-+
-+int glamo_engine_enable(struct glamo_core *glamo, enum glamo_engine engine)
-+{
-+      spin_lock(&glamo->lock);
-+      switch (engine) {
-+      case GLAMO_ENGINE_LCD:
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_LCD,
-+                          GLAMO_CLOCK_LCD_EN_M5CLK |
-+                          GLAMO_CLOCK_LCD_EN_DHCLK |
-+                          GLAMO_CLOCK_LCD_EN_DMCLK |
-+                          GLAMO_CLOCK_LCD_EN_DCLK |
-+                          GLAMO_CLOCK_LCD_DG_M5CLK |
-+                          GLAMO_CLOCK_LCD_DG_DMCLK, 0xffff);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_GEN5_1,
-+                          GLAMO_CLOCK_GEN51_EN_DIV_DHCLK |
-+                          GLAMO_CLOCK_GEN51_EN_DIV_DMCLK |
-+                          GLAMO_CLOCK_GEN51_EN_DIV_DCLK, 0xffff);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_HOSTBUS(2),
-+                          GLAMO_HOSTBUS2_MMIO_EN_LCD,
-+                          0xffff);
-+              break;
-+      case GLAMO_ENGINE_MMC:
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_MMC,
-+                                 GLAMO_CLOCK_MMC_EN_M9CLK |
-+                                 GLAMO_CLOCK_MMC_EN_TCLK |
-+                                 GLAMO_CLOCK_MMC_DG_M9CLK |
-+                                 GLAMO_CLOCK_MMC_DG_TCLK, 0xffff);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_HOSTBUS(2),
-+                                 GLAMO_HOSTBUS2_MMIO_EN_MMC,
-+                                 GLAMO_HOSTBUS2_MMIO_EN_MMC);
-+              break;
-+      case GLAMO_ENGINE_2D:
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_2D,
-+                                 GLAMO_CLOCK_2D_EN_M7CLK |
-+                                 GLAMO_CLOCK_2D_EN_GCLK |
-+                                 GLAMO_CLOCK_2D_DG_M7CLK |
-+                                 GLAMO_CLOCK_2D_DG_GCLK, 0xffff);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_HOSTBUS(2),
-+                                 GLAMO_HOSTBUS2_MMIO_EN_2D,
-+                                 GLAMO_HOSTBUS2_MMIO_EN_2D);
-+              break;
-+      case GLAMO_ENGINE_CMDQ:
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_2D,
-+                                 GLAMO_CLOCK_2D_EN_M6CLK, 0xffff);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_HOSTBUS(2),
-+                                 GLAMO_HOSTBUS2_MMIO_EN_CQ,
-+                                 GLAMO_HOSTBUS2_MMIO_EN_CQ);
-+              break;
-+      /* FIXME: Implementation */
-+      default:
-+              break;
-+      }
-+      spin_unlock(&glamo->lock);
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(glamo_engine_enable);
-+
-+int glamo_engine_disable(struct glamo_core *glamo, enum glamo_engine engine)
-+{
-+      spin_lock(&glamo->lock);
-+      switch (engine) {
-+      /* FIXME: Implementation */
-+      default:
-+              break;
-+      }
-+      spin_unlock(&glamo->lock);
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(glamo_engine_disable);
-+
-+struct glamo_script reset_regs[] = {
-+      [GLAMO_ENGINE_LCD] = {
-+              GLAMO_REG_CLOCK_LCD, GLAMO_CLOCK_LCD_RESET
-+      },
-+#if 0
-+      [GLAMO_ENGINE_HOST] = {
-+              GLAMO_REG_CLOCK_HOST, GLAMO_CLOCK_HOST_RESET
-+      },
-+      [GLAMO_ENGINE_MEM] = {
-+              GLAMO_REG_CLOCK_MEM, GLAMO_CLOCK_MEM_RESET
-+      },
-+#endif
-+      [GLAMO_ENGINE_MMC] = {
-+              GLAMO_REG_CLOCK_MMC, GLAMO_CLOCK_MMC_RESET
-+      },
-+      [GLAMO_ENGINE_2D] = {
-+              GLAMO_REG_CLOCK_2D, GLAMO_CLOCK_2D_RESET
-+      },
-+      [GLAMO_ENGINE_JPEG] = {
-+              GLAMO_REG_CLOCK_JPEG, GLAMO_CLOCK_JPEG_RESET
-+      },
-+};
-+
-+void glamo_engine_reset(struct glamo_core *glamo, enum glamo_engine engine)
-+{
-+      struct glamo_script *rst;
-+
-+      if (engine >= ARRAY_SIZE(reset_regs)) {
-+              dev_warn(&glamo->pdev->dev, "unknown engine %u ", engine);
-+              return;
-+      }
-+
-+      rst = &reset_regs[engine];
-+
-+      spin_lock(&glamo->lock);
-+      __reg_set_bit(glamo, rst->reg, rst->val);
-+      spin_unlock(&glamo->lock);
-+
-+      msleep(1);
-+
-+      spin_lock(&glamo->lock);
-+      __reg_clear_bit(glamo, rst->reg, rst->val);
-+      spin_unlock(&glamo->lock);
-+
-+      msleep(1);
-+}
-+EXPORT_SYMBOL_GPL(glamo_engine_reset);
-+
-+enum glamo_pll {
-+      GLAMO_PLL1,
-+      GLAMO_PLL2,
-+};
-+
-+static int glamo_pll_rate(struct glamo_core *glamo,
-+                        enum glamo_pll pll)
-+{
-+      u_int16_t reg;
-+      unsigned int div = 512;
-+      /* FIXME: move osci into platform_data */
-+      unsigned int osci = 32768;
-+
-+      if (osci == 32768)
-+              div = 1;
-+
-+      switch (pll) {
-+      case GLAMO_PLL1:
-+              reg = __reg_read(glamo, GLAMO_REG_PLL_GEN1);
-+              break;
-+      case GLAMO_PLL2:
-+              reg = __reg_read(glamo, GLAMO_REG_PLL_GEN3);
-+              break;
-+      default:
-+              return -EINVAL;
-+      }
-+      return (osci/div)*reg;
-+}
-+
-+int glamo_engine_reclock(struct glamo_core *glamo,
-+                       enum glamo_engine engine,
-+                       int ps)
-+{
-+      int pll, khz;
-+      u_int16_t reg, mask, val = 0;
-+
-+      if (!ps)
-+              return 0;
-+
-+      switch (engine) {
-+      case GLAMO_ENGINE_LCD:
-+              pll = GLAMO_PLL1;
-+              reg = GLAMO_REG_CLOCK_GEN7;
-+              mask = 0xff;
-+              break;
-+      default:
-+              dev_warn(&glamo->pdev->dev,
-+                       "reclock of engine 0x%x not supported\n", engine);
-+              return -EINVAL;
-+              break;
-+      }
-+
-+      pll = glamo_pll_rate(glamo, pll);
-+      khz = 1000000000UL / ps;
-+
-+      if (khz)
-+              val = (pll / khz) / 1000;
-+
-+      dev_dbg(&glamo->pdev->dev,
-+                      "PLL %d, kHZ %d, div %d\n", pll, khz, val);
-+
-+      if (val) {
-+              val--;
-+              reg_set_bit_mask(glamo, reg, mask, val);
-+              msleep(5); /* wait some time to stabilize */
-+
-+              return 0;
-+      } else {
-+              return -EINVAL;
-+      }
-+}
-+EXPORT_SYMBOL_GPL(glamo_engine_reclock);
-+
-+/***********************************************************************
-+ * script support
-+ ***********************************************************************/
-+
-+int glamo_run_script(struct glamo_core *glamo, struct glamo_script *script,
-+                   int len, int may_sleep)
-+{
-+      int i;
-+
-+      for (i = 0; i < len; i++) {
-+              struct glamo_script *line = &script[i];
-+
-+              switch (line->reg) {
-+              case 0xffff:
-+                      return 0;
-+              case 0xfffe:
-+                      if (may_sleep)
-+                              msleep(line->val);
-+                      else
-+                              mdelay(line->val);
-+                      break;
-+              case 0xfffd:
-+                      /* spin until PLLs lock */
-+                      while ((__reg_read(glamo, GLAMO_REG_PLL_GEN5) & 3) != 3)
-+                              ;
-+                      break;
-+              default:
-+                      __reg_write(glamo, script[i].reg, script[i].val);
-+                      break;
-+              }
-+      }
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL(glamo_run_script);
-+
-+static struct glamo_script glamo_init_script[] = {
-+      { GLAMO_REG_CLOCK_HOST,         0x1000 },
-+              { 0xfffe, 2 },
-+      { GLAMO_REG_CLOCK_MEMORY,       0x1000 },
-+      { GLAMO_REG_CLOCK_MEMORY,       0x2000 },
-+      { GLAMO_REG_CLOCK_LCD,          0x1000 },
-+      { GLAMO_REG_CLOCK_MMC,          0x1000 },
-+      { GLAMO_REG_CLOCK_ISP,          0x1000 },
-+      { GLAMO_REG_CLOCK_ISP,          0x3000 },
-+      { GLAMO_REG_CLOCK_JPEG,         0x1000 },
-+      { GLAMO_REG_CLOCK_3D,           0x1000 },
-+      { GLAMO_REG_CLOCK_3D,           0x3000 },
-+      { GLAMO_REG_CLOCK_2D,           0x1000 },
-+      { GLAMO_REG_CLOCK_2D,           0x3000 },
-+      { GLAMO_REG_CLOCK_RISC1,        0x1000 },
-+      { GLAMO_REG_CLOCK_MPEG,         0x3000 },
-+      { GLAMO_REG_CLOCK_MPEG,         0x3000 },
-+      { GLAMO_REG_CLOCK_MPROC,        0x1000 /*0x100f*/ },
-+              { 0xfffe, 2 },
-+      { GLAMO_REG_CLOCK_HOST,         0x0000 },
-+      { GLAMO_REG_CLOCK_MEMORY,       0x0000 },
-+      { GLAMO_REG_CLOCK_LCD,          0x0000 },
-+      { GLAMO_REG_CLOCK_MMC,          0x0000 },
-+#if 0
-+/* unused engines must be left in reset to stop MMC block read "blackouts" */
-+      { GLAMO_REG_CLOCK_ISP,          0x0000 },
-+      { GLAMO_REG_CLOCK_ISP,          0x0000 },
-+      { GLAMO_REG_CLOCK_JPEG,         0x0000 },
-+      { GLAMO_REG_CLOCK_3D,           0x0000 },
-+      { GLAMO_REG_CLOCK_3D,           0x0000 },
-+      { GLAMO_REG_CLOCK_2D,           0x0000 },
-+      { GLAMO_REG_CLOCK_2D,           0x0000 },
-+      { GLAMO_REG_CLOCK_RISC1,        0x0000 },
-+      { GLAMO_REG_CLOCK_MPEG,         0x0000 },
-+      { GLAMO_REG_CLOCK_MPEG,         0x0000 },
-+#endif
-+      { GLAMO_REG_PLL_GEN1,           0x05db },       /* 48MHz */
-+      { GLAMO_REG_PLL_GEN3,           0x09c3 },       /* 80MHz */
-+              { 0xfffd, 0 },
-+      /*
-+       * b9 of this register MUST be zero to get any interrupts on INT#
-+       * the other set bits enable all the engine interrupt sources
-+       */
-+      { GLAMO_REG_IRQ_ENABLE,         0x01ff },
-+      { GLAMO_REG_CLOCK_GEN6,         0x2000 },
-+      { GLAMO_REG_CLOCK_GEN7,         0x0101 },
-+      { GLAMO_REG_CLOCK_GEN8,         0x0100 },
-+      { GLAMO_REG_CLOCK_HOST,         0x000d },
-+      { 0x200,        0x0ef0 },
-+      { 0x202,        0x07ff },
-+      { 0x212,        0x0000 },
-+      { 0x214,        0x4000 },
-+      { 0x216,        0xf00e },
-+      { GLAMO_REG_MEM_TYPE,           0x0874 }, /* 8MB, 16 word pg wr+rd */
-+      { GLAMO_REG_MEM_GEN,            0xafaf }, /* 63 grants min + max */
-+      /*
-+       * the register below originally 0x0108 makes unreliable Glamo MMC
-+       * write operations.  Cranked to 0x05ad to add a wait state, the
-+       * unreliability is not seen after 4GB of write / read testing
-+       */
-+      { GLAMO_REG_MEM_TIMING1,        0x0108 },
-+      { GLAMO_REG_MEM_TIMING2,        0x0010 }, /* Taa = 3 MCLK */
-+      { GLAMO_REG_MEM_TIMING3,        0x0000 },
-+      { GLAMO_REG_MEM_TIMING4,        0x0000 }, /* CE1# delay fall/rise */
-+      { GLAMO_REG_MEM_TIMING5,        0x0000 }, /* UB# LB# */
-+      { GLAMO_REG_MEM_TIMING6,        0x0000 }, /* OE# */
-+      { GLAMO_REG_MEM_TIMING7,        0x0000 }, /* WE# */
-+      { GLAMO_REG_MEM_TIMING8,        0x1002 }, /* MCLK delay, was 0x1000 */
-+      { GLAMO_REG_MEM_TIMING9,        0x6006 },
-+      { GLAMO_REG_MEM_TIMING10,       0x00ff },
-+      { GLAMO_REG_MEM_TIMING11,       0x0001 },
-+      { GLAMO_REG_MEM_POWER1,         0x0020 },
-+      { GLAMO_REG_MEM_POWER2,         0x0000 },
-+      { GLAMO_REG_MEM_DRAM1,          0x0000 },
-+              { 0xfffe, 1 },
-+      { GLAMO_REG_MEM_DRAM1,          0xc100 },
-+              { 0xfffe, 1 },
-+      { GLAMO_REG_MEM_DRAM1,          0xe100 },
-+      { GLAMO_REG_MEM_DRAM2,          0x01d6 },
-+      { GLAMO_REG_CLOCK_MEMORY,       0x000b },
-+};
-+
-+static struct glamo_script glamo_resume_script[] = {
-+      { GLAMO_REG_IRQ_ENABLE,         0x01ff },
-+      { GLAMO_REG_CLOCK_GEN6,         0x2000 },
-+      { GLAMO_REG_CLOCK_GEN7,         0x0001 }, /* 0101 */
-+      { GLAMO_REG_CLOCK_GEN8,         0x0100 },
-+      { GLAMO_REG_CLOCK_HOST,         0x000d },
-+      { 0x200,        0x0ef0 },
-+      { 0x202,        0x07ff },
-+      { 0x212,        0x0000 },
-+      { 0x214,        0x4000 },
-+      { 0x216,        0xf00e },
-+      { GLAMO_REG_MEM_TYPE,           0x0874 }, /* 8MB, 16 word pg wr+rd */
-+      { GLAMO_REG_MEM_GEN,            0xafaf }, /* 63 grants min + max */
-+
-+      { GLAMO_REG_MEM_TIMING1,        0x0108 },
-+      { GLAMO_REG_MEM_TIMING2,        0x0010 }, /* Taa = 3 MCLK */
-+      { GLAMO_REG_MEM_TIMING3,        0x0000 },
-+      { GLAMO_REG_MEM_TIMING4,        0x0000 }, /* CE1# delay fall/rise */
-+      { GLAMO_REG_MEM_TIMING5,        0x0000 }, /* UB# LB# */
-+      { GLAMO_REG_MEM_TIMING6,        0x0000 }, /* OE# */
-+      { GLAMO_REG_MEM_TIMING7,        0x0000 }, /* WE# */
-+      { GLAMO_REG_MEM_TIMING8,        0x1002 }, /* MCLK delay, was 0x1000 */
-+      { GLAMO_REG_MEM_TIMING9,        0x6006 },
-+      { GLAMO_REG_MEM_TIMING10,       0x00ff },
-+      { GLAMO_REG_MEM_TIMING11,       0x0001 },
-+      { GLAMO_REG_MEM_POWER1,         0x0020 },
-+      { GLAMO_REG_MEM_POWER2,         0x0000 },
-+      { GLAMO_REG_MEM_DRAM1,          0x0000 },
-+              { 0xfffe, 1 },
-+      { GLAMO_REG_MEM_DRAM1,          0xc100 },
-+              { 0xfffe, 1 },
-+      { GLAMO_REG_MEM_DRAM1,          0xe100 },
-+      { GLAMO_REG_MEM_DRAM2,          0x01d6 },
-+      { GLAMO_REG_CLOCK_MEMORY,       0x000b },
-+};
-+
-+#if 0 /* MM370 */
-+static const struct glamo_script regs_vram_2mb = {
-+      { GLAMO_REG_CLOCK_MEMORY,       0x3aaa },
-+              { 0xfffe, 50 },
-+      { GLAMO_REG_CLOCK_MEMORY,       0x0aaa },
-+              { 0xfffe, 3 },
-+      { GLAMO_REG_MEM_POWER1,         0x0020 },
-+      { 0x033a,                       0x0000 },
-+      { 0x033c,                       0x0000 },
-+      { 0x033e,                       0x0000 },
-+      { 0x0340,                       0x0000 },
-+      { 0x0342,                       0x0000 },
-+      { 0x0344,                       0x0000 },
-+      { 0x0346,                       0x0240 },
-+      { GLAMO_REG_MEM_TIMING8,        0x1016 },
-+      { GLAMO_REG_MEM_TIMING9,        0x6067 },
-+      { GLAMO_REG_MEM_TIMING10,       0x00ff },
-+      { GLAMO_REG_MEM_TIMING11,       0x0030 },
-+      { GLAMO_REG_MEM_GEN,            0x3fff },
-+      { GLAMO_REG_MEM_GEN,            0xafaf },
-+      { GLAMO_REG_MEM_TIMING1,        0x0108 },
-+      { GLAMO_REG_MEM_TIMING2,        0x0010 },
-+      { GLAMO_REG_MEM_DRAM1,          0x0a00 },
-+              { 0xfffe, 3 },
-+      { GLAMO_REG_MEM_DRAM1,          0xe200 },
-+              { 0xfffe, 1 },
-+};
-+
-+static const struct glamo_script regs_vram_8mb = {
-+      { GLAMO_REG_CLOCK_MEMORY,       0x3aaa },
-+              { 0xfffe, 50 },
-+      { GLAMO_REG_CLOCK_MEMORY,       0x0aaa },
-+              { 0xfffe, 3 },
-+      { GLAMO_REG_MEM_POWER1,         0x0020 },
-+      { 0x033a,                       0x45cf },
-+      { 0x033c,                       0x4240 },
-+      { 0x033e,                       0x53e0 },
-+      { 0x0340,                       0x1401 },
-+      { 0x0342,                       0x0c44 },
-+      { 0x0344,                       0x1d0b },
-+      { 0x0346,                       0x25ac },
-+      { 0x0348,                       0x1953 },
-+              { 0xfffe, 1 },
-+      { GLAMO_REG_MEM_TYPE,           0x087a },
-+      { GLAMO_REG_MEM_DRAM2,          0x01d6 },
-+      { GLAMO_REG_MEM_TIMING8,        0x1060 },
-+      { GLAMO_REG_MEM_TIMING9,        0x6067 },
-+      { GLAMO_REG_MEM_TIMING10,       0x00ff },
-+      { GLAMO_REG_MEM_TIMING11,       0x0030 },
-+      { GLAMO_REG_MEM_GEN,            0x3fff },
-+      { GLAMO_REG_MEM_GEN,            0xafaf },
-+      { GLAMO_REG_MEM_TIMING1,        0x3108 },
-+      { GLAMO_REG_MEM_TIMING2,        0x0010 },
-+      { GLAMO_REG_MEM_DRAM1,          0x0a00 },
-+              { 0xfffe, 3 },
-+      { GLAMO_REG_MEM_DRAM1,          0xe200 },
-+              { 0xfffe, 1 },
-+};
-+#endif
-+
-+enum glamo_power {
-+      GLAMO_POWER_ON,
-+      GLAMO_POWER_STANDBY,
-+      GLAMO_POWER_SUSPEND,
-+};
-+
-+static void glamo_power(struct glamo_core *glamo,
-+                      enum glamo_power new_state)
-+{
-+      spin_lock(&glamo->lock);
-+
-+      switch (new_state) {
-+      case GLAMO_POWER_ON:
-+              /* power up PLL1 and PLL2 */
-+              __reg_set_bit_mask(glamo, GLAMO_REG_DFT_GEN6, 0x0001, 0xffff);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_PLL_GEN3, 0x2000, 0x0000);
-+
-+              /* spin until PLL1 and PLL2 lock */
-+              while ((__reg_read(glamo, GLAMO_REG_PLL_GEN5) & 3) != 3)
-+                      ;
-+
-+              /* enable memory clock and get it out of deep pwrdown */
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_MEMORY,
-+                                 GLAMO_CLOCK_MEM_EN_MOCACLK, 0xffff);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_MEM_DRAM2,
-+                                 GLAMO_MEM_DRAM2_DEEP_PWRDOWN, 0x0000);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_MEM_DRAM1,
-+                                 GLAMO_MEM_DRAM1_SELF_REFRESH, 0x0000);
-+
-+              glamo_run_script(glamo, glamo_resume_script,
-+                               ARRAY_SIZE(glamo_resume_script), 0);
-+
-+              break;
-+      case GLAMO_POWER_STANDBY:
-+              /* enable memory self-refresh */
-+              __reg_set_bit_mask(glamo, GLAMO_REG_MEM_DRAM1,
-+                                 GLAMO_MEM_DRAM1_SELF_REFRESH, 0xffff);
-+              /* stop memory clock */
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_MEMORY,
-+                                 GLAMO_CLOCK_MEM_EN_MOCACLK, 0x0000);
-+              /* power down PLL2 and then PLL1 */
-+              __reg_set_bit_mask(glamo, GLAMO_REG_PLL_GEN3, 0x2000, 0xffff);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_DFT_GEN5, 0x0001, 0xffff);
-+              break;
-+      case GLAMO_POWER_SUSPEND:
-+              __reg_set_bit_mask(glamo, GLAMO_REG_MEM_DRAM2,
-+                                 GLAMO_MEM_DRAM2_DEEP_PWRDOWN, 0xffff);
-+              /* stop memory clock */
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_MEMORY,
-+                                 GLAMO_CLOCK_MEM_EN_MOCACLK, 0x0000);
-+              /* power down PLL2 and then PLL1 */
-+              __reg_set_bit_mask(glamo, GLAMO_REG_PLL_GEN3, 0x2000, 0xffff);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_DFT_GEN5, 0x0001, 0xffff);
-+              break;
-+      }
-+
-+      spin_unlock(&glamo->lock);
-+}
-+
-+#if 0
-+#define MEMDETECT_RETRY       6
-+static unsigned int detect_memsize(struct glamo_core *glamo)
-+{
-+      int i;
-+
-+      /*static const u_int16_t pattern[] = {
-+              0x1111, 0x8a8a, 0x2222, 0x7a7a,
-+              0x3333, 0x6a6a, 0x4444, 0x5a5a,
-+              0x5555, 0x4a4a, 0x6666, 0x3a3a,
-+              0x7777, 0x2a2a, 0x8888, 0x1a1a
-+      }; */
-+
-+      for (i = 0; i < MEMDETECT_RETRY; i++) {
-+              switch (glamo->type) {
-+              case 3600:
-+                      __reg_write(glamo, GLAMO_REG_MEM_TYPE, 0x0072);
-+                      __reg_write(glamo, GLAMO_REG_MEM_DRAM1, 0xc100);
-+                      break;
-+              case 3650:
-+                      switch (glamo->revision) {
-+                      case GLAMO_CORE_REV_A0:
-+                              if (i & 1)
-+                                      __reg_write(glamo, GLAMO_REG_MEM_TYPE,
-+                                                  0x097a);
-+                              else
-+                                      __reg_write(glamo, GLAMO_REG_MEM_TYPE,
-+                                                  0x0173);
-+
-+                              __reg_write(glamo, GLAMO_REG_MEM_DRAM1, 0x0000);
-+                              msleep(1);
-+                              __reg_write(glamo, GLAMO_REG_MEM_DRAM1, 0xc100);
-+                              break;
-+                      default:
-+                              if (i & 1)
-+                                      __reg_write(glamo, GLAMO_REG_MEM_TYPE,
-+                                                  0x0972);
-+                              else
-+                                      __reg_write(glamo, GLAMO_REG_MEM_TYPE,
-+                                                  0x0872);
-+
-+                              __reg_write(glamo, GLAMO_REG_MEM_DRAM1, 0x0000);
-+                              msleep(1);
-+                              __reg_write(glamo, GLAMO_REG_MEM_DRAM1, 0xe100);
-+                              break;
-+                      }
-+                      break;
-+              case 3700:
-+                      /* FIXME */
-+              default:
-+                      break;
-+              }
-+
-+#if 0
-+              /* FIXME: finish implementation */
-+              for (j = 0; j < 8; j++) {
-+                      __
-+#endif
-+      }
-+
-+      return 0;
-+}
-+#endif
-+
-+/* Find out if we can support this version of the Glamo chip */
-+static int glamo_supported(struct glamo_core *glamo)
-+{
-+      u_int16_t dev_id, rev_id; /*, memsize; */
-+
-+      dev_id = __reg_read(glamo, GLAMO_REG_DEVICE_ID);
-+      rev_id = __reg_read(glamo, GLAMO_REG_REVISION_ID);
-+
-+      switch (dev_id) {
-+      case 0x3650:
-+              switch (rev_id) {
-+              case GLAMO_CORE_REV_A2:
-+                      break;
-+              case GLAMO_CORE_REV_A0:
-+              case GLAMO_CORE_REV_A1:
-+              case GLAMO_CORE_REV_A3:
-+                      dev_warn(&glamo->pdev->dev, "untested core revision "
-+                               "%04x, your mileage may vary\n", rev_id);
-+                      break;
-+              default:
-+                      dev_warn(&glamo->pdev->dev, "unknown glamo revision "
-+                               "%04x, your mileage may vary\n", rev_id);
-+                      /* maybe should abort ? */
-+              }
-+              break;
-+      case 0x3600:
-+      case 0x3700:
-+      default:
-+              dev_err(&glamo->pdev->dev, "unsupported Glamo device %04x\n",
-+                      dev_id);
-+              return 0;
-+      }
-+
-+      dev_info(&glamo->pdev->dev, "Detected Glamo core %04x Revision %04x "
-+               "(%uHz CPU / %uHz Memory)\n", dev_id, rev_id,
-+               glamo_pll_rate(glamo, GLAMO_PLL1),
-+               glamo_pll_rate(glamo, GLAMO_PLL2));
-+
-+      return 1;
-+}
-+
-+
-+static int __init glamo_probe(struct platform_device *pdev)
-+{
-+      int rc, irq;
-+      struct glamo_core *glamo;
-+
-+      if (glamo_handle) {
-+              dev_err(&pdev->dev,
-+                      "This driver supports only one instance\n");
-+              return -EBUSY;
-+      }
-+
-+      glamo = kmalloc(GFP_KERNEL, sizeof(*glamo));
-+      if (!glamo)
-+              return -ENOMEM;
-+
-+      spin_lock_init(&glamo->lock);
-+      glamo_handle = glamo;
-+      glamo->pdev = pdev;
-+      glamo->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+      glamo->irq = platform_get_irq(pdev, 0);
-+      glamo->pdata = pdev->dev.platform_data;
-+      if (!glamo->mem || !glamo->pdata) {
-+              dev_err(&pdev->dev, "platform device with no MEM/PDATA ?\n");
-+              rc = -ENOENT;
-+              goto out_free;
-+      }
-+
-+      /* register a number of sibling devices whoise IOMEM resources
-+       * are siblings of pdev's IOMEM resource */
-+#if 0
-+      glamo_core_dev.dev.parent = &pdev.dev;
-+      mangle_mem_resources(glamo_core_dev.resources,
-+                           glamo_core_dev.num_resources, glamo->mem);
-+      glamo_core_dev.resources[1].start = glamo->irq;
-+      glamo_core_dev.resources[1].end = glamo->irq;
-+      platform_device_register(&glamo_core_dev);
-+#endif
-+      /* only remap the generic, hostbus and memory controller registers */
-+      glamo->base = ioremap(glamo->mem->start, GLAMO_REGOFS_VIDCAP);
-+      if (!glamo->base) {
-+              dev_err(&pdev->dev, "failed to ioremap() memory region\n");
-+              goto out_free;
-+      }
-+
-+      /* bring MCI specific stuff over from our MFD platform data */
-+      glamo_mci_def_pdata.glamo_set_mci_power =
-+                                      glamo->pdata->glamo_set_mci_power;
-+      glamo_mci_def_pdata.glamo_irq_is_wired =
-+                                      glamo->pdata->glamo_irq_is_wired;
-+
-+      glamo_mmc_dev.dev.parent = &pdev->dev;
-+      /* we need it later to give to the engine enable and disable */
-+      glamo_mci_def_pdata.pglamo = glamo;
-+      mangle_mem_resources(glamo_mmc_dev.resource,
-+                           glamo_mmc_dev.num_resources, glamo->mem);
-+      platform_device_register(&glamo_mmc_dev);
-+
-+      glamo_2d_dev.dev.parent = &pdev->dev;
-+      mangle_mem_resources(glamo_2d_dev.resource,
-+                           glamo_2d_dev.num_resources, glamo->mem);
-+      platform_device_register(&glamo_2d_dev);
-+
-+      glamo_3d_dev.dev.parent = &pdev->dev;
-+      mangle_mem_resources(glamo_3d_dev.resource,
-+                           glamo_3d_dev.num_resources, glamo->mem);
-+      platform_device_register(&glamo_3d_dev);
-+
-+      glamo_jpeg_dev.dev.parent = &pdev->dev;
-+      mangle_mem_resources(glamo_jpeg_dev.resource,
-+                           glamo_jpeg_dev.num_resources, glamo->mem);
-+      platform_device_register(&glamo_jpeg_dev);
-+
-+      glamo_mpeg_dev.dev.parent = &pdev->dev;
-+      mangle_mem_resources(glamo_mpeg_dev.resource,
-+                           glamo_mpeg_dev.num_resources, glamo->mem);
-+      platform_device_register(&glamo_mpeg_dev);
-+
-+      glamo->pdata->glamo = glamo;
-+      glamo_fb_dev.dev.parent = &pdev->dev;
-+      glamo_fb_dev.dev.platform_data = glamo->pdata;
-+      mangle_mem_resources(glamo_fb_dev.resource,
-+                           glamo_fb_dev.num_resources, glamo->mem);
-+      platform_device_register(&glamo_fb_dev);
-+
-+      glamo->pdata->spigpio_info->glamo = glamo;
-+      glamo_spigpio_dev.dev.parent = &pdev->dev;
-+      glamo_spigpio_dev.dev.platform_data = glamo->pdata->spigpio_info;
-+      platform_device_register(&glamo_spigpio_dev);
-+
-+      /* only request the generic, hostbus and memory controller MMIO */
-+      glamo->mem = request_mem_region(glamo->mem->start,
-+                                      GLAMO_REGOFS_VIDCAP, "glamo-core");
-+      if (!glamo->mem) {
-+              dev_err(&pdev->dev, "failed to request memory region\n");
-+              goto out_free;
-+      }
-+
-+      if (!glamo_supported(glamo)) {
-+              dev_err(&pdev->dev, "This Glamo is not supported\n");
-+              goto out_free;
-+      }
-+
-+      platform_set_drvdata(pdev, glamo);
-+
-+      dev_dbg(&glamo->pdev->dev, "running init script\n");
-+      glamo_run_script(glamo, glamo_init_script,
-+                       ARRAY_SIZE(glamo_init_script), 1);
-+
-+      dev_info(&glamo->pdev->dev, "Glamo core now %uHz CPU / %uHz Memory)\n",
-+               glamo_pll_rate(glamo, GLAMO_PLL1),
-+               glamo_pll_rate(glamo, GLAMO_PLL2));
-+
-+      for (irq = IRQ_GLAMO(0); irq <= IRQ_GLAMO(8); irq++) {
-+              set_irq_chip(irq, &glamo_irq_chip);
-+              set_irq_handler(irq, handle_level_irq);
-+              set_irq_flags(irq, IRQF_VALID);
-+      }
-+
-+      if (glamo->pdata->glamo_irq_is_wired &&
-+          !glamo->pdata->glamo_irq_is_wired()) {
-+              set_irq_chained_handler(glamo->irq, glamo_irq_demux_handler);
-+              set_irq_type(glamo->irq, IRQT_FALLING);
-+              glamo->irq_works = 1;
-+      } else
-+              glamo->irq_works = 0;
-+      return 0;
-+
-+out_free:
-+      glamo_handle = NULL;
-+      kfree(glamo);
-+      return rc;
-+}
-+
-+static int glamo_remove(struct platform_device *pdev)
-+{
-+      struct glamo_core *glamo = platform_get_drvdata(pdev);
-+      int irq;
-+
-+      disable_irq(glamo->irq);
-+      set_irq_chained_handler(glamo->irq, NULL);
-+
-+      for (irq = IRQ_GLAMO(0); irq <= IRQ_GLAMO(8); irq++) {
-+              set_irq_flags(irq, 0);
-+              set_irq_chip(irq, NULL);
-+      }
-+
-+      platform_set_drvdata(pdev, NULL);
-+      platform_device_unregister(&glamo_fb_dev);
-+      platform_device_unregister(&glamo_mmc_dev);
-+      iounmap(glamo->base);
-+      release_mem_region(glamo->mem->start, GLAMO_REGOFS_VIDCAP);
-+      glamo_handle = NULL;
-+      kfree(glamo);
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int glamo_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+      return 0;
-+}
-+
-+static int glamo_resume(struct platform_device *pdev)
-+{
-+      return 0;
-+}
-+#else
-+#define glamo_suspend NULL
-+#define glamo_resume  NULL
-+#endif
-+
-+static struct platform_driver glamo_driver = {
-+      .probe          = glamo_probe,
-+      .remove         = glamo_remove,
-+      .suspend        = glamo_suspend,
-+      .resume         = glamo_resume,
-+      .driver         = {
-+              .name   = "glamo3362",
-+              .owner  = THIS_MODULE,
-+      },
-+};
-+
-+static int __devinit glamo_init(void)
-+{
-+      return platform_driver_register(&glamo_driver);
-+}
-+
-+static void __exit glamo_cleanup(void)
-+{
-+      platform_driver_unregister(&glamo_driver);
-+}
-+
-+module_init(glamo_init);
-+module_exit(glamo_cleanup);
-+
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_DESCRIPTION("Smedia Glamo 336x/337x core/resource driver");
-+MODULE_LICENSE("GPL");
-diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h
-new file mode 100644
-index 0000000..cf89f03
---- /dev/null
-+++ b/drivers/mfd/glamo/glamo-core.h
-@@ -0,0 +1,91 @@
-+#ifndef __GLAMO_CORE_H
-+#define __GLAMO_CORE_H
-+
-+#include <asm/system.h>
-+
-+
-+/* for the time being, we put the on-screen framebuffer into the lowest
-+ * VRAM space.  This should make the code easily compatible with the various
-+ * 2MB/4MB/8MB variants of the Smedia chips */
-+#define GLAMO_OFFSET_VRAM     0x800000
-+#define GLAMO_OFFSET_FB       (GLAMO_OFFSET_VRAM)
-+
-+/* we only allocate the minimum possible size for the framebuffer to make
-+ * sure we have sufficient memory for other functions of the chip */
-+//#define GLAMO_FB_SIZE       (640*480*4)     /* == 0x12c000 */
-+#define GLAMO_INTERNAL_RAM_SIZE 0x800000
-+#define GLAMO_MMC_BUFFER_SIZE (64 * 1024)
-+#define GLAMO_FB_SIZE (GLAMO_INTERNAL_RAM_SIZE - GLAMO_MMC_BUFFER_SIZE)
-+
-+
-+struct glamo_core {
-+      int irq;
-+      int irq_works; /* 0 means PCB does not support Glamo IRQ */
-+      struct resource *mem;
-+      struct resource *mem_core;
-+      void __iomem *base;
-+      struct platform_device *pdev;
-+      struct glamofb_platform_data *pdata;
-+      u_int16_t type;
-+      u_int16_t revision;
-+      spinlock_t lock;
-+};
-+
-+struct glamo_script {
-+      u_int16_t reg;
-+      u_int16_t val;
-+};
-+
-+int glamo_run_script(struct glamo_core *glamo,
-+                   struct glamo_script *script, int len, int may_sleep);
-+
-+enum glamo_engine {
-+      GLAMO_ENGINE_CAPTURE,
-+      GLAMO_ENGINE_ISP,
-+      GLAMO_ENGINE_JPEG,
-+      GLAMO_ENGINE_MPEG_ENC,
-+      GLAMO_ENGINE_MPEG_DEC,
-+      GLAMO_ENGINE_LCD,
-+      GLAMO_ENGINE_CMDQ,
-+      GLAMO_ENGINE_2D,
-+      GLAMO_ENGINE_3D,
-+      GLAMO_ENGINE_MMC,
-+      GLAMO_ENGINE_MICROP0,
-+      GLAMO_ENGINE_RISC,
-+      GLAMO_ENGINE_MICROP1_MPEG_ENC,
-+      GLAMO_ENGINE_MICROP1_MPEG_DEC,
-+#if 0
-+      GLAMO_ENGINE_H264_DEC,
-+      GLAMO_ENGINE_RISC1,
-+      GLAMO_ENGINE_SPI,
-+#endif
-+      __NUM_GLAMO_ENGINES
-+};
-+
-+struct glamo_mci_pdata {
-+      struct glamo_core * pglamo;
-+      unsigned int    gpio_detect;
-+      unsigned int    gpio_wprotect;
-+      unsigned long   ocr_avail;
-+      void            (*glamo_set_mci_power)(unsigned char power_mode,
-+                                   unsigned short vdd);
-+      int             (*glamo_irq_is_wired)(void);
-+};
-+
-+
-+static inline void glamo_reg_access_delay(void)
-+{
-+      int n;
-+
-+      for (n = 0; n != 2; n++)
-+              nop();
-+}
-+
-+
-+int glamo_engine_enable(struct glamo_core *glamo, enum glamo_engine engine);
-+int glamo_engine_disable(struct glamo_core *glamo, enum glamo_engine engine);
-+void glamo_engine_reset(struct glamo_core *glamo, enum glamo_engine engine);
-+int glamo_engine_reclock(struct glamo_core *glamo,
-+                       enum glamo_engine engine, int ps);
-+
-+#endif /* __GLAMO_CORE_H */
-diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c
-new file mode 100644
-index 0000000..394a0ad
---- /dev/null
-+++ b/drivers/mfd/glamo/glamo-fb.c
-@@ -0,0 +1,822 @@
-+/* Smedia Glamo 336x/337x driver
-+ *
-+ * (C) 2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/errno.h>
-+#include <linux/string.h>
-+#include <linux/mm.h>
-+#include <linux/slab.h>
-+#include <linux/delay.h>
-+#include <linux/fb.h>
-+#include <linux/init.h>
-+#include <linux/vmalloc.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/interrupt.h>
-+#include <linux/workqueue.h>
-+#include <linux/wait.h>
-+#include <linux/platform_device.h>
-+#include <linux/clk.h>
-+
-+#include <asm/io.h>
-+#include <asm/uaccess.h>
-+#include <asm/div64.h>
-+
-+#ifdef CONFIG_PM
-+#include <linux/pm.h>
-+#endif
-+
-+#include <linux/glamofb.h>
-+
-+#include "glamo-regs.h"
-+#include "glamo-core.h"
-+
-+#ifdef DEBUG
-+#define GLAMO_LOG(...)
-+#else
-+#define GLAMO_LOG(...) \
-+do { \
-+      printk(KERN_DEBUG "in %s:%s:%d", __FILE__, __func__, __LINE__); \
-+      printk(KERN_DEBUG __VA_ARGS__); \
-+} while (0);
-+#endif
-+
-+
-+#define RESSIZE(ressource) (((ressource)->end - (ressource)->start)+1)
-+
-+struct glamofb_handle {
-+      struct fb_info *fb;
-+      struct device *dev;
-+      struct resource *reg;
-+      struct resource *fb_res;
-+      char __iomem *base;
-+      struct glamofb_platform_data *mach_info;
-+      char __iomem *cursor_addr;
-+      u_int32_t pseudo_pal[16];
-+};
-+
-+/* 'sibling' spi device for lcm init */
-+static struct platform_device glamo_spi_dev = {
-+      .name           = "glamo-lcm-spi",
-+};
-+
-+
-+static int reg_read(struct glamofb_handle *glamo,
-+                         u_int16_t reg)
-+{
-+      glamo_reg_access_delay();
-+      return readw(glamo->base + reg);
-+}
-+
-+static void reg_write(struct glamofb_handle *glamo,
-+                           u_int16_t reg, u_int16_t val)
-+{
-+      glamo_reg_access_delay();
-+      writew(val, glamo->base + reg);
-+}
-+
-+static struct glamo_script glamo_regs[] = {
-+      { GLAMO_REG_LCD_MODE1, 0x0020 },
-+      /* no display rotation, no hardware cursor, no dither, no gamma,
-+       * no retrace flip, vsync low-active, hsync low active,
-+       * no TVCLK, no partial display, hw dest color from fb,
-+       * no partial display mode, LCD1, software flip,  */
-+      { GLAMO_REG_LCD_MODE2, 0x1020 },
-+        /* no video flip, no ptr, no ptr, dhclk,
-+         * normal mode,  no cpuif,
-+         * res, serial msb first, single fb, no fr ctrl,
-+         * cpu if bits all zero, no crc
-+         * 0000 0000 0010  0000 */
-+      { GLAMO_REG_LCD_MODE3, 0x0b40 },
-+        /* src data rgb565, res, 18bit rgb666
-+         * 000 01 011 0100 0000 */
-+      { GLAMO_REG_LCD_POLARITY, 0x440c },
-+        /* DE high active, no cpu/lcd if, cs0 force low, a0 low active,
-+         * np cpu if, 9bit serial data, sclk rising edge latch data
-+         * 01 00 0 100 0 000 01 0 0 */
-+      { GLAMO_REG_LCD_A_BASE1, 0x0000 }, /* display A base address 15:0 */
-+      { GLAMO_REG_LCD_A_BASE2, 0x0000 }, /* display A base address 22:16 */
-+};
-+
-+static int glamofb_run_script(struct glamofb_handle *glamo,
-+                              struct glamo_script *script, int len)
-+{
-+      int i;
-+
-+      for (i = 0; i < len; i++) {
-+              struct glamo_script *line = &script[i];
-+
-+              if (line->reg == 0xffff)
-+                      return 0;
-+              else if (line->reg == 0xfffe)
-+                      msleep(line->val);
-+              else
-+                      reg_write(glamo, script[i].reg, script[i].val);
-+      }
-+
-+      return 0;
-+}
-+
-+static int glamofb_check_var(struct fb_var_screeninfo *var,
-+                           struct fb_info *info)
-+{
-+      struct glamofb_handle *glamo = info->par;
-+
-+      if (var->yres > glamo->mach_info->yres.max)
-+              var->yres = glamo->mach_info->yres.max;
-+      else if (var->yres < glamo->mach_info->yres.min)
-+              var->yres = glamo->mach_info->yres.min;
-+
-+      if (var->xres > glamo->mach_info->xres.max)
-+              var->xres = glamo->mach_info->xres.max;
-+      else if (var->xres < glamo->mach_info->xres.min)
-+              var->xres = glamo->mach_info->xres.min;
-+
-+      if (var->bits_per_pixel > glamo->mach_info->bpp.max)
-+              var->bits_per_pixel = glamo->mach_info->bpp.max;
-+      else if (var->bits_per_pixel < glamo->mach_info->bpp.min)
-+              var->bits_per_pixel = glamo->mach_info->bpp.min;
-+
-+      /* FIXME: set rgb positions */
-+      switch (var->bits_per_pixel) {
-+      case 16:
-+              switch (reg_read(glamo, GLAMO_REG_LCD_MODE3) & 0xc000) {
-+              case GLAMO_LCD_SRC_RGB565:
-+                      var->red.offset         = 11;
-+                      var->green.offset       = 5;
-+                      var->blue.offset        = 0;
-+                      var->red.length         = 5;
-+                      var->green.length       = 6;
-+                      var->blue.length        = 5;
-+                      var->transp.length      = 0;
-+                      break;
-+              case GLAMO_LCD_SRC_ARGB1555:
-+                      var->transp.offset      = 15;
-+                      var->red.offset         = 10;
-+                      var->green.offset       = 5;
-+                      var->blue.offset        = 0;
-+                      var->transp.length      = 1;
-+                      var->red.length         = 5;
-+                      var->green.length       = 5;
-+                      var->blue.length        = 5;
-+                      break;
-+              case GLAMO_LCD_SRC_ARGB4444:
-+                      var->transp.offset      = 12;
-+                      var->red.offset         = 8;
-+                      var->green.offset       = 4;
-+                      var->blue.offset        = 0;
-+                      var->transp.length      = 4;
-+                      var->red.length         = 4;
-+                      var->green.length       = 4;
-+                      var->blue.length        = 4;
-+                      break;
-+              }
-+              break;
-+      case 24:
-+      case 32:
-+      default:
-+              /* The Smedia Glamo doesn't support anything but 16bit color */
-+              printk(KERN_ERR
-+                     "Smedia driver does not [yet?] support 24/32bpp\n");
-+              return -EINVAL;
-+              break;
-+      }
-+
-+      return 0;
-+}
-+
-+static void reg_set_bit_mask(struct glamofb_handle *glamo,
-+                           u_int16_t reg, u_int16_t mask,
-+                           u_int16_t val)
-+{
-+      u_int16_t tmp;
-+
-+      val &= mask;
-+
-+      tmp = reg_read(glamo, reg);
-+      tmp &= ~mask;
-+      tmp |= val;
-+      reg_write(glamo, reg, tmp);
-+}
-+
-+#define GLAMO_LCD_WIDTH_MASK 0x03FF
-+#define GLAMO_LCD_HEIGHT_MASK 0x03FF
-+#define GLAMO_LCD_PITCH_MASK 0x07FE
-+#define GLAMO_LCD_HV_TOTAL_MASK 0x03FF
-+#define GLAMO_LCD_HV_RETR_START_MASK 0x03FF
-+#define GLAMO_LCD_HV_RETR_END_MASK 0x03FF
-+#define GLAMO_LCD_HV_RETR_DISP_START_MASK 0x03FF
-+#define GLAMO_LCD_HV_RETR_DISP_END_MASK 0x03FF
-+
-+enum orientation {
-+    ORIENTATION_PORTRAIT,
-+    ORIENTATION_LANDSCAPE
-+};
-+
-+
-+static void rotate_lcd(struct glamofb_handle *glamo,
-+                       __u32 rotation)
-+{
-+      int glamo_rot;
-+
-+      switch (rotation) {
-+              case FB_ROTATE_UR:
-+                      glamo_rot = GLAMO_LCD_ROT_MODE_0;
-+                      break;
-+              case FB_ROTATE_CW:
-+                      glamo_rot = GLAMO_LCD_ROT_MODE_90;
-+                      break;
-+              case FB_ROTATE_UD:
-+                      glamo_rot = GLAMO_LCD_ROT_MODE_180;
-+                      break;
-+              case FB_ROTATE_CCW:
-+                      glamo_rot = GLAMO_LCD_ROT_MODE_270;
-+                      break;
-+              default:
-+                      glamo_rot = GLAMO_LCD_ROT_MODE_0;
-+                      break;
-+      }
-+      glamofb_cmd_mode(glamo, 1);
-+      reg_set_bit_mask(glamo,
-+                       GLAMO_REG_LCD_WIDTH,
-+                       GLAMO_LCD_ROT_MODE_MASK,
-+                       glamo_rot);
-+      reg_set_bit_mask(glamo,
-+                       GLAMO_REG_LCD_MODE1,
-+                       GLAMO_LCD_MODE1_ROTATE_EN,
-+                       (glamo_rot != GLAMO_LCD_ROT_MODE_0)?
-+                               GLAMO_LCD_MODE1_ROTATE_EN : 0);
-+      glamofb_cmd_mode(glamo, 0);
-+}
-+
-+static enum orientation get_orientation(struct fb_var_screeninfo *var)
-+{
-+      GLAMO_LOG("mark\n")
-+      if (var->xres <= var->yres) {
-+              GLAMO_LOG("portrait\n")
-+              return ORIENTATION_PORTRAIT;
-+      }
-+      GLAMO_LOG("landscape\n")
-+      return ORIENTATION_LANDSCAPE;
-+}
-+
-+static int will_orientation_change(struct fb_var_screeninfo *var)
-+{
-+      enum  orientation orient = get_orientation(var);
-+      switch (orient) {
-+              case ORIENTATION_LANDSCAPE:
-+                      if (var->rotate == FB_ROTATE_UR || var->rotate == FB_ROTATE_UD)
-+                              return 1;
-+                      break;
-+              case ORIENTATION_PORTRAIT:
-+                      if (var->rotate == FB_ROTATE_CW || var->rotate == FB_ROTATE_CCW)
-+                              return 1;
-+                      break;
-+      }
-+      return 0;
-+}
-+
-+static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
-+                                        struct fb_var_screeninfo *var)
-+{
-+      int sync, bp, disp, fp, total, xres, yres, pitch, orientation_changing;
-+
-+      GLAMO_LOG("enter: glamo:%#x, var:%#x\n", (unsigned)glamo, (unsigned)var);
-+      if (!glamo || !var)
-+              return;
-+
-+      glamofb_cmd_mode(glamo, 1);
-+
-+      if (var->pixclock)
-+              glamo_engine_reclock(glamo->mach_info->glamo,
-+                                   GLAMO_ENGINE_LCD,
-+                                   var->pixclock);
-+
-+      xres = var->xres;
-+      yres = var->yres;
-+      GLAMO_LOG("xres:%d, yres:%d, rotate:%d\n", xres, yres, var->rotate);
-+
-+      /*
-+       * figure out if orientation is going to change
-+       */
-+      orientation_changing = will_orientation_change(var);
-+      GLAMO_LOG("orientation_changing:%d\n", orientation_changing);
-+
-+        /*
-+         * adjust the pitch according to new orientation to come
-+         */
-+        if (orientation_changing) {
-+              pitch = var->yres * var->bits_per_pixel / 8;
-+        } else {
-+              pitch = var->xres * var->bits_per_pixel / 8;
-+        }
-+      GLAMO_LOG("pitch:%d\n", pitch);
-+
-+      /*
-+       * set the awaiten LCD geometry
-+       */
-+      reg_set_bit_mask(glamo,
-+                       GLAMO_REG_LCD_WIDTH,
-+                       GLAMO_LCD_WIDTH_MASK,
-+                       xres);
-+      reg_set_bit_mask(glamo,
-+                       GLAMO_REG_LCD_HEIGHT,
-+                       GLAMO_LCD_HEIGHT_MASK,
-+                       yres);
-+      reg_set_bit_mask(glamo,
-+                       GLAMO_REG_LCD_PITCH,
-+                       GLAMO_LCD_PITCH_MASK,
-+                       pitch);
-+
-+      GLAMO_LOG("mark:\n");
-+      /*
-+       * honour the rotation request
-+       */
-+      rotate_lcd(glamo, var->rotate);
-+
-+      /*
-+       * update the reported geometry
-+       * of the framebuffer.
-+       */
-+      if (orientation_changing) {
-+              var->xres_virtual = var->xres = yres;
-+              var->yres_virtual = var->yres = xres;
-+      } else {
-+              var->xres_virtual = var->xres = xres;
-+              var->yres_virtual = var->yres = yres;
-+      }
-+
-+      GLAMO_LOG("reported res:(%d,%d)\n", var->xres, var->yres);
-+      /*
-+       * update scannout timings
-+       */
-+      sync = 0;
-+      bp = sync + var->hsync_len;
-+      disp = bp + var->left_margin;
-+      fp = disp + xres;
-+      total = fp + var->right_margin;
-+
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_HORIZ_TOTAL,
-+                       GLAMO_LCD_HV_TOTAL_MASK, total);
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_HORIZ_RETR_START,
-+                       GLAMO_LCD_HV_RETR_START_MASK, sync);
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_HORIZ_RETR_END,
-+                       GLAMO_LCD_HV_RETR_END_MASK, bp);
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_HORIZ_DISP_START,
-+                        GLAMO_LCD_HV_RETR_DISP_START_MASK, disp);
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_HORIZ_DISP_END,
-+                       GLAMO_LCD_HV_RETR_DISP_END_MASK, fp);
-+
-+      GLAMO_LOG("mark:\n");
-+
-+      sync = 0;
-+      bp = sync + var->vsync_len;
-+      disp = bp + var->upper_margin;
-+      fp = disp + yres;
-+      total = fp + var->lower_margin;
-+
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_VERT_TOTAL,
-+                       GLAMO_LCD_HV_TOTAL_MASK, total);
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_VERT_RETR_START,
-+                        GLAMO_LCD_HV_RETR_START_MASK, sync);
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_VERT_RETR_END,
-+                       GLAMO_LCD_HV_RETR_END_MASK, bp);
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_VERT_DISP_START,
-+                       GLAMO_LCD_HV_RETR_DISP_START_MASK, disp);
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_VERT_DISP_END,
-+                       GLAMO_LCD_HV_RETR_DISP_END_MASK, fp);
-+
-+      GLAMO_LOG("mark:\n");
-+      glamofb_cmd_mode(glamo, 0);
-+
-+      GLAMO_LOG("leave:\n");
-+}
-+
-+static int glamofb_set_par(struct fb_info *info)
-+{
-+      struct glamofb_handle *glamo = info->par;
-+      struct fb_var_screeninfo *var = &info->var;
-+
-+      switch (var->bits_per_pixel) {
-+      case 16:
-+              info->fix.visual = FB_VISUAL_TRUECOLOR;
-+              break;
-+      default:
-+              printk("Smedia driver doesn't support != 16bpp\n");
-+              return -EINVAL;
-+      }
-+
-+      info->fix.line_length = (var->xres * var->bits_per_pixel) / 8;
-+
-+      glamofb_update_lcd_controller(glamo, var);
-+
-+      return 0;
-+}
-+
-+static int glamofb_blank(int blank_mode, struct fb_info *info)
-+{
-+      /* FIXME */
-+      return 0;
-+}
-+
-+static inline unsigned int chan_to_field(unsigned int chan, struct fb_bitfield *bf)
-+{
-+      chan &= 0xffff;
-+      chan >>= 16 - bf->length;
-+      return chan << bf->offset;
-+}
-+
-+static int glamofb_setcolreg(unsigned regno,
-+                           unsigned red, unsigned green, unsigned blue,
-+                           unsigned transp, struct fb_info *info)
-+{
-+      struct glamofb_handle *glamo = info->par;
-+      unsigned int val;
-+
-+      switch (glamo->fb->fix.visual) {
-+      case FB_VISUAL_TRUECOLOR:
-+      case FB_VISUAL_DIRECTCOLOR:
-+              /* true-colour, use pseuo-palette */
-+
-+              if (regno < 16) {
-+                      u32 *pal = glamo->fb->pseudo_palette;
-+
-+                      val  = chan_to_field(red, &glamo->fb->var.red);
-+                      val |= chan_to_field(green, &glamo->fb->var.green);
-+                      val |= chan_to_field(blue, &glamo->fb->var.blue);
-+
-+                      pal[regno] = val;
-+              };
-+              break;
-+      default:
-+              return 1; /* unknown type */
-+      }
-+
-+      return 0;
-+}
-+
-+static int glamofb_cursor(struct fb_info *info, struct fb_cursor *cursor)
-+{
-+      struct glamofb_handle *glamo = info->par;
-+      u_int16_t reg;
-+
-+      if (cursor->image.depth > 2)
-+              return -EINVAL;
-+
-+      reg = reg_read(glamo, GLAMO_REG_LCD_MODE1);
-+
-+      if (cursor->enable)
-+              reg_write(glamo, GLAMO_REG_LCD_MODE1,
-+                        reg | GLAMO_LCD_MODE1_CURSOR_EN);
-+      else
-+              reg_write(glamo, GLAMO_REG_LCD_MODE1,
-+                        reg & ~GLAMO_LCD_MODE1_CURSOR_EN);
-+
-+      if (cursor->set & FB_CUR_SETPOS) {
-+              reg_write(glamo, GLAMO_REG_LCD_CURSOR_X_POS,
-+                        cursor->image.dx);
-+              reg_write(glamo, GLAMO_REG_LCD_CURSOR_Y_POS,
-+                        cursor->image.dy);
-+      }
-+
-+      if (cursor->set & FB_CUR_SETCMAP) {
-+              /* FIXME */
-+      }
-+
-+      if (cursor->set & FB_CUR_SETSIZE ||
-+          cursor->set & (FB_CUR_SETIMAGE | FB_CUR_SETSHAPE)) {
-+              int x, y, op;
-+              const unsigned char *pcol = cursor->image.data;
-+              const unsigned char *pmsk = cursor->mask;
-+              void __iomem *dst = glamo->cursor_addr;
-+              unsigned char dcol = 0;
-+              unsigned char dmsk = 0;
-+
-+              reg_write(glamo, GLAMO_REG_LCD_CURSOR_X_SIZE,
-+                        cursor->image.width);
-+              reg_write(glamo, GLAMO_REG_LCD_CURSOR_PITCH,
-+                        cursor->image.width * 2);
-+              reg_write(glamo, GLAMO_REG_LCD_CURSOR_Y_SIZE,
-+                        cursor->image.height);
-+
-+              for (op = 0; op < (cursor->image.width *
-+                                 cursor->image.height * 2)/8; op += 4)
-+                      writel(0x0, dst + op);
-+
-+              for (y = 0; y < cursor->image.height; y++) {
-+                      for (x = 0; x < cursor->image.width; x++) {
-+                              if ((x % 8) == 0) {
-+                                      dcol = *pcol++;
-+                                      dmsk = *pmsk++;
-+                              } else {
-+                                      dcol >>= 1;
-+                                      dmsk >>= 1;
-+                              }
-+
-+                              if (dmsk & 1) {
-+                                      unsigned int op;
-+
-+                                      op = (dcol & 1) ? 1 : 3;
-+                                      op <<= ((x % 4) * 2);
-+
-+                                      op |= readb(dst + (x / 4));
-+                                      writeb(op, dst + (x / 4));
-+                              }
-+                      }
-+              }
-+      }
-+}
-+
-+static inline int glamofb_cmdq_empty(struct glamofb_handle *gfb)
-+{
-+      return reg_read(gfb, GLAMO_REG_LCD_STATUS1) & (1 << 15);
-+}
-+
-+void glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
-+{
-+      dev_dbg(gfb->dev, "glamofb_cmd_mode(gfb=%p, on=%d)\n", gfb, on);
-+      if (on) {
-+              dev_dbg(gfb->dev, "%s: waiting for cmdq empty: ",
-+                      __FUNCTION__);
-+              while (!glamofb_cmdq_empty(gfb))
-+                      yield();
-+              dev_dbg(gfb->dev, "empty!\n");
-+
-+              /* display the entire frame then switch to command */
-+              reg_write(gfb, GLAMO_REG_LCD_COMMAND1,
-+                        GLAMO_LCD_CMD_TYPE_DISP |
-+                        GLAMO_LCD_CMD_DATA_FIRE_VSYNC);
-+
-+              /* wait until LCD is idle */
-+              dev_dbg(gfb->dev, "waiting for LCD idle: ");
-+              while (!reg_read(gfb, GLAMO_REG_LCD_STATUS2) & (1 << 12))
-+                      yield();
-+              dev_dbg(gfb->dev, "idle!\n");
-+
-+              msleep(90);
-+      } else {
-+              /* RGB interface needs vsync/hsync */
-+              if (reg_read(gfb, GLAMO_REG_LCD_MODE3) & GLAMO_LCD_MODE3_RGB)
-+                      reg_write(gfb, GLAMO_REG_LCD_COMMAND1,
-+                                GLAMO_LCD_CMD_TYPE_DISP |
-+                                GLAMO_LCD_CMD_DATA_DISP_SYNC);
-+
-+              reg_write(gfb, GLAMO_REG_LCD_COMMAND1,
-+                        GLAMO_LCD_CMD_TYPE_DISP |
-+                        GLAMO_LCD_CMD_DATA_DISP_FIRE);
-+      }
-+}
-+EXPORT_SYMBOL_GPL(glamofb_cmd_mode);
-+
-+int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val)
-+{
-+      dev_dbg(gfb->dev, "%s: waiting for cmdq empty\n",
-+              __FUNCTION__);
-+      while (!glamofb_cmdq_empty(gfb))
-+              yield();
-+      dev_dbg(gfb->dev, "idle, writing 0x%04x\n", val);
-+
-+      reg_write(gfb, GLAMO_REG_LCD_COMMAND1, val);
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(glamofb_cmd_write);
-+
-+static struct fb_ops glamofb_ops = {
-+      .owner          = THIS_MODULE,
-+      .fb_check_var   = glamofb_check_var,
-+      .fb_set_par     = glamofb_set_par,
-+      .fb_blank       = glamofb_blank,
-+      .fb_setcolreg   = glamofb_setcolreg,
-+      //.fb_cursor    = glamofb_cursor,
-+      .fb_fillrect    = cfb_fillrect,
-+      .fb_copyarea    = cfb_copyarea,
-+      .fb_imageblit   = cfb_imageblit,
-+};
-+
-+static int glamofb_init_regs(struct glamofb_handle *glamo)
-+{
-+      struct fb_info *info = glamo->fb;
-+
-+      glamofb_check_var(&info->var, info);
-+      glamofb_run_script(glamo, glamo_regs, ARRAY_SIZE(glamo_regs));
-+      glamofb_set_par(info);
-+
-+      return 0;
-+}
-+
-+static int __init glamofb_probe(struct platform_device *pdev)
-+{
-+      int rc = -EIO;
-+      struct fb_info *fbinfo;
-+      struct glamofb_handle *glamofb;
-+      struct glamofb_platform_data *mach_info = pdev->dev.platform_data;
-+
-+      printk(KERN_INFO "SMEDIA Glamo frame buffer driver (C) 2007 "
-+              "OpenMoko, Inc.\n");
-+
-+      fbinfo = framebuffer_alloc(sizeof(struct glamofb_handle), &pdev->dev);
-+      if (!fbinfo)
-+              return -ENOMEM;
-+
-+      glamofb = fbinfo->par;
-+      glamofb->fb = fbinfo;
-+      glamofb->dev = &pdev->dev;
-+
-+      strcpy(fbinfo->fix.id, "SMedia Glamo");
-+
-+      glamofb->reg = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-+                                                  "glamo-fb-regs");
-+      if (!glamofb->reg) {
-+              dev_err(&pdev->dev, "platform device with no registers?\n");
-+              rc = -ENOENT;
-+              goto out_free;
-+      }
-+
-+      glamofb->fb_res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
-+                                                      "glamo-fb-mem");
-+      if (!glamofb->fb_res) {
-+              dev_err(&pdev->dev, "platform device with no memory ?\n");
-+              rc = -ENOENT;
-+              goto out_free;
-+      }
-+
-+      glamofb->reg = request_mem_region(glamofb->reg->start,
-+                                        RESSIZE(glamofb->reg), pdev->name);
-+      if (!glamofb->reg) {
-+              dev_err(&pdev->dev, "failed to request mmio region\n");
-+              goto out_free;
-+      }
-+
-+      glamofb->fb_res = request_mem_region(glamofb->fb_res->start,
-+                                           mach_info->fb_mem_size,
-+                                           pdev->name);
-+      if (!glamofb->fb_res) {
-+              dev_err(&pdev->dev, "failed to request vram region\n");
-+              goto out_release_reg;
-+      }
-+
-+      /* we want to remap only the registers required for this core
-+       * driver. */
-+      glamofb->base = ioremap(glamofb->reg->start, RESSIZE(glamofb->reg));
-+      if (!glamofb->base) {
-+              dev_err(&pdev->dev, "failed to ioremap() mmio memory\n");
-+              goto out_release_fb;
-+      }
-+      fbinfo->fix.smem_start = (unsigned long) glamofb->fb_res->start;
-+      fbinfo->fix.smem_len = mach_info->fb_mem_size;
-+
-+      fbinfo->screen_base = ioremap(glamofb->fb_res->start,
-+                                     RESSIZE(glamofb->fb_res));
-+      if (!fbinfo->screen_base) {
-+              dev_err(&pdev->dev, "failed to ioremap() vram memory\n");
-+              goto out_release_fb;
-+      }
-+
-+      platform_set_drvdata(pdev, fbinfo);
-+
-+      glamofb->mach_info = pdev->dev.platform_data;
-+
-+      fbinfo->fix.visual = FB_VISUAL_TRUECOLOR;
-+      fbinfo->fix.type = FB_TYPE_PACKED_PIXELS;
-+      fbinfo->fix.type_aux = 0;
-+      fbinfo->fix.xpanstep = 0;
-+      fbinfo->fix.ypanstep = 0;
-+      fbinfo->fix.ywrapstep = 0;
-+      fbinfo->fix.accel = FB_ACCEL_NONE; /* FIXME */
-+
-+      fbinfo->var.nonstd = 0;
-+      fbinfo->var.activate = FB_ACTIVATE_NOW;
-+      fbinfo->var.height = mach_info->height;
-+      fbinfo->var.width = mach_info->width;
-+      fbinfo->var.accel_flags = 0;
-+      fbinfo->var.vmode = FB_VMODE_NONINTERLACED;
-+
-+      fbinfo->fbops = &glamofb_ops;
-+      fbinfo->flags = FBINFO_FLAG_DEFAULT;
-+      fbinfo->pseudo_palette = &glamofb->pseudo_pal;
-+
-+      fbinfo->var.xres = mach_info->xres.defval;
-+      fbinfo->var.xres_virtual = mach_info->xres.defval;
-+      fbinfo->var.yres = mach_info->yres.defval;
-+      fbinfo->var.yres_virtual = mach_info->yres.defval;
-+      fbinfo->var.bits_per_pixel = mach_info->bpp.defval;
-+
-+      fbinfo->var.pixclock = mach_info->pixclock;
-+      fbinfo->var.left_margin = mach_info->left_margin;
-+      fbinfo->var.right_margin = mach_info->right_margin;
-+      fbinfo->var.upper_margin = mach_info->upper_margin;
-+      fbinfo->var.lower_margin = mach_info->lower_margin;
-+      fbinfo->var.hsync_len = mach_info->hsync_len;
-+      fbinfo->var.vsync_len = mach_info->vsync_len;
-+
-+      memset(fbinfo->screen_base, 0, fbinfo->fix.smem_len);
-+
-+      glamo_engine_enable(mach_info->glamo, GLAMO_ENGINE_LCD);
-+      glamo_engine_reset(mach_info->glamo, GLAMO_ENGINE_LCD);
-+      glamofb_init_regs(glamofb);
-+
-+      rc = register_framebuffer(fbinfo);
-+      if (rc < 0) {
-+              dev_err(&pdev->dev, "failed to register framebuffer\n");
-+              goto out_unmap_fb;
-+      }
-+
-+      if (mach_info->spi_info) {
-+              /* register the sibling spi device */
-+              mach_info->spi_info->glamofb_handle = glamofb;
-+              glamo_spi_dev.dev.parent = &pdev->dev;
-+              glamo_spi_dev.dev.platform_data = mach_info->spi_info;
-+              platform_device_register(&glamo_spi_dev);
-+      }
-+
-+      printk(KERN_INFO "fb%d: %s frame buffer device\n",
-+              fbinfo->node, fbinfo->fix.id);
-+
-+      return 0;
-+
-+out_unmap_fb:
-+      iounmap(fbinfo->screen_base);
-+      iounmap(glamofb->base);
-+out_release_fb:
-+      release_mem_region(glamofb->fb_res->start, RESSIZE(glamofb->fb_res));
-+out_release_reg:
-+      release_mem_region(glamofb->reg->start, RESSIZE(glamofb->reg));
-+out_free:
-+      framebuffer_release(fbinfo);
-+      return rc;
-+}
-+
-+static int glamofb_remove(struct platform_device *pdev)
-+{
-+      struct glamofb_handle *glamofb = platform_get_drvdata(pdev);
-+
-+      platform_set_drvdata(pdev, NULL);
-+      iounmap(glamofb->base);
-+      release_mem_region(glamofb->reg->start, RESSIZE(glamofb->reg));
-+      kfree(glamofb);
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int glamofb_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+      return 0;
-+}
-+
-+static int glamofb_resume(struct platform_device *pdev)
-+{
-+      return 0;
-+}
-+#else
-+#define glamofb_suspend NULL
-+#define glamofb_resume  NULL
-+#endif
-+
-+static struct platform_driver glamofb_driver = {
-+      .probe          = glamofb_probe,
-+      .remove         = glamofb_remove,
-+      .suspend        = glamofb_suspend,
-+      .resume         = glamofb_resume,
-+      .driver         = {
-+              .name   = "glamo-fb",
-+              .owner  = THIS_MODULE,
-+      },
-+};
-+
-+static int __devinit glamofb_init(void)
-+{
-+      return platform_driver_register(&glamofb_driver);
-+}
-+
-+static void __exit glamofb_cleanup(void)
-+{
-+      platform_driver_unregister(&glamofb_driver);
-+}
-+
-+module_init(glamofb_init);
-+module_exit(glamofb_cleanup);
-+
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_DESCRIPTION("Smedia Glamo 336x/337x framebuffer driver");
-+MODULE_LICENSE("GPL");
-diff --git a/drivers/mfd/glamo/glamo-gpio.c b/drivers/mfd/glamo/glamo-gpio.c
-new file mode 100644
-index 0000000..45d0bf9
---- /dev/null
-+++ b/drivers/mfd/glamo/glamo-gpio.c
-@@ -0,0 +1,62 @@
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/spinlock.h>
-+#include <linux/io.h>
-+
-+#include <linux/glamo-gpio.h>
-+
-+#include "glamo-core.h"
-+#include "glamo-regs.h"
-+
-+void glamo_gpio_setpin(struct glamo_core *glamo, unsigned int pin,
-+                     unsigned int value)
-+{
-+      unsigned int reg = REG_OF_GPIO(pin);
-+      u_int16_t tmp;
-+
-+      spin_lock(&glamo->lock);
-+      tmp = readw(glamo->base + reg);
-+      if (value)
-+              tmp |= OUTPUT_BIT(pin);
-+      else
-+              tmp &= ~OUTPUT_BIT(pin);
-+      writew(tmp, glamo->base + reg);
-+      spin_unlock(&glamo->lock);
-+}
-+EXPORT_SYMBOL(glamo_gpio_setpin);
-+
-+int glamo_gpio_getpin(struct glamo_core *glamo, unsigned int pin)
-+{
-+      return readw(REG_OF_GPIO(pin)) & INPUT_BIT(pin) ? 1 : 0;
-+}
-+EXPORT_SYMBOL(glamo_gpio_getpin);
-+
-+void glamo_gpio_cfgpin(struct glamo_core *glamo, unsigned int pinfunc)
-+{
-+      unsigned int reg = REG_OF_GPIO(pinfunc);
-+      u_int16_t tmp;
-+
-+      spin_lock(&glamo->lock);
-+      tmp = readw(glamo->base + reg);
-+
-+      if ((pinfunc & 0x00f0) == GLAMO_GPIO_F_FUNC) {
-+              /* pin is a function pin: clear gpio bit */
-+              tmp &= ~FUNC_BIT(pinfunc);
-+      } else {
-+              /* pin is gpio: set gpio bit */
-+              tmp |= FUNC_BIT(pinfunc);
-+
-+              if (pinfunc & GLAMO_GPIO_F_IN) {
-+                      /* gpio input: set bit to disable output mode */
-+                      tmp |= GPIO_OUT_BIT(pinfunc);
-+              } else if (pinfunc & GLAMO_GPIO_F_OUT) {
-+                      /* gpio output: clear bit to enable output mode */
-+                      tmp &= ~GPIO_OUT_BIT(pinfunc);
-+              }
-+      }
-+      writew(tmp, glamo->base + reg);
-+      spin_unlock(&glamo->lock);
-+}
-+EXPORT_SYMBOL(glamo_gpio_cfgpin);
-+
-diff --git a/drivers/mfd/glamo/glamo-lcm-spi.c b/drivers/mfd/glamo/glamo-lcm-spi.c
-new file mode 100644
-index 0000000..92cabe4
---- /dev/null
-+++ b/drivers/mfd/glamo/glamo-lcm-spi.c
-@@ -0,0 +1,241 @@
-+/*
-+ * Copyright (C) 2007 OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ *
-+ * Smedia Glamo GPIO based SPI driver
-+ *
-+ * 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 driver currently only implements a minimum subset of the hardware
-+ * features, esp. those features that are required to drive the jbt6k74
-+ * LCM controller asic in the TD028TTEC1 LCM.
-+ *
-+*/
-+
-+#define DEBUG
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/device.h>
-+#include <linux/spinlock.h>
-+#include <linux/workqueue.h>
-+#include <linux/platform_device.h>
-+
-+#include <linux/spi/spi.h>
-+#include <linux/spi/spi_bitbang.h>
-+#include <linux/spi/glamo.h>
-+
-+#include <linux/glamofb.h>
-+
-+#include <asm/hardware.h>
-+
-+#include "glamo-core.h"
-+#include "glamo-regs.h"
-+
-+struct glamo_spi {
-+      struct spi_bitbang      bitbang;
-+      struct spi_master       *master;
-+      struct glamo_spi_info   *info;
-+      struct device           *dev;
-+};
-+
-+static inline struct glamo_spi *to_gs(struct spi_device *spi)
-+{
-+      return spi->controller_data;
-+}
-+
-+static int glamo_spi_setupxfer(struct spi_device *spi, struct spi_transfer *t)
-+{
-+      struct glamo_spi *gs = to_gs(spi);
-+      unsigned int bpw;
-+
-+      bpw = t ? t->bits_per_word : spi->bits_per_word;
-+
-+      if (bpw != 9 && bpw != 8) {
-+              dev_err(&spi->dev, "invalid bits-per-word (%d)\n", bpw);
-+              return -EINVAL;
-+      }
-+
-+      return 0;
-+}
-+
-+static void glamo_spi_chipsel(struct spi_device *spi, int value)
-+{
-+#if 0
-+      struct glamo_spi *gs = to_gs(spi);
-+
-+      dev_dbg(&spi->dev, "chipsel %d: spi=%p, gs=%p, info=%p, handle=%p\n",
-+              value, spi, gs, gs->info, gs->info->glamofb_handle);
-+
-+      glamofb_cmd_mode(gs->info->glamofb_handle, value);
-+#endif
-+}
-+
-+static int glamo_spi_txrx(struct spi_device *spi, struct spi_transfer *t)
-+{
-+      struct glamo_spi *gs = to_gs(spi);
-+      const u_int16_t *ui16 = (const u_int16_t *) t->tx_buf;
-+      u_int16_t nine_bits;
-+      int i;
-+
-+      dev_dbg(&spi->dev, "txrx: tx %p, rx %p, bpw %d, len %d\n",
-+              t->tx_buf, t->rx_buf, t->bits_per_word, t->len);
-+
-+      if (spi->bits_per_word == 9)
-+              nine_bits = (1 << 9);
-+      else
-+              nine_bits = 0;
-+
-+      if (t->len > 3 * sizeof(u_int16_t)) {
-+              dev_err(&spi->dev, "this driver doesn't support "
-+                      "%u sized xfers\n", t->len);
-+              return -EINVAL;
-+      }
-+
-+      for (i = 0; i < t->len/sizeof(u_int16_t); i++) {
-+              /* actually transfer the data */
-+#if 1
-+              glamofb_cmd_write(gs->info->glamofb_handle,
-+                                GLAMO_LCD_CMD_TYPE_SERIAL | nine_bits |
-+                                (1 << 10) | (1 << 11) | (ui16[i] & 0x1ff));
-+#endif
-+              /* FIXME: fire ?!? */
-+              if (i == 0 && (ui16[i] & 0x1ff) == 0x29) {
-+                      dev_dbg(&spi->dev, "leaving command mode\n");
-+                      glamofb_cmd_mode(gs->info->glamofb_handle, 0);
-+              }
-+      }
-+
-+      return t->len;
-+}
-+
-+static int glamo_spi_setup(struct spi_device *spi)
-+{
-+      int ret;
-+
-+      if (!spi->bits_per_word)
-+              spi->bits_per_word = 9;
-+
-+      /* FIXME: hardware can do this */
-+      if (spi->mode & SPI_LSB_FIRST)
-+              return -EINVAL;
-+
-+      ret = glamo_spi_setupxfer(spi, NULL);
-+      if (ret < 0) {
-+              dev_err(&spi->dev, "setupxfer returned %d\n", ret);
-+              return ret;
-+      }
-+
-+      dev_dbg(&spi->dev, "%s: mode %d, %u bpw\n",
-+              __FUNCTION__, spi->mode, spi->bits_per_word);
-+
-+      return 0;
-+}
-+
-+static int glamo_spi_probe(struct platform_device *pdev)
-+{
-+      struct spi_master *master;
-+      struct glamo_spi *sp;
-+      int ret;
-+      int i;
-+
-+      master = spi_alloc_master(&pdev->dev, sizeof(struct glamo_spi));
-+      if (master == NULL) {
-+              dev_err(&pdev->dev, "failed to allocate spi master\n");
-+              ret = -ENOMEM;
-+              goto err;
-+      }
-+
-+      sp = spi_master_get_devdata(master);
-+      memset(sp, 0, sizeof(struct glamo_spi));
-+
-+      sp->master = spi_master_get(master);
-+      sp->info = pdev->dev.platform_data;
-+      if (!sp->info) {
-+              dev_err(&pdev->dev, "can't operate without platform data\n");
-+              ret = -EIO;
-+              goto err_no_pdev;
-+      }
-+      dev_dbg(&pdev->dev, "sp->info(pdata) = %p\n", sp->info);
-+
-+      sp->dev = &pdev->dev;
-+
-+      platform_set_drvdata(pdev, sp);
-+
-+      sp->bitbang.master = sp->master;
-+      sp->bitbang.setup_transfer = glamo_spi_setupxfer;
-+      sp->bitbang.chipselect = glamo_spi_chipsel;
-+      sp->bitbang.txrx_bufs = glamo_spi_txrx;
-+      sp->bitbang.master->setup = glamo_spi_setup;
-+
-+      ret = spi_bitbang_start(&sp->bitbang);
-+      if (ret)
-+              goto err_no_bitbang;
-+
-+      /* register the chips to go with the board */
-+
-+      glamofb_cmd_mode(sp->info->glamofb_handle, 1);
-+
-+      for (i = 0; i < sp->info->board_size; i++) {
-+              dev_info(&pdev->dev, "registering %p: %s\n",
-+                       &sp->info->board_info[i],
-+                       sp->info->board_info[i].modalias);
-+
-+              sp->info->board_info[i].controller_data = sp;
-+              spi_new_device(master, sp->info->board_info + i);
-+      }
-+
-+      return 0;
-+
-+err_no_bitbang:
-+      platform_set_drvdata(pdev, NULL);
-+err_no_pdev:
-+      spi_master_put(sp->bitbang.master);
-+err:
-+      return ret;
-+
-+}
-+
-+static int glamo_spi_remove(struct platform_device *pdev)
-+{
-+      struct glamo_spi *sp = platform_get_drvdata(pdev);
-+
-+      spi_bitbang_stop(&sp->bitbang);
-+      spi_master_put(sp->bitbang.master);
-+
-+      return 0;
-+}
-+
-+#define glamo_spi_suspend NULL
-+#define glamo_spi_resume NULL
-+
-+static struct platform_driver glamo_spi_drv = {
-+      .probe          = glamo_spi_probe,
-+      .remove         = glamo_spi_remove,
-+      .suspend        = glamo_spi_suspend,
-+      .resume         = glamo_spi_resume,
-+      .driver         = {
-+              .name   = "glamo-lcm-spi",
-+              .owner  = THIS_MODULE,
-+      },
-+};
-+
-+static int __init glamo_spi_init(void)
-+{
-+      return platform_driver_register(&glamo_spi_drv);
-+}
-+
-+static void __exit glamo_spi_exit(void)
-+{
-+      platform_driver_unregister(&glamo_spi_drv);
-+}
-+
-+module_init(glamo_spi_init);
-+module_exit(glamo_spi_exit);
-+
-+MODULE_DESCRIPTION("Smedia Glamo 336x/337x LCM serial command SPI Driver");
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>")
-+MODULE_LICENSE("GPL");
-diff --git a/drivers/mfd/glamo/glamo-regs.h b/drivers/mfd/glamo/glamo-regs.h
-new file mode 100644
-index 0000000..151cd66
---- /dev/null
-+++ b/drivers/mfd/glamo/glamo-regs.h
-@@ -0,0 +1,477 @@
-+#ifndef _GLAMO_REGS_H
-+#define _GLAMO_REGS_H
-+
-+/* Smedia Glamo 336x/337x driver
-+ *
-+ * (C) 2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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
-+ */
-+
-+enum glamo_regster_offsets {
-+      GLAMO_REGOFS_GENERIC    = 0x0000,
-+      GLAMO_REGOFS_HOSTBUS    = 0x0200,
-+      GLAMO_REGOFS_MEMORY     = 0x0300,
-+      GLAMO_REGOFS_VIDCAP     = 0x0400,
-+      GLAMO_REGOFS_ISP        = 0x0500,
-+      GLAMO_REGOFS_JPEG       = 0x0800,
-+      GLAMO_REGOFS_MPEG       = 0x0c00,
-+      GLAMO_REGOFS_LCD        = 0x1100,
-+      GLAMO_REGOFS_MMC        = 0x1400,
-+      GLAMO_REGOFS_MPROC0     = 0x1500,
-+      GLAMO_REGOFS_MPROC1     = 0x1580,
-+      GLAMO_REGOFS_CMDQUEUE   = 0x1600,
-+      GLAMO_REGOFS_RISC       = 0x1680,
-+      GLAMO_REGOFS_2D         = 0x1700,
-+      GLAMO_REGOFS_3D         = 0x1b00,
-+      GLAMO_REGOFS_END        = 0x2400,
-+};
-+
-+
-+enum glamo_register_generic {
-+      GLAMO_REG_GCONF1        = 0x0000,
-+      GLAMO_REG_GCONF2        = 0x0002,
-+#define       GLAMO_REG_DEVICE_ID     GLAMO_REG_GCONF2
-+      GLAMO_REG_GCONF3        = 0x0004,
-+#define       GLAMO_REG_REVISION_ID   GLAMO_REG_GCONF3
-+      GLAMO_REG_IRQ_GEN1      = 0x0006,
-+#define GLAMO_REG_IRQ_ENABLE  GLAMO_REG_IRQ_GEN1
-+      GLAMO_REG_IRQ_GEN2      = 0x0008,
-+#define GLAMO_REG_IRQ_SET     GLAMO_REG_IRQ_GEN2
-+      GLAMO_REG_IRQ_GEN3      = 0x000a,
-+#define GLAMO_REG_IRQ_CLEAR   GLAMO_REG_IRQ_GEN3
-+      GLAMO_REG_IRQ_GEN4      = 0x000c,
-+#define GLAMO_REG_IRQ_STATUS  GLAMO_REG_IRQ_GEN4
-+      GLAMO_REG_CLOCK_HOST    = 0x0010,
-+      GLAMO_REG_CLOCK_MEMORY  = 0x0012,
-+      GLAMO_REG_CLOCK_LCD     = 0x0014,
-+      GLAMO_REG_CLOCK_MMC     = 0x0016,
-+      GLAMO_REG_CLOCK_ISP     = 0x0018,
-+      GLAMO_REG_CLOCK_JPEG    = 0x001a,
-+      GLAMO_REG_CLOCK_3D      = 0x001c,
-+      GLAMO_REG_CLOCK_2D      = 0x001e,
-+      GLAMO_REG_CLOCK_RISC1   = 0x0020,       /* 3365 only? */
-+      GLAMO_REG_CLOCK_RISC2   = 0x0022,       /* 3365 only? */
-+      GLAMO_REG_CLOCK_MPEG    = 0x0024,
-+      GLAMO_REG_CLOCK_MPROC   = 0x0026,
-+
-+      GLAMO_REG_CLOCK_GEN5_1  = 0x0030,
-+      GLAMO_REG_CLOCK_GEN5_2  = 0x0032,
-+      GLAMO_REG_CLOCK_GEN6    = 0x0034,
-+      GLAMO_REG_CLOCK_GEN7    = 0x0036,
-+      GLAMO_REG_CLOCK_GEN8    = 0x0038,
-+      GLAMO_REG_CLOCK_GEN9    = 0x003a,
-+      GLAMO_REG_CLOCK_GEN10   = 0x003c,
-+      GLAMO_REG_CLOCK_GEN11   = 0x003e,
-+      GLAMO_REG_PLL_GEN1      = 0x0040,
-+      GLAMO_REG_PLL_GEN2      = 0x0042,
-+      GLAMO_REG_PLL_GEN3      = 0x0044,
-+      GLAMO_REG_PLL_GEN4      = 0x0046,
-+      GLAMO_REG_PLL_GEN5      = 0x0048,
-+      GLAMO_REG_GPIO_GEN1     = 0x0050,
-+      GLAMO_REG_GPIO_GEN2     = 0x0052,
-+      GLAMO_REG_GPIO_GEN3     = 0x0054,
-+      GLAMO_REG_GPIO_GEN4     = 0x0056,
-+      GLAMO_REG_GPIO_GEN5     = 0x0058,
-+      GLAMO_REG_GPIO_GEN6     = 0x005a,
-+      GLAMO_REG_GPIO_GEN7     = 0x005c,
-+      GLAMO_REG_GPIO_GEN8     = 0x005e,
-+      GLAMO_REG_GPIO_GEN9     = 0x0060,
-+      GLAMO_REG_GPIO_GEN10    = 0x0062,
-+      GLAMO_REG_DFT_GEN1      = 0x0070,
-+      GLAMO_REG_DFT_GEN2      = 0x0072,
-+      GLAMO_REG_DFT_GEN3      = 0x0074,
-+      GLAMO_REG_DFT_GEN4      = 0x0076,
-+
-+      GLAMO_REG_DFT_GEN5      = 0x01e0,
-+      GLAMO_REG_DFT_GEN6      = 0x01f0,
-+};
-+
-+#define GLAMO_REG_HOSTBUS(x)  (GLAMO_REGOFS_HOSTBUS-2+(x*2))
-+
-+#define REG_MEM(x)            (GLAMO_REGOFS_MEMORY+(x))
-+#define GLAMO_REG_MEM_TIMING(x)       (GLAMO_REG_MEM_TIMING1-2+(x*2))
-+
-+enum glamo_register_mem {
-+      GLAMO_REG_MEM_TYPE      = REG_MEM(0x00),
-+      GLAMO_REG_MEM_GEN       = REG_MEM(0x02),
-+      GLAMO_REG_MEM_TIMING1   = REG_MEM(0x04),
-+      GLAMO_REG_MEM_TIMING2   = REG_MEM(0x06),
-+      GLAMO_REG_MEM_TIMING3   = REG_MEM(0x08),
-+      GLAMO_REG_MEM_TIMING4   = REG_MEM(0x0a),
-+      GLAMO_REG_MEM_TIMING5   = REG_MEM(0x0c),
-+      GLAMO_REG_MEM_TIMING6   = REG_MEM(0x0e),
-+      GLAMO_REG_MEM_TIMING7   = REG_MEM(0x10),
-+      GLAMO_REG_MEM_TIMING8   = REG_MEM(0x12),
-+      GLAMO_REG_MEM_TIMING9   = REG_MEM(0x14),
-+      GLAMO_REG_MEM_TIMING10  = REG_MEM(0x16),
-+      GLAMO_REG_MEM_TIMING11  = REG_MEM(0x18),
-+      GLAMO_REG_MEM_POWER1    = REG_MEM(0x1a),
-+      GLAMO_REG_MEM_POWER2    = REG_MEM(0x1c),
-+      GLAMO_REG_MEM_LCD_BUF1  = REG_MEM(0x1e),
-+      GLAMO_REG_MEM_LCD_BUF2  = REG_MEM(0x20),
-+      GLAMO_REG_MEM_LCD_BUF3  = REG_MEM(0x22),
-+      GLAMO_REG_MEM_LCD_BUF4  = REG_MEM(0x24),
-+      GLAMO_REG_MEM_BIST1     = REG_MEM(0x26),
-+      GLAMO_REG_MEM_BIST2     = REG_MEM(0x28),
-+      GLAMO_REG_MEM_BIST3     = REG_MEM(0x2a),
-+      GLAMO_REG_MEM_BIST4     = REG_MEM(0x2c),
-+      GLAMO_REG_MEM_BIST5     = REG_MEM(0x2e),
-+      GLAMO_REG_MEM_MAH1      = REG_MEM(0x30),
-+      GLAMO_REG_MEM_MAH2      = REG_MEM(0x32),
-+      GLAMO_REG_MEM_DRAM1     = REG_MEM(0x34),
-+      GLAMO_REG_MEM_DRAM2     = REG_MEM(0x36),
-+      GLAMO_REG_MEM_CRC       = REG_MEM(0x38),
-+};
-+
-+#define GLAMO_MEM_TYPE_MASK   0x03
-+
-+enum glamo_reg_mem_dram1 {
-+      GLAMO_MEM_DRAM1_EN_SDRAM_CLK    = (1 << 11),
-+      GLAMO_MEM_DRAM1_SELF_REFRESH    = (1 << 12),
-+};
-+
-+enum glamo_reg_mem_dram2 {
-+      GLAMO_MEM_DRAM2_DEEP_PWRDOWN    = (1 << 12),
-+};
-+
-+enum glamo_irq {
-+      GLAMO_IRQ_HOSTBUS       = 0x0001,
-+      GLAMO_IRQ_JPEG          = 0x0002,
-+      GLAMO_IRQ_MPEG          = 0x0004,
-+      GLAMO_IRQ_MPROC1        = 0x0008,
-+      GLAMO_IRQ_MPROC0        = 0x0010,
-+      GLAMO_IRQ_CMDQUEUE      = 0x0020,
-+      GLAMO_IRQ_2D            = 0x0040,
-+      GLAMO_IRQ_MMC           = 0x0080,
-+      GLAMO_IRQ_RISC          = 0x0100,
-+};
-+
-+enum glamo_reg_clock_host {
-+      GLAMO_CLOCK_HOST_DG_BCLK        = 0x0001,
-+      GLAMO_CLOCK_HOST_DG_M0CLK       = 0x0004,
-+      GLAMO_CLOCK_HOST_RESET          = 0x1000,
-+};
-+
-+enum glamo_reg_clock_mem {
-+      GLAMO_CLOCK_MEM_DG_M1CLK        = 0x0001,
-+      GLAMO_CLOCK_MEM_EN_M1CLK        = 0x0002,
-+      GLAMO_CLOCK_MEM_DG_MOCACLK      = 0x0004,
-+      GLAMO_CLOCK_MEM_EN_MOCACLK      = 0x0008,
-+      GLAMO_CLOCK_MEM_RESET           = 0x1000,
-+      GLAMO_CLOCK_MOCA_RESET          = 0x2000,
-+};
-+
-+enum glamo_reg_clock_lcd {
-+      GLAMO_CLOCK_LCD_DG_DCLK         = 0x0001,
-+      GLAMO_CLOCK_LCD_EN_DCLK         = 0x0002,
-+      GLAMO_CLOCK_LCD_DG_DMCLK        = 0x0004,
-+      GLAMO_CLOCK_LCD_EN_DMCLK        = 0x0008,
-+      //
-+      GLAMO_CLOCK_LCD_EN_DHCLK        = 0x0020,
-+      GLAMO_CLOCK_LCD_DG_M5CLK        = 0x0040,
-+      GLAMO_CLOCK_LCD_EN_M5CLK        = 0x0080,
-+      GLAMO_CLOCK_LCD_RESET           = 0x1000,
-+};
-+
-+enum glamo_reg_clock_mmc {
-+      GLAMO_CLOCK_MMC_DG_TCLK         = 0x0001,
-+      GLAMO_CLOCK_MMC_EN_TCLK         = 0x0002,
-+      GLAMO_CLOCK_MMC_DG_M9CLK        = 0x0004,
-+      GLAMO_CLOCK_MMC_EN_M9CLK        = 0x0008,
-+      GLAMO_CLOCK_MMC_RESET           = 0x1000,
-+};
-+
-+enum glamo_reg_clock_isp {
-+      GLAMO_CLOCK_ISP_DG_I1CLK        = 0x0001,
-+      GLAMO_CLOCK_ISP_EN_I1CLK        = 0x0002,
-+      GLAMO_CLOCK_ISP_DG_CCLK         = 0x0004,
-+      GLAMO_CLOCK_ISP_EN_CCLK         = 0x0008,
-+      //
-+      GLAMO_CLOCK_ISP_EN_SCLK         = 0x0020,
-+      GLAMO_CLOCK_ISP_DG_M2CLK        = 0x0040,
-+      GLAMO_CLOCK_ISP_EN_M2CLK        = 0x0080,
-+      GLAMO_CLOCK_ISP_DG_M15CLK       = 0x0100,
-+      GLAMO_CLOCK_ISP_EN_M15CLK       = 0x0200,
-+      GLAMO_CLOCK_ISP1_RESET          = 0x1000,
-+      GLAMO_CLOCK_ISP2_RESET          = 0x2000,
-+};
-+
-+enum glamo_reg_clock_jpeg {
-+      GLAMO_CLOCK_JPEG_DG_JCLK        = 0x0001,
-+      GLAMO_CLOCK_JPEG_EN_JCLK        = 0x0002,
-+      GLAMO_CLOCK_JPEG_DG_M3CLK       = 0x0004,
-+      GLAMO_CLOCK_JPEG_EN_M3CLK       = 0x0008,
-+      GLAMO_CLOCK_JPEG_RESET          = 0x1000,
-+};
-+
-+enum glamo_reg_clock_2d {
-+      GLAMO_CLOCK_2D_DG_GCLK          = 0x0001,
-+      GLAMO_CLOCK_2D_EN_GCLK          = 0x0002,
-+      GLAMO_CLOCK_2D_DG_M7CLK         = 0x0004,
-+      GLAMO_CLOCK_2D_EN_M7CLK         = 0x0008,
-+      GLAMO_CLOCK_2D_DG_M6CLK         = 0x0010,
-+      GLAMO_CLOCK_2D_EN_M6CLK         = 0x0020,
-+      GLAMO_CLOCK_2D_RESET            = 0x1000,
-+      GLAMO_CLOCK_2D_CQ_RESET         = 0x2000,
-+};
-+
-+enum glamo_reg_clock_3d {
-+      GLAMO_CLOCK_3D_DG_ECLK          = 0x0001,
-+      GLAMO_CLOCK_3D_EN_ECLK          = 0x0002,
-+      GLAMO_CLOCK_3D_DG_RCLK          = 0x0004,
-+      GLAMO_CLOCK_3D_EN_RCLK          = 0x0008,
-+      GLAMO_CLOCK_3D_DG_M8CLK         = 0x0010,
-+      GLAMO_CLOCK_3D_EN_M8CLK         = 0x0020,
-+      GLAMO_CLOCK_3D_BACK_RESET       = 0x1000,
-+      GLAMO_CLOCK_3D_FRONT_RESET      = 0x2000,
-+};
-+
-+enum glamo_reg_clock_mpeg {
-+      GLAMO_CLOCK_MPEG_DG_X0CLK       = 0x0001,
-+      GLAMO_CLOCK_MPEG_EN_X0CLK       = 0x0002,
-+      GLAMO_CLOCK_MPEG_DG_X1CLK       = 0x0004,
-+      GLAMO_CLOCK_MPEG_EN_X1CLK       = 0x0008,
-+      GLAMO_CLOCK_MPEG_DG_X2CLK       = 0x0010,
-+      GLAMO_CLOCK_MPEG_EN_X2CLK       = 0x0020,
-+      GLAMO_CLOCK_MPEG_DG_X3CLK       = 0x0040,
-+      GLAMO_CLOCK_MPEG_EN_X3CLK       = 0x0080,
-+      GLAMO_CLOCK_MPEG_DG_X4CLK       = 0x0100,
-+      GLAMO_CLOCK_MPEG_EN_X4CLK       = 0x0200,
-+      GLAMO_CLOCK_MPEG_DG_X6CLK       = 0x0400,
-+      GLAMO_CLOCK_MPEG_EN_X6CLK       = 0x0800,
-+      GLAMO_CLOCK_MPEG_ENC_RESET      = 0x1000,
-+      GLAMO_CLOCK_MPEG_DEC_RESET      = 0x2000,
-+};
-+
-+enum glamo_reg_clock51 {
-+      GLAMO_CLOCK_GEN51_EN_DIV_MCLK   = 0x0001,
-+      GLAMO_CLOCK_GEN51_EN_DIV_SCLK   = 0x0002,
-+      GLAMO_CLOCK_GEN51_EN_DIV_JCLK   = 0x0004,
-+      GLAMO_CLOCK_GEN51_EN_DIV_DCLK   = 0x0008,
-+      GLAMO_CLOCK_GEN51_EN_DIV_DMCLK  = 0x0010,
-+      GLAMO_CLOCK_GEN51_EN_DIV_DHCLK  = 0x0020,
-+      GLAMO_CLOCK_GEN51_EN_DIV_GCLK   = 0x0040,
-+      GLAMO_CLOCK_GEN51_EN_DIV_TCLK   = 0x0080,
-+      /* FIXME: higher bits */
-+};
-+
-+enum glamo_reg_hostbus2 {
-+      GLAMO_HOSTBUS2_MMIO_EN_ISP      = 0x0001,
-+      GLAMO_HOSTBUS2_MMIO_EN_JPEG     = 0x0002,
-+      GLAMO_HOSTBUS2_MMIO_EN_MPEG     = 0x0004,
-+      GLAMO_HOSTBUS2_MMIO_EN_LCD      = 0x0008,
-+      GLAMO_HOSTBUS2_MMIO_EN_MMC      = 0x0010,
-+      GLAMO_HOSTBUS2_MMIO_EN_MICROP0  = 0x0020,
-+      GLAMO_HOSTBUS2_MMIO_EN_MICROP1  = 0x0040,
-+      GLAMO_HOSTBUS2_MMIO_EN_CQ       = 0x0080,
-+      GLAMO_HOSTBUS2_MMIO_EN_RISC     = 0x0100,
-+      GLAMO_HOSTBUS2_MMIO_EN_2D       = 0x0200,
-+      GLAMO_HOSTBUS2_MMIO_EN_3D       = 0x0400,
-+};
-+
-+/* LCD Controller */
-+
-+#define REG_LCD(x)    (x)
-+enum glamo_reg_lcd {
-+      GLAMO_REG_LCD_MODE1             = REG_LCD(0x00),
-+      GLAMO_REG_LCD_MODE2             = REG_LCD(0x02),
-+      GLAMO_REG_LCD_MODE3             = REG_LCD(0x04),
-+      GLAMO_REG_LCD_WIDTH             = REG_LCD(0x06),
-+      GLAMO_REG_LCD_HEIGHT            = REG_LCD(0x08),
-+      GLAMO_REG_LCD_POLARITY          = REG_LCD(0x0a),
-+      GLAMO_REG_LCD_A_BASE1           = REG_LCD(0x0c),
-+      GLAMO_REG_LCD_A_BASE2           = REG_LCD(0x0e),
-+      GLAMO_REG_LCD_B_BASE1           = REG_LCD(0x10),
-+      GLAMO_REG_LCD_B_BASE2           = REG_LCD(0x12),
-+      GLAMO_REG_LCD_C_BASE1           = REG_LCD(0x14),
-+      GLAMO_REG_LCD_C_BASE2           = REG_LCD(0x16),
-+      GLAMO_REG_LCD_PITCH             = REG_LCD(0x18),
-+      /* RES */
-+      GLAMO_REG_LCD_HORIZ_TOTAL       = REG_LCD(0x1c),
-+      /* RES */
-+      GLAMO_REG_LCD_HORIZ_RETR_START  = REG_LCD(0x20),
-+      /* RES */
-+      GLAMO_REG_LCD_HORIZ_RETR_END    = REG_LCD(0x24),
-+      /* RES */
-+      GLAMO_REG_LCD_HORIZ_DISP_START  = REG_LCD(0x28),
-+      /* RES */
-+      GLAMO_REG_LCD_HORIZ_DISP_END    = REG_LCD(0x2c),
-+      /* RES */
-+      GLAMO_REG_LCD_VERT_TOTAL        = REG_LCD(0x30),
-+      /* RES */
-+      GLAMO_REG_LCD_VERT_RETR_START   = REG_LCD(0x34),
-+      /* RES */
-+      GLAMO_REG_LCD_VERT_RETR_END     = REG_LCD(0x38),
-+      /* RES */
-+      GLAMO_REG_LCD_VERT_DISP_START   = REG_LCD(0x3c),
-+      /* RES */
-+      GLAMO_REG_LCD_VERT_DISP_END     = REG_LCD(0x40),
-+      /* RES */
-+      GLAMO_REG_LCD_POL               = REG_LCD(0x44),
-+      GLAMO_REG_LCD_DATA_START        = REG_LCD(0x46),
-+      GLAMO_REG_LCD_FRATE_CONTRO      = REG_LCD(0x48),
-+      GLAMO_REG_LCD_DATA_CMD_HDR      = REG_LCD(0x4a),
-+      GLAMO_REG_LCD_SP_START          = REG_LCD(0x4c),
-+      GLAMO_REG_LCD_SP_END            = REG_LCD(0x4e),
-+      GLAMO_REG_LCD_CURSOR_BASE1      = REG_LCD(0x50),
-+      GLAMO_REG_LCD_CURSOR_BASE2      = REG_LCD(0x52),
-+      GLAMO_REG_LCD_CURSOR_PITCH      = REG_LCD(0x54),
-+      GLAMO_REG_LCD_CURSOR_X_SIZE     = REG_LCD(0x56),
-+      GLAMO_REG_LCD_CURSOR_Y_SIZE     = REG_LCD(0x58),
-+      GLAMO_REG_LCD_CURSOR_X_POS      = REG_LCD(0x5a),
-+      GLAMO_REG_LCD_CURSOR_Y_POS      = REG_LCD(0x5c),
-+      GLAMO_REG_LCD_CURSOR_PRESET     = REG_LCD(0x5e),
-+      GLAMO_REG_LCD_CURSOR_FG_COLOR   = REG_LCD(0x60),
-+      /* RES */
-+      GLAMO_REG_LCD_CURSOR_BG_COLOR   = REG_LCD(0x64),
-+      /* RES */
-+      GLAMO_REG_LCD_CURSOR_DST_COLOR  = REG_LCD(0x68),
-+      /* RES */
-+      GLAMO_REG_LCD_STATUS1           = REG_LCD(0x80),
-+      GLAMO_REG_LCD_STATUS2           = REG_LCD(0x82),
-+      GLAMO_REG_LCD_STATUS3           = REG_LCD(0x84),
-+      GLAMO_REG_LCD_STATUS4           = REG_LCD(0x86),
-+      /* RES */
-+      GLAMO_REG_LCD_COMMAND1          = REG_LCD(0xa0),
-+      GLAMO_REG_LCD_COMMAND2          = REG_LCD(0xa2),
-+      /* RES */
-+      GLAMO_REG_LCD_WFORM_DELAY1      = REG_LCD(0xb0),
-+      GLAMO_REG_LCD_WFORM_DELAY2      = REG_LCD(0xb2),
-+      /* RES */
-+      GLAMO_REG_LCD_GAMMA_CORR        = REG_LCD(0x100),
-+      /* RES */
-+      GLAMO_REG_LCD_GAMMA_R_ENTRY01   = REG_LCD(0x110),
-+      GLAMO_REG_LCD_GAMMA_R_ENTRY23   = REG_LCD(0x112),
-+      GLAMO_REG_LCD_GAMMA_R_ENTRY45   = REG_LCD(0x114),
-+      GLAMO_REG_LCD_GAMMA_R_ENTRY67   = REG_LCD(0x116),
-+      GLAMO_REG_LCD_GAMMA_R_ENTRY8    = REG_LCD(0x118),
-+      /* RES */
-+      GLAMO_REG_LCD_GAMMA_G_ENTRY01   = REG_LCD(0x130),
-+      GLAMO_REG_LCD_GAMMA_G_ENTRY23   = REG_LCD(0x132),
-+      GLAMO_REG_LCD_GAMMA_G_ENTRY45   = REG_LCD(0x134),
-+      GLAMO_REG_LCD_GAMMA_G_ENTRY67   = REG_LCD(0x136),
-+      GLAMO_REG_LCD_GAMMA_G_ENTRY8    = REG_LCD(0x138),
-+      /* RES */
-+      GLAMO_REG_LCD_GAMMA_B_ENTRY01   = REG_LCD(0x150),
-+      GLAMO_REG_LCD_GAMMA_B_ENTRY23   = REG_LCD(0x152),
-+      GLAMO_REG_LCD_GAMMA_B_ENTRY45   = REG_LCD(0x154),
-+      GLAMO_REG_LCD_GAMMA_B_ENTRY67   = REG_LCD(0x156),
-+      GLAMO_REG_LCD_GAMMA_B_ENTRY8    = REG_LCD(0x158),
-+      /* RES */
-+      GLAMO_REG_LCD_SRAM_DRIVING1     = REG_LCD(0x160),
-+      GLAMO_REG_LCD_SRAM_DRIVING2     = REG_LCD(0x162),
-+      GLAMO_REG_LCD_SRAM_DRIVING3     = REG_LCD(0x164),
-+};
-+
-+enum glamo_reg_lcd_mode1 {
-+      GLAMO_LCD_MODE1_PWRSAVE         = 0x0001,
-+      GLAMO_LCD_MODE1_PARTIAL_PRT     = 0x0002,
-+      GLAMO_LCD_MODE1_HWFLIP          = 0x0004,
-+      GLAMO_LCD_MODE1_LCD2            = 0x0008,
-+      /* RES */
-+      GLAMO_LCD_MODE1_PARTIAL_MODE    = 0x0020,
-+      GLAMO_LCD_MODE1_CURSOR_DSTCOLOR = 0x0040,
-+      GLAMO_LCD_MODE1_PARTIAL_ENABLE  = 0x0080,
-+      GLAMO_LCD_MODE1_TVCLK_IN_ENABLE = 0x0100,
-+      GLAMO_LCD_MODE1_HSYNC_HIGH_ACT  = 0x0200,
-+      GLAMO_LCD_MODE1_VSYNC_HIGH_ACT  = 0x0400,
-+      GLAMO_LCD_MODE1_HSYNC_FLIP      = 0x0800,
-+      GLAMO_LCD_MODE1_GAMMA_COR_EN    = 0x1000,
-+      GLAMO_LCD_MODE1_DITHER_EN       = 0x2000,
-+      GLAMO_LCD_MODE1_CURSOR_EN       = 0x4000,
-+      GLAMO_LCD_MODE1_ROTATE_EN       = 0x8000,
-+};
-+
-+enum glamo_reg_lcd_mode2 {
-+      GLAMO_LCD_MODE2_CRC_CHECK_EN    = 0x0001,
-+      GLAMO_LCD_MODE2_DCMD_PER_LINE   = 0x0002,
-+      GLAMO_LCD_MODE2_NOUSE_BDEF      = 0x0004,
-+      GLAMO_LCD_MODE2_OUT_POS_MODE    = 0x0008,
-+      GLAMO_LCD_MODE2_FRATE_CTRL_EN   = 0x0010,
-+      GLAMO_LCD_MODE2_SINGLE_BUFFER   = 0x0020,
-+      GLAMO_LCD_MODE2_SER_LSB_TO_MSB  = 0x0040,
-+      /* FIXME */
-+};
-+
-+enum glamo_reg_lcd_mode3 {
-+      /* LCD color source data format */
-+      GLAMO_LCD_SRC_RGB565            = 0x0000,
-+      GLAMO_LCD_SRC_ARGB1555          = 0x4000,
-+      GLAMO_LCD_SRC_ARGB4444          = 0x8000,
-+      /* interface type */
-+      GLAMO_LCD_MODE3_LCD             = 0x1000,
-+      GLAMO_LCD_MODE3_RGB             = 0x0800,
-+      GLAMO_LCD_MODE3_CPU             = 0x0000,
-+      /* mode */
-+      GLAMO_LCD_MODE3_RGB332          = 0x0000,
-+      GLAMO_LCD_MODE3_RGB444          = 0x0100,
-+      GLAMO_LCD_MODE3_RGB565          = 0x0200,
-+      GLAMO_LCD_MODE3_RGB666          = 0x0300,
-+      /* depth */
-+      GLAMO_LCD_MODE3_6BITS           = 0x0000,
-+      GLAMO_LCD_MODE3_8BITS           = 0x0010,
-+      GLAMO_LCD_MODE3_9BITS           = 0x0020,
-+      GLAMO_LCD_MODE3_16BITS          = 0x0030,
-+      GLAMO_LCD_MODE3_18BITS          = 0x0040,
-+};
-+
-+enum glamo_lcd_rot_mode {
-+        GLAMO_LCD_ROT_MODE_0            = 0x0000,
-+        GLAMO_LCD_ROT_MODE_180          = 0x2000,
-+        GLAMO_LCD_ROT_MODE_MIRROR       = 0x4000,
-+        GLAMO_LCD_ROT_MODE_FLIP         = 0x6000,
-+        GLAMO_LCD_ROT_MODE_90           = 0x8000,
-+        GLAMO_LCD_ROT_MODE_270          = 0xa000,
-+};
-+#define GLAMO_LCD_ROT_MODE_MASK         0xe000
-+
-+enum glamo_lcd_cmd_type {
-+      GLAMO_LCD_CMD_TYPE_DISP         = 0x0000,
-+      GLAMO_LCD_CMD_TYPE_PARALLEL     = 0x4000,
-+      GLAMO_LCD_CMD_TYPE_SERIAL       = 0x8000,
-+      GLAMO_LCD_CMD_TYPE_SERIAL_DIRECT= 0xc000,
-+};
-+#define GLAMO_LCD_CMD_TYPE_MASK               0xc000
-+
-+enum glamo_lcd_cmds {
-+      GLAMO_LCD_CMD_DATA_DISP_FIRE    = 0x00,
-+      GLAMO_LCD_CMD_DATA_DISP_SYNC    = 0x01,         /* RGB only */
-+      /* switch to command mode, no display */
-+      GLAMO_LCD_CMD_DATA_FIRE_NO_DISP = 0x02,
-+      /* display until VSYNC, switch to command */
-+      GLAMO_LCD_CMD_DATA_FIRE_VSYNC   = 0x11,
-+      /* display until HSYNC, switch to command */
-+      GLAMO_LCD_CMD_DATA_FIRE_HSYNC   = 0x12,
-+      /* display until VSYNC, 1 black frame, VSYNC, switch to command */
-+      GLAMO_LCD_CMD_DATA_FIRE_VSYNC_B = 0x13,
-+      /* don't care about display and switch to command */
-+      GLAMO_LCD_CMD_DATA_FIRE_FREE    = 0x14,         /* RGB only */
-+      /* don't care about display, keep data display but disable data,
-+       * and switch to command */
-+      GLAMO_LCD_CMD_DATA_FIRE_FREE_D  = 0x15,         /* RGB only */
-+};
-+
-+enum glamo_core_revisions {
-+      GLAMO_CORE_REV_A0               = 0x0000,
-+      GLAMO_CORE_REV_A1               = 0x0001,
-+      GLAMO_CORE_REV_A2               = 0x0002,
-+      GLAMO_CORE_REV_A3               = 0x0003,
-+};
-+
-+#endif /* _GLAMO_REGS_H */
-diff --git a/drivers/mfd/glamo/glamo-spi-gpio.c b/drivers/mfd/glamo/glamo-spi-gpio.c
-new file mode 100644
-index 0000000..73926bd
---- /dev/null
-+++ b/drivers/mfd/glamo/glamo-spi-gpio.c
-@@ -0,0 +1,256 @@
-+/*
-+ * Copyright (C) 2007 OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ *
-+ * Smedia Glamo GPIO based SPI driver
-+ *
-+ * 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 driver currently only implements a minimum subset of the hardware
-+ * features, esp. those features that are required to drive the jbt6k74
-+ * LCM controller asic in the TD028TTEC1 LCM.
-+ *
-+*/
-+
-+#define DEBUG
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/device.h>
-+#include <linux/spinlock.h>
-+#include <linux/workqueue.h>
-+#include <linux/platform_device.h>
-+
-+#include <linux/spi/spi.h>
-+#include <linux/spi/spi_bitbang.h>
-+#include <linux/spi/glamo.h>
-+
-+#include <linux/glamofb.h>
-+
-+#include <asm/hardware.h>
-+
-+#include "glamo-core.h"
-+#include "glamo-regs.h"
-+
-+struct glamo_spigpio {
-+      struct spi_bitbang              bitbang;
-+      struct spi_master               *master;
-+      struct glamo_spigpio_info       *info;
-+      struct glamo_core               *glamo;
-+};
-+
-+static inline struct glamo_spigpio *to_sg(struct spi_device *spi)
-+{
-+      return spi->controller_data;
-+}
-+
-+static inline void setsck(struct spi_device *dev, int on)
-+{
-+      struct glamo_spigpio *sg = to_sg(dev);
-+      glamo_gpio_setpin(sg->glamo, sg->info->pin_clk, on ? 1 : 0);
-+}
-+
-+static inline void setmosi(struct spi_device *dev, int on)
-+{
-+      struct glamo_spigpio *sg = to_sg(dev);
-+      glamo_gpio_setpin(sg->glamo, sg->info->pin_mosi, on ? 1 : 0);
-+}
-+
-+static inline u32 getmiso(struct spi_device *dev)
-+{
-+      struct glamo_spigpio *sg = to_sg(dev);
-+      if (sg->info->pin_miso)
-+              return glamo_gpio_getpin(sg->glamo, sg->info->pin_miso) ? 1 : 0;
-+      else
-+              return 0;
-+}
-+
-+#define spidelay(x) ndelay(x)
-+
-+#define EXPAND_BITBANG_TXRX
-+#include <linux/spi/spi_bitbang.h>
-+
-+static u32 glamo_spigpio_txrx_mode0(struct spi_device *spi,
-+                                  unsigned nsecs, u32 word, u8 bits)
-+{
-+      return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 glamo_spigpio_txrx_mode1(struct spi_device *spi,
-+                                  unsigned nsecs, u32 word, u8 bits)
-+{
-+      return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, bits);
-+}
-+
-+static u32 glamo_spigpio_txrx_mode2(struct spi_device *spi,
-+                                  unsigned nsecs, u32 word, u8 bits)
-+{
-+      return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, bits);
-+}
-+
-+static u32 glamo_spigpio_txrx_mode3(struct spi_device *spi,
-+                                  unsigned nsecs, u32 word, u8 bits)
-+{
-+      return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, bits);
-+}
-+
-+
-+#if 0
-+static int glamo_spigpio_setupxfer(struct spi_device *spi,
-+                                 struct spi_transfer *t)
-+{
-+      struct glamo_spi *gs = to_sg(spi);
-+      unsigned int bpw;
-+
-+      bpw = t ? t->bits_per_word : spi->bits_per_word;
-+
-+      if (bpw != 9 && bpw != 8) {
-+              dev_err(&spi->dev, "invalid bits-per-word (%d)\n", bpw);
-+              return -EINVAL;
-+      }
-+
-+      return 0;
-+}
-+#endif
-+
-+static void glamo_spigpio_chipsel(struct spi_device *spi, int value)
-+{
-+      struct glamo_spigpio *gs = to_sg(spi);
-+#if 0
-+      dev_dbg(&spi->dev, "chipsel %d: spi=%p, gs=%p, info=%p, handle=%p\n",
-+              value, spi, gs, gs->info, gs->info->glamo);
-+#endif
-+      glamo_gpio_setpin(gs->glamo, gs->info->pin_cs, value ? 0 : 1);
-+}
-+
-+
-+static int glamo_spigpio_probe(struct platform_device *pdev)
-+{
-+      struct spi_master *master;
-+      struct glamo_spigpio *sp;
-+      int ret;
-+      int i;
-+
-+      master = spi_alloc_master(&pdev->dev, sizeof(struct glamo_spigpio));
-+      if (master == NULL) {
-+              dev_err(&pdev->dev, "failed to allocate spi master\n");
-+              ret = -ENOMEM;
-+              goto err;
-+      }
-+
-+      sp = spi_master_get_devdata(master);
-+      platform_set_drvdata(pdev, sp);
-+      sp->info = pdev->dev.platform_data;
-+      if (!sp->info) {
-+              dev_err(&pdev->dev, "can't operate without platform data\n");
-+              ret = -EIO;
-+              goto err_no_pdev;
-+      }
-+
-+      master->num_chipselect = 1;
-+      master->bus_num = 2; /* FIXME: use dynamic number */
-+
-+      sp->master = spi_master_get(master);
-+      sp->glamo = sp->info->glamo;
-+
-+      sp->bitbang.master = sp->master;
-+      sp->bitbang.chipselect = glamo_spigpio_chipsel;
-+      sp->bitbang.txrx_word[SPI_MODE_0] = glamo_spigpio_txrx_mode0;
-+      sp->bitbang.txrx_word[SPI_MODE_1] = glamo_spigpio_txrx_mode1;
-+      sp->bitbang.txrx_word[SPI_MODE_2] = glamo_spigpio_txrx_mode2;
-+      sp->bitbang.txrx_word[SPI_MODE_3] = glamo_spigpio_txrx_mode3;
-+
-+      /* set state of spi pins */
-+      glamo_gpio_setpin(sp->glamo, sp->info->pin_clk, 0);
-+      glamo_gpio_setpin(sp->glamo, sp->info->pin_mosi, 0);
-+      glamo_gpio_setpin(sp->glamo, sp->info->pin_cs, 1);
-+
-+      glamo_gpio_cfgpin(sp->glamo, sp->info->pin_clk);
-+      glamo_gpio_cfgpin(sp->glamo, sp->info->pin_mosi);
-+      glamo_gpio_cfgpin(sp->glamo, sp->info->pin_cs);
-+      if (sp->info->pin_miso)
-+              glamo_gpio_cfgpin(sp->glamo, sp->info->pin_miso);
-+
-+      /* bring the LCM panel out of reset if it isn't already */
-+
-+      glamo_gpio_setpin(sp->glamo, GLAMO_GPIO4, 1);
-+      glamo_gpio_cfgpin(sp->glamo, GLAMO_GPIO4_OUTPUT);
-+      msleep(90);
-+
-+#if 0
-+      sp->dev = &pdev->dev;
-+
-+      sp->bitbang.setup_transfer = glamo_spi_setupxfer;
-+      sp->bitbang.txrx_bufs = glamo_spi_txrx;
-+      sp->bitbang.master->setup = glamo_spi_setup;
-+#endif
-+
-+      ret = spi_bitbang_start(&sp->bitbang);
-+      if (ret)
-+              goto err_no_bitbang;
-+
-+      /* register the chips to go with the board */
-+
-+      for (i = 0; i < sp->info->board_size; i++) {
-+              dev_info(&pdev->dev, "registering %p: %s\n",
-+                       &sp->info->board_info[i],
-+                       sp->info->board_info[i].modalias);
-+
-+              sp->info->board_info[i].controller_data = sp;
-+              spi_new_device(master, sp->info->board_info + i);
-+      }
-+
-+      return 0;
-+
-+err_no_bitbang:
-+      platform_set_drvdata(pdev, NULL);
-+err_no_pdev:
-+      spi_master_put(sp->bitbang.master);
-+err:
-+      return ret;
-+
-+}
-+
-+static int glamo_spigpio_remove(struct platform_device *pdev)
-+{
-+      struct glamo_spigpio *sp = platform_get_drvdata(pdev);
-+
-+      spi_bitbang_stop(&sp->bitbang);
-+      spi_master_put(sp->bitbang.master);
-+
-+      return 0;
-+}
-+
-+#define glamo_spigpio_suspend NULL
-+#define glamo_spigpio_resume NULL
-+
-+static struct platform_driver glamo_spi_drv = {
-+      .probe          = glamo_spigpio_probe,
-+      .remove         = glamo_spigpio_remove,
-+      .suspend        = glamo_spigpio_suspend,
-+      .resume         = glamo_spigpio_resume,
-+      .driver         = {
-+              .name   = "glamo-spi-gpio",
-+              .owner  = THIS_MODULE,
-+      },
-+};
-+
-+static int __init glamo_spi_init(void)
-+{
-+      return platform_driver_register(&glamo_spi_drv);
-+}
-+
-+static void __exit glamo_spi_exit(void)
-+{
-+      platform_driver_unregister(&glamo_spi_drv);
-+}
-+
-+module_init(glamo_spi_init);
-+module_exit(glamo_spi_exit);
-+
-+MODULE_DESCRIPTION("Smedia Glamo 336x/337x LCM serial command SPI Driver");
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>")
-+MODULE_LICENSE("GPL");
-diff --git a/include/asm-arm/arch-s3c2410/irqs.h b/include/asm-arm/arch-s3c2410/irqs.h
-index f5435d8..ea945ea 100644
---- a/include/asm-arm/arch-s3c2410/irqs.h
-+++ b/include/asm-arm/arch-s3c2410/irqs.h
-@@ -155,12 +155,40 @@
- #define IRQ_S3C2443_AC97      S3C2410_IRQSUB(28)
- #ifdef CONFIG_CPU_S3C2443
--#define NR_IRQS (IRQ_S3C2443_AC97+1)
-+#define _NR_IRQS (IRQ_S3C2443_AC97+1)
- #else
--#define NR_IRQS (IRQ_S3C2440_AC97+1)
-+#define _NR_IRQS (IRQ_S3C2440_AC97+1)
- #endif
- /* Our FIQs are routable from IRQ_EINT0 to IRQ_ADCPARENT */
- #define FIQ_START             IRQ_EINT0
-+/*
-+ * The next 16 interrupts are for board specific purposes.  Since
-+ * the kernel can only run on one machine at a time, we can re-use
-+ * these.  If you need more, increase IRQ_BOARD_END, but keep it
-+ * within sensible limits.
-+ */
-+#define IRQ_BOARD_START               _NR_IRQS
-+#define IRQ_BOARD_END         (_NR_IRQS + 10)
-+
-+#if defined(CONFIG_MACH_NEO1973_GTA02)
-+#define NR_IRQS                       (IRQ_BOARD_END)
-+#else
-+#define NR_IRQS                       (IRQ_BOARD_START)
-+#endif
-+
-+/* Neo1973 GTA02 interrupts */
-+#define NEO1973_GTA02_IRQ(x)  (IRQ_BOARD_START + (x))
-+#define IRQ_GLAMO(x)          NEO1973_GTA02_IRQ(x)
-+#define IRQ_GLAMO_HOSTBUS     IRQ_GLAMO(0)
-+#define IRQ_GLAMO_JPEG                IRQ_GLAMO(1)
-+#define IRQ_GLAMO_MPEG                IRQ_GLAMO(2)
-+#define IRQ_GLAMO_MPROC1      IRQ_GLAMO(3)
-+#define IRQ_GLAMO_MPROC0      IRQ_GLAMO(4)
-+#define IRQ_GLAMO_CMDQUEUE    IRQ_GLAMO(5)
-+#define IRQ_GLAMO_2D          IRQ_GLAMO(6)
-+#define IRQ_GLAMO_MMC         IRQ_GLAMO(7)
-+#define IRQ_GLAMO_RISC                IRQ_GLAMO(8)
-+
- #endif /* __ASM_ARCH_IRQ_H */
-diff --git a/include/linux/glamo-gpio.h b/include/linux/glamo-gpio.h
-new file mode 100644
-index 0000000..d00f7e9
---- /dev/null
-+++ b/include/linux/glamo-gpio.h
-@@ -0,0 +1,99 @@
-+#ifndef __GLAMO_GPIO_H
-+#define __GLAMO_GPIO_H
-+
-+struct glamo_core;
-+
-+#define GLAMO_GPIO_BANKA      0x0000
-+#define GLAMO_GPIO_BANKB      0x1000
-+#define GLAMO_GPIO_BANKC      0x2000
-+#define GLAMO_GPIO_BANKD      0x3000
-+
-+#define GLAMO_GPIONO(bank, pin)       ((bank & 0xf000) | ((pin & 0xf) << 8))
-+
-+#define GLAMO_GPIO_F_IN               0x0010
-+#define GLAMO_GPIO_F_OUT      0x0020
-+#define GLAMO_GPIO_F_FUNC     0x0030
-+
-+#define GLAMO_GPIO0           GLAMO_GPIONO(GLAMO_GPIO_BANKA, 0)
-+#define GLAMO_GPIO0_INPUT     (GLAMO_GPIO0 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO0_OUTPUT    (GLAMO_GPIO0 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO0_HA20      (GLAMO_GPIO0 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO1           GLAMO_GPIONO(GLAMO_GPIO_BANKA, 1)
-+#define GLAMO_GPIO1_INPUT     (GLAMO_GPIO1 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO1_OUTPUT    (GLAMO_GPIO1 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO1_HA21      (GLAMO_GPIO1 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO2           GLAMO_GPIONO(GLAMO_GPIO_BANKA, 2)
-+#define GLAMO_GPIO2_INPUT     (GLAMO_GPIO2 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO2_OUTPUT    (GLAMO_GPIO2 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO2_HA22      (GLAMO_GPIO2 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO3           GLAMO_GPIONO(GLAMO_GPIO_BANKA, 3)
-+#define GLAMO_GPIO3_INPUT     (GLAMO_GPIO3 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO3_OUTPUT    (GLAMO_GPIO3 | GLAMO_GPIO_F_OUT)
-+#define       GLAMO_GPIO3_HA23        (GLAMO_GPIO3 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO4           GLAMO_GPIONO(GLAMO_GPIO_BANKB, 0)
-+#define GLAMO_GPIO4_INPUT     (GLAMO_GPIO4 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO4_OUTPUT    (GLAMO_GPIO4 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO4_nLCS0     (GLAMO_GPIO4 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO5           GLAMO_GPIONO(GLAMO_GPIO_BANKB, 1)
-+#define GLAMO_GPIO5_INPUT     (GLAMO_GPIO5 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO5_OUTPUT    (GLAMO_GPIO5 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO5_nLCS1     (GLAMO_GPIO5 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO6           GLAMO_GPIONO(GLAMO_GPIO_BANKB, 2)
-+#define GLAMO_GPIO6_INPUT     (GLAMO_GPIO6 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO6_OUTPUT    (GLAMO_GPIO6 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO6_LDCLK     (GLAMO_GPIO6 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO7           GLAMO_GPIONO(GLAMO_GPIO_BANKB, 3)
-+#define GLAMO_GPIO7_INPUT     (GLAMO_GPIO7 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO7_OUTPUT    (GLAMO_GPIO7 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO7_nLDE      (GLAMO_GPIO7 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO8           GLAMO_GPIONO(GLAMO_GPIO_BANKC, 0)
-+#define GLAMO_GPIO8_INPUT     (GLAMO_GPIO8 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO8_OUTPUT    (GLAMO_GPIO8 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO8_LD16      (GLAMO_GPIO8 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO9           GLAMO_GPIONO(GLAMO_GPIO_BANKC, 1)
-+#define GLAMO_GPIO9_INPUT     (GLAMO_GPIO9 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO9_OUTPUT    (GLAMO_GPIO9 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO9_LD17      (GLAMO_GPIO9 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO10          GLAMO_GPIONO(GLAMO_GPIO_BANKC, 2)
-+#define GLAMO_GPIO10_INPUT    (GLAMO_GPIO10 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO10_OUTPUT   (GLAMO_GPIO10 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO10_LSCK     (GLAMO_GPIO10 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO11          GLAMO_GPIONO(GLAMO_GPIO_BANKC, 3)
-+#define GLAMO_GPIO11_INPUT    (GLAMO_GPIO11 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO11_OUTPUT   (GLAMO_GPIO11 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO11_LSDA     (GLAMO_GPIO11 | GLAMO_GPIO_F_FUNC)
-+
-+#define GLAMO_GPIO12          GLAMO_GPIONO(GLAMO_GPIO_BANKD, 0)
-+#define GLAMO_GPIO12_INPUT    (GLAMO_GPIO12 | GLAMO_GPIO_F_IN)
-+#define GLAMO_GPIO12_OUTPUT   (GLAMO_GPIO12 | GLAMO_GPIO_F_OUT)
-+#define GLAMO_GPIO12_LSA0     (GLAMO_GPIO12 | GLAMO_GPIO_F_FUNC)
-+
-+
-+#define REG_OF_GPIO(gpio)     (((gpio & 0xf000) >> 12)*2 \
-+                                              + GLAMO_REG_GPIO_GEN1)
-+#define NUM_OF_GPIO(gpio)     ((gpio & 0x0f00) >> 8)
-+#define GPIO_OUT_BIT(gpio)    (1 << (NUM_OF_GPIO(gpio) + 0))
-+#define OUTPUT_BIT(gpio)      (1 << (NUM_OF_GPIO(gpio) + 4))
-+#define INPUT_BIT(gpio)               (1 << (NUM_OF_GPIO(gpio) + 8))
-+#define FUNC_BIT(gpio)                (1 << (NUM_OF_GPIO(gpio) + 12))
-+
-+void glamo_gpio_setpin(struct glamo_core *glamo, unsigned int pin,
-+                     unsigned int value);
-+
-+int glamo_gpio_getpin(struct glamo_core *glamo, unsigned int pin);
-+
-+void glamo_gpio_cfgpin(struct glamo_core *glamo, unsigned int pinfunc);
-+
-+
-+#endif /* _GLAMO_GPIO */
-diff --git a/include/linux/glamofb.h b/include/linux/glamofb.h
-new file mode 100644
-index 0000000..24742a2
---- /dev/null
-+++ b/include/linux/glamofb.h
-@@ -0,0 +1,39 @@
-+#ifndef _LINUX_GLAMOFB_H
-+#define _LINUX_GLAMOFB_H
-+
-+#include <linux/spi/glamo.h>
-+
-+struct glamofb_val {
-+      unsigned int defval;
-+      unsigned int min;
-+      unsigned int max;
-+};
-+
-+struct glamo_core;
-+
-+struct glamofb_platform_data {
-+      int width, height;
-+      int pixclock;
-+      int left_margin, right_margin;
-+      int upper_margin, lower_margin;
-+      int hsync_len, vsync_len;
-+      int fb_mem_size;
-+
-+      struct glamofb_val xres;
-+      struct glamofb_val yres;
-+      struct glamofb_val bpp;
-+
-+      struct glamo_spi_info *spi_info;
-+      struct glamo_spigpio_info *spigpio_info;
-+      struct glamo_core *glamo;
-+
-+      /* glamo mmc platform specific info */
-+      void            (*glamo_set_mci_power)(unsigned char power_mode,
-+                                   unsigned short vdd);
-+      int             (*glamo_irq_is_wired)(void);
-+};
-+
-+void glamofb_cmd_mode(struct glamofb_handle *gfb, int on);
-+int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val);
-+
-+#endif
-diff --git a/include/linux/spi/glamo.h b/include/linux/spi/glamo.h
-new file mode 100644
-index 0000000..86419ea
---- /dev/null
-+++ b/include/linux/spi/glamo.h
-@@ -0,0 +1,28 @@
-+#ifndef __GLAMO_SPI_H
-+#define __GLAMO_SPI_H
-+
-+#include <linux/glamo-gpio.h>
-+
-+struct spi_board_info;
-+struct glamofb_handle;
-+struct glamo_core;
-+
-+struct glamo_spi_info {
-+      unsigned long           board_size;
-+      struct spi_board_info   *board_info;
-+      struct glamofb_handle   *glamofb_handle;
-+};
-+
-+struct glamo_spigpio_info {
-+      unsigned int            pin_clk;
-+      unsigned int            pin_mosi;
-+      unsigned int            pin_miso;
-+      unsigned int            pin_cs;
-+
-+      unsigned int            board_size;
-+      struct spi_board_info   *board_info;
-+      struct glamo_core       *glamo;
-+};
-+
-+
-+#endif
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1027-glamo-mmc.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1027-glamo-mmc.patch.patch
deleted file mode 100755 (executable)
index 0eefdb7..0000000
+++ /dev/null
@@ -1,1188 +0,0 @@
-From 448ffab41f86596340e9f34dc8141bf2ca857e4e Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:44:51 +0100
-Subject: [PATCH] glamo-mmc.patch
-
----
- drivers/mfd/glamo/Kconfig      |    9 +
- drivers/mfd/glamo/Makefile     |    1 +
- drivers/mfd/glamo/glamo-core.c |   17 +-
- drivers/mfd/glamo/glamo-mci.c  |  837 ++++++++++++++++++++++++++++++++++++++++
- drivers/mfd/glamo/glamo-mci.h  |   76 ++++
- drivers/mfd/glamo/glamo-regs.h |  169 ++++++++-
- 6 files changed, 1099 insertions(+), 10 deletions(-)
- create mode 100644 drivers/mfd/glamo/glamo-mci.c
- create mode 100644 drivers/mfd/glamo/glamo-mci.h
-
-diff --git a/drivers/mfd/glamo/Kconfig b/drivers/mfd/glamo/Kconfig
-index b99f2b2..ec2ae3d 100644
---- a/drivers/mfd/glamo/Kconfig
-+++ b/drivers/mfd/glamo/Kconfig
-@@ -33,3 +33,12 @@ config MFD_GLAMO_SPI_FB
-        control channel.  This SPI interface is frequently used to
-        interconnect the LCM control interface.
-+config MFD_GLAMO_MCI
-+      tristate "Glamo S3C SD/MMC Card Interface support"
-+      depends on MFD_GLAMO && MMC
-+      help
-+        This selects a driver for the MCI interface found in
-+        the S-Media GLAMO chip, as used in OpenMoko
-+        neo1973 GTA-02.
-+
-+        If unsure, say N.
-\ No newline at end of file
-diff --git a/drivers/mfd/glamo/Makefile b/drivers/mfd/glamo/Makefile
-index fb53982..dc64d50 100644
---- a/drivers/mfd/glamo/Makefile
-+++ b/drivers/mfd/glamo/Makefile
-@@ -8,4 +8,5 @@ obj-$(CONFIG_MFD_GLAMO_SPI_GPIO)       += glamo-spi-gpio.o
- obj-$(CONFIG_MFD_GLAMO_FB)            += glamo-fb.o
- obj-$(CONFIG_MFD_GLAMO_SPI_FB)                += glamo-lcm-spi.o
-+obj-$(CONFIG_MFD_GLAMO_MCI)           += glamo-mci.o
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index acf545f..8497de2 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -440,7 +440,22 @@ int glamo_engine_disable(struct glamo_core *glamo, enum glamo_engine engine)
- {
-       spin_lock(&glamo->lock);
-       switch (engine) {
--      /* FIXME: Implementation */
-+      case GLAMO_ENGINE_MMC:
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_MMC, 0,
-+                                                 GLAMO_CLOCK_MMC_EN_M9CLK |
-+                                                 GLAMO_CLOCK_MMC_EN_TCLK |
-+                                                 GLAMO_CLOCK_MMC_DG_M9CLK |
-+                                                 GLAMO_CLOCK_MMC_DG_TCLK);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_HOSTBUS(2), 0,
-+                                                 GLAMO_HOSTBUS2_MMIO_EN_MMC);
-+              /* disable the TCLK divider clk input */
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_GEN5_1, 0,
-+                                              GLAMO_CLOCK_GEN51_EN_DIV_TCLK);
-+              /* good idea to hold the thing in reset when we power it off? */
-+/*            writew(readw(glamo->base + GLAMO_REG_CLOCK_MMC) |
-+                    GLAMO_CLOCK_MMC_RESET, glamo->base + GLAMO_REG_CLOCK_MMC);
-+*/
-+              break;
-       default:
-               break;
-       }
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-new file mode 100644
-index 0000000..f559e5e
---- /dev/null
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -0,0 +1,837 @@
-+/*
-+ *  linux/drivers/mmc/host/glamo-mmc.c - Glamo MMC driver
-+ *
-+ *  Copyright (C) 2007 OpenMoko, Inc,  Andy Green <andy@openmoko.com>
-+ *  Based on S3C MMC driver that was:
-+ *  Copyright (C) 2004-2006 maintech GmbH, Thomas Kleffel <tk@maintech.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.
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/clk.h>
-+#include <linux/mmc/mmc.h>
-+#include <linux/mmc/host.h>
-+#include <linux/platform_device.h>
-+#include <linux/irq.h>
-+#include <linux/pcf50633.h>
-+#include <linux/delay.h>
-+#include <linux/interrupt.h>
-+
-+#include <asm/dma.h>
-+#include <asm/dma-mapping.h>
-+#include <asm/io.h>
-+
-+#include "glamo-mci.h"
-+#include "glamo-core.h"
-+#include "glamo-regs.h"
-+
-+/* from glamo-core.c */
-+extern struct glamo_mci_pdata glamo_mci_def_pdata;
-+
-+
-+#define DRIVER_NAME "glamo-mci"
-+#define RESSIZE(ressource) (((ressource)->end - (ressource)->start) + 1)
-+
-+static void glamo_mci_send_request(struct mmc_host *mmc);
-+
-+unsigned char CRC7(u8 * pu8, int cnt)
-+{
-+      u8 crc = 0;
-+
-+      while (cnt--) {
-+              int n;
-+              u8 d = *pu8++;
-+              for (n = 0; n < 8; n++) {
-+                      crc <<= 1;
-+                      if ((d & 0x80) ^ (crc & 0x80))
-+                              crc ^= 0x09;
-+                      d <<= 1;
-+              }
-+      }
-+      return (crc << 1) | 1;
-+}
-+
-+/* these _dly versions account for the dead time rules for reg access */
-+static u16 readw_dly(u16 __iomem * pu16)
-+{
-+      glamo_reg_access_delay();
-+      return readw(pu16);
-+}
-+
-+static void writew_dly(u16 val, u16 __iomem * pu16)
-+{
-+      glamo_reg_access_delay();
-+      writew(val, pu16);
-+}
-+
-+static int get_data_buffer(struct glamo_mci_host *host,
-+                         volatile u32 *words, volatile u16 **pointer)
-+{
-+      struct scatterlist *sg;
-+
-+      *words = 0;
-+      *pointer = NULL;
-+
-+      if (host->pio_active == XFER_NONE)
-+              return -EINVAL;
-+
-+      if ((!host->mrq) || (!host->mrq->data))
-+              return -EINVAL;
-+
-+      if (host->pio_sgptr >= host->mrq->data->sg_len) {
-+              dev_dbg(&host->pdev->dev, "no more buffers (%i/%i)\n",
-+                    host->pio_sgptr, host->mrq->data->sg_len);
-+              return -EBUSY;
-+      }
-+      sg = &host->mrq->data->sg[host->pio_sgptr];
-+
-+      *words = sg->length >> 1; /* we are working with a 16-bit data bus */
-+      *pointer = page_address(sg_page(sg)) + sg->offset;
-+
-+      BUG_ON(((long)(*pointer)) & 1);
-+
-+      host->pio_sgptr++;
-+
-+      /* dev_info(&host->pdev->dev, "new buffer (%i/%i)\n",
-+            host->pio_sgptr, host->mrq->data->sg_len); */
-+      return 0;
-+}
-+
-+static void do_pio_read(struct glamo_mci_host *host)
-+{
-+      int res;
-+      u16 __iomem *from_ptr = host->base_data + (RESSIZE(host->mem_data) /
-+                                                            sizeof(u16) / 2);
-+#ifdef DEBUG
-+      u16 * block;
-+#endif
-+
-+      while (1) {
-+              res = get_data_buffer(host, &host->pio_words, &host->pio_ptr);
-+              if (res) {
-+                      host->pio_active = XFER_NONE;
-+                      host->complete_what = COMPLETION_FINALIZE;
-+
-+                      dev_dbg(&host->pdev->dev, "pio_read(): "
-+                              "complete (no more data).\n");
-+                      return;
-+              }
-+
-+              dev_dbg(&host->pdev->dev, "pio_read(): host->pio_words: %d\n",
-+                              host->pio_words);
-+
-+              host->pio_count += host->pio_words << 1;
-+
-+#ifdef DEBUG
-+              block = (u16 *)host->pio_ptr;
-+              res = host->pio_words << 1;
-+#endif
-+              while (host->pio_words--)
-+                      *host->pio_ptr++ = *from_ptr++;
-+#ifdef DEBUG
-+              print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 16, 1,
-+                             (void *)block, res, 1);
-+#endif
-+      }
-+}
-+
-+static int do_pio_write(struct glamo_mci_host *host)
-+{
-+      int res = 0;
-+      volatile u16 __iomem *to_ptr = host->base_data;
-+      int err = 0;
-+
-+      dev_dbg(&host->pdev->dev, "pio_write():\n");
-+      while (!res) {
-+              res = get_data_buffer(host, &host->pio_words, &host->pio_ptr);
-+              if (res)
-+                      continue;
-+
-+              dev_dbg(&host->pdev->dev, "pio_write():new source: [%i]@[%p]\n",
-+                      host->pio_words, host->pio_ptr);
-+
-+              host->pio_count += host->pio_words << 1;
-+              while (host->pio_words--)
-+                      writew(*host->pio_ptr++, to_ptr++);
-+      }
-+
-+      dev_dbg(&host->pdev->dev, "pio_write(): complete\n");
-+      host->pio_active = XFER_NONE;
-+      return err;
-+}
-+
-+static void glamo_mci_irq(unsigned int irq, struct irq_desc *desc)
-+{
-+      struct glamo_mci_host *host = (struct glamo_mci_host *)
-+                                    desc->handler_data;
-+      u16 status;
-+      struct mmc_command *cmd;
-+      unsigned long iflags;
-+
-+      if (!host)
-+              return;
-+      if (!host->mrq)
-+              return;
-+      cmd = host->mrq->cmd;
-+      if (!cmd)
-+              return;
-+
-+      spin_lock_irqsave(&host->complete_lock, iflags);
-+
-+      status = readw_dly(host->base + GLAMO_REG_MMC_RB_STAT1);
-+
-+      /* ack this interrupt source */
-+      writew(GLAMO_IRQ_MMC,
-+             glamo_mci_def_pdata.pglamo->base + GLAMO_REG_IRQ_CLEAR);
-+
-+      if (status & (GLAMO_STAT1_MMC_RTOUT |
-+                    GLAMO_STAT1_MMC_DTOUT))
-+              cmd->error = -ETIMEDOUT;
-+      if (status & (GLAMO_STAT1_MMC_BWERR |
-+                    GLAMO_STAT1_MMC_BRERR))
-+              cmd->error = -EILSEQ;
-+      if (cmd->error) {
-+              dev_err(&host->pdev->dev, "Error after cmd: 0x%x\n", status);
-+              goto done;
-+      }
-+
-+      if (host->pio_active == XFER_READ)
-+              do_pio_read(host);
-+
-+      host->mrq->data->bytes_xfered = host->pio_count;
-+      dev_dbg(&host->pdev->dev, "status = 0x%04x count=%d\n",
-+               status, host->pio_count);
-+
-+      /* issue STOP if we have been given one to use */
-+      if (host->mrq->stop) {
-+              host->cmd_is_stop = 1;
-+              glamo_mci_send_request(host->mmc);
-+              host->cmd_is_stop = 0;
-+      }
-+done:
-+      host->complete_what = COMPLETION_NONE;
-+      host->mrq = NULL;
-+      mmc_request_done(host->mmc, cmd->mrq);
-+      spin_unlock_irqrestore(&host->complete_lock, iflags);
-+}
-+
-+static int glamo_mci_send_command(struct glamo_mci_host *host,
-+                                struct mmc_command *cmd)
-+{
-+      u8 u8a[6];
-+      u16 fire = 0;
-+
-+      /* if we can't do it, reject as busy */
-+      if (!readw_dly(host->base + GLAMO_REG_MMC_RB_STAT1) &
-+           GLAMO_STAT1_MMC_IDLE) {
-+              host->mrq = NULL;
-+              cmd->error = -EBUSY;
-+              mmc_request_done(host->mmc, host->mrq);
-+              return -EBUSY;
-+      }
-+
-+      /* create an array in wire order for CRC computation */
-+      u8a[0] = 0x40 | (cmd->opcode & 0x3f);
-+      u8a[1] = (u8)(cmd->arg >> 24);
-+      u8a[2] = (u8)(cmd->arg >> 16);
-+      u8a[3] = (u8)(cmd->arg >> 8);
-+      u8a[4] = (u8)cmd->arg;
-+      u8a[5] = CRC7(&u8a[0], 5); /* CRC7 on first 5 bytes of packet */
-+
-+      /* issue the wire-order array including CRC in register order */
-+      writew_dly((u8a[4] << 8) | u8a[5], host->base + GLAMO_REG_MMC_CMD_REG1);
-+      writew_dly((u8a[2] << 8) | u8a[3], host->base + GLAMO_REG_MMC_CMD_REG2);
-+      writew_dly((u8a[0] << 8) | u8a[1], host->base + GLAMO_REG_MMC_CMD_REG3);
-+
-+      /* command index toggle */
-+      fire |= (host->ccnt & 1) << 12;
-+
-+      /* set type of command */
-+      switch (mmc_cmd_type(cmd)) {
-+      case MMC_CMD_BC:
-+              fire |= GLAMO_FIRE_MMC_CMDT_BNR;
-+              break;
-+      case MMC_CMD_BCR:
-+              fire |= GLAMO_FIRE_MMC_CMDT_BR;
-+              break;
-+      case MMC_CMD_AC:
-+              fire |= GLAMO_FIRE_MMC_CMDT_AND;
-+              break;
-+      case MMC_CMD_ADTC:
-+              fire |= GLAMO_FIRE_MMC_CMDT_AD;
-+              break;
-+      }
-+      /*
-+       * if it expects a response, set the type expected
-+       *
-+       * R1, Length  : 48bit, Normal response
-+       * R1b, Length : 48bit, same R1, but added card busy status
-+       * R2, Length  : 136bit (really 128 bits with CRC snipped)
-+       * R3, Length  : 48bit (OCR register value)
-+       * R4, Length  : 48bit, SDIO_OP_CONDITION, Reverse SDIO Card
-+       * R5, Length  : 48bit, IO_RW_DIRECTION, Reverse SDIO Card
-+       * R6, Length  : 48bit (RCA register)
-+       * R7, Length  : 48bit (interface condition, VHS(voltage supplied),
-+       *                     check pattern, CRC7)
-+       */
-+      switch (mmc_resp_type(cmd)) {
-+      case MMC_RSP_R6: /* same index as R7 and R1 */
-+              fire |= GLAMO_FIRE_MMC_RSPT_R1;
-+              break;
-+      case MMC_RSP_R1B:
-+              fire |= GLAMO_FIRE_MMC_RSPT_R1b;
-+              break;
-+      case MMC_RSP_R2:
-+              fire |= GLAMO_FIRE_MMC_RSPT_R2;
-+              break;
-+      case MMC_RSP_R3:
-+              fire |= GLAMO_FIRE_MMC_RSPT_R3;
-+              break;
-+      /* R4 and R5 supported by chip not defined in linux/mmc/core.h (sdio) */
-+      }
-+      /*
-+       * From the command index, set up the command class in the host ctrllr
-+       *
-+       * missing guys present on chip but couldn't figure out how to use yet:
-+       *     0x0 "stream read"
-+       *     0x9 "cancel running command"
-+       */
-+      switch (cmd->opcode) {
-+      case MMC_READ_SINGLE_BLOCK:
-+              fire |= GLAMO_FIRE_MMC_CC_SBR; /* single block read */
-+              break;
-+      case MMC_SWITCH: /* 64 byte payload */
-+      case 0x33: /* observed issued by MCI */
-+      case MMC_READ_MULTIPLE_BLOCK:
-+              /* we will get an interrupt off this */
-+              if (!cmd->mrq->stop)
-+                      /* multiblock no stop */
-+                      fire |= GLAMO_FIRE_MMC_CC_MBRNS;
-+              else
-+                       /* multiblock with stop */
-+                      fire |= GLAMO_FIRE_MMC_CC_MBRS;
-+              break;
-+      case MMC_WRITE_BLOCK:
-+              fire |= GLAMO_FIRE_MMC_CC_SBW; /* single block write */
-+              break;
-+      case MMC_WRITE_MULTIPLE_BLOCK:
-+              if (cmd->mrq->stop)
-+                       /* multiblock with stop */
-+                      fire |= GLAMO_FIRE_MMC_CC_MBWS;
-+              else
-+                       /* multiblock NO stop-- 'RESERVED'? */
-+                      fire |= GLAMO_FIRE_MMC_CC_MBWNS;
-+              break;
-+      case MMC_STOP_TRANSMISSION:
-+              fire |= GLAMO_FIRE_MMC_CC_STOP; /* STOP */
-+              break;
-+      default:
-+              fire |= GLAMO_FIRE_MMC_CC_BASIC; /* "basic command" */
-+              break;
-+      }
-+      /* enforce timeout */
-+      if (cmd->data) {
-+              if (cmd->data->timeout_clks)
-+                      writew_dly(cmd->data->timeout_clks >> 4, /* / 16 clks */
-+                                      host->base + GLAMO_REG_MMC_TIMEOUT);
-+              else
-+                      writew_dly(0xfff, host->base + GLAMO_REG_MMC_TIMEOUT);
-+      } else
-+              writew(0xfff, host->base + GLAMO_REG_MMC_TIMEOUT);
-+
-+      /* Generate interrupt on txfer; drive strength max */
-+      writew_dly((readw_dly(host->base + GLAMO_REG_MMC_BASIC) & 0xfe) |
-+                 0x0800 | GLAMO_BASIC_MMC_NO_CLK_RD_WAIT |
-+                 GLAMO_BASIC_MMC_EN_COMPL_INT |
-+                 GLAMO_BASIC_MMC_EN_DR_STR0 |
-+                 GLAMO_BASIC_MMC_EN_DR_STR1,
-+                 host->base + GLAMO_REG_MMC_BASIC);
-+
-+      /* send the command out on the wire */
-+      /* dev_info(&host->pdev->dev, "Using FIRE %04X\n", fire); */
-+      writew_dly(fire, host->base + GLAMO_REG_MMC_CMD_FIRE);
-+      cmd->error = 0;
-+      return 0;
-+}
-+
-+static int glamo_mci_prepare_pio(struct glamo_mci_host *host,
-+                               struct mmc_data *data)
-+{
-+      /*
-+       * the S-Media-internal RAM offset for our MMC buffer
-+       * Read is halfway up the buffer and write is at the start
-+       */
-+      if (data->flags & MMC_DATA_READ) {
-+              writew_dly((u16)(GLAMO_FB_SIZE + (RESSIZE(host->mem_data) / 2)),
-+                         host->base + GLAMO_REG_MMC_WDATADS1);
-+              writew_dly((u16)((GLAMO_FB_SIZE +
-+                                      (RESSIZE(host->mem_data) / 2)) >> 16),
-+                         host->base + GLAMO_REG_MMC_WDATADS2);
-+      } else {
-+              writew_dly((u16)GLAMO_FB_SIZE, host->base +
-+                                             GLAMO_REG_MMC_RDATADS1);
-+              writew_dly((u16)(GLAMO_FB_SIZE >> 16), host->base +
-+                                                     GLAMO_REG_MMC_RDATADS2);
-+      }
-+
-+      /* set up the block info */
-+      writew_dly(data->blksz, host->base + GLAMO_REG_MMC_DATBLKLEN);
-+      writew_dly(data->blocks, host->base + GLAMO_REG_MMC_DATBLKCNT);
-+      dev_dbg(&host->pdev->dev, "(blksz=%d, count=%d)\n",
-+                                 data->blksz, data->blocks);
-+      host->pio_sgptr = 0;
-+      host->pio_words = 0;
-+      host->pio_count = 0;
-+      host->pio_active = 0;
-+      /* if write, prep the write into the shared RAM before the command */
-+      if (data->flags & MMC_DATA_WRITE) {
-+              host->pio_active = XFER_WRITE;
-+              return do_pio_write(host);
-+      }
-+      host->pio_active = XFER_READ;
-+      return 0;
-+}
-+
-+static void glamo_mci_send_request(struct mmc_host *mmc)
-+{
-+      struct glamo_mci_host *host = mmc_priv(mmc);
-+      struct mmc_request *mrq = host->mrq;
-+      struct mmc_command *cmd = host->cmd_is_stop ? mrq->stop : mrq->cmd;
-+      u16 * pu16 = (u16 *)&cmd->resp[0];
-+      u16 * reg_resp = (u16 *)(host->base + GLAMO_REG_MMC_CMD_RSP1);
-+      u16 status;
-+      int n;
-+
-+      host->ccnt++;
-+      /*
-+       * somehow 2.6.24 MCI manages to issue MMC_WRITE_BLOCK *without* the
-+       * MMC_DATA_WRITE flag, WTF?  Work around the madness.
-+       */
-+      if (cmd->opcode == MMC_WRITE_BLOCK)
-+              if (mrq->data)
-+                      mrq->data->flags |= MMC_DATA_WRITE;
-+
-+       /* this guy has data to read/write? */
-+      if ((!host->cmd_is_stop) && cmd->data) {
-+              int res;
-+              host->dcnt++;
-+              res = glamo_mci_prepare_pio(host, cmd->data);
-+              if (res) {
-+                      cmd->error = -EIO;
-+                      cmd->data->error = -EIO;
-+                      mmc_request_done(mmc, mrq);
-+                      return;
-+              }
-+      }
-+
-+      dev_dbg(&host->pdev->dev,"cmd 0x%x, "
-+               "arg 0x%x data=%p mrq->stop=%p flags 0x%x\n",
-+               cmd->opcode, cmd->arg, cmd->data, cmd->mrq->stop,
-+               cmd->flags);
-+
-+      if (glamo_mci_send_command(host, cmd))
-+              return;
-+      /*
-+       * we must spin until response is ready or timed out
-+       * -- we don't get interrupts unless there is a bulk rx
-+       */
-+      do
-+              status = readw_dly(host->base + GLAMO_REG_MMC_RB_STAT1);
-+      while ((((status >> 15) & 1) != (host->ccnt & 1)) ||
-+              (!(status & (GLAMO_STAT1_MMC_RB_RRDY |
-+                           GLAMO_STAT1_MMC_RTOUT |
-+                           GLAMO_STAT1_MMC_DTOUT |
-+                           GLAMO_STAT1_MMC_BWERR |
-+                           GLAMO_STAT1_MMC_BRERR))));
-+
-+      if (status & (GLAMO_STAT1_MMC_RTOUT |
-+                    GLAMO_STAT1_MMC_DTOUT))
-+              cmd->error = -ETIMEDOUT;
-+      if (status & (GLAMO_STAT1_MMC_BWERR |
-+                    GLAMO_STAT1_MMC_BRERR))
-+              cmd->error = -EILSEQ;
-+
-+      if (host->cmd_is_stop)
-+              return;
-+
-+      if (cmd->error) {
-+              dev_err(&host->pdev->dev, "Error after cmd: 0x%x\n", status);
-+              goto done;
-+      }
-+      /*
-+       * mangle the response registers in two different exciting
-+       * undocumented ways discovered by trial and error
-+       */
-+      if (mmc_resp_type(cmd) == MMC_RSP_R2)
-+              /* grab the response */
-+              for (n = 0; n < 8; n++) /* super mangle power 1 */
-+                      pu16[n ^ 6] = readw_dly(&reg_resp[n]);
-+      else
-+              for (n = 0; n < 3; n++) /* super mangle power 2 */
-+                      pu16[n] = (readw_dly(&reg_resp[n]) >> 8) |
-+                                (readw_dly(&reg_resp[n + 1]) << 8);
-+      /*
-+       * if we don't have bulk data to take care of, we're done
-+       */
-+      if (!cmd->data)
-+              goto done;
-+      if (!(cmd->data->flags & (MMC_DATA_READ | MMC_DATA_WRITE)))
-+              goto done;
-+      /*
-+       * Otherwise can can use the interrupt as async completion --
-+       * if there is read data coming, or we wait for write data to complete,
-+       * exit without mmc_request_done() as the payload interrupt
-+       * will service it
-+       */
-+      dev_dbg(&host->pdev->dev, "Waiting for payload data\n");
-+      /*
-+       * if the glamo INT# line isn't wired (*cough* it can happen)
-+       * I'm afraid we have to spin on the IRQ status bit and "be
-+       * our own INT# line"
-+       */
-+      if (!glamo_mci_def_pdata.pglamo->irq_works) {
-+              /* we have faith we will get an "interrupt"... */
-+              while (!(readw_dly(glamo_mci_def_pdata.pglamo->base +
-+                       GLAMO_REG_IRQ_STATUS) & GLAMO_IRQ_MMC))
-+                      ;
-+              /* yay we are an interrupt controller! -- call the ISR */
-+              glamo_mci_irq(IRQ_GLAMO(GLAMO_IRQIDX_MMC),
-+                            irq_desc + IRQ_GLAMO(GLAMO_IRQIDX_MMC));
-+      }
-+      return;
-+
-+done:
-+      host->complete_what = COMPLETION_NONE;
-+      host->mrq = NULL;
-+      mmc_request_done(host->mmc, cmd->mrq);
-+}
-+
-+static void glamo_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)
-+{
-+      struct glamo_mci_host *host = mmc_priv(mmc);
-+
-+      host->cmd_is_stop = 0;
-+      host->mrq = mrq;
-+      glamo_mci_send_request(mmc);
-+}
-+
-+static void glamo_mci_reset(struct glamo_mci_host *host)
-+{
-+      /* reset MMC controller */
-+      writew_dly(GLAMO_CLOCK_MMC_RESET | GLAMO_CLOCK_MMC_DG_TCLK |
-+                 GLAMO_CLOCK_MMC_EN_TCLK | GLAMO_CLOCK_MMC_DG_M9CLK |
-+                 GLAMO_CLOCK_MMC_EN_M9CLK,
-+                 glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_MMC);
-+      msleep(1);
-+      /* and disable reset */
-+      writew_dly(GLAMO_CLOCK_MMC_DG_TCLK |
-+                 GLAMO_CLOCK_MMC_EN_TCLK | GLAMO_CLOCK_MMC_DG_M9CLK |
-+                 GLAMO_CLOCK_MMC_EN_M9CLK,
-+                 glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_MMC);
-+}
-+
-+static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-+{
-+      struct glamo_mci_host *host = mmc_priv(mmc);
-+      int mci_psc = 0;
-+      int n = 0;
-+
-+      /* Set power */
-+      switch(ios->power_mode) {
-+      case MMC_POWER_ON:
-+      case MMC_POWER_UP:
-+              if (host->power_mode_current != MMC_POWER_OFF)
-+                      break;
-+              if (host->vdd_current != ios->vdd) {
-+                      host->pdata->glamo_set_mci_power(ios->power_mode,
-+                                                       ios->vdd);
-+                      host->vdd_current = ios->vdd;
-+              }
-+              glamo_engine_enable(glamo_mci_def_pdata.pglamo,
-+                                                      GLAMO_ENGINE_MMC);
-+              glamo_mci_reset(host);
-+              break;
-+
-+      case MMC_POWER_OFF:
-+      default:
-+              if (host->power_mode_current == MMC_POWER_OFF)
-+                      break;
-+              glamo_engine_disable(glamo_mci_def_pdata.pglamo,
-+                                   GLAMO_ENGINE_MMC);
-+              host->pdata->glamo_set_mci_power(MMC_POWER_OFF, 0);
-+              host->vdd_current = -1;
-+              break;
-+      }
-+      host->power_mode_current = ios->power_mode;
-+
-+       /* Set clock */
-+/*    if (ios->clock) { */
-+      for (mci_psc = 0; mci_psc < 256; mci_psc++) {
-+              host->real_rate = host->clk_rate / (mci_psc + 1);
-+              if (host->real_rate <= ios->clock)
-+                      break;
-+      }
-+      if (mci_psc > 255)
-+              mci_psc = 255;
-+      host->clk_div = mci_psc;
-+      /* set the nearest prescaler factor
-+      *
-+      * register shared with SCLK divisor -- no chance of race because
-+      * we don't use sensor interface
-+      */
-+      writew_dly((readw(glamo_mci_def_pdata.pglamo->base +
-+                      GLAMO_REG_CLOCK_GEN8) & 0xff00) | host->clk_div,
-+              glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN8);
-+      /* enable clock to divider input */
-+      writew_dly(readw(glamo_mci_def_pdata.pglamo->base +
-+              GLAMO_REG_CLOCK_GEN5_1) | GLAMO_CLOCK_GEN51_EN_DIV_TCLK,
-+              glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN5_1);
-+#if 0
-+      } else { /* stop clock */
-+              host->real_rate = 0;
-+              /* remove clock from divider input */
-+              writew(readw(glamo_mci_def_pdata.pglamo->base +
-+                   GLAMO_REG_CLOCK_GEN5_1) & (~GLAMO_CLOCK_GEN51_EN_DIV_TCLK),
-+                   glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN5_1);
-+      }
-+#endif
-+      if ((ios->power_mode == MMC_POWER_ON) ||
-+          (ios->power_mode == MMC_POWER_UP)) {
-+              dev_info(&host->pdev->dev,
-+                      "powered (vdd = %d) clk: %lukHz div=%d (req: %ukHz). "
-+                      "Bus width=%d\n",ios->vdd,
-+                      host->real_rate / 1000, mci_psc,
-+                      ios->clock / 1000, ios->bus_width);
-+      } else
-+              dev_info(&host->pdev->dev, "glamo_mci_set_ios: power down.\n");
-+
-+      /* set bus width */
-+      host->bus_width = ios->bus_width;
-+      if (host->bus_width == MMC_BUS_WIDTH_4)
-+              n = GLAMO_BASIC_MMC_EN_4BIT_DATA;
-+      writew_dly((readw_dly(host->base + GLAMO_REG_MMC_BASIC) &
-+                                        (~GLAMO_BASIC_MMC_EN_4BIT_DATA)) | n,
-+                                            host->base + GLAMO_REG_MMC_BASIC);
-+}
-+
-+
-+/*
-+ * no physical write protect supported by us
-+ */
-+static int glamo_mci_get_ro(struct mmc_host *mmc)
-+{
-+      return 0;
-+}
-+
-+static struct mmc_host_ops glamo_mci_ops = {
-+      .request        = glamo_mci_request,
-+      .set_ios        = glamo_mci_set_ios,
-+      .get_ro         = glamo_mci_get_ro,
-+};
-+
-+static int glamo_mci_probe(struct platform_device *pdev)
-+{
-+      struct mmc_host         *mmc;
-+      struct glamo_mci_host   *host;
-+      int ret;
-+
-+      dev_info(&pdev->dev, "glamo_mci driver (C)2007 OpenMoko, Inc\n");
-+
-+      mmc = mmc_alloc_host(sizeof(struct glamo_mci_host), &pdev->dev);
-+      if (!mmc) {
-+              ret = -ENOMEM;
-+              goto probe_out;
-+      }
-+
-+      host = mmc_priv(mmc);
-+      host->mmc = mmc;
-+      host->pdev = pdev;
-+      host->pdata = &glamo_mci_def_pdata;
-+      host->power_mode_current = MMC_POWER_OFF;
-+
-+      host->complete_what = COMPLETION_NONE;
-+      host->pio_active = XFER_NONE;
-+
-+      spin_lock_init(&host->complete_lock);
-+
-+      host->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+      if (!host->mem) {
-+              dev_err(&pdev->dev,
-+                      "failed to get io memory region resouce.\n");
-+
-+              ret = -ENOENT;
-+              goto probe_free_host;
-+      }
-+
-+      host->mem = request_mem_region(host->mem->start,
-+              RESSIZE(host->mem), pdev->name);
-+
-+      if (!host->mem) {
-+              dev_err(&pdev->dev, "failed to request io memory region.\n");
-+              ret = -ENOENT;
-+              goto probe_free_host;
-+      }
-+
-+      host->base = ioremap(host->mem->start, RESSIZE(host->mem));
-+      if (!host->base) {
-+              dev_err(&pdev->dev, "failed to ioremap() io memory region.\n");
-+              ret = -EINVAL;
-+              goto probe_free_mem_region;
-+      }
-+
-+      /* set the handler for our bit of the shared chip irq register */
-+      set_irq_handler(IRQ_GLAMO(GLAMO_IRQIDX_MMC), glamo_mci_irq);
-+      /* stash host as our handler's private data */
-+      set_irq_data(IRQ_GLAMO(GLAMO_IRQIDX_MMC), host);
-+
-+      /* Get ahold of our data buffer we use for data in and out on MMC */
-+      host->mem_data = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-+      if (!host->mem_data) {
-+              dev_err(&pdev->dev,
-+                      "failed to get io memory region resource.\n");
-+              ret = -ENOENT;
-+              goto probe_iounmap;
-+      }
-+
-+      host->mem_data = request_mem_region(host->mem_data->start,
-+              RESSIZE(host->mem_data), pdev->name);
-+
-+      if (!host->mem_data) {
-+              dev_err(&pdev->dev, "failed to request io memory region.\n");
-+              ret = -ENOENT;
-+              goto probe_iounmap;
-+      }
-+      host->base_data = ioremap(host->mem_data->start,
-+                                        RESSIZE(host->mem_data));
-+      host->data_max_size = RESSIZE(host->mem_data);
-+
-+      if (host->base_data == 0) {
-+              dev_err(&pdev->dev, "failed to ioremap() io memory region.\n");
-+              ret = -EINVAL;
-+              goto probe_free_mem_region_data;
-+      }
-+
-+      host->vdd_current = 0;
-+      host->clk_rate = 50000000; /* really it's 49152000 */
-+      host->clk_div = 16;
-+
-+      /* explain our host controller capabilities */
-+      mmc->ops        = &glamo_mci_ops;
-+      mmc->ocr_avail  = host->pdata->ocr_avail;
-+      mmc->caps       = MMC_CAP_4_BIT_DATA |
-+                        MMC_CAP_MULTIWRITE |
-+                        MMC_CAP_MMC_HIGHSPEED |
-+                        MMC_CAP_SD_HIGHSPEED;
-+      mmc->f_min      = host->clk_rate / 256;
-+      /*
-+       * held at /4 due to concerns of 100R recommended series resistor
-+       * allows 16MHz @ 4-bit --> 8MBytes/sec raw
-+       */
-+      mmc->f_max      = host->clk_rate / 3;
-+
-+      mmc->max_blk_count      = (1 << 16) - 1; /* GLAMO_REG_MMC_RB_BLKCNT */
-+      mmc->max_blk_size       = (1 << 12) - 1; /* GLAMO_REG_MMC_RB_BLKLEN */
-+      mmc->max_req_size       = RESSIZE(host->mem_data) / 2;
-+      mmc->max_seg_size       = mmc->max_req_size;
-+      mmc->max_phys_segs      = 1; /* hw doesn't talk about segs??? */
-+      mmc->max_hw_segs        = 1;
-+
-+      dev_info(&host->pdev->dev, "probe: mapped mci_base:%p irq:%u.\n",
-+              host->base, host->irq);
-+
-+      if ((ret = mmc_add_host(mmc))) {
-+              dev_err(&pdev->dev, "failed to add mmc host.\n");
-+              goto probe_free_mem_region_data;
-+      }
-+
-+      platform_set_drvdata(pdev, mmc);
-+
-+      dev_info(&pdev->dev,"initialisation done.\n");
-+      return 0;
-+
-+ probe_free_mem_region_data:
-+      release_mem_region(host->mem_data->start, RESSIZE(host->mem_data));
-+
-+ probe_iounmap:
-+      iounmap(host->base);
-+
-+ probe_free_mem_region:
-+      release_mem_region(host->mem->start, RESSIZE(host->mem));
-+
-+ probe_free_host:
-+      mmc_free_host(mmc);
-+ probe_out:
-+      return ret;
-+}
-+
-+static int glamo_mci_remove(struct platform_device *pdev)
-+{
-+      struct mmc_host         *mmc  = platform_get_drvdata(pdev);
-+      struct glamo_mci_host   *host = mmc_priv(mmc);
-+
-+      mmc_remove_host(mmc);
-+      /* stop using our handler, revert it to default */
-+      set_irq_handler(IRQ_GLAMO(GLAMO_IRQIDX_MMC), handle_level_irq);
-+      iounmap(host->base);
-+      iounmap(host->base_data);
-+      release_mem_region(host->mem->start, RESSIZE(host->mem));
-+      release_mem_region(host->mem_data->start, RESSIZE(host->mem_data));
-+      mmc_free_host(mmc);
-+
-+      glamo_engine_disable(glamo_mci_def_pdata.pglamo, GLAMO_ENGINE_MMC);
-+      return 0;
-+}
-+
-+
-+#ifdef CONFIG_PM
-+
-+static int glamo_mci_suspend(struct platform_device *dev, pm_message_t state)
-+{
-+      struct mmc_host *mmc = platform_get_drvdata(dev);
-+
-+      return  mmc_suspend_host(mmc, state);
-+}
-+
-+static int glamo_mci_resume(struct platform_device *dev)
-+{
-+      struct mmc_host *mmc = platform_get_drvdata(dev);
-+
-+      return mmc_resume_host(mmc);
-+}
-+
-+#else /* CONFIG_PM */
-+#define glamo_mci_suspend NULL
-+#define glamo_mci_resume NULL
-+#endif /* CONFIG_PM */
-+
-+
-+static struct platform_driver glamo_mci_driver =
-+{
-+      .driver.name    = "glamo-mci",
-+      .probe          = glamo_mci_probe,
-+      .remove         = glamo_mci_remove,
-+      .suspend        = glamo_mci_suspend,
-+      .resume         = glamo_mci_resume,
-+};
-+
-+static int __init glamo_mci_init(void)
-+{
-+      platform_driver_register(&glamo_mci_driver);
-+      return 0;
-+}
-+
-+static void __exit glamo_mci_exit(void)
-+{
-+      platform_driver_unregister(&glamo_mci_driver);
-+}
-+
-+module_init(glamo_mci_init);
-+module_exit(glamo_mci_exit);
-+
-+MODULE_DESCRIPTION("Glamo MMC/SD Card Interface driver");
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
-diff --git a/drivers/mfd/glamo/glamo-mci.h b/drivers/mfd/glamo/glamo-mci.h
-new file mode 100644
-index 0000000..40c3e24
---- /dev/null
-+++ b/drivers/mfd/glamo/glamo-mci.h
-@@ -0,0 +1,76 @@
-+/*
-+ *  linux/drivers/mmc/host/glamo-mmc.h - GLAMO MCI driver
-+ *
-+ *  Copyright (C) 2007-2008 OpenMoko, Inc, Andy Green <andy@openmoko.com>
-+ *   based on S3C MMC driver -->
-+ *  Copyright (C) 2004-2006 Thomas Kleffel, 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 version 2 as
-+ * published by the Free Software Foundation.
-+ */
-+
-+
-+enum glamo_mci_waitfor {
-+      COMPLETION_NONE,
-+      COMPLETION_FINALIZE,
-+      COMPLETION_CMDSENT,
-+      COMPLETION_RSPFIN,
-+      COMPLETION_XFERFINISH,
-+      COMPLETION_XFERFINISH_RSPFIN,
-+};
-+
-+struct glamo_mci_host {
-+      struct platform_device  *pdev;
-+      struct glamo_mci_pdata  *pdata;
-+      struct mmc_host         *mmc;
-+      struct resource         *mem;
-+      struct resource         *mem_data;
-+      struct clk              *clk;
-+      void __iomem            *base;
-+      u16 __iomem             *base_data;
-+      int                     irq;
-+      int                     irq_cd;
-+      int                     dma;
-+      int                     data_max_size;
-+
-+      int                     power_mode_current;
-+      unsigned int            vdd_current;
-+
-+      unsigned long           clk_rate;
-+      unsigned long           clk_div;
-+      unsigned long           real_rate;
-+      u8                      prescaler;
-+
-+      unsigned                sdiimsk;
-+      int                     dodma;
-+
-+      volatile int            dmatogo;
-+
-+      struct mmc_request      *mrq;
-+      int                     cmd_is_stop;
-+
-+      spinlock_t              complete_lock;
-+      volatile enum glamo_mci_waitfor
-+                              complete_what;
-+
-+      volatile int            dma_complete;
-+
-+      volatile u32            pio_sgptr;
-+      volatile u32            pio_words;
-+      volatile u32            pio_count;
-+      volatile u16            *pio_ptr;
-+#define XFER_NONE 0
-+#define XFER_READ 1
-+#define XFER_WRITE 2
-+      volatile u32            pio_active;
-+
-+      int                     bus_width;
-+
-+      char                    dbgmsg_cmd[301];
-+      char                    dbgmsg_dat[301];
-+      volatile char           *status;
-+
-+      unsigned int            ccnt, dcnt;
-+      struct tasklet_struct   pio_tasklet;
-+};
-diff --git a/drivers/mfd/glamo/glamo-regs.h b/drivers/mfd/glamo/glamo-regs.h
-index 151cd66..8f6c45c 100644
---- a/drivers/mfd/glamo/glamo-regs.h
-+++ b/drivers/mfd/glamo/glamo-regs.h
-@@ -150,16 +150,28 @@ enum glamo_reg_mem_dram2 {
-       GLAMO_MEM_DRAM2_DEEP_PWRDOWN    = (1 << 12),
- };
-+enum glamo_irq_index {
-+      GLAMO_IRQIDX_HOSTBUS    = 0,
-+      GLAMO_IRQIDX_JPEG       = 1,
-+      GLAMO_IRQIDX_MPEG       = 2,
-+      GLAMO_IRQIDX_MPROC1     = 3,
-+      GLAMO_IRQIDX_MPROC0     = 4,
-+      GLAMO_IRQIDX_CMDQUEUE   = 5,
-+      GLAMO_IRQIDX_2D         = 6,
-+      GLAMO_IRQIDX_MMC        = 7,
-+      GLAMO_IRQIDX_RISC       = 8,
-+};
-+
- enum glamo_irq {
--      GLAMO_IRQ_HOSTBUS       = 0x0001,
--      GLAMO_IRQ_JPEG          = 0x0002,
--      GLAMO_IRQ_MPEG          = 0x0004,
--      GLAMO_IRQ_MPROC1        = 0x0008,
--      GLAMO_IRQ_MPROC0        = 0x0010,
--      GLAMO_IRQ_CMDQUEUE      = 0x0020,
--      GLAMO_IRQ_2D            = 0x0040,
--      GLAMO_IRQ_MMC           = 0x0080,
--      GLAMO_IRQ_RISC          = 0x0100,
-+      GLAMO_IRQ_HOSTBUS       = (1 << GLAMO_IRQIDX_HOSTBUS),
-+      GLAMO_IRQ_JPEG          = (1 << GLAMO_IRQIDX_JPEG),
-+      GLAMO_IRQ_MPEG          = (1 << GLAMO_IRQIDX_MPEG),
-+      GLAMO_IRQ_MPROC1        = (1 << GLAMO_IRQIDX_MPROC1),
-+      GLAMO_IRQ_MPROC0        = (1 << GLAMO_IRQIDX_MPROC0),
-+      GLAMO_IRQ_CMDQUEUE      = (1 << GLAMO_IRQIDX_CMDQUEUE),
-+      GLAMO_IRQ_2D            = (1 << GLAMO_IRQIDX_2D),
-+      GLAMO_IRQ_MMC           = (1 << GLAMO_IRQIDX_MMC),
-+      GLAMO_IRQ_RISC          = (1 << GLAMO_IRQIDX_RISC),
- };
- enum glamo_reg_clock_host {
-@@ -197,6 +209,145 @@ enum glamo_reg_clock_mmc {
-       GLAMO_CLOCK_MMC_RESET           = 0x1000,
- };
-+enum glamo_reg_basic_mmc {
-+      /* set to disable CRC error rejection */
-+      GLAMO_BASIC_MMC_DISABLE_CRC     = 0x0001,
-+      /* enable completion interrupt */
-+      GLAMO_BASIC_MMC_EN_COMPL_INT    = 0x0002,
-+      /* stop MMC clock while enforced idle waiting for data from card */
-+      GLAMO_BASIC_MMC_NO_CLK_RD_WAIT  = 0x0004,
-+      /* 0 = 1-bit bus to card, 1 = use 4-bit bus (has to be negotiated) */
-+      GLAMO_BASIC_MMC_EN_4BIT_DATA    = 0x0008,
-+      /* enable 75K pullups on D3..D0 */
-+      GLAMO_BASIC_MMC_EN_DATA_PUPS    = 0x0010,
-+      /* enable 75K pullup on CMD */
-+      GLAMO_BASIC_MMC_EN_CMD_PUP      = 0x0020,
-+      /* IO drive strength 00=weak -> 11=strongest */
-+      GLAMO_BASIC_MMC_EN_DR_STR0      = 0x0040,
-+      GLAMO_BASIC_MMC_EN_DR_STR1      = 0x0080,
-+      /* TCLK delay stage A, 0000 = 500ps --> 1111 = 8ns */
-+      GLAMO_BASIC_MMC_EN_TCLK_DLYA0   = 0x0100,
-+      GLAMO_BASIC_MMC_EN_TCLK_DLYA1   = 0x0200,
-+      GLAMO_BASIC_MMC_EN_TCLK_DLYA2   = 0x0400,
-+      GLAMO_BASIC_MMC_EN_TCLK_DLYA3   = 0x0800,
-+      /* TCLK delay stage B (cumulative), 0000 = 500ps --> 1111 = 8ns */
-+      GLAMO_BASIC_MMC_EN_TCLK_DLYB0   = 0x1000,
-+      GLAMO_BASIC_MMC_EN_TCLK_DLYB1   = 0x2000,
-+      GLAMO_BASIC_MMC_EN_TCLK_DLYB2   = 0x4000,
-+      GLAMO_BASIC_MMC_EN_TCLK_DLYB3   = 0x8000,
-+};
-+
-+enum glamo_reg_stat1_mmc {
-+      /* command "counter" (really: toggle) */
-+      GLAMO_STAT1_MMC_CMD_CTR = 0x8000,
-+      /* engine is idle */
-+      GLAMO_STAT1_MMC_IDLE    = 0x4000,
-+      /* readback response is ready */
-+      GLAMO_STAT1_MMC_RB_RRDY = 0x0200,
-+      /* readback data is ready */
-+      GLAMO_STAT1_MMC_RB_DRDY = 0x0100,
-+      /* no response timeout */
-+      GLAMO_STAT1_MMC_RTOUT   = 0x0020,
-+      /* no data timeout */
-+      GLAMO_STAT1_MMC_DTOUT   = 0x0010,
-+      /* CRC error on block write */
-+      GLAMO_STAT1_MMC_BWERR   = 0x0004,
-+      /* CRC error on block read */
-+      GLAMO_STAT1_MMC_BRERR   = 0x0002
-+};
-+
-+enum glamo_reg_fire_mmc {
-+      /* command "counter" (really: toggle)
-+       * the STAT1 register reflects this so you can ensure you don't look
-+       * at status for previous command
-+       */
-+      GLAMO_FIRE_MMC_CMD_CTR  = 0x8000,
-+      /* sets kind of response expected */
-+      GLAMO_FIRE_MMC_RES_MASK = 0x0700,
-+      /* sets command type */
-+      GLAMO_FIRE_MMC_TYP_MASK = 0x00C0,
-+      /* sets command class */
-+      GLAMO_FIRE_MMC_CLS_MASK = 0x000F,
-+};
-+
-+enum glamo_fire_mmc_response_types {
-+      GLAMO_FIRE_MMC_RSPT_R1  = 0x0000,
-+      GLAMO_FIRE_MMC_RSPT_R1b = 0x0100,
-+      GLAMO_FIRE_MMC_RSPT_R2  = 0x0200,
-+      GLAMO_FIRE_MMC_RSPT_R3  = 0x0300,
-+      GLAMO_FIRE_MMC_RSPT_R4  = 0x0400,
-+      GLAMO_FIRE_MMC_RSPT_R5  = 0x0500,
-+};
-+
-+enum glamo_fire_mmc_command_types {
-+      /* broadcast, no response */
-+      GLAMO_FIRE_MMC_CMDT_BNR = 0x0000,
-+      /* broadcast, with response */
-+      GLAMO_FIRE_MMC_CMDT_BR  = 0x0040,
-+      /* addressed, no data */
-+      GLAMO_FIRE_MMC_CMDT_AND = 0x0080,
-+      /* addressed, with data */
-+      GLAMO_FIRE_MMC_CMDT_AD  = 0x00C0,
-+};
-+
-+enum glamo_fire_mmc_command_class {
-+      /* "Stream Read" */
-+      GLAMO_FIRE_MMC_CC_STRR  = 0x0000,
-+      /* Single Block Read */
-+      GLAMO_FIRE_MMC_CC_SBR   = 0x0001,
-+      /* Multiple Block Read With Stop */
-+      GLAMO_FIRE_MMC_CC_MBRS  = 0x0002,
-+      /* Multiple Block Read No Stop */
-+      GLAMO_FIRE_MMC_CC_MBRNS = 0x0003,
-+      /* RESERVED for "Stream Write" */
-+      GLAMO_FIRE_MMC_CC_STRW  = 0x0004,
-+      /* "Stream Write" */
-+      GLAMO_FIRE_MMC_CC_SBW   = 0x0005,
-+      /* RESERVED for Multiple Block Write With Stop */
-+      GLAMO_FIRE_MMC_CC_MBWS  = 0x0006,
-+      /* Multiple Block Write No Stop */
-+      GLAMO_FIRE_MMC_CC_MBWNS = 0x0007,
-+      /* STOP command */
-+      GLAMO_FIRE_MMC_CC_STOP  = 0x0008,
-+      /* Cancel on Running Command */
-+      GLAMO_FIRE_MMC_CC_CANCL = 0x0009,
-+      /* "Basic Command" */
-+      GLAMO_FIRE_MMC_CC_BASIC = 0x000a,
-+};
-+
-+/* these are offsets from the start of the MMC register region */
-+enum glamo_register_mmc {
-+      /* MMC command, b15..8 = cmd arg b7..0; b7..1 = CRC; b0 = end bit */
-+      GLAMO_REG_MMC_CMD_REG1  = 0x00,
-+      /* MMC command, b15..0 = cmd arg b23 .. 8 */
-+      GLAMO_REG_MMC_CMD_REG2  = 0x02,
-+      /* MMC command, b15=start, b14=transmission,
-+       * b13..8=cmd idx, b7..0=cmd arg b31..24
-+       */
-+      GLAMO_REG_MMC_CMD_REG3  = 0x04,
-+      GLAMO_REG_MMC_CMD_FIRE  = 0x06,
-+      GLAMO_REG_MMC_CMD_RSP1  = 0x10,
-+      GLAMO_REG_MMC_CMD_RSP2  = 0x12,
-+      GLAMO_REG_MMC_CMD_RSP3  = 0x14,
-+      GLAMO_REG_MMC_CMD_RSP4  = 0x16,
-+      GLAMO_REG_MMC_CMD_RSP5  = 0x18,
-+      GLAMO_REG_MMC_CMD_RSP6  = 0x1a,
-+      GLAMO_REG_MMC_CMD_RSP7  = 0x1c,
-+      GLAMO_REG_MMC_CMD_RSP8  = 0x1e,
-+      GLAMO_REG_MMC_RB_STAT1  = 0x20,
-+      GLAMO_REG_MMC_RB_BLKCNT = 0x22,
-+      GLAMO_REG_MMC_RB_BLKLEN = 0x24,
-+      GLAMO_REG_MMC_BASIC     = 0x30,
-+      GLAMO_REG_MMC_RDATADS1  = 0x34,
-+      GLAMO_REG_MMC_RDATADS2  = 0x36,
-+      GLAMO_REG_MMC_WDATADS1  = 0x38,
-+      GLAMO_REG_MMC_WDATADS2  = 0x3a,
-+      GLAMO_REG_MMC_DATBLKCNT = 0x3c,
-+      GLAMO_REG_MMC_DATBLKLEN = 0x3e,
-+      GLAMO_REG_MMC_TIMEOUT   = 0x40,
-+
-+};
-+
- enum glamo_reg_clock_isp {
-       GLAMO_CLOCK_ISP_DG_I1CLK        = 0x0001,
-       GLAMO_CLOCK_ISP_EN_I1CLK        = 0x0002,
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1028-gta02-core.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1028-gta02-core.patch.patch
deleted file mode 100755 (executable)
index e2ef84f..0000000
+++ /dev/null
@@ -1,1024 +0,0 @@
-From 330ac25864dd0a71f2d1cd7d58db103ee93f9125 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:46:52 +0100
-Subject: [PATCH] gta02-core.patch
-
----
- arch/arm/mach-s3c2440/Kconfig        |   15 +
- arch/arm/mach-s3c2440/Makefile       |    3 +
- arch/arm/mach-s3c2440/mach-gta02.c   |  826 ++++++++++++++++++++++++++++++++++
- drivers/leds/leds-neo1973-vibrator.c |    2 +-
- include/asm-arm/arch-s3c2410/gta02.h |   99 ++++
- sound/soc/s3c24xx/neo1973_wm8753.c   |    8 +
- 6 files changed, 952 insertions(+), 1 deletions(-)
- create mode 100644 arch/arm/mach-s3c2440/mach-gta02.c
- create mode 100644 include/asm-arm/arch-s3c2410/gta02.h
-
-diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
-index f1915bd..6b317d1 100644
---- a/arch/arm/mach-s3c2440/Kconfig
-+++ b/arch/arm/mach-s3c2440/Kconfig
-@@ -68,5 +68,20 @@ config SMDK2440_CPU2440
-       select CPU_S3C2440
-+config MACH_NEO1973_GTA02
-+      bool "FIC Neo1973 GSM Phone (GTA02 Hardware)"
-+      select CPU_S3C2442
-+      select SENSORS_PCF50633
-+      help
-+         Say Y here if you are using the FIC Neo1973 GSM Phone
-+
-+config NEO1973_GTA02_2440
-+      bool "Old FIC Neo1973 GTA02 hardware using S3C2440 CPU"
-+      depends on MACH_NEO1973_GTA02
-+      select CPU_S3C2440
-+      help
-+         Say Y here if you are using an early hardware revision
-+         of the FIC/OpenMoko Neo1973 GTA02 GSM Phone.
-+
- endmenu
-diff --git a/arch/arm/mach-s3c2440/Makefile b/arch/arm/mach-s3c2440/Makefile
-index c81ed62..1a4defd 100644
---- a/arch/arm/mach-s3c2440/Makefile
-+++ b/arch/arm/mach-s3c2440/Makefile
-@@ -21,3 +21,6 @@ obj-$(CONFIG_MACH_OSIRIS)    += mach-osiris.o
- obj-$(CONFIG_MACH_RX3715)     += mach-rx3715.o
- obj-$(CONFIG_ARCH_S3C2440)    += mach-smdk2440.o
- obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
-+obj-$(CONFIG_MACH_AT2440EVB) += mach-at2440evb.o
-+obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
-+
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-new file mode 100644
-index 0000000..f72a5ae
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -0,0 +1,826 @@
-+/*
-+ * linux/arch/arm/mach-s3c2440/mach-gta02.c
-+ *
-+ * S3C2440 Machine Support for the FIC GTA02 (Neo1973)
-+ *
-+ * Copyright (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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
-+ *
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/types.h>
-+#include <linux/interrupt.h>
-+#include <linux/list.h>
-+#include <linux/delay.h>
-+#include <linux/timer.h>
-+#include <linux/init.h>
-+#include <linux/workqueue.h>
-+#include <linux/platform_device.h>
-+#include <linux/serial_core.h>
-+#include <linux/spi/spi.h>
-+#include <linux/spi/glamo.h>
-+#include <linux/spi/spi_bitbang.h>
-+#include <linux/mmc/host.h>
-+
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/nand.h>
-+#include <linux/mtd/nand_ecc.h>
-+#include <linux/mtd/partitions.h>
-+#include <linux/mtd/physmap.h>
-+
-+#include <linux/pcf50633.h>
-+
-+#include <asm/mach/arch.h>
-+#include <asm/mach/map.h>
-+#include <asm/mach/irq.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <asm/mach-types.h>
-+
-+#include <asm/arch/regs-gpio.h>
-+#include <asm/arch/regs-gpioj.h>
-+#include <asm/arch/fb.h>
-+#include <asm/arch/mci.h>
-+#include <asm/arch/ts.h>
-+#include <asm/arch/spi.h>
-+#include <asm/arch/spi-gpio.h>
-+#include <asm/arch/usb-control.h>
-+
-+#include <asm/arch/gta01.h>
-+#include <asm/arch/gta02.h>
-+
-+#include <asm/plat-s3c/regs-serial.h>
-+#include <asm/plat-s3c/nand.h>
-+#include <asm/plat-s3c24xx/devs.h>
-+#include <asm/plat-s3c24xx/cpu.h>
-+#include <asm/plat-s3c24xx/pm.h>
-+#include <asm/plat-s3c24xx/udc.h>
-+
-+#include <linux/glamofb.h>
-+
-+static struct map_desc gta02_iodesc[] __initdata = {
-+      {
-+              .virtual        = 0xe0000000,
-+              .pfn            = __phys_to_pfn(S3C2410_CS3+0x01000000),
-+              .length         = SZ_1M,
-+              .type           = MT_DEVICE
-+      },
-+};
-+
-+#define UCON S3C2410_UCON_DEFAULT
-+#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
-+#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
-+
-+static struct s3c2410_uartcfg gta02_uartcfgs[] = {
-+      [0] = {
-+              .hwport      = 0,
-+              .flags       = 0,
-+              .ucon        = UCON,
-+              .ulcon       = ULCON,
-+              .ufcon       = UFCON,
-+      },
-+      [1] = {
-+              .hwport      = 1,
-+              .flags       = 0,
-+              .ucon        = UCON,
-+              .ulcon       = ULCON,
-+              .ufcon       = UFCON,
-+      },
-+      [2] = {
-+              .hwport      = 2,
-+              .flags       = 0,
-+              .ucon        = UCON,
-+              .ulcon       = ULCON,
-+              .ufcon       = UFCON,
-+      },
-+
-+};
-+
-+/* PMU driver info */
-+
-+static int pmu_callback(struct device *dev, unsigned int feature,
-+                      enum pmu_event event)
-+{
-+      switch (feature) {
-+      case PCF50633_FEAT_MBC:
-+              switch (event) {
-+              case PMU_EVT_INSERT:
-+              case PMU_EVT_USB_INSERT:
-+                      pcf50633_charge_enable(pcf50633_global, 1);
-+                      break;
-+              case PMU_EVT_REMOVE:
-+              case PMU_EVT_USB_REMOVE:
-+                      pcf50633_charge_enable(pcf50633_global, 0);
-+                      break;
-+              default:
-+                      break;
-+              }
-+              break;
-+      default:
-+              break;
-+      }
-+
-+      return 0;
-+}
-+
-+static struct pcf50633_platform_data gta02_pcf_pdata = {
-+      .used_features  = PCF50633_FEAT_MBC |
-+                        PCF50633_FEAT_BBC |
-+                        PCF50633_FEAT_RTC |
-+                        PCF50633_FEAT_CHGCUR |
-+                        PCF50633_FEAT_BATVOLT |
-+                        PCF50633_FEAT_BATTEMP |
-+                        PCF50633_FEAT_PWM_BL,
-+      .onkey_seconds_sig_init = 4,
-+      .onkey_seconds_shutdown = 8,
-+      .cb             = &pmu_callback,
-+      .r_fix_batt     = 10000,
-+      .r_fix_batt_par = 10000,
-+      .r_sense_milli  = 220,
-+      .rails  = {
-+              [PCF50633_REGULATOR_AUTO] = {
-+                      .name           = "io_3v3",
-+                      .flags          = PMU_VRAIL_F_SUSPEND_ON,
-+                      .voltage        = {
-+                              .init   = 3300,
-+                              .max    = 3300,
-+                      },
-+              },
-+              [PCF50633_REGULATOR_DOWN1] = {
-+                      .name           = "core_1v3",
-+                      .voltage        = {
-+                              .init   = 1300,
-+                              .max    = 1600,
-+                      },
-+              },
-+              [PCF50633_REGULATOR_DOWN2] = {
-+                      .name           = "core_1v8",
-+                      .voltage        = {
-+                              .init   = 1800,
-+                              .max    = 1800,
-+                      },
-+              },
-+              [PCF50633_REGULATOR_HCLDO] = {
-+                      .name           = "sd_3v3",
-+                      .voltage        = {
-+                              .init   = 3300,
-+                              .max    = 3300,
-+                      },
-+              },
-+              [PCF50633_REGULATOR_LDO1] = {
-+                      .name           = "stby_1v3",
-+                      .flags          = PMU_VRAIL_F_SUSPEND_ON,
-+                      .voltage        = {
-+                              .init   = 1300,
-+                              .max    = 1330,
-+                      },
-+              },
-+              [PCF50633_REGULATOR_LDO2] = {
-+                      .name           = "codec_3v3",
-+                      .voltage        = {
-+                              .init   = 3300,
-+                              .max    = 3300,
-+                      },
-+              },
-+              [PCF50633_REGULATOR_LDO3] = {
-+                      .name           = "lcm_3v",
-+                      .voltage        = {
-+                              .init   = 3000,
-+                              .max    = 3000,
-+                      },
-+              },
-+              [PCF50633_REGULATOR_LDO4] = {
-+                      .name           = "gl_2v5",
-+                      .voltage        = {
-+                              .init   = 2500,
-+                              .max    = 2500,
-+                      },
-+              },
-+              [PCF50633_REGULATOR_LDO5] = {
-+                      .name           = "gl_1v5",
-+                      .voltage        = {
-+                              .init   = 1500,
-+                              .max    = 1500,
-+                      },
-+              },
-+              [PCF50633_REGULATOR_LDO6] = {
-+                      .name           = "user1",
-+                      .voltage        = {
-+                              .init   = 0,
-+                              .max    = 3300,
-+                      },
-+              },
-+      },
-+};
-+
-+#if 0 /* currently unused */
-+static void cfg_pmu_vrail(struct pmu_voltage_rail *vrail, char *name,
-+                        unsigned int flags, unsigned int init,
-+                        unsigned int max)
-+{
-+      vrail->name = name;
-+      vrail->flags = flags;
-+      vrail->voltage.init = init;
-+      vrail->voltage.max = max;
-+}
-+#endif
-+
-+static void mangle_pmu_pdata_by_system_rev(void)
-+{
-+      switch (system_rev) {
-+      case GTA02v1_SYSTEM_REV:
-+              /* FIXME: this is only in v1 due to wrong PMU variant */
-+              gta02_pcf_pdata.rails[PCF50633_REGULATOR_DOWN2].flags =
-+                                                      PMU_VRAIL_F_SUSPEND_ON;
-+              break;
-+      case GTA02v2_SYSTEM_REV:
-+      case GTA02v3_SYSTEM_REV:
-+      case GTA02v4_SYSTEM_REV:
-+      case GTA02v5_SYSTEM_REV:
-+      case GTA02v6_SYSTEM_REV:
-+              /* we need to keep the 1.8V going since this is the SDRAM
-+               * self-refresh voltage */
-+              gta02_pcf_pdata.rails[PCF50633_REGULATOR_DOWN2].flags =
-+                                                      PMU_VRAIL_F_SUSPEND_ON;
-+              gta02_pcf_pdata.rails[PCF50633_REGULATOR_DOWN2].name =
-+                                                      "io_1v8",
-+              gta02_pcf_pdata.rails[PCF50633_REGULATOR_LDO1].name =
-+                                                      "gsensor_3v3",
-+              gta02_pcf_pdata.rails[PCF50633_REGULATOR_LDO1].voltage.init =
-+                                                      3300;
-+              gta02_pcf_pdata.rails[PCF50633_REGULATOR_LDO1].voltage.max =
-+                                                      3300;
-+              gta02_pcf_pdata.rails[PCF50633_REGULATOR_LDO1].flags &=
-+                                                      ~PMU_VRAIL_F_SUSPEND_ON;
-+              gta02_pcf_pdata.rails[PCF50633_REGULATOR_LDO3].flags =
-+                                                      PMU_VRAIL_F_UNUSED;
-+              gta02_pcf_pdata.rails[PCF50633_REGULATOR_LDO5] = ((struct pmu_voltage_rail) {
-+                                                      .name = "rf_3v",
-+                                                      .voltage = {
-+                                                              .init = 0,
-+                                                              .max = 3000,
-+                                                      }
-+                                              });
-+              gta02_pcf_pdata.rails[PCF50633_REGULATOR_LDO6] = ((struct pmu_voltage_rail) {
-+                                                      .name = "lcm_3v",
-+                                                      .voltage = {
-+                                                              .init = 3000,
-+                                                              .max = 3000,
-+                                                      }
-+                                              });
-+              break;
-+      default:
-+              break;
-+      }
-+}
-+
-+static struct resource gta02_pmu_resources[] = {
-+      [0] = {
-+              .flags  = IORESOURCE_IRQ,
-+              .start  = GTA02_IRQ_PCF50633,
-+              .end    = GTA02_IRQ_PCF50633,
-+      },
-+};
-+
-+struct platform_device gta02_pmu_dev = {
-+      .name           = "pcf50633",
-+      .num_resources  = ARRAY_SIZE(gta02_pmu_resources),
-+      .resource       = gta02_pmu_resources,
-+      .dev            = {
-+              .platform_data = &gta02_pcf_pdata,
-+      },
-+};
-+
-+
-+/* NOR Flash */
-+
-+#define GTA02_FLASH_BASE      0x18000000 /* GCS3 */
-+#define GTA02_FLASH_SIZE      0x200000 /* 2MBytes */
-+
-+static struct physmap_flash_data gta02_nor_flash_data = {
-+      .width          = 2,
-+};
-+
-+static struct resource gta02_nor_flash_resource = {
-+      .start          = GTA02_FLASH_BASE,
-+      .end            = GTA02_FLASH_BASE + GTA02_FLASH_SIZE - 1,
-+      .flags          = IORESOURCE_MEM,
-+};
-+
-+static struct platform_device gta02_nor_flash = {
-+      .name           = "physmap-flash",
-+      .id             = 0,
-+      .dev            = {
-+                              .platform_data  = &gta02_nor_flash_data,
-+                      },
-+      .resource       = &gta02_nor_flash_resource,
-+      .num_resources  = 1,
-+};
-+
-+
-+
-+static struct resource gta02_sdio_resources[] = {
-+      [0] = {
-+              .flags  = IORESOURCE_IRQ,
-+              .start  = IRQ_SDI,
-+              .end    = IRQ_SDI,
-+      },
-+      [1] = {
-+              .flags = IORESOURCE_MEM,
-+              .start = S3C2410_PA_SDI,
-+              .end   = S3C2410_PA_SDI + S3C24XX_SZ_SDI - 1,
-+      },
-+      [2] = {
-+              .flags = IORESOURCE_DMA,
-+              .start = 0, /* Channel 0 for SDI */
-+              .end = 0,
-+      },
-+};
-+
-+
-+static struct platform_device gta02_sdio_dev = {
-+        .name           = "s3c24xx-sdio",
-+        .id             = -1,
-+        .dev            = {
-+                                .coherent_dma_mask      = 0xffffffff,
-+        },
-+        .resource       = gta02_sdio_resources,
-+        .num_resources  = ARRAY_SIZE(gta02_sdio_resources),
-+};
-+
-+static struct platform_device *gta02_devices[] __initdata = {
-+      &s3c_device_usb,
-+      &s3c_device_wdt,
-+      &s3c_device_i2c,
-+      &s3c_device_iis,
-+      // &s3c_device_sdi, /* FIXME: temporary disable to avoid s3cmci bind */
-+      &s3c_device_usbgadget,
-+      &s3c_device_nand,
-+      &s3c_device_ts,
-+      &s3c_device_spi0,
-+      &s3c_device_spi1,
-+      &gta02_nor_flash,
-+};
-+
-+static struct s3c2410_nand_set gta02_nand_sets[] = {
-+      [0] = {
-+              .name           = "neo1973-nand",
-+              .nr_chips       = 1,
-+              .flags          = S3C2410_NAND_BBT,
-+      },
-+};
-+
-+/* choose a set of timings which should suit most 512Mbit
-+ * chips and beyond.
-+ */
-+
-+static struct s3c2410_platform_nand gta02_nand_info = {
-+      .tacls          = 20,
-+      .twrph0         = 60,
-+      .twrph1         = 20,
-+      .nr_sets        = ARRAY_SIZE(gta02_nand_sets),
-+      .sets           = gta02_nand_sets,
-+};
-+
-+static struct s3c24xx_mci_pdata gta02_mmc_cfg = {
-+      .gpio_detect    = GTA02v1_GPIO_nSD_DETECT,
-+      .set_power      = NULL,
-+      .ocr_avail      = MMC_VDD_32_33,
-+};
-+
-+static void gta02_udc_command(enum s3c2410_udc_cmd_e cmd)
-+{
-+      printk(KERN_DEBUG "%s(%d)\n", __func__, cmd);
-+
-+      switch (cmd) {
-+      case S3C2410_UDC_P_ENABLE:
-+              s3c2410_gpio_setpin(GTA02_GPIO_USB_PULLUP, 1);
-+              break;
-+      case S3C2410_UDC_P_DISABLE:
-+              s3c2410_gpio_setpin(GTA02_GPIO_USB_PULLUP, 0);
-+              break;
-+      case S3C2410_UDC_P_RESET:
-+              /* FIXME! */
-+              break;
-+      default:
-+              break;
-+      }
-+}
-+
-+/* use a work queue, since I2C API inherently schedules
-+ * and we get called in hardirq context from UDC driver */
-+
-+struct vbus_draw {
-+      struct work_struct work;
-+      int ma;
-+};
-+static struct vbus_draw gta02_udc_vbus_drawer;
-+
-+static void __gta02_udc_vbus_draw(struct work_struct *work)
-+{
-+      if (!pcf50633_global) {
-+              printk(KERN_ERR  "pcf50633 not initialized yet, can't change "
-+                     "vbus_draw\n");
-+              return;
-+      }
-+      pcf50633_usb_curlim_set(pcf50633_global, gta02_udc_vbus_drawer.ma);
-+}
-+
-+static void gta02_udc_vbus_draw(unsigned int ma)
-+{
-+      gta02_udc_vbus_drawer.ma = ma;
-+      schedule_work(&gta02_udc_vbus_drawer.work);
-+}
-+
-+static struct s3c2410_udc_mach_info gta02_udc_cfg = {
-+      .vbus_draw      = gta02_udc_vbus_draw,
-+      .udc_command    = gta02_udc_command,
-+
-+};
-+
-+static struct s3c2410_ts_mach_info gta02_ts_cfg = {
-+      .delay = 10000,
-+      .presc = 65,
-+      .oversampling_shift = 5,
-+};
-+
-+/* SPI */
-+
-+static struct spi_board_info gta02_spi_board_info[] = {
-+      {
-+              .modalias       = "jbt6k74",
-+              /* platform_data */
-+              /* controller_data */
-+              /* irq */
-+              .max_speed_hz   = 10 * 1000 * 1000,
-+              .bus_num        = 2,
-+              /* chip_select */
-+      },
-+};
-+
-+static struct glamo_spi_info glamo_spi_cfg = {
-+      .board_size     = ARRAY_SIZE(gta02_spi_board_info),
-+      .board_info     = gta02_spi_board_info,
-+};
-+
-+static struct glamo_spigpio_info glamo_spigpio_cfg = {
-+      .pin_clk        = GLAMO_GPIO10_OUTPUT,
-+      .pin_mosi       = GLAMO_GPIO11_OUTPUT,
-+      .pin_cs         = GLAMO_GPIO12_OUTPUT,
-+      .pin_miso       = 0,
-+      .board_size     = ARRAY_SIZE(gta02_spi_board_info),
-+      .board_info     = gta02_spi_board_info,
-+};
-+
-+static struct resource gta01_led_resources[] = {
-+      [0] = {
-+              .start  = GTA02_GPIO_VIBRATOR_ON,
-+              .end    = GTA02_GPIO_VIBRATOR_ON,
-+      },
-+};
-+
-+static struct platform_device gta01_led_dev = {
-+      .name           = "neo1973-vibrator",
-+      .num_resources  = ARRAY_SIZE(gta01_led_resources),
-+      .resource       = gta01_led_resources,
-+};
-+
-+static struct resource gta02_led_resources[] = {
-+      {
-+              .name   = "gta02-power:orange",
-+              .start  = GTA02_GPIO_PWR_LED1,
-+              .end    = GTA02_GPIO_PWR_LED1,
-+      }, {
-+              .name   = "gta02-power:blue",
-+              .start  = GTA02_GPIO_PWR_LED2,
-+              .end    = GTA02_GPIO_PWR_LED2,
-+      }, {
-+              .name   = "gta02-aux:red",
-+              .start  = GTA02_GPIO_AUX_LED,
-+              .end    = GTA02_GPIO_AUX_LED,
-+      },
-+};
-+
-+struct platform_device gta02_led_dev = {
-+      .name           = "gta02-led",
-+      .num_resources  = ARRAY_SIZE(gta02_led_resources),
-+      .resource       = gta02_led_resources,
-+};
-+
-+static struct resource gta01_button_resources[] = {
-+      [0] = {
-+              .start = GTA02_GPIO_AUX_KEY,
-+              .end   = GTA02_GPIO_AUX_KEY,
-+      },
-+      [1] = {
-+              .start = GTA02_GPIO_HOLD_KEY,
-+              .end   = GTA02_GPIO_HOLD_KEY,
-+      },
-+      [2] = {
-+              .start = GTA02_GPIO_JACK_INSERT,
-+              .end   = GTA02_GPIO_JACK_INSERT,
-+      },
-+};
-+
-+static struct platform_device gta01_button_dev = {
-+      .name           = "neo1973-button",
-+      .num_resources  = ARRAY_SIZE(gta01_button_resources),
-+      .resource       = gta01_button_resources,
-+};
-+
-+static struct platform_device gta01_pm_gsm_dev = {
-+      .name           = "neo1973-pm-gsm",
-+};
-+
-+/* USB */
-+static struct s3c2410_hcd_info gta02_usb_info = {
-+      .port[0]        = {
-+              .flags  = S3C_HCDFLG_USED,
-+      },
-+      .port[1]        = {
-+              .flags  = 0,
-+      },
-+};
-+
-+static int glamo_irq_is_wired(void)
-+{
-+      int rc;
-+      int count = 0;
-+
-+      /*
-+      * GTA02 S-Media IRQs prior to A5 are broken due to a lack of
-+      * a pullup on the INT# line.  Check for the bad behaviour.
-+      */
-+      s3c2410_gpio_setpin(S3C2410_GPG4, 0);
-+      s3c2410_gpio_cfgpin(S3C2410_GPG4, S3C2410_GPG4_OUTP);
-+      s3c2410_gpio_cfgpin(S3C2410_GPG4, S3C2410_GPG4_INP);
-+      /*
-+      * we force it low ourselves for a moment and resume being input.
-+      * If there is a pullup, it won't stay low for long.  But if the
-+      * level converter is there as on < A5 revision, the weak keeper
-+      * on the input of the LC will hold the line low indefinitiely
-+      */
-+      do
-+              rc = s3c2410_gpio_getpin(S3C2410_GPG4);
-+      while ((!rc) && ((count++) < 10));
-+      if (rc) { /* it got pulled back up, it's good */
-+              printk(KERN_INFO "Detected S-Media IRQ# pullup, "
-+              "enabling interrupt\n");
-+              return 0;
-+      } else  /* Gah we can't work with this level converter */
-+              printk(KERN_WARNING "** Detected bad IRQ# circuit found"
-+              " on pre-A5 GTA02: S-Media interrupt disabled **\n");
-+      return -ENODEV;
-+}
-+
-+
-+static void
-+gta02_glamo_mmc_set_power(unsigned char power_mode, unsigned short vdd)
-+{
-+      int mv = 1650;
-+
-+      printk(KERN_DEBUG "mmc_set_power(power_mode=%u, vdd=%u\n",
-+             power_mode, vdd);
-+
-+      switch (system_rev) {
-+      case GTA02v1_SYSTEM_REV:
-+      case GTA02v2_SYSTEM_REV:
-+              break;
-+      case GTA02v3_SYSTEM_REV:
-+      case GTA02v4_SYSTEM_REV:
-+      case GTA02v5_SYSTEM_REV:
-+      case GTA02v6_SYSTEM_REV:
-+              /* depend on pcf50633 driver init */
-+              if (!pcf50633_global)
-+                      while (!pcf50633_global)
-+                              msleep(10);
-+              switch (power_mode) {
-+              case MMC_POWER_ON:
-+              case MMC_POWER_UP:
-+                      /* select and set the voltage */
-+                      if (vdd > 7) {
-+                              mv += 300 + 100 * (vdd - 8);
-+                              if (mv > 3500)
-+                                      mv = 3500;
-+                      }
-+                      pcf50633_voltage_set(pcf50633_global,
-+                                           PCF50633_REGULATOR_HCLDO, mv);
-+                      msleep(10);
-+                      pcf50633_onoff_set(pcf50633_global,
-+                                         PCF50633_REGULATOR_HCLDO, 1);
-+                      msleep(1);
-+                      break;
-+              case MMC_POWER_OFF:
-+                      pcf50633_onoff_set(pcf50633_global,
-+                                         PCF50633_REGULATOR_HCLDO, 0);
-+                      msleep(1);
-+                      break;
-+              }
-+              break;
-+      }
-+}
-+
-+/* Smedia Glamo 3362 */
-+
-+static struct glamofb_platform_data gta02_glamo_pdata = {
-+      .width          = 43,
-+      .height         = 58,
-+       /* 24.5MHz --> 40.816ns */
-+      .pixclock       = 40816,
-+      .left_margin    = 8,
-+      .right_margin   = 16,
-+      .upper_margin   = 2,
-+      .lower_margin   = 16,
-+      .hsync_len      = 8,
-+      .vsync_len      = 2,
-+      .fb_mem_size    = 0x400000, /* glamo has 8 megs of SRAM. we use 4 */
-+      .xres           = {
-+              .min    = 240,
-+              .max    = 640,
-+              .defval = 480,
-+      },
-+      .yres           = {
-+              .min    = 320,
-+              .max    = 640,
-+              .defval = 640,
-+      },
-+      .bpp            = {
-+              .min    = 16,
-+              .max    = 16,
-+              .defval = 16,
-+      },
-+      //.spi_info     = &glamo_spi_cfg,
-+      .spigpio_info   = &glamo_spigpio_cfg,
-+
-+      /* glamo MMC function platform data */
-+      .glamo_set_mci_power = gta02_glamo_mmc_set_power,
-+      .glamo_irq_is_wired = glamo_irq_is_wired,
-+};
-+
-+static struct resource gta02_glamo_resources[] = {
-+      [0] = {
-+              .start  = S3C2410_CS1,
-+              .end    = S3C2410_CS1 + 0x1000000 - 1,
-+              .flags  = IORESOURCE_MEM,
-+      },
-+      [1] = {
-+              .start  = GTA02_IRQ_3D,
-+              .end    = GTA02_IRQ_3D,
-+              .flags  = IORESOURCE_IRQ,
-+      },
-+      [2] = {
-+              .start = GTA02v1_GPIO_3D_RESET,
-+              .end   = GTA02v1_GPIO_3D_RESET,
-+      },
-+};
-+
-+static struct platform_device gta02_glamo_dev = {
-+      .name           = "glamo3362",
-+      .num_resources  = ARRAY_SIZE(gta02_glamo_resources),
-+      .resource       = gta02_glamo_resources,
-+      .dev            = {
-+              .platform_data  = &gta02_glamo_pdata,
-+      },
-+};
-+
-+static void mangle_glamo_res_by_system_rev(void)
-+{
-+      switch (system_rev) {
-+      case GTA02v1_SYSTEM_REV:
-+              break;
-+      default:
-+              gta02_glamo_resources[2].start = GTA02_GPIO_3D_RESET;
-+              gta02_glamo_resources[2].end = GTA02_GPIO_3D_RESET;
-+              break;
-+      }
-+
-+      switch (system_rev) {
-+      case GTA02v1_SYSTEM_REV:
-+      case GTA02v2_SYSTEM_REV:
-+      case GTA02v3_SYSTEM_REV:
-+      /* case GTA02v4_SYSTEM_REV: - FIXME: handle this later */
-+              /* The hardware is missing a pull-up resistor and thus can't
-+               * support the Smedia Glamo IRQ */
-+              gta02_glamo_resources[1].start = 0;
-+              gta02_glamo_resources[1].end = 0;
-+              break;
-+      }
-+}
-+
-+static void __init gta02_map_io(void)
-+{
-+      s3c24xx_init_io(gta02_iodesc, ARRAY_SIZE(gta02_iodesc));
-+      s3c24xx_init_clocks(12000000);
-+      s3c24xx_init_uarts(gta02_uartcfgs, ARRAY_SIZE(gta02_uartcfgs));
-+}
-+
-+static irqreturn_t gta02_modem_irq(int irq, void *param)
-+{
-+      printk(KERN_DEBUG "modem wakeup interrupt\n");
-+      return IRQ_HANDLED;
-+}
-+
-+static void __init gta02_machine_init(void)
-+{
-+      int rc;
-+
-+      s3c_device_usb.dev.platform_data = &gta02_usb_info;
-+      s3c_device_nand.dev.platform_data = &gta02_nand_info;
-+      s3c_device_sdi.dev.platform_data = &gta02_mmc_cfg;
-+
-+      /* Only GTA02v1 has a SD_DETECT GPIO.  Since the slot is not
-+       * hot-pluggable, this is not required anyway */
-+      switch (system_rev) {
-+      case GTA02v1_SYSTEM_REV:
-+              break;
-+      default:
-+              gta02_mmc_cfg.gpio_detect = 0;
-+              break;
-+      }
-+
-+      INIT_WORK(&gta02_udc_vbus_drawer.work, __gta02_udc_vbus_draw);
-+      s3c24xx_udc_set_platdata(&gta02_udc_cfg);
-+      set_s3c2410ts_info(&gta02_ts_cfg);
-+
-+      /* FIXME: hardcoded WLAN module power-up */
-+      s3c2410_gpio_cfgpin(GTA02_CHIP_PWD, S3C2410_GPIO_OUTPUT);
-+
-+      /* Power is down */
-+      s3c2410_gpio_setpin(GTA02_CHIP_PWD, 1);
-+      mdelay(100);
-+
-+      switch (system_rev) {
-+      case GTA02v1_SYSTEM_REV:
-+              s3c2410_gpio_setpin(GTA02_CHIP_PWD, 0);
-+              break;
-+      default:
-+              s3c2410_gpio_cfgpin(GTA02_GPIO_nWLAN_RESET, S3C2410_GPIO_OUTPUT);
-+              /* Chip is in reset state */
-+              s3c2410_gpio_setpin(GTA02_GPIO_nWLAN_RESET, 0);
-+              mdelay(100);
-+              /* Power is up */
-+              s3c2410_gpio_setpin(GTA02_CHIP_PWD, 0);
-+              mdelay(100);
-+              /* Chip is out of reset */
-+              s3c2410_gpio_setpin(GTA02_GPIO_nWLAN_RESET, 1);
-+              break;
-+      }
-+
-+      platform_device_register(&gta01_button_dev);
-+      platform_device_register(&gta01_pm_gsm_dev);
-+
-+      mangle_pmu_pdata_by_system_rev();
-+      platform_device_register(&gta02_pmu_dev);
-+      platform_device_register(&gta01_led_dev);
-+      platform_device_register(&gta02_led_dev);
-+
-+      mangle_glamo_res_by_system_rev();
-+      platform_device_register(&gta02_glamo_dev);
-+
-+      platform_device_register(&gta02_sdio_dev);
-+
-+      platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices));
-+
-+      s3c2410_pm_init();
-+
-+      /* Set LCD_RESET / XRES to high */
-+      s3c2410_gpio_cfgpin(GTA01_GPIO_LCD_RESET, S3C2410_GPIO_OUTPUT);
-+      s3c2410_gpio_setpin(GTA01_GPIO_LCD_RESET, 1);
-+
-+      /* Make sure the modem can wake us up */
-+      set_irq_type(GTA02_IRQ_MODEM, IRQT_RISING);
-+      rc = request_irq(GTA02_IRQ_MODEM, gta02_modem_irq, IRQF_DISABLED,
-+                       "modem", NULL);
-+      if (rc < 0)
-+              printk(KERN_ERR "GTA02: can't request GSM modem wakeup IRQ\n");
-+      enable_irq_wake(GTA02_IRQ_MODEM);
-+}
-+
-+MACHINE_START(NEO1973_GTA02, "GTA02")
-+      .phys_io        = S3C2410_PA_UART,
-+      .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
-+      .boot_params    = S3C2410_SDRAM_PA + 0x100,
-+      .map_io         = gta02_map_io,
-+      .init_irq       = s3c24xx_init_irq,
-+      .init_machine   = gta02_machine_init,
-+      .timer          = &s3c24xx_timer,
-+MACHINE_END
-diff --git a/drivers/leds/leds-neo1973-vibrator.c b/drivers/leds/leds-neo1973-vibrator.c
-index 0336e36..c943a6a 100644
---- a/drivers/leds/leds-neo1973-vibrator.c
-+++ b/drivers/leds/leds-neo1973-vibrator.c
-@@ -113,7 +113,7 @@ static int __init neo1973_vib_probe(struct platform_device *pdev)
-       struct resource *r;
-       int rc;
--      if (!machine_is_neo1973_gta01())
-+      if (!machine_is_neo1973_gta01() && !machine_is_neo1973_gta02())
-               return -EIO;
-       r = platform_get_resource(pdev, 0, 0);
-diff --git a/include/asm-arm/arch-s3c2410/gta02.h b/include/asm-arm/arch-s3c2410/gta02.h
-new file mode 100644
-index 0000000..fa49d93
---- /dev/null
-+++ b/include/asm-arm/arch-s3c2410/gta02.h
-@@ -0,0 +1,99 @@
-+#ifndef _GTA02_H
-+#define _GTA02_H
-+
-+#include <asm/arch/regs-gpio.h>
-+#include <asm/arch/irqs.h>
-+
-+/* Different hardware revisions, passed in ATAG_REVISION by u-boot */
-+#define GTA02v1_SYSTEM_REV    0x00000310
-+#define GTA02v2_SYSTEM_REV    0x00000320
-+#define GTA02v3_SYSTEM_REV    0x00000330
-+#define GTA02v4_SYSTEM_REV    0x00000340
-+#define GTA02v5_SYSTEM_REV    0x00000350
-+#define GTA02v6_SYSTEM_REV    0x00000360
-+
-+#define GTA02_GPIO_n3DL_GSM   S3C2410_GPA13   /* v1 + v2 + v3 only */
-+
-+#define GTA02_GPIO_PWR_LED1   S3C2410_GPB0
-+#define GTA02_GPIO_PWR_LED2   S3C2410_GPB1
-+#define GTA02_GPIO_AUX_LED    S3C2410_GPB2
-+#define GTA02_GPIO_VIBRATOR_ON        S3C2410_GPB3
-+#define GTA02v1_GPIO_GPS_PWRON        S3C2410_GPB4    /* v1 only */
-+#define GTA02_GPIO_MODEM_RST  S3C2410_GPB5
-+#define GTA02_GPIO_BT_EN      S3C2410_GPB6
-+#define GTA02_GPIO_MODEM_ON   S3C2410_GPB7
-+#define GTA02v1_GPIO_EN_AGPS3V        S3C2410_GPB8    /* v1 only */
-+#define GTA02_GPIO_EXTINT8    S3C2410_GPB8
-+#define GTA02_GPIO_USB_PULLUP S3C2410_GPB9
-+
-+#define GTA02v1_GPIO_nGPS_RST S3C2410_GPC0    /* v1 only */
-+#define GTA02v12_GPIO_PIO3    S3C2410_GPC5    /* v1 + v2 only */
-+#define GTA02_GPIO_PIO5               S3C2410_GPC5    /* v3 + v4 only */
-+#define GTA02_GPIO_LCD_RESET  S3C2410_GPC6    /* v1 + v2 only */
-+#define GTA02v12_GPIO_PIO2    S3C2410_GPC7    /* v1 + v2 only */
-+#define GTA02v2_nUSB_FLT      S3C2410_GPC9    /* v2 only */
-+#define GTA02v2_nUSB_OC               S3C2410_GPC10   /* v2 only */
-+#define GTA02v2_nGSM_OC               S3C2410_GPC12   /* v2 only */
-+
-+#define GTA02v3_GPIO_nG1_CS   S3C2410_GPD12   /* v3 + v4 only */
-+#define GTA02v3_GPIO_nG2_CS   S3C2410_GPD13   /* v3 + v4 only */
-+
-+#define GTA02_GPIO_nG1_INT    S3C2410_GPF0
-+#define GTA02_GPIO_IO1                S3C2410_GPF1
-+#define GTA02v1_GPIO_nG2_INT  S3C2410_GPF2    /* v1 only */
-+#define GTA02_GPIO_PIO_2      S3C2410_GPF2    /* v2 + v3 + v4 only */
-+#define GTA02_GPIO_JACK_INSERT        S3C2410_GPF4
-+#define GTA02v1_GPIO_nSD_DETECT       S3C2410_GPF5    /* v1 only */
-+#define GTA02_GPIO_WLAN_GPIO1 S3C2410_GPF5    /* v2 + v3 + v4 only */
-+#define GTA02_GPIO_AUX_KEY    S3C2410_GPF6
-+#define GTA02_GPIO_HOLD_KEY   S3C2410_GPF7
-+
-+#define GTA02_GPIO_3D_IRQ     S3C2410_GPG4
-+#define GTA02v1_GPIO_nG1_CS   S3C2410_GPG8    /* v1 only */
-+#define GTA02v2_GPIO_nG2_INT  S3C2410_GPG8    /* v2 + v3 + v4 only */
-+#define GTA02v3_GPIO_nUSB_OC  S3C2410_GPG9    /* v3 + v4 only */
-+#define GTA02v3_GPIO_nUSB_FLT S3C2410_GPG10   /* v3 + v4 only */
-+#define GTA02v1_GPIO_nG2_CS   S3C2410_GPG11   /* v1 only */
-+#define GTA02v3_GPIO_nGSM_OC  S3C2410_GPG11   /* v3 + v4 only */
-+
-+#define GTA02v1_GPIO_3D_RESET S3C2440_GPJ0    /* v1 only */
-+#define GTA02v2_GPIO_BAT_ID   S3C2440_GPJ0    /* v2 only */
-+#define GTA02v1_GPIO_WLAN_GPIO8       S3C2440_GPJ1    /* v1 only */
-+#define GTA02_GPIO_AMP_SHUT   S3C2440_GPJ1    /* v2 + v3 + v4 only */
-+#define GTA02v1_GPIO_WLAN_GPIO10      S3C2440_GPJ2
-+#define GTA02_GPIO_HP_IN      S3C2440_GPJ2    /* v2 + v3 + v4 only */
-+#define GTA02v1_GPIO_KEEPACT  S3C2440_GPJ3    /* v1 only */
-+#define GTA02_GPIO_INT0               S3C2440_GPJ3    /* v2 + v3 + v4 only */
-+#define GTA02_GPIO_nGSM_EN    S3C2440_GPJ4
-+#define GTA02_GPIO_3D_RESET   S3C2440_GPJ5
-+#define GTA02_GPIO_nDL_GSM    S3C2440_GPJ6    /* v4 + v5 only */
-+#define GTA02_GPIO_WLAN_GPIO0 S3C2440_GPJ7
-+#define GTA02v1_GPIO_BAT_ID   S3C2440_GPJ8
-+#define GTA02_GPIO_KEEPACT    S3C2440_GPJ8
-+#define GTA02v1_GPIO_AMP_SHUT S3C2440_GPJ9    /* v1 only */
-+#define GTA02v2_nG1_CS                S3C2440_GPJ9    /* v2 only */
-+#define GTA02v1_GPIO_HP_IN    S3C2440_GPJ10
-+#define GTA02v2_nG2_CS                S3C2440_GPJ10   /* v2 only */
-+#define GTA02v1_GPIO_INT0     S3C2440_GPJ11   /* v1 only */
-+#define GTA02_CHIP_PWD                S3C2440_GPJ11   /* v2 + v3 + v4 only */
-+#define GTA02v1_GPIO_nGSM_EN  S3C2440_GPJ12   /* v1 only */
-+#define GTA02_GPIO_nWLAN_RESET        S3C2440_GPJ12   /* v2 + v3 + v4 only */
-+
-+#define GTA02_IRQ_GSENSOR_1   IRQ_EINT0
-+#define GTA02_IRQ_MODEM               IRQ_EINT1
-+#define GTA02v1_IRQ_GSENSOR_2 IRQ_EINT2       /* v1 only */
-+#define GTA02_IRQ_PIO_2               IRQ_EINT2       /* v2 + v3 + v4 only */
-+#define GTA02_IRQ_nJACK_INSERT        IRQ_EINT4
-+#define GTA02v1_IRQ_nSD_CD    IRQ_EINT5       /* v1 only */
-+#define GTA02_IRQ_WLAN_GPIO1  IRQ_EINT5
-+#define GTA02_IRQ_AUX         IRQ_EINT6
-+#define GTA02_IRQ_nHOLD               IRQ_EINT7
-+#define GTA02v1_IRQ_nSIM_CD   IRQ_EINT8       /* v1 only */
-+#define GTA02_IRQ_PCF50633    IRQ_EINT9
-+#define GTA02_IRQ_3D          IRQ_EINT12
-+#define GTA02_IRQ_GSENSOR_2   IRQ_EINT16      /* v2 + v3 + v4 only */
-+#define GTA02v3_IRQ_nUSB_OC   IRQ_EINT17      /* v3 + v4 only */
-+#define GTA02v3_IRQ_nUSB_FLT  IRQ_EINT18      /* v3 + v4 only */
-+#define GTA02v3_IRQ_nGSM_OC   IRQ_EINT19      /* v3 + v4 only */
-+
-+#endif /* _GTA02_H */
-diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c
-index 0e9d1c5..4ab6f63 100644
---- a/sound/soc/s3c24xx/neo1973_wm8753.c
-+++ b/sound/soc/s3c24xx/neo1973_wm8753.c
-@@ -671,6 +671,14 @@ static int __init neo1973_init(void)
- {
-       int ret;
-+      DBG("Entered %s\n", __func__);
-+
-+      if (!machine_is_neo1973_gta01()) {
-+              printk(KERN_INFO
-+                     "Only GTA01 hardware supported by ASoc driver\n");
-+              return -ENODEV;
-+      }
-+
-       neo1973_snd_device = platform_device_alloc("soc-audio", -1);
-       if (!neo1973_snd_device)
-               return -ENOMEM;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1029-gta02-power_control.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1029-gta02-power_control.patch.patch
deleted file mode 100755 (executable)
index 2704969..0000000
+++ /dev/null
@@ -1,586 +0,0 @@
-From 70a0c17968f5151ce4f468785860e04bbc7a9d3c Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:46:56 +0100
-Subject: [PATCH] gta02-power_control.patch
-
----
- arch/arm/plat-s3c24xx/neo1973_pm_bt.c  |   84 +++++++++---
- arch/arm/plat-s3c24xx/neo1973_pm_gps.c |  217 ++++++++++++++++++++++++--------
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |   97 ++++++++++++--
- 3 files changed, 309 insertions(+), 89 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-index b1af441..d685ef7 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-@@ -19,7 +19,9 @@
- #include <linux/pcf50606.h>
- #include <asm/hardware.h>
-+#include <asm/mach-types.h>
- #include <asm/arch/gta01.h>
-+#include <asm/arch/gta02.h>
- #define DRVMSG "FIC Neo1973 Bluetooth Power Management"
-@@ -27,14 +29,30 @@ static ssize_t bt_read(struct device *dev, struct device_attribute *attr,
-                      char *buf)
- {
-       if (!strcmp(attr->attr.name, "power_on")) {
--              if (pcf50606_onoff_get(pcf50606_global,
--                                      PCF50606_REGULATOR_D1REG) &&
--                  pcf50606_voltage_get(pcf50606_global,
--                                       PCF50606_REGULATOR_D1REG) == 3100)
--                      goto out_1;
-+              switch (machine_arch_type) {
-+              case MACH_TYPE_NEO1973_GTA01:
-+                      if (pcf50606_onoff_get(pcf50606_global,
-+                                              PCF50606_REGULATOR_D1REG) &&
-+                          pcf50606_voltage_get(pcf50606_global,
-+                                               PCF50606_REGULATOR_D1REG) == 3100)
-+                              goto out_1;
-+                      break;
-+              case MACH_TYPE_NEO1973_GTA02:
-+                      if (s3c2410_gpio_getpin(GTA02_GPIO_BT_EN))
-+                              goto out_1;
-+                      break;
-+              }
-       } else if (!strcmp(attr->attr.name, "reset")) {
--              if (s3c2410_gpio_getpin(GTA01_GPIO_BT_EN) == 0)
--                      goto out_1;
-+              switch (machine_arch_type) {
-+              case MACH_TYPE_NEO1973_GTA01:
-+                      if (s3c2410_gpio_getpin(GTA01_GPIO_BT_EN) == 0)
-+                              goto out_1;
-+                      break;
-+              case MACH_TYPE_NEO1973_GTA02:
-+                      if (s3c2410_gpio_getpin(GTA02_GPIO_BT_EN) == 0)
-+                              goto out_1;
-+                      break;
-+              }
-       }
-       return strlcpy(buf, "0\n", 3);
-@@ -48,20 +66,37 @@ static ssize_t bt_write(struct device *dev, struct device_attribute *attr,
-       unsigned long on = simple_strtoul(buf, NULL, 10);
-       if (!strcmp(attr->attr.name, "power_on")) {
--              /* if we are powering up, assert reset, then power, then
--               * release reset */
--              if (on) {
--                      s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
--                      pcf50606_voltage_set(pcf50606_global,
--                                           PCF50606_REGULATOR_D1REG,
--                                           3100);
-+              switch (machine_arch_type) {
-+              case MACH_TYPE_NEO1973_GTA01:
-+                      /* if we are powering up, assert reset, then power,
-+                       * then release reset */
-+                      if (on) {
-+                              s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
-+                              pcf50606_voltage_set(pcf50606_global,
-+                                                   PCF50606_REGULATOR_D1REG,
-+                                                   3100);
-+                      }
-+                      pcf50606_onoff_set(pcf50606_global,
-+                                         PCF50606_REGULATOR_D1REG, on);
-+                      s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on);
-+                      break;
-+              case MACH_TYPE_NEO1973_GTA02:
-+                      if (on)
-+                              s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, 0);
-+                      else
-+                              s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, 1);
-+                      break;
-               }
--              pcf50606_onoff_set(pcf50606_global,
--                                 PCF50606_REGULATOR_D1REG, on);
--              s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on);
-       } else if (!strcmp(attr->attr.name, "reset")) {
-               /* reset is low-active, so we need to invert */
--              s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1);
-+              switch (machine_arch_type) {
-+              case MACH_TYPE_NEO1973_GTA01:
-+                      s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1);
-+                      break;
-+              case MACH_TYPE_NEO1973_GTA02:
-+                      s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, on ? 0 : 1);
-+                      break;
-+              }
-       }
-       return count;
-@@ -107,9 +142,16 @@ static int __init gta01_bt_probe(struct platform_device *pdev)
- {
-       dev_info(&pdev->dev, DRVMSG ": starting\n");
--      /* we make sure that the voltage is off */
--      pcf50606_onoff_set(pcf50606_global,
--                         PCF50606_REGULATOR_D1REG, 0);
-+      switch (machine_arch_type) {
-+      case MACH_TYPE_NEO1973_GTA01:
-+              /* we make sure that the voltage is off */
-+              pcf50606_onoff_set(pcf50606_global,
-+                                 PCF50606_REGULATOR_D1REG, 0);
-+              break;
-+      case MACH_TYPE_NEO1973_GTA02:
-+              /* FIXME: implementation */
-+              break;
-+      }
-       /* we pull reset to low to make sure that the chip doesn't
-        * drain power through the reset line */
-       s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-index f8cf719..6bd8054 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-@@ -17,10 +17,18 @@
- #include <linux/delay.h>
- #include <linux/platform_device.h>
--#include <linux/pcf50606.h>
--
- #include <asm/hardware.h>
-+
-+#include <asm/mach-types.h>
-+#ifdef CONFIG_MACH_NEO1973_GTA01
- #include <asm/arch/gta01.h>
-+#include <linux/pcf50606.h>
-+#endif
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+#include <asm/arch/gta02.h>
-+#include <linux/pcf50633.h>
-+#endif
- /* This is the 2.8V supply for the RTC crystal, the mail clock crystal and
-  * the input to VDD_RF */
-@@ -248,15 +256,42 @@ static int gps_power_1v5_get(void)
- /* This is the POWERON pin */
- static void gps_pwron_set(int on)
- {
--      s3c2410_gpio_setpin(GTA01_GPIO_GPS_PWRON, on);
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+      if (machine_is_neo1973_gta01())
-+              s3c2410_gpio_setpin(GTA01_GPIO_GPS_PWRON, on);
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+      if (machine_is_neo1973_gta02()) {
-+              if (on)
-+                      pcf50633_voltage_set(pcf50633_global,
-+                              PCF50633_REGULATOR_LDO5, 3000);
-+                      pcf50633_onoff_set(pcf50633_global,
-+                              PCF50633_REGULATOR_LDO5, on);
-+      }
-+#endif /* CONFIG_MACH_NEO1973_GTA02 */
- }
- static int gps_pwron_get(void)
- {
--      if (s3c2410_gpio_getpin(GTA01_GPIO_GPS_PWRON))
--              return 1;
--      else
--              return 0;
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+      if (machine_is_neo1973_gta01()) {
-+              if (s3c2410_gpio_getpin(GTA01_GPIO_GPS_PWRON))
-+                      return 1;
-+              else
-+                      return 0;
-+      }
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+      if (machine_is_neo1973_gta02()) {
-+              if (pcf50633_onoff_get(pcf50633_global, PCF50633_REGULATOR_LDO5))
-+                      return 1;
-+              else
-+                      return 0;
-+      }
-+#endif /* CONFIG_MACH_NEO1973_GTA02 */
-+      return -1;
- }
- /* This is the nRESET pin */
-@@ -441,17 +476,40 @@ static DEVICE_ATTR(power_sequence, 0644, power_sequence_read,
- static int gta01_pm_gps_suspend(struct platform_device *pdev,
-                               pm_message_t state)
- {
--      /* FIXME */
--      gps_power_sequence_down();
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+      if (machine_is_neo1973_gta01()) {
-+              /* FIXME */
-+              gps_power_sequence_down();
-+      }
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+      if (machine_is_neo1973_gta02()) {
-+              /* FIXME */
-+              pcf50633_onoff_set(pcf50633_global,
-+                      PCF50633_REGULATOR_LDO5, 0);
-+      }
-+#endif /* CONFIG_MACH_NEO1973_GTA02 */
-       return 0;
- }
- static int gta01_pm_gps_resume(struct platform_device *pdev)
- {
--      /* FIXME */
--      gps_power_sequence_up();
--
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+      if (machine_is_neo1973_gta01()) {
-+              /* FIXME */
-+              gps_power_sequence_up();
-+      }
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+      if (machine_is_neo1973_gta02()) {
-+              /* FIXME */
-+              pcf50633_onoff_set(pcf50633_global,
-+                      PCF50633_REGULATOR_LDO5, 1);
-+#endif /* CONFIG_MACH_NEO1973_GTA02 */
-+      }
-       return 0;
- }
- #else
-@@ -476,59 +534,110 @@ static struct attribute_group gta01_gps_attr_group = {
-       .attrs  = gta01_gps_sysfs_entries,
- };
-+static struct attribute *gta02_gps_sysfs_entries[] = {
-+      &dev_attr_pwron.attr,
-+      NULL
-+};
-+
-+static struct attribute_group gta02_gps_attr_group = {
-+      .name   = NULL,
-+      .attrs  = gta02_gps_sysfs_entries,
-+};
-+
- static int __init gta01_pm_gps_probe(struct platform_device *pdev)
- {
--      s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_PWRON, S3C2410_GPIO_OUTPUT);
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+      if (machine_is_neo1973_gta01()) {
-+              s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_PWRON, S3C2410_GPIO_OUTPUT);
--      switch (system_rev) {
--      case GTA01v3_SYSTEM_REV:
--              break;
--      case GTA01v4_SYSTEM_REV:
--              s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_RESET, S3C2410_GPIO_OUTPUT);
--              break;
--      case GTA01Bv3_SYSTEM_REV:
--      case GTA01Bv4_SYSTEM_REV:
--              s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_EN_3V3, S3C2410_GPIO_OUTPUT);
--              /* fallthrough */
--      case GTA01Bv2_SYSTEM_REV:
--              s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_EN_2V8, S3C2410_GPIO_OUTPUT);
--              s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_EN_3V, S3C2410_GPIO_OUTPUT);
--              s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_RESET, S3C2410_GPIO_OUTPUT);
--              break;
--      default:
--              dev_warn(&pdev->dev, "Unknown GTA01 Revision 0x%x, "
--                       "AGPS PM features not available!!!\n",
--                       system_rev);
--              return -1;
--              break;
--      }
-+              switch (system_rev) {
-+              case GTA01v3_SYSTEM_REV:
-+                      break;
-+              case GTA01v4_SYSTEM_REV:
-+                      s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_RESET, S3C2410_GPIO_OUTPUT);
-+                      break;
-+              case GTA01Bv3_SYSTEM_REV:
-+              case GTA01Bv4_SYSTEM_REV:
-+                      s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_EN_3V3, S3C2410_GPIO_OUTPUT);
-+                      /* fallthrough */
-+              case GTA01Bv2_SYSTEM_REV:
-+                      s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_EN_2V8, S3C2410_GPIO_OUTPUT);
-+                      s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_EN_3V, S3C2410_GPIO_OUTPUT);
-+                      s3c2410_gpio_cfgpin(GTA01_GPIO_GPS_RESET, S3C2410_GPIO_OUTPUT);
-+                      break;
-+              default:
-+                      dev_warn(&pdev->dev, "Unknown GTA01 Revision 0x%x, "
-+                              "AGPS PM features not available!!!\n",
-+                              system_rev);
-+                      return -1;
-+                      break;
-+              }
--      gps_power_sequence_down();
-+              gps_power_sequence_down();
--      switch (system_rev) {
--      case GTA01v3_SYSTEM_REV:
--      case GTA01v4_SYSTEM_REV:
--      case GTA01Bv2_SYSTEM_REV:
--              gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-3] =
--                                      &dev_attr_power_tcxo_2v8.attr;
--              break;
--      case GTA01Bv3_SYSTEM_REV:
--      case GTA01Bv4_SYSTEM_REV:
--              gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-3] =
--                                      &dev_attr_power_core_1v5.attr;
--              gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-2] =
--                                      &dev_attr_power_vdd_core_1v5.attr;
--              break;
--      }
-+              switch (system_rev) {
-+              case GTA01v3_SYSTEM_REV:
-+              case GTA01v4_SYSTEM_REV:
-+              case GTA01Bv2_SYSTEM_REV:
-+                      gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-3] =
-+                                              &dev_attr_power_tcxo_2v8.attr;
-+                      break;
-+              case GTA01Bv3_SYSTEM_REV:
-+              case GTA01Bv4_SYSTEM_REV:
-+                      gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-3] =
-+                                              &dev_attr_power_core_1v5.attr;
-+                      gta01_gps_sysfs_entries[ARRAY_SIZE(gta01_gps_sysfs_entries)-2] =
-+                                              &dev_attr_power_vdd_core_1v5.attr;
-+                      break;
-+              }
--      return sysfs_create_group(&pdev->dev.kobj, &gta01_gps_attr_group);
-+              return sysfs_create_group(&pdev->dev.kobj, &gta01_gps_attr_group);
-+      }
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+      if (machine_is_neo1973_gta02()) {
-+              switch (system_rev) {
-+              case GTA02v2_SYSTEM_REV:
-+              case GTA02v3_SYSTEM_REV:
-+              case GTA02v4_SYSTEM_REV:
-+              case GTA02v5_SYSTEM_REV:
-+              case GTA02v6_SYSTEM_REV:
-+                      pcf50633_voltage_set(pcf50633_global,
-+                              PCF50633_REGULATOR_LDO5, 3000);
-+                      pcf50633_onoff_set(pcf50633_global,
-+                              PCF50633_REGULATOR_LDO5, 0);
-+                      dev_info(&pdev->dev, "FIC Neo1973 GPS Power Managerment:"
-+                               "starting\n");
-+                      break;
-+              default:
-+                      dev_warn(&pdev->dev, "Unknown GTA02 Revision 0x%x, "
-+                              "AGPS PM features not available!!!\n",
-+                              system_rev);
-+                      return -1;
-+                      break;
-+              }
-+              return sysfs_create_group(&pdev->dev.kobj, &gta02_gps_attr_group);
-+      }
-+#endif /* CONFIG_MACH_NEO1973_GTA02 */
-+      return -1;
- }
- static int gta01_pm_gps_remove(struct platform_device *pdev)
- {
--      gps_power_sequence_down();
--      sysfs_remove_group(&pdev->dev.kobj, &gta01_gps_attr_group);
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+      if (machine_is_neo1973_gta01()) {
-+              gps_power_sequence_down();
-+              sysfs_remove_group(&pdev->dev.kobj, &gta01_gps_attr_group);
-+      }
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+      if (machine_is_neo1973_gta02()) {
-+              pcf50633_onoff_set(pcf50633_global, PCF50633_REGULATOR_LDO5, 0);
-+              sysfs_remove_group(&pdev->dev.kobj, &gta02_gps_attr_group);
-+      }
-+#endif /* CONFIG_MACH_NEO1973_GTA02 */
-       return 0;
- }
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index a1615f8..13cb45b 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -19,8 +19,15 @@
- #include <linux/errno.h>
- #include <asm/hardware.h>
-+#include <asm/mach-types.h>
- #include <asm/arch/gta01.h>
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+#include <asm/arch/gta02.h>
-+#include <linux/pcf50633.h>
-+#include <asm/arch/regs-gpioj.h>
-+#endif
-+
- struct gta01pm_priv {
-       int gpio_ngsm_en;
-       struct console *con;
-@@ -54,8 +61,16 @@ static ssize_t gsm_read(struct device *dev, struct device_attribute *attr,
-               if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_RST))
-                       goto out_1;
-       } else if (!strcmp(attr->attr.name, "download")) {
--              if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_DNLOAD))
--                      goto out_1;
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+              if (machine_is_neo1973_gta01())
-+                      if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_DNLOAD))
-+                              goto out_1;
-+#endif
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+              if (machine_is_neo1973_gta02())
-+                      if (s3c2410_gpio_getpin(GTA02_GPIO_nDL_GSM))
-+                              goto out_1;
-+#endif
-       }
-       return strlcpy(buf, "0\n", 3);
-@@ -70,32 +85,67 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-       if (!strcmp(attr->attr.name, "power_on")) {
-               if (on) {
--                      dev_info(dev, "powering up GSM, thus disconnecting "
--                               "serial console\n");
-+                      if (gta01_gsm.con) {
-+                              dev_info(dev, "powering up GSM, thus "
-+                                       "disconnecting serial console\n");
--                      if (gta01_gsm.con)
-                               console_stop(gta01_gsm.con);
-+                      }
-                       if (gta01_gsm.gpio_ngsm_en)
-                               s3c2410_gpio_setpin(gta01_gsm.gpio_ngsm_en, 0);
-+                      switch (system_rev) {
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+                      case GTA02v2_SYSTEM_REV:
-+                      case GTA02v3_SYSTEM_REV:
-+                      case GTA02v4_SYSTEM_REV:
-+                      case GTA02v5_SYSTEM_REV:
-+                      case GTA02v6_SYSTEM_REV:
-+                              pcf50633_gpio_set(pcf50633_global,
-+                                                PCF50633_GPIO2, 1);
-+                              break;
-+#endif
-+                      }
-+
-                       s3c2410_gpio_setpin(GTA01_GPIO_MODEM_ON, 1);
-               } else {
-                       s3c2410_gpio_setpin(GTA01_GPIO_MODEM_ON, 0);
-+                      switch (system_rev) {
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+                      case GTA02v2_SYSTEM_REV:
-+                      case GTA02v3_SYSTEM_REV:
-+                      case GTA02v4_SYSTEM_REV:
-+                      case GTA02v5_SYSTEM_REV:
-+                      case GTA02v6_SYSTEM_REV:
-+                              pcf50633_gpio_set(pcf50633_global,
-+                                                PCF50633_GPIO2, 0);
-+                              break;
-+#endif
-+                      }
-+
-                       if (gta01_gsm.gpio_ngsm_en)
-                               s3c2410_gpio_setpin(gta01_gsm.gpio_ngsm_en, 1);
--                      if (gta01_gsm.con)
-+                      if (gta01_gsm.con) {
-                               console_start(gta01_gsm.con);
--                      dev_info(dev, "powered down GSM, thus enabling "
--                               "serial console\n");
-+                              dev_info(dev, "powered down GSM, thus enabling "
-+                                       "serial console\n");
-+                      }
-               }
-       } else if (!strcmp(attr->attr.name, "reset")) {
-               s3c2410_gpio_setpin(GTA01_GPIO_MODEM_RST, on);
-       } else if (!strcmp(attr->attr.name, "download")) {
--              s3c2410_gpio_setpin(GTA01_GPIO_MODEM_DNLOAD, on);
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+              if (machine_is_neo1973_gta01())
-+                      s3c2410_gpio_setpin(GTA01_GPIO_MODEM_DNLOAD, on);
-+#endif
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+              if (machine_is_neo1973_gta02())
-+                      s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, on);
-+#endif
-       }
-       return count;
-@@ -111,6 +161,9 @@ static int gta01_gsm_suspend(struct platform_device *pdev, pm_message_t state)
-       /* GPIO state is saved/restored by S3C2410 core GPIO driver, so we
-        * don't need to do anything here */
-+      /* disable DL GSM to prevent jack_insert becoming flaoting */
-+      if (machine_is_neo1973_gta02())
-+              s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, 1);
-       return 0;
- }
-@@ -124,6 +177,8 @@ static int gta01_gsm_resume(struct platform_device *pdev)
-       if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_ON) && gta01_gsm.con)
-               console_stop(gta01_gsm.con);
-+      if (machine_is_neo1973_gta02())
-+              s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, 0);
-       return 0;
- }
- #else
-@@ -134,7 +189,7 @@ static int gta01_gsm_resume(struct platform_device *pdev)
- static struct attribute *gta01_gsm_sysfs_entries[] = {
-       &dev_attr_power_on.attr,
-       &dev_attr_reset.attr,
--      NULL,
-+      &dev_attr_download.attr,
-       NULL
- };
-@@ -158,8 +213,18 @@ static int __init gta01_gsm_probe(struct platform_device *pdev)
-               gta01_gsm.gpio_ngsm_en = GTA01Bv2_GPIO_nGSM_EN;
-               s3c2410_gpio_setpin(GTA01v3_GPIO_nGSM_EN, 0);
-               break;
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+      case GTA02v1_SYSTEM_REV:
-+      case GTA02v2_SYSTEM_REV:
-+      case GTA02v3_SYSTEM_REV:
-+      case GTA02v4_SYSTEM_REV:
-+      case GTA02v5_SYSTEM_REV:
-+      case GTA02v6_SYSTEM_REV:
-+              gta01_gsm.gpio_ngsm_en = 0;
-+              break;
-+#endif
-       default:
--              dev_warn(&pdev->dev, "Unknown GTA01 Revision 0x%x, "
-+              dev_warn(&pdev->dev, "Unknown Neo1973 Revision 0x%x, "
-                        "some PM features not available!!!\n",
-                        system_rev);
-               break;
-@@ -175,9 +240,13 @@ static int __init gta01_gsm_probe(struct platform_device *pdev)
-               break;
-       }
--      gta01_gsm.con = find_s3c24xx_console();
--      if (!gta01_gsm.con)
--              dev_warn(&pdev->dev, "cannot find S3C24xx console driver\n");
-+      if (machine_is_neo1973_gta01()) {
-+              gta01_gsm.con = find_s3c24xx_console();
-+              if (!gta01_gsm.con)
-+                      dev_warn(&pdev->dev,
-+                               "cannot find S3C24xx console driver\n");
-+      } else
-+              gta01_gsm.con = NULL;
-       return sysfs_create_group(&pdev->dev.kobj, &gta01_gsm_attr_group);
- }
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1030-gta02-sound.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1030-gta02-sound.patch.patch
deleted file mode 100755 (executable)
index 4ac6ddc..0000000
+++ /dev/null
@@ -1,778 +0,0 @@
-From c03e9f46b9f15afc3e8980ae28666ff30907b173 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:46:56 +0100
-Subject: [PATCH] gta02-sound.patch
-
----
- include/sound/soc-dapm.h                 |    7 +
- sound/soc/s3c24xx/Kconfig                |    9 +
- sound/soc/s3c24xx/Makefile               |    3 +
- sound/soc/s3c24xx/neo1973_gta02_wm8753.c |  667 ++++++++++++++++++++++++++++++
- sound/soc/soc-dapm.c                     |   24 ++
- 5 files changed, 710 insertions(+), 0 deletions(-)
- create mode 100644 sound/soc/s3c24xx/neo1973_gta02_wm8753.c
-
-diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
-index a105b01..e867447 100644
---- a/include/sound/soc-dapm.h
-+++ b/include/sound/soc-dapm.h
-@@ -225,6 +225,13 @@ int snd_soc_dapm_set_endpoint(struct snd_soc_codec *codec,
-       char *pin, int status);
- int snd_soc_dapm_sync_endpoints(struct snd_soc_codec *codec);
-+/* dapm audio endpoint control */
-+int snd_soc_dapm_set_endpoint(struct snd_soc_codec *codec,
-+      char *pin, int status);
-+int snd_soc_dapm_get_endpoint(struct snd_soc_codec *codec,
-+      char *pin);
-+int snd_soc_dapm_sync_endpoints(struct snd_soc_codec *codec);
-+
- /* dapm widget types */
- enum snd_soc_dapm_type {
-       snd_soc_dapm_input = 0,         /* input pin */
-diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig
-index 1f6dbfc..3155c43 100644
---- a/sound/soc/s3c24xx/Kconfig
-+++ b/sound/soc/s3c24xx/Kconfig
-@@ -28,6 +28,15 @@ config SND_S3C24XX_SOC_NEO1973_WM8753
-         Say Y if you want to add support for SoC audio on smdk2440
-         with the WM8753.
-+config SND_S3C24XX_SOC_NEO1973_GTA02_WM8753
-+      tristate "SoC I2S Audio support for NEO1973 GTA02 - WM8753"
-+      depends on SND_S3C24XX_SOC && MACH_NEO1973_GTA02
-+      select SND_S3C24XX_SOC_I2S
-+      select SND_SOC_WM8753
-+      help
-+        Say Y if you want to add support for SoC audio on neo1973 gta02
-+        with the WM8753 codec
-+
- config SND_S3C24XX_SOC_SMDK2443_WM9710
-       tristate "SoC AC97 Audio support for SMDK2443 - WM9710"
-       depends on SND_S3C24XX_SOC && MACH_SMDK2443
-diff --git a/sound/soc/s3c24xx/Makefile b/sound/soc/s3c24xx/Makefile
-index 0aa5fb0..f154cb1 100644
---- a/sound/soc/s3c24xx/Makefile
-+++ b/sound/soc/s3c24xx/Makefile
-@@ -13,7 +13,10 @@ obj-$(CONFIG_SND_S3C2412_SOC_I2S) += snd-soc-s3c2412-i2s.o
- snd-soc-neo1973-wm8753-objs := neo1973_wm8753.o
- snd-soc-smdk2443-wm9710-objs := smdk2443_wm9710.o
- snd-soc-ln2440sbc-alc650-objs := ln2440sbc_alc650.o
-+snd-soc-neo1973-gta02-wm8753-objs := neo1973_gta02_wm8753.o
- obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o
- obj-$(CONFIG_SND_S3C24XX_SOC_SMDK2443_WM9710) += snd-soc-smdk2443-wm9710.o
- obj-$(CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650) += snd-soc-ln2440sbc-alc650.o
-+obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753) += snd-soc-neo1973-gta02-wm8753.o
-+
-diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
-new file mode 100644
-index 0000000..f32cba3
---- /dev/null
-+++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
-@@ -0,0 +1,667 @@
-+/*
-+ * neo1973_gta02_wm8753.c  --  SoC audio for Neo1973
-+ *
-+ * Copyright 2007 OpenMoko Inc
-+ * Author: Graeme Gregory <graeme@openmoko.org>
-+ * Copyright 2007 Wolfson Microelectronics PLC.
-+ * Author: Graeme Gregory <linux@wolfsonmicro.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.
-+ *
-+ *  Revision history
-+ *    06th Nov 2007   Changed from GTA01 to GTA02
-+ *    20th Jan 2007   Initial version.
-+ *    05th Feb 2007   Rename all to Neo1973
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/moduleparam.h>
-+#include <linux/timer.h>
-+#include <linux/interrupt.h>
-+#include <linux/platform_device.h>
-+#include <linux/i2c.h>
-+#include <sound/driver.h>
-+#include <sound/core.h>
-+#include <sound/pcm.h>
-+#include <sound/soc.h>
-+#include <sound/soc-dapm.h>
-+
-+#include <asm/mach-types.h>
-+#include <asm/hardware/scoop.h>
-+#include <asm/plat-s3c24xx/regs-iis.h>
-+#include <asm/arch/regs-clock.h>
-+#include <asm/arch/regs-gpio.h>
-+#include <asm/hardware.h>
-+#include <asm/arch/audio.h>
-+#include <asm/io.h>
-+#include <asm/arch/spi-gpio.h>
-+#include <asm/arch/regs-gpioj.h>
-+#include <asm/arch/gta02.h>
-+#include "../codecs/wm8753.h"
-+#include "s3c24xx-pcm.h"
-+#include "s3c24xx-i2s.h"
-+
-+/* define the scenarios */
-+#define NEO_AUDIO_OFF                 0
-+#define NEO_GSM_CALL_AUDIO_HANDSET    1
-+#define NEO_GSM_CALL_AUDIO_HEADSET    2
-+#define NEO_GSM_CALL_AUDIO_BLUETOOTH  3
-+#define NEO_STEREO_TO_SPEAKERS                4
-+#define NEO_STEREO_TO_HEADPHONES      5
-+#define NEO_CAPTURE_HANDSET           6
-+#define NEO_CAPTURE_HEADSET           7
-+#define NEO_CAPTURE_BLUETOOTH         8
-+#define NEO_STEREO_TO_HANDSET_SPK     9
-+
-+static struct snd_soc_machine neo1973_gta02;
-+
-+static int neo1973_gta02_hifi_hw_params(struct snd_pcm_substream *substream,
-+      struct snd_pcm_hw_params *params)
-+{
-+      struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+      struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai;
-+      struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai;
-+      unsigned int pll_out = 0, bclk = 0;
-+      int ret = 0;
-+      unsigned long iis_clkrate;
-+
-+      iis_clkrate = s3c24xx_i2s_get_clockrate();
-+
-+      switch (params_rate(params)) {
-+      case 8000:
-+      case 16000:
-+              pll_out = 12288000;
-+              break;
-+      case 48000:
-+              bclk = WM8753_BCLK_DIV_4;
-+              pll_out = 12288000;
-+              break;
-+      case 96000:
-+              bclk = WM8753_BCLK_DIV_2;
-+              pll_out = 12288000;
-+              break;
-+      case 11025:
-+              bclk = WM8753_BCLK_DIV_16;
-+              pll_out = 11289600;
-+              break;
-+      case 22050:
-+              bclk = WM8753_BCLK_DIV_8;
-+              pll_out = 11289600;
-+              break;
-+      case 44100:
-+              bclk = WM8753_BCLK_DIV_4;
-+              pll_out = 11289600;
-+              break;
-+      case 88200:
-+              bclk = WM8753_BCLK_DIV_2;
-+              pll_out = 11289600;
-+              break;
-+      }
-+
-+      /* set codec DAI configuration */
-+      ret = codec_dai->dai_ops.set_fmt(codec_dai,
-+              SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-+              SND_SOC_DAIFMT_CBM_CFM);
-+      if (ret < 0)
-+              return ret;
-+
-+      /* set cpu DAI configuration */
-+      ret = cpu_dai->dai_ops.set_fmt(cpu_dai,
-+              SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-+              SND_SOC_DAIFMT_CBM_CFM);
-+      if (ret < 0)
-+              return ret;
-+
-+      /* set the codec system clock for DAC and ADC */
-+      ret = codec_dai->dai_ops.set_sysclk(codec_dai, WM8753_MCLK, pll_out,
-+              SND_SOC_CLOCK_IN);
-+      if (ret < 0)
-+              return ret;
-+
-+      /* set MCLK division for sample rate */
-+      ret = cpu_dai->dai_ops.set_clkdiv(cpu_dai, S3C24XX_DIV_MCLK,
-+              S3C2410_IISMOD_32FS );
-+      if (ret < 0)
-+              return ret;
-+
-+      /* set codec BCLK division for sample rate */
-+      ret = codec_dai->dai_ops.set_clkdiv(codec_dai,
-+                                      WM8753_BCLKDIV, bclk);
-+      if (ret < 0)
-+              return ret;
-+
-+      /* set prescaler division for sample rate */
-+      ret = cpu_dai->dai_ops.set_clkdiv(cpu_dai, S3C24XX_DIV_PRESCALER,
-+              S3C24XX_PRESCALE(4,4));
-+      if (ret < 0)
-+              return ret;
-+
-+      /* codec PLL input is PCLK/4 */
-+      ret = codec_dai->dai_ops.set_pll(codec_dai, WM8753_PLL1,
-+              iis_clkrate / 4, pll_out);
-+      if (ret < 0)
-+              return ret;
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_hifi_hw_free(struct snd_pcm_substream *substream)
-+{
-+      struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+      struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai;
-+
-+      /* disable the PLL */
-+      return codec_dai->dai_ops.set_pll(codec_dai, WM8753_PLL1, 0, 0);
-+}
-+
-+/*
-+ * Neo1973 WM8753 HiFi DAI opserations.
-+ */
-+static struct snd_soc_ops neo1973_gta02_hifi_ops = {
-+      .hw_params = neo1973_gta02_hifi_hw_params,
-+      .hw_free = neo1973_gta02_hifi_hw_free,
-+};
-+
-+static int neo1973_gta02_voice_hw_params(
-+      struct snd_pcm_substream *substream,
-+      struct snd_pcm_hw_params *params)
-+{
-+      struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+      struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai;
-+      unsigned int pcmdiv = 0;
-+      int ret = 0;
-+      unsigned long iis_clkrate;
-+
-+      iis_clkrate = s3c24xx_i2s_get_clockrate();
-+
-+      if (params_rate(params) != 8000)
-+              return -EINVAL;
-+      if (params_channels(params) != 1)
-+              return -EINVAL;
-+
-+      pcmdiv = WM8753_PCM_DIV_6; /* 2.048 MHz */
-+
-+      /* todo: gg check mode (DSP_B) against CSR datasheet */
-+      /* set codec DAI configuration */
-+      ret = codec_dai->dai_ops.set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_B |
-+              SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS);
-+      if (ret < 0)
-+              return ret;
-+
-+      /* set the codec system clock for DAC and ADC */
-+      ret = codec_dai->dai_ops.set_sysclk(codec_dai, WM8753_PCMCLK,
-+              12288000, SND_SOC_CLOCK_IN);
-+      if (ret < 0)
-+              return ret;
-+
-+      /* set codec PCM division for sample rate */
-+      ret = codec_dai->dai_ops.set_clkdiv(codec_dai, WM8753_PCMDIV,
-+                                      pcmdiv);
-+      if (ret < 0)
-+              return ret;
-+
-+      /* configue and enable PLL for 12.288MHz output */
-+      ret = codec_dai->dai_ops.set_pll(codec_dai, WM8753_PLL2,
-+              iis_clkrate / 4, 12288000);
-+      if (ret < 0)
-+              return ret;
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_voice_hw_free(struct snd_pcm_substream *substream)
-+{
-+      struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+      struct snd_soc_codec_dai *codec_dai = rtd->dai->codec_dai;
-+
-+      /* disable the PLL */
-+      return codec_dai->dai_ops.set_pll(codec_dai, WM8753_PLL2, 0, 0);
-+}
-+
-+static struct snd_soc_ops neo1973_gta02_voice_ops = {
-+      .hw_params = neo1973_gta02_voice_hw_params,
-+      .hw_free = neo1973_gta02_voice_hw_free,
-+};
-+
-+#define LM4853_AMP 1
-+#define LM4853_SPK 2
-+
-+static u8 lm4853_state=0;
-+
-+static int lm4853_set_state(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      int val = ucontrol->value.integer.value[0];
-+
-+      if(val) {
-+              lm4853_state |= LM4853_AMP;
-+              s3c2410_gpio_setpin(GTA02_GPIO_AMP_SHUT,0);
-+      } else {
-+              lm4853_state &= ~LM4853_AMP;
-+              s3c2410_gpio_setpin(GTA02_GPIO_AMP_SHUT,1);
-+      }
-+
-+      return 0;
-+}
-+
-+static int lm4853_get_state(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      ucontrol->value.integer.value[0] = lm4853_state & LM4853_AMP;
-+
-+      return 0;
-+}
-+
-+static int lm4853_set_spk(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      int val = ucontrol->value.integer.value[0];
-+
-+      if(val) {
-+              lm4853_state |= LM4853_SPK;
-+              s3c2410_gpio_setpin(GTA02_GPIO_HP_IN,0);
-+      } else {
-+              lm4853_state &= ~LM4853_SPK;
-+              s3c2410_gpio_setpin(GTA02_GPIO_HP_IN,1);
-+      }
-+
-+      return 0;
-+}
-+
-+static int lm4853_get_spk(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      ucontrol->value.integer.value[0] = (lm4853_state & LM4853_SPK) >> 1;
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_set_stereo_out(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+      int val = ucontrol->value.integer.value[0];
-+
-+      snd_soc_dapm_set_endpoint(codec, "Stereo Out", val);
-+
-+      snd_soc_dapm_sync_endpoints(codec);
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_get_stereo_out(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+
-+      ucontrol->value.integer.value[0] =
-+              snd_soc_dapm_get_endpoint(codec, "Stereo Out");
-+
-+      return 0;
-+}
-+
-+
-+static int neo1973_gta02_set_gsm_out(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+      int val = ucontrol->value.integer.value[0];
-+
-+      snd_soc_dapm_set_endpoint(codec, "GSM Line Out", val);
-+
-+      snd_soc_dapm_sync_endpoints(codec);
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_get_gsm_out(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+
-+      ucontrol->value.integer.value[0] =
-+              snd_soc_dapm_get_endpoint(codec, "GSM Line Out");
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_set_gsm_in(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+      int val = ucontrol->value.integer.value[0];
-+
-+      snd_soc_dapm_set_endpoint(codec, "GSM Line In", val);
-+
-+      snd_soc_dapm_sync_endpoints(codec);
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_get_gsm_in(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+
-+      ucontrol->value.integer.value[0] =
-+              snd_soc_dapm_get_endpoint(codec, "GSM Line In");
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_set_headset_mic(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+      int val = ucontrol->value.integer.value[0];
-+
-+      snd_soc_dapm_set_endpoint(codec, "Headset Mic", val);
-+
-+      snd_soc_dapm_sync_endpoints(codec);
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_get_headset_mic(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+
-+      ucontrol->value.integer.value[0] =
-+              snd_soc_dapm_get_endpoint(codec, "Headset Mic");
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_set_handset_mic(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+      int val = ucontrol->value.integer.value[0];
-+
-+      snd_soc_dapm_set_endpoint(codec, "Handset Mic", val);
-+
-+      snd_soc_dapm_sync_endpoints(codec);
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_get_handset_mic(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+
-+      ucontrol->value.integer.value[0] =
-+              snd_soc_dapm_get_endpoint(codec, "Handset Mic");
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_set_handset_spk(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+      int val = ucontrol->value.integer.value[0];
-+
-+      snd_soc_dapm_set_endpoint(codec, "Handset Spk", val);
-+
-+      snd_soc_dapm_sync_endpoints(codec);
-+
-+      return 0;
-+}
-+
-+static int neo1973_gta02_get_handset_spk(struct snd_kcontrol *kcontrol,
-+      struct snd_ctl_elem_value *ucontrol)
-+{
-+      struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-+
-+      ucontrol->value.integer.value[0] =
-+              snd_soc_dapm_get_endpoint(codec, "Handset Spk");
-+
-+      return 0;
-+}
-+
-+static const struct snd_soc_dapm_widget wm8753_dapm_widgets[] = {
-+      SND_SOC_DAPM_LINE("Stereo Out", NULL),
-+      SND_SOC_DAPM_LINE("GSM Line Out", NULL),
-+      SND_SOC_DAPM_LINE("GSM Line In", NULL),
-+      SND_SOC_DAPM_MIC("Headset Mic", NULL),
-+      SND_SOC_DAPM_MIC("Handset Mic", NULL),
-+      SND_SOC_DAPM_SPK("Handset Spk", NULL),
-+};
-+
-+
-+/* example machine audio_mapnections */
-+static const char* audio_map[][3] = {
-+
-+      /* Connections to the lm4853 amp */
-+      {"Stereo Out", NULL, "LOUT1"},
-+      {"Stereo Out", NULL, "ROUT1"},
-+
-+      /* Connections to the GSM Module */
-+      {"GSM Line Out", NULL, "MONO1"},
-+      {"GSM Line Out", NULL, "MONO2"},
-+      {"RXP", NULL, "GSM Line In"},
-+      {"RXN", NULL, "GSM Line In"},
-+
-+      /* Connections to Headset */
-+      {"MIC1", NULL, "Mic Bias"},
-+      {"Mic Bias", NULL, "Headset Mic"},
-+
-+      /* Call Mic */
-+      {"MIC2", NULL, "Mic Bias"},
-+      {"MIC2N", NULL, "Mic Bias"},
-+      {"Mic Bias", NULL, "Handset Mic"},
-+
-+      /* Call Speaker */
-+      {"Handset Spk", NULL, "LOUT2"},
-+      {"Handset Spk", NULL, "ROUT2"},
-+
-+      /* Connect the ALC pins */
-+      {"ACIN", NULL, "ACOP"},
-+
-+      {NULL, NULL, NULL},
-+};
-+
-+static const struct snd_kcontrol_new wm8753_neo1973_gta02_controls[] = {
-+      SOC_SINGLE_EXT("DAPM Stereo Out Switch", 0, 0, 1, 0,
-+              neo1973_gta02_get_stereo_out,
-+              neo1973_gta02_set_stereo_out),
-+      SOC_SINGLE_EXT("DAPM GSM Line Out Switch", 1, 0, 1, 0,
-+              neo1973_gta02_get_gsm_out,
-+              neo1973_gta02_set_gsm_out),
-+      SOC_SINGLE_EXT("DAPM GSM Line In Switch", 2, 0, 1, 0,
-+              neo1973_gta02_get_gsm_in,
-+              neo1973_gta02_set_gsm_in),
-+      SOC_SINGLE_EXT("DAPM Headset Mic Switch", 3, 0, 1, 0,
-+              neo1973_gta02_get_headset_mic,
-+              neo1973_gta02_set_headset_mic),
-+      SOC_SINGLE_EXT("DAPM Handset Mic Switch", 4, 0, 1, 0,
-+              neo1973_gta02_get_handset_mic,
-+              neo1973_gta02_set_handset_mic),
-+      SOC_SINGLE_EXT("DAPM Handset Spk Switch", 5, 0, 1, 0,
-+              neo1973_gta02_get_handset_spk,
-+              neo1973_gta02_set_handset_spk),
-+      SOC_SINGLE_EXT("Amp State Switch", 6, 0, 1, 0,
-+              lm4853_get_state,
-+              lm4853_set_state),
-+      SOC_SINGLE_EXT("Amp Spk Switch", 7, 0, 1, 0,
-+              lm4853_get_spk,
-+              lm4853_set_spk),
-+};
-+
-+/*
-+ * This is an example machine initialisation for a wm8753 connected to a
-+ * neo1973 GTA02.
-+ */
-+static int neo1973_gta02_wm8753_init(struct snd_soc_codec *codec)
-+{
-+      int i, err;
-+
-+      /* set up NC codec pins */
-+      snd_soc_dapm_set_endpoint(codec, "OUT3",  0);
-+      snd_soc_dapm_set_endpoint(codec, "OUT4",  0);
-+      snd_soc_dapm_set_endpoint(codec, "LINE1", 0);
-+      snd_soc_dapm_set_endpoint(codec, "LINE2", 0);
-+
-+      /* Add neo1973 gta02 specific widgets */
-+      for (i = 0; i < ARRAY_SIZE(wm8753_dapm_widgets); i++)
-+              snd_soc_dapm_new_control(codec, &wm8753_dapm_widgets[i]);
-+
-+      /* add neo1973 gta02 specific controls */
-+      for (i = 0; i < ARRAY_SIZE(wm8753_neo1973_gta02_controls); i++) {
-+              err = snd_ctl_add(codec->card,
-+                      snd_soc_cnew(&wm8753_neo1973_gta02_controls[i],
-+                      codec, NULL));
-+              if (err < 0)
-+                      return err;
-+      }
-+
-+      /* set up neo1973 gta02 specific audio path audio_mapnects */
-+      for (i = 0; audio_map[i][0] != NULL; i++) {
-+              snd_soc_dapm_connect_input(codec, audio_map[i][0],
-+                      audio_map[i][1], audio_map[i][2]);
-+      }
-+
-+      /* set endpoints to default off mode */
-+      snd_soc_dapm_set_endpoint(codec, "Stereo Out",  0);
-+      snd_soc_dapm_set_endpoint(codec, "GSM Line Out",0);
-+      snd_soc_dapm_set_endpoint(codec, "GSM Line In", 0);
-+      snd_soc_dapm_set_endpoint(codec, "Headset Mic", 0);
-+      snd_soc_dapm_set_endpoint(codec, "Handset Mic", 0);
-+      snd_soc_dapm_set_endpoint(codec, "Handset Spk", 0);
-+
-+      snd_soc_dapm_sync_endpoints(codec);
-+      return 0;
-+}
-+
-+/*
-+ * BT Codec DAI
-+ */
-+static struct snd_soc_cpu_dai bt_dai =
-+{     .name = "Bluetooth",
-+      .id = 0,
-+      .type = SND_SOC_DAI_PCM,
-+      .playback = {
-+              .channels_min = 1,
-+              .channels_max = 1,
-+              .rates = SNDRV_PCM_RATE_8000,
-+              .formats = SNDRV_PCM_FMTBIT_S16_LE,},
-+      .capture = {
-+              .channels_min = 1,
-+              .channels_max = 1,
-+              .rates = SNDRV_PCM_RATE_8000,
-+              .formats = SNDRV_PCM_FMTBIT_S16_LE,},
-+};
-+
-+static struct snd_soc_dai_link neo1973_gta02_dai[] = {
-+{ /* Hifi Playback - for similatious use with voice below */
-+      .name = "WM8753",
-+      .stream_name = "WM8753 HiFi",
-+      .cpu_dai = &s3c24xx_i2s_dai,
-+      .codec_dai = &wm8753_dai[WM8753_DAI_HIFI],
-+      .init = neo1973_gta02_wm8753_init,
-+      .ops = &neo1973_gta02_hifi_ops,
-+},
-+{ /* Voice via BT */
-+      .name = "Bluetooth",
-+      .stream_name = "Voice",
-+      .cpu_dai = &bt_dai,
-+      .codec_dai = &wm8753_dai[WM8753_DAI_VOICE],
-+      .ops = &neo1973_gta02_voice_ops,
-+},
-+};
-+
-+#ifdef CONFIG_PM
-+int neo1973_gta02_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+      s3c2410_gpio_setpin(GTA02_GPIO_AMP_SHUT, 1);
-+
-+      return 0;
-+}
-+
-+int neo1973_gta02_resume(struct platform_device *pdev)
-+{
-+      if(lm4853_state & LM4853_AMP)
-+              s3c2410_gpio_setpin(GTA02_GPIO_AMP_SHUT, 0);
-+
-+      return 0;
-+}
-+#else
-+#define neo1973_gta02_suspend NULL
-+#define neo1973_gta02_resume NULL
-+#endif
-+
-+static struct snd_soc_machine neo1973_gta02 = {
-+      .name = "neo1973-gta02",
-+      .suspend_pre = neo1973_gta02_suspend,
-+      .resume_post = neo1973_gta02_resume,
-+      .dai_link = neo1973_gta02_dai,
-+      .num_links = ARRAY_SIZE(neo1973_gta02_dai),
-+};
-+
-+static struct wm8753_setup_data neo1973_gta02_wm8753_setup = {
-+      .i2c_address = 0x1a,
-+};
-+
-+static struct snd_soc_device neo1973_gta02_snd_devdata = {
-+      .machine = &neo1973_gta02,
-+      .platform = &s3c24xx_soc_platform,
-+      .codec_dev = &soc_codec_dev_wm8753,
-+      .codec_data = &neo1973_gta02_wm8753_setup,
-+};
-+
-+static struct platform_device *neo1973_gta02_snd_device;
-+
-+static int __init neo1973_gta02_init(void)
-+{
-+      int ret;
-+
-+      if (!machine_is_neo1973_gta02()) {
-+              printk(KERN_INFO
-+                     "Only GTA02 hardware supported by ASoc driver\n");
-+              return -ENODEV;
-+      }
-+
-+      neo1973_gta02_snd_device = platform_device_alloc("soc-audio", -1);
-+      if (!neo1973_gta02_snd_device)
-+              return -ENOMEM;
-+
-+      platform_set_drvdata(neo1973_gta02_snd_device,
-+                      &neo1973_gta02_snd_devdata);
-+      neo1973_gta02_snd_devdata.dev = &neo1973_gta02_snd_device->dev;
-+      ret = platform_device_add(neo1973_gta02_snd_device);
-+
-+      if (ret)
-+              platform_device_put(neo1973_gta02_snd_device);
-+
-+      /* Initialise GPIOs used by amp */
-+      s3c2410_gpio_cfgpin(GTA02_GPIO_HP_IN, S3C2410_GPIO_OUTPUT);
-+      s3c2410_gpio_cfgpin(GTA02_GPIO_AMP_SHUT, S3C2410_GPIO_OUTPUT);
-+
-+      /* Amp off by default */
-+      s3c2410_gpio_setpin(GTA02_GPIO_AMP_SHUT, 1);
-+
-+      /* Speaker off by default */
-+      s3c2410_gpio_setpin(GTA02_GPIO_HP_IN, 1);
-+
-+      return ret;
-+}
-+
-+static void __exit neo1973_gta02_exit(void)
-+{
-+      platform_device_unregister(neo1973_gta02_snd_device);
-+}
-+
-+module_init(neo1973_gta02_init);
-+module_exit(neo1973_gta02_exit);
-+
-+/* Module information */
-+MODULE_AUTHOR("Graeme Gregory, graeme@openmoko.org");
-+MODULE_DESCRIPTION("ALSA SoC WM8753 Neo1973 GTA02");
-+MODULE_LICENSE("GPL");
-+
-diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
-index af3326c..95df1ff 100644
---- a/sound/soc/soc-dapm.c
-+++ b/sound/soc/soc-dapm.c
-@@ -1343,6 +1343,30 @@ int snd_soc_dapm_set_endpoint(struct snd_soc_codec *codec,
- EXPORT_SYMBOL_GPL(snd_soc_dapm_set_endpoint);
- /**
-+ * snd_soc_dapm_get_endpoint - get audio endpoint status
-+ * @codec: audio codec
-+ * @endpoint: audio signal endpoint (or start point)
-+ *
-+ * Get audio endpoint status - connected or disconnected.
-+ *
-+ * Returns status
-+ */
-+int snd_soc_dapm_get_endpoint(struct snd_soc_codec *codec,
-+      char *endpoint)
-+{
-+      struct snd_soc_dapm_widget *w;
-+
-+      list_for_each_entry(w, &codec->dapm_widgets, list) {
-+              if (!strcmp(w->name, endpoint)) {
-+                      return w->connected;
-+              }
-+      }
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(snd_soc_dapm_get_endpoint);
-+
-+/**
-  * snd_soc_dapm_free - free dapm resources
-  * @socdev: SoC device
-  *
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1031-lis302dl.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1031-lis302dl.patch.patch
deleted file mode 100755 (executable)
index ea1b231..0000000
+++ /dev/null
@@ -1,781 +0,0 @@
-From 65c5d85b4cf89969d2e2e981c018bf0ef1c03a2a Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:46:56 +0100
-Subject: [PATCH] lis302dl.patch
- This is a Linux driver for the STmicro LIS302DL 3-axis accelerometer.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   46 +++-
- drivers/input/misc/Kconfig         |    9 +
- drivers/input/misc/Makefile        |    2 +
- drivers/input/misc/lis302dl.c      |  633 ++++++++++++++++++++++++++++++++++++
- include/linux/lis302dl.h           |   11 +
- 5 files changed, 700 insertions(+), 1 deletions(-)
- create mode 100644 drivers/input/misc/lis302dl.c
- create mode 100644 include/linux/lis302dl.h
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index f72a5ae..d11da10 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -46,6 +46,7 @@
- #include <linux/mtd/physmap.h>
- #include <linux/pcf50633.h>
-+#include <linux/lis302dl.h>
- #include <asm/mach/arch.h>
- #include <asm/mach/map.h>
-@@ -463,7 +464,7 @@ static struct s3c2410_ts_mach_info gta02_ts_cfg = {
-       .oversampling_shift = 5,
- };
--/* SPI */
-+/* SPI: LCM control interface attached to Glamo3362 */
- static struct spi_board_info gta02_spi_board_info[] = {
-       {
-@@ -504,6 +505,48 @@ static struct platform_device gta01_led_dev = {
-       .resource       = gta01_led_resources,
- };
-+/* SPI: Accelerometers attached to SPI of s3c244x */
-+
-+static void gta02_spi_acc_set_cs(struct s3c2410_spi_info *spi, int cs, int pol)
-+{
-+      s3c2410_gpio_setpin(cs, pol);
-+}
-+
-+static const struct lis302dl_platform_data lis302_pdata[] = {
-+      {
-+              .name           = "lis302-1 (top)"
-+      }, {
-+              .name           = "lis302-2 (bottom)"
-+      },
-+};
-+
-+static struct spi_board_info gta02_spi_acc_bdinfo[] = {
-+      {
-+              .modalias       = "lis302dl",
-+              .platform_data  = &lis302_pdata[0],
-+              .irq            = GTA02_IRQ_GSENSOR_1,
-+              .max_speed_hz   = 400 * 1000,
-+              .bus_num        = 1,
-+              .chip_select    = S3C2410_GPD12,
-+              .mode           = SPI_MODE_3,
-+      },
-+      {
-+              .modalias       = "lis302dl",
-+              .platform_data  = &lis302_pdata[1],
-+              .irq            = GTA02_IRQ_GSENSOR_2,
-+              .max_speed_hz   = 400 * 1000,
-+              .bus_num        = 1,
-+              .chip_select    = S3C2410_GPD13,
-+              .mode           = SPI_MODE_3,
-+      },
-+};
-+
-+static struct s3c2410_spi_info gta02_spi_acc_cfg = {
-+      .set_cs         = gta02_spi_acc_set_cs,
-+      .board_size     = ARRAY_SIZE(gta02_spi_acc_bdinfo),
-+      .board_info     = gta02_spi_acc_bdinfo,
-+};
-+
- static struct resource gta02_led_resources[] = {
-       {
-               .name   = "gta02-power:orange",
-@@ -746,6 +789,7 @@ static void __init gta02_machine_init(void)
-       s3c_device_usb.dev.platform_data = &gta02_usb_info;
-       s3c_device_nand.dev.platform_data = &gta02_nand_info;
-       s3c_device_sdi.dev.platform_data = &gta02_mmc_cfg;
-+      s3c_device_spi1.dev.platform_data = &gta02_spi_acc_cfg;
-       /* Only GTA02v1 has a SD_DETECT GPIO.  Since the slot is not
-        * hot-pluggable, this is not required anyway */
-diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
-index 432699d..ac8bcf4 100644
---- a/drivers/input/misc/Kconfig
-+++ b/drivers/input/misc/Kconfig
-@@ -197,4 +197,13 @@ config HP_SDC_RTC
-         Say Y here if you want to support the built-in real time clock
-         of the HP SDC controller.
-+config INPUT_LIS302DL
-+      tristate "STmicro LIS302DL 3-axis accelerometer"
-+      depends on SPI_MASTER
-+      help
-+        SPI driver for the STmicro LIS302DL 3-axis accelerometer.
-+
-+        The userspece interface is a 3-axis (X/Y/Z) relative movement
-+        Linux input device, reporting REL_[XYZ] events.
-+
- endif
-diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
-index ebd39f2..0d223ba 100644
---- a/drivers/input/misc/Makefile
-+++ b/drivers/input/misc/Makefile
-@@ -20,3 +20,4 @@
- obj-$(CONFIG_INPUT_UINPUT)            += uinput.o
- obj-$(CONFIG_INPUT_APANEL)            += apanel.o
- obj-$(CONFIG_INPUT_GPIO_BUTTONS)      += gpio_buttons.o
-+obj-$(CONFIG_INPUT_LIS302DL)          += lis302dl.o
-diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
-new file mode 100644
-index 0000000..45c41c8
---- /dev/null
-+++ b/drivers/input/misc/lis302dl.c
-@@ -0,0 +1,633 @@
-+/* Linux kernel driver for the ST LIS302D 3-axis accelerometer
-+ *
-+ * Copyright (C) 2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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
-+ *
-+ * TODO
-+ *    * statistics for overflow events
-+ *    * configuration interface (sysfs) for
-+ *            * enable/disable x/y/z axis data ready
-+ *            * enable/disable resume from freee fall / click
-+ *            * free fall / click parameters
-+ *            * high pass filter parameters
-+ */
-+#include <linux/kernel.h>
-+#include <linux/types.h>
-+#include <linux/module.h>
-+#include <linux/device.h>
-+#include <linux/platform_device.h>
-+#include <linux/delay.h>
-+#include <linux/input.h>
-+#include <linux/irq.h>
-+#include <linux/interrupt.h>
-+#include <linux/sysfs.h>
-+
-+#include <linux/lis302dl.h>
-+
-+#include <linux/spi/spi.h>
-+
-+#define LIS302DL_WHO_AM_I_MAGIC               0x3b
-+
-+enum lis302dl_reg {
-+      LIS302DL_REG_WHO_AM_I           = 0x0f,
-+      LIS302DL_REG_CTRL1              = 0x20,
-+      LIS302DL_REG_CTRL2              = 0x21,
-+      LIS302DL_REG_CTRL3              = 0x22,
-+      LIS302DL_REG_HP_FILTER_RESET    = 0x23,
-+      LIS302DL_REG_STATUS             = 0x27,
-+      LIS302DL_REG_OUT_X              = 0x29,
-+      LIS302DL_REG_OUT_Y              = 0x2b,
-+      LIS302DL_REG_OUT_Z              = 0x2d,
-+      LIS302DL_REG_FF_WU_CFG_1        = 0x30,
-+      LIS302DL_REG_FF_WU_SRC_1        = 0x31,
-+      LIS302DL_REG_FF_WU_THS_1        = 0x32,
-+      LIS302DL_REG_FF_WU_DURATION_1   = 0x33,
-+      LIS302DL_REG_FF_WU_CFG_2        = 0x34,
-+      LIS302DL_REG_FF_WU_SRC_2        = 0x35,
-+      LIS302DL_REG_FF_WU_THS_2        = 0x36,
-+      LIS302DL_REG_FF_WU_DURATION_2   = 0x37,
-+      LIS302DL_REG_CLICK_CFG          = 0x38,
-+      LIS302DL_REG_CLICK_SRC          = 0x39,
-+      LIS302DL_REG_CLICK_THSY_X       = 0x3b,
-+      LIS302DL_REG_CLICK_THSZ         = 0x3c,
-+      LIS302DL_REG_CLICK_TIME_LIMIT   = 0x3d,
-+      LIS302DL_REG_CLICK_LATENCY      = 0x3e,
-+      LIS302DL_REG_CLICK_WINDOW       = 0x3f,
-+};
-+
-+enum lis302dl_reg_ctrl1 {
-+      LIS302DL_CTRL1_Xen              = 0x01,
-+      LIS302DL_CTRL1_Yen              = 0x02,
-+      LIS302DL_CTRL1_Zen              = 0x04,
-+      LIS302DL_CTRL1_STM              = 0x08,
-+      LIS302DL_CTRL1_STP              = 0x10,
-+      LIS302DL_CTRL1_FS               = 0x20,
-+      LIS302DL_CTRL1_PD               = 0x40,
-+      LIS302DL_CTRL1_DR               = 0x80,
-+};
-+
-+enum lis302dl_reg_ctrl3 {
-+      LIS302DL_CTRL3_PP_OD            = 0x40,
-+};
-+
-+enum lis302dl_reg_status {
-+      LIS302DL_STATUS_XDA             = 0x01,
-+      LIS302DL_STATUS_YDA             = 0x02,
-+      LIS302DL_STATUS_ZDA             = 0x04,
-+      LIS302DL_STATUS_XYZDA           = 0x08,
-+      LIS302DL_STATUS_XOR             = 0x10,
-+      LIS302DL_STATUS_YOR             = 0x20,
-+      LIS302DL_STATUS_ZOR             = 0x40,
-+      LIS302DL_STATUS_XYZOR           = 0x80,
-+};
-+
-+enum lis302dl_reg_ffwusrc1 {
-+      LIS302DL_FFWUSRC1_XL            = 0x01,
-+      LIS302DL_FFWUSRC1_XH            = 0x02,
-+      LIS302DL_FFWUSRC1_YL            = 0x04,
-+      LIS302DL_FFWUSRC1_YH            = 0x08,
-+      LIS302DL_FFWUSRC1_ZL            = 0x10,
-+      LIS302DL_FFWUSRC1_ZH            = 0x20,
-+      LIS302DL_FFWUSRC1_IA            = 0x40,
-+};
-+
-+enum lis302dl_reg_cloik_src {
-+      LIS302DL_CLICKSRC_SINGLE_X      = 0x01,
-+      LIS302DL_CLICKSRC_DOUBLE_X      = 0x02,
-+      LIS302DL_CLICKSRC_SINGLE_Y      = 0x04,
-+      LIS302DL_CLICKSRC_DOUBLE_Y      = 0x08,
-+      LIS302DL_CLICKSRC_SINGLE_Z      = 0x10,
-+      LIS302DL_CLICKSRC_DOUBLE_Z      = 0x20,
-+      LIS302DL_CLICKSRC_IA            = 0x40,
-+};
-+
-+struct lis302dl_info {
-+      struct spi_device *spi_dev;
-+      struct input_dev *input_dev;
-+      struct mutex lock;
-+      struct work_struct work;
-+      unsigned int flags;
-+      unsigned int working;
-+      u_int8_t regs[0x40];
-+};
-+
-+#define LIS302DL_F_WUP_FF             0x0001  /* wake up from free fall */
-+#define LIS302DL_F_WUP_CLICK          0x0002
-+#define LIS302DL_F_POWER              0x0010
-+#define LIS302DL_F_FS                 0x0020  /* ADC full scale */
-+
-+/* lowlevel register access functions */
-+
-+#define READ_BIT      0x01
-+#define MS_BIT                0x02
-+#define ADDR_SHIFT    2
-+
-+static inline u_int8_t __reg_read(struct lis302dl_info *lis, u_int8_t reg)
-+{
-+      int rc;
-+      u_int8_t cmd;
-+
-+      cmd = (reg << ADDR_SHIFT) | READ_BIT;
-+
-+      rc = spi_w8r8(lis->spi_dev, cmd);
-+
-+      return rc;
-+}
-+
-+static u_int8_t reg_read(struct lis302dl_info *lis, u_int8_t reg)
-+{
-+      u_int8_t ret;
-+
-+      mutex_lock(&lis->lock);
-+      ret = __reg_read(lis, reg);
-+      mutex_unlock(&lis->lock);
-+
-+      return ret;
-+}
-+
-+static inline int __reg_write(struct lis302dl_info *lis, u_int8_t reg, u_int8_t val)
-+{
-+      u_int8_t buf[2];
-+
-+      buf[0] = (reg << ADDR_SHIFT);
-+      buf[1] = val;
-+
-+      return spi_write(lis->spi_dev, buf, sizeof(buf));
-+}
-+
-+static int reg_write(struct lis302dl_info *lis, u_int8_t reg, u_int8_t val)
-+{
-+      int ret;
-+
-+      mutex_lock(&lis->lock);
-+      ret = __reg_write(lis, reg, val);
-+      mutex_unlock(&lis->lock);
-+
-+      return ret;
-+}
-+
-+static int reg_set_bit_mask(struct lis302dl_info *lis,
-+                          u_int8_t reg, u_int8_t mask, u_int8_t val)
-+{
-+      int ret;
-+      u_int8_t tmp;
-+
-+      val &= mask;
-+
-+      mutex_lock(&lis->lock);
-+
-+      tmp = __reg_read(lis, reg);
-+      tmp &= ~mask;
-+      tmp |= val;
-+      ret = __reg_write(lis, reg, tmp);
-+
-+      mutex_unlock(&lis->lock);
-+
-+      return ret;
-+}
-+
-+/* interrupt handling related */
-+
-+enum lis302dl_intmode {
-+      LIS302DL_INTMODE_GND            = 0x00,
-+      LIS302DL_INTMODE_FF_WU_1        = 0x01,
-+      LIX302DL_INTMODE_FF_WU_2        = 0x02,
-+      LIX302DL_INTMODE_FF_WU_12       = 0x03,
-+      LIX302DL_INTMODE_DATA_READY     = 0x04,
-+      LIX302DL_INTMODE_CLICK          = 0x07,
-+};
-+
-+static void lis302dl_int_mode(struct spi_device *spi, int int_pin,
-+                            enum lis302dl_intmode mode)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-+
-+      if (int_pin == 1)
-+              reg_set_bit_mask(lis, LIS302DL_REG_CTRL3, 0x07, mode);
-+      else if (int_pin == 2)
-+              reg_set_bit_mask(lis, LIS302DL_REG_CTRL3, 0x38, mode << 3);
-+}
-+
-+static void _report_btn_single(struct input_dev *inp, int btn)
-+{
-+      input_report_key(inp, btn, 1);
-+      input_sync(inp);
-+      input_report_key(inp, btn, 0);
-+}
-+
-+static void _report_btn_double(struct input_dev *inp, int btn)
-+{
-+      input_report_key(inp, btn, 1);
-+      input_sync(inp);
-+      input_report_key(inp, btn, 0);
-+      input_sync(inp);
-+      input_report_key(inp, btn, 1);
-+      input_sync(inp);
-+      input_report_key(inp, btn, 0);
-+}
-+
-+static void lis302dl_work(struct work_struct *work)
-+{
-+      struct lis302dl_info *lis =
-+                      container_of(work, struct lis302dl_info, work);
-+
-+      u_int8_t status, ff_wu_src_1, click_src;
-+      u_int8_t val;
-+
-+      lis->working = 1;
-+
-+      status = reg_read(lis, LIS302DL_REG_STATUS);
-+      ff_wu_src_1 = reg_read(lis, LIS302DL_REG_FF_WU_SRC_1);
-+      click_src = reg_read(lis, LIS302DL_REG_CLICK_SRC);
-+
-+      if (status & LIS302DL_STATUS_XDA) {
-+              val = reg_read(lis, LIS302DL_REG_OUT_X);
-+              if (lis->flags & LIS302DL_F_FS)
-+                      val = val << 2;
-+              input_report_rel(lis->input_dev, REL_X, val);
-+      }
-+
-+      if (status & LIS302DL_STATUS_YDA) {
-+              val = reg_read(lis, LIS302DL_REG_OUT_Y);
-+              if (lis->flags & LIS302DL_F_FS)
-+                      val = val << 2;
-+              input_report_rel(lis->input_dev, REL_Y, val);
-+      }
-+
-+      if (status & LIS302DL_STATUS_ZDA) {
-+              val = reg_read(lis, LIS302DL_REG_OUT_Z);
-+              if (lis->flags & LIS302DL_F_FS)
-+                      val = val << 2;
-+              input_report_rel(lis->input_dev, REL_Z, val);
-+      }
-+
-+      if (status & 0xf0)
-+              dev_dbg(&lis->spi_dev->dev, "overrun!\n");
-+
-+      /* FIXME: implement overrun statistics */
-+
-+      if (ff_wu_src_1 & LIS302DL_FFWUSRC1_IA) {
-+              /* FIXME: free fall interrupt handling */
-+      }
-+
-+      if (click_src & LIS302DL_CLICKSRC_IA) {
-+              if (click_src & LIS302DL_CLICKSRC_SINGLE_X)
-+                      _report_btn_single(lis->input_dev, BTN_X);
-+              if (click_src & LIS302DL_CLICKSRC_DOUBLE_X)
-+                      _report_btn_double(lis->input_dev, BTN_X);
-+
-+              if (click_src & LIS302DL_CLICKSRC_SINGLE_Y)
-+                      _report_btn_single(lis->input_dev, BTN_Y);
-+              if (click_src & LIS302DL_CLICKSRC_DOUBLE_Y)
-+                      _report_btn_double(lis->input_dev, BTN_Y);
-+
-+              if (click_src & LIS302DL_CLICKSRC_SINGLE_Z)
-+                      _report_btn_single(lis->input_dev, BTN_Z);
-+              if (click_src & LIS302DL_CLICKSRC_DOUBLE_Z)
-+                      _report_btn_double(lis->input_dev, BTN_Z);
-+      }
-+
-+      lis->working = 0;
-+      input_sync(lis->input_dev);
-+      put_device(&lis->spi_dev->dev);
-+
-+      enable_irq(lis->spi_dev->irq);
-+}
-+
-+static void lis302dl_schedule_work(struct lis302dl_info *lis)
-+{
-+      int status;
-+
-+      get_device(&lis->spi_dev->dev);
-+      status = schedule_work(&lis->work);
-+      if (!status && !lis->working)
-+              dev_dbg(&lis->spi_dev->dev, "work item may be lost\n");
-+}
-+
-+static irqreturn_t lis302dl_interrupt(int irq, void *_lis)
-+{
-+      struct lis302dl_info *lis = _lis;
-+
-+      lis302dl_schedule_work(lis);
-+
-+      /* Disable any further interrupts until we have processed
-+       * the current one */
-+      disable_irq(lis->spi_dev->irq);
-+
-+      return IRQ_HANDLED;
-+}
-+
-+/* sysfs */
-+
-+static ssize_t show_rate(struct device *dev, struct device_attribute *attr,
-+                       char *buf)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(dev);
-+      u_int8_t ctrl1 = reg_read(lis, LIS302DL_REG_CTRL1);
-+
-+      return sprintf(buf, "%d\n", ctrl1 & LIS302DL_CTRL1_DR ? 400 : 100);
-+}
-+
-+static ssize_t set_rate(struct device *dev, struct device_attribute *attr,
-+                      const char *buf, size_t count)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(dev);
-+
-+      if (!strcmp(buf, "400\n"))
-+              reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_DR,
-+                               LIS302DL_CTRL1_DR);
-+      else
-+              reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_DR, 0);
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(sample_rate, S_IRUGO | S_IWUSR, show_rate, set_rate);
-+
-+static ssize_t show_scale(struct device *dev, struct device_attribute *attr,
-+                        char *buf)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(dev);
-+      u_int8_t ctrl1 = reg_read(lis, LIS302DL_REG_CTRL1);
-+
-+      return sprintf(buf, "%s\n", ctrl1 & LIS302DL_CTRL1_FS ? "9.2" : "2.3");
-+}
-+
-+static ssize_t set_scale(struct device *dev, struct device_attribute *attr,
-+                       const char *buf, size_t count)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(dev);
-+
-+      if (!strcmp(buf, "9.2\n"))
-+              reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_FS,
-+                               LIS302DL_CTRL1_FS);
-+      else
-+              reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_FS, 0);
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(full_scale, S_IRUGO | S_IWUSR, show_scale, set_scale);
-+
-+static struct attribute *lis302dl_sysfs_entries[] = {
-+      &dev_attr_sample_rate.attr,
-+      &dev_attr_full_scale.attr,
-+};
-+
-+static struct attribute_group lis302dl_attr_group = {
-+      .name   = NULL,
-+      .attrs  = lis302dl_sysfs_entries,
-+};
-+
-+/* input device handling and driver core interaction */
-+
-+static int lis302dl_input_open(struct input_dev *inp)
-+{
-+      struct lis302dl_info *lis = inp->private;
-+      u_int8_t ctrl1 = LIS302DL_CTRL1_PD | LIS302DL_CTRL1_Xen |
-+                       LIS302DL_CTRL1_Yen | LIS302DL_CTRL1_Zen;
-+
-+      /* make sure we're powered up and generate data ready */
-+      reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, ctrl1, ctrl1);
-+
-+      return 0;
-+}
-+
-+static void lis302dl_input_close(struct input_dev *inp)
-+{
-+      struct lis302dl_info *lis = inp->private;
-+      u_int8_t ctrl1 = LIS302DL_CTRL1_Xen | LIS302DL_CTRL1_Yen |
-+                       LIS302DL_CTRL1_Zen;
-+
-+      /* since the input core already serializes access and makes sure we
-+       * only see close() for the close of the lastre user, we can safely
-+       * disable the data ready events */
-+      reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, ctrl1, 0x00);
-+
-+      /* however, don't power down the whole device if still needed */
-+      if (!(lis->flags & LIS302DL_F_WUP_FF ||
-+            lis->flags & LIS302DL_F_WUP_CLICK)) {
-+              reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD,
-+                               0x00);
-+      }
-+}
-+
-+static int __devinit lis302dl_probe(struct spi_device *spi)
-+{
-+      int rc;
-+      struct lis302dl_info *lis;
-+      u_int8_t wai;
-+
-+      lis = kzalloc(sizeof(*lis), GFP_KERNEL);
-+      if (!lis)
-+              return -ENOMEM;
-+
-+      mutex_init(&lis->lock);
-+      INIT_WORK(&lis->work, lis302dl_work);
-+      lis->spi_dev = spi;
-+
-+      spi_set_drvdata(spi, lis);
-+
-+      rc = spi_setup(spi);
-+      if (rc < 0) {
-+              printk(KERN_ERR "error durign spi_setup of lis302dl driver\n");
-+              dev_set_drvdata(&spi->dev, NULL);
-+              kfree(lis);
-+              return rc;
-+      }
-+
-+      wai = reg_read(lis, LIS302DL_REG_WHO_AM_I);
-+      if (wai != LIS302DL_WHO_AM_I_MAGIC) {
-+              printk(KERN_ERR "unknown who_am_i signature 0x%02x\n", wai);
-+              dev_set_drvdata(&spi->dev, NULL);
-+              kfree(lis);
-+              return -ENODEV;
-+      }
-+
-+      /* switch interrupt to open collector */
-+      reg_write(lis, LIS302DL_CTRL3_PP_OD, 0x7c);
-+
-+      rc = request_irq(lis->spi_dev->irq, lis302dl_interrupt, IRQF_DISABLED,
-+                       "lis302dl", NULL);
-+      if (rc < 0) {
-+              dev_err(&spi->dev, "error requesting IRQ %d\n",
-+                      lis->spi_dev->irq);
-+              /* FIXME */
-+              return rc;
-+      }
-+
-+      rc = sysfs_create_group(&spi->dev.kobj, &lis302dl_attr_group);
-+      if (rc) {
-+              dev_err(&spi->dev, "error creating sysfs group\n");
-+              /* FIXME */
-+              return rc;
-+      }
-+
-+      /* initialize input layer details */
-+      lis->input_dev = input_allocate_device();
-+      if (!lis->input_dev) {
-+              dev_err(&spi->dev, "Unable to allocate input device\n");
-+              /* FIXME */
-+      }
-+
-+      set_bit(EV_REL, lis->input_dev->evbit);
-+      set_bit(EV_KEY, lis->input_dev->evbit);
-+      set_bit(BTN_X, lis->input_dev->keybit);
-+      set_bit(BTN_Y, lis->input_dev->keybit);
-+      set_bit(BTN_Z, lis->input_dev->keybit);
-+
-+      lis->input_dev->private = lis;
-+      lis->input_dev->name = "lis302dl"; /* FIXME: platform data */
-+      lis->input_dev->id.bustype = BUS_I2C; /* FIXME: SPI Bus */
-+      lis->input_dev->open = lis302dl_input_open;
-+      lis->input_dev->close = lis302dl_input_close;
-+
-+      input_register_device(lis->input_dev);
-+
-+      return 0;
-+}
-+
-+static int __devexit lis302dl_remove(struct spi_device *spi)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-+
-+      /* power down the device */
-+      reg_write(lis, LIS302DL_REG_CTRL1, 0x00);
-+      sysfs_remove_group(&spi->dev.kobj, &lis302dl_attr_group);
-+      input_unregister_device(lis->input_dev);
-+      dev_set_drvdata(&spi->dev, NULL);
-+      kfree(lis);
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int lis302dl_suspend(struct spi_device *spi, pm_message_t state)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-+
-+      /* save registers */
-+      lis->regs[LIS302DL_REG_CTRL1] = reg_read(lis, LIS302DL_REG_CTRL1);
-+      lis->regs[LIS302DL_REG_CTRL2] = reg_read(lis, LIS302DL_REG_CTRL2);
-+      lis->regs[LIS302DL_REG_CTRL3] = reg_read(lis, LIS302DL_REG_CTRL3);
-+      lis->regs[LIS302DL_REG_FF_WU_CFG_1] =
-+                              reg_read(lis, LIS302DL_REG_FF_WU_CFG_1);
-+      lis->regs[LIS302DL_REG_FF_WU_THS_1] =
-+                              reg_read(lis, LIS302DL_REG_FF_WU_THS_1);
-+      lis->regs[LIS302DL_REG_FF_WU_DURATION_1] =
-+                              reg_read(lis, LIS302DL_REG_FF_WU_DURATION_1);
-+      lis->regs[LIS302DL_REG_FF_WU_CFG_2] =
-+                              reg_read(lis, LIS302DL_REG_FF_WU_CFG_2);
-+      lis->regs[LIS302DL_REG_FF_WU_THS_2] =
-+                              reg_read(lis, LIS302DL_REG_FF_WU_THS_2);
-+      lis->regs[LIS302DL_REG_FF_WU_DURATION_2] =
-+                              reg_read(lis, LIS302DL_REG_FF_WU_DURATION_2);
-+      lis->regs[LIS302DL_REG_CLICK_CFG] =
-+                              reg_read(lis, LIS302DL_REG_CLICK_CFG);
-+      lis->regs[LIS302DL_REG_CLICK_THSY_X] =
-+                              reg_read(lis, LIS302DL_REG_CLICK_THSY_X);
-+      lis->regs[LIS302DL_REG_CLICK_THSZ] =
-+                              reg_read(lis, LIS302DL_REG_CLICK_THSZ);
-+      lis->regs[LIS302DL_REG_CLICK_TIME_LIMIT] =
-+                              reg_read(lis, LIS302DL_REG_CLICK_TIME_LIMIT);
-+      lis->regs[LIS302DL_REG_CLICK_LATENCY] =
-+                              reg_read(lis, LIS302DL_REG_CLICK_LATENCY);
-+      lis->regs[LIS302DL_REG_CLICK_WINDOW] =
-+                              reg_read(lis, LIS302DL_REG_CLICK_WINDOW);
-+
-+      /* determine if we want to wake up from the accel. */
-+      if (!(lis->flags & LIS302DL_F_WUP_FF ||
-+            lis->flags & LIS302DL_F_WUP_CLICK)) {
-+              /* power down */
-+              u_int8_t tmp;
-+              tmp = reg_read(lis, LIS302DL_REG_CTRL1);
-+              tmp &= ~LIS302DL_CTRL1_PD;
-+              reg_write(lis, LIS302DL_REG_CTRL1, tmp);
-+      }
-+
-+      return 0;
-+}
-+
-+static int lis302dl_resume(struct spi_device *spi)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-+
-+      /* restore registers after resume */
-+      reg_write(lis, LIS302DL_REG_CTRL1, lis->regs[LIS302DL_REG_CTRL1]);
-+      reg_write(lis, LIS302DL_REG_CTRL2, lis->regs[LIS302DL_REG_CTRL2]);
-+      reg_write(lis, LIS302DL_REG_CTRL3, lis->regs[LIS302DL_REG_CTRL3]);
-+      reg_write(lis, LIS302DL_REG_FF_WU_CFG_1,
-+                lis->regs[LIS302DL_REG_FF_WU_CFG_1]);
-+      reg_write(lis, LIS302DL_REG_FF_WU_THS_1,
-+                lis->regs[LIS302DL_REG_FF_WU_THS_1]);
-+      reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1,
-+                lis->regs[LIS302DL_REG_FF_WU_DURATION_1]);
-+      reg_write(lis, LIS302DL_REG_FF_WU_CFG_2,
-+                lis->regs[LIS302DL_REG_FF_WU_CFG_2]);
-+      reg_write(lis, LIS302DL_REG_FF_WU_THS_2,
-+                lis->regs[LIS302DL_REG_FF_WU_THS_2]);
-+      reg_write(lis, LIS302DL_REG_FF_WU_DURATION_2,
-+                lis->regs[LIS302DL_REG_FF_WU_DURATION_2]);
-+      reg_write(lis, LIS302DL_REG_CLICK_CFG,
-+                lis->regs[LIS302DL_REG_CLICK_CFG]);
-+      reg_write(lis, LIS302DL_REG_CLICK_THSY_X,
-+                lis->regs[LIS302DL_REG_CLICK_THSY_X]);
-+      reg_write(lis, LIS302DL_REG_CLICK_THSZ,
-+                lis->regs[LIS302DL_REG_CLICK_THSZ]);
-+      reg_write(lis, LIS302DL_REG_CLICK_TIME_LIMIT,
-+                lis->regs[LIS302DL_REG_CLICK_TIME_LIMIT]);
-+      reg_write(lis, LIS302DL_REG_CLICK_LATENCY,
-+                lis->regs[LIS302DL_REG_CLICK_LATENCY]);
-+      reg_write(lis, LIS302DL_REG_CLICK_WINDOW,
-+                lis->regs[LIS302DL_REG_CLICK_WINDOW]);
-+
-+      return 0;
-+}
-+#else
-+#define lis302dl_suspend      NULL
-+#define lis302dl_resume               NULL
-+#endif
-+
-+static struct spi_driver lis302dl_driver = {
-+      .driver = {
-+              .name   = "lis302dl",
-+              .owner  = THIS_MODULE,
-+      },
-+
-+      .probe   = lis302dl_probe,
-+      .remove  = __devexit_p(lis302dl_remove),
-+      .suspend = lis302dl_suspend,
-+      .resume  = lis302dl_resume,
-+};
-+
-+static int __init lis302dl_init(void)
-+{
-+      return spi_register_driver(&lis302dl_driver);
-+}
-+
-+static void __exit lis302dl_exit(void)
-+{
-+      spi_unregister_driver(&lis302dl_driver);
-+}
-+
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_LICENSE("GPL");
-+
-+module_init(lis302dl_init);
-+module_exit(lis302dl_exit);
-diff --git a/include/linux/lis302dl.h b/include/linux/lis302dl.h
-new file mode 100644
-index 0000000..d0f31be
---- /dev/null
-+++ b/include/linux/lis302dl.h
-@@ -0,0 +1,11 @@
-+#ifndef _LINUX_LIS302DL_H
-+#define _LINUX_LIS302DL_H
-+
-+#include <linux/types.h>
-+
-+struct lis302dl_platform_data {
-+      char *name;
-+};
-+
-+#endif /* _LINUX_LIS302DL_H */
-+
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1032-gta02-leds.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1032-gta02-leds.patch.patch
deleted file mode 100755 (executable)
index 5645c00..0000000
+++ /dev/null
@@ -1,276 +0,0 @@
-From fc22d87d11df9053f1a1b41b7b450c3af07b5059 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:46:56 +0100
-Subject: [PATCH] gta02-leds.patch
-
----
- drivers/leds/Kconfig              |    6 +
- drivers/leds/Makefile             |    1 +
- drivers/leds/leds-neo1973-gta02.c |  226 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 233 insertions(+), 0 deletions(-)
- create mode 100644 drivers/leds/leds-neo1973-gta02.c
-
-diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
-index 8c7d949..b6b1211 100644
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -153,6 +153,12 @@ config LEDS_NEO1973_VIBRATOR
-       help
-         This option enables support for the vibrator on the FIC Neo1973.
-+config LEDS_NEO1973_GTA02
-+      tristate "LED Support for the FIC Neo1973 (GTA02)"
-+      depends on LEDS_CLASS && MACH_NEO1973_GTA02
-+      help
-+        This option enables support for the LEDs on the FIC Neo1973.
-+
- comment "LED Triggers"
- config LEDS_TRIGGERS
-diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
-index 148fe51..3a9df6a 100644
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -22,6 +22,7 @@ obj-$(CONFIG_LEDS_CLEVO_MAIL)                += leds-clevo-mail.o
- obj-$(CONFIG_LEDS_HP6XX)              += leds-hp6xx.o
- obj-$(CONFIG_LEDS_FSG)                        += leds-fsg.o
- obj-$(CONFIG_LEDS_NEO1973_VIBRATOR)   += leds-neo1973-vibrator.o
-+obj-$(CONFIG_LEDS_NEO1973_GTA02)      += leds-neo1973-gta02.o
- # LED Triggers
- obj-$(CONFIG_LEDS_TRIGGER_TIMER)      += ledtrig-timer.o
-diff --git a/drivers/leds/leds-neo1973-gta02.c b/drivers/leds/leds-neo1973-gta02.c
-new file mode 100644
-index 0000000..bf1d540
---- /dev/null
-+++ b/drivers/leds/leds-neo1973-gta02.c
-@@ -0,0 +1,226 @@
-+/*
-+ * LED driver for the FIC Neo1973 GTA02 GSM phone
-+ *
-+ * (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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 version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/leds.h>
-+#include <asm/hardware.h>
-+#include <asm/mach-types.h>
-+#include <asm/arch/pwm.h>
-+#include <asm/arch/gta02.h>
-+#include <asm/plat-s3c/regs-timer.h>
-+
-+#define MAX_LEDS 3
-+#define COUNTER 256
-+
-+struct gta02_led_priv
-+{
-+      struct mutex mutex;
-+      struct led_classdev cdev;
-+      struct s3c2410_pwm pwm;
-+      unsigned int gpio;
-+      unsigned int has_pwm;
-+};
-+
-+struct gta02_led_bundle
-+{
-+      int num_leds;
-+      struct gta02_led_priv led[MAX_LEDS];
-+};
-+
-+static inline struct gta02_led_priv *to_priv(struct led_classdev *led_cdev)
-+{
-+      return container_of(led_cdev, struct gta02_led_priv, cdev);
-+}
-+
-+static inline struct gta02_led_bundle *to_bundle(struct led_classdev *led_cdev)
-+{
-+      return dev_get_drvdata(led_cdev->dev);
-+}
-+
-+static void gta02led_set(struct led_classdev *led_cdev,
-+              enum led_brightness value)
-+{
-+      struct gta02_led_priv *lp = to_priv(led_cdev);
-+
-+      /*
-+       * value == 255 -> 99% duty cycle (full power)
-+       * value == 128 -> 50% duty cycle (medium power)
-+       * value == 0 -> 0% duty cycle (zero power)
-+       */
-+      mutex_lock(&lp->mutex);
-+      if (lp->has_pwm) {
-+                      s3c2410_pwm_duty_cycle(value, &lp->pwm);
-+      } else {
-+              if (value)
-+                      s3c2410_gpio_setpin(lp->gpio, 1);
-+              else
-+                      s3c2410_gpio_setpin(lp->gpio, 0);
-+      }
-+      mutex_unlock(&lp->mutex);
-+}
-+
-+#ifdef CONFIG_PM
-+static int gta02led_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+      struct gta02_led_bundle *bundle = platform_get_drvdata(pdev);
-+      int i;
-+
-+      for (i = 0; i < bundle->num_leds; i++)
-+              led_classdev_suspend(&bundle->led[i].cdev);
-+
-+      return 0;
-+}
-+
-+static int gta02led_resume(struct platform_device *pdev)
-+{
-+      struct gta02_led_bundle *bundle = platform_get_drvdata(pdev);
-+      int i;
-+
-+      for (i = 0; i < bundle->num_leds; i++)
-+              led_classdev_resume(&bundle->led[i].cdev);
-+
-+      return 0;
-+}
-+#endif
-+
-+static int __init gta02led_probe(struct platform_device *pdev)
-+{
-+      int i, rc;
-+      struct gta02_led_bundle *bundle;
-+
-+      if (!machine_is_neo1973_gta02())
-+              return -EIO;
-+
-+      bundle = kzalloc(sizeof(struct gta02_led_bundle), GFP_KERNEL);
-+      if (!bundle)
-+              return -ENOMEM;
-+      platform_set_drvdata(pdev, bundle);
-+
-+      for (i = 0; i < pdev->num_resources; i++) {
-+              struct gta02_led_priv *lp;
-+              struct resource *r;
-+
-+              if (i >= MAX_LEDS)
-+                      break;
-+
-+              r = platform_get_resource(pdev, 0, i);
-+              if (!r || !r->start || !r->name)
-+                      continue;
-+
-+              lp = &bundle->led[i];
-+
-+              lp->gpio = r->start;
-+              lp->cdev.name = r->name;
-+              lp->cdev.brightness_set = gta02led_set;
-+
-+              switch (lp->gpio) {
-+              case S3C2410_GPB0:
-+                      lp->has_pwm = 1;
-+                      lp->pwm.timerid = PWM0;
-+                      s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB0_TOUT0);
-+                      break;
-+              case S3C2410_GPB1:
-+                      lp->has_pwm = 1;
-+                      lp->pwm.timerid = PWM1;
-+                      s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB1_TOUT1);
-+                      break;
-+              case S3C2410_GPB2:
-+                      lp->has_pwm = 1;
-+                      lp->pwm.timerid = PWM2;
-+                      s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB2_TOUT2);
-+                      break;
-+              case S3C2410_GPB3:
-+                      lp->has_pwm = 1;
-+                      lp->pwm.timerid = PWM3;
-+                      s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB3_TOUT3);
-+                      break;
-+              default:
-+                      break;
-+              }
-+
-+              lp->pwm.prescaler = 0;
-+              lp->pwm.divider = S3C2410_TCFG1_MUX3_DIV8;
-+              lp->pwm.counter = COUNTER;
-+              lp->pwm.comparer = COUNTER;
-+              s3c2410_pwm_enable(&lp->pwm);
-+              s3c2410_pwm_start(&lp->pwm);
-+
-+              switch (lp->gpio) {
-+              case S3C2410_GPB0:
-+              case S3C2410_GPB1:
-+              case S3C2410_GPB2:
-+                      lp->has_pwm = 0;
-+                      s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPIO_OUTPUT);
-+                      s3c2410_gpio_setpin(lp->gpio, 0);
-+                      break;
-+              default:
-+                      break;
-+              }
-+
-+              mutex_init(&lp->mutex);
-+              rc = led_classdev_register(&pdev->dev, &lp->cdev);
-+      }
-+
-+      return 0;
-+}
-+
-+static int gta02led_remove(struct platform_device *pdev)
-+{
-+      struct gta02_led_bundle *bundle = platform_get_drvdata(pdev);
-+      int i;
-+
-+      for (i = 0; i < bundle->num_leds; i++) {
-+              struct gta02_led_priv *lp = &bundle->led[i];
-+              if (lp->has_pwm)
-+                      s3c2410_pwm_disable(&lp->pwm);
-+
-+              led_classdev_unregister(&lp->cdev);
-+              mutex_destroy(&lp->mutex);
-+      }
-+
-+      platform_set_drvdata(pdev, NULL);
-+      kfree(bundle);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver gta02led_driver = {
-+      .probe          = gta02led_probe,
-+      .remove         = gta02led_remove,
-+#ifdef CONFIG_PM
-+      .suspend        = gta02led_suspend,
-+      .resume         = gta02led_resume,
-+#endif
-+      .driver         = {
-+              .name           = "gta02-led",
-+      },
-+};
-+
-+static int __init gta02led_init(void)
-+{
-+      return platform_driver_register(&gta02led_driver);
-+}
-+
-+static void __exit gta02led_exit(void)
-+{
-+      platform_driver_unregister(&gta02led_driver);
-+}
-+
-+module_init(gta02led_init);
-+module_exit(gta02led_exit);
-+
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_DESCRIPTION("FIC Neo1973 GTA02 LED driver");
-+MODULE_LICENSE("GPL");
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1033-gta02-acc.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1033-gta02-acc.patch.patch
deleted file mode 100755 (executable)
index a468390..0000000
+++ /dev/null
@@ -1,1035 +0,0 @@
-From 0f43da072e28d0bad639cb6823a7759112ff3489 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:46:56 +0100
-Subject: [PATCH] gta02-acc.patch
-
----
- arch/arm/mach-s3c2410/mach-gta01.c      |    2 +-
- arch/arm/mach-s3c2410/mach-qt2410.c     |    2 +-
- arch/arm/mach-s3c2440/mach-gta02.c      |  181 +++++++++++++++--
- drivers/input/misc/lis302dl.c           |  350 ++++++++++++-------------------
- drivers/spi/spi_s3c24xx_gpio.c          |   23 ++-
- include/asm-arm/arch-s3c2410/spi-gpio.h |    6 +-
- include/linux/lis302dl.h                |  102 +++++++++
- 7 files changed, 429 insertions(+), 237 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index 87bb189..0543daa 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -510,7 +510,7 @@ static struct spi_board_info gta01_spi_board_info[] = {
-       },
- };
--static void spi_gpio_cs(struct s3c2410_spigpio_info *spi, int cs)
-+static void spi_gpio_cs(struct s3c2410_spigpio_info *spi, int csidx, int cs)
- {
-       switch (cs) {
-       case BITBANG_CS_ACTIVE:
-diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c
-index a1caf4b..6f7b56d 100644
---- a/arch/arm/mach-s3c2410/mach-qt2410.c
-+++ b/arch/arm/mach-s3c2410/mach-qt2410.c
-@@ -214,7 +214,7 @@ static struct platform_device qt2410_led = {
- /* SPI */
--static void spi_gpio_cs(struct s3c2410_spigpio_info *spi, int cs)
-+static void spi_gpio_cs(struct s3c2410_spigpio_info *spi, int csidx, int cs)
- {
-       switch (cs) {
-       case BITBANG_CS_ACTIVE:
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index d11da10..3fbb131 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -78,6 +78,9 @@
- #include <linux/glamofb.h>
-+/* arbitrates which sensor IRQ owns the shared SPI bus */
-+static spinlock_t motion_irq_lock;
-+
- static struct map_desc gta02_iodesc[] __initdata = {
-       {
-               .virtual        = 0xe0000000,
-@@ -377,8 +380,6 @@ static struct platform_device *gta02_devices[] __initdata = {
-       &s3c_device_usbgadget,
-       &s3c_device_nand,
-       &s3c_device_ts,
--      &s3c_device_spi0,
--      &s3c_device_spi1,
-       &gta02_nor_flash,
- };
-@@ -478,10 +479,12 @@ static struct spi_board_info gta02_spi_board_info[] = {
-       },
- };
-+#if 0 /* currently this is not used and we use gpio spi */
- static struct glamo_spi_info glamo_spi_cfg = {
-       .board_size     = ARRAY_SIZE(gta02_spi_board_info),
-       .board_info     = gta02_spi_board_info,
- };
-+#endif /* 0 */
- static struct glamo_spigpio_info glamo_spigpio_cfg = {
-       .pin_clk        = GLAMO_GPIO10_OUTPUT,
-@@ -507,16 +510,99 @@ static struct platform_device gta01_led_dev = {
- /* SPI: Accelerometers attached to SPI of s3c244x */
--static void gta02_spi_acc_set_cs(struct s3c2410_spi_info *spi, int cs, int pol)
-+/*
-+ * Situation is that Linux SPI can't work in an interrupt context, so we
-+ * implement our own bitbang here.  Arbitration is needed because not only
-+ * can this interrupt happen at any time even if foreground wants to use
-+ * the bitbang API from Linux, but multiple motion sensors can be on the
-+ * same SPI bus, and multiple interrupts can happen.
-+ *
-+ * Foreground / interrupt arbitration is okay because the interrupts are
-+ * disabled around all the foreground SPI code.
-+ *
-+ * Interrupt / Interrupt arbitration is evidently needed, otherwise we
-+ * lose edge-triggered service after a while due to the two sensors sharing
-+ * the SPI bus having irqs at the same time eventually.
-+ *
-+ * Servicing is typ 75 - 100us at 400MHz.
-+ */
-+
-+/* #define DEBUG_SPEW_MS */
-+#define MG_PER_SAMPLE 18
-+
-+void gat02_lis302dl_bitbang_read(struct lis302dl_info *lis)
- {
--      s3c2410_gpio_setpin(cs, pol);
-+      struct lis302dl_platform_data *pdata = lis->pdata;
-+      u8 shifter = 0xc0 | LIS302DL_REG_OUT_X; /* read, autoincrement */
-+      int n, n1;
-+      unsigned long flags;
-+#ifdef DEBUG_SPEW_MS
-+      s8 x, y, z;
-+#endif
-+
-+      spin_lock_irqsave(&motion_irq_lock, flags);
-+      s3c2410_gpio_setpin(pdata->pin_chip_select, 0);
-+      for (n = 0; n < 8; n++) { /* write the r/w, inc and address */
-+              s3c2410_gpio_setpin(pdata->pin_clk, 0);
-+              s3c2410_gpio_setpin(pdata->pin_mosi, (shifter >> 7) & 1);
-+              s3c2410_gpio_setpin(pdata->pin_clk, 1);
-+              shifter <<= 1;
-+      }
-+      for (n = 0; n < 5; n++) { /* 5 consequetive registers */
-+              for (n1 = 0; n1 < 8; n1++) { /* 8 bits each */
-+                      s3c2410_gpio_setpin(pdata->pin_clk, 0);
-+                      s3c2410_gpio_setpin(pdata->pin_clk, 1);
-+                      shifter <<= 1;
-+                      if (s3c2410_gpio_getpin(pdata->pin_miso))
-+                              shifter |= 1;
-+              }
-+              switch (n) {
-+              case 0:
-+#ifdef DEBUG_SPEW_MS
-+                      x = shifter;
-+#endif
-+                      input_report_rel(lis->input_dev, REL_X, MG_PER_SAMPLE * (s8)shifter);
-+                      break;
-+              case 2:
-+#ifdef DEBUG_SPEW_MS
-+                      y = shifter;
-+#endif
-+                      input_report_rel(lis->input_dev, REL_Y, MG_PER_SAMPLE * (s8)shifter);
-+                      break;
-+              case 4:
-+#ifdef DEBUG_SPEW_MS
-+                      z = shifter;
-+#endif
-+                      input_report_rel(lis->input_dev, REL_Z, MG_PER_SAMPLE * (s8)shifter);
-+                      break;
-+              }
-+      }
-+      s3c2410_gpio_setpin(pdata->pin_chip_select, 1);
-+      spin_unlock_irqrestore(&motion_irq_lock, flags);
-+      input_sync(lis->input_dev);
-+#ifdef DEBUG_SPEW_MS
-+      printk("%s: %d %d %d\n", pdata->name, x, y, z);
-+#endif
- }
--static const struct lis302dl_platform_data lis302_pdata[] = {
-+
-+struct lis302dl_platform_data lis302_pdata[] = {
-       {
--              .name           = "lis302-1 (top)"
-+              .name           = "lis302-1 (top)",
-+              .pin_chip_select= S3C2410_GPD12,
-+              .pin_clk        = S3C2410_GPG7,
-+              .pin_mosi       = S3C2410_GPG6,
-+              .pin_miso       = S3C2410_GPG5,
-+              .open_drain     = 1, /* altered at runtime by PCB rev */
-+              .lis302dl_bitbang_read = gat02_lis302dl_bitbang_read,
-       }, {
--              .name           = "lis302-2 (bottom)"
-+              .name           = "lis302-2 (bottom)",
-+              .pin_chip_select= S3C2410_GPD13,
-+              .pin_clk        = S3C2410_GPG7,
-+              .pin_mosi       = S3C2410_GPG6,
-+              .pin_miso       = S3C2410_GPG5,
-+              .open_drain     = 1, /* altered at runtime by PCB rev */
-+              .lis302dl_bitbang_read = gat02_lis302dl_bitbang_read,
-       },
- };
-@@ -525,26 +611,75 @@ static struct spi_board_info gta02_spi_acc_bdinfo[] = {
-               .modalias       = "lis302dl",
-               .platform_data  = &lis302_pdata[0],
-               .irq            = GTA02_IRQ_GSENSOR_1,
--              .max_speed_hz   = 400 * 1000,
-+              .max_speed_hz   = 10 * 1000 * 1000,
-               .bus_num        = 1,
--              .chip_select    = S3C2410_GPD12,
-+              .chip_select    = 0,
-               .mode           = SPI_MODE_3,
-       },
-       {
-               .modalias       = "lis302dl",
-               .platform_data  = &lis302_pdata[1],
-               .irq            = GTA02_IRQ_GSENSOR_2,
--              .max_speed_hz   = 400 * 1000,
-+              .max_speed_hz   = 10 * 1000 * 1000,
-               .bus_num        = 1,
--              .chip_select    = S3C2410_GPD13,
-+              .chip_select    = 1,
-               .mode           = SPI_MODE_3,
-       },
- };
--static struct s3c2410_spi_info gta02_spi_acc_cfg = {
--      .set_cs         = gta02_spi_acc_set_cs,
-+static void spi_acc_cs(struct s3c2410_spigpio_info *spigpio_info,
-+                     int csid, int cs)
-+{
-+      struct lis302dl_platform_data * plat_data =
-+                              (struct lis302dl_platform_data *)spigpio_info->
-+                                                   board_info->platform_data;
-+      switch (cs) {
-+      case BITBANG_CS_ACTIVE:
-+              s3c2410_gpio_setpin(plat_data[csid].pin_chip_select, 0);
-+              break;
-+      case BITBANG_CS_INACTIVE:
-+              s3c2410_gpio_setpin(plat_data[csid].pin_chip_select, 1);
-+              break;
-+      }
-+}
-+
-+static struct s3c2410_spigpio_info spi_gpio_cfg = {
-+      .pin_clk        = S3C2410_GPG7,
-+      .pin_mosi       = S3C2410_GPG6,
-+      .pin_miso       = S3C2410_GPG5,
-       .board_size     = ARRAY_SIZE(gta02_spi_acc_bdinfo),
-       .board_info     = gta02_spi_acc_bdinfo,
-+      .chip_select    = &spi_acc_cs,
-+      .num_chipselect = 2,
-+};
-+
-+static struct resource s3c_spi_acc_resource[] = {
-+      [0] = {
-+              .start = S3C2410_GPG3,
-+              .end   = S3C2410_GPG3,
-+      },
-+      [1] = {
-+              .start = S3C2410_GPG5,
-+              .end   = S3C2410_GPG5,
-+      },
-+      [2] = {
-+              .start = S3C2410_GPG6,
-+              .end   = S3C2410_GPG6,
-+      },
-+      [3] = {
-+              .start = S3C2410_GPG7,
-+              .end   = S3C2410_GPG7,
-+      },
-+};
-+
-+static struct platform_device s3c_device_spi_acc = {
-+      .name             = "spi_s3c24xx_gpio",
-+      .id               = 1,
-+      .num_resources    = ARRAY_SIZE(s3c_spi_acc_resource),
-+      .resource         = s3c_spi_acc_resource,
-+      .dev = {
-+              .platform_data = &spi_gpio_cfg,
-+      },
- };
- static struct resource gta02_led_resources[] = {
-@@ -786,10 +921,21 @@ static void __init gta02_machine_init(void)
- {
-       int rc;
-+      switch (system_rev) {
-+      case GTA02v6_SYSTEM_REV:
-+              /* we need push-pull interrupt from motion sensors */
-+              lis302_pdata[0].open_drain = 0;
-+              lis302_pdata[1].open_drain = 0;
-+              break;
-+      default:
-+              break;
-+      }
-+
-+      spin_lock_init(&motion_irq_lock);
-+
-       s3c_device_usb.dev.platform_data = &gta02_usb_info;
-       s3c_device_nand.dev.platform_data = &gta02_nand_info;
-       s3c_device_sdi.dev.platform_data = &gta02_mmc_cfg;
--      s3c_device_spi1.dev.platform_data = &gta02_spi_acc_cfg;
-       /* Only GTA02v1 has a SD_DETECT GPIO.  Since the slot is not
-        * hot-pluggable, this is not required anyway */
-@@ -801,6 +947,12 @@ static void __init gta02_machine_init(void)
-               break;
-       }
-+      /* acc sensor chip selects */
-+      s3c2410_gpio_setpin(S3C2410_GPD12, 1);
-+      s3c2410_gpio_cfgpin(S3C2410_GPD12, S3C2410_GPIO_OUTPUT);
-+      s3c2410_gpio_setpin(S3C2410_GPD13, 1);
-+      s3c2410_gpio_cfgpin(S3C2410_GPD13, S3C2410_GPIO_OUTPUT);
-+
-       INIT_WORK(&gta02_udc_vbus_drawer.work, __gta02_udc_vbus_draw);
-       s3c24xx_udc_set_platdata(&gta02_udc_cfg);
-       set_s3c2410ts_info(&gta02_ts_cfg);
-@@ -829,6 +981,7 @@ static void __init gta02_machine_init(void)
-               break;
-       }
-+      platform_device_register(&s3c_device_spi_acc);
-       platform_device_register(&gta01_button_dev);
-       platform_device_register(&gta01_pm_gsm_dev);
-diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
-index 45c41c8..36bdcf7 100644
---- a/drivers/input/misc/lis302dl.c
-+++ b/drivers/input/misc/lis302dl.c
-@@ -33,117 +33,26 @@
- #include <linux/device.h>
- #include <linux/platform_device.h>
- #include <linux/delay.h>
--#include <linux/input.h>
- #include <linux/irq.h>
- #include <linux/interrupt.h>
- #include <linux/sysfs.h>
- #include <linux/lis302dl.h>
--#include <linux/spi/spi.h>
--
--#define LIS302DL_WHO_AM_I_MAGIC               0x3b
--
--enum lis302dl_reg {
--      LIS302DL_REG_WHO_AM_I           = 0x0f,
--      LIS302DL_REG_CTRL1              = 0x20,
--      LIS302DL_REG_CTRL2              = 0x21,
--      LIS302DL_REG_CTRL3              = 0x22,
--      LIS302DL_REG_HP_FILTER_RESET    = 0x23,
--      LIS302DL_REG_STATUS             = 0x27,
--      LIS302DL_REG_OUT_X              = 0x29,
--      LIS302DL_REG_OUT_Y              = 0x2b,
--      LIS302DL_REG_OUT_Z              = 0x2d,
--      LIS302DL_REG_FF_WU_CFG_1        = 0x30,
--      LIS302DL_REG_FF_WU_SRC_1        = 0x31,
--      LIS302DL_REG_FF_WU_THS_1        = 0x32,
--      LIS302DL_REG_FF_WU_DURATION_1   = 0x33,
--      LIS302DL_REG_FF_WU_CFG_2        = 0x34,
--      LIS302DL_REG_FF_WU_SRC_2        = 0x35,
--      LIS302DL_REG_FF_WU_THS_2        = 0x36,
--      LIS302DL_REG_FF_WU_DURATION_2   = 0x37,
--      LIS302DL_REG_CLICK_CFG          = 0x38,
--      LIS302DL_REG_CLICK_SRC          = 0x39,
--      LIS302DL_REG_CLICK_THSY_X       = 0x3b,
--      LIS302DL_REG_CLICK_THSZ         = 0x3c,
--      LIS302DL_REG_CLICK_TIME_LIMIT   = 0x3d,
--      LIS302DL_REG_CLICK_LATENCY      = 0x3e,
--      LIS302DL_REG_CLICK_WINDOW       = 0x3f,
--};
--
--enum lis302dl_reg_ctrl1 {
--      LIS302DL_CTRL1_Xen              = 0x01,
--      LIS302DL_CTRL1_Yen              = 0x02,
--      LIS302DL_CTRL1_Zen              = 0x04,
--      LIS302DL_CTRL1_STM              = 0x08,
--      LIS302DL_CTRL1_STP              = 0x10,
--      LIS302DL_CTRL1_FS               = 0x20,
--      LIS302DL_CTRL1_PD               = 0x40,
--      LIS302DL_CTRL1_DR               = 0x80,
--};
--
--enum lis302dl_reg_ctrl3 {
--      LIS302DL_CTRL3_PP_OD            = 0x40,
--};
--
--enum lis302dl_reg_status {
--      LIS302DL_STATUS_XDA             = 0x01,
--      LIS302DL_STATUS_YDA             = 0x02,
--      LIS302DL_STATUS_ZDA             = 0x04,
--      LIS302DL_STATUS_XYZDA           = 0x08,
--      LIS302DL_STATUS_XOR             = 0x10,
--      LIS302DL_STATUS_YOR             = 0x20,
--      LIS302DL_STATUS_ZOR             = 0x40,
--      LIS302DL_STATUS_XYZOR           = 0x80,
--};
--
--enum lis302dl_reg_ffwusrc1 {
--      LIS302DL_FFWUSRC1_XL            = 0x01,
--      LIS302DL_FFWUSRC1_XH            = 0x02,
--      LIS302DL_FFWUSRC1_YL            = 0x04,
--      LIS302DL_FFWUSRC1_YH            = 0x08,
--      LIS302DL_FFWUSRC1_ZL            = 0x10,
--      LIS302DL_FFWUSRC1_ZH            = 0x20,
--      LIS302DL_FFWUSRC1_IA            = 0x40,
--};
--
--enum lis302dl_reg_cloik_src {
--      LIS302DL_CLICKSRC_SINGLE_X      = 0x01,
--      LIS302DL_CLICKSRC_DOUBLE_X      = 0x02,
--      LIS302DL_CLICKSRC_SINGLE_Y      = 0x04,
--      LIS302DL_CLICKSRC_DOUBLE_Y      = 0x08,
--      LIS302DL_CLICKSRC_SINGLE_Z      = 0x10,
--      LIS302DL_CLICKSRC_DOUBLE_Z      = 0x20,
--      LIS302DL_CLICKSRC_IA            = 0x40,
--};
--
--struct lis302dl_info {
--      struct spi_device *spi_dev;
--      struct input_dev *input_dev;
--      struct mutex lock;
--      struct work_struct work;
--      unsigned int flags;
--      unsigned int working;
--      u_int8_t regs[0x40];
--};
--
--#define LIS302DL_F_WUP_FF             0x0001  /* wake up from free fall */
--#define LIS302DL_F_WUP_CLICK          0x0002
--#define LIS302DL_F_POWER              0x0010
--#define LIS302DL_F_FS                 0x0020  /* ADC full scale */
--
- /* lowlevel register access functions */
--#define READ_BIT      0x01
--#define MS_BIT                0x02
--#define ADDR_SHIFT    2
-+#define READ_BIT              0x80
-+#define READ_BIT_INC_ADS      0xc0
-+#define       ADDR_MASK               0x3f
--static inline u_int8_t __reg_read(struct lis302dl_info *lis, u_int8_t reg)
-+static u_int8_t __reg_read(struct lis302dl_info *lis, u_int8_t reg)
- {
-       int rc;
-       u_int8_t cmd;
--      cmd = (reg << ADDR_SHIFT) | READ_BIT;
-+      BUG_ON(reg & ~ADDR_MASK);
-+
-+      cmd = reg | READ_BIT;
-       rc = spi_w8r8(lis->spi_dev, cmd);
-@@ -161,11 +70,13 @@ static u_int8_t reg_read(struct lis302dl_info *lis, u_int8_t reg)
-       return ret;
- }
--static inline int __reg_write(struct lis302dl_info *lis, u_int8_t reg, u_int8_t val)
-+static int __reg_write(struct lis302dl_info *lis, u_int8_t reg, u_int8_t val)
- {
-       u_int8_t buf[2];
--      buf[0] = (reg << ADDR_SHIFT);
-+      BUG_ON(reg & ~ADDR_MASK);
-+
-+      buf[0] = reg;
-       buf[1] = val;
-       return spi_write(lis->spi_dev, buf, sizeof(buf));
-@@ -207,10 +118,10 @@ static int reg_set_bit_mask(struct lis302dl_info *lis,
- enum lis302dl_intmode {
-       LIS302DL_INTMODE_GND            = 0x00,
-       LIS302DL_INTMODE_FF_WU_1        = 0x01,
--      LIX302DL_INTMODE_FF_WU_2        = 0x02,
--      LIX302DL_INTMODE_FF_WU_12       = 0x03,
--      LIX302DL_INTMODE_DATA_READY     = 0x04,
--      LIX302DL_INTMODE_CLICK          = 0x07,
-+      LIS302DL_INTMODE_FF_WU_2        = 0x02,
-+      LIS302DL_INTMODE_FF_WU_12       = 0x03,
-+      LIS302DL_INTMODE_DATA_READY     = 0x04,
-+      LIS302DL_INTMODE_CLICK          = 0x07,
- };
- static void lis302dl_int_mode(struct spi_device *spi, int int_pin,
-@@ -218,12 +129,18 @@ static void lis302dl_int_mode(struct spi_device *spi, int int_pin,
- {
-       struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
--      if (int_pin == 1)
-+      switch (int_pin) {
-+      case 1:
-               reg_set_bit_mask(lis, LIS302DL_REG_CTRL3, 0x07, mode);
--      else if (int_pin == 2)
-+              break;
-+      case 2:
-               reg_set_bit_mask(lis, LIS302DL_REG_CTRL3, 0x38, mode << 3);
-+              break;
-+      default:
-+              BUG();
-+      }
- }
--
-+#if 0
- static void _report_btn_single(struct input_dev *inp, int btn)
- {
-       input_report_key(inp, btn, 1);
-@@ -241,95 +158,14 @@ static void _report_btn_double(struct input_dev *inp, int btn)
-       input_sync(inp);
-       input_report_key(inp, btn, 0);
- }
-+#endif
--static void lis302dl_work(struct work_struct *work)
--{
--      struct lis302dl_info *lis =
--                      container_of(work, struct lis302dl_info, work);
--
--      u_int8_t status, ff_wu_src_1, click_src;
--      u_int8_t val;
--
--      lis->working = 1;
--
--      status = reg_read(lis, LIS302DL_REG_STATUS);
--      ff_wu_src_1 = reg_read(lis, LIS302DL_REG_FF_WU_SRC_1);
--      click_src = reg_read(lis, LIS302DL_REG_CLICK_SRC);
--
--      if (status & LIS302DL_STATUS_XDA) {
--              val = reg_read(lis, LIS302DL_REG_OUT_X);
--              if (lis->flags & LIS302DL_F_FS)
--                      val = val << 2;
--              input_report_rel(lis->input_dev, REL_X, val);
--      }
--
--      if (status & LIS302DL_STATUS_YDA) {
--              val = reg_read(lis, LIS302DL_REG_OUT_Y);
--              if (lis->flags & LIS302DL_F_FS)
--                      val = val << 2;
--              input_report_rel(lis->input_dev, REL_Y, val);
--      }
--
--      if (status & LIS302DL_STATUS_ZDA) {
--              val = reg_read(lis, LIS302DL_REG_OUT_Z);
--              if (lis->flags & LIS302DL_F_FS)
--                      val = val << 2;
--              input_report_rel(lis->input_dev, REL_Z, val);
--      }
--
--      if (status & 0xf0)
--              dev_dbg(&lis->spi_dev->dev, "overrun!\n");
--
--      /* FIXME: implement overrun statistics */
--
--      if (ff_wu_src_1 & LIS302DL_FFWUSRC1_IA) {
--              /* FIXME: free fall interrupt handling */
--      }
--
--      if (click_src & LIS302DL_CLICKSRC_IA) {
--              if (click_src & LIS302DL_CLICKSRC_SINGLE_X)
--                      _report_btn_single(lis->input_dev, BTN_X);
--              if (click_src & LIS302DL_CLICKSRC_DOUBLE_X)
--                      _report_btn_double(lis->input_dev, BTN_X);
--
--              if (click_src & LIS302DL_CLICKSRC_SINGLE_Y)
--                      _report_btn_single(lis->input_dev, BTN_Y);
--              if (click_src & LIS302DL_CLICKSRC_DOUBLE_Y)
--                      _report_btn_double(lis->input_dev, BTN_Y);
--
--              if (click_src & LIS302DL_CLICKSRC_SINGLE_Z)
--                      _report_btn_single(lis->input_dev, BTN_Z);
--              if (click_src & LIS302DL_CLICKSRC_DOUBLE_Z)
--                      _report_btn_double(lis->input_dev, BTN_Z);
--      }
--
--      lis->working = 0;
--      input_sync(lis->input_dev);
--      put_device(&lis->spi_dev->dev);
--
--      enable_irq(lis->spi_dev->irq);
--}
--
--static void lis302dl_schedule_work(struct lis302dl_info *lis)
--{
--      int status;
--
--      get_device(&lis->spi_dev->dev);
--      status = schedule_work(&lis->work);
--      if (!status && !lis->working)
--              dev_dbg(&lis->spi_dev->dev, "work item may be lost\n");
--}
- static irqreturn_t lis302dl_interrupt(int irq, void *_lis)
- {
-       struct lis302dl_info *lis = _lis;
--      lis302dl_schedule_work(lis);
--
--      /* Disable any further interrupts until we have processed
--       * the current one */
--      disable_irq(lis->spi_dev->irq);
--
-+      (lis->pdata->lis302dl_bitbang_read)(lis);
-       return IRQ_HANDLED;
- }
-@@ -388,6 +224,7 @@ static DEVICE_ATTR(full_scale, S_IRUGO | S_IWUSR, show_scale, set_scale);
- static struct attribute *lis302dl_sysfs_entries[] = {
-       &dev_attr_sample_rate.attr,
-       &dev_attr_full_scale.attr,
-+      NULL
- };
- static struct attribute_group lis302dl_attr_group = {
-@@ -402,9 +239,16 @@ static int lis302dl_input_open(struct input_dev *inp)
-       struct lis302dl_info *lis = inp->private;
-       u_int8_t ctrl1 = LIS302DL_CTRL1_PD | LIS302DL_CTRL1_Xen |
-                        LIS302DL_CTRL1_Yen | LIS302DL_CTRL1_Zen;
-+      unsigned long flags;
-+      local_save_flags(flags);
-       /* make sure we're powered up and generate data ready */
-       reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, ctrl1, ctrl1);
-+      local_irq_restore(flags);
-+
-+      /* kick it off -- since we are edge triggered, if we missed the edge
-+       * permanent low interrupt is death for us */
-+      (lis->pdata->lis302dl_bitbang_read)(lis);
-       return 0;
- }
-@@ -414,9 +258,12 @@ static void lis302dl_input_close(struct input_dev *inp)
-       struct lis302dl_info *lis = inp->private;
-       u_int8_t ctrl1 = LIS302DL_CTRL1_Xen | LIS302DL_CTRL1_Yen |
-                        LIS302DL_CTRL1_Zen;
-+      unsigned long flags;
-+
-+      local_save_flags(flags);
-       /* since the input core already serializes access and makes sure we
--       * only see close() for the close of the lastre user, we can safely
-+       * only see close() for the close of the last user, we can safely
-        * disable the data ready events */
-       reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, ctrl1, 0x00);
-@@ -426,6 +273,7 @@ static void lis302dl_input_close(struct input_dev *inp)
-               reg_set_bit_mask(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD,
-                                0x00);
-       }
-+      local_irq_restore(flags);
- }
- static int __devinit lis302dl_probe(struct spi_device *spi)
-@@ -433,84 +281,138 @@ static int __devinit lis302dl_probe(struct spi_device *spi)
-       int rc;
-       struct lis302dl_info *lis;
-       u_int8_t wai;
-+      unsigned long flags;
-+      struct lis302dl_platform_data *pdata;
-       lis = kzalloc(sizeof(*lis), GFP_KERNEL);
-       if (!lis)
-               return -ENOMEM;
-+      local_save_flags(flags);
-+
-       mutex_init(&lis->lock);
--      INIT_WORK(&lis->work, lis302dl_work);
-       lis->spi_dev = spi;
-       spi_set_drvdata(spi, lis);
-+      pdata = spi->dev.platform_data;
-+
-       rc = spi_setup(spi);
-       if (rc < 0) {
--              printk(KERN_ERR "error durign spi_setup of lis302dl driver\n");
-+              dev_err(&spi->dev, "error during spi_setup\n");
-               dev_set_drvdata(&spi->dev, NULL);
--              kfree(lis);
--              return rc;
-+              goto bail_free_lis;
-       }
-       wai = reg_read(lis, LIS302DL_REG_WHO_AM_I);
-       if (wai != LIS302DL_WHO_AM_I_MAGIC) {
--              printk(KERN_ERR "unknown who_am_i signature 0x%02x\n", wai);
-+              dev_err(&spi->dev, "unknown who_am_i signature 0x%02x\n", wai);
-               dev_set_drvdata(&spi->dev, NULL);
--              kfree(lis);
--              return -ENODEV;
--      }
--
--      /* switch interrupt to open collector */
--      reg_write(lis, LIS302DL_CTRL3_PP_OD, 0x7c);
--
--      rc = request_irq(lis->spi_dev->irq, lis302dl_interrupt, IRQF_DISABLED,
--                       "lis302dl", NULL);
--      if (rc < 0) {
--              dev_err(&spi->dev, "error requesting IRQ %d\n",
--                      lis->spi_dev->irq);
--              /* FIXME */
--              return rc;
-+              rc = -ENODEV;
-+              goto bail_free_lis;
-       }
-       rc = sysfs_create_group(&spi->dev.kobj, &lis302dl_attr_group);
-       if (rc) {
-               dev_err(&spi->dev, "error creating sysfs group\n");
--              /* FIXME */
--              return rc;
-+              goto bail_free_lis;
-       }
-       /* initialize input layer details */
-       lis->input_dev = input_allocate_device();
-       if (!lis->input_dev) {
-               dev_err(&spi->dev, "Unable to allocate input device\n");
--              /* FIXME */
-+              goto bail_sysfs;
-       }
-       set_bit(EV_REL, lis->input_dev->evbit);
--      set_bit(EV_KEY, lis->input_dev->evbit);
-+      set_bit(REL_X, lis->input_dev->relbit);
-+      set_bit(REL_Y, lis->input_dev->relbit);
-+      set_bit(REL_Z, lis->input_dev->relbit);
-+/*    set_bit(EV_KEY, lis->input_dev->evbit);
-       set_bit(BTN_X, lis->input_dev->keybit);
-       set_bit(BTN_Y, lis->input_dev->keybit);
-       set_bit(BTN_Z, lis->input_dev->keybit);
--
-+*/
-       lis->input_dev->private = lis;
--      lis->input_dev->name = "lis302dl"; /* FIXME: platform data */
--      lis->input_dev->id.bustype = BUS_I2C; /* FIXME: SPI Bus */
-+      lis->input_dev->name = pdata->name;
-+       /* SPI Bus not defined as a valid bus for input subsystem*/
-+      lis->input_dev->id.bustype = BUS_I2C; /* lie about it */
-       lis->input_dev->open = lis302dl_input_open;
-       lis->input_dev->close = lis302dl_input_close;
--      input_register_device(lis->input_dev);
-+      rc = input_register_device(lis->input_dev);
-+      if (rc) {
-+              dev_err(&spi->dev, "error %d registering input device\n", rc);
-+              goto bail_inp_dev;
-+      }
-+
-+      reg_write(lis, LIS302DL_REG_CTRL1, 0x47);
-+      reg_write(lis, LIS302DL_REG_CTRL3, 0xc0);
-+      reg_write(lis, LIS302DL_REG_FF_WU_THS_1, 0x14);
-+      reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1, 0x00);
-+      reg_write(lis, LIS302DL_REG_FF_WU_CFG_1, 0x95);
-+
-+      reg_write(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_Xen |
-+                                         LIS302DL_CTRL1_Yen |
-+                                         LIS302DL_CTRL1_Zen);
-+
-+      if (pdata->open_drain)
-+              /* switch interrupt to open collector, active-low */
-+              reg_write(lis, LIS302DL_REG_CTRL3, LIS302DL_CTRL3_PP_OD |
-+                                                 LIS302DL_CTRL3_IHL);
-+      else
-+              /* push-pull, active-low */
-+              reg_write(lis, LIS302DL_REG_CTRL3, LIS302DL_CTRL3_IHL);
-+
-+      lis302dl_int_mode(spi, 1, LIS302DL_INTMODE_DATA_READY);
-+      lis302dl_int_mode(spi, 2, LIS302DL_INTMODE_DATA_READY);
-+
-+      reg_read(lis, LIS302DL_REG_STATUS);
-+      reg_read(lis, LIS302DL_REG_FF_WU_SRC_1);
-+      reg_read(lis, LIS302DL_REG_FF_WU_SRC_2);
-+      reg_read(lis, LIS302DL_REG_CLICK_SRC);
-+      dev_info(&spi->dev, "Found %s\n", pdata->name);
-+
-+      lis->pdata = pdata;
-+
-+      rc = request_irq(lis->spi_dev->irq, lis302dl_interrupt,
-+                       IRQF_TRIGGER_FALLING, "lis302dl", lis);
-+      if (rc < 0) {
-+              dev_err(&spi->dev, "error requesting IRQ %d\n",
-+                      lis->spi_dev->irq);
-+              goto bail_inp_reg;
-+      }
-+      local_irq_restore(flags);
-       return 0;
-+
-+bail_inp_reg:
-+      input_unregister_device(lis->input_dev);
-+bail_inp_dev:
-+      input_free_device(lis->input_dev);
-+bail_sysfs:
-+      sysfs_remove_group(&spi->dev.kobj, &lis302dl_attr_group);
-+bail_free_lis:
-+      kfree(lis);
-+      local_irq_restore(flags);
-+      return rc;
- }
- static int __devexit lis302dl_remove(struct spi_device *spi)
- {
-       struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-+      unsigned long flags;
-       /* power down the device */
-+      local_save_flags(flags);
-       reg_write(lis, LIS302DL_REG_CTRL1, 0x00);
-+      local_irq_restore(flags);
-+
-       sysfs_remove_group(&spi->dev.kobj, &lis302dl_attr_group);
-       input_unregister_device(lis->input_dev);
-+      if (lis->input_dev)
-+              input_free_device(lis->input_dev);
-       dev_set_drvdata(&spi->dev, NULL);
-       kfree(lis);
-@@ -521,6 +423,10 @@ static int __devexit lis302dl_remove(struct spi_device *spi)
- static int lis302dl_suspend(struct spi_device *spi, pm_message_t state)
- {
-       struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-+      unsigned long flags;
-+
-+      disable_irq(lis->spi_dev->irq);
-+      local_save_flags(flags);
-       /* save registers */
-       lis->regs[LIS302DL_REG_CTRL1] = reg_read(lis, LIS302DL_REG_CTRL1);
-@@ -561,12 +467,17 @@ static int lis302dl_suspend(struct spi_device *spi, pm_message_t state)
-               reg_write(lis, LIS302DL_REG_CTRL1, tmp);
-       }
-+      local_irq_restore(flags);
-+
-       return 0;
- }
- static int lis302dl_resume(struct spi_device *spi)
- {
-       struct lis302dl_info *lis = dev_get_drvdata(&spi->dev);
-+      unsigned long flags;
-+
-+      local_save_flags(flags);
-       /* restore registers after resume */
-       reg_write(lis, LIS302DL_REG_CTRL1, lis->regs[LIS302DL_REG_CTRL1]);
-@@ -597,6 +508,9 @@ static int lis302dl_resume(struct spi_device *spi)
-       reg_write(lis, LIS302DL_REG_CLICK_WINDOW,
-                 lis->regs[LIS302DL_REG_CLICK_WINDOW]);
-+      local_irq_restore(flags);
-+      enable_irq(lis->spi_dev->irq);
-+
-       return 0;
- }
- #else
-diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c
-index e33f614..ccadf35 100644
---- a/drivers/spi/spi_s3c24xx_gpio.c
-+++ b/drivers/spi/spi_s3c24xx_gpio.c
-@@ -91,7 +91,7 @@ static void s3c2410_spigpio_chipselect(struct spi_device *dev, int value)
-       struct s3c2410_spigpio *sg = spidev_to_sg(dev);
-       if (sg->info && sg->info->chip_select)
--              (sg->info->chip_select)(sg->info, value);
-+              (sg->info->chip_select)(sg->info, dev->chip_select, value);
- }
- static int s3c2410_spigpio_probe(struct platform_device *dev)
-@@ -100,6 +100,7 @@ static int s3c2410_spigpio_probe(struct platform_device *dev)
-       struct spi_master       *master;
-       struct s3c2410_spigpio  *sp;
-       int ret;
-+      int i;
-       master = spi_alloc_master(&dev->dev, sizeof(struct s3c2410_spigpio));
-       if (master == NULL) {
-@@ -112,9 +113,11 @@ static int s3c2410_spigpio_probe(struct platform_device *dev)
-       platform_set_drvdata(dev, sp);
--      /* copy in the plkatform data */
-+      /* copy in the platform data */
-       info = sp->info = dev->dev.platform_data;
-+      master->num_chipselect = info->num_chipselect;
-+
-       /* setup spi bitbang adaptor */
-       sp->bitbang.master = spi_master_get(master);
-       sp->bitbang.master->bus_num = info->bus_num;
-@@ -142,6 +145,22 @@ static int s3c2410_spigpio_probe(struct platform_device *dev)
-       if (ret)
-               goto err_no_bitbang;
-+      /* register the chips to go with the board */
-+
-+      for (i = 0; i < sp->info->board_size; i++) {
-+              struct spi_device *spidev;
-+
-+              dev_info(&dev->dev, "registering %p: %s\n",
-+                       &sp->info->board_info[i],
-+                       sp->info->board_info[i].modalias);
-+
-+              sp->info->board_info[i].controller_data = sp;
-+              spidev = spi_new_device(master, sp->info->board_info + i);
-+              if (spidev)
-+                      spidev->max_speed_hz =
-+                                        sp->info->board_info[i].max_speed_hz;
-+      }
-+
-       return 0;
-  err_no_bitbang:
-diff --git a/include/asm-arm/arch-s3c2410/spi-gpio.h b/include/asm-arm/arch-s3c2410/spi-gpio.h
-index 7380373..d4efc97 100644
---- a/include/asm-arm/arch-s3c2410/spi-gpio.h
-+++ b/include/asm-arm/arch-s3c2410/spi-gpio.h
-@@ -19,8 +19,12 @@ struct s3c2410_spigpio_info {
-       unsigned long            pin_miso;
-       int                      bus_num;
-+      int                      num_chipselect;
--      void (*chip_select)(struct s3c2410_spigpio_info *spi, int cs);
-+      unsigned long            board_size;
-+      struct spi_board_info   *board_info;
-+
-+      void (*chip_select)(struct s3c2410_spigpio_info *spi, int csid, int cs);
- };
-diff --git a/include/linux/lis302dl.h b/include/linux/lis302dl.h
-index d0f31be..2dea813 100644
---- a/include/linux/lis302dl.h
-+++ b/include/linux/lis302dl.h
-@@ -2,10 +2,112 @@
- #define _LINUX_LIS302DL_H
- #include <linux/types.h>
-+#include <linux/spi/spi.h>
-+#include <linux/input.h>
-+
-+
-+struct lis302dl_info;
- struct lis302dl_platform_data {
-       char *name;
-+      unsigned long pin_chip_select;
-+      unsigned long pin_clk;
-+      unsigned long pin_mosi;
-+      unsigned long pin_miso;
-+      int open_drain;
-+      void (*lis302dl_bitbang_read)(struct lis302dl_info *);
-+};
-+
-+struct lis302dl_info {
-+      struct lis302dl_platform_data *pdata;
-+      struct spi_device *spi_dev;
-+      struct input_dev *input_dev;
-+      struct mutex lock;
-+      unsigned int flags;
-+      u_int8_t regs[0x40];
-+};
-+
-+enum lis302dl_reg {
-+      LIS302DL_REG_WHO_AM_I           = 0x0f,
-+      LIS302DL_REG_CTRL1              = 0x20,
-+      LIS302DL_REG_CTRL2              = 0x21,
-+      LIS302DL_REG_CTRL3              = 0x22,
-+      LIS302DL_REG_HP_FILTER_RESET    = 0x23,
-+      LIS302DL_REG_STATUS             = 0x27,
-+      LIS302DL_REG_OUT_X              = 0x29,
-+      LIS302DL_REG_OUT_Y              = 0x2b,
-+      LIS302DL_REG_OUT_Z              = 0x2d,
-+      LIS302DL_REG_FF_WU_CFG_1        = 0x30,
-+      LIS302DL_REG_FF_WU_SRC_1        = 0x31,
-+      LIS302DL_REG_FF_WU_THS_1        = 0x32,
-+      LIS302DL_REG_FF_WU_DURATION_1   = 0x33,
-+      LIS302DL_REG_FF_WU_CFG_2        = 0x34,
-+      LIS302DL_REG_FF_WU_SRC_2        = 0x35,
-+      LIS302DL_REG_FF_WU_THS_2        = 0x36,
-+      LIS302DL_REG_FF_WU_DURATION_2   = 0x37,
-+      LIS302DL_REG_CLICK_CFG          = 0x38,
-+      LIS302DL_REG_CLICK_SRC          = 0x39,
-+      LIS302DL_REG_CLICK_THSY_X       = 0x3b,
-+      LIS302DL_REG_CLICK_THSZ         = 0x3c,
-+      LIS302DL_REG_CLICK_TIME_LIMIT   = 0x3d,
-+      LIS302DL_REG_CLICK_LATENCY      = 0x3e,
-+      LIS302DL_REG_CLICK_WINDOW       = 0x3f,
-+};
-+
-+enum lis302dl_reg_ctrl1 {
-+      LIS302DL_CTRL1_Xen              = 0x01,
-+      LIS302DL_CTRL1_Yen              = 0x02,
-+      LIS302DL_CTRL1_Zen              = 0x04,
-+      LIS302DL_CTRL1_STM              = 0x08,
-+      LIS302DL_CTRL1_STP              = 0x10,
-+      LIS302DL_CTRL1_FS               = 0x20,
-+      LIS302DL_CTRL1_PD               = 0x40,
-+      LIS302DL_CTRL1_DR               = 0x80,
-+};
-+
-+enum lis302dl_reg_ctrl3 {
-+      LIS302DL_CTRL3_PP_OD            = 0x40,
-+      LIS302DL_CTRL3_IHL              = 0x80,
- };
-+enum lis302dl_reg_status {
-+      LIS302DL_STATUS_XDA             = 0x01,
-+      LIS302DL_STATUS_YDA             = 0x02,
-+      LIS302DL_STATUS_ZDA             = 0x04,
-+      LIS302DL_STATUS_XYZDA           = 0x08,
-+      LIS302DL_STATUS_XOR             = 0x10,
-+      LIS302DL_STATUS_YOR             = 0x20,
-+      LIS302DL_STATUS_ZOR             = 0x40,
-+      LIS302DL_STATUS_XYZOR           = 0x80,
-+};
-+
-+enum lis302dl_reg_ffwusrc1 {
-+      LIS302DL_FFWUSRC1_XL            = 0x01,
-+      LIS302DL_FFWUSRC1_XH            = 0x02,
-+      LIS302DL_FFWUSRC1_YL            = 0x04,
-+      LIS302DL_FFWUSRC1_YH            = 0x08,
-+      LIS302DL_FFWUSRC1_ZL            = 0x10,
-+      LIS302DL_FFWUSRC1_ZH            = 0x20,
-+      LIS302DL_FFWUSRC1_IA            = 0x40,
-+};
-+
-+enum lis302dl_reg_cloik_src {
-+      LIS302DL_CLICKSRC_SINGLE_X      = 0x01,
-+      LIS302DL_CLICKSRC_DOUBLE_X      = 0x02,
-+      LIS302DL_CLICKSRC_SINGLE_Y      = 0x04,
-+      LIS302DL_CLICKSRC_DOUBLE_Y      = 0x08,
-+      LIS302DL_CLICKSRC_SINGLE_Z      = 0x10,
-+      LIS302DL_CLICKSRC_DOUBLE_Z      = 0x20,
-+      LIS302DL_CLICKSRC_IA            = 0x40,
-+};
-+
-+#define LIS302DL_WHO_AM_I_MAGIC               0x3b
-+
-+#define LIS302DL_F_WUP_FF             0x0001  /* wake up from free fall */
-+#define LIS302DL_F_WUP_CLICK          0x0002
-+#define LIS302DL_F_POWER              0x0010
-+#define LIS302DL_F_FS                 0x0020  /* ADC full scale */
-+
-+
- #endif /* _LINUX_LIS302DL_H */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1034-pcf506xx.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1034-pcf506xx.patch.patch
deleted file mode 100755 (executable)
index 0eeaf2f..0000000
+++ /dev/null
@@ -1,200 +0,0 @@
-From 4ced79a6699eb5828c71b5438826fb44e3b41997 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:46:56 +0100
-Subject: [PATCH] pcf506xx.patch
- Moved shared PMU code from pcf50606.h and pcf50633.h (which prevented inclusion
- of both at the same time) to pcf506xx.h
-
-- include/linux/pcf50606.h (struct pmu_voltage_rail, enum pmu_event, pmu_cb):
-  moved to pcf506xx.h
-- include/linux/pcf50633.h (struct pmu_voltage_rail, enum pmu_event, pmu_cb):
-  moved to pcf506xx.h
-
-Signed off-by: Werner Almesberger <werner@openmoko.org>
----
- drivers/i2c/chips/pcf50606.c |   28 +++++++++++++++++++++++++++-
- include/linux/pcf50606.h     |   23 +++--------------------
- include/linux/pcf50633.h     |   27 +++------------------------
- include/linux/pcf506xx.h     |   31 +++++++++++++++++++++++++++++++
- 4 files changed, 64 insertions(+), 45 deletions(-)
- create mode 100644 include/linux/pcf506xx.h
-
-diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
-index 6626c68..b530583 100644
---- a/drivers/i2c/chips/pcf50606.c
-+++ b/drivers/i2c/chips/pcf50606.c
-@@ -102,6 +102,7 @@ struct pcf50606_data {
-       int allow_close;
-       int onkey_seconds;
-       int irq;
-+      int coldplug_done;
- #ifdef CONFIG_PM
-       struct {
-               u_int8_t dcdc1, dcdc2;
-@@ -573,6 +574,30 @@ static void pcf50606_work(struct work_struct *work)
-       if (ret != 3)
-               DEBUGPC("Oh crap PMU IRQ register read failed %d\n", ret);
-+      if (!pcf->coldplug_done) {
-+              DEBUGPC("PMU Coldplug init\n");
-+
-+              /* we used SECOND to kick ourselves started -- turn it off */
-+              pcfirq[0] &= ~PCF50606_INT1_SECOND;
-+              reg_set_bit_mask(pcf, PCF50606_REG_INT1M, PCF50606_INT1_SECOND,
-+                               PCF50606_INT1_SECOND);
-+
-+              /* coldplug the USB if present */
-+              if (__reg_read(pcf, PCF50606_REG_OOCS) & PCF50606_OOCS_EXTON) {
-+                      /* Charger inserted */
-+                      DEBUGPC("COLD CHGINS ");
-+                      input_report_key(pcf->input_dev, KEY_BATTERY, 1);
-+                      apm_queue_event(APM_POWER_STATUS_CHANGE);
-+                      pcf->flags |= PCF50606_F_CHG_PRESENT;
-+                      if (pcf->pdata->cb)
-+                              pcf->pdata->cb(&pcf->client.dev,
-+                                      PCF50606_FEAT_MBC, PMU_EVT_INSERT);
-+              }
-+
-+              pcf->coldplug_done = 1;
-+      }
-+
-+
-       dev_dbg(&pcf->client.dev, "INT1=0x%02x INT2=0x%02x INT3=0x%02x:",
-               pcfirq[0], pcfirq[1], pcfirq[2]);
-@@ -1642,7 +1667,8 @@ static int pcf50606_detect(struct i2c_adapter *adapter, int address, int kind)
-       pm_power_off = &pcf50606_go_standby;
-       /* configure interrupt mask */
--      reg_write(data, PCF50606_REG_INT1M, PCF50606_INT1_SECOND);
-+      /* we don't mask SECOND here, because we want one to do coldplug with */
-+      reg_write(data, PCF50606_REG_INT1M, 0x00);
-       reg_write(data, PCF50606_REG_INT2M, 0x00);
-       reg_write(data, PCF50606_REG_INT3M, PCF50606_INT3_TSCPRES);
-diff --git a/include/linux/pcf50606.h b/include/linux/pcf50606.h
-index bc98e47..167328f 100644
---- a/include/linux/pcf50606.h
-+++ b/include/linux/pcf50606.h
-@@ -1,6 +1,9 @@
- #ifndef _LINUX_PCF50606_H
- #define _LINUX_PCF50606_H
-+#include <linux/pcf506xx.h>
-+
-+
- /* public in-kernel pcf50606 api */
- enum pcf50606_regulator_id {
-       PCF50606_REGULATOR_DCD,
-@@ -48,26 +51,6 @@ pcf50606_onoff_set(struct pcf50606_data *pcf,
- extern void
- pcf50606_charge_fast(struct pcf50606_data *pcf, int on);
--#define PMU_VRAIL_F_SUSPEND_ON        0x00000001      /* Remains on during suspend */
--#define PMU_VRAIL_F_UNUSED    0x00000002      /* This rail is not used */
--struct pmu_voltage_rail {
--      char *name;
--      unsigned int flags;
--      struct {
--              unsigned int init;
--              unsigned int max;
--      } voltage;
--};
--
--enum pmu_event {
--      PMU_EVT_NONE,
--      PMU_EVT_INSERT,
--      PMU_EVT_REMOVE,
--      __NUM_PMU_EVTS
--};
--
--typedef int pmu_cb(struct device *dev, unsigned int feature,
--                 enum pmu_event event);
- #define PCF50606_FEAT_EXTON   0x00000001      /* not yet supported */
- #define PCF50606_FEAT_MBC     0x00000002
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index 5f32004..bf50fe4 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -1,6 +1,9 @@
- #ifndef _LINUX_PCF50633_H
- #define _LINUX_PCF50633_H
-+#include <linux/pcf506xx.h>
-+
-+
- /* public in-kernel pcf50633 api */
- enum pcf50633_regulator_id {
-       PCF50633_REGULATOR_AUTO,
-@@ -57,30 +60,6 @@ pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma);
- extern void
- pcf50633_charge_enable(struct pcf50633_data *pcf, int on);
--/* FIXME: sharded with pcf50606 */
--#define PMU_VRAIL_F_SUSPEND_ON        0x00000001      /* Remains on during suspend */
--#define PMU_VRAIL_F_UNUSED    0x00000002      /* This rail is not used */
--struct pmu_voltage_rail {
--      char *name;
--      unsigned int flags;
--      struct {
--              unsigned int init;
--              unsigned int max;
--      } voltage;
--};
--
--enum pmu_event {
--      PMU_EVT_NONE,
--      PMU_EVT_INSERT,
--      PMU_EVT_REMOVE,
--      PMU_EVT_USB_INSERT,
--      PMU_EVT_USB_REMOVE,
--      __NUM_PMU_EVTS
--};
--
--typedef int pmu_cb(struct device *dev, unsigned int feature,
--                 enum pmu_event event);
--
- #define PCF50633_FEAT_EXTON   0x00000001      /* not yet supported */
- #define PCF50633_FEAT_MBC     0x00000002
- #define PCF50633_FEAT_BBC     0x00000004      /* not yet supported */
-diff --git a/include/linux/pcf506xx.h b/include/linux/pcf506xx.h
-new file mode 100644
-index 0000000..33be73e
---- /dev/null
-+++ b/include/linux/pcf506xx.h
-@@ -0,0 +1,31 @@
-+#ifndef _LINUX_PCF506XX_H
-+#define _LINUX_PCF506XX_H
-+
-+
-+#define PMU_VRAIL_F_SUSPEND_ON        0x00000001      /* Remains on during suspend */
-+#define PMU_VRAIL_F_UNUSED    0x00000002      /* This rail is not used */
-+struct pmu_voltage_rail {
-+      char *name;
-+      unsigned int flags;
-+      struct {
-+              unsigned int init;
-+              unsigned int max;
-+      } voltage;
-+};
-+
-+enum pmu_event {
-+      PMU_EVT_NONE,
-+      PMU_EVT_INSERT,
-+      PMU_EVT_REMOVE,
-+#ifdef CONFIG_SENSORS_PCF50633
-+      PMU_EVT_USB_INSERT,
-+      PMU_EVT_USB_REMOVE,
-+#endif
-+      __NUM_PMU_EVTS
-+};
-+
-+typedef int pmu_cb(struct device *dev, unsigned int feature,
-+                 enum pmu_event event);
-+
-+
-+#endif /* !_LINUX_PCF506XX_H */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1035-gta02-bt-fixes.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1035-gta02-bt-fixes.patch.patch
deleted file mode 100755 (executable)
index e04723f..0000000
+++ /dev/null
@@ -1,209 +0,0 @@
-From d4d6e6229c94cfe2bd8f29b4ebc0d60b8ad29455 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:46:57 +0100
-Subject: [PATCH] gta02-bt-fixes.patch
- Modify GTA02 power manager for bluetooth.
-
-1. Default power value isn't correct. Now we set pcf50633 LDO4 to 3.2 voltage.
-
-2. Separate GTA01 and GTA02 source code.
-
-3. Add pcf50633 API for enable register.
----
- arch/arm/mach-s3c2440/mach-gta02.c    |    4 +-
- arch/arm/plat-s3c24xx/neo1973_pm_bt.c |   71 ++++++++++++++++++++++++++++----
- include/linux/pcf50633.h              |    1 +
- 3 files changed, 65 insertions(+), 11 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 3fbb131..46acede 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -213,10 +213,10 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-                       },
-               },
-               [PCF50633_REGULATOR_LDO4] = {
--                      .name           = "gl_2v5",
-+                      .name           = "bt_3v2",
-                       .voltage        = {
-                               .init   = 2500,
--                              .max    = 2500,
-+                              .max    = 3300,
-                       },
-               },
-               [PCF50633_REGULATOR_LDO5] = {
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-index d685ef7..8f5be88 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-@@ -16,12 +16,19 @@
- #include <linux/kernel.h>
- #include <linux/platform_device.h>
--#include <linux/pcf50606.h>
--
- #include <asm/hardware.h>
- #include <asm/mach-types.h>
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA01
- #include <asm/arch/gta01.h>
-+#include <linux/pcf50606.h>
-+#endif
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
- #include <asm/arch/gta02.h>
-+#include <linux/pcf50633.h>
-+#endif
-+
- #define DRVMSG "FIC Neo1973 Bluetooth Power Management"
-@@ -30,6 +37,8 @@ static ssize_t bt_read(struct device *dev, struct device_attribute *attr,
- {
-       if (!strcmp(attr->attr.name, "power_on")) {
-               switch (machine_arch_type) {
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-               case MACH_TYPE_NEO1973_GTA01:
-                       if (pcf50606_onoff_get(pcf50606_global,
-                                               PCF50606_REGULATOR_D1REG) &&
-@@ -37,21 +46,33 @@ static ssize_t bt_read(struct device *dev, struct device_attribute *attr,
-                                                PCF50606_REGULATOR_D1REG) == 3100)
-                               goto out_1;
-                       break;
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-               case MACH_TYPE_NEO1973_GTA02:
-                       if (s3c2410_gpio_getpin(GTA02_GPIO_BT_EN))
-                               goto out_1;
-                       break;
-+#endif /* CONFIG_MACH_NEO1973_GTA02 */
-+
-               }
-       } else if (!strcmp(attr->attr.name, "reset")) {
-               switch (machine_arch_type) {
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-               case MACH_TYPE_NEO1973_GTA01:
-                       if (s3c2410_gpio_getpin(GTA01_GPIO_BT_EN) == 0)
-                               goto out_1;
-                       break;
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-               case MACH_TYPE_NEO1973_GTA02:
-                       if (s3c2410_gpio_getpin(GTA02_GPIO_BT_EN) == 0)
-                               goto out_1;
-                       break;
-+#endif /* CONFIG_MACH_NEO1973_GTA02 */
-+
-               }
-       }
-@@ -64,9 +85,12 @@ static ssize_t bt_write(struct device *dev, struct device_attribute *attr,
-                       const char *buf, size_t count)
- {
-       unsigned long on = simple_strtoul(buf, NULL, 10);
-+      unsigned int vol;
-       if (!strcmp(attr->attr.name, "power_on")) {
-               switch (machine_arch_type) {
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-               case MACH_TYPE_NEO1973_GTA01:
-                       /* if we are powering up, assert reset, then power,
-                        * then release reset */
-@@ -80,22 +104,39 @@ static ssize_t bt_write(struct device *dev, struct device_attribute *attr,
-                                          PCF50606_REGULATOR_D1REG, on);
-                       s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on);
-                       break;
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-               case MACH_TYPE_NEO1973_GTA02:
-+                      s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, on ? 0 : 1);
-                       if (on)
--                              s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, 0);
--                      else
--                              s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, 1);
-+                              pcf50633_voltage_set(pcf50633_global,
-+                                      PCF50633_REGULATOR_LDO4, 3200);
-+                      pcf50633_onoff_set(pcf50633_global,
-+                              PCF50633_REGULATOR_LDO4, on);
-+                      vol = pcf50633_voltage_get(pcf50633_global,
-+                              PCF50633_REGULATOR_LDO4);
-+                      dev_info(dev, "GTA02 Set PCF50633 LDO4 = %d\n", vol);
-                       break;
-+#endif /* CONFIG_MACH_NEO1973_GTA02 */
-+
-               }
-       } else if (!strcmp(attr->attr.name, "reset")) {
-               /* reset is low-active, so we need to invert */
-               switch (machine_arch_type) {
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-               case MACH_TYPE_NEO1973_GTA01:
-                       s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1);
-                       break;
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-               case MACH_TYPE_NEO1973_GTA02:
-                       s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, on ? 0 : 1);
-                       break;
-+#endif /* CONFIG_MACH_NEO1973_GTA02 */
-+
-               }
-       }
-@@ -143,18 +184,30 @@ static int __init gta01_bt_probe(struct platform_device *pdev)
-       dev_info(&pdev->dev, DRVMSG ": starting\n");
-       switch (machine_arch_type) {
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-       case MACH_TYPE_NEO1973_GTA01:
-               /* we make sure that the voltage is off */
-               pcf50606_onoff_set(pcf50606_global,
-                                  PCF50606_REGULATOR_D1REG, 0);
-+              /* we pull reset to low to make sure that the chip doesn't
-+               * drain power through the reset line */
-+              s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
-               break;
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-       case MACH_TYPE_NEO1973_GTA02:
--              /* FIXME: implementation */
-+              /* we make sure that the voltage is off */
-+              pcf50633_onoff_set(pcf50633_global,
-+                                   PCF50633_REGULATOR_LDO4, 0);
-+              /* we pull reset to low to make sure that the chip doesn't
-+               * drain power through the reset line */
-+              s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, 0);
-               break;
-+#endif /* CONFIG_MACH_NEO1973_GTA02 */
-+
-       }
--      /* we pull reset to low to make sure that the chip doesn't
--       * drain power through the reset line */
--      s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
-       return sysfs_create_group(&pdev->dev.kobj, &gta01_bt_attr_group);
- }
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index bf50fe4..b6a67ee 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -46,6 +46,7 @@ pcf50633_voltage_set(struct pcf50633_data *pcf,
- extern unsigned int
- pcf50633_voltage_get(struct pcf50633_data *pcf,
-                    enum pcf50633_regulator_id reg);
-+
- extern int
- pcf50633_onoff_get(struct pcf50633_data *pcf,
-                  enum pcf50633_regulator_id reg);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1036-openmoko-logo.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1036-openmoko-logo.patch.patch
deleted file mode 100755 (executable)
index cb9f680..0000000
+++ /dev/null
@@ -1,40076 +0,0 @@
-From 0e792e3223f94ab85af6d51bef4c502ef5fa36c1 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:46:57 +0100
-Subject: [PATCH] openmoko-logo.patch
-
----
- drivers/video/logo/Kconfig                   |    5 +
- drivers/video/logo/Makefile                  |    1 +
- drivers/video/logo/logo.c                    |    5 +
- drivers/video/logo/logo_openmoko_clut224.ppm |40003 ++++++++++++++++++++++++++
- 4 files changed, 40014 insertions(+), 0 deletions(-)
- create mode 100644 drivers/video/logo/logo_openmoko_clut224.ppm
-
-diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
-index 39ac49e..9c98e86 100644
---- a/drivers/video/logo/Kconfig
-+++ b/drivers/video/logo/Kconfig
-@@ -77,6 +77,11 @@ config LOGO_SUPERH_CLUT224
-       depends on SUPERH
-       default y
-+config LOGO_OPENMOKO_CLUT224
-+      bool "224-color OpenMoko Linux logo"
-+      depends on MACH_NEO1973_GTA01 || MACH_NEO1973_GTA02
-+      default y
-+
- config LOGO_M32R_CLUT224
-       bool "224-color M32R Linux logo"
-       depends on M32R
-diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile
-index b91251d..022fae6 100644
---- a/drivers/video/logo/Makefile
-+++ b/drivers/video/logo/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_LOGO_SUPERH_MONO)               += logo_superh_mono.o
- obj-$(CONFIG_LOGO_SUPERH_VGA16)               += logo_superh_vga16.o
- obj-$(CONFIG_LOGO_SUPERH_CLUT224)     += logo_superh_clut224.o
- obj-$(CONFIG_LOGO_M32R_CLUT224)               += logo_m32r_clut224.o
-+obj-$(CONFIG_LOGO_OPENMOKO_CLUT224)   += logo_openmoko_clut224.o
- obj-$(CONFIG_SPU_BASE)                        += logo_spe_clut224.o
-diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c
-index 2e85a2b..8b044b4 100644
---- a/drivers/video/logo/logo.c
-+++ b/drivers/video/logo/logo.c
-@@ -35,6 +35,7 @@ extern const struct linux_logo logo_superh_mono;
- extern const struct linux_logo logo_superh_vga16;
- extern const struct linux_logo logo_superh_clut224;
- extern const struct linux_logo logo_m32r_clut224;
-+extern const struct linux_logo logo_openmoko_clut224;
- static int nologo;
- module_param(nologo, bool, 0);
-@@ -115,6 +116,10 @@ const struct linux_logo * __init_refok fb_find_logo(int depth)
-               /* M32R Linux logo */
-               logo = &logo_m32r_clut224;
- #endif
-+#ifdef CONFIG_LOGO_OPENMOKO_CLUT224
-+              /* OpenMoko Linux logo */
-+              logo = &logo_openmoko_clut224;
-+#endif
-       }
-       return logo;
- }
-diff --git a/drivers/video/logo/logo_openmoko_clut224.ppm b/drivers/video/logo/logo_openmoko_clut224.ppm
-new file mode 100644
-index 0000000..a2989cb
---- /dev/null
-+++ b/drivers/video/logo/logo_openmoko_clut224.ppm
-@@ -0,0 +1,40003 @@
-+P3
-+480 500
-+255
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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  1 1 1  1 1 1
-+1 1 1  1 1 1  2 2 2  2 2 2  2 2 2  3 3 1
-+3 3 1  3 3 1  3 3 1  3 3 1  3 3 1  3 3 1
-+3 3 1  3 3 1  3 3 1  3 3 1  3 3 1  2 2 2
-+2 2 2  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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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  1 1 1  2 2 2  3 3 1  4 3 1  4 3 1
-+5 4 1  5 4 1  5 4 1  5 4 1  5 4 1  7 5 2
-+7 5 2  7 5 2  7 5 2  7 5 2  7 5 2  7 5 2
-+7 5 2  7 5 2  7 5 2  7 5 2  5 4 1  5 4 1
-+5 4 1  5 4 1  5 4 1  4 3 1  4 3 1  3 3 1
-+3 3 1  2 2 2  1 1 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  1 1 1
-+3 3 1  4 3 1  5 4 1  7 5 2  7 5 2  9 7 3
-+9 7 3  9 7 3  10 9 3  10 9 3  11 9 3  11 9 3
-+10 9 3  13 11 4  11 9 3  13 11 4  13 11 4  13 11 4
-+13 11 4  11 9 3  13 11 4  11 9 3  11 9 3  11 9 3
-+10 9 3  9 7 3  9 7 3  9 7 3  7 5 2  7 5 2
-+7 5 2  5 4 1  5 4 1  4 3 1  3 3 1  3 3 1
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  1 1 1  3 3 1  5 4 1
-+7 5 2  9 7 3  10 9 3  11 9 3  13 11 4  14 11 4
-+15 13 4  15 13 4  15 13 4  16 14 4  18 15 5  18 15 5
-+18 15 5  18 15 5  18 15 5  18 15 5  18 15 5  18 15 5
-+18 15 5  18 15 5  18 15 5  18 15 5  18 15 5  16 14 4
-+16 14 4  15 13 4  15 13 4  14 11 4  13 11 4  13 11 4
-+11 9 3  10 9 3  9 7 3  9 7 3  7 5 2  7 5 2
-+5 4 1  5 4 1  3 3 1  3 3 1  1 1 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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  2 2 2  4 3 1  7 5 2  9 7 3
-+11 9 3  13 11 4  15 13 4  16 14 4  18 15 5  18 15 5
-+20 17 5  22 17 5  23 19 6  23 19 6  24 21 6  24 21 6
-+24 21 6  25 20 6  25 20 6  25 20 6  25 20 6  25 20 6
-+25 20 6  25 20 6  25 20 6  24 21 6  24 21 6  23 19 6
-+23 19 6  23 19 6  22 17 5  20 17 5  18 15 5  18 15 5
-+18 15 5  16 14 4  15 13 4  14 11 4  13 11 4  13 11 4
-+10 9 3  9 7 3  7 5 2  7 5 2  5 4 1  4 3 1
-+3 3 1  2 2 2  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  3 3 1  5 4 1  7 5 2  10 9 3  13 11 4
-+16 14 4  18 15 5  22 17 5  23 19 6  24 21 6  25 20 6
-+27 23 7  29 24 7  29 24 7  29 24 7  31 27 8  31 27 8
-+31 27 8  31 27 8  31 27 8  31 27 8  31 27 8  31 27 8
-+31 27 8  31 27 8  31 27 8  31 27 8  31 27 8  31 27 8
-+29 24 7  29 24 7  27 23 7  27 23 7  25 20 6  25 20 6
-+24 21 6  23 19 6  22 17 5  20 17 5  18 15 5  18 15 5
-+16 14 4  15 13 4  13 11 4  11 9 3  10 9 3  9 7 3
-+7 5 2  5 4 1  4 3 1  3 3 1  1 1 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  0 0 0
-+3 3 1  5 4 1  9 7 3  13 11 4  15 13 4  18 15 5
-+22 17 5  24 21 6  27 23 7  29 24 7  31 27 8  31 27 8
-+31 27 8  37 31 10  37 31 10  37 31 10  37 31 10  37 31 10
-+37 31 10  37 31 10  37 31 10  37 31 10  37 31 10  41 32 10
-+37 31 10  37 31 10  37 31 10  37 31 10  37 31 10  37 31 10
-+37 31 10  37 31 10  37 31 10  37 31 10  31 27 8  31 27 8
-+31 27 8  29 24 7  29 24 7  27 23 7  25 20 6  24 21 6
-+23 19 6  20 17 5  18 15 5  18 15 5  15 13 4  14 11 4
-+13 11 4  10 9 3  9 7 3  7 5 2  5 4 1  4 3 1
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  3 3 1
-+5 4 1  9 7 3  13 11 4  16 14 4  20 17 5  24 21 6
-+27 23 7  31 27 8  31 27 8  37 31 10  37 31 10  37 31 10
-+44 35 11  41 32 10  44 35 11  44 35 11  47 39 13  44 35 11
-+47 39 13  47 39 13  47 39 13  47 39 13  47 39 13  47 39 13
-+47 39 13  47 39 13  47 39 13  47 39 13  44 35 11  44 35 11
-+41 32 10  44 35 11  37 31 10  41 32 10  37 31 10  37 31 10
-+37 31 10  37 31 10  37 31 10  31 27 8  31 27 8  31 27 8
-+29 24 7  27 23 7  25 20 6  23 19 6  22 17 5  18 15 5
-+18 15 5  15 13 4  14 11 4  13 11 4  10 9 3  7 5 2
-+5 4 1  4 3 1  3 3 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1  3 3 1  5 4 1
-+9 7 3  14 11 4  18 15 5  22 17 5  25 20 6  29 24 7
-+31 27 8  37 31 10  37 31 10  44 35 11  47 39 13  47 39 13
-+47 39 13  47 39 13  47 39 13  47 39 13  47 39 13  47 39 13
-+56 48 15  47 39 13  47 39 13  47 39 13  56 48 15  47 39 13
-+47 39 13  47 39 13  47 39 13  56 48 15  47 39 13  47 39 13
-+47 39 13  47 39 13  47 39 13  47 39 13  47 39 13  47 39 13
-+47 39 13  44 35 11  41 32 10  44 35 11  37 31 10  37 31 10
-+37 31 10  37 31 10  31 27 8  29 24 7  27 23 7  25 20 6
-+24 21 6  22 17 5  18 15 5  18 15 5  15 13 4  13 11 4
-+11 9 3  9 7 3  7 5 2  5 4 1  3 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  3 3 1  5 4 1  9 7 3
-+14 11 4  18 15 5  23 19 6  27 23 7  31 27 8  37 31 10
-+37 31 10  44 35 11  47 39 13  47 39 13  47 39 13  56 48 15
-+47 39 13  57 50 17  57 50 17  57 50 17  56 48 15  57 50 17
-+56 48 15  57 50 17  57 50 17  57 50 17  56 48 15  57 50 17
-+57 50 17  57 50 17  57 50 17  56 48 15  57 50 17  57 50 17
-+56 48 15  56 48 15  47 39 13  56 48 15  47 39 13  47 39 13
-+47 39 13  47 39 13  47 39 13  47 39 13  47 39 13  44 35 11
-+44 35 11  37 31 10  37 31 10  37 31 10  37 31 10  31 27 8
-+31 27 8  27 23 7  25 20 6  23 19 6  22 17 5  18 15 5
-+16 14 4  14 11 4  13 11 4  9 7 3  7 5 2  5 4 1
-+3 3 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  3 3 1  5 4 1  9 7 3  13 11 4
-+18 15 5  23 19 6  27 23 7  31 27 8  37 31 10  37 31 10
-+47 39 13  47 39 13  47 39 13  56 48 15  56 48 15  57 50 17
-+57 50 17  57 50 17  56 48 15  57 50 17  56 48 15  57 50 17
-+56 48 15  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  57 50 17  56 48 15  56 48 15
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  47 39 13  56 48 15  47 39 13  47 39 13
-+47 39 13  47 39 13  47 39 13  44 35 11  44 35 11  37 31 10
-+37 31 10  37 31 10  31 27 8  29 24 7  27 23 7  25 20 6
-+23 19 6  18 15 5  18 15 5  15 13 4  13 11 4  10 9 3
-+7 5 2  5 4 1  3 3 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  2 2 2  5 4 1  9 7 3  13 11 4  18 15 5
-+23 19 6  27 23 7  31 27 8  37 31 10  37 31 10  47 39 13
-+47 39 13  47 39 13  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  56 48 15  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  56 48 15
-+56 48 15  47 39 13  47 39 13  47 39 13  47 39 13  47 39 13
-+44 35 11  37 31 10  37 31 10  37 31 10  31 27 8  31 27 8
-+29 24 7  25 20 6  23 19 6  20 17 5  18 15 5  15 13 4
-+13 11 4  9 7 3  7 5 2  5 4 1  3 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+1 1 1  4 3 1  7 5 2  13 11 4  16 14 4  22 17 5
-+27 23 7  31 27 8  37 31 10  37 31 10  47 39 13  47 39 13
-+57 50 16  70 58 37  71 64 51  100 76 42  66 66 66  114 84 45
-+138 129 110  140 134 120  163 154 123  176 168 138  185 178 149  192 187 164
-+200 196 176  216 206 146  200 196 176  227 222 178  227 222 178  227 222 178
-+227 221 169  224 217 160  185 178 149  224 212 126  185 178 149  163 154 123
-+150 141 118  149 122 79  142 111 68  100 76 42  70 58 37  57 50 17
-+57 50 17  56 48 15  57 50 17  57 50 17  57 50 17  57 50 17
-+56 48 15  57 50 17  57 50 17  56 48 15  56 48 15  47 39 13
-+47 39 13  47 39 13  47 39 13  44 35 11  37 31 10  37 31 10
-+37 31 10  31 27 8  29 24 7  25 20 6  23 19 6  20 17 5
-+18 15 5  15 13 4  13 11 4  9 7 3  7 5 2  4 3 1
-+2 2 2  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+3 3 1  7 5 2  11 9 3  15 13 4  20 17 5  25 20 6
-+31 27 8  37 31 10  44 40 33  71 64 51  135 101 60  138 129 110
-+138 129 110  138 129 110  140 134 120  140 134 120  163 154 123  150 141 118
-+150 141 118  140 134 120  138 129 110  138 129 110  138 129 110  138 129 110
-+138 129 110  138 129 110  138 129 110  138 129 110  138 129 110  150 141 118
-+150 141 118  176 168 138  176 168 138  185 178 149  216 206 146  227 221 169
-+227 221 169  227 220 160  227 221 169  227 219 152  226 218 148  216 206 146
-+176 168 138  149 122 79  142 111 68  68 60 43  57 50 16  57 50 17
-+57 50 17  57 50 17  57 50 17  56 48 15  56 48 15  57 50 17
-+56 48 15  47 39 13  47 39 13  47 39 13  47 39 13  44 35 11
-+37 31 10  37 31 10  37 31 10  31 27 8  29 24 7  25 20 6
-+23 19 6  20 17 5  18 15 5  14 11 4  11 9 3  9 7 3
-+5 4 1  3 3 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  0 0 0  0 0 0  0 0 0  0 0 0  2 2 2
-+5 4 1  9 7 3  14 11 4  20 17 5  33 28 19  71 64 51
-+66 66 66  138 129 110  138 129 110  140 134 120  138 129 110  138 129 110
-+138 129 110  140 134 120  138 129 110  140 134 120  176 168 138  192 187 164
-+192 187 164  185 178 149  150 141 118  138 129 110  138 129 110  138 129 110
-+138 129 110  138 129 110  138 129 110  138 129 110  138 129 110  138 129 110
-+138 129 110  138 129 110  138 129 110  138 129 110  138 129 110  138 129 110
-+150 141 118  163 154 123  185 178 149  224 217 160  228 223 179  227 221 169
-+227 219 152  227 219 152  226 218 148  226 218 148  224 212 126  163 154 123
-+142 111 68  70 58 37  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  47 39 13  56 48 15  47 39 13
-+47 39 13  47 39 13  44 35 11  37 31 10  37 31 10  31 27 8
-+29 24 7  25 20 6  23 19 6  18 15 5  16 14 4  13 11 4
-+10 9 3  7 5 2  5 4 1  3 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  0 0 0  1 1 1  3 3 1
-+7 5 2  20 20 20  63 58 50  135 101 60  140 134 120  138 129 110
-+140 134 120  138 129 110  138 129 110  140 134 120  138 129 110  140 134 120
-+138 129 110  138 129 110  163 154 123  229 226 192  229 226 192  229 226 192
-+229 225 190  229 225 190  229 226 192  200 196 176  163 154 123  138 129 110
-+138 129 110  135 101 60  138 129 110  66 66 66  138 129 110  138 129 110
-+135 101 60  138 129 110  66 66 66  138 129 110  135 101 60  138 129 110
-+135 101 60  138 129 110  138 129 110  135 101 60  138 129 110  150 141 118
-+192 187 164  227 221 169  227 221 169  227 220 160  227 219 152  226 218 148
-+226 217 139  226 218 148  176 168 138  149 122 79  75 62 40  57 50 16
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  47 39 13
-+57 50 17  47 39 13  47 39 13  47 39 13  37 31 10  37 31 10
-+37 31 10  31 27 8  29 24 7  25 20 6  22 17 5  18 15 5
-+15 13 4  13 11 4  9 7 3  5 4 1  3 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  5 5 5  52 52 52
-+66 66 66  138 129 110  138 129 110  138 129 110  138 129 110  138 129 110
-+138 129 110  138 129 110  138 129 110  138 129 110  138 129 110  138 129 110
-+138 129 110  192 187 164  229 226 192  229 226 192  229 225 190  229 225 190
-+229 226 192  229 224 185  229 226 192  229 226 192  229 226 192  138 129 110
-+138 129 110  138 129 110  138 129 110  138 129 110  138 129 110  138 129 110
-+66 66 66  138 129 110  138 129 110  138 129 110  138 129 110  66 66 66
-+138 129 110  66 66 66  138 129 110  66 66 66  138 129 110  135 101 60
-+138 129 110  142 111 68  150 141 118  176 168 138  227 221 169  227 221 169
-+227 220 160  226 218 148  227 218 146  227 218 146  226 217 137  176 168 138
-+149 122 79  70 58 37  57 50 17  57 50 17  57 50 17  57 50 17
-+56 48 15  57 50 17  47 39 13  47 39 13  47 39 13  47 39 13
-+41 32 10  37 31 10  37 31 10  31 27 8  27 23 7  24 21 6
-+20 17 5  16 14 4  14 11 4  10 9 3  7 5 2  5 4 1
-+2 2 2  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  17 17 17  66 66 66  138 129 110  138 129 110
-+138 129 110  138 129 110  138 129 110  138 129 110  138 129 110  138 129 110
-+138 129 110  138 129 110  140 134 120  138 129 110  138 129 110  138 129 110
-+185 178 149  229 226 196  229 226 192  229 226 192  229 225 190  229 225 190
-+229 226 192  229 226 192  229 225 190  229 226 192  200 196 176  138 129 110
-+138 129 110  66 66 66  138 129 110  138 129 110  66 66 66  138 129 110
-+138 129 110  135 101 60  66 66 66  138 129 110  66 66 66  140 134 120
-+138 129 110  138 129 110  66 66 66  138 129 110  138 129 110  66 66 66
-+138 129 110  66 66 66  138 129 110  114 84 45  138 129 110  138 129 110
-+192 187 164  227 221 169  227 221 169  227 219 152  227 219 152  227 217 139
-+226 217 139  226 217 139  163 154 123  110 81 38  57 50 17  57 50 17
-+57 50 17  56 48 15  57 50 17  56 48 15  47 39 13  47 39 13
-+47 39 13  47 39 13  37 31 10  37 31 10  31 27 8  29 24 7
-+25 20 6  23 19 6  18 15 5  15 13 4  13 11 4  9 7 3
-+5 4 1  3 3 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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
-+24 24 24  66 66 66  138 129 110  138 129 110  140 134 120  66 66 66
-+138 129 110  140 134 120  66 66 66  140 134 120  66 66 66  138 129 110
-+138 129 110  138 129 110  138 129 110  138 129 110  140 134 120  163 154 123
-+229 226 196  229 226 192  229 226 192  229 226 192  229 226 192  229 225 190
-+229 226 192  229 225 190  229 226 192  229 226 192  176 168 138  138 129 110
-+138 129 110  140 134 120  66 66 66  138 129 110  138 129 110  138 129 110
-+66 66 66  138 129 110  138 129 110  135 101 60  138 129 110  138 129 110
-+66 66 66  135 101 60  138 129 110  66 66 66  138 129 110  66 66 66
-+138 129 110  135 101 60  138 129 110  66 66 66  138 129 110  66 66 66
-+135 101 60  149 122 79  176 168 138  227 221 169  227 221 169  227 220 160
-+227 219 152  227 218 146  226 217 139  226 217 137  185 178 149  135 101 60
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+47 39 13  47 39 13  47 39 13  44 35 11  37 31 10  37 31 10
-+31 27 8  27 23 7  24 21 6  20 17 5  16 14 4  13 11 4
-+9 7 3  7 5 2  4 3 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  25 25 25  66 66 66
-+138 129 110  138 129 110  66 66 66  140 134 120  66 66 66  140 134 120
-+140 134 120  66 66 66  140 134 120  140 134 120  140 134 120  140 134 120
-+138 129 110  138 129 110  138 129 110  138 129 110  138 129 110  200 196 176
-+230 227 202  229 226 192  229 226 192  229 226 192  229 226 192  229 226 192
-+229 226 192  229 226 192  229 226 192  229 226 192  150 141 118  138 129 110
-+66 66 66  138 129 110  138 129 110  135 101 60  66 66 66  138 129 110
-+138 129 110  66 66 66  138 129 110  66 66 66  138 129 110  66 66 66
-+138 129 110  66 66 66  138 129 110  135 101 60  138 129 110  66 66 66
-+138 129 110  66 66 66  138 129 110  100 76 42  138 129 110  114 84 45
-+138 129 110  66 66 66  142 111 68  135 101 60  163 154 123  224 217 160
-+227 221 169  227 220 160  227 219 152  227 218 146  226 217 139  227 218 146
-+216 206 146  135 101 60  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  56 48 15  47 39 13  47 39 13  47 39 13  37 31 10
-+37 31 10  31 27 8  29 24 7  25 20 6  23 19 6  18 15 5
-+14 11 4  10 9 3  7 5 2  4 3 1  2 2 2  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1  17 17 17  66 66 66  138 129 110  138 129 110
-+140 134 120  66 66 66  138 129 110  140 134 120  140 134 120  66 66 66
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+66 66 66  138 129 110  138 129 110  138 129 110  185 178 149  230 227 197
-+229 226 196  229 226 192  229 226 192  229 226 192  229 226 192  229 226 192
-+229 226 192  229 226 192  229 226 192  229 226 192  138 129 110  138 129 110
-+138 129 110  138 129 110  66 66 66  138 129 110  138 129 110  66 66 66
-+138 129 110  66 66 66  138 129 110  66 66 66  138 129 110  66 66 66
-+138 129 110  66 66 66  138 129 110  66 66 66  66 66 66  138 129 110
-+66 66 66  142 111 68  66 66 66  138 129 110  66 66 66  138 129 110
-+66 66 66  138 129 110  66 66 66  138 129 110  66 66 66  135 101 60
-+163 154 123  224 217 160  227 221 169  227 219 152  227 219 152  226 218 148
-+226 218 148  226 217 139  216 206 146  135 101 60  57 50 17  57 50 17
-+56 48 15  56 48 15  56 48 15  56 48 15  47 39 13  47 39 13
-+44 35 11  37 31 10  37 31 10  31 27 8  27 23 7  23 19 6
-+18 15 5  15 13 4  11 9 3  9 7 3  5 4 1  2 2 2
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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
-+6 6 6  65 65 65  138 129 110  138 129 110  66 66 66  140 134 120
-+66 66 66  140 134 120  140 134 120  66 66 66  140 134 120  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  138 129 110  138 129 110
-+140 134 120  140 134 120  138 129 110  138 129 110  200 196 176  230 228 209
-+229 226 192  229 226 192  229 226 196  229 226 196  229 226 196  229 226 196
-+229 226 192  229 226 192  229 226 192  229 224 185  138 129 110  114 84 45
-+138 129 110  135 101 60  138 129 110  66 66 66  138 129 110  66 66 66
-+138 129 110  66 66 66  138 129 110  66 66 66  66 66 66  138 129 110
-+66 66 66  142 111 68  66 66 66  138 129 110  114 84 45  66 66 66
-+138 129 110  66 66 66  142 111 68  66 66 66  135 101 60  66 66 66
-+142 111 68  66 66 66  135 101 60  66 66 66  142 111 68  66 66 66
-+135 101 60  66 66 66  176 168 138  227 220 160  227 221 169  226 218 148
-+226 218 148  226 218 148  226 217 139  226 218 148  185 178 149  110 81 38
-+57 50 17  57 50 17  57 50 17  47 39 13  57 50 17  47 39 13
-+47 39 13  47 39 13  37 31 10  37 31 10  31 27 8  29 24 7
-+24 21 6  20 17 5  16 14 4  13 11 4  9 7 3  5 4 1
-+3 3 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  1 1 1  47 47 47
-+66 66 66  140 134 120  66 66 66  140 134 120  140 134 120  66 66 66
-+140 134 120  140 134 120  66 66 66  140 134 120  140 134 120  66 66 66
-+140 134 120  140 134 120  140 134 120  138 129 110  140 134 120  66 66 66
-+138 129 110  138 129 110  138 129 110  176 168 138  230 227 199  229 226 196
-+229 226 192  229 226 196  229 226 196  229 226 192  229 226 196  229 226 192
-+229 226 196  229 226 192  229 226 196  227 222 178  66 66 66  138 129 110
-+138 129 110  66 66 66  138 129 110  138 129 110  66 66 66  138 129 110
-+66 66 66  114 84 45  66 66 66  138 129 110  66 66 66  135 101 60
-+66 66 66  66 66 66  138 129 110  66 66 66  66 66 66  138 129 110
-+66 66 66  114 84 45  66 66 66  138 129 110  66 66 66  142 111 68
-+66 66 66  138 129 110  66 66 66  142 111 68  66 66 66  138 129 110
-+66 66 66  142 111 68  66 66 66  142 111 68  185 178 149  227 221 169
-+227 220 160  227 219 152  226 218 148  227 218 146  226 217 137  226 217 137
-+163 154 123  75 62 40  57 50 17  57 50 17  57 50 17  56 48 15
-+56 48 15  47 39 13  47 39 13  44 35 11  37 31 10  37 31 10
-+29 24 7  25 20 6  22 17 5  18 15 5  13 11 4  9 7 3
-+5 4 1  3 3 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  9 9 9  66 66 66  138 129 110
-+138 129 110  138 129 110  138 129 110  66 66 66  140 134 120  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+140 134 120  66 66 66  140 134 120  66 66 66  140 134 120  140 134 120
-+138 129 110  66 66 66  140 134 120  200 196 176  230 228 209  229 226 192
-+229 226 196  229 226 196  229 226 196  229 226 196  230 227 197  230 227 197
-+230 227 197  229 226 196  229 226 196  192 187 164  138 129 110  138 129 110
-+66 66 66  138 129 110  66 66 66  138 129 110  66 66 66  138 129 110
-+66 66 66  138 129 110  66 66 66  66 66 66  66 66 66  138 129 110
-+66 66 66  66 66 66  66 66 66  114 84 45  66 66 66  66 66 66
-+138 129 110  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+100 76 42  66 66 66  100 76 42  66 66 66  100 76 42  66 66 66
-+114 84 45  66 66 66  135 101 60  66 66 66  114 84 45  138 129 110
-+216 206 146  227 221 169  227 219 152  227 219 152  226 218 148  227 218 146
-+226 217 137  226 217 137  142 111 68  57 50 17  57 50 17  57 50 17
-+56 48 15  47 39 13  47 39 13  47 39 13  44 35 11  37 31 10
-+37 31 10  31 27 8  27 23 7  23 19 6  16 14 4  14 11 4
-+10 9 3  7 5 2  4 3 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  24 24 24  138 129 110  140 134 120  66 66 66
-+140 134 120  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  140 134 120  66 66 66  140 134 120  140 134 120
-+66 66 66  140 134 120  140 134 120  140 134 120  138 129 110  138 129 110
-+138 129 110  140 134 120  163 154 123  230 227 197  229 226 196  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  229 226 192
-+230 227 197  230 227 197  230 227 197  176 168 138  138 129 110  66 66 66
-+138 129 110  114 84 45  138 129 110  66 66 66  138 129 110  66 66 66
-+66 66 66  66 66 66  138 129 110  66 66 66  66 66 66  66 66 66
-+66 66 66  138 129 110  66 66 66  66 66 66  66 66 66  57 50 17
-+35 34 31  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 17  57 50 17  57 50 17  57 50 17  70 58 37
-+75 62 40  163 154 123  227 221 169  227 219 152  227 219 152  226 218 148
-+226 218 148  226 218 148  226 217 137  176 168 138  75 62 40  57 50 17
-+57 50 17  57 50 17  57 50 17  47 39 13  47 39 13  47 39 13
-+37 31 10  37 31 10  31 27 8  27 23 7  23 19 6  18 15 5
-+14 11 4  10 9 3  7 5 2  4 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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
-+3 3 3  65 65 65  138 129 110  66 66 66  140 134 120  138 129 110
-+66 66 66  140 134 120  140 134 120  66 66 66  140 134 120  140 134 120
-+66 66 66  140 134 120  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+138 129 110  138 129 110  176 168 138  230 228 209  229 226 196  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  176 168 138  138 129 110  135 101 60
-+138 129 110  66 66 66  138 129 110  66 66 66  114 84 45  66 66 66
-+138 129 110  66 66 66  66 66 66  66 66 66  66 66 66  63 58 50
-+35 34 31  24 21 6  24 21 6  31 27 8  31 27 8  31 27 8
-+31 27 8  31 27 8  31 27 8  31 27 8  31 27 8  31 27 8
-+31 27 8  31 27 8  47 39 13  47 39 13  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 17  57 50 17  57 50 17  57 50 16
-+57 50 16  57 50 16  135 101 60  216 206 146  227 219 152  227 219 152
-+227 219 152  226 218 148  227 218 146  226 217 137  226 217 137  135 101 60
-+57 50 17  57 50 17  57 50 17  57 50 17  47 39 13  47 39 13
-+47 39 13  37 31 10  37 31 10  31 27 8  27 23 7  23 19 6
-+18 15 5  15 13 4  10 9 3  7 5 2  4 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1  17 17 17
-+66 66 66  138 129 110  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+140 134 120  66 66 66  138 129 110  138 129 110  140 134 120  140 134 120
-+66 66 66  138 129 110  200 196 176  229 226 196  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  150 141 118  138 129 110  66 66 66
-+138 129 110  66 66 66  135 101 60  66 66 66  138 129 110  66 66 66
-+66 66 66  52 52 52  35 34 31  24 21 6  24 21 6  16 14 4
-+16 14 4  16 14 4  16 14 4  16 14 4  16 14 4  16 14 4
-+20 17 5  24 21 6  24 21 6  24 21 6  31 27 8  31 27 8
-+31 27 8  37 31 10  31 27 8  37 31 10  31 27 8  47 39 13
-+35 34 31  57 50 16  57 50 16  57 50 17  57 50 16  57 50 17
-+57 50 16  57 50 16  57 50 16  90 68 33  176 168 138  227 219 152
-+227 219 152  227 219 152  226 218 148  227 218 146  226 218 148  226 217 137
-+163 154 123  57 50 17  57 50 17  57 50 17  57 50 17  56 48 15
-+47 39 13  47 39 13  41 32 10  37 31 10  31 27 8  29 24 7
-+24 21 6  18 15 5  15 13 4  11 9 3  7 5 2  4 3 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  27 27 27  138 129 110
-+138 129 110  66 66 66  140 134 120  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  138 129 110  66 66 66  140 134 120  138 129 110
-+138 129 110  140 134 120  230 227 201  230 227 199  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  163 154 123  138 129 110  66 66 66
-+138 129 110  66 66 66  138 129 110  66 66 66  66 66 66  57 50 16
-+31 27 8  24 21 6  16 14 4  15 13 4  10 9 3  10 9 3
-+10 9 3  10 9 3  10 9 3  10 9 3  10 9 3  15 13 4
-+16 14 4  16 14 4  16 14 4  16 14 4  24 21 6  24 21 6
-+31 27 8  31 27 8  31 27 8  31 27 8  35 34 31  37 31 10
-+47 39 13  47 39 13  47 39 13  57 50 16  57 50 16  57 50 16
-+57 50 17  57 50 16  57 50 16  57 50 16  57 50 16  163 154 123
-+226 217 139  227 219 152  227 219 152  226 218 148  226 218 148  227 218 146
-+226 217 137  224 212 126  75 62 40  57 50 16  57 50 17  56 48 15
-+47 39 13  56 48 15  47 39 13  37 31 10  37 31 10  31 27 8
-+29 24 7  24 21 6  18 15 5  15 13 4  10 9 3  7 5 2
-+4 3 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  1 1 1  52 52 52  66 66 66  138 129 110
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+140 134 120  66 66 66  138 129 110  138 129 110  138 129 110  66 66 66
-+138 129 110  163 154 123  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  229 226 196  138 129 110  138 129 110  114 84 45
-+138 129 110  100 76 42  58 54 45  47 39 13  31 27 8  24 21 6
-+16 14 4  10 9 3  10 9 3  6 5 1  3 3 1  3 3 1
-+3 3 1  3 3 1  6 5 1  6 5 1  6 5 1  6 5 1
-+10 9 3  10 9 3  10 9 3  16 14 4  16 14 4  16 14 4
-+24 21 6  24 21 6  31 27 8  31 27 8  31 27 8  37 31 10
-+31 27 8  37 31 10  47 39 13  37 31 10  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+142 111 68  227 219 152  227 219 152  227 219 152  226 218 148  226 218 148
-+226 218 148  216 206 146  224 214 136  114 84 45  57 50 17  57 50 17
-+57 50 17  57 50 17  47 39 13  47 39 13  44 35 11  37 31 10
-+31 27 8  29 24 7  24 21 6  18 15 5  15 13 4  10 9 3
-+7 5 2  3 3 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  52 52 52  138 129 110  138 129 110  66 66 66
-+140 134 120  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  140 134 120  66 66 66  138 129 110  138 129 110  138 129 110
-+138 129 110  185 178 149  230 228 209  229 226 196  230 227 197  230 227 197
-+230 227 199  230 227 199  230 227 199  230 227 199  230 227 199  230 227 199
-+230 227 199  230 227 199  229 226 196  138 129 110  66 66 66  66 66 66
-+57 50 17  57 50 16  47 39 13  31 27 8  31 27 8  24 21 6
-+24 21 6  15 13 4  6 5 1  3 3 1  3 3 1  1 1 1
-+1 1 1  1 1 1  1 1 1  3 3 1  3 3 1  3 3 1
-+3 3 1  6 5 1  6 5 1  10 9 3  10 9 3  15 13 4
-+16 14 4  16 14 4  24 21 6  24 21 6  31 27 8  31 27 8
-+31 27 8  31 27 8  37 31 10  47 39 13  35 34 31  47 39 13
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  100 76 42  226 218 148  227 219 152  227 219 152  226 218 148
-+226 218 148  227 218 146  226 218 148  226 217 139  142 111 68  57 50 17
-+57 50 17  56 48 15  56 48 15  47 39 13  47 39 13  47 39 13
-+37 31 10  31 27 8  29 24 7  24 21 6  18 15 5  14 11 4
-+9 7 3  5 4 1  3 3 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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  1 1 1
-+4 4 4  66 66 66  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  138 129 110  140 134 120  66 66 66  138 129 110  66 66 66
-+138 129 110  200 196 176  230 227 199  230 227 199  230 227 199  230 227 199
-+230 227 199  230 227 199  230 227 199  230 227 199  230 227 201  230 227 199
-+230 227 199  230 227 197  229 226 192  138 129 110  75 62 40  57 50 16
-+57 50 16  57 50 16  37 31 10  37 31 10  24 21 6  24 21 6
-+15 13 4  10 9 3  3 3 1  1 1 1  0 0 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  3 3 1  3 3 1  6 5 1  6 5 1  10 9 3
-+10 9 3  16 14 4  16 14 4  20 17 5  24 21 6  24 21 6
-+31 27 8  31 27 8  31 27 8  37 31 10  37 31 10  47 39 13
-+47 39 13  47 39 13  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 17  57 50 17  75 62 40  216 206 146  227 219 152  227 219 152
-+226 218 148  226 218 148  226 218 148  226 218 148  226 217 137  138 129 110
-+57 50 17  57 50 17  57 50 17  57 50 17  47 39 13  47 39 13
-+47 39 13  37 31 10  31 27 8  27 23 7  23 19 6  18 15 5
-+14 11 4  9 7 3  5 4 1  2 2 2  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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
-+65 65 65  138 129 110  138 129 110  66 66 66  140 134 120  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  138 129 110  138 129 110
-+138 129 110  229 226 192  230 227 199  230 227 199  230 227 201  230 227 199
-+230 227 201  230 227 201  230 227 201  230 227 201  230 227 201  230 227 201
-+230 227 201  229 226 196  229 226 192  71 64 51  57 50 16  57 50 16
-+57 50 16  37 31 10  37 31 10  31 27 8  31 27 8  24 21 6
-+16 14 4  10 9 3  6 5 1  3 3 1  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  1 1 1  1 1 1  1 1 1  3 3 1  3 3 1
-+6 5 1  10 9 3  10 9 3  15 13 4  16 14 4  16 14 4
-+24 21 6  24 21 6  31 27 8  31 27 8  31 27 8  37 31 10
-+47 39 13  47 39 13  47 39 13  57 50 16  57 50 16  57 50 16
-+57 50 17  57 50 17  57 50 17  75 62 40  216 206 146  226 218 148
-+227 219 152  226 218 148  226 218 148  227 218 146  226 217 139  226 217 137
-+163 154 123  57 50 16  57 50 16  57 50 16  56 48 15  47 39 13
-+47 39 13  44 35 11  37 31 10  31 27 8  27 23 7  23 19 6
-+18 15 5  13 11 4  9 7 3  5 4 1  2 2 2  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  1 1 1  5 5 5  66 66 66
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  138 129 110  138 129 110  138 129 110  66 66 66
-+140 134 120  229 226 196  230 227 201  230 227 201  230 227 201  230 227 201
-+230 227 201  230 227 201  230 227 199  230 227 201  230 227 201  230 227 197
-+229 226 192  229 226 192  228 223 179  100 76 42  57 50 16  57 50 16
-+57 50 16  57 50 16  47 39 13  31 27 8  31 27 8  16 14 4
-+15 13 4  8 7 4  3 3 1  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  1 1 1  1 1 1  3 3 1
-+3 3 1  6 5 1  6 5 1  10 9 3  10 9 3  16 14 4
-+16 14 4  24 21 6  24 21 6  31 27 8  31 27 8  31 27 8
-+37 31 10  37 31 10  47 39 13  47 39 13  47 39 13  57 50 16
-+57 50 16  57 50 17  57 50 16  57 50 16  57 50 17  216 206 146
-+227 219 152  227 219 152  227 219 152  226 218 148  227 218 146  227 217 139
-+224 212 126  163 154 123  57 50 17  57 50 17  57 50 17  57 50 17
-+47 39 13  47 39 13  44 35 11  37 31 10  31 27 8  27 23 7
-+23 19 6  18 15 5  13 11 4  7 5 2  4 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  65 65 65  138 129 110
-+138 129 110  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  140 134 120  66 66 66  66 66 66  140 134 120
-+66 66 66  66 66 66  140 134 120  66 66 66  66 66 66  66 66 66
-+140 134 120  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  138 129 110  66 66 66  138 129 110  66 66 66  138 129 110
-+176 168 138  229 226 192  230 227 201  230 227 201  230 227 201  230 227 201
-+230 227 201  230 227 201  230 227 201  230 227 199  229 226 192  229 226 192
-+229 226 192  229 226 192  229 226 192  71 64 51  57 50 16  57 50 16
-+47 39 13  35 34 31  31 27 8  37 31 10  31 27 8  20 17 5
-+16 14 4  10 9 3  3 3 1  1 1 1  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  1 1 1  1 1 1  3 3 1  1 1 1  3 3 1
-+3 3 1  3 3 1  3 3 1  6 5 1  10 9 3  10 9 3
-+10 9 3  16 14 4  16 14 4  24 21 6  24 21 6  31 27 8
-+31 27 8  37 31 10  37 31 10  47 39 13  47 39 13  57 50 16
-+57 50 16  57 50 16  57 50 17  57 50 16  57 50 17  75 61 38
-+216 206 146  226 218 148  227 219 152  227 219 152  227 218 146  227 218 146
-+227 218 146  226 217 137  163 154 123  71 53 16  57 50 16  57 50 17
-+56 48 15  47 39 13  47 39 13  37 31 10  37 31 10  31 27 8
-+24 21 6  22 17 5  16 14 4  11 9 3  7 5 2  3 3 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  1 1 1  65 65 65  66 66 66  138 129 110
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  66 66 66  140 134 120  66 66 66
-+66 66 66  140 134 120  66 66 66  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  138 129 110  66 66 66  138 129 110  142 111 68  138 129 110
-+185 178 149  230 227 201  230 227 201  230 227 201  230 227 202  230 227 202
-+230 227 202  230 227 202  230 227 197  229 226 192  229 226 192  229 226 192
-+229 226 192  229 226 192  229 226 192  100 76 42  57 50 16  57 50 16
-+57 50 16  57 50 16  47 39 13  31 27 8  24 21 6  20 17 5
-+15 13 4  8 7 4  5 4 1  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  1 1 1  1 1 1  2 2 2
-+3 3 1  4 3 1  5 4 1  5 4 1  5 4 1  5 4 1
-+5 4 1  6 5 1  6 5 1  5 5 5  6 5 1  10 9 3
-+10 9 3  10 9 3  16 14 4  16 14 4  24 21 6  24 21 6
-+31 27 8  37 31 10  37 31 10  37 31 10  47 39 13  47 39 13
-+56 48 15  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+70 58 37  216 206 146  227 219 152  227 219 152  227 219 152  227 218 146
-+227 218 146  226 217 137  226 217 137  163 154 123  57 50 17  57 50 17
-+57 50 17  57 50 17  47 39 13  47 39 13  37 31 10  37 31 10
-+31 27 8  25 20 6  20 17 5  15 13 4  10 9 3  5 4 1
-+3 3 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  43 43 43  138 129 110  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  66 66 66
-+140 134 120  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+66 66 66  140 134 120  66 66 66  66 66 66  140 134 120  66 66 66
-+138 129 110  66 66 66  138 129 110  138 129 110  66 66 66  138 129 110
-+185 178 149  230 227 201  230 227 202  230 227 202  230 227 202  230 227 202
-+230 227 201  230 227 197  229 226 192  229 226 192  229 226 192  229 226 192
-+229 226 192  229 226 192  229 226 192  100 76 42  57 50 17  57 50 16
-+47 39 13  37 31 10  37 31 10  31 27 8  31 27 8  20 17 5
-+15 13 4  6 6 6  3 3 1  1 1 1  0 0 0  0 0 0
-+0 0 0  1 1 1  2 2 2  3 3 1  5 4 1  5 4 1
-+7 5 2  9 7 3  11 9 3  11 9 3  11 9 3  14 11 4
-+14 11 4  13 11 4  13 11 4  10 9 3  15 13 4  10 9 3
-+10 9 3  15 13 4  16 14 4  16 14 4  14 14 14  24 21 6
-+24 21 6  31 27 8  31 27 8  37 31 10  47 39 13  47 39 13
-+47 39 13  57 50 16  57 50 16  57 50 17  57 50 16  57 50 16
-+57 50 16  90 68 33  226 218 148  227 219 152  227 219 152  227 218 146
-+227 218 146  227 218 146  227 217 139  226 217 137  163 154 123  56 48 15
-+57 50 16  56 48 15  56 48 15  47 39 13  47 39 13  37 31 10
-+37 31 10  27 23 7  24 21 6  18 15 5  14 11 4  9 7 3
-+5 4 1  2 2 2  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  0 0 0  0 0 0
-+2 2 2  22 22 22  138 129 110  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+66 66 66  66 66 66  140 134 120  66 66 66  66 66 66  140 134 120
-+66 66 66  66 66 66  66 66 66  140 134 120  66 66 66  138 129 110
-+66 66 66  138 129 110  66 66 66  138 129 110  66 66 66  138 129 110
-+200 196 176  230 227 202  230 227 201  230 228 209  230 227 202  230 227 197
-+229 226 192  229 226 192  229 226 192  229 226 192  229 226 192  230 227 197
-+229 226 192  229 226 192  229 226 192  66 66 66  57 50 16  57 50 16
-+57 50 16  47 39 13  47 39 13  31 27 8  31 27 8  16 14 4
-+15 13 4  10 9 3  5 4 1  0 0 0  0 0 0  0 0 0
-+2 2 2  3 3 1  5 4 1  7 5 2  11 9 3  14 11 4
-+14 11 4  15 13 4  18 15 5  18 15 5  18 15 5  20 17 5
-+20 17 5  20 17 5  20 17 5  20 17 5  18 15 5  18 15 5
-+16 14 4  16 14 4  16 14 4  20 17 5  16 14 4  24 21 6
-+24 21 6  31 27 8  31 27 8  37 31 10  37 31 10  47 39 13
-+47 39 13  56 48 15  57 50 16  57 50 16  57 50 16  71 53 16
-+57 50 17  57 50 17  114 84 45  227 219 152  227 219 152  227 219 152
-+227 219 152  227 218 146  227 217 139  226 217 137  226 217 137  149 122 79
-+57 50 17  57 50 17  56 48 15  56 48 15  47 39 13  47 39 13
-+37 31 10  31 27 8  27 23 7  23 19 6  18 15 5  13 11 4
-+9 7 3  4 3 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  0 0 0
-+16 16 16  66 66 66  138 129 110  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+66 66 66  140 134 120  66 66 66  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  66 66 66  66 66 66  140 134 120  66 66 66
-+66 66 66  140 134 120  66 66 66  66 66 66  140 134 120  66 66 66
-+138 129 110  66 66 66  138 129 110  135 101 60  138 129 110  66 66 66
-+230 227 197  230 228 209  230 227 201  230 227 201  230 227 197  229 226 192
-+229 226 192  230 227 197  229 226 192  230 227 197  229 226 192  230 227 197
-+230 227 197  230 227 197  230 227 197  100 76 42  57 50 16  57 50 16
-+47 39 13  35 34 31  37 31 10  31 27 8  31 27 8  16 14 4
-+16 14 4  6 6 6  3 3 1  1 1 1  1 1 1  4 3 1
-+5 4 1  9 7 3  11 9 3  14 11 4  17 13 4  18 15 5
-+22 17 5  23 19 6  25 20 6  27 23 7  27 23 7  29 24 7
-+29 24 7  29 24 7  29 24 7  27 23 7  27 23 7  24 21 6
-+24 21 6  24 21 6  20 17 5  20 17 5  24 21 6  20 17 5
-+24 21 6  24 21 6  31 27 8  31 27 8  37 31 10  37 31 10
-+47 39 13  47 39 13  56 48 15  57 50 16  57 50 17  57 50 17
-+71 53 16  57 50 17  57 50 17  149 122 79  227 219 152  227 219 152
-+227 219 152  227 219 152  227 218 146  227 218 146  226 217 137  226 217 137
-+135 101 60  57 50 17  57 50 17  56 48 15  47 39 13  47 39 13
-+44 35 11  37 31 10  31 27 8  27 23 7  22 17 5  16 14 4
-+11 9 3  7 5 2  3 3 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  1 1 1  9 9 9
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+66 66 66  66 66 66  140 134 120  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  140 134 120  66 66 66  66 66 66  138 129 110
-+66 66 66  138 129 110  66 66 66  138 129 110  114 84 45  138 129 110
-+230 227 201  230 227 202  230 227 201  230 227 197  229 226 192  230 227 197
-+230 227 197  229 226 192  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 228 209  100 76 42  57 50 16  57 50 16
-+57 50 16  57 50 16  47 39 13  31 27 8  31 27 8  20 17 5
-+15 13 4  10 9 3  5 4 1  5 4 1  5 4 1  9 7 3
-+13 11 4  15 13 4  18 15 5  22 17 5  25 20 6  27 23 7
-+29 24 7  31 27 8  35 26 8  35 26 8  38 29 9  38 29 9
-+38 29 9  38 29 9  37 31 10  38 29 9  35 26 8  31 27 8
-+31 27 8  29 24 7  27 23 7  24 21 6  24 21 6  24 21 6
-+24 21 6  24 21 6  27 23 7  31 27 8  31 27 8  37 31 10
-+37 31 10  47 39 13  47 39 13  57 50 16  57 50 17  71 53 16
-+57 50 17  71 53 16  57 50 16  57 50 16  163 154 123  227 219 152
-+227 219 152  227 219 152  227 218 146  227 218 146  227 218 146  227 218 146
-+226 217 137  100 76 42  57 50 17  57 50 17  57 50 17  47 39 13
-+47 39 13  37 31 10  37 31 10  31 27 8  25 20 6  18 15 5
-+15 13 4  10 9 3  5 4 1  2 2 2  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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  65 65 65
-+138 129 110  66 66 66  138 129 110  66 66 66  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  66 66 66  66 66 66  140 134 120
-+66 66 66  66 66 66  140 134 120  66 66 66  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  66 66 66  140 134 120  66 66 66
-+140 134 120  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+138 129 110  66 66 66  138 129 110  66 66 66  138 129 110  138 129 110
-+229 226 192  230 227 201  230 227 197  229 226 192  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  114 84 45  58 54 45  57 50 16
-+47 39 13  37 31 10  37 31 10  31 27 8  31 27 8  20 17 5
-+16 14 4  10 9 3  8 7 4  9 7 3  11 9 3  15 13 4
-+18 15 5  23 19 6  25 20 6  29 24 7  31 27 8  35 26 8
-+38 29 9  41 32 10  41 32 10  44 35 11  44 35 11  44 35 11
-+44 35 11  44 35 11  44 35 11  44 35 11  43 33 10  43 33 10
-+41 32 10  38 29 9  37 31 10  31 27 8  29 24 7  27 23 7
-+27 23 7  31 27 8  27 23 7  31 27 8  31 27 8  37 31 10
-+44 35 11  47 39 13  47 39 13  56 48 15  57 50 16  57 50 17
-+71 53 16  71 53 16  71 53 16  57 50 16  80 59 18  185 178 149
-+227 218 146  227 219 152  227 219 152  227 218 146  227 218 146  227 218 146
-+226 217 139  224 212 126  75 62 40  57 50 16  57 50 17  57 50 17
-+56 48 15  47 39 13  37 31 10  37 31 10  27 23 7  23 19 6
-+18 15 5  13 11 4  9 7 3  4 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  2 2 2  42 42 42  66 66 66
-+138 129 110  66 66 66  66 66 66  140 134 120  66 66 66  140 134 120
-+66 66 66  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+66 66 66  140 134 120  66 66 66  66 66 66  140 134 120  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  138 129 110
-+66 66 66  138 129 110  114 84 45  149 122 79  66 66 66  138 129 110
-+230 227 197  229 226 192  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 228 209  135 101 60  57 50 16  57 50 16
-+47 39 13  57 50 16  47 39 13  31 27 8  31 27 8  24 21 6
-+16 14 4  15 13 4  13 11 4  15 13 4  18 15 5  22 17 5
-+25 20 6  29 24 7  31 27 8  35 26 8  41 32 10  44 35 11
-+46 36 11  47 39 13  47 39 13  55 43 14  51 40 13  55 43 14
-+55 43 14  55 43 14  51 40 13  55 43 14  51 40 13  51 40 13
-+46 36 11  46 36 11  43 33 10  41 32 10  38 29 9  35 26 8
-+29 24 7  31 27 8  29 24 7  31 27 8  31 27 8  31 27 8
-+37 31 10  37 31 10  47 39 13  47 39 13  57 50 16  57 50 17
-+57 50 17  71 53 16  57 50 17  71 53 16  71 53 16  90 68 33
-+226 217 139  227 219 152  227 219 152  226 218 148  227 218 146  226 218 148
-+226 217 139  226 217 137  176 168 138  71 53 16  57 50 17  57 50 17
-+56 48 15  47 39 13  47 39 13  37 31 10  37 31 10  27 23 7
-+22 17 5  16 14 4  11 9 3  7 5 2  3 3 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  11 11 11  66 66 66  138 129 110
-+66 66 66  140 134 120  66 66 66  66 66 66  140 134 120  66 66 66
-+66 66 66  140 134 120  66 66 66  66 66 66  66 66 66  66 66 66
-+140 134 120  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+140 134 120  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+66 66 66  140 134 120  66 66 66  140 134 120  66 66 66  138 129 110
-+66 66 66  142 111 68  66 66 66  138 129 110  66 66 66  150 141 118
-+229 226 192  229 226 192  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 199  230 227 199  230 227 199  230 227 199
-+230 227 201  230 227 201  230 227 201  138 129 110  37 31 10  57 50 16
-+57 50 16  47 39 13  37 31 10  37 31 10  31 27 8  24 21 6
-+24 21 6  16 14 4  18 15 5  18 15 5  23 17 5  28 21 6
-+35 26 8  38 29 9  41 32 10  44 35 11  47 39 13  51 40 13
-+55 43 14  55 44 14  58 46 15  56 48 15  59 49 15  59 49 15
-+59 49 15  59 49 15  59 49 15  59 49 15  58 46 15  58 46 15
-+55 43 14  51 40 13  51 40 13  50 37 12  44 35 11  41 32 10
-+38 29 9  35 25 8  35 25 8  35 25 8  35 25 8  35 25 8
-+38 29 9  41 32 10  44 35 11  51 40 13  51 40 13  57 50 16
-+57 50 17  71 53 16  80 59 18  57 50 17  80 59 18  57 50 16
-+142 111 68  227 219 152  227 219 152  227 219 152  226 218 148  227 218 146
-+227 218 146  226 217 137  226 217 137  149 122 79  80 59 18  57 50 17
-+57 50 17  57 50 17  47 39 13  47 39 13  37 31 10  31 27 8
-+25 20 6  18 15 5  14 11 4  9 7 3  5 4 1  2 2 2
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  1 1 1  3 3 3  66 66 66  138 129 110  66 66 66
-+140 134 120  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+140 134 120  66 66 66  66 66 66  66 66 66  140 134 120  66 66 66
-+66 66 66  66 66 66  140 134 120  66 66 66  140 134 120  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  138 129 110  66 66 66
-+66 66 66  138 129 110  66 66 66  135 101 60  75 62 40  138 129 110
-+229 226 192  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 199  230 227 199  230 227 201  230 227 201  230 227 201  230 227 201
-+230 227 201  230 227 201  227 222 178  138 129 110  57 50 16  57 50 16
-+57 50 16  57 50 16  47 39 13  37 31 10  31 27 8  27 23 7
-+27 23 7  25 20 6  23 17 5  28 21 6  29 24 7  35 26 8
-+37 31 10  43 33 10  46 36 11  51 40 13  55 44 14  55 44 14
-+59 49 15  57 50 17  67 48 15  59 49 15  71 53 16  71 53 16
-+71 53 16  71 53 16  71 53 16  71 53 16  67 48 15  59 49 15
-+67 48 15  58 46 15  58 46 15  55 43 14  51 40 13  50 37 12
-+44 35 11  41 32 10  38 27 8  38 27 8  35 25 8  35 25 8
-+38 27 8  38 29 9  43 33 10  50 37 12  51 40 13  59 49 15
-+57 50 16  57 50 17  80 59 18  57 50 17  80 59 18  71 53 16
-+71 53 16  163 154 123  227 219 152  227 219 152  227 219 152  227 218 146
-+227 218 146  227 218 146  226 217 137  226 217 137  114 84 45  57 50 17
-+71 53 16  57 50 17  56 48 15  47 39 13  47 39 13  37 31 10
-+29 24 7  23 19 6  18 15 5  13 11 4  7 5 2  4 3 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  41 41 41  66 66 66  66 66 66  138 129 110
-+66 66 66  140 134 120  66 66 66  66 66 66  140 134 120  66 66 66
-+66 66 66  66 66 66  140 134 120  66 66 66  66 66 66  66 66 66
-+140 134 120  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  140 134 120  66 66 66  66 66 66  66 66 66
-+140 134 120  66 66 66  66 66 66  66 66 66  66 66 66  138 129 110
-+66 66 66  142 111 68  66 66 66  71 64 51  57 50 16  150 141 118
-+228 223 179  230 227 197  230 227 197  230 227 199  230 227 199  230 227 199
-+230 227 201  230 227 201  230 227 201  230 227 201  230 227 202  230 227 202
-+230 227 202  230 227 202  230 227 202  138 129 110  47 39 13  57 50 16
-+57 50 16  47 39 13  47 39 13  47 39 13  31 27 8  31 27 8
-+31 27 8  29 24 7  31 27 8  35 25 8  38 29 9  43 33 10
-+46 36 11  51 40 13  55 43 14  58 46 15  59 49 15  67 48 15
-+71 53 16  71 53 16  71 53 16  71 53 16  80 59 18  71 53 16
-+71 53 16  80 59 18  71 53 16  71 53 16  71 53 16  71 53 16
-+71 53 16  71 53 16  59 49 15  59 49 15  58 46 15  55 43 14
-+50 37 12  46 36 11  43 33 10  38 27 8  38 27 8  38 27 8
-+38 27 8  41 32 10  38 29 9  46 36 11  51 40 13  55 43 14
-+59 49 15  57 50 16  71 53 16  80 59 18  57 50 17  80 59 18
-+80 59 18  90 68 33  224 214 136  227 220 160  227 219 152  227 219 152
-+227 218 146  227 218 146  227 218 146  226 217 139  224 212 126  75 61 38
-+71 53 16  57 50 17  57 50 17  55 44 14  47 39 13  44 35 11
-+37 31 10  24 21 6  20 17 5  15 13 4  10 9 3  5 4 1
-+2 2 2  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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
-+1 1 1  5 5 5  138 129 110  66 66 66  140 134 120  66 66 66
-+66 66 66  66 66 66  140 134 120  66 66 66  66 66 66  66 66 66
-+140 134 120  66 66 66  66 66 66  66 66 66  140 134 120  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  140 134 120
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  138 129 110  66 66 66  114 84 45
-+66 66 66  142 111 68  71 64 51  57 50 16  57 50 16  150 141 118
-+230 227 197  230 227 199  230 227 199  230 227 201  230 227 201  230 227 201
-+230 227 201  230 227 202  230 227 202  230 227 202  230 227 202  230 227 202
-+230 227 202  230 228 209  229 226 192  138 129 110  57 50 16  57 50 16
-+57 50 16  57 50 16  47 39 13  37 31 10  44 35 11  37 31 10
-+37 31 10  35 26 8  38 29 9  38 29 9  41 32 10  46 36 11
-+51 40 13  55 44 14  59 49 15  59 49 15  71 53 16  71 53 16
-+80 59 18  71 53 16  80 59 18  71 53 16  80 59 18  70 58 37
-+71 53 16  80 59 18  70 58 37  80 59 18  80 59 18  80 59 18
-+71 53 16  79 57 18  71 53 16  71 53 16  67 48 15  59 45 14
-+59 45 14  51 40 13  50 37 12  49 31 9  38 29 9  48 30 8
-+38 27 8  48 30 8  38 29 9  43 33 10  46 36 11  51 40 13
-+59 49 15  57 50 16  57 50 17  71 53 16  80 59 18  57 50 17
-+80 59 18  57 50 17  142 111 68  227 219 152  227 219 152  227 219 152
-+227 218 146  227 218 146  227 218 146  226 217 139  224 212 126  163 154 123
-+71 53 16  71 53 16  59 49 15  57 50 16  55 44 14  47 39 13
-+44 35 11  29 24 7  24 21 6  18 15 5  13 11 4  9 7 3
-+4 3 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  52 52 52  66 66 66  138 129 110  66 66 66  66 66 66
-+140 134 120  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+66 66 66  66 66 66  140 134 120  66 66 66  66 66 66  66 66 66
-+66 66 66  140 134 120  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  138 129 110
-+66 66 66  71 64 51  57 50 16  57 50 16  57 50 16  163 154 123
-+229 226 192  230 227 201  230 227 201  230 227 201  230 227 201  230 227 202
-+230 227 202  230 227 202  230 227 202  231 228 207  230 227 204  230 227 204
-+230 228 209  230 227 202  230 228 209  150 141 118  57 50 16  57 50 16
-+57 50 16  57 50 16  47 39 13  47 39 13  47 39 13  37 31 10
-+44 35 11  43 33 10  43 33 10  44 35 11  50 37 12  55 43 14
-+58 46 15  59 49 15  71 53 16  71 53 16  80 59 18  71 53 16
-+70 58 37  80 59 18  90 68 33  138 129 110  163 154 123  200 196 176
-+192 187 164  200 196 176  185 178 149  163 154 123  135 101 60  70 58 37
-+80 59 18  80 59 18  80 59 18  71 53 16  71 53 16  71 53 16
-+59 49 15  60 42 13  51 40 13  50 37 12  43 33 10  41 32 10
-+38 27 8  38 27 8  38 27 8  48 30 8  46 36 11  50 37 12
-+55 43 14  59 49 15  71 53 16  57 50 17  80 59 18  80 59 18
-+80 59 18  80 59 18  57 50 17  185 178 149  227 218 146  227 219 152
-+227 219 152  227 218 146  227 218 146  227 218 146  226 217 137  226 217 137
-+118 85 44  71 53 16  71 53 16  57 50 17  57 50 16  51 40 13
-+47 39 13  37 31 10  27 23 7  22 17 5  16 14 4  11 9 3
-+5 4 1  2 2 2  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  1 1 1  2 2 2
-+14 14 14  138 129 110  66 66 66  66 66 66  140 134 120  66 66 66
-+66 66 66  140 134 120  66 66 66  66 66 66  66 66 66  66 66 66
-+140 134 120  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  138 129 110  114 84 45  66 66 66
-+71 64 51  57 50 16  57 50 16  57 50 16  57 50 16  176 168 138
-+230 227 199  230 227 201  230 227 201  230 227 202  230 227 202  230 227 202
-+230 227 202  231 228 207  230 227 204  230 227 205  230 227 204  230 228 209
-+230 227 202  230 228 209  230 227 199  176 168 138  57 50 16  57 50 16
-+57 50 16  57 50 16  47 39 13  56 48 15  47 39 13  47 39 13
-+47 39 13  46 36 11  50 37 12  50 37 12  55 43 14  59 49 15
-+59 49 15  71 53 16  71 53 16  71 53 16  80 59 18  71 53 16
-+100 76 42  163 154 123  229 226 196  230 227 197  230 227 197  230 227 197
-+229 226 192  229 226 192  229 226 192  229 226 192  229 226 196  224 217 160
-+138 129 110  80 59 18  80 59 18  80 59 18  80 59 18  71 53 16
-+71 53 16  67 48 15  59 45 14  57 41 13  50 37 12  49 31 9
-+48 30 8  38 27 8  48 30 8  41 32 10  48 30 8  50 37 12
-+51 40 13  59 49 15  57 50 16  80 59 18  57 50 17  80 59 18
-+70 58 37  80 59 18  80 59 18  107 78 37  226 218 148  227 219 152
-+227 219 152  227 219 152  227 218 146  227 218 146  226 217 137  226 217 137
-+224 212 126  80 59 18  71 53 16  71 53 16  59 49 15  56 48 15
-+51 40 13  44 35 11  31 27 8  25 20 6  18 15 5  14 11 4
-+9 7 3  4 3 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  1 1 1
-+66 66 66  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+66 66 66  66 66 66  140 134 120  66 66 66  66 66 66  140 134 120
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  176 168 138
-+229 226 196  230 227 202  230 227 202  230 227 202  230 228 209  230 227 202
-+231 228 207  230 227 204  231 228 207  230 228 209  230 227 205  230 227 205
-+230 228 209  230 228 209  230 228 209  176 168 138  57 50 16  80 59 18
-+57 50 17  57 50 16  57 50 16  56 48 15  47 39 13  55 44 14
-+51 40 13  51 40 13  51 40 13  55 43 14  58 46 15  59 49 15
-+71 53 16  79 57 18  80 59 18  70 58 37  80 59 18  138 129 110
-+229 226 192  230 227 202  230 227 202  230 227 202  230 227 201  230 227 199
-+230 227 199  230 227 197  230 227 197  230 227 197  229 226 196  229 226 196
-+229 226 192  192 187 164  100 76 42  80 59 18  80 59 18  80 59 18
-+79 57 18  71 53 16  67 48 15  60 42 13  57 41 13  50 37 12
-+49 31 9  48 30 8  41 32 10  38 27 8  48 30 8  49 31 9
-+51 40 13  60 42 13  59 49 15  59 49 15  80 59 18  71 53 16
-+80 59 18  80 59 18  80 59 18  80 59 18  163 154 123  227 218 146
-+227 219 152  227 219 152  227 218 146  227 218 146  227 218 146  226 217 137
-+226 217 137  149 122 79  80 59 18  57 50 17  71 53 16  57 50 17
-+55 44 14  47 39 13  37 31 10  27 23 7  23 19 6  16 14 4
-+11 9 3  7 5 2  2 2 2  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  2 2 2  35 35 35
-+66 66 66  140 134 120  66 66 66  66 66 66  66 66 66  140 134 120
-+66 66 66  140 134 120  66 66 66  66 66 66  66 66 66  140 134 120
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  176 168 138
-+230 227 202  230 227 201  230 228 209  230 227 204  230 227 204  230 227 205
-+230 227 205  231 228 207  230 227 204  231 228 207  230 228 209  230 228 209
-+230 227 204  230 228 209  230 228 209  192 187 164  57 50 17  71 53 16
-+57 50 17  57 50 17  57 50 16  56 48 15  56 48 15  55 44 14
-+58 46 15  59 45 14  58 46 15  59 49 15  67 48 15  71 53 16
-+71 53 16  80 59 18  80 59 18  80 59 18  150 141 118  229 226 196
-+230 227 202  230 227 204  230 227 204  230 227 202  230 227 202  230 227 201
-+230 227 201  230 227 201  230 227 199  230 227 199  229 226 196  229 226 196
-+230 227 197  230 227 197  227 222 178  114 84 45  90 65 21  80 59 18
-+80 59 18  79 57 18  71 53 16  67 48 15  60 42 13  57 41 13
-+49 31 9  48 30 8  48 30 8  48 30 8  48 30 8  49 31 9
-+50 37 12  60 42 13  59 49 15  57 50 16  71 53 16  57 50 16
-+80 59 18  80 59 18  80 59 18  80 59 18  96 71 33  226 218 148
-+227 219 152  227 219 152  227 218 146  227 218 146  227 218 146  226 217 139
-+226 217 137  226 217 137  90 68 33  80 59 18  71 53 16  59 49 15
-+58 46 15  55 43 14  44 35 11  31 27 8  25 20 6  18 15 5
-+14 11 4  9 7 3  4 3 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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  66 66 66
-+66 66 66  66 66 66  138 129 110  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  138 129 110  65 65 65  57 50 16  37 31 10
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  185 178 149
-+230 228 209  230 227 201  230 228 209  230 227 202  230 228 209  230 228 209
-+230 228 209  231 228 207  230 228 209  231 228 207  230 228 209  231 228 207
-+230 228 209  230 228 209  230 228 209  200 196 176  80 59 18  57 50 17
-+80 59 18  57 50 17  71 53 16  57 50 16  59 49 15  67 48 15
-+59 49 15  67 48 15  59 49 15  69 49 15  71 53 16  71 53 16
-+80 59 18  80 59 18  80 59 18  138 129 110  230 227 199  230 228 209
-+230 228 209  230 227 204  230 227 204  230 227 204  230 227 202  230 227 202
-+230 227 202  230 227 201  230 227 201  230 227 199  230 227 199  230 227 197
-+230 227 197  230 227 197  229 226 196  227 222 178  100 76 42  80 59 18
-+90 65 21  80 59 18  71 53 16  71 53 16  67 48 15  60 42 13
-+58 38 12  49 31 9  49 31 9  48 30 8  43 33 10  48 30 8
-+50 37 12  58 38 12  60 42 13  67 48 15  71 53 16  80 59 18
-+80 59 18  80 59 18  80 59 18  80 59 18  80 59 18  149 122 79
-+227 220 160  227 219 152  227 219 152  227 218 146  227 218 146  227 218 146
-+226 217 137  226 217 137  163 154 123  80 59 18  71 53 16  71 53 16
-+57 50 17  59 49 15  51 40 13  37 31 10  27 23 7  23 19 6
-+16 14 4  11 9 3  5 4 1  2 2 2  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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  1 1 1  7 7 7  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  140 134 120  66 66 66
-+66 66 66  140 134 120  66 66 66  66 66 66  140 134 120  66 66 66
-+66 66 66  66 66 66  66 66 66  140 134 120  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  65 65 65  37 31 10  31 27 8  47 39 13
-+37 31 10  57 50 16  57 50 16  57 50 16  57 50 16  185 178 149
-+230 227 202  230 227 202  230 228 209  230 227 204  230 228 209  231 228 207
-+231 228 207  231 228 207  230 228 209  231 228 207  230 228 209  230 228 209
-+230 228 209  230 228 209  230 228 209  229 226 192  57 50 17  80 59 18
-+71 53 16  71 53 16  57 50 17  71 53 16  67 48 15  67 48 15
-+67 48 15  67 48 15  71 53 16  71 53 16  71 53 16  80 59 18
-+80 59 18  75 61 38  114 84 45  230 227 202  231 228 207  230 228 209
-+230 227 204  230 228 209  230 227 205  230 227 205  230 227 202  231 228 207
-+230 227 202  230 227 202  230 227 201  230 227 201  230 227 199  230 227 199
-+230 227 197  230 227 197  230 227 197  230 227 197  192 187 164  90 68 33
-+90 65 21  80 59 18  80 59 18  78 55 17  71 51 16  67 48 15
-+60 42 13  57 34 10  49 31 9  48 30 8  48 30 8  48 30 8
-+49 31 9  57 34 10  60 42 13  59 49 15  71 53 16  57 50 16
-+80 59 18  80 59 18  80 59 18  80 59 18  90 65 21  96 71 33
-+227 219 152  227 219 152  227 219 152  227 219 152  227 218 146  227 218 146
-+226 217 139  226 217 137  224 212 126  110 81 38  71 53 16  80 59 18
-+71 53 16  59 49 15  55 43 14  37 31 10  31 27 8  25 20 6
-+18 15 5  13 11 4  9 7 3  4 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  4 4 4
-+12 12 12  26 26 26  42 42 42  65 65 65  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  65 65 65  65 65 65
-+66 66 66  66 66 66  35 35 35  31 27 8  31 27 8  47 39 13
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  185 178 149
-+230 228 209  230 228 209  230 227 202  230 228 209  230 228 209  230 227 204
-+230 228 209  231 228 207  231 229 212  231 228 207  231 229 212  231 229 212
-+230 228 209  231 229 212  230 228 209  230 228 209  71 53 16  80 59 18
-+57 50 17  80 59 18  71 53 16  71 53 16  71 53 16  71 53 16
-+71 53 16  71 53 16  71 53 16  79 57 18  80 59 18  80 59 18
-+90 65 21  80 59 18  200 196 176  230 228 209  230 228 209  231 228 207
-+231 228 207  230 228 209  230 227 205  231 228 207  230 227 205  230 227 204
-+230 227 204  230 227 202  230 227 202  230 227 201  230 227 201  230 227 201
-+230 227 199  230 227 197  230 227 197  230 227 197  230 227 197  149 122 79
-+90 65 21  90 65 21  80 59 18  80 59 18  71 53 16  69 49 15
-+60 42 13  58 38 12  57 34 10  49 31 9  48 30 8  48 30 8
-+49 31 9  57 34 10  58 38 12  60 42 13  67 48 15  71 53 16
-+80 59 18  80 59 18  80 59 18  90 68 33  80 59 18  80 59 18
-+163 154 123  226 217 139  227 219 152  227 219 152  227 218 146  227 218 146
-+227 218 146  226 217 137  226 217 137  163 154 123  80 59 18  80 59 18
-+71 53 16  71 53 16  58 46 15  47 39 13  37 31 10  27 23 7
-+22 17 5  15 13 4  10 9 3  5 4 1  2 2 2  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  2 2 2  4 4 4
-+6 6 6  10 10 10  13 13 13  18 18 18  26 26 26  50 50 50
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  65 65 65  52 52 52  52 52 52  65 65 65
-+52 52 52  45 45 45  19 19 19  31 27 8  31 27 8  47 39 13
-+37 31 10  57 50 16  57 50 16  57 50 16  57 50 16  185 178 149
-+230 227 202  230 228 209  230 228 209  230 228 209  230 228 209  230 228 209
-+230 228 209  231 228 207  231 229 212  230 228 209  231 229 212  230 228 209
-+231 229 212  231 229 212  231 229 212  231 229 212  75 62 40  80 59 18
-+80 59 18  80 59 18  71 53 16  80 59 18  71 53 16  71 53 16
-+71 53 16  80 59 18  71 53 16  80 59 18  80 59 18  80 59 18
-+80 59 18  142 111 68  230 228 209  230 228 209  230 228 209  230 228 209
-+230 228 209  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+231 228 207  230 227 204  230 227 202  230 227 202  230 227 201  230 227 201
-+230 227 201  230 227 199  230 227 197  229 226 196  229 226 196  227 222 178
-+91 66 24  90 65 21  90 65 21  80 59 18  79 57 18  71 51 16
-+68 47 15  60 42 13  58 38 12  49 31 9  48 30 8  48 30 8
-+48 30 8  50 37 12  58 38 12  59 45 14  59 49 15  71 53 16
-+71 53 16  80 59 18  80 59 18  80 59 18  90 65 21  80 59 18
-+97 69 27  227 219 152  227 219 152  227 219 152  227 219 152  227 218 146
-+227 218 146  226 217 137  226 217 137  226 217 137  110 81 38  80 59 18
-+71 53 16  71 53 16  59 49 15  51 40 13  37 31 10  31 27 8
-+24 21 6  18 15 5  13 11 4  7 5 2  3 3 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1
-+2 2 2  4 4 4  6 6 6  8 8 8  11 11 11  16 16 16
-+22 22 22  30 30 30  52 52 52  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+65 65 65  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  19 19 19  24 21 6  31 27 8  37 31 10  47 39 13
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 17  185 178 149
-+230 228 209  230 228 209  230 228 209  230 227 204  230 228 209  230 228 209
-+231 229 212  231 229 212  231 229 212  230 228 210  231 229 212  231 229 212
-+231 229 212  231 229 212  231 229 212  231 229 212  100 76 42  75 61 38
-+80 59 18  71 53 16  80 59 18  71 53 16  80 59 18  80 59 18
-+80 59 18  80 59 18  80 59 18  80 59 18  80 59 18  90 68 33
-+80 59 18  176 168 138  230 228 210  231 229 212  230 228 209  230 228 209
-+230 228 209  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+230 227 204  230 227 205  230 227 204  230 227 202  230 227 202  230 227 201
-+230 227 201  230 227 199  230 227 199  230 227 197  229 226 196  229 226 196
-+135 101 60  90 65 21  90 65 21  90 65 21  79 57 18  78 55 17
-+69 49 15  68 47 15  62 38 11  56 33 8  49 31 9  48 30 8
-+49 31 9  56 33 8  57 34 10  60 42 13  68 47 15  71 53 16
-+71 53 16  80 59 18  80 59 18  90 65 21  90 65 21  90 65 21
-+80 59 18  163 154 123  227 219 152  227 219 152  227 219 152  227 218 146
-+227 218 146  227 218 146  226 217 137  226 217 137  163 154 123  90 65 21
-+80 59 18  71 53 16  71 53 16  59 49 15  41 32 10  31 27 8
-+27 23 7  20 17 5  15 13 4  9 7 3  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  1 1 1
-+2 2 2  2 2 2  4 4 4  6 6 6  8 8 8  11 11 11
-+14 14 14  20 20 20  26 26 26  33 33 33  50 50 50  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  65 65 65  65 65 65  65 65 65  52 52 52
-+52 52 52  65 65 65  52 52 52  52 52 52  52 52 52  52 52 52
-+24 24 24  14 14 14  24 21 6  31 27 8  31 27 8  47 39 13
-+35 34 31  47 39 13  57 50 16  57 50 17  57 50 17  176 168 138
-+230 228 209  230 228 209  230 228 209  230 228 209  231 229 212  230 228 209
-+231 229 212  230 228 210  231 229 212  231 229 212  231 229 212  231 229 214
-+231 229 214  231 229 214  231 229 212  231 230 220  142 111 68  80 59 18
-+80 59 18  80 59 18  80 59 18  80 59 18  75 61 38  80 59 18
-+80 59 18  80 59 18  80 59 18  91 66 24  80 59 18  90 65 21
-+80 59 18  229 226 196  231 229 212  231 229 212  231 229 212  231 229 212
-+231 229 212  230 228 209  231 228 207  230 228 209  231 228 207  231 228 207
-+231 228 207  231 228 207  230 227 205  230 227 204  230 227 202  230 227 202
-+230 227 201  230 227 201  230 227 199  230 227 199  229 226 196  229 226 196
-+163 154 123  91 66 24  90 65 21  90 65 21  80 59 18  79 57 18
-+75 50 15  68 47 15  62 38 11  57 34 10  56 33 8  48 30 8
-+49 31 9  49 31 9  58 38 12  62 38 11  68 47 15  71 53 16
-+71 53 16  80 59 18  80 59 18  80 59 18  90 65 21  90 65 21
-+90 65 21  134 96 54  227 219 152  227 219 152  227 219 152  227 218 146
-+227 218 146  227 218 146  226 217 137  226 217 137  224 212 126  110 81 38
-+80 59 18  80 59 18  71 53 16  67 48 15  47 39 13  37 31 10
-+29 24 7  23 19 6  18 15 5  13 11 4  7 5 2  3 3 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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
-+1 1 1  1 1 1  1 1 1  2 2 2  3 3 3  5 5 5
-+6 6 6  9 9 9  12 12 12  16 16 16  20 20 20  27 27 27
-+35 35 35  52 52 52  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  65 65 65  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  37 37 37
-+14 14 14  11 11 11  24 21 6  31 27 8  37 31 10  47 39 13
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 17  176 168 138
-+230 228 209  230 228 209  230 228 209  230 228 209  231 229 212  231 229 212
-+231 229 212  231 229 212  231 229 214  231 229 214  231 229 214  231 229 214
-+231 229 214  231 229 214  231 229 214  231 229 214  138 129 110  57 50 16
-+80 59 18  80 59 18  80 59 18  80 59 18  80 59 18  80 59 18
-+80 59 18  90 68 33  80 59 18  90 65 21  90 65 21  90 65 21
-+100 76 42  230 228 210  230 228 210  231 229 212  231 229 212  230 228 209
-+231 229 212  230 228 209  230 228 209  230 228 209  231 228 207  231 228 207
-+231 228 207  231 228 207  231 228 207  230 227 205  230 227 204  230 227 202
-+230 227 202  230 227 201  230 227 201  230 227 199  229 226 196  229 226 196
-+185 178 149  90 65 21  91 66 24  91 66 24  90 65 21  80 59 18
-+75 50 15  68 47 15  68 47 15  57 34 10  56 33 8  48 30 8
-+56 33 8  56 33 8  57 34 10  62 38 11  60 42 13  69 49 15
-+71 53 16  80 59 18  80 59 18  90 65 21  90 65 21  90 65 21
-+90 65 21  90 65 21  216 206 146  226 218 148  227 219 152  226 218 148
-+227 218 146  227 218 146  227 217 139  226 217 137  226 217 137  163 154 123
-+80 59 18  80 59 18  80 59 18  71 53 16  56 48 15  37 31 10
-+31 27 8  25 20 6  18 15 5  14 11 4  9 7 3  4 3 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1  1 1 1  1 1 1  2 2 2  3 3 3
-+4 4 4  6 6 6  7 7 7  10 10 10  13 13 13  18 18 18
-+22 22 22  30 30 30  37 37 37  47 47 47  65 65 65  65 65 65
-+65 65 65  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  50 50 50  50 50 50  47 47 47  12 12 12
-+9 9 9  16 14 4  24 21 6  31 27 8  31 27 8  47 39 13
-+37 31 10  57 50 16  57 50 16  57 50 17  57 50 17  176 168 138
-+230 228 209  230 228 209  230 228 209  231 229 212  231 229 212  231 229 212
-+231 229 212  231 229 212  231 229 214  231 229 214  231 229 214  231 229 214
-+231 229 214  231 229 214  231 229 214  230 228 209  138 129 110  80 59 18
-+90 65 21  80 59 18  80 59 18  80 59 18  90 65 21  80 59 18
-+90 65 21  80 59 18  90 65 21  91 66 24  80 59 18  90 68 33
-+114 84 45  231 229 214  231 229 214  231 229 214  231 229 212  231 229 212
-+230 228 210  231 229 212  230 228 210  230 228 209  230 228 209  231 228 207
-+231 228 207  231 228 207  230 227 205  231 228 207  230 227 205  230 227 204
-+230 227 202  230 227 202  230 227 201  230 227 201  230 227 199  230 227 201
-+216 206 146  97 69 27  97 69 27  90 65 21  90 63 20  80 59 18
-+78 55 17  75 50 15  68 47 15  62 38 11  57 34 10  56 33 8
-+48 30 8  56 33 8  57 34 10  62 38 11  62 38 11  69 49 15
-+71 53 16  80 59 18  80 59 18  80 59 18  90 65 21  90 65 21
-+90 65 21  80 59 18  149 122 79  227 219 152  227 219 152  227 219 152
-+227 218 146  227 218 146  227 218 146  226 217 137  224 212 126  224 212 126
-+90 65 21  80 59 18  80 59 18  71 53 16  57 50 17  37 31 10
-+37 31 10  27 23 7  22 17 5  15 13 4  10 9 3  5 4 1
-+2 2 2  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1  1 1 1  1 1 1
-+2 2 2  2 2 2  3 3 3  4 4 4  6 6 6  8 8 8
-+10 10 10  13 13 13  17 17 17  21 21 21  26 26 26  35 35 35
-+50 50 50  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  49 49 49  47 47 47  46 46 46  28 28 28  11 11 11
-+8 8 8  11 11 11  24 21 6  31 27 8  31 27 8  47 39 13
-+57 50 16  57 50 16  57 50 16  57 50 17  57 50 17  163 154 123
-+231 230 220  230 228 209  231 229 212  231 229 212  231 229 212  231 229 214
-+231 229 214  231 229 214  231 229 214  231 229 214  231 229 214  231 229 217
-+231 229 217  231 229 217  231 230 220  231 229 214  163 154 123  80 59 18
-+80 59 18  90 68 33  80 59 18  91 66 24  80 59 18  90 68 33
-+90 65 21  90 65 21  90 65 21  90 65 21  91 66 24  90 65 21
-+135 101 60  231 230 220  231 229 214  231 229 214  231 229 214  231 229 214
-+231 229 212  231 229 212  230 228 210  230 228 210  230 228 210  230 228 209
-+231 228 207  231 228 207  231 228 207  231 228 207  230 227 205  230 227 205
-+230 227 204  230 227 202  230 227 202  230 227 201  230 227 201  230 227 199
-+200 196 176  97 69 27  97 69 27  90 65 21  90 65 21  90 63 20
-+78 55 17  75 50 15  68 47 15  62 38 11  62 38 11  56 33 8
-+48 30 8  56 33 8  56 33 8  62 38 11  62 38 11  68 47 15
-+75 50 15  78 55 17  80 59 18  90 65 21  90 65 21  90 65 21
-+90 65 21  90 65 21  107 78 37  226 218 148  227 219 152  227 219 152
-+227 218 146  227 218 146  227 218 146  226 217 137  226 217 137  226 217 137
-+142 111 68  80 59 18  80 59 18  80 59 18  71 53 16  47 39 13
-+37 31 10  29 24 7  24 21 6  18 15 5  13 11 4  7 5 2
-+3 3 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1
-+1 1 1  1 1 1  2 2 2  3 3 3  4 4 4  5 5 5
-+7 7 7  8 8 8  10 10 10  13 13 13  17 17 17  24 24 24
-+30 30 30  42 42 42  52 52 52  52 52 52  52 52 52  49 49 49
-+47 47 47  46 46 46  45 45 45  38 38 38  9 9 9  5 5 5
-+7 7 7  16 14 4  24 21 6  31 27 8  37 31 10  35 34 31
-+47 39 13  57 50 16  57 50 17  57 50 17  57 50 17  150 141 118
-+230 228 210  230 228 210  231 229 212  231 229 212  231 229 214  231 229 214
-+231 229 214  231 229 214  231 229 214  231 229 217  231 229 217  231 229 217
-+231 230 220  231 229 214  231 230 220  231 230 220  185 178 149  80 59 18
-+90 65 21  80 59 18  90 65 21  90 65 21  90 65 21  90 65 21
-+90 65 21  90 65 21  91 66 24  90 65 21  91 66 24  91 66 24
-+100 76 42  231 229 214  231 229 214  231 229 214  231 229 214  231 229 214
-+231 229 214  231 229 212  231 229 212  231 229 212  230 228 210  230 228 210
-+230 228 209  231 228 207  231 228 207  231 228 207  230 227 205  230 227 205
-+230 227 204  230 227 204  230 227 202  230 227 201  230 227 202  229 226 196
-+216 206 146  90 65 21  104 73 28  104 73 28  90 63 20  90 63 20
-+78 55 17  75 50 15  75 50 15  62 38 11  62 38 11  56 33 8
-+56 33 8  56 33 8  56 33 8  62 38 11  62 38 11  68 47 15
-+75 50 15  71 53 16  80 59 18  80 59 18  90 65 21  90 65 21
-+91 66 24  90 65 21  90 65 21  176 168 138  227 220 160  227 219 152
-+227 219 152  227 218 146  227 218 146  226 217 139  226 217 137  224 212 126
-+224 212 126  90 65 21  80 59 18  80 59 18  79 57 18  47 39 13
-+37 31 10  31 27 8  25 20 6  18 15 5  14 11 4  9 7 3
-+4 3 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  1 1 1  1 1 1  1 1 1  1 1 1  2 2 2
-+3 3 3  4 4 4  5 5 5  6 6 6  8 8 8  10 10 10
-+14 14 14  18 18 18  25 25 25  37 37 37  47 47 47  47 47 47
-+46 46 46  45 45 45  43 43 43  22 22 22  11 11 11  6 6 6
-+7 7 7  16 14 4  24 21 6  31 27 8  31 27 8  47 39 13
-+57 50 16  57 50 16  57 50 16  57 50 17  70 58 37  150 141 118
-+231 229 212  231 229 212  231 229 214  231 229 214  231 229 214  231 229 214
-+231 229 214  231 229 214  231 229 217  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 230 220  200 196 176  80 59 18
-+90 65 21  90 68 33  80 59 18  91 66 24  90 65 21  90 65 21
-+90 65 21  90 65 21  91 66 24  91 66 24  91 66 24  91 66 24
-+96 71 33  230 228 209  231 230 220  231 229 214  231 229 214  231 229 214
-+231 229 214  231 229 214  231 229 212  231 229 212  231 229 212  230 228 210
-+230 228 210  230 228 209  231 228 207  231 228 207  231 228 207  230 227 205
-+230 227 205  230 227 204  230 227 202  230 227 202  230 227 201  230 227 201
-+176 168 138  97 69 27  104 73 28  90 65 21  90 65 21  90 63 20
-+80 59 18  75 50 15  75 50 15  62 38 11  62 38 11  57 34 10
-+56 33 8  56 33 8  56 33 8  57 34 10  62 38 11  68 47 15
-+75 50 15  75 50 15  80 59 18  90 65 21  90 65 21  90 65 21
-+91 66 24  97 69 27  90 65 21  156 118 66  227 219 152  227 219 152
-+227 219 152  227 218 146  227 218 146  227 218 146  226 217 137  226 217 137
-+224 212 126  100 74 37  90 65 21  80 59 18  80 59 18  56 48 15
-+44 35 11  37 31 10  29 24 7  23 19 6  15 13 4  10 9 3
-+5 4 1  2 2 2  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  1 1 1  1 1 1
-+1 1 1  2 2 2  3 3 3  4 4 4  5 5 5  7 7 7
-+9 9 9  12 12 12  17 17 17  22 22 22  32 32 32  41 41 41
-+45 45 45  43 43 43  35 35 35  9 9 9  5 5 5  3 3 3
-+10 9 3  15 13 4  24 21 6  31 27 8  37 31 10  47 39 13
-+57 50 16  57 50 16  57 50 16  71 53 16  57 50 16  150 141 118
-+231 229 212  231 229 212  231 229 214  231 229 214  231 229 214  231 229 214
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  231 229 217
-+231 229 217  231 230 220  231 230 220  231 229 217  229 226 192  91 66 24
-+80 59 18  90 65 21  90 65 21  90 65 21  90 65 21  91 66 24
-+91 66 24  91 66 24  91 66 24  91 66 24  91 66 24  97 69 27
-+91 66 24  192 187 164  231 229 217  231 229 217  231 229 217  231 229 214
-+231 229 214  231 229 214  231 229 214  231 229 212  231 229 212  231 229 212
-+230 228 210  230 228 209  230 228 209  231 228 207  231 228 207  231 228 207
-+230 227 205  230 227 205  230 227 204  230 227 202  230 227 202  230 227 197
-+149 122 79  104 73 28  104 73 28  104 73 28  90 63 20  90 63 20
-+90 63 20  75 50 15  75 50 15  75 50 15  62 38 11  62 38 11
-+56 33 8  56 33 8  56 33 8  62 38 11  62 38 11  62 38 11
-+75 50 15  78 55 17  80 59 18  80 59 18  90 65 21  90 65 21
-+90 65 21  104 73 28  90 65 21  110 81 38  227 219 152  227 219 152
-+227 219 152  227 218 146  227 218 146  227 218 146  226 217 137  226 217 137
-+226 217 137  149 122 79  90 65 21  80 59 18  80 59 18  57 50 17
-+44 35 11  37 31 10  31 27 8  24 21 6  18 15 5  13 11 4
-+7 5 2  3 3 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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
-+1 1 1  1 1 1  1 1 1  1 1 1  2 2 2  3 3 3
-+4 4 4  5 5 5  8 8 8  10 10 10  14 14 14  18 18 18
-+25 25 25  41 41 41  21 21 21  10 10 10  5 5 5  4 4 4
-+6 6 6  15 13 4  24 21 6  31 27 8  37 31 10  47 39 13
-+57 50 16  57 50 16  57 50 17  80 59 18  57 50 16  138 129 110
-+230 227 202  231 229 214  231 229 214  231 229 214  231 229 214  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  231 230 220
-+231 229 217  231 230 220  231 230 220  231 230 220  230 228 210  75 61 38
-+90 65 21  90 65 21  90 65 21  91 66 24  90 65 21  91 66 24
-+90 65 21  91 66 24  91 66 24  104 73 28  90 65 21  104 73 28
-+90 65 21  150 141 118  231 229 212  231 229 214  231 229 217  231 229 217
-+231 229 214  231 229 214  231 229 214  231 229 214  231 229 212  231 229 212
-+231 229 212  230 228 210  230 228 209  231 228 207  231 228 207  231 228 207
-+230 227 205  230 227 205  230 227 205  230 227 204  230 227 202  229 226 196
-+110 81 38  104 73 28  104 73 28  90 65 21  90 65 21  90 63 20
-+90 63 20  75 50 15  75 50 15  75 50 15  62 38 11  62 38 11
-+56 33 8  56 33 8  57 34 10  62 38 11  62 38 11  75 50 15
-+68 47 15  75 50 15  78 55 17  90 63 20  90 65 21  90 65 21
-+97 69 27  97 69 27  90 65 21  104 73 28  224 212 126  226 218 148
-+227 219 152  227 219 152  227 218 146  227 218 146  226 217 139  226 217 137
-+226 217 137  224 212 126  80 59 18  90 65 21  80 59 18  71 53 16
-+47 39 13  37 31 10  31 27 8  25 20 6  18 15 5  14 11 4
-+9 7 3  4 3 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  1 1 1  1 1 1  2 2 2
-+2 2 2  4 4 4  5 5 5  7 7 7  8 8 8  11 11 11
-+13 13 13  13 13 13  8 8 8  4 4 4  1 1 1  3 3 3
-+10 9 3  16 14 4  24 21 6  31 27 8  37 31 10  47 39 13
-+57 50 16  57 50 17  57 50 17  57 50 16  57 50 16  149 122 79
-+231 229 212  231 229 214  231 229 214  231 229 214  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 230 220  231 229 217  231 230 220
-+231 230 220  231 230 220  231 230 220  231 230 220  231 230 220  110 81 38
-+90 65 21  90 65 21  91 66 24  90 65 21  90 65 21  90 65 21
-+91 66 24  90 65 21  90 65 21  104 73 28  90 65 21  104 73 28
-+104 73 28  104 73 28  229 226 196  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 214  231 229 214  231 229 214  231 229 214  231 229 212
-+231 229 212  231 229 212  230 228 210  230 228 209  231 228 207  231 228 207
-+231 228 207  230 227 205  230 227 205  230 227 204  229 226 196  176 168 138
-+104 73 28  104 73 28  104 73 28  104 73 28  90 63 20  90 63 20
-+90 63 20  75 50 15  75 50 15  75 50 15  62 38 11  62 38 11
-+62 38 11  62 38 11  62 38 11  62 38 11  62 38 11  62 38 11
-+75 50 15  75 50 15  78 55 17  90 63 20  90 65 21  90 65 21
-+90 65 21  104 73 28  104 73 28  91 66 24  149 122 79  227 219 152
-+227 219 152  227 219 152  227 218 146  227 218 146  227 218 146  226 217 137
-+226 217 137  224 212 126  110 81 38  91 66 24  80 59 18  80 59 18
-+47 39 13  37 31 10  37 31 10  27 23 7  22 17 5  15 13 4
-+10 9 3  5 4 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  1 1 1
-+1 1 1  1 1 1  2 2 2  3 3 3  4 4 4  5 5 5
-+6 6 6  6 6 6  5 5 5  3 3 3  2 2 2  3 3 3
-+10 9 3  16 14 4  24 21 6  31 27 8  37 31 10  47 39 13
-+57 50 16  57 50 16  80 59 18  80 59 18  80 59 18  135 101 60
-+231 230 220  231 229 214  231 229 214  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 230 220  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  200 196 176  176 168 138  100 76 42
-+91 66 24  91 66 24  90 65 21  91 66 24  90 65 21  91 66 24
-+90 65 21  97 69 27  90 65 21  104 73 28  90 65 21  104 73 28
-+90 65 21  104 73 28  150 141 118  230 228 210  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 214  231 229 214  231 229 214  231 229 214
-+231 229 212  230 228 210  231 229 212  230 228 210  230 228 209  231 228 207
-+231 228 207  231 228 207  230 227 205  230 227 205  229 226 196  117 83 35
-+104 73 28  104 73 28  104 73 28  104 73 28  90 63 20  90 63 20
-+90 63 20  75 50 15  75 50 15  75 50 15  62 38 11  62 38 11
-+62 38 11  62 38 11  62 38 11  62 38 11  62 38 11  75 50 15
-+75 50 15  75 50 15  90 63 20  90 63 20  90 63 20  90 65 21
-+104 73 28  90 65 21  104 73 28  97 69 27  135 101 60  227 220 160
-+227 219 152  227 219 152  227 218 146  227 218 146  227 218 146  226 217 137
-+226 217 137  226 217 137  149 122 79  90 65 21  91 66 24  80 59 18
-+47 39 13  47 39 13  37 31 10  29 24 7  24 21 6  16 14 4
-+11 9 3  5 4 1  2 2 2  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  0 0 0
-+0 0 0  1 1 1  1 1 1  1 1 1  2 2 2  2 2 2
-+3 3 3  2 2 2  2 2 2  1 1 1  1 1 1  5 4 1
-+10 9 3  18 15 5  24 21 6  31 27 8  47 39 13  47 39 13
-+57 50 16  57 50 17  57 50 17  57 50 17  80 59 18  66 66 66
-+231 229 214  231 229 214  231 229 217  231 229 217  231 229 217  231 229 217
-+231 230 220  231 230 220  231 230 220  231 230 220  200 196 176  176 168 138
-+138 129 110  135 101 60  91 66 24  91 66 24  91 66 24  91 66 24
-+91 66 24  91 66 24  90 65 21  90 65 21  90 65 21  90 65 21
-+90 65 21  90 65 21  90 65 21  104 73 28  90 65 21  104 73 28
-+104 73 28  104 73 28  104 73 28  192 187 164  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 214  231 229 214  231 229 214
-+231 229 214  231 229 212  231 229 212  230 228 210  230 228 209  231 228 207
-+231 228 207  231 228 207  231 228 207  231 228 207  149 122 79  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  90 63 20  90 63 20
-+75 50 15  90 63 20  75 50 15  62 38 11  75 50 15  62 38 11
-+62 38 11  62 38 11  62 38 11  62 38 11  62 38 11  75 50 15
-+75 50 15  78 55 17  78 55 17  90 63 20  90 65 21  104 73 28
-+90 65 21  104 73 28  90 65 21  104 73 28  104 73 28  226 218 148
-+227 219 152  227 219 152  227 219 152  227 218 146  227 218 146  226 217 137
-+226 217 137  224 212 126  224 212 126  91 66 24  90 65 21  90 65 21
-+57 50 17  47 39 13  37 31 10  31 27 8  25 20 6  18 15 5
-+13 11 4  7 5 2  3 3 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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 1 1  0 0 0  3 3 1  5 4 1
-+13 11 4  18 15 5  27 23 7  31 27 8  37 31 10  47 39 13
-+57 50 16  57 50 17  80 59 18  80 59 18  80 59 18  100 76 42
-+231 230 220  231 230 220  231 229 214  231 230 220  231 229 217  229 226 196
-+185 178 149  150 141 118  135 101 60  90 68 33  90 65 21  91 66 24
-+90 65 21  90 65 21  90 65 21  91 66 24  91 66 24  91 66 24
-+90 65 21  90 65 21  90 65 21  90 65 21  90 65 21  90 65 21
-+90 65 21  90 65 21  90 65 21  90 65 21  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  117 83 35  200 196 176  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 214  231 229 214
-+231 229 214  231 229 212  230 228 210  231 229 212  230 228 210  230 228 209
-+231 228 207  231 228 207  231 228 207  163 154 123  117 83 35  104 73 28
-+117 83 35  104 73 28  104 73 28  90 63 20  104 73 28  90 63 20
-+90 63 20  75 50 15  75 50 15  75 50 15  62 38 11  62 38 11
-+62 38 11  62 38 11  75 50 15  62 38 11  75 50 15  75 50 15
-+75 50 15  90 63 20  90 63 20  90 63 20  90 63 20  90 65 21
-+104 73 28  104 73 28  104 73 28  104 73 28  90 65 21  224 212 126
-+226 218 148  227 219 152  226 218 148  227 218 146  227 218 146  226 217 139
-+226 217 137  224 212 126  224 212 126  90 65 21  90 65 21  90 65 21
-+57 50 16  47 39 13  37 31 10  31 27 8  27 23 7  20 17 5
-+14 11 4  9 7 3  4 3 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 0 0  2 1 0  7 5 2
-+14 11 4  20 17 5  27 23 7  31 27 8  47 39 13  47 39 13
-+57 50 16  57 50 17  80 59 18  57 50 17  80 59 18  90 68 33
-+231 230 220  200 196 176  163 154 123  138 129 110  100 76 42  80 59 18
-+80 59 18  80 59 18  80 59 18  90 65 21  90 65 21  90 65 21
-+90 65 21  90 65 21  91 66 24  91 66 24  91 66 24  90 65 21
-+90 65 21  90 65 21  90 65 21  90 65 21  90 65 21  90 65 21
-+90 65 21  90 65 21  90 65 21  104 73 28  90 65 21  90 65 21
-+104 73 28  104 73 28  104 73 28  104 73 28  117 83 35  192 187 164
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 214  231 229 214
-+231 229 214  231 229 214  231 229 212  231 229 212  230 228 210  230 228 209
-+231 228 207  231 228 207  149 122 79  104 73 28  104 73 28  117 83 35
-+104 73 28  104 73 28  104 73 28  104 73 28  90 63 20  90 63 20
-+90 63 20  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  90 63 20
-+75 50 15  90 63 20  90 63 20  90 63 20  104 73 28  90 65 21
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  150 141 118
-+224 217 160  227 219 152  227 219 152  227 218 146  227 218 146  226 217 139
-+226 217 137  226 217 137  224 212 126  143 106 60  91 66 24  90 65 21
-+57 50 17  47 39 13  44 35 11  37 31 10  29 24 7  22 17 5
-+15 13 4  10 9 3  5 4 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  1 0 0  2 1 0  4 3 1  7 5 2
-+14 11 4  18 15 5  28 21 6  31 27 8  44 35 11  47 39 13
-+57 50 16  57 50 16  71 53 16  80 59 18  80 59 18  80 59 18
-+90 68 33  80 59 18  80 59 18  80 59 18  80 59 18  90 65 21
-+90 65 21  90 65 21  91 66 24  90 65 21  90 65 21  90 65 21
-+90 65 21  91 66 24  90 65 21  90 65 21  90 65 21  90 65 21
-+90 65 21  90 65 21  80 59 18  80 59 18  80 59 18  90 65 21
-+80 59 18  90 65 21  90 65 21  90 65 21  90 65 21  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+163 154 123  229 226 196  231 229 217  231 229 217  231 229 217  231 229 214
-+231 229 214  231 229 214  231 229 212  231 229 212  230 228 210  230 228 210
-+200 196 176  146 109 61  117 83 35  117 83 35  117 83 35  104 73 28
-+104 73 28  104 73 28  104 73 28  90 63 20  90 63 20  90 63 20
-+90 63 20  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  90 63 20  75 50 15
-+90 63 20  90 63 20  90 63 20  90 63 20  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  154 108 49
-+227 218 146  227 219 152  227 219 152  227 218 146  227 218 146  227 218 146
-+226 217 139  226 217 137  224 212 126  149 122 79  104 73 28  90 65 21
-+71 53 16  47 39 13  47 39 13  31 27 8  31 27 8  23 19 6
-+16 14 4  11 9 3  5 4 1  2 2 2  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  2 1 0  4 3 1  5 4 1  9 7 3
-+14 11 4  18 15 5  28 21 6  35 26 8  43 33 10  47 39 13
-+57 50 16  57 50 16  80 59 18  57 50 17  80 59 18  70 58 37
-+80 59 18  80 59 18  90 65 21  80 59 18  90 65 21  80 59 18
-+90 65 21  80 59 18  90 65 21  80 59 18  90 65 21  90 65 21
-+90 65 21  90 65 21  90 65 21  90 65 21  90 65 21  90 65 21
-+90 65 21  80 59 18  80 59 18  80 59 18  80 59 18  80 59 18
-+80 59 18  90 63 20  90 65 21  90 65 21  90 65 21  90 65 21
-+104 73 28  104 73 28  104 73 28  104 73 28  117 83 35  104 73 28
-+104 73 28  117 83 35  150 141 118  192 187 164  231 229 214  231 229 217
-+231 229 214  231 229 214  230 228 210  229 225 190  185 178 149  154 114 62
-+117 83 35  117 83 35  104 73 28  117 83 35  117 83 35  117 83 35
-+104 73 28  104 73 28  104 73 28  104 73 28  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  75 50 15  75 50 15
-+75 50 15  90 63 20  75 50 15  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  134 96 54
-+227 220 160  227 219 152  227 219 152  227 218 146  227 218 146  227 218 146
-+226 217 137  226 217 137  224 212 126  224 212 126  104 73 28  91 66 24
-+80 59 18  47 39 13  47 39 13  37 31 10  31 27 8  24 21 6
-+18 15 5  13 11 4  7 5 2  3 3 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  2 1 0  3 3 1  4 3 1  7 5 2  9 7 3
-+14 11 4  22 17 5  26 19 6  35 25 8  41 32 10  50 37 12
-+55 43 14  57 50 16  57 50 17  80 59 18  80 59 18  80 59 18
-+80 59 18  80 59 18  80 59 18  80 59 18  80 59 18  80 59 18
-+80 59 18  90 65 21  80 59 18  90 65 21  80 59 18  80 59 18
-+80 59 18  90 65 21  80 59 18  90 65 21  80 59 18  80 59 18
-+80 59 18  80 59 18  80 59 18  78 55 17  78 55 17  80 59 18
-+80 59 18  80 59 18  80 59 18  90 63 20  90 63 20  90 65 21
-+104 73 28  104 73 28  104 73 28  117 83 35  104 73 28  117 83 35
-+104 73 28  117 83 35  117 83 35  117 83 35  104 73 28  144 102 51
-+142 111 68  143 106 60  134 96 54  104 73 28  117 83 35  104 73 28
-+117 83 35  117 83 35  117 83 35  117 83 35  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  90 63 20  90 63 20
-+90 63 20  90 63 20  75 50 15  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  117 83 35  104 73 28  104 73 28  104 73 28  104 73 28
-+227 218 146  227 219 152  227 219 152  227 219 152  227 218 146  227 218 146
-+227 217 139  226 217 137  224 212 126  224 212 126  90 65 21  90 65 21
-+80 59 18  57 50 16  47 39 13  37 31 10  31 27 8  24 21 6
-+18 15 5  13 11 4  7 5 2  4 3 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+1 0 0  3 3 1  4 3 1  5 4 1  7 5 2  11 9 3
-+14 11 4  18 15 5  26 19 6  29 24 7  38 29 9  44 35 11
-+55 43 14  57 50 16  57 50 16  80 59 18  57 50 17  80 59 18
-+80 59 18  80 59 18  80 59 18  80 59 18  90 65 21  80 59 18
-+80 59 18  80 59 18  80 59 18  80 59 18  80 59 18  80 59 18
-+80 59 18  80 59 18  80 59 18  80 59 18  80 59 18  80 59 18
-+78 55 17  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  78 55 17  90 63 20  90 63 20  90 65 21
-+90 65 21  104 73 28  104 73 28  104 73 28  117 83 35  104 73 28
-+117 83 35  104 73 28  117 83 35  104 73 28  117 83 35  117 83 35
-+117 83 35  104 73 28  117 83 35  117 83 35  117 83 35  131 88 37
-+104 73 28  117 83 35  117 83 35  104 73 28  131 88 37  104 73 28
-+131 88 37  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  104 73 28  90 63 20  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+117 83 35  104 73 28  117 83 35  104 73 28  117 83 35  104 73 28
-+226 217 139  227 219 152  227 219 152  227 218 146  227 218 146  227 218 146
-+226 217 137  226 217 137  226 217 137  224 212 126  132 90 43  97 69 27
-+80 59 18  47 39 13  47 39 13  37 31 10  37 31 10  27 23 7
-+20 17 5  14 11 4  9 7 3  4 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  0 0 0  0 0 0  0 0 0  0 0 0  1 0 0
-+2 1 0  4 3 1  5 4 1  7 5 2  7 5 2  9 7 3
-+17 13 4  17 13 4  30 16 4  29 24 7  38 27 8  43 33 10
-+51 40 13  55 44 14  59 49 15  57 50 16  80 59 18  71 53 16
-+80 59 18  80 59 18  80 59 18  80 59 18  80 59 18  80 59 18
-+80 59 18  80 59 18  80 59 18  80 59 18  80 59 18  80 59 18
-+80 59 18  78 55 17  78 55 17  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  90 63 20  90 63 20  90 63 20
-+90 63 20  104 73 28  104 73 28  104 73 28  104 73 28  117 83 35
-+117 83 35  117 83 35  117 83 35  117 83 35  117 83 35  104 73 28
-+117 83 35  117 83 35  117 83 35  117 83 35  104 73 28  131 88 37
-+117 83 35  117 83 35  117 83 35  117 83 35  104 73 28  117 83 35
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  90 63 20
-+104 73 28  104 73 28  90 63 20  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  131 88 37  104 73 28  131 88 37  104 73 28  117 83 35
-+117 83 35  104 73 28  117 83 35  104 73 28  143 100 47  224 212 126
-+216 206 146  227 220 160  227 219 152  227 219 152  227 218 146  227 218 146
-+227 217 139  226 217 137  226 217 137  224 212 126  156 118 66  90 65 21
-+90 65 21  57 50 16  47 39 13  37 31 10  37 31 10  27 23 7
-+20 17 5  15 13 4  9 7 3  5 4 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  0 0 0  0 0 0  0 0 0  0 0 0  2 1 0
-+4 3 1  5 4 1  7 5 2  7 5 2  11 9 3  11 9 3
-+11 9 3  23 17 5  23 17 5  36 23 7  38 27 8  38 29 9
-+50 37 12  51 40 13  59 49 15  57 50 16  57 50 16  71 53 16
-+57 50 16  71 53 16  57 50 17  71 53 16  71 53 16  71 53 16
-+71 53 16  71 53 16  71 53 16  71 53 16  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  62 38 11  75 50 15  62 38 11  62 38 11
-+75 50 15  75 50 15  75 50 15  75 50 15  90 63 20  90 63 20
-+90 63 20  90 63 20  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  117 83 35  104 73 28  117 83 35  117 83 35  117 83 35
-+117 83 35  131 88 37  117 83 35  117 83 35  131 88 37  117 83 35
-+117 83 35  117 83 35  131 88 37  104 73 28  131 88 37  104 73 28
-+131 88 37  104 73 28  131 88 37  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+90 63 20  143 92 37  90 63 20  143 92 37  104 73 28  143 92 37
-+104 73 28  131 88 37  104 73 28  104 73 28  117 83 35  117 83 35
-+104 73 28  117 83 35  131 88 37  224 212 126  227 219 152  226 218 148
-+227 219 152  227 219 152  227 219 152  227 219 152  227 218 146  227 218 146
-+227 217 139  226 217 137  226 217 137  226 217 137  149 122 79  104 73 28
-+80 59 18  57 50 17  47 39 13  44 35 11  37 31 10  29 24 7
-+23 19 6  16 14 4  10 9 3  5 4 1  2 2 2  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  0 0 0  0 0 0  0 0 0  2 1 0  3 3 1
-+4 3 1  7 5 2  7 5 2  11 9 3  11 9 3  11 9 3
-+14 11 4  17 13 4  30 16 4  30 16 4  36 23 7  38 27 8
-+48 30 8  50 37 12  58 38 12  59 45 14  59 49 15  59 49 15
-+71 53 16  71 53 16  71 53 16  71 53 16  71 53 16  71 53 16
-+69 49 15  69 49 15  68 47 15  68 47 15  68 47 15  68 47 15
-+68 47 15  75 50 15  62 38 11  75 50 15  62 38 11  75 50 15
-+62 38 11  75 50 15  75 50 15  62 38 11  75 50 15  62 38 11
-+75 50 15  75 50 15  75 50 15  75 50 15  90 63 20  90 63 20
-+90 63 20  90 63 20  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  117 83 35  104 73 28  131 88 37  104 73 28  131 88 37
-+104 73 28  131 88 37  117 83 35  117 83 35  117 83 35  131 88 37
-+117 83 35  131 88 37  104 73 28  131 88 37  104 73 28  131 88 37
-+104 73 28  104 73 28  104 73 28  131 88 37  104 73 28  104 73 28
-+143 92 37  90 63 20  143 92 37  104 73 28  143 92 37  104 73 28
-+154 97 33  90 63 20  143 92 37  90 63 20  143 92 37  90 63 20
-+143 92 37  104 73 28  131 88 37  131 88 37  104 73 28  131 88 37
-+154 108 49  224 212 126  226 218 148  224 217 160  224 217 160  224 217 160
-+227 220 160  227 219 152  227 219 152  227 219 152  227 218 146  227 218 146
-+227 218 146  226 217 137  226 217 137  224 212 126  224 212 126  90 65 21
-+90 65 21  57 50 16  47 39 13  47 39 13  31 27 8  31 27 8
-+24 21 6  16 14 4  11 9 3  5 4 1  2 2 2  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  0 0 0  0 0 0  1 0 0  2 1 0  4 3 1
-+6 5 1  7 5 2  7 5 2  11 9 3  11 9 3  11 9 3
-+17 13 4  17 13 4  23 17 5  23 17 5  36 23 7  38 27 8
-+38 27 8  48 30 8  46 36 11  57 34 10  57 41 13  60 42 13
-+59 45 14  59 49 15  59 49 15  59 49 15  59 45 14  68 47 15
-+62 38 11  68 47 15  62 38 11  68 47 15  62 38 11  75 50 15
-+62 38 11  62 38 11  75 50 15  62 38 11  75 50 15  62 38 11
-+75 50 15  62 38 11  62 38 11  75 50 15  62 38 11  62 38 11
-+62 38 11  75 50 15  75 50 15  75 50 15  75 50 15  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  117 83 35  104 73 28  117 83 35
-+117 83 35  117 83 35  117 83 35  131 88 37  117 83 35  131 88 37
-+117 83 35  131 88 37  104 73 28  154 97 33  104 73 28  143 92 37
-+104 73 28  154 97 33  104 73 28  143 92 37  90 63 20  143 92 37
-+90 63 20  143 92 37  90 63 20  143 92 37  90 63 20  143 92 37
-+90 63 20  143 92 37  104 73 28  143 92 37  104 73 28  143 92 37
-+104 73 28  131 88 37  104 73 28  143 92 37  156 118 66  216 206 146
-+227 220 160  224 217 160  227 221 169  227 221 169  227 220 160  227 220 160
-+227 220 160  227 220 160  227 219 152  227 219 152  227 218 146  227 218 146
-+227 217 139  226 217 137  224 212 126  224 212 126  224 212 126  104 73 28
-+90 65 21  57 50 16  47 39 13  47 39 13  37 31 10  31 27 8
-+24 21 6  18 15 5  13 11 4  7 5 2  3 3 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  0 0 0  0 0 0  2 1 0  4 3 1  5 4 1
-+7 5 2  9 7 3  11 9 3  11 9 3  14 11 4  14 11 4
-+17 13 4  30 16 4  17 13 4  30 16 4  30 16 4  36 23 7
-+38 27 8  43 33 10  48 30 8  50 37 12  56 33 8  58 38 12
-+58 38 12  62 38 11  62 38 11  62 38 11  62 38 11  62 38 11
-+62 38 11  62 38 11  62 38 11  62 38 11  62 38 11  62 38 11
-+62 38 11  62 38 11  62 38 11  62 38 11  62 38 11  62 38 11
-+62 38 11  62 38 11  75 50 15  62 38 11  62 38 11  75 50 15
-+75 50 15  62 38 11  75 50 15  75 50 15  75 50 15  75 50 15
-+90 63 20  90 63 20  90 63 20  104 73 28  90 63 20  104 73 28
-+104 73 28  104 73 28  104 73 28  131 88 37  104 73 28  131 88 37
-+117 83 35  131 88 37  117 83 35  131 88 37  117 83 35  131 88 37
-+117 83 35  131 88 37  131 88 37  104 73 28  131 88 37  131 88 37
-+104 73 28  131 88 37  104 73 28  104 73 28  143 92 37  90 63 20
-+143 92 37  90 63 20  154 97 33  90 63 20  154 97 33  104 73 28
-+143 92 37  104 73 28  143 92 37  104 73 28  143 92 37  104 73 28
-+143 92 37  154 97 33  163 154 123  227 219 152  227 221 169  228 223 179
-+227 221 169  227 221 169  227 221 169  227 220 160  227 220 160  227 220 160
-+227 220 160  227 219 152  227 219 152  227 219 152  227 218 146  227 218 146
-+227 218 146  226 217 137  226 217 137  224 212 126  224 212 126  90 65 21
-+90 65 21  57 50 16  56 48 15  47 39 13  37 31 10  31 27 8
-+27 23 7  18 15 5  11 9 3  7 5 2  3 3 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  0 0 0  2 1 0  3 3 1  4 3 1  7 5 2
-+7 5 2  7 5 2  11 9 3  14 11 4  14 11 4  17 13 4
-+17 13 4  17 13 4  17 13 4  30 16 4  30 16 4  38 21 5
-+38 21 5  38 27 8  48 30 8  48 30 8  49 31 9  50 37 12
-+56 33 8  57 34 10  58 38 12  57 34 10  62 38 11  62 38 11
-+57 34 10  62 38 11  62 38 11  62 38 11  62 38 11  62 38 11
-+62 38 11  62 38 11  62 38 11  62 38 11  62 38 11  62 38 11
-+75 50 15  62 38 11  62 38 11  62 38 11  75 50 15  62 38 11
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  131 88 37
-+104 73 28  117 83 35  131 88 37  117 83 35  131 88 37  131 88 37
-+117 83 35  143 92 37  104 73 28  154 97 33  104 73 28  143 92 37
-+104 73 28  154 97 33  104 73 28  154 97 33  104 73 28  154 97 33
-+104 73 28  154 97 33  104 73 28  154 97 33  104 73 28  154 97 33
-+104 73 28  154 97 33  104 73 28  131 88 37  154 97 33  156 118 66
-+216 206 146  228 223 179  227 221 169  228 223 179  228 223 179  227 221 169
-+227 221 169  227 221 169  227 221 169  227 221 169  227 220 160  227 220 160
-+227 220 160  227 220 160  227 219 152  227 219 152  227 218 146  227 218 146
-+227 217 139  226 217 137  226 217 137  224 212 126  224 212 126  117 83 35
-+90 65 21  57 50 16  47 39 13  47 39 13  37 31 10  31 27 8
-+25 20 6  18 15 5  13 11 4  7 5 2  4 3 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 0 0  2 1 0  4 3 1  5 4 1  7 5 2
-+11 9 3  11 9 3  11 9 3  14 11 4  17 13 4  30 16 4
-+17 13 4  30 16 4  17 13 4  30 16 4  30 16 4  30 16 4
-+38 21 5  38 21 5  38 21 5  48 30 8  48 30 8  48 30 8
-+49 31 9  56 33 8  56 33 8  56 33 8  56 33 8  56 33 8
-+56 33 8  57 34 10  56 33 8  56 33 8  62 38 11  62 38 11
-+62 38 11  62 38 11  62 38 11  62 38 11  75 50 15  62 38 11
-+62 38 11  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  90 63 20
-+75 50 15  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+104 73 28  104 73 28  104 73 28  131 88 37  104 73 28  131 88 37
-+131 88 37  131 88 37  104 73 28  154 97 33  104 73 28  154 97 33
-+117 83 35  131 88 37  131 88 37  131 88 37  131 88 37  131 88 37
-+131 88 37  104 73 28  154 97 33  104 73 28  143 92 37  104 73 28
-+154 97 33  104 73 28  154 97 33  104 73 28  154 97 33  104 73 28
-+154 97 33  143 92 37  154 114 62  216 206 146  227 221 169  229 225 190
-+229 224 185  228 223 179  228 223 179  228 223 179  228 223 179  227 221 169
-+227 221 169  227 221 169  227 221 169  227 220 160  227 221 169  227 220 160
-+227 220 160  227 219 152  227 219 152  227 219 152  226 218 148  227 218 146
-+227 218 146  226 217 137  226 217 137  224 212 126  224 212 126  140 95 42
-+90 65 21  57 50 16  47 39 13  47 39 13  37 31 10  37 31 10
-+27 23 7  20 17 5  14 11 4  9 7 3  4 3 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  2 1 0  4 3 1  5 4 1  7 5 2  7 5 2
-+9 7 3  11 9 3  14 11 4  14 11 4  17 13 4  17 13 4
-+17 13 4  17 13 4  30 16 4  30 16 4  30 16 4  30 16 4
-+38 21 5  38 21 5  38 21 5  38 21 5  38 21 5  48 30 8
-+48 30 8  48 30 8  48 30 8  56 33 8  48 30 8  56 33 8
-+56 33 8  56 33 8  56 33 8  56 33 8  62 38 11  56 33 8
-+62 38 11  62 38 11  75 50 15  62 38 11  62 38 11  75 50 15
-+75 50 15  62 38 11  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  90 63 20  90 63 20  75 50 15
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  104 73 28
-+90 63 20  104 73 28  104 73 28  104 73 28  104 73 28  131 88 37
-+104 73 28  131 88 37  131 88 37  117 83 35  131 88 37  131 88 37
-+131 88 37  131 88 37  131 88 37  131 88 37  131 88 37  131 88 37
-+131 88 37  143 92 37  131 88 37  131 88 37  143 92 37  154 97 33
-+104 73 28  143 92 37  143 92 37  143 92 37  154 97 33  156 118 66
-+176 168 138  227 222 178  229 224 185  229 224 185  229 224 185  229 224 185
-+229 224 185  228 223 179  228 223 179  228 223 179  228 223 179  228 223 179
-+227 221 169  227 221 169  227 221 169  227 221 169  227 220 160  227 220 160
-+227 220 160  227 220 160  227 219 152  227 219 152  226 218 148  227 218 146
-+227 218 146  226 217 137  226 217 137  224 212 126  224 212 126  146 109 61
-+80 59 18  57 50 16  57 50 17  47 39 13  37 31 10  37 31 10
-+27 23 7  20 17 5  14 11 4  9 7 3  4 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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
-+1 1 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 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
-+1 0 0  3 3 1  4 3 1  5 4 1  7 5 2  9 7 3
-+11 9 3  14 11 4  14 11 4  17 13 4  30 16 4  17 13 4
-+30 16 4  30 16 4  30 16 4  30 16 4  30 16 4  30 16 4
-+38 21 5  38 21 5  38 21 5  38 21 5  48 30 8  38 21 5
-+48 30 8  48 30 8  48 30 8  48 30 8  56 33 8  56 33 8
-+56 33 8  56 33 8  56 33 8  62 38 11  62 38 11  62 38 11
-+62 38 11  62 38 11  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  90 63 20
-+75 50 15  90 63 20  90 63 20  75 50 15  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+104 73 28  104 73 28  143 92 37  104 73 28  143 92 37  104 73 28
-+143 92 37  104 73 28  154 97 33  117 83 35  154 97 33  117 83 35
-+143 92 37  131 88 37  131 88 37  131 88 37  131 88 37  131 88 37
-+131 88 37  131 88 37  131 88 37  143 92 37  104 73 28  154 97 33
-+143 92 37  154 97 33  156 118 66  185 178 149  229 224 185  229 224 185
-+229 224 185  229 224 185  229 224 185  229 224 185  229 224 185  229 224 185
-+229 224 185  228 223 179  228 223 179  228 223 179  227 221 169  227 221 169
-+228 223 179  227 221 169  227 221 169  227 220 160  227 220 160  227 220 160
-+227 220 160  227 219 152  227 219 152  227 219 152  227 219 152  227 218 146
-+227 217 139  227 217 139  226 217 137  226 217 137  224 212 126  156 118 66
-+90 65 21  57 50 16  47 39 13  47 39 13  47 39 13  31 27 8
-+27 23 7  23 19 6  15 13 4  9 7 3  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  2 2 2  3 3 1
-+4 3 1  4 3 1  5 4 1  5 4 1  5 4 1  4 3 1
-+3 3 1  3 3 1  1 1 1  1 1 1  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
-+1 0 0  4 3 1  5 4 1  7 5 2  7 5 2  11 9 3
-+11 9 3  14 11 4  17 13 4  17 13 4  17 13 4  14 11 4
-+30 16 4  17 13 4  30 16 4  30 16 4  30 16 4  30 16 4
-+38 21 5  38 21 5  38 21 5  38 21 5  48 30 8  48 30 8
-+48 30 8  48 30 8  48 30 8  56 33 8  56 33 8  56 33 8
-+56 33 8  62 38 11  62 38 11  62 38 11  62 38 11  62 38 11
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  104 73 28
-+104 73 28  90 63 20  104 73 28  104 73 28  104 73 28  104 73 28
-+131 88 37  131 88 37  131 88 37  131 88 37  131 88 37  131 88 37
-+131 88 37  131 88 37  131 88 37  154 97 33  131 88 37  143 92 37
-+143 92 37  143 92 37  131 88 37  154 97 33  156 118 66  156 118 66
-+216 206 146  229 224 185  230 227 199  229 225 190  229 225 190  229 225 190
-+229 225 190  229 225 190  229 224 185  229 224 185  229 224 185  228 223 179
-+229 224 185  228 223 179  228 223 179  228 223 179  228 223 179  228 223 179
-+227 221 169  227 221 169  227 221 169  227 221 169  227 220 160  227 220 160
-+227 220 160  227 220 160  227 219 152  227 219 152  227 218 146  227 218 146
-+227 218 146  226 217 137  226 217 137  224 212 126  224 212 126  156 118 66
-+80 59 18  57 50 16  57 50 16  47 39 13  37 31 10  37 31 10
-+27 23 7  20 17 5  15 13 4  9 7 3  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  3 3 1  5 4 1  5 4 1
-+7 5 2  9 7 3  9 7 3  9 7 3  9 7 3  9 7 3
-+7 5 2  7 5 2  5 4 1  5 4 1  4 3 1  3 3 1
-+3 3 1  2 2 2  2 2 2  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  2 1 0
-+4 3 1  5 4 1  7 5 2  9 7 3  11 9 3  11 9 3
-+17 13 4  17 13 4  17 13 4  30 16 4  30 16 4  30 16 4
-+30 16 4  30 16 4  30 16 4  30 16 4  38 21 5  38 21 5
-+38 21 5  38 21 5  48 30 8  48 30 8  48 30 8  48 30 8
-+56 33 8  56 33 8  56 33 8  56 33 8  57 34 10  62 38 11
-+62 38 11  62 38 11  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  104 73 28  104 73 28
-+104 73 28  104 73 28  143 92 37  104 73 28  154 97 33  131 88 37
-+131 88 37  131 88 37  131 88 37  143 92 37  131 88 37  154 97 33
-+131 88 37  154 97 33  131 88 37  131 88 37  131 88 37  154 97 33
-+154 97 33  156 118 66  176 168 138  227 221 169  230 227 201  231 228 207
-+231 228 207  230 227 201  229 226 196  230 227 197  230 227 197  229 225 190
-+229 225 190  229 225 190  229 224 185  229 225 190  229 224 185  229 224 185
-+229 224 185  228 223 179  228 223 179  227 221 169  228 223 179  227 221 169
-+227 221 169  227 221 169  227 221 169  227 220 160  227 221 169  227 220 160
-+227 220 160  227 219 152  227 219 152  227 219 152  227 218 149  227 218 146
-+227 218 146  226 217 137  226 217 137  226 217 137  224 212 126  156 118 66
-+90 65 21  57 50 16  57 50 16  47 39 13  47 39 13  31 27 8
-+31 27 8  23 19 6  15 13 4  9 7 3  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  2 2 2  4 3 1  7 5 2  9 7 3  10 9 3
-+13 11 4  13 11 4  13 11 4  14 11 4  14 11 4  13 11 4
-+13 11 4  11 9 3  10 9 3  9 7 3  9 7 3  7 5 2
-+7 5 2  5 4 1  5 4 1  5 4 1  5 4 1  5 4 1
-+4 3 1  4 3 1  4 3 1  4 3 1  4 3 1  5 4 1
-+5 4 1  9 7 3  11 9 3  11 9 3  14 11 4  14 11 4
-+30 16 4  17 13 4  30 16 4  17 13 4  30 16 4  30 16 4
-+30 16 4  30 16 4  38 21 5  38 21 5  38 21 5  38 21 5
-+48 30 8  48 30 8  48 30 8  56 33 8  56 33 8  56 33 8
-+56 33 8  57 34 10  62 38 11  62 38 11  75 50 15  62 38 11
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  104 73 28  90 63 20
-+104 73 28  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  104 73 28  90 63 20  104 73 28  104 73 28
-+104 73 28  104 73 28  90 63 20  143 92 37  104 73 28  104 73 28
-+131 88 37  131 88 37  131 88 37  154 97 33  131 88 37  131 88 37
-+154 97 33  131 88 37  154 97 33  156 118 66  163 154 123  216 206 146
-+229 226 196  230 227 201  230 227 199  230 227 202  230 227 202  230 227 202
-+229 226 196  230 227 201  229 225 190  230 227 197  229 225 190  230 227 197
-+229 225 190  229 225 190  229 224 185  229 224 185  229 224 185  228 223 179
-+229 224 185  228 223 179  228 223 179  228 223 179  227 221 169  228 223 179
-+227 221 169  227 221 169  227 221 169  227 221 169  227 220 160  227 220 160
-+227 220 160  227 220 160  227 219 152  227 219 152  227 218 146  227 218 146
-+227 218 146  226 217 137  226 217 137  224 212 126  224 212 126  149 122 79
-+80 59 18  57 50 16  57 50 16  47 39 13  37 31 10  37 31 10
-+27 23 7  23 19 6  15 13 4  9 7 3  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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
-+3 3 1  5 4 1  7 5 2  10 9 3  13 11 4  15 13 4
-+18 15 5  18 15 5  18 15 5  18 15 5  18 15 5  18 15 5
-+18 15 5  18 15 5  16 14 4  15 13 4  14 11 4  13 11 4
-+13 11 4  11 9 3  10 9 3  10 9 3  9 7 3  9 7 3
-+9 7 3  9 7 3  9 7 3  9 7 3  9 7 3  11 9 3
-+13 11 4  14 11 4  17 13 4  17 13 4  30 16 4  17 13 4
-+30 16 4  30 16 4  30 16 4  30 16 4  30 16 4  38 21 5
-+38 21 5  38 21 5  48 30 8  48 30 8  48 30 8  56 33 8
-+49 31 9  57 34 10  57 34 10  57 34 10  57 34 10  62 38 11
-+62 38 11  62 38 11  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  90 63 20
-+104 73 28  90 63 20  104 73 28  104 73 28  104 73 28  104 73 28
-+143 92 37  104 73 28  143 92 37  90 63 20  154 97 33  143 92 37
-+143 92 37  143 92 37  131 88 37  143 92 37  154 97 33  154 108 49
-+163 154 123  216 206 146  229 225 190  230 227 199  231 228 207  231 228 207
-+231 228 207  230 227 204  230 227 202  230 227 202  230 227 201  230 227 199
-+230 227 197  229 226 196  230 227 199  229 225 190  230 227 197  229 225 190
-+229 225 190  229 225 190  229 224 185  229 225 190  229 224 185  229 224 185
-+229 224 185  228 223 179  228 223 179  228 223 179  228 223 179  227 221 169
-+227 221 169  227 221 169  227 221 169  227 220 160  227 220 160  227 220 160
-+227 220 160  227 219 152  227 219 152  227 219 152  227 218 146  227 218 146
-+227 217 139  226 217 137  226 217 137  226 217 137  224 212 126  156 118 66
-+90 65 21  57 50 16  57 50 16  47 39 13  47 39 13  31 27 8
-+31 27 8  20 17 5  15 13 4  10 9 3  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  2 2 2
-+5 4 1  9 7 3  11 9 3  15 13 4  18 15 5  20 17 5
-+23 19 6  24 21 6  25 20 6  27 23 7  24 21 6  25 20 6
-+25 20 6  24 21 6  23 19 6  22 17 5  20 17 5  18 15 5
-+18 15 5  18 15 5  16 14 4  15 13 4  15 13 4  15 13 4
-+15 13 4  15 13 4  14 11 4  14 11 4  15 13 4  17 13 4
-+18 15 5  22 17 5  23 17 5  23 17 5  30 16 4  30 16 4
-+30 16 4  30 16 4  38 21 5  38 27 8  38 27 8  38 27 8
-+41 32 10  49 31 9  49 31 9  49 31 9  57 34 10  57 34 10
-+58 38 12  62 38 11  62 38 11  68 47 15  62 38 11  68 47 15
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  104 73 28  104 73 28  104 73 28  104 73 28
-+90 63 20  143 92 37  90 63 20  143 92 37  90 63 20  143 92 37
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  90 63 20  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  90 63 20  154 97 33  104 73 28  131 88 37
-+131 88 37  131 88 37  154 97 33  154 97 33  229 226 192  231 228 207
-+230 227 201  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+230 227 205  230 227 204  230 227 202  230 227 202  230 227 201  230 227 199
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  229 225 190
-+229 225 190  229 225 190  229 224 185  229 224 185  229 224 185  229 224 185
-+228 223 179  228 223 179  228 223 179  228 223 179  228 223 179  227 221 169
-+228 223 179  227 221 169  227 221 169  227 221 169  227 220 160  227 217 139
-+176 168 138  227 220 160  227 219 152  227 219 152  227 218 146  227 218 146
-+227 218 146  226 217 137  226 217 137  226 217 137  224 212 126  156 118 66
-+57 50 16  57 50 16  57 50 16  47 39 13  37 31 10  37 31 10
-+27 23 7  23 19 6  15 13 4  9 7 3  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  5 4 1
-+7 5 2  11 9 3  15 13 4  18 15 5  23 19 6  25 20 6
-+29 24 7  31 27 8  31 27 8  31 27 8  35 26 8  31 27 8
-+31 27 8  31 27 8  29 24 7  27 23 7  27 23 7  25 20 6
-+25 20 6  24 21 6  23 19 6  23 19 6  23 19 6  23 19 6
-+22 17 5  22 17 5  22 17 5  23 19 6  23 19 6  25 20 6
-+25 20 6  28 21 6  29 24 7  35 25 8  35 25 8  35 26 8
-+38 29 9  41 32 10  41 32 10  48 30 8  49 31 9  50 37 12
-+49 31 9  50 37 12  58 38 12  58 38 12  60 42 13  60 42 13
-+60 42 13  68 47 15  68 47 15  68 47 15  75 50 15  75 50 15
-+75 50 15  75 50 15  78 55 17  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  143 92 37
-+104 73 28  104 73 28  143 92 37  90 63 20  143 92 37  90 63 20
-+104 73 28  143 92 37  90 63 20  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  143 92 37
-+104 73 28  154 97 33  104 73 28  154 97 33  104 73 28  154 97 33
-+154 97 33  143 92 37  131 88 37  154 97 33  229 225 190  231 229 212
-+231 229 212  231 229 212  231 228 207  231 228 207  231 228 207  231 228 207
-+231 228 207  230 227 204  230 227 202  230 227 202  230 227 201  230 227 199
-+230 227 197  230 227 197  229 225 190  230 227 197  229 225 190  229 225 190
-+229 225 190  229 224 185  229 225 190  229 224 185  229 224 185  229 224 185
-+229 224 185  228 223 179  228 223 179  228 223 179  227 221 169  228 223 179
-+227 221 169  227 221 169  227 220 160  227 221 169  224 212 126  143 100 47
-+156 118 66  227 219 152  227 219 152  227 219 152  227 218 146  227 218 146
-+227 217 139  226 217 137  226 217 137  224 212 126  224 212 126  163 154 123
-+80 59 18  57 50 16  57 50 16  47 39 13  47 39 13  31 27 8
-+31 27 8  23 19 6  15 13 4  10 9 3  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  3 3 1  7 5 2
-+11 9 3  15 13 4  18 15 5  24 21 6  27 23 7  31 27 8
-+37 31 10  37 31 10  41 32 10  37 31 10  37 31 10  37 31 10
-+37 31 10  37 31 10  37 31 10  37 31 10  37 31 10  31 27 8
-+31 27 8  31 27 8  29 24 7  29 24 7  29 24 7  27 23 7
-+27 23 7  27 23 7  27 23 7  29 24 7  31 27 8  31 27 8
-+35 26 8  35 26 8  38 29 9  38 29 9  41 32 10  43 33 10
-+43 33 10  46 36 11  50 37 12  50 37 12  51 40 13  58 38 12
-+60 42 13  60 42 13  60 42 13  67 48 15  68 47 15  69 49 15
-+71 51 16  75 50 15  75 50 15  75 50 15  78 55 17  78 55 17
-+78 55 17  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+104 73 28  90 63 20  90 63 20  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  143 92 37  90 63 20
-+143 92 37  104 73 28  143 92 37  90 63 20  143 92 37  104 73 28
-+143 92 37  90 63 20  143 92 37  104 73 28  143 92 37  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  90 63 20
-+143 92 37  90 63 20  143 92 37  104 73 28  154 97 33  104 73 28
-+154 97 33  131 88 37  154 97 33  154 97 33  200 196 176  231 229 212
-+231 228 207  231 229 212  231 228 207  231 228 207  231 228 207  231 228 207
-+231 228 207  230 227 204  230 227 202  230 227 202  230 227 201  230 227 199
-+230 227 197  230 227 197  230 227 197  230 227 197  229 225 190  230 227 197
-+229 225 190  229 225 190  229 224 185  229 224 185  229 224 185  229 224 185
-+228 223 179  228 223 179  228 223 179  228 223 179  227 221 169  228 223 179
-+227 221 169  227 221 169  227 218 146  163 154 123  117 83 35  154 97 33
-+163 154 123  227 219 152  227 219 152  227 219 152  227 218 146  227 218 146
-+227 217 139  226 217 137  226 217 137  224 212 126  224 212 126  156 118 66
-+57 50 16  57 50 16  57 50 16  47 39 13  37 31 10  37 31 10
-+27 23 7  23 19 6  15 13 4  9 7 3  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  2 2 2  5 4 1  9 7 3
-+14 11 4  18 15 5  24 21 6  29 24 7  31 27 8  37 31 10
-+37 31 10  47 39 13  47 39 13  47 39 13  47 39 13  47 39 13
-+47 39 13  44 35 11  44 35 11  37 31 10  41 32 10  37 31 10
-+37 31 10  37 31 10  37 31 10  37 31 10  37 31 10  37 31 10
-+37 31 10  37 31 10  37 31 10  37 31 10  37 31 10  41 32 10
-+41 32 10  44 35 11  46 36 11  46 36 11  50 37 12  50 37 12
-+51 40 13  57 41 13  55 43 14  60 42 13  59 45 14  59 45 14
-+67 48 15  67 48 15  69 49 15  71 51 16  71 53 16  78 55 17
-+78 55 17  79 57 18  80 59 18  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  104 73 28
-+90 63 20  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+143 92 37  104 73 28  154 97 33  104 73 28  104 73 28  143 92 37
-+104 73 28  143 92 37  104 73 28  154 97 33  104 73 28  143 92 37
-+90 63 20  154 97 33  90 63 20  104 73 28  104 73 28  104 73 28
-+143 92 37  90 63 20  143 92 37  90 63 20  143 92 37  104 73 28
-+104 73 28  154 97 33  104 73 28  154 97 33  143 92 37  154 97 33
-+143 92 37  154 97 33  131 88 37  154 97 33  185 178 149  230 227 202
-+231 229 212  231 229 212  231 228 207  231 228 207  231 228 207  231 228 207
-+230 227 204  230 227 204  230 227 202  230 227 201  230 227 201  230 227 199
-+230 227 197  230 227 197  230 227 197  229 225 190  230 227 197  229 224 185
-+229 225 190  229 224 185  229 224 185  229 224 185  229 224 185  229 224 185
-+228 223 179  228 223 179  228 223 179  228 223 179  227 221 169  227 221 169
-+227 221 169  224 212 126  154 97 33  143 92 37  131 88 37  131 88 37
-+156 118 66  227 219 152  227 219 152  227 219 152  227 218 146  227 218 146
-+227 218 146  226 217 137  226 217 137  224 212 126  224 212 126  156 118 66
-+57 50 16  57 50 16  57 50 16  47 39 13  47 39 13  31 27 8
-+31 27 8  20 17 5  15 13 4  10 9 3  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  3 3 1  7 5 2  13 11 4
-+18 15 5  23 19 6  27 23 7  31 27 8  37 31 10  44 35 11
-+47 39 13  47 39 13  47 39 13  56 48 15  47 39 13  56 48 15
-+47 39 13  47 39 13  47 39 13  47 39 13  47 39 13  47 39 13
-+47 39 13  47 39 13  44 35 11  41 32 10  44 35 11  41 32 10
-+44 35 11  37 31 10  41 32 10  44 35 11  44 35 11  47 39 13
-+47 39 13  47 39 13  55 43 14  51 40 13  55 43 14  58 46 15
-+58 46 15  59 45 14  59 49 15  67 48 15  67 48 15  71 51 16
-+71 53 16  71 53 16  71 53 16  79 57 18  79 57 18  80 59 18
-+80 59 18  80 59 18  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  104 73 28  90 63 20  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  131 88 37  104 73 28  143 92 37
-+104 73 28  104 73 28  104 73 28  104 73 28  154 97 33  104 73 28
-+143 92 37  104 73 28  154 97 33  104 73 28  154 97 33  104 73 28
-+154 97 33  90 63 20  154 97 33  104 73 28  154 97 33  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  90 63 20  143 92 37
-+104 73 28  143 92 37  104 73 28  154 97 33  104 73 28  143 92 37
-+131 88 37  154 97 33  154 97 33  154 97 33  163 154 123  231 228 207
-+231 229 212  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+230 227 205  230 227 204  230 227 202  230 227 201  230 227 201  230 227 199
-+230 227 197  230 227 197  230 227 197  230 227 197  229 225 190  230 227 197
-+229 225 190  229 224 185  229 225 190  229 224 185  229 224 185  229 224 185
-+228 223 179  229 224 185  227 221 169  228 223 179  228 223 179  224 214 136
-+156 118 66  131 88 37  131 88 37  131 88 37  131 88 37  131 88 37
-+224 212 126  227 219 152  227 219 152  227 218 146  227 218 146  227 218 146
-+226 217 137  226 217 137  226 217 137  224 212 126  224 212 126  156 118 66
-+57 50 16  57 50 16  57 50 16  47 39 13  37 31 10  37 31 10
-+27 23 7  23 19 6  15 13 4  9 7 3  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  5 4 1  9 7 3  15 13 4
-+20 17 5  25 20 6  31 27 8  37 31 10  44 35 11  47 39 13
-+56 48 15  57 50 17  57 50 17  57 50 17  56 48 15  57 50 17
-+57 50 17  56 48 15  56 48 15  47 39 13  56 48 15  47 39 13
-+47 39 13  47 39 13  47 39 13  47 39 13  47 39 13  47 39 13
-+47 39 13  47 39 13  47 39 13  56 48 15  47 39 13  56 48 15
-+55 44 14  58 46 15  56 48 15  59 49 15  59 49 15  67 48 15
-+59 49 15  71 53 16  71 53 16  71 53 16  71 53 16  78 55 17
-+78 55 17  80 59 18  80 59 18  80 59 18  80 59 18  90 65 21
-+90 63 20  90 65 21  90 65 21  90 65 21  90 65 21  97 69 27
-+104 73 28  90 63 20  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  131 88 37  104 73 28  104 73 28  104 73 28
-+143 92 37  131 88 37  143 92 37  104 73 28  143 92 37  143 92 37
-+154 97 33  156 118 66  176 168 138  156 118 66  154 97 33  104 73 28
-+154 97 33  104 73 28  143 92 37  104 73 28  104 73 28  104 73 28
-+154 97 33  104 73 28  104 73 28  143 92 37  104 73 28  104 73 28
-+143 92 37  104 73 28  154 97 33  104 73 28  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  156 118 66  231 228 207
-+231 229 212  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+230 227 202  230 227 202  230 227 202  230 227 201  230 227 199  230 227 197
-+230 227 197  230 227 197  229 225 190  230 227 197  229 225 190  229 225 190
-+229 225 190  229 224 185  229 224 185  229 224 185  229 224 185  229 224 185
-+228 223 179  228 223 179  228 223 179  227 218 149  156 118 66  154 97 33
-+143 92 37  154 97 33  131 88 37  154 97 33  131 88 37  131 88 37
-+224 212 126  224 214 136  227 219 152  227 219 152  227 218 146  227 218 146
-+227 217 139  226 217 137  226 217 137  224 212 126  224 212 126  154 108 49
-+57 50 16  57 50 16  47 39 13  47 39 13  37 31 10  37 31 10
-+27 23 7  20 17 5  15 13 4  8 7 4  5 4 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  3 3 1  7 5 2  13 11 4  18 15 5
-+23 19 6  29 24 7  37 31 10  37 31 10  47 39 13  47 39 13
-+56 48 15  56 48 15  57 50 17  57 50 17  57 50 17  57 50 17
-+56 48 15  57 50 17  57 50 17  57 50 17  56 48 15  57 50 17
-+57 50 17  57 50 17  56 48 15  57 50 17  56 48 15  56 48 15
-+56 48 15  56 48 15  57 50 17  56 48 15  57 50 17  57 50 17
-+57 50 17  59 49 15  59 49 15  67 48 15  71 53 16  71 53 16
-+71 53 16  71 53 16  71 53 16  79 57 18  80 59 18  80 59 18
-+80 59 18  80 59 18  90 65 21  90 65 21  90 65 21  90 65 21
-+90 65 21  97 69 27  90 65 21  97 69 27  97 69 27  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  131 88 37  104 73 28  104 73 28  143 92 37  154 108 49
-+156 118 66  156 118 66  176 168 138  192 187 164  229 225 190  231 229 217
-+238 238 238  238 238 238  231 229 217  176 168 138  143 92 37  154 97 33
-+104 73 28  154 97 33  104 73 28  154 97 33  104 73 28  154 97 33
-+104 73 28  90 63 20  143 92 37  104 73 28  104 73 28  143 92 37
-+104 73 28  154 97 33  104 73 28  143 92 37  143 92 37  143 92 37
-+131 88 37  154 97 33  154 97 33  154 97 33  156 118 66  231 229 212
-+231 229 212  231 228 207  231 228 207  231 228 207  231 228 207  230 227 205
-+230 227 204  230 227 202  230 227 202  230 227 201  230 227 199  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  229 225 190  229 225 190
-+229 225 190  229 225 190  229 224 185  229 224 185  229 224 185  228 223 179
-+229 224 185  227 218 153  156 118 66  154 97 33  154 97 33  143 92 37
-+154 97 33  131 88 37  154 97 33  131 88 37  131 88 37  131 88 37
-+216 206 146  227 219 152  227 219 152  227 218 146  227 218 146  227 218 146
-+226 217 137  226 217 137  224 212 126  224 212 126  224 212 126  110 81 38
-+57 50 16  57 50 16  57 50 16  57 50 17  37 31 10  37 31 10
-+27 23 7  20 17 5  15 13 4  9 7 3  4 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  4 3 1  9 7 3  13 11 4  18 15 5
-+25 20 6  31 27 8  37 31 10  47 39 13  47 39 13  57 50 17
-+57 50 17  57 50 17  57 50 17  150 141 118  142 111 68  60 51 33
-+57 50 16  57 50 17  57 50 17  57 50 17  57 50 17  56 48 15
-+56 48 15  56 48 15  56 48 15  56 48 15  57 50 17  56 48 15
-+56 48 15  57 50 17  56 48 15  57 50 17  59 49 15  67 48 15
-+71 53 16  71 53 16  71 53 16  71 53 16  71 53 16  80 59 18
-+80 59 18  80 59 18  80 59 18  80 59 18  80 59 18  80 59 18
-+90 65 21  90 65 21  90 65 21  90 65 21  91 66 24  91 66 24
-+97 69 27  90 65 21  104 73 28  97 69 27  104 73 28  90 65 21
-+104 73 28  104 73 28  104 73 28  143 92 37  154 108 49  149 122 79
-+163 154 123  176 168 138  216 206 146  229 225 190  230 228 210  231 229 217
-+238 238 238  238 238 238  231 230 220  231 230 220  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  200 196 176  143 92 37  104 73 28
-+154 97 33  104 73 28  154 97 33  104 73 28  143 92 37  90 63 20
-+154 97 33  104 73 28  104 73 28  143 92 37  104 73 28  104 73 28
-+154 97 33  104 73 28  154 97 33  104 73 28  154 97 33  154 97 33
-+143 92 37  154 97 33  154 97 33  154 97 33  154 97 33  230 227 197
-+231 228 207  231 228 207  231 228 207  231 228 207  231 228 207  230 227 205
-+230 227 204  230 227 202  230 227 201  230 227 201  230 227 199  230 227 197
-+230 227 197  230 227 197  229 225 190  229 225 190  230 227 197  229 225 190
-+229 224 185  229 224 185  229 224 185  229 224 185  229 224 185  216 206 146
-+156 118 66  154 97 33  154 97 33  154 97 33  154 97 33  131 88 37
-+154 97 33  131 88 37  131 88 37  154 97 33  131 88 37  154 97 33
-+226 217 137  227 219 152  227 219 152  227 218 149  227 218 146  227 217 139
-+227 217 139  226 217 137  226 217 137  224 212 126  224 212 126  90 65 21
-+57 50 16  57 50 16  47 39 13  37 31 10  47 39 13  31 27 8
-+27 23 7  20 17 5  15 13 4  8 7 4  3 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  2 2 2  5 4 1  10 9 3  16 14 4  23 19 6
-+27 23 7  37 31 10  37 31 10  47 39 13  47 39 13  56 48 15
-+57 50 17  57 50 17  90 68 33  226 218 148  227 219 152  227 219 152
-+176 168 138  138 129 110  135 101 60  75 62 40  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  57 50 17  71 53 16  57 50 17
-+71 53 16  57 50 17  71 53 16  80 59 18  71 53 16  70 58 37
-+80 59 18  80 59 18  80 59 18  80 59 18  91 66 24  80 59 18
-+90 65 21  90 65 21  90 65 21  90 65 21  91 66 24  90 65 21
-+135 101 60  135 98 56  150 141 118  149 122 79  176 168 138  176 168 138
-+200 196 176  227 222 178  231 228 207  231 229 212  231 229 217  231 229 217
-+231 229 214  231 229 217  231 230 220  231 229 217  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  231 230 220  231 230 220  238 238 238
-+231 230 220  231 230 220  231 230 220  230 227 205  143 92 37  154 97 33
-+143 92 37  143 92 37  154 97 33  104 73 28  154 97 33  104 73 28
-+143 92 37  104 73 28  143 92 37  104 73 28  104 73 28  143 92 37
-+104 73 28  154 97 33  104 73 28  154 97 33  143 92 37  131 88 37
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  227 222 178
-+231 228 207  231 228 207  231 228 207  231 228 207  231 228 207  230 227 204
-+230 227 202  230 227 202  230 227 201  230 227 201  230 227 197  230 227 197
-+230 227 197  229 225 190  230 227 197  230 227 197  229 225 190  229 225 190
-+229 225 190  229 224 185  229 224 185  216 206 146  156 118 66  154 97 33
-+154 97 33  154 97 33  154 97 33  143 92 37  154 97 33  154 97 33
-+131 88 37  154 97 33  154 97 33  131 88 37  154 97 33  156 118 66
-+227 219 152  227 219 152  227 219 152  227 218 146  227 218 146  227 218 146
-+226 217 137  226 217 137  224 212 126  224 212 126  224 212 126  57 50 16
-+57 50 16  57 50 16  57 50 16  47 39 13  37 31 10  31 27 8
-+27 23 7  18 15 5  13 11 4  7 5 2  4 3 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+1 1 1  3 3 1  7 5 2  13 11 4  18 15 5  24 21 6
-+31 27 8  37 31 10  47 39 13  47 39 13  57 50 17  57 50 17
-+57 50 17  57 50 17  149 122 79  227 219 152  227 220 160  227 219 152
-+227 220 160  227 219 152  227 220 160  227 221 169  227 221 169  185 178 149
-+176 168 138  163 154 123  150 141 118  142 111 68  138 129 110  142 111 68
-+100 76 42  100 76 42  100 76 42  114 84 45  100 76 42  114 84 45
-+114 84 45  114 84 45  114 84 45  114 84 45  114 84 45  138 129 110
-+149 122 79  138 129 110  138 129 110  150 141 118  176 168 138  163 154 123
-+176 168 138  200 196 176  200 196 176  229 225 190  230 228 209  230 228 209
-+230 228 209  230 228 209  231 228 207  231 229 212  231 229 212  231 229 212
-+231 228 207  231 229 214  231 229 217  231 229 217  231 229 217  231 229 217
-+231 230 220  231 229 217  231 230 220  231 230 220  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  231 230 220  231 230 220  231 230 220
-+231 230 220  238 238 238  231 230 220  231 230 220  154 108 49  131 88 37
-+104 73 28  154 97 33  104 73 28  154 97 33  104 73 28  143 92 37
-+104 73 28  143 92 37  104 73 28  143 92 37  104 73 28  154 97 33
-+104 73 28  154 97 33  143 92 37  143 92 37  143 92 37  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  216 206 146
-+230 227 205  231 228 207  231 228 207  231 228 207  230 227 204  230 227 204
-+230 227 202  230 227 202  230 227 201  230 227 199  230 227 197  230 227 197
-+230 227 197  230 227 197  229 225 190  229 225 190  229 225 190  229 225 190
-+228 223 179  176 168 138  154 108 49  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  131 88 37  154 97 33
-+154 97 33  131 88 37  154 97 33  131 88 37  154 97 33  156 118 66
-+227 219 152  227 219 152  227 219 152  227 218 146  227 218 146  227 217 139
-+226 217 137  226 217 137  224 212 126  224 212 126  224 212 126  57 50 16
-+57 50 16  57 50 16  47 39 13  47 39 13  37 31 10  31 27 8
-+24 21 6  18 15 5  13 11 4  7 5 2  3 3 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+1 1 1  4 3 1  9 7 3  14 11 4  18 15 5  25 20 6
-+31 27 8  37 31 10  47 39 13  47 39 13  56 48 15  57 50 17
-+57 50 16  57 50 16  163 154 123  227 219 152  227 220 160  227 219 152
-+227 220 160  227 221 169  227 220 160  227 221 169  227 221 169  227 220 160
-+227 221 169  227 221 169  227 221 169  227 222 178  227 222 178  227 222 178
-+229 226 192  229 226 192  229 226 192  229 226 196  229 226 196  230 227 199
-+230 227 201  230 227 202  230 227 202  230 228 209  229 226 196  229 226 192
-+229 226 196  229 226 192  229 226 192  229 226 192  230 227 197  231 228 207
-+230 227 202  230 227 202  230 227 204  230 227 205  231 228 207  230 228 209
-+230 228 209  231 229 212  231 229 212  231 229 212  231 229 212  231 229 214
-+231 229 214  231 229 217  231 229 217  231 229 217  231 229 217  231 229 217
-+231 229 217  231 230 220  231 229 217  231 230 220  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  238 238 238  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  238 238 238  149 122 79  143 92 37
-+154 97 33  143 92 37  154 97 33  104 73 28  154 97 33  104 73 28
-+154 97 33  104 73 28  143 92 37  104 73 28  143 92 37  104 73 28
-+143 92 37  104 73 28  154 97 33  104 73 28  143 92 37  143 92 37
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  176 168 138
-+230 228 209  231 228 207  231 228 207  230 227 205  230 227 204  230 227 202
-+230 227 202  230 227 201  230 227 201  230 227 199  230 227 197  230 227 197
-+230 227 197  230 227 197  229 225 190  230 227 197  227 218 153  156 118 66
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  131 88 37
-+154 97 33  154 97 33  131 88 37  154 97 33  131 88 37  224 212 126
-+227 219 152  227 219 152  227 218 149  227 218 146  227 218 146  227 217 139
-+226 217 137  226 217 137  224 212 126  224 212 126  163 154 123  57 50 16
-+57 50 16  57 50 16  47 39 13  47 39 13  37 31 10  31 27 8
-+24 21 6  18 15 5  13 11 4  7 5 2  3 3 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+2 2 2  5 4 1  9 7 3  15 13 4  22 17 5  27 23 7
-+37 31 10  37 31 10  47 39 13  56 48 15  57 50 17  57 50 17
-+57 50 17  57 50 16  163 154 123  227 218 146  227 219 152  227 220 160
-+227 220 160  227 220 160  227 220 160  227 221 169  227 221 169  227 221 169
-+227 221 169  228 223 179  227 221 169  227 222 178  227 222 178  227 222 178
-+229 224 185  229 224 185  229 226 192  229 224 185  229 226 192  229 226 192
-+229 226 192  229 226 192  229 226 192  229 226 196  229 226 196  229 226 196
-+229 226 196  230 227 199  230 227 201  230 227 201  230 227 202  230 227 202
-+230 227 204  230 227 205  231 228 207  231 228 207  231 228 207  230 228 209
-+231 228 207  231 229 212  231 229 212  231 229 212  231 229 214  231 229 214
-+231 229 214  231 229 214  231 229 217  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 230 220  231 230 220  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  231 229 217  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  231 230 220  185 178 149  154 97 33
-+131 88 37  143 92 37  104 73 28  154 97 33  143 92 37  143 92 37
-+104 73 28  154 97 33  104 73 28  143 92 37  104 73 28  154 97 33
-+104 73 28  154 97 33  143 92 37  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  163 154 123
-+230 227 197  231 228 207  231 228 207  230 227 204  230 227 204  230 227 202
-+230 227 202  230 227 201  230 227 199  230 227 197  230 227 197  230 227 197
-+230 227 197  227 222 178  176 168 138  154 108 49  154 97 33  154 108 49
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  131 88 37  154 97 33  154 97 33  131 88 37  224 212 126
-+226 218 148  227 219 152  226 218 148  227 218 146  227 218 146  227 217 139
-+226 217 137  226 217 137  224 212 126  224 212 126  156 118 66  80 59 18
-+57 50 16  57 50 16  47 39 13  47 39 13  37 31 10  31 27 8
-+24 21 6  18 15 5  10 9 3  6 5 1  3 3 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+3 3 1  5 4 1  10 9 3  15 13 4  23 19 6  29 24 7
-+31 27 8  47 39 13  47 39 13  47 39 13  56 48 15  57 50 16
-+57 50 16  57 50 16  163 154 123  227 219 152  227 219 152  227 219 152
-+227 220 160  227 220 160  227 221 169  227 220 160  227 221 169  227 221 169
-+227 221 169  227 221 169  228 223 179  227 222 178  228 223 179  228 223 179
-+228 223 179  229 224 185  228 223 179  229 224 185  229 224 185  229 224 185
-+229 226 192  229 226 192  229 226 192  229 226 192  229 226 196  230 227 197
-+230 227 197  230 227 197  230 227 199  230 227 201  230 227 202  230 227 202
-+230 227 204  230 227 205  231 228 207  231 228 207  231 228 207  231 228 207
-+230 228 209  231 228 207  231 229 212  231 229 212  231 229 212  231 229 214
-+231 229 214  231 229 214  231 229 214  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  231 230 220  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  231 229 217  200 196 176  143 92 37
-+143 92 37  154 97 33  154 97 33  104 73 28  154 97 33  104 73 28
-+154 97 33  104 73 28  154 97 33  104 73 28  154 97 33  104 73 28
-+154 97 33  104 73 28  154 97 33  104 73 28  143 92 37  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  156 118 66
-+230 227 201  231 228 207  231 228 207  230 227 204  230 227 204  230 227 202
-+230 227 201  230 227 201  230 227 201  229 226 196  229 224 185  224 212 126
-+156 118 66  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  131 88 37  154 97 33  154 97 33  227 219 152
-+227 219 152  227 219 152  227 218 146  227 218 146  227 218 146  226 217 137
-+226 217 137  224 212 126  224 212 126  224 212 126  156 118 66  57 50 16
-+57 50 16  57 50 16  47 39 13  47 39 13  31 27 8  31 27 8
-+24 21 6  16 14 4  10 9 3  5 4 1  2 2 2  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+3 3 1  7 5 2  11 9 3  16 14 4  23 19 6  29 24 7
-+37 31 10  44 35 11  47 39 13  57 50 17  57 50 17  57 50 17
-+75 61 38  57 50 16  135 101 60  226 217 137  227 219 152  227 220 160
-+227 219 152  227 220 160  227 220 160  227 221 169  227 221 169  227 221 169
-+227 221 169  228 223 179  227 221 169  228 223 179  228 223 179  228 223 179
-+228 223 179  229 224 185  229 224 185  229 224 185  229 226 192  229 224 185
-+229 226 192  229 226 192  229 226 192  229 226 192  229 226 196  230 227 197
-+230 227 197  230 227 197  230 227 199  230 227 201  230 227 201  230 227 202
-+230 227 202  230 227 204  230 227 205  231 228 207  231 228 207  231 228 207
-+231 228 207  230 228 209  230 228 210  231 229 212  231 229 212  231 229 212
-+231 229 214  231 229 214  231 229 214  231 229 214  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  231 230 220
-+231 229 217  231 230 220  231 230 220  231 230 220  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  231 230 220  231 229 217  154 97 33
-+143 92 37  143 92 37  143 92 37  154 97 33  143 92 37  143 92 37
-+143 92 37  104 73 28  154 97 33  104 73 28  154 97 33  104 73 28
-+154 97 33  154 97 33  143 92 37  154 97 33  154 97 33  143 92 37
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  156 118 66
-+230 227 197  231 228 207  231 228 207  230 227 202  230 227 202  230 227 202
-+230 227 201  229 224 185  185 178 149  156 118 66  154 108 49  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  131 88 37
-+154 97 33  154 97 33  154 97 33  154 97 33  156 118 66  227 219 152
-+227 219 152  227 219 152  227 218 146  227 218 146  227 217 139  226 217 137
-+226 217 137  224 212 126  224 212 126  224 212 126  117 83 35  57 50 16
-+57 50 16  57 50 16  47 39 13  37 31 10  37 31 10  31 27 8
-+20 17 5  15 13 4  10 9 3  5 4 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+3 3 1  7 5 2  11 9 3  18 15 5  24 21 6  31 27 8
-+33 28 19  47 39 13  47 39 13  57 50 17  57 50 17  57 50 16
-+80 59 18  75 61 38  57 50 17  224 214 136  227 219 152  227 219 152
-+227 220 160  227 220 160  227 220 160  227 220 160  227 221 169  227 221 169
-+227 221 169  227 221 169  227 221 169  228 223 179  228 223 179  228 223 179
-+228 223 179  228 223 179  228 223 179  229 226 192  228 223 179  229 226 192
-+229 224 185  229 226 192  229 226 192  229 226 192  229 226 192  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 199  230 227 201  230 227 201
-+230 227 202  230 227 204  230 227 205  230 227 205  231 228 207  231 228 207
-+231 228 207  231 228 207  230 228 209  230 228 210  231 229 212  231 229 212
-+231 229 212  231 229 214  231 229 214  231 229 214  231 229 214  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  231 229 217
-+231 230 220  231 229 217  231 230 220  231 230 220  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  231 229 217  231 229 217  154 108 49
-+143 92 37  143 92 37  154 97 33  104 73 28  154 97 33  104 73 28
-+143 92 37  143 92 37  143 92 37  154 97 33  104 73 28  143 92 37
-+154 97 33  104 73 28  154 97 33  104 73 28  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+230 227 199  231 228 207  230 227 202  230 227 204  229 224 185  216 206 146
-+156 118 66  154 97 33  154 97 33  154 108 49  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  131 88 37  224 212 126  227 219 152
-+227 219 152  227 219 152  227 218 146  227 218 146  227 217 139  226 217 137
-+226 217 137  224 212 126  224 212 126  224 212 126  57 50 16  57 50 16
-+57 50 16  57 50 16  47 39 13  47 39 13  31 27 8  24 21 6
-+20 17 5  15 13 4  10 9 3  5 4 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+3 3 1  7 5 2  11 9 3  18 15 5  23 19 6  31 27 8
-+37 31 10  44 35 11  47 39 13  57 50 17  57 50 17  57 50 17
-+57 50 16  114 84 45  57 50 16  114 84 45  227 220 160  227 219 152
-+227 220 160  227 220 160  227 220 160  227 221 169  227 220 160  227 221 169
-+227 221 169  227 221 169  228 223 179  227 221 169  228 223 179  228 223 179
-+228 223 179  228 223 179  229 224 185  229 224 185  229 224 185  229 226 192
-+229 224 185  229 226 192  229 226 192  229 226 192  229 226 192  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 199  230 227 201  230 227 201
-+230 227 202  230 227 202  230 227 204  230 227 205  230 227 205  231 228 207
-+231 228 207  231 228 207  230 228 209  231 228 207  230 228 210  231 229 212
-+231 229 212  231 229 212  231 229 214  231 229 214  231 229 214  231 229 214
-+231 229 214  231 229 217  231 229 217  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 230 220  231 229 217
-+231 230 220  231 230 220  231 230 220  231 230 220  231 230 220  176 168 138
-+154 97 33  154 97 33  143 92 37  154 97 33  154 97 33  143 92 37
-+143 92 37  104 73 28  154 97 33  104 73 28  154 97 33  104 73 28
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 108 49
-+227 221 169  227 221 169  176 168 138  156 118 66  154 97 33  154 97 33
-+154 108 49  154 108 49  154 97 33  154 97 33  154 97 33  154 108 49
-+154 97 33  154 108 49  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  224 212 126  226 218 148
-+227 219 152  226 218 148  227 218 146  227 218 146  227 217 139  226 217 137
-+226 217 137  224 212 126  224 212 126  224 212 126  57 50 16  57 50 16
-+57 50 16  47 39 13  37 31 10  37 31 10  31 27 8  27 23 7
-+20 17 5  13 11 4  8 7 4  3 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+3 3 1  7 5 2  11 9 3  15 13 4  24 21 6  27 23 7
-+37 31 10  47 39 13  47 39 13  56 48 15  57 50 16  57 50 17
-+57 50 17  135 101 60  57 50 17  57 50 17  149 122 79  227 219 152
-+227 219 152  227 220 160  227 220 160  227 220 160  227 221 169  227 221 169
-+227 221 169  227 221 169  228 223 179  227 221 169  228 223 179  228 223 179
-+228 223 179  228 223 179  228 223 179  229 224 185  229 224 185  229 224 185
-+229 224 185  229 225 190  229 226 192  229 226 192  229 226 192  229 226 192
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 199  230 227 201
-+230 227 201  230 227 202  230 227 202  230 227 204  230 227 205  230 227 205
-+231 228 207  231 228 207  230 228 209  231 228 207  231 229 212  231 229 212
-+231 229 212  231 229 212  231 229 212  231 229 214  231 229 214  231 229 214
-+231 229 214  231 229 214  231 229 217  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  185 178 149
-+143 92 37  143 92 37  154 97 33  154 97 33  104 73 28  143 92 37
-+143 92 37  143 92 37  143 92 37  143 92 37  143 92 37  143 92 37
-+154 97 33  104 73 28  143 92 37  143 92 37  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 108 49  154 97 33  154 97 33  154 97 33  154 108 49  154 97 33
-+154 97 33  154 97 33  154 97 33  154 108 49  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  156 118 66  227 219 152  227 219 152
-+227 219 152  227 218 146  227 218 146  227 218 146  226 217 137  226 217 137
-+224 212 126  224 212 126  224 212 126  156 118 66  57 50 16  57 50 16
-+57 50 16  57 50 16  47 39 13  37 31 10  31 27 8  24 21 6
-+16 14 4  13 11 4  7 5 2  3 3 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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
-+2 2 2  5 4 1  10 9 3  16 14 4  23 19 6  29 24 7
-+31 27 8  44 35 11  47 39 13  57 50 17  57 50 16  57 50 17
-+57 50 17  135 101 60  58 54 45  57 50 16  57 50 16  142 111 68
-+226 218 148  227 220 160  227 220 160  227 220 160  227 220 160  227 221 169
-+227 221 169  227 221 169  227 221 169  228 223 179  227 221 169  228 223 179
-+228 223 179  228 223 179  229 224 185  228 223 179  229 224 185  229 226 192
-+229 224 185  229 226 192  229 225 190  229 226 192  229 226 192  229 226 192
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 199
-+230 227 201  230 227 202  230 227 202  230 227 204  230 227 205  230 227 205
-+230 227 205  231 228 207  231 228 207  231 228 207  231 228 207  231 229 212
-+231 228 207  231 229 212  231 229 212  231 229 212  231 229 214  231 229 214
-+231 229 214  231 229 214  231 229 217  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  230 227 204
-+154 97 33  154 97 33  143 92 37  154 97 33  154 97 33  154 97 33
-+104 73 28  154 97 33  143 92 37  104 73 28  154 97 33  104 73 28
-+154 97 33  154 97 33  154 97 33  143 92 37  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 108 49  154 97 33
-+154 97 33  154 108 49  154 97 33  154 108 49  154 97 33  154 108 49
-+154 97 33  154 108 49  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  163 154 123  226 217 137  227 219 152
-+227 219 152  227 218 146  227 218 146  227 217 139  226 217 137  226 217 137
-+224 212 126  224 212 126  224 212 126  154 108 49  57 50 16  57 50 16
-+57 50 16  37 31 10  47 39 13  37 31 10  31 27 8  24 21 6
-+16 14 4  10 9 3  6 5 1  3 3 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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
-+1 1 1  5 4 1  9 7 3  15 13 4  20 17 5  27 23 7
-+37 31 10  37 31 10  47 39 13  47 39 13  57 50 16  57 50 16
-+57 50 16  68 60 43  142 111 68  57 50 16  57 50 16  57 50 16
-+90 68 33  185 178 149  227 220 160  227 220 160  227 221 169  227 220 160
-+227 221 169  227 221 169  227 221 169  227 221 169  228 223 179  228 223 179
-+228 223 179  228 223 179  229 224 185  228 223 179  229 224 185  229 224 185
-+229 224 185  229 224 185  229 224 185  229 226 192  229 226 192  229 226 192
-+229 226 192  229 226 196  230 227 197  230 227 197  230 227 197  230 227 199
-+230 227 201  230 227 201  230 227 202  230 227 202  230 227 204  230 227 205
-+230 227 205  230 227 205  231 228 207  231 228 207  231 228 207  231 228 207
-+231 229 212  231 229 212  231 229 212  231 229 212  231 229 212  231 229 212
-+231 229 214  231 229 214  231 229 214  231 229 214  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  231 229 217
-+154 97 33  143 92 37  154 97 33  143 92 37  143 92 37  154 97 33
-+154 97 33  143 92 37  143 92 37  154 97 33  143 92 37  154 97 33
-+143 92 37  143 92 37  143 92 37  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 108 49
-+154 97 33  154 108 49  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 108 49  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  226 217 137  227 219 152  227 219 152
-+227 218 146  227 218 146  227 218 146  227 217 139  226 217 137  226 217 137
-+224 212 126  224 212 126  224 212 126  80 59 18  57 50 16  57 50 16
-+57 50 16  57 50 16  37 31 10  37 31 10  27 23 7  24 21 6
-+15 13 4  10 9 3  5 4 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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
-+1 1 1  4 3 1  9 7 3  14 11 4  20 17 5  27 23 7
-+37 31 10  37 31 10  47 39 13  57 50 17  57 50 16  57 50 17
-+57 50 16  57 50 16  150 141 118  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  135 101 60  216 206 146  227 219 152  227 221 169
-+227 220 160  227 221 169  227 221 169  227 221 169  228 223 179  227 221 169
-+228 223 179  228 223 179  228 223 179  228 223 179  229 224 185  229 224 185
-+229 224 185  229 226 192  229 224 185  229 226 192  229 226 192  229 226 192
-+229 226 192  230 227 197  229 226 192  230 227 197  230 227 197  230 227 197
-+230 227 199  230 227 201  230 227 201  230 227 202  230 227 202  230 227 204
-+230 227 205  230 227 205  230 227 205  231 228 207  231 228 207  231 228 207
-+231 228 207  231 228 207  231 229 212  231 229 212  231 229 212  231 229 212
-+231 229 212  231 229 214  231 229 214  231 229 214  231 229 214  231 229 214
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 217  231 229 217
-+163 154 123  154 97 33  154 97 33  154 97 33  154 97 33  143 92 37
-+143 92 37  143 92 37  143 92 37  143 92 37  104 73 28  154 97 33
-+104 73 28  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 108 49  154 108 49
-+154 108 49  154 108 49  154 108 49  154 108 49  154 108 49  154 108 49
-+154 108 49  154 108 49  154 108 49  154 97 33  154 108 49  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  156 118 66  226 217 137  227 219 152  227 219 152
-+227 218 146  227 218 146  227 218 146  226 217 137  226 217 137  224 212 126
-+224 212 126  224 212 126  224 212 126  57 50 16  57 50 16  57 50 16
-+47 39 13  37 31 10  47 39 13  31 27 8  27 23 7  20 17 5
-+15 13 4  10 9 3  5 4 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  3 3 1  7 5 2  13 11 4  18 15 5  24 21 6
-+31 27 8  37 31 10  37 31 10  47 39 13  57 50 16  57 50 16
-+57 50 16  57 50 16  149 122 79  75 62 40  57 50 16  57 50 16
-+57 50 16  57 50 16  56 48 15  57 50 16  114 84 45  163 154 123
-+227 220 160  227 221 169  227 221 169  227 221 169  228 223 179  227 221 169
-+228 223 179  228 223 179  228 223 179  229 224 185  228 223 179  229 224 185
-+229 224 185  229 224 185  229 225 190  229 224 185  229 226 192  229 226 192
-+229 226 192  229 226 192  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 199  230 227 201  230 227 201  230 227 202  230 227 202
-+230 227 204  230 227 205  230 227 205  230 227 205  231 228 207  231 228 207
-+231 228 207  231 229 212  231 228 207  231 228 207  231 228 207  231 229 212
-+231 229 212  231 229 212  231 229 212  231 229 214  230 228 210  231 229 214
-+230 228 210  231 229 214  230 228 210  231 229 217  231 229 217  231 229 217
-+231 229 217  231 229 217  231 229 217  231 229 217  231 229 214  231 228 207
-+176 168 138  154 97 33  154 97 33  154 97 33  143 92 37  154 97 33
-+143 92 37  154 97 33  143 92 37  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  143 92 37  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 108 49
-+154 108 49  154 97 33  154 108 49  154 108 49  154 97 33  154 108 49
-+154 97 33  154 97 33  154 108 49  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  224 212 126  227 219 152  227 219 152  227 219 152
-+227 218 146  227 218 146  227 217 139  226 217 137  226 217 137  224 212 126
-+224 212 126  224 212 126  156 118 66  57 50 16  57 50 16  57 50 16
-+57 50 16  47 39 13  37 31 10  31 27 8  24 21 6  20 17 5
-+13 11 4  6 5 1  5 4 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  3 3 1  7 5 2  11 9 3  18 15 5  24 21 6
-+31 27 8  37 31 10  47 39 13  47 39 13  57 50 17  57 50 16
-+57 50 16  57 50 16  135 101 60  149 122 79  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+80 59 18  135 101 60  163 154 123  227 219 152  227 221 169  228 223 179
-+227 221 169  228 223 179  228 223 179  228 223 179  228 223 179  229 224 185
-+229 224 185  229 224 185  229 224 185  229 225 190  229 225 190  229 226 192
-+229 226 192  229 226 192  230 227 197  229 226 192  230 227 197  230 227 197
-+230 227 197  230 227 199  230 227 199  230 227 201  230 227 201  230 227 202
-+230 227 202  230 227 204  230 227 205  230 227 205  230 227 205  231 228 207
-+231 228 207  231 228 207  231 228 207  231 229 212  231 228 207  231 228 207
-+231 229 212  231 229 212  231 228 207  231 229 214  230 228 210  231 229 214
-+231 229 214  231 229 214  230 228 210  231 229 217  230 228 210  231 229 214
-+230 228 210  231 229 214  231 229 214  231 229 214  231 229 214  231 229 214
-+229 224 185  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+143 92 37  143 92 37  143 92 37  143 92 37  143 92 37  143 92 37
-+143 92 37  143 92 37  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 108 49
-+154 97 33  154 108 49  154 97 33  154 108 49  154 108 49  154 97 33
-+154 108 49  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 108 49  226 217 137  227 218 146  227 219 152  227 218 146
-+227 218 146  227 218 146  227 217 139  226 217 137  226 217 137  224 212 126
-+224 212 126  224 212 126  117 83 35  57 50 16  57 50 16  57 50 16
-+37 31 10  47 39 13  31 27 8  31 27 8  24 21 6  16 14 4
-+13 11 4  6 5 1  3 3 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  2 2 2  5 4 1  10 9 3  15 13 4  20 17 5
-+31 27 8  37 31 10  37 31 10  47 39 13  47 39 13  57 50 16
-+57 50 16  57 50 16  57 50 16  224 212 126  57 50 17  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 16  57 50 17  90 68 33  149 122 79
-+163 154 123  216 206 146  228 223 179  228 223 179  229 224 185  228 223 179
-+229 224 185  229 224 185  229 225 190  229 224 185  229 224 185  229 225 190
-+229 226 192  229 226 192  229 226 192  229 226 196  229 226 196  230 227 197
-+230 227 197  230 227 197  230 227 199  230 227 199  230 227 201  230 227 201
-+230 227 202  230 227 202  230 227 204  230 227 205  230 227 205  231 228 207
-+231 228 207  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+231 229 212  231 228 207  231 229 212  231 229 212  230 228 210  230 228 210
-+230 228 210  231 229 214  231 228 207  231 229 217  231 228 207  231 229 217
-+230 228 210  231 229 217  231 228 207  231 229 214  231 228 207  231 229 214
-+230 227 205  154 97 33  154 97 33  154 97 33  154 97 33  143 92 37
-+154 97 33  154 97 33  154 97 33  143 92 37  154 97 33  143 92 37
-+154 97 33  143 92 37  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 108 49  154 97 33  154 97 33  154 108 49  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  224 212 126  227 219 152  227 219 152  227 219 152  227 218 146
-+227 218 146  227 217 139  226 217 137  226 217 137  224 212 126  224 212 126
-+224 212 126  224 212 126  57 50 16  57 50 16  57 50 16  57 50 16
-+47 39 13  47 39 13  31 27 8  31 27 8  24 21 6  16 14 4
-+10 9 3  5 4 1  2 2 2  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  1 1 1  4 3 1  9 7 3  14 11 4  20 17 5
-+27 23 7  31 27 8  37 31 10  47 39 13  57 50 17  57 50 16
-+57 50 17  57 50 16  57 50 16  163 154 123  135 101 60  57 50 16
-+57 50 16  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  57 50 16
-+57 50 16  71 53 16  71 53 16  100 76 42  142 111 68  138 129 110
-+163 154 123  185 178 149  216 206 146  224 217 160  229 226 192  229 225 190
-+229 225 190  229 226 192  229 226 192  229 226 192  229 226 196  229 226 196
-+230 227 197  230 227 197  230 227 197  230 227 199  230 227 201  230 227 201
-+230 227 201  230 227 202  230 227 202  230 227 204  230 227 205  230 227 205
-+231 228 207  231 228 207  231 228 207  231 228 207  229 225 190  200 196 176
-+200 196 176  229 224 185  230 228 210  231 228 207  230 228 210  231 229 214
-+231 228 207  230 228 210  230 228 210  230 228 210  230 228 210  230 228 210
-+231 229 214  231 228 207  231 229 214  231 229 214  231 229 214  231 228 207
-+231 229 214  163 154 123  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  143 92 37  154 97 33  143 92 37  154 97 33  143 92 37
-+143 92 37  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  224 212 126  226 217 137  227 219 152  227 218 146  227 218 146
-+227 218 146  227 217 139  226 217 137  226 217 137  224 212 126  224 212 126
-+224 212 126  156 118 66  57 50 16  57 50 16  57 50 16  57 50 16
-+37 31 10  37 31 10  31 27 8  27 23 7  20 17 5  15 13 4
-+7 7 7  3 3 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  3 3 1  8 7 4  13 11 4  18 15 5
-+24 21 6  31 27 8  37 31 10  37 31 10  47 39 13  57 50 16
-+57 50 16  57 50 16  57 50 16  110 81 38  176 168 138  57 50 16
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  71 53 16  57 50 17  71 53 16
-+71 53 16  57 50 17  80 59 18  57 50 17  80 59 18  71 53 16
-+80 59 18  80 59 18  71 53 16  80 59 18  80 59 18  90 68 33
-+135 101 60  114 84 45  135 101 60  142 111 68  149 122 79  138 129 110
-+149 122 79  149 122 79  138 129 110  149 122 79  150 141 118  149 122 79
-+150 141 118  149 122 79  150 141 118  149 122 79  135 101 60  143 106 60
-+143 106 60  144 102 51  117 83 35  117 83 35  117 83 35  117 83 35
-+143 92 37  150 141 118  231 228 207  230 228 210  231 228 207  231 228 207
-+230 228 210  230 228 210  230 228 210  231 228 207  231 229 214  230 228 210
-+231 228 207  231 229 214  231 228 207  231 228 207  231 229 214  231 228 207
-+230 227 197  176 168 138  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  143 92 37  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 108 49  154 97 33
-+163 154 123  227 218 146  227 219 152  227 219 152  227 218 146  227 218 146
-+227 218 146  226 217 137  226 217 137  224 212 126  224 212 126  224 212 126
-+224 212 126  117 83 35  57 50 16  57 50 16  57 50 16  47 39 13
-+47 39 13  37 31 10  31 27 8  24 21 6  16 14 4  10 9 3
-+8 7 4  3 3 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  2 2 2  5 4 1  11 9 3  16 14 4
-+24 21 6  31 27 8  37 31 10  47 39 13  47 39 13  47 39 13
-+57 50 17  57 50 16  57 50 16  57 50 16  224 212 126  114 84 45
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  71 53 16
-+57 50 17  80 59 18  57 50 17  80 59 18  80 59 18  71 53 16
-+80 59 18  80 59 18  80 59 18  80 59 18  80 59 18  80 59 18
-+80 59 18  91 66 24  90 65 21  90 65 21  91 66 24  104 73 28
-+97 69 27  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  117 83 35  104 73 28  104 73 28  117 83 35  104 73 28
-+117 83 35  117 83 35  104 73 28  117 83 35  117 83 35  131 88 37
-+104 73 28  154 97 33  231 228 207  231 228 207  231 228 207  230 228 210
-+231 228 207  231 228 207  230 228 210  230 228 210  231 228 207  230 228 210
-+231 228 207  231 229 214  231 228 207  231 229 214  231 228 207  231 228 207
-+231 228 207  229 224 185  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+143 92 37  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 108 49  154 108 49  154 97 33
-+224 212 126  226 217 137  227 219 152  227 218 146  227 218 146  227 218 146
-+227 217 139  226 217 137  226 217 137  226 217 137  224 212 126  224 212 126
-+224 212 126  57 50 16  57 50 16  57 50 16  57 50 16  47 39 13
-+37 31 10  37 31 10  31 27 8  24 21 6  16 14 4  10 9 3
-+6 5 1  3 3 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1  5 4 1  9 8 6  15 13 4
-+20 17 5  24 21 6  33 28 19  37 31 10  37 31 10  57 50 16
-+57 50 16  57 50 17  57 50 16  57 50 16  149 122 79  176 168 138
-+57 50 17  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 17  57 50 16  57 50 17  71 53 16  57 50 17
-+57 50 17  71 53 16  57 50 17  80 59 18  57 50 17  71 53 16
-+80 59 18  80 59 18  80 59 18  90 65 21  80 59 18  90 65 21
-+90 65 21  90 65 21  90 65 21  91 66 24  91 66 24  90 65 21
-+97 69 27  90 65 21  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  117 83 35  104 73 28
-+117 83 35  104 73 28  117 83 35  117 83 35  131 88 37  117 83 35
-+131 88 37  131 88 37  200 196 176  231 228 207  231 228 207  231 228 207
-+231 228 207  231 228 207  231 228 207  231 228 207  231 228 207  231 229 214
-+231 228 207  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+231 228 207  231 228 207  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 108 49  154 97 33  154 97 33  224 212 126
-+227 218 146  227 218 146  227 219 152  227 218 146  227 218 146  227 218 146
-+226 217 137  226 217 137  224 212 126  224 212 126  224 212 126  224 212 126
-+154 108 49  57 50 16  57 50 16  57 50 16  57 50 16  47 39 13
-+37 31 10  31 27 8  24 21 6  20 17 5  16 14 4  10 9 3
-+5 4 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1  4 3 1  7 5 2  13 11 4
-+18 15 5  24 21 6  31 27 8  37 31 10  47 39 13  47 39 13
-+57 50 16  57 50 16  57 50 17  57 50 16  71 64 51  226 217 137
-+114 84 45  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 17  57 50 16  57 50 16  57 50 16  57 50 17  57 50 17
-+71 53 16  57 50 17  57 50 17  71 53 16  80 59 18  57 50 17
-+80 59 18  57 50 17  80 59 18  80 59 18  80 59 18  80 59 18
-+80 59 18  90 65 21  90 65 21  90 65 21  90 65 21  97 69 27
-+90 65 21  104 73 28  90 65 21  90 65 21  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  117 83 35
-+104 73 28  131 88 37  117 83 35  117 83 35  117 83 35  131 88 37
-+117 83 35  131 88 37  163 154 123  230 227 201  231 228 207  231 228 207
-+231 228 207  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+231 228 207  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+231 228 207  231 228 207  163 154 123  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 108 49  154 108 49  154 97 33  224 212 126
-+226 217 137  227 218 146  227 218 146  227 218 146  227 218 146  227 217 139
-+226 217 137  226 217 137  226 217 137  224 212 126  224 212 126  224 212 126
-+80 59 18  57 50 16  57 50 16  57 50 16  37 31 10  47 39 13
-+37 31 10  31 27 8  31 27 8  16 14 4  10 10 10  6 5 1
-+3 3 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  3 3 1  6 5 1  10 9 3
-+16 14 4  24 21 6  31 27 8  31 27 8  47 39 13  35 34 31
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  163 154 123
-+224 212 126  57 50 17  57 50 17  57 50 17  57 50 17  57 50 17
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 17  57 50 16  57 50 16  57 50 16  57 50 16  71 53 16
-+57 50 17  80 59 18  71 53 16  80 59 18  80 59 18  80 59 18
-+80 59 18  80 59 18  80 59 18  90 65 21  90 65 21  90 65 21
-+90 65 21  90 65 21  90 65 21  104 73 28  90 65 21  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  117 83 35
-+104 73 28  117 83 35  104 73 28  117 83 35  117 83 35  131 88 37
-+117 83 35  143 92 37  156 118 66  231 228 207  231 228 207  231 228 207
-+231 228 207  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+231 228 207  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+231 228 207  230 227 199  224 212 126  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 108 49  154 108 49  154 97 33  154 97 33  224 212 126  227 217 139
-+227 218 146  227 219 152  227 218 146  227 218 146  227 218 146  227 217 139
-+226 217 137  224 212 126  224 212 126  224 212 126  224 212 126  156 118 66
-+57 50 16  57 50 16  57 50 16  57 50 16  47 39 13  47 39 13
-+31 27 8  31 27 8  24 21 6  16 14 4  10 9 3  6 5 1
-+2 2 2  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  1 1 1  5 4 1  10 9 3
-+15 13 4  20 17 5  27 23 7  31 27 8  37 31 10  47 39 13
-+47 39 13  57 50 16  57 50 16  57 50 16  57 50 16  114 84 45
-+226 217 137  142 111 68  57 50 16  57 50 17  57 50 17  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  71 53 16  57 50 16  71 53 16  71 53 16  80 59 18
-+80 59 18  80 59 18  80 59 18  80 59 18  90 65 21  90 65 21
-+90 65 21  90 65 21  90 65 21  90 65 21  90 65 21  90 65 21
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  117 83 35  117 83 35  131 88 37  117 83 35  131 88 37
-+117 83 35  131 88 37  131 88 37  227 222 178  230 227 204  230 227 205
-+230 227 205  230 227 205  231 228 207  230 227 205  231 228 207  230 227 205
-+231 228 207  231 228 207  231 228 207  231 228 207  231 228 207  231 228 207
-+231 228 207  230 227 205  227 222 178  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 108 49  154 108 49  154 108 49  154 97 33  224 212 126  227 217 139
-+227 219 152  227 218 146  227 218 146  227 218 146  227 217 139  226 217 137
-+226 217 137  226 217 137  224 212 126  224 212 126  224 212 126  117 83 35
-+57 50 16  57 50 16  57 50 16  47 39 13  47 39 13  31 27 8
-+31 27 8  24 21 6  16 14 4  16 14 4  10 9 3  3 3 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  3 3 1  6 5 1
-+13 11 4  20 17 5  24 21 6  31 27 8  37 31 10  37 31 10
-+47 39 13  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+176 168 138  224 212 126  63 54 38  57 50 17  57 50 17  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  56 48 15
-+56 48 15  55 44 14  56 48 15  51 40 13  56 48 15  57 50 16
-+57 50 16  57 50 16  59 49 15  57 50 16  71 53 16  57 50 16
-+71 53 16  71 53 16  80 59 18  80 59 18  80 59 18  80 59 18
-+80 59 18  90 63 20  90 63 20  90 63 20  90 65 21  90 63 20
-+90 63 20  90 63 20  90 63 20  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  117 83 35  104 73 28  117 83 35  117 83 35
-+131 88 37  131 88 37  131 88 37  185 178 149  230 227 204  230 227 204
-+230 227 204  230 227 205  230 227 205  230 227 205  230 227 205  230 227 205
-+230 227 205  230 227 205  230 227 205  230 227 205  230 227 205  230 227 205
-+230 227 205  230 227 205  230 227 202  154 108 49  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 108 49
-+154 108 49  154 108 49  154 97 33  224 212 126  227 218 146  227 219 152
-+227 218 146  227 218 146  227 218 146  227 218 146  227 217 139  226 217 137
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  57 50 16
-+57 50 16  57 50 16  57 50 16  47 39 13  47 39 13  37 31 10
-+31 27 8  24 21 6  16 14 4  10 9 3  8 7 4  3 3 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  2 2 2  5 4 1
-+10 9 3  15 13 4  24 21 6  27 23 7  37 31 10  37 31 10
-+47 39 13  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+142 111 68  226 217 137  150 141 118  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  56 48 15  56 48 15  56 48 15  51 40 13
-+51 40 13  51 40 13  51 40 13  47 39 13  46 36 11  50 37 12
-+51 40 13  55 43 14  59 45 14  59 49 15  59 45 14  67 48 15
-+59 49 15  71 53 16  67 48 15  71 53 16  71 53 16  78 55 17
-+78 55 17  78 55 17  80 59 18  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  104 73 28
-+104 73 28  104 73 28  131 88 37  104 73 28  131 88 37  131 88 37
-+117 83 35  131 88 37  131 88 37  156 118 66  230 227 197  230 227 202
-+230 227 202  230 227 202  230 227 204  230 227 204  230 227 204  230 227 204
-+230 227 204  230 227 204  230 227 204  230 227 204  230 227 204  230 227 204
-+230 227 204  230 227 204  231 228 207  224 212 126  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 108 49
-+154 108 49  154 108 49  224 212 126  224 212 126  226 217 137  227 218 146
-+227 218 146  227 218 146  227 218 146  227 217 139  226 217 137  226 217 137
-+224 212 126  224 212 126  224 212 126  224 212 126  117 83 35  57 50 16
-+57 50 16  57 50 16  57 50 16  37 31 10  37 31 10  31 27 8
-+31 27 8  24 21 6  16 14 4  10 9 3  5 5 5  3 3 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  1 1 1  3 3 1
-+8 7 4  13 11 4  20 17 5  24 21 6  31 27 8  37 31 10
-+47 39 13  37 31 10  57 50 16  57 50 16  57 50 16  57 50 16
-+47 39 13  224 212 126  226 217 137  100 76 42  57 50 16  57 50 16
-+57 50 16  56 48 15  56 48 15  56 48 15  55 44 14  55 44 14
-+51 40 13  51 40 13  50 37 12  46 36 11  46 36 11  43 33 10
-+46 36 11  49 31 9  50 37 12  57 34 10  58 38 12  60 42 13
-+60 42 13  60 42 13  68 47 15  68 47 15  68 47 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  78 55 17  75 50 15
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  117 83 35  104 73 28
-+131 88 37  117 83 35  131 88 37  143 92 37  229 225 190  230 227 202
-+230 227 202  230 227 202  230 227 202  230 227 202  230 227 202  230 227 202
-+230 227 202  230 227 202  230 227 202  230 227 202  230 227 202  230 227 202
-+230 227 202  230 227 205  229 224 185  216 206 146  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 108 49  154 108 49  154 108 49
-+154 97 33  154 97 33  224 212 126  227 217 139  227 218 146  227 218 146
-+227 218 146  227 218 146  227 217 139  226 217 137  226 217 137  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  57 50 16  57 50 16
-+57 50 16  57 50 16  47 39 13  47 39 13  37 31 10  31 27 8
-+24 21 6  16 14 4  10 9 3  10 9 3  3 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  3 3 1
-+6 5 1  10 9 3  16 14 4  24 21 6  31 27 8  31 27 8
-+47 39 13  35 34 31  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  100 76 42  226 217 137  224 212 126  57 50 17  57 50 17
-+57 50 16  56 48 15  56 48 15  47 39 13  56 48 15  47 39 13
-+51 40 13  47 39 13  46 36 11  44 35 11  43 33 10  41 32 10
-+38 27 8  38 27 8  48 30 8  49 31 9  49 31 9  50 37 12
-+57 34 10  58 38 12  62 38 11  62 38 11  62 38 11  62 38 11
-+68 47 15  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  104 73 28  104 73 28  131 88 37  104 73 28  143 92 37
-+117 83 35  131 88 37  131 88 37  131 88 37  176 168 138  230 227 197
-+230 227 201  230 227 201  230 227 201  230 227 201  230 227 201  230 227 201
-+230 227 202  230 227 202  230 227 202  230 227 202  230 227 202  230 227 201
-+230 227 201  230 227 201  230 227 202  229 225 190  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 108 49  224 212 126  154 97 33
-+154 108 49  224 212 126  224 212 126  227 217 139  227 218 146  227 218 146
-+227 218 146  227 218 146  227 217 139  227 217 139  226 217 137  226 217 137
-+224 212 126  224 212 126  224 212 126  104 73 28  57 50 16  57 50 16
-+57 50 16  57 50 16  37 31 10  37 31 10  37 31 10  31 27 8
-+24 21 6  16 14 4  10 9 3  8 7 4  3 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1
-+5 4 1  10 9 3  16 14 4  20 17 5  24 21 6  31 27 8
-+37 31 10  37 31 10  47 39 13  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  176 168 138  226 217 137  138 129 110  57 50 17
-+57 50 16  56 48 15  56 48 15  56 48 15  56 48 15  51 40 13
-+51 40 13  46 36 11  44 35 11  41 32 10  41 32 10  38 27 8
-+48 30 8  38 27 8  38 27 8  38 27 8  48 30 8  49 31 9
-+49 31 9  56 33 8  57 34 10  56 33 8  62 38 11  62 38 11
-+62 38 11  62 38 11  62 38 11  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  90 63 20  90 63 20
-+90 63 20  104 73 28  104 73 28  104 73 28  117 83 35  104 73 28
-+117 83 35  131 88 37  131 88 37  154 97 33  156 118 66  230 227 197
-+230 227 199  230 227 201  230 227 201  230 227 201  230 227 201  230 227 201
-+230 227 201  230 227 201  230 227 201  230 227 201  230 227 201  230 227 201
-+230 227 201  230 227 201  230 227 201  230 227 199  156 118 66  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 108 49  154 108 49  154 97 33  154 97 33  154 97 33
-+154 108 49  224 212 126  227 217 139  227 218 146  227 218 146  227 218 146
-+227 218 146  227 217 139  227 217 139  226 217 137  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  57 50 16  57 50 16  57 50 16
-+57 50 16  47 39 13  47 39 13  37 31 10  31 27 8  24 21 6
-+16 14 4  15 13 4  10 9 3  3 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+3 3 1  8 7 4  10 9 3  16 14 4  24 21 6  31 27 8
-+37 31 10  47 39 13  47 39 13  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  110 81 38  226 217 137  226 217 137  114 84 45
-+57 50 17  57 50 16  57 50 16  56 48 15  47 39 13  55 44 14
-+47 39 13  47 39 13  44 35 11  43 33 10  38 29 9  38 27 8
-+36 23 7  38 27 8  38 21 5  38 21 5  38 21 5  48 30 8
-+48 30 8  48 30 8  48 30 8  56 33 8  56 33 8  56 33 8
-+62 38 11  62 38 11  62 38 11  62 38 11  62 38 11  75 50 15
-+62 38 11  75 50 15  75 50 15  75 50 15  75 50 15  90 63 20
-+90 63 20  90 63 20  104 73 28  104 73 28  104 73 28  143 92 37
-+117 83 35  131 88 37  131 88 37  131 88 37  154 97 33  227 222 178
-+230 227 199  230 227 197  230 227 199  230 227 199  230 227 199  230 227 199
-+230 227 199  230 227 199  230 227 199  230 227 199  230 227 199  230 227 199
-+230 227 199  230 227 199  230 227 199  230 227 197  224 212 126  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 108 49  154 108 49  224 212 126  154 97 33  154 108 49  154 108 49
-+224 212 126  227 217 139  227 218 146  227 218 146  227 218 146  227 218 146
-+227 217 139  227 217 139  227 217 139  226 217 137  224 212 126  224 212 126
-+224 212 126  224 212 126  90 65 21  57 50 16  57 50 16  57 50 16
-+57 50 16  37 31 10  37 31 10  37 31 10  31 27 8  24 21 6
-+13 13 13  10 9 3  8 7 4  3 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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  1 1 1
-+1 1 1  6 5 1  7 7 7  16 14 4  20 17 5  24 21 6
-+31 27 8  31 27 8  47 39 13  37 31 10  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  163 154 123  226 217 139  224 214 136
-+75 62 40  57 50 17  57 50 17  56 48 15  56 48 15  55 44 14
-+51 40 13  50 37 12  46 36 11  43 33 10  48 30 8  38 27 8
-+38 27 8  36 23 7  38 21 5  38 21 5  38 21 5  38 21 5
-+38 21 5  48 30 8  48 30 8  48 30 8  56 33 8  56 33 8
-+56 33 8  56 33 8  62 38 11  62 38 11  62 38 11  62 38 11
-+75 50 15  62 38 11  75 50 15  75 50 15  75 50 15  75 50 15
-+90 63 20  90 63 20  104 73 28  104 73 28  104 73 28  104 73 28
-+131 88 37  117 83 35  131 88 37  131 88 37  143 92 37  176 168 138
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  227 221 169  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 108 49  154 108 49
-+154 108 49  154 97 33  154 97 33  154 97 33  154 97 33  224 212 126
-+227 217 139  227 218 146  227 219 152  227 218 146  227 218 146  227 218 146
-+227 217 139  226 217 137  226 217 137  224 212 126  224 212 126  224 212 126
-+224 212 126  156 118 66  57 50 16  57 50 16  57 50 16  57 50 16
-+47 39 13  47 39 13  37 31 10  31 27 8  24 21 6  20 17 5
-+16 14 4  10 9 3  6 5 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  0 0 0
-+0 0 0  3 3 1  6 5 1  13 11 4  16 14 4  24 21 6
-+31 27 8  37 31 10  37 31 10  47 39 13  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  90 68 33  224 212 126  226 217 139
-+176 168 138  71 53 16  57 50 16  57 50 17  57 50 17  56 48 15
-+55 44 14  51 40 13  50 37 12  46 36 11  43 33 10  41 32 10
-+38 27 8  38 27 8  38 21 5  38 21 5  38 21 5  38 21 5
-+38 21 5  38 21 5  48 30 8  48 30 8  48 30 8  56 33 8
-+56 33 8  56 33 8  56 33 8  62 38 11  62 38 11  62 38 11
-+62 38 11  62 38 11  62 38 11  75 50 15  75 50 15  75 50 15
-+90 63 20  90 63 20  90 63 20  104 73 28  104 73 28  131 88 37
-+104 73 28  154 97 33  117 83 35  131 88 37  131 88 37  154 108 49
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  156 118 66
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 108 49  154 108 49  154 108 49  224 212 126
-+154 97 33  154 108 49  154 108 49  154 108 49  224 212 126  224 212 126
-+227 217 139  227 218 146  227 218 146  227 218 146  227 218 146  227 217 139
-+227 217 139  227 217 139  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  90 65 21  57 50 16  57 50 16  57 50 16  47 39 13
-+47 39 13  37 31 10  31 27 8  31 27 8  24 21 6  16 14 4
-+15 13 4  8 7 4  3 3 1  3 3 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  0 0 0
-+1 1 1  3 3 1  6 5 1  10 9 3  11 11 11  24 21 6
-+24 21 6  31 27 8  37 31 10  37 31 10  35 34 31  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  149 122 79  226 217 137
-+226 217 137  150 141 118  57 50 17  71 53 16  59 49 15  59 49 15
-+58 46 15  55 44 14  55 43 14  51 40 13  50 37 12  49 31 9
-+43 33 10  48 30 8  48 30 8  38 27 8  38 21 5  38 21 5
-+38 21 5  38 21 5  48 30 8  38 21 5  48 30 8  38 21 5
-+56 33 8  56 33 8  56 33 8  56 33 8  62 38 11  62 38 11
-+62 38 11  62 38 11  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  90 63 20  90 63 20  104 73 28  104 73 28  104 73 28
-+117 83 35  117 83 35  131 88 37  131 88 37  143 92 37  143 92 37
-+227 221 169  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  230 227 197  230 227 197  230 227 197  230 227 197  230 227 197
-+230 227 197  229 225 190  230 227 197  230 227 197  228 223 179  224 212 126
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 108 49  154 108 49  154 108 49  154 108 49  154 97 33  154 97 33
-+154 108 49  154 97 33  224 212 126  154 108 49  224 212 126  227 217 139
-+227 218 146  227 218 146  227 218 146  227 218 146  227 217 139  227 217 139
-+226 217 137  226 217 137  224 212 126  224 212 126  224 212 126  224 212 126
-+154 97 33  57 50 16  57 50 16  57 50 16  57 50 16  47 39 13
-+47 39 13  37 31 10  31 27 8  24 21 6  16 14 4  15 13 4
-+10 9 3  6 5 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  0 0 0  0 0 0
-+0 0 0  0 0 0  3 3 1  6 5 1  15 13 4  16 14 4
-+24 21 6  31 27 8  31 27 8  47 39 13  47 39 13  47 39 13
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  176 168 138
-+224 212 126  226 217 137  142 111 68  57 50 16  71 53 16  57 50 17
-+71 53 16  57 50 17  59 45 14  55 43 14  51 40 13  50 37 12
-+46 36 11  48 30 8  48 30 8  48 30 8  48 30 8  38 21 5
-+48 30 8  38 21 5  48 30 8  48 30 8  48 30 8  56 33 8
-+56 33 8  56 33 8  56 33 8  56 33 8  56 33 8  62 38 11
-+62 38 11  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+90 63 20  90 63 20  90 63 20  104 73 28  104 73 28  143 92 37
-+104 73 28  143 92 37  117 83 35  154 97 33  117 83 35  154 97 33
-+163 154 123  229 224 185  229 226 192  230 227 197  229 225 190  229 225 190
-+230 227 197  229 225 190  229 225 190  230 227 197  229 225 190  229 225 190
-+230 227 197  229 225 190  230 227 197  229 225 190  229 225 190  216 206 146
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 108 49  154 108 49  154 108 49  154 108 49
-+224 212 126  154 97 33  154 108 49  224 212 126  154 97 33  154 108 49
-+154 108 49  154 108 49  154 97 33  224 212 126  226 217 137  227 217 139
-+227 219 152  227 218 146  227 218 146  227 217 139  227 217 139  227 217 139
-+226 217 137  224 212 126  224 212 126  224 212 126  224 212 126  156 118 66
-+90 65 21  57 50 16  57 50 16  57 50 16  47 39 13  47 39 13
-+37 31 10  31 27 8  31 27 8  24 21 6  16 14 4  15 13 4
-+8 7 4  3 3 1  3 3 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  0 0 0  0 0 0
-+0 0 0  1 1 1  3 3 1  6 5 1  10 9 3  16 14 4
-+16 14 4  24 21 6  31 27 8  31 27 8  47 39 13  37 31 10
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  91 66 24
-+226 217 137  226 217 137  226 217 137  135 101 60  57 50 17  71 53 16
-+67 48 15  59 49 15  59 49 15  59 45 14  55 44 14  57 41 13
-+51 40 13  50 37 12  49 31 9  48 30 8  48 30 8  48 30 8
-+48 30 8  38 21 5  48 30 8  38 21 5  56 33 8  38 21 5
-+56 33 8  56 33 8  56 33 8  56 33 8  62 38 11  62 38 11
-+62 38 11  62 38 11  75 50 15  75 50 15  75 50 15  75 50 15
-+90 63 20  90 63 20  90 63 20  90 63 20  104 73 28  104 73 28
-+131 88 37  104 73 28  131 88 37  131 88 37  131 88 37  131 88 37
-+154 108 49  229 225 190  229 226 192  229 226 192  229 225 190  230 227 197
-+229 225 190  229 225 190  230 227 197  229 225 190  230 227 197  229 225 190
-+230 227 197  229 225 190  229 225 190  230 227 197  229 225 190  228 223 179
-+156 118 66  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 108 49  154 97 33  154 97 33  224 212 126  154 108 49  154 97 33
-+154 97 33  154 108 49  154 97 33  154 97 33  154 97 33  224 212 126
-+154 108 49  154 108 49  224 212 126  227 217 139  227 218 146  227 218 146
-+227 218 146  227 218 146  227 218 146  227 217 139  227 217 139  226 217 137
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  117 83 35
-+57 50 16  57 50 16  57 50 16  57 50 16  47 39 13  47 39 13
-+37 31 10  31 27 8  24 21 6  16 14 4  15 13 4  10 9 3
-+6 5 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  1 1 1  3 3 1  5 5 5  10 9 3
-+16 14 4  24 21 6  31 27 8  31 27 8  37 31 10  47 39 13
-+47 39 13  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+149 122 79  226 217 137  226 217 139  226 217 139  100 76 42  57 50 17
-+71 53 16  71 53 16  71 53 16  59 49 15  59 49 15  59 45 14
-+59 45 14  58 38 12  50 37 12  57 34 10  49 31 9  48 30 8
-+48 30 8  56 33 8  48 30 8  38 21 5  56 33 8  38 21 5
-+56 33 8  56 33 8  56 33 8  56 33 8  62 38 11  62 38 11
-+62 38 11  75 50 15  62 38 11  75 50 15  75 50 15  75 50 15
-+75 50 15  90 63 20  90 63 20  90 63 20  104 73 28  104 73 28
-+104 73 28  143 92 37  104 73 28  154 97 33  131 88 37  154 97 33
-+131 88 37  216 206 146  229 224 185  229 225 190  229 225 190  229 225 190
-+229 225 190  230 227 197  229 225 190  229 225 190  229 225 190  229 225 190
-+229 225 190  229 225 190  229 225 190  229 225 190  229 225 190  229 224 185
-+224 212 126  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 108 49  154 108 49  154 108 49  154 97 33  154 97 33  154 108 49
-+224 212 126  154 97 33  154 108 49  154 108 49  154 108 49  154 97 33
-+154 108 49  224 212 126  226 217 137  227 217 139  227 219 152  227 218 146
-+227 218 146  227 217 139  227 217 139  227 217 139  227 217 139  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  154 97 33  57 50 16
-+57 50 16  57 50 16  57 50 16  47 39 13  37 31 10  37 31 10
-+31 27 8  31 27 8  24 21 6  16 14 4  15 13 4  8 7 4
-+3 3 1  3 3 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  1 1 1  3 3 1  6 5 1  10 9 3
-+16 14 4  16 14 4  24 21 6  31 27 8  37 31 10  37 31 10
-+35 34 31  47 39 13  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  163 154 123  226 217 137  226 218 148  226 217 139  100 76 42
-+71 53 16  57 50 17  71 53 16  71 53 16  67 48 15  67 48 15
-+59 49 15  59 45 14  60 42 13  57 41 13  57 34 10  56 33 8
-+56 33 8  48 30 8  56 33 8  56 33 8  56 33 8  56 33 8
-+56 33 8  56 33 8  56 33 8  62 38 11  62 38 11  62 38 11
-+75 50 15  62 38 11  75 50 15  75 50 15  75 50 15  75 50 15
-+90 63 20  90 63 20  90 63 20  90 63 20  104 73 28  104 73 28
-+131 88 37  104 73 28  131 88 37  117 83 35  131 88 37  131 88 37
-+154 97 33  156 118 66  229 225 190  229 225 190  229 225 190  229 225 190
-+229 225 190  229 225 190  229 225 190  229 225 190  229 225 190  229 225 190
-+229 225 190  229 225 190  229 225 190  229 225 190  229 224 185  228 223 179
-+224 212 126  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+224 212 126  154 108 49  154 108 49  154 97 33  224 212 126  154 97 33
-+154 97 33  154 108 49  154 97 33  224 212 126  154 108 49  154 97 33
-+224 212 126  227 217 139  227 217 139  227 218 146  227 218 146  227 218 146
-+227 218 146  227 217 139  227 217 139  226 217 137  226 217 137  224 212 126
-+224 212 126  224 212 126  224 212 126  156 118 66  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  47 39 13  47 39 13  31 27 8
-+31 27 8  24 21 6  16 14 4  10 9 3  10 9 3  3 3 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  3 3 1  4 4 4
-+10 9 3  16 14 4  20 17 5  24 21 6  31 27 8  37 31 10
-+47 39 13  47 39 13  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  90 65 21  224 212 126  226 217 137  226 217 139  216 206 146
-+90 68 33  80 59 18  71 53 16  71 53 16  71 53 16  57 50 17
-+67 48 15  67 48 15  59 45 14  59 45 14  58 38 12  58 38 12
-+57 34 10  57 34 10  56 33 8  56 33 8  38 21 5  56 33 8
-+56 33 8  56 33 8  56 33 8  56 33 8  62 38 11  62 38 11
-+62 38 11  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  90 63 20  90 63 20  90 63 20  104 73 28  104 73 28
-+104 73 28  143 92 37  104 73 28  154 97 33  131 88 37  131 88 37
-+143 92 37  154 97 33  227 221 169  229 225 190  229 225 190  229 225 190
-+229 225 190  229 225 190  229 224 185  229 225 190  229 224 185  229 225 190
-+229 224 185  229 224 185  229 225 190  229 224 185  229 224 185  229 224 185
-+229 224 185  154 108 49  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 108 49  154 108 49  154 97 33  154 97 33
-+224 212 126  154 97 33  154 108 49  154 97 33  154 108 49  224 212 126
-+224 212 126  227 217 139  227 218 146  227 218 146  227 218 146  227 218 146
-+227 217 139  227 217 139  227 217 139  226 217 137  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  104 73 28  57 50 16  57 50 16
-+57 50 16  57 50 16  37 31 10  37 31 10  31 27 8  31 27 8
-+24 21 6  24 21 6  16 14 4  15 13 4  8 7 4  3 3 1
-+1 1 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  3 3 1  6 5 1
-+10 9 3  15 13 4  16 14 4  24 21 6  31 27 8  31 27 8
-+37 31 10  47 39 13  37 31 10  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  90 68 33  224 214 136  226 217 139  226 217 137
-+224 214 136  100 76 42  70 58 37  80 59 18  71 53 16  71 53 16
-+71 53 16  71 53 16  67 48 15  67 48 15  67 48 15  60 42 13
-+62 38 11  62 38 11  57 34 10  62 38 11  56 33 8  56 33 8
-+56 33 8  56 33 8  56 33 8  62 38 11  62 38 11  62 38 11
-+62 38 11  62 38 11  62 38 11  75 50 15  75 50 15  75 50 15
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  104 73 28
-+104 73 28  104 73 28  131 88 37  117 83 35  131 88 37  131 88 37
-+131 88 37  154 97 33  163 154 123  229 224 185  229 224 185  229 224 185
-+229 224 185  229 224 185  229 224 185  229 225 190  229 224 185  229 225 190
-+229 224 185  229 225 190  229 224 185  229 225 190  229 224 185  229 224 185
-+227 220 160  224 212 126  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 108 49  154 108 49  154 108 49
-+154 108 49  154 108 49  154 97 33  224 212 126  154 108 49  154 108 49
-+154 97 33  154 108 49  154 108 49  154 97 33  224 212 126  226 217 137
-+227 217 139  227 218 146  227 218 146  227 218 146  227 218 146  227 217 139
-+227 217 139  227 217 139  226 217 137  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  117 83 35  57 50 16  57 50 16  57 50 16
-+57 50 16  47 39 13  47 39 13  47 39 13  31 27 8  31 27 8
-+24 21 6  16 14 4  10 9 3  8 7 4  3 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  1 1 1
-+3 3 1  10 9 3  15 13 4  16 14 4  24 21 6  31 27 8
-+31 27 8  37 31 10  47 39 13  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 17  142 111 68  226 217 137  226 217 139
-+226 217 139  224 214 136  100 76 42  80 59 18  71 53 16  80 59 18
-+71 53 16  71 53 16  71 53 16  71 51 16  67 48 15  68 47 15
-+68 47 15  62 38 11  62 38 11  62 38 11  62 38 11  62 38 11
-+62 38 11  56 33 8  62 38 11  62 38 11  62 38 11  62 38 11
-+62 38 11  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  90 63 20  90 63 20  90 63 20  104 73 28  104 73 28
-+104 73 28  143 92 37  104 73 28  131 88 37  131 88 37  154 97 33
-+131 88 37  131 88 37  154 97 33  227 221 169  229 225 190  229 224 185
-+229 224 185  229 225 190  229 224 185  229 224 185  229 224 185  229 224 185
-+229 224 185  229 224 185  229 224 185  229 224 185  229 224 185  229 224 185
-+229 224 185  224 212 126  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 108 49  154 108 49  224 212 126
-+154 97 33  154 108 49  154 108 49  154 97 33  154 108 49  224 212 126
-+154 97 33  154 108 49  224 212 126  224 212 126  224 212 126  226 217 137
-+227 217 139  227 218 146  227 218 146  227 218 146  227 217 139  227 217 139
-+227 217 139  226 217 137  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  154 97 33  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  37 31 10  37 31 10  31 27 8  31 27 8  24 21 6
-+20 17 5  16 14 4  10 9 3  10 9 3  3 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  1 1 1  1 1 1
-+6 5 1  10 9 3  10 9 3  16 14 4  24 21 6  24 21 6
-+31 27 8  37 31 10  37 31 10  47 39 13  47 39 13  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  150 141 118  226 217 137
-+226 217 139  226 218 148  226 217 139  135 101 60  70 58 37  80 59 18
-+80 59 18  71 53 16  79 57 18  71 53 16  71 53 16  71 51 16
-+68 47 15  75 50 15  68 47 15  75 50 15  62 38 11  62 38 11
-+62 38 11  62 38 11  62 38 11  62 38 11  62 38 11  62 38 11
-+75 50 15  62 38 11  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  90 63 20  90 63 20  104 73 28  90 63 20
-+104 73 28  104 73 28  104 73 28  131 88 37  117 83 35  131 88 37
-+131 88 37  154 97 33  154 97 33  185 178 149  229 224 185  229 224 185
-+229 224 185  229 224 185  229 224 185  229 224 185  229 224 185  229 224 185
-+229 224 185  229 224 185  229 224 185  229 224 185  229 224 185  229 224 185
-+229 224 185  227 220 160  156 118 66  154 108 49  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 108 49  154 108 49  154 97 33  154 97 33
-+154 108 49  154 108 49  154 97 33  224 212 126  154 97 33  154 97 33
-+154 108 49  154 97 33  224 212 126  224 212 126  227 217 139  227 218 146
-+227 218 146  227 218 146  227 218 146  227 217 139  227 217 139  227 217 139
-+226 217 137  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+154 108 49  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+47 39 13  47 39 13  37 31 10  31 27 8  24 21 6  20 17 5
-+16 14 4  10 9 3  5 5 5  3 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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
-+1 1 1  3 3 1  8 7 4  10 9 3  16 14 4  24 21 6
-+31 27 8  31 27 8  37 31 10  47 39 13  47 39 13  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  80 59 18  163 154 123
-+226 217 137  226 217 137  226 217 139  226 217 137  142 111 68  71 53 16
-+80 59 18  80 59 18  80 59 18  79 57 18  71 53 16  78 55 17
-+71 53 16  75 50 15  75 50 15  68 47 15  75 50 15  75 50 15
-+62 38 11  75 50 15  62 38 11  75 50 15  62 38 11  75 50 15
-+62 38 11  75 50 15  62 38 11  75 50 15  75 50 15  75 50 15
-+75 50 15  90 63 20  90 63 20  90 63 20  90 63 20  104 73 28
-+104 73 28  143 92 37  104 73 28  143 92 37  104 73 28  154 97 33
-+131 88 37  131 88 37  154 97 33  154 97 33  228 223 179  229 224 185
-+229 224 185  229 224 185  229 224 185  229 224 185  229 224 185  229 224 185
-+229 224 185  229 224 185  229 224 185  228 223 179  229 224 185  228 223 179
-+229 224 185  228 223 179  224 212 126  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 108 49  154 108 49  154 108 49  154 108 49
-+224 212 126  154 97 33  154 108 49  154 97 33  154 108 49  154 108 49
-+224 212 126  224 212 126  224 212 126  224 212 126  227 217 139  227 218 146
-+227 218 146  227 218 146  227 217 139  227 217 139  227 217 139  227 217 139
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  156 118 66
-+117 83 35  57 50 16  57 50 16  57 50 16  57 50 16  47 39 13
-+37 31 10  37 31 10  31 27 8  31 27 8  24 21 6  16 14 4
-+16 14 4  10 9 3  6 5 1  3 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1
-+1 1 1  3 3 1  10 9 3  10 9 3  16 14 4  14 14 14
-+24 21 6  31 27 8  31 27 8  37 31 10  35 34 31  47 39 13
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+224 212 126  226 217 137  226 217 139  226 217 139  226 217 137  163 154 123
-+75 61 38  80 59 18  80 59 18  80 59 18  80 59 18  79 57 18
-+79 57 18  78 55 17  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  62 38 11  75 50 15  75 50 15  62 38 11
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+90 63 20  75 50 15  90 63 20  90 63 20  90 63 20  104 73 28
-+90 63 20  104 73 28  104 73 28  104 73 28  131 88 37  131 88 37
-+131 88 37  154 97 33  131 88 37  154 97 33  216 206 146  228 223 179
-+228 223 179  229 224 185  228 223 179  228 223 179  228 223 179  228 223 179
-+228 223 179  228 223 179  228 223 179  229 224 185  228 223 179  228 223 179
-+228 223 179  227 221 169  224 212 126  154 97 33  154 108 49  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 108 49  154 97 33  224 212 126  154 97 33
-+154 97 33  154 108 49  154 108 49  154 97 33  224 212 126  154 97 33
-+224 212 126  224 212 126  227 217 139  227 217 139  227 218 146  227 218 146
-+227 218 146  227 217 139  227 217 139  227 217 139  226 217 137  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  90 65 21
-+57 50 16  57 50 16  57 50 16  57 50 16  47 39 13  47 39 13
-+37 31 10  31 27 8  31 27 8  24 21 6  16 14 4  15 13 4
-+10 9 3  3 3 1  3 3 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  1 1 1  3 3 1  5 5 5  10 9 3  16 14 4
-+20 17 5  24 21 6  31 27 8  37 31 10  37 31 10  47 39 13
-+57 50 16  57 50 16  57 50 16  57 50 16  80 59 18  57 50 16
-+80 59 18  176 168 138  226 217 137  226 217 137  226 217 137  226 217 137
-+224 212 126  90 68 33  80 59 18  80 59 18  90 65 21  80 59 18
-+80 59 18  80 59 18  79 57 18  78 55 17  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  75 50 15  75 50 15
-+75 50 15  90 63 20  75 50 15  90 63 20  90 63 20  90 63 20
-+104 73 28  104 73 28  143 92 37  104 73 28  143 92 37  104 73 28
-+154 97 33  117 83 35  154 97 33  131 88 37  154 108 49  228 223 179
-+228 223 179  228 223 179  228 223 179  228 223 179  228 223 179  228 223 179
-+228 223 179  228 223 179  228 223 179  228 223 179  228 223 179  228 223 179
-+228 223 179  228 223 179  227 221 169  224 212 126  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 108 49  154 108 49  154 108 49  154 97 33  154 97 33
-+224 212 126  154 97 33  154 108 49  154 108 49  224 212 126  224 212 126
-+224 212 126  227 217 139  227 217 139  227 218 146  227 218 146  227 217 139
-+227 217 139  227 217 139  227 217 139  226 217 137  226 217 137  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  80 59 18  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  37 31 10  47 39 13
-+31 27 8  31 27 8  24 21 6  24 21 6  16 14 4  15 13 4
-+8 7 4  3 3 1  3 3 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  1 1 1  3 3 1  6 5 1  10 9 3  15 13 4
-+16 14 4  24 21 6  31 27 8  31 27 8  37 31 10  37 31 10
-+37 31 10  57 50 16  57 50 16  57 50 16  71 53 16  57 50 16
-+71 53 16  80 59 18  224 212 126  226 217 137  226 217 137  226 217 139
-+224 214 136  224 214 136  135 101 60  90 65 21  80 59 18  80 59 18
-+90 65 21  80 59 18  90 63 20  78 55 17  90 63 20  90 63 20
-+90 63 20  75 50 15  90 63 20  75 50 15  75 50 15  75 50 15
-+75 50 15  75 50 15  75 50 15  75 50 15  90 63 20  75 50 15
-+90 63 20  75 50 15  90 63 20  90 63 20  90 63 20  104 73 28
-+104 73 28  90 63 20  90 63 20  131 88 37  104 73 28  131 88 37
-+131 88 37  131 88 37  131 88 37  154 97 33  154 97 33  216 206 146
-+228 223 179  228 223 179  228 223 179  228 223 179  228 223 179  228 223 179
-+228 223 179  228 223 179  228 223 179  228 223 179  228 223 179  228 223 179
-+227 221 169  228 223 179  227 217 139  224 212 126  154 97 33  154 108 49
-+154 108 49  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 108 49  154 108 49  154 97 33  224 212 126  154 108 49  154 97 33
-+154 97 33  154 108 49  154 97 33  224 212 126  224 212 126  224 212 126
-+227 217 139  227 217 139  227 218 146  227 218 146  227 218 146  227 217 139
-+227 217 139  226 217 137  226 217 137  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  80 59 18  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  47 39 13  47 39 13  31 27 8
-+31 27 8  24 21 6  24 21 6  16 14 4  10 9 3  6 5 1
-+3 3 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  1 1 1  3 3 1  10 9 3
-+10 9 3  16 14 4  24 21 6  24 21 6  31 27 8  37 31 10
-+47 39 13  47 39 13  57 50 16  57 50 16  57 50 16  71 53 16
-+57 50 16  80 59 18  90 68 33  224 212 126  224 212 126  226 217 139
-+226 217 139  226 218 148  226 217 139  150 141 118  91 66 24  90 65 21
-+90 65 21  90 65 21  90 63 20  90 63 20  90 63 20  75 50 15
-+90 63 20  90 63 20  75 50 15  90 63 20  90 63 20  75 50 15
-+90 63 20  75 50 15  90 63 20  75 50 15  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+104 73 28  104 73 28  143 92 37  90 63 20  154 97 33  104 73 28
-+154 97 33  131 88 37  154 97 33  131 88 37  154 97 33  154 108 49
-+227 221 169  228 223 179  228 223 179  227 221 169  228 223 179  228 223 179
-+228 223 179  227 221 169  228 223 179  227 221 169  228 223 179  227 221 169
-+228 223 179  227 221 169  227 221 169  227 217 139  154 97 33  154 97 33
-+154 108 49  154 97 33  154 97 33  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 97 33  154 108 49
-+154 108 49  154 108 49  154 108 49  154 97 33  154 97 33  224 212 126
-+154 97 33  224 212 126  224 212 126  224 212 126  226 217 137  227 217 139
-+227 218 146  227 218 146  227 218 146  227 217 139  227 217 139  227 217 139
-+227 217 139  226 217 137  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  80 59 18  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  37 31 10  37 31 10  31 27 8  31 27 8
-+31 27 8  24 21 6  16 14 4  16 14 4  10 9 3  6 5 1
-+3 3 1  1 1 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  1 1 1  1 1 1  3 3 1  6 5 1
-+10 9 3  16 14 4  16 14 4  24 21 6  31 27 8  31 27 8
-+37 31 10  37 31 10  57 50 16  57 50 16  57 50 16  57 50 16
-+80 59 18  57 50 16  57 50 16  90 65 21  176 168 138  226 217 137
-+226 217 137  226 217 139  226 217 139  226 217 137  224 212 126  135 101 60
-+80 59 18  90 65 21  90 65 21  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  104 73 28
-+104 73 28  104 73 28  90 63 20  131 88 37  104 73 28  117 83 35
-+131 88 37  131 88 37  117 83 35  154 97 33  131 88 37  154 97 33
-+216 206 146  228 223 179  227 221 169  228 223 179  227 221 169  228 223 179
-+227 221 169  228 223 179  227 221 169  228 223 179  227 221 169  228 223 179
-+227 221 169  228 223 179  227 221 169  227 217 139  224 212 126  154 108 49
-+154 108 49  154 108 49  154 108 49  154 97 33  154 97 33  154 97 33
-+154 97 33  154 97 33  154 97 33  154 97 33  154 108 49  154 108 49
-+154 97 33  224 212 126  154 108 49  154 108 49  154 97 33  154 97 33
-+224 212 126  224 212 126  226 217 137  227 217 139  227 217 139  227 217 139
-+227 218 146  227 218 146  227 217 139  227 217 139  227 217 139  227 217 139
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+156 118 66  80 59 18  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  47 39 13  47 39 13  37 31 10  31 27 8  31 27 8
-+24 21 6  16 14 4  15 13 4  10 9 3  6 5 1  3 3 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1  3 3 1
-+5 5 5  10 9 3  15 13 4  16 14 4  24 21 6  31 27 8
-+31 27 8  37 31 10  47 39 13  57 50 16  57 50 16  57 50 16
-+57 50 16  80 59 18  71 53 16  80 59 18  80 59 18  176 168 138
-+224 212 126  226 217 137  226 217 137  226 217 139  226 218 148  226 217 139
-+163 154 123  104 73 28  90 65 21  90 65 21  91 66 24  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  104 73 28  104 73 28
-+104 73 28  104 73 28  143 92 37  104 73 28  143 92 37  104 73 28
-+154 97 33  117 83 35  154 97 33  131 88 37  154 97 33  143 92 37
-+154 108 49  227 220 160  228 223 179  227 221 169  228 223 179  227 221 169
-+227 221 169  227 221 169  227 221 169  227 221 169  227 221 169  227 221 169
-+227 221 169  227 221 169  227 221 169  227 220 160  224 212 126  154 97 33
-+154 97 33  154 108 49  154 108 49  154 108 49  154 97 33  154 97 33
-+154 97 33  154 97 33  154 108 49  154 108 49  154 108 49  154 108 49
-+154 108 49  154 97 33  154 97 33  154 108 49  224 212 126  224 212 126
-+224 212 126  224 212 126  227 217 139  227 217 139  227 218 146  227 218 146
-+227 218 146  227 217 139  227 217 139  227 217 139  227 217 139  226 217 137
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+104 73 28  71 53 16  57 50 16  57 50 16  57 50 16  47 39 13
-+47 39 13  37 31 10  37 31 10  31 27 8  31 27 8  24 21 6
-+20 17 5  16 14 4  10 9 3  10 9 3  3 3 1  3 3 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1  3 3 1
-+3 3 1  10 9 3  10 9 3  13 13 13  16 14 4  24 21 6
-+31 27 8  31 27 8  37 31 10  47 39 13  57 50 16  57 50 16
-+57 50 16  57 50 16  80 59 18  57 50 16  80 59 18  90 65 21
-+163 154 123  226 217 137  226 217 137  226 217 139  226 217 139  226 217 139
-+226 217 137  224 214 136  149 122 79  97 69 27  97 69 27  90 63 20
-+104 73 28  90 63 20  104 73 28  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  90 63 20  90 63 20  90 63 20  90 63 20
-+90 63 20  90 63 20  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  131 88 37
-+131 88 37  131 88 37  131 88 37  131 88 37  131 88 37  154 97 33
-+143 92 37  224 212 126  227 221 169  227 221 169  227 221 169  227 221 169
-+227 221 169  227 221 169  227 221 169  227 221 169  227 221 169  227 221 169
-+227 221 169  227 221 169  227 221 169  227 220 160  224 212 126  224 212 126
-+154 108 49  154 108 49  154 108 49  154 108 49  154 108 49  154 108 49
-+154 108 49  154 108 49  154 108 49  154 108 49  154 97 33  224 212 126
-+154 108 49  154 108 49  154 108 49  224 212 126  224 212 126  224 212 126
-+227 217 139  227 217 139  227 218 146  227 218 146  227 218 146  227 217 139
-+227 217 139  227 217 139  227 217 139  226 217 137  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  154 108 49  71 53 16
-+57 50 16  57 50 16  57 50 16  56 48 15  57 50 16  47 39 13
-+47 39 13  37 31 10  31 27 8  31 27 8  24 21 6  16 14 4
-+16 14 4  10 9 3  5 5 5  3 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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
-+1 1 1  3 3 1  6 5 1  10 9 3  16 14 4  24 21 6
-+24 21 6  31 27 8  31 27 8  37 31 10  47 39 13  57 50 16
-+57 50 16  57 50 16  80 59 18  80 59 18  80 59 18  80 59 18
-+80 59 18  149 122 79  226 217 137  226 217 137  226 217 137  226 217 139
-+226 217 139  226 217 139  227 218 146  224 212 126  142 111 68  90 65 21
-+97 69 27  104 73 28  90 63 20  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  143 92 37  104 73 28  154 97 33  104 73 28  154 97 33
-+104 73 28  154 97 33  131 88 37  154 97 33  131 88 37  154 97 33
-+131 88 37  154 97 33  227 218 153  227 221 169  227 221 169  227 221 169
-+227 221 169  227 221 169  227 221 169  227 221 169  227 221 169  227 221 169
-+227 220 160  227 221 169  227 220 160  227 221 169  227 218 153  224 212 126
-+154 97 33  154 97 33  154 108 49  154 108 49  154 108 49  154 108 49
-+154 108 49  154 108 49  154 108 49  154 108 49  154 108 49  154 97 33
-+154 108 49  224 212 126  224 212 126  226 217 137  226 217 137  227 217 139
-+227 218 146  227 218 146  227 218 146  227 218 146  227 217 139  227 217 139
-+227 217 139  227 217 139  226 217 137  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  154 108 49  104 73 28  57 50 16
-+57 50 16  57 50 16  57 50 16  47 39 13  47 39 13  37 31 10
-+37 31 10  37 31 10  31 27 8  24 21 6  24 21 6  16 14 4
-+16 14 4  10 9 3  6 5 1  3 3 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1
-+1 1 1  3 3 1  6 5 1  10 9 3  10 9 3  16 14 4
-+20 17 5  24 21 6  31 27 8  37 31 10  37 31 10  56 48 15
-+57 50 16  57 50 16  57 50 16  57 50 16  80 59 18  57 50 16
-+80 59 18  90 65 21  143 106 60  224 212 126  226 217 137  226 217 137
-+226 217 139  226 217 139  226 217 139  226 218 148  224 214 136  224 212 126
-+154 108 49  90 63 20  104 73 28  90 63 20  104 73 28  90 63 20
-+104 73 28  104 73 28  90 63 20  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  143 92 37  104 73 28
-+131 88 37  131 88 37  131 88 37  117 83 35  154 97 33  131 88 37
-+154 97 33  154 97 33  163 154 123  227 220 160  227 221 169  227 221 169
-+227 220 160  227 221 169  227 220 160  227 221 169  227 220 160  227 221 169
-+227 220 160  227 221 169  227 220 160  227 220 160  227 218 146  227 217 139
-+154 97 33  154 108 49  154 108 49  154 108 49  154 108 49  154 108 49
-+154 97 33  224 212 126  154 108 49  154 108 49  154 97 33  224 212 126
-+226 217 137  226 217 137  227 217 139  227 217 139  227 217 139  227 218 146
-+227 218 146  227 218 146  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  154 97 33  80 59 18  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  47 39 13  47 39 13  37 31 10
-+31 27 8  31 27 8  24 21 6  24 21 6  16 14 4  10 9 3
-+10 9 3  3 3 1  3 3 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+0 0 0  1 1 1  3 3 1  3 3 1  10 9 3  10 9 3
-+16 14 4  20 17 5  24 21 6  31 27 8  37 31 10  47 39 13
-+47 39 13  57 50 16  57 50 16  71 53 16  57 50 16  80 59 18
-+80 59 18  80 59 18  80 59 18  110 81 38  224 212 126  224 212 126
-+226 217 137  226 217 137  226 217 139  226 217 139  226 217 139  216 206 146
-+227 217 139  224 212 126  154 108 49  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  143 92 37  90 63 20  143 92 37  104 73 28  143 92 37
-+104 73 28  143 92 37  104 73 28  154 97 33  104 73 28  154 97 33
-+131 88 37  131 88 37  154 97 33  131 88 37  131 88 37  154 97 33
-+131 88 37  154 97 33  154 97 33  224 212 126  227 220 160  227 220 160
-+227 221 169  227 220 160  227 220 160  227 220 160  227 220 160  227 220 160
-+227 220 160  227 220 160  227 220 160  227 220 160  227 220 160  227 219 152
-+224 212 126  154 97 33  154 97 33  154 108 49  154 108 49  154 108 49
-+154 97 33  154 97 33  154 108 49  224 212 126  224 212 126  224 212 126
-+226 217 137  227 217 139  227 217 139  227 218 146  227 218 146  227 218 146
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  226 217 137
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  104 73 28  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  37 31 10  47 39 13  37 31 10  31 27 8
-+31 27 8  24 21 6  24 21 6  16 14 4  15 13 4  10 9 3
-+6 5 1  3 3 1  1 1 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+0 0 0  1 1 1  1 1 1  3 3 1  6 5 1  10 9 3
-+10 9 3  16 14 4  20 17 5  24 21 6  31 27 8  31 27 8
-+47 39 13  57 50 16  57 50 16  57 50 16  57 50 16  80 59 18
-+57 50 16  80 59 18  80 59 18  71 53 16  80 59 18  163 154 123
-+224 212 126  226 217 137  226 217 137  226 217 139  227 217 139  227 218 146
-+227 217 139  216 206 146  227 218 146  224 212 126  156 118 66  143 92 37
-+104 73 28  104 73 28  90 63 20  143 92 37  90 63 20  143 92 37
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  90 63 20  143 92 37  104 73 28  143 92 37  104 73 28
-+117 83 35  131 88 37  131 88 37  131 88 37  131 88 37  154 97 33
-+131 88 37  154 97 33  154 97 33  156 118 66  227 220 160  227 220 160
-+227 220 160  227 220 160  227 220 160  227 220 160  227 220 160  227 220 160
-+227 220 160  227 220 160  227 220 160  227 220 160  227 220 160  227 218 146
-+226 217 137  154 108 49  154 108 49  154 108 49  154 108 49  154 97 33
-+224 212 126  224 212 126  226 217 137  226 217 137  227 217 139  227 217 139
-+227 217 139  227 218 146  227 218 146  227 218 146  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  154 108 49
-+80 59 18  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+47 39 13  47 39 13  47 39 13  37 31 10  31 27 8  31 27 8
-+24 21 6  20 17 5  16 14 4  10 9 3  10 9 3  3 3 1
-+3 3 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  1 1 1  3 3 1  3 3 1
-+8 7 4  10 9 3  16 14 4  20 17 5  24 21 6  31 27 8
-+31 27 8  47 39 13  56 48 15  57 50 16  57 50 16  80 59 18
-+80 59 18  80 59 18  80 59 18  80 59 18  80 59 18  90 65 21
-+145 104 53  224 212 126  224 212 126  226 217 137  226 217 137  226 217 137
-+227 217 139  227 217 139  227 217 139  227 218 146  227 217 139  226 216 138
-+163 154 123  154 97 33  154 97 33  90 63 20  104 73 28  104 73 28
-+104 73 28  143 92 37  104 73 28  154 97 33  104 73 28  154 97 33
-+104 73 28  154 97 33  104 73 28  143 92 37  104 73 28  154 97 33
-+131 88 37  131 88 37  131 88 37  154 97 33  131 88 37  131 88 37
-+154 97 33  131 88 37  154 97 33  154 97 33  163 154 123  227 218 146
-+227 220 160  227 220 160  227 220 160  227 220 160  227 220 160  227 220 160
-+227 220 160  227 219 152  227 220 160  227 219 152  227 219 152  227 219 152
-+227 218 146  224 212 126  154 97 33  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  226 217 137  227 217 139  227 217 139  227 218 146
-+227 218 146  227 218 146  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  154 97 33  80 59 18
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+47 39 13  37 31 10  37 31 10  31 27 8  31 27 8  24 21 6
-+24 21 6  16 14 4  15 13 4  10 9 3  6 5 1  3 3 1
-+1 1 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  1 1 1  3 3 1
-+6 5 1  10 9 3  10 9 3  16 14 4  20 17 5  24 21 6
-+27 23 7  31 27 8  37 31 10  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  80 59 18  80 59 18  80 59 18  80 59 18
-+80 59 18  104 73 28  163 154 123  224 212 126  225 215 136  225 215 136
-+226 216 138  227 217 139  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  224 212 126  176 168 138  154 97 33  154 97 33
-+104 73 28  104 73 28  104 73 28  104 73 28  104 73 28  90 63 20
-+143 92 37  104 73 28  104 73 28  154 97 33  104 73 28  131 88 37
-+131 88 37  131 88 37  131 88 37  131 88 37  131 88 37  131 88 37
-+131 88 37  154 97 33  131 88 37  154 97 33  154 97 33  224 212 126
-+227 220 160  227 219 152  227 220 160  227 219 152  227 220 160  227 219 152
-+227 220 160  227 219 152  227 219 152  227 219 152  227 219 152  227 219 152
-+227 218 146  224 212 126  224 212 126  224 212 126  224 212 126  226 217 137
-+227 217 139  227 217 139  227 217 139  227 218 146  227 218 146  227 218 146
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  227 217 139
-+226 217 137  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  154 108 49  90 65 21  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  47 39 13  47 39 13
-+37 31 10  37 31 10  31 27 8  31 27 8  24 21 6  20 17 5
-+16 14 4  10 9 3  8 7 4  3 3 1  3 3 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1
-+1 1 1  3 3 1  5 5 5  10 9 3  16 14 4  20 17 5
-+24 21 6  27 23 7  31 27 8  37 31 10  47 39 13  57 50 16
-+57 50 16  80 59 18  57 50 16  80 59 18  80 59 18  90 65 21
-+80 59 18  80 59 18  90 65 21  143 100 47  224 212 126  224 212 126
-+224 212 126  226 217 137  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 218 146  227 217 139  227 217 139  227 217 139  226 216 138
-+224 212 126  156 118 66  154 97 33  154 97 33  143 92 37  104 73 28
-+143 92 37  104 73 28  154 97 33  104 73 28  154 97 33  104 73 28
-+154 97 33  117 83 35  143 92 37  131 88 37  154 97 33  131 88 37
-+154 97 33  131 88 37  154 97 33  154 97 33  154 97 33  154 97 33
-+227 217 139  227 219 152  227 219 152  227 219 152  227 219 152  227 219 152
-+227 219 152  227 219 152  227 219 152  227 219 152  227 219 152  227 219 152
-+227 218 146  227 218 146  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  227 218 146  227 218 146  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  226 217 137  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  154 97 33  80 59 18  80 59 18  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  47 39 13  37 31 10  37 31 10
-+37 31 10  31 27 8  31 27 8  24 21 6  16 14 4  16 14 4
-+10 9 3  10 9 3  6 5 1  3 3 1  1 1 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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
-+1 1 1  3 3 1  3 3 1  8 7 4  10 9 3  15 13 4
-+16 14 4  24 21 6  24 21 6  31 27 8  31 27 8  47 39 13
-+57 50 16  57 50 16  57 50 16  80 59 18  80 59 18  80 59 18
-+80 59 18  90 65 21  90 65 21  80 59 18  97 69 27  149 122 79
-+224 212 126  224 212 126  224 212 126  225 215 136  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  216 206 146
-+226 216 138  227 218 153  227 218 153  224 212 126  224 212 126  224 212 126
-+156 118 66  154 108 49  154 97 33  154 97 33  104 73 28  131 88 37
-+117 83 35  131 88 37  131 88 37  131 88 37  131 88 37  131 88 37
-+131 88 37  131 88 37  131 88 37  131 88 37  154 97 33  154 97 33
-+156 118 66  227 219 152  227 219 152  227 219 152  227 219 152  227 219 152
-+227 219 152  227 218 149  227 219 152  227 218 146  227 219 152  227 218 146
-+227 218 146  227 218 146  227 218 146  227 217 139  227 217 139  227 217 139
-+227 217 139  227 218 146  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  226 217 137  226 217 137  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  154 97 33
-+80 59 18  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  47 39 13  47 39 13  47 39 13  37 31 10  37 31 10
-+31 27 8  24 21 6  24 21 6  16 14 4  16 14 4  10 9 3
-+10 9 3  3 3 1  3 3 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  1 1 1  3 3 1  5 5 5  10 9 3
-+15 13 4  16 14 4  24 21 6  24 21 6  31 27 8  31 27 8
-+37 31 10  47 39 13  57 50 16  57 50 16  80 59 18  80 59 18
-+80 59 18  80 59 18  90 65 21  90 65 21  90 65 21  90 65 21
-+117 83 35  163 154 123  224 212 126  224 212 126  224 212 126  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  216 206 146  216 206 146  224 212 126
-+227 217 139  227 218 149  227 217 139  224 214 136  224 212 126  224 212 126
-+224 212 126  163 154 123  156 118 66  224 212 126  156 118 66  224 212 126
-+156 118 66  224 212 126  156 118 66  224 212 126  224 212 126  224 212 126
-+227 217 139  227 219 152  227 218 149  227 218 149  227 218 146  227 218 146
-+227 218 146  227 218 146  227 218 146  227 218 146  227 218 146  227 218 146
-+227 218 146  227 218 146  227 217 139  227 218 146  227 218 146  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  226 217 137
-+226 217 137  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  154 108 49  117 83 35  80 59 18
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+47 39 13  47 39 13  37 31 10  37 31 10  31 27 8  31 27 8
-+24 21 6  24 21 6  16 14 4  16 14 4  10 9 3  10 9 3
-+6 5 1  3 3 1  1 1 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  3 3 1  3 3 1  4 4 4
-+10 9 3  13 11 4  16 14 4  20 17 5  24 21 6  31 27 8
-+31 27 8  37 31 10  37 31 10  57 50 16  57 50 16  57 50 16
-+80 59 18  80 59 18  80 59 18  90 65 21  90 65 21  90 65 21
-+90 65 21  90 63 20  143 92 37  163 154 123  224 212 126  224 212 126
-+224 212 126  227 217 139  224 212 126  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  226 216 138  227 217 139
-+227 218 146  227 217 139  227 218 146  227 218 146  227 218 146  224 214 136
-+224 212 126  227 217 139  226 217 137  226 217 137  226 217 137  226 217 137
-+226 217 137  226 217 137  226 217 137  224 212 126  224 212 126  224 214 136
-+227 218 146  227 218 146  227 218 146  227 218 146  227 218 146  227 218 146
-+227 218 146  227 218 146  227 218 146  227 218 146  227 218 146  227 217 139
-+227 218 146  227 217 139  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  226 217 137  226 217 137  226 217 137  226 217 137  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  154 108 49  117 83 35  80 59 18  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  47 39 13  47 39 13
-+47 39 13  37 31 10  37 31 10  31 27 8  31 27 8  24 21 6
-+24 21 6  16 14 4  15 13 4  10 9 3  8 7 4  3 3 1
-+3 3 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  1 1 1  1 1 1  3 3 1
-+4 4 4  8 7 4  10 9 3  16 14 4  20 17 5  24 21 6
-+24 21 6  31 27 8  37 31 10  37 31 10  47 39 13  47 39 13
-+57 50 16  80 59 18  80 59 18  80 59 18  90 65 21  90 65 21
-+90 65 21  90 65 21  90 65 21  104 73 28  143 92 37  163 154 123
-+224 212 126  224 212 126  224 212 126  224 212 126  227 217 139  224 212 126
-+227 217 139  227 217 139  226 216 138  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 218 146  227 218 146  227 218 146  226 218 148  227 218 146
-+227 218 146  227 218 146  227 218 146  227 217 139  227 218 146  227 218 146
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  226 217 137
-+226 217 137  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  154 108 49
-+154 97 33  80 59 18  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  47 39 13  47 39 13  37 31 10
-+37 31 10  37 31 10  31 27 8  31 27 8  24 21 6  16 14 4
-+16 14 4  15 13 4  10 9 3  8 7 4  6 5 1  3 3 1
-+1 1 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  1 1 1  1 1 1
-+3 3 1  3 3 1  8 7 4  10 9 3  15 13 4  16 14 4
-+24 21 6  24 21 6  31 27 8  31 27 8  37 31 10  37 31 10
-+47 39 13  47 39 13  57 50 16  80 59 18  80 59 18  90 65 21
-+90 65 21  90 65 21  90 65 21  90 65 21  90 65 21  104 73 28
-+154 97 33  156 118 66  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  226 216 138  224 212 126  225 215 136  226 216 138
-+226 216 138  227 217 139  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 218 146  227 217 139  227 218 146
-+227 217 139  227 217 139  226 217 139  226 217 139  226 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  226 217 137  226 217 137  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  154 108 49  90 65 21  80 59 18
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  47 39 13  47 39 13  47 39 13  37 31 10  37 31 10
-+31 27 8  31 27 8  24 21 6  24 21 6  16 14 4  16 14 4
-+10 9 3  10 9 3  6 5 1  3 3 1  1 1 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1
-+1 1 1  3 3 1  3 3 1  6 5 1  10 9 3  10 9 3
-+16 14 4  20 17 5  24 21 6  31 27 8  31 27 8  37 31 10
-+37 31 10  37 31 10  47 39 13  47 39 13  57 50 16  57 50 16
-+80 59 18  90 65 21  90 65 21  104 73 28  90 65 21  90 65 21
-+104 73 28  104 73 28  117 83 35  154 108 49  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+227 217 139  224 212 126  227 217 139  225 215 136  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  226 217 137  226 217 137
-+226 217 137  226 217 137  226 217 137  226 217 137  227 217 139  226 217 137
-+227 217 139  227 217 139  227 217 139  227 217 139  227 217 139  227 217 139
-+227 217 139  227 217 139  227 217 139  227 217 139  224 212 126  226 217 137
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+154 108 49  154 97 33  80 59 18  80 59 18  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+47 39 13  37 31 10  37 31 10  37 31 10  37 31 10  31 27 8
-+31 27 8  24 21 6  20 17 5  16 14 4  16 14 4  10 9 3
-+10 9 3  6 5 1  3 3 1  1 1 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  1 1 1  3 3 1  3 3 1  4 4 4  10 9 3
-+10 9 3  16 14 4  16 14 4  20 17 5  24 21 6  31 27 8
-+31 27 8  37 31 10  37 31 10  37 31 10  47 39 13  47 39 13
-+56 48 15  57 50 16  71 53 16  90 65 21  90 65 21  104 73 28
-+90 65 21  104 73 28  104 73 28  90 63 20  90 63 20  131 88 37
-+154 108 49  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+226 217 137  224 212 126  226 217 137  226 217 137  226 217 137  226 217 137
-+226 217 137  226 217 137  226 217 137  226 217 137  226 217 137  226 217 137
-+224 212 126  227 217 139  224 212 126  227 217 139  224 212 126  224 212 126
-+226 217 137  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  156 118 66  154 97 33  90 65 21
-+90 65 21  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  47 39 13  37 31 10
-+47 39 13  37 31 10  37 31 10  31 27 8  31 27 8  24 21 6
-+24 21 6  16 14 4  16 14 4  10 9 3  10 9 3  8 7 4
-+3 3 1  3 3 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  1 1 1  3 3 1  3 3 1
-+5 5 5  10 9 3  15 13 4  16 14 4  16 14 4  24 21 6
-+24 21 6  31 27 8  31 27 8  37 31 10  37 31 10  47 39 13
-+47 39 13  47 39 13  56 48 15  47 39 13  57 50 16  71 53 16
-+80 59 18  90 63 20  90 65 21  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  131 88 37  154 108 49  163 154 123  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  226 217 137  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+154 108 49  154 97 33  104 73 28  90 65 21  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  47 39 13  37 31 10  47 39 13  37 31 10
-+37 31 10  31 27 8  31 27 8  31 27 8  24 21 6  20 17 5
-+16 14 4  16 14 4  15 13 4  10 9 3  10 9 3  3 3 1
-+3 3 1  1 1 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  1 1 1  3 3 1
-+3 3 1  6 5 1  6 6 6  10 9 3  16 14 4  16 14 4
-+20 17 5  24 21 6  31 27 8  31 27 8  37 31 10  31 27 8
-+37 31 10  37 31 10  47 39 13  47 39 13  47 39 13  56 48 15
-+56 48 15  59 49 15  59 49 15  71 53 16  90 63 20  90 63 20
-+90 63 20  104 73 28  104 73 28  104 73 28  131 88 37  131 88 37
-+154 97 33  156 118 66  156 118 66  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  154 108 49  154 97 33  90 65 21  80 59 18
-+80 59 18  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+47 39 13  37 31 10  47 39 13  37 31 10  37 31 10  31 27 8
-+31 27 8  31 27 8  24 21 6  24 21 6  16 14 4  16 14 4
-+10 9 3  10 9 3  8 7 4  3 3 1  3 3 1  1 1 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+1 1 1  3 3 1  3 3 1  5 5 5  10 9 3  10 9 3
-+16 14 4  16 14 4  20 17 5  24 21 6  31 27 8  31 27 8
-+37 31 10  37 31 10  37 31 10  47 39 13  47 39 13  44 35 11
-+47 39 13  56 48 15  56 48 15  55 44 14  56 48 15  59 49 15
-+67 48 15  69 49 15  75 50 15  80 59 18  80 59 18  90 63 20
-+104 73 28  117 83 35  131 88 37  131 88 37  117 83 35  154 97 33
-+156 118 66  156 118 66  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  224 212 126  224 212 126  224 212 126  224 212 126  224 212 126
-+224 212 126  156 118 66  156 118 66  154 108 49  154 97 33  104 73 28
-+71 53 16  57 50 16  71 53 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  47 39 13  47 39 13  37 31 10
-+37 31 10  37 31 10  37 31 10  31 27 8  31 27 8  31 27 8
-+24 21 6  24 21 6  16 14 4  16 14 4  16 14 4  10 9 3
-+10 9 3  10 9 3  3 3 1  3 3 1  1 1 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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
-+1 1 1  1 1 1  3 3 1  6 5 1  6 5 1  10 9 3
-+10 9 3  15 13 4  16 14 4  16 14 4  20 17 5  24 21 6
-+27 23 7  31 27 8  37 31 10  31 27 8  37 31 10  44 35 11
-+44 35 11  44 35 11  47 39 13  47 39 13  51 40 13  55 44 14
-+55 44 14  56 48 15  56 48 15  59 49 15  59 49 15  59 49 15
-+59 49 15  59 49 15  59 49 15  59 49 15  59 49 15  57 50 16
-+80 59 18  80 59 18  69 49 15  62 38 11  59 49 15  59 49 15
-+59 49 15  80 59 18  104 73 28  104 73 28  104 73 28  104 73 28
-+104 73 28  104 73 28  104 73 28  80 59 18  71 53 16  67 48 15
-+71 53 16  90 65 21  80 59 18  80 59 18  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  47 39 13  47 39 13  37 31 10  47 39 13  37 31 10
-+37 31 10  31 27 8  31 27 8  31 27 8  24 21 6  24 21 6
-+20 17 5  16 14 4  16 14 4  10 9 3  10 9 3  8 7 4
-+3 3 1  3 3 1  1 1 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  1 1 1  1 1 1  3 3 1  3 3 1
-+5 5 5  8 7 4  10 9 3  15 13 4  16 14 4  16 14 4
-+24 21 6  24 21 6  24 21 6  31 27 8  31 27 8  37 31 10
-+37 31 10  37 31 10  47 39 13  44 35 11  47 39 13  47 39 13
-+47 39 13  56 48 15  51 40 13  56 48 15  56 48 15  56 48 15
-+56 48 15  56 48 15  59 49 15  59 49 15  59 49 15  57 50 16
-+57 50 16  57 50 16  57 50 16  59 49 15  59 49 15  59 49 15
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  59 49 15  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  47 39 13  37 31 10
-+47 39 13  37 31 10  37 31 10  37 31 10  31 27 8  31 27 8
-+31 27 8  31 27 8  24 21 6  24 21 6  24 21 6  16 14 4
-+16 14 4  16 14 4  10 9 3  10 9 3  6 5 1  3 3 1
-+3 3 1  1 1 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  1 1 1  3 3 1
-+3 3 1  6 5 1  5 5 5  10 9 3  10 9 3  15 13 4
-+15 13 4  16 14 4  24 21 6  24 21 6  24 21 6  31 27 8
-+31 27 8  37 31 10  37 31 10  37 31 10  37 31 10  44 35 11
-+44 35 11  47 39 13  47 39 13  47 39 13  47 39 13  47 39 13
-+56 48 15  56 48 15  56 48 15  56 48 15  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+47 39 13  47 39 13  47 39 13  37 31 10  47 39 13  37 31 10
-+37 31 10  37 31 10  37 31 10  31 27 8  31 27 8  31 27 8
-+24 21 6  24 21 6  24 21 6  16 14 4  16 14 4  15 13 4
-+10 9 3  10 9 3  6 5 1  3 3 1  3 3 1  1 1 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  1 1 1
-+1 1 1  1 1 1  3 3 1  3 3 1  4 4 4  8 7 4
-+10 9 3  15 13 4  15 13 4  16 14 4  20 17 5  24 21 6
-+24 21 6  27 23 7  31 27 8  31 27 8  37 31 10  37 31 10
-+37 31 10  37 31 10  47 39 13  44 35 11  47 39 13  47 39 13
-+47 39 13  47 39 13  47 39 13  56 48 15  47 39 13  56 48 15
-+56 48 15  56 48 15  56 48 15  56 48 15  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  57 50 16  57 50 16
-+57 50 16  57 50 16  57 50 16  57 50 16  56 48 15  56 48 15
-+57 50 16  56 48 15  57 50 16  57 50 16  56 48 15  56 48 15
-+47 39 13  56 48 15  47 39 13  47 39 13  37 31 10  47 39 13
-+37 31 10  47 39 13  31 27 8  37 31 10  37 31 10  31 27 8
-+31 27 8  31 27 8  31 27 8  24 21 6  24 21 6  24 21 6
-+20 17 5  16 14 4  16 14 4  15 13 4  10 9 3  10 9 3
-+6 5 1  6 5 1  3 3 1  3 3 1  1 1 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  1 1 1  1 1 1  3 3 1  3 3 1  3 3 1
-+6 5 1  6 6 6  10 9 3  10 9 3  16 14 4  16 14 4
-+16 14 4  20 17 5  24 21 6  24 21 6  27 23 7  31 27 8
-+31 27 8  31 27 8  37 31 10  37 31 10  37 31 10  37 31 10
-+37 31 10  47 39 13  44 35 11  47 39 13  47 39 13  47 39 13
-+47 39 13  47 39 13  47 39 13  56 48 15  47 39 13  47 39 13
-+56 48 15  47 39 13  56 48 15  57 50 16  47 39 13  56 48 15
-+56 48 15  56 48 15  47 39 13  56 48 15  47 39 13  56 48 15
-+47 39 13  47 39 13  47 39 13  47 39 13  47 39 13  37 31 10
-+47 39 13  47 39 13  37 31 10  47 39 13  37 31 10  37 31 10
-+37 31 10  37 31 10  31 27 8  31 27 8  31 27 8  31 27 8
-+24 21 6  24 21 6  24 21 6  24 21 6  16 14 4  16 14 4
-+16 14 4  10 9 3  10 9 3  8 7 4  6 5 1  3 3 1
-+3 3 1  1 1 1  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  0 0 0  1 1 1  1 1 1  1 1 1  3 3 1
-+3 3 1  3 3 1  4 4 4  8 7 4  10 9 3  10 9 3
-+15 13 4  15 13 4  16 14 4  20 17 5  20 17 5  24 21 6
-+24 21 6  27 23 7  31 27 8  31 27 8  31 27 8  37 31 10
-+37 31 10  37 31 10  37 31 10  37 31 10  37 31 10  44 35 11
-+37 31 10  47 39 13  44 35 11  44 35 11  47 39 13  47 39 13
-+47 39 13  47 39 13  47 39 13  47 39 13  47 39 13  47 39 13
-+37 31 10  47 39 13  47 39 13  47 39 13  47 39 13  47 39 13
-+37 31 10  47 39 13  37 31 10  47 39 13  37 31 10  47 39 13
-+31 27 8  37 31 10  37 31 10  31 27 8  37 31 10  31 27 8
-+31 27 8  31 27 8  24 21 6  31 27 8  24 21 6  24 21 6
-+24 21 6  20 17 5  16 14 4  16 14 4  16 14 4  10 9 3
-+10 9 3  10 9 3  6 5 1  6 5 1  3 3 1  3 3 1
-+1 1 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+1 1 1  3 3 1  3 3 1  3 3 1  6 5 1  5 5 5
-+8 7 4  10 9 3  10 9 3  15 13 4  16 14 4  16 14 4
-+16 14 4  20 17 5  24 21 6  24 21 6  24 21 6  27 23 7
-+27 23 7  31 27 8  31 27 8  37 31 10  31 27 8  37 31 10
-+37 31 10  37 31 10  37 31 10  37 31 10  37 31 10  37 31 10
-+37 31 10  37 31 10  37 31 10  37 31 10  37 31 10  37 31 10
-+47 39 13  37 31 10  37 31 10  37 31 10  37 31 10  37 31 10
-+37 31 10  37 31 10  37 31 10  31 27 8  37 31 10  31 27 8
-+31 27 8  31 27 8  31 27 8  31 27 8  31 27 8  24 21 6
-+24 21 6  24 21 6  24 21 6  20 17 5  16 14 4  16 14 4
-+16 14 4  16 14 4  10 9 3  10 9 3  10 9 3  6 5 1
-+6 5 1  3 3 1  3 3 1  1 1 1  1 1 1  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+0 0 0  1 1 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 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 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 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  1 1 1  1 1 1  1 1 1  3 3 1
-+3 3 1  6 5 1  6 5 1  8 7 4  10 9 3  10 9 3
-+15 13 4  15 13 4  15 13 4  16 14 4  20 17 5  20 17 5
-+24 21 6  24 21 6  24 21 6  24 21 6  27 23 7  27 23 7
-+31 27 8  27 23 7  31 27 8  31 27 8  31 27 8  31 27 8
-+31 27 8  31 27 8  37 31 10  37 31 10  31 27 8  37 31 10
-+31 27 8  31 27 8  37 31 10  31 27 8  31 27 8  31 27 8
-+31 27 8  31 27 8  31 27 8  31 27 8  31 27 8  24 21 6
-+24 21 6  24 21 6  24 21 6  24 21 6  16 14 4  20 17 5
-+16 14 4  16 14 4  16 14 4  16 14 4  16 14 4  15 13 4
-+10 9 3  10 9 3  10 9 3  6 5 1  6 5 1  3 3 1
-+3 3 1  3 3 1  1 1 1  1 1 1  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  1 1 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 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 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  1 1 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 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 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 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 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 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 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 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 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 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 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 1 1  1 1 1
-+1 1 1  1 1 1  2 2 2  2 2 2  2 2 2  2 2 2
-+1 1 1  1 1 1  1 1 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 0 0  0 0 0  0 0 0  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 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 0 0  0 0 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 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 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 0 0  0 0 0  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+3 3 1  3 3 1  3 3 3  6 5 1  4 4 4  8 7 4
-+8 7 4  10 9 3  10 9 3  13 11 4  15 13 4  16 14 4
-+16 14 4  16 14 4  20 17 5  20 17 5  20 17 5  20 17 5
-+24 21 6  24 21 6  24 21 6  24 21 6  24 21 6  27 23 7
-+24 21 6  31 27 8  27 23 7  27 23 7  27 23 7  31 27 8
-+27 23 7  31 27 8  27 23 7  27 23 7  27 23 7  27 23 7
-+31 27 8  24 21 6  24 21 6  24 21 6  24 21 6  24 21 6
-+20 17 5  24 21 6  16 14 4  16 14 4  16 14 4  16 14 4
-+16 14 4  16 14 4  10 9 3  10 9 3  10 9 3  10 9 3
-+6 5 1  6 5 1  3 3 1  3 3 1  3 3 1  2 2 2
-+1 1 1  1 1 1  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  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  2 2 2
-+2 2 2  2 2 2  2 2 2  1 1 1  1 1 1  1 1 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  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 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 0 0  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  2 2 2
-+2 2 2  2 2 2  2 2 2  1 1 1  1 1 1  1 1 1
-+1 1 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 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 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 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 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 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 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 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 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 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  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+2 2 2  2 2 2  2 2 2  2 2 2  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  2 2 2  2 2 2
-+2 2 2  2 2 2  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  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  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  2 2 2  2 2 2
-+2 2 2  2 2 2  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  3 3 3
-+3 3 3  3 3 3  3 3 3  4 4 4  4 4 4  5 5 5
-+5 5 5  8 7 4  7 7 7  9 8 6  9 8 6  10 9 3
-+10 10 10  15 13 4  11 11 11  16 14 4  16 14 4  16 14 4
-+16 14 4  16 14 4  20 17 5  14 14 14  20 17 5  20 17 5
-+20 17 5  20 17 5  24 21 6  24 21 6  20 17 5  24 21 6
-+24 21 6  24 21 6  16 16 16  24 21 6  24 21 6  16 16 16
-+24 21 6  16 16 16  20 17 5  14 14 14  16 14 4  13 13 13
-+16 14 4  12 12 12  11 11 11  16 14 4  11 11 11  10 9 3
-+10 10 10  10 9 3  10 9 3  8 8 8  8 7 4  5 5 5
-+5 5 5  4 4 4  3 3 1  3 3 3  2 2 2  2 2 2
-+2 2 2  2 2 2  1 1 1  1 1 1  1 1 1  1 1 1
-+0 0 0  0 0 0  0 0 0  0 0 0  1 1 1  1 1 1
-+1 1 1  1 1 1  2 2 2  2 2 2  2 2 2  2 2 2
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  3 3 3
-+3 3 3  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  2 2 2  2 2 2  2 2 2  2 2 2  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 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 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 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 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 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 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 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 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 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  1 1 1
-+1 1 1  1 1 1  2 2 2  2 2 2  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  2 2 2  2 2 2
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+2 2 2  2 2 2  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  6 6 6  6 6 6  8 7 4  7 7 7  9 8 6
-+8 7 4  8 7 4  8 8 8  10 9 3  9 9 9  10 10 10
-+15 13 4  11 11 11  15 13 4  16 14 4  16 14 4  14 14 14
-+16 14 4  14 14 14  16 14 4  14 14 14  16 14 4  16 16 16
-+16 14 4  14 14 14  20 17 5  16 14 4  14 14 14  16 14 4
-+13 13 13  15 13 4  16 14 4  16 14 4  11 11 11  15 13 4
-+11 11 11  10 9 3  10 9 3  9 9 9  10 9 3  10 9 3
-+10 9 3  7 7 7  6 6 6  5 5 5  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  2 2 2  2 2 2  2 2 2
-+2 2 2  1 1 1  1 1 1  1 1 1  2 2 2  2 2 2
-+2 2 2  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  2 2 2  2 2 2  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 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 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 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 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 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 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 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 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 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  0 0 0  0 0 0  1 1 1  1 1 1  2 2 2
-+2 2 2  3 3 3  3 3 3  3 3 3  4 4 4  4 4 4
-+4 4 4  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  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  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  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  4 4 4  4 4 4  4 4 4  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  4 4 4  4 4 4  4 4 4  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+6 6 6  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 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  7 7 7  6 6 6
-+6 6 6  6 6 6  6 6 6  6 6 6  5 5 5  6 6 6
-+6 6 6  7 7 7  9 8 6  7 7 7  10 9 3  8 8 8
-+10 9 3  8 8 8  9 9 9  9 9 9  10 10 10  15 13 4
-+9 9 9  15 13 4  12 12 12  15 13 4  12 12 12  15 13 4
-+12 12 12  15 13 4  12 12 12  12 12 12  16 14 4  12 12 12
-+15 13 4  11 11 11  10 10 10  10 10 10  10 9 3  10 10 10
-+9 9 9  9 9 9  9 9 9  10 9 3  8 8 8  8 8 8
-+7 7 7  6 6 6  6 6 6  6 6 6  6 6 6  7 7 7
-+6 6 6  6 6 6  5 5 5  5 5 5  5 5 5  5 5 5
-+4 4 4  4 4 4  4 4 4  4 4 4  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+4 4 4  4 4 4  4 4 4  4 4 4  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
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 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 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
-+5 5 5  5 5 5  5 5 5  5 5 5  4 4 4  4 4 4
-+4 4 4  3 3 3  3 3 3  3 3 3  2 2 2  2 2 2
-+1 1 1  1 1 1  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  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  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  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
-+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  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  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  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  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  1 1 1  1 1 1  2 2 2  2 2 2  3 3 3
-+3 3 3  4 4 4  4 4 4  5 5 5  5 5 5  6 6 6
-+6 6 6  6 6 6  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  7 7 7  7 7 7  7 7 7
-+7 7 7  7 7 7  7 7 7  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 6  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  7 7 7  7 7 7  7 7 7  6 6 6
-+6 6 6  6 6 6  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 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
-+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  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  7 7 7  7 7 7
-+7 7 7  7 7 7  7 7 7  7 7 7  6 6 6  7 7 7
-+8 8 8  7 7 7  9 9 9  10 9 3  8 8 8  9 9 9
-+10 9 3  8 8 8  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  11 11 11  15 13 4  11 11 11  11 11 11  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  9 9 9
-+8 8 8  9 9 9  8 8 8  9 9 9  8 8 8  8 8 8
-+8 8 8  8 8 8  8 8 8  8 8 8  8 8 8  9 9 9
-+8 8 8  7 7 7  7 7 7  7 7 7  7 7 7  6 6 6
-+6 6 6  6 6 6  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 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  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  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  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  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
-+7 7 7  7 7 7  7 7 7  6 6 6  6 6 6  6 6 6
-+5 5 5  5 5 5  4 4 4  4 4 4  3 3 3  3 3 3
-+2 2 2  2 2 2  1 1 1  1 1 1  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  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  1 1 1
-+1 1 1  2 2 2  2 2 2  3 3 3  3 3 3  4 4 4
-+5 5 5  5 5 5  6 6 6  6 6 6  7 7 7  7 7 7
-+8 8 8  8 8 8  9 9 9  9 9 9  9 9 9  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  9 9 9  9 9 9  9 9 9  8 8 8
-+8 8 8  8 8 8  8 8 8  8 8 8  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
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  10 10 10
-+10 10 10  10 10 10  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  9 9 9  9 9 9
-+9 9 9  10 10 10  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  10 10 10  9 9 9  9 9 9
-+10 10 10  9 9 9  9 9 9  10 10 10  10 9 3  11 11 11
-+9 9 9  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  9 9 9  9 9 9  9 9 9  9 9 9  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  9 9 9
-+9 9 9  9 9 9  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  8 8 8  8 8 8
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+9 9 9  9 9 9  9 9 9  8 8 8  8 8 8  7 7 7
-+7 7 7  6 6 6  6 6 6  5 5 5  5 5 5  4 4 4
-+3 3 3  3 3 3  2 2 2  2 2 2  1 1 1  1 1 1
-+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  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  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  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  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  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
-+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  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  0 0 0  0 0 0  1 1 1  1 1 1
-+2 2 2  3 3 3  3 3 3  4 4 4  5 5 5  5 5 5
-+6 6 6  7 7 7  7 7 7  8 8 8  9 9 9  9 9 9
-+10 10 10  10 10 10  11 11 11  11 11 11  11 11 11  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  11 11 11  11 11 11  11 11 11  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  11 11 11  11 11 11  11 11 11  11 11 11  12 12 12
-+12 12 12  12 12 12  12 12 12  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  13 13 13
-+13 13 13  14 14 14  13 13 13  13 13 13  13 13 13  13 13 13
-+14 14 14  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  12 12 12
-+12 12 12  12 12 12  11 11 11  11 11 11  11 11 11  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  11 11 11  11 11 11
-+11 11 11  11 11 11  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  12 12 12  12 12 12  12 12 12  12 12 12
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+11 11 11  11 11 11  11 11 11  10 10 10  10 10 10  9 9 9
-+9 9 9  8 8 8  7 7 7  7 7 7  6 6 6  5 5 5
-+5 5 5  4 4 4  3 3 3  3 3 3  2 2 2  1 1 1
-+1 1 1  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  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  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  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  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
-+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  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  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  1 1 1  1 1 1  2 2 2  3 3 3
-+3 3 3  4 4 4  4 4 4  5 5 5  6 6 6  7 7 7
-+8 8 8  9 9 9  9 9 9  10 10 10  11 11 11  11 11 11
-+12 12 12  12 12 12  13 13 13  13 13 13  13 13 13  14 14 14
-+14 14 14  14 14 14  15 14 14  15 14 14  15 14 14  15 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  13 13 13  13 13 13  13 13 13
-+13 13 13  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  15 14 14  15 14 14  15 14 14
-+15 14 14  15 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  16 16 16  14 14 14  16 16 16
-+16 16 16  16 16 16  14 14 14  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+14 14 14  16 16 16  16 16 16  14 14 14  16 16 16  16 16 16
-+14 14 14  14 14 14  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  12 12 12  12 12 12  12 12 12
-+12 12 12  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  14 14 14  14 14 14  14 14 14  14 14 14  15 14 14
-+15 14 14  15 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+15 14 14  15 14 14  15 14 14  15 14 14  15 14 14  15 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  13 13 13  13 13 13  13 13 13  13 13 13
-+14 14 14  14 14 14  14 14 14  14 14 14  15 14 14  15 14 14
-+15 14 14  15 14 14  15 14 14  15 14 14  15 14 14  15 14 14
-+15 14 14  15 14 14  15 14 14  15 14 14  15 14 14  15 14 14
-+15 14 14  15 14 14  15 14 14  14 14 14  14 14 14  14 14 14
-+13 13 13  13 13 13  13 13 13  12 12 12  12 12 12  11 11 11
-+11 11 11  10 10 10  9 9 9  8 8 8  8 8 8  7 7 7
-+6 6 6  5 5 5  4 4 4  4 4 4  3 3 3  3 3 3
-+2 2 2  1 1 1  1 1 1  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  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  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
-+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  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  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  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  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  1 1 1  1 1 1  2 2 2  3 3 3  3 3 3
-+4 4 4  5 5 5  6 6 6  7 7 7  8 8 8  9 9 9
-+9 9 9  10 10 10  11 11 11  12 12 12  13 13 13  13 13 13
-+14 14 14  15 14 14  15 14 14  16 16 16  16 16 16  16 16 16
-+16 16 16  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  16 16 16  16 16 16  16 16 16  16 16 16  15 14 14
-+15 14 14  15 14 14  15 14 14  15 14 14  15 14 14  15 14 14
-+15 14 14  15 14 14  15 14 14  15 14 14  15 14 14  15 14 14
-+15 14 14  15 14 14  15 14 14  15 14 14  15 14 14  15 14 14
-+15 14 14  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+17 17 17  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  17 17 17  16 16 16  16 16 16  17 17 17
-+16 16 16  16 16 16  17 17 17  16 16 16  16 16 16  16 16 16
-+17 17 17  16 16 16  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  18 18 18  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  16 16 16  16 16 16  16 16 16  16 16 16  15 14 14
-+15 14 14  15 14 14  15 14 14  15 14 14  15 14 14  15 14 14
-+15 14 14  15 14 14  15 14 14  15 14 14  15 14 14  15 14 14
-+15 14 14  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  17 17 17  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  17 17 17  17 17 17  17 17 17  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  16 16 16  16 16 16
-+16 16 16  16 16 16  15 14 14  15 14 14  14 14 14  13 13 13
-+13 13 13  12 12 12  11 11 11  10 10 10  9 9 9  9 9 9
-+8 8 8  7 7 7  6 6 6  5 5 5  4 4 4  3 3 3
-+3 3 3  2 2 2  1 1 1  1 1 1  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  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
-+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  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  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  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  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  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
-+1 1 1  1 1 1  2 2 2  3 3 3  4 4 4  4 4 4
-+5 5 5  6 6 6  7 7 7  8 8 8  9 9 9  10 10 10
-+11 11 11  12 12 12  13 13 13  14 14 14  15 14 14  16 16 16
-+16 16 16  17 17 17  17 17 17  18 18 18  18 18 18  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  18 18 18  18 18 18  18 18 18
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  20 20 20  20 20 20  20 20 20
-+20 20 20  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  19 19 19
-+19 19 19  19 19 19  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  19 19 19  19 19 19  19 19 19
-+19 19 19  18 18 18  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  19 19 19  19 19 19  19 19 19  19 19 19
-+18 18 18  18 18 18  17 17 17  17 17 17  16 16 16  16 16 16
-+15 14 14  14 14 14  13 13 13  12 12 12  11 11 11  10 10 10
-+9 9 9  8 8 8  7 7 7  6 6 6  5 5 5  4 4 4
-+4 4 4  3 3 3  2 2 2  1 1 1  1 1 1  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
-+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  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  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  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  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  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
-+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  1 1 1
-+1 1 1  2 2 2  3 3 3  4 4 4  5 5 5  6 6 6
-+7 7 7  8 8 8  9 9 9  10 10 10  11 11 11  12 12 12
-+13 13 13  14 14 14  15 14 14  16 16 16  17 17 17  18 18 18
-+18 18 18  19 19 19  20 20 20  20 20 20  21 21 21  21 21 21
-+21 21 21  21 21 21  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  22 22 22  22 22 22  22 22 22  22 22 22
-+21 21 21  21 21 21  21 21 21  21 21 21  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+22 22 22  22 22 22  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  22 22 22  22 22 22  22 22 22  22 22 22  24 24 24
-+24 24 24  24 24 24  22 22 22  24 24 24  24 24 24  24 24 24
-+22 22 22  24 24 24  22 22 22  24 24 24  24 24 24  24 24 24
-+22 22 22  24 24 24  24 24 24  22 22 22  22 22 22  22 22 22
-+21 21 21  21 21 21  21 21 21  21 21 21  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  22 22 22
-+22 22 22  22 22 22  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  22 22 22  22 22 22  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+22 22 22  22 22 22  22 22 22  22 22 22  22 22 22  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  22 22 22  22 22 22  22 22 22  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+22 22 22  22 22 22  22 22 22  21 21 21  21 21 21  21 21 21
-+21 21 21  20 20 20  20 20 20  19 19 19  18 18 18  18 18 18
-+17 17 17  16 16 16  15 14 14  14 14 14  13 13 13  12 12 12
-+11 11 11  10 10 10  9 9 9  8 8 8  7 7 7  6 6 6
-+5 5 5  4 4 4  3 3 3  2 2 2  1 1 1  1 1 1
-+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  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  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  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  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  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
-+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  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  1 1 1  1 1 1
-+2 2 2  3 3 3  4 4 4  5 5 5  6 6 6  7 7 7
-+8 8 8  9 9 9  10 10 10  12 12 12  13 13 13  14 14 14
-+15 14 14  16 16 16  17 17 17  18 18 18  19 19 19  20 20 20
-+21 21 21  21 21 21  22 22 22  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  25 25 25  25 25 25  25 25 25  25 25 25
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+24 24 24  25 25 25  26 26 26  26 26 26  25 25 25  26 26 26
-+26 26 26  26 26 26  26 26 26  26 26 26  25 25 25  26 26 26
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  22 22 22  21 21 21  21 21 21  20 20 20
-+19 19 19  18 18 18  17 17 17  16 16 16  15 14 14  14 14 14
-+13 13 13  12 12 12  10 10 10  9 9 9  8 8 8  7 7 7
-+6 6 6  5 5 5  4 4 4  3 3 3  2 2 2  1 1 1
-+1 1 1  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  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  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  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  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
-+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  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  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  1 1 1  2 2 2
-+3 3 3  4 4 4  5 5 5  6 6 6  7 7 7  8 8 8
-+10 10 10  11 11 11  12 12 12  13 13 13  15 14 14  16 16 16
-+17 17 17  18 18 18  19 19 19  20 20 20  21 21 21  22 22 22
-+24 24 24  24 24 24  25 25 25  25 25 25  26 26 26  26 26 26
-+26 26 26  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  26 26 26  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  27 27 27  27 27 27
-+27 27 27  26 26 26  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  26 26 26  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  27 27 27  27 27 27  27 27 27  26 26 26  26 26 26
-+26 26 26  25 25 25  25 25 25  24 24 24  24 24 24  22 22 22
-+21 21 21  20 20 20  19 19 19  18 18 18  17 17 17  16 16 16
-+15 14 14  13 13 13  12 12 12  11 11 11  10 10 10  8 8 8
-+7 7 7  6 6 6  5 5 5  4 4 4  3 3 3  2 2 2
-+1 1 1  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  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  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  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  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
-+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  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  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  1 1 1  2 2 2  3 3 3
-+4 4 4  5 5 5  6 6 6  7 7 7  9 9 9  10 10 10
-+11 11 11  13 13 13  14 14 14  15 14 14  16 16 16  18 18 18
-+19 19 19  20 20 20  21 21 21  22 22 22  24 24 24  25 25 25
-+25 25 25  26 26 26  27 27 27  28 28 28  28 28 28  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  32 32 32
-+30 30 30  32 32 32  30 30 30  32 32 32  30 30 30  32 32 32
-+30 30 30  30 30 30  30 30 30  32 32 32  30 30 30  32 32 32
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+28 28 28  28 28 28  27 27 27  26 26 26  25 25 25  25 25 25
-+24 24 24  22 22 22  21 21 21  20 20 20  19 19 19  18 18 18
-+16 16 16  15 14 14  14 14 14  13 13 13  11 11 11  10 10 10
-+9 9 9  7 7 7  6 6 6  5 5 5  4 4 4  3 3 3
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  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  1 1 1  1 1 1  3 3 3  3 3 3
-+4 4 4  6 6 6  7 7 7  8 8 8  10 10 10  11 11 11
-+13 13 13  14 14 14  16 16 16  17 17 17  18 18 18  20 20 20
-+21 21 21  22 22 22  24 24 24  25 25 25  26 26 26  27 27 27
-+28 28 28  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  32 32 32  32 32 32  32 32 32  32 32 32
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  32 32 32
-+32 32 32  32 32 32  32 32 32  33 33 33  33 33 33  32 32 32
-+32 32 32  32 32 32  32 32 32  32 32 32  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  32 32 32
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  35 35 35  35 35 35  35 35 35  35 35 35  33 33 33
-+35 35 35  35 35 35  35 35 35  33 33 33  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  33 33 33  33 33 33  33 33 33
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  32 32 32
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  32 32 32
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  32 32 32
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  32 32 32
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  32 32 32
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  32 32 32  32 32 32  32 32 32  32 32 32  32 32 32
-+32 32 32  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  33 33 33
-+33 33 33  33 33 33  33 33 33  32 32 32  32 32 32  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  28 28 28  27 27 27
-+26 26 26  25 25 25  24 24 24  22 22 22  21 21 21  20 20 20
-+18 18 18  17 17 17  16 16 16  14 14 14  13 13 13  11 11 11
-+10 10 10  8 8 8  7 7 7  6 6 6  4 4 4  3 3 3
-+3 3 3  1 1 1  1 1 1  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  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  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
-+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  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  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  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  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  1 1 1  2 2 2  3 3 3  4 4 4
-+5 5 5  7 7 7  8 8 8  10 10 10  11 11 11  13 13 13
-+14 14 14  16 16 16  17 17 17  19 19 19  20 20 20  21 21 21
-+24 24 24  25 25 25  26 26 26  27 27 27  28 28 28  30 30 30
-+30 30 30  30 30 30  32 32 32  33 33 33  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  37 37 37  35 35 35
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  33 33 33  32 32 32  30 30 30  30 30 30  30 30 30
-+28 28 28  27 27 27  26 26 26  25 25 25  24 24 24  21 21 21
-+20 20 20  19 19 19  17 17 17  16 16 16  14 14 14  13 13 13
-+11 11 11  10 10 10  8 8 8  7 7 7  5 5 5  4 4 4
-+3 3 3  2 2 2  1 1 1  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  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  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
-+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  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  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  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  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  1 1 1  2 2 2  3 3 3  4 4 4  5 5 5
-+6 6 6  8 8 8  9 9 9  11 11 11  13 13 13  14 14 14
-+16 16 16  17 17 17  19 19 19  20 20 20  22 22 22  24 24 24
-+25 25 25  26 26 26  28 28 28  30 30 30  30 30 30  32 32 32
-+33 33 33  35 35 35  35 35 35  35 35 35  35 35 35  37 37 37
-+37 37 37  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  39 39 39  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  39 39 39  41 41 41  39 39 39
-+41 41 41  39 39 39  41 41 41  41 41 41  41 41 41  41 41 41
-+39 39 39  39 39 39  39 39 39  39 39 39  39 39 39  38 38 38
-+38 38 38  38 38 38  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  39 39 39  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  39 39 39  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  39 39 39  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  37 37 37  37 37 37  37 37 37
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  41 41 41  41 41 41  41 41 41
-+39 39 39  39 39 39  39 39 39  39 39 39  39 39 39  39 39 39
-+39 39 39  39 39 39  38 38 38  38 38 38  37 37 37  37 37 37
-+35 35 35  35 35 35  35 35 35  35 35 35  33 33 33  32 32 32
-+30 30 30  30 30 30  28 28 28  26 26 26  25 25 25  24 24 24
-+22 22 22  20 20 20  19 19 19  17 17 17  16 16 16  14 14 14
-+13 13 13  11 11 11  9 9 9  8 8 8  6 6 6  5 5 5
-+4 4 4  3 3 3  2 2 2  1 1 1  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  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
-+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  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  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  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  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  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+1 1 1  1 1 1  3 3 3  3 3 3  5 5 5  6 6 6
-+7 7 7  9 9 9  11 11 11  12 12 12  14 14 14  16 16 16
-+17 17 17  19 19 19  21 21 21  22 22 22  24 24 24  26 26 26
-+27 27 27  30 30 30  30 30 30  32 32 32  33 33 33  35 35 35
-+35 35 35  37 37 37  37 37 37  38 38 38  39 39 39  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  39 39 39  39 39 39  39 39 39  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  39 39 39  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  39 39 39  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  42 42 42  42 42 42
-+42 42 42  42 42 42  42 42 42  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  42 42 42
-+42 42 42  42 42 42  42 42 42  42 42 42  42 42 42  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  42 42 42  42 42 42  42 42 42
-+42 42 42  42 42 42  42 42 42  42 42 42  42 42 42  42 42 42
-+42 42 42  42 42 42  42 42 42  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  42 42 42  42 42 42
-+42 42 42  42 42 42  42 42 42  42 42 42  42 42 42  42 42 42
-+42 42 42  42 42 42  42 42 42  42 42 42  42 42 42  42 42 42
-+42 42 42  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+39 39 39  38 38 38  37 37 37  37 37 37  35 35 35  35 35 35
-+33 33 33  32 32 32  30 30 30  30 30 30  27 27 27  26 26 26
-+24 24 24  22 22 22  21 21 21  19 19 19  17 17 17  16 16 16
-+14 14 14  12 12 12  11 11 11  9 9 9  7 7 7  6 6 6
-+5 5 5  3 3 3  2 2 2  1 1 1  1 1 1  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+1 1 1  2 2 2  3 3 3  4 4 4  5 5 5  7 7 7
-+8 8 8  10 10 10  12 12 12  13 13 13  16 16 16  17 17 17
-+19 19 19  20 20 20  22 22 22  24 24 24  26 26 26  27 27 27
-+30 30 30  30 30 30  32 32 32  35 35 35  35 35 35  37 37 37
-+38 38 38  39 39 39  41 41 41  41 41 41  42 42 42  42 42 42
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+42 42 42  42 42 42  42 42 42  42 42 42  42 42 42  42 42 42
-+42 42 42  42 42 42  42 42 42  42 42 42  42 42 42  42 42 42
-+42 42 42  42 42 42  42 42 42  42 42 42  42 42 42  42 42 42
-+42 42 42  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  42 42 42  42 42 42  42 42 42  42 42 42
-+42 42 42  42 42 42  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  45 45 45  45 45 45  45 45 45  45 45 45  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  42 42 42
-+42 42 42  41 41 41  41 41 41  39 39 39  38 38 38  37 37 37
-+35 35 35  35 35 35  32 32 32  30 30 30  30 30 30  27 27 27
-+26 26 26  24 24 24  22 22 22  20 20 20  19 19 19  17 17 17
-+16 16 16  13 13 13  12 12 12  10 10 10  8 8 8  7 7 7
-+5 5 5  4 4 4  3 3 3  2 2 2  1 1 1  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+1 1 1  3 3 3  3 3 3  5 5 5  6 6 6  8 8 8
-+9 9 9  11 11 11  13 13 13  15 14 14  17 17 17  18 18 18
-+20 20 20  22 22 22  24 24 24  26 26 26  28 28 28  30 30 30
-+30 30 30  33 33 33  35 35 35  35 35 35  38 38 38  39 39 39
-+41 41 41  42 42 42  43 43 43  43 43 43  43 43 43  45 45 45
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  47 47 47  47 47 47  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  47 47 47  47 47 47  47 47 47  47 47 47
-+47 47 47  48 48 47  48 48 47  48 48 47  48 48 47  48 48 47
-+48 48 47  48 48 47  48 48 47  48 48 47  48 48 47  48 48 47
-+48 48 47  47 47 47  47 47 47  47 47 47  47 47 47  46 46 46
-+46 46 46  46 46 46  46 46 46  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  47 47 47  47 47 47  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  47 47 47  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  47 47 47  47 47 47  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  47 47 47  47 47 47  47 47 47  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  48 48 47  48 48 47  48 48 47  48 48 47
-+48 48 47  48 48 47  48 48 47  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  46 46 46  46 46 46  46 46 46  45 45 45
-+43 43 43  43 43 43  43 43 43  42 42 42  41 41 41  39 39 39
-+38 38 38  35 35 35  35 35 35  33 33 33  30 30 30  30 30 30
-+28 28 28  26 26 26  24 24 24  22 22 22  20 20 20  18 18 18
-+17 17 17  15 14 14  13 13 13  11 11 11  9 9 9  8 8 8
-+6 6 6  5 5 5  3 3 3  3 3 3  1 1 1  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  1 1 1
-+2 2 2  3 3 3  4 4 4  5 5 5  7 7 7  9 9 9
-+10 10 10  12 12 12  14 14 14  16 16 16  18 18 18  20 20 20
-+22 22 22  24 24 24  26 26 26  27 27 27  30 30 30  30 30 30
-+33 33 33  35 35 35  37 37 37  38 38 38  41 41 41  42 42 42
-+43 43 43  43 43 43  45 45 45  46 46 46  47 47 47  48 48 47
-+48 48 47  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  48 48 47  48 48 47  48 48 47  48 48 47  48 48 47
-+48 48 47  47 47 47  47 47 47  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  47 47 47  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  47 47 47  47 47 47  47 47 47  48 48 47
-+48 48 47  48 48 47  48 48 47  48 48 47  48 48 47  48 48 47
-+48 48 47  48 48 47  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  50 50 50
-+50 50 50  50 50 50  50 50 50  50 50 50  50 50 50  50 50 50
-+50 50 50  50 50 50  50 50 50  50 50 50  50 50 50  50 50 50
-+50 50 50  50 50 50  50 50 50  50 50 50  49 49 49  49 49 49
-+49 49 49  48 48 47  48 48 47  48 48 47  48 48 47  48 48 47
-+48 48 47  48 48 47  48 48 47  47 47 47  47 47 47  47 47 47
-+47 47 47  48 48 47  48 48 47  48 48 47  48 48 47  48 48 47
-+48 48 47  48 48 47  48 48 47  48 48 47  48 48 47  48 48 47
-+48 48 47  48 48 47  48 48 47  48 48 47  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  50 50 50  50 50 50  50 50 50  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+48 48 47  48 48 47  48 48 47  48 48 47  48 48 47  48 48 47
-+48 48 47  48 48 47  48 48 47  48 48 47  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  50 50 50
-+50 50 50  50 50 50  50 50 50  50 50 50  50 50 50  50 50 50
-+50 50 50  50 50 50  50 50 50  50 50 50  50 50 50  50 50 50
-+49 49 49  49 49 49  49 49 49  49 49 49  48 48 47  48 48 47
-+47 47 47  46 46 46  45 45 45  43 43 43  43 43 43  42 42 42
-+41 41 41  38 38 38  37 37 37  35 35 35  33 33 33  30 30 30
-+30 30 30  27 27 27  26 26 26  24 24 24  22 22 22  20 20 20
-+18 18 18  16 16 16  14 14 14  12 12 12  10 10 10  9 9 9
-+7 7 7  5 5 5  4 4 4  3 3 3  2 2 2  1 1 1
-+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  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  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  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  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  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
-+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  0 0 0  0 0 0  0 0 0  0 0 0  1 1 1
-+2 2 2  3 3 3  5 5 5  6 6 6  8 8 8  10 10 10
-+11 11 11  13 13 13  15 14 14  17 17 17  19 19 19  21 21 21
-+24 24 24  25 25 25  27 27 27  30 30 30  30 30 30  33 33 33
-+35 35 35  37 37 37  39 39 39  41 41 41  42 42 42  43 43 43
-+45 45 45  47 47 47  48 48 47  66 66 66  140 134 120  140 134 120
-+192 187 164  200 196 176  231 230 220  230 228 210  230 228 210  230 228 210
-+230 228 210  192 187 164  192 187 164  140 134 120  138 129 110  65 65 65
-+50 50 50  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  135 101 60  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  66 66 66
-+52 52 52  52 52 52  50 50 50  50 50 50  50 50 50  50 50 50
-+50 50 50  50 50 50  50 50 50  50 50 50  50 50 50  50 50 50
-+50 50 50  50 50 50  50 50 50  50 50 50  50 50 50  50 50 50
-+50 50 50  66 66 66  138 129 110  140 134 120  140 134 120  192 187 164
-+192 187 164  192 187 164  192 187 164  176 168 138  140 134 120  140 134 120
-+66 66 66  65 65 65  50 50 50  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  63 58 50  138 129 110  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+138 129 110  66 66 66  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  138 129 110  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  138 129 110  52 52 52
-+52 52 52  50 50 50  50 50 50  50 50 50  50 50 50  50 50 50
-+50 50 50  50 50 50  50 50 50  50 50 50  50 50 50  50 50 50
-+50 50 50  50 50 50  50 50 50  50 50 50  50 50 50  50 50 50
-+66 66 66  140 134 120  176 168 138  192 187 164  200 196 176  231 230 220
-+230 228 210  230 228 210  230 228 210  230 228 210  185 178 149  176 168 138
-+140 134 120  138 129 110  45 45 45  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  66 66 66  65 65 65  50 50 50  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  66 66 66  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  66 66 66  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+65 65 65  138 129 110  140 134 120  192 187 164  192 187 164  231 229 217
-+230 228 210  230 228 210  230 228 210  230 228 210  200 196 176  192 187 164
-+140 134 120  140 134 120  66 66 66  50 50 50  45 45 45  43 43 43
-+42 42 42  41 41 41  39 39 39  37 37 37  35 35 35  33 33 33
-+30 30 30  30 30 30  27 27 27  25 25 25  24 24 24  21 21 21
-+19 19 19  17 17 17  15 14 14  13 13 13  11 11 11  10 10 10
-+8 8 8  6 6 6  5 5 5  3 3 3  2 2 2  1 1 1
-+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  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  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  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  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  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
-+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  0 0 0  0 0 0  0 0 0  1 1 1  1 1 1
-+3 3 3  4 4 4  5 5 5  7 7 7  9 9 9  10 10 10
-+12 12 12  14 14 14  16 16 16  18 18 18  20 20 20  24 24 24
-+25 25 25  27 27 27  30 30 30  30 30 30  33 33 33  35 35 35
-+37 37 37  39 39 39  41 41 41  43 43 43  45 45 45  46 46 46
-+66 66 66  140 134 120  231 230 220  255 255 255  255 255 255  255 255 255
-+249 249 249  249 249 249  249 249 249  249 249 249  249 249 249  238 238 238
-+249 249 249  249 249 249  249 249 249  249 249 249  249 249 249  249 249 249
-+200 196 176  140 134 120  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  65 65 65
-+66 66 66  231 230 220  249 249 249  249 249 249  249 249 249  249 249 249
-+255 255 255  249 249 249  255 255 255  249 249 249  255 255 255  249 249 249
-+255 255 255  249 249 249  255 255 255  249 249 249  255 255 255  255 255 255
-+238 238 238  192 187 164  66 66 66  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  65 65 65  66 66 66  185 178 149
-+238 238 238  255 255 255  249 249 249  249 249 249  255 255 255  249 249 249
-+249 249 249  238 238 238  249 249 249  249 249 249  249 249 249  255 255 255
-+255 255 255  238 238 238  200 196 176  138 129 110  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  140 134 120  249 249 249  249 249 249  249 249 249  249 249 249
-+255 255 255  249 249 249  255 255 255  249 249 249  255 255 255  249 249 249
-+255 255 255  249 249 249  255 255 255  249 249 249  255 255 255  249 249 249
-+249 249 249  255 255 255  238 238 238  192 187 164  66 66 66  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  138 129 110  238 238 238  249 249 249  249 249 249
-+249 249 249  249 249 249  255 255 255  249 249 249  255 255 255  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+255 255 255  255 255 255  249 249 249  249 249 249  249 249 249  249 249 249
-+231 230 220  140 134 120  65 65 65  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  65 65 65  66 66 66  185 178 149  238 238 238
-+255 255 255  255 255 255  249 249 249  249 249 249  249 249 249  249 249 249
-+249 249 249  249 249 249  238 238 238  249 249 249  249 249 249  249 249 249
-+249 249 249  249 249 249  238 238 238  192 187 164  138 129 110  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  238 238 238  255 255 255  249 249 249  255 255 255
-+255 255 255  255 255 255  140 134 120  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  230 228 210  255 255 255  255 255 255  255 255 255
-+249 249 249  255 255 255  249 249 249  176 168 138  52 52 52  65 65 65
-+52 52 52  52 52 52  52 52 52  52 52 52  140 134 120  200 196 176
-+249 249 249  249 249 249  249 249 249  249 249 249  249 249 249  249 249 249
-+249 249 249  238 238 238  249 249 249  249 249 249  249 249 249  249 249 249
-+255 255 255  249 249 249  255 255 255  238 238 238  140 134 120  63 58 50
-+45 45 45  43 43 43  41 41 41  39 39 39  37 37 37  35 35 35
-+33 33 33  30 30 30  30 30 30  27 27 27  25 25 25  24 24 24
-+20 20 20  18 18 18  16 16 16  14 14 14  12 12 12  10 10 10
-+9 9 9  7 7 7  5 5 5  4 4 4  3 3 3  1 1 1
-+1 1 1  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  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  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  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  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
-+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  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  0 0 0  0 0 0  1 1 1  2 2 2
-+3 3 3  4 4 4  6 6 6  8 8 8  9 9 9  11 11 11
-+13 13 13  16 16 16  17 17 17  20 20 20  21 21 21  24 24 24
-+26 26 26  28 28 28  30 30 30  32 32 32  35 35 35  37 37 37
-+39 39 39  41 41 41  43 43 43  45 45 45  47 47 47  138 129 110
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  255 255 255  255 255 255
-+249 249 249  255 255 255  255 255 255  249 249 249  255 255 255  255 255 255
-+255 255 255  249 249 249  231 229 217  66 66 66  65 65 65  52 52 52
-+63 58 50  52 52 52  65 65 65  52 52 52  52 52 52  66 66 66
-+249 249 249  255 255 255  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  185 178 149  65 65 65  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  66 66 66  192 187 164  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  230 228 210  66 66 66
-+65 65 65  52 52 52  65 65 65  52 52 52  63 58 50  52 52 52
-+66 66 66  255 255 255  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  249 249 249  140 134 120
-+65 65 65  52 52 52  65 65 65  52 52 52  63 58 50  52 52 52
-+65 65 65  66 66 66  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  255 255 255  238 238 238  66 66 66  66 66 66  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  63 58 50  176 168 138  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  255 255 255  255 255 255  255 255 255  249 249 249  255 255 255
-+249 249 249  255 255 255  249 249 249  249 249 249  249 249 249  200 196 176
-+66 66 66  65 65 65  52 52 52  65 65 65  52 52 52  63 58 50
-+52 52 52  65 65 65  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  65 65 65  52 52 52  65 65 65
-+52 52 52  63 58 50  52 52 52  65 65 65  52 52 52  63 58 50
-+65 65 65  200 196 176  255 255 255  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  192 187 164  52 52 52  65 65 65  52 52 52
-+65 65 65  52 52 52  66 66 66  238 238 238  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  255 255 255
-+249 249 249  255 255 255  255 255 255  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  238 238 238
-+138 129 110  43 43 43  43 43 43  41 41 41  39 39 39  37 37 37
-+35 35 35  32 32 32  30 30 30  28 28 28  26 26 26  24 24 24
-+21 21 21  20 20 20  17 17 17  16 16 16  13 13 13  11 11 11
-+9 9 9  8 8 8  6 6 6  4 4 4  3 3 3  2 2 2
-+1 1 1  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  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  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  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  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
-+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  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  0 0 0  0 0 0  1 1 1  2 2 2
-+3 3 3  5 5 5  6 6 6  8 8 8  10 10 10  12 12 12
-+14 14 14  16 16 16  18 18 18  20 20 20  24 24 24  25 25 25
-+27 27 27  30 30 30  32 32 32  35 35 35  35 35 35  39 39 39
-+41 41 41  43 43 43  46 46 46  43 43 43  176 168 138  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  238 238 238  138 129 110  65 65 65
-+52 52 52  65 65 65  52 52 52  65 65 65  65 65 65  163 154 123
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  249 249 249  249 249 249  230 228 210  66 66 66
-+52 52 52  65 65 65  52 52 52  65 65 65  52 52 52  65 65 65
-+65 65 65  66 66 66  231 230 220  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  255 255 255
-+66 66 66  52 52 52  65 65 65  52 52 52  65 65 65  65 65 65
-+185 178 149  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+163 154 123  52 52 52  65 65 65  52 52 52  65 65 65  52 52 52
-+65 65 65  200 196 176  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  66 66 66  65 65 65
-+52 52 52  65 65 65  63 58 50  65 65 65  52 52 52  65 65 65
-+66 66 66  200 196 176  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  249 249 249
-+231 230 220  66 66 66  52 52 52  65 65 65  52 52 52  65 65 65
-+52 52 52  65 65 65  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  52 52 52  65 65 65  52 52 52
-+65 65 65  52 52 52  65 65 65  52 52 52  65 65 65  52 52 52
-+200 196 176  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  200 196 176  65 65 65  52 52 52  65 65 65  52 52 52
-+49 49 49  138 129 110  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  163 154 123  45 45 45  43 43 43  41 41 41  39 39 39
-+35 35 35  35 35 35  32 32 32  30 30 30  27 27 27  25 25 25
-+24 24 24  20 20 20  18 18 18  16 16 16  14 14 14  12 12 12
-+10 10 10  8 8 8  6 6 6  5 5 5  3 3 3  2 2 2
-+1 1 1  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  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  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  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  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
-+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  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  0 0 0  0 0 0  1 1 1  3 3 3
-+4 4 4  5 5 5  7 7 7  9 9 9  11 11 11  13 13 13
-+15 14 14  17 17 17  19 19 19  21 21 21  24 24 24  26 26 26
-+28 28 28  30 30 30  33 33 33  35 35 35  38 38 38  41 41 41
-+43 43 43  45 45 45  47 47 47  140 134 120  249 249 249  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  238 238 238  66 66 66
-+65 65 65  65 65 65  52 52 52  65 65 65  52 52 52  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+65 65 65  52 52 52  65 65 65  52 52 52  65 65 65  52 52 52
-+65 65 65  231 230 220  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+238 238 238  66 66 66  66 66 66  65 65 65  52 52 52  65 65 65
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  138 129 110  50 50 50  65 65 65  65 65 65  65 65 65
-+52 52 52  231 230 220  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  231 229 217  65 65 65
-+52 52 52  65 65 65  52 52 52  65 65 65  52 52 52  65 65 65
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  230 228 210  65 65 65  65 65 65  65 65 65  52 52 52
-+65 65 65  52 52 52  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  65 65 65  52 52 52
-+65 65 65  65 65 65  52 52 52  65 65 65  65 65 65  192 187 164
-+249 249 249  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+200 196 176  66 66 66  65 65 65  65 65 65  65 65 65  65 65 65
-+66 66 66  238 238 238  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  138 129 110  43 43 43  43 43 43  41 41 41
-+38 38 38  35 35 35  33 33 33  30 30 30  28 28 28  26 26 26
-+24 24 24  21 21 21  19 19 19  17 17 17  15 14 14  13 13 13
-+11 11 11  9 9 9  7 7 7  5 5 5  4 4 4  3 3 3
-+1 1 1  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  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  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  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  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
-+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  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  0 0 0  1 1 1  2 2 2  3 3 3
-+4 4 4  6 6 6  8 8 8  9 9 9  11 11 11  13 13 13
-+16 16 16  18 18 18  20 20 20  22 22 22  25 25 25  27 27 27
-+30 30 30  32 32 32  35 35 35  37 37 37  39 39 39  42 42 42
-+43 43 43  45 45 45  65 65 65  238 238 238  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  238 238 238
-+185 178 149  140 134 120  138 129 110  66 66 66  138 129 110  66 66 66
-+138 129 110  140 134 120  200 196 176  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  200 196 176
-+52 52 52  65 65 65  65 65 65  65 65 65  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+200 196 176  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  192 187 164  231 230 220  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+140 134 120  52 52 52  65 65 65  65 65 65  52 52 52  65 65 65
-+176 168 138  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  249 249 249  200 196 176  176 168 138  140 134 120
-+140 134 120  140 134 120  140 134 120  176 168 138  230 228 210  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  192 187 164  65 65 65  65 65 65  65 65 65  52 52 52
-+200 196 176  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  192 187 164  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  176 168 138  200 196 176  238 238 238
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  200 196 176  65 65 65  65 65 65  52 52 52  65 65 65
-+65 65 65  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  238 238 238  185 178 149  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+230 227 205  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+238 238 238  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  200 196 176  238 238 238  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  249 249 249  138 129 110
-+65 65 65  52 52 52  65 65 65  65 65 65  52 52 52  138 129 110
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  231 230 220  176 168 138  140 134 120  138 129 110
-+66 66 66  138 129 110  66 66 66  138 129 110  176 168 138  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  255 255 255  140 134 120  52 52 52  65 65 65  65 65 65
-+65 65 65  65 65 65  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  65 65 65  66 66 66  140 134 120  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  231 230 220
-+66 66 66  65 65 65  65 65 65  65 65 65  65 65 65  66 66 66
-+200 196 176  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  249 249 249  200 196 176  140 134 120  140 134 120
-+66 66 66  138 129 110  66 66 66  138 129 110  140 134 120  185 178 149
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  238 238 238  65 65 65  43 43 43  42 42 42
-+39 39 39  37 37 37  35 35 35  32 32 32  30 30 30  27 27 27
-+25 25 25  22 22 22  20 20 20  18 18 18  16 16 16  13 13 13
-+11 11 11  9 9 9  8 8 8  6 6 6  4 4 4  3 3 3
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  1 1 1  2 2 2  3 3 3
-+5 5 5  6 6 6  8 8 8  10 10 10  12 12 12  14 14 14
-+16 16 16  18 18 18  21 21 21  24 24 24  26 26 26  28 28 28
-+30 30 30  33 33 33  35 35 35  38 38 38  41 41 41  43 43 43
-+45 45 45  48 48 47  176 168 138  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  163 154 123  66 66 66
-+65 65 65  65 65 65  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  65 65 65  66 66 66  230 228 210  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+138 129 110  52 52 52  65 65 65  65 65 65  65 65 65  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  65 65 65  140 134 120  238 238 238
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+238 238 238  65 65 65  65 65 65  65 65 65  65 65 65  66 66 66
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  200 196 176  66 66 66  66 66 66  65 65 65  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  65 65 65  66 66 66
-+231 230 220  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  238 238 238  66 66 66  65 65 65  65 65 65  65 65 65
-+200 196 176  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  65 65 65  66 66 66
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  66 66 66  66 66 66  66 66 66  65 65 65
-+65 65 65  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  176 168 138  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+192 187 164  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+231 230 220  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  230 228 210  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  192 187 164
-+65 65 65  65 65 65  65 65 65  52 52 52  65 65 65  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+238 238 238  138 129 110  65 65 65  52 52 52  65 65 65  65 65 65
-+66 66 66  66 66 66  66 66 66  66 66 66  65 65 65  66 66 66
-+138 129 110  231 230 220  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  238 238 238  66 66 66  66 66 66  65 65 65
-+65 65 65  65 65 65  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  65 65 65  65 65 65
-+52 52 52  65 65 65  65 65 65  140 134 120  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  231 230 220  66 66 66
-+66 66 66  65 65 65  65 65 65  65 65 65  65 65 65  138 129 110
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  200 196 176  66 66 66  66 66 66  66 66 66  65 65 65
-+66 66 66  66 66 66  66 66 66  65 65 65  65 65 65  65 65 65
-+66 66 66  176 168 138  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  163 154 123  47 47 47  43 43 43
-+41 41 41  38 38 38  35 35 35  33 33 33  30 30 30  28 28 28
-+26 26 26  24 24 24  21 21 21  18 18 18  16 16 16  14 14 14
-+12 12 12  10 10 10  8 8 8  6 6 6  5 5 5  3 3 3
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  1 1 1  2 2 2  3 3 3
-+5 5 5  7 7 7  9 9 9  10 10 10  13 13 13  15 14 14
-+17 17 17  19 19 19  21 21 21  24 24 24  26 26 26  30 30 30
-+32 32 32  35 35 35  37 37 37  39 39 39  42 42 42  43 43 43
-+47 47 47  47 47 47  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  249 249 249  140 134 120  66 66 66  66 66 66
-+65 65 65  65 65 65  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  65 65 65  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  249 249 249
-+192 187 164  65 65 65  65 65 65  65 65 65  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  65 65 65  65 65 65  66 66 66  66 66 66
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+249 249 249  138 129 110  52 52 52  65 65 65  65 65 65  140 134 120
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  231 230 220  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  140 134 120  65 65 65  65 65 65  52 52 52
-+200 196 176  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+231 229 217  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+65 65 65  200 196 176  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  176 168 138  66 66 66  65 65 65  65 65 65
-+65 65 65  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  176 168 138  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  238 238 238
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  238 238 238
-+52 52 52  65 65 65  66 66 66  66 66 66  66 66 66  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  65 65 65  65 65 65  65 65 65  65 65 65  65 65 65
-+66 66 66  66 66 66  66 66 66  65 65 65  65 65 65  65 65 65
-+65 65 65  66 66 66  231 230 220  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  140 134 120  65 65 65  65 65 65
-+65 65 65  65 65 65  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  65 65 65  65 65 65
-+65 65 65  65 65 65  140 134 120  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  238 238 238  66 66 66  66 66 66
-+65 65 65  65 65 65  65 65 65  65 65 65  52 52 52  192 187 164
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  65 65 65  65 65 65  65 65 65  65 65 65
-+65 65 65  66 66 66  140 134 120  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  249 249 249  238 238 238  50 50 50  43 43 43
-+42 42 42  39 39 39  37 37 37  35 35 35  32 32 32  30 30 30
-+26 26 26  24 24 24  21 21 21  19 19 19  17 17 17  15 14 14
-+13 13 13  10 10 10  9 9 9  7 7 7  5 5 5  3 3 3
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  1 1 1  2 2 2  4 4 4
-+5 5 5  7 7 7  9 9 9  11 11 11  13 13 13  16 16 16
-+17 17 17  20 20 20  22 22 22  25 25 25  27 27 27  30 30 30
-+32 32 32  35 35 35  38 38 38  41 41 41  43 43 43  45 45 45
-+49 49 49  138 129 110  238 238 238  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+238 238 238  65 65 65  65 65 65  65 65 65  65 65 65  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+140 134 120  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  185 178 149  65 65 65  65 65 65  65 65 65  192 187 164
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  140 134 120  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  176 168 138  65 65 65  65 65 65  66 66 66
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+65 65 65  138 129 110  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  192 187 164  65 65 65  65 65 65  65 65 65
-+65 65 65  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  176 168 138  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+231 230 220  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  185 178 149
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  66 66 66  65 65 65  66 66 66  185 178 149  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  163 154 123
-+66 66 66  66 66 66  66 66 66  66 66 66  65 65 65  65 65 65
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+65 65 65  66 66 66  138 129 110  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  200 196 176  65 65 65  65 65 65
-+66 66 66  66 66 66  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  66 66 66  66 66 66
-+65 65 65  138 129 110  238 238 238  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  238 238 238  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  65 65 65  65 65 65  65 65 65  238 238 238
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  238 238 238
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  66 66 66  200 196 176  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  66 66 66  52 52 52
-+45 45 45  41 41 41  38 38 38  35 35 35  32 32 32  30 30 30
-+27 27 27  25 25 25  22 22 22  20 20 20  17 17 17  15 14 14
-+13 13 13  11 11 11  9 9 9  7 7 7  5 5 5  4 4 4
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  1 1 1  3 3 3  4 4 4
-+5 5 5  7 7 7  9 9 9  11 11 11  13 13 13  16 16 16
-+18 18 18  20 20 20  24 24 24  25 25 25  28 28 28  30 30 30
-+33 33 33  35 35 35  39 39 39  41 41 41  43 43 43  46 46 46
-+47 47 47  140 134 120  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  140 134 120  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+185 178 149  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  66 66 66  66 66 66  66 66 66  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  200 196 176  65 65 65  65 65 65  52 52 52  230 228 210
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  230 228 210
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  192 187 164  65 65 65  65 65 65  65 65 65
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+65 65 65  52 52 52  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  200 196 176  66 66 66  65 65 65  66 66 66
-+66 66 66  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  140 134 120  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  65 65 65  140 134 120
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  66 66 66  66 66 66  66 66 66  200 196 176  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  52 52 52  230 228 210  255 255 255  255 255 255
-+255 255 255  255 255 255  249 249 249  238 238 238  66 66 66  66 66 66
-+66 66 66  66 66 66  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  176 168 138  66 66 66  66 66 66  66 66 66
-+66 66 66  238 238 238  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  238 238 238  138 129 110  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  249 249 249
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  192 187 164
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  52 52 52  138 129 110  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  176 168 138  49 49 49
-+45 45 45  41 41 41  38 38 38  35 35 35  33 33 33  30 30 30
-+28 28 28  25 25 25  24 24 24  20 20 20  18 18 18  16 16 16
-+13 13 13  11 11 11  9 9 9  7 7 7  5 5 5  4 4 4
-+3 3 3  1 1 1  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  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  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  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
-+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  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  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  1 1 1  3 3 3  4 4 4
-+6 6 6  8 8 8  10 10 10  12 12 12  14 14 14  16 16 16
-+18 18 18  21 21 21  24 24 24  26 26 26  28 28 28  30 30 30
-+35 35 35  37 37 37  39 39 39  42 42 42  45 45 45  47 47 47
-+52 52 52  200 196 176  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  66 66 66  65 65 65  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+138 129 110  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  140 134 120  66 66 66  66 66 66  66 66 66  231 229 217
-+249 249 249  249 249 249  255 255 255  255 255 255  255 255 255  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  231 229 217  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  238 238 238  66 66 66  66 66 66  66 66 66  238 238 238
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  192 187 164
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  200 196 176  66 66 66  66 66 66  65 65 65
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  200 196 176  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  176 168 138  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+192 187 164  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+231 230 220  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  138 129 110
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+138 129 110  65 65 65  66 66 66  66 66 66  238 238 238  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  230 228 210  65 65 65
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  176 168 138  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  66 66 66  66 66 66
-+66 66 66  66 66 66  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  66 66 66  66 66 66
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  138 129 110  50 50 50  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  140 134 120  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  140 134 120
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  65 65 65  238 238 238  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  192 187 164  47 47 47
-+45 45 45  42 42 42  39 39 39  37 37 37  35 35 35  30 30 30
-+28 28 28  26 26 26  24 24 24  21 21 21  18 18 18  16 16 16
-+14 14 14  12 12 12  10 10 10  8 8 8  6 6 6  4 4 4
-+3 3 3  1 1 1  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  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  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  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
-+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  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  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  1 1 1  2 2 2  3 3 3  4 4 4
-+6 6 6  8 8 8  10 10 10  12 12 12  14 14 14  16 16 16
-+19 19 19  21 21 21  24 24 24  26 26 26  30 30 30  32 32 32
-+35 35 35  37 37 37  41 41 41  43 43 43  45 45 45  47 47 47
-+45 45 45  231 229 217  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  231 230 220  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+66 66 66  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  185 178 149  66 66 66  66 66 66  65 65 65  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  192 187 164  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  66 66 66  66 66 66  65 65 65  249 249 249
-+249 249 249  255 255 255  255 255 255  255 255 255  249 249 249  185 178 149
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  200 196 176  66 66 66  66 66 66  65 65 65
-+200 196 176  249 249 249  255 255 255  255 255 255  249 249 249  249 249 249
-+231 230 220  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  200 196 176  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  238 238 238  255 255 255  255 255 255  255 255 255  249 249 249
-+249 249 249  176 168 138  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  52 52 52  138 129 110
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  66 66 66  66 66 66  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  185 178 149  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  65 65 65  140 134 120  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  138 129 110  66 66 66
-+66 66 66  65 65 65  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  66 66 66  231 229 217
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  238 238 238
-+138 129 110  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  176 168 138  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  200 196 176  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  231 230 220  49 49 49
-+45 45 45  43 43 43  41 41 41  37 37 37  35 35 35  32 32 32
-+30 30 30  26 26 26  24 24 24  21 21 21  19 19 19  16 16 16
-+14 14 14  12 12 12  10 10 10  8 8 8  6 6 6  4 4 4
-+3 3 3  2 2 2  1 1 1  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  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  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
-+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  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  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  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  1 1 1  2 2 2  3 3 3  4 4 4
-+6 6 6  8 8 8  10 10 10  12 12 12  14 14 14  17 17 17
-+19 19 19  21 21 21  24 24 24  27 27 27  30 30 30  32 32 32
-+35 35 35  38 38 38  41 41 41  43 43 43  46 46 46  49 49 49
-+50 50 50  238 238 238  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  200 196 176  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  192 187 164  66 66 66  66 66 66  66 66 66  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+65 65 65  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  192 187 164  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  66 66 66  66 66 66  66 66 66  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  238 238 238
-+231 230 220  231 230 220  231 230 220  231 230 220  231 230 220  231 230 220
-+231 230 220  231 230 220  231 230 220  231 230 220  231 230 220  231 230 220
-+231 230 220  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  66 66 66  66 66 66
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  200 196 176  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  176 168 138  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+192 187 164  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+231 230 220  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  138 129 110
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+138 129 110  65 65 65  66 66 66  138 129 110  249 249 249  249 249 249
-+255 255 255  255 255 255  255 255 255  249 249 249  140 134 120  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  65 65 65  138 129 110  238 238 238  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  140 134 120  65 65 65
-+66 66 66  66 66 66  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  140 134 120  249 249 249
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  140 134 120
-+65 65 65  65 65 65  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  192 187 164  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  200 196 176  249 249 249
-+255 255 255  255 255 255  255 255 255  249 249 249  238 238 238  43 43 43
-+46 46 46  43 43 43  41 41 41  38 38 38  35 35 35  32 32 32
-+30 30 30  27 27 27  24 24 24  21 21 21  19 19 19  17 17 17
-+14 14 14  12 12 12  10 10 10  8 8 8  6 6 6  4 4 4
-+3 3 3  2 2 2  1 1 1  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  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  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
-+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  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  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  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  1 1 1  2 2 2  3 3 3  4 4 4
-+6 6 6  8 8 8  10 10 10  12 12 12  15 14 14  17 17 17
-+19 19 19  22 22 22  25 25 25  27 27 27  30 30 30  32 32 32
-+35 35 35  38 38 38  41 41 41  43 43 43  46 46 46  49 49 49
-+50 50 50  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  192 187 164  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+65 65 65  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  200 196 176  66 66 66  66 66 66  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+65 65 65  176 168 138  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  66 66 66  66 66 66  66 66 66  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+249 249 249  238 238 238  249 249 249  238 238 238  249 249 249  238 238 238
-+249 249 249  238 238 238  249 249 249  238 238 238  249 249 249  249 249 249
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  200 196 176  66 66 66  66 66 66  66 66 66
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  200 196 176  255 255 255  255 255 255  255 255 255
-+249 249 249  249 249 249  231 229 217  66 66 66  66 66 66  66 66 66
-+66 66 66  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  140 134 120  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  52 52 52  138 129 110
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  66 66 66  66 66 66  66 66 66  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  140 134 120  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  140 134 120  66 66 66
-+66 66 66  66 66 66  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  192 187 164  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  231 230 220  66 66 66
-+65 65 65  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  200 196 176  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  238 238 238  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  65 65 65  192 187 164  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  49 49 49
-+46 46 46  43 43 43  41 41 41  38 38 38  35 35 35  32 32 32
-+30 30 30  27 27 27  25 25 25  22 22 22  19 19 19  17 17 17
-+15 14 14  12 12 12  10 10 10  8 8 8  6 6 6  4 4 4
-+3 3 3  2 2 2  1 1 1  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  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  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
-+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  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  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  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  1 1 1  2 2 2  3 3 3  4 4 4
-+6 6 6  8 8 8  10 10 10  13 13 13  15 14 14  17 17 17
-+20 20 20  22 22 22  25 25 25  27 27 27  30 30 30  32 32 32
-+35 35 35  38 38 38  41 41 41  43 43 43  46 46 46  49 49 49
-+52 52 52  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  192 187 164  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  238 238 238  249 249 249  255 255 255  255 255 255  255 255 255
-+249 249 249  200 196 176  66 66 66  66 66 66  66 66 66  231 230 220
-+238 238 238  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  176 168 138  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  66 66 66  66 66 66  66 66 66  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  140 134 120  65 65 65  66 66 66  66 66 66
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  200 196 176  249 249 249  255 255 255  255 255 255
-+255 255 255  249 249 249  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  176 168 138  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+192 187 164  249 249 249  249 249 249  255 255 255  255 255 255  249 249 249
-+231 230 220  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  138 129 110
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+138 129 110  65 65 65  66 66 66  140 134 120  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  140 134 120  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  140 134 120  66 66 66
-+66 66 66  66 66 66  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  200 196 176  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  200 196 176  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  200 196 176  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  238 238 238  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  65 65 65  192 187 164  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  47 47 47
-+46 46 46  43 43 43  41 41 41  38 38 38  35 35 35  32 32 32
-+30 30 30  27 27 27  25 25 25  22 22 22  19 19 19  17 17 17
-+15 14 14  13 13 13  10 10 10  8 8 8  6 6 6  4 4 4
-+3 3 3  2 2 2  1 1 1  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  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  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
-+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  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  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  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  1 1 1  2 2 2  3 3 3  4 4 4
-+6 6 6  8 8 8  10 10 10  13 13 13  15 14 14  17 17 17
-+20 20 20  22 22 22  25 25 25  27 27 27  30 30 30  33 33 33
-+35 35 35  38 38 38  41 41 41  43 43 43  46 46 46  49 49 49
-+50 50 50  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+249 249 249  192 187 164  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+65 65 65  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  200 196 176  66 66 66  66 66 66  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  140 134 120  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  138 129 110  66 66 66  66 66 66  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  200 196 176  65 65 65  65 65 65  66 66 66  65 65 65
-+200 196 176  249 249 249  255 255 255  255 255 255  249 249 249  249 249 249
-+231 230 220  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  200 196 176  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+238 238 238  176 168 138  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  52 52 52  138 129 110
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  66 66 66  52 52 52  138 129 110  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  140 134 120  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  65 65 65  138 129 110  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  163 154 123  66 66 66
-+66 66 66  66 66 66  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  192 187 164  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  200 196 176  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  238 238 238  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  65 65 65  65 65 65  192 187 164  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  49 49 49
-+46 46 46  43 43 43  41 41 41  38 38 38  35 35 35  32 32 32
-+30 30 30  27 27 27  25 25 25  22 22 22  20 20 20  17 17 17
-+15 14 14  13 13 13  10 10 10  8 8 8  6 6 6  4 4 4
-+3 3 3  2 2 2  1 1 1  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  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  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
-+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  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  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  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  1 1 1  2 2 2  3 3 3  4 4 4
-+6 6 6  8 8 8  10 10 10  13 13 13  15 14 14  17 17 17
-+20 20 20  22 22 22  25 25 25  27 27 27  30 30 30  32 32 32
-+35 35 35  38 38 38  41 41 41  43 43 43  46 46 46  49 49 49
-+52 52 52  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  192 187 164  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+65 65 65  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  200 196 176  66 66 66  66 66 66  66 66 66  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+65 65 65  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  192 187 164  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  66 66 66  66 66 66  66 66 66  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+192 187 164  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+200 196 176  249 249 249  249 249 249  255 255 255  255 255 255  249 249 249
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  200 196 176  249 249 249  249 249 249  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  176 168 138  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+192 187 164  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+231 230 220  65 65 65  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  138 129 110
-+238 238 238  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+138 129 110  65 65 65  66 66 66  138 129 110  238 238 238  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  140 134 120  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  140 134 120  66 66 66
-+66 66 66  66 66 66  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  140 134 120  238 238 238
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  200 196 176  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  238 238 238  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  65 65 65  192 187 164  249 249 249
-+249 249 249  255 255 255  255 255 255  255 255 255  238 238 238  50 50 50
-+46 46 46  43 43 43  41 41 41  38 38 38  35 35 35  32 32 32
-+30 30 30  27 27 27  25 25 25  22 22 22  19 19 19  17 17 17
-+15 14 14  13 13 13  10 10 10  8 8 8  6 6 6  4 4 4
-+3 3 3  2 2 2  1 1 1  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  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  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
-+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  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  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  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  1 1 1  2 2 2  3 3 3  4 4 4
-+6 6 6  8 8 8  10 10 10  12 12 12  15 14 14  17 17 17
-+19 19 19  22 22 22  25 25 25  27 27 27  30 30 30  32 32 32
-+35 35 35  38 38 38  41 41 41  43 43 43  46 46 46  49 49 49
-+52 52 52  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  200 196 176  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+249 249 249  192 187 164  66 66 66  66 66 66  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+65 65 65  192 187 164  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  66 66 66  66 66 66  66 66 66  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  185 178 149
-+65 65 65  65 65 65  65 65 65  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  65 65 65  65 65 65  65 65 65  65 65 65
-+65 65 65  66 66 66  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  200 196 176  255 255 255  255 255 255  255 255 255
-+249 249 249  249 249 249  231 229 217  66 66 66  66 66 66  66 66 66
-+66 66 66  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  140 134 120  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  52 52 52  138 129 110
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  66 66 66  66 66 66  66 66 66  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  140 134 120  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  138 129 110  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  140 134 120  66 66 66
-+66 66 66  66 66 66  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  52 52 52  230 228 210
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+192 187 164  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  192 187 164  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  65 65 65  65 65 65  200 196 176  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  238 238 238  49 49 49
-+46 46 46  43 43 43  41 41 41  38 38 38  35 35 35  32 32 32
-+30 30 30  27 27 27  25 25 25  22 22 22  19 19 19  17 17 17
-+15 14 14  12 12 12  10 10 10  8 8 8  6 6 6  4 4 4
-+3 3 3  2 2 2  1 1 1  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  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  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
-+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  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  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  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  1 1 1  2 2 2  3 3 3  4 4 4
-+6 6 6  8 8 8  10 10 10  12 12 12  14 14 14  17 17 17
-+19 19 19  21 21 21  24 24 24  27 27 27  30 30 30  32 32 32
-+35 35 35  38 38 38  41 41 41  43 43 43  46 46 46  48 48 47
-+50 50 50  230 228 210  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  231 230 220  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  140 134 120  66 66 66  66 66 66  66 66 66  231 230 220
-+238 238 238  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+65 65 65  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  200 196 176  249 249 249  249 249 249  255 255 255  255 255 255
-+255 255 255  238 238 238  66 66 66  66 66 66  66 66 66  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  192 187 164
-+65 65 65  65 65 65  66 66 66  65 65 65  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  200 196 176  249 249 249  255 255 255  255 255 255
-+255 255 255  249 249 249  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  176 168 138  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+192 187 164  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+231 230 220  65 65 65  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  138 129 110
-+238 238 238  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+138 129 110  65 65 65  66 66 66  66 66 66  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  192 187 164  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  140 134 120  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  138 129 110  65 65 65
-+65 65 65  66 66 66  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  66 66 66  66 66 66
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  185 178 149  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  185 178 149  249 249 249
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  65 65 65  231 230 220  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  200 196 176  52 52 52
-+47 47 47  43 43 43  41 41 41  37 37 37  35 35 35  32 32 32
-+30 30 30  27 27 27  24 24 24  21 21 21  19 19 19  17 17 17
-+14 14 14  12 12 12  10 10 10  8 8 8  6 6 6  4 4 4
-+3 3 3  2 2 2  1 1 1  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  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  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
-+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  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  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  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  1 1 1  2 2 2  3 3 3  4 4 4
-+6 6 6  8 8 8  10 10 10  12 12 12  14 14 14  16 16 16
-+19 19 19  21 21 21  24 24 24  26 26 26  30 30 30  32 32 32
-+35 35 35  37 37 37  41 41 41  43 43 43  45 45 45  49 49 49
-+47 47 47  200 196 176  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  238 238 238  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+140 134 120  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  140 134 120  66 66 66  66 66 66  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+65 65 65  231 230 220  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  231 229 217  66 66 66  66 66 66  66 66 66  238 238 238
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+65 65 65  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+200 196 176  249 249 249  255 255 255  255 255 255  249 249 249  249 249 249
-+231 230 220  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  200 196 176  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+238 238 238  176 168 138  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  52 52 52  138 129 110
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  66 66 66  66 66 66  66 66 66  238 238 238  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  231 230 220  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  65 65 65  192 187 164  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  66 66 66  65 65 65
-+66 66 66  66 66 66  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  176 168 138  66 66 66  66 66 66  65 65 65
-+138 129 110  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  238 238 238  176 168 138  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  140 134 120  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  140 134 120
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  238 238 238  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  192 187 164  49 49 49
-+45 45 45  43 43 43  41 41 41  37 37 37  35 35 35  32 32 32
-+30 30 30  26 26 26  24 24 24  21 21 21  19 19 19  16 16 16
-+14 14 14  12 12 12  10 10 10  8 8 8  6 6 6  4 4 4
-+3 3 3  2 2 2  1 1 1  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  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  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
-+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  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  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  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  1 1 1  3 3 3  4 4 4
-+6 6 6  8 8 8  10 10 10  12 12 12  14 14 14  16 16 16
-+18 18 18  21 21 21  24 24 24  26 26 26  28 28 28  30 30 30
-+35 35 35  37 37 37  39 39 39  42 42 42  45 45 45  47 47 47
-+50 50 50  163 154 123  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  65 65 65  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  66 66 66  66 66 66  66 66 66  66 66 66  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+65 65 65  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  200 196 176  66 66 66  66 66 66  66 66 66  230 228 210
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  231 230 220
-+65 65 65  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+200 196 176  249 249 249  249 249 249  255 255 255  255 255 255  249 249 249
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  200 196 176  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  176 168 138  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+192 187 164  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+231 230 220  65 65 65  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  138 129 110
-+238 238 238  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+138 129 110  65 65 65  66 66 66  66 66 66  230 228 210  249 249 249
-+255 255 255  255 255 255  255 255 255  249 249 249  249 249 249  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  238 238 238  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  231 230 220  66 66 66  66 66 66
-+66 66 66  66 66 66  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  66 66 66  66 66 66
-+65 65 65  138 129 110  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  249 249 249  140 134 120  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  140 134 120  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  140 134 120  50 50 50
-+46 46 46  42 42 42  39 39 39  35 35 35  35 35 35  30 30 30
-+28 28 28  26 26 26  24 24 24  21 21 21  18 18 18  16 16 16
-+14 14 14  11 11 11  9 9 9  8 8 8  6 6 6  4 4 4
-+3 3 3  1 1 1  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  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  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  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
-+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  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  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  1 1 1  3 3 3  4 4 4
-+5 5 5  7 7 7  9 9 9  11 11 11  13 13 13  16 16 16
-+18 18 18  20 20 20  24 24 24  25 25 25  28 28 28  30 30 30
-+33 33 33  35 35 35  38 38 38  41 41 41  45 45 45  46 46 46
-+39 39 39  138 129 110  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  231 230 220  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+238 238 238  66 66 66  66 66 66  66 66 66  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+185 178 149  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  176 168 138  65 65 65  65 65 65  65 65 65  192 187 164
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  249 249 249
-+66 66 66  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+200 196 176  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  200 196 176  249 249 249  255 255 255  255 255 255
-+249 249 249  249 249 249  231 229 217  66 66 66  66 66 66  66 66 66
-+66 66 66  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  140 134 120  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  52 52 52  138 129 110
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  66 66 66  66 66 66  66 66 66  163 154 123  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  192 187 164
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  140 134 120  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  249 249 249  192 187 164  66 66 66  66 66 66
-+66 66 66  66 66 66  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  66 66 66  65 65 65
-+65 65 65  50 50 50  138 129 110  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  140 134 120  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  238 238 238
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  65 65 65  231 230 220  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  66 66 66  47 47 47
-+43 43 43  41 41 41  38 38 38  35 35 35  33 33 33  30 30 30
-+28 28 28  25 25 25  24 24 24  20 20 20  18 18 18  16 16 16
-+13 13 13  11 11 11  9 9 9  7 7 7  5 5 5  4 4 4
-+3 3 3  1 1 1  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  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  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  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
-+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  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  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  1 1 1  3 3 3  4 4 4
-+5 5 5  7 7 7  9 9 9  11 11 11  13 13 13  15 14 14
-+17 17 17  20 20 20  22 22 22  25 25 25  27 27 27  30 30 30
-+32 32 32  35 35 35  38 38 38  41 41 41  43 43 43  45 45 45
-+47 47 47  45 45 45  238 238 238  249 249 249  255 255 255  255 255 255
-+255 255 255  249 249 249  249 249 249  185 178 149  65 65 65  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  238 238 238
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+185 178 149  66 66 66  66 66 66  66 66 66  66 66 66  231 230 220
-+238 238 238  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+65 65 65  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  138 129 110
-+238 238 238  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  66 66 66  66 66 66  66 66 66  65 65 65  140 134 120
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+192 187 164  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+200 196 176  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+200 196 176  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  200 196 176  249 249 249  255 255 255  255 255 255
-+255 255 255  249 249 249  200 196 176  65 65 65  66 66 66  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  176 168 138  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+192 187 164  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+231 230 220  65 65 65  65 65 65  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  138 129 110
-+238 238 238  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+138 129 110  65 65 65  66 66 66  66 66 66  66 66 66  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+140 134 120  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  138 129 110  238 238 238  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  138 129 110  65 65 65  66 66 66
-+66 66 66  66 66 66  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  66 66 66  66 66 66
-+65 65 65  65 65 65  65 65 65  140 134 120  249 249 249  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  140 134 120
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+231 230 220  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  192 187 164  249 249 249  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  231 230 220  52 52 52  49 49 49
-+43 43 43  41 41 41  38 38 38  35 35 35  32 32 32  30 30 30
-+27 27 27  25 25 25  22 22 22  20 20 20  17 17 17  15 14 14
-+13 13 13  11 11 11  9 9 9  7 7 7  5 5 5  4 4 4
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  1 1 1  2 2 2  3 3 3
-+5 5 5  7 7 7  9 9 9  10 10 10  13 13 13  15 14 14
-+17 17 17  19 19 19  21 21 21  24 24 24  26 26 26  30 30 30
-+30 30 30  35 35 35  37 37 37  39 39 39  42 42 42  43 43 43
-+49 49 49  52 52 52  140 134 120  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  249 249 249  249 249 249  200 196 176  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  65 65 65  65 65 65  138 129 110  238 238 238  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  140 134 120  238 238 238
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+249 249 249  185 178 149  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+200 196 176  249 249 249  255 255 255  255 255 255  249 249 249  249 249 249
-+231 229 217  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  200 196 176  249 249 249  255 255 255  255 255 255
-+255 255 255  249 249 249  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+238 238 238  176 168 138  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  65 65 65  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  52 52 52  138 129 110
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  65 65 65  66 66 66  66 66 66  66 66 66  230 227 205
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+238 238 238  176 168 138  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+140 134 120  238 238 238  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  238 238 238  65 65 65  65 65 65  65 65 65
-+66 66 66  66 66 66  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  66 66 66  65 65 65
-+65 65 65  65 65 65  65 65 65  52 52 52  140 134 120  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  238 238 238
-+140 134 120  66 66 66  66 66 66  66 66 66  52 52 52  138 129 110
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  231 230 220  138 129 110  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  200 196 176  249 249 249  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  140 134 120  47 47 47  45 45 45
-+42 42 42  39 39 39  37 37 37  35 35 35  30 30 30  30 30 30
-+26 26 26  24 24 24  21 21 21  19 19 19  17 17 17  15 14 14
-+13 13 13  10 10 10  8 8 8  6 6 6  5 5 5  3 3 3
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  1 1 1  2 2 2  3 3 3
-+5 5 5  6 6 6  8 8 8  10 10 10  12 12 12  14 14 14
-+16 16 16  18 18 18  21 21 21  24 24 24  26 26 26  28 28 28
-+30 30 30  33 33 33  35 35 35  38 38 38  41 41 41  43 43 43
-+45 45 45  50 50 50  65 65 65  238 238 238  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  249 249 249  249 249 249
-+200 196 176  140 134 120  140 134 120  66 66 66  138 129 110  66 66 66
-+140 134 120  176 168 138  231 230 220  238 238 238  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  200 196 176
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  249 249 249  238 238 238
-+192 187 164  192 187 164  200 196 176  192 187 164  200 196 176  192 187 164
-+192 187 164  200 196 176  200 196 176  238 238 238  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+138 129 110  65 65 65  65 65 65  65 65 65  65 65 65  66 66 66
-+200 196 176  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  249 249 249  200 196 176  192 187 164  192 187 164
-+192 187 164  192 187 164  192 187 164  192 187 164  192 187 164  192 187 164
-+192 187 164  192 187 164  192 187 164  192 187 164  192 187 164  192 187 164
-+192 187 164  176 168 138  65 65 65  65 65 65  65 65 65  65 65 65
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+200 196 176  65 65 65  65 65 65  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  65 65 65  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  200 196 176  249 249 249  249 249 249  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  66 66 66  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  140 134 120  66 66 66  66 66 66  66 66 66  66 66 66
-+66 66 66  66 66 66  66 66 66  65 65 65  65 65 65  65 65 65
-+192 187 164  238 238 238  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  52 52 52  66 66 66  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  65 65 65  65 65 65  65 65 65  138 129 110
-+238 238 238  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+138 129 110  65 65 65  65 65 65  66 66 66  65 65 65  138 129 110
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  249 249 249  238 238 238  200 196 176  140 134 120  138 129 110
-+66 66 66  140 134 120  66 66 66  140 134 120  192 187 164  238 238 238
-+249 249 249  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  66 66 66  65 65 65
-+65 65 65  65 65 65  65 65 65  65 65 65  65 65 65  140 134 120
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  138 129 110  65 65 65  65 65 65  66 66 66  52 52 52
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  249 249 249  230 228 210  163 154 123  140 134 120
-+138 129 110  66 66 66  138 129 110  138 129 110  140 134 120  200 196 176
-+249 249 249  255 255 255  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  238 238 238  52 52 52  47 47 47  43 43 43
-+41 41 41  38 38 38  35 35 35  33 33 33  30 30 30  28 28 28
-+25 25 25  24 24 24  21 21 21  18 18 18  16 16 16  14 14 14
-+12 12 12  10 10 10  8 8 8  6 6 6  4 4 4  3 3 3
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  1 1 1  2 2 2  3 3 3
-+4 4 4  6 6 6  8 8 8  9 9 9  11 11 11  13 13 13
-+16 16 16  18 18 18  20 20 20  22 22 22  25 25 25  27 27 27
-+30 30 30  32 32 32  33 33 33  37 37 37  39 39 39  41 41 41
-+45 45 45  46 46 46  41 41 41  138 129 110  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  249 249 249  249 249 249  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  238 238 238  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  249 249 249
-+249 249 249  238 238 238  249 249 249  238 238 238  249 249 249  238 238 238
-+249 249 249  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  192 187 164
-+52 52 52  65 65 65  52 52 52  65 65 65  65 65 65  66 66 66
-+66 66 66  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  249 249 249  249 249 249
-+249 249 249  249 249 249  249 249 249  249 249 249  249 249 249  249 249 249
-+249 249 249  249 249 249  249 249 249  249 249 249  249 249 249  249 249 249
-+238 238 238  231 230 220  65 65 65  65 65 65  65 65 65  65 65 65
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+200 196 176  65 65 65  52 52 52  65 65 65  65 65 65  52 52 52
-+65 65 65  52 52 52  65 65 65  52 52 52  65 65 65  52 52 52
-+65 65 65  52 52 52  200 196 176  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  65 65 65  65 65 65
-+65 65 65  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  176 168 138  66 66 66  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  65 65 65  65 65 65  65 65 65  52 52 52
-+192 187 164  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  65 65 65  65 65 65  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  65 65 65  65 65 65  47 47 47  138 129 110
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  52 52 52  65 65 65  65 65 65  65 65 65  52 52 52
-+176 168 138  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  249 249 249  249 249 249  249 249 249  249 249 249
-+255 255 255  255 255 255  255 255 255  249 249 249  249 249 249  249 249 249
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  200 196 176  52 52 52  65 65 65  52 52 52  65 65 65
-+65 65 65  65 65 65  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  52 52 52  65 65 65  65 65 65  66 66 66
-+140 134 120  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+238 238 238  238 238 238  138 129 110  65 65 65  66 66 66  66 66 66
-+66 66 66  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  249 249 249  249 249 249  249 249 249  249 249 249
-+249 249 249  249 249 249  249 249 249  249 249 249  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  238 238 238  138 129 110  47 47 47  43 43 43  42 42 42
-+39 39 39  37 37 37  35 35 35  32 32 32  30 30 30  27 27 27
-+25 25 25  22 22 22  20 20 20  18 18 18  16 16 16  13 13 13
-+11 11 11  9 9 9  8 8 8  6 6 6  4 4 4  3 3 3
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  0 0 0  1 1 1  3 3 3
-+4 4 4  5 5 5  7 7 7  9 9 9  11 11 11  13 13 13
-+15 14 14  17 17 17  19 19 19  21 21 21  24 24 24  26 26 26
-+28 28 28  30 30 30  33 33 33  35 35 35  38 38 38  39 39 39
-+42 42 42  45 45 45  46 46 46  45 45 45  140 134 120  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  238 238 238  138 129 110  52 52 52
-+66 66 66  66 66 66  66 66 66  66 66 66  66 66 66  231 230 220
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+249 249 249  255 255 255  249 249 249  255 255 255  249 249 249  255 255 255
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  200 196 176  66 66 66
-+65 65 65  52 52 52  65 65 65  52 52 52  65 65 65  65 65 65
-+66 66 66  140 134 120  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  255 255 255  249 249 249  255 255 255  249 249 249
-+255 255 255  249 249 249  255 255 255  249 249 249  249 249 249  249 249 249
-+249 249 249  231 230 220  52 52 52  65 65 65  52 52 52  65 65 65
-+200 196 176  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+200 196 176  65 65 65  65 65 65  52 52 52  65 65 65  65 65 65
-+52 52 52  65 65 65  65 65 65  65 65 65  52 52 52  65 65 65
-+65 65 65  52 52 52  200 196 176  249 249 249  249 249 249  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  65 65 65  65 65 65
-+52 52 52  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  140 134 120  66 66 66  65 65 65  65 65 65  52 52 52
-+65 65 65  52 52 52  65 65 65  65 65 65  52 52 52  65 65 65
-+192 187 164  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+231 230 220  52 52 52  65 65 65  52 52 52  65 65 65  52 52 52
-+65 65 65  52 52 52  65 65 65  65 65 65  52 52 52  66 66 66
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+138 129 110  52 52 52  65 65 65  52 52 52  52 52 52  65 65 65
-+65 65 65  192 187 164  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+230 227 205  66 66 66  65 65 65  65 65 65  52 52 52  65 65 65
-+52 52 52  65 65 65  238 238 238  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  66 66 66  65 65 65  52 52 52
-+52 52 52  65 65 65  65 65 65  52 52 52  65 65 65  65 65 65
-+65 65 65  176 168 138  249 249 249  255 255 255  255 255 255  255 255 255
-+249 249 249  249 249 249  238 238 238  66 66 66  66 66 66  65 65 65
-+65 65 65  66 66 66  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  249 249 249  255 255 255  249 249 249
-+255 255 255  255 255 255  249 249 249  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  140 134 120  39 39 39  41 41 41  42 42 42  41 41 41
-+38 38 38  35 35 35  33 33 33  30 30 30  28 28 28  26 26 26
-+24 24 24  21 21 21  19 19 19  17 17 17  15 14 14  13 13 13
-+11 11 11  9 9 9  7 7 7  5 5 5  4 4 4  3 3 3
-+1 1 1  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  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  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  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  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
-+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  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  0 0 0  0 0 0  1 1 1  2 2 2
-+3 3 3  5 5 5  6 6 6  8 8 8  10 10 10  12 12 12
-+14 14 14  16 16 16  18 18 18  20 20 20  24 24 24  25 25 25
-+27 27 27  30 30 30  32 32 32  35 35 35  35 35 35  38 38 38
-+41 41 41  43 43 43  45 45 45  45 45 45  65 65 65  66 66 66
-+231 230 220  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  200 196 176  66 66 66  52 52 52  66 66 66
-+66 66 66  66 66 66  66 66 66  66 66 66  65 65 65  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  249 249 249  176 168 138  65 65 65  52 52 52
-+52 52 52  65 65 65  52 52 52  65 65 65  52 52 52  52 52 52
-+52 52 52  52 52 52  138 129 110  249 249 249  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  231 230 220  65 65 65  52 52 52  65 65 65  52 52 52
-+200 196 176  249 249 249  255 255 255  255 255 255  255 255 255  249 249 249
-+200 196 176  65 65 65  52 52 52  65 65 65  52 52 52  65 65 65
-+52 52 52  65 65 65  52 52 52  52 52 52  65 65 65  52 52 52
-+65 65 65  52 52 52  200 196 176  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  200 196 176  52 52 52  65 65 65  52 52 52
-+65 65 65  238 238 238  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  176 168 138  65 65 65  65 65 65  52 52 52  65 65 65
-+65 65 65  52 52 52  65 65 65  52 52 52  65 65 65  52 52 52
-+192 187 164  255 255 255  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  65 65 65  52 52 52  65 65 65  65 65 65  52 52 52
-+65 65 65  65 65 65  52 52 52  52 52 52  65 65 65  138 129 110
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  52 52 52  52 52 52  65 65 65  65 65 65  52 52 52
-+52 52 52  65 65 65  140 134 120  238 238 238  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  176 168 138
-+65 65 65  52 52 52  65 65 65  52 52 52  65 65 65  52 52 52
-+65 65 65  52 52 52  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  52 52 52  65 65 65  52 52 52
-+65 65 65  52 52 52  52 52 52  65 65 65  52 52 52  52 52 52
-+65 65 65  52 52 52  185 178 149  255 255 255  255 255 255  255 255 255
-+255 255 255  249 249 249  249 249 249  249 249 249  66 66 66  65 65 65
-+66 66 66  66 66 66  66 66 66  200 196 176  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  238 238 238
-+66 66 66  47 47 47  45 45 45  42 42 42  41 41 41  38 38 38
-+35 35 35  33 33 33  32 32 32  30 30 30  27 27 27  25 25 25
-+24 24 24  20 20 20  18 18 18  16 16 16  14 14 14  12 12 12
-+10 10 10  8 8 8  6 6 6  5 5 5  3 3 3  2 2 2
-+1 1 1  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  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  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  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  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
-+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  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  0 0 0  0 0 0  1 1 1  2 2 2
-+3 3 3  4 4 4  6 6 6  8 8 8  9 9 9  11 11 11
-+13 13 13  15 14 14  17 17 17  20 20 20  21 21 21  24 24 24
-+26 26 26  28 28 28  30 30 30  32 32 32  35 35 35  37 37 37
-+39 39 39  41 41 41  43 43 43  45 45 45  47 47 47  52 52 52
-+52 52 52  140 134 120  200 196 176  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  238 238 238
-+192 187 164  138 129 110  52 52 52  66 66 66  66 66 66  65 65 65
-+65 65 65  65 65 65  66 66 66  66 66 66  66 66 66  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+231 230 220  185 178 149  66 66 66  65 65 65  52 52 52  52 52 52
-+65 65 65  50 50 50  52 52 52  52 52 52  52 52 52  65 65 65
-+52 52 52  52 52 52  52 52 52  66 66 66  185 178 149  238 238 238
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  231 230 220  50 50 50  52 52 52  65 65 65  52 52 52
-+200 196 176  249 249 249  249 249 249  255 255 255  255 255 255  255 255 255
-+200 196 176  65 65 65  52 52 52  52 52 52  52 52 52  52 52 52
-+65 65 65  52 52 52  52 52 52  65 65 65  52 52 52  52 52 52
-+52 52 52  52 52 52  200 196 176  249 249 249  249 249 249  255 255 255
-+255 255 255  255 255 255  200 196 176  65 65 65  52 52 52  65 65 65
-+52 52 52  249 249 249  255 255 255  255 255 255  255 255 255  255 255 255
-+249 249 249  140 134 120  65 65 65  52 52 52  52 52 52  52 52 52
-+52 52 52  65 65 65  52 52 52  52 52 52  52 52 52  52 52 52
-+192 187 164  238 238 238  255 255 255  255 255 255  255 255 255  249 249 249
-+231 230 220  47 47 47  52 52 52  52 52 52  52 52 52  65 65 65
-+52 52 52  52 52 52  65 65 65  52 52 52  52 52 52  138 129 110
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+66 66 66  66 66 66  65 65 65  52 52 52  52 52 52  65 65 65
-+52 52 52  52 52 52  65 65 65  66 66 66  163 154 123  231 230 220
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  231 230 220  176 168 138  66 66 66  65 65 65
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  249 249 249  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  140 134 120  65 65 65  52 52 52  52 52 52
-+65 65 65  52 52 52  52 52 52  52 52 52  65 65 65  52 52 52
-+52 52 52  52 52 52  65 65 65  192 187 164  249 249 249  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  238 238 238  66 66 66
-+65 65 65  65 65 65  65 65 65  52 52 52  138 129 110  192 187 164
-+238 238 238  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  255 255 255  255 255 255  255 255 255
-+255 255 255  255 255 255  255 255 255  200 196 176  140 134 120  49 49 49
-+52 52 52  52 52 52  43 43 43  41 41 41  39 39 39  37 37 37
-+35 35 35  32 32 32  30 30 30  28 28 28  26 26 26  24 24 24
-+21 21 21  19 19 19  17 17 17  15 14 14  13 13 13  11 11 11
-+9 9 9  8 8 8  6 6 6  4 4 4  3 3 3  2 2 2
-+1 1 1  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  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  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  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  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
-+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  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  0 0 0  0 0 0  1 1 1  1 1 1
-+3 3 3  4 4 4  5 5 5  7 7 7  9 9 9  10 10 10
-+12 12 12  14 14 14  16 16 16  18 18 18  20 20 20  22 22 22
-+25 25 25  27 27 27  30 30 30  30 30 30  33 33 33  35 35 35
-+37 37 37  39 39 39  41 41 41  43 43 43  45 45 45  49 49 49
-+47 47 47  49 49 49  52 52 52  66 66 66  66 66 66  140 134 120
-+176 168 138  192 187 164  192 187 164  231 229 217  231 230 220  200 196 176
-+192 187 164  192 187 164  140 134 120  140 134 120  66 66 66  65 65 65
-+52 52 52  52 52 52  65 65 65  65 65 65  65 65 65  65 65 65
-+65 65 65  65 65 65  65 65 65  66 66 66  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  231 230 220
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  138 129 110  66 66 66
-+52 52 52  52 52 52  65 65 65  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+66 66 66  138 129 110  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  52 52 52  52 52 52  52 52 52  43 43 43
-+138 129 110  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  52 52 52  52 52 52  52 52 52  65 65 65  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  65 65 65
-+52 52 52  47 47 47  138 129 110  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  138 129 110  65 65 65  52 52 52  52 52 52
-+52 52 52  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  66 66 66  52 52 52  52 52 52  65 65 65  52 52 52
-+65 65 65  52 52 52  52 52 52  52 52 52  65 65 65  66 66 66
-+66 66 66  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  52 52 52  52 52 52  65 65 65  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  66 66 66
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  140 134 120
-+66 66 66  65 65 65  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+65 65 65  138 129 110  140 134 120  185 178 149  192 187 164  192 187 164
-+230 228 210  231 230 220  200 196 176  192 187 164  192 187 164  140 134 120
-+140 134 120  66 66 66  52 52 52  65 65 65  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  65 65 65  52 52 52  65 65 65
-+52 52 52  52 52 52  140 134 120  140 134 120  140 134 120  140 134 120
-+140 134 120  140 134 120  66 66 66  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  65 65 65  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  140 134 120  140 134 120
-+140 134 120  140 134 120  140 134 120  140 134 120  140 134 120  138 129 110
-+52 52 52  52 52 52  52 52 52  52 52 52  46 46 46  50 50 50
-+65 65 65  66 66 66  140 134 120  140 134 120  192 187 164  192 187 164
-+200 196 176  230 228 210  231 229 217  192 187 164  192 187 164  176 168 138
-+140 134 120  138 129 110  52 52 52  49 49 49  45 45 45  46 46 46
-+45 45 45  43 43 43  41 41 41  39 39 39  37 37 37  35 35 35
-+33 33 33  30 30 30  28 28 28  26 26 26  25 25 25  22 22 22
-+20 20 20  18 18 18  16 16 16  14 14 14  12 12 12  10 10 10
-+9 9 9  7 7 7  5 5 5  4 4 4  3 3 3  1 1 1
-+1 1 1  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  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  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  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  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
-+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  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  0 0 0  0 0 0  0 0 0  1 1 1
-+2 2 2  3 3 3  5 5 5  6 6 6  8 8 8  10 10 10
-+11 11 11  13 13 13  15 14 14  17 17 17  19 19 19  21 21 21
-+24 24 24  25 25 25  27 27 27  30 30 30  30 30 30  33 33 33
-+35 35 35  37 37 37  39 39 39  41 41 41  42 42 42  43 43 43
-+45 45 45  46 46 46  47 47 47  52 52 52  65 65 65  52 52 52
-+47 47 47  45 45 45  46 46 46  46 46 46  49 49 49  52 52 52
-+52 52 52  52 52 52  65 65 65  65 65 65  65 65 65  65 65 65
-+52 52 52  65 65 65  52 52 52  52 52 52  65 65 65  52 52 52
-+65 65 65  52 52 52  65 65 65  65 65 65  65 65 65  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  255 255 255  200 196 176
-+65 65 65  66 66 66  66 66 66  66 66 66  66 66 66  65 65 65
-+65 65 65  65 65 65  52 52 52  52 52 52  49 49 49  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  49 49 49  49 49 49  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+46 46 46  49 49 49  52 52 52  52 52 52  52 52 52  49 49 49
-+45 45 45  49 49 49  52 52 52  52 52 52  50 50 50  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  49 49 49
-+52 52 52  50 50 50  45 45 45  49 49 49  52 52 52  52 52 52
-+52 52 52  52 52 52  47 47 47  47 47 47  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  65 65 65
-+65 65 65  65 65 65  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+65 65 65  65 65 65  52 52 52  52 52 52  52 52 52  50 50 50
-+47 47 47  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  65 65 65
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  46 46 46  49 49 49  49 49 49  49 49 49  50 50 50
-+47 47 47  45 45 45  49 49 49  49 49 49  47 47 47  50 50 50
-+50 50 50  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  50 50 50  52 52 52  52 52 52  52 52 52
-+52 52 52  65 65 65  52 52 52  65 65 65  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  49 49 49
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  65 65 65  52 52 52  65 65 65  50 50 50  50 50 50
-+52 52 52  49 49 49  43 43 43  45 45 45  45 45 45  45 45 45
-+43 43 43  39 39 39  43 43 43  47 47 47  45 45 45  43 43 43
-+43 43 43  41 41 41  39 39 39  37 37 37  35 35 35  33 33 33
-+32 32 32  30 30 30  27 27 27  25 25 25  24 24 24  21 21 21
-+19 19 19  17 17 17  15 14 14  13 13 13  11 11 11  9 9 9
-+8 8 8  6 6 6  5 5 5  3 3 3  2 2 2  1 1 1
-+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  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  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  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  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  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
-+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  0 0 0  0 0 0  0 0 0  0 0 0  1 1 1
-+2 2 2  3 3 3  4 4 4  5 5 5  7 7 7  9 9 9
-+10 10 10  12 12 12  14 14 14  16 16 16  18 18 18  20 20 20
-+21 21 21  24 24 24  25 25 25  27 27 27  30 30 30  32 32 32
-+33 33 33  35 35 35  37 37 37  38 38 38  39 39 39  41 41 41
-+43 43 43  45 45 45  45 45 45  45 45 45  46 46 46  46 46 46
-+49 49 49  49 49 49  49 49 49  49 49 49  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  65 65 65  52 52 52  65 65 65
-+52 52 52  65 65 65  65 65 65  65 65 65  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+65 65 65  65 65 65  65 65 65  65 65 65  65 65 65  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  50 50 50  50 50 50  49 49 49
-+49 49 49  47 47 47  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  50 50 50  52 52 52  52 52 52  50 50 50  50 50 50
-+50 50 50  49 49 49  50 50 50  49 49 49  47 47 47  49 49 49
-+47 47 47  49 49 49  49 49 49  49 49 49  47 47 47  49 49 49
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  47 47 47
-+49 49 49  49 49 49  47 47 47  49 49 49  49 49 49  50 50 50
-+50 50 50  49 49 49  49 49 49  50 50 50  50 50 50  50 50 50
-+52 52 52  50 50 50  52 52 52  52 52 52  50 50 50  47 47 47
-+47 47 47  49 49 49  52 52 52  50 50 50  49 49 49  49 49 49
-+49 49 49  50 50 50  52 52 52  50 50 50  50 50 50  50 50 50
-+49 49 49  47 47 47  49 49 49  49 49 49  49 49 49  50 50 50
-+49 49 49  49 49 49  50 50 50  50 50 50  50 50 50  50 50 50
-+52 52 52  52 52 52  52 52 52  52 52 52  50 50 50  50 50 50
-+49 49 49  49 49 49  49 49 49  50 50 50  49 49 49  47 47 47
-+49 49 49  50 50 50  50 50 50  52 52 52  50 50 50  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  50 50 50
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  50 50 50
-+49 49 49  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  50 50 50  50 50 50  49 49 49  50 50 50  50 50 50
-+52 52 52  52 52 52  52 52 52  49 49 49  49 49 49  49 49 49
-+49 49 49  49 49 49  47 47 47  49 49 49  49 49 49  49 49 49
-+49 49 49  47 47 47  49 49 49  47 47 47  47 47 47  49 49 49
-+50 50 50  50 50 50  49 49 49  50 50 50  50 50 50  52 52 52
-+52 52 52  49 49 49  49 49 49  49 49 49  47 47 47  49 49 49
-+49 49 49  49 49 49  50 50 50  50 50 50  50 50 50  49 49 49
-+50 50 50  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+50 50 50  50 50 50  50 50 50  49 49 49  50 50 50  50 50 50
-+49 49 49  49 49 49  49 49 49  47 47 47  49 49 49  47 47 47
-+47 47 47  46 46 46  45 45 45  45 45 45  43 43 43  41 41 41
-+41 41 41  38 38 38  37 37 37  35 35 35  33 33 33  30 30 30
-+30 30 30  27 27 27  25 25 25  24 24 24  21 21 21  20 20 20
-+18 18 18  16 16 16  14 14 14  12 12 12  10 10 10  9 9 9
-+7 7 7  5 5 5  4 4 4  3 3 3  2 2 2  1 1 1
-+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  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  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  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  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  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
-+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  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+1 1 1  3 3 3  3 3 3  5 5 5  6 6 6  8 8 8
-+9 9 9  11 11 11  13 13 13  15 14 14  16 16 16  18 18 18
-+20 20 20  22 22 22  24 24 24  26 26 26  27 27 27  28 28 28
-+32 32 32  33 33 33  35 35 35  35 35 35  37 37 37  39 39 39
-+41 41 41  41 41 41  43 43 43  43 43 43  43 43 43  46 46 46
-+45 45 45  46 46 46  47 47 47  47 47 47  49 49 49  50 50 50
-+50 50 50  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+65 65 65  52 52 52  52 52 52  52 52 52  65 65 65  52 52 52
-+65 65 65  52 52 52  65 65 65  52 52 52  66 66 66  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+52 52 52  65 65 65  52 52 52  52 52 52  52 52 52  65 65 65
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+50 50 50  49 49 49  46 46 46  47 47 47  46 46 46  46 46 46
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  46 46 46  45 45 45  46 46 46  46 46 46  46 46 46
-+47 47 47  49 49 49  49 49 49  49 49 49  49 49 49  49 49 49
-+50 50 50  50 50 50  49 49 49  49 49 49  49 49 49  49 49 49
-+49 49 49  47 47 47  47 47 47  47 47 47  47 47 47  47 47 47
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  47 47 47  47 47 47
-+47 47 47  47 47 47  47 47 47  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  47 47 47  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  47 47 47  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  47 47 47  47 47 47  47 47 47
-+47 47 47  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  47 47 47  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  47 47 47  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  47 47 47  47 47 47  47 47 47  46 46 46
-+46 46 46  46 46 46  46 46 46  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  47 47 47  47 47 47  47 47 47  47 47 47
-+47 47 47  46 46 46  47 47 47  47 47 47  46 46 46  46 46 46
-+46 46 46  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  46 46 46  46 46 46  47 47 47
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  46 46 46  46 46 46
-+46 46 46  46 46 46  46 46 46  46 46 46  47 47 47  47 47 47
-+47 47 47  47 47 47  49 49 49  47 47 47  49 49 49  49 49 49
-+49 49 49  49 49 49  49 49 49  47 47 47  47 47 47  47 47 47
-+47 47 47  47 47 47  46 46 46  46 46 46  45 45 45  45 45 45
-+43 43 43  43 43 43  43 43 43  41 41 41  41 41 41  39 39 39
-+37 37 37  35 35 35  35 35 35  33 33 33  30 30 30  30 30 30
-+27 27 27  26 26 26  24 24 24  22 22 22  20 20 20  18 18 18
-+16 16 16  15 14 14  13 13 13  11 11 11  9 9 9  8 8 8
-+6 6 6  5 5 5  3 3 3  2 2 2  1 1 1  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+1 1 1  2 2 2  3 3 3  4 4 4  5 5 5  7 7 7
-+8 8 8  10 10 10  12 12 12  13 13 13  15 14 14  17 17 17
-+19 19 19  20 20 20  22 22 22  24 24 24  26 26 26  27 27 27
-+30 30 30  30 30 30  32 32 32  35 35 35  35 35 35  37 37 37
-+38 38 38  39 39 39  39 39 39  42 42 42  42 42 42  42 42 42
-+43 43 43  43 43 43  43 43 43  46 46 46  45 45 45  46 46 46
-+47 47 47  47 47 47  49 49 49  50 50 50  52 52 52  52 52 52
-+52 52 52  52 52 52  65 65 65  52 52 52  52 52 52  52 52 52
-+52 52 52  65 65 65  52 52 52  65 65 65  66 66 66  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+52 52 52  65 65 65  52 52 52  65 65 65  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  50 50 50  49 49 49  47 47 47
-+47 47 47  46 46 46  45 45 45  45 45 45  45 45 45  43 43 43
-+43 43 43  43 43 43  43 43 43  42 42 42  42 42 42  42 42 42
-+42 42 42  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+45 45 45  43 43 43  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  45 45 45  45 45 45
-+43 43 43  45 45 45  43 43 43  45 45 45  43 43 43  45 45 45
-+45 45 45  43 43 43  45 45 45  45 45 45  43 43 43  45 45 45
-+43 43 43  45 45 45  43 43 43  45 45 45  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  45 45 45  43 43 43  45 45 45
-+43 43 43  45 45 45  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  45 45 45  43 43 43
-+45 45 45  43 43 43  45 45 45  43 43 43  45 45 45  43 43 43
-+45 45 45  45 45 45  45 45 45  43 43 43  45 45 45  43 43 43
-+43 43 43  43 43 43  43 43 43  45 45 45  43 43 43  45 45 45
-+43 43 43  45 45 45  43 43 43  45 45 45  43 43 43  45 45 45
-+45 45 45  43 43 43  45 45 45  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  43 43 43  43 43 43
-+43 43 43  43 43 43  43 43 43  43 43 43  45 45 45  43 43 43
-+45 45 45  45 45 45  45 45 45  45 45 45  45 45 45  45 45 45
-+43 43 43  45 45 45  45 45 45  45 45 45  45 45 45  46 46 46
-+43 43 43  45 45 45  43 43 43  43 43 43  43 43 43  42 42 42
-+43 43 43  41 41 41  41 41 41  39 39 39  38 38 38  35 35 35
-+35 35 35  35 35 35  32 32 32  30 30 30  30 30 30  27 27 27
-+26 26 26  24 24 24  22 22 22  20 20 20  19 19 19  17 17 17
-+15 14 14  13 13 13  12 12 12  10 10 10  8 8 8  7 7 7
-+5 5 5  4 4 4  3 3 3  2 2 2  1 1 1  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
-+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  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  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  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  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  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
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  1 1 1  2 2 2  3 3 3  5 5 5  6 6 6
-+7 7 7  9 9 9  10 10 10  12 12 12  14 14 14  16 16 16
-+17 17 17  19 19 19  20 20 20  22 22 22  24 24 24  25 25 25
-+27 27 27  28 28 28  30 30 30  30 30 30  33 33 33  35 35 35
-+35 35 35  35 35 35  38 38 38  38 38 38  39 39 39  39 39 39
-+41 41 41  41 41 41  43 43 43  42 42 42  43 43 43  45 45 45
-+45 45 45  45 45 45  46 46 46  47 47 47  47 47 47  49 49 49
-+49 49 49  50 50 50  52 52 52  52 52 52  52 52 52  52 52 52
-+65 65 65  52 52 52  52 52 52  65 65 65  52 52 52  200 196 176
-+255 255 255  255 255 255  255 255 255  255 255 255  249 249 249  200 196 176
-+52 52 52  52 52 52  52 52 52  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  49 49 49  47 47 47  46 46 46  45 45 45
-+43 43 43  43 43 43  43 43 43  42 42 42  42 42 42  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  39 39 39  41 41 41  39 39 39
-+41 41 41  39 39 39  41 41 41  41 41 41  41 41 41  42 42 42
-+42 42 42  42 42 42  42 42 42  42 42 42  42 42 42  42 42 42
-+42 42 42  42 42 42  43 43 43  43 43 43  43 43 43  42 42 42
-+42 42 42  42 42 42  42 42 42  42 42 42  41 41 41  42 42 42
-+42 42 42  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+42 42 42  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  42 42 42  43 43 43  42 42 42  42 42 42  42 42 42
-+42 42 42  42 42 42  42 42 42  42 42 42  43 43 43  42 42 42
-+42 42 42  42 42 42  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  42 42 42  41 41 41  42 42 42  41 41 41  42 42 42
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  42 42 42
-+43 43 43  41 41 41  42 42 42  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  39 39 39  41 41 41  39 39 39  41 41 41
-+41 41 41  41 41 41  42 42 42  42 42 42  42 42 42  42 42 42
-+42 42 42  43 43 43  42 42 42  43 43 43  42 42 42  42 42 42
-+42 42 42  42 42 42  41 41 41  41 41 41  41 41 41  41 41 41
-+42 42 42  41 41 41  42 42 42  41 41 41  42 42 42  42 42 42
-+43 43 43  42 42 42  42 42 42  42 42 42  43 43 43  42 42 42
-+42 42 42  42 42 42  41 41 41  42 42 42  41 41 41  41 41 41
-+41 41 41  39 39 39  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  39 39 39
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+41 41 41  41 41 41  42 42 42  41 41 41  39 39 39  41 41 41
-+41 41 41  41 41 41  41 41 41  41 41 41  41 41 41  43 43 43
-+42 42 42  42 42 42  42 42 42  42 42 42  42 42 42  42 42 42
-+43 43 43  42 42 42  42 42 42  42 42 42  42 42 42  42 42 42
-+43 43 43  41 41 41  41 41 41  41 41 41  41 41 41  39 39 39
-+39 39 39  38 38 38  37 37 37  37 37 37  35 35 35  33 33 33
-+33 33 33  30 30 30  30 30 30  28 28 28  27 27 27  25 25 25
-+24 24 24  22 22 22  20 20 20  19 19 19  17 17 17  16 16 16
-+14 14 14  12 12 12  10 10 10  9 9 9  7 7 7  6 6 6
-+4 4 4  3 3 3  2 2 2  1 1 1  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  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
-+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  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  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  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  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  0 0 0
-+0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  1 1 1  2 2 2  3 3 3  4 4 4  5 5 5
-+6 6 6  8 8 8  9 9 9  11 11 11  13 13 13  14 14 14
-+16 16 16  17 17 17  19 19 19  20 20 20  22 22 22  24 24 24
-+25 25 25  26 26 26  28 28 28  30 30 30  30 30 30  32 32 32
-+33 33 33  35 35 35  35 35 35  35 35 35  37 37 37  37 37 37
-+37 37 37  38 38 38  39 39 39  39 39 39  41 41 41  41 41 41
-+42 42 42  43 43 43  45 45 45  45 45 45  46 46 46  47 47 47
-+47 47 47  47 47 47  49 49 49  52 52 52  52 52 52  52 52 52
-+52 52 52  52 52 52  52 52 52  52 52 52  65 65 65  200 196 176
-+255 255 255  255 255 255  255 255 255  249 249 249  249 249 249  200 196 176
-+65 65 65  52 52 52  52 52 52  52 52 52  52 52 52  50 50 50
-+49 49 49  47 47 47  46 46 46  45 45 45  45 45 45  43 43 43
-+42 42 42  42 42 42  39 39 39  41 41 41  39 39 39  39 39 39
-+38 38 38  38 38 38  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  38 38 38  38 38 38  38 38 38  38 38 38
-+39 39 39  39 39 39  39 39 39  39 39 39  39 39 39  39 39 39
-+39 39 39  41 41 41  41 41 41  41 41 41  41 41 41  41 41 41
-+39 39 39  39 39 39  39 39 39  39 39 39  39 39 39  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  39 39 39  38 38 38  38 38 38  38 38 38  38 38 38
-+39 39 39  39 39 39  39 39 39  39 39 39  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  39 39 39  39 39 39  39 39 39
-+39 39 39  39 39 39  38 38 38  38 38 38  39 39 39  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  39 39 39
-+38 38 38  38 38 38  38 38 38  38 38 38  39 39 39  39 39 39
-+39 39 39  39 39 39  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  39 39 39  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  39 39 39  38 38 38  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  39 39 39  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  38 38 38  38 38 38  38 38 38
-+38 38 38  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  38 38 38
-+38 38 38  38 38 38  38 38 38  38 38 38  38 38 38  39 39 39
-+39 39 39  39 39 39  39 39 39  39 39 39  41 41 41  39 39 39
-+41 41 41  39 39 39  39 39 39  39 39 39  39 39 39  39 39 39
-+39 39 39  38 38 38  38 38 38  38 38 38  37 37 37  37 37 37
-+37 37 37  35 35 35  35 35 35  35 35 35  33 33 33  32 32 32
-+30 30 30  30 30 30  28 28 28  26 26 26  25 25 25  24 24 24
-+22 22 22  20 20 20  19 19 19  17 17 17  16 16 16  14 14 14
-+12 12 12  11 11 11  9 9 9  8 8 8  6 6 6  5 5 5
-+4 4 4  3 3 3  2 2 2  1 1 1  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  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
-+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  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  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  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  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  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  1 1 1  2 2 2  3 3 3  4 4 4
-+5 5 5  7 7 7  8 8 8  10 10 10  11 11 11  13 13 13
-+14 14 14  16 16 16  17 17 17  18 18 18  20 20 20  21 21 21
-+24 24 24  24 24 24  25 25 25  27 27 27  28 28 28  28 28 28
-+30 30 30  30 30 30  32 32 32  33 33 33  33 33 33  35 35 35
-+35 35 35  35 35 35  37 37 37  37 37 37  38 38 38  39 39 39
-+41 41 41  39 39 39  42 42 42  42 42 42  43 43 43  45 45 45
-+45 45 45  46 46 46  47 47 47  47 47 47  49 49 49  50 50 50
-+50 50 50  52 52 52  52 52 52  52 52 52  52 52 52  200 196 176
-+249 249 249  255 255 255  255 255 255  255 255 255  249 249 249  192 187 164
-+49 49 49  52 52 52  52 52 52  52 52 52  49 49 49  47 47 47
-+46 46 46  45 45 45  43 43 43  43 43 43  42 42 42  41 41 41
-+41 41 41  39 39 39  38 38 38  37 37 37  37 37 37  37 37 37
-+35 35 35  35 35 35  35 35 35  33 33 33  35 35 35  33 33 33
-+35 35 35  33 33 33  35 35 35  35 35 35  33 33 33  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+37 37 37  35 35 35  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  35 35 35  37 37 37  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  37 37 37
-+35 35 35  37 37 37  37 37 37  35 35 35  37 37 37  35 35 35
-+37 37 37  35 35 35  37 37 37  35 35 35  37 37 37  35 35 35
-+37 37 37  35 35 35  37 37 37  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  37 37 37  35 35 35
-+37 37 37  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  37 37 37  35 35 35
-+37 37 37  35 35 35  37 37 37  35 35 35  37 37 37  35 35 35
-+37 37 37  37 37 37  35 35 35  37 37 37  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  37 37 37  37 37 37
-+35 35 35  37 37 37  35 35 35  37 37 37  35 35 35  37 37 37
-+37 37 37  35 35 35  37 37 37  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  33 33 33  33 33 33
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  35 35 35  35 35 35
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  37 37 37
-+37 37 37  37 37 37  37 37 37  37 37 37  37 37 37  35 35 35
-+37 37 37  35 35 35  35 35 35  35 35 35  35 35 35  33 33 33
-+33 33 33  33 33 33  32 32 32  30 30 30  30 30 30  30 30 30
-+28 28 28  27 27 27  25 25 25  24 24 24  24 24 24  21 21 21
-+20 20 20  18 18 18  17 17 17  16 16 16  14 14 14  13 13 13
-+11 11 11  10 10 10  8 8 8  7 7 7  5 5 5  4 4 4
-+3 3 3  2 2 2  1 1 1  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  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  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
-+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  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  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  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  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  1 1 1  1 1 1  3 3 3  3 3 3
-+4 4 4  6 6 6  7 7 7  8 8 8  10 10 10  11 11 11
-+13 13 13  14 14 14  16 16 16  17 17 17  18 18 18  20 20 20
-+21 21 21  22 22 22  22 22 22  25 25 25  26 26 26  27 27 27
-+28 28 28  28 28 28  30 30 30  30 30 30  30 30 30  32 32 32
-+32 32 32  33 33 33  33 33 33  35 35 35  35 35 35  35 35 35
-+37 37 37  38 38 38  39 39 39  41 41 41  41 41 41  42 42 42
-+43 43 43  43 43 43  45 45 45  45 45 45  46 46 46  47 47 47
-+47 47 47  49 49 49  50 50 50  52 52 52  52 52 52  200 196 176
-+255 255 255  255 255 255  255 255 255  249 249 249  249 249 249  200 196 176
-+49 49 49  50 50 50  49 49 49  47 47 47  46 46 46  45 45 45
-+43 43 43  42 42 42  41 41 41  41 41 41  39 39 39  38 38 38
-+37 37 37  35 35 35  35 35 35  35 35 35  33 33 33  33 33 33
-+33 33 33  32 32 32  32 32 32  32 32 32  30 30 30  32 32 32
-+30 30 30  32 32 32  30 30 30  30 30 30  30 30 30  32 32 32
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  33 33 33
-+33 33 33  33 33 33  33 33 33  35 35 35  33 33 33  35 35 35
-+33 33 33  35 35 35  33 33 33  35 35 35  33 33 33  35 35 35
-+35 35 35  35 35 35  35 35 35  33 33 33  33 33 33  33 33 33
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  33 33 33
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  32 32 32
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  32 32 32
-+33 33 33  32 32 32  32 32 32  33 33 33  33 33 33  32 32 32
-+32 32 32  32 32 32  32 32 32  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  32 32 32
-+33 33 33  32 32 32  32 32 32  32 32 32  32 32 32  32 32 32
-+32 32 32  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  32 32 32  32 32 32
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  32 32 32
-+32 32 32  32 32 32  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+32 32 32  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  33 33 33  33 33 33  32 32 32
-+32 32 32  32 32 32  32 32 32  30 30 30  30 30 30  32 32 32
-+30 30 30  32 32 32  32 32 32  32 32 32  32 32 32  32 32 32
-+32 32 32  32 32 32  33 33 33  33 33 33  32 32 32  32 32 32
-+32 32 32  32 32 32  32 32 32  32 32 32  32 32 32  32 32 32
-+32 32 32  32 32 32  32 32 32  33 33 33  33 33 33  33 33 33
-+33 33 33  35 35 35  33 33 33  35 35 35  33 33 33  35 35 35
-+35 35 35  35 35 35  35 35 35  33 33 33  35 35 35  33 33 33
-+33 33 33  33 33 33  33 33 33  32 32 32  32 32 32  32 32 32
-+30 30 30  30 30 30  30 30 30  28 28 28  28 28 28  27 27 27
-+26 26 26  25 25 25  22 22 22  22 22 22  21 21 21  20 20 20
-+18 18 18  17 17 17  16 16 16  14 14 14  13 13 13  11 11 11
-+10 10 10  8 8 8  7 7 7  6 6 6  4 4 4  3 3 3
-+2 2 2  1 1 1  1 1 1  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  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  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
-+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  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  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  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  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  1 1 1  2 2 2  3 3 3
-+4 4 4  5 5 5  6 6 6  7 7 7  8 8 8  10 10 10
-+11 11 11  12 12 12  14 14 14  15 14 14  16 16 16  18 18 18
-+19 19 19  20 20 20  21 21 21  22 22 22  24 24 24  25 25 25
-+25 25 25  26 26 26  27 27 27  27 27 27  28 28 28  28 28 28
-+28 28 28  30 30 30  32 32 32  32 32 32  33 33 33  35 35 35
-+35 35 35  35 35 35  35 35 35  37 37 37  38 38 38  39 39 39
-+41 41 41  41 41 41  42 42 42  43 43 43  43 43 43  45 45 45
-+45 45 45  47 47 47  46 46 46  47 47 47  47 47 47  140 134 120
-+192 187 164  192 187 164  185 178 149  192 187 164  192 187 164  140 134 120
-+41 41 41  46 46 46  45 45 45  43 43 43  43 43 43  42 42 42
-+41 41 41  41 41 41  39 39 39  38 38 38  37 37 37  35 35 35
-+35 35 35  35 35 35  33 33 33  32 32 32  30 30 30  32 32 32
-+30 30 30  30 30 30  28 28 28  30 30 30  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  30 30 30
-+28 28 28  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  32 32 32  30 30 30  32 32 32  30 30 30  32 32 32
-+30 30 30  32 32 32  30 30 30  32 32 32  30 30 30  32 32 32
-+30 30 30  30 30 30  32 32 32  32 32 32  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  28 28 28  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  32 32 32  32 32 32  30 30 30  32 32 32  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  28 28 28  30 30 30  28 28 28  30 30 30
-+28 28 28  30 30 30  28 28 28  30 30 30  28 28 28  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  30 30 30
-+30 30 30  30 30 30  32 32 32  30 30 30  32 32 32  30 30 30
-+30 30 30  30 30 30  30 30 30  32 32 32  30 30 30  32 32 32
-+30 30 30  30 30 30  30 30 30  30 30 30  30 30 30  28 28 28
-+28 28 28  27 27 27  27 27 27  26 26 26  25 25 25  25 25 25
-+24 24 24  22 22 22  21 21 21  20 20 20  19 19 19  17 17 17
-+16 16 16  15 14 14  13 13 13  12 12 12  11 11 11  10 10 10
-+8 8 8  7 7 7  6 6 6  5 5 5  3 3 3  3 3 3
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  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  1 1 1  2 2 2
-+3 3 3  4 4 4  5 5 5  6 6 6  7 7 7  8 8 8
-+10 10 10  11 11 11  12 12 12  13 13 13  15 14 14  16 16 16
-+17 17 17  18 18 18  19 19 19  20 20 20  21 21 21  21 21 21
-+24 24 24  24 24 24  25 25 25  25 25 25  25 25 25  26 26 26
-+27 27 27  27 27 27  28 28 28  30 30 30  30 30 30  32 32 32
-+32 32 32  33 33 33  35 35 35  35 35 35  35 35 35  37 37 37
-+37 37 37  38 38 38  39 39 39  41 41 41  41 41 41  42 42 42
-+42 42 42  43 43 43  45 45 45  43 43 43  46 46 46  45 45 45
-+41 41 41  39 39 39  41 41 41  38 38 38  37 37 37  39 39 39
-+43 43 43  43 43 43  43 43 43  43 43 43  41 41 41  39 39 39
-+38 38 38  37 37 37  35 35 35  35 35 35  35 35 35  33 33 33
-+32 32 32  30 30 30  30 30 30  30 30 30  30 30 30  28 28 28
-+27 27 27  27 27 27  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  27 27 27  27 27 27  27 27 27
-+27 27 27  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  27 27 27
-+28 28 28  27 27 27  28 28 28  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  28 28 28  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  30 30 30  28 28 28  28 28 28  28 28 28  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  27 27 27  28 28 28  28 28 28  28 28 28
-+27 27 27  27 27 27  27 27 27  28 28 28  27 27 27  28 28 28
-+27 27 27  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+26 26 26  26 26 26  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  26 26 26  26 26 26  26 26 26  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  27 27 27
-+27 27 27  27 27 27  27 27 27  27 27 27  27 27 27  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  27 27 27  27 27 27  27 27 27  26 26 26  26 26 26
-+25 25 25  25 25 25  25 25 25  24 24 24  22 22 22  22 22 22
-+21 21 21  20 20 20  19 19 19  18 18 18  17 17 17  16 16 16
-+15 14 14  13 13 13  12 12 12  11 11 11  9 9 9  8 8 8
-+7 7 7  6 6 6  5 5 5  4 4 4  3 3 3  2 2 2
-+1 1 1  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  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  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  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  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
-+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  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  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  1 1 1
-+2 2 2  3 3 3  4 4 4  5 5 5  6 6 6  7 7 7
-+8 8 8  9 9 9  10 10 10  11 11 11  13 13 13  14 14 14
-+15 14 14  16 16 16  17 17 17  18 18 18  19 19 19  20 20 20
-+20 20 20  21 21 21  22 22 22  22 22 22  22 22 22  24 24 24
-+24 24 24  25 25 25  26 26 26  26 26 26  27 27 27  28 28 28
-+30 30 30  30 30 30  30 30 30  33 33 33  33 33 33  35 35 35
-+35 35 35  35 35 35  37 37 37  37 37 37  38 38 38  39 39 39
-+41 41 41  39 39 39  41 41 41  42 42 42  43 43 43  42 42 42
-+42 42 42  42 42 42  42 42 42  42 42 42  42 42 42  42 42 42
-+41 41 41  41 41 41  41 41 41  39 39 39  38 38 38  37 37 37
-+37 37 37  35 35 35  33 33 33  32 32 32  32 32 32  30 30 30
-+30 30 30  28 28 28  28 28 28  27 27 27  26 26 26  25 25 25
-+25 25 25  24 24 24  24 24 24  22 22 22  24 24 24  22 22 22
-+24 24 24  22 22 22  24 24 24  22 22 22  24 24 24  22 22 22
-+24 24 24  22 22 22  24 24 24  24 24 24  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  26 26 26
-+26 26 26  26 26 26  26 26 26  26 26 26  26 26 26  26 26 26
-+26 26 26  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+25 25 25  24 24 24  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  26 26 26  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+24 24 24  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  25 25 25  25 25 25  24 24 24
-+24 24 24  24 24 24  22 22 22  24 24 24  22 22 22  24 24 24
-+22 22 22  24 24 24  22 22 22  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  26 26 26  26 26 26  26 26 26
-+26 26 26  26 26 26  25 25 25  25 25 25  25 25 25  25 25 25
-+25 25 25  25 25 25  25 25 25  24 24 24  24 24 24  24 24 24
-+24 24 24  22 22 22  22 22 22  21 21 21  20 20 20  20 20 20
-+19 19 19  18 18 18  17 17 17  16 16 16  15 14 14  14 14 14
-+13 13 13  11 11 11  10 10 10  9 9 9  8 8 8  7 7 7
-+6 6 6  5 5 5  4 4 4  3 3 3  2 2 2  1 1 1
-+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  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  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  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  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  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
-+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  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  1 1 1
-+1 1 1  2 2 2  3 3 3  4 4 4  5 5 5  5 5 5
-+6 6 6  8 8 8  9 9 9  10 10 10  11 11 11  12 12 12
-+13 13 13  14 14 14  15 14 14  16 16 16  17 17 17  17 17 17
-+18 18 18  19 19 19  20 20 20  20 20 20  20 20 20  21 21 21
-+21 21 21  22 22 22  24 24 24  24 24 24  25 25 25  26 26 26
-+27 27 27  28 28 28  28 28 28  30 30 30  30 30 30  30 30 30
-+32 32 32  33 33 33  35 35 35  35 35 35  35 35 35  35 35 35
-+37 37 37  38 38 38  38 38 38  39 39 39  39 39 39  39 39 39
-+39 39 39  39 39 39  39 39 39  39 39 39  39 39 39  39 39 39
-+39 39 39  38 38 38  37 37 37  37 37 37  35 35 35  35 35 35
-+33 33 33  33 33 33  30 30 30  30 30 30  30 30 30  28 28 28
-+27 27 27  26 26 26  25 25 25  24 24 24  22 22 22  24 24 24
-+22 22 22  21 21 21  21 21 21  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  21 21 21  21 21 21  21 21 21  21 21 21  22 22 22
-+22 22 22  22 22 22  22 22 22  24 24 24  22 22 22  24 24 24
-+24 24 24  22 22 22  24 24 24  24 24 24  24 24 24  22 22 22
-+24 24 24  22 22 22  24 24 24  24 24 24  22 22 22  22 22 22
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  22 22 22  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  22 22 22  22 22 22  22 22 22
-+21 21 21  21 21 21  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  22 22 22  22 22 22  22 22 22
-+22 22 22  22 22 22  22 22 22  22 22 22  22 22 22  21 21 21
-+21 21 21  21 21 21  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  21 21 21  21 21 21
-+21 21 21  21 21 21  21 21 21  21 21 21  22 22 22  22 22 22
-+24 24 24  22 22 22  24 24 24  22 22 22  24 24 24  22 22 22
-+24 24 24  24 24 24  24 24 24  24 24 24  24 24 24  22 22 22
-+22 22 22  22 22 22  22 22 22  21 21 21  21 21 21  20 20 20
-+20 20 20  20 20 20  20 20 20  19 19 19  18 18 18  17 17 17
-+17 17 17  16 16 16  15 14 14  14 14 14  13 13 13  12 12 12
-+11 11 11  10 10 10  9 9 9  8 8 8  6 6 6  5 5 5
-+5 5 5  4 4 4  3 3 3  2 2 2  1 1 1  1 1 1
-+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  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  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  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  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  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
-+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  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
-+1 1 1  1 1 1  2 2 2  3 3 3  3 3 3  4 4 4
-+5 5 5  6 6 6  7 7 7  8 8 8  9 9 9  10 10 10
-+11 11 11  12 12 12  13 13 13  14 14 14  15 14 14  15 14 14
-+16 16 16  16 16 16  17 17 17  18 18 18  18 18 18  18 18 18
-+19 19 19  20 20 20  20 20 20  21 21 21  22 22 22  24 24 24
-+24 24 24  25 25 25  26 26 26  27 27 27  28 28 28  28 28 28
-+30 30 30  30 30 30  32 32 32  32 32 32  33 33 33  35 35 35
-+35 35 35  35 35 35  35 35 35  35 35 35  37 37 37  35 35 35
-+37 37 37  37 37 37  37 37 37  35 35 35  37 37 37  35 35 35
-+37 37 37  35 35 35  35 35 35  33 33 33  33 33 33  32 32 32
-+30 30 30  30 30 30  28 28 28  27 27 27  26 26 26  25 25 25
-+24 24 24  24 24 24  22 22 22  21 21 21  21 21 21  20 20 20
-+19 19 19  19 19 19  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  19 19 19  19 19 19  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+19 19 19  19 19 19  19 19 19  19 19 19  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  18 18 18  18 18 18  19 19 19
-+19 19 19  19 19 19  19 19 19  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  18 18 18  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  21 21 21  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  20 20 20  20 20 20
-+20 20 20  20 20 20  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  18 18 18  18 18 18  18 18 18  18 18 18  18 18 18
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  18 18 18  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  18 18 18  18 18 18  19 19 19
-+19 19 19  19 19 19  19 19 19  19 19 19  19 19 19  19 19 19
-+19 19 19  19 19 19  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  19 19 19  19 19 19  19 19 19  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  20 20 20  20 20 20  20 20 20  20 20 20
-+20 20 20  20 20 20  19 19 19  19 19 19  19 19 19  18 18 18
-+18 18 18  18 18 18  17 17 17  16 16 16  16 16 16  16 16 16
-+14 14 14  14 14 14  13 13 13  12 12 12  11 11 11  10 10 10
-+9 9 9  8 8 8  7 7 7  6 6 6  5 5 5  4 4 4
-+3 3 3  3 3 3  2 2 2  1 1 1  1 1 1  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
-+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  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  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  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  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  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
-+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  1 1 1  1 1 1  2 2 2  3 3 3  3 3 3
-+4 4 4  5 5 5  6 6 6  7 7 7  8 8 8  8 8 8
-+9 9 9  10 10 10  11 11 11  12 12 12  13 13 13  13 13 13
-+14 14 14  14 14 14  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  17 17 17  18 18 18  19 19 19  20 20 20  20 20 20
-+21 21 21  22 22 22  24 24 24  24 24 24  25 25 25  26 26 26
-+27 27 27  28 28 28  28 28 28  30 30 30  30 30 30  30 30 30
-+32 32 32  32 32 32  33 33 33  33 33 33  33 33 33  33 33 33
-+33 33 33  33 33 33  33 33 33  35 35 35  35 35 35  33 33 33
-+33 33 33  33 33 33  33 33 33  30 30 30  30 30 30  30 30 30
-+28 28 28  27 27 27  26 26 26  25 25 25  24 24 24  24 24 24
-+21 21 21  21 21 21  20 20 20  19 19 19  18 18 18  17 17 17
-+16 16 16  16 16 16  16 16 16  16 16 16  14 14 14  16 16 16
-+14 14 14  16 16 16  14 14 14  16 16 16  14 14 14  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  17 17 17  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  14 14 14  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  18 18 18  18 18 18  18 18 18  18 18 18
-+18 18 18  18 18 18  18 18 18  17 17 17  17 17 17  17 17 17
-+17 17 17  17 17 17  17 17 17  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  16 16 16  14 14 14  14 14 14  13 13 13
-+13 13 13  12 12 12  11 11 11  10 10 10  9 9 9  8 8 8
-+8 8 8  7 7 7  6 6 6  5 5 5  4 4 4  3 3 3
-+3 3 3  2 2 2  1 1 1  1 1 1  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  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
-+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  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  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  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  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  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  1 1 1  2 2 2  2 2 2
-+3 3 3  4 4 4  4 4 4  5 5 5  6 6 6  7 7 7
-+8 8 8  8 8 8  9 9 9  10 10 10  10 10 10  11 11 11
-+11 11 11  12 12 12  13 13 13  13 13 13  13 13 13  14 14 14
-+14 14 14  14 14 14  16 16 16  16 16 16  17 17 17  18 18 18
-+19 19 19  20 20 20  21 21 21  21 21 21  24 24 24  22 22 22
-+24 24 24  25 25 25  26 26 26  27 27 27  27 27 27  28 28 28
-+30 30 30  30 30 30  30 30 30  32 32 32  32 32 32  30 30 30
-+32 32 32  30 30 30  32 32 32  30 30 30  30 30 30  32 32 32
-+30 30 30  30 30 30  30 30 30  28 28 28  28 28 28  27 27 27
-+26 26 26  25 25 25  24 24 24  22 22 22  21 21 21  20 20 20
-+19 19 19  18 18 18  17 17 17  16 16 16  16 16 16  16 16 16
-+14 14 14  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  14 14 14  14 14 14  14 14 14  16 16 16
-+14 14 14  16 16 16  14 14 14  16 16 16  14 14 14  16 16 16
-+14 14 14  16 16 16  14 14 14  16 16 16  14 14 14  16 16 16
-+14 14 14  16 16 16  14 14 14  16 16 16  14 14 14  16 16 16
-+14 14 14  14 14 14  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+14 14 14  14 14 14  16 16 16  16 16 16  16 16 16  16 16 16
-+16 16 16  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+14 14 14  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  14 14 14  14 14 14  16 16 16  14 14 14
-+16 16 16  14 14 14  16 16 16  14 14 14  16 16 16  14 14 14
-+16 16 16  14 14 14  16 16 16  14 14 14  16 16 16  14 14 14
-+16 16 16  14 14 14  14 14 14  14 14 14  14 14 14  14 14 14
-+13 13 13  13 13 13  13 13 13  12 12 12  11 11 11  11 11 11
-+10 10 10  10 10 10  9 9 9  8 8 8  8 8 8  7 7 7
-+6 6 6  5 5 5  4 4 4  4 4 4  3 3 3  2 2 2
-+2 2 2  1 1 1  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  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  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  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
-+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  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  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  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  1 1 1  1 1 1
-+2 2 2  3 3 3  3 3 3  4 4 4  4 4 4  5 5 5
-+6 6 6  6 6 6  7 7 7  8 8 8  9 9 9  9 9 9
-+10 10 10  10 10 10  10 10 10  11 11 11  11 11 11  11 11 11
-+12 12 12  12 12 12  13 13 13  14 14 14  16 16 16  16 16 16
-+16 16 16  17 17 17  18 18 18  19 19 19  20 20 20  21 21 21
-+21 21 21  22 22 22  24 24 24  24 24 24  25 25 25  25 25 25
-+26 26 26  27 27 27  27 27 27  28 28 28  28 28 28  28 28 28
-+28 28 28  28 28 28  28 28 28  28 28 28  28 28 28  28 28 28
-+28 28 28  27 27 27  27 27 27  26 26 26  25 25 25  25 25 25
-+22 22 22  22 22 22  21 21 21  20 20 20  19 19 19  18 18 18
-+17 17 17  16 16 16  14 14 14  14 14 14  13 13 13  12 12 12
-+11 11 11  11 11 11  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+11 11 11  11 11 11  11 11 11  12 12 12  12 12 12  12 12 12
-+12 12 12  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  12 12 12
-+12 12 12  12 12 12  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  12 12 12
-+12 12 12  12 12 12  12 12 12  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  10 10 10  10 10 10
-+10 10 10  10 10 10  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  11 11 11  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  12 12 12  12 12 12  12 12 12  12 12 12
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+13 13 13  13 13 13  13 13 13  13 13 13  13 13 13  13 13 13
-+12 12 12  12 12 12  12 12 12  12 12 12  12 12 12  11 11 11
-+11 11 11  11 11 11  10 10 10  10 10 10  10 10 10  9 9 9
-+9 9 9  8 8 8  7 7 7  6 6 6  6 6 6  5 5 5
-+4 4 4  4 4 4  3 3 3  3 3 3  2 2 2  1 1 1
-+1 1 1  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  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  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  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  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
-+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  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  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  0 0 0  0 0 0  1 1 1
-+1 1 1  2 2 2  2 2 2  3 3 3  3 3 3  4 4 4
-+4 4 4  5 5 5  5 5 5  6 6 6  7 7 7  7 7 7
-+8 8 8  8 8 8  9 9 9  9 9 9  9 9 9  9 9 9
-+10 10 10  10 10 10  10 10 10  11 11 11  12 12 12  13 13 13
-+14 14 14  16 16 16  16 16 16  16 16 16  17 17 17  18 18 18
-+19 19 19  20 20 20  21 21 21  21 21 21  22 22 22  24 24 24
-+24 24 24  25 25 25  25 25 25  25 25 25  26 26 26  27 27 27
-+26 26 26  27 27 27  26 26 26  27 27 27  26 26 26  26 26 26
-+26 26 26  25 25 25  25 25 25  24 24 24  24 24 24  22 22 22
-+21 21 21  20 20 20  19 19 19  18 18 18  16 16 16  16 16 16
-+14 14 14  13 13 13  12 12 12  11 11 11  10 10 10  10 10 10
-+9 9 9  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
-+9 9 9  9 9 9  9 9 9  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  11 11 11  11 11 11  11 11 11
-+11 11 11  11 11 11  10 10 10  10 10 10  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  9 9 9
-+9 9 9  9 9 9  9 9 9  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  8 8 8  8 8 8
-+8 8 8  8 8 8  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  9 9 9  9 9 9  9 9 9
-+9 9 9  9 9 9  9 9 9  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  10 10 10
-+10 10 10  10 10 10  10 10 10  10 10 10  10 10 10  9 9 9
-+9 9 9  9 9 9  9 9 9  8 8 8  8 8 8  7 7 7
-+7 7 7  6 6 6  5 5 5  5 5 5  4 4 4  4 4 4
-+3 3 3  3 3 3  2 2 2  2 2 2  1 1 1  1 1 1
-+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  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  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  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  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  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
-+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  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  0 0 0  0 0 0  0 0 0  0 0 0
-+0 0 0  1 1 1  1 1 1  2 2 2  2 2 2  3 3 3
-+3 3 3  4 4 4  4 4 4  5 5 5  5 5 5  5 5 5
-+6 6 6  6 6 6  7 7 7  7 7 7  7 7 7  7 7 7
-+8 8 8  8 8 8  8 8 8  9 9 9  10 10 10  10 10 10
-+11 11 11  12 12 12  13 13 13  14 14 14  14 14 14  16 16 16
-+17 17 17  17 17 17  18 18 18  19 19 19  20 20 20  20 20 20
-+21 21 21  22 22 22  22 22 22  22 22 22  24 24 24  24 24 24
-+24 24 24  24 24 24  24 24 24  25 25 25  24 24 24  24 24 24
-+22 22 22  24 24 24  22 22 22  21 21 21  20 20 20  20 20 20
-+18 18 18  17 17 17  16 16 16  16 16 16  14 14 14  13 13 13
-+12 12 12  11 11 11  10 10 10  9 9 9  8 8 8  7 7 7
-+6 6 6  6 6 6  5 5 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
-+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  9 9 9  9 9 9  9 9 9  8 8 8  8 8 8
-+8 8 8  8 8 8  7 7 7  8 8 8  8 8 8  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
-+7 7 7  7 7 7  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  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  8 8 8  8 8 8  8 8 8
-+8 8 8  8 8 8  8 8 8  8 8 8  8 8 8  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  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 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  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  7 7 7
-+7 7 7  7 7 7  7 7 7  6 6 6  6 6 6  5 5 5
-+5 5 5  5 5 5  4 4 4  4 4 4  3 3 3  3 3 3
-+2 2 2  2 2 2  1 1 1  1 1 1  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  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
-+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  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  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  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  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  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
-+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  1 1 1  1 1 1  2 2 2
-+2 2 2  3 3 3  3 3 3  3 3 3  4 4 4  4 4 4
-+4 4 4  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  7 7 7  8 8 8
-+9 9 9  10 10 10  11 11 11  11 11 11  13 13 13  13 13 13
-+14 14 14  14 14 14  16 16 16  16 16 16  17 17 17  18 18 18
-+19 19 19  20 20 20  20 20 20  20 20 20  21 21 21  21 21 21
-+22 22 22  22 22 22  22 22 22  22 22 22  21 21 21  21 21 21
-+22 22 22  20 20 20  20 20 20  19 19 19  18 18 18  17 17 17
-+16 16 16  16 16 16  14 14 14  13 13 13  12 12 12  11 11 11
-+10 10 10  9 9 9  8 8 8  6 6 6  5 5 5  5 5 5
-+4 4 4  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  4 4 4  4 4 4  4 4 4  4 4 4  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 6  6 6 6  6 6 6  7 7 7
-+7 7 7  7 7 7  6 6 6  6 6 6  6 6 6  7 7 7
-+7 7 7  6 6 6  6 6 6  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 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  7 7 7  7 7 7  7 7 7  7 7 7
-+7 7 7  7 7 7  6 6 6  6 6 6  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 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  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 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  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  5 5 5  5 5 5
-+5 5 5  5 5 5  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  5 5 5  5 5 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 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  5 5 5
-+5 5 5  5 5 5  5 5 5  5 5 5  4 4 4  4 4 4
-+4 4 4  3 3 3  3 3 3  3 3 3  2 2 2  2 2 2
-+1 1 1  1 1 1  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  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  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  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
-+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  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  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  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  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  1 1 1
-+1 1 1  1 1 1  2 2 2  2 2 2  2 2 2  3 3 3
-+3 3 3  3 3 3  3 3 3  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  5 5 5  6 6 6
-+7 7 7  8 8 8  8 8 8  9 9 9  10 10 10  11 11 11
-+12 12 12  13 13 13  13 13 13  14 14 14  14 14 14  16 16 16
-+16 16 16  17 17 17  18 18 18  18 18 18  20 20 20  20 20 20
-+20 20 20  20 20 20  21 21 21  20 20 20  21 21 21  19 19 19
-+18 18 18  18 18 18  17 17 17  16 16 16  16 16 16  14 14 14
-+14 14 14  13 13 13  12 12 12  11 11 11  10 10 10  9 9 9
-+8 8 8  7 7 7  6 6 6  5 5 5  4 4 4  3 3 3
-+2 2 2  2 2 2  1 1 1  1 1 1  2 2 2  2 2 2
-+2 2 2  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  5 5 5  5 5 5  5 5 5
-+4 4 4  4 4 4  5 5 5  5 5 5  5 5 5  5 5 5
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  5 5 5  5 5 5  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  3 3 3  3 3 3
-+3 3 3  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
-+4 4 4  4 4 4  3 3 3  3 3 3  3 3 3  3 3 3
-+2 2 2  2 2 2  2 2 2  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 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 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 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 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 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 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 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 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 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  1 1 1  1 1 1  1 1 1  1 1 1
-+2 2 2  2 2 2  2 2 2  2 2 2  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  4 4 4
-+5 5 5  5 5 5  6 6 6  7 7 7  8 8 8  9 9 9
-+9 9 9  10 10 10  11 11 11  12 12 12  13 13 13  13 13 13
-+14 14 14  16 16 16  16 16 16  16 16 16  17 17 17  17 17 17
-+19 19 19  18 18 18  18 18 18  18 18 18  17 17 17  17 17 17
-+16 16 16  16 16 16  16 16 16  14 14 14  13 13 13  13 13 13
-+12 12 12  11 11 11  10 10 10  9 9 9  8 8 8  7 7 7
-+6 6 6  5 5 5  4 4 4  3 3 3  2 2 2  1 1 1
-+1 1 1  0 0 0  0 0 0  0 0 0  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  4 4 4  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  4 4 4  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  1 1 1
-+1 1 1  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+3 3 3  3 3 3  3 3 3  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  3 3 3  3 3 3  3 3 3  3 3 3  3 3 3
-+3 3 3  2 2 2  2 2 2  2 2 2  2 2 2  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 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 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 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 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 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 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 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 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 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
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  2 2 2  2 2 2
-+3 3 3  3 3 3  4 4 4  5 5 5  6 6 6  6 6 6
-+7 7 7  8 8 8  9 9 9  10 10 10  11 11 11  11 11 11
-+12 12 12  13 13 13  14 14 14  16 16 16  16 16 16  16 16 16
-+16 16 16  16 16 16  17 17 17  16 16 16  16 16 16  16 16 16
-+16 16 16  14 14 14  13 13 13  13 13 13  12 12 12  11 11 11
-+10 10 10  9 9 9  8 8 8  7 7 7  6 6 6  5 5 5
-+4 4 4  3 3 3  3 3 3  2 2 2  1 1 1  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  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  1 1 1  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  2 2 2  1 1 1  1 1 1  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  1 1 1  2 2 2
-+2 2 2  2 2 2  2 2 2  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  2 2 2  2 2 2  2 2 2  2 2 2  2 2 2
-+2 2 2  2 2 2  2 2 2  2 2 2  2 2 2  1 1 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  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 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 0 0  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 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 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 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 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 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 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 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 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 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 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 0 0  0 0 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  2 2 2  3 3 3  3 3 3  4 4 4  5 5 5
-+5 5 5  6 6 6  7 7 7  8 8 8  9 9 9  10 10 10
-+11 11 11  11 11 11  12 12 12  13 13 13  13 13 13  13 13 13
-+14 14 14  14 14 14  14 14 14  14 14 14  14 14 14  13 13 13
-+13 13 13  12 12 12  11 11 11  11 11 11  10 10 10  9 9 9
-+8 8 8  7 7 7  6 6 6  5 5 5  5 5 5  4 4 4
-+3 3 3  2 2 2  1 1 1  1 1 1  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  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  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 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 0 0  0 0 0  0 0 0  0 0 0  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 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 1 1  1 1 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  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 1  1 1 1  1 1 1  1 1 1
-+1 1 1  1 1 1  1 1 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 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  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 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 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 0 0  0 0 0  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 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 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 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 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 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 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 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 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 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 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  1 1 1  2 2 2  2 2 2  3 3 3  4 4 4
-+4 4 4  5 5 5  6 6 6  7 7 7  8 8 8  8 8 8
-+9 9 9  10 10 10  10 10 10  11 11 11  11 11 11  12 12 12
-+12 12 12  12 12 12  13 13 13  12 12 12  12 12 12  11 11 11
-+11 11 11  10 10 10  10 10 10  9 9 9  8 8 8  8 8 8
-+7 7 7  6 6 6  5 5 5  4 4 4  4 4 4  3 3 3
-+2 2 2  2 2 2  1 1 1  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  1 1 1  1 1 1  2 2 2  3 3 3
-+3 3 3  4 4 4  5 5 5  5 5 5  6 6 6  7 7 7
-+8 8 8  8 8 8  9 9 9  9 9 9  10 10 10  10 10 10
-+10 10 10  11 11 11  11 11 11  11 11 11  11 11 11  10 10 10
-+10 10 10  9 9 9  8 8 8  8 8 8  7 7 7  6 6 6
-+5 5 5  5 5 5  4 4 4  3 3 3  3 3 3  2 2 2
-+1 1 1  1 1 1  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  1 1 1  1 1 1  2 2 2
-+3 3 3  3 3 3  4 4 4  4 4 4  5 5 5  5 5 5
-+6 6 6  7 7 7  7 7 7  8 8 8  8 8 8  8 8 8
-+9 9 9  9 9 9  8 8 8  8 8 8  9 9 9  8 8 8
-+8 8 8  7 7 7  7 7 7  6 6 6  5 5 5  5 5 5
-+4 4 4  4 4 4  3 3 3  3 3 3  2 2 2  1 1 1
-+1 1 1  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  1 1 1  1 1 1
-+2 2 2  2 2 2  3 3 3  3 3 3  4 4 4  4 4 4
-+5 5 5  5 5 5  5 5 5  6 6 6  6 6 6  7 7 7
-+7 7 7  7 7 7  7 7 7  7 7 7  6 6 6  7 7 7
-+7 7 7  6 6 6  5 5 5  5 5 5  5 5 5  4 4 4
-+4 4 4  3 3 3  2 2 2  2 2 2  1 1 1  1 1 1
-+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  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  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  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  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  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
-+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  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  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  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  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  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
-+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  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  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  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  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  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  1 1 1
-+1 1 1  1 1 1  2 2 2  2 2 2  3 3 3  3 3 3
-+3 3 3  4 4 4  4 4 4  5 5 5  5 5 5  6 6 6
-+5 5 5  5 5 5  5 5 5  6 6 6  5 5 5  5 5 5
-+4 4 4  4 4 4  4 4 4  3 3 3  3 3 3  3 3 3
-+2 2 2  2 2 2  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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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  1 1 1  1 1 1  1 1 1  2 2 2  2 2 2
-+2 2 2  3 3 3  3 3 3  3 3 3  3 3 3  4 4 4
-+4 4 4  4 4 4  4 4 4  5 5 5  4 4 4  4 4 4
-+3 3 3  3 3 3  3 3 3  3 3 3  2 2 2  2 2 2
-+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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 0 0  1 1 1  1 1 1  1 1 1
-+1 1 1  2 2 2  2 2 2  2 2 2  2 2 2  3 3 3
-+3 3 3  4 4 4  3 3 3  3 3 3  2 2 2  2 2 2
-+2 2 2  2 2 2  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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 0 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 1 1
-+1 1 1  2 2 2  2 2 2  2 2 2  1 1 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1037-config-nr-tty-devices.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1037-config-nr-tty-devices.patch.patch
deleted file mode 100755 (executable)
index 971b21d..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-From 18dc67c2500cc825b8f726e90aa1ce4b765f28da Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:46:57 +0100
-Subject: [PATCH] config-nr-tty-devices.patch
-
----
- drivers/char/Kconfig |   12 ++++++++++++
- include/linux/vt.h   |   11 +++++++++++
- 2 files changed, 23 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index 2d854bb..04afc16 100644
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -58,6 +58,18 @@ config VT_CONSOLE
-         If unsure, say Y.
-+config NR_TTY_DEVICES
-+      int "Maximum tty device number"
-+      depends on VT
-+      default 63
-+      ---help---
-+        This is the highest numbered device created in /dev. You will actually have
-+        NR_TTY_DEVICES+1 devices in /dev. The default is 63, which will result in
-+        64 /dev entries. The lowest number you can set is 11, anything below that, 
-+        and it will default to 11. 63 is also the upper limit so we don't overrun
-+        the serial consoles.
-+
-+
- config HW_CONSOLE
-       bool
-       depends on VT && !S390 && !UML
-diff --git a/include/linux/vt.h b/include/linux/vt.h
-index 02c1c02..2ba4d21 100644
---- a/include/linux/vt.h
-+++ b/include/linux/vt.h
-@@ -18,8 +18,19 @@ extern int unregister_vt_notifier(struct notifier_block *nb);
-  * resizing).
-  */
- #define MIN_NR_CONSOLES 1       /* must be at least 1 */
-+#if (CONFIG_NR_TTY_DEVICES < 4)
-+/* Lower Limit */
-+#define MAX_NR_CONSOLES       4       /* serial lines start at 64 */
-+#define MAX_NR_USER_CONSOLES 4        /* must be root to allocate above this */
-+#elif (CONFIG_NR_TTY_DEVICES > 63)
-+/* Upper Limit */
- #define MAX_NR_CONSOLES       63      /* serial lines start at 64 */
- #define MAX_NR_USER_CONSOLES 63       /* must be root to allocate above this */
-+#else
-+/* They chose a sensible number */
-+#define MAX_NR_CONSOLES CONFIG_NR_TTY_DEVICES
-+#define MAX_NR_USER_CONSOLES CONFIG_NR_TTY_DEVICES
-+#endif
-               /* Note: the ioctl VT_GETSTATE does not work for
-                  consoles 16 and higher (since it returns a short) */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1038-pm-debug_less_verbose.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1038-pm-debug_less_verbose.patch.patch
deleted file mode 100755 (executable)
index 1a05ec6..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4d5727829b4589a1e2c209ea562a057e758ec556 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Wed, 16 Jul 2008 14:46:57 +0100
-Subject: [PATCH] pm-debug_less_verbose.patch
-
----
- drivers/base/power/main.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
-index 45cc3d9..524f1a2 100644
---- a/drivers/base/power/main.c
-+++ b/drivers/base/power/main.c
-@@ -64,9 +64,9 @@ int device_pm_add(struct device *dev)
- {
-       int error;
--      pr_debug("PM: Adding info for %s:%s\n",
-+      /* pr_debug("PM: Adding info for %s:%s\n",
-                dev->bus ? dev->bus->name : "No Bus",
--               kobject_name(&dev->kobj));
-+               kobject_name(&dev->kobj)); */
-       mutex_lock(&dpm_list_mtx);
-       if ((dev->parent && dev->parent->power.sleeping) || all_sleeping) {
-               if (dev->parent->power.sleeping)
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1039-s3c2410_serial-nodebug.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1039-s3c2410_serial-nodebug.patch.patch
deleted file mode 100755 (executable)
index d8ee9a8..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 1611aca52fd831b0a90a854ef71f07ed341bd987 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 22:21:03 +0100
-Subject: [PATCH] s3c2410_serial-nodebug.patch
-
----
- drivers/serial/s3c2410.c |    8 --------
- 1 files changed, 0 insertions(+), 8 deletions(-)
-
-diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
-index 2b6a013..7117110 100644
---- a/drivers/serial/s3c2410.c
-+++ b/drivers/serial/s3c2410.c
-@@ -708,10 +708,6 @@ static unsigned int s3c24xx_serial_getclk(struct uart_port *port,
-               int calc_deviation;
-               for (sptr = res; sptr < resptr; sptr++) {
--                      printk(KERN_DEBUG
--                             "found clk %p (%s) quot %d, calc %d\n",
--                             sptr->clksrc, sptr->clksrc->name,
--                             sptr->quot, sptr->calc);
-                       calc_deviation = baud - sptr->calc;
-                       if (calc_deviation < 0)
-@@ -723,12 +719,8 @@ static unsigned int s3c24xx_serial_getclk(struct uart_port *port,
-                       }
-               }
--              printk(KERN_DEBUG "best %p (deviation %d)\n", best, deviation);
-       }
--      printk(KERN_DEBUG "selected clock %p (%s) quot %d, calc %d\n",
--             best->clksrc, best->clksrc->name, best->quot, best->calc);
--
-       /* store results to pass back */
-       *clksrc = best->clksrc;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1040-input-nots-mousedev.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1040-input-nots-mousedev.patch.patch
deleted file mode 100755 (executable)
index 716b048..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From 95bdfec0f2515b7f1cd8dd959e49e950a814868b Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 22:21:22 +0100
-Subject: [PATCH] input-nots-mousedev.patch
- This patch disables the reporting of touchscreen-like devices via
- /dev/input/mice.  In the Neo1973 (much like other handheld devices),
- we need this to distinguish between the touchscreen (which uses tslib)
- and optional additional usb/bluetooth mice that might be attached.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
----
- drivers/input/mousedev.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
-index b989748..685917e 100644
---- a/drivers/input/mousedev.c
-+++ b/drivers/input/mousedev.c
-@@ -1009,6 +1009,7 @@ static const struct input_device_id mousedev_ids[] = {
-               .evbit = { BIT_MASK(EV_KEY) | BIT_MASK(EV_REL) },
-               .relbit = { BIT_MASK(REL_WHEEL) },
-       },      /* A separate scrollwheel */
-+#if 0
-       {
-               .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
-                               INPUT_DEVICE_ID_MATCH_KEYBIT |
-@@ -1018,6 +1019,7 @@ static const struct input_device_id mousedev_ids[] = {
-               .absbit = { BIT_MASK(ABS_X) | BIT_MASK(ABS_Y) },
-       },      /* A tablet like device, at least touch detection,
-                  two absolute axes */
-+#endif
-       {
-               .flags = INPUT_DEVICE_ID_MATCH_EVBIT |
-                               INPUT_DEVICE_ID_MATCH_KEYBIT |
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1041-s3c2440-nand-disable-hwecc.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1041-s3c2440-nand-disable-hwecc.patch.patch
deleted file mode 100755 (executable)
index c6167f9..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From bc0d09dd89a8837b9a4eeb63585caded6b290cf9 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 22:21:22 +0100
-Subject: [PATCH] s3c2440-nand-disable-hwecc.patch
- Disable the hardware ECC checking on S3C2440 based platforms (HXD8, SMDK2440,
- GTA02) for the time being, since our u-boot doesn't yet support it for 2k page
- size NAND
-
----
- drivers/mtd/nand/s3c2410.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
-index 6e7a5b9..8e1e482 100644
---- a/drivers/mtd/nand/s3c2410.c
-+++ b/drivers/mtd/nand/s3c2410.c
-@@ -665,7 +665,7 @@ static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,
-       nmtd->mtd.owner    = THIS_MODULE;
-       nmtd->set          = set;
--      if (hardware_ecc) {
-+      if (info->cpu_type == TYPE_S3C2410 && hardware_ecc) {
-               chip->ecc.calculate = s3c2410_nand_calculate_ecc;
-               chip->ecc.correct   = s3c2410_nand_correct_data;
-               chip->ecc.mode      = NAND_ECC_HW;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1042-qt2410-cs8900.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1042-qt2410-cs8900.patch.patch
deleted file mode 100755 (executable)
index bca79a8..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-From 0ed3724f733b7049d5efea9c44f5e6f0c6beae06 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 22:21:22 +0100
-Subject: [PATCH] qt2410-cs8900.patch
-
----
- drivers/net/Kconfig  |    4 ++--
- drivers/net/cs89x0.c |   14 +++++++++++++-
- 2 files changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
-index f4182cf..8caa04a 100644
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -1248,7 +1248,7 @@ source "drivers/net/ibm_newemac/Kconfig"
- config NET_PCI
-       bool "EISA, VLB, PCI and on board controllers"
--      depends on ISA || EISA || PCI
-+      depends on ISA || EISA || PCI || MACH_QT2410
-       help
-         This is another class of network cards which attach directly to the
-         bus. If you have one of those, say Y and read the Ethernet-HOWTO,
-@@ -1410,7 +1410,7 @@ config FORCEDETH_NAPI
- config CS89x0
-       tristate "CS89x0 support"
--      depends on NET_PCI && (ISA || MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X)
-+      depends on NET_PCI && (ISA || MACH_IXDP2351 || ARCH_IXDP2X01 || ARCH_PNX010X || MACH_QT2410)
-       ---help---
-         Support for CS89x0 chipset based Ethernet cards. If you have a
-         network (Ethernet) card of this type, say Y and read the
-diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
-index fba87ab..d94a790 100644
---- a/drivers/net/cs89x0.c
-+++ b/drivers/net/cs89x0.c
-@@ -194,6 +194,10 @@ static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900, 0, 0, 0};
- #define CIRRUS_DEFAULT_IRQ    VH_INTC_INT_NUM_CASCADED_INTERRUPT_1 /* Event inputs bank 1 - ID 35/bit 3 */
- static unsigned int netcard_portlist[] __used __initdata = {CIRRUS_DEFAULT_BASE, 0};
- static unsigned int cs8900_irq_map[] = {CIRRUS_DEFAULT_IRQ, 0, 0, 0};
-+#elif defined(CONFIG_MACH_QT2410)
-+#include <asm/arch/irqs.h>
-+static unsigned int netcard_portlist [] __initdata = { 0xe0000300, 0 };
-+static unsigned int cs8900_irq_map[] = { IRQ_EINT9, 0, 0, 0 };
- #else
- static unsigned int netcard_portlist[] __used __initdata =
-    { 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x2e0, 0};
-@@ -829,6 +833,14 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
-       printk(" IRQ %d", dev->irq);
-+      dev->dev_addr[0] = 0x00;
-+      dev->dev_addr[1] = 0x00;
-+      dev->dev_addr[2] = 0xc0;
-+      dev->dev_addr[3] = 0xff;
-+      dev->dev_addr[4] = 0xee;
-+      dev->dev_addr[5] = 0x08;
-+      set_mac_address(dev, dev->dev_addr);
-+
- #if ALLOW_DMA
-       if (lp->use_dma) {
-               get_dma_channel(dev);
-@@ -1304,7 +1316,7 @@ net_open(struct net_device *dev)
-       else
- #endif
-       {
--#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01) && !defined(CONFIG_ARCH_PNX010X)
-+#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01) && !defined(CONFIG_ARCH_PNX010X) && !defined(CONFIG_MACH_QT2410)
-               if (((1 << dev->irq) & lp->irq_map) == 0) {
-                       printk(KERN_ERR "%s: IRQ %d is not in our map of allowable IRQs, which is %x\n",
-                                dev->name, dev->irq, lp->irq_map);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1043-s3c2410-qt2410-buttons.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1043-s3c2410-qt2410-buttons.patch.patch
deleted file mode 100755 (executable)
index 28886f4..0000000
+++ /dev/null
@@ -1,311 +0,0 @@
-From a63a227ece28df06d4c8f04eec51c7649ef28aea Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 22:21:22 +0100
-Subject: [PATCH] s3c2410-qt2410-buttons.patch
-
----
- arch/arm/mach-s3c2410/mach-qt2410.c |   18 +++
- drivers/input/keyboard/Kconfig      |    5 +
- drivers/input/keyboard/Makefile     |    1 +
- drivers/input/keyboard/qt2410kbd.c  |  233 +++++++++++++++++++++++++++++++++++
- 4 files changed, 257 insertions(+), 0 deletions(-)
- create mode 100644 drivers/input/keyboard/qt2410kbd.c
-
-diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c
-index 6f7b56d..daf94cd 100644
---- a/arch/arm/mach-s3c2410/mach-qt2410.c
-+++ b/arch/arm/mach-s3c2410/mach-qt2410.c
-@@ -321,6 +321,24 @@ static int __init qt2410_tft_setup(char *str)
- __setup("tft=", qt2410_tft_setup);
-+static struct resource qt2410_button_resources[] = {
-+      [0] = {
-+              .start = S3C2410_GPF0,
-+              .end   = S3C2410_GPF0,
-+      },
-+      [1] = {
-+              .start = S3C2410_GPF2,
-+              .end   = S3C2410_GPF2,
-+      },
-+};
-+
-+struct platform_device qt2410_button_dev = {
-+      .name           ="qt2410-button",
-+      .num_resources  = ARRAY_SIZE(qt2410_button_resources),
-+      .resource       = qt2410_button_resources,
-+};
-+
-+
- static void __init qt2410_map_io(void)
- {
-       s3c24xx_init_io(qt2410_iodesc, ARRAY_SIZE(qt2410_iodesc));
-diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
-index b8ecca9..bc7aac3 100644
---- a/drivers/input/keyboard/Kconfig
-+++ b/drivers/input/keyboard/Kconfig
-@@ -334,5 +334,10 @@ config KEYBOARD_NEO1973
-         To compile this driver as a module, choose M here: the
-         module will be called neo1973kbd.
-+config KEYBOARD_QT2410
-+      tristate "QT2410 buttons"
-+      depends on MACH_QT2410
-+      default y
-+
- endif
-diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
-index b3aa339..63a8972 100644
---- a/drivers/input/keyboard/Makefile
-+++ b/drivers/input/keyboard/Makefile
-@@ -15,6 +15,7 @@ obj-$(CONFIG_KEYBOARD_NEWTON)                += newtonkbd.o
- obj-$(CONFIG_KEYBOARD_STOWAWAY)               += stowaway.o
- obj-$(CONFIG_KEYBOARD_CORGI)          += corgikbd.o
- obj-$(CONFIG_KEYBOARD_NEO1973)                += neo1973kbd.o
-+obj-$(CONFIG_KEYBOARD_QT2410)         += qt2410kbd.o
- obj-$(CONFIG_KEYBOARD_SPITZ)          += spitzkbd.o
- obj-$(CONFIG_KEYBOARD_TOSA)           += tosakbd.o
- obj-$(CONFIG_KEYBOARD_HIL)            += hil_kbd.o
-diff --git a/drivers/input/keyboard/qt2410kbd.c b/drivers/input/keyboard/qt2410kbd.c
-new file mode 100644
-index 0000000..4d497a3
---- /dev/null
-+++ b/drivers/input/keyboard/qt2410kbd.c
-@@ -0,0 +1,233 @@
-+/*
-+ * Keyboard driver for Armzone QT2410
-+ *
-+ * (C) 2006 by OpenMoko, Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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 version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+#include <linux/delay.h>
-+#include <linux/platform_device.h>
-+#include <linux/init.h>
-+#include <linux/input.h>
-+#include <linux/interrupt.h>
-+#include <linux/jiffies.h>
-+#include <linux/module.h>
-+#include <linux/slab.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/arch/gta01.h>
-+
-+struct gta01kbd {
-+      struct input_dev *input;
-+      unsigned int suspended;
-+      unsigned long suspend_jiffies;
-+};
-+
-+static irqreturn_t gta01kbd_interrupt(int irq, void *dev_id)
-+{
-+      struct gta01kbd *gta01kbd_data = dev_id;
-+
-+      /* FIXME: use GPIO from platform_dev resources */
-+      if (s3c2410_gpio_getpin(S3C2410_GPF0))
-+              input_report_key(gta01kbd_data->input, KEY_PHONE, 1);
-+      else
-+              input_report_key(gta01kbd_data->input, KEY_PHONE, 0);
-+
-+      input_sync(gta01kbd_data->input);
-+
-+      return IRQ_HANDLED;
-+}
-+
-+
-+#ifdef CONFIG_PM
-+static int gta01kbd_suspend(struct platform_device *dev, pm_message_t state)
-+{
-+      struct gta01kbd *gta01kbd = platform_get_drvdata(dev);
-+
-+      gta01kbd->suspended = 1;
-+
-+      return 0;
-+}
-+
-+static int gta01kbd_resume(struct platform_device *dev)
-+{
-+      struct gta01kbd *gta01kbd = platform_get_drvdata(dev);
-+
-+      gta01kbd->suspended = 0;
-+
-+      return 0;
-+}
-+#else
-+#define gta01kbd_suspend      NULL
-+#define gta01kbd_resume               NULL
-+#endif
-+
-+static int gta01kbd_probe(struct platform_device *pdev)
-+{
-+      struct gta01kbd *gta01kbd;
-+      struct input_dev *input_dev;
-+      int irq_911;
-+      int rc = 0;
-+
-+      gta01kbd = kzalloc(sizeof(struct gta01kbd), GFP_KERNEL);
-+      if (!gta01kbd) {
-+              rc = -ENOMEM;
-+              goto bail;
-+      }
-+      input_dev = input_allocate_device();
-+      if (!gta01kbd || !input_dev) {
-+              rc = -ENOMEM;
-+              goto bail_free;
-+      }
-+
-+      if (pdev->resource[0].flags != 0) {\
-+              rc = -EINVAL;
-+              goto bail_free_dev;
-+      }
-+
-+      irq_911 = s3c2410_gpio_getirq(pdev->resource[0].start);
-+      if (irq_911 < 0) {
-+              rc = -EINVAL;
-+              goto bail_free_dev;
-+      }
-+
-+      platform_set_drvdata(pdev, gta01kbd);
-+
-+      gta01kbd->input = input_dev;
-+
-+#if 0
-+      spin_lock_init(&gta01kbd->lock);
-+      /* Init Keyboard rescan timer */
-+      init_timer(&corgikbd->timer);
-+      corgikbd->timer.function = corgikbd_timer_callback;
-+      corgikbd->timer.data = (unsigned long) corgikbd;
-+
-+      /* Init Hinge Timer */
-+      init_timer(&corgikbd->htimer);
-+      corgikbd->htimer.function = corgikbd_hinge_timer;
-+      corgikbd->htimer.data = (unsigned long) corgikbd;
-+
-+      corgikbd->suspend_jiffies=jiffies;
-+
-+      memcpy(corgikbd->keycode, corgikbd_keycode, sizeof(corgikbd->keycode));
-+#endif
-+
-+      input_dev->name = "QT2410 Buttons";
-+      input_dev->phys = "qt2410kbd/input0";
-+      input_dev->id.bustype = BUS_HOST;
-+      input_dev->id.vendor = 0x0001;
-+      input_dev->id.product = 0x0001;
-+      input_dev->id.version = 0x0100;
-+      input_dev->cdev.dev = &pdev->dev;
-+      input_dev->private = gta01kbd;
-+
-+      input_dev->evbit[0] = BIT(EV_KEY);
-+#if 0
-+      input_dev->keycode = gta01kbd->keycode;
-+      input_dev->keycodesize = sizeof(unsigned char);
-+      input_dev->keycodemax = ARRAY_SIZE(corgikbd_keycode);
-+
-+      for (i = 0; i < ARRAY_SIZE(corgikbd_keycode); i++)
-+              set_bit(corgikbd->keycode[i], input_dev->keybit);
-+      clear_bit(0, input_dev->keybit);
-+      set_bit(SW_LID, input_dev->swbit);
-+      set_bit(SW_TABLET_MODE, input_dev->swbit);
-+      set_bit(SW_HEADPHONE_INSERT, input_dev->swbit);
-+#endif
-+
-+      rc = input_register_device(gta01kbd->input);
-+      if (rc)
-+              goto bail_free_dev;
-+
-+      s3c2410_gpio_cfgpin(S3C2410_GPF0, S3C2410_GPF0_EINT0);
-+      if (request_irq(irq_911, gta01kbd_interrupt,
-+                      IRQF_DISABLED | IRQF_TRIGGER_RISING |
-+                      IRQF_TRIGGER_FALLING, "qt2410kbd_eint0", gta01kbd))
-+              printk(KERN_WARNING "gta01kbd: Can't get IRQ\n");
-+      enable_irq_wake(irq_911);
-+
-+      /* FIXME: headphone insert */
-+
-+#if 0
-+      mod_timer(&corgikbd->htimer, jiffies + msecs_to_jiffies(HINGE_SCAN_INTERVAL));
-+
-+      /* Setup sense interrupts - RisingEdge Detect, sense lines as inputs */
-+      for (i = 0; i < CORGI_KEY_SENSE_NUM; i++) {
-+              pxa_gpio_mode(CORGI_GPIO_KEY_SENSE(i) | GPIO_IN);
-+              if (request_irq(CORGI_IRQ_GPIO_KEY_SENSE(i), corgikbd_interrupt,
-+                              SA_INTERRUPT | SA_TRIGGER_RISING,
-+                              "corgikbd", corgikbd))
-+                      printk(KERN_WARNING "corgikbd: Can't get IRQ: %d!\n", i);
-+      }
-+
-+      /* Set Strobe lines as outputs - set high */
-+      for (i = 0; i < CORGI_KEY_STROBE_NUM; i++)
-+              pxa_gpio_mode(CORGI_GPIO_KEY_STROBE(i) | GPIO_OUT | GPIO_DFLT_HIGH);
-+
-+      /* Setup the headphone jack as an input */
-+      pxa_gpio_mode(CORGI_GPIO_AK_INT | GPIO_IN);
-+#endif
-+
-+      return 0;
-+
-+bail_free_dev:
-+      input_free_device(input_dev);
-+bail_free:
-+      kfree(gta01kbd);
-+bail:
-+      return rc;
-+}
-+
-+static int gta01kbd_remove(struct platform_device *pdev)
-+{
-+      struct gta01kbd *gta01kbd = platform_get_drvdata(pdev);
-+
-+      free_irq(s3c2410_gpio_getirq(pdev->resource[0].start), gta01kbd);
-+#if 0
-+      int i;
-+
-+      for (i = 0; i < CORGI_KEY_SENSE_NUM; i++)
-+              free_irq(CORGI_IRQ_GPIO_KEY_SENSE(i), corgikbd);
-+
-+      del_timer_sync(&corgikbd->htimer);
-+      del_timer_sync(&corgikbd->timer);
-+#endif
-+      input_unregister_device(gta01kbd->input);
-+
-+      kfree(gta01kbd);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver gta01kbd_driver = {
-+      .probe          = gta01kbd_probe,
-+      .remove         = gta01kbd_remove,
-+      .suspend        = gta01kbd_suspend,
-+      .resume         = gta01kbd_resume,
-+      .driver         = {
-+              .name   = "qt2410-button",
-+      },
-+};
-+
-+static int __devinit gta01kbd_init(void)
-+{
-+      return platform_driver_register(&gta01kbd_driver);
-+}
-+
-+static void __exit gta01kbd_exit(void)
-+{
-+      platform_driver_unregister(&gta01kbd_driver);
-+}
-+
-+module_init(gta01kbd_init);
-+module_exit(gta01kbd_exit);
-+
-+MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>");
-+MODULE_DESCRIPTION("Armzone QT2410 Buttons Driver");
-+MODULE_LICENSE("GPL");
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1044-fail-unless-uimage.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1044-fail-unless-uimage.patch.patch
deleted file mode 100755 (executable)
index 86a3ce9..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-From 10042752e49358e1ef5ccfbb4e1c27875f3f43c5 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 22:21:22 +0100
-Subject: [PATCH] fail-unless-uimage.patch
- Fail the build noisily if "mkimage" can't be found, e.g., if we forgot to add
- the u-boot directory to PATH.
-
----
- scripts/mkuboot.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/scripts/mkuboot.sh b/scripts/mkuboot.sh
-index 2e3d3cd..446739c 100755
---- a/scripts/mkuboot.sh
-+++ b/scripts/mkuboot.sh
-@@ -11,7 +11,7 @@ if [ -z "${MKIMAGE}" ]; then
-       if [ -z "${MKIMAGE}" ]; then
-               # Doesn't exist
-               echo '"mkimage" command not found - U-Boot images will not be built' >&2
--              exit 0;
-+              exit 1;
-       fi
- fi
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1045-introduce-fiq-basis.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1045-introduce-fiq-basis.patch.patch
deleted file mode 100755 (executable)
index 7b79d8e..0000000
+++ /dev/null
@@ -1,587 +0,0 @@
-From 6a2c7de90f47b7eb74f3cb2d181f950ece22b3fb Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 22:21:22 +0100
-Subject: [PATCH] introduce-fiq-basis.patch
- Adds a C-based FIQ ISR which is very convenient (and unusual --
- normally you have to do FIQ ISR in assembler only).
- Based on my article:
-
-http://warmcat.com/_wp/2007/09/17/at91rm9200-fiq-faq-and-simple-example-code-patch/
-
-Implemented as a platform device and driver.
-
-Suspend / resume is tested and works.
-
-Signed-off-by: Andy Green <andy@warmcat.com>
----
- arch/arm/mach-s3c2440/Kconfig                |    7 +
- arch/arm/mach-s3c2440/Makefile               |    1 +
- arch/arm/mach-s3c2440/fiq_c_isr.c            |  250 ++++++++++++++++++++++++++
- arch/arm/mach-s3c2440/fiq_c_isr.h            |   64 +++++++
- arch/arm/mach-s3c2440/mach-gta02.c           |   22 +++
- arch/arm/plat-s3c24xx/irq.c                  |   32 +++-
- include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h |   28 +++
- include/asm-arm/plat-s3c24xx/irq.h           |   20 ++
- 8 files changed, 422 insertions(+), 2 deletions(-)
- create mode 100644 arch/arm/mach-s3c2440/fiq_c_isr.c
- create mode 100644 arch/arm/mach-s3c2440/fiq_c_isr.h
- create mode 100644 include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-
-diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
-index 6b317d1..3015aaf 100644
---- a/arch/arm/mach-s3c2440/Kconfig
-+++ b/arch/arm/mach-s3c2440/Kconfig
-@@ -22,6 +22,13 @@ config S3C2440_DMA
-       help
-         Support for S3C2440 specific DMA code5A
-+config S3C2440_C_FIQ
-+      bool "FIQ ISR support in C"
-+      depends on ARCH_S3C2410
-+      select FIQ
-+      help
-+        Support for S3C2440 FIQ support in C -- see
-+        ./arch/arm/macs3c2440/fiq_c_isr.c
- menu "S3C2440 Machines"
-diff --git a/arch/arm/mach-s3c2440/Makefile b/arch/arm/mach-s3c2440/Makefile
-index 1a4defd..4932232 100644
---- a/arch/arm/mach-s3c2440/Makefile
-+++ b/arch/arm/mach-s3c2440/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_CPU_S3C2440)    += s3c2440.o dsc.o
- obj-$(CONFIG_CPU_S3C2440)     += irq.o
- obj-$(CONFIG_CPU_S3C2440)     += clock.o
- obj-$(CONFIG_S3C2440_DMA)     += dma.o
-+obj-$(CONFIG_S3C2440_C_FIQ)   += fiq_c_isr.o
- # Machine support
-diff --git a/arch/arm/mach-s3c2440/fiq_c_isr.c b/arch/arm/mach-s3c2440/fiq_c_isr.c
-new file mode 100644
-index 0000000..12f4527
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/fiq_c_isr.c
-@@ -0,0 +1,250 @@
-+/*
-+ * Copyright 2007  Andy Green <andy@warmcat.com>
-+ * S3C modfifications
-+ * Copyright 2008 Andy Green <andy@openmoko.com>
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <asm/hardware.h>
-+#include <asm/fiq.h>
-+#include "fiq_c_isr.h"
-+#include <linux/sysfs.h>
-+#include <linux/device.h>
-+#include <linux/platform_device.h>
-+
-+#include <asm/io.h>
-+
-+#include <asm/plat-s3c24xx/cpu.h>
-+#include <asm/plat-s3c24xx/irq.h>
-+
-+/*
-+ * Major Caveats for using FIQ
-+ * ---------------------------
-+ *
-+ * 1) it CANNOT touch any vmalloc()'d memory, only memory
-+ *    that was kmalloc()'d.  Static allocations in the monolithic kernel
-+ *    are kmalloc()'d so they are okay.  You can touch memory-mapped IO, but
-+ *    the pointer for it has to have been stored in kmalloc'd memory.  The
-+ *    reason for this is simple: every now and then Linux turns off interrupts
-+ *    and reorders the paging tables.  If a FIQ happens during this time, the
-+ *    virtual memory space can be partly or entirely disordered or missing.
-+ *
-+ * 2) Because vmalloc() is used when a module is inserted, THIS FIQ
-+ *    ISR HAS TO BE IN THE MONOLITHIC KERNEL, not a module.  But the way
-+ *    it is set up, you can all to enable and disable it from your module
-+ *    and intercommunicate with it through struct fiq_ipc
-+ *    fiq_ipc which you can define in
-+ *    asm/archfiq_ipc_type.h.  The reason is the same as above, a
-+ *    FIQ could happen while even the ISR is not present in virtual memory
-+ *    space due to pagetables being changed at the time.
-+ *
-+ * 3) You can't call any Linux API code except simple macros
-+ *    - understand that FIQ can come in at any time, no matter what
-+ *      state of undress the kernel may privately be in, thinking it
-+ *      locked the door by turning off interrupts... FIQ is an
-+ *      unstoppable monster force (which is its value)
-+ *    - they are not vmalloc()'d memory safe
-+ *    - they might do crazy stuff like sleep: FIQ pisses fire and
-+ *      is not interested in 'sleep' that the weak seem to need
-+ *    - calling APIs from FIQ can re-enter un-renterable things
-+ *    - summary: you cannot interoperate with linux APIs directly in the FIQ ISR
-+ *
-+ * If you follow these rules, it is fantastic, an extremely powerful, solid,
-+ * genuine hard realtime feature.
-+ *
-+ */
-+
-+/* more than enough to cover our jump instruction to the isr */
-+#define SIZEOF_FIQ_JUMP 8
-+/* more than enough to cover s3c2440_fiq_isr() in 4K blocks */
-+#define SIZEOF_FIQ_ISR 0x2000
-+/* increase the size of the stack that is active during FIQ as needed */
-+static u8 u8aFiqStack[4096];
-+
-+/* only one FIQ ISR possible, okay to do these here */
-+u32 _fiq_ack_mask; /* used by isr exit define */
-+unsigned long _fiq_count_fiqs; /* used by isr exit define */
-+static int _fiq_irq; /* private ; irq index we were started with, or 0 */
-+
-+/* this function must live in the monolithic kernel somewhere!  A module is
-+ * NOT good enough!
-+ */
-+extern void __attribute__ ((naked)) s3c2440_fiq_isr(void);
-+
-+/* this is copied into the hard FIQ vector during init */
-+
-+static void __attribute__ ((naked)) s3c2440_FIQ_Branch(void)
-+{
-+      asm __volatile__ (
-+              "mov pc, r8 ; "
-+      );
-+}
-+
-+/* sysfs */
-+
-+static ssize_t show_count(struct device *dev, struct device_attribute *attr,
-+                       char *buf)
-+{
-+      return sprintf(buf, "%ld\n", _fiq_count_fiqs);
-+}
-+
-+static DEVICE_ATTR(count, 0444, show_count, NULL);
-+
-+static struct attribute *s3c2440_fiq_sysfs_entries[] = {
-+      &dev_attr_count.attr,
-+      NULL
-+};
-+
-+static struct attribute_group s3c2440_fiq_attr_group = {
-+      .name   = "fiq",
-+      .attrs  = s3c2440_fiq_sysfs_entries,
-+};
-+
-+/*
-+ * call this from your kernel module to set up the FIQ ISR to service FIQs,
-+ * You need to have configured your FIQ input pin before anything will happen
-+ *
-+ * call it with, eg, IRQ_TIMER3 from asm-arm/arch-s3c2410/irqs.h
-+ *
-+ * you still need to clear the source interrupt in S3C2410_INTMSK to get
-+ * anything good happening
-+ */
-+static void fiq_init_irq_source(int irq_index_fiq)
-+{
-+      if (!irq_index_fiq) /* no interrupt */
-+              return;
-+
-+      printk(KERN_INFO"Enabling FIQ using int idx %d\n",
-+             irq_index_fiq - S3C2410_CPUIRQ_OFFSET);
-+      local_fiq_disable();
-+
-+      _fiq_irq = irq_index_fiq;
-+      _fiq_ack_mask = 1 << (irq_index_fiq - S3C2410_CPUIRQ_OFFSET);
-+
-+      /* let our selected interrupt be a magic FIQ interrupt */
-+      __raw_writel(_fiq_ack_mask, S3C2410_INTMOD);
-+
-+      /* it's ready to go as soon as we unmask the source in S3C2410_INTMSK */
-+      local_fiq_enable();
-+}
-+
-+
-+/* call this from your kernel module to disable generation of FIQ actions */
-+static void fiq_disable_irq_source(void)
-+{
-+      /* nothing makes FIQ any more */
-+      __raw_writel(0, S3C2410_INTMOD);
-+      local_fiq_disable();
-+      _fiq_irq = 0; /* no active source interrupt now either */
-+}
-+
-+/* this starts FIQ timer events... they continue until the FIQ ISR sees that
-+ * its work is done and it turns off the timer.  After setting up the fiq_ipc
-+ * struct with new work, you call this to start FIQ timer actions up again.
-+ * Only the FIQ ISR decides when it is done and controls turning off the
-+ * timer events.
-+ */
-+void fiq_kick(void)
-+{
-+      unsigned long flags;
-+
-+      /* we have to take care about FIQ because this modification is
-+       * non-atomic, FIQ could come in after the read and before the
-+       * writeback and its changes to the register would be lost
-+       * (platform INTMSK mod code is taken care of already)
-+       */
-+      local_save_flags(flags);
-+      local_fiq_disable();
-+      __raw_writel(__raw_readl(S3C2410_INTMSK) &
-+                   ~(1 << (_fiq_irq - S3C2410_CPUIRQ_OFFSET)),
-+                   S3C2410_INTMSK);
-+      local_irq_restore(flags);
-+}
-+EXPORT_SYMBOL_GPL(fiq_kick);
-+
-+
-+
-+static int __init sc32440_fiq_probe(struct platform_device *pdev)
-+{
-+      struct resource *r = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-+
-+      if (!r)
-+              return -EIO;
-+      /* configure for the interrupt we are meant to use */
-+      fiq_init_irq_source(r->start);
-+
-+      return sysfs_create_group(&pdev->dev.kobj, &s3c2440_fiq_attr_group);
-+}
-+
-+static int sc32440_fiq_remove(struct platform_device *pdev)
-+{
-+      fiq_disable_irq_source();
-+      sysfs_remove_group(&pdev->dev.kobj, &s3c2440_fiq_attr_group);
-+      return 0;
-+}
-+
-+static void fiq_set_vector_and_regs(void)
-+{
-+      struct pt_regs regs;
-+
-+      /* prep the special FIQ mode regs */
-+      memset(&regs, 0, sizeof(regs));
-+      regs.ARM_r8 = (unsigned long)s3c2440_fiq_isr;
-+      regs.ARM_sp = (unsigned long)u8aFiqStack + sizeof(u8aFiqStack) - 4;
-+      /* set up the special FIQ-mode-only registers from our regs */
-+      set_fiq_regs(&regs);
-+      /* copy our jump to the real ISR into the hard vector address */
-+      set_fiq_handler(s3c2440_FIQ_Branch, SIZEOF_FIQ_JUMP);
-+}
-+
-+#ifdef CONFIG_PM
-+static int sc32440_fiq_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+      /* nothing makes FIQ any more */
-+      __raw_writel(0, S3C2410_INTMOD);
-+      local_fiq_disable();
-+
-+      return 0;
-+}
-+
-+static int sc32440_fiq_resume(struct platform_device *pdev)
-+{
-+      fiq_set_vector_and_regs();
-+      fiq_init_irq_source(_fiq_irq);
-+      return 0;
-+}
-+#else
-+#define sc32440_fiq_suspend   NULL
-+#define sc32440_fiq_resume    NULL
-+#endif
-+
-+static struct platform_driver sc32440_fiq_driver = {
-+      .driver = {
-+              .name   = "sc32440_fiq",
-+              .owner  = THIS_MODULE,
-+      },
-+
-+      .probe   = sc32440_fiq_probe,
-+      .remove  = __devexit_p(sc32440_fiq_remove),
-+      .suspend = sc32440_fiq_suspend,
-+      .resume  = sc32440_fiq_resume,
-+};
-+
-+static int __init sc32440_fiq_init(void)
-+{
-+      fiq_set_vector_and_regs();
-+
-+      return platform_driver_register(&sc32440_fiq_driver);
-+}
-+
-+static void __exit sc32440_fiq_exit(void)
-+{
-+      fiq_disable_irq_source();
-+}
-+
-+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
-+MODULE_LICENSE("GPL");
-+
-+module_init(sc32440_fiq_init);
-+module_exit(sc32440_fiq_exit);
-diff --git a/arch/arm/mach-s3c2440/fiq_c_isr.h b/arch/arm/mach-s3c2440/fiq_c_isr.h
-new file mode 100644
-index 0000000..f08740e
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/fiq_c_isr.h
-@@ -0,0 +1,64 @@
-+#ifndef _LINUX_FIQ_C_ISR_H
-+#define _LINUX_FIQ_C_ISR_H
-+
-+#include <asm/arch-s3c2410/regs-irq.h>
-+
-+extern unsigned long _fiq_count_fiqs;
-+extern u32 _fiq_ack_mask;
-+
-+/* This CANNOT be implemented in a module -- it has to be used in code
-+ * included in the monolithic kernel
-+ */
-+
-+#define FIQ_HANDLER_START() \
-+void __attribute__ ((naked)) s3c2440_fiq_isr(void) \
-+{\
-+      /*\
-+       * you can declare local vars here, take care to set the frame size\
-+       *  below accordingly if there are more than a few dozen bytes of them\
-+       */\
-+
-+/* stick your locals here :-)
-+ * Do NOT initialize them here!  define them and initialize them after
-+ * FIQ_HANDLER_ENTRY() is done.
-+ */
-+
-+#define FIQ_HANDLER_ENTRY(LOCALS, FRAME) \
-+      const int _FIQ_FRAME_SIZE = FRAME; \
-+      /* entry takes care to store registers we will be treading on here */\
-+      asm __volatile__ (\
-+              "mov     ip, sp ;"\
-+              /* stash FIQ and r0-r8 normal regs */\
-+              "stmdb  sp!, {r0-r12, lr};"\
-+              /* allow SP to get some space */\
-+              "sub     sp, sp, %1 ;"\
-+              /* !! THIS SETS THE FRAME, adjust to > sizeof locals */\
-+              "sub     fp, sp, %0 ;"\
-+              :\
-+              : "rI" (LOCALS), "rI" (FRAME)\
-+              :"r9"\
-+      );
-+
-+/* stick your ISR code here and then end with... */
-+
-+#define FIQ_HANDLER_END() \
-+      _fiq_count_fiqs++;\
-+      __raw_writel(_fiq_ack_mask, S3C2410_SRCPND);\
-+\
-+      /* exit back to normal mode restoring everything */\
-+      asm __volatile__ (\
-+              /* pop our allocation */\
-+              "add     sp, sp, %0 ;"\
-+              /* return FIQ regs back to pristine state\
-+               * and get normal regs back\
-+               */\
-+              "ldmia  sp!, {r0-r12, lr};"\
-+\
-+              /* return */\
-+              "subs   pc, lr, #4;"\
-+              : \
-+              : "rI" (_FIQ_FRAME_SIZE) \
-+      );\
-+}
-+
-+#endif /* _LINUX_FIQ_C_ISR_H */
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 46acede..0bdd0e0 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -78,9 +78,31 @@
- #include <linux/glamofb.h>
-+#include <asm/arch/fiq_ipc_gta02.h>
-+#include "fiq_c_isr.h"
-+
- /* arbitrates which sensor IRQ owns the shared SPI bus */
- static spinlock_t motion_irq_lock;
-+/* define FIQ IPC struct */
-+/*
-+ * contains stuff FIQ ISR modifies and normal kernel code can see and use
-+ * this is defined in <asm/arch/fiq_ipc_gta02.h>, you should customize
-+ * the definition in there and include the same definition in your kernel
-+ * module that wants to interoperate with your FIQ code.
-+ */
-+struct fiq_ipc fiq_ipc;
-+EXPORT_SYMBOL(fiq_ipc);
-+
-+/* define FIQ ISR */
-+
-+FIQ_HANDLER_START()
-+/* define your locals here -- no initializers though */
-+FIQ_HANDLER_ENTRY(256, 512)
-+/* Your ISR here :-) */
-+FIQ_HANDLER_END()
-+
-+
- static struct map_desc gta02_iodesc[] __initdata = {
-       {
-               .virtual        = 0xe0000000,
-diff --git a/arch/arm/plat-s3c24xx/irq.c b/arch/arm/plat-s3c24xx/irq.c
-index ae2c5d7..9887db1 100644
---- a/arch/arm/plat-s3c24xx/irq.c
-+++ b/arch/arm/plat-s3c24xx/irq.c
-@@ -133,12 +133,20 @@ static void
- s3c_irq_mask(unsigned int irqno)
- {
-       unsigned long mask;
--
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      unsigned long flags;
-+#endif
-       irqno -= IRQ_EINT0;
--
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      local_save_flags(flags);
-+      local_fiq_disable();
-+#endif
-       mask = __raw_readl(S3C2410_INTMSK);
-       mask |= 1UL << irqno;
-       __raw_writel(mask, S3C2410_INTMSK);
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      local_irq_restore(flags);
-+#endif
- }
- static inline void
-@@ -155,9 +163,19 @@ s3c_irq_maskack(unsigned int irqno)
- {
-       unsigned long bitval = 1UL << (irqno - IRQ_EINT0);
-       unsigned long mask;
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      unsigned long flags;
-+#endif
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      local_save_flags(flags);
-+      local_fiq_disable();
-+#endif
-       mask = __raw_readl(S3C2410_INTMSK);
-       __raw_writel(mask|bitval, S3C2410_INTMSK);
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      local_irq_restore(flags);
-+#endif
-       __raw_writel(bitval, S3C2410_SRCPND);
-       __raw_writel(bitval, S3C2410_INTPND);
-@@ -168,15 +186,25 @@ static void
- s3c_irq_unmask(unsigned int irqno)
- {
-       unsigned long mask;
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      unsigned long flags;
-+#endif
-       if (irqno != IRQ_TIMER4 && irqno != IRQ_EINT8t23)
-               irqdbf2("s3c_irq_unmask %d\n", irqno);
-       irqno -= IRQ_EINT0;
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      local_save_flags(flags);
-+      local_fiq_disable();
-+#endif
-       mask = __raw_readl(S3C2410_INTMSK);
-       mask &= ~(1UL << irqno);
-       __raw_writel(mask, S3C2410_INTMSK);
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      local_irq_restore(flags);
-+#endif
- }
- struct irq_chip s3c_irq_level_chip = {
-diff --git a/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h b/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-new file mode 100644
-index 0000000..341f2bb
---- /dev/null
-+++ b/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-@@ -0,0 +1,28 @@
-+#ifndef _LINUX_FIQ_IPC_H
-+#define _LINUX_FIQ_IPC_H
-+
-+/*
-+ * this defines the struct which is used to communicate between the FIQ
-+ * world and the normal linux kernel world.  One of these structs is
-+ * statically defined for you in the monolithic kernel so the FIQ ISR code
-+ * can safely touch it any any time.
-+ *
-+ * You also want to include this file in your kernel module that wants to
-+ * communicate with your FIQ code.  Add any kinds of vars that are used by
-+ * the FIQ ISR and the module in here.
-+ *
-+ * To get you started there is just an int that is incremented every FIQ
-+ * you can remove this when you are ready to customize, but it is useful
-+ * for testing
-+ */
-+
-+struct fiq_ipc {
-+      u8 u8a[0]; /* placeholder */
-+};
-+
-+/* actual definition lives in arch/arm/mach-s3c2440/fiq_c_isr.c */
-+extern struct fiq_ipc fiq_ipc;
-+
-+extern void fiq_kick(void);  /* provoke a FIQ "immediately" */
-+
-+#endif /* _LINUX_FIQ_IPC_H */
-diff --git a/include/asm-arm/plat-s3c24xx/irq.h b/include/asm-arm/plat-s3c24xx/irq.h
-index 45746a9..bf15e1c 100644
---- a/include/asm-arm/plat-s3c24xx/irq.h
-+++ b/include/asm-arm/plat-s3c24xx/irq.h
-@@ -25,8 +25,15 @@ s3c_irqsub_mask(unsigned int irqno, unsigned int parentbit,
- {
-       unsigned long mask;
-       unsigned long submask;
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      unsigned long flags;
-+#endif
-       submask = __raw_readl(S3C2410_INTSUBMSK);
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      local_save_flags(flags);
-+      local_fiq_disable();
-+#endif
-       mask = __raw_readl(S3C2410_INTMSK);
-       submask |= (1UL << (irqno - IRQ_S3CUART_RX0));
-@@ -39,6 +46,9 @@ s3c_irqsub_mask(unsigned int irqno, unsigned int parentbit,
-       /* write back masks */
-       __raw_writel(submask, S3C2410_INTSUBMSK);
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      local_irq_restore(flags);
-+#endif
- }
-@@ -47,8 +57,15 @@ s3c_irqsub_unmask(unsigned int irqno, unsigned int parentbit)
- {
-       unsigned long mask;
-       unsigned long submask;
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      unsigned long flags;
-+#endif
-       submask = __raw_readl(S3C2410_INTSUBMSK);
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      local_save_flags(flags);
-+      local_fiq_disable();
-+#endif
-       mask = __raw_readl(S3C2410_INTMSK);
-       submask &= ~(1UL << (irqno - IRQ_S3CUART_RX0));
-@@ -57,6 +74,9 @@ s3c_irqsub_unmask(unsigned int irqno, unsigned int parentbit)
-       /* write back masks */
-       __raw_writel(submask, S3C2410_INTSUBMSK);
-       __raw_writel(mask, S3C2410_INTMSK);
-+#ifdef CONFIG_S3C2440_C_FIQ
-+      local_irq_restore(flags);
-+#endif
- }
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1046-introduce-fiq-use-timer3-as-source.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1046-introduce-fiq-use-timer3-as-source.patch.patch
deleted file mode 100755 (executable)
index ea8ae72..0000000
+++ /dev/null
@@ -1,220 +0,0 @@
-From 26fa0c816d5e1b593128477c7e200fafe3caae18 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 22:21:22 +0100
-Subject: [PATCH] introduce-fiq-use-timer3-as-source.patch
-
-This makes the FIQ stuff specific to one of the timers on the
-s3c244x and adds the platform stuff for fiq in the gta02 init
-
-Currently one sysfs node is exposed, a count of FIQ events
-
-cat /sys/devices/platform/sc32440_fiq.0/fiq/count
-
-From: Andy Green <andy@openmoko.com>
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/fiq_c_isr.c            |   56 +++++++++++++++++++++----
- arch/arm/mach-s3c2440/fiq_c_isr.h            |    2 +
- arch/arm/mach-s3c2440/mach-gta02.c           |   17 ++++++++
- include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h |    2 +-
- 4 files changed, 67 insertions(+), 10 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/fiq_c_isr.c b/arch/arm/mach-s3c2440/fiq_c_isr.c
-index 12f4527..a71a234 100644
---- a/arch/arm/mach-s3c2440/fiq_c_isr.c
-+++ b/arch/arm/mach-s3c2440/fiq_c_isr.c
-@@ -18,6 +18,9 @@
- #include <asm/plat-s3c24xx/cpu.h>
- #include <asm/plat-s3c24xx/irq.h>
-+#include <asm/arch/pwm.h>
-+#include <asm/plat-s3c/regs-timer.h>
-+
- /*
-  * Major Caveats for using FIQ
-  * ---------------------------
-@@ -66,6 +69,10 @@ static u8 u8aFiqStack[4096];
- u32 _fiq_ack_mask; /* used by isr exit define */
- unsigned long _fiq_count_fiqs; /* used by isr exit define */
- static int _fiq_irq; /* private ; irq index we were started with, or 0 */
-+struct s3c2410_pwm pwm_timer_fiq;
-+int _fiq_timer_index;
-+u16 _fiq_timer_divisor;
-+
- /* this function must live in the monolithic kernel somewhere!  A module is
-  * NOT good enough!
-@@ -110,23 +117,45 @@ static struct attribute_group s3c2440_fiq_attr_group = {
-  * you still need to clear the source interrupt in S3C2410_INTMSK to get
-  * anything good happening
-  */
--static void fiq_init_irq_source(int irq_index_fiq)
-+static int fiq_init_irq_source(int irq_index_fiq)
- {
-+      int rc = 0;
-+
-       if (!irq_index_fiq) /* no interrupt */
--              return;
-+              goto bail;
--      printk(KERN_INFO"Enabling FIQ using int idx %d\n",
--             irq_index_fiq - S3C2410_CPUIRQ_OFFSET);
-       local_fiq_disable();
-       _fiq_irq = irq_index_fiq;
-       _fiq_ack_mask = 1 << (irq_index_fiq - S3C2410_CPUIRQ_OFFSET);
-+      timer_index = (irq_index_fiq - IRQ_TIMER0);
-+
-+      /* set up the timer to operate as a pwm device */
-+
-+      rc = s3c2410_pwm_init(&pwm_timer_fiq);
-+      if (rc)
-+              goto bail;
-+
-+      pwm_timer_fiq.timerid = PWM0 + timer_index;
-+      pwm_timer_fiq.prescaler = (6 - 1) / 2;
-+      pwm_timer_fiq.divider = S3C2410_TCFG1_MUX3_DIV2;
-+      /* default rate == ~32us */
-+      pwm_timer_fiq.counter = pwm_timer_fiq.comparer =
-+                                      timer_divisor = 64;
-+
-+      rc = s3c2410_pwm_enable(&pwm_timer_fiq);
-+      if (rc)
-+              goto bail;
-+
-+      s3c2410_pwm_start(&pwm_timer_fiq);
-       /* let our selected interrupt be a magic FIQ interrupt */
-       __raw_writel(_fiq_ack_mask, S3C2410_INTMOD);
-       /* it's ready to go as soon as we unmask the source in S3C2410_INTMSK */
-       local_fiq_enable();
-+bail:
-+      return rc;
- }
-@@ -139,15 +168,13 @@ static void fiq_disable_irq_source(void)
-       _fiq_irq = 0; /* no active source interrupt now either */
- }
--/* this starts FIQ timer events... they continue until the FIQ ISR sees that
-- * its work is done and it turns off the timer.  After setting up the fiq_ipc
-- * struct with new work, you call this to start FIQ timer actions up again.
-- * Only the FIQ ISR decides when it is done and controls turning off the
-- * timer events.
-+/*
-+ * fiq_kick() forces a FIQ event to happen shortly after leaving the routine
-  */
- void fiq_kick(void)
- {
-       unsigned long flags;
-+      u32 tcon;
-       /* we have to take care about FIQ because this modification is
-        * non-atomic, FIQ could come in after the read and before the
-@@ -156,15 +183,24 @@ void fiq_kick(void)
-        */
-       local_save_flags(flags);
-       local_fiq_disable();
-+      /* allow FIQs to resume */
-       __raw_writel(__raw_readl(S3C2410_INTMSK) &
-                    ~(1 << (_fiq_irq - S3C2410_CPUIRQ_OFFSET)),
-                    S3C2410_INTMSK);
-+      tcon = __raw_readl(S3C2410_TCON) & ~S3C2410_TCON_T3START;
-+      /* fake the timer to a count of 1 */
-+      __raw_writel(1, S3C2410_TCNTB(timer_index));
-+      __raw_writel(tcon | S3C2410_TCON_T3MANUALUPD, S3C2410_TCON);
-+      __raw_writel(tcon | S3C2410_TCON_T3MANUALUPD | S3C2410_TCON_T3START,
-+                   S3C2410_TCON);
-+      __raw_writel(tcon | S3C2410_TCON_T3START, S3C2410_TCON);
-       local_irq_restore(flags);
- }
- EXPORT_SYMBOL_GPL(fiq_kick);
-+
- static int __init sc32440_fiq_probe(struct platform_device *pdev)
- {
-       struct resource *r = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-@@ -172,6 +208,8 @@ static int __init sc32440_fiq_probe(struct platform_device *pdev)
-       if (!r)
-               return -EIO;
-       /* configure for the interrupt we are meant to use */
-+      printk(KERN_INFO"Enabling FIQ using irq %d\n", r->start);
-+
-       fiq_init_irq_source(r->start);
-       return sysfs_create_group(&pdev->dev.kobj, &s3c2440_fiq_attr_group);
-diff --git a/arch/arm/mach-s3c2440/fiq_c_isr.h b/arch/arm/mach-s3c2440/fiq_c_isr.h
-index f08740e..0c45eb7 100644
---- a/arch/arm/mach-s3c2440/fiq_c_isr.h
-+++ b/arch/arm/mach-s3c2440/fiq_c_isr.h
-@@ -5,6 +5,8 @@
- extern unsigned long _fiq_count_fiqs;
- extern u32 _fiq_ack_mask;
-+extern int _fiq_timer_index;
-+extern u16 _fiq_timer_divisor;
- /* This CANNOT be implemented in a module -- it has to be used in code
-  * included in the monolithic kernel
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 0bdd0e0..cb839b2 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -57,6 +57,7 @@
- #include <asm/irq.h>
- #include <asm/mach-types.h>
-+#include <asm/arch-s3c2410/regs-irq.h>
- #include <asm/arch/regs-gpio.h>
- #include <asm/arch/regs-gpioj.h>
- #include <asm/arch/fb.h>
-@@ -336,6 +337,21 @@ struct platform_device gta02_pmu_dev = {
-       },
- };
-+/* FIQ */
-+
-+static struct resource sc32440_fiq_resources[] = {
-+      [0] = {
-+              .flags  = IORESOURCE_IRQ,
-+              .start  = IRQ_TIMER3,
-+              .end    = IRQ_TIMER3,
-+      },
-+};
-+
-+struct platform_device sc32440_fiq_device = {
-+      .name           = "sc32440_fiq",
-+      .num_resources  = 1,
-+      .resource       = sc32440_fiq_resources,
-+};
- /* NOR Flash */
-@@ -403,6 +419,7 @@ static struct platform_device *gta02_devices[] __initdata = {
-       &s3c_device_nand,
-       &s3c_device_ts,
-       &gta02_nor_flash,
-+      &sc32440_fiq_device,
- };
- static struct s3c2410_nand_set gta02_nand_sets[] = {
-diff --git a/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h b/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-index 341f2bb..6cbd8e4 100644
---- a/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-+++ b/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-@@ -22,7 +22,7 @@ struct fiq_ipc {
- /* actual definition lives in arch/arm/mach-s3c2440/fiq_c_isr.c */
- extern struct fiq_ipc fiq_ipc;
--
-+extern unsigned long _fiq_count_fiqs;
- extern void fiq_kick(void);  /* provoke a FIQ "immediately" */
- #endif /* _LINUX_FIQ_IPC_H */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1047-introduce-fiq-migrate-vibrator-gta02-only.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1047-introduce-fiq-migrate-vibrator-gta02-only.patch.patch
deleted file mode 100755 (executable)
index f179555..0000000
+++ /dev/null
@@ -1,243 +0,0 @@
-From b740b1200958baf4b5675017531c773bad5b64d0 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 22:21:23 +0100
-Subject: [PATCH] introduce-fiq-migrate-vibrator-gta02-only.patch
-
-On GTA02 we use FIQ to manage the vibrator IO now.  That
-is necessary because we stole timer3 from doing hw pwm
-for vibrator.  This keeps the same UI in /sys but does
-"bitbang pwm" on the same vibrator GPIO
-
-From: Andy Green <andy@openmoko.com>
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/fiq_c_isr.c            |   13 +++++---
- arch/arm/mach-s3c2440/mach-gta02.c           |   38 ++++++++++++++++++++++++++
- drivers/leds/Kconfig                         |    1 +
- drivers/leds/leds-neo1973-vibrator.c         |   24 +++++++++++++++-
- include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h |    9 +++++-
- 5 files changed, 77 insertions(+), 8 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/fiq_c_isr.c b/arch/arm/mach-s3c2440/fiq_c_isr.c
-index a71a234..38692fc 100644
---- a/arch/arm/mach-s3c2440/fiq_c_isr.c
-+++ b/arch/arm/mach-s3c2440/fiq_c_isr.c
-@@ -79,6 +79,7 @@ u16 _fiq_timer_divisor;
-  */
- extern void __attribute__ ((naked)) s3c2440_fiq_isr(void);
-+
- /* this is copied into the hard FIQ vector during init */
- static void __attribute__ ((naked)) s3c2440_FIQ_Branch(void)
-@@ -128,7 +129,7 @@ static int fiq_init_irq_source(int irq_index_fiq)
-       _fiq_irq = irq_index_fiq;
-       _fiq_ack_mask = 1 << (irq_index_fiq - S3C2410_CPUIRQ_OFFSET);
--      timer_index = (irq_index_fiq - IRQ_TIMER0);
-+      _fiq_timer_index = (irq_index_fiq - IRQ_TIMER0);
-       /* set up the timer to operate as a pwm device */
-@@ -136,12 +137,11 @@ static int fiq_init_irq_source(int irq_index_fiq)
-       if (rc)
-               goto bail;
--      pwm_timer_fiq.timerid = PWM0 + timer_index;
-+      pwm_timer_fiq.timerid = PWM0 + _fiq_timer_index;
-       pwm_timer_fiq.prescaler = (6 - 1) / 2;
-       pwm_timer_fiq.divider = S3C2410_TCFG1_MUX3_DIV2;
-       /* default rate == ~32us */
--      pwm_timer_fiq.counter = pwm_timer_fiq.comparer =
--                                      timer_divisor = 64;
-+      pwm_timer_fiq.counter = pwm_timer_fiq.comparer = 3000;
-       rc = s3c2410_pwm_enable(&pwm_timer_fiq);
-       if (rc)
-@@ -149,6 +149,8 @@ static int fiq_init_irq_source(int irq_index_fiq)
-       s3c2410_pwm_start(&pwm_timer_fiq);
-+      _fiq_timer_divisor = 0xffff; /* so kick will work initially */
-+
-       /* let our selected interrupt be a magic FIQ interrupt */
-       __raw_writel(_fiq_ack_mask, S3C2410_INTMOD);
-@@ -189,7 +191,7 @@ void fiq_kick(void)
-                    S3C2410_INTMSK);
-       tcon = __raw_readl(S3C2410_TCON) & ~S3C2410_TCON_T3START;
-       /* fake the timer to a count of 1 */
--      __raw_writel(1, S3C2410_TCNTB(timer_index));
-+      __raw_writel(1, S3C2410_TCNTB(_fiq_timer_index));
-       __raw_writel(tcon | S3C2410_TCON_T3MANUALUPD, S3C2410_TCON);
-       __raw_writel(tcon | S3C2410_TCON_T3MANUALUPD | S3C2410_TCON_T3START,
-                    S3C2410_TCON);
-@@ -207,6 +209,7 @@ static int __init sc32440_fiq_probe(struct platform_device *pdev)
-       if (!r)
-               return -EIO;
-+
-       /* configure for the interrupt we are meant to use */
-       printk(KERN_INFO"Enabling FIQ using irq %d\n", r->start);
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index cb839b2..8c7bbe7 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -95,12 +95,50 @@ static spinlock_t motion_irq_lock;
- struct fiq_ipc fiq_ipc;
- EXPORT_SYMBOL(fiq_ipc);
-+#define DIVISOR_FROM_US(x) ((x) << 1)
-+
-+#define FIQ_DIVISOR_VIBRATOR DIVISOR_FROM_US(100)
-+
- /* define FIQ ISR */
- FIQ_HANDLER_START()
- /* define your locals here -- no initializers though */
-+      u16 divisor;
- FIQ_HANDLER_ENTRY(256, 512)
- /* Your ISR here :-) */
-+      divisor = 0xffff;
-+
-+      /* Vibrator servicing */
-+
-+      if (fiq_ipc.vib_pwm_latched || fiq_ipc.vib_pwm) { /* not idle */
-+              if (((u8)_fiq_count_fiqs) == fiq_ipc.vib_pwm_latched)
-+                      s3c2410_gpio_setpin(fiq_ipc.vib_gpio_pin, 0);
-+              if (((u8)_fiq_count_fiqs) == 0) {
-+                      fiq_ipc.vib_pwm_latched = fiq_ipc.vib_pwm;
-+                      if (fiq_ipc.vib_pwm_latched)
-+                              s3c2410_gpio_setpin(fiq_ipc.vib_gpio_pin, 1);
-+              }
-+              divisor = FIQ_DIVISOR_VIBRATOR;
-+      }
-+
-+      /* TODO: HDQ servicing */
-+
-+
-+
-+      /* disable further timer interrupts if nobody has any work
-+       * or adjust rate according to who still has work
-+       *
-+       * CAUTION: it means forground code must disable FIQ around
-+       * its own non-atomic S3C2410_INTMSK changes... not common
-+       * thankfully and taken care of by the fiq-basis patch
-+       */
-+      if (divisor == 0xffff) /* mask the fiq irq source */
-+              __raw_writel(__raw_readl(S3C2410_INTMSK) | _fiq_ack_mask,
-+                           S3C2410_INTMSK);
-+      else /* still working, maybe at a different rate */
-+              __raw_writel(divisor, S3C2410_TCNTB(_fiq_timer_index));
-+      _fiq_timer_divisor = divisor;
-+
- FIQ_HANDLER_END()
-diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
-index b6b1211..5a0aa9c 100644
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -150,6 +150,7 @@ config LEDS_CLEVO_MAIL
- config LEDS_NEO1973_VIBRATOR
-       tristate "Vibrator Support for the FIC Neo1973 GSM phone"
-       depends on LEDS_CLASS && MACH_NEO1973
-+      select S3C2440_C_FIQ
-       help
-         This option enables support for the vibrator on the FIC Neo1973.
-diff --git a/drivers/leds/leds-neo1973-vibrator.c b/drivers/leds/leds-neo1973-vibrator.c
-index c943a6a..36ed216 100644
---- a/drivers/leds/leds-neo1973-vibrator.c
-+++ b/drivers/leds/leds-neo1973-vibrator.c
-@@ -23,6 +23,8 @@
- #include <asm/arch/gta01.h>
- #include <asm/plat-s3c/regs-timer.h>
-+#include <asm/arch-s3c2410/fiq_ipc_gta02.h>
-+
- #define COUNTER 64
- struct neo1973_vib_priv {
-@@ -39,6 +41,11 @@ static void neo1973_vib_vib_set(struct led_classdev *led_cdev,
-       struct neo1973_vib_priv *vp =
-               container_of(led_cdev, struct neo1973_vib_priv, cdev);
-+      if (machine_is_neo1973_gta02()) { /* use FIQ to control GPIO */
-+              fiq_ipc.vib_pwm = value; /* set it for FIQ */
-+              fiq_kick(); /* start up FIQs if not already going */
-+              return;
-+      }
-       /*
-        * value == 255 -> 99% duty cycle (full power)
-        * value == 128 -> 50% duty cycle (medium power)
-@@ -46,7 +53,7 @@ static void neo1973_vib_vib_set(struct led_classdev *led_cdev,
-        */
-       mutex_lock(&vp->mutex);
-       if (vp->has_pwm)
--              s3c2410_pwm_duty_cycle(value/4, &vp->pwm);
-+              s3c2410_pwm_duty_cycle(value / 4, &vp->pwm);
-       else {
-               if (value)
-                       s3c2410_gpio_setpin(vp->gpio, 1);
-@@ -123,6 +130,15 @@ static int __init neo1973_vib_probe(struct platform_device *pdev)
-       neo1973_vib_led.gpio = r->start;
-       platform_set_drvdata(pdev, &neo1973_vib_led);
-+      if (machine_is_neo1973_gta02()) { /* use FIQ to control GPIO */
-+              s3c2410_gpio_setpin(neo1973_vib_led.gpio, 0); /* off */
-+              s3c2410_gpio_cfgpin(neo1973_vib_led.gpio, S3C2410_GPIO_OUTPUT);
-+              /* safe, kmalloc'd copy needed for FIQ ISR */
-+              fiq_ipc.vib_gpio_pin = neo1973_vib_led.gpio;
-+              fiq_ipc.vib_pwm = 0; /* off */
-+              goto configured;
-+      }
-+
-       /* TOUT3 */
-       if (neo1973_vib_led.gpio == S3C2410_GPB3) {
-               rc = neo1973_vib_init_hw(&neo1973_vib_led);
-@@ -133,7 +149,7 @@ static int __init neo1973_vib_probe(struct platform_device *pdev)
-               s3c2410_gpio_cfgpin(neo1973_vib_led.gpio, S3C2410_GPB3_TOUT3);
-               neo1973_vib_led.has_pwm = 1;
-       }
--
-+configured:
-       mutex_init(&neo1973_vib_led.mutex);
-       return led_classdev_register(&pdev->dev, &neo1973_vib_led.cdev);
-@@ -141,6 +157,10 @@ static int __init neo1973_vib_probe(struct platform_device *pdev)
- static int neo1973_vib_remove(struct platform_device *pdev)
- {
-+      if (machine_is_neo1973_gta02()) /* use FIQ to control GPIO */
-+              fiq_ipc.vib_pwm = 0; /* off */
-+      /* would only need kick if already off so no kick needed */
-+
-       if (neo1973_vib_led.has_pwm)
-               s3c2410_pwm_disable(&neo1973_vib_led.pwm);
-diff --git a/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h b/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-index 6cbd8e4..507d235 100644
---- a/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-+++ b/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-@@ -16,8 +16,15 @@
-  * for testing
-  */
-+#include <asm/arch/pwm.h>
-+#include <asm/plat-s3c/regs-timer.h>
-+
-+
- struct fiq_ipc {
--      u8 u8a[0]; /* placeholder */
-+      /* vibrator */
-+      unsigned long vib_gpio_pin; /* which pin to meddle with */
-+      u8 vib_pwm; /* 0 = OFF -- will ensure GPIO deasserted and stop FIQ */
-+      u8 vib_pwm_latched;
- };
- /* actual definition lives in arch/arm/mach-s3c2440/fiq_c_isr.c */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1048-fiq-hdq.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1048-fiq-hdq.patch.patch
deleted file mode 100755 (executable)
index b8189a1..0000000
+++ /dev/null
@@ -1,606 +0,0 @@
-From d183fa083737f2b042ecf92166951c30fd83fe61 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 22:21:23 +0100
-Subject: [PATCH] fiq-hdq.patch
-
----
- arch/arm/mach-s3c2440/mach-gta02.c           |  204 +++++++++++++++++++++-
- drivers/power/Kconfig                        |    8 +
- drivers/power/Makefile                       |    2 +
- drivers/power/gta02_hdq.c                    |  250 ++++++++++++++++++++++++++
- include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h |   23 +++
- include/asm-arm/arch-s3c2410/gta02.h         |    1 +
- include/linux/gta02_hdq.h                    |    8 +
- 7 files changed, 495 insertions(+), 1 deletions(-)
- create mode 100644 drivers/power/gta02_hdq.c
- create mode 100644 include/linux/gta02_hdq.h
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 8c7bbe7..cea76e7 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -99,6 +99,19 @@ EXPORT_SYMBOL(fiq_ipc);
- #define FIQ_DIVISOR_VIBRATOR DIVISOR_FROM_US(100)
-+#ifdef CONFIG_GTA02_HDQ
-+/* HDQ specific */
-+#define HDQ_SAMPLE_PERIOD_US 20
-+/* private HDQ FSM state -- all other info interesting for caller in fiq_ipc */
-+static enum hdq_bitbang_states hdq_state;
-+static u8 hdq_ctr;
-+static u8 hdq_ctr2;
-+static u8 hdq_bit;
-+static u8 hdq_shifter;
-+static u8 hdq_tx_data_done;
-+
-+#define FIQ_DIVISOR_HDQ DIVISOR_FROM_US(HDQ_SAMPLE_PERIOD_US)
-+#endif
- /* define FIQ ISR */
- FIQ_HANDLER_START()
-@@ -121,9 +134,171 @@ FIQ_HANDLER_ENTRY(256, 512)
-               divisor = FIQ_DIVISOR_VIBRATOR;
-       }
--      /* TODO: HDQ servicing */
-+#ifdef CONFIG_GTA02_HDQ
-+      /* HDQ servicing */
-+
-+      switch (hdq_state) {
-+      case HDQB_IDLE:
-+              if (fiq_ipc.hdq_request_ctr == fiq_ipc.hdq_transaction_ctr)
-+                      break;
-+              hdq_ctr = 210 / HDQ_SAMPLE_PERIOD_US;
-+              s3c2410_gpio_setpin(fiq_ipc.hdq_gpio_pin, 0);
-+              s3c2410_gpio_cfgpin(fiq_ipc.hdq_gpio_pin, S3C2410_GPIO_OUTPUT);
-+              hdq_tx_data_done = 0;
-+              hdq_state = HDQB_TX_BREAK;
-+              break;
-+
-+      case HDQB_TX_BREAK: /* issue low for > 190us */
-+              if (--hdq_ctr == 0) {
-+                      hdq_ctr = 60 / HDQ_SAMPLE_PERIOD_US;
-+                      hdq_state = HDQB_TX_BREAK_RECOVERY;
-+                      s3c2410_gpio_setpin(fiq_ipc.hdq_gpio_pin, 1);
-+              }
-+              break;
-+
-+      case HDQB_TX_BREAK_RECOVERY: /* issue low for > 40us */
-+              if (--hdq_ctr)
-+                      break;
-+              hdq_shifter = fiq_ipc.hdq_ads;
-+              hdq_bit = 8; /* 8 bits of ads / rw */
-+              hdq_tx_data_done = 0; /* doing ads */
-+              /* fallthru on last one */
-+      case HDQB_ADS_CALC:
-+              if (hdq_shifter & 1)
-+                      hdq_ctr = 50 / HDQ_SAMPLE_PERIOD_US;
-+              else
-+                      hdq_ctr = 120 / HDQ_SAMPLE_PERIOD_US;
-+              /* carefully precompute the other phase length */
-+              hdq_ctr2 = (210 - (hdq_ctr * HDQ_SAMPLE_PERIOD_US)) /
-+                              HDQ_SAMPLE_PERIOD_US;
-+              hdq_state = HDQB_ADS_LOW;
-+              hdq_shifter >>= 1;
-+              hdq_bit--;
-+              s3c2410_gpio_setpin(fiq_ipc.hdq_gpio_pin, 0);
-+              break;
-+
-+      case HDQB_ADS_LOW:
-+              if (--hdq_ctr)
-+                      break;
-+              s3c2410_gpio_setpin(fiq_ipc.hdq_gpio_pin, 1);
-+              hdq_state = HDQB_ADS_HIGH;
-+              break;
-+
-+      case HDQB_ADS_HIGH:
-+              if (--hdq_ctr2 > 1) /* account for HDQB_ADS_CALC */
-+                      break;
-+              if (hdq_bit) { /* more bits to do */
-+                      hdq_state = HDQB_ADS_CALC;
-+                      break;
-+              }
-+              /* no more bits, wait it out until hdq_ctr2 exhausted */
-+              if (hdq_ctr2)
-+                      break;
-+              /* ok no more bits and very last state */
-+              hdq_ctr = 60 / HDQ_SAMPLE_PERIOD_US;
-+              /* FIXME 0 = read */
-+              if (fiq_ipc.hdq_ads & 0x80) { /* write the byte out */
-+                       /* set delay before payload */
-+                      hdq_ctr = 300 / HDQ_SAMPLE_PERIOD_US;
-+                      /* already high, no need to write */
-+                      hdq_state = HDQB_WAIT_TX;
-+                      break;
-+              }
-+              /* read the next byte */
-+              hdq_bit = 8; /* 8 bits of data */
-+              hdq_ctr = 3000 / HDQ_SAMPLE_PERIOD_US;
-+              hdq_state = HDQB_WAIT_RX;
-+              s3c2410_gpio_cfgpin(fiq_ipc.hdq_gpio_pin, S3C2410_GPIO_INPUT);
-+              break;
-+
-+      case HDQB_WAIT_TX: /* issue low for > 40us */
-+              if (--hdq_ctr)
-+                      break;
-+              if (!hdq_tx_data_done) { /* was that the data sent? */
-+                      hdq_tx_data_done++;
-+                      hdq_shifter = fiq_ipc.hdq_tx_data;
-+                      hdq_bit = 8; /* 8 bits of data */
-+                      hdq_state = HDQB_ADS_CALC; /* start sending */
-+                      break;
-+              }
-+              fiq_ipc.hdq_error = 0;
-+              fiq_ipc.hdq_transaction_ctr++;
-+              hdq_state = HDQB_IDLE; /* all tx is done */
-+              /* idle in input mode, it's pulled up by 10K */
-+              s3c2410_gpio_cfgpin(fiq_ipc.hdq_gpio_pin, S3C2410_GPIO_INPUT);
-+              break;
-+
-+      case HDQB_WAIT_RX: /* wait for battery to talk to us */
-+              if (s3c2410_gpio_getpin(fiq_ipc.hdq_gpio_pin) == 0) {
-+                      /* it talks to us! */
-+                      hdq_ctr2 = 1;
-+                      hdq_bit = 8; /* 8 bits of data */
-+                      /* timeout */
-+                      hdq_ctr = 300 / HDQ_SAMPLE_PERIOD_US;
-+                      hdq_state = HDQB_DATA_RX_LOW;
-+                      break;
-+              }
-+              if (--hdq_ctr == 0) { /* timed out, error */
-+                      fiq_ipc.hdq_error = 1;
-+                      fiq_ipc.hdq_transaction_ctr++;
-+                      hdq_state = HDQB_IDLE; /* abort */
-+              }
-+              break;
-+
-+      /*
-+       * HDQ basically works by measuring the low time of the bit cell
-+       * 32-50us --> '1', 80 - 145us --> '0'
-+       */
-+
-+      case HDQB_DATA_RX_LOW:
-+              if (s3c2410_gpio_getpin(fiq_ipc.hdq_gpio_pin)) {
-+                      fiq_ipc.hdq_rx_data >>= 1;
-+                      if (hdq_ctr2 <= (65 / HDQ_SAMPLE_PERIOD_US))
-+                              fiq_ipc.hdq_rx_data |= 0x80;
-+
-+                      if (--hdq_bit == 0) {
-+                              fiq_ipc.hdq_error = 0;
-+                              fiq_ipc.hdq_transaction_ctr++; /* done */
-+                              hdq_state = HDQB_IDLE;
-+                      } else
-+                              hdq_state = HDQB_DATA_RX_HIGH;
-+                      /* timeout */
-+                      hdq_ctr = 1000 / HDQ_SAMPLE_PERIOD_US;
-+                      hdq_ctr2 = 1;
-+                      break;
-+              }
-+              hdq_ctr2++;
-+              if (--hdq_ctr)
-+                      break;
-+               /* timed out, error */
-+              fiq_ipc.hdq_error = 2;
-+              fiq_ipc.hdq_transaction_ctr++;
-+              hdq_state = HDQB_IDLE; /* abort */
-+              break;
-+      case HDQB_DATA_RX_HIGH:
-+              if (!s3c2410_gpio_getpin(fiq_ipc.hdq_gpio_pin)) {
-+                      /* it talks to us! */
-+                      hdq_ctr2 = 1;
-+                      /* timeout */
-+                      hdq_ctr = 400 / HDQ_SAMPLE_PERIOD_US;
-+                      hdq_state = HDQB_DATA_RX_LOW;
-+                      break;
-+              }
-+              if (--hdq_ctr)
-+                      break;
-+              /* timed out, error */
-+              fiq_ipc.hdq_error = 3;
-+              fiq_ipc.hdq_transaction_ctr++;
-+              /* we're in input mode already */
-+              hdq_state = HDQB_IDLE; /* abort */
-+              break;
-+      }
-+      if (hdq_state != HDQB_IDLE) /* ie, not idle */
-+              if (divisor > FIQ_DIVISOR_HDQ)
-+                      divisor = FIQ_DIVISOR_HDQ; /* keep us going */
-+#endif
-       /* disable further timer interrupts if nobody has any work
-        * or adjust rate according to who still has work
-@@ -391,6 +566,23 @@ struct platform_device sc32440_fiq_device = {
-       .resource       = sc32440_fiq_resources,
- };
-+#ifdef CONFIG_GTA02_HDQ
-+/* HDQ */
-+
-+static struct resource gta02_hdq_resources[] = {
-+      [0] = {
-+              .start  = GTA02v5_GPIO_HDQ,
-+              .end    = GTA02v5_GPIO_HDQ,
-+      },
-+};
-+
-+struct platform_device gta02_hdq_device = {
-+      .name           = "gta02-hdq",
-+      .num_resources  = 1,
-+      .resource       = gta02_hdq_resources,
-+};
-+#endif
-+
- /* NOR Flash */
- #define GTA02_FLASH_BASE      0x18000000 /* GCS3 */
-@@ -1074,6 +1266,16 @@ static void __init gta02_machine_init(void)
-       platform_add_devices(gta02_devices, ARRAY_SIZE(gta02_devices));
-+#ifdef CONFIG_GTA02_HDQ
-+      switch (system_rev) {
-+      case GTA02v5_SYSTEM_REV:
-+      case GTA02v6_SYSTEM_REV:
-+              platform_device_register(&gta02_hdq_device);
-+              break;
-+      default:
-+              break;
-+      }
-+#endif
-       s3c2410_pm_init();
-       /* Set LCD_RESET / XRES to high */
-diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
-index 58c806e..0a4515d 100644
---- a/drivers/power/Kconfig
-+++ b/drivers/power/Kconfig
-@@ -50,3 +50,11 @@ config BATTERY_OLPC
-         Say Y to enable support for the battery on the OLPC laptop.
- endif # POWER_SUPPLY
-+
-+config GTA02_HDQ
-+      tristate "Neo Freerunner HDQ"
-+      depends on MACH_NEO1973_GTA02 && FIQ && S3C2440_C_FIQ
-+      help
-+        Say Y to enable support for communicating with an HDQ battery
-+        on the Neo Freerunner.  You probably want to select
-+        at least BATTERY_BQ27000_HDQ as well
-diff --git a/drivers/power/Makefile b/drivers/power/Makefile
-index 6413ded..88f227f 100644
---- a/drivers/power/Makefile
-+++ b/drivers/power/Makefile
-@@ -20,3 +20,5 @@ obj-$(CONFIG_APM_POWER)              += apm_power.o
- obj-$(CONFIG_BATTERY_DS2760)  += ds2760_battery.o
- obj-$(CONFIG_BATTERY_PMU)     += pmu_battery.o
- obj-$(CONFIG_BATTERY_OLPC)    += olpc_battery.o
-+
-+obj-$(CONFIG_GTA02_HDQ)               += gta02_hdq.o
-diff --git a/drivers/power/gta02_hdq.c b/drivers/power/gta02_hdq.c
-new file mode 100644
-index 0000000..12c742e
---- /dev/null
-+++ b/drivers/power/gta02_hdq.c
-@@ -0,0 +1,250 @@
-+/*
-+ * HDQ driver for the FIC Neo1973 GTA02 GSM phone
-+ *
-+ * (C) 2006-2007 by OpenMoko, Inc.
-+ * Author: Andy Green <andy@openmoko.com>
-+ * 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 version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+#include <linux/platform_device.h>
-+#include <asm/hardware.h>
-+#include <asm/mach-types.h>
-+#include <asm/arch/gta02.h>
-+#include <asm/arch/fiq_ipc_gta02.h>
-+
-+
-+
-+#define HDQ_READ 0
-+#define HDQ_WRITE 0x80
-+
-+
-+int gta02hdq_initialized(void)
-+{
-+      return fiq_ipc.hdq_probed;
-+}
-+EXPORT_SYMBOL_GPL(gta02hdq_initialized);
-+
-+int gta02hdq_read(int address)
-+{
-+      int count_sleeps = 5;
-+      int ret = -ETIME;
-+
-+      mutex_lock(&fiq_ipc.hdq_lock);
-+
-+      fiq_ipc.hdq_ads = address | HDQ_READ;
-+      fiq_ipc.hdq_request_ctr++;
-+      fiq_kick();
-+      /*
-+       * FIQ takes care of it while we block our calling process
-+       * But we're not spinning -- other processes run normally while
-+       * we wait for the result
-+       */
-+      while (count_sleeps--) {
-+              msleep(10); /* valid transaction always completes in < 10ms */
-+
-+              if (fiq_ipc.hdq_request_ctr != fiq_ipc.hdq_transaction_ctr)
-+                      continue;
-+
-+              if (fiq_ipc.hdq_error)
-+                      goto done; /* didn't see a response in good time */
-+
-+              ret = fiq_ipc.hdq_rx_data;
-+              goto done;
-+      }
-+      ret = -EINVAL;
-+
-+done:
-+      mutex_unlock(&fiq_ipc.hdq_lock);
-+      return ret;
-+}
-+EXPORT_SYMBOL_GPL(gta02hdq_read);
-+
-+int gta02hdq_write(int address, u8 data)
-+{
-+      int count_sleeps = 5;
-+      int ret = -ETIME;
-+
-+      mutex_lock(&fiq_ipc.hdq_lock);
-+
-+      fiq_ipc.hdq_ads = address | HDQ_WRITE;
-+      fiq_ipc.hdq_tx_data = data;
-+      fiq_ipc.hdq_request_ctr++;
-+      fiq_kick();
-+      /*
-+       * FIQ takes care of it while we block our calling process
-+       * But we're not spinning -- other processes run normally while
-+       * we wait for the result
-+       */
-+      while (count_sleeps--) {
-+              msleep(10); /* valid transaction always completes in < 10ms */
-+
-+              if (fiq_ipc.hdq_request_ctr != fiq_ipc.hdq_transaction_ctr)
-+                      continue; /* something bad with FIQ */
-+
-+              if (fiq_ipc.hdq_error)
-+                      goto done; /* didn't see a response in good time */
-+      }
-+      ret = -EINVAL;
-+
-+done:
-+      mutex_unlock(&fiq_ipc.hdq_lock);
-+      return ret;
-+}
-+EXPORT_SYMBOL_GPL(gta02hdq_write);
-+
-+/* sysfs */
-+
-+static ssize_t hdq_sysfs_dump(struct device *dev, struct device_attribute *attr,
-+                       char *buf)
-+{
-+      int n;
-+      int v;
-+      u8 u8a[128]; /* whole address space for HDQ */
-+      char *end = buf;
-+
-+      /* the dump does not take care about 16 bit regs, because at this
-+       * bus level we don't know about the chip details
-+       */
-+      for (n = 0; n < sizeof(u8a); n++) {
-+              v = gta02hdq_read(n);
-+              if (v < 0)
-+                      goto bail;
-+              u8a[n] = v;
-+      }
-+
-+      for (n = 0; n < sizeof(u8a); n += 16) {
-+              hex_dump_to_buffer(u8a + n, sizeof(u8a), 16, 1, end, 4096, 0);
-+              end += strlen(end);
-+              *end++ = '\n';
-+              *end = '\0';
-+      }
-+      return (end - buf);
-+
-+bail:
-+      return sprintf(buf, "ERROR %d\n", v);
-+}
-+
-+/* you write by <address> <data>, eg, "34 128" */
-+
-+#define atoi(str) simple_strtoul(((str != NULL) ? str : ""), NULL, 0)
-+
-+static ssize_t hdq_sysfs_write(struct device *dev,
-+                             struct device_attribute *attr,
-+                             const char *buf, size_t count)
-+{
-+      const char *end = buf + count;
-+      int address = atoi(buf);
-+
-+      while ((buf != end) && (*buf != ' '))
-+              buf++;
-+      if (buf >= end)
-+              return 0;
-+      while ((buf < end) && (*buf == ' '))
-+              buf++;
-+      if (buf >= end)
-+              return 0;
-+
-+      gta02hdq_write(address, atoi(buf));
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(dump, 0400, hdq_sysfs_dump, NULL);
-+static DEVICE_ATTR(write, 0600, NULL, hdq_sysfs_write);
-+
-+static struct attribute *gta02hdq_sysfs_entries[] = {
-+      &dev_attr_dump.attr,
-+      &dev_attr_write.attr,
-+      NULL
-+};
-+
-+static struct attribute_group gta02hdq_attr_group = {
-+      .name   = "hdq",
-+      .attrs  = gta02hdq_sysfs_entries,
-+};
-+
-+
-+#ifdef CONFIG_PM
-+static int gta02hdq_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+      /* after 18s of this, the battery monitor will also go to sleep */
-+      s3c2410_gpio_setpin(fiq_ipc.hdq_gpio_pin, 0);
-+      s3c2410_gpio_cfgpin(fiq_ipc.hdq_gpio_pin, S3C2410_GPIO_OUTPUT);
-+      return 0;
-+}
-+
-+static int gta02hdq_resume(struct platform_device *pdev)
-+{
-+      s3c2410_gpio_setpin(fiq_ipc.hdq_gpio_pin, 1);
-+      s3c2410_gpio_cfgpin(fiq_ipc.hdq_gpio_pin, S3C2410_GPIO_OUTPUT);
-+      return 0;
-+}
-+#endif
-+
-+static int __init gta02hdq_probe(struct platform_device *pdev)
-+{
-+      struct resource *r = platform_get_resource(pdev, 0, 0);
-+
-+      if (!machine_is_neo1973_gta02())
-+              return -EIO;
-+
-+      if (!r)
-+              return -EINVAL;
-+
-+      platform_set_drvdata(pdev, NULL);
-+
-+      mutex_init(&fiq_ipc.hdq_lock);
-+
-+      /* set our HDQ comms pin from the platform data */
-+      fiq_ipc.hdq_gpio_pin = r->start;
-+
-+      s3c2410_gpio_setpin(fiq_ipc.hdq_gpio_pin, 1);
-+      s3c2410_gpio_cfgpin(fiq_ipc.hdq_gpio_pin, S3C2410_GPIO_OUTPUT);
-+
-+      fiq_ipc.hdq_probed = 1; /* we are ready to do stuff now */
-+
-+      return sysfs_create_group(&pdev->dev.kobj, &gta02hdq_attr_group);
-+}
-+
-+static int gta02hdq_remove(struct platform_device *pdev)
-+{
-+      sysfs_remove_group(&pdev->dev.kobj, &gta02hdq_attr_group);
-+      return 0;
-+}
-+
-+static struct platform_driver gta02hdq_driver = {
-+      .probe          = gta02hdq_probe,
-+      .remove         = gta02hdq_remove,
-+#ifdef CONFIG_PM
-+      .suspend        = gta02hdq_suspend,
-+      .resume         = gta02hdq_resume,
-+#endif
-+      .driver         = {
-+              .name           = "gta02-hdq",
-+      },
-+};
-+
-+static int __init gta02hdq_init(void)
-+{
-+      return platform_driver_register(&gta02hdq_driver);
-+}
-+
-+static void __exit gta02hdq_exit(void)
-+{
-+      platform_driver_unregister(&gta02hdq_driver);
-+}
-+
-+module_init(gta02hdq_init);
-+module_exit(gta02hdq_exit);
-+
-+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
-+MODULE_DESCRIPTION("GTA02 HDQ driver");
-+MODULE_LICENSE("GPL");
-diff --git a/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h b/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-index 507d235..c5eb3df 100644
---- a/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-+++ b/include/asm-arm/arch-s3c2410/fiq_ipc_gta02.h
-@@ -19,12 +19,35 @@
- #include <asm/arch/pwm.h>
- #include <asm/plat-s3c/regs-timer.h>
-+enum hdq_bitbang_states {
-+      HDQB_IDLE = 0,
-+      HDQB_TX_BREAK,
-+      HDQB_TX_BREAK_RECOVERY,
-+      HDQB_ADS_CALC,
-+      HDQB_ADS_LOW,
-+      HDQB_ADS_HIGH,
-+      HDQB_WAIT_RX,
-+      HDQB_DATA_RX_LOW,
-+      HDQB_DATA_RX_HIGH,
-+      HDQB_WAIT_TX,
-+};
- struct fiq_ipc {
-       /* vibrator */
-       unsigned long vib_gpio_pin; /* which pin to meddle with */
-       u8 vib_pwm; /* 0 = OFF -- will ensure GPIO deasserted and stop FIQ */
-       u8 vib_pwm_latched;
-+
-+      /* hdq */
-+      u8 hdq_probed; /* nonzero after HDQ driver probed */
-+      struct mutex hdq_lock; /* if you want to use hdq, you have to take lock */
-+      unsigned long hdq_gpio_pin; /* GTA02 = GPD14 which pin to meddle with */
-+      u8 hdq_ads; /* b7..b6 = register address, b0 = r/w */
-+      u8 hdq_tx_data; /* data to tx for write action */
-+      u8 hdq_rx_data; /* data received in read action */
-+      u8 hdq_request_ctr; /* incremented by "user" to request a transfer */
-+      u8 hdq_transaction_ctr; /* incremented after each transfer */
-+      u8 hdq_error; /* 0 = no error */
- };
- /* actual definition lives in arch/arm/mach-s3c2440/fiq_c_isr.c */
-diff --git a/include/asm-arm/arch-s3c2410/gta02.h b/include/asm-arm/arch-s3c2410/gta02.h
-index fa49d93..f686a7a 100644
---- a/include/asm-arm/arch-s3c2410/gta02.h
-+++ b/include/asm-arm/arch-s3c2410/gta02.h
-@@ -37,6 +37,7 @@
- #define GTA02v3_GPIO_nG1_CS   S3C2410_GPD12   /* v3 + v4 only */
- #define GTA02v3_GPIO_nG2_CS   S3C2410_GPD13   /* v3 + v4 only */
-+#define GTA02v5_GPIO_HDQ      S3C2410_GPD14   /* v5 + */
- #define GTA02_GPIO_nG1_INT    S3C2410_GPF0
- #define GTA02_GPIO_IO1                S3C2410_GPF1
-diff --git a/include/linux/gta02_hdq.h b/include/linux/gta02_hdq.h
-new file mode 100644
-index 0000000..2f43a62
---- /dev/null
-+++ b/include/linux/gta02_hdq.h
-@@ -0,0 +1,8 @@
-+#ifndef __GTA02HDQ_H__
-+#define __GTA02HDQ_H__
-+
-+int gta02hdq_read(int address);
-+int gta02hdq_write(int address, u8 data);
-+int gta02hdq_initialized(void);
-+
-+#endif
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1049-bq27000-battery-driver.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1049-bq27000-battery-driver.patch.patch
deleted file mode 100755 (executable)
index 9e7ae11..0000000
+++ /dev/null
@@ -1,510 +0,0 @@
-From 2bab304b10f077cb88d5b5f5bd7e50c16aac2132 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 22:21:23 +0100
-Subject: [PATCH] bq27000-battery-driver.patch
-
----
- arch/arm/mach-s3c2440/Kconfig      |    2 +
- arch/arm/mach-s3c2440/mach-gta02.c |   21 ++
- drivers/power/Kconfig              |    7 +-
- drivers/power/Makefile             |    1 +
- drivers/power/bq27000_battery.c    |  375 ++++++++++++++++++++++++++++++++++++
- include/linux/bq27000_battery.h    |   12 ++
- 6 files changed, 417 insertions(+), 1 deletions(-)
- create mode 100644 drivers/power/bq27000_battery.c
- create mode 100644 include/linux/bq27000_battery.h
-
-diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
-index 3015aaf..b417f8e 100644
---- a/arch/arm/mach-s3c2440/Kconfig
-+++ b/arch/arm/mach-s3c2440/Kconfig
-@@ -79,6 +79,8 @@ config MACH_NEO1973_GTA02
-       bool "FIC Neo1973 GSM Phone (GTA02 Hardware)"
-       select CPU_S3C2442
-       select SENSORS_PCF50633
-+      select POWER_SUPPLY
-+      select GTA02_HDQ
-       help
-          Say Y here if you are using the FIC Neo1973 GSM Phone
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index cea76e7..3816ea5 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -81,6 +81,8 @@
- #include <asm/arch/fiq_ipc_gta02.h>
- #include "fiq_c_isr.h"
-+#include <linux/gta02_hdq.h>
-+#include <linux/bq27000_battery.h>
- /* arbitrates which sensor IRQ owns the shared SPI bus */
- static spinlock_t motion_irq_lock;
-@@ -583,6 +585,24 @@ struct platform_device gta02_hdq_device = {
- };
- #endif
-+/* BQ27000 Battery */
-+
-+struct bq27000_platform_data bq27000_pdata = {
-+      .name = "bat",
-+      .rsense_mohms = 20,
-+      .hdq_read = gta02hdq_read,
-+      .hdq_write = gta02hdq_write,
-+      .hdq_initialized = gta02hdq_initialized,
-+};
-+
-+struct platform_device bq27000_battery_device = {
-+      .name           = "bq27000-battery",
-+      .dev = {
-+              .platform_data = &bq27000_pdata,
-+      },
-+};
-+
-+
- /* NOR Flash */
- #define GTA02_FLASH_BASE      0x18000000 /* GCS3 */
-@@ -1271,6 +1291,7 @@ static void __init gta02_machine_init(void)
-       case GTA02v5_SYSTEM_REV:
-       case GTA02v6_SYSTEM_REV:
-               platform_device_register(&gta02_hdq_device);
-+              platform_device_register(&bq27000_battery_device);
-               break;
-       default:
-               break;
-diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
-index 0a4515d..feb8b0a 100644
---- a/drivers/power/Kconfig
-+++ b/drivers/power/Kconfig
-@@ -49,7 +49,10 @@ config BATTERY_OLPC
-       help
-         Say Y to enable support for the battery on the OLPC laptop.
--endif # POWER_SUPPLY
-+config BATTERY_BQ27000_HDQ
-+      tristate "BQ27000 HDQ battery monitor driver"
-+      help
-+        Say Y to enable support for the battery on the Neo Freerunner
- config GTA02_HDQ
-       tristate "Neo Freerunner HDQ"
-@@ -58,3 +61,5 @@ config GTA02_HDQ
-         Say Y to enable support for communicating with an HDQ battery
-         on the Neo Freerunner.  You probably want to select
-         at least BATTERY_BQ27000_HDQ as well
-+
-+endif # POWER_SUPPLY
-diff --git a/drivers/power/Makefile b/drivers/power/Makefile
-index 88f227f..d7e87ad 100644
---- a/drivers/power/Makefile
-+++ b/drivers/power/Makefile
-@@ -20,5 +20,6 @@ obj-$(CONFIG_APM_POWER)              += apm_power.o
- obj-$(CONFIG_BATTERY_DS2760)  += ds2760_battery.o
- obj-$(CONFIG_BATTERY_PMU)     += pmu_battery.o
- obj-$(CONFIG_BATTERY_OLPC)    += olpc_battery.o
-+obj-$(CONFIG_BATTERY_BQ27000_HDQ)     += bq27000_battery.o
- obj-$(CONFIG_GTA02_HDQ)               += gta02_hdq.o
-diff --git a/drivers/power/bq27000_battery.c b/drivers/power/bq27000_battery.c
-new file mode 100644
-index 0000000..d19186a
---- /dev/null
-+++ b/drivers/power/bq27000_battery.c
-@@ -0,0 +1,375 @@
-+/*
-+ * Driver for batteries with bq27000 chips inside via HDQ
-+ *
-+ * Copyright 2008 Openmoko, Inc
-+ * Andy Green <andy@openmoko.com>
-+ *
-+ * based on ds2760 driver, original copyright notice for that --->
-+ *
-+ * Copyright © 2007 Anton Vorontsov
-+ *           2004-2007 Matt Reimer
-+ *           2004 Szabolcs Gyurko
-+ *
-+ * Use consistent with the GNU GPL is permitted,
-+ * provided that this copyright notice is
-+ * preserved in its entirety in all copies and derived works.
-+ *
-+ * Author:  Anton Vorontsov <cbou@mail.ru>
-+ *        February 2007
-+ *
-+ *        Matt Reimer <mreimer@vpop.net>
-+ *        April 2004, 2005, 2007
-+ *
-+ *        Szabolcs Gyurko <szabolcs.gyurko@tlt.hu>
-+ *        September 2004
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/param.h>
-+#include <linux/jiffies.h>
-+#include <linux/delay.h>
-+#include <linux/pm.h>
-+#include <linux/platform_device.h>
-+#include <linux/power_supply.h>
-+#include <linux/bq27000_battery.h>
-+
-+enum bq27000_regs {
-+      /* RAM regs */
-+              /* read-write after this */
-+      BQ27000_CTRL = 0, /* Device Control Register */
-+      BQ27000_MODE, /* Device Mode Register */
-+      BQ27000_AR_L, /* At-Rate H L */
-+      BQ27000_AR_H,
-+              /* read-only after this */
-+      BQ27000_ARTTE_L, /* At-Rate Time To Empty H L */
-+      BQ27000_ARTTE_H,
-+      BQ27000_TEMP_L, /* Reported Temperature H L */
-+      BQ27000_TEMP_H,
-+      BQ27000_VOLT_L, /* Reported Voltage H L */
-+      BQ27000_VOLT_H,
-+      BQ27000_FLAGS, /* Status Flags */
-+      BQ27000_RSOC, /* Relative State of Charge */
-+      BQ27000_NAC_L, /* Nominal Available Capacity H L */
-+      BQ27000_NAC_H,
-+      BQ27000_CACD_L, /* Discharge Compensated H L */
-+      BQ27000_CACD_H,
-+      BQ27000_CACT_L, /* Temperature Compensated H L */
-+      BQ27000_CACT_H,
-+      BQ27000_LMD_L, /* Last measured discharge H L */
-+      BQ27000_LMD_H,
-+      BQ27000_AI_L, /* Average Current H L */
-+      BQ27000_AI_H,
-+      BQ27000_TTE_L, /* Time to Empty H L */
-+      BQ27000_TTE_H,
-+      BQ27000_TTF_L, /* Time to Full H L */
-+      BQ27000_TTF_H,
-+      BQ27000_SI_L, /* Standby Current H L */
-+      BQ27000_SI_H,
-+      BQ27000_STTE_L, /* Standby Time To Empty H L */
-+      BQ27000_STTE_H,
-+      BQ27000_MLI_L, /* Max Load Current H L */
-+      BQ27000_MLI_H,
-+      BQ27000_MLTTE_L, /* Max Load Time To Empty H L */
-+      BQ27000_MLTTE_H,
-+      BQ27000_SAE_L, /* Available Energy H L */
-+      BQ27000_SAE_H,
-+      BQ27000_AP_L, /* Available Power H L */
-+      BQ27000_AP_H,
-+      BQ27000_TTECP_L, /* Time to Empty at Constant Power H L */
-+      BQ27000_TTECP_H,
-+      BQ27000_CYCL_L, /* Cycle count since learning cycle H L */
-+      BQ27000_CYCL_H,
-+      BQ27000_CYCT_L, /* Cycle Count Total H L */
-+      BQ27000_CYCT_H,
-+      BQ27000_CSOC, /* Compensated State Of Charge */
-+      /* EEPROM regs */
-+              /* read-write after this */
-+      BQ27000_EE_EE_EN = 0x6e, /* EEPROM Program Enable */
-+      BQ27000_EE_ILMD = 0x76, /* Initial Last Measured Discharge High Byte */
-+      BQ27000_EE_SEDVF, /* Scaled EDVF Threshold */
-+      BQ27000_EE_SEDV1, /* Scaled EDV1 Threshold */
-+      BQ27000_EE_ISLC, /* Initial Standby Load Current */
-+      BQ27000_EE_DMFSD, /* Digital Magnitude Filter and Self Discharge */
-+      BQ27000_EE_TAPER, /* Aging Estimate Enable, Charge Termination Taper */
-+      BQ27000_EE_PKCFG, /* Pack Configuration Values */
-+      BQ27000_EE_IMLC, /* Initial Max Load Current or ID #3 */
-+      BQ27000_EE_DCOMP, /* Discharge rate compensation constants or ID #2 */
-+      BQ27000_EE_TCOMP, /* Temperature Compensation constants or ID #1 */
-+};
-+
-+enum bq27000_status_flags {
-+      BQ27000_STATUS_CHGS = 0x80, /* 1 = being charged */
-+      BQ27000_STATUS_NOACT = 0x40, /* 1 = no activity */
-+      BQ27000_STATUS_IMIN = 0x20, /* 1 = Lion taper current mode */
-+      BQ27000_STATUS_CI = 0x10, /* 1 = capacity likely  innacurate */
-+      BQ27000_STATUS_CALIP = 0x08, /* 1 = calibration in progress */
-+      BQ27000_STATUS_VDQ = 0x04, /* 1 = capacity should be accurate */
-+      BQ27000_STATUS_EDV1 = 0x02, /* 1 = end of discharge.. <6% left */
-+      BQ27000_STATUS_EDVF = 0x01, /* 1 = no, it's really empty now */
-+};
-+
-+#define NANOVOLTS_UNIT 3750
-+
-+struct bq27000_device_info {
-+      struct device *dev;
-+      struct power_supply bat;
-+
-+      int rsense_mohms;               /* from platform */
-+
-+      int (*hdq_initialized)(void); /* from platform */
-+      int (*hdq_read)(int); /* from platform */
-+      int (*hdq_write)(int, u8); /* from platform */
-+};
-+
-+/*
-+ * reading 16 bit values over HDQ has a special hazard where the
-+ * hdq device firmware can update the 16-bit register during the time we
-+ * read the two halves.  TI document SLUS556D recommends the algorithm here
-+ * to avoid trouble
-+ */
-+
-+static int hdq_read16(struct bq27000_device_info *di, int address)
-+{
-+      int acc;
-+      int high;
-+      int retries = 3;
-+
-+      while (retries--) {
-+
-+              high = (di->hdq_read)(address + 1); /* high part */
-+
-+              if (high < 0)
-+                      return high;
-+              acc = (di->hdq_read)(address);
-+              if (acc < 0)
-+                      return acc;
-+
-+              /* confirm high didn't change between reading it and low */
-+              if (high == (di->hdq_read)(address + 1))
-+                      return (high << 8) | acc;
-+      }
-+
-+      return -ETIME;
-+}
-+
-+#define to_bq27000_device_info(x) container_of((x), \
-+                                             struct bq27000_device_info, \
-+                                             bat);
-+
-+static void bq27000_battery_external_power_changed(struct power_supply *psy)
-+{
-+      struct bq27000_device_info *di = to_bq27000_device_info(psy);
-+
-+      dev_dbg(di->dev, "%s\n", __FUNCTION__);
-+}
-+
-+static int bq27000_battery_get_property(struct power_supply *psy,
-+                                     enum power_supply_property psp,
-+                                     union power_supply_propval *val)
-+{
-+      int v, n;
-+      struct bq27000_device_info *di = to_bq27000_device_info(psy);
-+
-+      if (!(di->hdq_initialized)())
-+              return -EINVAL;
-+
-+      switch (psp) {
-+      case POWER_SUPPLY_PROP_STATUS:
-+              val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
-+              v = hdq_read16(di, BQ27000_AI_L);
-+              if (v < 0)
-+                      return v;
-+              if (v < 2) { /* no real activity on the battery */
-+                      if (!hdq_read16(di, BQ27000_TTF_L))
-+                              val->intval = POWER_SUPPLY_STATUS_FULL;
-+                      else
-+                              val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
-+                      break;
-+              }
-+              /* power is actually going in or out... */
-+              v = (di->hdq_read)(BQ27000_FLAGS);
-+              if (v < 0)
-+                      return v;
-+              if (v & BQ27000_STATUS_CHGS)
-+                      val->intval = POWER_SUPPLY_STATUS_CHARGING;
-+              else
-+                      val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
-+              break;
-+      case POWER_SUPPLY_PROP_VOLTAGE_NOW:
-+              v = hdq_read16(di, BQ27000_VOLT_L);
-+              if (v < 0)
-+                      return v;
-+              val->intval = v * 1000; /* mV -> uV */
-+              break;
-+      case POWER_SUPPLY_PROP_CURRENT_NOW:
-+              v = (di->hdq_read)(BQ27000_FLAGS);
-+              if (v < 0)
-+                      return v;
-+              if (v & BQ27000_STATUS_CHGS)
-+                      n = -NANOVOLTS_UNIT;
-+              else
-+                      n = NANOVOLTS_UNIT;
-+              v = hdq_read16(di, BQ27000_AI_L);
-+              if (v < 0)
-+                      return v;
-+              val->intval = (v * n) / di->rsense_mohms;
-+              break;
-+      case POWER_SUPPLY_PROP_CHARGE_FULL:
-+              v = hdq_read16(di, BQ27000_LMD_L);
-+              if (v < 0)
-+                      return v;
-+              val->intval = (v * 3570) / di->rsense_mohms;
-+              break;
-+      case POWER_SUPPLY_PROP_TEMP:
-+              v = hdq_read16(di, BQ27000_TEMP_L);
-+              if (v < 0)
-+                      return v;
-+              /* K (in 0.25K units) is 273.15 up from C (in 0.1C)*/
-+              /* 10926 = 27315 * 4 / 10 */
-+              val->intval = (((long)v * 10l) - 10926) / 4;
-+              break;
-+      case POWER_SUPPLY_PROP_TECHNOLOGY:
-+              val->intval = POWER_SUPPLY_TECHNOLOGY_LION;
-+              break;
-+      case POWER_SUPPLY_PROP_CAPACITY:
-+              val->intval = (di->hdq_read)(BQ27000_RSOC);
-+              if (val->intval < 0)
-+                      return val->intval;
-+              break;
-+      case POWER_SUPPLY_PROP_PRESENT:
-+              v = (di->hdq_read)(BQ27000_RSOC);
-+              val->intval = !(v < 0);
-+              break;
-+      case POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW:
-+              v = hdq_read16(di, BQ27000_TTE_L);
-+              if (v < 0)
-+                      return v;
-+              val->intval = 60 * v;
-+              break;
-+      case POWER_SUPPLY_PROP_TIME_TO_FULL_NOW:
-+              v = hdq_read16(di, BQ27000_TTF_L);
-+              if (v < 0)
-+                      return v;
-+              val->intval = 60 * v;
-+              break;
-+      default:
-+              return -EINVAL;
-+      }
-+
-+      return 0;
-+}
-+
-+static enum power_supply_property bq27000_battery_props[] = {
-+      POWER_SUPPLY_PROP_STATUS,
-+      POWER_SUPPLY_PROP_VOLTAGE_NOW,
-+      POWER_SUPPLY_PROP_CURRENT_NOW,
-+      POWER_SUPPLY_PROP_CHARGE_FULL,
-+      POWER_SUPPLY_PROP_TEMP,
-+      POWER_SUPPLY_PROP_TECHNOLOGY,
-+      POWER_SUPPLY_PROP_PRESENT,
-+      POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW,
-+      POWER_SUPPLY_PROP_TIME_TO_FULL_NOW,
-+      POWER_SUPPLY_PROP_MODEL_NAME,
-+      POWER_SUPPLY_PROP_CAPACITY
-+};
-+
-+static int bq27000_battery_probe(struct platform_device *pdev)
-+{
-+      int retval = 0;
-+      struct bq27000_device_info *di;
-+      struct bq27000_platform_data *pdata;
-+
-+      dev_info(&pdev->dev, "BQ27000 Battery Driver (C) 2008 Openmoko, Inc\n");
-+
-+      di = kzalloc(sizeof(*di), GFP_KERNEL);
-+      if (!di) {
-+              retval = -ENOMEM;
-+              goto di_alloc_failed;
-+      }
-+
-+      platform_set_drvdata(pdev, di);
-+
-+      pdata = pdev->dev.platform_data;
-+      di->dev         = &pdev->dev;
-+      /* di->w1_dev        = pdev->dev.parent; */
-+      di->bat.name       = pdata->name;
-+      di->bat.type       = POWER_SUPPLY_TYPE_BATTERY;
-+      di->bat.properties     = bq27000_battery_props;
-+      di->bat.num_properties = ARRAY_SIZE(bq27000_battery_props);
-+      di->bat.get_property   = bq27000_battery_get_property;
-+      di->bat.external_power_changed =
-+                                bq27000_battery_external_power_changed;
-+      di->hdq_read = pdata->hdq_read;
-+      di->hdq_write = pdata->hdq_write;
-+      di->rsense_mohms = pdata->rsense_mohms;
-+      di->hdq_initialized = pdata->hdq_initialized;
-+
-+      retval = power_supply_register(&pdev->dev, &di->bat);
-+      if (retval) {
-+              dev_err(di->dev, "failed to register battery\n");
-+              goto batt_failed;
-+      }
-+
-+      return 0;
-+
-+batt_failed:
-+      kfree(di);
-+di_alloc_failed:
-+      return retval;
-+}
-+
-+static int bq27000_battery_remove(struct platform_device *pdev)
-+{
-+      struct bq27000_device_info *di = platform_get_drvdata(pdev);
-+
-+      power_supply_unregister(&di->bat);
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+
-+static int bq27000_battery_suspend(struct platform_device *pdev,
-+                                pm_message_t state)
-+{
-+      return 0;
-+}
-+
-+static int bq27000_battery_resume(struct platform_device *pdev)
-+{
-+      return 0;
-+}
-+
-+#else
-+
-+#define bq27000_battery_suspend NULL
-+#define bq27000_battery_resume NULL
-+
-+#endif /* CONFIG_PM */
-+
-+static struct platform_driver bq27000_battery_driver = {
-+      .driver = {
-+              .name = "bq27000-battery",
-+      },
-+      .probe    = bq27000_battery_probe,
-+      .remove   = bq27000_battery_remove,
-+      .suspend  = bq27000_battery_suspend,
-+      .resume   = bq27000_battery_resume,
-+};
-+
-+static int __init bq27000_battery_init(void)
-+{
-+      return platform_driver_register(&bq27000_battery_driver);
-+}
-+
-+static void __exit bq27000_battery_exit(void)
-+{
-+      platform_driver_unregister(&bq27000_battery_driver);
-+}
-+
-+module_init(bq27000_battery_init);
-+module_exit(bq27000_battery_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
-+MODULE_DESCRIPTION("bq27000 battery driver");
-diff --git a/include/linux/bq27000_battery.h b/include/linux/bq27000_battery.h
-new file mode 100644
-index 0000000..36b4f20
---- /dev/null
-+++ b/include/linux/bq27000_battery.h
-@@ -0,0 +1,12 @@
-+#ifndef __BQ27000_BATTERY_H__
-+#define __BQ27000_BATTERY_H__
-+
-+struct bq27000_platform_data {
-+      const char      *name;
-+      int             rsense_mohms;
-+      int (*hdq_read)(int);
-+      int (*hdq_write)(int, u8);
-+      int (*hdq_initialized)(void);
-+};
-+
-+#endif
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1050-fix-EVIOCGRAB-semantics.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1050-fix-EVIOCGRAB-semantics.patch.patch
deleted file mode 100755 (executable)
index 5ef328b..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-From 6294c84872b0d26111bdd1b9e5fec41c8a087443 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 22:21:23 +0100
-Subject: [PATCH] fix-EVIOCGRAB-semantics.patch
-
----
- drivers/input/evdev.c |   32 +++++++++++++++-----------------
- 1 files changed, 15 insertions(+), 17 deletions(-)
-
-diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
-index b32984b..499ffe1 100644
---- a/drivers/input/evdev.c
-+++ b/drivers/input/evdev.c
-@@ -28,7 +28,7 @@ struct evdev {
-       char name[16];
-       struct input_handle handle;
-       wait_queue_head_t wait;
--      struct evdev_client *grab;
-+      int *grab;
-       struct list_head client_list;
-       spinlock_t client_lock; /* protects client_list */
-       struct mutex mutex;
-@@ -39,6 +39,7 @@ struct evdev_client {
-       struct input_event buffer[EVDEV_BUFFER_SIZE];
-       int head;
-       int tail;
-+      int grab;
-       spinlock_t buffer_lock; /* protects access to buffer, head and tail */
-       struct fasync_struct *fasync;
-       struct evdev *evdev;
-@@ -79,12 +80,8 @@ static void evdev_event(struct input_handle *handle,
-       rcu_read_lock();
--      client = rcu_dereference(evdev->grab);
--      if (client)
-+      list_for_each_entry_rcu(client, &evdev->client_list, node)
-               evdev_pass_event(client, &event);
--      else
--              list_for_each_entry_rcu(client, &evdev->client_list, node)
--                      evdev_pass_event(client, &event);
-       rcu_read_unlock();
-@@ -136,14 +133,15 @@ static int evdev_grab(struct evdev *evdev, struct evdev_client *client)
- {
-       int error;
--      if (evdev->grab)
-+      if (client->grab)
-               return -EBUSY;
--      error = input_grab_device(&evdev->handle);
--      if (error)
--              return error;
--
--      rcu_assign_pointer(evdev->grab, client);
-+      if (!evdev->grab++) {
-+          error = input_grab_device(&evdev->handle);
-+          if (error)
-+                  return error;
-+      }
-+      client->grab = 1;
-       synchronize_rcu();
-       return 0;
-@@ -151,12 +149,12 @@ static int evdev_grab(struct evdev *evdev, struct evdev_client *client)
- static int evdev_ungrab(struct evdev *evdev, struct evdev_client *client)
- {
--      if (evdev->grab != client)
-+      if (!client->grab)
-               return  -EINVAL;
--      rcu_assign_pointer(evdev->grab, NULL);
--      synchronize_rcu();
--      input_release_device(&evdev->handle);
-+      if (!--evdev->grab && evdev->exist)
-+              input_release_device(&evdev->handle);
-+      client->grab = 0;
-       return 0;
- }
-@@ -231,7 +229,7 @@ static int evdev_release(struct inode *inode, struct file *file)
-       struct evdev *evdev = client->evdev;
-       mutex_lock(&evdev->mutex);
--      if (evdev->grab == client)
-+      if (client->grab)
-               evdev_ungrab(evdev, client);
-       mutex_unlock(&evdev->mutex);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1051-s3c2410-usb-switch.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1051-s3c2410-usb-switch.patch.patch
deleted file mode 100755 (executable)
index bfe959f..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-From 7cb1e9a0797dd5d372f943f0ed971a5b432d16aa Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 22:21:23 +0100
-Subject: [PATCH] s3c2410-usb-switch.patch
-
----
- drivers/usb/host/ohci-s3c2410.c |   43 +++++++++++++++++++++++++++++++++++++++
- 1 files changed, 43 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
-index 3c7a740..5877fc9 100644
---- a/drivers/usb/host/ohci-s3c2410.c
-+++ b/drivers/usb/host/ohci-s3c2410.c
-@@ -24,6 +24,7 @@
- #include <asm/hardware.h>
- #include <asm/arch/usb-control.h>
-+#include <asm/arch/regs-gpio.h>
- #define valid_port(idx) ((idx) == 1 || (idx) == 2)
-@@ -308,6 +309,40 @@ static void s3c2410_hcd_oc(struct s3c2410_hcd_info *info, int port_oc)
-       local_irq_restore(flags);
- }
-+/* switching of USB pads */
-+static ssize_t show_usb_mode(struct device *dev, struct device_attribute *attr,
-+                           char *buf)
-+{
-+      if (__raw_readl(S3C24XX_MISCCR) & S3C2410_MISCCR_USBHOST)
-+              return sprintf(buf, "host\n");
-+
-+      return sprintf(buf, "device\n");
-+}
-+
-+static ssize_t set_usb_mode(struct device *dev, struct device_attribute *attr,
-+                          const char *buf, size_t count)
-+{
-+      if (!strncmp(buf, "host", 4)) {
-+              printk("s3c2410: changing usb to host\n");
-+              s3c2410_modify_misccr(S3C2410_MISCCR_USBHOST,
-+                                    S3C2410_MISCCR_USBHOST);
-+              /* FIXME:
-+               * - call machine-specific disable-pullup function i
-+               * - enable +Vbus (if hardware supports it)
-+               */
-+              s3c2410_gpio_setpin(S3C2410_GPB9, 0);
-+      } else if (!strncmp(buf, "device", 6)) {
-+              printk("s3c2410: changing usb to device\n");
-+              s3c2410_modify_misccr(S3C2410_MISCCR_USBHOST, 0);
-+              s3c2410_gpio_setpin(S3C2410_GPB9, 1);
-+      } else
-+              printk("s3c2410: unknown mode\n");
-+              return -EINVAL;
-+      return count;
-+}
-+
-+static DEVICE_ATTR(usb_mode, S_IRUGO | S_IWUSR, show_usb_mode, set_usb_mode);
-+
- /* may be called without controller electrically present */
- /* may be called with controller, bus, and devices active */
-@@ -325,6 +360,7 @@ static void s3c2410_hcd_oc(struct s3c2410_hcd_info *info, int port_oc)
- static void
- usb_hcd_s3c2410_remove (struct usb_hcd *hcd, struct platform_device *dev)
- {
-+      device_remove_file(&dev->dev, &dev_attr_usb_mode);
-       usb_remove_hcd(hcd);
-       s3c2410_stop_hc(dev);
-       iounmap(hcd->regs);
-@@ -392,8 +428,15 @@ static int usb_hcd_s3c2410_probe (const struct hc_driver *driver,
-       if (retval != 0)
-               goto err_ioremap;
-+      retval = device_create_file(&dev->dev, &dev_attr_usb_mode);
-+      if (retval != 0)
-+              goto err_hcd;
-+
-       return 0;
-+ err_hcd:
-+      usb_remove_hcd(hcd);
-+
-  err_ioremap:
-       s3c2410_stop_hc(dev);
-       iounmap(hcd->regs);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1052-pnp_fixes.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1052-pnp_fixes.patch.patch
deleted file mode 100755 (executable)
index 6981983..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From 60018d983c0e7e8cc2f3b1669338b05c5b5356f8 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 22:21:24 +0100
-Subject: [PATCH] pnp_fixes.patch
-
----
- drivers/pnp/Kconfig    |    2 +-
- drivers/pnp/resource.c |    2 ++
- 2 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/pnp/Kconfig b/drivers/pnp/Kconfig
-index 821933f..f9313cf 100644
---- a/drivers/pnp/Kconfig
-+++ b/drivers/pnp/Kconfig
-@@ -5,7 +5,7 @@
- menuconfig PNP
-       bool "Plug and Play support"
-       depends on HAS_IOMEM
--      depends on ISA || ACPI
-+      depends on ISA || ACPI || SDIO
-       ---help---
-         Plug and Play (PnP) is a standard for peripherals which allows those
-         peripherals to be configured by software, e.g. assign IRQ's or other
-diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
-index 390b500..3aabbf6 100644
---- a/drivers/pnp/resource.c
-+++ b/drivers/pnp/resource.c
-@@ -468,6 +468,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
-               }
-       }
-+#if 0
-       /* check if the resource is already in use, skip if the
-        * device is active because it itself may be in use */
-       if (!dev->active) {
-@@ -475,6 +476,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
-                       return 0;
-               free_dma(*dma);
-       }
-+#endif
-       /* check for conflicts with other pnp devices */
-       pnp_for_each_dev(tdev) {
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1053-atheros_2_0_function.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1053-atheros_2_0_function.patch.patch
deleted file mode 100755 (executable)
index a03772b..0000000
+++ /dev/null
@@ -1,33239 +0,0 @@
-From 5421836ea607c6434d1c9734b2ad86df5e978460 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 22:21:24 +0100
-Subject: [PATCH] atheros_2_0_function.patch
-
----
- drivers/sdio/function/Kconfig                      |   11 +
- drivers/sdio/function/Makefile                     |    1 +
- drivers/sdio/function/wlan/Makefile                |    4 +
- drivers/sdio/function/wlan/ar6000/Makefile         |   38 +
- .../sdio/function/wlan/ar6000/ar6000/ar6000_drv.c  | 3062 ++++++++++++++
- .../sdio/function/wlan/ar6000/ar6000/ar6000_drv.h  |  360 ++
- .../function/wlan/ar6000/ar6000/ar6000_raw_if.c    |  439 ++
- .../function/wlan/ar6000/ar6000/ar6xapi_linux.h    |  128 +
- .../function/wlan/ar6000/ar6000/athdrv_linux.h     |  993 +++++
- .../function/wlan/ar6000/ar6000/athtypes_linux.h   |   47 +
- .../function/wlan/ar6000/ar6000/config_linux.h     |   44 +
- .../sdio/function/wlan/ar6000/ar6000/debug_linux.h |   86 +
- drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c   | 2540 +++++++++++
- drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c  |  225 +
- .../sdio/function/wlan/ar6000/ar6000/osapi_linux.h |  319 ++
- .../function/wlan/ar6000/ar6000/wireless_ext.c     | 1946 +++++++++
- drivers/sdio/function/wlan/ar6000/bmi/bmi.c        |  657 +++
- .../sdio/function/wlan/ar6000/bmi/bmi_internal.h   |   45 +
- drivers/sdio/function/wlan/ar6000/hif/hif.c        |  818 ++++
- .../sdio/function/wlan/ar6000/hif/hif_internal.h   |  102 +
- drivers/sdio/function/wlan/ar6000/htc/ar6k.c       |  991 +++++
- drivers/sdio/function/wlan/ar6000/htc/ar6k.h       |  191 +
- .../sdio/function/wlan/ar6000/htc/ar6k_events.c    |  638 +++
- drivers/sdio/function/wlan/ar6000/htc/htc.c        |  507 +++
- drivers/sdio/function/wlan/ar6000/htc/htc_debug.h  |   65 +
- .../sdio/function/wlan/ar6000/htc/htc_internal.h   |  168 +
- drivers/sdio/function/wlan/ar6000/htc/htc_recv.c   |  703 ++++
- drivers/sdio/function/wlan/ar6000/htc/htc_send.c   |  541 +++
- .../sdio/function/wlan/ar6000/htc/htc_services.c   |  403 ++
- .../function/wlan/ar6000/include/AR6001_regdump.h  |  100 +
- .../function/wlan/ar6000/include/AR6K_version.h    |   36 +
- .../wlan/ar6000/include/AR6K_version.h.NEW         |   36 +
- .../sdio/function/wlan/ar6000/include/AR6Khwreg.h  |  147 +
- .../sdio/function/wlan/ar6000/include/a_config.h   |   27 +
- .../sdio/function/wlan/ar6000/include/a_debug.h    |   41 +
- drivers/sdio/function/wlan/ar6000/include/a_drv.h  |   28 +
- .../sdio/function/wlan/ar6000/include/a_drv_api.h  |  185 +
- .../sdio/function/wlan/ar6000/include/a_osapi.h    |   28 +
- .../sdio/function/wlan/ar6000/include/a_types.h    |   28 +
- .../sdio/function/wlan/ar6000/include/ar6000_api.h |   29 +
- .../function/wlan/ar6000/include/ar6000_diag.h     |   38 +
- .../sdio/function/wlan/ar6000/include/athdefs.h    |   85 +
- drivers/sdio/function/wlan/ar6000/include/athdrv.h |   32 +
- .../sdio/function/wlan/ar6000/include/athendpack.h |   41 +
- .../function/wlan/ar6000/include/athstartpack.h    |   42 +
- drivers/sdio/function/wlan/ar6000/include/bmi.h    |  100 +
- .../sdio/function/wlan/ar6000/include/bmi_msg.h    |  199 +
- .../sdio/function/wlan/ar6000/include/common_drv.h |   61 +
- drivers/sdio/function/wlan/ar6000/include/dbglog.h |  107 +
- .../sdio/function/wlan/ar6000/include/dbglog_api.h |   46 +
- .../sdio/function/wlan/ar6000/include/dbglog_id.h  |  307 ++
- .../sdio/function/wlan/ar6000/include/dl_list.h    |  114 +
- .../sdio/function/wlan/ar6000/include/dset_api.h   |   63 +
- .../function/wlan/ar6000/include/dset_internal.h   |   39 +
- drivers/sdio/function/wlan/ar6000/include/dsetid.h |  110 +
- drivers/sdio/function/wlan/ar6000/include/gpio.h   |   34 +
- .../sdio/function/wlan/ar6000/include/gpio_api.h   |   57 +
- drivers/sdio/function/wlan/ar6000/include/hif.h    |  291 ++
- .../function/wlan/ar6000/include/host_version.h    |   49 +
- drivers/sdio/function/wlan/ar6000/include/htc.h    |  190 +
- .../sdio/function/wlan/ar6000/include/htc_api.h    |  436 ++
- .../sdio/function/wlan/ar6000/include/htc_packet.h |  138 +
- .../function/wlan/ar6000/include/htc_services.h    |   37 +
- .../sdio/function/wlan/ar6000/include/ieee80211.h  |  342 ++
- .../function/wlan/ar6000/include/ieee80211_ioctl.h |  163 +
- .../function/wlan/ar6000/include/ieee80211_node.h  |   77 +
- .../sdio/function/wlan/ar6000/include/ini_dset.h   |   40 +
- drivers/sdio/function/wlan/ar6000/include/regDb.h  |   19 +
- .../sdio/function/wlan/ar6000/include/regdump.h    |   33 +
- .../sdio/function/wlan/ar6000/include/targaddrs.h  |  158 +
- .../sdio/function/wlan/ar6000/include/testcmd.h    |  144 +
- .../sdio/function/wlan/ar6000/include/wlan_api.h   |  101 +
- .../sdio/function/wlan/ar6000/include/wlan_dset.h  |   20 +
- drivers/sdio/function/wlan/ar6000/include/wmi.h    | 1743 ++++++++
- .../sdio/function/wlan/ar6000/include/wmi_api.h    |  259 ++
- drivers/sdio/function/wlan/ar6000/include/wmix.h   |  233 +
- .../sdio/function/wlan/ar6000/miscdrv/common_drv.c |  467 +++
- .../function/wlan/ar6000/miscdrv/credit_dist.c     |  346 ++
- drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c |  371 ++
- .../function/wlan/ar6000/wlan/wlan_recv_beacon.c   |  192 +
- .../sdio/function/wlan/ar6000/wlan/wlan_utils.c    |   59 +
- drivers/sdio/function/wlan/ar6000/wmi/wmi.c        | 3921 +++++++++++++++++
- drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h    | 4421 ++++++++++++++++++++
- drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h   |   71 +
- 84 files changed, 32553 insertions(+), 0 deletions(-)
- create mode 100644 drivers/sdio/function/Kconfig
- create mode 100644 drivers/sdio/function/Makefile
- create mode 100644 drivers/sdio/function/wlan/Makefile
- create mode 100644 drivers/sdio/function/wlan/ar6000/Makefile
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/bmi/bmi.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/hif/hif.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/hif/hif_internal.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/htc/ar6k.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/htc/ar6k.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/htc/htc.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/htc/htc_debug.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/htc/htc_internal.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/htc/htc_recv.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/htc/htc_send.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/htc/htc_services.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/AR6K_version.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/a_config.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/a_debug.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/a_drv.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/a_drv_api.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/a_osapi.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/a_types.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/ar6000_api.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/athdefs.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/athdrv.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/athendpack.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/athstartpack.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/bmi.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/bmi_msg.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/common_drv.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/dbglog.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/dbglog_api.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/dbglog_id.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/dl_list.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/dset_api.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/dset_internal.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/dsetid.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/gpio.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/gpio_api.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/hif.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/host_version.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/htc.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/htc_api.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/htc_packet.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/htc_services.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/ieee80211.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/ini_dset.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/regDb.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/regdump.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/targaddrs.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/testcmd.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/wlan_api.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/wlan_dset.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/wmi.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/wmi_api.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/include/wmix.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/wmi/wmi.c
- create mode 100644 drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h
- create mode 100644 drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h
-
-diff --git a/drivers/sdio/function/Kconfig b/drivers/sdio/function/Kconfig
-new file mode 100644
-index 0000000..9b46af3
---- /dev/null
-+++ b/drivers/sdio/function/Kconfig
-@@ -0,0 +1,11 @@
-+#menu "SDIO function drivers"
-+
-+config SDIO_AR6000_WLAN
-+        tristate "ar6000 wireless networking over sdio"
-+      depends on SDIO
-+        select WIRELESS_EXT
-+        default m
-+        help
-+          good luck.
-+
-+#endmenu
-\ No newline at end of file
-diff --git a/drivers/sdio/function/Makefile b/drivers/sdio/function/Makefile
-new file mode 100644
-index 0000000..4940d37
---- /dev/null
-+++ b/drivers/sdio/function/Makefile
-@@ -0,0 +1 @@
-+obj-$(CONFIG_SDIO_AR6000_WLAN)          += wlan/
-\ No newline at end of file
-diff --git a/drivers/sdio/function/wlan/Makefile b/drivers/sdio/function/wlan/Makefile
-new file mode 100644
-index 0000000..b1e61fc
---- /dev/null
-+++ b/drivers/sdio/function/wlan/Makefile
-@@ -0,0 +1,4 @@
-+#
-+# SDIO wlan ar600 card function driver
-+#
-+obj-$(CONFIG_SDIO_AR6000_WLAN)          += ar6000/
-\ No newline at end of file
-diff --git a/drivers/sdio/function/wlan/ar6000/Makefile b/drivers/sdio/function/wlan/ar6000/Makefile
-new file mode 100644
-index 0000000..810dab6
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/Makefile
-@@ -0,0 +1,38 @@
-+REV ?= 2
-+
-+PWD := $(shell pwd)
-+
-+EXTRA_CFLAGS += -I$(src)/include
-+
-+EXTRA_CFLAGS += -DLINUX -DDEBUG -D__KERNEL__ -DHTC_RAW_INTERFACE\
-+                -DTCMD -DSEND_EVENT_TO_APP -DUSER_KEYS \
-+                -DNO_SYNC_FLUSH #\
-+                -DMULTIPLE_FRAMES_PER_INTERRUPT -DAR6000REV$(REV) \
-+                -DBLOCK_TX_PATH_FLAG \
-+              -DSDIO \
-+
-+EXTRA_CFLAGS += -DKERNEL_2_6
-+
-+obj-$(CONFIG_SDIO_AR6000_WLAN) += ar6000.o
-+
-+ar6000-objs += htc/ar6k.o                        \
-+             htc/ar6k_events.o           \
-+               htc/htc_send.o            \
-+               htc/htc_recv.o            \
-+               htc/htc_services.o          \
-+               htc/htc.o                 \
-+               hif/hif.o                 \
-+               bmi/bmi.o                   \
-+               ar6000/ar6000_drv.o         \
-+               ar6000/ar6000_raw_if.o    \
-+               ar6000/netbuf.o                   \
-+               ar6000/wireless_ext.o     \
-+               ar6000/ioctl.o            \
-+               miscdrv/common_drv.o      \
-+               miscdrv/credit_dist.o     \
-+               wmi/wmi.o                   \
-+               wlan/wlan_node.o            \
-+               wlan/wlan_recv_beacon.o     \
-+               wlan/wlan_utils.o
-+
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-new file mode 100644
-index 0000000..bb9ef55
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-@@ -0,0 +1,3062 @@
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+/*
-+ * This driver is a pseudo ethernet driver to access the Atheros AR6000
-+ * WLAN Device
-+ */
-+static const char athId[] __attribute__ ((unused)) = "$Id: //depot/sw/releases/olca2.0-GPL/host/os/linux/ar6000_drv.c#2 $";
-+
-+#include "ar6000_drv.h"
-+#include "htc.h"
-+
-+MODULE_LICENSE("GPL and additional rights");
-+
-+#ifndef REORG_APTC_HEURISTICS
-+#undef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+#endif /* REORG_APTC_HEURISTICS */
-+
-+#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+#define APTC_TRAFFIC_SAMPLING_INTERVAL     100  /* msec */
-+#define APTC_UPPER_THROUGHPUT_THRESHOLD    3000 /* Kbps */
-+#define APTC_LOWER_THROUGHPUT_THRESHOLD    2000 /* Kbps */
-+
-+typedef struct aptc_traffic_record {
-+    A_BOOL timerScheduled;
-+    struct timeval samplingTS;
-+    unsigned long bytesReceived;
-+    unsigned long bytesTransmitted;
-+} APTC_TRAFFIC_RECORD;
-+
-+A_TIMER aptcTimer;
-+APTC_TRAFFIC_RECORD aptcTR;
-+#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-+
-+int bmienable = 0;
-+unsigned int bypasswmi = 0;
-+unsigned int debuglevel = 0;
-+int tspecCompliance = 1;
-+unsigned int busspeedlow = 0;
-+unsigned int onebitmode = 0;
-+unsigned int skipflash = 0;
-+unsigned int wmitimeout = 2;
-+unsigned int wlanNodeCaching = 1;
-+unsigned int enableuartprint = 0;
-+unsigned int logWmiRawMsgs = 0;
-+unsigned int enabletimerwar = 0;
-+unsigned int mbox_yield_limit = 99;
-+int reduce_credit_dribble = 1 + HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_ONE_HALF;
-+int allow_trace_signal = 0;
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+unsigned int testmode =0;
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+module_param(bmienable, int, 0644);
-+module_param(bypasswmi, int, 0644);
-+module_param(debuglevel, int, 0644);
-+module_param(tspecCompliance, int, 0644);
-+module_param(onebitmode, int, 0644);
-+module_param(busspeedlow, int, 0644);
-+module_param(skipflash, int, 0644);
-+module_param(wmitimeout, int, 0644);
-+module_param(wlanNodeCaching, int, 0644);
-+module_param(logWmiRawMsgs, int, 0644);
-+module_param(enableuartprint, int, 0644);
-+module_param(enabletimerwar, int, 0644);
-+module_param(mbox_yield_limit, int, 0644);
-+module_param(reduce_credit_dribble, int, 0644);
-+module_param(allow_trace_signal, int, 0644);
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+module_param(testmode, int, 0644);
-+#endif
-+#else
-+
-+#define __user
-+/* for linux 2.4 and lower */
-+MODULE_PARM(bmienable,"i");
-+MODULE_PARM(bypasswmi,"i");
-+MODULE_PARM(debuglevel, "i");
-+MODULE_PARM(onebitmode,"i");
-+MODULE_PARM(busspeedlow, "i");
-+MODULE_PARM(skipflash, "i");
-+MODULE_PARM(wmitimeout, "i");
-+MODULE_PARM(wlanNodeCaching, "i");
-+MODULE_PARM(enableuartprint,"i");
-+MODULE_PARM(logWmiRawMsgs, "i");
-+MODULE_PARM(enabletimerwar,"i");
-+MODULE_PARM(mbox_yield_limit,"i");
-+MODULE_PARM(reduce_credit_dribble,"i");
-+MODULE_PARM(allow_trace_signal,"i");
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+MODULE_PARM(testmode, "i");
-+#endif
-+#endif
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10)
-+/* in 2.6.10 and later this is now a pointer to a uint */
-+unsigned int _mboxnum = HTC_MAILBOX_NUM_MAX;
-+#define mboxnum &_mboxnum
-+#else
-+unsigned int mboxnum = HTC_MAILBOX_NUM_MAX;
-+#endif
-+
-+#ifdef DEBUG
-+A_UINT32 g_dbg_flags = DBG_DEFAULTS;
-+unsigned int debugflags = 0;
-+int debugdriver = 1;
-+unsigned int debughtc = 128;
-+unsigned int debugbmi = 1;
-+unsigned int debughif = 2;
-+unsigned int resetok = 1;
-+unsigned int txcreditsavailable[HTC_MAILBOX_NUM_MAX] = {0};
-+unsigned int txcreditsconsumed[HTC_MAILBOX_NUM_MAX] = {0};
-+unsigned int txcreditintrenable[HTC_MAILBOX_NUM_MAX] = {0};
-+unsigned int txcreditintrenableaggregate[HTC_MAILBOX_NUM_MAX] = {0};
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+module_param(debugflags, int, 0644);
-+module_param(debugdriver, int, 0644);
-+module_param(debughtc, int, 0644);
-+module_param(debugbmi, int, 0644);
-+module_param(debughif, int, 0644);
-+module_param(resetok, int, 0644);
-+module_param_array(txcreditsavailable, int, mboxnum, 0644);
-+module_param_array(txcreditsconsumed, int, mboxnum, 0644);
-+module_param_array(txcreditintrenable, int, mboxnum, 0644);
-+module_param_array(txcreditintrenableaggregate, int, mboxnum, 0644);
-+#else
-+/* linux 2.4 and lower */
-+MODULE_PARM(debugflags,"i");
-+MODULE_PARM(debugdriver, "i");
-+MODULE_PARM(debughtc, "i");
-+MODULE_PARM(debugbmi, "i");
-+MODULE_PARM(debughif, "i");
-+MODULE_PARM(resetok, "i");
-+MODULE_PARM(txcreditsavailable, "0-3i");
-+MODULE_PARM(txcreditsconsumed, "0-3i");
-+MODULE_PARM(txcreditintrenable, "0-3i");
-+MODULE_PARM(txcreditintrenableaggregate, "0-3i");
-+#endif
-+
-+#endif /* DEBUG */
-+
-+unsigned int tx_attempt[HTC_MAILBOX_NUM_MAX] = {0};
-+unsigned int tx_post[HTC_MAILBOX_NUM_MAX] = {0};
-+unsigned int tx_complete[HTC_MAILBOX_NUM_MAX] = {0};
-+unsigned int hifBusRequestNumMax = 40;
-+unsigned int war23838_disabled = 0;
-+#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+unsigned int enableAPTCHeuristics = 1;
-+#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+module_param_array(tx_attempt, int, mboxnum, 0644);
-+module_param_array(tx_post, int, mboxnum, 0644);
-+module_param_array(tx_complete, int, mboxnum, 0644);
-+module_param(hifBusRequestNumMax, int, 0644);
-+module_param(war23838_disabled, int, 0644);
-+#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+module_param(enableAPTCHeuristics, int, 0644);
-+#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-+#else
-+MODULE_PARM(tx_attempt, "0-3i");
-+MODULE_PARM(tx_post, "0-3i");
-+MODULE_PARM(tx_complete, "0-3i");
-+MODULE_PARM(hifBusRequestNumMax, "i");
-+MODULE_PARM(war23838_disabled, "i");
-+#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+MODULE_PARM(enableAPTCHeuristics, "i");
-+#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-+#endif
-+
-+#ifdef BLOCK_TX_PATH_FLAG
-+int blocktx = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+module_param(blocktx, int, 0644);
-+#else
-+MODULE_PARM(blocktx, "i");
-+#endif
-+#endif /* BLOCK_TX_PATH_FLAG */
-+
-+// TODO move to arsoft_c
-+USER_RSSI_THOLD rssi_map[12];
-+
-+int reconnect_flag = 0;
-+
-+DECLARE_WAIT_QUEUE_HEAD(ar6000_scan_queue);
-+
-+/* Function declarations */
-+static int ar6000_init_module(void);
-+static void ar6000_cleanup_module(void);
-+
-+int ar6000_init(struct net_device *dev);
-+static int ar6000_open(struct net_device *dev);
-+static int ar6000_close(struct net_device *dev);
-+static void ar6000_init_control_info(AR_SOFTC_T *ar);
-+static int ar6000_data_tx(struct sk_buff *skb, struct net_device *dev);
-+
-+static void ar6000_destroy(struct net_device *dev, unsigned int unregister);
-+static void ar6000_detect_error(unsigned long ptr);
-+static struct net_device_stats *ar6000_get_stats(struct net_device *dev);
-+static struct iw_statistics *ar6000_get_iwstats(struct net_device * dev);
-+
-+/*
-+ * HTC service connection handlers
-+ */
-+static void ar6000_avail_ev(HTC_HANDLE HTCHandle);
-+
-+static void ar6000_unavail_ev(void *Instance);
-+
-+static void ar6000_target_failure(void *Instance, A_STATUS Status);
-+
-+static void ar6000_rx(void *Context, HTC_PACKET *pPacket);
-+
-+static void ar6000_rx_refill(void *Context,HTC_ENDPOINT_ID Endpoint);
-+
-+static void ar6000_tx_complete(void *Context, HTC_PACKET *pPacket);
-+
-+static void ar6000_tx_queue_full(void *Context, HTC_ENDPOINT_ID Endpoint);
-+
-+/*
-+ * Static variables
-+ */
-+
-+static struct net_device *ar6000_devices[MAX_AR6000];
-+extern struct iw_handler_def ath_iw_handler_def;
-+DECLARE_WAIT_QUEUE_HEAD(arEvent);
-+static void ar6000_cookie_init(AR_SOFTC_T *ar);
-+static void ar6000_cookie_cleanup(AR_SOFTC_T *ar);
-+static void ar6000_free_cookie(AR_SOFTC_T *ar, struct ar_cookie * cookie);
-+static struct ar_cookie *ar6000_alloc_cookie(AR_SOFTC_T *ar);
-+static void ar6000_TxDataCleanup(AR_SOFTC_T *ar);
-+
-+#ifdef USER_KEYS
-+static A_STATUS ar6000_reinstall_keys(AR_SOFTC_T *ar,A_UINT8 key_op_ctrl);
-+#endif
-+
-+
-+static struct ar_cookie s_ar_cookie_mem[MAX_COOKIE_NUM];
-+
-+#define HOST_INTEREST_ITEM_ADDRESS(ar, item)    \
-+((ar->arTargetType == TARGET_TYPE_AR6001) ?     \
-+   AR6001_HOST_INTEREST_ITEM_ADDRESS(item) :    \
-+   AR6002_HOST_INTEREST_ITEM_ADDRESS(item))
-+
-+
-+/* Debug log support */
-+
-+/*
-+ * Flag to govern whether the debug logs should be parsed in the kernel
-+ * or reported to the application.
-+ */
-+#define REPORT_DEBUG_LOGS_TO_APP
-+
-+A_STATUS
-+ar6000_set_host_app_area(AR_SOFTC_T *ar)
-+{
-+    A_UINT32 address, data;
-+    struct host_app_area_s host_app_area;
-+
-+    /* Fetch the address of the host_app_area_s instance in the host interest area */
-+    address = HOST_INTEREST_ITEM_ADDRESS(ar, hi_app_host_interest);
-+    if (ar6000_ReadRegDiag(ar->arHifDevice, &address, &data) != A_OK) {
-+        return A_ERROR;
-+    }
-+    address = data;
-+    host_app_area.wmi_protocol_ver = WMI_PROTOCOL_VERSION;
-+    if (ar6000_WriteDataDiag(ar->arHifDevice, address,
-+                             (A_UCHAR *)&host_app_area,
-+                             sizeof(struct host_app_area_s)) != A_OK)
-+    {
-+        return A_ERROR;
-+    }
-+
-+    return A_OK;
-+}
-+
-+A_UINT32
-+dbglog_get_debug_hdr_ptr(AR_SOFTC_T *ar)
-+{
-+    A_UINT32 param;
-+    A_UINT32 address;
-+    A_STATUS status;
-+
-+    address = HOST_INTEREST_ITEM_ADDRESS(ar, hi_dbglog_hdr);
-+    if ((status = ar6000_ReadDataDiag(ar->arHifDevice, address,
-+                                      (A_UCHAR *)&param, 4)) != A_OK)
-+    {
-+        param = 0;
-+    }
-+
-+    return param;
-+}
-+
-+/*
-+ * The dbglog module has been initialized. Its ok to access the relevant
-+ * data stuctures over the diagnostic window.
-+ */
-+void
-+ar6000_dbglog_init_done(AR_SOFTC_T *ar)
-+{
-+    ar->dbglog_init_done = TRUE;
-+}
-+
-+A_UINT32
-+dbglog_get_debug_fragment(A_INT8 *datap, A_UINT32 len, A_UINT32 limit)
-+{
-+    A_INT32 *buffer;
-+    A_UINT32 count;
-+    A_UINT32 numargs;
-+    A_UINT32 length;
-+    A_UINT32 fraglen;
-+
-+    count = fraglen = 0;
-+    buffer = (A_INT32 *)datap;
-+    length = (limit >> 2);
-+
-+    if (len <= limit) {
-+        fraglen = len;
-+    } else {
-+        while (count < length) {
-+            numargs = DBGLOG_GET_NUMARGS(buffer[count]);
-+            fraglen = (count << 2);
-+            count += numargs + 1;
-+        }
-+    }
-+
-+    return fraglen;
-+}
-+
-+void
-+dbglog_parse_debug_logs(A_INT8 *datap, A_UINT32 len)
-+{
-+    A_INT32 *buffer;
-+    A_UINT32 count;
-+    A_UINT32 timestamp;
-+    A_UINT32 debugid;
-+    A_UINT32 moduleid;
-+    A_UINT32 numargs;
-+    A_UINT32 length;
-+
-+    count = 0;
-+    buffer = (A_INT32 *)datap;
-+    length = (len >> 2);
-+    while (count < length) {
-+        debugid = DBGLOG_GET_DBGID(buffer[count]);
-+        moduleid = DBGLOG_GET_MODULEID(buffer[count]);
-+        numargs = DBGLOG_GET_NUMARGS(buffer[count]);
-+        timestamp = DBGLOG_GET_TIMESTAMP(buffer[count]);
-+        switch (numargs) {
-+            case 0:
-+            AR_DEBUG_PRINTF("%d %d (%d)\n", moduleid, debugid, timestamp);
-+            break;
-+
-+            case 1:
-+            AR_DEBUG_PRINTF("%d %d (%d): 0x%x\n", moduleid, debugid,
-+                            timestamp, buffer[count+1]);
-+            break;
-+
-+            case 2:
-+            AR_DEBUG_PRINTF("%d %d (%d): 0x%x, 0x%x\n", moduleid, debugid,
-+                            timestamp, buffer[count+1], buffer[count+2]);
-+            break;
-+
-+            default:
-+            AR_DEBUG_PRINTF("Invalid args: %d\n", numargs);
-+        }
-+        count += numargs + 1;
-+    }
-+}
-+
-+int
-+ar6000_dbglog_get_debug_logs(AR_SOFTC_T *ar)
-+{
-+    struct dbglog_hdr_s debug_hdr;
-+    struct dbglog_buf_s debug_buf;
-+    A_UINT32 address;
-+    A_UINT32 length;
-+    A_UINT32 dropped;
-+    A_UINT32 firstbuf;
-+    A_UINT32 debug_hdr_ptr;
-+
-+    if (!ar->dbglog_init_done) return A_ERROR;
-+
-+
-+    AR6000_SPIN_LOCK(&ar->arLock, 0);
-+
-+    if (ar->dbgLogFetchInProgress) {
-+        AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+        return A_EBUSY;
-+    }
-+
-+        /* block out others */
-+    ar->dbgLogFetchInProgress = TRUE;
-+
-+    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+
-+    debug_hdr_ptr = dbglog_get_debug_hdr_ptr(ar);
-+    printk("debug_hdr_ptr: 0x%x\n", debug_hdr_ptr);
-+
-+    /* Get the contents of the ring buffer */
-+    if (debug_hdr_ptr) {
-+        address = debug_hdr_ptr;
-+        length = sizeof(struct dbglog_hdr_s);
-+        ar6000_ReadDataDiag(ar->arHifDevice, address,
-+                            (A_UCHAR *)&debug_hdr, length);
-+        address = (A_UINT32)debug_hdr.dbuf;
-+        firstbuf = address;
-+        dropped = debug_hdr.dropped;
-+        length = sizeof(struct dbglog_buf_s);
-+        ar6000_ReadDataDiag(ar->arHifDevice, address,
-+                            (A_UCHAR *)&debug_buf, length);
-+
-+        do {
-+            address = (A_UINT32)debug_buf.buffer;
-+            length = debug_buf.length;
-+            if ((length) && (debug_buf.length <= debug_buf.bufsize)) {
-+                /* Rewind the index if it is about to overrun the buffer */
-+                if (ar->log_cnt > (DBGLOG_HOST_LOG_BUFFER_SIZE - length)) {
-+                    ar->log_cnt = 0;
-+                }
-+                if(A_OK != ar6000_ReadDataDiag(ar->arHifDevice, address,
-+                                    (A_UCHAR *)&ar->log_buffer[ar->log_cnt], length))
-+                {
-+                    break;
-+                }
-+                ar6000_dbglog_event(ar, dropped, &ar->log_buffer[ar->log_cnt], length);
-+                ar->log_cnt += length;
-+            } else {
-+                AR_DEBUG_PRINTF("Length: %d (Total size: %d)\n",
-+                                debug_buf.length, debug_buf.bufsize);
-+            }
-+
-+            address = (A_UINT32)debug_buf.next;
-+            length = sizeof(struct dbglog_buf_s);
-+            if(A_OK != ar6000_ReadDataDiag(ar->arHifDevice, address,
-+                                (A_UCHAR *)&debug_buf, length))
-+            {
-+                break;
-+            }
-+
-+        } while (address != firstbuf);
-+    }
-+
-+    ar->dbgLogFetchInProgress = FALSE;
-+
-+    return A_OK;
-+}
-+
-+void
-+ar6000_dbglog_event(AR_SOFTC_T *ar, A_UINT32 dropped,
-+                    A_INT8 *buffer, A_UINT32 length)
-+{
-+#ifdef REPORT_DEBUG_LOGS_TO_APP
-+    #define MAX_WIRELESS_EVENT_SIZE 252
-+    /*
-+     * Break it up into chunks of MAX_WIRELESS_EVENT_SIZE bytes of messages.
-+     * There seems to be a limitation on the length of message that could be
-+     * transmitted to the user app via this mechanism.
-+     */
-+    A_UINT32 send, sent;
-+
-+    sent = 0;
-+    send = dbglog_get_debug_fragment(&buffer[sent], length - sent,
-+                                     MAX_WIRELESS_EVENT_SIZE);
-+    while (send) {
-+        ar6000_send_event_to_app(ar, WMIX_DBGLOG_EVENTID, &buffer[sent], send);
-+        sent += send;
-+        send = dbglog_get_debug_fragment(&buffer[sent], length - sent,
-+                                         MAX_WIRELESS_EVENT_SIZE);
-+    }
-+#else
-+    AR_DEBUG_PRINTF("Dropped logs: 0x%x\nDebug info length: %d\n",
-+                    dropped, length);
-+
-+    /* Interpret the debug logs */
-+    dbglog_parse_debug_logs(buffer, length);
-+#endif /* REPORT_DEBUG_LOGS_TO_APP */
-+}
-+
-+
-+
-+static int __init
-+ar6000_init_module(void)
-+{
-+    static int probed = 0;
-+    A_STATUS status;
-+    HTC_INIT_INFO initInfo;
-+
-+    A_MEMZERO(&initInfo,sizeof(initInfo));
-+    initInfo.AddInstance = ar6000_avail_ev;
-+    initInfo.DeleteInstance = ar6000_unavail_ev;
-+    initInfo.TargetFailure = ar6000_target_failure;
-+
-+
-+#ifdef DEBUG
-+    /* Set the debug flags if specified at load time */
-+    if(debugflags != 0)
-+    {
-+        g_dbg_flags = debugflags;
-+    }
-+#endif
-+
-+    if (probed) {
-+        return -ENODEV;
-+    }
-+    probed++;
-+
-+#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+    memset(&aptcTR, 0, sizeof(APTC_TRAFFIC_RECORD));
-+#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-+
-+#ifdef CONFIG_HOST_GPIO_SUPPORT
-+    ar6000_gpio_init();
-+#endif /* CONFIG_HOST_GPIO_SUPPORT */
-+
-+    status = HTCInit(&initInfo);
-+    if(status != A_OK)
-+        return -ENODEV;
-+
-+    return 0;
-+}
-+
-+static void __exit
-+ar6000_cleanup_module(void)
-+{
-+    int i = 0;
-+    struct net_device *ar6000_netdev;
-+
-+#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+    /* Delete the Adaptive Power Control timer */
-+    if (timer_pending(&aptcTimer)) {
-+        del_timer_sync(&aptcTimer);
-+    }
-+#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-+
-+    for (i=0; i < MAX_AR6000; i++) {
-+        if (ar6000_devices[i] != NULL) {
-+            ar6000_netdev = ar6000_devices[i];
-+            ar6000_devices[i] = NULL;
-+            ar6000_destroy(ar6000_netdev, 1);
-+        }
-+    }
-+
-+        /* shutting down HTC will cause the HIF layer to detach from the
-+         * underlying bus driver which will cause the subsequent deletion of
-+         * all HIF and HTC instances */
-+    HTCShutDown();
-+
-+    AR_DEBUG_PRINTF("ar6000_cleanup: success\n");
-+}
-+
-+#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+void
-+aptcTimerHandler(unsigned long arg)
-+{
-+    A_UINT32 numbytes;
-+    A_UINT32 throughput;
-+    AR_SOFTC_T *ar;
-+    A_STATUS status;
-+
-+    ar = (AR_SOFTC_T *)arg;
-+    A_ASSERT(ar != NULL);
-+    A_ASSERT(!timer_pending(&aptcTimer));
-+
-+    AR6000_SPIN_LOCK(&ar->arLock, 0);
-+
-+    /* Get the number of bytes transferred */
-+    numbytes = aptcTR.bytesTransmitted + aptcTR.bytesReceived;
-+    aptcTR.bytesTransmitted = aptcTR.bytesReceived = 0;
-+
-+    /* Calculate and decide based on throughput thresholds */
-+    throughput = ((numbytes * 8)/APTC_TRAFFIC_SAMPLING_INTERVAL); /* Kbps */
-+    if (throughput < APTC_LOWER_THROUGHPUT_THRESHOLD) {
-+        /* Enable Sleep and delete the timer */
-+        A_ASSERT(ar->arWmiReady == TRUE);
-+        AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+        status = wmi_powermode_cmd(ar->arWmi, REC_POWER);
-+        AR6000_SPIN_LOCK(&ar->arLock, 0);
-+        A_ASSERT(status == A_OK);
-+        aptcTR.timerScheduled = FALSE;
-+    } else {
-+        A_TIMEOUT_MS(&aptcTimer, APTC_TRAFFIC_SAMPLING_INTERVAL, 0);
-+    }
-+
-+    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+}
-+#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-+
-+
-+
-+/* set HTC block size, assume BMI is already initialized */
-+A_STATUS ar6000_SetHTCBlockSize(AR_SOFTC_T *ar)
-+{
-+    A_STATUS status;
-+    A_UINT32 blocksizes[HTC_MAILBOX_NUM_MAX];
-+
-+    do {
-+            /* get the block sizes */
-+        status = HIFConfigureDevice(ar->arHifDevice, HIF_DEVICE_GET_MBOX_BLOCK_SIZE,
-+                                    blocksizes, sizeof(blocksizes));
-+
-+        if (A_FAILED(status)) {
-+            AR_DEBUG_PRINTF("Failed to get block size info from HIF layer...\n");
-+            break;
-+        }
-+            /* note: we actually get the block size for mailbox 1, for SDIO the block
-+             * size on mailbox 0 is artificially set to 1 */
-+            /* must be a power of 2 */
-+        A_ASSERT((blocksizes[1] & (blocksizes[1] - 1)) == 0);
-+
-+            /* set the host interest area for the block size */
-+        status = BMIWriteMemory(ar->arHifDevice,
-+                                HOST_INTEREST_ITEM_ADDRESS(ar, hi_mbox_io_block_sz),
-+                                (A_UCHAR *)&blocksizes[1],
-+                                4);
-+
-+        if (A_FAILED(status)) {
-+            AR_DEBUG_PRINTF("BMIWriteMemory for IO block size failed \n");
-+            break;
-+        }
-+
-+        AR_DEBUG_PRINTF("Block Size Set: %d (target address:0x%X)\n",
-+                blocksizes[1], HOST_INTEREST_ITEM_ADDRESS(ar, hi_mbox_io_block_sz));
-+
-+            /* set the host interest area for the mbox ISR yield limit */
-+        status = BMIWriteMemory(ar->arHifDevice,
-+                                HOST_INTEREST_ITEM_ADDRESS(ar, hi_mbox_isr_yield_limit),
-+                                (A_UCHAR *)&mbox_yield_limit,
-+                                4);
-+
-+        if (A_FAILED(status)) {
-+            AR_DEBUG_PRINTF("BMIWriteMemory for yield limit failed \n");
-+            break;
-+        }
-+
-+    } while (FALSE);
-+
-+    return status;
-+}
-+
-+/*
-+ * HTC Event handlers
-+ */
-+static void
-+ar6000_avail_ev(HTC_HANDLE HTCHandle)
-+{
-+    int i;
-+    struct net_device *dev;
-+    AR_SOFTC_T *ar;
-+    int device_index = 0;
-+
-+    AR_DEBUG_PRINTF("ar6000_available\n");
-+
-+    for (i=0; i < MAX_AR6000; i++) {
-+        if (ar6000_devices[i] == NULL) {
-+            break;
-+        }
-+    }
-+
-+    if (i == MAX_AR6000) {
-+        AR_DEBUG_PRINTF("ar6000_available: max devices reached\n");
-+        return;
-+    }
-+
-+    /* Save this. It gives a bit better readability especially since */
-+    /* we use another local "i" variable below.                      */
-+    device_index = i;
-+
-+    A_ASSERT(HTCHandle != NULL);
-+
-+    dev = alloc_etherdev(sizeof(AR_SOFTC_T));
-+    if (dev == NULL) {
-+        AR_DEBUG_PRINTF("ar6000_available: can't alloc etherdev\n");
-+        return;
-+    }
-+
-+    ether_setup(dev);
-+
-+    if (dev->priv == NULL) {
-+        printk(KERN_CRIT "ar6000_available: Could not allocate memory\n");
-+        return;
-+    }
-+
-+    A_MEMZERO(dev->priv, sizeof(AR_SOFTC_T));
-+
-+    ar                       = (AR_SOFTC_T *)dev->priv;
-+    ar->arNetDev             = dev;
-+    ar->arHtcTarget          = HTCHandle;
-+    ar->arHifDevice          = HTCGetHifDevice(HTCHandle);
-+    ar->arWlanState          = WLAN_ENABLED;
-+    ar->arDeviceIndex        = device_index;
-+
-+    A_INIT_TIMER(&ar->arHBChallengeResp.timer, ar6000_detect_error, dev);
-+    ar->arHBChallengeResp.seqNum = 0;
-+    ar->arHBChallengeResp.outstanding = FALSE;
-+    ar->arHBChallengeResp.missCnt = 0;
-+    ar->arHBChallengeResp.frequency = AR6000_HB_CHALLENGE_RESP_FREQ_DEFAULT;
-+    ar->arHBChallengeResp.missThres = AR6000_HB_CHALLENGE_RESP_MISS_THRES_DEFAULT;
-+
-+    ar6000_init_control_info(ar);
-+    init_waitqueue_head(&arEvent);
-+    sema_init(&ar->arSem, 1);
-+
-+#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+    A_INIT_TIMER(&aptcTimer, aptcTimerHandler, ar);
-+#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-+
-+    /*
-+     * If requested, perform some magic which requires no cooperation from
-+     * the Target.  It causes the Target to ignore flash and execute to the
-+     * OS from ROM.
-+     *
-+     * This is intended to support recovery from a corrupted flash on Targets
-+     * that support flash.
-+     */
-+    if (skipflash)
-+    {
-+        ar6000_reset_device_skipflash(ar->arHifDevice);
-+            }
-+
-+    BMIInit();
-+    {
-+        struct bmi_target_info targ_info;
-+
-+        if (BMIGetTargetInfo(ar->arHifDevice, &targ_info) != A_OK) {
-+            return;
-+        }
-+
-+        ar->arVersion.target_ver = targ_info.target_ver;
-+        ar->arTargetType = targ_info.target_type;
-+    }
-+
-+    if (enableuartprint) {
-+        A_UINT32 param;
-+        param = 1;
-+        if (BMIWriteMemory(ar->arHifDevice,
-+                           HOST_INTEREST_ITEM_ADDRESS(ar, hi_serial_enable),
-+                           (A_UCHAR *)&param,
-+                           4)!= A_OK)
-+        {
-+             AR_DEBUG_PRINTF("BMIWriteMemory for enableuartprint failed \n");
-+             return ;
-+        }
-+        AR_DEBUG_PRINTF("Serial console prints enabled\n");
-+    }
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+    if(testmode) {
-+        ar->arTargetMode = AR6000_TCMD_MODE;
-+    }else {
-+        ar->arTargetMode = AR6000_WLAN_MODE;
-+    }
-+#endif
-+    if (enabletimerwar) {
-+        A_UINT32 param;
-+
-+        if (BMIReadMemory(ar->arHifDevice,
-+            HOST_INTEREST_ITEM_ADDRESS(ar, hi_option_flag),
-+            (A_UCHAR *)&param,
-+            4)!= A_OK)
-+        {
-+            AR_DEBUG_PRINTF("BMIReadMemory for enabletimerwar failed \n");
-+            return;
-+        }
-+
-+        param |= HI_OPTION_TIMER_WAR;
-+
-+        if (BMIWriteMemory(ar->arHifDevice,
-+            HOST_INTEREST_ITEM_ADDRESS(ar, hi_option_flag),
-+            (A_UCHAR *)&param,
-+            4) != A_OK)
-+        {
-+            AR_DEBUG_PRINTF("BMIWriteMemory for enabletimerwar failed \n");
-+            return;
-+        }
-+        AR_DEBUG_PRINTF("Timer WAR enabled\n");
-+    }
-+
-+
-+        /* since BMIInit is called in the driver layer, we have to set the block
-+         * size here for the target */
-+
-+    if (A_FAILED(ar6000_SetHTCBlockSize(ar))) {
-+        return;
-+    }
-+
-+    spin_lock_init(&ar->arLock);
-+
-+    /* Don't install the init function if BMI is requested */
-+    if(!bmienable)
-+    {
-+        dev->init = ar6000_init;
-+    } else {
-+        AR_DEBUG_PRINTF(" BMI enabled \n");
-+    }
-+
-+    dev->open = &ar6000_open;
-+    dev->stop = &ar6000_close;
-+    dev->hard_start_xmit = &ar6000_data_tx;
-+    dev->get_stats = &ar6000_get_stats;
-+
-+    /* dev->tx_timeout = ar6000_tx_timeout; */
-+    dev->do_ioctl = &ar6000_ioctl;
-+    dev->watchdog_timeo = AR6000_TX_TIMEOUT;
-+    ar6000_ioctl_iwsetup(&ath_iw_handler_def);
-+    dev->wireless_handlers = &ath_iw_handler_def;
-+    ath_iw_handler_def.get_wireless_stats = ar6000_get_iwstats; /*Displayed via proc fs */
-+
-+    /*
-+     * We need the OS to provide us with more headroom in order to
-+     * perform dix to 802.3, WMI header encap, and the HTC header
-+     */
-+    dev->hard_header_len = ETH_HLEN + sizeof(ATH_LLC_SNAP_HDR) +
-+        sizeof(WMI_DATA_HDR) + HTC_HEADER_LEN;
-+
-+    /* This runs the init function */
-+    if (register_netdev(dev)) {
-+        AR_DEBUG_PRINTF("ar6000_avail: register_netdev failed\n");
-+        ar6000_destroy(dev, 0);
-+        return;
-+    }
-+
-+    HTCSetInstance(ar->arHtcTarget, ar);
-+
-+    /* We only register the device in the global list if we succeed. */
-+    /* If the device is in the global list, it will be destroyed     */
-+    /* when the module is unloaded.                                  */
-+    ar6000_devices[device_index] = dev;
-+
-+    AR_DEBUG_PRINTF("ar6000_avail: name=%s htcTarget=0x%x, dev=0x%x (%d), ar=0x%x\n",
-+                    dev->name, (A_UINT32)HTCHandle, (A_UINT32)dev, device_index,
-+                    (A_UINT32)ar);
-+}
-+
-+static void ar6000_target_failure(void *Instance, A_STATUS Status)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)Instance;
-+    WMI_TARGET_ERROR_REPORT_EVENT errEvent;
-+    static A_BOOL sip = FALSE;
-+
-+    if (Status != A_OK) {
-+        if (timer_pending(&ar->arHBChallengeResp.timer)) {
-+            A_UNTIMEOUT(&ar->arHBChallengeResp.timer);
-+        }
-+
-+        /* try dumping target assertion information (if any) */
-+        ar6000_dump_target_assert_info(ar->arHifDevice,ar->arTargetType);
-+
-+        /*
-+         * Fetch the logs from the target via the diagnostic
-+         * window.
-+         */
-+        ar6000_dbglog_get_debug_logs(ar);
-+
-+        /* Report the error only once */
-+        if (!sip) {
-+            sip = TRUE;
-+            errEvent.errorVal = WMI_TARGET_COM_ERR |
-+                                WMI_TARGET_FATAL_ERR;
-+            ar6000_send_event_to_app(ar, WMI_ERROR_REPORT_EVENTID,
-+                                     (A_UINT8 *)&errEvent,
-+                                     sizeof(WMI_TARGET_ERROR_REPORT_EVENT));
-+        }
-+    }
-+}
-+
-+static void
-+ar6000_unavail_ev(void *Instance)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)Instance;
-+        /* NULL out it's entry in the global list */
-+    ar6000_devices[ar->arDeviceIndex] = NULL;
-+    ar6000_destroy(ar->arNetDev, 1);
-+}
-+
-+/*
-+ * We need to differentiate between the surprise and planned removal of the
-+ * device because of the following consideration:
-+ * - In case of surprise removal, the hcd already frees up the pending
-+ *   for the device and hence there is no need to unregister the function
-+ *   driver inorder to get these requests. For planned removal, the function
-+ *   driver has to explictly unregister itself to have the hcd return all the
-+ *   pending requests before the data structures for the devices are freed up.
-+ *   Note that as per the current implementation, the function driver will
-+ *   end up releasing all the devices since there is no API to selectively
-+ *   release a particular device.
-+ * - Certain commands issued to the target can be skipped for surprise
-+ *   removal since they will anyway not go through.
-+ */
-+static void
-+ar6000_destroy(struct net_device *dev, unsigned int unregister)
-+{
-+    AR_SOFTC_T *ar;
-+
-+    AR_DEBUG_PRINTF("+ar6000_destroy \n");
-+
-+    if((dev == NULL) || ((ar = netdev_priv(dev)) == NULL))
-+    {
-+        AR_DEBUG_PRINTF("%s(): Failed to get device structure.\n", __func__);
-+        return;
-+    }
-+
-+    /* Stop the transmit queues */
-+    netif_stop_queue(dev);
-+
-+    /* Disable the target and the interrupts associated with it */
-+    if (ar->arWmiReady == TRUE)
-+    {
-+        if (!bypasswmi)
-+        {
-+            if (ar->arConnected == TRUE || ar->arConnectPending == TRUE)
-+            {
-+                AR_DEBUG_PRINTF("%s(): Disconnect\n", __func__);
-+                AR6000_SPIN_LOCK(&ar->arLock, 0);
-+                ar6000_init_profile_info(ar);
-+                AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+                wmi_disconnect_cmd(ar->arWmi);
-+            }
-+
-+            ar6000_dbglog_get_debug_logs(ar);
-+            ar->arWmiReady  = FALSE;
-+            ar->arConnected = FALSE;
-+            ar->arConnectPending = FALSE;
-+            wmi_shutdown(ar->arWmi);
-+            ar->arWmiEnabled = FALSE;
-+            ar->arWmi = NULL;
-+            ar->arWlanState = WLAN_ENABLED;
-+#ifdef USER_KEYS
-+            ar->user_savedkeys_stat = USER_SAVEDKEYS_STAT_INIT;
-+            ar->user_key_ctrl      = 0;
-+#endif
-+        }
-+
-+         AR_DEBUG_PRINTF("%s(): WMI stopped\n", __func__);
-+    }
-+    else
-+    {
-+        AR_DEBUG_PRINTF("%s(): WMI not ready 0x%08x 0x%08x\n",
-+            __func__, (unsigned int) ar, (unsigned int) ar->arWmi);
-+
-+        /* Shut down WMI if we have started it */
-+        if(ar->arWmiEnabled == TRUE)
-+        {
-+            AR_DEBUG_PRINTF("%s(): Shut down WMI\n", __func__);
-+            wmi_shutdown(ar->arWmi);
-+            ar->arWmiEnabled = FALSE;
-+            ar->arWmi = NULL;
-+        }
-+    }
-+
-+    /* stop HTC */
-+    HTCStop(ar->arHtcTarget);
-+
-+    /* set the instance to NULL so we do not get called back on remove incase we
-+     * we're explicity destroyed by module unload */
-+    HTCSetInstance(ar->arHtcTarget, NULL);
-+
-+    if (resetok) {
-+        /* try to reset the device if we can
-+         * The driver may have been configure NOT to reset the target during
-+         * a debug session */
-+        AR_DEBUG_PRINTF(" Attempting to reset target on instance destroy.... \n");
-+        ar6000_reset_device(ar->arHifDevice, ar->arTargetType);
-+    } else {
-+        AR_DEBUG_PRINTF(" Host does not want target reset. \n");
-+    }
-+
-+       /* Done with cookies */
-+    ar6000_cookie_cleanup(ar);
-+
-+    /* Cleanup BMI */
-+    BMIInit();
-+
-+    /* Clear the tx counters */
-+    memset(tx_attempt, 0, sizeof(tx_attempt));
-+    memset(tx_post, 0, sizeof(tx_post));
-+    memset(tx_complete, 0, sizeof(tx_complete));
-+
-+
-+    /* Free up the device data structure */
-+    if (unregister)
-+          unregister_netdev(dev);
-+#ifndef free_netdev
-+    kfree(dev);
-+#else
-+    free_netdev(dev);
-+#endif
-+
-+    AR_DEBUG_PRINTF("-ar6000_destroy \n");
-+}
-+
-+static void ar6000_detect_error(unsigned long ptr)
-+{
-+    struct net_device *dev = (struct net_device *)ptr;
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_TARGET_ERROR_REPORT_EVENT errEvent;
-+
-+    AR6000_SPIN_LOCK(&ar->arLock, 0);
-+
-+    if (ar->arHBChallengeResp.outstanding) {
-+        ar->arHBChallengeResp.missCnt++;
-+    } else {
-+        ar->arHBChallengeResp.missCnt = 0;
-+    }
-+
-+    if (ar->arHBChallengeResp.missCnt > ar->arHBChallengeResp.missThres) {
-+        /* Send Error Detect event to the application layer and do not reschedule the error detection module timer */
-+        ar->arHBChallengeResp.missCnt = 0;
-+        ar->arHBChallengeResp.seqNum = 0;
-+        errEvent.errorVal = WMI_TARGET_COM_ERR | WMI_TARGET_FATAL_ERR;
-+        AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+        ar6000_send_event_to_app(ar, WMI_ERROR_REPORT_EVENTID,
-+                                 (A_UINT8 *)&errEvent,
-+                                 sizeof(WMI_TARGET_ERROR_REPORT_EVENT));
-+        return;
-+    }
-+
-+    /* Generate the sequence number for the next challenge */
-+    ar->arHBChallengeResp.seqNum++;
-+    ar->arHBChallengeResp.outstanding = TRUE;
-+
-+    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+
-+    /* Send the challenge on the control channel */
-+    if (wmi_get_challenge_resp_cmd(ar->arWmi, ar->arHBChallengeResp.seqNum, DRV_HB_CHALLENGE) != A_OK) {
-+        AR_DEBUG_PRINTF("Unable to send heart beat challenge\n");
-+    }
-+
-+
-+    /* Reschedule the timer for the next challenge */
-+    A_TIMEOUT_MS(&ar->arHBChallengeResp.timer, ar->arHBChallengeResp.frequency * 1000, 0);
-+}
-+
-+void ar6000_init_profile_info(AR_SOFTC_T *ar)
-+{
-+    ar->arSsidLen            = 0;
-+    A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
-+    ar->arNetworkType        = INFRA_NETWORK;
-+    ar->arDot11AuthMode      = OPEN_AUTH;
-+    ar->arAuthMode           = NONE_AUTH;
-+    ar->arPairwiseCrypto     = NONE_CRYPT;
-+    ar->arPairwiseCryptoLen  = 0;
-+    ar->arGroupCrypto        = NONE_CRYPT;
-+    ar->arGroupCryptoLen     = 0;
-+    A_MEMZERO(ar->arWepKeyList, sizeof(ar->arWepKeyList));
-+    A_MEMZERO(ar->arReqBssid, sizeof(ar->arReqBssid));
-+    A_MEMZERO(ar->arBssid, sizeof(ar->arBssid));
-+    ar->arBssChannel = 0;
-+}
-+
-+static void
-+ar6000_init_control_info(AR_SOFTC_T *ar)
-+{
-+    ar->arWmiEnabled         = FALSE;
-+    ar6000_init_profile_info(ar);
-+    ar->arDefTxKeyIndex      = 0;
-+    A_MEMZERO(ar->arWepKeyList, sizeof(ar->arWepKeyList));
-+    ar->arChannelHint        = 0;
-+    ar->arListenInterval     = MAX_LISTEN_INTERVAL;
-+    ar->arVersion.host_ver   = AR6K_SW_VERSION;
-+    ar->arRssi               = 0;
-+    ar->arTxPwr              = 0;
-+    ar->arTxPwrSet           = FALSE;
-+    ar->arSkipScan           = 0;
-+    ar->arBeaconInterval     = 0;
-+    ar->arBitRate            = 0;
-+    ar->arMaxRetries         = 0;
-+    ar->arWmmEnabled         = TRUE;
-+}
-+
-+static int
-+ar6000_open(struct net_device *dev)
-+{
-+    /* Wake up the queues */
-+    netif_wake_queue(dev);
-+
-+    return 0;
-+}
-+
-+static int
-+ar6000_close(struct net_device *dev)
-+{
-+    netif_stop_queue(dev);
-+
-+    return 0;
-+}
-+
-+/* connect to a service */
-+static A_STATUS ar6000_connectservice(AR_SOFTC_T               *ar,
-+                                      HTC_SERVICE_CONNECT_REQ  *pConnect,
-+                                      WMI_PRI_STREAM_ID        WmiStreamID,
-+                                      char                     *pDesc)
-+{
-+    A_STATUS                 status;
-+    HTC_SERVICE_CONNECT_RESP response;
-+
-+    do {
-+
-+        A_MEMZERO(&response,sizeof(response));
-+
-+        status = HTCConnectService(ar->arHtcTarget,
-+                                   pConnect,
-+                                   &response);
-+
-+        if (A_FAILED(status)) {
-+            AR_DEBUG_PRINTF(" Failed to connect to %s service status:%d \n", pDesc, status);
-+            break;
-+        }
-+
-+        if (WmiStreamID == WMI_NOT_MAPPED) {
-+                /* done */
-+            break;
-+        }
-+
-+            /* set endpoint mapping for the WMI stream in the driver layer */
-+        arSetWMIStream2EndpointIDMap(ar,WmiStreamID,response.Endpoint);
-+
-+    } while (FALSE);
-+
-+    return status;
-+}
-+
-+static void ar6000_TxDataCleanup(AR_SOFTC_T *ar)
-+{
-+        /* flush all the data (non-control) streams
-+         * we only flush packets that are tagged as data, we leave any control packets that
-+         * were in the TX queues alone */
-+    HTCFlushEndpoint(ar->arHtcTarget,
-+                     arWMIStream2EndpointID(ar,WMI_BEST_EFFORT_PRI),
-+                     AR6K_DATA_PKT_TAG);
-+    HTCFlushEndpoint(ar->arHtcTarget,
-+                     arWMIStream2EndpointID(ar,WMI_LOW_PRI),
-+                     AR6K_DATA_PKT_TAG);
-+    HTCFlushEndpoint(ar->arHtcTarget,
-+                     arWMIStream2EndpointID(ar,WMI_HIGH_PRI),
-+                     AR6K_DATA_PKT_TAG);
-+    HTCFlushEndpoint(ar->arHtcTarget,
-+                     arWMIStream2EndpointID(ar,WMI_HIGHEST_PRI),
-+                     AR6K_DATA_PKT_TAG);
-+}
-+
-+/* This function does one time initialization for the lifetime of the device */
-+int ar6000_init(struct net_device *dev)
-+{
-+    AR_SOFTC_T *ar;
-+    A_STATUS    status;
-+    A_INT32     timeleft;
-+
-+    if((ar = netdev_priv(dev)) == NULL)
-+    {
-+        return(-EIO);
-+    }
-+
-+    /* Do we need to finish the BMI phase */
-+    if(BMIDone(ar->arHifDevice) != A_OK)
-+    {
-+        return -EIO;
-+    }
-+
-+    if (!bypasswmi)
-+    {
-+#if 0 /* TBDXXX */
-+        if (ar->arVersion.host_ver != ar->arVersion.target_ver) {
-+            A_PRINTF("WARNING: Host version 0x%x does not match Target "
-+                    " version 0x%x!\n",
-+                    ar->arVersion.host_ver, ar->arVersion.target_ver);
-+        }
-+#endif
-+
-+        /* Indicate that WMI is enabled (although not ready yet) */
-+        ar->arWmiEnabled = TRUE;
-+        if ((ar->arWmi = wmi_init((void *) ar)) == NULL)
-+        {
-+            AR_DEBUG_PRINTF("%s() Failed to initialize WMI.\n", __func__);
-+            return(-EIO);
-+        }
-+
-+        AR_DEBUG_PRINTF("%s() Got WMI @ 0x%08x.\n", __func__,
-+            (unsigned int) ar->arWmi);
-+    }
-+
-+    do {
-+        HTC_SERVICE_CONNECT_REQ connect;
-+
-+            /* the reason we have to wait for the target here is that the driver layer
-+             * has to init BMI in order to set the host block size,
-+             */
-+        status = HTCWaitTarget(ar->arHtcTarget);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+        A_MEMZERO(&connect,sizeof(connect));
-+            /* meta data is unused for now */
-+        connect.pMetaData = NULL;
-+        connect.MetaDataLength = 0;
-+            /* these fields are the same for all service endpoints */
-+        connect.EpCallbacks.pContext = ar;
-+        connect.EpCallbacks.EpTxComplete = ar6000_tx_complete;
-+        connect.EpCallbacks.EpRecv = ar6000_rx;
-+        connect.EpCallbacks.EpRecvRefill = ar6000_rx_refill;
-+        connect.EpCallbacks.EpSendFull = ar6000_tx_queue_full;
-+            /* set the max queue depth so that our ar6000_tx_queue_full handler gets called.
-+             * Linux has the peculiarity of not providing flow control between the
-+             * NIC and the network stack. There is no API to indicate that a TX packet
-+             * was sent which could provide some back pressure to the network stack.
-+             * Under linux you would have to wait till the network stack consumed all sk_buffs
-+             * before any back-flow kicked in. Which isn't very friendly.
-+             * So we have to manage this ourselves */
-+        connect.MaxSendQueueDepth = 32;
-+
-+            /* connect to control service */
-+        connect.ServiceID = WMI_CONTROL_SVC;
-+        status = ar6000_connectservice(ar,
-+                                       &connect,
-+                                       WMI_CONTROL_PRI,
-+                                       "WMI CONTROL");
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+            /* for the remaining data services set the connection flag to reduce dribbling,
-+             * if configured to do so */
-+        if (reduce_credit_dribble) {
-+            connect.ConnectionFlags |= HTC_CONNECT_FLAGS_REDUCE_CREDIT_DRIBBLE;
-+            /* the credit dribble trigger threshold is (reduce_credit_dribble - 1) for a value
-+             * of 0-3 */
-+            connect.ConnectionFlags &= ~HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_MASK;
-+            connect.ConnectionFlags |=
-+                        ((A_UINT16)reduce_credit_dribble - 1) & HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_MASK;
-+        }
-+            /* connect to best-effort service */
-+        connect.ServiceID = WMI_DATA_BE_SVC;
-+
-+        status = ar6000_connectservice(ar,
-+                                       &connect,
-+                                       WMI_BEST_EFFORT_PRI,
-+                                       "WMI DATA BE");
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+            /* connect to back-ground
-+             * map this to WMI LOW_PRI */
-+        connect.ServiceID = WMI_DATA_BK_SVC;
-+        status = ar6000_connectservice(ar,
-+                                       &connect,
-+                                       WMI_LOW_PRI,
-+                                       "WMI DATA BK");
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+            /* connect to Video service, map this to
-+             * to HI PRI */
-+        connect.ServiceID = WMI_DATA_VI_SVC;
-+        status = ar6000_connectservice(ar,
-+                                       &connect,
-+                                       WMI_HIGH_PRI,
-+                                       "WMI DATA VI");
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+            /* connect to VO service, this is currently not
-+             * mapped to a WMI priority stream due to historical reasons.
-+             * WMI originally defined 3 priorities over 3 mailboxes
-+             * We can change this when WMI is reworked so that priorities are not
-+             * dependent on mailboxes */
-+        connect.ServiceID = WMI_DATA_VO_SVC;
-+        status = ar6000_connectservice(ar,
-+                                       &connect,
-+                                       WMI_HIGHEST_PRI,
-+                                       "WMI DATA VO");
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+        A_ASSERT(arWMIStream2EndpointID(ar,WMI_CONTROL_PRI) != 0);
-+        A_ASSERT(arWMIStream2EndpointID(ar,WMI_BEST_EFFORT_PRI) != 0);
-+        A_ASSERT(arWMIStream2EndpointID(ar,WMI_LOW_PRI) != 0);
-+        A_ASSERT(arWMIStream2EndpointID(ar,WMI_HIGH_PRI) != 0);
-+        A_ASSERT(arWMIStream2EndpointID(ar,WMI_HIGHEST_PRI) != 0);
-+    } while (FALSE);
-+
-+    if (A_FAILED(status)) {
-+        return (-EIO);
-+    }
-+
-+    /*
-+     * give our connected endpoints some buffers
-+     */
-+    ar6000_rx_refill(ar, arWMIStream2EndpointID(ar,WMI_CONTROL_PRI));
-+
-+    ar6000_rx_refill(ar, arWMIStream2EndpointID(ar,WMI_BEST_EFFORT_PRI));
-+
-+    /*
-+     * We will post the receive buffers only for SPE testing and so we are
-+     * making it conditional on the 'bypasswmi' flag.
-+     */
-+    if (bypasswmi) {
-+        ar6000_rx_refill(ar,arWMIStream2EndpointID(ar,WMI_LOW_PRI));
-+        ar6000_rx_refill(ar,arWMIStream2EndpointID(ar,WMI_HIGH_PRI));
-+    }
-+
-+        /* setup credit distribution */
-+    ar6000_setup_credit_dist(ar->arHtcTarget, &ar->arCreditStateInfo);
-+
-+    /* Since cookies are used for HTC transports, they should be */
-+    /* initialized prior to enabling HTC.                        */
-+    ar6000_cookie_init(ar);
-+
-+    /* start HTC */
-+    status = HTCStart(ar->arHtcTarget);
-+
-+    if (status != A_OK) {
-+        if (ar->arWmiEnabled == TRUE) {
-+            wmi_shutdown(ar->arWmi);
-+            ar->arWmiEnabled = FALSE;
-+            ar->arWmi = NULL;
-+        }
-+        ar6000_cookie_cleanup(ar);
-+        return -EIO;
-+    }
-+
-+    if (!bypasswmi) {
-+        /* Wait for Wmi event to be ready */
-+        timeleft = wait_event_interruptible_timeout(arEvent,
-+            (ar->arWmiReady == TRUE), wmitimeout * HZ);
-+
-+        if(!timeleft || signal_pending(current))
-+        {
-+            AR_DEBUG_PRINTF("WMI is not ready or wait was interrupted\n");
-+#if defined(DWSIM) /* TBDXXX */
-+            AR_DEBUG_PRINTF(".....but proceed anyway.\n");
-+#else
-+            return -EIO;
-+#endif
-+        }
-+
-+        AR_DEBUG_PRINTF("%s() WMI is ready\n", __func__);
-+
-+        /* Communicate the wmi protocol verision to the target */
-+        if ((ar6000_set_host_app_area(ar)) != A_OK) {
-+            AR_DEBUG_PRINTF("Unable to set the host app area\n");
-+        }
-+    }
-+
-+    ar->arNumDataEndPts = 1;
-+
-+    return(0);
-+}
-+
-+
-+void
-+ar6000_bitrate_rx(void *devt, A_INT32 rateKbps)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
-+
-+    ar->arBitRate = rateKbps;
-+    wake_up(&arEvent);
-+}
-+
-+void
-+ar6000_ratemask_rx(void *devt, A_UINT16 ratemask)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
-+
-+    ar->arRateMask = ratemask;
-+    wake_up(&arEvent);
-+}
-+
-+void
-+ar6000_txPwr_rx(void *devt, A_UINT8 txPwr)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
-+
-+    ar->arTxPwr = txPwr;
-+    wake_up(&arEvent);
-+}
-+
-+
-+void
-+ar6000_channelList_rx(void *devt, A_INT8 numChan, A_UINT16 *chanList)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
-+
-+    A_MEMCPY(ar->arChannelList, chanList, numChan * sizeof (A_UINT16));
-+    ar->arNumChannels = numChan;
-+
-+    wake_up(&arEvent);
-+}
-+
-+A_UINT8
-+ar6000_ibss_map_epid(struct sk_buff *skb, struct net_device *dev, A_UINT32 * mapNo)
-+{
-+    AR_SOFTC_T      *ar = (AR_SOFTC_T *)dev->priv;
-+    A_UINT8         *datap;
-+    ATH_MAC_HDR     *macHdr;
-+    A_UINT32         i, eptMap;
-+
-+    (*mapNo) = 0;
-+    datap = A_NETBUF_DATA(skb);
-+    macHdr = (ATH_MAC_HDR *)(datap + sizeof(WMI_DATA_HDR));
-+    if (IEEE80211_IS_MULTICAST(macHdr->dstMac)) {
-+        return ENDPOINT_2;
-+    }
-+
-+    eptMap = -1;
-+    for (i = 0; i < ar->arNodeNum; i ++) {
-+        if (IEEE80211_ADDR_EQ(macHdr->dstMac, ar->arNodeMap[i].macAddress)) {
-+            (*mapNo) = i + 1;
-+            ar->arNodeMap[i].txPending ++;
-+            return ar->arNodeMap[i].epId;
-+        }
-+
-+        if ((eptMap == -1) && !ar->arNodeMap[i].txPending) {
-+            eptMap = i;
-+        }
-+    }
-+
-+    if (eptMap == -1) {
-+        eptMap = ar->arNodeNum;
-+        ar->arNodeNum ++;
-+        A_ASSERT(ar->arNodeNum <= MAX_NODE_NUM);
-+    }
-+
-+    A_MEMCPY(ar->arNodeMap[eptMap].macAddress, macHdr->dstMac, IEEE80211_ADDR_LEN);
-+
-+    for (i = ENDPOINT_2; i <= ENDPOINT_5; i ++) {
-+        if (!ar->arTxPending[i]) {
-+            ar->arNodeMap[eptMap].epId = i;
-+            break;
-+        }
-+        // No free endpoint is available, start redistribution on the inuse endpoints.
-+        if (i == ENDPOINT_5) {
-+            ar->arNodeMap[eptMap].epId = ar->arNexEpId;
-+            ar->arNexEpId ++;
-+            if (ar->arNexEpId > ENDPOINT_5) {
-+                ar->arNexEpId = ENDPOINT_2;
-+            }
-+        }
-+    }
-+
-+    (*mapNo) = eptMap + 1;
-+    ar->arNodeMap[eptMap].txPending ++;
-+
-+    return ar->arNodeMap[eptMap].epId;
-+}
-+
-+#ifdef DEBUG
-+static void ar6000_dump_skb(struct sk_buff *skb)
-+{
-+   u_char *ch;
-+   for (ch = A_NETBUF_DATA(skb);
-+        (A_UINT32)ch < ((A_UINT32)A_NETBUF_DATA(skb) +
-+        A_NETBUF_LEN(skb)); ch++)
-+    {
-+         AR_DEBUG_PRINTF("%2.2x ", *ch);
-+    }
-+    AR_DEBUG_PRINTF("\n");
-+}
-+#endif
-+
-+static int
-+ar6000_data_tx(struct sk_buff *skb, struct net_device *dev)
-+{
-+    AR_SOFTC_T        *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_PRI_STREAM_ID streamID = WMI_NOT_MAPPED;
-+    A_UINT32          mapNo = 0;
-+    int               len;
-+    struct ar_cookie *cookie;
-+    A_BOOL            checkAdHocPsMapping = FALSE;
-+
-+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,13)
-+    skb->list = NULL;
-+#endif
-+
-+    AR_DEBUG2_PRINTF("ar6000_data_tx start - skb=0x%x, data=0x%x, len=0x%x\n",
-+                     (A_UINT32)skb, (A_UINT32)A_NETBUF_DATA(skb),
-+                     A_NETBUF_LEN(skb));
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+     /* TCMD doesnt support any data, free the buf and return */
-+    if(ar->arTargetMode == AR6000_TCMD_MODE) {
-+        A_NETBUF_FREE(skb);
-+        return 0;
-+    }
-+#endif
-+    do {
-+
-+        if (ar->arWmiReady == FALSE && bypasswmi == 0) {
-+            break;
-+        }
-+
-+#ifdef BLOCK_TX_PATH_FLAG
-+        if (blocktx) {
-+            break;
-+        }
-+#endif /* BLOCK_TX_PATH_FLAG */
-+
-+        if (ar->arWmiEnabled) {
-+            if (A_NETBUF_HEADROOM(skb) < dev->hard_header_len) {
-+                struct sk_buff  *newbuf;
-+                /*
-+                 * We really should have gotten enough headroom but sometimes
-+                 * we still get packets with not enough headroom.  Copy the packet.
-+                 */
-+                len = A_NETBUF_LEN(skb);
-+                newbuf = A_NETBUF_ALLOC(len);
-+                if (newbuf == NULL) {
-+                    break;
-+                }
-+                A_NETBUF_PUT(newbuf, len);
-+                A_MEMCPY(A_NETBUF_DATA(newbuf), A_NETBUF_DATA(skb), len);
-+                A_NETBUF_FREE(skb);
-+                skb = newbuf;
-+                /* fall through and assemble header */
-+            }
-+
-+            if (wmi_dix_2_dot3(ar->arWmi, skb) != A_OK) {
-+                AR_DEBUG_PRINTF("ar6000_data_tx - wmi_dix_2_dot3 failed\n");
-+                break;
-+            }
-+
-+            if (wmi_data_hdr_add(ar->arWmi, skb, DATA_MSGTYPE) != A_OK) {
-+                AR_DEBUG_PRINTF("ar6000_data_tx - wmi_data_hdr_add failed\n");
-+                break;
-+            }
-+
-+            if ((ar->arNetworkType == ADHOC_NETWORK) &&
-+                ar->arIbssPsEnable && ar->arConnected) {
-+                    /* flag to check adhoc mapping once we take the lock below: */
-+                checkAdHocPsMapping = TRUE;
-+
-+            } else {
-+                    /* get the stream mapping */
-+                if (ar->arWmmEnabled) {
-+                    streamID = wmi_get_stream_id(ar->arWmi,
-+                                    wmi_implicit_create_pstream(ar->arWmi, skb, UPLINK_TRAFFIC, UNDEFINED_PRI));
-+                } else {
-+                    streamID = WMI_BEST_EFFORT_PRI;
-+                }
-+            }
-+
-+        } else {
-+            struct iphdr    *ipHdr;
-+            /*
-+             * the endpoint is directly based on the TOS field in the IP
-+             * header **** only for testing ******
-+             */
-+            ipHdr = A_NETBUF_DATA(skb) + sizeof(ATH_MAC_HDR);
-+                /* here we map the TOS field to an endpoint number, this is for
-+                 * the endpointping test application */
-+            streamID = IP_TOS_TO_WMI_PRI(ipHdr->tos);
-+        }
-+
-+    } while (FALSE);
-+
-+        /* did we succeed ? */
-+    if ((streamID == WMI_NOT_MAPPED) && !checkAdHocPsMapping) {
-+            /* cleanup and exit */
-+        A_NETBUF_FREE(skb);
-+        AR6000_STAT_INC(ar, tx_dropped);
-+        AR6000_STAT_INC(ar, tx_aborted_errors);
-+        return 0;
-+    }
-+
-+    cookie = NULL;
-+
-+        /* take the lock to protect driver data */
-+    AR6000_SPIN_LOCK(&ar->arLock, 0);
-+
-+    do {
-+
-+        if (checkAdHocPsMapping) {
-+            streamID = ar6000_ibss_map_epid(skb, dev, &mapNo);
-+        }
-+
-+        A_ASSERT(streamID != WMI_NOT_MAPPED);
-+
-+            /* validate that the endpoint is connected */
-+        if (arWMIStream2EndpointID(ar,streamID) == 0) {
-+            AR_DEBUG_PRINTF("Stream %d is NOT mapped!\n",streamID);
-+            break;
-+        }
-+            /* allocate resource for this packet */
-+        cookie = ar6000_alloc_cookie(ar);
-+
-+        if (cookie != NULL) {
-+                /* update counts while the lock is held */
-+            ar->arTxPending[streamID]++;
-+            ar->arTotalTxDataPending++;
-+        }
-+
-+    } while (FALSE);
-+
-+    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+
-+    if (cookie != NULL) {
-+        cookie->arc_bp[0] = (A_UINT32)skb;
-+        cookie->arc_bp[1] = mapNo;
-+        SET_HTC_PACKET_INFO_TX(&cookie->HtcPkt,
-+                               cookie,
-+                               A_NETBUF_DATA(skb),
-+                               A_NETBUF_LEN(skb),
-+                               arWMIStream2EndpointID(ar,streamID),
-+                               AR6K_DATA_PKT_TAG);
-+
-+#ifdef DEBUG
-+        if (debugdriver >= 3) {
-+            ar6000_dump_skb(skb);
-+        }
-+#endif
-+            /* HTC interface is asynchronous, if this fails, cleanup will happen in
-+             * the ar6000_tx_complete callback */
-+        HTCSendPkt(ar->arHtcTarget, &cookie->HtcPkt);
-+    } else {
-+            /* no packet to send, cleanup */
-+        A_NETBUF_FREE(skb);
-+        AR6000_STAT_INC(ar, tx_dropped);
-+        AR6000_STAT_INC(ar, tx_aborted_errors);
-+    }
-+
-+    return 0;
-+}
-+
-+#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+static void
-+tvsub(register struct timeval *out, register struct timeval *in)
-+{
-+    if((out->tv_usec -= in->tv_usec) < 0) {
-+        out->tv_sec--;
-+        out->tv_usec += 1000000;
-+    }
-+    out->tv_sec -= in->tv_sec;
-+}
-+
-+void
-+applyAPTCHeuristics(AR_SOFTC_T *ar)
-+{
-+    A_UINT32 duration;
-+    A_UINT32 numbytes;
-+    A_UINT32 throughput;
-+    struct timeval ts;
-+    A_STATUS status;
-+
-+    AR6000_SPIN_LOCK(&ar->arLock, 0);
-+
-+    if ((enableAPTCHeuristics) && (!aptcTR.timerScheduled)) {
-+        do_gettimeofday(&ts);
-+        tvsub(&ts, &aptcTR.samplingTS);
-+        duration = ts.tv_sec * 1000 + ts.tv_usec / 1000; /* ms */
-+        numbytes = aptcTR.bytesTransmitted + aptcTR.bytesReceived;
-+
-+        if (duration > APTC_TRAFFIC_SAMPLING_INTERVAL) {
-+            /* Initialize the time stamp and byte count */
-+            aptcTR.bytesTransmitted = aptcTR.bytesReceived = 0;
-+            do_gettimeofday(&aptcTR.samplingTS);
-+
-+            /* Calculate and decide based on throughput thresholds */
-+            throughput = ((numbytes * 8) / duration);
-+            if (throughput > APTC_UPPER_THROUGHPUT_THRESHOLD) {
-+                /* Disable Sleep and schedule a timer */
-+                A_ASSERT(ar->arWmiReady == TRUE);
-+                AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+                status = wmi_powermode_cmd(ar->arWmi, MAX_PERF_POWER);
-+                AR6000_SPIN_LOCK(&ar->arLock, 0);
-+                A_TIMEOUT_MS(&aptcTimer, APTC_TRAFFIC_SAMPLING_INTERVAL, 0);
-+                aptcTR.timerScheduled = TRUE;
-+            }
-+        }
-+    }
-+
-+    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+}
-+#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-+
-+static void ar6000_tx_queue_full(void *Context, HTC_ENDPOINT_ID Endpoint)
-+{
-+    AR_SOFTC_T     *ar = (AR_SOFTC_T *)Context;
-+
-+
-+    if (Endpoint == arWMIStream2EndpointID(ar,WMI_CONTROL_PRI)) {
-+        if (!bypasswmi) {
-+                /* under normal WMI if this is getting full, then something is running rampant
-+                 * the host should not be exhausting the WMI queue with too many commands
-+                 * the only exception to this is during testing using endpointping */
-+
-+            AR6000_SPIN_LOCK(&ar->arLock, 0);
-+                /* set flag to handle subsequent messages */
-+            ar->arWMIControlEpFull = TRUE;
-+            AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+            AR_DEBUG_PRINTF("WMI Control Endpoint is FULL!!! \n");
-+        }
-+    } else {
-+
-+        AR6000_SPIN_LOCK(&ar->arLock, 0);
-+        ar->arNetQueueStopped = TRUE;
-+        AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+        /* one of the data endpoints queues is getting full..need to stop network stack
-+         * the queue will resume in ar6000_tx_complete() */
-+        netif_stop_queue(ar->arNetDev);
-+    }
-+
-+
-+}
-+
-+
-+static void
-+ar6000_tx_complete(void *Context, HTC_PACKET *pPacket)
-+{
-+    AR_SOFTC_T     *ar = (AR_SOFTC_T *)Context;
-+    void           *cookie = (void *)pPacket->pPktContext;
-+    struct sk_buff *skb = NULL;
-+    A_UINT32        mapNo = 0;
-+    A_STATUS        status;
-+    struct ar_cookie * ar_cookie;
-+    WMI_PRI_STREAM_ID streamID;
-+    A_BOOL          wakeEvent = FALSE;
-+
-+    status = pPacket->Status;
-+    ar_cookie = (struct ar_cookie *)cookie;
-+    skb = (struct sk_buff *)ar_cookie->arc_bp[0];
-+    streamID = arEndpoint2WMIStreamID(ar,pPacket->Endpoint);
-+    mapNo = ar_cookie->arc_bp[1];
-+
-+    A_ASSERT(skb);
-+    A_ASSERT(pPacket->pBuffer == A_NETBUF_DATA(skb));
-+
-+    if (A_SUCCESS(status)) {
-+        A_ASSERT(pPacket->ActualLength == A_NETBUF_LEN(skb));
-+    }
-+
-+    AR_DEBUG2_PRINTF("ar6000_tx_complete skb=0x%x data=0x%x len=0x%x sid=%d ",
-+                     (A_UINT32)skb, (A_UINT32)pPacket->pBuffer,
-+                     pPacket->ActualLength,
-+                     streamID);
-+
-+        /* lock the driver as we update internal state */
-+    AR6000_SPIN_LOCK(&ar->arLock, 0);
-+
-+    ar->arTxPending[streamID]--;
-+
-+    if ((streamID != WMI_CONTROL_PRI) || bypasswmi) {
-+        ar->arTotalTxDataPending--;
-+    }
-+
-+    if (streamID == WMI_CONTROL_PRI)
-+    {
-+        if (ar->arWMIControlEpFull) {
-+                /* since this packet completed, the WMI EP is no longer full */
-+            ar->arWMIControlEpFull = FALSE;
-+        }
-+
-+        if (ar->arTxPending[streamID] == 0) {
-+            wakeEvent = TRUE;
-+        }
-+    }
-+
-+    if (A_FAILED(status)) {
-+        AR_DEBUG_PRINTF("%s() -TX ERROR, status: 0x%x\n", __func__,
-+                        status);
-+        AR6000_STAT_INC(ar, tx_errors);
-+    } else {
-+        AR_DEBUG2_PRINTF("OK\n");
-+        AR6000_STAT_INC(ar, tx_packets);
-+        ar->arNetStats.tx_bytes += A_NETBUF_LEN(skb);
-+#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+        aptcTR.bytesTransmitted += a_netbuf_to_len(skb);
-+        applyAPTCHeuristics(ar);
-+#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-+    }
-+
-+    // TODO this needs to be looked at
-+    if ((ar->arNetworkType == ADHOC_NETWORK) && ar->arIbssPsEnable
-+        && (streamID != WMI_CONTROL_PRI) && mapNo)
-+    {
-+        mapNo --;
-+        ar->arNodeMap[mapNo].txPending --;
-+
-+        if (!ar->arNodeMap[mapNo].txPending && (mapNo == (ar->arNodeNum - 1))) {
-+            A_UINT32 i;
-+            for (i = ar->arNodeNum; i > 0; i --) {
-+                if (!ar->arNodeMap[i - 1].txPending) {
-+                    A_MEMZERO(&ar->arNodeMap[i - 1], sizeof(struct ar_node_mapping));
-+                    ar->arNodeNum --;
-+                } else {
-+                    break;
-+                }
-+            }
-+        }
-+    }
-+
-+    /* Freeing a cookie should not be contingent on either of */
-+    /* these flags, just if we have a cookie or not.           */
-+    /* Can we even get here without a cookie? Fix later.       */
-+    if (ar->arWmiReady == TRUE || (bypasswmi))
-+    {
-+        ar6000_free_cookie(ar, cookie);
-+    }
-+
-+    if (ar->arNetQueueStopped) {
-+        ar->arNetQueueStopped = FALSE;
-+    }
-+
-+    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+
-+    /* lock is released, we can freely call other kernel APIs */
-+
-+        /* this indirectly frees the HTC_PACKET */
-+    A_NETBUF_FREE(skb);
-+
-+    if ((ar->arConnected == TRUE) || (bypasswmi)) {
-+        if (status != A_ECANCELED) {
-+                /* don't wake the queue if we are flushing, other wise it will just
-+                 * keep queueing packets, which will keep failing */
-+            netif_wake_queue(ar->arNetDev);
-+        }
-+    }
-+
-+    if (wakeEvent) {
-+        wake_up(&arEvent);
-+    }
-+
-+}
-+
-+/*
-+ * Receive event handler.  This is called by HTC when a packet is received
-+ */
-+int pktcount;
-+static void
-+ar6000_rx(void *Context, HTC_PACKET *pPacket)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)Context;
-+    struct sk_buff *skb = (struct sk_buff *)pPacket->pPktContext;
-+    int minHdrLen;
-+    A_STATUS        status = pPacket->Status;
-+    WMI_PRI_STREAM_ID streamID = arEndpoint2WMIStreamID(ar,pPacket->Endpoint);
-+    HTC_ENDPOINT_ID   ept = pPacket->Endpoint;
-+
-+    A_ASSERT((status != A_OK) || (pPacket->pBuffer == (A_NETBUF_DATA(skb) + HTC_HEADER_LEN)));
-+
-+    AR_DEBUG2_PRINTF("ar6000_rx ar=0x%x sid=%d, skb=0x%x, data=0x%x, len=0x%x ",
-+                    (A_UINT32)ar, streamID, (A_UINT32)skb, (A_UINT32)pPacket->pBuffer,
-+                    pPacket->ActualLength);
-+    if (status != A_OK) {
-+        AR_DEBUG2_PRINTF("ERR\n");
-+    } else {
-+        AR_DEBUG2_PRINTF("OK\n");
-+    }
-+
-+        /* take lock to protect buffer counts
-+         * and adaptive power throughput state */
-+    AR6000_SPIN_LOCK(&ar->arLock, 0);
-+
-+    ar->arRxBuffers[streamID]--;
-+
-+    if (A_SUCCESS(status)) {
-+        AR6000_STAT_INC(ar, rx_packets);
-+        ar->arNetStats.rx_bytes += pPacket->ActualLength;
-+#ifdef ADAPTIVE_POWER_THROUGHPUT_CONTROL
-+        aptcTR.bytesReceived += a_netbuf_to_len(skb);
-+        applyAPTCHeuristics(ar);
-+#endif /* ADAPTIVE_POWER_THROUGHPUT_CONTROL */
-+
-+        A_NETBUF_PUT(skb, pPacket->ActualLength +  HTC_HEADER_LEN);
-+        A_NETBUF_PULL(skb, HTC_HEADER_LEN);
-+
-+#ifdef DEBUG
-+        if (debugdriver >= 2) {
-+            ar6000_dump_skb(skb);
-+        }
-+#endif /* DEBUG */
-+    }
-+
-+    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+
-+    if (status != A_OK) {
-+        AR6000_STAT_INC(ar, rx_errors);
-+        A_NETBUF_FREE(skb);
-+    } else if (ar->arWmiEnabled == TRUE) {
-+        if (streamID == WMI_CONTROL_PRI) {
-+           /*
-+            * this is a wmi control msg
-+            */
-+            wmi_control_rx(ar->arWmi, skb);
-+        } else {
-+            WMI_DATA_HDR *dhdr = (WMI_DATA_HDR *)A_NETBUF_DATA(skb);
-+            if (WMI_DATA_HDR_IS_MSG_TYPE(dhdr, CNTL_MSGTYPE)) {
-+                /*
-+                 * this is a wmi control msg
-+                 */
-+                /* strip off WMI hdr */
-+                wmi_data_hdr_remove(ar->arWmi, skb);
-+                wmi_control_rx(ar->arWmi, skb);
-+            } else {
-+                /*
-+                 * this is a wmi data packet
-+                 */
-+                minHdrLen = sizeof (WMI_DATA_HDR) + sizeof(ATH_MAC_HDR) +
-+                            sizeof(ATH_LLC_SNAP_HDR);
-+
-+                if ((pPacket->ActualLength < minHdrLen) ||
-+                    (pPacket->ActualLength > AR6000_BUFFER_SIZE))
-+                {
-+                    /*
-+                     * packet is too short or too long
-+                     */
-+                    AR_DEBUG_PRINTF("TOO SHORT or TOO LONG\n");
-+                    AR6000_STAT_INC(ar, rx_errors);
-+                    AR6000_STAT_INC(ar, rx_length_errors);
-+                    A_NETBUF_FREE(skb);
-+                } else {
-+                    if (ar->arWmmEnabled) {
-+                        wmi_implicit_create_pstream(ar->arWmi, skb,
-+                            DNLINK_TRAFFIC, UNDEFINED_PRI);
-+                    }
-+#if 0
-+                    /* Access RSSI values here */
-+                    AR_DEBUG_PRINTF("RSSI %d\n",
-+                        ((WMI_DATA_HDR *) A_NETBUF_DATA(skb))->rssi);
-+#endif
-+                    wmi_data_hdr_remove(ar->arWmi, skb);
-+                    wmi_dot3_2_dix(ar->arWmi, skb);
-+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+                    /*
-+                     * extra push and memcpy, for eth_type_trans() of 2.4 kernel
-+                     * will pull out hard_header_len bytes of the skb.
-+                     */
-+                    A_NETBUF_PUSH(skb, sizeof(WMI_DATA_HDR) + sizeof(ATH_LLC_SNAP_HDR) + HTC_HEADER_LEN);
-+                    A_MEMCPY(A_NETBUF_DATA(skb), A_NETBUF_DATA(skb) + sizeof(WMI_DATA_HDR) +
-+                             sizeof(ATH_LLC_SNAP_HDR) + HTC_HEADER_LEN, sizeof(ATH_MAC_HDR));
-+#endif
-+                    if ((ar->arNetDev->flags & IFF_UP) == IFF_UP)
-+                    {
-+                        skb->dev = ar->arNetDev;
-+                        skb->protocol = eth_type_trans(skb, ar->arNetDev);
-+                        netif_rx(skb);
-+                    }
-+                    else
-+                    {
-+                        A_NETBUF_FREE(skb);
-+                    }
-+                }
-+            }
-+        }
-+    } else {
-+        if ((ar->arNetDev->flags & IFF_UP) == IFF_UP)
-+        {
-+            skb->dev = ar->arNetDev;
-+            skb->protocol = eth_type_trans(skb, ar->arNetDev);
-+            netif_rx(skb);
-+        }
-+        else
-+        {
-+            A_NETBUF_FREE(skb);
-+        }
-+    }
-+
-+    if (status != A_ECANCELED) {
-+        /*
-+         * HTC provides A_ECANCELED status when it doesn't want to be refilled
-+         * (probably due to a shutdown)
-+         */
-+        ar6000_rx_refill(Context, ept);
-+    }
-+
-+
-+}
-+
-+static void
-+ar6000_rx_refill(void *Context, HTC_ENDPOINT_ID Endpoint)
-+{
-+    AR_SOFTC_T  *ar = (AR_SOFTC_T *)Context;
-+    void        *osBuf;
-+    int         RxBuffers;
-+    int         buffersToRefill;
-+    HTC_PACKET  *pPacket;
-+    WMI_PRI_STREAM_ID streamId = arEndpoint2WMIStreamID(ar,Endpoint);
-+
-+    buffersToRefill = (int)AR6000_MAX_RX_BUFFERS -
-+                                    (int)ar->arRxBuffers[streamId];
-+
-+    if (buffersToRefill <= 0) {
-+            /* fast return, nothing to fill */
-+        return;
-+    }
-+
-+    AR_DEBUG2_PRINTF("ar6000_rx_refill: providing htc with %d buffers at eid=%d\n",
-+                    buffersToRefill, Endpoint);
-+
-+    for (RxBuffers = 0; RxBuffers < buffersToRefill; RxBuffers++) {
-+        osBuf = A_NETBUF_ALLOC(AR6000_BUFFER_SIZE);
-+        if (NULL == osBuf) {
-+            break;
-+        }
-+            /* the HTC packet wrapper is at the head of the reserved area
-+             * in the skb */
-+        pPacket = (HTC_PACKET *)(A_NETBUF_HEAD(osBuf));
-+            /* set re-fill info */
-+        SET_HTC_PACKET_INFO_RX_REFILL(pPacket,osBuf,A_NETBUF_DATA(osBuf),AR6000_BUFFER_SIZE,Endpoint);
-+            /* add this packet */
-+        HTCAddReceivePkt(ar->arHtcTarget, pPacket);
-+    }
-+
-+        /* update count */
-+    AR6000_SPIN_LOCK(&ar->arLock, 0);
-+    ar->arRxBuffers[streamId] += RxBuffers;
-+    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+}
-+
-+static struct net_device_stats *
-+ar6000_get_stats(struct net_device *dev)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    return &ar->arNetStats;
-+}
-+
-+static struct iw_statistics *
-+ar6000_get_iwstats(struct net_device * dev)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    TARGET_STATS *pStats = &ar->arTargetStats;
-+    struct iw_statistics * pIwStats = &ar->arIwStats;
-+
-+    if ((ar->arWmiReady == FALSE)
-+    /*
-+     * The in_atomic function is used to determine if the scheduling is
-+     * allowed in the current context or not. This was introduced in 2.6
-+     * From what I have read on the differences between 2.4 and 2.6, the
-+     * 2.4 kernel did not support preemption and so this check might not
-+     * be required for 2.4 kernels.
-+     */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        || (in_atomic())
-+#endif
-+       )
-+    {
-+        pIwStats->status = 0;
-+        pIwStats->qual.qual = 0;
-+        pIwStats->qual.level =0;
-+        pIwStats->qual.noise = 0;
-+        pIwStats->discard.code =0;
-+        pIwStats->discard.retries=0;
-+        pIwStats->miss.beacon =0;
-+        return pIwStats;
-+    }
-+    if (down_interruptible(&ar->arSem)) {
-+        pIwStats->status = 0;
-+        return pIwStats;
-+    }
-+
-+
-+    ar->statsUpdatePending = TRUE;
-+
-+    if(wmi_get_stats_cmd(ar->arWmi) != A_OK) {
-+        up(&ar->arSem);
-+        pIwStats->status = 0;
-+        return pIwStats;
-+    }
-+
-+    wait_event_interruptible_timeout(arEvent, ar->statsUpdatePending == FALSE, wmitimeout * HZ);
-+
-+    if (signal_pending(current)) {
-+        AR_DEBUG_PRINTF("ar6000 : WMI get stats timeout \n");
-+        up(&ar->arSem);
-+        pIwStats->status = 0;
-+        return pIwStats;
-+    }
-+    pIwStats->status = 1 ;
-+    pIwStats->qual.qual = pStats->cs_aveBeacon_rssi;
-+    pIwStats->qual.level =pStats->cs_aveBeacon_rssi + 161;  /* noise is -95 dBm */
-+    pIwStats->qual.noise = pStats->noise_floor_calibation;
-+    pIwStats->discard.code = pStats->rx_decrypt_err;
-+    pIwStats->discard.retries = pStats->tx_retry_cnt;
-+    pIwStats->miss.beacon = pStats->cs_bmiss_cnt;
-+    up(&ar->arSem);
-+    return pIwStats;
-+}
-+
-+void
-+ar6000_ready_event(void *devt, A_UINT8 *datap, A_UINT8 phyCap)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
-+    struct net_device *dev = ar->arNetDev;
-+
-+    ar->arWmiReady = TRUE;
-+    wake_up(&arEvent);
-+    A_MEMCPY(dev->dev_addr, datap, AR6000_ETH_ADDR_LEN);
-+    AR_DEBUG_PRINTF("mac address = %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n",
-+        dev->dev_addr[0], dev->dev_addr[1],
-+        dev->dev_addr[2], dev->dev_addr[3],
-+        dev->dev_addr[4], dev->dev_addr[5]);
-+
-+    ar->arPhyCapability = phyCap;
-+}
-+
-+A_UINT8
-+ar6000_iptos_to_userPriority(A_UINT8 *pkt)
-+{
-+    struct iphdr *ipHdr = (struct iphdr *)pkt;
-+    A_UINT8 userPriority;
-+
-+    /*
-+     * IP Tos format :
-+     *      (Refer Pg 57 WMM-test-plan-v1.2)
-+     * IP-TOS - 8bits
-+     *          : DSCP(6-bits) ECN(2-bits)
-+     *          : DSCP - P2 P1 P0 X X X
-+     *              where (P2 P1 P0) form 802.1D
-+     */
-+    userPriority = ipHdr->tos >> 5;
-+    return (userPriority & 0x7);
-+}
-+
-+void
-+ar6000_connect_event(AR_SOFTC_T *ar, A_UINT16 channel, A_UINT8 *bssid,
-+                     A_UINT16 listenInterval, A_UINT16 beaconInterval,
-+                     NETWORK_TYPE networkType, A_UINT8 beaconIeLen,
-+                     A_UINT8 assocReqLen, A_UINT8 assocRespLen,
-+                     A_UINT8 *assocInfo)
-+{
-+    union iwreq_data wrqu;
-+    int i, beacon_ie_pos, assoc_resp_ie_pos, assoc_req_ie_pos;
-+    static const char *tag1 = "ASSOCINFO(ReqIEs=";
-+    static const char *tag2 = "ASSOCRESPIE=";
-+    static const char *beaconIetag = "BEACONIE=";
-+    char buf[WMI_CONTROL_MSG_MAX_LEN * 2 + sizeof(tag1)];
-+    char *pos;
-+    A_UINT8 key_op_ctrl;
-+
-+    A_MEMCPY(ar->arBssid, bssid, sizeof(ar->arBssid));
-+    ar->arBssChannel = channel;
-+
-+    A_PRINTF("AR6000 connected event on freq %d ", channel);
-+    A_PRINTF("with bssid %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x "
-+            " listenInterval=%d, beaconInterval = %d, beaconIeLen = %d assocReqLen=%d"
-+            " assocRespLen =%d\n",
-+             bssid[0], bssid[1], bssid[2],
-+             bssid[3], bssid[4], bssid[5],
-+             listenInterval, beaconInterval,
-+             beaconIeLen, assocReqLen, assocRespLen);
-+    if (networkType & ADHOC_NETWORK) {
-+        if (networkType & ADHOC_CREATOR) {
-+            A_PRINTF("Network: Adhoc (Creator)\n");
-+        } else {
-+            A_PRINTF("Network: Adhoc (Joiner)\n");
-+        }
-+    } else {
-+        A_PRINTF("Network: Infrastructure\n");
-+    }
-+
-+    if (beaconIeLen && (sizeof(buf) > (9 + beaconIeLen * 2))) {
-+        AR_DEBUG_PRINTF("\nBeaconIEs= ");
-+
-+        beacon_ie_pos = 0;
-+        A_MEMZERO(buf, sizeof(buf));
-+        sprintf(buf, "%s", beaconIetag);
-+        pos = buf + 9;
-+        for (i = beacon_ie_pos; i < beacon_ie_pos + beaconIeLen; i++) {
-+            AR_DEBUG_PRINTF("%2.2x ", assocInfo[i]);
-+            sprintf(pos, "%2.2x", assocInfo[i]);
-+            pos += 2;
-+        }
-+        AR_DEBUG_PRINTF("\n");
-+
-+        A_MEMZERO(&wrqu, sizeof(wrqu));
-+        wrqu.data.length = strlen(buf);
-+        wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);
-+    }
-+
-+    if (assocRespLen && (sizeof(buf) > (12 + (assocRespLen * 2))))
-+    {
-+        assoc_resp_ie_pos = beaconIeLen + assocReqLen +
-+                            sizeof(A_UINT16)  +  /* capinfo*/
-+                            sizeof(A_UINT16)  +  /* status Code */
-+                            sizeof(A_UINT16)  ;  /* associd */
-+        A_MEMZERO(buf, sizeof(buf));
-+        sprintf(buf, "%s", tag2);
-+        pos = buf + 12;
-+        AR_DEBUG_PRINTF("\nAssocRespIEs= ");
-+        /*
-+         * The Association Response Frame w.o. the WLAN header is delivered to
-+         * the host, so skip over to the IEs
-+         */
-+        for (i = assoc_resp_ie_pos; i < assoc_resp_ie_pos + assocRespLen - 6; i++)
-+        {
-+            AR_DEBUG_PRINTF("%2.2x ", assocInfo[i]);
-+            sprintf(pos, "%2.2x", assocInfo[i]);
-+            pos += 2;
-+        }
-+        AR_DEBUG_PRINTF("\n");
-+
-+        A_MEMZERO(&wrqu, sizeof(wrqu));
-+        wrqu.data.length = strlen(buf);
-+        wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);
-+    }
-+
-+    if (assocReqLen && (sizeof(buf) > (17 + (assocReqLen * 2)))) {
-+        /*
-+         * assoc Request includes capability and listen interval. Skip these.
-+         */
-+        assoc_req_ie_pos =  beaconIeLen +
-+                            sizeof(A_UINT16)  +  /* capinfo*/
-+                            sizeof(A_UINT16);    /* listen interval */
-+
-+        A_MEMZERO(buf, sizeof(buf));
-+        sprintf(buf, "%s", tag1);
-+        pos = buf + 17;
-+        AR_DEBUG_PRINTF("AssocReqIEs= ");
-+        for (i = assoc_req_ie_pos; i < assoc_req_ie_pos + assocReqLen - 4; i++) {
-+            AR_DEBUG_PRINTF("%2.2x ", assocInfo[i]);
-+            sprintf(pos, "%2.2x", assocInfo[i]);
-+            pos += 2;;
-+        }
-+        AR_DEBUG_PRINTF("\n");
-+
-+        A_MEMZERO(&wrqu, sizeof(wrqu));
-+        wrqu.data.length = strlen(buf);
-+        wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);
-+    }
-+
-+#ifdef USER_KEYS
-+    if (ar->user_savedkeys_stat == USER_SAVEDKEYS_STAT_RUN &&
-+        ar->user_saved_keys.keyOk == TRUE)
-+    {
-+
-+        key_op_ctrl = KEY_OP_VALID_MASK & ~KEY_OP_INIT_TSC;
-+        if (ar->user_key_ctrl & AR6000_USER_SETKEYS_RSC_UNCHANGED) {
-+            key_op_ctrl &= ~KEY_OP_INIT_RSC;
-+        } else {
-+            key_op_ctrl |= KEY_OP_INIT_RSC;
-+        }
-+        ar6000_reinstall_keys(ar, key_op_ctrl);
-+    }
-+#endif /* USER_KEYS */
-+
-+        /* flush data queues */
-+    ar6000_TxDataCleanup(ar);
-+
-+    netif_wake_queue(ar->arNetDev);
-+
-+    if ((OPEN_AUTH == ar->arDot11AuthMode) &&
-+        (NONE_AUTH == ar->arAuthMode)      &&
-+        (WEP_CRYPT == ar->arPairwiseCrypto))
-+    {
-+        if (!ar->arConnected) {
-+            ar6000_install_static_wep_keys(ar);
-+        }
-+    }
-+
-+    ar->arConnected  = TRUE;
-+    ar->arConnectPending = FALSE;
-+
-+    reconnect_flag = 0;
-+
-+    A_MEMZERO(&wrqu, sizeof(wrqu));
-+    A_MEMCPY(wrqu.addr.sa_data, bssid, IEEE80211_ADDR_LEN);
-+    wrqu.addr.sa_family = ARPHRD_ETHER;
-+    wireless_send_event(ar->arNetDev, SIOCGIWAP, &wrqu, NULL);
-+    if ((ar->arNetworkType == ADHOC_NETWORK) && ar->arIbssPsEnable) {
-+        A_MEMZERO(ar->arNodeMap, sizeof(ar->arNodeMap));
-+        ar->arNodeNum = 0;
-+        ar->arNexEpId = ENDPOINT_2;
-+    }
-+
-+}
-+
-+void ar6000_set_numdataendpts(AR_SOFTC_T *ar, A_UINT32 num)
-+{
-+    A_ASSERT(num <= (HTC_MAILBOX_NUM_MAX - 1));
-+    ar->arNumDataEndPts = num;
-+}
-+
-+void
-+ar6000_disconnect_event(AR_SOFTC_T *ar, A_UINT8 reason, A_UINT8 *bssid,
-+                        A_UINT8 assocRespLen, A_UINT8 *assocInfo, A_UINT16 protocolReasonStatus)
-+{
-+    A_UINT8 i;
-+
-+    A_PRINTF("AR6000 disconnected");
-+    if (bssid[0] || bssid[1] || bssid[2] || bssid[3] || bssid[4] || bssid[5]) {
-+        A_PRINTF(" from %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x ",
-+                 bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5]);
-+    }
-+
-+    AR_DEBUG_PRINTF("\nDisconnect Reason is %d", reason);
-+    AR_DEBUG_PRINTF("\nProtocol Reason/Status Code is %d", protocolReasonStatus);
-+    AR_DEBUG_PRINTF("\nAssocResp Frame = %s",
-+                    assocRespLen ? " " : "NULL");
-+    for (i = 0; i < assocRespLen; i++) {
-+        if (!(i % 0x10)) {
-+            AR_DEBUG_PRINTF("\n");
-+        }
-+        AR_DEBUG_PRINTF("%2.2x ", assocInfo[i]);
-+    }
-+    AR_DEBUG_PRINTF("\n");
-+    /*
-+     * If the event is due to disconnect cmd from the host, only they the target
-+     * would stop trying to connect. Under any other condition, target would
-+     * keep trying to connect.
-+     *
-+     */
-+    if( reason == DISCONNECT_CMD)
-+    {
-+        ar->arConnectPending = FALSE;
-+    } else {
-+        ar->arConnectPending = TRUE;
-+        if (((reason == ASSOC_FAILED) && (protocolReasonStatus == 0x11)) ||
-+            ((reason == ASSOC_FAILED) && (protocolReasonStatus == 0x0) && (reconnect_flag == 1))) {
-+            ar->arConnected = TRUE;
-+            return;
-+        }
-+    }
-+    ar->arConnected = FALSE;
-+
-+    if( (reason != CSERV_DISCONNECT) || (reconnect_flag != 1) ) {
-+        reconnect_flag = 0;
-+    }
-+
-+#ifdef USER_KEYS
-+    if (reason != CSERV_DISCONNECT)
-+    {
-+        ar->user_savedkeys_stat = USER_SAVEDKEYS_STAT_INIT;
-+        ar->user_key_ctrl      = 0;
-+    }
-+#endif /* USER_KEYS */
-+
-+    netif_stop_queue(ar->arNetDev);
-+    A_MEMZERO(ar->arBssid, sizeof(ar->arBssid));
-+    ar->arBssChannel = 0;
-+    ar->arBeaconInterval = 0;
-+
-+    ar6000_TxDataCleanup(ar);
-+}
-+
-+void
-+ar6000_regDomain_event(AR_SOFTC_T *ar, A_UINT32 regCode)
-+{
-+    A_PRINTF("AR6000 Reg Code = 0x%x\n", regCode);
-+    ar->arRegCode = regCode;
-+}
-+
-+void
-+ar6000_neighborReport_event(AR_SOFTC_T *ar, int numAps, WMI_NEIGHBOR_INFO *info)
-+{
-+    static const char *tag = "PRE-AUTH";
-+    char buf[128];
-+    union iwreq_data wrqu;
-+    int i;
-+
-+    AR_DEBUG_PRINTF("AR6000 Neighbor Report Event\n");
-+    for (i=0; i < numAps; info++, i++) {
-+        AR_DEBUG_PRINTF("bssid %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x ",
-+            info->bssid[0], info->bssid[1], info->bssid[2],
-+            info->bssid[3], info->bssid[4], info->bssid[5]);
-+        if (info->bssFlags & WMI_PREAUTH_CAPABLE_BSS) {
-+            AR_DEBUG_PRINTF("preauth-cap");
-+        }
-+        if (info->bssFlags & WMI_PMKID_VALID_BSS) {
-+            AR_DEBUG_PRINTF(" pmkid-valid\n");
-+            continue;           /* we skip bss if the pmkid is already valid */
-+        }
-+        AR_DEBUG_PRINTF("\n");
-+        snprintf(buf, sizeof(buf), "%s%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x",
-+                 tag,
-+                 info->bssid[0], info->bssid[1], info->bssid[2],
-+                 info->bssid[3], info->bssid[4], info->bssid[5],
-+                 i, info->bssFlags);
-+        A_MEMZERO(&wrqu, sizeof(wrqu));
-+        wrqu.data.length = strlen(buf);
-+        wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);
-+    }
-+}
-+
-+void
-+ar6000_tkip_micerr_event(AR_SOFTC_T *ar, A_UINT8 keyid, A_BOOL ismcast)
-+{
-+    static const char *tag = "MLME-MICHAELMICFAILURE.indication";
-+    char buf[128];
-+    union iwreq_data wrqu;
-+
-+    A_PRINTF("AR6000 TKIP MIC error received for keyid %d %scast\n",
-+             keyid, ismcast ? "multi": "uni");
-+    snprintf(buf, sizeof(buf), "%s(keyid=%d %scat)", tag, keyid,
-+             ismcast ? "multi" : "uni");
-+    memset(&wrqu, 0, sizeof(wrqu));
-+    wrqu.data.length = strlen(buf);
-+    wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);
-+}
-+
-+void
-+ar6000_scanComplete_event(AR_SOFTC_T *ar, A_STATUS status)
-+{
-+      AR_DEBUG_PRINTF("AR6000 scan complete: %d\n", status);
-+
-+      ar->scan_complete = 1;
-+      wake_up_interruptible(&ar6000_scan_queue);
-+}
-+
-+void
-+ar6000_targetStats_event(AR_SOFTC_T *ar,  WMI_TARGET_STATS *pTarget)
-+{
-+    TARGET_STATS *pStats = &ar->arTargetStats;
-+    A_UINT8 ac;
-+
-+    A_PRINTF("AR6000 updating target stats\n");
-+    pStats->tx_packets          += pTarget->txrxStats.tx_stats.tx_packets;
-+    pStats->tx_bytes            += pTarget->txrxStats.tx_stats.tx_bytes;
-+    pStats->tx_unicast_pkts     += pTarget->txrxStats.tx_stats.tx_unicast_pkts;
-+    pStats->tx_unicast_bytes    += pTarget->txrxStats.tx_stats.tx_unicast_bytes;
-+    pStats->tx_multicast_pkts   += pTarget->txrxStats.tx_stats.tx_multicast_pkts;
-+    pStats->tx_multicast_bytes  += pTarget->txrxStats.tx_stats.tx_multicast_bytes;
-+    pStats->tx_broadcast_pkts   += pTarget->txrxStats.tx_stats.tx_broadcast_pkts;
-+    pStats->tx_broadcast_bytes  += pTarget->txrxStats.tx_stats.tx_broadcast_bytes;
-+    pStats->tx_rts_success_cnt  += pTarget->txrxStats.tx_stats.tx_rts_success_cnt;
-+    for(ac = 0; ac < WMM_NUM_AC; ac++)
-+        pStats->tx_packet_per_ac[ac] += pTarget->txrxStats.tx_stats.tx_packet_per_ac[ac];
-+    pStats->tx_errors           += pTarget->txrxStats.tx_stats.tx_errors;
-+    pStats->tx_failed_cnt       += pTarget->txrxStats.tx_stats.tx_failed_cnt;
-+    pStats->tx_retry_cnt        += pTarget->txrxStats.tx_stats.tx_retry_cnt;
-+    pStats->tx_rts_fail_cnt     += pTarget->txrxStats.tx_stats.tx_rts_fail_cnt;
-+    pStats->tx_unicast_rate      = wmi_get_rate(pTarget->txrxStats.tx_stats.tx_unicast_rate);
-+
-+    pStats->rx_packets          += pTarget->txrxStats.rx_stats.rx_packets;
-+    pStats->rx_bytes            += pTarget->txrxStats.rx_stats.rx_bytes;
-+    pStats->rx_unicast_pkts     += pTarget->txrxStats.rx_stats.rx_unicast_pkts;
-+    pStats->rx_unicast_bytes    += pTarget->txrxStats.rx_stats.rx_unicast_bytes;
-+    pStats->rx_multicast_pkts   += pTarget->txrxStats.rx_stats.rx_multicast_pkts;
-+    pStats->rx_multicast_bytes  += pTarget->txrxStats.rx_stats.rx_multicast_bytes;
-+    pStats->rx_broadcast_pkts   += pTarget->txrxStats.rx_stats.rx_broadcast_pkts;
-+    pStats->rx_broadcast_bytes  += pTarget->txrxStats.rx_stats.rx_broadcast_bytes;
-+    pStats->rx_fragment_pkt     += pTarget->txrxStats.rx_stats.rx_fragment_pkt;
-+    pStats->rx_errors           += pTarget->txrxStats.rx_stats.rx_errors;
-+    pStats->rx_crcerr           += pTarget->txrxStats.rx_stats.rx_crcerr;
-+    pStats->rx_key_cache_miss   += pTarget->txrxStats.rx_stats.rx_key_cache_miss;
-+    pStats->rx_decrypt_err      += pTarget->txrxStats.rx_stats.rx_decrypt_err;
-+    pStats->rx_duplicate_frames += pTarget->txrxStats.rx_stats.rx_duplicate_frames;
-+    pStats->rx_unicast_rate      = wmi_get_rate(pTarget->txrxStats.rx_stats.rx_unicast_rate);
-+
-+
-+    pStats->tkip_local_mic_failure
-+                                += pTarget->txrxStats.tkipCcmpStats.tkip_local_mic_failure;
-+    pStats->tkip_counter_measures_invoked
-+                                += pTarget->txrxStats.tkipCcmpStats.tkip_counter_measures_invoked;
-+    pStats->tkip_replays        += pTarget->txrxStats.tkipCcmpStats.tkip_replays;
-+    pStats->tkip_format_errors  += pTarget->txrxStats.tkipCcmpStats.tkip_format_errors;
-+    pStats->ccmp_format_errors  += pTarget->txrxStats.tkipCcmpStats.ccmp_format_errors;
-+    pStats->ccmp_replays        += pTarget->txrxStats.tkipCcmpStats.ccmp_replays;
-+
-+
-+    pStats->power_save_failure_cnt += pTarget->pmStats.power_save_failure_cnt;
-+    pStats->noise_floor_calibation = pTarget->noise_floor_calibation;
-+
-+    pStats->cs_bmiss_cnt        += pTarget->cservStats.cs_bmiss_cnt;
-+    pStats->cs_lowRssi_cnt      += pTarget->cservStats.cs_lowRssi_cnt;
-+    pStats->cs_connect_cnt      += pTarget->cservStats.cs_connect_cnt;
-+    pStats->cs_disconnect_cnt   += pTarget->cservStats.cs_disconnect_cnt;
-+    pStats->cs_aveBeacon_snr    = pTarget->cservStats.cs_aveBeacon_snr;
-+    pStats->cs_aveBeacon_rssi   = pTarget->cservStats.cs_aveBeacon_rssi;
-+    pStats->cs_lastRoam_msec    = pTarget->cservStats.cs_lastRoam_msec;
-+    pStats->cs_snr              = pTarget->cservStats.cs_snr;
-+    pStats->cs_rssi             = pTarget->cservStats.cs_rssi;
-+
-+    pStats->lq_val              = pTarget->lqVal;
-+
-+    pStats->wow_num_pkts_dropped += pTarget->wowStats.wow_num_pkts_dropped;
-+    pStats->wow_num_host_pkt_wakeups += pTarget->wowStats.wow_num_host_pkt_wakeups;
-+    pStats->wow_num_host_event_wakeups += pTarget->wowStats.wow_num_host_event_wakeups;
-+    pStats->wow_num_events_discarded += pTarget->wowStats.wow_num_events_discarded;
-+
-+    ar->statsUpdatePending = FALSE;
-+    wake_up(&arEvent);
-+}
-+
-+void
-+ar6000_rssiThreshold_event(AR_SOFTC_T *ar,  WMI_RSSI_THRESHOLD_VAL newThreshold, A_INT16 rssi)
-+{
-+    USER_RSSI_THOLD userRssiThold;
-+
-+    userRssiThold.tag = rssi_map[newThreshold].tag;
-+    userRssiThold.rssi = rssi;
-+    AR_DEBUG2_PRINTF("rssi Threshold range = %d tag = %d  rssi = %d\n", newThreshold, userRssiThold.tag, rssi);
-+    ar6000_send_event_to_app(ar, WMI_RSSI_THRESHOLD_EVENTID,(A_UINT8 *)&userRssiThold, sizeof(USER_RSSI_THOLD));
-+}
-+
-+
-+void
-+ar6000_hbChallengeResp_event(AR_SOFTC_T *ar, A_UINT32 cookie, A_UINT32 source)
-+{
-+    if (source == APP_HB_CHALLENGE) {
-+        /* Report it to the app in case it wants a positive acknowledgement */
-+        ar6000_send_event_to_app(ar, WMIX_HB_CHALLENGE_RESP_EVENTID,
-+                                 (A_UINT8 *)&cookie, sizeof(cookie));
-+    } else {
-+        /* This would ignore the replys that come in after their due time */
-+        if (cookie == ar->arHBChallengeResp.seqNum) {
-+            ar->arHBChallengeResp.outstanding = FALSE;
-+        }
-+    }
-+}
-+
-+
-+void
-+ar6000_reportError_event(AR_SOFTC_T *ar, WMI_TARGET_ERROR_VAL errorVal)
-+{
-+    char    *errString[] = {
-+                [WMI_TARGET_PM_ERR_FAIL]    "WMI_TARGET_PM_ERR_FAIL",
-+                [WMI_TARGET_KEY_NOT_FOUND]  "WMI_TARGET_KEY_NOT_FOUND",
-+                [WMI_TARGET_DECRYPTION_ERR] "WMI_TARGET_DECRYPTION_ERR",
-+                [WMI_TARGET_BMISS]          "WMI_TARGET_BMISS",
-+                [WMI_PSDISABLE_NODE_JOIN]   "WMI_PSDISABLE_NODE_JOIN"
-+                };
-+
-+    A_PRINTF("AR6000 Error on Target. Error = 0x%x\n", errorVal);
-+
-+    /* One error is reported at a time, and errorval is a bitmask */
-+    if(errorVal & (errorVal - 1))
-+       return;
-+
-+    A_PRINTF("AR6000 Error type = ");
-+    switch(errorVal)
-+    {
-+        case WMI_TARGET_PM_ERR_FAIL:
-+        case WMI_TARGET_KEY_NOT_FOUND:
-+        case WMI_TARGET_DECRYPTION_ERR:
-+        case WMI_TARGET_BMISS:
-+        case WMI_PSDISABLE_NODE_JOIN:
-+            A_PRINTF("%s\n", errString[errorVal]);
-+            break;
-+        default:
-+            A_PRINTF("INVALID\n");
-+            break;
-+    }
-+
-+}
-+
-+
-+void
-+ar6000_cac_event(AR_SOFTC_T *ar, A_UINT8 ac, A_UINT8 cacIndication,
-+                 A_UINT8 statusCode, A_UINT8 *tspecSuggestion)
-+{
-+    WMM_TSPEC_IE    *tspecIe;
-+
-+    /*
-+     * This is the TSPEC IE suggestion from AP.
-+     * Suggestion provided by AP under some error
-+     * cases, could be helpful for the host app.
-+     * Check documentation.
-+     */
-+    tspecIe = (WMM_TSPEC_IE *)tspecSuggestion;
-+
-+    /*
-+     * What do we do, if we get TSPEC rejection? One thought
-+     * that comes to mind is implictly delete the pstream...
-+     */
-+    A_PRINTF("AR6000 CAC notification. "
-+                "AC = %d, cacIndication = 0x%x, statusCode = 0x%x\n",
-+                 ac, cacIndication, statusCode);
-+}
-+
-+#define AR6000_PRINT_BSSID(_pBss)  do {     \
-+        A_PRINTF("%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x ",\
-+                 (_pBss)[0],(_pBss)[1],(_pBss)[2],(_pBss)[3],\
-+                 (_pBss)[4],(_pBss)[5]);  \
-+} while(0)
-+
-+void
-+ar6000_roam_tbl_event(AR_SOFTC_T *ar, WMI_TARGET_ROAM_TBL *pTbl)
-+{
-+    A_UINT8 i;
-+
-+    A_PRINTF("ROAM TABLE NO OF ENTRIES is %d ROAM MODE is %d\n",
-+              pTbl->numEntries, pTbl->roamMode);
-+    for (i= 0; i < pTbl->numEntries; i++) {
-+        A_PRINTF("[%d]bssid %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x ", i,
-+            pTbl->bssRoamInfo[i].bssid[0], pTbl->bssRoamInfo[i].bssid[1],
-+            pTbl->bssRoamInfo[i].bssid[2],
-+            pTbl->bssRoamInfo[i].bssid[3],
-+            pTbl->bssRoamInfo[i].bssid[4],
-+            pTbl->bssRoamInfo[i].bssid[5]);
-+        A_PRINTF("RSSI %d RSSIDT %d LAST RSSI %d UTIL %d ROAM_UTIL %d"
-+                 " BIAS %d\n",
-+            pTbl->bssRoamInfo[i].rssi,
-+            pTbl->bssRoamInfo[i].rssidt,
-+            pTbl->bssRoamInfo[i].last_rssi,
-+            pTbl->bssRoamInfo[i].util,
-+            pTbl->bssRoamInfo[i].roam_util,
-+            pTbl->bssRoamInfo[i].bias);
-+    }
-+}
-+
-+void
-+ar6000_wow_list_event(struct ar6_softc *ar, A_UINT8 num_filters, WMI_GET_WOW_LIST_REPLY *wow_reply)
-+{
-+    A_UINT8 i,j;
-+
-+    /*Each event now contains exactly one filter, see bug 26613*/
-+    A_PRINTF("WOW pattern %d of %d patterns\n", wow_reply->this_filter_num,                 wow_reply->num_filters);
-+    A_PRINTF("wow mode = %s host mode = %s\n",
-+            (wow_reply->wow_mode == 0? "disabled":"enabled"),
-+            (wow_reply->host_mode == 1 ? "awake":"asleep"));
-+
-+
-+    /*If there are no patterns, the reply will only contain generic
-+      WoW information. Pattern information will exist only if there are
-+      patterns present. Bug 26716*/
-+
-+   /* If this event contains pattern information, display it*/
-+    if (wow_reply->this_filter_num) {
-+        i=0;
-+        A_PRINTF("id=%d size=%d offset=%d\n",
-+                    wow_reply->wow_filters[i].wow_filter_id,
-+                    wow_reply->wow_filters[i].wow_filter_size,
-+                    wow_reply->wow_filters[i].wow_filter_offset);
-+       A_PRINTF("wow pattern = ");
-+       for (j=0; j< wow_reply->wow_filters[i].wow_filter_size; j++) {
-+             A_PRINTF("%2.2x",wow_reply->wow_filters[i].wow_filter_pattern[j]);
-+        }
-+
-+        A_PRINTF("\nwow mask = ");
-+        for (j=0; j< wow_reply->wow_filters[i].wow_filter_size; j++) {
-+            A_PRINTF("%2.2x",wow_reply->wow_filters[i].wow_filter_mask[j]);
-+        }
-+        A_PRINTF("\n");
-+    }
-+}
-+
-+/*
-+ * Report the Roaming related data collected on the target
-+ */
-+void
-+ar6000_display_roam_time(WMI_TARGET_ROAM_TIME *p)
-+{
-+    A_PRINTF("Disconnect Data : BSSID: ");
-+    AR6000_PRINT_BSSID(p->disassoc_bssid);
-+    A_PRINTF(" RSSI %d DISASSOC Time %d NO_TXRX_TIME %d\n",
-+             p->disassoc_bss_rssi,p->disassoc_time,
-+             p->no_txrx_time);
-+    A_PRINTF("Connect Data: BSSID: ");
-+    AR6000_PRINT_BSSID(p->assoc_bssid);
-+    A_PRINTF(" RSSI %d ASSOC Time %d TXRX_TIME %d\n",
-+             p->assoc_bss_rssi,p->assoc_time,
-+             p->allow_txrx_time);
-+    A_PRINTF("Last Data Tx Time (b4 Disassoc) %d "\
-+             "First Data Tx Time (after Assoc) %d\n",
-+             p->last_data_txrx_time, p->first_data_txrx_time);
-+}
-+
-+void
-+ar6000_roam_data_event(AR_SOFTC_T *ar, WMI_TARGET_ROAM_DATA *p)
-+{
-+    switch (p->roamDataType) {
-+        case ROAM_DATA_TIME:
-+            ar6000_display_roam_time(&p->u.roamTime);
-+            break;
-+        default:
-+            break;
-+    }
-+}
-+
-+void
-+ar6000_bssInfo_event_rx(AR_SOFTC_T *ar, A_UINT8 *datap, int len)
-+{
-+    struct sk_buff *skb;
-+    WMI_BSS_INFO_HDR *bih = (WMI_BSS_INFO_HDR *)datap;
-+
-+
-+    if (!ar->arMgmtFilter) {
-+        return;
-+    }
-+    if (((ar->arMgmtFilter & IEEE80211_FILTER_TYPE_BEACON) &&
-+        (bih->frameType != BEACON_FTYPE))  ||
-+        ((ar->arMgmtFilter & IEEE80211_FILTER_TYPE_PROBE_RESP) &&
-+        (bih->frameType != PROBERESP_FTYPE)))
-+    {
-+        return;
-+    }
-+
-+    if ((skb = A_NETBUF_ALLOC_RAW(len)) != NULL) {
-+
-+        A_NETBUF_PUT(skb, len);
-+        A_MEMCPY(A_NETBUF_DATA(skb), datap, len);
-+        skb->dev = ar->arNetDev;
-+      printk("MAC RAW...\n");
-+//        skb->mac.raw = A_NETBUF_DATA(skb);
-+        skb->ip_summed = CHECKSUM_NONE;
-+        skb->pkt_type = PACKET_OTHERHOST;
-+        skb->protocol = __constant_htons(0x0019);
-+        netif_rx(skb);
-+    }
-+}
-+
-+A_UINT32 wmiSendCmdNum;
-+
-+A_STATUS
-+ar6000_control_tx(void *devt, void *osbuf, WMI_PRI_STREAM_ID streamID)
-+{
-+    AR_SOFTC_T       *ar = (AR_SOFTC_T *)devt;
-+    A_STATUS         status = A_OK;
-+    struct ar_cookie *cookie = NULL;
-+    int i;
-+
-+        /* take lock to protect ar6000_alloc_cookie() */
-+    AR6000_SPIN_LOCK(&ar->arLock, 0);
-+
-+    do {
-+
-+        AR_DEBUG2_PRINTF("ar_contrstatus = ol_tx: skb=0x%x, len=0x%x, sid=%d\n",
-+                         (A_UINT32)osbuf, A_NETBUF_LEN(osbuf), streamID);
-+
-+        if ((streamID == WMI_CONTROL_PRI) && (ar->arWMIControlEpFull)) {
-+                /* control endpoint is full, don't allocate resources, we
-+                 * are just going to drop this packet */
-+            cookie = NULL;
-+            AR_DEBUG_PRINTF(" WMI Control EP full, dropping packet : 0x%X, len:%d \n",
-+                    (A_UINT32)osbuf, A_NETBUF_LEN(osbuf));
-+        } else {
-+            cookie = ar6000_alloc_cookie(ar);
-+        }
-+
-+        if (cookie == NULL) {
-+            status = A_NO_MEMORY;
-+            break;
-+        }
-+
-+        if(logWmiRawMsgs) {
-+            A_PRINTF("WMI cmd send, msgNo %d :", wmiSendCmdNum);
-+            for(i = 0; i < a_netbuf_to_len(osbuf); i++)
-+                A_PRINTF("%x ", ((A_UINT8 *)a_netbuf_to_data(osbuf))[i]);
-+            A_PRINTF("\n");
-+        }
-+
-+        wmiSendCmdNum++;
-+
-+    } while (FALSE);
-+
-+    if (cookie != NULL) {
-+            /* got a structure to send it out on */
-+        ar->arTxPending[streamID]++;
-+
-+        if (streamID != WMI_CONTROL_PRI) {
-+            ar->arTotalTxDataPending++;
-+        }
-+    }
-+
-+    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+
-+    if (cookie != NULL) {
-+        cookie->arc_bp[0] = (A_UINT32)osbuf;
-+        cookie->arc_bp[1] = 0;
-+        SET_HTC_PACKET_INFO_TX(&cookie->HtcPkt,
-+                               cookie,
-+                               A_NETBUF_DATA(osbuf),
-+                               A_NETBUF_LEN(osbuf),
-+                               arWMIStream2EndpointID(ar,streamID),
-+                               AR6K_CONTROL_PKT_TAG);
-+            /* this interface is asynchronous, if there is an error, cleanup will happen in the
-+             * TX completion callback */
-+        HTCSendPkt(ar->arHtcTarget, &cookie->HtcPkt);
-+        status = A_OK;
-+    }
-+
-+    return status;
-+}
-+
-+/* indicate tx activity or inactivity on a WMI stream */
-+void ar6000_indicate_tx_activity(void *devt, A_UINT8 TrafficClass, A_BOOL Active)
-+{
-+    AR_SOFTC_T  *ar = (AR_SOFTC_T *)devt;
-+    WMI_PRI_STREAM_ID streamid;
-+
-+    if (ar->arWmiEnabled) {
-+        streamid = wmi_get_stream_id(ar->arWmi, TrafficClass);
-+    } else {
-+            /* for mbox ping testing, the traffic class is mapped directly as a stream ID,
-+             * see handling of AR6000_XIOCTL_TRAFFIC_ACTIVITY_CHANGE in ioctl.c */
-+        streamid = (WMI_PRI_STREAM_ID)TrafficClass;
-+    }
-+
-+        /* notify HTC, this may cause credit distribution changes */
-+
-+    HTCIndicateActivityChange(ar->arHtcTarget,
-+                              arWMIStream2EndpointID(ar,streamid),
-+                              Active);
-+
-+}
-+
-+module_init(ar6000_init_module);
-+module_exit(ar6000_cleanup_module);
-+
-+/* Init cookie queue */
-+static void
-+ar6000_cookie_init(AR_SOFTC_T *ar)
-+{
-+    A_UINT32    i;
-+
-+    ar->arCookieList = NULL;
-+    A_MEMZERO(s_ar_cookie_mem, sizeof(s_ar_cookie_mem));
-+
-+    for (i = 0; i < MAX_COOKIE_NUM; i++) {
-+        ar6000_free_cookie(ar, &s_ar_cookie_mem[i]);
-+    }
-+}
-+
-+/* cleanup cookie queue */
-+static void
-+ar6000_cookie_cleanup(AR_SOFTC_T *ar)
-+{
-+    /* It is gone .... */
-+    ar->arCookieList = NULL;
-+}
-+
-+/* Init cookie queue */
-+static void
-+ar6000_free_cookie(AR_SOFTC_T *ar, struct ar_cookie * cookie)
-+{
-+    /* Insert first */
-+    A_ASSERT(ar != NULL);
-+    A_ASSERT(cookie != NULL);
-+    cookie->arc_list_next = ar->arCookieList;
-+    ar->arCookieList = cookie;
-+}
-+
-+/* cleanup cookie queue */
-+static struct ar_cookie *
-+ar6000_alloc_cookie(AR_SOFTC_T  *ar)
-+{
-+    struct ar_cookie   *cookie;
-+
-+    cookie = ar->arCookieList;
-+    if(cookie != NULL)
-+    {
-+        ar->arCookieList = cookie->arc_list_next;
-+    }
-+
-+    return cookie;
-+}
-+
-+#ifdef SEND_EVENT_TO_APP
-+/*
-+ * This function is used to send event which come from taget to
-+ * the application. The buf which send to application is include
-+ * the event ID and event content.
-+ */
-+#define EVENT_ID_LEN   2
-+void ar6000_send_event_to_app(AR_SOFTC_T *ar, A_UINT16 eventId,
-+                              A_UINT8 *datap, int len)
-+{
-+
-+#if (WIRELESS_EXT >= 15)
-+
-+/* note: IWEVCUSTOM only exists in wireless extensions after version 15 */
-+
-+    char *buf;
-+    A_UINT16 size;
-+    union iwreq_data wrqu;
-+
-+    size = len + EVENT_ID_LEN;
-+
-+    if (size > IW_CUSTOM_MAX) {
-+        AR_DEBUG_PRINTF("WMI event ID : 0x%4.4X, len = %d too big for IWEVCUSTOM (max=%d) \n",
-+                eventId, size, IW_CUSTOM_MAX);
-+        return;
-+    }
-+
-+    buf = A_MALLOC_NOWAIT(size);
-+    A_MEMZERO(buf, size);
-+    A_MEMCPY(buf, &eventId, EVENT_ID_LEN);
-+    A_MEMCPY(buf+EVENT_ID_LEN, datap, len);
-+
-+    //AR_DEBUG_PRINTF("event ID = %d,len = %d\n",*(A_UINT16*)buf, size);
-+    A_MEMZERO(&wrqu, sizeof(wrqu));
-+    wrqu.data.length = size;
-+    wireless_send_event(ar->arNetDev, IWEVCUSTOM, &wrqu, buf);
-+
-+    A_FREE(buf);
-+#endif
-+
-+
-+}
-+#endif
-+
-+
-+void
-+ar6000_tx_retry_err_event(void *devt)
-+{
-+    AR_DEBUG2_PRINTF("Tx retries reach maximum!\n");
-+}
-+
-+void
-+ar6000_snrThresholdEvent_rx(void *devt, WMI_SNR_THRESHOLD_VAL newThreshold, A_UINT8 snr)
-+{
-+    AR_DEBUG2_PRINTF("snr threshold range %d, snr %d\n", newThreshold, snr);
-+}
-+
-+void
-+ar6000_lqThresholdEvent_rx(void *devt, WMI_LQ_THRESHOLD_VAL newThreshold, A_UINT8 lq)
-+{
-+    AR_DEBUG2_PRINTF("lq threshold range %d, lq %d\n", newThreshold, lq);
-+}
-+
-+
-+
-+A_UINT32
-+a_copy_to_user(void *to, const void *from, A_UINT32 n)
-+{
-+    return(copy_to_user(to, from, n));
-+}
-+
-+A_UINT32
-+a_copy_from_user(void *to, const void *from, A_UINT32 n)
-+{
-+    return(copy_from_user(to, from, n));
-+}
-+
-+
-+A_STATUS
-+ar6000_get_driver_cfg(struct net_device *dev,
-+                        A_UINT16 cfgParam,
-+                        void *result)
-+{
-+
-+    A_STATUS    ret = 0;
-+
-+    switch(cfgParam)
-+    {
-+        case AR6000_DRIVER_CFG_GET_WLANNODECACHING:
-+           *((A_UINT32 *)result) = wlanNodeCaching;
-+           break;
-+        case AR6000_DRIVER_CFG_LOG_RAW_WMI_MSGS:
-+           *((A_UINT32 *)result) = logWmiRawMsgs;
-+            break;
-+        default:
-+           ret = EINVAL;
-+           break;
-+    }
-+
-+    return ret;
-+}
-+
-+void
-+ar6000_keepalive_rx(void *devt, A_UINT8 configured)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
-+
-+    ar->arKeepaliveConfigured = configured;
-+    wake_up(&arEvent);
-+}
-+
-+void
-+ar6000_pmkid_list_event(void *devt, A_UINT8 numPMKID, WMI_PMKID *pmkidList)
-+{
-+    A_UINT8 i, j;
-+
-+    A_PRINTF("Number of Cached PMKIDs is %d\n", numPMKID);
-+
-+    for (i = 0; i < numPMKID; i++) {
-+        A_PRINTF("\nPMKID %d ", i);
-+            for (j = 0; j < WMI_PMKID_LEN; j++) {
-+                A_PRINTF("%2.2x", pmkidList->pmkid[j]);
-+            }
-+        pmkidList++;
-+    }
-+}
-+
-+#ifdef USER_KEYS
-+static A_STATUS
-+
-+ar6000_reinstall_keys(AR_SOFTC_T *ar, A_UINT8 key_op_ctrl)
-+{
-+    A_STATUS status = A_OK;
-+    struct ieee80211req_key *uik = &ar->user_saved_keys.ucast_ik;
-+    struct ieee80211req_key *bik = &ar->user_saved_keys.bcast_ik;
-+    CRYPTO_TYPE  keyType = ar->user_saved_keys.keyType;
-+
-+    if (IEEE80211_CIPHER_CCKM_KRK != uik->ik_type) {
-+        if (NONE_CRYPT == keyType) {
-+            goto _reinstall_keys_out;
-+        }
-+
-+        if (uik->ik_keylen) {
-+            status = wmi_addKey_cmd(ar->arWmi, uik->ik_keyix,
-+                    ar->user_saved_keys.keyType, PAIRWISE_USAGE,
-+                    uik->ik_keylen, (A_UINT8 *)&uik->ik_keyrsc,
-+                    uik->ik_keydata, key_op_ctrl, SYNC_BEFORE_WMIFLAG);
-+        }
-+
-+    } else {
-+        status = wmi_add_krk_cmd(ar->arWmi, uik->ik_keydata);
-+    }
-+
-+    if (IEEE80211_CIPHER_CCKM_KRK != bik->ik_type) {
-+        if (NONE_CRYPT == keyType) {
-+            goto _reinstall_keys_out;
-+        }
-+
-+        if (bik->ik_keylen) {
-+            status = wmi_addKey_cmd(ar->arWmi, bik->ik_keyix,
-+                    ar->user_saved_keys.keyType, GROUP_USAGE,
-+                    bik->ik_keylen, (A_UINT8 *)&bik->ik_keyrsc,
-+                    bik->ik_keydata, key_op_ctrl, NO_SYNC_WMIFLAG);
-+        }
-+    } else {
-+        status = wmi_add_krk_cmd(ar->arWmi, bik->ik_keydata);
-+    }
-+
-+_reinstall_keys_out:
-+    ar->user_savedkeys_stat = USER_SAVEDKEYS_STAT_INIT;
-+    ar->user_key_ctrl      = 0;
-+
-+    return status;
-+}
-+#endif /* USER_KEYS */
-+
-+
-+void
-+ar6000_dset_open_req(
-+    void *context,
-+    A_UINT32 id,
-+    A_UINT32 targHandle,
-+    A_UINT32 targReplyFn,
-+    A_UINT32 targReplyArg)
-+{
-+}
-+
-+void
-+ar6000_dset_close(
-+    void *context,
-+    A_UINT32 access_cookie)
-+{
-+    return;
-+}
-+
-+void
-+ar6000_dset_data_req(
-+   void *context,
-+   A_UINT32 accessCookie,
-+   A_UINT32 offset,
-+   A_UINT32 length,
-+   A_UINT32 targBuf,
-+   A_UINT32 targReplyFn,
-+   A_UINT32 targReplyArg)
-+{
-+}
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h
-new file mode 100644
-index 0000000..c7b6ec4
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h
-@@ -0,0 +1,360 @@
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef _AR6000_H_
-+#define _AR6000_H_
-+
-+#include <linux/version.h>
-+
-+
-+#include <linux/autoconf.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/spinlock.h>
-+#include <linux/skbuff.h>
-+#include <linux/if_ether.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <net/iw_handler.h>
-+#include <linux/if_arp.h>
-+#include <linux/ip.h>
-+#include <asm/semaphore.h>
-+#include <linux/wireless.h>
-+#include <linux/module.h>
-+#include <asm/io.h>
-+
-+#include <a_config.h>
-+#include <athdefs.h>
-+#include "a_types.h"
-+#include "a_osapi.h"
-+#include "htc_api.h"
-+#include "wmi.h"
-+#include "a_drv.h"
-+#include "bmi.h"
-+#include <ieee80211.h>
-+#include <ieee80211_ioctl.h>
-+#include <wlan_api.h>
-+#include <wmi_api.h>
-+#include "gpio_api.h"
-+#include "gpio.h"
-+#include <host_version.h>
-+#include <linux/rtnetlink.h>
-+#include <linux/init.h>
-+#include <linux/moduleparam.h>
-+#include "AR6Khwreg.h"
-+#include "ar6000_api.h"
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+#include <testcmd.h>
-+#endif
-+
-+#include "targaddrs.h"
-+#include "dbglog_api.h"
-+#include "ar6000_diag.h"
-+#include "common_drv.h"
-+
-+#ifndef  __dev_put
-+#define  __dev_put(dev) dev_put(dev)
-+#endif
-+
-+#ifdef USER_KEYS
-+
-+#define USER_SAVEDKEYS_STAT_INIT     0
-+#define USER_SAVEDKEYS_STAT_RUN      1
-+
-+// TODO this needs to move into the AR_SOFTC struct
-+struct USER_SAVEDKEYS {
-+    struct ieee80211req_key   ucast_ik;
-+    struct ieee80211req_key   bcast_ik;
-+    CRYPTO_TYPE               keyType;
-+    A_BOOL                    keyOk;
-+};
-+#endif
-+
-+#define DBG_INFO              0x00000001
-+#define DBG_ERROR             0x00000002
-+#define DBG_WARNING           0x00000004
-+#define DBG_SDIO              0x00000008
-+#define DBG_HIF                       0x00000010
-+#define DBG_HTC                       0x00000020
-+#define DBG_WMI                       0x00000040
-+#define DBG_WMI2              0x00000080
-+#define DBG_DRIVER            0x00000100
-+
-+#define DBG_DEFAULTS  (DBG_ERROR|DBG_WARNING)
-+
-+
-+#ifdef DEBUG
-+#define AR_DEBUG_PRINTF(args...)        if (debugdriver) A_PRINTF(args);
-+#define AR_DEBUG2_PRINTF(args...)        if (debugdriver >= 2) A_PRINTF(args);
-+extern int debugdriver;
-+#else
-+#define AR_DEBUG_PRINTF(args...)
-+#define AR_DEBUG2_PRINTF(args...)
-+#endif
-+
-+A_STATUS ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
-+A_STATUS ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#define       MAX_AR6000                        1
-+#define AR6000_MAX_RX_BUFFERS             16
-+#define AR6000_BUFFER_SIZE                1664
-+#define AR6000_TX_TIMEOUT                 10
-+#define       AR6000_ETH_ADDR_LEN               6
-+#define       AR6000_MAX_ENDPOINTS              4
-+#define MAX_NODE_NUM                      15
-+#define MAX_COOKIE_NUM                    150
-+#define AR6000_HB_CHALLENGE_RESP_FREQ_DEFAULT        1
-+#define AR6000_HB_CHALLENGE_RESP_MISS_THRES_DEFAULT  1
-+
-+enum {
-+    DRV_HB_CHALLENGE = 0,
-+    APP_HB_CHALLENGE
-+};
-+
-+/* HTC RAW streams */
-+typedef enum _HTC_RAW_STREAM_ID {
-+    HTC_RAW_STREAM_NOT_MAPPED = -1,
-+    HTC_RAW_STREAM_0 = 0,
-+    HTC_RAW_STREAM_1 = 1,
-+    HTC_RAW_STREAM_2 = 2,
-+    HTC_RAW_STREAM_3 = 3,
-+    HTC_RAW_STREAM_NUM_MAX
-+} HTC_RAW_STREAM_ID;
-+
-+#define RAW_HTC_READ_BUFFERS_NUM    4
-+#define RAW_HTC_WRITE_BUFFERS_NUM   4
-+
-+typedef struct {
-+    int currPtr;
-+    int length;
-+    unsigned char data[AR6000_BUFFER_SIZE];
-+    HTC_PACKET    HTCPacket;
-+} raw_htc_buffer;
-+
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+/*
-+ *  add TCMD_MODE besides wmi and bypasswmi
-+ *  in TCMD_MODE, only few TCMD releated wmi commands
-+ *  counld be hanlder
-+ */
-+enum {
-+    AR6000_WMI_MODE = 0,
-+    AR6000_BYPASS_MODE,
-+    AR6000_TCMD_MODE,
-+    AR6000_WLAN_MODE
-+};
-+#endif /* CONFIG_HOST_TCMD_SUPPORT */
-+
-+struct ar_wep_key {
-+    A_UINT8                 arKeyIndex;
-+    A_UINT8                 arKeyLen;
-+    A_UINT8                 arKey[64];
-+} ;
-+
-+struct ar_node_mapping {
-+    A_UINT8                 macAddress[6];
-+    A_UINT8                 epId;
-+    A_UINT8                 txPending;
-+};
-+
-+struct ar_cookie {
-+    A_UINT32               arc_bp[2];    /* Must be first field */
-+    HTC_PACKET             HtcPkt;       /* HTC packet wrapper */
-+    struct ar_cookie *arc_list_next;
-+};
-+
-+struct ar_hb_chlng_resp {
-+    A_TIMER                 timer;
-+    A_UINT32                frequency;
-+    A_UINT32                seqNum;
-+    A_BOOL                  outstanding;
-+    A_UINT8                 missCnt;
-+    A_UINT8                 missThres;
-+};
-+
-+typedef struct ar6_softc {
-+    struct net_device       *arNetDev;    /* net_device pointer */
-+    void                    *arWmi;
-+    int                     arTxPending[WMI_PRI_MAX_COUNT];
-+    int                     arTotalTxDataPending;
-+    A_UINT8                 arNumDataEndPts;
-+    A_BOOL                  arWmiEnabled;
-+    A_BOOL                  arWmiReady;
-+    A_BOOL                  arConnected;
-+    HTC_HANDLE              arHtcTarget;
-+    void                    *arHifDevice;
-+    spinlock_t              arLock;
-+    struct semaphore        arSem;
-+    int                     arRxBuffers[WMI_PRI_MAX_COUNT];
-+    int                     arSsidLen;
-+    u_char                  arSsid[32];
-+    A_UINT8                 arNetworkType;
-+    A_UINT8                 arDot11AuthMode;
-+    A_UINT8                 arAuthMode;
-+    A_UINT8                 arPairwiseCrypto;
-+    A_UINT8                 arPairwiseCryptoLen;
-+    A_UINT8                 arGroupCrypto;
-+    A_UINT8                 arGroupCryptoLen;
-+    A_UINT8                 arDefTxKeyIndex;
-+    struct ar_wep_key       arWepKeyList[WMI_MAX_KEY_INDEX + 1];
-+    A_UINT8                 arBssid[6];
-+    A_UINT8                 arReqBssid[6];
-+    A_UINT16                arChannelHint;
-+    A_UINT16                arBssChannel;
-+    A_UINT16                arListenInterval;
-+    struct ar6000_version   arVersion;
-+    A_UINT32                arTargetType;
-+    A_INT8                  arRssi;
-+    A_UINT8                 arTxPwr;
-+    A_BOOL                  arTxPwrSet;
-+    A_INT32                 arBitRate;
-+    struct net_device_stats arNetStats;
-+    struct iw_statistics      arIwStats;
-+    A_INT8                  arNumChannels;
-+    A_UINT16                arChannelList[32];
-+    A_UINT32                arRegCode;
-+    A_BOOL                  statsUpdatePending;
-+    TARGET_STATS            arTargetStats;
-+    A_INT8                  arMaxRetries;
-+    A_UINT8                 arPhyCapability;
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+    A_UINT8                 tcmdRxReport;
-+    A_UINT32                tcmdRxTotalPkt;
-+    A_INT32                 tcmdRxRssi;
-+    A_UINT32                tcmdPm;
-+   A_UINT32                 arTargetMode;
-+#endif
-+    AR6000_WLAN_STATE       arWlanState;
-+    struct ar_node_mapping  arNodeMap[MAX_NODE_NUM];
-+    A_UINT8                 arIbssPsEnable;
-+    A_UINT8                 arNodeNum;
-+    A_UINT8                 arNexEpId;
-+    struct ar_cookie        *arCookieList;
-+    A_UINT16                arRateMask;
-+    A_UINT8                 arSkipScan;
-+    A_UINT16                arBeaconInterval;
-+    A_BOOL                  arConnectPending;
-+    A_BOOL                  arWmmEnabled;
-+    struct ar_hb_chlng_resp arHBChallengeResp;
-+    A_UINT8                 arKeepaliveConfigured;
-+    A_UINT32                arMgmtFilter;
-+    HTC_ENDPOINT_ID         arWmi2EpMapping[WMI_PRI_MAX_COUNT];
-+    WMI_PRI_STREAM_ID       arEp2WmiMapping[ENDPOINT_MAX];
-+#ifdef HTC_RAW_INTERFACE
-+    HTC_ENDPOINT_ID         arRaw2EpMapping[HTC_RAW_STREAM_NUM_MAX];
-+    HTC_RAW_STREAM_ID       arEp2RawMapping[ENDPOINT_MAX];
-+    struct semaphore        raw_htc_read_sem[HTC_RAW_STREAM_NUM_MAX];
-+    struct semaphore        raw_htc_write_sem[HTC_RAW_STREAM_NUM_MAX];
-+    wait_queue_head_t       raw_htc_read_queue[HTC_RAW_STREAM_NUM_MAX];
-+    wait_queue_head_t       raw_htc_write_queue[HTC_RAW_STREAM_NUM_MAX];
-+    raw_htc_buffer          raw_htc_read_buffer[HTC_RAW_STREAM_NUM_MAX][RAW_HTC_READ_BUFFERS_NUM];
-+    raw_htc_buffer          raw_htc_write_buffer[HTC_RAW_STREAM_NUM_MAX][RAW_HTC_WRITE_BUFFERS_NUM];
-+    A_BOOL                  write_buffer_available[HTC_RAW_STREAM_NUM_MAX];
-+    A_BOOL                  read_buffer_available[HTC_RAW_STREAM_NUM_MAX];
-+#endif
-+    A_BOOL                  arNetQueueStopped;
-+    A_BOOL                  arRawIfInit;
-+    int                     arDeviceIndex;
-+    COMMON_CREDIT_STATE_INFO arCreditStateInfo;
-+    A_BOOL                  arWMIControlEpFull;
-+    A_BOOL                  dbgLogFetchInProgress;
-+    A_UCHAR                 log_buffer[DBGLOG_HOST_LOG_BUFFER_SIZE];
-+    A_UINT32                log_cnt;
-+    A_UINT32                dbglog_init_done;
-+    A_UINT32                arConnectCtrlFlags;
-+      A_UINT32                scan_complete;
-+#ifdef USER_KEYS
-+    A_INT32                 user_savedkeys_stat;
-+    A_UINT32                user_key_ctrl;
-+    struct USER_SAVEDKEYS   user_saved_keys;
-+#endif
-+} AR_SOFTC_T;
-+
-+
-+#define arWMIStream2EndpointID(ar,wmi)          (ar)->arWmi2EpMapping[(wmi)]
-+#define arSetWMIStream2EndpointIDMap(ar,wmi,ep)  \
-+{  (ar)->arWmi2EpMapping[(wmi)] = (ep); \
-+   (ar)->arEp2WmiMapping[(ep)] = (wmi); }
-+#define arEndpoint2WMIStreamID(ar,ep)           (ar)->arEp2WmiMapping[(ep)]
-+
-+#define arRawIfEnabled(ar) (ar)->arRawIfInit
-+#define arRawStream2EndpointID(ar,raw)          (ar)->arRaw2EpMapping[(raw)]
-+#define arSetRawStream2EndpointIDMap(ar,raw,ep)  \
-+{  (ar)->arRaw2EpMapping[(raw)] = (ep); \
-+   (ar)->arEp2RawMapping[(ep)] = (raw); }
-+#define arEndpoint2RawStreamID(ar,ep)           (ar)->arEp2RawMapping[(ep)]
-+
-+struct ar_giwscan_param {
-+    char    *current_ev;
-+    char    *end_buf;
-+    A_BOOL  firstPass;
-+};
-+
-+#define AR6000_STAT_INC(ar, stat)       (ar->arNetStats.stat++)
-+
-+#define AR6000_SPIN_LOCK(lock, param)   do {                            \
-+    if (irqs_disabled()) {                                              \
-+        AR_DEBUG_PRINTF("IRQs disabled:AR6000_LOCK\n");                 \
-+    }                                                                   \
-+    spin_lock_bh(lock);                                                 \
-+} while (0)
-+
-+#define AR6000_SPIN_UNLOCK(lock, param) do {                            \
-+    if (irqs_disabled()) {                                              \
-+        AR_DEBUG_PRINTF("IRQs disabled: AR6000_UNLOCK\n");              \
-+    }                                                                   \
-+    spin_unlock_bh(lock);                                               \
-+} while (0)
-+
-+int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
-+int ar6000_ioctl_dispatcher(struct net_device *dev, struct ifreq *rq, int cmd);
-+void ar6000_ioctl_iwsetup(struct iw_handler_def *def);
-+void ar6000_gpio_init(void);
-+void ar6000_init_profile_info(AR_SOFTC_T *ar);
-+void ar6000_install_static_wep_keys(AR_SOFTC_T *ar);
-+int ar6000_init(struct net_device *dev);
-+int ar6000_dbglog_get_debug_logs(AR_SOFTC_T *ar);
-+A_STATUS ar6000_SetHTCBlockSize(AR_SOFTC_T *ar);
-+
-+#ifdef HTC_RAW_INTERFACE
-+
-+#ifndef __user
-+#define __user
-+#endif
-+
-+int ar6000_htc_raw_open(AR_SOFTC_T *ar);
-+int ar6000_htc_raw_close(AR_SOFTC_T *ar);
-+ssize_t ar6000_htc_raw_read(AR_SOFTC_T *ar,
-+                            HTC_RAW_STREAM_ID StreamID,
-+                            char __user *buffer, size_t count);
-+ssize_t ar6000_htc_raw_write(AR_SOFTC_T *ar,
-+                             HTC_RAW_STREAM_ID StreamID,
-+                             char __user *buffer, size_t count);
-+
-+#endif /* HTC_RAW_INTERFACE */
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _AR6000_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c
-new file mode 100644
-index 0000000..746cb2b
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c
-@@ -0,0 +1,439 @@
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "ar6000_drv.h"
-+
-+#ifdef HTC_RAW_INTERFACE
-+
-+static void
-+ar6000_htc_raw_read_cb(void *Context, HTC_PACKET *pPacket)
-+{
-+    AR_SOFTC_T        *ar = (AR_SOFTC_T *)Context;
-+    raw_htc_buffer    *busy;
-+    HTC_RAW_STREAM_ID streamID;
-+
-+    busy = (raw_htc_buffer *)pPacket->pPktContext;
-+    A_ASSERT(busy != NULL);
-+
-+    if (pPacket->Status == A_ECANCELED) {
-+        /*
-+         * HTC provides A_ECANCELED status when it doesn't want to be refilled
-+         * (probably due to a shutdown)
-+         */
-+        return;
-+    }
-+
-+    streamID = arEndpoint2RawStreamID(ar,pPacket->Endpoint);
-+    A_ASSERT(streamID != HTC_RAW_STREAM_NOT_MAPPED);
-+
-+#ifdef CF
-+   if (down_trylock(&ar->raw_htc_read_sem[streamID])) {
-+#else
-+    if (down_interruptible(&ar->raw_htc_read_sem[streamID])) {
-+#endif /* CF */
-+        AR_DEBUG2_PRINTF("Unable to down the semaphore\n");
-+    }
-+
-+    A_ASSERT((pPacket->Status != A_OK) ||
-+             (pPacket->pBuffer == (busy->data + HTC_HEADER_LEN)));
-+
-+    busy->length = pPacket->ActualLength + HTC_HEADER_LEN;
-+    busy->currPtr = HTC_HEADER_LEN;
-+    ar->read_buffer_available[streamID] = TRUE;
-+    //AR_DEBUG_PRINTF("raw read cb:  0x%X 0x%X \n", busy->currPtr,busy->length);
-+    up(&ar->raw_htc_read_sem[streamID]);
-+
-+    /* Signal the waiting process */
-+    AR_DEBUG2_PRINTF("Waking up the StreamID(%d) read process\n", streamID);
-+    wake_up_interruptible(&ar->raw_htc_read_queue[streamID]);
-+}
-+
-+static void
-+ar6000_htc_raw_write_cb(void *Context, HTC_PACKET *pPacket)
-+{
-+    AR_SOFTC_T          *ar = (AR_SOFTC_T  *)Context;
-+    raw_htc_buffer      *free;
-+    HTC_RAW_STREAM_ID   streamID;
-+
-+    free = (raw_htc_buffer *)pPacket->pPktContext;
-+    A_ASSERT(free != NULL);
-+
-+    if (pPacket->Status == A_ECANCELED) {
-+        /*
-+         * HTC provides A_ECANCELED status when it doesn't want to be refilled
-+         * (probably due to a shutdown)
-+         */
-+        return;
-+    }
-+
-+    streamID = arEndpoint2RawStreamID(ar,pPacket->Endpoint);
-+    A_ASSERT(streamID != HTC_RAW_STREAM_NOT_MAPPED);
-+
-+#ifdef CF
-+    if (down_trylock(&ar->raw_htc_write_sem[streamID])) {
-+#else
-+    if (down_interruptible(&ar->raw_htc_write_sem[streamID])) {
-+#endif
-+        AR_DEBUG2_PRINTF("Unable to down the semaphore\n");
-+    }
-+
-+    A_ASSERT(pPacket->pBuffer == (free->data + HTC_HEADER_LEN));
-+
-+    free->length = 0;
-+    ar->write_buffer_available[streamID] = TRUE;
-+    up(&ar->raw_htc_write_sem[streamID]);
-+
-+    /* Signal the waiting process */
-+    AR_DEBUG2_PRINTF("Waking up the StreamID(%d) write process\n", streamID);
-+    wake_up_interruptible(&ar->raw_htc_write_queue[streamID]);
-+}
-+
-+/* connect to a service */
-+static A_STATUS ar6000_connect_raw_service(AR_SOFTC_T        *ar,
-+                                           HTC_RAW_STREAM_ID StreamID)
-+{
-+    A_STATUS                 status;
-+    HTC_SERVICE_CONNECT_RESP response;
-+    A_UINT8                  streamNo;
-+    HTC_SERVICE_CONNECT_REQ  connect;
-+
-+    do {
-+
-+        A_MEMZERO(&connect,sizeof(connect));
-+            /* pass the stream ID as meta data to the RAW streams service */
-+        streamNo = (A_UINT8)StreamID;
-+        connect.pMetaData = &streamNo;
-+        connect.MetaDataLength = sizeof(A_UINT8);
-+            /* these fields are the same for all endpoints */
-+        connect.EpCallbacks.pContext = ar;
-+        connect.EpCallbacks.EpTxComplete = ar6000_htc_raw_write_cb;
-+        connect.EpCallbacks.EpRecv = ar6000_htc_raw_read_cb;
-+            /* simple interface, we don't need these optional callbacks */
-+        connect.EpCallbacks.EpRecvRefill = NULL;
-+        connect.EpCallbacks.EpSendFull = NULL;
-+        connect.MaxSendQueueDepth = RAW_HTC_WRITE_BUFFERS_NUM;
-+
-+            /* connect to the raw streams service, we may be able to get 1 or more
-+             * connections, depending on WHAT is running on the target */
-+        connect.ServiceID = HTC_RAW_STREAMS_SVC;
-+
-+        A_MEMZERO(&response,sizeof(response));
-+
-+            /* try to connect to the raw stream, it is okay if this fails with
-+             * status HTC_SERVICE_NO_MORE_EP */
-+        status = HTCConnectService(ar->arHtcTarget,
-+                                   &connect,
-+                                   &response);
-+
-+        if (A_FAILED(status)) {
-+            if (response.ConnectRespCode == HTC_SERVICE_NO_MORE_EP) {
-+                AR_DEBUG_PRINTF("HTC RAW , No more streams allowed \n");
-+                status = A_OK;
-+            }
-+            break;
-+        }
-+
-+            /* set endpoint mapping for the RAW HTC streams */
-+        arSetRawStream2EndpointIDMap(ar,StreamID,response.Endpoint);
-+
-+        AR_DEBUG_PRINTF("HTC RAW : stream ID: %d, endpoint: %d\n",
-+                        StreamID, arRawStream2EndpointID(ar,StreamID));
-+
-+    } while (FALSE);
-+
-+    return status;
-+}
-+
-+int ar6000_htc_raw_open(AR_SOFTC_T *ar)
-+{
-+    A_STATUS status;
-+    int streamID, endPt, count2;
-+    raw_htc_buffer *buffer;
-+    HTC_SERVICE_ID servicepriority;
-+
-+    A_ASSERT(ar->arHtcTarget != NULL);
-+
-+        /* wait for target */
-+    status = HTCWaitTarget(ar->arHtcTarget);
-+
-+    if (A_FAILED(status)) {
-+        AR_DEBUG_PRINTF("HTCWaitTarget failed (%d)\n", status);
-+        return -ENODEV;
-+    }
-+
-+    for (endPt = 0; endPt < ENDPOINT_MAX; endPt++) {
-+        ar->arEp2RawMapping[endPt] = HTC_RAW_STREAM_NOT_MAPPED;
-+    }
-+
-+    for (streamID = HTC_RAW_STREAM_0; streamID < HTC_RAW_STREAM_NUM_MAX; streamID++) {
-+        /* Initialize the data structures */
-+        init_MUTEX(&ar->raw_htc_read_sem[streamID]);
-+        init_MUTEX(&ar->raw_htc_write_sem[streamID]);
-+        init_waitqueue_head(&ar->raw_htc_read_queue[streamID]);
-+        init_waitqueue_head(&ar->raw_htc_write_queue[streamID]);
-+
-+            /* try to connect to the raw service */
-+        status = ar6000_connect_raw_service(ar,streamID);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+        if (arRawStream2EndpointID(ar,streamID) == 0) {
-+            break;
-+        }
-+
-+        for (count2 = 0; count2 < RAW_HTC_READ_BUFFERS_NUM; count2 ++) {
-+            /* Initialize the receive buffers */
-+            buffer = &ar->raw_htc_write_buffer[streamID][count2];
-+            memset(buffer, 0, sizeof(raw_htc_buffer));
-+            buffer = &ar->raw_htc_read_buffer[streamID][count2];
-+            memset(buffer, 0, sizeof(raw_htc_buffer));
-+
-+            SET_HTC_PACKET_INFO_RX_REFILL(&buffer->HTCPacket,
-+                                          buffer,
-+                                          buffer->data,
-+                                          AR6000_BUFFER_SIZE,
-+                                          arRawStream2EndpointID(ar,streamID));
-+
-+            /* Queue buffers to HTC for receive */
-+            if ((status = HTCAddReceivePkt(ar->arHtcTarget, &buffer->HTCPacket)) != A_OK)
-+            {
-+                BMIInit();
-+                return -EIO;
-+            }
-+        }
-+
-+        for (count2 = 0; count2 < RAW_HTC_WRITE_BUFFERS_NUM; count2 ++) {
-+            /* Initialize the receive buffers */
-+            buffer = &ar->raw_htc_write_buffer[streamID][count2];
-+            memset(buffer, 0, sizeof(raw_htc_buffer));
-+        }
-+
-+        ar->read_buffer_available[streamID] = FALSE;
-+        ar->write_buffer_available[streamID] = TRUE;
-+    }
-+
-+    if (A_FAILED(status)) {
-+        return -EIO;
-+    }
-+
-+    AR_DEBUG_PRINTF("HTC RAW, number of streams the target supports: %d \n", streamID);
-+
-+    servicepriority = HTC_RAW_STREAMS_SVC;  /* only 1 */
-+
-+        /* set callbacks and priority list */
-+    HTCSetCreditDistribution(ar->arHtcTarget,
-+                             ar,
-+                             NULL,  /* use default */
-+                             NULL,  /* use default */
-+                             &servicepriority,
-+                             1);
-+
-+    /* Start the HTC component */
-+    if ((status = HTCStart(ar->arHtcTarget)) != A_OK) {
-+        BMIInit();
-+        return -EIO;
-+    }
-+
-+    (ar)->arRawIfInit = TRUE;
-+
-+    return 0;
-+}
-+
-+int ar6000_htc_raw_close(AR_SOFTC_T *ar)
-+{
-+    A_PRINTF("ar6000_htc_raw_close called \n");
-+    HTCStop(ar->arHtcTarget);
-+
-+        /* reset the device */
-+    ar6000_reset_device(ar->arHifDevice, ar->arTargetType);
-+    /* Initialize the BMI component */
-+    BMIInit();
-+
-+    return 0;
-+}
-+
-+raw_htc_buffer *
-+get_filled_buffer(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID)
-+{
-+    int count;
-+    raw_htc_buffer *busy;
-+
-+    /* Check for data */
-+    for (count = 0; count < RAW_HTC_READ_BUFFERS_NUM; count ++) {
-+        busy = &ar->raw_htc_read_buffer[StreamID][count];
-+        if (busy->length) {
-+            break;
-+        }
-+    }
-+    if (busy->length) {
-+        ar->read_buffer_available[StreamID] = TRUE;
-+    } else {
-+        ar->read_buffer_available[StreamID] = FALSE;
-+    }
-+
-+    return busy;
-+}
-+
-+ssize_t ar6000_htc_raw_read(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID,
-+                            char __user *buffer, size_t length)
-+{
-+    int readPtr;
-+    raw_htc_buffer *busy;
-+
-+    if (arRawStream2EndpointID(ar,StreamID) == 0) {
-+        AR_DEBUG_PRINTF("StreamID(%d) not connected! \n", StreamID);
-+        return -EFAULT;
-+    }
-+
-+    if (down_interruptible(&ar->raw_htc_read_sem[StreamID])) {
-+        return -ERESTARTSYS;
-+    }
-+
-+    busy = get_filled_buffer(ar,StreamID);
-+    while (!ar->read_buffer_available[StreamID]) {
-+        up(&ar->raw_htc_read_sem[StreamID]);
-+
-+        /* Wait for the data */
-+        AR_DEBUG2_PRINTF("Sleeping StreamID(%d) read process\n", StreamID);
-+        if (wait_event_interruptible(ar->raw_htc_read_queue[StreamID],
-+                                     ar->read_buffer_available[StreamID]))
-+        {
-+            return -EINTR;
-+        }
-+        if (down_interruptible(&ar->raw_htc_read_sem[StreamID])) {
-+            return -ERESTARTSYS;
-+        }
-+        busy = get_filled_buffer(ar,StreamID);
-+    }
-+
-+    /* Read the data */
-+    readPtr = busy->currPtr;
-+    if (length > busy->length - HTC_HEADER_LEN) {
-+        length = busy->length - HTC_HEADER_LEN;
-+    }
-+    if (copy_to_user(buffer, &busy->data[readPtr], length)) {
-+        up(&ar->raw_htc_read_sem[StreamID]);
-+        return -EFAULT;
-+    }
-+
-+    busy->currPtr += length;
-+
-+    //AR_DEBUG_PRINTF("raw read ioctl:  currPTR : 0x%X 0x%X \n", busy->currPtr,busy->length);
-+
-+    if (busy->currPtr == busy->length)
-+    {
-+        busy->currPtr = 0;
-+        busy->length = 0;
-+        HTC_PACKET_RESET_RX(&busy->HTCPacket);
-+        //AR_DEBUG_PRINTF("raw read ioctl:  ep for packet:%d \n", busy->HTCPacket.Endpoint);
-+        HTCAddReceivePkt(ar->arHtcTarget, &busy->HTCPacket);
-+    }
-+    ar->read_buffer_available[StreamID] = FALSE;
-+    up(&ar->raw_htc_read_sem[StreamID]);
-+
-+    return length;
-+}
-+
-+static raw_htc_buffer *
-+get_free_buffer(AR_SOFTC_T *ar, HTC_ENDPOINT_ID StreamID)
-+{
-+    int count;
-+    raw_htc_buffer *free;
-+
-+    free = NULL;
-+    for (count = 0; count < RAW_HTC_WRITE_BUFFERS_NUM; count ++) {
-+        free = &ar->raw_htc_write_buffer[StreamID][count];
-+        if (free->length == 0) {
-+            break;
-+        }
-+    }
-+    if (!free->length) {
-+        ar->write_buffer_available[StreamID] = TRUE;
-+    } else {
-+        ar->write_buffer_available[StreamID] = FALSE;
-+    }
-+
-+    return free;
-+}
-+
-+ssize_t ar6000_htc_raw_write(AR_SOFTC_T *ar, HTC_RAW_STREAM_ID StreamID,
-+                     char __user *buffer, size_t length)
-+{
-+    int writePtr;
-+    raw_htc_buffer *free;
-+
-+    if (arRawStream2EndpointID(ar,StreamID) == 0) {
-+        AR_DEBUG_PRINTF("StreamID(%d) not connected! \n", StreamID);
-+        return -EFAULT;
-+    }
-+
-+    if (down_interruptible(&ar->raw_htc_write_sem[StreamID])) {
-+        return -ERESTARTSYS;
-+    }
-+
-+    /* Search for a free buffer */
-+    free = get_free_buffer(ar,StreamID);
-+
-+    /* Check if there is space to write else wait */
-+    while (!ar->write_buffer_available[StreamID]) {
-+        up(&ar->raw_htc_write_sem[StreamID]);
-+
-+        /* Wait for buffer to become free */
-+        AR_DEBUG2_PRINTF("Sleeping StreamID(%d) write process\n", StreamID);
-+        if (wait_event_interruptible(ar->raw_htc_write_queue[StreamID],
-+                                     ar->write_buffer_available[StreamID]))
-+        {
-+            return -EINTR;
-+        }
-+        if (down_interruptible(&ar->raw_htc_write_sem[StreamID])) {
-+            return -ERESTARTSYS;
-+        }
-+        free = get_free_buffer(ar,StreamID);
-+    }
-+
-+    /* Send the data */
-+    writePtr = HTC_HEADER_LEN;
-+    if (length > (AR6000_BUFFER_SIZE - HTC_HEADER_LEN)) {
-+        length = AR6000_BUFFER_SIZE - HTC_HEADER_LEN;
-+    }
-+
-+    if (copy_from_user(&free->data[writePtr], buffer, length)) {
-+        up(&ar->raw_htc_read_sem[StreamID]);
-+        return -EFAULT;
-+    }
-+
-+    free->length = length;
-+
-+    SET_HTC_PACKET_INFO_TX(&free->HTCPacket,
-+                           free,
-+                           &free->data[writePtr],
-+                           length,
-+                           arRawStream2EndpointID(ar,StreamID),
-+                           AR6K_DATA_PKT_TAG);
-+
-+    HTCSendPkt(ar->arHtcTarget,&free->HTCPacket);
-+
-+    ar->write_buffer_available[StreamID] = FALSE;
-+    up(&ar->raw_htc_write_sem[StreamID]);
-+
-+    return length;
-+}
-+#endif /* HTC_RAW_INTERFACE */
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h b/drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h
-new file mode 100644
-index 0000000..b8e6e09
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h
-@@ -0,0 +1,128 @@
-+#ifndef _AR6XAPI_LINUX_H
-+#define _AR6XAPI_LINUX_H
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+struct ar6_softc;
-+
-+void ar6000_ready_event(void *devt, A_UINT8 *datap, A_UINT8 phyCap);
-+A_UINT8 ar6000_iptos_to_userPriority(A_UINT8 *pkt);
-+A_STATUS ar6000_control_tx(void *devt, void *osbuf, WMI_PRI_STREAM_ID streamID);
-+void ar6000_connect_event(struct ar6_softc *ar, A_UINT16 channel,
-+                          A_UINT8 *bssid, A_UINT16 listenInterval,
-+                          A_UINT16 beaconInterval, NETWORK_TYPE networkType,
-+                          A_UINT8 beaconIeLen, A_UINT8 assocReqLen,
-+                          A_UINT8 assocRespLen,A_UINT8 *assocInfo);
-+void ar6000_disconnect_event(struct ar6_softc *ar, A_UINT8 reason,
-+                             A_UINT8 *bssid, A_UINT8 assocRespLen,
-+                             A_UINT8 *assocInfo, A_UINT16 protocolReasonStatus);
-+void ar6000_tkip_micerr_event(struct ar6_softc *ar, A_UINT8 keyid,
-+                              A_BOOL ismcast);
-+void ar6000_bitrate_rx(void *devt, A_INT32 rateKbps);
-+void ar6000_channelList_rx(void *devt, A_INT8 numChan, A_UINT16 *chanList);
-+void ar6000_regDomain_event(struct ar6_softc *ar, A_UINT32 regCode);
-+void ar6000_txPwr_rx(void *devt, A_UINT8 txPwr);
-+void ar6000_keepalive_rx(void *devt, A_UINT8 configured);
-+void ar6000_neighborReport_event(struct ar6_softc *ar, int numAps,
-+                                 WMI_NEIGHBOR_INFO *info);
-+void ar6000_set_numdataendpts(struct ar6_softc *ar, A_UINT32 num);
-+void ar6000_scanComplete_event(struct ar6_softc *ar, A_STATUS status);
-+void ar6000_targetStats_event(struct ar6_softc *ar,  WMI_TARGET_STATS *pStats);
-+void ar6000_rssiThreshold_event(struct ar6_softc *ar,
-+                                WMI_RSSI_THRESHOLD_VAL newThreshold,
-+                                A_INT16 rssi);
-+void ar6000_reportError_event(struct ar6_softc *, WMI_TARGET_ERROR_VAL errorVal);
-+void ar6000_cac_event(struct ar6_softc *ar, A_UINT8 ac, A_UINT8 cac_indication,
-+                                A_UINT8 statusCode, A_UINT8 *tspecSuggestion);
-+void ar6000_hbChallengeResp_event(struct ar6_softc *, A_UINT32 cookie, A_UINT32 source);
-+void
-+ar6000_roam_tbl_event(struct ar6_softc *ar, WMI_TARGET_ROAM_TBL *pTbl);
-+
-+void
-+ar6000_roam_data_event(struct ar6_softc *ar, WMI_TARGET_ROAM_DATA *p);
-+
-+void
-+ar6000_wow_list_event(struct ar6_softc *ar, A_UINT8 num_filters,
-+                      WMI_GET_WOW_LIST_REPLY *wow_reply);
-+
-+void ar6000_pmkid_list_event(void *devt, A_UINT8 numPMKID,
-+                             WMI_PMKID *pmkidList);
-+
-+void ar6000_gpio_intr_rx(A_UINT32 intr_mask, A_UINT32 input_values);
-+void ar6000_gpio_data_rx(A_UINT32 reg_id, A_UINT32 value);
-+void ar6000_gpio_ack_rx(void);
-+
-+void ar6000_dbglog_init_done(struct ar6_softc *ar);
-+
-+#ifdef SEND_EVENT_TO_APP
-+void ar6000_send_event_to_app(struct ar6_softc *ar, A_UINT16 eventId, A_UINT8 *datap, int len);
-+#endif
-+
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+void ar6000_tcmd_rx_report_event(void *devt, A_UINT8 * results, int len);
-+#endif
-+
-+void ar6000_tx_retry_err_event(void *devt);
-+
-+void ar6000_snrThresholdEvent_rx(void *devt,
-+                                 WMI_SNR_THRESHOLD_VAL newThreshold,
-+                                 A_UINT8 snr);
-+
-+void ar6000_lqThresholdEvent_rx(void *devt, WMI_LQ_THRESHOLD_VAL range, A_UINT8 lqVal);
-+
-+
-+void ar6000_ratemask_rx(void *devt, A_UINT16 ratemask);
-+
-+A_STATUS ar6000_get_driver_cfg(struct net_device *dev,
-+                                A_UINT16 cfgParam,
-+                                void *result);
-+void ar6000_bssInfo_event_rx(struct ar6_softc *ar, A_UINT8 *data, int len);
-+
-+void ar6000_dbglog_event(struct ar6_softc *ar, A_UINT32 dropped,
-+                         A_INT8 *buffer, A_UINT32 length);
-+
-+int ar6000_dbglog_get_debug_logs(struct ar6_softc *ar);
-+
-+void ar6000_indicate_tx_activity(void *devt, A_UINT8 trafficClass, A_BOOL Active);
-+
-+void ar6000_dset_open_req(void *devt,
-+                          A_UINT32 id,
-+                          A_UINT32 targ_handle,
-+                          A_UINT32 targ_reply_fn,
-+                          A_UINT32 targ_reply_arg);
-+void ar6000_dset_close(void *devt, A_UINT32 access_cookie);
-+void ar6000_dset_data_req(void *devt,
-+                          A_UINT32 access_cookie,
-+                          A_UINT32 offset,
-+                          A_UINT32 length,
-+                          A_UINT32 targ_buf,
-+                          A_UINT32 targ_reply_fn,
-+                          A_UINT32 targ_reply_arg);
-+
-+
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h b/drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h
-new file mode 100644
-index 0000000..9c3e449
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h
-@@ -0,0 +1,993 @@
-+/*
-+ * Copyright (c) 2004-2006 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef _ATHDRV_LINUX_H
-+#define _ATHDRV_LINUX_H
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+
-+/*
-+ * There are two types of ioctl's here: Standard ioctls and
-+ * eXtended ioctls.  All extended ioctls (XIOCTL) are multiplexed
-+ * off of the single ioctl command, AR6000_IOCTL_EXTENDED.  The
-+ * arguments for every XIOCTL starts with a 32-bit command word
-+ * that is used to select which extended ioctl is in use.  After
-+ * the command word are command-specific arguments.
-+ */
-+
-+/* Linux standard Wireless Extensions, private ioctl interfaces */
-+#define IEEE80211_IOCTL_SETPARAM             (SIOCIWFIRSTPRIV+0)
-+#define IEEE80211_IOCTL_GETPARAM             (SIOCIWFIRSTPRIV+1)
-+#define IEEE80211_IOCTL_SETKEY               (SIOCIWFIRSTPRIV+2)
-+#define IEEE80211_IOCTL_SETWMMPARAMS         (SIOCIWFIRSTPRIV+3)
-+#define IEEE80211_IOCTL_DELKEY               (SIOCIWFIRSTPRIV+4)
-+#define IEEE80211_IOCTL_GETWMMPARAMS         (SIOCIWFIRSTPRIV+5)
-+#define IEEE80211_IOCTL_SETOPTIE             (SIOCIWFIRSTPRIV+6)
-+#define IEEE80211_IOCTL_SETMLME              (SIOCIWFIRSTPRIV+7)
-+//#define IEEE80211_IOCTL_GETOPTIE             (SIOCIWFIRSTPRIV+7)
-+#define IEEE80211_IOCTL_ADDPMKID             (SIOCIWFIRSTPRIV+8)
-+//#define IEEE80211_IOCTL_SETAUTHALG           (SIOCIWFIRSTPRIV+10)
-+#define IEEE80211_IOCTL_LASTONE              (SIOCIWFIRSTPRIV+9)
-+
-+
-+
-+/*                      ====WMI Ioctls====                                    */
-+/*
-+ *
-+ * Many ioctls simply provide WMI services to application code:
-+ * an application makes such an ioctl call with a set of arguments
-+ * that are packaged into the corresponding WMI message, and sent
-+ * to the Target.
-+ */
-+
-+#define AR6000_IOCTL_WMI_GETREV              (SIOCIWFIRSTPRIV+10)
-+/*
-+ * arguments:
-+ *   ar6000_version *revision
-+ */
-+
-+#define AR6000_IOCTL_WMI_SETPWR              (SIOCIWFIRSTPRIV+11)
-+/*
-+ * arguments:
-+ *   WMI_POWER_MODE_CMD pwrModeCmd (see include/wmi.h)
-+ * uses: WMI_SET_POWER_MODE_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SETSCAN             (SIOCIWFIRSTPRIV+12)
-+/*
-+ * arguments:
-+ *   WMI_SCAN_PARAMS_CMD scanParams (see include/wmi.h)
-+ * uses: WMI_SET_SCAN_PARAMS_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SETLISTENINT        (SIOCIWFIRSTPRIV+13)
-+/*
-+ * arguments:
-+ *   UINT32 listenInterval
-+ * uses: WMI_SET_LISTEN_INT_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SETBSSFILTER        (SIOCIWFIRSTPRIV+14)
-+/*
-+ * arguments:
-+ *   WMI_BSS_FILTER filter (see include/wmi.h)
-+ * uses: WMI_SET_BSS_FILTER_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SET_CHANNELPARAMS   (SIOCIWFIRSTPRIV+16)
-+/*
-+ * arguments:
-+ *   WMI_CHANNEL_PARAMS_CMD chParams
-+ * uses: WMI_SET_CHANNEL_PARAMS_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SET_PROBEDSSID      (SIOCIWFIRSTPRIV+17)
-+/*
-+ * arguments:
-+ *   WMI_PROBED_SSID_CMD probedSsids (see include/wmi.h)
-+ * uses: WMI_SETPROBED_SSID_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SET_PMPARAMS        (SIOCIWFIRSTPRIV+18)
-+/*
-+ * arguments:
-+ *   WMI_POWER_PARAMS_CMD powerParams (see include/wmi.h)
-+ * uses: WMI_SET_POWER_PARAMS_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SET_BADAP           (SIOCIWFIRSTPRIV+19)
-+/*
-+ * arguments:
-+ *   WMI_ADD_BAD_AP_CMD badAPs (see include/wmi.h)
-+ * uses: WMI_ADD_BAD_AP_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_GET_QOS_QUEUE       (SIOCIWFIRSTPRIV+20)
-+/*
-+ * arguments:
-+ *   ar6000_queuereq queueRequest (see below)
-+ */
-+
-+#define AR6000_IOCTL_WMI_CREATE_QOS          (SIOCIWFIRSTPRIV+21)
-+/*
-+ * arguments:
-+ *   WMI_CREATE_PSTREAM createPstreamCmd (see include/wmi.h)
-+ * uses: WMI_CREATE_PSTREAM_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_DELETE_QOS          (SIOCIWFIRSTPRIV+22)
-+/*
-+ * arguments:
-+ *   WMI_DELETE_PSTREAM_CMD deletePstreamCmd (see include/wmi.h)
-+ * uses: WMI_DELETE_PSTREAM_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SET_SNRTHRESHOLD   (SIOCIWFIRSTPRIV+23)
-+/*
-+ * arguments:
-+ *   WMI_SNR_THRESHOLD_PARAMS_CMD thresholdParams (see include/wmi.h)
-+ * uses: WMI_SNR_THRESHOLD_PARAMS_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SET_ERROR_REPORT_BITMASK (SIOCIWFIRSTPRIV+24)
-+/*
-+ * arguments:
-+ *   WMI_TARGET_ERROR_REPORT_BITMASK errorReportBitMask (see include/wmi.h)
-+ * uses: WMI_TARGET_ERROR_REPORT_BITMASK_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_GET_TARGET_STATS    (SIOCIWFIRSTPRIV+25)
-+/*
-+ * arguments:
-+ *   TARGET_STATS *targetStats (see below)
-+ * uses: WMI_GET_STATISTICS_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SET_ASSOC_INFO      (SIOCIWFIRSTPRIV+26)
-+/*
-+ * arguments:
-+ *   WMI_SET_ASSOC_INFO_CMD setAssocInfoCmd
-+ * uses: WMI_SET_ASSOC_INFO_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SET_ACCESS_PARAMS   (SIOCIWFIRSTPRIV+27)
-+/*
-+ * arguments:
-+ *   WMI_SET_ACCESS_PARAMS_CMD setAccessParams (see include/wmi.h)
-+ * uses: WMI_SET_ACCESS_PARAMS_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SET_BMISS_TIME      (SIOCIWFIRSTPRIV+28)
-+/*
-+ * arguments:
-+ *   UINT32 beaconMissTime
-+ * uses: WMI_SET_BMISS_TIME_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SET_DISC_TIMEOUT    (SIOCIWFIRSTPRIV+29)
-+/*
-+ * arguments:
-+ *   WMI_DISC_TIMEOUT_CMD disconnectTimeoutCmd (see include/wmi.h)
-+ * uses: WMI_SET_DISC_TIMEOUT_CMDID
-+ */
-+
-+#define AR6000_IOCTL_WMI_SET_IBSS_PM_CAPS    (SIOCIWFIRSTPRIV+30)
-+/*
-+ * arguments:
-+ *   WMI_IBSS_PM_CAPS_CMD ibssPowerMgmtCapsCmd
-+ * uses: WMI_SET_IBSS_PM_CAPS_CMDID
-+ */
-+
-+/*
-+ * There is a very small space available for driver-private
-+ * wireless ioctls.  In order to circumvent this limitation,
-+ * we multiplex a bunch of ioctls (XIOCTLs) on top of a
-+ * single AR6000_IOCTL_EXTENDED ioctl.
-+ */
-+#define AR6000_IOCTL_EXTENDED                (SIOCIWFIRSTPRIV+31)
-+
-+
-+/*                         ====BMI Extended Ioctls====                        */
-+
-+#define AR6000_XIOCTL_BMI_DONE                                  1
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_BMI_DONE)
-+ * uses: BMI_DONE
-+ */
-+
-+#define AR6000_XIOCTL_BMI_READ_MEMORY                           2
-+/*
-+ * arguments:
-+ *   union {
-+ *     struct {
-+ *       UINT32 cmd (AR6000_XIOCTL_BMI_READ_MEMORY)
-+ *       UINT32 address
-+ *       UINT32 length
-+ *     }
-+ *     char results[length]
-+ *   }
-+ * uses: BMI_READ_MEMORY
-+ */
-+
-+#define AR6000_XIOCTL_BMI_WRITE_MEMORY                          3
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_BMI_WRITE_MEMORY)
-+ *   UINT32 address
-+ *   UINT32 length
-+ *   char data[length]
-+ * uses: BMI_WRITE_MEMORY
-+ */
-+
-+#define AR6000_XIOCTL_BMI_EXECUTE                               4
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_BMI_EXECUTE)
-+ *   UINT32 TargetAddress
-+ *   UINT32 parameter
-+ * uses: BMI_EXECUTE
-+ */
-+
-+#define AR6000_XIOCTL_BMI_SET_APP_START                         5
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_BMI_SET_APP_START)
-+ *   UINT32 TargetAddress
-+ * uses: BMI_SET_APP_START
-+ */
-+
-+#define AR6000_XIOCTL_BMI_READ_SOC_REGISTER                     6
-+/*
-+ * arguments:
-+ *   union {
-+ *     struct {
-+ *       UINT32 cmd (AR6000_XIOCTL_BMI_READ_SOC_REGISTER)
-+ *       UINT32 TargetAddress, 32-bit aligned
-+ *     }
-+ *     UINT32 result
-+ *   }
-+ * uses: BMI_READ_SOC_REGISTER
-+ */
-+
-+#define AR6000_XIOCTL_BMI_WRITE_SOC_REGISTER                    7
-+/*
-+ * arguments:
-+ *     struct {
-+ *       UINT32 cmd (AR6000_XIOCTL_BMI_WRITE_SOC_REGISTER)
-+ *       UINT32 TargetAddress, 32-bit aligned
-+ *       UINT32 newValue
-+ *     }
-+ * uses: BMI_WRITE_SOC_REGISTER
-+ */
-+
-+#define AR6000_XIOCTL_BMI_TEST                                  8
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_BMI_TEST)
-+ *   UINT32 address
-+ *   UINT32 length
-+ *   UINT32 count
-+ */
-+
-+
-+
-+/* Historical Host-side DataSet support */
-+#define AR6000_XIOCTL_UNUSED9                                   9
-+#define AR6000_XIOCTL_UNUSED10                                  10
-+#define AR6000_XIOCTL_UNUSED11                                  11
-+
-+/*                      ====Misc Extended Ioctls====                          */
-+
-+#define AR6000_XIOCTL_FORCE_TARGET_RESET                        12
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_FORCE_TARGET_RESET)
-+ */
-+
-+
-+#ifdef HTC_RAW_INTERFACE
-+/* HTC Raw Interface Ioctls */
-+#define AR6000_XIOCTL_HTC_RAW_OPEN                              13
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_HTC_RAW_OPEN)
-+ */
-+
-+#define AR6000_XIOCTL_HTC_RAW_CLOSE                             14
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_HTC_RAW_CLOSE)
-+ */
-+
-+#define AR6000_XIOCTL_HTC_RAW_READ                              15
-+/*
-+ * arguments:
-+ *   union {
-+ *     struct {
-+ *       UINT32 cmd (AR6000_XIOCTL_HTC_RAW_READ)
-+ *       UINT32 mailboxID
-+ *       UINT32 length
-+ *     }
-+ *     results[length]
-+ *   }
-+ */
-+
-+#define AR6000_XIOCTL_HTC_RAW_WRITE                             16
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_HTC_RAW_WRITE)
-+ *   UINT32 mailboxID
-+ *   UINT32 length
-+ *   char buffer[length]
-+ */
-+#endif /* HTC_RAW_INTERFACE */
-+
-+#define AR6000_XIOCTL_CHECK_TARGET_READY                        17
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_CHECK_TARGET_READY)
-+ */
-+
-+
-+
-+/*                ====GPIO (General Purpose I/O) Extended Ioctls====          */
-+
-+#define AR6000_XIOCTL_GPIO_OUTPUT_SET                           18
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_GPIO_OUTPUT_SET)
-+ *   ar6000_gpio_output_set_cmd_s (see below)
-+ * uses: WMIX_GPIO_OUTPUT_SET_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_GPIO_INPUT_GET                            19
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_GPIO_INPUT_GET)
-+ * uses: WMIX_GPIO_INPUT_GET_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_GPIO_REGISTER_SET                         20
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_GPIO_REGISTER_SET)
-+ *   ar6000_gpio_register_cmd_s (see below)
-+ * uses: WMIX_GPIO_REGISTER_SET_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_GPIO_REGISTER_GET                         21
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_GPIO_REGISTER_GET)
-+ *   ar6000_gpio_register_cmd_s (see below)
-+ * uses: WMIX_GPIO_REGISTER_GET_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_GPIO_INTR_ACK                             22
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_GPIO_INTR_ACK)
-+ *   ar6000_cpio_intr_ack_cmd_s (see below)
-+ * uses: WMIX_GPIO_INTR_ACK_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_GPIO_INTR_WAIT                            23
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_GPIO_INTR_WAIT)
-+ */
-+
-+
-+
-+/*                    ====more wireless commands====                          */
-+
-+#define AR6000_XIOCTL_SET_ADHOC_BSSID                           24
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_SET_ADHOC_BSSID)
-+ *   WMI_SET_ADHOC_BSSID_CMD setAdHocBssidCmd (see include/wmi.h)
-+ */
-+
-+#define AR6000_XIOCTL_SET_OPT_MODE                              25
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_SET_OPT_MODE)
-+ *   WMI_SET_OPT_MODE_CMD setOptModeCmd (see include/wmi.h)
-+ * uses: WMI_SET_OPT_MODE_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_OPT_SEND_FRAME                            26
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_OPT_SEND_FRAME)
-+ *   WMI_OPT_TX_FRAME_CMD optTxFrameCmd (see include/wmi.h)
-+ * uses: WMI_OPT_TX_FRAME_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_SET_ADHOC_BEACON_INTVAL                   27
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_SET_ADHOC_BEACON_INTVAL)
-+ *   WMI_BEACON_INT_CMD beaconIntCmd (see include/wmi.h)
-+ * uses: WMI_SET_BEACON_INT_CMDID
-+ */
-+
-+
-+#define IEEE80211_IOCTL_SETAUTHALG                              28
-+
-+
-+#define AR6000_XIOCTL_SET_VOICE_PKT_SIZE                        29
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_SET_VOICE_PKT_SIZE)
-+ *   WMI_SET_VOICE_PKT_SIZE_CMD setVoicePktSizeCmd (see include/wmi.h)
-+ * uses: WMI_SET_VOICE_PKT_SIZE_CMDID
-+ */
-+
-+
-+#define AR6000_XIOCTL_SET_MAX_SP                                30
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_SET_MAX_SP)
-+ *   WMI_SET_MAX_SP_LEN_CMD maxSPLen(see include/wmi.h)
-+ * uses: WMI_SET_MAX_SP_LEN_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_WMI_GET_ROAM_TBL                          31
-+
-+#define AR6000_XIOCTL_WMI_SET_ROAM_CTRL                         32
-+
-+#define AR6000_XIOCTRL_WMI_SET_POWERSAVE_TIMERS                 33
-+
-+
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTRL_WMI_SET_POWERSAVE_TIMERS)
-+ *   WMI_SET_POWERSAVE_TIMERS_CMD powerSaveTimers(see include/wmi.h)
-+ *   WMI_SET_POWERSAVE_TIMERS_CMDID
-+ */
-+
-+#define AR6000_XIOCTRL_WMI_GET_POWER_MODE                        34
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTRL_WMI_GET_POWER_MODE)
-+ */
-+
-+#define AR6000_XIOCTRL_WMI_SET_WLAN_STATE                       35
-+typedef enum {
-+    WLAN_DISABLED,
-+    WLAN_ENABLED
-+} AR6000_WLAN_STATE;
-+/*
-+ * arguments:
-+ * enable/disable
-+ */
-+
-+#define AR6000_XIOCTL_WMI_GET_ROAM_DATA                         36
-+
-+#define AR6000_XIOCTL_WMI_SETRETRYLIMITS                37
-+/*
-+ * arguments:
-+ *   WMI_SET_RETRY_LIMITS_CMD ibssSetRetryLimitsCmd
-+ * uses: WMI_SET_RETRY_LIMITS_CMDID
-+ */
-+
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+/*       ====extended commands for radio test ====                          */
-+
-+#define AR6000_XIOCTL_TCMD_CONT_TX                      38
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_TCMD_CONT_TX)
-+ *   WMI_TCMD_CONT_TX_CMD contTxCmd (see include/wmi.h)
-+ * uses: WMI_TCMD_CONT_TX_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_TCMD_CONT_RX                      39
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_TCMD_CONT_RX)
-+ *   WMI_TCMD_CONT_RX_CMD rxCmd (see include/wmi.h)
-+ * uses: WMI_TCMD_CONT_RX_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_TCMD_PM                           40
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_TCMD_PM)
-+ *   WMI_TCMD_PM_CMD pmCmd (see include/wmi.h)
-+ * uses: WMI_TCMD_PM_CMDID
-+ */
-+
-+#endif /* CONFIG_HOST_TCMD_SUPPORT */
-+
-+#define AR6000_XIOCTL_WMI_STARTSCAN                     41
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_WMI_STARTSCAN)
-+ *   UINT8  scanType
-+ *   UINT8  scanConnected
-+ *   A_BOOL forceFgScan
-+ * uses: WMI_START_SCAN_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_WMI_SETFIXRATES                   42
-+
-+#define AR6000_XIOCTL_WMI_GETFIXRATES                   43
-+
-+
-+#define AR6000_XIOCTL_WMI_SET_RSSITHRESHOLD             44
-+/*
-+ * arguments:
-+ *   WMI_RSSI_THRESHOLD_PARAMS_CMD thresholdParams (see include/wmi.h)
-+ * uses: WMI_RSSI_THRESHOLD_PARAMS_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_WMI_CLR_RSSISNR                   45
-+/*
-+ * arguments:
-+ *   WMI_CLR_RSSISNR_CMD thresholdParams (see include/wmi.h)
-+ * uses: WMI_CLR_RSSISNR_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_WMI_SET_LQTHRESHOLD               46
-+/*
-+ * arguments:
-+ *   WMI_LQ_THRESHOLD_PARAMS_CMD thresholdParams (see include/wmi.h)
-+ * uses: WMI_LQ_THRESHOLD_PARAMS_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_WMI_SET_RTS                        47
-+/*
-+ * arguments:
-+ *   WMI_SET_RTS_MODE_CMD (see include/wmi.h)
-+ * uses: WMI_SET_RTS_MODE_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_WMI_SET_LPREAMBLE                 48
-+
-+#define AR6000_XIOCTL_WMI_SET_AUTHMODE                  49
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_WMI_SET_AUTHMODE)
-+ *   UINT8  mode
-+ * uses: WMI_SET_RECONNECT_AUTH_MODE_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_WMI_SET_REASSOCMODE               50
-+
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_WMI_SET_WMM)
-+ *   UINT8  mode
-+ * uses: WMI_SET_WMM_CMDID
-+ */
-+#define AR6000_XIOCTL_WMI_SET_WMM                       51
-+
-+/*
-+ * arguments:
-+ * UINT32 cmd (AR6000_XIOCTL_WMI_SET_HB_CHALLENGE_RESP_PARAMS)
-+ * UINT32 frequency
-+ * UINT8  threshold
-+ */
-+#define AR6000_XIOCTL_WMI_SET_HB_CHALLENGE_RESP_PARAMS  52
-+
-+/*
-+ * arguments:
-+ * UINT32 cmd (AR6000_XIOCTL_WMI_GET_HB_CHALLENGE_RESP)
-+ * UINT32 cookie
-+ */
-+#define AR6000_XIOCTL_WMI_GET_HB_CHALLENGE_RESP         53
-+
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_WMI_GET_RD)
-+ *   UINT32 regDomain
-+ */
-+#define AR6000_XIOCTL_WMI_GET_RD                        54
-+
-+#define AR6000_XIOCTL_DIAG_READ                         55
-+
-+#define AR6000_XIOCTL_DIAG_WRITE                        56
-+
-+/*
-+ * arguments cmd (AR6000_XIOCTL_SET_TXOP)
-+ * WMI_TXOP_CFG  txopEnable
-+ */
-+#define AR6000_XIOCTL_WMI_SET_TXOP                      57
-+
-+#ifdef USER_KEYS
-+/*
-+ * arguments:
-+ * UINT32 cmd (AR6000_XIOCTL_USER_SETKEYS)
-+ * UINT32 keyOpCtrl
-+ * uses AR6000_USER_SETKEYS_INFO
-+ */
-+#define AR6000_XIOCTL_USER_SETKEYS                      58
-+#endif /* USER_KEYS */
-+
-+#define AR6000_XIOCTL_WMI_SET_KEEPALIVE                 59
-+/*
-+ * arguments:
-+ *   UINT8 cmd (AR6000_XIOCTL_WMI_SET_KEEPALIVE)
-+ *   UINT8 keepaliveInterval
-+ * uses: WMI_SET_KEEPALIVE_CMDID
-+ */
-+
-+#define AR6000_XIOCTL_WMI_GET_KEEPALIVE                 60
-+/*
-+ * arguments:
-+ *   UINT8 cmd (AR6000_XIOCTL_WMI_GET_KEEPALIVE)
-+ *   UINT8 keepaliveInterval
-+ *   A_BOOL configured
-+ * uses: WMI_GET_KEEPALIVE_CMDID
-+ */
-+
-+/*               ====ROM Patching Extended Ioctls====                       */
-+
-+#define AR6000_XIOCTL_BMI_ROMPATCH_INSTALL              61
-+/*
-+ * arguments:
-+ *     union {
-+ *       struct {
-+ *         UINT32 cmd (AR6000_XIOCTL_BMI_ROMPATCH_INSTALL)
-+ *         UINT32 ROM Address
-+ *         UINT32 RAM Address
-+ *         UINT32 number of bytes
-+ *         UINT32 activate? (0 or 1)
-+ *       }
-+ *       A_UINT32 resulting rompatch ID
-+ *     }
-+ * uses: BMI_ROMPATCH_INSTALL
-+ */
-+
-+#define AR6000_XIOCTL_BMI_ROMPATCH_UNINSTALL            62
-+/*
-+ * arguments:
-+ *     struct {
-+ *       UINT32 cmd (AR6000_XIOCTL_BMI_ROMPATCH_UNINSTALL)
-+ *       UINT32 rompatch ID
-+ *     }
-+ * uses: BMI_ROMPATCH_UNINSTALL
-+ */
-+
-+#define AR6000_XIOCTL_BMI_ROMPATCH_ACTIVATE             63
-+/*
-+ * arguments:
-+ *     struct {
-+ *       UINT32 cmd (AR6000_XIOCTL_BMI_ROMPATCH_ACTIVATE)
-+ *       UINT32 rompatch count
-+ *       UINT32 rompatch IDs[rompatch count]
-+ *     }
-+ * uses: BMI_ROMPATCH_ACTIVATE
-+ */
-+
-+#define AR6000_XIOCTL_BMI_ROMPATCH_DEACTIVATE           64
-+/*
-+ * arguments:
-+ *     struct {
-+ *       UINT32 cmd (AR6000_XIOCTL_BMI_ROMPATCH_DEACTIVATE)
-+ *       UINT32 rompatch count
-+ *       UINT32 rompatch IDs[rompatch count]
-+ *     }
-+ * uses: BMI_ROMPATCH_DEACTIVATE
-+ */
-+
-+#define AR6000_XIOCTL_WMI_SET_APPIE             65
-+/*
-+ * arguments:
-+ *      struct {
-+ *          UINT32 cmd (AR6000_XIOCTL_WMI_SET_APPIE)
-+ *          UINT32  app_frmtype;
-+ *          UINT32  app_buflen;
-+ *          UINT8   app_buf[];
-+ *      }
-+ */
-+#define AR6000_XIOCTL_WMI_SET_MGMT_FRM_RX_FILTER    66
-+/*
-+ * arguments:
-+ *      A_UINT32 filter_type;
-+ */
-+
-+#define AR6000_XIOCTL_DBGLOG_CFG_MODULE             67
-+
-+#define AR6000_XIOCTL_DBGLOG_GET_DEBUG_LOGS         68
-+
-+#define AR6000_XIOCTL_WMI_SET_WSC_STATUS              70
-+/*
-+ * arguments:
-+ *      A_UINT32 wsc_status;
-+ *            (WSC_REG_INACTIVE or WSC_REG_ACTIVE)
-+ */
-+
-+/*
-+ * arguments:
-+ *      struct {
-+ *          A_UINT8 streamType;
-+ *          A_UINT8 status;
-+ *      }
-+ * uses: WMI_SET_BT_STATUS_CMDID
-+ */
-+#define AR6000_XIOCTL_WMI_SET_BT_STATUS             71
-+
-+/*
-+ * arguments:
-+ *      struct {
-+ *           A_UINT8 paramType;
-+ *           union {
-+ *               A_UINT8 noSCOPkts;
-+ *               BT_PARAMS_A2DP a2dpParams;
-+ *               BT_COEX_REGS regs;
-+ *           };
-+ *      }
-+ * uses: WMI_SET_BT_PARAM_CMDID
-+ */
-+#define AR6000_XIOCTL_WMI_SET_BT_PARAMS             72
-+
-+#define AR6000_XIOCTL_WMI_SET_HOST_SLEEP_MODE       73
-+#define AR6000_XIOCTL_WMI_SET_WOW_MODE              74
-+#define AR6000_XIOCTL_WMI_GET_WOW_LIST              75
-+#define AR6000_XIOCTL_WMI_ADD_WOW_PATTERN           76
-+#define AR6000_XIOCTL_WMI_DEL_WOW_PATTERN           77
-+
-+
-+
-+#define AR6000_XIOCTL_TARGET_INFO                   78
-+/*
-+ * arguments:
-+ *   UINT32 cmd (AR6000_XIOCTL_TARGET_INFO)
-+ *   A_UINT32 TargetVersion (returned)
-+ *   A_UINT32 TargetType    (returned)
-+ * (See also bmi_msg.h target_ver and target_type)
-+ */
-+
-+#define AR6000_XIOCTL_DUMP_HTC_CREDIT_STATE         79
-+/*
-+ * arguments:
-+ *      none
-+ */
-+
-+#define AR6000_XIOCTL_TRAFFIC_ACTIVITY_CHANGE       80
-+/*
-+ * This ioctl is used to emulate traffic activity
-+ * timeouts.  Activity/inactivity will trigger the driver
-+ * to re-balance credits.
-+ *
-+ * arguments:
-+ *      ar6000_traffic_activity_change
-+ */
-+
-+#define AR6000_XIOCTL_WMI_SET_CONNECT_CTRL_FLAGS    81
-+/*
-+ * This ioctl is used to set the connect control flags
-+ *
-+ * arguments:
-+ *      A_UINT32 connectCtrlFlags
-+ */
-+
-+#define AR6000_XIOCTL_WMI_SET_AKMP_PARAMS              82
-+/*
-+ * This IOCTL sets any Authentication,Key Management and Protection
-+ * related parameters. This is used along with the information set in
-+ * Connect Command.
-+ * Currently this enables Multiple PMKIDs to an AP.
-+ *
-+ * arguments:
-+ *      struct {
-+ *          A_UINT32    akmpInfo;
-+ *      }
-+ * uses: WMI_SET_AKMP_PARAMS_CMD
-+ */
-+
-+#define AR6000_XIOCTL_WMI_GET_PMKID_LIST            83
-+
-+#define AR6000_XIOCTL_WMI_SET_PMKID_LIST            84
-+/*
-+ * This IOCTL is used to set a list of PMKIDs. This list of
-+ * PMKIDs is used in the [Re]AssocReq Frame. This list is used
-+ * only if the MultiPMKID option is enabled via the
-+ * AR6000_XIOCTL_WMI_SET_AKMP_PARAMS  IOCTL.
-+ *
-+ * arguments:
-+ *      struct {
-+ *          A_UINT32    numPMKID;
-+ *          WMI_PMKID   pmkidList[WMI_MAX_PMKID_CACHE];
-+ *      }
-+ * uses: WMI_SET_PMKIDLIST_CMD
-+ */
-+
-+/* Historical DSETPATCH support for INI patches */
-+#define AR6000_XIOCTL_UNUSED90                      90
-+
-+
-+
-+/* used by AR6000_IOCTL_WMI_GETREV */
-+struct ar6000_version {
-+    A_UINT32        host_ver;
-+    A_UINT32        target_ver;
-+};
-+
-+/* used by AR6000_IOCTL_WMI_GET_QOS_QUEUE */
-+struct ar6000_queuereq {
-+    A_UINT8         trafficClass;
-+    A_UINT16        activeTsids;
-+};
-+
-+/* used by AR6000_IOCTL_WMI_GET_TARGET_STATS */
-+typedef struct targetStats_t {
-+    A_UINT64    tx_packets;
-+    A_UINT64    tx_bytes;
-+    A_UINT64    tx_unicast_pkts;
-+    A_UINT64    tx_unicast_bytes;
-+    A_UINT64    tx_multicast_pkts;
-+    A_UINT64    tx_multicast_bytes;
-+    A_UINT64    tx_broadcast_pkts;
-+    A_UINT64    tx_broadcast_bytes;
-+    A_UINT64    tx_rts_success_cnt;
-+    A_UINT64    tx_packet_per_ac[4];
-+
-+    A_UINT64    tx_errors;
-+    A_UINT64    tx_failed_cnt;
-+    A_UINT64    tx_retry_cnt;
-+    A_UINT64    tx_rts_fail_cnt;
-+    A_INT32     tx_unicast_rate;
-+    A_UINT64    rx_packets;
-+    A_UINT64    rx_bytes;
-+    A_UINT64    rx_unicast_pkts;
-+    A_UINT64    rx_unicast_bytes;
-+    A_UINT64    rx_multicast_pkts;
-+    A_UINT64    rx_multicast_bytes;
-+    A_UINT64    rx_broadcast_pkts;
-+    A_UINT64    rx_broadcast_bytes;
-+    A_UINT64    rx_fragment_pkt;
-+
-+    A_UINT64    rx_errors;
-+    A_UINT64    rx_crcerr;
-+    A_UINT64    rx_key_cache_miss;
-+    A_UINT64    rx_decrypt_err;
-+    A_UINT64    rx_duplicate_frames;
-+    A_INT32     rx_unicast_rate;
-+
-+    A_UINT64    tkip_local_mic_failure;
-+    A_UINT64    tkip_counter_measures_invoked;
-+    A_UINT64    tkip_replays;
-+    A_UINT64    tkip_format_errors;
-+    A_UINT64    ccmp_format_errors;
-+    A_UINT64    ccmp_replays;
-+
-+    A_UINT64    power_save_failure_cnt;
-+    A_INT16     noise_floor_calibation;
-+
-+    A_UINT64    cs_bmiss_cnt;
-+    A_UINT64    cs_lowRssi_cnt;
-+    A_UINT64    cs_connect_cnt;
-+    A_UINT64    cs_disconnect_cnt;
-+    A_UINT8     cs_aveBeacon_snr;
-+    A_INT16     cs_aveBeacon_rssi;
-+    A_UINT8     cs_lastRoam_msec;
-+    A_UINT8     cs_snr;
-+    A_INT16     cs_rssi;
-+
-+    A_UINT32    lq_val;
-+
-+    A_UINT32    wow_num_pkts_dropped;
-+    A_UINT8     wow_num_host_pkt_wakeups;
-+    A_UINT8     wow_num_host_event_wakeups;
-+    A_UINT16    wow_num_events_discarded;
-+
-+}TARGET_STATS;
-+
-+typedef struct targetStats_cmd_t {
-+    TARGET_STATS targetStats;
-+    int clearStats;
-+} TARGET_STATS_CMD;
-+
-+/* used by AR6000_XIOCTL_USER_SETKEYS */
-+
-+/*
-+ * Setting this bit to 1 doesnot initialize the RSC on the firmware
-+ */
-+#define AR6000_XIOCTL_USER_SETKEYS_RSC_CTRL    1
-+#define AR6000_USER_SETKEYS_RSC_UNCHANGED     0x00000002
-+
-+typedef struct {
-+    A_UINT32  keyOpCtrl;  /* Bit Map of Key Mgmt Ctrl Flags */
-+} AR6000_USER_SETKEYS_INFO;
-+
-+
-+/* used by AR6000_XIOCTL_GPIO_OUTPUT_SET */
-+struct ar6000_gpio_output_set_cmd_s {
-+    A_UINT32 set_mask;
-+    A_UINT32 clear_mask;
-+    A_UINT32 enable_mask;
-+    A_UINT32 disable_mask;
-+};
-+
-+/*
-+ * used by AR6000_XIOCTL_GPIO_REGISTER_GET and AR6000_XIOCTL_GPIO_REGISTER_SET
-+ */
-+struct ar6000_gpio_register_cmd_s {
-+    A_UINT32 gpioreg_id;
-+    A_UINT32 value;
-+};
-+
-+/* used by AR6000_XIOCTL_GPIO_INTR_ACK */
-+struct ar6000_gpio_intr_ack_cmd_s {
-+    A_UINT32 ack_mask;
-+};
-+
-+/* used by AR6000_XIOCTL_GPIO_INTR_WAIT */
-+struct ar6000_gpio_intr_wait_cmd_s {
-+    A_UINT32 intr_mask;
-+    A_UINT32 input_values;
-+};
-+
-+/* used by the AR6000_XIOCTL_DBGLOG_CFG_MODULE */
-+typedef struct ar6000_dbglog_module_config_s {
-+    A_UINT32 valid;
-+    A_UINT16 mmask;
-+    A_UINT16 tsr;
-+    A_BOOL   rep;
-+    A_UINT16 size;
-+} DBGLOG_MODULE_CONFIG;
-+
-+typedef struct user_rssi_thold_t {
-+    A_INT16     tag;
-+    A_INT16     rssi;
-+} USER_RSSI_THOLD;
-+
-+typedef struct user_rssi_params_t {
-+    A_UINT8            weight;
-+    A_UINT32           pollTime;
-+    USER_RSSI_THOLD    tholds[12];
-+} USER_RSSI_PARAMS;
-+
-+/*
-+ * Host driver may have some config parameters. Typically, these
-+ * config params are one time config parameters. These could
-+ * correspond to any of the underlying modules. Host driver exposes
-+ * an api for the underlying modules to get this config.
-+ */
-+#define AR6000_DRIVER_CFG_BASE                  0x8000
-+
-+/* Should driver perform wlan node caching? */
-+#define AR6000_DRIVER_CFG_GET_WLANNODECACHING   0x8001
-+/*Should we log raw WMI msgs */
-+#define AR6000_DRIVER_CFG_LOG_RAW_WMI_MSGS      0x8002
-+
-+/* used by AR6000_XIOCTL_DIAG_READ & AR6000_XIOCTL_DIAG_WRITE */
-+struct ar6000_diag_window_cmd_s {
-+    unsigned int addr;
-+    unsigned int value;
-+};
-+
-+
-+struct ar6000_traffic_activity_change {
-+    A_UINT32    StreamID;   /* stream ID to indicate activity change */
-+    A_UINT32    Active;     /* active (1) or inactive (0) */
-+};
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h b/drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h
-new file mode 100644
-index 0000000..3e91de3
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h
-@@ -0,0 +1,47 @@
-+/*
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/os/linux/include/athtypes_linux.h#1 $
-+ *
-+ * This file contains the definitions of the basic atheros data types.
-+ * It is used to map the data types in atheros files to a platform specific
-+ * type.
-+ *
-+ * Copyright 2003-2005 Atheros Communications, 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef _ATHTYPES_LINUX_H_
-+#define _ATHTYPES_LINUX_H_
-+
-+#ifdef __KERNEL__
-+#include <linux/types.h>
-+#endif
-+
-+typedef int8_t      A_INT8;
-+typedef int16_t     A_INT16;
-+typedef int32_t     A_INT32;
-+typedef int64_t     A_INT64;
-+
-+typedef u_int8_t     A_UINT8;
-+typedef u_int16_t    A_UINT16;
-+typedef u_int32_t    A_UINT32;
-+typedef u_int64_t    A_UINT64;
-+
-+typedef int             A_BOOL;
-+typedef char            A_CHAR;
-+typedef unsigned char   A_UCHAR;
-+typedef unsigned long   A_ATH_TIMER;
-+
-+
-+#endif /* _ATHTYPES_LINUX_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h b/drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h
-new file mode 100644
-index 0000000..11a691d
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h
-@@ -0,0 +1,44 @@
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef _CONFIG_LINUX_H_
-+#define _CONFIG_LINUX_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/*
-+ * Host-side GPIO support is optional.
-+ * If run-time access to GPIO pins is not required, then
-+ * this should be changed to #undef.
-+ */
-+#define CONFIG_HOST_GPIO_SUPPORT
-+
-+/*
-+ * Host side Test Command support
-+ */
-+#define CONFIG_HOST_TCMD_SUPPORT
-+
-+#define USE_4BYTE_REGISTER_ACCESS
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h b/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h
-new file mode 100644
-index 0000000..e62e960
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h
-@@ -0,0 +1,86 @@
-+/*
-+ * Copyright (c) 2004-2006 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef _DEBUG_LINUX_H_
-+#define _DEBUG_LINUX_H_
-+
-+#define DBG_DEFAULTS  (DBG_ERROR|DBG_WARNING)
-+
-+extern A_UINT32 g_dbg_flags;
-+
-+#define DBGFMT  "%s() : "
-+#define DBGARG  __func__
-+#define DBGFN A_PRINTF
-+
-+/* ------- Debug related stuff ------- */
-+enum {
-+    ATH_DEBUG_SEND = 0x0001,
-+    ATH_DEBUG_RECV = 0x0002,
-+    ATH_DEBUG_SYNC = 0x0004,
-+    ATH_DEBUG_DUMP = 0x0008,
-+    ATH_DEBUG_IRQ  = 0x0010,
-+    ATH_DEBUG_TRC  = 0x0020,
-+    ATH_DEBUG_WARN = 0x0040,
-+    ATH_DEBUG_ERR  = 0x0080,
-+    ATH_LOG_INF          = 0x0100,
-+    ATH_DEBUG_BMI  = 0x0110,
-+    ATH_DEBUG_WMI  = 0x0120,
-+    ATH_DEBUG_HIF  = 0x0140,
-+    ATH_DEBUG_HTC  = 0x0180,
-+    ATH_DEBUG_WLAN = 0x1000,
-+    ATH_LOG_ERR          = 0x1010,
-+    ATH_DEBUG_ANY  = 0xFFFF,
-+};
-+
-+#ifdef DEBUG
-+
-+#define A_DPRINTF(f, a) \
-+      if(g_dbg_flags & (f)) \
-+      {       \
-+              DBGFN a ; \
-+      }
-+
-+
-+// TODO FIX usage of A_PRINTF!
-+#define AR_DEBUG_LVL_CHECK(lvl) (debughtc & (lvl))
-+#define AR_DEBUG_PRINTBUF(buffer, length, desc) do {   \
-+    if (debughtc & ATH_DEBUG_DUMP) {             \
-+        DebugDumpBytes(buffer, length,desc);               \
-+    }                                            \
-+} while(0)
-+#define PRINTX_ARG(arg...) arg
-+#define AR_DEBUG_PRINTF(flags, args) do {        \
-+    if (debughtc & (flags)) {                    \
-+        A_PRINTF(KERN_ALERT PRINTX_ARG args);    \
-+    }                                            \
-+} while (0)
-+#define AR_DEBUG_ASSERT(test) do {               \
-+    if (!(test)) {                               \
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Debug Assert Caught, File %s, Line: %d, Test:%s \n",__FILE__, __LINE__,#test));         \
-+    }                                            \
-+} while(0)
-+extern int debughtc;
-+#else
-+#define AR_DEBUG_PRINTF(flags, args)
-+#define AR_DEBUG_PRINTBUF(buffer, length)
-+#define AR_DEBUG_ASSERT(test)
-+#define AR_DEBUG_LVL_CHECK(lvl) 0
-+#define A_DPRINTF(f, a)
-+#endif
-+
-+#endif /* _DEBUG_LINUX_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c b/drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c
-new file mode 100644
-index 0000000..eb712b4
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c
-@@ -0,0 +1,2540 @@
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "ar6000_drv.h"
-+
-+static A_UINT8 bcast_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-+static A_UINT8 null_mac[] = {0x0, 0x0, 0x0, 0x0, 0x0, 0x0};
-+extern USER_RSSI_THOLD rssi_map[12];
-+extern unsigned int wmitimeout;
-+extern A_WAITQUEUE_HEAD arEvent;
-+extern int tspecCompliance;
-+extern int bmienable;
-+extern int bypasswmi;
-+
-+static int
-+ar6000_ioctl_get_roam_tbl(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if(wmi_get_roam_tbl_cmd(ar->arWmi) != A_OK) {
-+        return -EIO;
-+    }
-+
-+    return 0;
-+}
-+
-+static int
-+ar6000_ioctl_get_roam_data(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+
-+    /* currently assume only roam times are required */
-+    if(wmi_get_roam_data_cmd(ar->arWmi, ROAM_DATA_TIME) != A_OK) {
-+        return -EIO;
-+    }
-+
-+
-+    return 0;
-+}
-+
-+static int
-+ar6000_ioctl_set_roam_ctrl(struct net_device *dev, char *userdata)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_SET_ROAM_CTRL_CMD cmd;
-+    A_UINT8 size = sizeof(cmd);
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+
-+    if (copy_from_user(&cmd, userdata, size)) {
-+        return -EFAULT;
-+    }
-+
-+    if (cmd.roamCtrlType == WMI_SET_HOST_BIAS) {
-+        if (cmd.info.bssBiasInfo.numBss > 1) {
-+            size += (cmd.info.bssBiasInfo.numBss - 1) * sizeof(WMI_BSS_BIAS);
-+        }
-+    }
-+
-+    if (copy_from_user(&cmd, userdata, size)) {
-+        return -EFAULT;
-+    }
-+
-+    if(wmi_set_roam_ctrl_cmd(ar->arWmi, &cmd, size) != A_OK) {
-+        return -EIO;
-+    }
-+
-+    return 0;
-+}
-+
-+static int
-+ar6000_ioctl_set_powersave_timers(struct net_device *dev, char *userdata)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_POWERSAVE_TIMERS_POLICY_CMD cmd;
-+    A_UINT8 size = sizeof(cmd);
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, userdata, size)) {
-+        return -EFAULT;
-+    }
-+
-+    if (copy_from_user(&cmd, userdata, size)) {
-+        return -EFAULT;
-+    }
-+
-+    if(wmi_set_powersave_timers_cmd(ar->arWmi, &cmd, size) != A_OK) {
-+        return -EIO;
-+    }
-+
-+    return 0;
-+}
-+
-+static int
-+ar6000_ioctl_set_wmm(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_SET_WMM_CMD cmd;
-+    A_STATUS ret;
-+
-+    if ((dev->flags & IFF_UP) != IFF_UP) {
-+        return -EIO;
-+    }
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, (char *)((unsigned int*)rq->ifr_data + 1),
-+                                sizeof(cmd)))
-+    {
-+        return -EFAULT;
-+    }
-+
-+    if (cmd.status == WMI_WMM_ENABLED) {
-+        ar->arWmmEnabled = TRUE;
-+    } else {
-+        ar->arWmmEnabled = FALSE;
-+    }
-+
-+    ret = wmi_set_wmm_cmd(ar->arWmi, cmd.status);
-+
-+    switch (ret) {
-+        case A_OK:
-+            return 0;
-+        case A_EBUSY :
-+            return -EBUSY;
-+        case A_NO_MEMORY:
-+            return -ENOMEM;
-+        case A_EINVAL:
-+        default:
-+            return -EFAULT;
-+    }
-+}
-+
-+static int
-+ar6000_ioctl_set_txop(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_SET_WMM_TXOP_CMD cmd;
-+    A_STATUS ret;
-+
-+    if ((dev->flags & IFF_UP) != IFF_UP) {
-+        return -EIO;
-+    }
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, (char *)((unsigned int*)rq->ifr_data + 1),
-+                                sizeof(cmd)))
-+    {
-+        return -EFAULT;
-+    }
-+
-+    ret = wmi_set_wmm_txop(ar->arWmi, cmd.txopEnable);
-+
-+    switch (ret) {
-+        case A_OK:
-+            return 0;
-+        case A_EBUSY :
-+            return -EBUSY;
-+        case A_NO_MEMORY:
-+            return -ENOMEM;
-+        case A_EINVAL:
-+        default:
-+            return -EFAULT;
-+    }
-+}
-+
-+static int
-+ar6000_ioctl_get_rd(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    A_STATUS ret = 0;
-+
-+    if ((dev->flags & IFF_UP) != IFF_UP || ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if(copy_to_user((char *)((unsigned int*)rq->ifr_data + 1),
-+                            &ar->arRegCode, sizeof(ar->arRegCode)))
-+        ret = -EFAULT;
-+
-+    return ret;
-+}
-+
-+
-+/* Get power mode command */
-+static int
-+ar6000_ioctl_get_power_mode(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_POWER_MODE_CMD power_mode;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    power_mode.powerMode = wmi_get_power_mode_cmd(ar->arWmi);
-+    if (copy_to_user(rq->ifr_data, &power_mode, sizeof(WMI_POWER_MODE_CMD))) {
-+        ret = -EFAULT;
-+    }
-+
-+    return ret;
-+}
-+
-+
-+static int
-+ar6000_ioctl_set_channelParams(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_CHANNEL_PARAMS_CMD cmd, *cmdp;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+
-+    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    if (cmd.numChannels > 1) {
-+        cmdp = A_MALLOC(130);
-+        if (copy_from_user(cmdp, rq->ifr_data,
-+                           sizeof (*cmdp) +
-+                           ((cmd.numChannels - 1) * sizeof(A_UINT16))))
-+        {
-+            kfree(cmdp);
-+            return -EFAULT;
-+        }
-+    } else {
-+        cmdp = &cmd;
-+    }
-+
-+    if ((ar->arPhyCapability == WMI_11G_CAPABILITY) &&
-+        ((cmdp->phyMode == WMI_11A_MODE) || (cmdp->phyMode == WMI_11AG_MODE)))
-+    {
-+        ret = -EINVAL;
-+    }
-+
-+    if (!ret &&
-+        (wmi_set_channelParams_cmd(ar->arWmi, cmdp->scanParam, cmdp->phyMode,
-+                                   cmdp->numChannels, cmdp->channelList)
-+         != A_OK))
-+    {
-+        ret = -EIO;
-+    }
-+
-+    if (cmd.numChannels > 1) {
-+        kfree(cmdp);
-+    }
-+
-+    return ret;
-+}
-+
-+static int
-+ar6000_ioctl_set_snr_threshold(struct net_device *dev, struct ifreq *rq)
-+{
-+
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_SNR_THRESHOLD_PARAMS_CMD cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    if( wmi_set_snr_threshold_params(ar->arWmi, &cmd) != A_OK ) {
-+        ret = -EIO;
-+    }
-+
-+    return ret;
-+}
-+
-+static int
-+ar6000_ioctl_set_rssi_threshold(struct net_device *dev, struct ifreq *rq)
-+{
-+#define SWAP_THOLD(thold1, thold2) do { \
-+    USER_RSSI_THOLD tmpThold;           \
-+    tmpThold.tag = thold1.tag;          \
-+    tmpThold.rssi = thold1.rssi;        \
-+    thold1.tag = thold2.tag;            \
-+    thold1.rssi = thold2.rssi;          \
-+    thold2.tag = tmpThold.tag;          \
-+    thold2.rssi = tmpThold.rssi;        \
-+} while (0)
-+
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_RSSI_THRESHOLD_PARAMS_CMD cmd;
-+    USER_RSSI_PARAMS rssiParams;
-+    A_INT32 i, j;
-+
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user((char *)&rssiParams, (char *)((unsigned int *)rq->ifr_data + 1), sizeof(USER_RSSI_PARAMS))) {
-+        return -EFAULT;
-+    }
-+    cmd.weight = rssiParams.weight;
-+    cmd.pollTime = rssiParams.pollTime;
-+
-+    A_MEMCPY(rssi_map, &rssiParams.tholds, sizeof(rssi_map));
-+    /*
-+     *  only 6 elements, so use bubble sorting, in ascending order
-+     */
-+    for (i = 5; i > 0; i--) {
-+        for (j = 0; j < i; j++) { /* above tholds */
-+            if (rssi_map[j+1].rssi < rssi_map[j].rssi) {
-+                SWAP_THOLD(rssi_map[j+1], rssi_map[j]);
-+            } else if (rssi_map[j+1].rssi == rssi_map[j].rssi) {
-+                return EFAULT;
-+            }
-+        }
-+    }
-+    for (i = 11; i > 6; i--) {
-+        for (j = 6; j < i; j++) { /* below tholds */
-+            if (rssi_map[j+1].rssi < rssi_map[j].rssi) {
-+                SWAP_THOLD(rssi_map[j+1], rssi_map[j]);
-+            } else if (rssi_map[j+1].rssi == rssi_map[j].rssi) {
-+                return EFAULT;
-+            }
-+        }
-+    }
-+
-+#ifdef DEBUG
-+    for (i = 0; i < 12; i++) {
-+        AR_DEBUG2_PRINTF("thold[%d].tag: %d, thold[%d].rssi: %d \n",
-+                i, rssi_map[i].tag, i, rssi_map[i].rssi);
-+    }
-+#endif
-+    cmd.thresholdAbove1_Val = rssi_map[0].rssi;
-+    cmd.thresholdAbove2_Val = rssi_map[1].rssi;
-+    cmd.thresholdAbove3_Val = rssi_map[2].rssi;
-+    cmd.thresholdAbove4_Val = rssi_map[3].rssi;
-+    cmd.thresholdAbove5_Val = rssi_map[4].rssi;
-+    cmd.thresholdAbove6_Val = rssi_map[5].rssi;
-+    cmd.thresholdBelow1_Val = rssi_map[6].rssi;
-+    cmd.thresholdBelow2_Val = rssi_map[7].rssi;
-+    cmd.thresholdBelow3_Val = rssi_map[8].rssi;
-+    cmd.thresholdBelow4_Val = rssi_map[9].rssi;
-+    cmd.thresholdBelow5_Val = rssi_map[10].rssi;
-+    cmd.thresholdBelow6_Val = rssi_map[11].rssi;
-+
-+    if( wmi_set_rssi_threshold_params(ar->arWmi, &cmd) != A_OK ) {
-+        ret = -EIO;
-+    }
-+
-+    return ret;
-+}
-+
-+static int
-+ar6000_ioctl_set_lq_threshold(struct net_device *dev, struct ifreq *rq)
-+{
-+
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_LQ_THRESHOLD_PARAMS_CMD cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, (char *)((unsigned int *)rq->ifr_data + 1), sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    if( wmi_set_lq_threshold_params(ar->arWmi, &cmd) != A_OK ) {
-+        ret = -EIO;
-+    }
-+
-+    return ret;
-+}
-+
-+
-+static int
-+ar6000_ioctl_set_probedSsid(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_PROBED_SSID_CMD cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    if (wmi_probedSsid_cmd(ar->arWmi, cmd.entryIndex, cmd.flag, cmd.ssidLength,
-+                                  cmd.ssid) != A_OK)
-+    {
-+        ret = -EIO;
-+    }
-+
-+    return ret;
-+}
-+
-+static int
-+ar6000_ioctl_set_badAp(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_ADD_BAD_AP_CMD cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+
-+    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    if (cmd.badApIndex > WMI_MAX_BAD_AP_INDEX) {
-+        return -EIO;
-+    }
-+
-+    if (A_MEMCMP(cmd.bssid, null_mac, AR6000_ETH_ADDR_LEN) == 0) {
-+        /*
-+         * This is a delete badAP.
-+         */
-+        if (wmi_deleteBadAp_cmd(ar->arWmi, cmd.badApIndex) != A_OK) {
-+            ret = -EIO;
-+        }
-+    } else {
-+        if (wmi_addBadAp_cmd(ar->arWmi, cmd.badApIndex, cmd.bssid) != A_OK) {
-+            ret = -EIO;
-+        }
-+    }
-+
-+    return ret;
-+}
-+
-+static int
-+ar6000_ioctl_create_qos(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_CREATE_PSTREAM_CMD cmd;
-+    A_STATUS ret;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+
-+    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    ret = wmi_verify_tspec_params(&cmd, tspecCompliance);
-+    if (ret == A_OK)
-+        ret = wmi_create_pstream_cmd(ar->arWmi, &cmd);
-+
-+    switch (ret) {
-+        case A_OK:
-+            return 0;
-+        case A_EBUSY :
-+            return -EBUSY;
-+        case A_NO_MEMORY:
-+            return -ENOMEM;
-+        case A_EINVAL:
-+        default:
-+            return -EFAULT;
-+    }
-+}
-+
-+static int
-+ar6000_ioctl_delete_qos(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_DELETE_PSTREAM_CMD cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    ret = wmi_delete_pstream_cmd(ar->arWmi, cmd.trafficClass, cmd.tsid);
-+
-+    switch (ret) {
-+        case A_OK:
-+            return 0;
-+        case A_EBUSY :
-+            return -EBUSY;
-+        case A_NO_MEMORY:
-+            return -ENOMEM;
-+        case A_EINVAL:
-+        default:
-+            return -EFAULT;
-+    }
-+}
-+
-+static int
-+ar6000_ioctl_get_qos_queue(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    struct ar6000_queuereq qreq;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if( copy_from_user(&qreq, rq->ifr_data,
-+                  sizeof(struct ar6000_queuereq)))
-+        return -EFAULT;
-+
-+    qreq.activeTsids = wmi_get_mapped_qos_queue(ar->arWmi, qreq.trafficClass);
-+
-+    if (copy_to_user(rq->ifr_data, &qreq,
-+                 sizeof(struct ar6000_queuereq)))
-+    {
-+        ret = -EFAULT;
-+    }
-+
-+    return ret;
-+}
-+
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+static A_STATUS
-+ar6000_ioctl_tcmd_get_rx_report(struct net_device *dev,
-+                                 struct ifreq *rq, A_UINT8 *data, A_UINT32 len)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    A_UINT32    buf[2];
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (down_interruptible(&ar->arSem)) {
-+        return -ERESTARTSYS;
-+    }
-+    ar->tcmdRxReport = 0;
-+    if (wmi_test_cmd(ar->arWmi, data, len) != A_OK) {
-+        up(&ar->arSem);
-+        return -EIO;
-+    }
-+
-+    wait_event_interruptible_timeout(arEvent, ar->tcmdRxReport != 0, wmitimeout * HZ);
-+
-+    if (signal_pending(current)) {
-+        ret = -EINTR;
-+    }
-+
-+    buf[0] = ar->tcmdRxTotalPkt;
-+    buf[1] = ar->tcmdRxRssi;
-+    if (!ret && copy_to_user(rq->ifr_data, buf, sizeof(buf))) {
-+        ret = -EFAULT;
-+    }
-+
-+    up(&ar->arSem);
-+
-+    return ret;
-+}
-+
-+void
-+ar6000_tcmd_rx_report_event(void *devt, A_UINT8 * results, int len)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)devt;
-+    TCMD_CONT_RX * rx_rep = (TCMD_CONT_RX *)results;
-+
-+    ar->tcmdRxTotalPkt = rx_rep->u.report.totalPkt;
-+    ar->tcmdRxRssi = rx_rep->u.report.rssiInDBm;
-+    ar->tcmdRxReport = 1;
-+
-+    wake_up(&arEvent);
-+}
-+#endif /* CONFIG_HOST_TCMD_SUPPORT*/
-+
-+static int
-+ar6000_ioctl_set_error_report_bitmask(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_TARGET_ERROR_REPORT_BITMASK cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    ret = wmi_set_error_report_bitmask(ar->arWmi, cmd.bitmask);
-+
-+    return  (ret==0 ? ret : -EINVAL);
-+}
-+
-+static int
-+ar6000_clear_target_stats(struct net_device *dev)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    TARGET_STATS *pStats = &ar->arTargetStats;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+       return -EIO;
-+    }
-+    AR6000_SPIN_LOCK(&ar->arLock, 0);
-+    A_MEMZERO(pStats, sizeof(TARGET_STATS));
-+    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+    return ret;
-+}
-+
-+static int
-+ar6000_ioctl_get_target_stats(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    TARGET_STATS_CMD cmd;
-+    TARGET_STATS *pStats = &ar->arTargetStats;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+    if (down_interruptible(&ar->arSem)) {
-+        return -ERESTARTSYS;
-+    }
-+
-+    ar->statsUpdatePending = TRUE;
-+
-+    if(wmi_get_stats_cmd(ar->arWmi) != A_OK) {
-+        up(&ar->arSem);
-+        return -EIO;
-+    }
-+
-+    wait_event_interruptible_timeout(arEvent, ar->statsUpdatePending == FALSE, wmitimeout * HZ);
-+
-+    if (signal_pending(current)) {
-+        ret = -EINTR;
-+    }
-+
-+    if (!ret && copy_to_user(rq->ifr_data, pStats, sizeof(*pStats))) {
-+        ret = -EFAULT;
-+    }
-+
-+    if (cmd.clearStats == 1) {
-+        ret = ar6000_clear_target_stats(dev);
-+    }
-+
-+    up(&ar->arSem);
-+
-+    return ret;
-+}
-+
-+static int
-+ar6000_ioctl_set_access_params(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_SET_ACCESS_PARAMS_CMD cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    if (wmi_set_access_params_cmd(ar->arWmi, cmd.txop, cmd.eCWmin, cmd.eCWmax,
-+                                  cmd.aifsn) == A_OK)
-+    {
-+        ret = 0;
-+    } else {
-+        ret = -EINVAL;
-+    }
-+
-+    return (ret);
-+}
-+
-+static int
-+ar6000_ioctl_set_disconnect_timeout(struct net_device *dev, struct ifreq *rq)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_DISC_TIMEOUT_CMD cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, rq->ifr_data, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    if (wmi_disctimeout_cmd(ar->arWmi, cmd.disconnectTimeout) == A_OK)
-+    {
-+        ret = 0;
-+    } else {
-+        ret = -EINVAL;
-+    }
-+
-+    return (ret);
-+}
-+
-+static int
-+ar6000_xioctl_set_voice_pkt_size(struct net_device *dev, char * userdata)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_SET_VOICE_PKT_SIZE_CMD cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, userdata, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    if (wmi_set_voice_pkt_size_cmd(ar->arWmi, cmd.voicePktSize) == A_OK)
-+    {
-+        ret = 0;
-+    } else {
-+        ret = -EINVAL;
-+    }
-+
-+
-+    return (ret);
-+}
-+
-+static int
-+ar6000_xioctl_set_max_sp_len(struct net_device *dev, char * userdata)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_SET_MAX_SP_LEN_CMD cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, userdata, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    if (wmi_set_max_sp_len_cmd(ar->arWmi, cmd.maxSPLen) == A_OK)
-+    {
-+        ret = 0;
-+    } else {
-+        ret = -EINVAL;
-+    }
-+
-+    return (ret);
-+}
-+
-+
-+static int
-+ar6000_xioctl_set_bt_status_cmd(struct net_device *dev, char * userdata)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_SET_BT_STATUS_CMD cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, userdata, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    if (wmi_set_bt_status_cmd(ar->arWmi, cmd.streamType, cmd.status) == A_OK)
-+    {
-+        ret = 0;
-+    } else {
-+        ret = -EINVAL;
-+    }
-+
-+    return (ret);
-+}
-+
-+static int
-+ar6000_xioctl_set_bt_params_cmd(struct net_device *dev, char * userdata)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    WMI_SET_BT_PARAMS_CMD cmd;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (copy_from_user(&cmd, userdata, sizeof(cmd))) {
-+        return -EFAULT;
-+    }
-+
-+    if (wmi_set_bt_params_cmd(ar->arWmi, &cmd) == A_OK)
-+    {
-+        ret = 0;
-+    } else {
-+        ret = -EINVAL;
-+    }
-+
-+    return (ret);
-+}
-+
-+#ifdef CONFIG_HOST_GPIO_SUPPORT
-+struct ar6000_gpio_intr_wait_cmd_s  gpio_intr_results;
-+/* gpio_reg_results and gpio_data_available are protected by arSem */
-+static struct ar6000_gpio_register_cmd_s gpio_reg_results;
-+static A_BOOL gpio_data_available; /* Requested GPIO data available */
-+static A_BOOL gpio_intr_available; /* GPIO interrupt info available */
-+static A_BOOL gpio_ack_received;   /* GPIO ack was received */
-+
-+/* Host-side initialization for General Purpose I/O support */
-+void ar6000_gpio_init(void)
-+{
-+    gpio_intr_available = FALSE;
-+    gpio_data_available = FALSE;
-+    gpio_ack_received   = FALSE;
-+}
-+
-+/*
-+ * Called when a GPIO interrupt is received from the Target.
-+ * intr_values shows which GPIO pins have interrupted.
-+ * input_values shows a recent value of GPIO pins.
-+ */
-+void
-+ar6000_gpio_intr_rx(A_UINT32 intr_mask, A_UINT32 input_values)
-+{
-+    gpio_intr_results.intr_mask = intr_mask;
-+    gpio_intr_results.input_values = input_values;
-+    *((volatile A_BOOL *)&gpio_intr_available) = TRUE;
-+    wake_up(&arEvent);
-+}
-+
-+/*
-+ * This is called when a response is received from the Target
-+ * for a previous or ar6000_gpio_input_get or ar6000_gpio_register_get
-+ * call.
-+ */
-+void
-+ar6000_gpio_data_rx(A_UINT32 reg_id, A_UINT32 value)
-+{
-+    gpio_reg_results.gpioreg_id = reg_id;
-+    gpio_reg_results.value = value;
-+    *((volatile A_BOOL *)&gpio_data_available) = TRUE;
-+    wake_up(&arEvent);
-+}
-+
-+/*
-+ * This is called when an acknowledgement is received from the Target
-+ * for a previous or ar6000_gpio_output_set or ar6000_gpio_register_set
-+ * call.
-+ */
-+void
-+ar6000_gpio_ack_rx(void)
-+{
-+    gpio_ack_received = TRUE;
-+    wake_up(&arEvent);
-+}
-+
-+A_STATUS
-+ar6000_gpio_output_set(struct net_device *dev,
-+                       A_UINT32 set_mask,
-+                       A_UINT32 clear_mask,
-+                       A_UINT32 enable_mask,
-+                       A_UINT32 disable_mask)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    gpio_ack_received = FALSE;
-+    return wmi_gpio_output_set(ar->arWmi,
-+                set_mask, clear_mask, enable_mask, disable_mask);
-+}
-+
-+static A_STATUS
-+ar6000_gpio_input_get(struct net_device *dev)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    *((volatile A_BOOL *)&gpio_data_available) = FALSE;
-+    return wmi_gpio_input_get(ar->arWmi);
-+}
-+
-+static A_STATUS
-+ar6000_gpio_register_set(struct net_device *dev,
-+                         A_UINT32 gpioreg_id,
-+                         A_UINT32 value)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    gpio_ack_received = FALSE;
-+    return wmi_gpio_register_set(ar->arWmi, gpioreg_id, value);
-+}
-+
-+static A_STATUS
-+ar6000_gpio_register_get(struct net_device *dev,
-+                         A_UINT32 gpioreg_id)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    *((volatile A_BOOL *)&gpio_data_available) = FALSE;
-+    return wmi_gpio_register_get(ar->arWmi, gpioreg_id);
-+}
-+
-+static A_STATUS
-+ar6000_gpio_intr_ack(struct net_device *dev,
-+                     A_UINT32 ack_mask)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    gpio_intr_available = FALSE;
-+    return wmi_gpio_intr_ack(ar->arWmi, ack_mask);
-+}
-+#endif /* CONFIG_HOST_GPIO_SUPPORT */
-+
-+int ar6000_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    HIF_DEVICE *hifDevice = ar->arHifDevice;
-+    int ret, param, param2;
-+    unsigned int address = 0;
-+    unsigned int length = 0;
-+    unsigned char *buffer;
-+    char *userdata;
-+    A_UINT32 connectCtrlFlags;
-+
-+
-+    static WMI_SCAN_PARAMS_CMD scParams = {0, 0, 0, 0, 0,
-+                                           WMI_SHORTSCANRATIO_DEFAULT,
-+                                           DEFAULT_SCAN_CTRL_FLAGS,
-+                                           0};
-+    WMI_SET_AKMP_PARAMS_CMD  akmpParams;
-+    WMI_SET_PMKID_LIST_CMD   pmkidInfo;
-+
-+    if (cmd == AR6000_IOCTL_EXTENDED)
-+    {
-+        /*
-+         * This allows for many more wireless ioctls than would otherwise
-+         * be available.  Applications embed the actual ioctl command in
-+         * the first word of the parameter block, and use the command
-+         * AR6000_IOCTL_EXTENDED_CMD on the ioctl call.
-+         */
-+        get_user(cmd, (int *)rq->ifr_data);
-+        userdata = (char *)(((unsigned int *)rq->ifr_data)+1);
-+    }
-+    else
-+    {
-+        userdata = (char *)rq->ifr_data;
-+    }
-+
-+    if ((ar->arWlanState == WLAN_DISABLED) &&
-+        ((cmd != AR6000_XIOCTRL_WMI_SET_WLAN_STATE) &&
-+         (cmd != AR6000_XIOCTL_DIAG_READ) &&
-+         (cmd != AR6000_XIOCTL_DIAG_WRITE)))
-+    {
-+        return -EIO;
-+    }
-+
-+    ret = 0;
-+    switch(cmd)
-+    {
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+        case AR6000_XIOCTL_TCMD_CONT_TX:
-+            {
-+                TCMD_CONT_TX txCmd;
-+
-+                if (ar->tcmdPm == TCMD_PM_SLEEP) {
-+                    A_PRINTF("Can NOT send tx tcmd when target is asleep! \n");
-+                    return -EFAULT;
-+                }
-+
-+                if(copy_from_user(&txCmd, userdata, sizeof(TCMD_CONT_TX)))
-+                    return -EFAULT;
-+                wmi_test_cmd(ar->arWmi,(A_UINT8 *)&txCmd, sizeof(TCMD_CONT_TX));
-+            }
-+            break;
-+        case AR6000_XIOCTL_TCMD_CONT_RX:
-+            {
-+                TCMD_CONT_RX rxCmd;
-+
-+                if (ar->tcmdPm == TCMD_PM_SLEEP) {
-+                    A_PRINTF("Can NOT send rx tcmd when target is asleep! \n");
-+                    return -EFAULT;
-+                }
-+                if(copy_from_user(&rxCmd, userdata, sizeof(TCMD_CONT_RX)))
-+                    return -EFAULT;
-+                switch(rxCmd.act)
-+                {
-+                    case TCMD_CONT_RX_PROMIS:
-+                    case TCMD_CONT_RX_FILTER:
-+                    case TCMD_CONT_RX_SETMAC:
-+                         wmi_test_cmd(ar->arWmi,(A_UINT8 *)&rxCmd,
-+                                                sizeof(TCMD_CONT_RX));
-+                         break;
-+                    case TCMD_CONT_RX_REPORT:
-+                         ar6000_ioctl_tcmd_get_rx_report(dev, rq,
-+                         (A_UINT8 *)&rxCmd, sizeof(TCMD_CONT_RX));
-+                         break;
-+                    default:
-+                         A_PRINTF("Unknown Cont Rx mode: %d\n",rxCmd.act);
-+                         return -EINVAL;
-+                }
-+            }
-+            break;
-+        case AR6000_XIOCTL_TCMD_PM:
-+            {
-+                TCMD_PM pmCmd;
-+
-+                if(copy_from_user(&pmCmd, userdata, sizeof(TCMD_PM)))
-+                    return -EFAULT;
-+                ar->tcmdPm = pmCmd.mode;
-+                wmi_test_cmd(ar->arWmi, (A_UINT8*)&pmCmd, sizeof(TCMD_PM));
-+            }
-+            break;
-+#endif /* CONFIG_HOST_TCMD_SUPPORT */
-+
-+        case AR6000_XIOCTL_BMI_DONE:
-+            if(bmienable)
-+            {
-+                ret = ar6000_init(dev);
-+            }
-+            else
-+            {
-+                ret = BMIDone(hifDevice);
-+            }
-+            break;
-+
-+        case AR6000_XIOCTL_BMI_READ_MEMORY:
-+            get_user(address, (unsigned int *)userdata);
-+            get_user(length, (unsigned int *)userdata + 1);
-+            AR_DEBUG_PRINTF("Read Memory (address: 0x%x, length: %d)\n",
-+                             address, length);
-+            if ((buffer = (unsigned char *)A_MALLOC(length)) != NULL) {
-+                A_MEMZERO(buffer, length);
-+                ret = BMIReadMemory(hifDevice, address, buffer, length);
-+                if (copy_to_user(rq->ifr_data, buffer, length)) {
-+                    ret = -EFAULT;
-+                }
-+                A_FREE(buffer);
-+            } else {
-+                ret = -ENOMEM;
-+            }
-+            break;
-+
-+        case AR6000_XIOCTL_BMI_WRITE_MEMORY:
-+            get_user(address, (unsigned int *)userdata);
-+            get_user(length, (unsigned int *)userdata + 1);
-+            AR_DEBUG_PRINTF("Write Memory (address: 0x%x, length: %d)\n",
-+                             address, length);
-+            if ((buffer = (unsigned char *)A_MALLOC(length)) != NULL) {
-+                A_MEMZERO(buffer, length);
-+                if (copy_from_user(buffer, &userdata[sizeof(address) +
-+                                   sizeof(length)], length))
-+                {
-+                    ret = -EFAULT;
-+                } else {
-+                    ret = BMIWriteMemory(hifDevice, address, buffer, length);
-+                }
-+                A_FREE(buffer);
-+            } else {
-+                ret = -ENOMEM;
-+            }
-+            break;
-+
-+        case AR6000_XIOCTL_BMI_TEST:
-+           AR_DEBUG_PRINTF("No longer supported\n");
-+           ret = -EOPNOTSUPP;
-+           break;
-+
-+        case AR6000_XIOCTL_BMI_EXECUTE:
-+            get_user(address, (unsigned int *)userdata);
-+            get_user(param, (unsigned int *)userdata + 1);
-+            AR_DEBUG_PRINTF("Execute (address: 0x%x, param: %d)\n",
-+                             address, param);
-+            ret = BMIExecute(hifDevice, address, &param);
-+            put_user(param, (unsigned int *)rq->ifr_data); /* return value */
-+            break;
-+
-+        case AR6000_XIOCTL_BMI_SET_APP_START:
-+            get_user(address, (unsigned int *)userdata);
-+            AR_DEBUG_PRINTF("Set App Start (address: 0x%x)\n", address);
-+            ret = BMISetAppStart(hifDevice, address);
-+            break;
-+
-+        case AR6000_XIOCTL_BMI_READ_SOC_REGISTER:
-+            get_user(address, (unsigned int *)userdata);
-+            ret = BMIReadSOCRegister(hifDevice, address, &param);
-+            put_user(param, (unsigned int *)rq->ifr_data); /* return value */
-+            break;
-+
-+        case AR6000_XIOCTL_BMI_WRITE_SOC_REGISTER:
-+            get_user(address, (unsigned int *)userdata);
-+            get_user(param, (unsigned int *)userdata + 1);
-+            ret = BMIWriteSOCRegister(hifDevice, address, param);
-+            break;
-+
-+#ifdef HTC_RAW_INTERFACE
-+        case AR6000_XIOCTL_HTC_RAW_OPEN:
-+            ret = A_OK;
-+            if (!arRawIfEnabled(ar)) {
-+                /* make sure block size is set in case the target was reset since last
-+                  * BMI phase (i.e. flashup downloads) */
-+                ret = ar6000_SetHTCBlockSize(ar);
-+                if (A_FAILED(ret)) {
-+                    break;
-+                }
-+                /* Terminate the BMI phase */
-+                ret = BMIDone(hifDevice);
-+                if (ret == A_OK) {
-+                    ret = ar6000_htc_raw_open(ar);
-+                }
-+            }
-+            break;
-+
-+        case AR6000_XIOCTL_HTC_RAW_CLOSE:
-+            if (arRawIfEnabled(ar)) {
-+                ret = ar6000_htc_raw_close(ar);
-+                arRawIfEnabled(ar) = FALSE;
-+            } else {
-+                ret = A_ERROR;
-+            }
-+            break;
-+
-+        case AR6000_XIOCTL_HTC_RAW_READ:
-+            if (arRawIfEnabled(ar)) {
-+                unsigned int streamID;
-+                get_user(streamID, (unsigned int *)userdata);
-+                get_user(length, (unsigned int *)userdata + 1);
-+                buffer = rq->ifr_data + sizeof(length);
-+                ret = ar6000_htc_raw_read(ar, (HTC_RAW_STREAM_ID)streamID,
-+                                          buffer, length);
-+                put_user(ret, (unsigned int *)rq->ifr_data);
-+            } else {
-+                ret = A_ERROR;
-+            }
-+            break;
-+
-+        case AR6000_XIOCTL_HTC_RAW_WRITE:
-+            if (arRawIfEnabled(ar)) {
-+                unsigned int streamID;
-+                get_user(streamID, (unsigned int *)userdata);
-+                get_user(length, (unsigned int *)userdata + 1);
-+                buffer = userdata + sizeof(streamID) + sizeof(length);
-+                ret = ar6000_htc_raw_write(ar, (HTC_RAW_STREAM_ID)streamID,
-+                                           buffer, length);
-+                put_user(ret, (unsigned int *)rq->ifr_data);
-+            } else {
-+                ret = A_ERROR;
-+            }
-+            break;
-+#endif /* HTC_RAW_INTERFACE */
-+
-+        case AR6000_IOCTL_WMI_GETREV:
-+        {
-+            if (copy_to_user(rq->ifr_data, &ar->arVersion,
-+                             sizeof(ar->arVersion)))
-+            {
-+                ret = -EFAULT;
-+            }
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SETPWR:
-+        {
-+            WMI_POWER_MODE_CMD pwrModeCmd;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&pwrModeCmd, userdata,
-+                                   sizeof(pwrModeCmd)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_powermode_cmd(ar->arWmi, pwrModeCmd.powerMode)
-+                       != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SET_IBSS_PM_CAPS:
-+        {
-+            WMI_IBSS_PM_CAPS_CMD ibssPmCaps;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&ibssPmCaps, userdata,
-+                                   sizeof(ibssPmCaps)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_ibsspmcaps_cmd(ar->arWmi, ibssPmCaps.power_saving, ibssPmCaps.ttl,
-+                    ibssPmCaps.atim_windows, ibssPmCaps.timeout_value) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+                AR6000_SPIN_LOCK(&ar->arLock, 0);
-+                ar->arIbssPsEnable = ibssPmCaps.power_saving;
-+                AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+            }
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SET_PMPARAMS:
-+        {
-+            WMI_POWER_PARAMS_CMD pmParams;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&pmParams, userdata,
-+                                      sizeof(pmParams)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_pmparams_cmd(ar->arWmi, pmParams.idle_period,
-+                                     pmParams.pspoll_number,
-+                                     pmParams.dtim_policy) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SETSCAN:
-+        {
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&scParams, userdata,
-+                                      sizeof(scParams)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (CAN_SCAN_IN_CONNECT(scParams.scanCtrlFlags)) {
-+                    ar->arSkipScan = FALSE;
-+                } else {
-+                    ar->arSkipScan = TRUE;
-+                }
-+
-+                if (wmi_scanparams_cmd(ar->arWmi, scParams.fg_start_period,
-+                                       scParams.fg_end_period,
-+                                       scParams.bg_period,
-+                                       scParams.minact_chdwell_time,
-+                                       scParams.maxact_chdwell_time,
-+                                       scParams.pas_chdwell_time,
-+                                       scParams.shortScanRatio,
-+                                       scParams.scanCtrlFlags,
-+                                       scParams.max_dfsch_act_time) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SETLISTENINT:
-+        {
-+            WMI_LISTEN_INT_CMD listenCmd;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&listenCmd, userdata,
-+                                      sizeof(listenCmd)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                    if (wmi_listeninterval_cmd(ar->arWmi, listenCmd.listenInterval, listenCmd.numBeacons) != A_OK) {
-+                        ret = -EIO;
-+                    } else {
-+                        AR6000_SPIN_LOCK(&ar->arLock, 0);
-+                        ar->arListenInterval = param;
-+                        AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+                    }
-+
-+                }
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SET_BMISS_TIME:
-+        {
-+            WMI_BMISS_TIME_CMD bmissCmd;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&bmissCmd, userdata,
-+                                      sizeof(bmissCmd)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_bmisstime_cmd(ar->arWmi, bmissCmd.bmissTime, bmissCmd.numBeacons) != A_OK) {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SETBSSFILTER:
-+        {
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else {
-+
-+                get_user(param, (unsigned char *)userdata);
-+                get_user(param2, (unsigned int *)(userdata + 1));
-+              printk("SETBSSFILTER: filter 0x%x, mask: 0x%x\n", param, param2);
-+                if (wmi_bssfilter_cmd(ar->arWmi, param, param2) != A_OK) {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SET_SNRTHRESHOLD:
-+        {
-+            ret = ar6000_ioctl_set_snr_threshold(dev, rq);
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_RSSITHRESHOLD:
-+        {
-+            ret = ar6000_ioctl_set_rssi_threshold(dev, rq);
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_CLR_RSSISNR:
-+        {
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            }
-+            ret = wmi_clr_rssi_snr(ar->arWmi);
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_LQTHRESHOLD:
-+        {
-+            ret = ar6000_ioctl_set_lq_threshold(dev, rq);
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_LPREAMBLE:
-+        {
-+            WMI_SET_LPREAMBLE_CMD setLpreambleCmd;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&setLpreambleCmd, userdata,
-+                                   sizeof(setLpreambleCmd)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_set_lpreamble_cmd(ar->arWmi, setLpreambleCmd.status)
-+                       != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_RTS:
-+        {
-+            WMI_SET_RTS_CMD rtsCmd;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&rtsCmd, userdata,
-+                                   sizeof(rtsCmd)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_set_rts_cmd(ar->arWmi, rtsCmd.threshold)
-+                       != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_WMM:
-+        {
-+            ret = ar6000_ioctl_set_wmm(dev, rq);
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_TXOP:
-+        {
-+            ret = ar6000_ioctl_set_txop(dev, rq);
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_GET_RD:
-+        {
-+            ret = ar6000_ioctl_get_rd(dev, rq);
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SET_CHANNELPARAMS:
-+        {
-+            ret = ar6000_ioctl_set_channelParams(dev, rq);
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SET_PROBEDSSID:
-+        {
-+            ret = ar6000_ioctl_set_probedSsid(dev, rq);
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SET_BADAP:
-+        {
-+            ret = ar6000_ioctl_set_badAp(dev, rq);
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_CREATE_QOS:
-+        {
-+            ret = ar6000_ioctl_create_qos(dev, rq);
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_DELETE_QOS:
-+        {
-+            ret = ar6000_ioctl_delete_qos(dev, rq);
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_GET_QOS_QUEUE:
-+        {
-+            ret = ar6000_ioctl_get_qos_queue(dev, rq);
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_GET_TARGET_STATS:
-+        {
-+            ret = ar6000_ioctl_get_target_stats(dev, rq);
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SET_ERROR_REPORT_BITMASK:
-+        {
-+            ret = ar6000_ioctl_set_error_report_bitmask(dev, rq);
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SET_ASSOC_INFO:
-+        {
-+            WMI_SET_ASSOC_INFO_CMD cmd;
-+            A_UINT8 assocInfo[WMI_MAX_ASSOC_INFO_LEN];
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else {
-+                get_user(cmd.ieType, userdata);
-+                if (cmd.ieType >= WMI_MAX_ASSOC_INFO_TYPE) {
-+                    ret = -EIO;
-+                } else {
-+                    get_user(cmd.bufferSize, userdata + 1);
-+                    if (cmd.bufferSize > WMI_MAX_ASSOC_INFO_LEN) {
-+                        ret = -EFAULT;
-+                        break;
-+                    }
-+                    if (copy_from_user(assocInfo, userdata + 2,
-+                                       cmd.bufferSize))
-+                    {
-+                        ret = -EFAULT;
-+                    } else {
-+                        if (wmi_associnfo_cmd(ar->arWmi, cmd.ieType,
-+                                                 cmd.bufferSize,
-+                                                 assocInfo) != A_OK)
-+                        {
-+                            ret = -EIO;
-+                        }
-+                    }
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SET_ACCESS_PARAMS:
-+        {
-+            ret = ar6000_ioctl_set_access_params(dev, rq);
-+            break;
-+        }
-+        case AR6000_IOCTL_WMI_SET_DISC_TIMEOUT:
-+        {
-+            ret = ar6000_ioctl_set_disconnect_timeout(dev, rq);
-+            break;
-+        }
-+        case AR6000_XIOCTL_FORCE_TARGET_RESET:
-+        {
-+            if (ar->arHtcTarget)
-+            {
-+//                HTCForceReset(htcTarget);
-+            }
-+            else
-+            {
-+                AR_DEBUG_PRINTF("ar6000_ioctl cannot attempt reset.\n");
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_TARGET_INFO:
-+        case AR6000_XIOCTL_CHECK_TARGET_READY: /* backwards compatibility */
-+        {
-+            /* If we made it to here, then the Target exists and is ready. */
-+
-+            if (cmd == AR6000_XIOCTL_TARGET_INFO) {
-+                if (copy_to_user((A_UINT32 *)rq->ifr_data, &ar->arVersion.target_ver,
-+                                 sizeof(ar->arVersion.target_ver)))
-+                {
-+                    ret = -EFAULT;
-+                }
-+                if (copy_to_user(((A_UINT32 *)rq->ifr_data)+1, &ar->arTargetType,
-+                                 sizeof(ar->arTargetType)))
-+                {
-+                    ret = -EFAULT;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_HB_CHALLENGE_RESP_PARAMS:
-+        {
-+            WMI_SET_HB_CHALLENGE_RESP_PARAMS_CMD hbparam;
-+
-+            if (copy_from_user(&hbparam, userdata, sizeof(hbparam)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                AR6000_SPIN_LOCK(&ar->arLock, 0);
-+                /* Start a cyclic timer with the parameters provided. */
-+                if (hbparam.frequency) {
-+                    ar->arHBChallengeResp.frequency = hbparam.frequency;
-+                }
-+                if (hbparam.threshold) {
-+                    ar->arHBChallengeResp.missThres = hbparam.threshold;
-+                }
-+
-+                /* Delete the pending timer and start a new one */
-+                if (timer_pending(&ar->arHBChallengeResp.timer)) {
-+                    A_UNTIMEOUT(&ar->arHBChallengeResp.timer);
-+                }
-+                A_TIMEOUT_MS(&ar->arHBChallengeResp.timer, ar->arHBChallengeResp.frequency * 1000, 0);
-+                AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_GET_HB_CHALLENGE_RESP:
-+        {
-+            A_UINT32 cookie;
-+
-+            if (copy_from_user(&cookie, userdata, sizeof(cookie))) {
-+                return -EFAULT;
-+            }
-+
-+            /* Send the challenge on the control channel */
-+            if (wmi_get_challenge_resp_cmd(ar->arWmi, cookie, APP_HB_CHALLENGE) != A_OK) {
-+                return -EIO;
-+            }
-+            break;
-+        }
-+#ifdef USER_KEYS
-+        case AR6000_XIOCTL_USER_SETKEYS:
-+        {
-+
-+            ar->user_savedkeys_stat = USER_SAVEDKEYS_STAT_RUN;
-+
-+            if (copy_from_user(&ar->user_key_ctrl, userdata,
-+                               sizeof(ar->user_key_ctrl)))
-+            {
-+                return -EFAULT;
-+            }
-+
-+            A_PRINTF("ar6000 USER set key %x\n", ar->user_key_ctrl);
-+            break;
-+        }
-+#endif /* USER_KEYS */
-+
-+#ifdef CONFIG_HOST_GPIO_SUPPORT
-+        case AR6000_XIOCTL_GPIO_OUTPUT_SET:
-+        {
-+            struct ar6000_gpio_output_set_cmd_s gpio_output_set_cmd;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                return -EIO;
-+            }
-+            if (down_interruptible(&ar->arSem)) {
-+                return -ERESTARTSYS;
-+            }
-+
-+            if (copy_from_user(&gpio_output_set_cmd, userdata,
-+                                sizeof(gpio_output_set_cmd)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                ret = ar6000_gpio_output_set(dev,
-+                                             gpio_output_set_cmd.set_mask,
-+                                             gpio_output_set_cmd.clear_mask,
-+                                             gpio_output_set_cmd.enable_mask,
-+                                             gpio_output_set_cmd.disable_mask);
-+                if (ret != A_OK) {
-+                    ret = EIO;
-+                }
-+            }
-+            up(&ar->arSem);
-+            break;
-+        }
-+        case AR6000_XIOCTL_GPIO_INPUT_GET:
-+        {
-+            if (ar->arWmiReady == FALSE) {
-+                return -EIO;
-+            }
-+            if (down_interruptible(&ar->arSem)) {
-+                return -ERESTARTSYS;
-+            }
-+
-+            ret = ar6000_gpio_input_get(dev);
-+            if (ret != A_OK) {
-+                up(&ar->arSem);
-+                return -EIO;
-+            }
-+
-+            /* Wait for Target to respond. */
-+            wait_event_interruptible(arEvent, gpio_data_available);
-+            if (signal_pending(current)) {
-+                ret = -EINTR;
-+            } else {
-+                A_ASSERT(gpio_reg_results.gpioreg_id == GPIO_ID_NONE);
-+
-+                if (copy_to_user(userdata, &gpio_reg_results.value,
-+                                 sizeof(gpio_reg_results.value)))
-+                {
-+                    ret = -EFAULT;
-+                }
-+            }
-+            up(&ar->arSem);
-+            break;
-+        }
-+        case AR6000_XIOCTL_GPIO_REGISTER_SET:
-+        {
-+            struct ar6000_gpio_register_cmd_s gpio_register_cmd;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                return -EIO;
-+            }
-+            if (down_interruptible(&ar->arSem)) {
-+                return -ERESTARTSYS;
-+            }
-+
-+            if (copy_from_user(&gpio_register_cmd, userdata,
-+                                sizeof(gpio_register_cmd)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                ret = ar6000_gpio_register_set(dev,
-+                                               gpio_register_cmd.gpioreg_id,
-+                                               gpio_register_cmd.value);
-+                if (ret != A_OK) {
-+                    ret = EIO;
-+                }
-+
-+                /* Wait for acknowledgement from Target */
-+                wait_event_interruptible(arEvent, gpio_ack_received);
-+                if (signal_pending(current)) {
-+                    ret = -EINTR;
-+                }
-+            }
-+            up(&ar->arSem);
-+            break;
-+        }
-+        case AR6000_XIOCTL_GPIO_REGISTER_GET:
-+        {
-+            struct ar6000_gpio_register_cmd_s gpio_register_cmd;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                return -EIO;
-+            }
-+            if (down_interruptible(&ar->arSem)) {
-+                return -ERESTARTSYS;
-+            }
-+
-+            if (copy_from_user(&gpio_register_cmd, userdata,
-+                                sizeof(gpio_register_cmd)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                ret = ar6000_gpio_register_get(dev, gpio_register_cmd.gpioreg_id);
-+                if (ret != A_OK) {
-+                    up(&ar->arSem);
-+                    return -EIO;
-+                }
-+
-+                /* Wait for Target to respond. */
-+                wait_event_interruptible(arEvent, gpio_data_available);
-+                if (signal_pending(current)) {
-+                    ret = -EINTR;
-+                } else {
-+                    A_ASSERT(gpio_register_cmd.gpioreg_id == gpio_reg_results.gpioreg_id);
-+                    if (copy_to_user(userdata, &gpio_reg_results,
-+                                     sizeof(gpio_reg_results)))
-+                    {
-+                        ret = -EFAULT;
-+                    }
-+                }
-+            }
-+            up(&ar->arSem);
-+            break;
-+        }
-+        case AR6000_XIOCTL_GPIO_INTR_ACK:
-+        {
-+            struct ar6000_gpio_intr_ack_cmd_s gpio_intr_ack_cmd;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                return -EIO;
-+            }
-+            if (down_interruptible(&ar->arSem)) {
-+                return -ERESTARTSYS;
-+            }
-+
-+            if (copy_from_user(&gpio_intr_ack_cmd, userdata,
-+                                sizeof(gpio_intr_ack_cmd)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                ret = ar6000_gpio_intr_ack(dev, gpio_intr_ack_cmd.ack_mask);
-+                if (ret != A_OK) {
-+                    ret = EIO;
-+                }
-+            }
-+            up(&ar->arSem);
-+            break;
-+        }
-+        case AR6000_XIOCTL_GPIO_INTR_WAIT:
-+        {
-+            /* Wait for Target to report an interrupt. */
-+            dev_hold(dev);
-+            rtnl_unlock();
-+            wait_event_interruptible(arEvent, gpio_intr_available);
-+            rtnl_lock();
-+            __dev_put(dev);
-+
-+            if (signal_pending(current)) {
-+                ret = -EINTR;
-+            } else {
-+                if (copy_to_user(userdata, &gpio_intr_results,
-+                                 sizeof(gpio_intr_results)))
-+                {
-+                    ret = -EFAULT;
-+                }
-+            }
-+            break;
-+        }
-+#endif /* CONFIG_HOST_GPIO_SUPPORT */
-+
-+        case AR6000_XIOCTL_DBGLOG_CFG_MODULE:
-+        {
-+            struct ar6000_dbglog_module_config_s config;
-+
-+            if (copy_from_user(&config, userdata, sizeof(config))) {
-+                return -EFAULT;
-+            }
-+
-+            /* Send the challenge on the control channel */
-+            if (wmi_config_debug_module_cmd(ar->arWmi, config.mmask,
-+                                            config.tsr, config.rep,
-+                                            config.size, config.valid) != A_OK)
-+            {
-+                return -EIO;
-+            }
-+            break;
-+        }
-+
-+        case AR6000_XIOCTL_DBGLOG_GET_DEBUG_LOGS:
-+        {
-+            /* Send the challenge on the control channel */
-+            if (ar6000_dbglog_get_debug_logs(ar) != A_OK)
-+            {
-+                return -EIO;
-+            }
-+            break;
-+        }
-+
-+        case AR6000_XIOCTL_SET_ADHOC_BSSID:
-+        {
-+            WMI_SET_ADHOC_BSSID_CMD adhocBssid;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&adhocBssid, userdata,
-+                                      sizeof(adhocBssid)))
-+            {
-+                ret = -EFAULT;
-+            } else if (A_MEMCMP(adhocBssid.bssid, bcast_mac,
-+                                AR6000_ETH_ADDR_LEN) == 0)
-+            {
-+                ret = -EFAULT;
-+            } else {
-+
-+                A_MEMCPY(ar->arReqBssid, adhocBssid.bssid, sizeof(ar->arReqBssid));
-+        }
-+            break;
-+        }
-+
-+        case AR6000_XIOCTL_SET_OPT_MODE:
-+        {
-+        WMI_SET_OPT_MODE_CMD optModeCmd;
-+            AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&optModeCmd, userdata,
-+                                      sizeof(optModeCmd)))
-+            {
-+                ret = -EFAULT;
-+            } else if (ar->arConnected && optModeCmd.optMode == SPECIAL_ON) {
-+                ret = -EFAULT;
-+
-+            } else if (wmi_set_opt_mode_cmd(ar->arWmi, optModeCmd.optMode)
-+                       != A_OK)
-+            {
-+                ret = -EIO;
-+            }
-+            break;
-+        }
-+
-+        case AR6000_XIOCTL_OPT_SEND_FRAME:
-+        {
-+        WMI_OPT_TX_FRAME_CMD optTxFrmCmd;
-+            A_UINT8 data[MAX_OPT_DATA_LEN];
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&optTxFrmCmd, userdata,
-+                                      sizeof(optTxFrmCmd)))
-+            {
-+                ret = -EFAULT;
-+            } else if (copy_from_user(data,
-+                                      userdata+sizeof(WMI_OPT_TX_FRAME_CMD)-1,
-+                                      optTxFrmCmd.optIEDataLen))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                ret = wmi_opt_tx_frame_cmd(ar->arWmi,
-+                                           optTxFrmCmd.frmType,
-+                                           optTxFrmCmd.dstAddr,
-+                                           optTxFrmCmd.bssid,
-+                                           optTxFrmCmd.optIEDataLen,
-+                                           data);
-+            }
-+
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SETRETRYLIMITS:
-+        {
-+            WMI_SET_RETRY_LIMITS_CMD setRetryParams;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&setRetryParams, userdata,
-+                                      sizeof(setRetryParams)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_set_retry_limits_cmd(ar->arWmi, setRetryParams.frameType,
-+                                          setRetryParams.trafficClass,
-+                                          setRetryParams.maxRetries,
-+                                          setRetryParams.enableNotify) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+                AR6000_SPIN_LOCK(&ar->arLock, 0);
-+                ar->arMaxRetries = setRetryParams.maxRetries;
-+                AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+            }
-+            break;
-+        }
-+
-+        case AR6000_XIOCTL_SET_ADHOC_BEACON_INTVAL:
-+        {
-+            WMI_BEACON_INT_CMD bIntvlCmd;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&bIntvlCmd, userdata,
-+                       sizeof(bIntvlCmd)))
-+            {
-+                ret = -EFAULT;
-+            } else if (wmi_set_adhoc_bconIntvl_cmd(ar->arWmi, bIntvlCmd.beaconInterval)
-+                        != A_OK)
-+            {
-+                ret = -EIO;
-+            }
-+            break;
-+        }
-+        case IEEE80211_IOCTL_SETAUTHALG:
-+        {
-+            AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+            struct ieee80211req_authalg req;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&req, userdata,
-+                       sizeof(struct ieee80211req_authalg)))
-+            {
-+                ret = -EFAULT;
-+            } else if (req.auth_alg == AUTH_ALG_OPEN_SYSTEM) {
-+                ar->arDot11AuthMode  = OPEN_AUTH;
-+                ar->arPairwiseCrypto  = NONE_CRYPT;
-+                ar->arGroupCrypto     = NONE_CRYPT;
-+            } else if (req.auth_alg == AUTH_ALG_LEAP) {
-+                ar->arDot11AuthMode   = LEAP_AUTH;
-+            } else {
-+                ret = -EIO;
-+            }
-+            break;
-+        }
-+
-+        case AR6000_XIOCTL_SET_VOICE_PKT_SIZE:
-+            ret = ar6000_xioctl_set_voice_pkt_size(dev, userdata);
-+            break;
-+
-+        case AR6000_XIOCTL_SET_MAX_SP:
-+            ret = ar6000_xioctl_set_max_sp_len(dev, userdata);
-+            break;
-+
-+        case AR6000_XIOCTL_WMI_GET_ROAM_TBL:
-+            ret = ar6000_ioctl_get_roam_tbl(dev, rq);
-+            break;
-+        case AR6000_XIOCTL_WMI_SET_ROAM_CTRL:
-+            ret = ar6000_ioctl_set_roam_ctrl(dev, userdata);
-+            break;
-+        case AR6000_XIOCTRL_WMI_SET_POWERSAVE_TIMERS:
-+            ret = ar6000_ioctl_set_powersave_timers(dev, userdata);
-+            break;
-+        case AR6000_XIOCTRL_WMI_GET_POWER_MODE:
-+            ret = ar6000_ioctl_get_power_mode(dev, rq);
-+            break;
-+        case AR6000_XIOCTRL_WMI_SET_WLAN_STATE:
-+            get_user(ar->arWlanState, (unsigned int *)userdata);
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+                break;
-+            }
-+
-+            if (ar->arWlanState == WLAN_ENABLED) {
-+                /* Enable foreground scanning */
-+                if (wmi_scanparams_cmd(ar->arWmi, scParams.fg_start_period,
-+                                       scParams.fg_end_period,
-+                                       scParams.bg_period,
-+                                       scParams.minact_chdwell_time,
-+                                       scParams.maxact_chdwell_time,
-+                                       scParams.pas_chdwell_time,
-+                                       scParams.shortScanRatio,
-+                                       scParams.scanCtrlFlags,
-+                                       scParams.max_dfsch_act_time) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+                if (ar->arSsidLen) {
-+                    ar->arConnectPending = TRUE;
-+                    if (wmi_connect_cmd(ar->arWmi, ar->arNetworkType,
-+                                        ar->arDot11AuthMode, ar->arAuthMode,
-+                                        ar->arPairwiseCrypto,
-+                                        ar->arPairwiseCryptoLen,
-+                                        ar->arGroupCrypto, ar->arGroupCryptoLen,
-+                                        ar->arSsidLen, ar->arSsid,
-+                                        ar->arReqBssid, ar->arChannelHint,
-+                                        ar->arConnectCtrlFlags) != A_OK)
-+                    {
-+                        ret = -EIO;
-+                        ar->arConnectPending = FALSE;
-+                    }
-+                }
-+            } else {
-+                /* Disconnect from the AP and disable foreground scanning */
-+                AR6000_SPIN_LOCK(&ar->arLock, 0);
-+                if (ar->arConnected == TRUE || ar->arConnectPending == TRUE) {
-+                    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+                    wmi_disconnect_cmd(ar->arWmi);
-+                } else {
-+                    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+                }
-+
-+                if (wmi_scanparams_cmd(ar->arWmi, 0xFFFF, 0, 0, 0, 0, 0, 0, 0xFF, 0) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        case AR6000_XIOCTL_WMI_GET_ROAM_DATA:
-+            ret = ar6000_ioctl_get_roam_data(dev, rq);
-+            break;
-+        case AR6000_XIOCTL_WMI_SET_BT_STATUS:
-+            ret = ar6000_xioctl_set_bt_status_cmd(dev, userdata);
-+            break;
-+        case AR6000_XIOCTL_WMI_SET_BT_PARAMS:
-+            ret = ar6000_xioctl_set_bt_params_cmd(dev, userdata);
-+            break;
-+        case AR6000_XIOCTL_WMI_STARTSCAN:
-+        {
-+            WMI_START_SCAN_CMD setStartScanCmd;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                    ret = -EIO;
-+                } else if (copy_from_user(&setStartScanCmd, userdata,
-+                                          sizeof(setStartScanCmd)))
-+                {
-+                    ret = -EFAULT;
-+                } else {
-+                    if (wmi_startscan_cmd(ar->arWmi, setStartScanCmd.scanType,
-+                                    setStartScanCmd.forceFgScan,
-+                                    setStartScanCmd.isLegacy,
-+                                    setStartScanCmd.homeDwellTime,
-+                                    setStartScanCmd.forceScanInterval) != A_OK)
-+                    {
-+                        ret = -EIO;
-+                    }
-+                }
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SETFIXRATES:
-+        {
-+            WMI_FIX_RATES_CMD setFixRatesCmd;
-+            A_STATUS returnStatus;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                    ret = -EIO;
-+                } else if (copy_from_user(&setFixRatesCmd, userdata,
-+                                          sizeof(setFixRatesCmd)))
-+                {
-+                    ret = -EFAULT;
-+                } else {
-+                    returnStatus = wmi_set_fixrates_cmd(ar->arWmi, setFixRatesCmd.fixRateMask);
-+                    if (returnStatus == A_EINVAL)
-+                    {
-+                        ret = -EINVAL;
-+                    }
-+                    else if(returnStatus != A_OK) {
-+                        ret = -EIO;
-+                    }
-+                }
-+            break;
-+        }
-+
-+        case AR6000_XIOCTL_WMI_GETFIXRATES:
-+        {
-+            WMI_FIX_RATES_CMD getFixRatesCmd;
-+            AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+            int ret = 0;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                return -EIO;
-+            }
-+
-+            if (down_interruptible(&ar->arSem)) {
-+                return -ERESTARTSYS;
-+            }
-+            /* Used copy_from_user/copy_to_user to access user space data */
-+            if (copy_from_user(&getFixRatesCmd, userdata, sizeof(getFixRatesCmd))) {
-+                ret = -EFAULT;
-+            } else {
-+                ar->arRateMask = 0xFFFF;
-+
-+                if (wmi_get_ratemask_cmd(ar->arWmi) != A_OK) {
-+                    up(&ar->arSem);
-+                    return -EIO;
-+                }
-+
-+                wait_event_interruptible_timeout(arEvent, ar->arRateMask != 0xFFFF, wmitimeout * HZ);
-+
-+                if (signal_pending(current)) {
-+                    ret = -EINTR;
-+                }
-+
-+                if (!ret) {
-+                    getFixRatesCmd.fixRateMask = ar->arRateMask;
-+                }
-+
-+                if(copy_to_user(userdata, &getFixRatesCmd, sizeof(getFixRatesCmd))) {
-+                   ret = -EFAULT;
-+                }
-+
-+                up(&ar->arSem);
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_AUTHMODE:
-+        {
-+            WMI_SET_AUTH_MODE_CMD setAuthMode;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&setAuthMode, userdata,
-+                                      sizeof(setAuthMode)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_set_authmode_cmd(ar->arWmi, setAuthMode.mode) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_REASSOCMODE:
-+        {
-+            WMI_SET_REASSOC_MODE_CMD setReassocMode;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&setReassocMode, userdata,
-+                                      sizeof(setReassocMode)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_set_reassocmode_cmd(ar->arWmi, setReassocMode.mode) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_DIAG_READ:
-+        {
-+            A_UINT32 addr, data;
-+            get_user(addr, (unsigned int *)userdata);
-+            if (ar6000_ReadRegDiag(ar->arHifDevice, &addr, &data) != A_OK) {
-+                ret = -EIO;
-+            }
-+            put_user(data, (unsigned int *)userdata + 1);
-+            break;
-+        }
-+        case AR6000_XIOCTL_DIAG_WRITE:
-+        {
-+            A_UINT32 addr, data;
-+            get_user(addr, (unsigned int *)userdata);
-+            get_user(data, (unsigned int *)userdata + 1);
-+            if (ar6000_WriteRegDiag(ar->arHifDevice, &addr, &data) != A_OK) {
-+                ret = -EIO;
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_KEEPALIVE:
-+        {
-+             WMI_SET_KEEPALIVE_CMD setKeepAlive;
-+             if (ar->arWmiReady == FALSE) {
-+                 return -EIO;
-+             } else if (copy_from_user(&setKeepAlive, userdata,
-+                        sizeof(setKeepAlive))){
-+                 ret = -EFAULT;
-+             } else {
-+                 if (wmi_set_keepalive_cmd(ar->arWmi, setKeepAlive.keepaliveInterval) != A_OK) {
-+                     ret = -EIO;
-+               }
-+             }
-+             break;
-+        }
-+        case AR6000_XIOCTL_WMI_GET_KEEPALIVE:
-+        {
-+            AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+            WMI_GET_KEEPALIVE_CMD getKeepAlive;
-+            int ret = 0;
-+            if (ar->arWmiReady == FALSE) {
-+               return -EIO;
-+            }
-+            if (down_interruptible(&ar->arSem)) {
-+                return -ERESTARTSYS;
-+            }
-+            if (copy_from_user(&getKeepAlive, userdata,sizeof(getKeepAlive))) {
-+               ret = -EFAULT;
-+            } else {
-+            getKeepAlive.keepaliveInterval = wmi_get_keepalive_cmd(ar->arWmi);
-+            ar->arKeepaliveConfigured = 0xFF;
-+            if (wmi_get_keepalive_configured(ar->arWmi) != A_OK){
-+                up(&ar->arSem);
-+                return -EIO;
-+            }
-+            wait_event_interruptible_timeout(arEvent, ar->arKeepaliveConfigured != 0xFF, wmitimeout * HZ);
-+            if (signal_pending(current)) {
-+                ret = -EINTR;
-+            }
-+
-+            if (!ret) {
-+                getKeepAlive.configured = ar->arKeepaliveConfigured;
-+            }
-+            if (copy_to_user(userdata, &getKeepAlive, sizeof(getKeepAlive))) {
-+               ret = -EFAULT;
-+            }
-+            up(&ar->arSem);
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_APPIE:
-+        {
-+            WMI_SET_APPIE_CMD appIEcmd;
-+            A_UINT8           appIeInfo[IEEE80211_APPIE_FRAME_MAX_LEN];
-+            A_UINT32            fType,ieLen;
-+
-+          if (ar->arWmiReady == FALSE) {
-+                  return -EIO;
-+          }
-+          get_user(fType, (A_UINT32 *)userdata);
-+          appIEcmd.mgmtFrmType = fType;
-+          if (appIEcmd.mgmtFrmType >= IEEE80211_APPIE_NUM_OF_FRAME) {
-+                  ret = -EIO;
-+          } else {
-+                  get_user(ieLen, (A_UINT32 *)(userdata + 4));
-+                  appIEcmd.ieLen = ieLen;
-+                  if (appIEcmd.ieLen > IEEE80211_APPIE_FRAME_MAX_LEN) {
-+                          ret = -EIO;
-+                          break;
-+                  }
-+                  if (copy_from_user(appIeInfo, userdata + 8, appIEcmd.ieLen)) {
-+                          ret = -EFAULT;
-+                  } else {
-+                          if (wmi_set_appie_cmd(ar->arWmi, appIEcmd.mgmtFrmType,
-+                                                appIEcmd.ieLen,  appIeInfo) != A_OK)
-+                          {
-+                                  ret = -EIO;
-+                          }
-+                  }
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_MGMT_FRM_RX_FILTER:
-+        {
-+            WMI_BSS_FILTER_CMD cmd;
-+            A_UINT32    filterType;
-+
-+            if (copy_from_user(&filterType, userdata, sizeof(A_UINT32)))
-+            {
-+                return -EFAULT;
-+            }
-+            if (filterType & (IEEE80211_FILTER_TYPE_BEACON |
-+                                    IEEE80211_FILTER_TYPE_PROBE_RESP))
-+            {
-+                cmd.bssFilter = ALL_BSS_FILTER;
-+            } else {
-+                cmd.bssFilter = NONE_BSS_FILTER;
-+            }
-+            if (wmi_bssfilter_cmd(ar->arWmi, cmd.bssFilter, 0) != A_OK) {
-+                ret = -EIO;
-+            }
-+
-+            AR6000_SPIN_LOCK(&ar->arLock, 0);
-+            ar->arMgmtFilter = filterType;
-+            AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_WSC_STATUS:
-+        {
-+            A_UINT32    wsc_status;
-+
-+            if (copy_from_user(&wsc_status, userdata, sizeof(A_UINT32)))
-+            {
-+                return -EFAULT;
-+            }
-+            if (wmi_set_wsc_status_cmd(ar->arWmi, wsc_status) != A_OK) {
-+                ret = -EIO;
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_BMI_ROMPATCH_INSTALL:
-+        {
-+            A_UINT32 ROM_addr;
-+            A_UINT32 RAM_addr;
-+            A_UINT32 nbytes;
-+            A_UINT32 do_activate;
-+            A_UINT32 rompatch_id;
-+
-+            get_user(ROM_addr, (A_UINT32 *)userdata);
-+            get_user(RAM_addr, (A_UINT32 *)userdata + 1);
-+            get_user(nbytes, (A_UINT32 *)userdata + 2);
-+            get_user(do_activate, (A_UINT32 *)userdata + 3);
-+            AR_DEBUG_PRINTF("Install rompatch from ROM: 0x%x to RAM: 0x%x  length: %d\n",
-+                             ROM_addr, RAM_addr, nbytes);
-+            ret = BMIrompatchInstall(hifDevice, ROM_addr, RAM_addr,
-+                                        nbytes, do_activate, &rompatch_id);
-+            if (ret == A_OK) {
-+                put_user(rompatch_id, (unsigned int *)rq->ifr_data); /* return value */
-+            }
-+            break;
-+        }
-+
-+        case AR6000_XIOCTL_BMI_ROMPATCH_UNINSTALL:
-+        {
-+            A_UINT32 rompatch_id;
-+
-+            get_user(rompatch_id, (A_UINT32 *)userdata);
-+            AR_DEBUG_PRINTF("UNinstall rompatch_id %d\n", rompatch_id);
-+            ret = BMIrompatchUninstall(hifDevice, rompatch_id);
-+            break;
-+        }
-+
-+        case AR6000_XIOCTL_BMI_ROMPATCH_ACTIVATE:
-+        case AR6000_XIOCTL_BMI_ROMPATCH_DEACTIVATE:
-+        {
-+            A_UINT32 rompatch_count;
-+
-+            get_user(rompatch_count, (A_UINT32 *)userdata);
-+            AR_DEBUG_PRINTF("Change rompatch activation count=%d\n", rompatch_count);
-+            length = sizeof(A_UINT32) * rompatch_count;
-+            if ((buffer = (unsigned char *)A_MALLOC(length)) != NULL) {
-+                A_MEMZERO(buffer, length);
-+                if (copy_from_user(buffer, &userdata[sizeof(rompatch_count)], length))
-+                {
-+                    ret = -EFAULT;
-+                } else {
-+                    if (cmd == AR6000_XIOCTL_BMI_ROMPATCH_ACTIVATE) {
-+                        ret = BMIrompatchActivate(hifDevice, rompatch_count, (A_UINT32 *)buffer);
-+                    } else {
-+                        ret = BMIrompatchDeactivate(hifDevice, rompatch_count, (A_UINT32 *)buffer);
-+                    }
-+                }
-+                A_FREE(buffer);
-+            } else {
-+                ret = -ENOMEM;
-+            }
-+
-+            break;
-+        }
-+
-+        case AR6000_XIOCTL_WMI_SET_HOST_SLEEP_MODE:
-+        {
-+            WMI_SET_HOST_SLEEP_MODE_CMD setHostSleepMode;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&setHostSleepMode, userdata,
-+                                      sizeof(setHostSleepMode)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_set_host_sleep_mode_cmd(ar->arWmi,
-+                                &setHostSleepMode) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_SET_WOW_MODE:
-+        {
-+            WMI_SET_WOW_MODE_CMD setWowMode;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&setWowMode, userdata,
-+                                      sizeof(setWowMode)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_set_wow_mode_cmd(ar->arWmi,
-+                                &setWowMode) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_GET_WOW_LIST:
-+        {
-+            WMI_GET_WOW_LIST_CMD getWowList;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&getWowList, userdata,
-+                                      sizeof(getWowList)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_get_wow_list_cmd(ar->arWmi,
-+                                &getWowList) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_ADD_WOW_PATTERN:
-+        {
-+#define WOW_PATTERN_SIZE 64
-+#define WOW_MASK_SIZE 64
-+
-+            WMI_ADD_WOW_PATTERN_CMD cmd;
-+            A_UINT8 mask_data[WOW_PATTERN_SIZE]={0};
-+            A_UINT8 pattern_data[WOW_PATTERN_SIZE]={0};
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else {
-+
-+                if(copy_from_user(&cmd, userdata,
-+                            sizeof(WMI_ADD_WOW_PATTERN_CMD)))
-+                      return -EFAULT;
-+                if (copy_from_user(pattern_data,
-+                                      userdata + 3,
-+                                      cmd.filter_size)){
-+                        ret = -EFAULT;
-+                        break;
-+                }
-+                if (copy_from_user(mask_data,
-+                                      (userdata + 3 + cmd.filter_size),
-+                                      cmd.filter_size)){
-+                        ret = -EFAULT;
-+                        break;
-+                } else {
-+                    if (wmi_add_wow_pattern_cmd(ar->arWmi,
-+                                &cmd, pattern_data, mask_data, cmd.filter_size) != A_OK){
-+                        ret = -EIO;
-+                    }
-+                }
-+            }
-+#undef WOW_PATTERN_SIZE
-+#undef WOW_MASK_SIZE
-+            break;
-+        }
-+        case AR6000_XIOCTL_WMI_DEL_WOW_PATTERN:
-+        {
-+            WMI_DEL_WOW_PATTERN_CMD delWowPattern;
-+
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&delWowPattern, userdata,
-+                                      sizeof(delWowPattern)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_del_wow_pattern_cmd(ar->arWmi,
-+                                &delWowPattern) != A_OK)
-+                {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        }
-+        case AR6000_XIOCTL_DUMP_HTC_CREDIT_STATE:
-+            if (ar->arHtcTarget != NULL) {
-+                HTCDumpCreditStates(ar->arHtcTarget);
-+            }
-+            break;
-+        case AR6000_XIOCTL_TRAFFIC_ACTIVITY_CHANGE:
-+            if (ar->arHtcTarget != NULL) {
-+                struct ar6000_traffic_activity_change data;
-+
-+                if (copy_from_user(&data, userdata, sizeof(data)))
-+                {
-+                    return -EFAULT;
-+                }
-+                    /* note, this is used for testing (mbox ping testing), indicate activity
-+                     * change using the stream ID as the traffic class */
-+                ar6000_indicate_tx_activity(ar,
-+                                            (A_UINT8)data.StreamID,
-+                                            data.Active ? TRUE : FALSE);
-+            }
-+            break;
-+        case AR6000_XIOCTL_WMI_SET_CONNECT_CTRL_FLAGS:
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&connectCtrlFlags, userdata,
-+                                      sizeof(connectCtrlFlags)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                ar->arConnectCtrlFlags = connectCtrlFlags;
-+            }
-+            break;
-+        case AR6000_XIOCTL_WMI_SET_AKMP_PARAMS:
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else if (copy_from_user(&akmpParams, userdata,
-+                                      sizeof(WMI_SET_AKMP_PARAMS_CMD)))
-+            {
-+                ret = -EFAULT;
-+            } else {
-+                if (wmi_set_akmp_params_cmd(ar->arWmi, &akmpParams) != A_OK) {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        case AR6000_XIOCTL_WMI_SET_PMKID_LIST:
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else {
-+                if (copy_from_user(&pmkidInfo.numPMKID, userdata,
-+                                      sizeof(pmkidInfo.numPMKID)))
-+                {
-+                    ret = -EFAULT;
-+                    break;
-+                }
-+                if (copy_from_user(&pmkidInfo.pmkidList,
-+                                   userdata + sizeof(pmkidInfo.numPMKID),
-+                                   pmkidInfo.numPMKID * sizeof(WMI_PMKID)))
-+                {
-+                    ret = -EFAULT;
-+                    break;
-+                }
-+                if (wmi_set_pmkid_list_cmd(ar->arWmi, &pmkidInfo) != A_OK) {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        case AR6000_XIOCTL_WMI_GET_PMKID_LIST:
-+            if (ar->arWmiReady == FALSE) {
-+                ret = -EIO;
-+            } else  {
-+                if (wmi_get_pmkid_list_cmd(ar->arWmi) != A_OK) {
-+                    ret = -EIO;
-+                }
-+            }
-+            break;
-+        default:
-+            ret = -EOPNOTSUPP;
-+    }
-+    return ret;
-+}
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c b/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c
-new file mode 100644
-index 0000000..97b273b
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c
-@@ -0,0 +1,225 @@
-+
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+#include <linux/kernel.h>
-+#include <linux/skbuff.h>
-+#include <a_config.h>
-+#include "athdefs.h"
-+#include "a_types.h"
-+#include "a_osapi.h"
-+#include "htc_packet.h"
-+
-+#define AR6000_DATA_OFFSET    64
-+
-+void a_netbuf_enqueue(A_NETBUF_QUEUE_T *q, void *pkt)
-+{
-+    skb_queue_tail((struct sk_buff_head *) q, (struct sk_buff *) pkt);
-+}
-+
-+void a_netbuf_prequeue(A_NETBUF_QUEUE_T *q, void *pkt)
-+{
-+    skb_queue_head((struct sk_buff_head *) q, (struct sk_buff *) pkt);
-+}
-+
-+void *a_netbuf_dequeue(A_NETBUF_QUEUE_T *q)
-+{
-+    return((void *) skb_dequeue((struct sk_buff_head *) q));
-+}
-+
-+int a_netbuf_queue_size(A_NETBUF_QUEUE_T *q)
-+{
-+    return(skb_queue_len((struct sk_buff_head *) q));
-+}
-+
-+int a_netbuf_queue_empty(A_NETBUF_QUEUE_T *q)
-+{
-+    return(skb_queue_empty((struct sk_buff_head *) q));
-+}
-+
-+void a_netbuf_queue_init(A_NETBUF_QUEUE_T *q)
-+{
-+    skb_queue_head_init((struct sk_buff_head *) q);
-+}
-+
-+void *
-+a_netbuf_alloc(int size)
-+{
-+    struct sk_buff *skb;
-+    skb = dev_alloc_skb(AR6000_DATA_OFFSET + sizeof(HTC_PACKET) + size);
-+    skb_reserve(skb, AR6000_DATA_OFFSET + sizeof(HTC_PACKET));
-+    return ((void *)skb);
-+}
-+
-+/*
-+ * Allocate an SKB w.o. any encapsulation requirement.
-+ */
-+void *
-+a_netbuf_alloc_raw(int size)
-+{
-+    struct sk_buff *skb;
-+
-+    skb = dev_alloc_skb(size);
-+
-+    return ((void *)skb);
-+}
-+
-+void
-+a_netbuf_free(void *bufPtr)
-+{
-+    struct sk_buff *skb = (struct sk_buff *)bufPtr;
-+
-+    dev_kfree_skb(skb);
-+}
-+
-+A_UINT32
-+a_netbuf_to_len(void *bufPtr)
-+{
-+    return (((struct sk_buff *)bufPtr)->len);
-+}
-+
-+void *
-+a_netbuf_to_data(void *bufPtr)
-+{
-+    return (((struct sk_buff *)bufPtr)->data);
-+}
-+
-+/*
-+ * Add len # of bytes to the beginning of the network buffer
-+ * pointed to by bufPtr
-+ */
-+A_STATUS
-+a_netbuf_push(void *bufPtr, A_INT32 len)
-+{
-+    skb_push((struct sk_buff *)bufPtr, len);
-+
-+    return A_OK;
-+}
-+
-+/*
-+ * Add len # of bytes to the beginning of the network buffer
-+ * pointed to by bufPtr and also fill with data
-+ */
-+A_STATUS
-+a_netbuf_push_data(void *bufPtr, char *srcPtr, A_INT32 len)
-+{
-+    skb_push((struct sk_buff *) bufPtr, len);
-+    A_MEMCPY(((struct sk_buff *)bufPtr)->data, srcPtr, len);
-+
-+    return A_OK;
-+}
-+
-+/*
-+ * Add len # of bytes to the end of the network buffer
-+ * pointed to by bufPtr
-+ */
-+A_STATUS
-+a_netbuf_put(void *bufPtr, A_INT32 len)
-+{
-+    skb_put((struct sk_buff *)bufPtr, len);
-+
-+    return A_OK;
-+}
-+
-+/*
-+ * Add len # of bytes to the end of the network buffer
-+ * pointed to by bufPtr and also fill with data
-+ */
-+A_STATUS
-+a_netbuf_put_data(void *bufPtr, char *srcPtr, A_INT32 len)
-+{
-+    char *start = ((struct sk_buff *)bufPtr)->data +
-+        ((struct sk_buff *)bufPtr)->len;
-+    skb_put((struct sk_buff *)bufPtr, len);
-+    A_MEMCPY(start, srcPtr, len);
-+
-+    return A_OK;
-+}
-+
-+
-+/*
-+ * Trim the network buffer pointed to by bufPtr to len # of bytes
-+ */
-+A_STATUS
-+a_netbuf_setlen(void *bufPtr, A_INT32 len)
-+{
-+    skb_trim((struct sk_buff *)bufPtr, len);
-+
-+    return A_OK;
-+}
-+
-+/*
-+ * Chop of len # of bytes from the end of the buffer.
-+ */
-+A_STATUS
-+a_netbuf_trim(void *bufPtr, A_INT32 len)
-+{
-+    skb_trim((struct sk_buff *)bufPtr, ((struct sk_buff *)bufPtr)->len - len);
-+
-+    return A_OK;
-+}
-+
-+/*
-+ * Chop of len # of bytes from the end of the buffer and return the data.
-+ */
-+A_STATUS
-+a_netbuf_trim_data(void *bufPtr, char *dstPtr, A_INT32 len)
-+{
-+    char *start = ((struct sk_buff *)bufPtr)->data +
-+        (((struct sk_buff *)bufPtr)->len - len);
-+
-+    A_MEMCPY(dstPtr, start, len);
-+    skb_trim((struct sk_buff *)bufPtr, ((struct sk_buff *)bufPtr)->len - len);
-+
-+    return A_OK;
-+}
-+
-+
-+/*
-+ * Returns the number of bytes available to a a_netbuf_push()
-+ */
-+A_INT32
-+a_netbuf_headroom(void *bufPtr)
-+{
-+    return (skb_headroom((struct sk_buff *)bufPtr));
-+}
-+
-+/*
-+ * Removes specified number of bytes from the beginning of the buffer
-+ */
-+A_STATUS
-+a_netbuf_pull(void *bufPtr, A_INT32 len)
-+{
-+    skb_pull((struct sk_buff *)bufPtr, len);
-+
-+    return A_OK;
-+}
-+
-+/*
-+ * Removes specified number of bytes from the beginning of the buffer
-+ * and return the data
-+ */
-+A_STATUS
-+a_netbuf_pull_data(void *bufPtr, char *dstPtr, A_INT32 len)
-+{
-+    A_MEMCPY(dstPtr, ((struct sk_buff *)bufPtr)->data, len);
-+    skb_pull((struct sk_buff *)bufPtr, len);
-+
-+    return A_OK;
-+}
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h b/drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h
-new file mode 100644
-index 0000000..5b64212
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h
-@@ -0,0 +1,319 @@
-+/*
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/os/linux/include/osapi_linux.h#1 $
-+ *
-+ * This file contains the definitions of the basic atheros data types.
-+ * It is used to map the data types in atheros files to a platform specific
-+ * type.
-+ *
-+ * Copyright 2003-2005 Atheros Communications, 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef _OSAPI_LINUX_H_
-+#define _OSAPI_LINUX_H_
-+
-+#ifdef __KERNEL__
-+
-+#include <linux/version.h>
-+#include <linux/types.h>
-+#include <linux/kernel.h>
-+#include <linux/string.h>
-+#include <linux/skbuff.h>
-+#include <linux/netdevice.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#include <linux/jiffies.h>
-+#endif
-+#include <linux/timer.h>
-+#include <linux/delay.h>
-+#include <linux/wait.h>
-+#ifdef KERNEL_2_4
-+#include <asm/arch/irq.h>
-+#include <asm/irq.h>
-+#endif
-+
-+#ifdef __GNUC__
-+#define __ATTRIB_PACK           __attribute__ ((packed))
-+#define __ATTRIB_PRINTF         __attribute__ ((format (printf, 1, 2)))
-+#define __ATTRIB_NORETURN       __attribute__ ((noreturn))
-+#ifndef INLINE
-+#define INLINE                  __inline__
-+#endif
-+#else /* Not GCC */
-+#define __ATTRIB_PACK
-+#define __ATTRIB_PRINTF
-+#define __ATTRIB_NORETURN
-+#ifndef INLINE
-+#define INLINE                  __inline
-+#endif
-+#endif /* End __GNUC__ */
-+
-+#define PREPACK
-+#define POSTPACK                __ATTRIB_PACK
-+
-+/*
-+ * Endianes macros
-+ */
-+#define A_BE2CPU8(x)       ntohb(x)
-+#define A_BE2CPU16(x)      ntohs(x)
-+#define A_BE2CPU32(x)      ntohl(x)
-+
-+#define A_LE2CPU8(x)       (x)
-+#define A_LE2CPU16(x)      (x)
-+#define A_LE2CPU32(x)      (x)
-+
-+#define A_CPU2BE8(x)       htonb(x)
-+#define A_CPU2BE16(x)      htons(x)
-+#define A_CPU2BE32(x)      htonl(x)
-+
-+#define A_MEMCPY(dst, src, len)         memcpy((A_UINT8 *)(dst), (src), (len))
-+#define A_MEMZERO(addr, len)            memset(addr, 0, len)
-+#define A_MEMCMP(addr1, addr2, len)     memcmp((addr1), (addr2), (len))
-+#define A_MALLOC(size)                  kmalloc((size), GFP_KERNEL)
-+#define A_MALLOC_NOWAIT(size)           kmalloc((size), GFP_ATOMIC)
-+#define A_FREE(addr)                    kfree(addr)
-+#define A_PRINTF(args...)               printk(args)
-+
-+/* Mutual Exclusion */
-+typedef spinlock_t                      A_MUTEX_T;
-+#define A_MUTEX_INIT(mutex)             spin_lock_init(mutex)
-+#define A_MUTEX_LOCK(mutex)             spin_lock_bh(mutex)
-+#define A_MUTEX_UNLOCK(mutex)           spin_unlock_bh(mutex)
-+#define A_IS_MUTEX_VALID(mutex)         TRUE  /* okay to return true, since A_MUTEX_DELETE does nothing */
-+#define A_MUTEX_DELETE(mutex)           /* spin locks are not kernel resources so nothing to free.. */
-+
-+/* Get current time in ms adding a constant offset (in ms) */
-+#define A_GET_MS(offset)    \
-+      (jiffies + ((offset) / 1000) * HZ)
-+
-+/*
-+ * Timer Functions
-+ */
-+#define A_MDELAY(msecs)                 mdelay(msecs)
-+typedef struct timer_list               A_TIMER;
-+
-+#define A_INIT_TIMER(pTimer, pFunction, pArg) do {              \
-+    init_timer(pTimer);                                         \
-+    (pTimer)->function = (pFunction);                           \
-+    (pTimer)->data   = (unsigned long)(pArg);                   \
-+} while (0)
-+
-+/*
-+ * Start a Timer that elapses after 'periodMSec' milli-seconds
-+ * Support is provided for a one-shot timer. The 'repeatFlag' is
-+ * ignored.
-+ */
-+#define A_TIMEOUT_MS(pTimer, periodMSec, repeatFlag) do {                   \
-+    if (repeatFlag) {                                                       \
-+        printk("\n" __FILE__ ":%d: Timer Repeat requested\n",__LINE__);     \
-+        panic("Timer Repeat");                                              \
-+    }                                                                       \
-+    mod_timer((pTimer), jiffies + HZ * (periodMSec) / 1000);                \
-+} while (0)
-+
-+/*
-+ * Cancel the Timer.
-+ */
-+#define A_UNTIMEOUT(pTimer) do {                                \
-+    del_timer((pTimer));                                        \
-+} while (0)
-+
-+#define A_DELETE_TIMER(pTimer) do {                             \
-+} while (0)
-+
-+/*
-+ * Wait Queue related functions
-+ */
-+typedef wait_queue_head_t               A_WAITQUEUE_HEAD;
-+#define A_INIT_WAITQUEUE_HEAD(head)     init_waitqueue_head(head)
-+#ifndef wait_event_interruptible_timeout
-+#define __wait_event_interruptible_timeout(wq, condition, ret)          \
-+do {                                                                    \
-+        wait_queue_t __wait;                                            \
-+        init_waitqueue_entry(&__wait, current);                         \
-+                                                                        \
-+        add_wait_queue(&wq, &__wait);                                   \
-+        for (;;) {                                                      \
-+                set_current_state(TASK_INTERRUPTIBLE);                  \
-+                if (condition)                                          \
-+                        break;                                          \
-+                if (!signal_pending(current)) {                         \
-+                        ret = schedule_timeout(ret);                    \
-+                        if (!ret)                                       \
-+                                break;                                  \
-+                        continue;                                       \
-+                }                                                       \
-+                ret = -ERESTARTSYS;                                     \
-+                break;                                                  \
-+        }                                                               \
-+        current->state = TASK_RUNNING;                                  \
-+        remove_wait_queue(&wq, &__wait);                                \
-+} while (0)
-+
-+#define wait_event_interruptible_timeout(wq, condition, timeout)        \
-+({                                                                      \
-+        long __ret = timeout;                                           \
-+        if (!(condition))                                               \
-+                __wait_event_interruptible_timeout(wq, condition, __ret); \
-+        __ret;                                                          \
-+})
-+#endif /* wait_event_interruptible_timeout */
-+
-+#define A_WAIT_EVENT_INTERRUPTIBLE_TIMEOUT(head, condition, timeout) do { \
-+    wait_event_interruptible_timeout(head, condition, timeout); \
-+} while (0)
-+
-+#define A_WAKE_UP(head)                 wake_up(head)
-+
-+#ifdef DEBUG
-+#define A_ASSERT(expr)  \
-+    if (!(expr)) {   \
-+        printk(KERN_ALERT "\n" __FILE__ ":%d: Assertion " #expr " failed!\n",__LINE__); \
-+        panic(#expr); \
-+    }
-+
-+#else
-+#define A_ASSERT(expr)
-+#endif /* DEBUG */
-+
-+/*
-+ * Initialization of the network buffer subsystem
-+ */
-+#define A_NETBUF_INIT()
-+
-+/*
-+ * Network buffer queue support
-+ */
-+typedef struct sk_buff_head A_NETBUF_QUEUE_T;
-+
-+#define A_NETBUF_QUEUE_INIT(q)  \
-+    a_netbuf_queue_init(q)
-+
-+#define A_NETBUF_ENQUEUE(q, pkt) \
-+    a_netbuf_enqueue((q), (pkt))
-+#define A_NETBUF_PREQUEUE(q, pkt) \
-+    a_netbuf_prequeue((q), (pkt))
-+#define A_NETBUF_DEQUEUE(q) \
-+    (a_netbuf_dequeue(q))
-+#define A_NETBUF_QUEUE_SIZE(q)  \
-+    a_netbuf_queue_size(q)
-+#define A_NETBUF_QUEUE_EMPTY(q) \
-+    a_netbuf_queue_empty(q)
-+
-+/*
-+ * Network buffer support
-+ */
-+#define A_NETBUF_ALLOC(size) \
-+    a_netbuf_alloc(size)
-+#define A_NETBUF_ALLOC_RAW(size) \
-+    a_netbuf_alloc_raw(size)
-+#define A_NETBUF_FREE(bufPtr) \
-+    a_netbuf_free(bufPtr)
-+#define A_NETBUF_DATA(bufPtr) \
-+    a_netbuf_to_data(bufPtr)
-+#define A_NETBUF_LEN(bufPtr) \
-+    a_netbuf_to_len(bufPtr)
-+#define A_NETBUF_PUSH(bufPtr, len) \
-+    a_netbuf_push(bufPtr, len)
-+#define A_NETBUF_PUT(bufPtr, len) \
-+    a_netbuf_put(bufPtr, len)
-+#define A_NETBUF_TRIM(bufPtr,len) \
-+    a_netbuf_trim(bufPtr, len)
-+#define A_NETBUF_PULL(bufPtr, len) \
-+    a_netbuf_pull(bufPtr, len)
-+#define A_NETBUF_HEADROOM(bufPtr)\
-+    a_netbuf_headroom(bufPtr)
-+#define A_NETBUF_SETLEN(bufPtr,len) \
-+    a_netbuf_setlen(bufPtr, len)
-+
-+/* Add data to end of a buffer  */
-+#define A_NETBUF_PUT_DATA(bufPtr, srcPtr,  len) \
-+    a_netbuf_put_data(bufPtr, srcPtr, len)
-+
-+/* Add data to start of the  buffer */
-+#define A_NETBUF_PUSH_DATA(bufPtr, srcPtr,  len) \
-+    a_netbuf_push_data(bufPtr, srcPtr, len)
-+
-+/* Remove data at start of the buffer */
-+#define A_NETBUF_PULL_DATA(bufPtr, dstPtr, len) \
-+    a_netbuf_pull_data(bufPtr, dstPtr, len)
-+
-+/* Remove data from the end of the buffer */
-+#define A_NETBUF_TRIM_DATA(bufPtr, dstPtr, len) \
-+    a_netbuf_trim_data(bufPtr, dstPtr, len)
-+
-+/* View data as "size" contiguous bytes of type "t" */
-+#define A_NETBUF_VIEW_DATA(bufPtr, t, size) \
-+    (t )( ((struct skbuf *)(bufPtr))->data)
-+
-+/* return the beginning of the headroom for the buffer */
-+#define A_NETBUF_HEAD(bufPtr) \
-+        ((((struct sk_buff *)(bufPtr))->head))
-+
-+/*
-+ * OS specific network buffer access routines
-+ */
-+void *a_netbuf_alloc(int size);
-+void *a_netbuf_alloc_raw(int size);
-+void a_netbuf_free(void *bufPtr);
-+void *a_netbuf_to_data(void *bufPtr);
-+A_UINT32 a_netbuf_to_len(void *bufPtr);
-+A_STATUS a_netbuf_push(void *bufPtr, A_INT32 len);
-+A_STATUS a_netbuf_push_data(void *bufPtr, char *srcPtr, A_INT32 len);
-+A_STATUS a_netbuf_put(void *bufPtr, A_INT32 len);
-+A_STATUS a_netbuf_put_data(void *bufPtr, char *srcPtr, A_INT32 len);
-+A_STATUS a_netbuf_pull(void *bufPtr, A_INT32 len);
-+A_STATUS a_netbuf_pull_data(void *bufPtr, char *dstPtr, A_INT32 len);
-+A_STATUS a_netbuf_trim(void *bufPtr, A_INT32 len);
-+A_STATUS a_netbuf_trim_data(void *bufPtr, char *dstPtr, A_INT32 len);
-+A_STATUS a_netbuf_setlen(void *bufPtr, A_INT32 len);
-+A_INT32 a_netbuf_headroom(void *bufPtr);
-+void a_netbuf_enqueue(A_NETBUF_QUEUE_T *q, void *pkt);
-+void a_netbuf_prequeue(A_NETBUF_QUEUE_T *q, void *pkt);
-+void *a_netbuf_dequeue(A_NETBUF_QUEUE_T *q);
-+int a_netbuf_queue_size(A_NETBUF_QUEUE_T *q);
-+int a_netbuf_queue_empty(A_NETBUF_QUEUE_T *q);
-+int a_netbuf_queue_empty(A_NETBUF_QUEUE_T *q);
-+void a_netbuf_queue_init(A_NETBUF_QUEUE_T *q);
-+
-+/*
-+ * Kernel v.s User space functions
-+ */
-+A_UINT32 a_copy_to_user(void *to, const void *from, A_UINT32 n);
-+A_UINT32 a_copy_from_user(void *to, const void *from, A_UINT32 n);
-+
-+#else /* __KERNEL__ */
-+
-+#ifdef __GNUC__
-+#define __ATTRIB_PACK           __attribute__ ((packed))
-+#define __ATTRIB_PRINTF         __attribute__ ((format (printf, 1, 2)))
-+#define __ATTRIB_NORETURN       __attribute__ ((noreturn))
-+#ifndef INLINE
-+#define INLINE                  __inline__
-+#endif
-+#else /* Not GCC */
-+#define __ATTRIB_PACK
-+#define __ATTRIB_PRINTF
-+#define __ATTRIB_NORETURN
-+#ifndef INLINE
-+#define INLINE                  __inline
-+#endif
-+#endif /* End __GNUC__ */
-+
-+#define PREPACK
-+#define POSTPACK                __ATTRIB_PACK
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* _OSAPI_LINUX_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c b/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
-new file mode 100644
-index 0000000..d775e4d
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
-@@ -0,0 +1,1946 @@
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "ar6000_drv.h"
-+
-+static A_UINT8 bcast_mac[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-+static void ar6000_set_quality(struct iw_quality *iq, A_INT8 rssi);
-+extern unsigned int wmitimeout;
-+extern A_WAITQUEUE_HEAD arEvent;
-+extern wait_queue_head_t ar6000_scan_queue;
-+
-+/*
-+ * Encode a WPA or RSN information element as a custom
-+ * element using the hostap format.
-+ */
-+static u_int
-+encode_ie(void *buf, size_t bufsize,
-+    const u_int8_t *ie, size_t ielen,
-+    const char *leader, size_t leader_len)
-+{
-+    u_int8_t *p;
-+    int i;
-+
-+    if (bufsize < leader_len)
-+        return 0;
-+    p = buf;
-+    memcpy(p, leader, leader_len);
-+    bufsize -= leader_len;
-+    p += leader_len;
-+    for (i = 0; i < ielen && bufsize > 2; i++)
-+        p += sprintf(p, "%02x", ie[i]);
-+    return (i == ielen ? p - (u_int8_t *)buf : 0);
-+}
-+
-+void
-+ar6000_scan_node(void *arg, bss_t *ni)
-+{
-+    struct iw_event iwe;
-+#if WIRELESS_EXT > 14
-+    char buf[64*2 + 30];
-+#endif
-+    struct ar_giwscan_param *param;
-+    A_CHAR *current_ev;
-+    A_CHAR *end_buf;
-+    struct ieee80211_common_ie  *cie;
-+
-+    param = (struct ar_giwscan_param *)arg;
-+
-+    if (param->current_ev >= param->end_buf) {
-+        return;
-+    }
-+    if ((param->firstPass == TRUE) &&
-+        ((ni->ni_cie.ie_wpa == NULL) && (ni->ni_cie.ie_rsn == NULL))) {
-+        /*
-+         * Only forward wpa bss's in first pass
-+         */
-+        return;
-+    }
-+
-+     if ((param->firstPass == FALSE) &&
-+        ((ni->ni_cie.ie_wpa != NULL) || (ni->ni_cie.ie_rsn != NULL))) {
-+        /*
-+         * Only forward non-wpa bss's in 2nd pass
-+         */
-+        return;
-+    }
-+
-+    current_ev = param->current_ev;
-+    end_buf = param->end_buf;
-+
-+    cie = &ni->ni_cie;
-+
-+    A_MEMZERO(&iwe, sizeof(iwe));
-+    iwe.cmd = SIOCGIWAP;
-+    iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
-+    A_MEMCPY(iwe.u.ap_addr.sa_data, ni->ni_macaddr, 6);
-+    current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
-+                                      IW_EV_ADDR_LEN);
-+
-+    A_MEMZERO(&iwe, sizeof(iwe));
-+    iwe.cmd = SIOCGIWESSID;
-+    iwe.u.data.flags = 1;
-+    iwe.u.data.length = cie->ie_ssid[1];
-+    current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
-+                                      &cie->ie_ssid[2]);
-+
-+    if (cie->ie_capInfo & (IEEE80211_CAPINFO_ESS|IEEE80211_CAPINFO_IBSS)) {
-+        A_MEMZERO(&iwe, sizeof(iwe));
-+        iwe.cmd = SIOCGIWMODE;
-+        iwe.u.mode = cie->ie_capInfo & IEEE80211_CAPINFO_ESS ?
-+                IW_MODE_MASTER : IW_MODE_ADHOC;
-+        current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
-+                                          IW_EV_UINT_LEN);
-+    }
-+
-+    A_MEMZERO(&iwe, sizeof(iwe));
-+    iwe.cmd = SIOCGIWFREQ;
-+    iwe.u.freq.m = cie->ie_chan * 100000;
-+    iwe.u.freq.e = 1;
-+    current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
-+                                      IW_EV_FREQ_LEN);
-+
-+    A_MEMZERO(&iwe, sizeof(iwe));
-+    iwe.cmd = IWEVQUAL;
-+    ar6000_set_quality(&iwe.u.qual, ni->ni_snr);
-+    current_ev = iwe_stream_add_event(current_ev, end_buf, &iwe,
-+                                      IW_EV_QUAL_LEN);
-+
-+    A_MEMZERO(&iwe, sizeof(iwe));
-+    iwe.cmd = SIOCGIWENCODE;
-+    if (cie->ie_capInfo & IEEE80211_CAPINFO_PRIVACY) {
-+        iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
-+    } else {
-+        iwe.u.data.flags = IW_ENCODE_DISABLED;
-+    }
-+    iwe.u.data.length = 0;
-+    current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, "");
-+
-+    A_MEMZERO(&iwe, sizeof(iwe));
-+    iwe.cmd = IWEVCUSTOM;
-+    snprintf(buf, sizeof(buf), "bcn_int=%d", cie->ie_beaconInt);
-+    iwe.u.data.length = strlen(buf);
-+    current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, buf);
-+
-+    if (cie->ie_wpa != NULL) {
-+        static const char wpa_leader[] = "wpa_ie=";
-+
-+        A_MEMZERO(&iwe, sizeof(iwe));
-+        iwe.cmd = IWEVCUSTOM;
-+        iwe.u.data.length = encode_ie(buf, sizeof(buf), cie->ie_wpa,
-+                                      cie->ie_wpa[1]+2,
-+                                      wpa_leader, sizeof(wpa_leader)-1);
-+
-+        if (iwe.u.data.length != 0) {
-+            current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, buf);
-+        }
-+    }
-+
-+    if (cie->ie_rsn != NULL && cie->ie_rsn[0] == IEEE80211_ELEMID_RSN) {
-+        static const char rsn_leader[] = "rsn_ie=";
-+
-+        A_MEMZERO(&iwe, sizeof(iwe));
-+        iwe.cmd = IWEVCUSTOM;
-+        iwe.u.data.length = encode_ie(buf, sizeof(buf), cie->ie_rsn,
-+                                      cie->ie_rsn[1]+2,
-+                                      rsn_leader, sizeof(rsn_leader)-1);
-+
-+        if (iwe.u.data.length != 0) {
-+            current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, buf);
-+        }
-+    }
-+
-+    if (cie->ie_wmm != NULL) {
-+        static const char wmm_leader[] = "wmm_ie=";
-+
-+        A_MEMZERO(&iwe, sizeof(iwe));
-+        iwe.cmd = IWEVCUSTOM;
-+        iwe.u.data.length = encode_ie(buf, sizeof(buf), cie->ie_wmm,
-+                                      cie->ie_wmm[1]+2,
-+                                      wmm_leader, sizeof(wmm_leader)-1);
-+        if (iwe.u.data.length != 0) {
-+            current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, buf);
-+        }
-+    }
-+
-+    if (cie->ie_ath != NULL) {
-+        static const char ath_leader[] = "ath_ie=";
-+
-+        A_MEMZERO(&iwe, sizeof(iwe));
-+        iwe.cmd = IWEVCUSTOM;
-+        iwe.u.data.length = encode_ie(buf, sizeof(buf), cie->ie_ath,
-+                                      cie->ie_ath[1]+2,
-+                                      ath_leader, sizeof(ath_leader)-1);
-+        if (iwe.u.data.length != 0) {
-+            current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe, buf);
-+        }
-+    }
-+
-+    param->current_ev = current_ev;
-+}
-+
-+int
-+ar6000_ioctl_giwscan(struct net_device *dev,
-+            struct iw_request_info *info,
-+            struct iw_point *data, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    struct ar_giwscan_param param;
-+    int i;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    param.current_ev = extra;
-+    param.end_buf = extra + IW_SCAN_MAX_DATA;
-+    param.firstPass = TRUE;
-+
-+    /*
-+     * Do two passes to insure WPA scan candidates
-+     * are sorted to the front.  This is a hack to deal with
-+     * the wireless extensions capping scan results at
-+     * IW_SCAN_MAX_DATA bytes.  In densely populated environments
-+     * it's easy to overflow this buffer (especially with WPA/RSN
-+     * information elements).  Note this sorting hack does not
-+     * guarantee we won't overflow anyway.
-+     */
-+    for (i = 0; i < 2; i++) {
-+        /*
-+         * Translate data to WE format.
-+         */
-+        wmi_iterate_nodes(ar->arWmi, ar6000_scan_node, &param);
-+        param.firstPass = FALSE;
-+        if (param.current_ev >= param.end_buf) {
-+            data->length = param.current_ev - extra;
-+            return -E2BIG;
-+        }
-+    }
-+
-+    if(!(data->length = param.current_ev - extra)) {
-+          printk("%s(): data length %d\n", __FUNCTION__, data->length);
-+          return -EAGAIN;
-+    }
-+    return 0;
-+}
-+
-+extern int reconnect_flag;
-+/* SIOCSIWESSID */
-+static int
-+ar6000_ioctl_siwessid(struct net_device *dev,
-+                     struct iw_request_info *info,
-+                     struct iw_point *data, char *ssid)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    A_STATUS status;
-+    A_UINT8     arNetworkType;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    /*
-+     * iwconfig passes a null terminated string with length including this
-+     * so we need to account for this
-+     */
-+    if (data->flags && (!data->length || (data->length == 1) ||
-+        ((data->length - 1) > sizeof(ar->arSsid))))
-+    {
-+        /*
-+         * ssid is invalid
-+         */
-+        return -EINVAL;
-+    }
-+    /* Added for bug 25178, return an IOCTL error instead of target returning
-+       Illegal parameter error when either the BSSID or channel is missing
-+       and we cannot scan during connect.
-+     */
-+    if (data->flags) {
-+        if (ar->arSkipScan == TRUE &&
-+            (ar->arChannelHint == 0 ||
-+             (!ar->arReqBssid[0] && !ar->arReqBssid[1] && !ar->arReqBssid[2] &&
-+              !ar->arReqBssid[3] && !ar->arReqBssid[4] && !ar->arReqBssid[5])))
-+        {
-+            return -EINVAL;
-+        }
-+    }
-+
-+    if (down_interruptible(&ar->arSem)) {
-+        return -ERESTARTSYS;
-+    }
-+
-+    if (ar->arTxPending[WMI_CONTROL_PRI]) {
-+        /*
-+         * sleep until the command queue drains
-+         */
-+        wait_event_interruptible_timeout(arEvent,
-+            ar->arTxPending[WMI_CONTROL_PRI] == 0, wmitimeout * HZ);
-+        if (signal_pending(current)) {
-+            return -EINTR;
-+        }
-+    }
-+
-+    if (!data->flags) {
-+        arNetworkType = ar->arNetworkType;
-+        ar6000_init_profile_info(ar);
-+        ar->arNetworkType = arNetworkType;
-+    }
-+
-+    if ((ar->arSsidLen) || (!data->flags))
-+    {
-+        if ((!data->flags) ||
-+            (A_MEMCMP(ar->arSsid, ssid, ar->arSsidLen) != 0) ||
-+            (ar->arSsidLen != (data->length)))
-+        {
-+            /*
-+             * SSID set previously or essid off has been issued.
-+             *
-+             * Disconnect Command is issued in two cases after wmi is ready
-+             * (1) ssid is different from the previous setting
-+             * (2) essid off has been issued
-+             *
-+             */
-+            if (ar->arWmiReady == TRUE) {
-+                reconnect_flag = 0;
-+                status = wmi_disconnect_cmd(ar->arWmi);
-+                A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
-+                ar->arSsidLen = 0;
-+                if (ar->arSkipScan == FALSE) {
-+                    A_MEMZERO(ar->arReqBssid, sizeof(ar->arReqBssid));
-+                }
-+                if (!data->flags) {
-+                    up(&ar->arSem);
-+                    return 0;
-+                }
-+            } else {
-+                 up(&ar->arSem);
-+            }
-+        }
-+        else
-+        {
-+            /*
-+             * SSID is same, so we assume profile hasn't changed.
-+             * If the interface is up and wmi is ready, we issue
-+             * a reconnect cmd. Issue a reconnect only we are already
-+             * connected.
-+             */
-+            if((ar->arConnected == TRUE) && (ar->arWmiReady == TRUE))
-+            {
-+                reconnect_flag = TRUE;
-+                status = wmi_reconnect_cmd(ar->arWmi,ar->arReqBssid,
-+                                           ar->arChannelHint);
-+                up(&ar->arSem);
-+                if (status != A_OK) {
-+                    return -EIO;
-+                }
-+                return 0;
-+            }
-+            else{
-+                /*
-+                 * Dont return if connect is pending.
-+                 */
-+                if(!(ar->arConnectPending)) {
-+                    up(&ar->arSem);
-+                    return 0;
-+                }
-+            }
-+        }
-+    }
-+
-+    ar->arSsidLen = data->length;
-+    A_MEMCPY(ar->arSsid, ssid, ar->arSsidLen);
-+
-+    /* The ssid length check prevents second "essid off" from the user,
-+       to be treated as a connect cmd. The second "essid off" is ignored.
-+    */
-+    if((ar->arWmiReady == TRUE) && (ar->arSsidLen > 0) )
-+    {
-+        AR6000_SPIN_LOCK(&ar->arLock, 0);
-+        if (SHARED_AUTH == ar->arDot11AuthMode) {
-+            ar6000_install_static_wep_keys(ar);
-+        }
-+        AR_DEBUG_PRINTF("Connect called with authmode %d dot11 auth %d"\
-+                        " PW crypto %d PW crypto Len %d GRP crypto %d"\
-+                        " GRP crypto Len %d\n",
-+                        ar->arAuthMode, ar->arDot11AuthMode,
-+                        ar->arPairwiseCrypto, ar->arPairwiseCryptoLen,
-+                        ar->arGroupCrypto, ar->arGroupCryptoLen);
-+        reconnect_flag = 0;
-+        AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+        status = wmi_connect_cmd(ar->arWmi, ar->arNetworkType,
-+                                 ar->arDot11AuthMode, ar->arAuthMode,
-+                                 ar->arPairwiseCrypto, ar->arPairwiseCryptoLen,
-+                                 ar->arGroupCrypto,ar->arGroupCryptoLen,
-+                                 ar->arSsidLen, ar->arSsid,
-+                                 ar->arReqBssid, ar->arChannelHint,
-+                                 ar->arConnectCtrlFlags);
-+
-+
-+        up(&ar->arSem);
-+
-+        if (status != A_OK) {
-+            return -EIO;
-+        }
-+        ar->arConnectPending = TRUE;
-+    }else{
-+      up(&ar->arSem);
-+    }
-+    return 0;
-+}
-+
-+/* SIOCGIWESSID */
-+static int
-+ar6000_ioctl_giwessid(struct net_device *dev,
-+                     struct iw_request_info *info,
-+                     struct iw_point *data, char *essid)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    if (!ar->arSsidLen) {
-+        return -EINVAL;
-+    }
-+
-+    data->flags = 1;
-+    data->length = ar->arSsidLen;
-+    A_MEMCPY(essid, ar->arSsid, ar->arSsidLen);
-+
-+    return 0;
-+}
-+
-+
-+void ar6000_install_static_wep_keys(AR_SOFTC_T *ar)
-+{
-+    A_UINT8 index;
-+    A_UINT8 keyUsage;
-+
-+    for (index = WMI_MIN_KEY_INDEX; index <= WMI_MAX_KEY_INDEX; index++) {
-+        if (ar->arWepKeyList[index].arKeyLen) {
-+            keyUsage = GROUP_USAGE;
-+            if (index == ar->arDefTxKeyIndex) {
-+                keyUsage |= TX_USAGE;
-+            }
-+            wmi_addKey_cmd(ar->arWmi,
-+                           index,
-+                           WEP_CRYPT,
-+                           keyUsage,
-+                           ar->arWepKeyList[index].arKeyLen,
-+                           NULL,
-+                           ar->arWepKeyList[index].arKey, KEY_OP_INIT_VAL,
-+                           NO_SYNC_WMIFLAG);
-+        }
-+    }
-+}
-+
-+int
-+ar6000_ioctl_delkey(struct net_device *dev, struct iw_request_info *info,
-+             void *w, char *extra)
-+{
-+    return 0;
-+}
-+
-+int
-+ar6000_ioctl_setmlme(struct net_device *dev, struct iw_request_info *info,
-+             void *w, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    struct ieee80211req_mlme *mlme = (struct ieee80211req_mlme *)extra;
-+
-+    if ((ar->arWmiReady == FALSE) || (ar->arConnected != TRUE))
-+              return -EIO;
-+
-+    switch (mlme->im_op) {
-+        case IEEE80211_MLME_DISASSOC:
-+        case IEEE80211_MLME_DEAUTH:
-+            /* Not Supported */
-+            break;
-+        default:
-+            break;
-+    }
-+    return 0;
-+}
-+
-+
-+int
-+ar6000_ioctl_setwmmparams(struct net_device *dev, struct iw_request_info *info,
-+             void *w, char *extra)
-+{
-+    return -EIO;            /* for now */
-+}
-+
-+int
-+ar6000_ioctl_getwmmparams(struct net_device *dev, struct iw_request_info *info,
-+             void *w, char *extra)
-+{
-+    return -EIO;            /* for now */
-+}
-+
-+int ar6000_ioctl_setoptie(struct net_device *dev, struct iw_request_info *info,
-+                        struct iw_point *data, char *extra)
-+{
-+      /* The target generates the WPA/RSN IE */
-+      return 0;
-+}
-+
-+int
-+ar6000_ioctl_setauthalg(struct net_device *dev, struct iw_request_info *info,
-+             void *w, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    struct ieee80211req_authalg *req = (struct ieee80211req_authalg *)extra;
-+    int ret = 0;
-+
-+
-+    AR6000_SPIN_LOCK(&ar->arLock, 0);
-+
-+    if (req->auth_alg == AUTH_ALG_OPEN_SYSTEM) {
-+        ar->arDot11AuthMode  = OPEN_AUTH;
-+    } else if (req->auth_alg == AUTH_ALG_LEAP) {
-+        ar->arDot11AuthMode   = LEAP_AUTH;
-+        ar->arPairwiseCrypto  = WEP_CRYPT;
-+        ar->arGroupCrypto     = WEP_CRYPT;
-+    } else {
-+        ret = -EIO;
-+    }
-+
-+    AR6000_SPIN_UNLOCK(&ar->arLock, 0);
-+
-+    return ret;
-+}
-+static int
-+ar6000_ioctl_addpmkid(struct net_device *dev, struct iw_request_info *info,
-+             void *w, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    struct ieee80211req_addpmkid  *req = (struct ieee80211req_addpmkid *)extra;
-+    A_STATUS status;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    AR_DEBUG_PRINTF("Add pmkid for %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x en=%d\n",
-+                    req->pi_bssid[0], req->pi_bssid[1], req->pi_bssid[2],
-+                    req->pi_bssid[3], req->pi_bssid[4], req->pi_bssid[5],
-+                    req->pi_enable);
-+
-+    status = wmi_setPmkid_cmd(ar->arWmi, req->pi_bssid, req->pi_pmkid,
-+                              req->pi_enable);
-+
-+    if (status != A_OK) {
-+        return -EIO;
-+    }
-+
-+    return 0;
-+}
-+
-+/*
-+ * SIOCSIWRATE
-+ */
-+int
-+ar6000_ioctl_siwrate(struct net_device *dev,
-+            struct iw_request_info *info,
-+            struct iw_param *rrq, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    A_UINT32  kbps;
-+
-+    if (rrq->fixed) {
-+        kbps = rrq->value / 1000;           /* rrq->value is in bps */
-+    } else {
-+        kbps = -1;                          /* -1 indicates auto rate */
-+    }
-+    if(kbps != -1 && wmi_validate_bitrate(ar->arWmi, kbps) == A_EINVAL)
-+    {
-+        AR_DEBUG_PRINTF("BitRate is not Valid %d\n", kbps);
-+        return -EINVAL;
-+    }
-+    ar->arBitRate = kbps;
-+    if(ar->arWmiReady == TRUE)
-+    {
-+        if (wmi_set_bitrate_cmd(ar->arWmi, kbps) != A_OK) {
-+            return -EINVAL;
-+        }
-+    }
-+    return 0;
-+}
-+
-+/*
-+ * SIOCGIWRATE
-+ */
-+int
-+ar6000_ioctl_giwrate(struct net_device *dev,
-+            struct iw_request_info *info,
-+            struct iw_param *rrq, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    int ret = 0;
-+
-+    if (down_interruptible(&ar->arSem)) {
-+        return -ERESTARTSYS;
-+    }
-+    if(ar->arWmiReady == TRUE)
-+    {
-+        ar->arBitRate = 0xFFFF;
-+        if (wmi_get_bitrate_cmd(ar->arWmi) != A_OK) {
-+            up(&ar->arSem);
-+            return -EIO;
-+        }
-+        wait_event_interruptible_timeout(arEvent, ar->arBitRate != 0xFFFF, wmitimeout * HZ);
-+        if (signal_pending(current)) {
-+            ret = -EINTR;
-+        }
-+    }
-+    /* If the interface is down or wmi is not ready or the target is not
-+       connected - return the value stored in the device structure */
-+    if (!ret) {
-+        if (ar->arBitRate == -1) {
-+            rrq->fixed = TRUE;
-+            rrq->value = 0;
-+        } else {
-+            rrq->value = ar->arBitRate * 1000;
-+        }
-+    }
-+
-+    up(&ar->arSem);
-+
-+    return ret;
-+}
-+
-+/*
-+ * SIOCSIWTXPOW
-+ */
-+static int
-+ar6000_ioctl_siwtxpow(struct net_device *dev,
-+             struct iw_request_info *info,
-+             struct iw_param *rrq, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    A_UINT8 dbM;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    if (rrq->disabled) {
-+        return -EOPNOTSUPP;
-+    }
-+
-+    if (rrq->fixed) {
-+        if (rrq->flags != IW_TXPOW_DBM) {
-+            return -EOPNOTSUPP;
-+        }
-+        ar->arTxPwr= dbM = rrq->value;
-+        ar->arTxPwrSet = TRUE;
-+    } else {
-+        ar->arTxPwr = dbM = 0;
-+        ar->arTxPwrSet = FALSE;
-+    }
-+    if(ar->arWmiReady == TRUE)
-+    {
-+        AR_DEBUG_PRINTF("Set tx pwr cmd %d dbM\n", dbM);
-+        wmi_set_txPwr_cmd(ar->arWmi, dbM);
-+    }
-+    return 0;
-+}
-+
-+/*
-+ * SIOCGIWTXPOW
-+ */
-+int
-+ar6000_ioctl_giwtxpow(struct net_device *dev,
-+            struct iw_request_info *info,
-+            struct iw_param *rrq, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    int ret = 0;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    if (down_interruptible(&ar->arSem)) {
-+        return -ERESTARTSYS;
-+    }
-+    if((ar->arWmiReady == TRUE) && (ar->arConnected == TRUE))
-+    {
-+        ar->arTxPwr = 0;
-+
-+        if (wmi_get_txPwr_cmd(ar->arWmi) != A_OK) {
-+            up(&ar->arSem);
-+            return -EIO;
-+        }
-+
-+        wait_event_interruptible_timeout(arEvent, ar->arTxPwr != 0, wmitimeout * HZ);
-+
-+        if (signal_pending(current)) {
-+            ret = -EINTR;
-+         }
-+    }
-+   /* If the interace is down or wmi is not ready or target is not connected
-+      then return value stored in the device structure */
-+
-+    if (!ret) {
-+         if (ar->arTxPwrSet == TRUE) {
-+            rrq->fixed = TRUE;
-+        }
-+        rrq->value = ar->arTxPwr;
-+        rrq->flags = IW_TXPOW_DBM;
-+    }
-+
-+    up(&ar->arSem);
-+
-+    return ret;
-+}
-+
-+/*
-+ * SIOCSIWRETRY
-+ * since iwconfig only provides us with one max retry value, we use it
-+ * to apply to data frames of the BE traffic class.
-+ */
-+static int
-+ar6000_ioctl_siwretry(struct net_device *dev,
-+             struct iw_request_info *info,
-+             struct iw_param *rrq, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    if (rrq->disabled) {
-+        return -EOPNOTSUPP;
-+    }
-+
-+    if ((rrq->flags & IW_RETRY_TYPE) != IW_RETRY_LIMIT) {
-+        return -EOPNOTSUPP;
-+    }
-+
-+    if ( !(rrq->value >= WMI_MIN_RETRIES) || !(rrq->value <= WMI_MAX_RETRIES)) {
-+            return - EINVAL;
-+    }
-+    if(ar->arWmiReady == TRUE)
-+    {
-+        if (wmi_set_retry_limits_cmd(ar->arWmi, DATA_FRAMETYPE, WMM_AC_BE,
-+                                     rrq->value, 0) != A_OK){
-+            return -EINVAL;
-+        }
-+    }
-+    ar->arMaxRetries = rrq->value;
-+    return 0;
-+}
-+
-+/*
-+ * SIOCGIWRETRY
-+ */
-+static int
-+ar6000_ioctl_giwretry(struct net_device *dev,
-+             struct iw_request_info *info,
-+             struct iw_param *rrq, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    rrq->disabled = 0;
-+    switch (rrq->flags & IW_RETRY_TYPE) {
-+    case IW_RETRY_LIFETIME:
-+        return -EOPNOTSUPP;
-+        break;
-+    case IW_RETRY_LIMIT:
-+        rrq->flags = IW_RETRY_LIMIT;
-+        switch (rrq->flags & IW_RETRY_MODIFIER) {
-+        case IW_RETRY_MIN:
-+            rrq->flags |= IW_RETRY_MIN;
-+            rrq->value = WMI_MIN_RETRIES;
-+            break;
-+        case IW_RETRY_MAX:
-+            rrq->flags |= IW_RETRY_MAX;
-+            rrq->value = ar->arMaxRetries;
-+            break;
-+        }
-+        break;
-+    }
-+    return 0;
-+}
-+
-+/*
-+ * SIOCSIWENCODE
-+ */
-+static int
-+ar6000_ioctl_siwencode(struct net_device *dev,
-+              struct iw_request_info *info,
-+              struct iw_point *erq, char *keybuf)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    int index;
-+    A_INT32 auth = ar->arDot11AuthMode;
-+    /*
-+     *  Static WEP Keys should be configured before setting the SSID
-+     */
-+    if (ar->arSsidLen) {
-+        return -EIO;
-+    }
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    index = erq->flags & IW_ENCODE_INDEX;
-+
-+    if (index && (((index - 1) < WMI_MIN_KEY_INDEX) ||
-+                  ((index - 1) > WMI_MAX_KEY_INDEX)))
-+    {
-+        return -EIO;
-+    }
-+
-+    if (erq->flags & IW_ENCODE_DISABLED) {
-+        /*
-+         * Encryption disabled
-+         */
-+        if (index) {
-+            /*
-+             * If key index was specified then clear the specified key
-+             */
-+            index--;
-+            A_MEMZERO(ar->arWepKeyList[index].arKey,
-+                      sizeof(ar->arWepKeyList[index].arKey));
-+            ar->arWepKeyList[index].arKeyLen = 0;
-+        }
-+        ar->arDot11AuthMode       = OPEN_AUTH;
-+        ar->arPairwiseCrypto      = NONE_CRYPT;
-+        ar->arGroupCrypto         = NONE_CRYPT;
-+        ar->arAuthMode            = NONE_AUTH;
-+    } else {
-+        /*
-+         * Enabling WEP encryption
-+         */
-+        if (index) {
-+            index--;                /* keyindex is off base 1 in iwconfig */
-+        }
-+
-+        if (erq->flags & IW_ENCODE_OPEN) {
-+            auth = OPEN_AUTH;
-+        } else if (erq->flags & IW_ENCODE_RESTRICTED) {
-+            auth = SHARED_AUTH;
-+        }
-+
-+        if (erq->length) {
-+            if (!IEEE80211_IS_VALID_WEP_CIPHER_LEN(erq->length)) {
-+                return -EIO;
-+            }
-+
-+            A_MEMZERO(ar->arWepKeyList[index].arKey,
-+                      sizeof(ar->arWepKeyList[index].arKey));
-+            A_MEMCPY(ar->arWepKeyList[index].arKey, keybuf, erq->length);
-+            ar->arWepKeyList[index].arKeyLen = erq->length;
-+        } else {
-+            if (ar->arWepKeyList[index].arKeyLen == 0) {
-+                return -EIO;
-+            }
-+            ar->arDefTxKeyIndex = index;
-+        }
-+
-+        ar->arPairwiseCrypto      = WEP_CRYPT;
-+        ar->arGroupCrypto         = WEP_CRYPT;
-+        ar->arDot11AuthMode       = auth;
-+        ar->arAuthMode            = NONE_AUTH;
-+    }
-+
-+    /*
-+     * profile has changed.  Erase ssid to signal change
-+     */
-+    A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
-+
-+    return 0;
-+}
-+
-+static int
-+ar6000_ioctl_giwencode(struct net_device *dev,
-+              struct iw_request_info *info,
-+              struct iw_point *erq, char *key)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-+    A_UINT8 keyIndex;
-+    struct ar_wep_key *wk;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    if (ar->arPairwiseCrypto == NONE_CRYPT) {
-+        erq->length = 0;
-+        erq->flags = IW_ENCODE_DISABLED;
-+    } else {
-+        /* get the keyIndex */
-+        keyIndex = erq->flags & IW_ENCODE_INDEX;
-+        if (0 == keyIndex) {
-+            keyIndex = ar->arDefTxKeyIndex;
-+        } else if ((keyIndex - 1 < WMI_MIN_KEY_INDEX) ||
-+                   (keyIndex - 1 > WMI_MAX_KEY_INDEX))
-+        {
-+            keyIndex = WMI_MIN_KEY_INDEX;
-+        } else {
-+            keyIndex--;
-+        }
-+        erq->flags = keyIndex + 1;
-+        erq->flags |= IW_ENCODE_ENABLED;
-+        wk = &ar->arWepKeyList[keyIndex];
-+        if (erq->length > wk->arKeyLen) {
-+            erq->length = wk->arKeyLen;
-+        }
-+        if (wk->arKeyLen) {
-+            A_MEMCPY(key, wk->arKey, erq->length);
-+        }
-+        if (ar->arDot11AuthMode == OPEN_AUTH) {
-+            erq->flags |= IW_ENCODE_OPEN;
-+        } else if (ar->arDot11AuthMode == SHARED_AUTH) {
-+            erq->flags |= IW_ENCODE_RESTRICTED;
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+static int ar6000_ioctl_siwpower(struct net_device *dev,
-+                               struct iw_request_info *info,
-+                               union iwreq_data *wrqu, char *extra)
-+{
-+      AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-+      WMI_POWER_MODE power_mode;
-+
-+      if (wrqu->power.disabled)
-+              power_mode = MAX_PERF_POWER;
-+      else
-+              power_mode = REC_POWER;
-+
-+      if (wmi_powermode_cmd(ar->arWmi, power_mode) < 0)
-+              return -EIO;
-+
-+      return 0;
-+}
-+
-+static int ar6000_ioctl_giwpower(struct net_device *dev,
-+                               struct iw_request_info *info,
-+                               union iwreq_data *wrqu, char *extra)
-+{
-+      AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-+
-+      return wmi_get_power_mode_cmd(ar->arWmi);
-+}
-+
-+static int ar6000_ioctl_siwgenie(struct net_device *dev,
-+                               struct iw_request_info *info,
-+                               struct iw_point *dwrq,
-+                               char *extra)
-+{
-+      /* The target does that for us */
-+      return 0;
-+}
-+
-+static int ar6000_ioctl_giwgenie(struct net_device *dev,
-+                               struct iw_request_info *info,
-+                               struct iw_point *dwrq,
-+                               char *extra)
-+{
-+      return 0;
-+}
-+
-+static int ar6000_ioctl_siwauth(struct net_device *dev,
-+                              struct iw_request_info *info,
-+                              struct iw_param *param,
-+                              char *extra)
-+{
-+      AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-+      int reset = 0;
-+
-+      switch (param->flags & IW_AUTH_INDEX) {
-+      case IW_AUTH_WPA_VERSION:
-+              if (param->value & IW_AUTH_WPA_VERSION_DISABLED) {
-+                      ar->arAuthMode = NONE_AUTH;
-+              }
-+              if (param->value & IW_AUTH_WPA_VERSION_WPA) {
-+                      ar->arAuthMode = WPA_AUTH;
-+              }
-+              if (param->value & IW_AUTH_WPA_VERSION_WPA2) {
-+                      ar->arAuthMode = WPA2_AUTH;
-+              }
-+
-+              reset = 1;
-+              break;
-+      case IW_AUTH_CIPHER_PAIRWISE:
-+              if (param->value & IW_AUTH_CIPHER_NONE) {
-+                      ar->arPairwiseCrypto = NONE_CRYPT;
-+              }
-+              if (param->value & IW_AUTH_CIPHER_WEP40) {
-+                      ar->arPairwiseCrypto = WEP_CRYPT;
-+              }
-+              if (param->value & IW_AUTH_CIPHER_TKIP) {
-+                      ar->arPairwiseCrypto = TKIP_CRYPT;
-+              }
-+              if (param->value & IW_AUTH_CIPHER_CCMP) {
-+                      ar->arPairwiseCrypto = AES_CRYPT;
-+              }
-+
-+              reset = 1;
-+              break;
-+      case IW_AUTH_CIPHER_GROUP:
-+              if (param->value & IW_AUTH_CIPHER_NONE) {
-+                      ar->arGroupCrypto = NONE_CRYPT;
-+              }
-+              if (param->value & IW_AUTH_CIPHER_WEP40) {
-+                      ar->arGroupCrypto = WEP_CRYPT;
-+              }
-+              if (param->value & IW_AUTH_CIPHER_TKIP) {
-+                      ar->arGroupCrypto = TKIP_CRYPT;
-+              }
-+              if (param->value & IW_AUTH_CIPHER_CCMP) {
-+                      ar->arGroupCrypto = AES_CRYPT;
-+              }
-+
-+              reset = 1;
-+              break;
-+      case IW_AUTH_KEY_MGMT:
-+              if (param->value & IW_AUTH_KEY_MGMT_PSK) {
-+                      if (ar->arAuthMode == WPA_AUTH) {
-+                              ar->arAuthMode = WPA_PSK_AUTH;
-+                      } else if (ar->arAuthMode == WPA2_AUTH) {
-+                              ar->arAuthMode = WPA2_PSK_AUTH;
-+                      }
-+
-+                      reset = 1;
-+              }
-+              break;
-+
-+      case IW_AUTH_TKIP_COUNTERMEASURES:
-+              if (ar->arWmiReady == FALSE) {
-+                      return -EIO;
-+              }
-+              wmi_set_tkip_countermeasures_cmd(ar->arWmi, param->value);
-+              break;
-+
-+      case IW_AUTH_DROP_UNENCRYPTED:
-+              break;
-+
-+      case IW_AUTH_80211_AUTH_ALG:
-+              if (param->value & IW_AUTH_ALG_OPEN_SYSTEM) {
-+                      ar->arDot11AuthMode  = OPEN_AUTH;
-+              }
-+              if (param->value & IW_AUTH_ALG_SHARED_KEY) {
-+                      ar->arDot11AuthMode  = SHARED_AUTH;
-+              }
-+              if (param->value & IW_AUTH_ALG_LEAP) {
-+                      ar->arDot11AuthMode   = LEAP_AUTH;
-+                      ar->arPairwiseCrypto  = WEP_CRYPT;
-+                      ar->arGroupCrypto     = WEP_CRYPT;
-+              }
-+
-+              reset = 1;
-+              break;
-+
-+      case IW_AUTH_WPA_ENABLED:
-+              reset = 1;
-+              break;
-+
-+      case IW_AUTH_RX_UNENCRYPTED_EAPOL:
-+              break;
-+
-+      case IW_AUTH_PRIVACY_INVOKED:
-+              break;
-+
-+      default:
-+              printk("%s(): Unknown flag 0x%x\n", __FUNCTION__, param->flags);
-+              return -EOPNOTSUPP;
-+      }
-+
-+      if (reset)
-+              memset(ar->arSsid, 0, sizeof(ar->arSsid));
-+
-+      return 0;
-+}
-+
-+static int ar6000_ioctl_giwauth(struct net_device *dev,
-+                              struct iw_request_info *info,
-+                              struct iw_param *dwrq,
-+                              char *extra)
-+{
-+      return 0;
-+}
-+
-+static int ar6000_ioctl_siwencodeext(struct net_device *dev,
-+                                   struct iw_request_info *info,
-+                                   union iwreq_data *wrqu,
-+                                   char *extra)
-+{
-+      AR_SOFTC_T *ar = (AR_SOFTC_T *)netdev_priv(dev);
-+      struct iw_point *encoding = &wrqu->encoding;
-+      struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
-+      int alg = ext->alg, idx;
-+
-+      if (ar->arWlanState == WLAN_DISABLED) {
-+              return -EIO;
-+      }
-+
-+      /* Determine and validate the key index */
-+      idx = (encoding->flags & IW_ENCODE_INDEX) - 1;
-+      if (idx) {
-+              if (idx < 0 || idx > 3)
-+                      return -EINVAL;
-+      }
-+
-+      if ((alg == IW_ENCODE_ALG_TKIP) || (alg == IW_ENCODE_ALG_CCMP)) {
-+              struct ieee80211req_key ik;
-+              KEY_USAGE key_usage;
-+              CRYPTO_TYPE key_type = NONE_CRYPT;
-+              int status;
-+
-+              ar->user_saved_keys.keyOk = FALSE;
-+
-+              if (alg == IW_ENCODE_ALG_TKIP) {
-+                      key_type = TKIP_CRYPT;
-+                      ik.ik_type = IEEE80211_CIPHER_TKIP;
-+              } else {
-+                      key_type = AES_CRYPT;
-+                      ik.ik_type = IEEE80211_CIPHER_AES_CCM;
-+              }
-+
-+              ik.ik_keyix = idx;
-+              ik.ik_keylen = ext->key_len;
-+              ik.ik_flags = IEEE80211_KEY_RECV;
-+              if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) {
-+                      ik.ik_flags |= IEEE80211_KEY_XMIT
-+                              | IEEE80211_KEY_DEFAULT;
-+              }
-+
-+              if (ext->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID) {
-+                      memcpy(&ik.ik_keyrsc, ext->rx_seq, 8);
-+              }
-+
-+              memcpy(ik.ik_keydata, ext->key, ext->key_len);
-+
-+              ar->user_saved_keys.keyType = key_type;
-+              if (ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) {
-+                      key_usage = GROUP_USAGE;
-+                      memset(ik.ik_macaddr, 0, ETH_ALEN);
-+                      memcpy(&ar->user_saved_keys.bcast_ik, &ik,
-+                             sizeof(struct ieee80211req_key));
-+              } else {
-+                      key_usage = PAIRWISE_USAGE;
-+                      memcpy(ik.ik_macaddr, ext->addr.sa_data, ETH_ALEN);
-+                      memcpy(&ar->user_saved_keys.ucast_ik, &ik,
-+                             sizeof(struct ieee80211req_key));
-+              }
-+
-+              status = wmi_addKey_cmd(ar->arWmi, ik.ik_keyix, key_type,
-+                                      key_usage, ik.ik_keylen,
-+                                      (A_UINT8 *)&ik.ik_keyrsc,
-+                                      ik.ik_keydata,
-+                                      KEY_OP_INIT_VAL, SYNC_BEFORE_WMIFLAG);
-+
-+              if (status < 0)
-+                      return -EIO;
-+
-+              ar->user_saved_keys.keyOk = TRUE;
-+
-+              return 0;
-+
-+      } else {
-+              /* WEP falls back to SIWENCODE */
-+              return -EOPNOTSUPP;
-+      }
-+
-+      return 0;
-+}
-+
-+
-+static int ar6000_ioctl_giwencodeext(struct net_device *dev,
-+                                   struct iw_request_info *info,
-+                                   struct iw_point *dwrq,
-+                                   char *extra)
-+{
-+      return 0;
-+}
-+
-+
-+static int
-+ar6000_ioctl_setparam(struct net_device *dev,
-+                      struct iw_request_info *info,
-+                      void *erq, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    int *i = (int *)extra;
-+    int param = i[0];
-+    int value = i[1];
-+    int ret = 0;
-+    A_BOOL profChanged = FALSE;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    switch (param) {
-+        case IEEE80211_PARAM_WPA:
-+            switch (value) {
-+                case WPA_MODE_WPA1:
-+                    ar->arAuthMode = WPA_AUTH;
-+                    profChanged    = TRUE;
-+                    break;
-+                case WPA_MODE_WPA2:
-+                    ar->arAuthMode = WPA2_AUTH;
-+                    profChanged    = TRUE;
-+                    break;
-+                case WPA_MODE_NONE:
-+                    ar->arAuthMode = NONE_AUTH;
-+                    profChanged    = TRUE;
-+                    break;
-+          default:
-+                  printk("IEEE80211_PARAM_WPA: Unknown value %d\n", value);
-+            }
-+            break;
-+        case IEEE80211_PARAM_AUTHMODE:
-+            switch(value) {
-+                case IEEE80211_AUTH_WPA_PSK:
-+                    if (WPA_AUTH == ar->arAuthMode) {
-+                        ar->arAuthMode = WPA_PSK_AUTH;
-+                        profChanged    = TRUE;
-+                    } else if (WPA2_AUTH == ar->arAuthMode) {
-+                        ar->arAuthMode = WPA2_PSK_AUTH;
-+                        profChanged    = TRUE;
-+                    } else {
-+                        AR_DEBUG_PRINTF("Error -  Setting PSK mode when WPA "\
-+                                        "param was set to %d\n",
-+                                        ar->arAuthMode);
-+                        ret = -1;
-+                    }
-+                    break;
-+                case IEEE80211_AUTH_WPA_CCKM:
-+                    if (WPA2_AUTH == ar->arAuthMode) {
-+                        ar->arAuthMode = WPA2_AUTH_CCKM;
-+                    } else {
-+                        ar->arAuthMode = WPA_AUTH_CCKM;
-+                    }
-+                    break;
-+                default:
-+                    break;
-+            }
-+            break;
-+        case IEEE80211_PARAM_UCASTCIPHER:
-+            switch (value) {
-+                case IEEE80211_CIPHER_AES_CCM:
-+                    ar->arPairwiseCrypto = AES_CRYPT;
-+                    profChanged          = TRUE;
-+                    break;
-+                case IEEE80211_CIPHER_TKIP:
-+                    ar->arPairwiseCrypto = TKIP_CRYPT;
-+                    profChanged          = TRUE;
-+                    break;
-+                case IEEE80211_CIPHER_WEP:
-+                    ar->arPairwiseCrypto = WEP_CRYPT;
-+                    profChanged          = TRUE;
-+                    break;
-+                case IEEE80211_CIPHER_NONE:
-+                    ar->arPairwiseCrypto = NONE_CRYPT;
-+                    profChanged          = TRUE;
-+                    break;
-+            }
-+            break;
-+        case IEEE80211_PARAM_UCASTKEYLEN:
-+            if (!IEEE80211_IS_VALID_WEP_CIPHER_LEN(value)) {
-+                ret = -EIO;
-+            } else {
-+                ar->arPairwiseCryptoLen = value;
-+            }
-+            break;
-+        case IEEE80211_PARAM_MCASTCIPHER:
-+            switch (value) {
-+                case IEEE80211_CIPHER_AES_CCM:
-+                    ar->arGroupCrypto = AES_CRYPT;
-+                    profChanged       = TRUE;
-+                    break;
-+                case IEEE80211_CIPHER_TKIP:
-+                    ar->arGroupCrypto = TKIP_CRYPT;
-+                    profChanged       = TRUE;
-+                    break;
-+                case IEEE80211_CIPHER_WEP:
-+                    ar->arGroupCrypto = WEP_CRYPT;
-+                    profChanged       = TRUE;
-+                    break;
-+                case IEEE80211_CIPHER_NONE:
-+                    ar->arGroupCrypto = NONE_CRYPT;
-+                    profChanged       = TRUE;
-+                    break;
-+            }
-+            break;
-+        case IEEE80211_PARAM_MCASTKEYLEN:
-+            if (!IEEE80211_IS_VALID_WEP_CIPHER_LEN(value)) {
-+                ret = -EIO;
-+            } else {
-+                ar->arGroupCryptoLen = value;
-+            }
-+            break;
-+        case IEEE80211_PARAM_COUNTERMEASURES:
-+            if (ar->arWmiReady == FALSE) {
-+                return -EIO;
-+            }
-+            wmi_set_tkip_countermeasures_cmd(ar->arWmi, value);
-+            break;
-+        default:
-+            break;
-+    }
-+
-+    if (profChanged == TRUE) {
-+        /*
-+         * profile has changed.  Erase ssid to signal change
-+         */
-+        A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
-+    }
-+
-+    return ret;
-+}
-+
-+int
-+ar6000_ioctl_getparam(struct net_device *dev, struct iw_request_info *info,
-+            void *w, char *extra)
-+{
-+    return -EIO;            /* for now */
-+}
-+
-+int
-+ar6000_ioctl_setkey(struct net_device *dev, struct iw_request_info *info,
-+                  void *w, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    struct ieee80211req_key *ik = (struct ieee80211req_key *)extra;
-+    KEY_USAGE keyUsage;
-+    A_STATUS status;
-+    CRYPTO_TYPE keyType = NONE_CRYPT;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    ar->user_saved_keys.keyOk = FALSE;
-+
-+    if ( 0 == memcmp(ik->ik_macaddr, "\x00\x00\x00\x00\x00\x00",
-+                     IEEE80211_ADDR_LEN)) {
-+        keyUsage = GROUP_USAGE;
-+        A_MEMCPY(&ar->user_saved_keys.bcast_ik, ik,
-+                 sizeof(struct ieee80211req_key));
-+    } else {
-+        keyUsage = PAIRWISE_USAGE;
-+        A_MEMCPY(&ar->user_saved_keys.ucast_ik, ik,
-+                 sizeof(struct ieee80211req_key));
-+    }
-+
-+    switch (ik->ik_type) {
-+        case IEEE80211_CIPHER_WEP:
-+            keyType = WEP_CRYPT;
-+            break;
-+        case IEEE80211_CIPHER_TKIP:
-+            keyType = TKIP_CRYPT;
-+            break;
-+        case IEEE80211_CIPHER_AES_CCM:
-+            keyType = AES_CRYPT;
-+            break;
-+        default:
-+            break;
-+    }
-+    ar->user_saved_keys.keyType = keyType;
-+
-+    if (IEEE80211_CIPHER_CCKM_KRK != ik->ik_type) {
-+        if (NONE_CRYPT == keyType) {
-+            return -EIO;
-+        }
-+
-+        status = wmi_addKey_cmd(ar->arWmi, ik->ik_keyix, keyType, keyUsage,
-+                                ik->ik_keylen, (A_UINT8 *)&ik->ik_keyrsc,
-+                                ik->ik_keydata, KEY_OP_INIT_VAL,
-+                                SYNC_BEFORE_WMIFLAG);
-+
-+        if (status != A_OK) {
-+            return -EIO;
-+        }
-+    } else {
-+        status = wmi_add_krk_cmd(ar->arWmi, ik->ik_keydata);
-+    }
-+
-+    ar->user_saved_keys.keyOk = TRUE;
-+
-+    return 0;
-+}
-+
-+
-+/*
-+ * SIOCGIWNAME
-+ */
-+int
-+ar6000_ioctl_giwname(struct net_device *dev,
-+           struct iw_request_info *info,
-+           char *name, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    switch (ar->arPhyCapability) {
-+    case (WMI_11A_CAPABILITY):
-+        strncpy(name, "AR6000 802.11a", IFNAMSIZ);
-+        break;
-+    case (WMI_11G_CAPABILITY):
-+        strncpy(name, "AR6000 802.11g", IFNAMSIZ);
-+        break;
-+    case (WMI_11AG_CAPABILITY):
-+        strncpy(name, "AR6000 802.11ag", IFNAMSIZ);
-+        break;
-+    default:
-+        strncpy(name, "AR6000 802.11", IFNAMSIZ);
-+        break;
-+    }
-+
-+    return 0;
-+}
-+
-+/*
-+ * SIOCSIWFREQ
-+ */
-+int
-+ar6000_ioctl_siwfreq(struct net_device *dev,
-+            struct iw_request_info *info,
-+            struct iw_freq *freq, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    /*
-+     * We support limiting the channels via wmiconfig.
-+     *
-+     * We use this command to configure the channel hint for the connect cmd
-+     * so it is possible the target will end up connecting to a different
-+     * channel.
-+     */
-+    if (freq->e > 1) {
-+        return -EINVAL;
-+    } else if (freq->e == 1) {
-+        ar->arChannelHint = freq->m / 100000;
-+    } else {
-+        ar->arChannelHint = wlan_ieee2freq(freq->m);
-+    }
-+
-+    A_PRINTF("channel hint set to %d\n", ar->arChannelHint);
-+    return 0;
-+}
-+
-+/*
-+ * SIOCGIWFREQ
-+ */
-+int
-+ar6000_ioctl_giwfreq(struct net_device *dev,
-+                struct iw_request_info *info,
-+                struct iw_freq *freq, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    if (ar->arConnected != TRUE) {
-+        return -EINVAL;
-+    }
-+
-+    freq->m = ar->arBssChannel * 100000;
-+    freq->e = 1;
-+
-+    return 0;
-+}
-+
-+/*
-+ * SIOCSIWMODE
-+ */
-+int
-+ar6000_ioctl_siwmode(struct net_device *dev,
-+            struct iw_request_info *info,
-+            __u32 *mode, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    switch (*mode) {
-+    case IW_MODE_INFRA:
-+        ar->arNetworkType = INFRA_NETWORK;
-+        break;
-+    case IW_MODE_ADHOC:
-+        ar->arNetworkType = ADHOC_NETWORK;
-+        break;
-+    default:
-+        return -EINVAL;
-+    }
-+
-+    return 0;
-+}
-+
-+/*
-+ * SIOCGIWMODE
-+ */
-+int
-+ar6000_ioctl_giwmode(struct net_device *dev,
-+            struct iw_request_info *info,
-+            __u32 *mode, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    switch (ar->arNetworkType) {
-+    case INFRA_NETWORK:
-+        *mode = IW_MODE_INFRA;
-+        break;
-+    case ADHOC_NETWORK:
-+        *mode = IW_MODE_ADHOC;
-+        break;
-+    default:
-+        return -EIO;
-+    }
-+    return 0;
-+}
-+
-+/*
-+ * SIOCSIWSENS
-+ */
-+int
-+ar6000_ioctl_siwsens(struct net_device *dev,
-+            struct iw_request_info *info,
-+            struct iw_param *sens, char *extra)
-+{
-+    return 0;
-+}
-+
-+/*
-+ * SIOCGIWSENS
-+ */
-+int
-+ar6000_ioctl_giwsens(struct net_device *dev,
-+            struct iw_request_info *info,
-+            struct iw_param *sens, char *extra)
-+{
-+    sens->value = 0;
-+    sens->fixed = 1;
-+
-+    return 0;
-+}
-+
-+/*
-+ * SIOCGIWRANGE
-+ */
-+int
-+ar6000_ioctl_giwrange(struct net_device *dev,
-+             struct iw_request_info *info,
-+             struct iw_point *data, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    struct iw_range *range = (struct iw_range *) extra;
-+    int i, ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    if (down_interruptible(&ar->arSem)) {
-+        return -ERESTARTSYS;
-+    }
-+    ar->arNumChannels = -1;
-+    A_MEMZERO(ar->arChannelList, sizeof (ar->arChannelList));
-+
-+    if (wmi_get_channelList_cmd(ar->arWmi) != A_OK) {
-+        up(&ar->arSem);
-+        return -EIO;
-+    }
-+
-+    wait_event_interruptible_timeout(arEvent, ar->arNumChannels != -1, wmitimeout * HZ);
-+
-+    if (signal_pending(current)) {
-+        up(&ar->arSem);
-+        return -EINTR;
-+    }
-+
-+    data->length = sizeof(struct iw_range);
-+    A_MEMZERO(range, sizeof(struct iw_range));
-+
-+    range->txpower_capa = 0;
-+
-+    range->min_pmp = 1 * 1024;
-+    range->max_pmp = 65535 * 1024;
-+    range->min_pmt = 1 * 1024;
-+    range->max_pmt = 1000 * 1024;
-+    range->pmp_flags = IW_POWER_PERIOD;
-+    range->pmt_flags = IW_POWER_TIMEOUT;
-+    range->pm_capa = 0;
-+
-+    range->we_version_compiled = WIRELESS_EXT;
-+    range->we_version_source = 13;
-+
-+    range->retry_capa = IW_RETRY_LIMIT;
-+    range->retry_flags = IW_RETRY_LIMIT;
-+    range->min_retry = 0;
-+    range->max_retry = 255;
-+
-+    range->num_frequency = range->num_channels = ar->arNumChannels;
-+    for (i = 0; i < ar->arNumChannels; i++) {
-+        range->freq[i].i = wlan_freq2ieee(ar->arChannelList[i]);
-+        range->freq[i].m = ar->arChannelList[i] * 100000;
-+        range->freq[i].e = 1;
-+         /*
-+         * Linux supports max of 32 channels, bail out once you
-+         * reach the max.
-+         */
-+        if (i == IW_MAX_FREQUENCIES) {
-+            break;
-+        }
-+    }
-+
-+    /* Max quality is max field value minus noise floor */
-+    range->max_qual.qual  = 0xff - 161;
-+
-+    /*
-+     * In order to use dBm measurements, 'level' must be lower
-+     * than any possible measurement (see iw_print_stats() in
-+     * wireless tools).  It's unclear how this is meant to be
-+     * done, but setting zero in these values forces dBm and
-+     * the actual numbers are not used.
-+     */
-+    range->max_qual.level = 0;
-+    range->max_qual.noise = 0;
-+
-+    range->sensitivity = 3;
-+
-+    range->max_encoding_tokens = 4;
-+    /* XXX query driver to find out supported key sizes */
-+    range->num_encoding_sizes = 3;
-+    range->encoding_size[0] = 5;        /* 40-bit */
-+    range->encoding_size[1] = 13;       /* 104-bit */
-+    range->encoding_size[2] = 16;       /* 128-bit */
-+
-+    range->num_bitrates = 0;
-+
-+    /* estimated maximum TCP throughput values (bps) */
-+    range->throughput = 22000000;
-+
-+    range->min_rts = 0;
-+    range->max_rts = 2347;
-+    range->min_frag = 256;
-+    range->max_frag = 2346;
-+
-+    up(&ar->arSem);
-+
-+    return ret;
-+}
-+
-+
-+/*
-+ * SIOCSIWAP
-+ * This ioctl is used to set the desired bssid for the connect command.
-+ */
-+int
-+ar6000_ioctl_siwap(struct net_device *dev,
-+              struct iw_request_info *info,
-+              struct sockaddr *ap_addr, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    if (ap_addr->sa_family != ARPHRD_ETHER) {
-+        return -EIO;
-+    }
-+
-+    if (A_MEMCMP(&ap_addr->sa_data, bcast_mac, AR6000_ETH_ADDR_LEN) == 0) {
-+        A_MEMZERO(ar->arReqBssid, sizeof(ar->arReqBssid));
-+    } else {
-+        A_MEMCPY(ar->arReqBssid, &ap_addr->sa_data,  sizeof(ar->arReqBssid));
-+    }
-+
-+    return 0;
-+}
-+
-+/*
-+ * SIOCGIWAP
-+ */
-+int
-+ar6000_ioctl_giwap(struct net_device *dev,
-+              struct iw_request_info *info,
-+              struct sockaddr *ap_addr, char *extra)
-+{
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    if (ar->arConnected != TRUE) {
-+        return -EINVAL;
-+    }
-+
-+    A_MEMCPY(&ap_addr->sa_data, ar->arBssid, sizeof(ar->arBssid));
-+    ap_addr->sa_family = ARPHRD_ETHER;
-+
-+    return 0;
-+}
-+
-+/*
-+ * SIOCGIWAPLIST
-+ */
-+int
-+ar6000_ioctl_iwaplist(struct net_device *dev,
-+            struct iw_request_info *info,
-+            struct iw_point *data, char *extra)
-+{
-+    return -EIO;            /* for now */
-+}
-+
-+/*
-+ * SIOCSIWSCAN
-+ */
-+int
-+ar6000_ioctl_siwscan(struct net_device *dev,
-+                     struct iw_request_info *info,
-+                     struct iw_point *data, char *extra)
-+{
-+#define ACT_DWELLTIME_DEFAULT   105
-+#define HOME_TXDRAIN_TIME       100
-+#define SCAN_INT                HOME_TXDRAIN_TIME + ACT_DWELLTIME_DEFAULT
-+    AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-+    int ret = 0;
-+
-+    if (ar->arWmiReady == FALSE) {
-+        return -EIO;
-+    }
-+
-+    if (ar->arWlanState == WLAN_DISABLED) {
-+        return -EIO;
-+    }
-+
-+    /* We ask for everything from the target */
-+    if (wmi_bssfilter_cmd(ar->arWmi, ALL_BSS_FILTER, 0) != A_OK) {
-+          printk("Couldn't set filtering\n");
-+          ret = -EIO;
-+    }
-+
-+    if (wmi_startscan_cmd(ar->arWmi, WMI_LONG_SCAN, FALSE, FALSE, \
-+                          HOME_TXDRAIN_TIME, SCAN_INT) != A_OK) {
-+        ret = -EIO;
-+    }
-+
-+    ar->scan_complete = 0;
-+    wait_event_interruptible_timeout(ar6000_scan_queue, ar->scan_complete,
-+                                   5 * HZ);
-+
-+    if (wmi_bssfilter_cmd(ar->arWmi, NONE_BSS_FILTER, 0) != A_OK) {
-+          printk("Couldn't set filtering\n");
-+          ret = -EIO;
-+    }
-+
-+    return ret;
-+#undef  ACT_DWELLTIME_DEFAULT
-+#undef HOME_TXDRAIN_TIME
-+#undef SCAN_INT
-+}
-+
-+
-+/*
-+ * Units are in db above the noise floor. That means the
-+ * rssi values reported in the tx/rx descriptors in the
-+ * driver are the SNR expressed in db.
-+ *
-+ * If you assume that the noise floor is -95, which is an
-+ * excellent assumption 99.5 % of the time, then you can
-+ * derive the absolute signal level (i.e. -95 + rssi).
-+ * There are some other slight factors to take into account
-+ * depending on whether the rssi measurement is from 11b,
-+ * 11g, or 11a.   These differences are at most 2db and
-+ * can be documented.
-+ *
-+ * NB: various calculations are based on the orinoco/wavelan
-+ *     drivers for compatibility
-+ */
-+static void
-+ar6000_set_quality(struct iw_quality *iq, A_INT8 rssi)
-+{
-+    if (rssi < 0) {
-+        iq->qual = 0;
-+    } else {
-+        iq->qual = rssi;
-+    }
-+
-+    /* NB: max is 94 because noise is hardcoded to 161 */
-+    if (iq->qual > 94)
-+        iq->qual = 94;
-+
-+    iq->noise = 161;        /* -95dBm */
-+    iq->level = iq->noise + iq->qual;
-+    iq->updated = 7;
-+}
-+
-+
-+/* Structures to export the Wireless Handlers */
-+static const iw_handler ath_handlers[] = {
-+    (iw_handler) NULL,                          /* SIOCSIWCOMMIT */
-+    (iw_handler) ar6000_ioctl_giwname,          /* SIOCGIWNAME */
-+    (iw_handler) NULL,                          /* SIOCSIWNWID */
-+    (iw_handler) NULL,                          /* SIOCGIWNWID */
-+    (iw_handler) ar6000_ioctl_siwfreq,          /* SIOCSIWFREQ */
-+    (iw_handler) ar6000_ioctl_giwfreq,          /* SIOCGIWFREQ */
-+    (iw_handler) ar6000_ioctl_siwmode,          /* SIOCSIWMODE */
-+    (iw_handler) ar6000_ioctl_giwmode,          /* SIOCGIWMODE */
-+    (iw_handler) ar6000_ioctl_siwsens,          /* SIOCSIWSENS */
-+    (iw_handler) ar6000_ioctl_giwsens,          /* SIOCGIWSENS */
-+    (iw_handler) NULL /* not _used */,          /* SIOCSIWRANGE */
-+    (iw_handler) ar6000_ioctl_giwrange,         /* SIOCGIWRANGE */
-+    (iw_handler) NULL /* not used */,           /* SIOCSIWPRIV */
-+    (iw_handler) NULL /* kernel code */,        /* SIOCGIWPRIV */
-+    (iw_handler) NULL /* not used */,           /* SIOCSIWSTATS */
-+    (iw_handler) NULL /* kernel code */,        /* SIOCGIWSTATS */
-+    (iw_handler) NULL,                          /* SIOCSIWSPY */
-+    (iw_handler) NULL,                          /* SIOCGIWSPY */
-+    (iw_handler) NULL,                          /* SIOCSIWTHRSPY */
-+    (iw_handler) NULL,                          /* SIOCGIWTHRSPY */
-+    (iw_handler) ar6000_ioctl_siwap,            /* SIOCSIWAP */
-+    (iw_handler) ar6000_ioctl_giwap,            /* SIOCGIWAP */
-+    (iw_handler) NULL,                          /* -- hole -- */
-+    (iw_handler) ar6000_ioctl_iwaplist,         /* SIOCGIWAPLIST */
-+    (iw_handler) ar6000_ioctl_siwscan,          /* SIOCSIWSCAN */
-+    (iw_handler) ar6000_ioctl_giwscan,          /* SIOCGIWSCAN */
-+    (iw_handler) ar6000_ioctl_siwessid,         /* SIOCSIWESSID */
-+    (iw_handler) ar6000_ioctl_giwessid,         /* SIOCGIWESSID */
-+    (iw_handler) NULL,                          /* SIOCSIWNICKN */
-+    (iw_handler) NULL,                          /* SIOCGIWNICKN */
-+    (iw_handler) NULL,                          /* -- hole -- */
-+    (iw_handler) NULL,                          /* -- hole -- */
-+    (iw_handler) ar6000_ioctl_siwrate,          /* SIOCSIWRATE */
-+    (iw_handler) ar6000_ioctl_giwrate,          /* SIOCGIWRATE */
-+    (iw_handler) NULL,           /* SIOCSIWRTS */
-+    (iw_handler) NULL,           /* SIOCGIWRTS */
-+    (iw_handler) NULL,          /* SIOCSIWFRAG */
-+    (iw_handler) NULL,          /* SIOCGIWFRAG */
-+    (iw_handler) ar6000_ioctl_siwtxpow,         /* SIOCSIWTXPOW */
-+    (iw_handler) ar6000_ioctl_giwtxpow,         /* SIOCGIWTXPOW */
-+    (iw_handler) ar6000_ioctl_siwretry,         /* SIOCSIWRETRY */
-+    (iw_handler) ar6000_ioctl_giwretry,         /* SIOCGIWRETRY */
-+    (iw_handler) ar6000_ioctl_siwencode,        /* SIOCSIWENCODE */
-+    (iw_handler) ar6000_ioctl_giwencode,        /* SIOCGIWENCODE */
-+    (iw_handler) ar6000_ioctl_siwpower,         /* SIOCSIWPOWER */
-+    (iw_handler) ar6000_ioctl_giwpower,         /* SIOCGIWPOWER */
-+    (iw_handler) NULL,        /* -- hole -- */
-+    (iw_handler) NULL,        /* -- hole -- */
-+    (iw_handler) ar6000_ioctl_siwgenie,       /* SIOCSIWGENIE */
-+    (iw_handler) ar6000_ioctl_giwgenie,       /* SIOCGIWGENIE */
-+    (iw_handler) ar6000_ioctl_siwauth,        /* SIOCSIWAUTH */
-+    (iw_handler) ar6000_ioctl_giwauth,        /* SIOCGIWAUTH */
-+    (iw_handler) ar6000_ioctl_siwencodeext,/* SIOCSIWENCODEEXT */
-+    (iw_handler) ar6000_ioctl_giwencodeext,/* SIOCGIWENCODEEXT */
-+    (iw_handler) NULL,                /* SIOCSIWPMKSA */
-+};
-+
-+static const iw_handler ath_priv_handlers[] = {
-+    (iw_handler) ar6000_ioctl_setparam,         /* SIOCWFIRSTPRIV+0 */
-+    (iw_handler) ar6000_ioctl_getparam,         /* SIOCWFIRSTPRIV+1 */
-+    (iw_handler) ar6000_ioctl_setkey,           /* SIOCWFIRSTPRIV+2 */
-+    (iw_handler) ar6000_ioctl_setwmmparams,     /* SIOCWFIRSTPRIV+3 */
-+    (iw_handler) ar6000_ioctl_delkey,           /* SIOCWFIRSTPRIV+4 */
-+    (iw_handler) ar6000_ioctl_getwmmparams,     /* SIOCWFIRSTPRIV+5 */
-+    (iw_handler) ar6000_ioctl_setoptie,         /* SIOCWFIRSTPRIV+6 */
-+    (iw_handler) ar6000_ioctl_setmlme,          /* SIOCWFIRSTPRIV+7 */
-+    (iw_handler) ar6000_ioctl_addpmkid,         /* SIOCWFIRSTPRIV+8 */
-+};
-+
-+#define IW_PRIV_TYPE_KEY \
-+    (IW_PRIV_TYPE_BYTE | sizeof(struct ieee80211req_key))
-+#define IW_PRIV_TYPE_DELKEY \
-+    (IW_PRIV_TYPE_BYTE | sizeof(struct ieee80211req_del_key))
-+#define IW_PRIV_TYPE_MLME \
-+    (IW_PRIV_TYPE_BYTE | sizeof(struct ieee80211req_mlme))
-+#define IW_PRIV_TYPE_ADDPMKID \
-+    (IW_PRIV_TYPE_BYTE | sizeof(struct ieee80211req_addpmkid))
-+
-+static const struct iw_priv_args ar6000_priv_args[] = {
-+    { IEEE80211_IOCTL_SETKEY,
-+      IW_PRIV_TYPE_KEY | IW_PRIV_SIZE_FIXED, 0,       "setkey"},
-+    { IEEE80211_IOCTL_DELKEY,
-+      IW_PRIV_TYPE_DELKEY | IW_PRIV_SIZE_FIXED, 0,    "delkey"},
-+    { IEEE80211_IOCTL_SETPARAM,
-+      IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, 0,   "setparam"},
-+    { IEEE80211_IOCTL_GETPARAM,
-+      IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
-+      IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,      "getparam"},
-+    { IEEE80211_IOCTL_SETWMMPARAMS,
-+      IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 4, 0,   "setwmmparams"},
-+    { IEEE80211_IOCTL_GETWMMPARAMS,
-+      IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 3,
-+      IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,      "getwmmparams"},
-+    { IEEE80211_IOCTL_SETOPTIE,
-+      IW_PRIV_TYPE_BYTE, 0,       "setie"},
-+    { IEEE80211_IOCTL_SETMLME,
-+      IW_PRIV_TYPE_MLME, 0,       "setmlme"},
-+    { IEEE80211_IOCTL_ADDPMKID,
-+      IW_PRIV_TYPE_ADDPMKID | IW_PRIV_SIZE_FIXED, 0,  "addpmkid"},
-+};
-+
-+void ar6000_ioctl_iwsetup(struct iw_handler_def *def)
-+{
-+    def->private_args = (struct iw_priv_args *)ar6000_priv_args;
-+    def->num_private_args = ARRAY_SIZE(ar6000_priv_args);
-+}
-+
-+struct iw_handler_def ath_iw_handler_def = {
-+    .standard         = (iw_handler *)ath_handlers,
-+    .num_standard     = ARRAY_SIZE(ath_handlers),
-+    .private          = (iw_handler *)ath_priv_handlers,
-+    .num_private      = ARRAY_SIZE(ath_priv_handlers),
-+};
-+
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/bmi/bmi.c b/drivers/sdio/function/wlan/ar6000/bmi/bmi.c
-new file mode 100644
-index 0000000..d7b610c
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/bmi/bmi.c
-@@ -0,0 +1,657 @@
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "hif.h"
-+#include "bmi.h"
-+#include "htc_api.h"
-+#include "bmi_internal.h"
-+
-+/*
-+Although we had envisioned BMI to run on top of HTC, this is not what the
-+final implementation boiled down to on dragon. Its a part of BSP and does
-+not use the HTC protocol either. On the host side, however, we were still
-+living with the original idea. I think the time has come to accept the truth
-+and separate it from HTC which has been carrying BMI's burden all this while.
-+It shall make HTC state machine relatively simpler
-+*/
-+
-+/* APIs visible to the driver */
-+void
-+BMIInit(void)
-+{
-+    bmiDone = FALSE;
-+}
-+
-+A_STATUS
-+BMIDone(HIF_DEVICE *device)
-+{
-+    A_STATUS status;
-+    A_UINT32 cid;
-+
-+    if (bmiDone) {
-+        AR_DEBUG_PRINTF (ATH_DEBUG_BMI, ("BMIDone skipped\n"));
-+        return A_OK;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Done: Enter (device: 0x%p)\n", device));
-+    bmiDone = TRUE;
-+    cid = BMI_DONE;
-+
-+    status = bmiBufferSend(device, (A_UCHAR *)&cid, sizeof(cid));
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-+        return A_ERROR;
-+    }
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Done: Exit\n"));
-+
-+    return A_OK;
-+}
-+
-+A_STATUS
-+BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info)
-+{
-+    A_STATUS status;
-+    A_UINT32 cid;
-+
-+    if (bmiDone) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Get Target Info: Enter (device: 0x%p)\n", device));
-+    cid = BMI_GET_TARGET_INFO;
-+
-+    status = bmiBufferSend(device, (A_UCHAR *)&cid, sizeof(cid));
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-+        return A_ERROR;
-+    }
-+
-+    status = bmiBufferReceive(device, (A_UCHAR *)&targ_info->target_ver,
-+                                                sizeof(targ_info->target_ver));
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read Target Version from the device\n"));
-+        return A_ERROR;
-+    }
-+
-+    if (targ_info->target_ver == TARGET_VERSION_SENTINAL) {
-+        /* Determine how many bytes are in the Target's targ_info */
-+        status = bmiBufferReceive(device, (A_UCHAR *)&targ_info->target_info_byte_count,
-+                                            sizeof(targ_info->target_info_byte_count));
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read Target Info Byte Count from the device\n"));
-+            return A_ERROR;
-+        }
-+
-+        /*
-+         * The Target's targ_info doesn't match the Host's targ_info.
-+         * We need to do some backwards compatibility work to make this OK.
-+         */
-+        A_ASSERT(targ_info->target_info_byte_count == sizeof(*targ_info));
-+
-+        /* Read the remainder of the targ_info */
-+        status = bmiBufferReceive(device,
-+                        ((A_UCHAR *)targ_info)+sizeof(targ_info->target_info_byte_count),
-+                        sizeof(*targ_info)-sizeof(targ_info->target_info_byte_count));
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read Target Info (%d bytes) from the device\n",
-+                                                              targ_info->target_info_byte_count));
-+            return A_ERROR;
-+        }
-+    } else {
-+        /*
-+         * Target must be an AR6001 whose firmware does not
-+         * support BMI_GET_TARGET_INFO.  Construct the data
-+         * that it would have sent.
-+         */
-+        targ_info->target_info_byte_count = sizeof(targ_info);
-+        targ_info->target_type = TARGET_TYPE_AR6001;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Get Target Info: Exit (ver: 0x%x type: 0x%x)\n",
-+                                                              targ_info->target_ver, targ_info->target_type));
-+    printk("BMI Get Target Info: Exit (ver: 0x%x type: 0x%x)\n",
-+         targ_info->target_ver, targ_info->target_type);
-+
-+    return A_OK;
-+}
-+
-+A_STATUS
-+BMIReadMemory(HIF_DEVICE *device,
-+              A_UINT32 address,
-+              A_UCHAR *buffer,
-+              A_UINT32 length)
-+{
-+    A_UINT32 cid;
-+    A_STATUS status;
-+    A_UINT32 offset;
-+    A_UINT32 remaining, rxlen;
-+    static A_UCHAR data[BMI_DATASZ_MAX + sizeof(cid) + sizeof(address) + sizeof(length)];
-+    memset (&data, 0, BMI_DATASZ_MAX + sizeof(cid) + sizeof(address) + sizeof(length));
-+
-+    if (bmiDone) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-+                              ("BMI Read Memory: Enter (device: 0x%p, address: 0x%x, length: %d)\n",
-+                              device, address, length));
-+
-+    cid = BMI_READ_MEMORY;
-+
-+    remaining = length;
-+
-+    while (remaining)
-+    {
-+        rxlen = (remaining < BMI_DATASZ_MAX) ? remaining : BMI_DATASZ_MAX;
-+        offset = 0;
-+        A_MEMCPY(&data[offset], &cid, sizeof(cid));
-+        offset += sizeof(cid);
-+        A_MEMCPY(&data[offset], &address, sizeof(address));
-+        offset += sizeof(address);
-+        A_MEMCPY(&data[offset], &rxlen, sizeof(rxlen));
-+        offset += sizeof(length);
-+
-+        status = bmiBufferSend(device, data, offset);
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-+            return A_ERROR;
-+        }
-+        status = bmiBufferReceive(device, data, rxlen);
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));
-+            return A_ERROR;
-+        }
-+        A_MEMCPY(&buffer[length - remaining], data, rxlen);
-+        remaining -= rxlen; address += rxlen;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Read Memory: Exit\n"));
-+    return A_OK;
-+}
-+
-+A_STATUS
-+BMIWriteMemory(HIF_DEVICE *device,
-+               A_UINT32 address,
-+               A_UCHAR *buffer,
-+               A_UINT32 length)
-+{
-+    A_UINT32 cid;
-+    A_STATUS status;
-+    A_UINT32 offset;
-+    A_UINT32 remaining, txlen;
-+    const A_UINT32 header = sizeof(cid) + sizeof(address) + sizeof(length);
-+    static A_UCHAR data[BMI_DATASZ_MAX + sizeof(cid) + sizeof(address) + sizeof(length)];
-+      memset (&data, 0, header);
-+
-+    if (bmiDone) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-+         ("BMI Write Memory: Enter (device: 0x%p, address: 0x%x, length: %d)\n",
-+         device, address, length));
-+
-+    cid = BMI_WRITE_MEMORY;
-+
-+    remaining = length;
-+    while (remaining)
-+    {
-+        txlen = (remaining < (BMI_DATASZ_MAX - header)) ?
-+                                       remaining : (BMI_DATASZ_MAX - header);
-+        offset = 0;
-+        A_MEMCPY(&data[offset], &cid, sizeof(cid));
-+        offset += sizeof(cid);
-+        A_MEMCPY(&data[offset], &address, sizeof(address));
-+        offset += sizeof(address);
-+        A_MEMCPY(&data[offset], &txlen, sizeof(txlen));
-+        offset += sizeof(txlen);
-+        A_MEMCPY(&data[offset], &buffer[length - remaining], txlen);
-+        offset += txlen;
-+        status = bmiBufferSend(device, data, offset);
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-+            return A_ERROR;
-+        }
-+        remaining -= txlen; address += txlen;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Write Memory: Exit\n"));
-+
-+    return A_OK;
-+}
-+
-+A_STATUS
-+BMIExecute(HIF_DEVICE *device,
-+           A_UINT32 address,
-+           A_UINT32 *param)
-+{
-+    A_UINT32 cid;
-+    A_STATUS status;
-+    A_UINT32 offset;
-+    static A_UCHAR data[sizeof(cid) + sizeof(address) + sizeof(*param)];
-+    memset (&data, 0, sizeof(cid) + sizeof(address) + sizeof(*param));
-+
-+    if (bmiDone) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-+       ("BMI Execute: Enter (device: 0x%p, address: 0x%x, param: %d)\n",
-+        device, address, *param));
-+
-+    cid = BMI_EXECUTE;
-+
-+    offset = 0;
-+    A_MEMCPY(&data[offset], &cid, sizeof(cid));
-+    offset += sizeof(cid);
-+    A_MEMCPY(&data[offset], &address, sizeof(address));
-+    offset += sizeof(address);
-+    A_MEMCPY(&data[offset], param, sizeof(*param));
-+    offset += sizeof(*param);
-+    status = bmiBufferSend(device, data, offset);
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-+        return A_ERROR;
-+    }
-+
-+    status = bmiBufferReceive(device, data, sizeof(*param));
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));
-+        return A_ERROR;
-+    }
-+
-+    A_MEMCPY(param, data, sizeof(*param));
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Execute: Exit (param: %d)\n", *param));
-+    return A_OK;
-+}
-+
-+A_STATUS
-+BMISetAppStart(HIF_DEVICE *device,
-+               A_UINT32 address)
-+{
-+    A_UINT32 cid;
-+    A_STATUS status;
-+    A_UINT32 offset;
-+    static A_UCHAR data[sizeof(cid) + sizeof(address)];
-+    memset (&data, 0, sizeof(cid) + sizeof(address));
-+
-+    if (bmiDone) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-+       ("BMI Set App Start: Enter (device: 0x%p, address: 0x%x)\n",
-+        device, address));
-+
-+    cid = BMI_SET_APP_START;
-+
-+    offset = 0;
-+    A_MEMCPY(&data[offset], &cid, sizeof(cid));
-+    offset += sizeof(cid);
-+    A_MEMCPY(&data[offset], &address, sizeof(address));
-+    offset += sizeof(address);
-+    status = bmiBufferSend(device, data, offset);
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Set App Start: Exit\n"));
-+    return A_OK;
-+}
-+
-+A_STATUS
-+BMIReadSOCRegister(HIF_DEVICE *device,
-+                   A_UINT32 address,
-+                   A_UINT32 *param)
-+{
-+    A_UINT32 cid;
-+    A_STATUS status;
-+    A_UINT32 offset;
-+    static A_UCHAR data[sizeof(cid) + sizeof(address)];
-+    memset (&data, 0, sizeof(cid) + sizeof(address));
-+
-+    if (bmiDone) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-+       ("BMI Read SOC Register: Enter (device: 0x%p, address: 0x%x)\n",
-+       device, address));
-+
-+    cid = BMI_READ_SOC_REGISTER;
-+
-+    offset = 0;
-+    A_MEMCPY(&data[offset], &cid, sizeof(cid));
-+    offset += sizeof(cid);
-+    A_MEMCPY(&data[offset], &address, sizeof(address));
-+    offset += sizeof(address);
-+
-+    status = bmiBufferSend(device, data, offset);
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-+        return A_ERROR;
-+    }
-+
-+    status = bmiBufferReceive(device, data, sizeof(*param));
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));
-+        return A_ERROR;
-+    }
-+    A_MEMCPY(param, data, sizeof(*param));
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Read SOC Register: Exit (value: %d)\n", *param));
-+    return A_OK;
-+}
-+
-+A_STATUS
-+BMIWriteSOCRegister(HIF_DEVICE *device,
-+                    A_UINT32 address,
-+                    A_UINT32 param)
-+{
-+    A_UINT32 cid;
-+    A_STATUS status;
-+    A_UINT32 offset;
-+    static A_UCHAR data[sizeof(cid) + sizeof(address) + sizeof(param)];
-+
-+    memset (&data, 0, sizeof(cid) + sizeof(address) + sizeof(param));
-+
-+    if (bmiDone) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-+     ("BMI Write SOC Register: Enter (device: 0x%p, address: 0x%x, param: %d)\n",
-+     device, address, param));
-+
-+    cid = BMI_WRITE_SOC_REGISTER;
-+
-+    offset = 0;
-+    A_MEMCPY(&data[offset], &cid, sizeof(cid));
-+    offset += sizeof(cid);
-+    A_MEMCPY(&data[offset], &address, sizeof(address));
-+    offset += sizeof(address);
-+    A_MEMCPY(&data[offset], &param, sizeof(param));
-+    offset += sizeof(param);
-+    status = bmiBufferSend(device, data, offset);
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Read SOC Register: Exit\n"));
-+    return A_OK;
-+}
-+
-+A_STATUS
-+BMIrompatchInstall(HIF_DEVICE *device,
-+                   A_UINT32 ROM_addr,
-+                   A_UINT32 RAM_addr,
-+                   A_UINT32 nbytes,
-+                   A_UINT32 do_activate,
-+                   A_UINT32 *rompatch_id)
-+{
-+    A_UINT32 cid;
-+    A_STATUS status;
-+    A_UINT32 offset;
-+    static A_UCHAR data[sizeof(cid) + sizeof(ROM_addr) + sizeof(RAM_addr) +
-+                                sizeof(nbytes) + sizeof(do_activate)];
-+
-+      memset (&data, 0, sizeof(cid) + sizeof(ROM_addr) + sizeof(RAM_addr) +
-+                      sizeof(nbytes) + sizeof(do_activate));
-+
-+    if (bmiDone) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-+         ("BMI rompatch Install: Enter (device: 0x%p, ROMaddr: 0x%x, RAMaddr: 0x%x length: %d activate: %d)\n",
-+         device, ROM_addr, RAM_addr, nbytes, do_activate));
-+
-+    cid = BMI_ROMPATCH_INSTALL;
-+
-+    offset = 0;
-+    A_MEMCPY(&data[offset], &cid, sizeof(cid));
-+    offset += sizeof(cid);
-+    A_MEMCPY(&data[offset], &ROM_addr, sizeof(ROM_addr));
-+    offset += sizeof(ROM_addr);
-+    A_MEMCPY(&data[offset], &RAM_addr, sizeof(RAM_addr));
-+    offset += sizeof(RAM_addr);
-+    A_MEMCPY(&data[offset], &nbytes, sizeof(nbytes));
-+    offset += sizeof(nbytes);
-+    A_MEMCPY(&data[offset], &do_activate, sizeof(do_activate));
-+    offset += sizeof(do_activate);
-+    status = bmiBufferSend(device, data, offset);
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-+        return A_ERROR;
-+    }
-+
-+    status = bmiBufferReceive(device, (A_UCHAR *)rompatch_id, sizeof(*rompatch_id));
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read from the device\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI rompatch Install: (rompatch_id=%d)\n", *rompatch_id));
-+    return A_OK;
-+}
-+
-+A_STATUS
-+BMIrompatchUninstall(HIF_DEVICE *device,
-+                     A_UINT32 rompatch_id)
-+{
-+    A_UINT32 cid;
-+    A_STATUS status;
-+    A_UINT32 offset;
-+    static A_UCHAR data[sizeof(cid) + sizeof(rompatch_id)];
-+    memset (&data, 0, sizeof(cid) + sizeof(rompatch_id));
-+
-+    if (bmiDone) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-+         ("BMI rompatch Uninstall: Enter (device: 0x%p, rompatch_id: %d)\n",
-+                                                                       device, rompatch_id));
-+
-+    cid = BMI_ROMPATCH_UNINSTALL;
-+
-+    offset = 0;
-+    A_MEMCPY(&data[offset], &cid, sizeof(cid));
-+    offset += sizeof(cid);
-+    A_MEMCPY(&data[offset], &rompatch_id, sizeof(rompatch_id));
-+    offset += sizeof(rompatch_id);
-+    status = bmiBufferSend(device, data, offset);
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI rompatch UNinstall: (rompatch_id=0x%x)\n", rompatch_id));
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+_BMIrompatchChangeActivation(HIF_DEVICE *device,
-+                             A_UINT32 rompatch_count,
-+                             A_UINT32 *rompatch_list,
-+                             A_UINT32 do_activate)
-+{
-+    A_UINT32 cid;
-+    A_STATUS status;
-+    A_UINT32 offset;
-+    static A_UCHAR data[BMI_DATASZ_MAX + sizeof(cid) + sizeof(rompatch_count)];
-+    A_UINT32 length;
-+
-+      memset (&data, 0, BMI_DATASZ_MAX + sizeof(cid) + sizeof(rompatch_count));
-+
-+    if (bmiDone) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Command disallowed\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI,
-+         ("BMI Change rompatch Activation: Enter (device: 0x%p, count: %d)\n",
-+           device, rompatch_count));
-+
-+    cid = do_activate ? BMI_ROMPATCH_ACTIVATE : BMI_ROMPATCH_DEACTIVATE;
-+
-+    offset = 0;
-+    A_MEMCPY(&data[offset], &cid, sizeof(cid));
-+    offset += sizeof(cid);
-+    A_MEMCPY(&data[offset], &rompatch_count, sizeof(rompatch_count));
-+    offset += sizeof(rompatch_count);
-+    length = rompatch_count * sizeof(*rompatch_list);
-+    A_MEMCPY(&data[offset], rompatch_list, length);
-+    offset += length;
-+    status = bmiBufferSend(device, data, offset);
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to write to the device\n"));
-+        return A_ERROR;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Change rompatch Activation: Exit\n"));
-+
-+    return A_OK;
-+}
-+
-+A_STATUS
-+BMIrompatchActivate(HIF_DEVICE *device,
-+                    A_UINT32 rompatch_count,
-+                    A_UINT32 *rompatch_list)
-+{
-+    return _BMIrompatchChangeActivation(device, rompatch_count, rompatch_list, 1);
-+}
-+
-+A_STATUS
-+BMIrompatchDeactivate(HIF_DEVICE *device,
-+                      A_UINT32 rompatch_count,
-+                      A_UINT32 *rompatch_list)
-+{
-+    return _BMIrompatchChangeActivation(device, rompatch_count, rompatch_list, 0);
-+}
-+
-+/* BMI Access routines */
-+A_STATUS
-+bmiBufferSend(HIF_DEVICE *device,
-+              A_UCHAR *buffer,
-+              A_UINT32 length)
-+{
-+    A_STATUS status;
-+    A_UINT32 timeout;
-+    A_UINT32 address;
-+    static A_UINT32 cmdCredits;
-+    A_UINT32 mboxAddress[HTC_MAILBOX_NUM_MAX];
-+
-+    HIFConfigureDevice(device, HIF_DEVICE_GET_MBOX_ADDR,
-+                       &mboxAddress, sizeof(mboxAddress));
-+
-+    cmdCredits = 0;
-+    timeout = BMI_COMMUNICATION_TIMEOUT;
-+
-+    while(timeout-- && !cmdCredits) {
-+        /* Read the counter register to get the command credits */
-+        address = COUNT_DEC_ADDRESS + (HTC_MAILBOX_NUM_MAX + ENDPOINT1) * 4;
-+        /* hit the credit counter with a 4-byte access, the first byte read will hit the counter and cause
-+         * a decrement, while the remaining 3 bytes has no effect.  The rationale behind this is to
-+         * make all HIF accesses 4-byte aligned */
-+        status = HIFReadWrite(device, address, (A_UINT8 *)&cmdCredits, 4,
-+            HIF_RD_SYNC_BYTE_INC, NULL);
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to decrement the command credit count register\n"));
-+            return A_ERROR;
-+        }
-+        /* the counter is only 8=bits, ignore anything in the upper 3 bytes */
-+        cmdCredits &= 0xFF;
-+    }
-+
-+    if (cmdCredits) {
-+        address = mboxAddress[ENDPOINT1];
-+        status = HIFReadWrite(device, address, buffer, length,
-+            HIF_WR_SYNC_BYTE_INC, NULL);
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to send the BMI data to the device\n"));
-+            return A_ERROR;
-+        }
-+    } else {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("BMI Communication timeout\n"));
-+        return A_ERROR;
-+    }
-+
-+    return status;
-+}
-+
-+A_STATUS
-+bmiBufferReceive(HIF_DEVICE *device,
-+                 A_UCHAR *buffer,
-+                 A_UINT32 length)
-+{
-+    A_STATUS status;
-+    A_UINT32 address;
-+    A_UINT32 timeout;
-+    static A_UINT32 cmdCredits;
-+    A_UINT32 mboxAddress[HTC_MAILBOX_NUM_MAX];
-+
-+    HIFConfigureDevice(device, HIF_DEVICE_GET_MBOX_ADDR,
-+                       &mboxAddress, sizeof(mboxAddress));
-+
-+    cmdCredits = 0;
-+    timeout = BMI_COMMUNICATION_TIMEOUT;
-+    while(timeout-- && !cmdCredits) {
-+        /* Read the counter register to get the command credits */
-+        address = COUNT_ADDRESS + (HTC_MAILBOX_NUM_MAX + ENDPOINT1) * 1;
-+        /* read the counter using a 4-byte read.  Since the counter is NOT auto-decrementing,
-+         * we can read this counter multiple times using a non-incrementing address mode.
-+         * The rationale here is to make all HIF accesses a multiple of 4 bytes */
-+        status = HIFReadWrite(device, address, (A_UINT8 *)&cmdCredits, sizeof(cmdCredits),
-+            HIF_RD_SYNC_BYTE_FIX, NULL);
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read the command credit count register\n"));
-+            return A_ERROR;
-+        }
-+            /* we did a 4-byte read to the same count register so mask off upper bytes */
-+        cmdCredits &= 0xFF;
-+        status = A_ERROR;
-+    }
-+
-+    if (cmdCredits) {
-+        address = mboxAddress[ENDPOINT1];
-+        status = HIFReadWrite(device, address, buffer, length,
-+            HIF_RD_SYNC_BYTE_INC, NULL);
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to read the BMI data from the device\n"));
-+            return A_ERROR;
-+        }
-+    } else {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_BMI, ("BMI Communication timeout\n"));
-+        return A_ERROR;
-+    }
-+
-+    return status;
-+}
-diff --git a/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h b/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h
-new file mode 100644
-index 0000000..1e21354
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h
-@@ -0,0 +1,45 @@
-+#ifndef BMI_INTERNAL_H
-+#define BMI_INTERNAL_H
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "a_config.h"
-+#include "athdefs.h"
-+#include "a_types.h"
-+#include "a_osapi.h"
-+#include "a_debug.h"
-+#include "AR6Khwreg.h"
-+#include "bmi_msg.h"
-+
-+#define BMI_COMMUNICATION_TIMEOUT       100000
-+
-+/* ------ Global Variable Declarations ------- */
-+A_BOOL bmiDone;
-+
-+A_STATUS
-+bmiBufferSend(HIF_DEVICE *device,
-+              A_UCHAR *buffer,
-+              A_UINT32 length);
-+
-+A_STATUS
-+bmiBufferReceive(HIF_DEVICE *device,
-+                 A_UCHAR *buffer,
-+                 A_UINT32 length);
-+
-+#endif
-diff --git a/drivers/sdio/function/wlan/ar6000/hif/hif.c b/drivers/sdio/function/wlan/ar6000/hif/hif.c
-new file mode 100644
-index 0000000..f5a0986
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/hif/hif.c
-@@ -0,0 +1,818 @@
-+/*
-+ * @file: hif.c
-+ *
-+ * @abstract: HIF layer reference implementation for Atheros SDIO stack
-+ *
-+ * @notice: Copyright (c) 2004-2006 Atheros Communications 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "hif_internal.h"
-+
-+/* ------ Static Variables ------ */
-+
-+/* ------ Global Variable Declarations ------- */
-+SD_PNP_INFO Ids[] = {
-+    {
-+        .SDIO_ManufacturerID = MANUFACTURER_ID_AR6001_BASE | 0xB,
-+        .SDIO_ManufacturerCode = MANUFACTURER_CODE,
-+        .SDIO_FunctionClass = FUNCTION_CLASS,
-+        .SDIO_FunctionNo = 1
-+    },
-+    {
-+        .SDIO_ManufacturerID = MANUFACTURER_ID_AR6001_BASE | 0xA,
-+        .SDIO_ManufacturerCode = MANUFACTURER_CODE,
-+        .SDIO_FunctionClass = FUNCTION_CLASS,
-+        .SDIO_FunctionNo = 1
-+    },
-+    {
-+        .SDIO_ManufacturerID = MANUFACTURER_ID_AR6001_BASE | 0x9,
-+        .SDIO_ManufacturerCode = MANUFACTURER_CODE,
-+        .SDIO_FunctionClass = FUNCTION_CLASS,
-+        .SDIO_FunctionNo = 1
-+    },
-+    {
-+        .SDIO_ManufacturerID = MANUFACTURER_ID_AR6001_BASE | 0x8,
-+        .SDIO_ManufacturerCode = MANUFACTURER_CODE,
-+        .SDIO_FunctionClass = FUNCTION_CLASS,
-+        .SDIO_FunctionNo = 1
-+    },
-+    {
-+        .SDIO_ManufacturerID = MANUFACTURER_ID_AR6002_BASE | 0x0,
-+        .SDIO_ManufacturerCode = MANUFACTURER_CODE,
-+        .SDIO_FunctionClass = FUNCTION_CLASS,
-+        .SDIO_FunctionNo = 1
-+    },
-+    {
-+        .SDIO_ManufacturerID = MANUFACTURER_ID_AR6002_BASE | 0x1,
-+        .SDIO_ManufacturerCode = MANUFACTURER_CODE,
-+        .SDIO_FunctionClass = FUNCTION_CLASS,
-+        .SDIO_FunctionNo = 1
-+    },
-+    {
-+    }                      //list is null termintaed
-+};
-+
-+TARGET_FUNCTION_CONTEXT FunctionContext = {
-+    .function.Version    = CT_SDIO_STACK_VERSION_CODE,
-+    .function.pName      = "sdio_wlan",
-+    .function.MaxDevices = 1,
-+    .function.NumDevices = 0,
-+    .function.pIds       = Ids,
-+    .function.pProbe     = hifDeviceInserted,
-+    .function.pRemove    = hifDeviceRemoved,
-+    .function.pSuspend   = NULL,
-+    .function.pResume    = NULL,
-+    .function.pWake      = NULL,
-+    .function.pContext   = &FunctionContext,
-+};
-+
-+HIF_DEVICE hifDevice[HIF_MAX_DEVICES];
-+HTC_CALLBACKS htcCallbacks;
-+BUS_REQUEST busRequest[BUS_REQUEST_MAX_NUM];
-+static BUS_REQUEST *s_busRequestFreeQueue = NULL;
-+OS_CRITICALSECTION lock;
-+extern A_UINT32 onebitmode;
-+extern A_UINT32 busspeedlow;
-+extern A_UINT32 debughif;
-+
-+#ifdef DEBUG
-+#define ATH_DEBUG_ERROR 1
-+#define ATH_DEBUG_WARN  2
-+#define ATH_DEBUG_TRACE 3
-+#define _AR_DEBUG_PRINTX_ARG(arg...) arg
-+#define AR_DEBUG_PRINTF(lvl, args)\
-+    {if (lvl <= debughif)\
-+        A_PRINTF(KERN_ALERT _AR_DEBUG_PRINTX_ARG args);\
-+    }
-+#else
-+#define AR_DEBUG_PRINTF(lvl, args)
-+#endif
-+
-+static BUS_REQUEST *hifAllocateBusRequest(void);
-+static void hifFreeBusRequest(BUS_REQUEST *busrequest);
-+static THREAD_RETURN insert_helper_func(POSKERNEL_HELPER pHelper);
-+static void ResetAllCards(void);
-+
-+/* ------ Functions ------ */
-+int HIFInit(HTC_CALLBACKS *callbacks)
-+{
-+    SDIO_STATUS status;
-+    DBG_ASSERT(callbacks != NULL);
-+
-+    /* Store the callback and event handlers */
-+    htcCallbacks.deviceInsertedHandler = callbacks->deviceInsertedHandler;
-+    htcCallbacks.deviceRemovedHandler = callbacks->deviceRemovedHandler;
-+    htcCallbacks.deviceSuspendHandler = callbacks->deviceSuspendHandler;
-+    htcCallbacks.deviceResumeHandler = callbacks->deviceResumeHandler;
-+    htcCallbacks.deviceWakeupHandler = callbacks->deviceWakeupHandler;
-+    htcCallbacks.rwCompletionHandler = callbacks->rwCompletionHandler;
-+    htcCallbacks.dsrHandler = callbacks->dsrHandler;
-+
-+    CriticalSectionInit(&lock);
-+
-+    /* Register with bus driver core */
-+    status = SDIO_RegisterFunction(&FunctionContext.function);
-+    DBG_ASSERT(SDIO_SUCCESS(status));
-+
-+    return(0);
-+}
-+
-+A_STATUS
-+HIFReadWrite(HIF_DEVICE *device,
-+             A_UINT32 address,
-+             A_UCHAR *buffer,
-+             A_UINT32 length,
-+             A_UINT32 request,
-+             void *context)
-+{
-+    A_UINT8 rw;
-+    A_UINT8 mode;
-+    A_UINT8 funcNo;
-+    A_UINT8 opcode;
-+    A_UINT16 count;
-+    SDREQUEST *sdrequest;
-+    SDIO_STATUS sdiostatus;
-+    BUS_REQUEST *busrequest;
-+    A_STATUS    status = A_OK;
-+
-+    DBG_ASSERT(device != NULL);
-+    DBG_ASSERT(device->handle != NULL);
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Device: %p\n", device));
-+
-+    do {
-+        busrequest = hifAllocateBusRequest();
-+        if (busrequest == NULL) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR, ("HIF Unable to allocate bus request\n"));
-+            status = A_NO_RESOURCE;
-+            break;
-+        }
-+
-+        sdrequest = busrequest->request;
-+        busrequest->context = context;
-+
-+        sdrequest->pDataBuffer = buffer;
-+        if (request & HIF_SYNCHRONOUS) {
-+            sdrequest->Flags = SDREQ_FLAGS_RESP_SDIO_R5 | SDREQ_FLAGS_DATA_TRANS;
-+            sdrequest->pCompleteContext = NULL;
-+            sdrequest->pCompletion = NULL;
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Execution mode: Synchronous\n"));
-+        } else if (request & HIF_ASYNCHRONOUS) {
-+            sdrequest->Flags = SDREQ_FLAGS_RESP_SDIO_R5 | SDREQ_FLAGS_DATA_TRANS |
-+                               SDREQ_FLAGS_TRANS_ASYNC;
-+            sdrequest->pCompleteContext = busrequest;
-+            sdrequest->pCompletion = hifRWCompletionHandler;
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Execution mode: Asynchronous\n"));
-+        } else {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-+                            ("Invalid execution mode: 0x%08x\n", request));
-+            status = A_EINVAL;
-+            break;
-+        }
-+
-+        if (request & HIF_EXTENDED_IO) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Command type: CMD53\n"));
-+            sdrequest->Command = CMD53;
-+        } else {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-+                            ("Invalid command type: 0x%08x\n", request));
-+            status = A_EINVAL;
-+            break;
-+        }
-+
-+        if (request & HIF_BLOCK_BASIS) {
-+            mode = CMD53_BLOCK_BASIS;
-+            sdrequest->BlockLen = HIF_MBOX_BLOCK_SIZE;
-+            sdrequest->BlockCount = length / HIF_MBOX_BLOCK_SIZE;
-+            count = sdrequest->BlockCount;
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-+                            ("Block mode (BlockLen: %d, BlockCount: %d)\n",
-+                            sdrequest->BlockLen, sdrequest->BlockCount));
-+        } else if (request & HIF_BYTE_BASIS) {
-+            mode = CMD53_BYTE_BASIS;
-+            sdrequest->BlockLen = length;
-+            sdrequest->BlockCount = 1;
-+            count = sdrequest->BlockLen;
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-+                            ("Byte mode (BlockLen: %d, BlockCount: %d)\n",
-+                            sdrequest->BlockLen, sdrequest->BlockCount));
-+        } else {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-+                            ("Invalid data mode: 0x%08x\n", request));
-+            status = A_EINVAL;
-+            break;
-+        }
-+
-+#if 0
-+        /* useful for checking register accesses */
-+        if (length & 0x3) {
-+            A_PRINTF(KERN_ALERT"HIF (%s) is not a multiple of 4 bytes, addr:0x%X, len:%d\n",
-+                                request & HIF_WRITE ? "write":"read", address, length);
-+        }
-+#endif
-+
-+        if ((address >= HIF_MBOX_START_ADDR(0)) &&
-+            (address <= HIF_MBOX_END_ADDR(3)))
-+        {
-+
-+            DBG_ASSERT(length <= HIF_MBOX_WIDTH);
-+
-+            /*
-+             * Mailbox write. Adjust the address so that the last byte
-+             * falls on the EOM address.
-+             */
-+            address += (HIF_MBOX_WIDTH - length);
-+        }
-+
-+
-+
-+        if (request & HIF_WRITE) {
-+            rw = CMD53_WRITE;
-+            sdrequest->Flags |= SDREQ_FLAGS_DATA_WRITE;
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Direction: Write\n"));
-+        } else if (request & HIF_READ) {
-+            rw = CMD53_READ;
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Direction: Read\n"));
-+        } else {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-+                            ("Invalid direction: 0x%08x\n", request));
-+            status = A_EINVAL;
-+            break;
-+        }
-+
-+        if (request & HIF_FIXED_ADDRESS) {
-+            opcode = CMD53_FIXED_ADDRESS;
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Address mode: Fixed\n"));
-+        } else if (request & HIF_INCREMENTAL_ADDRESS) {
-+            opcode = CMD53_INCR_ADDRESS;
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Address mode: Incremental\n"));
-+        } else {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-+                            ("Invalid address mode: 0x%08x\n", request));
-+            status = A_EINVAL;
-+            break;
-+        }
-+
-+        funcNo = SDDEVICE_GET_SDIO_FUNCNO(device->handle);
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Function number: %d\n", funcNo));
-+        SDIO_SET_CMD53_ARG(sdrequest->Argument, rw, funcNo,
-+                           mode, opcode, address, count);
-+
-+        /* Send the command out */
-+        sdiostatus = SDDEVICE_CALL_REQUEST_FUNC(device->handle, sdrequest);
-+
-+        if (!SDIO_SUCCESS(sdiostatus)) {
-+            status = A_ERROR;
-+        }
-+
-+    } while (FALSE);
-+
-+    if (A_FAILED(status) || (request & HIF_SYNCHRONOUS)) {
-+        if (busrequest != NULL) {
-+            hifFreeBusRequest(busrequest);
-+        }
-+    }
-+
-+    if (A_FAILED(status) && (request & HIF_ASYNCHRONOUS)) {
-+            /* call back async handler on failure */
-+        htcCallbacks.rwCompletionHandler(context, status);
-+    }
-+
-+    return status;
-+}
-+
-+A_STATUS
-+HIFConfigureDevice(HIF_DEVICE *device, HIF_DEVICE_CONFIG_OPCODE opcode,
-+                   void *config, A_UINT32 configLen)
-+{
-+    A_UINT32 count;
-+
-+    switch(opcode) {
-+        case HIF_DEVICE_GET_MBOX_BLOCK_SIZE:
-+            ((A_UINT32 *)config)[0] = HIF_MBOX0_BLOCK_SIZE;
-+            ((A_UINT32 *)config)[1] = HIF_MBOX1_BLOCK_SIZE;
-+            ((A_UINT32 *)config)[2] = HIF_MBOX2_BLOCK_SIZE;
-+            ((A_UINT32 *)config)[3] = HIF_MBOX3_BLOCK_SIZE;
-+            break;
-+
-+        case HIF_DEVICE_GET_MBOX_ADDR:
-+            for (count = 0; count < 4; count ++) {
-+                ((A_UINT32 *)config)[count] = HIF_MBOX_START_ADDR(count);
-+            }
-+            break;
-+        case HIF_DEVICE_GET_IRQ_PROC_MODE:
-+                /* the SDIO stack allows the interrupts to be processed either way, ASYNC or SYNC */
-+            *((HIF_DEVICE_IRQ_PROCESSING_MODE *)config) = HIF_DEVICE_IRQ_ASYNC_SYNC;
-+            break;
-+        default:
-+            AR_DEBUG_PRINTF(ATH_DEBUG_WARN,
-+                            ("Unsupported configuration opcode: %d\n", opcode));
-+            return A_ERROR;
-+    }
-+
-+    return A_OK;
-+}
-+
-+void
-+HIFShutDownDevice(HIF_DEVICE *device)
-+{
-+    A_UINT8 data;
-+    A_UINT32 count;
-+    SDIO_STATUS status;
-+    SDCONFIG_BUS_MODE_DATA busSettings;
-+    SDCONFIG_FUNC_ENABLE_DISABLE_DATA fData;
-+
-+    if (device != NULL) {
-+        DBG_ASSERT(device->handle != NULL);
-+
-+        /* Remove the allocated current if any */
-+        status = SDLIB_IssueConfig(device->handle,
-+                                   SDCONFIG_FUNC_FREE_SLOT_CURRENT, NULL, 0);
-+        DBG_ASSERT(SDIO_SUCCESS(status));
-+
-+        /* Disable the card */
-+        fData.EnableFlags = SDCONFIG_DISABLE_FUNC;
-+        fData.TimeOut = 1;
-+        status = SDLIB_IssueConfig(device->handle, SDCONFIG_FUNC_ENABLE_DISABLE,
-+                                   &fData, sizeof(fData));
-+        DBG_ASSERT(SDIO_SUCCESS(status));
-+
-+        /* Perform a soft I/O reset */
-+        data = SDIO_IO_RESET;
-+        status = SDLIB_IssueCMD52(device->handle, 0, SDIO_IO_ABORT_REG,
-+                                  &data, 1, 1);
-+        DBG_ASSERT(SDIO_SUCCESS(status));
-+
-+        /*
-+         * WAR - Codetelligence driver does not seem to shutdown correctly in 1
-+         * bit mode. By default it configures the HC in the 4 bit. Its later in
-+         * our driver that we switch to 1 bit mode. If we try to shutdown, the
-+         * driver hangs so we revert to 4 bit mode, to be transparent to the
-+         * underlying bus driver.
-+         */
-+        if (onebitmode) {
-+            ZERO_OBJECT(busSettings);
-+            busSettings.BusModeFlags = SDDEVICE_GET_BUSMODE_FLAGS(device->handle);
-+            SDCONFIG_SET_BUS_WIDTH(busSettings.BusModeFlags,
-+                                   SDCONFIG_BUS_WIDTH_4_BIT);
-+
-+            /* Issue config request to change the bus width to 4 bit */
-+            status = SDLIB_IssueConfig(device->handle, SDCONFIG_BUS_MODE_CTRL,
-+                                       &busSettings,
-+                                       sizeof(SDCONFIG_BUS_MODE_DATA));
-+            DBG_ASSERT(SDIO_SUCCESS(status));
-+        }
-+
-+        /* Free the bus requests */
-+        for (count = 0; count < BUS_REQUEST_MAX_NUM; count ++) {
-+            SDDeviceFreeRequest(device->handle, busRequest[count].request);
-+        }
-+        /* Clean up the queue */
-+        s_busRequestFreeQueue = NULL;
-+    } else {
-+            /* since we are unloading the driver anyways, reset all cards in case the SDIO card
-+             * is externally powered and we are unloading the SDIO stack.  This avoids the problem when
-+             * the SDIO stack is reloaded and attempts are made to re-enumerate a card that is already
-+             * enumerated */
-+        ResetAllCards();
-+        /* Unregister with bus driver core */
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-+                        ("Unregistering with the bus driver\n"));
-+        status = SDIO_UnregisterFunction(&FunctionContext.function);
-+        DBG_ASSERT(SDIO_SUCCESS(status));
-+    }
-+}
-+
-+void
-+hifRWCompletionHandler(SDREQUEST *request)
-+{
-+    A_STATUS status;
-+    void *context;
-+    BUS_REQUEST *busrequest;
-+
-+    if (SDIO_SUCCESS(request->Status)) {
-+        status = A_OK;
-+    } else {
-+        status = A_ERROR;
-+    }
-+
-+    DBG_ASSERT(status == A_OK);
-+    busrequest = (BUS_REQUEST *) request->pCompleteContext;
-+    context = (void *) busrequest->context;
-+        /* free the request before calling the callback, in case the
-+         * callback submits another request, this guarantees that
-+         * there is at least 1 free request available everytime the callback
-+         * is invoked */
-+    hifFreeBusRequest(busrequest);
-+    htcCallbacks.rwCompletionHandler(context, status);
-+}
-+
-+void
-+hifIRQHandler(void *context)
-+{
-+    A_STATUS status;
-+    HIF_DEVICE *device;
-+
-+    device = (HIF_DEVICE *)context;
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Device: %p\n", device));
-+    status = htcCallbacks.dsrHandler(device->htc_handle);
-+    DBG_ASSERT(status == A_OK);
-+}
-+
-+BOOL
-+hifDeviceInserted(SDFUNCTION *function, SDDEVICE *handle)
-+{
-+    BOOL enabled;
-+    A_UINT8 data;
-+    A_UINT32 count;
-+    HIF_DEVICE *device;
-+    SDIO_STATUS status;
-+    A_UINT16 maxBlocks;
-+    A_UINT16 maxBlockSize;
-+    SDCONFIG_BUS_MODE_DATA busSettings;
-+    SDCONFIG_FUNC_ENABLE_DISABLE_DATA fData;
-+    TARGET_FUNCTION_CONTEXT *functionContext;
-+    SDCONFIG_FUNC_SLOT_CURRENT_DATA slotCurrent;
-+    SD_BUSCLOCK_RATE                currentBusClock;
-+
-+    DBG_ASSERT(function != NULL);
-+    DBG_ASSERT(handle != NULL);
-+
-+    device = addHifDevice(handle);
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Device: %p\n", device));
-+    functionContext =  (TARGET_FUNCTION_CONTEXT *)function->pContext;
-+
-+    /*
-+     * Issue commands to get the manufacturer ID and stuff and compare it
-+     * against the rev Id derived from the ID registered during the
-+     * initialization process. Report the device only in the case there
-+     * is a match. In the case od SDIO, the bus driver has already queried
-+     * these details so we just need to use their data structures to get the
-+     * relevant values. Infact, the driver has already matched it against
-+     * the Ids that we registered with it so we dont need to the step here.
-+     */
-+
-+    /* Configure the SDIO Bus Width */
-+    if (onebitmode) {
-+        data = SDIO_BUS_WIDTH_1_BIT;
-+        status = SDLIB_IssueCMD52(handle, 0, SDIO_BUS_IF_REG, &data, 1, 1);
-+        if (!SDIO_SUCCESS(status)) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-+                            ("Unable to set the bus width to 1 bit\n"));
-+            return FALSE;
-+        }
-+    }
-+
-+    /* Get current bus flags */
-+    ZERO_OBJECT(busSettings);
-+
-+    busSettings.BusModeFlags = SDDEVICE_GET_BUSMODE_FLAGS(handle);
-+    if (onebitmode) {
-+        SDCONFIG_SET_BUS_WIDTH(busSettings.BusModeFlags,
-+                               SDCONFIG_BUS_WIDTH_1_BIT);
-+    }
-+
-+        /* get the current operating clock, the bus driver sets us up based
-+         * on what our CIS reports and what the host controller can handle
-+         * we can use this to determine whether we want to drop our clock rate
-+         * down */
-+    currentBusClock = SDDEVICE_GET_OPER_CLOCK(handle);
-+    busSettings.ClockRate = currentBusClock;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-+                        ("HIF currently running at: %d \n",currentBusClock));
-+
-+        /* see if HIF wants to run at a lower clock speed, we may already be
-+         * at that lower clock speed */
-+    if (currentBusClock > (SDIO_CLOCK_FREQUENCY_DEFAULT >> busspeedlow)) {
-+        busSettings.ClockRate = SDIO_CLOCK_FREQUENCY_DEFAULT >> busspeedlow;
-+        AR_DEBUG_PRINTF(ATH_DEBUG_WARN,
-+                        ("HIF overriding clock to %d \n",busSettings.ClockRate));
-+    }
-+
-+    /* Issue config request to override clock rate */
-+    status = SDLIB_IssueConfig(handle, SDCONFIG_FUNC_CHANGE_BUS_MODE, &busSettings,
-+                               sizeof(SDCONFIG_BUS_MODE_DATA));
-+    if (!SDIO_SUCCESS(status)) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-+                        ("Unable to configure the host clock\n"));
-+        return FALSE;
-+    } else {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-+                        ("Configured clock: %d, Maximum clock: %d\n",
-+                        busSettings.ActualClockRate,
-+                        SDDEVICE_GET_MAX_CLOCK(handle)));
-+    }
-+
-+    /*
-+     * Check if the target supports block mode. This result of this check
-+     * can be used to implement the HIFReadWrite API.
-+     */
-+    if (SDDEVICE_GET_SDIO_FUNC_MAXBLKSIZE(handle)) {
-+        /* Limit block size to operational block limit or card function
-+           capability */
-+        maxBlockSize = min(SDDEVICE_GET_OPER_BLOCK_LEN(handle),
-+                           SDDEVICE_GET_SDIO_FUNC_MAXBLKSIZE(handle));
-+
-+        /* check if the card support multi-block transfers */
-+        if (!(SDDEVICE_GET_SDIOCARD_CAPS(handle) & SDIO_CAPS_MULTI_BLOCK)) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Byte basis only\n"));
-+
-+            /* Limit block size to max byte basis */
-+            maxBlockSize =  min(maxBlockSize,
-+                                (A_UINT16)SDIO_MAX_LENGTH_BYTE_BASIS);
-+            maxBlocks = 1;
-+        } else {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Multi-block capable\n"));
-+            maxBlocks = SDDEVICE_GET_OPER_BLOCKS(handle);
-+            status = SDLIB_SetFunctionBlockSize(handle, HIF_MBOX_BLOCK_SIZE);
-+            if (!SDIO_SUCCESS(status)) {
-+                AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-+                                ("Failed to set block size. Err:%d\n", status));
-+                return FALSE;
-+            }
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-+                        ("Bytes Per Block: %d bytes, Block Count:%d \n",
-+                        maxBlockSize, maxBlocks));
-+    } else {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-+                        ("Function does not support Block Mode!\n"));
-+        return FALSE;
-+    }
-+
-+    /* Allocate the slot current */
-+    status = SDLIB_GetDefaultOpCurrent(handle, &slotCurrent.SlotCurrent);
-+    if (SDIO_SUCCESS(status)) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Allocating Slot current: %d mA\n",
-+                                slotCurrent.SlotCurrent));
-+        status = SDLIB_IssueConfig(handle, SDCONFIG_FUNC_ALLOC_SLOT_CURRENT,
-+                                   &slotCurrent, sizeof(slotCurrent));
-+        if (!SDIO_SUCCESS(status)) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-+                            ("Failed to allocate slot current %d\n", status));
-+            return FALSE;
-+        }
-+    }
-+
-+    /* Enable the dragon function */
-+    count = 0;
-+    enabled = FALSE;
-+    fData.TimeOut = 1;
-+    fData.EnableFlags = SDCONFIG_ENABLE_FUNC;
-+    while ((count++ < SDWLAN_ENABLE_DISABLE_TIMEOUT) && !enabled)
-+    {
-+        /* Enable dragon */
-+        status = SDLIB_IssueConfig(handle, SDCONFIG_FUNC_ENABLE_DISABLE,
-+                                   &fData, sizeof(fData));
-+        if (!SDIO_SUCCESS(status)) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-+                            ("Attempting to enable the card again\n"));
-+            continue;
-+        }
-+
-+        /* Mark the status as enabled */
-+        enabled = TRUE;
-+    }
-+
-+    /* Check if we were succesful in enabling the target */
-+    if (!enabled) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERROR,
-+                        ("Failed to communicate with the target\n"));
-+        return FALSE;
-+    }
-+
-+    /* Allocate the bus requests to be used later */
-+    A_MEMZERO(busRequest, sizeof(busRequest));
-+    for (count = 0; count < BUS_REQUEST_MAX_NUM; count ++) {
-+        if ((busRequest[count].request = SDDeviceAllocRequest(handle)) == NULL){
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERROR, ("Unable to allocate memory\n"));
-+            /* TODO: Free the memory that has already been allocated */
-+            return FALSE;
-+        }
-+        hifFreeBusRequest(&busRequest[count]);
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-+                ("0x%08x = busRequest[%d].request = 0x%08x\n",
-+                              (unsigned int) &busRequest[count], count,
-+                              (unsigned int) busRequest[count].request));
-+    }
-+
-+        /* Schedule a worker to handle device inserted, this is a temporary workaround
-+         * to fix a deadlock if the device fails to intialize in the insertion handler
-+         * The failure causes the instance to shutdown the HIF layer and unregister the
-+         * function driver within the busdriver probe context which can deadlock
-+         *
-+         * NOTE: we cannot use the default work queue because that would block
-+         * SD bus request processing for all synchronous I/O. We must use a kernel
-+         * thread that is creating using the helper library.
-+         * */
-+
-+    if (SDIO_SUCCESS(SDLIB_OSCreateHelper(&device->insert_helper,
-+                         insert_helper_func,
-+                         device))) {
-+        device->helper_started = TRUE;
-+    }
-+
-+    return TRUE;
-+}
-+
-+static THREAD_RETURN insert_helper_func(POSKERNEL_HELPER pHelper)
-+{
-+
-+    /*
-+     * Adding a wait of around a second before we issue the very first
-+     * command to dragon. During the process of loading/unloading the
-+     * driver repeatedly it was observed that we get a data timeout
-+     * while accessing function 1 registers in the chip. The theory at
-+     * this point is that some initialization delay in dragon is
-+     * causing the SDIO state in dragon core to be not ready even after
-+     * the ready bit indicates that function 1 is ready. Accomodating
-+     * for this behavior by adding some delay in the driver before it
-+     * issues the first command after switching on dragon. Need to
-+     * investigate this a bit more - TODO
-+     */
-+
-+    A_MDELAY(1000);
-+        /* Inform HTC */
-+    if ((htcCallbacks.deviceInsertedHandler(SD_GET_OS_HELPER_CONTEXT(pHelper))) != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRACE, ("Device rejected\n"));
-+    }
-+
-+    return 0;
-+}
-+
-+void
-+HIFAckInterrupt(HIF_DEVICE *device)
-+{
-+    SDIO_STATUS status;
-+    DBG_ASSERT(device != NULL);
-+    DBG_ASSERT(device->handle != NULL);
-+
-+    /* Acknowledge our function IRQ */
-+    status = SDLIB_IssueConfig(device->handle, SDCONFIG_FUNC_ACK_IRQ,
-+                               NULL, 0);
-+    DBG_ASSERT(SDIO_SUCCESS(status));
-+}
-+
-+void
-+HIFUnMaskInterrupt(HIF_DEVICE *device)
-+{
-+    SDIO_STATUS status;
-+
-+    DBG_ASSERT(device != NULL);
-+    DBG_ASSERT(device->handle != NULL);
-+
-+    /* Register the IRQ Handler */
-+    SDDEVICE_SET_IRQ_HANDLER(device->handle, hifIRQHandler, device);
-+
-+    /* Unmask our function IRQ */
-+    status = SDLIB_IssueConfig(device->handle, SDCONFIG_FUNC_UNMASK_IRQ,
-+                               NULL, 0);
-+    DBG_ASSERT(SDIO_SUCCESS(status));
-+}
-+
-+void HIFMaskInterrupt(HIF_DEVICE *device)
-+{
-+    SDIO_STATUS status;
-+    DBG_ASSERT(device != NULL);
-+    DBG_ASSERT(device->handle != NULL);
-+
-+    /* Mask our function IRQ */
-+    status = SDLIB_IssueConfig(device->handle, SDCONFIG_FUNC_MASK_IRQ,
-+                               NULL, 0);
-+    DBG_ASSERT(SDIO_SUCCESS(status));
-+
-+    /* Unregister the IRQ Handler */
-+    SDDEVICE_SET_IRQ_HANDLER(device->handle, NULL, NULL);
-+}
-+
-+static BUS_REQUEST *hifAllocateBusRequest(void)
-+{
-+    BUS_REQUEST *busrequest;
-+
-+    /* Acquire lock */
-+    CriticalSectionAcquire(&lock);
-+
-+    /* Remove first in list */
-+    if((busrequest = s_busRequestFreeQueue) != NULL)
-+    {
-+        s_busRequestFreeQueue = busrequest->next;
-+    }
-+
-+    /* Release lock */
-+    CriticalSectionRelease(&lock);
-+
-+    return busrequest;
-+}
-+
-+static void
-+hifFreeBusRequest(BUS_REQUEST *busrequest)
-+{
-+    DBG_ASSERT(busrequest != NULL);
-+
-+    /* Acquire lock */
-+    CriticalSectionAcquire(&lock);
-+
-+    /* Insert first in list */
-+    busrequest->next = s_busRequestFreeQueue;
-+    s_busRequestFreeQueue = busrequest;
-+
-+    /* Release lock */
-+    CriticalSectionRelease(&lock);
-+}
-+
-+void
-+hifDeviceRemoved(SDFUNCTION *function, SDDEVICE *handle)
-+{
-+    A_STATUS status;
-+    HIF_DEVICE *device;
-+    DBG_ASSERT(function != NULL);
-+    DBG_ASSERT(handle != NULL);
-+
-+    device = getHifDevice(handle);
-+    status = htcCallbacks.deviceRemovedHandler(device->htc_handle, A_OK);
-+
-+        /* cleanup the helper thread */
-+    if (device->helper_started) {
-+        SDLIB_OSDeleteHelper(&device->insert_helper);
-+        device->helper_started = FALSE;
-+    }
-+
-+    delHifDevice(handle);
-+    DBG_ASSERT(status == A_OK);
-+}
-+
-+HIF_DEVICE *
-+addHifDevice(SDDEVICE *handle)
-+{
-+    DBG_ASSERT(handle != NULL);
-+    hifDevice[0].handle = handle;
-+    return &hifDevice[0];
-+}
-+
-+HIF_DEVICE *
-+getHifDevice(SDDEVICE *handle)
-+{
-+    DBG_ASSERT(handle != NULL);
-+    return &hifDevice[0];
-+}
-+
-+void
-+delHifDevice(SDDEVICE *handle)
-+{
-+    DBG_ASSERT(handle != NULL);
-+    hifDevice[0].handle = NULL;
-+}
-+
-+static void ResetAllCards(void)
-+{
-+    UINT8       data;
-+    SDIO_STATUS status;
-+    int         i;
-+
-+    data = SDIO_IO_RESET;
-+
-+    /* set the I/O CARD reset bit:
-+     * NOTE: we are exploiting a "feature" of the SDIO core that resets the core when you
-+     * set the RES bit in the SDIO_IO_ABORT register.  This bit however "normally" resets the
-+     * I/O functions leaving the SDIO core in the same state (as per SDIO spec).
-+     * In this design, this reset can be used to reset the SDIO core itself */
-+    for (i = 0; i < HIF_MAX_DEVICES; i++) {
-+        if (hifDevice[i].handle != NULL) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_TRACE,
-+                        ("Issuing I/O Card reset for instance: %d \n",i));
-+                /* set the I/O Card reset bit */
-+            status = SDLIB_IssueCMD52(hifDevice[i].handle,
-+                                      0,                    /* function 0 space */
-+                                      SDIO_IO_ABORT_REG,
-+                                      &data,
-+                                      1,                    /* 1 byte */
-+                                      TRUE);                /* write */
-+        }
-+    }
-+
-+}
-+
-+void HIFSetHandle(void *hif_handle, void *handle)
-+{
-+    HIF_DEVICE *device = (HIF_DEVICE *) hif_handle;
-+
-+    device->htc_handle = handle;
-+
-+    return;
-+}
-diff --git a/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h b/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h
-new file mode 100644
-index 0000000..d8fc101
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h
-@@ -0,0 +1,102 @@
-+/*
-+ * @file: hif_internal.h
-+ *
-+ * @abstract: internal header file for hif layer
-+ *
-+ * @notice: Copyright (c) 2004-2006 Atheros Communications 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include <linux/sdio/ctsystem.h>
-+#include <linux/sdio/sdio_busdriver.h>
-+#include <linux/sdio/_sdio_defs.h>
-+#include <linux/sdio/sdio_lib.h>
-+#include "a_config.h"
-+#include "athdefs.h"
-+#include "a_types.h"
-+#include "a_osapi.h"
-+#include "hif.h"
-+
-+#define MANUFACTURER_ID_AR6001_BASE        0x100
-+#define MANUFACTURER_ID_AR6002_BASE        0x200
-+#define FUNCTION_CLASS                     0x0
-+#define MANUFACTURER_CODE                  0x271
-+
-+#define BUS_REQUEST_MAX_NUM                64
-+
-+#define SDIO_CLOCK_FREQUENCY_DEFAULT       25000000
-+#define SDWLAN_ENABLE_DISABLE_TIMEOUT      20
-+#define FLAGS_CARD_ENAB                    0x02
-+#define FLAGS_CARD_IRQ_UNMSK               0x04
-+
-+#define HIF_MBOX_BLOCK_SIZE                128
-+#define HIF_MBOX_BASE_ADDR                 0x800
-+#define HIF_MBOX_WIDTH                     0x800
-+#define HIF_MBOX0_BLOCK_SIZE               1
-+#define HIF_MBOX1_BLOCK_SIZE               HIF_MBOX_BLOCK_SIZE
-+#define HIF_MBOX2_BLOCK_SIZE               HIF_MBOX_BLOCK_SIZE
-+#define HIF_MBOX3_BLOCK_SIZE               HIF_MBOX_BLOCK_SIZE
-+
-+#define HIF_MBOX_START_ADDR(mbox)                        \
-+    HIF_MBOX_BASE_ADDR + mbox * HIF_MBOX_WIDTH
-+
-+#define HIF_MBOX_END_ADDR(mbox)                                \
-+    HIF_MBOX_START_ADDR(mbox) + HIF_MBOX_WIDTH - 1
-+
-+struct hif_device {
-+    SDDEVICE *handle;
-+    void *htc_handle;
-+    OSKERNEL_HELPER insert_helper;
-+    BOOL  helper_started;
-+};
-+
-+typedef struct target_function_context {
-+    SDFUNCTION           function; /* function description of the bus driver */
-+    OS_SEMAPHORE         instanceSem; /* instance lock. Unused */
-+    SDLIST               instanceList; /* list of instances. Unused */
-+} TARGET_FUNCTION_CONTEXT;
-+
-+typedef struct bus_request {
-+    struct bus_request *next;
-+    SDREQUEST *request;
-+    void *context;
-+} BUS_REQUEST;
-+
-+BOOL
-+hifDeviceInserted(SDFUNCTION *function, SDDEVICE *device);
-+
-+void
-+hifDeviceRemoved(SDFUNCTION *function, SDDEVICE *device);
-+
-+SDREQUEST *
-+hifAllocateDeviceRequest(SDDEVICE *device);
-+
-+void
-+hifFreeDeviceRequest(SDREQUEST *request);
-+
-+void
-+hifRWCompletionHandler(SDREQUEST *request);
-+
-+void
-+hifIRQHandler(void *context);
-+
-+HIF_DEVICE *
-+addHifDevice(SDDEVICE *handle);
-+
-+HIF_DEVICE *
-+getHifDevice(SDDEVICE *handle);
-+
-+void
-+delHifDevice(SDDEVICE *handle);
-diff --git a/drivers/sdio/function/wlan/ar6000/htc/ar6k.c b/drivers/sdio/function/wlan/ar6000/htc/ar6k.c
-new file mode 100644
-index 0000000..0fd671a
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/htc/ar6k.c
-@@ -0,0 +1,991 @@
-+/*
-+ * AR6K device layer that handles register level I/O
-+ *
-+ * Copyright (c) 2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+#include "a_config.h"
-+#include "athdefs.h"
-+#include "a_types.h"
-+#include "AR6Khwreg.h"
-+#include "a_osapi.h"
-+#include "a_debug.h"
-+#include "hif.h"
-+#include "htc_packet.h"
-+#include "ar6k.h"
-+
-+#define MAILBOX_FOR_BLOCK_SIZE 1
-+
-+extern A_UINT32 resetok;
-+
-+static A_STATUS DevEnableInterrupts(AR6K_DEVICE *pDev);
-+static A_STATUS DevDisableInterrupts(AR6K_DEVICE *pDev);
-+
-+#define LOCK_AR6K(p)      A_MUTEX_LOCK(&(p)->Lock);
-+#define UNLOCK_AR6K(p)    A_MUTEX_UNLOCK(&(p)->Lock);
-+
-+void AR6KFreeIOPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket)
-+{
-+    LOCK_AR6K(pDev);
-+    HTC_PACKET_ENQUEUE(&pDev->RegisterIOList,pPacket);
-+    UNLOCK_AR6K(pDev);
-+}
-+
-+HTC_PACKET *AR6KAllocIOPacket(AR6K_DEVICE *pDev)
-+{
-+    HTC_PACKET *pPacket;
-+
-+    LOCK_AR6K(pDev);
-+    pPacket = HTC_PACKET_DEQUEUE(&pDev->RegisterIOList);
-+    UNLOCK_AR6K(pDev);
-+
-+    return pPacket;
-+}
-+
-+A_STATUS DevSetup(AR6K_DEVICE *pDev)
-+{
-+    A_UINT32 mailboxaddrs[AR6K_MAILBOXES];
-+    A_UINT32 blocksizes[AR6K_MAILBOXES];
-+    A_STATUS status = A_OK;
-+    int      i;
-+
-+    AR_DEBUG_ASSERT(AR6K_IRQ_PROC_REGS_SIZE == 16);
-+    AR_DEBUG_ASSERT(AR6K_IRQ_ENABLE_REGS_SIZE == 4);
-+
-+    do {
-+            /* give a handle to HIF for this target */
-+        HIFSetHandle(pDev->HIFDevice, (void *)pDev);
-+            /* initialize our free list of IO packets */
-+        INIT_HTC_PACKET_QUEUE(&pDev->RegisterIOList);
-+        A_MUTEX_INIT(&pDev->Lock);
-+
-+            /* get the addresses for all 4 mailboxes */
-+        status = HIFConfigureDevice(pDev->HIFDevice, HIF_DEVICE_GET_MBOX_ADDR,
-+                                    mailboxaddrs, sizeof(mailboxaddrs));
-+
-+        if (status != A_OK) {
-+            AR_DEBUG_ASSERT(FALSE);
-+            break;
-+        }
-+
-+            /* carve up register I/O packets (these are for ASYNC register I/O ) */
-+        for (i = 0; i < AR6K_MAX_REG_IO_BUFFERS; i++) {
-+            HTC_PACKET *pIOPacket;
-+            pIOPacket = &pDev->RegIOBuffers[i].HtcPacket;
-+            SET_HTC_PACKET_INFO_RX_REFILL(pIOPacket,
-+                                          pDev,
-+                                          pDev->RegIOBuffers[i].Buffer,
-+                                          AR6K_REG_IO_BUFFER_SIZE,
-+                                          0); /* don't care */
-+            AR6KFreeIOPacket(pDev,pIOPacket);
-+        }
-+
-+            /* get the address of the mailbox we are using */
-+        pDev->MailboxAddress = mailboxaddrs[HTC_MAILBOX];
-+
-+            /* get the block sizes */
-+        status = HIFConfigureDevice(pDev->HIFDevice, HIF_DEVICE_GET_MBOX_BLOCK_SIZE,
-+                                    blocksizes, sizeof(blocksizes));
-+
-+        if (status != A_OK) {
-+            AR_DEBUG_ASSERT(FALSE);
-+            break;
-+        }
-+
-+            /* note: we actually get the block size of a mailbox other than 0, for SDIO the block
-+             * size on mailbox 0 is artificially set to 1.  So we use the block size that is set
-+             * for the other 3 mailboxes */
-+        pDev->BlockSize = blocksizes[MAILBOX_FOR_BLOCK_SIZE];
-+            /* must be a power of 2 */
-+        AR_DEBUG_ASSERT((pDev->BlockSize & (pDev->BlockSize - 1)) == 0);
-+
-+            /* assemble mask, used for padding to a block */
-+        pDev->BlockMask = pDev->BlockSize - 1;
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("BlockSize: %d, MailboxAddress:0x%X \n",
-+                    pDev->BlockSize, pDev->MailboxAddress));
-+
-+        pDev->GetPendingEventsFunc = NULL;
-+            /* see if the HIF layer implements the get pending events function  */
-+        HIFConfigureDevice(pDev->HIFDevice,
-+                           HIF_DEVICE_GET_PENDING_EVENTS_FUNC,
-+                           &pDev->GetPendingEventsFunc,
-+                           sizeof(pDev->GetPendingEventsFunc));
-+
-+            /* assume we can process HIF interrupt events asynchronously */
-+        pDev->HifIRQProcessingMode = HIF_DEVICE_IRQ_ASYNC_SYNC;
-+
-+            /* see if the HIF layer overrides this assumption */
-+        HIFConfigureDevice(pDev->HIFDevice,
-+                           HIF_DEVICE_GET_IRQ_PROC_MODE,
-+                           &pDev->HifIRQProcessingMode,
-+                           sizeof(pDev->HifIRQProcessingMode));
-+
-+        switch (pDev->HifIRQProcessingMode) {
-+            case HIF_DEVICE_IRQ_SYNC_ONLY:
-+                AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("HIF Interrupt processing is SYNC ONLY\n"));
-+                break;
-+            case HIF_DEVICE_IRQ_ASYNC_SYNC:
-+                AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("HIF Interrupt processing is ASYNC and SYNC\n"));
-+                break;
-+            default:
-+                AR_DEBUG_ASSERT(FALSE);
-+        }
-+
-+        pDev->HifMaskUmaskRecvEvent = NULL;
-+
-+            /* see if the HIF layer implements the mask/unmask recv events function  */
-+        HIFConfigureDevice(pDev->HIFDevice,
-+                           HIF_DEVICE_GET_RECV_EVENT_MASK_UNMASK_FUNC,
-+                           &pDev->HifMaskUmaskRecvEvent,
-+                           sizeof(pDev->HifMaskUmaskRecvEvent));
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("HIF special overrides : 0x%X , 0x%X\n",
-+                 (A_UINT32)pDev->GetPendingEventsFunc, (A_UINT32)pDev->HifMaskUmaskRecvEvent));
-+
-+        status = DevDisableInterrupts(pDev);
-+
-+    } while (FALSE);
-+
-+    if (A_FAILED(status)) {
-+            /* make sure handle is cleared */
-+        HIFSetHandle(pDev->HIFDevice, NULL);
-+    }
-+
-+    return status;
-+
-+}
-+
-+static A_STATUS DevEnableInterrupts(AR6K_DEVICE *pDev)
-+{
-+    A_STATUS                  status;
-+    AR6K_IRQ_ENABLE_REGISTERS regs;
-+
-+    LOCK_AR6K(pDev);
-+
-+        /* Enable all the interrupts except for the dragon interrupt */
-+    pDev->IrqEnableRegisters.int_status_enable = INT_STATUS_ENABLE_ERROR_SET(0x01) |
-+                                      INT_STATUS_ENABLE_CPU_SET(0x01) |
-+                                      INT_STATUS_ENABLE_COUNTER_SET(0x01);
-+
-+    if (NULL == pDev->GetPendingEventsFunc) {
-+        pDev->IrqEnableRegisters.int_status_enable |= INT_STATUS_ENABLE_MBOX_DATA_SET(0x01);
-+    } else {
-+        /* The HIF layer provided us with a pending events function which means that
-+         * the detection of pending mbox messages is handled in the HIF layer.
-+         * This is the case for the SPI2 interface.
-+         * In the normal case we enable MBOX interrupts, for the case
-+         * with HIFs that offer this mechanism, we keep these interrupts
-+         * masked */
-+        pDev->IrqEnableRegisters.int_status_enable &= ~INT_STATUS_ENABLE_MBOX_DATA_SET(0x01);
-+    }
-+
-+
-+    /* Set up the CPU Interrupt Status Register */
-+    pDev->IrqEnableRegisters.cpu_int_status_enable = CPU_INT_STATUS_ENABLE_BIT_SET(0x00);
-+
-+    /* Set up the Error Interrupt Status Register */
-+    pDev->IrqEnableRegisters.error_status_enable =
-+                                  ERROR_STATUS_ENABLE_RX_UNDERFLOW_SET(0x01) |
-+                                  ERROR_STATUS_ENABLE_TX_OVERFLOW_SET(0x01);
-+
-+    /* Set up the Counter Interrupt Status Register (only for debug interrupt to catch fatal errors) */
-+    pDev->IrqEnableRegisters.counter_int_status_enable =
-+        COUNTER_INT_STATUS_ENABLE_BIT_SET(AR6K_TARGET_DEBUG_INTR_MASK);
-+
-+        /* copy into our temp area */
-+    A_MEMCPY(&regs,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);
-+
-+    UNLOCK_AR6K(pDev);
-+
-+        /* always synchronous */
-+    status = HIFReadWrite(pDev->HIFDevice,
-+                          INT_STATUS_ENABLE_ADDRESS,
-+                          &regs.int_status_enable,
-+                          AR6K_IRQ_ENABLE_REGS_SIZE,
-+                          HIF_WR_SYNC_BYTE_INC,
-+                          NULL);
-+
-+    if (status != A_OK) {
-+        /* Can't write it for some reason */
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                        ("Failed to update interrupt control registers err: %d\n", status));
-+
-+    }
-+
-+    return status;
-+}
-+
-+static A_STATUS DevDisableInterrupts(AR6K_DEVICE *pDev)
-+{
-+    AR6K_IRQ_ENABLE_REGISTERS regs;
-+
-+    LOCK_AR6K(pDev);
-+        /* Disable all interrupts */
-+    pDev->IrqEnableRegisters.int_status_enable = 0;
-+    pDev->IrqEnableRegisters.cpu_int_status_enable = 0;
-+    pDev->IrqEnableRegisters.error_status_enable = 0;
-+    pDev->IrqEnableRegisters.counter_int_status_enable = 0;
-+        /* copy into our temp area */
-+    A_MEMCPY(&regs,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);
-+
-+    UNLOCK_AR6K(pDev);
-+
-+        /* always synchronous */
-+    return HIFReadWrite(pDev->HIFDevice,
-+                        INT_STATUS_ENABLE_ADDRESS,
-+                        &regs.int_status_enable,
-+                        AR6K_IRQ_ENABLE_REGS_SIZE,
-+                        HIF_WR_SYNC_BYTE_INC,
-+                        NULL);
-+}
-+
-+/* enable device interrupts */
-+A_STATUS DevUnmaskInterrupts(AR6K_DEVICE *pDev)
-+{
-+        /* Unmask the host controller interrupts */
-+    HIFUnMaskInterrupt(pDev->HIFDevice);
-+
-+    return DevEnableInterrupts(pDev);
-+}
-+
-+/* disable all device interrupts */
-+A_STATUS DevMaskInterrupts(AR6K_DEVICE *pDev)
-+{
-+    A_STATUS status;
-+
-+    status = DevDisableInterrupts(pDev);
-+
-+    if (A_SUCCESS(status)) {
-+            /* Disable the interrupt at the HIF layer */
-+        HIFMaskInterrupt(pDev->HIFDevice);
-+    }
-+
-+    return status;
-+}
-+
-+/* callback when our fetch to enable/disable completes */
-+static void DevDoEnableDisableRecvAsyncHandler(void *Context, HTC_PACKET *pPacket)
-+{
-+    AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevDoEnableDisableRecvAsyncHandler: (dev: 0x%X)\n", (A_UINT32)pDev));
-+
-+    if (A_FAILED(pPacket->Status)) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                (" Failed to disable receiver, status:%d \n", pPacket->Status));
-+    }
-+        /* free this IO packet */
-+    AR6KFreeIOPacket(pDev,pPacket);
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("-DevDoEnableDisableRecvAsyncHandler \n"));
-+}
-+
-+/* disable packet reception (used in case the host runs out of buffers)
-+ * this is the "override" method when the HIF reports another methods to
-+ * disable recv events */
-+static A_STATUS DevDoEnableDisableRecvOverride(AR6K_DEVICE *pDev, A_BOOL EnableRecv, A_BOOL AsyncMode)
-+{
-+    A_STATUS                  status = A_OK;
-+    HTC_PACKET                *pIOPacket = NULL;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC,("DevDoEnableDisableRecvOverride: Enable:%d Mode:%d\n",
-+            EnableRecv,AsyncMode));
-+
-+    do {
-+
-+        if (AsyncMode) {
-+
-+            pIOPacket = AR6KAllocIOPacket(pDev);
-+
-+            if (NULL == pIOPacket) {
-+                status = A_NO_MEMORY;
-+                AR_DEBUG_ASSERT(FALSE);
-+                break;
-+            }
-+
-+                /* stick in our completion routine when the I/O operation completes */
-+            pIOPacket->Completion = DevDoEnableDisableRecvAsyncHandler;
-+            pIOPacket->pContext = pDev;
-+
-+                /* call the HIF layer override and do this asynchronously */
-+            status = pDev->HifMaskUmaskRecvEvent(pDev->HIFDevice,
-+                                                 EnableRecv ? HIF_UNMASK_RECV : HIF_MASK_RECV,
-+                                                 pIOPacket);
-+            break;
-+        }
-+
-+            /* if we get here we are doing it synchronously */
-+        status = pDev->HifMaskUmaskRecvEvent(pDev->HIFDevice,
-+                                             EnableRecv ? HIF_UNMASK_RECV : HIF_MASK_RECV,
-+                                             NULL);
-+
-+    } while (FALSE);
-+
-+    if (A_FAILED(status) && (pIOPacket != NULL)) {
-+        AR6KFreeIOPacket(pDev,pIOPacket);
-+    }
-+
-+    return status;
-+}
-+
-+/* disable packet reception (used in case the host runs out of buffers)
-+ * this is the "normal" method using the interrupt enable registers through
-+ * the host I/F */
-+static A_STATUS DevDoEnableDisableRecvNormal(AR6K_DEVICE *pDev, A_BOOL EnableRecv, A_BOOL AsyncMode)
-+{
-+    A_STATUS                  status = A_OK;
-+    HTC_PACKET                *pIOPacket = NULL;
-+    AR6K_IRQ_ENABLE_REGISTERS regs;
-+
-+        /* take the lock to protect interrupt enable shadows */
-+    LOCK_AR6K(pDev);
-+
-+    if (EnableRecv) {
-+        pDev->IrqEnableRegisters.int_status_enable |= INT_STATUS_ENABLE_MBOX_DATA_SET(0x01);
-+    } else {
-+        pDev->IrqEnableRegisters.int_status_enable &= ~INT_STATUS_ENABLE_MBOX_DATA_SET(0x01);
-+    }
-+
-+        /* copy into our temp area */
-+    A_MEMCPY(&regs,&pDev->IrqEnableRegisters,AR6K_IRQ_ENABLE_REGS_SIZE);
-+    UNLOCK_AR6K(pDev);
-+
-+    do {
-+
-+        if (AsyncMode) {
-+
-+            pIOPacket = AR6KAllocIOPacket(pDev);
-+
-+            if (NULL == pIOPacket) {
-+                status = A_NO_MEMORY;
-+                AR_DEBUG_ASSERT(FALSE);
-+                break;
-+            }
-+
-+                /* copy values to write to our async I/O buffer */
-+            A_MEMCPY(pIOPacket->pBuffer,&regs,AR6K_IRQ_ENABLE_REGS_SIZE);
-+
-+                /* stick in our completion routine when the I/O operation completes */
-+            pIOPacket->Completion = DevDoEnableDisableRecvAsyncHandler;
-+            pIOPacket->pContext = pDev;
-+
-+                /* write it out asynchronously */
-+            HIFReadWrite(pDev->HIFDevice,
-+                         INT_STATUS_ENABLE_ADDRESS,
-+                         pIOPacket->pBuffer,
-+                         AR6K_IRQ_ENABLE_REGS_SIZE,
-+                         HIF_WR_ASYNC_BYTE_INC,
-+                         pIOPacket);
-+            break;
-+        }
-+
-+        /* if we get here we are doing it synchronously */
-+
-+        status = HIFReadWrite(pDev->HIFDevice,
-+                              INT_STATUS_ENABLE_ADDRESS,
-+                              &regs.int_status_enable,
-+                              AR6K_IRQ_ENABLE_REGS_SIZE,
-+                              HIF_WR_SYNC_BYTE_INC,
-+                              NULL);
-+
-+    } while (FALSE);
-+
-+    if (A_FAILED(status) && (pIOPacket != NULL)) {
-+        AR6KFreeIOPacket(pDev,pIOPacket);
-+    }
-+
-+    return status;
-+}
-+
-+
-+A_STATUS DevStopRecv(AR6K_DEVICE *pDev, A_BOOL AsyncMode)
-+{
-+    if (NULL == pDev->HifMaskUmaskRecvEvent) {
-+        return DevDoEnableDisableRecvNormal(pDev,FALSE,AsyncMode);
-+    } else {
-+        return DevDoEnableDisableRecvOverride(pDev,FALSE,AsyncMode);
-+    }
-+}
-+
-+A_STATUS DevEnableRecv(AR6K_DEVICE *pDev, A_BOOL AsyncMode)
-+{
-+    if (NULL == pDev->HifMaskUmaskRecvEvent) {
-+        return DevDoEnableDisableRecvNormal(pDev,TRUE,AsyncMode);
-+    } else {
-+        return DevDoEnableDisableRecvOverride(pDev,TRUE,AsyncMode);
-+    }
-+}
-+
-+void DevDumpRegisters(AR6K_IRQ_PROC_REGISTERS   *pIrqProcRegs,
-+                      AR6K_IRQ_ENABLE_REGISTERS *pIrqEnableRegs)
-+{
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_DUMP, ("\n<------- Register Table -------->\n"));
-+
-+    if (pIrqProcRegs != NULL) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-+            ("Int Status:               0x%x\n",pIrqProcRegs->host_int_status));
-+        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-+            ("CPU Int Status:            0x%x\n",pIrqProcRegs->cpu_int_status));
-+        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-+            ("Error Int Status:          0x%x\n",pIrqProcRegs->error_int_status));
-+        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-+            ("Counter Int Status:        0x%x\n",pIrqProcRegs->counter_int_status));
-+        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-+            ("Mbox Frame:                0x%x\n",pIrqProcRegs->mbox_frame));
-+        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-+            ("Rx Lookahead Valid:        0x%x\n",pIrqProcRegs->rx_lookahead_valid));
-+        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-+            ("Rx Lookahead 0:            0x%x\n",pIrqProcRegs->rx_lookahead[0]));
-+        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-+            ("Rx Lookahead 1:            0x%x\n",pIrqProcRegs->rx_lookahead[1]));
-+    }
-+
-+    if (pIrqEnableRegs != NULL) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-+            ("Int Status Enable:         0x%x\n",pIrqEnableRegs->int_status_enable));
-+        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP,
-+            ("Counter Int Status Enable: 0x%x\n",pIrqEnableRegs->counter_int_status_enable));
-+        AR_DEBUG_PRINTF(ATH_DEBUG_DUMP, ("<------------------------------->\n"));
-+    }
-+}
-+
-+
-+#ifdef MBOXHW_UNIT_TEST
-+
-+
-+/* This is a mailbox hardware unit test that must be called in a schedulable context
-+ * This test is very simple, it will send a list of buffers with a counting pattern
-+ * and the target will invert the data and send the message back
-+ *
-+ * the unit test has the following constraints:
-+ *
-+ * The target has at least 8 buffers of 256 bytes each. The host will send
-+ * the following pattern of buffers in rapid succession :
-+ *
-+ * 1 buffer - 128 bytes
-+ * 1 buffer - 256 bytes
-+ * 1 buffer - 512 bytes
-+ * 1 buffer - 1024 bytes
-+ *
-+ * The host will send the buffers to one mailbox and wait for buffers to be reflected
-+ * back from the same mailbox. The target sends the buffers FIFO order.
-+ * Once the final buffer has been received for a mailbox, the next mailbox is tested.
-+ *
-+ *
-+ * Note:  To simplifythe test , we assume that the chosen buffer sizes
-+ *        will fall on a nice block pad
-+ *
-+ * It is expected that higher-order tests will be written to stress the mailboxes using
-+ * a message-based protocol (with some performance timming) that can create more
-+ * randomness in the packets sent over mailboxes.
-+ *
-+ * */
-+
-+#define A_ROUND_UP_PWR2(x, align)    (((int) (x) + ((align)-1)) & ~((align)-1))
-+
-+#define BUFFER_BLOCK_PAD 128
-+
-+#if 0
-+#define BUFFER1 128
-+#define BUFFER2 256
-+#define BUFFER3 512
-+#define BUFFER4 1024
-+#endif
-+
-+#if 1
-+#define BUFFER1 80
-+#define BUFFER2 200
-+#define BUFFER3 444
-+#define BUFFER4 800
-+#endif
-+
-+#define TOTAL_BYTES (A_ROUND_UP_PWR2(BUFFER1,BUFFER_BLOCK_PAD) + \
-+                     A_ROUND_UP_PWR2(BUFFER2,BUFFER_BLOCK_PAD) + \
-+                     A_ROUND_UP_PWR2(BUFFER3,BUFFER_BLOCK_PAD) + \
-+                     A_ROUND_UP_PWR2(BUFFER4,BUFFER_BLOCK_PAD) )
-+
-+#define TEST_BYTES (BUFFER1 +  BUFFER2 + BUFFER3 + BUFFER4)
-+
-+#define TEST_CREDITS_RECV_TIMEOUT 100
-+
-+static A_UINT8  g_Buffer[TOTAL_BYTES];
-+static A_UINT32 g_MailboxAddrs[AR6K_MAILBOXES];
-+static A_UINT32 g_BlockSizes[AR6K_MAILBOXES];
-+
-+#define BUFFER_PROC_LIST_DEPTH 4
-+
-+typedef struct _BUFFER_PROC_LIST{
-+    A_UINT8  *pBuffer;
-+    A_UINT32 length;
-+}BUFFER_PROC_LIST;
-+
-+
-+#define PUSH_BUFF_PROC_ENTRY(pList,len,pCurrpos) \
-+{                                                   \
-+    (pList)->pBuffer = (pCurrpos);                  \
-+    (pList)->length = (len);                        \
-+    (pCurrpos) += (len);                            \
-+    (pList)++;                                      \
-+}
-+
-+/* a simple and crude way to send different "message" sizes */
-+static void AssembleBufferList(BUFFER_PROC_LIST *pList)
-+{
-+    A_UINT8 *pBuffer = g_Buffer;
-+
-+#if BUFFER_PROC_LIST_DEPTH < 4
-+#error "Buffer processing list depth is not deep enough!!"
-+#endif
-+
-+    PUSH_BUFF_PROC_ENTRY(pList,BUFFER1,pBuffer);
-+    PUSH_BUFF_PROC_ENTRY(pList,BUFFER2,pBuffer);
-+    PUSH_BUFF_PROC_ENTRY(pList,BUFFER3,pBuffer);
-+    PUSH_BUFF_PROC_ENTRY(pList,BUFFER4,pBuffer);
-+
-+}
-+
-+#define FILL_ZERO     TRUE
-+#define FILL_COUNTING FALSE
-+static void InitBuffers(A_BOOL Zero)
-+{
-+    A_UINT16 *pBuffer16 = (A_UINT16 *)g_Buffer;
-+    int      i;
-+
-+        /* fill buffer with 16 bit counting pattern or zeros */
-+    for (i = 0; i <  (TOTAL_BYTES / 2) ; i++) {
-+        if (!Zero) {
-+            pBuffer16[i] = (A_UINT16)i;
-+        } else {
-+            pBuffer16[i] = 0;
-+        }
-+    }
-+}
-+
-+
-+static A_BOOL CheckOneBuffer(A_UINT16 *pBuffer16, int Length)
-+{
-+    int      i;
-+    A_UINT16 startCount;
-+    A_BOOL   success = TRUE;
-+
-+        /* get the starting count */
-+    startCount = pBuffer16[0];
-+        /* invert it, this is the expected value */
-+    startCount = ~startCount;
-+        /* scan the buffer and verify */
-+    for (i = 0; i < (Length / 2) ; i++,startCount++) {
-+            /* target will invert all the data */
-+        if ((A_UINT16)pBuffer16[i] != (A_UINT16)~startCount) {
-+            success = FALSE;
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Invalid Data Got:0x%X, Expecting:0x%X (offset:%d, total:%d) \n",
-+                        pBuffer16[i], ((A_UINT16)~startCount), i, Length));
-+             AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("0x%X 0x%X 0x%X 0x%X \n",
-+                        pBuffer16[i], pBuffer16[i + 1], pBuffer16[i + 2],pBuffer16[i+3]));
-+            break;
-+        }
-+    }
-+
-+    return success;
-+}
-+
-+static A_BOOL CheckBuffers(void)
-+{
-+    int      i;
-+    A_BOOL   success = TRUE;
-+    BUFFER_PROC_LIST checkList[BUFFER_PROC_LIST_DEPTH];
-+
-+        /* assemble the list */
-+    AssembleBufferList(checkList);
-+
-+        /* scan the buffers and verify */
-+    for (i = 0; i < BUFFER_PROC_LIST_DEPTH ; i++) {
-+        success = CheckOneBuffer((A_UINT16 *)checkList[i].pBuffer, checkList[i].length);
-+        if (!success) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Buffer : 0x%X, Length:%d failed verify \n",
-+                        (A_UINT32)checkList[i].pBuffer, checkList[i].length));
-+            break;
-+        }
-+    }
-+
-+    return success;
-+}
-+
-+    /* find the end marker for the last buffer we will be sending */
-+static A_UINT16 GetEndMarker(void)
-+{
-+    A_UINT8  *pBuffer;
-+    BUFFER_PROC_LIST checkList[BUFFER_PROC_LIST_DEPTH];
-+
-+        /* fill up buffers with the normal counting pattern */
-+    InitBuffers(FILL_COUNTING);
-+
-+        /* assemble the list we will be sending down */
-+    AssembleBufferList(checkList);
-+        /* point to the last 2 bytes of the last buffer */
-+    pBuffer = &(checkList[BUFFER_PROC_LIST_DEPTH - 1].pBuffer[(checkList[BUFFER_PROC_LIST_DEPTH - 1].length) - 2]);
-+
-+        /* the last count in the last buffer is the marker */
-+    return (A_UINT16)pBuffer[0] | ((A_UINT16)pBuffer[1] << 8);
-+}
-+
-+#define ATH_PRINT_OUT_ZONE ATH_DEBUG_ERR
-+
-+/* send the ordered buffers to the target */
-+static A_STATUS SendBuffers(AR6K_DEVICE *pDev, int mbox)
-+{
-+    A_STATUS         status = A_OK;
-+    A_UINT32         request = HIF_WR_SYNC_BLOCK_INC;
-+    BUFFER_PROC_LIST sendList[BUFFER_PROC_LIST_DEPTH];
-+    int              i;
-+    int              totalBytes = 0;
-+    int              paddedLength;
-+    int              totalwPadding = 0;
-+
-+    AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Sending buffers on mailbox : %d \n",mbox));
-+
-+        /* fill buffer with counting pattern */
-+    InitBuffers(FILL_COUNTING);
-+
-+        /* assemble the order in which we send */
-+    AssembleBufferList(sendList);
-+
-+    for (i = 0; i < BUFFER_PROC_LIST_DEPTH; i++) {
-+
-+            /* we are doing block transfers, so we need to pad everything to a block size */
-+        paddedLength = (sendList[i].length + (g_BlockSizes[mbox] - 1)) &
-+                       (~(g_BlockSizes[mbox] - 1));
-+
-+            /* send each buffer synchronously */
-+        status = HIFReadWrite(pDev->HIFDevice,
-+                              g_MailboxAddrs[mbox],
-+                              sendList[i].pBuffer,
-+                              paddedLength,
-+                              request,
-+                              NULL);
-+        if (status != A_OK) {
-+            break;
-+        }
-+        totalBytes += sendList[i].length;
-+        totalwPadding += paddedLength;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Sent %d bytes (%d padded bytes) to mailbox : %d \n",totalBytes,totalwPadding,mbox));
-+
-+    return status;
-+}
-+
-+/* poll the mailbox credit counter until we get a credit or timeout */
-+static A_STATUS GetCredits(AR6K_DEVICE *pDev, int mbox, int *pCredits)
-+{
-+    A_STATUS status = A_OK;
-+    int      timeout = TEST_CREDITS_RECV_TIMEOUT;
-+    A_UINT8  credits = 0;
-+    A_UINT32 address;
-+
-+    while (TRUE) {
-+
-+            /* Read the counter register to get credits, this auto-decrements  */
-+        address = COUNT_DEC_ADDRESS + (AR6K_MAILBOXES + mbox) * 4;
-+        status = HIFReadWrite(pDev->HIFDevice, address, &credits, sizeof(credits),
-+                              HIF_RD_SYNC_BYTE_FIX, NULL);
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                ("Unable to decrement the command credit count register (mbox=%d)\n",mbox));
-+            status = A_ERROR;
-+            break;
-+        }
-+
-+        if (credits) {
-+            break;
-+        }
-+
-+        timeout--;
-+
-+        if (timeout <= 0) {
-+              AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                (" Timeout reading credit registers (mbox=%d, address:0x%X) \n",mbox,address));
-+            status = A_ERROR;
-+            break;
-+        }
-+
-+         /* delay a little, target may not be ready */
-+         A_MDELAY(1000);
-+
-+    }
-+
-+    if (status == A_OK) {
-+        *pCredits = credits;
-+    }
-+
-+    return status;
-+}
-+
-+
-+/* wait for the buffers to come back */
-+static A_STATUS RecvBuffers(AR6K_DEVICE *pDev, int mbox)
-+{
-+    A_STATUS         status = A_OK;
-+    A_UINT32         request = HIF_RD_SYNC_BLOCK_INC;
-+    BUFFER_PROC_LIST recvList[BUFFER_PROC_LIST_DEPTH];
-+    int              curBuffer;
-+    int              credits;
-+    int              i;
-+    int              totalBytes = 0;
-+    int              paddedLength;
-+    int              totalwPadding = 0;
-+
-+    AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Waiting for buffers on mailbox : %d \n",mbox));
-+
-+        /* zero the buffers */
-+    InitBuffers(FILL_ZERO);
-+
-+        /* assemble the order in which we should receive */
-+    AssembleBufferList(recvList);
-+
-+    curBuffer = 0;
-+
-+    while (curBuffer < BUFFER_PROC_LIST_DEPTH) {
-+
-+            /* get number of buffers that have been completed, this blocks
-+             * until we get at least 1 credit or it times out */
-+        status = GetCredits(pDev, mbox, &credits);
-+
-+        if (status != A_OK) {
-+            break;
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Got %d messages on mailbox : %d \n",credits, mbox));
-+
-+            /* get all the buffers that are sitting on the queue */
-+        for (i = 0; i < credits; i++) {
-+            AR_DEBUG_ASSERT(curBuffer < BUFFER_PROC_LIST_DEPTH);
-+                /* recv the current buffer synchronously, the buffers should come back in
-+                 * order... with padding applied by the target */
-+            paddedLength = (recvList[curBuffer].length + (g_BlockSizes[mbox] - 1)) &
-+                       (~(g_BlockSizes[mbox] - 1));
-+
-+            status = HIFReadWrite(pDev->HIFDevice,
-+                                  g_MailboxAddrs[mbox],
-+                                  recvList[curBuffer].pBuffer,
-+                                  paddedLength,
-+                                  request,
-+                                  NULL);
-+            if (status != A_OK) {
-+                AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Failed to read %d bytes on mailbox:%d : address:0x%X \n",
-+                        recvList[curBuffer].length, mbox, g_MailboxAddrs[mbox]));
-+                break;
-+            }
-+
-+            totalwPadding += paddedLength;
-+            totalBytes += recvList[curBuffer].length;
-+            curBuffer++;
-+        }
-+
-+        if (status != A_OK) {
-+            break;
-+        }
-+            /* go back and get some more */
-+        credits = 0;
-+    }
-+
-+    if (totalBytes != TEST_BYTES) {
-+        AR_DEBUG_ASSERT(FALSE);
-+    }  else {
-+        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Got all buffers on mbox:%d total recv :%d (w/Padding : %d) \n",
-+            mbox, totalBytes, totalwPadding));
-+    }
-+
-+    return status;
-+
-+
-+}
-+
-+static A_STATUS DoOneMboxHWTest(AR6K_DEVICE *pDev, int mbox)
-+{
-+    A_STATUS status;
-+
-+    do {
-+            /* send out buffers */
-+        status = SendBuffers(pDev,mbox);
-+
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Sending buffers Failed : %d mbox:%d\n",status,mbox));
-+            break;
-+        }
-+
-+            /* go get them, this will block */
-+        status =  RecvBuffers(pDev, mbox);
-+
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Recv buffers Failed : %d mbox:%d\n",status,mbox));
-+            break;
-+        }
-+
-+            /* check the returned data patterns */
-+        if (!CheckBuffers()) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Buffer Verify Failed : mbox:%d\n",mbox));
-+            status = A_ERROR;
-+            break;
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, (" Send/Recv success! mailbox : %d \n",mbox));
-+
-+    }  while (FALSE);
-+
-+    return status;
-+}
-+
-+/* here is where the test starts */
-+A_STATUS DoMboxHWTest(AR6K_DEVICE *pDev)
-+{
-+    int      i;
-+    A_STATUS status;
-+    int      credits = 0;
-+    A_UINT8  params[4];
-+    int      numBufs;
-+    int      bufferSize;
-+    A_UINT16 temp;
-+
-+
-+    AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, (" DoMboxHWTest START -  \n"));
-+
-+    do {
-+            /* get the addresses for all 4 mailboxes */
-+        status = HIFConfigureDevice(pDev->HIFDevice, HIF_DEVICE_GET_MBOX_ADDR,
-+                                    g_MailboxAddrs, sizeof(g_MailboxAddrs));
-+
-+        if (status != A_OK) {
-+            AR_DEBUG_ASSERT(FALSE);
-+            break;
-+        }
-+
-+            /* get the block sizes */
-+        status = HIFConfigureDevice(pDev->HIFDevice, HIF_DEVICE_GET_MBOX_BLOCK_SIZE,
-+                                    g_BlockSizes, sizeof(g_BlockSizes));
-+
-+        if (status != A_OK) {
-+            AR_DEBUG_ASSERT(FALSE);
-+            break;
-+        }
-+
-+            /* note, the HIF layer usually reports mbox 0 to have a block size of
-+             * 1, but our test wants to run in block-mode for all mailboxes, so we treat all mailboxes
-+             * the same. */
-+        g_BlockSizes[0] = g_BlockSizes[1];
-+        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Block Size to use: %d \n",g_BlockSizes[0]));
-+
-+        if (g_BlockSizes[1] > BUFFER_BLOCK_PAD) {
-+            AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("%d Block size is too large for buffer pad %d\n",
-+                g_BlockSizes[1], BUFFER_BLOCK_PAD));
-+            break;
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Waiting for target.... \n"));
-+
-+            /* the target lets us know it is ready by giving us 1 credit on
-+             * mailbox 0 */
-+        status = GetCredits(pDev, 0, &credits);
-+
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Failed to wait for target ready \n"));
-+            break;
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Target is ready ...\n"));
-+
-+            /* read the first 4 scratch registers */
-+        status = HIFReadWrite(pDev->HIFDevice,
-+                              SCRATCH_ADDRESS,
-+                              params,
-+                              4,
-+                              HIF_RD_SYNC_BYTE_INC,
-+                              NULL);
-+
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Failed to wait get parameters \n"));
-+            break;
-+        }
-+
-+        numBufs = params[0];
-+        bufferSize = (int)(((A_UINT16)params[2] << 8) | (A_UINT16)params[1]);
-+
-+        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE,
-+            ("Target parameters: bufs per mailbox:%d, buffer size:%d bytes (total space: %d, minimum required space (w/padding): %d) \n",
-+            numBufs, bufferSize, (numBufs * bufferSize), TOTAL_BYTES));
-+
-+        if ((numBufs * bufferSize) < TOTAL_BYTES) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Not Enough buffer space to run test! need:%d, got:%d \n",
-+                TOTAL_BYTES, (numBufs*bufferSize)));
-+            status = A_ERROR;
-+            break;
-+        }
-+
-+        temp = GetEndMarker();
-+
-+        status = HIFReadWrite(pDev->HIFDevice,
-+                              SCRATCH_ADDRESS + 4,
-+                              (A_UINT8 *)&temp,
-+                              2,
-+                              HIF_WR_SYNC_BYTE_INC,
-+                              NULL);
-+
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Failed to write end marker \n"));
-+            break;
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("End Marker: 0x%X \n",temp));
-+
-+        temp = (A_UINT16)g_BlockSizes[1];
-+            /* convert to a mask */
-+        temp = temp - 1;
-+        status = HIFReadWrite(pDev->HIFDevice,
-+                              SCRATCH_ADDRESS + 6,
-+                              (A_UINT8 *)&temp,
-+                              2,
-+                              HIF_WR_SYNC_BYTE_INC,
-+                              NULL);
-+
-+        if (status != A_OK) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Failed to write block mask \n"));
-+            break;
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, ("Set Block Mask: 0x%X \n",temp));
-+
-+            /* execute the test on each mailbox */
-+        for (i = 0; i < AR6K_MAILBOXES; i++) {
-+            status = DoOneMboxHWTest(pDev, i);
-+            if (status != A_OK) {
-+                break;
-+            }
-+        }
-+
-+    } while (FALSE);
-+
-+    if (status == A_OK) {
-+        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, (" DoMboxHWTest DONE - SUCCESS! -  \n"));
-+    } else {
-+        AR_DEBUG_PRINTF(ATH_PRINT_OUT_ZONE, (" DoMboxHWTest DONE - FAILED! -  \n"));
-+    }
-+        /* don't let HTC_Start continue, the target is actually not running any HTC code */
-+    return A_ERROR;
-+}
-+#endif
-+
-+
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/htc/ar6k.h b/drivers/sdio/function/wlan/ar6000/htc/ar6k.h
-new file mode 100644
-index 0000000..301ab34
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/htc/ar6k.h
-@@ -0,0 +1,191 @@
-+/*
-+ *
-+ * Copyright (c) 2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef AR6K_H_
-+#define AR6K_H_
-+
-+#define AR6K_MAILBOXES 4
-+
-+/* HTC runs over mailbox 0 */
-+#define HTC_MAILBOX          0
-+
-+#define AR6K_TARGET_DEBUG_INTR_MASK     0x01
-+
-+#define OTHER_INTS_ENABLED (INT_STATUS_ENABLE_ERROR_MASK |   \
-+                            INT_STATUS_ENABLE_CPU_MASK   |   \
-+                            INT_STATUS_ENABLE_COUNTER_MASK)
-+
-+//#define MBOXHW_UNIT_TEST 1
-+
-+#include "athstartpack.h"
-+typedef PREPACK struct _AR6K_IRQ_PROC_REGISTERS {
-+    A_UINT8                      host_int_status;
-+    A_UINT8                      cpu_int_status;
-+    A_UINT8                      error_int_status;
-+    A_UINT8                      counter_int_status;
-+    A_UINT8                      mbox_frame;
-+    A_UINT8                      rx_lookahead_valid;
-+    A_UINT8                      hole[2];
-+    A_UINT32                     rx_lookahead[2];
-+} POSTPACK AR6K_IRQ_PROC_REGISTERS;
-+
-+#define AR6K_IRQ_PROC_REGS_SIZE sizeof(AR6K_IRQ_PROC_REGISTERS)
-+
-+
-+
-+typedef PREPACK struct _AR6K_IRQ_ENABLE_REGISTERS {
-+    A_UINT8                      int_status_enable;
-+    A_UINT8                      cpu_int_status_enable;
-+    A_UINT8                      error_status_enable;
-+    A_UINT8                      counter_int_status_enable;
-+} POSTPACK AR6K_IRQ_ENABLE_REGISTERS;
-+
-+#include "athendpack.h"
-+
-+#define AR6K_IRQ_ENABLE_REGS_SIZE sizeof(AR6K_IRQ_ENABLE_REGISTERS)
-+
-+#define AR6K_REG_IO_BUFFER_SIZE     32
-+#define AR6K_MAX_REG_IO_BUFFERS     8
-+
-+/* buffers for ASYNC I/O */
-+typedef struct AR6K_ASYNC_REG_IO_BUFFER {
-+    HTC_PACKET    HtcPacket;   /* we use an HTC packet as a wrapper for our async register-based I/O */
-+    A_UINT8       Buffer[AR6K_REG_IO_BUFFER_SIZE];
-+} AR6K_ASYNC_REG_IO_BUFFER;
-+
-+typedef struct _AR6K_DEVICE {
-+    A_MUTEX_T                   Lock;
-+    AR6K_IRQ_PROC_REGISTERS     IrqProcRegisters;
-+    AR6K_IRQ_ENABLE_REGISTERS   IrqEnableRegisters;
-+    void                        *HIFDevice;
-+    A_UINT32                    BlockSize;
-+    A_UINT32                    BlockMask;
-+    A_UINT32                    MailboxAddress;
-+    HIF_PENDING_EVENTS_FUNC     GetPendingEventsFunc;
-+    void                        *HTCContext;
-+    HTC_PACKET_QUEUE            RegisterIOList;
-+    AR6K_ASYNC_REG_IO_BUFFER    RegIOBuffers[AR6K_MAX_REG_IO_BUFFERS];
-+    void                        (*TargetFailureCallback)(void *Context);
-+    A_STATUS                    (*MessagePendingCallback)(void *Context, A_UINT32 LookAhead, A_BOOL *pAsyncProc);
-+    HIF_DEVICE_IRQ_PROCESSING_MODE  HifIRQProcessingMode;
-+    HIF_MASK_UNMASK_RECV_EVENT      HifMaskUmaskRecvEvent;
-+} AR6K_DEVICE;
-+
-+#define IS_DEV_IRQ_PROCESSING_ASYNC_ALLOWED(pDev) ((pDev)->HifIRQProcessingMode != HIF_DEVICE_IRQ_SYNC_ONLY)
-+
-+A_STATUS DevSetup(AR6K_DEVICE *pDev);
-+A_STATUS DevUnmaskInterrupts(AR6K_DEVICE *pDev);
-+A_STATUS DevMaskInterrupts(AR6K_DEVICE *pDev);
-+A_STATUS DevPollMboxMsgRecv(AR6K_DEVICE *pDev,
-+                            A_UINT32    *pLookAhead,
-+                            int          TimeoutMS);
-+A_STATUS DevRWCompletionHandler(void *context, A_STATUS status);
-+A_STATUS DevDsrHandler(void *context);
-+A_STATUS DevCheckPendingRecvMsgsAsync(void *context);
-+void     DevDumpRegisters(AR6K_IRQ_PROC_REGISTERS   *pIrqProcRegs,
-+                          AR6K_IRQ_ENABLE_REGISTERS *pIrqEnableRegs);
-+
-+#define DEV_STOP_RECV_ASYNC TRUE
-+#define DEV_STOP_RECV_SYNC  FALSE
-+#define DEV_ENABLE_RECV_ASYNC TRUE
-+#define DEV_ENABLE_RECV_SYNC  FALSE
-+A_STATUS DevStopRecv(AR6K_DEVICE *pDev, A_BOOL ASyncMode);
-+A_STATUS DevEnableRecv(AR6K_DEVICE *pDev, A_BOOL ASyncMode);
-+
-+static INLINE A_STATUS DevSendPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, A_UINT32 SendLength) {
-+    A_UINT32 paddedLength;
-+    A_BOOL   sync = (pPacket->Completion == NULL) ? TRUE : FALSE;
-+    A_STATUS status;
-+
-+       /* adjust the length to be a multiple of block size if appropriate */
-+    paddedLength = (SendLength + (pDev->BlockMask)) &
-+                    (~(pDev->BlockMask));
-+#if 0 // BufferLength may not be set in , fix this...
-+    if (paddedLength > pPacket->BufferLength) {
-+        AR_DEBUG_ASSERT(FALSE);
-+        if (pPacket->Completion != NULL) {
-+            COMPLETE_HTC_PACKET(pPacket,A_EINVAL);
-+        }
-+        return A_EINVAL;
-+    }
-+#endif
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND,
-+                ("DevSendPacket, Padded Length: %d Mbox:0x%X (mode:%s)\n",
-+                paddedLength,
-+                pDev->MailboxAddress,
-+                sync ? "SYNC" : "ASYNC"));
-+
-+    status = HIFReadWrite(pDev->HIFDevice,
-+                          pDev->MailboxAddress,
-+                          pPacket->pBuffer,
-+                          paddedLength,     /* the padded length */
-+                          sync ? HIF_WR_SYNC_BLOCK_INC : HIF_WR_ASYNC_BLOCK_INC,
-+                          sync ? NULL : pPacket);  /* pass the packet as the context to the HIF request */
-+
-+    if (sync) {
-+        pPacket->Status = status;
-+    }
-+
-+    return status;
-+}
-+
-+static INLINE A_STATUS DevRecvPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket, A_UINT32 RecvLength) {
-+    A_UINT32 paddedLength;
-+    A_STATUS status;
-+    A_BOOL   sync = (pPacket->Completion == NULL) ? TRUE : FALSE;
-+
-+        /* adjust the length to be a multiple of block size if appropriate */
-+    paddedLength = (RecvLength + (pDev->BlockMask)) &
-+                    (~(pDev->BlockMask));
-+    if (paddedLength > pPacket->BufferLength) {
-+        AR_DEBUG_ASSERT(FALSE);
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                ("DevRecvPacket, Not enough space for padlen:%d recvlen:%d bufferlen:%d \n",
-+                    paddedLength,RecvLength,pPacket->BufferLength));
-+        if (pPacket->Completion != NULL) {
-+            COMPLETE_HTC_PACKET(pPacket,A_EINVAL);
-+        }
-+        return A_EINVAL;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,
-+                ("DevRecvPacket, Padded Length: %d Mbox:0x%X (mode:%s)\n",
-+                paddedLength,
-+                pDev->MailboxAddress,
-+                sync ? "SYNC" : "ASYNC"));
-+
-+    status = HIFReadWrite(pDev->HIFDevice,
-+                          pDev->MailboxAddress,
-+                          pPacket->pBuffer,
-+                          paddedLength,
-+                          sync ? HIF_RD_SYNC_BLOCK_INC : HIF_RD_ASYNC_BLOCK_INC,
-+                          sync ? NULL : pPacket);  /* pass the packet as the context to the HIF request */
-+
-+    if (sync) {
-+        pPacket->Status = status;
-+    }
-+
-+    return status;
-+}
-+
-+#ifdef MBOXHW_UNIT_TEST
-+A_STATUS DoMboxHWTest(AR6K_DEVICE *pDev);
-+#endif
-+
-+#endif /*AR6K_H_*/
-diff --git a/drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c b/drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c
-new file mode 100644
-index 0000000..fbbcd51
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c
-@@ -0,0 +1,638 @@
-+/*
-+ * AR6K Driver layer event handling (i.e. interrupts, message polling)
-+ *
-+ * Copyright (c) 2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+#include "a_config.h"
-+#include "athdefs.h"
-+#include "a_types.h"
-+#include "AR6Khwreg.h"
-+#include "a_osapi.h"
-+#include "a_debug.h"
-+#include "hif.h"
-+#include "htc_packet.h"
-+#include "ar6k.h"
-+
-+extern void AR6KFreeIOPacket(AR6K_DEVICE *pDev, HTC_PACKET *pPacket);
-+extern HTC_PACKET *AR6KAllocIOPacket(AR6K_DEVICE *pDev);
-+
-+static A_STATUS DevServiceDebugInterrupt(AR6K_DEVICE *pDev);
-+
-+#define DELAY_PER_INTERVAL_MS 10  /* 10 MS delay per polling interval */
-+
-+/* completion routine for ALL HIF layer async I/O */
-+A_STATUS DevRWCompletionHandler(void *context, A_STATUS status)
-+{
-+    HTC_PACKET *pPacket = (HTC_PACKET *)context;
-+
-+    COMPLETE_HTC_PACKET(pPacket,status);
-+
-+    return A_OK;
-+}
-+
-+/* mailbox recv message polling */
-+A_STATUS DevPollMboxMsgRecv(AR6K_DEVICE *pDev,
-+                            A_UINT32    *pLookAhead,
-+                            int          TimeoutMS)
-+{
-+    A_STATUS status = A_OK;
-+    int      timeout = TimeoutMS/DELAY_PER_INTERVAL_MS;
-+
-+    AR_DEBUG_ASSERT(timeout > 0);
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("+DevPollMboxMsgRecv \n"));
-+
-+    while (TRUE) {
-+
-+        if (pDev->GetPendingEventsFunc != NULL)
-+              {
-+
-+            HIF_PENDING_EVENTS_INFO events;
-+
-+            /* the HIF layer uses a special mechanism to get events, do this
-+             * synchronously */
-+            status = pDev->GetPendingEventsFunc(pDev->HIFDevice,
-+                                            &events,
-+                                            NULL);
-+            if (A_FAILED(status))
-+                      {
-+                AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Failed to get pending events \n"));
-+                              break;
-+            }
-+
-+            if (events.Events & HIF_RECV_MSG_AVAIL)
-+                      {
-+                    /*  there is a message available, the lookahead should be valid now */
-+                *pLookAhead = events.LookAhead;
-+
-+                break;
-+            }
-+        }
-+              else
-+              {
-+
-+                /* this is the standard HIF way.... */
-+                /* load the register table */
-+            status = HIFReadWrite(pDev->HIFDevice,
-+                                  HOST_INT_STATUS_ADDRESS,
-+                                  (A_UINT8 *)&pDev->IrqProcRegisters,
-+                                  AR6K_IRQ_PROC_REGS_SIZE,
-+                                  HIF_RD_SYNC_BYTE_INC,
-+                                  NULL);
-+
-+            if (A_FAILED(status))
-+                      {
-+                AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Failed to read register table \n"));
-+                break;
-+            }
-+
-+                /* check for MBOX data and valid lookahead */
-+            if (pDev->IrqProcRegisters.host_int_status & (1 << HTC_MAILBOX))
-+                      {
-+                if (pDev->IrqProcRegisters.rx_lookahead_valid & (1 << HTC_MAILBOX))
-+                              {
-+                    /* mailbox has a message and the look ahead is valid */
-+                    *pLookAhead = pDev->IrqProcRegisters.rx_lookahead[HTC_MAILBOX];
-+                    break;
-+                }
-+            }
-+
-+        }
-+
-+        timeout--;
-+
-+        if (timeout <= 0)
-+              {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, (" Timeout waiting for recv message \n"));
-+            status = A_ERROR;
-+
-+                /* check if the target asserted */
-+            if ( pDev->IrqProcRegisters.counter_int_status & AR6K_TARGET_DEBUG_INTR_MASK) {
-+                    /* target signaled an assert, process this pending interrupt
-+                     * this will call the target failure handler */
-+                DevServiceDebugInterrupt(pDev);
-+            }
-+
-+            break;
-+        }
-+
-+            /* delay a little  */
-+         A_MDELAY(DELAY_PER_INTERVAL_MS);
-+         AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("  Retry Mbox Poll : %d \n",timeout));
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("-DevPollMboxMsgRecv \n"));
-+
-+    return status;
-+}
-+
-+static A_STATUS DevServiceCPUInterrupt(AR6K_DEVICE *pDev)
-+{
-+    A_STATUS status;
-+    A_UINT8  cpu_int_status;
-+    A_UINT8  regBuffer[4];
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ, ("CPU Interrupt\n"));
-+    cpu_int_status = pDev->IrqProcRegisters.cpu_int_status &
-+                     pDev->IrqEnableRegisters.cpu_int_status_enable;
-+    AR_DEBUG_ASSERT(cpu_int_status);
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,
-+                    ("Valid interrupt source(s) in CPU_INT_STATUS: 0x%x\n",
-+                    cpu_int_status));
-+
-+        /* Clear the interrupt */
-+    pDev->IrqProcRegisters.cpu_int_status &= ~cpu_int_status; /* W1C */
-+
-+        /* set up the register transfer buffer to hit the register 4 times , this is done
-+         * to make the access 4-byte aligned to mitigate issues with host bus interconnects that
-+         * restrict bus transfer lengths to be a multiple of 4-bytes */
-+
-+        /* set W1C value to clear the interrupt, this hits the register first */
-+    regBuffer[0] = cpu_int_status;
-+        /* the remaining 4 values are set to zero which have no-effect  */
-+    regBuffer[1] = 0;
-+    regBuffer[2] = 0;
-+    regBuffer[3] = 0;
-+
-+    status = HIFReadWrite(pDev->HIFDevice,
-+                          CPU_INT_STATUS_ADDRESS,
-+                          regBuffer,
-+                          4,
-+                          HIF_WR_SYNC_BYTE_FIX,
-+                          NULL);
-+
-+    AR_DEBUG_ASSERT(status == A_OK);
-+    return status;
-+}
-+
-+
-+static A_STATUS DevServiceErrorInterrupt(AR6K_DEVICE *pDev)
-+{
-+    A_STATUS status;
-+    A_UINT8  error_int_status;
-+    A_UINT8  regBuffer[4];
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ, ("Error Interrupt\n"));
-+    error_int_status = pDev->IrqProcRegisters.error_int_status & 0x0F;
-+    AR_DEBUG_ASSERT(error_int_status);
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,
-+                    ("Valid interrupt source(s) in ERROR_INT_STATUS: 0x%x\n",
-+                    error_int_status));
-+
-+    if (ERROR_INT_STATUS_WAKEUP_GET(error_int_status)) {
-+        /* Wakeup */
-+        AR_DEBUG_PRINTF(ATH_DEBUG_IRQ, ("Error : Wakeup\n"));
-+    }
-+
-+    if (ERROR_INT_STATUS_RX_UNDERFLOW_GET(error_int_status)) {
-+        /* Rx Underflow */
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Error : Rx Underflow\n"));
-+    }
-+
-+    if (ERROR_INT_STATUS_TX_OVERFLOW_GET(error_int_status)) {
-+        /* Tx Overflow */
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Error : Tx Overflow\n"));
-+    }
-+
-+        /* Clear the interrupt */
-+    pDev->IrqProcRegisters.error_int_status &= ~error_int_status; /* W1C */
-+
-+        /* set up the register transfer buffer to hit the register 4 times , this is done
-+         * to make the access 4-byte aligned to mitigate issues with host bus interconnects that
-+         * restrict bus transfer lengths to be a multiple of 4-bytes */
-+
-+        /* set W1C value to clear the interrupt, this hits the register first */
-+    regBuffer[0] = error_int_status;
-+        /* the remaining 4 values are set to zero which have no-effect  */
-+    regBuffer[1] = 0;
-+    regBuffer[2] = 0;
-+    regBuffer[3] = 0;
-+
-+    status = HIFReadWrite(pDev->HIFDevice,
-+                          ERROR_INT_STATUS_ADDRESS,
-+                          regBuffer,
-+                          4,
-+                          HIF_WR_SYNC_BYTE_FIX,
-+                          NULL);
-+
-+    AR_DEBUG_ASSERT(status == A_OK);
-+    return status;
-+}
-+
-+static A_STATUS DevServiceDebugInterrupt(AR6K_DEVICE *pDev)
-+{
-+    A_UINT32 dummy;
-+    A_STATUS status;
-+
-+    /* Send a target failure event to the application */
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Target debug interrupt\n"));
-+
-+    if (pDev->TargetFailureCallback != NULL) {
-+        pDev->TargetFailureCallback(pDev->HTCContext);
-+    }
-+
-+    /* clear the interrupt , the debug error interrupt is
-+     * counter 0 */
-+        /* read counter to clear interrupt */
-+    status = HIFReadWrite(pDev->HIFDevice,
-+                          COUNT_DEC_ADDRESS,
-+                          (A_UINT8 *)&dummy,
-+                          4,
-+                          HIF_RD_SYNC_BYTE_INC,
-+                          NULL);
-+
-+    AR_DEBUG_ASSERT(status == A_OK);
-+    return status;
-+}
-+
-+static A_STATUS DevServiceCounterInterrupt(AR6K_DEVICE *pDev)
-+{
-+    A_UINT8 counter_int_status;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ, ("Counter Interrupt\n"));
-+
-+    counter_int_status = pDev->IrqProcRegisters.counter_int_status &
-+                         pDev->IrqEnableRegisters.counter_int_status_enable;
-+
-+    AR_DEBUG_ASSERT(counter_int_status);
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,
-+                    ("Valid interrupt source(s) in COUNTER_INT_STATUS: 0x%x\n",
-+                    counter_int_status));
-+
-+    /* Check if the debug interrupt is pending */
-+    if (counter_int_status & AR6K_TARGET_DEBUG_INTR_MASK) {
-+        return DevServiceDebugInterrupt(pDev);
-+    }
-+
-+    return A_OK;
-+}
-+
-+/* callback when our fetch to get interrupt status registers completes */
-+static void DevGetEventAsyncHandler(void *Context, HTC_PACKET *pPacket)
-+{
-+    AR6K_DEVICE *pDev = (AR6K_DEVICE *)Context;
-+    A_UINT32    lookAhead = 0;
-+    A_BOOL      otherInts = FALSE;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevGetEventAsyncHandler: (dev: 0x%X)\n", (A_UINT32)pDev));
-+
-+    do {
-+
-+        if (A_FAILED(pPacket->Status)) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                    (" GetEvents I/O request failed, status:%d \n", pPacket->Status));
-+            /* bail out, don't unmask HIF interrupt */
-+            break;
-+        }
-+
-+        if (pDev->GetPendingEventsFunc != NULL) {
-+                /* the HIF layer collected the information for us */
-+            HIF_PENDING_EVENTS_INFO *pEvents = (HIF_PENDING_EVENTS_INFO *)pPacket->pBuffer;
-+            if (pEvents->Events & HIF_RECV_MSG_AVAIL) {
-+                lookAhead = pEvents->LookAhead;
-+                if (0 == lookAhead) {
-+                    AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" DevGetEventAsyncHandler1, lookAhead is zero! \n"));
-+                }
-+            }
-+            if (pEvents->Events & HIF_OTHER_EVENTS) {
-+                otherInts = TRUE;
-+            }
-+        } else {
-+                /* standard interrupt table handling.... */
-+            AR6K_IRQ_PROC_REGISTERS *pReg = (AR6K_IRQ_PROC_REGISTERS *)pPacket->pBuffer;
-+            A_UINT8                 host_int_status;
-+
-+            host_int_status = pReg->host_int_status & pDev->IrqEnableRegisters.int_status_enable;
-+
-+            if (host_int_status & (1 << HTC_MAILBOX)) {
-+                host_int_status &= ~(1 << HTC_MAILBOX);
-+                if (pReg->rx_lookahead_valid & (1 << HTC_MAILBOX)) {
-+                        /* mailbox has a message and the look ahead is valid */
-+                    lookAhead = pReg->rx_lookahead[HTC_MAILBOX];
-+                    if (0 == lookAhead) {
-+                        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" DevGetEventAsyncHandler2, lookAhead is zero! \n"));
-+                    }
-+                }
-+            }
-+
-+            if (host_int_status) {
-+                    /* there are other interrupts to handle */
-+                otherInts = TRUE;
-+            }
-+        }
-+
-+        if (otherInts || (lookAhead == 0)) {
-+            /* if there are other interrupts to process, we cannot do this in the async handler so
-+             * ack the interrupt which will cause our sync handler to run again
-+             * if however there are no more messages, we can now ack the interrupt  */
-+            AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,
-+                (" Acking interrupt from DevGetEventAsyncHandler (otherints:%d, lookahead:0x%X)\n",
-+                otherInts, lookAhead));
-+            HIFAckInterrupt(pDev->HIFDevice);
-+        } else {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,
-+                    (" DevGetEventAsyncHandler : detected another message, lookahead :0x%X \n",
-+                    lookAhead));
-+                /* lookahead is non-zero and there are no other interrupts to service,
-+                 * go get the next message */
-+            pDev->MessagePendingCallback(pDev->HTCContext, lookAhead, NULL);
-+        }
-+
-+    } while (FALSE);
-+
-+        /* free this IO packet */
-+    AR6KFreeIOPacket(pDev,pPacket);
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("-DevGetEventAsyncHandler \n"));
-+}
-+
-+/* called by the HTC layer when it wants us to check if the device has any more pending
-+ * recv messages, this starts off a series of async requests to read interrupt registers  */
-+A_STATUS DevCheckPendingRecvMsgsAsync(void *context)
-+{
-+    AR6K_DEVICE  *pDev = (AR6K_DEVICE *)context;
-+    A_STATUS      status = A_OK;
-+    HTC_PACKET   *pIOPacket;
-+
-+    /* this is called in an ASYNC only context, we may NOT block, sleep or call any apis that can
-+     * cause us to switch contexts */
-+
-+   AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevCheckPendingRecvMsgsAsync: (dev: 0x%X)\n", (A_UINT32)pDev));
-+
-+   do {
-+
-+        if (HIF_DEVICE_IRQ_SYNC_ONLY == pDev->HifIRQProcessingMode) {
-+                /* break the async processing chain right here, no need to continue.
-+                 * The DevDsrHandler() will handle things in a loop when things are driven
-+                 * synchronously  */
-+            break;
-+        }
-+            /* first allocate one of our HTC packets we created for async I/O
-+             * we reuse HTC packet definitions so that we can use the completion mechanism
-+             * in DevRWCompletionHandler() */
-+        pIOPacket = AR6KAllocIOPacket(pDev);
-+
-+        if (NULL == pIOPacket) {
-+                /* there should be only 1 asynchronous request out at a time to read these registers
-+                 * so this should actually never happen */
-+            status = A_NO_MEMORY;
-+            AR_DEBUG_ASSERT(FALSE);
-+            break;
-+        }
-+
-+            /* stick in our completion routine when the I/O operation completes */
-+        pIOPacket->Completion = DevGetEventAsyncHandler;
-+        pIOPacket->pContext = pDev;
-+
-+        if (pDev->GetPendingEventsFunc) {
-+                /* HIF layer has it's own mechanism, pass the IO to it.. */
-+            status = pDev->GetPendingEventsFunc(pDev->HIFDevice,
-+                                                (HIF_PENDING_EVENTS_INFO *)pIOPacket->pBuffer,
-+                                                pIOPacket);
-+
-+        } else {
-+                /* standard way, read the interrupt register table asynchronously again */
-+            status = HIFReadWrite(pDev->HIFDevice,
-+                                  HOST_INT_STATUS_ADDRESS,
-+                                  pIOPacket->pBuffer,
-+                                  AR6K_IRQ_PROC_REGS_SIZE,
-+                                  HIF_RD_ASYNC_BYTE_INC,
-+                                  pIOPacket);
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,(" Async IO issued to get interrupt status...\n"));
-+   } while (FALSE);
-+
-+   AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("-DevCheckPendingRecvMsgsAsync \n"));
-+
-+   return status;
-+}
-+
-+/* process pending interrupts synchronously */
-+static A_STATUS ProcessPendingIRQs(AR6K_DEVICE *pDev, A_BOOL *pDone, A_BOOL *pASyncProcessing)
-+{
-+    A_STATUS    status = A_OK;
-+    A_UINT8     host_int_status = 0;
-+    A_UINT32    lookAhead = 0;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+ProcessPendingIRQs: (dev: 0x%X)\n", (A_UINT32)pDev));
-+
-+    /*** NOTE: the HIF implementation guarantees that the context of this call allows
-+     *         us to perform SYNCHRONOUS I/O, that is we can block, sleep or call any API that
-+     *         can block or switch thread/task ontexts.
-+     *         This is a fully schedulable context.
-+     * */
-+    do {
-+
-+        if (pDev->GetPendingEventsFunc != NULL) {
-+            HIF_PENDING_EVENTS_INFO events;
-+
-+                /* the HIF layer uses a special mechanism to get events
-+                 * get this synchronously  */
-+            status = pDev->GetPendingEventsFunc(pDev->HIFDevice,
-+                                                &events,
-+                                                NULL);
-+
-+            if (A_FAILED(status)) {
-+                break;
-+            }
-+
-+            if (events.Events & HIF_RECV_MSG_AVAIL) {
-+                lookAhead = events.LookAhead;
-+                if (0 == lookAhead) {
-+                    AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" ProcessPendingIRQs1 lookAhead is zero! \n"));
-+                }
-+            }
-+
-+            if (!(events.Events & HIF_OTHER_EVENTS) ||
-+                !(pDev->IrqEnableRegisters.int_status_enable & OTHER_INTS_ENABLED)) {
-+                    /* no need to read the register table, no other interesting interrupts.
-+                     * Some interfaces (like SPI) can shadow interrupt sources without
-+                     * requiring the host to do a full table read */
-+                break;
-+            }
-+
-+            /* otherwise fall through and read the register table */
-+        }
-+
-+        /*
-+         * Read the first 28 bytes of the HTC register table. This will yield us
-+         * the value of different int status registers and the lookahead
-+         * registers.
-+         *    length = sizeof(int_status) + sizeof(cpu_int_status) +
-+         *             sizeof(error_int_status) + sizeof(counter_int_status) +
-+         *             sizeof(mbox_frame) + sizeof(rx_lookahead_valid) +
-+         *             sizeof(hole) +  sizeof(rx_lookahead) +
-+         *             sizeof(int_status_enable) + sizeof(cpu_int_status_enable) +
-+         *             sizeof(error_status_enable) +
-+         *             sizeof(counter_int_status_enable);
-+         *
-+        */
-+        status = HIFReadWrite(pDev->HIFDevice,
-+                              HOST_INT_STATUS_ADDRESS,
-+                              (A_UINT8 *)&pDev->IrqProcRegisters,
-+                              AR6K_IRQ_PROC_REGS_SIZE,
-+                              HIF_RD_SYNC_BYTE_INC,
-+                              NULL);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+        if (AR_DEBUG_LVL_CHECK(ATH_DEBUG_IRQ)) {
-+            DevDumpRegisters(&pDev->IrqProcRegisters,
-+                             &pDev->IrqEnableRegisters);
-+        }
-+
-+            /* Update only those registers that are enabled */
-+        host_int_status = pDev->IrqProcRegisters.host_int_status &
-+                          pDev->IrqEnableRegisters.int_status_enable;
-+
-+        if (NULL == pDev->GetPendingEventsFunc) {
-+                /* only look at mailbox status if the HIF layer did not provide this function,
-+                 * on some HIF interfaces reading the RX lookahead is not valid to do */
-+            if (host_int_status & (1 << HTC_MAILBOX)) {
-+                    /* mask out pending mailbox value, we use "lookAhead" as the real flag for
-+                     * mailbox processing below */
-+                host_int_status &= ~(1 << HTC_MAILBOX);
-+                if (pDev->IrqProcRegisters.rx_lookahead_valid & (1 << HTC_MAILBOX)) {
-+                        /* mailbox has a message and the look ahead is valid */
-+                    lookAhead = pDev->IrqProcRegisters.rx_lookahead[HTC_MAILBOX];
-+                    if (0 == lookAhead) {
-+                        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" ProcessPendingIRQs2, lookAhead is zero! \n"));
-+                    }
-+                }
-+            }
-+        } else {
-+                /* not valid to check if the HIF has another mechanism for reading mailbox pending status*/
-+            host_int_status &= ~(1 << HTC_MAILBOX);
-+        }
-+
-+    } while (FALSE);
-+
-+
-+    do {
-+
-+            /* did the interrupt status fetches succeed? */
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+        if ((0 == host_int_status) && (0 == lookAhead)) {
-+                /* nothing to process, the caller can use this to break out of a loop */
-+            *pDone = TRUE;
-+            break;
-+        }
-+
-+        if (lookAhead != 0) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("Pending mailbox message, LookAhead: 0x%X\n",lookAhead));
-+                /* Mailbox Interrupt, the HTC layer may issue async requests to empty the
-+                 * mailbox...
-+                 * When emptying the recv mailbox we use the async handler above called from the
-+                 * completion routine of the callers read request. This can improve performance
-+                 * by reducing context switching when we rapidly pull packets */
-+            status = pDev->MessagePendingCallback(pDev->HTCContext, lookAhead, pASyncProcessing);
-+            if (A_FAILED(status)) {
-+                break;
-+            }
-+        }
-+
-+            /* now handle the rest of them */
-+        AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,
-+                            (" Valid interrupt source(s) for OTHER interrupts: 0x%x\n",
-+                            host_int_status));
-+
-+        if (HOST_INT_STATUS_CPU_GET(host_int_status)) {
-+                /* CPU Interrupt */
-+            status = DevServiceCPUInterrupt(pDev);
-+            if (A_FAILED(status)){
-+                break;
-+            }
-+        }
-+
-+        if (HOST_INT_STATUS_ERROR_GET(host_int_status)) {
-+                /* Error Interrupt */
-+            status = DevServiceErrorInterrupt(pDev);
-+            if (A_FAILED(status)){
-+                break;
-+            }
-+        }
-+
-+        if (HOST_INT_STATUS_COUNTER_GET(host_int_status)) {
-+                /* Counter Interrupt */
-+            status = DevServiceCounterInterrupt(pDev);
-+            if (A_FAILED(status)){
-+                break;
-+            }
-+        }
-+
-+    } while (FALSE);
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("-ProcessPendingIRQs: (done:%d, async:%d) status=%d \n",
-+                *pDone, *pASyncProcessing, status));
-+
-+    return status;
-+}
-+
-+
-+/* Synchronousinterrupt handler, this handler kicks off all interrupt processing.*/
-+A_STATUS DevDsrHandler(void *context)
-+{
-+    AR6K_DEVICE *pDev = (AR6K_DEVICE *)context;
-+    A_STATUS    status = A_OK;
-+    A_BOOL      done = FALSE;
-+    A_BOOL      asyncProc = FALSE;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("+DevDsrHandler: (dev: 0x%X)\n", (A_UINT32)pDev));
-+
-+
-+    while (!done) {
-+        status = ProcessPendingIRQs(pDev, &done, &asyncProc);
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+        if (HIF_DEVICE_IRQ_SYNC_ONLY == pDev->HifIRQProcessingMode) {
-+            /* the HIF layer does not allow async IRQ processing, override the asyncProc flag */
-+            asyncProc = FALSE;
-+            /* this will cause us to re-enter ProcessPendingIRQ() and re-read interrupt status registers.
-+             * this has a nice side effect of blocking us until all async read requests are completed.
-+             * This behavior is required on some HIF implementations that do not allow ASYNC
-+             * processing in interrupt handlers (like Windows CE) */
-+        }
-+
-+        if (asyncProc) {
-+                /* the function performed some async I/O for performance, we
-+                   need to exit the ISR immediately, the check below will prevent the interrupt from being
-+                   Ack'd while we handle it asynchronously */
-+            break;
-+        }
-+
-+    }
-+
-+    if (A_SUCCESS(status) && !asyncProc) {
-+            /* Ack the interrupt only if :
-+             *  1. we did not get any errors in processing interrupts
-+             *  2. there are no outstanding async processing requests */
-+        AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,(" Acking interrupt from DevDsrHandler \n"));
-+        HIFAckInterrupt(pDev->HIFDevice);
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_IRQ,("-DevDsrHandler \n"));
-+    return A_OK;
-+}
-+
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/htc/htc.c b/drivers/sdio/function/wlan/ar6000/htc/htc.c
-new file mode 100644
-index 0000000..b5e691b
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/htc/htc.c
-@@ -0,0 +1,507 @@
-+/*
-+ *
-+ * Copyright (c) 2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "htc_internal.h"
-+
-+
-+static HTC_INIT_INFO  HTCInitInfo = {NULL,NULL,NULL};
-+static A_BOOL         HTCInitialized = FALSE;
-+
-+static A_STATUS HTCTargetInsertedHandler(void *hif_handle);
-+static A_STATUS HTCTargetRemovedHandler(void *handle, A_STATUS status);
-+static void HTCReportFailure(void *Context);
-+
-+/* Initializes the HTC layer */
-+A_STATUS HTCInit(HTC_INIT_INFO *pInitInfo)
-+{
-+    HTC_CALLBACKS htcCallbacks;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCInit: Enter\n"));
-+    if (HTCInitialized) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCInit: Exit\n"));
-+        return A_OK;
-+    }
-+
-+    A_MEMCPY(&HTCInitInfo,pInitInfo,sizeof(HTC_INIT_INFO));
-+
-+    A_MEMZERO(&htcCallbacks, sizeof(HTC_CALLBACKS));
-+
-+        /* setup HIF layer callbacks */
-+    htcCallbacks.deviceInsertedHandler = HTCTargetInsertedHandler;
-+    htcCallbacks.deviceRemovedHandler = HTCTargetRemovedHandler;
-+        /* the device layer handles these */
-+    htcCallbacks.rwCompletionHandler = DevRWCompletionHandler;
-+    htcCallbacks.dsrHandler = DevDsrHandler;
-+    HIFInit(&htcCallbacks);
-+    HTCInitialized = TRUE;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCInit: Exit\n"));
-+    return A_OK;
-+}
-+
-+void HTCFreeControlBuffer(HTC_TARGET *target, HTC_PACKET *pPacket, HTC_PACKET_QUEUE *pList)
-+{
-+    LOCK_HTC(target);
-+    HTC_PACKET_ENQUEUE(pList,pPacket);
-+    UNLOCK_HTC(target);
-+}
-+
-+HTC_PACKET *HTCAllocControlBuffer(HTC_TARGET *target,  HTC_PACKET_QUEUE *pList)
-+{
-+    HTC_PACKET *pPacket;
-+
-+    LOCK_HTC(target);
-+    pPacket = HTC_PACKET_DEQUEUE(pList);
-+    UNLOCK_HTC(target);
-+
-+    return pPacket;
-+}
-+
-+/* cleanup the HTC instance */
-+static void HTCCleanup(HTC_TARGET *target)
-+{
-+    if (A_IS_MUTEX_VALID(&target->HTCLock)) {
-+        A_MUTEX_DELETE(&target->HTCLock);
-+    }
-+
-+    if (A_IS_MUTEX_VALID(&target->HTCRxLock)) {
-+        A_MUTEX_DELETE(&target->HTCRxLock);
-+    }
-+
-+    if (A_IS_MUTEX_VALID(&target->HTCTxLock)) {
-+        A_MUTEX_DELETE(&target->HTCTxLock);
-+    }
-+        /* free our instance */
-+    A_FREE(target);
-+}
-+
-+/* registered target arrival callback from the HIF layer */
-+static A_STATUS HTCTargetInsertedHandler(void *hif_handle)
-+{
-+    HTC_TARGET              *target = NULL;
-+    A_STATUS                 status;
-+    int                      i;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("htcTargetInserted - Enter\n"));
-+
-+    do {
-+
-+            /* allocate target memory */
-+        if ((target = (HTC_TARGET *)A_MALLOC(sizeof(HTC_TARGET))) == NULL) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Unable to allocate memory\n"));
-+            status = A_ERROR;
-+            break;
-+        }
-+
-+        A_MEMZERO(target, sizeof(HTC_TARGET));
-+        A_MUTEX_INIT(&target->HTCLock);
-+        A_MUTEX_INIT(&target->HTCRxLock);
-+        A_MUTEX_INIT(&target->HTCTxLock);
-+        INIT_HTC_PACKET_QUEUE(&target->ControlBufferTXFreeList);
-+        INIT_HTC_PACKET_QUEUE(&target->ControlBufferRXFreeList);
-+
-+            /* give device layer the hif device handle */
-+        target->Device.HIFDevice = hif_handle;
-+            /* give the device layer our context (for event processing)
-+             * the device layer will register it's own context with HIF
-+             * so we need to set this so we can fetch it in the target remove handler */
-+        target->Device.HTCContext = target;
-+            /* set device layer target failure callback */
-+        target->Device.TargetFailureCallback = HTCReportFailure;
-+            /* set device layer recv message pending callback */
-+        target->Device.MessagePendingCallback = HTCRecvMessagePendingHandler;
-+        target->EpWaitingForBuffers = ENDPOINT_MAX;
-+
-+            /* setup device layer */
-+        status = DevSetup(&target->Device);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+            /* carve up buffers/packets for control messages */
-+        for (i = 0; i < NUM_CONTROL_RX_BUFFERS; i++) {
-+            HTC_PACKET *pControlPacket;
-+            pControlPacket = &target->HTCControlBuffers[i].HtcPacket;
-+            SET_HTC_PACKET_INFO_RX_REFILL(pControlPacket,
-+                                          target,
-+                                          target->HTCControlBuffers[i].Buffer,
-+                                          HTC_CONTROL_BUFFER_SIZE,
-+                                          ENDPOINT_0);
-+            HTC_FREE_CONTROL_RX(target,pControlPacket);
-+        }
-+
-+        for (;i < NUM_CONTROL_BUFFERS;i++) {
-+             HTC_PACKET *pControlPacket;
-+             pControlPacket = &target->HTCControlBuffers[i].HtcPacket;
-+             INIT_HTC_PACKET_INFO(pControlPacket,
-+                                  target->HTCControlBuffers[i].Buffer,
-+                                  HTC_CONTROL_BUFFER_SIZE);
-+             HTC_FREE_CONTROL_TX(target,pControlPacket);
-+        }
-+
-+    } while (FALSE);
-+
-+    if (A_SUCCESS(status)) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRC, (" calling AddInstance callback \n"));
-+            /* announce ourselves */
-+        HTCInitInfo.AddInstance((HTC_HANDLE)target);
-+    } else {
-+        if (target != NULL) {
-+            HTCCleanup(target);
-+        }
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("htcTargetInserted - Exit\n"));
-+
-+    return status;
-+}
-+
-+/* registered removal callback from the HIF layer */
-+static A_STATUS HTCTargetRemovedHandler(void *handle, A_STATUS status)
-+{
-+    HTC_TARGET *target;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("+HTCTargetRemovedHandler handle:0x%X \n",(A_UINT32)handle));
-+
-+    if (NULL == handle) {
-+            /* this could be NULL in the event that target initialization failed */
-+        return A_OK;
-+    }
-+
-+    target = ((AR6K_DEVICE *)handle)->HTCContext;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("   removing target:0x%X instance:0x%X ... \n",
-+            (A_UINT32)target, (A_UINT32)target->pInstanceContext));
-+
-+    if (target->pInstanceContext != NULL) {
-+            /* let upper layer know, it needs to call HTCStop() */
-+        HTCInitInfo.DeleteInstance(target->pInstanceContext);
-+    }
-+
-+    HIFShutDownDevice(target->Device.HIFDevice);
-+
-+    HTCCleanup(target);
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("-HTCTargetRemovedHandler \n"));
-+    return A_OK;
-+}
-+
-+/* get the low level HIF device for the caller , the caller may wish to do low level
-+ * HIF requests */
-+void *HTCGetHifDevice(HTC_HANDLE HTCHandle)
-+{
-+    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+    return target->Device.HIFDevice;
-+}
-+
-+/* set the instance block for this HTC handle, so that on removal, the blob can be
-+ * returned to the caller */
-+void HTCSetInstance(HTC_HANDLE HTCHandle, void *Instance)
-+{
-+    HTC_TARGET  *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+
-+    target->pInstanceContext = Instance;
-+}
-+
-+/* wait for the target to arrive (sends HTC Ready message)
-+ * this operation is fully synchronous and the message is polled for */
-+A_STATUS HTCWaitTarget(HTC_HANDLE HTCHandle)
-+{
-+    HTC_TARGET              *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+    A_STATUS                 status;
-+    HTC_PACKET              *pPacket = NULL;
-+    HTC_READY_MSG           *pRdyMsg;
-+    HTC_SERVICE_CONNECT_REQ  connect;
-+    HTC_SERVICE_CONNECT_RESP resp;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCWaitTarget - Enter (target:0x%X) \n", (A_UINT32)target));
-+
-+    do {
-+
-+#ifdef MBOXHW_UNIT_TEST
-+
-+        status = DoMboxHWTest(&target->Device);
-+
-+        if (status != A_OK) {
-+            break;
-+        }
-+
-+#endif
-+
-+            /* we should be getting 1 control message that the target is ready */
-+        status = HTCWaitforControlMessage(target, &pPacket);
-+
-+        if (A_FAILED(status)) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, (" Target Not Available!!\n"));
-+            break;
-+        }
-+
-+            /* we controlled the buffer creation so it has to be properly aligned */
-+        pRdyMsg = (HTC_READY_MSG *)pPacket->pBuffer;
-+
-+        if ((pRdyMsg->MessageID != HTC_MSG_READY_ID) ||
-+            (pPacket->ActualLength < sizeof(HTC_READY_MSG))) {
-+                /* this message is not valid */
-+            AR_DEBUG_ASSERT(FALSE);
-+            status = A_EPROTO;
-+            break;
-+        }
-+
-+        if (pRdyMsg->CreditCount == 0 || pRdyMsg->CreditSize == 0) {
-+              /* this message is not valid */
-+            AR_DEBUG_ASSERT(FALSE);
-+            status = A_EPROTO;
-+            break;
-+        }
-+
-+        target->TargetCredits = pRdyMsg->CreditCount;
-+        target->TargetCreditSize = pRdyMsg->CreditSize;
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRC, (" Target Ready: credits: %d credit size: %d\n",
-+                target->TargetCredits, target->TargetCreditSize));
-+
-+            /* setup our pseudo HTC control endpoint connection */
-+        A_MEMZERO(&connect,sizeof(connect));
-+        A_MEMZERO(&resp,sizeof(resp));
-+        connect.EpCallbacks.pContext = target;
-+        connect.EpCallbacks.EpTxComplete = HTCControlTxComplete;
-+        connect.EpCallbacks.EpRecv = HTCControlRecv;
-+        connect.EpCallbacks.EpRecvRefill = NULL;  /* not needed */
-+        connect.EpCallbacks.EpSendFull = NULL;    /* not nedded */
-+        connect.MaxSendQueueDepth = NUM_CONTROL_BUFFERS;
-+        connect.ServiceID = HTC_CTRL_RSVD_SVC;
-+
-+            /* connect fake service */
-+        status = HTCConnectService((HTC_HANDLE)target,
-+                                   &connect,
-+                                   &resp);
-+
-+        if (!A_FAILED(status)) {
-+            break;
-+        }
-+
-+    } while (FALSE);
-+
-+    if (pPacket != NULL) {
-+        HTC_FREE_CONTROL_RX(target,pPacket);
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCWaitTarget - Exit\n"));
-+
-+    return status;
-+}
-+
-+
-+
-+/* Start HTC, enable interrupts and let the target know host has finished setup */
-+A_STATUS HTCStart(HTC_HANDLE HTCHandle)
-+{
-+    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+    HTC_PACKET *pPacket;
-+    A_STATUS   status;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCStart Enter\n"));
-+
-+        /* now that we are starting, push control receive buffers into the
-+         * HTC control endpoint */
-+
-+    while (1) {
-+        pPacket = HTC_ALLOC_CONTROL_RX(target);
-+        if (NULL == pPacket) {
-+            break;
-+        }
-+        HTCAddReceivePkt((HTC_HANDLE)target,pPacket);
-+    }
-+
-+    do {
-+
-+        AR_DEBUG_ASSERT(target->InitCredits != NULL);
-+        AR_DEBUG_ASSERT(target->EpCreditDistributionListHead != NULL);
-+        AR_DEBUG_ASSERT(target->EpCreditDistributionListHead->pNext != NULL);
-+
-+            /* call init credits callback to do the distribution ,
-+             * NOTE: the first entry in the distribution list is ENDPOINT_0, so
-+             * we pass the start of the list after this one. */
-+        target->InitCredits(target->pCredDistContext,
-+                            target->EpCreditDistributionListHead->pNext,
-+                            target->TargetCredits);
-+
-+        if (AR_DEBUG_LVL_CHECK(ATH_DEBUG_TRC)) {
-+            DumpCreditDistStates(target);
-+        }
-+
-+            /* the caller is done connecting to services, so we can indicate to the
-+            * target that the setup phase is complete */
-+        status = HTCSendSetupComplete(target);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+            /* unmask interrupts */
-+        status = DevUnmaskInterrupts(&target->Device);
-+
-+        if (A_FAILED(status)) {
-+            HTCStop(target);
-+        }
-+
-+    } while (FALSE);
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("HTCStart Exit\n"));
-+    return status;
-+}
-+
-+
-+/* stop HTC communications, i.e. stop interrupt reception, and flush all queued buffers */
-+void HTCStop(HTC_HANDLE HTCHandle)
-+{
-+    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("+HTCStop \n"));
-+
-+        /* mark that we are shutting down .. */
-+    target->HTCStateFlags |= HTC_STATE_STOPPING;
-+
-+        /* Masking interrupts is a synchronous operation, when this function returns
-+         * all pending HIF I/O has completed, we can safely flush the queues */
-+    DevMaskInterrupts(&target->Device);
-+
-+        /* flush all send packets */
-+    HTCFlushSendPkts(target);
-+        /* flush all recv buffers */
-+    HTCFlushRecvBuffers(target);
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("-HTCStop \n"));
-+}
-+
-+/* undo what was done in HTCInit() */
-+void HTCShutDown(void)
-+{
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("+HTCShutDown: \n"));
-+    HTCInitialized = FALSE;
-+        /* undo HTCInit */
-+    HIFShutDownDevice(NULL);
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("-HTCShutDown: \n"));
-+}
-+
-+void HTCDumpCreditStates(HTC_HANDLE HTCHandle)
-+{
-+    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+
-+    LOCK_HTC_TX(target);
-+
-+    DumpCreditDistStates(target);
-+
-+    UNLOCK_HTC_TX(target);
-+}
-+
-+/* report a target failure from the device, this is a callback from the device layer
-+ * which uses a mechanism to report errors from the target (i.e. special interrupts) */
-+static void HTCReportFailure(void *Context)
-+{
-+    HTC_TARGET *target = (HTC_TARGET *)Context;
-+
-+    target->TargetFailure = TRUE;
-+
-+    if ((target->pInstanceContext != NULL) && (HTCInitInfo.TargetFailure != NULL)) {
-+            /* let upper layer know, it needs to call HTCStop() */
-+        HTCInitInfo.TargetFailure(target->pInstanceContext, A_ERROR);
-+    }
-+}
-+
-+void DebugDumpBytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription)
-+{
-+    A_CHAR stream[60];
-+    A_UINT32 i;
-+    A_UINT16 offset, count;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("<---------Dumping %d Bytes : %s ------>\n", length, pDescription));
-+
-+    count = 0;
-+    offset = 0;
-+    for(i = 0; i < length; i++) {
-+        sprintf(stream + offset, "%2.2X ", buffer[i]);
-+        count ++;
-+        offset += 3;
-+
-+        if(count == 16) {
-+            count = 0;
-+            offset = 0;
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("[H]: %s\n", stream));
-+            A_MEMZERO(stream, 60);
-+        }
-+    }
-+
-+    if(offset != 0) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("[H]: %s\n", stream));
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("<------------------------------------------------->\n"));
-+}
-+
-+A_BOOL HTCGetEndpointStatistics(HTC_HANDLE               HTCHandle,
-+                                HTC_ENDPOINT_ID          Endpoint,
-+                                HTC_ENDPOINT_STAT_ACTION Action,
-+                                HTC_ENDPOINT_STATS       *pStats)
-+{
-+
-+#ifdef HTC_EP_STAT_PROFILING
-+    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+    A_BOOL     clearStats = FALSE;
-+    A_BOOL     sample = FALSE;
-+
-+    switch (Action) {
-+        case HTC_EP_STAT_SAMPLE :
-+            sample = TRUE;
-+            break;
-+        case HTC_EP_STAT_SAMPLE_AND_CLEAR :
-+            sample = TRUE;
-+            clearStats = TRUE;
-+            break;
-+        case HTC_EP_STAT_CLEAR :
-+            clearStats = TRUE;
-+            break;
-+        default:
-+            break;
-+    }
-+
-+    A_ASSERT(Endpoint < ENDPOINT_MAX);
-+
-+        /* lock out TX and RX while we sample and/or clear */
-+    LOCK_HTC_TX(target);
-+    LOCK_HTC_RX(target);
-+
-+    if (sample) {
-+        A_ASSERT(pStats != NULL);
-+            /* return the stats to the caller */
-+        A_MEMCPY(pStats, &target->EndPoint[Endpoint].EndPointStats, sizeof(HTC_ENDPOINT_STATS));
-+    }
-+
-+    if (clearStats) {
-+            /* reset stats */
-+        A_MEMZERO(&target->EndPoint[Endpoint].EndPointStats, sizeof(HTC_ENDPOINT_STATS));
-+    }
-+
-+    UNLOCK_HTC_RX(target);
-+    UNLOCK_HTC_TX(target);
-+
-+    return TRUE;
-+#else
-+    return FALSE;
-+#endif
-+}
-diff --git a/drivers/sdio/function/wlan/ar6000/htc/htc_debug.h b/drivers/sdio/function/wlan/ar6000/htc/htc_debug.h
-new file mode 100644
-index 0000000..08080be
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/htc/htc_debug.h
-@@ -0,0 +1,65 @@
-+#ifndef HTC_DEBUG_H_
-+#define HTC_DEBUG_H_
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+/* ------- Debug related stuff ------- */
-+enum {
-+    ATH_DEBUG_SEND = 0x0001,
-+    ATH_DEBUG_RECV = 0x0002,
-+    ATH_DEBUG_SYNC = 0x0004,
-+    ATH_DEBUG_DUMP = 0x0008,
-+    ATH_DEBUG_IRQ  = 0x0010,
-+    ATH_DEBUG_TRC  = 0x0020,
-+    ATH_DEBUG_WARN = 0x0040,
-+    ATH_DEBUG_ERR  = 0x0080,
-+    ATH_DEBUG_ANY  = 0xFFFF,
-+};
-+
-+#ifdef DEBUG
-+
-+// TODO FIX usage of A_PRINTF!
-+#define AR_DEBUG_LVL_CHECK(lvl) (debughtc & (lvl))
-+#define AR_DEBUG_PRINTBUF(buffer, length, desc) do {   \
-+    if (debughtc & ATH_DEBUG_DUMP) {             \
-+        DebugDumpBytes(buffer, length,desc);               \
-+    }                                            \
-+} while(0)
-+#define PRINTX_ARG(arg...) arg
-+#define AR_DEBUG_PRINTF(flags, args) do {        \
-+    if (debughtc & (flags)) {                    \
-+        A_PRINTF(KERN_ALERT PRINTX_ARG args);    \
-+    }                                            \
-+} while (0)
-+#define AR_DEBUG_ASSERT(test) do {               \
-+    if (!(test)) {                               \
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Debug Assert Caught, File %s, Line: %d, Test:%s \n",__FILE__, __LINE__,#test));         \
-+    }                                            \
-+} while(0)
-+extern int debughtc;
-+#else
-+#define AR_DEBUG_PRINTF(flags, args)
-+#define AR_DEBUG_PRINTBUF(buffer, length, desc)
-+#define AR_DEBUG_ASSERT(test)
-+#define AR_DEBUG_LVL_CHECK(lvl) 0
-+#endif
-+
-+void DebugDumpBytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription);
-+
-+#endif /*HTC_DEBUG_H_*/
-diff --git a/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h b/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h
-new file mode 100644
-index 0000000..ebb8ac1
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h
-@@ -0,0 +1,168 @@
-+/*
-+ *
-+ * Copyright (c) 2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef _HTC_INTERNAL_H_
-+#define _HTC_INTERNAL_H_
-+
-+/* for debugging, uncomment this to capture the last frame header, on frame header
-+ * processing errors, the last frame header is dump for comparison */
-+//#define HTC_CAPTURE_LAST_FRAME
-+
-+//#define HTC_EP_STAT_PROFILING
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-+
-+/* Header files */
-+#include "a_config.h"
-+#include "athdefs.h"
-+#include "a_types.h"
-+#include "a_osapi.h"
-+#include "a_debug.h"
-+#include "htc.h"
-+#include "htc_api.h"
-+#include "bmi_msg.h"
-+#include "hif.h"
-+#include "ar6k.h"
-+
-+/* HTC operational parameters */
-+#define HTC_TARGET_RESPONSE_TIMEOUT        2000 /* in ms */
-+#define HTC_TARGET_DEBUG_INTR_MASK         0x01
-+#define HTC_TARGET_CREDIT_INTR_MASK        0xF0
-+
-+typedef struct _HTC_ENDPOINT {
-+    HTC_SERVICE_ID              ServiceID;      /* service ID this endpoint is bound to
-+                                                   non-zero value means this endpoint is in use */
-+    HTC_PACKET_QUEUE            TxQueue;        /* HTC frame buffer TX queue */
-+    HTC_PACKET_QUEUE            RxBuffers;      /* HTC frame buffer RX list */
-+    HTC_ENDPOINT_CREDIT_DIST    CreditDist;     /* credit distribution structure (exposed to driver layer) */
-+    HTC_EP_CALLBACKS            EpCallBacks;    /* callbacks associated with this endpoint */
-+    int                         MaxTxQueueDepth;   /* max depth of the TX queue before we need to
-+                                                      call driver's full handler */
-+    int                         CurrentTxQueueDepth; /* current TX queue depth */
-+    int                         MaxMsgLength;        /* max length of endpoint message */
-+#ifdef HTC_EP_STAT_PROFILING
-+    HTC_ENDPOINT_STATS          EndPointStats;  /* endpoint statistics */
-+#endif
-+} HTC_ENDPOINT;
-+
-+#ifdef HTC_EP_STAT_PROFILING
-+#define INC_HTC_EP_STAT(p,stat,count) (p)->EndPointStats.stat += (count);
-+#else
-+#define INC_HTC_EP_STAT(p,stat,count)
-+#endif
-+
-+#define HTC_SERVICE_TX_PACKET_TAG  HTC_TX_PACKET_TAG_INTERNAL
-+
-+#define NUM_CONTROL_BUFFERS     8
-+#define NUM_CONTROL_TX_BUFFERS  2
-+#define NUM_CONTROL_RX_BUFFERS  (NUM_CONTROL_BUFFERS - NUM_CONTROL_TX_BUFFERS)
-+
-+#define HTC_CONTROL_BUFFER_SIZE (HTC_MAX_CONTROL_MESSAGE_LENGTH + HTC_HDR_LENGTH)
-+
-+typedef struct HTC_CONTROL_BUFFER {
-+    HTC_PACKET    HtcPacket;
-+    A_UINT8       Buffer[HTC_CONTROL_BUFFER_SIZE];
-+} HTC_CONTROL_BUFFER;
-+
-+/* our HTC target state */
-+typedef struct _HTC_TARGET {
-+    HTC_ENDPOINT                EndPoint[ENDPOINT_MAX];
-+    HTC_CONTROL_BUFFER          HTCControlBuffers[NUM_CONTROL_BUFFERS];
-+    HTC_ENDPOINT_CREDIT_DIST   *EpCreditDistributionListHead;
-+    HTC_PACKET_QUEUE            ControlBufferTXFreeList;
-+    HTC_PACKET_QUEUE            ControlBufferRXFreeList;
-+    HTC_CREDIT_DIST_CALLBACK    DistributeCredits;
-+    HTC_CREDIT_INIT_CALLBACK    InitCredits;
-+    void                       *pCredDistContext;
-+    int                         TargetCredits;
-+    int                         TargetCreditSize;
-+    A_MUTEX_T                   HTCLock;
-+    A_MUTEX_T                   HTCRxLock;
-+    A_MUTEX_T                   HTCTxLock;
-+    AR6K_DEVICE                 Device;         /* AR6K - specific state */
-+    A_UINT32                    HTCStateFlags;
-+    HTC_ENDPOINT_ID             EpWaitingForBuffers;
-+    A_BOOL                      TargetFailure;
-+    void                       *pInstanceContext;
-+#define HTC_STATE_WAIT_BUFFERS  (1 << 0)
-+#define HTC_STATE_STOPPING      (1 << 1)
-+#ifdef HTC_CAPTURE_LAST_FRAME
-+    HTC_FRAME_HDR               LastFrameHdr;  /* useful for debugging */
-+    A_UINT8                     LastTrailer[256];
-+    A_UINT8                     LastTrailerLength;
-+#endif
-+} HTC_TARGET;
-+
-+#define HTC_STOPPING(t) ((t)->HTCStateFlags & HTC_STATE_STOPPING)
-+#define LOCK_HTC(t)      A_MUTEX_LOCK(&(t)->HTCLock);
-+#define UNLOCK_HTC(t)    A_MUTEX_UNLOCK(&(t)->HTCLock);
-+#define LOCK_HTC_RX(t)   A_MUTEX_LOCK(&(t)->HTCRxLock);
-+#define UNLOCK_HTC_RX(t) A_MUTEX_UNLOCK(&(t)->HTCRxLock);
-+#define LOCK_HTC_TX(t)   A_MUTEX_LOCK(&(t)->HTCTxLock);
-+#define UNLOCK_HTC_TX(t) A_MUTEX_UNLOCK(&(t)->HTCTxLock);
-+
-+#define GET_HTC_TARGET_FROM_HANDLE(hnd) ((HTC_TARGET *)(hnd))
-+#define HTC_RECYCLE_RX_PKT(target,p)                \
-+{                                                   \
-+    HTC_PACKET_RESET_RX(pPacket);                   \
-+    HTCAddReceivePkt((HTC_HANDLE)(target),(p));     \
-+}
-+
-+/* internal HTC functions */
-+void        HTCControlTxComplete(void *Context, HTC_PACKET *pPacket);
-+void        HTCControlRecv(void *Context, HTC_PACKET *pPacket);
-+A_STATUS    HTCWaitforControlMessage(HTC_TARGET *target, HTC_PACKET **ppControlPacket);
-+HTC_PACKET *HTCAllocControlBuffer(HTC_TARGET *target, HTC_PACKET_QUEUE *pList);
-+void        HTCFreeControlBuffer(HTC_TARGET *target, HTC_PACKET *pPacket, HTC_PACKET_QUEUE *pList);
-+A_STATUS    HTCIssueSend(HTC_TARGET *target, HTC_PACKET *pPacket, A_UINT8 Flags);
-+A_STATUS    HTCIssueRecv(HTC_TARGET *target, HTC_PACKET *pPacket);
-+void        HTCRecvCompleteHandler(void *Context, HTC_PACKET *pPacket);
-+A_STATUS    HTCRecvMessagePendingHandler(void *Context, A_UINT32 LookAhead, A_BOOL *pAsyncProc);
-+void        HTCProcessCreditRpt(HTC_TARGET *target, HTC_CREDIT_REPORT *pRpt, int NumEntries, HTC_ENDPOINT_ID FromEndpoint);
-+A_STATUS    HTCSendSetupComplete(HTC_TARGET *target);
-+void        HTCFlushRecvBuffers(HTC_TARGET *target);
-+void        HTCFlushSendPkts(HTC_TARGET *target);
-+void        DumpCreditDist(HTC_ENDPOINT_CREDIT_DIST *pEPDist);
-+void        DumpCreditDistStates(HTC_TARGET *target);
-+void          DebugDumpBytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription);
-+
-+static INLINE HTC_PACKET *HTC_ALLOC_CONTROL_TX(HTC_TARGET *target) {
-+    HTC_PACKET *pPacket = HTCAllocControlBuffer(target,&target->ControlBufferTXFreeList);
-+    if (pPacket != NULL) {
-+            /* set payload pointer area with some headroom */
-+        pPacket->pBuffer = pPacket->pBufferStart + HTC_HDR_LENGTH;
-+    }
-+    return pPacket;
-+}
-+
-+#define HTC_FREE_CONTROL_TX(t,p) HTCFreeControlBuffer((t),(p),&(t)->ControlBufferTXFreeList)
-+#define HTC_ALLOC_CONTROL_RX(t)  HTCAllocControlBuffer((t),&(t)->ControlBufferRXFreeList)
-+#define HTC_FREE_CONTROL_RX(t,p) \
-+{                                                                \
-+    HTC_PACKET_RESET_RX(p);                                      \
-+    HTCFreeControlBuffer((t),(p),&(t)->ControlBufferRXFreeList); \
-+}
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _HTC_INTERNAL_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c b/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c
-new file mode 100644
-index 0000000..4be2b08
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c
-@@ -0,0 +1,703 @@
-+/*
-+ *
-+ * Copyright (c) 2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "htc_internal.h"
-+
-+#define HTCIssueRecv(t, p) \
-+    DevRecvPacket(&(t)->Device,  \
-+                  (p),          \
-+                  (p)->ActualLength)
-+
-+#define DO_RCV_COMPLETION(t,p,e)            \
-+{                                           \
-+    if ((p)->ActualLength > 0) {            \
-+        AR_DEBUG_PRINTF(ATH_DEBUG_RECV, (" completing packet 0x%X (%d bytes) on ep : %d \n", \
-+            (A_UINT32)(p), (p)->ActualLength, (p)->Endpoint));  \
-+        (e)->EpCallBacks.EpRecv((e)->EpCallBacks.pContext,      \
-+                                (p));                           \
-+    } else {                                                    \
-+        AR_DEBUG_PRINTF(ATH_DEBUG_RECV, (" recycling empty packet \n"));  \
-+        HTC_RECYCLE_RX_PKT((t), (p));                           \
-+    }                                                           \
-+}
-+
-+#ifdef HTC_EP_STAT_PROFILING
-+#define HTC_RX_STAT_PROFILE(t,ep,lookAhead)            \
-+{                                                      \
-+    LOCK_HTC_RX((t));                                  \
-+    INC_HTC_EP_STAT((ep), RxReceived, 1);              \
-+    if ((lookAhead) != 0) {                            \
-+        INC_HTC_EP_STAT((ep), RxLookAheads, 1);        \
-+    }                                                  \
-+    UNLOCK_HTC_RX((t));                                \
-+}
-+#else
-+#define HTC_RX_STAT_PROFILE(t,ep,lookAhead)
-+#endif
-+
-+static INLINE A_STATUS HTCProcessTrailer(HTC_TARGET *target,
-+                                         A_UINT8    *pBuffer,
-+                                         int         Length,
-+                                         A_UINT32   *pNextLookAhead,
-+                                         HTC_ENDPOINT_ID FromEndpoint)
-+{
-+    HTC_RECORD_HDR          *pRecord;
-+    A_UINT8                 *pRecordBuf;
-+    HTC_LOOKAHEAD_REPORT    *pLookAhead;
-+    A_UINT8                 *pOrigBuffer;
-+    int                     origLength;
-+    A_STATUS                status;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("+HTCProcessTrailer (length:%d) \n", Length));
-+
-+    if (AR_DEBUG_LVL_CHECK(ATH_DEBUG_RECV)) {
-+        AR_DEBUG_PRINTBUF(pBuffer,Length,"Recv Trailer");
-+    }
-+
-+    pOrigBuffer = pBuffer;
-+    origLength = Length;
-+    status = A_OK;
-+
-+    while (Length > 0) {
-+
-+        if (Length < sizeof(HTC_RECORD_HDR)) {
-+            status = A_EPROTO;
-+            break;
-+        }
-+            /* these are byte aligned structs */
-+        pRecord = (HTC_RECORD_HDR *)pBuffer;
-+        Length -= sizeof(HTC_RECORD_HDR);
-+        pBuffer += sizeof(HTC_RECORD_HDR);
-+
-+        if (pRecord->Length > Length) {
-+                /* no room left in buffer for record */
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                (" invalid record length: %d (id:%d) buffer has: %d bytes left \n",
-+                        pRecord->Length, pRecord->RecordID, Length));
-+            status = A_EPROTO;
-+            break;
-+        }
-+            /* start of record follows the header */
-+        pRecordBuf = pBuffer;
-+
-+        switch (pRecord->RecordID) {
-+            case HTC_RECORD_CREDITS:
-+                AR_DEBUG_ASSERT(pRecord->Length >= sizeof(HTC_CREDIT_REPORT));
-+                HTCProcessCreditRpt(target,
-+                                    (HTC_CREDIT_REPORT *)pRecordBuf,
-+                                    pRecord->Length / (sizeof(HTC_CREDIT_REPORT)),
-+                                    FromEndpoint);
-+                break;
-+            case HTC_RECORD_LOOKAHEAD:
-+                AR_DEBUG_ASSERT(pRecord->Length >= sizeof(HTC_LOOKAHEAD_REPORT));
-+                pLookAhead = (HTC_LOOKAHEAD_REPORT *)pRecordBuf;
-+                if ((pLookAhead->PreValid == ((~pLookAhead->PostValid) & 0xFF)) &&
-+                    (pNextLookAhead != NULL)) {
-+
-+                    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,
-+                                (" LookAhead Report Found (pre valid:0x%X, post valid:0x%X) \n",
-+                                pLookAhead->PreValid,
-+                                pLookAhead->PostValid));
-+
-+                        /* look ahead bytes are valid, copy them over */
-+                    ((A_UINT8 *)pNextLookAhead)[0] = pLookAhead->LookAhead[0];
-+                    ((A_UINT8 *)pNextLookAhead)[1] = pLookAhead->LookAhead[1];
-+                    ((A_UINT8 *)pNextLookAhead)[2] = pLookAhead->LookAhead[2];
-+                    ((A_UINT8 *)pNextLookAhead)[3] = pLookAhead->LookAhead[3];
-+
-+                    if (AR_DEBUG_LVL_CHECK(ATH_DEBUG_RECV)) {
-+                        DebugDumpBytes((A_UINT8 *)pNextLookAhead,4,"Next Look Ahead");
-+                    }
-+                }
-+                break;
-+            default:
-+                AR_DEBUG_PRINTF(ATH_DEBUG_ERR, (" unhandled record: id:%d length:%d \n",
-+                        pRecord->RecordID, pRecord->Length));
-+                break;
-+        }
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+            /* advance buffer past this record for next time around */
-+        pBuffer += pRecord->Length;
-+        Length -= pRecord->Length;
-+    }
-+
-+    if (A_FAILED(status)) {
-+        DebugDumpBytes(pOrigBuffer,origLength,"BAD Recv Trailer");
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("-HTCProcessTrailer \n"));
-+    return status;
-+
-+}
-+
-+/* process a received message (i.e. strip off header, process any trailer data)
-+ * note : locks must be released when this function is called */
-+static A_STATUS HTCProcessRecvHeader(HTC_TARGET *target, HTC_PACKET *pPacket, A_UINT32 *pNextLookAhead)
-+{
-+    A_UINT8   temp;
-+    A_UINT8   *pBuf;
-+    A_STATUS  status = A_OK;
-+    A_UINT16  payloadLen;
-+    A_UINT32  lookAhead;
-+
-+    pBuf = pPacket->pBuffer;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("+HTCProcessRecvHeader \n"));
-+
-+    if (AR_DEBUG_LVL_CHECK(ATH_DEBUG_RECV)) {
-+        AR_DEBUG_PRINTBUF(pBuf,pPacket->ActualLength,"HTC Recv PKT");
-+    }
-+
-+    do {
-+        /* note, we cannot assume the alignment of pBuffer, so we use the safe macros to
-+         * retrieve 16 bit fields */
-+        payloadLen = A_GET_UINT16_FIELD(pBuf, HTC_FRAME_HDR, PayloadLen);
-+
-+        ((A_UINT8 *)&lookAhead)[0] = pBuf[0];
-+        ((A_UINT8 *)&lookAhead)[1] = pBuf[1];
-+        ((A_UINT8 *)&lookAhead)[2] = pBuf[2];
-+        ((A_UINT8 *)&lookAhead)[3] = pBuf[3];
-+
-+        if (lookAhead != pPacket->HTCReserved) {
-+            /* somehow the lookahead that gave us the full read length did not
-+             * reflect the actual header in the pending message */
-+             AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                    ("HTCProcessRecvHeader, lookahead mismatch! \n"));
-+             DebugDumpBytes((A_UINT8 *)&pPacket->HTCReserved,4,"Expected Message LookAhead");
-+             DebugDumpBytes(pBuf,sizeof(HTC_FRAME_HDR),"Current Frame Header");
-+#ifdef HTC_CAPTURE_LAST_FRAME
-+            DebugDumpBytes((A_UINT8 *)&target->LastFrameHdr,sizeof(HTC_FRAME_HDR),"Last Frame Header");
-+            if (target->LastTrailerLength != 0) {
-+                DebugDumpBytes(target->LastTrailer,
-+                               target->LastTrailerLength,
-+                               "Last trailer");
-+            }
-+#endif
-+            status = A_EPROTO;
-+            break;
-+        }
-+
-+            /* get flags */
-+        temp = A_GET_UINT8_FIELD(pBuf, HTC_FRAME_HDR, Flags);
-+
-+        if (temp & HTC_FLAGS_RECV_TRAILER) {
-+            /* this packet has a trailer */
-+
-+                /* extract the trailer length in control byte 0 */
-+            temp = A_GET_UINT8_FIELD(pBuf, HTC_FRAME_HDR, ControlBytes[0]);
-+
-+            if ((temp < sizeof(HTC_RECORD_HDR)) || (temp > payloadLen)) {
-+                AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                    ("HTCProcessRecvHeader, invalid header (payloadlength should be :%d, CB[0] is:%d) \n",
-+                        payloadLen, temp));
-+                status = A_EPROTO;
-+                break;
-+            }
-+
-+                /* process trailer data that follows HDR + application payload */
-+            status = HTCProcessTrailer(target,
-+                                       (pBuf + HTC_HDR_LENGTH + payloadLen - temp),
-+                                       temp,
-+                                       pNextLookAhead,
-+                                       pPacket->Endpoint);
-+
-+            if (A_FAILED(status)) {
-+                break;
-+            }
-+
-+#ifdef HTC_CAPTURE_LAST_FRAME
-+            A_MEMCPY(target->LastTrailer, (pBuf + HTC_HDR_LENGTH + payloadLen - temp), temp);
-+            target->LastTrailerLength = temp;
-+#endif
-+                /* trim length by trailer bytes */
-+            pPacket->ActualLength -= temp;
-+        }
-+#ifdef HTC_CAPTURE_LAST_FRAME
-+         else {
-+            target->LastTrailerLength = 0;
-+        }
-+#endif
-+
-+            /* if we get to this point, the packet is good */
-+            /* remove header and adjust length */
-+        pPacket->pBuffer += HTC_HDR_LENGTH;
-+        pPacket->ActualLength -= HTC_HDR_LENGTH;
-+
-+    } while (FALSE);
-+
-+    if (A_FAILED(status)) {
-+            /* dump the whole packet */
-+        DebugDumpBytes(pBuf,pPacket->ActualLength,"BAD HTC Recv PKT");
-+    } else {
-+#ifdef HTC_CAPTURE_LAST_FRAME
-+        A_MEMCPY(&target->LastFrameHdr,pBuf,sizeof(HTC_FRAME_HDR));
-+#endif
-+        if (AR_DEBUG_LVL_CHECK(ATH_DEBUG_RECV)) {
-+            if (pPacket->ActualLength > 0) {
-+                AR_DEBUG_PRINTBUF(pPacket->pBuffer,pPacket->ActualLength,"HTC - Application Msg");
-+            }
-+        }
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("-HTCProcessRecvHeader \n"));
-+    return status;
-+}
-+
-+/* asynchronous completion handler for recv packet fetching, when the device layer
-+ * completes a read request, it will call this completion handler */
-+void HTCRecvCompleteHandler(void *Context, HTC_PACKET *pPacket)
-+{
-+    HTC_TARGET      *target = (HTC_TARGET *)Context;
-+    HTC_ENDPOINT    *pEndpoint;
-+    A_UINT32        nextLookAhead = 0;
-+    A_STATUS        status;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("+HTCRecvCompleteHandler (status:%d, ep:%d) \n",
-+                pPacket->Status, pPacket->Endpoint));
-+
-+    AR_DEBUG_ASSERT(pPacket->Endpoint < ENDPOINT_MAX);
-+    pEndpoint = &target->EndPoint[pPacket->Endpoint];
-+    pPacket->Completion = NULL;
-+
-+        /* get completion status */
-+    status = pPacket->Status;
-+
-+    do {
-+        if (A_FAILED(status)) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("HTCRecvCompleteHandler: request failed (status:%d, ep:%d) \n",
-+                pPacket->Status, pPacket->Endpoint));
-+            break;
-+        }
-+            /* process the header for any trailer data */
-+        status = HTCProcessRecvHeader(target,pPacket,&nextLookAhead);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+            /* was there a lookahead for the next packet? */
-+        if (nextLookAhead != 0) {
-+            A_STATUS nextStatus;
-+            AR_DEBUG_PRINTF(ATH_DEBUG_RECV,
-+                            ("HTCRecvCompleteHandler - next look ahead was non-zero : 0x%X \n",
-+                             nextLookAhead));
-+                /* we have another packet, get the next packet fetch started (pipelined) before
-+                 * we call into the endpoint's callback, this will start another async request */
-+            nextStatus = HTCRecvMessagePendingHandler(target,nextLookAhead,NULL);
-+            if (A_EPROTO == nextStatus) {
-+                AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                            ("Next look ahead from recv header was INVALID\n"));
-+                DebugDumpBytes((A_UINT8 *)&nextLookAhead,
-+                                4,
-+                                "BAD lookahead from lookahead report");
-+            }
-+        } else {
-+             AR_DEBUG_PRINTF(ATH_DEBUG_RECV,
-+            ("HTCRecvCompleteHandler - rechecking for more messages...\n"));
-+            /* if we did not get anything on the look-ahead,
-+             * call device layer to asynchronously re-check for messages. If we can keep the async
-+             * processing going we get better performance.  If there is a pending message we will keep processing
-+             * messages asynchronously which should pipeline things nicely */
-+            DevCheckPendingRecvMsgsAsync(&target->Device);
-+        }
-+
-+        HTC_RX_STAT_PROFILE(target,pEndpoint,nextLookAhead);
-+        DO_RCV_COMPLETION(target,pPacket,pEndpoint);
-+
-+    } while (FALSE);
-+
-+    if (A_FAILED(status)) {
-+         AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                         ("HTCRecvCompleteHandler , message fetch failed (status = %d) \n",
-+                         status));
-+            /* recyle this packet */
-+         HTC_RECYCLE_RX_PKT(target, pPacket);
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("-HTCRecvCompleteHandler\n"));
-+}
-+
-+/* synchronously wait for a control message from the target,
-+ * This function is used at initialization time ONLY.  At init messages
-+ * on ENDPOINT 0 are expected. */
-+A_STATUS HTCWaitforControlMessage(HTC_TARGET *target, HTC_PACKET **ppControlPacket)
-+{
-+    A_STATUS        status;
-+    A_UINT32        lookAhead;
-+    HTC_PACKET      *pPacket = NULL;
-+    HTC_FRAME_HDR   *pHdr;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("+HTCWaitforControlMessage \n"));
-+
-+    do  {
-+
-+        *ppControlPacket = NULL;
-+
-+            /* call the polling function to see if we have a message */
-+        status = DevPollMboxMsgRecv(&target->Device,
-+                                    &lookAhead,
-+                                    HTC_TARGET_RESPONSE_TIMEOUT);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_RECV,
-+                ("HTCWaitforControlMessage : lookAhead : 0x%X \n", lookAhead));
-+
-+            /* check the lookahead */
-+        pHdr = (HTC_FRAME_HDR *)&lookAhead;
-+
-+        if (pHdr->EndpointID != ENDPOINT_0) {
-+                /* unexpected endpoint number, should be zero */
-+            AR_DEBUG_ASSERT(FALSE);
-+            status = A_EPROTO;
-+            break;
-+        }
-+
-+        if (A_FAILED(status)) {
-+                /* bad message */
-+            AR_DEBUG_ASSERT(FALSE);
-+            status = A_EPROTO;
-+            break;
-+        }
-+
-+        pPacket = HTC_ALLOC_CONTROL_RX(target);
-+
-+        if (pPacket == NULL) {
-+            AR_DEBUG_ASSERT(FALSE);
-+            status = A_NO_MEMORY;
-+            break;
-+        }
-+
-+        pPacket->HTCReserved = lookAhead;
-+        pPacket->ActualLength = pHdr->PayloadLen + HTC_HDR_LENGTH;
-+
-+        if (pPacket->ActualLength > pPacket->BufferLength) {
-+            AR_DEBUG_ASSERT(FALSE);
-+            status = A_EPROTO;
-+            break;
-+        }
-+
-+            /* we want synchronous operation */
-+        pPacket->Completion = NULL;
-+
-+            /* get the message from the device, this will block */
-+        status = HTCIssueRecv(target, pPacket);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+            /* process receive header */
-+        status = HTCProcessRecvHeader(target,pPacket,NULL);
-+
-+        pPacket->Status = status;
-+
-+        if (A_FAILED(status)) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                    ("HTCWaitforControlMessage, HTCProcessRecvHeader failed (status = %d) \n",
-+                     status));
-+            break;
-+        }
-+
-+            /* give the caller this control message packet, they are responsible to free */
-+        *ppControlPacket = pPacket;
-+
-+    } while (FALSE);
-+
-+    if (A_FAILED(status)) {
-+        if (pPacket != NULL) {
-+                /* cleanup buffer on error */
-+            HTC_FREE_CONTROL_RX(target,pPacket);
-+        }
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("-HTCWaitforControlMessage \n"));
-+
-+    return status;
-+}
-+
-+/* callback when device layer or lookahead report parsing detects a pending message */
-+A_STATUS HTCRecvMessagePendingHandler(void *Context, A_UINT32 LookAhead, A_BOOL *pAsyncProc)
-+{
-+    HTC_TARGET      *target = (HTC_TARGET *)Context;
-+    A_STATUS         status = A_OK;
-+    HTC_PACKET      *pPacket = NULL;
-+    HTC_FRAME_HDR   *pHdr;
-+    HTC_ENDPOINT    *pEndpoint;
-+    A_BOOL          asyncProc = FALSE;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("+HTCRecvMessagePendingHandler LookAhead:0x%X \n",LookAhead));
-+
-+    if (IS_DEV_IRQ_PROCESSING_ASYNC_ALLOWED(&target->Device)) {
-+            /* We use async mode to get the packets if the device layer supports it.
-+             * The device layer interfaces with HIF in which HIF may have restrictions on
-+             * how interrupts are processed */
-+        asyncProc = TRUE;
-+    }
-+
-+    if (pAsyncProc != NULL) {
-+            /* indicate to caller how we decided to process this */
-+        *pAsyncProc = asyncProc;
-+    }
-+
-+    while (TRUE) {
-+
-+        pHdr = (HTC_FRAME_HDR *)&LookAhead;
-+
-+        if (pHdr->EndpointID >= ENDPOINT_MAX) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Invalid Endpoint in look-ahead: %d \n",pHdr->EndpointID));
-+                /* invalid endpoint */
-+            status = A_EPROTO;
-+            break;
-+        }
-+
-+        if (pHdr->PayloadLen > HTC_MAX_PAYLOAD_LENGTH) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Payload length %d exceeds max HTC : %d !\n",
-+                    pHdr->PayloadLen, HTC_MAX_PAYLOAD_LENGTH));
-+            status = A_EPROTO;
-+            break;
-+        }
-+
-+        pEndpoint = &target->EndPoint[pHdr->EndpointID];
-+
-+        if (0 == pEndpoint->ServiceID) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Endpoint %d is not connected !\n",pHdr->EndpointID));
-+                /* endpoint isn't even connected */
-+            status = A_EPROTO;
-+            break;
-+        }
-+
-+            /* lock RX to get a buffer */
-+        LOCK_HTC_RX(target);
-+
-+            /* get a packet from the endpoint recv queue */
-+        pPacket = HTC_PACKET_DEQUEUE(&pEndpoint->RxBuffers);
-+
-+        if (NULL == pPacket) {
-+                /* check for refill handler */
-+            if (pEndpoint->EpCallBacks.EpRecvRefill != NULL) {
-+                UNLOCK_HTC_RX(target);
-+                    /* call the re-fill handler */
-+                pEndpoint->EpCallBacks.EpRecvRefill(pEndpoint->EpCallBacks.pContext,
-+                                                    pHdr->EndpointID);
-+                LOCK_HTC_RX(target);
-+                    /* check if we have more buffers */
-+                pPacket = HTC_PACKET_DEQUEUE(&pEndpoint->RxBuffers);
-+                    /* fall through */
-+            }
-+        }
-+
-+        if (NULL == pPacket) {
-+                /* this is not an error, we simply need to mark that we are waiting for buffers.*/
-+            target->HTCStateFlags |= HTC_STATE_WAIT_BUFFERS;
-+            target->EpWaitingForBuffers = pHdr->EndpointID;
-+            status = A_NO_MEMORY;
-+        }
-+
-+        UNLOCK_HTC_RX(target);
-+
-+        if (A_FAILED(status)) {
-+                /* no buffers */
-+            break;
-+        }
-+
-+        AR_DEBUG_ASSERT(pPacket->Endpoint == pHdr->EndpointID);
-+
-+            /* make sure this message can fit in the endpoint buffer */
-+        if ((pHdr->PayloadLen + HTC_HDR_LENGTH) > pPacket->BufferLength) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                    ("Payload Length Error : header reports payload of: %d, endpoint buffer size: %d \n",
-+                    pHdr->PayloadLen, pPacket->BufferLength));
-+            status = A_EPROTO;
-+            break;
-+        }
-+
-+        pPacket->HTCReserved = LookAhead; /* set expected look ahead */
-+            /* set the amount of data to fetch */
-+        pPacket->ActualLength = pHdr->PayloadLen + HTC_HDR_LENGTH;
-+
-+        if (asyncProc) {
-+                /* we use async mode to get the packet if the device layer supports it
-+                 * set our callback and context */
-+            pPacket->Completion = HTCRecvCompleteHandler;
-+            pPacket->pContext = target;
-+        } else {
-+                /* fully synchronous */
-+            pPacket->Completion = NULL;
-+        }
-+
-+            /* go fetch the packet */
-+        status = HTCIssueRecv(target, pPacket);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+        if (asyncProc) {
-+                /* we did this asynchronously so we can get out of the loop, the asynch processing
-+                 * creates a chain of requests to continue processing pending messages in the
-+                 * context of callbacks  */
-+            break;
-+        }
-+
-+            /* in the sync case, we process the packet, check lookaheads and then repeat */
-+
-+        LookAhead = 0;
-+        status = HTCProcessRecvHeader(target,pPacket,&LookAhead);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+        HTC_RX_STAT_PROFILE(target,pEndpoint,LookAhead);
-+        DO_RCV_COMPLETION(target,pPacket,pEndpoint);
-+
-+        pPacket = NULL;
-+
-+        if (0 == LookAhead) {
-+            break;
-+        }
-+
-+    }
-+
-+    if (A_NO_MEMORY == status) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                (" Endpoint :%d has no buffers, blocking receiver to prevent overrun.. \n",
-+                pHdr->EndpointID));
-+            /* try to stop receive at the device layer */
-+        DevStopRecv(&target->Device, asyncProc ? DEV_STOP_RECV_ASYNC : DEV_STOP_RECV_SYNC);
-+        status = A_OK;
-+    } else if (A_FAILED(status)) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                        ("Failed to get pending message : LookAhead Value: 0x%X (status = %d) \n",
-+                        LookAhead, status));
-+        if (pPacket != NULL) {
-+                /* clean up packet on error */
-+            HTC_RECYCLE_RX_PKT(target, pPacket);
-+        }
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_RECV,("-HTCRecvMessagePendingHandler \n"));
-+
-+    return status;
-+}
-+
-+/* Makes a buffer available to the HTC module */
-+A_STATUS HTCAddReceivePkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket)
-+{
-+    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+    HTC_ENDPOINT *pEndpoint;
-+    A_BOOL       unblockRecv = FALSE;
-+    A_STATUS     status = A_OK;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND,
-+                    ("+- HTCAddReceivePkt: endPointId: %d, buffer: 0x%X, length: %d\n",
-+                    pPacket->Endpoint, (A_UINT32)pPacket->pBuffer, pPacket->BufferLength));
-+
-+    do {
-+
-+        if (HTC_STOPPING(target)) {
-+            status = A_ECANCELED;
-+            break;
-+        }
-+
-+        AR_DEBUG_ASSERT(pPacket->Endpoint < ENDPOINT_MAX);
-+
-+        pEndpoint = &target->EndPoint[pPacket->Endpoint];
-+
-+        LOCK_HTC_RX(target);
-+
-+            /* store receive packet */
-+        HTC_PACKET_ENQUEUE(&pEndpoint->RxBuffers, pPacket);
-+
-+            /* check if we are blocked waiting for a new buffer */
-+        if (target->HTCStateFlags & HTC_STATE_WAIT_BUFFERS) {
-+            if (target->EpWaitingForBuffers == pPacket->Endpoint) {
-+                AR_DEBUG_PRINTF(ATH_DEBUG_RECV,(" receiver was blocked on ep:%d, unblocking.. \n",
-+                    target->EpWaitingForBuffers));
-+                target->HTCStateFlags &= ~HTC_STATE_WAIT_BUFFERS;
-+                target->EpWaitingForBuffers = ENDPOINT_MAX;
-+                unblockRecv = TRUE;
-+            }
-+        }
-+
-+        UNLOCK_HTC_RX(target);
-+
-+        if (unblockRecv && !HTC_STOPPING(target)) {
-+                /* TODO : implement a buffer threshold count? */
-+            DevEnableRecv(&target->Device,DEV_ENABLE_RECV_SYNC);
-+        }
-+
-+    } while (FALSE);
-+
-+    return status;
-+}
-+
-+static void HTCFlushEndpointRX(HTC_TARGET *target, HTC_ENDPOINT *pEndpoint)
-+{
-+    HTC_PACKET  *pPacket;
-+
-+    LOCK_HTC_RX(target);
-+
-+    while (1) {
-+        pPacket = HTC_PACKET_DEQUEUE(&pEndpoint->RxBuffers);
-+        if (NULL == pPacket) {
-+            break;
-+        }
-+        UNLOCK_HTC_RX(target);
-+        pPacket->Status = A_ECANCELED;
-+        pPacket->ActualLength = 0;
-+        AR_DEBUG_PRINTF(ATH_DEBUG_RECV, ("  Flushing RX packet:0x%X, length:%d, ep:%d \n",
-+                (A_UINT32)pPacket, pPacket->BufferLength, pPacket->Endpoint));
-+            /* give the packet back */
-+        pEndpoint->EpCallBacks.EpRecv(pEndpoint->EpCallBacks.pContext,
-+                                      pPacket);
-+        LOCK_HTC_RX(target);
-+    }
-+
-+    UNLOCK_HTC_RX(target);
-+
-+
-+}
-+
-+void HTCFlushRecvBuffers(HTC_TARGET *target)
-+{
-+    HTC_ENDPOINT    *pEndpoint;
-+    int             i;
-+
-+        /* NOTE: no need to flush endpoint 0, these buffers were
-+         * allocated as part of the HTC struct */
-+    for (i = ENDPOINT_1; i < ENDPOINT_MAX; i++) {
-+        pEndpoint = &target->EndPoint[i];
-+        if (pEndpoint->ServiceID == 0) {
-+                /* not in use.. */
-+            continue;
-+        }
-+        HTCFlushEndpointRX(target,pEndpoint);
-+    }
-+
-+
-+}
-+
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/htc/htc_send.c b/drivers/sdio/function/wlan/ar6000/htc/htc_send.c
-new file mode 100644
-index 0000000..7792dd6
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/htc/htc_send.c
-@@ -0,0 +1,541 @@
-+/*
-+ *
-+ * Copyright (c) 2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "htc_internal.h"
-+
-+#define DO_EP_TX_COMPLETION(ep,p)                                    \
-+{                                                                    \
-+    (p)->Completion = NULL;                                          \
-+    (ep)->EpCallBacks.EpTxComplete((ep)->EpCallBacks.pContext,(p));  \
-+}
-+
-+
-+/* call the distribute credits callback with the distribution */
-+#define DO_DISTRIBUTION(t,reason,description,pList) \
-+{                                             \
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND,           \
-+        ("  calling distribute function (%s) (dfn:0x%X, ctxt:0x%X, dist:0x%X) \n", \
-+                (description),                                           \
-+                (A_UINT32)(t)->DistributeCredits,                        \
-+                (A_UINT32)(t)->pCredDistContext,                         \
-+                (A_UINT32)pList));                                       \
-+    (t)->DistributeCredits((t)->pCredDistContext,                        \
-+                           (pList),                                      \
-+                           (reason));                                    \
-+}
-+
-+/* our internal send packet completion handler when packets are submited to the AR6K device
-+ * layer */
-+static void HTCSendPktCompletionHandler(void *Context, HTC_PACKET *pPacket)
-+{
-+    HTC_TARGET      *target = (HTC_TARGET *)Context;
-+    HTC_ENDPOINT    *pEndpoint = &target->EndPoint[pPacket->Endpoint];
-+
-+
-+    if (A_FAILED(pPacket->Status)) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+            ("HTCSendPktCompletionHandler: request failed (status:%d, ep:%d) \n",
-+                pPacket->Status, pPacket->Endpoint));
-+    }
-+        /* first, fixup the head room we allocated */
-+    pPacket->pBuffer += HTC_HDR_LENGTH;
-+        /* do completion */
-+    DO_EP_TX_COMPLETION(pEndpoint,pPacket);
-+}
-+
-+A_STATUS HTCIssueSend(HTC_TARGET *target, HTC_PACKET *pPacket, A_UINT8 SendFlags)
-+{
-+    A_STATUS status;
-+    A_UINT8 *pHdrBuf;
-+    A_BOOL   sync = FALSE;
-+
-+        /* caller always provides headrooom */
-+    pPacket->pBuffer -= HTC_HDR_LENGTH;
-+    pHdrBuf = pPacket->pBuffer;
-+        /* setup frame header */
-+    A_SET_UINT16_FIELD(pHdrBuf,HTC_FRAME_HDR,PayloadLen,(A_UINT16)pPacket->ActualLength);
-+    A_SET_UINT8_FIELD(pHdrBuf,HTC_FRAME_HDR,Flags,SendFlags);
-+    A_SET_UINT8_FIELD(pHdrBuf,HTC_FRAME_HDR,EndpointID, (A_UINT8)pPacket->Endpoint);
-+
-+    if (pPacket->Completion == NULL) {
-+            /* mark that this request was synchronously issued */
-+        sync = TRUE;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND,
-+                    ("+-HTCIssueSend: transmit length : %d (%s) \n",
-+                    pPacket->ActualLength + HTC_HDR_LENGTH,
-+                    sync ? "SYNC" : "ASYNC" ));
-+
-+        /* send message to device */
-+    status = DevSendPacket(&target->Device,
-+                           pPacket,
-+                           pPacket->ActualLength + HTC_HDR_LENGTH);
-+
-+    if (sync) {
-+            /* use local sync variable.  If this was issued asynchronously, pPacket is no longer
-+             * safe to access. */
-+        pPacket->pBuffer += HTC_HDR_LENGTH;
-+    }
-+
-+    /* if this request was asynchronous, the packet completion routine will be invoked by
-+     * the device layer when the HIF layer completes the request */
-+
-+    return status;
-+}
-+
-+/* try to send the current packet or a packet at the head of the TX queue,
-+ * if there are no credits, the packet remains in the queue.
-+ * this function always succeeds and returns a flag if the TX queue for
-+ * the endpoint has hit the set limit */
-+static A_BOOL HTCTrySend(HTC_TARGET   *target,
-+                         HTC_ENDPOINT *pEndpoint,
-+                         HTC_PACKET   *pPacketToSend)
-+{
-+    HTC_PACKET  *pPacket;
-+    int         creditsRequired;
-+    int         remainder;
-+    A_UINT8     sendFlags;
-+    A_BOOL      epFull = FALSE;
-+
-+    LOCK_HTC_TX(target);
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND,("+HTCTrySend (pPkt:0x%X)\n",(A_UINT32)pPacketToSend));
-+
-+    if (pPacketToSend != NULL) {
-+        /* caller supplied us a packet to queue to the tail of the HTC TX queue before
-+         * we check the tx queue */
-+        HTC_PACKET_ENQUEUE(&pEndpoint->TxQueue,pPacketToSend);
-+        pEndpoint->CurrentTxQueueDepth++;
-+    }
-+
-+        /* now drain the TX queue for transmission as long as we have enough
-+         * credits */
-+
-+    while (1) {
-+
-+        if (HTC_QUEUE_EMPTY(&pEndpoint->TxQueue)) {
-+                /* nothing in the queue */
-+            break;
-+        }
-+
-+        sendFlags = 0;
-+
-+            /* get packet at head, but don't remove it */
-+        pPacket = HTC_GET_PKT_AT_HEAD(&pEndpoint->TxQueue);
-+        AR_DEBUG_PRINTF(ATH_DEBUG_SEND,(" Got head packet:0x%X , Queue Depth: %d\n",
-+                (A_UINT32)pPacket, pEndpoint->CurrentTxQueueDepth));
-+
-+            /* figure out how many credits this message requires */
-+        creditsRequired = (pPacket->ActualLength + HTC_HDR_LENGTH) / target->TargetCreditSize;
-+        remainder = (pPacket->ActualLength + HTC_HDR_LENGTH) % target->TargetCreditSize;
-+
-+        if (remainder) {
-+            creditsRequired++;
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_SEND,(" Creds Required:%d   Got:%d\n",
-+                            creditsRequired, pEndpoint->CreditDist.TxCredits));
-+
-+        if (pEndpoint->CreditDist.TxCredits < creditsRequired) {
-+
-+            /* not enough credits */
-+
-+            if (pPacket->Endpoint == ENDPOINT_0) {
-+                    /* leave it in the queue */
-+                break;
-+            }
-+                /* invoke the registered distribution function only if this is not
-+                 * endpoint 0, we let the driver layer provide more credits if it can.
-+                 * We pass the credit distribution list starting at the endpoint in question
-+                 * */
-+
-+                /* set how many credits we need  */
-+            pEndpoint->CreditDist.TxCreditsSeek =
-+                                    creditsRequired - pEndpoint->CreditDist.TxCredits;
-+            DO_DISTRIBUTION(target,
-+                            HTC_CREDIT_DIST_SEEK_CREDITS,
-+                            "Seek Credits",
-+                            &pEndpoint->CreditDist);
-+
-+            pEndpoint->CreditDist.TxCreditsSeek = 0;
-+
-+            if (pEndpoint->CreditDist.TxCredits < creditsRequired) {
-+                    /* still not enough credits to send, leave packet in the queue */
-+                AR_DEBUG_PRINTF(ATH_DEBUG_SEND,
-+                    (" Not enough credits for ep %d leaving packet in queue..\n",
-+                    pPacket->Endpoint));
-+                break;
-+            }
-+
-+        }
-+
-+        pEndpoint->CreditDist.TxCredits -= creditsRequired;
-+        INC_HTC_EP_STAT(pEndpoint, TxCreditsConsummed, creditsRequired);
-+
-+            /* check if we need credits */
-+        if (pEndpoint->CreditDist.TxCredits < pEndpoint->CreditDist.TxCreditsPerMaxMsg) {
-+            sendFlags |= HTC_FLAGS_NEED_CREDIT_UPDATE;
-+            INC_HTC_EP_STAT(pEndpoint, TxCreditLowIndications, 1);
-+            AR_DEBUG_PRINTF(ATH_DEBUG_SEND,(" Host Needs Credits  \n"));
-+        }
-+
-+            /* now we can fully dequeue */
-+        pPacket = HTC_PACKET_DEQUEUE(&pEndpoint->TxQueue);
-+        pEndpoint->CurrentTxQueueDepth--;
-+
-+        INC_HTC_EP_STAT(pEndpoint, TxIssued, 1);
-+
-+        UNLOCK_HTC_TX(target);
-+
-+        HTCIssueSend(target, pPacket, sendFlags);
-+
-+        LOCK_HTC_TX(target);
-+
-+        /* go back and check for more messages */
-+    }
-+
-+    if (pEndpoint->CurrentTxQueueDepth >= pEndpoint->MaxTxQueueDepth) {
-+            /* let caller know that this endpoint has reached the maximum depth */
-+        epFull = TRUE;
-+    }
-+
-+    UNLOCK_HTC_TX(target);
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND,("-HTCTrySend:  \n"));
-+    return epFull;
-+}
-+
-+/* HTC API - HTCSendPkt */
-+A_STATUS HTCSendPkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket)
-+{
-+    HTC_TARGET      *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+    HTC_ENDPOINT    *pEndpoint;
-+    HTC_ENDPOINT_ID ep;
-+    A_STATUS        status = A_OK;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND,
-+                    ("+HTCSendPkt: Enter endPointId: %d, buffer: 0x%X, length: %d \n",
-+                    pPacket->Endpoint, (A_UINT32)pPacket->pBuffer, pPacket->ActualLength));
-+
-+    ep = pPacket->Endpoint;
-+    AR_DEBUG_ASSERT(ep < ENDPOINT_MAX);
-+    pEndpoint = &target->EndPoint[ep];
-+
-+    do {
-+
-+        if (HTC_STOPPING(target)) {
-+            status = A_ECANCELED;
-+            pPacket->Status = status;
-+            DO_EP_TX_COMPLETION(pEndpoint,pPacket);
-+            break;
-+        }
-+            /* everything sent through this interface is asynchronous */
-+            /* fill in HTC completion routines */
-+        pPacket->Completion = HTCSendPktCompletionHandler;
-+        pPacket->pContext = target;
-+
-+        if (HTCTrySend(target, pEndpoint, pPacket)) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_SEND, (" Endpoint %d, TX queue is full, Depth:%d, Max:%d \n",
-+                    ep, pEndpoint->CurrentTxQueueDepth, pEndpoint->MaxTxQueueDepth));
-+                /* queue is now full, let caller know */
-+            if (pEndpoint->EpCallBacks.EpSendFull != NULL) {
-+                AR_DEBUG_PRINTF(ATH_DEBUG_SEND, (" Calling driver's send full callback.... \n"));
-+                pEndpoint->EpCallBacks.EpSendFull(pEndpoint->EpCallBacks.pContext,
-+                                                  ep);
-+            }
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("-HTCSendPkt \n"));
-+    } while (FALSE);
-+
-+    return status;
-+}
-+
-+
-+/* check TX queues to drain because of credit distribution update */
-+static INLINE void HTCCheckEndpointTxQueues(HTC_TARGET *target)
-+{
-+    HTC_ENDPOINT                *pEndpoint;
-+    HTC_ENDPOINT_CREDIT_DIST    *pDistItem;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("+HTCCheckEndpointTxQueues \n"));
-+    pDistItem = target->EpCreditDistributionListHead;
-+
-+        /* run through the credit distribution list to see
-+         * if there are packets queued
-+         * NOTE: no locks need to be taken since the distribution list
-+         * is not dynamic (cannot be re-ordered) and we are not modifying any state */
-+    while (pDistItem != NULL) {
-+        pEndpoint = (HTC_ENDPOINT *)pDistItem->pHTCReserved;
-+
-+        if (pEndpoint->CurrentTxQueueDepth > 0) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_SEND, (" Ep %d has %d credits and %d Packets in TX Queue \n",
-+                    pDistItem->Endpoint, pEndpoint->CreditDist.TxCredits, pEndpoint->CurrentTxQueueDepth));
-+                /* try to start the stalled queue, this list is ordered by priority.
-+                 * Highest priority queue get's processed first, if there are credits available the
-+                 * highest priority queue will get a chance to reclaim credits from lower priority
-+                 * ones */
-+            HTCTrySend(target, pEndpoint, NULL);
-+        }
-+
-+        pDistItem = pDistItem->pNext;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("-HTCCheckEndpointTxQueues \n"));
-+}
-+
-+/* process credit reports and call distribution function */
-+void HTCProcessCreditRpt(HTC_TARGET *target, HTC_CREDIT_REPORT *pRpt, int NumEntries, HTC_ENDPOINT_ID FromEndpoint)
-+{
-+    int             i;
-+    HTC_ENDPOINT    *pEndpoint;
-+    int             totalCredits = 0;
-+    A_BOOL          doDist = FALSE;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("+HTCProcessCreditRpt, Credit Report Entries:%d \n", NumEntries));
-+
-+        /* lock out TX while we update credits */
-+    LOCK_HTC_TX(target);
-+
-+    for (i = 0; i < NumEntries; i++, pRpt++) {
-+        if (pRpt->EndpointID >= ENDPOINT_MAX) {
-+            AR_DEBUG_ASSERT(FALSE);
-+            break;
-+        }
-+
-+        pEndpoint = &target->EndPoint[pRpt->EndpointID];
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("  Endpoint %d got %d credits \n",
-+                pRpt->EndpointID, pRpt->Credits));
-+
-+
-+#ifdef HTC_EP_STAT_PROFILING
-+
-+        INC_HTC_EP_STAT(pEndpoint, TxCreditRpts, 1);
-+        INC_HTC_EP_STAT(pEndpoint, TxCreditsReturned, pRpt->Credits);
-+
-+        if (FromEndpoint == pRpt->EndpointID) {
-+                /* this credit report arrived on the same endpoint indicating it arrived in an RX
-+                 * packet */
-+            INC_HTC_EP_STAT(pEndpoint, TxCreditsFromRx, pRpt->Credits);
-+            INC_HTC_EP_STAT(pEndpoint, TxCreditRptsFromRx, 1);
-+        } else if (FromEndpoint == ENDPOINT_0) {
-+                /* this credit arrived on endpoint 0 as a NULL message */
-+            INC_HTC_EP_STAT(pEndpoint, TxCreditsFromEp0, pRpt->Credits);
-+            INC_HTC_EP_STAT(pEndpoint, TxCreditRptsFromEp0, 1);
-+        } else {
-+                /* arrived on another endpoint */
-+            INC_HTC_EP_STAT(pEndpoint, TxCreditsFromOther, pRpt->Credits);
-+            INC_HTC_EP_STAT(pEndpoint, TxCreditRptsFromOther, 1);
-+        }
-+
-+#endif
-+
-+        if (ENDPOINT_0 == pRpt->EndpointID) {
-+                /* always give endpoint 0 credits back */
-+            pEndpoint->CreditDist.TxCredits += pRpt->Credits;
-+        } else {
-+                /* for all other endpoints, update credits to distribute, the distribution function
-+                 * will handle giving out credits back to the endpoints */
-+            pEndpoint->CreditDist.TxCreditsToDist += pRpt->Credits;
-+                /* flag that we have to do the distribution */
-+            doDist = TRUE;
-+        }
-+
-+        totalCredits += pRpt->Credits;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("  Report indicated %d credits to distribute \n", totalCredits));
-+
-+    if (doDist) {
-+            /* this was a credit return based on a completed send operations
-+             * note, this is done with the lock held */
-+        DO_DISTRIBUTION(target,
-+                        HTC_CREDIT_DIST_SEND_COMPLETE,
-+                        "Send Complete",
-+                        target->EpCreditDistributionListHead->pNext);
-+    }
-+
-+    UNLOCK_HTC_TX(target);
-+
-+    if (totalCredits) {
-+        HTCCheckEndpointTxQueues(target);
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_SEND, ("-HTCProcessCreditRpt \n"));
-+}
-+
-+/* flush endpoint TX queue */
-+static void HTCFlushEndpointTX(HTC_TARGET *target, HTC_ENDPOINT *pEndpoint, HTC_TX_TAG Tag)
-+{
-+    HTC_PACKET          *pPacket;
-+    HTC_PACKET_QUEUE    discardQueue;
-+
-+        /* initialize the discard queue */
-+    INIT_HTC_PACKET_QUEUE(&discardQueue);
-+
-+    LOCK_HTC_TX(target);
-+
-+        /* interate from the front of the TX queue and flush out packets */
-+    ITERATE_OVER_LIST_ALLOW_REMOVE(&pEndpoint->TxQueue, pPacket, HTC_PACKET, ListLink) {
-+
-+            /* check for removal */
-+        if ((HTC_TX_PACKET_TAG_ALL == Tag) || (Tag == pPacket->PktInfo.AsTx.Tag)) {
-+                /* remove from queue */
-+            HTC_PACKET_REMOVE(pPacket);
-+                /* add it to the discard pile */
-+            HTC_PACKET_ENQUEUE(&discardQueue, pPacket);
-+            pEndpoint->CurrentTxQueueDepth--;
-+        }
-+
-+    } ITERATE_END;
-+
-+    UNLOCK_HTC_TX(target);
-+
-+        /* empty the discard queue */
-+    while (1) {
-+        pPacket = HTC_PACKET_DEQUEUE(&discardQueue);
-+        if (NULL == pPacket) {
-+            break;
-+        }
-+        pPacket->Status = A_ECANCELED;
-+        AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("  Flushing TX packet:0x%X, length:%d, ep:%d tag:0x%X \n",
-+                (A_UINT32)pPacket, pPacket->ActualLength, pPacket->Endpoint, pPacket->PktInfo.AsTx.Tag));
-+        DO_EP_TX_COMPLETION(pEndpoint,pPacket);
-+    }
-+
-+}
-+
-+void DumpCreditDist(HTC_ENDPOINT_CREDIT_DIST *pEPDist)
-+{
-+    HTC_ENDPOINT *pEndpoint = (HTC_ENDPOINT *)pEPDist->pHTCReserved;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("--- EP : %d  ServiceID: 0x%X    --------------\n",
-+                        pEPDist->Endpoint, pEPDist->ServiceID));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" this:0x%X next:0x%X prev:0x%X\n",
-+                (A_UINT32)pEPDist, (A_UINT32)pEPDist->pNext, (A_UINT32)pEPDist->pPrev));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" DistFlags          : 0x%X \n", pEPDist->DistFlags));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCreditsNorm      : %d \n", pEPDist->TxCreditsNorm));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCreditsMin       : %d \n", pEPDist->TxCreditsMin));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCredits          : %d \n", pEPDist->TxCredits));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCreditsAssigned  : %d \n", pEPDist->TxCreditsAssigned));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCreditsSeek      : %d \n", pEPDist->TxCreditsSeek));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCreditSize       : %d \n", pEPDist->TxCreditSize));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCreditsPerMaxMsg : %d \n", pEPDist->TxCreditsPerMaxMsg));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxCreditsToDist    : %d \n", pEPDist->TxCreditsToDist));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, (" TxQueueDepth       : %d \n", pEndpoint->CurrentTxQueueDepth));
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ANY, ("----------------------------------------------------\n"));
-+}
-+
-+void DumpCreditDistStates(HTC_TARGET *target)
-+{
-+    HTC_ENDPOINT_CREDIT_DIST *pEPList = target->EpCreditDistributionListHead;
-+
-+    while (pEPList != NULL) {
-+        DumpCreditDist(pEPList);
-+        pEPList = pEPList->pNext;
-+    }
-+
-+    if (target->DistributeCredits != NULL) {
-+        DO_DISTRIBUTION(target,
-+                        HTC_DUMP_CREDIT_STATE,
-+                        "Dump State",
-+                        NULL);
-+    }
-+}
-+
-+/* flush all send packets from all endpoint queues */
-+void HTCFlushSendPkts(HTC_TARGET *target)
-+{
-+    HTC_ENDPOINT    *pEndpoint;
-+    int             i;
-+
-+    DumpCreditDistStates(target);
-+
-+    for (i = ENDPOINT_0; i < ENDPOINT_MAX; i++) {
-+        pEndpoint = &target->EndPoint[i];
-+        if (pEndpoint->ServiceID == 0) {
-+                /* not in use.. */
-+            continue;
-+        }
-+        HTCFlushEndpointTX(target,pEndpoint,HTC_TX_PACKET_TAG_ALL);
-+    }
-+
-+
-+}
-+
-+/* HTC API to flush an endpoint's TX queue*/
-+void HTCFlushEndpoint(HTC_HANDLE HTCHandle, HTC_ENDPOINT_ID Endpoint, HTC_TX_TAG Tag)
-+{
-+    HTC_TARGET      *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+    HTC_ENDPOINT    *pEndpoint = &target->EndPoint[Endpoint];
-+
-+    if (pEndpoint->ServiceID == 0) {
-+        AR_DEBUG_ASSERT(FALSE);
-+        /* not in use.. */
-+        return;
-+    }
-+
-+    HTCFlushEndpointTX(target, pEndpoint, Tag);
-+}
-+
-+/* HTC API to indicate activity to the credit distribution function */
-+void HTCIndicateActivityChange(HTC_HANDLE      HTCHandle,
-+                               HTC_ENDPOINT_ID Endpoint,
-+                               A_BOOL          Active)
-+{
-+    HTC_TARGET      *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+    HTC_ENDPOINT    *pEndpoint = &target->EndPoint[Endpoint];
-+    A_BOOL          doDist = FALSE;
-+
-+    if (pEndpoint->ServiceID == 0) {
-+        AR_DEBUG_ASSERT(FALSE);
-+        /* not in use.. */
-+        return;
-+    }
-+
-+    LOCK_HTC_TX(target);
-+
-+    if (Active) {
-+        if (!(pEndpoint->CreditDist.DistFlags & HTC_EP_ACTIVE)) {
-+                /* mark active now */
-+            pEndpoint->CreditDist.DistFlags |= HTC_EP_ACTIVE;
-+            doDist = TRUE;
-+        }
-+    } else {
-+        if (pEndpoint->CreditDist.DistFlags & HTC_EP_ACTIVE) {
-+                /* mark inactive now */
-+            pEndpoint->CreditDist.DistFlags &= ~HTC_EP_ACTIVE;
-+            doDist = TRUE;
-+        }
-+    }
-+
-+    if (doDist) {
-+        /* do distribution again based on activity change
-+         * note, this is done with the lock held */
-+        DO_DISTRIBUTION(target,
-+                        HTC_CREDIT_DIST_ACTIVITY_CHANGE,
-+                        "Activity Change",
-+                        target->EpCreditDistributionListHead->pNext);
-+    }
-+
-+    UNLOCK_HTC_TX(target);
-+
-+}
-diff --git a/drivers/sdio/function/wlan/ar6000/htc/htc_services.c b/drivers/sdio/function/wlan/ar6000/htc/htc_services.c
-new file mode 100644
-index 0000000..e5d50d1
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/htc/htc_services.c
-@@ -0,0 +1,403 @@
-+/*
-+ *
-+ * Copyright (c) 2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "htc_internal.h"
-+
-+void HTCControlTxComplete(void *Context, HTC_PACKET *pPacket)
-+{
-+        /* not implemented
-+         * we do not send control TX frames during normal runtime, only during setup  */
-+    AR_DEBUG_ASSERT(FALSE);
-+}
-+
-+    /* callback when a control message arrives on this endpoint */
-+void HTCControlRecv(void *Context, HTC_PACKET *pPacket)
-+{
-+    AR_DEBUG_ASSERT(pPacket->Endpoint == ENDPOINT_0);
-+
-+        /* the only control messages we are expecting are NULL messages (credit resports), which should
-+         * never get here */
-+    AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                    ("HTCControlRecv, got message with length:%d \n",
-+                    pPacket->ActualLength + HTC_HDR_LENGTH));
-+
-+        /* dump header and message */
-+    DebugDumpBytes(pPacket->pBuffer - HTC_HDR_LENGTH,
-+                   pPacket->ActualLength + HTC_HDR_LENGTH,
-+                   "Unexpected ENDPOINT 0 Message");
-+
-+    HTC_RECYCLE_RX_PKT((HTC_TARGET*)Context,pPacket);
-+}
-+
-+A_STATUS HTCSendSetupComplete(HTC_TARGET *target)
-+{
-+    HTC_PACKET             *pSendPacket = NULL;
-+    A_STATUS                status;
-+    HTC_SETUP_COMPLETE_MSG *pSetupComplete;
-+
-+    do {
-+           /* allocate a packet to send to the target */
-+        pSendPacket = HTC_ALLOC_CONTROL_TX(target);
-+
-+        if (NULL == pSendPacket) {
-+            status = A_NO_MEMORY;
-+            break;
-+        }
-+
-+            /* assemble setup complete message */
-+        pSetupComplete = (HTC_SETUP_COMPLETE_MSG *)pSendPacket->pBuffer;
-+        A_MEMZERO(pSetupComplete,sizeof(HTC_SETUP_COMPLETE_MSG));
-+        pSetupComplete->MessageID = HTC_MSG_SETUP_COMPLETE_ID;
-+
-+        SET_HTC_PACKET_INFO_TX(pSendPacket,
-+                               NULL,
-+                               (A_UINT8 *)pSetupComplete,
-+                               sizeof(HTC_SETUP_COMPLETE_MSG),
-+                               ENDPOINT_0,
-+                               HTC_SERVICE_TX_PACKET_TAG);
-+
-+            /* we want synchronous operation */
-+        pSendPacket->Completion = NULL;
-+            /* send the message */
-+        status = HTCIssueSend(target,pSendPacket,0);
-+
-+    } while (FALSE);
-+
-+    if (pSendPacket != NULL) {
-+        HTC_FREE_CONTROL_TX(target,pSendPacket);
-+    }
-+
-+    return status;
-+}
-+
-+
-+A_STATUS HTCConnectService(HTC_HANDLE               HTCHandle,
-+                           HTC_SERVICE_CONNECT_REQ  *pConnectReq,
-+                           HTC_SERVICE_CONNECT_RESP *pConnectResp)
-+{
-+    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+    A_STATUS                            status = A_OK;
-+    HTC_PACKET                          *pRecvPacket = NULL;
-+    HTC_PACKET                          *pSendPacket = NULL;
-+    HTC_CONNECT_SERVICE_RESPONSE_MSG    *pResponseMsg;
-+    HTC_CONNECT_SERVICE_MSG             *pConnectMsg;
-+    HTC_ENDPOINT_ID                     assignedEndpoint = ENDPOINT_MAX;
-+    HTC_ENDPOINT                        *pEndpoint;
-+    int                                 maxMsgSize = 0;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("+HTCConnectService, target:0x%X SvcID:0x%X \n",
-+               (A_UINT32)target, pConnectReq->ServiceID));
-+
-+    do {
-+
-+        AR_DEBUG_ASSERT(pConnectReq->ServiceID != 0);
-+
-+        if (HTC_CTRL_RSVD_SVC == pConnectReq->ServiceID) {
-+                /* special case for pseudo control service */
-+            assignedEndpoint = ENDPOINT_0;
-+            maxMsgSize = HTC_MAX_CONTROL_MESSAGE_LENGTH;
-+        } else {
-+                /* allocate a packet to send to the target */
-+            pSendPacket = HTC_ALLOC_CONTROL_TX(target);
-+
-+            if (NULL == pSendPacket) {
-+                AR_DEBUG_ASSERT(FALSE);
-+                status = A_NO_MEMORY;
-+                break;
-+            }
-+                /* assemble connect service message */
-+            pConnectMsg = (HTC_CONNECT_SERVICE_MSG *)pSendPacket->pBuffer;
-+            AR_DEBUG_ASSERT(pConnectMsg != NULL);
-+            A_MEMZERO(pConnectMsg,sizeof(HTC_CONNECT_SERVICE_MSG));
-+            pConnectMsg->MessageID = HTC_MSG_CONNECT_SERVICE_ID;
-+            pConnectMsg->ServiceID = pConnectReq->ServiceID;
-+            pConnectMsg->ConnectionFlags = pConnectReq->ConnectionFlags;
-+                /* check caller if it wants to transfer meta data */
-+            if ((pConnectReq->pMetaData != NULL) &&
-+                (pConnectReq->MetaDataLength <= HTC_SERVICE_META_DATA_MAX_LENGTH)) {
-+                    /* copy meta data into message buffer (after header ) */
-+                A_MEMCPY((A_UINT8 *)pConnectMsg + sizeof(HTC_CONNECT_SERVICE_MSG),
-+                         pConnectReq->pMetaData,
-+                         pConnectReq->MetaDataLength);
-+                pConnectMsg->ServiceMetaLength = pConnectReq->MetaDataLength;
-+            }
-+
-+            SET_HTC_PACKET_INFO_TX(pSendPacket,
-+                                   NULL,
-+                                   (A_UINT8 *)pConnectMsg,
-+                                   sizeof(HTC_CONNECT_SERVICE_MSG) + pConnectMsg->ServiceMetaLength,
-+                                   ENDPOINT_0,
-+                                   HTC_SERVICE_TX_PACKET_TAG);
-+
-+                /* we want synchronous operation */
-+            pSendPacket->Completion = NULL;
-+
-+            status = HTCIssueSend(target,pSendPacket,0);
-+
-+            if (A_FAILED(status)) {
-+                break;
-+            }
-+
-+                /* wait for response */
-+            status = HTCWaitforControlMessage(target, &pRecvPacket);
-+
-+            if (A_FAILED(status)) {
-+                break;
-+            }
-+                /* we controlled the buffer creation so it has to be properly aligned */
-+            pResponseMsg = (HTC_CONNECT_SERVICE_RESPONSE_MSG *)pRecvPacket->pBuffer;
-+
-+            if ((pResponseMsg->MessageID != HTC_MSG_CONNECT_SERVICE_RESPONSE_ID) ||
-+                (pRecvPacket->ActualLength < sizeof(HTC_CONNECT_SERVICE_RESPONSE_MSG))) {
-+                    /* this message is not valid */
-+                AR_DEBUG_ASSERT(FALSE);
-+                status = A_EPROTO;
-+                break;
-+            }
-+
-+            pConnectResp->ConnectRespCode = pResponseMsg->Status;
-+                /* check response status */
-+            if (pResponseMsg->Status != HTC_SERVICE_SUCCESS) {
-+                AR_DEBUG_PRINTF(ATH_DEBUG_ERR,
-+                    (" Target failed service 0x%X connect request (status:%d)\n",
-+                                pResponseMsg->ServiceID, pResponseMsg->Status));
-+                status = A_EPROTO;
-+                break;
-+            }
-+
-+            assignedEndpoint = pResponseMsg->EndpointID;
-+            maxMsgSize = pResponseMsg->MaxMsgSize;
-+
-+            if ((pConnectResp->pMetaData != NULL) &&
-+                (pResponseMsg->ServiceMetaLength > 0) &&
-+                (pResponseMsg->ServiceMetaLength <= HTC_SERVICE_META_DATA_MAX_LENGTH)) {
-+                    /* caller supplied a buffer and the target responded with data */
-+                int copyLength = min((int)pConnectResp->BufferLength, (int)pResponseMsg->ServiceMetaLength);
-+                    /* copy the meta data */
-+                A_MEMCPY(pConnectResp->pMetaData,
-+                         ((A_UINT8 *)pResponseMsg) + sizeof(HTC_CONNECT_SERVICE_RESPONSE_MSG),
-+                         copyLength);
-+                pConnectResp->ActualLength = copyLength;
-+            }
-+
-+        }
-+
-+            /* the rest of these are parameter checks so set the error status */
-+        status = A_EPROTO;
-+
-+        if (assignedEndpoint >= ENDPOINT_MAX) {
-+            AR_DEBUG_ASSERT(FALSE);
-+            break;
-+        }
-+
-+        if (0 == maxMsgSize) {
-+            AR_DEBUG_ASSERT(FALSE);
-+            break;
-+        }
-+
-+        pEndpoint = &target->EndPoint[assignedEndpoint];
-+
-+        if (pEndpoint->ServiceID != 0) {
-+            /* endpoint already in use! */
-+            AR_DEBUG_ASSERT(FALSE);
-+            break;
-+        }
-+
-+            /* return assigned endpoint to caller */
-+        pConnectResp->Endpoint = assignedEndpoint;
-+        pConnectResp->MaxMsgLength = maxMsgSize;
-+
-+            /* setup the endpoint */
-+        pEndpoint->ServiceID = pConnectReq->ServiceID; /* this marks the endpoint in use */
-+        pEndpoint->MaxTxQueueDepth = pConnectReq->MaxSendQueueDepth;
-+        pEndpoint->MaxMsgLength = maxMsgSize;
-+            /* copy all the callbacks */
-+        pEndpoint->EpCallBacks = pConnectReq->EpCallbacks;
-+        INIT_HTC_PACKET_QUEUE(&pEndpoint->RxBuffers);
-+        INIT_HTC_PACKET_QUEUE(&pEndpoint->TxQueue);
-+            /* set the credit distribution info for this endpoint, this information is
-+             * passed back to the credit distribution callback function */
-+        pEndpoint->CreditDist.ServiceID = pConnectReq->ServiceID;
-+        pEndpoint->CreditDist.pHTCReserved = pEndpoint;
-+        pEndpoint->CreditDist.Endpoint = assignedEndpoint;
-+        pEndpoint->CreditDist.TxCreditSize = target->TargetCreditSize;
-+        pEndpoint->CreditDist.TxCreditsPerMaxMsg = maxMsgSize / target->TargetCreditSize;
-+
-+        if (0 == pEndpoint->CreditDist.TxCreditsPerMaxMsg) {
-+            pEndpoint->CreditDist.TxCreditsPerMaxMsg = 1;
-+        }
-+
-+        status = A_OK;
-+
-+    } while (FALSE);
-+
-+    if (pSendPacket != NULL) {
-+        HTC_FREE_CONTROL_TX(target,pSendPacket);
-+    }
-+
-+    if (pRecvPacket != NULL) {
-+        HTC_FREE_CONTROL_RX(target,pRecvPacket);
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_TRC, ("-HTCConnectService \n"));
-+
-+    return status;
-+}
-+
-+static void AddToEndpointDistList(HTC_TARGET *target, HTC_ENDPOINT_CREDIT_DIST *pEpDist)
-+{
-+    HTC_ENDPOINT_CREDIT_DIST *pCurEntry,*pLastEntry;
-+
-+    if (NULL == target->EpCreditDistributionListHead) {
-+        target->EpCreditDistributionListHead = pEpDist;
-+        pEpDist->pNext = NULL;
-+        pEpDist->pPrev = NULL;
-+        return;
-+    }
-+
-+        /* queue to the end of the list, this does not have to be very
-+         * fast since this list is built at startup time */
-+    pCurEntry = target->EpCreditDistributionListHead;
-+
-+    while (pCurEntry) {
-+        pLastEntry = pCurEntry;
-+        pCurEntry = pCurEntry->pNext;
-+    }
-+
-+    pLastEntry->pNext = pEpDist;
-+    pEpDist->pPrev = pLastEntry;
-+    pEpDist->pNext = NULL;
-+}
-+
-+
-+
-+/* default credit init callback */
-+static void HTCDefaultCreditInit(void                     *Context,
-+                                 HTC_ENDPOINT_CREDIT_DIST *pEPList,
-+                                 int                      TotalCredits)
-+{
-+    HTC_ENDPOINT_CREDIT_DIST *pCurEpDist;
-+    int                      totalEps = 0;
-+    int                      creditsPerEndpoint;
-+
-+    pCurEpDist = pEPList;
-+        /* first run through the list and figure out how many endpoints we are dealing with */
-+    while (pCurEpDist != NULL) {
-+        pCurEpDist = pCurEpDist->pNext;
-+        totalEps++;
-+    }
-+
-+        /* even distribution */
-+    creditsPerEndpoint = TotalCredits/totalEps;
-+
-+    pCurEpDist = pEPList;
-+        /* run through the list and set minimum and normal credits and
-+         * provide the endpoint with some credits to start */
-+    while (pCurEpDist != NULL) {
-+
-+        if (creditsPerEndpoint < pCurEpDist->TxCreditsPerMaxMsg) {
-+                /* too many endpoints and not enough credits */
-+            AR_DEBUG_ASSERT(FALSE);
-+            break;
-+        }
-+            /* our minimum is set for at least 1 max message */
-+        pCurEpDist->TxCreditsMin = pCurEpDist->TxCreditsPerMaxMsg;
-+            /* this value is ignored by our credit alg, since we do
-+             * not dynamically adjust credits, this is the policy of
-+             * the "default" credit distribution, something simple and easy */
-+        pCurEpDist->TxCreditsNorm = 0xFFFF;
-+            /* give the endpoint minimum credits */
-+        pCurEpDist->TxCredits = creditsPerEndpoint;
-+        pCurEpDist->TxCreditsAssigned = creditsPerEndpoint;
-+        pCurEpDist = pCurEpDist->pNext;
-+    }
-+
-+}
-+
-+/* default credit distribution callback, NOTE, this callback holds the TX lock */
-+void HTCDefaultCreditDist(void                     *Context,
-+                          HTC_ENDPOINT_CREDIT_DIST *pEPDistList,
-+                          HTC_CREDIT_DIST_REASON   Reason)
-+{
-+    HTC_ENDPOINT_CREDIT_DIST *pCurEpDist;
-+
-+    if (Reason == HTC_CREDIT_DIST_SEND_COMPLETE) {
-+        pCurEpDist = pEPDistList;
-+            /* simple distribution */
-+        while (pCurEpDist != NULL) {
-+            if (pCurEpDist->TxCreditsToDist > 0) {
-+                    /* just give the endpoint back the credits */
-+                pCurEpDist->TxCredits += pCurEpDist->TxCreditsToDist;
-+                pCurEpDist->TxCreditsToDist = 0;
-+            }
-+            pCurEpDist = pCurEpDist->pNext;
-+        }
-+    }
-+
-+    /* note we do not need to handle the other reason codes as this is a very
-+     * simple distribution scheme, no need to seek for more credits or handle inactivity */
-+}
-+
-+void HTCSetCreditDistribution(HTC_HANDLE               HTCHandle,
-+                              void                     *pCreditDistContext,
-+                              HTC_CREDIT_DIST_CALLBACK CreditDistFunc,
-+                              HTC_CREDIT_INIT_CALLBACK CreditInitFunc,
-+                              HTC_SERVICE_ID           ServicePriorityOrder[],
-+                              int                      ListLength)
-+{
-+    HTC_TARGET *target = GET_HTC_TARGET_FROM_HANDLE(HTCHandle);
-+    int i;
-+    int ep;
-+
-+    if (CreditInitFunc != NULL) {
-+            /* caller has supplied their own distribution functions */
-+        target->InitCredits = CreditInitFunc;
-+        AR_DEBUG_ASSERT(CreditDistFunc != NULL);
-+        target->DistributeCredits = CreditDistFunc;
-+        target->pCredDistContext = pCreditDistContext;
-+    } else {
-+        /* caller wants HTC to do distribution */
-+        /* if caller wants service to handle distributions then
-+         * it must set both of these to NULL! */
-+        AR_DEBUG_ASSERT(CreditDistFunc == NULL);
-+        target->InitCredits = HTCDefaultCreditInit;
-+        target->DistributeCredits = HTCDefaultCreditDist;
-+        target->pCredDistContext = target;
-+    }
-+
-+        /* always add HTC control endpoint first, we only expose the list after the
-+         * first one, this is added for TX queue checking */
-+    AddToEndpointDistList(target, &target->EndPoint[ENDPOINT_0].CreditDist);
-+
-+        /* build the list of credit distribution structures in priority order
-+         * supplied by the caller, these will follow endpoint 0 */
-+    for (i = 0; i < ListLength; i++) {
-+            /* match services with endpoints and add the endpoints to the distribution list
-+             * in FIFO order */
-+        for (ep = ENDPOINT_1; ep < ENDPOINT_MAX; ep++) {
-+            if (target->EndPoint[ep].ServiceID == ServicePriorityOrder[i]) {
-+                    /* queue this one to the list */
-+                AddToEndpointDistList(target, &target->EndPoint[ep].CreditDist);
-+                break;
-+            }
-+        }
-+        AR_DEBUG_ASSERT(ep < ENDPOINT_MAX);
-+    }
-+
-+}
-diff --git a/drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h b/drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h
-new file mode 100644
-index 0000000..c1bcade
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h
-@@ -0,0 +1,100 @@
-+/*
-+ * Copyright (c) 2006 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ */
-+
-+#ifndef __AR6000_REGDUMP_H__
-+#define __AR6000_REGDUMP_H__
-+
-+#if !defined(__ASSEMBLER__)
-+/*
-+ * Target CPU state at the time of failure is reflected
-+ * in a register dump, which the Host can fetch through
-+ * the diagnostic window.
-+ */
-+
-+struct MIPS_exception_frame_s {
-+    A_UINT32 pc;        /* Program Counter */
-+    A_UINT32 at;        /* MIPS General Purpose registers */
-+    A_UINT32 v0;
-+    A_UINT32 v1;
-+    A_UINT32 a0;
-+    A_UINT32 a1;
-+    A_UINT32 a2;
-+    A_UINT32 a3;
-+    A_UINT32 t0;
-+    A_UINT32 t1;
-+    A_UINT32 t2;
-+    A_UINT32 t3;
-+    A_UINT32 t4;
-+    A_UINT32 t5;
-+    A_UINT32 t6;
-+    A_UINT32 t7;
-+    A_UINT32 s0;
-+    A_UINT32 s1;
-+    A_UINT32 s2;
-+    A_UINT32 s3;
-+    A_UINT32 s4;
-+    A_UINT32 s5;
-+    A_UINT32 s6;
-+    A_UINT32 s7;
-+    A_UINT32 t8;
-+    A_UINT32 t9;
-+    A_UINT32 k0;
-+    A_UINT32 k1;
-+    A_UINT32 gp;
-+    A_UINT32 sp;
-+    A_UINT32 s8;
-+    A_UINT32 ra;
-+    A_UINT32 cause; /* Selected coprocessor regs */
-+    A_UINT32 status;
-+};
-+typedef struct MIPS_exception_frame_s CPU_exception_frame_t;
-+
-+#endif
-+
-+/*
-+ * Offsets into MIPS_exception_frame structure, for use in assembler code
-+ * MUST MATCH C STRUCTURE ABOVE
-+ */
-+#define RD_pc           0
-+#define RD_at           1
-+#define RD_v0           2
-+#define RD_v1           3
-+#define RD_a0           4
-+#define RD_a1           5
-+#define RD_a2           6
-+#define RD_a3           7
-+#define RD_t0           8
-+#define RD_t1           9
-+#define RD_t2           10
-+#define RD_t3           11
-+#define RD_t4           12
-+#define RD_t5           13
-+#define RD_t6           14
-+#define RD_t7           15
-+#define RD_s0           16
-+#define RD_s1           17
-+#define RD_s2           18
-+#define RD_s3           19
-+#define RD_s4           20
-+#define RD_s5           21
-+#define RD_s6           22
-+#define RD_s7           23
-+#define RD_t8           24
-+#define RD_t9           25
-+#define RD_k0           26
-+#define RD_k1           27
-+#define RD_gp           28
-+#define RD_sp           29
-+#define RD_s8           30
-+#define RD_ra           31
-+#define RD_cause        32
-+#define RD_status       33
-+
-+#define RD_SIZE         (34*4) /* Space for this number of words */
-+
-+#endif /* __AR6000_REGDUMP_H__ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h b/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h
-new file mode 100644
-index 0000000..d5b2a20
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h
-@@ -0,0 +1,36 @@
-+#define __VER_MAJOR_ 2
-+#define __VER_MINOR_ 0
-+#define __VER_PATCH_ 0
-+
-+
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ * The makear6ksdk script (used for release builds) modifies the following line.
-+ */
-+#define __BUILD_NUMBER_ 18
-+
-+
-+/* Format of the version number. */
-+#define VER_MAJOR_BIT_OFFSET          28
-+#define VER_MINOR_BIT_OFFSET          24
-+#define VER_PATCH_BIT_OFFSET          16
-+#define VER_BUILD_NUM_BIT_OFFSET      0
-+
-+
-+/*
-+ * The version has the following format:
-+ * Bits 28-31: Major version
-+ * Bits 24-27: Minor version
-+ * Bits 16-23: Patch version
-+ * Bits 0-15:  Build number (automatically generated during build process )
-+ * E.g. Build 1.1.3.7 would be represented as 0x11030007.
-+ *
-+ * DO NOT split the following macro into multiple lines as this may confuse the build scripts.
-+ */
-+#define AR6K_SW_VERSION       ( ( __VER_MAJOR_ << VER_MAJOR_BIT_OFFSET ) + ( __VER_MINOR_ << VER_MINOR_BIT_OFFSET ) + ( __VER_PATCH_ << VER_PATCH_BIT_OFFSET ) + ( __BUILD_NUMBER_ << VER_BUILD_NUM_BIT_OFFSET ) )
-+
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW b/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW
-new file mode 100644
-index 0000000..d5b2a20
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW
-@@ -0,0 +1,36 @@
-+#define __VER_MAJOR_ 2
-+#define __VER_MINOR_ 0
-+#define __VER_PATCH_ 0
-+
-+
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ * The makear6ksdk script (used for release builds) modifies the following line.
-+ */
-+#define __BUILD_NUMBER_ 18
-+
-+
-+/* Format of the version number. */
-+#define VER_MAJOR_BIT_OFFSET          28
-+#define VER_MINOR_BIT_OFFSET          24
-+#define VER_PATCH_BIT_OFFSET          16
-+#define VER_BUILD_NUM_BIT_OFFSET      0
-+
-+
-+/*
-+ * The version has the following format:
-+ * Bits 28-31: Major version
-+ * Bits 24-27: Minor version
-+ * Bits 16-23: Patch version
-+ * Bits 0-15:  Build number (automatically generated during build process )
-+ * E.g. Build 1.1.3.7 would be represented as 0x11030007.
-+ *
-+ * DO NOT split the following macro into multiple lines as this may confuse the build scripts.
-+ */
-+#define AR6K_SW_VERSION       ( ( __VER_MAJOR_ << VER_MAJOR_BIT_OFFSET ) + ( __VER_MINOR_ << VER_MINOR_BIT_OFFSET ) + ( __VER_PATCH_ << VER_PATCH_BIT_OFFSET ) + ( __BUILD_NUMBER_ << VER_BUILD_NUM_BIT_OFFSET ) )
-+
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h b/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h
-new file mode 100644
-index 0000000..ecfdf20
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h
-@@ -0,0 +1,147 @@
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ * This file contains the definitions for AR6001 registers
-+ * that may be directly manipulated by Host software.
-+ */
-+
-+#ifndef __AR6KHWREG_H__
-+#define __AR6KHWREG_H__
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/* Host registers */
-+#define HOST_INT_STATUS_ADDRESS                  0x00000400
-+#define CPU_INT_STATUS_ADDRESS                   0x00000401
-+#define ERROR_INT_STATUS_ADDRESS                 0x00000402
-+#define INT_STATUS_ENABLE_ADDRESS                0x00000418
-+#define CPU_INT_STATUS_ENABLE_ADDRESS            0x00000419
-+#define COUNT_ADDRESS                            0x00000420
-+#define COUNT_DEC_ADDRESS                        0x00000440
-+#define WINDOW_DATA_ADDRESS                      0x00000474
-+#define WINDOW_WRITE_ADDR_ADDRESS                0x00000478
-+#define WINDOW_READ_ADDR_ADDRESS                 0x0000047c
-+
-+/* Target addresses */
-+#define RESET_CONTROL_ADDRESS                    0x0c000000
-+#define MC_REMAP_VALID_ADDRESS                   0x0c004080
-+#define MC_REMAP_SIZE_ADDRESS                    0x0c004100
-+#define MC_REMAP_COMPARE_ADDRESS                 0x0c004180
-+#define MC_REMAP_TARGET_ADDRESS                  0x0c004200
-+#define LOCAL_COUNT_ADDRESS                      0x0c014080
-+#define LOCAL_SCRATCH_ADDRESS                    0x0c0140c0
-+
-+
-+#define INT_STATUS_ENABLE_ERROR_MSB              7
-+#define INT_STATUS_ENABLE_ERROR_LSB              7
-+#define INT_STATUS_ENABLE_ERROR_MASK             0x00000080
-+#define INT_STATUS_ENABLE_ERROR_GET(x)           (((x) & INT_STATUS_ENABLE_ERROR_MASK) >> INT_STATUS_ENABLE_ERROR_LSB)
-+#define INT_STATUS_ENABLE_ERROR_SET(x)           (((x) << INT_STATUS_ENABLE_ERROR_LSB) & INT_STATUS_ENABLE_ERROR_MASK)
-+
-+#define INT_STATUS_ENABLE_CPU_MSB                6
-+#define INT_STATUS_ENABLE_CPU_LSB                6
-+#define INT_STATUS_ENABLE_CPU_MASK               0x00000040
-+#define INT_STATUS_ENABLE_CPU_GET(x)             (((x) & INT_STATUS_ENABLE_CPU_MASK) >> INT_STATUS_ENABLE_CPU_LSB)
-+#define INT_STATUS_ENABLE_CPU_SET(x)             (((x) << INT_STATUS_ENABLE_CPU_LSB) & INT_STATUS_ENABLE_CPU_MASK)
-+
-+#define INT_STATUS_ENABLE_COUNTER_MSB            4
-+#define INT_STATUS_ENABLE_COUNTER_LSB            4
-+#define INT_STATUS_ENABLE_COUNTER_MASK           0x00000010
-+#define INT_STATUS_ENABLE_COUNTER_GET(x)         (((x) & INT_STATUS_ENABLE_COUNTER_MASK) >> INT_STATUS_ENABLE_COUNTER_LSB)
-+#define INT_STATUS_ENABLE_COUNTER_SET(x)         (((x) << INT_STATUS_ENABLE_COUNTER_LSB) & INT_STATUS_ENABLE_COUNTER_MASK)
-+
-+#define INT_STATUS_ENABLE_MBOX_DATA_MSB          3
-+#define INT_STATUS_ENABLE_MBOX_DATA_LSB          0
-+#define INT_STATUS_ENABLE_MBOX_DATA_MASK         0x0000000f
-+#define INT_STATUS_ENABLE_MBOX_DATA_GET(x)       (((x) & INT_STATUS_ENABLE_MBOX_DATA_MASK) >> INT_STATUS_ENABLE_MBOX_DATA_LSB)
-+#define INT_STATUS_ENABLE_MBOX_DATA_SET(x)       (((x) << INT_STATUS_ENABLE_MBOX_DATA_LSB) & INT_STATUS_ENABLE_MBOX_DATA_MASK)
-+
-+#define ERROR_STATUS_ENABLE_RX_UNDERFLOW_MSB     1
-+#define ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB     1
-+#define ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK    0x00000002
-+#define ERROR_STATUS_ENABLE_RX_UNDERFLOW_GET(x)  (((x) & ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK) >> ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB)
-+#define ERROR_STATUS_ENABLE_RX_UNDERFLOW_SET(x)  (((x) << ERROR_STATUS_ENABLE_RX_UNDERFLOW_LSB) & ERROR_STATUS_ENABLE_RX_UNDERFLOW_MASK)
-+
-+#define ERROR_STATUS_ENABLE_TX_OVERFLOW_MSB      0
-+#define ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB      0
-+#define ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK     0x00000001
-+#define ERROR_STATUS_ENABLE_TX_OVERFLOW_GET(x)   (((x) & ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK) >> ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB)
-+#define ERROR_STATUS_ENABLE_TX_OVERFLOW_SET(x)   (((x) << ERROR_STATUS_ENABLE_TX_OVERFLOW_LSB) & ERROR_STATUS_ENABLE_TX_OVERFLOW_MASK)
-+
-+
-+#define CPU_INT_STATUS_ENABLE_BIT_MSB            7
-+#define CPU_INT_STATUS_ENABLE_BIT_LSB            0
-+#define CPU_INT_STATUS_ENABLE_BIT_MASK           0x000000ff
-+#define CPU_INT_STATUS_ENABLE_BIT_GET(x)         (((x) & CPU_INT_STATUS_ENABLE_BIT_MASK) >> CPU_INT_STATUS_ENABLE_BIT_LSB)
-+#define CPU_INT_STATUS_ENABLE_BIT_SET(x)         (((x) << CPU_INT_STATUS_ENABLE_BIT_LSB) & CPU_INT_STATUS_ENABLE_BIT_MASK)
-+
-+#define COUNTER_INT_STATUS_ENABLE_BIT_MSB        7
-+#define COUNTER_INT_STATUS_ENABLE_BIT_LSB        0
-+#define COUNTER_INT_STATUS_ENABLE_BIT_MASK       0x000000ff
-+#define COUNTER_INT_STATUS_ENABLE_BIT_GET(x)     (((x) & COUNTER_INT_STATUS_ENABLE_BIT_MASK) >> COUNTER_INT_STATUS_ENABLE_BIT_LSB)
-+#define COUNTER_INT_STATUS_ENABLE_BIT_SET(x)     (((x) << COUNTER_INT_STATUS_ENABLE_BIT_LSB) & COUNTER_INT_STATUS_ENABLE_BIT_MASK)
-+
-+#define ERROR_INT_STATUS_WAKEUP_MSB              2
-+#define ERROR_INT_STATUS_WAKEUP_LSB              2
-+#define ERROR_INT_STATUS_WAKEUP_MASK             0x00000004
-+#define ERROR_INT_STATUS_WAKEUP_GET(x)           (((x) & ERROR_INT_STATUS_WAKEUP_MASK) >> ERROR_INT_STATUS_WAKEUP_LSB)
-+#define ERROR_INT_STATUS_WAKEUP_SET(x)           (((x) << ERROR_INT_STATUS_WAKEUP_LSB) & ERROR_INT_STATUS_WAKEUP_MASK)
-+
-+#define ERROR_INT_STATUS_RX_UNDERFLOW_MSB        1
-+#define ERROR_INT_STATUS_RX_UNDERFLOW_LSB        1
-+#define ERROR_INT_STATUS_RX_UNDERFLOW_MASK       0x00000002
-+#define ERROR_INT_STATUS_RX_UNDERFLOW_GET(x)     (((x) & ERROR_INT_STATUS_RX_UNDERFLOW_MASK) >> ERROR_INT_STATUS_RX_UNDERFLOW_LSB)
-+#define ERROR_INT_STATUS_RX_UNDERFLOW_SET(x)     (((x) << ERROR_INT_STATUS_RX_UNDERFLOW_LSB) & ERROR_INT_STATUS_RX_UNDERFLOW_MASK)
-+
-+#define ERROR_INT_STATUS_TX_OVERFLOW_MSB         0
-+#define ERROR_INT_STATUS_TX_OVERFLOW_LSB         0
-+#define ERROR_INT_STATUS_TX_OVERFLOW_MASK        0x00000001
-+#define ERROR_INT_STATUS_TX_OVERFLOW_GET(x)      (((x) & ERROR_INT_STATUS_TX_OVERFLOW_MASK) >> ERROR_INT_STATUS_TX_OVERFLOW_LSB)
-+#define ERROR_INT_STATUS_TX_OVERFLOW_SET(x)      (((x) << ERROR_INT_STATUS_TX_OVERFLOW_LSB) & ERROR_INT_STATUS_TX_OVERFLOW_MASK)
-+
-+#define HOST_INT_STATUS_ERROR_MSB                7
-+#define HOST_INT_STATUS_ERROR_LSB                7
-+#define HOST_INT_STATUS_ERROR_MASK               0x00000080
-+#define HOST_INT_STATUS_ERROR_GET(x)             (((x) & HOST_INT_STATUS_ERROR_MASK) >> HOST_INT_STATUS_ERROR_LSB)
-+#define HOST_INT_STATUS_ERROR_SET(x)             (((x) << HOST_INT_STATUS_ERROR_LSB) & HOST_INT_STATUS_ERROR_MASK)
-+
-+#define HOST_INT_STATUS_CPU_MSB                  6
-+#define HOST_INT_STATUS_CPU_LSB                  6
-+#define HOST_INT_STATUS_CPU_MASK                 0x00000040
-+#define HOST_INT_STATUS_CPU_GET(x)               (((x) & HOST_INT_STATUS_CPU_MASK) >> HOST_INT_STATUS_CPU_LSB)
-+#define HOST_INT_STATUS_CPU_SET(x)               (((x) << HOST_INT_STATUS_CPU_LSB) & HOST_INT_STATUS_CPU_MASK)
-+
-+#define HOST_INT_STATUS_COUNTER_MSB              4
-+#define HOST_INT_STATUS_COUNTER_LSB              4
-+#define HOST_INT_STATUS_COUNTER_MASK             0x00000010
-+#define HOST_INT_STATUS_COUNTER_GET(x)           (((x) & HOST_INT_STATUS_COUNTER_MASK) >> HOST_INT_STATUS_COUNTER_LSB)
-+#define HOST_INT_STATUS_COUNTER_SET(x)           (((x) << HOST_INT_STATUS_COUNTER_LSB) & HOST_INT_STATUS_COUNTER_MASK)
-+
-+#define RESET_CONTROL_WARM_RST_MSB               7
-+#define RESET_CONTROL_WARM_RST_LSB               7
-+#define RESET_CONTROL_WARM_RST_MASK              0x00000080
-+#define RESET_CONTROL_WARM_RST_GET(x)            (((x) & RESET_CONTROL_WARM_RST_MASK) >> RESET_CONTROL_WARM_RST_LSB)
-+#define RESET_CONTROL_WARM_RST_SET(x)            (((x) << RESET_CONTROL_WARM_RST_LSB) & RESET_CONTROL_WARM_RST_MASK)
-+
-+#define RESET_CONTROL_COLD_RST_MSB               8
-+#define RESET_CONTROL_COLD_RST_LSB               8
-+#define RESET_CONTROL_COLD_RST_MASK              0x00000100
-+#define RESET_CONTROL_COLD_RST_GET(x)            (((x) & RESET_CONTROL_COLD_RST_MASK) >> RESET_CONTROL_COLD_RST_LSB)
-+#define RESET_CONTROL_COLD_RST_SET(x)            (((x) << RESET_CONTROL_COLD_RST_LSB) & RESET_CONTROL_COLD_RST_MASK)
-+
-+#define RESET_CAUSE_LAST_MSB                     2
-+#define RESET_CAUSE_LAST_LSB                     0
-+#define RESET_CAUSE_LAST_MASK                    0x00000007
-+#define RESET_CAUSE_LAST_GET(x)                  (((x) & RESET_CAUSE_LAST_MASK) >> RESET_CAUSE_LAST_LSB)
-+#define RESET_CAUSE_LAST_SET(x)                  (((x) << RESET_CAUSE_LAST_LSB) & RESET_CAUSE_LAST_MASK)
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* __AR6KHWREG_H__ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/a_config.h b/drivers/sdio/function/wlan/ar6000/include/a_config.h
-new file mode 100644
-index 0000000..627b298
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/a_config.h
-@@ -0,0 +1,27 @@
-+#ifndef _A_CONFIG_H_
-+#define _A_CONFIG_H_
-+/*
-+ * Copyright (c) 2004-2005 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+/*
-+ * This file contains software configuration options that enables
-+ * specific software "features"
-+ */
-+#include "../ar6000/config_linux.h"
-+
-+#endif
-diff --git a/drivers/sdio/function/wlan/ar6000/include/a_debug.h b/drivers/sdio/function/wlan/ar6000/include/a_debug.h
-new file mode 100644
-index 0000000..4b0b351
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/a_debug.h
-@@ -0,0 +1,41 @@
-+#ifndef _A_DEBUG_H_
-+#define _A_DEBUG_H_
-+/*
-+ * Copyright (c) 2004-2006 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include <a_types.h>
-+#include <a_osapi.h>
-+
-+#define DBG_INFO              0x00000001
-+#define DBG_ERROR             0x00000002
-+#define DBG_WARNING           0x00000004
-+#define DBG_SDIO              0x00000008
-+#define DBG_HIF                       0x00000010
-+#define DBG_HTC                       0x00000020
-+#define DBG_WMI                       0x00000040
-+#define DBG_WMI2              0x00000080
-+#define DBG_DRIVER            0x00000100
-+
-+#define DBG_DEFAULTS  (DBG_ERROR|DBG_WARNING)
-+
-+#include "../ar6000/debug_linux.h"
-+
-+#endif
-diff --git a/drivers/sdio/function/wlan/ar6000/include/a_drv.h b/drivers/sdio/function/wlan/ar6000/include/a_drv.h
-new file mode 100644
-index 0000000..07e52d1
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/a_drv.h
-@@ -0,0 +1,28 @@
-+#ifndef _A_DRV_H_
-+#define _A_DRV_H_
-+/*
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/include/a_drv.h#1 $
-+ *
-+ * This file contains the definitions of the basic atheros data types.
-+ * It is used to map the data types in atheros files to a platform specific
-+ * type.
-+ *
-+ * Copyright 2003-2005 Atheros Communications, 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "../ar6000/athdrv_linux.h"
-+
-+#endif /* _ADRV_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/a_drv_api.h b/drivers/sdio/function/wlan/ar6000/include/a_drv_api.h
-new file mode 100644
-index 0000000..7531726
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/a_drv_api.h
-@@ -0,0 +1,185 @@
-+#ifndef _A_DRV_API_H_
-+#define _A_DRV_API_H_
-+/*
-+ * Copyright (c) 2004-2006 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/****************************************************************************/
-+/****************************************************************************/
-+/**                                                                        **/
-+/** WMI related hooks                                                      **/
-+/**                                                                        **/
-+/****************************************************************************/
-+/****************************************************************************/
-+
-+#include <ar6000_api.h>
-+
-+#define A_WMI_CHANNELLIST_RX(devt, numChan, chanList) \
-+      ar6000_channelList_rx((devt), (numChan), (chanList))
-+
-+#define A_WMI_SET_NUMDATAENDPTS(devt, num)    \
-+      ar6000_set_numdataendpts((devt), (num))
-+
-+#define A_WMI_CONTROL_TX(devt, osbuf, streamID)       \
-+      ar6000_control_tx((devt), (osbuf), (streamID))
-+
-+#define A_WMI_TARGETSTATS_EVENT(devt, pStats) \
-+      ar6000_targetStats_event((devt), (pStats))
-+
-+#define A_WMI_SCANCOMPLETE_EVENT(devt, status)        \
-+      ar6000_scanComplete_event((devt), (status))
-+
-+#ifdef CONFIG_HOST_DSET_SUPPORT
-+
-+#define A_WMI_DSET_DATA_REQ(devt, access_cookie, offset, length, targ_buf, targ_reply_fn, targ_reply_arg)     \
-+      ar6000_dset_data_req((devt), (access_cookie), (offset), (length), (targ_buf), (targ_reply_fn), (targ_reply_arg))
-+
-+#define A_WMI_DSET_CLOSE(devt, access_cookie) \
-+      ar6000_dset_close((devt), (access_cookie))
-+
-+#endif
-+
-+#define A_WMI_DSET_OPEN_REQ(devt, id, targ_handle, targ_reply_fn, targ_reply_arg) \
-+      ar6000_dset_open_req((devt), (id), (targ_handle), (targ_reply_fn), (targ_reply_arg))
-+
-+#define A_WMI_CONNECT_EVENT(devt, channel, bssid, listenInterval, beaconInterval, networkType, beaconIeLen, assocReqLen, assocRespLen, assocInfo) \
-+      ar6000_connect_event((devt), (channel), (bssid), (listenInterval), (beaconInterval), (networkType), (beaconIeLen), (assocReqLen), (assocRespLen), (assocInfo))
-+
-+#define A_WMI_REGDOMAIN_EVENT(devt, regCode)  \
-+      ar6000_regDomain_event((devt), (regCode))
-+
-+#define A_WMI_NEIGHBORREPORT_EVENT(devt, numAps, info)        \
-+      ar6000_neighborReport_event((devt), (numAps), (info))
-+
-+#define A_WMI_DISCONNECT_EVENT(devt, reason, bssid, assocRespLen, assocInfo, protocolReasonStatus)    \
-+      ar6000_disconnect_event((devt), (reason), (bssid), (assocRespLen), (assocInfo), (protocolReasonStatus))
-+
-+#define A_WMI_TKIP_MICERR_EVENT(devt, keyid, ismcast) \
-+      ar6000_tkip_micerr_event((devt), (keyid), (ismcast))
-+
-+#define A_WMI_BITRATE_RX(devt, rateKbps)      \
-+      ar6000_bitrate_rx((devt), (rateKbps))
-+
-+#define A_WMI_TXPWR_RX(devt, txPwr)   \
-+      ar6000_txPwr_rx((devt), (txPwr))
-+
-+#define A_WMI_READY_EVENT(devt, datap, phyCap)        \
-+      ar6000_ready_event((devt), (datap), (phyCap))
-+
-+#define A_WMI_DBGLOG_INIT_DONE(ar) \
-+        ar6000_dbglog_init_done(ar);
-+
-+#define A_WMI_RSSI_THRESHOLD_EVENT(devt, newThreshold, rssi)  \
-+      ar6000_rssiThreshold_event((devt), (newThreshold), (rssi))
-+
-+#define A_WMI_REPORT_ERROR_EVENT(devt, errorVal)      \
-+      ar6000_reportError_event((devt), (errorVal))
-+
-+#define A_WMI_ROAM_TABLE_EVENT(devt, pTbl) \
-+      ar6000_roam_tbl_event((devt), (pTbl))
-+
-+#define A_WMI_ROAM_DATA_EVENT(devt, p) \
-+      ar6000_roam_data_event((devt), (p))
-+
-+#define A_WMI_WOW_LIST_EVENT(devt, num_filters, wow_filters)  \
-+      ar6000_wow_list_event((devt), (num_filters), (wow_filters))
-+
-+#define A_WMI_CAC_EVENT(devt, ac, cac_indication, statusCode, tspecSuggestion)  \
-+      ar6000_cac_event((devt), (ac), (cac_indication), (statusCode), (tspecSuggestion))
-+
-+#define A_WMI_IPTOS_TO_USERPRIORITY(pkt)    \
-+      ar6000_iptos_to_userPriority((pkt))
-+
-+#define A_WMI_PMKID_LIST_EVENT(devt, num_pmkid, pmkid_list)   \
-+      ar6000_pmkid_list_event((devt), (num_pmkid), (pmkid_list))
-+
-+#ifdef CONFIG_HOST_GPIO_SUPPORT
-+
-+#define A_WMI_GPIO_INTR_RX(intr_mask, input_values) \
-+      ar6000_gpio_intr_rx((intr_mask), (input_values))
-+
-+#define A_WMI_GPIO_DATA_RX(reg_id, value) \
-+      ar6000_gpio_data_rx((reg_id), (value))
-+
-+#define A_WMI_GPIO_ACK_RX() \
-+      ar6000_gpio_ack_rx()
-+
-+#endif
-+
-+#ifdef SEND_EVENT_TO_APP
-+
-+#define A_WMI_SEND_EVENT_TO_APP(ar, eventId, datap, len) \
-+      ar6000_send_event_to_app((ar), (eventId), (datap), (len))
-+
-+#else
-+
-+#define A_WMI_SEND_EVENT_TO_APP(ar, eventId, datap, len)
-+
-+#endif
-+
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+#define A_WMI_TCMD_RX_REPORT_EVENT(devt, results, len) \
-+      ar6000_tcmd_rx_report_event((devt), (results), (len))
-+#endif
-+
-+#define A_WMI_HBCHALLENGERESP_EVENT(devt, cookie, source)    \
-+    ar6000_hbChallengeResp_event((devt), (cookie), (source))
-+
-+#define A_WMI_TX_RETRY_ERR_EVENT(devt) \
-+      ar6000_tx_retry_err_event((devt))
-+
-+#define A_WMI_SNR_THRESHOLD_EVENT_RX(devt, newThreshold, snr) \
-+      ar6000_snrThresholdEvent_rx((devt), (newThreshold), (snr))
-+
-+#define A_WMI_LQ_THRESHOLD_EVENT_RX(devt, range, lqVal) \
-+      ar6000_lqThresholdEvent_rx((devt), (range), (lqVal))
-+
-+#define A_WMI_RATEMASK_RX(devt, ratemask) \
-+      ar6000_ratemask_rx((devt), (ratemask))
-+
-+#define A_WMI_KEEPALIVE_RX(devt, configured)    \
-+        ar6000_keepalive_rx((devt), (configured))
-+
-+#define A_WMI_BSSINFO_EVENT_RX(ar, datp, len)   \
-+        ar6000_bssInfo_event_rx((ar), (datap), (len))
-+
-+#define A_WMI_DBGLOG_EVENT(ar, dropped, buffer, length) \
-+        ar6000_dbglog_event((ar), (dropped), (buffer), (length));
-+
-+#define A_WMI_STREAM_TX_ACTIVE(devt,trafficClass) \
-+    ar6000_indicate_tx_activity((devt),(trafficClass), TRUE)
-+
-+#define A_WMI_STREAM_TX_INACTIVE(devt,trafficClass) \
-+    ar6000_indicate_tx_activity((devt),(trafficClass), FALSE)
-+
-+/****************************************************************************/
-+/****************************************************************************/
-+/**                                                                        **/
-+/** HTC related hooks                                                      **/
-+/**                                                                        **/
-+/****************************************************************************/
-+/****************************************************************************/
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-diff --git a/drivers/sdio/function/wlan/ar6000/include/a_osapi.h b/drivers/sdio/function/wlan/ar6000/include/a_osapi.h
-new file mode 100644
-index 0000000..7d60867
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/a_osapi.h
-@@ -0,0 +1,28 @@
-+#ifndef _A_OSAPI_H_
-+#define _A_OSAPI_H_
-+/*
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/include/a_osapi.h#1 $
-+ *
-+ * This file contains the definitions of the basic atheros data types.
-+ * It is used to map the data types in atheros files to a platform specific
-+ * type.
-+ *
-+ * Copyright 2003-2005 Atheros Communications, 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "../ar6000/osapi_linux.h"
-+
-+#endif /* _OSAPI_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/a_types.h b/drivers/sdio/function/wlan/ar6000/include/a_types.h
-new file mode 100644
-index 0000000..e2ed090
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/a_types.h
-@@ -0,0 +1,28 @@
-+#ifndef _A_TYPES_H_
-+#define _A_TYPES_H_
-+/*
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/include/a_types.h#1 $
-+ *
-+ * This file contains the definitions of the basic atheros data types.
-+ * It is used to map the data types in atheros files to a platform specific
-+ * type.
-+ *
-+ * Copyright 2003-2005 Atheros Communications, 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "../ar6000/athtypes_linux.h"
-+
-+#endif /* _ATHTYPES_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h b/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h
-new file mode 100644
-index 0000000..abe5de7
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h
-@@ -0,0 +1,29 @@
-+#ifndef _AR6000_API_H_
-+#define _AR6000_API_H_
-+/*
-+ * Copyright (c) 2004-2005 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * This file contains the API to access the OS dependent atheros host driver
-+ * by the WMI or WLAN generic modules.
-+ *
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/include/ar6000_api.h#1 $
-+ *
-+ *
-+ *  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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "../ar6000/ar6xapi_linux.h"
-+
-+#endif /* _AR6000_API_H */
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h b/drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h
-new file mode 100644
-index 0000000..2df131d
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h
-@@ -0,0 +1,38 @@
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef AR6000_DIAG_H_
-+#define AR6000_DIAG_H_
-+
-+
-+A_STATUS
-+ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
-+
-+A_STATUS
-+ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
-+
-+A_STATUS
-+ar6000_ReadDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address,
-+                    A_UCHAR *data, A_UINT32 length);
-+
-+A_STATUS
-+ar6000_WriteDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address,
-+                     A_UCHAR *data, A_UINT32 length);
-+
-+#endif /*AR6000_DIAG_H_*/
-diff --git a/drivers/sdio/function/wlan/ar6000/include/athdefs.h b/drivers/sdio/function/wlan/ar6000/include/athdefs.h
-new file mode 100644
-index 0000000..c28c871
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/athdefs.h
-@@ -0,0 +1,85 @@
-+#ifndef __ATHDEFS_H__
-+#define __ATHDEFS_H__
-+
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ * This file contains definitions that may be used across both
-+ * Host and Target software.  Nothing here is module-dependent
-+ * or platform-dependent.
-+ */
-+
-+/*
-+ * Generic error codes that can be used by hw, sta, ap, sim, dk
-+ * and any other environments. Since these are enums, feel free to
-+ * add any more codes that you need.
-+ */
-+
-+typedef enum {
-+    A_ERROR = -1,               /* Generic error return */
-+    A_OK = 0,                   /* success */
-+                                /* Following values start at 1 */
-+    A_DEVICE_NOT_FOUND,         /* not able to find PCI device */
-+    A_NO_MEMORY,                /* not able to allocate memory, not available */
-+    A_MEMORY_NOT_AVAIL,         /* memory region is not free for mapping */
-+    A_NO_FREE_DESC,             /* no free descriptors available */
-+    A_BAD_ADDRESS,              /* address does not match descriptor */
-+    A_WIN_DRIVER_ERROR,         /* used in NT_HW version, if problem at init */
-+    A_REGS_NOT_MAPPED,          /* registers not correctly mapped */
-+    A_EPERM,                    /* Not superuser */
-+    A_EACCES,                   /* Access denied */
-+    A_ENOENT,                   /* No such entry, search failed, etc. */
-+    A_EEXIST,                   /* The object already exists (can't create) */
-+    A_EFAULT,                   /* Bad address fault */
-+    A_EBUSY,                    /* Object is busy */
-+    A_EINVAL,                   /* Invalid parameter */
-+    A_EMSGSIZE,                 /* Inappropriate message buffer length */
-+    A_ECANCELED,                /* Operation canceled */
-+    A_ENOTSUP,                  /* Operation not supported */
-+    A_ECOMM,                    /* Communication error on send */
-+    A_EPROTO,                   /* Protocol error */
-+    A_ENODEV,                   /* No such device */
-+    A_EDEVNOTUP,                /* device is not UP */
-+    A_NO_RESOURCE,              /* No resources for requested operation */
-+    A_HARDWARE,                 /* Hardware failure */
-+    A_PENDING,                  /* Asynchronous routine; will send up results la
-+ter (typically in callback) */
-+    A_EBADCHANNEL,              /* The channel cannot be used */
-+    A_DECRYPT_ERROR,            /* Decryption error */
-+    A_PHY_ERROR,                /* RX PHY error */
-+    A_CONSUMED                  /* Object was consumed */
-+} A_STATUS;
-+
-+#define A_SUCCESS(x)        (x == A_OK)
-+#define A_FAILED(x)         (!A_SUCCESS(x))
-+
-+#ifndef TRUE
-+#define TRUE 1
-+#endif
-+
-+#ifndef FALSE
-+#define FALSE 0
-+#endif
-+
-+/*
-+ * The following definition is WLAN specific definition
-+ */
-+typedef enum {
-+    MODE_11A = 0,   /* 11a Mode */
-+    MODE_11G = 1,   /* 11g + 11b Mode */
-+    MODE_11B = 2,   /* 11b Mode */
-+    MODE_11GONLY = 3, /* 11g only Mode */
-+    MODE_UNKNOWN = 4,
-+    MODE_MAX = 4
-+} WLAN_PHY_MODE;
-+
-+typedef enum {
-+    WLAN_11A_CAPABILITY   = 1,
-+    WLAN_11G_CAPABILITY   = 2,
-+    WLAN_11AG_CAPABILITY  = 3,
-+}WLAN_CAPABILITY;
-+
-+#endif /* __ATHDEFS_H__ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/athdrv.h b/drivers/sdio/function/wlan/ar6000/include/athdrv.h
-new file mode 100644
-index 0000000..19da97e
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/athdrv.h
-@@ -0,0 +1,32 @@
-+/*
-+ * Copyright (c) 2004-2006 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef _ATHDRV_H_
-+#define _ATHDRV_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _ATHDRV_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/athendpack.h b/drivers/sdio/function/wlan/ar6000/include/athendpack.h
-new file mode 100644
-index 0000000..42921ae
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/athendpack.h
-@@ -0,0 +1,41 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+ * @file: athendpack.h
-+ *
-+ * @abstract: end compiler-specific structure packing
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+#ifdef VXWORKS
-+#endif /* VXWORKS */
-+
-+#ifdef LINUX
-+#endif /* LINUX */
-+
-+#ifdef QNX
-+#endif /* QNX */
-+
-+#ifdef INTEGRITY
-+#include "integrity/athendpack_integrity.h"
-+#endif /* INTEGRITY */
-+
-+#ifdef NUCLEUS
-+#endif /* NUCLEUS */
-+
-+#ifdef UNDER_CE
-+#include "../os/wince/include/athendpack_wince.h"
-+#endif /* WINCE */
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/include/athstartpack.h b/drivers/sdio/function/wlan/ar6000/include/athstartpack.h
-new file mode 100644
-index 0000000..6632cc2
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/athstartpack.h
-@@ -0,0 +1,42 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+ * @file: athstartpack.h
-+ *
-+ * @abstract: start compiler-specific structure packing
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifdef VXWORKS
-+#endif /* VXWORKS */
-+
-+#ifdef LINUX
-+#endif /* LINUX */
-+
-+#ifdef QNX
-+#endif /* QNX */
-+
-+#ifdef INTEGRITY
-+#include "integrity/athstartpack_integrity.h"
-+#endif /* INTEGRITY */
-+
-+#ifdef NUCLEUS
-+#endif /* NUCLEUS */
-+
-+#ifdef UNDER_CE
-+#include "../os/wince/include/athstartpack_wince.h"
-+#endif /* WINCE */
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/include/bmi.h b/drivers/sdio/function/wlan/ar6000/include/bmi.h
-new file mode 100644
-index 0000000..2eb7134
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/bmi.h
-@@ -0,0 +1,100 @@
-+#ifndef _BMI_H_
-+#define _BMI_H_
-+/*
-+ * Copyright (c) 2004-2005 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ * BMI declarations and prototypes
-+ */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-+
-+/* Header files */
-+#include "a_config.h"
-+#include "athdefs.h"
-+#include "a_types.h"
-+#include "hif.h"
-+#include "a_osapi.h"
-+#include "bmi_msg.h"
-+
-+void
-+BMIInit(void);
-+
-+A_STATUS
-+BMIDone(HIF_DEVICE *device);
-+
-+A_STATUS
-+BMIGetTargetInfo(HIF_DEVICE *device, struct bmi_target_info *targ_info);
-+
-+A_STATUS
-+BMIReadMemory(HIF_DEVICE *device,
-+              A_UINT32 address,
-+              A_UCHAR *buffer,
-+              A_UINT32 length);
-+
-+A_STATUS
-+BMIWriteMemory(HIF_DEVICE *device,
-+               A_UINT32 address,
-+               A_UCHAR *buffer,
-+               A_UINT32 length);
-+
-+A_STATUS
-+BMIExecute(HIF_DEVICE *device,
-+           A_UINT32 address,
-+           A_UINT32 *param);
-+
-+A_STATUS
-+BMISetAppStart(HIF_DEVICE *device,
-+               A_UINT32 address);
-+
-+A_STATUS
-+BMIReadSOCRegister(HIF_DEVICE *device,
-+                   A_UINT32 address,
-+                   A_UINT32 *param);
-+
-+A_STATUS
-+BMIWriteSOCRegister(HIF_DEVICE *device,
-+                    A_UINT32 address,
-+                    A_UINT32 param);
-+
-+A_STATUS
-+BMIrompatchInstall(HIF_DEVICE *device,
-+                   A_UINT32 ROM_addr,
-+                   A_UINT32 RAM_addr,
-+                   A_UINT32 nbytes,
-+                   A_UINT32 do_activate,
-+                   A_UINT32 *patch_id);
-+
-+A_STATUS
-+BMIrompatchUninstall(HIF_DEVICE *device,
-+                     A_UINT32 rompatch_id);
-+
-+A_STATUS
-+BMIrompatchActivate(HIF_DEVICE *device,
-+                    A_UINT32 rompatch_count,
-+                    A_UINT32 *rompatch_list);
-+
-+A_STATUS
-+BMIrompatchDeactivate(HIF_DEVICE *device,
-+                      A_UINT32 rompatch_count,
-+                      A_UINT32 *rompatch_list);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _BMI_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/bmi_msg.h b/drivers/sdio/function/wlan/ar6000/include/bmi_msg.h
-new file mode 100644
-index 0000000..7c91ef4
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/bmi_msg.h
-@@ -0,0 +1,199 @@
-+#ifndef __BMI_MSG_H__
-+#define __BMI_MSG_H__
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+/*
-+ * Bootloader Messaging Interface (BMI)
-+ *
-+ * BMI is a very simple messaging interface used during initialization
-+ * to read memory, write memory, execute code, and to define an
-+ * application entry PC.
-+ *
-+ * It is used to download an application to AR6K, to provide
-+ * patches to code that is already resident on AR6K, and generally
-+ * to examine and modify state.  The Host has an opportunity to use
-+ * BMI only once during bootup.  Once the Host issues a BMI_DONE
-+ * command, this opportunity ends.
-+ *
-+ * The Host writes BMI requests to mailbox0, and reads BMI responses
-+ * from mailbox0.   BMI requests all begin with a command
-+ * (see below for specific commands), and are followed by
-+ * command-specific data.
-+ *
-+ * Flow control:
-+ * The Host can only issue a command once the Target gives it a
-+ * "BMI Command Credit", using AR6K Counter #4.  As soon as the
-+ * Target has completed a command, it issues another BMI Command
-+ * Credit (so the Host can issue the next command).
-+ *
-+ * BMI handles all required Target-side cache flushing.
-+ */
-+
-+
-+/* Maximum data size used for BMI transfers */
-+#define BMI_DATASZ_MAX                     32
-+
-+/* BMI Commands */
-+
-+#define BMI_NO_COMMAND                      0
-+
-+#define BMI_DONE                            1
-+        /*
-+         * Semantics: Host is done using BMI
-+         * Request format:
-+         *    A_UINT32      command (BMI_DONE)
-+         * Response format: none
-+         */
-+
-+#define BMI_READ_MEMORY                     2
-+        /*
-+         * Semantics: Host reads AR6K memory
-+         * Request format:
-+         *    A_UINT32      command (BMI_READ_MEMORY)
-+         *    A_UINT32      address
-+         *    A_UINT32      length, at most BMI_DATASZ_MAX
-+         * Response format:
-+         *    A_UINT8       data[length]
-+         */
-+
-+#define BMI_WRITE_MEMORY                    3
-+        /*
-+         * Semantics: Host writes AR6K memory
-+         * Request format:
-+         *    A_UINT32       command (BMI_WRITE_MEMORY)
-+         *    A_UINT32      address
-+         *    A_UINT32      length, at most BMI_DATASZ_MAX
-+         *    A_UINT8       data[length]
-+         * Response format: none
-+         */
-+
-+#define BMI_EXECUTE                         4
-+        /*
-+         * Semantics: Causes AR6K to execute code
-+         * Request format:
-+         *    A_UINT32      command (BMI_EXECUTE)
-+         *    A_UINT32      address
-+         *    A_UINT32      parameter
-+         * Response format:
-+         *    A_UINT32      return value
-+         */
-+
-+#define BMI_SET_APP_START                   5
-+        /*
-+         * Semantics: Set Target application starting address
-+         * Request format:
-+         *    A_UINT32      command (BMI_SET_APP_START)
-+         *    A_UINT32      address
-+         * Response format: none
-+         */
-+
-+#define BMI_READ_SOC_REGISTER               6
-+        /*
-+         * Semantics: Read a 32-bit Target SOC register.
-+         * Request format:
-+         *    A_UINT32      command (BMI_READ_REGISTER)
-+         *    A_UINT32      address
-+         * Response format:
-+         *    A_UINT32      value
-+         */
-+
-+#define BMI_WRITE_SOC_REGISTER              7
-+        /*
-+         * Semantics: Write a 32-bit Target SOC register.
-+         * Request format:
-+         *    A_UINT32      command (BMI_WRITE_REGISTER)
-+         *    A_UINT32      address
-+         *    A_UINT32      value
-+         *
-+         * Response format: none
-+         */
-+
-+#define BMI_GET_TARGET_ID                  8
-+#define BMI_GET_TARGET_INFO                8
-+        /*
-+         * Semantics: Fetch the 4-byte Target information
-+         * Request format:
-+         *    A_UINT32      command (BMI_GET_TARGET_ID/INFO)
-+         * Response format1 (old firmware):
-+         *    A_UINT32      TargetVersionID
-+         * Response format2 (newer firmware):
-+         *    A_UINT32      TARGET_VERSION_SENTINAL
-+         *    struct bmi_target_info;
-+         */
-+
-+struct bmi_target_info {
-+    A_UINT32 target_info_byte_count; /* size of this structure */
-+    A_UINT32 target_ver;             /* Target Version ID */
-+    A_UINT32 target_type;            /* Target type */
-+};
-+#define TARGET_VERSION_SENTINAL 0xffffffff
-+#define TARGET_TYPE_AR6001 1
-+#define TARGET_TYPE_AR6002 2
-+
-+
-+#define BMI_ROMPATCH_INSTALL               9
-+        /*
-+         * Semantics: Install a ROM Patch.
-+         * Request format:
-+         *    A_UINT32      command (BMI_ROMPATCH_INSTALL)
-+         *    A_UINT32      Target ROM Address
-+         *    A_UINT32      Target RAM Address
-+         *    A_UINT32      Size, in bytes
-+         *    A_UINT32      Activate? 1-->activate;
-+         *                            0-->install but do not activate
-+         * Response format:
-+         *    A_UINT32      PatchID
-+         */
-+
-+#define BMI_ROMPATCH_UNINSTALL             10
-+        /*
-+         * Semantics: Uninstall a previously-installed ROM Patch,
-+         * automatically deactivating, if necessary.
-+         * Request format:
-+         *    A_UINT32      command (BMI_ROMPATCH_UNINSTALL)
-+         *    A_UINT32      PatchID
-+         *
-+         * Response format: none
-+         */
-+
-+#define BMI_ROMPATCH_ACTIVATE              11
-+        /*
-+         * Semantics: Activate a list of previously-installed ROM Patches.
-+         * Request format:
-+         *    A_UINT32      command (BMI_ROMPATCH_ACTIVATE)
-+         *    A_UINT32      rompatch_count
-+         *    A_UINT32      PatchID[rompatch_count]
-+         *
-+         * Response format: none
-+         */
-+
-+#define BMI_ROMPATCH_DEACTIVATE            12
-+        /*
-+         * Semantics: Deactivate a list of active ROM Patches.
-+         * Request format:
-+         *    A_UINT32      command (BMI_ROMPATCH_DEACTIVATE)
-+         *    A_UINT32      rompatch_count
-+         *    A_UINT32      PatchID[rompatch_count]
-+         *
-+         * Response format: none
-+         */
-+
-+
-+#endif /* __BMI_MSG_H__ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/common_drv.h b/drivers/sdio/function/wlan/ar6000/include/common_drv.h
-new file mode 100644
-index 0000000..1bdc3da
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/common_drv.h
-@@ -0,0 +1,61 @@
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+
-+#ifndef COMMON_DRV_H_
-+#define COMMON_DRV_H_
-+
-+#include "hif.h"
-+#include "htc_packet.h"
-+
-+
-+
-+/* structure that is the state information for the default credit distribution callback
-+ * drivers should instantiate (zero-init as well) this structure in their driver instance
-+ * and pass it as a context to the HTC credit distribution functions */
-+typedef struct _COMMON_CREDIT_STATE_INFO {
-+    int TotalAvailableCredits;      /* total credits in the system at startup */
-+    int CurrentFreeCredits;         /* credits available in the pool that have not been
-+                                       given out to endpoints */
-+    HTC_ENDPOINT_CREDIT_DIST *pLowestPriEpDist;  /* pointer to the lowest priority endpoint dist struct */
-+} COMMON_CREDIT_STATE_INFO;
-+
-+
-+/* HTC TX packet tagging definitions */
-+#define AR6K_CONTROL_PKT_TAG    HTC_TX_PACKET_TAG_USER_DEFINED
-+#define AR6K_DATA_PKT_TAG       (AR6K_CONTROL_PKT_TAG + 1)
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/* OS-independent APIs */
-+A_STATUS ar6000_setup_credit_dist(HTC_HANDLE HTCHandle, COMMON_CREDIT_STATE_INFO *pCredInfo);
-+A_STATUS ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
-+A_STATUS ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data);
-+A_STATUS ar6000_ReadDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address,  A_UCHAR *data, A_UINT32 length);
-+A_STATUS ar6000_reset_device(HIF_DEVICE *hifDevice, A_UINT32 TargetType);
-+void ar6000_dump_target_assert_info(HIF_DEVICE *hifDevice, A_UINT32 TargetType);
-+A_STATUS ar6000_reset_device_skipflash(HIF_DEVICE *hifDevice);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /*COMMON_DRV_H_*/
-diff --git a/drivers/sdio/function/wlan/ar6000/include/dbglog.h b/drivers/sdio/function/wlan/ar6000/include/dbglog.h
-new file mode 100644
-index 0000000..3d1e528
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/dbglog.h
-@@ -0,0 +1,107 @@
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ * This file contains the definitions and data structures associated with
-+ * the log based debug mechanism.
-+ *
-+ */
-+
-+#ifndef _DBGLOG_H_
-+#define _DBGLOG_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#define DBGLOG_TIMESTAMP_OFFSET          0
-+#define DBGLOG_TIMESTAMP_MASK            0x0000FFFF /* Bit 0-15. Contains bit
-+                                                       8-23 of the LF0 timer */
-+#define DBGLOG_DBGID_OFFSET              16
-+#define DBGLOG_DBGID_MASK                0x03FF0000 /* Bit 16-25 */
-+#define DBGLOG_DBGID_NUM_MAX             256 /* Upper limit is width of mask */
-+
-+#define DBGLOG_MODULEID_OFFSET           26
-+#define DBGLOG_MODULEID_MASK             0x3C000000 /* Bit 26-29 */
-+#define DBGLOG_MODULEID_NUM_MAX          16 /* Upper limit is width of mask */
-+
-+/*
-+ * Please ensure that the definition of any new module intrduced is captured
-+ * between the DBGLOG_MODULEID_START and DBGLOG_MODULEID_END defines. The
-+ * structure is required for the parser to correctly pick up the values for
-+ * different modules.
-+ */
-+#define DBGLOG_MODULEID_START
-+#define DBGLOG_MODULEID_INF                   0
-+#define DBGLOG_MODULEID_WMI                   1
-+#define DBGLOG_MODULEID_CSERV                 2
-+#define DBGLOG_MODULEID_PM                    3
-+#define DBGLOG_MODULEID_TXRX_MGMTBUF          4
-+#define DBGLOG_MODULEID_TXRX_TXBUF            5
-+#define DBGLOG_MODULEID_TXRX_RXBUF            6
-+#define DBGLOG_MODULEID_WOW                   7
-+#define DBGLOG_MODULEID_WHAL                  8
-+#define DBGLOG_MODULEID_END
-+
-+#define DBGLOG_NUM_ARGS_OFFSET             30
-+#define DBGLOG_NUM_ARGS_MASK               0xC0000000 /* Bit 30-31 */
-+#define DBGLOG_NUM_ARGS_MAX                2 /* Upper limit is width of mask */
-+
-+#define DBGLOG_MODULE_LOG_ENABLE_OFFSET    0
-+#define DBGLOG_MODULE_LOG_ENABLE_MASK      0x0000FFFF
-+
-+#define DBGLOG_REPORTING_ENABLED_OFFSET    16
-+#define DBGLOG_REPORTING_ENABLED_MASK      0x00010000
-+
-+#define DBGLOG_TIMESTAMP_RESOLUTION_OFFSET 17
-+#define DBGLOG_TIMESTAMP_RESOLUTION_MASK   0x000E0000
-+
-+#define DBGLOG_REPORT_SIZE_OFFSET          20
-+#define DBGLOG_REPORT_SIZE_MASK            0x3FF00000
-+
-+#define DBGLOG_LOG_BUFFER_SIZE             1500
-+#define DBGLOG_DBGID_DEFINITION_LEN_MAX    64
-+
-+struct dbglog_buf_s {
-+    struct dbglog_buf_s *next;
-+    A_INT8              *buffer;
-+    A_UINT32             bufsize;
-+    A_UINT32             length;
-+    A_UINT32             count;
-+    A_UINT32             free;
-+};
-+
-+struct dbglog_hdr_s {
-+    struct dbglog_buf_s *dbuf;
-+    A_UINT32             dropped;
-+};
-+
-+struct dbglog_config_s {
-+    A_UINT32                    cfgvalid; /* Mask with valid config bits */
-+    union {
-+        /* TODO: Take care of endianness */
-+        struct {
-+            A_UINT32            mmask:16; /* Mask of modules with logging on */
-+            A_UINT32            rep:1; /* Reporting enabled or not */
-+            A_UINT32            tsr:3; /* Time stamp resolution. Def: 1 ms */
-+            A_UINT32            size:10; /* Report size in number of messages */
-+            A_UINT32            reserved:2;
-+        } dbglog_config;
-+
-+        A_UINT32                value;
-+    } u;
-+};
-+
-+#define cfgmmask                   u.dbglog_config.mmask
-+#define cfgrep                     u.dbglog_config.rep
-+#define cfgtsr                     u.dbglog_config.tsr
-+#define cfgsize                    u.dbglog_config.size
-+#define cfgvalue                   u.value
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _DBGLOG_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/dbglog_api.h b/drivers/sdio/function/wlan/ar6000/include/dbglog_api.h
-new file mode 100644
-index 0000000..06c8102
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/dbglog_api.h
-@@ -0,0 +1,46 @@
-+#ifndef _DBGLOG_API_H_
-+#define _DBGLOG_API_H_
-+/*
-+ * Copyright (c) 2004-2006 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ * This file contains host side debug primitives.
-+ */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include "dbglog.h"
-+
-+#define DBGLOG_HOST_LOG_BUFFER_SIZE            DBGLOG_LOG_BUFFER_SIZE
-+
-+#define DBGLOG_GET_DBGID(arg) \
-+    ((arg & DBGLOG_DBGID_MASK) >> DBGLOG_DBGID_OFFSET)
-+
-+#define DBGLOG_GET_MODULEID(arg) \
-+    ((arg & DBGLOG_MODULEID_MASK) >> DBGLOG_MODULEID_OFFSET)
-+
-+#define DBGLOG_GET_NUMARGS(arg) \
-+    ((arg & DBGLOG_NUM_ARGS_MASK) >> DBGLOG_NUM_ARGS_OFFSET)
-+
-+#define DBGLOG_GET_TIMESTAMP(arg) \
-+    ((arg & DBGLOG_TIMESTAMP_MASK) >> DBGLOG_TIMESTAMP_OFFSET)
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _DBGLOG_API_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/dbglog_id.h b/drivers/sdio/function/wlan/ar6000/include/dbglog_id.h
-new file mode 100644
-index 0000000..ce22b16
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/dbglog_id.h
-@@ -0,0 +1,307 @@
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ * This file contains the definitions of the debug identifiers for different
-+ * modules.
-+ *
-+ */
-+
-+#ifndef _DBGLOG_ID_H_
-+#define _DBGLOG_ID_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/*
-+ * The nomenclature for the debug identifiers is MODULE_DESCRIPTION.
-+ * Please ensure that the definition of any new debugid introduced is captured
-+ * between the <MODULE>_DBGID_DEFINITION_START and
-+ * <MODULE>_DBGID_DEFINITION_END defines. The structure is required for the
-+ * parser to correctly pick up the values for different debug identifiers.
-+ */
-+
-+/* INF debug identifier definitions */
-+#define INF_DBGID_DEFINITION_START
-+#define INF_ASSERTION_FAILED                          1
-+#define INF_TARGET_ID                                 2
-+#define INF_DBGID_DEFINITION_END
-+
-+/* WMI debug identifier definitions */
-+#define WMI_DBGID_DEFINITION_START
-+#define WMI_CMD_RX_XTND_PKT_TOO_SHORT                 1
-+#define WMI_EXTENDED_CMD_NOT_HANDLED                  2
-+#define WMI_CMD_RX_PKT_TOO_SHORT                      3
-+#define WMI_CALLING_WMI_EXTENSION_FN                  4
-+#define WMI_CMD_NOT_HANDLED                           5
-+#define WMI_IN_SYNC                                   6
-+#define WMI_TARGET_WMI_SYNC_CMD                       7
-+#define WMI_SET_SNR_THRESHOLD_PARAMS                  8
-+#define WMI_SET_RSSI_THRESHOLD_PARAMS                 9
-+#define WMI_SET_LQ_TRESHOLD_PARAMS                   10
-+#define WMI_TARGET_CREATE_PSTREAM_CMD                11
-+#define WMI_WI_DTM_INUSE                             12
-+#define WMI_TARGET_DELETE_PSTREAM_CMD                13
-+#define WMI_TARGET_IMPLICIT_DELETE_PSTREAM_CMD       14
-+#define WMI_TARGET_GET_BIT_RATE_CMD                  15
-+#define WMI_GET_RATE_MASK_CMD_FIX_RATE_MASK_IS       16
-+#define WMI_TARGET_GET_AVAILABLE_CHANNELS_CMD        17
-+#define WMI_TARGET_GET_TX_PWR_CMD                    18
-+#define WMI_FREE_EVBUF_WMIBUF                        19
-+#define WMI_FREE_EVBUF_DATABUF                       20
-+#define WMI_FREE_EVBUF_BADFLAG                       21
-+#define WMI_HTC_RX_ERROR_DATA_PACKET                 22
-+#define WMI_HTC_RX_SYNC_PAUSING_FOR_MBOX             23
-+#define WMI_INCORRECT_WMI_DATA_HDR_DROPPING_PKT      24
-+#define WMI_SENDING_READY_EVENT                      25
-+#define WMI_SETPOWER_MDOE_TO_MAXPERF                 26
-+#define WMI_SETPOWER_MDOE_TO_REC                     27
-+#define WMI_BSSINFO_EVENT_FROM                       28
-+#define WMI_TARGET_GET_STATS_CMD                     29
-+#define WMI_SENDING_SCAN_COMPLETE_EVENT              30
-+#define WMI_SENDING_RSSI_INDB_THRESHOLD_EVENT        31
-+#define WMI_SENDING_RSSI_INDBM_THRESHOLD_EVENT       32
-+#define WMI_SENDING_LINK_QUALITY_THRESHOLD_EVENT     33
-+#define WMI_SENDING_ERROR_REPORT_EVENT               34
-+#define WMI_SENDING_CAC_EVENT                        35
-+#define WMI_TARGET_GET_ROAM_TABLE_CMD                36
-+#define WMI_TARGET_GET_ROAM_DATA_CMD                 37
-+#define WMI_SENDING_GPIO_INTR_EVENT                  38
-+#define WMI_SENDING_GPIO_ACK_EVENT                   39
-+#define WMI_SENDING_GPIO_DATA_EVENT                  40
-+#define WMI_CMD_RX                                   41
-+#define WMI_CMD_RX_XTND                              42
-+#define WMI_EVENT_SEND                               43
-+#define WMI_EVENT_SEND_XTND                          44
-+#define WMI_DBGID_DEFINITION_END
-+
-+/* CSERV debug identifier definitions */
-+#define CSERV_DBGID_DEFINITION_START
-+#define CSERV_BEGIN_SCAN1                             1
-+#define CSERV_BEGIN_SCAN2                             2
-+#define CSERV_END_SCAN1                               3
-+#define CSERV_END_SCAN2                               4
-+#define CSERV_CHAN_SCAN_START                         5
-+#define CSERV_CHAN_SCAN_STOP                          6
-+#define CSERV_CHANNEL_OPPPORTUNITY                    7
-+#define CSERV_NC_TIMEOUT                              8
-+#define CSERV_BACK_HOME                              10
-+#define CSERV_CHMGR_CH_CALLBACK1                     11
-+#define CSERV_CHMGR_CH_CALLBACK2                     12
-+#define CSERV_CHMGR_CH_CALLBACK3                     13
-+#define CSERV_SET_SCAN_PARAMS1                       14
-+#define CSERV_SET_SCAN_PARAMS2                       15
-+#define CSERV_SET_SCAN_PARAMS3                       16
-+#define CSERV_SET_SCAN_PARAMS4                       17
-+#define CSERV_ABORT_SCAN                             18
-+#define CSERV_NEWSTATE                               19
-+#define CSERV_MINCHMGR_OP_END                        20
-+#define CSERV_CHMGR_OP_END                           21
-+#define CSERV_DISCONNECT_TIMEOUT                     22
-+#define CSERV_ROAM_TIMEOUT                           23
-+#define CSERV_FORCE_SCAN1                            24
-+#define CSERV_FORCE_SCAN2                            25
-+#define CSERV_FORCE_SCAN3                            26
-+#define CSERV_UTIL_TIMEOUT                           27
-+#define CSERV_RSSIPOLLER                             28
-+#define CSERV_RETRY_CONNECT_TIMEOUT                  29
-+#define CSERV_RSSIINDBMPOLLER                        30
-+#define CSERV_BGSCAN_ENABLE                          31
-+#define CSERV_BGSCAN_DISABLE                         32
-+#define CSERV_WLAN_START_SCAN_CMD1                   33
-+#define CSERV_WLAN_START_SCAN_CMD2                   34
-+#define CSERV_WLAN_START_SCAN_CMD3                   35
-+#define CSERV_START_SCAN_CMD                         36
-+#define CSERV_START_FORCE_SCAN                       37
-+#define CSERV_NEXT_CHAN                              38
-+#define CSERV_SET_REGCODE                            39
-+#define CSERV_START_ADHOC                            40
-+#define CSERV_ADHOC_AT_HOME                          41
-+#define CSERV_OPT_AT_HOME                            42
-+#define CSERV_WLAN_CONNECT_CMD                       43
-+#define CSERV_WLAN_RECONNECT_CMD                     44
-+#define CSERV_WLAN_DISCONNECT_CMD                    45
-+#define CSERV_BSS_CHANGE_CHANNEL                     46
-+#define CSERV_BEACON_RX                              47
-+#define CSERV_KEEPALIVE_CHECK                        48
-+#define CSERV_RC_BEGIN_SCAN                          49
-+#define CSERV_RC_SCAN_START                          50
-+#define CSERV_RC_SCAN_STOP                           51
-+#define CSERV_RC_NEXT                                52
-+#define CSERV_RC_SCAN_END                            53
-+#define CSERV_PROBE_CALLBACK                         54
-+#define CSERV_ROAM1                                  55
-+#define CSERV_ROAM2                                  56
-+#define CSERV_ROAM3                                  57
-+#define CSERV_CONNECT_EVENT                          58
-+#define CSERV_DISCONNECT_EVENT                       59
-+#define CSERV_BMISS_HANDLER1                         60
-+#define CSERV_BMISS_HANDLER2                         61
-+#define CSERV_BMISS_HANDLER3                         62
-+#define CSERV_LOWRSSI_HANDLER                        63
-+#define CSERV_WLAN_SET_PMKID_CMD                     64
-+#define CSERV_RECONNECT_REQUEST                      65
-+#define CSERV_KEYSPLUMBED_EVENT                      66
-+#define CSERV_NEW_REG                                67
-+#define CSERV_SET_RSSI_THOLD                         68
-+#define CSERV_RSSITHRESHOLDCHECK                     69
-+#define CSERV_RSSIINDBMTHRESHOLDCHECK                70
-+#define CSERV_WLAN_SET_OPT_CMD1                      71
-+#define CSERV_WLAN_SET_OPT_CMD2                      72
-+#define CSERV_WLAN_SET_OPT_CMD3                      73
-+#define CSERV_WLAN_SET_OPT_CMD4                      74
-+#define CSERV_SCAN_CONNECT_STOP                      75
-+#define CSERV_BMISS_HANDLER4                         76
-+#define CSERV_INITIALIZE_TIMER                       77
-+#define CSERV_ARM_TIMER                              78
-+#define CSERV_DISARM_TIMER                           79
-+#define CSERV_UNINITIALIZE_TIMER                     80
-+#define CSERV_DISCONNECT_EVENT2                      81
-+#define CSERV_SCAN_CONNECT_START                     82
-+#define CSERV_BSSINFO_MEMORY_ALLOC_FAILED            83
-+#define CSERV_SET_SCAN_PARAMS5                       84
-+#define CSERV_DBGID_DEFINITION_END
-+
-+/* TXRX debug identifier definitions */
-+#define TXRX_TXBUF_DBGID_DEFINITION_START
-+#define TXRX_TXBUF_ALLOCATE_BUF                      1
-+#define TXRX_TXBUF_QUEUE_BUF_TO_MBOX                 2
-+#define TXRX_TXBUF_QUEUE_BUF_TO_TXQ                  3
-+#define TXRX_TXBUF_TXQ_DEPTH                         4
-+#define TXRX_TXBUF_IBSS_QUEUE_TO_SFQ                 5
-+#define TXRX_TXBUF_IBSS_QUEUE_TO_TXQ_FRM_SFQ         6
-+#define TXRX_TXBUF_INITIALIZE_TIMER                  7
-+#define TXRX_TXBUF_ARM_TIMER                         8
-+#define TXRX_TXBUF_DISARM_TIMER                      9
-+#define TXRX_TXBUF_UNINITIALIZE_TIMER                10
-+#define TXRX_TXBUF_DBGID_DEFINITION_END
-+
-+#define TXRX_RXBUF_DBGID_DEFINITION_START
-+#define TXRX_RXBUF_ALLOCATE_BUF                      1
-+#define TXRX_RXBUF_QUEUE_TO_HOST                     2
-+#define TXRX_RXBUF_QUEUE_TO_WLAN                     3
-+#define TXRX_RXBUF_ZERO_LEN_BUF                      4
-+#define TXRX_RXBUF_QUEUE_TO_HOST_LASTBUF_IN_RXCHAIN  5
-+#define TXRX_RXBUF_LASTBUF_IN_RXCHAIN_ZEROBUF        6
-+#define TXRX_RXBUF_QUEUE_EMPTY_QUEUE_TO_WLAN         7
-+#define TXRX_RXBUF_SEND_TO_RECV_MGMT                 8
-+#define TXRX_RXBUF_SEND_TO_IEEE_LAYER                9
-+#define TXRX_RXBUF_DBGID_DEFINITION_END
-+
-+#define TXRX_MGMTBUF_DBGID_DEFINITION_START
-+#define TXRX_MGMTBUF_ALLOCATE_BUF                    1
-+#define TXRX_MGMTBUF_ALLOCATE_SM_BUF                 2
-+#define TXRX_MGMTBUF_ALLOCATE_RMBUF                  3
-+#define TXRX_MGMTBUF_GET_BUF                         4
-+#define TXRX_MGMTBUF_GET_SM_BUF                      5
-+#define TXRX_MGMTBUF_QUEUE_BUF_TO_TXQ                6
-+#define TXRX_MGMTBUF_REAPED_BUF                      7
-+#define TXRX_MGMTBUF_REAPED_SM_BUF                   8
-+#define TXRX_MGMTBUF_WAIT_FOR_TXQ_DRAIN              9
-+#define TXRX_MGMTBUF_WAIT_FOR_TXQ_SFQ_DRAIN          10
-+#define TXRX_MGMTBUF_ENQUEUE_INTO_SFQ                11
-+#define TXRX_MGMTBUF_DEQUEUE_FROM_SFQ                12
-+#define TXRX_MGMTBUF_PAUSE_TXQ                       13
-+#define TXRX_MGMTBUF_RESUME_TXQ                      14
-+#define TXRX_MGMTBUF_WAIT_FORTXQ_DRAIN_TIMEOUT       15
-+#define TXRX_MGMTBUF_DRAINQ                          16
-+#define TXRX_MGMTBUF_INDICATE_Q_DRAINED              17
-+#define TXRX_MGMTBUF_DBGID_DEFINITION_END
-+
-+/* PM (Power Module) debug identifier definitions */
-+#define PM_DBGID_DEFINITION_START
-+#define PM_INIT                                      1
-+#define PM_ENABLE                                    2
-+#define PM_SET_STATE                                 3
-+#define PM_SET_POWERMODE                             4
-+#define PM_CONN_NOTIFY                               5
-+#define PM_REF_COUNT_NEGATIVE                        6
-+#define PM_APSD_ENABLE                               7
-+#define PM_UPDATE_APSD_STATE                         8
-+#define PM_CHAN_OP_REQ                               9
-+#define PM_SET_MY_BEACON_POLICY                      10
-+#define PM_SET_ALL_BEACON_POLICY                     11
-+#define PM_SET_PM_PARAMS1                            12
-+#define PM_SET_PM_PARAMS2                            13
-+#define PM_ADHOC_SET_PM_CAPS_FAIL                    14
-+#define PM_ADHOC_UNKNOWN_IBSS_ATTRIB_ID              15
-+#define PM_DBGID_DEFINITION_END
-+
-+/* Wake on Wireless debug identifier definitions */
-+#define WOW_DBGID_DEFINITION_START
-+#define WOW_INIT                                        1
-+#define WOW_GET_CONFIG_DSET                             2
-+#define WOW_NO_CONFIG_DSET                              3
-+#define WOW_INVALID_CONFIG_DSET                         4
-+#define WOW_USE_DEFAULT_CONFIG                          5
-+#define WOW_SETUP_GPIO                                  6
-+#define WOW_INIT_DONE                                   7
-+#define WOW_SET_GPIO_PIN                                8
-+#define WOW_CLEAR_GPIO_PIN                              9
-+#define WOW_SET_WOW_MODE_CMD                            10
-+#define WOW_SET_HOST_MODE_CMD                           11
-+#define WOW_ADD_WOW_PATTERN_CMD                         12
-+#define WOW_NEW_WOW_PATTERN_AT_INDEX                    13
-+#define WOW_DEL_WOW_PATTERN_CMD                         14
-+#define WOW_LIST_CONTAINS_PATTERNS                      15
-+#define WOW_GET_WOW_LIST_CMD                            16
-+#define WOW_INVALID_FILTER_ID                           17
-+#define WOW_INVALID_FILTER_LISTID                       18
-+#define WOW_NO_VALID_FILTER_AT_ID                       19
-+#define WOW_NO_VALID_LIST_AT_ID                         20
-+#define WOW_NUM_PATTERNS_EXCEEDED                       21
-+#define WOW_NUM_LISTS_EXCEEDED                          22
-+#define WOW_GET_WOW_STATS                               23
-+#define WOW_CLEAR_WOW_STATS                             24
-+#define WOW_WAKEUP_HOST                                 25
-+#define WOW_EVENT_WAKEUP_HOST                           26
-+#define WOW_EVENT_DISCARD                               27
-+#define WOW_PATTERN_MATCH                               28
-+#define WOW_PATTERN_NOT_MATCH                           29
-+#define WOW_PATTERN_NOT_MATCH_OFFSET                    30
-+#define WOW_DISABLED_HOST_ASLEEP                        31
-+#define WOW_ENABLED_HOST_ASLEEP_NO_PATTERNS             32
-+#define WOW_ENABLED_HOST_ASLEEP_NO_MATCH_FOUND          33
-+#define WOW_DBGID_DEFINITION_END
-+
-+/* WHAL debug identifier definitions */
-+#define WHAL_DBGID_DEFINITION_START
-+#define WHAL_ERROR_ANI_CONTROL                      1
-+#define WHAL_ERROR_CHIP_TEST1                       2
-+#define WHAL_ERROR_CHIP_TEST2                       3
-+#define WHAL_ERROR_EEPROM_CHECKSUM                  4
-+#define WHAL_ERROR_EEPROM_MACADDR                   5
-+#define WHAL_ERROR_INTERRUPT_HIU                    6
-+#define WHAL_ERROR_KEYCACHE_RESET                   7
-+#define WHAL_ERROR_KEYCACHE_SET                     8
-+#define WHAL_ERROR_KEYCACHE_TYPE                    9
-+#define WHAL_ERROR_KEYCACHE_TKIPENTRY              10
-+#define WHAL_ERROR_KEYCACHE_WEPLENGTH              11
-+#define WHAL_ERROR_PHY_INVALID_CHANNEL             12
-+#define WHAL_ERROR_POWER_AWAKE                     13
-+#define WHAL_ERROR_POWER_SET                       14
-+#define WHAL_ERROR_RECV_STOPDMA                    15
-+#define WHAL_ERROR_RECV_STOPPCU                    16
-+#define WHAL_ERROR_RESET_CHANNF1                   17
-+#define WHAL_ERROR_RESET_CHANNF2                   18
-+#define WHAL_ERROR_RESET_PM                        19
-+#define WHAL_ERROR_RESET_OFFSETCAL                 20
-+#define WHAL_ERROR_RESET_RFGRANT                   21
-+#define WHAL_ERROR_RESET_RXFRAME                   22
-+#define WHAL_ERROR_RESET_STOPDMA                   23
-+#define WHAL_ERROR_RESET_RECOVER                   24
-+#define WHAL_ERROR_XMIT_COMPUTE                    25
-+#define WHAL_ERROR_XMIT_NOQUEUE                    26
-+#define WHAL_ERROR_XMIT_ACTIVEQUEUE                27
-+#define WHAL_ERROR_XMIT_BADTYPE                    28
-+#define WHAL_DBGID_DEFINITION_END
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _DBGLOG_ID_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/dl_list.h b/drivers/sdio/function/wlan/ar6000/include/dl_list.h
-new file mode 100644
-index 0000000..4b9c581
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/dl_list.h
-@@ -0,0 +1,114 @@
-+/*
-+ *
-+ * Double-link list definitions (adapted from Atheros SDIO stack)
-+ *
-+ * Copyright (c) 2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+#ifndef __DL_LIST_H___
-+#define __DL_LIST_H___
-+
-+#define A_CONTAINING_STRUCT(address, struct_type, field_name)\
-+            ((struct_type *)((A_UINT32)(address) - (A_UINT32)(&((struct_type *)0)->field_name)))
-+
-+/* list functions */
-+/* pointers for the list */
-+typedef struct _DL_LIST {
-+    struct _DL_LIST *pPrev;
-+    struct _DL_LIST *pNext;
-+}DL_LIST, *PDL_LIST;
-+/*
-+ * DL_LIST_INIT , initialize doubly linked list
-+*/
-+#define DL_LIST_INIT(pList)\
-+    {(pList)->pPrev = pList; (pList)->pNext = pList;}
-+
-+#define DL_LIST_IS_EMPTY(pList) (((pList)->pPrev == (pList)) && ((pList)->pNext == (pList)))
-+#define DL_LIST_GET_ITEM_AT_HEAD(pList) (pList)->pNext
-+#define DL_LIST_GET_ITEM_AT_TAIL(pList) (pList)->pPrev
-+/*
-+ * ITERATE_OVER_LIST pStart is the list, pTemp is a temp list member
-+ * NOT: do not use this function if the items in the list are deleted inside the
-+ * iteration loop
-+*/
-+#define ITERATE_OVER_LIST(pStart, pTemp) \
-+    for((pTemp) =(pStart)->pNext; pTemp != (pStart); (pTemp) = (pTemp)->pNext)
-+
-+
-+/* safe iterate macro that allows the item to be removed from the list
-+ * the iteration continues to the next item in the list
-+ */
-+#define ITERATE_OVER_LIST_ALLOW_REMOVE(pStart,pItem,st,offset)  \
-+{                                                       \
-+    PDL_LIST  pTemp;                                     \
-+    pTemp = (pStart)->pNext;                            \
-+    while (pTemp != (pStart)) {                         \
-+        (pItem) = A_CONTAINING_STRUCT(pTemp,st,offset);   \
-+         pTemp = pTemp->pNext;                          \
-+
-+#define ITERATE_END }}
-+
-+/*
-+ * DL_ListInsertTail - insert pAdd to the end of the list
-+*/
-+static INLINE PDL_LIST DL_ListInsertTail(PDL_LIST pList, PDL_LIST pAdd) {
-+        /* insert at tail */
-+    pAdd->pPrev = pList->pPrev;
-+    pAdd->pNext = pList;
-+    pList->pPrev->pNext = pAdd;
-+    pList->pPrev = pAdd;
-+    return pAdd;
-+}
-+
-+/*
-+ * DL_ListInsertHead - insert pAdd into the head of the list
-+*/
-+static INLINE PDL_LIST DL_ListInsertHead(PDL_LIST pList, PDL_LIST pAdd) {
-+        /* insert at head */
-+    pAdd->pPrev = pList;
-+    pAdd->pNext = pList->pNext;
-+    pList->pNext->pPrev = pAdd;
-+    pList->pNext = pAdd;
-+    return pAdd;
-+}
-+
-+#define DL_ListAdd(pList,pItem) DL_ListInsertHead((pList),(pItem))
-+/*
-+ * DL_ListRemove - remove pDel from list
-+*/
-+static INLINE PDL_LIST DL_ListRemove(PDL_LIST pDel) {
-+    pDel->pNext->pPrev = pDel->pPrev;
-+    pDel->pPrev->pNext = pDel->pNext;
-+        /* point back to itself just to be safe, incase remove is called again */
-+    pDel->pNext = pDel;
-+    pDel->pPrev = pDel;
-+    return pDel;
-+}
-+
-+/*
-+ * DL_ListRemoveItemFromHead - get a list item from the head
-+*/
-+static INLINE PDL_LIST DL_ListRemoveItemFromHead(PDL_LIST pList) {
-+    PDL_LIST pItem = NULL;
-+    if (pList->pNext != pList) {
-+        pItem = pList->pNext;
-+            /* remove the first item from head */
-+        DL_ListRemove(pItem);
-+    }
-+    return pItem;
-+}
-+
-+#endif /* __DL_LIST_H___ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/dset_api.h b/drivers/sdio/function/wlan/ar6000/include/dset_api.h
-new file mode 100644
-index 0000000..de5cc6a
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/dset_api.h
-@@ -0,0 +1,63 @@
-+/*
-+ * Copyright (c) 2004-2006 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/include/dset_api.h#1 $
-+ *
-+ * Host-side DataSet API.
-+ *
-+ */
-+
-+#ifndef _DSET_API_H_
-+#define _DSET_API_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-+
-+/*
-+ * Host-side DataSet support is optional, and is not
-+ * currently required for correct operation.  To disable
-+ * Host-side DataSet support, set this to 0.
-+ */
-+#ifndef CONFIG_HOST_DSET_SUPPORT
-+#define CONFIG_HOST_DSET_SUPPORT 1
-+#endif
-+
-+/* Called to send a DataSet Open Reply back to the Target. */
-+A_STATUS wmi_dset_open_reply(struct wmi_t *wmip,
-+                             A_UINT32 status,
-+                             A_UINT32 access_cookie,
-+                             A_UINT32 size,
-+                             A_UINT32 version,
-+                             A_UINT32 targ_handle,
-+                             A_UINT32 targ_reply_fn,
-+                             A_UINT32 targ_reply_arg);
-+
-+/* Called to send a DataSet Data Reply back to the Target. */
-+A_STATUS wmi_dset_data_reply(struct wmi_t *wmip,
-+                             A_UINT32 status,
-+                             A_UINT8 *host_buf,
-+                             A_UINT32 length,
-+                             A_UINT32 targ_buf,
-+                             A_UINT32 targ_reply_fn,
-+                             A_UINT32 targ_reply_arg);
-+
-+#ifdef __cplusplus
-+}
-+#endif /* __cplusplus */
-+
-+
-+#endif /* _DSET_API_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/dset_internal.h b/drivers/sdio/function/wlan/ar6000/include/dset_internal.h
-new file mode 100644
-index 0000000..f0be380
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/dset_internal.h
-@@ -0,0 +1,39 @@
-+/*
-+ * Copyright (c) 2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ */
-+
-+#ifndef __DSET_INTERNAL_H__
-+#define __DSET_INTERNAL_H__
-+
-+/*
-+ * Internal dset definitions, common for DataSet layer.
-+ */
-+
-+#define DSET_TYPE_STANDARD      0
-+#define DSET_TYPE_BPATCHED      1
-+#define DSET_TYPE_COMPRESSED    2
-+
-+/* Dataset descriptor */
-+
-+typedef struct dset_descriptor_s {
-+  struct dset_descriptor_s  *next;         /* List link. NULL only at the last
-+                                              descriptor */
-+  A_UINT16                   id;           /* Dset ID */
-+  A_UINT16                   size;         /* Dset size. */
-+  void                      *DataPtr;      /* Pointer to raw data for standard
-+                                              DataSet or pointer to original
-+                                              dset_descriptor for patched
-+                                              DataSet */
-+  A_UINT32                   data_type;    /* DSET_TYPE_*, above */
-+
-+  void                      *AuxPtr;       /* Additional data that might
-+                                              needed for data_type. For
-+                                              example, pointer to patch
-+                                              Dataset descriptor for BPatch. */
-+} dset_descriptor_t;
-+
-+#endif /* __DSET_INTERNAL_H__ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/dsetid.h b/drivers/sdio/function/wlan/ar6000/include/dsetid.h
-new file mode 100644
-index 0000000..85729f8
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/dsetid.h
-@@ -0,0 +1,110 @@
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ */
-+
-+#ifndef __DSETID_H__
-+#define __DSETID_H__
-+
-+/* Well-known DataSet IDs */
-+#define DSETID_UNUSED                     0x00000000
-+#define DSETID_BOARD_DATA                 0x00000001 /* Cal and board data */
-+#define DSETID_REGDB                      0x00000002 /* Regulatory Database */
-+#define DSETID_POWER_CONTROL              0x00000003 /* TX Pwr Lim & Ant Gain */
-+#define DSETID_USER_CONFIG                0x00000004 /* User Configuration */
-+
-+#define DSETID_ANALOG_CONTROL_DATA_START  0x00000005
-+#define DSETID_ANALOG_CONTROL_DATA_END    0x00000025
-+/*
-+ * Get DSETID for various reference clock speeds.
-+ * For each speed there are three DataSets that correspond
-+ * to the three columns of bank6 data (addr, 11a, 11b/g).
-+ * This macro returns the dsetid of the first of those
-+ * three DataSets.
-+ */
-+#define ANALOG_CONTROL_DATA_DSETID(refclk) \
-+        (DSETID_ANALOG_CONTROL_DATA_START + 3*refclk)
-+
-+/*
-+ * There are TWO STARTUP_PATCH DataSets.
-+ * DSETID_STARTUP_PATCH is historical, and was applied before BMI on
-+ * earlier systems.  On AR6002, it is applied after BMI, just like
-+ * DSETID_STARTUP_PATCH2.
-+ */
-+#define DSETID_STARTUP_PATCH              0x00000026
-+#define DSETID_GPIO_CONFIG_PATCH          0x00000027
-+#define DSETID_WLANREGS                   0x00000028 /* override wlan regs */
-+#define DSETID_STARTUP_PATCH2             0x00000029
-+
-+#define DSETID_WOW_CONFIG                 0x00000090 /* WoW Configuration */
-+
-+/* Add WHAL_INI_DATA_ID to DSETID_INI_DATA for a specific WHAL INI table. */
-+#define DSETID_INI_DATA                   0x00000100
-+/* Reserved for WHAL INI Tables: 0x100..0x11f */
-+#define DSETID_INI_DATA_END               0x0000011f
-+
-+#define DSETID_VENDOR_START               0x00010000 /* Vendor-defined DataSets */
-+
-+#define DSETID_INDEX_END                  0xfffffffe /* Reserved to indicate the
-+                                                        end of a memory-based
-+                                                        DataSet Index */
-+#define DSETID_INDEX_FREE                 0xffffffff /* An unused index entry */
-+
-+/*
-+ * PATCH DataSet format:
-+ * A list of patches, terminated by a patch with
-+ * address=PATCH_END.
-+ *
-+ * This allows for patches to be stored in flash.
-+ */
-+struct patch_s {
-+    A_UINT32 *address;
-+    A_UINT32  data;
-+};
-+
-+/*
-+ * Skip some patches.  Can be used to erase a single patch in a
-+ * patch DataSet without having to re-write the DataSet.  May
-+ * also be used to embed information for use by subsequent
-+ * patch code.  The "data" in a PATCH_SKIP tells how many
-+ * bytes of length "patch_s" to skip.
-+ */
-+#define PATCH_SKIP      ((A_UINT32 *)0x00000000)
-+
-+/*
-+ * Execute code at the address specified by "data".
-+ * The address of the patch structure is passed as
-+ * the one parameter.
-+ */
-+#define PATCH_CODE_ABS  ((A_UINT32 *)0x00000001)
-+
-+/*
-+ * Same as PATCH_CODE_ABS, but treat "data" as an
-+ * offset from the start of the patch word.
-+ */
-+#define PATCH_CODE_REL  ((A_UINT32 *)0x00000002)
-+
-+/* Mark the end of this patch DataSet. */
-+#define PATCH_END       ((A_UINT32 *)0xffffffff)
-+
-+/*
-+ * A DataSet which contains a Binary Patch to some other DataSet
-+ * uses the original dsetid with the DSETID_BPATCH_FLAG bit set.
-+ * Such a BPatch DataSet consists of BPatch metadata followed by
-+ * the bdiff bytes.  BPatch metadata consists of a single 32-bit
-+ * word that contains the size of the BPatched final image.
-+ *
-+ * To create a suitable bdiff DataSet, use bdiff in host/tools/bdiff
-+ * to create "diffs":
-+ *  bdiff -q -O -nooldmd5 -nonewmd5 -d ORIGfile NEWfile diffs
-+ * Then add BPatch metadata to the start of "diffs".
-+ *
-+ * NB: There are some implementation-induced restrictions
-+ * on which DataSets can be BPatched.
-+ */
-+#define DSETID_BPATCH_FLAG                0x80000000
-+
-+#endif /* __DSETID_H__ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/gpio.h b/drivers/sdio/function/wlan/ar6000/include/gpio.h
-new file mode 100644
-index 0000000..2203c7e
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/gpio.h
-@@ -0,0 +1,34 @@
-+/*
-+ * Copyright (c) 2005 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ */
-+
-+#if defined(AR6001)
-+#define GPIO_PIN_COUNT 18
-+#else
-+#define GPIO_PIN_COUNT 18
-+#endif
-+
-+/*
-+ * Possible values for WMIX_GPIO_SET_REGISTER_CMDID.
-+ * NB: These match hardware order, so that addresses can
-+ * easily be computed.
-+ */
-+#define GPIO_ID_OUT             0x00000000
-+#define GPIO_ID_OUT_W1TS        0x00000001
-+#define GPIO_ID_OUT_W1TC        0x00000002
-+#define GPIO_ID_ENABLE          0x00000003
-+#define GPIO_ID_ENABLE_W1TS     0x00000004
-+#define GPIO_ID_ENABLE_W1TC     0x00000005
-+#define GPIO_ID_IN              0x00000006
-+#define GPIO_ID_STATUS          0x00000007
-+#define GPIO_ID_STATUS_W1TS     0x00000008
-+#define GPIO_ID_STATUS_W1TC     0x00000009
-+#define GPIO_ID_PIN0            0x0000000a
-+#define GPIO_ID_PIN(n)          (GPIO_ID_PIN0+(n))
-+
-+#define GPIO_LAST_REGISTER_ID   GPIO_ID_PIN(17)
-+#define GPIO_ID_NONE            0xffffffff
-diff --git a/drivers/sdio/function/wlan/ar6000/include/gpio_api.h b/drivers/sdio/function/wlan/ar6000/include/gpio_api.h
-new file mode 100644
-index 0000000..8078aa5
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/gpio_api.h
-@@ -0,0 +1,57 @@
-+#ifndef _GPIO_API_H_
-+#define _GPIO_API_H_
-+/*
-+ * Copyright 2005 Atheros Communications, 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+/*
-+ * Host-side General Purpose I/O API.
-+ *
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/include/gpio_api.h#1 $
-+ */
-+
-+/*
-+ * Send a command to the Target in order to change output on GPIO pins.
-+ */
-+A_STATUS wmi_gpio_output_set(struct wmi_t *wmip,
-+                             A_UINT32 set_mask,
-+                             A_UINT32 clear_mask,
-+                             A_UINT32 enable_mask,
-+                             A_UINT32 disable_mask);
-+
-+/*
-+ * Send a command to the Target requesting input state of GPIO pins.
-+ */
-+A_STATUS wmi_gpio_input_get(struct wmi_t *wmip);
-+
-+/*
-+ * Send a command to the Target to change the value of a GPIO register.
-+ */
-+A_STATUS wmi_gpio_register_set(struct wmi_t *wmip,
-+                               A_UINT32 gpioreg_id,
-+                               A_UINT32 value);
-+
-+/*
-+ * Send a command to the Target to fetch the value of a GPIO register.
-+ */
-+A_STATUS wmi_gpio_register_get(struct wmi_t *wmip, A_UINT32 gpioreg_id);
-+
-+/*
-+ * Send a command to the Target, acknowledging some GPIO interrupts.
-+ */
-+A_STATUS wmi_gpio_intr_ack(struct wmi_t *wmip, A_UINT32 ack_mask);
-+
-+#endif /* _GPIO_API_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/hif.h b/drivers/sdio/function/wlan/ar6000/include/hif.h
-new file mode 100644
-index 0000000..f32388c
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/hif.h
-@@ -0,0 +1,291 @@
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ * HIF specific declarations and prototypes
-+ */
-+
-+#ifndef _HIF_H_
-+#define _HIF_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-+
-+/* Header files */
-+#include "a_config.h"
-+#include "athdefs.h"
-+#include "a_types.h"
-+#include "a_osapi.h"
-+
-+typedef struct htc_callbacks HTC_CALLBACKS;
-+typedef struct hif_device HIF_DEVICE;
-+
-+/*
-+ * direction - Direction of transfer (HIF_READ/HIF_WRITE).
-+ */
-+#define HIF_READ                    0x00000001
-+#define HIF_WRITE                   0x00000002
-+#define HIF_DIR_MASK                (HIF_READ | HIF_WRITE)
-+
-+/*
-+ *     type - An interface may support different kind of read/write commands.
-+ *            The command type is divided into a basic and an extended command
-+ *            and can be specified using HIF_BASIC_IO/HIF_EXTENDED_IO.
-+ */
-+#define HIF_BASIC_IO                0x00000004
-+#define HIF_EXTENDED_IO             0x00000008
-+#define HIF_TYPE_MASK               (HIF_BASIC_IO | HIF_EXTENDED_IO)
-+
-+/*
-+ *     emode - This indicates the whether the command is to be executed in a
-+ *             blocking or non-blocking fashion (HIF_SYNCHRONOUS/
-+ *             HIF_ASYNCHRONOUS). The read/write data paths in HTC have been
-+ *             implemented using the asynchronous mode allowing the the bus
-+ *             driver to indicate the completion of operation through the
-+ *             registered callback routine. The requirement primarily comes
-+ *             from the contexts these operations get called from (a driver's
-+ *             transmit context or the ISR context in case of receive).
-+ *             Support for both of these modes is essential.
-+ */
-+#define HIF_SYNCHRONOUS             0x00000010
-+#define HIF_ASYNCHRONOUS            0x00000020
-+#define HIF_EMODE_MASK              (HIF_SYNCHRONOUS | HIF_ASYNCHRONOUS)
-+
-+/*
-+ *     dmode - An interface may support different kinds of commands based on
-+ *             the tradeoff between the amount of data it can carry and the
-+ *             setup time. Byte and Block modes are supported (HIF_BYTE_BASIS/
-+ *             HIF_BLOCK_BASIS). In case of latter, the data is rounded off
-+ *             to the nearest block size by padding. The size of the block is
-+ *             configurable at compile time using the HIF_BLOCK_SIZE and is
-+ *             negotiated with the target during initialization after the
-+ *             dragon interrupts are enabled.
-+ */
-+#define HIF_BYTE_BASIS              0x00000040
-+#define HIF_BLOCK_BASIS             0x00000080
-+#define HIF_DMODE_MASK              (HIF_BYTE_BASIS | HIF_BLOCK_BASIS)
-+
-+/*
-+ *     amode - This indicates if the address has to be incremented on dragon
-+ *             after every read/write operation (HIF?FIXED_ADDRESS/
-+ *             HIF_INCREMENTAL_ADDRESS).
-+ */
-+#define HIF_FIXED_ADDRESS           0x00000100
-+#define HIF_INCREMENTAL_ADDRESS     0x00000200
-+#define HIF_AMODE_MASK              (HIF_FIXED_ADDRESS | HIF_INCREMENTAL_ADDRESS)
-+
-+#define HIF_WR_ASYNC_BYTE_FIX   \
-+    (HIF_WRITE | HIF_ASYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_FIXED_ADDRESS)
-+#define HIF_WR_ASYNC_BYTE_INC   \
-+    (HIF_WRITE | HIF_ASYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_INCREMENTAL_ADDRESS)
-+#define HIF_WR_ASYNC_BLOCK_INC  \
-+    (HIF_WRITE | HIF_ASYNCHRONOUS | HIF_EXTENDED_IO | HIF_BLOCK_BASIS | HIF_INCREMENTAL_ADDRESS)
-+#define HIF_WR_SYNC_BYTE_FIX    \
-+    (HIF_WRITE | HIF_SYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_FIXED_ADDRESS)
-+#define HIF_WR_SYNC_BYTE_INC    \
-+    (HIF_WRITE | HIF_SYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_INCREMENTAL_ADDRESS)
-+#define HIF_WR_SYNC_BLOCK_INC  \
-+    (HIF_WRITE | HIF_SYNCHRONOUS | HIF_EXTENDED_IO | HIF_BLOCK_BASIS | HIF_INCREMENTAL_ADDRESS)
-+#define HIF_RD_SYNC_BYTE_INC    \
-+    (HIF_READ | HIF_SYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_INCREMENTAL_ADDRESS)
-+#define HIF_RD_SYNC_BYTE_FIX    \
-+    (HIF_READ | HIF_SYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_FIXED_ADDRESS)
-+#define HIF_RD_ASYNC_BYTE_FIX   \
-+    (HIF_READ | HIF_ASYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_FIXED_ADDRESS)
-+#define HIF_RD_ASYNC_BLOCK_FIX  \
-+    (HIF_READ | HIF_ASYNCHRONOUS | HIF_EXTENDED_IO | HIF_BLOCK_BASIS | HIF_FIXED_ADDRESS)
-+#define HIF_RD_ASYNC_BYTE_INC   \
-+    (HIF_READ | HIF_ASYNCHRONOUS | HIF_EXTENDED_IO | HIF_BYTE_BASIS | HIF_INCREMENTAL_ADDRESS)
-+#define HIF_RD_ASYNC_BLOCK_INC  \
-+    (HIF_READ | HIF_ASYNCHRONOUS | HIF_EXTENDED_IO | HIF_BLOCK_BASIS | HIF_INCREMENTAL_ADDRESS)
-+#define HIF_RD_SYNC_BLOCK_INC  \
-+    (HIF_READ | HIF_SYNCHRONOUS | HIF_EXTENDED_IO | HIF_BLOCK_BASIS | HIF_INCREMENTAL_ADDRESS)
-+
-+
-+typedef enum {
-+    HIF_DEVICE_POWER_STATE = 0,
-+    HIF_DEVICE_GET_MBOX_BLOCK_SIZE,
-+    HIF_DEVICE_GET_MBOX_ADDR,
-+    HIF_DEVICE_GET_PENDING_EVENTS_FUNC,
-+    HIF_DEVICE_GET_IRQ_PROC_MODE,
-+    HIF_DEVICE_GET_RECV_EVENT_MASK_UNMASK_FUNC,
-+} HIF_DEVICE_CONFIG_OPCODE;
-+
-+/*
-+ * HIF CONFIGURE definitions:
-+ *
-+ *   HIF_DEVICE_GET_MBOX_BLOCK_SIZE
-+ *   input : none
-+ *   output : array of 4 A_UINT32s
-+ *   notes: block size is returned for each mailbox (4)
-+ *
-+ *   HIF_DEVICE_GET_MBOX_ADDR
-+ *   input : none
-+ *   output : array of 4 A_UINT32
-+ *   notes: address is returned for each mailbox (4) in the array
-+ *
-+ *   HIF_DEVICE_GET_PENDING_EVENTS_FUNC
-+ *   input : none
-+ *   output: HIF_PENDING_EVENTS_FUNC function pointer
-+ *   notes: this is optional for the HIF layer, if the request is
-+ *          not handled then it indicates that the upper layer can use
-+ *          the standard device methods to get pending events (IRQs, mailbox messages etc..)
-+ *          otherwise it can call the function pointer to check pending events.
-+ *
-+ *   HIF_DEVICE_GET_IRQ_PROC_MODE
-+ *   input : none
-+ *   output : HIF_DEVICE_IRQ_PROCESSING_MODE (interrupt processing mode)
-+ *   note: the hif layer interfaces with the underlying OS-specific bus driver. The HIF
-+ *         layer can report whether IRQ processing is requires synchronous behavior or
-+ *         can be processed using asynchronous bus requests (typically faster).
-+ *
-+ *   HIF_DEVICE_GET_RECV_EVENT_MASK_UNMASK_FUNC
-+ *   input :
-+ *   output : HIF_MASK_UNMASK_RECV_EVENT function pointer
-+ *   notes: this is optional for the HIF layer.  The HIF layer may require a special mechanism
-+ *          to mask receive message events.  The upper layer can call this pointer when it needs
-+ *          to mask/unmask receive events (in case it runs out of buffers).
-+ *
-+ *
-+ */
-+
-+typedef enum {
-+    HIF_DEVICE_IRQ_SYNC_ONLY,   /* for HIF implementations that require the DSR to process all
-+                                   interrupts before returning */
-+    HIF_DEVICE_IRQ_ASYNC_SYNC,  /* for HIF implementations that allow DSR to process interrupts
-+                                   using ASYNC I/O (that is HIFAckInterrupt can be called at a
-+                                   later time */
-+} HIF_DEVICE_IRQ_PROCESSING_MODE;
-+
-+#define HIF_MAX_DEVICES                 1
-+
-+struct htc_callbacks {
-+    A_UCHAR *name;
-+    A_UINT32 id;
-+    A_STATUS (* deviceInsertedHandler)(void *hif_handle);
-+    A_STATUS (* deviceRemovedHandler)(void *htc_handle, A_STATUS status);
-+    A_STATUS (* deviceSuspendHandler)(void *htc_handle);
-+    A_STATUS (* deviceResumeHandler)(void *htc_handle);
-+    A_STATUS (* deviceWakeupHandler)(void *htc_handle);
-+    A_STATUS (* rwCompletionHandler)(void *context, A_STATUS status);
-+    A_STATUS (* dsrHandler)(void *htc_handle);
-+};
-+
-+
-+#define HIF_OTHER_EVENTS     (1 << 0)   /* other interrupts (non-Recv) are pending, host
-+                                           needs to read the register table to figure out what */
-+#define HIF_RECV_MSG_AVAIL   (1 << 1)   /* pending recv packet */
-+
-+typedef struct _HIF_PENDING_EVENTS_INFO {
-+    A_UINT32 Events;
-+    A_UINT32 LookAhead;
-+} HIF_PENDING_EVENTS_INFO;
-+
-+    /* function to get pending events , some HIF modules use special mechanisms
-+     * to detect packet available and other interrupts */
-+typedef A_STATUS ( *HIF_PENDING_EVENTS_FUNC)(HIF_DEVICE              *device,
-+                                             HIF_PENDING_EVENTS_INFO *pEvents,
-+                                             void                    *AsyncContext);
-+
-+#define HIF_MASK_RECV    TRUE
-+#define HIF_UNMASK_RECV  FALSE
-+    /* function to mask recv events */
-+typedef A_STATUS ( *HIF_MASK_UNMASK_RECV_EVENT)(HIF_DEVICE  *device,
-+                                                A_BOOL      Mask,
-+                                                void        *AsyncContext);
-+
-+
-+/*
-+ * This API is used by the HTC layer to initialize the HIF layer and to
-+ * register different callback routines. Support for following events has
-+ * been captured - DSR, Read/Write completion, Device insertion/removal,
-+ * Device suspension/resumption/wakeup. In addition to this, the API is
-+ * also used to register the name and the revision of the chip. The latter
-+ * can be used to verify the revision of the chip read from the device
-+ * before reporting it to HTC.
-+ */
-+int HIFInit(HTC_CALLBACKS *callbacks);
-+
-+/*
-+ * This API is used to provide the read/write interface over the specific bus
-+ * interface.
-+ * address - Starting address in the dragon's address space. For mailbox
-+ *           writes, it refers to the start of the mbox boundary. It should
-+ *           be ensured that the last byte falls on the mailbox's EOM. For
-+ *           mailbox reads, it refers to the end of the mbox boundary.
-+ * buffer - Pointer to the buffer containg the data to be transmitted or
-+ *          received.
-+ * length - Amount of data to be transmitted or received.
-+ * request - Characterizes the attributes of the command.
-+ */
-+A_STATUS
-+HIFReadWrite(HIF_DEVICE    *device,
-+             A_UINT32       address,
-+             A_UCHAR       *buffer,
-+             A_UINT32       length,
-+             A_UINT32       request,
-+             void          *context);
-+
-+/*
-+ * This can be initiated from the unload driver context ie when the HTCShutdown
-+ * routine is called.
-+ */
-+void HIFShutDownDevice(HIF_DEVICE *device);
-+
-+/*
-+ * This should translate to an acknowledgment to the bus driver indicating that
-+ * the previous interrupt request has been serviced and the all the relevant
-+ * sources have been cleared. HTC is ready to process more interrupts.
-+ * This should prevent the bus driver from raising an interrupt unless the
-+ * previous one has been serviced and acknowledged using the previous API.
-+ */
-+void HIFAckInterrupt(HIF_DEVICE *device);
-+
-+void HIFMaskInterrupt(HIF_DEVICE *device);
-+
-+void HIFUnMaskInterrupt(HIF_DEVICE *device);
-+
-+/*
-+ * This set of functions are to be used by the bus driver to notify
-+ * the HIF module about various events.
-+ * These are not implemented if the bus driver provides an alternative
-+ * way for this notification though callbacks for instance.
-+ */
-+int HIFInsertEventNotify(void);
-+
-+int HIFRemoveEventNotify(void);
-+
-+int HIFIRQEventNotify(void);
-+
-+int HIFRWCompleteEventNotify(void);
-+
-+/*
-+ * This function associates a opaque handle with the HIF layer
-+ * to be used in communication with upper layer i.e. HTC.
-+ * This would normaly be a pointer to htc_target data structure.
-+ */
-+void HIFSetHandle(void *hif_handle, void *handle);
-+
-+A_STATUS
-+HIFConfigureDevice(HIF_DEVICE *device, HIF_DEVICE_CONFIG_OPCODE opcode,
-+                   void *config, A_UINT32 configLen);
-+
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _HIF_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/host_version.h b/drivers/sdio/function/wlan/ar6000/include/host_version.h
-new file mode 100644
-index 0000000..c090115
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/host_version.h
-@@ -0,0 +1,49 @@
-+#ifndef _HOST_VERSION_H_
-+#define _HOST_VERSION_H_
-+/*
-+ * Copyright (c) 2004-2005 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * This file contains version information for the sample host driver for the
-+ * AR6000 chip
-+ *
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/include/host_version.h#2 $
-+ *
-+ *
-+ *  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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#include <AR6K_version.h>
-+
-+/*
-+ * The version number is made up of major, minor, patch and build
-+ * numbers. These are 16 bit numbers.  The build and release script will
-+ * set the build number using a Perforce counter.  Here the build number is
-+ * set to 9999 so that builds done without the build-release script are easily
-+ * identifiable.
-+ */
-+
-+#define ATH_SW_VER_MAJOR      __VER_MAJOR_
-+#define ATH_SW_VER_MINOR      __VER_MINOR_
-+#define ATH_SW_VER_PATCH      __VER_PATCH_
-+#define ATH_SW_VER_BUILD 9999
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _HOST_VERSION_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/htc.h b/drivers/sdio/function/wlan/ar6000/include/htc.h
-new file mode 100644
-index 0000000..152d867
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/htc.h
-@@ -0,0 +1,190 @@
-+/*
-+ * Copyright (c) 2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ */
-+
-+
-+#ifndef __HTC_H__
-+#define __HTC_H__
-+
-+#ifndef ATH_TARGET
-+#include "athstartpack.h"
-+#endif
-+
-+#define A_OFFSETOF(type,field) (int)(&(((type *)NULL)->field))
-+
-+#define ASSEMBLE_UNALIGNED_UINT16(p,highbyte,lowbyte) \
-+        (((A_UINT16)(((A_UINT8 *)(p))[(highbyte)])) << 8 | (A_UINT16)(((A_UINT8 *)(p))[(lowbyte)]))
-+
-+/* alignment independent macros (little-endian) to fetch UINT16s or UINT8s from a
-+ * structure using only the type and field name.
-+ * Use these macros if there is the potential for unaligned buffer accesses. */
-+#define A_GET_UINT16_FIELD(p,type,field) \
-+    ASSEMBLE_UNALIGNED_UINT16(p,\
-+                              A_OFFSETOF(type,field) + 1, \
-+                              A_OFFSETOF(type,field))
-+
-+#define A_SET_UINT16_FIELD(p,type,field,value) \
-+{                                              \
-+    ((A_UINT8 *)(p))[A_OFFSETOF(type,field)] = (A_UINT8)(value);        \
-+    ((A_UINT8 *)(p))[A_OFFSETOF(type,field) + 1] = (A_UINT8)((value) >> 8); \
-+}
-+
-+#define A_GET_UINT8_FIELD(p,type,field) \
-+            ((A_UINT8 *)(p))[A_OFFSETOF(type,field)]
-+
-+#define A_SET_UINT8_FIELD(p,type,field,value) \
-+    ((A_UINT8 *)(p))[A_OFFSETOF(type,field)] = (value)
-+
-+/****** DANGER DANGER ***************
-+ *
-+ *   The frame header length and message formats defined herein were
-+ *   selected to accommodate optimal alignment for target processing.  This reduces code
-+ *   size and improves performance.
-+ *
-+ *   Any changes to the header length may alter the alignment and cause exceptions
-+ *   on the target. When adding to the message structures insure that fields are
-+ *   properly aligned.
-+ *
-+ */
-+
-+/* HTC frame header */
-+typedef PREPACK struct _HTC_FRAME_HDR{
-+        /* do not remove or re-arrange these fields, these are minimally required
-+         * to take advantage of 4-byte lookaheads in some hardware implementations */
-+    A_UINT8   EndpointID;
-+    A_UINT8   Flags;
-+    A_UINT16  PayloadLen;       /* length of data (including trailer) that follows the header */
-+
-+    /***** end of 4-byte lookahead ****/
-+
-+    A_UINT8   ControlBytes[2];
-+
-+    /* message payload starts after the header */
-+
-+} POSTPACK HTC_FRAME_HDR;
-+
-+/* frame header flags */
-+#define HTC_FLAGS_NEED_CREDIT_UPDATE (1 << 0)
-+#define HTC_FLAGS_RECV_TRAILER       (1 << 1)
-+
-+
-+#define HTC_HDR_LENGTH  (sizeof(HTC_FRAME_HDR))
-+#define HTC_MAX_TRAILER_LENGTH   255
-+#define HTC_MAX_PAYLOAD_LENGTH   (2048 - sizeof(HTC_FRAME_HDR))
-+
-+/* HTC control message IDs */
-+typedef enum {
-+    HTC_MSG_READY_ID = 1,
-+    HTC_MSG_CONNECT_SERVICE_ID = 2,
-+    HTC_MSG_CONNECT_SERVICE_RESPONSE_ID = 3,
-+    HTC_MSG_SETUP_COMPLETE_ID = 4,
-+} HTC_MSG_IDS;
-+
-+#define HTC_MAX_CONTROL_MESSAGE_LENGTH  256
-+
-+/* base message ID header */
-+typedef PREPACK struct {
-+    A_UINT16 MessageID;
-+} POSTPACK HTC_UNKNOWN_MSG;
-+
-+/* HTC ready message
-+ * direction : target-to-host  */
-+typedef PREPACK struct {
-+    A_UINT16  MessageID;    /* ID */
-+    A_UINT16  CreditCount;  /* number of credits the target can offer */
-+    A_UINT16  CreditSize;   /* size of each credit */
-+    A_UINT8   MaxEndpoints; /* maximum number of endpoints the target has resources for */
-+    A_UINT8   _Pad1;
-+} POSTPACK HTC_READY_MSG;
-+
-+#define HTC_SERVICE_META_DATA_MAX_LENGTH 128
-+
-+/* connect service
-+ * direction : host-to-target */
-+typedef PREPACK struct {
-+    A_UINT16  MessageID;
-+    A_UINT16  ServiceID;           /* service ID of the service to connect to */
-+    A_UINT16  ConnectionFlags;     /* connection flags */
-+
-+#define HTC_CONNECT_FLAGS_REDUCE_CREDIT_DRIBBLE (1 << 2)  /* reduce credit dribbling when
-+                                                             the host needs credits */
-+#define HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_MASK             (0x3)
-+#define HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_ONE_FOURTH        0x0
-+#define HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_ONE_HALF          0x1
-+#define HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_THREE_FOURTHS     0x2
-+#define HTC_CONNECT_FLAGS_THRESHOLD_LEVEL_UNITY             0x3
-+
-+    A_UINT8   ServiceMetaLength;   /* length of meta data that follows */
-+    A_UINT8   _Pad1;
-+
-+    /* service-specific meta data starts after the header */
-+
-+} POSTPACK HTC_CONNECT_SERVICE_MSG;
-+
-+/* connect response
-+ * direction : target-to-host */
-+typedef PREPACK struct {
-+    A_UINT16  MessageID;
-+    A_UINT16  ServiceID;            /* service ID that the connection request was made */
-+    A_UINT8   Status;               /* service connection status */
-+    A_UINT8   EndpointID;           /* assigned endpoint ID */
-+    A_UINT16  MaxMsgSize;           /* maximum expected message size on this endpoint */
-+    A_UINT8   ServiceMetaLength;    /* length of meta data that follows */
-+    A_UINT8   _Pad1;
-+
-+    /* service-specific meta data starts after the header */
-+
-+} POSTPACK HTC_CONNECT_SERVICE_RESPONSE_MSG;
-+
-+typedef PREPACK struct {
-+    A_UINT16  MessageID;
-+    /* currently, no other fields */
-+} POSTPACK HTC_SETUP_COMPLETE_MSG;
-+
-+
-+/* connect response status codes */
-+#define HTC_SERVICE_SUCCESS      0  /* success */
-+#define HTC_SERVICE_NOT_FOUND    1  /* service could not be found */
-+#define HTC_SERVICE_FAILED       2  /* specific service failed the connect */
-+#define HTC_SERVICE_NO_RESOURCES 3  /* no resources (i.e. no more endpoints) */
-+#define HTC_SERVICE_NO_MORE_EP   4  /* specific service is not allowing any more
-+                                       endpoints */
-+
-+/* report record IDs */
-+typedef enum {
-+    HTC_RECORD_NULL  = 0,
-+    HTC_RECORD_CREDITS   = 1,
-+    HTC_RECORD_LOOKAHEAD = 2,
-+} HTC_RPT_IDS;
-+
-+typedef PREPACK struct {
-+    A_UINT8 RecordID;     /* Record ID */
-+    A_UINT8 Length;       /* Length of record */
-+} POSTPACK HTC_RECORD_HDR;
-+
-+typedef PREPACK struct {
-+    A_UINT8 EndpointID;     /* Endpoint that owns these credits */
-+    A_UINT8 Credits;        /* credits to report since last report */
-+} POSTPACK HTC_CREDIT_REPORT;
-+
-+typedef PREPACK struct {
-+    A_UINT8 PreValid;         /* pre valid guard */
-+    A_UINT8 LookAhead[4];     /* 4 byte lookahead */
-+    A_UINT8 PostValid;        /* post valid guard */
-+
-+   /* NOTE: the LookAhead array is guarded by a PreValid and Post Valid guard bytes.
-+    * The PreValid bytes must equal the inverse of the PostValid byte */
-+
-+} POSTPACK HTC_LOOKAHEAD_REPORT;
-+
-+#ifndef ATH_TARGET
-+#include "athendpack.h"
-+#endif
-+
-+
-+#endif /* __HTC_H__ */
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/include/htc_api.h b/drivers/sdio/function/wlan/ar6000/include/htc_api.h
-new file mode 100644
-index 0000000..73b7df6
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/htc_api.h
-@@ -0,0 +1,436 @@
-+/*
-+ *
-+ * Copyright (c) 2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef _HTC_API_H_
-+#define _HTC_API_H_
-+
-+#include <htc.h>
-+#include <htc_services.h>
-+#include "htc_packet.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
-+
-+/* TODO.. for BMI */
-+#define ENDPOINT1 0
-+// TODO -remove me, but we have to fix BMI first
-+#define HTC_MAILBOX_NUM_MAX    4
-+
-+
-+/* ------ Endpoint IDS ------ */
-+typedef enum
-+{
-+    ENDPOINT_UNUSED = -1,
-+    ENDPOINT_0 = 0,
-+    ENDPOINT_1 = 1,
-+    ENDPOINT_2 = 2,
-+    ENDPOINT_3,
-+    ENDPOINT_4,
-+    ENDPOINT_5,
-+    ENDPOINT_6,
-+    ENDPOINT_7,
-+    ENDPOINT_8,
-+    ENDPOINT_MAX,
-+} HTC_ENDPOINT_ID;
-+
-+/* this is the amount of header room required by users of HTC */
-+#define HTC_HEADER_LEN         HTC_HDR_LENGTH
-+
-+typedef void *HTC_HANDLE;
-+
-+typedef A_UINT16 HTC_SERVICE_ID;
-+
-+typedef struct _HTC_INIT_INFO {
-+    void   (*AddInstance)(HTC_HANDLE);
-+    void   (*DeleteInstance)(void *Instance);
-+    void   (*TargetFailure)(void *Instance, A_STATUS Status);
-+} HTC_INIT_INFO;
-+
-+/* per service connection send completion */
-+typedef void   (*HTC_EP_SEND_PKT_COMPLETE)(void *,HTC_PACKET *);
-+/* per service connection pkt received */
-+typedef void   (*HTC_EP_RECV_PKT)(void *,HTC_PACKET *);
-+
-+/* Optional per service connection receive buffer re-fill callback,
-+ * On some OSes (like Linux) packets are allocated from a global pool and indicated up
-+ * to the network stack.  The driver never gets the packets back from the OS.  For these OSes
-+ * a refill callback can be used to allocate and re-queue buffers into HTC.
-+ *
-+ * On other OSes, the network stack can call into the driver's OS-specifc "return_packet" handler and
-+ * the driver can re-queue these buffers into HTC. In this regard a refill callback is
-+ * unnecessary */
-+typedef void   (*HTC_EP_RECV_REFILL)(void *, HTC_ENDPOINT_ID Endpoint);
-+
-+/* Optional per service connection callback when a send queue is full. This can occur if the
-+ * host continues queueing up TX packets faster than credits can arrive
-+ * To prevent the host (on some Oses like Linux) from continuously queueing packets
-+ * and consuming resources, this callback is provided so that that the host
-+ * can disable TX in the subsystem (i.e. network stack)
-+ * Other OSes require a "per-packet" indication_RAW_STREAM_NUM_MAX for each completed TX packet, this
-+ * closed loop mechanism will prevent the network stack from overunning the NIC */
-+typedef void (*HTC_EP_SEND_QUEUE_FULL)(void *, HTC_ENDPOINT_ID Endpoint);
-+
-+typedef struct _HTC_EP_CALLBACKS {
-+    void                     *pContext;     /* context for each callback */
-+    HTC_EP_SEND_PKT_COMPLETE EpTxComplete;  /* tx completion callback for connected endpoint */
-+    HTC_EP_RECV_PKT          EpRecv;        /* receive callback for connected endpoint */
-+    HTC_EP_RECV_REFILL       EpRecvRefill;  /* OPTIONAL receive re-fill callback for connected endpoint */
-+    HTC_EP_SEND_QUEUE_FULL   EpSendFull;    /* OPTIONAL send full callback */
-+} HTC_EP_CALLBACKS;
-+
-+/* service connection information */
-+typedef struct _HTC_SERVICE_CONNECT_REQ {
-+    HTC_SERVICE_ID   ServiceID;                 /* service ID to connect to */
-+    A_UINT16         ConnectionFlags;           /* connection flags, see htc protocol definition */
-+    A_UINT8         *pMetaData;                 /* ptr to optional service-specific meta-data */
-+    A_UINT8          MetaDataLength;            /* optional meta data length */
-+    HTC_EP_CALLBACKS EpCallbacks;               /* endpoint callbacks */
-+    int              MaxSendQueueDepth;         /* maximum depth of any send queue */
-+} HTC_SERVICE_CONNECT_REQ;
-+
-+/* service connection response information */
-+typedef struct _HTC_SERVICE_CONNECT_RESP {
-+    A_UINT8     *pMetaData;             /* caller supplied buffer to optional meta-data */
-+    A_UINT8     BufferLength;           /* length of caller supplied buffer */
-+    A_UINT8     ActualLength;           /* actual length of meta data */
-+    HTC_ENDPOINT_ID Endpoint;           /* endpoint to communicate over */
-+    int         MaxMsgLength;           /* max length of all messages over this endpoint */
-+    A_UINT8     ConnectRespCode;        /* connect response code from target */
-+} HTC_SERVICE_CONNECT_RESP;
-+
-+/* endpoint distribution structure */
-+typedef struct _HTC_ENDPOINT_CREDIT_DIST {
-+    struct _HTC_ENDPOINT_CREDIT_DIST *pNext;
-+    struct _HTC_ENDPOINT_CREDIT_DIST *pPrev;
-+    HTC_SERVICE_ID      ServiceID;          /* Service ID (set by HTC) */
-+    HTC_ENDPOINT_ID     Endpoint;           /* endpoint for this distribution struct (set by HTC) */
-+    A_UINT32            DistFlags;          /* distribution flags, distribution function can
-+                                               set default activity using SET_EP_ACTIVE() macro */
-+    int                 TxCreditsNorm;      /* credits for normal operation, anything above this
-+                                               indicates the endpoint is over-subscribed, this field
-+                                               is only relevant to the credit distribution function */
-+    int                 TxCreditsMin;       /* floor for credit distribution, this field is
-+                                               only relevant to the credit distribution function */
-+    int                 TxCreditsAssigned;  /* number of credits assigned to this EP, this field
-+                                               is only relevant to the credit dist function */
-+    int                 TxCredits;          /* current credits available, this field is used by
-+                                               HTC to determine whether a message can be sent or
-+                                               must be queued */
-+    int                 TxCreditsToDist;    /* pending credits to distribute on this endpoint, this
-+                                               is set by HTC when credit reports arrive.
-+                                               The credit distribution functions sets this to zero
-+                                               when it distributes the credits */
-+    int                 TxCreditsSeek;      /* this is the number of credits that the current pending TX
-+                                               packet needs to transmit.  This is set by HTC when
-+                                               and endpoint needs credits in order to transmit */
-+    int                 TxCreditSize;       /* size in bytes of each credit (set by HTC) */
-+    int                 TxCreditsPerMaxMsg; /* credits required for a maximum sized messages (set by HTC) */
-+    void                *pHTCReserved;      /* reserved for HTC use */
-+} HTC_ENDPOINT_CREDIT_DIST;
-+
-+#define HTC_EP_ACTIVE                            (1 << 31)
-+
-+/* macro to check if an endpoint has gone active, useful for credit
-+ * distributions */
-+#define IS_EP_ACTIVE(epDist)  ((epDist)->DistFlags & HTC_EP_ACTIVE)
-+#define SET_EP_ACTIVE(epDist) (epDist)->DistFlags |= HTC_EP_ACTIVE
-+
-+    /* credit distibution code that is passed into the distrbution function,
-+     * there are mandatory and optional codes that must be handled */
-+typedef enum _HTC_CREDIT_DIST_REASON {
-+    HTC_CREDIT_DIST_SEND_COMPLETE = 0,     /* credits available as a result of completed
-+                                              send operations (MANDATORY) resulting in credit reports */
-+    HTC_CREDIT_DIST_ACTIVITY_CHANGE = 1,   /* a change in endpoint activity occured (OPTIONAL) */
-+    HTC_CREDIT_DIST_SEEK_CREDITS,          /* an endpoint needs to "seek" credits (OPTIONAL) */
-+    HTC_DUMP_CREDIT_STATE                  /* for debugging, dump any state information that is kept by
-+                                              the distribution function */
-+} HTC_CREDIT_DIST_REASON;
-+
-+typedef void (*HTC_CREDIT_DIST_CALLBACK)(void                     *Context,
-+                                         HTC_ENDPOINT_CREDIT_DIST *pEPList,
-+                                         HTC_CREDIT_DIST_REASON   Reason);
-+
-+typedef void (*HTC_CREDIT_INIT_CALLBACK)(void *Context,
-+                                         HTC_ENDPOINT_CREDIT_DIST *pEPList,
-+                                         int                      TotalCredits);
-+
-+    /* endpoint statistics action */
-+typedef enum _HTC_ENDPOINT_STAT_ACTION {
-+    HTC_EP_STAT_SAMPLE = 0,                /* only read statistics */
-+    HTC_EP_STAT_SAMPLE_AND_CLEAR = 1,      /* sample and immediately clear statistics */
-+    HTC_EP_STAT_CLEAR                      /* clear only */
-+} HTC_ENDPOINT_STAT_ACTION;
-+
-+    /* endpoint statistics */
-+typedef struct _HTC_ENDPOINT_STATS {
-+    A_UINT32  TxCreditLowIndications;  /* number of times the host set the credit-low flag in a send message on
-+                                        this endpoint */
-+    A_UINT32  TxIssued;               /* running count of TX packets issued */
-+    A_UINT32  TxCreditRpts;           /* running count of total credit reports received for this endpoint */
-+    A_UINT32  TxCreditRptsFromRx;
-+    A_UINT32  TxCreditRptsFromOther;
-+    A_UINT32  TxCreditRptsFromEp0;
-+    A_UINT32  TxCreditsFromRx;        /* count of credits received via Rx packets on this endpoint */
-+    A_UINT32  TxCreditsFromOther;     /* count of credits received via another endpoint */
-+    A_UINT32  TxCreditsFromEp0;       /* count of credits received via another endpoint */
-+    A_UINT32  TxCreditsConsummed;     /* count of consummed credits */
-+    A_UINT32  TxCreditsReturned;      /* count of credits returned */
-+    A_UINT32  RxReceived;             /* count of RX packets received */
-+    A_UINT32  RxLookAheads;           /* count of lookahead records
-+                                         found in messages received on this endpoint */
-+} HTC_ENDPOINT_STATS;
-+
-+/* ------ Function Prototypes ------ */
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Initialize HTC
-+  @function name: HTCInit
-+  @input:  pInfo - initialization information
-+  @output:
-+  @return: A_OK on success
-+  @notes: The caller initializes global HTC state and registers various instance
-+          notification callbacks (see HTC_INIT_INFO).
-+
-+  @example:
-+  @see also: HTCShutdown
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+A_STATUS    HTCInit(HTC_INIT_INFO *pInfo);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Get the underlying HIF device handle
-+  @function name: HTCGetHifDevice
-+  @input:  HTCHandle - handle passed into the AddInstance callback
-+  @output:
-+  @return: opaque HIF device handle usable in HIF API calls.
-+  @notes:
-+  @example:
-+  @see also:
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void       *HTCGetHifDevice(HTC_HANDLE HTCHandle);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Set the associated instance for the HTC handle
-+  @function name: HTCSetInstance
-+  @input:  HTCHandle - handle passed into the AddInstance callback
-+           Instance - caller supplied instance object
-+  @output:
-+  @return:
-+  @notes:  Caller must set the instance information for the HTC handle in order to receive
-+           notifications for instance deletion (DeleteInstance callback is called) and for target
-+           failure notification.
-+  @example:
-+  @see also:
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void        HTCSetInstance(HTC_HANDLE HTCHandle, void *Instance);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Set credit distribution parameters
-+  @function name: HTCSetCreditDistribution
-+  @input:  HTCHandle - HTC handle
-+           pCreditDistCont - caller supplied context to pass into distribution functions
-+           CreditDistFunc - Distribution function callback
-+           CreditDistInit - Credit Distribution initialization callback
-+           ServicePriorityOrder - Array containing list of service IDs, lowest index is highest
-+                                  priority
-+           ListLength - number of elements in ServicePriorityOrder
-+  @output:
-+  @return:
-+  @notes:  The user can set a custom credit distribution function to handle special requirements
-+           for each endpoint.  A default credit distribution routine can be used by setting
-+           CreditInitFunc to NULL.  The default credit distribution is only provided for simple
-+           "fair" credit distribution without regard to any prioritization.
-+
-+  @example:
-+  @see also:
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void        HTCSetCreditDistribution(HTC_HANDLE               HTCHandle,
-+                                     void                     *pCreditDistContext,
-+                                     HTC_CREDIT_DIST_CALLBACK CreditDistFunc,
-+                                     HTC_CREDIT_INIT_CALLBACK CreditInitFunc,
-+                                     HTC_SERVICE_ID           ServicePriorityOrder[],
-+                                     int                      ListLength);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Wait for the target to indicate the HTC layer is ready
-+  @function name: HTCWaitTarget
-+  @input:  HTCHandle - HTC handle
-+  @output:
-+  @return:
-+  @notes:  This API blocks until the target responds with an HTC ready message.
-+           The caller should not connect services until the target has indicated it is
-+           ready.
-+  @example:
-+  @see also: HTCConnectService
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+A_STATUS    HTCWaitTarget(HTC_HANDLE HTCHandle);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Start target service communications
-+  @function name: HTCStart
-+  @input:  HTCHandle - HTC handle
-+  @output:
-+  @return:
-+  @notes: This API indicates to the target that the service connection phase is complete
-+          and the target can freely start all connected services.  This API should only be
-+          called AFTER all service connections have been made.  TCStart will issue a
-+          SETUP_COMPLETE message to the target to indicate that all service connections
-+          have been made and the target can start communicating over the endpoints.
-+  @example:
-+  @see also: HTCConnectService
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+A_STATUS    HTCStart(HTC_HANDLE HTCHandle);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Add receive packet to HTC
-+  @function name: HTCAddReceivePkt
-+  @input:  HTCHandle - HTC handle
-+           pPacket - HTC receive packet to add
-+  @output:
-+  @return: A_OK on success
-+  @notes:  user must supply HTC packets for capturing incomming HTC frames.  The caller
-+           must initialize each HTC packet using the SET_HTC_PACKET_INFO_RX_REFILL()
-+           macro.
-+  @example:
-+  @see also:
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+A_STATUS    HTCAddReceivePkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Connect to an HTC service
-+  @function name: HTCConnectService
-+  @input:  HTCHandle - HTC handle
-+           pReq - connection details
-+  @output: pResp - connection response
-+  @return:
-+  @notes:  Service connections must be performed before HTCStart.  User provides callback handlers
-+           for various endpoint events.
-+  @example:
-+  @see also: HTCStart
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+A_STATUS    HTCConnectService(HTC_HANDLE HTCHandle,
-+                              HTC_SERVICE_CONNECT_REQ  *pReq,
-+                              HTC_SERVICE_CONNECT_RESP *pResp);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Send an HTC packet
-+  @function name: HTCSendPkt
-+  @input:  HTCHandle - HTC handle
-+           pPacket - packet to send
-+  @output:
-+  @return: A_OK
-+  @notes:  Caller must initialize packet using SET_HTC_PACKET_INFO_TX() macro.
-+           This interface is fully asynchronous.  On error, HTC SendPkt will
-+           call the registered Endpoint callback to cleanup the packet.
-+  @example:
-+  @see also: HTCFlushEndpoint
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+A_STATUS    HTCSendPkt(HTC_HANDLE HTCHandle, HTC_PACKET *pPacket);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Stop HTC service communications
-+  @function name: HTCStop
-+  @input:  HTCHandle - HTC handle
-+  @output:
-+  @return:
-+  @notes: HTC communications is halted.  All receive and pending TX packets will
-+          be flushed.
-+  @example:
-+  @see also:
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void        HTCStop(HTC_HANDLE HTCHandle);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Shutdown HTC
-+  @function name: HTCShutdown
-+  @input:
-+  @output:
-+  @return:
-+  @notes:  This cleans up all resources allocated by HTCInit().
-+  @example:
-+  @see also: HTCInit
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void        HTCShutDown(void);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Flush pending TX packets
-+  @function name: HTCFlushEndpoint
-+  @input:  HTCHandle - HTC handle
-+           Endpoint - Endpoint to flush
-+           Tag - flush tag
-+  @output:
-+  @return:
-+  @notes:  The Tag parameter is used to selectively flush packets with matching tags.
-+           The value of 0 forces all packets to be flush regardless of tag.
-+  @example:
-+  @see also: HTCSendPkt
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void        HTCFlushEndpoint(HTC_HANDLE HTCHandle, HTC_ENDPOINT_ID Endpoint, HTC_TX_TAG Tag);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Dump credit distribution state
-+  @function name: HTCDumpCreditStates
-+  @input:  HTCHandle - HTC handle
-+  @output:
-+  @return:
-+  @notes:  This dumps all credit distribution information to the debugger
-+  @example:
-+  @see also:
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void        HTCDumpCreditStates(HTC_HANDLE HTCHandle);
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Indicate a traffic activity change on an endpoint
-+  @function name: HTCIndicateActivityChange
-+  @input:  HTCHandle - HTC handle
-+           Endpoint - endpoint in which activity has changed
-+           Active - TRUE if active, FALSE if it has become inactive
-+  @output:
-+  @return:
-+  @notes:  This triggers the registered credit distribution function to
-+           re-adjust credits for active/inactive endpoints.
-+  @example:
-+  @see also:
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void        HTCIndicateActivityChange(HTC_HANDLE      HTCHandle,
-+                                      HTC_ENDPOINT_ID Endpoint,
-+                                      A_BOOL          Active);
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @desc: Get endpoint statistics
-+  @function name: HTCGetEndpointStatistics
-+  @input:  HTCHandle - HTC handle
-+           Endpoint - Endpoint identifier
-+           Action - action to take with statistics
-+  @output:
-+           pStats - statistics that were sampled (can be NULL if Action is HTC_EP_STAT_CLEAR)
-+
-+  @return: TRUE if statistics profiling is enabled, otherwise FALSE.
-+
-+  @notes:  Statistics is a compile-time option and this function may return FALSE
-+           if HTC is not compiled with profiling.
-+
-+           The caller can specify the statistic "action" to take when sampling
-+           the statistics.  This includes:
-+
-+           HTC_EP_STAT_SAMPLE: The pStats structure is filled with the current values.
-+           HTC_EP_STAT_SAMPLE_AND_CLEAR: The structure is filled and the current statistics
-+                             are cleared.
-+           HTC_EP_STAT_CLEA : the statistics are cleared, the called can pass a NULL value for
-+                   pStats
-+
-+  @example:
-+  @see also:
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+A_BOOL       HTCGetEndpointStatistics(HTC_HANDLE               HTCHandle,
-+                                      HTC_ENDPOINT_ID          Endpoint,
-+                                      HTC_ENDPOINT_STAT_ACTION Action,
-+                                      HTC_ENDPOINT_STATS       *pStats);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _HTC_API_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/htc_packet.h b/drivers/sdio/function/wlan/ar6000/include/htc_packet.h
-new file mode 100644
-index 0000000..9ce8718
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/htc_packet.h
-@@ -0,0 +1,138 @@
-+/*
-+ *
-+ * Copyright (c) 2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifndef HTC_PACKET_H_
-+#define HTC_PACKET_H_
-+
-+
-+#include "dl_list.h"
-+
-+struct _HTC_PACKET;
-+
-+typedef void (* HTC_PACKET_COMPLETION)(void *,struct _HTC_PACKET *);
-+
-+typedef A_UINT16 HTC_TX_TAG;
-+
-+typedef struct _HTC_TX_PACKET_INFO {
-+    HTC_TX_TAG    Tag;            /* tag used to selective flush packets */
-+} HTC_TX_PACKET_INFO;
-+
-+#define HTC_TX_PACKET_TAG_ALL          0    /* a tag of zero is reserved and used to flush ALL packets */
-+#define HTC_TX_PACKET_TAG_INTERNAL     1                                /* internal tags start here */
-+#define HTC_TX_PACKET_TAG_USER_DEFINED (HTC_TX_PACKET_TAG_INTERNAL + 9) /* user-defined tags start here */
-+
-+typedef struct _HTC_RX_PACKET_INFO {
-+    A_UINT32    Unused;          /* for future use and to make compilers happy */
-+} HTC_RX_PACKET_INFO;
-+
-+/* wrapper around endpoint-specific packets */
-+typedef struct _HTC_PACKET {
-+    DL_LIST         ListLink;       /* double link */
-+    void            *pPktContext;   /* caller's per packet specific context */
-+
-+    A_UINT8         *pBufferStart;  /* the true buffer start , the caller can
-+                                       store the real buffer start here.  In
-+                                       receive callbacks, the HTC layer sets pBuffer
-+                                       to the start of the payload past the header. This
-+                                       field allows the caller to reset pBuffer when it
-+                                       recycles receive packets back to HTC */
-+    /*
-+     * Pointer to the start of the buffer. In the transmit
-+     * direction this points to the start of the payload. In the
-+     * receive direction, however, the buffer when queued up
-+     * points to the start of the HTC header but when returned
-+     * to the caller points to the start of the payload
-+     */
-+    A_UINT8         *pBuffer;       /* payload start (RX/TX) */
-+    A_UINT32        BufferLength;   /* length of buffer */
-+    A_UINT32        ActualLength;   /* actual length of payload */
-+    int             Endpoint;       /* endpoint that this packet was sent/recv'd from */
-+    A_STATUS        Status;         /* completion status */
-+    union {
-+        HTC_TX_PACKET_INFO  AsTx;   /* Tx Packet specific info */
-+        HTC_RX_PACKET_INFO  AsRx;   /* Rx Packet specific info */
-+    } PktInfo;
-+
-+    /* the following fields are for internal HTC use */
-+    HTC_PACKET_COMPLETION Completion;   /* completion */
-+    void                  *pContext;    /* HTC private completion context */
-+    A_UINT32              HTCReserved;  /* reserved */
-+} HTC_PACKET;
-+
-+
-+
-+#define COMPLETE_HTC_PACKET(p,status)        \
-+{                                            \
-+    (p)->Status = (status);                  \
-+    (p)->Completion((p)->pContext,(p));      \
-+}
-+
-+#define INIT_HTC_PACKET_INFO(p,b,len)             \
-+{                                                 \
-+    (p)->pBufferStart = (b);                      \
-+    (p)->BufferLength = (len);                    \
-+}
-+
-+/* macro to set an initial RX packet for refilling HTC */
-+#define SET_HTC_PACKET_INFO_RX_REFILL(p,c,b,len,ep) \
-+{                                                 \
-+    (p)->pPktContext = (c);                       \
-+    (p)->pBuffer = (b);                           \
-+    (p)->pBufferStart = (b);                      \
-+    (p)->BufferLength = (len);                    \
-+    (p)->Endpoint = (ep);                         \
-+}
-+
-+/* fast macro to recycle an RX packet that will be re-queued to HTC */
-+#define HTC_PACKET_RESET_RX(p)              \
-+    (p)->pBuffer = (p)->pBufferStart
-+
-+/* macro to set packet parameters for TX */
-+#define SET_HTC_PACKET_INFO_TX(p,c,b,len,ep,tag)  \
-+{                                                 \
-+    (p)->pPktContext = (c);                       \
-+    (p)->pBuffer = (b);                           \
-+    (p)->ActualLength = (len);                    \
-+    (p)->Endpoint = (ep);                         \
-+    (p)->PktInfo.AsTx.Tag = (tag);                \
-+}
-+
-+/* HTC Packet Queueing Macros */
-+typedef DL_LIST HTC_PACKET_QUEUE;
-+/* initialize queue */
-+#define INIT_HTC_PACKET_QUEUE(pQ) DL_LIST_INIT((pQ))
-+/* enqueue HTC packet to the tail of the queue */
-+#define HTC_PACKET_ENQUEUE(pQ,p)  DL_ListInsertTail((pQ),&(p)->ListLink)
-+/* test if a queue is empty */
-+#define HTC_QUEUE_EMPTY(pQ)       DL_LIST_IS_EMPTY((pQ))
-+/* get packet at head without removing it */
-+#define HTC_GET_PKT_AT_HEAD(pQ)   A_CONTAINING_STRUCT((DL_LIST_GET_ITEM_AT_HEAD(pQ)),HTC_PACKET,ListLink);
-+/* remove a packet from the current list it is linked to */
-+#define HTC_PACKET_REMOVE(p)      DL_ListRemove(&(p)->ListLink)
-+
-+/* dequeue an HTC packet from the head of the queue */
-+static INLINE HTC_PACKET *HTC_PACKET_DEQUEUE(HTC_PACKET_QUEUE *queue) {
-+    DL_LIST    *pItem = DL_ListRemoveItemFromHead(queue);
-+    if (pItem != NULL) {
-+        return A_CONTAINING_STRUCT(pItem, HTC_PACKET, ListLink);
-+    }
-+    return NULL;
-+}
-+
-+#endif /*HTC_PACKET_H_*/
-diff --git a/drivers/sdio/function/wlan/ar6000/include/htc_services.h b/drivers/sdio/function/wlan/ar6000/include/htc_services.h
-new file mode 100644
-index 0000000..fc6fc29
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/htc_services.h
-@@ -0,0 +1,37 @@
-+/*
-+ * Copyright (c) 2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ */
-+
-+#ifndef __HTC_SERVICES_H__
-+#define __HTC_SERVICES_H__
-+
-+/* Current service IDs */
-+
-+typedef enum {
-+    RSVD_SERVICE_GROUP  = 0,
-+    WMI_SERVICE_GROUP   = 1,
-+
-+    HTC_TEST_GROUP = 254,
-+    HTC_SERVICE_GROUP_LAST = 255
-+}HTC_SERVICE_GROUP_IDS;
-+
-+#define MAKE_SERVICE_ID(group,index) \
-+            (int)(((int)group << 8) | (int)(index))
-+
-+/* NOTE: service ID of 0x0000 is reserved and should never be used */
-+#define HTC_CTRL_RSVD_SVC MAKE_SERVICE_ID(RSVD_SERVICE_GROUP,1)
-+#define WMI_CONTROL_SVC   MAKE_SERVICE_ID(WMI_SERVICE_GROUP,0)
-+#define WMI_DATA_BE_SVC   MAKE_SERVICE_ID(WMI_SERVICE_GROUP,1)
-+#define WMI_DATA_BK_SVC   MAKE_SERVICE_ID(WMI_SERVICE_GROUP,2)
-+#define WMI_DATA_VI_SVC   MAKE_SERVICE_ID(WMI_SERVICE_GROUP,3)
-+#define WMI_DATA_VO_SVC   MAKE_SERVICE_ID(WMI_SERVICE_GROUP,4)
-+#define WMI_MAX_SERVICES  5
-+
-+/* raw stream service (i.e. flash, tcmd, calibration apps) */
-+#define HTC_RAW_STREAMS_SVC MAKE_SERVICE_ID(HTC_TEST_GROUP,0)
-+
-+#endif /*HTC_SERVICES_H_*/
-diff --git a/drivers/sdio/function/wlan/ar6000/include/ieee80211.h b/drivers/sdio/function/wlan/ar6000/include/ieee80211.h
-new file mode 100644
-index 0000000..7090040
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/ieee80211.h
-@@ -0,0 +1,342 @@
-+/*-
-+ * Copyright (c) 2001 Atsushi Onoe
-+ * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting
-+ * Copyright (c) 2006 Atheros Communications, Inc.
-+ *
-+ * Wireless Network driver for Atheros AR6001
-+ * All rights reserved.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
-+ *
-+ */
-+#ifndef _NET80211_IEEE80211_H_
-+#define _NET80211_IEEE80211_H_
-+
-+#include "athstartpack.h"
-+
-+/*
-+ * 802.11 protocol definitions.
-+ */
-+
-+#define IEEE80211_ADDR_LEN  6       /* size of 802.11 address */
-+/* is 802.11 address multicast/broadcast? */
-+#define IEEE80211_IS_MULTICAST(_a)  (*(_a) & 0x01)
-+#define IEEE80211_ADDR_EQ(addr1, addr2)     \
-+    (A_MEMCMP(addr1, addr2, IEEE80211_ADDR_LEN) == 0)
-+
-+#define IEEE80211_KEYBUF_SIZE 16
-+#define IEEE80211_MICBUF_SIZE (8+8)  /* space for both tx and rx */
-+
-+/*
-+ * NB: these values are ordered carefully; there are lots of
-+ * of implications in any reordering.  In particular beware
-+ * that 4 is not used to avoid conflicting with IEEE80211_F_PRIVACY.
-+ */
-+#define IEEE80211_CIPHER_WEP            0
-+#define IEEE80211_CIPHER_TKIP           1
-+#define IEEE80211_CIPHER_AES_OCB        2
-+#define IEEE80211_CIPHER_AES_CCM        3
-+#define IEEE80211_CIPHER_CKIP           5
-+#define IEEE80211_CIPHER_CCKM_KRK       6
-+#define IEEE80211_CIPHER_NONE           7       /* pseudo value */
-+
-+#define IEEE80211_CIPHER_MAX            (IEEE80211_CIPHER_NONE+1)
-+
-+#define IEEE80211_IS_VALID_WEP_CIPHER_LEN(len) \
-+        (((len) == 5) || ((len) == 13) || ((len) == 16))
-+
-+
-+
-+/*
-+ * generic definitions for IEEE 802.11 frames
-+ */
-+PREPACK struct ieee80211_frame {
-+    A_UINT8    i_fc[2];
-+    A_UINT8    i_dur[2];
-+    A_UINT8    i_addr1[IEEE80211_ADDR_LEN];
-+    A_UINT8    i_addr2[IEEE80211_ADDR_LEN];
-+    A_UINT8    i_addr3[IEEE80211_ADDR_LEN];
-+    A_UINT8    i_seq[2];
-+    /* possibly followed by addr4[IEEE80211_ADDR_LEN]; */
-+    /* see below */
-+} POSTPACK;
-+
-+#define IEEE80211_FC0_VERSION_MASK          0x03
-+#define IEEE80211_FC0_VERSION_SHIFT         0
-+#define IEEE80211_FC0_VERSION_0             0x00
-+#define IEEE80211_FC0_TYPE_MASK             0x0c
-+#define IEEE80211_FC0_TYPE_SHIFT            2
-+#define IEEE80211_FC0_TYPE_MGT              0x00
-+#define IEEE80211_FC0_TYPE_CTL              0x04
-+#define IEEE80211_FC0_TYPE_DATA             0x08
-+
-+#define IEEE80211_FC0_SUBTYPE_MASK          0xf0
-+#define IEEE80211_FC0_SUBTYPE_SHIFT         4
-+/* for TYPE_MGT */
-+#define IEEE80211_FC0_SUBTYPE_ASSOC_REQ     0x00
-+#define IEEE80211_FC0_SUBTYPE_ASSOC_RESP    0x10
-+#define IEEE80211_FC0_SUBTYPE_REASSOC_REQ   0x20
-+#define IEEE80211_FC0_SUBTYPE_REASSOC_RESP  0x30
-+#define IEEE80211_FC0_SUBTYPE_PROBE_REQ     0x40
-+#define IEEE80211_FC0_SUBTYPE_PROBE_RESP    0x50
-+#define IEEE80211_FC0_SUBTYPE_BEACON        0x80
-+#define IEEE80211_FC0_SUBTYPE_ATIM          0x90
-+#define IEEE80211_FC0_SUBTYPE_DISASSOC      0xa0
-+#define IEEE80211_FC0_SUBTYPE_AUTH          0xb0
-+#define IEEE80211_FC0_SUBTYPE_DEAUTH        0xc0
-+/* for TYPE_CTL */
-+#define IEEE80211_FC0_SUBTYPE_PS_POLL       0xa0
-+#define IEEE80211_FC0_SUBTYPE_RTS           0xb0
-+#define IEEE80211_FC0_SUBTYPE_CTS           0xc0
-+#define IEEE80211_FC0_SUBTYPE_ACK           0xd0
-+#define IEEE80211_FC0_SUBTYPE_CF_END        0xe0
-+#define IEEE80211_FC0_SUBTYPE_CF_END_ACK    0xf0
-+/* for TYPE_DATA (bit combination) */
-+#define IEEE80211_FC0_SUBTYPE_DATA          0x00
-+#define IEEE80211_FC0_SUBTYPE_CF_ACK        0x10
-+#define IEEE80211_FC0_SUBTYPE_CF_POLL       0x20
-+#define IEEE80211_FC0_SUBTYPE_CF_ACPL       0x30
-+#define IEEE80211_FC0_SUBTYPE_NODATA        0x40
-+#define IEEE80211_FC0_SUBTYPE_CFACK         0x50
-+#define IEEE80211_FC0_SUBTYPE_CFPOLL        0x60
-+#define IEEE80211_FC0_SUBTYPE_CF_ACK_CF_ACK 0x70
-+#define IEEE80211_FC0_SUBTYPE_QOS           0x80
-+#define IEEE80211_FC0_SUBTYPE_QOS_NULL      0xc0
-+
-+#define IEEE80211_FC1_DIR_MASK              0x03
-+#define IEEE80211_FC1_DIR_NODS              0x00    /* STA->STA */
-+#define IEEE80211_FC1_DIR_TODS              0x01    /* STA->AP  */
-+#define IEEE80211_FC1_DIR_FROMDS            0x02    /* AP ->STA */
-+#define IEEE80211_FC1_DIR_DSTODS            0x03    /* AP ->AP  */
-+
-+#define IEEE80211_FC1_MORE_FRAG             0x04
-+#define IEEE80211_FC1_RETRY                 0x08
-+#define IEEE80211_FC1_PWR_MGT               0x10
-+#define IEEE80211_FC1_MORE_DATA             0x20
-+#define IEEE80211_FC1_WEP                   0x40
-+#define IEEE80211_FC1_ORDER                 0x80
-+
-+#define IEEE80211_SEQ_FRAG_MASK             0x000f
-+#define IEEE80211_SEQ_FRAG_SHIFT            0
-+#define IEEE80211_SEQ_SEQ_MASK              0xfff0
-+#define IEEE80211_SEQ_SEQ_SHIFT             4
-+
-+#define IEEE80211_NWID_LEN                  32
-+
-+/*
-+ * 802.11 rate set.
-+ */
-+#define IEEE80211_RATE_SIZE     8       /* 802.11 standard */
-+#define IEEE80211_RATE_MAXSIZE  15      /* max rates we'll handle */
-+
-+#define WMM_NUM_AC                  4   /* 4 AC categories */
-+
-+#define WMM_PARAM_ACI_M         0x60    /* Mask for ACI field */
-+#define WMM_PARAM_ACI_S         5   /* Shift for ACI field */
-+#define WMM_PARAM_ACM_M         0x10    /* Mask for ACM bit */
-+#define WMM_PARAM_ACM_S         4       /* Shift for ACM bit */
-+#define WMM_PARAM_AIFSN_M       0x0f    /* Mask for aifsn field */
-+#define WMM_PARAM_LOGCWMIN_M    0x0f    /* Mask for CwMin field (in log) */
-+#define WMM_PARAM_LOGCWMAX_M    0xf0    /* Mask for CwMax field (in log) */
-+#define WMM_PARAM_LOGCWMAX_S    4   /* Shift for CwMax field */
-+
-+#define WMM_AC_TO_TID(_ac) (       \
-+    ((_ac) == WMM_AC_VO) ? 6 : \
-+    ((_ac) == WMM_AC_VI) ? 5 : \
-+    ((_ac) == WMM_AC_BK) ? 1 : \
-+    0)
-+
-+#define TID_TO_WMM_AC(_tid) (      \
-+    ((_tid) < 1) ? WMM_AC_BE : \
-+    ((_tid) < 3) ? WMM_AC_BK : \
-+    ((_tid) < 6) ? WMM_AC_VI : \
-+    WMM_AC_VO)
-+/*
-+ * Management information element payloads.
-+ */
-+
-+enum {
-+    IEEE80211_ELEMID_SSID       = 0,
-+    IEEE80211_ELEMID_RATES      = 1,
-+    IEEE80211_ELEMID_FHPARMS    = 2,
-+    IEEE80211_ELEMID_DSPARMS    = 3,
-+    IEEE80211_ELEMID_CFPARMS    = 4,
-+    IEEE80211_ELEMID_TIM        = 5,
-+    IEEE80211_ELEMID_IBSSPARMS  = 6,
-+    IEEE80211_ELEMID_COUNTRY    = 7,
-+    IEEE80211_ELEMID_CHALLENGE  = 16,
-+    /* 17-31 reserved for challenge text extension */
-+    IEEE80211_ELEMID_PWRCNSTR   = 32,
-+    IEEE80211_ELEMID_PWRCAP     = 33,
-+    IEEE80211_ELEMID_TPCREQ     = 34,
-+    IEEE80211_ELEMID_TPCREP     = 35,
-+    IEEE80211_ELEMID_SUPPCHAN   = 36,
-+    IEEE80211_ELEMID_CHANSWITCH = 37,
-+    IEEE80211_ELEMID_MEASREQ    = 38,
-+    IEEE80211_ELEMID_MEASREP    = 39,
-+    IEEE80211_ELEMID_QUIET      = 40,
-+    IEEE80211_ELEMID_IBSSDFS    = 41,
-+    IEEE80211_ELEMID_ERP        = 42,
-+    IEEE80211_ELEMID_RSN        = 48,
-+    IEEE80211_ELEMID_XRATES     = 50,
-+    IEEE80211_ELEMID_TPC        = 150,
-+    IEEE80211_ELEMID_CCKM       = 156,
-+    IEEE80211_ELEMID_VENDOR     = 221,  /* vendor private */
-+};
-+
-+#define ATH_OUI             0x7f0300        /* Atheros OUI */
-+#define ATH_OUI_TYPE        0x01
-+#define ATH_OUI_SUBTYPE     0x01
-+#define ATH_OUI_VERSION     0x00
-+
-+#define WPA_OUI             0xf25000
-+#define WPA_OUI_TYPE        0x01
-+#define WPA_VERSION         1          /* current supported version */
-+
-+#define WPA_CSE_NULL        0x00
-+#define WPA_CSE_WEP40       0x01
-+#define WPA_CSE_TKIP        0x02
-+#define WPA_CSE_CCMP        0x04
-+#define WPA_CSE_WEP104      0x05
-+
-+#define WPA_ASE_NONE        0x00
-+#define WPA_ASE_8021X_UNSPEC    0x01
-+#define WPA_ASE_8021X_PSK   0x02
-+
-+#define RSN_OUI         0xac0f00
-+#define RSN_VERSION     1       /* current supported version */
-+
-+#define RSN_CSE_NULL        0x00
-+#define RSN_CSE_WEP40       0x01
-+#define RSN_CSE_TKIP        0x02
-+#define RSN_CSE_WRAP        0x03
-+#define RSN_CSE_CCMP        0x04
-+#define RSN_CSE_WEP104      0x05
-+
-+#define RSN_ASE_NONE        0x00
-+#define RSN_ASE_8021X_UNSPEC    0x01
-+#define RSN_ASE_8021X_PSK   0x02
-+
-+#define RSN_CAP_PREAUTH     0x01
-+
-+#define WMM_OUI         0xf25000
-+#define WMM_OUI_TYPE        0x02
-+#define WMM_INFO_OUI_SUBTYPE    0x00
-+#define WMM_PARAM_OUI_SUBTYPE   0x01
-+#define WMM_VERSION     1
-+
-+/* WMM stream classes */
-+#define WMM_NUM_AC  4
-+#define WMM_AC_BE   0       /* best effort */
-+#define WMM_AC_BK   1       /* background */
-+#define WMM_AC_VI   2       /* video */
-+#define WMM_AC_VO   3       /* voice */
-+
-+/* TSPEC related */
-+#define ACTION_CATEGORY_CODE_TSPEC                 17
-+#define ACTION_CODE_TSPEC_ADDTS                    0
-+#define ACTION_CODE_TSPEC_ADDTS_RESP               1
-+#define ACTION_CODE_TSPEC_DELTS                    2
-+
-+typedef enum {
-+    TSPEC_STATUS_CODE_ADMISSION_ACCEPTED = 0,
-+    TSPEC_STATUS_CODE_ADDTS_INVALID_PARAMS = 0x1,
-+    TSPEC_STATUS_CODE_ADDTS_REQUEST_REFUSED = 0x3,
-+    TSPEC_STATUS_CODE_UNSPECIFIED_QOS_RELATED_FAILURE = 0xC8,
-+    TSPEC_STATUS_CODE_REQUESTED_REFUSED_POLICY_CONFIGURATION = 0xC9,
-+    TSPEC_STATUS_CODE_INSUFFCIENT_BANDWIDTH = 0xCA,
-+    TSPEC_STATUS_CODE_INVALID_PARAMS = 0xCB,
-+    TSPEC_STATUS_CODE_DELTS_SENT    = 0x30,
-+    TSPEC_STATUS_CODE_DELTS_RECV    = 0x31,
-+} TSPEC_STATUS_CODE;
-+
-+/*
-+ * WMM/802.11e Tspec Element
-+ */
-+typedef PREPACK struct wmm_tspec_ie_t {
-+    A_UINT8     elementId;
-+    A_UINT8     len;
-+    A_UINT8     oui[3];
-+    A_UINT8     ouiType;
-+    A_UINT8     ouiSubType;
-+    A_UINT8     version;
-+    A_UINT16    tsInfo_info;
-+    A_UINT8     tsInfo_reserved;
-+    A_UINT16    nominalMSDU;
-+    A_UINT16    maxMSDU;
-+    A_UINT32    minServiceInt;
-+    A_UINT32    maxServiceInt;
-+    A_UINT32    inactivityInt;
-+    A_UINT32    suspensionInt;
-+    A_UINT32    serviceStartTime;
-+    A_UINT32    minDataRate;
-+    A_UINT32    meanDataRate;
-+    A_UINT32    peakDataRate;
-+    A_UINT32    maxBurstSize;
-+    A_UINT32    delayBound;
-+    A_UINT32    minPhyRate;
-+    A_UINT16    sba;
-+    A_UINT16    mediumTime;
-+} POSTPACK WMM_TSPEC_IE;
-+
-+
-+/*
-+ * BEACON management packets
-+ *
-+ *  octet timestamp[8]
-+ *  octet beacon interval[2]
-+ *  octet capability information[2]
-+ *  information element
-+ *      octet elemid
-+ *      octet length
-+ *      octet information[length]
-+ */
-+
-+#define IEEE80211_BEACON_INTERVAL(beacon) \
-+    ((beacon)[8] | ((beacon)[9] << 8))
-+#define IEEE80211_BEACON_CAPABILITY(beacon) \
-+    ((beacon)[10] | ((beacon)[11] << 8))
-+
-+#define IEEE80211_CAPINFO_ESS               0x0001
-+#define IEEE80211_CAPINFO_IBSS              0x0002
-+#define IEEE80211_CAPINFO_CF_POLLABLE       0x0004
-+#define IEEE80211_CAPINFO_CF_POLLREQ        0x0008
-+#define IEEE80211_CAPINFO_PRIVACY           0x0010
-+#define IEEE80211_CAPINFO_SHORT_PREAMBLE    0x0020
-+#define IEEE80211_CAPINFO_PBCC              0x0040
-+#define IEEE80211_CAPINFO_CHNL_AGILITY      0x0080
-+/* bits 8-9 are reserved */
-+#define IEEE80211_CAPINFO_SHORT_SLOTTIME    0x0400
-+#define IEEE80211_CAPINFO_APSD              0x0800
-+/* bit 12 is reserved */
-+#define IEEE80211_CAPINFO_DSSSOFDM          0x2000
-+/* bits 14-15 are reserved */
-+
-+/*
-+ * Authentication Modes
-+ */
-+
-+enum ieee80211_authmode {
-+    IEEE80211_AUTH_NONE     = 0,
-+    IEEE80211_AUTH_OPEN     = 1,
-+    IEEE80211_AUTH_SHARED   = 2,
-+    IEEE80211_AUTH_8021X    = 3,
-+    IEEE80211_AUTH_AUTO     = 4,   /* auto-select/accept */
-+    /* NB: these are used only for ioctls */
-+    IEEE80211_AUTH_WPA      = 5,  /* WPA/RSN  w/ 802.1x */
-+    IEEE80211_AUTH_WPA_PSK  = 6,  /* WPA/RSN  w/ PSK */
-+    IEEE80211_AUTH_WPA_CCKM = 7,  /* WPA/RSN IE  w/ CCKM */
-+};
-+
-+#include "athendpack.h"
-+
-+#endif /* _NET80211_IEEE80211_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h b/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h
-new file mode 100644
-index 0000000..dab6747
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h
-@@ -0,0 +1,163 @@
-+/*
-+ * Copyright (c) 2004-2005 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ *
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/os/linux/include/ieee80211_ioctl.h#1 $
-+ */
-+
-+#ifndef _IEEE80211_IOCTL_H_
-+#define _IEEE80211_IOCTL_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/*
-+ * Extracted from the MADWIFI net80211/ieee80211_ioctl.h
-+ */
-+
-+/*
-+ * WPA/RSN get/set key request.  Specify the key/cipher
-+ * type and whether the key is to be used for sending and/or
-+ * receiving.  The key index should be set only when working
-+ * with global keys (use IEEE80211_KEYIX_NONE for ``no index'').
-+ * Otherwise a unicast/pairwise key is specified by the bssid
-+ * (on a station) or mac address (on an ap).  They key length
-+ * must include any MIC key data; otherwise it should be no
-+ more than IEEE80211_KEYBUF_SIZE.
-+ */
-+struct ieee80211req_key {
-+      u_int8_t        ik_type;        /* key/cipher type */
-+      u_int8_t        ik_pad;
-+      u_int16_t       ik_keyix;       /* key index */
-+      u_int8_t        ik_keylen;      /* key length in bytes */
-+      u_int8_t        ik_flags;
-+#define IEEE80211_KEY_XMIT  0x01
-+#define IEEE80211_KEY_RECV  0x02
-+#define       IEEE80211_KEY_DEFAULT   0x80    /* default xmit key */
-+      u_int8_t        ik_macaddr[IEEE80211_ADDR_LEN];
-+      u_int64_t       ik_keyrsc;      /* key receive sequence counter */
-+      u_int64_t       ik_keytsc;      /* key transmit sequence counter */
-+      u_int8_t        ik_keydata[IEEE80211_KEYBUF_SIZE+IEEE80211_MICBUF_SIZE];
-+};
-+/*
-+ * Delete a key either by index or address.  Set the index
-+ * to IEEE80211_KEYIX_NONE when deleting a unicast key.
-+ */
-+struct ieee80211req_del_key {
-+      u_int8_t        idk_keyix;      /* key index */
-+      u_int8_t        idk_macaddr[IEEE80211_ADDR_LEN];
-+};
-+/*
-+ * MLME state manipulation request.  IEEE80211_MLME_ASSOC
-+ * only makes sense when operating as a station.  The other
-+ * requests can be used when operating as a station or an
-+ * ap (to effect a station).
-+ */
-+struct ieee80211req_mlme {
-+      u_int8_t        im_op;          /* operation to perform */
-+#define       IEEE80211_MLME_ASSOC            1       /* associate station */
-+#define       IEEE80211_MLME_DISASSOC         2       /* disassociate station */
-+#define       IEEE80211_MLME_DEAUTH           3       /* deauthenticate station */
-+#define       IEEE80211_MLME_AUTHORIZE        4       /* authorize station */
-+#define       IEEE80211_MLME_UNAUTHORIZE      5       /* unauthorize station */
-+      u_int16_t       im_reason;      /* 802.11 reason code */
-+      u_int8_t        im_macaddr[IEEE80211_ADDR_LEN];
-+};
-+
-+struct ieee80211req_addpmkid {
-+    u_int8_t    pi_bssid[IEEE80211_ADDR_LEN];
-+    u_int8_t    pi_enable;
-+    u_int8_t    pi_pmkid[16];
-+};
-+
-+#define AUTH_ALG_OPEN_SYSTEM  0x01
-+#define AUTH_ALG_SHARED_KEY   0x02
-+#define AUTH_ALG_LEAP         0x04
-+
-+struct ieee80211req_authalg {
-+   u_int8_t auth_alg;
-+};
-+
-+/*
-+ * Request to add an IE to a Management Frame
-+ */
-+enum{
-+    IEEE80211_APPIE_FRAME_BEACON     = 0,
-+    IEEE80211_APPIE_FRAME_PROBE_REQ  = 1,
-+    IEEE80211_APPIE_FRAME_PROBE_RESP = 2,
-+    IEEE80211_APPIE_FRAME_ASSOC_REQ  = 3,
-+    IEEE80211_APPIE_FRAME_ASSOC_RESP = 4,
-+    IEEE80211_APPIE_NUM_OF_FRAME     = 5
-+};
-+
-+/*
-+ * The Maximum length of the IE that can be added to a Management frame
-+ */
-+#define IEEE80211_APPIE_FRAME_MAX_LEN  78
-+
-+struct ieee80211req_getset_appiebuf {
-+    u_int32_t app_frmtype; /* management frame type for which buffer is added */
-+    u_int32_t app_buflen;  /*application supplied buffer length */
-+    u_int8_t  app_buf[];
-+};
-+
-+/*
-+ * The following definitions are used by an application to set filter
-+ * for receiving management frames
-+ */
-+enum {
-+     IEEE80211_FILTER_TYPE_BEACON      =   0x1,
-+     IEEE80211_FILTER_TYPE_PROBE_REQ   =   0x2,
-+     IEEE80211_FILTER_TYPE_PROBE_RESP  =   0x4,
-+     IEEE80211_FILTER_TYPE_ASSOC_REQ   =   0x8,
-+     IEEE80211_FILTER_TYPE_ASSOC_RESP  =   0x10,
-+     IEEE80211_FILTER_TYPE_AUTH        =   0x20,
-+     IEEE80211_FILTER_TYPE_DEAUTH      =   0x40,
-+     IEEE80211_FILTER_TYPE_DISASSOC    =   0x80,
-+     IEEE80211_FILTER_TYPE_ALL         =   0xFF  /* used to check the valid filter bits */
-+};
-+
-+struct ieee80211req_set_filter {
-+      u_int32_t app_filterype; /* management frame filter type */
-+};
-+
-+enum {
-+    IEEE80211_PARAM_AUTHMODE = 3,   /* Authentication Mode */
-+    IEEE80211_PARAM_MCASTCIPHER = 5,
-+    IEEE80211_PARAM_MCASTKEYLEN = 6,    /* multicast key length */
-+    IEEE80211_PARAM_UCASTCIPHER = 8,
-+    IEEE80211_PARAM_UCASTKEYLEN = 9,    /* unicast key length */
-+      IEEE80211_PARAM_WPA             = 10,   /* WPA mode (0,1,2) */
-+      IEEE80211_PARAM_ROAMING         = 12,   /* roaming mode */
-+      IEEE80211_PARAM_PRIVACY         = 13,   /* privacy invoked */
-+      IEEE80211_PARAM_COUNTERMEASURES = 14,   /* WPA/TKIP countermeasures */
-+      IEEE80211_PARAM_DROPUNENCRYPTED = 15,   /* discard unencrypted frames */
-+};
-+
-+/*
-+ * Values for IEEE80211_PARAM_WPA
-+ */
-+#define WPA_MODE_WPA1   1
-+#define WPA_MODE_WPA2   2
-+#define WPA_MODE_AUTO   3
-+#define WPA_MODE_NONE   4
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _IEEE80211_IOCTL_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h b/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h
-new file mode 100644
-index 0000000..46b613c
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h
-@@ -0,0 +1,77 @@
-+/*-
-+ * Copyright (c) 2001 Atsushi Onoe
-+ * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting
-+ * Copyright (c) 2006 Atheros Communications, Inc.
-+ *
-+ * Wireless Network driver for Atheros AR6001
-+ * All rights reserved.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
-+ *
-+ */
-+#ifndef _IEEE80211_NODE_H_
-+#define _IEEE80211_NODE_H_
-+
-+/*
-+ * Node locking definitions.
-+ */
-+#define IEEE80211_NODE_LOCK_INIT(_nt)   A_MUTEX_INIT(&(_nt)->nt_nodelock)
-+#define IEEE80211_NODE_LOCK_DESTROY(_nt)
-+#define IEEE80211_NODE_LOCK(_nt)        A_MUTEX_LOCK(&(_nt)->nt_nodelock)
-+#define IEEE80211_NODE_UNLOCK(_nt)      A_MUTEX_UNLOCK(&(_nt)->nt_nodelock)
-+#define IEEE80211_NODE_LOCK_BH(_nt)     A_MUTEX_LOCK(&(_nt)->nt_nodelock)
-+#define IEEE80211_NODE_UNLOCK_BH(_nt)   A_MUTEX_UNLOCK(&(_nt)->nt_nodelock)
-+#define IEEE80211_NODE_LOCK_ASSERT(_nt)
-+
-+/*
-+ * Node reference counting definitions.
-+ *
-+ * ieee80211_node_initref   initialize the reference count to 1
-+ * ieee80211_node_incref    add a reference
-+ * ieee80211_node_decref    remove a reference
-+ * ieee80211_node_dectestref    remove a reference and return 1 if this
-+ *              is the last reference, otherwise 0
-+ * ieee80211_node_refcnt    reference count for printing (only)
-+ */
-+#define ieee80211_node_initref(_ni)     ((_ni)->ni_refcnt = 1)
-+#define ieee80211_node_incref(_ni)      ((_ni)->ni_refcnt++)
-+#define ieee80211_node_decref(_ni)      ((_ni)->ni_refcnt--)
-+#define ieee80211_node_dectestref(_ni)  (((_ni)->ni_refcnt--) == 0)
-+#define ieee80211_node_refcnt(_ni)      ((_ni)->ni_refcnt)
-+
-+#define IEEE80211_NODE_HASHSIZE 32
-+/* simple hash is enough for variation of macaddr */
-+#define IEEE80211_NODE_HASH(addr)   \
-+    (((const A_UINT8 *)(addr))[IEEE80211_ADDR_LEN - 1] % \
-+        IEEE80211_NODE_HASHSIZE)
-+
-+/*
-+ * Table of ieee80211_node instances.  Each ieee80211com
-+ * has at least one for holding the scan candidates.
-+ * When operating as an access point or in ibss mode there
-+ * is a second table for associated stations or neighbors.
-+ */
-+struct ieee80211_node_table {
-+    void                   *nt_wmip;       /* back reference */
-+    A_MUTEX_T               nt_nodelock;    /* on node table */
-+    struct bss              *nt_node_first; /* information of all nodes */
-+    struct bss              *nt_node_last;  /* information of all nodes */
-+    struct bss              *nt_hash[IEEE80211_NODE_HASHSIZE];
-+    const char              *nt_name;   /* for debugging */
-+    A_UINT32                nt_scangen; /* gen# for timeout scan */
-+    A_TIMER                 nt_inact_timer;
-+    A_UINT8                 isTimerArmed;   /* is the node timer armed */
-+};
-+
-+#define WLAN_NODE_INACT_TIMEOUT_MSEC            10000
-+
-+#endif /* _IEEE80211_NODE_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/ini_dset.h b/drivers/sdio/function/wlan/ar6000/include/ini_dset.h
-new file mode 100644
-index 0000000..410f2b5
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/ini_dset.h
-@@ -0,0 +1,40 @@
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ */
-+#ifndef _INI_DSET_H_
-+#define _INI_DSET_H_
-+
-+/*
-+ * Each of these represents a WHAL INI table, which consists
-+ * of an "address column" followed by 1 or more "value columns".
-+ *
-+ * Software uses the base WHAL_INI_DATA_ID+column to access a
-+ * DataSet that holds a particular column of data.
-+ */
-+typedef enum {
-+    WHAL_INI_DATA_ID_NULL               =0,
-+    WHAL_INI_DATA_ID_MODE_SPECIFIC      =1,  /* 2,3 */
-+    WHAL_INI_DATA_ID_COMMON             =4,  /* 5 */
-+    WHAL_INI_DATA_ID_BB_RFGAIN          =6,  /* 7,8 */
-+    WHAL_INI_DATA_ID_ANALOG_BANK1       =9,  /* 10 */
-+    WHAL_INI_DATA_ID_ANALOG_BANK2       =11, /* 12 */
-+    WHAL_INI_DATA_ID_ANALOG_BANK3       =13, /* 14, 15 */
-+    WHAL_INI_DATA_ID_ANALOG_BANK6       =16, /* 17, 18 */
-+    WHAL_INI_DATA_ID_ANALOG_BANK7       =19, /* 20 */
-+    WHAL_INI_DATA_ID_MODE_OVERRIDES     =21, /* 22,23 */
-+    WHAL_INI_DATA_ID_COMMON_OVERRIDES   =24, /* 25 */
-+
-+    WHAL_INI_DATA_ID_MAX                =25
-+} WHAL_INI_DATA_ID;
-+
-+typedef PREPACK struct {
-+    A_UINT16 freqIndex; // 1 - A mode 2 - B or G mode 0 - common
-+    A_UINT16 offset;
-+    A_UINT32 newValue;
-+} POSTPACK INI_DSET_REG_OVERRIDE;
-+
-+#endif
-diff --git a/drivers/sdio/function/wlan/ar6000/include/regDb.h b/drivers/sdio/function/wlan/ar6000/include/regDb.h
-new file mode 100644
-index 0000000..b3f665f
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/regDb.h
-@@ -0,0 +1,19 @@
-+/*
-+ * Copyright (c) 2005 Atheros Communications, Inc.
-+ * All rights reserved.
-+ *
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ * This module contains the header files for regulatory module,
-+ * which include the DB schema and DB values.
-+ * $Id:
-+ */
-+
-+#ifndef __REG_DB_H__
-+#define __REG_DB_H__
-+
-+#include "./regulatory/reg_dbschema.h"
-+#include "./regulatory/reg_dbvalues.h"
-+
-+#endif  /* __REG_DB_H__ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/regdump.h b/drivers/sdio/function/wlan/ar6000/include/regdump.h
-new file mode 100644
-index 0000000..0106825
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/regdump.h
-@@ -0,0 +1,33 @@
-+#ifndef __REGDUMP_H__
-+#define __REGDUMP_H__
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ */
-+#if defined(AR6001)
-+#include "AR6001/AR6001_regdump.h"
-+#endif
-+#if defined(AR6002)
-+#include "AR6002/AR6002_regdump.h"
-+#endif
-+
-+#if !defined(__ASSEMBLER__)
-+/*
-+ * Target CPU state at the time of failure is reflected
-+ * in a register dump, which the Host can fetch through
-+ * the diagnostic window.
-+ */
-+struct register_dump_s {
-+    A_UINT32 target_id;               /* Target ID */
-+    A_UINT32 assline;                 /* Line number (if assertion failure) */
-+    A_UINT32 pc;                      /* Program Counter at time of exception */
-+    A_UINT32 badvaddr;                /* Virtual address causing exception */
-+    CPU_exception_frame_t exc_frame;  /* CPU-specific exception info */
-+
-+    /* Could copy top of stack here, too.... */
-+};
-+#endif /* __ASSEMBLER__ */
-+#endif /* __REGDUMP_H__ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/targaddrs.h b/drivers/sdio/function/wlan/ar6000/include/targaddrs.h
-new file mode 100644
-index 0000000..da2a650
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/targaddrs.h
-@@ -0,0 +1,158 @@
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ */
-+
-+#ifndef __TARGADDRS_H__
-+#define __TARGADDRS_H__
-+#if defined(AR6001)
-+#include "AR6001/addrs.h"
-+#endif
-+#if defined(AR6002)
-+#include "AR6002/addrs.h"
-+#endif
-+
-+/*
-+ * AR6K option bits, to enable/disable various features.
-+ * By default, all option bits are 0.
-+ * These bits can be set in LOCAL_SCRATCH register 0.
-+ */
-+#define AR6K_OPTION_BMI_DISABLE      0x01 /* Disable BMI comm with Host */
-+#define AR6K_OPTION_SERIAL_ENABLE    0x02 /* Enable serial port msgs */
-+#define AR6K_OPTION_WDT_DISABLE      0x04 /* WatchDog Timer override */
-+#define AR6K_OPTION_SLEEP_DISABLE    0x08 /* Disable system sleep */
-+#define AR6K_OPTION_STOP_BOOT        0x10 /* Stop boot processes (for ATE) */
-+#define AR6K_OPTION_ENABLE_NOANI     0x20 /* Operate without ANI */
-+#define AR6K_OPTION_DSET_DISABLE     0x40 /* Ignore DataSets */
-+#define AR6K_OPTION_IGNORE_FLASH     0x80 /* Ignore flash during bootup */
-+
-+/*
-+ * xxx_HOST_INTEREST_ADDRESS is the address in Target RAM of the
-+ * host_interest structure.  It must match the address of the _host_interest
-+ * symbol (see linker script).
-+ *
-+ * Host Interest is shared between Host and Target in order to coordinate
-+ * between the two, and is intended to remain constant (with additions only
-+ * at the end) across software releases.
-+ */
-+#define AR6001_HOST_INTEREST_ADDRESS     0x80000600
-+#define AR6002_HOST_INTEREST_ADDRESS     0x00500400
-+
-+#define HOST_INTEREST_MAX_SIZE          0x100
-+
-+#if !defined(__ASSEMBLER__)
-+struct register_dump_s;
-+struct dbglog_hdr_s;
-+
-+/*
-+ * These are items that the Host may need to access
-+ * via BMI or via the Diagnostic Window. The position
-+ * of items in this structure must remain constant
-+ * across firmware revisions!
-+ *
-+ * Types for each item must be fixed size across
-+ * target and host platforms.
-+ *
-+ * More items may be added at the end.
-+ */
-+struct host_interest_s {
-+    /*
-+     * Pointer to application-defined area, if any.
-+     * Set by Target application during startup.
-+     */
-+    A_UINT32               hi_app_host_interest;                      /* 0x00 */
-+
-+    /* Pointer to register dump area, valid after Target crash. */
-+    A_UINT32               hi_failure_state;                          /* 0x04 */
-+
-+    /* Pointer to debug logging header */
-+    A_UINT32               hi_dbglog_hdr;                             /* 0x08 */
-+
-+    /* Indicates whether or not flash is present on Target.
-+     * NB: flash_is_present indicator is here not just
-+     * because it might be of interest to the Host; but
-+     * also because it's set early on by Target's startup
-+     * asm code and we need it to have a special RAM address
-+     * so that it doesn't get reinitialized with the rest
-+     * of data.
-+     */
-+    A_UINT32               hi_flash_is_present;                       /* 0x0c */
-+
-+    /*
-+     * General-purpose flag bits, similar to AR6000_OPTION_* flags.
-+     * Can be used by application rather than by OS.
-+     */
-+    A_UINT32               hi_option_flag;                            /* 0x10 */
-+
-+    /*
-+     * Boolean that determines whether or not to
-+     * display messages on the serial port.
-+     */
-+    A_UINT32               hi_serial_enable;                          /* 0x14 */
-+
-+    /* Start address of Flash DataSet index, if any */
-+    A_UINT32               hi_dset_list_head;                         /* 0x18 */
-+
-+    /* Override Target application start address */
-+    A_UINT32               hi_app_start;                              /* 0x1c */
-+
-+    /* Clock and voltage tuning */
-+    A_UINT32               hi_skip_clock_init;                        /* 0x20 */
-+    A_UINT32               hi_core_clock_setting;                     /* 0x24 */
-+    A_UINT32               hi_cpu_clock_setting;                      /* 0x28 */
-+    A_UINT32               hi_system_sleep_setting;                   /* 0x2c */
-+    A_UINT32               hi_xtal_control_setting;                   /* 0x30 */
-+    A_UINT32               hi_pll_ctrl_setting_24ghz;                 /* 0x34 */
-+    A_UINT32               hi_pll_ctrl_setting_5ghz;                  /* 0x38 */
-+    A_UINT32               hi_ref_voltage_trim_setting;               /* 0x3c */
-+    A_UINT32               hi_clock_info;                             /* 0x40 */
-+
-+    /*
-+     * Flash configuration overrides, used only
-+     * when firmware is not executing from flash.
-+     * (When using flash, modify the global variables
-+     * with equivalent names.)
-+     */
-+    A_UINT32               hi_bank0_addr_value;                       /* 0x44 */
-+    A_UINT32               hi_bank0_read_value;                       /* 0x48 */
-+    A_UINT32               hi_bank0_write_value;                      /* 0x4c */
-+    A_UINT32               hi_bank0_config_value;                     /* 0x50 */
-+
-+    /* Pointer to Board Data  */
-+    A_UINT32               hi_board_data;                             /* 0x54 */
-+    A_UINT32               hi_board_data_initialized;                 /* 0x58 */
-+
-+    A_UINT32               hi_dset_RAM_index_table;                   /* 0x5c */
-+
-+    A_UINT32               hi_desired_baud_rate;                      /* 0x60 */
-+    A_UINT32               hi_dbglog_config;                          /* 0x64 */
-+    A_UINT32               hi_end_RAM_reserve_sz;                     /* 0x68 */
-+    A_UINT32               hi_mbox_io_block_sz;                       /* 0x6c */
-+
-+    A_UINT32               hi_num_bpatch_streams;                     /* 0x70 */
-+    A_UINT32               hi_mbox_isr_yield_limit;                   /* 0x74 */
-+
-+    A_UINT32               hi_refclk_hz;                              /* 0x78 */
-+};
-+
-+/* Bits defined in hi_option_flag */
-+#define HI_OPTION_TIMER_WAR     1 /* not really used */
-+
-+/*
-+ * Intended for use by Host software, this macro returns the Target RAM
-+ * address of any item in the host_interest structure.
-+ * Example: target_addr = AR6001_HOST_INTEREST_ITEM_ADDRESS(hi_board_data);
-+ */
-+#define AR6001_HOST_INTEREST_ITEM_ADDRESS(item) \
-+    ((A_UINT32)&((((struct host_interest_s *)(AR6001_HOST_INTEREST_ADDRESS))->item)))
-+
-+#define AR6002_HOST_INTEREST_ITEM_ADDRESS(item) \
-+    ((A_UINT32)&((((struct host_interest_s *)(AR6002_HOST_INTEREST_ADDRESS))->item)))
-+
-+
-+#endif /* !__ASSEMBLER__ */
-+
-+#endif /* __TARGADDRS_H__ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/testcmd.h b/drivers/sdio/function/wlan/ar6000/include/testcmd.h
-new file mode 100644
-index 0000000..737533a
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/testcmd.h
-@@ -0,0 +1,144 @@
-+/*
-+ * Copyright (c) 2004-2005 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ */
-+
-+#ifndef  TESTCMD_H_
-+#define  TESTCMD_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+typedef enum {
-+    ZEROES_PATTERN = 0,
-+    ONES_PATTERN,
-+    REPEATING_10,
-+    PN7_PATTERN,
-+    PN9_PATTERN,
-+    PN15_PATTERN
-+}TX_DATA_PATTERN;
-+
-+/* Continous tx
-+   mode : TCMD_CONT_TX_OFF - Disabling continous tx
-+          TCMD_CONT_TX_SINE - Enable continuous unmodulated tx
-+          TCMD_CONT_TX_FRAME- Enable continuous modulated tx
-+   freq : Channel freq in Mhz. (e.g 2412 for channel 1 in 11 g)
-+dataRate: 0 - 1 Mbps
-+          1 - 2 Mbps
-+          2 - 5.5 Mbps
-+          3 - 11 Mbps
-+          4 - 6 Mbps
-+          5 - 9 Mbps
-+          6 - 12 Mbps
-+          7 - 18 Mbps
-+          8 - 24 Mbps
-+          9 - 36 Mbps
-+         10 - 28 Mbps
-+         11 - 54 Mbps
-+  txPwr: Tx power in dBm[5 -11] for unmod Tx, [5-14] for mod Tx
-+antenna:  1 - one antenna
-+          2 - two antenna
-+Note : Enable/disable continuous tx test cmd works only when target is awake.
-+*/
-+
-+typedef enum {
-+    TCMD_CONT_TX_OFF = 0,
-+    TCMD_CONT_TX_SINE,
-+    TCMD_CONT_TX_FRAME,
-+    TCMD_CONT_TX_TX99,
-+    TCMD_CONT_TX_TX100
-+} TCMD_CONT_TX_MODE;
-+
-+typedef PREPACK struct {
-+    A_UINT32                 testCmdId;
-+    A_UINT32                mode;
-+    A_UINT32                freq;
-+    A_UINT32                dataRate;
-+    A_INT32                 txPwr;
-+    A_UINT32                antenna;
-+    A_UINT32                enANI;
-+    A_UINT32                scramblerOff;
-+    A_UINT32                aifsn;
-+    A_UINT16                pktSz;
-+    A_UINT16                txPattern;
-+} POSTPACK TCMD_CONT_TX;
-+
-+#define TCMD_TXPATTERN_ZERONE                 0x1
-+#define TCMD_TXPATTERN_ZERONE_DIS_SCRAMBLE    0x2
-+
-+/* Continuous Rx
-+ act: TCMD_CONT_RX_PROMIS - promiscuous mode (accept all incoming frames)
-+      TCMD_CONT_RX_FILTER - filter mode (accept only frames with dest
-+                                             address equal specified
-+                                             mac address (set via act =3)
-+      TCMD_CONT_RX_REPORT  off mode  (disable cont rx mode and get the
-+                                          report from the last cont
-+                                          Rx test)
-+
-+     TCMD_CONT_RX_SETMAC - set MacAddr mode (sets the MAC address for the
-+                                                 target. This Overrides
-+                                                 the default MAC address.)
-+
-+*/
-+typedef enum {
-+    TCMD_CONT_RX_PROMIS =0,
-+    TCMD_CONT_RX_FILTER,
-+    TCMD_CONT_RX_REPORT,
-+    TCMD_CONT_RX_SETMAC
-+} TCMD_CONT_RX_ACT;
-+
-+typedef PREPACK struct {
-+    A_UINT32         testCmdId;
-+    A_UINT32        act;
-+    A_UINT32        enANI;
-+    PREPACK union {
-+        struct PREPACK TCMD_CONT_RX_PARA {
-+            A_UINT32    freq;
-+            A_UINT32    antenna;
-+        } POSTPACK para;
-+        struct PREPACK TCMD_CONT_RX_REPORT {
-+            A_UINT32    totalPkt;
-+            A_INT32    rssiInDBm;
-+        } POSTPACK report;
-+        struct PREPACK TCMD_CONT_RX_MAC {
-+            A_UCHAR    addr[ATH_MAC_LEN];
-+        } POSTPACK mac;
-+    } POSTPACK u;
-+} POSTPACK TCMD_CONT_RX;
-+
-+/* Force sleep/wake  test cmd
-+ mode: TCMD_PM_WAKEUP - Wakeup the target
-+       TCMD_PM_SLEEP - Force the target to sleep.
-+ */
-+typedef enum {
-+    TCMD_PM_WAKEUP = 1, /* be consistent with target */
-+    TCMD_PM_SLEEP
-+} TCMD_PM_MODE;
-+
-+typedef PREPACK struct {
-+      A_UINT32  testCmdId;
-+    A_UINT32  mode;
-+} POSTPACK TCMD_PM;
-+
-+typedef enum{
-+    TCMD_CONT_TX_ID,
-+    TCMD_CONT_RX_ID,
-+    TCMD_PM_ID
-+   } TCMD_ID;
-+
-+typedef PREPACK union {
-+          TCMD_CONT_TX contTx;
-+          TCMD_CONT_RX contRx;
-+          TCMD_PM pm ;
-+} POSTPACK TEST_CMD;
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* TESTCMD_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/wlan_api.h b/drivers/sdio/function/wlan/ar6000/include/wlan_api.h
-new file mode 100644
-index 0000000..aabca4b
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/wlan_api.h
-@@ -0,0 +1,101 @@
-+#ifndef _HOST_WLAN_API_H_
-+#define _HOST_WLAN_API_H_
-+/*
-+ * Copyright (c) 2004-2005 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * This file contains the API for the host wlan module
-+ *
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/include/wlan_api.h#1 $
-+ *
-+ *
-+ *  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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+struct ieee80211_node_table;
-+struct ieee80211_frame;
-+
-+struct ieee80211_common_ie {
-+    A_UINT16    ie_chan;
-+    A_UINT8     *ie_tstamp;
-+    A_UINT8     *ie_ssid;
-+    A_UINT8     *ie_rates;
-+    A_UINT8     *ie_xrates;
-+    A_UINT8     *ie_country;
-+    A_UINT8     *ie_wpa;
-+    A_UINT8     *ie_rsn;
-+    A_UINT8     *ie_wmm;
-+    A_UINT8     *ie_ath;
-+    A_UINT16    ie_capInfo;
-+    A_UINT16    ie_beaconInt;
-+    A_UINT8     *ie_tim;
-+    A_UINT8     *ie_chswitch;
-+    A_UINT8     ie_erp;
-+    A_UINT8     *ie_wsc;
-+};
-+
-+typedef struct bss {
-+    A_UINT8                      ni_macaddr[6];
-+    A_UINT8                      ni_snr;
-+    A_INT16                      ni_rssi;
-+    struct bss                   *ni_list_next;
-+    struct bss                   *ni_list_prev;
-+    struct bss                   *ni_hash_next;
-+    struct bss                   *ni_hash_prev;
-+    struct ieee80211_common_ie   ni_cie;
-+    A_UINT8                     *ni_buf;
-+    struct ieee80211_node_table *ni_table;
-+    A_UINT32                     ni_refcnt;
-+    int                          ni_scangen;
-+    A_UINT32                     ni_tstamp;
-+} bss_t;
-+
-+typedef void wlan_node_iter_func(void *arg, bss_t *);
-+
-+bss_t *wlan_node_alloc(struct ieee80211_node_table *nt, int wh_size);
-+void wlan_node_free(bss_t *ni);
-+void wlan_setup_node(struct ieee80211_node_table *nt, bss_t *ni,
-+                const A_UINT8 *macaddr);
-+bss_t *wlan_find_node(struct ieee80211_node_table *nt, const A_UINT8 *macaddr);
-+void wlan_node_reclaim(struct ieee80211_node_table *nt, bss_t *ni);
-+void wlan_free_allnodes(struct ieee80211_node_table *nt);
-+void wlan_iterate_nodes(struct ieee80211_node_table *nt, wlan_node_iter_func *f,
-+                        void *arg);
-+
-+void wlan_node_table_init(void *wmip, struct ieee80211_node_table *nt);
-+void wlan_node_table_reset(struct ieee80211_node_table *nt);
-+void wlan_node_table_cleanup(struct ieee80211_node_table *nt);
-+
-+A_STATUS wlan_parse_beacon(A_UINT8 *buf, int framelen,
-+                           struct ieee80211_common_ie *cie);
-+
-+A_UINT16 wlan_ieee2freq(int chan);
-+A_UINT32 wlan_freq2ieee(A_UINT16 freq);
-+
-+
-+bss_t *
-+wlan_find_Ssidnode (struct ieee80211_node_table *nt, A_UCHAR *pSsid,
-+                                      A_UINT32 ssidLength, A_BOOL bIsWPA2);
-+
-+void
-+wlan_node_return (struct ieee80211_node_table *nt, bss_t *ni);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _HOST_WLAN_API_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/wlan_dset.h b/drivers/sdio/function/wlan/ar6000/include/wlan_dset.h
-new file mode 100644
-index 0000000..8a876d6
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/wlan_dset.h
-@@ -0,0 +1,20 @@
-+/*
-+ * Copyright (c) 2007 Atheros Communications, Inc.
-+ * All rights reserved.
-+ *
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ */
-+
-+#ifndef __WLAN_DSET_H__
-+#define __WKAN_DSET_H__
-+
-+typedef PREPACK struct wow_config_dset {
-+
-+    A_UINT8 valid_dset;
-+    A_UINT8 gpio_enable;
-+    A_UINT16 gpio_pin;
-+} POSTPACK WOW_CONFIG_DSET;
-+
-+#endif
-diff --git a/drivers/sdio/function/wlan/ar6000/include/wmi.h b/drivers/sdio/function/wlan/ar6000/include/wmi.h
-new file mode 100644
-index 0000000..045acd4
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/wmi.h
-@@ -0,0 +1,1743 @@
-+/*
-+ * Copyright (c) 2004-2006 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ * This file contains the definitions of the WMI protocol specified in the
-+ * Wireless Module Interface (WMI).  It includes definitions of all the
-+ * commands and events. Commands are messages from the host to the WM.
-+ * Events and Replies are messages from the WM to the host.
-+ *
-+ * Ownership of correctness in regards to WMI commands
-+ * belongs to the host driver and the WM is not required to validate
-+ * parameters for value, proper range, or any other checking.
-+ *
-+ */
-+
-+#ifndef _WMI_H_
-+#define _WMI_H_
-+
-+#ifndef ATH_TARGET
-+#include "athstartpack.h"
-+#endif
-+
-+#include "wmix.h"
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#define WMI_PROTOCOL_VERSION    0x0002
-+#define WMI_PROTOCOL_REVISION   0x0000
-+
-+#define ATH_MAC_LEN             6               /* length of mac in bytes */
-+#define WMI_CMD_MAX_LEN         100
-+#define WMI_CONTROL_MSG_MAX_LEN     256
-+#define WMI_OPT_CONTROL_MSG_MAX_LEN 1536
-+#define IS_ETHERTYPE(_typeOrLen)        ((_typeOrLen) >= 0x0600)
-+#define RFC1042OUI      {0x00, 0x00, 0x00}
-+
-+#define IP_ETHERTYPE 0x0800
-+
-+#define WMI_IMPLICIT_PSTREAM 0xFF
-+#define WMI_MAX_THINSTREAM 15
-+
-+struct host_app_area_s {
-+    A_UINT32 wmi_protocol_ver;
-+};
-+
-+/*
-+ * Data Path
-+ */
-+typedef PREPACK struct {
-+    A_UINT8     dstMac[ATH_MAC_LEN];
-+    A_UINT8     srcMac[ATH_MAC_LEN];
-+    A_UINT16    typeOrLen;
-+} POSTPACK ATH_MAC_HDR;
-+
-+typedef PREPACK struct {
-+    A_UINT8     dsap;
-+    A_UINT8     ssap;
-+    A_UINT8     cntl;
-+    A_UINT8     orgCode[3];
-+    A_UINT16    etherType;
-+} POSTPACK ATH_LLC_SNAP_HDR;
-+
-+typedef enum {
-+    DATA_MSGTYPE = 0x0,
-+    CNTL_MSGTYPE,
-+    SYNC_MSGTYPE
-+} WMI_MSG_TYPE;
-+
-+
-+typedef PREPACK struct {
-+    A_INT8      rssi;
-+    A_UINT8     info;            /* WMI_MSG_TYPE in lower 2 bits - b1b0 */
-+                                 /* UP in next 3 bits - b4b3b2 */
-+#define WMI_DATA_HDR_MSG_TYPE_MASK  0x03
-+#define WMI_DATA_HDR_MSG_TYPE_SHIFT 0
-+#define WMI_DATA_HDR_UP_MASK        0x07
-+#define WMI_DATA_HDR_UP_SHIFT       2
-+#define WMI_DATA_HDR_IS_MSG_TYPE(h, t)  (((h)->info & (WMI_DATA_HDR_MSG_TYPE_MASK)) == (t))
-+} POSTPACK WMI_DATA_HDR;
-+
-+
-+#define WMI_DATA_HDR_SET_MSG_TYPE(h, t) (h)->info = (((h)->info & ~(WMI_DATA_HDR_MSG_TYPE_MASK << WMI_DATA_HDR_MSG_TYPE_SHIFT)) | (t << WMI_DATA_HDR_MSG_TYPE_SHIFT))
-+#define WMI_DATA_HDR_SET_UP(h, p) (h)->info = (((h)->info & ~(WMI_DATA_HDR_UP_MASK << WMI_DATA_HDR_UP_SHIFT)) | (p << WMI_DATA_HDR_UP_SHIFT))
-+
-+/*
-+ * Control Path
-+ */
-+typedef PREPACK struct {
-+    A_UINT16    commandId;
-+} POSTPACK WMI_CMD_HDR;        /* used for commands and events */
-+
-+/*
-+ * List of Commnands
-+ */
-+typedef enum {
-+    WMI_CONNECT_CMDID           = 0x0001,
-+    WMI_RECONNECT_CMDID,
-+    WMI_DISCONNECT_CMDID,
-+    WMI_SYNCHRONIZE_CMDID,
-+    WMI_CREATE_PSTREAM_CMDID,
-+    WMI_DELETE_PSTREAM_CMDID,
-+    WMI_START_SCAN_CMDID,
-+    WMI_SET_SCAN_PARAMS_CMDID,
-+    WMI_SET_BSS_FILTER_CMDID,
-+    WMI_SET_PROBED_SSID_CMDID,
-+    WMI_SET_LISTEN_INT_CMDID,
-+    WMI_SET_BMISS_TIME_CMDID,
-+    WMI_SET_DISC_TIMEOUT_CMDID,
-+    WMI_GET_CHANNEL_LIST_CMDID,
-+    WMI_SET_BEACON_INT_CMDID,
-+    WMI_GET_STATISTICS_CMDID,
-+    WMI_SET_CHANNEL_PARAMS_CMDID,
-+    WMI_SET_POWER_MODE_CMDID,
-+    WMI_SET_IBSS_PM_CAPS_CMDID,
-+    WMI_SET_POWER_PARAMS_CMDID,
-+    WMI_SET_POWERSAVE_TIMERS_POLICY_CMDID,
-+    WMI_ADD_CIPHER_KEY_CMDID,
-+    WMI_DELETE_CIPHER_KEY_CMDID,
-+    WMI_ADD_KRK_CMDID,
-+    WMI_DELETE_KRK_CMDID,
-+    WMI_SET_PMKID_CMDID,
-+    WMI_SET_TX_PWR_CMDID,
-+    WMI_GET_TX_PWR_CMDID,
-+    WMI_SET_ASSOC_INFO_CMDID,
-+    WMI_ADD_BAD_AP_CMDID,
-+    WMI_DELETE_BAD_AP_CMDID,
-+    WMI_SET_TKIP_COUNTERMEASURES_CMDID,
-+    WMI_RSSI_THRESHOLD_PARAMS_CMDID,
-+    WMI_TARGET_ERROR_REPORT_BITMASK_CMDID,
-+    WMI_SET_ACCESS_PARAMS_CMDID,
-+    WMI_SET_RETRY_LIMITS_CMDID,
-+    WMI_SET_OPT_MODE_CMDID,
-+    WMI_OPT_TX_FRAME_CMDID,
-+    WMI_SET_VOICE_PKT_SIZE_CMDID,
-+    WMI_SET_MAX_SP_LEN_CMDID,
-+    WMI_SET_ROAM_CTRL_CMDID,
-+    WMI_GET_ROAM_TBL_CMDID,
-+    WMI_GET_ROAM_DATA_CMDID,
-+    WMI_ENABLE_RM_CMDID,
-+    WMI_SET_MAX_OFFHOME_DURATION_CMDID,
-+    WMI_EXTENSION_CMDID,                        /* Non-wireless extensions */
-+    WMI_SNR_THRESHOLD_PARAMS_CMDID,
-+    WMI_LQ_THRESHOLD_PARAMS_CMDID,
-+    WMI_SET_LPREAMBLE_CMDID,
-+    WMI_SET_RTS_CMDID,
-+    WMI_CLR_RSSI_SNR_CMDID,
-+    WMI_SET_FIXRATES_CMDID,
-+    WMI_GET_FIXRATES_CMDID,
-+    WMI_SET_AUTH_MODE_CMDID,
-+    WMI_SET_REASSOC_MODE_CMDID,
-+    WMI_SET_WMM_CMDID,
-+    WMI_SET_WMM_TXOP_CMDID,
-+    WMI_TEST_CMDID,
-+    WMI_SET_BT_STATUS_CMDID,
-+    WMI_SET_BT_PARAMS_CMDID,
-+
-+    WMI_SET_KEEPALIVE_CMDID,
-+    WMI_GET_KEEPALIVE_CMDID,
-+    WMI_SET_APPIE_CMDID,
-+    WMI_GET_APPIE_CMDID,
-+    WMI_SET_WSC_STATUS_CMDID,
-+
-+    /* Wake on Wireless */
-+    WMI_SET_HOST_SLEEP_MODE_CMDID,
-+    WMI_SET_WOW_MODE_CMDID,
-+    WMI_GET_WOW_LIST_CMDID,
-+    WMI_ADD_WOW_PATTERN_CMDID,
-+    WMI_DEL_WOW_PATTERN_CMDID,
-+    WMI_SET_MAC_ADDRESS_CMDID,
-+    WMI_SET_AKMP_PARAMS_CMDID,
-+    WMI_SET_PMKID_LIST_CMDID,
-+    WMI_GET_PMKID_LIST_CMDID,
-+
-+    /*
-+     * Developer commands starts at 0xF000
-+     */
-+    WMI_SET_BITRATE_CMDID = 0xF000,
-+    WMI_GET_BITRATE_CMDID,
-+    WMI_SET_WHALPARAM_CMDID,
-+
-+} WMI_COMMAND_ID;
-+
-+/*
-+ * Frame Types
-+ */
-+typedef enum {
-+    WMI_FRAME_BEACON        =   0,
-+    WMI_FRAME_PROBE_REQ,
-+    WMI_FRAME_PROBE_RESP,
-+    WMI_FRAME_ASSOC_REQ,
-+    WMI_FRAME_ASSOC_RESP,
-+    WMI_NUM_MGMT_FRAME
-+} WMI_MGMT_FRAME_TYPE;
-+
-+/*
-+ * Connect Command
-+ */
-+typedef enum {
-+    INFRA_NETWORK       = 0x01,
-+    ADHOC_NETWORK       = 0x02,
-+    ADHOC_CREATOR       = 0x04,
-+} NETWORK_TYPE;
-+
-+typedef enum {
-+    OPEN_AUTH           = 0x01,
-+    SHARED_AUTH         = 0x02,
-+    LEAP_AUTH           = 0x04,  /* different from IEEE_AUTH_MODE definitions */
-+} DOT11_AUTH_MODE;
-+
-+typedef enum {
-+    NONE_AUTH           = 0x01,
-+    WPA_AUTH            = 0x02,
-+    WPA_PSK_AUTH        = 0x03,
-+    WPA2_AUTH           = 0x04,
-+    WPA2_PSK_AUTH       = 0x05,
-+    WPA_AUTH_CCKM       = 0x06,
-+    WPA2_AUTH_CCKM      = 0x07,
-+} AUTH_MODE;
-+
-+typedef enum {
-+    NONE_CRYPT          = 0x01,
-+    WEP_CRYPT           = 0x02,
-+    TKIP_CRYPT          = 0x03,
-+    AES_CRYPT           = 0x04,
-+} CRYPTO_TYPE;
-+
-+#define WMI_MIN_CRYPTO_TYPE NONE_CRYPT
-+#define WMI_MAX_CRYPTO_TYPE (AES_CRYPT + 1)
-+
-+#define WMI_MIN_KEY_INDEX   0
-+#define WMI_MAX_KEY_INDEX   3
-+
-+#define WMI_MAX_KEY_LEN     32
-+
-+#define WMI_MAX_SSID_LEN    32
-+
-+typedef enum {
-+    CONNECT_ASSOC_POLICY_USER = 0x0001,
-+    CONNECT_SEND_REASSOC = 0x0002,
-+    CONNECT_IGNORE_WPAx_GROUP_CIPHER = 0x0004,
-+    CONNECT_PROFILE_MATCH_DONE = 0x0008,
-+    CONNECT_IGNORE_AAC_BEACON = 0x0010,
-+    CONNECT_CSA_FOLLOW_BSS = 0x0020,
-+} WMI_CONNECT_CTRL_FLAGS_BITS;
-+
-+#define DEFAULT_CONNECT_CTRL_FLAGS         (CONNECT_CSA_FOLLOW_BSS)
-+
-+typedef PREPACK struct {
-+    A_UINT8     networkType;
-+    A_UINT8     dot11AuthMode;
-+    A_UINT8     authMode;
-+    A_UINT8     pairwiseCryptoType;
-+    A_UINT8     pairwiseCryptoLen;
-+    A_UINT8     groupCryptoType;
-+    A_UINT8     groupCryptoLen;
-+    A_UINT8     ssidLength;
-+    A_UCHAR     ssid[WMI_MAX_SSID_LEN];
-+    A_UINT16    channel;
-+    A_UINT8     bssid[ATH_MAC_LEN];
-+    A_UINT32    ctrl_flags;
-+} POSTPACK WMI_CONNECT_CMD;
-+
-+/*
-+ * WMI_RECONNECT_CMDID
-+ */
-+typedef PREPACK struct {
-+    A_UINT16    channel;                    /* hint */
-+    A_UINT8     bssid[ATH_MAC_LEN];         /* mandatory if set */
-+} POSTPACK WMI_RECONNECT_CMD;
-+
-+/*
-+ * WMI_ADD_CIPHER_KEY_CMDID
-+ */
-+typedef enum {
-+    PAIRWISE_USAGE      = 0x00,
-+    GROUP_USAGE         = 0x01,
-+    TX_USAGE            = 0x02,     /* default Tx Key - Static WEP only */
-+} KEY_USAGE;
-+
-+/*
-+ * Bit Flag
-+ * Bit 0 - Initialise TSC - default is Initialize
-+ */
-+#define KEY_OP_INIT_TSC       0x01
-+#define KEY_OP_INIT_RSC       0x02
-+
-+#define KEY_OP_INIT_VAL     0x03     /* Default Initialise the TSC & RSC */
-+#define KEY_OP_VALID_MASK   0x03
-+
-+typedef PREPACK struct {
-+    A_UINT8     keyIndex;
-+    A_UINT8     keyType;
-+    A_UINT8     keyUsage;           /* KEY_USAGE */
-+    A_UINT8     keyLength;
-+    A_UINT8     keyRSC[8];          /* key replay sequence counter */
-+    A_UINT8     key[WMI_MAX_KEY_LEN];
-+    A_UINT8     key_op_ctrl;       /* Additional Key Control information */
-+} POSTPACK WMI_ADD_CIPHER_KEY_CMD;
-+
-+/*
-+ * WMI_DELETE_CIPHER_KEY_CMDID
-+ */
-+typedef PREPACK struct {
-+    A_UINT8     keyIndex;
-+} POSTPACK WMI_DELETE_CIPHER_KEY_CMD;
-+
-+#define WMI_KRK_LEN     16
-+/*
-+ * WMI_ADD_KRK_CMDID
-+ */
-+typedef PREPACK struct {
-+    A_UINT8     krk[WMI_KRK_LEN];
-+} POSTPACK WMI_ADD_KRK_CMD;
-+
-+/*
-+ * WMI_SET_TKIP_COUNTERMEASURES_CMDID
-+ */
-+typedef enum {
-+    WMI_TKIP_CM_DISABLE = 0x0,
-+    WMI_TKIP_CM_ENABLE  = 0x1,
-+} WMI_TKIP_CM_CONTROL;
-+
-+typedef PREPACK struct {
-+    A_UINT8  cm_en;                     /* WMI_TKIP_CM_CONTROL */
-+} POSTPACK WMI_SET_TKIP_COUNTERMEASURES_CMD;
-+
-+/*
-+ * WMI_SET_PMKID_CMDID
-+ */
-+
-+#define WMI_PMKID_LEN 16
-+
-+typedef enum {
-+   PMKID_DISABLE = 0,
-+   PMKID_ENABLE  = 1,
-+} PMKID_ENABLE_FLG;
-+
-+typedef PREPACK struct {
-+    A_UINT8     bssid[ATH_MAC_LEN];
-+    A_UINT8     enable;                 /* PMKID_ENABLE_FLG */
-+    A_UINT8     pmkid[WMI_PMKID_LEN];
-+} POSTPACK WMI_SET_PMKID_CMD;
-+
-+/*
-+ * WMI_START_SCAN_CMD
-+ */
-+typedef enum {
-+    WMI_LONG_SCAN  = 0,
-+    WMI_SHORT_SCAN = 1,
-+} WMI_SCAN_TYPE;
-+
-+typedef PREPACK struct {
-+    A_BOOL   forceFgScan;
-+    A_BOOL   isLegacy;        /* For Legacy Cisco AP compatibility */
-+    A_UINT32 homeDwellTime;   /* Maximum duration in the home channel(milliseconds) */
-+    A_UINT32 forceScanInterval;    /* Time interval between scans (milliseconds)*/
-+    A_UINT8  scanType;           /* WMI_SCAN_TYPE */
-+} POSTPACK WMI_START_SCAN_CMD;
-+
-+/*
-+ * WMI_SET_SCAN_PARAMS_CMDID
-+ */
-+#define WMI_SHORTSCANRATIO_DEFAULT      3
-+typedef enum {
-+    CONNECT_SCAN_CTRL_FLAGS = 0x01,    /* set if can scan in the Connect cmd */
-+    SCAN_CONNECTED_CTRL_FLAGS = 0x02,  /* set if scan for the SSID it is */
-+                                       /* already connected to */
-+    ACTIVE_SCAN_CTRL_FLAGS = 0x04,     /* set if enable active scan */
-+    ROAM_SCAN_CTRL_FLAGS = 0x08,       /* set if enable roam scan when bmiss and lowrssi */
-+    REPORT_BSSINFO_CTRL_FLAGS = 0x10,   /* set if follows customer BSSINFO reporting rule */
-+    ENABLE_AUTO_CTRL_FLAGS = 0x20,      /* if disabled, target doesn't
-+                                          scan after a disconnect event  */
-+    ENABLE_SCAN_ABORT_EVENT = 0x40      /* Scan complete event with canceled status will be generated when a scan is prempted before it gets completed */
-+
-+} WMI_SCAN_CTRL_FLAGS_BITS;
-+
-+#define CAN_SCAN_IN_CONNECT(flags)      (flags & CONNECT_SCAN_CTRL_FLAGS)
-+#define CAN_SCAN_CONNECTED(flags)       (flags & SCAN_CONNECTED_CTRL_FLAGS)
-+#define ENABLE_ACTIVE_SCAN(flags)       (flags & ACTIVE_SCAN_CTRL_FLAGS)
-+#define ENABLE_ROAM_SCAN(flags)         (flags & ROAM_SCAN_CTRL_FLAGS)
-+#define CONFIG_REPORT_BSSINFO(flags)     (flags & REPORT_BSSINFO_CTRL_FLAGS)
-+#define IS_AUTO_SCAN_ENABLED(flags)      (flags & ENABLE_AUTO_CTRL_FLAGS)
-+#define SCAN_ABORT_EVENT_ENABLED(flags) (flags & ENABLE_SCAN_ABORT_EVENT)
-+
-+#define DEFAULT_SCAN_CTRL_FLAGS         (CONNECT_SCAN_CTRL_FLAGS| SCAN_CONNECTED_CTRL_FLAGS| ACTIVE_SCAN_CTRL_FLAGS| ROAM_SCAN_CTRL_FLAGS | ENABLE_AUTO_CTRL_FLAGS)
-+
-+
-+typedef PREPACK struct {
-+    A_UINT16    fg_start_period;        /* seconds */
-+    A_UINT16    fg_end_period;          /* seconds */
-+    A_UINT16    bg_period;              /* seconds */
-+    A_UINT16    maxact_chdwell_time;    /* msec */
-+    A_UINT16    pas_chdwell_time;       /* msec */
-+    A_UINT8     shortScanRatio;         /* how many shorts scan for one long */
-+    A_UINT8     scanCtrlFlags;
-+    A_UINT16    minact_chdwell_time;    /* msec */
-+    A_UINT32    max_dfsch_act_time;  /* msecs */
-+} POSTPACK WMI_SCAN_PARAMS_CMD;
-+
-+/*
-+ * WMI_SET_BSS_FILTER_CMDID
-+ */
-+typedef enum {
-+    NONE_BSS_FILTER = 0x0,              /* no beacons forwarded */
-+    ALL_BSS_FILTER,                     /* all beacons forwarded */
-+    PROFILE_FILTER,                     /* only beacons matching profile */
-+    ALL_BUT_PROFILE_FILTER,             /* all but beacons matching profile */
-+    CURRENT_BSS_FILTER,                 /* only beacons matching current BSS */
-+    ALL_BUT_BSS_FILTER,                 /* all but beacons matching BSS */
-+    PROBED_SSID_FILTER,                 /* beacons matching probed ssid */
-+    LAST_BSS_FILTER,                    /* marker only */
-+} WMI_BSS_FILTER;
-+
-+typedef PREPACK struct {
-+    A_UINT8    bssFilter;                      /* see WMI_BSS_FILTER */
-+    A_UINT32   ieMask;
-+} POSTPACK WMI_BSS_FILTER_CMD;
-+
-+/*
-+ * WMI_SET_PROBED_SSID_CMDID
-+ */
-+#define MAX_PROBED_SSID_INDEX   5
-+
-+typedef enum {
-+    DISABLE_SSID_FLAG  = 0,                  /* disables entry */
-+    SPECIFIC_SSID_FLAG = 0x01,               /* probes specified ssid */
-+    ANY_SSID_FLAG      = 0x02,               /* probes for any ssid */
-+} WMI_SSID_FLAG;
-+
-+typedef PREPACK struct {
-+    A_UINT8     entryIndex;                     /* 0 to MAX_PROBED_SSID_INDEX */
-+    A_UINT8     flag;                           /* WMI_SSID_FLG */
-+    A_UINT8     ssidLength;
-+    A_UINT8     ssid[32];
-+} POSTPACK WMI_PROBED_SSID_CMD;
-+
-+/*
-+ * WMI_SET_LISTEN_INT_CMDID
-+ * The Listen interval is between 15 and 3000 TUs
-+ */
-+#define MIN_LISTEN_INTERVAL 15
-+#define MAX_LISTEN_INTERVAL 5000
-+#define MIN_LISTEN_BEACONS 1
-+#define MAX_LISTEN_BEACONS 50
-+
-+typedef PREPACK struct {
-+    A_UINT16     listenInterval;
-+    A_UINT16     numBeacons;
-+} POSTPACK WMI_LISTEN_INT_CMD;
-+
-+/*
-+ * WMI_SET_BEACON_INT_CMDID
-+ */
-+typedef PREPACK struct {
-+    A_UINT16     beaconInterval;
-+} POSTPACK WMI_BEACON_INT_CMD;
-+
-+/*
-+ * WMI_SET_BMISS_TIME_CMDID
-+ * valid values are between 1000 and 5000 TUs
-+ */
-+
-+#define MIN_BMISS_TIME     1000
-+#define MAX_BMISS_TIME     5000
-+#define MIN_BMISS_BEACONS  1
-+#define MAX_BMISS_BEACONS  50
-+
-+typedef PREPACK struct {
-+    A_UINT16     bmissTime;
-+    A_UINT16     numBeacons;
-+} POSTPACK WMI_BMISS_TIME_CMD;
-+
-+/*
-+ * WMI_SET_POWER_MODE_CMDID
-+ */
-+typedef enum {
-+    REC_POWER = 0x01,
-+    MAX_PERF_POWER,
-+} WMI_POWER_MODE;
-+
-+typedef PREPACK struct {
-+    A_UINT8     powerMode;      /* WMI_POWER_MODE */
-+} POSTPACK WMI_POWER_MODE_CMD;
-+
-+/*
-+ * WMI_SET_POWER_PARAMS_CMDID
-+ */
-+typedef enum {
-+    IGNORE_DTIM = 0x01,
-+    NORMAL_DTIM = 0x02,
-+    STICK_DTIM  = 0x03,
-+} WMI_DTIM_POLICY;
-+
-+typedef PREPACK struct {
-+    A_UINT16    idle_period;             /* msec */
-+    A_UINT16    pspoll_number;
-+    A_UINT16    dtim_policy;
-+} POSTPACK WMI_POWER_PARAMS_CMD;
-+
-+typedef PREPACK struct {
-+    A_UINT8    power_saving;
-+    A_UINT8    ttl; /* number of beacon periods */
-+    A_UINT16   atim_windows;          /* msec */
-+    A_UINT16   timeout_value;         /* msec */
-+} POSTPACK WMI_IBSS_PM_CAPS_CMD;
-+
-+/*
-+ * WMI_SET_POWERSAVE_TIMERS_POLICY_CMDID
-+ */
-+typedef enum {
-+    IGNORE_TIM_ALL_QUEUES_APSD = 0,
-+    PROCESS_TIM_ALL_QUEUES_APSD = 1,
-+    IGNORE_TIM_SIMULATED_APSD = 2,
-+    PROCESS_TIM_SIMULATED_APSD = 3,
-+} APSD_TIM_POLICY;
-+
-+typedef PREPACK struct {
-+    A_UINT16    psPollTimeout;          /* msec */
-+    A_UINT16    triggerTimeout;         /* msec */
-+    A_UINT32    apsdTimPolicy;      /* TIM behavior with  ques APSD enabled. Default is IGNORE_TIM_ALL_QUEUES_APSD */
-+    A_UINT32    simulatedAPSDTimPolicy;      /* TIM behavior with  simulated APSD enabled. Default is PROCESS_TIM_SIMULATED_APSD */
-+} POSTPACK WMI_POWERSAVE_TIMERS_POLICY_CMD;
-+
-+/*
-+ * WMI_SET_VOICE_PKT_SIZE_CMDID
-+ */
-+typedef PREPACK struct {
-+    A_UINT16    voicePktSize;
-+} POSTPACK WMI_SET_VOICE_PKT_SIZE_CMD;
-+
-+/*
-+ * WMI_SET_MAX_SP_LEN_CMDID
-+ */
-+typedef enum {
-+    DELIVER_ALL_PKT = 0x0,
-+    DELIVER_2_PKT = 0x1,
-+    DELIVER_4_PKT = 0x2,
-+    DELIVER_6_PKT = 0x3,
-+} APSD_SP_LEN_TYPE;
-+
-+typedef PREPACK struct {
-+    A_UINT8    maxSPLen;
-+} POSTPACK WMI_SET_MAX_SP_LEN_CMD;
-+
-+/*
-+ * WMI_SET_DISC_TIMEOUT_CMDID
-+ */
-+typedef PREPACK struct {
-+    A_UINT8     disconnectTimeout;          /* seconds */
-+} POSTPACK WMI_DISC_TIMEOUT_CMD;
-+
-+typedef enum {
-+    UPLINK_TRAFFIC = 0,
-+    DNLINK_TRAFFIC = 1,
-+    BIDIR_TRAFFIC = 2,
-+} DIR_TYPE;
-+
-+typedef enum {
-+    DISABLE_FOR_THIS_AC = 0,
-+    ENABLE_FOR_THIS_AC  = 1,
-+    ENABLE_FOR_ALL_AC   = 2,
-+} VOICEPS_CAP_TYPE;
-+
-+typedef enum {
-+    TRAFFIC_TYPE_APERIODIC = 0,
-+    TRAFFIC_TYPE_PERIODIC = 1,
-+}TRAFFIC_TYPE;
-+
-+/*
-+ * WMI_CREATE_PSTREAM_CMDID
-+ */
-+typedef PREPACK struct {
-+    A_UINT32        minServiceInt;           /* in milli-sec */
-+    A_UINT32        maxServiceInt;           /* in milli-sec */
-+    A_UINT32        inactivityInt;           /* in milli-sec */
-+    A_UINT32        suspensionInt;           /* in milli-sec */
-+    A_UINT32        serviceStartTime;
-+    A_UINT32        minDataRate;             /* in bps */
-+    A_UINT32        meanDataRate;            /* in bps */
-+    A_UINT32        peakDataRate;            /* in bps */
-+    A_UINT32        maxBurstSize;
-+    A_UINT32        delayBound;
-+    A_UINT32        minPhyRate;              /* in bps */
-+    A_UINT32        sba;
-+    A_UINT32        mediumTime;
-+    A_UINT16        nominalMSDU;             /* in octects */
-+    A_UINT16        maxMSDU;                 /* in octects */
-+    A_UINT8         trafficClass;
-+    A_UINT8         trafficType;             /* TRAFFIC_TYPE */
-+    A_UINT8         trafficDirection;        /* TRAFFIC_DIR */
-+    A_UINT8         voicePSCapability;       /* VOICEPS_CAP_TYPE */
-+    A_UINT8         tsid;
-+    A_UINT8         userPriority;            /* 802.1D user priority */
-+} POSTPACK WMI_CREATE_PSTREAM_CMD;
-+
-+/*
-+ * WMI_DELETE_PSTREAM_CMDID
-+ */
-+typedef PREPACK struct {
-+    A_UINT8     trafficClass;
-+    A_UINT8     tsid;
-+} POSTPACK WMI_DELETE_PSTREAM_CMD;
-+
-+/*
-+ * WMI_SET_CHANNEL_PARAMS_CMDID
-+ */
-+typedef enum {
-+    WMI_11A_MODE  = 0x1,
-+    WMI_11G_MODE  = 0x2,
-+    WMI_11AG_MODE = 0x3,
-+    WMI_11B_MODE  = 0x4,
-+    WMI_11GONLY_MODE = 0x5,
-+} WMI_PHY_MODE;
-+
-+#define WMI_MAX_CHANNELS        32
-+
-+typedef PREPACK struct {
-+    A_UINT8     reserved1;
-+    A_UINT8     scanParam;              /* set if enable scan */
-+    A_UINT8     phyMode;                /* see WMI_PHY_MODE */
-+    A_UINT8     numChannels;            /* how many channels follow */
-+    A_UINT16    channelList[1];         /* channels in Mhz */
-+} POSTPACK WMI_CHANNEL_PARAMS_CMD;
-+
-+
-+/*
-+ *  WMI_RSSI_THRESHOLD_PARAMS_CMDID
-+ *  Setting the polltime to 0 would disable polling.
-+ *  Threshold values are in the ascending order, and should agree to:
-+ *  (lowThreshold_lowerVal < lowThreshold_upperVal < highThreshold_lowerVal
-+ *      < highThreshold_upperVal)
-+ */
-+
-+typedef PREPACK struct WMI_RSSI_THRESHOLD_PARAMS{
-+    A_UINT32    pollTime;               /* Polling time as a factor of LI */
-+    A_INT16     thresholdAbove1_Val;          /* lowest of upper */
-+    A_INT16     thresholdAbove2_Val;
-+    A_INT16     thresholdAbove3_Val;
-+    A_INT16     thresholdAbove4_Val;
-+    A_INT16     thresholdAbove5_Val;
-+    A_INT16     thresholdAbove6_Val;          /* highest of upper */
-+    A_INT16     thresholdBelow1_Val;         /* lowest of bellow */
-+    A_INT16     thresholdBelow2_Val;
-+    A_INT16     thresholdBelow3_Val;
-+    A_INT16     thresholdBelow4_Val;
-+    A_INT16     thresholdBelow5_Val;
-+    A_INT16     thresholdBelow6_Val;         /* highest of bellow */
-+    A_UINT8     weight;                  /* "alpha" */
-+    A_UINT8     reserved[3];
-+} POSTPACK  WMI_RSSI_THRESHOLD_PARAMS_CMD;
-+
-+/*
-+ *  WMI_SNR_THRESHOLD_PARAMS_CMDID
-+ *  Setting the polltime to 0 would disable polling.
-+ */
-+
-+typedef PREPACK struct WMI_SNR_THRESHOLD_PARAMS{
-+    A_UINT32    pollTime;               /* Polling time as a factor of LI */
-+    A_UINT8     weight;                  /* "alpha" */
-+    A_UINT8     thresholdAbove1_Val;      /* lowest of uppper*/
-+    A_UINT8     thresholdAbove2_Val;
-+    A_UINT8     thresholdAbove3_Val;
-+    A_UINT8     thresholdAbove4_Val;      /* highest of upper */
-+    A_UINT8     thresholdBelow1_Val;     /* lowest of bellow */
-+    A_UINT8     thresholdBelow2_Val;
-+    A_UINT8     thresholdBelow3_Val;
-+    A_UINT8     thresholdBelow4_Val;     /* highest of bellow */
-+    A_UINT8     reserved[3];
-+} POSTPACK WMI_SNR_THRESHOLD_PARAMS_CMD;
-+
-+/*
-+ *  WMI_LQ_THRESHOLD_PARAMS_CMDID
-+ */
-+typedef PREPACK struct WMI_LQ_THRESHOLD_PARAMS {
-+    A_UINT8     enable;
-+    A_UINT8     thresholdAbove1_Val;
-+    A_UINT8     thresholdAbove2_Val;
-+    A_UINT8     thresholdAbove3_Val;
-+    A_UINT8     thresholdAbove4_Val;
-+    A_UINT8     thresholdBelow1_Val;
-+    A_UINT8     thresholdBelow2_Val;
-+    A_UINT8     thresholdBelow3_Val;
-+    A_UINT8     thresholdBelow4_Val;
-+    A_UINT8     reserved[3];
-+} POSTPACK  WMI_LQ_THRESHOLD_PARAMS_CMD;
-+
-+typedef enum {
-+    WMI_LPREAMBLE_DISABLED = 0,
-+    WMI_LPREAMBLE_ENABLED
-+} WMI_LPREAMBLE_STATUS;
-+
-+typedef PREPACK struct {
-+    A_UINT8     status;
-+}POSTPACK WMI_SET_LPREAMBLE_CMD;
-+
-+typedef PREPACK struct {
-+    A_UINT16    threshold;
-+}POSTPACK WMI_SET_RTS_CMD;
-+
-+/*
-+ *  WMI_TARGET_ERROR_REPORT_BITMASK_CMDID
-+ *  Sets the error reporting event bitmask in target. Target clears it
-+ *  upon an error. Subsequent errors are counted, but not reported
-+ *  via event, unless the bitmask is set again.
-+ */
-+typedef PREPACK struct {
-+    A_UINT32    bitmask;
-+} POSTPACK  WMI_TARGET_ERROR_REPORT_BITMASK;
-+
-+/*
-+ * WMI_SET_TX_PWR_CMDID
-+ */
-+typedef PREPACK struct {
-+    A_UINT8     dbM;                  /* in dbM units */
-+} POSTPACK WMI_SET_TX_PWR_CMD, WMI_TX_PWR_REPLY;
-+
-+/*
-+ * WMI_SET_ASSOC_INFO_CMDID
-+ *
-+ * A maximum of 2 private IEs can be sent in the [Re]Assoc request.
-+ * A 3rd one, the CCX version IE can also be set from the host.
-+ */
-+#define WMI_MAX_ASSOC_INFO_TYPE    2
-+#define WMI_CCX_VER_IE             2 /* ieType to set CCX Version IE */
-+
-+#define WMI_MAX_ASSOC_INFO_LEN     240
-+
-+typedef PREPACK struct {
-+    A_UINT8     ieType;
-+    A_UINT8     bufferSize;
-+    A_UINT8     assocInfo[1];       /* up to WMI_MAX_ASSOC_INFO_LEN */
-+} POSTPACK WMI_SET_ASSOC_INFO_CMD;
-+
-+
-+/*
-+ * WMI_GET_TX_PWR_CMDID does not take any parameters
-+ */
-+
-+/*
-+ * WMI_ADD_BAD_AP_CMDID
-+ */
-+#define WMI_MAX_BAD_AP_INDEX      1
-+
-+typedef PREPACK struct {
-+    A_UINT8     badApIndex;         /* 0 to WMI_MAX_BAD_AP_INDEX */
-+    A_UINT8     bssid[ATH_MAC_LEN];
-+} POSTPACK WMI_ADD_BAD_AP_CMD;
-+
-+/*
-+ * WMI_DELETE_BAD_AP_CMDID
-+ */
-+typedef PREPACK struct {
-+    A_UINT8     badApIndex;         /* 0 to WMI_MAX_BAD_AP_INDEX */
-+} POSTPACK WMI_DELETE_BAD_AP_CMD;
-+
-+/*
-+ * WMI_SET_ACCESS_PARAMS_CMDID
-+ */
-+#define WMI_DEFAULT_TXOP_ACPARAM    0       /* implies one MSDU */
-+#define WMI_DEFAULT_ECWMIN_ACPARAM  4       /* corresponds to CWmin of 15 */
-+#define WMI_DEFAULT_ECWMAX_ACPARAM  10      /* corresponds to CWmax of 1023 */
-+#define WMI_MAX_CW_ACPARAM          15      /* maximum eCWmin or eCWmax */
-+#define WMI_DEFAULT_AIFSN_ACPARAM   2
-+#define WMI_MAX_AIFSN_ACPARAM       15
-+typedef PREPACK struct {
-+    A_UINT16 txop;                      /* in units of 32 usec */
-+    A_UINT8  eCWmin;
-+    A_UINT8  eCWmax;
-+    A_UINT8  aifsn;
-+} POSTPACK WMI_SET_ACCESS_PARAMS_CMD;
-+
-+
-+/*
-+ * WMI_SET_RETRY_LIMITS_CMDID
-+ *
-+ * This command is used to customize the number of retries the
-+ * wlan device will perform on a given frame.
-+ */
-+#define WMI_MIN_RETRIES 2
-+#define WMI_MAX_RETRIES 13
-+typedef enum {
-+    MGMT_FRAMETYPE    = 0,
-+    CONTROL_FRAMETYPE = 1,
-+    DATA_FRAMETYPE    = 2
-+} WMI_FRAMETYPE;
-+
-+typedef PREPACK struct {
-+    A_UINT8 frameType;                      /* WMI_FRAMETYPE */
-+    A_UINT8 trafficClass;                   /* applies only to DATA_FRAMETYPE */
-+    A_UINT8 maxRetries;
-+    A_UINT8 enableNotify;
-+} POSTPACK WMI_SET_RETRY_LIMITS_CMD;
-+
-+/*
-+ * WMI_SET_ROAM_CTRL_CMDID
-+ *
-+ * This command is used to influence the Roaming behaviour
-+ * Set the host biases of the BSSs before setting the roam mode as bias
-+ * based.
-+ */
-+
-+/*
-+ * Different types of Roam Control
-+ */
-+
-+typedef enum {
-+        WMI_FORCE_ROAM          = 1,      /* Roam to the specified BSSID */
-+        WMI_SET_ROAM_MODE       = 2,      /* default ,progd bias, no roam */
-+        WMI_SET_HOST_BIAS       = 3,     /* Set the Host Bias */
-+        WMI_SET_LOWRSSI_SCAN_PARAMS = 4, /* Set lowrssi Scan parameters */
-+} WMI_ROAM_CTRL_TYPE;
-+
-+#define WMI_MIN_ROAM_CTRL_TYPE WMI_FORCE_ROAM
-+#define WMI_MAX_ROAM_CTRL_TYPE WMI_SET_LOWRSSI_SCAN_PARAMS
-+
-+/*
-+ * ROAM MODES
-+ */
-+
-+typedef enum {
-+        WMI_DEFAULT_ROAM_MODE   = 1,  /* RSSI based ROAM */
-+        WMI_HOST_BIAS_ROAM_MODE = 2, /* HOST BIAS based ROAM */
-+        WMI_LOCK_BSS_MODE  = 3  /* Lock to the Current BSS - no Roam */
-+} WMI_ROAM_MODE;
-+
-+/*
-+ * BSS HOST BIAS INFO
-+ */
-+
-+typedef PREPACK struct {
-+        A_UINT8 bssid[ATH_MAC_LEN];
-+        A_INT8  bias;
-+} POSTPACK WMI_BSS_BIAS;
-+
-+typedef PREPACK struct {
-+        A_UINT8 numBss;
-+        WMI_BSS_BIAS bssBias[1];
-+} POSTPACK WMI_BSS_BIAS_INFO;
-+
-+typedef PREPACK struct WMI_LOWRSSI_SCAN_PARAMS {
-+        A_UINT16 lowrssi_scan_period;
-+        A_INT16  lowrssi_scan_threshold;
-+        A_INT16  lowrssi_roam_threshold;
-+        A_UINT8  roam_rssi_floor;
-+        A_UINT8  reserved[1];              /* For alignment */
-+} POSTPACK WMI_LOWRSSI_SCAN_PARAMS;
-+
-+typedef PREPACK struct {
-+    PREPACK union {
-+        A_UINT8 bssid[ATH_MAC_LEN]; /* WMI_FORCE_ROAM */
-+        A_UINT8 roamMode;           /* WMI_SET_ROAM_MODE  */
-+        WMI_BSS_BIAS_INFO bssBiasInfo; /* WMI_SET_HOST_BIAS */
-+        WMI_LOWRSSI_SCAN_PARAMS lrScanParams;
-+    } POSTPACK info;
-+    A_UINT8   roamCtrlType ;
-+} POSTPACK WMI_SET_ROAM_CTRL_CMD;
-+
-+/*
-+ * WMI_ENABLE_RM_CMDID
-+ */
-+typedef PREPACK struct {
-+        A_BOOL enable_radio_measurements;
-+} POSTPACK WMI_ENABLE_RM_CMD;
-+
-+/*
-+ * WMI_SET_MAX_OFFHOME_DURATION_CMDID
-+ */
-+typedef PREPACK struct {
-+        A_UINT8 max_offhome_duration;
-+} POSTPACK WMI_SET_MAX_OFFHOME_DURATION_CMD;
-+
-+typedef PREPACK struct {
-+    A_UINT32 frequency;
-+    A_UINT8  threshold;
-+} POSTPACK WMI_SET_HB_CHALLENGE_RESP_PARAMS_CMD;
-+
-+typedef enum {
-+    BT_STREAM_UNDEF = 0,
-+    BT_STREAM_SCO,             /* SCO stream */
-+    BT_STREAM_A2DP,            /* A2DP stream */
-+    BT_STREAM_MAX
-+} BT_STREAM_TYPE;
-+
-+typedef enum {
-+    BT_PARAM_SCO = 1,         /* SCO stream parameters */
-+    BT_PARAM_A2DP,            /* A2DP stream parameters */
-+    BT_PARAM_MISC,            /* miscellaneous parameters */
-+    BT_PARAM_REGS,            /* co-existence register parameters */
-+    BT_PARAM_MAX
-+} BT_PARAM_TYPE;
-+
-+typedef enum {
-+    BT_STATUS_UNDEF = 0,
-+    BT_STATUS_START,
-+    BT_STATUS_STOP,
-+    BT_STATUS_RESUME,
-+    BT_STATUS_SUSPEND,
-+    BT_STATUS_MAX
-+} BT_STREAM_STATUS;
-+
-+typedef PREPACK struct {
-+    A_UINT8 streamType;
-+    A_UINT8 status;
-+} POSTPACK WMI_SET_BT_STATUS_CMD;
-+
-+typedef PREPACK struct {
-+    A_UINT8 noSCOPkts;
-+    A_UINT8 pspollTimeout;
-+    A_UINT8 stompbt;
-+} POSTPACK BT_PARAMS_SCO;
-+
-+typedef PREPACK struct {
-+    A_UINT32 period;
-+    A_UINT32 dutycycle;
-+    A_UINT8  stompbt;
-+} POSTPACK BT_PARAMS_A2DP;
-+
-+typedef PREPACK struct {
-+    A_UINT32 mode;
-+    A_UINT32 scoWghts;
-+    A_UINT32 a2dpWghts;
-+    A_UINT32 genWghts;
-+    A_UINT32 mode2;
-+    A_UINT8  setVal;
-+} POSTPACK BT_COEX_REGS;
-+
-+typedef enum {
-+    WLAN_PROTECT_POLICY = 1,
-+    WLAN_COEX_CTRL_FLAGS
-+} BT_PARAMS_MISC_TYPE;
-+
-+typedef enum {
-+    WLAN_PROTECT_PER_STREAM = 0x01,   /* default */
-+    WLAN_PROTECT_ANY_TX = 0x02
-+} WLAN_PROTECT_FLAGS;
-+
-+
-+#define WLAN_DISABLE_COEX_IN_DISCONNECT   0x01 /* default */
-+#define WLAN_KEEP_COEX_IN_DISCONNECT      0x02
-+#define WLAN_STOMPBT_IN_DISCONNECT        0x04
-+
-+#define WLAN_DISABLE_COEX_IN_ROAM         0x10 /* default */
-+#define WLAN_KEEP_COEX_IN_ROAM            0x20
-+#define WLAN_STOMPBT_IN_ROAM              0x40
-+
-+#define WLAN_DISABLE_COEX_IN_SCAN        0x100 /* default */
-+#define WLAN_KEEP_COEX_IN_SCAN           0x200
-+#define WLAN_STOMPBT_IN_SCAN             0x400
-+
-+#define WLAN_DISABLE_COEX_BT_OFF        0x1000 /* default */
-+#define WLAN_KEEP_COEX_BT_OFF           0x2000
-+#define WLAN_STOMPBT_BT_OFF             0x4000
-+
-+typedef PREPACK struct {
-+    A_UINT32 period;
-+    A_UINT32 dutycycle;
-+    A_UINT8  stompbt;
-+    A_UINT8  policy;
-+} POSTPACK WLAN_PROTECT_POLICY_TYPE;
-+
-+typedef PREPACK struct {
-+    PREPACK union {
-+        WLAN_PROTECT_POLICY_TYPE protectParams;
-+        A_UINT16 wlanCtrlFlags;
-+    } POSTPACK info;
-+    A_UINT8 paramType;
-+} POSTPACK BT_PARAMS_MISC;
-+
-+typedef PREPACK struct {
-+    PREPACK union {
-+        BT_PARAMS_SCO scoParams;
-+        BT_PARAMS_A2DP a2dpParams;
-+        BT_PARAMS_MISC miscParams;
-+        BT_COEX_REGS regs;
-+    } POSTPACK info;
-+    A_UINT8 paramType;
-+} POSTPACK WMI_SET_BT_PARAMS_CMD;
-+
-+/*
-+ * Command Replies
-+ */
-+
-+/*
-+ * WMI_GET_CHANNEL_LIST_CMDID reply
-+ */
-+typedef PREPACK struct {
-+    A_UINT8     reserved1;
-+    A_UINT8     numChannels;            /* number of channels in reply */
-+    A_UINT16    channelList[1];         /* channel in Mhz */
-+} POSTPACK WMI_CHANNEL_LIST_REPLY;
-+
-+typedef enum {
-+    A_SUCCEEDED = A_OK,
-+    A_FAILED_DELETE_STREAM_DOESNOT_EXIST=250,
-+    A_SUCCEEDED_MODIFY_STREAM=251,
-+    A_FAILED_INVALID_STREAM = 252,
-+    A_FAILED_MAX_THINSTREAMS = 253,
-+    A_FAILED_CREATE_REMOVE_PSTREAM_FIRST = 254,
-+} PSTREAM_REPLY_STATUS;
-+
-+/*
-+ * List of Events (target to host)
-+ */
-+typedef enum {
-+    WMI_READY_EVENTID           = 0x1001,
-+    WMI_CONNECT_EVENTID,
-+    WMI_DISCONNECT_EVENTID,
-+    WMI_BSSINFO_EVENTID,
-+    WMI_CMDERROR_EVENTID,
-+    WMI_REGDOMAIN_EVENTID,
-+    WMI_PSTREAM_TIMEOUT_EVENTID,
-+    WMI_NEIGHBOR_REPORT_EVENTID,
-+    WMI_TKIP_MICERR_EVENTID,
-+    WMI_SCAN_COMPLETE_EVENTID,
-+    WMI_REPORT_STATISTICS_EVENTID,
-+    WMI_RSSI_THRESHOLD_EVENTID,
-+    WMI_ERROR_REPORT_EVENTID,
-+    WMI_OPT_RX_FRAME_EVENTID,
-+    WMI_REPORT_ROAM_TBL_EVENTID,
-+    WMI_EXTENSION_EVENTID,
-+    WMI_CAC_EVENTID,
-+    WMI_SNR_THRESHOLD_EVENTID,
-+    WMI_LQ_THRESHOLD_EVENTID,
-+    WMI_TX_RETRY_ERR_EVENTID,
-+    WMI_REPORT_ROAM_DATA_EVENTID,
-+    WMI_TEST_EVENTID,
-+    WMI_APLIST_EVENTID,
-+    WMI_GET_WOW_LIST_EVENTID,
-+    WMI_GET_PMKID_LIST_EVENTID
-+} WMI_EVENT_ID;
-+
-+typedef enum {
-+    WMI_11A_CAPABILITY   = 1,
-+    WMI_11G_CAPABILITY   = 2,
-+    WMI_11AG_CAPABILITY  = 3,
-+} WMI_PHY_CAPABILITY;
-+
-+typedef PREPACK struct {
-+    A_UINT8     macaddr[ATH_MAC_LEN];
-+    A_UINT8     phyCapability;              /* WMI_PHY_CAPABILITY */
-+} POSTPACK WMI_READY_EVENT;
-+
-+/*
-+ * Connect Event
-+ */
-+typedef PREPACK struct {
-+    A_UINT16    channel;
-+    A_UINT8     bssid[ATH_MAC_LEN];
-+    A_UINT16    listenInterval;
-+    A_UINT16    beaconInterval;
-+    A_UINT32    networkType;
-+    A_UINT8     beaconIeLen;
-+    A_UINT8     assocReqLen;
-+    A_UINT8     assocRespLen;
-+    A_UINT8     assocInfo[1];
-+} POSTPACK WMI_CONNECT_EVENT;
-+
-+/*
-+ * Disconnect Event
-+ */
-+typedef enum {
-+    NO_NETWORK_AVAIL   = 0x01,
-+    LOST_LINK          = 0x02,     /* bmiss */
-+    DISCONNECT_CMD     = 0x03,
-+    BSS_DISCONNECTED   = 0x04,
-+    AUTH_FAILED        = 0x05,
-+    ASSOC_FAILED       = 0x06,
-+    NO_RESOURCES_AVAIL = 0x07,
-+    CSERV_DISCONNECT   = 0x08,
-+    INVALID_PROFILE    = 0x0a,
-+    DOT11H_CHANNEL_SWITCH = 0x0b,
-+} WMI_DISCONNECT_REASON;
-+
-+typedef PREPACK struct {
-+    A_UINT16    protocolReasonStatus;  /* reason code, see 802.11 spec. */
-+    A_UINT8     bssid[ATH_MAC_LEN];    /* set if known */
-+    A_UINT8     disconnectReason ;      /* see WMI_DISCONNECT_REASON */
-+    A_UINT8     assocRespLen;
-+    A_UINT8     assocInfo[1];
-+} POSTPACK WMI_DISCONNECT_EVENT;
-+
-+/*
-+ * BSS Info Event.
-+ * Mechanism used to inform host of the presence and characteristic of
-+ * wireless networks present.  Consists of bss info header followed by
-+ * the beacon or probe-response frame body.  The 802.11 header is not included.
-+ */
-+typedef enum {
-+    BEACON_FTYPE = 0x1,
-+    PROBERESP_FTYPE,
-+    ACTION_MGMT_FTYPE,
-+} WMI_BI_FTYPE;
-+
-+enum {
-+    BSS_ELEMID_CHANSWITCH = 0x01,
-+    BSS_ELEMID_ATHEROS = 0x02,
-+};
-+
-+typedef PREPACK struct {
-+    A_UINT16    channel;
-+    A_UINT8     frameType;          /* see WMI_BI_FTYPE */
-+    A_UINT8     snr;
-+    A_INT16     rssi;
-+    A_UINT8     bssid[ATH_MAC_LEN];
-+    A_UINT32    ieMask;
-+} POSTPACK WMI_BSS_INFO_HDR;
-+
-+/*
-+ * Command Error Event
-+ */
-+typedef enum {
-+    INVALID_PARAM  = 0x01,
-+    ILLEGAL_STATE  = 0x02,
-+    INTERNAL_ERROR = 0x03,
-+} WMI_ERROR_CODE;
-+
-+typedef PREPACK struct {
-+    A_UINT16    commandId;
-+    A_UINT8     errorCode;
-+} POSTPACK WMI_CMD_ERROR_EVENT;
-+
-+/*
-+ * New Regulatory Domain Event
-+ */
-+typedef PREPACK struct {
-+    A_UINT32    regDomain;
-+} POSTPACK WMI_REG_DOMAIN_EVENT;
-+
-+typedef PREPACK struct {
-+    A_UINT8     trafficClass;
-+} POSTPACK WMI_PSTREAM_TIMEOUT_EVENT;
-+
-+/*
-+ * The WMI_NEIGHBOR_REPORT Event is generated by the target to inform
-+ * the host of BSS's it has found that matches the current profile.
-+ * It can be used by the host to cache PMKs and/to initiate pre-authentication
-+ * if the BSS supports it.  The first bssid is always the current associated
-+ * BSS.
-+ * The bssid and bssFlags information repeats according to the number
-+ * or APs reported.
-+ */
-+typedef enum {
-+    WMI_DEFAULT_BSS_FLAGS   = 0x00,
-+    WMI_PREAUTH_CAPABLE_BSS = 0x01,
-+    WMI_PMKID_VALID_BSS     = 0x02,
-+} WMI_BSS_FLAGS;
-+
-+typedef PREPACK struct {
-+    A_UINT8     bssid[ATH_MAC_LEN];
-+    A_UINT8     bssFlags;            /* see WMI_BSS_FLAGS */
-+} POSTPACK WMI_NEIGHBOR_INFO;
-+
-+typedef PREPACK struct {
-+    A_INT8      numberOfAps;
-+    WMI_NEIGHBOR_INFO neighbor[1];
-+} POSTPACK WMI_NEIGHBOR_REPORT_EVENT;
-+
-+/*
-+ * TKIP MIC Error Event
-+ */
-+typedef PREPACK struct {
-+    A_UINT8 keyid;
-+    A_UINT8 ismcast;
-+} POSTPACK WMI_TKIP_MICERR_EVENT;
-+
-+/*
-+ * WMI_SCAN_COMPLETE_EVENTID - no parameters (old), staus parameter (new)
-+ */
-+typedef PREPACK struct {
-+    A_STATUS status;
-+} POSTPACK WMI_SCAN_COMPLETE_EVENT;
-+
-+#define MAX_OPT_DATA_LEN 1400
-+
-+/*
-+ * WMI_SET_ADHOC_BSSID_CMDID
-+ */
-+typedef PREPACK struct {
-+    A_UINT8     bssid[ATH_MAC_LEN];
-+} POSTPACK WMI_SET_ADHOC_BSSID_CMD;
-+
-+/*
-+ * WMI_SET_OPT_MODE_CMDID
-+ */
-+typedef enum {
-+    SPECIAL_OFF,
-+    SPECIAL_ON,
-+} OPT_MODE_TYPE;
-+
-+typedef PREPACK struct {
-+    A_UINT8     optMode;
-+} POSTPACK WMI_SET_OPT_MODE_CMD;
-+
-+/*
-+ * WMI_TX_OPT_FRAME_CMDID
-+ */
-+typedef enum {
-+    OPT_PROBE_REQ   = 0x01,
-+    OPT_PROBE_RESP  = 0x02,
-+    OPT_CPPP_START  = 0x03,
-+    OPT_CPPP_STOP   = 0x04,
-+} WMI_OPT_FTYPE;
-+
-+typedef PREPACK struct {
-+    A_UINT16    optIEDataLen;
-+    A_UINT8     frmType;
-+    A_UINT8     dstAddr[ATH_MAC_LEN];
-+    A_UINT8     bssid[ATH_MAC_LEN];
-+    A_UINT8     reserved;               /* For alignment */
-+    A_UINT8     optIEData[1];
-+} POSTPACK WMI_OPT_TX_FRAME_CMD;
-+
-+/*
-+ * Special frame receive Event.
-+ * Mechanism used to inform host of the receiption of the special frames.
-+ * Consists of special frame info header followed by special frame body.
-+ * The 802.11 header is not included.
-+ */
-+typedef PREPACK struct {
-+    A_UINT16    channel;
-+    A_UINT8     frameType;          /* see WMI_OPT_FTYPE */
-+    A_INT8      snr;
-+    A_UINT8     srcAddr[ATH_MAC_LEN];
-+    A_UINT8     bssid[ATH_MAC_LEN];
-+} POSTPACK WMI_OPT_RX_INFO_HDR;
-+
-+/*
-+ * Reporting statistics.
-+ */
-+typedef PREPACK struct {
-+    A_UINT32   tx_packets;
-+    A_UINT32   tx_bytes;
-+    A_UINT32   tx_unicast_pkts;
-+    A_UINT32   tx_unicast_bytes;
-+    A_UINT32   tx_multicast_pkts;
-+    A_UINT32   tx_multicast_bytes;
-+    A_UINT32   tx_broadcast_pkts;
-+    A_UINT32   tx_broadcast_bytes;
-+    A_UINT32   tx_rts_success_cnt;
-+    A_UINT32   tx_packet_per_ac[4];
-+    A_UINT32   tx_errors_per_ac[4];
-+
-+    A_UINT32   tx_errors;
-+    A_UINT32   tx_failed_cnt;
-+    A_UINT32   tx_retry_cnt;
-+    A_UINT32   tx_rts_fail_cnt;
-+    A_INT32    tx_unicast_rate;
-+}POSTPACK tx_stats_t;
-+
-+typedef PREPACK struct {
-+    A_UINT32   rx_packets;
-+    A_UINT32   rx_bytes;
-+    A_UINT32   rx_unicast_pkts;
-+    A_UINT32   rx_unicast_bytes;
-+    A_UINT32   rx_multicast_pkts;
-+    A_UINT32   rx_multicast_bytes;
-+    A_UINT32   rx_broadcast_pkts;
-+    A_UINT32   rx_broadcast_bytes;
-+    A_UINT32   rx_fragment_pkt;
-+
-+    A_UINT32   rx_errors;
-+    A_UINT32   rx_crcerr;
-+    A_UINT32   rx_key_cache_miss;
-+    A_UINT32   rx_decrypt_err;
-+    A_UINT32   rx_duplicate_frames;
-+    A_INT32    rx_unicast_rate;
-+}POSTPACK rx_stats_t;
-+
-+typedef PREPACK struct {
-+    A_UINT32   tkip_local_mic_failure;
-+    A_UINT32   tkip_counter_measures_invoked;
-+    A_UINT32   tkip_replays;
-+    A_UINT32   tkip_format_errors;
-+    A_UINT32   ccmp_format_errors;
-+    A_UINT32   ccmp_replays;
-+}POSTPACK tkip_ccmp_stats_t;
-+
-+typedef PREPACK struct {
-+    A_UINT32   power_save_failure_cnt;
-+}POSTPACK pm_stats_t;
-+
-+typedef PREPACK struct {
-+    A_UINT32    cs_bmiss_cnt;
-+    A_UINT32    cs_lowRssi_cnt;
-+    A_UINT16    cs_connect_cnt;
-+    A_UINT16    cs_disconnect_cnt;
-+    A_INT16     cs_aveBeacon_rssi;
-+    A_UINT16    cs_roam_count;
-+    A_UINT16    cs_rssi;
-+    A_UINT8     cs_snr;
-+    A_UINT8     cs_aveBeacon_snr;
-+    A_UINT8     cs_lastRoam_msec;
-+} POSTPACK cserv_stats_t;
-+
-+typedef PREPACK struct {
-+    tx_stats_t          tx_stats;
-+    rx_stats_t          rx_stats;
-+    tkip_ccmp_stats_t   tkipCcmpStats;
-+}POSTPACK wlan_net_stats_t;
-+
-+typedef PREPACK struct {
-+    A_UINT32    wow_num_pkts_dropped;
-+    A_UINT16    wow_num_events_discarded;
-+    A_UINT8     wow_num_host_pkt_wakeups;
-+    A_UINT8     wow_num_host_event_wakeups;
-+} POSTPACK wlan_wow_stats_t;
-+
-+typedef PREPACK struct {
-+    A_UINT32            lqVal;
-+    A_INT32             noise_floor_calibation;
-+    pm_stats_t          pmStats;
-+    wlan_net_stats_t    txrxStats;
-+    wlan_wow_stats_t    wowStats;
-+    cserv_stats_t       cservStats;
-+} POSTPACK WMI_TARGET_STATS;
-+
-+/*
-+ * WMI_RSSI_THRESHOLD_EVENTID.
-+ * Indicate the RSSI events to host. Events are indicated when we breach a
-+ * thresold value.
-+ */
-+typedef enum{
-+    WMI_RSSI_THRESHOLD1_ABOVE = 0,
-+    WMI_RSSI_THRESHOLD2_ABOVE,
-+    WMI_RSSI_THRESHOLD3_ABOVE,
-+    WMI_RSSI_THRESHOLD4_ABOVE,
-+    WMI_RSSI_THRESHOLD5_ABOVE,
-+    WMI_RSSI_THRESHOLD6_ABOVE,
-+    WMI_RSSI_THRESHOLD1_BELOW,
-+    WMI_RSSI_THRESHOLD2_BELOW,
-+    WMI_RSSI_THRESHOLD3_BELOW,
-+    WMI_RSSI_THRESHOLD4_BELOW,
-+    WMI_RSSI_THRESHOLD5_BELOW,
-+    WMI_RSSI_THRESHOLD6_BELOW
-+}WMI_RSSI_THRESHOLD_VAL;
-+
-+typedef PREPACK struct {
-+    A_INT16 rssi;
-+    A_UINT8 range;
-+}POSTPACK WMI_RSSI_THRESHOLD_EVENT;
-+
-+/*
-+ *  WMI_ERROR_REPORT_EVENTID
-+ */
-+typedef enum{
-+    WMI_TARGET_PM_ERR_FAIL      = 0x00000001,
-+    WMI_TARGET_KEY_NOT_FOUND    = 0x00000002,
-+    WMI_TARGET_DECRYPTION_ERR   = 0x00000004,
-+    WMI_TARGET_BMISS            = 0x00000008,
-+    WMI_PSDISABLE_NODE_JOIN     = 0x00000010,
-+    WMI_TARGET_COM_ERR          = 0x00000020,
-+    WMI_TARGET_FATAL_ERR        = 0x00000040
-+} WMI_TARGET_ERROR_VAL;
-+
-+typedef PREPACK struct {
-+    A_UINT32 errorVal;
-+}POSTPACK  WMI_TARGET_ERROR_REPORT_EVENT;
-+
-+typedef PREPACK struct {
-+    A_UINT8 retrys;
-+}POSTPACK  WMI_TX_RETRY_ERR_EVENT;
-+
-+typedef enum{
-+    WMI_SNR_THRESHOLD1_ABOVE = 1,
-+    WMI_SNR_THRESHOLD1_BELOW,
-+    WMI_SNR_THRESHOLD2_ABOVE,
-+    WMI_SNR_THRESHOLD2_BELOW,
-+    WMI_SNR_THRESHOLD3_ABOVE,
-+    WMI_SNR_THRESHOLD3_BELOW,
-+    WMI_SNR_THRESHOLD4_ABOVE,
-+    WMI_SNR_THRESHOLD4_BELOW
-+} WMI_SNR_THRESHOLD_VAL;
-+
-+typedef PREPACK struct {
-+    A_UINT8 range;  /* WMI_SNR_THRESHOLD_VAL */
-+    A_UINT8 snr;
-+}POSTPACK  WMI_SNR_THRESHOLD_EVENT;
-+
-+typedef enum{
-+    WMI_LQ_THRESHOLD1_ABOVE = 1,
-+    WMI_LQ_THRESHOLD1_BELOW,
-+    WMI_LQ_THRESHOLD2_ABOVE,
-+    WMI_LQ_THRESHOLD2_BELOW,
-+    WMI_LQ_THRESHOLD3_ABOVE,
-+    WMI_LQ_THRESHOLD3_BELOW,
-+    WMI_LQ_THRESHOLD4_ABOVE,
-+    WMI_LQ_THRESHOLD4_BELOW
-+} WMI_LQ_THRESHOLD_VAL;
-+
-+typedef PREPACK struct {
-+    A_INT32 lq;
-+    A_UINT8 range;  /* WMI_LQ_THRESHOLD_VAL */
-+}POSTPACK  WMI_LQ_THRESHOLD_EVENT;
-+/*
-+ * WMI_REPORT_ROAM_TBL_EVENTID
-+ */
-+#define MAX_ROAM_TBL_CAND   5
-+
-+typedef PREPACK struct {
-+    A_INT32 roam_util;
-+    A_UINT8 bssid[ATH_MAC_LEN];
-+    A_INT8  rssi;
-+    A_INT8  rssidt;
-+    A_INT8  last_rssi;
-+    A_INT8  util;
-+    A_INT8  bias;
-+    A_UINT8 reserved; /* For alignment */
-+} POSTPACK WMI_BSS_ROAM_INFO;
-+
-+
-+typedef PREPACK struct {
-+    A_UINT16  roamMode;
-+    A_UINT16  numEntries;
-+    WMI_BSS_ROAM_INFO bssRoamInfo[1];
-+} POSTPACK WMI_TARGET_ROAM_TBL;
-+
-+/*
-+ *  WMI_CAC_EVENTID
-+ */
-+typedef enum {
-+    CAC_INDICATION_ADMISSION = 0x00,
-+    CAC_INDICATION_ADMISSION_RESP = 0x01,
-+    CAC_INDICATION_DELETE = 0x02,
-+    CAC_INDICATION_NO_RESP = 0x03,
-+}CAC_INDICATION;
-+
-+#define WMM_TSPEC_IE_LEN   63
-+
-+typedef PREPACK struct {
-+    A_UINT8 ac;
-+    A_UINT8 cac_indication;
-+    A_UINT8 statusCode;
-+    A_UINT8 tspecSuggestion[WMM_TSPEC_IE_LEN];
-+}POSTPACK  WMI_CAC_EVENT;
-+
-+/*
-+ * WMI_APLIST_EVENTID
-+ */
-+
-+typedef enum {
-+    APLIST_VER1 = 1,
-+} APLIST_VER;
-+
-+typedef PREPACK struct {
-+    A_UINT8     bssid[ATH_MAC_LEN];
-+    A_UINT16    channel;
-+} POSTPACK  WMI_AP_INFO_V1;
-+
-+typedef PREPACK union {
-+    WMI_AP_INFO_V1  apInfoV1;
-+} POSTPACK WMI_AP_INFO;
-+
-+typedef PREPACK struct {
-+    A_UINT8     apListVer;
-+    A_UINT8     numAP;
-+    WMI_AP_INFO apList[1];
-+} POSTPACK WMI_APLIST_EVENT;
-+
-+/*
-+ * developer commands
-+ */
-+
-+/*
-+ * WMI_SET_BITRATE_CMDID
-+ *
-+ * Get bit rate cmd uses same definition as set bit rate cmd
-+ */
-+typedef enum {
-+    RATE_AUTO   = -1,
-+    RATE_1Mb    = 0,
-+    RATE_2Mb    = 1,
-+    RATE_5_5Mb  = 2,
-+    RATE_11Mb   = 3,
-+    RATE_6Mb    = 4,
-+    RATE_9Mb    = 5,
-+    RATE_12Mb   = 6,
-+    RATE_18Mb   = 7,
-+    RATE_24Mb   = 8,
-+    RATE_36Mb   = 9,
-+    RATE_48Mb   = 10,
-+    RATE_54Mb   = 11,
-+} WMI_BIT_RATE;
-+
-+typedef PREPACK struct {
-+    A_INT8      rateIndex;          /* see WMI_BIT_RATE */
-+} POSTPACK WMI_BIT_RATE_CMD, WMI_BIT_RATE_REPLY;
-+
-+/*
-+ * WMI_SET_FIXRATES_CMDID
-+ *
-+ * Get fix rates cmd uses same definition as set fix rates cmd
-+ */
-+typedef enum {
-+    FIX_RATE_1Mb    = 0x1,
-+    FIX_RATE_2Mb    = 0x2,
-+    FIX_RATE_5_5Mb  = 0x4,
-+    FIX_RATE_11Mb   = 0x8,
-+    FIX_RATE_6Mb    = 0x10,
-+    FIX_RATE_9Mb    = 0x20,
-+    FIX_RATE_12Mb   = 0x40,
-+    FIX_RATE_18Mb   = 0x80,
-+    FIX_RATE_24Mb   = 0x100,
-+    FIX_RATE_36Mb   = 0x200,
-+    FIX_RATE_48Mb   = 0x400,
-+    FIX_RATE_54Mb   = 0x800,
-+} WMI_FIX_RATES_MASK;
-+
-+typedef PREPACK struct {
-+    A_UINT16      fixRateMask;          /* see WMI_BIT_RATE */
-+} POSTPACK WMI_FIX_RATES_CMD, WMI_FIX_RATES_REPLY;
-+
-+/*
-+ * WMI_SET_RECONNECT_AUTH_MODE_CMDID
-+ *
-+ * Set authentication mode
-+ */
-+typedef enum {
-+    RECONN_DO_AUTH = 0x00,
-+    RECONN_NOT_AUTH = 0x01
-+} WMI_AUTH_MODE;
-+
-+typedef PREPACK struct {
-+    A_UINT8 mode;
-+} POSTPACK WMI_SET_AUTH_MODE_CMD;
-+
-+/*
-+ * WMI_SET_REASSOC_MODE_CMDID
-+ *
-+ * Set authentication mode
-+ */
-+typedef enum {
-+    REASSOC_DO_DISASSOC = 0x00,
-+    REASSOC_DONOT_DISASSOC = 0x01
-+} WMI_REASSOC_MODE;
-+
-+typedef PREPACK struct {
-+    A_UINT8 mode;
-+}POSTPACK WMI_SET_REASSOC_MODE_CMD;
-+
-+typedef enum {
-+    ROAM_DATA_TIME = 1,            /* Get The Roam Time Data */
-+} ROAM_DATA_TYPE;
-+
-+typedef PREPACK struct {
-+    A_UINT32        disassoc_time;
-+    A_UINT32        no_txrx_time;
-+    A_UINT32        assoc_time;
-+    A_UINT32        allow_txrx_time;
-+    A_UINT32        last_data_txrx_time;
-+    A_UINT32        first_data_txrx_time;
-+    A_UINT8         disassoc_bssid[ATH_MAC_LEN];
-+    A_INT8          disassoc_bss_rssi;
-+    A_UINT8         assoc_bssid[ATH_MAC_LEN];
-+    A_INT8          assoc_bss_rssi;
-+} POSTPACK WMI_TARGET_ROAM_TIME;
-+
-+typedef PREPACK struct {
-+    PREPACK union {
-+        WMI_TARGET_ROAM_TIME roamTime;
-+    } POSTPACK u;
-+    A_UINT8 roamDataType ;
-+} POSTPACK WMI_TARGET_ROAM_DATA;
-+
-+typedef enum {
-+    WMI_WMM_DISABLED = 0,
-+    WMI_WMM_ENABLED
-+} WMI_WMM_STATUS;
-+
-+typedef PREPACK struct {
-+    A_UINT8    status;
-+}POSTPACK WMI_SET_WMM_CMD;
-+
-+typedef enum {
-+    WMI_TXOP_DISABLED = 0,
-+    WMI_TXOP_ENABLED
-+} WMI_TXOP_CFG;
-+
-+typedef PREPACK struct {
-+    A_UINT8    txopEnable;
-+}POSTPACK WMI_SET_WMM_TXOP_CMD;
-+
-+typedef PREPACK struct {
-+    A_UINT8 keepaliveInterval;
-+} POSTPACK WMI_SET_KEEPALIVE_CMD;
-+
-+typedef PREPACK struct {
-+    A_BOOL configured;
-+    A_UINT8 keepaliveInterval;
-+} POSTPACK WMI_GET_KEEPALIVE_CMD;
-+
-+/*
-+ * Add Application specified IE to a management frame
-+ */
-+#define WMI_MAX_IE_LEN  78
-+
-+typedef PREPACK struct {
-+    A_UINT8 mgmtFrmType;  /* one of WMI_MGMT_FRAME_TYPE */
-+    A_UINT8 ieLen;    /* Length  of the IE that should be added to the MGMT frame */
-+    A_UINT8 ieInfo[1];
-+} POSTPACK WMI_SET_APPIE_CMD;
-+
-+/*
-+ * Notify the WSC registration status to the target
-+ */
-+#define WSC_REG_ACTIVE     1
-+#define WSC_REG_INACTIVE   0
-+/* Generic Hal Interface for setting hal paramters. */
-+/* Add new Set HAL Param cmdIds here for newer params */
-+typedef enum {
-+   WHAL_SETCABTO_CMDID = 1,
-+}WHAL_CMDID;
-+
-+typedef PREPACK struct {
-+    A_UINT8 cabTimeOut;
-+} POSTPACK WHAL_SETCABTO_PARAM;
-+
-+typedef PREPACK struct {
-+    A_UINT8  whalCmdId;
-+    A_UINT8 data[1];
-+} POSTPACK WHAL_PARAMCMD;
-+
-+
-+#define WOW_MAX_FILTER_LISTS 1 /*4*/
-+#define WOW_MAX_FILTERS_PER_LIST 4
-+#define WOW_PATTERN_SIZE 64
-+#define WOW_MASK_SIZE 64
-+
-+typedef PREPACK struct {
-+    A_UINT8 wow_valid_filter;
-+    A_UINT8 wow_filter_id;
-+    A_UINT8 wow_filter_size;
-+    A_UINT8 wow_filter_offset;
-+    A_UINT8 wow_filter_mask[WOW_MASK_SIZE];
-+    A_UINT8 wow_filter_pattern[WOW_PATTERN_SIZE];
-+} POSTPACK WOW_FILTER;
-+
-+
-+typedef PREPACK struct {
-+    A_UINT8 wow_valid_list;
-+    A_UINT8 wow_list_id;
-+    A_UINT8 wow_num_filters;
-+    A_UINT8 wow_total_list_size;
-+    WOW_FILTER list[WOW_MAX_FILTERS_PER_LIST];
-+} POSTPACK WOW_FILTER_LIST;
-+
-+typedef PREPACK struct {
-+    A_BOOL awake;
-+    A_BOOL asleep;
-+} POSTPACK WMI_SET_HOST_SLEEP_MODE_CMD;
-+
-+typedef PREPACK struct {
-+    A_BOOL enable_wow;
-+} POSTPACK WMI_SET_WOW_MODE_CMD;
-+
-+typedef PREPACK struct {
-+    A_UINT8 filter_list_id;
-+} POSTPACK WMI_GET_WOW_LIST_CMD;
-+
-+/*
-+ * WMI_GET_WOW_LIST_CMD reply
-+ */
-+typedef PREPACK struct {
-+    A_UINT8     num_filters;     /* number of patterns in reply */
-+    A_UINT8     this_filter_num; /*  this is filter # x of total num_filters */
-+    A_UINT8     wow_mode;
-+    A_UINT8     host_mode;
-+    WOW_FILTER  wow_filters[1];
-+} POSTPACK WMI_GET_WOW_LIST_REPLY;
-+
-+typedef PREPACK struct {
-+    A_UINT8 filter_list_id;
-+    A_UINT8 filter_size;
-+    A_UINT8 filter_offset;
-+    A_UINT8 filter[1];
-+} POSTPACK WMI_ADD_WOW_PATTERN_CMD;
-+
-+typedef PREPACK struct {
-+    A_UINT16 filter_list_id;
-+    A_UINT16 filter_id;
-+} POSTPACK WMI_DEL_WOW_PATTERN_CMD;
-+
-+typedef PREPACK struct {
-+    A_UINT8 macaddr[ATH_MAC_LEN];
-+} POSTPACK WMI_SET_MAC_ADDRESS_CMD;
-+
-+/*
-+ * WMI_SET_AKMP_PARAMS_CMD
-+ */
-+
-+#define WMI_AKMP_MULTI_PMKID_EN   0x000001
-+
-+typedef PREPACK struct {
-+    A_UINT32    akmpInfo;
-+} POSTPACK WMI_SET_AKMP_PARAMS_CMD;
-+
-+typedef PREPACK struct {
-+    A_UINT8 pmkid[WMI_PMKID_LEN];
-+} POSTPACK WMI_PMKID;
-+
-+/*
-+ * WMI_SET_PMKID_LIST_CMD
-+ */
-+#define WMI_MAX_PMKID_CACHE   8
-+
-+typedef PREPACK struct {
-+    A_UINT32    numPMKID;
-+    WMI_PMKID   pmkidList[WMI_MAX_PMKID_CACHE];
-+} POSTPACK WMI_SET_PMKID_LIST_CMD;
-+
-+/*
-+ * WMI_GET_PMKID_LIST_CMD  Reply
-+ * Following the Number of PMKIDs is the list of PMKIDs
-+ */
-+typedef PREPACK struct {
-+    A_UINT32    numPMKID;
-+    WMI_PMKID   pmkidList[1];
-+} POSTPACK WMI_PMKID_LIST_REPLY;
-+
-+/* index used for priority streams */
-+typedef enum {
-+    WMI_NOT_MAPPED  = -1,
-+    WMI_CONTROL_PRI = 0,
-+    WMI_BEST_EFFORT_PRI = 1,
-+    WMI_LOW_PRI = 2,
-+    WMI_HIGH_PRI = 3,
-+    WMI_HIGHEST_PRI,
-+    WMI_PRI_MAX_COUNT
-+} WMI_PRI_STREAM_ID;
-+
-+#ifndef ATH_TARGET
-+#include "athendpack.h"
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _WMI_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/wmi_api.h b/drivers/sdio/function/wlan/ar6000/include/wmi_api.h
-new file mode 100644
-index 0000000..aa9a9c6
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/wmi_api.h
-@@ -0,0 +1,259 @@
-+#ifndef _WMI_API_H_
-+#define _WMI_API_H_
-+/*
-+ * Copyright (c) 2004-2006 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * This file contains the definitions for the Wireless Module Interface (WMI).
-+ *
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/include/wmi_api.h#2 $
-+ *
-+ *
-+ *  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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/*
-+ * IP QoS Field definitions according to 802.1p
-+ */
-+#define BEST_EFFORT_PRI         0
-+#define BACKGROUND_PRI          1
-+#define EXCELLENT_EFFORT_PRI    3
-+#define CONTROLLED_LOAD_PRI     4
-+#define VIDEO_PRI               5
-+#define VOICE_PRI               6
-+#define NETWORK_CONTROL_PRI     7
-+#define MAX_NUM_PRI             8
-+
-+#define UNDEFINED_PRI           (0xff)
-+
-+/* simple mapping of IP TOS field to a WMI priority stream
-+ * this mapping was taken from the original linux driver implementation
-+ * The operation maps the following
-+ *
-+ *  */
-+#define IP_TOS_TO_WMI_PRI(tos)  \
-+    ((WMI_PRI_STREAM_ID)(((tos) >> 1) & 0x03))
-+
-+#define WMI_IMPLICIT_PSTREAM_INACTIVITY_INT 5000 /* 5 seconds */
-+
-+
-+struct wmi_t;
-+
-+void *wmi_init(void *devt);
-+
-+void wmi_qos_state_init(struct wmi_t *wmip);
-+void wmi_shutdown(struct wmi_t *wmip);
-+A_UINT16  wmi_get_mapped_qos_queue(struct wmi_t *, A_UINT8);
-+A_STATUS wmi_dix_2_dot3(struct wmi_t *wmip, void *osbuf);
-+A_STATUS wmi_data_hdr_add(struct wmi_t *wmip, void *osbuf, A_UINT8 msgType);
-+A_STATUS wmi_dot3_2_dix(struct wmi_t *wmip, void *osbuf);
-+A_STATUS wmi_data_hdr_remove(struct wmi_t *wmip, void *osbuf);
-+A_STATUS wmi_syncpoint(struct wmi_t *wmip);
-+A_STATUS wmi_syncpoint_reset(struct wmi_t *wmip);
-+WMI_PRI_STREAM_ID wmi_get_stream_id(struct wmi_t *wmip, A_UINT8 trafficClass);
-+A_UINT8 wmi_implicit_create_pstream(struct wmi_t *wmip, void *osbuf, A_UINT8 dir, A_UINT8 up);
-+
-+A_STATUS wmi_control_rx(struct wmi_t *wmip, void *osbuf);
-+void wmi_iterate_nodes(struct wmi_t *wmip, wlan_node_iter_func *f, void *arg);
-+void wmi_free_allnodes(struct wmi_t *wmip);
-+bss_t *wmi_find_node(struct wmi_t *wmip, const A_UINT8 *macaddr);
-+
-+
-+typedef enum {
-+    NO_SYNC_WMIFLAG = 0,
-+    SYNC_BEFORE_WMIFLAG,            /* transmit all queued data before cmd */
-+    SYNC_AFTER_WMIFLAG,             /* any new data waits until cmd execs */
-+    SYNC_BOTH_WMIFLAG,
-+    END_WMIFLAG                     /* end marker */
-+} WMI_SYNC_FLAG;
-+
-+A_STATUS wmi_cmd_send(struct wmi_t *wmip, void *osbuf, WMI_COMMAND_ID cmdId,
-+                      WMI_SYNC_FLAG flag);
-+A_STATUS wmi_connect_cmd(struct wmi_t *wmip,
-+                         NETWORK_TYPE netType,
-+                         DOT11_AUTH_MODE dot11AuthMode,
-+                         AUTH_MODE authMode,
-+                         CRYPTO_TYPE pairwiseCrypto,
-+                         A_UINT8 pairwiseCryptoLen,
-+                         CRYPTO_TYPE groupCrypto,
-+                         A_UINT8 groupCryptoLen,
-+                         int ssidLength,
-+                         A_UCHAR *ssid,
-+                         A_UINT8 *bssid,
-+                         A_UINT16 channel,
-+                         A_UINT32 ctrl_flags);
-+A_STATUS wmi_reconnect_cmd(struct wmi_t *wmip,
-+                           A_UINT8 *bssid,
-+                           A_UINT16 channel);
-+A_STATUS wmi_disconnect_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_getrev_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType,
-+                           A_BOOL forceFgScan, A_BOOL isLegacy,
-+                           A_UINT32 homeDwellTime, A_UINT32 forceScanInterval);
-+A_STATUS wmi_scanparams_cmd(struct wmi_t *wmip, A_UINT16 fg_start_sec,
-+                            A_UINT16 fg_end_sec, A_UINT16 bg_sec,
-+                            A_UINT16 minact_chdw_msec,
-+                            A_UINT16 maxact_chdw_msec, A_UINT16 pas_chdw_msec,
-+                            A_UINT8 shScanRatio, A_UINT8 scanCtrlFlags,
-+                            A_UINT32 max_dfsch_act_time);
-+A_STATUS wmi_bssfilter_cmd(struct wmi_t *wmip, A_UINT8 filter, A_UINT32 ieMask);
-+A_STATUS wmi_probedSsid_cmd(struct wmi_t *wmip, A_UINT8 index, A_UINT8 flag,
-+                            A_UINT8 ssidLength, A_UCHAR *ssid);
-+A_STATUS wmi_listeninterval_cmd(struct wmi_t *wmip, A_UINT16 listenInterval, A_UINT16 listenBeacons);
-+A_STATUS wmi_bmisstime_cmd(struct wmi_t *wmip, A_UINT16 bmisstime, A_UINT16 bmissbeacons);
-+A_STATUS wmi_associnfo_cmd(struct wmi_t *wmip, A_UINT8 ieType,
-+                           A_UINT8 ieLen, A_UINT8 *ieInfo);
-+A_STATUS wmi_powermode_cmd(struct wmi_t *wmip, A_UINT8 powerMode);
-+A_STATUS wmi_ibsspmcaps_cmd(struct wmi_t *wmip, A_UINT8 pmEnable, A_UINT8 ttl,
-+                            A_UINT16 atim_windows, A_UINT16 timeout_value);
-+A_STATUS wmi_pmparams_cmd(struct wmi_t *wmip, A_UINT16 idlePeriod,
-+                           A_UINT16 psPollNum, A_UINT16 dtimPolicy);
-+A_STATUS wmi_disctimeout_cmd(struct wmi_t *wmip, A_UINT8 timeout);
-+A_STATUS wmi_sync_cmd(struct wmi_t *wmip, A_UINT8 syncNumber);
-+A_STATUS wmi_create_pstream_cmd(struct wmi_t *wmip, WMI_CREATE_PSTREAM_CMD *pstream);
-+A_STATUS wmi_delete_pstream_cmd(struct wmi_t *wmip, A_UINT8 trafficClass, A_UINT8 streamID);
-+A_STATUS wmi_set_bitrate_cmd(struct wmi_t *wmip, A_INT32 rate);
-+A_STATUS wmi_get_bitrate_cmd(struct wmi_t *wmip);
-+A_INT8   wmi_validate_bitrate(struct wmi_t *wmip, A_INT32 rate);
-+A_STATUS wmi_get_regDomain_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_get_channelList_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_set_channelParams_cmd(struct wmi_t *wmip, A_UINT8 scanParam,
-+                                   WMI_PHY_MODE mode, A_INT8 numChan,
-+                                   A_UINT16 *channelList);
-+
-+A_STATUS wmi_set_snr_threshold_params(struct wmi_t *wmip,
-+                                       WMI_SNR_THRESHOLD_PARAMS_CMD *snrCmd);
-+A_STATUS wmi_set_rssi_threshold_params(struct wmi_t *wmip,
-+                                        WMI_RSSI_THRESHOLD_PARAMS_CMD *rssiCmd);
-+A_STATUS wmi_clr_rssi_snr(struct wmi_t *wmip);
-+A_STATUS wmi_set_lq_threshold_params(struct wmi_t *wmip,
-+                                      WMI_LQ_THRESHOLD_PARAMS_CMD *lqCmd);
-+A_STATUS wmi_set_rts_cmd(struct wmi_t *wmip, A_UINT16 threshold);
-+A_STATUS wmi_set_lpreamble_cmd(struct wmi_t *wmip, A_UINT8 status);
-+
-+A_STATUS wmi_set_error_report_bitmask(struct wmi_t *wmip, A_UINT32 bitmask);
-+
-+A_STATUS wmi_get_challenge_resp_cmd(struct wmi_t *wmip, A_UINT32 cookie,
-+                                    A_UINT32 source);
-+A_STATUS wmi_config_debug_module_cmd(struct wmi_t *wmip, A_UINT16 mmask,
-+                                     A_UINT16 tsr, A_BOOL rep, A_UINT16 size,
-+                                     A_UINT32 valid);
-+A_STATUS wmi_get_stats_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_addKey_cmd(struct wmi_t *wmip, A_UINT8 keyIndex,
-+                        CRYPTO_TYPE keyType, A_UINT8 keyUsage,
-+                        A_UINT8 keyLength,A_UINT8 *keyRSC,
-+                        A_UINT8 *keyMaterial, A_UINT8 key_op_ctrl,
-+                        WMI_SYNC_FLAG sync_flag);
-+A_STATUS wmi_add_krk_cmd(struct wmi_t *wmip, A_UINT8 *krk);
-+A_STATUS wmi_delete_krk_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_deleteKey_cmd(struct wmi_t *wmip, A_UINT8 keyIndex);
-+A_STATUS wmi_set_akmp_params_cmd(struct wmi_t *wmip,
-+                                 WMI_SET_AKMP_PARAMS_CMD *akmpParams);
-+A_STATUS wmi_get_pmkid_list_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_set_pmkid_list_cmd(struct wmi_t *wmip,
-+                                WMI_SET_PMKID_LIST_CMD *pmkInfo);
-+A_STATUS wmi_set_txPwr_cmd(struct wmi_t *wmip, A_UINT8 dbM);
-+A_STATUS wmi_get_txPwr_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_addBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex, A_UINT8 *bssid);
-+A_STATUS wmi_deleteBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex);
-+A_STATUS wmi_set_tkip_countermeasures_cmd(struct wmi_t *wmip, A_BOOL en);
-+A_STATUS wmi_setPmkid_cmd(struct wmi_t *wmip, A_UINT8 *bssid, A_UINT8 *pmkId,
-+                          A_BOOL set);
-+A_STATUS wmi_set_access_params_cmd(struct wmi_t *wmip, A_UINT16 txop,
-+                                   A_UINT8 eCWmin, A_UINT8 eCWmax,
-+                                   A_UINT8 aifsn);
-+A_STATUS wmi_set_retry_limits_cmd(struct wmi_t *wmip, A_UINT8 frameType,
-+                                  A_UINT8 trafficClass, A_UINT8 maxRetries,
-+                                  A_UINT8 enableNotify);
-+
-+void wmi_get_current_bssid(struct wmi_t *wmip, A_UINT8 *bssid);
-+
-+A_STATUS wmi_get_roam_tbl_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_get_roam_data_cmd(struct wmi_t *wmip, A_UINT8 roamDataType);
-+A_STATUS wmi_set_roam_ctrl_cmd(struct wmi_t *wmip, WMI_SET_ROAM_CTRL_CMD *p,
-+                               A_UINT8 size);
-+A_STATUS wmi_set_powersave_timers_cmd(struct wmi_t *wmip,
-+                            WMI_POWERSAVE_TIMERS_POLICY_CMD *pCmd,
-+                            A_UINT8 size);
-+
-+A_STATUS wmi_set_opt_mode_cmd(struct wmi_t *wmip, A_UINT8 optMode);
-+A_STATUS wmi_opt_tx_frame_cmd(struct wmi_t *wmip,
-+                              A_UINT8 frmType,
-+                              A_UINT8 *dstMacAddr,
-+                              A_UINT8 *bssid,
-+                              A_UINT16 optIEDataLen,
-+                              A_UINT8 *optIEData);
-+
-+A_STATUS wmi_set_adhoc_bconIntvl_cmd(struct wmi_t *wmip, A_UINT16 intvl);
-+A_STATUS wmi_set_voice_pkt_size_cmd(struct wmi_t *wmip, A_UINT16 voicePktSize);
-+A_STATUS wmi_set_max_sp_len_cmd(struct wmi_t *wmip, A_UINT8 maxSpLen);
-+A_UINT8  convert_userPriority_to_trafficClass(A_UINT8 userPriority);
-+A_UINT8 wmi_get_power_mode_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_verify_tspec_params(WMI_CREATE_PSTREAM_CMD *pCmd, A_BOOL tspecCompliance);
-+
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+A_STATUS wmi_test_cmd(struct wmi_t *wmip, A_UINT8 *buf, A_UINT32  len);
-+#endif
-+
-+A_STATUS wmi_set_bt_status_cmd(struct wmi_t *wmip, A_UINT8 streamType, A_UINT8 status);
-+A_STATUS wmi_set_bt_params_cmd(struct wmi_t *wmip, WMI_SET_BT_PARAMS_CMD* cmd);
-+
-+
-+/*
-+ *  This function is used to configure the fix rates mask to the target.
-+ */
-+A_STATUS wmi_set_fixrates_cmd(struct wmi_t *wmip, A_INT16 fixRatesMask);
-+A_STATUS wmi_get_ratemask_cmd(struct wmi_t *wmip);
-+
-+A_STATUS wmi_set_authmode_cmd(struct wmi_t *wmip, A_UINT8 mode);
-+
-+A_STATUS wmi_set_reassocmode_cmd(struct wmi_t *wmip, A_UINT8 mode);
-+
-+A_STATUS wmi_set_wmm_cmd(struct wmi_t *wmip, WMI_WMM_STATUS status);
-+A_STATUS wmi_set_wmm_txop(struct wmi_t *wmip, WMI_TXOP_CFG txEnable);
-+
-+A_STATUS wmi_get_keepalive_configured(struct wmi_t *wmip);
-+A_UINT8 wmi_get_keepalive_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_set_keepalive_cmd(struct wmi_t *wmip, A_UINT8 keepaliveInterval);
-+
-+A_STATUS wmi_set_appie_cmd(struct wmi_t *wmip, A_UINT8 mgmtFrmType,
-+                           A_UINT8 ieLen,A_UINT8 *ieInfo);
-+
-+A_STATUS wmi_set_halparam_cmd(struct wmi_t *wmip, A_UINT8 *cmd, A_UINT16 dataLen);
-+A_INT32 wmi_get_rate(A_INT8 rateindex);
-+
-+/*Wake on Wireless WMI commands*/
-+A_STATUS wmi_set_host_sleep_mode_cmd(struct wmi_t *wmip, WMI_SET_HOST_SLEEP_MODE_CMD *cmd);
-+A_STATUS wmi_set_wow_mode_cmd(struct wmi_t *wmip, WMI_SET_WOW_MODE_CMD *cmd);
-+A_STATUS wmi_get_wow_list_cmd(struct wmi_t *wmip, WMI_GET_WOW_LIST_CMD *cmd);
-+A_STATUS wmi_add_wow_pattern_cmd(struct wmi_t *wmip,
-+                                 WMI_ADD_WOW_PATTERN_CMD *cmd, A_UINT8* pattern, A_UINT8* mask, A_UINT8 pattern_size);
-+A_STATUS wmi_del_wow_pattern_cmd(struct wmi_t *wmip,
-+                                 WMI_DEL_WOW_PATTERN_CMD *cmd);
-+A_STATUS wmi_set_wsc_status_cmd(struct wmi_t *wmip, A_UINT32 status);
-+
-+bss_t *
-+wmi_find_Ssidnode (struct wmi_t *wmip, A_UCHAR *pSsid,
-+                                 A_UINT32 ssidLength, A_BOOL bIsWPA2);
-+
-+void
-+wmi_node_return (struct wmi_t *wmip, bss_t *bss);
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _WMI_API_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/include/wmix.h b/drivers/sdio/function/wlan/ar6000/include/wmix.h
-new file mode 100644
-index 0000000..8f12b5e
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/include/wmix.h
-@@ -0,0 +1,233 @@
-+/*
-+ * Copyright (c) 2004-2005 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ *
-+ * $ATH_LICENSE_HOSTSDK0_C$
-+ *
-+ * This file contains extensions of the WMI protocol specified in the
-+ * Wireless Module Interface (WMI).  It includes definitions of all
-+ * extended commands and events.  Extensions include useful commands
-+ * that are not directly related to wireless activities.  They may
-+ * be hardware-specific, and they might not be supported on all
-+ * implementations.
-+ *
-+ * Extended WMIX commands are encapsulated in a WMI message with
-+ * cmd=WMI_EXTENSION_CMD.
-+ *
-+ */
-+
-+#ifndef _WMIX_H_
-+#define _WMIX_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#ifndef ATH_TARGET
-+#include "athstartpack.h"
-+#endif
-+
-+#include "dbglog.h"
-+
-+/*
-+ * Extended WMI commands are those that are needed during wireless
-+ * operation, but which are not really wireless commands.  This allows,
-+ * for instance, platform-specific commands.  Extended WMI commands are
-+ * embedded in a WMI command message with WMI_COMMAND_ID=WMI_EXTENSION_CMDID.
-+ * Extended WMI events are similarly embedded in a WMI event message with
-+ * WMI_EVENT_ID=WMI_EXTENSION_EVENTID.
-+ */
-+typedef PREPACK struct {
-+    A_UINT32    commandId;
-+} POSTPACK WMIX_CMD_HDR;
-+
-+typedef enum {
-+    WMIX_DSETOPEN_REPLY_CMDID           = 0x2001,
-+    WMIX_DSETDATA_REPLY_CMDID,
-+    WMIX_GPIO_OUTPUT_SET_CMDID,
-+    WMIX_GPIO_INPUT_GET_CMDID,
-+    WMIX_GPIO_REGISTER_SET_CMDID,
-+    WMIX_GPIO_REGISTER_GET_CMDID,
-+    WMIX_GPIO_INTR_ACK_CMDID,
-+    WMIX_HB_CHALLENGE_RESP_CMDID,
-+    WMIX_DBGLOG_CFG_MODULE_CMDID,
-+} WMIX_COMMAND_ID;
-+
-+typedef enum {
-+    WMIX_DSETOPENREQ_EVENTID            = 0x3001,
-+    WMIX_DSETCLOSE_EVENTID,
-+    WMIX_DSETDATAREQ_EVENTID,
-+    WMIX_GPIO_INTR_EVENTID,
-+    WMIX_GPIO_DATA_EVENTID,
-+    WMIX_GPIO_ACK_EVENTID,
-+    WMIX_HB_CHALLENGE_RESP_EVENTID,
-+    WMIX_DBGLOG_EVENTID,
-+} WMIX_EVENT_ID;
-+
-+/*
-+ * =============DataSet support=================
-+ */
-+
-+/*
-+ * WMIX_DSETOPENREQ_EVENTID
-+ * DataSet Open Request Event
-+ */
-+typedef PREPACK struct {
-+    A_UINT32 dset_id;
-+    A_UINT32 targ_dset_handle;  /* echo'ed, not used by Host, */
-+    A_UINT32 targ_reply_fn;     /* echo'ed, not used by Host, */
-+    A_UINT32 targ_reply_arg;    /* echo'ed, not used by Host, */
-+} POSTPACK WMIX_DSETOPENREQ_EVENT;
-+
-+/*
-+ * WMIX_DSETCLOSE_EVENTID
-+ * DataSet Close Event
-+ */
-+typedef PREPACK struct {
-+    A_UINT32 access_cookie;
-+} POSTPACK WMIX_DSETCLOSE_EVENT;
-+
-+/*
-+ * WMIX_DSETDATAREQ_EVENTID
-+ * DataSet Data Request Event
-+ */
-+typedef PREPACK struct {
-+    A_UINT32 access_cookie;
-+    A_UINT32 offset;
-+    A_UINT32 length;
-+    A_UINT32 targ_buf;         /* echo'ed, not used by Host, */
-+    A_UINT32 targ_reply_fn;    /* echo'ed, not used by Host, */
-+    A_UINT32 targ_reply_arg;   /* echo'ed, not used by Host, */
-+} POSTPACK WMIX_DSETDATAREQ_EVENT;
-+
-+typedef PREPACK struct {
-+    A_UINT32              status;
-+    A_UINT32              targ_dset_handle;
-+    A_UINT32              targ_reply_fn;
-+    A_UINT32              targ_reply_arg;
-+    A_UINT32              access_cookie;
-+    A_UINT32              size;
-+    A_UINT32              version;
-+} POSTPACK WMIX_DSETOPEN_REPLY_CMD;
-+
-+typedef PREPACK struct {
-+    A_UINT32              status;
-+    A_UINT32              targ_buf;
-+    A_UINT32              targ_reply_fn;
-+    A_UINT32              targ_reply_arg;
-+    A_UINT32              length;
-+    A_UINT8               buf[1];
-+} POSTPACK WMIX_DSETDATA_REPLY_CMD;
-+
-+
-+/*
-+ * =============GPIO support=================
-+ * All masks are 18-bit masks with bit N operating on GPIO pin N.
-+ */
-+
-+#include "gpio.h"
-+
-+/*
-+ * Set GPIO pin output state.
-+ * In order for output to be driven, a pin must be enabled for output.
-+ * This can be done during initialization through the GPIO Configuration
-+ * DataSet, or during operation with the enable_mask.
-+ *
-+ * If a request is made to simultaneously set/clear or set/disable or
-+ * clear/disable or disable/enable, results are undefined.
-+ */
-+typedef PREPACK struct {
-+    A_UINT32              set_mask;             /* pins to set */
-+    A_UINT32              clear_mask;           /* pins to clear */
-+    A_UINT32              enable_mask;          /* pins to enable for output */
-+    A_UINT32              disable_mask;         /* pins to disable/tristate */
-+} POSTPACK WMIX_GPIO_OUTPUT_SET_CMD;
-+
-+/*
-+ * Set a GPIO register.  For debug/exceptional cases.
-+ * Values for gpioreg_id are GPIO_REGISTER_IDs, defined in a
-+ * platform-dependent header.
-+ */
-+typedef PREPACK struct {
-+    A_UINT32              gpioreg_id;           /* GPIO register ID */
-+    A_UINT32              value;                /* value to write */
-+} POSTPACK WMIX_GPIO_REGISTER_SET_CMD;
-+
-+/* Get a GPIO register.  For debug/exceptional cases. */
-+typedef PREPACK struct {
-+    A_UINT32              gpioreg_id;           /* GPIO register to read */
-+} POSTPACK WMIX_GPIO_REGISTER_GET_CMD;
-+
-+/*
-+ * Host acknowledges and re-arms GPIO interrupts.  A single
-+ * message should be used to acknowledge all interrupts that
-+ * were delivered in an earlier WMIX_GPIO_INTR_EVENT message.
-+ */
-+typedef PREPACK struct {
-+    A_UINT32              ack_mask;             /* interrupts to acknowledge */
-+} POSTPACK WMIX_GPIO_INTR_ACK_CMD;
-+
-+/*
-+ * Target informs Host of GPIO interrupts that have ocurred since the
-+ * last WMIX_GIPO_INTR_ACK_CMD was received.  Additional information --
-+ * the current GPIO input values is provided -- in order to support
-+ * use of a GPIO interrupt as a Data Valid signal for other GPIO pins.
-+ */
-+typedef PREPACK struct {
-+    A_UINT32              intr_mask;            /* pending GPIO interrupts */
-+    A_UINT32              input_values;         /* recent GPIO input values */
-+} POSTPACK WMIX_GPIO_INTR_EVENT;
-+
-+/*
-+ * Target responds to Host's earlier WMIX_GPIO_INPUT_GET_CMDID request
-+ * using a GPIO_DATA_EVENT with
-+ *   value set to the mask of GPIO pin inputs and
-+ *   reg_id set to GPIO_ID_NONE
-+ *
-+ *
-+ * Target responds to Hosts's earlier WMIX_GPIO_REGISTER_GET_CMDID request
-+ * using a GPIO_DATA_EVENT with
-+ *   value set to the value of the requested register and
-+ *   reg_id identifying the register (reflects the original request)
-+ * NB: reg_id supports the future possibility of unsolicited
-+ * WMIX_GPIO_DATA_EVENTs (for polling GPIO input), and it may
-+ * simplify Host GPIO support.
-+ */
-+typedef PREPACK struct {
-+    A_UINT32              value;
-+    A_UINT32              reg_id;
-+} POSTPACK WMIX_GPIO_DATA_EVENT;
-+
-+/*
-+ * =============Error Detection support=================
-+ */
-+
-+/*
-+ * WMIX_HB_CHALLENGE_RESP_CMDID
-+ * Heartbeat Challenge Response command
-+ */
-+typedef PREPACK struct {
-+    A_UINT32              cookie;
-+    A_UINT32              source;
-+} POSTPACK WMIX_HB_CHALLENGE_RESP_CMD;
-+
-+/*
-+ * WMIX_HB_CHALLENGE_RESP_EVENTID
-+ * Heartbeat Challenge Response Event
-+ */
-+#define WMIX_HB_CHALLENGE_RESP_EVENT WMIX_HB_CHALLENGE_RESP_CMD
-+
-+typedef PREPACK struct {
-+    struct dbglog_config_s config;
-+} POSTPACK WMIX_DBGLOG_CFG_MODULE_CMD;
-+
-+#ifndef ATH_TARGET
-+#include "athendpack.h"
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _WMIX_H_ */
-diff --git a/drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c b/drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c
-new file mode 100644
-index 0000000..2b0dfd3
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c
-@@ -0,0 +1,467 @@
-+
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "a_config.h"
-+#include "athdefs.h"
-+#include "a_types.h"
-+#include "AR6Khwreg.h"
-+#include "targaddrs.h"
-+#include "a_osapi.h"
-+#include "hif.h"
-+#include "htc_api.h"
-+#include "bmi.h"
-+#include "bmi_msg.h"
-+#include "common_drv.h"
-+#include "a_debug.h"
-+#include "targaddrs.h"
-+
-+#define HOST_INTEREST_ITEM_ADDRESS(target, item)    \
-+(((TargetType) == TARGET_TYPE_AR6001) ?     \
-+   AR6001_HOST_INTEREST_ITEM_ADDRESS(item) :    \
-+   AR6002_HOST_INTEREST_ITEM_ADDRESS(item))
-+
-+
-+/* Compile the 4BYTE version of the window register setup routine,
-+ * This mitigates host interconnect issues with non-4byte aligned bus requests, some
-+ * interconnects use bus adapters that impose strict limitations.
-+ * Since diag window access is not intended for performance critical operations, the 4byte mode should
-+ * be satisfactory even though it generates 4X the bus activity. */
-+
-+#ifdef USE_4BYTE_REGISTER_ACCESS
-+
-+    /* set the window address register (using 4-byte register access ). */
-+A_STATUS ar6000_SetAddressWindowRegister(HIF_DEVICE *hifDevice, A_UINT32 RegisterAddr, A_UINT32 Address)
-+{
-+    A_STATUS status;
-+    A_UINT8 addrValue[4];
-+    int i;
-+
-+        /* write bytes 1,2,3 of the register to set the upper address bytes, the LSB is written
-+         * last to initiate the access cycle */
-+
-+    for (i = 1; i <= 3; i++) {
-+            /* fill the buffer with the address byte value we want to hit 4 times*/
-+        addrValue[0] = ((A_UINT8 *)&Address)[i];
-+        addrValue[1] = addrValue[0];
-+        addrValue[2] = addrValue[0];
-+        addrValue[3] = addrValue[0];
-+
-+            /* hit each byte of the register address with a 4-byte write operation to the same address,
-+             * this is a harmless operation */
-+        status = HIFReadWrite(hifDevice,
-+                              RegisterAddr+i,
-+                              addrValue,
-+                              4,
-+                              HIF_WR_SYNC_BYTE_FIX,
-+                              NULL);
-+        if (status != A_OK) {
-+            break;
-+        }
-+    }
-+
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Cannot write initial bytes of 0x%x to window reg: 0x%X \n",
-+             RegisterAddr, Address));
-+        return status;
-+    }
-+
-+        /* write the address register again, this time write the whole 4-byte value.
-+         * The effect here is that the LSB write causes the cycle to start, the extra
-+         * 3 byte write to bytes 1,2,3 has no effect since we are writing the same values again */
-+    status = HIFReadWrite(hifDevice,
-+                          RegisterAddr,
-+                          (A_UCHAR *)(&Address),
-+                          4,
-+                          HIF_WR_SYNC_BYTE_INC,
-+                          NULL);
-+
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Cannot write 0x%x to window reg: 0x%X \n",
-+            RegisterAddr, Address));
-+        return status;
-+    }
-+
-+    return A_OK;
-+
-+
-+
-+}
-+
-+
-+#else
-+
-+    /* set the window address register */
-+A_STATUS ar6000_SetAddressWindowRegister(HIF_DEVICE *hifDevice, A_UINT32 RegisterAddr, A_UINT32 Address)
-+{
-+    A_STATUS status;
-+
-+        /* write bytes 1,2,3 of the register to set the upper address bytes, the LSB is written
-+         * last to initiate the access cycle */
-+    status = HIFReadWrite(hifDevice,
-+                          RegisterAddr+1,  /* write upper 3 bytes */
-+                          ((A_UCHAR *)(&Address))+1,
-+                          sizeof(A_UINT32)-1,
-+                          HIF_WR_SYNC_BYTE_INC,
-+                          NULL);
-+
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Cannot write initial bytes of 0x%x to window reg: 0x%X \n",
-+             RegisterAddr, Address));
-+        return status;
-+    }
-+
-+        /* write the LSB of the register, this initiates the operation */
-+    status = HIFReadWrite(hifDevice,
-+                          RegisterAddr,
-+                          (A_UCHAR *)(&Address),
-+                          sizeof(A_UINT8),
-+                          HIF_WR_SYNC_BYTE_INC,
-+                          NULL);
-+
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Cannot write 0x%x to window reg: 0x%X \n",
-+            RegisterAddr, Address));
-+        return status;
-+    }
-+
-+    return A_OK;
-+}
-+
-+#endif
-+
-+/*
-+ * Read from the AR6000 through its diagnostic window.
-+ * No cooperation from the Target is required for this.
-+ */
-+A_STATUS
-+ar6000_ReadRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data)
-+{
-+    A_STATUS status;
-+
-+        /* set window register to start read cycle */
-+    status = ar6000_SetAddressWindowRegister(hifDevice,
-+                                             WINDOW_READ_ADDR_ADDRESS,
-+                                             *address);
-+
-+    if (status != A_OK) {
-+        return status;
-+    }
-+
-+        /* read the data */
-+    status = HIFReadWrite(hifDevice,
-+                          WINDOW_DATA_ADDRESS,
-+                          (A_UCHAR *)data,
-+                          sizeof(A_UINT32),
-+                          HIF_RD_SYNC_BYTE_INC,
-+                          NULL);
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Cannot read from WINDOW_DATA_ADDRESS\n"));
-+        return status;
-+    }
-+
-+    return status;
-+}
-+
-+
-+/*
-+ * Write to the AR6000 through its diagnostic window.
-+ * No cooperation from the Target is required for this.
-+ */
-+A_STATUS
-+ar6000_WriteRegDiag(HIF_DEVICE *hifDevice, A_UINT32 *address, A_UINT32 *data)
-+{
-+    A_STATUS status;
-+
-+        /* set write data */
-+    status = HIFReadWrite(hifDevice,
-+                          WINDOW_DATA_ADDRESS,
-+                          (A_UCHAR *)data,
-+                          sizeof(A_UINT32),
-+                          HIF_WR_SYNC_BYTE_INC,
-+                          NULL);
-+    if (status != A_OK) {
-+        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Cannot write 0x%x to WINDOW_DATA_ADDRESS\n", *data));
-+        return status;
-+    }
-+
-+        /* set window register, which starts the write cycle */
-+    return ar6000_SetAddressWindowRegister(hifDevice,
-+                                           WINDOW_WRITE_ADDR_ADDRESS,
-+                                           *address);
-+}
-+
-+A_STATUS
-+ar6000_ReadDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address,
-+                    A_UCHAR *data, A_UINT32 length)
-+{
-+    A_UINT32 count;
-+    A_STATUS status = A_OK;
-+
-+    for (count = 0; count < length; count += 4, address += 4) {
-+        if ((status = ar6000_ReadRegDiag(hifDevice, &address,
-+                                         (A_UINT32 *)&data[count])) != A_OK)
-+        {
-+            break;
-+        }
-+    }
-+
-+    return status;
-+}
-+
-+A_STATUS
-+ar6000_WriteDataDiag(HIF_DEVICE *hifDevice, A_UINT32 address,
-+                     A_UCHAR *data, A_UINT32 length)
-+{
-+    A_UINT32 count;
-+    A_STATUS status = A_OK;
-+
-+    for (count = 0; count < length; count += 4, address += 4) {
-+        if ((status = ar6000_WriteRegDiag(hifDevice, &address,
-+                                          (A_UINT32 *)&data[count])) != A_OK)
-+        {
-+            break;
-+        }
-+    }
-+
-+    return status;
-+}
-+
-+A_STATUS
-+ar6000_reset_device_skipflash(HIF_DEVICE *hifDevice)
-+{
-+    int i;
-+    struct forceROM_s {
-+        A_UINT32 addr;
-+        A_UINT32 data;
-+    };
-+    struct forceROM_s *ForceROM;
-+    int szForceROM;
-+    A_UINT32 instruction;
-+
-+    static struct forceROM_s ForceROM_REV2[] = {
-+        /* NB: This works for old REV2 ROM (old). */
-+        {0x00001ff0, 0x175b0027}, /* jump instruction at 0xa0001ff0 */
-+        {0x00001ff4, 0x00000000}, /* nop instruction at 0xa0001ff4 */
-+
-+        {MC_REMAP_TARGET_ADDRESS, 0x00001ff0}, /* remap to 0xa0001ff0 */
-+        {MC_REMAP_COMPARE_ADDRESS, 0x01000040},/* ...from 0xbfc00040 */
-+        {MC_REMAP_SIZE_ADDRESS, 0x00000000},   /* ...1 cache line */
-+        {MC_REMAP_VALID_ADDRESS, 0x00000001},  /* ...remap is valid */
-+
-+        {LOCAL_COUNT_ADDRESS+0x10, 0}, /* clear BMI credit counter */
-+
-+        {RESET_CONTROL_ADDRESS, RESET_CONTROL_WARM_RST_MASK},
-+    };
-+
-+    static struct forceROM_s ForceROM_NEW[] = {
-+        /* NB: This works for AR6000 ROM REV3 and beyond.  */
-+        {LOCAL_SCRATCH_ADDRESS, AR6K_OPTION_IGNORE_FLASH},
-+        {LOCAL_COUNT_ADDRESS+0x10, 0}, /* clear BMI credit counter */
-+        {RESET_CONTROL_ADDRESS, RESET_CONTROL_WARM_RST_MASK},
-+    };
-+
-+    /*
-+     * Examine a semi-arbitrary instruction that's different
-+     * in REV2 and other revisions.
-+     * NB: If a Host port does not require simultaneous support
-+     * for multiple revisions of Target ROM, this code can be elided.
-+     */
-+    (void)ar6000_ReadDataDiag(hifDevice, 0x01000040,
-+                              (A_UCHAR *)&instruction, 4);
-+
-+    AR_DEBUG_PRINTF(ATH_LOG_ERR, ("instruction=0x%x\n", instruction));
-+
-+    if (instruction == 0x3c1aa200) {
-+        /* It's an old ROM */
-+        ForceROM = ForceROM_REV2;
-+        szForceROM = sizeof(ForceROM_REV2)/sizeof(*ForceROM);
-+        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Using OLD method\n"));
-+    } else {
-+        ForceROM = ForceROM_NEW;
-+        szForceROM = sizeof(ForceROM_NEW)/sizeof(*ForceROM);
-+        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Using NEW method\n"));
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Force Target to execute from ROM....\n"));
-+    for (i = 0; i < szForceROM; i++)
-+    {
-+        if (ar6000_WriteRegDiag(hifDevice,
-+                                &ForceROM[i].addr,
-+                                &ForceROM[i].data) != A_OK)
-+        {
-+            AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Cannot force Target to execute ROM!\n"));
-+            return A_ERROR;
-+        }
-+    }
-+
-+    A_MDELAY(50); /* delay to allow dragon to come to BMI phase  */
-+    return A_OK;
-+}
-+
-+/* reset device */
-+A_STATUS ar6000_reset_device(HIF_DEVICE *hifDevice, A_UINT32 TargetType)
-+{
-+
-+#if !defined(DWSIM)
-+    A_STATUS status = A_OK;
-+    A_UINT32 address;
-+    A_UINT32 data;
-+
-+    do {
-+
-+        // address = RESET_CONTROL_ADDRESS;
-+        data = RESET_CONTROL_COLD_RST_MASK;
-+
-+          /* Hardcode the address of RESET_CONTROL_ADDRESS based on the target type */
-+        if (TargetType == TARGET_TYPE_AR6001) {
-+            address = 0x0C000000;
-+        } else {
-+            if (TargetType == TARGET_TYPE_AR6002) {
-+                address = 0x00004000;
-+            } else {
-+                A_ASSERT(0);
-+            }
-+        }
-+
-+        status = ar6000_WriteRegDiag(hifDevice, &address, &data);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+        /*
-+         * Read back the RESET CAUSE register to ensure that the cold reset
-+         * went through.
-+         */
-+        A_MDELAY(2000); /* 2 second delay to allow things to settle down */
-+
-+
-+        // address = RESET_CAUSE_ADDRESS;
-+        /* Hardcode the address of RESET_CAUSE_ADDRESS based on the target type */
-+        if (TargetType == TARGET_TYPE_AR6001) {
-+            address = 0x0C0000CC;
-+        } else {
-+            if (TargetType == TARGET_TYPE_AR6002) {
-+                address = 0x000040C0;
-+            } else {
-+                A_ASSERT(0);
-+            }
-+        }
-+
-+        data = 0;
-+        status = ar6000_ReadRegDiag(hifDevice, &address, &data);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Reset Cause readback: 0x%X \n",data));
-+        data &= RESET_CAUSE_LAST_MASK;
-+        if (data != 2) {
-+            AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Unable to cold reset the target \n"));
-+        }
-+
-+    } while (FALSE);
-+
-+    if (A_FAILED(status)) {
-+        AR_DEBUG_PRINTF(ATH_LOG_ERR, ("Failed to reset target \n"));
-+    }
-+#endif
-+    return A_OK;
-+}
-+
-+#define REG_DUMP_COUNT_AR6001   38  /* WORDs, derived from AR6001_regdump.h */
-+#define REG_DUMP_COUNT_AR6002   32  /* WORDs, derived from AR6002_regdump.h */
-+
-+
-+#if REG_DUMP_COUNT_AR6001 <= REG_DUMP_COUNT_AR6002
-+#define REGISTER_DUMP_LEN_MAX  REG_DUMP_COUNT_AR6002
-+#else
-+#define REGISTER_DUMP_LEN_MAX  REG_DUMP_COUNT_AR6001
-+#endif
-+
-+void ar6000_dump_target_assert_info(HIF_DEVICE *hifDevice, A_UINT32 TargetType)
-+{
-+    A_UINT32 address;
-+    A_UINT32 regDumpArea = 0;
-+    A_STATUS status;
-+    A_UINT32 regDumpValues[REGISTER_DUMP_LEN_MAX];
-+    A_UINT32 regDumpCount = 0;
-+    A_UINT32 i;
-+
-+    do {
-+
-+            /* the reg dump pointer is copied to the host interest area */
-+        address = HOST_INTEREST_ITEM_ADDRESS(TargetType, hi_failure_state);
-+
-+        if (TargetType == TARGET_TYPE_AR6001) {
-+                /* for AR6001, this is a fixed location because the ptr is actually stuck in cache,
-+                 * this may be fixed in later firmware versions */
-+            address = 0x18a0;
-+            regDumpCount = REG_DUMP_COUNT_AR6001;
-+
-+        } else  if (TargetType == TARGET_TYPE_AR6002) {
-+
-+            regDumpCount = REG_DUMP_COUNT_AR6002;
-+
-+        } else {
-+            A_ASSERT(0);
-+        }
-+
-+            /* read RAM location through diagnostic window */
-+        status = ar6000_ReadRegDiag(hifDevice, &address, &regDumpArea);
-+
-+        if (A_FAILED(status)) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("AR6K: Failed to get ptr to register dump area \n"));
-+            break;
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("AR6K: Location of register dump data: 0x%X \n",regDumpArea));
-+
-+        if (regDumpArea == 0) {
-+                /* no reg dump */
-+            break;
-+        }
-+
-+        if (TargetType == TARGET_TYPE_AR6001) {
-+            regDumpArea &= 0x0FFFFFFF;  /* convert to physical address in target memory */
-+        }
-+
-+            /* fetch register dump data */
-+        status = ar6000_ReadDataDiag(hifDevice,
-+                                     regDumpArea,
-+                                     (A_UCHAR *)&regDumpValues[0],
-+                                     regDumpCount * (sizeof(A_UINT32)));
-+
-+        if (A_FAILED(status)) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("AR6K: Failed to get register dump \n"));
-+            break;
-+        }
-+
-+        AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("AR6K: Register Dump: \n"));
-+
-+        for (i = 0; i < regDumpCount; i++) {
-+            AR_DEBUG_PRINTF(ATH_DEBUG_ERR,(" %d :  0x%8.8X \n",i, regDumpValues[i]));
-+        }
-+
-+    } while (FALSE);
-+
-+}
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c b/drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c
-new file mode 100644
-index 0000000..8d37d62
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c
-@@ -0,0 +1,346 @@
-+
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include "a_config.h"
-+#include "athdefs.h"
-+#include "a_types.h"
-+#include "a_osapi.h"
-+#include "a_debug.h"
-+#include "htc_api.h"
-+#include "common_drv.h"
-+
-+/********* CREDIT DISTRIBUTION FUNCTIONS ******************************************/
-+
-+#define NO_VO_SERVICE 1 /* currently WMI only uses 3 data streams, so we leave VO service inactive */
-+
-+#ifdef NO_VO_SERVICE
-+#define DATA_SVCS_USED 3
-+#else
-+#define DATA_SVCS_USED 4
-+#endif
-+
-+static void RedistributeCredits(COMMON_CREDIT_STATE_INFO *pCredInfo,
-+                                HTC_ENDPOINT_CREDIT_DIST *pEPDistList);
-+
-+static void SeekCredits(COMMON_CREDIT_STATE_INFO *pCredInfo,
-+                        HTC_ENDPOINT_CREDIT_DIST *pEPDistList);
-+
-+/* reduce an ep's credits back to a set limit */
-+static INLINE void ReduceCredits(COMMON_CREDIT_STATE_INFO *pCredInfo,
-+                                HTC_ENDPOINT_CREDIT_DIST  *pEpDist,
-+                                int                       Limit)
-+{
-+    int credits;
-+
-+        /* set the new limit */
-+    pEpDist->TxCreditsAssigned = Limit;
-+
-+    if (pEpDist->TxCredits <= Limit) {
-+        return;
-+    }
-+
-+        /* figure out how much to take away */
-+    credits = pEpDist->TxCredits - Limit;
-+        /* take them away */
-+    pEpDist->TxCredits -= credits;
-+    pCredInfo->CurrentFreeCredits += credits;
-+}
-+
-+/* give an endpoint some credits from the free credit pool */
-+#define GiveCredits(pCredInfo,pEpDist,credits)      \
-+{                                                   \
-+    (pEpDist)->TxCredits += (credits);              \
-+    (pEpDist)->TxCreditsAssigned += (credits);      \
-+    (pCredInfo)->CurrentFreeCredits -= (credits);   \
-+}
-+
-+
-+/* default credit init callback.
-+ * This function is called in the context of HTCStart() to setup initial (application-specific)
-+ * credit distributions */
-+static void ar6000_credit_init(void                     *Context,
-+                               HTC_ENDPOINT_CREDIT_DIST *pEPList,
-+                               int                      TotalCredits)
-+{
-+    HTC_ENDPOINT_CREDIT_DIST *pCurEpDist;
-+    int                      count;
-+    COMMON_CREDIT_STATE_INFO *pCredInfo = (COMMON_CREDIT_STATE_INFO *)Context;
-+
-+    pCredInfo->CurrentFreeCredits = TotalCredits;
-+    pCredInfo->TotalAvailableCredits = TotalCredits;
-+
-+    pCurEpDist = pEPList;
-+
-+        /* run through the list and initialize */
-+    while (pCurEpDist != NULL) {
-+
-+            /* set minimums for each endpoint */
-+        pCurEpDist->TxCreditsMin = pCurEpDist->TxCreditsPerMaxMsg;
-+
-+        if (pCurEpDist->ServiceID == WMI_CONTROL_SVC) {
-+                /* give control service some credits */
-+            GiveCredits(pCredInfo,pCurEpDist,pCurEpDist->TxCreditsMin);
-+                /* control service is always marked active, it never goes inactive EVER */
-+            SET_EP_ACTIVE(pCurEpDist);
-+        } else if (pCurEpDist->ServiceID == WMI_DATA_BK_SVC) {
-+                /* this is the lowest priority data endpoint, save this off for easy access */
-+            pCredInfo->pLowestPriEpDist = pCurEpDist;
-+        }
-+
-+        /* Streams have to be created (explicit | implicit)for all kinds
-+         * of traffic. BE endpoints are also inactive in the beginning.
-+         * When BE traffic starts it creates implicit streams that
-+         * redistributes credits.
-+         */
-+
-+        /* note, all other endpoints have minimums set but are initially given NO credits.
-+         * Credits will be distributed as traffic activity demands */
-+        pCurEpDist = pCurEpDist->pNext;
-+    }
-+
-+    if (pCredInfo->CurrentFreeCredits <= 0) {
-+        AR_DEBUG_PRINTF(ATH_LOG_INF, ("Not enough credits (%d) to do credit distributions \n", TotalCredits));
-+        A_ASSERT(FALSE);
-+        return;
-+    }
-+
-+        /* reset list */
-+    pCurEpDist = pEPList;
-+        /* now run through the list and set max operating credit limits for everyone */
-+    while (pCurEpDist != NULL) {
-+        if (pCurEpDist->ServiceID == WMI_CONTROL_SVC) {
-+                /* control service max is just 1 max message */
-+            pCurEpDist->TxCreditsNorm = pCurEpDist->TxCreditsPerMaxMsg;
-+        } else {
-+                /* for the remaining data endpoints, we assume that each TxCreditsPerMaxMsg are
-+                 * the same.
-+                 * We use a simple calculation here, we take the remaining credits and
-+                 * determine how many max messages this can cover and then set each endpoint's
-+                 * normal value equal to half this amount.
-+                 * */
-+            count = (pCredInfo->CurrentFreeCredits/pCurEpDist->TxCreditsPerMaxMsg) * pCurEpDist->TxCreditsPerMaxMsg;
-+            count = count >> 1;
-+            count = max(count,pCurEpDist->TxCreditsPerMaxMsg);
-+                /* set normal */
-+            pCurEpDist->TxCreditsNorm = count;
-+
-+        }
-+        pCurEpDist = pCurEpDist->pNext;
-+    }
-+
-+}
-+
-+
-+/* default credit distribution callback
-+ * This callback is invoked whenever endpoints require credit distributions.
-+ * A lock is held while this function is invoked, this function shall NOT block.
-+ * The pEPDistList is a list of distribution structures in prioritized order as
-+ * defined by the call to the HTCSetCreditDistribution() api.
-+ *
-+ */
-+static void ar6000_credit_distribute(void                     *Context,
-+                                     HTC_ENDPOINT_CREDIT_DIST *pEPDistList,
-+                                     HTC_CREDIT_DIST_REASON   Reason)
-+{
-+    HTC_ENDPOINT_CREDIT_DIST *pCurEpDist;
-+    COMMON_CREDIT_STATE_INFO *pCredInfo = (COMMON_CREDIT_STATE_INFO *)Context;
-+
-+    switch (Reason) {
-+        case HTC_CREDIT_DIST_SEND_COMPLETE :
-+            pCurEpDist = pEPDistList;
-+                /* we are given the start of the endpoint distribution list.
-+                 * There may be one or more endpoints to service.
-+                 * Run through the list and distribute credits */
-+            while (pCurEpDist != NULL) {
-+
-+                if (pCurEpDist->TxCreditsToDist > 0) {
-+                        /* return the credits back to the endpoint */
-+                    pCurEpDist->TxCredits += pCurEpDist->TxCreditsToDist;
-+                        /* always zero out when we are done */
-+                    pCurEpDist->TxCreditsToDist = 0;
-+
-+                    if (pCurEpDist->TxCredits > pCurEpDist->TxCreditsAssigned) {
-+                            /* reduce to the assigned limit, previous credit reductions
-+                             * could have caused the limit to change */
-+                        ReduceCredits(pCredInfo, pCurEpDist, pCurEpDist->TxCreditsAssigned);
-+                    }
-+
-+                    if (pCurEpDist->TxCredits > pCurEpDist->TxCreditsNorm) {
-+                            /* oversubscribed endpoints need to reduce back to normal */
-+                        ReduceCredits(pCredInfo, pCurEpDist, pCurEpDist->TxCreditsNorm);
-+                    }
-+                }
-+
-+                pCurEpDist = pCurEpDist->pNext;
-+            }
-+
-+            A_ASSERT(pCredInfo->CurrentFreeCredits <= pCredInfo->TotalAvailableCredits);
-+
-+            break;
-+
-+        case HTC_CREDIT_DIST_ACTIVITY_CHANGE :
-+            RedistributeCredits(pCredInfo,pEPDistList);
-+            break;
-+        case HTC_CREDIT_DIST_SEEK_CREDITS :
-+            SeekCredits(pCredInfo,pEPDistList);
-+            break;
-+        case HTC_DUMP_CREDIT_STATE :
-+            AR_DEBUG_PRINTF(ATH_LOG_INF, ("Credit Distribution, total : %d, free : %d\n",
-+                                                                      pCredInfo->TotalAvailableCredits, pCredInfo->CurrentFreeCredits));
-+            break;
-+        default:
-+            break;
-+
-+    }
-+
-+}
-+
-+/* redistribute credits based on activity change */
-+static void RedistributeCredits(COMMON_CREDIT_STATE_INFO *pCredInfo,
-+                                HTC_ENDPOINT_CREDIT_DIST *pEPDistList)
-+{
-+    HTC_ENDPOINT_CREDIT_DIST *pCurEpDist = pEPDistList;
-+
-+        /* walk through the list and remove credits from inactive endpoints */
-+    while (pCurEpDist != NULL) {
-+
-+        if (pCurEpDist->ServiceID != WMI_CONTROL_SVC) {
-+            if (!IS_EP_ACTIVE(pCurEpDist)) {
-+                    /* EP is inactive, reduce credits back to zero */
-+                ReduceCredits(pCredInfo, pCurEpDist, 0);
-+            }
-+        }
-+
-+        /* NOTE in the active case, we do not need to do anything further,
-+         * when an EP goes active and needs credits, HTC will call into
-+         * our distribution function using a reason code of HTC_CREDIT_DIST_SEEK_CREDITS  */
-+
-+        pCurEpDist = pCurEpDist->pNext;
-+    }
-+
-+    A_ASSERT(pCredInfo->CurrentFreeCredits <= pCredInfo->TotalAvailableCredits);
-+
-+}
-+
-+/* HTC has an endpoint that needs credits, pEPDist is the endpoint in question */
-+static void SeekCredits(COMMON_CREDIT_STATE_INFO *pCredInfo,
-+                        HTC_ENDPOINT_CREDIT_DIST *pEPDist)
-+{
-+    HTC_ENDPOINT_CREDIT_DIST *pCurEpDist;
-+    int                      credits = 0;
-+    int                      need;
-+
-+    do {
-+
-+        if (pEPDist->ServiceID == WMI_CONTROL_SVC) {
-+                /* we never oversubscribe on the control service, this is not
-+                 * a high performance path and the target never holds onto control
-+                 * credits for too long */
-+            break;
-+        }
-+
-+        /* for all other services, we follow a simple algorithm of
-+         * 1. checking the free pool for credits
-+         * 2. checking lower priority endpoints for credits to take */
-+
-+        if (pCredInfo->CurrentFreeCredits >= 2 * pEPDist->TxCreditsSeek) {
-+                /* try to give more credits than it needs */
-+            credits = 2 * pEPDist->TxCreditsSeek;
-+        } else {
-+                /* give what we can */
-+            credits = min(pCredInfo->CurrentFreeCredits,pEPDist->TxCreditsSeek);
-+        }
-+
-+        if (credits >= pEPDist->TxCreditsSeek) {
-+                /* we found some to fullfill the seek request */
-+            break;
-+        }
-+
-+        /* we don't have enough in the free pool, try taking away from lower priority services
-+         *
-+         * The rule for taking away credits:
-+         *   1. Only take from lower priority endpoints
-+         *   2. Only take what is allocated above the minimum (never starve an endpoint completely)
-+         *   3. Only take what you need.
-+         *
-+         * */
-+
-+            /* starting at the lowest priority */
-+        pCurEpDist = pCredInfo->pLowestPriEpDist;
-+
-+            /* work backwards until we hit the endpoint again */
-+        while (pCurEpDist != pEPDist) {
-+                /* calculate how many we need so far */
-+            need = pEPDist->TxCreditsSeek - pCredInfo->CurrentFreeCredits;
-+
-+            if ((pCurEpDist->TxCreditsAssigned - need) > pCurEpDist->TxCreditsMin) {
-+                    /* the current one has been allocated more than it's minimum and it
-+                     * has enough credits assigned above it's minimum to fullfill our need
-+                     * try to take away just enough to fullfill our need */
-+                ReduceCredits(pCredInfo,
-+                              pCurEpDist,
-+                              pCurEpDist->TxCreditsAssigned - need);
-+
-+                if (pCredInfo->CurrentFreeCredits >= pEPDist->TxCreditsSeek) {
-+                        /* we have enough */
-+                    break;
-+                }
-+            }
-+
-+            pCurEpDist = pCurEpDist->pPrev;
-+        }
-+
-+            /* return what we can get */
-+        credits = min(pCredInfo->CurrentFreeCredits,pEPDist->TxCreditsSeek);
-+
-+    } while (FALSE);
-+
-+        /* did we find some credits? */
-+    if (credits) {
-+            /* give what we can */
-+        GiveCredits(pCredInfo, pEPDist, credits);
-+    }
-+
-+}
-+
-+/* initialize and setup credit distribution */
-+A_STATUS ar6000_setup_credit_dist(HTC_HANDLE HTCHandle, COMMON_CREDIT_STATE_INFO *pCredInfo)
-+{
-+    HTC_SERVICE_ID servicepriority[5];
-+
-+    A_MEMZERO(pCredInfo,sizeof(COMMON_CREDIT_STATE_INFO));
-+
-+    servicepriority[0] = WMI_CONTROL_SVC;  /* highest */
-+    servicepriority[1] = WMI_DATA_VO_SVC;
-+    servicepriority[2] = WMI_DATA_VI_SVC;
-+    servicepriority[3] = WMI_DATA_BE_SVC;
-+    servicepriority[4] = WMI_DATA_BK_SVC; /* lowest */
-+
-+        /* set callbacks and priority list */
-+    HTCSetCreditDistribution(HTCHandle,
-+                             pCredInfo,
-+                             ar6000_credit_distribute,
-+                             ar6000_credit_init,
-+                             servicepriority,
-+                             5);
-+
-+    return A_OK;
-+}
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c b/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c
-new file mode 100644
-index 0000000..b124845
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c
-@@ -0,0 +1,371 @@
-+/*-
-+ * Copyright (c) 2001 Atsushi Onoe
-+ * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting
-+ * Copyright (c) 2004-2005 Atheros Communications
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ *    derived from this software without specific prior written permission.
-+ *
-+ * Alternatively, this software may be distributed under the terms of the
-+ * GNU General Public License ("GPL") version 2 as published by the Free
-+ * Software Foundation.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
-+ *
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/wlan/src/wlan_node.c#1 $
-+ */
-+/*
-+ * IEEE 802.11 node handling support.
-+ */
-+#include <a_config.h>
-+#include <athdefs.h>
-+#include <a_types.h>
-+#include <a_osapi.h>
-+#include <a_debug.h>
-+#include <ieee80211.h>
-+#include <wlan_api.h>
-+#include <ieee80211_node.h>
-+#include <htc_api.h>
-+#include <wmi.h>
-+#include <wmi_api.h>
-+
-+static void wlan_node_timeout(A_ATH_TIMER arg);
-+static bss_t * _ieee80211_find_node(struct ieee80211_node_table *nt,
-+                                    const A_UINT8 *macaddr);
-+
-+bss_t *
-+wlan_node_alloc(struct ieee80211_node_table *nt, int wh_size)
-+{
-+    bss_t *ni;
-+
-+    ni = A_MALLOC_NOWAIT(sizeof(bss_t));
-+
-+    if (ni != NULL) {
-+        ni->ni_buf = A_MALLOC_NOWAIT(wh_size);
-+        if (ni->ni_buf == NULL) {
-+            A_FREE(ni);
-+            ni = NULL;
-+            return ni;
-+        }
-+    } else {
-+        return ni;
-+    }
-+
-+    /* Make sure our lists are clean */
-+    ni->ni_list_next = NULL;
-+    ni->ni_list_prev = NULL;
-+    ni->ni_hash_next = NULL;
-+    ni->ni_hash_prev = NULL;
-+
-+    //
-+    // ni_scangen never initialized before and during suspend/resume of winmobile, customer (LG/SEMCO) identified
-+    // that some junk has been stored in this, due to this scan list didn't properly updated
-+    //
-+    ni->ni_scangen     = 0;
-+
-+    return ni;
-+}
-+
-+void
-+wlan_node_free(bss_t *ni)
-+{
-+    if (ni->ni_buf != NULL) {
-+        A_FREE(ni->ni_buf);
-+    }
-+    A_FREE(ni);
-+}
-+
-+void
-+wlan_setup_node(struct ieee80211_node_table *nt, bss_t *ni,
-+                const A_UINT8 *macaddr)
-+{
-+    int hash;
-+
-+    A_MEMCPY(ni->ni_macaddr, macaddr, IEEE80211_ADDR_LEN);
-+    hash = IEEE80211_NODE_HASH(macaddr);
-+    ieee80211_node_initref(ni);     /* mark referenced */
-+
-+    ni->ni_tstamp = A_GET_MS(WLAN_NODE_INACT_TIMEOUT_MSEC);
-+    IEEE80211_NODE_LOCK_BH(nt);
-+
-+    /* Insert at the end of the node list */
-+    ni->ni_list_next = NULL;
-+    ni->ni_list_prev = nt->nt_node_last;
-+    if(nt->nt_node_last != NULL)
-+    {
-+        nt->nt_node_last->ni_list_next = ni;
-+    }
-+    nt->nt_node_last = ni;
-+    if(nt->nt_node_first == NULL)
-+    {
-+        nt->nt_node_first = ni;
-+    }
-+
-+    /* Insert into the hash list i.e. the bucket */
-+    if((ni->ni_hash_next = nt->nt_hash[hash]) != NULL)
-+    {
-+        nt->nt_hash[hash]->ni_hash_prev = ni;
-+    }
-+    ni->ni_hash_prev = NULL;
-+    nt->nt_hash[hash] = ni;
-+
-+    if (!nt->isTimerArmed) {
-+        A_TIMEOUT_MS(&nt->nt_inact_timer, WLAN_NODE_INACT_TIMEOUT_MSEC, 0);
-+        nt->isTimerArmed = TRUE;
-+    }
-+
-+    IEEE80211_NODE_UNLOCK_BH(nt);
-+}
-+
-+static bss_t *
-+_ieee80211_find_node(struct ieee80211_node_table *nt,
-+    const A_UINT8 *macaddr)
-+{
-+    bss_t *ni;
-+    int hash;
-+
-+    IEEE80211_NODE_LOCK_ASSERT(nt);
-+
-+    hash = IEEE80211_NODE_HASH(macaddr);
-+    for(ni = nt->nt_hash[hash]; ni; ni = ni->ni_hash_next) {
-+        if (IEEE80211_ADDR_EQ(ni->ni_macaddr, macaddr)) {
-+            ieee80211_node_incref(ni);  /* mark referenced */
-+            return ni;
-+        }
-+    }
-+    return NULL;
-+}
-+
-+bss_t *
-+wlan_find_node(struct ieee80211_node_table *nt, const A_UINT8 *macaddr)
-+{
-+    bss_t *ni;
-+
-+    IEEE80211_NODE_LOCK(nt);
-+    ni = _ieee80211_find_node(nt, macaddr);
-+    IEEE80211_NODE_UNLOCK(nt);
-+    return ni;
-+}
-+
-+/*
-+ * Reclaim a node.  If this is the last reference count then
-+ * do the normal free work.  Otherwise remove it from the node
-+ * table and mark it gone by clearing the back-reference.
-+ */
-+void
-+wlan_node_reclaim(struct ieee80211_node_table *nt, bss_t *ni)
-+{
-+    IEEE80211_NODE_LOCK(nt);
-+
-+    if(ni->ni_list_prev == NULL)
-+    {
-+        /* First in list so fix the list head */
-+        nt->nt_node_first = ni->ni_list_next;
-+    }
-+    else
-+    {
-+        ni->ni_list_prev->ni_list_next = ni->ni_list_next;
-+    }
-+
-+    if(ni->ni_list_next == NULL)
-+    {
-+        /* Last in list so fix list tail */
-+        nt->nt_node_last = ni->ni_list_prev;
-+    }
-+    else
-+    {
-+        ni->ni_list_next->ni_list_prev = ni->ni_list_prev;
-+    }
-+
-+    if(ni->ni_hash_prev == NULL)
-+    {
-+        /* First in list so fix the list head */
-+        int hash;
-+        hash = IEEE80211_NODE_HASH(ni->ni_macaddr);
-+        nt->nt_hash[hash] = ni->ni_hash_next;
-+    }
-+    else
-+    {
-+        ni->ni_hash_prev->ni_hash_next = ni->ni_hash_next;
-+    }
-+
-+    if(ni->ni_hash_next != NULL)
-+    {
-+        ni->ni_hash_next->ni_hash_prev = ni->ni_hash_prev;
-+    }
-+    wlan_node_free(ni);
-+
-+    IEEE80211_NODE_UNLOCK(nt);
-+}
-+
-+static void
-+wlan_node_dec_free(bss_t *ni)
-+{
-+    if (ieee80211_node_dectestref(ni)) {
-+        wlan_node_free(ni);
-+    }
-+}
-+
-+void
-+wlan_free_allnodes(struct ieee80211_node_table *nt)
-+{
-+    bss_t *ni;
-+
-+    while ((ni = nt->nt_node_first) != NULL) {
-+        wlan_node_reclaim(nt, ni);
-+    }
-+}
-+
-+void
-+wlan_iterate_nodes(struct ieee80211_node_table *nt, wlan_node_iter_func *f,
-+                   void *arg)
-+{
-+    bss_t *ni;
-+    A_UINT32 gen;
-+
-+    gen = ++nt->nt_scangen;
-+
-+    IEEE80211_NODE_LOCK(nt);
-+    for (ni = nt->nt_node_first; ni; ni = ni->ni_list_next) {
-+        if (ni->ni_scangen != gen) {
-+            ni->ni_scangen = gen;
-+            (void) ieee80211_node_incref(ni);
-+            (*f)(arg, ni);
-+            wlan_node_dec_free(ni);
-+        }
-+    }
-+    IEEE80211_NODE_UNLOCK(nt);
-+}
-+
-+/*
-+ * Node table support.
-+ */
-+void
-+wlan_node_table_init(void *wmip, struct ieee80211_node_table *nt)
-+{
-+    int i;
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_WLAN, ("node table = 0x%x\n", (A_UINT32)nt));
-+    IEEE80211_NODE_LOCK_INIT(nt);
-+
-+    nt->nt_node_first = nt->nt_node_last = NULL;
-+    for(i = 0; i < IEEE80211_NODE_HASHSIZE; i++)
-+    {
-+        nt->nt_hash[i] = NULL;
-+    }
-+    A_INIT_TIMER(&nt->nt_inact_timer, wlan_node_timeout, nt);
-+    nt->isTimerArmed = FALSE;
-+    nt->nt_wmip = wmip;
-+}
-+
-+static void
-+wlan_node_timeout(A_ATH_TIMER arg)
-+{
-+    struct ieee80211_node_table *nt = (struct ieee80211_node_table *)arg;
-+    bss_t *bss, *nextBss;
-+    A_UINT8 myBssid[IEEE80211_ADDR_LEN], reArmTimer = FALSE;
-+
-+    wmi_get_current_bssid(nt->nt_wmip, myBssid);
-+
-+    bss = nt->nt_node_first;
-+    while (bss != NULL)
-+    {
-+        nextBss = bss->ni_list_next;
-+        if (A_MEMCMP(myBssid, bss->ni_macaddr, sizeof(myBssid)) != 0)
-+        {
-+
-+            if (bss->ni_tstamp <= A_GET_MS(0))
-+            {
-+               /*
-+                * free up all but the current bss - if set
-+                */
-+                wlan_node_reclaim(nt, bss);
-+            }
-+            else
-+            {
-+                /*
-+                 * Re-arm timer, only when we have a bss other than
-+                 * current bss AND it is not aged-out.
-+                 */
-+                reArmTimer = TRUE;
-+            }
-+        }
-+        bss = nextBss;
-+    }
-+
-+    if(reArmTimer)
-+        A_TIMEOUT_MS(&nt->nt_inact_timer, WLAN_NODE_INACT_TIMEOUT_MSEC, 0);
-+
-+    nt->isTimerArmed = reArmTimer;
-+}
-+
-+void
-+wlan_node_table_cleanup(struct ieee80211_node_table *nt)
-+{
-+    A_UNTIMEOUT(&nt->nt_inact_timer);
-+    A_DELETE_TIMER(&nt->nt_inact_timer);
-+    wlan_free_allnodes(nt);
-+    IEEE80211_NODE_LOCK_DESTROY(nt);
-+}
-+
-+bss_t *
-+wlan_find_Ssidnode (struct ieee80211_node_table *nt, A_UCHAR *pSsid,
-+                                      A_UINT32 ssidLength, A_BOOL bIsWPA2)
-+{
-+    bss_t   *ni = NULL;
-+      A_UCHAR *pIESsid = NULL;
-+
-+    IEEE80211_NODE_LOCK (nt);
-+
-+    for (ni = nt->nt_node_first; ni; ni = ni->ni_list_next) {
-+              pIESsid = ni->ni_cie.ie_ssid;
-+              if (pIESsid[1] <= 32) {
-+
-+                      // Step 1 : Check SSID
-+                      if (0x00 == memcmp (pSsid, &pIESsid[2], ssidLength)) {
-+
-+                              // Step 2 : if SSID matches, check WPA or WPA2
-+                              if (TRUE == bIsWPA2 && NULL != ni->ni_cie.ie_rsn) {
-+                                      ieee80211_node_incref (ni);  /* mark referenced */
-+                                      IEEE80211_NODE_UNLOCK (nt);
-+                                      return ni;
-+                              }
-+                              if (FALSE == bIsWPA2 && NULL != ni->ni_cie.ie_wpa) {
-+                                      ieee80211_node_incref(ni);  /* mark referenced */
-+                                      IEEE80211_NODE_UNLOCK (nt);
-+                                      return ni;
-+                              }
-+                      }
-+              }
-+    }
-+
-+    IEEE80211_NODE_UNLOCK (nt);
-+
-+    return NULL;
-+}
-+
-+void
-+wlan_node_return (struct ieee80211_node_table *nt, bss_t *ni)
-+{
-+      IEEE80211_NODE_LOCK (nt);
-+      wlan_node_dec_free (ni);
-+      IEEE80211_NODE_UNLOCK (nt);
-+}
-diff --git a/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c b/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c
-new file mode 100644
-index 0000000..15beabb
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c
-@@ -0,0 +1,192 @@
-+/*-
-+ * Copyright (c) 2001 Atsushi Onoe
-+ * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ * 3. The name of the author may not be used to endorse or promote products
-+ *    derived from this software without specific prior written permission.
-+ *
-+ * Alternatively, this software may be distributed under the terms of the
-+ * GNU General Public License ("GPL") version 2 as published by the Free
-+ * Software Foundation.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
-+ */
-+/*
-+ * IEEE 802.11 input handling.
-+ */
-+
-+#include "a_config.h"
-+#include "athdefs.h"
-+#include "a_types.h"
-+#include "a_osapi.h"
-+#include <wmi.h>
-+#include <ieee80211.h>
-+#include <wlan_api.h>
-+
-+#define IEEE80211_VERIFY_LENGTH(_len, _minlen) do {         \
-+    if ((_len) < (_minlen)) {                   \
-+        return A_EINVAL;                         \
-+    }                               \
-+} while (0)
-+
-+#define IEEE80211_VERIFY_ELEMENT(__elem, __maxlen) do {         \
-+    if ((__elem) == NULL) {                     \
-+        return A_EINVAL;                         \
-+    }                               \
-+    if ((__elem)[1] > (__maxlen)) {                 \
-+        return A_EINVAL;                         \
-+    }                               \
-+} while (0)
-+
-+
-+/* unaligned little endian access */
-+#define LE_READ_2(p)                            \
-+    ((A_UINT16)                            \
-+     ((((A_UINT8 *)(p))[0]      ) | (((A_UINT8 *)(p))[1] <<  8)))
-+
-+#define LE_READ_4(p)                            \
-+    ((A_UINT32)                            \
-+     ((((A_UINT8 *)(p))[0]      ) | (((A_UINT8 *)(p))[1] <<  8) | \
-+      (((A_UINT8 *)(p))[2] << 16) | (((A_UINT8 *)(p))[3] << 24)))
-+
-+
-+static int __inline
-+iswpaoui(const A_UINT8 *frm)
-+{
-+    return frm[1] > 3 && LE_READ_4(frm+2) == ((WPA_OUI_TYPE<<24)|WPA_OUI);
-+}
-+
-+static int __inline
-+iswmmoui(const A_UINT8 *frm)
-+{
-+    return frm[1] > 3 && LE_READ_4(frm+2) == ((WMM_OUI_TYPE<<24)|WMM_OUI);
-+}
-+
-+static int __inline
-+iswmmparam(const A_UINT8 *frm)
-+{
-+    return frm[1] > 5 && frm[6] == WMM_PARAM_OUI_SUBTYPE;
-+}
-+
-+static int __inline
-+iswmminfo(const A_UINT8 *frm)
-+{
-+    return frm[1] > 5 && frm[6] == WMM_INFO_OUI_SUBTYPE;
-+}
-+
-+static int __inline
-+isatherosoui(const A_UINT8 *frm)
-+{
-+    return frm[1] > 3 && LE_READ_4(frm+2) == ((ATH_OUI_TYPE<<24)|ATH_OUI);
-+}
-+
-+static int __inline
-+iswscoui(const A_UINT8 *frm)
-+{
-+    return frm[1] > 3 && LE_READ_4(frm+2) == ((0x04<<24)|WPA_OUI);
-+}
-+
-+A_STATUS
-+wlan_parse_beacon(A_UINT8 *buf, int framelen, struct ieee80211_common_ie *cie)
-+{
-+    A_UINT8 *frm, *efrm;
-+
-+    frm = buf;
-+    efrm = (A_UINT8 *) (frm + framelen);
-+
-+    /*
-+     * beacon/probe response frame format
-+     *  [8] time stamp
-+     *  [2] beacon interval
-+     *  [2] capability information
-+     *  [tlv] ssid
-+     *  [tlv] supported rates
-+     *  [tlv] country information
-+     *  [tlv] parameter set (FH/DS)
-+     *  [tlv] erp information
-+     *  [tlv] extended supported rates
-+     *  [tlv] WMM
-+     *  [tlv] WPA or RSN
-+     *  [tlv] Atheros Advanced Capabilities
-+     */
-+    IEEE80211_VERIFY_LENGTH(efrm - frm, 12);
-+    A_MEMZERO(cie, sizeof(*cie));
-+
-+    cie->ie_tstamp = frm; frm += 8;
-+    cie->ie_beaconInt = A_LE2CPU16(*(A_UINT16 *)frm);  frm += 2;
-+    cie->ie_capInfo = A_LE2CPU16(*(A_UINT16 *)frm);  frm += 2;
-+    cie->ie_chan = 0;
-+
-+    while (frm < efrm) {
-+        switch (*frm) {
-+        case IEEE80211_ELEMID_SSID:
-+            cie->ie_ssid = frm;
-+            break;
-+        case IEEE80211_ELEMID_RATES:
-+            cie->ie_rates = frm;
-+            break;
-+        case IEEE80211_ELEMID_COUNTRY:
-+            cie->ie_country = frm;
-+            break;
-+        case IEEE80211_ELEMID_FHPARMS:
-+            break;
-+        case IEEE80211_ELEMID_DSPARMS:
-+            cie->ie_chan = frm[2];
-+            break;
-+        case IEEE80211_ELEMID_TIM:
-+            cie->ie_tim = frm;
-+            break;
-+        case IEEE80211_ELEMID_IBSSPARMS:
-+            break;
-+        case IEEE80211_ELEMID_XRATES:
-+            cie->ie_xrates = frm;
-+            break;
-+        case IEEE80211_ELEMID_ERP:
-+            if (frm[1] != 1) {
-+                //A_PRINTF("Discarding ERP Element - Bad Len\n");
-+                return A_EINVAL;
-+            }
-+            cie->ie_erp = frm[2];
-+            break;
-+        case IEEE80211_ELEMID_RSN:
-+            cie->ie_rsn = frm;
-+            break;
-+        case IEEE80211_ELEMID_VENDOR:
-+            if (iswpaoui(frm)) {
-+                cie->ie_wpa = frm;
-+            } else if (iswmmoui(frm)) {
-+                cie->ie_wmm = frm;
-+            } else if (isatherosoui(frm)) {
-+                cie->ie_ath = frm;
-+            } else if(iswscoui(frm)) {
-+                cie->ie_wsc = frm;
-+            }
-+            break;
-+        default:
-+            break;
-+        }
-+        frm += frm[1] + 2;
-+    }
-+    IEEE80211_VERIFY_ELEMENT(cie->ie_rates, IEEE80211_RATE_MAXSIZE);
-+    IEEE80211_VERIFY_ELEMENT(cie->ie_ssid, IEEE80211_NWID_LEN);
-+
-+    return A_OK;
-+}
-diff --git a/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c b/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c
-new file mode 100644
-index 0000000..fd5aac9
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c
-@@ -0,0 +1,59 @@
-+/*
-+ * Copyright (c) 2004-2005 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * This module implements frequently used wlan utilies
-+ *
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/wlan/src/wlan_utils.c#1 $
-+ *
-+ *
-+ *  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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include <a_config.h>
-+#include <athdefs.h>
-+#include <a_types.h>
-+#include <a_osapi.h>
-+
-+/*
-+ * converts ieee channel number to frequency
-+ */
-+A_UINT16
-+wlan_ieee2freq(int chan)
-+{
-+    if (chan == 14) {
-+        return 2484;
-+    }
-+    if (chan < 14) {    /* 0-13 */
-+        return (2407 + (chan*5));
-+    }
-+    if (chan < 27) {    /* 15-26 */
-+        return (2512 + ((chan-15)*20));
-+    }
-+    return (5000 + (chan*5));
-+}
-+
-+/*
-+ * Converts MHz frequency to IEEE channel number.
-+ */
-+A_UINT32
-+wlan_freq2ieee(A_UINT16 freq)
-+{
-+    if (freq == 2484)
-+        return 14;
-+    if (freq < 2484)
-+        return (freq - 2407) / 5;
-+    if (freq < 5000)
-+        return 15 + ((freq - 2512) / 20);
-+    return (freq - 5000) / 5;
-+}
-diff --git a/drivers/sdio/function/wlan/ar6000/wmi/wmi.c b/drivers/sdio/function/wlan/ar6000/wmi/wmi.c
-new file mode 100644
-index 0000000..0e0e6ba
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/wmi/wmi.c
-@@ -0,0 +1,3921 @@
-+/*
-+ * Copyright (c) 2004-2007 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * This module implements the hardware independent layer of the
-+ * Wireless Module Interface (WMI) protocol.
-+ *
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/wmi/wmi.c#3 $
-+ *
-+ *
-+ *  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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#include <a_config.h>
-+#include <athdefs.h>
-+#include <a_types.h>
-+#include <a_osapi.h>
-+#include "htc.h"
-+#include "htc_api.h"
-+#include "wmi.h"
-+#include <ieee80211.h>
-+#include <ieee80211_node.h>
-+#include <wlan_api.h>
-+#include <wmi_api.h>
-+#include "dset_api.h"
-+#include "gpio_api.h"
-+#include "wmi_host.h"
-+#include "a_drv.h"
-+#include "a_drv_api.h"
-+#include "a_debug.h"
-+#include "dbglog_api.h"
-+
-+static A_STATUS wmi_ready_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+
-+static A_STATUS wmi_connect_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                     int len);
-+static A_STATUS wmi_disconnect_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                        int len);
-+static A_STATUS wmi_tkip_micerr_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                        int len);
-+static A_STATUS wmi_bssInfo_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                     int len);
-+static A_STATUS wmi_opt_frame_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                       int len);
-+static A_STATUS wmi_pstream_timeout_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                     int len);
-+static A_STATUS wmi_sync_point(struct wmi_t *wmip);
-+
-+static A_STATUS wmi_bitrate_reply_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                     int len);
-+static A_STATUS wmi_ratemask_reply_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                     int len);
-+static A_STATUS wmi_channelList_reply_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                         int len);
-+static A_STATUS wmi_regDomain_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                       int len);
-+static A_STATUS wmi_txPwr_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+static A_STATUS wmi_neighborReport_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                             int len);
-+
-+static A_STATUS wmi_dset_open_req_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                     int len);
-+#ifdef CONFIG_HOST_DSET_SUPPORT
-+static A_STATUS wmi_dset_close_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+static A_STATUS wmi_dset_data_req_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                     int len);
-+#endif /* CONFIG_HOST_DSET_SUPPORT */
-+
-+
-+static A_STATUS wmi_scanComplete_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                     int len);
-+static A_STATUS wmi_errorEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+static A_STATUS wmi_statsEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+static A_STATUS wmi_rssiThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+static A_STATUS wmi_hbChallengeResp_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+static A_STATUS wmi_reportErrorEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+static A_STATUS wmi_cac_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+static A_STATUS wmi_roam_tbl_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                      int len);
-+static A_STATUS wmi_roam_data_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                      int len);
-+static A_STATUS wmi_get_wow_list_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
-+                                      int len);
-+static A_STATUS
-+wmi_get_pmkid_list_event_rx(struct wmi_t *wmip, A_UINT8 *datap, A_UINT32 len);
-+
-+#ifdef CONFIG_HOST_GPIO_SUPPORT
-+static A_STATUS wmi_gpio_intr_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+static A_STATUS wmi_gpio_data_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+static A_STATUS wmi_gpio_ack_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+#endif /* CONFIG_HOST_GPIO_SUPPORT */
-+
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+static A_STATUS
-+wmi_tcmd_test_report_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+#endif
-+
-+static A_STATUS
-+wmi_txRetryErrEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+
-+static A_STATUS
-+wmi_snrThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+
-+static A_STATUS
-+wmi_lqThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+
-+static A_BOOL
-+wmi_is_bitrate_index_valid(struct wmi_t *wmip, A_UINT32 rateIndex);
-+
-+static A_STATUS
-+wmi_aplistEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+
-+static A_STATUS
-+wmi_dbglog_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+
-+static A_STATUS wmi_keepalive_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
-+
-+int wps_enable;
-+static const A_INT32 wmi_rateTable[] = {
-+    1000,
-+    2000,
-+    5500,
-+    11000,
-+    6000,
-+    9000,
-+    12000,
-+    18000,
-+    24000,
-+    36000,
-+    48000,
-+    54000,
-+    0};
-+
-+#define MODE_A_SUPPORT_RATE_START       4
-+#define MODE_A_SUPPORT_RATE_STOP        11
-+
-+#define MODE_GONLY_SUPPORT_RATE_START   MODE_A_SUPPORT_RATE_START
-+#define MODE_GONLY_SUPPORT_RATE_STOP    MODE_A_SUPPORT_RATE_STOP
-+
-+#define MODE_B_SUPPORT_RATE_START       0
-+#define MODE_B_SUPPORT_RATE_STOP        3
-+
-+#define MODE_G_SUPPORT_RATE_START       0
-+#define MODE_G_SUPPORT_RATE_STOP        11
-+
-+#define MAX_NUMBER_OF_SUPPORT_RATES     (MODE_G_SUPPORT_RATE_STOP + 1)
-+
-+/* 802.1d to AC mapping. Refer pg 57 of WMM-test-plan-v1.2 */
-+const A_UINT8 up_to_ac[]= {
-+                WMM_AC_BE,
-+                WMM_AC_BK,
-+                WMM_AC_BK,
-+                WMM_AC_BE,
-+                WMM_AC_VI,
-+                WMM_AC_VI,
-+                WMM_AC_VO,
-+                WMM_AC_VO,
-+            };
-+
-+void *
-+wmi_init(void *devt)
-+{
-+    struct wmi_t *wmip;
-+
-+    wmip = A_MALLOC(sizeof(struct wmi_t));
-+    if (wmip == NULL) {
-+        return (NULL);
-+    }
-+    A_MEMZERO(wmip, sizeof(*wmip));
-+    A_MUTEX_INIT(&wmip->wmi_lock);
-+    wmip->wmi_devt = devt;
-+    wlan_node_table_init(wmip, &wmip->wmi_scan_table);
-+    wmi_qos_state_init(wmip);
-+    wmip->wmi_powerMode = REC_POWER;
-+    wmip->wmi_phyMode = WMI_11G_MODE;
-+
-+    return (wmip);
-+}
-+
-+void
-+wmi_qos_state_init(struct wmi_t *wmip)
-+{
-+    A_UINT8 i;
-+
-+    if (wmip == NULL) {
-+        return;
-+    }
-+    LOCK_WMI(wmip);
-+
-+    /* Initialize QoS States */
-+    wmip->wmi_numQoSStream = 0;
-+
-+    wmip->wmi_fatPipeExists = 0;
-+
-+    for (i=0; i < WMM_NUM_AC; i++) {
-+        wmip->wmi_streamExistsForAC[i]=0;
-+    }
-+
-+        /* Initialize the static Wmi stream Pri to WMM AC mappings Arrays */
-+    WMI_INIT_WMISTREAM_AC_MAP(wmip);
-+
-+    UNLOCK_WMI(wmip);
-+
-+    A_WMI_SET_NUMDATAENDPTS(wmip->wmi_devt, 1);
-+}
-+
-+void
-+wmi_shutdown(struct wmi_t *wmip)
-+{
-+    if (wmip != NULL) {
-+        wlan_node_table_cleanup(&wmip->wmi_scan_table);
-+        if (A_IS_MUTEX_VALID(&wmip->wmi_lock)) {
-+            A_MUTEX_DELETE(&wmip->wmi_lock);
-+        }
-+        A_FREE(wmip);
-+    }
-+}
-+
-+/*
-+ *  performs DIX to 802.3 encapsulation for transmit packets.
-+ *  uses passed in buffer.  Returns buffer or NULL if failed.
-+ *  Assumes the entire DIX header is contigous and that there is
-+ *  enough room in the buffer for a 802.3 mac header and LLC+SNAP headers.
-+ */
-+A_STATUS
-+wmi_dix_2_dot3(struct wmi_t *wmip, void *osbuf)
-+{
-+    A_UINT8          *datap;
-+    A_UINT16         typeorlen;
-+    ATH_MAC_HDR      macHdr;
-+    ATH_LLC_SNAP_HDR *llcHdr;
-+
-+    A_ASSERT(osbuf != NULL);
-+
-+    if (A_NETBUF_HEADROOM(osbuf) <
-+        (sizeof(ATH_LLC_SNAP_HDR) + sizeof(WMI_DATA_HDR)))
-+    {
-+        return A_NO_MEMORY;
-+    }
-+
-+    datap = A_NETBUF_DATA(osbuf);
-+
-+    typeorlen = *(A_UINT16 *)(datap + ATH_MAC_LEN + ATH_MAC_LEN);
-+
-+    if (!IS_ETHERTYPE(A_BE2CPU16(typeorlen))) {
-+        /*
-+         * packet is already in 802.3 format - return success
-+         */
-+        A_DPRINTF(DBG_WMI, (DBGFMT "packet already 802.3\n", DBGARG));
-+        return (A_OK);
-+    }
-+
-+    /*
-+     * Save mac fields and length to be inserted later
-+     */
-+    A_MEMCPY(macHdr.dstMac, datap, ATH_MAC_LEN);
-+    A_MEMCPY(macHdr.srcMac, datap + ATH_MAC_LEN, ATH_MAC_LEN);
-+    macHdr.typeOrLen = A_CPU2BE16(A_NETBUF_LEN(osbuf) - sizeof(ATH_MAC_HDR) +
-+                                  sizeof(ATH_LLC_SNAP_HDR));
-+
-+    /*
-+     * Make room for LLC+SNAP headers
-+     */
-+    if (A_NETBUF_PUSH(osbuf, sizeof(ATH_LLC_SNAP_HDR)) != A_OK) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    datap = A_NETBUF_DATA(osbuf);
-+
-+    A_MEMCPY(datap, &macHdr, sizeof (ATH_MAC_HDR));
-+
-+    llcHdr = (ATH_LLC_SNAP_HDR *)(datap + sizeof(ATH_MAC_HDR));
-+    llcHdr->dsap      = 0xAA;
-+    llcHdr->ssap      = 0xAA;
-+    llcHdr->cntl      = 0x03;
-+    llcHdr->orgCode[0] = 0x0;
-+    llcHdr->orgCode[1] = 0x0;
-+    llcHdr->orgCode[2] = 0x0;
-+    llcHdr->etherType = typeorlen;
-+
-+    return (A_OK);
-+}
-+
-+/*
-+ * Adds a WMI data header
-+ * Assumes there is enough room in the buffer to add header.
-+ */
-+A_STATUS
-+wmi_data_hdr_add(struct wmi_t *wmip, void *osbuf, A_UINT8 msgType)
-+{
-+    WMI_DATA_HDR     *dtHdr;
-+
-+    A_ASSERT(osbuf != NULL);
-+
-+    if (A_NETBUF_PUSH(osbuf, sizeof(WMI_DATA_HDR)) != A_OK) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    dtHdr = (WMI_DATA_HDR *)A_NETBUF_DATA(osbuf);
-+    dtHdr->info = msgType;
-+    dtHdr->rssi = 0;
-+
-+    return (A_OK);
-+}
-+
-+A_UINT8 wmi_implicit_create_pstream(struct wmi_t *wmip, void *osbuf, A_UINT8 dir, A_UINT8 up)
-+{
-+    A_UINT8         *datap;
-+    A_UINT8         trafficClass = WMM_AC_BE, userPriority = up;
-+    ATH_LLC_SNAP_HDR *llcHdr;
-+    A_UINT16        ipType = IP_ETHERTYPE;
-+    WMI_DATA_HDR     *dtHdr;
-+    WMI_CREATE_PSTREAM_CMD  cmd;
-+    A_BOOL           streamExists = FALSE;
-+
-+    A_ASSERT(osbuf != NULL);
-+
-+    datap = A_NETBUF_DATA(osbuf);
-+
-+    if (up == UNDEFINED_PRI) {
-+    llcHdr = (ATH_LLC_SNAP_HDR *)(datap + sizeof(WMI_DATA_HDR) +
-+                                  sizeof(ATH_MAC_HDR));
-+
-+        if (llcHdr->etherType == A_CPU2BE16(ipType)) {
-+        /* Extract the endpoint info from the TOS field in the IP header */
-+        userPriority = A_WMI_IPTOS_TO_USERPRIORITY(((A_UINT8 *)llcHdr) + sizeof(ATH_LLC_SNAP_HDR));
-+        }
-+    }
-+
-+    if (userPriority < MAX_NUM_PRI) {
-+        trafficClass = convert_userPriority_to_trafficClass(userPriority);
-+    }
-+
-+    dtHdr = (WMI_DATA_HDR *)datap;
-+    if(dir==UPLINK_TRAFFIC)
-+        dtHdr->info |= (userPriority & WMI_DATA_HDR_UP_MASK) << WMI_DATA_HDR_UP_SHIFT;  /* lower 3-bits are 802.1d priority */
-+
-+    LOCK_WMI(wmip);
-+    streamExists = wmip->wmi_fatPipeExists;
-+    UNLOCK_WMI(wmip);
-+
-+    if (!(streamExists & (1 << trafficClass))) {
-+
-+        A_MEMZERO(&cmd, sizeof(cmd));
-+          cmd.trafficClass = trafficClass;
-+          cmd.userPriority = userPriority;
-+              cmd.inactivityInt = WMI_IMPLICIT_PSTREAM_INACTIVITY_INT;
-+            /* Implicit streams are created with TSID 0xFF */
-+        cmd.tsid = WMI_IMPLICIT_PSTREAM;
-+        wmi_create_pstream_cmd(wmip, &cmd);
-+    }
-+
-+    return trafficClass;
-+}
-+
-+WMI_PRI_STREAM_ID
-+wmi_get_stream_id(struct wmi_t *wmip, A_UINT8 trafficClass)
-+{
-+    return WMI_ACCESSCATEGORY_WMISTREAM(wmip, trafficClass);
-+}
-+
-+/*
-+ *  performs 802.3 to DIX encapsulation for received packets.
-+ *  Assumes the entire 802.3 header is contigous.
-+ */
-+A_STATUS
-+wmi_dot3_2_dix(struct wmi_t *wmip, void *osbuf)
-+{
-+    A_UINT8          *datap;
-+    ATH_MAC_HDR      macHdr;
-+    ATH_LLC_SNAP_HDR *llcHdr;
-+
-+    A_ASSERT(osbuf != NULL);
-+    datap = A_NETBUF_DATA(osbuf);
-+
-+    A_MEMCPY(&macHdr, datap, sizeof(ATH_MAC_HDR));
-+    llcHdr = (ATH_LLC_SNAP_HDR *)(datap + sizeof(ATH_MAC_HDR));
-+    macHdr.typeOrLen = llcHdr->etherType;
-+
-+    if (A_NETBUF_PULL(osbuf, sizeof(ATH_LLC_SNAP_HDR)) != A_OK) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    datap = A_NETBUF_DATA(osbuf);
-+
-+    A_MEMCPY(datap, &macHdr, sizeof (ATH_MAC_HDR));
-+
-+    return (A_OK);
-+}
-+
-+/*
-+ * Removes a WMI data header
-+ */
-+A_STATUS
-+wmi_data_hdr_remove(struct wmi_t *wmip, void *osbuf)
-+{
-+    A_ASSERT(osbuf != NULL);
-+
-+    return (A_NETBUF_PULL(osbuf, sizeof(WMI_DATA_HDR)));
-+}
-+
-+void
-+wmi_iterate_nodes(struct wmi_t *wmip, wlan_node_iter_func *f, void *arg)
-+{
-+    wlan_iterate_nodes(&wmip->wmi_scan_table, f, arg);
-+}
-+
-+/*
-+ * WMI Extended Event received from Target.
-+ */
-+A_STATUS
-+wmi_control_rx_xtnd(struct wmi_t *wmip, void *osbuf)
-+{
-+    WMIX_CMD_HDR *cmd;
-+    A_UINT16 id;
-+    A_UINT8 *datap;
-+    A_UINT32 len;
-+    A_STATUS status = A_OK;
-+
-+    if (A_NETBUF_LEN(osbuf) < sizeof(WMIX_CMD_HDR)) {
-+        A_DPRINTF(DBG_WMI, (DBGFMT "bad packet 1\n", DBGARG));
-+        wmip->wmi_stats.cmd_len_err++;
-+        A_NETBUF_FREE(osbuf);
-+        return A_ERROR;
-+    }
-+
-+    cmd = (WMIX_CMD_HDR *)A_NETBUF_DATA(osbuf);
-+    id = cmd->commandId;
-+
-+    if (A_NETBUF_PULL(osbuf, sizeof(WMIX_CMD_HDR)) != A_OK) {
-+        A_DPRINTF(DBG_WMI, (DBGFMT "bad packet 2\n", DBGARG));
-+        wmip->wmi_stats.cmd_len_err++;
-+        A_NETBUF_FREE(osbuf);
-+        return A_ERROR;
-+    }
-+
-+    datap = A_NETBUF_DATA(osbuf);
-+    len = A_NETBUF_LEN(osbuf);
-+
-+    switch (id) {
-+    case (WMIX_DSETOPENREQ_EVENTID):
-+        status = wmi_dset_open_req_rx(wmip, datap, len);
-+        break;
-+#ifdef CONFIG_HOST_DSET_SUPPORT
-+    case (WMIX_DSETCLOSE_EVENTID):
-+        status = wmi_dset_close_rx(wmip, datap, len);
-+        break;
-+    case (WMIX_DSETDATAREQ_EVENTID):
-+        status = wmi_dset_data_req_rx(wmip, datap, len);
-+        break;
-+#endif /* CONFIG_HOST_DSET_SUPPORT */
-+#ifdef CONFIG_HOST_GPIO_SUPPORT
-+    case (WMIX_GPIO_INTR_EVENTID):
-+        wmi_gpio_intr_rx(wmip, datap, len);
-+        break;
-+    case (WMIX_GPIO_DATA_EVENTID):
-+        wmi_gpio_data_rx(wmip, datap, len);
-+        break;
-+    case (WMIX_GPIO_ACK_EVENTID):
-+        wmi_gpio_ack_rx(wmip, datap, len);
-+        break;
-+#endif /* CONFIG_HOST_GPIO_SUPPORT */
-+    case (WMIX_HB_CHALLENGE_RESP_EVENTID):
-+        wmi_hbChallengeResp_rx(wmip, datap, len);
-+        break;
-+    case (WMIX_DBGLOG_EVENTID):
-+        wmi_dbglog_event_rx(wmip, datap, len);
-+        break;
-+    default:
-+        A_DPRINTF(DBG_WMI|DBG_ERROR,
-+            (DBGFMT "Unknown id 0x%x\n", DBGARG, id));
-+        wmip->wmi_stats.cmd_id_err++;
-+        status = A_ERROR;
-+        break;
-+    }
-+
-+    return status;
-+}
-+
-+/*
-+ * Control Path
-+ */
-+A_UINT32 cmdRecvNum;
-+
-+A_STATUS
-+wmi_control_rx(struct wmi_t *wmip, void *osbuf)
-+{
-+    WMI_CMD_HDR *cmd;
-+    A_UINT16 id;
-+    A_UINT8 *datap;
-+    A_UINT32 len, i, loggingReq;
-+    A_STATUS status = A_OK;
-+
-+    A_ASSERT(osbuf != NULL);
-+    if (A_NETBUF_LEN(osbuf) < sizeof(WMI_CMD_HDR)) {
-+        A_DPRINTF(DBG_WMI, (DBGFMT "bad packet 1\n", DBGARG));
-+        wmip->wmi_stats.cmd_len_err++;
-+        A_NETBUF_FREE(osbuf);
-+        return A_ERROR;
-+    }
-+
-+    cmd = (WMI_CMD_HDR *)A_NETBUF_DATA(osbuf);
-+    id = cmd->commandId;
-+
-+    if (A_NETBUF_PULL(osbuf, sizeof(WMI_CMD_HDR)) != A_OK) {
-+        A_DPRINTF(DBG_WMI, (DBGFMT "bad packet 2\n", DBGARG));
-+        wmip->wmi_stats.cmd_len_err++;
-+        A_NETBUF_FREE(osbuf);
-+        return A_ERROR;
-+    }
-+
-+    datap = A_NETBUF_DATA(osbuf);
-+    len = A_NETBUF_LEN(osbuf);
-+
-+    ar6000_get_driver_cfg(wmip->wmi_devt,
-+                    AR6000_DRIVER_CFG_LOG_RAW_WMI_MSGS,
-+                    &loggingReq);
-+
-+    if(loggingReq) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("WMI %d \n",id));
-+        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("WMI recv, MsgNo %d : ", cmdRecvNum));
-+        for(i = 0; i < len; i++)
-+            AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("%x ", datap[i]));
-+        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("\n"));
-+    }
-+
-+    LOCK_WMI(wmip);
-+    cmdRecvNum++;
-+    UNLOCK_WMI(wmip);
-+
-+    switch (id) {
-+    case (WMI_GET_BITRATE_CMDID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_GET_BITRATE_CMDID\n", DBGARG));
-+        status = wmi_bitrate_reply_rx(wmip, datap, len);
-+        break;
-+    case (WMI_GET_CHANNEL_LIST_CMDID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_GET_CHANNEL_LIST_CMDID\n", DBGARG));
-+        status = wmi_channelList_reply_rx(wmip, datap, len);
-+        break;
-+    case (WMI_GET_TX_PWR_CMDID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_GET_TX_PWR_CMDID\n", DBGARG));
-+        status = wmi_txPwr_reply_rx(wmip, datap, len);
-+        break;
-+    case (WMI_READY_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_READY_EVENTID\n", DBGARG));
-+        status = wmi_ready_event_rx(wmip, datap, len);
-+        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-+        A_WMI_DBGLOG_INIT_DONE(wmip->wmi_devt);
-+        break;
-+    case (WMI_CONNECT_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_CONNECT_EVENTID\n", DBGARG));
-+        status = wmi_connect_event_rx(wmip, datap, len);
-+        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-+        break;
-+    case (WMI_DISCONNECT_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_DISCONNECT_EVENTID\n", DBGARG));
-+        status = wmi_disconnect_event_rx(wmip, datap, len);
-+        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-+        break;
-+    case (WMI_TKIP_MICERR_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_TKIP_MICERR_EVENTID\n", DBGARG));
-+        status = wmi_tkip_micerr_event_rx(wmip, datap, len);
-+        break;
-+    case (WMI_BSSINFO_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_BSSINFO_EVENTID\n", DBGARG));
-+        status = wmi_bssInfo_event_rx(wmip, datap, len);
-+        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-+        break;
-+    case (WMI_REGDOMAIN_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_REGDOMAIN_EVENTID\n", DBGARG));
-+        status = wmi_regDomain_event_rx(wmip, datap, len);
-+        break;
-+    case (WMI_PSTREAM_TIMEOUT_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_PSTREAM_TIMEOUT_EVENTID\n", DBGARG));
-+        status = wmi_pstream_timeout_event_rx(wmip, datap, len);
-+            /* pstreams are fatpipe abstractions that get implicitly created.
-+             * User apps only deal with thinstreams. creation of a thinstream
-+             * by the user or data traffic flow in an AC triggers implicit
-+             * pstream creation. Do we need to send this event to App..?
-+             * no harm in sending it.
-+             */
-+        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-+        break;
-+    case (WMI_NEIGHBOR_REPORT_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_NEIGHBOR_REPORT_EVENTID\n", DBGARG));
-+        status = wmi_neighborReport_event_rx(wmip, datap, len);
-+        break;
-+    case (WMI_SCAN_COMPLETE_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_SCAN_COMPLETE_EVENTID\n", DBGARG));
-+        status = wmi_scanComplete_rx(wmip, datap, len);
-+        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-+        break;
-+    case (WMI_CMDERROR_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_CMDERROR_EVENTID\n", DBGARG));
-+        status = wmi_errorEvent_rx(wmip, datap, len);
-+        break;
-+    case (WMI_REPORT_STATISTICS_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_REPORT_STATISTICS_EVENTID\n", DBGARG));
-+        status = wmi_statsEvent_rx(wmip, datap, len);
-+        break;
-+    case (WMI_RSSI_THRESHOLD_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_RSSI_THRESHOLD_EVENTID\n", DBGARG));
-+        status = wmi_rssiThresholdEvent_rx(wmip, datap, len);
-+        break;
-+    case (WMI_ERROR_REPORT_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_ERROR_REPORT_EVENTID\n", DBGARG));
-+        status = wmi_reportErrorEvent_rx(wmip, datap, len);
-+        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-+        break;
-+    case (WMI_OPT_RX_FRAME_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_OPT_RX_FRAME_EVENTID\n", DBGARG));
-+        status = wmi_opt_frame_event_rx(wmip, datap, len);
-+        break;
-+    case (WMI_REPORT_ROAM_TBL_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_REPORT_ROAM_TBL_EVENTID\n", DBGARG));
-+        status = wmi_roam_tbl_event_rx(wmip, datap, len);
-+        break;
-+    case (WMI_EXTENSION_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_EXTENSION_EVENTID\n", DBGARG));
-+        status = wmi_control_rx_xtnd(wmip, osbuf);
-+        break;
-+    case (WMI_CAC_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_CAC_EVENTID\n", DBGARG));
-+        status = wmi_cac_event_rx(wmip, datap, len);
-+        break;
-+    case (WMI_REPORT_ROAM_DATA_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_REPORT_ROAM_DATA_EVENTID\n", DBGARG));
-+        status = wmi_roam_data_event_rx(wmip, datap, len);
-+        break;
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+    case (WMI_TEST_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_TEST_EVENTID\n", DBGARG));
-+        status = wmi_tcmd_test_report_rx(wmip, datap, len);
-+        break;
-+#endif
-+    case (WMI_GET_FIXRATES_CMDID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_GET_FIXRATES_CMDID\n", DBGARG));
-+        status = wmi_ratemask_reply_rx(wmip, datap, len);
-+        break;
-+    case (WMI_TX_RETRY_ERR_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_TX_RETRY_ERR_EVENTID\n", DBGARG));
-+        status = wmi_txRetryErrEvent_rx(wmip, datap, len);
-+        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-+        break;
-+    case (WMI_SNR_THRESHOLD_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_SNR_THRESHOLD_EVENTID\n", DBGARG));
-+        status = wmi_snrThresholdEvent_rx(wmip, datap, len);
-+        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-+        break;
-+    case (WMI_LQ_THRESHOLD_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_LQ_THRESHOLD_EVENTID\n", DBGARG));
-+        status = wmi_lqThresholdEvent_rx(wmip, datap, len);
-+        A_WMI_SEND_EVENT_TO_APP(wmip->wmi_devt, id, datap, len);
-+        break;
-+    case (WMI_APLIST_EVENTID):
-+        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("Received APLIST Event\n"));
-+        status = wmi_aplistEvent_rx(wmip, datap, len);
-+        break;
-+    case (WMI_GET_KEEPALIVE_CMDID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_GET_KEEPALIVE_CMDID\n", DBGARG));
-+        status = wmi_keepalive_reply_rx(wmip, datap, len);
-+        break;
-+    case (WMI_GET_WOW_LIST_EVENTID):
-+        status = wmi_get_wow_list_event_rx(wmip, datap, len);
-+        break;
-+    case (WMI_GET_PMKID_LIST_EVENTID):
-+        A_DPRINTF(DBG_WMI, (DBGFMT "WMI_GET_PMKID_LIST Event\n", DBGARG));
-+        status = wmi_get_pmkid_list_event_rx(wmip, datap, len);
-+        break;
-+    default:
-+        A_DPRINTF(DBG_WMI|DBG_ERROR,
-+            (DBGFMT "Unknown id 0x%x\n", DBGARG, id));
-+        wmip->wmi_stats.cmd_id_err++;
-+        status = A_ERROR;
-+        break;
-+    }
-+
-+    A_NETBUF_FREE(osbuf);
-+
-+    return status;
-+}
-+
-+static A_STATUS
-+wmi_ready_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_READY_EVENT *ev = (WMI_READY_EVENT *)datap;
-+
-+    if (len < sizeof(WMI_READY_EVENT)) {
-+        return A_EINVAL;
-+    }
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+    wmip->wmi_ready = TRUE;
-+    A_WMI_READY_EVENT(wmip->wmi_devt, ev->macaddr, ev->phyCapability);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_connect_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_CONNECT_EVENT *ev;
-+
-+    if (len < sizeof(WMI_CONNECT_EVENT)) {
-+        return A_EINVAL;
-+    }
-+    ev = (WMI_CONNECT_EVENT *)datap;
-+    A_DPRINTF(DBG_WMI,
-+        (DBGFMT "freq %d bssid %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n",
-+        DBGARG, ev->channel,
-+        ev->bssid[0], ev->bssid[1], ev->bssid[2],
-+        ev->bssid[3], ev->bssid[4], ev->bssid[5]));
-+
-+    A_MEMCPY(wmip->wmi_bssid, ev->bssid, ATH_MAC_LEN);
-+
-+    A_WMI_CONNECT_EVENT(wmip->wmi_devt, ev->channel, ev->bssid,
-+                         ev->listenInterval, ev->beaconInterval,
-+                         ev->networkType, ev->beaconIeLen,
-+                         ev->assocReqLen, ev->assocRespLen,
-+                         ev->assocInfo);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_regDomain_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_REG_DOMAIN_EVENT *ev;
-+
-+    if (len < sizeof(*ev)) {
-+        return A_EINVAL;
-+    }
-+    ev = (WMI_REG_DOMAIN_EVENT *)datap;
-+
-+    A_WMI_REGDOMAIN_EVENT(wmip->wmi_devt, ev->regDomain);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_neighborReport_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_NEIGHBOR_REPORT_EVENT *ev;
-+    int numAps;
-+
-+    if (len < sizeof(*ev)) {
-+        return A_EINVAL;
-+    }
-+    ev = (WMI_NEIGHBOR_REPORT_EVENT *)datap;
-+    numAps = ev->numberOfAps;
-+
-+    if (len < (int)(sizeof(*ev) + ((numAps - 1) * sizeof(WMI_NEIGHBOR_INFO)))) {
-+        return A_EINVAL;
-+    }
-+
-+    A_WMI_NEIGHBORREPORT_EVENT(wmip->wmi_devt, numAps, ev->neighbor);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_disconnect_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_DISCONNECT_EVENT *ev;
-+
-+    if (len < sizeof(WMI_DISCONNECT_EVENT)) {
-+        return A_EINVAL;
-+    }
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    ev = (WMI_DISCONNECT_EVENT *)datap;
-+
-+    A_MEMZERO(wmip->wmi_bssid, sizeof(wmip->wmi_bssid));
-+
-+    A_WMI_DISCONNECT_EVENT(wmip->wmi_devt, ev->disconnectReason, ev->bssid,
-+                            ev->assocRespLen, ev->assocInfo, ev->protocolReasonStatus);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_tkip_micerr_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_TKIP_MICERR_EVENT *ev;
-+
-+    if (len < sizeof(*ev)) {
-+        return A_EINVAL;
-+    }
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    ev = (WMI_TKIP_MICERR_EVENT *)datap;
-+    A_WMI_TKIP_MICERR_EVENT(wmip->wmi_devt, ev->keyid, ev->ismcast);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_bssInfo_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    bss_t *bss;
-+    WMI_BSS_INFO_HDR *bih;
-+    A_UINT8 *buf;
-+    A_UINT32 nodeCachingAllowed;
-+
-+    if (len <= sizeof(WMI_BSS_INFO_HDR)) {
-+        return A_EINVAL;
-+    }
-+
-+    A_WMI_BSSINFO_EVENT_RX(wmip->wmi_devt, datap, len);
-+    /* What is driver config for wlan node caching? */
-+    if(ar6000_get_driver_cfg(wmip->wmi_devt,
-+                    AR6000_DRIVER_CFG_GET_WLANNODECACHING,
-+                    &nodeCachingAllowed) != A_OK) {
-+        return A_EINVAL;
-+    }
-+
-+    if(!nodeCachingAllowed) {
-+        return A_OK;
-+    }
-+
-+
-+    bih = (WMI_BSS_INFO_HDR *)datap;
-+    buf = datap + sizeof(WMI_BSS_INFO_HDR);
-+    len -= sizeof(WMI_BSS_INFO_HDR);
-+
-+    A_DPRINTF(DBG_WMI2, (DBGFMT "bssInfo event - ch %u, rssi %02x, "
-+              "bssid \"%02x:%02x:%02x:%02x:%02x:%02x\"\n", DBGARG,
-+              bih->channel, (unsigned char) bih->rssi, bih->bssid[0],
-+              bih->bssid[1], bih->bssid[2], bih->bssid[3], bih->bssid[4],
-+              bih->bssid[5]));
-+
-+    if(wps_enable && (bih->frameType == PROBERESP_FTYPE) ) {
-+          printk("%s() A_OK 2\n", __FUNCTION__);
-+              return A_OK;
-+    }
-+
-+    bss = wlan_find_node(&wmip->wmi_scan_table, bih->bssid);
-+    if (bss != NULL) {
-+        /*
-+         * Free up the node.  Not the most efficient process given
-+         * we are about to allocate a new node but it is simple and should be
-+         * adequate.
-+         */
-+        wlan_node_reclaim(&wmip->wmi_scan_table, bss);
-+    }
-+
-+    bss = wlan_node_alloc(&wmip->wmi_scan_table, len);
-+    if (bss == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    bss->ni_snr        = bih->snr;
-+    bss->ni_rssi       = bih->rssi;
-+    A_ASSERT(bss->ni_buf != NULL);
-+    A_MEMCPY(bss->ni_buf, buf, len);
-+
-+    if (wlan_parse_beacon(bss->ni_buf, len, &bss->ni_cie) != A_OK) {
-+        wlan_node_free(bss);
-+        return A_EINVAL;
-+    }
-+
-+    /*
-+     * Update the frequency in ie_chan, overwriting of channel number
-+     * which is done in wlan_parse_beacon
-+     */
-+    bss->ni_cie.ie_chan = bih->channel;
-+    wlan_setup_node(&wmip->wmi_scan_table, bss, bih->bssid);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_opt_frame_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    bss_t *bss;
-+    WMI_OPT_RX_INFO_HDR *bih;
-+    A_UINT8 *buf;
-+
-+    if (len <= sizeof(WMI_OPT_RX_INFO_HDR)) {
-+        return A_EINVAL;
-+    }
-+
-+    bih = (WMI_OPT_RX_INFO_HDR *)datap;
-+    buf = datap + sizeof(WMI_OPT_RX_INFO_HDR);
-+    len -= sizeof(WMI_OPT_RX_INFO_HDR);
-+
-+    A_DPRINTF(DBG_WMI2, (DBGFMT "opt frame event %2.2x:%2.2x\n", DBGARG,
-+        bih->bssid[4], bih->bssid[5]));
-+
-+    bss = wlan_find_node(&wmip->wmi_scan_table, bih->bssid);
-+    if (bss != NULL) {
-+        /*
-+         * Free up the node.  Not the most efficient process given
-+         * we are about to allocate a new node but it is simple and should be
-+         * adequate.
-+         */
-+        wlan_node_reclaim(&wmip->wmi_scan_table, bss);
-+    }
-+
-+    bss = wlan_node_alloc(&wmip->wmi_scan_table, len);
-+    if (bss == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    bss->ni_snr        = bih->snr;
-+    bss->ni_cie.ie_chan = bih->channel;
-+    A_ASSERT(bss->ni_buf != NULL);
-+    A_MEMCPY(bss->ni_buf, buf, len);
-+    wlan_setup_node(&wmip->wmi_scan_table, bss, bih->bssid);
-+
-+    return A_OK;
-+}
-+
-+    /* This event indicates inactivity timeout of a fatpipe(pstream)
-+     * at the target
-+     */
-+static A_STATUS
-+wmi_pstream_timeout_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_PSTREAM_TIMEOUT_EVENT *ev;
-+
-+    if (len < sizeof(WMI_PSTREAM_TIMEOUT_EVENT)) {
-+        return A_EINVAL;
-+    }
-+
-+    A_DPRINTF(DBG_WMI, (DBGFMT "wmi_pstream_timeout_event_rx\n", DBGARG));
-+
-+    ev = (WMI_PSTREAM_TIMEOUT_EVENT *)datap;
-+
-+        /* When the pstream (fat pipe == AC) timesout, it means there were no
-+         * thinStreams within this pstream & it got implicitly created due to
-+         * data flow on this AC. We start the inactivity timer only for
-+         * implicitly created pstream. Just reset the host state.
-+         */
-+        /* Set the activeTsids for this AC to 0 */
-+    LOCK_WMI(wmip);
-+    wmip->wmi_streamExistsForAC[ev->trafficClass]=0;
-+    wmip->wmi_fatPipeExists &= ~(1 << ev->trafficClass);
-+    UNLOCK_WMI(wmip);
-+
-+        /*Indicate inactivity to driver layer for this fatpipe (pstream)*/
-+    A_WMI_STREAM_TX_INACTIVE(wmip->wmi_devt, ev->trafficClass);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_bitrate_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_BIT_RATE_CMD *reply;
-+    A_INT32 rate;
-+
-+    if (len < sizeof(WMI_BIT_RATE_CMD)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_BIT_RATE_CMD *)datap;
-+    A_DPRINTF(DBG_WMI,
-+        (DBGFMT "Enter - rateindex %d\n", DBGARG, reply->rateIndex));
-+
-+    if (reply->rateIndex == RATE_AUTO) {
-+        rate = RATE_AUTO;
-+    } else {
-+        rate = wmi_rateTable[(A_UINT32) reply->rateIndex];
-+    }
-+
-+    A_WMI_BITRATE_RX(wmip->wmi_devt, rate);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_ratemask_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_FIX_RATES_CMD *reply;
-+
-+    if (len < sizeof(WMI_BIT_RATE_CMD)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_FIX_RATES_CMD *)datap;
-+    A_DPRINTF(DBG_WMI,
-+        (DBGFMT "Enter - fixed rate mask %x\n", DBGARG, reply->fixRateMask));
-+
-+    A_WMI_RATEMASK_RX(wmip->wmi_devt, reply->fixRateMask);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_channelList_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_CHANNEL_LIST_REPLY *reply;
-+
-+    if (len < sizeof(WMI_CHANNEL_LIST_REPLY)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_CHANNEL_LIST_REPLY *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_CHANNELLIST_RX(wmip->wmi_devt, reply->numChannels,
-+                          reply->channelList);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_txPwr_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_TX_PWR_REPLY *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_TX_PWR_REPLY *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_TXPWR_RX(wmip->wmi_devt, reply->dbM);
-+
-+    return A_OK;
-+}
-+static A_STATUS
-+wmi_keepalive_reply_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_GET_KEEPALIVE_CMD *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_GET_KEEPALIVE_CMD *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_KEEPALIVE_RX(wmip->wmi_devt, reply->configured);
-+
-+    return A_OK;
-+}
-+
-+
-+static A_STATUS
-+wmi_dset_open_req_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMIX_DSETOPENREQ_EVENT *dsetopenreq;
-+
-+    if (len < sizeof(WMIX_DSETOPENREQ_EVENT)) {
-+        return A_EINVAL;
-+    }
-+    dsetopenreq = (WMIX_DSETOPENREQ_EVENT *)datap;
-+    A_DPRINTF(DBG_WMI,
-+        (DBGFMT "Enter - dset_id=0x%x\n", DBGARG, dsetopenreq->dset_id));
-+    A_WMI_DSET_OPEN_REQ(wmip->wmi_devt,
-+                        dsetopenreq->dset_id,
-+                        dsetopenreq->targ_dset_handle,
-+                        dsetopenreq->targ_reply_fn,
-+                        dsetopenreq->targ_reply_arg);
-+
-+    return A_OK;
-+}
-+
-+#ifdef CONFIG_HOST_DSET_SUPPORT
-+static A_STATUS
-+wmi_dset_close_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMIX_DSETCLOSE_EVENT *dsetclose;
-+
-+    if (len < sizeof(WMIX_DSETCLOSE_EVENT)) {
-+        return A_EINVAL;
-+    }
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    dsetclose = (WMIX_DSETCLOSE_EVENT *)datap;
-+    A_WMI_DSET_CLOSE(wmip->wmi_devt, dsetclose->access_cookie);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_dset_data_req_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMIX_DSETDATAREQ_EVENT *dsetdatareq;
-+
-+    if (len < sizeof(WMIX_DSETDATAREQ_EVENT)) {
-+        return A_EINVAL;
-+    }
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    dsetdatareq = (WMIX_DSETDATAREQ_EVENT *)datap;
-+    A_WMI_DSET_DATA_REQ(wmip->wmi_devt,
-+                         dsetdatareq->access_cookie,
-+                         dsetdatareq->offset,
-+                         dsetdatareq->length,
-+                         dsetdatareq->targ_buf,
-+                         dsetdatareq->targ_reply_fn,
-+                         dsetdatareq->targ_reply_arg);
-+
-+    return A_OK;
-+}
-+#endif /* CONFIG_HOST_DSET_SUPPORT */
-+
-+static A_STATUS
-+wmi_scanComplete_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_SCAN_COMPLETE_EVENT *ev;
-+
-+    ev = (WMI_SCAN_COMPLETE_EVENT *)datap;
-+    A_WMI_SCANCOMPLETE_EVENT(wmip->wmi_devt, ev->status);
-+
-+    return A_OK;
-+}
-+
-+/*
-+ * Target is reporting a programming error.  This is for
-+ * developer aid only.  Target only checks a few common violations
-+ * and it is responsibility of host to do all error checking.
-+ * Behavior of target after wmi error event is undefined.
-+ * A reset is recommended.
-+ */
-+static A_STATUS
-+wmi_errorEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_CMD_ERROR_EVENT *ev;
-+
-+    ev = (WMI_CMD_ERROR_EVENT *)datap;
-+    AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("Programming Error: cmd=%d ", ev->commandId));
-+    switch (ev->errorCode) {
-+    case (INVALID_PARAM):
-+        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("Illegal Parameter\n"));
-+        break;
-+    case (ILLEGAL_STATE):
-+        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("Illegal State\n"));
-+        break;
-+    case (INTERNAL_ERROR):
-+        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("Internal Error\n"));
-+        break;
-+    }
-+
-+    return A_OK;
-+}
-+
-+
-+static A_STATUS
-+wmi_statsEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_TARGET_STATS *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_TARGET_STATS *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_TARGETSTATS_EVENT(wmip->wmi_devt, reply);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_rssiThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_RSSI_THRESHOLD_EVENT *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_RSSI_THRESHOLD_EVENT *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_RSSI_THRESHOLD_EVENT(wmip->wmi_devt, reply->range, reply->rssi);
-+
-+    return A_OK;
-+}
-+
-+
-+static A_STATUS
-+wmi_reportErrorEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_TARGET_ERROR_REPORT_EVENT *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_TARGET_ERROR_REPORT_EVENT *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_REPORT_ERROR_EVENT(wmip->wmi_devt, reply->errorVal);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_cac_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_CAC_EVENT *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_CAC_EVENT *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_CAC_EVENT(wmip->wmi_devt, reply->ac,
-+                reply->cac_indication, reply->statusCode,
-+                reply->tspecSuggestion);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_hbChallengeResp_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMIX_HB_CHALLENGE_RESP_EVENT *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMIX_HB_CHALLENGE_RESP_EVENT *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "wmi: challenge response event\n", DBGARG));
-+
-+    A_WMI_HBCHALLENGERESP_EVENT(wmip->wmi_devt, reply->cookie, reply->source);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_roam_tbl_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_TARGET_ROAM_TBL *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_TARGET_ROAM_TBL *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_ROAM_TABLE_EVENT(wmip->wmi_devt, reply);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_roam_data_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_TARGET_ROAM_DATA *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_TARGET_ROAM_DATA *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_ROAM_DATA_EVENT(wmip->wmi_devt, reply);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_txRetryErrEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_TX_RETRY_ERR_EVENT *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_TX_RETRY_ERR_EVENT *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_TX_RETRY_ERR_EVENT(wmip->wmi_devt);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_snrThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_SNR_THRESHOLD_EVENT *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_SNR_THRESHOLD_EVENT *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_SNR_THRESHOLD_EVENT_RX(wmip->wmi_devt, reply->range, reply->snr);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_lqThresholdEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_LQ_THRESHOLD_EVENT *reply;
-+
-+    if (len < sizeof(*reply)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_LQ_THRESHOLD_EVENT *)datap;
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_LQ_THRESHOLD_EVENT_RX(wmip->wmi_devt, reply->range, reply->lq);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_aplistEvent_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    A_UINT16 ap_info_entry_size;
-+    WMI_APLIST_EVENT *ev = (WMI_APLIST_EVENT *)datap;
-+    WMI_AP_INFO_V1 *ap_info_v1;
-+    A_UINT8 i;
-+
-+    if (len < sizeof(WMI_APLIST_EVENT)) {
-+        return A_EINVAL;
-+    }
-+
-+    if (ev->apListVer == APLIST_VER1) {
-+        ap_info_entry_size = sizeof(WMI_AP_INFO_V1);
-+        ap_info_v1 = (WMI_AP_INFO_V1 *)ev->apList;
-+    } else {
-+        return A_EINVAL;
-+    }
-+
-+    AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("Number of APs in APLIST Event is %d\n", ev->numAP));
-+    if (len < (int)(sizeof(WMI_APLIST_EVENT) +
-+              (ev->numAP - 1) * ap_info_entry_size))
-+    {
-+        return A_EINVAL;
-+    }
-+
-+    /*
-+     * AP List Ver1 Contents
-+     */
-+    for (i = 0; i < ev->numAP; i++) {
-+        AR_DEBUG_PRINTF(ATH_DEBUG_WMI, ("AP#%d BSSID %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x "\
-+                    "Channel %d\n", i,
-+                   ap_info_v1->bssid[0], ap_info_v1->bssid[1],
-+                   ap_info_v1->bssid[2], ap_info_v1->bssid[3],
-+                   ap_info_v1->bssid[4], ap_info_v1->bssid[5],
-+                   ap_info_v1->channel));
-+        ap_info_v1++;
-+    }
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_dbglog_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    A_UINT32 dropped;
-+
-+    dropped = *((A_UINT32 *)datap);
-+    datap += sizeof(dropped);
-+    len -= sizeof(dropped);
-+    A_WMI_DBGLOG_EVENT(wmip->wmi_devt, dropped, datap, len);
-+    return A_OK;
-+}
-+
-+#ifdef CONFIG_HOST_GPIO_SUPPORT
-+static A_STATUS
-+wmi_gpio_intr_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMIX_GPIO_INTR_EVENT *gpio_intr = (WMIX_GPIO_INTR_EVENT *)datap;
-+
-+    A_DPRINTF(DBG_WMI,
-+        (DBGFMT "Enter - intrmask=0x%x input=0x%x.\n", DBGARG,
-+        gpio_intr->intr_mask, gpio_intr->input_values));
-+
-+    A_WMI_GPIO_INTR_RX(gpio_intr->intr_mask, gpio_intr->input_values);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_gpio_data_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMIX_GPIO_DATA_EVENT *gpio_data = (WMIX_GPIO_DATA_EVENT *)datap;
-+
-+    A_DPRINTF(DBG_WMI,
-+        (DBGFMT "Enter - reg=%d value=0x%x\n", DBGARG,
-+        gpio_data->reg_id, gpio_data->value));
-+
-+    A_WMI_GPIO_DATA_RX(gpio_data->reg_id, gpio_data->value);
-+
-+    return A_OK;
-+}
-+
-+static A_STATUS
-+wmi_gpio_ack_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    A_WMI_GPIO_ACK_RX();
-+
-+    return A_OK;
-+}
-+#endif /* CONFIG_HOST_GPIO_SUPPORT */
-+
-+/*
-+ * Called to send a wmi command. Command specific data is already built
-+ * on osbuf and current osbuf->data points to it.
-+ */
-+A_STATUS
-+wmi_cmd_send(struct wmi_t *wmip, void *osbuf, WMI_COMMAND_ID cmdId,
-+               WMI_SYNC_FLAG syncflag)
-+{
-+#define IS_LONG_CMD(cmdId) ((cmdId == WMI_OPT_TX_FRAME_CMDID) || (cmdId == WMI_ADD_WOW_PATTERN_CMDID))
-+    WMI_CMD_HDR         *cHdr;
-+    WMI_PRI_STREAM_ID   streamID = WMI_CONTROL_PRI;
-+
-+    A_ASSERT(osbuf != NULL);
-+
-+    if (syncflag >= END_WMIFLAG) {
-+        return A_EINVAL;
-+    }
-+
-+    if ((syncflag == SYNC_BEFORE_WMIFLAG) || (syncflag == SYNC_BOTH_WMIFLAG)) {
-+        /*
-+         * We want to make sure all data currently queued is transmitted before
-+         * the cmd execution.  Establish a new sync point.
-+         */
-+        wmi_sync_point(wmip);
-+    }
-+
-+    if (A_NETBUF_PUSH(osbuf, sizeof(WMI_CMD_HDR)) != A_OK) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    cHdr = (WMI_CMD_HDR *)A_NETBUF_DATA(osbuf);
-+    cHdr->commandId = cmdId;
-+
-+    /*
-+     * Send cmd, some via control pipe, others via data pipe
-+     */
-+    if (IS_LONG_CMD(cmdId)) {
-+        wmi_data_hdr_add(wmip, osbuf, CNTL_MSGTYPE);
-+        // TODO ... these can now go through the control endpoint via HTC 2.0
-+        streamID = WMI_BEST_EFFORT_PRI;
-+    }
-+    A_WMI_CONTROL_TX(wmip->wmi_devt, osbuf, streamID);
-+
-+    if ((syncflag == SYNC_AFTER_WMIFLAG) || (syncflag == SYNC_BOTH_WMIFLAG)) {
-+        /*
-+         * We want to make sure all new data queued waits for the command to
-+         * execute. Establish a new sync point.
-+         */
-+        wmi_sync_point(wmip);
-+    }
-+    return (A_OK);
-+#undef IS_LONG_CMD
-+}
-+
-+A_STATUS
-+wmi_cmd_send_xtnd(struct wmi_t *wmip, void *osbuf, WMI_COMMAND_ID cmdId,
-+                  WMI_SYNC_FLAG syncflag)
-+{
-+    WMIX_CMD_HDR     *cHdr;
-+
-+    if (A_NETBUF_PUSH(osbuf, sizeof(WMIX_CMD_HDR)) != A_OK) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    cHdr = (WMIX_CMD_HDR *)A_NETBUF_DATA(osbuf);
-+    cHdr->commandId = cmdId;
-+
-+    return wmi_cmd_send(wmip, osbuf, WMI_EXTENSION_CMDID, syncflag);
-+}
-+
-+A_STATUS
-+wmi_connect_cmd(struct wmi_t *wmip, NETWORK_TYPE netType,
-+                DOT11_AUTH_MODE dot11AuthMode, AUTH_MODE authMode,
-+                CRYPTO_TYPE pairwiseCrypto, A_UINT8 pairwiseCryptoLen,
-+                CRYPTO_TYPE groupCrypto,A_UINT8 groupCryptoLen,
-+                int ssidLength, A_UCHAR *ssid,
-+                A_UINT8 *bssid, A_UINT16 channel, A_UINT32 ctrl_flags)
-+{
-+    void *osbuf;
-+    WMI_CONNECT_CMD *cc;
-+
-+    if ((pairwiseCrypto == NONE_CRYPT) && (groupCrypto != NONE_CRYPT)) {
-+        return A_EINVAL;
-+    }
-+    if ((pairwiseCrypto != NONE_CRYPT) && (groupCrypto == NONE_CRYPT)) {
-+        return A_EINVAL;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(WMI_CONNECT_CMD));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(WMI_CONNECT_CMD));
-+
-+    cc = (WMI_CONNECT_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cc, sizeof(*cc));
-+
-+    A_MEMCPY(cc->ssid, ssid, ssidLength);
-+    cc->ssidLength          = ssidLength;
-+    cc->networkType         = netType;
-+    cc->dot11AuthMode       = dot11AuthMode;
-+    cc->authMode            = authMode;
-+    cc->pairwiseCryptoType  = pairwiseCrypto;
-+    cc->pairwiseCryptoLen   = pairwiseCryptoLen;
-+    cc->groupCryptoType     = groupCrypto;
-+    cc->groupCryptoLen      = groupCryptoLen;
-+    cc->channel             = channel;
-+    cc->ctrl_flags          = ctrl_flags;
-+
-+    if (bssid != NULL) {
-+        A_MEMCPY(cc->bssid, bssid, ATH_MAC_LEN);
-+    }
-+    if (wmi_set_keepalive_cmd(wmip, wmip->wmi_keepaliveInterval) != A_OK) {
-+        return(A_ERROR);
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_CONNECT_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_reconnect_cmd(struct wmi_t *wmip, A_UINT8 *bssid, A_UINT16 channel)
-+{
-+    void *osbuf;
-+    WMI_RECONNECT_CMD *cc;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(WMI_RECONNECT_CMD));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(WMI_RECONNECT_CMD));
-+
-+    cc = (WMI_RECONNECT_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cc, sizeof(*cc));
-+
-+    cc->channel = channel;
-+
-+    if (bssid != NULL) {
-+        A_MEMCPY(cc->bssid, bssid, ATH_MAC_LEN);
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_RECONNECT_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_disconnect_cmd(struct wmi_t *wmip)
-+{
-+    void *osbuf;
-+    A_STATUS status;
-+
-+    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    /* Bug fix for 24817(elevator bug) - the disconnect command does not
-+       need to do a SYNC before.*/
-+    status = (wmi_cmd_send(wmip, osbuf, WMI_DISCONNECT_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+
-+    return status;
-+}
-+
-+A_STATUS
-+wmi_startscan_cmd(struct wmi_t *wmip, WMI_SCAN_TYPE scanType,
-+                  A_BOOL forceFgScan, A_BOOL isLegacy,
-+                  A_UINT32 homeDwellTime, A_UINT32 forceScanInterval)
-+{
-+    void *osbuf;
-+    WMI_START_SCAN_CMD *sc;
-+
-+    if ((scanType != WMI_LONG_SCAN) && (scanType != WMI_SHORT_SCAN)) {
-+        return A_EINVAL;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*sc));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*sc));
-+
-+    sc = (WMI_START_SCAN_CMD *)(A_NETBUF_DATA(osbuf));
-+    sc->scanType = scanType;
-+    sc->forceFgScan = forceFgScan;
-+    sc->isLegacy = isLegacy;
-+    sc->homeDwellTime = homeDwellTime;
-+    sc->forceScanInterval = forceScanInterval;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_START_SCAN_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_scanparams_cmd(struct wmi_t *wmip, A_UINT16 fg_start_sec,
-+                   A_UINT16 fg_end_sec, A_UINT16 bg_sec,
-+                   A_UINT16 minact_chdw_msec, A_UINT16 maxact_chdw_msec,
-+                   A_UINT16 pas_chdw_msec,
-+                   A_UINT8 shScanRatio, A_UINT8 scanCtrlFlags,
-+                   A_UINT32 max_dfsch_act_time)
-+{
-+    void *osbuf;
-+    WMI_SCAN_PARAMS_CMD *sc;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*sc));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*sc));
-+
-+    sc = (WMI_SCAN_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(sc, sizeof(*sc));
-+    sc->fg_start_period  = fg_start_sec;
-+    sc->fg_end_period    = fg_end_sec;
-+    sc->bg_period        = bg_sec;
-+    sc->minact_chdwell_time = minact_chdw_msec;
-+    sc->maxact_chdwell_time = maxact_chdw_msec;
-+    sc->pas_chdwell_time = pas_chdw_msec;
-+    sc->shortScanRatio   = shScanRatio;
-+    sc->scanCtrlFlags    = scanCtrlFlags;
-+    sc->max_dfsch_act_time = max_dfsch_act_time;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_SCAN_PARAMS_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_bssfilter_cmd(struct wmi_t *wmip, A_UINT8 filter, A_UINT32 ieMask)
-+{
-+    void *osbuf;
-+    WMI_BSS_FILTER_CMD *cmd;
-+
-+    if (filter >= LAST_BSS_FILTER) {
-+        return A_EINVAL;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_BSS_FILTER_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->bssFilter = filter;
-+    cmd->ieMask = ieMask;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_BSS_FILTER_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_probedSsid_cmd(struct wmi_t *wmip, A_UINT8 index, A_UINT8 flag,
-+                   A_UINT8 ssidLength, A_UCHAR *ssid)
-+{
-+    void *osbuf;
-+    WMI_PROBED_SSID_CMD *cmd;
-+
-+    if (index > MAX_PROBED_SSID_INDEX) {
-+        return A_EINVAL;
-+    }
-+    if (ssidLength > sizeof(cmd->ssid)) {
-+        return A_EINVAL;
-+    }
-+    if ((flag & (DISABLE_SSID_FLAG | ANY_SSID_FLAG)) && (ssidLength > 0)) {
-+        return A_EINVAL;
-+    }
-+    if ((flag & SPECIFIC_SSID_FLAG) && !ssidLength) {
-+        return A_EINVAL;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_PROBED_SSID_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->entryIndex = index;
-+    cmd->flag       = flag;
-+    cmd->ssidLength = ssidLength;
-+    A_MEMCPY(cmd->ssid, ssid, ssidLength);
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_PROBED_SSID_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_listeninterval_cmd(struct wmi_t *wmip, A_UINT16 listenInterval, A_UINT16 listenBeacons)
-+{
-+    void *osbuf;
-+    WMI_LISTEN_INT_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_LISTEN_INT_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->listenInterval = listenInterval;
-+    cmd->numBeacons = listenBeacons;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_LISTEN_INT_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_bmisstime_cmd(struct wmi_t *wmip, A_UINT16 bmissTime, A_UINT16 bmissBeacons)
-+{
-+    void *osbuf;
-+    WMI_BMISS_TIME_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_BMISS_TIME_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->bmissTime = bmissTime;
-+    cmd->numBeacons =  bmissBeacons;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_BMISS_TIME_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_associnfo_cmd(struct wmi_t *wmip, A_UINT8 ieType,
-+                     A_UINT8 ieLen, A_UINT8 *ieInfo)
-+{
-+    void *osbuf;
-+    WMI_SET_ASSOC_INFO_CMD *cmd;
-+    A_UINT16 cmdLen;
-+
-+    cmdLen = sizeof(*cmd) + ieLen - 1;
-+    osbuf = A_NETBUF_ALLOC(cmdLen);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, cmdLen);
-+
-+    cmd = (WMI_SET_ASSOC_INFO_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, cmdLen);
-+    cmd->ieType = ieType;
-+    cmd->bufferSize = ieLen;
-+    A_MEMCPY(cmd->assocInfo, ieInfo, ieLen);
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_ASSOC_INFO_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_powermode_cmd(struct wmi_t *wmip, A_UINT8 powerMode)
-+{
-+    void *osbuf;
-+    WMI_POWER_MODE_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_POWER_MODE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->powerMode = powerMode;
-+    wmip->wmi_powerMode = powerMode;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_POWER_MODE_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_ibsspmcaps_cmd(struct wmi_t *wmip, A_UINT8 pmEnable, A_UINT8 ttl,
-+                   A_UINT16 atim_windows, A_UINT16 timeout_value)
-+{
-+    void *osbuf;
-+    WMI_IBSS_PM_CAPS_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_IBSS_PM_CAPS_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->power_saving = pmEnable;
-+    cmd->ttl = ttl;
-+    cmd->atim_windows = atim_windows;
-+    cmd->timeout_value = timeout_value;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_IBSS_PM_CAPS_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_pmparams_cmd(struct wmi_t *wmip, A_UINT16 idlePeriod,
-+                 A_UINT16 psPollNum, A_UINT16 dtimPolicy)
-+{
-+    void *osbuf;
-+    WMI_POWER_PARAMS_CMD *pm;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*pm));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*pm));
-+
-+    pm = (WMI_POWER_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(pm, sizeof(*pm));
-+    pm->idle_period   = idlePeriod;
-+    pm->pspoll_number = psPollNum;
-+    pm->dtim_policy   = dtimPolicy;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_POWER_PARAMS_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_disctimeout_cmd(struct wmi_t *wmip, A_UINT8 timeout)
-+{
-+    void *osbuf;
-+    WMI_DISC_TIMEOUT_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_DISC_TIMEOUT_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->disconnectTimeout = timeout;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_DISC_TIMEOUT_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_addKey_cmd(struct wmi_t *wmip, A_UINT8 keyIndex, CRYPTO_TYPE keyType,
-+               A_UINT8 keyUsage, A_UINT8 keyLength, A_UINT8 *keyRSC,
-+               A_UINT8 *keyMaterial, A_UINT8 key_op_ctrl,
-+               WMI_SYNC_FLAG sync_flag)
-+{
-+    void *osbuf;
-+    WMI_ADD_CIPHER_KEY_CMD *cmd;
-+
-+    if ((keyIndex > WMI_MAX_KEY_INDEX) || (keyLength > WMI_MAX_KEY_LEN) ||
-+        (keyMaterial == NULL))
-+    {
-+        return A_EINVAL;
-+    }
-+
-+    if ((WEP_CRYPT != keyType) && (NULL == keyRSC)) {
-+        return A_EINVAL;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_ADD_CIPHER_KEY_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->keyIndex = keyIndex;
-+    cmd->keyType  = keyType;
-+    cmd->keyUsage = keyUsage;
-+    cmd->keyLength = keyLength;
-+    A_MEMCPY(cmd->key, keyMaterial, keyLength);
-+    if (NULL != keyRSC) {
-+        A_MEMCPY(cmd->keyRSC, keyRSC, sizeof(cmd->keyRSC));
-+    }
-+    cmd->key_op_ctrl = key_op_ctrl;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_ADD_CIPHER_KEY_CMDID, sync_flag));
-+}
-+
-+A_STATUS
-+wmi_add_krk_cmd(struct wmi_t *wmip, A_UINT8 *krk)
-+{
-+    void *osbuf;
-+    WMI_ADD_KRK_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_ADD_KRK_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    A_MEMCPY(cmd->krk, krk, WMI_KRK_LEN);
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_ADD_KRK_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_delete_krk_cmd(struct wmi_t *wmip)
-+{
-+    void *osbuf;
-+
-+    osbuf = A_NETBUF_ALLOC(0);
-+
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_DELETE_KRK_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_deleteKey_cmd(struct wmi_t *wmip, A_UINT8 keyIndex)
-+{
-+    void *osbuf;
-+    WMI_DELETE_CIPHER_KEY_CMD *cmd;
-+
-+    if (keyIndex > WMI_MAX_KEY_INDEX) {
-+        return A_EINVAL;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_DELETE_CIPHER_KEY_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->keyIndex = keyIndex;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_DELETE_CIPHER_KEY_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_setPmkid_cmd(struct wmi_t *wmip, A_UINT8 *bssid, A_UINT8 *pmkId,
-+                 A_BOOL set)
-+{
-+    void *osbuf;
-+    WMI_SET_PMKID_CMD *cmd;
-+
-+    if (bssid == NULL) {
-+        return A_EINVAL;
-+    }
-+
-+    if ((set == TRUE) && (pmkId == NULL)) {
-+        return A_EINVAL;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_PMKID_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMCPY(cmd->bssid, bssid, sizeof(cmd->bssid));
-+    if (set == TRUE) {
-+        A_MEMCPY(cmd->pmkid, pmkId, sizeof(cmd->pmkid));
-+        cmd->enable = PMKID_ENABLE;
-+    } else {
-+        A_MEMZERO(cmd->pmkid, sizeof(cmd->pmkid));
-+        cmd->enable = PMKID_DISABLE;
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_PMKID_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_tkip_countermeasures_cmd(struct wmi_t *wmip, A_BOOL en)
-+{
-+    void *osbuf;
-+    WMI_SET_TKIP_COUNTERMEASURES_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_TKIP_COUNTERMEASURES_CMD *)(A_NETBUF_DATA(osbuf));
-+    cmd->cm_en = (en == TRUE)? WMI_TKIP_CM_ENABLE : WMI_TKIP_CM_DISABLE;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_TKIP_COUNTERMEASURES_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_akmp_params_cmd(struct wmi_t *wmip,
-+                        WMI_SET_AKMP_PARAMS_CMD *akmpParams)
-+{
-+    void *osbuf;
-+    WMI_SET_AKMP_PARAMS_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+    cmd = (WMI_SET_AKMP_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-+    cmd->akmpInfo = akmpParams->akmpInfo;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_AKMP_PARAMS_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_pmkid_list_cmd(struct wmi_t *wmip,
-+                       WMI_SET_PMKID_LIST_CMD *pmkInfo)
-+{
-+    void *osbuf;
-+    WMI_SET_PMKID_LIST_CMD *cmd;
-+    A_UINT16 cmdLen;
-+    A_UINT8 i;
-+
-+    cmdLen = sizeof(pmkInfo->numPMKID) +
-+             pmkInfo->numPMKID * sizeof(WMI_PMKID);
-+
-+    osbuf = A_NETBUF_ALLOC(cmdLen);
-+
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, cmdLen);
-+    cmd = (WMI_SET_PMKID_LIST_CMD *)(A_NETBUF_DATA(osbuf));
-+    cmd->numPMKID = pmkInfo->numPMKID;
-+
-+    for (i = 0; i < cmd->numPMKID; i++) {
-+        A_MEMCPY(&cmd->pmkidList[i], &pmkInfo->pmkidList[i],
-+                 WMI_PMKID_LEN);
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_PMKID_LIST_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_get_pmkid_list_cmd(struct wmi_t *wmip)
-+{
-+    void *osbuf;
-+
-+    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_GET_PMKID_LIST_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_dataSync_send(struct wmi_t *wmip, void *osbuf, WMI_PRI_STREAM_ID streamID)
-+{
-+    WMI_DATA_HDR     *dtHdr;
-+
-+    A_ASSERT(streamID != WMI_CONTROL_PRI);
-+    A_ASSERT(osbuf != NULL);
-+
-+    if (A_NETBUF_PUSH(osbuf, sizeof(WMI_DATA_HDR)) != A_OK) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    dtHdr = (WMI_DATA_HDR *)A_NETBUF_DATA(osbuf);
-+    dtHdr->info =
-+      (SYNC_MSGTYPE & WMI_DATA_HDR_MSG_TYPE_MASK) << WMI_DATA_HDR_MSG_TYPE_SHIFT;
-+
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter - streamID %d\n", DBGARG, streamID));
-+
-+    return (A_WMI_CONTROL_TX(wmip->wmi_devt, osbuf, streamID));
-+}
-+
-+typedef struct _WMI_DATA_SYNC_BUFS {
-+    A_UINT8            trafficClass;
-+    void               *osbuf;
-+}WMI_DATA_SYNC_BUFS;
-+
-+static A_STATUS
-+wmi_sync_point(struct wmi_t *wmip)
-+{
-+      void *cmd_osbuf;
-+    WMI_DATA_SYNC_BUFS dataSyncBufs[WMM_NUM_AC];
-+      A_UINT8 i,numPriStreams=0;
-+      A_STATUS status;
-+
-+      A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    memset(dataSyncBufs,0,sizeof(dataSyncBufs));
-+
-+    /* lock out while we walk through the priority list and assemble our local array */
-+    LOCK_WMI(wmip);
-+
-+    for (i=0; i < WMM_NUM_AC ; i++) {
-+              if (wmip->wmi_fatPipeExists & (1 << i)) {
-+            numPriStreams++;
-+            dataSyncBufs[numPriStreams-1].trafficClass = i;
-+        }
-+    }
-+
-+    UNLOCK_WMI(wmip);
-+
-+    /* dataSyncBufs is now filled with entries (starting at index 0) containing valid streamIDs */
-+
-+    do {
-+          /*
-+           * We allocate all network buffers needed so we will be able to
-+           * send all required frames.
-+           */
-+          cmd_osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-+          if (cmd_osbuf == NULL) {
-+                  status = A_NO_MEMORY;
-+            break;
-+          }
-+
-+          for (i=0; i < numPriStreams ; i++) {
-+              dataSyncBufs[i].osbuf = A_NETBUF_ALLOC(0);
-+            if (dataSyncBufs[i].osbuf == NULL) {
-+                status = A_NO_MEMORY;
-+                break;
-+            }
-+          } //end for
-+
-+          /*
-+           * Send sync cmd followed by sync data messages on all endpoints being
-+           * used
-+           */
-+          status = wmi_cmd_send(wmip, cmd_osbuf, WMI_SYNCHRONIZE_CMDID,
-+                                                NO_SYNC_WMIFLAG);
-+
-+        if (A_FAILED(status)) {
-+            break;
-+        }
-+            /* cmd buffer sent, we no longer own it */
-+        cmd_osbuf = NULL;
-+
-+              for(i=0; i < numPriStreams; i++) {
-+            A_ASSERT(dataSyncBufs[i].osbuf != NULL);
-+
-+            status = wmi_dataSync_send(wmip, dataSyncBufs[i].osbuf,
-+                        WMI_ACCESSCATEGORY_WMISTREAM(wmip,dataSyncBufs[i].trafficClass));
-+
-+            if (A_FAILED(status)) {
-+                break;
-+            }
-+            /* we don't own this buffer anymore, NULL it out of the array so it
-+             * won't get cleaned up */
-+            dataSyncBufs[i].osbuf = NULL;
-+              } //end for
-+
-+    } while(FALSE);
-+
-+    /* free up any resources left over (possibly due to an error) */
-+
-+    if (cmd_osbuf != NULL) {
-+        A_NETBUF_FREE(cmd_osbuf);
-+    }
-+
-+    for (i = 0; i < numPriStreams; i++) {
-+        if (dataSyncBufs[i].osbuf != NULL) {
-+            A_NETBUF_FREE(dataSyncBufs[i].osbuf);
-+        }
-+    }
-+
-+      return (status);
-+}
-+
-+A_STATUS
-+wmi_create_pstream_cmd(struct wmi_t *wmip, WMI_CREATE_PSTREAM_CMD *params)
-+{
-+    void *osbuf;
-+    WMI_CREATE_PSTREAM_CMD *cmd;
-+      A_UINT16 activeTsids=0;
-+    A_UINT8 fatPipeExistsForAC=0;
-+
-+    /* Validate all the parameters. */
-+    if( !((params->userPriority < 8) &&
-+         (params->userPriority <= 0x7) &&
-+         (convert_userPriority_to_trafficClass(params->userPriority) == params->trafficClass)  &&
-+         (params->trafficDirection == UPLINK_TRAFFIC ||
-+            params->trafficDirection == DNLINK_TRAFFIC ||
-+            params->trafficDirection == BIDIR_TRAFFIC) &&
-+         (params->trafficType == TRAFFIC_TYPE_APERIODIC ||
-+            params->trafficType == TRAFFIC_TYPE_PERIODIC ) &&
-+         (params->voicePSCapability == DISABLE_FOR_THIS_AC  ||
-+            params->voicePSCapability == ENABLE_FOR_THIS_AC ||
-+            params->voicePSCapability == ENABLE_FOR_ALL_AC) &&
-+         (params->tsid == WMI_IMPLICIT_PSTREAM || params->tsid <= WMI_MAX_THINSTREAM)) )
-+    {
-+        return  A_EINVAL;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    A_DPRINTF(DBG_WMI,
-+        (DBGFMT "Sending create_pstream_cmd: ac=%d    tsid:%d\n", DBGARG,
-+        params->trafficClass, params->tsid));
-+
-+    cmd = (WMI_CREATE_PSTREAM_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    A_MEMCPY(cmd, params, sizeof(*cmd));
-+
-+        /* this is an implicitly created Fat pipe */
-+    if (params->tsid == WMI_IMPLICIT_PSTREAM) {
-+        LOCK_WMI(wmip);
-+        fatPipeExistsForAC = (wmip->wmi_fatPipeExists & (1 << params->trafficClass));
-+        wmip->wmi_fatPipeExists |= (1<<params->trafficClass);
-+        UNLOCK_WMI(wmip);
-+    } else {
-+            /* this is an explicitly created thin stream within a fat pipe */
-+        LOCK_WMI(wmip);
-+        fatPipeExistsForAC = (wmip->wmi_fatPipeExists & (1 << params->trafficClass));
-+        activeTsids = wmip->wmi_streamExistsForAC[params->trafficClass];
-+        wmip->wmi_streamExistsForAC[params->trafficClass] |= (1<<params->tsid);
-+            /* if a thinstream becomes active, the fat pipe automatically
-+            * becomes active
-+            */
-+        wmip->wmi_fatPipeExists |= (1<<params->trafficClass);
-+        UNLOCK_WMI(wmip);
-+    }
-+
-+        /* Indicate activty change to driver layer only if this is the
-+         * first TSID to get created in this AC explicitly or an implicit
-+         * fat pipe is getting created.
-+         */
-+    if (!fatPipeExistsForAC) {
-+        A_WMI_STREAM_TX_ACTIVE(wmip->wmi_devt, params->trafficClass);
-+    }
-+
-+    /* mike: should be SYNC_BEFORE_WMIFLAG */
-+    return (wmi_cmd_send(wmip, osbuf, WMI_CREATE_PSTREAM_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_delete_pstream_cmd(struct wmi_t *wmip, A_UINT8 trafficClass, A_UINT8 tsid)
-+{
-+    void *osbuf;
-+    WMI_DELETE_PSTREAM_CMD *cmd;
-+    A_STATUS status;
-+      A_UINT16 activeTsids=0;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_DELETE_PSTREAM_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+
-+    cmd->trafficClass = trafficClass;
-+    cmd->tsid = tsid;
-+
-+    LOCK_WMI(wmip);
-+    activeTsids = wmip->wmi_streamExistsForAC[trafficClass];
-+    UNLOCK_WMI(wmip);
-+
-+        /* Check if the tsid was created & exists */
-+    if (!(activeTsids & (1<<tsid))) {
-+
-+        A_DPRINTF(DBG_WMI,
-+        (DBGFMT "TSID %d does'nt exist for trafficClass: %d\n", DBGARG, tsid, trafficClass));
-+            /* TODO: return a more appropriate err code */
-+        return A_ERROR;
-+    }
-+
-+    A_DPRINTF(DBG_WMI,
-+        (DBGFMT "Sending delete_pstream_cmd: trafficClass: %d tsid=%d\n", DBGARG, trafficClass, tsid));
-+
-+    status = (wmi_cmd_send(wmip, osbuf, WMI_DELETE_PSTREAM_CMDID,
-+                         SYNC_BEFORE_WMIFLAG));
-+
-+    LOCK_WMI(wmip);
-+    wmip->wmi_streamExistsForAC[trafficClass] &= ~(1<<tsid);
-+    activeTsids = wmip->wmi_streamExistsForAC[trafficClass];
-+    UNLOCK_WMI(wmip);
-+
-+
-+        /* Indicate stream inactivity to driver layer only if all tsids
-+         * within this AC are deleted.
-+         */
-+    if(!activeTsids) {
-+        A_WMI_STREAM_TX_INACTIVE(wmip->wmi_devt, trafficClass);
-+        wmip->wmi_fatPipeExists &= ~(1<<trafficClass);
-+    }
-+
-+    return status;
-+}
-+
-+/*
-+ * used to set the bit rate.  rate is in Kbps.  If rate == -1
-+ * then auto selection is used.
-+ */
-+A_STATUS
-+wmi_set_bitrate_cmd(struct wmi_t *wmip, A_INT32 rate)
-+{
-+    void *osbuf;
-+    WMI_BIT_RATE_CMD *cmd;
-+    A_INT8 index;
-+
-+    if (rate != -1) {
-+        index = wmi_validate_bitrate(wmip, rate);
-+        if(index == A_EINVAL){
-+            return A_EINVAL;
-+        }
-+    } else {
-+        index = -1;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_BIT_RATE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+
-+    cmd->rateIndex = index;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_BITRATE_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_get_bitrate_cmd(struct wmi_t *wmip)
-+{
-+    void *osbuf;
-+
-+    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_GET_BITRATE_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+/*
-+ * Returns TRUE iff the given rate index is legal in the current PHY mode.
-+ */
-+A_BOOL
-+wmi_is_bitrate_index_valid(struct wmi_t *wmip, A_UINT32 rateIndex)
-+{
-+    WMI_PHY_MODE phyMode = wmip->wmi_phyMode;
-+    A_BOOL isValid = TRUE;
-+    switch(phyMode) {
-+        case WMI_11A_MODE:
-+            if ((rateIndex < MODE_A_SUPPORT_RATE_START) || (rateIndex > MODE_A_SUPPORT_RATE_STOP)) {
-+                isValid = FALSE;
-+            }
-+            break;
-+
-+        case WMI_11B_MODE:
-+            if ((rateIndex < MODE_B_SUPPORT_RATE_START) || (rateIndex > MODE_B_SUPPORT_RATE_STOP)) {
-+                isValid = FALSE;
-+            }
-+            break;
-+
-+        case WMI_11GONLY_MODE:
-+            if ((rateIndex < MODE_GONLY_SUPPORT_RATE_START) || (rateIndex > MODE_GONLY_SUPPORT_RATE_STOP)) {
-+                isValid = FALSE;
-+            }
-+            break;
-+
-+        case WMI_11G_MODE:
-+        case WMI_11AG_MODE:
-+            if ((rateIndex < MODE_G_SUPPORT_RATE_START) || (rateIndex > MODE_G_SUPPORT_RATE_STOP)) {
-+                isValid = FALSE;
-+            }
-+            break;
-+
-+        default:
-+            A_ASSERT(FALSE);
-+            break;
-+    }
-+
-+    return isValid;
-+}
-+
-+A_INT8
-+wmi_validate_bitrate(struct wmi_t *wmip, A_INT32 rate)
-+{
-+    A_INT8 i;
-+    if (rate != -1)
-+    {
-+        for (i=0;;i++)
-+        {
-+            if (wmi_rateTable[(A_UINT32) i] == 0) {
-+                return A_EINVAL;
-+            }
-+            if (wmi_rateTable[(A_UINT32) i] == rate) {
-+                break;
-+            }
-+        }
-+    }
-+    else{
-+     i = -1;
-+    }
-+
-+    if(wmi_is_bitrate_index_valid(wmip, i) != TRUE) {
-+        return A_EINVAL;
-+    }
-+
-+    return i;
-+}
-+
-+A_STATUS
-+wmi_set_fixrates_cmd(struct wmi_t *wmip, A_INT16 fixRatesMask)
-+{
-+    void *osbuf;
-+    WMI_FIX_RATES_CMD *cmd;
-+    A_UINT32 rateIndex;
-+
-+    /* Make sure all rates in the mask are valid in the current PHY mode */
-+    for(rateIndex = 0; rateIndex < MAX_NUMBER_OF_SUPPORT_RATES; rateIndex++) {
-+       if((1 << rateIndex) & (A_UINT32)fixRatesMask) {
-+            if(wmi_is_bitrate_index_valid(wmip, rateIndex) != TRUE) {
-+                A_DPRINTF(DBG_WMI, (DBGFMT "Set Fix Rates command failed: Given rate is illegal in current PHY mode\n", DBGARG));
-+                return A_EINVAL;
-+            }
-+       }
-+    }
-+
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_FIX_RATES_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+
-+    cmd->fixRateMask = fixRatesMask;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_FIXRATES_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_get_ratemask_cmd(struct wmi_t *wmip)
-+{
-+    void *osbuf;
-+
-+    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_GET_FIXRATES_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_get_channelList_cmd(struct wmi_t *wmip)
-+{
-+    void *osbuf;
-+
-+    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_GET_CHANNEL_LIST_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+/*
-+ * used to generate a wmi sey channel Parameters cmd.
-+ * mode should always be specified and corresponds to the phy mode of the
-+ * wlan.
-+ * numChan should alway sbe specified. If zero indicates that all available
-+ * channels should be used.
-+ * channelList is an array of channel frequencies (in Mhz) which the radio
-+ * should limit its operation to.  It should be NULL if numChan == 0.  Size of
-+ * array should correspond to numChan entries.
-+ */
-+A_STATUS
-+wmi_set_channelParams_cmd(struct wmi_t *wmip, A_UINT8 scanParam,
-+                          WMI_PHY_MODE mode, A_INT8 numChan,
-+                          A_UINT16 *channelList)
-+{
-+    void *osbuf;
-+    WMI_CHANNEL_PARAMS_CMD *cmd;
-+    A_INT8 size;
-+
-+    size = sizeof (*cmd);
-+
-+    if (numChan) {
-+        if (numChan > WMI_MAX_CHANNELS) {
-+            return A_EINVAL;
-+        }
-+        size += sizeof(A_UINT16) * (numChan - 1);
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_CHANNEL_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, size);
-+
-+    wmip->wmi_phyMode = mode;
-+    cmd->scanParam   = scanParam;
-+    cmd->phyMode     = mode;
-+    cmd->numChannels = numChan;
-+    A_MEMCPY(cmd->channelList, channelList, numChan * sizeof(A_UINT16));
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_CHANNEL_PARAMS_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_rssi_threshold_params(struct wmi_t *wmip,
-+                              WMI_RSSI_THRESHOLD_PARAMS_CMD *rssiCmd)
-+{
-+    void    *osbuf;
-+    A_INT8  size;
-+    WMI_RSSI_THRESHOLD_PARAMS_CMD *cmd;
-+    /* These values are in ascending order */
-+    if( rssiCmd->thresholdAbove6_Val <= rssiCmd->thresholdAbove5_Val ||
-+        rssiCmd->thresholdAbove5_Val <= rssiCmd->thresholdAbove4_Val ||
-+        rssiCmd->thresholdAbove4_Val <= rssiCmd->thresholdAbove3_Val ||
-+        rssiCmd->thresholdAbove3_Val <= rssiCmd->thresholdAbove2_Val ||
-+        rssiCmd->thresholdAbove2_Val <= rssiCmd->thresholdAbove1_Val ||
-+        rssiCmd->thresholdBelow6_Val <= rssiCmd->thresholdBelow5_Val ||
-+        rssiCmd->thresholdBelow5_Val <= rssiCmd->thresholdBelow4_Val ||
-+        rssiCmd->thresholdBelow4_Val <= rssiCmd->thresholdBelow3_Val ||
-+        rssiCmd->thresholdBelow3_Val <= rssiCmd->thresholdBelow2_Val ||
-+        rssiCmd->thresholdBelow2_Val <= rssiCmd->thresholdBelow1_Val) {
-+
-+        return A_EINVAL;
-+    }
-+
-+    size = sizeof (*cmd);
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_RSSI_THRESHOLD_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, size);
-+    A_MEMCPY(cmd, rssiCmd, sizeof(WMI_RSSI_THRESHOLD_PARAMS_CMD));
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_RSSI_THRESHOLD_PARAMS_CMDID,
-+                            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_host_sleep_mode_cmd(struct wmi_t *wmip,
-+                              WMI_SET_HOST_SLEEP_MODE_CMD *hostModeCmd)
-+{
-+    void    *osbuf;
-+    A_INT8  size;
-+    WMI_SET_HOST_SLEEP_MODE_CMD *cmd;
-+
-+    if( hostModeCmd->awake == hostModeCmd->asleep) {
-+        return A_EINVAL;
-+    }
-+
-+    size = sizeof (*cmd);
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_SET_HOST_SLEEP_MODE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, size);
-+    A_MEMCPY(cmd, hostModeCmd, sizeof(WMI_SET_HOST_SLEEP_MODE_CMD));
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_HOST_SLEEP_MODE_CMDID,
-+                            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_wow_mode_cmd(struct wmi_t *wmip,
-+                              WMI_SET_WOW_MODE_CMD *wowModeCmd)
-+{
-+    void    *osbuf;
-+    A_INT8  size;
-+    WMI_SET_WOW_MODE_CMD *cmd;
-+
-+    size = sizeof (*cmd);
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_SET_WOW_MODE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, size);
-+    A_MEMCPY(cmd, wowModeCmd, sizeof(WMI_SET_WOW_MODE_CMD));
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_WOW_MODE_CMDID,
-+                            NO_SYNC_WMIFLAG));
-+
-+}
-+
-+A_STATUS
-+wmi_get_wow_list_cmd(struct wmi_t *wmip,
-+                              WMI_GET_WOW_LIST_CMD *wowListCmd)
-+{
-+    void    *osbuf;
-+    A_INT8  size;
-+    WMI_GET_WOW_LIST_CMD *cmd;
-+
-+    size = sizeof (*cmd);
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_GET_WOW_LIST_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, size);
-+    A_MEMCPY(cmd, wowListCmd, sizeof(WMI_GET_WOW_LIST_CMD));
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_GET_WOW_LIST_CMDID,
-+                            NO_SYNC_WMIFLAG));
-+
-+}
-+
-+static A_STATUS
-+wmi_get_wow_list_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+    WMI_GET_WOW_LIST_REPLY *reply;
-+
-+    if (len < sizeof(WMI_GET_WOW_LIST_REPLY)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_GET_WOW_LIST_REPLY *)datap;
-+
-+    A_WMI_WOW_LIST_EVENT(wmip->wmi_devt, reply->num_filters,
-+                          reply);
-+
-+    return A_OK;
-+}
-+
-+A_STATUS wmi_add_wow_pattern_cmd(struct wmi_t *wmip,
-+                                 WMI_ADD_WOW_PATTERN_CMD *addWowCmd,
-+                                 A_UINT8* pattern, A_UINT8* mask,
-+                                 A_UINT8 pattern_size)
-+{
-+    void    *osbuf;
-+    A_INT8  size;
-+    WMI_ADD_WOW_PATTERN_CMD *cmd;
-+    A_UINT8 *filter_mask = NULL;
-+
-+    size = sizeof (*cmd);
-+
-+    size += ((2 * addWowCmd->filter_size)* sizeof(A_UINT8));
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_ADD_WOW_PATTERN_CMD *)(A_NETBUF_DATA(osbuf));
-+    cmd->filter_list_id = addWowCmd->filter_list_id;
-+    cmd->filter_offset = addWowCmd->filter_offset;
-+    cmd->filter_size = addWowCmd->filter_size;
-+
-+    A_MEMCPY(cmd->filter, pattern, addWowCmd->filter_size);
-+
-+    filter_mask = (A_UINT8*)(cmd->filter + cmd->filter_size);
-+    A_MEMCPY(filter_mask, mask, addWowCmd->filter_size);
-+
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_ADD_WOW_PATTERN_CMDID,
-+                            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_del_wow_pattern_cmd(struct wmi_t *wmip,
-+                              WMI_DEL_WOW_PATTERN_CMD *delWowCmd)
-+{
-+    void    *osbuf;
-+    A_INT8  size;
-+    WMI_DEL_WOW_PATTERN_CMD *cmd;
-+
-+    size = sizeof (*cmd);
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_DEL_WOW_PATTERN_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, size);
-+    A_MEMCPY(cmd, delWowCmd, sizeof(WMI_DEL_WOW_PATTERN_CMD));
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_DEL_WOW_PATTERN_CMDID,
-+                            NO_SYNC_WMIFLAG));
-+
-+}
-+
-+A_STATUS
-+wmi_set_snr_threshold_params(struct wmi_t *wmip,
-+                             WMI_SNR_THRESHOLD_PARAMS_CMD *snrCmd)
-+{
-+    void    *osbuf;
-+    A_INT8  size;
-+    WMI_SNR_THRESHOLD_PARAMS_CMD *cmd;
-+    /* These values are in ascending order */
-+    if( snrCmd->thresholdAbove4_Val <= snrCmd->thresholdAbove3_Val ||
-+        snrCmd->thresholdAbove3_Val <= snrCmd->thresholdAbove2_Val ||
-+        snrCmd->thresholdAbove2_Val <= snrCmd->thresholdAbove1_Val ||
-+        snrCmd->thresholdBelow4_Val <= snrCmd->thresholdBelow3_Val ||
-+        snrCmd->thresholdBelow3_Val <= snrCmd->thresholdBelow2_Val ||
-+        snrCmd->thresholdBelow2_Val <= snrCmd->thresholdBelow1_Val) {
-+
-+        return A_EINVAL;
-+    }
-+
-+    size = sizeof (*cmd);
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_SNR_THRESHOLD_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, size);
-+    A_MEMCPY(cmd, snrCmd, sizeof(WMI_SNR_THRESHOLD_PARAMS_CMD));
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SNR_THRESHOLD_PARAMS_CMDID,
-+                            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_clr_rssi_snr(struct wmi_t *wmip)
-+{
-+    void    *osbuf;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(int));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_CLR_RSSI_SNR_CMDID,
-+                            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_lq_threshold_params(struct wmi_t *wmip,
-+                             WMI_LQ_THRESHOLD_PARAMS_CMD *lqCmd)
-+{
-+    void    *osbuf;
-+    A_INT8  size;
-+    WMI_LQ_THRESHOLD_PARAMS_CMD *cmd;
-+    /* These values are in ascending order */
-+    if( lqCmd->thresholdAbove4_Val <= lqCmd->thresholdAbove3_Val ||
-+        lqCmd->thresholdAbove3_Val <= lqCmd->thresholdAbove2_Val ||
-+        lqCmd->thresholdAbove2_Val <= lqCmd->thresholdAbove1_Val ||
-+        lqCmd->thresholdBelow4_Val <= lqCmd->thresholdBelow3_Val ||
-+        lqCmd->thresholdBelow3_Val <= lqCmd->thresholdBelow2_Val ||
-+        lqCmd->thresholdBelow2_Val <= lqCmd->thresholdBelow1_Val ) {
-+
-+        return A_EINVAL;
-+    }
-+
-+    size = sizeof (*cmd);
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_LQ_THRESHOLD_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, size);
-+    A_MEMCPY(cmd, lqCmd, sizeof(WMI_LQ_THRESHOLD_PARAMS_CMD));
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_LQ_THRESHOLD_PARAMS_CMDID,
-+                            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_error_report_bitmask(struct wmi_t *wmip, A_UINT32 mask)
-+{
-+    void    *osbuf;
-+    A_INT8  size;
-+    WMI_TARGET_ERROR_REPORT_BITMASK *cmd;
-+
-+    size = sizeof (*cmd);
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_TARGET_ERROR_REPORT_BITMASK *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, size);
-+
-+    cmd->bitmask = mask;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_TARGET_ERROR_REPORT_BITMASK_CMDID,
-+                            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_get_challenge_resp_cmd(struct wmi_t *wmip, A_UINT32 cookie, A_UINT32 source)
-+{
-+    void *osbuf;
-+    WMIX_HB_CHALLENGE_RESP_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMIX_HB_CHALLENGE_RESP_CMD *)(A_NETBUF_DATA(osbuf));
-+    cmd->cookie = cookie;
-+    cmd->source = source;
-+
-+    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_HB_CHALLENGE_RESP_CMDID,
-+                              NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_config_debug_module_cmd(struct wmi_t *wmip, A_UINT16 mmask,
-+                            A_UINT16 tsr, A_BOOL rep, A_UINT16 size,
-+                            A_UINT32 valid)
-+{
-+    void *osbuf;
-+    WMIX_DBGLOG_CFG_MODULE_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMIX_DBGLOG_CFG_MODULE_CMD *)(A_NETBUF_DATA(osbuf));
-+    cmd->config.cfgmmask = mmask;
-+    cmd->config.cfgtsr = tsr;
-+    cmd->config.cfgrep = rep;
-+    cmd->config.cfgsize = size;
-+    cmd->config.cfgvalid = valid;
-+
-+    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_DBGLOG_CFG_MODULE_CMDID,
-+                              NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_get_stats_cmd(struct wmi_t *wmip)
-+{
-+    void *osbuf;
-+
-+    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_GET_STATISTICS_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_addBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex, A_UINT8 *bssid)
-+{
-+    void *osbuf;
-+    WMI_ADD_BAD_AP_CMD *cmd;
-+
-+    if ((bssid == NULL) || (apIndex > WMI_MAX_BAD_AP_INDEX)) {
-+        return A_EINVAL;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_ADD_BAD_AP_CMD *)(A_NETBUF_DATA(osbuf));
-+    cmd->badApIndex = apIndex;
-+    A_MEMCPY(cmd->bssid, bssid, sizeof(cmd->bssid));
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_ADD_BAD_AP_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_deleteBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex)
-+{
-+    void *osbuf;
-+    WMI_DELETE_BAD_AP_CMD *cmd;
-+
-+    if (apIndex > WMI_MAX_BAD_AP_INDEX) {
-+        return A_EINVAL;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_DELETE_BAD_AP_CMD *)(A_NETBUF_DATA(osbuf));
-+    cmd->badApIndex = apIndex;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_DELETE_BAD_AP_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_txPwr_cmd(struct wmi_t *wmip, A_UINT8 dbM)
-+{
-+    void *osbuf;
-+    WMI_SET_TX_PWR_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_TX_PWR_CMD *)(A_NETBUF_DATA(osbuf));
-+    cmd->dbM = dbM;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_TX_PWR_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_get_txPwr_cmd(struct wmi_t *wmip)
-+{
-+    void *osbuf;
-+
-+    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_GET_TX_PWR_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_UINT16
-+wmi_get_mapped_qos_queue(struct wmi_t *wmip, A_UINT8 trafficClass)
-+{
-+      A_UINT16 activeTsids=0;
-+
-+    LOCK_WMI(wmip);
-+    activeTsids = wmip->wmi_streamExistsForAC[trafficClass];
-+    UNLOCK_WMI(wmip);
-+
-+    return activeTsids;
-+}
-+
-+A_STATUS
-+wmi_get_roam_tbl_cmd(struct wmi_t *wmip)
-+{
-+    void *osbuf;
-+
-+    osbuf = A_NETBUF_ALLOC(0);      /* no payload */
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_GET_ROAM_TBL_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_get_roam_data_cmd(struct wmi_t *wmip, A_UINT8 roamDataType)
-+{
-+    void *osbuf;
-+    A_UINT32 size = sizeof(A_UINT8);
-+    WMI_TARGET_ROAM_DATA *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(size);      /* no payload */
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_TARGET_ROAM_DATA *)(A_NETBUF_DATA(osbuf));
-+    cmd->roamDataType = roamDataType;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_GET_ROAM_DATA_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_roam_ctrl_cmd(struct wmi_t *wmip, WMI_SET_ROAM_CTRL_CMD *p,
-+                      A_UINT8 size)
-+{
-+    void *osbuf;
-+    WMI_SET_ROAM_CTRL_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_SET_ROAM_CTRL_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, size);
-+
-+    A_MEMCPY(cmd, p, size);
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_ROAM_CTRL_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_powersave_timers_cmd(struct wmi_t *wmip,
-+                            WMI_POWERSAVE_TIMERS_POLICY_CMD *pCmd,
-+                            A_UINT8 size)
-+{
-+    void *osbuf;
-+    WMI_POWERSAVE_TIMERS_POLICY_CMD *cmd;
-+
-+    /* These timers can't be zero */
-+    if(!pCmd->psPollTimeout || !pCmd->triggerTimeout ||
-+       !(pCmd->apsdTimPolicy == IGNORE_TIM_ALL_QUEUES_APSD ||
-+         pCmd->apsdTimPolicy == PROCESS_TIM_ALL_QUEUES_APSD) ||
-+       !(pCmd->simulatedAPSDTimPolicy == IGNORE_TIM_SIMULATED_APSD ||
-+         pCmd->simulatedAPSDTimPolicy == PROCESS_TIM_SIMULATED_APSD))
-+        return A_EINVAL;
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, size);
-+
-+    cmd = (WMI_POWERSAVE_TIMERS_POLICY_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, size);
-+
-+    A_MEMCPY(cmd, pCmd, size);
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_POWERSAVE_TIMERS_POLICY_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+#ifdef CONFIG_HOST_GPIO_SUPPORT
-+/* Send a command to Target to change GPIO output pins. */
-+A_STATUS
-+wmi_gpio_output_set(struct wmi_t *wmip,
-+                    A_UINT32 set_mask,
-+                    A_UINT32 clear_mask,
-+                    A_UINT32 enable_mask,
-+                    A_UINT32 disable_mask)
-+{
-+    void *osbuf;
-+    WMIX_GPIO_OUTPUT_SET_CMD *output_set;
-+    int size;
-+
-+    size = sizeof(*output_set);
-+
-+    A_DPRINTF(DBG_WMI,
-+        (DBGFMT "Enter - set=0x%x clear=0x%x enb=0x%x dis=0x%x\n", DBGARG,
-+        set_mask, clear_mask, enable_mask, disable_mask));
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+    A_NETBUF_PUT(osbuf, size);
-+    output_set = (WMIX_GPIO_OUTPUT_SET_CMD *)(A_NETBUF_DATA(osbuf));
-+
-+    output_set->set_mask                   = set_mask;
-+    output_set->clear_mask                 = clear_mask;
-+    output_set->enable_mask                = enable_mask;
-+    output_set->disable_mask               = disable_mask;
-+
-+    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_GPIO_OUTPUT_SET_CMDID,
-+                             NO_SYNC_WMIFLAG));
-+}
-+
-+/* Send a command to the Target requesting state of the GPIO input pins */
-+A_STATUS
-+wmi_gpio_input_get(struct wmi_t *wmip)
-+{
-+    void *osbuf;
-+
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    osbuf = A_NETBUF_ALLOC(0);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_GPIO_INPUT_GET_CMDID,
-+                             NO_SYNC_WMIFLAG));
-+}
-+
-+/* Send a command to the Target that changes the value of a GPIO register. */
-+A_STATUS
-+wmi_gpio_register_set(struct wmi_t *wmip,
-+                      A_UINT32 gpioreg_id,
-+                      A_UINT32 value)
-+{
-+    void *osbuf;
-+    WMIX_GPIO_REGISTER_SET_CMD *register_set;
-+    int size;
-+
-+    size = sizeof(*register_set);
-+
-+    A_DPRINTF(DBG_WMI,
-+        (DBGFMT "Enter - reg=%d value=0x%x\n", DBGARG, gpioreg_id, value));
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+    A_NETBUF_PUT(osbuf, size);
-+    register_set = (WMIX_GPIO_REGISTER_SET_CMD *)(A_NETBUF_DATA(osbuf));
-+
-+    register_set->gpioreg_id               = gpioreg_id;
-+    register_set->value                    = value;
-+
-+    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_GPIO_REGISTER_SET_CMDID,
-+                             NO_SYNC_WMIFLAG));
-+}
-+
-+/* Send a command to the Target to fetch the value of a GPIO register. */
-+A_STATUS
-+wmi_gpio_register_get(struct wmi_t *wmip,
-+                      A_UINT32 gpioreg_id)
-+{
-+    void *osbuf;
-+    WMIX_GPIO_REGISTER_GET_CMD *register_get;
-+    int size;
-+
-+    size = sizeof(*register_get);
-+
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter - reg=%d\n", DBGARG, gpioreg_id));
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+    A_NETBUF_PUT(osbuf, size);
-+    register_get = (WMIX_GPIO_REGISTER_GET_CMD *)(A_NETBUF_DATA(osbuf));
-+
-+    register_get->gpioreg_id               = gpioreg_id;
-+
-+    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_GPIO_REGISTER_GET_CMDID,
-+                             NO_SYNC_WMIFLAG));
-+}
-+
-+/* Send a command to the Target acknowledging some GPIO interrupts. */
-+A_STATUS
-+wmi_gpio_intr_ack(struct wmi_t *wmip,
-+                  A_UINT32 ack_mask)
-+{
-+    void *osbuf;
-+    WMIX_GPIO_INTR_ACK_CMD *intr_ack;
-+    int size;
-+
-+    size = sizeof(*intr_ack);
-+
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter ack_mask=0x%x\n", DBGARG, ack_mask));
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+    A_NETBUF_PUT(osbuf, size);
-+    intr_ack = (WMIX_GPIO_INTR_ACK_CMD *)(A_NETBUF_DATA(osbuf));
-+
-+    intr_ack->ack_mask               = ack_mask;
-+
-+    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_GPIO_INTR_ACK_CMDID,
-+                             NO_SYNC_WMIFLAG));
-+}
-+#endif /* CONFIG_HOST_GPIO_SUPPORT */
-+
-+A_STATUS
-+wmi_set_access_params_cmd(struct wmi_t *wmip, A_UINT16 txop, A_UINT8 eCWmin,
-+                          A_UINT8 eCWmax, A_UINT8 aifsn)
-+{
-+    void *osbuf;
-+    WMI_SET_ACCESS_PARAMS_CMD *cmd;
-+
-+    if ((eCWmin > WMI_MAX_CW_ACPARAM) || (eCWmax > WMI_MAX_CW_ACPARAM) ||
-+        (aifsn > WMI_MAX_AIFSN_ACPARAM))
-+    {
-+        return A_EINVAL;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_ACCESS_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-+    cmd->txop   = txop;
-+    cmd->eCWmin = eCWmin;
-+    cmd->eCWmax = eCWmax;
-+    cmd->aifsn  = aifsn;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_ACCESS_PARAMS_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_retry_limits_cmd(struct wmi_t *wmip, A_UINT8 frameType,
-+                         A_UINT8 trafficClass, A_UINT8 maxRetries,
-+                         A_UINT8 enableNotify)
-+{
-+    void *osbuf;
-+    WMI_SET_RETRY_LIMITS_CMD *cmd;
-+
-+    if ((frameType != MGMT_FRAMETYPE) && (frameType != CONTROL_FRAMETYPE) &&
-+        (frameType != DATA_FRAMETYPE))
-+    {
-+        return A_EINVAL;
-+    }
-+
-+    if (maxRetries > WMI_MAX_RETRIES) {
-+        return A_EINVAL;
-+    }
-+
-+    if (frameType != DATA_FRAMETYPE) {
-+        trafficClass = 0;
-+    }
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_RETRY_LIMITS_CMD *)(A_NETBUF_DATA(osbuf));
-+    cmd->frameType    = frameType;
-+    cmd->trafficClass = trafficClass;
-+    cmd->maxRetries   = maxRetries;
-+    cmd->enableNotify = enableNotify;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_RETRY_LIMITS_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+void
-+wmi_get_current_bssid(struct wmi_t *wmip, A_UINT8 *bssid)
-+{
-+    if (bssid != NULL) {
-+        A_MEMCPY(bssid, wmip->wmi_bssid, ATH_MAC_LEN);
-+    }
-+}
-+
-+A_STATUS
-+wmi_set_opt_mode_cmd(struct wmi_t *wmip, A_UINT8 optMode)
-+{
-+    void *osbuf;
-+    WMI_SET_OPT_MODE_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_OPT_MODE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->optMode = optMode;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_OPT_MODE_CMDID,
-+                         SYNC_BOTH_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_opt_tx_frame_cmd(struct wmi_t *wmip,
-+                      A_UINT8 frmType,
-+                      A_UINT8 *dstMacAddr,
-+                      A_UINT8 *bssid,
-+                      A_UINT16 optIEDataLen,
-+                      A_UINT8 *optIEData)
-+{
-+    void *osbuf;
-+    WMI_OPT_TX_FRAME_CMD *cmd;
-+    osbuf = A_NETBUF_ALLOC(optIEDataLen + sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, (optIEDataLen + sizeof(*cmd)));
-+
-+    cmd = (WMI_OPT_TX_FRAME_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, (optIEDataLen + sizeof(*cmd)-1));
-+
-+    cmd->frmType    = frmType;
-+    cmd->optIEDataLen   = optIEDataLen;
-+    //cmd->optIEData     = (A_UINT8 *)((int)cmd + sizeof(*cmd));
-+    A_MEMCPY(cmd->bssid, bssid, sizeof(cmd->bssid));
-+    A_MEMCPY(cmd->dstAddr, dstMacAddr, sizeof(cmd->dstAddr));
-+    A_MEMCPY(&cmd->optIEData[0], optIEData, optIEDataLen);
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_OPT_TX_FRAME_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_adhoc_bconIntvl_cmd(struct wmi_t *wmip, A_UINT16 intvl)
-+{
-+    void *osbuf;
-+    WMI_BEACON_INT_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_BEACON_INT_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->beaconInterval = intvl;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_BEACON_INT_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+
-+A_STATUS
-+wmi_set_voice_pkt_size_cmd(struct wmi_t *wmip, A_UINT16 voicePktSize)
-+{
-+    void *osbuf;
-+    WMI_SET_VOICE_PKT_SIZE_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_VOICE_PKT_SIZE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->voicePktSize = voicePktSize;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_VOICE_PKT_SIZE_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+
-+A_STATUS
-+wmi_set_max_sp_len_cmd(struct wmi_t *wmip, A_UINT8 maxSPLen)
-+{
-+    void *osbuf;
-+    WMI_SET_MAX_SP_LEN_CMD *cmd;
-+
-+    /* maxSPLen is a two-bit value. If user trys to set anything
-+     * other than this, then its invalid
-+     */
-+    if(maxSPLen & ~0x03)
-+        return  A_EINVAL;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_MAX_SP_LEN_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->maxSPLen = maxSPLen;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_MAX_SP_LEN_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+A_UINT8
-+convert_userPriority_to_trafficClass(A_UINT8 userPriority)
-+{
-+        return  (up_to_ac[userPriority & 0x7]);
-+}
-+
-+A_UINT8
-+wmi_get_power_mode_cmd(struct wmi_t *wmip)
-+{
-+    return wmip->wmi_powerMode;
-+}
-+
-+A_STATUS
-+wmi_verify_tspec_params(WMI_CREATE_PSTREAM_CMD *pCmd, A_BOOL tspecCompliance)
-+{
-+    return A_OK;
-+}
-+
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+static A_STATUS
-+wmi_tcmd_test_report_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
-+{
-+
-+   A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+   A_WMI_TCMD_RX_REPORT_EVENT(wmip->wmi_devt, datap, len);
-+
-+   return A_OK;
-+}
-+
-+#endif /* CONFIG_HOST_TCMD_SUPPORT*/
-+
-+A_STATUS
-+wmi_set_authmode_cmd(struct wmi_t *wmip, A_UINT8 mode)
-+{
-+    void *osbuf;
-+    WMI_SET_AUTH_MODE_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_AUTH_MODE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->mode = mode;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_AUTH_MODE_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_reassocmode_cmd(struct wmi_t *wmip, A_UINT8 mode)
-+{
-+    void *osbuf;
-+    WMI_SET_REASSOC_MODE_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_REASSOC_MODE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->mode = mode;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_REASSOC_MODE_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_lpreamble_cmd(struct wmi_t *wmip, A_UINT8 status)
-+{
-+    void *osbuf;
-+    WMI_SET_LPREAMBLE_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_LPREAMBLE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->status = status;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_LPREAMBLE_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_rts_cmd(struct wmi_t *wmip, A_UINT16 threshold)
-+{
-+    void *osbuf;
-+    WMI_SET_RTS_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_RTS_CMD*)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->threshold = threshold;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_RTS_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_wmm_cmd(struct wmi_t *wmip, WMI_WMM_STATUS status)
-+{
-+    void *osbuf;
-+    WMI_SET_WMM_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_WMM_CMD*)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->status = status;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_WMM_CMDID,
-+            NO_SYNC_WMIFLAG));
-+
-+}
-+
-+A_STATUS
-+wmi_set_wmm_txop(struct wmi_t *wmip, WMI_TXOP_CFG cfg)
-+{
-+    void *osbuf;
-+    WMI_SET_WMM_TXOP_CMD *cmd;
-+
-+    if( !((cfg == WMI_TXOP_DISABLED) || (cfg == WMI_TXOP_ENABLED)) )
-+        return A_EINVAL;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_WMM_TXOP_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->txopEnable = cfg;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_WMM_TXOP_CMDID,
-+            NO_SYNC_WMIFLAG));
-+
-+}
-+
-+#ifdef CONFIG_HOST_TCMD_SUPPORT
-+/* WMI  layer doesn't need to know the data type of the test cmd.
-+   This would be beneficial for customers like Qualcomm, who might
-+   have different test command requirements from differnt manufacturers
-+ */
-+A_STATUS
-+wmi_test_cmd(struct wmi_t *wmip, A_UINT8 *buf, A_UINT32  len)
-+{
-+    void *osbuf;
-+    char *data;
-+
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-+
-+    osbuf= A_NETBUF_ALLOC(len);
-+    if(osbuf == NULL)
-+    {
-+        return A_NO_MEMORY;
-+    }
-+    A_NETBUF_PUT(osbuf, len);
-+    data = A_NETBUF_DATA(osbuf);
-+    A_MEMCPY(data, buf, len);
-+
-+    return(wmi_cmd_send(wmip, osbuf, WMI_TEST_CMDID,
-+         NO_SYNC_WMIFLAG));
-+}
-+
-+#endif
-+
-+A_STATUS
-+wmi_set_bt_status_cmd(struct wmi_t *wmip, A_UINT8 streamType, A_UINT8 status)
-+{
-+    void *osbuf;
-+    WMI_SET_BT_STATUS_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_BT_STATUS_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->streamType = streamType;
-+    cmd->status = status;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_BT_STATUS_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_bt_params_cmd(struct wmi_t *wmip, WMI_SET_BT_PARAMS_CMD* cmd)
-+{
-+    void *osbuf;
-+    WMI_SET_BT_PARAMS_CMD* alloc_cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    alloc_cmd = (WMI_SET_BT_PARAMS_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(alloc_cmd, sizeof(*cmd));
-+    A_MEMCPY(alloc_cmd, cmd, sizeof(*cmd));
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_BT_PARAMS_CMDID,
-+            NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_get_keepalive_configured(struct wmi_t *wmip)
-+{
-+    void *osbuf;
-+    WMI_GET_KEEPALIVE_CMD *cmd;
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+    cmd = (WMI_GET_KEEPALIVE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    return (wmi_cmd_send(wmip, osbuf, WMI_GET_KEEPALIVE_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_UINT8
-+wmi_get_keepalive_cmd(struct wmi_t *wmip)
-+{
-+    return wmip->wmi_keepaliveInterval;
-+}
-+
-+A_STATUS
-+wmi_set_keepalive_cmd(struct wmi_t *wmip, A_UINT8 keepaliveInterval)
-+{
-+    void *osbuf;
-+    WMI_SET_KEEPALIVE_CMD *cmd;
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*cmd));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*cmd));
-+
-+    cmd = (WMI_SET_KEEPALIVE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd->keepaliveInterval = keepaliveInterval;
-+    wmip->wmi_keepaliveInterval = keepaliveInterval;
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_KEEPALIVE_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_appie_cmd(struct wmi_t *wmip, A_UINT8 mgmtFrmType, A_UINT8 ieLen,
-+                  A_UINT8 *ieInfo)
-+{
-+    void *osbuf;
-+    WMI_SET_APPIE_CMD *cmd;
-+    A_UINT16 cmdLen;
-+
-+    if (ieLen > WMI_MAX_IE_LEN) {
-+        return A_ERROR;
-+    }
-+    cmdLen = sizeof(*cmd) + ieLen - 1;
-+    osbuf = A_NETBUF_ALLOC(cmdLen);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, cmdLen);
-+
-+    cmd = (WMI_SET_APPIE_CMD *)(A_NETBUF_DATA(osbuf));
-+    A_MEMZERO(cmd, cmdLen);
-+
-+    cmd->mgmtFrmType = mgmtFrmType;
-+    cmd->ieLen = ieLen;
-+    A_MEMCPY(cmd->ieInfo, ieInfo, ieLen);
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_APPIE_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_STATUS
-+wmi_set_halparam_cmd(struct wmi_t *wmip, A_UINT8 *cmd, A_UINT16 dataLen)
-+{
-+    void *osbuf;
-+    A_UINT8 *data;
-+
-+    osbuf = A_NETBUF_ALLOC(dataLen);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, dataLen);
-+
-+    data = A_NETBUF_DATA(osbuf);
-+
-+    A_MEMCPY(data, cmd, dataLen);
-+
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_WHALPARAM_CMDID, NO_SYNC_WMIFLAG));
-+}
-+
-+A_INT32
-+wmi_get_rate(A_INT8 rateindex)
-+{
-+    if (rateindex == RATE_AUTO) {
-+        return 0;
-+    } else {
-+        return(wmi_rateTable[(A_UINT32) rateindex]);
-+    }
-+}
-+
-+void
-+wmi_node_return (struct wmi_t *wmip, bss_t *bss)
-+{
-+      if (NULL != bss)
-+      {
-+              wlan_node_return (&wmip->wmi_scan_table, bss);
-+      }
-+}
-+
-+bss_t *
-+wmi_find_Ssidnode (struct wmi_t *wmip, A_UCHAR *pSsid,
-+                                 A_UINT32 ssidLength, A_BOOL bIsWPA2)
-+{
-+      bss_t *node = NULL;
-+    node = wlan_find_Ssidnode (&wmip->wmi_scan_table, pSsid,
-+                                                         ssidLength, bIsWPA2);
-+      return node;
-+}
-+
-+void
-+wmi_free_allnodes(struct wmi_t *wmip)
-+{
-+      wlan_free_allnodes(&wmip->wmi_scan_table);
-+}
-+
-+bss_t *
-+wmi_find_node(struct wmi_t *wmip, const A_UINT8 *macaddr)
-+{
-+      bss_t *ni=NULL;
-+      ni=wlan_find_node(&wmip->wmi_scan_table,macaddr);
-+      return ni;
-+}
-+
-+A_STATUS
-+wmi_dset_open_reply(struct wmi_t *wmip,
-+                    A_UINT32 status,
-+                    A_UINT32 access_cookie,
-+                    A_UINT32 dset_size,
-+                    A_UINT32 dset_version,
-+                    A_UINT32 targ_handle,
-+                    A_UINT32 targ_reply_fn,
-+                    A_UINT32 targ_reply_arg)
-+{
-+    void *osbuf;
-+    WMIX_DSETOPEN_REPLY_CMD *open_reply;
-+
-+    A_DPRINTF(DBG_WMI, (DBGFMT "Enter - wmip=0x%x\n", DBGARG, (int)wmip));
-+
-+    osbuf = A_NETBUF_ALLOC(sizeof(*open_reply));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    A_NETBUF_PUT(osbuf, sizeof(*open_reply));
-+    open_reply = (WMIX_DSETOPEN_REPLY_CMD *)(A_NETBUF_DATA(osbuf));
-+
-+    open_reply->status                   = status;
-+    open_reply->targ_dset_handle         = targ_handle;
-+    open_reply->targ_reply_fn            = targ_reply_fn;
-+    open_reply->targ_reply_arg           = targ_reply_arg;
-+    open_reply->access_cookie            = access_cookie;
-+    open_reply->size                     = dset_size;
-+    open_reply->version                  = dset_version;
-+
-+    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_DSETOPEN_REPLY_CMDID,
-+                             NO_SYNC_WMIFLAG));
-+}
-+
-+static A_STATUS
-+wmi_get_pmkid_list_event_rx(struct wmi_t *wmip, A_UINT8 *datap, A_UINT32 len)
-+{
-+    WMI_PMKID_LIST_REPLY *reply;
-+    A_UINT32 expected_len;
-+
-+    if (len < sizeof(WMI_PMKID_LIST_REPLY)) {
-+        return A_EINVAL;
-+    }
-+    reply = (WMI_PMKID_LIST_REPLY *)datap;
-+    expected_len = sizeof(reply->numPMKID) + reply->numPMKID * WMI_PMKID_LEN;
-+
-+    if (len < expected_len) {
-+        return A_EINVAL;
-+    }
-+
-+    A_WMI_PMKID_LIST_EVENT(wmip->wmi_devt, reply->numPMKID,
-+                           reply->pmkidList);
-+
-+    return A_OK;
-+}
-+
-+#ifdef CONFIG_HOST_DSET_SUPPORT
-+A_STATUS
-+wmi_dset_data_reply(struct wmi_t *wmip,
-+                    A_UINT32 status,
-+                    A_UINT8 *user_buf,
-+                    A_UINT32 length,
-+                    A_UINT32 targ_buf,
-+                    A_UINT32 targ_reply_fn,
-+                    A_UINT32 targ_reply_arg)
-+{
-+    void *osbuf;
-+    WMIX_DSETDATA_REPLY_CMD *data_reply;
-+    int size;
-+
-+    size = sizeof(*data_reply) + length;
-+
-+    A_DPRINTF(DBG_WMI,
-+        (DBGFMT "Enter - length=%d status=%d\n", DBGARG, length, status));
-+
-+    osbuf = A_NETBUF_ALLOC(size);
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+    A_NETBUF_PUT(osbuf, size);
-+    data_reply = (WMIX_DSETDATA_REPLY_CMD *)(A_NETBUF_DATA(osbuf));
-+
-+    data_reply->status                     = status;
-+    data_reply->targ_buf                   = targ_buf;
-+    data_reply->targ_reply_fn              = targ_reply_fn;
-+    data_reply->targ_reply_arg             = targ_reply_arg;
-+    data_reply->length                     = length;
-+
-+    if (status == A_OK) {
-+        if (a_copy_from_user(data_reply->buf, user_buf, length)) {
-+            return A_ERROR;
-+        }
-+    }
-+
-+    return (wmi_cmd_send_xtnd(wmip, osbuf, WMIX_DSETDATA_REPLY_CMDID,
-+                             NO_SYNC_WMIFLAG));
-+}
-+#endif /* CONFIG_HOST_DSET_SUPPORT */
-+
-+A_STATUS
-+wmi_set_wsc_status_cmd(struct wmi_t *wmip, A_UINT32 status)
-+{
-+    void *osbuf;
-+    char *cmd;
-+
-+      wps_enable = status;
-+
-+    osbuf = a_netbuf_alloc(sizeof(1));
-+    if (osbuf == NULL) {
-+        return A_NO_MEMORY;
-+    }
-+
-+    a_netbuf_put(osbuf, sizeof(1));
-+
-+    cmd = (char *)(a_netbuf_to_data(osbuf));
-+
-+    A_MEMZERO(cmd, sizeof(*cmd));
-+    cmd[0] = (status?1:0);
-+    return (wmi_cmd_send(wmip, osbuf, WMI_SET_WSC_STATUS_CMDID,
-+                         NO_SYNC_WMIFLAG));
-+}
-+
-diff --git a/drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h b/drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h
-new file mode 100644
-index 0000000..19cd938
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h
-@@ -0,0 +1,4421 @@
-+/*
-+ *
-+ * Copyright (c) 2004-2007 Atheros Communications 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 version 2 as
-+ *  published by the Free Software Foundation;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+
-+#if 0
-+Wireless Module Interface (WMI) Documentaion
-+
-+   This section describes the format and the usage model for WMI control and
-+   data messages between the host and the AR6000-based targets. The header
-+   file include/wmi.h contains all command and event manifest constants as
-+   well as structure typedefs for each set of command and reply parameters.
-+
-+Data Frames
-+
-+   The data payload transmitted and received by the target follows RFC-1042
-+   encapsulation and thus starts with an 802.2-style LLC-SNAP header. The
-+   WLAN module completes 802.11 encapsulation of the payload, including the
-+   MAC header, FCS, and WLAN security related fields. At the interface to the
-+   message transport (HTC), a data frame is encapsulated in a WMI message.
-+
-+WMI Message Structure
-+
-+   The WMI protocol leverages an 802.3-style Ethernet header in communicating
-+   the source and destination information between the host and the AR6000
-+   modules using a 14-byte 802.3 header ahead of the 802.2-style payload. In
-+   addition, the WMI protocol adds a header to all data messages:
-+
-+    {
-+    INT8    rssi
-+                  The RSSI of the received packet and its units are shown in db above the
-+                      noise floor, and the noise floor is shown in dbm.
-+    UINT8   info
-+                      Contains information on message type and user priority. Message type
-+                      differentiates between a data packet and a synchronization message.
-+    } WMI_DATA_HDR
-+
-+   User priority contains the 802.1d user priority info from host to target. Host
-+   software translates the host Ethernet format to 802.3 format prior to Tx and
-+   802.3 format to host format in the Rx direction. The host does not transmit the
-+   FCS that follows the data. MsgType differentiates between a regular data
-+   packet (msgType=0) and a synchronization message (msgType=1).
-+
-+Data Endpoints
-+
-+   The AR6000 chipset provides several data endpoints to support quality of
-+   service (QoS) and maintains separate queues and separate DMA engines for
-+   each data endpoint. A data endpoint can be bi-directional.
-+
-+   Best effort (BE) class traffic uses the default data endpoint (2). The host can
-+   establish up to two additional data endpoints for other traffic classes. Once
-+   such a data endpoint is established, it sends and receives corresponding QoS
-+   traffic in a manner similar to the default data endpoint.
-+
-+   If QoS is desired over the interconnect, host software must classify each data
-+   packet and place it on the appropriate data endpoint. The information
-+   required to classify data is generally available in-band as an 802.1p/q style
-+   tag or as the ToS field in the IP header. The information may also be available
-+   out-of-band depending on the host DDI.
-+
-+Connection States
-+
-+   Table B-1 describes the AR6000 WLAN connection states:
-+
-+   Table B-1.  AR6000 Connection States
-+
-+Connection State
-+    Description
-+
-+   DISCONNECTED
-+    In this state, the AR6000 device is not connected to a wireless
-+   network. The device is in this state after reset when it sends the
-+   WIRELESS MODULE \93READY\94 EVENT, after it processes a
-+   DISCONNECT command, and when it loses its link with the
-+   access point (AP) that it was connected to. The device signals a
-+   transition to the DISCONNECTED state with a \93DISCONNECT\94
-+   event.
-+
-+CONNECTED
-+    In this state, the AR6000 device is connected to wireless networks.
-+   The device enters this state after successfully processing a
-+   CONNECT, which establishes a connection with a wireless
-+   network. The device signals a transition to the CONNECTED state
-+   with a \93CONNECT\94 event.
-+
-+
-+Message Types
-+
-+   WMI uses commands, replies, and events for the control and configuration of
-+   the AR6000 device. The control protocol is asynchronous. Table B-2 describes
-+   AR6000 message types:
-+
-+Table B-2.  AR6000 Message Types
-+
-+Message Type
-+    Description
-+
-+Commands
-+    Control messages that flow from the host to the device
-+
-+Replies/Events
-+    Control messages that flow from the device to the host.
-+
-+   The device issues a reply to some WMI commands, but not to others.
-+   The payload in a reply is command-specific, and some commands do
-+   not trigger a reply message at all. Events are control messages issued
-+   by the device to signal the occurrence of an asynchronous event.
-+
-+
-+WMI Message Format
-+
-+   All WMI control commands, replies and events use the header format:
-+
-+   WMI_CMD_HDR Header Format
-+   {
-+        UINT16 id
-+                 This 16-bit constant identifies which WMI command the host is issuing,
-+                 which command the target is replying to, or which event has occurred.
-+        WMI_CMD_HDR
-+   }
-+
-+
-+   A variable-size command-, reply-, or event-specific payload follows the
-+   header. Over the interconnect, all fields in control messages (including
-+   WMI_CMD_HDR and the command specific payload) use 32-bit little Endian
-+   byte ordering and fields are packed. The AR6000 device always executes
-+   commands in order, and the host may send multiple commands without
-+   waiting for previous commands to complete. A majority of commands are
-+   processed to completion once received. Other commands trigger a longer
-+   duration activity whose completion is signaled to the host through an event.
-+
-+Command Restrictions
-+
-+   Some commands may only be issued when the AR6000 device is in a certain
-+   state. The host is required to wait for an event signaling a state transition
-+   before such a command can be issued. For example, if a command requires
-+   the device to be in the CONNECTED state, then the host is required to wait
-+   for a \93CONNECT\94 event before it issues that command.
-+
-+   The device ignores any commands inappropriate for its current state. If the
-+   command triggers a reply, the device generates an error reply. Otherwise, the
-+   device silently ignores the inappropriate command.
-+
-+Command and Data Synchronization
-+
-+   WMI provides a mechanism for a host to advise the device of necessary
-+   synchronization between commands and data. The device implements
-+   synchronization; no implicit synchronization exists between endpoints.
-+
-+   The host controls synchronization using the \93SYNCHRONIZE\94 command
-+   over the control channel and synchronization messages over data channels.
-+   The device stops each data channel upon receiving a synchronization message
-+   on that channel, processing all data packets received prior to that message.
-+   After the device receives synchronization messages for each data endpoint
-+   and the \93SYNCHRONIZE\94 command, it resumes all channels.
-+
-+   When the host must guarantee a command executes before processing new
-+   data packets, it first issues the command, then issues the \93SYNCHRONIZE\94
-+   command and sends synchronization messages on data channels. When the
-+   host must guarantee the device has processed all old data packets before a
-+   processing a new command, it issues a \93SYNCHRONIZE\94 command and
-+   synchronization messages on all data channels, then issues the desired
-+   command.
-+
-+
-+
-+WMI Commands
-+
-+   ADD_BAD_AP
-+    Cause the AR6000 device to avoid a particular AP
-+   ADD_CIPHER_KEY
-+    Add or replace any of the four AR6000 encryption keys
-+   ADD_WOW_PATTERN
-+    Used to add a pattern to the WoW pattern list
-+   CLR_RSSI_SNR
-+    Clear the current calculated RSSI and SNR value
-+   CONNECT_CMD
-+    Request that the AR6000 device establish a wireless connection
-+        with the specified SSID
-+   CREATE_PSTREAM
-+    Create prioritized data endpoint between the host and device
-+   DELETE_BAD_AP
-+    Clear an entry in the bad AP table
-+   DELETE_CIPHER_KEY
-+    Delete a previously added cipher key
-+   DELETE_PSTREAM
-+    Delete a prioritized data endpoint
-+   DELETE_WOW_PATTERN
-+    Remove a pre-specified pattern from the WoW pattern list
-+   EXTENSION
-+    WMI message interface command
-+   GET_BIT_RATE
-+    Retrieve rate most recently used by the AR6000
-+   GET_CHANNEL_LIST
-+    Retrieve list of channels used by the AR6000
-+   GET_FIXRATES
-+    Retrieves the rate-mask set via the SET_FIXRATES command.
-+   GET_PMKID_LIST_CMD
-+    Retrieve the firmware list of PMKIDs
-+   GET_ROAM_DATA
-+    Internal use for data collection; available in special build only
-+   GET_ROAM_TBL
-+    Retrieve the roaming table maintained on the target
-+   GET_TARGET_STATS
-+    Request that the target send the statistics it maintains
-+   GET_TX_PWR
-+    Retrieve the current AR6000 device Tx power levels
-+   GET_WOW_LIST
-+    Retrieve the current list of WoW patterns
-+   LQ_THRESHOLD_PARAMS
-+    Set the link quality thresholds
-+   OPT_TX_FRAME
-+    Send a special frame (special feature)
-+   RECONNECT
-+    Request a reconnection to a BSS
-+   RSSI_THRESHOLD_PARAMS
-+    Configure how the AR6000 device monitors and reports signal
-+       strength (RSSI) of the connected BSS
-+   SCAN_PARAMS
-+    Determine dwell time and changes scanned channels
-+   SET_ACCESS_PARAMS
-+    Set access parameters for the wireless network
-+   SET_ADHOC_BSSID
-+    Set the BSSID for an ad hoc network
-+   SET_AKMP_PARAMS
-+    Set multiPMKID mode
-+   SET_APPIE
-+    Add application-specified IE to a management frame
-+   SET_ASSOC_INFO
-+    Specify the IEs the device should add to association or
-+        reassociation requests
-+   SET_AUTH_MODE
-+    Set 802.11 authentication mode of reconnection
-+   SET_BEACON_INT
-+    Set the beacon interval for an ad hoc network
-+   SET_BIT_RATE
-+    Set the AR6000 to a specific fixed bit rate
-+   SET_BMISS_TIME
-+    Set the beacon miss time
-+   SET_BSS_FILTER
-+    Inform the AR6000 of network types about which it wants to
-+        receive information using a \93BSSINFO\94 event
-+   SET_BT_PARAMS
-+    Set the status of a Bluetooth stream (SCO or A2DP) or set
-+        Bluetooth coexistence register parameters
-+   SET_BT_STATUS
-+    Set the status of a Bluetooth stream (SCO or A2DP)
-+   SET_CHANNEL_PARAMETERS
-+    Configure WLAN channel parameters
-+   SET_DISC_TIMEOUT
-+    Set the amount of time the AR6000 spends attempting to
-+        reestablish a connection
-+   SET_FIXRATES
-+    Set the device to a specific fixed PHY rate (supported subset)
-+   SET_HALPARAM
-+    Internal AR6000 command to set certain hardware parameters
-+   SET_HOST_SLEEP_MODE
-+    Set the host mode to asleep or awake
-+   SET_IBSS_PM_CAPS
-+    Support a non-standard power management scheme for an
-+        ad hoc network
-+   SET_LISTEN_INT
-+    Request a listen interval
-+   SET_LPREAMBLE
-+    Override the short preamble capability of the AR6000 device
-+   SET_MAX_SP_LEN
-+    Set the maximum service period
-+   SET_OPT_MODE
-+    Set the special mode on/off (special feature)
-+   SET_PMKID
-+    Set the pairwise master key ID (PMKID)
-+   SET_PMKID_LIST_CMD
-+    Configure the firmware list of PMKIDs
-+   SET_POWER_MODE
-+    Set guidelines on trade-off between power utilization
-+   SET_POWER_PARAMS
-+    Configure power parameters
-+   SET_POWERSAVE_PARAMS
-+    Set the two AR6000 power save timers
-+   SET_PROBED_SSID
-+    Provide list of SSIDs the device should seek
-+   SET_REASSOC_MODE
-+    Specify whether the disassociated frame should be sent upon
-+        reassociation
-+   SET_RETRY_LIMITS
-+    Limit how many times the device tries to send a frame
-+   SET_ROAM_CTRL
-+    Control roaming behavior
-+   SET_RTS
-+    Determine when RTS should be sent
-+   SET_SCAN_PARAMS
-+    Set the AR6000 scan parameters
-+   SET_TKIP_COUNTERMEASURES
-+    Enable/disable reports of TKIP MIC errors
-+   SET_TX_PWR
-+    Specify the AR6000 device Tx power levels
-+   SET_VOICE_PKT_SIZE
-+    Set voice packet size
-+   SET_WMM
-+    Override the AR6000 WMM capability
-+   SET_WMM_TXOP
-+    Configure TxOP bursting when sending traffic to a WMM-
-+    capable AP
-+   SET_WOW_MODE
-+    Enable/disable WoW mode
-+   SET_WSC_STATUS
-+    Enable/disable profile check in cserv when the WPS protocol
-+    is in progress
-+   SNR_THRESHOLD_PARAMS
-+    Configure how the device monitors and reports SNR of BSS
-+   START_SCAN
-+    Start a long or short channel scan
-+   SYNCHRONIZE
-+    Force a synchronization point between command and data
-+    paths
-+   TARGET_REPORT_ERROR_BITMASK
-+    Control \93ERROR_REPORT\94 events from the AR6000
-+
-+
-+
-+
-+Name
-+    ADD_BAD_AP
-+
-+Synopsis
-+    The host uses this command to cause the AR6000 to avoid a particular AP. The
-+    AR6000 maintain a table with up to two APs to avoid. An ADD_BAD_AP command
-+    adds or replaces the specified entry in this bad AP table.
-+
-+    If the AR6000 are currently connected to the AP specified in this command, they
-+    disassociate.
-+
-+Command
-+    wmiconfig eth1 --badap <bssid> <badApIndex>
-+
-+Command Parameters
-+    UINT8 badApIndex    Index [0...1] that identifies which entry in the
-+                        bad AP table to use
-+
-+
-+    UINT8 bssid[6]  MAC address of the AP to avoid
-+
-+Command Values
-+    badApIndex = 0, 1    Entry in the bad AP table to use
-+
-+Reset Value
-+    The bad AP table is cleared
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93DELETE_BAD_AP\94 on page B-13
-+
-+=====================================================================
-+Name
-+    ADD_CIPHER_KEY
-+
-+Synopsis
-+    The host uses this command to add/replace any of four encryption keys on the
-+    AR6000. The ADD_CIPHER_KEY command is issued after the CONNECT event
-+    has been received by the host for all dot11Auth modes except for SHARED_AUTH.
-+    When the dot11AuthMode is SHARED_AUTH, then the ADD_CIPHER_KEY
-+    command should be issued before the \93CONNECT\94 command.
-+
-+Command
-+    wmiconfig eth1 --cipherkey <keyIndex> <keyType> <keyUsage>
-+                            <keyLength> <keyopctrl> <keyRSC> <key>
-+
-+Command Parameters
-+    UINT8 keyIndex      Index (0...3) of the key to add/replace;
-+                        uniquely identifies the key
-+    UINT8 keyType    CRYPTO_TYPE
-+    UINT8 keyUsage   Specifies usage parameters of the key when
-+                     keyType = WEP_CRYPT
-+    UINT8 keyLength  Length of the key in bytes
-+    UINT8 keyOpCtrl  bit[0] = Initialize TSC (default),
-+                     bit[1] = Initialize RSC
-+    UINT8 keyRSC[8]  Key replay sequence counter (RSC) initial
-+                     value the device should use
-+    UINT8 key[32]    Key material used for this connection
-+    Command Values
-+    {
-+        NONE_CRYPT = 1
-+        WEP_CRYPT  = 2
-+        TKIP_CRYPT = 3
-+        AES_CRYPT  = 4
-+        KEY_OP_INIT_TSC   0x01
-+        KEY_OP_INIT_RSC   0x02
-+        KEY_OP_INIT_VAL   0x03
-+                Default is to Initialize the TSC
-+        KEY_OP_VALID_MASK 0x04
-+                Two operations defined
-+    } CRYPTO_TYPE
-+
-+    {
-+        PAIRWISE_USAGE  = 0  Set if the key is used for unicast traffic only
-+        GROUP_USAGE     = 1  Set if the key is used to receive multicast
-+                              traffic (also set for static WEP keys)
-+        TX_USAGE        = 2  Set for the GROUP key used to transmit frames
-+                All others are reserved
-+    } KEY_USAGE
-+
-+Reset Value
-+    The four available keys are disabled.
-+
-+Restrictions
-+    The cipher should correspond to the encryption mode specified in the \93CONNECT\94
-+    command.
-+
-+See Also
-+    \93DELETE_CIPHER_KEY\94
-+
-+=====================================================================
-+
-+
-+Name
-+    ADD_WOW_PATTERN
-+
-+Synopsis
-+    The host uses this command to add a pattern to the WoW pattern list; used for
-+    pattern-matching for host wakeups by the WoW module. If the host mode is asleep
-+    and WoW is enabled, all packets are matched against the existing WoW patterns. If a
-+    packet matches any of the patterns specified, the target will wake up the host. All
-+    non-matching packets are discarded by the target without being sent up to the host.
-+
-+Command
-+    wmiconfig \96addwowpattern <list-id> <filter-size> <filter-offset>
-+    <pattern> <mask>
-+
-+Command Parameters
-+    A_UINT8  filter_list_id    ID of the list that is to include the new pattern
-+    A_UINT8  filter_size       Size of the new pattern
-+    A_UINT8  filter_offset     Offset at which the pattern matching for this
-+                                new pattern should begin at
-+    A_UINT8  filter[1]         Byte stream that contains both the pattern and
-+                                the mask of the new WoW wake-up pattern
-+
-+Reply Parameters
-+    None
-+
-+Reset Value
-+    None defined (default host mode is awake)
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93DELETE_WOW_PATTERN\94
-+
-+=====================================================================
-+
-+
-+Name
-+    CLR_RSSI_SNR
-+
-+Synopsis
-+    Clears the current calculated RSSI and SNR value. RSSI and SNR are reported by
-+    running-average value. This command will clear the history and have a fresh start
-+    for the running-average mechanism.
-+
-+Command
-+    wmiconfig eth1 --cleanRssiSnr
-+
-+Command Parameters
-+    None
-+
-+Reply Parameters
-+    None
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+Name
-+    CONNECT_CMD
-+
-+Synopsis
-+    New connect control information (connectCtrl) is added, with 32 possible modifiers.
-+
-+    CONNECT_SEND_REASSOC
-+        Valid only for a host-controlled connection to a
-+        particular AP. If this bit is set, a reassociation frame is
-+        sent. If this bit is clear, an association request frame is
-+        sent to the AP.
-+
-+    CONNECT_IGNORE_WPAx_GROUP_CIPHER
-+        No group key is issued in the CONNECT command,
-+        so use the group key advertised by the AP. In a target-
-+        initiated roaming situation this allows a STA to roam
-+        between APs that support different multicast ciphers.
-+
-+    CONNECT_PROFILE_MATCH_DONE
-+        In a host-controlled connection case, it is possible that
-+        during connect, firmware may not have the
-+        information for a profile match (e.g, when the AP
-+        supports hidden SSIDs and the device may not
-+        transmit probe requests during connect). By setting
-+        this bit in the connection control information, the
-+        firmware waits for a beacon from the AP with the
-+        BSSID supplied in the CONNECT command. No
-+        additional profile checks are done.
-+
-+    CONNECT_IGNORE_AAC_BEACON
-+        Ignore the Admission Capacity information in the
-+        beacon of the AP
-+
-+    CONNECT_ASSOC_POLICY_USER
-+        When set, the CONNECT_SEND_REASSOC setting
-+        determines if an Assoc or Reassoc is sent to an AP
-+
-+Command
-+    wmiconfig --setconnectctrl <ctrl flags bitmask>
-+
-+Command Parameters
-+    typedef struct{
-+    A_UINT8 networktype;
-+    A_UINT8 dot11authmode;
-+    A_UINT8 authmode;
-+    A_UINT8 pairwiseCryptoType; /*CRYPTO_TYPE*/
-+    A_UINT8 pairwiseCryptoLen;
-+    A_UINT8 groupCryptoType; /*CRYPTO_TYPE*/
-+    A_UINT8 groupCryptoLen;
-+    A_UINT8 ssidLength;
-+    A_UCHAR ssid[WMI_MAX_SSID_LEN];
-+    A_UINT16 channel;
-+    A_UINT8 bssid[AUTH_MAC_LEN];
-+    A_UINT8 ctrl_flags; /*WMI_CONNECT_CTRL_FLAGS_BITS*/
-+    } WMI_CONNECT_CMD;
-+
-+    ctrl flags bitmask
-+        = 0x0001 CONNECT_ASSOC_POLICY_USER
-+            Assoc frames are sent using the policy specified by
-+            the flag
-+        = 0x0002 CONNECT_SEND_REASSOC
-+            Send Reassoc frame while connecting, otherwise send
-+            assoc frames
-+        = 0x0004 CONNECT_IGNORE_WPAx_GROUP_CIPHER
-+            Ignore WPAx group cipher for WPA/WPA2
-+        = 0x0008 CONNECT_PROFILE_MATCH_DONE
-+            Ignore any profile check
-+        = 0x0010 CONNECT_IGNORE_AAC_BEACON
-+            Ignore the admission control information in the
-+            beacon
-+        ... CONNECT_CMD, continued
-+        Command Values
-+        typedef enum {
-+            INFRA_NETWORK       = 0x01,
-+            ADHOC_NETWORK       = 0x02,
-+            ADHOC_CREATOR       = 0x04,
-+        } NETWORK_TYPE;
-+
-+        typedef enum {
-+            OPEN_AUTH           = 0x01,
-+            SHARED_AUTH         = 0x02,
-+            LEAP_AUTH           = 0x04,
-+        } DOT11_AUTH_MODE;
-+        typedef enum {
-+            NONE_AUTH           = 0x01,
-+            WPA_AUTH            = 0x02,
-+            WPA_PSK_AUTH        = 0x03,
-+            WPA2_AUTH           = 0x04,
-+            WPA2_PSK_AUTH       = 0x05,
-+            WPA_AUTH_CCKM       = 0x06,
-+            WPA2_AUTH_CCKM      = 0x07,
-+        } AUTH_MODE;
-+        typedef enum {
-+            NONE_CRYPT          = 0x01,
-+            WEP_CRYPT           = 0x02,
-+            TKIP_CRYPT          = 0x03,
-+            AES_CRYPT           = 0x04,
-+        } CRYPTO_TYPE;
-+        typedef enum {
-+            CONNECT_ASSOC_POLICY_USER = 0x0001,
-+            CONNECT_SEND_REASSOC = 0x0002,
-+            CONNECT_IGNORE_WPAx_GROUP_CIPHER = 0x0004,
-+            CONNECT_PROFILE_MATCH_DONE = 0x0008,
-+            CONNECT_IGNORE_AAC_BEACON = 0x0010,
-+        } WMI_CONNECT_CTRL_FLAGS_BITS;
-+
-+    pairwiseCryptoLen and groupCryptoLen are valid when the respective
-+    CryptoTypesis WEP_CRYPT, otherwise this value should be 0. This is the length in
-+    bytes.
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    CREATE_PSTREAM
-+
-+Synopsis
-+    The host uses this command to create a new prioritized data endpoint between the
-+    host and the AR6000 device that carries a prioritized stream of data. If the AP that the
-+    device connects to requires TSPEC stream establishment, the device requests the
-+    corresponding TSPEC with the AP. The maximum and minimum service interval
-+    ranges from 0 \96 0x7FFFFFFF (ms), where 0 = disabled. The device does not send a
-+    reply event for this command, as it is always assumed the command has succeeded.
-+    An AP admission control response comes to the host via a WMI_CAC_INDICATION
-+    event, once the response for the ADDTS frame comes.
-+
-+    Examples of cases where reassociation is generated (when WMM) and cases where
-+    ADDTS is generated (when WMM and enabling ACM) are when:
-+        Changing UAPSD flags in WMM mode, reassociation is generated
-+        Changing the interval of sending auto QoS Null frame in WMM mode;
-+            reassociation is not generated
-+        Issuing a command with same previous parameters in WMM mode and enabling
-+            ACM, an ADDTS request is generated
-+        Changing the interval of a QoS null frame sending in WMM mode and enabling
-+            ACM, an ADDTS request is generated
-+        Issuing the command in disconnected state, reassociation or ADDTS is not
-+            generated but the parameters are available after (re)association
-+
-+Command
-+    --createqos <user priority> <direction> <traffic class>
-+<trafficType> <voice PS capability> <min service interval> <max
-+service interval> <inactivity interval> <suspension interval>
-+<service start time> <tsid> <nominal MSDU> <max MSDU> <min data
-+rate> <mean data rate> <peak data rate> <max burst size> <delay
-+bound> <min phy rate> <sba> <medium time> where:
-+
-+    <user priority>
-+    802.1D user priority range (0\967)
-+    <direction>
-+        = 0    Tx (uplink) traffic
-+        = 1    Rx (downlink) traffic
-+        = 2    Bi-directional traffic
-+    <traffic class>
-+        = 1    BK
-+        = 2    VI
-+        = 3    VO
-+    <trafficType>
-+        = 0    Aperiodic
-+        = 1    Periodic
-+    <voice PS capability>
-+        Specifies whether the voice power save mechanism
-+    (APSD if AP supports it or legacy/simulated APSD
-+    [using PS-Poll]) should be used
-+        = 0    Disable voice power save for traffic class
-+        = 1    Enable APSD voice power save for traffic class
-+        = 2    Enable voice power save for all traffic classes
-+    <min service interval>
-+        (In ms)
-+    <max service interval>
-+        Inactivity interval (in ms) (0 = Infinite)
-+    <suspension interval>
-+        (In ms)
-+    <service start time>
-+        Service start time
-+    <tsid>
-+        TSID range (0\9615)
-+    <nominal MSDU>
-+        Nominal MAC SDU size
-+    <max MSDU>
-+        Maximum MAC SDU size
-+    <min data rate>
-+        Minimum data rate (in bps)
-+    <mean data rate>
-+        Mean data rate (in bps)
-+    <peak data rate>
-+        Peak data rate (in bps)
-+    <max burst size>
-+        Maximum burst size (in bps)
-+    <delay bound>
-+        Delay bound
-+    <min phy rate>
-+        Minimum PHY rate (in bps)
-+    <sba>
-+        Surplus bandwidth allowance
-+    <medium time>
-+        Medium time in TU of 32-ms periods per sec
-+    ... CREATE_PSTREAM (continued)
-+
-+Command Parameters
-+    UINT8 trafficClass    TRAFFIC_CLASS value
-+    UINT8 traffic
-+    Direction
-+    DIR_TYPE value
-+    UINT8    rxQueueNum
-+        AR6000 device mailbox index (2 or 3)
-+        corresponding to the endpoint the host
-+        wishes to use to receive packets for the
-+        prioritized stream
-+    UINT8 trafficType  TRAFFIC_TYPE value
-+    UINT8 voicePS
-+Capability
-+    VOICEPS_CAP_TYPE value
-+    UINT8 tsid          Traffic stream ID
-+    UINT8 userPriority  802.1D user priority
-+    UINT16 nominalMSDU  Nominal MSDU in octets
-+    UINT16 maxMSDU      Maximum MSDU in octets
-+    UINT32 minServiceInt Minimum service interval: the min.
-+                            period of traffic specified (in ms)
-+    UINT32 maxServiceInt  Maximum service interval: the max.
-+                        period of traffic specified (in ms)
-+    UINT32 inactivityInt Indicates how many ms an established
-+                        stream is inactive before the prioritized
-+                        data endpoint is taken down and the
-+                        corresponding T-SPEC deleted
-+    UINT32 suspensionInt  Suspension interval (in ms)
-+    UINT32 service       StartTime Service start time
-+    UINT32 minDataRate  Minimum data rate (in bps)
-+    UINT32 meanDataRate Mean data rate (in bps)
-+    UINT32 peakDataRate Peak data rate (in bps)
-+    UINT32 maxBurstSize
-+    UINT32 delayBound
-+    UINT32 minPhyRate   Minimum PHY rate for TSPEC (in bps)
-+    UINT32 sba          Surplus bandwidth allowance
-+    UINT32 mediumTime   Medium TSPEC time (in units of 32 ms)
-+Command Values
-+    {
-+        WMM_AC_BE = 0   Best Effort
-+        WMM_AC_BK = 1   Background
-+        WMM_AC_VI = 2   Video
-+        WMM_AC_VO = 3   Voice
-+        All other values reserved
-+    } TRAFFIC_CLASS
-+    {
-+        UPLINK_TRAFFIC   = 0  From the AR6000 device to the AP
-+        DOWNLINK_TRAFFIC = 1  From the AP to the AR6000 device
-+        BIDIR_TRAFFIC    = 2  Bi-directional traffic
-+        All other values reserved
-+    } DIR_TYPE
-+    {
-+        DISABLE_FOR_THIS_AC = 0
-+        ENABLE_FOR_THIS_AC  = 1
-+        ENABLE_FOR_ALL_AC   = 2
-+        All other values reserved
-+    } VOICEPS_CAP_TYPE
-+
-+    ... CREATE_PSTREAM (continued)
-+
-+
-+        VI  BE   BK    Supported, Y/N?
-+   0    0    0    0    Y
-+   0    0    0    1    Y
-+   0    0    1    0    N
-+   0    0    1    1    N
-+   0    1    0    0    Y
-+   0    1    0    1    Y
-+   0    1    1    0    N
-+   0    1    1    1    N
-+   1    0    0    0    Y
-+   1    0    0    1    Y
-+   1    0    1    0    N
-+   1    1    0    0    N
-+   1    1    0    1    Y
-+   1    1    0    0    N
-+   1    1    1    0    N
-+   1    1    1    1    Y
-+
-+Reset Value
-+    No pstream is present after reset; each of the BE, BK, VI,VO pstreams must be created
-+    (either implicitly by data flow or explicitly by user)
-+
-+Restrictions
-+    This command can only be issued when the device is in the CONNECTED state. If
-+    the device receives the command while in DISCONNECTED state, it replies with a
-+    failure indication. At most four prioritized data endpoints can be created, one for
-+    each AC.
-+
-+See Also
-+    \93DELETE_PSTREAM\94
-+=====================================================================
-+
-+Name
-+    DELETE_BAD_AP
-+
-+Synopsis
-+    The host uses this command to clear a particular entry in the bad AP table
-+
-+Command
-+    wmiconfig eth1 --rmAP [--num=<index>] // used to clear a badAP
-+    entry. num is index from 0-3
-+
-+Command Parameters
-+    UINT8  badApIndex   Index [0...n] that identifies the entry in the bad
-+                        AP table to delete
-+
-+Command Values
-+    badApIndex   = 0, 1, 2, 3
-+            Entry in the bad AP table
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93ADD_BAD_AP\94
-+
-+=====================================================================
-+
-+
-+Name
-+    DELETE_CIPHER_KEY
-+
-+Synopsis
-+    The host uses this command to delete a key that was previously added with the
-+    \93ADD_CIPHER_KEY\94 command.
-+
-+Command
-+    TBD
-+
-+Command Parameters
-+    UINT8   keyIndex    Index (0...3) of the key to be deleted
-+
-+Command Values
-+    keyIndex    = 0, 1,2, 3    Key to delete
-+
-+Reset Value
-+    None
-+
-+Restrictions
-+    The host should not delete a key that is currently in use by the AR6000.
-+
-+See Also
-+    \93ADD_CIPHER_KEY\94
-+
-+=====================================================================
-+
-+Name
-+    DELETE_PSTREAM
-+
-+Synopsis
-+    The host uses this command to delete a prioritized data endpoint created by a
-+    previous \93CREATE_PSTREAM\94 command
-+
-+Command
-+    --deleteqos <trafficClass> <tsid>, where:
-+
-+    <traffic class>
-+        = 0    BE
-+        = 1    BK
-+        = 2    VI
-+        = 3    VO
-+    <tsid>
-+        The TSpec ID; use the -qosqueue option
-+        to get the active TSpec IDs for each traffic class
-+
-+Command Parameters
-+    A_UINT8    trafficClass    Indicate the traffic class of the stream
-+                            being deleted
-+
-+Command Values
-+    {
-+        WMM_AC_BE = 0    Best effort
-+        WMM_AC_BK = 1    Background
-+        WMM_AC_VI = 2    Video
-+        WMM_AC_VO = 3    Voice
-+    } TRAFFIC CLASS
-+
-+    0-15 for TSID
-+
-+Reply Values
-+    N/A
-+
-+Restrictions
-+    This command should only be issued after a \93CREATE_PSTREAM\94 command has
-+    successfully created a prioritized stream
-+
-+See Also
-+    \93CREATE_PSTREAM\94
-+
-+=====================================================================
-+
-+
-+Name
-+    DELETE_WOW_PATTERN
-+
-+Synopsis
-+    The host uses this command to remove a pre-specified pattern from the
-+    WoW pattern list.
-+
-+Command
-+    wmiconfig \96delwowpattern <list-id> <pattern-id>
-+
-+Command Parameters
-+    A_UINT8    filter_list_id    ID of the list that contains the WoW filter
-+                                 pattern to delete
-+    A_UINT8    filter_id    ID of the WoW filter pattern to delete
-+
-+Reply Parameters
-+    None
-+
-+
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93ADD_WOW_PATTERN\94
-+
-+=====================================================================
-+
-+
-+Name
-+    EXTENSION
-+
-+Synopsis
-+    The WMI message interface is used mostly for wireless control messages to a wireless
-+    module applicable to wireless module management regardless of the target platform
-+    implementation. However, some commands only peripherally related to wireless
-+    management are desired during operation. These wireless extension commands may
-+    be platform-specific or implementation-dependent.
-+
-+Command
-+    N/A
-+
-+Command Parameters
-+    Command-specific
-+
-+Command Values
-+    Command-specific
-+
-+Reply Parameters
-+    Command-specific
-+
-+Reset Values
-+    None defined
-+
-+Restrictions
-+    None defined
-+
-+=====================================================================
-+
-+
-+Name
-+    GET_BIT_RATE
-+
-+Synopsis
-+    Used by the host to obtain the rate most recently used by the AR6000 device
-+
-+Command
-+    wmiconfig eth1 --getfixrates
-+
-+Command Parameters
-+    None
-+
-+
-+
-+Reply Parameters
-+    INT8
-+    rateIndex
-+    See the \93SET_BIT_RATE\94 command
-+
-+Reset Values
-+    None
-+
-+Restrictions
-+    This command should only be used during development/debug; it is not intended
-+for use in production. It is only valid when the device is in the CONNECTED state
-+
-+See Also
-+    \93SET_BIT_RATE\94
-+
-+=====================================================================
-+
-+
-+Name
-+    GET_CHANNEL_LIST
-+
-+Synopsis
-+    Used by the host uses to retrieve the list of channels that can be used by the device
-+    while in the current wireless mode and in the current regulatory domain.
-+
-+Command
-+    TBD
-+
-+Command Parameters
-+    None
-+
-+Reply Parameters
-+    UINT8    reserved    Reserved
-+    UINT8    numberOfChannels    Number of channels the reply contains
-+    UINT16    channelList[numberOfChannels]  Array of channel frequencies (in MHz)
-+
-+Reset Values
-+    None defined
-+
-+Restrictions
-+    The maximum number of channels that can be reported are 32
-+
-+=====================================================================
-+
-+
-+Name
-+    GET_FIXRATES
-+
-+Synopsis
-+    Clears the current calculated RSSI and SNR value. RSSI and SNR are reported by
-+    running-average value. This command will clear the history and have a fresh start for
-+    the running-average mechanism.
-+
-+Synopsis
-+    This returns rate-mask set via WMI_SET_FIXRATES to retrieve the current fixed rate
-+    that the AR6001 or AR6001 is using. See \93SET_FIXRATES\94.
-+
-+Command
-+    wmiconfig eth1 --getfixrates
-+
-+Command Parameters
-+    A_UINT16    fixRateMask;    Note: if this command is used prior to
-+                using WMI_SET_FIXRATES, AR6000
-+                returns 0xffff as fixRateMask, indicating
-+                all the rates are enabled
-+
-+Reply Parameters
-+    None
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93SET_FIXRATES\94
-+
-+=====================================================================
-+
-+
-+
-+Name
-+    GET_PMKID_LIST_CMD
-+
-+Synopsis
-+    Retrieves the list of PMKIDs on the firmware. The
-+    WMI_GET_PMKID_LIST_EVENT is generated by the firmware.
-+
-+Command
-+    TBD
-+
-+Command Parameters
-+
-+Reset Values
-+    None
-+
-+Restrictions
-+    None
-+
-+See Also
-+    SET_PMKID_LIST_CMD GET_PMKID_LIST_EVENT
-+
-+=====================================================================
-+
-+
-+Name
-+    GET_ROAM_TBL
-+
-+Synopsis
-+    Retrieve the roaming table maintained on the target. The response is reported
-+    asynchronously through the ROAM_TBL_EVENT.
-+
-+Command
-+    wmiconfig --getroamtable <roamctrl> <info>
-+
-+Command Parameters
-+    A_UINT8    roamCtrlType;
-+    A_UINT16   roamMode
-+    A_UINT16   numEntries
-+    WMI_BSS_ROAM_INFO bssRoamInfo[1]
-+
-+Reply Value
-+    Reported asynchronously through the ROAM_TBL_EVENT
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+See Also
-+    SET_KEEPALIVE
-+
-+=====================================================================
-+
-+
-+Name
-+    GET_TARGET_STATS
-+
-+Synopsis
-+    The host uses this command to request that the target send the statistics that it
-+    maintains. The statistics obtained from the target are accrued in the host every time
-+    the GET_TARGET_STATS command is issued. The --clearStats option is added to
-+    clear the target statistics maintained in the host.
-+
-+Command
-+    wmiconfig --getTargetStats --clearStats
-+
-+Command Parameters
-+    TARGET_STATS    targetStats
-+    WMI_TARGET_STATS
-+    UINT8   clearStats
-+
-+
-+Reply Value
-+    RSSI return value (0\96100)
-+
-+Reset Values
-+    All statistics are cleared (zeroed)
-+
-+Restrictions
-+    The --getTargetStats option must be used; the --clearStats option is also available also
-+
-+
-+=====================================================================
-+
-+Name
-+    GET_TX_PWR
-+
-+Synopsis
-+    The host uses this command to retrieve the current Tx power level
-+
-+Command
-+    wmiconfig -i eth1 --getpower
-+
-+Command Parameters
-+    None
-+
-+Reply Parameters
-+    UINT16 dbM    The current Tx power level specified in dbM
-+
-+Reset Values
-+    The maximum permitted by the regulatory domain
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93SET_TX_PWR\94
-+
-+=====================================================================
-+
-+
-+Name
-+    GET_WOW_LIST
-+
-+Synopsis
-+    The host uses this command to retrieve the current list of WoW patterns.
-+
-+Command
-+    wmiconfig \96getwowlist <list-id>
-+
-+Command Parameters
-+    A_UINT8 filter_list_id    ID of the list of WoW patterns to retrieve
-+
-+Reply Value(s)
-+    A_UINT16  num_filters    Number of WoW patterns contained in the list
-+    A_UINT8   wow_mode    Current mode of WoW (enabled or disabled)
-+    A_UINT8    host_mode    Current host mode (asleep or awake)
-+    WOW_FILTER    wow_filters[1]
-+        Contents of the WoW filter pattern list
-+        (contains mask, pattern, offset and size
-+    information for each of the patterns)
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93SET_WSC_STATUS\94
-+
-+=====================================================================
-+
-+
-+Name
-+    LQ_THRESHOLD_PARAMS
-+
-+Synopsis
-+    Sets Link Quality thresholds, the sampling will happen at every unicast data frame
-+    Tx if a certain threshold is met, and the corresponding event will be sent to the host.
-+
-+Command
-+    --lqThreshold <enable> <upper_threshold_1> ...
-+    <upper_threshold_4> <lower_threshold_1> ... <lower_threshold_4>
-+
-+Command Parameters
-+    <enable>    = 0    Disable link quality sampling
-+                = 1    Enable link quality sampling
-+    <upper_threshold_x>  Above thresholds (value in [0,100]), in
-+                    ascending order
-+    <lower_threshold_x> Below thresholds (value in [0,100]), in
-+                    ascending order
-+
-+Command Values
-+    See command parameters
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    OPT_TX_FRAME
-+
-+Synopsis
-+    Special feature, sends a special frame.
-+
-+Command
-+    wmiconfig --sendframe <frmType> <dstaddr> <bssid> <optIEDatalen>
-+    <optIEData>
-+
-+Command Parameters
-+    {
-+        A_UINT16    optIEDataLen;
-+        A_UINT8    frmType;
-+        A_UINT8    dstAddr[ATH_MAC_LEN];
-+        A_UINT8    bssid[ATH_MAC_LEN];
-+        A_UINT8    optIEData[1];
-+    } WMI_OPT_TX_FRAME_CMD;
-+
-+Command Values
-+    <frmtype>   = 1    Probe request frame
-+                = 2    Probe response frame
-+                = 3    CPPP start
-+                = 4    CPPP stop
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    Send a special frame only when special mode is on.
-+
-+=====================================================================
-+
-+
-+Name
-+    RECONNECT
-+
-+Synopsis
-+    This command requests a reconnection to a BSS to which the AR6000 device was
-+    formerly connected
-+
-+Command
-+    TBD
-+
-+Command Parameters
-+    UINT16    channel    Provides a hint as to which channel was
-+                        used for a previous connection
-+    UINT8    bssid[6]    If set, indicates which BSSID to connect to
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    None
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93CONNECT_CMD\94
-+
-+=====================================================================
-+
-+
-+Name
-+    RSSI_THRESHOLD_PARAMS
-+
-+Synopsis
-+    Configures how the AR6000 device monitors and reports signal strength (RSSI) of the
-+    connected BSS, which is used as a link quality metric. The four RSSI threshold sets (in
-+    dbM) of the host specification divide the signal strength range into six segments.
-+    When signal strength increases or decreases across one of the boundaries, an
-+    RSSI_THRESHOLD event is signaled to the host. The host may then choose to take
-+    action (such as influencing roaming).
-+
-+Command
-+    wmiconfig eth1 --rssiThreshold <weight> <pollTime>
-+        <above_threshold_val_1> ... <above_threshold_tag_6>
-+        <above_threshold_val_6>
-+        <below_threshold_tag_1> <below_threshold_val_1> ...
-+        <below_threshold_tag_6> <below_threshold_val_6>
-+
-+Command Parameters
-+    UINT8    weight    Range in [1, 16] used to calculate average RSSI
-+    UINT32   pollTime   RSSI (signal strength) sampling frequency in
-+                seconds (if pollTime = 0, single strength
-+        sampling is disabled)
-+    USER_RSS__THOLD tholds[12]  Thresholds (6 x 2)
-+
-+Command Values
-+    None defined
-+
-+Reset Values
-+    pollTime is 0, and sampling is disabled
-+
-+Restrictions
-+    Can only be issued if the AR6000 device is connected
-+
-+
-+=====================================================================
-+
-+Name
-+    SCAN_PARAMS
-+
-+Synopsis
-+    The minact parameter determines the minimum active channel dwell time, within
-+    which if the STA receives any beacon, it remains on that channel until the maxact
-+    channel dwell time. If the STA does not receive a beacon within the minact dwell
-+    time, it switches to scan the next channel.
-+
-+Command
-+    wmiconfig -scan -minact=<ms> --maxact=<ms>
-+
-+Command Parameters
-+    UINT16    maxact    Channel dwell time (in ms), default = 0
-+    UINT16    minact    Channel dwell time (in ms), default = 105
-+
-+Command Values
-+    See channel parameters
-+
-+Reset Values
-+    None defined
-+
-+Restrictions
-+    The minact value should be greater than 0; maxact should be between 5\9665535 ms
-+    and greater than minact
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_ACCESS_PARAMS
-+
-+Synopsis
-+    Allows the host to set access parameters for the wireless network. A thorough
-+    understanding of IEEE 802.11 is required to properly manipulate these parameters.
-+
-+Command
-+    wmiconfig eth1 --acparams --txop <limit> --cwmin <0-15>
-+    --cwmax <0-15> --aifsn<0-15>
-+
-+Command Parameters
-+    UINT16    txop    The maximum time (expressed in units of
-+                        32 ms) the device can spend transmitting
-+                        after acquiring the right to transmit
-+    UINT8    eCWmin    Minimum contention window
-+    UINT8    eCWmax    Maximum contention window
-+    UINT8    aifsn    The arbitration inter-frame space number
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    Reasonable defaults that vary, between endpoints (prioritized streams)
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_ADHOC_BSSID
-+
-+Synopsis
-+    Allows the host to set the BSSID for an ad hoc network. If a network with this BSSID
-+    is not found, the target creates an ad hoc network with this BSSID after the connect
-+    WMI command is triggered (e.g., by the SIOCSIWESSID IOCTL).
-+
-+Command
-+    wmiconfig eth1 --adhocbssid <bssid>
-+
-+Command Parameters
-+    A_UINT8     bssid[ATH_MAC_LEN]    BSSID is specified in xx:xx:xx:xx:xx:xx format
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    None
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_AKMP_PARAMS
-+
-+Synopsis
-+    Enables or disables multi PMKID mode.
-+
-+Command
-+    wmiconfig eth1 --setakmp --multipmkid=<on/off>
-+
-+Command Parameters
-+    typedef struct {
-+      A_UINT32    akmpInfo;
-+    } WMI_SET_AKMP_PARAMS_CMD;
-+
-+Command Values
-+    akmpInfo;
-+    bit[0] = 0
-+        MultiPMKID mode is disabled and PMKIDs that
-+        were set using the WMI_SET_PMKID_CMD are
-+        used in the [Re]AssocRequest frame.
-+     bit[0] = 1
-+        MultiPMKID mode is enabled and PMKIDs issued
-+        by the WMI_SET_PMKID_LIST_CMD are used in
-+        the next [Re]AssocRequest sent to the AP.
-+
-+Reset Values
-+    MultiPMKID mode is disabled
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_APPIE
-+
-+Synopsis
-+    Add an application-specified IE to a management frame. The maximum length is
-+    76 bytes. Including the length and the element ID, this translates to 78 bytes.
-+
-+Command
-+    wmiconfig --setappie <frame> <IE>, where:
-+
-+    frame
-+        One of beacon, probe, respon, assoc
-+
-+    IE
-+        A hex string beginning with DD (if = 0, no
-+        IE is sent in the management frame)
-+
-+Command Parameters
-+    mgmtFrmType;
-+        A WMI_MGMT_FRAME_TYPE
-+
-+    ieLen;
-+        Length of the IE to add to the GMT frame
-+
-+Command Values
-+    None
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    Supported only for the probe request and association request management frame
-+types. Also, only one IE can be added per management frame type.
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_ASSOC_INFO
-+
-+Synopsis
-+    The host uses this command to specify any information elements (IEs) it wishes the
-+    AR6000 device to add to all future association and reassociation requests. IEs must be
-+    correct and are used as is by the device. IEs specified through this command are
-+    cleared with a DISCONNECT.
-+
-+Command
-+    wmiconfig eth1 --setAssocIe <IE>
-+
-+Command Parameters
-+    UINT8    ieType    Used directly in 802.11 frames
-+    UINT8    bufferSize    Size of assocInfo (in bytes) ranging from
-+                        0\96240. If = 0, previously set IEs are cleared.
-+    UINT8    assocInfo[bufferSize]    Used directly in 802.11 frames
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    IEs are cleared
-+
-+Restrictions
-+    This command can only be issued in the DISCONNECTED state
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_AUTHMODE
-+
-+Synopsis
-+    Sets the 802.11 authentication mode of reconnection
-+
-+Command
-+    wmiconfig eth1 --setauthmode <mode>
-+
-+Command Parameters
-+    UINT8    mode
-+
-+Command Values
-+    mode    = 0x00    Proceed with authentication during reconnect
-+            = 0x01    Do not proceed with authentication during reconnect
-+
-+Reset Values
-+    Authentication
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_BEACON_INT
-+
-+Synopsis
-+    Sets the beacon interval for an ad hoc network. Beacon interval selection may have an
-+    impact on power savings. To some degree, a longer interval reduces power
-+    consumption but also decreases throughput. A thorough understanding of IEEE
-+    802.11 ad hoc networks is required to use this command effectively.
-+
-+Command
-+    wmiconfig eth1 --ibssconintv
-+
-+Command Parameters
-+    UINT16    beaconInterval    Specifies the beacon interval in TU units (1024 ms)
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    The default beacon interval is 100 TUs (102.4 ms)
-+
-+Restrictions
-+    This command can only be issued before the AR6000 device starts an ad hoc network
-+
-+See Also
-+    \93SET_IBSS_PM_CAPS\94
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_BIT_RATE
-+
-+Synopsis
-+    The host uses this command to set the AR6000 device to a specific fixed rate.
-+
-+Command
-+    wmiconfig eth1 --setfixrates <rate_0> ... <rate_n>
-+
-+Command Parameters
-+    INT8    rateIndex
-+    A WMI_BIT_RATE value
-+    {
-+        RATE_AUTO    = -1
-+        RATE_1Mb     = 0
-+        RATE_2Mb     = 1
-+        RATE_5_5M    = 2
-+        RATE_11Mb    = 3
-+        RATE_6Mb     = 4
-+        RATE_9Mb     = 5
-+        RATE_12Mb    = 6
-+        RATE_18Mb    = 7
-+        RATE_24Mb    = 8
-+        RATE_36Mb    = 9
-+        RATE_48Mb    = 10
-+        RATE_54Mb    = 11
-+      } WMI_BIT_RATE
-+
-+
-+Command Values
-+    See command parameters
-+
-+Reset Values
-+    The dynamic rate is determined by the AR6000 device
-+
-+Restrictions
-+    This command is intended for use only during development/debug; it is not
-+intended for use in production
-+
-+See Also
-+    \93GET_BIT_RATE\94
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_BMISS_TIME
-+
-+Synopsis
-+    This command sets the beacon miss (BMISS) time, which the AR6000 hardware use
-+    to recognize missed beacons. When an excessive number (15) of consecutive beacons
-+    are missed, the AR6000 consider switching to a different BSS. The time can be
-+    specified in number of beacons or in TUs.
-+
-+Command(s)
-+    wmiconfig eth1 --setbmissbeacons=<val>
-+    wmiconfig eth1 --setbmisstime=<val>
-+
-+Command Parameters
-+    UINT16    bmissTime    Specifies the beacon miss time
-+                            [1000...5000] in TUs (1024 ms)
-+    UINT16    bmissbeacons  Specifies the number of beacons [5...50]
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    bmissTime is 1500 TUs (1536 ms)
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_BSS_FILTER
-+
-+Synopsis
-+    The host uses this to inform the AR6000 device of the types of networks about which
-+    it wants to receive information from the \93BSSINFO\94 event. As the device performs
-+    either foreground or background scans, it applies the filter and sends \93BSSINFO\94
-+    events only for the networks that pass the filter. If any of the  bssFilter or the ieMask
-+    filter matches, a BSS Info is sent to the host. The ieMask currently is used as a match
-+    for the IEs in the beacons, probe reponses and channel switch action management
-+    frame. See also \93Scan and Roam\94 on page C-1.
-+
-+    The BSS filter command has been enhanced to support IE based filtering. The IEs can
-+    be specified as a bitmask through this command using this enum.
-+
-+Command
-+    wmiconfig eth1 \96filter = <filter> --ieMask 0x<mask>
-+
-+Command Parameters
-+    UINT8    BssFilter
-+
-+ Command Values
-+    typedef struct {
-+        A_UINT8    bssFilter;    See WMI_BSS_FILTER
-+        A_UINT32    ieMask;
-+    } __ATTRIB_PACK WMI_BSS_FILTER_CMD;
-+
-+    The ieMask can take this combination of values:
-+
-+    enum {
-+        BSS_ELEMID_CHANSWITCH   = 0x01
-+        BSS_ELEMID_ATHEROS      = 0x02,
-+    }
-+
-+Reply Value
-+    None
-+
-+Reset Value
-+    BssFilter = NONE_BSS_FILTER (0)
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93CONNECT_CMD\94
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_BT_PARAMS
-+
-+Synopsis
-+    This command is used to set the status of a Bluetooth stream or set Bluetooth
-+    coexistence register parameters. The stream may be an SCO or an A2DP stream and
-+    its status can be started/stopped/suspended/resumed.
-+
-+Command
-+    wmiconfig \96setBTparams <paramType> <params>
-+
-+Command Parameters
-+    struct {
-+       union {
-+            BT_PARAMS_SCO    scoParams;
-+            BT_PARAMS_A2DP   a2dpParams;
-+            BT_PARAMS_MISC   miscParams;
-+            BT_COEX_REGS     regs;
-+        } info;
-+         A_UINT8 paramType;
-+        struct {
-+            A_UINT8 noSCOPkts;    Number of SCO packets between consecutive PS-POLLs
-+            A_UINT8 pspollTimeout;
-+            A_UINT8 stompbt;
-+        } BT_PARAMS_SCO;
-+        struct {
-+            A2DP BT stream parameters
-+            A_UINT32   period;
-+            A_UINT32   dutycycle;
-+            A_UINT8    stompbt;
-+        } BT_PARAMS_A2DP;
-+        struct {
-+            union {
-+               WLAN_PROTECT_POLICY_TYPE   protectParams;
-+               A_UINT16    wlanCtrlFlags;
-+            }info;
-+        A_UINT8 paramType;
-+        } BT_PARAMS_MISC;
-+        struct {
-+            BT coexistence registers values
-+            A_UINT32    mode;     Coexistence mode
-+            A_UINT32    scoWghts; WLAN and BT weights
-+            A_UINT32    a2dpWghts;
-+            A_UINT32    genWghts;
-+            A_UINT32    mode2;    Coexistence mode2
-+            A_UINT8    setVal;
-+        } BT_COEX_REGS;
-+
-+Command Values
-+    None defined
-+
-+Reset Value
-+    None
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_BT_STATUS
-+
-+Synopsis
-+    Sets the status of a Bluetooth stream. The stream may be a SCO or an A2DP stream
-+    and its status can be started/stopped/suspended/resumed.
-+
-+Command
-+    wmiconfig \96setBTstatus <streamType> <status>
-+
-+Command Parameters
-+    {
-+        A_UINT8        streamType;    Stream type
-+        A_UINT8        status;    Stream status
-+    }WMI_SET_BT_STATUS_CMD;
-+
-+Command Values
-+    {
-+        BT_STREAM_UNDEF    = 0
-+        BT_STREAM_SCO
-+        SCO stream
-+        BT_STREAM_A2DP
-+        A2DP stream
-+        BT_STREAM_MAX
-+    } BT_STREAM_TYPE;
-+
-+    {
-+        BT_STATUS_UNDEF    = 0
-+        BT_STATUS_START
-+        BT_STATUS_STOP
-+        BT_STATUS_RESUME
-+        BT_STATUS_SUSPEND
-+        BT_STATUS_MAX
-+    } BT_STREAM_STATUS;
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_CHANNEL_PARAMETERS
-+
-+Synopsis
-+    Configures various WLAN parameters related to channels, sets the wireless mode,
-+    and can restrict the AR6000 device to a subset of available channels. The list of
-+    available channels varies depending on the wireless mode and the regulatory
-+    domain. The device never operates on a channel outside of its regulatory domain. The
-+    device starts to scan the list of channels right after this command.
-+
-+Command
-+    wmiconfig eth1 --wmode <mode> <list>
-+
-+Command Parameters
-+    UINT8    phyMode    See Values below.
-+    UINT8    numberOfChannels
-+        Number of channels in the channel array that
-+        follows. If = 0, then the device uses all of the
-+        channels permitted by the regulatory domain
-+        and by the specified phyMode.
-+    UINT16    channel[numberOfChannels]
-+        Array listing the subset of channels (expressed
-+        as frequencies in MHz) the host wants the
-+        device to use. Any channel not permitted by
-+        the specified phyMode or by the specified
-+        regulatory domain is ignored by the device.
-+
-+Command Values
-+    phyMode = {
-+        Wireless mode
-+        11a    = 0x01
-+        11g    = 0x02
-+        11ag   = 0x03
-+        11b    = 0x04
-+        11g only    = 0x05
-+        }
-+
-+Reset Values
-+    phyMode
-+    11ag
-+    802.11a/g modules
-+        11g
-+    802.11g module
-+    channels
-+        Defaults to all channels permitted by the
-+        current regulatory domain.
-+
-+Restrictions
-+    This command, if issued, should be issued soon after reset and prior to the first
-+    connection. This command should only be issued in the DISCONNECTED state.
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_DISC_TIMEOUT
-+
-+Synopsis
-+    The host uses this command to configure the amount of time that the AR6000 should
-+    spend when it attempts to reestablish a connection after losing link with its current
-+    BSS. If this time limit is exceeded, the AR6000 send a \93DISCONNECT\94 event. After
-+    sending the \93DISCONNECT\94 event the AR6000 continues to attempt to reestablish a
-+    connection, but they do so at the interval corresponding to a foreground scan as
-+    established by the \93SET_SCAN_PARAMS\94 command.
-+
-+    A timeout value of 0 indicates that the AR6000 will disable all autonomous roaming,
-+    so that the AR6000 will not perform any scans after sending a \93DISCONNECT\94
-+    event to the host. The state is maintained until a shutdown or host sets different
-+    timeout value from 0.
-+
-+Command
-+    wmiconfig eth1 --disc=<timeout in seconds>
-+
-+Command Parameters
-+    UINT8    disconnectTimeout
-+        Specifies the time limit (in seconds) after
-+        which a failure to reestablish a connection
-+        results in a \93DISCONNECT\94 event
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    disconnectTimeout is 10 seconds
-+
-+Restrictions
-+    This command can only be issued while in a DISCONNECTED state
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_FIXRATES
-+
-+Synopsis
-+    By default, the AR6000 device uses all PHY rates based on mode of operation. If the
-+    host application requires the device to use subset of supported rates, it can set those
-+    rates with this command. In 802.11g mode, the AR6000 device takes the entire
-+    802.11g basic rate set and the rates specified with this command and uses it as the
-+    supported rate set.
-+
-+    This rate set is advertised in the probe request and the assoc/re-assoc request as
-+    supported rates. Upon successful association, the device modifies the rate set pool
-+    using the: intersection of AP-supported rates with the union of the 802.11g basic rate
-+    set and rates set using this command. The device picks transmission rates from this
-+    pool based on a rate control algorithm.
-+
-+Command
-+    TBD
-+
-+Command Parameters
-+    A_UINT16    fixRateMask;
-+        The individual bit is an index for rate table,
-+        and setting the that index to 1 would set that
-+        corresponding rate. E.g., fixRateMask = 9
-+        (1001) sets 1 Mbps and 11 Mbps.
-+
-+Command Values
-+    None
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93GET_FIXRATES\94
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_WHAL_PARAM
-+
-+Synopsis
-+    An internal AR6000 command that is used to set certain hardware parameters. The
-+    description of this command is in $WORKAREA/include/halapi.h.
-+
-+Command
-+    TBD
-+
-+Command Parameters
-+    ATH_HAL_SETCABTO_CMDID
-+        Sets the timeout waiting for the multicast
-+        traffic after a DTIM beacon (in TUs).
-+
-+Command Values
-+    None
-+
-+Reset Value
-+    Default = 10 TUs
-+
-+Restrictions
-+    This command should be executed before issuing a connect command.
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_HOST_SLEEP_MODE
-+
-+Synopsis
-+    The host uses this command to set the host mode to asleep or awake. All packets are
-+    delivered to the host when the host mode is awake. When host mode is asleep, only if
-+    WoW is enabled and the incoming packet matches one of the specified WoW
-+    patterns, will the packet be delivered to the host. The host will also be woken up by
-+    the target for pattern-matching packets and important events.
-+
-+Command
-+    wmiconfig \96sethostmode=<asleep/awake>
-+
-+Command Parameters
-+    A_BOOL    awake    Set the host mode to awake
-+    A_BOOL    asleep   Set the host mode to asleep
-+
-+Command Values
-+    1 = awake, 0 = asleep
-+
-+Reset Value
-+    None defined (default host mode is awake)
-+
-+Restrictions
-+    None
-+
-+
-+=====================================================================
-+
-+Name
-+    SET_IBSS_PM_CAPS
-+
-+Synopsis
-+    Used to support a non-standard power management scheme for an ad hoc wireless
-+    network consisting of up to eight stations (STAs) that support this form of power
-+    saving (e.g., Atheros-based STAs). A thorough understanding of IEEE 802.11 ad hoc
-+    networks is required to use this command effectively.
-+
-+Command
-+    wmiconfig eth1 --ibsspmcaps --ps=<enable/disable>
-+        --aw=<ATIM Windows in ms>
-+        --ttl=<Time to live in number of beacon periods>
-+        --to=<timeout in ms>
-+
-+Command Parameters
-+    UINT8    power_saving
-+        = 0
-+        The non-standard power saving scheme is
-+        disabled and maximum throughput (with no
-+        power saving) is obtained.
-+
-+        = 1
-+        Ad hoc power saving scheme is enabled (but
-+        throughput may be decreased)
-+
-+    UINT16    atim_windows
-+        Specifies the length (in ms) of the ad hoc traffic
-+        indication message (ATIM) windows used in an ad
-+        hoc network. All Atheros-based STAs that join the
-+        network use this duration ATIM window.
-+
-+    The duration is communicated between wireless
-+    STAs through an IE in beacons and probe responses.
-+
-+    The host sets atim_windows to control trade-offs
-+    between power use and throughput. The value
-+    chosen should be based on the beacon interval (see
-+    the \93SET_BEACON_INT\94 command) on the
-+    expected number of STAs in the IBSS, and on the
-+    amount of traffic and traffic patterns between STAs.
-+
-+    UINT16    timeout_value
-+        Specifies the timeout (in ms). The value is the same
-+        for all ad hoc connections, but tracks separately for
-+        each.
-+
-+        Applicable only for a beacon period and used to
-+        derive actual timeout values on the Tx and Rx sides.
-+        On the Tx side, the value defines a window during
-+        which the STA accepts the frame(s) from the host for a
-+        particular connection. Until closed, the window
-+        restarts with every frame received from the host. On
-+        the Rx side, indicates the time until which the STA
-+        continues accepting frames from a particular
-+        connection. The value resets with every frame
-+        received. The value can be used to determine the
-+        trade off between throughput and power.
-+        Default = 10 ms
-+
-+    UINT8    ttl
-+        Specifies the value in number of beacon periods. The
-+        value is used to set a limit on the time until which a
-+        frame is kept alive in the AR6001 before being
-+        discarded. Default = 5
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    By default, power_saving is enabled with atim_window = 20 ms
-+
-+Restrictions
-+    Can only be issued before the AR6000 starts an ad hoc network
-+
-+See Also
-+    \93SET_BEACON_INT\94
-+
-+=====================================================================
-+
-+
-+
-+Name
-+    SET_LISTEN_INT
-+
-+Synopsis
-+    The host uses this command to request a listen interval, which determines how often
-+    the AR6000 device should wake up and listen for traffic. The listen interval can be set
-+    by the TUs or by the number of beacons. The device may not be able to comply with
-+    the request (e.g., if the beacon interval is greater than the requested listen interval, the
-+    device sets the listen interval to the beacon interval). The actual listen interval used
-+    by the device is available in the \93CONNECT\94 event.
-+
-+Command
-+    wmiconfig eth1 --listen=<#of TUs, can range from 15 to 3000>
-+
-+    --listenbeacons=<#of beacons, can range from 1 to 50>
-+
-+Command Parameters
-+    UINT16    listenInterval
-+        Specifies the listen interval in Kms
-+        (1024 ms), ranging from 100 to 1000
-+
-+    UINT16    listenbeacons
-+        Specifies the listen interval in beacons,
-+        ranging from 1 to 50
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    The device sets the listen interval equal to the beacon interval of the AP it associates
-+    to.
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_LPREAMBLE
-+
-+Synopsis
-+    Overrides the short preamble capability of the AR6000 device
-+
-+Command
-+    TBD
-+
-+Command Parameters
-+    WMI_LPREAMBLE_DISABLED
-+        The device is short-preamble capable
-+
-+    WMI_LPREAMBLE_ENABLED
-+        The device supports only the long-
-+    preamble mode
-+
-+Command Values
-+    None
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+
-+=====================================================================
-+
-+Name
-+    SET_MAX_SP_LEN
-+
-+Synopsis
-+    Set the maximum service period; indicates the number of packets the AR6001 can
-+    receive from the AP when triggered
-+
-+Command
-+    wmiconfig eth1 --setMaxSPLength <maxSPLen>
-+
-+Command Parameters
-+    UINT8    maxSPLen
-+        An APSD_SP_LEN_TYPE value
-+
-+Command Values
-+    {
-+        DELIVER_ALL_PKT  = 0x0
-+        DELIVER_2_PKT    = 0x1
-+        DELIVER_4_PKT    = 0x2
-+        DELIVER_6_PKT    = 0x3
-+    }APSD_SP_LEN_TYPE
-+
-+
-+Reset Values
-+    maxSPLen is DELIVER_ALL_PKT
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_OPT_MODE
-+
-+Synopsis
-+    Special feature, sets the special mode on/off
-+
-+Command
-+    wmiconfig eth1 --mode <mode>
-+    Set the optional mode, where mode is special or off
-+
-+Command Parameters
-+    enum {
-+        SPECIAL_OFF
-+        SPECIAL_ON
-+    } OPT_MODE_TYPE;
-+
-+Command Values
-+
-+Reset Value
-+    Mode = Off
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_PMKID
-+
-+Synopsis
-+    The host uses this command to enable or disable a pairwise master key ID (PMKID)
-+    in the AR6000 PMKID cache. The AR6000 clears its PMKID cache on receipt of a
-+    DISCONNECT command from the host. Individual entries in the cache might be
-+    deleted as the AR6000 detect new APs and decides to remove old ones.
-+
-+Command
-+    wmiconfig eth1 --setbsspmkid --bssid=<aabbccddeeff>
-+    --bsspmkid=<pmkid>
-+
-+Command Parameters
-+    UINT8    bssid[6]
-+        The MAC address of the AP that the
-+        PMKID corresponds to (6 bytes in hex
-+        format)
-+
-+    UINT8    enable
-+        Either PMKID_DISABLE (0) to disable
-+        the PMKID or PMKID_ENABLE (1) to
-+        enable it (16 bytes in hex format)
-+
-+    UINT8    pmkid[16]
-+        Meaningful only if enable is
-+        PMKID_ENABLE, when it is the PMKID
-+        that the AR6000 should use on the next
-+        reassociation with the specified AP
-+
-+Command Values
-+    enable
-+    = 0 (disable), 1 (enable)
-+    PKMID enabled/disabled
-+
-+Reset Values
-+    None defined
-+
-+Restrictions
-+    Only supported in infrastructure networks
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_PMKID_LIST_CMD
-+
-+Synopsis
-+    Configures the list of PMKIDs on the firmware.
-+
-+Command
-+    wmiconfig --setpmkidlist --numpmkid=<n> --pmkid=<pmkid_1>
-+    ... --pmkid=<pmkid_n>
-+
-+    Where n is the number of pmkids (maximum = 8) and pmkid_i is the ith pmkid (16
-+    bytes in hex format)
-+
-+Command Parameters
-+    {
-+        A_UINT8 pmkid[WMI_PMKID_LEN];
-+    } __ATTRIB_PACK WMI_PMKID;
-+
-+    {
-+        A_UINT32 numPMKID;
-+        WMI_PMKID pmkidList[WMI_MAX_PMKID_CACHE];
-+    } __ATTRIB_PACK WMI_SET_PMKID_LIST_CMD;
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    None
-+
-+Restrictions
-+    Supported only in infrastructure modes
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_POWER_MODE
-+
-+Synopsis
-+    The host uses this command to provide the AR6000 device with guidelines on the
-+    desired trade-off between power utilization and performance.
-+
-+        In normal power mode, the device enters a sleep state if they have nothing to do,
-+        which conserves power but may cost performance as it can take up to 2 ms to
-+        resume operation after leaving sleep state.
-+
-+        In maximum performance mode, the device never enters sleep state, thus no time
-+        is spent waking up, resulting in higher power consumption and better
-+        performance.
-+
-+Command
-+    TBD
-+
-+Command Parameters
-+    UINT8    powerMode
-+        WMI_POWER_MODE value
-+    {
-+        REC_POWER   = 1
-+            (Recommended setting) Tries to conserve
-+            power without sacrificing performance
-+        MAX_PERF_POWER    = 2
-+            Setting that maximizes performance at
-+            the expense of power
-+
-+            All other values are reserved
-+    } WMI_POWER_MODE
-+
-+Command Values
-+    See command parameters
-+
-+Reset Values
-+    powerMode is REC_POWER
-+
-+Restrictions
-+    This command should only be issued in the DISCONNECTED state for the
-+    infrastructure network.
-+
-+            For a PM-disabled ad hoc network, the power mode should remain in
-+            MAX_PERF_POWER.
-+
-+            For a PM-enabled ad hoc network, the device can have REC_POWER or
-+            MAX_PERF_POWER set, but either way it must follow the power save ad hoc
-+            protocol. The host can change power modes in the CONNECTED state.
-+
-+    Host changes to the PS setting when the STA is off the home channel take no effect
-+    and cause a TARGET_PM_FAIL event.
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_POWER_PARAMS
-+
-+Synopsis
-+    The host uses this command to configure power parameters
-+
-+Command
-+    wmiconfig eth1 --pmparams --it=<ms> --np=<number of PS POLL>
-+    --dp=<DTIM policy: ignore/normal/stick>
-+
-+Command Parameters
-+    UINT16    idle_period
-+        Length of time (in ms) the AR6000 device
-+        remains awake after frame Rx/Tx before going
-+        to SLEEP state
-+
-+    UINT16    pspoll_number
-+            The number of PowerSavePoll (PS-poll)
-+            messages the device should send before
-+            notifying the AP it is awake
-+
-+    UINT16    dtim_policy
-+            A WMI_POWER_PARAMS_CMD value
-+
-+    {
-+        IGNORE_DTIM    =1
-+            The device does not listen to any content after
-+            beacon (CAB) traffic
-+        NORMAL_DTIM    = 2
-+            DTIM period follows the listen interval (e.g., if
-+            the listen interval is 4 and the DTIM period is 2,
-+            the device wakes up every fourth beacon)
-+        STICK_DTIM    = 3
-+            Device attempt to receive all CAB traffic (e.g., if
-+            the DTIM period is 2 and the listen interval is 4,
-+            the device wakes up every second beacon)
-+    } WMI_POWER_PARAMS_CMD
-+
-+Command Parameters
-+    See command parameters
-+
-+Reset Values
-+    idle_period
-+        200 ms
-+
-+    pspoll_number
-+    = 1
-+
-+    dtim_policy
-+    = NORMAL_DTIM
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_POWERSAVE_PARAMS
-+
-+Synopsis
-+    Set the two AR6000 power save timers (PS-POLL timer and APSD trigger timer) and
-+    the two ASPD TIM policies
-+
-+Command
-+    wmiconfig eth1--psparams --psPollTimer=<psPollTimeout in ms>
-+    --triggerTimer=<triggerTimeout in ms> --apsdTimPolicy=<ignore/
-+    adhere> --simulatedAPSDTimPolicy=<ignore/adhere>
-+
-+Command Parameters
-+    typedef struct {
-+        A_UINT16    psPollTimeout;
-+            Timeout (in ms) after sending PS-POLL; the
-+            AR6000 device sleeps if it does not receive a
-+            data packet from the AP
-+
-+        A_UINT16    triggerTimeout;
-+            Timeout (in ms) after sending a trigger; the
-+            device sleeps if it does not receive any data
-+            or null frame from the AP
-+
-+        APSD_TIM_POLICY    apsdTimPolicy;
-+            TIM behavior with queue APSD enabled
-+
-+        APSD_TIM_POLICY    simulatedAPSD
-+
-+        TimPolicy;
-+            TIM behavior with simulated APSD
-+            enabled
-+
-+    typedef enum {
-+        IGNORE_TIM_ALL_QUEUES_APSD = 0,
-+        PROCESS_TIM_ALL_QUEUES_APSD = 1,
-+        IGNORE_TIM_SIMULATED_APSD = 2,
-+        POWERSAVE_TIMERS_POLICY = 3,
-+    } APSD_TIM_POLICY;
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    psPollTimeout is 50 ms; triggerTimeout is 10 ms;
-+    apsdTimPolicy = IGNORE_TIM_ALL_QUEUES_APSD;
-+    simulatedAPSDTimPolicy = POWERSAVE_TIMERS_POLICY
-+
-+Restrictions
-+    When this command is used, all parameters must be set; this command does not
-+    allow setting only one parameter.
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_PROBED_SSID
-+
-+Synopsis
-+    The host uses this command to provide a list of up to MAX_PROBED_SSID_INDEX
-+    (six) SSIDs that the AR6000 device should actively look for. It lists the active SSID
-+    table. By default, the device actively looks for only the SSID specified in the
-+    \93CONNECT_CMD\94 command, and only when the regulatory domain allows active
-+    probing. With this command, specified SSIDs are probed for, even if they are hidden.
-+
-+Command
-+    wmiconfig eth1 --ssid=<ssid> [--num=<index>]
-+
-+Command Parameters
-+    {
-+        A_UINT8    numSsids
-+            A number from 0 to
-+            MAX_PROBED_SSID_INDEX indicating
-+            the active SSID table entry index for this
-+            command (if the specified entry index
-+            already has an SSID, the SSID specified in
-+            this command replaces it)
-+
-+        WMI_PROBED_SSID_INFO    probedSSID[1]
-+    } WMI_PROBED_SSID_CMD
-+
-+    {
-+        A_UINT8    flag
-+            WMI_SSID_FLAG indicates the current
-+            entry in the active SSID table
-+        A_UINT8    ssidLength
-+            Length of the specified SSID in bytes.
-+            If = 0, the entry corresponding to the
-+            index is erased
-+        A_UINT8    ssid[32]
-+            SSID string actively probed for when
-+            permitted by the regulatory domain
-+    } WMI_PROBED_SSID_INFO
-+
-+Command Values
-+    WMI_SSID_FLAG
-+    {
-+         DISABLE_SSID_FLAG    = 0
-+            Disables entry
-+        SPECIFIC_SSID_FLAG    = 1
-+            Probes specified SSID
-+        ANY_SSID_FLAG    = 2
-+            Probes for any SSID
-+    } WMI_SSID_FLAG
-+
-+Reset Value
-+    The entries are unused.
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_REASSOC_MODE
-+
-+Synopsis
-+    Specify whether the disassociated frame should be sent or not upon reassociation.
-+
-+Command
-+    wmiconfig eth1 --setreassocmode <mode>
-+
-+Command Parameters
-+    UINT8    mode
-+
-+Command Values
-+    mode
-+        = 0x00
-+        Send disassoc to a previously connected AP
-+        upon reassociation
-+        = 0x01
-+        Do not send disassoc to previously connected
-+        AP upon reassociation
-+
-+Reset Values
-+    None defined
-+
-+Restrictions
-+    None
-+
-+
-+=====================================================================
-+
-+Name
-+    SET_RETRY_LIMITS
-+
-+Synopsis
-+    Allows the host to influence the number of times that the AR6000 device should
-+    attempt to send a frame before they give up.
-+
-+Command
-+    wmiconfig --setretrylimits <frameType> <trafficClass> <maxRetries>
-+    <enableNotify>
-+
-+Command Parameters
-+    {
-+        UINT8    frameType
-+            A WMI_FRAMETYPE specifying
-+            which type of frame is of interest.
-+        UINT8    trafficClass
-+            Specifies a traffic class (see
-+            \93CREATE_PSTREAM\94). This
-+            parameter is only significant when
-+            frameType = DATA_FRAMETYPE.
-+        UINT8    maxRetries
-+            Maximum number of times the
-+            device attempts to retry a frame Tx,
-+            ranging from WMI_MIN_RETRIES
-+            (2) to WMI_MAX_RETRIES (15). If
-+            the special value 0 is used,
-+            maxRetries is set to 15.
-+        A_UINT8    enableNotify
-+            Notify when enabled
-+    } WMI_RETRY_LIMIT_INFO
-+
-+    {
-+        A_UINT8    numEntries
-+        WMI_RETRY_LIMIT_INFO  retryLimitInfo[1]
-+    } WMI_SET_RETRY_LIMITS_CMD
-+
-+Command Values
-+    {
-+        MGMT_FRAMETYPE    = 0    Management frame
-+        CONTROL_FRAMETYPE = 1    Control frame
-+        DATA_FRAMETYPE    = 2    Data frame
-+    } WMI_FRAMETYPE
-+
-+Reset Values
-+    Retries are set to 15
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_ROAM_CTRL
-+
-+Synopsis
-+    Affects how the AR6000 device selects a BSS. The host uses this command to set and
-+    enable low RSSI scan parameters. The time period of low RSSI background scan is
-+    mentioned in scan period. Low RSSI scan is triggered when the current RSSI
-+    threshold (75% of current RSSI) is equal to or less than scan threshold.
-+
-+    Low RSSI roam is triggered when the current RSSI threshold falls below the roam
-+    threshold and roams to a better AP by the end of the scan cycle. During Low RSSI
-+    roam, if the STA finds a new AP with an RSSI greater than roam RSSI to floor, during
-+    scan, it roams immediately to it instead of waiting for the end of the scan cycle. See
-+    also \93Scan and Roam\94 on page C-1.
-+
-+Command
-+    wmiconfig --roam <roamctrl> <info>, where info is <scan period>
-+    <scan threshold> <roam threshold> <roam rssi floor>
-+
-+Command Parameters
-+    A_UINT8    roamCtrlType;
-+
-+Command Values
-+    WMI_FORCE_ROAM     = 1
-+    Roam to the specified BSSID
-+
-+    WMI_SET_ROAM_MODE  = 2
-+    Default, progd bias, no roam
-+
-+    WMI_SET_HOST_BIAS  = 3
-+    Set the host bias
-+
-+    WMI_SET_LOWRSSI_SCAN_PARAMS  = 4
-+    Info parameters
-+
-+    A_UINT8    bssid[ATH_MAC_LEN];
-+    WMI_FORCE_ROAM
-+
-+    A_UINT8    roamMode;
-+    WMI_SET_ROAM_MODE
-+
-+    A_UINT8    bssBiasInfo;
-+    WMI_SET_HOST_BIAS
-+
-+    A_UINT16    lowrssi_scan_period;
-+    WMI_SET_LOWRSSI_SCAN_PARAMS
-+
-+    A_INT16
-+    lowrssi_scan_threshold;
-+    WMI_SET_LOWRSSI_SCAN_PARAMS
-+
-+    A_INT16    lowrssi_roam_threshold;
-+    WMI_SET_LOWRSSI_SCAN_PARAMS
-+
-+    A_UINT8    roam_rssi_floor;
-+    WMI_SET_LOWRSSI_SCAN_PARAMS
-+
-+Reset Value
-+    None defined (default lowrssi scan is disabled. Enabled only when scan period is set.)
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_RTS
-+
-+Synopsis
-+    Decides when RTS should be sent.
-+
-+Command
-+    wmiconfig eth1 --setRTS <pkt length threshold>
-+
-+Command Parameters
-+    A_UINT16
-+    threshold;
-+    Command parameter threshold in bytes. An RTS is
-+    sent if the data length is more than this threshold.
-+    The default is to NOT send RTS.
-+
-+Command Values
-+    None
-+
-+Reset Value
-+    Not to send RTS.
-+
-+Restrictions
-+    None
-+
-+
-+=====================================================================
-+
-+Name
-+    SET_SCAN_PARAMS
-+
-+Synopsis
-+    The host uses this command to set the AR6000 scan parameters, including the duty
-+    cycle for both foreground and background scanning. Foreground scanning takes
-+    place when the AR6000 device is not connected, and discovers all available wireless
-+    networks to find the best BSS to join. Background scanning takes place when the
-+    device is already connected to a network and scans for potential roaming candidates
-+    and maintains them in order of best to worst. A second priority of background
-+    scanning is to find new wireless networks.
-+
-+    The device initiates a scan when necessary. For example, a foreground scan is always
-+    started on receipt of a \93CONNECT_CMD\94 command or when the device cannot find
-+    a BSS to connect to. Foreground scanning is disabled by default until receipt of a
-+    CONNECT command. Background scanning is enabled by default and occurs every
-+    60 seconds after the device is connected.
-+
-+    The device implements a binary backoff interval for foreground scanning when it
-+    enters the DISCONNECTED state after losing connectivity with an AP or when a
-+    CONNECT command is received. The first interval is ForegroundScanStartPeriod,
-+    which doubles after each scan until the interval reaches ForegroundScanEndPeriod.
-+    If the host terminates a connection with DISCONNECT, the foreground scan period
-+    is ForegroundScanEndPeriod. All scan intervals are measured from the time a full
-+    scan ends to the time the next full scan starts. The host starts a scan by issuing a
-+    \93START_SCAN\94 command. See also \93Scan and Roam\94 on page C-1.
-+
-+Command
-+    wmiconfig eth1 --scan --fgstart=<sec> --fgend=<sec> --bg=<sec> --
-+    act=<msec> --pas=<msec> --sr=<short scan ratio> --scanctrlflags
-+    <connScan> <scanConnected> <activeScan> <reportBSSINFO>
-+
-+Command Parameters
-+    UINT16    fgStartPeriod
-+        First interval used by the device when it
-+        disconnects from an AP or receives a
-+        CONNECT command, specified in seconds (0\96
-+        65535). If = 0, the device uses the reset value.
-+        If = 65535, the device disables foreground
-+        scanning.
-+
-+    UINT16    fgEndPeriod
-+        The maximum interval the device waits between
-+        foreground scans specified in seconds (from
-+        ForegroundScanStartPeriod to 65535). If = 0, the
-+        device uses the reset value.
-+
-+    UINT16    bgScanPeriod
-+        The period of background scan specified in
-+        seconds (0\9665535). By default, it is set to the reset
-+        value of 60 seconds. If 0 or 65535 is specified, the
-+        device disables background scanning.
-+
-+    UINT16    maxactChDwellTime
-+        The period of time the device stays on a
-+        particular channel while active scanning. It is
-+        specified in ms (10\9665535). If the special value of
-+        0 is specified, the device uses the reset value.
-+
-+    UINT16    PasChDwellTime
-+        The period of time the device remains on a
-+        particular channel while passive scanning. It is
-+        specified in ms (10\9665535). If the special value of
-+        0 is specified, the device uses the reset value.
-+
-+    UINT8    shortScanRatio
-+        Number of short scans to perform for each
-+        long scan.
-+
-+    UINT8    scanCtrlFlasgs
-+
-+    UINT16    minactChDwellTime
-+        Specified in ms
-+
-+    UINT32    maxDFSchActTime
-+        The maximum time a DFS channel can stay
-+        active before being marked passive, specified in
-+        ms.
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    ForegroundScanStart
-+Period
-+        1 sec
-+
-+    ForegroundScanEndPeriod
-+        60 sec
-+
-+    BackgroundScanPeriod
-+        60 sec
-+
-+    ActiveChannelDwellTime
-+        105 ms
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_TKIP_COUNTERMEASURES
-+
-+Synopsis
-+    The host issues this command to tell the target whether to enable or disable TKIP
-+    countermeasures.
-+
-+Command
-+    TBD
-+
-+Command Parameters
-+    UINT8    WMI_TKIP_CM_ENABLE
-+        Enables the countermeasures
-+
-+
-+    UINT8    TKIP_CM_DISABLE
-+        Disables the countermeasures
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    By default, TKIP MIC reporting is disabled
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_TX_PWR
-+
-+Synopsis
-+    The host uses this command to specify the Tx power level of the AR6000. Cannot be
-+    used to exceed the power limit permitted by the regulatory domain. The maximum
-+    output power is limited in the chip to 31.5 dBm; the range is 0 \96 31.5 dbm.
-+
-+Command
-+    wmiconfig --power <dbM>
-+
-+Command Parameters
-+    UINT8    dbM
-+        The desired Tx power specified in dbM.
-+        If = 0, the device chooses the maximum
-+        permitted by the regulatory domain.
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    The maximum permitted by the regulatory domain
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93GET_TX_PWR\94
-+
-+
-+=====================================================================
-+
-+Name
-+    SET_VOICE_PKT_SIZE
-+
-+Synopsis
-+    If an AP does not support WMM, it has no way to differentiate voice from data.
-+    Because the voice packet is typically small, packet in size less than voicePktSize are
-+    assumed to be voice, otherwise it is treated as data.
-+
-+Command
-+    wmiconfig eth1 --setVoicePktSize <size-in-bytes>
-+
-+Command Parameters
-+    UINT16    voicePktSize
-+        Packet size in octets
-+
-+Command Values
-+    None
-+
-+Reset Values
-+    voicePktSize default is 400 bytes
-+
-+Restrictions
-+    No effect if WMM is unavailable
-+
-+
-+=====================================================================
-+
-+Name
-+    SET_WMM
-+
-+Synopsis
-+    Overrides the AR6000 device WMM capability
-+
-+Command
-+    wmiconfig eth1 --setwmm <enable>
-+
-+Command Parameters
-+    WMI_WMM_ENABLED
-+        Enables WMM
-+
-+    WMI_WMM_DISABLED
-+        Disables WMM support
-+
-+Command Values
-+    0 = disabled
-+    1 = enabled
-+
-+Reset Value
-+    WMM Disabled
-+
-+Restrictions
-+    None
-+
-+
-+=====================================================================
-+
-+Name
-+    SET_WMM_TXOP
-+
-+Synopsis
-+    Configures TxOP Bursting when sending traffic to a WMM capable AP
-+
-+Command
-+    wmiconfig eth1 --txopbursting <burstEnable>
-+
-+    <burstEnable>
-+        = 0
-+    Disallow TxOp bursting
-+
-+        = 1
-+    Allow TxOp bursting
-+
-+Command Parameters
-+    txopEnable
-+        = WMI_TXOP_DISABLED
-+        Disabled
-+
-+        = WMI_TXOP_ENABLED
-+        Enabled
-+
-+Command Values
-+    txopEnable
-+        = 0    Disabled
-+
-+        = 1    Enabled
-+
-+Reset Value
-+    Bursting is off by default
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_WOW_MODE
-+
-+Synopsis
-+    The host uses this command to enable or disable the WoW mode. When WoW mode
-+    is enabled and the host is asleep, pattern matching takes place at the target level.
-+    Only packets that match any of the pre-specified WoW filter patterns, will be passed
-+    up to the host. The host will also be woken up by the target. Packets which do not
-+    match any of the WoW patterns are discarded.
-+
-+Command
-+    wmiconfig \96setwowmode <enable/disable>
-+
-+Command Parameters
-+    A_BOOL    enable_wow
-+        Enable or disable WoW:
-+
-+Command Values
-+        = 0
-+    Disable WoW
-+
-+        = 1
-+    Enable WoW
-+
-+Reset Value
-+    None defined (default WoW mode is disabled).
-+
-+Restrictions
-+    None
-+
-+See Also
-+    \93GET_WOW_LIST\94
-+
-+
-+=====================================================================
-+
-+Name
-+    SET_WSC_STATUS
-+
-+Synopsis
-+    The supplicant uses this command to inform the target about the status of the WSC
-+    registration protocol. During the WSC registration protocol, a flag is set so the target
-+    bypasses some of the checks in the CSERV module. At the end of the registration, this
-+    flag is reset.
-+
-+Command
-+    N/A
-+
-+Command Parameters
-+    A_BOOL status
-+        = 1    WSC registration in progress
-+        = 0    WSC protocol not running
-+
-+Reply Parameters
-+    None
-+
-+Reset Value
-+    None defined (default = 0)
-+
-+Restrictions
-+    None
-+
-+
-+=====================================================================
-+
-+Name
-+    SNR_THRESHOLD_PARAMS
-+
-+Synopsis
-+    Configures how the AR6000 device monitors and reports SNR of the connected BSS,
-+    used as a link quality metric.
-+
-+Command
-+    --snrThreshold <weight> <upper_threshold_1> ...
-+    <upper_threshold_4> <lower_threshold_1> ... <lower_threshold_4>
-+    <pollTimer>
-+
-+Command Parameters
-+    <weight>
-+        Share with rssiThreshold. Range in [1, 16], used
-+        in the formula to calculate average RSSI
-+
-+    <upper_threshold_x>
-+        Above thresholds expressed in db, in ascending
-+        order
-+
-+    <lower_threshold_x>
-+        Below thresholds expressed in db, in ascending
-+        order
-+
-+    <pollTimer>
-+        The signal strength sampling frequency in
-+        seconds. If polltime = 0, signal strength
-+        sampling is disabled
-+
-+Command Values
-+    None
-+
-+Reset Value
-+    None defined
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    START_SCAN
-+
-+Synopsis
-+    The host uses this command to start a long or short channel scan. All future scans are
-+    relative to the time the AR6000 device processes this command. The device performs
-+    a channel scan on receipt of this command, even if a scan was already in progress.
-+    The host uses this command when it wishes to refresh its cached database of wireless
-+    networks. The isLegacy field will be removed (0 for now) because it is achieved by
-+    setting CONNECT_PROFILE_MATCH_DONE in the CONNECT command. See also
-+    \93Scan and Roam\94
-+
-+Command
-+    wmiconfig eth1 --startscan <scan type> <forcefgscan> 0
-+    <homeDwellTime> <forceScanInterval>
-+
-+Command Parameters
-+    UINT8    scanType
-+        WMI_SCAN_TYPE
-+
-+Command Values
-+    {
-+        WMI_LONG_SCAN    =0x0
-+            Requests a full scan
-+        WMI_SHORT_SCAN   =0x1
-+            Requests a short scan
-+    } WMI_SCAN_TYPE
-+
-+    A_BOOL    forceFgScan
-+        forceFgScan
-+        = 0
-+        Disable the foreground scan
-+
-+        forceFgScan
-+        = 1
-+        Forces a foreground scan
-+
-+    A_UINT32    homeDwellTime
-+        Maximum duration in the home
-+        channel (in ms)
-+
-+    A_UINT32     forceScanInterval
-+        Time interval between scans (in ms)
-+
-+    A_UINT32     scanType
-+        WMI_SCAN_TYPE
-+
-+Reset Value
-+    Disable forcing foreground scan
-+
-+Restrictions
-+    isLegacy field will no longer be supported (pass as 0 for now)
-+
-+
-+=====================================================================
-+
-+Name
-+    SYNCHRONIZE
-+
-+Synopsis
-+    The host uses this command to force a synchronization point between the command
-+    and data paths
-+
-+Command
-+    TBD
-+
-+Command Parameters
-+    None
-+
-+
-+
-+Command Values
-+    None
-+
-+
-+
-+Reset Values
-+    None
-+
-+
-+
-+Restrictions
-+    None
-+
-+
-+=====================================================================
-+
-+Name
-+    TARGET_ERROR_REPORT_BITMASK
-+
-+Synopsis
-+    Allows the host to control \93ERROR_REPORT\94 events from the AR6000 device.
-+
-+        If error reporting is disabled for an error type, a count of errors of that type is
-+        maintained by the device.
-+
-+        If error reporting is enabled for an error type, an \93ERROR_REPORT\94 event is
-+        sent when an error occurs and the error report bit is cleared.
-+
-+    Error counts for each error type are available through the \93GET_TARGET_STATS\94
-+    command.
-+
-+Command
-+    wmiconfig eth1 --setErrorReportingBitmask
-+
-+Command Parameters
-+    UINT32    bitmask
-+        Represents the set of
-+        WMI_TARGET_ERROR_VAL error types
-+        enabled for reporting
-+
-+Command Values
-+    {
-+        WMI_TARGET_PM_ERR_FAIL    = 0x00000001
-+            Power save fails (only two cases):
-+               Retry out of null function/QoS null
-+               function to associated AP for PS
-+               indication'
-+               Host changes the PS setting when
-+               STA is off home channel
-+
-+        WMI_TARGET_KEY_NOT_FOUND    = 0x00000002
-+            No cipher key
-+        WMI_TARGET_DECRYPTION_ERR   = 0x00000004
-+            Decryption error
-+        WMI_TARGET_BMISS            = 0x00000008
-+            Beacon miss
-+        WMI_PSDISABLE_NODE_JOIN     = 0x00000010
-+            A non-PS-enabled STA joined the
-+            PS-enabled network
-+        WMI_TARGET_COM_ERR          = 0x00000020
-+            Host/target communication error
-+        WMI_TARGET_FATAL_ERR        = 0x00000040
-+            Fatal error
-+    } WMI_TARGET_ERROR_VAL
-+
-+Reset Values
-+    Bitmask is 0, and all error reporting is disabled
-+
-+Restrictions
-+    None
-+
-+
-+=====================================================================
-+WMI Events
-+
-+Event
-+    Description
-+    Page
-+
-+
-+BSSINFO
-+    Contains information describing BSSs collected during a scan
-+
-+CAC_EVENTID
-+    Indicates signalling events in admission control
-+
-+CMDERROR
-+    The AR6000 device encounters an error while attempting to process
-+    a command
-+
-+CONNECT
-+    The device has connected to a wireless network
-+
-+DISCONNECT
-+    The device lost connectivity with a wireless network
-+
-+ERROR_REPORT
-+    An error has occurred for which the host previously requested
-+    notification with the command
-+    \93TARGET_ERROR_REPORT_BITMASK\94
-+
-+EXTENSION
-+    WMI extension event
-+
-+GET_PMKID_LIST_EVENT
-+    Created in response to a \93GET_PMKID_LIST_CMD\94 command
-+
-+GET_WOW_LIST_EVENT
-+    Response to the wmiconfig \93GET_WOW_LIST\94 command to
-+    retrieve the configured WoW patterns
-+
-+NEIGHBOR_REPORT
-+    Neighbor APs that match the current profile were detected
-+
-+OPT_RX_FRAME_EVENT
-+    (Special feature) informs the host of the reception of a special frame
-+
-+PSTREAM_TIMEOUT
-+    A prioritized stream has been idle for a specified interval
-+
-+READY
-+    The AR6000 device is ready to accept commands
-+
-+REGDOMAIN
-+    The regulatory domain has changed
-+
-+REPORT_ROAM_DATA_EVENT
-+    Reports the roam time calculations made by the device
-+    (generated with a special build)
-+    \97
-+
-+REPORT_STATISTICS
-+    Reply to a \93GET_TARGET_STATS\94 command
-+
-+ROAM_TBL_EVENT
-+    Reports the roam table
-+
-+RSSI_THRESHOLD
-+    Signal strength from the connected AP has crossed the threshold
-+    defined in the \93RSSI_THRESHOLD_PARAMS\94 command
-+
-+SCAN_COMPLETE_EVENT
-+    A scan has completed (added status SCAN_ABORTED in release 2.0)
-+
-+TEST_EVENT
-+    Event generated by the TCMD
-+
-+TKIP_MICERROR
-+    TKIP MIC errors were detected
-+
-+=====================================================================
-+
-+Name
-+    BSSINFO
-+
-+Synopsis
-+    Contains information describing one or more BSSs as collected during a scan.
-+    Information includes the BSSID, SSID, RSSI, network type, channel, supported rates,
-+    and IEs. BSSINFO events are sent only after the device receives a beacon or probe-
-+    response frame that pass the filter specified in the \93SET_BSS_FILTER\94 command.
-+    BSSINFO events consist of a small header followed by a copy of the beacon or probe
-+    response frame. The 802.11 header is not present. For formats of beacon and probe-
-+    response frames please consult the IEEE 802.11 specification.
-+
-+    The beacons or probe responses containing the IE specified by the
-+    WMI_BSS_FILTER_CMD are passed to the host through the
-+    WMI_BSSINFO_EVENT. The event carries a 32-bit bitmask that indicates the IEs that
-+    were detected in the management frame. The frame type field has been extended to
-+    indicate action management frames. This would be helpful to route these frames
-+    through the same event mechanism as used by the beacon processing function.
-+
-+    If the bssFilter in the SET_BSS_FILTER matches, then the ieMask is not relevant
-+    because the BSSINFO event is sent to the host. If the bssFilter doesnot match in the
-+    beacons/probe respones, then the ieMask match dictates whether the BSSINFO
-+    event is sent to the host. In the case of action management frames, the ieMask is the
-+    filter that is applied.
-+
-+Event ID
-+    0x1004
-+
-+Event Parameters
-+    typedef struct {
-+        A_UINT16    channel;
-+            Specifies the frequency (in MHz) where the
-+            frame was received
-+        A_UINT8    frameType;
-+            A WMI_BI_FTYPE value
-+        A_UINT8    snr;
-+        A_INT16    rssi;
-+            Indicates signal strength
-+        A_UINT8    bssid[ATH_MAC_LEN];
-+        A_UINT32    ieMask;
-+    } _ATTRIB_PACK_WMI_BSS_INFO_HDR;
-+
-+    Beacon or Probe Response Frame
-+
-+Event Values
-+    {
-+        BEACON_FTYPE    = 0x1
-+            Indicates a beacon frame
-+        PROBERESP_FTYPE
-+            Indicates a probe response frame
-+        ACTION_MGMT_FTYPE
-+     } WMI_BI_FTYPE
-+
-+=====================================================================
-+
-+Name
-+    CAC_EVENTID
-+
-+Synopsis
-+    Indicates signalling events in admission control. Events are generated when
-+    admission is accepted, rejected, or deleted by either the host or the AP. If the AP does
-+    not respond to an admission request within a timeout of 500 ms, an event is
-+    generated to the host.
-+
-+Event ID
-+    0x1011
-+
-+Event Parameters
-+    UINT8
-+    ac
-+    Access class pertaining to the
-+signalling
-+
-+    UINT8    cac_indication
-+        Type of indication; indications are
-+        listed in WMI_CAC_INDICATION
-+
-+    UINT8    statusCode
-+        AP response status code for a
-+        request
-+
-+    UINT8    tspecSuggestion[63]
-+        Suggested TSPEC from AP
-+
-+Event Values
-+    {
-+        CAC_INDICATION_ADMISSION = 0x00
-+        CAC_INDICATION_ADMISSION_RESP    = 0x01
-+        CAC_INDICATION_DELETE    = 0x02
-+        CAC_INDICATION_NO_RESP   = 0x03
-+    } WMI_CAC_INDICATION
-+
-+
-+=====================================================================
-+
-+
-+Name
-+    CMDERROR
-+
-+Synopsis
-+    Indicates that the AR6000 device encountered an error while attempting to process a
-+    command. This error is fatal and indicates that the device requires a reset.
-+
-+Event ID
-+    0x1005
-+
-+Event Parameters
-+    UINT16    commandId
-+        Corresponds to the command which generated
-+        the error
-+    UINT8    errorCode
-+        A WMI_ERROR_CODE value
-+
-+Event Values
-+    {
-+        INVALID_PARAM    = 1
-+            Invalid parameter
-+        ILLEGAL_STATE    = 2
-+            Illegal state
-+        INTERNAL_ERROR   = 3
-+            Internal Error
-+        All other values reserved
-+    } WMI_ERROR_CODE
-+
-+
-+=====================================================================
-+
-+
-+Name
-+    CONNECT
-+
-+Synopsis
-+    Signals that the AR6000 connected to a wireless network. Connection occurs due to a
-+    \93CONNECT\94 command or roaming to a new AP. For infrastructure networks, shows
-+    that the AR6000 successfully performed 802.11 authentication and AP association.
-+
-+Event ID
-+    0x1002
-+
-+Event Parameters
-+    UINT16    channel
-+        Channel frequency (in MHz) of the network the
-+        AR6000 are connected to
-+
-+    UINT8    bssid[6]
-+        MAC address of the AP the AR6000 are
-+        connected to or the BSSID of the ad hoc
-+        network
-+
-+    UINT16    listenInterval
-+        Listen interval (in Kms) that the AR6000 are
-+        using
-+
-+    UINT 8    beaconIeLen
-+        Length (in bytes) of the beacon IEs
-+
-+    UINT8    assocInfo
-+        Pointer to an array containing beacon IEs,
-+        followed first by association request IEs then by
-+        association response IEs
-+
-+    UINT8    assocReqLen
-+        Length (in bytes) of the assocReqIEs array
-+
-+    UINT8    assocRespLen
-+        Length (in bytes) of the assocRespIEs array
-+
-+Event Values
-+    None defined
-+
-+=====================================================================
-+
-+
-+Name
-+    DISCONNECT
-+
-+Synopsis
-+    Signals that the AR6000 device lost connectivity with the wireless network.
-+    DISCONENCT is generated when the device fails to complete a \93CONNECT\94
-+    command or as a result of a transition from a connected state to disconnected state.
-+
-+    After sending the \93DISCONNECT\94 event the device continually tries to re-establish
-+    a connection. A LOST_LINK occurs when STA cannot receive beacons within the
-+    specified time for the SET_BMISS_TIME command.
-+
-+Event ID
-+    0x1003
-+
-+Event Parameters
-+    UINT8    disconnect
-+        Reason
-+        A WMI_DISCONNECT_REASON value
-+
-+    UINT8    bssid[6]
-+        Indicates which BSS the device was connected to
-+
-+    UINT8    assocRespLen
-+        Length of the 802.11 association response frame
-+        that triggered this event, or 0 if not applicable
-+
-+    UINT8    assocInfo[assocRespLen]
-+        Copy of the 802.11 association response frame
-+
-+Event Values
-+    {
-+        NO_NETWORK_AVAIL    =0x01
-+            Indicates that the device was unable to
-+            establish or find the desired network
-+        LOST_LINK    =0x02
-+            Indicates the devices is no longer receiving
-+            beacons from the BSS it was previously
-+            connected to
-+
-+        DISCONNECT_CMD  =0x03
-+            Indicates a \93DISCONNECT\94 command was
-+            processed
-+        BSS_DISCONNECTED =0x04
-+            Indicates the BSS explicitly disconnected the
-+            device. Possible mechanisms include the AP
-+            sending 802.11 management frames
-+            (e.g., disassociate or deauthentication
-+            messages).
-+        AUTH_FAILED    =0x05
-+            Indicates that the device failed 802.11
-+            authentication with the BSS
-+        ASSOC_FAILED    =0x06
-+            Indicates that the device failed 802.11
-+            association with the BSS
-+        NO_RESOURCES_AVAIL    =0x07
-+            Indicates that a connection failed because the
-+            AP had insufficient resources to complete the
-+            connection
-+        CSERV_DISCONNECT    =0x08
-+            Indicates that the device\92s connection services
-+            module decided to disconnect from a BSS,
-+            which can happen for a variety of reasons (e.g.,
-+            the host marks the current connected AP as a
-+            bad AP).
-+        INVALID_PROFILE    =0x0A
-+            Indicates that an attempt was made to
-+            reconnect to a BSS that no longer matches the
-+            current profile
-+        All other values are reserved
-+    } WMI_DISCONNECT_REASON
-+
-+
-+=====================================================================
-+
-+
-+Name
-+    ERROR_REPORT
-+
-+Synopsis
-+    Signals that a type of error has occurred for which the host previously requested
-+    notification through the \93TARGET_ERROR_REPORT_BITMASK\94 command.
-+
-+Event ID
-+    0x100D
-+
-+Event Parameters
-+    UINT32    errorVal
-+            WMI_TARGET_ERROR_VAL value. See
-+            \93TARGET_ERROR_REPORT_BITMASK\94.
-+
-+Event Values
-+    errorVal
-+    = 0x00000001
-+    Power save fails
-+
-+        = 0x00000002
-+    No cipher key
-+
-+        = 0x00000004
-+    Decryption error
-+
-+        = 0x00000008
-+    Beacon miss
-+
-+        = 0x00000010
-+    A non-power save disabled node has joined
-+    the PS-enabled network
-+
-+
-+=====================================================================
-+
-+
-+Name
-+    EXTENSION
-+
-+Synopsis
-+    The WMI is used mostly for wireless control messages to a wireless module that
-+    apply to wireless module management regardless of the target platform
-+    implementation. However, some events peripherally related to wireless management
-+    are desired during operation. These wireless extension events may be platform-
-+    specific or implementation-dependent. See \93WMI Extension Commands\94
-+
-+
-+Event ID
-+    0x1010
-+
-+
-+=====================================================================
-+
-+
-+Name
-+    GET_PMKID_LIST_EVENT
-+
-+Synopsis
-+    Generated by firmware in response to a \93GET_PMKID_LIST_CMD\94 command.
-+
-+Event Parameters
-+    typedef struct {
-+        A_UINT32    numPMKID;
-+            Contains the number of PMKIDs in the reply
-+        WMI_PMKID   pmkidList[1];
-+    } __ATTRIB_PACK WMI_PMKID_LIST_REPLY;
-+
-+Event Values
-+    None
-+
-+
-+=====================================================================
-+
-+
-+Name
-+    GET_WOW_LIST_EVENT
-+
-+Synopsis
-+    Response to the wmiconfig \96getwowlist command to retrieve the configured Wake on
-+    Wireless patterns
-+
-+Event ID
-+    0x10018
-+
-+Event Parameters
-+    {
-+
-+    A_UINT8    num_filters
-+        Total number of patterns in the list
-+    A_UINT8    this_filter_num
-+        The filter number
-+    A_UINT8    wow_mode
-+        Shows whether WoW is enabled or disabled
-+    A_UINT8    host_mode
-+        Shows whether the host is asleep or awake
-+    WOW_FILTER    wow_filters[1]
-+        List of WoW filters (pattern and mask data bytes)
-+    } WMI_GET_WOW_LIST_REPLY;
-+
-+    {
-+        Each wow_filter_list element shows:
-+    A_UINT8    wow_valid_filter
-+        Whether the filter is valid
-+    A_UINT8    wow_filter_list_id
-+        Filter List ID (23 = default)
-+    A_UINT8    wow_filter_size
-+        Size in bytes of the filter
-+    A_UINT8    wow_filter_offset
-+        Offset of the pattern to search in the data packet
-+    A_UINT8    wow_filter_mask[MASK_SIZE]
-+        The mask to be applied to the pattern
-+    A_UINT8    wow_filter_pattern[WOW_PATTERN_SIZE]
-+        The pattern that to match to wake up the host
-+    } WOW_FILTER
-+
-+Event Values
-+    None
-+
-+=====================================================================
-+
-+
-+
-+Name
-+    NEIGHBOR_REPORT
-+
-+Synopsis
-+    Indicates the existence of neighbor APs that match the current profile. The host uses
-+    this event to populate the PMKID cache on the AR6000 and/or to perform
-+    preauthentication. This event is only generated in infrastructure mode.
-+
-+    A total of numberOfAps pairs of bssid/bssFlags exist, one pair for each AP.
-+
-+Event ID
-+    0x1008
-+
-+Event Parameters
-+    UINT8    numberOfAps
-+        The number of APs reported about in
-+        this event
-+    {
-+        UINT8    bssid[6]
-+            MAC address of a neighbor AP
-+        UINT8    bssFlags
-+            A WMI_BSS_FLAGS value
-+    }[numberOfAps]
-+
-+
-+Event Values
-+    {
-+        WMI_DEFAULT_BSS_FLAGS    = 0
-+            Logical OR of 1 or more
-+        WMI_BSS_FLAGS
-+        WMI_PREAUTH_CAPABLE_BSS
-+            = 1
-+            Indicates that this AP is capable of
-+            preauthentication
-+        WMI_PMKID_VALID_BSS
-+            = 2
-+            Indicates that the AR6000 have a
-+            valid pairwise master key for this AP
-+    } WMI_BSS_FLAGS
-+
-+
-+=====================================================================
-+
-+
-+
-+Name
-+    OPT_RX_FRAME_EVENT
-+
-+Synopsis
-+    Special feature, informs host of the reception of a special frame.
-+
-+Event ID
-+    0x100E
-+
-+Event Parameters
-+    {
-+        A_UINT16    channel;
-+        A_UINT8    frameType;
-+        A_INT8    snr;
-+        A_UINT8    srcAddr[ATH_MAC_LEN];
-+        A_UINT8    bssid[ATH_MAC_LEN];
-+        }WMI_OPT_RX_INFO_HDR
-+
-+Event Values
-+    None
-+
-+=====================================================================
-+
-+
-+
-+Name
-+    PSTREAM_TIMEOUT
-+
-+Synopsis
-+    Indicates that a priority stream that got created as a result of priority-marked data
-+    flow (priority marked in IP TOS) being idle for the default inactivity interval period
-+    (specified in the \93CREATE_PSTREAM\94 command) used for priority streams created
-+    implicitly by the driver. This event is not indicated for user-created priority streams.
-+    User-created priority streams exist until the users delete them explicitly. They do not
-+    timeout due to data inactivity.
-+
-+Event ID
-+    0x1007
-+
-+Event Parameters
-+    A_UINT8
-+    trafficClass
-+    Indicated the traffic class of priority
-+    stream that timed out
-+
-+Event Values
-+    {
-+        WMM_AC_BE    = 0
-+            Best effort
-+        WMM_AC_BK    = 1
-+            Background
-+        WMM_AC_VI    = 2
-+            Video
-+        WMM_AC_VO     = 3
-+            Voice
-+    } TRAFFIC CLASS
-+
-+
-+=====================================================================
-+
-+Name
-+    READY
-+
-+Synopsis
-+    Indicates that the AR6000 device is prepared to accept commands. It is sent once after
-+    power on or reset. It also indicates the MAC address of the device.
-+
-+Event ID
-+    0x1001
-+
-+Event Parameters
-+    UINT8    macAddr[6]
-+        Device MAC address
-+    UINT8    phyCapability
-+        A WMI_PHY_CAPABILITY value. Indicates the
-+        capabilities of the device wireless module\92s radio
-+
-+Event Values
-+    {
-+        WMI_11A_CAPABILITY       = 1
-+        WMI_11G_CAPABILITY       = 2
-+        WMI_11AG_CAPABILITY      = 3
-+    } WMI_PHY_CAPABILITY
-+
-+
-+=====================================================================
-+
-+Name
-+    REGDOMAIN
-+
-+Synopsis
-+    Indicates that the regulatory domain has changed. It initially occurs when the
-+    AR6000 device reads the board data information. The regulatory domain can also
-+    change when the device is a world-mode SKU. In this case, the regulatory domain is
-+    based on the country advertised by APs per the IEEE 802.11d specification. A
-+    potential side effect of a regulatory domain change is a change in the list of available
-+    channels. Any channel restrictions that exist as a result of a previous
-+    \93SET_CHANNEL_PARAMETERS\94 command are lifted.
-+
-+Event ID
-+    0x1006
-+
-+Event Parameters
-+    UINT32    regDomain
-+        The range of 0x0000 \96 0x00FF
-+        corresponds to an ISO country code.
-+
-+    Other regCodes are reserved for world
-+    mode settings and specific regulatory
-+    domains.
-+
-+Event Values
-+    None
-+
-+
-+=====================================================================
-+
-+
-+
-+Name
-+    REPORT_STATISTICS
-+
-+Synopsis
-+    A reply to a \93GET_TARGET_STATS\94 command.
-+
-+Event ID
-+    0x100B
-+
-+Event Parameters
-+    When the statistics are sent to the host, the AR6001 clear them so that a new set of
-+    statistics are collected for the next report.
-+
-+    UINT32    tx_packets
-+    UINT32    tx_bytes
-+    UINT32    tx_unicast_pkts
-+    UINT32    tx_unicast_bytes
-+    UINT32    tx_multicast_pkts
-+    UINT32    tx_multicast_bytes
-+    UINT32    tx_broadcast_pkts
-+    UINT32    tx_broadcast_bytes
-+    UINT32    tx_rts_success_cnt
-+    UINT32    tx_packet_per_ac[4]
-+        Tx packets per AC: [0] = BE, [1] = BK,
-+        [2] = VI, [3] = VO
-+    UINT32    tx_errors
-+        Number of packets which failed Tx, due
-+        to all failures
-+    ... REPORT_STATISTICS, continued
-+    UINT32    tx_failed_cnt
-+        Number of data packets that failed Tx
-+    UINT32    tx_retry_cnt
-+        Number of Tx retries for all packets
-+    UINT32    tx_rts_fail_cnt
-+        Number of RTS Tx failed count
-+    UINT32    rx_packets
-+    UINT32    rx_bytes
-+    UINT32    rx_unicast_pkts
-+    UINT32    rx_unicast_bytes
-+    UINT32    rx_multicast_pkts
-+    UINT32    rx_multicast_bytes
-+    UINT32    rx_broadcast_pkts
-+    UINT32    rx_broadcast_bytes
-+    UINT32    rx_fragment_pkt
-+        Number of fragmented packets received
-+    UINT32    rx_errors
-+        Number of Rx errors due to all failures
-+    UINT32    rx_crcerr
-+        Number of Rx errors due to CRC errors
-+    UINT32    rx_key_cache_miss
-+        Number of Rx errors due to a key not
-+        being plumbed
-+    UINT32    rx_decrypt_err
-+        Number of Rx errors due to decryption
-+        failure
-+    UINT32    rx_duplicate_frames
-+        Number of duplicate frames received
-+    UINT32    tkip_local_mic_failure
-+        Number of TKIP MIC errors detected
-+    UINT32    tkip_counter_measures_invoked
-+        Number of times TKIP countermeasures
-+        were invoked
-+    UINT32    tkip_replays
-+        Number of frames that replayed a TKIP
-+        encrypted frame received earlier
-+    UINT32    tkip_format_errors
-+        Number of frames that did not conform
-+        to the TKIP frame format
-+    UINT32    ccmp_format_errors
-+        Number of frames that did not conform
-+        to the CCMP frame format
-+    UINT32    ccmp_replays
-+        Number of frames that replayed a CCMP
-+        encrypted frame received earlier
-+    UINT32    power_save_failure_cnt
-+        Number of failures that occurred when
-+        the AR6001 could not go to sleep
-+    UINT32    cs_bmiss_cnt
-+        Number of BMISS interrupts since
-+    connection
-+    UINT32    cs_lowRssi_cnt
-+        Number of the times the RSSI went below
-+        the low RSSI threshold
-+    UINT16    cs_connect_cnt
-+        Number of connection times
-+    UINT16    cs_disconnect_cnt
-+        Number of disconnection times
-+    UINT8    cs_aveBeacon_rssi
-+        The current averaged value of the RSSI
-+        from the beacons of the connected BSS
-+    UINT8    cs_lastRoam_msec
-+        Time that the last roaming took, in ms.
-+        This time is the difference between
-+        roaming start and actual connection.
-+
-+Event Values
-+    None defined
-+
-+
-+=====================================================================
-+
-+Name
-+    ROAM_TBL_EVENT
-+
-+Synopsis
-+    Reports the roam table, which contains the current roam mode and this information
-+    for every BSS:
-+
-+Event ID
-+    0x100F
-+
-+Event Parameters
-+    A_UINT8     bssid[ATH_MAC_LEN];
-+        BSSID
-+    A_UINT8     rssi
-+        Averaged RSSI
-+    A_UINT8     rssidt
-+        Change in RSSI
-+    A_UINT8     last_rssi
-+        Last recorded RSSI
-+    A_UINT8     roam_util
-+        Utility value used in roaming decision
-+    A_UINT8     util
-+        Base utility with the BSS
-+    A_UINT8     bias
-+        Host configured for this BSS
-+
-+Event Values
-+    roamMode
-+        Current roam mode
-+
-+        = 1
-+    RSSI based roam
-+
-+        = 2
-+    Host bias-based roam
-+
-+        = 3
-+    Lock to the current BSS
-+
-+        = 4
-+    Autonomous roaming disabled
-+
-+
-+=====================================================================
-+
-+Name
-+    RSSI_THRESHOLD
-+
-+Synopsis
-+    Alerts the host that the signal strength from the connected AP has crossed a
-+    interesting threshold as defined in a previous \93RSSI_THRESHOLD_PARAMS\94
-+    command.
-+
-+Event ID
-+    0x100C
-+
-+Event Parameters
-+    UINT8    range
-+        A WMI_RSSI_THRESHOLD_VAL
-+        value, which indicates the range of
-+        the average signal strength
-+
-+Event Values
-+    {
-+        WMI_RSSI_LOWTHRESHOLD_BELOW_LOWERVAL  = 1
-+        WMI_RSSI_LOWTHRESHOLD_LOWERVAL        = 2
-+        WMI_RSSI_LOWTHRESHOLD_UPPERVAL        = 3
-+        WMI_RSSI_HIGHTHRESHOLD_LOWERVAL       = 4
-+        WMI_RSSI_HIGHTHRESHOLD_HIGHERVAL      = 5
-+    } WMI_RSSI_THRESHOLD_VAL
-+
-+
-+=====================================================================
-+
-+Name
-+    SCAN_COMPLETE_EVENT
-+
-+Synopsis
-+    Indicates the scan status. if the Scan was not completed, this event is generated with
-+    the status A_ECANCELED.
-+
-+Event ID
-+    0x100A
-+
-+Event Parameters
-+    A_UINT8    scanStatus
-+
-+Event Values
-+    {
-+        #define     SCAN_ABORTED 16
-+        #define     SCAN_COMPLETED 0
-+        A_UINT8     scanStatus
-+            A_OK or A_ECANCELED
-+    } WMI_SCAN_COMPLETE_EVENT;
-+
-+
-+=====================================================================
-+
-+Name
-+    TEST_EVENT
-+
-+Synopsis
-+    The TCMD application uses a single WMI event (WMI_TEST_EVENTID) to
-+    communicate events from target to host. The events are parsed by the TCMD
-+    application and WMI layer is oblivious of it.
-+
-+Event ID
-+    0x1016
-+
-+Event Parameters
-+    WMI_TEST_EVENTID
-+
-+
-+Event Values
-+    None
-+
-+
-+=====================================================================
-+
-+
-+
-+Name
-+    TKIP_MICERR
-+
-+Synopsis
-+    Indicates that TKIP MIC errors were detected.
-+
-+Event ID
-+    0x1009
-+
-+Event Parameters
-+    UINT8    keyid
-+        Indicates the TKIP key ID
-+
-+    UINT8    ismcast
-+        0 = Unicast
-+        1 = Multicast
-+
-+Event Values
-+    See event parameters
-+
-+=====================================================================
-+
-+WMI Extension Commands
-+
-+The WMI EXTENSION command is used to multiplex a collection of
-+commands that:
-+
-+        Are not generic wireless commands
-+        May be implementation-specific
-+        May be target platform-specific
-+        May be optional for a host implementation
-+
-+    An extension command is sent to the AR6000 targets like any other WMI
-+command message and uses the WMI_EXTENSION. The first field of the
-+payload for this EXTENSION command is another commandId, sometimes
-+called the subcommandId, which indicates which extension command is
-+being used. A subcommandId-specific payload follows the subcommandId.
-+
-+All extensions (subcommandIds) are listed in the header file include/wmix.h.
-+See also \93WMI Extension Events\94 on page B-58.
-+
-+
-+WMI Extension Commands
-+
-+
-+GPIO_INPUT_GET
-+    Read GPIO pins configured for input
-+
-+GPIO_INTR_ACK
-+    Acknowledge and re-arm GPIO interrupts reported earlier
-+
-+GPIO_OUTPUT_SET
-+    Manage output on GPIO pins configured for output
-+
-+GPIO_REGISTER_GET
-+    Read an arbitrary GPIO register
-+
-+GPIO_REGISTER_SET
-+    Dynamically change GPIO configuration
-+
-+SET_LQTHRESHOLD
-+    Set link quality thresholds; the sampling happens at every unicast
-+    data frame Tx, if certain thresholds are met, and corresponding
-+    events are sent to the host
-+
-+
-+=====================================================================
-+
-+Name
-+    GPIO_INPUT_GET
-+
-+Synopsis
-+    Allows the host to read GPIO pins that are configured for input. The values read are
-+    returned through a \93GPIO_DATA\94 extension event.
-+
-+NOTE: Support for GPIO is optional.
-+
-+Command
-+    N/A
-+
-+Command Parameters
-+    None
-+
-+
-+
-+Reply Parameters
-+    None
-+
-+
-+Reset Value
-+    None
-+
-+
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    GPIO_INTR_ACK
-+
-+Synopsis
-+    The host uses this command to acknowledge and to re-arm GPIO interrupts reported
-+    through an earlier \93GPIO_INTR\94 extension event. A single \93GPIO_INTR_ACK\94
-+    command should be used to acknowledge all GPIO interrupts that the host knows to
-+    be outstanding (if pending interrupts are not acknowledged through
-+    \93GPIO_INTR_ACK\94, another \93GPIO_INTR\94 extension event is raised).
-+
-+NOTE: Support for GPIO is optional.
-+
-+Command
-+    N/A
-+
-+Command Parameters
-+    UINT32    ack_mask
-+        A mask of interrupting GPIO pins (e.g., ack_mask
-+        bit [3] acknowledges an interrupt from the pin GPIO3).
-+
-+Command Values
-+    None
-+
-+Reset Value
-+    None
-+
-+Restrictions
-+    The host should acknowledge only interrupts about which it was notified.
-+
-+
-+=====================================================================
-+
-+Name
-+    GPIO_OUTPUT_SET
-+
-+Synopsis
-+    Manages output on GPIO pins configured for output.
-+
-+    Conflicts between set_mask and clear_mask or enable_mask and disable_mask result
-+    in undefined behavior.
-+
-+NOTE: Support for GPIO is optional.
-+
-+Command
-+    N/A
-+
-+Command Parameters
-+    UINT32    set_mask
-+        Specifies which pins should drive a 1 out
-+    UINT32    clear_mask
-+        Specifies which pins should drive a 0 out
-+    UINT32    enable_mask
-+        Specifies which pins should be enabled for output
-+    UINT32    disable_mask
-+        Specifies which pins should be disabled for output
-+
-+Command Values
-+    None
-+
-+
-+Reset Value
-+    None
-+
-+
-+Restrictions
-+    None
-+
-+
-+
-+=====================================================================
-+
-+
-+Name
-+    GPIO_REGISTER_GET
-+
-+Synopsis
-+    Allows the host to read an arbitrary GPIO register. It is intended for use during
-+    bringup/debug. The target responds to this command with a \93GPIO_DATA\94 event.
-+
-+NOTE: Support for GPIO is optional.
-+
-+Command
-+    N/A
-+
-+Command Parameters
-+    UINT32
-+    gpioreg_id
-+    Specifies a GPIO register identifier, as defined
-+in include/AR6000/AR6000_gpio.h
-+
-+Reply Parameters
-+    None
-+
-+Reset Value
-+    N/A
-+
-+Restrictions
-+    None
-+
-+
-+=====================================================================
-+
-+Name
-+    GPIO_REGISTER_SET
-+
-+Synopsis
-+    Allows the host to dynamically change GPIO configuration (usually handled
-+    statically through the GPIO configuration DataSet).
-+
-+NOTE: Support for GPIO is optional.
-+
-+Command
-+    N/A
-+
-+Command Parameters
-+    UINT32    gpioreg_id
-+        Specifies a GPIO register identifier, as defined in
-+        include/AR6000/AR6000_gpio.h
-+    UINT32    value
-+        Specifies a value to write to the specified
-+        GPIO register
-+
-+Command Values
-+    None
-+
-+
-+Reset Value
-+    Initial hardware configuration is as defined in the AR6001 or AR6002 ROCmTM
-+    Single-Chip MAC/BB/Radio for 2.4/5 GHz Embedded WLAN Applications data sheet. This
-+    configuration is modified by the GPIO Configuration DataSet, if one exists.
-+
-+Restrictions
-+    None
-+
-+
-+=====================================================================
-+
-+
-+Name
-+    SET_LQTHRESHOLD
-+
-+Synopsis
-+    Set link quality thresholds, the sampling happens at every unicast data frame Tx, if
-+    certain threshold is met, corresponding event will be sent to host.
-+
-+Command
-+    wmiconfig eth1 --lqThreshold <enable> <upper_threshold_1>...
-+    <upper_threshold_4> <lower_threshold_1>... <lower_threshold_4>
-+
-+Command Parameters
-+    A_UINT8   enable;
-+    A_UINT8   thresholdAbove1_Val;
-+    A_UINT8   thresholdAbove2_Val;
-+    A_UINT8   thresholdAbove3_Val;
-+    A_UINT8   thresholdAbove4_Val;
-+    A_UINT8   thresholdBelow1_Val;
-+    A_UINT8   thresholdBelow2_Val;
-+    A_UINT8   thresholdBelow3_Val;
-+    A_UINT8   thresholdBelow4_Val;
-+
-+Command Values
-+    enable
-+    = 0
-+    Disable link quality sampling
-+
-+        = 1
-+    Enable link quality sampling
-+
-+
-+    thresholdAbove_Val
-+    [1...4]
-+    Above thresholds (value in [0,100]), in ascending
-+    order threshold
-+
-+    Below_Val [1...4] = below thresholds (value
-+    in [0,100]), in ascending order
-+
-+Reset Values
-+    None
-+
-+Restrictions
-+    None
-+
-+=====================================================================
-+WMI Extension Events
-+
-+The WMI EXTENSION event is used for a collection of events that:
-+
-+    Are not generic wireless events
-+    May be implementation-specific
-+    May be target platform-specific
-+    May be optional for a host implementation
-+
-+    An extension event is sent from the AR6000 device targets to the host just like
-+any other WMI event message, using the WMI_EXTENSION_EVENTID. The
-+first field of the payload for this \93EXTENSION\94 event is another commandId
-+(sometimes called the subcommandId) that indicates which \93EXTENSION\94
-+event is being used. A subcommandId-specific payload follows the
-+subcommandId.
-+
-+All extensions (subcommandIds) are listed in the header file include/wmix.h.
-+See also \93WMI Extension Commands\94 on page B-55.
-+
-+
-+WMI Extension Events
-+
-+
-+GPIO_ACK
-+    Acknowledges a host set command has been processed by the device
-+
-+GPIO_DATA
-+    Response to a host\92s request for data
-+
-+GPIO_INTR
-+    Signals that GPIO interrupts are pending
-+
-+
-+=====================================================================
-+
-+Name
-+    GPIO_ACK
-+
-+Synopsis
-+    Acknowledges that a host set command (either \93GPIO_OUTPUT_SET\94 or
-+    \93GPIO_REGISTER_SET\94) has been processed by the AR6000 device.
-+
-+NOTE: Support for GPIO is optional.
-+
-+Event ID
-+    N/A
-+
-+Event Parameters
-+    None
-+
-+
-+Event Values
-+    None
-+
-+=====================================================================
-+
-+
-+Name
-+    GPIO_DATA
-+
-+Synopsis
-+    The AR6000 device uses this event to respond to the host\92s earlier request for data
-+    (through either a \93GPIO_REGISTER_GET\94 or a \93GPIO_INPUT_GET\94 command).
-+
-+NOTE: Support for GPIO is optional.
-+
-+Event ID
-+    N/A
-+
-+Event Parameters
-+    UINT32    value
-+        Holds the data of interest, which is either a register value
-+        (in the case of \93GPIO_REGISTER_GET\94) or a mask of
-+        pin inputs (in the case of \93GPIO_INPUT_GET\94).
-+    UINT32    reg_id
-+        Indicates which register was read (in the case of
-+        \93GPIO_REGISTER_GET\94) or is GPIO_ID_NONE (in the
-+        case of \93GPIO_INPUT_GET\94)
-+
-+Event Values
-+    None
-+
-+
-+=====================================================================
-+
-+
-+
-+Name
-+    GPIO_INTR
-+
-+Synopsis
-+    The AR6000 device raises this event to signal that GPIO interrupts are pending.
-+    These GPIOs may be interrupts that occurred after the last \93GPIO_INTR_ACK\94
-+    command was issued, or may be GPIO interrupts that the host failed to acknowledge
-+    in the last \93GPIO_INTR_ACK\94. The AR6000 will not raise another GPIO_INTR
-+    event until this event is acknowledged through a \93GPIO_INTR_ACK\94 command.
-+
-+NOTE: Support for GPIO is optional.
-+
-+Event ID
-+    N/A
-+
-+Event Parameters
-+    UINT32    intr_mask
-+        Indicates which GPIO interrupts are currently pending
-+
-+    UINT32    input_values
-+        A recent copy of the GPIO input values, taken at the
-+        time the most recent GPIO interrupt was processed
-+
-+Event Values
-+    None
-+
-+
-+
-+=====================================================================
-+#endif
-diff --git a/drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h b/drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h
-new file mode 100644
-index 0000000..57844bc
---- /dev/null
-+++ b/drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h
-@@ -0,0 +1,71 @@
-+#ifndef _WMI_HOST_H_
-+#define _WMI_HOST_H_
-+/*
-+ * Copyright (c) 2004-2006 Atheros Communications Inc.
-+ * All rights reserved.
-+ *
-+ * This file contains local definitios for the wmi host module.
-+ *
-+ * $Id: //depot/sw/releases/olca2.0-GPL/host/wmi/wmi_host.h#1 $
-+ *
-+ *
-+ *  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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *
-+ *
-+ */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+struct wmi_stats {
-+    A_UINT32    cmd_len_err;
-+    A_UINT32    cmd_id_err;
-+};
-+
-+struct wmi_t {
-+    A_BOOL                          wmi_ready;
-+    A_BOOL                          wmi_numQoSStream;
-+    A_UINT8                         wmi_wmiStream2AcMapping[WMI_PRI_MAX_COUNT];
-+    WMI_PRI_STREAM_ID               wmi_ac2WmiStreamMapping[WMM_NUM_AC];
-+    A_UINT16                        wmi_streamExistsForAC[WMM_NUM_AC];
-+    A_UINT8                         wmi_fatPipeExists;
-+    void                           *wmi_devt;
-+    struct wmi_stats                wmi_stats;
-+    struct ieee80211_node_table     wmi_scan_table;
-+    A_UINT8                         wmi_bssid[ATH_MAC_LEN];
-+    A_UINT8                         wmi_powerMode;
-+    A_UINT8                         wmi_phyMode;
-+    A_UINT8                         wmi_keepaliveInterval;
-+    A_MUTEX_T                       wmi_lock;
-+};
-+
-+#define WMI_INIT_WMISTREAM_AC_MAP(w) \
-+{  (w)->wmi_wmiStream2AcMapping[WMI_BEST_EFFORT_PRI] = WMM_AC_BE; \
-+   (w)->wmi_wmiStream2AcMapping[WMI_LOW_PRI] = WMM_AC_BK; \
-+   (w)->wmi_wmiStream2AcMapping[WMI_HIGH_PRI] = WMM_AC_VI; \
-+   (w)->wmi_wmiStream2AcMapping[WMI_HIGHEST_PRI] = WMM_AC_VO; \
-+   (w)->wmi_ac2WmiStreamMapping[WMM_AC_BE] = WMI_BEST_EFFORT_PRI; \
-+   (w)->wmi_ac2WmiStreamMapping[WMM_AC_BK] = WMI_LOW_PRI; \
-+   (w)->wmi_ac2WmiStreamMapping[WMM_AC_VI] = WMI_HIGH_PRI; \
-+   (w)->wmi_ac2WmiStreamMapping[WMM_AC_VO] = WMI_HIGHEST_PRI; }
-+
-+#define WMI_WMISTREAM_ACCESSCATEGORY(w,s)      (w)->wmi_wmiStream2AcMapping[s]
-+#define WMI_ACCESSCATEGORY_WMISTREAM(w,ac)       (w)->wmi_ac2WmiStreamMapping[ac]
-+
-+#define LOCK_WMI(w)     A_MUTEX_LOCK(&(w)->wmi_lock);
-+#define UNLOCK_WMI(w)   A_MUTEX_UNLOCK(&(w)->wmi_lock);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _WMI_HOST_H_ */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1054-atheros_2_0_hcd.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1054-atheros_2_0_hcd.patch.patch
deleted file mode 100755 (executable)
index 5b5e976..0000000
+++ /dev/null
@@ -1,1637 +0,0 @@
-From 3a9e6d01e200d3caab806474dcf870b7fc8c113d Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 22:21:24 +0100
-Subject: [PATCH] atheros_2_0_hcd.patch
-
----
- drivers/sdio/hcd/Kconfig               |   14 +
- drivers/sdio/hcd/Makefile              |    1 +
- drivers/sdio/hcd/s3c24xx/Makefile      |    2 +
- drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c | 1502 ++++++++++++++++++++++++++++++++
- drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h |   67 ++
- 5 files changed, 1586 insertions(+), 0 deletions(-)
- create mode 100644 drivers/sdio/hcd/Kconfig
- create mode 100644 drivers/sdio/hcd/Makefile
- create mode 100644 drivers/sdio/hcd/s3c24xx/Makefile
- create mode 100644 drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
- create mode 100644 drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
-
-diff --git a/drivers/sdio/hcd/Kconfig b/drivers/sdio/hcd/Kconfig
-new file mode 100644
-index 0000000..e4d8397
---- /dev/null
-+++ b/drivers/sdio/hcd/Kconfig
-@@ -0,0 +1,14 @@
-+config SDIO_S3C24XX
-+      tristate "Samsung s3c24xx host controller"
-+      depends on PLAT_S3C24XX && SDIO
-+      default m
-+      help
-+        good luck.
-+
-+config SDIO_S3C24XX_DMA
-+      bool "Samsung s3c24xx host controller DMA I/O"
-+      depends on SDIO_S3C24XX
-+      default n
-+      help
-+        good luck.
-+
-diff --git a/drivers/sdio/hcd/Makefile b/drivers/sdio/hcd/Makefile
-new file mode 100644
-index 0000000..e2401e2
---- /dev/null
-+++ b/drivers/sdio/hcd/Makefile
-@@ -0,0 +1 @@
-+obj-$(CONFIG_PLAT_S3C24XX)            += s3c24xx/
-diff --git a/drivers/sdio/hcd/s3c24xx/Makefile b/drivers/sdio/hcd/s3c24xx/Makefile
-new file mode 100644
-index 0000000..d2d099c
---- /dev/null
-+++ b/drivers/sdio/hcd/s3c24xx/Makefile
-@@ -0,0 +1,2 @@
-+obj-$(CONFIG_PLAT_S3C24XX) += sdio_s3c24xx_hcd.o
-+sdio_s3c24xx_hcd-objs := s3c24xx_hcd.o
-diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-new file mode 100644
-index 0000000..3c4758b
---- /dev/null
-+++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-@@ -0,0 +1,1502 @@
-+/*
-+ * s3c24xx_hcd.c - Samsung S3C MCI driver, Atheros SDIO API compatible.
-+ *
-+ * Copyright (C) 2007 by OpenMoko, Inc.
-+ * Written by Samuel Ortiz <sameo@openedhand.com>
-+ * 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.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/interrupt.h>
-+#include <linux/list.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/errno.h>
-+#include <linux/platform_device.h>
-+#include <linux/device.h>
-+#include <linux/clk.h>
-+#include <linux/fs.h>
-+#include <linux/ioport.h>
-+#include <linux/workqueue.h>
-+#include <linux/completion.h>
-+#include <linux/delay.h>
-+#include <linux/seq_file.h>
-+#include <linux/debugfs.h>
-+
-+#include <linux/sdio/ctsystem.h>
-+#include <linux/sdio/sdio_busdriver.h>
-+#include <linux/sdio/sdio_lib.h>
-+
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <asm/uaccess.h>
-+#include <asm/dma.h>
-+#include <asm/dma-mapping.h>
-+
-+#include <asm/arch/regs-sdi.h>
-+#include <asm/arch/regs-gpio.h>
-+#include <asm/arch/mci.h>
-+#include <asm/arch/gta02.h>
-+
-+#include "s3c24xx_hcd.h"
-+
-+#define DESCRIPTION "S3c24xx SDIO host controller"
-+#define AUTHOR "Samuel Ortiz <sameo@openedhand.com>"
-+
-+#define RESSIZE(ressource) (((ressource)->end - (ressource)->start)+1)
-+
-+static struct s3c2410_dma_client s3c24xx_hcd_dma_client = {
-+      .name           = "s3c24xx_hcd",
-+};
-+
-+extern struct platform_device s3c_device_sdi;
-+
-+static void dump_request(struct s3c24xx_hcd_context * context)
-+{
-+    if (context->hcd.pCurrentRequest != NULL) {
-+        DBG_PRINT(SDDBG_ERROR, ("Current Request Command:%d, ARG:0x%8.8X flags: 0x%04x\n",
-+                              context->hcd.pCurrentRequest->Command, context->hcd.pCurrentRequest->Argument,
-+                              context->hcd.pCurrentRequest->Flags));
-+        if (IS_SDREQ_DATA_TRANS(context->hcd.pCurrentRequest->Flags)) {
-+            DBG_PRINT(SDDBG_ERROR, ("Data %s, Blocks: %d, BlockLen:%d Remaining: %d \n",
-+                      IS_SDREQ_WRITE_DATA(context->hcd.pCurrentRequest->Flags) ? "WRITE":"READ",
-+                      context->hcd.pCurrentRequest->BlockCount,
-+                      context->hcd.pCurrentRequest->BlockLen,
-+                      context->hcd.pCurrentRequest->DataRemaining));
-+        }
-+    }
-+}
-+
-+static void s3c24xx_dump_regs(struct s3c24xx_hcd_context * context)
-+{
-+      u32 con, pre, cmdarg, cmdcon, cmdsta, r0, r1, r2, r3, timer, bsize;
-+      u32 datcon, datcnt, datsta, fsta, imask;
-+
-+      con     = readl(context->base + S3C2410_SDICON);
-+      pre     = readl(context->base + S3C2410_SDIPRE);
-+      cmdarg  = readl(context->base + S3C2410_SDICMDARG);
-+      cmdcon  = readl(context->base + S3C2410_SDICMDCON);
-+      cmdsta  = readl(context->base + S3C2410_SDICMDSTAT);
-+      r0      = readl(context->base + S3C2410_SDIRSP0);
-+      r1      = readl(context->base + S3C2410_SDIRSP1);
-+      r2      = readl(context->base + S3C2410_SDIRSP2);
-+      r3      = readl(context->base + S3C2410_SDIRSP3);
-+      timer   = readl(context->base + S3C2410_SDITIMER);
-+      bsize   = readl(context->base + S3C2410_SDIBSIZE);
-+      datcon  = readl(context->base + S3C2410_SDIDCON);
-+      datcnt  = readl(context->base + S3C2410_SDIDCNT);
-+      datsta  = readl(context->base + S3C2410_SDIDSTA);
-+      fsta    = readl(context->base + S3C2410_SDIFSTA);
-+      imask   = readl(context->base + S3C2440_SDIIMSK);
-+
-+      printk("SDICON:    0x%08x\n", con);
-+      printk("SDIPRE:    0x%08x\n", pre);
-+      printk("SDICmdArg: 0x%08x\n", cmdarg);
-+      printk("SDICmdCon: 0x%08x\n", cmdcon);
-+      printk("SDICmdSta: 0x%08x\n", cmdsta);
-+      printk("SDIRSP0:   0x%08x\n", r0);
-+      printk("SDIRSP1:   0x%08x\n", r1);
-+      printk("SDIRSP2:   0x%08x\n", r2);
-+      printk("SDIRSP3:   0x%08x\n", r3);
-+      printk("SDIDTimer: 0x%08x\n", timer);
-+      printk("SDIBSize:  0x%08x\n", bsize);
-+      printk("SDIDatCon: 0x%08x\n", datcon);
-+      printk("SDIDatCnt: 0x%08x\n", datcnt);
-+      printk("SDIDatSta: 0x%08x\n", datsta);
-+      printk("SDIFSta:   0x%08x\n", fsta);
-+      printk("SDIIntMsk: 0x%08x\n", imask);
-+}
-+
-+static inline void s3c24xx_hcd_clear_imask(struct s3c24xx_hcd_context * context)
-+{
-+      if (context->int_sdio) {
-+              writel(S3C2410_SDIIMSK_SDIOIRQ | S3C2410_SDIIMSK_READWAIT,
-+                     context->base + S3C2440_SDIIMSK);
-+      }  else {
-+              writel(0, context->base + S3C2440_SDIIMSK);
-+      }
-+}
-+
-+static inline void s3c24xx_hcd_set_imask(struct s3c24xx_hcd_context * context)
-+{
-+      writel(context->int_mask, context->base + S3C2440_SDIIMSK);
-+}
-+
-+
-+static inline void s3c24xx_hcd_clear_dsta(struct s3c24xx_hcd_context * context)
-+{
-+      u32 dsta;
-+
-+      dsta = readl(context->base + S3C2410_SDIDSTA);
-+      writel(dsta, context->base + S3C2410_SDIDSTA);
-+}
-+
-+static inline void s3c24xx_hcd_clear_csta(struct s3c24xx_hcd_context * context)
-+{
-+      u32 csta, csta_clear = 0;
-+
-+      csta = readl(context->base + S3C2410_SDICMDSTAT);
-+
-+      if (csta & S3C2410_SDICMDSTAT_CRCFAIL)
-+              csta_clear |= S3C2410_SDICMDSTAT_CRCFAIL;
-+      if (csta & S3C2410_SDICMDSTAT_CMDSENT)
-+              csta_clear |= S3C2410_SDICMDSTAT_CMDSENT;
-+      if (csta & S3C2410_SDICMDSTAT_CMDTIMEOUT)
-+              csta_clear |= S3C2410_SDICMDSTAT_CMDTIMEOUT;
-+      if (csta & S3C2410_SDICMDSTAT_RSPFIN)
-+              csta_clear |= S3C2410_SDICMDSTAT_RSPFIN;
-+
-+      writel(csta_clear, context->base + S3C2410_SDICMDSTAT);
-+}
-+
-+static inline void s3c24xx_hcd_clear_sta(struct s3c24xx_hcd_context * context)
-+{
-+      u32 csta, dsta, csta_clear = 0, dsta_clear = 0;
-+
-+      csta = readl(context->base + S3C2410_SDICMDSTAT);
-+      dsta = readl(context->base + S3C2410_SDIDSTA);
-+
-+      if (csta & S3C2410_SDICMDSTAT_CRCFAIL)
-+              csta_clear |= S3C2410_SDICMDSTAT_CRCFAIL;
-+      if (csta & S3C2410_SDICMDSTAT_CMDSENT)
-+              csta_clear |= S3C2410_SDICMDSTAT_CMDSENT;
-+      if (csta & S3C2410_SDICMDSTAT_CMDTIMEOUT)
-+              csta_clear |= S3C2410_SDICMDSTAT_CMDTIMEOUT;
-+      if (csta & S3C2410_SDICMDSTAT_RSPFIN)
-+              csta_clear |= S3C2410_SDICMDSTAT_RSPFIN;
-+
-+
-+      if (dsta & S3C2410_SDIDSTA_RDYWAITREQ)
-+              dsta_clear |= S3C2410_SDIDSTA_RDYWAITREQ;
-+      if (dsta & S3C2410_SDIDSTA_SDIOIRQDETECT)
-+              dsta_clear |= S3C2410_SDIDSTA_SDIOIRQDETECT;
-+      if (dsta & S3C2410_SDIDSTA_FIFOFAIL)
-+              dsta_clear |= S3C2410_SDIDSTA_FIFOFAIL;
-+      if (dsta & S3C2410_SDIDSTA_CRCFAIL)
-+              dsta_clear |= S3C2410_SDIDSTA_CRCFAIL;
-+      if (dsta & S3C2410_SDIDSTA_RXCRCFAIL)
-+              dsta_clear |= S3C2410_SDIDSTA_RXCRCFAIL;
-+      if (dsta & S3C2410_SDIDSTA_DATATIMEOUT)
-+              dsta_clear |= S3C2410_SDIDSTA_DATATIMEOUT;
-+      if (dsta & S3C2410_SDIDSTA_XFERFINISH)
-+              dsta_clear |= S3C2410_SDIDSTA_XFERFINISH;
-+      if (dsta & S3C2410_SDIDSTA_BUSYFINISH)
-+              dsta_clear |= S3C2410_SDIDSTA_BUSYFINISH;
-+      if (dsta & S3C2410_SDIDSTA_SBITERR)
-+              dsta_clear |= S3C2410_SDIDSTA_SBITERR;
-+
-+      writel(csta_clear, context->base + S3C2410_SDICMDSTAT);
-+      writel(dsta_clear, context->base + S3C2410_SDIDSTA);
-+}
-+
-+static inline void s3c24xx_hcd_fifo_reset(struct s3c24xx_hcd_context * context)
-+{
-+      u32 fsta;
-+
-+      fsta = readl(context->base + S3C2410_SDIFSTA);
-+      fsta |= S3C2440_SDIFSTA_FIFORESET;
-+      writel(fsta, context->base + S3C2410_SDIFSTA);
-+}
-+
-+#if 0
-+static void s3c24xx_hcd_reset(struct s3c24xx_hcd_context * context)
-+{
-+      u32 con, counter;
-+      unsigned long flags;
-+
-+      spin_lock_irqsave(&context->lock, flags);
-+
-+      con = readl(context->base + S3C2410_SDICON);
-+
-+      con |= S3C2440_SDICON_SDRESET;
-+
-+      writel(con, context->base + S3C2410_SDICON);
-+
-+      counter = 1000;
-+      while(counter) {
-+              con = readl(context->base + S3C2410_SDICON);
-+              if (!(con & S3C2440_SDICON_SDRESET))
-+                      break;
-+              counter--;
-+              mdelay(1);
-+      }
-+
-+      spin_unlock_irqrestore(&context->lock, flags);
-+}
-+#endif
-+
-+static SDIO_STATUS s3c24xx_hcd_clock_enable(struct s3c24xx_hcd_context * context,
-+                                          unsigned int clock_rate,
-+                                          unsigned char enable)
-+{
-+      SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+      unsigned long flags;
-+      u32 con;
-+
-+      spin_lock_irqsave(&context->lock, flags);
-+
-+      con = readl(context->base + S3C2410_SDICON);
-+
-+      if (enable && clock_rate) {
-+              con |= S3C2410_SDICON_CLOCKTYPE;
-+      } else {
-+              con &= ~S3C2410_SDICON_CLOCKTYPE;
-+      }
-+
-+      if (clock_rate) {
-+              int prescaler;
-+
-+              for (prescaler = 0; prescaler < 0xff; prescaler++) {
-+                      context->device.actual_clock_rate =
-+                              context->device.max_clock_rate / (prescaler + 1);
-+
-+                      if (context->device.actual_clock_rate <= clock_rate &&
-+                          context->device.actual_clock_rate <= context->hcd.MaxClockRate)
-+                              break;
-+              }
-+
-+              if (prescaler == 0xff)
-+                      DBG_PRINT(SDDBG_ERROR , ("Using lowest clock rate\n"));
-+
-+              writel(prescaler, context->base + S3C2410_SDIPRE);
-+      }
-+
-+      writel(con, context->base + S3C2410_SDICON);
-+
-+      spin_unlock_irqrestore(&context->lock, flags);
-+
-+      return SDIOErrorToOSError(status);
-+}
-+
-+static void s3c24xx_hcd_set_bus_mode(struct s3c24xx_hcd_context *context,
-+                                   PSDCONFIG_BUS_MODE_DATA pMode)
-+{
-+      u32 datacon;
-+      unsigned long flags;
-+
-+      DBG_PRINT(SDDBG_TRACE , ("SetBusMode\n"));
-+
-+      spin_lock_irqsave(&context->lock, flags);
-+      datacon = readl(context->base + S3C2410_SDIDCON);
-+
-+      switch (SDCONFIG_GET_BUSWIDTH(pMode->BusModeFlags)) {
-+        case SDCONFIG_BUS_WIDTH_1_BIT:
-+              context->bus_width = 1;
-+              datacon &= S3C2410_SDIDCON_WIDEBUS;
-+              break;
-+        case SDCONFIG_BUS_WIDTH_4_BIT:
-+              context->bus_width = 4;
-+              datacon |= S3C2410_SDIDCON_WIDEBUS;
-+              break;
-+        default:
-+              DBG_PRINT(SDDBG_TRACE , ("Unknown bus width: %d\n", SDCONFIG_GET_BUSWIDTH(pMode->BusModeFlags)));
-+              break;
-+      }
-+
-+      writel(datacon, context->base + S3C2410_SDIDCON);
-+      spin_unlock_irqrestore(&context->lock, flags);
-+
-+      /* Set clock rate and enable clock */
-+      s3c24xx_hcd_clock_enable(context, pMode->ClockRate, 1);
-+      pMode->ActualClockRate = context->device.actual_clock_rate;
-+
-+      DBG_PRINT(SDDBG_TRACE , ("BUS mode: %d bits wide, actual clock rate: %d kHz (requested %d kHz)\n",
-+                               context->bus_width, pMode->ActualClockRate / 1000, pMode->ClockRate / 1000));
-+}
-+
-+
-+static void s3c24xx_hcd_dma_complete(struct s3c24xx_hcd_context * context)
-+{
-+      u32 dsta, counter, i;
-+      PSDREQUEST req;
-+      SDIO_STATUS status = SDIO_STATUS_ERROR;
-+
-+      req = GET_CURRENT_REQUEST(&context->hcd);
-+      if (req == NULL) {
-+              DBG_PRINT(SDDBG_ERROR, ("%s(): No current request\n", __FUNCTION__));
-+              return;
-+      }
-+
-+      if (context->complete == S3C24XX_HCD_DATA_READ) {
-+              /* DMA READ completion */
-+              if (context->latest_xfer_size != req->DataRemaining) {
-+                      DBG_PRINT(SDDBG_ERROR, ("Unexpected read xfer size: %d <-> %d\n",
-+                                              context->latest_xfer_size, req->DataRemaining));
-+                      status = SDIO_STATUS_BUS_WRITE_ERROR;
-+              }
-+
-+              counter = 0;
-+              dsta = readl(context->base + S3C2410_SDIDSTA);
-+              while (!(dsta & S3C2410_SDIDSTA_XFERFINISH)) {
-+                      if (counter > 500) {
-+                              printk("read xfer timed out\n");
-+                              s3c24xx_dump_regs(context);
-+                              memcpy(req->pDataBuffer, context->io_buffer,
-+                                     req->BlockCount * req->BlockLen);
-+                              printk("Transfer: %dx%d\n", req->BlockCount, req->BlockLen);
-+                              for (i = 0; i < req->DataRemaining; i++)
-+                                      printk("0x%x ", *(((char *)context->io_buffer) + i));
-+                              printk("\n");
-+                              status = SDIO_STATUS_BUS_READ_TIMEOUT;
-+                              goto out;
-+                      }
-+                      dsta = readl(context->base + S3C2410_SDIDSTA);
-+                      counter++;
-+                      mdelay(1);
-+              };
-+
-+              dma_sync_single(NULL, context->io_buffer_dma,
-+                              req->BlockCount * req->BlockLen, DMA_BIDIRECTIONAL);
-+
-+              writel(S3C2410_SDIDSTA_XFERFINISH, context->base + S3C2410_SDIDSTA);
-+
-+              memcpy(req->pDataBuffer, context->io_buffer,
-+                     req->BlockCount * req->BlockLen);
-+
-+              req->DataRemaining = 0;
-+              status = SDIO_STATUS_SUCCESS;
-+
-+      } else if (context->complete == S3C24XX_HCD_DATA_WRITE) {
-+              /* DMA WRITE completion */
-+              if (context->latest_xfer_size != req->DataRemaining) {
-+                      DBG_PRINT(SDDBG_ERROR, ("Unexpected write xfer size: %d <-> %d\n",
-+                                              context->latest_xfer_size, req->DataRemaining));
-+                      status = SDIO_STATUS_BUS_WRITE_ERROR;
-+              }
-+
-+              dsta = readl(context->base + S3C2410_SDIDSTA);
-+              counter = 0;
-+              while (!(dsta & S3C2410_SDIDSTA_XFERFINISH)) {
-+                      if (counter > 500) {
-+                              printk("write xfer timed out\n");
-+                              status = SDIO_STATUS_BUS_WRITE_ERROR;
-+                              goto out;
-+                      }
-+                      dsta = readl(context->base + S3C2410_SDIDSTA);
-+                      counter++;
-+                      mdelay(1);
-+              };
-+
-+              writel(S3C2410_SDIDSTA_XFERFINISH, context->base + S3C2410_SDIDSTA);
-+              req->DataRemaining = 0;
-+              status = SDIO_STATUS_SUCCESS;
-+      }
-+
-+ out:
-+      req->Status = status;
-+}
-+
-+static void s3c24xx_hcd_pio_complete(struct s3c24xx_hcd_context * context)
-+{
-+      u32 fsta, counter;
-+      u8 *ptr;
-+      int fifo_count;
-+      PSDREQUEST req;
-+      SDIO_STATUS status = SDIO_STATUS_ERROR;
-+
-+      req = GET_CURRENT_REQUEST(&context->hcd);
-+      if (req == NULL) {
-+              DBG_PRINT(SDDBG_ERROR, ("%s(): No current request\n", __FUNCTION__));
-+              return;
-+      }
-+
-+      ptr = req->pDataBuffer;
-+
-+      if (context->complete == S3C24XX_HCD_DATA_READ) {
-+              counter = 0;
-+              DBG_PRINT(SDDBG_TRACE, ("Data read..."));
-+              do {
-+                      counter++;
-+                      fsta = readl(context->base + S3C2410_SDIFSTA);
-+                      mdelay(1);
-+                      if (counter > 1000) {
-+                              DBG_PRINT(SDDBG_ERROR, ("DATA read timeout\n"));
-+                              status = SDIO_STATUS_BUS_READ_TIMEOUT;
-+                              s3c24xx_dump_regs(context);
-+                              goto out;
-+                      }
-+              } while(!(fsta & S3C2410_SDIFSTA_RFDET));
-+              DBG_PRINT(SDDBG_TRACE, ("RX detected\n"));
-+
-+              while (1) {
-+                      counter = 0;
-+                      fifo_count = (readl(context->base + S3C2410_SDIFSTA) & S3C2410_SDIFSTA_COUNTMASK);
-+                      while (!fifo_count) {
-+                              counter++;
-+                              mdelay(1);
-+                              if (counter > 500) {
-+                                      s3c24xx_dump_regs(context);
-+                                      DBG_PRINT(SDDBG_ERROR, ("No more bytes in FIFO\n"));
-+                                      goto out;
-+                              }
-+                              fifo_count = (readl(context->base + S3C2410_SDIFSTA) & S3C2410_SDIFSTA_COUNTMASK);
-+                      }
-+
-+                      if (fifo_count > req->DataRemaining) {
-+                              DBG_PRINT(SDDBG_ERROR, ("DATA read, fifo_count %d > expected %d\n", fifo_count, req->DataRemaining));
-+                              fifo_count = req->DataRemaining;
-+                      }
-+
-+                      req->DataRemaining -= fifo_count;
-+                      while (fifo_count > 0) {
-+                              if (context->data_size == 4)
-+                                      *(ptr) = readl(context->base + S3C2440_SDIDATA);
-+                              else if (context->data_size == 2)
-+                                      *(ptr) = readw(context->base + S3C2440_SDIDATA);
-+                              else
-+                                      *(ptr) = readb(context->base + S3C2440_SDIDATA);
-+
-+                              ptr += context->data_size;
-+                              fifo_count -= context->data_size;
-+
-+                      }
-+
-+                      if (!req->DataRemaining) {
-+                              /* We poll for xfer finish */
-+                              counter = 0;
-+                              while (!(readl(context->base + S3C2410_SDIDSTA)
-+                                               & S3C2410_SDIDSTA_XFERFINISH)) {
-+                                      counter++;
-+                                      mdelay(1);
-+                                      if (counter > 500) {
-+                                              DBG_PRINT(SDDBG_ERROR, ("RX XFERFINISH missing\n"));
-+                                              s3c24xx_dump_regs(context);
-+                                              break;
-+                                      }
-+                              }
-+
-+                              status = SDIO_STATUS_SUCCESS;
-+                              goto out;
-+                      }
-+              }
-+
-+      } else if (context->complete == S3C24XX_HCD_DATA_WRITE) {
-+              counter = 0;
-+              DBG_PRINT(SDDBG_TRACE, ("Data write..."));
-+              do {
-+                      counter++;
-+                      fsta = readl(context->base + S3C2410_SDIFSTA);
-+                      mdelay(1);
-+                      if (counter > 1000) {
-+                              DBG_PRINT(SDDBG_ERROR, ("DATA write timeout\n"));
-+                              status = SDIO_STATUS_BUS_WRITE_ERROR;
-+                              goto out;
-+                              break;
-+                      }
-+
-+              } while(!(fsta & S3C2410_SDIFSTA_TFDET));
-+              DBG_PRINT(SDDBG_TRACE, ("TX detected\n"));
-+
-+              while (1) {
-+                      counter = 0;
-+                      fifo_count = 63 - (readl(context->base + S3C2410_SDIFSTA) & S3C2410_SDIFSTA_COUNTMASK);
-+                      while (!fifo_count) {
-+                              counter++;
-+                              mdelay(1);
-+                              if (counter > 500) {
-+                                      s3c24xx_dump_regs(context);
-+                                      DBG_PRINT(SDDBG_ERROR, ("No more space in FIFO\n"));
-+                                      goto out;
-+                              }
-+                              fifo_count = 63 - (readl(context->base + S3C2410_SDIFSTA) & S3C2410_SDIFSTA_COUNTMASK);
-+                      }
-+
-+                      if (fifo_count > req->DataRemaining)
-+                              fifo_count = req->DataRemaining;
-+
-+                              req->DataRemaining -= fifo_count;
-+
-+                              while (fifo_count > 0) {
-+                                      if (context->data_size == 4)
-+                                              writel(*(ptr), context->base + S3C2440_SDIDATA);
-+                                      else if (context->data_size == 2)
-+                                              writew(*(ptr), context->base + S3C2440_SDIDATA);
-+                                      else
-+                                              writeb(*(ptr), context->base + S3C2440_SDIDATA);
-+
-+                                      ptr += context->data_size;
-+                                      fifo_count -= context->data_size;
-+                              }
-+
-+                              if (!req->DataRemaining) {
-+                                      /* We poll for xfer finish */
-+                                      counter = 0;
-+                                      while (!(readl(context->base + S3C2410_SDIDSTA)
-+                                               & S3C2410_SDIDSTA_XFERFINISH)) {
-+                                              counter++;
-+                                              mdelay(1);
-+                                              if (counter > 500) {
-+                                                      DBG_PRINT(SDDBG_ERROR, ("RX XFERFINISH missing\n"));
-+                                                      s3c24xx_dump_regs(context);
-+                                                      break;
-+                                              }
-+                                      }
-+
-+                                      status = SDIO_STATUS_SUCCESS;
-+                                      goto out;
-+                              }
-+              }
-+
-+      } else {
-+              DBG_PRINT(SDDBG_ERROR, ("Wrong context: %d\n", context->complete));
-+      }
-+
-+ out:
-+      req->Status = status;
-+}
-+
-+static void s3c24xx_hcd_io_work(struct work_struct *work)
-+{
-+      PSDREQUEST req;
-+      SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+      struct s3c24xx_hcd_context * context =
-+              container_of(work, struct s3c24xx_hcd_context, io_work);
-+
-+      req = GET_CURRENT_REQUEST(&context->hcd);
-+      if (req == NULL) {
-+              DBG_PRINT(SDDBG_ERROR, ("%s(): No current request\n", __FUNCTION__));
-+              return;
-+      }
-+
-+      if (req->Status == SDIO_STATUS_BUS_RESP_TIMEOUT) {
-+              DBG_PRINT(SDDBG_ERROR, ("### TIMEOUT ###\n"));
-+              s3c24xx_dump_regs(context);
-+              goto out;
-+      }
-+
-+      if (context->complete == S3C24XX_HCD_NO_RESPONSE &&
-+          req->Status == SDIO_STATUS_SUCCESS) {
-+              DBG_PRINT(SDDBG_TRACE, ("CMD done, Status: %d\n", req->Status));
-+              printk("CMD done, Status: %d\n", req->Status);
-+              goto out;
-+      }
-+
-+      if ((context->complete == S3C24XX_HCD_RESPONSE_SHORT ||
-+           context->complete == S3C24XX_HCD_RESPONSE_LONG ||
-+           context->complete == S3C24XX_HCD_DATA_READ ||
-+           context->complete == S3C24XX_HCD_DATA_WRITE) &&
-+          req->Status == SDIO_STATUS_SUCCESS) {
-+              u32 resp[4];
-+
-+              /* We need to copy the response data and send it over */
-+              resp[0] = readl(context->base + S3C2410_SDIRSP0);
-+              resp[1] = readl(context->base + S3C2410_SDIRSP1);
-+              resp[2] = readl(context->base + S3C2410_SDIRSP2);
-+              resp[3] = readl(context->base + S3C2410_SDIRSP3);
-+
-+              if (GET_SDREQ_RESP_TYPE(req->Flags) != SDREQ_FLAGS_RESP_R2) {
-+                      DBG_PRINT(SDDBG_TRACE, ("SHORT response: 0x%08x\n", resp[0]));
-+                      memcpy(&req->Response[1], (u8*)resp, 4);
-+                      req->Response[5] = (readl(context->base + S3C2410_SDICMDSTAT) & 0xff);
-+              } else {
-+                      printk("LONG response: 0x%08x\n", resp[0]);
-+                      DBG_PRINT(SDDBG_TRACE, ("LONG response: 0x%08x\n", resp[0]));
-+                      memcpy(&req->Response[1], (u8*)resp, 16);
-+                      //req->Response[17] = (readl(context->base + S3C2410_SDICMDSTAT) & 0xff);
-+              }
-+
-+              /* There is a data stage */
-+              if (context->complete == S3C24XX_HCD_DATA_READ ||
-+                  context->complete == S3C24XX_HCD_DATA_WRITE) {
-+                      status = SDIO_CheckResponse(&context->hcd, req,
-+                                                  SDHCD_CHECK_DATA_TRANS_OK);
-+
-+                      if (!SDIO_SUCCESS(status)) {
-+                              DBG_PRINT(SDDBG_ERROR,
-+                                        ("Target not ready for data xfer\n"));
-+                              return;
-+                      }
-+
-+                      if (context->dma_en) {
-+                              dma_sync_single(NULL, context->io_buffer_dma,
-+                                              req->BlockCount * req->BlockLen, DMA_BIDIRECTIONAL);
-+
-+                              s3c2410_dma_ctrl(context->dma_channel, S3C2410_DMAOP_START);
-+
-+                              wait_for_completion(&context->dma_complete);
-+
-+                              s3c24xx_hcd_dma_complete(context);
-+                      } else {
-+                              s3c24xx_hcd_pio_complete(context);
-+                      }
-+              }
-+      }
-+
-+ out:
-+      s3c24xx_hcd_clear_sta(context);
-+      s3c24xx_hcd_clear_imask(context);
-+
-+      writel(0, context->base + S3C2410_SDICMDARG);
-+      writel(0, context->base + S3C2410_SDICMDCON);
-+
-+      SDIO_HandleHcdEvent(&context->hcd, EVENT_HCD_TRANSFER_DONE);
-+}
-+
-+static void s3c24xx_hcd_irq_work(struct work_struct *work)
-+{
-+      struct s3c24xx_hcd_context * context =
-+              container_of(work, struct s3c24xx_hcd_context, irq_work);
-+
-+      disable_irq(context->io_irq);
-+
-+      writel(S3C2410_SDIDSTA_SDIOIRQDETECT, context->base + S3C2410_SDIDSTA);
-+
-+      SDIO_HandleHcdEvent(&context->hcd, EVENT_HCD_SDIO_IRQ_PENDING);
-+
-+      enable_irq(context->io_irq);
-+}
-+
-+void s3c24xx_hcd_dma_done(struct s3c2410_dma_chan *dma_ch, void *buf_id,
-+                        int size, enum s3c2410_dma_buffresult result)
-+{
-+      struct s3c24xx_hcd_context * context =
-+              (struct s3c24xx_hcd_context *) buf_id;
-+
-+      if (result != S3C2410_RES_OK) {
-+              DBG_PRINT(SDDBG_ERROR, ("%s(): DMA xfer failed: %d\n", __FUNCTION__, result));
-+              s3c24xx_dump_regs(context);
-+      }
-+
-+      context->latest_xfer_size = size;
-+      complete(&context->dma_complete);
-+}
-+
-+static int s3c24xx_hcd_prepare_dma(struct s3c24xx_hcd_context * context)
-+{
-+      PSDREQUEST req;
-+      SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+      int read = 0, hwcfg = S3C2410_DISRCC_INC | S3C2410_DISRCC_APB;
-+      enum s3c2410_dmasrc source = S3C2410_DMASRC_MEM;
-+
-+      req = GET_CURRENT_REQUEST(&context->hcd);
-+      if (req == NULL) {
-+              DBG_PRINT(SDDBG_ERROR, ("%s(): No current request\n", __FUNCTION__));
-+              status = SDIO_STATUS_ERROR;
-+      }
-+
-+      if (!context->dma_en) {
-+              DBG_PRINT(SDDBG_ERROR, ("%s(): DMA is disabled\n", __FUNCTION__));
-+              status = SDIO_STATUS_ERROR;
-+      }
-+
-+      if (!IS_SDREQ_DATA_TRANS(req->Flags)) {
-+              DBG_PRINT(SDDBG_ERROR, ("%s(): No data to transfer\n", __FUNCTION__));
-+              status = SDIO_STATUS_ERROR;
-+      }
-+
-+      if(!IS_SDREQ_WRITE_DATA(req->Flags)) {
-+              read = 1;
-+              source = S3C2410_DMASRC_HW;
-+              hwcfg = S3C2410_DISRCC_APB | 1;
-+      } else {
-+              memcpy(context->io_buffer, req->pDataBuffer, req->DataRemaining);
-+              dma_sync_single(NULL, context->io_buffer_dma,
-+                              req->BlockCount * req->BlockLen, DMA_BIDIRECTIONAL);
-+
-+      }
-+
-+      s3c2410_dma_devconfig(context->dma_channel, source, hwcfg,
-+                            (unsigned long)context->mem->start + S3C2440_SDIDATA);
-+
-+      s3c2410_dma_config(context->dma_channel, context->data_size,
-+                         S3C2410_DCON_CH0_SDI);
-+                         //(S3C2410_DCON_HWTRIG | S3C2410_DCON_CH0_SDI));
-+
-+      s3c2410_dma_set_buffdone_fn(context->dma_channel, s3c24xx_hcd_dma_done);
-+
-+//    s3c2410_dma_setflags(context->dma_channel, S3C2410_DMAF_AUTOSTART);
-+
-+      s3c2410_dma_ctrl(context->dma_channel, S3C2410_DMAOP_FLUSH);
-+
-+      s3c2410_dma_enqueue(context->dma_channel, context,
-+                          context->io_buffer_dma,
-+                          req->DataRemaining);
-+
-+      return 0;
-+}
-+
-+
-+static irqreturn_t s3c24xx_hcd_irq(int irq, void *dev_id)
-+{
-+      u32 cmdsta, dsta, fsta;
-+      unsigned long flags, trace = 0;
-+      PSDREQUEST req;
-+      struct s3c24xx_hcd_context * context =
-+              (struct s3c24xx_hcd_context *)dev_id;
-+
-+      spin_lock_irqsave(&context->lock, flags);
-+
-+      s3c24xx_hcd_clear_imask(context);
-+
-+      cmdsta = readl(context->base + S3C2410_SDICMDSTAT);
-+      dsta = readl(context->base + S3C2410_SDIDSTA);
-+      fsta = readl(context->base + S3C2410_SDIFSTA);
-+
-+      context->cmdsta = cmdsta;
-+      context->dsta = dsta;
-+      context->fsta = fsta;
-+
-+      s3c24xx_hcd_clear_csta(context);
-+
-+      if (dsta & S3C2410_SDIDSTA_SDIOIRQDETECT) {
-+              writel(S3C2410_SDIDSTA_SDIOIRQDETECT, context->base + S3C2410_SDIDSTA);
-+
-+              if (context->int_sdio) {
-+                      u32 imask;
-+
-+                      context->int_sdio = 0;
-+
-+                      imask = readl(context->base + S3C2440_SDIIMSK);
-+                      imask &= ~S3C2410_SDIIMSK_SDIOIRQ;
-+                      writel(imask, context->base + S3C2440_SDIIMSK);
-+                      schedule_work(&context->irq_work);
-+              }
-+      }
-+
-+      req = GET_CURRENT_REQUEST(&context->hcd);
-+      if (req == NULL) {
-+              DBG_PRINT(SDDBG_TRACE, ("%s(): No current request\n", __FUNCTION__));
-+              goto out;
-+      }
-+
-+      if (cmdsta & S3C2410_SDICMDSTAT_CMDTIMEOUT) {
-+              DBG_PRINT(SDDBG_ERROR, ("TIMEOUT\n"));
-+              printk("TIMEOUT\n");
-+              req->Status = SDIO_STATUS_BUS_RESP_TIMEOUT;
-+              writel(S3C2410_SDICMDSTAT_CMDTIMEOUT, context->base + S3C2410_SDICMDSTAT);
-+              schedule_work(&context->io_work);
-+      }
-+
-+      if (cmdsta & S3C2410_SDICMDSTAT_CRCFAIL) {
-+              DBG_PRINT(SDDBG_ERROR, ("CRCFAIL 0x%x\n", cmdsta));
-+              printk("CRCFAIL 0x%x\n", cmdsta);
-+              req->Status = SDIO_STATUS_BUS_RESP_CRC_ERR;
-+              dump_request(context);
-+              writel(S3C2410_SDICMDSTAT_CRCFAIL, context->base + S3C2410_SDICMDSTAT);
-+              schedule_work(&context->io_work);
-+      }
-+
-+
-+      if (cmdsta & S3C2410_SDICMDSTAT_CMDSENT) {
-+              writel(S3C2410_SDICMDSTAT_CMDSENT, context->base + S3C2410_SDICMDSTAT);
-+
-+              if (context->complete == S3C24XX_HCD_NO_RESPONSE) {
-+                      req->Status = SDIO_STATUS_SUCCESS;
-+                      trace = 1;
-+                      schedule_work(&context->io_work);
-+              }
-+      }
-+
-+      if (cmdsta & S3C2410_SDICMDSTAT_RSPFIN ||
-+          (IS_SDREQ_WRITE_DATA(req->Flags) && (fsta &  S3C2410_SDIFSTA_TFDET)) ||
-+          (!IS_SDREQ_WRITE_DATA(req->Flags) && (fsta &  S3C2410_SDIFSTA_RFDET))) {
-+
-+              writel(S3C2410_SDICMDSTAT_RSPFIN, context->base + S3C2410_SDICMDSTAT);
-+
-+              if (context->complete == S3C24XX_HCD_RESPONSE_SHORT ||
-+                  context->complete == S3C24XX_HCD_RESPONSE_LONG ||
-+                  context->complete == S3C24XX_HCD_DATA_READ ||
-+                  context->complete == S3C24XX_HCD_DATA_WRITE) {
-+                      req->Status = SDIO_STATUS_SUCCESS;
-+                      if (trace)
-+                              printk("IO work already scheduled, cmdsta: 0x%x\n", cmdsta);
-+                      schedule_work(&context->io_work);
-+              }
-+      }
-+
-+ out:
-+      if (dsta & S3C2410_SDIDSTA_RDYWAITREQ) {
-+              printk("S3C2410_SDIDSTA_RDYWAITREQ\n");
-+              //writel(S3C2410_SDIDSTA_RDYWAITREQ, context->base + S3C2410_SDIDSTA);
-+      }
-+
-+      if (dsta & S3C2410_SDIDSTA_FIFOFAIL) {
-+              printk("S3C2410_SDIDSTA_FIFOFAIL\n");
-+              writel(S3C2410_SDIDSTA_FIFOFAIL, context->base + S3C2410_SDIDSTA);
-+      }
-+
-+      if (dsta & S3C2410_SDIDSTA_CRCFAIL) {
-+              printk("S3C2410_SDIDSTA_CRCFAIL\n");
-+              writel(S3C2410_SDIDSTA_CRCFAIL, context->base + S3C2410_SDIDSTA);
-+      }
-+
-+      if (dsta & S3C2410_SDIDSTA_RXCRCFAIL) {
-+              printk("S3C2410_SDIDSTA_RXCRCFAIL\n");
-+              writel(S3C2410_SDIDSTA_RXCRCFAIL, context->base + S3C2410_SDIDSTA);
-+      }
-+
-+      if (dsta & S3C2410_SDIDSTA_DATATIMEOUT) {
-+              printk("S3C2410_SDIDSTA_DATATIMEOUT\n");
-+              writel(S3C2410_SDIDSTA_DATATIMEOUT, context->base + S3C2410_SDIDSTA);
-+      }
-+
-+      if (dsta & S3C2410_SDIDSTA_BUSYFINISH) {
-+              printk("S3C2410_SDIDSTA_BUSYFINISH\n");
-+              writel(S3C2410_SDIDSTA_BUSYFINISH, context->base + S3C2410_SDIDSTA);
-+      }
-+
-+      if (dsta & S3C2410_SDIDSTA_SBITERR) {
-+              printk("S3C2410_SDIDSTA_SBIERR\n");
-+              writel(S3C2410_SDIDSTA_SBITERR, context->base + S3C2410_SDIDSTA);
-+      }
-+
-+      spin_unlock_irqrestore(&context->lock, flags);
-+      return IRQ_HANDLED;
-+}
-+
-+
-+SDIO_STATUS s3c24xx_hcd_config(PSDHCD hcd, PSDCONFIG config)
-+{
-+      u32 con, imsk;
-+      SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+      PSDCONFIG_SDIO_INT_CTRL_DATA int_data;
-+      struct s3c24xx_hcd_context * context = (struct s3c24xx_hcd_context *)hcd->pContext;
-+
-+      switch (GET_SDCONFIG_CMD(config)){
-+      case SDCONFIG_GET_WP:
-+              DBG_PRINT(SDDBG_TRACE, ("config GET_WP\n"));
-+              *((SDCONFIG_WP_VALUE *)config->pData) = 0;
-+              status = SDIO_STATUS_SUCCESS;
-+              break;
-+      case SDCONFIG_SEND_INIT_CLOCKS:
-+              DBG_PRINT(SDDBG_TRACE, ("config SEND_INIT_CLOCKS\n"));
-+
-+              /* We stop/start the clock */
-+              con = readl(context->base + S3C2410_SDICON);
-+
-+              con &= ~S3C2410_SDICON_CLOCKTYPE;
-+              writel(con, context->base + S3C2410_SDICON);
-+
-+              mdelay(100);
-+
-+              con |= S3C2410_SDICON_CLOCKTYPE;
-+              writel(con, context->base + S3C2410_SDICON);
-+
-+              mdelay(100);
-+
-+              status = SDIO_STATUS_SUCCESS;
-+              break;
-+        case SDCONFIG_SDIO_INT_CTRL:
-+              DBG_PRINT(SDDBG_TRACE, ("config SDIO_INT_CTRL\n"));
-+              int_data =  GET_SDCONFIG_CMD_DATA(PSDCONFIG_SDIO_INT_CTRL_DATA, config);
-+
-+              if (int_data->SlotIRQEnable &
-+                  (IRQ_DETECT_1_BIT | IRQ_DETECT_4_BIT | IRQ_DETECT_MULTI_BLK) ) {
-+                      imsk = readl(context->base + S3C2440_SDIIMSK);
-+
-+                      if (int_data->SlotIRQEnable) {
-+                              printk("SDIO_INT_CTRL enable IRQ\n");
-+                              DBG_PRINT(SDDBG_TRACE, ("SDIO_INT_CTRL enable IRQ\n"));
-+                              context->int_sdio = 1;
-+                              imsk |= S3C2410_SDIIMSK_SDIOIRQ;
-+                              writel(imsk, context->base + S3C2440_SDIIMSK);
-+                      } else {
-+                              printk("SDIO_INT_CTRL disable IRQ\n");
-+                              DBG_PRINT(SDDBG_TRACE, ("SDIO_INT_CTRL disable IRQ\n"));
-+                              context->int_sdio = 0;
-+                              imsk &= ~S3C2410_SDIIMSK_SDIOIRQ;
-+                              writel(imsk, context->base + S3C2440_SDIIMSK);
-+                      }
-+              }
-+              status = SDIO_STATUS_SUCCESS;
-+              break;
-+        case SDCONFIG_SDIO_REARM_INT:
-+              DBG_PRINT(SDDBG_TRACE, ("config SDIO_REARM_INT\n"));
-+
-+              context->int_sdio = 1;
-+              imsk = readl(context->base + S3C2440_SDIIMSK);
-+              imsk |= S3C2410_SDIIMSK_SDIOIRQ;
-+              writel(imsk, context->base + S3C2440_SDIIMSK);
-+
-+              status = SDIO_STATUS_SUCCESS;
-+              break;
-+      case SDCONFIG_FUNC_CHANGE_BUS_MODE:
-+        case SDCONFIG_BUS_MODE_CTRL:
-+              s3c24xx_hcd_set_bus_mode(context, (PSDCONFIG_BUS_MODE_DATA)(config->pData));
-+              DBG_PRINT(SDDBG_TRACE, ("config BUS_MODE_CTRL\n"));
-+              status = SDIO_STATUS_SUCCESS;
-+              break;
-+        case SDCONFIG_POWER_CTRL:
-+              DBG_PRINT(SDDBG_TRACE, ("config POWER_CTRL\n"));
-+              status = SDIO_STATUS_SUCCESS;
-+              break;
-+        case SDCONFIG_GET_HCD_DEBUG:
-+              DBG_PRINT(SDDBG_TRACE, ("config GET_HCD_DEBUG\n"));
-+              status = SDIO_STATUS_SUCCESS;
-+              break;
-+        case SDCONFIG_SET_HCD_DEBUG:
-+              DBG_PRINT(SDDBG_TRACE, ("config SET_HCD_DEBUG\n"));
-+              status = SDIO_STATUS_SUCCESS;
-+              break;
-+      default:
-+              /* invalid request */
-+              DBG_PRINT(SDDBG_ERROR, ("%s() - unsupported command: 0x%X\n",
-+                                     __FUNCTION__, GET_SDCONFIG_CMD(config)));
-+              status = SDIO_STATUS_INVALID_PARAMETER;
-+      }
-+
-+      return SDIOErrorToOSError(status);
-+}
-+
-+
-+SDIO_STATUS s3c24xx_hcd_request(PSDHCD hcd)
-+{
-+      SDIO_STATUS status = SDIO_STATUS_PENDING;
-+      PSDREQUEST req;
-+      u32 cmdcon, imask;
-+      unsigned long flags;
-+      struct s3c24xx_hcd_context * context =
-+              (struct s3c24xx_hcd_context *)hcd->pContext;
-+
-+      req = GET_CURRENT_REQUEST(hcd);
-+      DBG_ASSERT(req != NULL);
-+
-+      if (req->Flags & SDREQ_FLAGS_DATA_SHORT_TRANSFER)
-+              printk("### SHORT TRANSFER ###\n");
-+
-+      spin_lock_irqsave(&context->lock, flags);
-+
-+      /* Clear command, data and fifo status registers */
-+      writel(0xFFFFFFFF, context->base + S3C2410_SDICMDSTAT);
-+      writel(0xFFFFFFFF, context->base + S3C2410_SDIDSTA);
-+      writel(0xFFFFFFFF, context->base + S3C2410_SDIFSTA);
-+
-+      /* Enabling irqs */
-+      imask = S3C2410_SDIIMSK_READWAIT;
-+
-+      cmdcon = readl(context->base + S3C2410_SDICMDCON);
-+
-+        switch (GET_SDREQ_RESP_TYPE(req->Flags)) {
-+      case SDREQ_FLAGS_NO_RESP:
-+              cmdcon &= ~S3C2410_SDICMDCON_WAITRSP;
-+              context->complete = S3C24XX_HCD_NO_RESPONSE;
-+              imask |= S3C2410_SDIIMSK_CMDSENT;
-+                break;
-+      case SDREQ_FLAGS_RESP_R1:
-+      case SDREQ_FLAGS_RESP_R1B:
-+      case SDREQ_FLAGS_RESP_R3:
-+      case SDREQ_FLAGS_RESP_SDIO_R4:
-+      case SDREQ_FLAGS_RESP_SDIO_R5:
-+      case SDREQ_FLAGS_RESP_R6:
-+              cmdcon &= ~S3C2410_SDICMDCON_LONGRSP;
-+              cmdcon |= S3C2410_SDICMDCON_WAITRSP;
-+              context->complete = S3C24XX_HCD_RESPONSE_SHORT;
-+              imask |= S3C2410_SDIIMSK_CRCSTATUS | S3C2410_SDIIMSK_RESPONSEND
-+                      | S3C2410_SDIIMSK_CMDTIMEOUT | S3C2410_SDIIMSK_RESPONSECRC;
-+                break;
-+      case SDREQ_FLAGS_RESP_R2:
-+              cmdcon |= S3C2410_SDICMDCON_LONGRSP;
-+              cmdcon |= S3C2410_SDICMDCON_WAITRSP;
-+              context->complete = S3C24XX_HCD_RESPONSE_LONG;
-+              imask |= S3C2410_SDIIMSK_CRCSTATUS | S3C2410_SDIIMSK_RESPONSEND
-+                      | S3C2410_SDIIMSK_CMDTIMEOUT | S3C2410_SDIIMSK_RESPONSECRC;
-+                break;
-+
-+      }
-+
-+      /* There is a data part */
-+      if (IS_SDREQ_DATA_TRANS(req->Flags)) {
-+              u32 dcon = 0;
-+
-+              if (readl(context->base + S3C2410_SDIDSTA) &
-+                  (S3C2410_SDIDSTA_TXDATAON | S3C2410_SDIDSTA_RXDATAON)) {
-+                      printk("##### DATA ON: 0x%x ######\n", readl(context->base + S3C2410_SDIDSTA));
-+              }
-+
-+              /* Setting timer */
-+              writel(0x7fffff, context->base + S3C2410_SDITIMER);
-+
-+              /* Block size */
-+              writel(req->BlockLen, context->base + S3C2410_SDIBSIZE);
-+              /* Number of blocks */
-+              dcon |= (0xfff & req->BlockCount);
-+
-+              if (context->bus_width == 4)
-+                      dcon |= S3C2410_SDIDCON_WIDEBUS;
-+
-+              req->DataRemaining = req->BlockCount * req->BlockLen;
-+
-+              /* Set data size, and start the transfer */
-+              dcon |= S3C2410_SDIDCON_IRQPERIOD;
-+              if (!(req->DataRemaining % 4)) {
-+                      context->data_size = 4;
-+                      dcon |= S3C2440_SDIDCON_DS_WORD;
-+              } else if (!(req->DataRemaining % 2)) {
-+                      context->data_size = 2;
-+                      dcon |= S3C2440_SDIDCON_DS_HALFWORD;
-+              } else {
-+                      context->data_size = 1;
-+                      dcon |= S3C2440_SDIDCON_DS_BYTE;
-+              }
-+
-+#ifdef CONFIG_SDIO_S3C24XX_DMA
-+              if (req->DataRemaining > 16) {
-+                      context->dma_en = 1;
-+              } else
-+#endif
-+              {
-+                      context->dma_en = 0;
-+                      context->data_size = 1;
-+                      dcon |= S3C2440_SDIDCON_DS_BYTE;
-+              }
-+
-+              if (context->dma_en) {
-+                      dcon |= S3C2410_SDIDCON_DMAEN;
-+                      s3c24xx_hcd_prepare_dma(context);
-+              }
-+
-+              if (IS_SDREQ_WRITE_DATA(req->Flags)) {
-+                      /* Data write */
-+                      DBG_PRINT(SDDBG_TRACE, ("Start data write, block count=%d, block size=%d\n",
-+                                              req->BlockCount, req->BlockLen));
-+
-+                      /* Data configuration: transmit after resp, block mode*/
-+                      dcon |= S3C2410_SDIDCON_TXAFTERRESP | S3C2410_SDIDCON_BLOCKMODE;
-+
-+                      /* This is a write */
-+                      dcon |= S3C2410_SDIDCON_XFER_TXSTART;
-+
-+                      imask |= S3C2410_SDIIMSK_TXFIFOHALF | S3C2410_SDIIMSK_TXFIFOEMPTY |
-+                              S3C2410_SDIIMSK_FIFOFAIL | S3C2410_SDIIMSK_DATACRC |
-+                              S3C2410_SDIIMSK_DATATIMEOUT | S3C2410_SDIIMSK_DATAFINISH;
-+
-+                      context->complete = S3C24XX_HCD_DATA_WRITE;
-+              } else {
-+                      /* Data read */
-+                      DBG_PRINT(SDDBG_TRACE, ("Start data read, block count=%d, block size=%d\n",
-+                                              req->BlockCount, req->BlockLen));
-+
-+                      /* Data configuration: receive after cmd, block mode*/
-+                      dcon |= S3C2410_SDIDCON_RXAFTERCMD | S3C2410_SDIDCON_BLOCKMODE;
-+
-+                      /* This is a read */
-+                      dcon |= S3C2410_SDIDCON_XFER_RXSTART;
-+
-+                      imask |= S3C2410_SDIIMSK_RXFIFOHALF | S3C2410_SDIIMSK_RXFIFOLAST |
-+                              S3C2410_SDIIMSK_FIFOFAIL | S3C2410_SDIIMSK_DATACRC |
-+                              S3C2410_SDIIMSK_DATATIMEOUT | S3C2410_SDIIMSK_DATAFINISH;
-+
-+                      context->complete = S3C24XX_HCD_DATA_READ;
-+              }
-+
-+              dcon |= S3C2440_SDIDCON_DATSTART;
-+
-+              writel(dcon, context->base + S3C2410_SDIDCON);
-+
-+              cmdcon |= S3C2410_SDICMDCON_WITHDATA;
-+
-+      } else {
-+              cmdcon &= ~S3C2410_SDICMDCON_WITHDATA;
-+      }
-+
-+      cmdcon |= req->Command & S3C2410_SDICMDCON_INDEX;
-+      cmdcon |= S3C2410_SDICMDCON_SENDERHOST | S3C2410_SDICMDCON_CMDSTART;
-+
-+      req->Status = SDIO_STATUS_PENDING;
-+
-+      if (context->int_sdio)
-+              imask |= S3C2410_SDIIMSK_SDIOIRQ;
-+      context->int_mask = imask;
-+      writel(imask, context->base + S3C2440_SDIIMSK);
-+      writel(req->Argument, context->base + S3C2410_SDICMDARG);
-+      writel(cmdcon, context->base + S3C2410_SDICMDCON);
-+
-+      spin_unlock_irqrestore(&context->lock, flags);
-+
-+      return status;
-+}
-+
-+static int s3c24xx_hcd_hw_init(struct s3c24xx_hcd_context * context)
-+{
-+      SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+      u32 con, datacon;
-+
-+      /* Clock */
-+      context->device.clock = clk_get(NULL, "sdi");
-+      if (IS_ERR(context->device.clock)) {
-+              DBG_PRINT(SDDBG_ERROR, ("Couldn't get clock\n"));
-+              status = PTR_ERR(context->device.clock);
-+              context->device.clock = NULL;
-+              return status;
-+      }
-+
-+      status = clk_enable(context->device.clock);
-+      if (SDIO_IS_ERROR(status)) {
-+              DBG_PRINT(SDDBG_ERROR, ("Couldn't get clock\n"));
-+              return SDIOErrorToOSError(status);
-+      }
-+
-+      context->device.max_clock_rate = clk_get_rate(context->device.clock);
-+      context->device.actual_clock_rate = context->device.max_clock_rate;
-+
-+      /* I/O */
-+      context->mem = request_mem_region(context->mem->start,
-+                                        RESSIZE(context->mem), context->description);
-+
-+      if (!context->mem) {
-+              DBG_PRINT(SDDBG_ERROR, ("Failed to request io memory region\n"));
-+              status = -ENOENT;
-+              goto out_disable_clock;
-+      }
-+
-+      context->base = ioremap(context->mem->start, RESSIZE(context->mem));
-+      if (context->base == 0) {
-+              DBG_PRINT(SDDBG_ERROR, ("failed to ioremap() io memory region.\n"));
-+              status = -EINVAL;
-+              goto out_free_mem_region;
-+      }
-+
-+      /* IRQ */
-+#if 0
-+      context->cd_irq = s3c2410_gpio_getirq(GTA02v1_GPIO_nSD_DETECT);
-+      s3c2410_gpio_cfgpin(GTA02v1_GPIO_nSD_DETECT, S3C2410_GPIO_IRQ);
-+
-+      if (request_irq(context->cd_irq, s3c24xx_hcd_cd_irq, 0, context->description, context)) {
-+              DBG_PRINT(SDDBG_ERROR, ("failed to request card detect interrupt.\n"));
-+              status = -ENOENT;
-+              goto out_unmap_mem_region;
-+      }
-+#endif
-+
-+      if (request_irq(context->io_irq, s3c24xx_hcd_irq, 0, context->description, context)) {
-+              DBG_PRINT(SDDBG_ERROR, ("failed to request mci interrupt.\n"));
-+              status = -ENOENT;
-+              goto out_unmap_mem_region;
-+      }
-+
-+
-+      /* DMA */
-+      context->io_buffer_size = 4 * 4096;
-+      context->io_buffer = dma_alloc_writecombine(&context->pdev->dev,
-+                                                  context->io_buffer_size,
-+                                                  &context->io_buffer_dma,
-+                                                  GFP_KERNEL | GFP_DMA);
-+
-+      if (context->io_buffer == NULL) {
-+              DBG_PRINT(SDDBG_ERROR, ("failed to allocate DMA buffer\n"));
-+              status = -ENOMEM;
-+              goto out_free_irq;
-+
-+      }
-+
-+      if (s3c2410_dma_request(context->dma_channel, &s3c24xx_hcd_dma_client, NULL)) {
-+              DBG_PRINT(SDDBG_ERROR, ("unable to get DMA channel.\n"));
-+              status = -ENOENT;
-+              goto out_free_dma;
-+      }
-+
-+
-+      /* Set multiplexing */
-+      s3c2410_gpio_cfgpin(S3C2410_GPE5, S3C2410_GPE5_SDCLK);
-+      s3c2410_gpio_cfgpin(S3C2410_GPE6, S3C2410_GPE6_SDCMD);
-+      s3c2410_gpio_cfgpin(S3C2410_GPE7, S3C2410_GPE7_SDDAT0);
-+      s3c2410_gpio_cfgpin(S3C2410_GPE8, S3C2410_GPE8_SDDAT1);
-+      s3c2410_gpio_cfgpin(S3C2410_GPE9, S3C2410_GPE9_SDDAT2);
-+      s3c2410_gpio_cfgpin(S3C2410_GPE10, S3C2410_GPE10_SDDAT3);
-+
-+      con = readl(context->base + S3C2410_SDICON);
-+      con |= S3C2410_SDICON_SDIOIRQ;
-+      writel(con, context->base + S3C2410_SDICON);
-+
-+      datacon = readl(context->base + S3C2410_SDIDCON);
-+      datacon |= S3C2410_SDIDCON_WIDEBUS;
-+      writel(datacon, context->base + S3C2410_SDIDCON);
-+
-+      printk("S3c24xx SDIO: IRQ:%d Detect IRQ:%d DMA channel:%d base@0x%p PCLK@%ld kHz\n",
-+             context->io_irq, context->cd_irq, context->dma_channel, context->base,
-+             context->device.max_clock_rate/1000);
-+
-+      return SDIOErrorToOSError(status);
-+
-+ out_free_dma:
-+      dma_free_writecombine(&context->pdev->dev,context->io_buffer_size,
-+                            context->io_buffer, context->io_buffer_dma);
-+
-+ out_free_irq:
-+      free_irq(context->io_irq, context);
-+
-+ out_unmap_mem_region:
-+      iounmap(context->base);
-+
-+ out_free_mem_region:
-+      release_mem_region(context->mem->start, RESSIZE(context->mem));
-+
-+ out_disable_clock:
-+      clk_disable(context->device.clock);
-+
-+      return SDIOErrorToOSError(status);
-+}
-+
-+static void s3c24xx_hcd_hw_cleanup(struct s3c24xx_hcd_context * context)
-+{
-+      clk_disable(context->device.clock);
-+      free_irq(context->io_irq, context);
-+      iounmap(context->base);
-+      release_mem_region(context->mem->start, RESSIZE(context->mem));
-+      dma_free_writecombine(&context->pdev->dev,context->io_buffer_size,
-+                            context->io_buffer, context->io_buffer_dma);
-+}
-+
-+static int s3c24xx_hcd_pnp_probe(struct pnp_dev *pBusDevice, const struct pnp_device_id *pId)
-+{
-+      SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+
-+      status = s3c24xx_hcd_hw_init(&hcd_context);
-+      if (SDIO_IS_ERROR(status)) {
-+              DBG_PRINT(SDDBG_ERROR, ("HW Init failed\n"));
-+              return SDIOErrorToOSError(status);
-+      }
-+
-+      status = SDIO_RegisterHostController(&hcd_context.hcd);
-+      if (SDIO_IS_ERROR(status)) {
-+              DBG_PRINT(SDDBG_ERROR, ("Host registration failed\n"));
-+              s3c24xx_hcd_hw_cleanup(&hcd_context);
-+              return SDIOErrorToOSError(status);
-+      }
-+
-+      /* Our card is built-in, we force the attachement event */
-+      SDIO_HandleHcdEvent(&hcd_context.hcd, EVENT_HCD_ATTACH);
-+
-+      return 0;
-+}
-+
-+static void s3c24xx_hcd_pnp_remove(struct pnp_dev *pBusDevice)
-+{
-+}
-+
-+/* the driver context data */
-+struct s3c24xx_hcd_context hcd_context = {
-+      .description  = DESCRIPTION,
-+      .hcd.pName = "sdio_s3c24xx",
-+      .hcd.Version = CT_SDIO_STACK_VERSION_CODE,
-+      .hcd.pModule = THIS_MODULE,
-+      /* builtin card, 4 bits bus */
-+      .hcd.Attributes = SDHCD_ATTRIB_BUS_4BIT | SDHCD_ATTRIB_BUS_1BIT | SDHCD_ATTRIB_MULTI_BLK_IRQ,
-+      .hcd.SlotNumber = 0,
-+      .hcd.MaxSlotCurrent = 500, /* 1/2 amp */
-+      .hcd.SlotVoltageCaps = SLOT_POWER_3_3V, /* 3.3V */
-+      .hcd.SlotVoltagePreferred = SLOT_POWER_3_3V, /* 3.3V */
-+      .hcd.MaxClockRate = 25000000,
-+      .hcd.MaxBytesPerBlock = 0xfff, /* 0 - 4095 */
-+      .hcd.MaxBlocksPerTrans = 0xfff, /* 0 - 4095 */
-+      .hcd.pContext = &hcd_context,
-+      .hcd.pRequest = s3c24xx_hcd_request,
-+      .hcd.pConfigure = s3c24xx_hcd_config,
-+      .device.pnp_device.name = "sdio_s3c24xx_hcd",
-+      .device.pnp_driver.name = "sdio_s3c24xx_hcd",
-+      .device.pnp_driver.probe  = s3c24xx_hcd_pnp_probe,
-+      .device.pnp_driver.remove = s3c24xx_hcd_pnp_remove,
-+};
-+
-+static int s3c24xx_hcd_probe(struct platform_device * pdev)
-+{
-+      SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+      struct resource *r = NULL;
-+
-+      printk("S3c2440 SDIO Host controller\n");
-+
-+      hcd_context.pdev = pdev;
-+
-+      hcd_context.mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-+      if (hcd_context.mem == NULL) {
-+              DBG_PRINT(SDDBG_ERROR, ("No memory region\n"));
-+              status = SDIO_STATUS_NO_RESOURCES;
-+              goto out;
-+      }
-+
-+      hcd_context.io_irq = platform_get_irq(pdev, 0);
-+      if (hcd_context.io_irq == 0) {
-+              DBG_PRINT(SDDBG_ERROR, ("No IRQ\n"));
-+              status = SDIO_STATUS_NO_RESOURCES;
-+              goto out;
-+      }
-+
-+      r = platform_get_resource(pdev, IORESOURCE_DMA, 0);
-+      if (r == NULL) {
-+              DBG_PRINT(SDDBG_ERROR, ("No DMA channel\n"));
-+              status = SDIO_STATUS_NO_RESOURCES;
-+              goto out;
-+      }
-+      hcd_context.dma_channel = r->start;
-+      hcd_context.dma_en = 0;
-+
-+      hcd_context.int_sdio = 0;
-+
-+      spin_lock_init(&hcd_context.lock);
-+
-+      init_completion(&hcd_context.dma_complete);
-+      init_completion(&hcd_context.xfer_complete);
-+
-+      INIT_WORK(&hcd_context.io_work, s3c24xx_hcd_io_work);
-+      INIT_WORK(&hcd_context.irq_work, s3c24xx_hcd_irq_work);
-+
-+      mdelay(100);
-+
-+      status = SDIO_BusAddOSDevice(&hcd_context.device.dma,
-+                                   &hcd_context.device.pnp_driver,
-+                                   &hcd_context.device.pnp_device);
-+
-+ out:
-+
-+      return SDIOErrorToOSError(status);
-+}
-+
-+/*
-+ * module cleanup
-+ */
-+static int s3c24xx_hcd_remove(struct platform_device * pdev) {
-+      printk("S3C2440 SDIO host controller unloaded\n");
-+      SDIO_BusRemoveOSDevice(&hcd_context.device.pnp_driver, &hcd_context.device.pnp_device);
-+
-+      return 0;
-+}
-+
-+static struct platform_driver s3c24xx_hcd_sdio =
-+{
-+      .driver.name    = "s3c24xx-sdio",
-+      .probe          = s3c24xx_hcd_probe,
-+      .remove         = s3c24xx_hcd_remove,
-+};
-+
-+#ifdef CONFIG_DEBUG_FS
-+static struct dentry *debugfs_dir;
-+
-+static int s3c24xx_hcd_debugfs_show(struct seq_file *s, void *data)
-+{
-+      PSDREQUEST req;
-+      u32 con, pre, cmdarg, cmdcon, cmdsta, r0, r1, r2, r3, timer, bsize;
-+      u32 datcon, datcnt, datsta, fsta, imask;
-+      struct s3c24xx_hcd_context * context = &hcd_context;
-+
-+
-+      con     = readl(context->base + S3C2410_SDICON);
-+      pre     = readl(context->base + S3C2410_SDIPRE);
-+      cmdarg  = readl(context->base + S3C2410_SDICMDARG);
-+      cmdcon  = readl(context->base + S3C2410_SDICMDCON);
-+      cmdsta  = readl(context->base + S3C2410_SDICMDSTAT);
-+      r0      = readl(context->base + S3C2410_SDIRSP0);
-+      r1      = readl(context->base + S3C2410_SDIRSP1);
-+      r2      = readl(context->base + S3C2410_SDIRSP2);
-+      r3      = readl(context->base + S3C2410_SDIRSP3);
-+      timer   = readl(context->base + S3C2410_SDITIMER);
-+      bsize   = readl(context->base + S3C2410_SDIBSIZE);
-+      datcon  = readl(context->base + S3C2410_SDIDCON);
-+      datcnt  = readl(context->base + S3C2410_SDIDCNT);
-+      datsta  = readl(context->base + S3C2410_SDIDSTA);
-+      fsta    = readl(context->base + S3C2410_SDIFSTA);
-+      imask   = readl(context->base + S3C2440_SDIIMSK);
-+
-+      seq_printf(s, "SDICON:    0x%08x\n", con);
-+      seq_printf(s, "SDIPRE:    0x%08x\n", pre);
-+      seq_printf(s, "SDICmdArg: 0x%08x\n", cmdarg);
-+      seq_printf(s, "SDICmdCon: 0x%08x\n", cmdcon);
-+      seq_printf(s, "SDICmdSta: 0x%08x\n", cmdsta);
-+      seq_printf(s, "SDIRSP0:   0x%08x\n", r0);
-+      seq_printf(s, "SDIRSP1:   0x%08x\n", r1);
-+      seq_printf(s, "SDIRSP2:   0x%08x\n", r2);
-+      seq_printf(s, "SDIRSP3:   0x%08x\n", r3);
-+      seq_printf(s, "SDIDTimer: 0x%08x\n", timer);
-+      seq_printf(s, "SDIBSize:  0x%08x\n", bsize);
-+      seq_printf(s, "SDIDatCon: 0x%08x\n", datcon);
-+      seq_printf(s, "SDIDatCnt: 0x%08x\n", datcnt);
-+      seq_printf(s, "SDIDatSta: 0x%08x\n", datsta);
-+      seq_printf(s, "SDIFSta:   0x%08x\n", fsta);
-+      seq_printf(s, "SDIIntMsk: 0x%08x\n", imask);
-+      seq_printf(s, "\n");
-+
-+      seq_printf(s, "Current REQ: \n");
-+      req = GET_CURRENT_REQUEST(&context->hcd);
-+      if (req == NULL) {
-+              seq_printf(s, " No current request\n");
-+      } else {
-+              seq_printf(s, " Command: %d\n", req->Command);
-+              seq_printf(s, " Args: 0x%x\n", req->Argument);
-+              seq_printf(s, " Flags: 0x%x\n", req->Flags);
-+              seq_printf(s, " %d blocks x %d bytes\n", req->BlockCount, req->BlockLen);
-+              seq_printf(s, " %d bytes remaining\n", req->DataRemaining);
-+      }
-+
-+      seq_printf(s, "Context: \n");
-+      seq_printf(s, " INT mask: 0x%x\n", context->int_mask);
-+      seq_printf(s, " sdio INT: %d\n", context->int_sdio);
-+      seq_printf(s, " cmdsta: 0x%x\n", context->cmdsta);
-+      seq_printf(s, " dsta: 0x%x\n", context->dsta);
-+      seq_printf(s, " fsta: 0x%x\n", context->fsta);
-+
-+      return 0;
-+}
-+
-+static int s3c24xx_hcd_debugfs_open(struct inode *inode,
-+                                      struct file *file)
-+{
-+      return single_open(file, s3c24xx_hcd_debugfs_show, NULL);
-+}
-+
-+static const struct file_operations s3c24xx_hcd_debugfs_fops = {
-+      .open           = s3c24xx_hcd_debugfs_open,
-+      .read           = seq_read,
-+      .llseek         = seq_lseek,
-+      .release        = single_release,
-+      .owner          = THIS_MODULE,
-+};
-+
-+
-+static int s3c24xx_debugfs_init(struct s3c24xx_hcd_context * context)
-+{
-+      debugfs_dir = debugfs_create_dir("s3c24xx_sdio", NULL);
-+
-+      debugfs_create_file("registers", 0444, debugfs_dir,
-+                          (void *)context,
-+                          &s3c24xx_hcd_debugfs_fops);
-+
-+      return 0;
-+}
-+
-+#else
-+
-+static int s3c24xx_debugfs_init(struct s3c24xx_hcd_context * context)
-+{
-+      return 0;
-+}
-+
-+#endif
-+
-+static int __init s3c24xx_hcd_init(void)
-+{
-+      int ret;
-+
-+      ret = s3c24xx_debugfs_init(&hcd_context);
-+      if (ret) {
-+              printk("%s(): debugfs init failed\n", __FUNCTION__);
-+      }
-+
-+      platform_driver_register(&s3c24xx_hcd_sdio);
-+
-+      return 0;
-+}
-+
-+static void __exit s3c24xx_hcd_exit(void)
-+{
-+      platform_driver_unregister(&s3c24xx_hcd_sdio);
-+}
-+
-+
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION(DESCRIPTION);
-+MODULE_AUTHOR(AUTHOR);
-+
-+module_init(s3c24xx_hcd_init);
-+module_exit(s3c24xx_hcd_exit);
-diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
-new file mode 100644
-index 0000000..eb262fc
---- /dev/null
-+++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
-@@ -0,0 +1,67 @@
-+#ifndef __SDIO_S3C24XX_HCD_H___
-+#define __SDIO_S3C24XX_HCD_H___
-+
-+#define S3C24XX_HCD_NO_RESPONSE     1
-+#define S3C24XX_HCD_RESPONSE_SHORT  2
-+#define S3C24XX_HCD_RESPONSE_LONG   3
-+#define S3C24XX_HCD_DATA_READ       4
-+#define S3C24XX_HCD_DATA_WRITE      5
-+
-+struct s3c24xx_hcd_device {
-+      OS_PNPDEVICE   pnp_device;     /* the OS device for this HCD */
-+      OS_PNPDRIVER   pnp_driver;     /* the OS driver for this HCD */
-+      SDDMA_DESCRIPTION dma;
-+      struct clk * clock;
-+      unsigned long max_clock_rate;
-+      unsigned long actual_clock_rate;
-+};
-+
-+
-+/* driver wide data, this driver only supports one device,
-+ * so we include the per device data here also */
-+struct s3c24xx_hcd_context {
-+      PTEXT                     description;       /* human readable device decsription */
-+      SDHCD                     hcd;                /* HCD description for bus driver */
-+      struct s3c24xx_hcd_device device;             /* the single device's info */
-+      struct platform_device    *pdev;
-+      struct resource           *mem;
-+      void __iomem              *base;
-+      UINT32                    io_irq;
-+      UINT32                    cd_irq;
-+      BOOL                      card_inserted;       /* card inserted flag */
-+      BOOL                      cmd_processed;       /* command phase was processed */
-+      UINT32                    fifo_depth;          /* FIFO depth for the bus mode */
-+      BOOL                      irq_masked;
-+      UINT32                    bus_width;
-+      UINT32                    data_size;           /* Word, half word, or byte */
-+      UINT32                    latest_xfer_size;
-+
-+      void                      *io_buffer;         /* Kernel address */
-+      dma_addr_t                io_buffer_dma;      /* Bus address */
-+      UINT32                    io_buffer_size;
-+      UINT32                    dma_channel;
-+      UINT32                    dma_en;
-+      struct completion         dma_complete;
-+      struct completion         xfer_complete;
-+
-+      UINT32                    int_mask;
-+      UINT32                    int_sdio;            /* Do we have SDIO interrupt on ? */
-+
-+      UINT32                    complete;
-+
-+      UINT32                    cmdsta;
-+      UINT32                    dsta;
-+      UINT32                    fsta;
-+
-+      spinlock_t                lock;
-+
-+      struct work_struct        io_work;
-+      struct work_struct        irq_work;
-+};
-+
-+SDIO_STATUS s3c24xx_hcd_config(PSDHCD hcd, PSDCONFIG config);
-+SDIO_STATUS s3c24xx_hcd_request(PSDHCD hcd);
-+
-+struct s3c24xx_hcd_context hcd_context;
-+
-+#endif
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1055-atheros_2_0_sdio_stack.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1055-atheros_2_0_sdio_stack.patch.patch
deleted file mode 100755 (executable)
index e29f050..0000000
+++ /dev/null
@@ -1,13982 +0,0 @@
-From 79b0634b39757c62f4e61256c12ddf8e7b3783c4 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 22:21:24 +0100
-Subject: [PATCH] atheros_2_0_sdio_stack.patch
-
----
- arch/arm/Kconfig                                 |    2 +
- drivers/Kconfig                                  |    2 +
- drivers/Makefile                                 |    1 +
- drivers/sdio/Kconfig                             |   17 +
- drivers/sdio/Makefile                            |    4 +
- drivers/sdio/stack/Makefile                      |    1 +
- drivers/sdio/stack/busdriver/Makefile            |    2 +
- drivers/sdio/stack/busdriver/_busdriver.h        |  466 ++++
- drivers/sdio/stack/busdriver/sdio_bus.c          | 2120 +++++++++++++++
- drivers/sdio/stack/busdriver/sdio_bus_events.c   | 1040 +++++++
- drivers/sdio/stack/busdriver/sdio_bus_misc.c     | 3122 ++++++++++++++++++++++
- drivers/sdio/stack/busdriver/sdio_bus_os.c       |  832 ++++++
- drivers/sdio/stack/busdriver/sdio_function.c     |  715 +++++
- drivers/sdio/stack/lib/Makefile                  |    2 +
- drivers/sdio/stack/lib/_sdio_lib.h               |   50 +
- drivers/sdio/stack/lib/sdio_lib_c.c              |  908 +++++++
- drivers/sdio/stack/lib/sdio_lib_os.c             |  251 ++
- drivers/sdio/stack/platform/Makefile             |    2 +
- drivers/sdio/stack/platform/sdioplatformdriver.c |  300 +++
- include/linux/sdio/_sdio_defs.h                  |  638 +++++
- include/linux/sdio/ctsystem.h                    |  115 +
- include/linux/sdio/ctsystem_linux.h              |  983 +++++++
- include/linux/sdio/mmc_defs.h                    |  103 +
- include/linux/sdio/sdio_busdriver.h              | 1435 ++++++++++
- include/linux/sdio/sdio_hcd_defs.h               |  219 ++
- include/linux/sdio/sdio_lib.h                    |  270 ++
- include/linux/sdio/sdlist.h                      |  141 +
- 27 files changed, 13741 insertions(+), 0 deletions(-)
- create mode 100644 drivers/sdio/Kconfig
- create mode 100644 drivers/sdio/Makefile
- create mode 100644 drivers/sdio/stack/Makefile
- create mode 100644 drivers/sdio/stack/busdriver/Makefile
- create mode 100644 drivers/sdio/stack/busdriver/_busdriver.h
- create mode 100644 drivers/sdio/stack/busdriver/sdio_bus.c
- create mode 100644 drivers/sdio/stack/busdriver/sdio_bus_events.c
- create mode 100644 drivers/sdio/stack/busdriver/sdio_bus_misc.c
- create mode 100644 drivers/sdio/stack/busdriver/sdio_bus_os.c
- create mode 100644 drivers/sdio/stack/busdriver/sdio_function.c
- create mode 100644 drivers/sdio/stack/lib/Makefile
- create mode 100644 drivers/sdio/stack/lib/_sdio_lib.h
- create mode 100644 drivers/sdio/stack/lib/sdio_lib_c.c
- create mode 100644 drivers/sdio/stack/lib/sdio_lib_os.c
- create mode 100644 drivers/sdio/stack/platform/Makefile
- create mode 100644 drivers/sdio/stack/platform/sdioplatformdriver.c
- create mode 100644 include/linux/sdio/_sdio_defs.h
- create mode 100644 include/linux/sdio/ctsystem.h
- create mode 100644 include/linux/sdio/ctsystem_linux.h
- create mode 100644 include/linux/sdio/mmc_defs.h
- create mode 100644 include/linux/sdio/sdio_busdriver.h
- create mode 100644 include/linux/sdio/sdio_hcd_defs.h
- create mode 100644 include/linux/sdio/sdio_lib.h
- create mode 100644 include/linux/sdio/sdlist.h
-
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index b786e68..e394067 100644
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -1169,6 +1169,8 @@ source "drivers/hid/Kconfig"
- source "drivers/usb/Kconfig"
-+source "drivers/sdio/Kconfig"
-+
- source "drivers/mmc/Kconfig"
- source "drivers/leds/Kconfig"
-diff --git a/drivers/Kconfig b/drivers/Kconfig
-index 59f33fa..f5900b7 100644
---- a/drivers/Kconfig
-+++ b/drivers/Kconfig
-@@ -78,6 +78,8 @@ source "drivers/hid/Kconfig"
- source "drivers/usb/Kconfig"
-+source "drivers/sdio/Kconfig"
-+
- source "drivers/mmc/Kconfig"
- source "drivers/memstick/Kconfig"
-diff --git a/drivers/Makefile b/drivers/Makefile
-index f65deda..ce63a01 100644
---- a/drivers/Makefile
-+++ b/drivers/Makefile
-@@ -80,6 +80,7 @@ obj-$(CONFIG_CPU_FREQ)               += cpufreq/
- obj-$(CONFIG_CPU_IDLE)                += cpuidle/
- obj-$(CONFIG_MMC)             += mmc/
- obj-$(CONFIG_MEMSTICK)                += memstick/
-+obj-$(CONFIG_SDIO)              += sdio/
- obj-$(CONFIG_NEW_LEDS)                += leds/
- obj-$(CONFIG_INFINIBAND)      += infiniband/
- obj-$(CONFIG_SGI_SN)          += sn/
-diff --git a/drivers/sdio/Kconfig b/drivers/sdio/Kconfig
-new file mode 100644
-index 0000000..14bf5e3
---- /dev/null
-+++ b/drivers/sdio/Kconfig
-@@ -0,0 +1,17 @@
-+#
-+# SDIO driver and host controller support
-+#
-+
-+menu "SDIO support"
-+
-+config SDIO
-+        tristate "SDIO support"
-+        default m
-+        ---help---
-+          good luck.
-+
-+source "drivers/sdio/hcd/Kconfig"
-+
-+source "drivers/sdio/function/Kconfig"
-+
-+endmenu
-diff --git a/drivers/sdio/Makefile b/drivers/sdio/Makefile
-new file mode 100644
-index 0000000..f56aa0f
---- /dev/null
-+++ b/drivers/sdio/Makefile
-@@ -0,0 +1,4 @@
-+#Makefile for SDIO stack
-+obj-$(CONFIG_SDIO)      += stack/
-+obj-$(CONFIG_SDIO)      += hcd/
-+obj-$(CONFIG_SDIO)      += function/
-diff --git a/drivers/sdio/stack/Makefile b/drivers/sdio/stack/Makefile
-new file mode 100644
-index 0000000..ff0e24d
---- /dev/null
-+++ b/drivers/sdio/stack/Makefile
-@@ -0,0 +1 @@
-+obj-$(CONFIG_SDIO)      += busdriver/ lib/
-\ No newline at end of file
-diff --git a/drivers/sdio/stack/busdriver/Makefile b/drivers/sdio/stack/busdriver/Makefile
-new file mode 100644
-index 0000000..1130e2d
---- /dev/null
-+++ b/drivers/sdio/stack/busdriver/Makefile
-@@ -0,0 +1,2 @@
-+obj-$(CONFIG_SDIO) += sdio_busdriver.o
-+sdio_busdriver-objs := sdio_bus.o sdio_function.o sdio_bus_misc.o sdio_bus_events.o sdio_bus_os.o
-diff --git a/drivers/sdio/stack/busdriver/_busdriver.h b/drivers/sdio/stack/busdriver/_busdriver.h
-new file mode 100644
-index 0000000..a85aed1
---- /dev/null
-+++ b/drivers/sdio/stack/busdriver/_busdriver.h
-@@ -0,0 +1,466 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: _busdriver.h
-+
-+@abstract: internal include file for busdriver
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#ifndef ___BUSDRIVER_H___
-+#define ___BUSDRIVER_H___
-+#include <linux/sdio/sdio_lib.h>
-+
-+#define SDIODBG_FUNC_IRQ  (SDDBG_TRACE + 1)
-+#define SDIODBG_REQUESTS  (SDDBG_TRACE + 2)
-+#define SDIODBG_CD_TIMER  (SDDBG_TRACE + 3)
-+#define SDIODBG_HCD_EVENTS  (SDDBG_TRACE + 4)
-+
-+#define SDIOBUS_CD_TIMER_ID 0
-+
-+#define SDBUS_MAX_RETRY   3
-+
-+/* Notes on list linkages:
-+ *  list heads are held in BDCONTEXT
-+ *  HcdList - SDHCD
-+ *          one per registered host controller
-+ *          Next - links of all HCDs
-+ *  DeviceList SDDEVICE
-+ *          one per inserted device
-+ *          Next - links of all devices
-+ *          DeviceListNext - links of all devices on a function
-+ *          pFunction - ptr to Function supportting this device
-+ *          pHcd - ptr to HCD with supporting this device
-+ *  FunctionList SDFUNCTION
-+ *          one per register function driver
-+ *          Next - links of all functions
-+ *          DeviceList - list of devices being support by this function
-+ *                       uses DeviceListNext in SDDEVICE to link
-+ *
-+ *
-+*/
-+
-+#define SDMMC_DEFAULT_CMD_RETRIES           1
-+#define SDMMC_DEFAULT_CARD_READY_RETRIES    200
-+#define OCR_READY_CHECK_DELAY_MS            10
-+#define SDMMC_POWER_SETTLE_DELAY            400  /* in milliseconds */
-+#define SDBUS_DEFAULT_REQ_LIST_SIZE         16
-+#define SDBUS_DEFAULT_REQ_SIG_SIZE          8
-+#define CARD_DETECT_PAUSE                   100
-+#define SDBUS_DEFAULT_CD_POLLING_INTERVAL   1000  /* in milliseconds */
-+#define MAX_CARD_DETECT_MSGS                16
-+#define SDMMC_DEFAULT_BYTES_PER_BLOCK       2048
-+#define SDMMC_DEFAULT_BLOCKS_PER_TRANS      512
-+#define SDMMC_CMD13_POLLING_MULTIPLIER      1000 /* per block multiplier */
-+#define MAX_HCD_REQ_RECURSION               5
-+#define MAX_HCD_RECURSION_RUNAWAY           100
-+
-+    /* internal signalling item */
-+typedef struct _SIGNAL_ITEM{
-+    SDLIST       SDList;        /* list link*/
-+    OS_SIGNAL    Signal;        /* signal */
-+}SIGNAL_ITEM, *PSIGNAL_ITEM;
-+
-+typedef struct _HCD_EVENT_MESSAGE {
-+    HCD_EVENT Event;    /* the event */
-+    PSDHCD    pHcd;     /* hcd that generated the event */
-+}HCD_EVENT_MESSAGE, *PHCD_EVENT_MESSAGE;
-+
-+/* internal data for bus driver */
-+typedef struct _BDCONTEXT {
-+
-+    /* list of SD requests and signalling semaphores and a semaphore to protect it */
-+    SDLIST  RequestList;
-+    SDLIST  SignalList;
-+    OS_CRITICALSECTION RequestListCritSection;
-+    /* list of host controller bus drivers, sempahore to protect it */
-+    SDLIST HcdList;
-+    OS_SEMAPHORE HcdListSem;
-+    /* list of inserted devices, semaphore to protect it */
-+    SDLIST DeviceList;
-+    OS_SEMAPHORE DeviceListSem;
-+    /* list of function drivers, semaphore to protect it */
-+    SDLIST FunctionList;
-+    OS_SEMAPHORE FunctionListSem;
-+    INT              RequestListSize;        /* default request list */
-+    INT              SignalSemListSize;      /* default signalling semaphore size */
-+    INT              CurrentRequestAllocations; /*current count of allocated requests */
-+    INT              CurrentSignalAllocations;   /* current count of signal allocations */
-+    INT              MaxRequestAllocations;  /* max number of allocated requests to keep around*/
-+    INT              MaxSignalAllocations;   /* max number of signal allocations to keep around*/
-+    INT              RequestRetries;         /* cmd retries */
-+    INT              CardReadyPollingRetry;  /* card ready polling retry count */
-+    INT              PowerSettleDelay;       /* power settle delay */
-+    INT              CMD13PollingMultiplier; /* CMD13 (GET STATUS) multiplier */
-+    SD_BUSCLOCK_RATE DefaultOperClock;       /* default operation clock */
-+    SD_BUSMODE_FLAGS DefaultBusMode;         /* default bus mode */
-+    UINT16           DefaultOperBlockLen;    /* default operational block length per block */
-+    UINT16           DefaultOperBlockCount;  /* default operational block count per transaction */
-+    UINT32           CDPollingInterval;      /* card insert/removal polling interval */
-+    UINT8            InitMask;               /* bus driver init mask */
-+#define BD_TIMER_INIT    0x01
-+#define HELPER_INIT      0x02
-+#define RESOURCE_INIT    0x04
-+    BOOL             CDTimerQueued;          /* card detect timer queued */
-+    OSKERNEL_HELPER  CardDetectHelper;       /* card detect helper */
-+    PSDMESSAGE_QUEUE pCardDetectMsgQueue;    /* card detect message queue */
-+    ULONG            HcdInUseField;          /* bit field of in use HCD numbers*/
-+    UINT32           ConfigFlags;            /* bus driver configuration flags */
-+#define BD_CONFIG_SDREQ_FORCE_ALL_ASYNC 0x00000001
-+    INT              MaxHcdRecursion;        /* max HCD recurion level */
-+}BDCONTEXT, *PBDCONTEXT;
-+
-+#define BD_DEFAULT_CONFIG_FLAGS 0x00000000
-+#define IsQueueBusy(pRequestQueue)      (pRequestQueue)->Busy
-+#define MarkQueueBusy(pRequestQueue)    (pRequestQueue)->Busy = TRUE
-+#define MarkQueueNotBusy(pRequestQueue) (pRequestQueue)->Busy = FALSE
-+
-+#define CLEAR_INTERNAL_REQ_FLAGS(pReq) (pReq)->Flags &= ~(UINT)((SDREQ_FLAGS_RESP_SPI_CONVERTED | \
-+                                                          SDREQ_FLAGS_FORCE_DEFERRED_COMPLETE))
-+
-+/* macros to insert request into the queue */
-+#define QueueRequest(pReqQ,pReq) SDListInsertTail(&(pReqQ)->Queue,&(pReq)->SDList)
-+#define QueueRequestToFront(pReqQ,pReq) SDListInsertHead(&(pReqQ)->Queue,&(pReq)->SDList)
-+
-+/* macros to remove an item from the head of the queue */
-+static INLINE PSDREQUEST DequeueRequest(PSDREQUESTQUEUE pRequestQueue) {
-+    PSDLIST pItem;
-+    pItem = SDListRemoveItemFromHead(&pRequestQueue->Queue);
-+    if (pItem != NULL) {
-+        return CONTAINING_STRUCT(pItem, SDREQUEST, SDList);
-+    }
-+    return NULL;
-+};
-+
-+static INLINE SDIO_STATUS InitializeRequestQueue(PSDREQUESTQUEUE pRequestQueue) {
-+    SDLIST_INIT(&pRequestQueue->Queue);
-+    MarkQueueNotBusy(pRequestQueue);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+static INLINE void CleanupRequestQueue(PSDREQUESTQUEUE pRequestQueue) {
-+
-+}
-+
-+/* for bus driver internal use only */
-+SDIO_STATUS _SDIO_BusDriverInitialize(void);
-+SDIO_STATUS _SDIO_BusGetDefaultSettings(PBDCONTEXT pBdc);
-+void _SDIO_BusDriverCleanup(void);
-+SDIO_STATUS RemoveAllFunctions(void);
-+SDIO_STATUS RemoveHcdFunctions(PSDHCD pHcd);
-+PSDDEVICE AllocateDevice(PSDHCD pHcd);
-+BOOL AddDeviceToList(PSDDEVICE pDevice);
-+SDIO_STATUS DeleteDevices(PSDHCD pHcd);
-+SDIO_STATUS NotifyDeviceRemove(PSDDEVICE pDevice);
-+extern PBDCONTEXT pBusContext;
-+extern const CT_VERSION_CODE g_Version;
-+SDIO_STATUS _SDIO_RegisterHostController(PSDHCD pHcd);
-+SDIO_STATUS _SDIO_UnregisterHostController(PSDHCD pHcd);
-+SDIO_STATUS _SDIO_HandleHcdEvent(PSDHCD pHcd, HCD_EVENT Event);
-+SDIO_STATUS _SDIO_RegisterFunction(PSDFUNCTION pFunction);
-+SDIO_STATUS _SDIO_UnregisterFunction(PSDFUNCTION pFunction);
-+SDIO_STATUS _SDIO_CheckResponse(PSDHCD pHcd, PSDREQUEST pReq, SDHCD_RESPONSE_CHECK_MODE CheckMode);
-+SDIO_STATUS ProbeForFunction(PSDDEVICE pDevice, PSDHCD pHcd);
-+SDIO_STATUS SDInitializeCard(PSDHCD pHcd);
-+SDIO_STATUS SDQuerySDMMCInfo(PSDDEVICE pDevice);
-+SDIO_STATUS SDQuerySDIOInfo(PSDDEVICE pDevice);
-+SDIO_STATUS SDEnableFunction(PSDDEVICE pDevice, PSDCONFIG_FUNC_ENABLE_DISABLE_DATA pEnData);
-+SDIO_STATUS SDAllocFreeSlotCurrent(PSDDEVICE pDevice, BOOL Allocate, PSDCONFIG_FUNC_SLOT_CURRENT_DATA pData);
-+SDIO_STATUS SDMaskUnmaskFunctionIRQ(PSDDEVICE pDevice, BOOL Mask);
-+SDIO_STATUS SDFunctionAckInterrupt(PSDDEVICE pDevice);
-+SDIO_STATUS SDSPIModeEnableDisableCRC(PSDDEVICE pDevice,BOOL Enable);
-+SDIO_STATUS IssueBusConfig(PSDDEVICE pDev, PSDCONFIG pConfig);
-+SDIO_STATUS IssueBusRequest(PSDDEVICE pDev, PSDREQUEST pReq);
-+PSDREQUEST IssueAllocRequest(PSDDEVICE pDev);
-+void IssueFreeRequest(PSDDEVICE pDev, PSDREQUEST pReq);
-+PSDREQUEST AllocateRequest(void);
-+void FreeRequest(PSDREQUEST pReq);
-+PSIGNAL_ITEM AllocateSignal(void);
-+void FreeSignal(PSIGNAL_ITEM pSignal);
-+SDIO_STATUS InitializeTimers(void);
-+SDIO_STATUS CleanupTimers(void);
-+SDIO_STATUS QueueTimer(INT TimerID, UINT32 TimeOut);
-+SDIO_STATUS DeviceAttach(PSDHCD pHcd);
-+SDIO_STATUS DeviceDetach(PSDHCD pHcd);
-+SDIO_STATUS DeviceInterrupt(PSDHCD pHcd);
-+SDIO_STATUS CardInitSetup(PSDHCD pHcd);
-+void RunCardDetect(void);
-+void SDIO_NotifyTimerTriggered(INT TimerID);
-+SDIO_STATUS TestPresence(PSDHCD          pHcd,
-+                         CARD_INFO_FLAGS TestType,
-+                         PSDREQUEST      pReq);
-+#define _IssueSimpleBusRequest(pHcd,Cmd,Arg,Flags,pReqToUse) \
-+          _IssueBusRequestBd((pHcd),(Cmd),(Arg),(Flags),(pReqToUse),NULL,0)
-+
-+SDIO_STATUS Do_OS_IncHcdReference(PSDHCD pHcd);
-+SDIO_STATUS Do_OS_DecHcdReference(PSDHCD pHcd);
-+SDIO_STATUS TryNoIrqPendingCheck(PSDDEVICE pDev);
-+
-+    /* check API version compatibility of an HCD or function driver to a stack major/minor version
-+     if the driver version is greater than the major number, we are compatible
-+     if the driver version is equal, then we check if the minor is greater than or equal
-+     we don't have to check for the less than major, because the bus driver never loads
-+     drivers with different major numbers ...
-+     if the busdriver compiled version major is greater than the major version being checked this
-+     macro will resolved to ALWAYS true thus optimizing the code to not check the HCD since
-+     as a rule we never load an HCD with a lower major number */
-+#define CHECK_API_VERSION_COMPAT(p,major,minor)       \
-+     ((CT_SDIO_STACK_VERSION_MAJOR(CT_SDIO_STACK_VERSION_CODE) > (major)) || \
-+      (GET_SDIO_STACK_VERSION_MINOR((p)) >= (minor)))
-+
-+static INLINE SDIO_STATUS OS_IncHcdReference(PSDHCD pHcd) {
-+        /* this API was added in version 2.3 which requires access to a field in the HCD structure */
-+    if (CHECK_API_VERSION_COMPAT(pHcd,2,3)) {
-+            /* we can safely call the OS-dependent function */
-+        return Do_OS_IncHcdReference(pHcd);
-+    }
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+static INLINE SDIO_STATUS OS_DecHcdReference(PSDHCD pHcd) {
-+            /* this API was added in version 2.3 which requires access to a field in the HCD structure */
-+    if (CHECK_API_VERSION_COMPAT(pHcd,2,3)) {
-+            /* we can safely call the OS-dependent function */
-+        return Do_OS_DecHcdReference(pHcd);
-+    }
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+SDIO_STATUS _IssueBusRequestBd(PSDHCD           pHcd,
-+                               UINT8            Cmd,
-+                               UINT32           Argument,
-+                               SDREQUEST_FLAGS  Flags,
-+                               PSDREQUEST       pReqToUse,
-+                               PVOID            pData,
-+                               INT              Length);
-+
-+SDIO_STATUS IssueRequestToHCD(PSDHCD pHcd,PSDREQUEST pReq);
-+
-+#define CALL_HCD_CONFIG(pHcd,pCfg) (pHcd)->pConfigure((pHcd),(pCfg))
-+    /* macro to force all requests to be asynchronous in the HCD */
-+static INLINE BOOL ForceAllRequestsAsync(void) {
-+    return (pBusContext->ConfigFlags & BD_CONFIG_SDREQ_FORCE_ALL_ASYNC);
-+}
-+
-+static INLINE SDIO_STATUS CallHcdRequest(PSDHCD pHcd) {
-+
-+    if (pHcd->pCurrentRequest->Flags & SDREQ_FLAGS_PSEUDO) {
-+        DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: PSEUDO Request 0x%X \n",
-+                    (INT)pHcd->pCurrentRequest));
-+            /* return successful completion so that processing can finish */
-+        return SDIO_STATUS_SUCCESS;
-+    }
-+
-+    if (ForceAllRequestsAsync()) {
-+            /* all requests must be completed(indicated) in a separate context */
-+        pHcd->pCurrentRequest->Flags |= SDREQ_FLAGS_FORCE_DEFERRED_COMPLETE;
-+    } else {
-+            /* otherwise perform a test on flags in the HCD */
-+        if (!CHECK_API_VERSION_COMPAT(pHcd,2,6) &&
-+            AtomicTest_Set(&pHcd->HcdFlags, HCD_REQUEST_CALL_BIT)) {
-+
-+            /* bit was already set, this is a recursive call,
-+             * we need to tell the HCD to complete the
-+             * request in a separate context */
-+            DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Recursive CallHcdRequest \n"));
-+            pHcd->pCurrentRequest->Flags |= SDREQ_FLAGS_FORCE_DEFERRED_COMPLETE;
-+        }
-+    }
-+ #if DEBUG
-+    {
-+        SDIO_STATUS status;
-+        BOOL forceDeferred;
-+        forceDeferred = pHcd->pCurrentRequest->Flags & SDREQ_FLAGS_FORCE_DEFERRED_COMPLETE;
-+        status = pHcd->pRequest(pHcd);
-+        if (forceDeferred) {
-+                /* status better be pending... */
-+            DBG_ASSERT(status == SDIO_STATUS_PENDING);
-+        }
-+        return status;
-+    }
-+ #else
-+    return pHcd->pRequest(pHcd);
-+ #endif
-+
-+}
-+
-+/* note the caller of this macro must take the HCD lock to protect the count */
-+#define CHECK_HCD_RECURSE(pHcd,pReq)   \
-+{                                      \
-+    (pHcd)->Recursion++;               \
-+    DBG_ASSERT((pHcd)->Recursion < MAX_HCD_RECURSION_RUNAWAY); \
-+    if ((pHcd)->Recursion > pBusContext->MaxHcdRecursion) {    \
-+        DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Recursive Request Count Exceeded (%d) \n",(pHcd)->Recursion)); \
-+        (pReq)->Flags |= SDREQ_FLAGS_FORCE_DEFERRED_COMPLETE; \
-+    }                                                         \
-+}
-+
-+/* InternalFlags bit number settings */
-+#define SDBD_INIT        1
-+#define SDBD_PENDING    15
-+#define SDBD_ALLOC_IRQ_SAFE     2
-+
-+#define SDBD_ALLOC_IRQ_SAFE_MASK (1 << SDBD_ALLOC_IRQ_SAFE)
-+
-+static void INLINE DoRequestCompletion(PSDREQUEST pReq, PSDHCD pHcd) {
-+    CLEAR_INTERNAL_REQ_FLAGS(pReq);
-+    if (pReq->pCompletion != NULL) {
-+        DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Calling completion on request:0x%X, CMD:%d \n",
-+           (INT)pReq, pReq->Command));
-+            /* call completion routine, mark request reusable */
-+        AtomicTest_Clear(&pReq->InternalFlags, SDBD_PENDING);
-+        pReq->pCompletion(pReq);
-+    } else {
-+            /* mark request reusable */
-+        AtomicTest_Clear(&pReq->InternalFlags, SDBD_PENDING);
-+    }
-+}
-+
-+THREAD_RETURN CardDetectHelperFunction(POSKERNEL_HELPER pHelper);
-+THREAD_RETURN SDIOIrqHelperFunction(POSKERNEL_HELPER pHelper);
-+
-+void ConvertSPI_Response(PSDREQUEST pReq, UINT8 *pRespBuffer);
-+
-+static INLINE SDIO_STATUS PostCardDetectEvent(PBDCONTEXT pSDB, HCD_EVENT Event, PSDHCD pHcd) {
-+    HCD_EVENT_MESSAGE message;
-+    SDIO_STATUS       status;
-+    message.Event = Event;
-+    message.pHcd = pHcd;
-+
-+    if (pHcd != NULL) {
-+            /* increment HCD reference count to process this HCD message */
-+        status = OS_IncHcdReference(pHcd);
-+        if (!SDIO_SUCCESS(status)) {
-+            return status;
-+        }
-+    }
-+        /* post card detect message */
-+    status = SDLIB_PostMessage(pSDB->pCardDetectMsgQueue, &message, sizeof(message));
-+    if (!SDIO_SUCCESS(status)) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: PostCardDetectEvent error status %d\n",status));
-+        if (pHcd != NULL) {
-+                /* decrement count */
-+            OS_DecHcdReference(pHcd);
-+        }
-+        return status;
-+    }
-+        /* wake card detect helper */
-+    DBG_PRINT(SDIODBG_HCD_EVENTS, ("SDIO Bus Driver: PostCardDetectEvent waking\n"));
-+    return SD_WAKE_OS_HELPER(&pSDB->CardDetectHelper);
-+};
-+
-+/* initialize device fields */
-+static INLINE void InitDeviceData(PSDHCD pHcd, PSDDEVICE pDevice) {
-+    ZERO_POBJECT(pDevice);
-+    SDLIST_INIT(&pDevice->SDList);
-+    SDLIST_INIT(&pDevice->FuncListLink);
-+    pDevice->pRequest = IssueBusRequest;
-+    pDevice->pConfigure = IssueBusConfig;
-+    pDevice->AllocRequest = IssueAllocRequest;
-+    pDevice->FreeRequest = IssueFreeRequest;
-+        /* set card flags in the ID */
-+    pDevice->pId[0].CardFlags = pHcd->CardProperties.Flags;
-+    pDevice->pFunction = NULL;
-+    pDevice->pHcd = pHcd;
-+    SET_SDIO_STACK_VERSION(pDevice);
-+}
-+
-+/* de-initialize device fields */
-+static INLINE void DeinitDeviceData(PSDDEVICE pDevice) {
-+}
-+
-+/* reset hcd state */
-+static INLINE void ResetHcdState(PSDHCD pHcd) {
-+    ZERO_POBJECT(&pHcd->CardProperties);
-+    pHcd->PendingHelperIrqs = 0;
-+    pHcd->PendingIrqAcks = 0;
-+    pHcd->IrqsEnabled = 0;
-+    pHcd->pCurrentRequest = NULL;
-+    pHcd->IrqProcState = SDHCD_IDLE;
-+        /* mark this device as special */
-+    pHcd->pPseudoDev->pId[0].CardFlags = CARD_PSEUDO;
-+    pHcd->SlotCurrentAllocated = 0;
-+}
-+
-+static INLINE SDIO_STATUS _IssueConfig(PSDHCD           pHcd,
-+                                       SDCONFIG_COMMAND Command,
-+                                       PVOID            pData,
-+                                       INT              Length){
-+    SDCONFIG  configHdr;
-+    SET_SDCONFIG_CMD_INFO(&configHdr,Command,pData,Length);
-+    return CALL_HCD_CONFIG(pHcd,&configHdr);
-+}
-+
-+/* prototypes */
-+#define _AcquireHcdLock(pHcd)CriticalSectionAcquireSyncIrq(&(pHcd)->HcdCritSection)
-+#define _ReleaseHcdLock(pHcd)CriticalSectionReleaseSyncIrq(&(pHcd)->HcdCritSection)
-+
-+#define AcquireHcdLock(pDev) CriticalSectionAcquireSyncIrq(&(pDev)->pHcd->HcdCritSection)
-+#define ReleaseHcdLock(pDev) CriticalSectionReleaseSyncIrq(&(pDev)->pHcd->HcdCritSection)
-+
-+SDIO_STATUS OS_AddDevice(PSDDEVICE pDevice, PSDFUNCTION pFunction);
-+void OS_RemoveDevice(PSDDEVICE pDevice);
-+SDIO_STATUS OS_InitializeDevice(PSDDEVICE pDevice, PSDFUNCTION pFunction);
-+SDIO_STATUS SetOperationalBusMode(PSDDEVICE               pDevice,
-+                                  PSDCONFIG_BUS_MODE_DATA pBusMode);
-+void FreeDevice(PSDDEVICE pDevice);
-+BOOL IsPotentialIdMatch(PSD_PNP_INFO pIdsDev, PSD_PNP_INFO pIdsFuncList);
-+
-+
-+#define CHECK_FUNCTION_DRIVER_VERSION(pF) \
-+    (GET_SDIO_STACK_VERSION_MAJOR((pF)) == CT_SDIO_STACK_VERSION_MAJOR(g_Version))
-+#define CHECK_HCD_DRIVER_VERSION(pH) \
-+    (GET_SDIO_STACK_VERSION_MAJOR((pH)) == CT_SDIO_STACK_VERSION_MAJOR(g_Version))
-+
-+/* CLARIFICATION on SDREQ_FLAGS_PSEUDO and SDREQ_FLAGS_BARRIER flags :
-+ *
-+ * A request marked as PSEUDO is synchronized with bus requests and is not a true request
-+ * that is issued to an HCD.
-+ *
-+ * A request marked with a BARRIER flag requires that the completion routine be called
-+ * before the next bus request starts.  This is required for HCD requests that can change
-+ * bus or clock modes.  Changing the clock or bus mode while a bus request is pending
-+ * can cause problems.
-+ *
-+ *
-+ *
-+ * */
-+#define SD_PSEUDO_REQ_FLAGS \
-+      (SDREQ_FLAGS_PSEUDO | SDREQ_FLAGS_BARRIER | SDREQ_FLAGS_TRANS_ASYNC)
-+
-+#endif /*___BUSDRIVER_H___*/
-diff --git a/drivers/sdio/stack/busdriver/sdio_bus.c b/drivers/sdio/stack/busdriver/sdio_bus.c
-new file mode 100644
-index 0000000..ffc1e9f
---- /dev/null
-+++ b/drivers/sdio/stack/busdriver/sdio_bus.c
-@@ -0,0 +1,2120 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdio_bus.c
-+
-+@abstract: OS independent bus driver support
-+@category abstract: HD_Reference Host Controller Driver Interfaces.
-+@category abstract: PD_Reference
-+    Peripheral Driver Interfaces.
-+
-+#notes: this file supports the HCD's and generic functions
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define MODULE_NAME  SDBUSDRIVER
-+#include <linux/sdio/ctsystem.h>
-+#include <linux/sdio/sdio_busdriver.h>
-+#include <linux/sdio/_sdio_defs.h>
-+#include <linux/sdio/sdio_lib.h>
-+#include <linux/sdio/mmc_defs.h>
-+#include "_busdriver.h"
-+
-+/* list of host controller bus drivers */
-+PBDCONTEXT pBusContext = NULL;
-+static void CleanUpBusResources(void);
-+static SDIO_STATUS AllocateBusResources(void);
-+static PSIGNAL_ITEM BuildSignal(void);
-+static void DestroySignal(PSIGNAL_ITEM pSignal);
-+
-+const CT_VERSION_CODE g_Version = CT_SDIO_STACK_VERSION_CODE;
-+/*
-+ * _SDIO_BusDriverInitialize - call once on driver loading
-+ *
-+*/
-+SDIO_STATUS _SDIO_BusDriverInitialize(void)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Version: %d.%d\n",
-+       CT_SDIO_STACK_VERSION_MAJOR(g_Version),CT_SDIO_STACK_VERSION_MINOR(g_Version)));
-+
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: enter _SDIO_BusDriverInitialize\n"));
-+
-+    do {
-+        /* allocate our internal data initialize it */
-+        pBusContext = KernelAlloc(sizeof(BDCONTEXT));
-+        if (pBusContext == NULL) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_BusDriverInitialize can't allocate memory.\n"));
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            break;
-+        }
-+        memset(pBusContext,0,sizeof(BDCONTEXT));
-+        SDLIST_INIT(&pBusContext->RequestList);
-+        SDLIST_INIT(&pBusContext->HcdList);
-+        SDLIST_INIT(&pBusContext->DeviceList);
-+        SDLIST_INIT(&pBusContext->FunctionList);
-+        SDLIST_INIT(&pBusContext->SignalList);
-+
-+            /* setup defaults */
-+        pBusContext->RequestRetries = SDMMC_DEFAULT_CMD_RETRIES;
-+        pBusContext->CardReadyPollingRetry = SDMMC_DEFAULT_CARD_READY_RETRIES;
-+        pBusContext->PowerSettleDelay = SDMMC_POWER_SETTLE_DELAY;
-+        pBusContext->DefaultOperClock = MMC_HS_MAX_BUS_CLOCK;
-+        pBusContext->DefaultBusMode = SDCONFIG_BUS_WIDTH_4_BIT;
-+        pBusContext->RequestListSize = SDBUS_DEFAULT_REQ_LIST_SIZE;
-+        pBusContext->SignalSemListSize = SDBUS_DEFAULT_REQ_SIG_SIZE;
-+        pBusContext->CDPollingInterval = SDBUS_DEFAULT_CD_POLLING_INTERVAL;
-+        pBusContext->DefaultOperBlockLen = SDMMC_DEFAULT_BYTES_PER_BLOCK;
-+        pBusContext->DefaultOperBlockCount = SDMMC_DEFAULT_BLOCKS_PER_TRANS;
-+        pBusContext->ConfigFlags = BD_DEFAULT_CONFIG_FLAGS;
-+        pBusContext->CMD13PollingMultiplier = SDMMC_CMD13_POLLING_MULTIPLIER;
-+        pBusContext->MaxHcdRecursion = MAX_HCD_REQ_RECURSION;
-+
-+            /* get overrides for the defaults */
-+        status = _SDIO_BusGetDefaultSettings(pBusContext);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+
-+        pBusContext->MaxRequestAllocations = pBusContext->RequestListSize << 1;
-+        pBusContext->MaxSignalAllocations = pBusContext->SignalSemListSize << 1;
-+
-+        status = CriticalSectionInit(&pBusContext->RequestListCritSection);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_BusDriverInitialize can't CriticalSectionInit.\n"));
-+            break;
-+        }
-+        status = SemaphoreInitialize(&pBusContext->HcdListSem, 1);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_BusDriverInitialize can't SemaphoreInitialize HcdListSem.\n"));
-+            break;
-+        }
-+        status = SemaphoreInitialize(&pBusContext->DeviceListSem, 1);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_BusDriverInitialize can't SemaphoreInitialize DeviceListSem.\n"));
-+            break;
-+        }
-+        status = SemaphoreInitialize(&pBusContext->FunctionListSem, 1);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_BusDriverInitialize can't SemaphoreInitialize FunctionListSem.\n"));
-+            break;
-+        }
-+        status = AllocateBusResources();
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_BusDriverInitialize can't AllocateBusResources.\n"));
-+            break;
-+        }
-+
-+        pBusContext->InitMask |= RESOURCE_INIT;
-+
-+        pBusContext->pCardDetectMsgQueue = SDLIB_CreateMessageQueue(MAX_CARD_DETECT_MSGS,
-+                                                                   sizeof(HCD_EVENT_MESSAGE));
-+
-+        if (NULL == pBusContext->pCardDetectMsgQueue) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_BusDriverInitialize can't CreateMessageQueue.\n"));
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            break;
-+        }
-+
-+        status = SDLIB_OSCreateHelper(&pBusContext->CardDetectHelper,
-+                                      CardDetectHelperFunction,
-+                                      NULL);
-+
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_BusDriverInitialize can't OSCreateHelper.\n"));
-+            break;
-+        }
-+
-+        pBusContext->InitMask |= HELPER_INIT;
-+
-+        status = InitializeTimers();
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_BusDriverInitialize can't InitializeTimers.\n"));
-+            break;
-+        }
-+        pBusContext->InitMask |= BD_TIMER_INIT;
-+    } while(FALSE);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        _SDIO_BusDriverCleanup();
-+    }
-+
-+    return status;
-+}
-+
-+
-+/*
-+ * _SDIO_BusDriverBusDriverCleanup - call once on driver unloading
-+ *
-+*/
-+void _SDIO_BusDriverCleanup(void) {
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: _SDIO_BusDriverCleanup\n"));
-+
-+    if (pBusContext->InitMask & BD_TIMER_INIT) {
-+        CleanupTimers();
-+    }
-+
-+    if (pBusContext->InitMask & HELPER_INIT) {
-+        SDLIB_OSDeleteHelper(&pBusContext->CardDetectHelper);
-+    }
-+
-+    if (pBusContext->pCardDetectMsgQueue != NULL) {
-+        SDLIB_DeleteMessageQueue(pBusContext->pCardDetectMsgQueue);
-+        pBusContext->pCardDetectMsgQueue = NULL;
-+    }
-+        /* remove functions */
-+    RemoveAllFunctions();
-+        /* cleanup all devices */
-+    DeleteDevices(NULL);
-+    CleanUpBusResources();
-+    CriticalSectionDelete(&pBusContext->RequestListCritSection);
-+    SemaphoreDelete(&pBusContext->HcdListSem);
-+    SemaphoreDelete(&pBusContext->DeviceListSem);
-+    SemaphoreDelete(&pBusContext->FunctionListSem);
-+    KernelFree(pBusContext);
-+    pBusContext = NULL;
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: _SDIO_BusDriverCleanup\n"));
-+}
-+
-+
-+/* cleanup hcd */
-+static void CleanupHcd(PSDHCD pHcd)
-+{
-+    SDLIB_OSDeleteHelper(&pHcd->SDIOIrqHelper);
-+    CleanupRequestQueue(&pHcd->CompletedRequestQueue);
-+    CleanupRequestQueue(&pHcd->RequestQueue);
-+    CriticalSectionDelete(&pHcd->HcdCritSection);
-+    SemaphoreDelete(&pHcd->ConfigureOpsSem);
-+    pHcd->pCurrentRequest = NULL;
-+    if (pHcd->pPseudoDev != NULL) {
-+        FreeDevice(pHcd->pPseudoDev);
-+        pHcd->pPseudoDev = NULL;
-+    }
-+}
-+
-+/* set up the hcd */
-+static SDIO_STATUS SetupHcd(PSDHCD pHcd)
-+{
-+    SDIO_STATUS status;
-+
-+    ZERO_POBJECT(&pHcd->SDIOIrqHelper);
-+    ZERO_POBJECT(&pHcd->ConfigureOpsSem);
-+    ZERO_POBJECT(&pHcd->HcdCritSection);
-+    ZERO_POBJECT(&pHcd->RequestQueue);
-+    ZERO_POBJECT(&pHcd->CompletedRequestQueue);
-+    pHcd->pPseudoDev = NULL;
-+    pHcd->Recursion = 0;
-+
-+    do {
-+
-+        pHcd->pPseudoDev = AllocateDevice(pHcd);
-+
-+        if (NULL == pHcd->pPseudoDev) {
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            break;
-+        }
-+
-+        ResetHcdState(pHcd);
-+
-+        status = SemaphoreInitialize(&pHcd->ConfigureOpsSem,1);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+        status = CriticalSectionInit(&pHcd->HcdCritSection);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+        status = InitializeRequestQueue(&pHcd->RequestQueue);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+        status = InitializeRequestQueue(&pHcd->CompletedRequestQueue);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+            /* create SDIO Irq helper */
-+        status = SDLIB_OSCreateHelper(&pHcd->SDIOIrqHelper,
-+                                      SDIOIrqHelperFunction,
-+                                     (PVOID)pHcd);
-+    } while(FALSE);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+            /* undo what we did */
-+        CleanupHcd(pHcd);
-+    }
-+    return status;
-+}
-+
-+
-+/*
-+ * _SDIO_RegisterHostController - register a host controller bus driver
-+ *
-+*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Register a host controller driver with the bus driver.
-+
-+  @function name: SDIO_RegisterHostController
-+  @prototype: SDIO_STATUS SDIO_RegisterHostController (PSDHCD pHcd)
-+  @category: HD_Reference
-+
-+  @input:  pHcd - the host controller definition structure.
-+
-+  @output: none
-+
-+  @return: SDIO_STATUS - SDIO_STATUS_SUCCESS when successful.
-+
-+  @notes: Each host controller driver must register with the bus driver when loaded.
-+          The driver registers an SDHCD structure initialized with hardware properties
-+          and callback functions for bus requests and configuration.  On multi-slot
-+          hardware ,each slot should be registered with a separate SDHCD structure.
-+          The bus driver views each slot as a seperate host controller object.
-+          The driver should be prepared to receive configuration requests before
-+          this call returns. The host controller driver must unregister itself when
-+          shutting down.
-+
-+  @example: Registering a host controller driver:
-+    static SDHCD Hcd = {
-+       .pName = "sdio_custom_hcd",
-+       .Version = CT_SDIO_STACK_VERSION_CODE,  // set stack version code
-+       .SlotNumber = 0,                        // bus driver internal use
-+       .Attributes = SDHCD_ATTRIB_BUS_1BIT | SDHCD_ATTRIB_BUS_4BIT | SDHCD_ATTRIB_MULTI_BLK_IRQ
-+                     SDHCD_ATTRIB_AUTO_CMD12 ,
-+       .MaxBytesPerBlock = 2048     // each data block can be up to 2048 bytes
-+       .MaxBlocksPerTrans = 1024,   // each data transaction can consist of 1024 blocks
-+       .MaxSlotCurrent = 500,       // max FET switch current rating
-+       .SlotVoltageCaps = SLOT_POWER_3_3V,      // only 3.3V operation
-+       .SlotVoltagePreferred = SLOT_POWER_3_3V,
-+       .MaxClockRate = 24000000,   // 24 Mhz max operation
-+       .pContext = &HcdContext,    // set our driver context
-+       .pRequest = HcdRequest,     // set SDIO bus request callback
-+       .pConfigure = HcdConfig,    // set SDIO bus configuration callback
-+    };
-+    if (!SDIO_SUCCESS((status = SDIO_RegisterHostController(&Hcd)))) {
-+         DBG_PRINT(SDDBG_ERROR, ("SDIO HCD - failed to register with host, status =%d\n",
-+                                    status));
-+    }
-+
-+  @see also: SDIO_UnregisterHostController
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _SDIO_RegisterHostController(PSDHCD pHcd) {
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: _SDIO_RegisterHostController - %s\n",pHcd->pName));
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: Host Controller Stack Version: %d.%d \n",
-+        GET_SDIO_STACK_VERSION_MAJOR(pHcd),GET_SDIO_STACK_VERSION_MINOR(pHcd)));
-+
-+    if (!CHECK_HCD_DRIVER_VERSION(pHcd)) {
-+        DBG_PRINT(SDDBG_ERROR,
-+           ("SDIO Bus Driver: HCD Major Version Mismatch (hcd = %d, bus driver = %d)\n",
-+           GET_SDIO_STACK_VERSION_MAJOR(pHcd), CT_SDIO_STACK_VERSION_MAJOR(g_Version)));
-+        return SDIO_STATUS_INVALID_PARAMETER;
-+    }
-+        /* setup hcd */
-+    status = SetupHcd(pHcd);
-+    if (!SDIO_SUCCESS(status)) {
-+        return status;
-+    }
-+
-+    do {
-+        INT slotNumber;
-+
-+            /* protect the HCD list */
-+        if (!SDIO_SUCCESS((status = SemaphorePendInterruptable(&pBusContext->HcdListSem)))) {
-+            break;  /* wait interrupted */
-+        }
-+            /* find a unique number for this HCD, must be done under semaphore protection */
-+        slotNumber = FirstClearBit(&pBusContext->HcdInUseField);
-+        if (slotNumber < 0) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_RegisterHostController, error, slotNumber exceeded\n"));
-+            /* fake something */
-+            slotNumber = 31;
-+        }
-+        SetBit(&pBusContext->HcdInUseField, slotNumber);
-+        pHcd->SlotNumber = slotNumber;
-+            /* add HCD to the end of the internal list */
-+        SDListAdd(&pBusContext->HcdList , &pHcd->SDList);
-+        if (!SDIO_SUCCESS((status = SemaphorePost(&pBusContext->HcdListSem)))) {
-+            break;   /* wait interrupted */
-+        }
-+        if (pHcd->Attributes & SDHCD_ATTRIB_SLOT_POLLING) {
-+                /* post message to card detect helper to do polling */
-+            PostCardDetectEvent(pBusContext, EVENT_HCD_CD_POLLING, NULL);
-+        }
-+    } while (FALSE);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+       CleanupHcd(pHcd);
-+       DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_RegisterHostController, error 0x%X.\n", status));
-+    }
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: _SDIO_RegisterHostController\n"));
-+    return status;
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Unregister a host controller driver with the bus driver.
-+
-+  @function name: SDIO_UnregisterHostController
-+  @prototype: SDIO_STATUS SDIO_UnregisterHostController (PSDHCD pHcd)
-+  @category: HD_Reference
-+
-+  @input:  pHcd - the host controller definition structure that was registered.
-+
-+  @output: none
-+
-+  @return: SDIO_STATUS - SDIO_STATUS_SUCCESS when successful.
-+
-+  @notes: Each host controller driver must unregister with the bus driver when
-+          unloading. The driver is responsible for halting any outstanding I/O
-+          operations.  The bus driver will automatically unload function drivers
-+          that may be attached assigned to cards inserted into slots.
-+
-+  @example: Unregistering a host controller driver:
-+    if (!SDIO_SUCCESS((status = SDIO_UnregisterHostController(&Hcd)))) {
-+         DBG_PRINT(SDDBG_ERROR, ("SDIO HCD - failed to unregister with host, status =%d\n",
-+                                    status));
-+    }
-+
-+  @see also: SDIO_RegisterHostController
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _SDIO_UnregisterHostController(PSDHCD pHcd) {
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: _SDIO_UnregisterHostController\n"));
-+
-+        /* remove functions associated with the HCD */
-+    RemoveHcdFunctions(pHcd);
-+        /* remove any devices associated with the HCD */
-+    DeleteDevices(pHcd);
-+    /* wait for the message queue to be empty, so we don't have any delayed requests going
-+       to this device */
-+    while(!SDLIB_IsQueueEmpty(pBusContext->pCardDetectMsgQueue)) {
-+        /* wait for the messages to be handled */
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: _SDIO_UnregisterHostController, waiting on messages\n"));
-+        OSSleep(250);
-+    }
-+
-+    /* protect the HCD list */
-+    if (!SDIO_SUCCESS((status = SemaphorePendInterruptable(&pBusContext->HcdListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+    ClearBit(&pBusContext->HcdInUseField, pHcd->SlotNumber);
-+    /* delete HCD from list  */
-+    SDListRemove(&pHcd->SDList);
-+    if (!SDIO_SUCCESS((status = SemaphorePost(&pBusContext->HcdListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+        /* cleanup anything we allocated */
-+    CleanupHcd(pHcd);
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: _SDIO_UnregisterHostController\n"));
-+    return status;
-+cleanup:
-+    DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_UnregisterHostController, error 0x%X.\n", status));
-+    return status;
-+}
-+
-+/* documentation headers only for Request and Configure */
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: The bus driver calls the request callback to start an SDIO bus transaction.
-+  @function name: Request
-+  @prototype: SDIO_STATUS (*pRequest) (struct _SDHCD *pHcd)
-+  @category: HD_Reference
-+
-+  @input:  pHcd - the host controller structure that was registered
-+
-+  @output: none
-+
-+  @return: SDIO_STATUS
-+
-+  @notes:
-+          The bus driver maintains an internal queue of SDREQUEST structures submited by function
-+          drivers. The driver should use request macros to obtain a pointer to the current SDREQUEST
-+          at the head of the queue.  The driver can access the fields of the current request in order
-+          to program hardware appropriately.   Once the request completes, the driver should update
-+          the current request information (final status, response bytes and/or data) and call
-+          SDIO_HandleHcdEvent() with the event type of EVENT_HCD_TRANSFER_DONE.
-+          The bus driver will remove the current request from the head of the queue and start the next
-+          request.
-+
-+  @example: Example of a typical Request callback:
-+  SDIO_STATUS HcdRequest(PSDHCD pHcd)
-+  {
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    PSDHCD_DRIVER_CONTEXT pHct = (PSDHCD_DRIVER_CONTEXT)pHcd->pContext;
-+    UINT32                temp = 0;
-+    PSDREQUEST            pReq;
-+       // get the current request
-+    pReq = GET_CURRENT_REQUEST(pHcd);
-+    DBG_ASSERT(pReq != NULL);
-+       // get controller settings based on response type
-+    switch (GET_SDREQ_RESP_TYPE(pReq->Flags)) {
-+        case SDREQ_FLAGS_NO_RESP:
-+            break;
-+        case SDREQ_FLAGS_RESP_R1:
-+        case SDREQ_FLAGS_RESP_MMC_R4:
-+        case SDREQ_FLAGS_RESP_MMC_R5:
-+        case SDREQ_FLAGS_RESP_R6:
-+        case SDREQ_FLAGS_RESP_SDIO_R5:
-+            temp |= CMDDAT_RES_R1_R4_R5;
-+            break;
-+        case SDREQ_FLAGS_RESP_R1B:
-+            temp |= (CMDDAT_RES_R1_R4_R5 | CMDAT_RES_BUSY);
-+            break;
-+        case SDREQ_FLAGS_RESP_R2:
-+            temp |= CMDDAT_RES_R2;
-+            break;
-+        case SDREQ_FLAGS_RESP_R3:
-+        case SDREQ_FLAGS_RESP_SDIO_R4:
-+            temp |= CMDDAT_RES_R3;
-+            break;
-+    }
-+        // check for data
-+    if (pReq->Flags & SDREQ_FLAGS_DATA_TRANS){
-+        temp |= CMDDAT_DATA_EN;
-+        // set data remaining count
-+        pReq->DataRemaining = pReq->BlockLen * pReq->BlockCount;
-+        DBG_PRINT(TRACE_DATA, ("SDIO %s Data Transfer, Blocks:%d, BlockLen:%d, Total:%d \n",
-+                    IS_SDREQ_WRITE_DATA(pReq->Flags) ? "TX":"RX",
-+                    pReq->BlockCount, pReq->BlockLen, pReq->DataRemaining));
-+        if (IS_SDREQ_WRITE_DATA(pReq->Flags)) {
-+                // write operation
-+        }
-+    }
-+    // .... program hardware, interrupt handler will complete request
-+    return SDIO_STATUS_PENDING;
-+  }
-+
-+  @see also: SDIO_HandleHcdEvent
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: The bus driver calls the configure callback to set various options
-+             and modes in the host controller hardware.
-+
-+  @function name: Configure
-+  @prototype: SDIO_STATUS (*pConfigure) (struct _SDHCD *pHcd, PSDCONFIG pConfig)
-+  @category: HD_Reference
-+
-+  @input:  pHcd - the host controller structure that was registered
-+  @input:  pConfig - configuration request structure
-+
-+  @output: none
-+
-+  @return: SDIO_STATUS
-+
-+  @notes:
-+          The host controller driver recieves configuration requests for options
-+          such as slot voltage, bus width, clock rates and interrupt detection.
-+          The bus driver guarantees that only one configuration option request
-+          can be issued at a time.
-+
-+  @example: Example of a typical configure callback:
-+  SDIO_STATUS HcdConfig(PSDHCD pHcd, PSDCONFIG pConfig)
-+  {
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    PSDHCD_DRIVER_CONTEXT pHct = (PSDHCD_DRIVER_CONTEXT)pHcd->pContext;
-+    UINT16      command;
-+        // get command
-+    command = GET_SDCONFIG_CMD(pConfig);
-+        // decode command
-+    switch (command){
-+        case SDCONFIG_GET_WP:
-+            if (GetGpioPinLevel(pHct,SDIO_CARD_WP_GPIO) == WP_POLARITY) {
-+                *((SDCONFIG_WP_VALUE *)pConfig->pData) = 1;
-+            } else {
-+                *((SDCONFIG_WP_VALUE *)pConfig->pData) = 0;
-+            }
-+            break;
-+        case SDCONFIG_SEND_INIT_CLOCKS:
-+            ClockStartStop(pHct,CLOCK_ON);
-+                // sleep a little, should be at least 80 clocks at our lowest clock setting
-+            status = OSSleep(100);
-+            ClockStartStop(pHct,CLOCK_OFF);
-+            break;
-+        case SDCONFIG_SDIO_INT_CTRL:
-+            if (GET_SDCONFIG_CMD_DATA(PSDCONFIG_SDIO_INT_CTRL_DATA,pConfig)->SlotIRQEnable) {
-+                // request to enable IRQ detection
-+            } else {
-+                // request to disable IRQ detectioon
-+            }
-+            break;
-+        case SDCONFIG_SDIO_REARM_INT:
-+                // request to re-arm the card IRQ detection logic
-+            break;
-+        case SDCONFIG_BUS_MODE_CTRL:
-+                // request to set bus mode
-+            {
-+                // get bus mode data structure
-+               PSDCONFIG_BUS_MODE_DATA pBusMode =
-+                      GET_SDCONFIG_CMD_DATA(PSDCONFIG_SDIO_INT_CTRL_DATA,pConfig);
-+                // set bus mode based on settings in bus mode structure
-+                // bus mode   :  pBusMode->BusModeFlags
-+                // clock rate :  pBusMode->ClockRate
-+            }
-+            break;
-+        case SDCONFIG_POWER_CTRL:
-+                // request to set power/voltage
-+            {
-+                PSDCONFIG_POWER_CTRL_DATA pPowerSetting =
-+                       GET_SDCONFIG_CMD_DATA(PSDCONFIG_POWER_CTRL_DATA,pConfig);
-+                if (pPowerSetting->SlotPowerEnable) {
-+                    // turn on slot power
-+                    //
-+                } else {
-+                    // turn off slot power
-+                }
-+                DBG_PRINT(PXA_TRACE_CONFIG, ("SDIO PXA255 PwrControl: En:%d, VCC:0x%X \n",
-+                      pPowerSetting->SlotPowerEnable,
-+                      pPowerSetting->SlotPowerVoltageMask));
-+            }
-+            break;
-+        default:
-+            // unsupported
-+            status = SDIO_STATUS_INVALID_PARAMETER;
-+    }
-+    return status;
-+ }
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+
-+/*
-+ * Allocate a Device instance
-+ */
-+PSDDEVICE AllocateDevice(PSDHCD pHcd)
-+{
-+    PSDDEVICE pDevice;
-+
-+    pDevice = KernelAlloc(sizeof(SDDEVICE));
-+    if (pDevice != NULL) {
-+        InitDeviceData(pHcd,pDevice);
-+    }
-+    return pDevice;
-+}
-+
-+
-+/*
-+ * Free a Device instance
-+ */
-+void FreeDevice(PSDDEVICE pDevice)
-+{
-+    DeinitDeviceData(pDevice);
-+    KernelFree(pDevice);
-+}
-+/*
-+ * add this device to the list
-+ */
-+BOOL AddDeviceToList(PSDDEVICE pDevice)
-+{
-+    BOOL success = FALSE;
-+
-+    do {
-+            /* protect the driver list */
-+        if (!SDIO_SUCCESS(SemaphorePendInterruptable(&pBusContext->DeviceListSem))) {
-+            break;   /* wait interrupted */
-+        }
-+
-+            /* add new device to the internal list */
-+        SDListAdd(&pBusContext->DeviceList , &pDevice->SDList);
-+
-+        if (!SDIO_SUCCESS(SemaphorePost(&pBusContext->DeviceListSem))) {
-+            break;
-+        }
-+
-+        success = TRUE;
-+    } while (FALSE);
-+
-+    return success;
-+}
-+
-+/*
-+ *  Delete device associated with the HCD
-+ *  if pHCD is NULL this function cleans up all devices, the caller
-+ *  better have cleaned up functions first!
-+ */
-+SDIO_STATUS DeleteDevices(PSDHCD pHcd)
-+{
-+    SDIO_STATUS status;
-+    PSDDEVICE   pDevice;
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: DeleteDevices hcd:0x%X \n", (INT)pHcd));
-+      /* protect the device list */
-+    if (!SDIO_SUCCESS((status = SemaphorePendInterruptable(&pBusContext->DeviceListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+    SDITERATE_OVER_LIST_ALLOW_REMOVE(&pBusContext->DeviceList,pDevice,SDDEVICE,SDList) {
-+            /* only remove devices for the hcd or if we are cleaning up all */
-+        if ((NULL == pHcd) || (pDevice->pHcd == pHcd)) {
-+            SDListRemove(&pDevice->SDList);
-+            DeinitDeviceData(pDevice);
-+            FreeDevice(pDevice);
-+        }
-+    }SDITERATE_END;
-+    if (!SDIO_SUCCESS((status = SemaphorePost(&pBusContext->DeviceListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: DeleteDevices \n"));
-+    return status;
-+cleanup:
-+    DBG_PRINT(SDDBG_ERROR, ("-SDIO Bus Driver: DeleteDevice, error exit 0x%X\n", status));
-+    return status;
-+}
-+
-+
-+static SDIO_STATUS AllocateBusResources(void)
-+{
-+    INT                 ii;
-+    PSDREQUEST          pReq;
-+    PSIGNAL_ITEM        pSignal;
-+
-+    DBG_PRINT(SDDBG_TRACE,
-+    ("+SDIO Bus Driver: AllocateBusResources (R:%d,S:%d) (CR:%d,MR:%d)(CS:%d,MS:%d) \n",
-+       pBusContext->RequestListSize,
-+       pBusContext->SignalSemListSize,
-+       pBusContext->CurrentRequestAllocations,pBusContext->MaxRequestAllocations,
-+       pBusContext->CurrentSignalAllocations,pBusContext->MaxSignalAllocations));
-+
-+        /* allocate some initial requests */
-+    for (ii = 0; ii < pBusContext->RequestListSize; ii++) {
-+        pReq = AllocateRequest();
-+        if (pReq == NULL) {
-+            break;
-+        }
-+            /* free requests adds the request to the list */
-+        FreeRequest(pReq);
-+    }
-+
-+    for (ii = 0; ii < pBusContext->SignalSemListSize; ii++) {
-+        pSignal = AllocateSignal();
-+        if (pSignal == NULL) {
-+            break;
-+        }
-+            /* freeing it adds it to the list */
-+        FreeSignal(pSignal);
-+    }
-+
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: AllocateBusResources\n"));
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+
-+/* cleanup bus resources */
-+static void CleanUpBusResources(void)
-+{
-+    PSDLIST      pItem;
-+    PSDREQUEST   pReq;
-+    PSIGNAL_ITEM pSignal;
-+
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: CleanUpBusResources (CR:%d,MR:%d)(CS:%d,MS:%d) \n",
-+       pBusContext->CurrentRequestAllocations,pBusContext->MaxRequestAllocations,
-+       pBusContext->CurrentSignalAllocations,pBusContext->MaxSignalAllocations));
-+
-+    while(1) {
-+        pItem = SDListRemoveItemFromHead(&pBusContext->RequestList);
-+        if (NULL == pItem) {
-+            break;
-+        }
-+            /* free the request */
-+        pReq = CONTAINING_STRUCT(pItem, SDREQUEST, SDList);
-+        if (pReq->InternalFlags & SDBD_ALLOC_IRQ_SAFE_MASK) {
-+            KernelFreeIrqSafe(pReq);
-+        } else {
-+            KernelFree(pReq);
-+        }
-+        pBusContext->CurrentRequestAllocations--;
-+    }
-+
-+    if (pBusContext->CurrentRequestAllocations != 0) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Request allocations are not ZERO! (CR:%d)\n",
-+             pBusContext->CurrentRequestAllocations));
-+    }
-+
-+    while(1) {
-+        pItem = SDListRemoveItemFromHead(&pBusContext->SignalList);
-+        if (NULL == pItem) {
-+            break;
-+        }
-+        pSignal = CONTAINING_STRUCT(pItem, SIGNAL_ITEM, SDList);
-+        DestroySignal(pSignal);
-+        pBusContext->CurrentSignalAllocations--;
-+    }
-+
-+    if (pBusContext->CurrentSignalAllocations != 0) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Signal allocations are not ZERO! (CR:%d)\n",
-+             pBusContext->CurrentRequestAllocations));
-+    }
-+
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: CleanUpBusResources\n"));
-+}
-+
-+
-+/* free a request to the lookaside list */
-+void FreeRequest(PSDREQUEST pReq)
-+{
-+    SDIO_STATUS status;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    status = CriticalSectionAcquireSyncIrq(&pBusContext->RequestListCritSection);
-+        /* protect request list */
-+    if (!SDIO_SUCCESS(status)) {
-+        return;
-+    }
-+
-+    if ((pBusContext->CurrentRequestAllocations <= pBusContext->MaxRequestAllocations) ||
-+         !(pReq->InternalFlags & SDBD_ALLOC_IRQ_SAFE_MASK)) {
-+            /* add it to the list */
-+        SDListAdd(&pBusContext->RequestList, &pReq->SDList);
-+            /* we will hold onto this one */
-+        pReq = NULL;
-+    } else {
-+            /* decrement count */
-+        pBusContext->CurrentRequestAllocations--;
-+    }
-+
-+    status = CriticalSectionReleaseSyncIrq(&pBusContext->RequestListCritSection);
-+
-+    if (pReq != NULL) {
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Free Request allocation (CR:%d,MR:%d)\n",
-+        pBusContext->CurrentRequestAllocations,pBusContext->MaxRequestAllocations));
-+        if (pReq->InternalFlags & SDBD_ALLOC_IRQ_SAFE_MASK) {
-+            KernelFreeIrqSafe(pReq);
-+        } else {
-+                /* we should never free the ones that were normally allocated */
-+            DBG_ASSERT(FALSE);
-+        }
-+    }
-+}
-+
-+/* allocate a request from the lookaside list */
-+PSDREQUEST AllocateRequest(void)
-+{
-+    PSDLIST  pItem;
-+    SDIO_STATUS status;
-+    PSDREQUEST pReq = NULL;
-+    ATOMIC_FLAGS internalflags;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+
-+    status = CriticalSectionAcquireSyncIrq(&pBusContext->RequestListCritSection);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        return NULL;
-+    }
-+
-+    if (pBusContext->InitMask & RESOURCE_INIT) {
-+            /* check the list, we are now running... */
-+        pItem = SDListRemoveItemFromHead(&pBusContext->RequestList);
-+    } else {
-+            /* we are loading the list with requests at initialization */
-+        pItem = NULL;
-+    }
-+    status = CriticalSectionReleaseSyncIrq(&pBusContext->RequestListCritSection);
-+
-+    if (pItem != NULL) {
-+        pReq = CONTAINING_STRUCT(pItem, SDREQUEST, SDList);
-+    } else {
-+        if (pBusContext->InitMask & RESOURCE_INIT) {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Request List empty..allocating new one (irq-safe) (CR:%d,MR:%d)\n",
-+            pBusContext->CurrentRequestAllocations,pBusContext->MaxRequestAllocations));
-+                /* the resource list was already allocated, we must be running now.
-+                 * at run-time, we allocate using the safe IRQ */
-+            pReq = (PSDREQUEST)KernelAllocIrqSafe(sizeof(SDREQUEST));
-+                /* mark that this one was created using IRQ safe allocation */
-+            internalflags = SDBD_ALLOC_IRQ_SAFE_MASK;
-+        } else {
-+                /* use the normal allocation since we are called at initialization */
-+            pReq = (PSDREQUEST)KernelAlloc(sizeof(SDREQUEST));
-+            internalflags = 0;
-+        }
-+
-+        if (pReq != NULL) {
-+            pReq->InternalFlags = internalflags;
-+                /* keep track of allocations */
-+            status = CriticalSectionAcquireSyncIrq(&pBusContext->RequestListCritSection);
-+            pBusContext->CurrentRequestAllocations++;
-+            status = CriticalSectionReleaseSyncIrq(&pBusContext->RequestListCritSection);
-+        }
-+    }
-+
-+
-+    if (pReq != NULL) {
-+            /* preserve internal flags */
-+        internalflags = pReq->InternalFlags;
-+        ZERO_POBJECT(pReq);
-+        pReq->InternalFlags = internalflags;
-+    }
-+
-+    return pReq;
-+}
-+
-+void DestroySignal(PSIGNAL_ITEM pSignal)
-+{
-+   SignalDelete(&pSignal->Signal);
-+   KernelFree(pSignal);
-+}
-+
-+PSIGNAL_ITEM BuildSignal(void)
-+{
-+    PSIGNAL_ITEM pSignal;
-+
-+    pSignal = (PSIGNAL_ITEM)KernelAlloc(sizeof(SIGNAL_ITEM));
-+    if (pSignal != NULL) {
-+            /* initialize signal */
-+        if (!SDIO_SUCCESS(SignalInitialize(&pSignal->Signal))) {
-+            KernelFree(pSignal);
-+            pSignal = NULL;
-+        }
-+    }
-+    return pSignal;
-+}
-+/* free a signal*/
-+void FreeSignal(PSIGNAL_ITEM pSignal)
-+{
-+    SDIO_STATUS status;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    status = CriticalSectionAcquireSyncIrq(&pBusContext->RequestListCritSection);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        return;
-+    }
-+
-+    if (pBusContext->CurrentSignalAllocations <= pBusContext->MaxSignalAllocations) {
-+            /* add it to the list */
-+        SDListAdd(&pBusContext->SignalList, &pSignal->SDList);
-+            /* flag that we are holding onto it */
-+        pSignal = NULL;
-+    } else {
-+            /* decrement count */
-+        pBusContext->CurrentSignalAllocations--;
-+    }
-+
-+    status = CriticalSectionReleaseSyncIrq(&pBusContext->RequestListCritSection);
-+
-+    if (pSignal != NULL) {
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Free signal allocation (CS:%d,MS:%d)\n",
-+        pBusContext->CurrentSignalAllocations,pBusContext->MaxSignalAllocations));
-+        DestroySignal(pSignal);
-+    }
-+}
-+
-+/* allocate a signal from the list */
-+PSIGNAL_ITEM AllocateSignal(void)
-+{
-+    PSDLIST         pItem;
-+    PSIGNAL_ITEM    pSignal;
-+    SDIO_STATUS status;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    status = CriticalSectionAcquireSyncIrq(&pBusContext->RequestListCritSection);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        return NULL;
-+    }
-+
-+    if (pBusContext->InitMask & RESOURCE_INIT) {
-+            /* check the list */
-+        pItem = SDListRemoveItemFromHead(&pBusContext->SignalList);
-+    } else {
-+            /* we are loading the list */
-+        pItem = NULL;
-+    }
-+
-+    status = CriticalSectionReleaseSyncIrq(&pBusContext->RequestListCritSection);
-+    if (pItem != NULL) {
-+            /* return the one from the list */
-+        pSignal = CONTAINING_STRUCT(pItem, SIGNAL_ITEM, SDList);
-+    } else {
-+        if (pBusContext->InitMask & RESOURCE_INIT) {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Signal List empty..allocating new one (CS:%d,MS:%d)\n",
-+            pBusContext->CurrentSignalAllocations,pBusContext->MaxSignalAllocations));
-+        }
-+            /* just allocate one */
-+        pSignal = BuildSignal();
-+        status = CriticalSectionAcquireSyncIrq(&pBusContext->RequestListCritSection);
-+        if (pSignal != NULL) {
-+            pBusContext->CurrentSignalAllocations++;
-+        }
-+        status = CriticalSectionReleaseSyncIrq(&pBusContext->RequestListCritSection);
-+    }
-+
-+
-+    return pSignal;
-+}
-+
-+/*
-+ * Issus Bus Request (exposed to function drivers)
-+*/
-+PSDREQUEST IssueAllocRequest(PSDDEVICE pDev)
-+{
-+    return AllocateRequest();
-+}
-+
-+/*
-+ * Free Request (exposed to function drivers)
-+*/
-+void IssueFreeRequest(PSDDEVICE pDev, PSDREQUEST pReq)
-+{
-+    FreeRequest(pReq);
-+}
-+
-+/*
-+ * Issus Bus Request (exposed to function drivers)
-+*/
-+SDIO_STATUS IssueBusRequest(PSDDEVICE pDev, PSDREQUEST pReq)
-+{
-+    pReq->pFunction = pDev->pFunction;
-+    return IssueRequestToHCD(pDev->pHcd,pReq);
-+}
-+
-+
-+    /* completion routine for HCD configs, this is synchronized with normal bus requests */
-+static void HcdConfigComplete(PSDREQUEST pReq)
-+{
-+
-+    pReq->Status = CALL_HCD_CONFIG((PSDHCD)pReq->pDataBuffer, (PSDCONFIG)pReq->pCompleteContext);
-+
-+    SignalSet(&((PSIGNAL_ITEM)pReq->pHcdContext)->Signal);
-+}
-+
-+SDIO_STATUS SendSyncedHcdBusConfig(PSDDEVICE pDevice, PSDCONFIG pConfig)
-+{
-+    SDIO_STATUS     status = SDIO_STATUS_SUCCESS;
-+    PSDREQUEST      pReq = NULL;
-+    PSIGNAL_ITEM    pSignal = NULL;
-+
-+    do {
-+
-+        pSignal = AllocateSignal();
-+        if (NULL == pSignal) {
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            break;
-+        }
-+
-+        pReq = AllocateRequest();
-+        if (NULL == pReq) {
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            break;
-+        }
-+
-+            /* issue pseudo request to sync this with bus requests */
-+        pReq->pCompletion = HcdConfigComplete;
-+        pReq->pCompleteContext = pConfig;
-+            /* re-use hcd context to store the signal since this request
-+             * never actually goes to an HCD */
-+        pReq->pHcdContext = pSignal;
-+        pReq->pDataBuffer = pDevice->pHcd;
-+            /* flag this as barrier in case it may change the bus mode of the HCD */
-+        pReq->Flags = SDREQ_FLAGS_PSEUDO | SDREQ_FLAGS_BARRIER | SDREQ_FLAGS_TRANS_ASYNC;
-+        pReq->Status = SDIO_STATUS_SUCCESS;
-+
-+            /* issue request */
-+        status = IssueRequestToHCD(pDevice->pHcd,pReq);
-+
-+    } while (FALSE);
-+
-+    if (SDIO_SUCCESS(status)) {
-+        DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Config Request Sync-Op waiting....\n"));
-+        status = SignalWait(&pSignal->Signal);
-+
-+        if (SDIO_SUCCESS(status)) {
-+                /* return the result of the configuration request */
-+            status = pReq->Status;
-+        }
-+    }
-+
-+        /* cleanup */
-+    if (pReq != NULL) {
-+        FreeRequest(pReq);
-+    }
-+
-+    if (pSignal != NULL) {
-+        FreeSignal(pSignal);
-+    }
-+
-+    return status;
-+}
-+
-+/*
-+ * Issus bus Configuration  (exposed to function drivers)
-+*/
-+SDIO_STATUS IssueBusConfig(PSDDEVICE pDev, PSDCONFIG pConfig)
-+{
-+    SDIO_STATUS status;
-+    INT         cmdLength;
-+    UINT8       debugLevel = SDDBG_ERROR;
-+
-+    cmdLength = GET_SDCONFIG_CMD_LEN(pConfig);
-+    status = SDIO_STATUS_INVALID_PARAMETER;
-+
-+    do {
-+            /* check buffers and length */
-+        if (IS_SDCONFIG_CMD_GET(pConfig) || IS_SDCONFIG_CMD_PUT(pConfig)) {
-+            if ((GET_SDCONFIG_CMD_DATA(PVOID,pConfig) == NULL) || (0 == cmdLength)) {
-+                break;
-+            }
-+        }
-+
-+        switch (GET_SDCONFIG_CMD(pConfig)) {
-+            case SDCONFIG_FUNC_ACK_IRQ:
-+                status = SDFunctionAckInterrupt(pDev);
-+                break;
-+            case SDCONFIG_FUNC_ENABLE_DISABLE:
-+                if (cmdLength < sizeof(SDCONFIG_FUNC_ENABLE_DISABLE_DATA)) {
-+                    break;
-+                }
-+                status = SDEnableFunction(pDev,
-+                           GET_SDCONFIG_CMD_DATA(PSDCONFIG_FUNC_ENABLE_DISABLE_DATA,pConfig));
-+                break;
-+            case SDCONFIG_FUNC_UNMASK_IRQ:
-+                status = SDMaskUnmaskFunctionIRQ(pDev,FALSE);
-+                break;
-+            case SDCONFIG_FUNC_MASK_IRQ:
-+                status = SDMaskUnmaskFunctionIRQ(pDev,TRUE);
-+                break;
-+            case SDCONFIG_FUNC_SPI_MODE_DISABLE_CRC:
-+                status = SDSPIModeEnableDisableCRC(pDev,FALSE);
-+                break;
-+            case SDCONFIG_FUNC_SPI_MODE_ENABLE_CRC:
-+                status = SDSPIModeEnableDisableCRC(pDev,TRUE);
-+                break;
-+            case SDCONFIG_FUNC_ALLOC_SLOT_CURRENT:
-+                status = SDAllocFreeSlotCurrent(pDev,
-+                                                TRUE,
-+                                   GET_SDCONFIG_CMD_DATA(PSDCONFIG_FUNC_SLOT_CURRENT_DATA,pConfig));
-+                break;
-+            case SDCONFIG_FUNC_FREE_SLOT_CURRENT:
-+                status = SDAllocFreeSlotCurrent(pDev, FALSE, NULL);
-+                break;
-+            case SDCONFIG_FUNC_CHANGE_BUS_MODE:
-+
-+                status = SetOperationalBusMode(pDev,
-+                                               GET_SDCONFIG_CMD_DATA(PSDCONFIG_BUS_MODE_DATA,
-+                                               pConfig));
-+                break;
-+            case SDCONFIG_FUNC_NO_IRQ_PEND_CHECK:
-+                status = TryNoIrqPendingCheck(pDev);
-+                break;
-+            default:
-+
-+                if (GET_SDCONFIG_CMD(pConfig) & SDCONFIG_FLAGS_HC_CONFIG) {
-+                        /* synchronize config requests with busrequests */
-+                    status = SendSyncedHcdBusConfig(pDev,pConfig);
-+                } else {
-+                    DBG_PRINT(SDDBG_ERROR,
-+                        ("SDIO Bus Driver: IssueBusConfig - unknown command:0x%X \n",
-+                        GET_SDCONFIG_CMD(pConfig)));
-+                    status = SDIO_STATUS_INVALID_PARAMETER;
-+                }
-+                break;
-+        }
-+    } while(FALSE);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+
-+           if(status == SDIO_STATUS_FUNC_ENABLE_TIMEOUT ){ /* reduce debug level to avoid timeout error messages */
-+                debugLevel = SDDBG_TRACE;
-+         }
-+
-+
-+         DBG_PRINT(debugLevel,
-+                ("SDIO Bus Driver: IssueBusConfig - Error in command:0x%X, Buffer:0x%X, Length:%d Err:%d\n",
-+                GET_SDCONFIG_CMD(pConfig),
-+                GET_SDCONFIG_CMD_DATA(INT,pConfig),
-+                cmdLength, status));
-+    }
-+    return status;
-+}
-+
-+/* start a request */
-+static INLINE SDIO_STATUS StartHcdRequest(PSDHCD pHcd, PSDREQUEST pReq)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    if ((pReq->pFunction != NULL) && (pReq->pFunction->Flags & SDFUNCTION_FLAG_REMOVING)) {
-+        /* this device or function is going away, fail any new requests */
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: StartHcdRequest, fail request 0x%X, device is removing\n", (UINT)pReq));
-+        pReq->Status = SDIO_STATUS_CANCELED;
-+        return SDIO_STATUS_SDREQ_QUEUE_FAILED;
-+    }
-+
-+    status = _AcquireHcdLock(pHcd);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to acquire HCD request lock: Err:%d\n", status));
-+        pReq->Status = SDIO_STATUS_SDREQ_QUEUE_FAILED;
-+        return SDIO_STATUS_SDREQ_QUEUE_FAILED;
-+    }
-+
-+    if (pReq->Flags & SDREQ_FLAGS_QUEUE_HEAD) {
-+            /* caller wants this request queued to the head */
-+
-+            /* a completion routine for a barrier request is called
-+             * while the queue is busy.  A barrier request can
-+             * insert a new request at the head of the queue */
-+        DBG_ASSERT(IsQueueBusy(&pHcd->RequestQueue));
-+        QueueRequestToFront(&pHcd->RequestQueue,pReq);
-+    } else {
-+            /* insert in queue at tail */
-+        QueueRequest(&pHcd->RequestQueue,pReq);
-+
-+            /* is queue busy ? */
-+        if (IsQueueBusy(&pHcd->RequestQueue)) {
-+                /* release lock */
-+            status = _ReleaseHcdLock(pHcd);
-+                /* controller is busy already, no need to call the hcd */
-+            return SDIO_STATUS_PENDING;
-+        }
-+            /* mark it as busy */
-+        MarkQueueBusy(&pHcd->RequestQueue);
-+    }
-+
-+        /* remove item from head and set current request */
-+    SET_CURRENT_REQUEST(pHcd, DequeueRequest(&pHcd->RequestQueue));
-+    if (CHECK_API_VERSION_COMPAT(pHcd,2,6)) {
-+        CHECK_HCD_RECURSE(pHcd, pHcd->pCurrentRequest);
-+    }
-+        /* release lock */
-+    status = _ReleaseHcdLock(pHcd);
-+        /* controller was not busy, call into HCD to process current request */
-+    status = CallHcdRequest(pHcd);
-+    return status;
-+}
-+
-+
-+/* used by CMD12,CMD13 to save the original completion routine */
-+#define GET_BD_RSV_REQUEST_COMPLETION(pR)   (PSDEQUEST_COMPLETION)(pR)->pBdRsv1
-+#define SET_BD_RSV_REQUEST_COMPLETION(pR,c) (pR)->pBdRsv1 = (PVOID)(c)
-+
-+/* used by CMD12 processing to save/restore the original data transfer status */
-+#define GET_BD_RSV_ORIG_STATUS(pR)          (SDIO_STATUS)(pR)->pBdRsv2
-+#define SET_BD_RSV_ORIG_STATUS(pR,s)        (pR)->pBdRsv2 = (PVOID)(s)
-+
-+/* used by CMD13 processing to get/set polling count */
-+#define GET_BD_RSV_STATUS_POLL_COUNT(pR)     (INT)(pR)->pBdRsv2
-+#define SET_BD_RSV_STATUS_POLL_COUNT(pR,s)   (pR)->pBdRsv2 = (PVOID)(s)
-+
-+/* used by CMD55 processing to save the second part of the request */
-+#define GET_BD_RSV_ORIG_REQ(pR)             (PSDREQUEST)(pR)->pBdRsv1
-+#define SET_BD_RSV_ORIG_REQ(pR,r)           (pR)->pBdRsv1 = (PVOID)(r)
-+
-+/* used by all to save HCD */
-+#define GET_BD_RSV_HCD(pR)                  (PSDHCD)(pR)->pBdRsv3
-+#define SET_BD_RSV_HCD(pR,h)                (pR)->pBdRsv3 = (PVOID)(h)
-+
-+static void CMD13CompletionBarrier(PSDREQUEST pReq);
-+
-+static INLINE void SetupCMD13(PSDHCD pHcd, PSDREQUEST pReq)
-+{
-+    pReq->Command = CMD13;
-+        /* sequence must be atomic, queue it to the head and flag as a barrier */
-+    pReq->Flags = SDREQ_FLAGS_QUEUE_HEAD | SDREQ_FLAGS_BARRIER | SDREQ_FLAGS_TRANS_ASYNC;
-+    if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+        pReq->Argument = 0;
-+        pReq->Flags |= SDREQ_FLAGS_RESP_R2;
-+    } else {
-+        pReq->Flags |= SDREQ_FLAGS_RESP_R1;
-+        pReq->Argument |= pHcd->CardProperties.RCA << 16;
-+    }
-+        /* insert completion */
-+    pReq->pCompletion = CMD13CompletionBarrier;
-+}
-+
-+/* CMD13 (GET STATUS) completion */
-+static void CMD13CompletionBarrier(PSDREQUEST pReq)
-+{
-+    PSDEQUEST_COMPLETION pOrigCompletion = GET_BD_RSV_REQUEST_COMPLETION(pReq);
-+    PSDHCD               pHcd = GET_BD_RSV_HCD(pReq);
-+    INT                  pollingCount = GET_BD_RSV_STATUS_POLL_COUNT(pReq);
-+    BOOL                 doCompletion = TRUE;
-+    UINT32               cardStatus;
-+
-+    DBG_ASSERT(pOrigCompletion != NULL);
-+    DBG_ASSERT(pHcd != NULL);
-+    DBG_PRINT(SDIODBG_REQUESTS, ("+SDIO Bus Driver: CMD13CompletionBarrier (cnt:%d) \n",pollingCount));
-+
-+    do {
-+        if (!SDIO_SUCCESS(pReq->Status)) {
-+            break;
-+        }
-+
-+        cardStatus = SD_R1_GET_CARD_STATUS(pReq->Response);
-+
-+        if (cardStatus & SD_CS_TRANSFER_ERRORS) {
-+            DBG_PRINT(SDIODBG_REQUESTS,("SDIO Bus Driver: Card transfer errors : 0x%X \n",cardStatus));
-+            pReq->Status = SDIO_STATUS_PROGRAM_STATUS_ERROR;
-+            break;
-+        }
-+
-+        if (SD_CS_GET_STATE(cardStatus) != SD_CS_STATE_PRG) {
-+            DBG_PRINT(SDIODBG_REQUESTS,("SDIO Bus Driver: Card programming done \n"));
-+            break;
-+        }
-+
-+        DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Card still programming.. \n"));
-+        pollingCount--;
-+
-+        if (pollingCount < 0) {
-+            pReq->Status = SDIO_STATUS_PROGRAM_TIMEOUT;
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: card programming timeout!\n"));
-+            break;
-+        }
-+
-+        doCompletion = FALSE;
-+            /* keep trying */
-+        SET_BD_RSV_STATUS_POLL_COUNT(pReq, pollingCount);
-+        SetupCMD13(pHcd,pReq);
-+        DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: re-issuing CMD13 \n"));
-+            /* re-issue */
-+        IssueRequestToHCD(pHcd, pReq);
-+
-+    } while (FALSE);
-+
-+
-+    if (doCompletion) {
-+            /* restore original completion routine */
-+        pReq->pCompletion = pOrigCompletion;
-+            /* call original completion routine */
-+        pOrigCompletion(pReq);
-+    }
-+
-+    DBG_PRINT(SDIODBG_REQUESTS, ("-SDIO Bus Driver: CMD13CompletionBarrier \n"));
-+}
-+
-+/* command 13 (GET STATUS) preparation */
-+static void PrepCMD13Barrier(PSDREQUEST pReq)
-+{
-+    SDIO_STATUS status = pReq->Status;
-+    PSDHCD      pHcd = GET_BD_RSV_HCD(pReq);
-+    INT         pollingCount;
-+    PSDEQUEST_COMPLETION pOrigCompletion = GET_BD_RSV_REQUEST_COMPLETION(pReq);
-+
-+    DBG_ASSERT(pHcd != NULL);
-+    DBG_ASSERT(pOrigCompletion != NULL);
-+
-+    DBG_PRINT(SDIODBG_REQUESTS, ("+SDIO Bus Driver: PrepCMD13Barrier \n"));
-+
-+    if (SDIO_SUCCESS(status)) {
-+            /* re-use the request for CMD13 */
-+        SetupCMD13(pHcd,pReq);
-+            /* set polling count to a multiple of the Block count, if the BlockCount was
-+             * zeroed by the HCD, then set it to 1X multiplier */
-+        pollingCount = max(pBusContext->CMD13PollingMultiplier,
-+                           pBusContext->CMD13PollingMultiplier * (INT)pReq->BlockCount);
-+            /* initialize count */
-+        SET_BD_RSV_STATUS_POLL_COUNT(pReq, pollingCount);
-+            /* re-issue it, we can call IssueRequest here since we are re-using the request */
-+        IssueRequestToHCD(pHcd, pReq);
-+    } else {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Request Failure (%d) , CMD13 bypassed.\n",status));
-+            /* call the original completion routine */
-+        pOrigCompletion(pReq);
-+    }
-+
-+    DBG_PRINT(SDIODBG_REQUESTS, ("-SDIO Bus Driver: PrepCMD13Barrier (%d) \n",status));
-+}
-+
-+/* CMD12 completion */
-+static void CMD12Completion(PSDREQUEST pReq)
-+{
-+    PSDEQUEST_COMPLETION pOrigCompletion = GET_BD_RSV_REQUEST_COMPLETION(pReq);
-+
-+    DBG_ASSERT(pOrigCompletion != NULL);
-+
-+    DBG_PRINT(SDIODBG_REQUESTS, ("+SDIO Bus Driver: CMD12Completion \n"));
-+
-+        /* restore original completion routine */
-+    pReq->pCompletion = pOrigCompletion;
-+
-+    if (SDIO_SUCCESS(pReq->Status)) {
-+            /* if CMD12 succeeds, we want to return the result of the original
-+             * request */
-+        pReq->Status = GET_BD_RSV_ORIG_STATUS(pReq);
-+        DBG_PRINT(SDIODBG_REQUESTS,
-+                ("SDIO Bus Driver: PrepCMD12Completion original status %d \n",pReq->Status));
-+    }
-+        /* call original completion routine */
-+    pOrigCompletion(pReq);
-+
-+    DBG_PRINT(SDIODBG_REQUESTS, ("-SDIO Bus Driver: CMD12Completion \n"));
-+}
-+
-+/* CMD12 preparation */
-+static void PrepCMD12Barrier(PSDREQUEST pReq)
-+{
-+
-+    SDIO_STATUS status = pReq->Status;
-+    PSDHCD               pHcd = GET_BD_RSV_HCD(pReq);
-+    PSDEQUEST_COMPLETION pOrigCompletion = GET_BD_RSV_REQUEST_COMPLETION(pReq);
-+
-+    DBG_ASSERT(pHcd != NULL);
-+    DBG_ASSERT(pOrigCompletion != NULL);
-+
-+    DBG_PRINT(SDIODBG_REQUESTS, ("+SDIO Bus Driver: PrepCMD12Barrier \n"));
-+
-+    if (SDIO_SUCCESS(status) ||    /* only issue CMD12 on success or specific bus errors */
-+        (SDIO_STATUS_BUS_READ_TIMEOUT == status) ||
-+        (SDIO_STATUS_BUS_READ_CRC_ERR == status) ||
-+        (SDIO_STATUS_BUS_WRITE_ERROR == status)) {
-+        if (!CHECK_API_VERSION_COMPAT(pHcd,2,6)) {
-+            if (!ForceAllRequestsAsync()) {
-+                /* clear the call bit as an optimization, note clearing it wholesale here will
-+                 * allow request processing to recurse one more level */
-+                AtomicTest_Clear(&pHcd->HcdFlags, HCD_REQUEST_CALL_BIT);
-+            }
-+        }
-+            /* re-use the request for CMD12 */
-+        pReq->Command = CMD12;
-+        pReq->Argument = 0;
-+
-+            /* if the data transfer was successful, check for transfer check */
-+        if (SDIO_SUCCESS(status) &&
-+            (pReq->Flags & SDREQ_FLAGS_AUTO_TRANSFER_STATUS)) {
-+                /* original data request requires a transfer status check, which is another
-+                 * barrier request */
-+            pReq->Flags = SDREQ_FLAGS_RESP_R1B | SDREQ_FLAGS_QUEUE_HEAD | SDREQ_FLAGS_BARRIER |
-+                          SDREQ_FLAGS_TRANS_ASYNC;
-+            DBG_PRINT(SDIODBG_REQUESTS, ("-SDIO Bus Driver: PrepCMD12Barrier , chaining CMD13 \n"));
-+                /* switch out completion to send the CMD13 next */
-+            pReq->pCompletion = PrepCMD13Barrier;
-+        } else {
-+            pReq->Flags = SDREQ_FLAGS_RESP_R1B | SDREQ_FLAGS_QUEUE_HEAD | SDREQ_FLAGS_TRANS_ASYNC;
-+            pReq->pCompletion = CMD12Completion;
-+        }
-+
-+            /* save the original data transfer request status */
-+        SET_BD_RSV_ORIG_STATUS(pReq,status);
-+            /* re-issue it, we can call IssueRequest here since we are re-using the request */
-+        IssueRequestToHCD(pHcd, pReq);
-+    } else {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Request Failure (%d) , CMD12 bypassed.\n",status));
-+            /* call the original completion routine */
-+        pOrigCompletion(pReq);
-+    }
-+
-+    DBG_PRINT(SDIODBG_REQUESTS, ("-SDIO Bus Driver: PrepCMD12Barrier (%d) \n",status));
-+}
-+
-+
-+/* CMD55 barrier - this is a special barrier completion routine, we have to submit the second
-+ * part of the command command sequence atomically */
-+static void CMD55CompletionBarrier(PSDREQUEST pReq)
-+{
-+    SDIO_STATUS status = pReq->Status;
-+    PSDREQUEST  pOrigReq = GET_BD_RSV_ORIG_REQ(pReq);
-+    PSDHCD      pHcd = GET_BD_RSV_HCD(pReq);
-+    BOOL        doCompletion = FALSE;
-+
-+    DBG_ASSERT(pOrigReq != NULL);
-+    DBG_ASSERT(pHcd != NULL);
-+
-+    DBG_PRINT(SDIODBG_REQUESTS, ("+SDIO Bus Driver: CMD55Completion \n"));
-+
-+    do {
-+
-+        if (!SDIO_SUCCESS(status)) {
-+                /* command 55 failed */
-+            pOrigReq->Status = status;
-+            doCompletion = TRUE;
-+            break;
-+        }
-+
-+        if (!(SD_R1_GET_CARD_STATUS(pReq->Response) & SD_CS_APP_CMD)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Card is not accepting CMD55, status:0x%X \n",
-+                    SD_R1_GET_CARD_STATUS(pReq->Response)));
-+            pOrigReq->Status = SDIO_STATUS_INVALID_COMMAND;
-+            doCompletion = TRUE;
-+            break;
-+        }
-+
-+        if (!CHECK_API_VERSION_COMPAT(pHcd,2,6)) {
-+            if (!ForceAllRequestsAsync()) {
-+                AtomicTest_Clear(&pHcd->HcdFlags, HCD_REQUEST_CALL_BIT);
-+            }
-+        }
-+
-+            /* flag the original request to queue to the head */
-+        pOrigReq->Flags |= SDREQ_FLAGS_QUEUE_HEAD;
-+            /* submit original request, we cannot call IssueRequestHCD() here because the
-+             * original request has already gone through IssueRequestHCD() already */
-+        status = StartHcdRequest(pHcd, pOrigReq);
-+
-+        if (SDIO_STATUS_PENDING == status) {
-+            break;
-+        }
-+
-+        pOrigReq->Status = status;
-+
-+        if (SDIO_STATUS_SDREQ_QUEUE_FAILED == status) {
-+                /* never made it to the queue */
-+            doCompletion = TRUE;
-+            break;
-+        }
-+
-+            /* request completed in-line */
-+        _SDIO_HandleHcdEvent(pHcd, EVENT_HCD_TRANSFER_DONE);
-+
-+    } while (FALSE);
-+
-+    if (doCompletion) {
-+        DoRequestCompletion(pOrigReq, pHcd);
-+    }
-+
-+        /* free the CMD55 request */
-+    FreeRequest(pReq);
-+
-+    DBG_PRINT(SDIODBG_REQUESTS, ("-SDIO Bus Driver: CMD55Completion \n"));
-+}
-+
-+
-+/* synch completion routine */
-+static void SynchCompletion(PSDREQUEST pRequest)
-+{
-+    PSIGNAL_ITEM pSignal;
-+
-+    pSignal = (PSIGNAL_ITEM)pRequest->pCompleteContext;
-+    DBG_ASSERT(pSignal != NULL);
-+    if (!SDIO_SUCCESS(SignalSet(&pSignal->Signal))) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: SynchCompletion - signal failed \n"));
-+    }
-+
-+}
-+
-+/*
-+ * Issue a request to the host controller
-+ *
-+ *
-+ * The following flags are handled internally by the bus driver to guarantee atomicity.
-+ *
-+ *    SDREQ_FLAGS_APP_CMD - SD Extended commands requiring CMD55 to precede the actual command
-+ *    SDREQ_FLAGS_AUTO_CMD12 - Memory Card Data transfer needs CMD12 to stop transfer
-+ *                             (multi-block reads/writes)
-+ *    SDREQ_FLAGS_AUTO_TRANSFER_STATUS - Memory card data transfer needs transfer status polling
-+ *                                       using CMD13
-+ *
-+ *    These request flags require additional commands prepended or appended to the original command
-+ *
-+ *    The order of command execution :
-+ *
-+ *    Order  Condition                 Command Issued
-+ *    -------------------------------------------------------------
-+ *      1.   If APP_CMD                CMD55 issued.
-+ *      2.   Always                    Caller command issued.
-+ *      3.   If AUTO_CMD12             CMD12 issued.
-+ *      4.   If AUTO_TRANSFER_STATUS   CMD13 issued until card programming is complete
-+*/
-+SDIO_STATUS IssueRequestToHCD(PSDHCD pHcd, PSDREQUEST pReq)
-+{
-+    SDIO_STATUS     status = SDIO_STATUS_SUCCESS;
-+    PSIGNAL_ITEM    pSignal = NULL;
-+    BOOL            handleFailedReqSubmit = FALSE;
-+
-+    CLEAR_INTERNAL_REQ_FLAGS(pReq);
-+
-+    do {
-+            /* mark request in-use */
-+        ATOMIC_FLAGS internal = AtomicTest_Set(&pReq->InternalFlags, SDBD_PENDING);
-+        if (internal & (1<<SDBD_PENDING)) {
-+            DBG_ASSERT_WITH_MSG(FALSE,
-+                            "SDIO Bus Driver: IssueRequestToHCD - request already in use \n");
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Request already in use: 0x%X",(INT)pReq));
-+        }
-+
-+        if (!(pReq->Flags & SDREQ_FLAGS_TRANS_ASYNC)) {
-+                /* caller wants synchronous operation, insert our completion routine */
-+            pReq->pCompletion = SynchCompletion;
-+            pSignal = AllocateSignal();
-+            if (NULL == pSignal) {
-+                status = SDIO_STATUS_NO_RESOURCES;
-+                pReq->Status = SDIO_STATUS_NO_RESOURCES;
-+                handleFailedReqSubmit = TRUE;
-+                    /* no need to continue */
-+                break;
-+            }
-+            pReq->pCompleteContext = (PVOID)pSignal;
-+        }
-+
-+        if ((pReq->Flags & SDREQ_FLAGS_AUTO_CMD12) &&
-+            !(pHcd->Attributes & SDHCD_ATTRIB_AUTO_CMD12) &&
-+            !(IS_HCD_BUS_MODE_SPI(pHcd) && IS_SDREQ_WRITE_DATA(pReq->Flags))) {
-+            DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Auto CMD12 on Request:0x%08X \n",(INT)pReq));
-+                /* caller wants CMD12 auto-issued and the HCD does not support it */
-+                /* setup caller's request as a barrier and replace their completion routine */
-+            pReq->Flags |= SDREQ_FLAGS_BARRIER;
-+                /* take off the flag, since the BD will be issuing it */
-+            pReq->Flags &= ~SDREQ_FLAGS_AUTO_CMD12;
-+                /* save original completion */
-+            SET_BD_RSV_REQUEST_COMPLETION(pReq,pReq->pCompletion);
-+                /* save the HCD we are on */
-+            SET_BD_RSV_HCD(pReq,pHcd);
-+                /* use completion for preping CMD12 */
-+            pReq->pCompletion = PrepCMD12Barrier;
-+        }
-+
-+        if (pReq->Flags & SDREQ_FLAGS_AUTO_TRANSFER_STATUS) {
-+            /* caller wants transfer status checked. If a CMD12
-+             * barrier request has been setup we let the CMD12 completion take care
-+             * of setting up the transfer check */
-+            if (pReq->pCompletion != PrepCMD12Barrier) {
-+                    /* make CMD13 prep a barrier */
-+                pReq->Flags |= SDREQ_FLAGS_BARRIER;
-+                    /* save original completion */
-+                SET_BD_RSV_REQUEST_COMPLETION(pReq,pReq->pCompletion);
-+                    /* save the HCD we are on */
-+                SET_BD_RSV_HCD(pReq,pHcd);
-+                    /* use completion for preping CMD13 */
-+                pReq->pCompletion = PrepCMD13Barrier;
-+            }
-+        }
-+
-+            /* check app command, the two command sequence must be handled atomically */
-+        if (pReq->Flags & SDREQ_FLAGS_APP_CMD) {
-+            PSDREQUEST      pCmd55;
-+                /* allocate request to handle initial CMD55 command */
-+            pCmd55 = AllocateRequest();
-+            if (NULL == pCmd55) {
-+                status = SDIO_STATUS_NO_RESOURCES;
-+                pReq->Status = SDIO_STATUS_NO_RESOURCES;
-+                    /* complete the caller's request with error */
-+                handleFailedReqSubmit = TRUE;
-+                    /* no need to continue */
-+                break;
-+            }
-+                /* first submit CMD55 */
-+                /* set RCA */
-+            pCmd55->Argument = pHcd->CardProperties.RCA << 16;
-+                /* mark as a barrier request */
-+            pCmd55->Flags = SDREQ_FLAGS_RESP_R1 | SDREQ_FLAGS_BARRIER | SDREQ_FLAGS_TRANS_ASYNC;
-+            pCmd55->Command = CMD55;
-+                /* call our barrier completion routine when done */
-+            pCmd55->pCompletion = CMD55CompletionBarrier;
-+                /* save request and target HCD */
-+            SET_BD_RSV_ORIG_REQ(pCmd55,pReq);
-+            SET_BD_RSV_HCD(pCmd55,pHcd);
-+                /* recursively start the CMD55 request, since the CMD55 is a barrier
-+                 * request, it's completion routine will submit the actual request
-+                 * atomically */
-+            status = IssueRequestToHCD(pHcd, pCmd55);
-+
-+        } else {
-+                /* start the normal request */
-+            status = StartHcdRequest(pHcd,pReq);
-+        }
-+
-+
-+        if (SDIO_STATUS_SDREQ_QUEUE_FAILED == status) {
-+            handleFailedReqSubmit = TRUE;
-+                /* no need to continue, clean up at the end */
-+            break;
-+        }
-+
-+            /* at this point, the request was either queued or was processed by the
-+             * HCD */
-+
-+        DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: HCD returned status:%d on request: 0x%X, (CMD:%d) \n",
-+                  status, (INT)pReq, pReq->Command));
-+
-+        if (status != SDIO_STATUS_PENDING) {
-+            /* the HCD completed the request within the HCD request callback,
-+             * check and see if this is a synchronous request */
-+            if (pSignal != NULL) {
-+                    /* it was synchronous */
-+                DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Sync-Op signal wait bypassed \n"));
-+                    /* NULL out completion info, there's no need to
-+                     * signal the semaphore */
-+                pReq->pCompletion = NULL;
-+
-+            } else {
-+                DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Async operation completed in-line \n"));
-+                    /* this was an async call, always return pending */
-+                status = SDIO_STATUS_PENDING;
-+            }
-+                /* process this completed transfer on behalf of the HCD */
-+            _SDIO_HandleHcdEvent(pHcd, EVENT_HCD_TRANSFER_DONE);
-+
-+                /* done processing */
-+            break;
-+        }
-+                /* I/O is now pending, could be sync or async */
-+                /* check for synch op */
-+        if (pSignal != NULL) {
-+                /* wait for completion */
-+            DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Sync-Op signal waiting....\n"));
-+                /* this is not interruptable, as the HCD must complete it. */
-+            status = SignalWait(&pSignal->Signal);
-+                /* don't need the signal anymore */
-+            FreeSignal(pSignal);
-+            pSignal = NULL;
-+
-+            /* note: it is safe to touch pReq since we own
-+             * the completion routine for synch transfers */
-+
-+                /* check signal wait status */
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_TRACE,
-+                ("SDIO Bus Driver - IssueRequestToHCD: Synch transfer - signal wait failed, cancelling req 0X%X\n",
-+                (UINT)pReq));
-+                pReq->Status = SDIO_STATUS_CANCELED;
-+                status = SDIO_STATUS_CANCELED;
-+                break;
-+            }
-+            DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Sync-Op woke up\n"));
-+                /* return the completion status of the request */
-+            status = pReq->Status;
-+        } else {
-+            DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Async operation Pending \n"));
-+        }
-+
-+    } while (FALSE);
-+
-+        /* see if we need to clean up failed submissions */
-+    if (handleFailedReqSubmit) {
-+            /* make sure this is cleared */
-+        AtomicTest_Clear(&pReq->InternalFlags, SDBD_PENDING);
-+            /* the  request processing failed before it was submitted to the HCD */
-+            /* note: since it never made it to the queue we can touch pReq */
-+        if (pReq->Flags & SDREQ_FLAGS_TRANS_ASYNC) {
-+            /* for ASYNC requests, we need to call the completion routine */
-+            DoRequestCompletion(pReq, pHcd);
-+                /* return pending for all ASYNC requests */
-+            status = SDIO_STATUS_PENDING;
-+        }
-+    }
-+
-+        /* check if we need to clean up the signal */
-+    if (pSignal != NULL) {
-+            /* make sure this is freed */
-+        FreeSignal(pSignal);
-+    }
-+        /* return status */
-+    return status;
-+}
-+
-+/* documentation for configuration requests */
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Enable or Disable the SDIO Function
-+
-+  @function name: SDCONFIG_FUNC_ENABLE_DISABLE
-+  @prototype: SDCONFIG_FUNC_ENABLE_DISABLE
-+  @category: PD_Reference
-+
-+  @input:  SDCONFIG_FUNC_ENABLE_DISABLE_DATA - Enable Data structure
-+
-+  @output: none
-+
-+  @return: SDIO Status
-+
-+  @notes: This command code is used in the SDLIB_IssueConfig() API.  The command
-+          uses the SDCONFIG_FUNC_ENABLE_DISABLE_DATA structure.  The caller must set the
-+          EnableFlags and specify the TimeOut value in milliseconds.   The TimeOut
-+          value is used for polling the I/O ready bit.  This command returns a status
-+          of SDIO_STATUS_FUNC_ENABLE_TIMEOUT if the ready bit was not set/cleared
-+          by the card within the timeout period.
-+
-+  @example: Example of enabling an I/O function:
-+        fData.EnableFlags = SDCONFIG_ENABLE_FUNC;
-+        fData.TimeOut = 500;
-+        status = SDLIB_IssueConfig(pInstance->pDevice,
-+                                   SDCONFIG_FUNC_ENABLE_DISABLE,
-+                                   &fData,
-+                                   sizeof(fData));
-+
-+  @see also: SDLIB_IssueConfig
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Unmask the function's IRQ
-+
-+  @function name: SDCONFIG_FUNC_UNMASK_IRQ
-+  @prototype: SDCONFIG_FUNC_UNMASK_IRQ
-+  @category: PD_Reference
-+
-+  @input:  none
-+
-+  @output: none
-+
-+  @return: SDIO Status
-+
-+  @notes: This command code is used in the SDLIB_IssueConfig() API.  The command
-+          unmasks the IRQ for the I/O function. This request sets the function's
-+          interrupt enable bit in the INTENABLE register in the
-+          common register space.
-+
-+  @example: Example of unmasking interrupt :
-+        status = SDLIB_IssueConfig(pInstance->pDevice,
-+                                   SDCONFIG_FUNC_UNMASK_IRQ,
-+                                   NULL,
-+                                   0);
-+
-+  @see also: SDCONFIG_FUNC_MASK_IRQ
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Mask the function's IRQ
-+
-+  @function name: SDCONFIG_FUNC_MASK_IRQ
-+  @prototype: SDCONFIG_FUNC_MASK_IRQ
-+  @category: PD_Reference
-+
-+  @input:  none
-+
-+  @output: none
-+
-+  @return: SDIO Status
-+
-+  @notes: This command code is used in the SDLIB_IssueConfig() API.  The command
-+          masks the IRQ for the I/O function.
-+
-+  @example: Example of unmasking interrupt :
-+        status = SDLIB_IssueConfig(pInstance->pDevice,
-+                                   SDCONFIG_FUNC_MASK_IRQ,
-+                                   NULL,
-+                                   0);
-+
-+  @see also: SDCONFIG_FUNC_UNMASK_IRQ
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Acknowledge that the function's IRQ has been handled
-+
-+  @function name: SDCONFIG_FUNC_ACK_IRQ
-+  @prototype: SDCONFIG_FUNC_ACK_IRQ
-+  @category: PD_Reference
-+
-+  @input:  none
-+
-+  @output: none
-+
-+  @return: SDIO Status
-+
-+  @notes: This command code is used in the SDLIB_IssueConfig() API.  The command
-+          indicates to the bus driver that the function driver has handled the
-+          interrupt.  The bus driver will notify the host controller to unmask the
-+          interrupt source.  SDIO interrupts are level triggered and are masked at the
-+          host controller level until all function drivers have indicated that they
-+          have handled their respective interrupt. This command can be issued in either
-+          the IRQ handler or asynchronous IRQ handler.
-+
-+  @example: Example of acknowledging an interrupt :
-+        status = SDLIB_IssueConfig(pInstance->pDevice,
-+                                   SDCONFIG_FUNC_ACK_IRQ,
-+                                   NULL,
-+                                   0);
-+
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Disable SD/MMC/SDIO card CRC checking.
-+
-+  @function name: SDCONFIG_FUNC_SPI_MODE_DISABLE_CRC
-+  @prototype: SDCONFIG_FUNC_SPI_MODE_DISABLE_CRC
-+  @category: PD_Reference
-+
-+  @input:  none
-+
-+  @output: none
-+
-+  @return: SDIO Status
-+
-+  @notes: This command code is used in the SDLIB_IssueConfig() API.  The command
-+          issues CMD59 to disable SPI-CRC checking and requests the host controller
-+          driver to stop checking the CRC. This is typically used in systems where
-+          CRC checking is not required and performance is improved if the CRC checking
-+          is ommitted (i.e. SPI implementations without hardware CRC support).
-+
-+  @example: Example of disabling SPI CRC checking:
-+        status = SDLIB_IssueConfig(pInstance->pDevice,
-+                                   SDCONFIG_FUNC_SPI_MODE_DISABLE_CRC,
-+                                   NULL,
-+                                   0);
-+
-+  @see also: SDCONFIG_FUNC_SPI_MODE_ENABLE_CRC
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Enable SD/MMC/SDIO card CRC checking.
-+
-+  @function name: SDCONFIG_FUNC_SPI_MODE_ENABLE_CRC
-+  @prototype: SDCONFIG_FUNC_SPI_MODE_ENABLE_CRC
-+  @category: PD_Reference
-+
-+  @input:  none
-+
-+  @output: none
-+
-+  @return: SDIO Status
-+
-+  @notes: This command code is used in the SDLIB_IssueConfig() API.  The command
-+          issues CMD59 to enable SPI-CRC checking and requests the host controller
-+          driver to generate valid CRCs for commands and data as well as
-+          check the CRC in responses and incomming data blocks.
-+
-+  @example: Example of enabling SPI CRC checking:
-+        status = SDLIB_IssueConfig(pInstance->pDevice,
-+                                   SDCONFIG_FUNC_SPI_MODE_ENABLE_CRC,
-+                                   NULL,
-+                                   0);
-+
-+  @see also: SDCONFIG_FUNC_SPI_MODE_DISABLE_CRC
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Allocate slot current for a card function.
-+
-+  @function name: SDCONFIG_FUNC_ALLOC_SLOT_CURRENT
-+  @prototype: SDCONFIG_FUNC_ALLOC_SLOT_CURRENT
-+  @category: PD_Reference
-+
-+  @input:  SDCONFIG_FUNC_SLOT_CURRENT_DATA
-+
-+  @output: SDCONFIG_FUNC_SLOT_CURRENT_DATA
-+
-+  @return: SDIO Status
-+
-+  @notes: This command code is used in the SDLIB_IssueConfig() API.  The command
-+          requests an allocation of slot current to satisfy the power requirements
-+          of the function.  The command uses the SDCONFIG_FUNC_SLOT_CURRENT_DATA
-+          data structure to pass the required current in mA. Slot current allocation
-+          is not cummulative and this command should only be issued once by each function
-+          driver with the worse case slot current usage.
-+          The command returns SDIO_STATUS_NO_RESOURCES if the
-+          requirement cannot be met by the host hardware.  The SlotCurrent field will
-+          contain the remaining current available to the slot.  The slot current should
-+          be allocated before the function is enabled using SDCONFIG_FUNC_ENABLE_DISABLE.
-+          When a function driver is unloaded it should free the slot current allocation
-+          by using the SDCONFIG_FUNC_FREE_SLOT_CURRENT command.
-+
-+  @example: Example of allocating slot current:
-+        slotCurrent.SlotCurrent = 150;  // 150 mA
-+        status = SDLIB_IssueConfig(pInstance->pDevice,
-+                                   SDCONFIG_FUNC_ALLOC_SLOT_CURRENT,
-+                                   &slotCurrent,
-+                                   sizeof(slotCurrent));
-+
-+
-+  @see also: SDCONFIG_FUNC_FREE_SLOT_CURRENT
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Free slot current for a card function.
-+
-+  @function name: SDCONFIG_FUNC_FREE_SLOT_CURRENT
-+  @prototype: SDCONFIG_FUNC_FREE_SLOT_CURRENT
-+  @category: PD_Reference
-+
-+  @input:  none
-+
-+  @output: none
-+
-+  @return: SDIO Status
-+
-+  @notes: This command code is used in the SDLIB_IssueConfig() API.  The command
-+          frees the allocated current for a card function.  This command should be
-+          issued only once (per function) and only after an allocation was successfully made.
-+
-+  @example: Example of freeing slot current:
-+        status = SDLIB_IssueConfig(pInstance->pDevice,
-+                                   SDCONFIG_FUNC_FREE_SLOT_CURRENT,
-+                                   NULL,
-+                                   0);
-+
-+  @see also: SDCONFIG_FUNC_ALLOC_SLOT_CURRENT
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Set the bus mode for the SD/SDIO card.
-+
-+  @function name: SDCONFIG_FUNC_CHANGE_BUS_MODE
-+  @prototype: SDCONFIG_FUNC_CHANGE_BUS_MODE
-+  @category: PD_Reference
-+
-+  @input:  none
-+
-+  @output: none
-+
-+  @return: SDIO Status
-+
-+  @notes:     This command code is used in the SDLIB_IssueConfig() API.  The command
-+          alters the card's bus mode (width and clock rate) to a driver specified
-+          value.  The driver must read the current bus mode flags, modify if necessary
-+          and pass the value in the SDCONFIG_BUS_MODE_DATA structure.
-+              If the bus width is changed (1 or 4 bit) the caller must adjust the mode flags
-+          for the new width. Cards cannot be switched between 1/4 bit and SPI mode.
-+          Switching to or from SPI mode requires a power cycle. Adjustments to the clock
-+          rate is immediate on the next bus transaction.  The actual clock rate value is
-+          limited by the host controller and is reported in the ClockRate field when the
-+          command completes successfully.
-+              The bus mode change is card wide and may affect other SDIO functions on
-+          multi-function cards. Use this feature with caution. This feature should NOT be
-+          used to dynamically control clock rates during runtime and should only be used
-+          at card initialization. Changing the bus mode must be done with SDIO function
-+          interrupts masked.
-+              This request can block and must only be called from a schedulable context.
-+
-+  @example: Example of changing the clock rate:
-+    SDCONFIG_BUS_MODE_DATA  busSettings;
-+    ZERO_OBJECT(busSettings);
-+       // get current bus flags and keep the same bus width
-+    busSettings.BusModeFlags = SDDEVICE_GET_BUSMODE_FLAGS(pInstance->pDevice);
-+    busSettings.ClockRate = 8000000;  // adjust clock to 8 Mhz
-+       // issue config request to override clock rate
-+    status = SDLIB_IssueConfig(pInstance->pDevice,
-+                               SDCONFIG_FUNC_CHANGE_BUS_MODE,
-+                               &busSettings,
-+                               sizeof(SDCONFIG_BUS_MODE_DATA));
-+
-+  @see also: SDDEVICE_GET_BUSMODE_FLAGS
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the debug level of the underlying host controller driver.
-+
-+  @function name: SDCONFIG_GET_HCD_DEBUG
-+  @prototype: SDCONFIG_GET_HCD_DEBUG
-+  @category: PD_Reference
-+
-+  @input:  none
-+
-+  @output: CT_DEBUG_LEVEL
-+
-+  @return: SDIO Status
-+
-+  @notes: This command code is used in the SDLIB_IssueConfig() API.  The command
-+          requests the current debug level of the HCD driver.  This API is useful for
-+          saving the current debug level of the HCD prior to issuing SDCONFIG_SET_HCD_DEBUG
-+          in order to increase the verbosity of the HCD. This API should be used only for
-+          debugging purposes.  If multiple functions attempt to save and set the HCD debug
-+          level simultanously, the final debug level will be unknown. Not all HCDs support
-+          this command.
-+
-+  @example: Example of saving the debug level:
-+        CT_DEBUG_LEVEL savedDebug;
-+        status = SDLIB_IssueConfig(pInstance->pDevice,
-+                                   SDCONFIG_GET_HCD_DEBUG,
-+                                   &savedDebug,
-+                                   sizeof(savedDebug));
-+
-+  @see also: SDCONFIG_SET_HCD_DEBUG
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Set the debug level of the underlying host controller driver.
-+
-+  @function name: SDCONFIG_SET_HCD_DEBUG
-+  @prototype: SDCONFIG_SET_HCD_DEBUG
-+  @category: PD_Reference
-+
-+  @input:  CT_DEBUG_LEVEL
-+
-+  @output: none
-+
-+  @return: SDIO Status
-+
-+  @notes: This command code is used in the SDLIB_IssueConfig() API.  The command
-+          sets the current debug level of the HCD driver.  This API is useful for
-+          setting the debug level of the HCD programatically for debugging purposes.
-+          If multiple functions attempt to save and set the HCD debug
-+          level simultanously, the final debug level will be unknown. Not all HCDs support
-+          this request.
-+
-+  @example: Example of setting the debug level:
-+        CT_DEBUG_LEVEL setDebug = 15;
-+        status = SDLIB_IssueConfig(pInstance->pDevice,
-+                                   SDCONFIG_GET_HCD_DEBUG,
-+                                   &setDebug,
-+                                   sizeof(setDebug));
-+
-+  @see also: SDCONFIG_GET_HCD_DEBUG
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Instruct the bus driver to not check the SDIO card interrupt pending
-+             register on card interrupts, if possible.
-+
-+  @function name: SDCONFIG_FUNC_NO_IRQ_PEND_CHECK
-+  @prototype: SDCONFIG_FUNC_NO_IRQ_PEND_CHECK
-+  @category: PD_Reference
-+
-+  @input:  none
-+
-+  @output: none
-+
-+  @return: SDIO Status
-+
-+  @notes: This command code is used in the SDLIB_IssueConfig() API.  The command instructs the
-+          bus driver to skip checking the card interrupt pending register on each card
-+          interrupt.  The bus driver will assume the function is interrupting and immediately start
-+          the interrupt processing stage. This option is only valid for single function cards.
-+          The bus driver will reject the command for a card with more than 1 function.
-+          For single function cards, this can improve interrupt response time.
-+
-+  @example: Example of skipping IRQ pending checks:
-+
-+        status = SDLIB_IssueConfig(pInstance->pDevice,
-+                                   SDCONFIG_FUNC_NO_IRQ_PEND_CHECK,
-+                                   NULL,
-+                                   0);
-+
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-diff --git a/drivers/sdio/stack/busdriver/sdio_bus_events.c b/drivers/sdio/stack/busdriver/sdio_bus_events.c
-new file mode 100644
-index 0000000..5b3148d
---- /dev/null
-+++ b/drivers/sdio/stack/busdriver/sdio_bus_events.c
-@@ -0,0 +1,1040 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdio_bus_events.c
-+
-+@abstract: OS independent bus driver support
-+
-+#notes: this file contains various event handlers and helpers
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define MODULE_NAME  SDBUSDRIVER
-+#include <linux/sdio/ctsystem.h>
-+#include <linux/sdio/sdio_busdriver.h>
-+#include <linux/sdio/sdio_lib.h>
-+#include "_busdriver.h"
-+#include <linux/sdio/_sdio_defs.h>
-+#include <linux/sdio/mmc_defs.h>
-+
-+static SDIO_STATUS ScanSlotForCard(PSDHCD pHcd,
-+                                   PBOOL  pCardPresent);
-+static void GetPendingIrqComplete(PSDREQUEST pReq);
-+static void ProcessPendingIrqs(PSDHCD  pHcd, UINT8 IntPendingMsk);
-+
-+/*
-+ * DeviceDetach - tell core a device was removed from a slot
-+*/
-+SDIO_STATUS DeviceDetach(PSDHCD pHcd)
-+{
-+    SDCONFIG_SDIO_INT_CTRL_DATA irqData;
-+
-+    ZERO_OBJECT(irqData);
-+
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: DeviceDetach\n"));
-+        /* tell any function drivers we are gone */
-+    RemoveHcdFunctions(pHcd);
-+        /* delete the devices associated with this HCD */
-+    DeleteDevices(pHcd);
-+        /* check and see if there are any IRQs that were left enabled */
-+    if (pHcd->IrqsEnabled) {
-+        irqData.SlotIRQEnable = FALSE;
-+            /* turn off IRQ detection in HCD */
-+        _IssueConfig(pHcd,SDCONFIG_SDIO_INT_CTRL,(PVOID)&irqData, sizeof(irqData));
-+    }
-+
-+        /* reset hcd state */
-+    ResetHcdState(pHcd);
-+
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: DeviceDetach\n"));
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+/*
-+ * DeviceAttach - tell core a device was inserted into a slot
-+*/
-+SDIO_STATUS DeviceAttach(PSDHCD pHcd)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    PSDDEVICE pDevice = NULL;
-+    UINT      ii;
-+
-+
-+    if (IS_CARD_PRESENT(pHcd)) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: DeviceAttach called on occupied slot!\n"));
-+        return SDIO_STATUS_ERROR;
-+    }
-+
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: DeviceAttach bdctxt:0x%X \n", (UINT32)pBusContext));
-+
-+    if (IS_HCD_RAW(pHcd)) {
-+         DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: RAW HCD (%s) device attach \n",pHcd->pName));
-+            /* this is a raw HCD */
-+        memset(&pHcd->CardProperties,0,sizeof(pHcd->CardProperties));
-+        pHcd->CardProperties.Flags = CARD_RAW;
-+        pHcd->CardProperties.IOFnCount = 0;
-+          /* for raw HCD, set up minimum parameters
-+           * since we cannot determine these values using any standard, use values
-+           * reported by the HCD */
-+            /* the operational rate is just the max clock rate reported */
-+        pHcd->CardProperties.OperBusClock =  pHcd->MaxClockRate;
-+            /* the max bytes per data transfer is just the max bytes per block */
-+        pHcd->CardProperties.OperBlockLenLimit = pHcd->MaxBytesPerBlock;
-+            /* if the raw HCD uses blocks to transfer, report the operational size
-+             * from the HCD max value */
-+        pHcd->CardProperties.OperBlockCountLimit = pHcd->MaxBlocksPerTrans;
-+            /* set the slot preferred voltage */
-+        pHcd->CardProperties.CardVoltage = pHcd->SlotVoltagePreferred;
-+    } else {
-+            /* initialize this card and get card properties  */
-+        if (!SDIO_SUCCESS((status = SDInitializeCard(pHcd)))) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: DeviceAttach, failed to initialize card, %d\n",
-+                                   status));
-+            return status;
-+        }
-+    }
-+
-+        /* check for SD or MMC, this must be done first as the query may involve
-+         * de-selecting the card */
-+    do {
-+        if (!(pHcd->CardProperties.Flags & (CARD_MMC | CARD_SD | CARD_RAW))) {
-+                /* none of these were discovered */
-+            break;
-+        }
-+        pDevice = AllocateDevice(pHcd);
-+        if (NULL == pDevice) {
-+            break;
-+        }
-+        if (pHcd->CardProperties.Flags & CARD_RAW) {
-+                /* set function number to 1 for IRQ processing */
-+            SDDEVICE_SET_SDIO_FUNCNO(pDevice,1);
-+        } else {
-+                /* get the ID info for the SD/MMC Card */
-+            if (!SDIO_SUCCESS((status = SDQuerySDMMCInfo(pDevice)))) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: DeviceAttach, query SDMMC Info failed \n"));
-+                FreeDevice(pDevice);
-+                break;
-+            }
-+        }
-+        AddDeviceToList(pDevice);
-+            /* look for a function driver to handle this card */
-+        ProbeForFunction(pDevice, pHcd);
-+    } while (FALSE);
-+
-+        /* create a device for each I/O function */
-+    for(ii= 1; ii <= pHcd->CardProperties.IOFnCount; ii++) {
-+        pDevice = AllocateDevice(pHcd);
-+        if (NULL == pDevice) {
-+            break;
-+        }
-+            /* set the function number */
-+        SDDEVICE_SET_SDIO_FUNCNO(pDevice,ii);
-+            /* get the ID info for each I/O function */
-+        if (!SDIO_SUCCESS((status = SDQuerySDIOInfo(pDevice)))) {
-+            DBG_PRINT(SDDBG_ERROR,
-+                    ("SDIO Bus Driver: DeviceAttach, could not query SDIO Info, funcNo:%d status:%d \n",
-+                    ii, status));
-+            FreeDevice(pDevice);
-+                /* keep loading other functions */
-+            continue;
-+        }
-+        AddDeviceToList(pDevice);
-+            /* look for a function driver to handle this card */
-+        ProbeForFunction(pDevice, pHcd);
-+    }
-+
-+
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: DeviceAttach \n"));
-+    return status;
-+}
-+
-+static INLINE void CompleteRequestCheckCancel(PSDHCD pHcd, PSDREQUEST pReqToComplete)
-+{
-+    BOOL cancel = FALSE;
-+    PSDFUNCTION pFunc = NULL;
-+
-+        /* handle cancel of current request */
-+    if (pReqToComplete->Flags & SDREQ_FLAGS_CANCELED) {
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver - _SDIO_HandleHcdEvent: cancelling req 0X%X\n", (UINT)pReqToComplete));
-+        cancel = TRUE;
-+        pReqToComplete->Status = SDIO_STATUS_CANCELED;
-+        pFunc = pReqToComplete->pFunction;
-+        DBG_ASSERT(pFunc != NULL);
-+    }
-+
-+    DoRequestCompletion(pReqToComplete, pHcd);
-+
-+    if (cancel) {
-+        SignalSet(&pFunc->CleanupReqSig);
-+    }
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Indicate to the SDIO bus driver (core) of an event in the host controller
-+             driver.
-+
-+  @function name: SDIO_HandleHcdEvent
-+  @prototype: SDIO_STATUS SDIO_HandleHcdEvent(PSDHCD pHcd, HCD_EVENT Event)
-+  @category: HD_Reference
-+
-+  @input:  pHcd - the host controller structure that was registered
-+           HCD_EVENT - event code
-+
-+  @output: none
-+
-+  @return: SDIO_STATUS
-+
-+  @notes:
-+          The host controller driver can indicate asynchronous events by calling this
-+          function with an appropriate event code. Refer to the HDK help manual for
-+          more information on the event types
-+
-+  @example: Example of indicating a card insertion event:
-+            SDIO_HandleHcdEvent(&Hcd, EVENT_HCD_ATTACH);
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _SDIO_HandleHcdEvent(PSDHCD pHcd, HCD_EVENT Event)
-+{
-+    PSDREQUEST       pReq;
-+    PSDREQUEST       pReqToComplete = NULL;
-+    PSDREQUEST       pNextReq = NULL;
-+    SDIO_STATUS      status;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    DBG_PRINT(SDIODBG_HCD_EVENTS, ("SDIO Bus Driver: _SDIO_HandleHcdEvent, event type 0x%X, HCD:0x%X\n",
-+                         Event, (UINT)pHcd));
-+
-+    if (Event == EVENT_HCD_TRANSFER_DONE) {
-+        pReq = GET_CURRENT_REQUEST(pHcd);
-+        if (NULL == pReq) {
-+            DBG_ASSERT(FALSE);
-+            return SDIO_STATUS_ERROR;
-+        }
-+
-+        status = _AcquireHcdLock(pHcd);
-+        if (SDIO_SUCCESS(status)) {
-+                /* null out the current request */
-+            SET_CURRENT_REQUEST(pHcd, NULL);
-+            status = _ReleaseHcdLock(pHcd);
-+        } else {
-+            DBG_PRINT(SDDBG_ERROR,
-+              ("SDIO Bus Driver: SDIO_HandleHcdEvent Failed to acquire HCD lock \n"));
-+            return SDIO_STATUS_ERROR;
-+        }
-+
-+            /* note: the queue is still marked busy to prevent other threads/tasks from starting
-+             * new requests while we are handling completion , some completed requests are
-+             * marked as barrier requests which must be handled atomically */
-+
-+        status = pReq->Status;
-+        DBG_PRINT(SDIODBG_REQUESTS,
-+            ("+SDIO Bus Driver: Handling Transfer Done (CMD:%d, Status:%d) from HCD:0x%08X \n",
-+                  pReq->Command, status, (INT)pHcd));
-+            /* check SPI mode conversion */
-+        if (IS_HCD_BUS_MODE_SPI(pHcd) && SDIO_SUCCESS(status)) {
-+            if (!(pReq->Flags & SDREQ_FLAGS_RESP_SKIP_SPI_FILT) && !(pReq->Flags & SDREQ_FLAGS_PSEUDO) &&
-+                (GET_SDREQ_RESP_TYPE(pReq->Flags) != SDREQ_FLAGS_NO_RESP)) {
-+                ConvertSPI_Response(pReq, NULL);
-+            }
-+        }
-+
-+        DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Completing Request:0x%08X \n",(INT)pReq));
-+
-+        if (!SDIO_SUCCESS(status) &&
-+            (status != SDIO_STATUS_CANCELED)  &&
-+            !(pReq->Flags & SDREQ_FLAGS_CANCELED) &&
-+            (pReq->RetryCount > 0)) {
-+                /* retry the request if it failed, was NOT cancelled and the retry count
-+                 * is greater than zero */
-+            pReq->RetryCount--;
-+            pReqToComplete = NULL;
-+                /* clear SPI converted flag */
-+            pReq->Flags &= ~SDREQ_FLAGS_RESP_SPI_CONVERTED;
-+            pNextReq = pReq;
-+        } else {
-+                /* complete the request */
-+            if (pReq->Flags & SDREQ_FLAGS_BARRIER) {
-+                    /* a barrier request must be completed before the next bus request is
-+                     * started */
-+                CompleteRequestCheckCancel(pHcd, pReq);
-+                if (!ForceAllRequestsAsync()) {
-+                    if (CHECK_API_VERSION_COMPAT(pHcd,2,6)) {
-+                            /* the request was completed, decrement recursion count */
-+                        status = _AcquireHcdLock(pHcd);
-+                        if (!SDIO_SUCCESS(status)) {
-+                            return status;
-+                        }
-+                        pHcd->Recursion--;
-+                        DBG_ASSERT(pHcd->Recursion >= 0);
-+                        status = _ReleaseHcdLock(pHcd);
-+                    } else {
-+                            /* reset bit */
-+                        AtomicTest_Clear(&pHcd->HcdFlags, HCD_REQUEST_CALL_BIT);
-+                    }
-+                }
-+                pReqToComplete = NULL;
-+            } else {
-+                    /* complete this after the next request has
-+                     * been started */
-+                pReqToComplete = pReq;
-+            }
-+        }
-+
-+            /* acquire the hcd lock to look at the queues */
-+        status = _AcquireHcdLock(pHcd);
-+        if (SDIO_SUCCESS(status)) {
-+            if (pReqToComplete != NULL) {
-+                    /* queue the request that was completed */
-+                QueueRequest(&pHcd->CompletedRequestQueue, pReqToComplete);
-+            }
-+            if (NULL == pNextReq) {
-+                    /* check the queue for the next request */
-+                DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Checking queue.. \n"));
-+                    /* check to see if the HCD was already working on one.  This occurs if
-+                     * the current request being completed was a barrier request and the
-+                     * barrier completion routine submitted a new request to the head of the
-+                     * queue */
-+                if (GET_CURRENT_REQUEST(pHcd) == NULL) {
-+                    pNextReq = DequeueRequest(&pHcd->RequestQueue);
-+                    if (NULL == pNextReq) {
-+                            /* nothing in the queue, mark it not busy */
-+                        MarkQueueNotBusy(&pHcd->RequestQueue);
-+                        DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Queue idle \n"));
-+                    } else {
-+                        DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Next request in queue: 0x%X \n",
-+                            (INT)pNextReq));
-+                    }
-+                } else {
-+                    DBG_PRINT(SDIODBG_REQUESTS,
-+                        ("SDIO Bus Driver: Busy Queue from barrier request \n"));
-+                }
-+            }
-+
-+            if (pNextReq != NULL) {
-+                    /* a new request will be submitted to the HCD below,
-+                     * check recursion while we have the lock */
-+                if (CHECK_API_VERSION_COMPAT(pHcd,2,6)) {
-+                    CHECK_HCD_RECURSE(pHcd,pNextReq);
-+                }
-+            }
-+            status = _ReleaseHcdLock(pHcd);
-+        } else {
-+            DBG_PRINT(SDDBG_ERROR,
-+              ("SDIO Bus Driver: SDIO_HandleHcdEvent Failed to acquire HCD lock \n"));
-+            return SDIO_STATUS_ERROR;
-+        }
-+            /* check for the next request to issue */
-+        if (pNextReq != NULL) {
-+            DBG_PRINT(SDIODBG_REQUESTS, ("SDIO Bus Driver: Starting Next Request: 0x%X \n",
-+                        (INT)pNextReq));
-+            SET_CURRENT_REQUEST(pHcd,pNextReq);
-+            status = CallHcdRequest(pHcd);
-+                /* check and see if the HCD completed the request in the callback */
-+            if (status != SDIO_STATUS_PENDING) {
-+                    /* recurse and process the request */
-+                _SDIO_HandleHcdEvent(pHcd, EVENT_HCD_TRANSFER_DONE);
-+            }
-+        }
-+
-+        /* now empty the completed request queue
-+         * - this guarantees in-order completion even during recursion */
-+        status = _AcquireHcdLock(pHcd);
-+        if (SDIO_SUCCESS(status)) {
-+            while (1) {
-+                pReqToComplete = DequeueRequest(&pHcd->CompletedRequestQueue);
-+                status = _ReleaseHcdLock(pHcd);
-+                if (pReqToComplete != NULL) {
-+                    CompleteRequestCheckCancel(pHcd, pReqToComplete);
-+                    if (!CHECK_API_VERSION_COMPAT(pHcd,2,6)) {
-+                        if (!ForceAllRequestsAsync()) {
-+                                /* reset bit */
-+                            AtomicTest_Clear(&pHcd->HcdFlags, HCD_REQUEST_CALL_BIT);
-+                        }
-+                    }
-+                        /* re-acquire lock */
-+                    status = _AcquireHcdLock(pHcd);
-+                    if (!SDIO_SUCCESS(status)) {
-+                        return SDIO_STATUS_ERROR;
-+                    }
-+                    if (CHECK_API_VERSION_COMPAT(pHcd,2,6)) {
-+                        if (!ForceAllRequestsAsync()) {
-+                            /* while we have the lock, decrement recursion count each time
-+                             * we complete a request */
-+                            pHcd->Recursion--;
-+                            DBG_ASSERT(pHcd->Recursion >= 0);
-+                        }
-+                    }
-+                }  else {
-+                        /* we're done */
-+                    break;
-+                }
-+            }
-+        } else {
-+            DBG_PRINT(SDDBG_ERROR,
-+              ("SDIO Bus Driver: SDIO_HandleHcdEvent Failed to acquire HCD lock \n"));
-+            return SDIO_STATUS_ERROR;
-+        }
-+        DBG_PRINT(SDIODBG_REQUESTS, ("-SDIO Bus Driver: Transfer Done Handled \n"));
-+        return SDIO_STATUS_SUCCESS;
-+    }
-+
-+    switch(Event) {
-+        case EVENT_HCD_ATTACH:
-+        case EVENT_HCD_DETACH:
-+                /* card detect helper does the actual attach detach */
-+            return PostCardDetectEvent(pBusContext,Event,pHcd);
-+        case EVENT_HCD_SDIO_IRQ_PENDING:
-+            return DeviceInterrupt(pHcd);
-+        default:
-+            DBG_PRINT(SDDBG_ERROR, ("-SDIO Bus Driver: SDIO_HandleHcdEvent, invalid event type 0x%X, HCD:0x%X\n",
-+                                    Event, (UINT)pHcd));
-+        return SDIO_STATUS_INVALID_PARAMETER;
-+    }
-+
-+}
-+
-+/* card detect helper function */
-+THREAD_RETURN CardDetectHelperFunction(POSKERNEL_HELPER pHelper)
-+{
-+    SDIO_STATUS       status;
-+    HCD_EVENT_MESSAGE message;
-+    INT               length;
-+
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver - CardDetectHelperFunction starting up: 0x%X \n", (INT)pHelper));
-+
-+    while (1) {
-+
-+            /* wait for wake up event */
-+        status = SD_WAIT_FOR_WAKEUP(pHelper);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver - Card Detect Helper Semaphore Pend Error:%d \n",
-+                                    status));
-+            break;
-+        }
-+
-+        if (SD_IS_HELPER_SHUTTING_DOWN(pHelper)) {
-+                /* cleanup message queue on shutdown */
-+            while (1) {
-+                length = sizeof(message);
-+                    /* get a message */
-+                status = SDLIB_GetMessage(pBusContext->pCardDetectMsgQueue,
-+                                          &message, &length);
-+                if (!SDIO_SUCCESS(status)) {
-+                    break;
-+                }
-+                if (message.pHcd != NULL) {
-+                        /* decrement HCD reference count */
-+                    OS_DecHcdReference(message.pHcd);
-+                }
-+            }
-+
-+            break;
-+        }
-+
-+        while (1) {
-+            length = sizeof(message);
-+                /* get a message */
-+            status = SDLIB_GetMessage(pBusContext->pCardDetectMsgQueue,
-+                                      &message, &length);
-+            if (!SDIO_SUCCESS(status)) {
-+                break;
-+            }
-+
-+            switch (message.Event) {
-+                case EVENT_HCD_ATTACH:
-+                    DeviceAttach(message.pHcd);
-+                    break;
-+                case EVENT_HCD_DETACH:
-+                    DeviceDetach(message.pHcd);
-+                    break;
-+                case EVENT_HCD_CD_POLLING:
-+                        /* run detector */
-+                    RunCardDetect();
-+                    break;
-+                default:
-+                    DBG_ASSERT(FALSE);
-+                    break;
-+            }
-+
-+            if (message.pHcd != NULL) {
-+                    /* message was processed, decrement reference count */
-+                OS_DecHcdReference(message.pHcd);
-+            }
-+        }
-+    }
-+
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver - Card Detect Helper Exiting.. \n"));
-+    return 0;
-+}
-+
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  RunCardDetect - run card detect on host controller slots that require polling
-+  Input:
-+  Output:
-+  Return:
-+  Notes: This function is called from the card detect timer thread
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void RunCardDetect(void)
-+{
-+    BOOL       CDPollingRequired = FALSE;
-+    PSDLIST    pListItem;
-+    PSDHCD     pHcd;
-+    BOOL       cardPresent;
-+
-+    DBG_PRINT(SDIODBG_CD_TIMER, ("+SDIO Bus Driver: RunCardDetect\n"));
-+
-+       /* protect the HCD list */
-+    if (!SDIO_SUCCESS(SemaphorePendInterruptable(&pBusContext->HcdListSem))) {
-+        DBG_ASSERT(FALSE);
-+        return;  /* wait interrupted */
-+    }
-+        /* while we are running the detector we are blocking HCD removal*/
-+    SDITERATE_OVER_LIST(&pBusContext->HcdList, pListItem) {
-+        pHcd = CONTAINING_STRUCT(pListItem, SDHCD, SDList);
-+            /* does the HCD require polling ? */
-+        if (pHcd->Attributes & SDHCD_ATTRIB_SLOT_POLLING) {
-+            DBG_PRINT(SDIODBG_CD_TIMER, ("SDIO Bus Driver: Found HCD requiring polling \n"));
-+                /* set flag to queue the timer */
-+            CDPollingRequired = TRUE;
-+            if (IS_CARD_PRESENT(pHcd)) {
-+                    /* there is a device in the slot */
-+                cardPresent = TRUE;
-+                if (SDIO_SUCCESS(ScanSlotForCard(pHcd,&cardPresent))) {
-+                    if (!cardPresent) {
-+                        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver CD Polling.. Card Removal Detected\n"));
-+                        DeviceDetach(pHcd);
-+                    }
-+                }
-+            } else {
-+                cardPresent = FALSE;
-+                if (SDIO_SUCCESS(ScanSlotForCard(pHcd,&cardPresent))) {
-+                     if (cardPresent) {
-+                        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver CD Polling.. Card Detected\n"));
-+                        DeviceAttach(pHcd);
-+                    }
-+                }
-+            }
-+        }
-+
-+        DBG_PRINT(SDIODBG_CD_TIMER, ("SDIO Bus Driver: moving to next hcd:0x%X \n",
-+                                     (INT)pListItem->pNext));
-+    }
-+
-+        /* check if we need to queue the timer */
-+    if (CDPollingRequired && !pBusContext->CDTimerQueued) {
-+        pBusContext->CDTimerQueued = TRUE;
-+        DBG_PRINT(SDIODBG_CD_TIMER, ("SDIO Bus Driver: Queuing Card detect timer \n"));
-+        if (!SDIO_SUCCESS(
-+            QueueTimer(SDIOBUS_CD_TIMER_ID, pBusContext->CDPollingInterval))) {
-+            DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: failed to queue CD timer \n"));
-+            pBusContext->CDTimerQueued = FALSE;
-+        }
-+    }
-+        /* release HCD list lock */
-+    SemaphorePost(&pBusContext->HcdListSem);
-+    DBG_PRINT(SDIODBG_CD_TIMER, ("-SDIO Bus Driver: RunCardDetect\n"));
-+}
-+
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  ScanSlotForCard - scan slot for a card
-+  Input:  pHcd - the hcd
-+  Output: pCardPresent - card present flag (set/cleared on return)
-+  Return:
-+  Notes:
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static SDIO_STATUS ScanSlotForCard(PSDHCD pHcd,PBOOL pCardPresent)
-+{
-+    SDIO_STATUS         status = SDIO_STATUS_SUCCESS;
-+    UINT8               temp;
-+
-+    DBG_PRINT(SDIODBG_CD_TIMER, ("+SDIO Bus Driver: ScanSlotForCard\n"));
-+
-+    do {
-+        if (!IS_CARD_PRESENT(pHcd)) {
-+            INT   dbgLvl;
-+            dbgLvl = DBG_GET_DEBUG_LEVEL();
-+            DBG_SET_DEBUG_LEVEL(SDDBG_WARN);
-+            status = CardInitSetup(pHcd);
-+            DBG_SET_DEBUG_LEVEL(dbgLvl);
-+            if (!SDIO_SUCCESS(status)) {
-+                break;
-+            }
-+                /* issue go-idle */
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_RESP_R1,NULL);
-+            } else {
-+                _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_NO_RESP,NULL);
-+            }
-+                /* try SDIO */
-+            status = TestPresence(pHcd,CARD_SDIO,NULL);
-+            if (SDIO_SUCCESS(status)) {
-+                *pCardPresent = TRUE;
-+                break;
-+            }
-+                /* issue go-idle */
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_RESP_R1,NULL);
-+            } else {
-+                _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_NO_RESP,NULL);
-+            }
-+                /* try SD */
-+            status = TestPresence(pHcd,CARD_SD,NULL);
-+            if (SDIO_SUCCESS(status)) {
-+                *pCardPresent = TRUE;
-+                break;
-+            }
-+                /* issue go-idle */
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_RESP_R1,NULL);
-+            } else {
-+                _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_NO_RESP,NULL);
-+            }
-+                /* try MMC */
-+            status = TestPresence(pHcd,CARD_MMC,NULL);
-+            if (SDIO_SUCCESS(status)) {
-+                *pCardPresent = TRUE;
-+                break;
-+            }
-+        } else {
-+            if (pHcd->CardProperties.Flags & CARD_SDIO) {
-+#ifdef DUMP_INT_PENDING
-+                temp = 0;
-+                    /* handy debug prints to check interrupt status and print pending register */
-+                status = Cmd52ReadByteCommon(pHcd->pPseudoDev, SDIO_INT_ENABLE_REG, &temp);
-+                if (SDIO_SUCCESS(status) && (temp != 0)) {
-+                    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: INT Enable Reg: 0x%2.2X\n", temp));
-+                    status = Cmd52ReadByteCommon(pHcd->pPseudoDev, SDIO_INT_PENDING_REG, &temp);
-+                    if (SDIO_SUCCESS(status)) {
-+                        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: INT Pend Reg: 0x%2.2X\n", temp));
-+                    }
-+                }
-+#endif
-+                    /* for SDIO cards, read the revision register */
-+                status = Cmd52ReadByteCommon(pHcd->pPseudoDev, CCCR_SDIO_REVISION_REG, &temp);
-+            } else if (pHcd->CardProperties.Flags & (CARD_SD | CARD_MMC)) {
-+                    /* for SD/MMC cards, issue SEND_STATUS */
-+                if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                        /* SPI uses the SPI R2 response */
-+                    status = _IssueSimpleBusRequest(pHcd,
-+                                                    CMD13,
-+                                                    0,
-+                                                    SDREQ_FLAGS_RESP_R2,
-+                                                    NULL);
-+                } else {
-+                    status = _IssueSimpleBusRequest(pHcd,
-+                                                    CMD13,
-+                                                    (pHcd->CardProperties.RCA << 16),
-+                                                    SDREQ_FLAGS_RESP_R1,NULL);
-+                }
-+            } else {
-+                DBG_ASSERT(FALSE);
-+            }
-+            if (!SDIO_SUCCESS(status)) {
-+                    /* card is gone */
-+                *pCardPresent = FALSE;
-+            }
-+        }
-+    } while (FALSE);
-+
-+    if (status == SDIO_STATUS_BUS_RESP_TIMEOUT) {
-+        status = SDIO_STATUS_SUCCESS;
-+    }
-+
-+    DBG_PRINT(SDIODBG_CD_TIMER, ("-SDIO Bus Driver: ScanSlotForCard status:%d\n",
-+                                 status));
-+
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  DeviceInterrupt - handle device interrupt
-+  Input:  pHcd -  host controller
-+  Output:
-+  Return:
-+  Notes:
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS DeviceInterrupt(PSDHCD pHcd)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    SDIO_STATUS status2;
-+    PSDREQUEST pReq = NULL;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    DBG_PRINT(SDIODBG_FUNC_IRQ, ("+SDIO Bus Driver: DeviceInterrupt\n"));
-+
-+    if (!IS_CARD_PRESENT(pHcd)) {
-+        DBG_PRINT(SDDBG_ERROR, ("-SDIO Bus Driver: Device interrupt asserted on empty slot!\n"));
-+        return SDIO_STATUS_ERROR;
-+    }
-+
-+    do {
-+            /* for RAW HCDs or HCDs flagged for single-function IRQ optimization */
-+        if (IS_HCD_RAW(pHcd) || (pHcd->HcdFlags & (1 << HCD_IRQ_NO_PEND_CHECK))) {
-+            status = _AcquireHcdLock(pHcd);
-+            if (!SDIO_SUCCESS(status)) {
-+                return status;
-+            }
-+            if (pHcd->IrqProcState != SDHCD_IDLE) {
-+                status = SDIO_STATUS_ERROR;
-+                status2 = _ReleaseHcdLock(pHcd);
-+            } else {
-+                DBG_PRINT(SDIODBG_FUNC_IRQ, ("SDIO Bus Driver :  Device Interrupt \n"));
-+                    /* mark that we are processing */
-+                pHcd->IrqProcState = SDHCD_IRQ_PENDING;
-+                status2 = _ReleaseHcdLock(pHcd);
-+                    /* process Irqs for raw hcds or HCDs with the single function optimization */
-+                    /* force processing of function 1 interrupt */
-+                ProcessPendingIrqs(pHcd, (1 << 1));
-+            }
-+            DBG_PRINT(SDIODBG_FUNC_IRQ, ("-SDIO Bus Driver: DeviceInterrupt: %d\n", status));
-+                /* done with RAW irqs */
-+            return status;
-+        }
-+
-+            /* pre-allocate a request to get the pending bits, we have to do this outside the
-+              * hcd lock acquisition */
-+        pReq = AllocateRequest();
-+
-+        if (NULL == pReq) {
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            break;
-+        }
-+
-+        status = _AcquireHcdLock(pHcd);
-+
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+
-+        if (pHcd->IrqProcState != SDHCD_IDLE) {
-+            status = SDIO_STATUS_ERROR;
-+        } else {
-+                /* mark that we are processing */
-+            pHcd->IrqProcState = SDHCD_IRQ_PENDING;
-+                /* build argument to read IRQ pending register */
-+            SDIO_SET_CMD52_READ_ARG(pReq->Argument,0,SDIO_INT_PENDING_REG);
-+            pReq->Command = CMD52;
-+            pReq->Flags = SDREQ_FLAGS_TRANS_ASYNC | SDREQ_FLAGS_RESP_SDIO_R5;
-+            pReq->pCompleteContext = (PVOID)pHcd;
-+            pReq->pCompletion = GetPendingIrqComplete;
-+            pReq->RetryCount = SDBUS_MAX_RETRY;
-+        }
-+
-+        status2 = _ReleaseHcdLock(pHcd);
-+
-+        if (!SDIO_SUCCESS(status2)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: lock release error: %d\n", status2));
-+        }
-+
-+    } while (FALSE);
-+
-+    if (SDIO_SUCCESS(status)) {
-+        DBG_ASSERT(pReq != NULL);
-+        IssueRequestToHCD(pHcd,pReq);
-+        status = SDIO_STATUS_PENDING;
-+    } else {
-+        if (pReq != NULL) {
-+            FreeRequest(pReq);
-+        }
-+    }
-+
-+    DBG_PRINT(SDIODBG_FUNC_IRQ, ("-SDIO Bus Driver: DeviceInterrupt: %d\n", status));
-+    return status;
-+}
-+
-+
-+/* SDIO IRQ helper */
-+THREAD_RETURN SDIOIrqHelperFunction(POSKERNEL_HELPER pHelper)
-+{
-+    PSDHCD            pHcd;
-+    SDIO_STATUS       status;
-+    PSDLIST           pListItem;
-+    PSDDEVICE         pDevice;
-+    UINT8             funcMask;
-+    PSDDEVICE         pDeviceIRQ[7];
-+    UINT              deviceIrqCount = 0;
-+    UINT              ii;
-+
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver - SDIOIrqHelperFunction starting up \n"));
-+
-+    pHcd = (PSDHCD)pHelper->pContext;
-+    DBG_ASSERT(pHcd != NULL);
-+
-+    while (1) {
-+
-+            /* wait for wake up event */
-+        status = SD_WAIT_FOR_WAKEUP(pHelper);
-+
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver - SDIOIrqHelperFunction Pend Error:%d \n",
-+                                    status));
-+            break;
-+        }
-+
-+        if (SD_IS_HELPER_SHUTTING_DOWN(pHelper)) {
-+            break;
-+        }
-+
-+        DBG_PRINT(SDIODBG_FUNC_IRQ, ("SDIO Bus Driver - Pending IRQs:0x%X \n",
-+                                     pHcd->PendingHelperIrqs));
-+
-+         /* take the device list lock as we iterate through the list, this blocks
-+             * device removals */
-+        status = SemaphorePendInterruptable(&pBusContext->DeviceListSem);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+            /* walk through the device list matching HCD and interrupting function */
-+        SDITERATE_OVER_LIST(&pBusContext->DeviceList, pListItem) {
-+            pDevice = CONTAINING_STRUCT(pListItem, SDDEVICE, SDList);
-+                /* check if device belongs to the HCD */
-+            if (pDevice->pHcd != pHcd){
-+                    /* not on this hcd */
-+                continue;
-+            }
-+            funcMask = 1 << SDDEVICE_GET_SDIO_FUNCNO(pDevice);
-+                /* check device function against the pending mask */
-+            if (!(funcMask & pHcd->PendingHelperIrqs)) {
-+                    /* this one is not scheduled for the helper */
-+                continue;
-+            }
-+                /* clear bit */
-+            pHcd->PendingHelperIrqs &= ~funcMask;
-+                /* check for sync IRQ and call handler */
-+            if (pDevice->pIrqFunction != NULL) {
-+                DBG_PRINT(SDIODBG_FUNC_IRQ, ("SDIO Bus Driver: Calling IRQ Handler. Fn:%d\n",
-+                                             SDDEVICE_GET_SDIO_FUNCNO(pDevice)));
-+                /* save the device so we can process it without holding any locks */
-+                pDeviceIRQ[deviceIrqCount++] = pDevice;
-+            } else {
-+                    /* this is actually okay if the device is removing, the callback
-+                     * is NULLed out */
-+                DBG_PRINT(SDIODBG_FUNC_IRQ, ("SDIO Bus Driver: No IRQ handler Fn:%d\n",
-+                                             SDDEVICE_GET_SDIO_FUNCNO(pDevice)));
-+            }
-+        }
-+            /* should have handled all these */
-+        DBG_ASSERT(pHcd->PendingHelperIrqs == 0);
-+        pHcd->PendingHelperIrqs = 0;
-+        SemaphorePost(&pBusContext->DeviceListSem);
-+        for (ii = 0; ii < deviceIrqCount; ii++) {
-+            /* now call the function */
-+            SDDEVICE_CALL_IRQ_HANDLER(pDeviceIRQ[ii]);
-+        }
-+        deviceIrqCount = 0;
-+    }
-+
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver - SDIOIrqHelperFunction Exiting.. \n"));
-+    return 0;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  GetPendingIrqComplete - completion routine for getting pending IRQs
-+  Input:  pRequest -  completed request
-+  Output:
-+  Return:
-+  Notes:
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static void GetPendingIrqComplete(PSDREQUEST pReq)
-+{
-+    UINT8       intPendingMsk;
-+    PSDHCD      pHcd;
-+
-+    do {
-+        pHcd = (PSDHCD)pReq->pCompleteContext;
-+        DBG_ASSERT(pHcd != NULL);
-+
-+        if (!SDIO_SUCCESS(pReq->Status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to get Interrupt pending register Err:%d\n",
-+                                    pReq->Status));
-+            break;
-+        }
-+
-+        if (SD_R5_GET_RESP_FLAGS(pReq->Response) & SD_R5_ERRORS) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: CMD52 resp error: 0x%X \n",
-+                                    SD_R5_GET_RESP_FLAGS(pReq->Response)));
-+            break;
-+        }
-+            /* extract the pending mask */
-+        intPendingMsk =  SD_R5_GET_READ_DATA(pReq->Response) & SDIO_INT_PEND_MASK;
-+            /* process them */
-+        ProcessPendingIrqs(pHcd, intPendingMsk);
-+
-+    } while (FALSE);
-+
-+    FreeRequest(pReq);
-+
-+    DBG_PRINT(SDIODBG_FUNC_IRQ, ("-SDIO Bus Driver: GetPendingIrqComplete \n"));
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  ProcessPendingIrqs - processing pending Irqs
-+  Input:  pHcd - host controller
-+  Input:  IntPendingMsk -  pending irq bit mask
-+  Output:
-+  Return:
-+  Notes:
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static void ProcessPendingIrqs(PSDHCD pHcd, UINT8 IntPendingMsk)
-+{
-+    PSDLIST     pListItem;
-+    PSDDEVICE   pDevice;
-+    UINT8       funcMask;
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    DBG_PRINT(SDIODBG_FUNC_IRQ, ("+SDIO Bus Driver: ProcessPendingIrqs \n"));
-+    do {
-+            /* acquire lock to protect configuration and irq enables */
-+        status = _AcquireHcdLock(pHcd);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+
-+            /* sanity check */
-+        if ((IntPendingMsk & pHcd->IrqsEnabled) != IntPendingMsk) {
-+            DBG_PRINT(SDDBG_ERROR,
-+                ("SDIO Bus Driver: IRQs asserting when not enabled : curr:0x%X , card reports: 0x%X\n",
-+                     pHcd->IrqsEnabled, IntPendingMsk));
-+                /* remove the pending IRQs that are not enabled */
-+            IntPendingMsk &= pHcd->IrqsEnabled;
-+                /* fall through */
-+        }
-+
-+        if (!IntPendingMsk) {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: No interrupts on HCD:0x%X \n", (INT)pHcd));
-+            pHcd->IrqProcState = SDHCD_IDLE;
-+            if (pHcd->IrqsEnabled) {
-+                    /* only re-arm if there are IRQs enabled */
-+                _IssueConfig(pHcd,SDCONFIG_SDIO_REARM_INT,NULL,0);
-+            }
-+            status = _ReleaseHcdLock(pHcd);
-+            break;
-+        }
-+            /* reset helper IRQ bits */
-+        pHcd->PendingHelperIrqs = 0;
-+            /* save pending IRQ acks */
-+        pHcd->PendingIrqAcks = IntPendingMsk;
-+        status = _ReleaseHcdLock(pHcd);
-+        DBG_PRINT(SDIODBG_FUNC_IRQ, ("SDIO Bus Driver: INTs Pending - 0x%2.2X \n", IntPendingMsk));
-+            /* take the device list lock as we iterate through the list, this blocks
-+             * device removals */
-+        status = SemaphorePendInterruptable(&pBusContext->DeviceListSem);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+            /* walk through the device list matching HCD and interrupting function */
-+        SDITERATE_OVER_LIST(&pBusContext->DeviceList, pListItem) {
-+            pDevice = CONTAINING_STRUCT(pListItem, SDDEVICE, SDList);
-+                /* check if device belongs to the HCD */
-+            if (pDevice->pHcd != pHcd){
-+                    /* not on this hcd */
-+                continue;
-+            }
-+            funcMask = 1 << SDDEVICE_GET_SDIO_FUNCNO(pDevice);
-+                /* check device function against the pending mask */
-+            if (!(funcMask & IntPendingMsk)) {
-+                    /* this one is not interrupting */
-+                continue;
-+            }
-+                /* check for async IRQ and call handler */
-+            if (pDevice->pIrqAsyncFunction != NULL) {
-+                DBG_PRINT(SDIODBG_FUNC_IRQ, ("SDIO Bus Driver: Calling Async IRQ Handler. Fn:%d\n",
-+                                             SDDEVICE_GET_SDIO_FUNCNO(pDevice)));
-+                SDDEVICE_CALL_IRQ_ASYNC_HANDLER(pDevice);
-+            } else {
-+                    /* this one needs the helper */
-+                pHcd->PendingHelperIrqs |= funcMask;
-+                DBG_PRINT(SDIODBG_FUNC_IRQ, ("SDIO Bus Driver: No Async IRQ, Pending Helper Fn:%d\n",
-+                                             SDDEVICE_GET_SDIO_FUNCNO(pDevice)));
-+            }
-+        }
-+            /* release HCD list lock */
-+        SemaphorePost(&pBusContext->DeviceListSem);
-+            /* check for helper IRQs */
-+        if (pHcd->PendingHelperIrqs) {
-+            pHcd->IrqProcState = SDHCD_IRQ_HELPER;
-+            DBG_PRINT(SDIODBG_FUNC_IRQ, ("SDIO Bus Driver: Waking IRQ Helper \n"));
-+            if (!SDIO_SUCCESS(SD_WAKE_OS_HELPER(&pHcd->SDIOIrqHelper))) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: failed to wake helper! \n"));
-+            }
-+        }
-+    } while (FALSE);
-+
-+    DBG_PRINT(SDIODBG_FUNC_IRQ, ("-SDIO Bus Driver: ProcessPendingIrqs \n"));
-+}
-+
-+SDIO_STATUS TryNoIrqPendingCheck(PSDDEVICE pDevice)
-+{
-+    if (pDevice->pHcd->CardProperties.IOFnCount > 1) {
-+            /* not supported on multi-function cards */
-+        DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: IRQ Pending Check cannot be bypassed, (Funcs:%d)\n",
-+            pDevice->pHcd->CardProperties.IOFnCount));
-+        return SDIO_STATUS_UNSUPPORTED;
-+    }
-+
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: pending IRQ check bypassed \n"));
-+        /* set flag to optimize this */
-+    AtomicTest_Set(&pDevice->pHcd->HcdFlags, HCD_IRQ_NO_PEND_CHECK);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  SDIO_NotifyTimerTriggered - notification handler that a timer expired
-+  Input:  TimerID - ID of timer that expired
-+  Output:
-+  Return:
-+  Notes:
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void SDIO_NotifyTimerTriggered(INT TimerID)
-+{
-+
-+    switch (TimerID) {
-+        case SDIOBUS_CD_TIMER_ID:
-+            pBusContext->CDTimerQueued = FALSE;
-+                /* post an HCD polling event to the helper thread */
-+            PostCardDetectEvent(pBusContext, EVENT_HCD_CD_POLLING, NULL);
-+            break;
-+        default:
-+            DBG_ASSERT(FALSE);
-+    }
-+
-+}
-diff --git a/drivers/sdio/stack/busdriver/sdio_bus_misc.c b/drivers/sdio/stack/busdriver/sdio_bus_misc.c
-new file mode 100644
-index 0000000..c5c7381
---- /dev/null
-+++ b/drivers/sdio/stack/busdriver/sdio_bus_misc.c
-@@ -0,0 +1,3122 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdio_bus_misc.c
-+
-+@abstract: OS independent bus driver support
-+
-+#notes: this file contains miscellaneous control functions
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define MODULE_NAME  SDBUSDRIVER
-+#include <linux/sdio/ctsystem.h>
-+#include <linux/sdio/sdio_busdriver.h>
-+#include <linux/sdio/sdio_lib.h>
-+#include "_busdriver.h"
-+#include <linux/sdio/_sdio_defs.h>
-+#include <linux/sdio/mmc_defs.h>
-+
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  IssueBusRequestBd - issue a bus request
-+  Input:  pHcd - HCD object
-+          Cmd - command to issue
-+          Argument - command argument
-+          Flags - request flags
-+
-+  Output: pReqToUse - request to use (if caller wants response data)
-+  Return: SDIO Status
-+  Notes:  This function only issues 1 block data transfers
-+          This function issues the request synchronously
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _IssueBusRequestBd(PSDHCD           pHcd,
-+                               UINT8            Cmd,
-+                               UINT32           Argument,
-+                               SDREQUEST_FLAGS  Flags,
-+                               PSDREQUEST       pReqToUse,
-+                               PVOID            pData,
-+                               INT              Length)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    PSDREQUEST  pReq;
-+
-+    if (NULL == pReqToUse) {
-+            /* caller doesn't care about the response data, allocate locally */
-+        pReq = AllocateRequest();
-+        if (NULL == pReq) {
-+            return SDIO_STATUS_NO_RESOURCES;
-+        }
-+    } else {
-+            /* use the caller's request buffer */
-+        pReq = pReqToUse;
-+    }
-+
-+    pReq->Argument = Argument;
-+    pReq->Flags = Flags;
-+    pReq->Command = Cmd;
-+    if (pReq->Flags & SDREQ_FLAGS_DATA_TRANS) {
-+        pReq->pDataBuffer  = pData;
-+        pReq->BlockCount = 1;
-+        pReq->BlockLen = Length;
-+    }
-+
-+    status = IssueRequestToHCD(pHcd,pReq);
-+
-+    if (NULL == pReqToUse) {
-+        DBG_ASSERT(pReq != NULL);
-+        FreeRequest(pReq);
-+    }
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  ConvertVoltageCapsToOCRMask - initialize card
-+  Input:  VoltageCaps - voltage cap to look up
-+  Return: 32 bit OCR mask
-+  Notes:  this function sets voltage for +- 10%
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static UINT32 ConvertVoltageCapsToOCRMask(SLOT_VOLTAGE_MASK VoltageCaps)
-+{
-+    UINT32 ocrMask;
-+
-+    ocrMask = 0;
-+
-+    if (VoltageCaps & SLOT_POWER_3_3V) {
-+        ocrMask |= SD_OCR_3_2_TO_3_3_VDD | SD_OCR_3_3_TO_3_4_VDD;
-+    }
-+    if (VoltageCaps & SLOT_POWER_3_0V) {
-+        ocrMask |= SD_OCR_2_9_TO_3_0_VDD | SD_OCR_3_0_TO_3_1_VDD;
-+    }
-+    if (VoltageCaps & SLOT_POWER_2_8V) {
-+        ocrMask |= SD_OCR_2_7_TO_2_8_VDD | SD_OCR_2_8_TO_2_9_VDD;
-+    }
-+    if (VoltageCaps & SLOT_POWER_2_0V) {
-+        ocrMask |= SD_OCR_1_9_TO_2_0_VDD | SD_OCR_2_0_TO_2_1_VDD;
-+    }
-+    if (VoltageCaps & SLOT_POWER_1_8V) {
-+        ocrMask |= SD_OCR_1_7_TO_1_8_VDD | SD_OCR_1_8_TO_1_9_VDD;
-+    }
-+    if (VoltageCaps & SLOT_POWER_1_6V) {
-+        ocrMask |= SD_OCR_1_6_TO_1_7_VDD;
-+    }
-+
-+    return ocrMask;
-+}
-+
-+static UINT32 GetUsableOCRValue(UINT32 CardOCR, UINT32 SlotOCRMask)
-+{
-+    INT    i;
-+    UINT32 mask = 0;
-+
-+    for (i = 0; i < 32; i++) {
-+        mask = 1 << i;
-+        if ((SlotOCRMask & mask) && (CardOCR & mask)) {
-+            return mask;
-+        }
-+    }
-+
-+    return mask;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  GetPowerSetting - power up the SDIO card
-+  Input:  pHcd - HCD object
-+          pOCRvalue - OCR value of the card
-+  Output: pOCRvalue - OCR to actually use
-+  Return: power setting for HCD based on card's OCR, zero indicates unsupported
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static SLOT_VOLTAGE_MASK GetPowerSetting(PSDHCD pHcd, UINT32 *pOCRvalue)
-+{
-+    UINT32                      ocrMask;
-+    SLOT_VOLTAGE_MASK           hcdVoltage = 0;
-+    SLOT_VOLTAGE_MASK           hcdVMask;
-+    INT                         i;
-+
-+        /* check preferred value */
-+    ocrMask = ConvertVoltageCapsToOCRMask(pHcd->SlotVoltagePreferred);
-+    if (ocrMask & *pOCRvalue) {
-+            /* using preferred voltage */
-+        *pOCRvalue = GetUsableOCRValue(*pOCRvalue, ocrMask);
-+        hcdVoltage = pHcd->SlotVoltagePreferred;
-+    } else {
-+            /* walk through the slot voltage caps and find a match */
-+        for (i = 0; i < 8; i++) {
-+            hcdVMask = (1 << i);
-+            if (hcdVMask & pHcd->SlotVoltageCaps) {
-+                ocrMask = ConvertVoltageCapsToOCRMask((SLOT_VOLTAGE_MASK)(pHcd->SlotVoltageCaps & hcdVMask));
-+                if (ocrMask & *pOCRvalue) {
-+                        /* found a match */
-+                    *pOCRvalue = GetUsableOCRValue(*pOCRvalue, ocrMask);
-+                    hcdVoltage = pHcd->SlotVoltageCaps & hcdVMask;
-+                    break;
-+                }
-+            }
-+        }
-+    }
-+
-+    return hcdVoltage;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  TestPresence - test the presence of a card/function
-+  Input:  pHcd - HCD object
-+          TestType - type of test to perform
-+  Output: pReq - Request to use (optional)
-+  Return:
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS TestPresence(PSDHCD          pHcd,
-+                         CARD_INFO_FLAGS TestType,
-+                         PSDREQUEST      pReq)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_ERROR;
-+
-+     switch (TestType) {
-+        case CARD_SDIO:
-+                /* issue CMD5 */
-+            status = _IssueSimpleBusRequest(pHcd,CMD5,0,
-+                        SDREQ_FLAGS_RESP_SDIO_R4 | SDREQ_FLAGS_RESP_SKIP_SPI_FILT,pReq);
-+            break;
-+        case CARD_SD:
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                 /* ACMD41 just starts initialization when in SPI mode, argument is ignored
-+                 * Note: In SPI mode ACMD41 uses an R1 response */
-+                status = _IssueSimpleBusRequest(pHcd,ACMD41,0,
-+                                                SDREQ_FLAGS_APP_CMD | SDREQ_FLAGS_RESP_R1,pReq);
-+
-+            } else {
-+                /* issue ACMD41 with OCR value of zero */
-+                /* ACMD41 on SD uses an R3 response */
-+                status = _IssueSimpleBusRequest(pHcd,ACMD41,0,
-+                                                SDREQ_FLAGS_APP_CMD | SDREQ_FLAGS_RESP_R3,pReq);
-+            }
-+            break;
-+        case CARD_MMC:
-+                 /* issue CMD1 */
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                    /* note: in SPI mode an R1 response is used */
-+                status = _IssueSimpleBusRequest(pHcd,CMD1,0,SDREQ_FLAGS_RESP_R1,pReq);
-+            } else {
-+                status = _IssueSimpleBusRequest(pHcd,CMD1,0,SDREQ_FLAGS_RESP_R3,pReq);
-+            }
-+            break;
-+        default:
-+            DBG_ASSERT(FALSE);
-+            break;
-+    }
-+
-+    return status;
-+}
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  ReadOCR - read the OCR
-+  Input:  pHcd - HCD object
-+          ReadType - type of read to perform
-+          OCRValue - OCR value to use as an argument
-+  Output: pReq - Request to use
-+          pOCRValueRd - OCR value read back (can be NULL)
-+  Return:
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static SDIO_STATUS ReadOCR(PSDHCD          pHcd,
-+                           CARD_INFO_FLAGS ReadType,
-+                           PSDREQUEST      pReq,
-+                           UINT32          OCRValue,
-+                           UINT32          *pOCRValueRd)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_ERROR;
-+
-+     switch (ReadType) {
-+        case CARD_SDIO:
-+                /* CMD5 for SDIO cards */
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                    /* skip the SPI filter, we will decode the response here  */
-+                status = _IssueSimpleBusRequest(pHcd,CMD5,
-+                                                OCRValue,
-+                                                SDREQ_FLAGS_RESP_SDIO_R4 |
-+                                                SDREQ_FLAGS_RESP_SKIP_SPI_FILT,
-+                                                pReq);
-+            } else {
-+                    /* native SD */
-+                status = _IssueSimpleBusRequest(pHcd,CMD5,
-+                                                OCRValue,
-+                                                SDREQ_FLAGS_RESP_SDIO_R4,
-+                                                pReq);
-+            }
-+            break;
-+        case CARD_SD:
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                    /* CMD58 is used to read the OCR */
-+                status = _IssueSimpleBusRequest(pHcd,CMD58,
-+                                                0, /* argument ignored */
-+                                                (SDREQ_FLAGS_RESP_R3 | SDREQ_FLAGS_RESP_SKIP_SPI_FILT),
-+                                                pReq);
-+            } else {
-+                    /* SD Native uses ACMD41 */
-+                status = _IssueSimpleBusRequest(pHcd,ACMD41,
-+                                                OCRValue,
-+                                                SDREQ_FLAGS_APP_CMD | SDREQ_FLAGS_RESP_R3,
-+                                                pReq);
-+            }
-+            break;
-+        case CARD_MMC:
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                    /* CMD58 is used to read the OCR  */
-+                status = _IssueSimpleBusRequest(pHcd,CMD58,
-+                                                0, /* argument ignored */
-+                                                (SDREQ_FLAGS_RESP_R3 | SDREQ_FLAGS_RESP_SKIP_SPI_FILT),
-+                                                pReq);
-+            } else {
-+                    /* MMC Native uses CMD1 */
-+                status = _IssueSimpleBusRequest(pHcd,CMD1,
-+                                                OCRValue, SDREQ_FLAGS_RESP_R3,
-+                                                pReq);
-+            }
-+            break;
-+        default:
-+            DBG_ASSERT(FALSE);
-+            break;
-+    }
-+
-+    if (SDIO_SUCCESS(status) && (pOCRValueRd != NULL)) {
-+        *pOCRValueRd = 0;
-+            /* someone wants the OCR read back */
-+        switch (ReadType) {
-+            case CARD_SDIO:
-+                if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                    *pOCRValueRd = SPI_SDIO_R4_GET_OCR(pReq->Response);
-+                } else {
-+                    *pOCRValueRd = SD_SDIO_R4_GET_OCR(pReq->Response);
-+                }
-+                break;
-+            case CARD_SD:
-+            case CARD_MMC:
-+                if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                    *pOCRValueRd = SPI_R3_GET_OCR(pReq->Response);
-+                } else {
-+                    *pOCRValueRd = SD_R3_GET_OCR(pReq->Response);
-+                }
-+                break;
-+            default:
-+                DBG_ASSERT(FALSE);
-+                break;
-+        }
-+    }
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  PollCardReady - poll card till it's ready
-+  Input:  pHcd - HCD object
-+          OCRValue - OCR value to poll with
-+          PollType - polling type (based on card type)
-+  Output:
-+  Return:
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS PollCardReady(PSDHCD pHcd, UINT32 OCRValue, CARD_INFO_FLAGS PollType)
-+{
-+    INT             cardReadyRetry;
-+    SDIO_STATUS     status;
-+    PSDREQUEST      pReq;
-+
-+    if (!((PollType == CARD_SDIO) || (PollType == CARD_SD) || (PollType == CARD_MMC))) {
-+        DBG_ASSERT(FALSE);
-+        return SDIO_STATUS_INVALID_PARAMETER;
-+    }
-+
-+    pReq = AllocateRequest();
-+    if (NULL == pReq) {
-+        return SDIO_STATUS_NO_RESOURCES;
-+    }
-+
-+    status = SDIO_STATUS_SUCCESS;
-+    cardReadyRetry = pBusContext->CardReadyPollingRetry;
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Polling card ready, Using OCR:0x%8.8X, Poll Type:0x%X\n",
-+                            OCRValue,PollType));
-+
-+        /* now issue CMD with the actual OCR as an argument until the card is ready */
-+    while (cardReadyRetry) {
-+        if (IS_HCD_BUS_MODE_SPI(pHcd) && !(PollType == CARD_SDIO)) {
-+            if (PollType == CARD_MMC) {
-+                /* under SPI mode for MMC cards, we need to issue CMD1 and
-+                 * check the response for the "in-idle" bit */
-+                status = _IssueSimpleBusRequest(pHcd,
-+                                                CMD1,
-+                                                0,
-+                                                SDREQ_FLAGS_RESP_R1 | SDREQ_FLAGS_RESP_SKIP_SPI_FILT,
-+                                                pReq);
-+            } else if (PollType == CARD_SD) {
-+                 /* under SPI mode for SD cards, we need to issue ACMD41 and
-+                 * check the response for the "in-idle" bit */
-+                 status = _IssueSimpleBusRequest(pHcd,
-+                                                 ACMD41,
-+                                                 0,
-+                                                 SDREQ_FLAGS_RESP_R1 |
-+                                                 SDREQ_FLAGS_APP_CMD |
-+                                                 SDREQ_FLAGS_RESP_SKIP_SPI_FILT,
-+                                                 pReq);
-+            } else {
-+                DBG_ASSERT(FALSE);
-+            }
-+        } else {
-+                /* for SD/MMC in native mode and SDIO (all modes) we need to read the OCR register */
-+                /* read the OCR using the supplied OCR value as an argument, we don't care about the
-+                  * actual OCR read-back, but we are interested in the response */
-+            status = ReadOCR(pHcd,PollType,pReq,OCRValue,NULL);
-+        }
-+
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to issue CMD to poll ready \n"));
-+            break;
-+        }
-+        if (PollType == CARD_SDIO)  {
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                if (SPI_SDIO_R4_IS_CARD_READY(pReq->Response)) {
-+                    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SDIO Card Ready! (SPI) \n"));
-+                    break;
-+                }
-+            } else {
-+                if (SD_SDIO_R4_IS_CARD_READY(pReq->Response)) {
-+                    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SDIO Card Ready! \n"));
-+                    break;
-+                }
-+            }
-+        } else if ((PollType == CARD_SD) || (PollType == CARD_MMC)) {
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                    /* check response when MMC or SD cards operate in SPI mode */
-+                if (!(GET_SPI_R1_RESP_TOKEN(pReq->Response) & SPI_CS_STATE_IDLE)) {
-+                        /* card is no longer in idle */
-+                    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SD/MMC Card (SPI mode) is ready! \n"));
-+                    break;
-+                }
-+            } else {
-+                    /* check the OCR busy bit */
-+                if (SD_R3_IS_CARD_READY(pReq->Response)) {
-+                    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SD/MMC (Native Mode) Card Ready! \n"));
-+                    break;
-+                }
-+            }
-+        } else {
-+            DBG_ASSERT(FALSE);
-+        }
-+        cardReadyRetry--;
-+            /* delay */
-+        status = OSSleep(OCR_READY_CHECK_DELAY_MS);
-+        if (!SDIO_SUCCESS(status)){
-+            break;
-+        }
-+    }
-+
-+    if (0 == cardReadyRetry) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Card Ready timeout! \n"));
-+        status = SDIO_STATUS_DEVICE_ERROR;
-+    }
-+
-+    FreeRequest(pReq);
-+
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  AdjustSlotPower - adjust slot power
-+  Input:  pHcd - HCD object
-+  Output: pOCRvalue - ocr value to use
-+  Return:
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static SDIO_STATUS AdjustSlotPower(PSDHCD pHcd, UINT32 *pOCRvalue)
-+{
-+    SDCONFIG_POWER_CTRL_DATA    pwrSetting;
-+    SDIO_STATUS                 status = SDIO_STATUS_SUCCESS;
-+
-+    ZERO_OBJECT(pwrSetting);
-+    DBG_PRINT(SDDBG_TRACE,
-+        ("SDIO Bus Driver: Adjusting Slot Power, Requesting adjustment for OCR:0x%8.8X \n",
-+         *pOCRvalue));
-+
-+    do {
-+        pwrSetting.SlotPowerEnable = TRUE;
-+            /* get optimal power setting */
-+        pwrSetting.SlotPowerVoltageMask = GetPowerSetting(pHcd, pOCRvalue);
-+        if (0 == pwrSetting.SlotPowerVoltageMask) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: No matching voltage for OCR \n"));
-+            status = SDIO_STATUS_DEVICE_ERROR;
-+            break;
-+        }
-+
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Slot Pwr Mask 0x%X for OCR:0x%8.8X \n",
-+                                pwrSetting.SlotPowerVoltageMask,*pOCRvalue));
-+        status = _IssueConfig(pHcd,SDCONFIG_POWER_CTRL,&pwrSetting,sizeof(pwrSetting));
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to set power in hcd \n"));
-+            break;
-+        }
-+            /* delay for power to settle */
-+        OSSleep(pBusContext->PowerSettleDelay);
-+            /* save off for drivers */
-+        pHcd->CardProperties.CardVoltage  = pwrSetting.SlotPowerVoltageMask;
-+
-+    } while (FALSE);
-+
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  ConvertEncodedTransSpeed - convert encoded TRANS_SPEED value to a clock rate
-+  Input:  TransSpeedValue - encoded transfer speed value
-+  Output:
-+  Return: appropriate SD clock rate
-+  Notes: This function returns a rate of 0, if it could not be determined.
-+         This function can check tran speed values for SD,SDIO and MMC cards
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static SD_BUSCLOCK_RATE ConvertEncodedTransSpeed(UINT8 TransSpeedValue)
-+{
-+    SD_BUSCLOCK_RATE transfMul = 0;
-+    UINT8            timeVal = 0;
-+
-+    switch (TransSpeedValue & TRANSFER_UNIT_MULTIPIER_MASK) {
-+        case 0:
-+            transfMul = 10000;
-+            break;
-+        case 1:
-+            transfMul = 100000;
-+            break;
-+        case 2:
-+            transfMul = 1000000;
-+            break;
-+        case 3:
-+            transfMul = 10000000;
-+            break;
-+        default:
-+            transfMul = 0;
-+            DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: Card transfer multipler is wrong (val=0x%X)! \n",
-+                                   TransSpeedValue));
-+            break;
-+    }
-+
-+    switch ((TransSpeedValue & TIME_VALUE_MASK) >> TIME_VALUE_SHIFT) {
-+        case 1: timeVal = 10; break;
-+        case 2: timeVal = 12; break;
-+        case 3: timeVal = 13; break;
-+        case 4: timeVal = 15; break;
-+        case 5: timeVal = 20; break;
-+        case 6: timeVal = 25; break;
-+        case 7: timeVal = 30; break;
-+        case 8: timeVal = 35; break;
-+        case 9: timeVal = 40; break;
-+        case 10: timeVal = 45; break;
-+        case 11: timeVal = 50; break;
-+        case 12: timeVal = 55; break;
-+        case 13: timeVal = 60; break;
-+        case 14: timeVal = 70; break;
-+        case 15: timeVal = 80; break;
-+        default: timeVal = 0;
-+        DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: Card time value is wrong (val=0x%X)! \n",
-+                               TransSpeedValue));
-+        break;
-+    }
-+
-+    if ((transfMul != 0) && (timeVal != 0)) {
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Card Reported Max: %d Hz (0x%X) \n",
-+                                (timeVal*transfMul), TransSpeedValue));
-+        return timeVal*transfMul;
-+    }
-+
-+    return 0;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  SelectDeselectCard - Select or deselect a card
-+  Input:  pHcd - HCD object
-+          Select - select the card
-+  Output:
-+  Return: status
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static SDIO_STATUS SelectDeselectCard(PSDHCD pHcd, BOOL Select)
-+{
-+    SDIO_STATUS status;
-+
-+    if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+            /* SPI mode cards do not support selection */
-+        status = SDIO_STATUS_SUCCESS;
-+    } else {
-+        if (!Select) {
-+                /* deselect, note that deselecting a card does not return a response */
-+            status = _IssueSimpleBusRequest(pHcd,
-+                                            CMD7,0,
-+                                            SDREQ_FLAGS_NO_RESP,NULL);
-+        } else {
-+                /* select */
-+            status = _IssueSimpleBusRequest(pHcd,
-+                                            CMD7,(pHcd->CardProperties.RCA << 16),
-+                                            SDREQ_FLAGS_RESP_R1B,NULL);
-+        }
-+    }
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Failed to %s card, RCA:0x%X Err:%d \n",
-+            (Select ? "Select":"Deselect"), pHcd->CardProperties.RCA, status));
-+    }
-+    return status;
-+}
-+
-+/* reorder a buffer by swapping MSB with LSB */
-+static void ReorderBuffer(UINT8 *pBuffer, INT Bytes)
-+{
-+    UINT8 *pEnd;
-+    UINT8 temp;
-+
-+    DBG_ASSERT(!(Bytes & 1));
-+        /* point to the end */
-+    pEnd = &pBuffer[Bytes - 1];
-+        /* divide in half */
-+    Bytes = Bytes >> 1;
-+
-+    while (Bytes) {
-+        temp = *pBuffer;
-+            /* swap bytes */
-+        *pBuffer = *pEnd;
-+        *pEnd = temp;
-+        pBuffer++;
-+        pEnd--;
-+        Bytes--;
-+    }
-+}
-+
-+#define ADJUST_OPER_CLOCK(pBusMode,Clock) \
-+    (pBusMode)->ClockRate = min((SD_BUSCLOCK_RATE)(Clock),(pBusMode)->ClockRate)
-+#define ADJUST_OPER_BLOCK_LEN(pCaps,Length) \
-+    (pCaps)->OperBlockLenLimit = min((UINT16)(Length),(pCaps)->OperBlockLenLimit)
-+#define ADJUST_OPER_BLOCK_COUNT(pCaps,Count) \
-+    (pCaps)->OperBlockCountLimit = min((UINT16)(Count),(pCaps)->OperBlockCountLimit)
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  GetBusParameters - Get bus parameters for a card
-+  Input:  pHcd - HCD object
-+          pBusMode - current bus mode on entry
-+  Output: pBusMode - new adjusted bus mode
-+  Return: status
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static SDIO_STATUS GetBusParameters(PSDHCD pHcd, PSDCONFIG_BUS_MODE_DATA pBusMode)
-+{
-+    SDIO_STATUS                        status = SDIO_STATUS_SUCCESS;
-+    UINT8                              temp;
-+    UINT32                             tplAddr;
-+    struct SDIO_FUNC_EXT_COMMON_TPL    func0ext;
-+    UINT8                              scrRegister[SD_SCR_BYTES];
-+    SD_BUSCLOCK_RATE                   cardReportedRate = 0;
-+    PSDREQUEST                         pReq = NULL;
-+    BOOL                               spiMode = FALSE;
-+
-+
-+    if (SDCONFIG_GET_BUSWIDTH(pBusMode->BusModeFlags) == SDCONFIG_BUS_WIDTH_SPI) {
-+        spiMode = TRUE;
-+    }
-+
-+    if (!spiMode) {
-+            /* set highest bus mode bus driver is allowing (non-SPI), the code below will
-+               * adjust to lower or equal settings */
-+        pBusMode->BusModeFlags = pBusContext->DefaultBusMode;
-+    }
-+        /* set operational parameters */
-+    pBusMode->ClockRate = pBusContext->DefaultOperClock;
-+    pHcd->CardProperties.OperBlockLenLimit = pBusContext->DefaultOperBlockLen;
-+    pHcd->CardProperties.OperBlockCountLimit = pBusContext->DefaultOperBlockCount;
-+
-+        /* adjust operational block counts and length to match HCD */
-+    ADJUST_OPER_BLOCK_LEN(&pHcd->CardProperties,pHcd->MaxBytesPerBlock);
-+    ADJUST_OPER_BLOCK_COUNT(&pHcd->CardProperties,pHcd->MaxBlocksPerTrans);
-+        /* limit operational clock to the max clock rate */
-+    ADJUST_OPER_CLOCK(pBusMode,pHcd->MaxClockRate);
-+
-+    if (!spiMode) {
-+            /* check HCD bus mode */
-+        if (!(pHcd->Attributes & SDHCD_ATTRIB_BUS_4BIT) ||
-+            ((pHcd->CardProperties.Flags & CARD_SDIO) &&
-+             (pHcd->Attributes & SDHCD_ATTRIB_NO_4BIT_IRQ)) ) {
-+
-+            if (pHcd->Attributes & SDHCD_ATTRIB_BUS_4BIT) {
-+                DBG_PRINT(SDDBG_WARN,
-+                ("SDIO Card Detected, but host does not support IRQs in 4 bit mode - dropping to 1 bit. \n"));
-+            }
-+                /* force to 1 bit mode */
-+            SDCONFIG_SET_BUS_WIDTH(pBusMode->BusModeFlags, SDCONFIG_BUS_WIDTH_1_BIT);
-+        }
-+    }
-+
-+        /* now do various card inquiries to drop the bus mode or clock
-+         * none of these checks can raise the bus mode or clock higher that what
-+         * was initialized above */
-+    do {
-+        if (pHcd->CardProperties.Flags & (CARD_SD | CARD_MMC)) {
-+                /* allocate a request for response data we'll need */
-+            pReq = AllocateRequest();
-+            if (NULL == pReq) {
-+                status = SDIO_STATUS_NO_RESOURCES;
-+                break;
-+            }
-+        }
-+
-+        if (!spiMode && (pHcd->CardProperties.Flags & CARD_MMC)) {
-+                /* MMC cards all run in 1 bit mode */
-+            SDCONFIG_SET_BUS_WIDTH(pBusMode->BusModeFlags, SDCONFIG_BUS_WIDTH_1_BIT);
-+        }
-+
-+        if (pHcd->CardProperties.Flags & CARD_SD) {
-+            DBG_ASSERT(pReq != NULL);
-+            DBG_PRINT(SDDBG_TRACE, ("Getting SCR from SD Card..\n"));
-+                /* read SCR (requires data transfer) to get supported modes */
-+            status = _IssueBusRequestBd(pHcd,ACMD51,0,
-+                                        SDREQ_FLAGS_RESP_R1 | SDREQ_FLAGS_APP_CMD |
-+                                        SDREQ_FLAGS_DATA_TRANS,
-+                                        pReq,&scrRegister,SD_SCR_BYTES);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_WARN, ("SD card does not have SCR. \n"));
-+                if (!spiMode) {
-+                        /* switch it to 1 bit mode */
-+                    SDCONFIG_SET_BUS_WIDTH(pBusMode->BusModeFlags, SDCONFIG_BUS_WIDTH_1_BIT);
-+                }
-+                status = SDIO_STATUS_SUCCESS;
-+            } else {
-+                    /* we have to reorder this buffer since the SCR is sent MSB first on the data
-+                     * data bus */
-+                ReorderBuffer(scrRegister,SD_SCR_BYTES);
-+                    /* got the SCR */
-+                DBG_PRINT(SDDBG_TRACE, ("SD SCR StructRev:0x%X, Flags:0x%X \n",
-+                        GET_SD_SCR_STRUCT_VER(scrRegister),
-+                        GET_SD_SCR_BUSWIDTHS_FLAGS(scrRegister)));
-+                    /* set the revision */
-+                switch (GET_SD_SCR_SDSPEC_VER(scrRegister)) {
-+                    case SCR_SD_SPEC_1_00:
-+                        DBG_PRINT(SDDBG_TRACE, ("SD Spec Revision 1.01 \n"));
-+                        pHcd->CardProperties.SD_MMC_Revision = SD_REVISION_1_01;
-+                        break;
-+                    case SCR_SD_SPEC_1_10:
-+                        DBG_PRINT(SDDBG_TRACE, ("SD Spec Revision 1.10 \n"));
-+                        pHcd->CardProperties.SD_MMC_Revision = SD_REVISION_1_10;
-+                        break;
-+                    default:
-+                        DBG_PRINT(SDDBG_WARN, ("SD Spec Revision is greater than 1.10 \n"));
-+                        pHcd->CardProperties.SD_MMC_Revision = SD_REVISION_1_10;
-+                        break;
-+                }
-+
-+                if (!(GET_SD_SCR_BUSWIDTHS(scrRegister) & SCR_BUS_SUPPORTS_4_BIT)) {
-+                    if (!spiMode) {
-+                        DBG_PRINT(SDDBG_WARN, ("SD SCR reports 1bit only Mode \n"));
-+                            /* switch it to 1 bit mode */
-+                        SDCONFIG_SET_BUS_WIDTH(pBusMode->BusModeFlags, SDCONFIG_BUS_WIDTH_1_BIT);
-+                    }
-+                }
-+            }
-+        }
-+
-+        if (pHcd->CardProperties.Flags & (CARD_SD | CARD_MMC)) {
-+            DBG_ASSERT(pReq != NULL);
-+                /* de-select the card in order to get the CSD */
-+            status = SelectDeselectCard(pHcd,FALSE);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to deselect card before getting CSD \n"));
-+                break;
-+            }
-+                /* Get CSD for SD or MMC cards */
-+            if (spiMode) {
-+                    /* in SPI mode, getting the CSD requires a read data transfer */
-+                status = _IssueBusRequestBd(pHcd,CMD9,0,
-+                                            SDREQ_FLAGS_RESP_R1 | SDREQ_FLAGS_DATA_TRANS,
-+                                            pReq,
-+                                            pHcd->CardProperties.CardCSD,
-+                                            MAX_CSD_CID_BYTES);
-+                if (SDIO_SUCCESS(status)) {
-+                        /* when the CSD is sent over in SPI data mode, it comes to us in MSB first
-+                         * and thus is not ordered correctly as defined in the SD spec */
-+                    ReorderBuffer(pHcd->CardProperties.CardCSD,MAX_CSD_CID_BYTES);
-+                }
-+            } else {
-+                status = _IssueSimpleBusRequest(pHcd,
-+                                                CMD9,
-+                                                (pHcd->CardProperties.RCA << 16),
-+                                                SDREQ_FLAGS_RESP_R2,
-+                                                pReq);
-+                if (SDIO_SUCCESS(status)) {
-+                        /* save the CSD */
-+                    memcpy(pHcd->CardProperties.CardCSD,pReq->Response,MAX_CARD_RESPONSE_BYTES);
-+                }
-+            }
-+
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to get CSD, Err:%d \n",
-+                                        status));
-+                break;
-+            }
-+                /* for MMC cards, the spec version is in the CSD */
-+            if (pHcd->CardProperties.Flags & CARD_MMC) {
-+                DBG_PRINT(SDDBG_TRACE, ("MMC Spec version : (0x%2.2X) \n",
-+                            GET_MMC_SPEC_VERSION(pHcd->CardProperties.CardCSD)));
-+                switch (GET_MMC_SPEC_VERSION(pHcd->CardProperties.CardCSD)) {
-+                    case MMC_SPEC_1_0_TO_1_2:
-+                    case MMC_SPEC_1_4:
-+                    case MMC_SPEC_2_0_TO_2_2:
-+                        DBG_PRINT(SDDBG_WARN, ("MMC Spec version less than 3.1 \n"));
-+                        pHcd->CardProperties.SD_MMC_Revision = MMC_REVISION_1_0_2_2;
-+                        break;
-+                    case MMC_SPEC_3_1:
-+                        DBG_PRINT(SDDBG_TRACE, ("MMC Spec version 3.1 \n"));
-+                        pHcd->CardProperties.SD_MMC_Revision = MMC_REVISION_3_1;
-+                        break;
-+                    case MMC_SPEC_4_0_TO_4_1:
-+                        DBG_PRINT(SDDBG_TRACE, ("MMC Spec version 4.0-4.1 \n"));
-+                        pHcd->CardProperties.SD_MMC_Revision = MMC_REVISION_4_0;
-+                        break;
-+                    default:
-+                        pHcd->CardProperties.SD_MMC_Revision = MMC_REVISION_3_1;
-+                        DBG_PRINT(SDDBG_WARN, ("MMC Spec version greater than 4.1\n"));
-+                        break;
-+                }
-+            }
-+                /* re-select the card  */
-+            status = SelectDeselectCard(pHcd,TRUE);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to re-select card after getting CSD \n"));
-+                break;
-+            }
-+        }
-+
-+        if ((pHcd->CardProperties.Flags & CARD_SD) &&
-+            !(pHcd->CardProperties.Flags & CARD_SDIO) &&
-+             SDDEVICE_IS_SD_REV_GTEQ_1_10(pHcd->pPseudoDev) &&
-+             (pHcd->Attributes & SDHCD_ATTRIB_SD_HIGH_SPEED) &&
-+             !spiMode)  {
-+            UINT32 arg;
-+            PUINT8 pSwitchStatusBlock = KernelAlloc(SD_SWITCH_FUNC_STATUS_BLOCK_BYTES);
-+
-+            if (NULL == pSwitchStatusBlock) {
-+                status = SDIO_STATUS_NO_RESOURCES;
-+                break;
-+            }
-+
-+            arg = SD_SWITCH_FUNC_ARG_GROUP_CHECK(SD_SWITCH_HIGH_SPEED_GROUP,
-+                                                 SD_SWITCH_HIGH_SPEED_FUNC_NO);
-+
-+                /* for 1.10 SD cards, check if high speed mode is supported */
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Checking SD Card for switchable functions (CMD6 arg:0x%X)\n",arg));
-+
-+                /* issue simple data transfer request to read the switch status */
-+            status = _IssueBusRequestBd(pHcd,
-+                                        CMD6,
-+                                        arg,
-+                                        SDREQ_FLAGS_RESP_R1 | SDREQ_FLAGS_DATA_TRANS,
-+                                        pReq,
-+                                        pSwitchStatusBlock,
-+                                        SD_SWITCH_FUNC_STATUS_BLOCK_BYTES);
-+
-+            if (SDIO_SUCCESS(status)) {
-+                UINT16 switchGroupMask;
-+                    /* need to reorder this since cards send this MSB first */
-+                ReorderBuffer(pSwitchStatusBlock,SD_SWITCH_FUNC_STATUS_BLOCK_BYTES);
-+                switchGroupMask = SD_SWITCH_FUNC_STATUS_GET_GRP_BIT_MASK(pSwitchStatusBlock,SD_SWITCH_HIGH_SPEED_GROUP);
-+                DBG_PRINT(SDDBG_TRACE, ("SD Card Switch Status Group1 Mask:0x%X Max Current:%d\n",
-+                        switchGroupMask, SD_SWITCH_FUNC_STATUS_GET_MAX_CURRENT(pSwitchStatusBlock) ));
-+                if (SD_SWITCH_FUNC_STATUS_GET_MAX_CURRENT(pSwitchStatusBlock) == 0) {
-+                    DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: SD Switch Status block has zero max current \n"));
-+                    SDLIB_PrintBuffer(pSwitchStatusBlock,
-+                                      SD_SWITCH_FUNC_STATUS_BLOCK_BYTES,
-+                                      "SDIO Bus Driver: SD Switch Status Block Error");
-+                } else {
-+                        /* check HS support */
-+                    if (switchGroupMask & (1 << SD_SWITCH_HIGH_SPEED_FUNC_NO)) {
-+                        DBG_PRINT(SDDBG_TRACE, ("SD Card Supports High Speed Mode\n"));
-+                            /* set the rate, this will override the CSD value */
-+                        cardReportedRate = SD_HS_MAX_BUS_CLOCK;
-+                        pBusMode->BusModeFlags |= SDCONFIG_BUS_MODE_SD_HS;
-+                    }
-+                }
-+            } else {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to get SD Switch Status block (%d)\n", status));
-+                    /* just fall through, we'll handle this like a normal SD card */
-+                status = SDIO_STATUS_SUCCESS;
-+            }
-+
-+            KernelFree(pSwitchStatusBlock);
-+        }
-+
-+        if ((pHcd->CardProperties.Flags & CARD_MMC) &&
-+             SDDEVICE_IS_MMC_REV_GTEQ_4_0(pHcd->pPseudoDev) &&
-+             (pHcd->Attributes & SDHCD_ATTRIB_MMC_HIGH_SPEED) &&
-+             !spiMode)  {
-+                /* for MMC cards, get the Extended CSD to get the High speed and
-+                 * wide bus paramaters */
-+
-+            PUINT8 pExtData = KernelAlloc(MMC_EXT_CSD_SIZE);
-+
-+            if (NULL == pExtData) {
-+                status = SDIO_STATUS_NO_RESOURCES;
-+                break;
-+            }
-+                /* issue simple data transfer request to read the extended CSD */
-+            status = _IssueBusRequestBd(pHcd,MMC_CMD8,0,
-+                                        SDREQ_FLAGS_RESP_R1 | SDREQ_FLAGS_DATA_TRANS,
-+                                        pReq,
-+                                        pExtData,
-+                                        MMC_EXT_CSD_SIZE);
-+            if (SDIO_SUCCESS(status)) {
-+                 DBG_PRINT(SDDBG_TRACE, ("MMC Ext CSD Version: 0x%X Card Type: 0x%X\n",
-+                        pExtData[MMC_EXT_VER_OFFSET],pExtData[MMC_EXT_CARD_TYPE_OFFSET]));
-+                    /* check HS support */
-+                if (pExtData[MMC_EXT_CARD_TYPE_OFFSET] & MMC_EXT_CARD_TYPE_HS_52) {
-+                        /* try 52 Mhz */
-+                    cardReportedRate = 52000000;
-+                    pBusMode->BusModeFlags |= SDCONFIG_BUS_MODE_MMC_HS;
-+                } else if (pExtData[MMC_EXT_CARD_TYPE_OFFSET] & MMC_EXT_CARD_TYPE_HS_26) {
-+                        /* try 26MHZ */
-+                    cardReportedRate = 26000000;
-+                    pBusMode->BusModeFlags |= SDCONFIG_BUS_MODE_MMC_HS;
-+                } else {
-+                        /* doesn't report high speed capable */
-+                    cardReportedRate = 0;
-+                }
-+
-+                if (cardReportedRate && !spiMode) {
-+                        /* figure out the bus mode */
-+                    if (pHcd->Attributes & SDHCD_ATTRIB_BUS_MMC8BIT) {
-+                        SDCONFIG_SET_BUS_WIDTH(pBusMode->BusModeFlags, SDCONFIG_BUS_WIDTH_MMC8_BIT);
-+                    } else if (pHcd->Attributes & SDHCD_ATTRIB_BUS_4BIT) {
-+                        SDCONFIG_SET_BUS_WIDTH(pBusMode->BusModeFlags, SDCONFIG_BUS_WIDTH_4_BIT);
-+                    } else {
-+                        /* we leave it to default to 1 bit mode */
-+                    }
-+                }
-+            } else {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to get MMC Extended CSD \n"));
-+                    /* just fall through, we'll do without the extended information
-+                     * and run it like a legacy MMC card */
-+                status = SDIO_STATUS_SUCCESS;
-+            }
-+
-+            KernelFree(pExtData);
-+        }
-+
-+        if (pHcd->CardProperties.Flags & (CARD_SD | CARD_MMC)) {
-+
-+            if (0 == cardReportedRate) {
-+                    /* extract rate from CSD only if it was not set by earlier tests */
-+                cardReportedRate = ConvertEncodedTransSpeed(
-+                                GET_SD_CSD_TRANS_SPEED(pHcd->CardProperties.CardCSD));
-+                    /* fall through and test for zero again */
-+            }
-+
-+            if (cardReportedRate != 0) {
-+                     /* adjust clock based on what the card can handle */
-+                ADJUST_OPER_CLOCK(pBusMode,cardReportedRate);
-+            } else {
-+                    /* something is wrong with the CSD */
-+                if (DBG_GET_DEBUG_LEVEL() >= SDDBG_TRACE) {
-+                    SDLIB_PrintBuffer(pHcd->CardProperties.CardCSD,
-+                                      MAX_CARD_RESPONSE_BYTES,
-+                                      "SDIO Bus Driver: CSD Dump");
-+                }
-+                    /* can't figure out the card rate, so set reasonable defaults */
-+                if (pHcd->CardProperties.Flags & CARD_SD) {
-+                    ADJUST_OPER_CLOCK(pBusMode,SD_MAX_BUS_CLOCK);
-+                } else {
-+                    ADJUST_OPER_CLOCK(pBusMode,MMC_MAX_BUS_CLOCK);
-+                }
-+            }
-+        }
-+
-+            /* note, we do SDIO card "after" SD in case this is a combo card */
-+        if (pHcd->CardProperties.Flags & CARD_SDIO) {
-+                /* read card capabilities */
-+            status = Cmd52ReadByteCommon(pHcd->pPseudoDev,
-+                                         SDIO_CARD_CAPS_REG,
-+                                         &pHcd->CardProperties.SDIOCaps);
-+            if (!SDIO_SUCCESS(status)) {
-+                break;
-+            }
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Card Caps: 0x%X \n",pHcd->CardProperties.SDIOCaps));
-+            if (pHcd->CardProperties.SDIOCaps & SDIO_CAPS_LOW_SPEED) {
-+                    /* adjust max clock for LS device */
-+                ADJUST_OPER_CLOCK(pBusMode,SDIO_LOW_SPEED_MAX_BUS_CLOCK);
-+                    /* adjust bus if LS device does not support 4 bit mode */
-+                if (!(pHcd->CardProperties.SDIOCaps & SDIO_CAPS_4BIT_LS)) {
-+                    if (!spiMode) {
-+                            /* low speed device does not support 4 bit mode, force us to 1 bit */
-+                        SDCONFIG_SET_BUS_WIDTH(pBusMode->BusModeFlags,
-+                                               SDCONFIG_BUS_WIDTH_1_BIT);
-+                    }
-+                }
-+            }
-+
-+                /* check if 1.2 card supports high speed mode, checking HCD as well*/
-+            if (SDDEVICE_IS_SDIO_REV_GTEQ_1_20(pHcd->pPseudoDev) &&
-+                (pHcd->Attributes & SDHCD_ATTRIB_SD_HIGH_SPEED) &&
-+                !spiMode) {
-+                UCHAR hsControl = 0;
-+
-+                status = Cmd52ReadByteCommon(pHcd->pPseudoDev,
-+                                             SDIO_HS_CONTROL_REG,
-+                                             &hsControl);
-+
-+                if (!SDIO_SUCCESS(status)) {
-+                    DBG_PRINT(SDDBG_TRACE,
-+                        ("SDIO Failed to read high speed control (%d) \n",status));
-+                        /* reset status and continue */
-+                    status = SDIO_STATUS_SUCCESS;
-+                } else {
-+                    if (hsControl & SDIO_HS_CONTROL_SHS) {
-+                        DBG_PRINT(SDDBG_TRACE, ("SDIO Card Supports High Speed Mode\n"));
-+                        pBusMode->BusModeFlags |= SDCONFIG_BUS_MODE_SD_HS;
-+                    }
-+                }
-+
-+            }
-+
-+            cardReportedRate = 0;
-+            temp = sizeof(func0ext);
-+            tplAddr = pHcd->CardProperties.CommonCISPtr;
-+                /* get the FUNCE tuple */
-+            status = SDLIB_FindTuple(pHcd->pPseudoDev,
-+                                     CISTPL_FUNCE,
-+                                     &tplAddr,
-+                                     (PUINT8)&func0ext,
-+                                     &temp);
-+            if (!SDIO_SUCCESS(status) || (temp < sizeof(func0ext))) {
-+                DBG_PRINT(SDDBG_WARN, ("SDIO Function 0 Ext. Tuple Missing (Got size:%d) \n", temp));
-+                    /* reset status */
-+                status = SDIO_STATUS_SUCCESS;
-+            } else {
-+                    /* convert encoded value to rate */
-+                cardReportedRate = ConvertEncodedTransSpeed(func0ext.MaxTransSpeed);
-+            }
-+
-+            if (cardReportedRate != 0) {
-+                if (pBusMode->BusModeFlags & SDCONFIG_BUS_MODE_SD_HS) {
-+                    if (cardReportedRate <= SD_MAX_BUS_CLOCK) {
-+                        DBG_PRINT(SDDBG_WARN,
-+                            ("SDIO Function tuple reports clock:%d Hz, with advertised High Speed support \n", cardReportedRate));
-+                            /* back off high speed support */
-+                        pBusMode->BusModeFlags &= ~SDCONFIG_BUS_MODE_SD_HS;
-+                    }
-+                } else {
-+                    if (cardReportedRate > SD_MAX_BUS_CLOCK) {
-+                        DBG_PRINT(SDDBG_WARN,
-+                            ("SDIO Function tuple reports clock:%d Hz, without advertising High Speed support..using 25Mhz \n", cardReportedRate));
-+                        cardReportedRate = SD_MAX_BUS_CLOCK;
-+                    }
-+                }
-+                    /* adjust clock based on what the card can handle */
-+                ADJUST_OPER_CLOCK(pBusMode,cardReportedRate);
-+
-+            } else {
-+                    /* set a reasonable default */
-+                ADJUST_OPER_CLOCK(pBusMode,SD_MAX_BUS_CLOCK);
-+            }
-+        }
-+    } while (FALSE);
-+
-+    if (pReq != NULL) {
-+        FreeRequest(pReq);
-+    }
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  SetOperationalBusMode - set operational bus mode
-+  Input:  pDevice - pDevice that is requesting the change
-+          pBusMode - operational bus mode
-+  Output: pBusMode - on return will have the actual clock rate set
-+  Return: status
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS SetOperationalBusMode(PSDDEVICE                pDevice,
-+                                  PSDCONFIG_BUS_MODE_DATA  pBusMode)
-+{
-+    SDIO_STATUS     status = SDIO_STATUS_SUCCESS;
-+    UCHAR           regData;
-+    UINT32          arg;
-+    UINT32          switcharg;
-+    PSDHCD          pHcd = pDevice->pHcd;
-+
-+        /* synchronize access for updating bus mode settings */
-+    status = SemaphorePendInterruptable(&pDevice->pHcd->ConfigureOpsSem);
-+    if (!SDIO_SUCCESS(status)) {
-+        return status;
-+    }
-+
-+    do {
-+
-+        if (!IS_CARD_PRESENT(pHcd)) {
-+                /* for an empty slot (a Pseudo dev was passed in) we still allow the
-+                 * bus mode to be set for the card detect
-+                 * polling */
-+            status = _IssueConfig(pHcd,SDCONFIG_BUS_MODE_CTRL,pBusMode,sizeof(SDCONFIG_BUS_MODE_DATA));
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to set bus mode in hcd : Err:%d \n",
-+                                        status));
-+            }
-+                /* nothing more to do */
-+            break;
-+        }
-+
-+
-+        if ((pBusMode->BusModeFlags == SDDEVICE_GET_BUSMODE_FLAGS(pDevice)) &&
-+            (pBusMode->ClockRate == SDDEVICE_GET_OPER_CLOCK(pDevice))) {
-+            DBG_PRINT(SDDBG_TRACE,
-+               ("SDIO Bus Driver: Bus mode already set, nothing to do\n"));
-+            pBusMode->ActualClockRate = SDDEVICE_GET_OPER_CLOCK(pDevice);
-+            break;
-+        }
-+
-+        if (pBusMode->BusModeFlags & SDCONFIG_BUS_MODE_MMC_HS) {
-+            if (!(pHcd->Attributes & SDHCD_ATTRIB_MMC_HIGH_SPEED)) {
-+                status = SDIO_STATUS_INVALID_PARAMETER;
-+                DBG_PRINT(SDDBG_ERROR,
-+                        ("SDIO Bus Driver: HCD does not support MMC High Speed\n"));
-+                break;
-+            }
-+        }
-+
-+        if (pBusMode->BusModeFlags & SDCONFIG_BUS_MODE_SD_HS) {
-+            if (!(pHcd->Attributes & SDHCD_ATTRIB_SD_HIGH_SPEED)) {
-+                status = SDIO_STATUS_INVALID_PARAMETER;
-+                DBG_PRINT(SDDBG_ERROR,
-+                        ("SDIO Bus Driver: HCD does not support SD High Speed\n"));
-+                break;
-+            }
-+        }
-+
-+            /* before we set the operational clock and mode, configure the clock for high
-+             * speed mode on the card , if necessary */
-+        if ((pHcd->CardProperties.Flags & CARD_MMC) &&
-+            (pBusMode->BusModeFlags & SDCONFIG_BUS_MODE_MMC_HS) &&
-+            !(SDDEVICE_GET_BUSMODE_FLAGS(pDevice) & SDCONFIG_BUS_MODE_MMC_HS)) {
-+
-+            switcharg = MMC_SWITCH_BUILD_ARG(MMC_SWITCH_CMD_SET0,
-+                                             MMC_SWITCH_WRITE_BYTE,
-+                                             MMC_EXT_HS_TIMING_OFFSET,
-+                                             MMC_EXT_HS_TIMING_ENABLE);
-+            status = _IssueSimpleBusRequest(pHcd,
-+                                            MMC_CMD_SWITCH,
-+                                            switcharg,
-+                                            SDREQ_FLAGS_RESP_R1B,
-+                                            NULL);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR,
-+                 ("SDIO Bus Driver: Failed to switch MMC High Speed Mode (arg:0x%X): %d \n",
-+                                        switcharg, status));
-+                break;
-+            }
-+
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: High Speed MMC enabled (arg:0x%X)\n",
-+                switcharg));
-+        }
-+
-+            /* before setting bus mode and clock in the HCD, switch card to high speed mode
-+             * if necessary */
-+        if ((pHcd->CardProperties.Flags & CARD_SD) &&
-+            (pBusMode->BusModeFlags & SDCONFIG_BUS_MODE_SD_HS) &&
-+            !(SDDEVICE_GET_BUSMODE_FLAGS(pDevice) & SDCONFIG_BUS_MODE_SD_HS)) {
-+            UINT32     arg;
-+            PUINT8     pSwitchStatusBlock;
-+
-+            pSwitchStatusBlock = KernelAlloc(SD_SWITCH_FUNC_STATUS_BLOCK_BYTES);
-+
-+            if (NULL == pSwitchStatusBlock) {
-+                status = SDIO_STATUS_NO_RESOURCES;
-+                break;
-+            }
-+
-+                /* set high speed group */
-+            arg = SD_SWITCH_FUNC_ARG_GROUP_SET(SD_SWITCH_HIGH_SPEED_GROUP,
-+                                               SD_SWITCH_HIGH_SPEED_FUNC_NO);
-+
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Setting SD Card for High Speed mode (CMD6 arg:0x%X)\n",arg));
-+
-+                /* issue simple data transfer request to switch modes */
-+            status = _IssueBusRequestBd(pHcd,
-+                                        CMD6,
-+                                        arg,
-+                                        SDREQ_FLAGS_RESP_R1 | SDREQ_FLAGS_DATA_TRANS,
-+                                        NULL,
-+                                        pSwitchStatusBlock,
-+                                        SD_SWITCH_FUNC_STATUS_BLOCK_BYTES);
-+
-+            if (SDIO_SUCCESS(status)) {
-+                ReorderBuffer(pSwitchStatusBlock,SD_SWITCH_FUNC_STATUS_BLOCK_BYTES);
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SD High Speed Result, Got Max Current:%d mA, SwitchResult:0x%X \n",
-+                      SD_SWITCH_FUNC_STATUS_GET_MAX_CURRENT(pSwitchStatusBlock),
-+                      SDSwitchGetSwitchResult(pSwitchStatusBlock, SD_SWITCH_HIGH_SPEED_GROUP)));
-+                if (SD_SWITCH_FUNC_STATUS_GET_MAX_CURRENT(pSwitchStatusBlock) == 0) {
-+                    DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Error in Status Block after High Speed Switch (current==0) \n"));
-+                    status = SDIO_STATUS_DEVICE_ERROR;
-+                }
-+                if (SDSwitchGetSwitchResult(pSwitchStatusBlock, SD_SWITCH_HIGH_SPEED_GROUP) !=
-+                    SD_SWITCH_HIGH_SPEED_FUNC_NO) {
-+                    DBG_PRINT(SDDBG_ERROR,
-+                        ("SDIO Bus Driver: Error in Status Block after High Speed Switch (Group1 did not switch) \n"));
-+                    status = SDIO_STATUS_DEVICE_ERROR;
-+                }
-+                if (SDIO_SUCCESS(status)) {
-+                    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SD High Speed Mode Enabled \n"));
-+                } else {
-+                    SDLIB_PrintBuffer(pSwitchStatusBlock,
-+                                      SD_SWITCH_FUNC_STATUS_BLOCK_BYTES,
-+                                       "SDIO Bus Driver: SD Switch Status Block Error");
-+                }
-+            } else {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to Set SD High Speed Mode (%d) \n",status));
-+            }
-+            KernelFree(pSwitchStatusBlock);
-+
-+            if (!SDIO_SUCCESS(status)) {
-+                break;
-+            }
-+        }
-+
-+            /* enable/disable high speed mode for SDIO card */
-+        if (pHcd->CardProperties.Flags & CARD_SDIO) {
-+            BOOL doSet = TRUE;
-+
-+            if ((pBusMode->BusModeFlags & SDCONFIG_BUS_MODE_SD_HS) &&
-+                !(SDDEVICE_GET_BUSMODE_FLAGS(pDevice) & SDCONFIG_BUS_MODE_SD_HS)) {
-+                    /* enable */
-+                regData = SDIO_HS_CONTROL_EHS;
-+            } else if (!(pBusMode->BusModeFlags & SDCONFIG_BUS_MODE_SD_HS) &&
-+                       (SDDEVICE_GET_BUSMODE_FLAGS(pDevice) & SDCONFIG_BUS_MODE_SD_HS)) {
-+                    /* disable */
-+                regData = 0;
-+            } else {
-+                    /* do nothing */
-+                doSet = FALSE;
-+            }
-+
-+            if (doSet) {
-+                status = Cmd52WriteByteCommon(pDevice,
-+                                              SDIO_HS_CONTROL_REG,
-+                                              &regData);
-+
-+                if (!SDIO_SUCCESS(status)) {
-+                    DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to %s HS mode in SDIO card : Err:%d\n",
-+                                            (SDIO_HS_CONTROL_EHS == regData) ? "enable":"disable" , status));
-+                    break;
-+                } else {
-+                    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver:SDIO Card %s for High Speed mode \n",
-+                                    (SDIO_HS_CONTROL_EHS == regData) ? "enabled":"disabled" ));
-+                }
-+            }
-+        }
-+
-+            /* use synchronize-with-bus request version, this may have been requested by a
-+             * function driver */
-+        status = SDLIB_IssueConfig(pDevice,
-+                                   SDCONFIG_BUS_MODE_CTRL,
-+                                   pBusMode,
-+                                   sizeof(SDCONFIG_BUS_MODE_DATA));
-+
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to set bus mode in hcd : Err:%d \n",
-+                                    status));
-+            break;
-+        }
-+
-+             /* check requested bus width against the current mode */
-+        if (SDCONFIG_GET_BUSWIDTH(pBusMode->BusModeFlags) ==
-+                SDCONFIG_GET_BUSWIDTH(pHcd->CardProperties.BusMode)) {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Bus mode set, no width change\n"));
-+            break;
-+        }
-+
-+        if (SDCONFIG_GET_BUSWIDTH(pBusMode->BusModeFlags) == SDCONFIG_BUS_WIDTH_SPI) {
-+                /* nothing more to do for SPI */
-+            break;
-+        }
-+
-+            /* set the bus width for SD and combo cards */
-+        if (pHcd->CardProperties.Flags & CARD_SD) {
-+            if (SDCONFIG_GET_BUSWIDTH(pBusMode->BusModeFlags) == SDCONFIG_BUS_WIDTH_4_BIT) {
-+                    /* turn off card detect resistor */
-+                status = _IssueSimpleBusRequest(pHcd,
-+                                                ACMD42,
-+                                                0, /* disable CD */
-+                                                SDREQ_FLAGS_APP_CMD | SDREQ_FLAGS_RESP_R1,
-+                                                NULL);
-+                if (!SDIO_SUCCESS(status)) {
-+                    DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: Failed to disable CD Res: %d \n",
-+                                           status)); /* this should be okay */
-+                }
-+                arg = SD_ACMD6_BUS_WIDTH_4_BIT;
-+            } else {
-+                    /* don't need to turn off CD in 1 bit mode, just set mode */
-+                arg = SD_ACMD6_BUS_WIDTH_1_BIT;
-+
-+            }
-+                /* set the bus width */
-+            status = _IssueSimpleBusRequest(pHcd,
-+                                            ACMD6,
-+                                            arg, /* set bus mode */
-+                                            SDREQ_FLAGS_APP_CMD | SDREQ_FLAGS_RESP_R1,
-+                                            NULL);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to set bus width: %d \n",
-+                                        status));
-+                break;
-+            }
-+        }
-+            /* set bus width for SDIO cards */
-+        if (pHcd->CardProperties.Flags & CARD_SDIO) {
-+                /* default */
-+            regData = CARD_DETECT_DISABLE | SDIO_BUS_WIDTH_1_BIT;
-+
-+            if (SDCONFIG_GET_BUSWIDTH(pBusMode->BusModeFlags) == SDCONFIG_BUS_WIDTH_4_BIT) {
-+                    /* turn off card detect resistor and set buswidth */
-+                regData = CARD_DETECT_DISABLE | SDIO_BUS_WIDTH_4_BIT;
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Enabling 4 bit mode on card \n"));
-+            } else {
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Enabling 1 bit mode on card \n"));
-+            }
-+            status = Cmd52WriteByteCommon(pDevice,
-+                                          SDIO_BUS_IF_REG,
-+                                          &regData);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to set bus mode in Card : Err:%d\n",
-+                                        status));
-+                break;
-+            }
-+
-+                /* check for 4-bit interrupt detect mode */
-+            if ((SDCONFIG_GET_BUSWIDTH(pBusMode->BusModeFlags) == SDCONFIG_BUS_WIDTH_4_BIT) &&
-+                (pHcd->CardProperties.SDIOCaps & SDIO_CAPS_INT_MULTI_BLK) &&
-+                (pHcd->Attributes & SDHCD_ATTRIB_MULTI_BLK_IRQ)) {
-+                    /* enable interrupts between blocks, this doesn't actually turn on interrupts
-+                     * it merely allows interrupts to be asserted in the inter-block gap */
-+                pHcd->CardProperties.SDIOCaps |= SDIO_CAPS_ENB_INT_MULTI_BLK;
-+
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: 4-Bit Multi-blk Interrupt support enabled\n"));
-+            } else {
-+                    /* make sure this is disabled */
-+                pHcd->CardProperties.SDIOCaps &= ~SDIO_CAPS_ENB_INT_MULTI_BLK;
-+            }
-+
-+            status = Cmd52WriteByteCommon(pDevice,
-+                                          SDIO_CARD_CAPS_REG,
-+                                          &pHcd->CardProperties.SDIOCaps);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to update Card Caps register Err:%d\n",
-+                                        status));
-+                break;
-+            }
-+        }
-+
-+            /* set data bus width for MMC */
-+        if (pHcd->CardProperties.Flags & CARD_MMC) {
-+            UINT8  buswidth = 0;
-+
-+            if (SDCONFIG_GET_BUSWIDTH(pBusMode->BusModeFlags) == SDCONFIG_BUS_WIDTH_4_BIT) {
-+                buswidth = MMC_EXT_BUS_WIDTH_4_BIT;
-+            } else if (SDCONFIG_GET_BUSWIDTH(pBusMode->BusModeFlags) == SDCONFIG_BUS_WIDTH_MMC8_BIT) {
-+                buswidth = MMC_EXT_BUS_WIDTH_8_BIT;
-+            } else {
-+                /* normal 1 bit mode .. nothing to do */
-+                break;
-+            }
-+                /* now set the bus mode on the card */
-+            switcharg = MMC_SWITCH_BUILD_ARG(MMC_SWITCH_CMD_SET0,
-+                                             MMC_SWITCH_WRITE_BYTE,
-+                                             MMC_EXT_BUS_WIDTH_OFFSET,
-+                                             buswidth);
-+
-+            status = _IssueSimpleBusRequest(pHcd,
-+                                            MMC_CMD_SWITCH,
-+                                            switcharg,
-+                                            SDREQ_FLAGS_RESP_R1B,
-+                                            NULL);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to set MMC bus width (arg:0x%X): %d \n",
-+                                        switcharg, status));
-+                break;
-+            }
-+
-+            if (SDCONFIG_GET_BUSWIDTH(pBusMode->BusModeFlags) == SDCONFIG_BUS_WIDTH_4_BIT) {
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: 4 bit MMC mode enabled (arg:0x%X) \n",
-+                      switcharg));
-+            } else if (SDCONFIG_GET_BUSWIDTH(pBusMode->BusModeFlags) == SDCONFIG_BUS_WIDTH_MMC8_BIT) {
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: 8-Bit MMC mode enabled (arg:0x%X) \n",
-+                      switcharg));
-+            }
-+        }
-+
-+    } while (FALSE);
-+
-+    if (SDIO_SUCCESS(status)) {
-+            /* set the operating mode */
-+        pHcd->CardProperties.BusMode = pBusMode->BusModeFlags;
-+            /* set the actual clock rate */
-+        pHcd->CardProperties.OperBusClock = pBusMode->ActualClockRate;
-+    }
-+
-+    SemaphorePost(&pDevice->pHcd->ConfigureOpsSem);
-+
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  CardInitSetup - setup host for card initialization
-+  Input:  pHcd - HCD object
-+  Output:
-+  Return:
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS CardInitSetup(PSDHCD pHcd)
-+{
-+    SDCONFIG_INIT_CLOCKS_DATA   initClocks;
-+    SDCONFIG_BUS_MODE_DATA      busMode;
-+    UINT32                      OCRvalue;
-+    SDIO_STATUS                 status = SDIO_STATUS_SUCCESS;
-+
-+    ZERO_OBJECT(initClocks);
-+    ZERO_OBJECT(busMode);
-+        /* setup defaults */
-+    initClocks.NumberOfClocks = SDMMC_MIN_INIT_CLOCKS;
-+    busMode.ClockRate = SD_INIT_BUS_CLOCK;
-+
-+        /* check for SPI only */
-+    if (pHcd->Attributes & SDHCD_ATTRIB_BUS_SPI) {
-+            /* SPI cards startup in non-CRC mode with the exception of CMD0, the
-+             * HCDs must issue CMD0 with the correct CRC , the spec shows that a
-+             * CMD 0 sequence is 0x40,0x00,0x00,0x00,0x00,0x95 */
-+        busMode.BusModeFlags = SDCONFIG_BUS_WIDTH_SPI | SDCONFIG_BUS_MODE_SPI_NO_CRC;
-+    }
-+        /* check if host supports 1 bit mode */
-+        /* TODO : if host supports power switching, we can
-+         * could initialize cards in SPI mode first */
-+    if (pHcd->Attributes & SDHCD_ATTRIB_BUS_1BIT) {
-+        busMode.BusModeFlags = SDCONFIG_BUS_WIDTH_1_BIT;
-+    }
-+
-+        /* set initial VDD, starting at the highest allowable voltage and working
-+         * our way down */
-+    if (pHcd->SlotVoltageCaps & SLOT_POWER_3_3V) {
-+        OCRvalue = SD_OCR_3_2_TO_3_3_VDD;
-+    } else if (pHcd->SlotVoltageCaps & SLOT_POWER_3_0V) {
-+        OCRvalue = SD_OCR_2_9_TO_3_0_VDD;
-+    } else if (pHcd->SlotVoltageCaps & SLOT_POWER_2_8V) {
-+        OCRvalue = SD_OCR_2_7_TO_2_8_VDD;
-+    } else if (pHcd->SlotVoltageCaps & SLOT_POWER_2_0V) {
-+        OCRvalue = SD_OCR_1_9_TO_2_0_VDD;
-+    } else if (pHcd->SlotVoltageCaps & SLOT_POWER_1_8V) {
-+        OCRvalue = SD_OCR_1_7_TO_1_8_VDD;
-+    } else if (pHcd->SlotVoltageCaps & SLOT_POWER_1_6V) {
-+        OCRvalue = SD_OCR_1_6_TO_1_7_VDD;
-+    } else {
-+        DBG_ASSERT(FALSE);
-+        OCRvalue = 0;
-+    }
-+
-+    do {
-+            /* power up the card */
-+        status = AdjustSlotPower(pHcd, &OCRvalue);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to adjust slot power \n"));
-+            break;
-+        }
-+        status = SetOperationalBusMode(pHcd->pPseudoDev,&busMode);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to set bus mode \n"));
-+            break;
-+        }
-+        status = _IssueConfig(pHcd,SDCONFIG_SEND_INIT_CLOCKS,&initClocks,sizeof(initClocks));
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to send init clocks in hcd \n"));
-+            break;
-+        }
-+
-+    } while(FALSE);
-+
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  SDInitializeCard - initialize card
-+  Input:  pHcd - HCD object
-+  Output: pProperties - card properties
-+  Return:
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS SDInitializeCard(PSDHCD pHcd)
-+{
-+    SDCONFIG_BUS_MODE_DATA      busMode;
-+    SDIO_STATUS                 status = SDIO_STATUS_SUCCESS;
-+    PSDREQUEST                  pReq = NULL;
-+    UINT32                      OCRvalue;
-+    UINT32                      tplAddr;
-+    UINT8                       temp;
-+    struct SDIO_MANFID_TPL      manfid;
-+    SDCONFIG_WP_VALUE           wpValue;
-+    UINT8                       cisBuffer[3];
-+
-+    OCRvalue = 0;
-+
-+    do {
-+        if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Initializing card in SPI mode \n"));
-+        } else {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Initializing card in MMC/SD mode \n"));
-+        }
-+
-+        pReq = AllocateRequest();
-+        if (NULL == pReq) {
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: failed to allocate bus request \n"));
-+            break;
-+        }
-+        memset(pReq, 0, sizeof(SDREQUEST));
-+
-+        status = CardInitSetup(pHcd);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to setup card \n"));
-+            break;
-+        }
-+        status = _IssueConfig(pHcd,SDCONFIG_GET_WP,&wpValue,sizeof(wpValue));
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: host doesn't support Write Protect \n"));
-+        } else {
-+            if (wpValue) {
-+                pHcd->CardProperties.Flags |= CARD_SD_WP;
-+                DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: SD WP switch is on \n"));
-+            }
-+        }
-+
-+        if (!(pHcd->Attributes & SDHCD_ATTRIB_SLOT_POLLING) &&
-+            IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                /* for non-slot polling HCDs operating in SPI mode
-+                 * issue CMD0 to reset card state and to place the card
-+                 * in SPI mode.  If slot polling is used, the polling thread
-+                 * will have already issued a CMD0 to place the card in SPI mode*/
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                INT ii = 256;
-+                status = SDIO_STATUS_ERROR;
-+                /* if the CMD0 fails, retry it. Some cards have a hard time getting into SPI mode.*/
-+                while ((!SDIO_SUCCESS(status)) && (ii-- >= 0)) {
-+                    status = _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_RESP_R1,pReq);
-+                    OSSleep(20);
-+                }
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: cmd0 go SPI retries:(256) %d\n", ii));
-+
-+            } else {
-+                status = _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_NO_RESP,pReq);
-+            }
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: go-idle failed! \n"));
-+                break;
-+            }
-+        }
-+
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Looking for SDIO.. \n"));
-+            /* check for SDIO card by trying to read it's OCR */
-+        status = ReadOCR(pHcd,CARD_SDIO,pReq,0,&OCRvalue);
-+        if (SDIO_SUCCESS(status)) {
-+                /* we got a response, this is an SDIO card */
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                    /* handle SPI */
-+                pHcd->CardProperties.IOFnCount = SPI_SDIO_R4_GET_IO_FUNC_COUNT(pReq->Response);
-+                if (SPI_SDIO_R4_IS_MEMORY_PRESENT(pReq->Response)) {
-+                        /* flag an SD function exists */
-+                    pHcd->CardProperties.Flags |= CARD_SD;
-+                }
-+            } else {
-+                    /* handle native SD */
-+                pHcd->CardProperties.IOFnCount = SD_SDIO_R4_GET_IO_FUNC_COUNT(pReq->Response);
-+                if (SD_SDIO_R4_IS_MEMORY_PRESENT(pReq->Response)) {
-+                        /* flag an SD function exists */
-+                    pHcd->CardProperties.Flags |= CARD_SD;
-+                }
-+
-+            }
-+            if (0 == pHcd->CardProperties.IOFnCount) {
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SDIO Card reports no functions \n"));
-+                status = SDIO_STATUS_DEVICE_ERROR;
-+                pHcd->CardProperties.Flags = 0;
-+                break;
-+            }
-+            pHcd->CardProperties.Flags |= CARD_SDIO;
-+
-+            DBG_PRINT(SDDBG_TRACE,
-+                ("SDIO Bus Driver: SDIO Card, Functions: %d Card Info Flags:0x%X OCR:0x%8.8X\n",
-+                      pHcd->CardProperties.IOFnCount, pHcd->CardProperties.Flags, OCRvalue));
-+                /* adjust slot power for this SDIO card */
-+            status = AdjustSlotPower(pHcd, &OCRvalue);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to set power in hcd \n"));
-+                break;
-+            }
-+                /* poll for SDIO card ready */
-+            status = PollCardReady(pHcd,OCRvalue,CARD_SDIO);
-+            if (!SDIO_SUCCESS(status)) {
-+                break;
-+            }
-+        } else if (status != SDIO_STATUS_BUS_RESP_TIMEOUT){
-+                /* major error in hcd, bail */
-+            break;
-+        }
-+
-+            /* check if this is an SDIO-only card before continuing  */
-+        if (!(pHcd->CardProperties.Flags & CARD_SD) && (pHcd->CardProperties.Flags & CARD_SDIO)) {
-+                /* this is an SDIO card with no memory function */
-+            goto prepareCard;
-+        }
-+
-+        if (!(pHcd->CardProperties.Flags & CARD_SDIO)) {
-+                /* issue go idle only if we did not find an SDIO function in our earlier test */
-+            if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                status = _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_RESP_R1,pReq);
-+            } else {
-+                status = _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_NO_RESP,pReq);
-+            }
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: go-idle failed! \n"));
-+                break;
-+            }
-+        }
-+
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Looking for SD Memory.. \n"));
-+            /* SD Memory Card checking */
-+            /* test for present of SD card (stand-alone or combo card) */
-+        status = TestPresence(pHcd, CARD_SD, pReq);
-+        if (SDIO_SUCCESS(status)) {
-+                /* there is an SD Card present, could be part of a combo system */
-+            pHcd->CardProperties.Flags |= CARD_SD;
-+            if (0 == OCRvalue) {
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SD Memory card detected. \n"));
-+                    /* no OCR value on entry this is a stand-alone card, go and get it*/
-+                status = ReadOCR(pHcd,CARD_SD,pReq,0,&OCRvalue);
-+                if (!SDIO_SUCCESS(status) || (OCRvalue == 0)) {
-+                    DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to get OCR (status:%d) \n",
-+                                            status));
-+                    break;
-+                }
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SD Card Reports OCR:0x%8.8X \n", OCRvalue));
-+                status = AdjustSlotPower(pHcd, &OCRvalue);
-+                if (!SDIO_SUCCESS(status)) {
-+                    DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to adjust power \n"));
-+                    break;
-+                }
-+            } else {
-+                 DBG_ASSERT((pHcd->CardProperties.Flags & (CARD_SD | CARD_SDIO)));
-+                 DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SDIO Combo Card detected \n"));
-+            }
-+                /* poll for SD card ready */
-+            status = PollCardReady(pHcd,OCRvalue,CARD_SD);
-+            if (!SDIO_SUCCESS(status)) {
-+                    /* check if this card has an SDIO function */
-+                if (pHcd->CardProperties.Flags & CARD_SDIO) {
-+                    DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: Combo Detected but SD memory function failed \n"));
-+                        /* allow SDIO functions to load normally */
-+                    status = SDIO_STATUS_SUCCESS;
-+                        /* remove SD flag */
-+                    pHcd->CardProperties.Flags &= ~CARD_SD;
-+                } else {
-+                    break;
-+                }
-+            } else {
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SD Memory ready. \n"));
-+            }
-+                /* we're done, no need to check for MMC */
-+            goto prepareCard;
-+        } else if (status != SDIO_STATUS_BUS_RESP_TIMEOUT){
-+                /* major error in hcd, bail */
-+            break;
-+        }
-+
-+        /* MMC card checking */
-+        /* if we get here, these better not be set */
-+        DBG_ASSERT(!(pHcd->CardProperties.Flags & (CARD_SD | CARD_SDIO)));
-+           /* issue go idle */
-+        if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+            status = _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_RESP_R1,pReq);
-+        } else {
-+            status = _IssueSimpleBusRequest(pHcd,CMD0,0,SDREQ_FLAGS_NO_RESP,pReq);
-+        }
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: go-idle failed! \n"));
-+            break;
-+        }
-+
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Looking for MMC.. \n"));
-+        status = TestPresence(pHcd, CARD_MMC, pReq);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: unknown card detected \n"));
-+            break;
-+        }
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: MMC Card Detected \n"));
-+        pHcd->CardProperties.Flags |= CARD_MMC;
-+            /* read the OCR value */
-+        status = ReadOCR(pHcd,CARD_MMC,pReq,0,&OCRvalue);
-+        if (!SDIO_SUCCESS(status) || (OCRvalue == 0)) {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Failed to get OCR (status:%d)",
-+                                    status));
-+            break;
-+        }
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: MMC Card Reports OCR:0x%8.8X \n", OCRvalue));
-+            /* adjust power */
-+        status = AdjustSlotPower(pHcd, &OCRvalue);
-+        if (!SDIO_SUCCESS(status)) {
-+             DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to adjust power \n"));
-+             break;
-+        }
-+            /* poll for MMC card ready */
-+        status = PollCardReady(pHcd,OCRvalue,CARD_MMC);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+            /* fall through and prepare MMC card */
-+
-+prepareCard:
-+            /* we're done figuring out what was inserted, and setting up
-+             * optimal slot voltage, now we need to prepare the card */
-+        if (!IS_HCD_BUS_MODE_SPI(pHcd) &&
-+            (pHcd->CardProperties.Flags & (CARD_SD | CARD_MMC))) {
-+                /* non-SPI SD or MMC cards need to be moved to the "ident" state before we can get the
-+                 * RCA or select the card using the new RCA */
-+            status = _IssueSimpleBusRequest(pHcd,CMD2,0,SDREQ_FLAGS_RESP_R2,pReq);
-+            if (!SDIO_SUCCESS(status)){
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: failed to move SD/MMC card into ident state \n"));
-+                break;
-+            }
-+        }
-+
-+        if (!IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                /* non-SPI mode cards need their RCA's setup */
-+            if (pHcd->CardProperties.Flags & (CARD_SD | CARD_SDIO)) {
-+                    /* issue CMD3 to get RCA on SD/SDIO cards */
-+                status = _IssueSimpleBusRequest(pHcd,CMD3,0,SDREQ_FLAGS_RESP_R6,pReq);
-+                if (!SDIO_SUCCESS(status)){
-+                    DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: failed to get RCA for SD/SDIO card \n"));
-+                    break;
-+                }
-+                pHcd->CardProperties.RCA = SD_R6_GET_RCA(pReq->Response);
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: SD/SDIO RCA:0x%X \n",
-+                                        pHcd->CardProperties.RCA));
-+            } else if (pHcd->CardProperties.Flags & CARD_MMC) {
-+                    /* for MMC cards, we have to assign a relative card address */
-+                    /* just a non-zero number */
-+                pHcd->CardProperties.RCA = 1;
-+                    /* issue CMD3 to set the RCA for MMC cards */
-+                status = _IssueSimpleBusRequest(pHcd,
-+                                                CMD3,(pHcd->CardProperties.RCA << 16),
-+                                                SDREQ_FLAGS_RESP_R1,pReq);
-+                if (!SDIO_SUCCESS(status)){
-+                    DBG_PRINT(SDDBG_ERROR,
-+                            ("SDIO Bus Driver: failed to set RCA for MMC card! (err=%d) \n",status));
-+                    break;
-+                }
-+            } else {
-+                DBG_ASSERT(FALSE);
-+            }
-+        }
-+            /* select the card in order to get the rest of the card info, applies
-+             * to SDIO/SD/MMC cards*/
-+        status = SelectDeselectCard(pHcd, TRUE);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: failed to select card! \n"));
-+            break;
-+        }
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver, Card now Selected.. \n"));
-+
-+        if (pHcd->CardProperties.Flags & CARD_SDIO) {
-+                /* read SDIO revision register */
-+            status = Cmd52ReadByteCommon(pHcd->pPseudoDev, CCCR_SDIO_REVISION_REG, &temp);
-+            if (!SDIO_SUCCESS(status)) {
-+                break;
-+            }
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Revision Reg: 0x%X \n", temp));
-+            switch (temp & SDIO_REV_MASK) {
-+                case SDIO_REV_1_00:
-+                    DBG_PRINT(SDDBG_TRACE, ("SDIO Spec Revision 1.00 \n"));
-+                    pHcd->CardProperties.SDIORevision = SDIO_REVISION_1_00;
-+                    break;
-+                case SDIO_REV_1_10:
-+                    DBG_PRINT(SDDBG_TRACE, ("SDIO Spec Revision 1.10 \n"));
-+                    pHcd->CardProperties.SDIORevision = SDIO_REVISION_1_10;
-+                    break;
-+                case SDIO_REV_1_20:
-+                    DBG_PRINT(SDDBG_TRACE, ("SDIO Spec Revision 1.20 \n"));
-+                    pHcd->CardProperties.SDIORevision = SDIO_REVISION_1_20;
-+                    break;
-+                default:
-+                    DBG_PRINT(SDDBG_WARN, ("SDIO Warning: unknown SDIO revision, treating like 1.0 device \n"));
-+                    pHcd->CardProperties.SDIORevision = SDIO_REVISION_1_00;
-+                    break;
-+            }
-+                /* get the common CIS ptr */
-+            status = Cmd52ReadMultipleCommon(pHcd->pPseudoDev,
-+                                             SDIO_CMN_CIS_PTR_LOW_REG,
-+                                             cisBuffer,
-+                                             3);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to get CIS ptr, Err:%d", status));
-+                break;
-+            }
-+                /* this is endian-safe*/
-+            pHcd->CardProperties.CommonCISPtr = ((UINT32)cisBuffer[0]) |
-+                                                (((UINT32)cisBuffer[1]) << 8) |
-+                                                (((UINT32)cisBuffer[2]) << 16);
-+
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Card CIS Ptr: 0x%X \n", pHcd->CardProperties.CommonCISPtr));
-+            temp = sizeof(manfid);
-+            tplAddr = pHcd->CardProperties.CommonCISPtr;
-+                /* get the MANFID tuple */
-+            status = SDLIB_FindTuple(pHcd->pPseudoDev,
-+                                     CISTPL_MANFID,
-+                                     &tplAddr,
-+                                     (PUINT8)&manfid,
-+                                     &temp);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: Failed to get MANFID tuple err:%d \n", status));
-+                status = SDIO_STATUS_SUCCESS;
-+            } else {
-+                    /* save this off so that it can be copied into each SDIO Func's SDDEVICE structure */
-+                pHcd->CardProperties.SDIO_ManufacturerCode =
-+                                        CT_LE16_TO_CPU_ENDIAN(manfid.ManufacturerCode);
-+                pHcd->CardProperties.SDIO_ManufacturerID =
-+                                        CT_LE16_TO_CPU_ENDIAN(manfid.ManufacturerInfo);
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO MANFID:0x%X, MANFINFO:0x%X \n",
-+                                        pHcd->CardProperties.SDIO_ManufacturerID,
-+                                        pHcd->CardProperties.SDIO_ManufacturerCode));
-+            }
-+
-+            if (pHcd->CardProperties.SDIORevision >= SDIO_REVISION_1_10) {
-+                    /* read power control */
-+                status = Cmd52ReadByteCommon(pHcd->pPseudoDev, SDIO_POWER_CONTROL_REG, &temp);
-+                if (SDIO_SUCCESS(status)) {
-+                        /* check for power control support which indicates the card may use more
-+                         * than 200 mA */
-+                    if (temp & SDIO_POWER_CONTROL_SMPC) {
-+                            /* check that the host can support this. */
-+                        if (pHcd->MaxSlotCurrent >= SDIO_EMPC_CURRENT_THRESHOLD) {
-+                            temp = SDIO_POWER_CONTROL_EMPC;
-+                                /* enable power control on the card */
-+                            status = Cmd52WriteByteCommon(pHcd->pPseudoDev, SDIO_POWER_CONTROL_REG, &temp);
-+                            if (!SDIO_SUCCESS(status)) {
-+                                DBG_PRINT(SDDBG_ERROR,
-+                                        ("SDIO Busdriver: failed to enable power control (%d) \n",status));
-+                                break;
-+                            }
-+                                /* mark that the card is high power */
-+                            pHcd->CardProperties.Flags |= CARD_HIPWR;
-+
-+                            DBG_PRINT(SDDBG_TRACE,
-+                               ("SDIO Busdriver: Power Control Enabled on SDIO (1.10 or greater) card \n"));
-+                        } else {
-+                            DBG_PRINT(SDDBG_WARN,
-+                               ("SDIO Busdriver: Card can operate higher than 200mA, host cannot (max:%d) \n",
-+                               pHcd->MaxSlotCurrent));
-+                            /* this is not fatal, the card should operate at a reduced rate */
-+                        }
-+                    } else {
-+                        DBG_PRINT(SDDBG_TRACE,
-+                            ("SDIO Busdriver: SDIO 1.10 (or greater) card draws less than 200mA \n"));
-+                    }
-+                } else {
-+                    DBG_PRINT(SDDBG_WARN,
-+                            ("SDIO Busdriver: failed to get POWER CONTROL REG (%d) \n",status));
-+                    /* fall through and continue on at reduced mode */
-+                }
-+            }
-+        }
-+            /* get the current bus parameters */
-+        busMode.BusModeFlags = pHcd->CardProperties.BusMode;
-+        busMode.ClockRate =  pHcd->CardProperties.OperBusClock;
-+            /* get the rest of the bus parameters like clock and supported bus width */
-+        status = GetBusParameters(pHcd,&busMode);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+
-+        if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+                /* check HCD if it wants to run without SPI CRC */
-+            if (pHcd->Attributes & SDHCD_ATTRIB_NO_SPI_CRC) {
-+                    /* hcd would rather not run with CRC we don't need to tell the card since SPI mode
-+                     * cards power up with CRC initially disabled */
-+                busMode.BusModeFlags |= SDCONFIG_BUS_MODE_SPI_NO_CRC;
-+            } else {
-+                    /* first enable SPI CRC checking if the HCD can handle it */
-+                status = SDSPIModeEnableDisableCRC(pHcd->pPseudoDev, TRUE);
-+                if (!SDIO_SUCCESS(status)) {
-+                    DBG_PRINT(SDDBG_ERROR,
-+                                ("SDIO Bus Driver: Failed to set Enable SPI CRC on card \n"));
-+                    break;
-+                }
-+            }
-+        }
-+
-+        status = SetOperationalBusMode(pHcd->pPseudoDev, &busMode);
-+
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to set operational bus mode\n"));
-+            break;
-+        }
-+
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Oper. Mode: Clock:%d, Bus:0x%X \n",
-+                                pHcd->CardProperties.OperBusClock,pHcd->CardProperties.BusMode));
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Card in TRANS state, Ready: CardInfo Flags 0x%X \n",
-+                                pHcd->CardProperties.Flags));
-+
-+    } while (FALSE);
-+
-+    if (pReq != NULL) {
-+        FreeRequest(pReq);
-+    }
-+
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  SDQuerySDMMCInfo - query MMC card info
-+  Input:  pDevice - device
-+  Output:
-+  Return:
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS SDQuerySDMMCInfo(PSDDEVICE pDevice)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    PSDREQUEST  pReq = NULL;
-+    UINT8       CID[MAX_CSD_CID_BYTES];
-+
-+    do {
-+        pReq = AllocateRequest();
-+        if (NULL == pReq) {
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            break;
-+        }
-+            /* de-select the card */
-+        status = SelectDeselectCard(pDevice->pHcd,FALSE);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to deselect card before getting CID \n"));
-+            break;
-+        }
-+
-+        if (SDDEVICE_IS_BUSMODE_SPI(pDevice)) {
-+                /* in SPI mode, getting the CSD requires a data transfer */
-+            status = _IssueBusRequestBd(pDevice->pHcd,CMD10,0,
-+                                        SDREQ_FLAGS_RESP_R1 | SDREQ_FLAGS_DATA_TRANS,
-+                                        pReq,
-+                                        CID,
-+                                        MAX_CSD_CID_BYTES);
-+            if (SDIO_SUCCESS(status)) {
-+                    /* in SPI mode we need to reorder to the CID since SPI data comes in MSB first*/
-+                ReorderBuffer(CID,MAX_CSD_CID_BYTES);
-+            }
-+        } else {
-+                /* get the CID */
-+            status = _IssueSimpleBusRequest(pDevice->pHcd,
-+                                            CMD10,
-+                                            (SDDEVICE_GET_CARD_RCA(pDevice) << 16),
-+                                            SDREQ_FLAGS_RESP_R2,
-+                                            pReq);
-+            if (SDIO_SUCCESS(status)) {
-+                    /* extract it from the reponse */
-+                memcpy(CID,pReq->Response,MAX_CSD_CID_BYTES);
-+            }
-+        }
-+
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_WARN, ("SDQuerySDMMCInfo: failed to get CID. \n"));
-+            status = SDIO_STATUS_SUCCESS;
-+        } else {
-+            pDevice->pId[0].SDMMC_ManfacturerID = GET_SD_CID_MANFID(CID);
-+            pDevice->pId[0].SDMMC_OEMApplicationID = GET_SD_CID_OEMID(CID);
-+#if DEBUG
-+            {
-+                char pBuf[7];
-+
-+                pBuf[0] = GET_SD_CID_PN_1(CID);
-+                pBuf[1] = GET_SD_CID_PN_2(CID);
-+                pBuf[2] = GET_SD_CID_PN_3(CID);
-+                pBuf[3] = GET_SD_CID_PN_4(CID);
-+                pBuf[4] = GET_SD_CID_PN_5(CID);
-+                if (pDevice->pHcd->CardProperties.Flags & CARD_MMC) {
-+                    pBuf[5] = GET_SD_CID_PN_6(CID);
-+                    pBuf[6] = 0;
-+                } else {
-+                    pBuf[5] = 0;
-+                }
-+                DBG_PRINT(SDDBG_TRACE, ("SDQuerySDMMCInfo: Product String: %s\n", pBuf));
-+            }
-+#endif
-+            DBG_PRINT(SDDBG_TRACE, ("SDQuerySDMMCInfo: ManfID: 0x%X, OEMID:0x%X \n",
-+                       pDevice->pId[0].SDMMC_ManfacturerID, pDevice->pId[0].SDMMC_OEMApplicationID));
-+        }
-+            /* re-select card */
-+        status = SelectDeselectCard(pDevice->pHcd,TRUE);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to re-select card after getting CID \n"));
-+            break;
-+        }
-+    } while (FALSE);
-+
-+    if (pReq != NULL) {
-+        FreeRequest(pReq);
-+    }
-+
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  SDQuerySDIOInfo - query SDIO card info
-+  Input:  pDevice - the device
-+  Output:
-+  Return:
-+  Notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS SDQuerySDIOInfo(PSDDEVICE pDevice)
-+{
-+    SDIO_STATUS     status = SDIO_STATUS_SUCCESS;
-+    UINT32          faddress;
-+    UINT8           fInfo;
-+    UINT32          nextTpl;
-+    UINT8           tplLength;
-+    UINT8           cisPtrBuffer[3];
-+    struct SDIO_FUNC_EXT_FUNCTION_TPL_1_1 funcTuple;
-+
-+        /* use the card-wide SDIO manufacturer code and ID previously read.*/
-+    pDevice->pId[0].SDIO_ManufacturerCode = pDevice->pHcd->CardProperties.SDIO_ManufacturerCode;
-+    pDevice->pId[0].SDIO_ManufacturerID = pDevice->pHcd->CardProperties.SDIO_ManufacturerID;
-+
-+        /* calculate function base address */
-+    faddress = CalculateFBROffset(SDDEVICE_GET_SDIO_FUNCNO(pDevice));
-+    DBG_ASSERT(faddress != 0);
-+
-+    do {
-+        status = Cmd52ReadByteCommon(pDevice,
-+                                     FBR_FUNC_INFO_REG_OFFSET(faddress),
-+                                     &fInfo);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to get function info, Err:%d , using Class:UNKNOWN\n", status));
-+            fInfo = 0;
-+            pDevice->pId[0].SDIO_FunctionClass = 0;
-+            status = SDIO_STATUS_SUCCESS;
-+        } else {
-+            pDevice->pId[0].SDIO_FunctionClass = fInfo & FUNC_INFO_DEVICE_CODE_MASK;
-+        }
-+
-+        if ((FUNC_INFO_DEVICE_CODE_LAST == pDevice->pId[0].SDIO_FunctionClass) &&
-+            SDDEVICE_IS_SDIO_REV_GTEQ_1_10(pDevice)) {
-+                /* if the device code is the last one, check for 1.1 revision and get the
-+                 * extended code */
-+            status = Cmd52ReadByteCommon(pDevice,
-+                                         FBR_FUNC_EXT_DEVICE_CODE_OFFSET(faddress),
-+                                         &(pDevice->pId[0].SDIO_FunctionClass));
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to get 1.1 extended DC, Err:%d\n",
-+                                        status));
-+                break;
-+            }
-+        }
-+
-+            /* get the function CIS ptr */
-+        status = Cmd52ReadMultipleCommon(pDevice,
-+                                         FBR_FUNC_CIS_LOW_OFFSET(faddress),
-+                                         cisPtrBuffer,
-+                                         3);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to get FN CIS ptr, Err:%d\n", status));
-+            break;
-+        }
-+            /* endian safe */
-+        pDevice->DeviceInfo.AsSDIOInfo.FunctionCISPtr = ((UINT32)cisPtrBuffer[0]) |
-+                                                        (((UINT32)cisPtrBuffer[1]) << 8) |
-+                                                        (((UINT32)cisPtrBuffer[2]) << 16);
-+
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Function:%d, Class:%d FnCISPtr:0x%X \n",
-+                  SDDEVICE_GET_SDIO_FUNCNO(pDevice),
-+                  pDevice->pId[0].SDIO_FunctionClass,pDevice->DeviceInfo.AsSDIOInfo.FunctionCISPtr));
-+
-+        if (fInfo & FUNC_INFO_SUPPORTS_CSA_MASK) {
-+               /* get the function CSA ptr */
-+            status = Cmd52ReadMultipleCommon(pDevice,
-+                                             FBR_FUNC_CSA_LOW_OFFSET(faddress),
-+                                             cisPtrBuffer,
-+                                             3);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to get FN CSA ptr, Err:%d \n", status));
-+                break;
-+            }
-+                /* endian safe */
-+            pDevice->DeviceInfo.AsSDIOInfo.FunctionCSAPtr = ((UINT32)cisPtrBuffer[0]) |
-+                                                            (((UINT32)cisPtrBuffer[1]) << 8) |
-+                                                            (((UINT32)cisPtrBuffer[2]) << 16);
-+
-+        }
-+
-+        nextTpl = SDDEVICE_GET_SDIO_FUNC_CISPTR(pDevice);
-+            /* look for the funce TPL */
-+        tplLength = sizeof(funcTuple);
-+            /* go get the func CE tuple */
-+        status = SDLIB_FindTuple(pDevice,
-+                                 CISTPL_FUNCE,
-+                                 &nextTpl,
-+                                 (PUINT8)&funcTuple,
-+                                 &tplLength);
-+
-+        if (!SDIO_SUCCESS(status)){
-+            /* handles case of bad CIS or missing tupple, allow function driver to handle */
-+            DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: Failed to get FuncCE Tuple: %d \n", status));
-+            status = SDIO_STATUS_SUCCESS;
-+            break;
-+        }
-+            /* set the max block size */
-+        pDevice->DeviceInfo.AsSDIOInfo.FunctionMaxBlockSize =
-+                                CT_LE16_TO_CPU_ENDIAN(funcTuple.CommonInfo.MaxBlockSize);
-+
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Function:%d, MaxBlocks:%d \n",
-+                  SDDEVICE_GET_SDIO_FUNCNO(pDevice),
-+                  pDevice->DeviceInfo.AsSDIOInfo.FunctionMaxBlockSize));
-+
-+            /* check for MANFID function tuple (SDIO 1.1 or greater) */
-+        if (SDDEVICE_IS_SDIO_REV_GTEQ_1_10(pDevice)) {
-+            struct SDIO_MANFID_TPL      manfid;
-+            nextTpl = SDDEVICE_GET_SDIO_FUNC_CISPTR(pDevice);
-+            tplLength = sizeof(manfid);
-+                /* get the MANFID tuple */
-+            status = SDLIB_FindTuple(pDevice,
-+                                     CISTPL_MANFID,
-+                                     &nextTpl,
-+                                     (PUINT8)&manfid,
-+                                     &tplLength);
-+            if (SDIO_SUCCESS(status)) {
-+                    /* this function has a MANFID tuple */
-+                pDevice->pId[0].SDIO_ManufacturerCode =
-+                                        CT_LE16_TO_CPU_ENDIAN(manfid.ManufacturerCode);
-+                pDevice->pId[0].SDIO_ManufacturerID =
-+                                        CT_LE16_TO_CPU_ENDIAN(manfid.ManufacturerInfo);
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO 1.1 (Function Specific) MANFID:0x%X, MANFINFO:0x%X \n",
-+                                        pDevice->pId[0].SDIO_ManufacturerID,
-+                                        pDevice->pId[0].SDIO_ManufacturerCode));
-+            } else {
-+                DBG_PRINT(SDDBG_WARN, ("SDIO 1.1, No CISTPL_MANFID Tuple in FUNC CIS \n"));
-+                status = SDIO_STATUS_SUCCESS;
-+            }
-+        }
-+    } while (FALSE);
-+
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  SDEnableFunction - enable function
-+  Input:  pDevice - the device/function
-+          pEnData - enable data;
-+  Output:
-+  Return: status
-+  Notes: Note, this performs synchronous calls
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS SDEnableFunction(PSDDEVICE pDevice, PSDCONFIG_FUNC_ENABLE_DISABLE_DATA pEnData)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    UINT8       registerValue;
-+    UINT8       mask;
-+    FUNC_ENABLE_TIMEOUT  retry;
-+
-+        /* take the configure op lock to make this atomic */
-+    status = SemaphorePendInterruptable(&pDevice->pHcd->ConfigureOpsSem);
-+    if (!SDIO_SUCCESS(status)) {
-+        return status;
-+    }
-+
-+    status = SDIO_STATUS_INVALID_PARAMETER;
-+    do {
-+        if (!(pDevice->pHcd->CardProperties.Flags & CARD_SDIO)){
-+                /* nothing to do if it's not an SDIO card */
-+            break;
-+        }
-+
-+        if (!((SDDEVICE_GET_SDIO_FUNCNO(pDevice) >= SDIO_FIRST_FUNCTION_NUMBER) &&
-+              (SDDEVICE_GET_SDIO_FUNCNO(pDevice) <= SDIO_LAST_FUNCTION_NUMBER))){
-+            DBG_ASSERT(FALSE);
-+            break;
-+        }
-+            /* make sure there is a timeout value */
-+        if (0 == pEnData->TimeOut) {
-+            break;
-+        }
-+
-+        mask = 1 << SDDEVICE_GET_SDIO_FUNCNO(pDevice);
-+            /* read the enable register */
-+        status = Cmd52ReadByteCommon(pDevice, SDIO_ENABLE_REG, &registerValue);
-+        if (!SDIO_SUCCESS(status)){
-+            break;
-+        }
-+        if (pEnData->EnableFlags & SDCONFIG_ENABLE_FUNC) {
-+                /* set the enable register bit */
-+            registerValue |= mask;
-+        } else {
-+               /* clear the bit */
-+            registerValue &= ~mask;
-+        }
-+
-+        DBG_PRINT(SDDBG_TRACE,
-+                ("SDIO Bus Driver %s Function, Mask:0x%X Enable Reg Value:0x%2.2X\n",
-+                 (pEnData->EnableFlags & SDCONFIG_ENABLE_FUNC) ? "Enabling":"Disabling",
-+                 mask,
-+                 registerValue));
-+
-+            /* write it back out */
-+        status = Cmd52WriteByteCommon(pDevice, SDIO_ENABLE_REG, &registerValue);
-+        if (!SDIO_SUCCESS(status)){
-+            break;
-+        }
-+            /* now poll the ready bit until it sets or clears */
-+        retry = pEnData->TimeOut;
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Function Enable/Disable Polling: %d retries \n",
-+                                retry));
-+        while (retry) {
-+            status = Cmd52ReadByteCommon(pDevice, SDIO_READY_REG, &registerValue);
-+            if (!SDIO_SUCCESS(status)){
-+                break;
-+            }
-+            if (pEnData->EnableFlags & SDCONFIG_ENABLE_FUNC) {
-+                    /* if the bit is set, the device is ready */
-+                if (registerValue & mask) {
-+                        /* device ready */
-+                    break;
-+                }
-+            } else {
-+                if (!(registerValue & mask)) {
-+                        /* device is no longer ready */
-+                    break;
-+                }
-+            }
-+                /* sleep before trying again */
-+            status = OSSleep(1);
-+            if (!SDIO_SUCCESS(status)) {
-+                DBG_PRINT(SDDBG_ERROR, ("OSSleep Failed! \n"));
-+                break;
-+            }
-+            retry--;
-+        }
-+
-+        if (0 == retry) {
-+            status = SDIO_STATUS_FUNC_ENABLE_TIMEOUT;
-+            break;
-+        }
-+
-+    } while (FALSE);
-+
-+    SemaphorePost(&pDevice->pHcd->ConfigureOpsSem);
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  SDAllocFreeSlotCurrent - allocate or free slot current
-+  Input:  pDevice - the device/function
-+          Allocate - Allocate current, else free
-+          pData - slotcurrent data (non-NULL if Allocate is TRUE)
-+  Output:
-+  Return: status
-+  Notes:  if the function returns SDIO_STATUS_NO_RESOURCES, the pData->SlotCurrent field is
-+          updated with the available current
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS SDAllocFreeSlotCurrent(PSDDEVICE pDevice, BOOL Allocate, PSDCONFIG_FUNC_SLOT_CURRENT_DATA pData)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: SDAllocFreeSlotCurrent\n"));
-+
-+        /* take the configure op lock to make this atomic */
-+    status = SemaphorePendInterruptable(&pDevice->pHcd->ConfigureOpsSem);
-+    if (!SDIO_SUCCESS(status)) {
-+        return status;
-+    }
-+
-+    status = SDIO_STATUS_INVALID_PARAMETER;
-+    do {
-+            /* check the current budget and allocate */
-+        if (Allocate) {
-+            if (0 == pData->SlotCurrent) {
-+                /* caller must specify current requirement for the power mode */
-+                break;
-+            }
-+            if (pDevice->SlotCurrentAlloc != 0) {
-+               /* slot current has already been allocated, caller needs to free
-+                * first */
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Slot Current Already allocated! \n"));
-+                break;
-+            }
-+            if (((UINT32)pDevice->pHcd->SlotCurrentAllocated + (UINT32)pData->SlotCurrent) >
-+                (UINT32)pDevice->pHcd->MaxSlotCurrent) {
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Slot Current Budget exceeded, Requesting: %d, Allocated already: %d, Max: %d \n",
-+                            pData->SlotCurrent, pDevice->pHcd->SlotCurrentAllocated,
-+                            pDevice->pHcd->MaxSlotCurrent));
-+                status = SDIO_STATUS_NO_RESOURCES;
-+                    /* return remaining */
-+                pData->SlotCurrent = pDevice->pHcd->MaxSlotCurrent -
-+                                     pDevice->pHcd->SlotCurrentAllocated;
-+                break;
-+            }
-+                /* bump up allocation */
-+            pDevice->pHcd->SlotCurrentAllocated += pData->SlotCurrent;
-+                /* save this off for the call to free slot current */
-+            pDevice->SlotCurrentAlloc = pData->SlotCurrent;
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Slot Current Requested: %d, New Total: %d, Max: %d \n",
-+                            pData->SlotCurrent, pDevice->pHcd->SlotCurrentAllocated,
-+                            pDevice->pHcd->MaxSlotCurrent));
-+
-+        } else {
-+            if (0 == pDevice->SlotCurrentAlloc) {
-+                    /* no allocation */
-+                break;
-+            }
-+                /* return the allocation back */
-+            if (pDevice->SlotCurrentAlloc <= pDevice->pHcd->SlotCurrentAllocated) {
-+                pDevice->pHcd->SlotCurrentAllocated -= pDevice->SlotCurrentAlloc;
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Slot Current Freed: %d, New Total: %d, Max: %d \n",
-+                            pDevice->SlotCurrentAlloc, pDevice->pHcd->SlotCurrentAllocated,
-+                            pDevice->pHcd->MaxSlotCurrent));
-+            } else {
-+                DBG_ASSERT(FALSE);
-+            }
-+
-+                /* make sure this is zeroed */
-+            pDevice->SlotCurrentAlloc = 0;
-+        }
-+
-+        status = SDIO_STATUS_SUCCESS;
-+
-+    } while (FALSE);
-+
-+    SemaphorePost(&pDevice->pHcd->ConfigureOpsSem);
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: SDAllocFreeSlotCurrent, %d\n", status));
-+    return status;
-+}
-+
-+static void RawHcdIrqControl(PSDHCD pHcd, BOOL Enable)
-+{
-+    SDIO_STATUS status;
-+    SDCONFIG_SDIO_INT_CTRL_DATA irqData;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    ZERO_OBJECT(irqData);
-+
-+    status = _AcquireHcdLock(pHcd);
-+    if (!SDIO_SUCCESS(status)) {
-+        return;
-+    }
-+
-+    do {
-+            /* for raw devices, we simply enable/disable in the HCD only */
-+        if (Enable) {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver (RAW) Unmasking Int \n"));
-+            irqData.IRQDetectMode = IRQ_DETECT_RAW;
-+            irqData.SlotIRQEnable = TRUE;
-+        } else {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver (RAW) Masking Int \n"));
-+            irqData.SlotIRQEnable = FALSE;
-+        }
-+
-+        status = _IssueConfig(pHcd,SDCONFIG_SDIO_INT_CTRL,
-+                              (PVOID)&irqData, sizeof(irqData));
-+
-+        if (!SDIO_SUCCESS(status)){
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver failed to enable/disable IRQ in (RAW) hcd :%d\n",
-+                                    status));
-+        }
-+
-+    } while (FALSE);
-+
-+    status = _ReleaseHcdLock(pHcd);
-+}
-+
-+static void RawHcdEnableIrqPseudoComplete(PSDREQUEST pReq)
-+{
-+    if (SDIO_SUCCESS(pReq->Status)) {
-+        RawHcdIrqControl((PSDHCD)pReq->pCompleteContext, TRUE);
-+    }
-+    FreeRequest(pReq);
-+}
-+
-+static void RawHcdDisableIrqPseudoComplete(PSDREQUEST pReq)
-+{
-+    RawHcdIrqControl((PSDHCD)pReq->pCompleteContext, FALSE);
-+    FreeRequest(pReq);
-+}
-+
-+static void HcdIrqControl(PSDHCD pHcd, BOOL Enable)
-+{
-+    SDIO_STATUS                 status;
-+    SDCONFIG_SDIO_INT_CTRL_DATA irqData;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    ZERO_OBJECT(irqData);
-+
-+    status = _AcquireHcdLock(pHcd);
-+    if (!SDIO_SUCCESS(status)) {
-+        return;
-+    }
-+
-+    do {
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: HcdIrqControl (%s), IrqsEnabled:0x%X \n",
-+                        Enable ? "Enable":"Disable",pHcd->IrqsEnabled ));
-+
-+        if (Enable) {
-+            irqData.SlotIRQEnable = TRUE;
-+        } else {
-+            irqData.SlotIRQEnable = FALSE;
-+        }
-+                /* setup HCD to enable/disable it's detection hardware */
-+        if (irqData.SlotIRQEnable) {
-+                /* set the IRQ detection mode */
-+            switch (SDCONFIG_GET_BUSWIDTH(pHcd->CardProperties.BusMode)) {
-+                case SDCONFIG_BUS_WIDTH_SPI:
-+                    irqData.IRQDetectMode = IRQ_DETECT_SPI;
-+                    break;
-+                case SDCONFIG_BUS_WIDTH_1_BIT:
-+                    irqData.IRQDetectMode = IRQ_DETECT_1_BIT;
-+                    break;
-+                case SDCONFIG_BUS_WIDTH_4_BIT:
-+                    irqData.IRQDetectMode = IRQ_DETECT_4_BIT;
-+                        /* check card and HCD for 4bit multi-block interrupt support */
-+                    if ((pHcd->CardProperties.SDIOCaps & SDIO_CAPS_INT_MULTI_BLK) &&
-+                        (pHcd->Attributes & SDHCD_ATTRIB_MULTI_BLK_IRQ)) {
-+                            /* note: during initialization of the card, the mult-blk IRQ support
-+                             * is enabled in card caps register */
-+                        irqData.IRQDetectMode |= IRQ_DETECT_MULTI_BLK;
-+                        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver enabling IRQ in multi-block mode:\n"));
-+                    }
-+                    break;
-+                default:
-+                    DBG_ASSERT(FALSE);
-+                    break;
-+            }
-+
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver enabling IRQ in HCD Mode:0x%X\n",
-+                                     irqData.IRQDetectMode));
-+        }
-+
-+        status = _IssueConfig(pHcd,SDCONFIG_SDIO_INT_CTRL,
-+                                (PVOID)&irqData, sizeof(irqData));
-+        if (!SDIO_SUCCESS(status)){
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver failed to enable/disable IRQ in hcd %d\n",
-+                                    status));
-+        }
-+
-+    } while (FALSE);
-+
-+    status = _ReleaseHcdLock(pHcd);
-+}
-+
-+static BOOL CheckWriteIntEnableSuccess(PSDREQUEST pReq)
-+{
-+    if (!SDIO_SUCCESS(pReq->Status)){
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to get write INT Enable register Err:%d\n",
-+                                     pReq->Status));
-+        return FALSE;
-+    }
-+
-+    if (SD_R5_GET_RESP_FLAGS(pReq->Response) & SD_R5_ERRORS) {
-+       DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: WriteIntEnableComplete CMD52 resp error: 0x%X \n",
-+                  SD_R5_GET_RESP_FLAGS(pReq->Response)));
-+        return FALSE;
-+    }
-+
-+    return TRUE;
-+}
-+
-+static void HcdIrqEnableComplete(PSDREQUEST pReq)
-+{
-+    if (CheckWriteIntEnableSuccess(pReq)) {
-+            /* configure HCD */
-+        HcdIrqControl((PSDHCD)pReq->pCompleteContext, TRUE);
-+    }
-+    FreeRequest(pReq);
-+}
-+
-+static void HcdIrqDisableComplete(PSDREQUEST pReq)
-+{
-+    CheckWriteIntEnableSuccess(pReq);
-+    HcdIrqControl((PSDHCD)pReq->pCompleteContext, FALSE);
-+    FreeRequest(pReq);
-+}
-+
-+static void WriteIntEnableComplete(PSDREQUEST pReq)
-+{
-+   if (CheckWriteIntEnableSuccess(pReq)) {
-+       DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: Wrote INT Enable value:0x%X \n",
-+                    (INT)pReq->pCompleteContext));
-+   }
-+   FreeRequest(pReq);
-+}
-+
-+static void HcdAckComplete(PSDREQUEST pReq)
-+{
-+    SDIO_STATUS status;
-+    DBG_PRINT(SDIODBG_FUNC_IRQ, ("SDIO Bus Driver: Hcd (0x%X) Irq Ack \n",
-+                    (INT)pReq->pCompleteContext));
-+        /* re-arm the HCD */
-+    status = _IssueConfig((PSDHCD)pReq->pCompleteContext,SDCONFIG_SDIO_REARM_INT,NULL,0);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: HCD Re-Arm failed : %d\n",
-+                    status));
-+    }
-+    FreeRequest(pReq);
-+}
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  SDFunctionAckInterrupt - handle device interrupt acknowledgement
-+  Input:  pDevice - the device
-+  Output:
-+  Return:
-+  Notes:
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS SDFunctionAckInterrupt(PSDDEVICE pDevice)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    UCHAR       mask;
-+    PSDREQUEST  pReq = NULL;
-+    BOOL        setHcd = FALSE;
-+    SDIO_STATUS status2;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    pReq = AllocateRequest();
-+    if (NULL == pReq) {
-+        return SDIO_STATUS_NO_RESOURCES;
-+    }
-+
-+    status = _AcquireHcdLock(pDevice->pHcd);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        FreeRequest(pReq);
-+        return status;
-+    }
-+
-+    do {
-+        if (!((SDDEVICE_GET_SDIO_FUNCNO(pDevice) >= SDIO_FIRST_FUNCTION_NUMBER) &&
-+              (SDDEVICE_GET_SDIO_FUNCNO(pDevice) <= SDIO_LAST_FUNCTION_NUMBER))){
-+            status = SDIO_STATUS_INVALID_PARAMETER;
-+            DBG_ASSERT(FALSE);
-+            break;
-+        }
-+        mask = 1 << SDDEVICE_GET_SDIO_FUNCNO(pDevice);
-+        if (pDevice->pHcd->PendingIrqAcks & mask) {
-+                /* clear the ack bit in question */
-+            pDevice->pHcd->PendingIrqAcks &= ~mask;
-+            if (0 == pDevice->pHcd->PendingIrqAcks) {
-+                pDevice->pHcd->IrqProcState = SDHCD_IDLE;
-+                    /* no pending acks, so re-arm if irqs are stilled enabled */
-+                if (pDevice->pHcd->IrqsEnabled) {
-+                    setHcd = TRUE;
-+                        /* issue pseudo request to sync this with bus requests */
-+                    pReq->Status = SDIO_STATUS_SUCCESS;
-+                    pReq->pCompletion = HcdAckComplete;
-+                    pReq->pCompleteContext = pDevice->pHcd;
-+                    pReq->Flags = SD_PSEUDO_REQ_FLAGS;
-+                }
-+            }
-+        } else {
-+            DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: AckInterrupt: no IRQ pending on Function :%d, \n",
-+                        SDDEVICE_GET_SDIO_FUNCNO(pDevice)));
-+        }
-+    } while (FALSE);
-+
-+    status2 = ReleaseHcdLock(pDevice);
-+
-+    if (pReq != NULL) {
-+        if (SDIO_SUCCESS(status) && (setHcd)) {
-+                /* issue request */
-+            IssueRequestToHCD(pDevice->pHcd,pReq);
-+        } else {
-+            FreeRequest(pReq);
-+        }
-+    }
-+
-+    return status;
-+}
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  SDMaskUnmaskFunctionIRQ - mask/unmask function IRQ
-+  Input:  pDevice - the device/function
-+          MaskInt - mask interrupt
-+  Output:
-+  Return: status
-+  Notes:  Note, this function can be called from an ISR or completion context
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS SDMaskUnmaskFunctionIRQ(PSDDEVICE pDevice, BOOL MaskInt)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    UINT8       mask;
-+    UINT8       controlVal;
-+    BOOL        setHcd;
-+    PSDREQUEST  pReq = NULL;
-+    SDIO_STATUS status2;
-+
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    setHcd = FALSE;
-+
-+    pReq = AllocateRequest();
-+    if (NULL == pReq) {
-+        return SDIO_STATUS_NO_RESOURCES;
-+    }
-+
-+    status = _AcquireHcdLock(pDevice->pHcd);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        FreeRequest(pReq);
-+        return status;
-+    }
-+
-+    do {
-+
-+        if (pDevice->pHcd->CardProperties.Flags & CARD_RAW) {
-+            if (!MaskInt) {
-+                if (!pDevice->pHcd->IrqsEnabled) {
-+                    pReq->pCompletion = RawHcdEnableIrqPseudoComplete;
-+                    setHcd = TRUE;
-+                    pDevice->pHcd->IrqsEnabled = 1 << 1;
-+                }
-+            } else {
-+                if (pDevice->pHcd->IrqsEnabled) {
-+                    pReq->pCompletion = RawHcdDisableIrqPseudoComplete;
-+                    setHcd = TRUE;
-+                    pDevice->pHcd->IrqsEnabled = 0;
-+                }
-+            }
-+
-+            if (setHcd) {
-+                    /* hcd IRQ control requests must be synched with outstanding
-+                     * bus requests so we issue a pseudo bus request  */
-+                pReq->pCompleteContext = pDevice->pHcd;
-+                pReq->Flags = SD_PSEUDO_REQ_FLAGS;
-+                pReq->Status = SDIO_STATUS_SUCCESS;
-+            } else {
-+                    /* no request to submit, just free it */
-+                FreeRequest(pReq);
-+                pReq = NULL;
-+            }
-+                /* we're done, submit the bus request if any */
-+            break;
-+        }
-+
-+        if (!(pDevice->pHcd->CardProperties.Flags & CARD_SDIO)){
-+                /* nothing to do if it's not an SDIO card */
-+            DBG_ASSERT(FALSE);
-+            status = SDIO_STATUS_INVALID_PARAMETER;
-+            break;
-+        }
-+
-+        if (!((SDDEVICE_GET_SDIO_FUNCNO(pDevice) >= SDIO_FIRST_FUNCTION_NUMBER) &&
-+              (SDDEVICE_GET_SDIO_FUNCNO(pDevice) <= SDIO_LAST_FUNCTION_NUMBER))){
-+            status = SDIO_STATUS_INVALID_PARAMETER;
-+            DBG_ASSERT(FALSE);
-+            break;
-+        }
-+
-+        mask = 1 << SDDEVICE_GET_SDIO_FUNCNO(pDevice);
-+        if (!MaskInt) {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver Unmasking Int, Mask:0x%X\n", mask));
-+                /* check interrupts that were enabled on entry */
-+            if (0 == pDevice->pHcd->IrqsEnabled) {
-+                    /* need to turn on interrupts in HCD */
-+                setHcd = TRUE;
-+                    /* use this completion routine */
-+                pReq->pCompletion = HcdIrqEnableComplete;
-+            }
-+                /* set the enable bit, in the shadow register */
-+            pDevice->pHcd->IrqsEnabled |= mask;
-+                /* make sure control value includes the master enable */
-+            controlVal = pDevice->pHcd->IrqsEnabled | SDIO_INT_MASTER_ENABLE;
-+        } else {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver Masking Int, Mask:0x%X\n", mask));
-+                /* clear the bit */
-+            pDevice->pHcd->IrqsEnabled &= ~mask;
-+                /* check and see if this clears all the bits */
-+            if (0 == pDevice->pHcd->IrqsEnabled){
-+                    /* if none of the functions are enabled, clear this register */
-+                controlVal = 0;
-+                    /* disable in host */
-+                setHcd = TRUE;
-+                    /* use this completion routine */
-+                pReq->pCompletion = HcdIrqDisableComplete;
-+            } else {
-+                    /* set control value making sure master enable is left on */
-+                controlVal = pDevice->pHcd->IrqsEnabled | SDIO_INT_MASTER_ENABLE;
-+            }
-+        }
-+
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver INT_ENABLE_REG value:0x%X\n", controlVal));
-+            /* setup bus request to update the mask register */
-+        SDIO_SET_CMD52_WRITE_ARG(pReq->Argument,0,SDIO_INT_ENABLE_REG,controlVal);
-+        pReq->Command = CMD52;
-+        pReq->Flags = SDREQ_FLAGS_TRANS_ASYNC | SDREQ_FLAGS_RESP_SDIO_R5;
-+
-+        if (setHcd) {
-+                /* make this a barrier request and set context*/
-+            pReq->Flags |= SDREQ_FLAGS_BARRIER;
-+            pReq->pCompleteContext = pDevice->pHcd;
-+        } else {
-+                /* does not require an update to the HCD  */
-+            pReq->pCompleteContext = (PVOID)(UINT32)controlVal;
-+            pReq->pCompletion = WriteIntEnableComplete;
-+        }
-+
-+    } while (FALSE);
-+
-+    status2 = _ReleaseHcdLock(pDevice->pHcd);
-+
-+    if (pReq != NULL) {
-+        if (SDIO_SUCCESS(status)) {
-+                /* issue request */
-+            IssueRequestToHCD(pDevice->pHcd,pReq);
-+        } else {
-+            FreeRequest(pReq);
-+        }
-+    }
-+
-+    return status;
-+}
-+
-+
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  SDSPIModeEnableDisableCRC - Enable/Disable SPI Mode CRC checking
-+  Input:  pDevice - the device/function
-+          Enable - Enable CRC
-+  Output:
-+  Return: status
-+  Notes:  Note, this function can be called from an ISR or completion context
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS SDSPIModeEnableDisableCRC(PSDDEVICE pDevice,BOOL Enable)
-+{
-+    SDCONFIG_BUS_MODE_DATA busMode;
-+    SDIO_STATUS            status = SDIO_STATUS_SUCCESS;
-+    UINT32                 cmdARG = 0;
-+
-+    if (!SDDEVICE_IS_BUSMODE_SPI(pDevice)) {
-+        return SDIO_STATUS_INVALID_PARAMETER;
-+    }
-+       //??we should make these atomic using a barrier
-+
-+        /* get the current mode and clock */
-+    busMode.BusModeFlags = pDevice->pHcd->CardProperties.BusMode;
-+    busMode.ClockRate = pDevice->pHcd->CardProperties.OperBusClock;
-+
-+    if (Enable) {
-+            /* clear the no-CRC flag */
-+        busMode.BusModeFlags &= ~SDCONFIG_BUS_MODE_SPI_NO_CRC;
-+        cmdARG = SD_CMD59_CRC_ON;
-+    } else {
-+        busMode.BusModeFlags |= SDCONFIG_BUS_MODE_SPI_NO_CRC;
-+        cmdARG = SD_CMD59_CRC_OFF;
-+    }
-+
-+    do {
-+            /* issue CMD59 to turn on/off CRC */
-+        status = _IssueSimpleBusRequest(pDevice->pHcd,
-+                                        CMD59,
-+                                        cmdARG,
-+                                        SDREQ_FLAGS_RESP_R1,
-+                                        NULL);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed issue CMD59 (arg=0x%X) Err:%d \n",
-+                                    cmdARG, status));
-+            break;
-+        }
-+        if (Enable) {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: CRC Enabled in SPI mode \n"));
-+        } else {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: CRC Disabled in SPI mode \n"));
-+        }
-+        status = SetOperationalBusMode(pDevice,&busMode);
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Failed to set SPI NO CRC mode in hcd : Err:%d \n",
-+                                    status));
-+            break;
-+        }
-+    } while (FALSE);
-+
-+    return status;
-+}
-+
-+
-+static UINT32 ConvertSPIStatusToSDCardStatus(UINT8 SpiR1, UINT8 SpiR2)
-+{
-+    UINT32 cardStatus = 0;
-+
-+    if (SpiR1 != 0) {
-+            /* convert the error */
-+        if (SpiR1 & SPI_CS_ERASE_RESET) {
-+            cardStatus |= SD_CS_ERASE_RESET;
-+        }
-+        if (SpiR1 & SPI_CS_ILLEGAL_CMD) {
-+            cardStatus |= SD_CS_ILLEGAL_CMD_ERR;
-+        }
-+        if (SpiR1 & SPI_CS_CMD_CRC_ERR) {
-+            cardStatus |= SD_CS_PREV_CMD_CRC_ERR;
-+        }
-+        if (SpiR1 & SPI_CS_ERASE_SEQ_ERR) {
-+            cardStatus |= SD_CS_ERASE_SEQ_ERR;
-+        }
-+        if (SpiR1 & SPI_CS_ADDRESS_ERR) {
-+            cardStatus |= SD_CS_ADDRESS_ERR;
-+        }
-+        if (SpiR1 & SPI_CS_PARAM_ERR) {
-+            cardStatus |= SD_CS_CMD_OUT_OF_RANGE;
-+        }
-+    }
-+
-+    if (SpiR2 != 0) {
-+            /* convert the error */
-+        if (SpiR2 & SPI_CS_CARD_IS_LOCKED) {
-+            cardStatus |= SD_CS_CARD_LOCKED;
-+        }
-+        if (SpiR2 & SPI_CS_LOCK_UNLOCK_FAILED) {
-+                /* this bit is shared, just set both */
-+            cardStatus |= (SD_CS_LK_UNLK_FAILED | SD_CS_WP_ERASE_SKIP);
-+        }
-+        if (SpiR2 & SPI_CS_ERROR) {
-+            cardStatus |= SD_CS_GENERAL_ERR;
-+        }
-+        if (SpiR2 & SPI_CS_INTERNAL_ERROR) {
-+            cardStatus |= SD_CS_CARD_INTERNAL_ERR;
-+        }
-+        if (SpiR2 & SPI_CS_ECC_FAILED) {
-+            cardStatus |= SD_CS_ECC_FAILED;
-+        }
-+        if (SpiR2 & SPI_CS_WP_VIOLATION) {
-+            cardStatus |= SD_CS_WP_ERR;
-+        }
-+        if (SpiR2 & SPI_CS_ERASE_PARAM_ERR) {
-+            cardStatus |= SD_CS_ERASE_PARAM_ERR;
-+        }
-+        if (SpiR2 & SPI_CS_OUT_OF_RANGE) {
-+            cardStatus |= SD_CS_CMD_OUT_OF_RANGE;
-+        }
-+    }
-+
-+    return cardStatus;
-+}
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  ConvertSPI_Response - filter the SPI response and convert it to an SD Response
-+  Input:  pReq - request
-+  Output: pReq - modified response, if pRespBuffer is not NULL
-+          pRespBuffer - converted response (optional)
-+  Return:
-+  Notes:  This function converts a SPI response into an SD response.  A caller
-+          can supply a buffer instead.
-+          For SPI bus operation the HCD must send the SPI response as
-+          a stream of bytes, the highest byte contains the first received byte from the
-+          card.  This function only filters simple responses (R1 primarily).
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void ConvertSPI_Response(PSDREQUEST pReq, UINT8 *pRespBuffer)
-+{
-+
-+    UINT32  cardStatus;
-+
-+    if (pReq->Flags & SDREQ_FLAGS_RESP_SPI_CONVERTED) {
-+            /* already converted */
-+        return;
-+    }
-+    if (NULL == pRespBuffer) {
-+        pRespBuffer = pReq->Response;
-+    }
-+
-+    switch (GET_SDREQ_RESP_TYPE(pReq->Flags)) {
-+        case SDREQ_FLAGS_RESP_R1:
-+        case SDREQ_FLAGS_RESP_R1B:
-+            cardStatus = ConvertSPIStatusToSDCardStatus(GET_SPI_R1_RESP_TOKEN(pReq->Response),
-+                                                        0);
-+            if (CMD55 == pReq->Command) {
-+                    /* we emulate this since SPI does not have such a bit */
-+                cardStatus |= SD_CS_APP_CMD;
-+            }
-+                /* stuff the SD card status */
-+            SD_R1_SET_CMD_STATUS(pRespBuffer,cardStatus);
-+                /* stuff the command */
-+            SD_R1_SET_CMD(pRespBuffer,pReq->Command);
-+            pReq->Flags |= SDREQ_FLAGS_RESP_SPI_CONVERTED;
-+            break;
-+        case SDREQ_FLAGS_RESP_SDIO_R5:
-+            {
-+                UINT8 respFlags;
-+                UINT8 readData;
-+
-+                readData = GET_SPI_SDIO_R5_RESPONSE_RDATA(pReq->Response);
-+                respFlags = GET_SPI_SDIO_R5_RESP_TOKEN(pReq->Response);
-+
-+                pRespBuffer[SD_R5_RESP_FLAGS_OFFSET] = 0;
-+                if (respFlags != 0) {
-+                    if (respFlags & SPI_R5_ILLEGAL_CMD) {
-+                        pRespBuffer[SD_R5_RESP_FLAGS_OFFSET] |= SD_R5_ILLEGAL_CMD;
-+                    }
-+                    if (respFlags & SPI_R5_CMD_CRC) {
-+                        pRespBuffer[SD_R5_RESP_FLAGS_OFFSET] |= SD_R5_RESP_CMD_ERR;
-+                    }
-+                    if (respFlags & SPI_R5_FUNC_ERR) {
-+                        pRespBuffer[SD_R5_RESP_FLAGS_OFFSET] |= SD_R5_INVALID_FUNC;
-+                    }
-+                    if (respFlags & SPI_R5_PARAM_ERR) {
-+                        pRespBuffer[SD_R5_RESP_FLAGS_OFFSET] |= SD_R5_ARG_RANGE_ERR;
-+                    }
-+                }
-+                    /* stuff read data */
-+                pRespBuffer[SD_SDIO_R5_READ_DATA_OFFSET] = readData;
-+                    /* stuff the command */
-+                SD_R5_SET_CMD(pRespBuffer,pReq->Command);
-+            }
-+            pReq->Flags |= SDREQ_FLAGS_RESP_SPI_CONVERTED;
-+            break;
-+        case SDREQ_FLAGS_RESP_R2:
-+                /* for CMD13 and ACMD13 , SPI uses it's own R2 response format (2 bytes) */
-+                /* the issue of CMD13 needs to change the response flag to R2 */
-+            if (CMD13 == pReq->Command) {
-+                cardStatus = ConvertSPIStatusToSDCardStatus(
-+                                    GET_SPI_R2_RESP_TOKEN(pReq->Response),
-+                                    GET_SPI_R2_STATUS_TOKEN(pReq->Response));
-+                    /* stuff the SD card status */
-+                SD_R1_SET_CMD_STATUS(pRespBuffer,cardStatus);
-+                    /* stuff the command */
-+                SD_R1_SET_CMD(pRespBuffer,pReq->Command);
-+                pReq->Flags |= SDREQ_FLAGS_RESP_SPI_CONVERTED;
-+                break;
-+            }
-+                /* no other commands should be using R2 when using SPI, if they are
-+                 * they should be bypassing the filter  */
-+            DBG_ASSERT(FALSE);
-+            break;
-+        default:
-+                /* for all others:
-+                 *
-+                 * SDREQ_FLAGS_RESP_R6 - SPI mode does not use RCA
-+                 * SDREQ_FLAGS_RESP_R3 - bus driver handles this internally
-+                 * SDREQ_FLAGS_RESP_SDIO_R4 - bus driver handles this internally
-+                 *
-+                 */
-+            DBG_PRINT(SDDBG_ERROR, ("ConvertSPI_Response - invalid response type:0x%2.2X",
-+                                    GET_SDREQ_RESP_TYPE(pReq->Flags)));
-+            DBG_ASSERT(FALSE);
-+            break;
-+    }
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Check an SD/MMC/SDIO response.
-+
-+  @function name: SDIO_CheckResponse
-+  @prototype: SDIO_STATUS SDIO_CheckResponse(PSDHCD pHcd, PSDREQUEST pReq, SDHCD_RESPONSE_CHECK_MODE CheckMode)
-+  @category: HD_Reference
-+
-+  @input:  pHcd - the host controller definition structure.
-+  @input:  pReq - request containing the response
-+  @input:  CheckMode - mode
-+
-+  @return: SDIO_STATUS
-+
-+  @notes: Host controller drivers must call into this function to validate various command
-+          responses before continuing with data transfers or for decoding received SPI tokens.
-+          The CheckMode option determines the type of validation to perform.
-+          if (CheckMode == SDHCD_CHECK_DATA_TRANS_OK) :
-+             The host controller must check the card response to determine whether it
-+          is safe to perform a data transfer.  This API only checks commands that
-+          involve data transfers and checks various status fields in the command response.
-+          If the card cannot accept data, this function will return a non-successful status that
-+          should be treated as a request failure.  The host driver should complete the request with the
-+          returned status. Host controller should only call this function in preparation for a
-+          data transfer.
-+          if (CheckMode == SDHCD_CHECK_SPI_TOKEN) :
-+             This API checks the SPI token and returns a timeout status if the illegal command bit is
-+          set.  This simulates the behavior of SD 1/4 bit operation where illegal commands result in
-+          a command timeout.  A driver that supports SPI mode should pass every response to this
-+          function to determine the appropriate error status to complete the request with.  If the
-+          API returns success, the response indicates that the card accepted the command.
-+
-+  @example: Checking the response before starting the data transfer :
-+        if (SDIO_SUCCESS(status) && (pReq->Flags & SDREQ_FLAGS_DATA_TRANS)) {
-+                // check the response to see if we should continue with data
-+            status = SDIO_CheckResponse(pHcd, pReq, SDHCD_CHECK_DATA_TRANS_OK);
-+            if (SDIO_SUCCESS(status)) {
-+                .... start data transfer phase
-+            } else {
-+               ... card response indicates that the card cannot handle data
-+                  // set completion status
-+               pRequest->Status = status;
-+            }
-+        }
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+/*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  _SDIO_CheckResponse - check response on behalf of the host controller
-+  Input:  pHcd - host controller
-+          pReq - request containing the response
-+          CheckMode - mode
-+  Output:
-+  Return: status
-+  Notes:
-+
-+    CheckMode == SDHCD_CHECK_DATA_TRANS_OK :
-+    The host controller requests a check on the response to determine whether it
-+    is okay to perform a data transfer.  This function only filters on commands that
-+    involve data.  Host controller should only call this function in preparation for a
-+    data transfer.
-+
-+    CheckMode == SDHCD_CHECK_SPI_TOKEN :
-+    The bus driver checks the SPI token and returns a timeout status if the illegal command bit is
-+    set.  This simulates the behavior of SD native operation.
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _SDIO_CheckResponse(PSDHCD pHcd, PSDREQUEST pReq, SDHCD_RESPONSE_CHECK_MODE CheckMode)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+
-+    if (CheckMode == SDHCD_CHECK_DATA_TRANS_OK) {
-+        UINT32      cardStatus;
-+        UINT8       *pResponse;
-+        UINT8       convertedResponse[MAX_CARD_RESPONSE_BYTES];
-+
-+        if (!(pReq->Flags & SDREQ_FLAGS_DATA_TRANS) ||
-+             (pReq->Flags & SDREQ_FLAGS_DATA_SKIP_RESP_CHK) ||
-+             (GET_SDREQ_RESP_TYPE(pReq->Flags) ==  SDREQ_FLAGS_NO_RESP)) {
-+            return SDIO_STATUS_SUCCESS;
-+        }
-+        pResponse = pReq->Response;
-+            /* check SPI mode */
-+        if (IS_HCD_BUS_MODE_SPI(pHcd)) {
-+            if (!(pReq->Flags & SDREQ_FLAGS_RESP_SKIP_SPI_FILT)) {
-+                    /* apply conversion */
-+                ConvertSPI_Response(pReq, NULL);
-+            } else {
-+                    /* temporarily convert the response, without altering the original */
-+                ConvertSPI_Response(pReq, convertedResponse);
-+                    /* point to the converted one */
-+                pResponse = convertedResponse;
-+            }
-+        }
-+
-+        switch (GET_SDREQ_RESP_TYPE(pReq->Flags)) {
-+            case SDREQ_FLAGS_RESP_R1:
-+            case SDREQ_FLAGS_RESP_R1B:
-+                cardStatus = SD_R1_GET_CARD_STATUS(pResponse);
-+                if (!(cardStatus &
-+                     (SD_CS_ILLEGAL_CMD_ERR | SD_CS_CARD_INTERNAL_ERR | SD_CS_GENERAL_ERR))) {
-+                        /* okay for data */
-+                    break;
-+                }
-+                    /* figure out what it was */
-+                if (cardStatus & SD_CS_ILLEGAL_CMD_ERR) {
-+                    status = SDIO_STATUS_DATA_STATE_INVALID;
-+                } else {
-+                    status = SDIO_STATUS_DATA_ERROR_UNKNOWN;
-+                }
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Check Response Error. R1 CardStatus:0x%X \n",
-+                                        cardStatus));
-+                break;
-+            case SDREQ_FLAGS_RESP_SDIO_R5:
-+                cardStatus = SD_R5_GET_RESP_FLAGS(pResponse);
-+                if (!(cardStatus & SD_R5_CURRENT_CMD_ERRORS)){
-+                        /* all okay */
-+                    break;
-+                }
-+
-+                status = ConvertCMD52ResponseToSDIOStatus((UINT8)cardStatus);
-+                DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: Check Response Error. R5 CardStatus:0x%X \n",
-+                                        cardStatus));
-+                break;
-+            default:
-+                break;
-+        }
-+
-+        return status;
-+    }
-+
-+    {
-+        UINT8       spiToken;
-+
-+            /* handle SPI token validation */
-+        switch (GET_SDREQ_RESP_TYPE(pReq->Flags)) {
-+            case SDREQ_FLAGS_RESP_R2:
-+                spiToken = GET_SPI_R2_RESP_TOKEN(pReq->Response);
-+                break;
-+            case SDREQ_FLAGS_RESP_SDIO_R5:
-+                spiToken = GET_SPI_SDIO_R5_RESP_TOKEN(pReq->Response);
-+                break;
-+            case SDREQ_FLAGS_RESP_R3:
-+                spiToken = GET_SPI_R3_RESP_TOKEN(pReq->Response);
-+                break;
-+            case SDREQ_FLAGS_RESP_SDIO_R4:
-+                spiToken = GET_SPI_SDIO_R4_RESP_TOKEN(pReq->Response);
-+                break;
-+            default:
-+                    /* all other tokesn are SPI R1 type */
-+                spiToken = GET_SPI_R1_RESP_TOKEN(pReq->Response);
-+                break;
-+        }
-+
-+        if ((GET_SDREQ_RESP_TYPE(pReq->Flags) == SDREQ_FLAGS_RESP_SDIO_R5) ||
-+            (GET_SDREQ_RESP_TYPE(pReq->Flags) == SDREQ_FLAGS_RESP_SDIO_R4)) {
-+                /* handle SDIO status tokens */
-+            if ((spiToken & SPI_R5_ILLEGAL_CMD) ||
-+                (spiToken & SPI_R5_CMD_CRC)) {
-+                status = SDIO_STATUS_BUS_RESP_TIMEOUT;
-+            }
-+        } else {
-+                /* handle all other status tokens */
-+            if ((spiToken & SPI_CS_ILLEGAL_CMD) ||
-+                (spiToken & SPI_CS_CMD_CRC_ERR)) {
-+                status = SDIO_STATUS_BUS_RESP_TIMEOUT;
-+            }
-+       }
-+    }
-+
-+    return status;
-+}
-+
-diff --git a/drivers/sdio/stack/busdriver/sdio_bus_os.c b/drivers/sdio/stack/busdriver/sdio_bus_os.c
-new file mode 100644
-index 0000000..dbdb955
---- /dev/null
-+++ b/drivers/sdio/stack/busdriver/sdio_bus_os.c
-@@ -0,0 +1,832 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdio_bus_os.c
-+
-+@abstract: Linux implementation module
-+
-+#notes: includes module load and unload functions
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+/* debug level for this module*/
-+#define DBG_DECLARE 3;
-+
-+#include <linux/sdio/ctsystem.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/version.h>
-+#include <linux/init.h>
-+#include <linux/workqueue.h>
-+#include <linux/delay.h>
-+#include <linux/kthread.h>
-+#include <linux/pnp.h>
-+void pnp_remove_card_device(struct pnp_dev *dev);
-+#include <linux/sdio/sdio_busdriver.h>
-+#include <linux/sdio/sdio_lib.h>
-+#include "_busdriver.h"
-+
-+#define DESCRIPTION "SDIO Bus Driver"
-+#define AUTHOR "Atheros Communications, Inc."
-+
-+/* debug print parameter */
-+/* configuration and default parameters */
-+static int RequestRetries = SDMMC_DEFAULT_CMD_RETRIES;
-+module_param(RequestRetries, int, 0644);
-+MODULE_PARM_DESC(RequestRetries, "number of command retries");
-+static int CardReadyPollingRetry = SDMMC_DEFAULT_CARD_READY_RETRIES;
-+module_param(CardReadyPollingRetry, int, 0644);
-+MODULE_PARM_DESC(CardReadyPollingRetry, "number of card ready retries");
-+static int PowerSettleDelay = SDMMC_POWER_SETTLE_DELAY;
-+module_param(PowerSettleDelay, int, 0644);
-+MODULE_PARM_DESC(PowerSettleDelay, "delay in ms for power to settle after power changes");
-+static int DefaultOperClock = 52000000;
-+module_param(DefaultOperClock, int, 0644);
-+MODULE_PARM_DESC(DefaultOperClock, "maximum operational clock limit");
-+static int DefaultBusMode = SDCONFIG_BUS_WIDTH_4_BIT;
-+module_param(DefaultBusMode, int, 0644);
-+MODULE_PARM_DESC(DefaultBusMode, "default bus mode: see SDCONFIG_BUS_WIDTH_xxx");
-+static int RequestListSize = SDBUS_DEFAULT_REQ_LIST_SIZE;
-+module_param(RequestListSize, int, 0644);
-+MODULE_PARM_DESC(RequestListSize, "");
-+static int SignalSemListSize = SDBUS_DEFAULT_REQ_SIG_SIZE;
-+module_param(SignalSemListSize, int, 0644);
-+MODULE_PARM_DESC(SignalSemListSize, "");
-+static int CDPollingInterval = SDBUS_DEFAULT_CD_POLLING_INTERVAL;
-+module_param(CDPollingInterval, int, 0644);
-+MODULE_PARM_DESC(CDPollingInterval, "");
-+static int DefaultOperBlockLen = SDMMC_DEFAULT_BYTES_PER_BLOCK;
-+module_param(DefaultOperBlockLen, int, 0644);
-+MODULE_PARM_DESC(DefaultOperBlockLen, "operational block length");
-+static int DefaultOperBlockCount = SDMMC_DEFAULT_BLOCKS_PER_TRANS;
-+module_param(DefaultOperBlockCount, int, 0644);
-+MODULE_PARM_DESC(DefaultOperBlockCount, "operational block count");
-+static int ConfigFlags = BD_DEFAULT_CONFIG_FLAGS;
-+module_param(ConfigFlags, int, 0644);
-+MODULE_PARM_DESC(ConfigFlags, "config flags");
-+
-+static int HcdRCount = MAX_HCD_REQ_RECURSION;
-+module_param(HcdRCount, int, 0644);
-+MODULE_PARM_DESC(HcdRCount, "HCD request recursion count");
-+
-+static void CardDetect_WorkItem(
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+void *context);
-+#else
-+struct work_struct *ignored);
-+#endif
-+static void CardDetect_TimerFunc(unsigned long Context);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+static DECLARE_WORK(CardDetectPollWork, CardDetect_WorkItem
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+, 0);
-+#else
-+);
-+#endif
-+#endif
-+static int RegisterDriver(PSDFUNCTION pFunction);
-+static int UnregisterDriver(PSDFUNCTION pFunction);
-+
-+static struct timer_list CardDetectTimer;
-+
-+#define SDDEVICE_FROM_OSDEVICE(pOSDevice)  container_of(pOSDevice, SDDEVICE, Device)
-+#define SDFUNCTION_FROM_OSDRIVER(pOSDriver)  container_of(pOSDriver, SDFUNCTION, Driver)
-+
-+
-+/*
-+ * SDIO_RegisterHostController - register a host controller bus driver
-+*/
-+SDIO_STATUS SDIO_RegisterHostController(PSDHCD pHcd) {
-+    /* we are the exported verison, call the internal verison */
-+    return _SDIO_RegisterHostController(pHcd);
-+}
-+
-+/*
-+ * SDIO_UnregisterHostController - unregister a host controller bus driver
-+*/
-+SDIO_STATUS SDIO_UnregisterHostController(PSDHCD pHcd) {
-+    /* we are the exported verison, call the internal verison */
-+    return _SDIO_UnregisterHostController(pHcd);
-+}
-+
-+/*
-+ * SDIO_RegisterFunction - register a function driver
-+*/
-+SDIO_STATUS SDIO_RegisterFunction(PSDFUNCTION pFunction) {
-+    int error;
-+    SDIO_STATUS status;
-+
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO BusDriver - SDIO_RegisterFunction\n"));
-+
-+        /* since we do PnP registration first, we need to check the version */
-+    if (!CHECK_FUNCTION_DRIVER_VERSION(pFunction)) {
-+        DBG_PRINT(SDDBG_ERROR,
-+           ("SDIO Bus Driver: Function Major Version Mismatch (hcd = %d, bus driver = %d)\n",
-+           GET_SDIO_STACK_VERSION_MAJOR(pFunction), CT_SDIO_STACK_VERSION_MAJOR(g_Version)));
-+        return SDIO_STATUS_INVALID_PARAMETER;
-+    }
-+
-+    /* we are the exported verison, call the internal verison after registering with the bus
-+       we handle probes internally to the bus driver */
-+    if ((error = RegisterDriver(pFunction)) < 0) {
-+        DBG_PRINT(SDDBG_ERROR,
-+            ("SDIO BusDriver - SDIO_RegisterFunction, failed to register with system bus driver: %d\n",
-+            error));
-+        status = OSErrorToSDIOError(error);
-+    } else {
-+        status = _SDIO_RegisterFunction(pFunction);
-+        if (!SDIO_SUCCESS(status)) {
-+            UnregisterDriver(pFunction);
-+        }
-+    }
-+
-+    return status;
-+}
-+
-+/*
-+ * SDIO_UnregisterFunction - unregister a function driver
-+*/
-+SDIO_STATUS SDIO_UnregisterFunction(PSDFUNCTION pFunction) {
-+    SDIO_STATUS status;
-+    /* we are the exported verison, call the internal verison */
-+    status = _SDIO_UnregisterFunction(pFunction);
-+    UnregisterDriver(pFunction);
-+    return  status;
-+}
-+
-+/*
-+ * SDIO_HandleHcdEvent - tell core an event occurred
-+*/
-+SDIO_STATUS SDIO_HandleHcdEvent(PSDHCD pHcd, HCD_EVENT Event) {
-+    /* we are the exported verison, call the internal verison */
-+    DBG_PRINT(SDIODBG_HCD_EVENTS, ("SDIO Bus Driver: SDIO_HandleHcdEvent, event type 0x%X, HCD:0x%X\n",
-+                         Event, (UINT)pHcd));
-+    return _SDIO_HandleHcdEvent(pHcd, Event);
-+}
-+
-+/* get default settings */
-+SDIO_STATUS _SDIO_BusGetDefaultSettings(PBDCONTEXT pBdc)
-+{
-+    /* these defaults are module params */
-+    pBdc->RequestRetries = RequestRetries;
-+    pBdc->CardReadyPollingRetry = CardReadyPollingRetry;
-+    pBdc->PowerSettleDelay = PowerSettleDelay;
-+    pBdc->DefaultOperClock = DefaultOperClock;
-+    pBdc->DefaultBusMode = DefaultBusMode;
-+    pBdc->RequestListSize = RequestListSize;
-+    pBdc->SignalSemListSize = SignalSemListSize;
-+    pBdc->CDPollingInterval = CDPollingInterval;
-+    pBdc->DefaultOperBlockLen = DefaultOperBlockLen;
-+    pBdc->DefaultOperBlockCount = DefaultOperBlockCount;
-+    pBdc->ConfigFlags = ConfigFlags;
-+    pBdc->MaxHcdRecursion = HcdRCount;
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+static void CardDetect_TimerFunc(unsigned long Context)
-+{
-+    DBG_PRINT(SDIODBG_CD_TIMER, ("+ SDIO BusDriver Card Detect Timer\n"));
-+
-+        /* timers run in an ISR context and cannot block or sleep, so we need
-+         * to queue a work item to call the bus driver timer notification */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+    if (schedule_work(&CardDetectPollWork) <= 0) {
-+        DBG_PRINT(SDDBG_ERROR, ("Failed to queue Card Detect timer!\n"));
-+    }
-+#else
-+    CardDetect_WorkItem(NULL);
-+#endif
-+    DBG_PRINT(SDIODBG_CD_TIMER, ("- SDIO BusDriver  Card Detect Timer\n"));
-+}
-+
-+/*
-+ * Initialize any timers we are using
-+*/
-+SDIO_STATUS InitializeTimers(void)
-+{
-+    init_timer(&CardDetectTimer);
-+    CardDetectTimer.function = CardDetect_TimerFunc;
-+    CardDetectTimer.data = 0;
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+/*
-+ * cleanup timers
-+*/
-+SDIO_STATUS CleanupTimers(void)
-+{
-+    del_timer(&CardDetectTimer);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+
-+/*
-+ * Queue a timer, Timeout is in milliseconds
-+*/
-+SDIO_STATUS QueueTimer(INT TimerID, UINT32 TimeOut)
-+{
-+    UINT32 delta;
-+
-+        /* convert timeout to ticks */
-+    delta = (TimeOut * HZ)/1000;
-+    if (delta == 0) {
-+        delta = 1;
-+    }
-+    DBG_PRINT(SDIODBG_CD_TIMER, ("SDIO BusDriver - SDIO_QueueTimer System Ticks Per Sec:%d \n",HZ));
-+    DBG_PRINT(SDIODBG_CD_TIMER, ("SDIO BusDriver - SDIO_QueueTimer TimerID: %d TimeOut:%d MS, requires %d Ticks\n",
-+                TimerID,TimeOut,delta));
-+    switch (TimerID) {
-+        case SDIOBUS_CD_TIMER_ID:
-+            CardDetectTimer.expires = jiffies + delta;
-+            add_timer(&CardDetectTimer);
-+            break;
-+        default:
-+            return SDIO_STATUS_INVALID_PARAMETER;
-+    }
-+
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+/* check a response on behalf of the host controller, to allow it to proceed with a
-+ * data transfer */
-+SDIO_STATUS SDIO_CheckResponse(PSDHCD pHcd, PSDREQUEST pReq, SDHCD_RESPONSE_CHECK_MODE CheckMode)
-+{
-+    return _SDIO_CheckResponse(pHcd,pReq,CheckMode);
-+}
-+
-+/*
-+ * CardDetect_WorkItem - the work item for handling card detect polling interrupt
-+*/
-+static void CardDetect_WorkItem(
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+void *context)
-+#else
-+struct work_struct *ignored)
-+#endif
-+{
-+        /* call bus driver function */
-+    SDIO_NotifyTimerTriggered(SDIOBUS_CD_TIMER_ID);
-+}
-+
-+/*
-+ * OS_IncHcdReference - increment host controller driver reference count
-+*/
-+SDIO_STATUS Do_OS_IncHcdReference(PSDHCD pHcd)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+
-+    do {
-+        if (NULL == pHcd->pModule) {
-+                /* hcds that are 2.3 or higher should set this */
-+            DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: HCD:%s should set module ptr!\n",
-+                (pHcd->pName != NULL) ? pHcd->pName : "Unknown"));
-+            break;
-+        }
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        if (!try_module_get(pHcd->pModule)) {
-+            status = SDIO_STATUS_ERROR;
-+        }
-+#else
-+        if (!try_inc_mod_count(pHcd->pModule)) {
-+            status = SDIO_STATUS_ERROR;
-+        }
-+#endif
-+
-+    } while (FALSE);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: HCD:%s failed to get module\n",
-+            (pHcd->pName != NULL) ? pHcd->pName : "Unknown"));
-+    }
-+
-+    return status;
-+}
-+
-+/*
-+ * OS_DecHcdReference - decrement host controller driver reference count
-+*/
-+SDIO_STATUS Do_OS_DecHcdReference(PSDHCD pHcd)
-+{
-+    if (pHcd->pModule != NULL) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        module_put(pHcd->pModule);
-+#else
-+            /* 2.4 or lower */
-+        __MOD_DEC_USE_COUNT(pHcd->pModule);
-+#endif
-+    }
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+/****************************************************************************************/
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#include <linux/pnp.h>
-+
-+#if !defined(CONFIG_PNP)
-+#error "CONFIG_PNP not defined"
-+#endif
-+
-+static ULONG InUseDevices = 0;
-+static spinlock_t InUseDevicesLock = SPIN_LOCK_UNLOCKED;
-+
-+static const struct pnp_device_id pnp_idtable[] = {
-+    {"SD_XXXX",  0}
-+};
-+static int sdio_get_resources(struct pnp_dev * pDev, struct pnp_resource_table * res)
-+{
-+    DBG_PRINT(SDDBG_TRACE,
-+        ("SDIO BusDriver - sdio_get_resources: %s\n",
-+        pDev->dev.bus_id));
-+    return 0;
-+}
-+static int sdio_set_resources(struct pnp_dev * pDev, struct pnp_resource_table * res)
-+{
-+    DBG_PRINT(SDDBG_TRACE,
-+        ("SDIO BusDriver - sdio_set_resources: %s\n",
-+        pDev->dev.bus_id));
-+    return 0;
-+}
-+
-+static int sdio_disable_resources(struct pnp_dev *pDev)
-+{
-+    DBG_PRINT(SDDBG_TRACE,
-+        ("SDIO BusDriver - sdio_disable_resources: %s\n",
-+        pDev->dev.bus_id));
-+    if (pDev != NULL) {
-+        pDev->active = 0;
-+    }
-+    return 0;
-+}
-+void    release(struct device * pDev) {
-+    DBG_PRINT(SDDBG_TRACE,
-+        ("SDIO BusDriver - release: %s\n",
-+        pDev->bus_id));
-+    return;
-+}
-+struct pnp_protocol sdio_protocol = {
-+    .name   = "SDIO",
-+    .get    = sdio_get_resources,
-+    .set    = sdio_set_resources,
-+    .disable = sdio_disable_resources,
-+    .dev.release = release,
-+};
-+
-+/*
-+ * driver_probe - probe for OS based driver
-+*/
-+static int driver_probe(struct pnp_dev* pOSDevice, const struct pnp_device_id *pId)
-+{
-+    PSDDEVICE pDevice = SDDEVICE_FROM_OSDEVICE(pOSDevice);
-+    PSDFUNCTION pFunction = pDevice->Device.dev.driver_data;
-+
-+    if (pFunction == NULL) {
-+        return -1;
-+    }
-+
-+    if (strcmp(pFunction->pName, pOSDevice->dev.driver->name) == 0) {
-+        DBG_PRINT(SDDBG_TRACE,
-+            ("SDIO BusDriver - driver_probe, match: %s/%s driver: %s\n",
-+            pOSDevice->dev.bus_id, pFunction->pName, pOSDevice->dev.driver->name));
-+        return 1;
-+    } else {
-+        DBG_PRINT(SDDBG_TRACE,
-+            ("SDIO BusDriver - driver_probe, no match: %s/%s driver: %s\n",
-+            pOSDevice->dev.bus_id, pFunction->pName, pOSDevice->dev.driver->name));
-+        return -1;
-+    }
-+/*    if (pOSDevice->id != NULL) {
-+        if (strcmp(pOSDevice->id->id, pId->id) == 0) {
-+            DBG_PRINT(SDDBG_TRACE,
-+                ("SDIO BusDriver - driver_probe, match: %s/%s\n",
-+                pOSDevice->dev.bus_id, pId->id));
-+            return 1;
-+        }
-+        DBG_PRINT(SDDBG_TRACE,
-+            ("SDIO BusDriver - driver_probe, did not match: %s/%s/%s\n",
-+            pOSDevice->dev.bus_id, pId->id, pOSDevice->id->id));
-+    } else {
-+        DBG_PRINT(SDDBG_TRACE,
-+            ("SDIO BusDriver - driver_probe, did not match: %s/%s\n",
-+            pOSDevice->dev.bus_id, pId->id));
-+    }
-+    return -1;
-+*/
-+//??    if (pDevice->Device.dev.driver_data != NULL) {
-+//??        if (pDevice->Device.dev.driver_data == pFunction) {
-+//??    if (pDevice->Device.data != NULL) {
-+//??        if (pDevice->Device.data == pFunction) {
-+//??            DBG_PRINT(SDDBG_TRACE,
-+//??                ("SDIO BusDriver - driver_probe, match: %s\n",
-+//??                pOSDevice->dev.bus_id));
-+//??            return 1;
-+//??        }
-+//??    }
-+   DBG_PRINT(SDDBG_TRACE,
-+        ("SDIO BusDriver - driver_probe,  match: %s\n",
-+        pOSDevice->dev.bus_id));
-+    return 1;
-+}
-+
-+static int RegisterDriver(PSDFUNCTION pFunction)
-+{
-+    memset(&pFunction->Driver, 0, sizeof(pFunction->Driver));
-+    pFunction->Driver.name = pFunction->pName;
-+    pFunction->Driver.probe = driver_probe;
-+    pFunction->Driver.id_table = pnp_idtable;
-+    pFunction->Driver.flags = PNP_DRIVER_RES_DO_NOT_CHANGE;
-+
-+    DBG_PRINT(SDDBG_TRACE,
-+            ("SDIO BusDriver - SDIO_RegisterFunction, registering driver: %s\n",
-+            pFunction->Driver.name));
-+    return pnp_register_driver(&pFunction->Driver);
-+}
-+
-+static int UnregisterDriver(PSDFUNCTION pFunction)
-+{
-+    DBG_PRINT(SDDBG_TRACE,
-+            ("+SDIO BusDriver - UnregisterDriver, driver: %s\n",
-+            pFunction->Driver.name));
-+    pnp_unregister_driver(&pFunction->Driver);
-+    DBG_PRINT(SDDBG_TRACE,
-+            ("-SDIO BusDriver - UnregisterDriver\n"));
-+   return 0;
-+}
-+
-+/*
-+ * OS_InitializeDevice - initialize device that will be registered
-+*/
-+SDIO_STATUS OS_InitializeDevice(PSDDEVICE pDevice, PSDFUNCTION pFunction)
-+{
-+    struct pnp_id *pFdname;
-+    memset(&pDevice->Device, 0, sizeof(pDevice->Device));
-+    pDevice->Device.dev.driver_data = (PVOID)pFunction;
-+//??    pDevice->Device.data = (PVOID)pFunction;
-+//??    pDevice->Device.dev.driver = &pFunction->Driver.driver;
-+//??    pDevice->Device.driver = &pFunction->Driver;
-+//??    pDevice->Device.dev.release = release;
-+    /* get a unique device number, must be done with locks held */
-+    spin_lock(&InUseDevicesLock);
-+    pDevice->Device.number = FirstClearBit(&InUseDevices);
-+    SetBit(&InUseDevices, pDevice->Device.number);
-+    spin_unlock(&InUseDevicesLock);
-+    pDevice->Device.capabilities = PNP_REMOVABLE | PNP_DISABLE;
-+    pDevice->Device.protocol = &sdio_protocol;
-+    pDevice->Device.active = 1;
-+
-+    pnp_init_resource_table(&pDevice->Device.res);
-+
-+    pFdname = KernelAlloc(sizeof(struct pnp_id));
-+
-+    if (NULL == pFdname) {
-+        return SDIO_STATUS_NO_RESOURCES;
-+    }
-+    /* set the id as slot number/function number */
-+    snprintf(pFdname->id, sizeof(pFdname->id), "SD_%02X%02X",
-+             pDevice->pHcd->SlotNumber, (UINT)SDDEVICE_GET_SDIO_FUNCNO(pDevice));
-+    pFdname->next = NULL;
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO BusDriver - OS_InitializeDevice adding id: %s\n",
-+                             pFdname->id));
-+    pnp_add_id(pFdname, &pDevice->Device);
-+
-+        /* deal with DMA settings */
-+    if (pDevice->pHcd->pDmaDescription != NULL) {
-+        pDevice->Device.dev.dma_mask = &pDevice->pHcd->pDmaDescription->Mask;
-+        pDevice->Device.dev.coherent_dma_mask = pDevice->pHcd->pDmaDescription->Mask;
-+    }
-+
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+/*
-+ * OS_AddDevice - must be pre-initialized with OS_InitializeDevice
-+*/
-+SDIO_STATUS OS_AddDevice(PSDDEVICE pDevice, PSDFUNCTION pFunction)
-+{
-+    int error;
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO BusDriver - OS_AddDevice adding function: %s\n",
-+                               pFunction->pName));
-+    error = pnp_add_device(&pDevice->Device);
-+    if (error < 0) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO BusDriver - OS_AddDevice failed pnp_add_device: %d\n",
-+                               error));
-+    }
-+        /* replace the buggy pnp's release */
-+    pDevice->Device.dev.release = release;
-+
-+    return OSErrorToSDIOError(error);
-+}
-+
-+/*
-+ * OS_RemoveDevice - unregister device with driver and bus
-+*/
-+void OS_RemoveDevice(PSDDEVICE pDevice)
-+{
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO BusDriver - OS_RemoveDevice \n"));
-+    pnp_remove_card_device(&pDevice->Device);
-+    spin_lock(&InUseDevicesLock);
-+    ClearBit(&InUseDevices, pDevice->Device.number);
-+    spin_unlock(&InUseDevicesLock);
-+
-+    if (pDevice->Device.id != NULL) {
-+        KernelFree(pDevice->Device.id);
-+        pDevice->Device.id = NULL;
-+    }
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Add OS device to bus driver.
-+
-+  @function name: SDIO_BusAddOSDevice
-+  @category: HD_Reference
-+
-+  @output: pDma    - descrip[tion of support DMA or NULL
-+  @output: pDriver - assigned driver object
-+  @output: pDevice - assigned device object
-+
-+  @return: SDIO_STATUS - SDIO_STATUS_SUCCESS when successful.
-+
-+  @notes: If the HCD does not register with the driver sub-system directly (like in the PCI case),
-+          then it should register with the bus driver to obtain OS dependent device objects.
-+          All input structures should be maintained throughout the life of the driver.
-+
-+  @example: getting device objects:
-+    typedef struct _SDHCD_DRIVER {
-+        OS_PNPDEVICE   HcdDevice;     / * the OS device for this HCD * /
-+        OS_PNPDRIVER   HcdDriver;     / * the OS driver for this HCD * /
-+        SDDMA_DESCRIPTION Dma;        / * driver DMA description * /
-+    }SDHCD_DRIVER, *PSDHCD_DRIVER;
-+
-+    typedef struct _SDHCD_DRIVER_CONTEXT {
-+        PTEXT        pDescription;       / * human readable device decsription * /
-+        SDLIST       DeviceList;         / * the list of current devices handled by this driver * /
-+        OS_SEMAPHORE DeviceListSem;      / * protection for the DeviceList * /
-+        UINT         DeviceCount;        / * number of devices currently installed * /
-+        SDHCD_DRIVER Driver;             / * OS dependent driver specific info * /
-+    }SDHCD_DRIVER_CONTEXT, *PSDHCD_DRIVER_CONTEXT;
-+
-+    static SDHCD_DRIVER_CONTEXT HcdContext = {
-+        .pDescription  = DESCRIPTION,
-+        .DeviceCount   = 0,
-+        .Driver.HcdDevice.name = "sdio_xxx_hcd",
-+        .Driver.HcdDriver.name = "sdio_xxx_hcd",
-+    }
-+    .....
-+    status = SDIO_BusAddOSDevice(NULL, &HcdContext.Driver, &HcdContext.Device);
-+    if (SDIO_SUCCESS(status) {
-+        return Probe(&HcdContext.Device);
-+    }
-+    return SDIOErrorToOSError(status);
-+
-+  @see also: SDIO_BusRemoveOSDevice
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS SDIO_BusAddOSDevice(PSDDMA_DESCRIPTION pDma, POS_PNPDRIVER pDriver, POS_PNPDEVICE pDevice)
-+{
-+    int err;
-+    struct pnp_id *pFdname;
-+    struct pnp_device_id *pFdid;
-+    static int slotNumber = 0; /* we just use an increasing count for the slots number */
-+
-+    if (pDma != NULL) {
-+        pDevice->dev.dma_mask = &pDma->Mask;
-+        pDevice->dev.coherent_dma_mask = pDma->Mask;
-+    }
-+    DBG_PRINT(SDDBG_ERROR,
-+            ("SDIO BusDriver - SDIO_GetBusOSDevice, registering driver: %s DMAmask: 0x%x\n",
-+            pDriver->name, (UINT)*pDevice->dev.dma_mask));
-+    pFdid = KernelAlloc(sizeof(struct pnp_device_id)*2);
-+    /* set the id as slot number/function number */
-+    snprintf(pFdid[0].id, sizeof(pFdid[0].id), "SD_%02X08",
-+             slotNumber++);
-+    pFdid[0].driver_data = 0;
-+    pFdid[1].id[0] = '\0';
-+    pFdid[1].driver_data = 0;
-+
-+    pDriver->id_table = pFdid;
-+    pDriver->flags = PNP_DRIVER_RES_DO_NOT_CHANGE;
-+    err = pnp_register_driver(pDriver);
-+    if (err < 0) {
-+        DBG_PRINT(SDDBG_ERROR,
-+            ("SDIO BusDriver - SDIO_GetBusOSDevice, failed registering driver: %s, err: %d\n",
-+            pDriver->name, err));
-+        return OSErrorToSDIOError(err);
-+    }
-+
-+    pDevice->protocol = &sdio_protocol;
-+    pDevice->capabilities = PNP_REMOVABLE | PNP_DISABLE;
-+    pDevice->active = 1;
-+
-+    pFdname = KernelAlloc(sizeof(struct pnp_id));
-+    /* set the id as slot number/function number */
-+    snprintf(pFdname->id, sizeof(pFdname->id), "SD_%02X08",
-+             0); //??pDevice->pHcd->SlotNumber);//?????fix this, slotnumber isn't vaialble yet
-+    pFdname->next = NULL;
-+    pnp_add_id(pFdname, pDevice);
-+
-+    /* get a unique device number */
-+    spin_lock(&InUseDevicesLock);
-+    pDevice->number = FirstClearBit(&InUseDevices);
-+    SetBit(&InUseDevices, pDevice->number);
-+    spin_unlock(&InUseDevicesLock);
-+    pnp_init_resource_table(&pDevice->res);
-+    err = pnp_add_device(pDevice);
-+    if (err < 0) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO BusDriver - SDIO_GetBusOSDevice failed pnp_device_add: %d\n",
-+                               err));
-+        pnp_unregister_driver(pDriver);
-+    }
-+    /* replace the buggy pnp's release */
-+    pDevice->dev.release = release;
-+    return OSErrorToSDIOError(err);
-+}
-+
-+/**+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Return OS device from bus driver.
-+
-+  @function name: SDIO_BusRemoveOSDevice
-+  @category: HD_Reference
-+
-+  @input: pDriver - setup PNP driver object
-+  @input: pDevice - setup PNP device object
-+
-+  @return: none
-+
-+
-+  @example: returning device objects:
-+        SDIO_BusRemoveOSDevice(&HcdContext.Driver, &HcdContext.Device);
-+
-+
-+  @see also: SDIO_BusAddOSDevice
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void SDIO_BusRemoveOSDevice(POS_PNPDRIVER pDriver, POS_PNPDEVICE pDevice)
-+{
-+    DBG_PRINT(SDDBG_ERROR,
-+            ("SDIO BusDriver - SDIO_PutBusOSDevice, unregistering driver: %s\n",
-+            pDriver->name));
-+
-+    pnp_remove_card_device(pDevice);
-+    if (pDevice->id != NULL) {
-+        KernelFree(pDevice->id);
-+        pDevice->id = NULL;
-+    }
-+
-+    spin_lock(&InUseDevicesLock);
-+    ClearBit(&InUseDevices, pDevice->number);
-+    spin_unlock(&InUseDevicesLock);
-+
-+    pnp_unregister_driver(pDriver);
-+    if (pDriver->id_table != NULL) {
-+        KernelFree((void *)pDriver->id_table);
-+        pDriver->id_table = NULL;
-+    }
-+
-+}
-+
-+
-+/*
-+ * module init
-+*/
-+static int __init sdio_busdriver_init(void) {
-+    SDIO_STATUS status;
-+    int error;
-+    REL_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: loaded\n"));
-+    if (!SDIO_SUCCESS((status = _SDIO_BusDriverInitialize()))) {
-+        return SDIOErrorToOSError(status);
-+    }
-+    /* register the sdio bus */
-+    error = pnp_register_protocol(&sdio_protocol);
-+    if (error < 0) {
-+        REL_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: failed to register bus device, %d\n", error));
-+        _SDIO_BusDriverCleanup();
-+        return error;
-+    }
-+    return 0;
-+}
-+
-+/*
-+ * module cleanup
-+*/
-+static void __exit sdio_busdriver_cleanup(void) {
-+    REL_PRINT(SDDBG_TRACE, ("SDIO unloaded\n"));
-+    _SDIO_BusDriverCleanup();
-+    pnp_unregister_protocol(&sdio_protocol);
-+DBG_PRINT(SDDBG_TRACE,
-+            ("SDIO BusDriver - unloaded 1\n"));
-+}
-+EXPORT_SYMBOL(SDIO_BusAddOSDevice);
-+EXPORT_SYMBOL(SDIO_BusRemoveOSDevice);
-+
-+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+    /* 2.4 */
-+static int RegisterDriver(PSDFUNCTION pFunction)
-+{
-+    return 0;
-+}
-+
-+static int UnregisterDriver(PSDFUNCTION pFunction)
-+{
-+    DBG_PRINT(SDDBG_TRACE,
-+            ("+-SDIO BusDriver - UnregisterDriver, driver: \n"));
-+   return 0;
-+}
-+
-+/*
-+ * OS_InitializeDevice - initialize device that will be registered
-+*/
-+SDIO_STATUS OS_InitializeDevice(PSDDEVICE pDevice, PSDFUNCTION pFunction)
-+{
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+/*
-+ * OS_AddDevice - must be pre-initialized with OS_InitializeDevice
-+*/
-+SDIO_STATUS OS_AddDevice(PSDDEVICE pDevice, PSDFUNCTION pFunction)
-+{
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO BusDriver - OS_AddDevice adding function: %s\n",
-+                               pFunction->pName));
-+    return SDIO_STATUS_SUCCESS;
-+
-+}
-+
-+/*
-+ * OS_RemoveDevice - unregister device with driver and bus
-+*/
-+void OS_RemoveDevice(PSDDEVICE pDevice)
-+{
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO BusDriver - OS_RemoveDevice \n"));
-+}
-+
-+/*
-+ * module init
-+*/
-+static int __init sdio_busdriver_init(void) {
-+    SDIO_STATUS status;
-+    REL_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: loaded\n"));
-+    if (!SDIO_SUCCESS((status = _SDIO_BusDriverInitialize()))) {
-+        return SDIOErrorToOSError(status);
-+    }
-+    return 0;
-+}
-+
-+/*
-+ * module cleanup
-+*/
-+static void __exit sdio_busdriver_cleanup(void) {
-+    REL_PRINT(SDDBG_TRACE, ("SDIO unloaded\n"));
-+    _SDIO_BusDriverCleanup();
-+}
-+#else  ////KERNEL_VERSION
-+#error "unsupported kernel version: "UTS_RELEASE
-+#endif //KERNEL_VERSION
-+
-+MODULE_LICENSE("GPL and additional rights");
-+MODULE_DESCRIPTION(DESCRIPTION);
-+MODULE_AUTHOR(AUTHOR);
-+
-+module_init(sdio_busdriver_init);
-+module_exit(sdio_busdriver_cleanup);
-+EXPORT_SYMBOL(SDIO_RegisterHostController);
-+EXPORT_SYMBOL(SDIO_UnregisterHostController);
-+EXPORT_SYMBOL(SDIO_HandleHcdEvent);
-+EXPORT_SYMBOL(SDIO_CheckResponse);
-+EXPORT_SYMBOL(SDIO_RegisterFunction);
-+EXPORT_SYMBOL(SDIO_UnregisterFunction);
-diff --git a/drivers/sdio/stack/busdriver/sdio_function.c b/drivers/sdio/stack/busdriver/sdio_function.c
-new file mode 100644
-index 0000000..78b8e17
---- /dev/null
-+++ b/drivers/sdio/stack/busdriver/sdio_function.c
-@@ -0,0 +1,715 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdio_function.c
-+
-+@abstract: OS independent bus driver support for function drivers
-+
-+@notes: This file supports the interface between SDIO function drivers and the bus driver.
-+
-+@notice: Copyright (c), 2004-2005 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define MODULE_NAME  SDBUSDRIVER
-+#include <linux/sdio/ctsystem.h>
-+#include <linux/sdio/sdio_busdriver.h>
-+#include <linux/sdio/sdio_lib.h>
-+#include "_busdriver.h"
-+
-+static SDIO_STATUS ProbeForDevice(PSDFUNCTION pFunction);
-+
-+#ifdef CT_MAN_CODE_CHECK
-+static UINT16 ManCodeCheck = CT_MAN_CODE_CHECK;
-+#endif
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Register a function driver with the bus driver.
-+
-+  @function name: SDIO_RegisterFunction
-+  @prototype: SDIO_STATUS SDIO_RegisterFunction(PSDFUNCTION pFunction)
-+  @category: PD_Reference
-+  @input:  pFunction - the function definition structure.
-+
-+  @output: none
-+
-+  @return: SDIO_STATUS - SDIO_STATUS_SUCCESS when succesful.
-+
-+  @notes: Each function driver must register with the bus driver once upon loading.
-+          The calling function must be prepared to receive a Probe callback before
-+          this function returns. This will occur when an perpheral device is already
-+          pluugged in that is supported by this function.
-+          The function driver should unregister itself when exiting.
-+          The bus driver checks for possible function drivers to support a device
-+          in reverse registration order.
-+
-+  @example: Registering a function driver:
-+            //list of devices supported by this function driver
-+       static SD_PNP_INFO Ids[] = {
-+            {.SDIO_ManufacturerID = 0xaa55,
-+             .SDIO_ManufacturerCode = 0x5555,
-+             .SDIO_FunctionNo = 1},
-+            {}                      //list is null termintaed
-+        };
-+        static GENERIC_FUNCTION_CONTEXT FunctionContext = {
-+            .Function.pName    = "sdio_generic", //name of the device
-+            .Function.Version  = CT_SDIO_STACK_VERSION_CODE, // set stack version
-+            .Function.MaxDevices = 1,    //maximum number of devices supported by this driver
-+            .Function.NumDevices = 0,    //current number of devices, always zero to start
-+            .Function.pIds     = Ids,    //the list of devices supported by this device
-+            .Function.pProbe   = Probe,  //pointer to the function drivers Probe function
-+                                         //  that will be called when a possibly supported device
-+                                         //  is inserted.
-+            .Function.pRemove  = Remove, //pointer to the function drivers Remove function
-+                                         /  that will be called when a device is removed.
-+            .Function.pContext = &FunctionContext, //data value that will be passed into Probe and
-+                                         //  Remove callbacks.
-+        };
-+        SDIO_STATUS status;
-+        status = SDIO_RegisterFunction(&FunctionContext.Function)
-+        if (!SDIO_SUCCESS(status)) {
-+            ...failed to register
-+        }
-+
-+  @see also: SDIO_UnregisterFunction
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _SDIO_RegisterFunction(PSDFUNCTION pFunction)
-+{
-+      SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+
-+#ifdef CT_MAN_CODE_CHECK
-+    DBG_PRINT(SDDBG_TRACE,
-+        ("SDIO Bus Driver: _SDIO_RegisterFunction: WARNING, this version is locked to Memory cards and SDIO cards with JEDEC IDs of: 0x%X\n",
-+            ManCodeCheck));
-+#else
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: _SDIO_RegisterFunction\n"));
-+#endif
-+
-+      DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: Function Driver Stack Version: %d.%d \n",
-+        GET_SDIO_STACK_VERSION_MAJOR(pFunction),GET_SDIO_STACK_VERSION_MINOR(pFunction)));
-+
-+    if (!CHECK_FUNCTION_DRIVER_VERSION(pFunction)) {
-+        DBG_PRINT(SDDBG_ERROR,
-+           ("SDIO Bus Driver: Function Major Version Mismatch (hcd = %d, bus driver = %d)\n",
-+           GET_SDIO_STACK_VERSION_MAJOR(pFunction), CT_SDIO_STACK_VERSION_MAJOR(g_Version)));
-+        return SDIO_STATUS_INVALID_PARAMETER;
-+    }
-+
-+
-+      /* sanity check the driver */
-+      if ((pFunction == NULL) ||
-+              (pFunction->pProbe == NULL) ||
-+              (pFunction->pIds == NULL)) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_RegisterFunction, invalid registration data\n"));
-+          return SDIO_STATUS_INVALID_PARAMETER;
-+      }
-+    /* protect the function list and add the function */
-+    if (!SDIO_SUCCESS((status = SemaphorePendInterruptable(&pBusContext->FunctionListSem)))) {
-+      goto cleanup;   /* wait interrupted */
-+    }
-+    SignalInitialize(&pFunction->CleanupReqSig);
-+    SDLIST_INIT(&pFunction->DeviceList);
-+    SDListAdd(&pBusContext->FunctionList, &pFunction->SDList);
-+    if (!SDIO_SUCCESS((status = SemaphorePost(&pBusContext->FunctionListSem)))) {
-+      goto cleanup;   /* wait interrupted */
-+    }
-+
-+      /* see if we have devices for this new function driver */
-+      ProbeForDevice(pFunction);
-+
-+      return status;
-+cleanup:
-+    DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: _SDIO_RegisterFunction, error exit 0x%X\n", status));
-+    return status;
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Unregister a function driver with the bus driver.
-+
-+  @function name: SDIO_UnregisterFunction
-+  @prototype: SDIO_STATUS SDIO_UnregisterFunction(PSDFUNCTION pFunction)
-+  @category: PD_Reference
-+
-+  @input:  pFunction - the function definition structure.
-+
-+  @output: none
-+
-+  @return: SDIO_STATUS - SDIO_STATUS_SUCCESS when succesful.
-+
-+  @notes: Each function driver must unregister from the bus driver when the function driver
-+          exits.
-+          A function driver must disconnect from any interrupts before calling this function.
-+
-+  @example: Unregistering a function driver:
-+        SDIO_UnregisterFunction(&FunctionContext.Function);
-+
-+  @see also: SDIO_RegisterFunction
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _SDIO_UnregisterFunction(PSDFUNCTION pFunction)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    PSDDEVICE pDevice;
-+
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: _SDIO_UnregisterFunction\n"));
-+
-+    /* protect the function list and synchronize with Probe() and Remove()*/
-+    if (!SDIO_SUCCESS((status = SemaphorePendInterruptable(&pBusContext->FunctionListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+        /* remove this function from the function list */
-+    SDListRemove(&pFunction->SDList);
-+        /* now remove this function as the handler for any of its devices */
-+    SDITERATE_OVER_LIST_ALLOW_REMOVE(&pFunction->DeviceList, pDevice, SDDEVICE,FuncListLink)  {
-+        if (pDevice->pFunction == pFunction) {
-+                /* notify removal */
-+            NotifyDeviceRemove(pDevice);
-+        }
-+    }SDITERATE_END;
-+
-+    SignalDelete(&pFunction->CleanupReqSig);
-+
-+    if (!SDIO_SUCCESS((status = SemaphorePost(&pBusContext->FunctionListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: _SDIO_UnregisterFunction\n"));
-+      return status;
-+
-+cleanup:
-+    DBG_PRINT(SDDBG_ERROR, ("-SDIO Bus Driver: _SDIO_UnregisterFunction, error exit 0x%X\n", status));
-+    return status;
-+}
-+
-+/* documentation headers only for Probe and Remove */
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: This function is called by the Busdriver when a device is inserted that can be supported by this function driver.
-+
-+  @function name: Probe
-+  @prototype: BOOL (*pProbe)(struct _SDFUNCTION *pFunction, struct _SDDEVICE *pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pFunction - the function definition structure that was passed to Busdriver
-+                       via the SDIO_RegisterFunction.
-+  @input:  pDevice   - the description of the newly inserted device.
-+
-+  @output: none
-+
-+  @return: TRUE  - this function driver will suport this device
-+           FALSE - this function driver will not support this device
-+
-+  @notes: The Busdriver calls the Probe function of a function driver to inform it that device is
-+          available for the function driver to control. The function driver should initialize the
-+          device and be pepared to acceopt any interrupts from the device before returning.
-+
-+  @example: Example of typical Probe function callback:
-+  static BOOL Probe(PSDFUNCTION pFunction, PSDDEVICE pDevice) {
-+       ...get the our context info passed into the SDIO_RegisterFunction
-+    PSDXXX_DRIVER_CONTEXT pFunctionContext =
-+                                (PSDXXX_DRIVER_CONTEXT)pFunction->pContext;
-+    SDIO_STATUS status;
-+       //test the identification of this device and ensure we want to support it
-+       // we can test based on class, or use more specific tests on SDIO_ManufacturerID, etc.
-+    if (pDevice->pId[0].SDIO_FunctionClass == XXX) {
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO XXX Function: Probe - card matched (0x%X/0x%X/0x%X)\n",
-+                                pDevice->pId[0].SDIO_ManufacturerID,
-+                                pDevice->pId[0].SDIO_ManufacturerCode,
-+                                pDevice->pId[0].SDIO_FunctionNo));
-+        ...
-+
-+  @see also: SDIO_RegisterFunction
-+  @see also: Remove
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+BOOL FilterPnpInfo(PSDDEVICE pDevice)
-+{
-+#ifdef CT_MAN_CODE_CHECK
-+    if (pDevice->pId[0].CardFlags & CARD_SDIO) {
-+        if (pDevice->pId[0].SDIO_ManufacturerCode != ManCodeCheck) {
-+            DBG_PRINT(SDDBG_ERROR,
-+             ("SDIO Card with JEDEC ID:0x%X , not Allowed! Driver check halted. "
-+              "Please Contact sales@codetelligence.com.\n",
-+                    pDevice->pId[0].SDIO_ManufacturerCode));
-+            return FALSE;
-+        }
-+    }
-+    return TRUE;
-+#else
-+    return TRUE;
-+#endif
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: This function is called by the Busdriver when a device controlled by this function
-+             function driver is removed.
-+
-+  @function name: Remove
-+  @prototype: void (*pRemove)(struct _SDFUNCTION *pFunction, struct _SDDEVICE *pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pFunction - the function definition structure that was passed to Busdriver
-+                       via the SDIO_RegisterFunction.
-+  @input:  pDevice   - the description of the device being removed.
-+
-+  @output: none
-+
-+  @return: none
-+
-+  @notes: The Busdriver calls the Remove function of a function driver to inform it that device it
-+          was supporting has been removed. The device has already been removed, so no further I/O
-+          to the device can be performed.
-+
-+  @example: Example of typical Remove function callback:
-+    void Remove(PSDFUNCTION pFunction, PSDDEVICE pDevice) {
-+            // get the our context info passed into the SDIO_RegisterFunction
-+        PSDXXX_DRIVER_CONTEXT pFunctionContext =
-+                             (PSDXXX_DRIVER_CONTEXT)pFunction->pContext;
-+           ...free any acquired resources.
-+
-+  @see also: SDIO_RegisterFunction
-+  @see also: Probe
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/*
-+ * ProbeForFunction - look for a function driver to handle this card
-+ *
-+*/
-+SDIO_STATUS ProbeForFunction(PSDDEVICE pDevice, PSDHCD pHcd) {
-+    SDIO_STATUS status;
-+    PSDLIST pList;
-+    PSDFUNCTION pFunction;
-+
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: ProbeForFunction\n"));
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: ProbeForFunction - Dump of Device PNP Data: \n"));
-+    DBG_PRINT(SDDBG_TRACE, (" Card Flags 0x%X \n", pDevice->pId[0].CardFlags));
-+    if (pDevice->pId[0].CardFlags & CARD_SDIO) {
-+        DBG_PRINT(SDDBG_TRACE, (" SDIO MANF:      0x%X \n", pDevice->pId[0].SDIO_ManufacturerID));
-+        DBG_PRINT(SDDBG_TRACE, (" SDIO MANFCODE:  0x%X \n", pDevice->pId[0].SDIO_ManufacturerCode));
-+        DBG_PRINT(SDDBG_TRACE, (" SDIO FuncNo:    %d \n", pDevice->pId[0].SDIO_FunctionNo));
-+        DBG_PRINT(SDDBG_TRACE, (" SDIO FuncClass: %d \n", pDevice->pId[0].SDIO_FunctionClass));
-+    }
-+    if (pDevice->pId[0].CardFlags & (CARD_MMC | CARD_SD)) {
-+        DBG_PRINT(SDDBG_TRACE, (" SDMMC MANFID: 0x%X \n",pDevice->pId[0].SDMMC_ManfacturerID));
-+        DBG_PRINT(SDDBG_TRACE, (" SDMMC OEMID:  0x%X \n",pDevice->pId[0].SDMMC_OEMApplicationID));
-+    }
-+
-+    if (!FilterPnpInfo(pDevice)) {
-+        status = SDIO_STATUS_SUCCESS;
-+        goto cleanup;
-+    }
-+
-+    /* protect the function list */
-+    if (!SDIO_SUCCESS((status = SemaphorePendInterruptable(&pBusContext->FunctionListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+
-+    /* protect against ProbeForDevice */
-+    if (!SDIO_SUCCESS((status = SemaphorePendInterruptable(&pBusContext->DeviceListSem)))) {
-+            /* release the function list semaphore we just took */
-+        SemaphorePost(&pBusContext->FunctionListSem);
-+        goto cleanup;
-+    }
-+
-+    if (pDevice->pFunction != NULL) {
-+            /* device already has a function driver handling it */
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: ProbeForFunction, device already has function\n"));
-+            /* release function list */
-+        SemaphorePost(&pBusContext->DeviceListSem);
-+            /* release function list */
-+        SemaphorePost(&pBusContext->FunctionListSem);
-+            /* just return success */
-+        status = SDIO_STATUS_SUCCESS;
-+        goto cleanup;
-+    }
-+
-+        /* release device list */
-+    SemaphorePost(&pBusContext->DeviceListSem);
-+
-+    /* walk functions looking for one that can handle this device */
-+    SDITERATE_OVER_LIST(&pBusContext->FunctionList, pList) {
-+        pFunction = CONTAINING_STRUCT(pList, SDFUNCTION, SDList);
-+        if (pFunction->NumDevices >=  pFunction->MaxDevices) {
-+            /* function can't support any more devices */
-+            continue;
-+        }
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: ProbeForFunction - checking: %s \n",
-+                                pFunction->pName));
-+
-+        /* see if this function handles this device */
-+        if (IsPotentialIdMatch(pDevice->pId, pFunction->pIds)) {
-+            if (!FilterPnpInfo(pDevice)) {
-+                break;
-+            }
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: ProbeForFunction -Got Match, probing: %s \n",
-+                                    pFunction->pName));
-+            /* we need to setup with the OS bus driver before the probe, so probe can
-+              do OS operations. */
-+            OS_InitializeDevice(pDevice, pFunction);
-+            if (!SDIO_SUCCESS(OS_AddDevice(pDevice, pFunction))) {
-+                break;
-+            }
-+            /* close enough match, ask the function driver if it supports us */
-+            if (pFunction->pProbe(pFunction, pDevice)) {
-+                /* she accepted the device, add to list */
-+                pDevice->pFunction = pFunction;
-+                SDListAdd(&pFunction->DeviceList, &pDevice->FuncListLink);
-+                pFunction->NumDevices++;
-+                break;
-+            } else {
-+                DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: %s did not claim the device \n",
-+                  pFunction->pName));
-+                /* didn't take this device */
-+                OS_RemoveDevice(pDevice);
-+            }
-+
-+        }
-+    }
-+    if (!SDIO_SUCCESS((status = SemaphorePost(&pBusContext->FunctionListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: ProbeForFunction\n"));
-+      return status;
-+cleanup:
-+    DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: ProbeForFunction, error exit 0x%X\n", status));
-+    return status;
-+}
-+
-+/*
-+ * ProbeForDevice - look for a device that this function driver supports
-+ *
-+*/
-+static SDIO_STATUS ProbeForDevice(PSDFUNCTION pFunction) {
-+    SDIO_STATUS status;
-+    PSDLIST pList;
-+    PSDDEVICE pDevice;
-+
-+    DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: ProbeForDevice\n"));
-+    if (pFunction->NumDevices >=  pFunction->MaxDevices) {
-+        /* function can't support any more devices */
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: ProbeForDevice, too many devices in function\n"));
-+        return SDIO_STATUS_SUCCESS;
-+    }
-+
-+     /* protect the driver list */
-+    if (!SDIO_SUCCESS((status = SemaphorePendInterruptable(&pBusContext->DeviceListSem)))) {
-+      goto cleanup;   /* wait interrupted */
-+    }
-+    /* walk device list */
-+    SDITERATE_OVER_LIST(&pBusContext->DeviceList, pList) {
-+        pDevice = CONTAINING_STRUCT(pList, SDDEVICE, SDList);
-+        if (pDevice->pFunction != NULL) {
-+            /* device already has a function driver handling it */
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: ProbeForDevice, device already has function\n"));
-+            continue;
-+        }
-+        /* see if this function handles this device */
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: ProbeForDevice, matching ID:%d %d class:%d\n",
-+                                pDevice->pId[0].SDIO_ManufacturerID,
-+                                pDevice->pId[0].SDIO_FunctionNo,
-+                                pDevice->pId[0].SDIO_FunctionClass));
-+        if (IsPotentialIdMatch(pDevice->pId, pFunction->pIds)) {
-+            if (!FilterPnpInfo(pDevice)) {
-+                break;
-+            }
-+            /* we need to setup with the OS bus driver before the probe, so probe can
-+              do OS operations. */
-+            OS_InitializeDevice(pDevice, pFunction);
-+            if (!SDIO_SUCCESS(OS_AddDevice(pDevice, pFunction))) {
-+                break;
-+            }
-+            /* close enough match, ask the function driver if it supports us */
-+            if (pFunction->pProbe(pFunction, pDevice)) {
-+                /* she accepted the device, add to list */
-+                pDevice->pFunction = pFunction;
-+                SDListAdd(&pFunction->DeviceList, &pDevice->FuncListLink);
-+                pFunction->NumDevices++;
-+                break;
-+            } else {
-+                DBG_PRINT(SDDBG_WARN, ("SDIO Bus Driver: %s did not claim the device \n",
-+                  pFunction->pName));
-+                /* didn't take this device */
-+                OS_RemoveDevice(pDevice);
-+            }
-+        }
-+    }
-+    if (!SDIO_SUCCESS((status = SemaphorePost(&pBusContext->DeviceListSem)))) {
-+      goto cleanup;   /* wait interrupted */
-+    }
-+
-+      return status;
-+cleanup:
-+    DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: ProbeForDevice, error exit 0x%X\n", status));
-+    return status;
-+}
-+
-+#if 0
-+static void DumpPnpEntry(PSD_PNP_INFO pInfo)
-+{
-+    DBG_PRINT(SDDBG_TRACE, ("Function PnpInfo Dump: \n"));
-+    DBG_PRINT(SDDBG_TRACE, (" Card Flags      0x%X \n", pInfo->CardFlags));
-+    DBG_PRINT(SDDBG_TRACE, (" SDIO MANF:      0x%X \n", pInfo->SDIO_ManufacturerID));
-+    DBG_PRINT(SDDBG_TRACE, (" SDIO MANFCODE:  0x%X \n", pInfo->SDIO_ManufacturerCode));
-+    DBG_PRINT(SDDBG_TRACE, (" SDIO FuncNo:    %d \n", pInfo->SDIO_FunctionNo));
-+    DBG_PRINT(SDDBG_TRACE, (" SDIO FuncClass: %d \n", pInfo->SDIO_FunctionClass));
-+    DBG_PRINT(SDDBG_TRACE, (" SDMMC MANFID:   0x%X \n", pInfo->SDMMC_ManfacturerID));
-+    DBG_PRINT(SDDBG_TRACE, (" SDMMC OEMID:    0x%X \n", pInfo->SDMMC_OEMApplicationID));
-+}
-+#endif
-+/*
-+ * IsPotentialIdMatch - test for potential device match
-+ *
-+*/
-+BOOL IsPotentialIdMatch(PSD_PNP_INFO pIdsDev, PSD_PNP_INFO pIdsFuncList) {
-+    PSD_PNP_INFO pTFn;
-+      BOOL match = FALSE;
-+
-+      for (pTFn = pIdsFuncList;!IS_LAST_SDPNPINFO_ENTRY(pTFn);pTFn++) {
-+        //DumpPnpEntry(pTFn);
-+            /* check specific SDIO Card manufacturer ID, Code and Function number */
-+              if ((pIdsDev->SDIO_ManufacturerID != 0) &&
-+                  (pTFn->SDIO_ManufacturerID != 0) &&
-+                  (pIdsDev->SDIO_ManufacturerID == pTFn->SDIO_ManufacturerID) &&
-+                  (pIdsDev->SDIO_ManufacturerCode == pTFn->SDIO_ManufacturerCode) &&
-+            ((pIdsDev->SDIO_FunctionNo == pTFn->SDIO_FunctionNo) ||
-+             (pTFn->SDIO_FunctionNo == 0)) ) {
-+                  match = TRUE;
-+            break;
-+              }
-+            /* check generic function class */
-+        if ((pIdsDev->SDIO_FunctionClass != 0) &&
-+            (pTFn->SDIO_FunctionClass != 0) &&
-+            (pIdsDev->SDIO_FunctionClass == pTFn->SDIO_FunctionClass)) {
-+            match = TRUE;
-+            break;
-+        }
-+            /* check specific SDMMC MANFID and APPLICATION ID, NOTE SANDISK
-+             * uses a MANFID of zero! */
-+        if ((pTFn->SDMMC_OEMApplicationID != 0) &&
-+            (pIdsDev->SDMMC_ManfacturerID == pTFn->SDMMC_ManfacturerID) &&
-+            (pIdsDev->SDMMC_OEMApplicationID == pTFn->SDMMC_OEMApplicationID)) {
-+            match = TRUE;
-+            break;
-+        }
-+
-+            /* check generic SD Card */
-+        if ((pIdsDev->CardFlags & CARD_SD) &&
-+            (pTFn->CardFlags & CARD_SD)){
-+            match = TRUE;
-+            break;
-+        }
-+
-+            /* check generic MMC Card */
-+        if ((pIdsDev->CardFlags & CARD_MMC) &&
-+            (pTFn->CardFlags & CARD_MMC)){
-+            match = TRUE;
-+            break;
-+        }
-+
-+             /* check raw Card */
-+        if ((pIdsDev->CardFlags & CARD_RAW) &&
-+            (pTFn->CardFlags & CARD_RAW)){
-+            match = TRUE;
-+            break;
-+        }
-+      }
-+
-+    return match;
-+}
-+
-+/*
-+ * NotifyDeviceRemove - tell function driver on this device that the device is being removed
-+ *
-+*/
-+SDIO_STATUS NotifyDeviceRemove(PSDDEVICE pDevice) {
-+    SDIO_STATUS     status;
-+    SDREQUESTQUEUE  cancelQueue;
-+    PSDREQUEST      pReq;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    InitializeRequestQueue(&cancelQueue);
-+
-+      if ((pDevice->pFunction != NULL) &&
-+        (pDevice->pFunction->pRemove != NULL)){
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: removing device 0x%X\n", (INT)pDevice));
-+            /* fail any outstanding requests for this device */
-+            /* acquire lock for request queue */
-+        status = _AcquireHcdLock(pDevice->pHcd);
-+        if (!SDIO_SUCCESS(status)) {
-+            return status;
-+        }
-+            /* mark the function to block any more requests comming down */
-+        pDevice->pFunction->Flags |= SDFUNCTION_FLAG_REMOVING;
-+            /* walk through HCD queue and remove this function's requests */
-+        SDITERATE_OVER_LIST_ALLOW_REMOVE(&pDevice->pHcd->RequestQueue.Queue, pReq, SDREQUEST, SDList) {
-+            if (pReq->pFunction == pDevice->pFunction) {
-+                /* cancel this request, as this device or function is being removed */
-+                /* note that these request are getting completed out of order */
-+                DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver - NotifyDeviceRemove: canceling req 0x%X\n", (UINT)pReq));
-+                pReq->Status = SDIO_STATUS_CANCELED;
-+                    /* remove it from the HCD queue */
-+                SDListRemove(&pReq->SDList);
-+                    /* add it to the cancel queue */
-+                QueueRequest(&cancelQueue, pReq);
-+            }
-+        }SDITERATE_END;
-+
-+        status = _ReleaseHcdLock(pDevice->pHcd);
-+
-+           /* now empty the cancel queue if anything is in there */
-+        while (TRUE) {
-+            pReq = DequeueRequest(&cancelQueue);
-+            if (NULL == pReq) {
-+                break;
-+            }
-+                /* complete the request */
-+            DoRequestCompletion(pReq, pDevice->pHcd);
-+        }
-+            /* re-acquire the lock to deal with the current request */
-+        status = _AcquireHcdLock(pDevice->pHcd);
-+        if (!SDIO_SUCCESS(status)) {
-+            return status;
-+        }
-+            /* now deal with the current request */
-+        pReq = GET_CURRENT_REQUEST(pDevice->pHcd);
-+        if ((pReq !=NULL) && (pReq->pFunction == pDevice->pFunction) && (pReq->pFunction != NULL)) {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver - NotifyDeviceRemove: Outstanding Req 0x%X on HCD: 0x%X.. waiting...\n",
-+                (UINT)pReq, (UINT)pDevice->pHcd));
-+                /* the outstanding request on this device is for the function being removed */
-+            pReq->Flags |= SDREQ_FLAGS_CANCELED;
-+                /* wait for this request to get completed normally */
-+            status = _ReleaseHcdLock(pDevice->pHcd);
-+            SignalWait(&pDevice->pFunction->CleanupReqSig);
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver - NotifyDeviceRemove: Outstanding HCD Req 0x%X completed \n", (UINT)pReq));
-+        }  else {
-+                /* release lock */
-+            status = _ReleaseHcdLock(pDevice->pHcd);
-+        }
-+
-+            /* synchronize with ISR SYNC Handlers */
-+              status = SemaphorePendInterruptable(&pBusContext->DeviceListSem);
-+        if (!SDIO_SUCCESS(status)) {
-+            return status;
-+        }
-+            /* call this devices Remove function */
-+        pDevice->pFunction->pRemove(pDevice->pFunction,pDevice);
-+        pDevice->pFunction->NumDevices--;
-+            /* make sure the sync handler is NULLed out */
-+        pDevice->pIrqFunction = NULL;
-+        SemaphorePost(&pBusContext->DeviceListSem);
-+
-+        OS_RemoveDevice(pDevice);
-+            /* detach this device from the function list it belongs to */
-+        SDListRemove(&pDevice->FuncListLink);
-+        pDevice->pFunction->Flags &= ~SDFUNCTION_FLAG_REMOVING;
-+              pDevice->pFunction = NULL;
-+      }
-+      return SDIO_STATUS_SUCCESS;
-+}
-+
-+
-+/*
-+ * RemoveHcdFunctions - remove all functions attached to an HCD
-+ *
-+*/
-+SDIO_STATUS RemoveHcdFunctions(PSDHCD pHcd) {
-+    SDIO_STATUS status;
-+    PSDLIST pList;
-+    PSDFUNCTION pFunction;
-+    PSDDEVICE pDevice;
-+    DBG_PRINT(SDDBG_TRACE, ("+SDIO Bus Driver: RemoveHcdFunctions\n"));
-+
-+    /* walk through the functions and remove the ones associated with this HCD */
-+    /* protect the driver list */
-+    if (!SDIO_SUCCESS((status = SemaphorePend(&pBusContext->FunctionListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+        /* mark that card is being removed */
-+    pHcd->CardProperties.CardState |= CARD_STATE_REMOVED;
-+    SDITERATE_OVER_LIST(&pBusContext->FunctionList, pList) {
-+        pFunction = CONTAINING_STRUCT(pList, SDFUNCTION, SDList);
-+        DBG_PRINT(SDDBG_TRACE, ("SDIO Bus Driver: scanning function 0x%X, %s\n", (INT)pFunction,
-+                                (pFunction == NULL)?"NULL":pFunction->pName));
-+
-+        /* walk the devices on this function and look for a match */
-+        SDITERATE_OVER_LIST_ALLOW_REMOVE(&pFunction->DeviceList, pDevice, SDDEVICE,FuncListLink) {
-+            if (pDevice->pHcd == pHcd) {
-+                /* match, remove it */
-+                NotifyDeviceRemove(pDevice);
-+            }
-+        SDITERATE_END;
-+    SDITERATE_END;
-+    if (!SDIO_SUCCESS((status = SemaphorePost(&pBusContext->FunctionListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+    DBG_PRINT(SDDBG_TRACE, ("-SDIO Bus Driver: RemoveHcdFunctions\n"));
-+    return SDIO_STATUS_SUCCESS;
-+
-+cleanup:
-+    DBG_PRINT(SDDBG_ERROR, ("-SDIO Bus Driver: RemoveHcdFunctions, error exit 0x%X\n", status));
-+    return status;
-+}
-+
-+/*
-+ * RemoveAllFunctions - remove all functions attached
-+ *
-+*/
-+SDIO_STATUS RemoveAllFunctions()
-+{
-+    SDIO_STATUS status;
-+    PSDLIST pList;
-+    PSDHCD pHcd;
-+
-+    /* walk through the HCDs  */
-+    /* protect the driver list */
-+    if (!SDIO_SUCCESS((status = SemaphorePend(&pBusContext->HcdListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+    SDITERATE_OVER_LIST(&pBusContext->HcdList, pList) {
-+        pHcd = CONTAINING_STRUCT(pList, SDHCD, SDList);
-+            /* remove the functions */
-+        RemoveHcdFunctions(pHcd);
-+    }
-+    if (!SDIO_SUCCESS((status = SemaphorePost(&pBusContext->HcdListSem)))) {
-+        goto cleanup;   /* wait interrupted */
-+    }
-+    return SDIO_STATUS_SUCCESS;
-+cleanup:
-+    DBG_PRINT(SDDBG_ERROR, ("SDIO Bus Driver: RemoveAllFunctions, error exit 0x%X\n", status));
-+    return status;
-+}
-+
-diff --git a/drivers/sdio/stack/lib/Makefile b/drivers/sdio/stack/lib/Makefile
-new file mode 100644
-index 0000000..44fa038
---- /dev/null
-+++ b/drivers/sdio/stack/lib/Makefile
-@@ -0,0 +1,2 @@
-+obj-$(CONFIG_SDIO) += sdio_lib.o
-+sdio_lib-objs := sdio_lib_c.o sdio_lib_os.o
-diff --git a/drivers/sdio/stack/lib/_sdio_lib.h b/drivers/sdio/stack/lib/_sdio_lib.h
-new file mode 100644
-index 0000000..28762b0
---- /dev/null
-+++ b/drivers/sdio/stack/lib/_sdio_lib.h
-@@ -0,0 +1,50 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: _sdio_lib.h
-+
-+@abstract: SDIO Lib internal include
-+
-+#notes:
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#ifndef ___SDIO_LIB_H___
-+#define ___SDIO_LIB_H___
-+
-+#endif /* ___SDIO_LIB_H___*/
-diff --git a/drivers/sdio/stack/lib/sdio_lib_c.c b/drivers/sdio/stack/lib/sdio_lib_c.c
-new file mode 100644
-index 0000000..4bc5a83
---- /dev/null
-+++ b/drivers/sdio/stack/lib/sdio_lib_c.c
-@@ -0,0 +1,908 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdio_lib_c.c
-+
-+@abstract: OS independent SDIO library functions
-+@category abstract: Support_Reference Support Functions.
-+
-+@notes: Support functions for device I/O
-+
-+@notice: Copyright (c), 2004-2005 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define MODULE_NAME  SDLIB_
-+
-+#include <linux/sdio/ctsystem.h>
-+#include <linux/sdio/sdio_busdriver.h>
-+#include <linux/sdio/_sdio_defs.h>
-+#include <linux/sdio/sdio_lib.h>
-+#include "_sdio_lib.h"
-+
-+#define _Cmd52WriteByteCommon(pDev, Address, pValue) \
-+                _SDLIB_IssueCMD52((pDev),0,(Address),(pValue),1,TRUE)
-+#define _Cmd52ReadByteCommon(pDev, Address, pValue) \
-+                _SDLIB_IssueCMD52((pDev),0,(Address),pValue,1,FALSE)
-+#define _Cmd52ReadMultipleCommon(pDev, Address, pBuf,length) \
-+                _SDLIB_IssueCMD52((pDev),0,(Address),(pBuf),(length),FALSE)
-+
-+/* inline version */
-+static INLINE void _iSDLIB_SetupCMD52Request(UINT8         FuncNo,
-+                                             UINT32        Address,
-+                                             BOOL          Write,
-+                                             UINT8         WriteData,
-+                                             PSDREQUEST    pRequest) {
-+    if (Write) {
-+        SDIO_SET_CMD52_ARG(pRequest->Argument,CMD52_WRITE,
-+                           FuncNo,
-+                           CMD52_NORMAL_WRITE,Address,WriteData);
-+    } else {
-+        SDIO_SET_CMD52_ARG(pRequest->Argument,CMD52_READ,FuncNo,0,Address,0x00);
-+    }
-+
-+    pRequest->Flags = SDREQ_FLAGS_RESP_SDIO_R5;
-+    pRequest->Command = CMD52;
-+}
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Setup cmd52 requests
-+
-+  @function name: SDLIB_SetupCMD52Request
-+  @prototype: void SDLIB_SetupCMD52Request(UINT8         FuncNo,
-+                                           UINT32        Address,
-+                                           BOOL          Write,
-+                                           UINT8         WriteData,
-+                                           PSDREQUEST    pRequest)
-+  @category: PD_Reference
-+
-+  @input:  FunctionNo - function number.
-+  @input:  Address - I/O address, 17-bit register address.
-+  @input:  Write  - TRUE if a write operation, FALSE for reads.
-+  @input:  WriteData - write data, byte to write if write operation.
-+
-+  @output: pRequest - request is updated with cmd52 parameters
-+
-+  @return: none
-+
-+  @notes: This function does not perform any I/O. For register reads, the completion
-+          routine can use the SD_R5_GET_READ_DATA() macro to extract the register value.
-+          The routine should also extract the response flags using the SD_R5_GET_RESP_FLAGS()
-+          macro and check the flags with the SD_R5_ERRORS mask.
-+
-+  @example: Getting the register value from the completion routine:
-+          flags = SD_R5_GET_RESP_FLAGS(pRequest->Response);
-+          if (flags & SD_R5_ERRORS) {
-+             ... errors
-+          } else {
-+             registerValue = SD_R5_GET_READ_DATA(pRequest->Response);
-+          }
-+
-+  @see also: SDLIB_IssueCMD52
-+  @see also: SDDEVICE_CALL_REQUEST_FUNC
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void _SDLIB_SetupCMD52Request(UINT8         FuncNo,
-+                              UINT32        Address,
-+                              BOOL          Write,
-+                              UINT8         WriteData,
-+                              PSDREQUEST    pRequest)
-+{
-+    _iSDLIB_SetupCMD52Request(FuncNo,Address,Write,WriteData,pRequest);
-+}
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Issue a CMD52 to read or write a register
-+
-+  @function name: SDLIB_IssueCMD52
-+  @prototype: SDIO_STATUS SDLIB_IssueCMD52(PSDDEVICE     pDevice,
-+                                           UINT8         FuncNo,
-+                                           UINT32        Address,
-+                                           PUINT8        pData,
-+                                           INT           ByteCount,
-+                                           BOOL          Write)
-+  @category: PD_Reference
-+  @input: pDevice - the device that is the target of the command.
-+  @input: FunctionNo - function number of the target.
-+  @input: Address - 17-bit register address.
-+  @input: ByteCount - number of bytes to read or write,
-+  @input: Write - TRUE if a write operation, FALSE for reads.
-+  @input: pData - data buffer for writes.
-+
-+  @output: pData - data buffer for writes.
-+
-+  @return: SDIO Status
-+
-+  @notes:  This function will allocate a request and issue multiple byte reads or writes
-+           to satisfy the ByteCount requested.  This function is fully synchronous and will block
-+           the caller.
-+
-+  @see also: SDLIB_SetupCMD52Request
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _SDLIB_IssueCMD52(PSDDEVICE     pDevice,
-+                              UINT8         FuncNo,
-+                              UINT32        Address,
-+                              PUINT8        pData,
-+                              INT           ByteCount,
-+                              BOOL          Write)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+
-+    PSDREQUEST  pReq = NULL;
-+
-+    pReq = SDDeviceAllocRequest(pDevice);
-+
-+    if (NULL == pReq) {
-+        return SDIO_STATUS_NO_RESOURCES;
-+    }
-+
-+    while (ByteCount) {
-+        _iSDLIB_SetupCMD52Request(FuncNo,Address,Write,*pData,pReq);
-+        status = SDDEVICE_CALL_REQUEST_FUNC(pDevice,pReq);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+
-+        status = ConvertCMD52ResponseToSDIOStatus(SD_R5_GET_RESP_FLAGS(pReq->Response));
-+        if (!SDIO_SUCCESS(status)) {
-+            DBG_PRINT(SDDBG_TRACE, ("SDIO Library: CMD52 resp error: 0x%X \n",
-+                                    SD_R5_GET_RESP_FLAGS(pReq->Response)));
-+            break;
-+        }
-+        if (!Write) {
-+                /* store the byte */
-+            *pData =  SD_R5_GET_READ_DATA(pReq->Response);
-+        }
-+        pData++;
-+        Address++;
-+        ByteCount--;
-+    }
-+
-+    SDDeviceFreeRequest(pDevice,pReq);
-+    return status;
-+}
-+
-+
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Find a device's tuple.
-+
-+  @function name: SDLIB_FindTuple
-+  @prototype: SDIO_STATUS SDLIB_FindTuple(PSDDEVICE  pDevice,
-+                                          UINT8      Tuple,
-+                                          UINT32     *pTupleScanAddress,
-+                                          PUINT8     pBuffer,
-+                                          UINT8      *pLength)
-+
-+  @category: PD_Reference
-+  @input: pDevice - the device that is the target of the command.
-+  @input: Tuple - 8-bit ID of tuple to find
-+  @input: pTupleScanAddress - On entry pTupleScanAddress is the adddress to start scanning
-+  @input: pLength - length of pBuffer
-+
-+  @output: pBuffer - storage for tuple
-+  @output: pTupleScanAddress - address of the next tuple
-+  @output: pLength - length of tuple read
-+
-+  @return: status
-+
-+  @notes: It is possible to have the same tuple ID multiple times with different lengths. This function
-+          blocks and is fully synchronous.
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _SDLIB_FindTuple(PSDDEVICE  pDevice,
-+                             UINT8      Tuple,
-+                             UINT32     *pTupleScanAddress,
-+                             PUINT8     pBuffer,
-+                             UINT8      *pLength)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    UINT32      scanStart = *pTupleScanAddress;
-+    UINT8       tupleCode;
-+    UINT8       tupleLink;
-+
-+        /* sanity check */
-+    if (scanStart < SDIO_CIS_AREA_BEGIN) {
-+        return SDIO_STATUS_CIS_OUT_OF_RANGE;
-+    }
-+
-+    while (TRUE) {
-+            /* check for end */
-+        if (scanStart > SDIO_CIS_AREA_END) {
-+            status = SDIO_STATUS_TUPLE_NOT_FOUND;
-+            break;
-+        }
-+            /* get the code */
-+        status = _Cmd52ReadByteCommon(pDevice, scanStart, &tupleCode);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+        if (CISTPL_END == tupleCode) {
-+                /* found the end */
-+            status = SDIO_STATUS_TUPLE_NOT_FOUND;
-+            break;
-+        }
-+            /* bump past tuple code */
-+        scanStart++;
-+            /* get the tuple link value */
-+        status = _Cmd52ReadByteCommon(pDevice, scanStart, &tupleLink);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+            /* bump past tuple link*/
-+        scanStart++;
-+            /* check tuple we just found */
-+        if (tupleCode == Tuple) {
-+             DBG_PRINT(SDDBG_TRACE, ("SDIO Library: Tuple:0x%2.2X Found at Address:0x%X, TupleLink:0x%X \n",
-+                                     Tuple, (scanStart - 2), tupleLink));
-+            if (tupleLink != CISTPL_LINK_END) {
-+                    /* return the next scan address to the caller */
-+                *pTupleScanAddress = scanStart + tupleLink;
-+            } else {
-+                    /* the tuple link is an end marker */
-+                *pTupleScanAddress = 0xFFFFFFFF;
-+            }
-+                /* go get the tuple */
-+            status = _Cmd52ReadMultipleCommon(pDevice, scanStart,pBuffer,min(*pLength,tupleLink));
-+            if (SDIO_SUCCESS(status)) {
-+                    /* set the actual return length */
-+                *pLength = min(*pLength,tupleLink);
-+            }
-+                /* break out of loop */
-+            break;
-+        }
-+            /*increment past this entire tuple */
-+        scanStart += tupleLink;
-+    }
-+
-+    return status;
-+}
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Issue an SDIO configuration command.
-+
-+  @function name: SDLIB_IssueConfig
-+  @prototype: SDIO_STATUS _SDLIB_IssueConfig(PSDDEVICE        pDevice,
-+                                             SDCONFIG_COMMAND Command,
-+                                             PVOID            pData,
-+                                             INT              Length)
-+
-+  @category: PD_Reference
-+  @input:  pDevice - the device that is the target of the command.
-+  @input:  Command - command to send, see example.
-+  @input:  pData - command's data
-+  @input:  Length length of pData
-+
-+  @output: pData - updated on commands that return data.
-+
-+  @return: SDIO Status
-+
-+  @example: Command and data pairs:
-+            Type                               Data
-+            SDCONFIG_GET_WP             SDCONFIG_WP_VALUE
-+            SDCONFIG_SEND_INIT_CLOCKS   none
-+            SDCONFIG_SDIO_INT_CTRL      SDCONFIG_SDIO_INT_CTRL_DATA
-+            SDCONFIG_SDIO_REARM_INT     none
-+            SDCONFIG_BUS_MODE_CTRL      SDCONFIG_BUS_MODE_DATA
-+            SDCONFIG_POWER_CTRL         SDCONFIG_POWER_CTRL_DATA
-+
-+  @notes:
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _SDLIB_IssueConfig(PSDDEVICE        pDevice,
-+                               SDCONFIG_COMMAND Command,
-+                               PVOID            pData,
-+                               INT              Length)
-+{
-+    SDCONFIG  configHdr;
-+    SET_SDCONFIG_CMD_INFO(&configHdr,Command,pData,Length);
-+    return SDDEVICE_CALL_CONFIG_FUNC(pDevice,&configHdr);
-+}
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Set function block size
-+
-+  @function name: SDLIB_SetFunctionBlockSize
-+  @prototype: SDIO_STATUS SDLIB_SetFunctionBlockSize(PSDDEVICE        pDevice,
-+                                                     UINT16           BlockSize)
-+
-+  @category: PD_Reference
-+  @input:  pDevice - the device that is the target of the command.
-+  @input:  BlockSize - block size to set in function
-+
-+  @output: none
-+
-+  @return: SDIO Status
-+
-+  @notes:  Issues CMD52 to set the block size.  This function is fully synchronous and may
-+           block.
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _SDLIB_SetFunctionBlockSize(PSDDEVICE        pDevice,
-+                                        UINT16           BlockSize)
-+{
-+    UINT8   data[2];
-+
-+      /* endian safe */
-+    data[0] = (UINT8)BlockSize;
-+    data[1] = (UINT8)(BlockSize >> 8);
-+        /* write the function blk size control register */
-+    return _SDLIB_IssueCMD52(pDevice,
-+                             0,    /* function 0 register space */
-+                             FBR_FUNC_BLK_SIZE_LOW_OFFSET(CalculateFBROffset(
-+                             SDDEVICE_GET_SDIO_FUNCNO(pDevice))),
-+                             data,
-+                             2,
-+                             TRUE);
-+}
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Print a buffer to the debug output
-+
-+  @function name: SDLIB_PrintBuffer
-+  @prototype: void SDLIB_PrintBuffer(PUCHAR pBuffer, INT Length, PTEXT pDescription)
-+  @category: Support_Reference
-+
-+  @input:  pBuffer - Hex buffer to be printed.
-+  @input:  Length - length of pBuffer.
-+  @input:  pDescription - String title to be printed above the dump.
-+
-+  @output: none
-+
-+  @return: none
-+
-+  @notes:  Prints the buffer by converting to ASCII and using REL_PRINT() with 16
-+           bytes per line.
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void _SDLIB_PrintBuffer(PUCHAR pBuffer, INT Length, PTEXT pDescription)
-+{
-+    TEXT  line[49];
-+    TEXT  address[5];
-+    TEXT  ascii[17];
-+    TEXT  temp[5];
-+    INT   i;
-+    UCHAR num;
-+    USHORT offset = 0;
-+
-+    REL_PRINT(0,
-+              ("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n"));
-+    if (pDescription != NULL) {
-+        REL_PRINT(0, ("Description: %s \n\n",pDescription));
-+    } else {
-+        REL_PRINT(0, ("Description: NONE \n\n"));
-+    }
-+    REL_PRINT(0,
-+              ("Offset                   Data                               ASCII        \n"));
-+    REL_PRINT(0,
-+              ("--------------------------------------------------------------------------\n"));
-+
-+    while (Length) {
-+        line[0] = (TEXT)0;
-+        ascii[0] = (TEXT)0;
-+        address[0] = (TEXT)0;
-+        sprintf(address,"%4.4X",offset);
-+        for (i = 0; i < 16; i++) {
-+            if (Length != 0) {
-+                num = *pBuffer;
-+                sprintf(temp,"%2.2X ",num);
-+                strcat(line,temp);
-+                if ((num >= 0x20) && (num <= 0x7E)) {
-+                    sprintf(temp,"%c",*pBuffer);
-+                } else {
-+                    sprintf(temp,"%c",0x2e);
-+                }
-+                strcat(ascii,temp);
-+                pBuffer++;
-+                Length--;
-+            } else {
-+                    /* pad partial line with spaces */
-+                strcat(line,"   ");
-+                strcat(ascii," ");
-+            }
-+        }
-+        REL_PRINT(0,("%s    %s   %s\n", address, line, ascii));
-+        offset += 16;
-+    }
-+    REL_PRINT(0,
-+              ("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n"));
-+
-+}
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get default operational current
-+
-+  @function name: SDLIB_GetDefaultOpCurrent
-+  @prototype: SDIO_STATUS SDLIB_GetDefaultOpCurrent(PSDDEVICE  pDevice, SD_SLOT_CURRENT *pOpCurrent)
-+  @category: PD_Reference
-+
-+  @input: pDevice - the device that is the target of the command.
-+
-+  @output: pOpCurrent - operational current in mA.
-+
-+  @return: SDIO_STATUS
-+
-+  @notes:  This routine reads the function's CISTPL_FUNCE tuple for the default operational
-+           current. For SDIO 1.0 devices this value is read from the 8-bit TPLFE_OP_MAX_PWR
-+           field.  For SDIO 1.1 devices, the HP MAX power field is used only if the device is
-+           operating in HIPWR mode. Otherwise the 8-bit TPLFE_OP_MAX_PWR field is used.
-+           Some systems may restrict high power/current mode and force cards to operate in a
-+           legacy (< 200mA) mode.  This function is fully synchronous and will block the caller.
-+
-+   @example: Getting the default operational current for this function:
-+            // get default operational current
-+       status = SDLIB_GetDefaultOpCurrent(pDevice, &slotCurrent);
-+       if (!SDIO_SUCCESS(status)) {
-+           .. failed
-+       }
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _SDLIB_GetDefaultOpCurrent(PSDDEVICE  pDevice, SD_SLOT_CURRENT *pOpCurrent)
-+{
-+    UINT32              nextTpl;
-+    UINT8               tplLength;
-+    struct SDIO_FUNC_EXT_FUNCTION_TPL_1_1 funcTuple;
-+    SDIO_STATUS         status;
-+
-+      /* get the FUNCE tuple */
-+    nextTpl = SDDEVICE_GET_SDIO_FUNC_CISPTR(pDevice);
-+    tplLength = sizeof(funcTuple);
-+        /* go get the function Extension tuple */
-+    status = _SDLIB_FindTuple(pDevice,
-+                              CISTPL_FUNCE,
-+                              &nextTpl,
-+                              (PUINT8)&funcTuple,
-+                              &tplLength);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        DBG_PRINT(SDDBG_ERROR, ("SDLIB_GetDefaultOpCurrent: Failed to get FuncE Tuple: %d \n", status));
-+        return status;
-+    }
-+       /* use the operational power (8-bit) value of current in mA as default*/
-+    *pOpCurrent = funcTuple.CommonInfo.OpMaxPwr;
-+    if ((tplLength >= sizeof(funcTuple)) && (SDDEVICE_IS_SDIO_REV_GTEQ_1_10(pDevice))) {
-+            /* we have a 1.1 tuple */
-+             /* check for HIPWR mode */
-+        if (SDDEVICE_GET_CARD_FLAGS(pDevice) & CARD_HIPWR) {
-+                /* use the maximum operational power (16 bit ) from the tuple */
-+            *pOpCurrent = CT_LE16_TO_CPU_ENDIAN(funcTuple.HiPwrMaxPwr);
-+        }
-+    }
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+
-+static INLINE void FreeMessageBlock(PSDMESSAGE_QUEUE pQueue, PSDMESSAGE_BLOCK pMsg) {
-+    SDListInsertHead(&pQueue->FreeMessageList, &pMsg->SDList);
-+}
-+static INLINE void QueueMessageBlock(PSDMESSAGE_QUEUE pQueue, PSDMESSAGE_BLOCK pMsg) {
-+    SDListInsertTail(&pQueue->MessageList, &pMsg->SDList);
-+}
-+static INLINE void QueueMessageToHead(PSDMESSAGE_QUEUE pQueue, PSDMESSAGE_BLOCK pMsg) {
-+    SDListInsertHead(&pQueue->MessageList, &pMsg->SDList);
-+}
-+
-+static INLINE PSDMESSAGE_BLOCK GetFreeMessageBlock(PSDMESSAGE_QUEUE pQueue) {
-+    PSDLIST pItem = SDListRemoveItemFromHead(&pQueue->FreeMessageList);
-+    if (pItem != NULL) {
-+        return CONTAINING_STRUCT(pItem, SDMESSAGE_BLOCK , SDList);
-+    }
-+    return NULL;
-+}
-+static INLINE PSDMESSAGE_BLOCK GetQueuedMessage(PSDMESSAGE_QUEUE pQueue) {
-+    PSDLIST pItem = SDListRemoveItemFromHead(&pQueue->MessageList);
-+    if (pItem != NULL) {
-+        return CONTAINING_STRUCT(pItem, SDMESSAGE_BLOCK , SDList);
-+    }
-+    return NULL;
-+}
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Create a message queue
-+
-+  @function name: SDLIB_CreateMessageQueue
-+  @prototype: PSDMESSAGE_QUEUE SDLIB_CreateMessageQueue(INT MaxMessages, INT MaxMessageLength)
-+  @category: Support_Reference
-+
-+  @input: MaxMessages - Maximum number of messages this queue supports
-+  @input: MaxMessageLength - Maximum size of each message
-+
-+  @return: Message queue object, NULL on failure
-+
-+  @notes:  This function creates a simple first-in-first-out message queue.  The caller must determine
-+           the maximum number of messages the queue supports and the size of each message.  This
-+           function will pre-allocate memory for each message. A producer of data posts a message
-+           using SDLIB_PostMessage with a user defined data structure. A consumer of this data
-+           can retrieve the message (in FIFO order) using SDLIB_GetMessage. A message queue does not
-+           provide a signaling mechanism for notifying a consumer of data. Notifying a consumer is
-+           user defined.
-+
-+  @see also: SDLIB_DeleteMessageQueue, SDLIB_GetMessage, SDLIB_PostMessage.
-+
-+  @example: Creating a message queue:
-+       typedef struct _MyMessage {
-+           UINT8 Code;
-+           PVOID pDataBuffer;
-+       } MyMessage;
-+            // create message queue, 16 messages max.
-+       pMsgQueue = SDLIB_CreateMessageQueue(16,sizeof(MyMessage));
-+       if (NULL == pMsgQueue) {
-+           .. failed
-+       }
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+PSDMESSAGE_QUEUE _CreateMessageQueue(INT MaxMessages, INT MaxMessageLength)
-+{
-+    PSDMESSAGE_QUEUE pQueue = NULL;
-+    SDIO_STATUS      status = SDIO_STATUS_SUCCESS;
-+    INT              ii;
-+    PSDMESSAGE_BLOCK pMsg;
-+
-+    do {
-+        pQueue = (PSDMESSAGE_QUEUE)KernelAlloc(sizeof(SDMESSAGE_QUEUE));
-+
-+        if (NULL == pQueue) {
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            break;
-+        }
-+        SDLIST_INIT(&pQueue->MessageList);
-+        SDLIST_INIT(&pQueue->FreeMessageList);
-+        pQueue->MaxMessageLength = MaxMessageLength;
-+        status = CriticalSectionInit(&pQueue->MessageCritSection);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+            /* allocate message blocks */
-+        for (ii = 0; ii < MaxMessages; ii++) {
-+            pMsg = (PSDMESSAGE_BLOCK)KernelAlloc(sizeof(SDMESSAGE_BLOCK) + MaxMessageLength -1);
-+            if (NULL == pMsg) {
-+                break;
-+            }
-+            FreeMessageBlock(pQueue, pMsg);
-+        }
-+
-+        if (0 == ii) {
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            break;
-+        }
-+
-+    } while (FALSE);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        if (pQueue != NULL) {
-+            _DeleteMessageQueue(pQueue);
-+            pQueue = NULL;
-+        }
-+    }
-+    return pQueue;
-+}
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Delete a message queue
-+
-+  @function name: SDLIB_DeleteMessageQueue
-+  @prototype: void SDLIB_DeleteMessageQueue(PSDMESSAGE_QUEUE pQueue)
-+  @category: Support_Reference
-+
-+  @input: pQueue - message queue to delete
-+
-+  @notes: This function flushes the message queue and frees all memory allocated for
-+          messages.
-+
-+  @see also: SDLIB_CreateMessageQueue
-+
-+  @example: Deleting a message queue:
-+       if (pMsgQueue != NULL) {
-+            SDLIB_DeleteMessageQueue(pMsgQueue);
-+       }
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+void _DeleteMessageQueue(PSDMESSAGE_QUEUE pQueue)
-+{
-+    PSDMESSAGE_BLOCK pMsg;
-+    SDIO_STATUS     status;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    status = CriticalSectionAcquireSyncIrq(&pQueue->MessageCritSection);
-+
-+        /* cleanup free list */
-+    while (1) {
-+        pMsg = GetFreeMessageBlock(pQueue);
-+        if (pMsg != NULL) {
-+            KernelFree(pMsg);
-+        } else {
-+            break;
-+        }
-+    }
-+        /* cleanup any in the queue */
-+    while (1) {
-+        pMsg = GetQueuedMessage(pQueue);
-+        if (pMsg != NULL) {
-+            KernelFree(pMsg);
-+        } else {
-+            break;
-+        }
-+    }
-+
-+    status = CriticalSectionReleaseSyncIrq(&pQueue->MessageCritSection);
-+    CriticalSectionDelete(&pQueue->MessageCritSection);
-+    KernelFree(pQueue);
-+
-+}
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Post a message queue
-+
-+  @function name: SDLIB_PostMessage
-+  @prototype: SDIO_STATUS SDLIB_PostMessage(PSDMESSAGE_QUEUE pQueue, PVOID pMessage, INT MessageLength)
-+  @category: Support_Reference
-+
-+  @input: pQueue - message queue to post to
-+  @input: pMessage - message to post
-+  @input: MessageLength - length of message (for validation)
-+
-+  @return: SDIO_STATUS
-+
-+  @notes: The message queue uses an internal list of user defined message structures.  When
-+          posting a message the message is copied into an allocated structure and queued.  The memory
-+          pointed to by pMessage does not need to be allocated and can reside on the stack.
-+          The length of the message to post can be smaller that the maximum message size. This allows
-+          for variable length messages up to the maximum message size. This
-+          function returns SDIO_STATUS_NO_RESOURCES, if the message queue is full.  This
-+          function returns SDIO_STATUS_BUFFER_TOO_SMALL, if the message size exceeds the maximum
-+          size of a message.  Posting and getting messsages from a message queue is safe in any
-+          driver context.
-+
-+  @see also: SDLIB_CreateMessageQueue , SDLIB_GetMessage
-+
-+  @example: Posting a message
-+       MyMessage message;
-+           // set up message
-+       message.code = MESSAGE_DATA_READY;
-+       message.pData = pInstance->pDataBuffers[currentIndex];
-+           // post message
-+       status = SDLIB_PostMessage(pInstance->pReadQueue,&message,sizeof(message));
-+       if (!SDIO_SUCCESS(status)) {
-+           // failed
-+       }
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _PostMessage(PSDMESSAGE_QUEUE pQueue, PVOID pMessage, INT MessageLength)
-+{
-+    SDIO_STATUS status2;
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    PSDMESSAGE_BLOCK pMsg;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    if (MessageLength > pQueue->MaxMessageLength) {
-+        return SDIO_STATUS_BUFFER_TOO_SMALL;
-+    }
-+
-+    status = CriticalSectionAcquireSyncIrq(&pQueue->MessageCritSection);
-+    if (!SDIO_SUCCESS(status)) {
-+        return status;
-+    }
-+
-+    do {
-+            /* get a message block */
-+        pMsg = GetFreeMessageBlock(pQueue);
-+        if (NULL == pMsg) {
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            break;
-+        }
-+            /* copy the message */
-+        memcpy(pMsg->MessageStart,pMessage,MessageLength);
-+            /* set the length of the message */
-+        pMsg->MessageLength = MessageLength;
-+            /* queue the message to the list  */
-+        QueueMessageBlock(pQueue,pMsg);
-+    } while (FALSE);
-+
-+    status2 = CriticalSectionReleaseSyncIrq(&pQueue->MessageCritSection);
-+    return status;
-+}
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get a message from a message queue
-+
-+  @function name: SDLIB_GetMessage
-+  @prototype: SDIO_STATUS SDLIB_GetMessage(PSDMESSAGE_QUEUE pQueue, PVOID pData, INT *pBufferLength)
-+  @category: Support_Reference
-+
-+  @input: pQueue - message queue to retreive a message from
-+  @input: pBufferLength - on entry, the length of the data buffer
-+  @output: pData - buffer to hold the message
-+  @output: pBufferLength - on return, contains the number of bytes copied
-+
-+  @return: SDIO_STATUS
-+
-+  @notes: The message queue uses an internal list of user defined message structures.  The message is
-+          dequeued (FIFO order) and copied to the callers buffer.  The internal allocation for the message
-+          is returned back to the message queue. This function returns SDIO_STATUS_NO_MORE_MESSAGES
-+          if the message queue is empty. If the length of the buffer is smaller than the length of
-+          the message at the head of the queue,this function returns SDIO_STATUS_BUFFER_TOO_SMALL and
-+          returns the required length in pBufferLength.
-+
-+  @see also: SDLIB_CreateMessageQueue , SDLIB_PostMessage
-+
-+  @example: Getting a message
-+       MyMessage message;
-+       INT       length;
-+           // set length
-+       length = sizeof(message);
-+           // post message
-+       status = SDLIB_GetMessage(pInstance->pReadQueue,&message,&length);
-+       if (!SDIO_SUCCESS(status)) {
-+           // failed
-+       }
-+
-+  @example: Checking queue for a message and getting the size of the message
-+       INT       length;
-+           // use zero length to get the size of the message
-+       length = 0;
-+       status = SDLIB_GetMessage(pInstance->pReadQueue,NULL,&length);
-+       if (status == SDIO_STATUS_NO_MORE_MESSAGES) {
-+            // no messages in queue
-+       } else if (status == SDIO_STATUS_BUFFER_TOO_SMALL) {
-+            // message exists in queue and length of message is returned
-+            messageSizeInQueue = length;
-+       } else {
-+            // some other failure
-+       }
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+SDIO_STATUS _GetMessage(PSDMESSAGE_QUEUE pQueue, PVOID pData, INT *pBufferLength)
-+{
-+    SDIO_STATUS status2;
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+    PSDMESSAGE_BLOCK pMsg;
-+    CT_DECLARE_IRQ_SYNC_CONTEXT();
-+
-+    status = CriticalSectionAcquireSyncIrq(&pQueue->MessageCritSection);
-+    if (!SDIO_SUCCESS(status)) {
-+        return status;
-+    }
-+
-+    do {
-+        pMsg = GetQueuedMessage(pQueue);
-+        if (NULL == pMsg) {
-+            status = SDIO_STATUS_NO_MORE_MESSAGES;
-+            break;
-+        }
-+        if (*pBufferLength < pMsg->MessageLength) {
-+                /* caller buffer is too small */
-+            *pBufferLength = pMsg->MessageLength;
-+                /* stick it back to the front */
-+            QueueMessageToHead(pQueue, pMsg);
-+            status = SDIO_STATUS_BUFFER_TOO_SMALL;
-+            break;
-+        }
-+            /* copy the message to the callers buffer */
-+        memcpy(pData,pMsg->MessageStart,pMsg->MessageLength);
-+            /* return actual length */
-+        *pBufferLength = pMsg->MessageLength;
-+            /* return this message block back to the free list  */
-+        FreeMessageBlock(pQueue, pMsg);
-+
-+    } while (FALSE);
-+
-+    status2 = CriticalSectionReleaseSyncIrq(&pQueue->MessageCritSection);
-+
-+    return status;
-+}
-+
-+/* the following documents the OS helper APIs */
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Create an OS-specific helper task/thread
-+
-+  @function name: SDLIB_OSCreateHelper
-+  @prototype: SDIO_STATUS SDLIB_OSCreateHelper(POSKERNEL_HELPER pHelper,
-+                                               PHELPER_FUNCTION pFunction,
-+                                               PVOID            pContext)
-+  @category: Support_Reference
-+
-+  @input: pHelper - caller allocated helper object
-+  @input: pFunction - helper function
-+  @input: pContext - helper context
-+
-+  @return: SDIO_STATUS
-+
-+  @notes: This function creates a helper task/thread that runs in a new execution context. The newly
-+          created task/thread invokes the helper function. The thread/task exits when the helper
-+          function returns.  The helper function has the prototype of:
-+          THREAD_RETURN HelperFunction(POSKERNEL_HELPER pHelper)
-+          The helper function usually implements a while loop and suspends execution using
-+          SD_WAIT_FOR_WAKEUP().  On exit the helper function can return an OS-specific THREAD_RETURN
-+          code (usually zero). The helper function executes in a fully schedule-able context and
-+          can block on semaphores and sleep.
-+
-+  @see also: SDLIB_OSDeleteHelper , SD_WAIT_FOR_WAKEUP
-+
-+  @example: A thread helper function:
-+       THREAD_RETURN HelperFunction(POSKERNEL_HELPER pHelper)
-+       {
-+           SDIO_STATUS status;
-+           PMYCONTEXT pContext = (PMYCONTEXT)SD_GET_OS_HELPER_CONTEXT(pHelper);
-+                // wait for wake up
-+           while(1) {
-+                  status = SD_WAIT_FOR_WAKEUP(pHelper);
-+                  if (!SDIO_SUCCESS(status)) {
-+                      break;
-+                  }
-+                  if (SD_IS_HELPER_SHUTTING_DOWN(pHelper)) {
-+                      //... shutting down
-+                      break;
-+                  }
-+                  // handle wakeup...
-+            }
-+            return 0;
-+       }
-+
-+  @example: Creating a helper:
-+       status = SDLIB_OSCreateHelper(&pInstance->OSHelper,HelperFunction,pInstance);
-+       if (!SDIO_SUCCESS(status)) {
-+           // failed
-+       }
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+/**++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Delete an OS helper task/thread
-+
-+  @function name: SDLIB_OSDeleteHelper
-+  @prototype: void SDLIB_OSDeleteHelper(POSKERNEL_HELPER pHelper)
-+  @category: Support_Reference
-+
-+  @input: pHelper - caller allocated helper object
-+
-+  @notes: This function wakes the helper and waits(blocks) until the helper exits. The caller can
-+          only pass an OS helper structure that was initialized sucessfully by
-+          SDLIB_OSCreateHelper.  The caller must be in a schedulable context.
-+
-+  @see also: SDLIB_OSCreateHelper
-+
-+  @example: Deleting a helper:
-+       if (pInstance->HelperCreated) {
-+               // clean up the helper if we successfully created it
-+           SDLIB_OSDeleteHelper(&pInstance->OSHelper);
-+       }
-+
-+
-+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+
-diff --git a/drivers/sdio/stack/lib/sdio_lib_os.c b/drivers/sdio/stack/lib/sdio_lib_os.c
-new file mode 100644
-index 0000000..55363d0
---- /dev/null
-+++ b/drivers/sdio/stack/lib/sdio_lib_os.c
-@@ -0,0 +1,251 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdio_function_os.c
-+
-+@abstract: Linux implementation module for SDIO library
-+
-+#notes: includes module load and unload functions
-+
-+@notice: Copyright (c), 2004 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+/* debug level for this module*/
-+#define DBG_DECLARE 4;
-+#include <linux/sdio/ctsystem.h>
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/kthread.h>
-+
-+#include <linux/sdio/sdio_busdriver.h>
-+#include <linux/sdio/sdio_lib.h>
-+#include "_sdio_lib.h"
-+
-+#define DESCRIPTION "SDIO Kernel Library"
-+#define AUTHOR "Atheros Communications, Inc."
-+
-+/* proxies */
-+SDIO_STATUS SDLIB_IssueCMD52(PSDDEVICE     pDevice,
-+                            UINT8         FuncNo,
-+                            UINT32        Address,
-+                            PUINT8        pData,
-+                            INT           ByteCount,
-+                            BOOL          Write)
-+{
-+    return _SDLIB_IssueCMD52(pDevice,FuncNo,Address,pData,ByteCount,Write);
-+}
-+
-+SDIO_STATUS SDLIB_FindTuple(PSDDEVICE  pDevice,
-+                         UINT8      Tuple,
-+                         UINT32     *pTupleScanAddress,
-+                         PUINT8     pBuffer,
-+                         UINT8      *pLength)
-+{
-+    return _SDLIB_FindTuple(pDevice,Tuple,pTupleScanAddress,pBuffer,pLength);
-+}
-+
-+SDIO_STATUS SDLIB_IssueConfig(PSDDEVICE        pDevice,
-+                              SDCONFIG_COMMAND Command,
-+                              PVOID            pData,
-+                              INT              Length)
-+{
-+    return _SDLIB_IssueConfig(pDevice,Command,pData,Length);
-+}
-+
-+void SDLIB_PrintBuffer(PUCHAR pBuffer,INT Length,PTEXT pDescription)
-+{
-+    _SDLIB_PrintBuffer(pBuffer,Length,pDescription);
-+}
-+
-+SDIO_STATUS SDLIB_SetFunctionBlockSize(PSDDEVICE        pDevice,
-+                                       UINT16           BlockSize)
-+{
-+    return _SDLIB_SetFunctionBlockSize(pDevice,BlockSize);
-+}
-+
-+void SDLIB_SetupCMD52Request(UINT8         FuncNo,
-+                             UINT32        Address,
-+                             BOOL          Write,
-+                             UINT8         WriteData,
-+                             PSDREQUEST    pRequest)
-+{
-+    _SDLIB_SetupCMD52Request(FuncNo,Address,Write,WriteData,pRequest);
-+}
-+
-+SDIO_STATUS SDLIB_GetDefaultOpCurrent(PSDDEVICE  pDevice, SD_SLOT_CURRENT *pOpCurrent)
-+{
-+    return _SDLIB_GetDefaultOpCurrent(pDevice,pOpCurrent);
-+}
-+
-+/* helper function launcher */
-+INT HelperLaunch(PVOID pContext)
-+{
-+    INT exit;
-+        /* call function */
-+    exit = ((POSKERNEL_HELPER)pContext)->pHelperFunc((POSKERNEL_HELPER)pContext);
-+    complete_and_exit(&((POSKERNEL_HELPER)pContext)->Completion, exit);
-+    return exit;
-+}
-+
-+/*
-+ * OSCreateHelper - create a worker kernel thread
-+*/
-+SDIO_STATUS SDLIB_OSCreateHelper(POSKERNEL_HELPER pHelper,
-+                           PHELPER_FUNCTION pFunction,
-+                           PVOID            pContext)
-+{
-+    SDIO_STATUS status = SDIO_STATUS_SUCCESS;
-+
-+    memset(pHelper,0,sizeof(OSKERNEL_HELPER));
-+
-+    do {
-+        pHelper->pContext = pContext;
-+        pHelper->pHelperFunc = pFunction;
-+        status = SignalInitialize(&pHelper->WakeSignal);
-+        if (!SDIO_SUCCESS(status)) {
-+            break;
-+        }
-+        init_completion(&pHelper->Completion);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        pHelper->pTask = kthread_create(HelperLaunch,
-+                                       (PVOID)pHelper,
-+                                       "SDIO Helper");
-+        if (NULL == pHelper->pTask) {
-+            status = SDIO_STATUS_NO_RESOURCES;
-+            break;
-+        }
-+        wake_up_process(pHelper->pTask);
-+#else
-+    /* 2.4 */
-+        pHelper->pTask = kernel_thread(HelperLaunch,
-+                                       (PVOID)pHelper,
-+                                       (CLONE_FS | CLONE_FILES | SIGCHLD));
-+        if (pHelper->pTask < 0) {
-+            DBG_PRINT(SDDBG_TRACE,
-+                ("SDIO BusDriver - OSCreateHelper, failed to create thread\n"));
-+        }
-+#endif
-+
-+    } while (FALSE);
-+
-+    if (!SDIO_SUCCESS(status)) {
-+        SDLIB_OSDeleteHelper(pHelper);
-+    }
-+    return status;
-+}
-+
-+/*
-+ * OSDeleteHelper - delete thread created with OSCreateHelper
-+*/
-+void SDLIB_OSDeleteHelper(POSKERNEL_HELPER pHelper)
-+{
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+    if (pHelper->pTask != NULL) {
-+#else
-+    /* 2.4 */
-+    if (pHelper->pTask >= 0) {
-+#endif
-+        pHelper->ShutDown = TRUE;
-+        SignalSet(&pHelper->WakeSignal);
-+            /* wait for thread to exit */
-+        wait_for_completion(&pHelper->Completion);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+        pHelper->pTask = NULL;
-+#else
-+    /* 2.4 */
-+        pHelper->pTask = 0;
-+#endif
-+    }
-+
-+    SignalDelete(&pHelper->WakeSignal);
-+}
-+
-+/*
-+ * module init
-+*/
-+static int __init sdio_lib_init(void) {
-+    REL_PRINT(SDDBG_TRACE, ("SDIO Library load\n"));
-+    return 0;
-+}
-+
-+/*
-+ * module cleanup
-+*/
-+static void __exit sdio_lib_cleanup(void) {
-+    REL_PRINT(SDDBG_TRACE, ("SDIO Library unload\n"));
-+}
-+
-+PSDMESSAGE_QUEUE SDLIB_CreateMessageQueue(INT MaxMessages, INT MaxMessageLength)
-+{
-+    return _CreateMessageQueue(MaxMessages,MaxMessageLength);
-+
-+}
-+void SDLIB_DeleteMessageQueue(PSDMESSAGE_QUEUE pQueue)
-+{
-+    _DeleteMessageQueue(pQueue);
-+}
-+
-+SDIO_STATUS SDLIB_PostMessage(PSDMESSAGE_QUEUE pQueue, PVOID pMessage, INT MessageLength)
-+{
-+    return _PostMessage(pQueue,pMessage,MessageLength);
-+}
-+
-+SDIO_STATUS SDLIB_GetMessage(PSDMESSAGE_QUEUE pQueue, PVOID pData, INT *pBufferLength)
-+{
-+    return _GetMessage(pQueue,pData,pBufferLength);
-+}
-+
-+MODULE_LICENSE("GPL and additional rights");
-+MODULE_DESCRIPTION(DESCRIPTION);
-+MODULE_AUTHOR(AUTHOR);
-+module_init(sdio_lib_init);
-+module_exit(sdio_lib_cleanup);
-+EXPORT_SYMBOL(SDLIB_IssueCMD52);
-+EXPORT_SYMBOL(SDLIB_FindTuple);
-+EXPORT_SYMBOL(SDLIB_IssueConfig);
-+EXPORT_SYMBOL(SDLIB_PrintBuffer);
-+EXPORT_SYMBOL(SDLIB_SetFunctionBlockSize);
-+EXPORT_SYMBOL(SDLIB_SetupCMD52Request);
-+EXPORT_SYMBOL(SDLIB_GetDefaultOpCurrent);
-+EXPORT_SYMBOL(SDLIB_OSCreateHelper);
-+EXPORT_SYMBOL(SDLIB_OSDeleteHelper);
-+EXPORT_SYMBOL(SDLIB_CreateMessageQueue);
-+EXPORT_SYMBOL(SDLIB_DeleteMessageQueue);
-+EXPORT_SYMBOL(SDLIB_PostMessage);
-+EXPORT_SYMBOL(SDLIB_GetMessage);
-diff --git a/drivers/sdio/stack/platform/Makefile b/drivers/sdio/stack/platform/Makefile
-new file mode 100644
-index 0000000..14b3612
---- /dev/null
-+++ b/drivers/sdio/stack/platform/Makefile
-@@ -0,0 +1,2 @@
-+obj-$(CONFIG_SDIO) += sdio_platform.o
-+sdio_platform-objs := sdioplatformdriver.o
-\ No newline at end of file
-diff --git a/drivers/sdio/stack/platform/sdioplatformdriver.c b/drivers/sdio/stack/platform/sdioplatformdriver.c
-new file mode 100644
-index 0000000..d5520fc
---- /dev/null
-+++ b/drivers/sdio/stack/platform/sdioplatformdriver.c
-@@ -0,0 +1,300 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdioplatformdriver.c
-+
-+@abstract: Linux implementation module for SDIO pltaform driver
-+
-+#notes:
-+
-+@notice: Copyright (c), 2006 Atheros Communications, Inc.
-+
-+@license:  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 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+
-+#define DESCRIPTION "SDIO Platform Driver"
-+#define AUTHOR "Atheros Communications, Inc."
-+
-+//??for .h
-+
-+struct sdioplatform_peripheral {
-+    struct list_head    node;
-+    struct sdioplatform_controller *controller;
-+    struct device       dev;
-+};
-+struct sdioplatform_driver {
-+    struct device_driver drv;
-+    int (*probe)(struct sdioplatform_peripheral *);
-+    void (*remove)(struct sdioplatform_peripheral *);
-+    int (*suspend)(struct sdioplatform_peripheral *, pm_message_t);
-+    int (*resume)(struct sdioplatform_peripheral *);
-+};
-+
-+
-+struct sdioplatform_controller {
-+    struct device       *dev;
-+};
-+struct sdioplatform_controller_driver {
-+    struct device_driver drv;
-+    int (*probe)(struct sdioplatform_controller *);
-+    void (*remove)(struct sdioplatform_controller *);
-+    int (*suspend)(struct sdioplatform_controller *, pm_message_t);
-+    int (*resume)(struct sdioplatform_controller *);
-+};
-+
-+
-+
-+#define device_to_sdioplatform_peripheral(d)  container_of(d, struct sdioplatform_peripheral, dev)
-+#define driver_to_sdioplatform_driver(d)  container_of(d, struct sdioplatform_driver, drv)
-+
-+#define device_to_sdioplatform_controller(d)  container_of(d, struct sdioplatform_controller, dev)
-+#define driver_to_sdioplatform_controller_driver(d)  container_of(d, struct sdioplatform_controller_driver, drv)
-+
-+#define SDIOPLATFORM_ATTR(name, fmt, args...)                    \
-+static ssize_t sdio_##name##_show (struct device *dev, struct device_attribute *attr, char *buf) \
-+{                                   \
-+    struct sdioplatform_peripheral *peripheral = device_to_sdioplatform_peripheral(dev);  \
-+    return sprintf(buf, fmt, args);                 \
-+}
-+
-+SDIOPLATFORM_ATTR(bus_id, "%s\n", bus_id);
-+#define SDIOPLATFORM_ATTR_RO(name) __ATTR(name, S_IRUGO, sdioplatform_##name##_show, NULL)
-+
-+static struct device_attribute sdioplatform_dev_attrs[] = {
-+    SDIOPLATFORM_ATTR_RO(bus_id),
-+    __ATTR_NULL
-+};
-+
-+static struct bus_type sdioplatform_bus_type = {
-+    .name       = "sdioplatform",
-+    .dev_attrs  = sdioplatform_dev_attrs,
-+    .match      = sdioplatform_bus_match,
-+    .hotplug    = NULL,
-+    .suspend    = sdioplatform_bus_suspend,
-+    .resume     = sdioplatform_bus_resume,
-+};
-+
-+
-+/* controller functions */
-+static int sdioplatform_controllerdrv_probe(struct device *dev)
-+{
-+    struct sdioplatform_controller_driver *drv = driver_to_sdioplatform_controller_driver(dev->driver);
-+    struct sdioplatform_controller *controller = device_to_sdioplatform_controller(dev);
-+
-+    return drv->probe(controller);
-+}
-+
-+static int sdioplatform_controllerdrv_remove(struct device *dev)
-+{
-+    struct sdioplatform_controller_driver *drv = driver_to_sdioplatform_controller_driver(dev->driver);
-+    struct sdioplatform_controller *controller = device_to_sdioplatform_controller(dev);
-+
-+    return drv->remove(controller);
-+}
-+
-+/*
-+ * sdioplatform_register_controller_driver - register a controller driver
-+ */
-+int sdioplatform_register_controller_driver(struct sdioplatform_controller_driver *drv)
-+{
-+    drv->drv.bus = &sdioplatform_bus_type;
-+    drv->drv.probe = sdioplatform_controllerdrv_probe;
-+    drv->drv.remove = sdioplatform_controllerdrv_remove;
-+    return driver_register(&drv->drv);
-+}
-+
-+/*
-+ *  sdioplatform_unregister_controller_driver - unregister a controller driver
-+ */
-+void sdioplatform_unregister_controller_driver(struct sdioplatform_driver *drv)
-+{
-+    driver_unregister(&drv->drv);
-+}
-+
-+/*
-+ * sdioplatform_add_controller - register a controller device
-+ */
-+int sdioplatform_add_controller(char *name, struct sdioplatform_controller *dev)
-+{
-+    if (!dev) {
-+        return -EINVAL;
-+    }
-+    strncpy(dev->dev.bus_id, BUS_ID_SIZE, name);
-+    return device_register(&dev->dev);
-+}
-+
-+/*
-+ * sdioplatform_remove_controller - unregister a controller device
-+ */
-+int sdioplatform_remove_controller(char *name, struct sdioplatform_controller *dev)
-+{
-+    if (!dev) {
-+        return -EINVAL;
-+    }
-+    return device_unregister(&dev->dev);
-+}
-+
-+/* peripheral functions */
-+static int sdioplatform_drv_probe(struct device *dev)
-+{
-+    struct sdioplatform_driver *drv = driver_to_sdioplatform_driver(dev->driver);
-+    struct sdioplatform_peripheral *peripheral = device_to_sdioplatform_peripheral(dev);
-+
-+    return drv->probe(peripheral);
-+}
-+
-+static int sdioplatform_controllerdrv_remove(struct device *dev)
-+{
-+    struct sdioplatform_controller_driver *drv = driver_to_sdioplatform_controller_driver(dev->driver);
-+    struct sdioplatform_controller *controller = device_to_sdioplatform_controller(dev);
-+
-+    return drv->remove(controller);
-+}
-+
-+/*
-+ * sdioplatform_register_driver - register a driver
-+ */
-+int sdioplatform_register_driver(struct sdioplatform_driver *drv)
-+{
-+    drv->drv.bus = &sdioplatform_bus_type;
-+    drv->drv.probe = sdioplatform_drv_probe;
-+    drv->drv.remove = sdioplatform_drv_remove;
-+    return driver_register(&drv->drv);
-+}
-+
-+/*
-+ *  sdioplatform_unregister_driver - unregister a driver
-+ */
-+void sdioplatform_unregister_driver(struct sdioplatform_driver *drv)
-+{
-+    driver_unregister(&drv->drv);
-+}
-+
-+/*
-+ * sdioplatform_add_peripheral - register a peripheral device
-+ */
-+int sdioplatform_add_peripheral(char *name, struct sdioplatform_peripheral *dev)
-+{
-+    if (!dev) {
-+        return -EINVAL;
-+    }
-+    strncpy(dev->dev.bus_id, BUS_ID_SIZE, name);
-+    return device_register(&dev->dev);
-+}
-+
-+/*
-+ * sdioplatform_remove_peripheral - unregister a peripheral device
-+ */
-+int sdioplatform_remove_peripheral(char *name, struct sdioplatform_peripheral *dev)
-+{
-+    if (!dev) {
-+        return -EINVAL;
-+    }
-+    return device_unregister(&dev->dev);
-+}
-+
-+
-+
-+
-+
-+static int sdioplatform_bus_match(struct device *dev, struct device_driver *drv)
-+{
-+    /* probes handle the matching */
-+    return 1;
-+}
-+
-+static int sdioplatform_bus_suspend(struct device *dev, pm_message_t state)
-+{
-+    struct sdioplatform_driver *drv = driver_to_sdioplatform_driver(dev->driver);
-+    struct sdioplatform_peripheral *peripheral = device_to_sdioplatform_peripheral(dev);
-+    int ret = 0;
-+
-+    if (peripheral->driver && drv->suspend) {
-+        ret = drv->suspend(peripheral, state);
-+    }
-+    return ret;
-+}
-+
-+static int sdioplatform_bus_resume(struct device *dev)
-+{
-+    struct sdioplatform_driver *drv = driver_to_sdioplatform_driver(dev->driver);
-+    struct sdioplatform_peripheral *peripheral = device_to_sdioplatform_peripheral(dev);
-+    int ret = 0;
-+
-+    if (peripheral->driver && drv->resume) {
-+        ret = drv->resume(card);
-+    }
-+    return ret;
-+}
-+
-+/*
-+ * module init
-+*/
-+static int __init sdio_platformdriver_init(void) {
-+    int ret = bus_register(&sdioplatform_bus_type);
-+    return ret;
-+}
-+
-+/*
-+ * module cleanup
-+*/
-+static void __exit sdio_platformdriver_cleanup(void) {
-+    REL_PRINT(SDDBG_TRACE, ("SDIO unloaded\n"));
-+    _SDIO_BusDriverCleanup();
-+}
-+
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION(DESCRIPTION);
-+MODULE_AUTHOR(AUTHOR);
-+
-+module_init(sdio_platformdriver_init);
-+module_exit(sdio_platformdriver_cleanup);
-+EXPORT_SYMBOL(sdioplatform_register_controller_driver);
-+EXPORT_SYMBOL(sdioplatform_unregister_controller_driver);
-+EXPORT_SYMBOL(sdioplatform_add_controller);
-+EXPORT_SYMBOL(sdioplatform_remove_controller);
-+EXPORT_SYMBOL(sdioplatform_register_driver);
-+EXPORT_SYMBOL(sdioplatform_unregister_driver);
-+EXPORT_SYMBOL(sdioplatform_add_peripheral);
-+EXPORT_SYMBOL(sdioplatform_remove_peripheral);
-+
-+
-+
-diff --git a/include/linux/sdio/_sdio_defs.h b/include/linux/sdio/_sdio_defs.h
-new file mode 100644
-index 0000000..a3f5542
---- /dev/null
-+++ b/include/linux/sdio/_sdio_defs.h
-@@ -0,0 +1,638 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: _sdio_defs.h
-+
-+@abstract: SD/SDIO definitions
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#ifndef ___SDIO_DEFS_H___
-+#define ___SDIO_DEFS_H___
-+
-+#define SD_INIT_BUS_CLOCK   100000    /* initialization clock in hz */
-+#define SPI_INIT_BUS_CLOCK  100000    /* initialization clock in hz */
-+#define SD_MAX_BUS_CLOCK    25000000  /* max clock speed in hz */
-+#define SD_HS_MAX_BUS_CLOCK 50000000  /* SD high speed max clock speed in hz */
-+#define SDIO_LOW_SPEED_MAX_BUS_CLOCK 400000 /* max low speed clock in hz */
-+#define SDMMC_MIN_INIT_CLOCKS   80    /* minimun number of initialization clocks */
-+#define SDIO_EMPC_CURRENT_THRESHOLD  300  /* SDIO 1.10 , EMPC (mA) threshold, we add some overhead */
-+
-+/* commands */
-+#define CMD0    0
-+#define CMD1    1
-+#define CMD2    2
-+#define CMD3    3
-+#define CMD4    4
-+#define CMD5    5
-+#define CMD6    6
-+#define CMD7    7
-+#define CMD9    9
-+#define CMD10   10
-+#define CMD12   12
-+#define CMD13   13
-+#define CMD15   15
-+#define CMD16   16
-+#define CMD17   17
-+#define CMD18   18
-+#define CMD24   24
-+#define CMD25   25
-+#define CMD27   27
-+#define CMD28   28
-+#define CMD29   29
-+#define CMD30   30
-+#define CMD32   32
-+#define CMD33   33
-+#define CMD38   38
-+#define CMD42   42
-+#define CMD52   52
-+#define CMD53   53
-+#define CMD55   55
-+#define CMD56   56
-+#define CMD58   58
-+#define CMD59   59
-+#define ACMD6   6
-+#define ACMD13  13
-+#define ACMD22  22
-+#define ACMD23  23
-+#define ACMD41  41
-+#define ACMD42  42
-+#define ACMD51  51
-+
-+#define SD_ACMD6_BUS_WIDTH_1_BIT         0x00
-+#define SD_ACMD6_BUS_WIDTH_4_BIT         0x02
-+
-+#define SD_CMD59_CRC_OFF            0x00000000
-+#define SD_CMD59_CRC_ON             0x00000001
-+
-+/* SD/SPI max response size */
-+#define SD_MAX_CMD_RESPONSE_BYTES SD_R2_RESPONSE_BYTES
-+
-+#define SD_R1_RESPONSE_BYTES  6
-+#define SD_R1B_RESPONSE_BYTES SD_R1_RESPONSE_BYTES
-+#define SD_R1_GET_CMD(pR) ((pR)[5] & 0xC0))
-+#define SD_R1_SET_CMD(pR,cmd)  (pR)[5] = (cmd) & 0xC0
-+#define SD_R1_GET_CARD_STATUS(pR) (((UINT32)((pR)[1]))        |  \
-+                                  (((UINT32)((pR)[2])) << 8)  |  \
-+                                  (((UINT32)((pR)[3])) << 16) |  \
-+                                  (((UINT32)((pR)[4])) << 24) )
-+#define SD_R1_SET_CMD_STATUS(pR,status) \
-+{                                      \
-+    (pR)[1] = (UINT8)(status);         \
-+    (pR)[2] = (UINT8)((status) >> 8);  \
-+    (pR)[3] = (UINT8)((status) >> 16); \
-+    (pR)[4] = (UINT8)((status) >> 24); \
-+}
-+
-+/* SD R1 card status bit masks */
-+#define SD_CS_CMD_OUT_OF_RANGE  ((UINT32)(1 << 31))
-+#define SD_CS_ADDRESS_ERR       (1 << 30)
-+#define SD_CS_BLK_LEN_ERR       (1 << 29)
-+#define SD_CS_ERASE_SEQ_ERR     (1 << 28)
-+#define SD_CS_ERASE_PARAM_ERR   (1 << 27)
-+#define SD_CS_WP_ERR            (1 << 26)
-+#define SD_CS_CARD_LOCKED       (1 << 25)
-+#define SD_CS_LK_UNLK_FAILED    (1 << 24)
-+#define SD_CS_PREV_CMD_CRC_ERR  (1 << 23)
-+#define SD_CS_ILLEGAL_CMD_ERR   (1 << 22)
-+#define SD_CS_ECC_FAILED        (1 << 21)
-+#define SD_CS_CARD_INTERNAL_ERR (1 << 20)
-+#define SD_CS_GENERAL_ERR       (1 << 19)
-+#define SD_CS_CSD_OVERWR_ERR    (1 << 16)
-+#define SD_CS_WP_ERASE_SKIP     (1 << 15)
-+#define SD_CS_ECC_DISABLED      (1 << 14)
-+#define SD_CS_ERASE_RESET       (1 << 13)
-+#define SD_CS_GET_STATE(status) (((status) >> 9) & 0x0f)
-+#define SD_CS_SET_STATE(status, state) \
-+{                               \
-+    (status) &= ~(0x0F << 9);   \
-+    (status) |= (state) << 9    \
-+}
-+
-+#define SD_CS_TRANSFER_ERRORS \
-+                ( SD_CS_ADDRESS_ERR       | \
-+                  SD_CS_BLK_LEN_ERR       | \
-+                  SD_CS_ERASE_SEQ_ERR     | \
-+                  SD_CS_ERASE_PARAM_ERR   | \
-+                  SD_CS_WP_ERR            | \
-+                  SD_CS_ECC_FAILED        | \
-+                  SD_CS_CARD_INTERNAL_ERR | \
-+                  SD_CS_GENERAL_ERR )
-+
-+#define SD_CS_STATE_IDLE   0
-+#define SD_CS_STATE_READY  1
-+#define SD_CS_STATE_IDENT  2
-+#define SD_CS_STATE_STBY   3
-+#define SD_CS_STATE_TRANS  4
-+#define SD_CS_STATE_DATA   5
-+#define SD_CS_STATE_RCV    6
-+#define SD_CS_STATE_PRG    7
-+#define SD_CS_STATE_DIS    8
-+#define SD_CS_READY_FOR_DATA    (1 << 8)
-+#define SD_CS_APP_CMD           (1 << 5)
-+#define SD_CS_AKE_SEQ_ERR       (1 << 3)
-+
-+/* SD R2 response */
-+#define SD_R2_RESPONSE_BYTES  17
-+#define MAX_CSD_CID_BYTES     16
-+#define SD_R2_SET_STUFF_BITS(pR)   (pR)[16] = 0x3F
-+#define GET_SD_CSD_TRANS_SPEED(pR) (pR)[12]
-+#define GET_SD_CID_MANFID(pR)      (pR)[15]
-+#define GET_SD_CID_PN_1(pR)        (pR)[12]
-+#define GET_SD_CID_PN_2(pR)        (pR)[11]
-+#define GET_SD_CID_PN_3(pR)        (pR)[10]
-+#define GET_SD_CID_PN_4(pR)        (pR)[9]
-+#define GET_SD_CID_PN_5(pR)        (pR)[8]
-+#define GET_SD_CID_PN_6(pR)        (pR)[7]
-+
-+#define GET_SD_CID_OEMID(pR)      ((((UINT16)(pR)[14]) << 8 )| (UINT16)((pR)[13]))
-+#define SDMMC_OCR_VOLTAGE_MASK 0x7FFFFFFF
-+/* SD R3 response */
-+#define SD_R3_RESPONSE_BYTES 6
-+#define SD_R3_GET_OCR(pR) ((((UINT32)((pR)[1])) |  \
-+                           (((UINT32)((pR)[2])) << 8)  |  \
-+                           (((UINT32)((pR)[3])) << 16) | \
-+                           (((UINT32)((pR)[4])) << 24)) & SDMMC_OCR_VOLTAGE_MASK)
-+#define SD_R3_IS_CARD_READY(pR)  (((pR)[4] & 0x80) == 0x80)
-+
-+/* OCR bit definitions */
-+#define SD_OCR_CARD_PWR_UP_STATUS  ((UINT32)(1 << 31))
-+#define SD_OCR_3_5_TO_3_6_VDD      (1 << 23)
-+#define SD_OCR_3_4_TO_3_5_VDD      (1 << 22)
-+#define SD_OCR_3_3_TO_3_4_VDD      (1 << 21)
-+#define SD_OCR_3_2_TO_3_3_VDD      (1 << 20)
-+#define SD_OCR_3_1_TO_3_2_VDD      (1 << 19)
-+#define SD_OCR_3_0_TO_3_1_VDD      (1 << 18)
-+#define SD_OCR_2_9_TO_3_0_VDD      (1 << 17)
-+#define SD_OCR_2_8_TO_2_9_VDD      (1 << 16)
-+#define SD_OCR_2_7_TO_2_8_VDD      (1 << 15)
-+#define SD_OCR_2_6_TO_2_7_VDD      (1 << 14)
-+#define SD_OCR_2_5_TO_2_6_VDD      (1 << 13)
-+#define SD_OCR_2_4_TO_2_5_VDD      (1 << 12)
-+#define SD_OCR_2_3_TO_2_4_VDD      (1 << 11)
-+#define SD_OCR_2_2_TO_2_3_VDD      (1 << 10)
-+#define SD_OCR_2_1_TO_2_2_VDD      (1 << 9)
-+#define SD_OCR_2_0_TO_2_1_VDD      (1 << 8)
-+#define SD_OCR_1_9_TO_2_0_VDD      (1 << 7)
-+#define SD_OCR_1_8_TO_1_9_VDD      (1 << 6)
-+#define SD_OCR_1_7_TO_1_8_VDD      (1 << 5)
-+#define SD_OCR_1_6_TO_1_7_VDD      (1 << 4)
-+
-+/* SD Status data block */
-+#define SD_STATUS_DATA_BYTES        64
-+#define SDS_GET_DATA_WIDTH(buffer)  ((buffer)[0] & 0xC0)
-+#define SDS_BUS_1_BIT               0x00
-+#define SDS_BUS_4_BIT               0x80
-+#define SDS_GET_SECURE_MODE(buffer) ((buffer)[0] & 0x20)
-+#define SDS_CARD_SECURE_MODE        0x20
-+#define SDS_GET_CARD_TYPE(buffer)   ((buffer)[60] & 0x0F)
-+#define SDS_SD_CARD_RW              0x00
-+#define SDS_SD_CARD_ROM             0x01
-+
-+/* SD R6 response */
-+#define SD_R6_RESPONSE_BYTES 6
-+#define SD_R6_GET_RCA(pR) ((UINT16)((pR)[3]) | (((UINT16)((pR)[4])) << 8))
-+#define SD_R6_GET_CS(pR)  ((UINT16)((pR)[1]) | (((UINT16)((pR)[2])) << 8))
-+
-+/* SD Configuration Register (SCR) */
-+#define SD_SCR_BYTES            8
-+#define SCR_REV_1_0             0x00
-+#define SCR_SD_SPEC_1_00        0x00
-+#define SCR_SD_SPEC_1_10        0x01
-+#define SCR_BUS_SUPPORTS_1_BIT  0x01
-+#define SCR_BUS_SUPPORTS_4_BIT  0x04
-+#define SCR_SD_SECURITY_MASK    0x70
-+#define SCR_SD_NO_SECURITY      0x00
-+#define SCR_SD_SECURITY_1_0     0x10
-+#define SCR_SD_SECURITY_2_0     0x20
-+#define SCR_DATA_STATUS_1_AFTER_ERASE  0x80
-+
-+#define GET_SD_SCR_STRUCT_VER(pB) ((pB)[7] >> 4)
-+#define GET_SD_SCR_SDSPEC_VER(pB) ((pB)[7] & 0x0F)
-+#define GET_SD_SCR_BUSWIDTHS(pB)  ((pB)[6] & 0x0F)
-+#define GET_SD_SCR_BUSWIDTHS_FLAGS(pB)  (pB)[6]
-+#define GET_SD_SCR_SECURITY(pB)   (((pB)[6] >> 4) & 0x07)
-+#define GET_SD_SCR_DATA_STAT_AFTER_ERASE(pB) (((pB)[6] >> 7) & 0x01)
-+
-+/* SDIO R4 Response */
-+#define SD_SDIO_R4_RESPONSE_BYTES 6
-+#define SD_SDIO_R4_GET_OCR(pR) ((UINT32)((pR)[1])        |  \
-+                          (((UINT32)(pR)[2]) << 8)  |  \
-+                          (((UINT32)(pR)[3]) << 16))
-+#define SD_SDIO_R4_IS_MEMORY_PRESENT(pR)   (((pR)[4] & 0x08) == 0x08)
-+#define SD_SDIO_R4_GET_IO_FUNC_COUNT(pR)   (((pR)[4] >> 4) & 0x07)
-+#define SD_SDIO_R4_IS_CARD_READY(pR)       (((pR)[4] & 0x80) == 0x80)
-+
-+/* SDIO R5 response */
-+#define SD_SDIO_R5_RESPONSE_BYTES      6
-+#define SD_SDIO_R5_READ_DATA_OFFSET    1
-+#define SD_R5_GET_READ_DATA(pR)  (pR)[SD_SDIO_R5_READ_DATA_OFFSET]
-+#define SD_R5_RESP_FLAGS_OFFSET   2
-+#define SD_R5_GET_RESP_FLAGS(pR) (pR)[SD_R5_RESP_FLAGS_OFFSET]
-+#define SD_R5_SET_CMD(pR,cmd)  (pR)[5] = (cmd) & 0xC0
-+#define SD_R5_RESP_CMD_ERR  (1 << 7) /* for previous cmd */
-+#define SD_R5_ILLEGAL_CMD   (1 << 6)
-+#define SD_R5_GENERAL_ERR   (1 << 3)
-+#define SD_R5_INVALID_FUNC  (1 << 1)
-+#define SD_R5_ARG_RANGE_ERR (1 << 0)
-+#define SD_R5_CURRENT_CMD_ERRORS (SD_R5_ILLEGAL_CMD | SD_R5_GENERAL_ERR \
-+                                 | SD_R5_INVALID_FUNC | SD_R5_ARG_RANGE_ERR)
-+#define SD_R5_ERRORS (SD_R5_CURRENT_CMD_ERRORS)
-+
-+#define SD_R5_GET_IO_STATE(pR) (((pR)[2] >> 4) & 0x03)
-+#define SD_R5_STATE_DIS 0x00
-+#define SD_R5_STATE_CMD 0x01
-+#define SD_R5_STATE_TRN 0x02
-+
-+/* SDIO Modified R6 Response */
-+#define SD_SDIO_R6_RESPONSE_BYTES 6
-+#define SD_SDIO_R6_GET_RCA(pR)  ((UINT16)((pR)[3]) | ((UINT16)((pR)[4]) << 8))
-+#define SD_SDIO_R6_GET_CSTAT(pR)((UINT16)((pR)[1]) | ((UINT16)((pR)[2]) << 8))
-+
-+/* SPI mode R1 response */
-+#define SPI_R1_RESPONSE_BYTES   1
-+#define GET_SPI_R1_RESP_TOKEN(pR) (pR)[0]
-+#define SPI_CS_STATE_IDLE       0x01
-+#define SPI_CS_ERASE_RESET      (1 << 1)
-+#define SPI_CS_ILLEGAL_CMD      (1 << 2)
-+#define SPI_CS_CMD_CRC_ERR      (1 << 3)
-+#define SPI_CS_ERASE_SEQ_ERR    (1 << 4)
-+#define SPI_CS_ADDRESS_ERR      (1 << 5)
-+#define SPI_CS_PARAM_ERR        (1 << 6)
-+#define SPI_CS_ERR_MASK         0x7c
-+
-+/* SPI mode R2 response */
-+#define SPI_R2_RESPONSE_BYTES  2
-+#define GET_SPI_R2_RESP_TOKEN(pR)   (pR)[1]
-+#define GET_SPI_R2_STATUS_TOKEN(pR) (pR)[0]
-+/* the first response byte is defined above */
-+/* the second response byte is defined below */
-+#define SPI_CS_CARD_IS_LOCKED      (1 << 0)
-+#define SPI_CS_LOCK_UNLOCK_FAILED  (1 << 1)
-+#define SPI_CS_ERROR               (1 << 2)
-+#define SPI_CS_INTERNAL_ERROR      (1 << 3)
-+#define SPI_CS_ECC_FAILED          (1 << 4)
-+#define SPI_CS_WP_VIOLATION        (1 << 5)
-+#define SPI_CS_ERASE_PARAM_ERR     (1 << 6)
-+#define SPI_CS_OUT_OF_RANGE        (1 << 7)
-+
-+/* SPI mode R3 response */
-+#define SPI_R3_RESPONSE_BYTES 5
-+#define SPI_R3_GET_OCR(pR) ((((UINT32)((pR)[0])) |         \
-+                            (((UINT32)((pR)[1])) << 8)  |  \
-+                            (((UINT32)((pR)[2])) << 16) |  \
-+                            (((UINT32)((pR)[3])) << 24)) & SDMMC_OCR_VOLTAGE_MASK)
-+#define SPI_R3_IS_CARD_READY(pR)  (((pR)[3] & 0x80) == 0x80)
-+#define GET_SPI_R3_RESP_TOKEN(pR) (pR)[4]
-+
-+/* SPI mode SDIO R4 response */
-+#define SPI_SDIO_R4_RESPONSE_BYTES 5
-+#define SPI_SDIO_R4_GET_OCR(pR) ((UINT32)((pR)[0])        |  \
-+                          (((UINT32)(pR)[1]) << 8)   |  \
-+                          (((UINT32)(pR)[2]) << 16))
-+#define SPI_SDIO_R4_IS_MEMORY_PRESENT(pR)   (((pR)[3] & 0x08) == 0x08)
-+#define SPI_SDIO_R4_GET_IO_FUNC_COUNT(pR)   (((pR)[3] >> 4) & 0x07)
-+#define SPI_SDIO_R4_IS_CARD_READY(pR)       (((pR)[3] & 0x80) == 0x80)
-+#define GET_SPI_SDIO_R4_RESP_TOKEN(pR)  (pR)[4]
-+
-+/* SPI Mode SDIO R5 response */
-+#define SPI_SDIO_R5_RESPONSE_BYTES 2
-+#define GET_SPI_SDIO_R5_RESP_TOKEN(pR)     (pR)[1]
-+#define GET_SPI_SDIO_R5_RESPONSE_RDATA(pR) (pR)[0]
-+#define SPI_R5_IDLE_STATE   0x01
-+#define SPI_R5_ILLEGAL_CMD  (1 << 2)
-+#define SPI_R5_CMD_CRC      (1 << 3)
-+#define SPI_R5_FUNC_ERR     (1 << 4)
-+#define SPI_R5_PARAM_ERR    (1 << 6)
-+
-+/* SDIO COMMAND 52 Definitions */
-+#define CMD52_READ  0
-+#define CMD52_WRITE 1
-+#define CMD52_READ_AFTER_WRITE 1
-+#define CMD52_NORMAL_WRITE     0
-+#define SDIO_SET_CMD52_ARG(arg,rw,func,raw,address,writedata) \
-+    (arg) = (((rw) & 1) << 31)           | \
-+            (((func) & 0x7) << 28)       | \
-+            (((raw) & 1) << 27)          | \
-+            (1 << 26)                    | \
-+            (((address) & 0x1FFFF) << 9) | \
-+            (1 << 8)                     | \
-+            ((writedata) & 0xFF)
-+#define SDIO_SET_CMD52_READ_ARG(arg,func,address) \
-+    SDIO_SET_CMD52_ARG(arg,CMD52_READ,(func),0,address,0x00)
-+#define SDIO_SET_CMD52_WRITE_ARG(arg,func,address,value) \
-+    SDIO_SET_CMD52_ARG(arg,CMD52_WRITE,(func),CMD52_NORMAL_WRITE,address,value)
-+
-+/* SDIO COMMAND 53 Definitions */
-+#define CMD53_READ          0
-+#define CMD53_WRITE         1
-+#define CMD53_BLOCK_BASIS   1
-+#define CMD53_BYTE_BASIS    0
-+#define CMD53_FIXED_ADDRESS 0
-+#define CMD53_INCR_ADDRESS  1
-+#define SDIO_SET_CMD53_ARG(arg,rw,func,mode,opcode,address,bytes_blocks) \
-+    (arg) = (((rw) & 1) << 31)                  | \
-+            (((func) & 0x7) << 28)              | \
-+            (((mode) & 1) << 27)                | \
-+            (((opcode) & 1) << 26)              | \
-+            (((address) & 0x1FFFF) << 9)        | \
-+            ((bytes_blocks) & 0x1FF)
-+
-+#define SDIO_MAX_LENGTH_BYTE_BASIS  512
-+#define SDIO_MAX_BLOCKS_BLOCK_BASIS 511
-+#define SDIO_MAX_BYTES_PER_BLOCK    2048
-+#define SDIO_COMMON_AREA_FUNCTION_NUMBER 0
-+#define SDIO_FIRST_FUNCTION_NUMBER       1
-+#define SDIO_LAST_FUNCTION_NUMBER        7
-+
-+#define CMD53_CONVERT_BYTE_BASIS_BLK_LENGTH_PARAM(b) (((b) < SDIO_MAX_LENGTH_BYTE_BASIS) ? (b) : 0)
-+#define CMD53_CONVERT_BLOCK_BASIS_BLK_COUNT_PARAM(b) (((b) <= SDIO_MAX_BLOCKS_BLOCK_BASIS) ? (b) : 0)
-+
-+
-+/* SDIO COMMON Registers */
-+
-+/* revision register */
-+#define CCCR_SDIO_REVISION_REG  0x00
-+#define CCCR_REV_MASK           0x0F
-+#define CCCR_REV_1_0            0x00
-+#define CCCR_REV_1_1            0x01
-+#define SDIO_REV_MASK           0xF0
-+#define SDIO_REV_1_00           0x00
-+#define SDIO_REV_1_10           0x10
-+#define SDIO_REV_1_20           0x20
-+/* SD physical spec revision */
-+#define SD_SPEC_REVISION_REG    0x01
-+#define SD_REV_MASK             0x0F
-+#define SD_REV_1_01             0x00
-+#define SD_REV_1_10             0x01
-+/* I/O Enable  */
-+#define SDIO_ENABLE_REG         0x02
-+/* I/O Ready */
-+#define SDIO_READY_REG          0x03
-+/* Interrupt Enable */
-+#define SDIO_INT_ENABLE_REG     0x04
-+#define SDIO_INT_MASTER_ENABLE  0x01
-+#define SDIO_INT_ALL_ENABLE     0xFE
-+/* Interrupt Pending */
-+#define SDIO_INT_PENDING_REG    0x05
-+#define SDIO_INT_PEND_MASK      0xFE
-+/* I/O Abort */
-+#define SDIO_IO_ABORT_REG       0x06
-+#define SDIO_IO_RESET           (1 << 3)
-+/* Bus Interface */
-+#define SDIO_BUS_IF_REG         0x07
-+#define CARD_DETECT_DISABLE     0x80
-+#define SDIO_BUS_WIDTH_1_BIT    0x00
-+#define SDIO_BUS_WIDTH_4_BIT    0x02
-+/* Card Capabilities */
-+#define SDIO_CARD_CAPS_REG          0x08
-+#define SDIO_CAPS_CMD52_WHILE_DATA  0x01   /* card can issue CMD52 while data transfer */
-+#define SDIO_CAPS_MULTI_BLOCK       0x02   /* card supports multi-block data transfers */
-+#define SDIO_CAPS_READ_WAIT         0x04   /* card supports read-wait protocol */
-+#define SDIO_CAPS_SUSPEND_RESUME    0x08   /* card supports I/O function suspend/resume */
-+#define SDIO_CAPS_INT_MULTI_BLK     0x10   /* interrupts between multi-block data capable */
-+#define SDIO_CAPS_ENB_INT_MULTI_BLK 0x20   /* enable ints between muli-block data */
-+#define SDIO_CAPS_LOW_SPEED         0x40   /* low speed card */
-+#define SDIO_CAPS_4BIT_LS           0x80   /* 4 bit low speed card */
-+/* Common CIS pointer */
-+#define SDIO_CMN_CIS_PTR_LOW_REG    0x09
-+#define SDIO_CMN_CIS_PTR_MID_REG    0x0a
-+#define SDIO_CMN_CIS_PTR_HI_REG     0x0b
-+/* Bus suspend */
-+#define SDIO_BUS_SUSPEND_REG            0x0c
-+#define SDIO_FUNC_SUSPEND_STATUS_MASK   0x01 /* selected function is suspended */
-+#define SDIO_SUSPEND_FUNCTION           0x02 /* suspend the current selected function */
-+/* Function select (for bus suspension) */
-+#define SDIO_FUNCTION_SELECT_REG        0x0d
-+#define SDIO_SUSPEND_FUNCTION_0         0x00
-+#define SDIO_SUSPEND_MEMORY_FUNC_MASK    0x08
-+/* Function Execution */
-+#define SDIO_FUNCTION_EXEC_REG          0x0e
-+#define SDIO_MEMORY_FUNC_EXEC_MASK      0x01
-+/* Function Ready */
-+#define SDIO_FUNCTION_READY_REG          0x0f
-+#define SDIO_MEMORY_FUNC_BUSY_MASK       0x01
-+
-+/* power control 1.10 only  */
-+#define SDIO_POWER_CONTROL_REG            0x12
-+#define SDIO_POWER_CONTROL_SMPC           0x01
-+#define SDIO_POWER_CONTROL_EMPC           0x02
-+
-+/* high speed control , 1.20 only */
-+#define SDIO_HS_CONTROL_REG               0x13
-+#define SDIO_HS_CONTROL_SHS               0x01
-+#define SDIO_HS_CONTROL_EHS               0x02
-+
-+/* Function Base Registers */
-+#define xFUNCTION_FBR_OFFSET(funcNo) (0x100*(funcNo))
-+/* offset calculation that does not use multiplication */
-+static INLINE UINT32 CalculateFBROffset(UCHAR FuncNo) {
-+    UCHAR i = FuncNo;
-+    UINT32 offset = 0;
-+    while (i) {
-+        offset += 0x100;
-+        i--;
-+    }
-+    return offset;
-+}
-+/* Function info */
-+#define FBR_FUNC_INFO_REG_OFFSET(fbr)   ((fbr) + 0x00)
-+#define FUNC_INFO_SUPPORTS_CSA_MASK     0x40
-+#define FUNC_INFO_ENABLE_CSA            0x80
-+#define FUNC_INFO_DEVICE_CODE_MASK      0x0F
-+#define FUNC_INFO_DEVICE_CODE_LAST      0x0F
-+#define FBR_FUNC_EXT_DEVICE_CODE_OFFSET(fbr) ((fbr) + 0x01)
-+/* Function Power selection */
-+#define FBR_FUNC_POWER_SELECT_OFFSET(fbr)    ((fbr) + 0x02)
-+#define FUNC_POWER_SELECT_SPS           0x01
-+#define FUNC_POWER_SELECT_EPS           0x02
-+/* Function CIS ptr */
-+#define FBR_FUNC_CIS_LOW_OFFSET(fbr)   ((fbr) + 0x09)
-+#define FBR_FUNC_CIS_MID_OFFSET(fbr)   ((fbr) + 0x0a)
-+#define FBR_FUNC_CIS_HI_OFFSET(fbr)    ((fbr) + 0x0b)
-+/* Function CSA ptr */
-+#define FBR_FUNC_CSA_LOW_OFFSET(fbr)   ((fbr) + 0x0c)
-+#define FBR_FUNC_CSA_MID_OFFSET(fbr)   ((fbr) + 0x0d)
-+#define FBR_FUNC_CSA_HI_OFFSET(fbr)    ((fbr) + 0x0e)
-+/* Function CSA data window */
-+#define FBR_FUNC_CSA_DATA_OFFSET(fbr)  ((fbr) + 0x0f)
-+/* Function Block Size Control */
-+#define FBR_FUNC_BLK_SIZE_LOW_OFFSET(fbr)  ((fbr) + 0x10)
-+#define FBR_FUNC_BLK_SIZE_HI_OFFSET(fbr)   ((fbr) + 0x11)
-+#define SDIO_CIS_AREA_BEGIN   0x00001000
-+#define SDIO_CIS_AREA_END     0x00017fff
-+/* Tuple definitions */
-+#define CISTPL_NULL         0x00
-+#define CISTPL_CHECKSUM     0x10
-+#define CISTPL_VERS_1       0x15
-+#define CISTPL_ALTSTR       0x16
-+#define CISTPL_MANFID       0x20
-+#define CISTPL_FUNCID       0x21
-+#define CISTPL_FUNCE        0x22
-+#define CISTPL_VENDOR       0x91
-+#define CISTPL_END          0xff
-+#define CISTPL_LINK_END     0xff
-+
-+
-+/* these structures must be packed */
-+
-+/* Manufacturer ID tuple */
-+struct SDIO_MANFID_TPL {
-+    UINT16  ManufacturerCode;   /* jedec code */
-+    UINT16  ManufacturerInfo;   /* manufacturer specific code */
-+}CT_PACK_STRUCT;
-+
-+/* Function ID Tuple */
-+struct SDIO_FUNC_ID_TPL {
-+    UINT8  DeviceCode;  /* device code */
-+    UINT8  InitMask;    /* system initialization mask (not used) */
-+}CT_PACK_STRUCT;
-+
-+    /* Extended Function Tuple (Common) */
-+struct SDIO_FUNC_EXT_COMMON_TPL {
-+    UINT8   Type;                               /* type */
-+    UINT16  Func0_MaxBlockSize;                 /* max function 0 block transfer size */
-+    UINT8   MaxTransSpeed;                      /* max transfer speed (encoded) */
-+#define TRANSFER_UNIT_MULTIPIER_MASK  0x07
-+#define TIME_VALUE_MASK               0x78
-+#define TIME_VALUE_SHIFT              3
-+}CT_PACK_STRUCT;
-+
-+/* Extended Function Tuple (Per Function) */
-+struct SDIO_FUNC_EXT_FUNCTION_TPL {
-+    UINT8   Type;                               /* type */
-+#define SDIO_FUNC_INFO_WAKEUP_SUPPORT 0x01
-+    UINT8   FunctionInfo;                       /* function info */
-+    UINT8   SDIORev;                            /* revision */
-+    UINT32  CardPSN;                            /* product serial number */
-+    UINT32  CSASize;                            /* CSA size */
-+    UINT8   CSAProperties;                      /* CSA properties */
-+    UINT16  MaxBlockSize;                       /* max block size for block transfers */
-+    UINT32  FunctionOCR;                        /* optimal function OCR */
-+    UINT8   OpMinPwr;                           /* operational min power */
-+    UINT8   OpAvgPwr;                           /* operational average power */
-+    UINT8   OpMaxPwr;                           /* operation maximum power */
-+    UINT8   SbMinPwr;                           /* standby minimum power */
-+    UINT8   SbAvgPwr;                           /* standby average power */
-+    UINT8   SbMaxPwr;                           /* standby maximum power */
-+    UINT16  MinBandWidth;                       /* minimum bus bandwidth */
-+    UINT16  OptBandWidth;                       /* optimalbus bandwitdh */
-+}CT_PACK_STRUCT;
-+
-+struct SDIO_FUNC_EXT_FUNCTION_TPL_1_1 {
-+    struct SDIO_FUNC_EXT_FUNCTION_TPL CommonInfo;  /* from 1.0*/
-+    UINT16  EnableTimeOut;                  /* timeout for enable */
-+    UINT16  OperPwrMaxPwr;
-+    UINT16  OperPwrAvgPwr;
-+    UINT16  HiPwrMaxPwr;
-+    UINT16  HiPwrAvgPwr;
-+    UINT16  LowPwrMaxPwr;
-+    UINT16  LowPwrAvgPwr;
-+}CT_PACK_STRUCT;
-+
-+static INLINE SDIO_STATUS ConvertCMD52ResponseToSDIOStatus(UINT8 CMD52ResponseFlags) {
-+    if (!(CMD52ResponseFlags & SD_R5_ERRORS)) {
-+        return SDIO_STATUS_SUCCESS;
-+    }
-+    if (CMD52ResponseFlags & SD_R5_ILLEGAL_CMD) {
-+        return SDIO_STATUS_DATA_STATE_INVALID;
-+    } else if (CMD52ResponseFlags & SD_R5_INVALID_FUNC) {
-+        return SDIO_STATUS_INVALID_FUNC;
-+    } else if (CMD52ResponseFlags & SD_R5_ARG_RANGE_ERR) {
-+        return SDIO_STATUS_FUNC_ARG_ERROR;
-+    } else {
-+        return SDIO_STATUS_DATA_ERROR_UNKNOWN;
-+    }
-+}
-+
-+/* CMD6 mode switch definitions */
-+
-+#define SD_SWITCH_FUNC_CHECK    0
-+#define SD_SWITCH_FUNC_SET      ((UINT32)(1 << 31))
-+#define SD_FUNC_NO_SELECT_MASK  0x00FFFFFF
-+#define SD_SWITCH_GRP_1         0
-+#define SD_SWITCH_GRP_2         1
-+#define SD_SWITCH_GRP_3         2
-+#define SD_SWITCH_GRP_4         3
-+#define SD_SWITCH_GRP_5         4
-+#define SD_SWITCH_GRP_6         5
-+
-+#define SD_SWITCH_HIGH_SPEED_GROUP     SD_SWITCH_GRP_1
-+#define SD_SWITCH_HIGH_SPEED_FUNC_NO   1
-+
-+#define SD_SWITCH_MAKE_SHIFT(grp) ((grp) * 4)
-+
-+#define SD_SWITCH_MAKE_GRP_PATTERN(FuncGrp,FuncNo) \
-+     ((SD_FUNC_NO_SELECT_MASK & (~(0xF << SD_SWITCH_MAKE_SHIFT(FuncGrp)))) |  \
-+        (((FuncNo) & 0xF) << SD_SWITCH_MAKE_SHIFT(FuncGrp)))                 \
-+
-+#define SD_SWITCH_FUNC_ARG_GROUP_CHECK(FuncGrp,FuncNo) \
-+    (SD_SWITCH_FUNC_CHECK | SD_SWITCH_MAKE_GRP_PATTERN(FuncGrp,FuncNo))
-+
-+#define SD_SWITCH_FUNC_ARG_GROUP_SET(FuncGrp,FuncNo)   \
-+    (SD_SWITCH_FUNC_SET | SD_SWITCH_MAKE_GRP_PATTERN(FuncGrp,FuncNo))
-+
-+#define SD_SWITCH_FUNC_STATUS_BLOCK_BYTES 64
-+
-+#define SD_SWITCH_FUNC_STATUS_GET_GRP_BIT_MASK(pBuffer,FuncGrp) \
-+    (USHORT)((pBuffer)[50 + ((FuncGrp)*2)] | ((pBuffer)[51 + ((FuncGrp)*2)] << 8))
-+
-+#define SD_SWITCH_FUNC_STATUS_GET_MAX_CURRENT(pBuffer) \
-+     (USHORT)((pBuffer)[62] | ((pBuffer)[63] << 8))
-+
-+static INLINE UINT8 SDSwitchGetSwitchResult(PUINT8 pBuffer, UINT8 FuncGrp)
-+{
-+    switch (FuncGrp) {
-+        case 0:
-+            return (pBuffer[47] & 0xF);
-+        case 1:
-+            return (pBuffer[47] >> 4);
-+        case 2:
-+            return (pBuffer[48] & 0xF);
-+        case 3:
-+            return (pBuffer[48] >> 4);
-+        case 4:
-+            return (pBuffer[49] & 0xF);
-+        case 5:
-+            return (pBuffer[49] >> 4);
-+        default:
-+            return 0xF;
-+    }
-+}
-+
-+#endif
-diff --git a/include/linux/sdio/ctsystem.h b/include/linux/sdio/ctsystem.h
-new file mode 100644
-index 0000000..4f72739
---- /dev/null
-+++ b/include/linux/sdio/ctsystem.h
-@@ -0,0 +1,115 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: cpsystem.h
-+
-+@abstract: common system include file.
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#ifndef __CPSYSTEM_H___
-+#define __CPSYSTEM_H___
-+
-+/* SDIO stack status defines */
-+/* < 0 error, >0 warning, 0 success */
-+#define SDIO_IS_WARNING(status) ((status) > 0)
-+#define SDIO_IS_ERROR(status) ((status) < 0)
-+#define SDIO_SUCCESS(status) ((SDIO_STATUS)(status) >= 0)
-+#define SDIO_STATUS_SUCCESS             0
-+#define SDIO_STATUS_ERROR              -1
-+#define SDIO_STATUS_INVALID_PARAMETER  -2
-+#define SDIO_STATUS_PENDING             3
-+#define SDIO_STATUS_DEVICE_NOT_FOUND   -4
-+#define SDIO_STATUS_DEVICE_ERROR       -5
-+#define SDIO_STATUS_INTERRUPTED        -6
-+#define SDIO_STATUS_NO_RESOURCES       -7
-+#define SDIO_STATUS_CANCELED           -8
-+#define SDIO_STATUS_BUFFER_TOO_SMALL   -9
-+#define SDIO_STATUS_NO_MORE_MESSAGES   -10
-+#define SDIO_STATUS_BUS_RESP_TIMEOUT   -20    /* response timed-out */
-+#define SDIO_STATUS_BUS_READ_TIMEOUT   -21    /* read data timed-out */
-+#define SDIO_STATUS_BUS_READ_CRC_ERR   -22   /* data CRC failed */
-+#define SDIO_STATUS_BUS_WRITE_ERROR    -23   /* write failed */
-+#define SDIO_STATUS_BUS_RESP_CRC_ERR   -24   /* response received with a CRC error */
-+#define SDIO_STATUS_INVALID_TUPLE_LENGTH -25 /* tuple length was invalid */
-+#define SDIO_STATUS_TUPLE_NOT_FOUND      -26 /* tuple could not be found */
-+#define SDIO_STATUS_CIS_OUT_OF_RANGE     -27 /* CIS is out of range in the tuple scan */
-+#define SDIO_STATUS_FUNC_ENABLE_TIMEOUT  -28 /* card timed out enabling or disabling */
-+#define SDIO_STATUS_DATA_STATE_INVALID   -29 /* card is in an invalid state for data */
-+#define SDIO_STATUS_DATA_ERROR_UNKNOWN   -30 /* card cannot process data transfer */
-+#define SDIO_STATUS_INVALID_FUNC         -31 /* sdio request is not valid for the function */
-+#define SDIO_STATUS_FUNC_ARG_ERROR       -32 /* sdio request argument is invalid or out of range */
-+#define SDIO_STATUS_INVALID_COMMAND      -33 /* SD COMMAND is invalid for the card state */
-+#define SDIO_STATUS_SDREQ_QUEUE_FAILED   -34 /* request failed to insert into queue */
-+#define SDIO_STATUS_BUS_RESP_TIMEOUT_SHIFTABLE -35  /* response timed-out, possibily shiftable to correct  */
-+#define SDIO_STATUS_UNSUPPORTED          -36  /* not supported  */
-+#define SDIO_STATUS_PROGRAM_TIMEOUT      -37  /* memory card programming timeout  */
-+#define SDIO_STATUS_PROGRAM_STATUS_ERROR -38  /* memory card programming errors  */
-+
-+#include <linux/sdio/ctsystem_linux.h>
-+
-+/* get structure from contained field */
-+#define CONTAINING_STRUCT(address, struct_type, field_name)\
-+            ((struct_type *)((ULONG_PTR)(address) - (ULONG_PTR)(&((struct_type *)0)->field_name)))
-+
-+#define ZERO_OBJECT(obj) memset(&(obj),0,sizeof(obj))
-+#define ZERO_POBJECT(pObj) memset((pObj),0,sizeof(*(pObj)))
-+
-+
-+/* bit field support functions */
-+static INLINE void SetBit(PULONG pField, UINT position) {
-+    *pField |= 1 << position;
-+}
-+static INLINE void ClearBit(PULONG pField, UINT position) {
-+    *pField &= ~(1 << position);
-+}
-+static INLINE BOOL IsBitSet(PULONG pField, UINT position) {
-+    return (*pField & (1 << position));
-+}
-+static INLINE INT FirstClearBit(PULONG pField) {
-+    UINT ii;
-+    for(ii = 0; ii < sizeof(ULONG)*8; ii++) {
-+        if (!IsBitSet(pField, ii)) {
-+            return ii;
-+        }
-+    }
-+    /* no clear bits found */
-+    return -1;
-+}
-+
-+#endif /* __CPSYSTEM_H___ */
-diff --git a/include/linux/sdio/ctsystem_linux.h b/include/linux/sdio/ctsystem_linux.h
-new file mode 100644
-index 0000000..0de89a6
---- /dev/null
-+++ b/include/linux/sdio/ctsystem_linux.h
-@@ -0,0 +1,983 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: ctsystem_linux.h
-+
-+@abstract: common system include file for Linux.
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#ifndef __CPSYSTEM_LINUX_H___
-+#define __CPSYSTEM_LINUX_H___
-+
-+/* #define DBG_TIMESTAMP 1 */
-+#define SD_TRACK_REQ 1
-+
-+/* LINUX support */
-+#include <linux/version.h>
-+
-+#ifndef KERNEL_VERSION
-+  #error KERNEL_VERSION macro not defined!
-+#endif
-+
-+#ifndef  LINUX_VERSION_CODE
-+  #error LINUX_VERSION_CODE macro not defined!
-+#endif
-+
-+#include <linux/autoconf.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/types.h>
-+#include <linux/spinlock.h>
-+#include <linux/module.h>
-+
-+#include <linux/interrupt.h>
-+#include <linux/pnp.h>
-+#include <asm/hardirq.h>
-+#include <asm/semaphore.h>
-+#include <asm/io.h>
-+#include <asm/scatterlist.h>
-+#ifdef DBG_TIMESTAMP
-+#include <asm/timex.h>
-+#endif /* DBG_TIMESTAMP */
-+#ifndef in_atomic
-+    /* released version of 2.6.9 */
-+#include <linux/hardirq.h>
-+#endif
-+#include <linux/delay.h>
-+#include <linux/device.h>
-+
-+/* generic types */
-+typedef    unsigned char    UCHAR;
-+typedef    unsigned char *  PUCHAR;
-+typedef    char             TEXT;
-+typedef    char *           PTEXT;
-+typedef    unsigned short   USHORT;
-+typedef    unsigned short*  PUSHORT;
-+typedef    unsigned int     UINT;
-+typedef    unsigned int*    PUINT;
-+typedef    int              INT;
-+typedef    int*             PINT;
-+typedef    unsigned long    ULONG;
-+typedef    unsigned long*   PULONG;
-+typedef    u8               UINT8;
-+typedef    u16              UINT16;
-+typedef    u32              UINT32;
-+typedef    u8*              PUINT8;
-+typedef    u16*             PUINT16;
-+typedef    u32*             PUINT32;
-+typedef    unsigned char *  ULONG_PTR;
-+typedef    void*            PVOID;
-+typedef    unsigned char    BOOL;
-+typedef    BOOL*            PBOOL;
-+typedef    int              SDIO_STATUS;
-+typedef    int              SYSTEM_STATUS;
-+typedef    unsigned int     EVENT_TYPE;
-+typedef    unsigned int     EVENT_ARG;
-+typedef    unsigned int*    PEVENT_TYPE;
-+typedef    struct semaphore OS_SEMAPHORE;
-+typedef    struct semaphore* POS_SEMAPHORE;
-+typedef    struct semaphore  OS_SIGNAL;    /* OS signals are just semaphores */
-+typedef    struct semaphore* POS_SIGNAL;
-+typedef    spinlock_t OS_CRITICALSECTION;
-+typedef    spinlock_t *POS_CRITICALSECTION;
-+typedef    int              SDPOWER_STATE;
-+typedef    unsigned long    ATOMIC_FLAGS;
-+typedef    INT              THREAD_RETURN;
-+typedef    dma_addr_t       DMA_ADDRESS;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
-+typedef    struct task_struct* PKERNEL_TASK;
-+typedef    struct device_driver OS_DRIVER;
-+typedef    struct device_driver* POS_DRIVER;
-+typedef    struct device    OS_DEVICE;
-+typedef    struct device*   POS_DEVICE;
-+typedef    struct pnp_driver OS_PNPDRIVER;
-+typedef    struct pnp_driver* POS_PNPDRIVER;
-+typedef    struct pnp_dev   OS_PNPDEVICE;
-+typedef    struct pnp_dev*  POS_PNPDEVICE;
-+typedef    struct module*   POS_MODULE;
-+#else
-+/* 2.4 */
-+typedef    int              PKERNEL_TASK;
-+typedef    PVOID            OS_DRIVER;
-+typedef    PVOID*           POS_DRIVER;
-+typedef    PVOID            OS_DEVICE;
-+typedef    PVOID*           POS_DEVICE;
-+typedef    PVOID            OS_PNPDRIVER;
-+typedef    PVOID*           POS_PNPDRIVER;
-+typedef    PVOID            OS_PNPDEVICE;
-+typedef    PVOID*           POS_PNPDEVICE;
-+typedef    struct module*   POS_MODULE;
-+#define    module_param(a,b,c) MODULE_PARM(a, "i")
-+#endif
-+
-+typedef    int              CT_DEBUG_LEVEL;
-+
-+
-+#ifndef TRUE
-+#define TRUE 1
-+#endif
-+#ifndef FALSE
-+#define FALSE 0
-+#endif
-+#ifndef NULL
-+#define NULL ((PVOID)0)
-+#endif
-+#define SDDMA_DESCRIPTION_FLAG_DMA   0x1  /* DMA enabled */
-+#define SDDMA_DESCRIPTION_FLAG_SGDMA 0x2  /* Scatter-Gather DMA enabled */
-+typedef struct _SDDMA_DESCRIPTION {
-+    UINT16      Flags;      /* SDDMA_DESCRIPTION_FLAG_xxx */
-+    UINT16      MaxDescriptors; /* number of supported scatter gather entries */
-+    UINT32      MaxBytesPerDescriptor;  /* maximum bytes in a DMA descriptor entry */
-+    u64         Mask;              /* dma address mask */
-+    UINT32      AddressAlignment;  /* dma address alignment mask, least significant bits indicate illegal address bits */
-+    UINT32      LengthAlignment;   /* dma buffer length alignment mask, least significant bits indicate illegal length bits  */
-+}SDDMA_DESCRIPTION, *PSDDMA_DESCRIPTION;
-+typedef struct scatterlist SDDMA_DESCRIPTOR, *PSDDMA_DESCRIPTOR;
-+
-+#define INLINE  inline
-+#define CT_PACK_STRUCT __attribute__ ((packed))
-+
-+#define CT_DECLARE_MODULE_PARAM_INTEGER(p)  module_param(p, int, 0644);
-+
-+/* debug print macros */
-+//#define SDDBG_KERNEL_PRINT_LEVEL KERN_DEBUG
-+#define SDDBG_KERNEL_PRINT_LEVEL KERN_ALERT
-+#define DBG_MASK_NONE 0x0
-+#define DBG_MASK_HCD  0x100
-+#define DBG_MASK_LIB  0x200
-+#define DBG_MASK_BUS  0x400
-+
-+/* debug output levels, this must be order low number to higher */
-+#define SDDBG_ERROR 3
-+#define SDDBG_WARN  4
-+#define SDDBG_DEBUG 6
-+#define SDDBG_TRACE 7
-+#define SDDBG_ALL   0xff
-+
-+#define DBG_LEVEL_NONE  0
-+#define DBG_LEVEL_ERROR SDDBG_ERROR
-+#define DBG_LEVEL_WARN  SDDBG_WARN
-+#define DBG_LEVEL_DEBUG SDDBG_DEBUG
-+#define DBG_LEVEL_TRACE SDDBG_TRACE
-+#define DBG_LEVEL_ALL   SDDBG_ALL
-+
-+#define DBG_GET_LEVEL(lvl) ((lvl) & 0xff)
-+#define DBG_GET_MASK(lvl) (((lvl) & 0xff00))
-+
-+#define DBG_SDIO_MASK (DBG_MASK_NONE | DBG_LEVEL_DEBUG)
-+
-+#define DEBUG 1
-+
-+#ifdef DEBUG
-+
-+#define DBG_ASSERT(test) \
-+{                         \
-+    if (!(test)) {          \
-+        DBG_PRINT(SDDBG_ERROR, ("Debug Assert Caught, File %s, Line: %d, Test:%s \n",__FILE__, __LINE__,#test)); \
-+    }                     \
-+}
-+#define DBG_ASSERT_WITH_MSG(test,s) \
-+{                                   \
-+    if (!(test)) {                  \
-+        DBG_PRINT(SDDBG_ERROR, ("Assert:%s File %s, Line: %d \n",(s),__FILE__, __LINE__)); \
-+    }                     \
-+}
-+
-+#define DBG_PRINT(lvl, args)\
-+    do {\
-+            if (DBG_GET_LEVEL(lvl) <= (DBG_SDIO_MASK & 0xff)) \
-+                printk(_DBG_PRINTX_ARG args); \
-+    } while(0);
-+
-+#else /* DEBUG */
-+
-+#define DBG_PRINT(lvl, str)
-+#define DBG_ASSERT(test)
-+#define DBG_ASSERT_WITH_MSG(test,s)
-+#endif /* DEBUG */
-+
-+#define _DBG_PRINTX_ARG(arg...) arg /* unroll the parens around the var args*/
-+#define DBG_GET_DEBUG_LEVEL() DBG_GET_LEVEL(DBG_SDIO_MASK)
-+#define DBG_SET_DEBUG_LEVEL(v)
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Print a string to the debugger or console
-+
-+  @function name: REL_PRINT
-+  @prototype: void REL_PRINT(INT Level, string)
-+  @category: Support_Reference
-+  @input:  Level - debug level for the print
-+
-+  @output: none
-+
-+  @return:
-+
-+  @notes: If Level is less than the current debug level, the print will be
-+          issued. This print cannot be conditionally compiled.
-+  @see also: DBG_PRINT
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define REL_PRINT(lvl, args)\
-+    {if (lvl <= DBG_GET_DEBUG_LEVEL())\
-+        printk(SDDBG_KERNEL_PRINT_LEVEL _DBG_PRINTX_ARG args);\
-+    }
-+/* debug output levels, this must be order low number to higher */
-+#define SDDBG_ERROR 3
-+#define SDDBG_WARN  4
-+#define SDDBG_DEBUG 6
-+#define SDDBG_TRACE 7
-+
-+#ifdef DBG_CRIT_SECTION_RECURSE
-+   /* this macro thows an exception if the lock is recursively taken
-+    * the kernel must be configured with: CONFIG_DEBUG_SPINLOCK=y */
-+#define call_spin_lock(pCrit) \
-+{                                     \
-+  UINT32 unlocked = 1;                \
-+  if ((pCrit)->lock) {unlocked = 0;}  \
-+  spin_lock_bh(pCrit);                \
-+  if (!unlocked) {                     \
-+     unlocked = 0x01;                   \
-+     unlocked = *((volatile UINT32 *)unlocked); \
-+  }                                   \
-+}
-+
-+#define call_spin_lock_irqsave(pCrit,isc) \
-+{                                     \
-+  UINT32 unlocked = 1;                \
-+  if ((pCrit)->lock) {unlocked = 0;}  \
-+  spin_lock_irqsave(pCrit,isc);                \
-+  if (!unlocked) {                     \
-+     unlocked = 0x01;                   \
-+     unlocked = *((volatile UINT32 *)unlocked); \
-+  }                                   \
-+}
-+
-+#else
-+#define call_spin_lock(s) spin_lock_bh(s)
-+#define call_spin_lock_irqsave(s,isc) spin_lock_irqsave(s,isc)
-+#endif
-+
-+#define call_spin_unlock(s) spin_unlock_bh((s))
-+#define call_spin_unlock_irqrestore(s,isc) spin_unlock_irqrestore(s,isc)
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
-+#define NonSchedulable() (in_atomic() || irqs_disabled())
-+#else
-+#define NonSchedulable() (irqs_disabled())
-+#endif
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Initialize a critical section object.
-+
-+  @function name: CriticalSectionInit
-+  @prototype: SDIO_STATUS CriticalSectionInit(POS_CRITICALSECTION pCrit)
-+  @category: Support_Reference
-+  @output: pCrit - pointer to critical section to initialize
-+
-+  @return: SDIO_STATUS_SUCCESS on success.
-+
-+  @notes:  CriticalSectionDelete() must be called to cleanup any resources
-+           associated with the critical section.
-+
-+  @see also: CriticalSectionDelete, CriticalSectionAcquire, CriticalSectionRelease
-+  @example: To initialize a critical section:
-+        status = CriticalSectionInit(&pDevice->ListLock);
-+        if (!SDIO_SUCCESS(status)) {
-+                .. failed
-+            return status;
-+        }
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline SDIO_STATUS CriticalSectionInit(POS_CRITICALSECTION pCrit) {
-+    spin_lock_init(pCrit);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Acquire a critical section lock.
-+
-+  @function name: CriticalSectionAcquire
-+  @prototype: SDIO_STATUS CriticalSectionAcquire(POS_CRITICALSECTION pCrit)
-+  @category: Support_Reference
-+
-+  @input: pCrit - pointer to critical section that was initialized
-+
-+  @return: SDIO_STATUS_SUCCESS on success.
-+
-+  @notes:  The critical section lock is acquired when this function returns
-+           SDIO_STATUS_SUCCESS.  Use CriticalSectionRelease() to release
-+           the critical section lock.
-+
-+  @see also: CriticalSectionRelease
-+
-+  @example: To acquire a critical section lock:
-+        status = CriticalSectionAcquire(&pDevice->ListLock);
-+        if (!SDIO_SUCCESS(status)) {
-+                .. failed
-+            return status;
-+        }
-+        ... access protected data
-+            // unlock
-+        status = CriticalSectionRelease(&pDevice->ListLock);
-+        if (!SDIO_SUCCESS(status)) {
-+                .. failed
-+            return status;
-+        }
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline SDIO_STATUS CriticalSectionAcquire(POS_CRITICALSECTION pCrit) {
-+    call_spin_lock(pCrit);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+// macro-tized versions
-+#define CriticalSectionAcquire_M(pCrit) \
-+    SDIO_STATUS_SUCCESS; call_spin_lock(pCrit)
-+#define CriticalSectionRelease_M(pCrit) \
-+    SDIO_STATUS_SUCCESS; call_spin_unlock(pCrit)
-+
-+#define CT_DECLARE_IRQ_SYNC_CONTEXT() unsigned long _ctSyncFlags
-+
-+#define CriticalSectionAcquireSyncIrq(pCrit) \
-+    SDIO_STATUS_SUCCESS; call_spin_lock_irqsave(pCrit,_ctSyncFlags)
-+
-+#define CriticalSectionReleaseSyncIrq(pCrit) \
-+    SDIO_STATUS_SUCCESS; call_spin_unlock_irqrestore(pCrit,_ctSyncFlags)
-+
-+
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Release a critical section lock.
-+
-+  @function name: CriticalSectionRelease
-+  @prototype: SDIO_STATUS CriticalSectionRelease(POS_CRITICALSECTION pCrit)
-+  @category: Support_Reference
-+
-+  @input: pCrit - pointer to critical section that was initialized
-+
-+  @return: SDIO_STATUS_SUCCESS on success.
-+
-+  @notes:  The critical section lock is released when this function returns
-+           SDIO_STATUS_SUCCESS.
-+
-+  @see also: CriticalSectionAcquire
-+
-+  @example: see CriticalSectionAcquire
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline SDIO_STATUS CriticalSectionRelease(POS_CRITICALSECTION pCrit) {
-+    call_spin_unlock(pCrit);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Cleanup a critical section object
-+
-+  @function name: CriticalSectionDelete
-+  @prototype: void CriticalSectionDelete(POS_CRITICALSECTION pCrit)
-+  @category: Support_Reference
-+
-+  @input: pCrit - an initialized critical section object
-+
-+  @return: SDIO_STATUS_SUCCESS on success.
-+
-+  @notes:
-+
-+  @see also: CriticalSectionInit, CriticalSectionAcquire, CriticalSectionRelease
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline void CriticalSectionDelete(POS_CRITICALSECTION pCrit) {
-+    return;
-+}
-+
-+/* internal use */
-+static inline SDIO_STATUS SignalInitialize(POS_SIGNAL pSignal) {
-+    sema_init(pSignal, 0);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+/* internal use */
-+static inline void SignalDelete(POS_SIGNAL pSignal) {
-+    return;
-+}
-+/* internal use */
-+static inline SDIO_STATUS SignalWaitInterruptible(POS_SIGNAL pSignal) {
-+    DBG_ASSERT_WITH_MSG(!NonSchedulable(),"SignalWaitInterruptible not allowed\n");
-+    if (down_interruptible(pSignal) == 0) {
-+        return SDIO_STATUS_SUCCESS;
-+    } else {
-+        return SDIO_STATUS_INTERRUPTED;
-+    }
-+}
-+/* internal use */
-+static inline SDIO_STATUS SignalWait(POS_SIGNAL pSignal) {
-+    DBG_ASSERT_WITH_MSG(!NonSchedulable(),"SignalWait not allowed\n");
-+    down(pSignal);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+/* internal use */
-+static inline SDIO_STATUS SignalSet(POS_SIGNAL pSignal) {
-+    up(pSignal);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Initialize a semaphore object.
-+
-+  @function name: SemaphoreInitialize
-+  @prototype: SDIO_STATUS SemaphoreInitialize(POS_SEMAPHORE pSem, UINT value)
-+  @category: Support_Reference
-+
-+  @input:  value - initial value of the semaphore
-+
-+  @output: pSem - pointer to a semaphore object to initialize
-+
-+  @return: SDIO_STATUS_SUCCESS on success.
-+
-+  @notes:  SemaphoreDelete() must be called to cleanup any resources
-+           associated with the semaphore
-+
-+  @see also: SemaphoreDelete, SemaphorePend, SemaphorePendInterruptable
-+
-+  @example: To initialize a semaphore:
-+        status = SemaphoreInitialize(&pDevice->ResourceSem,1);
-+        if (!SDIO_SUCCESS(status)) {
-+                .. failed
-+            return status;
-+        }
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline SDIO_STATUS SemaphoreInitialize(POS_SEMAPHORE pSem, UINT value) {
-+    sema_init(pSem, value);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Cleanup a semaphore object.
-+
-+  @function name: SemaphoreDelete
-+  @prototype: void SemaphoreDelete(POS_SEMAPHORE pSem)
-+  @category: Support_Reference
-+
-+  @input: pSem - pointer to a semaphore object to cleanup
-+
-+  @return:
-+
-+  @notes:
-+
-+  @see also: SemaphoreInitialize
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline void SemaphoreDelete(POS_SEMAPHORE pSem) {
-+    return;
-+}
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Acquire the semaphore or pend if the resource is not available
-+
-+  @function name: SemaphorePend
-+  @prototype: SDIO_STATUS SemaphorePend(POS_SEMAPHORE pSem)
-+  @category: Support_Reference
-+
-+  @input: pSem - pointer to an initialized semaphore object
-+
-+  @return: SDIO_STATUS_SUCCESS on success.
-+
-+  @notes: If the semaphore count is zero this function blocks until the count
-+          becomes non-zero, otherwise the count is decremented and execution
-+          continues. While waiting, the task/thread cannot be interrupted.
-+          If the task or thread should be interruptible, use SemaphorePendInterruptible.
-+          On some OSes SemaphorePend and SemaphorePendInterruptible behave the same.
-+
-+  @see also: SemaphorePendInterruptable, SemaphorePost
-+  @example: To wait for a resource using a semaphore:
-+        status = SemaphorePend(&pDevice->ResourceSem);
-+        if (!SDIO_SUCCESS(status)) {
-+                .. failed
-+            return status;
-+        }
-+        ... resource acquired
-+        SemaphorePost(&pDevice->ResourceSem);
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline SDIO_STATUS SemaphorePend(POS_SEMAPHORE pSem) {
-+    DBG_ASSERT_WITH_MSG(!NonSchedulable(),"SemaphorePend not allowed\n");
-+    down(pSem);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Acquire the semaphore or pend if the resource is not available
-+
-+  @function name: SemaphorePendInterruptable
-+  @prototype: SDIO_STATUS SemaphorePendInterruptable(POS_SEMAPHORE pSem)
-+  @category: Support_Reference
-+
-+  @input: pSem - pointer to an initialized semaphore object
-+
-+  @return: SDIO_STATUS_SUCCESS on success.
-+
-+  @notes: If the semaphore count is zero this function blocks until the count
-+          becomes non-zero, otherwise the count is decremented and execution
-+          continues. While waiting, the task/thread can be interrupted.
-+          If the task or thread should not be interruptible, use SemaphorePend.
-+
-+  @see also: SemaphorePend, SemaphorePost
-+  @example: To wait for a resource using a semaphore:
-+        status = SemaphorePendInterruptable(&pDevice->ResourceSem);
-+        if (!SDIO_SUCCESS(status)) {
-+                .. failed, could have been interrupted
-+            return status;
-+        }
-+        ... resource acquired
-+        SemaphorePost(&pDevice->ResourceSem);
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline SDIO_STATUS SemaphorePendInterruptable(POS_SEMAPHORE pSem) {
-+    DBG_ASSERT_WITH_MSG(!NonSchedulable(),"SemaphorePendInterruptable not allowed\n");
-+    if (down_interruptible(pSem) == 0) {
-+        return SDIO_STATUS_SUCCESS;
-+    } else {
-+        return SDIO_STATUS_INTERRUPTED;
-+    }
-+}
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Post a semaphore.
-+
-+  @function name: SemaphorePost
-+  @prototype: SDIO_STATUS SemaphorePost(POS_SEMAPHORE pSem)
-+  @category: Support_Reference
-+
-+  @input: pSem - pointer to an initialized semaphore object
-+
-+  @return: SDIO_STATUS_SUCCESS on success.
-+
-+  @notes: This function increments the semaphore count.
-+
-+  @see also: SemaphorePend, SemaphorePendInterruptable.
-+  @example: Posting a semaphore:
-+        status = SemaphorePendInterruptable(&pDevice->ResourceSem);
-+        if (!SDIO_SUCCESS(status)) {
-+                .. failed, could have been interrupted
-+            return status;
-+        }
-+        ... resource acquired
-+            // post the semaphore
-+        SemaphorePost(&pDevice->ResourceSem);
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline SDIO_STATUS SemaphorePost(POS_SEMAPHORE pSem) {
-+    DBG_ASSERT_WITH_MSG(!NonSchedulable(),"SemaphorePost not allowed\n");
-+    up(pSem);
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Allocate a block of kernel accessible memory
-+
-+  @function name: KernelAlloc
-+  @prototype: PVOID KernelAlloc(UINT size)
-+  @category: Support_Reference
-+
-+  @input: size - size of memory block to allocate
-+
-+  @return: pointer to the allocated memory, NULL if allocation failed
-+
-+  @notes: For operating systems that use paging, the allocated memory is always
-+          non-paged memory.  Caller should only use KernelFree() to release the
-+          block of memory.  This call can potentially block and should only be called
-+          from a schedulable context.  Use KernelAllocIrqSafe() if the allocation
-+          must be made from a non-schedulable context.
-+
-+  @see also: KernelFree, KernelAllocIrqSafe
-+  @example: allocating memory:
-+        pBlock = KernelAlloc(1024);
-+        if (pBlock == NULL) {
-+                .. failed, no memory
-+            return SDIO_STATUS_INSUFFICIENT_RESOURCES;
-+        }
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline PVOID KernelAlloc(UINT size) {
-+    PVOID pMem = kmalloc(size, GFP_KERNEL);
-+    if (pMem != NULL) { memset(pMem,0,size); }
-+    return pMem;
-+}
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Free a block of kernel accessible memory.
-+
-+  @function name: KernelFree
-+  @prototype: void KernelFree(PVOID ptr)
-+  @category: Support_Reference
-+
-+  @input: ptr - pointer to memory allocated with KernelAlloc()
-+
-+  @return:
-+
-+  @notes: Caller should only use KernelFree() to release memory that was allocated
-+          with KernelAlloc().
-+
-+  @see also: KernelAlloc
-+  @example: KernelFree(pBlock);
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline void KernelFree(PVOID ptr) {
-+    kfree(ptr);
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Allocate a block of kernel accessible memory in an IRQ-safe manner
-+
-+  @function name: KernelAllocIrqSafe
-+  @prototype: PVOID KernelAllocIrqSafe(UINT size)
-+  @category: Support_Reference
-+
-+  @input: size - size of memory block to allocate
-+
-+  @return: pointer to the allocated memory, NULL if allocation failed
-+
-+  @notes: This variant of KernelAlloc allows the allocation of small blocks of
-+          memory from an ISR or from a context where scheduling has been disabled.
-+          The allocations should be small as the memory is typically allocated
-+          from a critical heap. The caller should only use KernelFreeIrqSafe()
-+          to release the block of memory.
-+
-+  @see also: KernelAlloc, KernelFreeIrqSafe
-+  @example: allocating memory:
-+        pBlock = KernelAllocIrqSafe(16);
-+        if (pBlock == NULL) {
-+                .. failed, no memory
-+            return SDIO_STATUS_INSUFFICIENT_RESOURCES;
-+        }
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline PVOID KernelAllocIrqSafe(UINT size) {
-+    return kmalloc(size, GFP_ATOMIC);
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Free a block of kernel accessible memory.
-+
-+  @function name: KernelFreeIrqSafe
-+  @prototype: void KernelFreeIrqSafe(PVOID ptr)
-+  @category: Support_Reference
-+
-+  @input: ptr - pointer to memory allocated with KernelAllocIrqSafe()
-+
-+  @return:
-+
-+  @notes: Caller should only use KernelFreeIrqSafe() to release memory that was allocated
-+          with KernelAllocIrqSafe().
-+
-+  @see also: KernelAllocIrqSafe
-+  @example: KernelFreeIrqSafe(pBlock);
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline void KernelFreeIrqSafe(PVOID ptr) {
-+    kfree(ptr);
-+}
-+
-+/* error status conversions */
-+static inline SYSTEM_STATUS SDIOErrorToOSError(SDIO_STATUS status) {
-+    switch (status) {
-+        case SDIO_STATUS_SUCCESS:
-+            return 0;
-+        case SDIO_STATUS_INVALID_PARAMETER:
-+            return -EINVAL;
-+        case SDIO_STATUS_PENDING:
-+            return -EAGAIN; /* try again */
-+        case SDIO_STATUS_DEVICE_NOT_FOUND:
-+            return -ENXIO;
-+        case SDIO_STATUS_DEVICE_ERROR:
-+            return -EIO;
-+        case SDIO_STATUS_INTERRUPTED:
-+            return -EINTR;
-+        case SDIO_STATUS_NO_RESOURCES:
-+            return -ENOMEM;
-+        case SDIO_STATUS_ERROR:
-+        default:
-+            return -EFAULT;
-+    }
-+}
-+static inline SDIO_STATUS OSErrorToSDIOError(SYSTEM_STATUS status) {
-+    if (status >=0) {
-+        return SDIO_STATUS_SUCCESS;
-+    }
-+    switch (status) {
-+        case -EINVAL:
-+            return SDIO_STATUS_INVALID_PARAMETER;
-+        case -ENXIO:
-+            return SDIO_STATUS_DEVICE_NOT_FOUND;
-+        case -EIO:
-+            return SDIO_STATUS_DEVICE_ERROR;
-+        case -EINTR:
-+            return SDIO_STATUS_INTERRUPTED;
-+        case -ENOMEM:
-+            return SDIO_STATUS_NO_RESOURCES;
-+        case -EFAULT:
-+            return SDIO_STATUS_ERROR;
-+        default:
-+            return SDIO_STATUS_ERROR;
-+    }
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Sleep or delay the execution context for a number of milliseconds.
-+
-+  @function name: OSSleep
-+  @prototype: SDIO_STATUS OSSleep(INT SleepInterval)
-+  @category: Support_Reference
-+
-+  @input: SleepInterval - time in milliseconds to put the execution context to sleep
-+
-+  @return: SDIO_STATUS_SUCCESS if sleep succeeded.
-+
-+  @notes: Caller should be in a context that allows it to sleep or block.  The
-+  minimum duration of sleep may be greater than 1 MS on some platforms and OSes.
-+
-+  @see also: OSSleep
-+  @example: Using sleep to delay
-+        EnableSlotPower(pSlot);
-+            // wait for power to settle
-+        status = OSSleep(100);
-+        if (!SDIO_SUCCESS(status)){
-+            // failed..
-+        }
-+
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static inline SDIO_STATUS OSSleep(INT SleepInterval) {
-+    UINT32 delta;
-+
-+    DBG_ASSERT_WITH_MSG(!NonSchedulable(),"OSSleep not allowed\n");
-+        /* convert timeout to ticks */
-+    delta = (SleepInterval * HZ)/1000;
-+    if (delta == 0) {
-+        delta = 1;
-+    }
-+    set_current_state(TASK_INTERRUPTIBLE);
-+    if (schedule_timeout(delta) != 0) {
-+        return SDIO_STATUS_INTERRUPTED;
-+    }
-+    return SDIO_STATUS_SUCCESS;
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: get the OSs device object
-+
-+  @function name: SD_GET_OS_DEVICE
-+  @prototype: POS_DEVICE SD_GET_OS_DEVICE(PSDDEVICE pDevice)
-+  @category: Support_Reference
-+
-+  @input: pDevice - the device on the HCD
-+
-+  @return: pointer to the OSs device
-+
-+  @see also:
-+  @example: obtain low level device
-+        pFunctionContext->GpsDevice.Port.dev = SD_GET_OS_DEVICE(pDevice);
-+
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SD_GET_OS_DEVICE(pDevice) &((pDevice)->Device.dev)
-+
-+
-+#ifdef __iomem
-+    /* new type checking in 2.6.9 */
-+    /* I/O Access macros */
-+#define _READ_DWORD_REG(reg)  \
-+        readl((const volatile void __iomem *)(reg))
-+#define _READ_WORD_REG(reg)  \
-+        readw((const volatile void __iomem *)(reg))
-+#define _READ_BYTE_REG(reg)  \
-+        readb((const volatile void __iomem *)(reg))
-+#define _WRITE_DWORD_REG(reg,value)  \
-+        writel((value),(volatile void __iomem *)(reg))
-+#define _WRITE_WORD_REG(reg,value)  \
-+        writew((value),(volatile void __iomem *)(reg))
-+#define _WRITE_BYTE_REG(reg,value)  \
-+        writeb((value),(volatile void __iomem *)(reg))
-+#else
-+    /* I/O Access macros */
-+#define _READ_DWORD_REG(reg)  \
-+        readl((reg))
-+#define _READ_WORD_REG(reg)  \
-+        readw((reg))
-+#define _READ_BYTE_REG(reg)  \
-+        readb((reg))
-+#define _WRITE_DWORD_REG(reg,value)  \
-+        writel((value),(reg))
-+#define _WRITE_WORD_REG(reg,value)  \
-+        writew((value),(reg))
-+#define _WRITE_BYTE_REG(reg,value)  \
-+        writeb((value),(reg))
-+#endif
-+    /* atomic operators */
-+static inline ATOMIC_FLAGS AtomicTest_Set(volatile ATOMIC_FLAGS *pValue, INT BitNo) {
-+    return test_and_set_bit(BitNo,(ATOMIC_FLAGS *)pValue);
-+}
-+static inline ATOMIC_FLAGS AtomicTest_Clear(volatile ATOMIC_FLAGS *pValue, INT BitNo) {
-+    return test_and_clear_bit(BitNo,(ATOMIC_FLAGS *)pValue);
-+}
-+
-+struct _OSKERNEL_HELPER;
-+
-+typedef THREAD_RETURN (*PHELPER_FUNCTION)(struct _OSKERNEL_HELPER *);
-+
-+typedef struct _OSKERNEL_HELPER {
-+    PKERNEL_TASK            pTask;
-+    BOOL                    ShutDown;
-+    OS_SIGNAL               WakeSignal;
-+    struct completion       Completion;
-+    PVOID                   pContext;
-+    PHELPER_FUNCTION        pHelperFunc;
-+}OSKERNEL_HELPER, *POSKERNEL_HELPER;
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Wake the helper thread
-+
-+  @function name: SD_WAKE_OS_HELPER
-+  @prototype: SD_WAKE_OS_HELPER(POSKERNEL_HELPER pOSHelper)
-+  @category: Support_Reference
-+
-+  @input: pOSHelper - the OS helper object
-+
-+  @return: SDIO_STATUS
-+
-+  @see also: SDLIB_OSCreateHelper
-+
-+  @example: Waking up a helper thread
-+        status = SD_WAKE_OS_HELPER(&pInstance->OSHelper);
-+
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SD_WAKE_OS_HELPER(p)        SignalSet(&(p)->WakeSignal)
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Obtains the context for the helper function
-+
-+  @function name: SD_GET_OS_HELPER_CONTEXT
-+  @prototype: SD_GET_OS_HELPER_CONTEXT(POSKERNEL_HELPER pOSHelper)
-+  @category: Support_Reference
-+
-+  @input: pOSHelper - the OS helper object
-+
-+  @return: helper specific context
-+
-+  @notes: This macro should only be called by the function associated with
-+          the helper object.
-+
-+  @see also: SDLIB_OSCreateHelper
-+
-+  @example: Getting the helper specific context
-+        PMYCONTEXT pContext = (PMYCONTEXT)SD_GET_OS_HELPER_CONTEXT(pHelper);
-+
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SD_GET_OS_HELPER_CONTEXT(p)     (p)->pContext
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Check helper function shut down flag.
-+
-+  @function name: SD_IS_HELPER_SHUTTING_DOWN
-+  @prototype: SD_IS_HELPER_SHUTTING_DOWN(POSKERNEL_HELPER pOSHelper)
-+  @category: Support_Reference
-+
-+  @input: pOSHelper - the OS helper object
-+
-+  @return: TRUE if shutting down, else FALSE
-+
-+  @notes: This macro should only be called by the function associated with
-+          the helper object.  The function should call this macro when it
-+          unblocks from the call to SD_WAIT_FOR_WAKEUP().  If this function
-+          returns TRUE, the function should clean up and exit.
-+
-+  @see also: SDLIB_OSCreateHelper , SD_WAIT_FOR_WAKEUP
-+
-+  @example: Checking for shutdown
-+        while(1) {
-+              status = SD_WAIT_FOR_WAKEUP(pHelper);
-+              if (!SDIO_SUCCESS(status)) {
-+                  break;
-+              }
-+              if (SD_IS_HELPER_SHUTTING_DOWN(pHelper)) {
-+                  ... shutting down
-+                  break;
-+              }
-+        }
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SD_IS_HELPER_SHUTTING_DOWN(p)   (p)->ShutDown
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Suspend and wait for wakeup signal
-+
-+  @function name: SD_WAIT_FOR_WAKEUP
-+  @prototype: SD_WAIT_FOR_WAKEUP(POSKERNEL_HELPER pOSHelper)
-+  @category: Support_Reference
-+
-+  @input: pOSHelper - the OS helper object
-+
-+  @return: SDIO_STATUS
-+
-+  @notes: This macro should only be called by the function associated with
-+          the helper object.  The function should call this function to suspend (block)
-+          itself and wait for a wake up signal. The function should always check
-+          whether the function should exit by calling SD_IS_HELPER_SHUTTING_DOWN.
-+
-+  @see also: SDLIB_OSCreateHelper , SD_IS_HELPER_SHUTTING_DOWN
-+
-+  @example: block on the wake signal
-+        while(1) {
-+              status = SD_WAIT_FOR_WAKEUP(pHelper);
-+              if (!SDIO_SUCCESS(status)) {
-+                  break;
-+              }
-+              if (SD_IS_HELPER_SHUTTING_DOWN(pHelper)) {
-+                  ... shutting down
-+                  break;
-+              }
-+        }
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SD_WAIT_FOR_WAKEUP(p)   SignalWait(&(p)->WakeSignal);
-+
-+#define CT_LE16_TO_CPU_ENDIAN(x) __le16_to_cpu(x)
-+#define CT_LE32_TO_CPU_ENDIAN(x) __le32_to_cpu(x)
-+#define CT_CPU_ENDIAN_TO_LE16(x) __cpu_to_le16(x)
-+#define CT_CPU_ENDIAN_TO_LE32(x) __cpu_to_le32(x)
-+
-+#define CT_CPU_ENDIAN_TO_BE16(x) __cpu_to_be16(x)
-+#define CT_CPU_ENDIAN_TO_BE32(x) __cpu_to_be32(x)
-+#define CT_BE16_TO_CPU_ENDIAN(x) __be16_to_cpu(x)
-+#define CT_BE32_TO_CPU_ENDIAN(x) __be32_to_cpu(x)
-+#endif /* __CPSYSTEM_LINUX_H___ */
-+
-diff --git a/include/linux/sdio/mmc_defs.h b/include/linux/sdio/mmc_defs.h
-new file mode 100644
-index 0000000..576ebd7
---- /dev/null
-+++ b/include/linux/sdio/mmc_defs.h
-@@ -0,0 +1,103 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: mmc_defs.h
-+
-+@abstract: MMC definitions not already defined in _sdio_defs.h
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#ifndef ___MMC_DEFS_H___
-+#define ___MMC_DEFS_H___
-+
-+#define MMC_MAX_BUS_CLOCK    20000000 /* max clock speed in hz */
-+#define MMC_HS_MAX_BUS_CLOCK 52000000 /* MMC PLUS (high speed) max clock rate in hz */
-+
-+/* R2 (CSD) macros */
-+#define GET_MMC_CSD_TRANS_SPEED(pR) (pR)[12]
-+#define GET_MMC_SPEC_VERSION(pR)    (((pR)[15] >> 2) & 0x0F)
-+#define MMC_SPEC_1_0_TO_1_2         0x00
-+#define MMC_SPEC_1_4                0x01
-+#define MMC_SPEC_2_0_TO_2_2         0x02
-+#define MMC_SPEC_3_1                0x03
-+#define MMC_SPEC_4_0_TO_4_1         0x04
-+
-+#define MMC_CMD_SWITCH    6
-+#define MMC_CMD8    8
-+
-+#define MMC_SWITCH_CMD_SET    0
-+#define MMC_SWITCH_SET_BITS   1
-+#define MMC_SWITCH_CLEAR_BITS 2
-+#define MMC_SWITCH_WRITE_BYTE 3
-+#define MMC_SWITCH_CMD_SET0   0
-+#define MMC_SWITCH_BUILD_ARG(cmdset,access,index,value) \
-+     (((cmdset) & 0x07) | (((access) & 0x03) << 24) | (((index) & 0xFF) << 16) | (((value) & 0xFF) << 8))
-+
-+#define MMC_EXT_CSD_SIZE                     512
-+
-+#define MMC_EXT_S_CMD_SET_OFFSET             504
-+#define MMC_EXT_MIN_PERF_W_8_52_OFFSET       210
-+#define MMC_EXT_MIN_PERF_R_8_52_OFFSET       209
-+#define MMC_EXT_MIN_PERF_W_8_26_4_52_OFFSET  208
-+#define MMC_EXT_MIN_PERF_R_8_26_4_52_OFFSET  207
-+#define MMC_EXT_MIN_PERF_W_4_26_OFFSET       206
-+#define MMC_EXT_MIN_PERF_R_4_56_OFFSET       205
-+#define MMC_EXT_PWR_CL_26_360_OFFSET         203
-+#define MMC_EXT_PWR_CL_52_360_OFFSET         202
-+#define MMC_EXT_PWR_CL_26_195_OFFSET         201
-+#define MMC_EXT_PWR_CL_52_195_OFFSET         200
-+#define MMC_EXT_GET_PWR_CLASS(reg)    ((reg) & 0xF)
-+#define MMC_EXT_MAX_PWR_CLASSES       16
-+#define MMC_EXT_CARD_TYPE_OFFSET             196
-+#define MMC_EXT_CARD_TYPE_HS_52  (1 << 1)
-+#define MMC_EXT_CARD_TYPE_HS_26  (1 << 0)
-+#define MMC_EXT_CSD_VER_OFFSET               194
-+#define MMC_EXT_VER_OFFSET                   192
-+#define MMC_EXT_VER_1_0          0
-+#define MMC_EXT_VER_1_1          1
-+#define MMC_EXT_CMD_SET_OFFSET               191
-+#define MMC_EXT_CMD_SET_REV_OFFSET           189
-+#define MMC_EXT_PWR_CLASS_OFFSET             187
-+#define MMC_EXT_HS_TIMING_OFFSET             185
-+#define MMC_EXT_HS_TIMING_ENABLE   0x01
-+#define MMC_EXT_BUS_WIDTH_OFFSET             183
-+#define MMC_EXT_BUS_WIDTH_1_BIT    0x00
-+#define MMC_EXT_BUS_WIDTH_4_BIT    0x01
-+#define MMC_EXT_BUS_WIDTH_8_BIT    0x02
-+
-+#endif
-diff --git a/include/linux/sdio/sdio_busdriver.h b/include/linux/sdio/sdio_busdriver.h
-new file mode 100644
-index 0000000..b431d3d
---- /dev/null
-+++ b/include/linux/sdio/sdio_busdriver.h
-@@ -0,0 +1,1435 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdio_busdriver.h
-+
-+@abstract: include file for registration of SDIO function drivers
-+  and SDIO host controller bus drivers.
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#ifndef __SDIO_BUSDRIVER_H___
-+#define __SDIO_BUSDRIVER_H___
-+
-+typedef UINT8      CT_VERSION_CODE;
-+#define CT_SDIO_STACK_VERSION_CODE ((CT_VERSION_CODE)0x26)   /* version code that must be set in various structures */
-+#define CT_SDIO_STACK_VERSION_MAJOR(v) (((v) & 0xF0) >> 4)
-+#define CT_SDIO_STACK_VERSION_MINOR(v) (((v) & 0x0F))
-+#define SET_SDIO_STACK_VERSION(p) (p)->Version = CT_SDIO_STACK_VERSION_CODE
-+#define GET_SDIO_STACK_VERSION(p) (p)->Version
-+#define GET_SDIO_STACK_VERSION_MAJOR(p) CT_SDIO_STACK_VERSION_MAJOR(GET_SDIO_STACK_VERSION(p))
-+#define GET_SDIO_STACK_VERSION_MINOR(p) CT_SDIO_STACK_VERSION_MINOR(GET_SDIO_STACK_VERSION(p))
-+#include "sdlist.h"
-+
-+/* card flags */
-+typedef UINT16      CARD_INFO_FLAGS;
-+#define CARD_MMC        0x0001    /* Multi-media card */
-+#define CARD_SD         0x0002    /* SD-Memory present */
-+#define CARD_SDIO       0x0004    /* SDIO present */
-+#define CARD_RAW        0x0008    /* Raw card */
-+#define CARD_COMBO      (CARD_SD | CARD_SDIO)  /* SDIO with SD */
-+#define CARD_TYPE_MASK  0x000F    /* card type mask */
-+#define CARD_SD_WP      0x0010    /* SD WP on */
-+#define CARD_PSEUDO     0x0020    /* pseudo card (internal use) */
-+#define CARD_HIPWR      0x0040    /* card can use more than 200mA (SDIO 1.1 or greater)*/
-+#define GET_CARD_TYPE(flags) ((flags) & CARD_TYPE_MASK)
-+
-+/* bus mode and clock rate */
-+typedef UINT32  SD_BUSCLOCK_RATE;       /* clock rate in hz */
-+typedef UINT16  SD_BUSMODE_FLAGS;
-+#define SDCONFIG_BUS_WIDTH_RESERVED           0x00
-+#define SDCONFIG_BUS_WIDTH_SPI                0x01
-+#define SDCONFIG_BUS_WIDTH_1_BIT              0x02
-+#define SDCONFIG_BUS_WIDTH_4_BIT              0x03
-+#define SDCONFIG_BUS_WIDTH_MMC8_BIT           0x04
-+#define SDCONFIG_BUS_WIDTH_MASK               0x0F
-+#define SDCONFIG_SET_BUS_WIDTH(flags,width) \
-+{                       \
-+    (flags) &= ~SDCONFIG_BUS_WIDTH_MASK; \
-+    (flags) |= (width);                  \
-+}
-+#define SDCONFIG_GET_BUSWIDTH(flags) ((flags) & SDCONFIG_BUS_WIDTH_MASK)
-+#define SDCONFIG_BUS_MODE_SPI_NO_CRC         0x40   /* SPI bus is operating with NO CRC */
-+#define SDCONFIG_BUS_MODE_SD_HS              0x80   /* set interface to SD high speed mode  */
-+#define SDCONFIG_BUS_MODE_MMC_HS             0x20   /* set interface to MMC high speed mode */
-+
-+typedef UINT16 SD_SLOT_CURRENT;      /* slot current in mA */
-+
-+typedef UINT8 SLOT_VOLTAGE_MASK;     /* slot voltage */
-+#define SLOT_POWER_3_3V  0x01
-+#define SLOT_POWER_3_0V  0x02
-+#define SLOT_POWER_2_8V  0x04
-+#define SLOT_POWER_2_0V  0x08
-+#define SLOT_POWER_1_8V  0x10
-+#define SLOT_POWER_1_6V  0x20
-+
-+#define MAX_CARD_RESPONSE_BYTES 17
-+
-+/* plug and play information for SD cards */
-+typedef struct _SD_PNP_INFO {
-+    UINT16 SDIO_ManufacturerCode;  /* JEDEC Code */
-+    UINT16 SDIO_ManufacturerID;    /* manf-specific ID */
-+    UINT8  SDIO_FunctionNo;        /* function number 1-7 */
-+    UINT8  SDIO_FunctionClass;     /* function class */
-+    UINT8  SDMMC_ManfacturerID;    /* card CID's MANF-ID */
-+    UINT16 SDMMC_OEMApplicationID; /* card CID's OEMAPP-ID */
-+    CARD_INFO_FLAGS CardFlags;     /* card flags */
-+}SD_PNP_INFO, *PSD_PNP_INFO;
-+
-+#define IS_LAST_SDPNPINFO_ENTRY(id)\
-+    (((id)->SDIO_ManufacturerCode == 0) &&\
-+     ((id)->SDIO_ManufacturerID == 0) &&\
-+     ((id)->SDIO_FunctionNo == 0) &&\
-+     ((id)->SDIO_FunctionClass == 0) &&\
-+     ((id)->SDMMC_OEMApplicationID == 0) && \
-+     ((id)->CardFlags == 0))
-+
-+/* card properties */
-+typedef struct _CARD_PROPERTIES {
-+    UINT8              IOFnCount;      /* number of I/O functions */
-+    UINT8              SDIORevision;   /* SDIO revision */
-+#define SDIO_REVISION_1_00 0x00
-+#define SDIO_REVISION_1_10 0x01
-+#define SDIO_REVISION_1_20 0x02
-+    UINT8              SD_MMC_Revision; /* SD or MMC revision */
-+#define SD_REVISION_1_01  0x00
-+#define SD_REVISION_1_10  0x01
-+#define MMC_REVISION_1_0_2_2 0x00
-+#define MMC_REVISION_3_1  0x01
-+#define MMC_REVISION_4_0  0x02
-+    UINT16 SDIO_ManufacturerCode;      /* JEDEC Code */
-+    UINT16 SDIO_ManufacturerID;        /* manf-specific ID */
-+    UINT32             CommonCISPtr;   /* common CIS ptr */
-+    UINT16             RCA;            /* relative card address */
-+    UINT8              SDIOCaps;       /* SDIO card capabilities (refer to SDIO spec for decoding) */
-+    UINT8              CardCSD[MAX_CARD_RESPONSE_BYTES];    /* for SD/MMC cards */
-+    CARD_INFO_FLAGS    Flags;          /* card flags */
-+    SD_BUSCLOCK_RATE   OperBusClock;   /* operational bus clock (based on HCD limit)*/
-+    SD_BUSMODE_FLAGS   BusMode;        /* current card bus mode */
-+    UINT16             OperBlockLenLimit; /* operational bytes per block length limit*/
-+    UINT16             OperBlockCountLimit; /* operational number of blocks per transfer limit */
-+    UINT8              CardState;      /* card state flags */
-+    SLOT_VOLTAGE_MASK  CardVoltage;    /* card operational voltage */
-+#define CARD_STATE_REMOVED 0x01
-+}CARD_PROPERTIES, *PCARD_PROPERTIES;
-+
-+/* SDREQUEST request flags */
-+typedef UINT32 SDREQUEST_FLAGS;
-+/* write operation */
-+#define SDREQ_FLAGS_DATA_WRITE         0x8000
-+/* has data (read or write) */
-+#define SDREQ_FLAGS_DATA_TRANS         0x4000
-+/* command is an atomic APP command, requiring CMD55 to be issued */
-+#define SDREQ_FLAGS_APP_CMD            0x2000
-+/* transfer should be handled asynchronously */
-+#define SDREQ_FLAGS_TRANS_ASYNC        0x1000
-+/* host should skip the SPI response filter for this command */
-+#define SDREQ_FLAGS_RESP_SKIP_SPI_FILT 0x0800
-+/* host should skip the response check for this data transfer */
-+#define SDREQ_FLAGS_DATA_SKIP_RESP_CHK 0x0400
-+/* flag requesting a CMD12 be automatically issued by host controller */
-+#define SDREQ_FLAGS_AUTO_CMD12         0x0200
-+/* flag indicating that the data buffer meets HCD's DMA restrictions   */
-+#define SDREQ_FLAGS_DATA_DMA           0x0010
-+/* indicate to host that this is a short and quick transfer, the HCD may optimize
-+ * this request to reduce interrupt overhead */
-+#define SDREQ_FLAGS_DATA_SHORT_TRANSFER   0x00010000
-+/* indicate to the host that this is a raw request */
-+#define SDREQ_FLAGS_RAW                   0x00020000
-+/* auto data transfer status check for MMC and Memory cards */
-+#define SDREQ_FLAGS_AUTO_TRANSFER_STATUS  0x00100000
-+
-+#define SDREQ_FLAGS_UNUSED1               0x00200000
-+#define SDREQ_FLAGS_UNUSED2               0x00400000
-+#define SDREQ_FLAGS_UNUSED3               0x00800000
-+#define SDREQ_FLAGS_UNUSED4               0x01000000
-+#define SDREQ_FLAGS_UNUSED5               0x02000000
-+
-+/* the following flags are internal use only */
-+#define SDREQ_FLAGS_FORCE_DEFERRED_COMPLETE 0x0100
-+/* flag indicating that response has been converted (internal use) */
-+#define SDREQ_FLAGS_RESP_SPI_CONVERTED      0x0040
-+/* request was cancelled - internal use only */
-+#define SDREQ_FLAGS_CANCELED                0x0020
-+/* a barrier operation */
-+#define SDREQ_FLAGS_BARRIER                 0x00040000
-+/* a pseudo bus request */
-+#define SDREQ_FLAGS_PSEUDO                  0x00080000
-+/* queue to the head */
-+#define SDREQ_FLAGS_QUEUE_HEAD              0x04000000
-+
-+#define SDREQ_FLAGS_I_UNUSED1               0x08000000
-+#define SDREQ_FLAGS_I_UNUSED2               0x10000000
-+#define SDREQ_FLAGS_I_UNUSED3               0x20000000
-+#define SDREQ_FLAGS_I_UNUSED4               0x40000000
-+#define SDREQ_FLAGS_I_UNUSED5               0x80000000
-+
-+/* response type mask */
-+#define SDREQ_FLAGS_RESP_MASK       0x000F
-+#define GET_SDREQ_RESP_TYPE(flags)     ((flags) & SDREQ_FLAGS_RESP_MASK)
-+#define IS_SDREQ_WRITE_DATA(flags)     ((flags) & SDREQ_FLAGS_DATA_WRITE)
-+#define IS_SDREQ_DATA_TRANS(flags)     ((flags) & SDREQ_FLAGS_DATA_TRANS)
-+#define IS_SDREQ_RAW(flags)            ((flags) & SDREQ_FLAGS_RAW)
-+#define IS_SDREQ_FORCE_DEFERRED_COMPLETE(flags) ((flags) & SDREQ_FLAGS_FORCE_DEFERRED_COMPLETE)
-+#define SDREQ_FLAGS_NO_RESP         0x0000
-+#define SDREQ_FLAGS_RESP_R1         0x0001
-+#define SDREQ_FLAGS_RESP_R1B        0x0002
-+#define SDREQ_FLAGS_RESP_R2         0x0003
-+#define SDREQ_FLAGS_RESP_R3         0x0004
-+#define SDREQ_FLAGS_RESP_MMC_R4     0x0005 /* not supported, for future use */
-+#define SDREQ_FLAGS_RESP_MMC_R5     0x0006 /* not supported, for future use */
-+#define SDREQ_FLAGS_RESP_R6         0x0007
-+#define SDREQ_FLAGS_RESP_SDIO_R4    0x0008
-+#define SDREQ_FLAGS_RESP_SDIO_R5    0x0009
-+
-+struct _SDREQUEST;
-+struct _SDFUNCTION;
-+
-+typedef void (*PSDEQUEST_COMPLETION)(struct _SDREQUEST *);
-+
-+/* defines SD/MMC and SDIO requests for the RAW-mode API */
-+typedef struct _SDREQUEST {
-+    SDLIST  SDList;             /* internal use list*/
-+    UINT32  Argument;           /* SD/SDIO/MMC 32 bit argument */
-+    SDREQUEST_FLAGS Flags;      /* request flags */
-+    ATOMIC_FLAGS InternalFlags; /* internal use flags */
-+    UINT8   Command;            /* SD/SDIO/MMC 8 bit command */
-+    UINT8   Response[MAX_CARD_RESPONSE_BYTES];       /* buffer for CMD response */
-+    UINT16  BlockCount;         /* number of blocks to send/rcv */
-+    UINT16  BlockLen;           /* length of each block */
-+    UINT16  DescriptorCount;    /* number of DMA descriptor entries in pDataBuffer if DMA */
-+    PVOID   pDataBuffer;        /* starting address of buffer (or ptr to PSDDMA_DESCRIPTOR*/
-+    UINT32  DataRemaining;      /* number of bytes remaining in the transfer (internal use) */
-+    PVOID   pHcdContext;        /* internal use context */
-+    PSDEQUEST_COMPLETION pCompletion; /* function driver completion routine */
-+    PVOID   pCompleteContext;   /* function driver completion context */
-+    SDIO_STATUS Status;         /* completion status */
-+    struct _SDFUNCTION* pFunction; /* function driver that generated request (internal use)*/
-+    INT     RetryCount;          /* number of times to retry on error, non-data cmds only */
-+    PVOID   pBdRsv1;        /* reserved */
-+    PVOID   pBdRsv2;
-+    PVOID   pBdRsv3;
-+}SDREQUEST, *PSDREQUEST;
-+
-+    /* a request queue */
-+typedef struct _SDREQUESTQUEUE {
-+    SDLIST        Queue;           /* the queue of requests */
-+    BOOL          Busy;            /* busy flag */
-+}SDREQUESTQUEUE, *PSDREQUESTQUEUE;
-+
-+
-+typedef UINT16 SDCONFIG_COMMAND;
-+/* SDCONFIG request flags */
-+/* get operation */
-+#define SDCONFIG_FLAGS_DATA_GET       0x8000
-+/* put operation */
-+#define SDCONFIG_FLAGS_DATA_PUT       0x4000
-+/* host controller */
-+#define SDCONFIG_FLAGS_HC_CONFIG      0x2000
-+/* both */
-+#define SDCONFIG_FLAGS_DATA_BOTH      (SDCONFIG_FLAGS_DATA_GET | SDCONFIG_FLAGS_DATA_PUT)
-+/* no data */
-+#define SDCONFIG_FLAGS_DATA_NONE      0x0000
-+
-+/* SDCONFIG commands */
-+#define SDCONFIG_GET_HCD_DEBUG   (SDCONFIG_FLAGS_HC_CONFIG | SDCONFIG_FLAGS_DATA_GET  | 275)
-+#define SDCONFIG_SET_HCD_DEBUG   (SDCONFIG_FLAGS_HC_CONFIG | SDCONFIG_FLAGS_DATA_PUT  | 276)
-+
-+/* custom hcd commands */
-+#define SDCONFIG_GET_HOST_CUSTOM   (SDCONFIG_FLAGS_HC_CONFIG | SDCONFIG_FLAGS_DATA_GET  | 300)
-+#define SDCONFIG_PUT_HOST_CUSTOM   (SDCONFIG_FLAGS_HC_CONFIG | SDCONFIG_FLAGS_DATA_PUT  | 301)
-+
-+/* function commands */
-+#define SDCONFIG_FUNC_ENABLE_DISABLE         (SDCONFIG_FLAGS_DATA_PUT  | 18)
-+#define SDCONFIG_FUNC_UNMASK_IRQ             (SDCONFIG_FLAGS_DATA_NONE | 21)
-+#define SDCONFIG_FUNC_MASK_IRQ               (SDCONFIG_FLAGS_DATA_NONE | 22)
-+#define SDCONFIG_FUNC_ACK_IRQ                (SDCONFIG_FLAGS_DATA_NONE | 23)
-+#define SDCONFIG_FUNC_SPI_MODE_DISABLE_CRC   (SDCONFIG_FLAGS_DATA_NONE | 24)
-+#define SDCONFIG_FUNC_SPI_MODE_ENABLE_CRC    (SDCONFIG_FLAGS_DATA_NONE | 25)
-+#define SDCONFIG_FUNC_ALLOC_SLOT_CURRENT     (SDCONFIG_FLAGS_DATA_PUT  | 26)
-+#define SDCONFIG_FUNC_FREE_SLOT_CURRENT      (SDCONFIG_FLAGS_DATA_NONE | 27)
-+#define SDCONFIG_FUNC_CHANGE_BUS_MODE        (SDCONFIG_FLAGS_DATA_BOTH | 28)
-+#define SDCONFIG_FUNC_CHANGE_BUS_MODE_ASYNC  (SDCONFIG_FLAGS_DATA_BOTH | 29)
-+#define SDCONFIG_FUNC_NO_IRQ_PEND_CHECK      (SDCONFIG_FLAGS_DATA_NONE | 30)
-+
-+typedef UINT8  FUNC_ENABLE_DISABLE_FLAGS;
-+typedef UINT32 FUNC_ENABLE_TIMEOUT;
-+
-+    /* function enable */
-+typedef struct _SDCONFIG_FUNC_ENABLE_DISABLE_DATA {
-+#define SDCONFIG_DISABLE_FUNC   0x0000
-+#define SDCONFIG_ENABLE_FUNC    0x0001
-+    FUNC_ENABLE_DISABLE_FLAGS    EnableFlags;     /* enable flags*/
-+    FUNC_ENABLE_TIMEOUT          TimeOut;         /* timeout in milliseconds */
-+    void (*pOpComplete)(PVOID Context, SDIO_STATUS status); /* reserved */
-+    PVOID                        pOpCompleteContext;        /* reserved */
-+}SDCONFIG_FUNC_ENABLE_DISABLE_DATA, *PSDCONFIG_FUNC_ENABLE_DISABLE_DATA;
-+
-+    /* slot current allocation data */
-+typedef struct _SDCONFIG_FUNC_SLOT_CURRENT_DATA {
-+    SD_SLOT_CURRENT     SlotCurrent;    /* slot current to request in mA*/
-+}SDCONFIG_FUNC_SLOT_CURRENT_DATA, *PSDCONFIG_FUNC_SLOT_CURRENT_DATA;
-+
-+/* slot bus mode configuration */
-+typedef struct _SDCONFIG_BUS_MODE_DATA {
-+    SD_BUSCLOCK_RATE   ClockRate;       /* clock rate in Hz */
-+    SD_BUSMODE_FLAGS   BusModeFlags;    /* bus mode flags */
-+    SD_BUSCLOCK_RATE   ActualClockRate; /* actual rate in KHz */
-+}SDCONFIG_BUS_MODE_DATA, *PSDCONFIG_BUS_MODE_DATA;
-+
-+/* defines configuration requests for the HCD */
-+typedef struct _SDCONFIG {
-+    SDCONFIG_COMMAND  Cmd;          /* configuration command */
-+    PVOID   pData;        /* configuration data */
-+    INT     DataLength;   /* config data length */
-+}SDCONFIG, *PSDCONFIG;
-+
-+#define SET_SDCONFIG_CMD_INFO(pHdr,cmd,pC,len) \
-+{           \
-+  (pHdr)->Cmd = (cmd);                     \
-+  (pHdr)->pData = (PVOID)(pC);             \
-+  (pHdr)->DataLength = (len);              \
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get a pointer to the configuration command data.
-+
-+  @function name: GET_SDCONFIG_CMD
-+  @prototype: UNIT16 GET_SDCONFIG_CMD (PSDCONFIG pCommand)
-+  @category: HD_Reference
-+
-+  @input:  pCommand - config command structure.
-+
-+  @return: command code
-+
-+  @notes: Implemented as a macro. This macro returns the command code for this
-+          configuration request.
-+
-+  @example: getting the command code:
-+    cmd = GET_SDCONFIG_CMD(pConfig);
-+    switch (cmd) {
-+        case SDCONFIG_GET_WP:
-+             .. get write protect switch position
-+           break;
-+        ...
-+    }
-+
-+  @see also: GET_SDCONFIG_CMD_LEN, GET_SDCONFIG_CMD_DATA
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define GET_SDCONFIG_CMD(pBuffer)     ((pBuffer)->Cmd)
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get a pointer to the configuration command data.
-+
-+  @function name: GET_SDCONFIG_CMD_LEN
-+  @prototype: INT GET_SDCONFIG_CMD_LEN (PSDCONFIG pCommand)
-+  @category: HD_Reference
-+
-+  @input:  pCommand - config command structure.
-+
-+  @return: length of config command data
-+
-+  @notes: Implemented as a macro. Host controller drivers can use this macro to extract
-+          the number of bytes of command specific data. This can be used to validate the
-+          config data buffer size.
-+
-+  @example: getting the data length:
-+    length = GET_SDCONFIG_CMD_LEN(pConfig);
-+    if (length < CUSTOM_COMMAND_XXX_SIZE) {
-+       ... invalid length
-+    }
-+
-+  @see also: GET_SDCONFIG_CMD, GET_SDCONFIG_CMD_DATA
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define GET_SDCONFIG_CMD_LEN(pBuffer) ((pBuffer)->DataLength)
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get a pointer to the configuration command data.
-+
-+  @function name: GET_SDCONFIG_CMD_DATA
-+  @prototype: (casted ptr) GET_SDCONFIG_CMD_DATA (type, PSDCONFIG pCommand)
-+  @category: HD_Reference
-+
-+  @input:  type - pointer type to cast the returned pointer to.
-+           pCommand - config command structure.
-+
-+  @return: type-casted pointer to the command's data
-+
-+  @notes: Implemented as a macro.  Host controller drivers can use this macro to extract
-+          a pointer to the command specific data in an HCD configuration request.
-+
-+  @example: getting the pointer:
-+        // get interrupt control data
-+    pIntControl = GET_SDCONFIG_CMD_DATA(PSDCONFIG_SDIO_INT_CTRL_DATA,pConfig);
-+    if (pIntControl->SlotIRQEnable) {
-+       ... enable slot IRQ detection
-+    }
-+
-+  @see also: GET_SDCONFIG_CMD, GET_SDCONFIG_CMD_LEN
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define GET_SDCONFIG_CMD_DATA(type,pBuffer) ((type)((pBuffer)->pData))
-+#define IS_SDCONFIG_CMD_GET(pBuffer)  ((pBuffer)->Cmd & SDCONFIG_FLAGS_DATA_GET)
-+#define IS_SDCONFIG_CMD_PUT(pBuffer)  ((pBuffer)->Cmd & SDCONFIG_FLAGS_DATA_PUT)
-+
-+struct _SDDEVICE;
-+struct _SDHCD;
-+
-+typedef UINT8   SD_FUNCTION_FLAGS;
-+#define SDFUNCTION_FLAG_REMOVING       0x01
-+
-+/* function driver registration structure */
-+typedef struct _SDFUNCTION {
-+    CT_VERSION_CODE Version;    /* version code of the SDIO stack */
-+      SDLIST     SDList;          /* internal use list*/
-+    PTEXT      pName;           /* name of registering driver */
-+    UINT       MaxDevices;      /* maximum number of devices supported by this function */
-+    UINT       NumDevices;      /* number of devices supported by this function */
-+    PSD_PNP_INFO pIds;          /* null terminated table of supported devices*/
-+    BOOL (*pProbe)(struct _SDFUNCTION *pFunction, struct _SDDEVICE *pDevice);/* New device inserted */
-+                                /* Device removed (NULL if not a hot-plug capable driver) */
-+    void (*pRemove)(struct _SDFUNCTION *pFunction, struct _SDDEVICE *pDevice);
-+    SDIO_STATUS (*pSuspend)(struct _SDFUNCTION *pFunction, SDPOWER_STATE state); /* Device suspended */
-+    SDIO_STATUS (*pResume)(struct _SDFUNCTION *pFunction); /* Device woken up */
-+                                /* Enable wake event */
-+    SDIO_STATUS (*pWake) (struct _SDFUNCTION *pFunction, SDPOWER_STATE state, BOOL enable);
-+      PVOID      pContext;        /* function driver use data */
-+      OS_PNPDRIVER Driver;        /* driver registration with base system */
-+      SDLIST     DeviceList;      /* the list of devices this driver is using*/
-+    OS_SIGNAL   CleanupReqSig;  /* wait for requests completion on cleanup (internal use) */
-+    SD_FUNCTION_FLAGS Flags;    /* internal flags (internal use) */
-+}SDFUNCTION, *PSDFUNCTION;
-+
-+typedef UINT8  HCD_EVENT;
-+
-+    /* device info for SDIO functions */
-+typedef struct _SDIO_DEVICE_INFO {
-+    UINT32  FunctionCISPtr;         /* function's CIS ptr */
-+    UINT32  FunctionCSAPtr;         /* function's CSA ptr */
-+    UINT16  FunctionMaxBlockSize;   /* function's reported max block size */
-+}SDIO_DEVICE_INFO, *PSDIO_DEVICE_INFO;
-+
-+    /* device info for SD/MMC card functions */
-+typedef struct _SDMMC_INFO{
-+    UINT8  Unused;    /* reserved */
-+}SDMMC_INFO, *PSDMMC_INFO;
-+
-+    /* union of SDIO function and device info */
-+typedef union _SDDEVICE_INFO {
-+    SDIO_DEVICE_INFO AsSDIOInfo;
-+    SDMMC_INFO       AsSDMMCInfo;
-+}SDDEVICE_INFO, *PSDDEVICE_INFO;
-+
-+
-+typedef UINT8   SD_DEVICE_FLAGS;
-+#define SDDEVICE_FLAG_REMOVING       0x01
-+
-+/* inserted device description, describes an inserted card */
-+typedef struct _SDDEVICE {
-+    SDLIST      SDList;             /* internal use list*/
-+    SDLIST      FuncListLink;       /* internal use list */
-+                                    /* read/write request function */
-+    SDIO_STATUS (*pRequest)(struct _SDDEVICE *pDev, PSDREQUEST req);
-+                                    /* get/set configuration */
-+    SDIO_STATUS (*pConfigure)(struct _SDDEVICE *pDev, PSDCONFIG config);
-+    PSDREQUEST  (*AllocRequest)(struct _SDDEVICE *pDev);      /* allocate a request */
-+    void        (*FreeRequest)(struct _SDDEVICE *pDev, PSDREQUEST pReq); /* free the request */
-+    void        (*pIrqFunction)(PVOID pContext);       /* interrupt routine, synchronous calls allowed */
-+    void        (*pIrqAsyncFunction)(PVOID pContext); /* async IRQ function , asynch only calls */
-+    PVOID       IrqContext;         /* irq context */
-+    PVOID       IrqAsyncContext;    /* irq async context */
-+    PSDFUNCTION pFunction;          /* function driver supporting this device */
-+    struct _SDHCD  *pHcd;           /* host controller this device is on (internal use) */
-+    SDDEVICE_INFO   DeviceInfo;     /* device info */
-+    SD_PNP_INFO pId[1];             /* id of this device  */
-+    OS_PNPDEVICE Device;            /* device registration with base system */
-+    SD_SLOT_CURRENT  SlotCurrentAlloc; /* allocated slot current for this device/function (internal use) */
-+    SD_DEVICE_FLAGS Flags;          /* internal use flags */
-+    CT_VERSION_CODE Version;        /* version code of the bus driver */
-+}SDDEVICE, *PSDDEVICE;
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get SDIO Bus Driver Version Major number
-+
-+  @function name: SDDEVICE_GET_VERSION_MAJOR
-+  @prototype: INT SDDEVICE_GET_VERSION_MAJOR(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: integer value for the major version
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_GET_VERSION_MINOR
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_VERSION_MAJOR(pDev) (GET_SDIO_STACK_VERSION_MAJOR(pDev))
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get SDIO Bus Driver Version Minor number
-+
-+  @function name: SDDEVICE_GET_VERSION_MINOR
-+  @prototype: INT SDDEVICE_GET_VERSION_MINOR(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: integer value for the minor version
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_GET_VERSION_MAJOR
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_VERSION_MINOR(pDev) (GET_SDIO_STACK_VERSION_MINOR(pDev))
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Test the SDIO revision for greater than or equal to 1.10
-+
-+  @function name: SDDEVICE_IS_SDIO_REV_GTEQ_1_10
-+  @prototype: BOOL SDDEVICE_IS_SDIO_REV_GTEQ_1_10(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: TRUE if the revision is greater than or equal to 1.10
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_IS_SD_REV_GTEQ_1_10
-+  @see also: SDDEVICE_IS_MMC_REV_GTEQ_4_0
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_IS_SDIO_REV_GTEQ_1_10(pDev) ((pDev)->pHcd->CardProperties.SDIORevision >= SDIO_REVISION_1_10)
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Test the SDIO revision for greater than or equal to 1.20
-+
-+  @function name: SDDEVICE_IS_SDIO_REV_GTEQ_1_20
-+  @prototype: BOOL SDDEVICE_IS_SDIO_REV_GTEQ_1_20(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: TRUE if the revision is greater than or equal to 1.20
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_IS_SD_REV_GTEQ_1_10
-+  @see also: SDDEVICE_IS_SDIO_REV_GTEQ_1_10
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_IS_SDIO_REV_GTEQ_1_20(pDev) ((pDev)->pHcd->CardProperties.SDIORevision >= SDIO_REVISION_1_20)
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Test the SD revision for greater than or equal to 1.10
-+
-+  @function name: SDDEVICE_IS_SD_REV_GTEQ_1_10
-+  @prototype: BOOL SDDEVICE_IS_SD_REV_GTEQ_1_10(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: TRUE if the revision is greater than or equal to 1.10
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_IS_SDIO_REV_GTEQ_1_10
-+  @see also: SDDEVICE_IS_MMC_REV_GTEQ_4_0
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_IS_SD_REV_GTEQ_1_10(pDev) ((pDev)->pHcd->CardProperties.SD_MMC_Revision >= SD_REVISION_1_10)
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Test the MMC revision for greater than or equal to 4.0
-+
-+  @function name: SDDEVICE_IS_MMC_REV_GTEQ_4_0
-+  @prototype: BOOL SDDEVICE_IS_MMC_REV_GTEQ_4_0(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: TRUE if the revision is greater than or equal to 4.0
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_IS_SDIO_REV_GTEQ_1_10
-+  @see also: SDDEVICE_IS_SD_REV_GTEQ_1_10
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_IS_MMC_REV_GTEQ_4_0(pDev) ((pDev)->pHcd->CardProperties.SD_MMC_Revision >= MMC_REVISION_4_0)
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Test for write protect enabled
-+
-+  @function name: SDDEVICE_IS_CARD_WP_ON
-+  @prototype: BOOL SDDEVICE_IS_CARD_WP_ON(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: TRUE if device is write protected.
-+
-+  @notes: Implemented as a macro.
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_IS_CARD_WP_ON(pDev)       ((pDev)->pHcd->CardProperties.Flags & CARD_SD_WP)
-+
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the device's manufacturer specific ID
-+
-+  @function name: SDDEVICE_GET_SDIO_MANFID
-+  @prototype: UINT16 SDDEVICE_GET_SDIO_MANFID(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: function number
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_GET_SDIO_MANFCODE
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SDIO_MANFID(pDev)     (pDev)->pId[0].SDIO_ManufacturerID
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the device's manufacturer code
-+
-+  @function name: SDDEVICE_GET_SDIO_MANFCODE
-+  @prototype: UINT16 SDDEVICE_GET_SDIO_MANFCODE(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: function number
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_GET_SDIO_MANFID
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SDIO_MANFCODE(pDev)     (pDev)->pId[0].SDIO_ManufacturerCode
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the device's function number
-+
-+  @function name: SDDEVICE_GET_SDIO_FUNCNO
-+  @prototype: UINT8 SDDEVICE_GET_SDIO_FUNCNO(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: function number
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_GET_SDIO_FUNC_CLASS
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SDIO_FUNCNO(pDev)     (pDev)->pId[0].SDIO_FunctionNo
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the functions's class
-+
-+  @function name: SDDEVICE_GET_SDIO_FUNC_CLASS
-+  @prototype: UINT8 SDDEVICE_GET_SDIO_FUNC_CLASS(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: class number
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_GET_SDIO_FUNCNO
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SDIO_FUNC_CLASS(pDev) (pDev)->pId[0].SDIO_FunctionClass
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the functions's Card Information Structure pointer
-+
-+  @function name: SDDEVICE_GET_SDIO_FUNC_CISPTR
-+  @prototype: UINT32 SDDEVICE_GET_SDIO_FUNC_CISPTR(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: CIS offset
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_GET_SDIO_FUNC_CSAPTR
-+  @see also: SDDEVICE_GET_SDIO_COMMON_CISPTR
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SDIO_FUNC_CISPTR(pDev)(pDev)->DeviceInfo.AsSDIOInfo.FunctionCISPtr
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the functions's Code Stoarge Area pointer
-+
-+  @function name: SDDEVICE_GET_SDIO_FUNC_CSAPTR
-+  @prototype: UINT32 SDDEVICE_GET_SDIO_FUNC_CSAPTR(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: CSA offset
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_GET_SDIO_FUNC_CISPTR
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SDIO_FUNC_CSAPTR(pDev)(pDev)->DeviceInfo.AsSDIOInfo.FunctionCSAPtr
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the functions's maximum reported block size
-+
-+  @function name: SDDEVICE_GET_SDIO_FUNC_MAXBLKSIZE
-+  @prototype: UINT16 SDDEVICE_GET_SDIO_FUNC_MAXBLKSIZE(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: block size
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also:
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SDIO_FUNC_MAXBLKSIZE(pDev) (pDev)->DeviceInfo.AsSDIOInfo.FunctionMaxBlockSize
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the common Card Information Structure pointer
-+
-+  @function name: SDDEVICE_GET_SDIO_COMMON_CISPTR
-+  @prototype: UINT32 SDDEVICE_GET_SDIO_COMMON_CISPTR(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: Common CIS Address (in SDIO address space)
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_GET_SDIO_FUNC_CSAPTR
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SDIO_COMMON_CISPTR(pDev) (pDev)->pHcd->CardProperties.CommonCISPtr
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the card capabilities
-+
-+  @function name: SDDEVICE_GET_SDIO_CARD_CAPS
-+  @prototype: UINT8 SDDEVICE_GET_SDIO_CARD_CAPS(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: 8-bit card capabilities register
-+
-+  @notes: Implemented as a macro. Refer to SDIO spec for decoding.
-+
-+  @see also: SDDEVICE_GET_CARD_FLAGS
-+  @see also: SDDEVICE_GET_SDIOCARD_CAPS
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SDIO_CARD_CAPS(pDev)     (pDev)->pHcd->CardProperties.SDIOCaps
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the card flags
-+
-+  @function name: SDDEVICE_GET_CARD_FLAGS
-+  @prototype: CARD_INFO_FLAGS SDDEVICE_GET_CARD_FLAGS(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: flags
-+
-+  @notes: Implemented as a macro.
-+
-+  @example: Get card type:
-+        CARD_INFO_FLAGS flags;
-+        flags = SDDEVICE_GET_CARD_FLAGS(pDevice);
-+        switch(GET_CARD_TYPE(flags)) {
-+            case CARD_MMC: // Multi-media card
-+                ...
-+            case CARD_SD:  // SD-Memory present
-+                ...
-+            case CARD_SDIO: // SDIO card present
-+                ...
-+            case CARD_COMBO: //SDIO card with SD
-+                ...
-+        }
-+        if (flags & CARD_SD_WP) {
-+            ...SD write protect on
-+        }
-+
-+  @see also: SDDEVICE_GET_SDIO_CARD_CAPS
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_CARD_FLAGS(pDev)      (pDev)->pHcd->CardProperties.Flags
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the Relative Card Address register
-+
-+  @function name: SDDEVICE_GET_CARD_RCA
-+  @prototype: UINT16 SDDEVICE_GET_CARD_RCA(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: register address
-+
-+  @notes: Implemented as a macro. Refer to SDIO spec for decoding.
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_CARD_RCA(pDev)        (pDev)->pHcd->CardProperties.RCA
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get operational bus clock
-+
-+  @function name: SDDEVICE_GET_OPER_CLOCK
-+  @prototype: SD_BUSCLOCK_RATE SDDEVICE_GET_OPER_CLOCK(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: clock rate
-+
-+  @notes: Implemented as a macro. Returns the current bus clock rate.
-+          This may be lower than reported by the card due to Host Controller,
-+          Bus driver, or power management limitations.
-+
-+  @see also: SDDEVICE_GET_MAX_CLOCK
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_OPER_CLOCK(pDev)      (pDev)->pHcd->CardProperties.OperBusClock
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get maximum bus clock
-+
-+  @function name: SDDEVICE_GET_MAX_CLOCK
-+  @prototype: SD_BUSCLOCK_RATE SDDEVICE_GET_MAX_CLOCK(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: clock rate
-+
-+  @notes: To obtain the current maximum clock rate use SDDEVICE_GET_OPER_CLOCK().
-+          This rate my be lower than the host controllers maximum obtained using
-+          SDDEVICE_GET_MAX_CLOCK().
-+
-+  @see also: SDDEVICE_GET_OPER_CLOCK
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_MAX_CLOCK(pDev)       (pDev)->pHcd->MaxClockRate
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get operational maximum block length.
-+
-+  @function name: SDDEVICE_GET_OPER_BLOCK_LEN
-+  @prototype: UINT16 SDDEVICE_GET_OPER_BLOCK_LEN(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: block size in bytes
-+
-+  @notes: Implemented as a macro. Returns the maximum current block length.
-+          This may be lower than reported by the card due to Host Controller,
-+          Bus driver, or power management limitations.
-+
-+  @see also: SDDEVICE_GET_MAX_BLOCK_LEN
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_OPER_BLOCK_LEN(pDev)  (pDev)->pHcd->CardProperties.OperBlockLenLimit
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get maximum block length.
-+
-+  @function name: SDDEVICE_GET_MAX_BLOCK_LEN
-+  @prototype: UINT16 SDDEVICE_GET_MAX_BLOCK_LEN(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: block size in bytes
-+
-+  @notes: Implemented as a macro. Use SDDEVICE_GET_OPER_BLOCK_LEN to obtain
-+          the current block length.
-+
-+  @see also: SDDEVICE_GET_OPER_BLOCK_LEN
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_MAX_BLOCK_LEN(pDev)   (pDev)->pHcd->MaxBytesPerBlock
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get operational maximum block count.
-+
-+  @function name: SDDEVICE_GET_OPER_BLOCKS
-+  @prototype: UINT16 SDDEVICE_GET_OPER_BLOCKS(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: maximum number of blocks per transaction.
-+
-+  @notes: Implemented as a macro. Returns the maximum current block count.
-+          This may be lower than reported by the card due to Host Controller,
-+          Bus driver, or power management limitations.
-+
-+  @see also: SDDEVICE_GET_MAX_BLOCK_LEN
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_OPER_BLOCKS(pDev)     (pDev)->pHcd->CardProperties.OperBlockCountLimit
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get maximum block count.
-+
-+  @function name: SDDEVICE_GET_MAX_BLOCKS
-+  @prototype: UINT16 SDDEVICE_GET_MAX_BLOCKS(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: maximum number of blocks per transaction.
-+
-+  @notes: Implemented as a macro. Use SDDEVICE_GET_OPER_BLOCKS to obtain
-+          the current block count.
-+
-+  @see also: SDDEVICE_GET_OPER_BLOCKS
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_MAX_BLOCKS(pDev)      (pDev)->pHcd->MaxBlocksPerTrans
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get applied slot voltage
-+
-+  @function name: SDDEVICE_GET_SLOT_VOLTAGE_MASK
-+  @prototype: SLOT_VOLTAGE_MASK SDDEVICE_GET_SLOT_VOLTAGE_MASK(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: slot voltage mask
-+
-+  @notes: This function returns the applied voltage on the slot. The voltage value is a
-+          mask having the following values:
-+          SLOT_POWER_3_3V
-+          SLOT_POWER_3_0V
-+          SLOT_POWER_2_8V
-+          SLOT_POWER_2_0V
-+          SLOT_POWER_1_8V
-+          SLOT_POWER_1_6V
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SLOT_VOLTAGE_MASK(pDev)   (pDev)->pHcd->CardProperties.CardVoltage
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the Card Specific Data Register.
-+
-+  @function name: SDDEVICE_GET_CARDCSD
-+  @prototype: PUINT8 SDDEVICE_GET_CARDCSD(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return:  UINT8 CardCSD[MAX_CARD_RESPONSE_BYTES] array of CSD data.
-+
-+  @notes: Implemented as a macro.
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_CARDCSD(pDev)         (pDev)->pHcd->CardProperties.CardCSD
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the bus mode flags
-+
-+  @function name: SDDEVICE_GET_BUSMODE_FLAGS
-+  @prototype: SD_BUSMODE_FLAGS SDDEVICE_GET_BUSMODE_FLAGS(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return:
-+
-+  @notes: Implemented as a macro.  This function returns the raw bus mode flags.  This
-+          is useful for function drivers that wish to override the bus clock without
-+          modifying the current bus mode.
-+
-+  @see also: SDDEVICE_GET_BUSWIDTH
-+  @see also: SDCONFIG_BUS_MODE_CTRL
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_BUSMODE_FLAGS(pDev)  (pDev)->pHcd->CardProperties.BusMode
-+
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the bus width.
-+
-+  @function name: SDDEVICE_GET_BUSWIDTH
-+  @prototype: UINT8 SDDEVICE_GET_BUSWIDTH(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return:  bus width: SDCONFIG_BUS_WIDTH_SPI, SDCONFIG_BUS_WIDTH_1_BIT, SDCONFIG_BUS_WIDTH_4_BIT
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_IS_BUSMODE_SPI
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_BUSWIDTH(pDev)        SDCONFIG_GET_BUSWIDTH((pDev)->pHcd->CardProperties.BusMode)
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Is bus in SPI mode.
-+
-+  @function name: SDDEVICE_IS_BUSMODE_SPI
-+  @prototype: BOOL SDDEVICE_IS_BUSMODE_SPI(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return:  TRUE, SPI mode.
-+
-+  @notes: Implemented as a macro.
-+
-+  @see also: SDDEVICE_GET_BUSWIDTH
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_IS_BUSMODE_SPI(pDev) (SDDEVICE_GET_BUSWIDTH(pDev) == SDCONFIG_BUS_WIDTH_SPI)
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Send a request to a device.
-+
-+  @function name: SDDEVICE_CALL_REQUEST_FUNC
-+  @prototype: SDIO_STATUS SDDEVICE_CALL_REQUEST_FUNC(PSDDEVICE pDevice, PSDREQUEST pRequest)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+  @input:  pRequest  - the request to be sent
-+
-+  @output: none
-+
-+  @return: SDIO_STATUS
-+
-+  @notes: Sends a request to the specified device. If the request is successfully sent, then
-+          the response flags can be checked to detemine the result of the request.
-+
-+  @example: Example of sending a request to a device:
-+    PSDREQUEST  pReq = NULL;
-+    //allocate a request
-+    pReq = SDDeviceAllocRequest(pDevice);
-+    if (NULL == pReq) {
-+        return SDIO_STATUS_NO_RESOURCES;
-+    }
-+    //initialize the request
-+    SDLIB_SetupCMD52Request(FuncNo, Address, Write, *pData, pReq);
-+    //send the request to the target
-+    status = SDDEVICE_CALL_REQUEST_FUNC(pDevice,pReq);
-+    if (!SDIO_SUCCESS(status)) {
-+        break;
-+    }
-+    //check the request response (based on the request type)
-+    if (SD_R5_GET_RESP_FLAGS(pReq->Response) & SD_R5_ERRORS) {
-+        ...
-+    }
-+    if (!Write) {
-+            // store the byte
-+        *pData =  SD_R5_GET_READ_DATA(pReq->Response);
-+    }
-+    //free the request
-+    SDDeviceFreeRequest(pDevice,pReq);
-+    ...
-+
-+  @see also: SDDeviceAllocRequest
-+  @see also: SDDEVICE_CALL_CONFIG_FUNC
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_CALL_REQUEST_FUNC(pDev,pReq)  (pDev)->pRequest((pDev),(pReq))
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Send configuration to a device.
-+
-+  @function name: SDDEVICE_CALL_CONFIG_FUNC
-+  @prototype: SDIO_STATUS SDDEVICE_CALL_CONFIG_FUNC(PSDDEVICE pDevice, PSDCONFIG pConfigure)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+  @input:  pConfigure - configuration request
-+
-+  @output: none
-+
-+  @return: SDIO_STATUS
-+
-+  @notes: Sends a configuration request to the specified device.
-+
-+  @example: Example of sending a request to a device:
-+        SDCONFIG  configHdr;
-+        SDCONFIG_FUNC_ENABLE_DISABLE_DATA fData;
-+        fData.EnableFlags = SDCONFIG_ENABLE_FUNC;
-+        fData.TimeOut = 500;
-+        SET_SDCONFIG_CMD_INFO(&configHdr, SDCONFIG_FUNC_ENABLE_DISABLE, fData, sizeof(fData));
-+        return SDDEVICE_CALL_CONFIG_FUNC(pDevice, &configHdr);
-+
-+  @see also: SDLIB_IssueConfig
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_CALL_CONFIG_FUNC(pDev,pCfg)   (pDev)->pConfigure((pDev),(pCfg))
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Allocate a request structure.
-+
-+  @function name: SDDeviceAllocRequest
-+  @prototype: PSDREQUEST SDDeviceAllocRequest(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: request pointer or NULL if not available.
-+
-+  @notes:  This function must not be called in a non-schedulable (interrupts off) context.
-+           Allocating memory on some OSes may block.
-+
-+  @see also: SDDEVICE_CALL_REQUEST_FUNC
-+  @see also: SDDeviceFreeRequest
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDeviceAllocRequest(pDev)        (pDev)->AllocRequest((pDev))
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Free a request structure.
-+
-+  @function name: SDDeviceFreeRequest
-+  @prototype: void SDDeviceFreeRequest(PSDDEVICE pDevice, PSDREQUEST pRequest)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+  @input:  pRequest  - request allocated by SDDeviceAllocRequest().
-+
-+  @output: none
-+
-+  @return: none
-+
-+  @notes: This function must not be called in a non-schedulable (interrupts off) context.
-+          Freeing memory on some OSes may block.
-+
-+  @see also: SDDEVICE_CALL_REQUEST_FUNC
-+  @see also: SDDeviceAllocRequest
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDeviceFreeRequest(pDev,pReq)    (pDev)->FreeRequest((pDev),pReq)
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Register an interrupt handler for a device.
-+
-+  @function name: SDDEVICE_SET_IRQ_HANDLER
-+  @prototype: void SDDEVICE_SET_IRQ_HANDLER(PSDDEVICE pDevice,
-+                                            void (*pIrqFunction)(PVOID pContext),
-+                                            PVOID pContext)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+  @input:  pIrqFunction  - the interrupt function to execute.
-+  @input:  pContext  - context value passed into interrupt routine.
-+
-+  @output: none
-+
-+  @return: none
-+
-+  @notes: The registered routine will be called upon each card interrupt.
-+          The interrupt function should acknowledge the interrupt when it is
-+          ready to handle more interrupts using:
-+          SDLIB_IssueConfig(pDevice, SDCONFIG_FUNC_ACK_IRQ, NULL, 0);
-+          The interrupt handler can perform synchronous request calls.
-+
-+  @see also: SDDEVICE_SET_ASYNC_IRQ_HANDLER
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_SET_IRQ_HANDLER(pDev,pFn,pContext)  \
-+{                                                    \
-+    (pDev)->pIrqFunction = (pFn);                    \
-+    (pDev)->IrqContext = (PVOID)(pContext);          \
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Register an asynchronous interrupt handler for a device.
-+
-+  @function name: SDDEVICE_SET_ASYNC_IRQ_HANDLER
-+  @prototype: void SDDEVICE_SET_ASYNC_IRQ_HANDLER(PSDDEVICE pDevice,
-+                                            void (*pIrqAsyncFunction)(PVOID pContext),
-+                                            PVOID pContext)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+  @input:  pIrqAsyncFunction  - the interrupt function to execute.
-+  @input:  pContext  - context value passed into interrupt routine.
-+
-+  @output: none
-+
-+  @return: none
-+
-+  @notes: The registered routine will be called upon each card interrupt.
-+          The interrupt function should acknowledge the interrupt when it is
-+          ready to handle more interrupts using:
-+          SDLIB_IssueConfig(pDevice, SDCONFIG_FUNC_ACK_IRQ, NULL, 0);
-+          The interrupt handler can not perform any synchronous request calls.
-+          Using this call provides a faster interrupt dispatch, but limits all
-+          requests to asynchronous mode.
-+
-+  @see also: SDDEVICE_SET_IRQ_HANDLER
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_SET_ASYNC_IRQ_HANDLER(pDev,pFn,pContext)  \
-+{                                                          \
-+    (pDev)->pIrqAsyncFunction = (pFn);                     \
-+    (pDev)->IrqAsyncContext = (PVOID)(pContext);           \
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the SDIO capabilities rgeister.
-+
-+  @function name: SDDEVICE_GET_SDIOCARD_CAPS
-+  @prototype: UINT8 SDDEVICE_GET_SDIOCARD_CAPS(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return: SD capabilities
-+
-+  @notes: See SD specification for decoding of these capabilities.
-+
-+  @see also: SDDEVICE_GET_SDIO_CARD_CAPS
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SDIOCARD_CAPS(pDev) (pDev)->pHcd->CardProperties.SDIOCaps
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get HCD driver name
-+
-+  @function name: SDDEVICE_GET_HCDNAME
-+  @prototype: PTEXT SDDEVICE_GET_HCDNAME(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice   - the target device for this request
-+
-+  @output: none
-+
-+  @return:  pointer to a string containing the name of the underlying HCD
-+
-+  @notes: Implemented as a macro.
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_HCDNAME(pDev)  (pDev)->pHcd->pName
-+
-+
-+#define SDDEVICE_CALL_IRQ_HANDLER(pDev)       (pDev)->pIrqFunction((pDev)->IrqContext)
-+#define SDDEVICE_CALL_IRQ_ASYNC_HANDLER(pDev) (pDev)->pIrqAsyncFunction((pDev)->IrqAsyncContext)
-+
-+
-+#define SDDEVICE_SET_SDIO_FUNCNO(pDev,Num) (pDev)->pId[0].SDIO_FunctionNo = (Num)
-+#define SDDEVICE_IS_CARD_REMOVED(pDev)     ((pDev)->pHcd->CardProperties.CardState & \
-+                                             CARD_STATE_REMOVED)
-+
-+
-+typedef enum _SDHCD_IRQ_PROC_STATE {
-+    SDHCD_IDLE = 0,
-+    SDHCD_IRQ_PENDING = 1,
-+    SDHCD_IRQ_HELPER  = 2
-+}SDHCD_IRQ_PROC_STATE, *PSDHCD_IRQ_PROC_STATE;
-+
-+/* host controller bus driver registration structure */
-+typedef struct _SDHCD {
-+    CT_VERSION_CODE Version;    /* version code of the SDIO stack */
-+    SDLIST  SDList;             /* internal use list*/
-+    PTEXT   pName;              /* name of registering host/slot driver */
-+    UINT32  Attributes;         /* attributes of host controller */
-+    UINT16  MaxBytesPerBlock;   /* max bytes per block */
-+    UINT16  MaxBlocksPerTrans;  /* max blocks per transaction */
-+    SD_SLOT_CURRENT  MaxSlotCurrent;  /* max current per slot in milli-amps */
-+    UINT8   SlotNumber;         /* sequential slot number for this HCD, set by bus driver */
-+    SD_BUSCLOCK_RATE    MaxClockRate;         /* max clock rate in hz */
-+    SLOT_VOLTAGE_MASK   SlotVoltageCaps;      /* slot voltage capabilities */
-+    SLOT_VOLTAGE_MASK   SlotVoltagePreferred; /* preferred slot voltage */
-+    PVOID   pContext;                         /* host controller driver use data   */
-+    SDIO_STATUS (*pRequest)(struct _SDHCD *pHcd);
-+                                /* get/set configuration */
-+    SDIO_STATUS (*pConfigure)(struct _SDHCD *pHcd, PSDCONFIG pConfig);
-+        /* everything below this line is for bus driver use */
-+    OS_SEMAPHORE    ConfigureOpsSem;    /* semaphore to make specific configure ops atomic, internal use */
-+    OS_CRITICALSECTION HcdCritSection;  /* critical section to protect hcd data structures (internal use) */
-+    SDREQUESTQUEUE  RequestQueue;       /* request queue, internal use */
-+    PSDREQUEST      pCurrentRequest;    /* current request we are working on */
-+    CARD_PROPERTIES CardProperties;     /* properties for the currently inserted card*/
-+    OSKERNEL_HELPER SDIOIrqHelper;      /* synch IRQ helper, internal use */
-+    SDDEVICE        *pPseudoDev;        /* pseudo device used for initialization (internal use) */
-+    UINT8           PendingHelperIrqs;  /* IRQ helper pending IRQs */
-+    UINT8           PendingIrqAcks;     /* pending IRQ acks from function drivers */
-+    UINT8           IrqsEnabled;        /* current irq enabled mask */
-+    SDHCD_IRQ_PROC_STATE IrqProcState;  /* irq processing state */
-+    POS_DEVICE      pDevice;            /* device registration with base system */
-+    SD_SLOT_CURRENT SlotCurrentAllocated; /* slot current allocated (internal use ) */
-+    ATOMIC_FLAGS    HcdFlags;             /* HCD Flags */
-+#define HCD_REQUEST_CALL_BIT  0
-+#define HCD_IRQ_NO_PEND_CHECK 1           /* HCD flag to bypass interrupt pending register
-+                                             check, typically done on single function cards */
-+    SDREQUESTQUEUE  CompletedRequestQueue; /* completed request queue, internal use */
-+    PSDDMA_DESCRIPTION pDmaDescription; /* description of HCD's DMA capabilities */
-+    POS_MODULE         pModule;         /* OS-specific module information */
-+    INT                Recursion;       /* recursion level */
-+    PVOID              Reserved1;
-+    PVOID              Reserved2;
-+}SDHCD, *PSDHCD;
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get a pointer to the HCD's DMA description
-+
-+  @function name: SDGET_DMA_DESCRIPTION
-+  @prototype: PSDDMA_DESCRIPTION SDGET_DMA_DESCRIPTION(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice - device structure
-+
-+  @return: PSDDMA_DESCRIPTION or NULL if no DMA support
-+
-+  @notes: Implemented as a macro.
-+
-+  @example: getting the current request:
-+          PSDDMA_DESCRIPTION pDmaDescrp = SDGET_DMA_DESCRIPTION(pDevice);
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDGET_DMA_DESCRIPTION(pDevice)     (pDevice)->pHcd->pDmaDescription
-+
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get the logical slot number the device is assigned to.
-+
-+  @function name: SDDEVICE_GET_SLOT_NUMBER
-+  @prototype: UINT8 SDDEVICE_GET_SLOT_NUMBER(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input:  pDevice - device structure
-+
-+  @return: unsigned number representing the slot number
-+
-+  @notes: Implemented as a macro. This value is unique for each physical slot in the system
-+          and assigned by the bus driver. Devices on a multi-function card will share the same
-+          slot number.
-+
-+  @example: getting the slot number:
-+          UINT8 thisSlot = SDDEVICE_GET_SLOT_NUMBER(pDevice);
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDDEVICE_GET_SLOT_NUMBER(pDevice) (pDevice)->pHcd->SlotNumber
-+
-+/* for function use */
-+SDIO_STATUS SDIO_RegisterFunction(PSDFUNCTION pFunction);
-+SDIO_STATUS SDIO_UnregisterFunction(PSDFUNCTION pFunction);
-+
-+#include "sdio_hcd_defs.h"
-+#endif /* __SDIO_BUSDRIVER_H___ */
-diff --git a/include/linux/sdio/sdio_hcd_defs.h b/include/linux/sdio/sdio_hcd_defs.h
-new file mode 100644
-index 0000000..1782469
---- /dev/null
-+++ b/include/linux/sdio/sdio_hcd_defs.h
-@@ -0,0 +1,219 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdio_hcd_defs.h
-+
-+@abstract: host controller driver definitions
-+
-+@notice: Copyright (c), 2005-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#ifndef __SDIO_HCD_DEFS_H___
-+#define __SDIO_HCD_DEFS_H___
-+
-+    /* write protect switch position data */
-+typedef UINT8 SDCONFIG_WP_VALUE;
-+
-+    /* HC commands */
-+#define SDCONFIG_SEND_INIT_CLOCKS  (SDCONFIG_FLAGS_HC_CONFIG | SDCONFIG_FLAGS_DATA_PUT  | 1)
-+#define SDCONFIG_SDIO_INT_CTRL     (SDCONFIG_FLAGS_HC_CONFIG | SDCONFIG_FLAGS_DATA_PUT  | 2)
-+#define SDCONFIG_SDIO_REARM_INT    (SDCONFIG_FLAGS_HC_CONFIG | SDCONFIG_FLAGS_DATA_NONE | 3)
-+#define SDCONFIG_BUS_MODE_CTRL     (SDCONFIG_FLAGS_HC_CONFIG | SDCONFIG_FLAGS_DATA_BOTH | 4)
-+#define SDCONFIG_POWER_CTRL        (SDCONFIG_FLAGS_HC_CONFIG | SDCONFIG_FLAGS_DATA_PUT  | 5)
-+#define SDCONFIG_GET_WP            (SDCONFIG_FLAGS_HC_CONFIG | SDCONFIG_FLAGS_DATA_GET  | 6)
-+
-+    /* slot init clocks control */
-+typedef struct _SDCONFIG_INIT_CLOCKS_DATA  {
-+    UINT16  NumberOfClocks;  /* number of clocks to issue in the current bus mode*/
-+}SDCONFIG_INIT_CLOCKS_DATA, *PSDCONFIG_INIT_CLOCKS_DATA;
-+
-+/* slot power control */
-+typedef struct _SDCONFIG_POWER_CTRL_DATA  {
-+    BOOL                SlotPowerEnable;            /* turn on/off slot power */
-+    SLOT_VOLTAGE_MASK   SlotPowerVoltageMask;       /* slot power voltage mask */
-+}SDCONFIG_POWER_CTRL_DATA, *PSDCONFIG_POWER_CTRL_DATA;
-+
-+typedef UINT8 SDIO_IRQ_MODE_FLAGS;
-+/* SDIO Interrupt control */
-+typedef struct _SDCONFIG_SDIO_INT_CTRL_DATA  {
-+    BOOL                  SlotIRQEnable;      /* turn on/off Slot IRQ detection */
-+    SDIO_IRQ_MODE_FLAGS   IRQDetectMode;      /* slot IRQ detect mode , only valid if Enabled = TRUE */
-+#define IRQ_DETECT_RAW       0x00
-+#define IRQ_DETECT_MULTI_BLK 0x01
-+#define IRQ_DETECT_4_BIT     0x02
-+#define IRQ_DETECT_1_BIT     0x04
-+#define IRQ_DETECT_SPI       0x08
-+}SDCONFIG_SDIO_INT_CTRL_DATA, *PSDCONFIG_SDIO_INT_CTRL_DATA;
-+
-+/* card insert */
-+#define EVENT_HCD_ATTACH               1
-+/* card remove */
-+#define EVENT_HCD_DETACH               2
-+/* card slot interrupt */
-+#define EVENT_HCD_SDIO_IRQ_PENDING     3
-+/* transfer done */
-+#define EVENT_HCD_TRANSFER_DONE        4
-+/* (internal use only) */
-+#define EVENT_HCD_CD_POLLING           5
-+/* NOP */
-+#define EVENT_HCD_NOP                  0
-+
-+/* attrib_flags */
-+#define SDHCD_ATTRIB_SUPPORTS_POWER   0x0001  /* host controller driver supports power managment */
-+#define SDHCD_ATTRIB_BUS_1BIT         0x0002  /* SD Native 1 - bit mode */
-+#define SDHCD_ATTRIB_BUS_4BIT         0x0004  /* SD Native 4 - bit mode */
-+#define SDHCD_ATTRIB_BUS_SPI          0x0008  /* SPI mode capable */
-+#define SDHCD_ATTRIB_READ_WAIT        0x0010  /* read wait supported (SD-only) */
-+#define SDHCD_ATTRIB_MULTI_BLK_IRQ    0x0020  /* interrupts between multi-block capable (SD-only) */
-+#define SDHCD_ATTRIB_BUS_MMC8BIT      0x0040  /* MMC  8-bit */
-+#define SDHCD_ATTRIB_SLOT_POLLING     0x0080  /* requires slot polling for Card Detect */
-+#define SDHCD_ATTRIB_POWER_SWITCH     0x0100  /* host has power switch control, must be set if SPI
-+                                                 mode can be switched to 1 or 4 bit mode */
-+#define SDHCD_ATTRIB_NO_SPI_CRC       0x0200  /* when in SPI mode,
-+                                                 host wants to run without SPI CRC */
-+#define SDHCD_ATTRIB_AUTO_CMD12       0x0400  /* host controller supports auto CMD12 */
-+#define SDHCD_ATTRIB_NO_4BIT_IRQ      0x0800  /* host controller does not support 4 bit IRQ mode*/
-+#define SDHCD_ATTRIB_RAW_MODE         0x1000  /* host controller is a raw mode hcd*/
-+#define SDHCD_ATTRIB_SD_HIGH_SPEED    0x2000  /* host controller supports SD high speed interface */
-+#define SDHCD_ATTRIB_MMC_HIGH_SPEED   0x4000  /* host controller supports MMC high speed interface */
-+
-+#define IS_CARD_PRESENT(pHcd)         ((pHcd)->CardProperties.Flags & CARD_TYPE_MASK)
-+#define SET_CURRENT_REQUEST(pHcd,Req) (pHcd)->pCurrentRequest = (Req)
-+#define IS_HCD_RAW(pHcd)              ((pHcd)->Attributes & SDHCD_ATTRIB_RAW_MODE)
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get a pointer to the current bus request for a host controller
-+
-+  @function name: GET_CURRENT_REQUEST
-+  @prototype: PSDREQUEST GET_CURRENT_REQUEST (PSDHCD pHcd)
-+  @category: HD_Reference
-+
-+  @input:  pHcd - host structure
-+
-+  @return: current SD/SDIO bus request being worked on
-+
-+  @notes: Implemented as a macro. This macro returns the current SD request that is
-+          being worked on.
-+
-+  @example: getting the current request:
-+          pReq = GET_CURRENT_REQUEST(&pHct->Hcd);
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define GET_CURRENT_REQUEST(pHcd)     (pHcd)->pCurrentRequest
-+#define GET_CURRENT_BUS_WIDTH(pHcd) SDCONFIG_GET_BUSWIDTH((pHcd)->CardProperties.BusMode)
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Get host controller's current operational bus clock
-+
-+  @function name: SDHCD_GET_OPER_CLOCK
-+  @prototype: SD_BUSCLOCK_RATE SDHCD_GET_OPER_CLOCK(PSDHCD pHcd)
-+  @category: HD_Reference
-+
-+  @input:  pHcd   - the registered host structure
-+
-+  @output: none
-+
-+  @return: clock rate
-+
-+  @notes: Implemented as a macro. Returns the current bus clock rate.
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDHCD_GET_OPER_CLOCK(pHcd)      (pHcd)->CardProperties.OperBusClock
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Is host controller operating in SPI mode
-+
-+  @function name: IS_HCD_BUS_MODE_SPI
-+  @prototype: BOOL IS_HCD_BUS_MODE_SPI (PSDHCD pHcd)
-+  @category: HD_Reference
-+
-+  @input:  pHcd - host structure
-+
-+  @return: TRUE if in SPI mode
-+
-+  @notes: Implemented as a macro. Host controllers that operate in SPI mode
-+          dynamically can use this macro to check for SPI operation.
-+
-+  @example: testing for SPI mode:
-+          if (IS_HCD_BUS_MODE_SPI(&pHct->Hcd)) {
-+             .. in spi mode
-+          }
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define IS_HCD_BUS_MODE_SPI(pHcd)   (GET_CURRENT_BUS_WIDTH(pHcd) == SDCONFIG_BUS_WIDTH_SPI)
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Is host controller using SPI in non-CRC mode
-+
-+  @function name: IS_HCD_BUS_MODE_SPI_NO_CRC
-+  @prototype: BOOL IS_HCD_BUS_MODE_SPI_NO_CRC(PSDHCD pHcd)
-+  @category: HD_Reference
-+
-+  @input:  pHcd - host structure
-+
-+  @return: TRUE if CRC mode is off
-+
-+  @notes: Implemented as a macro. SPI-capable cards and systems can operate in
-+          non-CRC protected mode.  In this mode the host controller should ignore
-+          CRC fields and/or disable CRC generation when issuing command or data
-+          packets.  This option is useful for software based SPI mode where CRC
-+          should be turned off in order to reduce processing overhead.
-+
-+  @example: test for non-CRC SPI mode:
-+          if (IS_HCD_BUS_MODE_SPI_NO_CRC(&pHct->Hcd)) {
-+             .. disable CRC checking in hardware.
-+          }
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define IS_HCD_BUS_MODE_SPI_NO_CRC(pHcd)   ((pHcd)->CardProperties.BusMode & \
-+                                                        SDCONFIG_BUS_MODE_SPI_NO_CRC)
-+
-+typedef UINT8 SDHCD_RESPONSE_CHECK_MODE;
-+/* have SDIO core check the response token and see if it is okay to continue with
-+   * the data portion */
-+#define SDHCD_CHECK_DATA_TRANS_OK   0x01
-+/* have SDIO core check the SPI token received */
-+#define SDHCD_CHECK_SPI_TOKEN       0x02
-+
-+/* prototypes */
-+/* for HCD use */
-+SDIO_STATUS SDIO_RegisterHostController(PSDHCD pHcd);
-+SDIO_STATUS SDIO_UnregisterHostController(PSDHCD pHcd);
-+SDIO_STATUS SDIO_HandleHcdEvent(PSDHCD pHcd, HCD_EVENT Event);
-+SDIO_STATUS SDIO_CheckResponse(PSDHCD pHcd, PSDREQUEST pReq, SDHCD_RESPONSE_CHECK_MODE CheckMode);
-+SDIO_STATUS SDIO_BusAddOSDevice(PSDDMA_DESCRIPTION pDma, POS_PNPDRIVER pDriver, POS_PNPDEVICE pDevice);
-+void SDIO_BusRemoveOSDevice(POS_PNPDRIVER pDriver, POS_PNPDEVICE pDevice);
-+
-+#endif /* __SDIO_BUSDRIVER_H___ */
-diff --git a/include/linux/sdio/sdio_lib.h b/include/linux/sdio/sdio_lib.h
-new file mode 100644
-index 0000000..ac0cbd7
---- /dev/null
-+++ b/include/linux/sdio/sdio_lib.h
-@@ -0,0 +1,270 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdio_lib.h
-+
-+@abstract: SDIO Library include
-+
-+#notes:
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#ifndef __SDIO_LIB_H___
-+#define __SDIO_LIB_H___
-+
-+#ifdef UNDER_CE
-+#include "wince\sdio_lib_wince.h"
-+#endif /* WINCE */
-+
-+#define CMD52_DO_READ  FALSE
-+#define CMD52_DO_WRITE TRUE
-+
-+    /* read/write macros to any function */
-+#define Cmd52WriteByteFunc(pDev,Func,Address,pValue) \
-+                SDLIB_IssueCMD52((pDev),(Func),(Address),(pValue),1,CMD52_DO_WRITE)
-+#define Cmd52ReadByteFunc(pDev,Func,Address,pValue) \
-+                SDLIB_IssueCMD52((pDev),(Func),(Address),pValue,1,CMD52_DO_READ)
-+#define Cmd52ReadMultipleFunc(pDev,Func, Address, pBuf,length) \
-+                SDLIB_IssueCMD52((pDev),(Func),(Address),(pBuf),(length),CMD52_DO_READ)
-+
-+   /* macros to access common registers */
-+#define Cmd52WriteByteCommon(pDev, Address, pValue) \
-+                Cmd52WriteByteFunc((pDev),0,(Address),(pValue))
-+#define Cmd52ReadByteCommon(pDev, Address, pValue) \
-+                Cmd52ReadByteFunc((pDev),0,(Address),(pValue))
-+#define Cmd52ReadMultipleCommon(pDev, Address, pBuf,length) \
-+                Cmd52ReadMultipleFunc((pDev),0,(Address),(pBuf),(length))
-+
-+#define SDLIB_SetupCMD52RequestAsync(f,a,w,wd,pR)   \
-+{                                                   \
-+    SDLIB_SetupCMD52Request((f),(a),(w),(wd),(pR)); \
-+    (pR)->Flags |= SDREQ_FLAGS_TRANS_ASYNC;         \
-+}
-+
-+    /* a message block */
-+typedef struct _SDMESSAGE_BLOCK {
-+    SDLIST  SDList;                   /* list entry */
-+    INT     MessageLength;            /* number of bytes in this message */
-+    UINT8   MessageStart[1];          /* message start */
-+}SDMESSAGE_BLOCK, *PSDMESSAGE_BLOCK;
-+
-+    /* message queue */
-+typedef struct _SDMESSAGE_QUEUE {
-+    SDLIST          MessageList;        /* message list */
-+    OS_CRITICALSECTION MessageCritSection; /* message semaphore */
-+    SDLIST          FreeMessageList;    /* free message list */
-+    INT             MaxMessageLength;   /* max message block length */
-+}SDMESSAGE_QUEUE, *PSDMESSAGE_QUEUE;
-+
-+/* internal library prototypes that can be proxied */
-+SDIO_STATUS _SDLIB_IssueCMD52(PSDDEVICE     pDevice,
-+                        UINT8         FuncNo,
-+                        UINT32        Address,
-+                        PUINT8        pData,
-+                        INT           ByteCount,
-+                        BOOL          Write);
-+SDIO_STATUS _SDLIB_FindTuple(PSDDEVICE  pDevice,
-+                             UINT8      Tuple,
-+                             UINT32     *pTupleScanAddress,
-+                             PUINT8     pBuffer,
-+                             UINT8      *pLength);
-+SDIO_STATUS _SDLIB_IssueConfig(PSDDEVICE        pDevice,
-+                               SDCONFIG_COMMAND Command,
-+                               PVOID            pData,
-+                               INT              Length);
-+void _SDLIB_PrintBuffer(PUCHAR pBuffer, INT Length,PTEXT pDescription);
-+void _SDLIB_SetupCMD52Request(UINT8         FuncNo,
-+                              UINT32        Address,
-+                              BOOL          Write,
-+                              UINT8         WriteData,
-+                              PSDREQUEST    pRequest);
-+SDIO_STATUS _SDLIB_SetFunctionBlockSize(PSDDEVICE        pDevice,
-+                                        UINT16           BlockSize);
-+
-+SDIO_STATUS _SDLIB_GetDefaultOpCurrent(PSDDEVICE  pDevice,
-+                                       SD_SLOT_CURRENT *pOpCurrent);
-+PSDMESSAGE_QUEUE _CreateMessageQueue(INT MaxMessages, INT MaxMessageLength);
-+void _DeleteMessageQueue(PSDMESSAGE_QUEUE pQueue);
-+SDIO_STATUS _PostMessage(PSDMESSAGE_QUEUE pQueue, PVOID pMessage, INT MessageLength);
-+SDIO_STATUS _GetMessage(PSDMESSAGE_QUEUE pQueue, PVOID pData, INT *pBufferLength);
-+
-+#ifdef CTSYSTEM_NO_FUNCTION_PROXIES
-+    /* OS port requires no proxy functions, use methods directly from the library */
-+#define SDLIB_IssueCMD52        _SDLIB_IssueCMD52
-+#define SDLIB_SetupCMD52Request _SDLIB_SetupCMD52Request
-+#define SDLIB_FindTuple         _SDLIB_FindTuple
-+#define SDLIB_IssueConfig       _SDLIB_IssueConfig
-+#define SDLIB_SetFunctionBlockSize  _SDLIB_SetFunctionBlockSize
-+#define SDLIB_GetDefaultOpCurrent   _SDLIB_GetDefaultOpCurrent
-+#define SDLIB_CreateMessageQueue    _CreateMessageQueue
-+#define SDLIB_DeleteMessageQueue    _DeleteMessageQueue
-+#define SDLIB_PostMessage           _PostMessage
-+#define SDLIB_GetMessage            _GetMessage
-+#define SDLIB_PrintBuffer           _SDLIB_PrintBuffer
-+#else
-+
-+/* proxied versions */
-+SDIO_STATUS SDLIB_IssueCMD52(PSDDEVICE     pDevice,
-+                             UINT8         FuncNo,
-+                             UINT32        Address,
-+                             PUINT8        pData,
-+                             INT           ByteCount,
-+                             BOOL          Write);
-+
-+void SDLIB_SetupCMD52Request(UINT8         FuncNo,
-+                             UINT32        Address,
-+                             BOOL          Write,
-+                             UINT8         WriteData,
-+                             PSDREQUEST    pRequest);
-+
-+SDIO_STATUS SDLIB_FindTuple(PSDDEVICE  pDevice,
-+                        UINT8      Tuple,
-+                        UINT32     *pTupleScanAddress,
-+                        PUINT8     pBuffer,
-+                        UINT8      *pLength);
-+
-+SDIO_STATUS SDLIB_IssueConfig(PSDDEVICE        pDevice,
-+                              SDCONFIG_COMMAND Command,
-+                              PVOID            pData,
-+                              INT              Length);
-+
-+SDIO_STATUS SDLIB_SetFunctionBlockSize(PSDDEVICE        pDevice,
-+                                       UINT16           BlockSize);
-+
-+void SDLIB_PrintBuffer(PUCHAR pBuffer, INT Length,PTEXT pDescription);
-+
-+SDIO_STATUS SDLIB_GetDefaultOpCurrent(PSDDEVICE  pDevice, SD_SLOT_CURRENT *pOpCurrent);
-+
-+PSDMESSAGE_QUEUE SDLIB_CreateMessageQueue(INT MaxMessages, INT MaxMessageLength);
-+
-+void SDLIB_DeleteMessageQueue(PSDMESSAGE_QUEUE pQueue);
-+
-+SDIO_STATUS SDLIB_PostMessage(PSDMESSAGE_QUEUE pQueue, PVOID pMessage, INT MessageLength);
-+
-+SDIO_STATUS SDLIB_GetMessage(PSDMESSAGE_QUEUE pQueue, PVOID pData, INT *pBufferLength);
-+#endif /* CTSYSTEM_NO_FUNCTION_PROXIES */
-+
-+
-+SDIO_STATUS SDLIB_OSCreateHelper(POSKERNEL_HELPER pHelper,
-+                           PHELPER_FUNCTION pFunction,
-+                           PVOID            pContext);
-+
-+void SDLIB_OSDeleteHelper(POSKERNEL_HELPER pHelper);
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Check message queue is empty
-+
-+  @function name: SDLIB_IsQueueEmpty
-+  @prototype: BOOL SDLIB_IsQueueEmpty(PSDMESSAGE_QUEUE pQueue)
-+  @category: Support_Reference
-+
-+  @input: pQueue - message queue to check
-+
-+  @return: TRUE if empty else false
-+
-+  @see also: SDLIB_CreateMessageQueue
-+
-+  @example: Check message queue :
-+              if (SDLIB_IsQueueEmpty(pInstance->pQueue)) {
-+                   .. message queue is empty
-+              }
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static INLINE BOOL SDLIB_IsQueueEmpty(PSDMESSAGE_QUEUE pQueue) {
-+    return SDLIST_IS_EMPTY(&pQueue->MessageList);
-+}
-+
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Issue an I/O abort request
-+
-+  @function name: SDLIB_IssueIOAbort
-+  @prototype: SDIO_STATUS SDLIB_IssueIOAbort(PSDDEVICE pDevice)
-+  @category: PD_Reference
-+
-+  @input: pDevice - the device that is the target of this request
-+
-+  @return: SDIO_STATUS
-+
-+  @notes: This procedure can be called to issue an I/O abort request to an I/O function.
-+          This procedure cannot be used to abort a data (block) transfer already in progress.
-+          It is intended to be used when a data (block) transfer completes with an error and only if
-+          the I/O function requires an abort action.  Some I/O functions may automatically
-+          recover from such failures and not require this action. This function issues
-+          the abort command synchronously and can potentially block.
-+          If an async request is required, you must allocate a request and use
-+          SDLIB_SetupIOAbortAsync() to prepare the request.
-+
-+  @example: Issuing I/O Abort synchronously :
-+              .. check status from last block operation:
-+              if (status == SDIO_STATUS_BUS_READ_TIMEOUT) {
-+                   .. on failure, issue I/O abort
-+                   status2 = SDLIB_IssueIOAbort(pDevice);
-+              }
-+            Issuing I/O Abort asynchronously:
-+                ... allocate a request
-+                ... setup the request:
-+                 SDLIB_SetupIOAbortAsync(pDevice,pReq);
-+                 pReq->pCompletion = myIOAbortCompletion;
-+                 pReq->pCompleteContext = pDevice;
-+                 status = SDDEVICE_CALL_REQUEST_FUNC(pDevice,pReq);
-+
-+   @see also: SDLIB_SetupIOAbortAsync
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+static INLINE SDIO_STATUS SDLIB_IssueIOAbort(PSDDEVICE pDevice) {
-+    UINT8 value = SDDEVICE_GET_SDIO_FUNCNO(pDevice);
-+    return Cmd52WriteByteCommon(pDevice,0x06,&value);
-+}
-+
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+  @function: Setup an I/O abort request for async operation
-+
-+  @function name: SDLIB_SetupIOAbortAsync
-+  @prototype: SDLIB_SetupIOAbortAsync(PSDDEVICE pDevice, PSDREQUEST pRequest)
-+  @category: PD_Reference
-+
-+  @input: pDevice - the device that is the target of this request
-+          pRequest - the request to set up
-+
-+  @see also: SDLIB_IssueIOAbort
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#define SDLIB_SetupIOAbortAsync(pDevice, pReq) \
-+        SDLIB_SetupCMD52RequestAsync(0,0x06,TRUE,SDDEVICE_GET_SDIO_FUNCNO(pDevice),(pReq))
-+
-+
-+#endif /* __SDIO_LIB_H___*/
-diff --git a/include/linux/sdio/sdlist.h b/include/linux/sdio/sdlist.h
-new file mode 100644
-index 0000000..dc35e1c
---- /dev/null
-+++ b/include/linux/sdio/sdlist.h
-@@ -0,0 +1,141 @@
-+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+@file: sdlist.h
-+
-+@abstract: OS independent list functions
-+
-+@notice: Copyright (c), 2004-2006 Atheros Communications, 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;
-+ *
-+ *  Software distributed under the License is distributed on an "AS
-+ *  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-+ *  implied. See the License for the specific language governing
-+ *  rights and limitations under the License.
-+ *
-+ *  Portions of this code were developed with information supplied from the
-+ *  SD Card Association Simplified Specifications. The following conditions and disclaimers may apply:
-+ *
-+ *   The following conditions apply to the release of the SD simplified specification (�Simplified
-+ *   Specification�) by the SD Card Association. The Simplified Specification is a subset of the complete
-+ *   SD Specification which is owned by the SD Card Association. This Simplified Specification is provided
-+ *   on a non-confidential basis subject to the disclaimers below. Any implementation of the Simplified
-+ *   Specification may require a license from the SD Card Association or other third parties.
-+ *   Disclaimers:
-+ *   The information contained in the Simplified Specification is presented only as a standard
-+ *   specification for SD Cards and SD Host/Ancillary products and is provided "AS-IS" without any
-+ *   representations or warranties of any kind. No responsibility is assumed by the SD Card Association for
-+ *   any damages, any infringements of patents or other right of the SD Card Association or any third
-+ *   parties, which may result from its use. No license is granted by implication, estoppel or otherwise
-+ *   under any patent or other rights of the SD Card Association or any third party. Nothing herein shall
-+ *   be construed as an obligation by the SD Card Association to disclose or distribute any technical
-+ *   information, know-how or other confidential information to any third party.
-+ *
-+ *
-+ *  The initial developers of the original code are Seung Yi and Paul Lever
-+ *
-+ *  sdio@atheros.com
-+ *
-+ *
-+
-++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-+#ifndef __SDLIST_H___
-+#define __SDLIST_H___
-+
-+/* list functions */
-+/* pointers for the list */
-+typedef struct _SDLIST {
-+    struct _SDLIST *pPrev;
-+    struct _SDLIST *pNext;
-+}SDLIST, *PSDLIST;
-+/*
-+ * SDLIST_INIT , circular list
-+*/
-+#define SDLIST_INIT(pList)\
-+    {(pList)->pPrev = pList; (pList)->pNext = pList;}
-+#define SDLIST_INIT_DECLARE(List)\
-+    SDLIST List =   {&List, &List}
-+
-+
-+#define SDLIST_IS_EMPTY(pList) (((pList)->pPrev == (pList)) && ((pList)->pNext == (pList)))
-+#define SDLIST_GET_ITEM_AT_HEAD(pList) (pList)->pNext
-+#define SDLIST_GET_ITEM_AT_TAIL(pList) (pList)->pPrev
-+/*
-+ * SDITERATE_OVER_LIST pStart is the list, pTemp is a temp list member
-+ * NOT: do not use this function if the items in the list are deleted inside the
-+ * iteration loop
-+*/
-+#define SDITERATE_OVER_LIST(pStart, pTemp) \
-+    for((pTemp) =(pStart)->pNext; pTemp != (pStart); (pTemp) = (pTemp)->pNext)
-+
-+
-+/* safe iterate macro that allows the item to be removed from the list
-+ * the iteration continues to the next item in the list
-+ */
-+#define SDITERATE_OVER_LIST_ALLOW_REMOVE(pStart,pItem,st,offset)  \
-+{                                                       \
-+    PSDLIST  pTemp;                                     \
-+    pTemp = (pStart)->pNext;                            \
-+    while (pTemp != (pStart)) {                         \
-+        (pItem) = CONTAINING_STRUCT(pTemp,st,offset);   \
-+         pTemp = pTemp->pNext;                          \
-+
-+#define SDITERATE_END }}
-+
-+/*
-+ * SDListInsertTail - insert pAdd to the end of the list
-+*/
-+static INLINE PSDLIST SDListInsertTail(PSDLIST pList, PSDLIST pAdd) {
-+        /* this assert catches when an item is added twice */
-+    DBG_ASSERT(pAdd->pNext != pList);
-+        /* insert at tail */
-+    pAdd->pPrev = pList->pPrev;
-+    pAdd->pNext = pList;
-+    pList->pPrev->pNext = pAdd;
-+    pList->pPrev = pAdd;
-+    return pAdd;
-+}
-+
-+/*
-+ * SDListInsertHead - insert pAdd into the head of the list
-+*/
-+static INLINE PSDLIST SDListInsertHead(PSDLIST pList, PSDLIST pAdd) {
-+        /* this assert catches when an item is added twice */
-+    DBG_ASSERT(pAdd->pPrev != pList);
-+        /* insert at head */
-+    pAdd->pPrev = pList;
-+    pAdd->pNext = pList->pNext;
-+    pList->pNext->pPrev = pAdd;
-+    pList->pNext = pAdd;
-+    return pAdd;
-+}
-+
-+#define SDListAdd(pList,pItem) SDListInsertHead((pList),(pItem))
-+/*
-+ * SDListRemove - remove pDel from list
-+*/
-+static INLINE PSDLIST SDListRemove(PSDLIST pDel) {
-+    pDel->pNext->pPrev = pDel->pPrev;
-+    pDel->pPrev->pNext = pDel->pNext;
-+        /* point back to itself just to be safe, incase remove is called again */
-+    pDel->pNext = pDel;
-+    pDel->pPrev = pDel;
-+    return pDel;
-+}
-+
-+/*
-+ * SDListRemoveItemFromHead - get a list item from the head
-+*/
-+static INLINE PSDLIST SDListRemoveItemFromHead(PSDLIST pList) {
-+    PSDLIST pItem = NULL;
-+    if (pList->pNext != pList) {
-+        pItem = pList->pNext;
-+            /* remove the first item from head */
-+        SDListRemove(pItem);
-+    }
-+    return pItem;
-+}
-+#endif /* __SDLIST_H___ */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1056-fix-hwecc-2410.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1056-fix-hwecc-2410.patch.patch
deleted file mode 100755 (executable)
index 6754ec4..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1b629ded094c800293cf694e85d0c5b66cc9fcfd Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 22:21:25 +0100
-Subject: [PATCH] fix-hwecc-2410.patch
- S3C24xx ECC mis-calculates the bit to flip:
- http://lists.infradead.org/pipermail/linux-mtd/2007-October/019586.html
- If the error couldn't be corrected, we returned "no problem" :-(
- http://lists.infradead.org/pipermail/linux-mtd/2007-October/019615.html
-
-Signed-off-by: Werner Almesberger <werner@openmoko.org>
----
- drivers/mtd/nand/s3c2410.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
-index 8e1e482..4f747b1 100644
---- a/drivers/mtd/nand/s3c2410.c
-+++ b/drivers/mtd/nand/s3c2410.c
-@@ -406,7 +406,7 @@ static int s3c2410_nand_correct_data(struct mtd_info *mtd, u_char *dat,
-       if ((diff0 & ~(1<<fls(diff0))) == 0)
-               return 1;
--      return -1;
-+      return -EBADMSG;
- }
- /* ECC functions
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1057-fix-pcf50606-LOWBAT-kill-init.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1057-fix-pcf50606-LOWBAT-kill-init.patch.patch
deleted file mode 100755 (executable)
index 13945f5..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-From 835002d2e751c0d35b744ceec5bef726b9778b7b Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 22:21:25 +0100
-Subject: [PATCH] fix-pcf50606-LOWBAT-kill-init.patch
-
----
- drivers/i2c/chips/pcf50606.c |   53 ++++++++++++++++++++++++++++++++++++-----
- 1 files changed, 46 insertions(+), 7 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
-index b530583..a1c92d3 100644
---- a/drivers/i2c/chips/pcf50606.c
-+++ b/drivers/i2c/chips/pcf50606.c
-@@ -654,8 +654,20 @@ static void pcf50606_work(struct work_struct *work)
-                       if (pcf->onkey_seconds >=
-                           pcf->pdata->onkey_seconds_required) {
-                               /* Ask init to do 'ctrlaltdel' */
--                              DEBUGPC("SIGINT(init) ");
--                              kill_proc(1, SIGINT, 1);
-+                              /*
-+                               * currently Linux reacts badly to issuing a
-+                               * signal to PID #1 before init is started.
-+                               * What happens is that the next kernel thread
-+                               * to start, which is the JFFS2 Garbage
-+                               * collector in our case, gets the signal
-+                               * instead and proceeds to fail to fork --
-+                               * which is very bad.  Therefore we confirm
-+                               * PID #1 exists before issuing the signal
-+                               */
-+                              if (find_task_by_pid(1)) {
-+                                      kill_proc(1, SIGINT, 1);
-+                                      DEBUGPC("SIGINT(init) ");
-+                              }
-                               /* FIXME: what to do if userspace doesn't
-                                * shut down? Do we want to force it? */
-                       }
-@@ -749,11 +761,38 @@ static void pcf50606_work(struct work_struct *work)
-       }
-       /* FIXME: TSCPRES */
-       if (pcfirq[2] & PCF50606_INT3_LOWBAT) {
--              /* Really low battery voltage, we have 8 seconds left */
--              DEBUGPC("LOWBAT ");
--              apm_queue_event(APM_LOW_BATTERY);
--              DEBUGPC("SIGPWR(init) ");
--              kill_proc(1, SIGPWR, 1);
-+              if (__reg_read(pcf, PCF50606_REG_OOCS) & PCF50606_OOCS_EXTON) {
-+                      /*
-+                       * hey no need to freak out, we have some kind of
-+                       * valid charger power
-+                       */
-+                      DEBUGPC("(NO)BAT ");
-+              } else {
-+                      /* Really low battery voltage, we have 8 seconds left */
-+                      DEBUGPC("LOWBAT ");
-+                      /*
-+                       * currently Linux reacts badly to issuing a signal to
-+                       * PID #1 before init is started.  What happens is that
-+                       * the next kernel thread to start, which is the JFFS2
-+                       * Garbage collector in our case, gets the signal
-+                       * instead and proceeds to fail to fork -- which is
-+                       * very bad.  Therefore we confirm PID #1 exists
-+                       * before issuing SPIGPWR
-+                       */
-+                      if (find_task_by_pid(1)) {
-+                              apm_queue_event(APM_LOW_BATTERY);
-+                              DEBUGPC("SIGPWR(init) ");
-+                              kill_proc(1, SIGPWR, 1);
-+                      } else
-+                              /*
-+                               * well, our situation is like this:  we do not
-+                               * have any external power, we have a low
-+                               * battery and since PID #1 doesn't exist yet,
-+                               * we are early in the boot, likely before
-+                               * rootfs mount.  We should just call it a day
-+                               */
-+                              apm_queue_event(APM_CRITICAL_SUSPEND);
-+              }
-               /* Tell PMU we are taking care of this */
-               reg_set_bit_mask(pcf, PCF50606_REG_OOCC1,
-                                PCF50606_OOCC1_TOTRST,
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1058-fix-pcf50633-LOWBAT-kill-init.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1058-fix-pcf50633-LOWBAT-kill-init.patch.patch
deleted file mode 100755 (executable)
index 429a8c7..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-From 6d3172ba9f1b4a650c8fdb3b6e11dc71852fe6d1 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 22:21:25 +0100
-Subject: [PATCH] fix-pcf50633-LOWBAT-kill-init.patch
-
----
- drivers/i2c/chips/pcf50633.c |   56 ++++++++++++++++++++++++++++++++++++-----
- 1 files changed, 49 insertions(+), 7 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 0cf5e53..fc1262e 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -690,8 +690,20 @@ static void pcf50633_work(struct work_struct *work)
-                       if (pcf->onkey_seconds >=
-                           pcf->pdata->onkey_seconds_sig_init) {
-                               /* Ask init to do 'ctrlaltdel' */
--                              DEBUGPC("SIGINT(init) ");
--                              kill_proc(1, SIGINT, 1);
-+                              /*
-+                               * currently Linux reacts badly to issuing a
-+                               * signal to PID #1 before init is started.
-+                               * What happens is that the next kernel thread
-+                               * to start, which is the JFFS2 Garbage
-+                               * collector in our case, gets the signal
-+                               * instead and proceeds to fail to fork --
-+                               * which is very bad.  Therefore we confirm
-+                               * PID #1 exists before issuing the signal
-+                               */
-+                              if (find_task_by_pid(1)) {
-+                                      DEBUGPC("SIGINT(init) ");
-+                                      kill_proc(1, SIGINT, 1);
-+                              }
-                               /* FIXME: what if userspace doesn't shut down? */
-                       }
-                       if (pcf->onkey_seconds >=
-@@ -790,11 +802,41 @@ static void pcf50633_work(struct work_struct *work)
-       }
-       if (pcfirq[3] & (PCF50633_INT4_LOWBAT|PCF50633_INT4_LOWSYS)) {
--              /* Really low battery voltage, we have 8 seconds left */
--              DEBUGPC("LOWBAT ");
--              apm_queue_event(APM_LOW_BATTERY);
--              DEBUGPC("SIGPWR(init) ");
--              kill_proc(1, SIGPWR, 1);
-+              if ((__reg_read(pcf, PCF50633_REG_MBCS1) &
-+                  (PCF50633_MBCS1_USBPRES | PCF50633_MBCS1_USBOK)) ==
-+                  (PCF50633_MBCS1_USBPRES | PCF50633_MBCS1_USBOK)) {
-+                      /*
-+                       * hey no need to freak out, we have some kind of
-+                       * valid charger power
-+                       */
-+                      DEBUGPC("(NO)BAT ");
-+              } else {
-+                      /* Really low battery voltage, we have 8 seconds left */
-+                      DEBUGPC("LOWBAT ");
-+                      /*
-+                       * currently Linux reacts badly to issuing a signal to
-+                       * PID #1 before init is started.  What happens is that
-+                       * the next kernel thread to start, which is the JFFS2
-+                       * Garbage collector in our case, gets the signal
-+                       * instead and proceeds to fail to fork -- which is
-+                       * very bad.  Therefore we confirm PID #1 exists
-+                       * before issuing SPIGPWR
-+                       */
-+                      if (find_task_by_pid(1)) {
-+                              apm_queue_event(APM_LOW_BATTERY);
-+                              DEBUGPC("SIGPWR(init) ");
-+                              kill_proc(1, SIGPWR, 1);
-+                      } else
-+                              /*
-+                               * well, our situation is like this:  we do not
-+                               * have any external power, we have a low
-+                               * battery and since PID #1 doesn't exist yet,
-+                               * we are early in the boot, likely before
-+                               * rootfs mount.  We should just call it a day
-+                               */
-+                              apm_queue_event(APM_CRITICAL_SUSPEND);
-+              }
-+
-               /* Tell PMU we are taking care of this */
-               reg_set_bit_mask(pcf, PCF50633_REG_OOCSHDWN,
-                                PCF50633_OOCSHDWN_TOTRST,
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1059-gta01-dehang-printk.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1059-gta01-dehang-printk.patch.patch
deleted file mode 100755 (executable)
index 826abf3..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From 2e7d18a213b94e4aeded7f35b7cd0d02b9b661cd Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 23:04:37 +0100
-Subject: [PATCH] gta01-dehang-printk.patch
- This is a temporary work-around Mike Westerhof for this bug:
- http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=788
-
-See also
-http://lists.openmoko.org/pipermail/openmoko-kernel/2008-February/000804.html
-
-(It's the 2nd option.)
-
-We may settle on a different solution in the future, depending on
-feedback from upstream.
----
- drivers/serial/s3c2410.c |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
-index 7117110..bd87c79 100644
---- a/drivers/serial/s3c2410.c
-+++ b/drivers/serial/s3c2410.c
-@@ -1720,9 +1720,18 @@ static void
- s3c24xx_serial_console_putchar(struct uart_port *port, int ch)
- {
-       unsigned int ufcon = rd_regl(cons_uart, S3C2410_UFCON);
-+      unsigned int umcon = rd_regl(cons_uart, S3C2410_UMCON);
-+
-+      /* If auto HW flow control enabled, temporarily turn it off */
-+      if (umcon & S3C2410_UMCOM_AFC)
-+              wr_regl(port, S3C2410_UMCON, (umcon & !S3C2410_UMCOM_AFC));
-+
-       while (!s3c24xx_serial_console_txrdy(port, ufcon))
-               barrier();
-       wr_regb(cons_uart, S3C2410_UTXH, ch);
-+
-+      if (umcon & S3C2410_UMCOM_AFC)
-+              wr_regl(port, S3C2410_UMCON, umcon);
- }
- static void
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1060-suspend-prelim1.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1060-suspend-prelim1.patch.patch
deleted file mode 100755 (executable)
index 468c633..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-From a158085e182617f31960599ab1f468668c3161d4 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 23:05:18 +0100
-Subject: [PATCH] suspend-prelim1.patch
-
----
- drivers/i2c/chips/pcf50633.c   |    5 +++++
- drivers/i2c/i2c-core.c         |   13 ++++++++++++-
- drivers/mfd/glamo/glamo-core.c |    2 ++
- 3 files changed, 19 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index fc1262e..e23c540 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1901,6 +1901,9 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-               }
-       }
-+      /* turn off the backlight */
-+      __reg_write(pcf, PCF50633_REG_LEDENA, 0x00);
-+
-       pcf->standby_regs.int1m = __reg_read(pcf, PCF50633_REG_INT1M);
-       pcf->standby_regs.int2m = __reg_read(pcf, PCF50633_REG_INT2M);
-       pcf->standby_regs.int3m = __reg_read(pcf, PCF50633_REG_INT3M);
-@@ -1925,6 +1928,8 @@ static int pcf50633_resume(struct device *dev)
-       mutex_lock(&pcf->lock);
-+      __reg_write(pcf, PCF50633_REG_LEDENA, 0x01);
-+
-       /* Resume all saved registers that don't "survive" standby state */
-       __reg_write(pcf, PCF50633_REG_INT1M, pcf->standby_regs.int1m);
-       __reg_write(pcf, PCF50633_REG_INT2M, pcf->standby_regs.int2m);
-diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
-index bb0c5e5..c300975 100644
---- a/drivers/i2c/i2c-core.c
-+++ b/drivers/i2c/i2c-core.c
-@@ -1,4 +1,3 @@
--/* i2c-core.c - a device driver for the iic-bus interface                  */
- /* ------------------------------------------------------------------------- */
- /*   Copyright (C) 1995-99 Simon G. Vogl
-@@ -160,10 +159,16 @@ static int i2c_device_suspend(struct device * dev, pm_message_t mesg)
-       if (!dev->driver)
-               return 0;
-+#if 0
-       driver = to_i2c_driver(dev->driver);
-       if (!driver->suspend)
-               return 0;
-       return driver->suspend(to_i2c_client(dev), mesg);
-+#else
-+      if (!dev->driver->suspend)
-+              return 0;
-+      return dev->driver->suspend(dev, mesg);
-+#endif
- }
- static int i2c_device_resume(struct device * dev)
-@@ -172,10 +177,16 @@ static int i2c_device_resume(struct device * dev)
-       if (!dev->driver)
-               return 0;
-+#if 0
-       driver = to_i2c_driver(dev->driver);
-       if (!driver->resume)
-               return 0;
-       return driver->resume(to_i2c_client(dev));
-+#else
-+      if (!dev->driver->resume)
-+              return 0;
-+      return dev->driver->resume(dev);
-+#endif
- }
- static void i2c_client_release(struct device *dev)
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index 8497de2..ffa4945 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -1125,11 +1125,13 @@ static int glamo_remove(struct platform_device *pdev)
- #ifdef CONFIG_PM
- static int glamo_suspend(struct platform_device *pdev, pm_message_t state)
- {
-+      glamo_power(glamo_handle, GLAMO_POWER_SUSPEND);
-       return 0;
- }
- static int glamo_resume(struct platform_device *pdev)
- {
-+      glamo_power(glamo_handle, GLAMO_POWER_ON);
-       return 0;
- }
- #else
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1061-gta02-sound-bandaid.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1061-gta02-sound-bandaid.patch.patch
deleted file mode 100755 (executable)
index ea64733..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From 4df411aa6f42be6fe5881d7b2fb88aae9d9a56a8 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 23:05:21 +0100
-Subject: [PATCH] gta02-sound-bandaid.patch
- http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=1172
-
-This patch seems to alleviate the symptoms but doesn't cure them.
-Keep it to keep development going, until we have a proper solution.
----
- sound/soc/codecs/wm8753.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
-index fb41826..72baf3d 100644
---- a/sound/soc/codecs/wm8753.c
-+++ b/sound/soc/codecs/wm8753.c
-@@ -1589,6 +1589,9 @@ static int wm8753_init(struct snd_soc_device *socdev)
-       schedule_delayed_work(&codec->delayed_work,
-               msecs_to_jiffies(caps_charge));
-+      /* Fix reg WM8753_ADCTL2 */
-+      wm8753_write(codec, WM8753_ADCTL2, 0x0000);
-+
-       /* set the update bits */
-       reg = wm8753_read_reg_cache(codec, WM8753_LDAC);
-       wm8753_write(codec, WM8753_LDAC, reg | 0x0100);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1062-glamo-cmdqueue-bandaid.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1062-glamo-cmdqueue-bandaid.patch.patch
deleted file mode 100755 (executable)
index 96ec17c..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-From 08f211e0775ee1e29993fd072968e17a51c5ec14 Mon Sep 17 00:00:00 2001
-From: mokopatches <mokopatches@openmoko.org>
-Date: Fri, 25 Jul 2008 23:05:22 +0100
-Subject: [PATCH] glamo-cmdqueue-bandaid.patch
- [ Stop kernel from hanging every once in a while during Glamo
-   initialization. ]
-
-debug-glamo-fb-cmdqueue-wait-timeout.patch
-
-From: warmcat <andy@warmcat.com>
----
- drivers/mfd/glamo/glamo-fb.c |   30 +++++++++++++++++++++++++++---
- 1 files changed, 27 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c
-index 394a0ad..f0d7600 100644
---- a/drivers/mfd/glamo/glamo-fb.c
-+++ b/drivers/mfd/glamo/glamo-fb.c
-@@ -553,12 +553,20 @@ static inline int glamofb_cmdq_empty(struct glamofb_handle *gfb)
- void glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
- {
-+      int timeout = 2000;
-+
-       dev_dbg(gfb->dev, "glamofb_cmd_mode(gfb=%p, on=%d)\n", gfb, on);
-       if (on) {
-               dev_dbg(gfb->dev, "%s: waiting for cmdq empty: ",
-                       __FUNCTION__);
--              while (!glamofb_cmdq_empty(gfb))
-+              while ((!glamofb_cmdq_empty(gfb)) && (timeout--))
-                       yield();
-+              if (timeout < 0) {
-+                      printk(KERN_ERR"*************"
-+                                     "glamofb cmd_queue never got empty"
-+                                     "*************\n");
-+                      return;
-+              }
-               dev_dbg(gfb->dev, "empty!\n");
-               /* display the entire frame then switch to command */
-@@ -568,8 +576,16 @@ void glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
-               /* wait until LCD is idle */
-               dev_dbg(gfb->dev, "waiting for LCD idle: ");
--              while (!reg_read(gfb, GLAMO_REG_LCD_STATUS2) & (1 << 12))
-+              timeout = 2000;
-+              while ((!reg_read(gfb, GLAMO_REG_LCD_STATUS2) & (1 << 12)) &&
-+                    (timeout--))
-                       yield();
-+              if (timeout < 0) {
-+                      printk(KERN_ERR"*************"
-+                                     "glamofb lcd never idle"
-+                                     "*************\n");
-+                      return;
-+              }
-               dev_dbg(gfb->dev, "idle!\n");
-               msleep(90);
-@@ -589,10 +605,18 @@ EXPORT_SYMBOL_GPL(glamofb_cmd_mode);
- int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val)
- {
-+      int timeout = 2000;
-+
-       dev_dbg(gfb->dev, "%s: waiting for cmdq empty\n",
-               __FUNCTION__);
--      while (!glamofb_cmdq_empty(gfb))
-+      while ((!glamofb_cmdq_empty(gfb)) && (timeout--))
-               yield();
-+      if (timeout < 0) {
-+              printk(KERN_ERR"*************"
-+                              "glamofb cmd_queue never got empty"
-+                              "*************\n");
-+              return 1;
-+      }
-       dev_dbg(gfb->dev, "idle, writing 0x%04x\n", val);
-       reg_write(gfb, GLAMO_REG_LCD_COMMAND1, val);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1063-fix-wm8753-DBG.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1063-fix-wm8753-DBG.patch.patch
deleted file mode 100755 (executable)
index 44c61af..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From 38801452b334d3591eddadbfa4a31529b8957513 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:05:24 +0100
-Subject: [PATCH] fix-wm8753-DBG.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- sound/soc/s3c24xx/neo1973_wm8753.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c
-index 4ab6f63..2bc813f 100644
---- a/sound/soc/s3c24xx/neo1973_wm8753.c
-+++ b/sound/soc/s3c24xx/neo1973_wm8753.c
-@@ -671,7 +671,7 @@ static int __init neo1973_init(void)
- {
-       int ret;
--      DBG("Entered %s\n", __func__);
-+      printk(KERN_DEBUG "Entered %s\n", __func__);
-       if (!machine_is_neo1973_gta01()) {
-               printk(KERN_INFO
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1064-local-add-defconfig.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1064-local-add-defconfig.patch.patch
deleted file mode 100755 (executable)
index 3f0f891..0000000
+++ /dev/null
@@ -1,1849 +0,0 @@
-From 1f9b7c8eead2c1b919a502d90ded310ac023d2bc Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Fri, 25 Jul 2008 23:05:59 +0100
-Subject: [PATCH] local-add-defconfig.patch
-
-Adds svn defconfig
-
-From: warmcat <andy@warmcat.com>
----
- defconfig-2.6.22.5 | 1827 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 1827 insertions(+), 0 deletions(-)
- create mode 100644 defconfig-2.6.22.5
-
-diff --git a/defconfig-2.6.22.5 b/defconfig-2.6.22.5
-new file mode 100644
-index 0000000..e9e40fe
---- /dev/null
-+++ b/defconfig-2.6.22.5
-@@ -0,0 +1,1827 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.22.5
-+# Tue Nov 27 09:09:32 2007
-+#
-+CONFIG_ARM=y
-+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-+CONFIG_GENERIC_GPIO=y
-+# CONFIG_GENERIC_TIME is not set
-+# CONFIG_GENERIC_CLOCKEVENTS is not set
-+CONFIG_MMU=y
-+CONFIG_NO_IOPORT=y
-+CONFIG_GENERIC_HARDIRQS=y
-+CONFIG_STACKTRACE_SUPPORT=y
-+CONFIG_LOCKDEP_SUPPORT=y
-+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-+CONFIG_HARDIRQS_SW_RESEND=y
-+CONFIG_GENERIC_IRQ_PROBE=y
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_ZONE_DMA=y
-+CONFIG_VECTORS_BASE=0xffff0000
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# Code maturity level options
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_LOCK_KERNEL=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+
-+#
-+# General setup
-+#
-+CONFIG_LOCALVERSION="-moko11"
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+# CONFIG_IPC_NS is not set
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_UTS_NS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_SYSFS_DEPRECATED is not set
-+# CONFIG_RELAY is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+CONFIG_SYSCTL=y
-+# CONFIG_EMBEDDED is not set
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+# CONFIG_KALLSYMS_ALL is not set
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+
-+#
-+# Loadable module support
-+#
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+
-+#
-+# Block layer
-+#
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=m
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=m
-+# CONFIG_DEFAULT_AS is not set
-+CONFIG_DEFAULT_DEADLINE=y
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="deadline"
-+
-+#
-+# System Type
-+#
-+# CONFIG_ARCH_AAEC2000 is not set
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_REALVIEW is not set
-+# CONFIG_ARCH_VERSATILE is not set
-+# CONFIG_ARCH_AT91 is not set
-+# CONFIG_ARCH_CLPS7500 is not set
-+# CONFIG_ARCH_CLPS711X is not set
-+# CONFIG_ARCH_CO285 is not set
-+# CONFIG_ARCH_EBSA110 is not set
-+# CONFIG_ARCH_EP93XX is not set
-+# CONFIG_ARCH_FOOTBRIDGE is not set
-+# CONFIG_ARCH_NETX is not set
-+# CONFIG_ARCH_H720X is not set
-+# CONFIG_ARCH_IMX is not set
-+# CONFIG_ARCH_IOP13XX is not set
-+# CONFIG_ARCH_IOP32X is not set
-+# CONFIG_ARCH_IOP33X is not set
-+# CONFIG_ARCH_IXP23XX is not set
-+# CONFIG_ARCH_IXP2000 is not set
-+# CONFIG_ARCH_IXP4XX is not set
-+# CONFIG_ARCH_L7200 is not set
-+# CONFIG_ARCH_KS8695 is not set
-+# CONFIG_ARCH_NS9XXX is not set
-+# CONFIG_ARCH_PNX4008 is not set
-+# CONFIG_ARCH_PXA is not set
-+# CONFIG_ARCH_RPC is not set
-+# CONFIG_ARCH_SA1100 is not set
-+CONFIG_ARCH_S3C2410=y
-+# CONFIG_ARCH_SHARK is not set
-+# CONFIG_ARCH_LH7A40X is not set
-+# CONFIG_ARCH_DAVINCI is not set
-+# CONFIG_ARCH_OMAP is not set
-+CONFIG_PLAT_S3C24XX=y
-+CONFIG_CPU_S3C244X=y
-+# CONFIG_S3C2410_BOOT_WATCHDOG is not set
-+CONFIG_S3C2410_BOOT_ERROR_RESET=y
-+CONFIG_S3C2410_PM_DEBUG=y
-+# CONFIG_S3C2410_PM_CHECK is not set
-+CONFIG_S3C2410_LOWLEVEL_UART_PORT=0
-+CONFIG_S3C2410_DMA=y
-+# CONFIG_S3C2410_DMA_DEBUG is not set
-+CONFIG_MACH_SMDK=y
-+
-+#
-+# S3C2400 Machines
-+#
-+CONFIG_CPU_S3C2410=y
-+CONFIG_CPU_S3C2410_DMA=y
-+CONFIG_S3C2410_PM=y
-+CONFIG_S3C2410_GPIO=y
-+CONFIG_S3C2410_CLOCK=y
-+CONFIG_S3C2410_PWM=y
-+
-+#
-+# S3C2410 Machines
-+#
-+# CONFIG_ARCH_SMDK2410 is not set
-+# CONFIG_ARCH_H1940 is not set
-+# CONFIG_MACH_N30 is not set
-+# CONFIG_ARCH_BAST is not set
-+# CONFIG_MACH_OTOM is not set
-+# CONFIG_MACH_AML_M5900 is not set
-+# CONFIG_MACH_VR1000 is not set
-+CONFIG_MACH_QT2410=y
-+CONFIG_MACH_NEO1973_GTA01=y
-+
-+#
-+# S3C2412 Machines
-+#
-+# CONFIG_MACH_SMDK2413 is not set
-+# CONFIG_MACH_SMDK2412 is not set
-+# CONFIG_MACH_VSTMS is not set
-+CONFIG_CPU_S3C2440=y
-+CONFIG_S3C2440_DMA=y
-+
-+#
-+# S3C2440 Machines
-+#
-+# CONFIG_MACH_ANUBIS is not set
-+# CONFIG_MACH_OSIRIS is not set
-+# CONFIG_MACH_RX3715 is not set
-+CONFIG_ARCH_S3C2440=y
-+# CONFIG_MACH_NEXCODER_2440 is not set
-+CONFIG_SMDK2440_CPU2440=y
-+CONFIG_MACH_HXD8=y
-+CONFIG_MACH_NEO1973_GTA02=y
-+CONFIG_CPU_S3C2442=y
-+
-+#
-+# S3C2442 Machines
-+#
-+CONFIG_SMDK2440_CPU2442=y
-+
-+#
-+# S3C2443 Machines
-+#
-+# CONFIG_MACH_SMDK2443 is not set
-+
-+#
-+# Processor Type
-+#
-+CONFIG_CPU_32=y
-+CONFIG_CPU_ARM920T=y
-+CONFIG_CPU_32v4T=y
-+CONFIG_CPU_ABRT_EV4T=y
-+CONFIG_CPU_CACHE_V4WT=y
-+CONFIG_CPU_CACHE_VIVT=y
-+CONFIG_CPU_COPY_V4WB=y
-+CONFIG_CPU_TLB_V4WBI=y
-+CONFIG_CPU_CP15=y
-+CONFIG_CPU_CP15_MMU=y
-+
-+#
-+# Processor Features
-+#
-+CONFIG_ARM_THUMB=y
-+# CONFIG_CPU_ICACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-+# CONFIG_OUTER_CACHE is not set
-+
-+#
-+# Bus support
-+#
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+
-+#
-+# PCCARD (PCMCIA/CardBus) support
-+#
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Kernel Features
-+#
-+# CONFIG_TICK_ONESHOT is not set
-+CONFIG_PREEMPT=y
-+CONFIG_NO_IDLE_HZ=y
-+CONFIG_HZ=200
-+CONFIG_AEABI=y
-+CONFIG_OABI_COMPAT=y
-+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4096
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_ALIGNMENT_TRAP=y
-+
-+#
-+# Boot options
-+#
-+CONFIG_ZBOOT_ROM_TEXT=0x0
-+CONFIG_ZBOOT_ROM_BSS=0x0
-+CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
-+# CONFIG_XIP_KERNEL is not set
-+CONFIG_KEXEC=y
-+
-+#
-+# Floating point emulation
-+#
-+
-+#
-+# At least one emulation must be selected
-+#
-+CONFIG_FPE_NWFPE=y
-+# CONFIG_FPE_NWFPE_XP is not set
-+# CONFIG_FPE_FASTFPE is not set
-+
-+#
-+# Userspace binary formats
-+#
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+
-+#
-+# Power management options
-+#
-+CONFIG_PM=y
-+CONFIG_PM_LEGACY=y
-+CONFIG_PM_DEBUG=y
-+CONFIG_DISABLE_CONSOLE_SUSPEND=y
-+# CONFIG_PM_SYSFS_DEPRECATED is not set
-+CONFIG_APM_EMULATION=y
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=m
-+CONFIG_PACKET_MMAP=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+CONFIG_XFRM_MIGRATE=y
-+CONFIG_NET_KEY=m
-+CONFIG_NET_KEY_MIGRATE=y
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+# CONFIG_IP_ROUTE_MULTIPATH is not set
-+# CONFIG_IP_ROUTE_VERBOSE 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=m
-+CONFIG_NET_IPGRE=m
-+# CONFIG_NET_IPGRE_BROADCAST is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_XFRM_TUNNEL=m
-+CONFIG_INET_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET_XFRM_MODE_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_BEET=m
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+CONFIG_TCP_MD5SIG=y
-+# CONFIG_IP_VS is not set
-+CONFIG_IPV6=m
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_IPCOMP=m
-+# CONFIG_IPV6_MIP6 is not set
-+CONFIG_INET6_XFRM_TUNNEL=m
-+CONFIG_INET6_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET6_XFRM_MODE_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_BEET=m
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_TUNNEL=m
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+CONFIG_NETFILTER=y
-+# CONFIG_NETFILTER_DEBUG is not set
-+CONFIG_BRIDGE_NETFILTER=y
-+
-+#
-+# Core Netfilter Configuration
-+#
-+CONFIG_NETFILTER_NETLINK=m
-+CONFIG_NETFILTER_NETLINK_QUEUE=m
-+CONFIG_NETFILTER_NETLINK_LOG=m
-+CONFIG_NF_CONNTRACK_ENABLED=m
-+CONFIG_NF_CONNTRACK=m
-+CONFIG_NF_CT_ACCT=y
-+CONFIG_NF_CONNTRACK_MARK=y
-+CONFIG_NF_CONNTRACK_EVENTS=y
-+CONFIG_NF_CT_PROTO_GRE=m
-+CONFIG_NF_CT_PROTO_SCTP=m
-+# CONFIG_NF_CONNTRACK_AMANDA is not set
-+CONFIG_NF_CONNTRACK_FTP=m
-+CONFIG_NF_CONNTRACK_H323=m
-+CONFIG_NF_CONNTRACK_IRC=m
-+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-+CONFIG_NF_CONNTRACK_PPTP=m
-+CONFIG_NF_CONNTRACK_SANE=m
-+CONFIG_NF_CONNTRACK_SIP=m
-+CONFIG_NF_CONNTRACK_TFTP=m
-+CONFIG_NF_CT_NETLINK=m
-+CONFIG_NETFILTER_XTABLES=m
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-+CONFIG_NETFILTER_XT_TARGET_DSCP=m
-+CONFIG_NETFILTER_XT_TARGET_MARK=m
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+CONFIG_NETFILTER_XT_MATCH_DCCP=m
-+CONFIG_NETFILTER_XT_MATCH_DSCP=m
-+CONFIG_NETFILTER_XT_MATCH_ESP=m
-+CONFIG_NETFILTER_XT_MATCH_HELPER=m
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_MAC=m
-+CONFIG_NETFILTER_XT_MATCH_MARK=m
-+CONFIG_NETFILTER_XT_MATCH_POLICY=m
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-+CONFIG_NETFILTER_XT_MATCH_REALM=m
-+CONFIG_NETFILTER_XT_MATCH_SCTP=m
-+CONFIG_NETFILTER_XT_MATCH_STATE=m
-+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-+CONFIG_NETFILTER_XT_MATCH_STRING=m
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-+
-+#
-+# IP: Netfilter Configuration
-+#
-+CONFIG_NF_CONNTRACK_IPV4=m
-+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-+# CONFIG_IP_NF_QUEUE is not set
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_MATCH_IPRANGE=m
-+CONFIG_IP_NF_MATCH_TOS=m
-+# CONFIG_IP_NF_MATCH_RECENT is not set
-+CONFIG_IP_NF_MATCH_ECN=m
-+CONFIG_IP_NF_MATCH_AH=m
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_MATCH_OWNER=m
-+CONFIG_IP_NF_MATCH_ADDRTYPE=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_TARGET_LOG=m
-+CONFIG_IP_NF_TARGET_ULOG=m
-+CONFIG_NF_NAT=m
-+CONFIG_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_NF_NAT_SNMP_BASIC=m
-+CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_FTP=m
-+CONFIG_NF_NAT_IRC=m
-+CONFIG_NF_NAT_TFTP=m
-+# CONFIG_NF_NAT_AMANDA is not set
-+CONFIG_NF_NAT_PPTP=m
-+CONFIG_NF_NAT_H323=m
-+CONFIG_NF_NAT_SIP=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_IP_NF_TARGET_TOS=m
-+CONFIG_IP_NF_TARGET_ECN=m
-+CONFIG_IP_NF_TARGET_TTL=m
-+CONFIG_IP_NF_TARGET_CLUSTERIP=m
-+# CONFIG_IP_NF_RAW is not set
-+# CONFIG_IP_NF_ARPTABLES is not set
-+
-+#
-+# IPv6: Netfilter Configuration (EXPERIMENTAL)
-+#
-+CONFIG_NF_CONNTRACK_IPV6=m
-+# CONFIG_IP6_NF_QUEUE is not set
-+CONFIG_IP6_NF_IPTABLES=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_OWNER=m
-+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-+CONFIG_IP6_NF_MATCH_AH=m
-+CONFIG_IP6_NF_MATCH_MH=m
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_LOG=m
-+CONFIG_IP6_NF_TARGET_REJECT=m
-+CONFIG_IP6_NF_MANGLE=m
-+CONFIG_IP6_NF_TARGET_HL=m
-+# CONFIG_IP6_NF_RAW is not set
-+
-+#
-+# 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_BRIDGE_EBT_ULOG=m
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+CONFIG_BRIDGE=y
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+CONFIG_LLC=y
-+# 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+
-+#
-+# QoS and/or fair queueing
-+#
-+CONFIG_NET_SCHED=y
-+CONFIG_NET_SCH_FIFO=y
-+
-+#
-+# Queueing/Scheduling
-+#
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=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_NETEM=m
-+CONFIG_NET_SCH_INGRESS=m
-+
-+#
-+# Classification
-+#
-+CONFIG_NET_CLS=y
-+CONFIG_NET_CLS_BASIC=m
-+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_CLS_U32_PERF=y
-+CONFIG_CLS_U32_MARK=y
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
-+# CONFIG_NET_EMATCH is not set
-+# CONFIG_NET_CLS_ACT is not set
-+# CONFIG_NET_CLS_POLICE is not set
-+# CONFIG_NET_CLS_IND is not set
-+CONFIG_NET_ESTIMATOR=y
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_IRDA 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_HIDP=m
-+
-+#
-+# Bluetooth device drivers
-+#
-+CONFIG_BT_HCIUSB=m
-+CONFIG_BT_HCIUSB_SCO=y
-+# CONFIG_BT_HCIUART is not set
-+# CONFIG_BT_HCIBCM203X is not set
-+# CONFIG_BT_HCIBPA10X is not set
-+# CONFIG_BT_HCIBFUSB is not set
-+# CONFIG_BT_HCIVHCI is not set
-+# CONFIG_AF_RXRPC is not set
-+CONFIG_FIB_RULES=y
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=m
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+
-+#
-+# Connector - unified userspace <-> kernelspace linker
-+#
-+CONFIG_CONNECTOR=m
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+# CONFIG_MTD_CONCAT is not set
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_AFS_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+# CONFIG_MTD_CFI is not set
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+# CONFIG_MTD_RAM is not set
-+# CONFIG_MTD_ROM is not set
-+# CONFIG_MTD_ABSENT is not set
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+CONFIG_MTD_NAND=y
-+CONFIG_MTD_NAND_VERIFY_WRITE=y
-+# CONFIG_MTD_NAND_ECC_SMC is not set
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+CONFIG_MTD_NAND_IDS=y
-+CONFIG_MTD_NAND_S3C2410=y
-+CONFIG_MTD_NAND_S3C2410_BBT=y
-+# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
-+CONFIG_MTD_NAND_S3C2410_HWECC=y
-+# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+
-+#
-+# Parallel port support
-+#
-+# CONFIG_PARPORT is not set
-+
-+#
-+# Plug and Play support
-+#
-+# CONFIG_PNPACPI is not set
-+
-+#
-+# Block devices
-+#
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=m
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_UB=m
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=4096
-+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=m
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=m
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+CONFIG_BLK_DEV_SR=m
-+# CONFIG_BLK_DEV_SR_VENDOR is not set
-+CONFIG_CHR_DEV_SG=m
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+CONFIG_SCSI_SCAN_ASYNC=y
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+
-+#
-+# SCSI low-level drivers
-+#
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_ATA is not set
-+
-+#
-+# Multi-device support (RAID and LVM)
-+#
-+CONFIG_MD=y
-+# CONFIG_BLK_DEV_MD is not set
-+CONFIG_BLK_DEV_DM=m
-+# CONFIG_DM_DEBUG is not set
-+CONFIG_DM_CRYPT=m
-+CONFIG_DM_SNAPSHOT=m
-+# CONFIG_DM_MIRROR is not set
-+# CONFIG_DM_ZERO is not set
-+# CONFIG_DM_MULTIPATH is not set
-+# CONFIG_DM_DELAY is not set
-+
-+#
-+# Network device support
-+#
-+CONFIG_NETDEVICES=y
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_EQUALIZER is not set
-+CONFIG_TUN=m
-+# CONFIG_PHYLIB is not set
-+
-+#
-+# Ethernet (10 or 100Mbit)
-+#
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=m
-+# CONFIG_SMC91X is not set
-+# CONFIG_DM9000 is not set
-+CONFIG_NET_PCI=y
-+CONFIG_CS89x0=m
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+CONFIG_USB_CATC=m
-+CONFIG_USB_KAWETH=m
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+CONFIG_USB_USBNET_MII=m
-+CONFIG_USB_USBNET=m
-+CONFIG_USB_NET_AX8817X=m
-+CONFIG_USB_NET_CDCETHER=m
-+CONFIG_USB_NET_DM9601=m
-+CONFIG_USB_NET_GL620A=m
-+CONFIG_USB_NET_NET1080=m
-+CONFIG_USB_NET_PLUSB=m
-+CONFIG_USB_NET_MCS7830=m
-+CONFIG_USB_NET_RNDIS_HOST=m
-+CONFIG_USB_NET_CDC_SUBSET=m
-+CONFIG_USB_ALI_M5632=y
-+CONFIG_USB_AN2720=y
-+CONFIG_USB_BELKIN=y
-+CONFIG_USB_ARMLINUX=y
-+CONFIG_USB_EPSON2888=y
-+CONFIG_USB_KC2190=y
-+CONFIG_USB_NET_ZAURUS=m
-+# CONFIG_WAN is not set
-+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=m
-+CONFIG_PPP_MPPE=m
-+# CONFIG_PPPOE is not set
-+# CONFIG_SLIP is not set
-+CONFIG_SLHC=m
-+# CONFIG_SHAPER is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+
-+#
-+# ISDN subsystem
-+#
-+# CONFIG_ISDN is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
-+# CONFIG_INPUT_JOYDEV is not set
-+# CONFIG_INPUT_TSDEV is not set
-+CONFIG_INPUT_EVDEV=y
-+CONFIG_INPUT_EVBUG=m
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+# CONFIG_KEYBOARD_ATKBD is not set
-+# 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_KEYBOARD_STOWAWAY=m
-+CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_GTA01=y
-+CONFIG_KEYBOARD_QT2410=y
-+CONFIG_INPUT_MOUSE=y
-+# CONFIG_MOUSE_PS2 is not set
-+# CONFIG_MOUSE_SERIAL is not set
-+# CONFIG_MOUSE_APPLETOUCH is not set
-+# CONFIG_MOUSE_VSXXXAA is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+CONFIG_INPUT_TOUCHSCREEN=y
-+# CONFIG_TOUCHSCREEN_ADS7846 is not set
-+CONFIG_TOUCHSCREEN_S3C2410=y
-+# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
-+# CONFIG_TOUCHSCREEN_GUNZE is not set
-+# CONFIG_TOUCHSCREEN_ELO is not set
-+# CONFIG_TOUCHSCREEN_MTOUCH is not set
-+# CONFIG_TOUCHSCREEN_MK712 is not set
-+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-+# CONFIG_TOUCHSCREEN_UCB1400 is not set
-+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-+CONFIG_INPUT_MISC=y
-+# CONFIG_INPUT_ATI_REMOTE is not set
-+# CONFIG_INPUT_ATI_REMOTE2 is not set
-+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-+# CONFIG_INPUT_POWERMATE is not set
-+# CONFIG_INPUT_YEALINK is not set
-+CONFIG_INPUT_UINPUT=m
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+# CONFIG_SERIO_SERPORT is not set
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_NR_TTY_DEVICES=4
-+CONFIG_HW_CONSOLE=y
-+CONFIG_VT_HW_CONSOLE_BINDING=y
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_SERIAL_S3C2410=y
-+CONFIG_SERIAL_S3C2410_CONSOLE=y
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_LEGACY_PTYS is not set
-+
-+#
-+# IPMI
-+#
-+# CONFIG_IPMI_HANDLER is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_S3C2410_WATCHDOG=m
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+
-+#
-+# TPM devices
-+#
-+# CONFIG_TCG_TPM is not set
-+# CONFIG_TS0710_MUX is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_GPIO is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+CONFIG_I2C_S3C2410=y
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_TINY_USB is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_SENSORS_DS1337 is not set
-+# CONFIG_SENSORS_DS1374 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+CONFIG_SENSORS_PCF50606=y
-+CONFIG_SENSORS_PCF50633=y
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_SENSORS_PCA9539 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+CONFIG_SENSORS_TSL256X=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
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+# CONFIG_SPI_DEBUG is not set
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+CONFIG_SPI_S3C24XX=y
-+CONFIG_SPI_S3C24XX_GPIO=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+CONFIG_SPI_SLAVE_JBT6K74=y
-+# CONFIG_SPI_SLAVE_LIS302DL is not set
-+
-+#
-+# Dallas's 1-wire bus
-+#
-+# CONFIG_W1 is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_ABITUGURU is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ASB100 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_FSCHER is not set
-+# CONFIG_SENSORS_FSCPOS is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+# CONFIG_SENSORS_LM70 is not set
-+# CONFIG_SENSORS_LM75 is not set
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# CONFIG_SENSORS_LM87 is not set
-+# CONFIG_SENSORS_LM90 is not set
-+# CONFIG_SENSORS_LM92 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+
-+#
-+# Misc devices
-+#
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+
-+#
-+# LED devices
-+#
-+CONFIG_NEW_LEDS=y
-+CONFIG_LEDS_CLASS=y
-+
-+#
-+# LED drivers
-+#
-+CONFIG_LEDS_S3C24XX=m
-+CONFIG_LEDS_GTA01=y
-+# CONFIG_LEDS_GTA02 is not set
-+
-+#
-+# LED Triggers
-+#
-+CONFIG_LEDS_TRIGGERS=y
-+CONFIG_LEDS_TRIGGER_TIMER=y
-+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+CONFIG_BACKLIGHT_LCD_SUPPORT=y
-+CONFIG_BACKLIGHT_CLASS_DEVICE=y
-+CONFIG_LCD_CLASS_DEVICE=y
-+CONFIG_BACKLIGHT_GTA01=y
-+
-+#
-+# Display device support
-+#
-+# CONFIG_DISPLAY_SUPPORT is not set
-+# CONFIG_VGASTATE is not set
-+CONFIG_FB=y
-+# CONFIG_FIRMWARE_EDID is not set
-+# CONFIG_FB_DDC is not set
-+CONFIG_FB_CFB_FILLRECT=y
-+CONFIG_FB_CFB_COPYAREA=y
-+CONFIG_FB_CFB_IMAGEBLIT=y
-+# CONFIG_FB_SYS_FILLRECT is not set
-+# CONFIG_FB_SYS_COPYAREA is not set
-+# CONFIG_FB_SYS_IMAGEBLIT is not set
-+# CONFIG_FB_SYS_FOPS is not set
-+CONFIG_FB_DEFERRED_IO=y
-+# CONFIG_FB_SVGALIB is not set
-+# CONFIG_FB_MACMODES is not set
-+# CONFIG_FB_BACKLIGHT is not set
-+# CONFIG_FB_MODE_HELPERS is not set
-+# CONFIG_FB_TILEBLITTING is not set
-+
-+#
-+# Frame buffer hardware drivers
-+#
-+# CONFIG_FB_S1D13XXX is not set
-+CONFIG_FB_S3C2410=y
-+# CONFIG_FB_S3C2410_DEBUG is not set
-+CONFIG_GLAMO=y
-+CONFIG_FB_GLAMO=y
-+CONFIG_GLAMO_SPI_GPIO=y
-+CONFIG_FB_GLAMO_SPI=y
-+# CONFIG_FB_VIRTUAL is not set
-+
-+#
-+# Console display driver support
-+#
-+# CONFIG_VGA_CONSOLE is not set
-+CONFIG_DUMMY_CONSOLE=y
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-+CONFIG_FONTS=y
-+# CONFIG_FONT_8x8 is not set
-+# CONFIG_FONT_8x16 is not set
-+CONFIG_FONT_6x11=y
-+# CONFIG_FONT_7x14 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
-+# CONFIG_FONT_10x18 is not set
-+# CONFIG_LOGO is not set
-+
-+#
-+# Sound
-+#
-+CONFIG_SOUND=y
-+
-+#
-+# 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 is not set
-+CONFIG_SND_OSSEMUL=y
-+CONFIG_SND_MIXER_OSS=m
-+CONFIG_SND_PCM_OSS=m
-+CONFIG_SND_PCM_OSS_PLUGINS=y
-+# CONFIG_SND_DYNAMIC_MINORS is not set
-+CONFIG_SND_SUPPORT_OLD_API=y
-+CONFIG_SND_VERBOSE_PROCFS=y
-+# 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
-+
-+#
-+# ALSA ARM devices
-+#
-+
-+#
-+# USB devices
-+#
-+CONFIG_SND_USB_AUDIO=m
-+# CONFIG_SND_USB_CAIAQ is not set
-+
-+#
-+# System on Chip audio support
-+#
-+CONFIG_SND_SOC=m
-+CONFIG_SND_S3C24XX_SOC=m
-+CONFIG_SND_S3C24XX_SOC_I2S=m
-+CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
-+CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
-+
-+#
-+# SoC Audio support for SuperH
-+#
-+CONFIG_SND_SOC_WM8753=m
-+
-+#
-+# Open Sound System
-+#
-+# CONFIG_SOUND_PRIME is not set
-+
-+#
-+# HID Devices
-+#
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=m
-+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-+# CONFIG_HID_FF is not set
-+# CONFIG_USB_HIDDEV is not set
-+
-+#
-+# USB HID Boot Protocol drivers
-+#
-+# CONFIG_USB_KBD is not set
-+# CONFIG_USB_MOUSE is not set
-+
-+#
-+# USB support
-+#
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+CONFIG_USB_SUSPEND=y
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=m
-+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_SL811_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+CONFIG_USB_ACM=m
-+CONFIG_USB_PRINTER=m
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+CONFIG_USB_STORAGE=m
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+CONFIG_USB_STORAGE_DATAFAB=y
-+CONFIG_USB_STORAGE_FREECOM=y
-+CONFIG_USB_STORAGE_DPCM=y
-+CONFIG_USB_STORAGE_USBAT=y
-+CONFIG_USB_STORAGE_SDDR09=y
-+CONFIG_USB_STORAGE_SDDR55=y
-+CONFIG_USB_STORAGE_JUMPSHOT=y
-+CONFIG_USB_STORAGE_ALAUDA=y
-+CONFIG_USB_STORAGE_KARMA=y
-+CONFIG_USB_LIBUSUAL=y
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+
-+#
-+# USB Serial Converter support
-+#
-+CONFIG_USB_SERIAL=m
-+CONFIG_USB_SERIAL_GENERIC=y
-+CONFIG_USB_SERIAL_AIRCABLE=m
-+CONFIG_USB_SERIAL_AIRPRIME=m
-+CONFIG_USB_SERIAL_ARK3116=m
-+CONFIG_USB_SERIAL_BELKIN=m
-+CONFIG_USB_SERIAL_WHITEHEAT=m
-+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-+CONFIG_USB_SERIAL_CP2101=m
-+CONFIG_USB_SERIAL_CYPRESS_M8=m
-+CONFIG_USB_SERIAL_EMPEG=m
-+CONFIG_USB_SERIAL_FTDI_SIO=m
-+CONFIG_USB_SERIAL_FUNSOFT=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_GARMIN=m
-+CONFIG_USB_SERIAL_IPW=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_MOS7720=m
-+CONFIG_USB_SERIAL_MOS7840=m
-+CONFIG_USB_SERIAL_NAVMAN=m
-+CONFIG_USB_SERIAL_PL2303=m
-+CONFIG_USB_SERIAL_HP4X=m
-+CONFIG_USB_SERIAL_SAFE=m
-+CONFIG_USB_SERIAL_SAFE_PADDED=y
-+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-+CONFIG_USB_SERIAL_TI=m
-+CONFIG_USB_SERIAL_CYBERJACK=m
-+CONFIG_USB_SERIAL_XIRCOM=m
-+CONFIG_USB_SERIAL_OPTION=m
-+CONFIG_USB_SERIAL_OMNINET=m
-+# CONFIG_USB_SERIAL_DEBUG is not set
-+CONFIG_USB_EZUSB=y
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+CONFIG_USB_BERRY_CHARGE=m
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_LD is not set
-+CONFIG_USB_TRANCEVIBRATOR=m
-+CONFIG_USB_IOWARRIOR=m
-+# CONFIG_USB_TEST is not set
-+
-+#
-+# USB DSL modem support
-+#
-+
-+#
-+# USB Gadget Support
-+#
-+CONFIG_USB_GADGET=y
-+# CONFIG_USB_GADGET_DEBUG_FILES is not set
-+CONFIG_USB_GADGET_SELECTED=y
-+# CONFIG_USB_GADGET_FSL_USB2 is not set
-+# CONFIG_USB_GADGET_NET2280 is not set
-+# CONFIG_USB_GADGET_PXA2XX is not set
-+# CONFIG_USB_GADGET_GOKU is not set
-+# CONFIG_USB_GADGET_LH7A40X is not set
-+# CONFIG_USB_GADGET_OMAP is not set
-+CONFIG_USB_GADGET_S3C2410=y
-+CONFIG_USB_S3C2410=y
-+# CONFIG_USB_S3C2410_DEBUG is not set
-+# CONFIG_USB_GADGET_AT91 is not set
-+# CONFIG_USB_GADGET_DUMMY_HCD is not set
-+# CONFIG_USB_GADGET_DUALSPEED is not set
-+# CONFIG_USB_ZERO is not set
-+CONFIG_USB_ETH=y
-+CONFIG_USB_ETH_RNDIS=y
-+# CONFIG_USB_GADGETFS is not set
-+# CONFIG_USB_FILE_STORAGE is not set
-+# CONFIG_USB_G_SERIAL is not set
-+# CONFIG_USB_MIDI_GADGET is not set
-+CONFIG_MMC=y
-+# CONFIG_MMC_DEBUG is not set
-+CONFIG_MMC_UNSAFE_RESUME=y
-+
-+#
-+# MMC/SD Card Drivers
-+#
-+CONFIG_MMC_BLOCK=y
-+
-+#
-+# MMC/SD Host Controller Drivers
-+#
-+CONFIG_MMC_S3C=y
-+
-+#
-+# Real Time Clock
-+#
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+CONFIG_RTC_DEBUG=y
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+CONFIG_RTC_DRV_S3C=m
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=m
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+# CONFIG_EXT3_FS_XATTR is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+# CONFIG_JBD_DEBUG is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+CONFIG_FS_POSIX_ACL=y
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+# CONFIG_MINIX_FS is not set
-+CONFIG_ROMFS_FS=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+CONFIG_DNOTIFY=y
-+# CONFIG_AUTOFS_FS is not set
-+CONFIG_AUTOFS4_FS=m
-+CONFIG_FUSE_FS=m
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+CONFIG_ISO9660_FS=m
-+CONFIG_JOLIET=y
-+# CONFIG_ZISOFS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=m
-+CONFIG_MSDOS_FS=m
-+CONFIG_VFAT_FS=m
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+CONFIG_RAMFS=y
-+CONFIG_CONFIGFS_FS=m
-+
-+#
-+# 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_YAFFS_FS=y
-+CONFIG_YAFFS_YAFFS1=y
-+CONFIG_YAFFS_9BYTE_TAGS=y
-+CONFIG_YAFFS_YAFFS2=y
-+CONFIG_YAFFS_AUTO_YAFFS2=y
-+# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-+CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
-+# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-+# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
-+CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+CONFIG_JFFS2_SUMMARY=y
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# 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_V3_ACL is not set
-+CONFIG_NFS_V4=y
-+# CONFIG_NFS_DIRECTIO is not set
-+CONFIG_NFSD=m
-+CONFIG_NFSD_V3=y
-+# CONFIG_NFSD_V3_ACL is not set
-+CONFIG_NFSD_V4=y
-+CONFIG_NFSD_TCP=y
-+CONFIG_ROOT_NFS=y
-+CONFIG_LOCKD=y
-+CONFIG_LOCKD_V4=y
-+CONFIG_EXPORTFS=m
-+CONFIG_NFS_COMMON=y
-+CONFIG_SUNRPC=y
-+CONFIG_SUNRPC_GSS=y
-+# CONFIG_SUNRPC_BIND34 is not set
-+CONFIG_RPCSEC_GSS_KRB5=y
-+# CONFIG_RPCSEC_GSS_SPKM3 is not set
-+# CONFIG_SMB_FS is not set
-+CONFIG_CIFS=m
-+# CONFIG_CIFS_STATS is not set
-+CONFIG_CIFS_WEAK_PW_HASH=y
-+# CONFIG_CIFS_XATTR is not set
-+# CONFIG_CIFS_DEBUG2 is not set
-+# CONFIG_CIFS_EXPERIMENTAL is not set
-+# CONFIG_NCP_FS is not set
-+# CONFIG_CODA_FS is not set
-+# CONFIG_AFS_FS is not set
-+# CONFIG_9P_FS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+
-+#
-+# Native Language Support
-+#
-+CONFIG_NLS=m
-+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 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=m
-+CONFIG_NLS_CODEPAGE_950=m
-+# 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=m
-+
-+#
-+# Distributed Lock Manager
-+#
-+# CONFIG_DLM is not set
-+
-+#
-+# Profiling support
-+#
-+# CONFIG_PROFILING is not set
-+
-+#
-+# Kernel hacking
-+#
-+# CONFIG_PRINTK_TIME is not set
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+# CONFIG_DEBUG_SHIRQ is not set
-+CONFIG_DETECT_SOFTLOCKUP=y
-+# CONFIG_SCHEDSTATS is not set
-+CONFIG_TIMER_STATS=y
-+# CONFIG_DEBUG_SLAB is not set
-+CONFIG_DEBUG_PREEMPT=y
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+# CONFIG_DEBUG_SPINLOCK is not set
-+# CONFIG_DEBUG_MUTEXES is not set
-+# CONFIG_DEBUG_LOCK_ALLOC is not set
-+# CONFIG_PROVE_LOCKING is not set
-+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+CONFIG_FRAME_POINTER=y
-+CONFIG_FORCED_INLINING=y
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_DEBUG_USER is not set
-+CONFIG_DEBUG_ERRORS=y
-+CONFIG_DEBUG_LL=y
-+# CONFIG_DEBUG_ICEDCC is not set
-+CONFIG_DEBUG_S3C2410_PORT=y
-+CONFIG_DEBUG_S3C2410_UART=0
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+
-+#
-+# Cryptographic options
-+#
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_HMAC=y
-+CONFIG_CRYPTO_XCBC=m
-+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_WP512=m
-+CONFIG_CRYPTO_TGR192=m
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+CONFIG_CRYPTO_LRW=m
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_FCRYPT=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_CAST6=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_KHAZAD=m
-+CONFIG_CRYPTO_ANUBIS=m
-+CONFIG_CRYPTO_DEFLATE=m
-+CONFIG_CRYPTO_MICHAEL_MIC=m
-+CONFIG_CRYPTO_CRC32C=m
-+CONFIG_CRYPTO_CAMELLIA=m
-+CONFIG_CRYPTO_TEST=m
-+
-+#
-+# Hardware crypto devices
-+#
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_CRC_CCITT=m
-+CONFIG_CRC16=m
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+CONFIG_LIBCRC32C=m
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_TEXTSEARCH=y
-+CONFIG_TEXTSEARCH_KMP=m
-+CONFIG_TEXTSEARCH_BM=m
-+CONFIG_TEXTSEARCH_FSM=m
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_DMA=y
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1065-local-build-scripts.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1065-local-build-scripts.patch.patch
deleted file mode 100755 (executable)
index f62f1b8..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-From bd559c9f37baa73f7220b8158909ce6d7264d4d3 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Fri, 25 Jul 2008 23:05:59 +0100
-Subject: [PATCH] local-build-scripts.patch
-
-Add a couple of handy scripts to crossmake and send over dfu
-
-From: warmcat <andy@warmcat.com>
----
- build    |   14 ++++++++++++++
- dfu-kern |    9 +++++++++
- 2 files changed, 23 insertions(+), 0 deletions(-)
- create mode 100755 build
- create mode 100755 dfu-kern
-
-diff --git a/build b/build
-new file mode 100755
-index 0000000..7e61ea2
---- /dev/null
-+++ b/build
-@@ -0,0 +1,14 @@
-+#!/bin/sh
-+
-+set -x
-+
-+export CROSS_COMPILE=../../cross/bin/arm-angstrom-linux-gnueabi-
-+make ARCH=arm silentoldconfig
-+if make -j5 ARCH=arm; then
-+      ${CROSS_COMPILE}objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux linux.bin
-+      mkimage -A arm -O linux -T kernel -C none -a 30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973(GTA02)" -d linux.bin uImage.bin
-+      exit 0
-+else
-+      exit 1
-+fi
-+
-diff --git a/dfu-kern b/dfu-kern
-new file mode 100755
-index 0000000..990abdd
---- /dev/null
-+++ b/dfu-kern
-@@ -0,0 +1,9 @@
-+#!/bin/bash
-+../../dfu-util/src/dfu-util -a 3 -d 0x1457:0x5119 -D uImage.bin
-+if [ $? -eq 1 ] ; then
-+../../dfu-util/src/dfu-util -a 3 -d 0x1457:0x5120 -D uImage.bin
-+../../dfu-util/src/dfu-util -a 3 -d 0x1457:0x5119 -D uImage.bin
-+
-+fi
-+
-+
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1066-local-build-new-dfu-vid.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1066-local-build-new-dfu-vid.patch.patch
deleted file mode 100755 (executable)
index 9684085..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-From 11b5692836d6e70af1da2acf4c61f45838b6be83 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Fri, 25 Jul 2008 23:05:59 +0100
-Subject: [PATCH] local-build-new-dfu-vid.patch
-
-Update to new DFU VID for A5
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- dfu-kern |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/dfu-kern b/dfu-kern
-index 990abdd..b7ed2c3 100755
---- a/dfu-kern
-+++ b/dfu-kern
-@@ -1,8 +1,8 @@
- #!/bin/bash
--../../dfu-util/src/dfu-util -a 3 -d 0x1457:0x5119 -D uImage.bin
-+../../dfu-util/src/dfu-util -a 3 -d 0x1d50:0x5119 -D uImage.bin
- if [ $? -eq 1 ] ; then
--../../dfu-util/src/dfu-util -a 3 -d 0x1457:0x5120 -D uImage.bin
--../../dfu-util/src/dfu-util -a 3 -d 0x1457:0x5119 -D uImage.bin
-+../../dfu-util/src/dfu-util -a 3 -d 0x1d50:0x5120 -D uImage.bin
-+../../dfu-util/src/dfu-util -a 3 -d 0x1d50:0x5119 -D uImage.bin
- fi
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1067-local-update-defconfig-for-2.6-dev.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1067-local-update-defconfig-for-2.6-dev.patch.patch
deleted file mode 100755 (executable)
index f30e431..0000000
+++ /dev/null
@@ -1,1836 +0,0 @@
-From 855ecb79dc82ac833287f5d0f9c9ece81e2c825e Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Fri, 25 Jul 2008 23:05:59 +0100
-Subject: [PATCH] local-update-defconfig-for-2.6-dev.patch
-
-Make a defconfig for 2.6.24 out of the current 2.6.22.5 one
-
-From: warmcat <andy@warmcat.com>
----
- defconfig-2.6.24 | 1814 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 1814 insertions(+), 0 deletions(-)
- create mode 100644 defconfig-2.6.24
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-new file mode 100644
-index 0000000..48644ac
---- /dev/null
-+++ b/defconfig-2.6.24
-@@ -0,0 +1,1814 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.24-rc6
-+# Tue Jan  8 11:16:56 2008
-+#
-+CONFIG_ARM=y
-+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-+CONFIG_GENERIC_GPIO=y
-+# CONFIG_GENERIC_TIME is not set
-+# CONFIG_GENERIC_CLOCKEVENTS is not set
-+CONFIG_MMU=y
-+CONFIG_NO_IOPORT=y
-+CONFIG_GENERIC_HARDIRQS=y
-+CONFIG_STACKTRACE_SUPPORT=y
-+CONFIG_LOCKDEP_SUPPORT=y
-+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-+CONFIG_HARDIRQS_SW_RESEND=y
-+CONFIG_GENERIC_IRQ_PROBE=y
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_ZONE_DMA=y
-+CONFIG_VECTORS_BASE=0xffff0000
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_LOCK_KERNEL=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION="-mokodev"
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=14
-+# CONFIG_CGROUPS is not set
-+CONFIG_FAIR_GROUP_SCHED=y
-+CONFIG_FAIR_USER_SCHED=y
-+# CONFIG_FAIR_CGROUP_SCHED is not set
-+# CONFIG_SYSFS_DEPRECATED is not set
-+# CONFIG_RELAY is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+CONFIG_SYSCTL=y
-+# CONFIG_EMBEDDED is not set
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=m
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=m
-+# CONFIG_DEFAULT_AS is not set
-+CONFIG_DEFAULT_DEADLINE=y
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="deadline"
-+
-+#
-+# System Type
-+#
-+# CONFIG_ARCH_AAEC2000 is not set
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_REALVIEW is not set
-+# CONFIG_ARCH_VERSATILE is not set
-+# CONFIG_ARCH_AT91 is not set
-+# CONFIG_ARCH_CLPS7500 is not set
-+# CONFIG_ARCH_CLPS711X is not set
-+# CONFIG_ARCH_CO285 is not set
-+# CONFIG_ARCH_EBSA110 is not set
-+# CONFIG_ARCH_EP93XX is not set
-+# CONFIG_ARCH_FOOTBRIDGE is not set
-+# CONFIG_ARCH_NETX is not set
-+# CONFIG_ARCH_H720X is not set
-+# CONFIG_ARCH_IMX is not set
-+# CONFIG_ARCH_IOP13XX is not set
-+# CONFIG_ARCH_IOP32X is not set
-+# CONFIG_ARCH_IOP33X is not set
-+# CONFIG_ARCH_IXP23XX is not set
-+# CONFIG_ARCH_IXP2000 is not set
-+# CONFIG_ARCH_IXP4XX is not set
-+# CONFIG_ARCH_L7200 is not set
-+# CONFIG_ARCH_KS8695 is not set
-+# CONFIG_ARCH_NS9XXX is not set
-+# CONFIG_ARCH_MXC is not set
-+# CONFIG_ARCH_PNX4008 is not set
-+# CONFIG_ARCH_PXA is not set
-+# CONFIG_ARCH_RPC is not set
-+# CONFIG_ARCH_SA1100 is not set
-+CONFIG_ARCH_S3C2410=y
-+# CONFIG_ARCH_SHARK is not set
-+# CONFIG_ARCH_LH7A40X is not set
-+# CONFIG_ARCH_DAVINCI is not set
-+# CONFIG_ARCH_OMAP is not set
-+CONFIG_PLAT_S3C24XX=y
-+CONFIG_CPU_S3C244X=y
-+CONFIG_S3C2410_DMA=y
-+# CONFIG_S3C2410_DMA_DEBUG is not set
-+CONFIG_MACH_SMDK=y
-+CONFIG_MACH_NEO1973=y
-+CONFIG_PLAT_S3C=y
-+CONFIG_CPU_LLSERIAL_S3C2410=y
-+CONFIG_CPU_LLSERIAL_S3C2440=y
-+
-+#
-+# Boot options
-+#
-+# CONFIG_S3C_BOOT_WATCHDOG is not set
-+# CONFIG_S3C_BOOT_ERROR_RESET is not set
-+
-+#
-+# Power management
-+#
-+CONFIG_S3C2410_PM_DEBUG=y
-+# CONFIG_S3C2410_PM_CHECK is not set
-+CONFIG_S3C_LOWLEVEL_UART_PORT=0
-+
-+#
-+# S3C2400 Machines
-+#
-+CONFIG_CPU_S3C2410=y
-+CONFIG_CPU_S3C2410_DMA=y
-+CONFIG_S3C2410_PM=y
-+CONFIG_S3C2410_GPIO=y
-+CONFIG_S3C2410_CLOCK=y
-+CONFIG_S3C2410_PWM=y
-+
-+#
-+# S3C2410 Machines
-+#
-+# CONFIG_ARCH_SMDK2410 is not set
-+# CONFIG_ARCH_H1940 is not set
-+# CONFIG_MACH_N30 is not set
-+# CONFIG_ARCH_BAST is not set
-+# CONFIG_MACH_OTOM is not set
-+# CONFIG_MACH_AML_M5900 is not set
-+# CONFIG_MACH_VR1000 is not set
-+CONFIG_MACH_QT2410=y
-+CONFIG_MACH_NEO1973_GTA01=y
-+
-+#
-+# S3C2412 Machines
-+#
-+# CONFIG_MACH_SMDK2413 is not set
-+# CONFIG_MACH_SMDK2412 is not set
-+# CONFIG_MACH_VSTMS is not set
-+CONFIG_CPU_S3C2440=y
-+CONFIG_S3C2440_DMA=y
-+
-+#
-+# S3C2440 Machines
-+#
-+# CONFIG_MACH_ANUBIS is not set
-+# CONFIG_MACH_OSIRIS is not set
-+# CONFIG_MACH_RX3715 is not set
-+CONFIG_ARCH_S3C2440=y
-+# CONFIG_MACH_NEXCODER_2440 is not set
-+CONFIG_SMDK2440_CPU2440=y
-+CONFIG_MACH_HXD8=y
-+CONFIG_MACH_NEO1973_GTA02=y
-+# CONFIG_NEO1973_GTA02_2440 is not set
-+CONFIG_CPU_S3C2442=y
-+
-+#
-+# S3C2442 Machines
-+#
-+CONFIG_SMDK2440_CPU2442=y
-+
-+#
-+# S3C2443 Machines
-+#
-+# CONFIG_MACH_SMDK2443 is not set
-+
-+#
-+# Processor Type
-+#
-+CONFIG_CPU_32=y
-+CONFIG_CPU_ARM920T=y
-+CONFIG_CPU_32v4T=y
-+CONFIG_CPU_ABRT_EV4T=y
-+CONFIG_CPU_CACHE_V4WT=y
-+CONFIG_CPU_CACHE_VIVT=y
-+CONFIG_CPU_COPY_V4WB=y
-+CONFIG_CPU_TLB_V4WBI=y
-+CONFIG_CPU_CP15=y
-+CONFIG_CPU_CP15_MMU=y
-+
-+#
-+# Processor Features
-+#
-+CONFIG_ARM_THUMB=y
-+# CONFIG_CPU_ICACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-+# CONFIG_OUTER_CACHE is not set
-+
-+#
-+# Bus support
-+#
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Kernel Features
-+#
-+# CONFIG_TICK_ONESHOT is not set
-+CONFIG_PREEMPT=y
-+CONFIG_NO_IDLE_HZ=y
-+CONFIG_HZ=200
-+CONFIG_AEABI=y
-+CONFIG_OABI_COMPAT=y
-+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4096
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_ALIGNMENT_TRAP=y
-+
-+#
-+# Boot options
-+#
-+CONFIG_ZBOOT_ROM_TEXT=0x0
-+CONFIG_ZBOOT_ROM_BSS=0x0
-+CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
-+# CONFIG_XIP_KERNEL is not set
-+CONFIG_KEXEC=y
-+
-+#
-+# Floating point emulation
-+#
-+
-+#
-+# At least one emulation must be selected
-+#
-+CONFIG_FPE_NWFPE=y
-+# CONFIG_FPE_NWFPE_XP is not set
-+# CONFIG_FPE_FASTFPE is not set
-+
-+#
-+# Userspace binary formats
-+#
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+
-+#
-+# Power management options
-+#
-+CONFIG_PM=y
-+CONFIG_PM_LEGACY=y
-+CONFIG_PM_DEBUG=y
-+# CONFIG_PM_VERBOSE is not set
-+CONFIG_PM_SLEEP=y
-+CONFIG_SUSPEND_UP_POSSIBLE=y
-+CONFIG_SUSPEND=y
-+CONFIG_APM_EMULATION=y
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=m
-+CONFIG_PACKET_MMAP=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+CONFIG_XFRM_MIGRATE=y
-+CONFIG_NET_KEY=m
-+CONFIG_NET_KEY_MIGRATE=y
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+# CONFIG_IP_ROUTE_MULTIPATH is not set
-+# CONFIG_IP_ROUTE_VERBOSE 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=m
-+CONFIG_NET_IPGRE=m
-+# CONFIG_NET_IPGRE_BROADCAST is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_XFRM_TUNNEL=m
-+CONFIG_INET_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET_XFRM_MODE_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_BEET=m
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+CONFIG_TCP_MD5SIG=y
-+# CONFIG_IP_VS is not set
-+CONFIG_IPV6=m
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_IPCOMP=m
-+# CONFIG_IPV6_MIP6 is not set
-+CONFIG_INET6_XFRM_TUNNEL=m
-+CONFIG_INET6_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET6_XFRM_MODE_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_BEET=m
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_TUNNEL=m
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+CONFIG_NETFILTER=y
-+# CONFIG_NETFILTER_DEBUG is not set
-+CONFIG_BRIDGE_NETFILTER=y
-+
-+#
-+# Core Netfilter Configuration
-+#
-+CONFIG_NETFILTER_NETLINK=m
-+CONFIG_NETFILTER_NETLINK_QUEUE=m
-+CONFIG_NETFILTER_NETLINK_LOG=m
-+CONFIG_NF_CONNTRACK_ENABLED=m
-+CONFIG_NF_CONNTRACK=m
-+CONFIG_NF_CT_ACCT=y
-+CONFIG_NF_CONNTRACK_MARK=y
-+CONFIG_NF_CONNTRACK_EVENTS=y
-+CONFIG_NF_CT_PROTO_GRE=m
-+CONFIG_NF_CT_PROTO_SCTP=m
-+# CONFIG_NF_CT_PROTO_UDPLITE is not set
-+# CONFIG_NF_CONNTRACK_AMANDA is not set
-+CONFIG_NF_CONNTRACK_FTP=m
-+CONFIG_NF_CONNTRACK_H323=m
-+CONFIG_NF_CONNTRACK_IRC=m
-+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-+CONFIG_NF_CONNTRACK_PPTP=m
-+CONFIG_NF_CONNTRACK_SANE=m
-+CONFIG_NF_CONNTRACK_SIP=m
-+CONFIG_NF_CONNTRACK_TFTP=m
-+CONFIG_NF_CT_NETLINK=m
-+CONFIG_NETFILTER_XTABLES=m
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-+CONFIG_NETFILTER_XT_TARGET_DSCP=m
-+CONFIG_NETFILTER_XT_TARGET_MARK=m
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+CONFIG_NETFILTER_XT_MATCH_DCCP=m
-+CONFIG_NETFILTER_XT_MATCH_DSCP=m
-+CONFIG_NETFILTER_XT_MATCH_ESP=m
-+CONFIG_NETFILTER_XT_MATCH_HELPER=m
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_MAC=m
-+CONFIG_NETFILTER_XT_MATCH_MARK=m
-+CONFIG_NETFILTER_XT_MATCH_POLICY=m
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-+CONFIG_NETFILTER_XT_MATCH_REALM=m
-+CONFIG_NETFILTER_XT_MATCH_SCTP=m
-+CONFIG_NETFILTER_XT_MATCH_STATE=m
-+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-+CONFIG_NETFILTER_XT_MATCH_STRING=m
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-+
-+#
-+# IP: Netfilter Configuration
-+#
-+CONFIG_NF_CONNTRACK_IPV4=m
-+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-+# CONFIG_IP_NF_QUEUE is not set
-+CONFIG_IP_NF_IPTABLES=m
-+CONFIG_IP_NF_MATCH_IPRANGE=m
-+CONFIG_IP_NF_MATCH_TOS=m
-+# CONFIG_IP_NF_MATCH_RECENT is not set
-+CONFIG_IP_NF_MATCH_ECN=m
-+CONFIG_IP_NF_MATCH_AH=m
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_MATCH_OWNER=m
-+CONFIG_IP_NF_MATCH_ADDRTYPE=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_TARGET_LOG=m
-+CONFIG_IP_NF_TARGET_ULOG=m
-+CONFIG_NF_NAT=m
-+CONFIG_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_NF_NAT_SNMP_BASIC=m
-+CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_FTP=m
-+CONFIG_NF_NAT_IRC=m
-+CONFIG_NF_NAT_TFTP=m
-+# CONFIG_NF_NAT_AMANDA is not set
-+CONFIG_NF_NAT_PPTP=m
-+CONFIG_NF_NAT_H323=m
-+CONFIG_NF_NAT_SIP=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_IP_NF_TARGET_TOS=m
-+CONFIG_IP_NF_TARGET_ECN=m
-+CONFIG_IP_NF_TARGET_TTL=m
-+CONFIG_IP_NF_TARGET_CLUSTERIP=m
-+# CONFIG_IP_NF_RAW is not set
-+# CONFIG_IP_NF_ARPTABLES is not set
-+
-+#
-+# IPv6: Netfilter Configuration (EXPERIMENTAL)
-+#
-+CONFIG_NF_CONNTRACK_IPV6=m
-+# CONFIG_IP6_NF_QUEUE is not set
-+CONFIG_IP6_NF_IPTABLES=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_OWNER=m
-+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-+CONFIG_IP6_NF_MATCH_AH=m
-+CONFIG_IP6_NF_MATCH_MH=m
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_LOG=m
-+CONFIG_IP6_NF_TARGET_REJECT=m
-+CONFIG_IP6_NF_MANGLE=m
-+CONFIG_IP6_NF_TARGET_HL=m
-+# CONFIG_IP6_NF_RAW is not set
-+
-+#
-+# 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_BRIDGE_EBT_ULOG=m
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+CONFIG_BRIDGE=y
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+CONFIG_LLC=y
-+# 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+CONFIG_NET_SCHED=y
-+
-+#
-+# Queueing/Scheduling
-+#
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=m
-+CONFIG_NET_SCH_PRIO=m
-+# CONFIG_NET_SCH_RR is not set
-+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_NETEM=m
-+CONFIG_NET_SCH_INGRESS=m
-+
-+#
-+# Classification
-+#
-+CONFIG_NET_CLS=y
-+CONFIG_NET_CLS_BASIC=m
-+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_CLS_U32_PERF=y
-+CONFIG_CLS_U32_MARK=y
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
-+# CONFIG_NET_EMATCH is not set
-+# CONFIG_NET_CLS_ACT is not set
-+# CONFIG_NET_CLS_POLICE is not set
-+# CONFIG_NET_CLS_IND is not set
-+CONFIG_NET_SCH_FIFO=y
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_IRDA 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_HIDP=m
-+
-+#
-+# Bluetooth device drivers
-+#
-+CONFIG_BT_HCIUSB=m
-+CONFIG_BT_HCIUSB_SCO=y
-+# CONFIG_BT_HCIBTSDIO is not set
-+# CONFIG_BT_HCIUART is not set
-+# CONFIG_BT_HCIBCM203X is not set
-+# CONFIG_BT_HCIBPA10X is not set
-+# CONFIG_BT_HCIBFUSB is not set
-+# CONFIG_BT_HCIVHCI is not set
-+# CONFIG_AF_RXRPC is not set
-+CONFIG_FIB_RULES=y
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+# CONFIG_WIRELESS_EXT is not set
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=m
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=m
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+CONFIG_MTD_CONCAT=y
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_AFS_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+CONFIG_MTD_CFI_INTELEXT=y
-+# CONFIG_MTD_CFI_AMDSTD is not set
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+CONFIG_MTD_ROM=y
-+CONFIG_MTD_ABSENT=y
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+CONFIG_MTD_PHYSMAP=y
-+CONFIG_MTD_PHYSMAP_START=0x0
-+CONFIG_MTD_PHYSMAP_LEN=0
-+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-+# CONFIG_MTD_ARM_INTEGRATOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+CONFIG_MTD_NAND=y
-+CONFIG_MTD_NAND_VERIFY_WRITE=y
-+# CONFIG_MTD_NAND_ECC_SMC is not set
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+CONFIG_MTD_NAND_IDS=y
-+CONFIG_MTD_NAND_S3C2410=y
-+CONFIG_MTD_NAND_S3C2410_DEBUG=y
-+CONFIG_MTD_NAND_S3C2410_HWECC=y
-+# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ALAUDA is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+# CONFIG_PARPORT is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=m
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_UB=m
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=4096
-+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=m
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=m
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+CONFIG_BLK_DEV_SR=m
-+# CONFIG_BLK_DEV_SR_VENDOR is not set
-+CONFIG_CHR_DEV_SG=m
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+CONFIG_SCSI_SCAN_ASYNC=y
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_ATA is not set
-+CONFIG_MD=y
-+# CONFIG_BLK_DEV_MD is not set
-+CONFIG_BLK_DEV_DM=m
-+# CONFIG_DM_DEBUG is not set
-+CONFIG_DM_CRYPT=m
-+CONFIG_DM_SNAPSHOT=m
-+# CONFIG_DM_MIRROR is not set
-+# CONFIG_DM_ZERO is not set
-+# CONFIG_DM_MULTIPATH is not set
-+# CONFIG_DM_DELAY is not set
-+# CONFIG_DM_UEVENT is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+CONFIG_TUN=m
-+# CONFIG_VETH is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=m
-+# CONFIG_AX88796 is not set
-+# CONFIG_SMC91X is not set
-+# CONFIG_DM9000 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_B44 is not set
-+CONFIG_CS89x0=m
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+CONFIG_USB_CATC=m
-+CONFIG_USB_KAWETH=m
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+CONFIG_USB_USBNET=m
-+CONFIG_USB_NET_AX8817X=m
-+CONFIG_USB_NET_CDCETHER=m
-+CONFIG_USB_NET_DM9601=m
-+CONFIG_USB_NET_GL620A=m
-+CONFIG_USB_NET_NET1080=m
-+CONFIG_USB_NET_PLUSB=m
-+CONFIG_USB_NET_MCS7830=m
-+CONFIG_USB_NET_RNDIS_HOST=m
-+CONFIG_USB_NET_CDC_SUBSET=m
-+CONFIG_USB_ALI_M5632=y
-+CONFIG_USB_AN2720=y
-+CONFIG_USB_BELKIN=y
-+CONFIG_USB_ARMLINUX=y
-+CONFIG_USB_EPSON2888=y
-+CONFIG_USB_KC2190=y
-+CONFIG_USB_NET_ZAURUS=m
-+# CONFIG_WAN is not set
-+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=m
-+CONFIG_PPP_MPPE=m
-+# CONFIG_PPPOE is not set
-+# CONFIG_PPPOL2TP is not set
-+# CONFIG_SLIP is not set
-+CONFIG_SLHC=m
-+# CONFIG_SHAPER is not set
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
-+# CONFIG_INPUT_JOYDEV is not set
-+CONFIG_INPUT_EVDEV=y
-+CONFIG_INPUT_EVBUG=m
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+# CONFIG_KEYBOARD_ATKBD is not set
-+# 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_KEYBOARD_STOWAWAY=m
-+CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_NEO1973=y
-+CONFIG_KEYBOARD_QT2410=y
-+CONFIG_INPUT_MOUSE=y
-+# CONFIG_MOUSE_PS2 is not set
-+# CONFIG_MOUSE_SERIAL is not set
-+# CONFIG_MOUSE_APPLETOUCH is not set
-+# CONFIG_MOUSE_VSXXXAA is not set
-+# CONFIG_MOUSE_GPIO is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+CONFIG_INPUT_TOUCHSCREEN=y
-+# CONFIG_TOUCHSCREEN_ADS7846 is not set
-+# CONFIG_TOUCHSCREEN_FUJITSU is not set
-+CONFIG_TOUCHSCREEN_S3C2410=y
-+# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
-+# CONFIG_TOUCHSCREEN_GUNZE is not set
-+# CONFIG_TOUCHSCREEN_ELO is not set
-+# CONFIG_TOUCHSCREEN_MTOUCH is not set
-+# CONFIG_TOUCHSCREEN_MK712 is not set
-+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-+# CONFIG_TOUCHSCREEN_UCB1400 is not set
-+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-+CONFIG_INPUT_MISC=y
-+# CONFIG_INPUT_ATI_REMOTE is not set
-+# CONFIG_INPUT_ATI_REMOTE2 is not set
-+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-+# CONFIG_INPUT_POWERMATE is not set
-+# CONFIG_INPUT_YEALINK is not set
-+CONFIG_INPUT_UINPUT=m
-+CONFIG_INPUT_LIS302DL=y
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+# CONFIG_SERIO_SERPORT is not set
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_NR_TTY_DEVICES=4
-+CONFIG_HW_CONSOLE=y
-+CONFIG_VT_HW_CONSOLE_BINDING=y
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_SERIAL_S3C2410=y
-+CONFIG_SERIAL_S3C2410_CONSOLE=y
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_LEGACY_PTYS is not set
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_GPIO is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+CONFIG_I2C_S3C2410=y
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_TINY_USB is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_SENSORS_DS1337 is not set
-+# CONFIG_SENSORS_DS1374 is not set
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+CONFIG_SENSORS_PCF50606=y
-+CONFIG_SENSORS_PCF50633=y
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_SENSORS_PCA9539 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+CONFIG_SENSORS_TSL256X=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
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+# CONFIG_SPI_DEBUG is not set
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+CONFIG_SPI_S3C24XX=y
-+CONFIG_SPI_S3C24XX_GPIO=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_W1 is not set
-+CONFIG_POWER_SUPPLY=y
-+CONFIG_POWER_SUPPLY_DEBUG=y
-+CONFIG_PDA_POWER=y
-+CONFIG_APM_POWER=y
-+# CONFIG_BATTERY_DS2760 is not set
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+# CONFIG_SENSORS_LM70 is not set
-+# CONFIG_SENSORS_LM75 is not set
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# CONFIG_SENSORS_LM87 is not set
-+# CONFIG_SENSORS_LM90 is not set
-+# CONFIG_SENSORS_LM92 is not set
-+# CONFIG_SENSORS_LM93 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_DME1737 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_S3C2410_WATCHDOG=m
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+CONFIG_MFD_GLAMO=y
-+CONFIG_MFD_GLAMO_FB=y
-+CONFIG_MFD_GLAMO_SPI_GPIO=y
-+CONFIG_MFD_GLAMO_SPI_FB=y
-+CONFIG_MFD_GLAMO_MCI=y
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+CONFIG_FB=y
-+# CONFIG_FIRMWARE_EDID is not set
-+# CONFIG_FB_DDC is not set
-+CONFIG_FB_CFB_FILLRECT=y
-+CONFIG_FB_CFB_COPYAREA=y
-+CONFIG_FB_CFB_IMAGEBLIT=y
-+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-+# CONFIG_FB_SYS_FILLRECT is not set
-+# CONFIG_FB_SYS_COPYAREA is not set
-+# CONFIG_FB_SYS_IMAGEBLIT is not set
-+# CONFIG_FB_SYS_FOPS is not set
-+CONFIG_FB_DEFERRED_IO=y
-+# CONFIG_FB_SVGALIB is not set
-+# CONFIG_FB_MACMODES is not set
-+# CONFIG_FB_BACKLIGHT is not set
-+# CONFIG_FB_MODE_HELPERS is not set
-+# CONFIG_FB_TILEBLITTING is not set
-+
-+#
-+# Frame buffer hardware drivers
-+#
-+# CONFIG_FB_UVESA is not set
-+# CONFIG_FB_S1D13XXX is not set
-+CONFIG_FB_S3C2410=y
-+# CONFIG_FB_S3C2410_DEBUG is not set
-+# CONFIG_FB_VIRTUAL is not set
-+CONFIG_BACKLIGHT_LCD_SUPPORT=y
-+CONFIG_LCD_CLASS_DEVICE=y
-+CONFIG_LCD_LTV350QV=y
-+CONFIG_BACKLIGHT_CLASS_DEVICE=y
-+# CONFIG_BACKLIGHT_CORGI is not set
-+CONFIG_BACKLIGHT_GTA01=y
-+
-+#
-+# Display device support
-+#
-+CONFIG_DISPLAY_SUPPORT=y
-+
-+#
-+# Display hardware drivers
-+#
-+CONFIG_DISPLAY_JBT6K74=y
-+
-+#
-+# Console display driver support
-+#
-+# CONFIG_VGA_CONSOLE is not set
-+CONFIG_DUMMY_CONSOLE=y
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-+CONFIG_FONTS=y
-+# CONFIG_FONT_8x8 is not set
-+# CONFIG_FONT_8x16 is not set
-+CONFIG_FONT_6x11=y
-+# CONFIG_FONT_7x14 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
-+# CONFIG_FONT_10x18 is not set
-+# CONFIG_LOGO is not set
-+
-+#
-+# Sound
-+#
-+CONFIG_SOUND=y
-+
-+#
-+# 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 is not set
-+CONFIG_SND_OSSEMUL=y
-+CONFIG_SND_MIXER_OSS=m
-+CONFIG_SND_PCM_OSS=m
-+CONFIG_SND_PCM_OSS_PLUGINS=y
-+# CONFIG_SND_DYNAMIC_MINORS is not set
-+CONFIG_SND_SUPPORT_OLD_API=y
-+CONFIG_SND_VERBOSE_PROCFS=y
-+# 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
-+
-+#
-+# ALSA ARM devices
-+#
-+
-+#
-+# SPI devices
-+#
-+
-+#
-+# USB devices
-+#
-+CONFIG_SND_USB_AUDIO=m
-+# CONFIG_SND_USB_CAIAQ is not set
-+
-+#
-+# System on Chip audio support
-+#
-+CONFIG_SND_SOC=m
-+CONFIG_SND_S3C24XX_SOC=m
-+CONFIG_SND_S3C24XX_SOC_I2S=m
-+CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
-+CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
-+
-+#
-+# SoC Audio support for SuperH
-+#
-+CONFIG_SND_SOC_WM8753=m
-+
-+#
-+# Open Sound System
-+#
-+# CONFIG_SOUND_PRIME is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=m
-+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-+# CONFIG_HID_FF is not set
-+# CONFIG_USB_HIDDEV is not set
-+
-+#
-+# USB HID Boot Protocol drivers
-+#
-+# CONFIG_USB_KBD is not set
-+# CONFIG_USB_MOUSE is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+CONFIG_USB_SUSPEND=y
-+CONFIG_USB_PERSIST=y
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=m
-+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+CONFIG_USB_ACM=m
-+CONFIG_USB_PRINTER=m
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+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 is not set
-+CONFIG_USB_STORAGE_DPCM=y
-+CONFIG_USB_STORAGE_USBAT=y
-+CONFIG_USB_STORAGE_SDDR09=y
-+CONFIG_USB_STORAGE_SDDR55=y
-+CONFIG_USB_STORAGE_JUMPSHOT=y
-+CONFIG_USB_STORAGE_ALAUDA=y
-+CONFIG_USB_STORAGE_KARMA=y
-+CONFIG_USB_LIBUSUAL=y
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+
-+#
-+# USB Serial Converter support
-+#
-+CONFIG_USB_SERIAL=m
-+CONFIG_USB_SERIAL_GENERIC=y
-+CONFIG_USB_SERIAL_AIRCABLE=m
-+CONFIG_USB_SERIAL_AIRPRIME=m
-+CONFIG_USB_SERIAL_ARK3116=m
-+CONFIG_USB_SERIAL_BELKIN=m
-+# CONFIG_USB_SERIAL_CH341 is not set
-+CONFIG_USB_SERIAL_WHITEHEAT=m
-+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-+CONFIG_USB_SERIAL_CP2101=m
-+CONFIG_USB_SERIAL_CYPRESS_M8=m
-+CONFIG_USB_SERIAL_EMPEG=m
-+CONFIG_USB_SERIAL_FTDI_SIO=m
-+CONFIG_USB_SERIAL_FUNSOFT=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_GARMIN=m
-+CONFIG_USB_SERIAL_IPW=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_MOS7720=m
-+CONFIG_USB_SERIAL_MOS7840=m
-+CONFIG_USB_SERIAL_NAVMAN=m
-+CONFIG_USB_SERIAL_PL2303=m
-+# CONFIG_USB_SERIAL_OTI6858 is not set
-+CONFIG_USB_SERIAL_HP4X=m
-+CONFIG_USB_SERIAL_SAFE=m
-+CONFIG_USB_SERIAL_SAFE_PADDED=y
-+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-+CONFIG_USB_SERIAL_TI=m
-+CONFIG_USB_SERIAL_CYBERJACK=m
-+CONFIG_USB_SERIAL_XIRCOM=m
-+CONFIG_USB_SERIAL_OPTION=m
-+CONFIG_USB_SERIAL_OMNINET=m
-+# CONFIG_USB_SERIAL_DEBUG is not set
-+CONFIG_USB_EZUSB=y
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+CONFIG_USB_BERRY_CHARGE=m
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_LD is not set
-+CONFIG_USB_TRANCEVIBRATOR=m
-+CONFIG_USB_IOWARRIOR=m
-+# CONFIG_USB_TEST is not set
-+
-+#
-+# USB DSL modem support
-+#
-+
-+#
-+# USB Gadget Support
-+#
-+CONFIG_USB_GADGET=y
-+# CONFIG_USB_GADGET_DEBUG is not set
-+# CONFIG_USB_GADGET_DEBUG_FILES is not set
-+CONFIG_USB_GADGET_SELECTED=y
-+# CONFIG_USB_GADGET_AMD5536UDC is not set
-+# CONFIG_USB_GADGET_ATMEL_USBA is not set
-+# CONFIG_USB_GADGET_FSL_USB2 is not set
-+# CONFIG_USB_GADGET_NET2280 is not set
-+# CONFIG_USB_GADGET_PXA2XX is not set
-+# CONFIG_USB_GADGET_M66592 is not set
-+# CONFIG_USB_GADGET_GOKU is not set
-+# CONFIG_USB_GADGET_LH7A40X is not set
-+# CONFIG_USB_GADGET_OMAP is not set
-+CONFIG_USB_GADGET_S3C2410=y
-+CONFIG_USB_S3C2410=y
-+# CONFIG_USB_S3C2410_DEBUG is not set
-+# CONFIG_USB_GADGET_AT91 is not set
-+# CONFIG_USB_GADGET_DUMMY_HCD is not set
-+# CONFIG_USB_GADGET_DUALSPEED is not set
-+# CONFIG_USB_ZERO is not set
-+CONFIG_USB_ETH=y
-+CONFIG_USB_ETH_RNDIS=y
-+# CONFIG_USB_GADGETFS is not set
-+# CONFIG_USB_FILE_STORAGE is not set
-+# CONFIG_USB_G_SERIAL is not set
-+# CONFIG_USB_MIDI_GADGET is not set
-+CONFIG_MMC=y
-+# CONFIG_MMC_DEBUG is not set
-+# CONFIG_MMC_UNSAFE_RESUME is not set
-+
-+#
-+# MMC/SD Card Drivers
-+#
-+CONFIG_MMC_BLOCK=y
-+# CONFIG_MMC_BLOCK_BOUNCE is not set
-+# CONFIG_SDIO_UART is not set
-+
-+#
-+# MMC/SD Host Controller Drivers
-+#
-+# CONFIG_MMC_SPI is not set
-+# CONFIG_MMC_S3C is not set
-+CONFIG_MMC_GLAMO=y
-+CONFIG_NEW_LEDS=y
-+CONFIG_LEDS_CLASS=y
-+
-+#
-+# LED drivers
-+#
-+CONFIG_LEDS_S3C24XX=m
-+CONFIG_LEDS_GPIO=y
-+CONFIG_LEDS_NEO1973_VIBRATOR=y
-+CONFIG_LEDS_NEO1973_GTA02=y
-+
-+#
-+# LED Triggers
-+#
-+CONFIG_LEDS_TRIGGERS=y
-+CONFIG_LEDS_TRIGGER_TIMER=y
-+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+CONFIG_RTC_DEBUG=y
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+CONFIG_RTC_DRV_S3C=m
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=m
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+# CONFIG_EXT3_FS_XATTR is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+# CONFIG_MINIX_FS is not set
-+CONFIG_ROMFS_FS=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+CONFIG_DNOTIFY=y
-+# CONFIG_AUTOFS_FS is not set
-+CONFIG_AUTOFS4_FS=m
-+CONFIG_FUSE_FS=m
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+CONFIG_ISO9660_FS=m
-+CONFIG_JOLIET=y
-+# CONFIG_ZISOFS is not set
-+# CONFIG_UDF_FS is not set
-+
-+#
-+# DOS/FAT/NT Filesystems
-+#
-+CONFIG_FAT_FS=m
-+CONFIG_MSDOS_FS=m
-+CONFIG_VFAT_FS=m
-+CONFIG_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+CONFIG_CONFIGFS_FS=m
-+
-+#
-+# 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_YAFFS_FS=y
-+CONFIG_YAFFS_YAFFS1=y
-+CONFIG_YAFFS_9BYTE_TAGS=y
-+CONFIG_YAFFS_YAFFS2=y
-+CONFIG_YAFFS_AUTO_YAFFS2=y
-+# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-+CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
-+# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-+# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
-+CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
-+CONFIG_JFFS2_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+CONFIG_JFFS2_SUMMARY=y
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# 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
-+# CONFIG_NETWORK_FILESYSTEMS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+CONFIG_NLS=m
-+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 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=m
-+CONFIG_NLS_CODEPAGE_950=m
-+# 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=m
-+# CONFIG_DLM is not set
-+CONFIG_INSTRUMENTATION=y
-+# CONFIG_PROFILING is not set
-+CONFIG_MARKERS=y
-+
-+#
-+# Kernel hacking
-+#
-+CONFIG_PRINTK_TIME=y
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+# CONFIG_DEBUG_FS is not set
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+CONFIG_DEBUG_SHIRQ=y
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+CONFIG_TIMER_STATS=y
-+# CONFIG_DEBUG_SLAB is not set
-+CONFIG_DEBUG_PREEMPT=y
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+CONFIG_DEBUG_SPINLOCK=y
-+CONFIG_DEBUG_MUTEXES=y
-+CONFIG_DEBUG_LOCK_ALLOC=y
-+# CONFIG_PROVE_LOCKING is not set
-+CONFIG_LOCKDEP=y
-+CONFIG_LOCK_STAT=y
-+CONFIG_DEBUG_LOCKDEP=y
-+CONFIG_DEBUG_SPINLOCK_SLEEP=y
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+CONFIG_STACKTRACE=y
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+CONFIG_DEBUG_SG=y
-+CONFIG_FRAME_POINTER=y
-+CONFIG_FORCED_INLINING=y
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_USER is not set
-+CONFIG_DEBUG_ERRORS=y
-+CONFIG_DEBUG_LL=y
-+# CONFIG_DEBUG_ICEDCC is not set
-+# CONFIG_DEBUG_S3C_PORT is not set
-+CONFIG_DEBUG_S3C_UART=0
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_BLKCIPHER=y
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_HMAC=y
-+CONFIG_CRYPTO_XCBC=m
-+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_WP512=m
-+CONFIG_CRYPTO_TGR192=m
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+CONFIG_CRYPTO_LRW=m
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_FCRYPT=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_CAST6=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_KHAZAD=m
-+CONFIG_CRYPTO_ANUBIS=m
-+# CONFIG_CRYPTO_SEED is not set
-+CONFIG_CRYPTO_DEFLATE=m
-+CONFIG_CRYPTO_MICHAEL_MIC=m
-+CONFIG_CRYPTO_CRC32C=m
-+CONFIG_CRYPTO_CAMELLIA=m
-+CONFIG_CRYPTO_TEST=m
-+# CONFIG_CRYPTO_AUTHENC is not set
-+CONFIG_CRYPTO_HW=y
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_CRC_CCITT=m
-+CONFIG_CRC16=m
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+CONFIG_LIBCRC32C=m
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_TEXTSEARCH=y
-+CONFIG_TEXTSEARCH_KMP=m
-+CONFIG_TEXTSEARCH_BM=m
-+CONFIG_TEXTSEARCH_FSM=m
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_DMA=y
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1068-local-config-add-vfat-nls-to-kern.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1068-local-config-add-vfat-nls-to-kern.patch.patch
deleted file mode 100755 (executable)
index 8d9845a..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-From 46b7ab304f0f5fcdfa1ab6d2034438928ab68f97 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Fri, 25 Jul 2008 23:05:59 +0100
-Subject: [PATCH] local-config-add-vfat-nls-to-kern.patch
-
-SD Card / VFAT in monolithic kernel
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- defconfig-2.6.24 |   18 +++++++++---------
- 1 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index 48644ac..b0ef327 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
--# Linux kernel version: 2.6.24-rc6
--# Tue Jan  8 11:16:56 2008
-+# Linux kernel version: 2.6.24-rc7
-+# Sun Jan 13 21:40:55 2008
- #
- CONFIG_ARM=y
- CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-@@ -1034,7 +1034,7 @@ CONFIG_SPI_MASTER=y
- #
- CONFIG_SPI_BITBANG=y
- CONFIG_SPI_S3C24XX=y
--CONFIG_SPI_S3C24XX_GPIO=y
-+# CONFIG_SPI_S3C24XX_GPIO is not set
- #
- # SPI Protocol Masters
-@@ -1587,9 +1587,9 @@ CONFIG_JOLIET=y
- #
- # DOS/FAT/NT Filesystems
- #
--CONFIG_FAT_FS=m
--CONFIG_MSDOS_FS=m
--CONFIG_VFAT_FS=m
-+CONFIG_FAT_FS=y
-+CONFIG_MSDOS_FS=y
-+CONFIG_VFAT_FS=y
- CONFIG_FAT_DEFAULT_CODEPAGE=437
- CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
- # CONFIG_NTFS_FS is not set
-@@ -1649,9 +1649,9 @@ CONFIG_CRAMFS=y
- #
- # CONFIG_PARTITION_ADVANCED is not set
- CONFIG_MSDOS_PARTITION=y
--CONFIG_NLS=m
-+CONFIG_NLS=y
- CONFIG_NLS_DEFAULT="iso8859-1"
--CONFIG_NLS_CODEPAGE_437=m
-+CONFIG_NLS_CODEPAGE_437=y
- # CONFIG_NLS_CODEPAGE_737 is not set
- # CONFIG_NLS_CODEPAGE_775 is not set
- CONFIG_NLS_CODEPAGE_850=m
-@@ -1675,7 +1675,7 @@ CONFIG_NLS_CODEPAGE_950=m
- # 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_1=y
- # CONFIG_NLS_ISO8859_2 is not set
- # CONFIG_NLS_ISO8859_3 is not set
- # CONFIG_NLS_ISO8859_4 is not set
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1069-local-config-add-bluetooth-monolithic.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1069-local-config-add-bluetooth-monolithic.patch.patch
deleted file mode 100755 (executable)
index 449d38c..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From 5e63b0173c4f096c43f9320c1ea910710b11eaad Mon Sep 17 00:00:00 2001
-From: warmcat <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:05:59 +0100
-Subject: [PATCH] local-config-add-bluetooth-monolithic.patch
-
-Add Bluetooth in monolithic kernel
----
- defconfig-2.6.24 |   10 ++--------
- 1 files changed, 2 insertions(+), 8 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index b0ef327..5b3e5e9 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -1275,16 +1275,10 @@ CONFIG_HID=y
- #
- # USB Input Devices
- #
--CONFIG_USB_HID=m
-+CONFIG_USB_HID=y
- # CONFIG_USB_HIDINPUT_POWERBOOK is not set
- # CONFIG_HID_FF is not set
- # CONFIG_USB_HIDDEV is not set
--
--#
--# USB HID Boot Protocol drivers
--#
--# CONFIG_USB_KBD is not set
--# CONFIG_USB_MOUSE is not set
- CONFIG_USB_SUPPORT=y
- CONFIG_USB_ARCH_HAS_HCD=y
- CONFIG_USB_ARCH_HAS_OHCI=y
-@@ -1306,7 +1300,7 @@ CONFIG_USB_PERSIST=y
- # USB Host Controller Drivers
- #
- # CONFIG_USB_ISP116X_HCD is not set
--CONFIG_USB_OHCI_HCD=m
-+CONFIG_USB_OHCI_HCD=y
- # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
- # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
- CONFIG_USB_OHCI_LITTLE_ENDIAN=y
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1070-local-config-wlan-config-changes.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1070-local-config-wlan-config-changes.patch.patch
deleted file mode 100755 (executable)
index 11a0592..0000000
+++ /dev/null
@@ -1,155 +0,0 @@
-From c21c82ef59cc77008ab05448ff001ae4a72396ba Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Fri, 25 Jul 2008 23:05:59 +0100
-Subject: [PATCH] local-config-wlan-config-changes.patch
-
----
- defconfig-2.6.24 |   47 ++++++++++++++++++++++++++++++++---------------
- 1 files changed, 32 insertions(+), 15 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index 5b3e5e9..140fbfa 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
--# Linux kernel version: 2.6.24-rc7
--# Sun Jan 13 21:40:55 2008
-+# Linux kernel version: 2.6.24-rc8
-+# Tue Jan 22 11:47:25 2008
- #
- CONFIG_ARM=y
- CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-@@ -322,7 +322,7 @@ CONFIG_NET=y
- #
- # Networking options
- #
--CONFIG_PACKET=m
-+CONFIG_PACKET=y
- CONFIG_PACKET_MMAP=y
- CONFIG_UNIX=y
- CONFIG_XFRM=y
-@@ -595,20 +595,20 @@ CONFIG_NET_SCH_FIFO=y
- # CONFIG_NET_PKTGEN is not set
- # CONFIG_HAMRADIO is not set
- # CONFIG_IRDA is not set
--CONFIG_BT=m
--CONFIG_BT_L2CAP=m
--CONFIG_BT_SCO=m
--CONFIG_BT_RFCOMM=m
-+CONFIG_BT=y
-+CONFIG_BT_L2CAP=y
-+CONFIG_BT_SCO=y
-+CONFIG_BT_RFCOMM=y
- CONFIG_BT_RFCOMM_TTY=y
--CONFIG_BT_BNEP=m
-+CONFIG_BT_BNEP=y
- CONFIG_BT_BNEP_MC_FILTER=y
- CONFIG_BT_BNEP_PROTO_FILTER=y
--CONFIG_BT_HIDP=m
-+CONFIG_BT_HIDP=y
- #
- # Bluetooth device drivers
- #
--CONFIG_BT_HCIUSB=m
-+CONFIG_BT_HCIUSB=y
- CONFIG_BT_HCIUSB_SCO=y
- # CONFIG_BT_HCIBTSDIO is not set
- # CONFIG_BT_HCIUART is not set
-@@ -623,7 +623,7 @@ CONFIG_FIB_RULES=y
- # Wireless
- #
- # CONFIG_CFG80211 is not set
--# CONFIG_WIRELESS_EXT is not set
-+CONFIG_WIRELESS_EXT=y
- # CONFIG_MAC80211 is not set
- # CONFIG_IEEE80211 is not set
- # CONFIG_RFKILL is not set
-@@ -737,6 +737,13 @@ CONFIG_MTD_NAND_S3C2410_HWECC=y
- #
- # CONFIG_MTD_UBI is not set
- # CONFIG_PARPORT is not set
-+CONFIG_PNP=y
-+CONFIG_PNP_DEBUG=y
-+
-+#
-+# Protocols
-+#
-+# CONFIG_PNPACPI is not set
- CONFIG_BLK_DEV=y
- # CONFIG_BLK_DEV_COW_COMMON is not set
- CONFIG_BLK_DEV_LOOP=m
-@@ -814,9 +821,10 @@ CONFIG_NETDEVICES=y
- # CONFIG_EQUALIZER is not set
- CONFIG_TUN=m
- # CONFIG_VETH is not set
-+# CONFIG_NET_SB1000 is not set
- # CONFIG_PHYLIB is not set
- CONFIG_NET_ETHERNET=y
--CONFIG_MII=m
-+CONFIG_MII=y
- # CONFIG_AX88796 is not set
- # CONFIG_SMC91X is not set
- # CONFIG_DM9000 is not set
-@@ -843,7 +851,7 @@ CONFIG_USB_CATC=m
- CONFIG_USB_KAWETH=m
- CONFIG_USB_PEGASUS=m
- CONFIG_USB_RTL8150=m
--CONFIG_USB_USBNET=m
-+CONFIG_USB_USBNET=y
- CONFIG_USB_NET_AX8817X=m
- CONFIG_USB_NET_CDCETHER=m
- CONFIG_USB_NET_DM9601=m
-@@ -1436,6 +1444,7 @@ CONFIG_USB_IOWARRIOR=m
- CONFIG_USB_GADGET=y
- # CONFIG_USB_GADGET_DEBUG is not set
- # CONFIG_USB_GADGET_DEBUG_FILES is not set
-+# CONFIG_USB_GADGET_DEBUG_FS is not set
- CONFIG_USB_GADGET_SELECTED=y
- # CONFIG_USB_GADGET_AMD5536UDC is not set
- # CONFIG_USB_GADGET_ATMEL_USBA is not set
-@@ -1459,6 +1468,14 @@ CONFIG_USB_ETH_RNDIS=y
- # CONFIG_USB_FILE_STORAGE is not set
- # CONFIG_USB_G_SERIAL is not set
- # CONFIG_USB_MIDI_GADGET is not set
-+
-+#
-+# SDIO support
-+#
-+CONFIG_SDIO=y
-+CONFIG_SDIO_S3C24XX=y
-+CONFIG_SDIO_S3C24XX_DMA=y
-+CONFIG_SDIO_AR6000_WLAN=y
- CONFIG_MMC=y
- # CONFIG_MMC_DEBUG is not set
- # CONFIG_MMC_UNSAFE_RESUME is not set
-@@ -1475,7 +1492,6 @@ CONFIG_MMC_BLOCK=y
- #
- # CONFIG_MMC_SPI is not set
- # CONFIG_MMC_S3C is not set
--CONFIG_MMC_GLAMO=y
- CONFIG_NEW_LEDS=y
- CONFIG_LEDS_CLASS=y
-@@ -1554,6 +1570,7 @@ CONFIG_EXT3_FS=y
- # CONFIG_EXT3_FS_XATTR is not set
- # CONFIG_EXT4DEV_FS is not set
- CONFIG_JBD=y
-+# CONFIG_JBD_DEBUG is not set
- # CONFIG_REISERFS_FS is not set
- # CONFIG_JFS_FS is not set
- # CONFIG_FS_POSIX_ACL is not set
-@@ -1696,7 +1713,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
- CONFIG_ENABLE_MUST_CHECK=y
- CONFIG_MAGIC_SYSRQ=y
- # CONFIG_UNUSED_SYMBOLS is not set
--# CONFIG_DEBUG_FS is not set
-+CONFIG_DEBUG_FS=y
- # CONFIG_HEADERS_CHECK is not set
- CONFIG_DEBUG_KERNEL=y
- CONFIG_DEBUG_SHIRQ=y
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1071-local-config-defconfig-motion-sensor-gpio.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1071-local-config-defconfig-motion-sensor-gpio.patch.patch
deleted file mode 100755 (executable)
index 2e34e31..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From cdefa3c7722774152538c4ac5ea9290c441d6a4b Mon Sep 17 00:00:00 2001
-From: warmcat <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:05:59 +0100
-Subject: [PATCH] local-config-defconfig-motion-sensor-gpio.patch
-
----
- defconfig-2.6.24 |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index 140fbfa..8b428b1 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.24-rc8
--# Tue Jan 22 11:47:25 2008
-+# Wed Jan 23 10:00:57 2008
- #
- CONFIG_ARM=y
- CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-@@ -1041,8 +1041,8 @@ CONFIG_SPI_MASTER=y
- # SPI Master Controller Drivers
- #
- CONFIG_SPI_BITBANG=y
--CONFIG_SPI_S3C24XX=y
--# CONFIG_SPI_S3C24XX_GPIO is not set
-+# CONFIG_SPI_S3C24XX is not set
-+CONFIG_SPI_S3C24XX_GPIO=y
- #
- # SPI Protocol Masters
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1072-local-config-pmu.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1072-local-config-pmu.patch.patch
deleted file mode 100755 (executable)
index df87a57..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From cdb9d4e048f43bb19bd50713b88b1594ae60abf7 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Fri, 25 Jul 2008 23:06:00 +0100
-Subject: [PATCH] local-config-pmu.patch
-
----
- defconfig-2.6.24 |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index 8b428b1..270c4f9 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -308,7 +308,7 @@ CONFIG_BINFMT_ELF=y
- CONFIG_PM=y
- CONFIG_PM_LEGACY=y
- CONFIG_PM_DEBUG=y
--# CONFIG_PM_VERBOSE is not set
-+CONFIG_PM_VERBOSE=y
- CONFIG_PM_SLEEP=y
- CONFIG_SUSPEND_UP_POSSIBLE=y
- CONFIG_SUSPEND=y
-@@ -1056,6 +1056,8 @@ CONFIG_POWER_SUPPLY_DEBUG=y
- CONFIG_PDA_POWER=y
- CONFIG_APM_POWER=y
- # CONFIG_BATTERY_DS2760 is not set
-+CONFIG_BATTERY_BQ27000_HDQ=y
-+CONFIG_GTA02_HDQ=y
- CONFIG_HWMON=y
- # CONFIG_HWMON_VID is not set
- # CONFIG_SENSORS_AD7418 is not set
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1073-local-config-ext2.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1073-local-config-ext2.patch.patch
deleted file mode 100755 (executable)
index 7137c17..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-From e2cf46fcd393bcba106d610fae6d0a56e646328b Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Fri, 25 Jul 2008 23:06:00 +0100
-Subject: [PATCH] local-config-ext2.patch
-
----
- defconfig-2.6.24 |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index 270c4f9..833e15e 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -1565,7 +1565,7 @@ CONFIG_RTC_DRV_S3C=m
- #
- # File systems
- #
--CONFIG_EXT2_FS=m
-+CONFIG_EXT2_FS=y
- # CONFIG_EXT2_FS_XATTR is not set
- # CONFIG_EXT2_FS_XIP is not set
- CONFIG_EXT3_FS=y
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1074-contrib-fix-chgstate-array-bloat.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1074-contrib-fix-chgstate-array-bloat.patch.patch
deleted file mode 100755 (executable)
index 2adcf6a..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
-index a1c92d3..aaec6e8 100644
---- a/drivers/i2c/chips/pcf50606.c
-+++ b/drivers/i2c/chips/pcf50606.c
-@@ -72,12 +72,19 @@ static unsigned short normal_i2c[] = { 0x08, I2C_CLIENT_END };
- I2C_CLIENT_INSMOD_1(pcf50606);
--#define PCF50606_F_CHG_FAST   0x00000001      /* Charger Fast allowed */
--#define PCF50606_F_CHG_PRESENT        0x00000002      /* Charger present */
--#define PCF50606_F_CHG_FOK    0x00000004      /* Fast OK for battery */
--#define PCF50606_F_CHG_ERR    0x00000008      /* Charger Error */
--#define PCF50606_F_CHG_PROT   0x00000010      /* Charger Protection */
--#define PCF50606_F_CHG_READY  0x00000020      /* Charging completed */
-+#define PCF50606_B_CHG_FAST   0       /* Charger Fast allowed */
-+#define PCF50606_B_CHG_PRESENT        1       /* Charger present */
-+#define PCF50606_B_CHG_FOK    2       /* Fast OK for battery */
-+#define PCF50606_B_CHG_ERR    3       /* Charger Error */
-+#define PCF50606_B_CHG_PROT   4       /* Charger Protection */
-+#define PCF50606_B_CHG_READY  5       /* Charging completed */
-+
-+#define PCF50606_F_CHG_FAST   (1<<PCF50606_B_CHG_FAST)        /* Charger Fast allowed */
-+#define PCF50606_F_CHG_PRESENT        (1<<PCF50606_B_CHG_PRESENT)     /* Charger present */
-+#define PCF50606_F_CHG_FOK    (1<<PCF50606_B_CHG_FOK) /* Fast OK for battery */
-+#define PCF50606_F_CHG_ERR    (1<<PCF50606_B_CHG_ERR) /* Charger Error */
-+#define PCF50606_F_CHG_PROT   (1<<PCF50606_B_CHG_PROT)        /* Charger Protection */
-+#define PCF50606_F_CHG_READY  (1<<PCF50606_B_CHG_READY)       /* Charging completed */
- #define PCF50606_F_CHG_MASK   0x000000fc
- #define PCF50606_F_PWR_PRESSED        0x00000100
-@@ -1087,12 +1094,12 @@ static ssize_t set_chgmode(struct device *dev, struct device_attribute *attr,
- static DEVICE_ATTR(chgmode, S_IRUGO | S_IWUSR, show_chgmode, set_chgmode);
- static const char *chgstate_names[] = {
--      [PCF50606_F_CHG_FAST]                   = "fast_enabled",
--      [PCF50606_F_CHG_PRESENT]                = "present",
--      [PCF50606_F_CHG_FOK]                    = "fast_ok",
--      [PCF50606_F_CHG_ERR]                    = "error",
--      [PCF50606_F_CHG_PROT]                   = "protection",
--      [PCF50606_F_CHG_READY]                  = "ready",
-+      [PCF50606_B_CHG_FAST]                   = "fast_enabled",
-+      [PCF50606_B_CHG_PRESENT]                = "present",
-+      [PCF50606_B_CHG_FOK]                    = "fast_ok",
-+      [PCF50606_B_CHG_ERR]                    = "error",
-+      [PCF50606_B_CHG_PROT]                   = "protection",
-+      [PCF50606_B_CHG_READY]                  = "ready",
- };
- static ssize_t show_chgstate(struct device *dev, struct device_attribute *attr,
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1075-bugfix-deglitch-gpio-output-enable.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1075-bugfix-deglitch-gpio-output-enable.patch.patch
deleted file mode 100755 (executable)
index a0443e8..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-From 25a9f8ef682fcc215a345202defb3884c2be080f Mon Sep 17 00:00:00 2001
-From: warmcat <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:00 +0100
-Subject: [PATCH] bugfix-deglitch-gpio-output-enable.patch
-
----
- arch/arm/mach-s3c2440/mach-gta02.c |   10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 3816ea5..e32294b 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1258,9 +1258,9 @@ static void __init gta02_machine_init(void)
-               s3c2410_gpio_setpin(GTA02_CHIP_PWD, 0);
-               break;
-       default:
--              s3c2410_gpio_cfgpin(GTA02_GPIO_nWLAN_RESET, S3C2410_GPIO_OUTPUT);
-               /* Chip is in reset state */
-               s3c2410_gpio_setpin(GTA02_GPIO_nWLAN_RESET, 0);
-+              s3c2410_gpio_cfgpin(GTA02_GPIO_nWLAN_RESET, S3C2410_GPIO_OUTPUT);
-               mdelay(100);
-               /* Power is up */
-               s3c2410_gpio_setpin(GTA02_CHIP_PWD, 0);
-@@ -1300,8 +1300,14 @@ static void __init gta02_machine_init(void)
-       s3c2410_pm_init();
-       /* Set LCD_RESET / XRES to high */
--      s3c2410_gpio_cfgpin(GTA01_GPIO_LCD_RESET, S3C2410_GPIO_OUTPUT);
-       s3c2410_gpio_setpin(GTA01_GPIO_LCD_RESET, 1);
-+      s3c2410_gpio_cfgpin(GTA01_GPIO_LCD_RESET, S3C2410_GPIO_OUTPUT);
-+
-+      s3c2410_gpio_setpin(S3C2410_GPD12, 1);
-+      s3c2410_gpio_cfgpin(S3C2410_GPD12, S3C2410_GPIO_OUTPUT);
-+
-+      s3c2410_gpio_setpin(S3C2410_GPD13, 1);
-+      s3c2410_gpio_cfgpin(S3C2410_GPD13, S3C2410_GPIO_OUTPUT);
-       /* Make sure the modem can wake us up */
-       set_irq_type(GTA02_IRQ_MODEM, IRQT_RISING);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1076-clean-snip-gpio-reinit.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1076-clean-snip-gpio-reinit.patch.patch
deleted file mode 100755 (executable)
index 3322cbd..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-From 60e00c0c6a69c302d73093ccaf09697f94d6e7c2 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:00 +0100
-Subject: [PATCH] clean-snip-gpio-reinit.patch
- These are initialized already
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |    6 ------
- 1 files changed, 0 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index e32294b..f2b1b66 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1303,12 +1303,6 @@ static void __init gta02_machine_init(void)
-       s3c2410_gpio_setpin(GTA01_GPIO_LCD_RESET, 1);
-       s3c2410_gpio_cfgpin(GTA01_GPIO_LCD_RESET, S3C2410_GPIO_OUTPUT);
--      s3c2410_gpio_setpin(S3C2410_GPD12, 1);
--      s3c2410_gpio_cfgpin(S3C2410_GPD12, S3C2410_GPIO_OUTPUT);
--
--      s3c2410_gpio_setpin(S3C2410_GPD13, 1);
--      s3c2410_gpio_cfgpin(S3C2410_GPD13, S3C2410_GPIO_OUTPUT);
--
-       /* Make sure the modem can wake us up */
-       set_irq_type(GTA02_IRQ_MODEM, IRQT_RISING);
-       rc = request_irq(GTA02_IRQ_MODEM, gta02_modem_irq, IRQF_DISABLED,
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1077-introduce-fiq-hdq.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1077-introduce-fiq-hdq.patch.patch
deleted file mode 100755 (executable)
index 6513e5c..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-From 46f0b99a7b0e52e8dee4cdfe2e3599814f0388ed Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:00 +0100
-Subject: [PATCH] introduce-fiq-hdq.patch
-
-This adds a platform driver and device which performs HDQ
-battery protocol using a single GPIO pin which is set
-through platform data.
-
-HDQ has some hard latency requirements which can't
-be met if interrupts are enabled, so normally using
-a GPIO for this will require blocking out all other
-interrupts and processes for several milliseconds
-per register being read or written.
-
-This HDQ protocol engine is a FSM implemented inside the
-the FIQ ISR and regulated by timer interrupts happening
-at 20us intervals.  The path through the FSM on any
-"clock" is very short and should be over with in ~
-1us.  Because FIQ has guaranteed latencies of <1us,
-it means we can service the HDQ protocol without
-blocking interrupts or any other process other than
-the caller that is waiting for the result. It's pretty
-cool performance from 1 GPIO ;-)
-
-Due to it being hard to do locking from the FIQ ISR
-the code simply sleeps 10ms or whatever the scheduler
-gives it and checks if the transfer took place yet.
-
-This platform driver doesn't have any knowledge about
-the device it is talking to, it just knows it is a
-HDQ device.  It exports three functions for read, write
-and confirming HDQ is initialized.  It also exports two
-/sys nodes that are usable by humans, one dumps the whole
-127 register HDQ register space
-
-# cat /sys/devices/platform/gta02-hdq.0/hdq/dump
-00 44 55 00 00 00 ba 04 a2 0d 50 00 00 00 00 00
-00 00 9a 1a 00 00 ff ff ff ff 29 00 00 00 80 2b
-00 00 00 00 00 00 ff ff 00 00 00 00 00 32 af 06
-a0 d8 37 4e 00 00 00 00 00 00 00 34 2e 03 b4 e7
-00 00 06 00 41 00 4c 02 00 00 00 00 00 00 00 00
-83 02 00 00 94 09 59 b9 a5 0d 7f 21 00 00 7a ff
-df ff 62 ff a7 04 2e 05 00 00 00 01 00 07 00 00
-2a 78 36 67 7b b5 1b a9 af 19 38 89 63 57 42 7c
-#
-
-and the other allows to set one register
-
-# echo 2 170 > /sys/devices/platform/gta02-hdq.0/hdq/write
-
-writes 0xAA into register 2.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- defconfig-2.6.24      |    1 +
- drivers/power/Kconfig |    8 ++++++++
- 2 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index 833e15e..6d750a5 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -1825,3 +1825,4 @@ CONFIG_TEXTSEARCH_FSM=m
- CONFIG_PLIST=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_DMA=y
-+CONFIG_GTA02_HDQ=y
-diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
-index feb8b0a..5ace872 100644
---- a/drivers/power/Kconfig
-+++ b/drivers/power/Kconfig
-@@ -63,3 +63,11 @@ config GTA02_HDQ
-         at least BATTERY_BQ27000_HDQ as well
- endif # POWER_SUPPLY
-+
-+config GTA02_HDQ
-+      tristate "Neo Freerunner HDQ"
-+      depends on MACH_NEO1973_GTA02 && FIQ && S3C2440_C_FIQ
-+      help
-+        Say Y to enable support for communicating with an HDQ battery
-+        on the Neo Freerunner.  You probably want to select
-+        at least BATTERY_BQ27000_HDQ as well
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1078-introduce-bq27000-battery-driver.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1078-introduce-bq27000-battery-driver.patch.patch
deleted file mode 100755 (executable)
index b258bee..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-From ee70eb69aca0855f8deea2d6792bca29f5f64c8d Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:00 +0100
-Subject: [PATCH] introduce-bq27000-battery-driver.patch
-
-This is a driver for the bq27000 found in the Highcell A5
-battery, and the platform device stuff for it for GTA02.  It
-is a Power Supply Class battery device.
-
-The driver doesn't contain an HDQ engine but accepts pointers
-from the platform data to the HDQ action routines; our
-platform data plugs it into the FIQ HDQ engine stuff.
-
-The Power Supply class exposes the battery down /sys so you
-can find out battery status by doing the equivalent of this
-bash command
-
-for i in capacity charge_full current_now present status technology temp time_to_empty_now time_to_full_now type voltage_now ; do echo -n "$i    " ; cat /sys/devices/platform/bq27000-battery.0/power_supply/bat/$i ; done
-
-Here is the kind of result you get from a battery discharging
-
-capacity    0
-charge_full    1215585
-current_now    183375
-present    1
-status    Discharging
-technology    Li-ion
-temp    276
-time_to_empty_now    0
-time_to_full_now    3932100
-type    Battery
-voltage_now    2761000
-
-Note that temp is in 1/10 degrees C, other values are in uV,
-uA, uW.  The time_to_* reported are bogus, but that is what
-the battery actually reports.
-
-We can make more mappings to entries in power_supply class
-but this is enough to get started with.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- defconfig-2.6.24      |    1 +
- drivers/power/Kconfig |    7 -------
- 2 files changed, 1 insertions(+), 7 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index 6d750a5..9467f4b 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -1826,3 +1826,4 @@ CONFIG_PLIST=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_DMA=y
- CONFIG_GTA02_HDQ=y
-+CONFIG_BATTERY_BQ27000_HDQ=y
-diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
-index 5ace872..8c50ecb 100644
---- a/drivers/power/Kconfig
-+++ b/drivers/power/Kconfig
-@@ -64,10 +64,3 @@ config GTA02_HDQ
- endif # POWER_SUPPLY
--config GTA02_HDQ
--      tristate "Neo Freerunner HDQ"
--      depends on MACH_NEO1973_GTA02 && FIQ && S3C2440_C_FIQ
--      help
--        Say Y to enable support for communicating with an HDQ battery
--        on the Neo Freerunner.  You probably want to select
--        at least BATTERY_BQ27000_HDQ as well
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1079-debug-suspend-dump-gpio-states-add-GPA.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1079-debug-suspend-dump-gpio-states-add-GPA.patch.patch
deleted file mode 100755 (executable)
index 07ed46b..0000000
+++ /dev/null
@@ -1,452 +0,0 @@
-From c6eeaaf1c19526e7ceb535663c3b8143c19b8cc7 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:00 +0100
-Subject: [PATCH] debug-suspend-dump-gpio-states-add-GPA.patch
-
-Add support for GPA[] GPIO bus since we have some NCs
-but they seem to output-only IO cells so no matter
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/plat-s3c24xx/gpio.c |  421 ++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 421 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/gpio.c b/arch/arm/plat-s3c24xx/gpio.c
-index ee99dcc..4e94801 100644
---- a/arch/arm/plat-s3c24xx/gpio.c
-+++ b/arch/arm/plat-s3c24xx/gpio.c
-@@ -32,6 +32,7 @@
- #include <asm/io.h>
- #include <asm/arch/regs-gpio.h>
-+#include <asm/arch/regs-gpioj.h>
- void s3c2410_gpio_cfgpin(unsigned int pin, unsigned int function)
- {
-@@ -215,3 +216,423 @@ int s3c2410_gpio_irq2pin(unsigned int irq)
- }
- EXPORT_SYMBOL(s3c2410_gpio_irq2pin);
-+
-+static void pretty_dump(u32 cfg, u32 state, u32 pull,
-+                      const char ** function_names_2,
-+                      const char ** function_names_3,
-+                      const char * prefix,
-+                      int count)
-+{
-+      int n;
-+      const char *tag_type = NULL,
-+                 *tag_state = NULL,
-+                 *tag_pulldown = NULL,
-+                 * level0 = "0",
-+                 * level1 = "1";
-+
-+      for (n = 0; n < count; n++) {
-+              switch ((cfg >> (2 * n)) & 3) {
-+              case 0:
-+                      tag_type = "input      ";
-+                      break;
-+              case 1:
-+                      tag_type = "OUTPUT     ";
-+                      break;
-+              case 2:
-+                      if (function_names_2) {
-+                              if (function_names_2[n])
-+                                      tag_type = function_names_2[n];
-+                              else
-+                                      tag_type = "*** ILLEGAL CFG (2) *** ";
-+                      } else
-+                              tag_type = "(function) ";
-+                      break;
-+              default:
-+                      if (function_names_3) {
-+                              if (function_names_3[n])
-+                                      tag_type = function_names_3[n];
-+                              else
-+                                      tag_type = "*** ILLEGAL CFG (3) *** ";
-+                      } else
-+                              tag_type = "(function) ";
-+                      break;
-+              }
-+              if ((state >> n) & 1)
-+                      tag_state = level1;
-+              else
-+                      tag_state = level0;
-+
-+              if (((pull >> n) & 1))
-+                      tag_pulldown = "";
-+              else
-+                      tag_pulldown = "(pulldown)";
-+
-+              printk(KERN_INFO"%s%02d: %s %s %s\n", prefix, n, tag_type,
-+                                                    tag_state, tag_pulldown);
-+      }
-+      printk(KERN_INFO"\n");
-+}
-+
-+static void pretty_dump_a(u32 cfg, u32 state,
-+                        const char ** function_names,
-+                        const char * prefix,
-+                        int count)
-+{
-+      int n;
-+      const char *tag_type = NULL,
-+                 *tag_state = NULL,
-+                 * level0 = "0",
-+                 * level1 = "1";
-+
-+      for (n = 0; n < count; n++) {
-+              switch ((cfg >> n) & 1) {
-+              case 0:
-+                      tag_type = "OUTPUT     ";
-+                      break;
-+              default:
-+                      if (function_names) {
-+                              if (function_names[n])
-+                                      tag_type = function_names[n];
-+                              else
-+                                      tag_type = "*** ILLEGAL CFG *** ";
-+                      } else
-+                              tag_type = "(function) ";
-+                      break;
-+              }
-+              if ((state >> n) & 1)
-+                      tag_state = level1;
-+              else
-+                      tag_state = level0;
-+
-+              printk(KERN_INFO"%s%02d: %s %s\n", prefix, n, tag_type,
-+                                                 tag_state);
-+      }
-+      printk(KERN_INFO"\n");
-+}
-+
-+static const char * funcs_a[] = {
-+      "ADDR0      ",
-+      "ADDR16     ",
-+      "ADDR17     ",
-+      "ADDR18     ",
-+      "ADDR19     ",
-+      "ADDR20     ",
-+      "ADDR21     ",
-+      "ADDR22     ",
-+      "ADDR23     ",
-+      "ADDR24     ",
-+      "ADDR25     ",
-+      "ADDR26     ",
-+      "nGCS[1]    ",
-+      "nGCS[2]    ",
-+      "nGCS[3]    ",
-+      "nGCS[4]    ",
-+      "nGCS[5]    ",
-+      "CLE        ",
-+      "ALE        ",
-+      "nFWE       ",
-+      "nFRE       ",
-+      "nRSTOUT    ",
-+      "nFCE       ",
-+      NULL,
-+      NULL
-+};
-+
-+
-+static const char * funcs_b2[] = {
-+      "TOUT0      ",
-+      "TOUT1      ",
-+      "TOUT2      ",
-+      "TOUT3      ",
-+      "TCLK[0]    ",
-+      "nXBACK     ",
-+      "nXBREQ     ",
-+      "nXDACK1    ",
-+      "nXDREQ1    ",
-+      "nXDACK0    ",
-+      "nXDREQ0    ",
-+};
-+static const char * funcs_b3[] = {
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+};
-+
-+static const char * funcs_c2[] = {
-+      "LEND       ",
-+      "VCLK       ",
-+      "VLINE      ",
-+      "VFRAME     ",
-+      "VM         ",
-+      "LCD_LPCOE  ",
-+      "LCD_LPCREV ",
-+      "LCD_LPCREVB",
-+      "VD[0]      ",
-+      "VD[1]      ",
-+      "VD[2]      ",
-+      "VD[3]      ",
-+      "VD[4]      ",
-+      "VD[5]      ",
-+      "VD[6]      ",
-+      "VD[7]      ",
-+};
-+static const char * funcs_c3[] = {
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      "I2SSDI     ",
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+};
-+
-+static const char * funcs_d2[] = {
-+      "VD[8]      ",
-+      "VD[9]      ",
-+      "VD[10]     ",
-+      "VD[11]     ",
-+      "VD[12]     ",
-+      "VD[13]     ",
-+      "VD[14]     ",
-+      "VD[15]     ",
-+      "VD[16]     ",
-+      "VD[17]     ",
-+      "VD[18]     ",
-+      "VD[19]     ",
-+      "VD[20]     ",
-+      "VD[21]     ",
-+      "VD[22]     ",
-+      "VD[23]     ",
-+};
-+static const char * funcs_d3[] = {
-+      "nSPICS1    ",
-+      "SPICLK1    ",
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      "SPIMISO1   ",
-+      "SPIMOSI1   ",
-+      "SPICLK1    ",
-+      NULL,
-+      NULL,
-+      NULL,
-+      "nSS1       ",
-+      "nSS0       ",
-+};
-+
-+static const char * funcs_e2[] = {
-+      "I2SLRCK    ",
-+      "I2SSCLK    ",
-+      "CDCLK      ",
-+      "I2SDI      ",
-+      "I2SDO      ",
-+      "SDCLK      ",
-+      "SDCMD      ",
-+      "SDDAT0     ",
-+      "SDDAT1     ",
-+      "SDDAT2     ",
-+      "SDDAT3     ",
-+      "SPIMISO0   ",
-+      "SPIMOSI0   ",
-+      "SPICLK0    ",
-+      "IICSCL     ",
-+      "IICSDA     ",
-+};
-+static const char * funcs_e3[] = {
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+};
-+
-+static const char * funcs_f2[] = {
-+      "EINT[0]    ",
-+      "EINT[1]    ",
-+      "EINT[2]    ",
-+      "EINT[3]    ",
-+      "EINT[4]    ",
-+      "EINT[5]    ",
-+      "EINT[6]    ",
-+      "EINT[7]    ",
-+};
-+static const char * funcs_f3[] = {
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+};
-+
-+
-+static const char * funcs_g2[] = {
-+      "EINT[8]    ",
-+      "EINT[9]    ",
-+      "EINT[10]   ",
-+      "EINT[11]   ",
-+      "EINT[12]   ",
-+      "EINT[13]   ",
-+      "EINT[14]   ",
-+      "EINT[15]   ",
-+      "EINT[16]   ",
-+      "EINT[17]   ",
-+      "EINT[18]   ",
-+      "EINT[19]   ",
-+      "EINT[20]   ",
-+      "EINT[21]   ",
-+      "EINT[22]   ",
-+      "EINT[23]   ",
-+};
-+static const char * funcs_g3[] = {
-+      NULL,
-+      NULL,
-+      "nSS0       ",
-+      "nSS1       ",
-+      "LCD_PWRDN  ",
-+      "SPIMISO1   ",
-+      "SPIMOSI1   ",
-+      "SPICLK1    ",
-+      NULL,
-+      "nRTS1      ",
-+      "nCTS1      ",
-+      "TCLK[1]    ",
-+      "nSPICS0    ",
-+      NULL,
-+      NULL,
-+      NULL,
-+};
-+
-+static const char * funcs_h2[] = {
-+      "nCTS0      ",
-+      "nRTS0      ",
-+      "TXD[0]     ",
-+      "RXD[0]     ",
-+      "TXD[1]     ",
-+      "RXD[1]     ",
-+      "TXD[2]     ",
-+      "RXD[2]     ",
-+      "UEXTCLK    ",
-+      "CLKOUT0    ",
-+      "CLKOUT1    ",
-+};
-+static const char * funcs_h3[] = {
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      "nRTS1      ",
-+      "nCTS1      ",
-+      NULL,
-+      "nSPICS0    ",
-+      NULL,
-+};
-+
-+static const char * funcs_j2[] = {
-+      "CAMDATA[0] ",
-+      "CAMDATA[1] ",
-+      "CAMDATA[2] ",
-+      "CAMDATA[3] ",
-+      "CAMDATA[4] ",
-+      "CAMDATA[5] ",
-+      "CAMDATA[6] ",
-+      "CAMDATA[7] ",
-+      "CAMPCLK    ",
-+      "CAMVSYNC   ",
-+      "CAMHREF    ",
-+      "CAMCLKOUT  ",
-+      "CAMRESET   ",
-+};
-+static const char * funcs_j3[] = {
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+      NULL,
-+};
-+
-+/* used to dump GPIO states at suspend */
-+void s3c24xx_dump_gpio_states(void)
-+{
-+      pretty_dump_a(__raw_readl(S3C2410_GPACON),
-+                    __raw_readl(S3C2410_GPADAT),
-+                    funcs_a, "GPA", 25);
-+      pretty_dump(__raw_readl(S3C2410_GPBCON),
-+                  __raw_readl(S3C2410_GPBDAT),
-+                  __raw_readl(S3C2410_GPBUP),
-+                  funcs_b2, funcs_b3, "GPB", 11);
-+      pretty_dump(__raw_readl(S3C2410_GPCCON),
-+                  __raw_readl(S3C2410_GPCDAT),
-+                  __raw_readl(S3C2410_GPCUP),
-+                  funcs_c2, funcs_c3, "GPC", 16);
-+      pretty_dump(__raw_readl(S3C2410_GPDCON),
-+                  __raw_readl(S3C2410_GPDDAT),
-+                  __raw_readl(S3C2410_GPDUP),
-+                  funcs_d2, funcs_d3, "GPD", 16);
-+      pretty_dump(__raw_readl(S3C2410_GPECON),
-+                  __raw_readl(S3C2410_GPEDAT),
-+                  __raw_readl(S3C2410_GPEUP),
-+                  funcs_e2, funcs_e3, "GPE", 16);
-+      pretty_dump(__raw_readl(S3C2410_GPFCON),
-+                  __raw_readl(S3C2410_GPFDAT),
-+                  __raw_readl(S3C2410_GPFUP),
-+                  funcs_f2, funcs_f3, "GPF", 8);
-+      pretty_dump(__raw_readl(S3C2410_GPGCON),
-+                  __raw_readl(S3C2410_GPGDAT),
-+                  __raw_readl(S3C2410_GPGUP),
-+                  funcs_g2, funcs_g3, "GPG", 16);
-+      pretty_dump(__raw_readl(S3C2410_GPHCON),
-+                  __raw_readl(S3C2410_GPHDAT),
-+                  __raw_readl(S3C2410_GPHUP),
-+                  funcs_h2, funcs_h3, "GPH", 11);
-+      pretty_dump(__raw_readl(S3C2440_GPJCON),
-+                  __raw_readl(S3C2440_GPJDAT),
-+                  __raw_readl(S3C2440_GPJUP),
-+                  funcs_j2, funcs_j3, "GPJ", 13);
-+
-+}
-+EXPORT_SYMBOL(s3c24xx_dump_gpio_states);
-+
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1080-fix-s3c2410_timer_setup-resume-BUG.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1080-fix-s3c2410_timer_setup-resume-BUG.patch.patch
deleted file mode 100755 (executable)
index f3e3532..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-From 1da7d81ddc35e3527d10abbc411bc09c81340d70 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Fri, 25 Jul 2008 23:06:00 +0100
-Subject: [PATCH] fix-s3c2410_timer_setup-resume-BUG.patch
-
----
- arch/arm/plat-s3c24xx/time.c |   33 +++++++++++++++++++++++++++++++++
- drivers/i2c/chips/pcf50633.c |    9 +++++++--
- 2 files changed, 40 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/time.c b/arch/arm/plat-s3c24xx/time.c
-index f8d307b..59e5382 100644
---- a/arch/arm/plat-s3c24xx/time.c
-+++ b/arch/arm/plat-s3c24xx/time.c
-@@ -42,6 +42,7 @@
- static unsigned long timer_startval;
- static unsigned long timer_usec_ticks;
-+static struct work_struct resume_work;
- #define TIMER_USEC_SHIFT 16
-@@ -199,9 +200,12 @@ static void s3c2410_timer_setup (void)
-               pclk = clk_get_rate(clk);
-+              printk("pclk = %d\n", pclk);
-+
-               /* configure clock tick */
-               timer_usec_ticks = timer_mask_usec_ticks(6, pclk);
-+              printk("timer_usec_ticks = %d\n", timer_usec_ticks);
-               tcfg1 &= ~S3C2410_TCFG1_MUX4_MASK;
-               tcfg1 |= S3C2410_TCFG1_MUX4_DIV2;
-@@ -210,6 +214,11 @@ static void s3c2410_timer_setup (void)
-               tcfg0 |= ((6 - 1) / 2) << S3C2410_TCFG_PRESCALER1_SHIFT;
-               tcnt = (pclk / 6) / HZ;
-+
-+              /* start the timer running */
-+              tcon |= S3C2410_TCON_T4START | S3C2410_TCON_T4RELOAD;
-+              tcon &= ~S3C2410_TCON_T4MANUALUPD;
-+              __raw_writel(tcon, S3C2410_TCON);
-       }
-       /* timers reload after counting zero, so reduce the count by 1 */
-@@ -245,10 +254,34 @@ static void s3c2410_timer_setup (void)
-       tcon |= S3C2410_TCON_T4START;
-       tcon &= ~S3C2410_TCON_T4MANUALUPD;
-       __raw_writel(tcon, S3C2410_TCON);
-+
-+      __raw_writel(__raw_readl(S3C2410_INTMSK) & (~(1UL << 14)),
-+                   S3C2410_INTMSK);
-+
-+}
-+
-+static void timer_resume_work(struct work_struct *work)
-+{
-+      s3c2410_timer_setup();
-+}
-+
-+/* ooh a nasty situation arises if we try to call s3c2410_timer_setup() from
-+ * the resume handler.  It is called in atomic context but the clock APIs
-+ * try to lock a mutex which may sleep.  We are in a bit of an unusual
-+ * situation because we don't have a tick source right now, but it should be
-+ * okay to try to schedule a work item... hopefully
-+ */
-+
-+static void s3c2410_timer_resume_atomic(void)
-+{
-+      int ret = schedule_work(&resume_work);
-+      if (!ret)
-+              printk(KERN_INFO"Failed to schedule_work tick ctr (%d)\n", ret);
- }
- static void __init s3c2410_timer_init (void)
- {
-+      INIT_WORK(&resume_work, timer_resume_work);
-       s3c2410_timer_setup();
-       setup_irq(IRQ_TIMER4, &s3c2410_timer_irq);
- }
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index e23c540..91b9ac3 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1926,9 +1926,11 @@ static int pcf50633_resume(struct device *dev)
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-       int i;
--      mutex_lock(&pcf->lock);
-+      printk(KERN_INFO"a\n");
-+      /* mutex_lock(&pcf->lock); */  /* resume in atomic context */
-       __reg_write(pcf, PCF50633_REG_LEDENA, 0x01);
-+      printk(KERN_INFO"b\n");
-       /* Resume all saved registers that don't "survive" standby state */
-       __reg_write(pcf, PCF50633_REG_INT1M, pcf->standby_regs.int1m);
-@@ -1936,6 +1938,7 @@ static int pcf50633_resume(struct device *dev)
-       __reg_write(pcf, PCF50633_REG_INT3M, pcf->standby_regs.int3m);
-       __reg_write(pcf, PCF50633_REG_INT4M, pcf->standby_regs.int4m);
-       __reg_write(pcf, PCF50633_REG_INT5M, pcf->standby_regs.int5m);
-+      printk(KERN_INFO"c\n");
-       __reg_write(pcf, PCF50633_REG_OOCTIM2, pcf->standby_regs.ooctim2);
-       __reg_write(pcf, PCF50633_REG_AUTOOUT, pcf->standby_regs.autoout);
-@@ -1949,14 +1952,16 @@ static int pcf50633_resume(struct device *dev)
-       __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.ledout);
-       __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.ledena);
-       __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.leddim);
-+      printk(KERN_INFO"d\n");
-       /* FIXME: one big read? */
-       for (i = 0; i < 7; i++) {
-               u_int8_t reg_out = PCF50633_REG_LDO1OUT + 2*i;
-               __reg_write(pcf, reg_out, pcf->standby_regs.ldo[i].out);
-               __reg_write(pcf, reg_out+1, pcf->standby_regs.ldo[i].ena);
-       }
-+      printk(KERN_INFO"e\n");
--      mutex_unlock(&pcf->lock);
-+      /* mutex_unlock(&pcf->lock); */ /* resume in atomic context */
-       pcf50633_irq(pcf->irq, pcf);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1081-config-add-alsa.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1081-config-add-alsa.patch.patch
deleted file mode 100755 (executable)
index 1ba03d3..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-From eb890d62a201337536f18f8d2ea44df744155552 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Fri, 25 Jul 2008 23:06:01 +0100
-Subject: [PATCH] config-add-alsa.patch
-
----
- defconfig-2.6.24 |   34 +++++++++++++++++-----------------
- 1 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index 9467f4b..e57081a 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
--# Linux kernel version: 2.6.24-rc8
--# Wed Jan 23 10:00:57 2008
-+# Linux kernel version: 2.6.24
-+# Fri Feb 22 22:38:48 2008
- #
- CONFIG_ARM=y
- CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-@@ -22,6 +22,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
- CONFIG_GENERIC_HWEIGHT=y
- CONFIG_GENERIC_CALIBRATE_DELAY=y
- CONFIG_ZONE_DMA=y
-+CONFIG_FIQ=y
- CONFIG_VECTORS_BASE=0xffff0000
- CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-@@ -44,7 +45,7 @@ CONFIG_SYSVIPC_SYSCTL=y
- # CONFIG_PID_NS is not set
- # CONFIG_AUDIT is not set
- # CONFIG_IKCONFIG is not set
--CONFIG_LOG_BUF_SHIFT=14
-+CONFIG_LOG_BUF_SHIFT=16
- # CONFIG_CGROUPS is not set
- CONFIG_FAIR_GROUP_SCHED=y
- CONFIG_FAIR_USER_SCHED=y
-@@ -195,6 +196,7 @@ CONFIG_MACH_NEO1973_GTA01=y
- # CONFIG_MACH_VSTMS is not set
- CONFIG_CPU_S3C2440=y
- CONFIG_S3C2440_DMA=y
-+CONFIG_S3C2440_C_FIQ=y
- #
- # S3C2440 Machines
-@@ -1221,15 +1223,15 @@ CONFIG_SOUND=y
- #
- # 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=y
-+CONFIG_SND_TIMER=y
-+CONFIG_SND_PCM=y
-+CONFIG_SND_HWDEP=y
-+CONFIG_SND_RAWMIDI=y
- # CONFIG_SND_SEQUENCER is not set
- CONFIG_SND_OSSEMUL=y
--CONFIG_SND_MIXER_OSS=m
--CONFIG_SND_PCM_OSS=m
-+CONFIG_SND_MIXER_OSS=y
-+CONFIG_SND_PCM_OSS=y
- CONFIG_SND_PCM_OSS_PLUGINS=y
- # CONFIG_SND_DYNAMIC_MINORS is not set
- CONFIG_SND_SUPPORT_OLD_API=y
-@@ -1262,11 +1264,11 @@ CONFIG_SND_USB_AUDIO=m
- #
- # System on Chip audio support
- #
--CONFIG_SND_SOC=m
--CONFIG_SND_S3C24XX_SOC=m
--CONFIG_SND_S3C24XX_SOC_I2S=m
--CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
--CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m
-+CONFIG_SND_SOC=y
-+CONFIG_SND_S3C24XX_SOC=y
-+CONFIG_SND_S3C24XX_SOC_I2S=y
-+CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=y
-+CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=y
- #
- # SoC Audio support for SuperH
-@@ -1825,5 +1827,3 @@ CONFIG_TEXTSEARCH_FSM=m
- CONFIG_PLIST=y
- CONFIG_HAS_IOMEM=y
- CONFIG_HAS_DMA=y
--CONFIG_GTA02_HDQ=y
--CONFIG_BATTERY_BQ27000_HDQ=y
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1082-fix-glamo-mci-defeat-ops-during-suspend.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1082-fix-glamo-mci-defeat-ops-during-suspend.patch.patch
deleted file mode 100755 (executable)
index 938d89e..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-From adeb466de3bb306dc68468c64be3ebc61960d788 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:01 +0100
-Subject: [PATCH] fix-glamo-mci-defeat-ops-during-suspend.patch
-
-We need to be able to use the config option CONFIG_MMC_UNSAFE_RESUME that allows the rootfs
-to live on SD.  But when we use this, it tries to send a reset command to the SD card during
-suspend -- and unfortunately many things like Power have suspended by then.
-
-This patch again rejects IO on the MMC device during suspend of the MMC device, and it
-gives the result the rootfs on SD card works okay.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-mci.c |   14 ++++++++++++++
- drivers/mfd/glamo/glamo-mci.h |    2 ++
- 2 files changed, 16 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index f559e5e..bbbbe4d 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -406,6 +406,14 @@ static void glamo_mci_send_request(struct mmc_host *mmc)
-       u16 status;
-       int n;
-+      if (host->suspending) {
-+              cmd->error = -EIO;
-+              if (cmd->data)
-+                      cmd->data->error = -EIO;
-+              mmc_request_done(mmc, mrq);
-+              return;
-+      }
-+
-       host->ccnt++;
-       /*
-        * somehow 2.6.24 MCI manages to issue MMC_WRITE_BLOCK *without* the
-@@ -792,6 +800,9 @@ static int glamo_mci_remove(struct platform_device *pdev)
- static int glamo_mci_suspend(struct platform_device *dev, pm_message_t state)
- {
-       struct mmc_host *mmc = platform_get_drvdata(dev);
-+      struct glamo_mci_host   *host = mmc_priv(mmc);
-+
-+      host->suspending++;
-       return  mmc_suspend_host(mmc, state);
- }
-@@ -799,6 +810,9 @@ static int glamo_mci_suspend(struct platform_device *dev, pm_message_t state)
- static int glamo_mci_resume(struct platform_device *dev)
- {
-       struct mmc_host *mmc = platform_get_drvdata(dev);
-+      struct glamo_mci_host   *host = mmc_priv(mmc);
-+
-+      host->suspending--;
-       return mmc_resume_host(mmc);
- }
-diff --git a/drivers/mfd/glamo/glamo-mci.h b/drivers/mfd/glamo/glamo-mci.h
-index 40c3e24..55852e7 100644
---- a/drivers/mfd/glamo/glamo-mci.h
-+++ b/drivers/mfd/glamo/glamo-mci.h
-@@ -34,6 +34,8 @@ struct glamo_mci_host {
-       int                     dma;
-       int                     data_max_size;
-+      int                     suspending;
-+
-       int                     power_mode_current;
-       unsigned int            vdd_current;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1083-fix-lcm-reinit-post-resume.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1083-fix-lcm-reinit-post-resume.patch.patch
deleted file mode 100755 (executable)
index 31876a1..0000000
+++ /dev/null
@@ -1,286 +0,0 @@
-From 3d71204efba10914e339b411471877b81cf1e5d9 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Fri, 25 Jul 2008 23:06:01 +0100
-Subject: [PATCH] fix-lcm-reinit-post-resume.patch
-
----
- arch/arm/mach-s3c2440/mach-gta02.c |   12 +++++++++
- drivers/mfd/glamo/glamo-core.c     |   15 ++++++++++-
- drivers/mfd/glamo/glamo-spi-gpio.c |   38 ++++++++++++++++++++++++++--
- drivers/video/display/jbt6k74.c    |   47 ++++++++++++++++++++++++++++++++----
- include/linux/glamofb.h            |    1 +
- include/linux/jbt6k74.h            |    8 ++++++
- 6 files changed, 111 insertions(+), 10 deletions(-)
- create mode 100644 include/linux/jbt6k74.h
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index f2b1b66..750fd97 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -76,6 +76,7 @@
- #include <asm/plat-s3c24xx/cpu.h>
- #include <asm/plat-s3c24xx/pm.h>
- #include <asm/plat-s3c24xx/udc.h>
-+#include <linux/jbt6k74.h>
- #include <linux/glamofb.h>
-@@ -756,10 +757,21 @@ static struct s3c2410_ts_mach_info gta02_ts_cfg = {
- /* SPI: LCM control interface attached to Glamo3362 */
-+void gta02_jbt6k74_reset(int devidx, int level)
-+{
-+      glamo_lcm_reset(level);
-+}
-+
-+
-+const struct jbt6k74_platform_data jbt6k74_pdata = {
-+      .reset          = gta02_jbt6k74_reset,
-+};
-+
- static struct spi_board_info gta02_spi_board_info[] = {
-       {
-               .modalias       = "jbt6k74",
-               /* platform_data */
-+              .platform_data  = &jbt6k74_pdata,
-               /* controller_data */
-               /* irq */
-               .max_speed_hz   = 10 * 1000 * 1000,
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index ffa4945..2076e61 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -513,6 +513,17 @@ void glamo_engine_reset(struct glamo_core *glamo, enum glamo_engine engine)
- }
- EXPORT_SYMBOL_GPL(glamo_engine_reset);
-+void glamo_lcm_reset(int level)
-+{
-+      if (!glamo_handle)
-+              return;
-+
-+      glamo_gpio_setpin(glamo_handle, GLAMO_GPIO4, level);
-+      glamo_gpio_cfgpin(glamo_handle, GLAMO_GPIO4_OUTPUT);
-+
-+}
-+EXPORT_SYMBOL_GPL(glamo_lcm_reset);
-+
- enum glamo_pll {
-       GLAMO_PLL1,
-       GLAMO_PLL2,
-@@ -1142,8 +1153,8 @@ static int glamo_resume(struct platform_device *pdev)
- static struct platform_driver glamo_driver = {
-       .probe          = glamo_probe,
-       .remove         = glamo_remove,
--      .suspend        = glamo_suspend,
--      .resume         = glamo_resume,
-+      .suspend_late   = glamo_suspend,
-+      .resume_early   = glamo_resume,
-       .driver         = {
-               .name   = "glamo3362",
-               .owner  = THIS_MODULE,
-diff --git a/drivers/mfd/glamo/glamo-spi-gpio.c b/drivers/mfd/glamo/glamo-spi-gpio.c
-index 73926bd..eda7322 100644
---- a/drivers/mfd/glamo/glamo-spi-gpio.c
-+++ b/drivers/mfd/glamo/glamo-spi-gpio.c
-@@ -224,14 +224,46 @@ static int glamo_spigpio_remove(struct platform_device *pdev)
-       return 0;
- }
--#define glamo_spigpio_suspend NULL
-+/*#define glamo_spigpio_suspend NULL
- #define glamo_spigpio_resume NULL
-+*/
-+
-+
-+#ifdef CONFIG_PM
-+static int glamo_spigpio_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+      return 0;
-+}
-+
-+static int glamo_spigpio_resume(struct platform_device *pdev)
-+{
-+      struct glamo_spigpio *sp = platform_get_drvdata(pdev);
-+
-+      if (!sp)
-+              return 0;
-+
-+      /* set state of spi pins */
-+      glamo_gpio_setpin(sp->glamo, sp->info->pin_clk, 0);
-+      glamo_gpio_setpin(sp->glamo, sp->info->pin_mosi, 0);
-+      glamo_gpio_setpin(sp->glamo, sp->info->pin_cs, 1);
-+
-+      glamo_gpio_cfgpin(sp->glamo, sp->info->pin_clk);
-+      glamo_gpio_cfgpin(sp->glamo, sp->info->pin_mosi);
-+      glamo_gpio_cfgpin(sp->glamo, sp->info->pin_cs);
-+      if (sp->info->pin_miso)
-+              glamo_gpio_cfgpin(sp->glamo, sp->info->pin_miso);
-+
-+      return 0;
-+}
-+#endif
- static struct platform_driver glamo_spi_drv = {
-       .probe          = glamo_spigpio_probe,
-       .remove         = glamo_spigpio_remove,
--      .suspend        = glamo_spigpio_suspend,
--      .resume         = glamo_spigpio_resume,
-+#ifdef CONFIG_PM
-+      .suspend_late   = glamo_spigpio_suspend,
-+      .resume_early   = glamo_spigpio_resume,
-+#endif
-       .driver         = {
-               .name   = "glamo-spi-gpio",
-               .owner  = THIS_MODULE,
-diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c
-index d021d7e..d7e9442 100644
---- a/drivers/video/display/jbt6k74.c
-+++ b/drivers/video/display/jbt6k74.c
-@@ -27,6 +27,8 @@
- #include <linux/device.h>
- #include <linux/platform_device.h>
- #include <linux/delay.h>
-+#include <linux/workqueue.h>
-+#include <linux/jbt6k74.h>
- #include <linux/spi/spi.h>
-@@ -114,11 +116,15 @@ struct jbt_info {
-       struct mutex lock;              /* protects tx_buf and reg_cache */
-       u16 tx_buf[8];
-       u16 reg_cache[0xEE];
-+      struct work_struct work;
- };
- #define JBT_COMMAND   0x000
- #define JBT_DATA      0x100
-+static void jbt_resume_work(struct work_struct *work);
-+
-+
- static int jbt_reg_write_nodata(struct jbt_info *jbt, u8 reg)
- {
-       int rc;
-@@ -130,6 +136,9 @@ static int jbt_reg_write_nodata(struct jbt_info *jbt, u8 reg)
-                      1*sizeof(u16));
-       if (rc == 0)
-               jbt->reg_cache[reg] = 0;
-+      else
-+              printk(KERN_ERR"jbt_reg_write_nodata spi_write ret %d\n",
-+                     rc);
-       mutex_unlock(&jbt->lock);
-@@ -149,6 +158,8 @@ static int jbt_reg_write(struct jbt_info *jbt, u8 reg, u8 data)
-                      2*sizeof(u16));
-       if (rc == 0)
-               jbt->reg_cache[reg] = data;
-+      else
-+              printk(KERN_ERR"jbt_reg_write spi_write ret %d\n", rc);
-       mutex_unlock(&jbt->lock);
-@@ -169,6 +180,8 @@ static int jbt_reg_write16(struct jbt_info *jbt, u8 reg, u16 data)
-                      3*sizeof(u16));
-       if (rc == 0)
-               jbt->reg_cache[reg] = data;
-+      else
-+              printk(KERN_ERR"jbt_reg_write16 spi_write ret %d\n", rc);
-       mutex_unlock(&jbt->lock);
-@@ -563,6 +576,8 @@ static int __devinit jbt_probe(struct spi_device *spi)
-       if (!jbt)
-               return -ENOMEM;
-+      INIT_WORK(&jbt->work, jbt_resume_work);
-+
-       jbt->spi_dev = spi;
-       jbt->state = JBT_STATE_DEEP_STANDBY;
-       mutex_init(&jbt->lock);
-@@ -618,28 +633,50 @@ static int __devexit jbt_remove(struct spi_device *spi)
- static int jbt_suspend(struct spi_device *spi, pm_message_t state)
- {
-       struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-+      struct jbt6k74_platform_data *jbt6k74_pdata = spi->dev.platform_data;
-       /* Save mode for resume */
-       jbt->last_state = jbt->state;
-       jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);
-+      (jbt6k74_pdata->reset)(0, 0);
-+
-       return 0;
- }
--static int jbt_resume(struct spi_device *spi)
-+static void jbt_resume_work(struct work_struct *work)
- {
--      struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-+      struct jbt_info *jbt = container_of(work, struct jbt_info, work);
-+
-+      printk(KERN_INFO"jbt_resume_work waiting...\n");
-+      msleep(2000);
-+      printk(KERN_INFO"jbt_resume_work GO...\n");
--      jbt6k74_enter_state(jbt, jbt->last_state);
-+      jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);
-+      msleep(100);
-       switch (jbt->last_state) {
--      case JBT_STATE_NORMAL:
-       case JBT_STATE_QVGA_NORMAL:
--              jbt6k74_display_onoff(jbt, 1);
-+              jbt6k74_enter_state(jbt, JBT_STATE_QVGA_NORMAL);
-               break;
-       default:
-+              jbt6k74_enter_state(jbt, JBT_STATE_NORMAL);
-               break;
-       }
-+      jbt6k74_display_onoff(jbt, 1);
-+
-+      printk(KERN_INFO"jbt_resume_work done...\n");
-+}
-+
-+static int jbt_resume(struct spi_device *spi)
-+{
-+      struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-+      struct jbt6k74_platform_data *jbt6k74_pdata = spi->dev.platform_data;
-+
-+      (jbt6k74_pdata->reset)(0, 1);
-+
-+      if (!schedule_work(&jbt->work))
-+              dev_err(&spi->dev, "Unable to schedule LCM wakeup work\n");
-       return 0;
- }
-diff --git a/include/linux/glamofb.h b/include/linux/glamofb.h
-index 24742a2..75eefef 100644
---- a/include/linux/glamofb.h
-+++ b/include/linux/glamofb.h
-@@ -35,5 +35,6 @@ struct glamofb_platform_data {
- void glamofb_cmd_mode(struct glamofb_handle *gfb, int on);
- int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val);
-+void glamo_lcm_reset(int level);
- #endif
-diff --git a/include/linux/jbt6k74.h b/include/linux/jbt6k74.h
-new file mode 100644
-index 0000000..3fbe178
---- /dev/null
-+++ b/include/linux/jbt6k74.h
-@@ -0,0 +1,8 @@
-+#ifndef __JBT6K74_H__
-+#define __JBT6K74_H__
-+
-+struct jbt6k74_platform_data {
-+      void (* reset)(int devindex, int level);
-+};
-+
-+#endif
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1084-fix-glamo-mci-fake-reset-opcode-in-suspend.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1084-fix-glamo-mci-fake-reset-opcode-in-suspend.patch.patch
deleted file mode 100755 (executable)
index f1ac5a4..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-From f26eee35ae154c2be8a6e23f3e6a45f01f50f7a7 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Fri, 25 Jul 2008 23:06:01 +0100
-Subject: [PATCH] fix-glamo-mci-fake-reset-opcode-in-suspend.patch
-
----
- arch/arm/mach-s3c2440/mach-gta02.c |    4 ++--
- drivers/mfd/glamo/glamo-core.c     |   16 +++++++++-------
- drivers/mfd/glamo/glamo-mci.c      |   29 +++++++++++++++++++++--------
- 3 files changed, 32 insertions(+), 17 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 750fd97..f18c8fd 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1281,6 +1281,8 @@ static void __init gta02_machine_init(void)
-               s3c2410_gpio_setpin(GTA02_GPIO_nWLAN_RESET, 1);
-               break;
-       }
-+      mangle_glamo_res_by_system_rev();
-+      platform_device_register(&gta02_glamo_dev);
-       platform_device_register(&s3c_device_spi_acc);
-       platform_device_register(&gta01_button_dev);
-@@ -1291,8 +1293,6 @@ static void __init gta02_machine_init(void)
-       platform_device_register(&gta01_led_dev);
-       platform_device_register(&gta02_led_dev);
--      mangle_glamo_res_by_system_rev();
--      platform_device_register(&gta02_glamo_dev);
-       platform_device_register(&gta02_sdio_dev);
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index 2076e61..4d8e47f 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -822,6 +822,8 @@ static void glamo_power(struct glamo_core *glamo,
- {
-       spin_lock(&glamo->lock);
-+      dev_dbg(&glamo->pdev->dev, "***** glamo_power -> %d\n", new_state);
-+
-       switch (new_state) {
-       case GLAMO_POWER_ON:
-               /* power up PLL1 and PLL2 */
-@@ -1026,13 +1028,6 @@ static int __init glamo_probe(struct platform_device *pdev)
-       glamo_mci_def_pdata.glamo_irq_is_wired =
-                                       glamo->pdata->glamo_irq_is_wired;
--      glamo_mmc_dev.dev.parent = &pdev->dev;
--      /* we need it later to give to the engine enable and disable */
--      glamo_mci_def_pdata.pglamo = glamo;
--      mangle_mem_resources(glamo_mmc_dev.resource,
--                           glamo_mmc_dev.num_resources, glamo->mem);
--      platform_device_register(&glamo_mmc_dev);
--
-       glamo_2d_dev.dev.parent = &pdev->dev;
-       mangle_mem_resources(glamo_2d_dev.resource,
-                            glamo_2d_dev.num_resources, glamo->mem);
-@@ -1065,6 +1060,13 @@ static int __init glamo_probe(struct platform_device *pdev)
-       glamo_spigpio_dev.dev.platform_data = glamo->pdata->spigpio_info;
-       platform_device_register(&glamo_spigpio_dev);
-+      glamo_mmc_dev.dev.parent = &pdev->dev;
-+      /* we need it later to give to the engine enable and disable */
-+      glamo_mci_def_pdata.pglamo = glamo;
-+      mangle_mem_resources(glamo_mmc_dev.resource,
-+                           glamo_mmc_dev.num_resources, glamo->mem);
-+      platform_device_register(&glamo_mmc_dev);
-+
-       /* only request the generic, hostbus and memory controller MMIO */
-       glamo->mem = request_mem_region(glamo->mem->start,
-                                       GLAMO_REGOFS_VIDCAP, "glamo-core");
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index bbbbe4d..d8847c5 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -405,11 +405,11 @@ static void glamo_mci_send_request(struct mmc_host *mmc)
-       u16 * reg_resp = (u16 *)(host->base + GLAMO_REG_MMC_CMD_RSP1);
-       u16 status;
-       int n;
-+      int timeout = 100000000;
-       if (host->suspending) {
--              cmd->error = -EIO;
--              if (cmd->data)
--                      cmd->data->error = -EIO;
-+              dev_err(&host->pdev->dev, "faking cmd %d "
-+                      "during suspend\n", cmd->opcode);
-               mmc_request_done(mmc, mrq);
-               return;
-       }
-@@ -502,10 +502,23 @@ static void glamo_mci_send_request(struct mmc_host *mmc)
-        * our own INT# line"
-        */
-       if (!glamo_mci_def_pdata.pglamo->irq_works) {
--              /* we have faith we will get an "interrupt"... */
--              while (!(readw_dly(glamo_mci_def_pdata.pglamo->base +
--                       GLAMO_REG_IRQ_STATUS) & GLAMO_IRQ_MMC))
-+              /*
-+               * we have faith we will get an "interrupt"...
-+               * but something insane like suspend problems can mean
-+               * we spin here forever, so we timeout after a LONG time
-+               */
-+              while ((!(readw_dly(glamo_mci_def_pdata.pglamo->base +
-+                       GLAMO_REG_IRQ_STATUS) & GLAMO_IRQ_MMC)) &&
-+                     (timeout--))
-                       ;
-+
-+              if (timeout < 0) {
-+                      if (cmd->data->error)
-+                              cmd->data->error = -ETIMEDOUT;
-+                      dev_err(&host->pdev->dev, "Payload timeout\n");
-+                      return;
-+              }
-+
-               /* yay we are an interrupt controller! -- call the ISR */
-               glamo_mci_irq(IRQ_GLAMO(GLAMO_IRQIDX_MMC),
-                             irq_desc + IRQ_GLAMO(GLAMO_IRQIDX_MMC));
-@@ -529,6 +542,7 @@ static void glamo_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)
- static void glamo_mci_reset(struct glamo_mci_host *host)
- {
-+      dev_dbg(&host->pdev->dev, "******* glamo_mci_reset\n");
-       /* reset MMC controller */
-       writew_dly(GLAMO_CLOCK_MMC_RESET | GLAMO_CLOCK_MMC_DG_TCLK |
-                  GLAMO_CLOCK_MMC_EN_TCLK | GLAMO_CLOCK_MMC_DG_M9CLK |
-@@ -803,8 +817,7 @@ static int glamo_mci_suspend(struct platform_device *dev, pm_message_t state)
-       struct glamo_mci_host   *host = mmc_priv(mmc);
-       host->suspending++;
--
--      return  mmc_suspend_host(mmc, state);
-+      return mmc_suspend_host(mmc, state);
- }
- static int glamo_mci_resume(struct platform_device *dev)
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1085-use-gpio-control-leds.patch b/target/linux/s3c24xx/patches-2.6.26/1085-use-gpio-control-leds.patch
deleted file mode 100755 (executable)
index 3e1e212..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-From 39f011b7788caa6800c5779eeb51f1877de9cfc4 Mon Sep 17 00:00:00 2001
-From: Willie <willie_chen@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:01 +0100
-Subject: [PATCH] use gpio control leds
-
----
- drivers/leds/leds-neo1973-gta02.c |    9 ++++-----
- 1 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/leds/leds-neo1973-gta02.c b/drivers/leds/leds-neo1973-gta02.c
-index bf1d540..e442e48 100644
---- a/drivers/leds/leds-neo1973-gta02.c
-+++ b/drivers/leds/leds-neo1973-gta02.c
-@@ -127,22 +127,22 @@ static int __init gta02led_probe(struct platform_device *pdev)
-               switch (lp->gpio) {
-               case S3C2410_GPB0:
--                      lp->has_pwm = 1;
-+                      lp->has_pwm = 0;
-                       lp->pwm.timerid = PWM0;
-                       s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB0_TOUT0);
-                       break;
-               case S3C2410_GPB1:
--                      lp->has_pwm = 1;
-+                      lp->has_pwm = 0;
-                       lp->pwm.timerid = PWM1;
-                       s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB1_TOUT1);
-                       break;
-               case S3C2410_GPB2:
--                      lp->has_pwm = 1;
-+                      lp->has_pwm = 0;
-                       lp->pwm.timerid = PWM2;
-                       s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB2_TOUT2);
-                       break;
-               case S3C2410_GPB3:
--                      lp->has_pwm = 1;
-+                      lp->has_pwm = 0;
-                       lp->pwm.timerid = PWM3;
-                       s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB3_TOUT3);
-                       break;
-@@ -167,7 +167,6 @@ static int __init gta02led_probe(struct platform_device *pdev)
-                       break;
-               default:
-                       break;
--              }
-               mutex_init(&lp->mutex);
-               rc = led_classdev_register(&pdev->dev, &lp->cdev);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1086-fix-gpio-led-patch-still-pwm-t3.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1086-fix-gpio-led-patch-still-pwm-t3.patch.patch
deleted file mode 100755 (executable)
index a49a9f8..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-From 3488a253e7a20d491d180313340f39cf6fd043a9 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Fri, 25 Jul 2008 23:06:01 +0100
-Subject: [PATCH] fix-gpio-led-patch-still-pwm-t3.patch
-
-Starting up all the PWMs seems to be needed for PWM3 operation
-and FIQ / HDQ / VIB operation.  But after starting, turn the
-LEDs to GPIO-only.
-
-Applies on top of Willie's patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/leds/leds-neo1973-gta02.c |    9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/leds/leds-neo1973-gta02.c b/drivers/leds/leds-neo1973-gta02.c
-index e442e48..bf1d540 100644
---- a/drivers/leds/leds-neo1973-gta02.c
-+++ b/drivers/leds/leds-neo1973-gta02.c
-@@ -127,22 +127,22 @@ static int __init gta02led_probe(struct platform_device *pdev)
-               switch (lp->gpio) {
-               case S3C2410_GPB0:
--                      lp->has_pwm = 0;
-+                      lp->has_pwm = 1;
-                       lp->pwm.timerid = PWM0;
-                       s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB0_TOUT0);
-                       break;
-               case S3C2410_GPB1:
--                      lp->has_pwm = 0;
-+                      lp->has_pwm = 1;
-                       lp->pwm.timerid = PWM1;
-                       s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB1_TOUT1);
-                       break;
-               case S3C2410_GPB2:
--                      lp->has_pwm = 0;
-+                      lp->has_pwm = 1;
-                       lp->pwm.timerid = PWM2;
-                       s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB2_TOUT2);
-                       break;
-               case S3C2410_GPB3:
--                      lp->has_pwm = 0;
-+                      lp->has_pwm = 1;
-                       lp->pwm.timerid = PWM3;
-                       s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPB3_TOUT3);
-                       break;
-@@ -167,6 +167,7 @@ static int __init gta02led_probe(struct platform_device *pdev)
-                       break;
-               default:
-                       break;
-+              }
-               mutex_init(&lp->mutex);
-               rc = led_classdev_register(&pdev->dev, &lp->cdev);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1087-introduce-usb-host-power-control.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1087-introduce-usb-host-power-control.patch.patch
deleted file mode 100755 (executable)
index 0d9253c..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-From a2f39c5197fbea18417722e5c7d362eaa3bc6210 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:01 +0100
-Subject: [PATCH] introduce-usb-host-power-control.patch
-
-Unless I really really missed the point, there is no support for enabling
-USB Host power for USB host mode.  This patch adds a /sys node for GTA02
-that allows control of the charge pump for 5V out on the USB mini connector
-It doesn't change any logical mode in the CPU, just enables (1) and disables
-(0) USB host power.
-
-# cat /sys/devices/platform/neo1973-pm-host.0/hostmode
-0
-# echo 1 > /sys/devices/platform/neo1973-pm-host.0/hostmode
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c      |    6 ++
- arch/arm/plat-s3c24xx/Makefile          |    2 +-
- arch/arm/plat-s3c24xx/neo1973_pm_host.c |  101 +++++++++++++++++++++++++++++++
- 3 files changed, 108 insertions(+), 1 deletions(-)
- create mode 100644 arch/arm/plat-s3c24xx/neo1973_pm_host.c
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index f18c8fd..5bd68a6 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1030,6 +1030,11 @@ static struct platform_device gta01_pm_gsm_dev = {
-       .name           = "neo1973-pm-gsm",
- };
-+static struct platform_device gta02_pm_usbhost_dev = {
-+      .name           = "neo1973-pm-host",
-+};
-+
-+
- /* USB */
- static struct s3c2410_hcd_info gta02_usb_info = {
-       .port[0]        = {
-@@ -1287,6 +1292,7 @@ static void __init gta02_machine_init(void)
-       platform_device_register(&s3c_device_spi_acc);
-       platform_device_register(&gta01_button_dev);
-       platform_device_register(&gta01_pm_gsm_dev);
-+      platform_device_register(&gta02_pm_usbhost_dev);
-       mangle_pmu_pdata_by_system_rev();
-       platform_device_register(&gta02_pmu_dev);
-diff --git a/arch/arm/plat-s3c24xx/Makefile b/arch/arm/plat-s3c24xx/Makefile
-index 6f43aca..d58265f 100644
---- a/arch/arm/plat-s3c24xx/Makefile
-+++ b/arch/arm/plat-s3c24xx/Makefile
-@@ -29,4 +29,4 @@ obj-$(CONFIG_PM)             += pm.o
- obj-$(CONFIG_PM)              += sleep.o
- obj-$(CONFIG_S3C2410_DMA)     += dma.o
- obj-$(CONFIG_MACH_SMDK)               += common-smdk.o
--obj-$(CONFIG_MACH_NEO1973)    += neo1973_pm_gsm.o neo1973_pm_gps.o neo1973_pm_bt.o
-+obj-$(CONFIG_MACH_NEO1973)    += neo1973_pm_host.o neo1973_pm_gsm.o neo1973_pm_gps.o neo1973_pm_bt.o
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_host.c b/arch/arm/plat-s3c24xx/neo1973_pm_host.c
-new file mode 100644
-index 0000000..4eae341
---- /dev/null
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_host.c
-@@ -0,0 +1,101 @@
-+/*
-+ * Bluetooth PM code for the FIC Neo1973 GSM Phone
-+ *
-+ * (C) 2007 by OpenMoko Inc.
-+ * Author: Harald Welte <laforge@openmoko.org>
-+ * 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 version 2 as
-+ * published by the Free Software Foundation
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/mach-types.h>
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+#include <asm/arch/gta02.h>
-+#include <linux/pcf50633.h>
-+
-+static ssize_t pm_host_read(struct device *dev, struct device_attribute *attr,
-+                          char *buf)
-+{
-+      return sprintf(buf, "%d\n",
-+                     pcf50633_gpio_get(pcf50633_global, PCF50633_GPO));
-+}
-+
-+static ssize_t pm_host_write(struct device *dev, struct device_attribute *attr,
-+                           const char *buf, size_t count)
-+{
-+      unsigned long on = simple_strtoul(buf, NULL, 10);
-+
-+      pcf50633_gpio_set(pcf50633_global, PCF50633_GPO, on);
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(hostmode, 0644, pm_host_read, pm_host_write);
-+
-+static struct attribute *neo1973_pm_host_sysfs_entries[] = {
-+      &dev_attr_hostmode.attr,
-+      NULL
-+};
-+
-+static struct attribute_group neo1973_pm_host_attr_group = {
-+      .name   = NULL,
-+      .attrs  = neo1973_pm_host_sysfs_entries,
-+};
-+
-+static int __init neo1973_pm_host_probe(struct platform_device *pdev)
-+{
-+      dev_info(&pdev->dev, "starting\n");
-+
-+      switch (machine_arch_type) {
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+      case MACH_TYPE_NEO1973_GTA01:
-+              return -EINVAL;
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+      default:
-+              break;
-+      }
-+
-+      return sysfs_create_group(&pdev->dev.kobj, &neo1973_pm_host_attr_group);
-+}
-+
-+static int neo1973_pm_host_remove(struct platform_device *pdev)
-+{
-+      sysfs_remove_group(&pdev->dev.kobj, &neo1973_pm_host_attr_group);
-+      return 0;
-+}
-+
-+static struct platform_driver neo1973_pm_host_driver = {
-+      .probe          = neo1973_pm_host_probe,
-+      .remove         = neo1973_pm_host_remove,
-+      .driver         = {
-+              .name           = "neo1973-pm-host",
-+      },
-+};
-+
-+static int __devinit neo1973_pm_host_init(void)
-+{
-+      return platform_driver_register(&neo1973_pm_host_driver);
-+}
-+
-+static void neo1973_pm_host_exit(void)
-+{
-+      platform_driver_unregister(&neo1973_pm_host_driver);
-+}
-+
-+module_init(neo1973_pm_host_init);
-+module_exit(neo1973_pm_host_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
-+MODULE_DESCRIPTION("Neo1973 USB Host Power Management");
-+#endif
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1088-fix-charging-deassert-host-power-1a-detect.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1088-fix-charging-deassert-host-power-1a-detect.patch.patch
deleted file mode 100755 (executable)
index 67fde72..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From f78f3a4decb7e67b5349a2c088449342398d2114 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:01 +0100
-Subject: [PATCH] fix-charging-deassert-host-power-1a-detect.patch
-
-We don't take care to stop driving generated USB host power even
-when we have a 1A charger connected on the same pins.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 91b9ac3..c14fad0 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -523,6 +523,15 @@ static void configure_pmu_for_charger(struct pcf50633_data *pcf,
-               break;
-       case CHARGER_TYPE_1A:
-               __reg_write(pcf, PCF50633_REG_MBCC7, PCF50633_MBCC7_USB_1000mA);
-+              /*
-+               * stop GPO / EN_HOSTUSB power driving out on the same
-+               * USB power pins we have a 1A charger on right now!
-+               */
-+              dev_info(&pcf->client.dev, "Charger -> CHARGER_TYPE_1A\n");
-+              __reg_write(pcf, PCF50633_GPO - PCF50633_GPIO1 +
-+                               PCF50633_REG_GPIO1CFG,
-+                               __reg_read(pcf, PCF50633_GPO - PCF50633_GPIO1 +
-+                                               PCF50633_REG_GPIO1CFG) & 0xf0);
-               break;
-       }
- }
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1089-add-pcf50633-06-RTC_AIE-ioctl.patch b/target/linux/s3c24xx/patches-2.6.26/1089-add-pcf50633-06-RTC_AIE-ioctl.patch
deleted file mode 100755 (executable)
index 94a03bc..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From d35cdd3761e8b030937e463ccc64938104f1d773 Mon Sep 17 00:00:00 2001
-From: Holger Hans Peter Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:02 +0100
-Subject: [PATCH] add-pcf50633-06-RTC_AIE-ioctl
-
-Hey,
-
-the legacy application 'atd' from Russ Nelson/Nils Faerber, used by Qtopia, to
-schedule alarms currently fails to start as the the above ioctl is failing.
-The other drivers in drivers/rtc implement the above ioctl and we can
-implement it too.
-
-The code to mask/unmask the RTC alarm is copied from the set_alarm routine and
-adapted to use the reg_set_bit_mask and reg_set_clear_mask.
-
-It is compiling, so it must work. Please welcome me the lkml way ;)
-
-
-Signed-Off-by: Holger Hans Peter Freyther <zecke@openmoko.org>
----
- drivers/i2c/chips/pcf50606.c |   10 ++++++++++
- drivers/i2c/chips/pcf50633.c |   10 ++++++++++
- 2 files changed, 20 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
-index aaec6e8..03805be 100644
---- a/drivers/i2c/chips/pcf50606.c
-+++ b/drivers/i2c/chips/pcf50606.c
-@@ -1191,7 +1191,17 @@ static int pcf50606_rtc_ioctl(struct device *dev, unsigned int cmd,
- {
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf50606_data *pcf = i2c_get_clientdata(client);
-+
-       switch (cmd) {
-+      case RTC_AIE_OFF:
-+              /* disable the alarm interrupt */
-+              reg_set_bit_mask(pcf, PCF50606_REG_INT1M,
-+                               PCF50606_INT1_ALARM, PCF50606_INT1_ALARM);
-+              return 0;
-+      case RTC_AIE_ON:
-+              /* enable the alarm interrupt */
-+              reg_clear_bits(pcf, PCF50606_REG_INT1M, PCF50606_INT1_ALARM);
-+              return 0;
-       case RTC_PIE_OFF:
-               /* disable periodic interrupt (hz tick) */
-               pcf->flags &= ~PCF50606_F_RTC_SECOND;
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index c14fad0..b5cd2cb 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1297,7 +1297,17 @@ static int pcf50633_rtc_ioctl(struct device *dev, unsigned int cmd,
- {
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+
-       switch (cmd) {
-+      case RTC_AIE_OFF:
-+              /* disable the alarm interrupt */
-+              reg_set_bit_mask(pcf, PCF50633_REG_INT1M,
-+                               PCF50633_INT1_ALARM, PCF50633_INT1_ALARM);
-+              return 0;
-+      case RTC_AIE_ON:
-+              /* enable the alarm interrupt */
-+              reg_clear_bits(pcf, PCF50633_REG_INT1M, PCF50633_INT1_ALARM);
-+              return 0;
-       case RTC_PIE_OFF:
-               /* disable periodic interrupt (hz tick) */
-               pcf->flags &= ~PCF50633_F_RTC_SECOND;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1090-fix-lis302dl-suspend-gpio.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1090-fix-lis302dl-suspend-gpio.patch.patch
deleted file mode 100755 (executable)
index 9a9c605..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-From f97c81869175362f755488bd50ddf85570236ce8 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:02 +0100
-Subject: [PATCH] fix-lis302dl-suspend-gpio.patch
- Add platform stuff to deal with going in and out of suspend
- so the motion sensor IO is not driving high into unpowered sensors
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   28 +++++++++++++++++++++++++++-
- drivers/input/misc/lis302dl.c      |   15 +++++++++++++++
- include/linux/lis302dl.h           |    1 +
- 3 files changed, 43 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 5bd68a6..99206ee 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -887,7 +887,31 @@ void gat02_lis302dl_bitbang_read(struct lis302dl_info *lis)
- }
--struct lis302dl_platform_data lis302_pdata[] = {
-+void gat02_lis302dl_suspend_io(struct lis302dl_info *lis, int resume)
-+{
-+      struct lis302dl_platform_data *pdata = lis->pdata;
-+
-+      if (!resume) {
-+               /*
-+               * we don't want to power them with a high level
-+               * because GSENSOR_3V3 is not up during suspend
-+               */
-+              s3c2410_gpio_setpin(pdata->pin_chip_select, 0);
-+              s3c2410_gpio_setpin(pdata->pin_clk, 0);
-+              s3c2410_gpio_setpin(pdata->pin_mosi, 0);
-+              /* misnomer: it is a pullDOWN in 2442 */
-+              s3c2410_gpio_pullup(pdata->pin_miso, 1);
-+              return;
-+      }
-+
-+      /* back to normal */
-+      s3c2410_gpio_setpin(pdata->pin_chip_select, 1);
-+      s3c2410_gpio_setpin(pdata->pin_clk, 1);
-+      /* misnomer: it is a pullDOWN in 2442 */
-+      s3c2410_gpio_pullup(pdata->pin_miso, 0);
-+}
-+
-+const struct lis302dl_platform_data lis302_pdata[] = {
-       {
-               .name           = "lis302-1 (top)",
-               .pin_chip_select= S3C2410_GPD12,
-@@ -896,6 +920,7 @@ struct lis302dl_platform_data lis302_pdata[] = {
-               .pin_miso       = S3C2410_GPG5,
-               .open_drain     = 1, /* altered at runtime by PCB rev */
-               .lis302dl_bitbang_read = gat02_lis302dl_bitbang_read,
-+              .lis302dl_suspend_io = gat02_lis302dl_suspend_io,
-       }, {
-               .name           = "lis302-2 (bottom)",
-               .pin_chip_select= S3C2410_GPD13,
-@@ -904,6 +929,7 @@ struct lis302dl_platform_data lis302_pdata[] = {
-               .pin_miso       = S3C2410_GPG5,
-               .open_drain     = 1, /* altered at runtime by PCB rev */
-               .lis302dl_bitbang_read = gat02_lis302dl_bitbang_read,
-+              .lis302dl_suspend_io = gat02_lis302dl_suspend_io,
-       },
- };
-diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
-index 36bdcf7..2be816a 100644
---- a/drivers/input/misc/lis302dl.c
-+++ b/drivers/input/misc/lis302dl.c
-@@ -428,6 +428,15 @@ static int lis302dl_suspend(struct spi_device *spi, pm_message_t state)
-       disable_irq(lis->spi_dev->irq);
-       local_save_flags(flags);
-+      /*
-+       * When we share SPI over multiple sensors, there is a race here
-+       * that one or more sensors will lose.  In that case, the shared
-+       * SPI bus GPIO will be in sleep mode and partially pulled down.  So
-+       * we explicitly put our IO into "wake" mode here before the final
-+       * traffic to the sensor.
-+       */
-+      (lis->pdata->lis302dl_suspend_io)(lis, 1);
-+
-       /* save registers */
-       lis->regs[LIS302DL_REG_CTRL1] = reg_read(lis, LIS302DL_REG_CTRL1);
-       lis->regs[LIS302DL_REG_CTRL2] = reg_read(lis, LIS302DL_REG_CTRL2);
-@@ -467,6 +476,9 @@ static int lis302dl_suspend(struct spi_device *spi, pm_message_t state)
-               reg_write(lis, LIS302DL_REG_CTRL1, tmp);
-       }
-+      /* place our IO to the device in sleep-compatible states */
-+      (lis->pdata->lis302dl_suspend_io)(lis, 0);
-+
-       local_irq_restore(flags);
-       return 0;
-@@ -479,6 +491,9 @@ static int lis302dl_resume(struct spi_device *spi)
-       local_save_flags(flags);
-+      /* get our IO to the device back in operational states */
-+      (lis->pdata->lis302dl_suspend_io)(lis, 1);
-+
-       /* restore registers after resume */
-       reg_write(lis, LIS302DL_REG_CTRL1, lis->regs[LIS302DL_REG_CTRL1]);
-       reg_write(lis, LIS302DL_REG_CTRL2, lis->regs[LIS302DL_REG_CTRL2]);
-diff --git a/include/linux/lis302dl.h b/include/linux/lis302dl.h
-index 2dea813..0d6b4c4 100644
---- a/include/linux/lis302dl.h
-+++ b/include/linux/lis302dl.h
-@@ -16,6 +16,7 @@ struct lis302dl_platform_data {
-       unsigned long pin_miso;
-       int open_drain;
-       void (*lis302dl_bitbang_read)(struct lis302dl_info *);
-+      void (*lis302dl_suspend_io)(struct lis302dl_info *, int resuming);
- };
- struct lis302dl_info {
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1091-fix-suspend-gps-tx-level.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1091-fix-suspend-gps-tx-level.patch.patch
deleted file mode 100755 (executable)
index 41b692a..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From 626e5a4e87bfc9471c3ded7da839c41a94088843 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Fri, 25 Jul 2008 23:06:02 +0100
-Subject: [PATCH] fix-suspend-gps-tx-level.patch
-
-We used to drive output high into GPS unit in suspend
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gps.c |   14 ++++++++++++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-index 6bd8054..e8cfb96 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-@@ -485,6 +485,12 @@ static int gta01_pm_gps_suspend(struct platform_device *pdev,
- #ifdef CONFIG_MACH_NEO1973_GTA02
-       if (machine_is_neo1973_gta02()) {
-+              /* take care not to power unpowered GPS from GPIO */
-+              s3c2410_gpio_cfgpin(S3C2410_GPH4, S3C2410_GPH4_OUTP);
-+              s3c2410_gpio_setpin(S3C2410_GPH4, 0);
-+              /* don't let RX from unpowered GPS float */
-+              s3c2410_gpio_pullup(S3C2410_GPH5, 1);
-+
-               /* FIXME */
-               pcf50633_onoff_set(pcf50633_global,
-                       PCF50633_REGULATOR_LDO5, 0);
-@@ -505,6 +511,14 @@ static int gta01_pm_gps_resume(struct platform_device *pdev)
- #ifdef CONFIG_MACH_NEO1973_GTA02
-       if (machine_is_neo1973_gta02()) {
-+              /*
-+               * resume TXD1 function since we power GPS now... er..
-+               * WTF?  FIXME We always power GPS on resume ??
-+               */
-+              s3c2410_gpio_cfgpin(S3C2410_GPH4, S3C2410_GPH4_TXD1);
-+              /* remove pulldown now it won't be floating any more */
-+              s3c2410_gpio_pullup(S3C2410_GPH5, 0);
-+
-               /* FIXME */
-               pcf50633_onoff_set(pcf50633_global,
-                       PCF50633_REGULATOR_LDO5, 1);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1092-Do-not-send-low-level-debugging-to-the-modem.patch b/target/linux/s3c24xx/patches-2.6.26/1092-Do-not-send-low-level-debugging-to-the-modem.patch
deleted file mode 100755 (executable)
index 842f247..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-From f1c5b25e153c0c2a335632895a85000266dd475a Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:02 +0100
-Subject: [PATCH] Do not send low level debugging to the modem
-
-Hey,
-
-I see no reason to send LL debugging messages to the modem. This can happen if
-we compile the Samsung SoC with PM debugging as in andy's git branch.
-
-
-
-From 452c17990dfeb9c2eb2ffa7ded4d24ddb1bcd4b2 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Sun, 23 Mar 2008 00:57:28 +0100
-Subject: [PATCH] Never ever send debug messages to the modem. The serial
-console is
- on UART2, send the messages for decompressing  and low level debugging
- there.
-
-Signed-Off-by: Holger Freyther <zecke@openmoko.org>
----
- defconfig-2.6.24 |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index e57081a..cce3737 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -163,7 +163,7 @@ CONFIG_CPU_LLSERIAL_S3C2440=y
- #
- CONFIG_S3C2410_PM_DEBUG=y
- # CONFIG_S3C2410_PM_CHECK is not set
--CONFIG_S3C_LOWLEVEL_UART_PORT=0
-+CONFIG_S3C_LOWLEVEL_UART_PORT=2
- #
- # S3C2400 Machines
-@@ -1756,7 +1756,7 @@ CONFIG_DEBUG_ERRORS=y
- CONFIG_DEBUG_LL=y
- # CONFIG_DEBUG_ICEDCC is not set
- # CONFIG_DEBUG_S3C_PORT is not set
--CONFIG_DEBUG_S3C_UART=0
-+CONFIG_DEBUG_S3C_UART=2
- #
- # Security options
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1093-add-gta02-pcb-revision-detect.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1093-add-gta02-pcb-revision-detect.patch.patch
deleted file mode 100755 (executable)
index 8de4e52..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-From fffb5d650929cf49a3e3f200bea1d5472de56794 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:02 +0100
-Subject: [PATCH] add-gta02-pcb-revision-detect.patch
-
-Add function
-
-int gta02_get_pcb_revision(void)
-
-which returns state of GTA02 PCB revision pins.  It is also called
-and logged during boot with KERN_INFO.  The results look like:
-
-b9    b8        b2    b1    b0
- GPD4  GPD3     GPD0  GPC15 GPC13
-
- GTA02 A5 and before:  0x000
- GTA02 A6           :  0x001
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c   |   55 +++++++++++++++++++++++++++++++++-
- include/asm-arm/arch-s3c2410/gta02.h |    9 +++++
- 2 files changed, 63 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 99206ee..a2a63fe 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -320,6 +320,59 @@ FIQ_HANDLER_ENTRY(256, 512)
- FIQ_HANDLER_END()
-+/**
-+ * returns PCB revision information in b9,b8 and b2,b1,b0
-+ * Pre-GTA02 A6 returns 0x000
-+ *     GTA02 A6 returns 0x101
-+ *     ...
-+ */
-+
-+int gta02_get_pcb_revision(void)
-+{
-+      int n;
-+      int u = 0;
-+      static unsigned long pinlist[] = {
-+              GTA02_PCB_ID1_0,
-+              GTA02_PCB_ID1_1,
-+              GTA02_PCB_ID1_2,
-+              GTA02_PCB_ID2_0,
-+              GTA02_PCB_ID2_1,
-+      };
-+      static int pin_offset[] = {
-+              0, 1, 2, 8, 9
-+      };
-+
-+      for (n = 0 ; n < ARRAY_SIZE(pinlist); n++) {
-+              /*
-+               * set the PCB version GPIO to be pulled-down input
-+               * force low briefly first
-+               */
-+              s3c2410_gpio_cfgpin(pinlist[n], S3C2410_GPIO_OUTPUT);
-+              s3c2410_gpio_setpin(pinlist[n], 0);
-+              /* misnomer: it is a pullDOWN in 2442 */
-+              s3c2410_gpio_pullup(pinlist[n], 1);
-+              s3c2410_gpio_cfgpin(pinlist[n], S3C2410_GPIO_INPUT);
-+
-+              udelay(10);
-+
-+              if (s3c2410_gpio_getpin(pinlist[n]))
-+                      u |= 1 << pin_offset[n];
-+
-+              /*
-+              * when not being interrogated, all of the revision GPIO
-+              * are set to output HIGH without pulldown so no current flows
-+              * if they are NC or pulled up.
-+              */
-+              s3c2410_gpio_setpin(pinlist[n], 1);
-+              s3c2410_gpio_cfgpin(pinlist[n], S3C2410_GPIO_OUTPUT);
-+              /* misnomer: it is a pullDOWN in 2442 */
-+              s3c2410_gpio_pullup(pinlist[n], 0);
-+      }
-+
-+      return u;
-+}
-+
-+
- static struct map_desc gta02_iodesc[] __initdata = {
-       {
-               .virtual        = 0xe0000000,
-@@ -911,7 +964,7 @@ void gat02_lis302dl_suspend_io(struct lis302dl_info *lis, int resume)
-       s3c2410_gpio_pullup(pdata->pin_miso, 0);
- }
--const struct lis302dl_platform_data lis302_pdata[] = {
-+struct lis302dl_platform_data lis302_pdata[] = {
-       {
-               .name           = "lis302-1 (top)",
-               .pin_chip_select= S3C2410_GPD12,
-diff --git a/include/asm-arm/arch-s3c2410/gta02.h b/include/asm-arm/arch-s3c2410/gta02.h
-index f686a7a..791ea4f 100644
---- a/include/asm-arm/arch-s3c2410/gta02.h
-+++ b/include/asm-arm/arch-s3c2410/gta02.h
-@@ -97,4 +97,13 @@
- #define GTA02v3_IRQ_nUSB_FLT  IRQ_EINT18      /* v3 + v4 only */
- #define GTA02v3_IRQ_nGSM_OC   IRQ_EINT19      /* v3 + v4 only */
-+/* returns 00 000 on GTA02 A5 and earlier, A6 returns 01 001 */
-+#define GTA02_PCB_ID1_0               S3C2410_GPC13
-+#define GTA02_PCB_ID1_1               S3C2410_GPC15
-+#define GTA02_PCB_ID1_2               S3C2410_GPD0
-+#define GTA02_PCB_ID2_0               S3C2410_GPD3
-+#define GTA02_PCB_ID2_1               S3C2410_GPD4
-+
-+int gta02_get_pcb_revision(void);
-+
- #endif /* _GTA02_H */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1094-debug-glamo-dump-regs.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1094-debug-glamo-dump-regs.patch.patch
deleted file mode 100755 (executable)
index f7ab57a..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-From 1dd60fdf9fe229443304a5f53c265d9f2b35a7ec Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Fri, 25 Jul 2008 23:06:02 +0100
-Subject: [PATCH] debug-glamo-dump-regs.patch
- From: Andy Green <andy@openmoko.com>
-
-Sigend-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-core.c |   91 +++++++++++++++++++++++++++++++++++++++-
- 1 files changed, 90 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index 4d8e47f..accd933 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -977,10 +977,92 @@ static int glamo_supported(struct glamo_core *glamo)
-       return 1;
- }
-+static ssize_t regs_write(struct device *dev, struct device_attribute *attr,
-+                         const char *buf, size_t count)
-+{
-+      unsigned long reg = simple_strtoul(buf, NULL, 10);
-+      struct glamo_core *glamo = dev_get_drvdata(dev);
-+
-+      while (*buf && (*buf != ' '))
-+              buf++;
-+      if (*buf != ' ')
-+              return -EINVAL;
-+      while (*buf && (*buf == ' '))
-+              buf++;
-+      if (!*buf)
-+              return -EINVAL;
-+
-+      printk(KERN_INFO"reg 0x%02lX <-- 0x%04lX\n",
-+             reg, simple_strtoul(buf, NULL, 10));
-+
-+      __reg_write(glamo, reg, simple_strtoul(buf, NULL, 10));
-+
-+      return count;
-+}
-+
-+static ssize_t regs_read(struct device *dev, struct device_attribute *attr,
-+                      char *buf)
-+{
-+      struct glamo_core *glamo = dev_get_drvdata(dev);
-+      int n, n1 = 0, r;
-+      char * end = buf;
-+      struct reg_range {
-+              int start;
-+              int count;
-+              char * name;
-+      };
-+      struct reg_range reg_range[] = {
-+              { 0x0000, 0x200, "General" },
-+              { 0x0200, 0x100, "Host Bus" },
-+              { 0x0300, 0x100, "Memory" },
-+/*            { 0x0400, 0x100, "Sensor" },
-+              { 0x0500, 0x300, "ISP" },
-+              { 0x0800, 0x400, "JPEG" },
-+              { 0x0c00, 0x500, "MPEG" },
-+              { 0x1100, 0x400, "LCD" },
-+              { 0x1500, 0x080, "MPU 0" },
-+              { 0x1580, 0x080, "MPU 1" },
-+              { 0x1600, 0x080, "Command Queue" },
-+              { 0x1680, 0x080, "RISC CPU" },
-+              { 0x1700, 0x400, "2D Unit" },
-+              { 0x1b00, 0x900, "3D Unit" },
-+*/
-+      };
-+
-+      spin_lock(&glamo->lock);
-+
-+      for (r = 0; r < ARRAY_SIZE(reg_range); r++) {
-+              n1 = 0;
-+              end += sprintf(end, "\n%s\n\n", reg_range[r].name);
-+              for (n = reg_range[r].start;
-+                   n < reg_range[r].start + reg_range[r].count; n += 2) {
-+                      if (((n1++) & 7) == 0)
-+                              end += sprintf(end, "\n%04X:  ",
-+                                             n + reg_range[r].start);
-+                      end += sprintf(end, "%04x ", __reg_read(glamo, n));
-+              }
-+              end += sprintf(end, "\n");
-+      }
-+      spin_unlock(&glamo->lock);
-+
-+      return end - buf;
-+}
-+
-+static DEVICE_ATTR(regs, 0644, regs_read, regs_write);
-+static struct attribute *glamo_sysfs_entries[] = {
-+      &dev_attr_regs.attr,
-+      NULL
-+};
-+static struct attribute_group glamo_attr_group = {
-+      .name   = NULL,
-+      .attrs  = glamo_sysfs_entries,
-+};
-+
-+
- static int __init glamo_probe(struct platform_device *pdev)
- {
--      int rc, irq;
-+      int rc = 0, irq;
-       struct glamo_core *glamo;
-       if (glamo_handle) {
-@@ -1080,6 +1162,12 @@ static int __init glamo_probe(struct platform_device *pdev)
-               goto out_free;
-       }
-+      rc = sysfs_create_group(&pdev->dev.kobj, &glamo_attr_group);
-+      if (rc < 0) {
-+              dev_err(&pdev->dev, "cannot create sysfs group\n");
-+              goto out_free;
-+      }
-+
-       platform_set_drvdata(pdev, glamo);
-       dev_dbg(&glamo->pdev->dev, "running init script\n");
-@@ -1103,6 +1191,7 @@ static int __init glamo_probe(struct platform_device *pdev)
-               glamo->irq_works = 1;
-       } else
-               glamo->irq_works = 0;
-+
-       return 0;
- out_free:
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1095-add-pcb-rev-sysfs.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1095-add-pcb-rev-sysfs.patch.patch
deleted file mode 100755 (executable)
index 8c14b2b..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-From 440ff3efce2982d9808045a696d9b7c17f539a10 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:02 +0100
-Subject: [PATCH] add-pcb-rev-sysfs.patch
- Signed-off-by: Andy Green <andy@openmoko.com>
-
----
- arch/arm/mach-s3c2440/mach-gta02.c      |    6 ++
- arch/arm/plat-s3c24xx/Makefile          |    6 ++-
- arch/arm/plat-s3c24xx/neo1973_version.c |   90 +++++++++++++++++++++++++++++++
- 3 files changed, 101 insertions(+), 1 deletions(-)
- create mode 100644 arch/arm/plat-s3c24xx/neo1973_version.c
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index a2a63fe..3574375 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -372,6 +372,11 @@ int gta02_get_pcb_revision(void)
-       return u;
- }
-+struct platform_device gta02_version_device = {
-+      .name           = "neo1973-version",
-+      .num_resources  = 0,
-+};
-+
- static struct map_desc gta02_iodesc[] __initdata = {
-       {
-@@ -724,6 +729,7 @@ static struct platform_device *gta02_devices[] __initdata = {
-       &s3c_device_ts,
-       &gta02_nor_flash,
-       &sc32440_fiq_device,
-+      &gta02_version_device,
- };
- static struct s3c2410_nand_set gta02_nand_sets[] = {
-diff --git a/arch/arm/plat-s3c24xx/Makefile b/arch/arm/plat-s3c24xx/Makefile
-index d58265f..6b32a8a 100644
---- a/arch/arm/plat-s3c24xx/Makefile
-+++ b/arch/arm/plat-s3c24xx/Makefile
-@@ -29,4 +29,8 @@ obj-$(CONFIG_PM)             += pm.o
- obj-$(CONFIG_PM)              += sleep.o
- obj-$(CONFIG_S3C2410_DMA)     += dma.o
- obj-$(CONFIG_MACH_SMDK)               += common-smdk.o
--obj-$(CONFIG_MACH_NEO1973)    += neo1973_pm_host.o neo1973_pm_gsm.o neo1973_pm_gps.o neo1973_pm_bt.o
-+obj-$(CONFIG_MACH_NEO1973)    += neo1973_version.o \
-+                                 neo1973_pm_host.o \
-+                                 neo1973_pm_gsm.o \
-+                                 neo1973_pm_gps.o \
-+                                 neo1973_pm_bt.o
-diff --git a/arch/arm/plat-s3c24xx/neo1973_version.c b/arch/arm/plat-s3c24xx/neo1973_version.c
-new file mode 100644
-index 0000000..ad41a0f
---- /dev/null
-+++ b/arch/arm/plat-s3c24xx/neo1973_version.c
-@@ -0,0 +1,90 @@
-+/*
-+ * PCB version sysfs for the FIC Neo1973 GSM Phone
-+ *
-+ * (C) 2007 by OpenMoko Inc.
-+ * Author: Andy Green <andy@openmoko.com>
-+ * 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 version 2 as
-+ * published by the Free Software Foundation
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/mach-types.h>
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+#include <asm/arch/gta02.h>
-+
-+static ssize_t version_read(struct device *dev, struct device_attribute *attr,
-+                          char *buf)
-+{
-+      return sprintf(buf, "0x%03X\n", gta02_get_pcb_revision());
-+}
-+
-+
-+static DEVICE_ATTR(pcb, 0644, version_read, NULL);
-+
-+static struct attribute *neo1973_version_sysfs_entries[] = {
-+      &dev_attr_pcb.attr,
-+      NULL
-+};
-+
-+static struct attribute_group neo1973_version_attr_group = {
-+      .name   = NULL,
-+      .attrs  = neo1973_version_sysfs_entries,
-+};
-+
-+static int __init neo1973_version_probe(struct platform_device *pdev)
-+{
-+      dev_info(&pdev->dev, "starting\n");
-+
-+      switch (machine_arch_type) {
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+      case MACH_TYPE_NEO1973_GTA01:
-+              return -EINVAL;
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+      default:
-+              break;
-+      }
-+
-+      return sysfs_create_group(&pdev->dev.kobj, &neo1973_version_attr_group);
-+}
-+
-+static int neo1973_version_remove(struct platform_device *pdev)
-+{
-+      sysfs_remove_group(&pdev->dev.kobj, &neo1973_version_attr_group);
-+      return 0;
-+}
-+
-+static struct platform_driver neo1973_version_driver = {
-+      .probe          = neo1973_version_probe,
-+      .remove         = neo1973_version_remove,
-+      .driver         = {
-+              .name           = "neo1973-version",
-+      },
-+};
-+
-+static int __devinit neo1973_version_init(void)
-+{
-+      return platform_driver_register(&neo1973_version_driver);
-+}
-+
-+static void neo1973_version_exit(void)
-+{
-+      platform_driver_unregister(&neo1973_version_driver);
-+}
-+
-+module_init(neo1973_version_init);
-+module_exit(neo1973_version_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
-+MODULE_DESCRIPTION("Neo1973 PCB version");
-+#endif
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1096-Simplify-the-code-there-is-no-need-for-a-branch.-Th.patch b/target/linux/s3c24xx/patches-2.6.26/1096-Simplify-the-code-there-is-no-need-for-a-branch.-Th.patch
deleted file mode 100755 (executable)
index e7c05f8..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-From ca5c103515f48dc5d0d910847fb38a652d70a093 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:02 +0100
-Subject: [PATCH] Simplify the code, there is no need for a branch. The code for
- GTA01_GPIO_AUX_KEY looks odd.
-
-Signed-Off-by: Holger Freyther <zecke@openmoko.org>
----
- drivers/input/keyboard/neo1973kbd.c |   24 +++++++-----------------
- 1 files changed, 7 insertions(+), 17 deletions(-)
-
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-index 917d5ae..99ca9c3 100644
---- a/drivers/input/keyboard/neo1973kbd.c
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -37,11 +37,8 @@ static irqreturn_t neo1973kbd_aux_irq(int irq, void *dev_id)
-       struct neo1973kbd *neo1973kbd_data = dev_id;
-       /* FIXME: use GPIO from platform_dev resources */
--      if (s3c2410_gpio_getpin(GTA01_GPIO_AUX_KEY))
--              input_report_key(neo1973kbd_data->input, KEY_PHONE, 0);
--      else
--              input_report_key(neo1973kbd_data->input, KEY_PHONE, 1);
--
-+      int key_pressed = !s3c2410_gpio_getpin(GTA01_GPIO_AUX_KEY);
-+      input_report_key(neo1973kbd_data->input, KEY_PHONE, key_pressed);
-       input_sync(neo1973kbd_data->input);
-       return IRQ_HANDLED;
-@@ -52,11 +49,8 @@ static irqreturn_t neo1973kbd_hold_irq(int irq, void *dev_id)
-       struct neo1973kbd *neo1973kbd_data = dev_id;
-       /* FIXME: use GPIO from platform_dev resources */
--      if (s3c2410_gpio_getpin(GTA01_GPIO_HOLD_KEY))
--              input_report_key(neo1973kbd_data->input, KEY_PAUSE, 1);
--      else
--              input_report_key(neo1973kbd_data->input, KEY_PAUSE, 0);
--
-+      int key_pressed = 3c2410_gpio_getpin(GTA01_GPIO_HOLD_KEY);
-+      input_report_key(neo1973kbd_data->input, KEY_PAUSE, key_pressed);
-       input_sync(neo1973kbd_data->input);
-       return IRQ_HANDLED;
-@@ -67,13 +61,9 @@ static irqreturn_t neo1973kbd_headphone_irq(int irq, void *dev_id)
-       struct neo1973kbd *neo1973kbd_data = dev_id;
-       /* FIXME: use GPIO from platform_dev resources */
--      if (s3c2410_gpio_getpin(GTA01_GPIO_JACK_INSERT))
--              input_report_switch(neo1973kbd_data->input,
--                                  SW_HEADPHONE_INSERT, 1);
--      else
--              input_report_switch(neo1973kbd_data->input,
--                                  SW_HEADPHONE_INSERT, 0);
--
-+      int key_pressed = s3c2410_gpio_getpin(GTA01_GPIO_JACK_INSERT);
-+      input_report_switch(neo1973kbd_data->input,
-+                          SW_HEADPHONE_INSERT, key_pressed);
-       input_sync(neo1973kbd_data->input);
-       return IRQ_HANDLED;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1097-Remove-dead-code.patch b/target/linux/s3c24xx/patches-2.6.26/1097-Remove-dead-code.patch
deleted file mode 100755 (executable)
index e3d1b46..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-From 03f86e3432815c6d0ada8539cb3bd8bce56edb2d Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:02 +0100
-Subject: [PATCH] Remove dead code
-
-Signed-Off-by: Holger Freyther <zecke@openmoko.org>
----
- drivers/input/keyboard/neo1973kbd.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-index 99ca9c3..30f324d 100644
---- a/drivers/input/keyboard/neo1973kbd.c
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -29,7 +29,6 @@
- struct neo1973kbd {
-       struct input_dev *input;
-       unsigned int suspended;
--      unsigned long suspend_jiffies;
- };
- static irqreturn_t neo1973kbd_aux_irq(int irq, void *dev_id)
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1098-Fix-the-FIXME-store-the-GPIO-value-for-now.patch b/target/linux/s3c24xx/patches-2.6.26/1098-Fix-the-FIXME-store-the-GPIO-value-for-now.patch
deleted file mode 100755 (executable)
index 85c0dc4..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-From 4b1af3131a97c004c8cdc74b61fbdd00d3ab22e4 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:03 +0100
-Subject: [PATCH] Fix the FIXME, store the GPIO value for now
-
-Signed-Off-by: Holger Freyther <zecke@openmoko.org>
----
- drivers/input/keyboard/neo1973kbd.c |   23 +++++++++++++----------
- 1 files changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-index 30f324d..a77d8c0 100644
---- a/drivers/input/keyboard/neo1973kbd.c
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -23,20 +23,21 @@
- #include <linux/slab.h>
- #include <asm/hardware.h>
--#include <asm/arch/gta01.h>
- #include <asm/mach-types.h>
- struct neo1973kbd {
-       struct input_dev *input;
-       unsigned int suspended;
-+      int gpio_aux;
-+      int gpio_hold;
-+      int gpio_jack;    
- };
- static irqreturn_t neo1973kbd_aux_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--      /* FIXME: use GPIO from platform_dev resources */
--      int key_pressed = !s3c2410_gpio_getpin(GTA01_GPIO_AUX_KEY);
-+      int key_pressed = !s3c2410_gpio_getpin(neo1973kbd_data->gpio_aux);
-       input_report_key(neo1973kbd_data->input, KEY_PHONE, key_pressed);
-       input_sync(neo1973kbd_data->input);
-@@ -47,8 +48,7 @@ static irqreturn_t neo1973kbd_hold_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--      /* FIXME: use GPIO from platform_dev resources */
--      int key_pressed = 3c2410_gpio_getpin(GTA01_GPIO_HOLD_KEY);
-+      int key_pressed = s3c2410_gpio_getpin(neo1973kbd_data->gpio_hold);
-       input_report_key(neo1973kbd_data->input, KEY_PAUSE, key_pressed);
-       input_sync(neo1973kbd_data->input);
-@@ -59,8 +59,7 @@ static irqreturn_t neo1973kbd_headphone_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--      /* FIXME: use GPIO from platform_dev resources */
--      int key_pressed = s3c2410_gpio_getpin(GTA01_GPIO_JACK_INSERT);
-+      int key_pressed = s3c2410_gpio_getpin(neo1973kbd_data->gpio_jack);
-       input_report_switch(neo1973kbd_data->input,
-                           SW_HEADPHONE_INSERT, key_pressed);
-       input_sync(neo1973kbd_data->input);
-@@ -108,15 +107,19 @@ static int neo1973kbd_probe(struct platform_device *pdev)
-       if (pdev->resource[0].flags != 0)
-               return -EINVAL;
--      irq_aux = s3c2410_gpio_getirq(pdev->resource[0].start);
-+      neo1973kbd->gpio_aux = pdev->resource[0].start;
-+      neo1973kbd->gpio_hold = pdev->resource[1].start;
-+      neo1973kbd->gpio_jack = pdev->resource[2].start;
-+
-+      irq_aux = s3c2410_gpio_getirq(neo1973kbd->gpio_aux);
-       if (irq_aux < 0)
-               return -EINVAL;
--      irq_hold = s3c2410_gpio_getirq(pdev->resource[1].start);
-+      irq_hold = s3c2410_gpio_getirq(neo1973kbd->gpio_hold);
-       if (irq_hold < 0)
-               return -EINVAL;
--      irq_jack = s3c2410_gpio_getirq(pdev->resource[2].start);
-+      irq_jack = s3c2410_gpio_getirq(neo1973kbd->gpio_jack);
-       if (irq_jack < 0)
-               return -EINVAL;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1099-Convert-the-driver-to-the-generic-GPIO-framework.patch b/target/linux/s3c24xx/patches-2.6.26/1099-Convert-the-driver-to-the-generic-GPIO-framework.patch
deleted file mode 100755 (executable)
index 8a4176a..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-From 8c90c2e17ec6ff710d28e8308c42ccd09443dae4 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:03 +0100
-Subject: [PATCH] Convert the driver to the generic GPIO framework
-
-Signed-Off-by: Holger Freyther <zecke@openmoko.org>
----
- drivers/input/keyboard/neo1973kbd.c |   20 ++++++++++----------
- 1 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-index a77d8c0..b413bc8 100644
---- a/drivers/input/keyboard/neo1973kbd.c
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -22,7 +22,7 @@
- #include <linux/module.h>
- #include <linux/slab.h>
--#include <asm/hardware.h>
-+#include <asm/gpio.h>
- #include <asm/mach-types.h>
- struct neo1973kbd {
-@@ -37,7 +37,7 @@ static irqreturn_t neo1973kbd_aux_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--      int key_pressed = !s3c2410_gpio_getpin(neo1973kbd_data->gpio_aux);
-+      int key_pressed = !gpio_get_value(neo1973kbd_data->gpio_aux);
-       input_report_key(neo1973kbd_data->input, KEY_PHONE, key_pressed);
-       input_sync(neo1973kbd_data->input);
-@@ -48,7 +48,7 @@ static irqreturn_t neo1973kbd_hold_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--      int key_pressed = s3c2410_gpio_getpin(neo1973kbd_data->gpio_hold);
-+      int key_pressed = gpio_get_value(neo1973kbd_data->gpio_hold);
-       input_report_key(neo1973kbd_data->input, KEY_PAUSE, key_pressed);
-       input_sync(neo1973kbd_data->input);
-@@ -59,7 +59,7 @@ static irqreturn_t neo1973kbd_headphone_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--      int key_pressed = s3c2410_gpio_getpin(neo1973kbd_data->gpio_jack);
-+      int key_pressed = gpio_get_value(neo1973kbd_data->gpio_jack);
-       input_report_switch(neo1973kbd_data->input,
-                           SW_HEADPHONE_INSERT, key_pressed);
-       input_sync(neo1973kbd_data->input);
-@@ -111,15 +111,15 @@ static int neo1973kbd_probe(struct platform_device *pdev)
-       neo1973kbd->gpio_hold = pdev->resource[1].start;
-       neo1973kbd->gpio_jack = pdev->resource[2].start;
--      irq_aux = s3c2410_gpio_getirq(neo1973kbd->gpio_aux);
-+      irq_aux = gpio_to_irq(neo1973kbd->gpio_aux);
-       if (irq_aux < 0)
-               return -EINVAL;
--      irq_hold = s3c2410_gpio_getirq(neo1973kbd->gpio_hold);
-+      irq_hold = gpio_to_irq(neo1973kbd->gpio_hold);
-       if (irq_hold < 0)
-               return -EINVAL;
--      irq_jack = s3c2410_gpio_getirq(neo1973kbd->gpio_jack);
-+      irq_jack = gpio_to_irq(neo1973kbd->gpio_jack);
-       if (irq_jack < 0)
-               return -EINVAL;
-@@ -194,9 +194,9 @@ static int neo1973kbd_remove(struct platform_device *pdev)
- {
-       struct neo1973kbd *neo1973kbd = platform_get_drvdata(pdev);
--      free_irq(s3c2410_gpio_getirq(pdev->resource[2].start), neo1973kbd);
--      free_irq(s3c2410_gpio_getirq(pdev->resource[1].start), neo1973kbd);
--      free_irq(s3c2410_gpio_getirq(pdev->resource[0].start), neo1973kbd);
-+      free_irq(gpio_to_irq(pdev->resource[2].start), neo1973kbd);
-+      free_irq(gpio_to_irq(pdev->resource[1].start), neo1973kbd);
-+      free_irq(gpio_to_irq(pdev->resource[0].start), neo1973kbd);
-       input_unregister_device(neo1973kbd->input);
-       input_free_device(neo1973kbd->input);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1100-Add-GPIO-IRQ-for-the-s3c2410-and-add-irq_to_gpio.patch b/target/linux/s3c24xx/patches-2.6.26/1100-Add-GPIO-IRQ-for-the-s3c2410-and-add-irq_to_gpio.patch
deleted file mode 100755 (executable)
index 952a229..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-From d0342f6cc0388862a8e62b4b77f1c4c011385e9a Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:03 +0100
-Subject: [PATCH] Add GPIO -> IRQ for the s3c2410 and add irq_to_gpio to the gpio.h of the Samsung SoC
-
-Use this irq_to_gpio in the neo1973 keyboard driver
----
- drivers/input/keyboard/neo1973kbd.c |   19 ++++++-------------
- include/asm-arm/arch-s3c2410/gpio.h |    5 ++---
- 2 files changed, 8 insertions(+), 16 deletions(-)
-
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-index b413bc8..06fa8e0 100644
---- a/drivers/input/keyboard/neo1973kbd.c
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -28,16 +28,13 @@
- struct neo1973kbd {
-       struct input_dev *input;
-       unsigned int suspended;
--      int gpio_aux;
--      int gpio_hold;
--      int gpio_jack;    
- };
- static irqreturn_t neo1973kbd_aux_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--      int key_pressed = !gpio_get_value(neo1973kbd_data->gpio_aux);
-+      int key_pressed = !gpio_get_value(irq_to_gpio(irq));
-       input_report_key(neo1973kbd_data->input, KEY_PHONE, key_pressed);
-       input_sync(neo1973kbd_data->input);
-@@ -48,7 +45,7 @@ static irqreturn_t neo1973kbd_hold_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--      int key_pressed = gpio_get_value(neo1973kbd_data->gpio_hold);
-+      int key_pressed = gpio_get_value(irq_to_gpio(irq));
-       input_report_key(neo1973kbd_data->input, KEY_PAUSE, key_pressed);
-       input_sync(neo1973kbd_data->input);
-@@ -59,7 +56,7 @@ static irqreturn_t neo1973kbd_headphone_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--      int key_pressed = gpio_get_value(neo1973kbd_data->gpio_jack);
-+      int key_pressed = gpio_get_value(irq_to_gpio(irq));
-       input_report_switch(neo1973kbd_data->input,
-                           SW_HEADPHONE_INSERT, key_pressed);
-       input_sync(neo1973kbd_data->input);
-@@ -107,19 +104,15 @@ static int neo1973kbd_probe(struct platform_device *pdev)
-       if (pdev->resource[0].flags != 0)
-               return -EINVAL;
--      neo1973kbd->gpio_aux = pdev->resource[0].start;
--      neo1973kbd->gpio_hold = pdev->resource[1].start;
--      neo1973kbd->gpio_jack = pdev->resource[2].start;
--
--      irq_aux = gpio_to_irq(neo1973kbd->gpio_aux);
-+      irq_aux = gpio_to_irq(pdev->resource[0].start);
-       if (irq_aux < 0)
-               return -EINVAL;
--      irq_hold = gpio_to_irq(neo1973kbd->gpio_hold);
-+      irq_hold = gpio_to_irq(pdev->resource[1].start);
-       if (irq_hold < 0)
-               return -EINVAL;
--      irq_jack = gpio_to_irq(neo1973kbd->gpio_jack);
-+      irq_jack = gpio_to_irq(pdev->resource[2].start);
-       if (irq_jack < 0)
-               return -EINVAL;
-diff --git a/include/asm-arm/arch-s3c2410/gpio.h b/include/asm-arm/arch-s3c2410/gpio.h
-index 7583895..1b96c4e 100644
---- a/include/asm-arm/arch-s3c2410/gpio.h
-+++ b/include/asm-arm/arch-s3c2410/gpio.h
-@@ -61,8 +61,7 @@ static inline int gpio_direction_output(unsigned gpio, int value)
- #define gpio_to_irq(gpio)             s3c2400_gpio_getirq(gpio)
- #else
- #define gpio_to_irq(gpio)             s3c2410_gpio_getirq(gpio)
-+#define irq_to_gpio(irq)              s3c2410_irq_to_gpio(irq)
- #endif
--
--/* FIXME implement irq_to_gpio() */
--
- #endif
-+#include <asm-generic/gpio.h>
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1101-This-is-gta02-and-not-gta01.-Do-not-call-the-vibrato.patch b/target/linux/s3c24xx/patches-2.6.26/1101-This-is-gta02-and-not-gta01.-Do-not-call-the-vibrato.patch
deleted file mode 100755 (executable)
index 727e9bb..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-From f41615922ff8f847afde0872ba8edb0ad4054190 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:03 +0100
-Subject: [PATCH] This is gta02 and not gta01. Do not call the vibrator led.
-
-Signed-Off-by: Holger Freyther <zecke@openmoko.org>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   25 ++++++++++++-------------
- 1 files changed, 12 insertions(+), 13 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 3574375..bd2888a 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -67,7 +67,6 @@
- #include <asm/arch/spi-gpio.h>
- #include <asm/arch/usb-control.h>
--#include <asm/arch/gta01.h>
- #include <asm/arch/gta02.h>
- #include <asm/plat-s3c/regs-serial.h>
-@@ -855,17 +854,17 @@ static struct glamo_spigpio_info glamo_spigpio_cfg = {
-       .board_info     = gta02_spi_board_info,
- };
--static struct resource gta01_led_resources[] = {
-+static struct resource gta02_vibrator_resources[] = {
-       [0] = {
-               .start  = GTA02_GPIO_VIBRATOR_ON,
-               .end    = GTA02_GPIO_VIBRATOR_ON,
-       },
- };
--static struct platform_device gta01_led_dev = {
-+static struct platform_device gta02_vibrator_dev = {
-       .name           = "neo1973-vibrator",
--      .num_resources  = ARRAY_SIZE(gta01_led_resources),
--      .resource       = gta01_led_resources,
-+      .num_resources  = ARRAY_SIZE(gta02_vibrator_resources),
-+      .resource       = gta02_vibrator_resources,
- };
- /* SPI: Accelerometers attached to SPI of s3c244x */
-@@ -1090,7 +1089,7 @@ struct platform_device gta02_led_dev = {
-       .resource       = gta02_led_resources,
- };
--static struct resource gta01_button_resources[] = {
-+static struct resource gta02_button_resources[] = {
-       [0] = {
-               .start = GTA02_GPIO_AUX_KEY,
-               .end   = GTA02_GPIO_AUX_KEY,
-@@ -1105,13 +1104,13 @@ static struct resource gta01_button_resources[] = {
-       },
- };
--static struct platform_device gta01_button_dev = {
-+static struct platform_device gta02_button_dev = {
-       .name           = "neo1973-button",
--      .num_resources  = ARRAY_SIZE(gta01_button_resources),
--      .resource       = gta01_button_resources,
-+      .num_resources  = ARRAY_SIZE(gta02_button_resources),
-+      .resource       = gta02_button_resources,
- };
--static struct platform_device gta01_pm_gsm_dev = {
-+static struct platform_device gta02_pm_gsm_dev = {
-       .name           = "neo1973-pm-gsm",
- };
-@@ -1375,13 +1374,13 @@ static void __init gta02_machine_init(void)
-       platform_device_register(&gta02_glamo_dev);
-       platform_device_register(&s3c_device_spi_acc);
--      platform_device_register(&gta01_button_dev);
--      platform_device_register(&gta01_pm_gsm_dev);
-+      platform_device_register(&gta02_button_dev);
-+      platform_device_register(&gta02_pm_gsm_dev);
-       platform_device_register(&gta02_pm_usbhost_dev);
-       mangle_pmu_pdata_by_system_rev();
-       platform_device_register(&gta02_pmu_dev);
--      platform_device_register(&gta01_led_dev);
-+      platform_device_register(&gta02_vibrator_dev);
-       platform_device_register(&gta02_led_dev);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1102-Fix-spelling.-flaoting-floating.patch b/target/linux/s3c24xx/patches-2.6.26/1102-Fix-spelling.-flaoting-floating.patch
deleted file mode 100755 (executable)
index 697df10..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From c37e302d75871c3956a13d6a71a9c7c7de90d5b4 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:03 +0100
-Subject: [PATCH] Fix spelling. flaoting => floating
-
-Signed-Off-by: Holger Freyther <zecke@openmoko.org>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index 13cb45b..1123d7d 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -161,7 +161,7 @@ static int gta01_gsm_suspend(struct platform_device *pdev, pm_message_t state)
-       /* GPIO state is saved/restored by S3C2410 core GPIO driver, so we
-        * don't need to do anything here */
--      /* disable DL GSM to prevent jack_insert becoming flaoting */
-+      /* disable DL GSM to prevent jack_insert becoming floating */
-       if (machine_is_neo1973_gta02())
-               s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, 1);
-       return 0;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1103-Fix-the-firing-of-Jack-Interrupts-after-resume-whe.patch b/target/linux/s3c24xx/patches-2.6.26/1103-Fix-the-firing-of-Jack-Interrupts-after-resume-whe.patch
deleted file mode 100755 (executable)
index 8c474b8..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-From 081f2aa16800b186e0cfde52f41afa805a3d53c2 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:04 +0100
-Subject: [PATCH] Fix the firing of "Jack"-Interrupts after resume when the modem is powered on.
-
-GTA02_GPIO_nDL_GSM defaults to high/1. On resume do not enable the DL_GSM if
-it was not enabled before. This is stopping the storm of interrupts.
-
-Fix the logic in the download file handling. Downloads are disabled (0) when
-the GTA02_GPIO_nDL_GSM is high (1). To enable downloading set
-GTA02_GPIO_nDL_GSM to low (0, !on). Disable the jack interrupt while download
-the is active. When disabling download we will get a couple of jack interrupts
-but this is hardly avoidable.
-
-Avoid reading the GPIO value if we do not even have a console set.
-
-Signed-Off-by: Holger Freyther <zecke@openmoko.org>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |   35 +++++++++++++++++++++++--------
- 1 files changed, 26 insertions(+), 9 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index 1123d7d..b4ea8ba 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -17,8 +17,9 @@
- #include <linux/platform_device.h>
- #include <linux/console.h>
- #include <linux/errno.h>
-+#include <linux/interrupt.h>
--#include <asm/hardware.h>
-+#include <asm/gpio.h>
- #include <asm/mach-types.h>
- #include <asm/arch/gta01.h>
-@@ -30,6 +31,7 @@
- struct gta01pm_priv {
-       int gpio_ngsm_en;
-+        int gpio_ndl_gsm;
-       struct console *con;
- };
-@@ -68,7 +70,7 @@ static ssize_t gsm_read(struct device *dev, struct device_attribute *attr,
- #endif
- #ifdef CONFIG_MACH_NEO1973_GTA02
-               if (machine_is_neo1973_gta02())
--                      if (s3c2410_gpio_getpin(GTA02_GPIO_nDL_GSM))
-+                      if (!s3c2410_gpio_getpin(GTA02_GPIO_nDL_GSM))
-                               goto out_1;
- #endif
-       }
-@@ -143,8 +145,18 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-                       s3c2410_gpio_setpin(GTA01_GPIO_MODEM_DNLOAD, on);
- #endif
- #ifdef CONFIG_MACH_NEO1973_GTA02
--              if (machine_is_neo1973_gta02())
--                      s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, on);
-+              if (machine_is_neo1973_gta02()) {
-+                      /* FIXME: Layering violation, we know how this relates to
-+                       * the Jack-IRQ. And we assume the keyboard driver to be
-+                       * around. */
-+                      if (on)
-+                          disable_irq(gpio_to_irq(GTA02_GPIO_JACK_INSERT));
-+                      else
-+                          enable_irq(gpio_to_irq(GTA02_GPIO_JACK_INSERT));
-+
-+                      gta01_gsm.gpio_ndl_gsm = !on;
-+                      s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, !on);
-+              }
- #endif
-       }
-@@ -159,26 +171,29 @@ static DEVICE_ATTR(download, 0644, gsm_read, gsm_write);
- static int gta01_gsm_suspend(struct platform_device *pdev, pm_message_t state)
- {
-       /* GPIO state is saved/restored by S3C2410 core GPIO driver, so we
--       * don't need to do anything here */
-+       * don't need to do much here. */
-+
--      /* disable DL GSM to prevent jack_insert becoming floating */
-+      /* disable DL GSM to prevent jack_insert becoming 'floating' */
-       if (machine_is_neo1973_gta02())
-               s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, 1);
-+
-       return 0;
- }
- static int gta01_gsm_resume(struct platform_device *pdev)
- {
-       /* GPIO state is saved/restored by S3C2410 core GPIO driver, so we
--       * don't need to do anything here */
-+       * don't need to do much here. */
-       /* Make sure that the kernel console on the serial port is still
-        * disabled. FIXME: resume ordering race with serial driver! */
--      if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_ON) && gta01_gsm.con)
-+      if (gta01_gsm.con && s3c2410_gpio_getpin(GTA01_GPIO_MODEM_ON))
-               console_stop(gta01_gsm.con);
-       if (machine_is_neo1973_gta02())
--              s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, 0);
-+              s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, gta01_gsm.gpio_ndl_gsm);
-+
-       return 0;
- }
- #else
-@@ -248,6 +263,8 @@ static int __init gta01_gsm_probe(struct platform_device *pdev)
-       } else
-               gta01_gsm.con = NULL;
-+      gta01_gsm.gpio_ndl_gsm = 1;
-+
-       return sysfs_create_group(&pdev->dev.kobj, &gta01_gsm_attr_group);
- }
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1104-Enable-GPS-only-if-it-was-powered-on-before-suspendi.patch b/target/linux/s3c24xx/patches-2.6.26/1104-Enable-GPS-only-if-it-was-powered-on-before-suspendi.patch
deleted file mode 100755 (executable)
index b230c3b..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-From f44eb50db93450c790f398379215431fa9959511 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:04 +0100
-Subject: [PATCH] Enable GPS only if it was powered on before suspending the device
-
-    Similar to the neo1974_pm_gsm.c keep a static struct around. On suspend
-    we will save the current power state, on resume we will use this
-    information to enable power of the GPS only when it was powered on before.
-    This is passing basic tests with screen /dev/ttySAC1 on suspend and resume.
-
-    Only do this for the GTA02 as I don't have a gllin setup for the GTA01
-
-    I wonder why the suspend and resume code is not using gps_pwron_set and why
-    for the GTA02 we need to keep the state of the GPIOs, this should be done
-    by the s3c code.
-
-Signed-Off-by: Holger Frether <zecke@openmoko.org>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gps.c |   22 ++++++++++++++--------
- 1 files changed, 14 insertions(+), 8 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-index e8cfb96..b12f7bc 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-@@ -30,6 +30,12 @@
- #include <linux/pcf50633.h>
- #endif
-+struct neo1973_pm_gps_data {
-+      int power_was_on;
-+};
-+
-+static struct neo1973_pm_gps_data neo1973_gps;
-+
- /* This is the 2.8V supply for the RTC crystal, the mail clock crystal and
-  * the input to VDD_RF */
- static void gps_power_2v8_set(int on)
-@@ -266,8 +272,8 @@ static void gps_pwron_set(int on)
-               if (on)
-                       pcf50633_voltage_set(pcf50633_global,
-                               PCF50633_REGULATOR_LDO5, 3000);
--                      pcf50633_onoff_set(pcf50633_global,
--                              PCF50633_REGULATOR_LDO5, on);
-+              pcf50633_onoff_set(pcf50633_global,
-+                      PCF50633_REGULATOR_LDO5, on);
-       }
- #endif /* CONFIG_MACH_NEO1973_GTA02 */
- }
-@@ -476,6 +482,9 @@ static DEVICE_ATTR(power_sequence, 0644, power_sequence_read,
- static int gta01_pm_gps_suspend(struct platform_device *pdev,
-                               pm_message_t state)
- {
-+
-+      neo1973_gps.power_was_on = gps_pwron_get();
-+
- #ifdef CONFIG_MACH_NEO1973_GTA01
-       if (machine_is_neo1973_gta01()) {
-               /* FIXME */
-@@ -491,9 +500,7 @@ static int gta01_pm_gps_suspend(struct platform_device *pdev,
-               /* don't let RX from unpowered GPS float */
-               s3c2410_gpio_pullup(S3C2410_GPH5, 1);
--              /* FIXME */
--              pcf50633_onoff_set(pcf50633_global,
--                      PCF50633_REGULATOR_LDO5, 0);
-+              gps_pwron_set(0);
-       }
- #endif /* CONFIG_MACH_NEO1973_GTA02 */
-@@ -519,9 +526,8 @@ static int gta01_pm_gps_resume(struct platform_device *pdev)
-               /* remove pulldown now it won't be floating any more */
-               s3c2410_gpio_pullup(S3C2410_GPH5, 0);
--              /* FIXME */
--              pcf50633_onoff_set(pcf50633_global,
--                      PCF50633_REGULATOR_LDO5, 1);
-+              if (neo1973_gps.power_was_on)
-+                  gps_pwron_set(1);
- #endif /* CONFIG_MACH_NEO1973_GTA02 */
-       }
-       return 0;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1105-fix-wlan-disable.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1105-fix-wlan-disable.patch.patch
deleted file mode 100755 (executable)
index c4bf8d4..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-From 2d1fed81a5bac8db65fcfd9eabfb76d4c3deab31 Mon Sep 17 00:00:00 2001
-From: Sameo <sameo@openedhand.com>
-Date: Fri, 25 Jul 2008 23:06:04 +0100
-Subject: [PATCH] fix-wlan-disable.patch
-
-see
-http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=1288
----
- .../sdio/function/wlan/ar6000/ar6000/ar6000_drv.c  |    1 +
- .../sdio/function/wlan/ar6000/ar6000/ar6000_drv.h  |    1 +
- .../function/wlan/ar6000/ar6000/wireless_ext.c     |   19 +++++++++--
- .../sdio/function/wlan/ar6000/include/wmi_api.h    |    1 +
- drivers/sdio/function/wlan/ar6000/wmi/wmi.c        |   33 ++++++++++++++++++++
- 5 files changed, 52 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-index bb9ef55..d35f31c 100644
---- a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-@@ -704,6 +704,7 @@ ar6000_avail_ev(HTC_HANDLE HTCHandle)
-     ar->arHtcTarget          = HTCHandle;
-     ar->arHifDevice          = HTCGetHifDevice(HTCHandle);
-     ar->arWlanState          = WLAN_ENABLED;
-+    ar->arRadioSwitch        = WLAN_ENABLED;
-     ar->arDeviceIndex        = device_index;
-     A_INIT_TIMER(&ar->arHBChallengeResp.timer, ar6000_detect_error, dev);
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h
-index c7b6ec4..655288b 100644
---- a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h
-@@ -201,6 +201,7 @@ typedef struct ar6_softc {
-     A_BOOL                  arWmiEnabled;
-     A_BOOL                  arWmiReady;
-     A_BOOL                  arConnected;
-+    A_BOOL                  arRadioSwitch;
-     HTC_HANDLE              arHtcTarget;
-     void                    *arHifDevice;
-     spinlock_t              arLock;
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c b/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
-index d775e4d..db749e2 100644
---- a/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
-@@ -649,8 +649,16 @@ ar6000_ioctl_siwtxpow(struct net_device *dev,
-         return -EIO;
-     }
--    if (rrq->disabled) {
--        return -EOPNOTSUPP;
-+    if (ar->arRadioSwitch == WLAN_ENABLED
-+      && rrq->disabled) {
-+          if (wmi_switch_radio(ar->arWmi, WLAN_DISABLED) < 0)
-+                  return -EIO;
-+          ar->arRadioSwitch = WLAN_DISABLED;
-+    } else if (ar->arRadioSwitch == WLAN_DISABLED
-+             && !rrq->disabled) {
-+          if (wmi_switch_radio(ar->arWmi, WLAN_ENABLED) < 0)
-+                  return -EIO;
-+          ar->arRadioSwitch = WLAN_ENABLED;
-     }
-     if (rrq->fixed) {
-@@ -686,6 +694,11 @@ ar6000_ioctl_giwtxpow(struct net_device *dev,
-         return -EIO;
-     }
-+    if (ar->arRadioSwitch == WLAN_DISABLED) {
-+          rrq->disabled = 1;
-+          return 0;
-+    }
-+
-     if (down_interruptible(&ar->arSem)) {
-         return -ERESTARTSYS;
-     }
-@@ -1610,7 +1623,7 @@ ar6000_ioctl_giwrange(struct net_device *dev,
-     data->length = sizeof(struct iw_range);
-     A_MEMZERO(range, sizeof(struct iw_range));
--    range->txpower_capa = 0;
-+    range->txpower_capa = IW_TXPOW_DBM;
-     range->min_pmp = 1 * 1024;
-     range->max_pmp = 65535 * 1024;
-diff --git a/drivers/sdio/function/wlan/ar6000/include/wmi_api.h b/drivers/sdio/function/wlan/ar6000/include/wmi_api.h
-index aa9a9c6..267edfd 100644
---- a/drivers/sdio/function/wlan/ar6000/include/wmi_api.h
-+++ b/drivers/sdio/function/wlan/ar6000/include/wmi_api.h
-@@ -168,6 +168,7 @@ A_STATUS wmi_set_pmkid_list_cmd(struct wmi_t *wmip,
-                                 WMI_SET_PMKID_LIST_CMD *pmkInfo);
- A_STATUS wmi_set_txPwr_cmd(struct wmi_t *wmip, A_UINT8 dbM);
- A_STATUS wmi_get_txPwr_cmd(struct wmi_t *wmip);
-+A_STATUS wmi_switch_radio(struct wmi_t *wmip, A_UINT8 on);
- A_STATUS wmi_addBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex, A_UINT8 *bssid);
- A_STATUS wmi_deleteBadAp_cmd(struct wmi_t *wmip, A_UINT8 apIndex);
- A_STATUS wmi_set_tkip_countermeasures_cmd(struct wmi_t *wmip, A_BOOL en);
-diff --git a/drivers/sdio/function/wlan/ar6000/wmi/wmi.c b/drivers/sdio/function/wlan/ar6000/wmi/wmi.c
-index 0e0e6ba..d322cf3 100644
---- a/drivers/sdio/function/wlan/ar6000/wmi/wmi.c
-+++ b/drivers/sdio/function/wlan/ar6000/wmi/wmi.c
-@@ -2990,6 +2990,39 @@ wmi_get_txPwr_cmd(struct wmi_t *wmip)
-     return (wmi_cmd_send(wmip, osbuf, WMI_GET_TX_PWR_CMDID, NO_SYNC_WMIFLAG));
- }
-+A_STATUS
-+wmi_switch_radio(struct wmi_t *wmip, A_UINT8 on)
-+{
-+      WMI_SCAN_PARAMS_CMD scParams = {0, 0, 0, 0, 0,
-+                                      WMI_SHORTSCANRATIO_DEFAULT,
-+                                      DEFAULT_SCAN_CTRL_FLAGS,
-+                                      0};
-+
-+      if (on) {
-+              /* Enable foreground scanning */
-+                if (wmi_scanparams_cmd(wmip, scParams.fg_start_period,
-+                                       scParams.fg_end_period,
-+                                       scParams.bg_period,
-+                                       scParams.minact_chdwell_time,
-+                                       scParams.maxact_chdwell_time,
-+                                       scParams.pas_chdwell_time,
-+                                       scParams.shortScanRatio,
-+                                       scParams.scanCtrlFlags,
-+                                       scParams.max_dfsch_act_time) != A_OK) {
-+                      return -EIO;
-+              }
-+      } else {
-+              wmi_disconnect_cmd(wmip);
-+              if (wmi_scanparams_cmd(wmip, 0xFFFF, 0, 0, 0,
-+                                     0, 0, 0, 0xFF, 0) != A_OK) {
-+                      return -EIO;
-+              }
-+      }
-+
-+      return A_OK;
-+}
-+
-+
- A_UINT16
- wmi_get_mapped_qos_queue(struct wmi_t *wmip, A_UINT8 trafficClass)
- {
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1106-defconfig-audio.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1106-defconfig-audio.patch.patch
deleted file mode 100755 (executable)
index 803ee2f..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From 312994ec67428f3e2d6692b1377d87cc270b59f8 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Fri, 25 Jul 2008 23:06:04 +0100
-Subject: [PATCH] defconfig-audio.patch
- Add in some audio config needed
- Signed-off-by: Andy Green <andy@openmoko.com>
-
----
- defconfig-2.6.24 |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index cce3737..4df10bf 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
- # Linux kernel version: 2.6.24
--# Fri Feb 22 22:38:48 2008
-+# Sat Mar  1 11:36:29 2008
- #
- CONFIG_ARM=y
- CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-@@ -285,6 +285,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
- CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
- # CONFIG_XIP_KERNEL is not set
- CONFIG_KEXEC=y
-+CONFIG_ATAGS_PROC=y
- #
- # Floating point emulation
-@@ -1273,7 +1274,7 @@ CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=y
- #
- # SoC Audio support for SuperH
- #
--CONFIG_SND_SOC_WM8753=m
-+CONFIG_SND_SOC_WM8753=y
- #
- # Open Sound System
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1107-fix-gsm-download-irq-balance-issue.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1107-fix-gsm-download-irq-balance-issue.patch.patch
deleted file mode 100755 (executable)
index eb74929..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-From 95f161a3dc8b50ee354f5d9cd3785d3522bc1bb5 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:04 +0100
-Subject: [PATCH] fix-gsm-download-irq-balance-issue.patch
-
-Only enable or disable the interrupt if we see we are in the opposing state.
-Also force that damn GSM download signal deasserted on probe at the time we
-set the logical state for it to deasserted.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |   28 +++++++++++++++++++++-------
- 1 files changed, 21 insertions(+), 7 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index b4ea8ba..c3292b8 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -146,13 +146,24 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
- #endif
- #ifdef CONFIG_MACH_NEO1973_GTA02
-               if (machine_is_neo1973_gta02()) {
--                      /* FIXME: Layering violation, we know how this relates to
--                       * the Jack-IRQ. And we assume the keyboard driver to be
--                       * around. */
--                      if (on)
--                          disable_irq(gpio_to_irq(GTA02_GPIO_JACK_INSERT));
--                      else
--                          enable_irq(gpio_to_irq(GTA02_GPIO_JACK_INSERT));
-+                      /*
-+                       * the keyboard / buttons driver requests and enables
-+                       * the JACK_INSERT IRQ.  We have to take care about
-+                       * not enabling and disabling the IRQ when it was
-+                       * already in that state or we get "unblanaced IRQ"
-+                       * kernel warnings and stack dumps.  So we use the
-+                       * copy of the ndl_gsm state to figure out if we should
-+                       * enable or disable the jack interrupt
-+                       */
-+                      if (on) {
-+                              if (gta01_gsm.gpio_ndl_gsm)
-+                                      disable_irq(gpio_to_irq(
-+                                                     GTA02_GPIO_JACK_INSERT));
-+                      } else {
-+                              if (!gta01_gsm.gpio_ndl_gsm)
-+                                      enable_irq(gpio_to_irq(
-+                                                     GTA02_GPIO_JACK_INSERT));
-+                      }
-                       gta01_gsm.gpio_ndl_gsm = !on;
-                       s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, !on);
-@@ -263,7 +274,10 @@ static int __init gta01_gsm_probe(struct platform_device *pdev)
-       } else
-               gta01_gsm.con = NULL;
-+      /* note that download initially disabled, and enforce that */
-       gta01_gsm.gpio_ndl_gsm = 1;
-+      if (machine_is_neo1973_gta02())
-+              s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, 1);
-       return sysfs_create_group(&pdev->dev.kobj, &gta01_gsm_attr_group);
- }
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1108-fix-glamofb-cmdqueue-timeout.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1108-fix-glamofb-cmdqueue-timeout.patch.patch
deleted file mode 100755 (executable)
index 2eb3f46..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-From 4ff23f7fca984270079de89abaca26e299a97b82 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:04 +0100
-Subject: [PATCH] fix-glamofb-cmdqueue-timeout.patch
-
-loglevl=9 can cause failure to init glamo-fb
-problem seems to be too low timeout when text scrolling can
-delay commandqueue going empty
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-fb.c |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c
-index f0d7600..87c7420 100644
---- a/drivers/mfd/glamo/glamo-fb.c
-+++ b/drivers/mfd/glamo/glamo-fb.c
-@@ -548,12 +548,13 @@ static int glamofb_cursor(struct fb_info *info, struct fb_cursor *cursor)
- static inline int glamofb_cmdq_empty(struct glamofb_handle *gfb)
- {
-+      /* DGCMdQempty -- 1 == command queue is empty */
-       return reg_read(gfb, GLAMO_REG_LCD_STATUS1) & (1 << 15);
- }
- void glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
- {
--      int timeout = 2000;
-+      int timeout = 20000;
-       dev_dbg(gfb->dev, "glamofb_cmd_mode(gfb=%p, on=%d)\n", gfb, on);
-       if (on) {
-@@ -605,7 +606,7 @@ EXPORT_SYMBOL_GPL(glamofb_cmd_mode);
- int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val)
- {
--      int timeout = 2000;
-+      int timeout = 20000;
-       dev_dbg(gfb->dev, "%s: waiting for cmdq empty\n",
-               __FUNCTION__);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1109-fix-glamofb-cmd-mode-locking.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1109-fix-glamofb-cmd-mode-locking.patch.patch
deleted file mode 100755 (executable)
index 851eab0..0000000
+++ /dev/null
@@ -1,320 +0,0 @@
-From 863d980d4392041b36edd53b248ae7709609325d Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:04 +0100
-Subject: [PATCH] fix-glamofb-cmd-mode-locking.patch
-
-Glamo "cmd mode" is modal, but nothing took care about locking.
-Also cmd mode was entered recursively in rotate_lcd().
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-core.c |    2 +-
- drivers/mfd/glamo/glamo-fb.c   |  106 +++++++++++++++++++++++++--------------
- include/linux/glamofb.h        |    2 +-
- 3 files changed, 70 insertions(+), 40 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index accd933..19ca363 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -588,7 +588,7 @@ int glamo_engine_reclock(struct glamo_core *glamo,
-       if (val) {
-               val--;
-               reg_set_bit_mask(glamo, reg, mask, val);
--              msleep(5); /* wait some time to stabilize */
-+              mdelay(5); /* wait some time to stabilize */
-               return 0;
-       } else {
-diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c
-index 87c7420..8633e44 100644
---- a/drivers/mfd/glamo/glamo-fb.c
-+++ b/drivers/mfd/glamo/glamo-fb.c
-@@ -36,6 +36,7 @@
- #include <linux/wait.h>
- #include <linux/platform_device.h>
- #include <linux/clk.h>
-+#include <linux/spinlock.h>
- #include <asm/io.h>
- #include <asm/uaccess.h>
-@@ -50,7 +51,7 @@
- #include "glamo-regs.h"
- #include "glamo-core.h"
--#ifdef DEBUG
-+#ifndef DEBUG
- #define GLAMO_LOG(...)
- #else
- #define GLAMO_LOG(...) \
-@@ -72,6 +73,7 @@ struct glamofb_handle {
-       struct glamofb_platform_data *mach_info;
-       char __iomem *cursor_addr;
-       u_int32_t pseudo_pal[16];
-+      spinlock_t lock_cmd;
- };
- /* 'sibling' spi device for lcm init */
-@@ -237,6 +239,7 @@ static void rotate_lcd(struct glamofb_handle *glamo,
-                        __u32 rotation)
- {
-       int glamo_rot;
-+      unsigned long flags;
-       switch (rotation) {
-               case FB_ROTATE_UR:
-@@ -255,7 +258,15 @@ static void rotate_lcd(struct glamofb_handle *glamo,
-                       glamo_rot = GLAMO_LCD_ROT_MODE_0;
-                       break;
-       }
--      glamofb_cmd_mode(glamo, 1);
-+
-+      /*
-+       * ha ha we are only called when we are in cmd mode already
-+       * printk(KERN_ERR"rotate_lcd spin_lock_irqsave\n");
-+       * spin_lock_irqsave(&glamo->lock_cmd, flags);
-+       *
-+       * if (glamofb_cmd_mode(glamo, 1))
-+       *              goto out_unlock;
-+       */
-       reg_set_bit_mask(glamo,
-                        GLAMO_REG_LCD_WIDTH,
-                        GLAMO_LCD_ROT_MODE_MASK,
-@@ -265,17 +276,19 @@ static void rotate_lcd(struct glamofb_handle *glamo,
-                        GLAMO_LCD_MODE1_ROTATE_EN,
-                        (glamo_rot != GLAMO_LCD_ROT_MODE_0)?
-                                GLAMO_LCD_MODE1_ROTATE_EN : 0);
--      glamofb_cmd_mode(glamo, 0);
-+/*    glamofb_cmd_mode(glamo, 0);
-+
-+out_unlock:
-+      printk(KERN_ERR"rotate_lcd spin_unlock_irqrestore\n");
-+      spin_unlock_irqrestore(&glamo->lock_cmd, flags);
-+*/
- }
- static enum orientation get_orientation(struct fb_var_screeninfo *var)
- {
--      GLAMO_LOG("mark\n")
--      if (var->xres <= var->yres) {
--              GLAMO_LOG("portrait\n")
-+      if (var->xres <= var->yres)
-               return ORIENTATION_PORTRAIT;
--      }
--      GLAMO_LOG("landscape\n")
-+
-       return ORIENTATION_LANDSCAPE;
- }
-@@ -299,12 +312,18 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
-                                         struct fb_var_screeninfo *var)
- {
-       int sync, bp, disp, fp, total, xres, yres, pitch, orientation_changing;
-+      unsigned long flags;
--      GLAMO_LOG("enter: glamo:%#x, var:%#x\n", (unsigned)glamo, (unsigned)var);
-+/*    GLAMO_LOG("enter: glamo:%#x, var:%#x\n", (unsigned)glamo, (unsigned)var);
-+*/
-       if (!glamo || !var)
-               return;
--      glamofb_cmd_mode(glamo, 1);
-+      printk(KERN_ERR"glamofb_update_lcd_controller spin_lock_irqsave\n");
-+      spin_lock_irqsave(&glamo->lock_cmd, flags);
-+
-+      if (glamofb_cmd_mode(glamo, 1))
-+              goto out_unlock;
-       if (var->pixclock)
-               glamo_engine_reclock(glamo->mach_info->glamo,
-@@ -313,14 +332,14 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
-       xres = var->xres;
-       yres = var->yres;
--      GLAMO_LOG("xres:%d, yres:%d, rotate:%d\n", xres, yres, var->rotate);
--
-+/*    GLAMO_LOG("xres:%d, yres:%d, rotate:%d\n", xres, yres, var->rotate);
-+*/
-       /*
-        * figure out if orientation is going to change
-        */
-       orientation_changing = will_orientation_change(var);
--      GLAMO_LOG("orientation_changing:%d\n", orientation_changing);
--
-+/*    GLAMO_LOG("orientation_changing:%d\n", orientation_changing);
-+*/
-         /*
-          * adjust the pitch according to new orientation to come
-          */
-@@ -329,8 +348,8 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
-         } else {
-               pitch = var->xres * var->bits_per_pixel / 8;
-         }
--      GLAMO_LOG("pitch:%d\n", pitch);
--
-+/*    GLAMO_LOG("pitch:%d\n", pitch);
-+*/
-       /*
-        * set the awaiten LCD geometry
-        */
-@@ -347,7 +366,7 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
-                        GLAMO_LCD_PITCH_MASK,
-                        pitch);
--      GLAMO_LOG("mark:\n");
-+/*    GLAMO_LOG("mark:\n");*/
-       /*
-        * honour the rotation request
-        */
-@@ -365,7 +384,8 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
-               var->yres_virtual = var->yres = yres;
-       }
--      GLAMO_LOG("reported res:(%d,%d)\n", var->xres, var->yres);
-+/*    GLAMO_LOG("reported res:(%d,%d)\n", var->xres, var->yres);
-+*/
-       /*
-        * update scannout timings
-        */
-@@ -386,8 +406,8 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
-       reg_set_bit_mask(glamo, GLAMO_REG_LCD_HORIZ_DISP_END,
-                        GLAMO_LCD_HV_RETR_DISP_END_MASK, fp);
--      GLAMO_LOG("mark:\n");
--
-+/*    GLAMO_LOG("mark:\n");
-+*/
-       sync = 0;
-       bp = sync + var->vsync_len;
-       disp = bp + var->upper_margin;
-@@ -405,10 +425,13 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo,
-       reg_set_bit_mask(glamo, GLAMO_REG_LCD_VERT_DISP_END,
-                        GLAMO_LCD_HV_RETR_DISP_END_MASK, fp);
--      GLAMO_LOG("mark:\n");
-+/*    GLAMO_LOG("mark:\n"); */
-       glamofb_cmd_mode(glamo, 0);
--      GLAMO_LOG("leave:\n");
-+/*    GLAMO_LOG("leave:\n"); */
-+out_unlock:
-+      printk(KERN_ERR"glamofb_update_lcd_controller spin_unlock_irqrestore\n");
-+      spin_unlock_irqrestore(&glamo->lock_cmd, flags);
- }
- static int glamofb_set_par(struct fb_info *info)
-@@ -552,23 +575,25 @@ static inline int glamofb_cmdq_empty(struct glamofb_handle *gfb)
-       return reg_read(gfb, GLAMO_REG_LCD_STATUS1) & (1 << 15);
- }
--void glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
-+/* call holding gfb->lock_cmd  when locking, until you unlock */
-+
-+int glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
- {
--      int timeout = 20000;
-+      int timeout = 200000;
--      dev_dbg(gfb->dev, "glamofb_cmd_mode(gfb=%p, on=%d)\n", gfb, on);
-+/*    dev_dbg(gfb->dev, "glamofb_cmd_mode(gfb=%p, on=%d)\n", gfb, on); */
-       if (on) {
--              dev_dbg(gfb->dev, "%s: waiting for cmdq empty: ",
--                      __FUNCTION__);
-+/*            dev_dbg(gfb->dev, "%s: waiting for cmdq empty: ",
-+                      __FUNCTION__); */
-               while ((!glamofb_cmdq_empty(gfb)) && (timeout--))
-                       yield();
-               if (timeout < 0) {
-                       printk(KERN_ERR"*************"
-                                      "glamofb cmd_queue never got empty"
-                                      "*************\n");
--                      return;
-+                      return -EIO;
-               }
--              dev_dbg(gfb->dev, "empty!\n");
-+/*            dev_dbg(gfb->dev, "empty!\n"); */
-               /* display the entire frame then switch to command */
-               reg_write(gfb, GLAMO_REG_LCD_COMMAND1,
-@@ -576,8 +601,8 @@ void glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
-                         GLAMO_LCD_CMD_DATA_FIRE_VSYNC);
-               /* wait until LCD is idle */
--              dev_dbg(gfb->dev, "waiting for LCD idle: ");
--              timeout = 2000;
-+/*            dev_dbg(gfb->dev, "waiting for LCD idle: "); */
-+              timeout = 200000;
-               while ((!reg_read(gfb, GLAMO_REG_LCD_STATUS2) & (1 << 12)) &&
-                     (timeout--))
-                       yield();
-@@ -585,11 +610,11 @@ void glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
-                       printk(KERN_ERR"*************"
-                                      "glamofb lcd never idle"
-                                      "*************\n");
--                      return;
-+                      return -EIO;
-               }
--              dev_dbg(gfb->dev, "idle!\n");
-+/*            dev_dbg(gfb->dev, "idle!\n"); */
--              msleep(90);
-+              mdelay(100);
-       } else {
-               /* RGB interface needs vsync/hsync */
-               if (reg_read(gfb, GLAMO_REG_LCD_MODE3) & GLAMO_LCD_MODE3_RGB)
-@@ -601,15 +626,17 @@ void glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
-                         GLAMO_LCD_CMD_TYPE_DISP |
-                         GLAMO_LCD_CMD_DATA_DISP_FIRE);
-       }
-+
-+      return 0;
- }
- EXPORT_SYMBOL_GPL(glamofb_cmd_mode);
- int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val)
- {
--      int timeout = 20000;
-+      int timeout = 200000;
--      dev_dbg(gfb->dev, "%s: waiting for cmdq empty\n",
--              __FUNCTION__);
-+/*    dev_dbg(gfb->dev, "%s: waiting for cmdq empty\n",
-+              __FUNCTION__); */
-       while ((!glamofb_cmdq_empty(gfb)) && (timeout--))
-               yield();
-       if (timeout < 0) {
-@@ -618,7 +645,7 @@ int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val)
-                               "*************\n");
-               return 1;
-       }
--      dev_dbg(gfb->dev, "idle, writing 0x%04x\n", val);
-+/*    dev_dbg(gfb->dev, "idle, writing 0x%04x\n", val); */
-       reg_write(gfb, GLAMO_REG_LCD_COMMAND1, val);
-@@ -758,6 +785,9 @@ static int __init glamofb_probe(struct platform_device *pdev)
-       glamo_engine_enable(mach_info->glamo, GLAMO_ENGINE_LCD);
-       glamo_engine_reset(mach_info->glamo, GLAMO_ENGINE_LCD);
-+
-+      printk(KERN_ERR"spin_lock_init\n");
-+      spin_lock_init(&glamofb->lock_cmd);
-       glamofb_init_regs(glamofb);
-       rc = register_framebuffer(fbinfo);
-diff --git a/include/linux/glamofb.h b/include/linux/glamofb.h
-index 75eefef..51bf593 100644
---- a/include/linux/glamofb.h
-+++ b/include/linux/glamofb.h
-@@ -33,7 +33,7 @@ struct glamofb_platform_data {
-       int             (*glamo_irq_is_wired)(void);
- };
--void glamofb_cmd_mode(struct glamofb_handle *gfb, int on);
-+int glamofb_cmd_mode(struct glamofb_handle *gfb, int on);
- int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val);
- void glamo_lcm_reset(int level);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1110-debug-glamo-add-lcd-regs-to-dump.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1110-debug-glamo-add-lcd-regs-to-dump.patch.patch
deleted file mode 100755 (executable)
index a77816b..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-From b125a98964db82b9d69f683f6b887422a55f0124 Mon Sep 17 00:00:00 2001
-From: warmcat <andy@warmcat.com>
-Date: Fri, 25 Jul 2008 23:06:04 +0100
-Subject: [PATCH] debug-glamo-add-lcd-regs-to-dump.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-core.c |   11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index 19ca363..ab90690 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -1012,14 +1012,16 @@ static ssize_t regs_read(struct device *dev, struct device_attribute *attr,
-               char * name;
-       };
-       struct reg_range reg_range[] = {
--              { 0x0000, 0x200, "General" },
-+/*            { 0x0000, 0x200, "General" },
-               { 0x0200, 0x100, "Host Bus" },
-               { 0x0300, 0x100, "Memory" },
--/*            { 0x0400, 0x100, "Sensor" },
-+              { 0x0400, 0x100, "Sensor" },
-               { 0x0500, 0x300, "ISP" },
-               { 0x0800, 0x400, "JPEG" },
-               { 0x0c00, 0x500, "MPEG" },
-+*/
-               { 0x1100, 0x400, "LCD" },
-+/*
-               { 0x1500, 0x080, "MPU 0" },
-               { 0x1580, 0x080, "MPU 1" },
-               { 0x1600, 0x080, "Command Queue" },
-@@ -1037,8 +1039,7 @@ static ssize_t regs_read(struct device *dev, struct device_attribute *attr,
-               for (n = reg_range[r].start;
-                    n < reg_range[r].start + reg_range[r].count; n += 2) {
-                       if (((n1++) & 7) == 0)
--                              end += sprintf(end, "\n%04X:  ",
--                                             n + reg_range[r].start);
-+                              end += sprintf(end, "\n%04X:  ", n);
-                       end += sprintf(end, "%04x ", __reg_read(glamo, n));
-               }
-               end += sprintf(end, "\n");
-@@ -1098,7 +1099,7 @@ static int __init glamo_probe(struct platform_device *pdev)
-       platform_device_register(&glamo_core_dev);
- #endif
-       /* only remap the generic, hostbus and memory controller registers */
--      glamo->base = ioremap(glamo->mem->start, GLAMO_REGOFS_VIDCAP);
-+      glamo->base = ioremap(glamo->mem->start, 0x4000 /*GLAMO_REGOFS_VIDCAP*/);
-       if (!glamo->base) {
-               dev_err(&pdev->dev, "failed to ioremap() memory region\n");
-               goto out_free;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1111-fix-jack-debounce.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1111-fix-jack-debounce.patch.patch
deleted file mode 100755 (executable)
index 419bfd2..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-From 4c83444bd41a70fe47731e589c6575da2bfc78c8 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:05 +0100
-Subject: [PATCH] fix-jack-debounce.patch
-
-Headphone jack detection is bouncy, it can trigger multiple interrupts
-on insertion or removal.  This patch adds a workqueue that waits out the
-interrupt spew in 100ms units, and if it sees no more interrupts for 100ms
-only then samples and reports the jack state.  I was unable to get a bounce
-after 20 or so tries after this.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/input/keyboard/neo1973kbd.c |   63 ++++++++++++++++++++++++++++++++--
- 1 files changed, 59 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-index 06fa8e0..6c96660 100644
---- a/drivers/input/keyboard/neo1973kbd.c
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -21,6 +21,7 @@
- #include <linux/jiffies.h>
- #include <linux/module.h>
- #include <linux/slab.h>
-+#include <linux/workqueue.h>
- #include <asm/gpio.h>
- #include <asm/mach-types.h>
-@@ -28,6 +29,11 @@
- struct neo1973kbd {
-       struct input_dev *input;
-       unsigned int suspended;
-+      struct work_struct work;
-+      int work_in_progress;
-+      int hp_irq_count_in_work;
-+      int hp_irq_count;
-+      int jack_irq;
- };
- static irqreturn_t neo1973kbd_aux_irq(int irq, void *dev_id)
-@@ -52,14 +58,61 @@ static irqreturn_t neo1973kbd_hold_irq(int irq, void *dev_id)
-       return IRQ_HANDLED;
- }
-+
-+static void neo1973kbd_debounce_jack(struct work_struct *work)
-+{
-+      struct neo1973kbd *kbd = container_of(work, struct neo1973kbd, work);
-+
-+      /* we wait out any multiple interrupt stuttering in 100ms lumps */
-+
-+      do {
-+              kbd->hp_irq_count_in_work = kbd->hp_irq_count;
-+              msleep(100);
-+      } while (kbd->hp_irq_count != kbd->hp_irq_count_in_work);
-+
-+      /* no new interrupts on jack for 100ms... ok we will report it */
-+
-+      input_report_switch(kbd->input,
-+                          SW_HEADPHONE_INSERT,
-+                          gpio_get_value(irq_to_gpio(kbd->jack_irq)));
-+      input_sync(kbd->input);
-+
-+      /* next time we get an interrupt on jack we need new work action */
-+      kbd->work_in_progress = 0;
-+}
-+
-+
-+
- static irqreturn_t neo1973kbd_headphone_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--      int key_pressed = gpio_get_value(irq_to_gpio(irq));
--      input_report_switch(neo1973kbd_data->input,
--                          SW_HEADPHONE_INSERT, key_pressed);
--      input_sync(neo1973kbd_data->input);
-+      /*
-+       * this interrupt is prone to bouncing and userspace doesn't like
-+       * to have to deal with that kind of thing.  So we do not accept
-+       * that a jack interrupt is equal to a jack event.  Instead we fire
-+       * some work on the first interrupt, and it hangs about in 100ms units
-+       * until no more interrupts come.  Then it accepts the state it finds
-+       * for jack insert and reports it once
-+       */
-+
-+      neo1973kbd_data->hp_irq_count++;
-+      /*
-+       * the first interrupt we see for a while, we fire the work item
-+       * and record the interrupt count when we did that.  If more interrupts
-+       * come in the meanwhile, we can tell by the difference in that
-+       * stored count and hp_irq_count which increments every interrupt
-+       */
-+      if (!neo1973kbd_data->work_in_progress) {
-+              neo1973kbd_data->jack_irq = irq;
-+              neo1973kbd_data->hp_irq_count_in_work =
-+                                              neo1973kbd_data->hp_irq_count;
-+              if (!schedule_work(&neo1973kbd_data->work))
-+                      printk(KERN_ERR
-+                              "Unable to schedule headphone debounce\n");
-+              else
-+                      neo1973kbd_data->work_in_progress = 1;
-+      }
-       return IRQ_HANDLED;
- }
-@@ -120,6 +173,8 @@ static int neo1973kbd_probe(struct platform_device *pdev)
-       neo1973kbd->input = input_dev;
-+      INIT_WORK(&neo1973kbd->work, neo1973kbd_debounce_jack);
-+
-       input_dev->name = "Neo1973 Buttons";
-       input_dev->phys = "neo1973kbd/input0";
-       input_dev->id.bustype = BUS_HOST;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1112-OpenMoko-Openmoko.patch b/target/linux/s3c24xx/patches-2.6.26/1112-OpenMoko-Openmoko.patch
deleted file mode 100755 (executable)
index 39296c3..0000000
+++ /dev/null
@@ -1,524 +0,0 @@
-From 2ffd2dab18cc5b69aec914c15f44c6343cfe38df Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:05 +0100
-Subject: [PATCH] OpenMoko => Openmoko
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- arch/arm/mach-s3c2410/mach-gta01.c       |    2 +-
- arch/arm/mach-s3c2410/mach-qt2410.c      |    2 +-
- arch/arm/mach-s3c2410/pwm.c              |    2 +-
- arch/arm/mach-s3c2440/Kconfig            |    2 +-
- arch/arm/mach-s3c2440/mach-gta02.c       |    2 +-
- arch/arm/plat-s3c24xx/neo1973_pm_bt.c    |    2 +-
- arch/arm/plat-s3c24xx/neo1973_pm_gps.c   |    2 +-
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c   |    2 +-
- arch/arm/plat-s3c24xx/neo1973_pm_host.c  |    2 +-
- arch/arm/plat-s3c24xx/neo1973_version.c  |    2 +-
- build                                    |    2 +-
- drivers/i2c/chips/pcf50606.c             |    2 +-
- drivers/i2c/chips/pcf50606.h             |    2 +-
- drivers/i2c/chips/pcf50633.c             |    2 +-
- drivers/i2c/chips/pcf50633.h             |    2 +-
- drivers/input/keyboard/neo1973kbd.c      |    2 +-
- drivers/input/keyboard/qt2410kbd.c       |    2 +-
- drivers/input/misc/lis302dl.c            |    2 +-
- drivers/leds/leds-neo1973-gta02.c        |    2 +-
- drivers/leds/leds-neo1973-vibrator.c     |    2 +-
- drivers/mfd/glamo/Kconfig                |    2 +-
- drivers/mfd/glamo/glamo-core.c           |    2 +-
- drivers/mfd/glamo/glamo-fb.c             |    4 ++--
- drivers/mfd/glamo/glamo-lcm-spi.c        |    2 +-
- drivers/mfd/glamo/glamo-mci.c            |    4 ++--
- drivers/mfd/glamo/glamo-mci.h            |    2 +-
- drivers/mfd/glamo/glamo-regs.h           |    2 +-
- drivers/mfd/glamo/glamo-spi-gpio.c       |    2 +-
- drivers/power/gta02_hdq.c                |    2 +-
- drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c   |    2 +-
- drivers/video/backlight/gta01_bl.c       |    2 +-
- drivers/video/display/Kconfig            |    2 +-
- drivers/video/display/jbt6k74.c          |    2 +-
- drivers/video/logo/Kconfig               |    2 +-
- drivers/video/logo/logo.c                |    2 +-
- sound/soc/s3c24xx/neo1973_gta02_wm8753.c |    2 +-
- 36 files changed, 38 insertions(+), 38 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index 0543daa..8c1a402 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -3,7 +3,7 @@
-  *
-  * S3C2410 Machine Support for the FIC Neo1973 GTA01
-  *
-- * Copyright (C) 2006-2007 by OpenMoko, Inc.
-+ * Copyright (C) 2006-2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c
-index daf94cd..f446996 100644
---- a/arch/arm/mach-s3c2410/mach-qt2410.c
-+++ b/arch/arm/mach-s3c2410/mach-qt2410.c
-@@ -1,6 +1,6 @@
- /* linux/arch/arm/mach-s3c2410/mach-qt2410.c
-  *
-- * Copyright (C) 2006 by OpenMoko, Inc.
-+ * Copyright (C) 2006 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/arch/arm/mach-s3c2410/pwm.c b/arch/arm/mach-s3c2410/pwm.c
-index 8a07359..23738c1 100644
---- a/arch/arm/mach-s3c2410/pwm.c
-+++ b/arch/arm/mach-s3c2410/pwm.c
-@@ -2,7 +2,7 @@
-  * arch/arm/mach-s3c2410/3c2410-pwm.c
-  *
-  * Copyright (c) by Javi Roman <javiroman@kernel-labs.org>
-- *             for the OpenMoko Project.
-+ *             for the Openmoko Project.
-  *
-  *     S3C2410A SoC PWM support
-  *
-diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
-index b417f8e..3e9e9f1 100644
---- a/arch/arm/mach-s3c2440/Kconfig
-+++ b/arch/arm/mach-s3c2440/Kconfig
-@@ -90,7 +90,7 @@ config NEO1973_GTA02_2440
-       select CPU_S3C2440
-       help
-          Say Y here if you are using an early hardware revision
--         of the FIC/OpenMoko Neo1973 GTA02 GSM Phone.
-+         of the FIC/Openmoko Neo1973 GTA02 GSM Phone.
- endmenu
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index bd2888a..f9e00d5 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -3,7 +3,7 @@
-  *
-  * S3C2440 Machine Support for the FIC GTA02 (Neo1973)
-  *
-- * Copyright (C) 2006-2007 by OpenMoko, Inc.
-+ * Copyright (C) 2006-2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-index 8f5be88..a9694b4 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-@@ -1,7 +1,7 @@
- /*
-  * Bluetooth PM code for the FIC Neo1973 GSM Phone
-  *
-- * (C) 2007 by OpenMoko Inc.
-+ * (C) 2007 by Openmoko Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-index b12f7bc..d882f7b 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-@@ -1,7 +1,7 @@
- /*
-  * GPS Power Management code for the FIC Neo1973 GSM Phone
-  *
-- * (C) 2007 by OpenMoko Inc.
-+ * (C) 2007 by Openmoko Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index c3292b8..f22cad8 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -1,7 +1,7 @@
- /*
-  * GSM Management code for the FIC Neo1973 GSM Phone
-  *
-- * (C) 2007 by OpenMoko Inc.
-+ * (C) 2007 by Openmoko Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_host.c b/arch/arm/plat-s3c24xx/neo1973_pm_host.c
-index 4eae341..8aee609 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_host.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_host.c
-@@ -1,7 +1,7 @@
- /*
-  * Bluetooth PM code for the FIC Neo1973 GSM Phone
-  *
-- * (C) 2007 by OpenMoko Inc.
-+ * (C) 2007 by Openmoko Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/arch/arm/plat-s3c24xx/neo1973_version.c b/arch/arm/plat-s3c24xx/neo1973_version.c
-index ad41a0f..ab4805b 100644
---- a/arch/arm/plat-s3c24xx/neo1973_version.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_version.c
-@@ -1,7 +1,7 @@
- /*
-  * PCB version sysfs for the FIC Neo1973 GSM Phone
-  *
-- * (C) 2007 by OpenMoko Inc.
-+ * (C) 2007 by Openmoko Inc.
-  * Author: Andy Green <andy@openmoko.com>
-  * All rights reserved.
-  *
-diff --git a/build b/build
-index 7e61ea2..5bd3d2d 100755
---- a/build
-+++ b/build
-@@ -6,7 +6,7 @@ export CROSS_COMPILE=../../cross/bin/arm-angstrom-linux-gnueabi-
- make ARCH=arm silentoldconfig
- if make -j5 ARCH=arm; then
-       ${CROSS_COMPILE}objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux linux.bin
--      mkimage -A arm -O linux -T kernel -C none -a 30008000 -e 30008000 -n "OpenMoko Kernel Image Neo1973(GTA02)" -d linux.bin uImage.bin
-+      mkimage -A arm -O linux -T kernel -C none -a 30008000 -e 30008000 -n "Openmoko Kernel Image Neo1973(GTA02)" -d linux.bin uImage.bin
-       exit 0
- else
-       exit 1
-diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
-index 03805be..6f71e6c 100644
---- a/drivers/i2c/chips/pcf50606.c
-+++ b/drivers/i2c/chips/pcf50606.c
-@@ -1,6 +1,6 @@
- /* Philips/NXP PCF50606 Power Management Unit (PMU) driver
-  *
-- * (C) 2006-2007 by OpenMoko, Inc.
-+ * (C) 2006-2007 by Openmoko, Inc.
-  * Authors: Harald Welte <laforge@openmoko.org>,
-  *        Matt Hsu <matt@openmoko.org>
-  * All rights reserved.
-diff --git a/drivers/i2c/chips/pcf50606.h b/drivers/i2c/chips/pcf50606.h
-index 15b350f..5eded96 100644
---- a/drivers/i2c/chips/pcf50606.h
-+++ b/drivers/i2c/chips/pcf50606.h
-@@ -2,7 +2,7 @@
- #define _PCF50606_H
- /* Philips PCF50606 Power Managemnt Unit (PMU) driver
-- * (C) 2006-2007 by OpenMoko, Inc.
-+ * (C) 2006-2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  *
-  */
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index b5cd2cb..09d5cfd 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1,6 +1,6 @@
- /* Philips PCF50633 Power Management Unit (PMU) driver
-  *
-- * (C) 2006-2007 by OpenMoko, Inc.
-+ * (C) 2006-2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/drivers/i2c/chips/pcf50633.h b/drivers/i2c/chips/pcf50633.h
-index 9aad206..93dfd99 100644
---- a/drivers/i2c/chips/pcf50633.h
-+++ b/drivers/i2c/chips/pcf50633.h
-@@ -2,7 +2,7 @@
- #define _PCF50633_H
- /* Philips PCF50633 Power Managemnt Unit (PMU) driver
-- * (C) 2006-2007 by OpenMoko, Inc.
-+ * (C) 2006-2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  *
-  */
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-index 6c96660..a1fc7a3 100644
---- a/drivers/input/keyboard/neo1973kbd.c
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -1,7 +1,7 @@
- /*
-  * Keyboard driver for FIC Neo1973 GSM phone
-  *
-- * (C) 2006-2007 by OpenMoko, Inc.
-+ * (C) 2006-2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/drivers/input/keyboard/qt2410kbd.c b/drivers/input/keyboard/qt2410kbd.c
-index 4d497a3..fa4bf32 100644
---- a/drivers/input/keyboard/qt2410kbd.c
-+++ b/drivers/input/keyboard/qt2410kbd.c
-@@ -1,7 +1,7 @@
- /*
-  * Keyboard driver for Armzone QT2410
-  *
-- * (C) 2006 by OpenMoko, Inc.
-+ * (C) 2006 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
-index 2be816a..6067dba 100644
---- a/drivers/input/misc/lis302dl.c
-+++ b/drivers/input/misc/lis302dl.c
-@@ -1,6 +1,6 @@
- /* Linux kernel driver for the ST LIS302D 3-axis accelerometer
-  *
-- * Copyright (C) 2007 by OpenMoko, Inc.
-+ * Copyright (C) 2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/drivers/leds/leds-neo1973-gta02.c b/drivers/leds/leds-neo1973-gta02.c
-index bf1d540..8678670 100644
---- a/drivers/leds/leds-neo1973-gta02.c
-+++ b/drivers/leds/leds-neo1973-gta02.c
-@@ -1,7 +1,7 @@
- /*
-  * LED driver for the FIC Neo1973 GTA02 GSM phone
-  *
-- * (C) 2006-2007 by OpenMoko, Inc.
-+ * (C) 2006-2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/drivers/leds/leds-neo1973-vibrator.c b/drivers/leds/leds-neo1973-vibrator.c
-index 36ed216..f31302d 100644
---- a/drivers/leds/leds-neo1973-vibrator.c
-+++ b/drivers/leds/leds-neo1973-vibrator.c
-@@ -1,7 +1,7 @@
- /*
-  * LED driver for the vibrator of the FIC Neo1973 GSM Phone
-  *
-- * (C) 2006-2007 by OpenMoko, Inc.
-+ * (C) 2006-2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/drivers/mfd/glamo/Kconfig b/drivers/mfd/glamo/Kconfig
-index ec2ae3d..86a7c40 100644
---- a/drivers/mfd/glamo/Kconfig
-+++ b/drivers/mfd/glamo/Kconfig
-@@ -38,7 +38,7 @@ config MFD_GLAMO_MCI
-       depends on MFD_GLAMO && MMC
-       help
-         This selects a driver for the MCI interface found in
--        the S-Media GLAMO chip, as used in OpenMoko
-+        the S-Media GLAMO chip, as used in Openmoko
-         neo1973 GTA-02.
-         If unsure, say N.
-\ No newline at end of file
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index ab90690..a6b977b 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -1,6 +1,6 @@
- /* Smedia Glamo 336x/337x driver
-  *
-- * (C) 2007 by OpenMoko, Inc.
-+ * (C) 2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c
-index 8633e44..edc6d9c 100644
---- a/drivers/mfd/glamo/glamo-fb.c
-+++ b/drivers/mfd/glamo/glamo-fb.c
-@@ -1,6 +1,6 @@
- /* Smedia Glamo 336x/337x driver
-  *
-- * (C) 2007 by OpenMoko, Inc.
-+ * (C) 2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-@@ -684,7 +684,7 @@ static int __init glamofb_probe(struct platform_device *pdev)
-       struct glamofb_platform_data *mach_info = pdev->dev.platform_data;
-       printk(KERN_INFO "SMEDIA Glamo frame buffer driver (C) 2007 "
--              "OpenMoko, Inc.\n");
-+              "Openmoko, Inc.\n");
-       fbinfo = framebuffer_alloc(sizeof(struct glamofb_handle), &pdev->dev);
-       if (!fbinfo)
-diff --git a/drivers/mfd/glamo/glamo-lcm-spi.c b/drivers/mfd/glamo/glamo-lcm-spi.c
-index 92cabe4..874fb0e 100644
---- a/drivers/mfd/glamo/glamo-lcm-spi.c
-+++ b/drivers/mfd/glamo/glamo-lcm-spi.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2007 OpenMoko, Inc.
-+ * Copyright (C) 2007 Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  *
-  * Smedia Glamo GPIO based SPI driver
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index d8847c5..05bbfc4 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -1,7 +1,7 @@
- /*
-  *  linux/drivers/mmc/host/glamo-mmc.c - Glamo MMC driver
-  *
-- *  Copyright (C) 2007 OpenMoko, Inc,  Andy Green <andy@openmoko.com>
-+ *  Copyright (C) 2007 Openmoko, Inc,  Andy Green <andy@openmoko.com>
-  *  Based on S3C MMC driver that was:
-  *  Copyright (C) 2004-2006 maintech GmbH, Thomas Kleffel <tk@maintech.de>
-  *
-@@ -661,7 +661,7 @@ static int glamo_mci_probe(struct platform_device *pdev)
-       struct glamo_mci_host   *host;
-       int ret;
--      dev_info(&pdev->dev, "glamo_mci driver (C)2007 OpenMoko, Inc\n");
-+      dev_info(&pdev->dev, "glamo_mci driver (C)2007 Openmoko, Inc\n");
-       mmc = mmc_alloc_host(sizeof(struct glamo_mci_host), &pdev->dev);
-       if (!mmc) {
-diff --git a/drivers/mfd/glamo/glamo-mci.h b/drivers/mfd/glamo/glamo-mci.h
-index 55852e7..f3f170e 100644
---- a/drivers/mfd/glamo/glamo-mci.h
-+++ b/drivers/mfd/glamo/glamo-mci.h
-@@ -1,7 +1,7 @@
- /*
-  *  linux/drivers/mmc/host/glamo-mmc.h - GLAMO MCI driver
-  *
-- *  Copyright (C) 2007-2008 OpenMoko, Inc, Andy Green <andy@openmoko.com>
-+ *  Copyright (C) 2007-2008 Openmoko, Inc, Andy Green <andy@openmoko.com>
-  *   based on S3C MMC driver -->
-  *  Copyright (C) 2004-2006 Thomas Kleffel, All Rights Reserved.
-  *
-diff --git a/drivers/mfd/glamo/glamo-regs.h b/drivers/mfd/glamo/glamo-regs.h
-index 8f6c45c..32411e3 100644
---- a/drivers/mfd/glamo/glamo-regs.h
-+++ b/drivers/mfd/glamo/glamo-regs.h
-@@ -3,7 +3,7 @@
- /* Smedia Glamo 336x/337x driver
-  *
-- * (C) 2007 by OpenMoko, Inc.
-+ * (C) 2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/drivers/mfd/glamo/glamo-spi-gpio.c b/drivers/mfd/glamo/glamo-spi-gpio.c
-index eda7322..ece5750 100644
---- a/drivers/mfd/glamo/glamo-spi-gpio.c
-+++ b/drivers/mfd/glamo/glamo-spi-gpio.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2007 OpenMoko, Inc.
-+ * Copyright (C) 2007 Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  *
-  * Smedia Glamo GPIO based SPI driver
-diff --git a/drivers/power/gta02_hdq.c b/drivers/power/gta02_hdq.c
-index 12c742e..5a79fd6 100644
---- a/drivers/power/gta02_hdq.c
-+++ b/drivers/power/gta02_hdq.c
-@@ -1,7 +1,7 @@
- /*
-  * HDQ driver for the FIC Neo1973 GTA02 GSM phone
-  *
-- * (C) 2006-2007 by OpenMoko, Inc.
-+ * (C) 2006-2007 by Openmoko, Inc.
-  * Author: Andy Green <andy@openmoko.com>
-  * All rights reserved.
-  *
-diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-index 3c4758b..8c3bbbc 100644
---- a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-+++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-@@ -1,7 +1,7 @@
- /*
-  * s3c24xx_hcd.c - Samsung S3C MCI driver, Atheros SDIO API compatible.
-  *
-- * Copyright (C) 2007 by OpenMoko, Inc.
-+ * Copyright (C) 2007 by Openmoko, Inc.
-  * Written by Samuel Ortiz <sameo@openedhand.com>
-  * All Rights Reserved
-  *
-diff --git a/drivers/video/backlight/gta01_bl.c b/drivers/video/backlight/gta01_bl.c
-index c2bf0c9..bd7d41f 100644
---- a/drivers/video/backlight/gta01_bl.c
-+++ b/drivers/video/backlight/gta01_bl.c
-@@ -1,7 +1,7 @@
- /*
-  *  Backlight Driver for FIC GTA01 (Neo1973) GSM Phone
-  *
-- * Copyright (C) 2006-2007 by OpenMoko, Inc.
-+ * Copyright (C) 2006-2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>
-  * All rights reserved.
-  *
-diff --git a/drivers/video/display/Kconfig b/drivers/video/display/Kconfig
-index f0da483..674dc2c 100644
---- a/drivers/video/display/Kconfig
-+++ b/drivers/video/display/Kconfig
-@@ -27,7 +27,7 @@ config DISPLAY_JBT6K74
-       help
-         SPI driver for the control interface of TFT panels containing
-         the TPO JBT6K74-AS controller ASIC, such as the TPO TD028TTEC1
--        TFT diplay module used in the FIC/OpenMoko Neo1973 GSM phones.
-+        TFT diplay module used in the FIC/Openmoko Neo1973 GSM phones.
-         The control interface is required for display operation, as it
-         controls power management, display timing and gamma calibration.
-diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c
-index d7e9442..7e11da7 100644
---- a/drivers/video/display/jbt6k74.c
-+++ b/drivers/video/display/jbt6k74.c
-@@ -1,6 +1,6 @@
- /* Linux kernel driver for the tpo JBT6K74-AS LCM ASIC
-  *
-- * Copyright (C) 2006-2007 by OpenMoko, Inc.
-+ * Copyright (C) 2006-2007 by Openmoko, Inc.
-  * Author: Harald Welte <laforge@openmoko.org>,
-  *       Stefan Schmidt <stefan@openmoko.org>
-  * All rights reserved.
-diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
-index 9c98e86..cd76c1a 100644
---- a/drivers/video/logo/Kconfig
-+++ b/drivers/video/logo/Kconfig
-@@ -78,7 +78,7 @@ config LOGO_SUPERH_CLUT224
-       default y
- config LOGO_OPENMOKO_CLUT224
--      bool "224-color OpenMoko Linux logo"
-+      bool "224-color Openmoko Linux logo"
-       depends on MACH_NEO1973_GTA01 || MACH_NEO1973_GTA02
-       default y
-diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c
-index 8b044b4..bd397e1 100644
---- a/drivers/video/logo/logo.c
-+++ b/drivers/video/logo/logo.c
-@@ -117,7 +117,7 @@ const struct linux_logo * __init_refok fb_find_logo(int depth)
-               logo = &logo_m32r_clut224;
- #endif
- #ifdef CONFIG_LOGO_OPENMOKO_CLUT224
--              /* OpenMoko Linux logo */
-+              /* Openmoko Linux logo */
-               logo = &logo_openmoko_clut224;
- #endif
-       }
-diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
-index f32cba3..dbc9c18 100644
---- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
-+++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
-@@ -1,7 +1,7 @@
- /*
-  * neo1973_gta02_wm8753.c  --  SoC audio for Neo1973
-  *
-- * Copyright 2007 OpenMoko Inc
-+ * Copyright 2007 Openmoko Inc
-  * Author: Graeme Gregory <graeme@openmoko.org>
-  * Copyright 2007 Wolfson Microelectronics PLC.
-  * Author: Graeme Gregory <linux@wolfsonmicro.com>
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1113-Remove-not-needed-ifdef-as-machine_is_-is-always-de.patch b/target/linux/s3c24xx/patches-2.6.26/1113-Remove-not-needed-ifdef-as-machine_is_-is-always-de.patch
deleted file mode 100755 (executable)
index 17f5742..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-From 6d612224c0182f69f103cc20a7460870e5c45c0f Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:05 +0100
-Subject: [PATCH] Remove not needed #ifdef as machine_is_ is always defined.
-     If we build a kernel without gta01/gta02 the
-     machine_is_ macro will expand to (0) and the compiler will
-     optimize the if (0) {} away.
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |   14 ++++----------
- 1 files changed, 4 insertions(+), 10 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index f22cad8..cde3dd8 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -63,16 +63,13 @@ static ssize_t gsm_read(struct device *dev, struct device_attribute *attr,
-               if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_RST))
-                       goto out_1;
-       } else if (!strcmp(attr->attr.name, "download")) {
--#ifdef CONFIG_MACH_NEO1973_GTA01
--              if (machine_is_neo1973_gta01())
-+              if (machine_is_neo1973_gta01()) {
-                       if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_DNLOAD))
-                               goto out_1;
--#endif
--#ifdef CONFIG_MACH_NEO1973_GTA02
--              if (machine_is_neo1973_gta02())
-+              } else if (machine_is_neo1973_gta02()) {
-                       if (!s3c2410_gpio_getpin(GTA02_GPIO_nDL_GSM))
-                               goto out_1;
--#endif
-+              }
-       }
-       return strlcpy(buf, "0\n", 3);
-@@ -140,11 +137,9 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-       } else if (!strcmp(attr->attr.name, "reset")) {
-               s3c2410_gpio_setpin(GTA01_GPIO_MODEM_RST, on);
-       } else if (!strcmp(attr->attr.name, "download")) {
--#ifdef CONFIG_MACH_NEO1973_GTA01
-               if (machine_is_neo1973_gta01())
-                       s3c2410_gpio_setpin(GTA01_GPIO_MODEM_DNLOAD, on);
--#endif
--#ifdef CONFIG_MACH_NEO1973_GTA02
-+
-               if (machine_is_neo1973_gta02()) {
-                       /*
-                        * the keyboard / buttons driver requests and enables
-@@ -168,7 +163,6 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-                       gta01_gsm.gpio_ndl_gsm = !on;
-                       s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, !on);
-               }
--#endif
-       }
-       return count;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1114--leds-We-would-enable-PWM-for-all-four-timers-disa.patch b/target/linux/s3c24xx/patches-2.6.26/1114--leds-We-would-enable-PWM-for-all-four-timers-disa.patch
deleted file mode 100755 (executable)
index 3636e88..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From 18651314c0fea31faa6f43f184d3237f5b855a95 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:05 +0100
-Subject: [PATCH] [leds] We would enable PWM for all four timers, disable it for all four as well
-
-Currently we do not use the PWM code to drive the LEDS. We have enabled the PWM
-for four timer sources but disable it only for three, fix that up.
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- drivers/leds/leds-neo1973-gta02.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/leds/leds-neo1973-gta02.c b/drivers/leds/leds-neo1973-gta02.c
-index 8678670..fbb62c4 100644
---- a/drivers/leds/leds-neo1973-gta02.c
-+++ b/drivers/leds/leds-neo1973-gta02.c
-@@ -161,6 +161,7 @@ static int __init gta02led_probe(struct platform_device *pdev)
-               case S3C2410_GPB0:
-               case S3C2410_GPB1:
-               case S3C2410_GPB2:
-+              case S3C2410_GPB3:
-                       lp->has_pwm = 0;
-                       s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPIO_OUTPUT);
-                       s3c2410_gpio_setpin(lp->gpio, 0);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1115--led-Misc-fixes-in-the-driver-code.patch b/target/linux/s3c24xx/patches-2.6.26/1115--led-Misc-fixes-in-the-driver-code.patch
deleted file mode 100755 (executable)
index a5b2c6e..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-From 28b29382f1f9c4f6783054527283a8247b2c5cba Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:05 +0100
-Subject: [PATCH] [led] Misc fixes in the driver code
-     to_bundle returned the wrong data. The platform_device is the
-     parent of the class_device used by the LED device class. Return
-     the correct class.
-
-    num_leds was not set to the correct number of registered LEDs. All
-    loops using num_leds (e.g. module unloading) were not executed at
-    all.
-
-    On removal of the module disable all LEDs.
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- drivers/leds/leds-neo1973-gta02.c |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/leds/leds-neo1973-gta02.c b/drivers/leds/leds-neo1973-gta02.c
-index fbb62c4..343550a 100644
---- a/drivers/leds/leds-neo1973-gta02.c
-+++ b/drivers/leds/leds-neo1973-gta02.c
-@@ -46,7 +46,7 @@ static inline struct gta02_led_priv *to_priv(struct led_classdev *led_cdev)
- static inline struct gta02_led_bundle *to_bundle(struct led_classdev *led_cdev)
- {
--      return dev_get_drvdata(led_cdev->dev);
-+      return dev_get_drvdata(led_cdev->dev->parent);
- }
- static void gta02led_set(struct led_classdev *led_cdev,
-@@ -174,6 +174,8 @@ static int __init gta02led_probe(struct platform_device *pdev)
-               rc = led_classdev_register(&pdev->dev, &lp->cdev);
-       }
-+      bundle->num_leds = i;
-+
-       return 0;
- }
-@@ -186,6 +188,8 @@ static int gta02led_remove(struct platform_device *pdev)
-               struct gta02_led_priv *lp = &bundle->led[i];
-               if (lp->has_pwm)
-                       s3c2410_pwm_disable(&lp->pwm);
-+              else
-+                      gta02led_set(&lp->cdev, 0);
-               led_classdev_unregister(&lp->cdev);
-               mutex_destroy(&lp->mutex);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1116--neo-bluetooth-GTA01_GPIO_MODEM_RST-GTA02_GPIO_M.patch b/target/linux/s3c24xx/patches-2.6.26/1116--neo-bluetooth-GTA01_GPIO_MODEM_RST-GTA02_GPIO_M.patch
deleted file mode 100755 (executable)
index 0be60eb..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-From 09ddf24c0602256435dd4768ab5b3ccf1f6cd51c Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:05 +0100
-Subject: [PATCH] [neo bluetooth] GTA01_GPIO_MODEM_RST != GTA02_GPIO_MODEM_RST
-     The bluetooth enable and modem reset switched the order in
-     gta02. Do not poke the bluetooth dongle when we want to reset
-     the modem.
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |    9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index cde3dd8..5ad942e 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -60,7 +60,9 @@ static ssize_t gsm_read(struct device *dev, struct device_attribute *attr,
-               if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_ON))
-                       goto out_1;
-       } else if (!strcmp(attr->attr.name, "reset")) {
--              if (s3c2410_gpio_getpin(GTA01_GPIO_MODEM_RST))
-+              if (machine_is_neo1973_gta01() && s3c2410_gpio_getpin(GTA01_GPIO_MODEM_RST))
-+                      goto out_1;
-+              else if (machine_is_neo1973_gta02() && s3c2410_gpio_getpin(GTA02_GPIO_MODEM_RST))
-                       goto out_1;
-       } else if (!strcmp(attr->attr.name, "download")) {
-               if (machine_is_neo1973_gta01()) {
-@@ -135,7 +137,10 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-                       }
-               }
-       } else if (!strcmp(attr->attr.name, "reset")) {
--              s3c2410_gpio_setpin(GTA01_GPIO_MODEM_RST, on);
-+              if (machine_is_neo1973_gta01())
-+                      s3c2410_gpio_setpin(GTA01_GPIO_MODEM_RST, on);
-+              else if (machine_is_neo1973_gta02())
-+                      s3c2410_gpio_setpin(GTA02_GPIO_MODEM_RST, on);
-       } else if (!strcmp(attr->attr.name, "download")) {
-               if (machine_is_neo1973_gta01())
-                       s3c2410_gpio_setpin(GTA01_GPIO_MODEM_DNLOAD, on);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1117--neo-Every-access-to-GPIO-bank-B-has-to-go-through.patch b/target/linux/s3c24xx/patches-2.6.26/1117--neo-Every-access-to-GPIO-bank-B-has-to-go-through.patch
deleted file mode 100755 (executable)
index 8754eab..0000000
+++ /dev/null
@@ -1,497 +0,0 @@
-From 81bf1ac05c1ba0d32db8fe8fb0cd52cb6b7d8e7e Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:05 +0100
-Subject: [PATCH] [neo] Every access to GPIO bank B has to go through the shadow code
-
-    - Any setting of any PIN on bank B will undo the LED setting.
-      Introduce neo1973_gpb_set_pin to set the PIN in a way not losing
-      the LED or any other shadowed setting.
-    - Update users of GPBXY for gta01 and gta02.
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- arch/arm/mach-s3c2410/mach-gta01.c     |    9 ++--
- arch/arm/mach-s3c2440/mach-gta02.c     |   10 ++--
- arch/arm/plat-s3c24xx/Makefile         |    4 +-
- arch/arm/plat-s3c24xx/neo1973_pm_bt.c  |   15 +++---
- arch/arm/plat-s3c24xx/neo1973_pm_gps.c |    5 ++-
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |    9 ++--
- arch/arm/plat-s3c24xx/neo1973_shadow.c |   86 ++++++++++++++++++++++++++++++++
- drivers/leds/leds-neo1973-gta02.c      |   12 ++--
- drivers/leds/leds-neo1973-vibrator.c   |    7 ++-
- drivers/video/backlight/gta01_bl.c     |    9 ++--
- include/asm-arm/plat-s3c24xx/neo1973.h |   33 ++++++++++++
- 11 files changed, 165 insertions(+), 34 deletions(-)
- create mode 100644 arch/arm/plat-s3c24xx/neo1973_shadow.c
- create mode 100644 include/asm-arm/plat-s3c24xx/neo1973.h
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index 8c1a402..a4384b6 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -72,6 +72,7 @@
- #include <asm/plat-s3c24xx/cpu.h>
- #include <asm/plat-s3c24xx/pm.h>
- #include <asm/plat-s3c24xx/udc.h>
-+#include <asm/plat-s3c24xx/neo1973.h>
- static struct map_desc gta01_iodesc[] __initdata = {
-       {
-@@ -416,10 +417,10 @@ static void gta01_mmc_set_power(unsigned char power_mode, unsigned short vdd)
-       case GTA01Bv4_SYSTEM_REV:
-               switch (power_mode) {
-               case MMC_POWER_OFF:
--                      s3c2410_gpio_setpin(GTA01_GPIO_SDMMC_ON, 1);
-+                      neo1973_gpb_setpin(GTA01_GPIO_SDMMC_ON, 1);
-                       break;
-               case MMC_POWER_ON:
--                      s3c2410_gpio_setpin(GTA01_GPIO_SDMMC_ON, 0);
-+                      neo1973_gpb_setpin(GTA01_GPIO_SDMMC_ON, 0);
-                       break;
-               }
-               break;
-@@ -442,10 +443,10 @@ static void gta01_udc_command(enum s3c2410_udc_cmd_e cmd)
-       switch (cmd) {
-       case S3C2410_UDC_P_ENABLE:
--              s3c2410_gpio_setpin(GTA01_GPIO_USB_PULLUP, 1);
-+              neo1973_gpb_setpin(GTA01_GPIO_USB_PULLUP, 1);
-               break;
-       case S3C2410_UDC_P_DISABLE:
--              s3c2410_gpio_setpin(GTA01_GPIO_USB_PULLUP, 0);
-+              neo1973_gpb_setpin(GTA01_GPIO_USB_PULLUP, 0);
-               break;
-       default:
-               break;
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index f9e00d5..27babc9 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -75,6 +75,7 @@
- #include <asm/plat-s3c24xx/cpu.h>
- #include <asm/plat-s3c24xx/pm.h>
- #include <asm/plat-s3c24xx/udc.h>
-+#include <asm/plat-s3c24xx/neo1973.h>
- #include <linux/jbt6k74.h>
- #include <linux/glamofb.h>
-@@ -127,11 +128,11 @@ FIQ_HANDLER_ENTRY(256, 512)
-       if (fiq_ipc.vib_pwm_latched || fiq_ipc.vib_pwm) { /* not idle */
-               if (((u8)_fiq_count_fiqs) == fiq_ipc.vib_pwm_latched)
--                      s3c2410_gpio_setpin(fiq_ipc.vib_gpio_pin, 0);
-+                      neo1973_gpb_setpin(fiq_ipc.vib_gpio_pin, 0);
-               if (((u8)_fiq_count_fiqs) == 0) {
-                       fiq_ipc.vib_pwm_latched = fiq_ipc.vib_pwm;
-                       if (fiq_ipc.vib_pwm_latched)
--                              s3c2410_gpio_setpin(fiq_ipc.vib_gpio_pin, 1);
-+                              neo1973_gpb_setpin(fiq_ipc.vib_gpio_pin, 1);
-               }
-               divisor = FIQ_DIVISOR_VIBRATOR;
-       }
-@@ -319,6 +320,7 @@ FIQ_HANDLER_ENTRY(256, 512)
- FIQ_HANDLER_END()
-+
- /**
-  * returns PCB revision information in b9,b8 and b2,b1,b0
-  * Pre-GTA02 A6 returns 0x000
-@@ -763,10 +765,10 @@ static void gta02_udc_command(enum s3c2410_udc_cmd_e cmd)
-       switch (cmd) {
-       case S3C2410_UDC_P_ENABLE:
--              s3c2410_gpio_setpin(GTA02_GPIO_USB_PULLUP, 1);
-+              neo1973_gpb_setpin(GTA02_GPIO_USB_PULLUP, 1);
-               break;
-       case S3C2410_UDC_P_DISABLE:
--              s3c2410_gpio_setpin(GTA02_GPIO_USB_PULLUP, 0);
-+              neo1973_gpb_setpin(GTA02_GPIO_USB_PULLUP, 0);
-               break;
-       case S3C2410_UDC_P_RESET:
-               /* FIXME! */
-diff --git a/arch/arm/plat-s3c24xx/Makefile b/arch/arm/plat-s3c24xx/Makefile
-index 6b32a8a..c173f7b 100644
---- a/arch/arm/plat-s3c24xx/Makefile
-+++ b/arch/arm/plat-s3c24xx/Makefile
-@@ -33,4 +33,6 @@ obj-$(CONFIG_MACH_NEO1973)   += neo1973_version.o \
-                                  neo1973_pm_host.o \
-                                  neo1973_pm_gsm.o \
-                                  neo1973_pm_gps.o \
--                                 neo1973_pm_bt.o
-+                                 neo1973_pm_bt.o  \
-+                                 neo1973_shadow.o
-+
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-index a9694b4..dfc9ae8 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_bt.c
-@@ -18,6 +18,7 @@
- #include <asm/hardware.h>
- #include <asm/mach-types.h>
-+#include <asm/plat-s3c24xx/neo1973.h>
- #ifdef CONFIG_MACH_NEO1973_GTA01
- #include <asm/arch/gta01.h>
-@@ -95,20 +96,20 @@ static ssize_t bt_write(struct device *dev, struct device_attribute *attr,
-                       /* if we are powering up, assert reset, then power,
-                        * then release reset */
-                       if (on) {
--                              s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
-+                              neo1973_gpb_setpin(GTA01_GPIO_BT_EN, 0);
-                               pcf50606_voltage_set(pcf50606_global,
-                                                    PCF50606_REGULATOR_D1REG,
-                                                    3100);
-                       }
-                       pcf50606_onoff_set(pcf50606_global,
-                                          PCF50606_REGULATOR_D1REG, on);
--                      s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on);
-+                      neo1973_gpb_setpin(GTA01_GPIO_BT_EN, on);
-                       break;
- #endif /* CONFIG_MACH_NEO1973_GTA01 */
- #ifdef CONFIG_MACH_NEO1973_GTA02
-               case MACH_TYPE_NEO1973_GTA02:
--                      s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, on ? 0 : 1);
-+                      neo1973_gpb_setpin(GTA02_GPIO_BT_EN, on ? 0 : 1);
-                       if (on)
-                               pcf50633_voltage_set(pcf50633_global,
-                                       PCF50633_REGULATOR_LDO4, 3200);
-@@ -127,13 +128,13 @@ static ssize_t bt_write(struct device *dev, struct device_attribute *attr,
- #ifdef CONFIG_MACH_NEO1973_GTA01
-               case MACH_TYPE_NEO1973_GTA01:
--                      s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1);
-+                      neo1973_gpb_setpin(GTA01_GPIO_BT_EN, on ? 0 : 1);
-                       break;
- #endif /* CONFIG_MACH_NEO1973_GTA01 */
- #ifdef CONFIG_MACH_NEO1973_GTA02
-               case MACH_TYPE_NEO1973_GTA02:
--                      s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, on ? 0 : 1);
-+                      neo1973_gpb_setpin(GTA02_GPIO_BT_EN, on ? 0 : 1);
-                       break;
- #endif /* CONFIG_MACH_NEO1973_GTA02 */
-@@ -192,7 +193,7 @@ static int __init gta01_bt_probe(struct platform_device *pdev)
-                                  PCF50606_REGULATOR_D1REG, 0);
-               /* we pull reset to low to make sure that the chip doesn't
-                * drain power through the reset line */
--              s3c2410_gpio_setpin(GTA01_GPIO_BT_EN, 0);
-+              neo1973_gpb_setpin(GTA01_GPIO_BT_EN, 0);
-               break;
- #endif /* CONFIG_MACH_NEO1973_GTA01 */
-@@ -203,7 +204,7 @@ static int __init gta01_bt_probe(struct platform_device *pdev)
-                                    PCF50633_REGULATOR_LDO4, 0);
-               /* we pull reset to low to make sure that the chip doesn't
-                * drain power through the reset line */
--              s3c2410_gpio_setpin(GTA02_GPIO_BT_EN, 0);
-+              neo1973_gpb_setpin(GTA02_GPIO_BT_EN, 0);
-               break;
- #endif /* CONFIG_MACH_NEO1973_GTA02 */
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-index d882f7b..d020f8d 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-@@ -20,6 +20,9 @@
- #include <asm/hardware.h>
- #include <asm/mach-types.h>
-+
-+#include <asm/plat-s3c24xx/neo1973.h>
-+
- #ifdef CONFIG_MACH_NEO1973_GTA01
- #include <asm/arch/gta01.h>
- #include <linux/pcf50606.h>
-@@ -264,7 +267,7 @@ static void gps_pwron_set(int on)
- {
- #ifdef CONFIG_MACH_NEO1973_GTA01
-       if (machine_is_neo1973_gta01())
--              s3c2410_gpio_setpin(GTA01_GPIO_GPS_PWRON, on);
-+              neo1973_gpb_setpin(GTA01_GPIO_GPS_PWRON, on);
- #endif /* CONFIG_MACH_NEO1973_GTA01 */
- #ifdef CONFIG_MACH_NEO1973_GTA02
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index 5ad942e..149b866 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -22,6 +22,7 @@
- #include <asm/gpio.h>
- #include <asm/mach-types.h>
- #include <asm/arch/gta01.h>
-+#include <asm/plat-s3c24xx/neo1973.h>
- #ifdef CONFIG_MACH_NEO1973_GTA02
- #include <asm/arch/gta02.h>
-@@ -109,9 +110,9 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
- #endif
-                       }
--                      s3c2410_gpio_setpin(GTA01_GPIO_MODEM_ON, 1);
-+                      neo1973_gpb_setpin(GTA01_GPIO_MODEM_ON, 1);
-               } else {
--                      s3c2410_gpio_setpin(GTA01_GPIO_MODEM_ON, 0);
-+                      neo1973_gpb_setpin(GTA01_GPIO_MODEM_ON, 0);
-                       switch (system_rev) {
- #ifdef CONFIG_MACH_NEO1973_GTA02
-@@ -138,9 +139,9 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-               }
-       } else if (!strcmp(attr->attr.name, "reset")) {
-               if (machine_is_neo1973_gta01())
--                      s3c2410_gpio_setpin(GTA01_GPIO_MODEM_RST, on);
-+                      neo1973_gpb_setpin(GTA01_GPIO_MODEM_RST, on);
-               else if (machine_is_neo1973_gta02())
--                      s3c2410_gpio_setpin(GTA02_GPIO_MODEM_RST, on);
-+                      neo1973_gpb_setpin(GTA02_GPIO_MODEM_RST, on);
-       } else if (!strcmp(attr->attr.name, "download")) {
-               if (machine_is_neo1973_gta01())
-                       s3c2410_gpio_setpin(GTA01_GPIO_MODEM_DNLOAD, on);
-diff --git a/arch/arm/plat-s3c24xx/neo1973_shadow.c b/arch/arm/plat-s3c24xx/neo1973_shadow.c
-new file mode 100644
-index 0000000..09667da
---- /dev/null
-+++ b/arch/arm/plat-s3c24xx/neo1973_shadow.c
-@@ -0,0 +1,86 @@
-+/*
-+ * include/asm-arm/plat-s3c24xx/neo1973.h
-+ *
-+ * Common utility code for GTA01 and GTA02
-+ *
-+ * Copyright (C) 2008 by Openmoko, Inc.
-+ * Author: Holger Hans Peter Freyther <freyther@openmoko.org>
-+ * 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
-+ *
-+ */
-+
-+#include <linux/io.h>
-+#include <linux/irq.h>
-+
-+#include <asm/gpio.h>
-+#include <asm/plat-s3c24xx/neo1973.h>
-+
-+/**
-+ * Shadow GPIO bank B handling. For the LEDs we need to keep track of the state
-+ * in software. The s3c2410_gpio_setpin must not be used for GPIOs on bank B
-+ */
-+static unsigned long gpb_mask;
-+static unsigned long gpb_state;
-+
-+void neo1973_gpb_add_shadow_gpio(unsigned int gpio)
-+{
-+      unsigned long offset = S3C2410_GPIO_OFFSET(gpio);
-+      unsigned long flags;
-+
-+      local_irq_save(flags);
-+      gpb_mask |= 1L << offset;
-+      local_irq_restore(flags);
-+}
-+EXPORT_SYMBOL(neo1973_gpb_add_shadow_gpio);
-+
-+static void set_shadow_gpio(unsigned long offset, unsigned int value)
-+{
-+      unsigned long state = value != 0;
-+
-+      gpb_state &= ~(1L << offset);
-+      gpb_state |= state << offset;
-+}
-+
-+void neo1973_gpb_setpin(unsigned int pin, unsigned to)
-+{
-+      void __iomem *base = S3C24XX_GPIO_BASE(S3C2410_GPB0);
-+      unsigned long offset = S3C2410_GPIO_OFFSET(pin);
-+      unsigned long flags;
-+      unsigned long dat;
-+
-+      BUG_ON(base != S3C24XX_GPIO_BASE(pin));
-+
-+      local_irq_save(flags);
-+      dat = __raw_readl(base + 0x04);
-+
-+      /* Add the shadow values */
-+      dat &= ~gpb_mask;
-+      dat |= gpb_state;
-+
-+      /* Do the operation like s3c2410_gpio_setpin */
-+      dat &= ~(1L << offset);
-+      dat |= to << offset;
-+
-+      /* Update the shadow state */
-+      if ((1L << offset) & gpb_mask)
-+              set_shadow_gpio(offset, to);
-+
-+      __raw_writel(dat, base + 0x04);
-+      local_irq_restore(flags);
-+}
-+EXPORT_SYMBOL(neo1973_gpb_setpin);
-diff --git a/drivers/leds/leds-neo1973-gta02.c b/drivers/leds/leds-neo1973-gta02.c
-index 343550a..952ad69 100644
---- a/drivers/leds/leds-neo1973-gta02.c
-+++ b/drivers/leds/leds-neo1973-gta02.c
-@@ -20,6 +20,7 @@
- #include <asm/arch/pwm.h>
- #include <asm/arch/gta02.h>
- #include <asm/plat-s3c/regs-timer.h>
-+#include <asm/plat-s3c24xx/neo1973.h>
- #define MAX_LEDS 3
- #define COUNTER 256
-@@ -60,14 +61,13 @@ static void gta02led_set(struct led_classdev *led_cdev,
-        * value == 0 -> 0% duty cycle (zero power)
-        */
-       mutex_lock(&lp->mutex);
-+
-       if (lp->has_pwm) {
--                      s3c2410_pwm_duty_cycle(value, &lp->pwm);
-+              s3c2410_pwm_duty_cycle(value, &lp->pwm);
-       } else {
--              if (value)
--                      s3c2410_gpio_setpin(lp->gpio, 1);
--              else
--                      s3c2410_gpio_setpin(lp->gpio, 0);
-+              neo1973_gpb_setpin(lp->gpio, value ? 1 : 0);
-       }
-+
-       mutex_unlock(&lp->mutex);
- }
-@@ -164,7 +164,7 @@ static int __init gta02led_probe(struct platform_device *pdev)
-               case S3C2410_GPB3:
-                       lp->has_pwm = 0;
-                       s3c2410_gpio_cfgpin(lp->gpio, S3C2410_GPIO_OUTPUT);
--                      s3c2410_gpio_setpin(lp->gpio, 0);
-+                      neo1973_gpb_add_shadow_gpio(lp->gpio);
-                       break;
-               default:
-                       break;
-diff --git a/drivers/leds/leds-neo1973-vibrator.c b/drivers/leds/leds-neo1973-vibrator.c
-index f31302d..647e860 100644
---- a/drivers/leds/leds-neo1973-vibrator.c
-+++ b/drivers/leds/leds-neo1973-vibrator.c
-@@ -24,6 +24,7 @@
- #include <asm/plat-s3c/regs-timer.h>
- #include <asm/arch-s3c2410/fiq_ipc_gta02.h>
-+#include <asm/plat-s3c24xx/neo1973.h>
- #define COUNTER 64
-@@ -56,9 +57,9 @@ static void neo1973_vib_vib_set(struct led_classdev *led_cdev,
-               s3c2410_pwm_duty_cycle(value / 4, &vp->pwm);
-       else {
-               if (value)
--                      s3c2410_gpio_setpin(vp->gpio, 1);
-+                      neo1973_gpb_setpin(vp->gpio, 1);
-               else
--                      s3c2410_gpio_setpin(vp->gpio, 0);
-+                      neo1973_gpb_setpin(vp->gpio, 0);
-       }
-       mutex_unlock(&vp->mutex);
-@@ -131,7 +132,7 @@ static int __init neo1973_vib_probe(struct platform_device *pdev)
-       platform_set_drvdata(pdev, &neo1973_vib_led);
-       if (machine_is_neo1973_gta02()) { /* use FIQ to control GPIO */
--              s3c2410_gpio_setpin(neo1973_vib_led.gpio, 0); /* off */
-+              neo1973_gpb_setpin(neo1973_vib_led.gpio, 0); /* off */
-               s3c2410_gpio_cfgpin(neo1973_vib_led.gpio, S3C2410_GPIO_OUTPUT);
-               /* safe, kmalloc'd copy needed for FIQ ISR */
-               fiq_ipc.vib_gpio_pin = neo1973_vib_led.gpio;
-diff --git a/drivers/video/backlight/gta01_bl.c b/drivers/video/backlight/gta01_bl.c
-index bd7d41f..301ec9c 100644
---- a/drivers/video/backlight/gta01_bl.c
-+++ b/drivers/video/backlight/gta01_bl.c
-@@ -40,6 +40,7 @@
- #include <asm/arch/pwm.h>
- #include <asm/plat-s3c/regs-timer.h>
-+#include <asm/plat-s3c24xx/neo1973.h>
- static struct backlight_properties gta01bl_prop;
- static struct backlight_device *gta01_backlight_device;
-@@ -83,12 +84,12 @@ static int gta01bl_send_intensity(struct backlight_device *bd)
-       mutex_lock(&gta01bl.mutex);
- #ifdef GTA01_BACKLIGHT_ONOFF_ONLY
-       if (intensity)
--              s3c2410_gpio_setpin(GTA01_GPIO_BACKLIGHT, 1);
-+              neo1973_gpb_setpin(GTA01_GPIO_BACKLIGHT, 1);
-       else
--              s3c2410_gpio_setpin(GTA01_GPIO_BACKLIGHT, 0);
-+              neo1973_gpb_setpin(GTA01_GPIO_BACKLIGHT, 0);
- #else
-       if (intensity == bd->props.max_brightness) {
--              s3c2410_gpio_setpin(GTA01_GPIO_BACKLIGHT, 1);
-+              neo1973_gpb_setpin(GTA01_GPIO_BACKLIGHT, 1);
-               s3c2410_gpio_cfgpin(GTA01_GPIO_BACKLIGHT, S3C2410_GPIO_OUTPUT);
-       } else  {
-               s3c2410_pwm_duty_cycle(intensity & 0xffff, &gta01bl.pwm);
-@@ -222,7 +223,7 @@ static int gta01bl_remove(struct platform_device *dev)
-       mutex_destroy(&gta01bl.mutex);
-       s3c2410_gpio_cfgpin(GTA01_GPIO_BACKLIGHT, S3C2410_GPIO_OUTPUT);
--      s3c2410_gpio_setpin(GTA01_GPIO_BACKLIGHT, 1);
-+      neo1973_gpb_setpin(GTA01_GPIO_BACKLIGHT, 1);
-       return 0;
- }
-diff --git a/include/asm-arm/plat-s3c24xx/neo1973.h b/include/asm-arm/plat-s3c24xx/neo1973.h
-new file mode 100644
-index 0000000..63297de
---- /dev/null
-+++ b/include/asm-arm/plat-s3c24xx/neo1973.h
-@@ -0,0 +1,33 @@
-+/*
-+ * include/asm-arm/plat-s3c24xx/neo1973.h
-+ *
-+ * Common utility code for GTA01 and GTA02
-+ *
-+ * Copyright (C) 2008 by Openmoko, Inc.
-+ * Author: Holger Hans Peter Freyther <freyther@openmoko.org>
-+ * 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
-+ *
-+ */
-+
-+#ifndef NEO1973_H
-+#define NEO1973_H
-+
-+void neo1973_gpb_add_shadow_gpio(unsigned int gpio);
-+void neo1973_gpb_setpin(unsigned int pin, unsigned to);
-+
-+#endif
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1118-fix-jack-interrupt-debounce-loss-window.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1118-fix-jack-interrupt-debounce-loss-window.patch.patch
deleted file mode 100755 (executable)
index 58b07d7..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-From 0143ee8d373f04e443645072a24ff0c7c87036c6 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:05 +0100
-Subject: [PATCH] fix-jack-interrupt-debounce-loss-window.patch
-
-Make sure we can't lose a jack interrupt in debounce, despite it is
-a one-in-a-million thing that just needs replug to clear
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/input/keyboard/neo1973kbd.c |   50 +++++++++++++++++++++++-----------
- 1 files changed, 34 insertions(+), 16 deletions(-)
-
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-index a1fc7a3..8b9a420 100644
---- a/drivers/input/keyboard/neo1973kbd.c
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -62,27 +62,45 @@ static irqreturn_t neo1973kbd_hold_irq(int irq, void *dev_id)
- static void neo1973kbd_debounce_jack(struct work_struct *work)
- {
-       struct neo1973kbd *kbd = container_of(work, struct neo1973kbd, work);
--
--      /* we wait out any multiple interrupt stuttering in 100ms lumps */
-+      unsigned long flags;
-+      int loop = 0;
-       do {
--              kbd->hp_irq_count_in_work = kbd->hp_irq_count;
--              msleep(100);
--      } while (kbd->hp_irq_count != kbd->hp_irq_count_in_work);
--
--      /* no new interrupts on jack for 100ms... ok we will report it */
--
--      input_report_switch(kbd->input,
--                          SW_HEADPHONE_INSERT,
--                          gpio_get_value(irq_to_gpio(kbd->jack_irq)));
--      input_sync(kbd->input);
--
--      /* next time we get an interrupt on jack we need new work action */
--      kbd->work_in_progress = 0;
-+              /*
-+               * we wait out any multiple interrupt
-+               * stuttering in 100ms lumps
-+               */
-+              do {
-+                      kbd->hp_irq_count_in_work = kbd->hp_irq_count;
-+                      msleep(100);
-+              } while (kbd->hp_irq_count != kbd->hp_irq_count_in_work);
-+              /*
-+               * no new interrupts on jack for 100ms...
-+               * ok we will report it
-+               */
-+              input_report_switch(kbd->input, SW_HEADPHONE_INSERT,
-+                                  gpio_get_value(irq_to_gpio(kbd->jack_irq)));
-+              input_sync(kbd->input);
-+              /*
-+               * we go around the outer loop again if we detect that more
-+               * interrupts came while we are servicing here.  But we have
-+               * to sequence it carefully with interrupts off
-+               */
-+              local_save_flags(flags);
-+              /* no interrupts during this work means we can exit the work */
-+              loop = !!(kbd->hp_irq_count != kbd->hp_irq_count_in_work);
-+              if (!loop)
-+                      kbd->work_in_progress = 0;
-+              local_irq_restore(flags);
-+              /*
-+               * interrupt that comes here will either queue a new work action
-+               * since work_in_progress is cleared now, or be dealt with
-+               * when we loop.
-+               */
-+      } while (loop);
- }
--
- static irqreturn_t neo1973kbd_headphone_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1119-fix-gta01-spi-resume-patch.patch b/target/linux/s3c24xx/patches-2.6.26/1119-fix-gta01-spi-resume-patch.patch
deleted file mode 100755 (executable)
index 4b4205c..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From 6491a55deecc0ca16e86cc1c2edf76b72b4432d8 Mon Sep 17 00:00:00 2001
-From: Mike Wester <mwester@dis.net>
-Date: Fri, 25 Jul 2008 23:06:06 +0100
-Subject: [PATCH] fix-gta01-spi-resume-patch
-
-Patch to register the SPI device and thus the save/resume for the display
-
-This patch does *NOT* resolve this problem, but it does make things a bit
-better.  The SPI device name changed with 2.6.24, and the change was made for
-the gta02 but never propagated to the gta01.  With this change, you'll now see
-the entries for the spi bus and the display controller in /sys; and the display
-controller suspend/resume functions will be called.
-
-(via BZ 79)
-
-Signed-off-by: Mike Wester <mwester@dis.net>
----
- arch/arm/mach-s3c2410/mach-gta01.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index a4384b6..ff08449 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -530,6 +530,7 @@ static struct s3c2410_spigpio_info spi_gpio_cfg = {
-       .board_size     = ARRAY_SIZE(gta01_spi_board_info),
-       .board_info     = gta01_spi_board_info,
-       .chip_select    = &spi_gpio_cs,
-+      .num_chipselect = 2,   /*** Should be 1 or 2 for gta01? ***/
- };
- static struct resource s3c_spi_lcm_resource[] = {
-@@ -552,7 +553,7 @@ static struct resource s3c_spi_lcm_resource[] = {
- };
- struct platform_device s3c_device_spi_lcm = {
--      .name             = "s3c24xx-spi-gpio",
-+      .name             = "spi_s3c24xx_gpio",
-       .id               = 1,
-       .num_resources    = ARRAY_SIZE(s3c_spi_lcm_resource),
-       .resource         = s3c_spi_lcm_resource,
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1120-fix-gta01-pmu-irq-edge-lost-on-resume.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1120-fix-gta01-pmu-irq-edge-lost-on-resume.patch.patch
deleted file mode 100755 (executable)
index 018115e..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From a0852d1ca05076a7f5129b57248fc72ea719ff2b Mon Sep 17 00:00:00 2001
-From: Mike Wester <mwester@dis.net>
-Date: Fri, 25 Jul 2008 23:06:06 +0100
-Subject: [PATCH] fix-gta01-pmu-irq-edge-lost-on-resume.patch
-
-GTA01 -only
-
-Restore power button functionality after resume operation
-
-Per Werner's suggestion, run the PMU interrupt handler immediately after resume
-to clear/handle any pending interrupts from that device.  This appears to
-resolve the  dead-powerbutton-after-resume problem.  This is not well-tested;
-need feedback to see if there are any side-effects or other problems.
-
-From BZ 1313
-
-Signed-off-by: Mike Wester <mwester@dis.net>
----
- drivers/i2c/chips/pcf50606.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
-index 6f71e6c..aa841e3 100644
---- a/drivers/i2c/chips/pcf50606.c
-+++ b/drivers/i2c/chips/pcf50606.c
-@@ -1957,6 +1957,9 @@ static int pcf50606_resume(struct device *dev)
-       mutex_unlock(&pcf->lock);
-+      /* Hack to fix the gta01 power button problem on resume */
-+      pcf50606_irq(0, pcf);
-+
-       return 0;
- }
- #else
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1121-add-defconfig-2.6.25.patch b/target/linux/s3c24xx/patches-2.6.26/1121-add-defconfig-2.6.25.patch
deleted file mode 100755 (executable)
index e81c6bf..0000000
+++ /dev/null
@@ -1,1872 +0,0 @@
-From c0d7b4a1990f25dd6898ba7dc9991b94aa8b145c Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:06 +0100
-Subject: [PATCH] add-defconfig-2.6.25
-
-mostly built-in defconfig for 2.6.25
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- defconfig-2.6.25 | 1850 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 1850 insertions(+), 0 deletions(-)
- create mode 100644 defconfig-2.6.25
-
-diff --git a/defconfig-2.6.25 b/defconfig-2.6.25
-new file mode 100644
-index 0000000..ce1c1ca
---- /dev/null
-+++ b/defconfig-2.6.25
-@@ -0,0 +1,1850 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.25-rc9
-+# Sun Apr 13 08:49:27 2008
-+#
-+CONFIG_ARM=y
-+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-+CONFIG_GENERIC_GPIO=y
-+# CONFIG_GENERIC_TIME is not set
-+# CONFIG_GENERIC_CLOCKEVENTS is not set
-+CONFIG_MMU=y
-+CONFIG_NO_IOPORT=y
-+CONFIG_GENERIC_HARDIRQS=y
-+CONFIG_STACKTRACE_SUPPORT=y
-+CONFIG_LOCKDEP_SUPPORT=y
-+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-+CONFIG_HARDIRQS_SW_RESEND=y
-+CONFIG_GENERIC_IRQ_PROBE=y
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_ARCH_SUPPORTS_AOUT=y
-+CONFIG_ZONE_DMA=y
-+CONFIG_FIQ=y
-+CONFIG_VECTORS_BASE=0xffff0000
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_LOCK_KERNEL=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION="-mokodev"
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=16
-+# CONFIG_CGROUPS is not set
-+CONFIG_GROUP_SCHED=y
-+CONFIG_FAIR_GROUP_SCHED=y
-+# CONFIG_RT_GROUP_SCHED is not set
-+CONFIG_USER_SCHED=y
-+# CONFIG_CGROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+CONFIG_NAMESPACES=y
-+# CONFIG_UTS_NS is not set
-+# CONFIG_IPC_NS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+CONFIG_SYSCTL=y
-+# CONFIG_EMBEDDED is not set
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+CONFIG_MARKERS=y
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=m
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=m
-+# CONFIG_DEFAULT_AS is not set
-+CONFIG_DEFAULT_DEADLINE=y
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="deadline"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# System Type
-+#
-+# CONFIG_ARCH_AAEC2000 is not set
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_REALVIEW is not set
-+# CONFIG_ARCH_VERSATILE is not set
-+# CONFIG_ARCH_AT91 is not set
-+# CONFIG_ARCH_CLPS7500 is not set
-+# CONFIG_ARCH_CLPS711X is not set
-+# CONFIG_ARCH_CO285 is not set
-+# CONFIG_ARCH_EBSA110 is not set
-+# CONFIG_ARCH_EP93XX is not set
-+# CONFIG_ARCH_FOOTBRIDGE is not set
-+# CONFIG_ARCH_NETX is not set
-+# CONFIG_ARCH_H720X is not set
-+# CONFIG_ARCH_IMX is not set
-+# CONFIG_ARCH_IOP13XX is not set
-+# CONFIG_ARCH_IOP32X is not set
-+# CONFIG_ARCH_IOP33X is not set
-+# CONFIG_ARCH_IXP23XX is not set
-+# CONFIG_ARCH_IXP2000 is not set
-+# CONFIG_ARCH_IXP4XX is not set
-+# CONFIG_ARCH_L7200 is not set
-+# CONFIG_ARCH_KS8695 is not set
-+# CONFIG_ARCH_NS9XXX is not set
-+# CONFIG_ARCH_MXC is not set
-+# CONFIG_ARCH_ORION is not set
-+# CONFIG_ARCH_PNX4008 is not set
-+# CONFIG_ARCH_PXA is not set
-+# CONFIG_ARCH_RPC is not set
-+# CONFIG_ARCH_SA1100 is not set
-+CONFIG_ARCH_S3C2410=y
-+# CONFIG_ARCH_SHARK is not set
-+# CONFIG_ARCH_LH7A40X is not set
-+# CONFIG_ARCH_DAVINCI is not set
-+# CONFIG_ARCH_OMAP is not set
-+# CONFIG_ARCH_MSM7X00A is not set
-+CONFIG_PLAT_S3C24XX=y
-+CONFIG_CPU_S3C244X=y
-+CONFIG_S3C2410_DMA=y
-+# CONFIG_S3C2410_DMA_DEBUG is not set
-+CONFIG_MACH_SMDK=y
-+CONFIG_MACH_NEO1973=y
-+CONFIG_PLAT_S3C=y
-+CONFIG_CPU_LLSERIAL_S3C2410=y
-+CONFIG_CPU_LLSERIAL_S3C2440=y
-+
-+#
-+# Boot options
-+#
-+# CONFIG_S3C_BOOT_WATCHDOG is not set
-+# CONFIG_S3C_BOOT_ERROR_RESET is not set
-+
-+#
-+# Power management
-+#
-+CONFIG_S3C2410_PM_DEBUG=y
-+# CONFIG_S3C2410_PM_CHECK is not set
-+CONFIG_S3C_LOWLEVEL_UART_PORT=2
-+
-+#
-+# S3C2400 Machines
-+#
-+CONFIG_CPU_S3C2410=y
-+CONFIG_CPU_S3C2410_DMA=y
-+CONFIG_S3C2410_PM=y
-+CONFIG_S3C2410_GPIO=y
-+CONFIG_S3C2410_CLOCK=y
-+CONFIG_S3C2410_PWM=y
-+
-+#
-+# S3C2410 Machines
-+#
-+# CONFIG_ARCH_SMDK2410 is not set
-+# CONFIG_ARCH_H1940 is not set
-+# CONFIG_MACH_N30 is not set
-+# CONFIG_ARCH_BAST is not set
-+# CONFIG_MACH_OTOM is not set
-+# CONFIG_MACH_AML_M5900 is not set
-+# CONFIG_MACH_VR1000 is not set
-+CONFIG_MACH_QT2410=y
-+CONFIG_MACH_NEO1973_GTA01=y
-+
-+#
-+# S3C2412 Machines
-+#
-+# CONFIG_MACH_SMDK2413 is not set
-+# CONFIG_MACH_SMDK2412 is not set
-+# CONFIG_MACH_VSTMS is not set
-+CONFIG_CPU_S3C2440=y
-+CONFIG_S3C2440_DMA=y
-+CONFIG_S3C2440_C_FIQ=y
-+
-+#
-+# S3C2440 Machines
-+#
-+# CONFIG_MACH_ANUBIS is not set
-+# CONFIG_MACH_OSIRIS is not set
-+# CONFIG_MACH_RX3715 is not set
-+CONFIG_ARCH_S3C2440=y
-+# CONFIG_MACH_NEXCODER_2440 is not set
-+CONFIG_SMDK2440_CPU2440=y
-+CONFIG_MACH_HXD8=y
-+CONFIG_MACH_NEO1973_GTA02=y
-+# CONFIG_NEO1973_GTA02_2440 is not set
-+CONFIG_CPU_S3C2442=y
-+
-+#
-+# S3C2442 Machines
-+#
-+CONFIG_SMDK2440_CPU2442=y
-+
-+#
-+# S3C2443 Machines
-+#
-+# CONFIG_MACH_SMDK2443 is not set
-+
-+#
-+# Processor Type
-+#
-+CONFIG_CPU_32=y
-+CONFIG_CPU_ARM920T=y
-+CONFIG_CPU_32v4T=y
-+CONFIG_CPU_ABRT_EV4T=y
-+CONFIG_CPU_CACHE_V4WT=y
-+CONFIG_CPU_CACHE_VIVT=y
-+CONFIG_CPU_COPY_V4WB=y
-+CONFIG_CPU_TLB_V4WBI=y
-+CONFIG_CPU_CP15=y
-+CONFIG_CPU_CP15_MMU=y
-+
-+#
-+# Processor Features
-+#
-+CONFIG_ARM_THUMB=y
-+# CONFIG_CPU_ICACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-+# CONFIG_OUTER_CACHE is not set
-+
-+#
-+# Bus support
-+#
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Kernel Features
-+#
-+# CONFIG_TICK_ONESHOT is not set
-+CONFIG_PREEMPT=y
-+CONFIG_NO_IDLE_HZ=y
-+CONFIG_HZ=200
-+CONFIG_AEABI=y
-+CONFIG_OABI_COMPAT=y
-+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_SPLIT_PTLOCK_CPUS=4096
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_ALIGNMENT_TRAP=y
-+
-+#
-+# Boot options
-+#
-+CONFIG_ZBOOT_ROM_TEXT=0x0
-+CONFIG_ZBOOT_ROM_BSS=0x0
-+CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
-+# CONFIG_XIP_KERNEL is not set
-+CONFIG_KEXEC=y
-+CONFIG_ATAGS_PROC=y
-+
-+#
-+# Floating point emulation
-+#
-+
-+#
-+# At least one emulation must be selected
-+#
-+CONFIG_FPE_NWFPE=y
-+# CONFIG_FPE_NWFPE_XP is not set
-+# CONFIG_FPE_FASTFPE is not set
-+
-+#
-+# Userspace binary formats
-+#
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+
-+#
-+# Power management options
-+#
-+CONFIG_PM=y
-+CONFIG_PM_LEGACY=y
-+CONFIG_PM_DEBUG=y
-+CONFIG_PM_VERBOSE=y
-+CONFIG_CAN_PM_TRACE=y
-+CONFIG_PM_SLEEP=y
-+CONFIG_SUSPEND=y
-+CONFIG_SUSPEND_FREEZER=y
-+CONFIG_APM_EMULATION=y
-+CONFIG_ARCH_SUSPEND_POSSIBLE=y
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+CONFIG_PACKET_MMAP=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+CONFIG_XFRM_MIGRATE=y
-+# CONFIG_XFRM_STATISTICS is not set
-+CONFIG_NET_KEY=m
-+CONFIG_NET_KEY_MIGRATE=y
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+# CONFIG_IP_ROUTE_MULTIPATH is not set
-+# CONFIG_IP_ROUTE_VERBOSE 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=m
-+CONFIG_NET_IPGRE=m
-+# CONFIG_NET_IPGRE_BROADCAST is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_XFRM_TUNNEL=m
-+CONFIG_INET_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET_XFRM_MODE_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_BEET=m
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+CONFIG_TCP_MD5SIG=y
-+# CONFIG_IP_VS is not set
-+CONFIG_IPV6=m
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_IPCOMP=m
-+# CONFIG_IPV6_MIP6 is not set
-+CONFIG_INET6_XFRM_TUNNEL=m
-+CONFIG_INET6_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET6_XFRM_MODE_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_BEET=m
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_TUNNEL=m
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+CONFIG_NETFILTER=y
-+# CONFIG_NETFILTER_DEBUG is not set
-+CONFIG_NETFILTER_ADVANCED=y
-+CONFIG_BRIDGE_NETFILTER=y
-+
-+#
-+# Core Netfilter Configuration
-+#
-+CONFIG_NETFILTER_NETLINK=m
-+CONFIG_NETFILTER_NETLINK_QUEUE=m
-+CONFIG_NETFILTER_NETLINK_LOG=m
-+CONFIG_NF_CONNTRACK=m
-+CONFIG_NF_CT_ACCT=y
-+CONFIG_NF_CONNTRACK_MARK=y
-+CONFIG_NF_CONNTRACK_EVENTS=y
-+CONFIG_NF_CT_PROTO_GRE=m
-+CONFIG_NF_CT_PROTO_SCTP=m
-+# CONFIG_NF_CT_PROTO_UDPLITE is not set
-+# CONFIG_NF_CONNTRACK_AMANDA is not set
-+CONFIG_NF_CONNTRACK_FTP=m
-+CONFIG_NF_CONNTRACK_H323=m
-+CONFIG_NF_CONNTRACK_IRC=m
-+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-+CONFIG_NF_CONNTRACK_PPTP=m
-+CONFIG_NF_CONNTRACK_SANE=m
-+CONFIG_NF_CONNTRACK_SIP=m
-+CONFIG_NF_CONNTRACK_TFTP=m
-+CONFIG_NF_CT_NETLINK=m
-+CONFIG_NETFILTER_XTABLES=m
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-+CONFIG_NETFILTER_XT_TARGET_DSCP=m
-+CONFIG_NETFILTER_XT_TARGET_MARK=m
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
-+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set
-+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-+CONFIG_NETFILTER_XT_MATCH_DCCP=m
-+CONFIG_NETFILTER_XT_MATCH_DSCP=m
-+CONFIG_NETFILTER_XT_MATCH_ESP=m
-+CONFIG_NETFILTER_XT_MATCH_HELPER=m
-+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_MAC=m
-+CONFIG_NETFILTER_XT_MATCH_MARK=m
-+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-+CONFIG_NETFILTER_XT_MATCH_POLICY=m
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-+CONFIG_NETFILTER_XT_MATCH_REALM=m
-+CONFIG_NETFILTER_XT_MATCH_SCTP=m
-+CONFIG_NETFILTER_XT_MATCH_STATE=m
-+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-+CONFIG_NETFILTER_XT_MATCH_STRING=m
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-+
-+#
-+# IP: Netfilter Configuration
-+#
-+CONFIG_NF_CONNTRACK_IPV4=m
-+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-+# CONFIG_IP_NF_QUEUE is not set
-+CONFIG_IP_NF_IPTABLES=m
-+# CONFIG_IP_NF_MATCH_RECENT is not set
-+CONFIG_IP_NF_MATCH_ECN=m
-+CONFIG_IP_NF_MATCH_AH=m
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_MATCH_ADDRTYPE=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_TARGET_LOG=m
-+CONFIG_IP_NF_TARGET_ULOG=m
-+CONFIG_NF_NAT=m
-+CONFIG_NF_NAT_NEEDED=y
-+CONFIG_IP_NF_TARGET_MASQUERADE=m
-+CONFIG_IP_NF_TARGET_REDIRECT=m
-+CONFIG_IP_NF_TARGET_NETMAP=m
-+CONFIG_NF_NAT_SNMP_BASIC=m
-+CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_FTP=m
-+CONFIG_NF_NAT_IRC=m
-+CONFIG_NF_NAT_TFTP=m
-+# CONFIG_NF_NAT_AMANDA is not set
-+CONFIG_NF_NAT_PPTP=m
-+CONFIG_NF_NAT_H323=m
-+CONFIG_NF_NAT_SIP=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_IP_NF_TARGET_ECN=m
-+CONFIG_IP_NF_TARGET_TTL=m
-+CONFIG_IP_NF_TARGET_CLUSTERIP=m
-+# CONFIG_IP_NF_RAW is not set
-+# CONFIG_IP_NF_ARPTABLES is not set
-+
-+#
-+# IPv6: Netfilter Configuration
-+#
-+CONFIG_NF_CONNTRACK_IPV6=m
-+# CONFIG_IP6_NF_QUEUE is not set
-+CONFIG_IP6_NF_IPTABLES=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_IPV6HEADER=m
-+CONFIG_IP6_NF_MATCH_AH=m
-+CONFIG_IP6_NF_MATCH_MH=m
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_LOG=m
-+CONFIG_IP6_NF_TARGET_REJECT=m
-+CONFIG_IP6_NF_MANGLE=m
-+CONFIG_IP6_NF_TARGET_HL=m
-+# CONFIG_IP6_NF_RAW is not set
-+
-+#
-+# 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_BRIDGE_EBT_ULOG=m
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+CONFIG_BRIDGE=y
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+CONFIG_LLC=y
-+# 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+CONFIG_NET_SCHED=y
-+
-+#
-+# Queueing/Scheduling
-+#
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=m
-+CONFIG_NET_SCH_PRIO=m
-+# CONFIG_NET_SCH_RR is not set
-+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_NETEM=m
-+
-+#
-+# Classification
-+#
-+CONFIG_NET_CLS=y
-+CONFIG_NET_CLS_BASIC=m
-+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_CLS_U32_PERF=y
-+CONFIG_CLS_U32_MARK=y
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
-+# CONFIG_NET_CLS_FLOW is not set
-+# CONFIG_NET_EMATCH is not set
-+# CONFIG_NET_CLS_ACT is not set
-+# CONFIG_NET_CLS_IND is not set
-+CONFIG_NET_SCH_FIFO=y
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+CONFIG_BT=y
-+CONFIG_BT_L2CAP=y
-+CONFIG_BT_SCO=y
-+CONFIG_BT_RFCOMM=y
-+CONFIG_BT_RFCOMM_TTY=y
-+CONFIG_BT_BNEP=y
-+CONFIG_BT_BNEP_MC_FILTER=y
-+CONFIG_BT_BNEP_PROTO_FILTER=y
-+CONFIG_BT_HIDP=y
-+
-+#
-+# Bluetooth device drivers
-+#
-+CONFIG_BT_HCIUSB=y
-+CONFIG_BT_HCIUSB_SCO=y
-+# CONFIG_BT_HCIBTSDIO is not set
-+# CONFIG_BT_HCIUART is not set
-+# CONFIG_BT_HCIBCM203X is not set
-+# CONFIG_BT_HCIBPA10X is not set
-+# CONFIG_BT_HCIBFUSB is not set
-+# CONFIG_BT_HCIVHCI is not set
-+# CONFIG_AF_RXRPC is not set
-+CONFIG_FIB_RULES=y
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+CONFIG_WIRELESS_EXT=y
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=m
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=m
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+CONFIG_MTD_CONCAT=y
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_AFS_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+CONFIG_MTD_CFI_INTELEXT=y
-+# CONFIG_MTD_CFI_AMDSTD is not set
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+CONFIG_MTD_ROM=y
-+CONFIG_MTD_ABSENT=y
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+CONFIG_MTD_PHYSMAP=y
-+CONFIG_MTD_PHYSMAP_START=0x0
-+CONFIG_MTD_PHYSMAP_LEN=0
-+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-+# CONFIG_MTD_ARM_INTEGRATOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+CONFIG_MTD_NAND=y
-+CONFIG_MTD_NAND_VERIFY_WRITE=y
-+# CONFIG_MTD_NAND_ECC_SMC is not set
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+CONFIG_MTD_NAND_IDS=y
-+CONFIG_MTD_NAND_S3C2410=y
-+CONFIG_MTD_NAND_S3C2410_DEBUG=y
-+CONFIG_MTD_NAND_S3C2410_HWECC=y
-+# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ALAUDA is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+# CONFIG_PARPORT is not set
-+CONFIG_PNP=y
-+CONFIG_PNP_DEBUG=y
-+
-+#
-+# Protocols
-+#
-+# CONFIG_PNPACPI is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=m
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_UB=m
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=4096
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=m
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=m
-+# CONFIG_CHR_DEV_ST is not set
-+# CONFIG_CHR_DEV_OSST is not set
-+CONFIG_BLK_DEV_SR=m
-+# CONFIG_BLK_DEV_SR_VENDOR is not set
-+CONFIG_CHR_DEV_SG=m
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-+#
-+# CONFIG_SCSI_MULTI_LUN is not set
-+# CONFIG_SCSI_CONSTANTS is not set
-+# CONFIG_SCSI_LOGGING is not set
-+CONFIG_SCSI_SCAN_ASYNC=y
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_ATA is not set
-+CONFIG_MD=y
-+# CONFIG_BLK_DEV_MD is not set
-+CONFIG_BLK_DEV_DM=m
-+# CONFIG_DM_DEBUG is not set
-+CONFIG_DM_CRYPT=m
-+CONFIG_DM_SNAPSHOT=m
-+# CONFIG_DM_MIRROR is not set
-+# CONFIG_DM_ZERO is not set
-+# CONFIG_DM_MULTIPATH is not set
-+# CONFIG_DM_DELAY is not set
-+# CONFIG_DM_UEVENT is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+CONFIG_TUN=m
-+# CONFIG_VETH is not set
-+# CONFIG_NET_SB1000 is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_AX88796 is not set
-+# CONFIG_SMC91X is not set
-+# CONFIG_DM9000 is not set
-+# CONFIG_ENC28J60 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_B44 is not set
-+CONFIG_CS89x0=m
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+
-+#
-+# USB Network Adapters
-+#
-+CONFIG_USB_CATC=m
-+CONFIG_USB_KAWETH=m
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+CONFIG_USB_USBNET=y
-+CONFIG_USB_NET_AX8817X=m
-+CONFIG_USB_NET_CDCETHER=m
-+CONFIG_USB_NET_DM9601=m
-+CONFIG_USB_NET_GL620A=m
-+CONFIG_USB_NET_NET1080=m
-+CONFIG_USB_NET_PLUSB=m
-+CONFIG_USB_NET_MCS7830=m
-+CONFIG_USB_NET_RNDIS_HOST=m
-+CONFIG_USB_NET_CDC_SUBSET=m
-+CONFIG_USB_ALI_M5632=y
-+CONFIG_USB_AN2720=y
-+CONFIG_USB_BELKIN=y
-+CONFIG_USB_ARMLINUX=y
-+CONFIG_USB_EPSON2888=y
-+CONFIG_USB_KC2190=y
-+CONFIG_USB_NET_ZAURUS=m
-+# CONFIG_WAN is not set
-+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=m
-+CONFIG_PPP_MPPE=m
-+# CONFIG_PPPOE is not set
-+# CONFIG_PPPOL2TP is not set
-+# CONFIG_SLIP is not set
-+CONFIG_SLHC=m
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
-+# CONFIG_INPUT_JOYDEV is not set
-+CONFIG_INPUT_EVDEV=y
-+CONFIG_INPUT_EVBUG=m
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+# CONFIG_KEYBOARD_ATKBD is not set
-+# 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_KEYBOARD_STOWAWAY=m
-+CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_NEO1973=y
-+CONFIG_KEYBOARD_QT2410=y
-+CONFIG_INPUT_MOUSE=y
-+# CONFIG_MOUSE_PS2 is not set
-+# CONFIG_MOUSE_SERIAL is not set
-+# CONFIG_MOUSE_APPLETOUCH is not set
-+# CONFIG_MOUSE_VSXXXAA is not set
-+# CONFIG_MOUSE_GPIO is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+CONFIG_INPUT_TOUCHSCREEN=y
-+# CONFIG_TOUCHSCREEN_ADS7846 is not set
-+# CONFIG_TOUCHSCREEN_FUJITSU is not set
-+CONFIG_TOUCHSCREEN_S3C2410=y
-+# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
-+# CONFIG_TOUCHSCREEN_GUNZE is not set
-+# CONFIG_TOUCHSCREEN_ELO is not set
-+# CONFIG_TOUCHSCREEN_MTOUCH is not set
-+# CONFIG_TOUCHSCREEN_MK712 is not set
-+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-+# CONFIG_TOUCHSCREEN_UCB1400 is not set
-+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-+CONFIG_INPUT_MISC=y
-+# CONFIG_INPUT_ATI_REMOTE is not set
-+# CONFIG_INPUT_ATI_REMOTE2 is not set
-+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-+# CONFIG_INPUT_POWERMATE is not set
-+# CONFIG_INPUT_YEALINK is not set
-+CONFIG_INPUT_UINPUT=m
-+CONFIG_INPUT_LIS302DL=y
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+# CONFIG_SERIO_SERPORT is not set
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_NR_TTY_DEVICES=4
-+CONFIG_HW_CONSOLE=y
-+CONFIG_VT_HW_CONSOLE_BINDING=y
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_SERIAL_S3C2410=y
-+CONFIG_SERIAL_S3C2410_CONSOLE=y
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_LEGACY_PTYS is not set
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Algorithms
-+#
-+# CONFIG_I2C_ALGOBIT is not set
-+# CONFIG_I2C_ALGOPCF is not set
-+# CONFIG_I2C_ALGOPCA is not set
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_GPIO is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+CONFIG_I2C_S3C2410=y
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_TINY_USB is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+CONFIG_SENSORS_PCF50606=y
-+CONFIG_SENSORS_PCF50633=y
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_TPS65010 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+CONFIG_SENSORS_TSL256X=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
-+
-+#
-+# SPI support
-+#
-+CONFIG_SPI=y
-+# CONFIG_SPI_DEBUG is not set
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+# CONFIG_SPI_S3C24XX is not set
-+CONFIG_SPI_S3C24XX_GPIO=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_W1 is not set
-+CONFIG_POWER_SUPPLY=y
-+CONFIG_POWER_SUPPLY_DEBUG=y
-+CONFIG_PDA_POWER=y
-+CONFIG_APM_POWER=y
-+# CONFIG_BATTERY_DS2760 is not set
-+CONFIG_BATTERY_BQ27000_HDQ=y
-+CONFIG_GTA02_HDQ=y
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+# CONFIG_SENSORS_LM70 is not set
-+# CONFIG_SENSORS_LM75 is not set
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# CONFIG_SENSORS_LM87 is not set
-+# CONFIG_SENSORS_LM90 is not set
-+# CONFIG_SENSORS_LM92 is not set
-+# CONFIG_SENSORS_LM93 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_DME1737 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_S3C2410_WATCHDOG=m
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+# CONFIG_MFD_ASIC3 is not set
-+CONFIG_MFD_GLAMO=y
-+CONFIG_MFD_GLAMO_FB=y
-+CONFIG_MFD_GLAMO_SPI_GPIO=y
-+CONFIG_MFD_GLAMO_SPI_FB=y
-+CONFIG_MFD_GLAMO_MCI=y
-+
-+#
-+# Multimedia devices
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+CONFIG_FB=y
-+# CONFIG_FIRMWARE_EDID is not set
-+# CONFIG_FB_DDC is not set
-+CONFIG_FB_CFB_FILLRECT=y
-+CONFIG_FB_CFB_COPYAREA=y
-+CONFIG_FB_CFB_IMAGEBLIT=y
-+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-+# CONFIG_FB_SYS_FILLRECT is not set
-+# CONFIG_FB_SYS_COPYAREA is not set
-+# CONFIG_FB_SYS_IMAGEBLIT is not set
-+# CONFIG_FB_SYS_FOPS is not set
-+CONFIG_FB_DEFERRED_IO=y
-+# CONFIG_FB_SVGALIB is not set
-+# CONFIG_FB_MACMODES is not set
-+# CONFIG_FB_BACKLIGHT is not set
-+# CONFIG_FB_MODE_HELPERS is not set
-+# CONFIG_FB_TILEBLITTING is not set
-+
-+#
-+# Frame buffer hardware drivers
-+#
-+# CONFIG_FB_UVESA is not set
-+# CONFIG_FB_S1D13XXX is not set
-+CONFIG_FB_S3C2410=y
-+# CONFIG_FB_S3C2410_DEBUG is not set
-+# CONFIG_FB_VIRTUAL is not set
-+CONFIG_BACKLIGHT_LCD_SUPPORT=y
-+CONFIG_LCD_CLASS_DEVICE=y
-+CONFIG_LCD_LTV350QV=y
-+CONFIG_BACKLIGHT_CLASS_DEVICE=y
-+# CONFIG_BACKLIGHT_CORGI is not set
-+CONFIG_BACKLIGHT_GTA01=y
-+
-+#
-+# Display device support
-+#
-+CONFIG_DISPLAY_SUPPORT=y
-+
-+#
-+# Display hardware drivers
-+#
-+CONFIG_DISPLAY_JBT6K74=y
-+
-+#
-+# Console display driver support
-+#
-+# CONFIG_VGA_CONSOLE is not set
-+CONFIG_DUMMY_CONSOLE=y
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-+CONFIG_FONTS=y
-+# CONFIG_FONT_8x8 is not set
-+# CONFIG_FONT_8x16 is not set
-+CONFIG_FONT_6x11=y
-+# CONFIG_FONT_7x14 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
-+# CONFIG_FONT_10x18 is not set
-+# CONFIG_LOGO is not set
-+
-+#
-+# Sound
-+#
-+CONFIG_SOUND=y
-+
-+#
-+# Advanced Linux Sound Architecture
-+#
-+CONFIG_SND=y
-+CONFIG_SND_TIMER=y
-+CONFIG_SND_PCM=y
-+CONFIG_SND_HWDEP=m
-+CONFIG_SND_RAWMIDI=m
-+# CONFIG_SND_SEQUENCER is not set
-+CONFIG_SND_OSSEMUL=y
-+CONFIG_SND_MIXER_OSS=y
-+CONFIG_SND_PCM_OSS=y
-+CONFIG_SND_PCM_OSS_PLUGINS=y
-+# CONFIG_SND_DYNAMIC_MINORS is not set
-+CONFIG_SND_SUPPORT_OLD_API=y
-+CONFIG_SND_VERBOSE_PROCFS=y
-+# 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
-+
-+#
-+# ALSA ARM devices
-+#
-+
-+#
-+# SPI devices
-+#
-+
-+#
-+# USB devices
-+#
-+CONFIG_SND_USB_AUDIO=m
-+# CONFIG_SND_USB_CAIAQ is not set
-+
-+#
-+# System on Chip audio support
-+#
-+CONFIG_SND_SOC=y
-+CONFIG_SND_S3C24XX_SOC=y
-+CONFIG_SND_S3C24XX_SOC_I2S=y
-+CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=y
-+CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=y
-+# CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
-+
-+#
-+# SoC Audio support for SuperH
-+#
-+
-+#
-+# ALSA SoC audio for Freescale SOCs
-+#
-+CONFIG_SND_SOC_WM8753=y
-+
-+#
-+# Open Sound System
-+#
-+# CONFIG_SOUND_PRIME is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=y
-+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-+# CONFIG_HID_FF is not set
-+# CONFIG_USB_HIDDEV is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+CONFIG_USB_SUSPEND=y
-+CONFIG_USB_PERSIST=y
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+# CONFIG_USB_ISP116X_HCD is not set
-+CONFIG_USB_OHCI_HCD=y
-+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+CONFIG_USB_ACM=m
-+CONFIG_USB_PRINTER=m
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+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 is not set
-+CONFIG_USB_STORAGE_DPCM=y
-+CONFIG_USB_STORAGE_USBAT=y
-+CONFIG_USB_STORAGE_SDDR09=y
-+CONFIG_USB_STORAGE_SDDR55=y
-+CONFIG_USB_STORAGE_JUMPSHOT=y
-+CONFIG_USB_STORAGE_ALAUDA=y
-+CONFIG_USB_STORAGE_KARMA=y
-+CONFIG_USB_LIBUSUAL=y
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+CONFIG_USB_SERIAL=m
-+CONFIG_USB_EZUSB=y
-+CONFIG_USB_SERIAL_GENERIC=y
-+CONFIG_USB_SERIAL_AIRCABLE=m
-+CONFIG_USB_SERIAL_AIRPRIME=m
-+CONFIG_USB_SERIAL_ARK3116=m
-+CONFIG_USB_SERIAL_BELKIN=m
-+# CONFIG_USB_SERIAL_CH341 is not set
-+CONFIG_USB_SERIAL_WHITEHEAT=m
-+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-+CONFIG_USB_SERIAL_CP2101=m
-+CONFIG_USB_SERIAL_CYPRESS_M8=m
-+CONFIG_USB_SERIAL_EMPEG=m
-+CONFIG_USB_SERIAL_FTDI_SIO=m
-+CONFIG_USB_SERIAL_FUNSOFT=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_GARMIN=m
-+CONFIG_USB_SERIAL_IPW=m
-+# CONFIG_USB_SERIAL_IUU is not set
-+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_MOS7720=m
-+CONFIG_USB_SERIAL_MOS7840=m
-+CONFIG_USB_SERIAL_NAVMAN=m
-+CONFIG_USB_SERIAL_PL2303=m
-+# CONFIG_USB_SERIAL_OTI6858 is not set
-+CONFIG_USB_SERIAL_HP4X=m
-+CONFIG_USB_SERIAL_SAFE=m
-+CONFIG_USB_SERIAL_SAFE_PADDED=y
-+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-+CONFIG_USB_SERIAL_TI=m
-+CONFIG_USB_SERIAL_CYBERJACK=m
-+CONFIG_USB_SERIAL_XIRCOM=m
-+CONFIG_USB_SERIAL_OPTION=m
-+CONFIG_USB_SERIAL_OMNINET=m
-+# CONFIG_USB_SERIAL_DEBUG is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+CONFIG_USB_BERRY_CHARGE=m
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_LD is not set
-+CONFIG_USB_TRANCEVIBRATOR=m
-+CONFIG_USB_IOWARRIOR=m
-+# CONFIG_USB_TEST is not set
-+CONFIG_USB_GADGET=y
-+# CONFIG_USB_GADGET_DEBUG is not set
-+# CONFIG_USB_GADGET_DEBUG_FILES is not set
-+# CONFIG_USB_GADGET_DEBUG_FS is not set
-+CONFIG_USB_GADGET_SELECTED=y
-+# CONFIG_USB_GADGET_AMD5536UDC is not set
-+# CONFIG_USB_GADGET_ATMEL_USBA is not set
-+# CONFIG_USB_GADGET_FSL_USB2 is not set
-+# CONFIG_USB_GADGET_NET2280 is not set
-+# CONFIG_USB_GADGET_PXA2XX is not set
-+# CONFIG_USB_GADGET_M66592 is not set
-+# CONFIG_USB_GADGET_GOKU is not set
-+# CONFIG_USB_GADGET_LH7A40X is not set
-+# CONFIG_USB_GADGET_OMAP is not set
-+CONFIG_USB_GADGET_S3C2410=y
-+CONFIG_USB_S3C2410=y
-+# CONFIG_USB_S3C2410_DEBUG is not set
-+# CONFIG_USB_GADGET_AT91 is not set
-+# CONFIG_USB_GADGET_DUMMY_HCD is not set
-+# CONFIG_USB_GADGET_DUALSPEED is not set
-+# CONFIG_USB_ZERO is not set
-+CONFIG_USB_ETH=y
-+CONFIG_USB_ETH_RNDIS=y
-+# CONFIG_USB_GADGETFS is not set
-+# CONFIG_USB_FILE_STORAGE is not set
-+# CONFIG_USB_G_SERIAL is not set
-+# CONFIG_USB_MIDI_GADGET is not set
-+# CONFIG_USB_G_PRINTER is not set
-+
-+#
-+# SDIO support
-+#
-+CONFIG_SDIO=y
-+CONFIG_SDIO_S3C24XX=y
-+CONFIG_SDIO_S3C24XX_DMA=y
-+CONFIG_SDIO_AR6000_WLAN=y
-+CONFIG_MMC=y
-+# CONFIG_MMC_DEBUG is not set
-+# CONFIG_MMC_UNSAFE_RESUME is not set
-+
-+#
-+# MMC/SD Card Drivers
-+#
-+CONFIG_MMC_BLOCK=y
-+# CONFIG_MMC_BLOCK_BOUNCE is not set
-+# CONFIG_SDIO_UART is not set
-+
-+#
-+# MMC/SD Host Controller Drivers
-+#
-+# CONFIG_MMC_SPI is not set
-+# CONFIG_MMC_S3C is not set
-+CONFIG_NEW_LEDS=y
-+CONFIG_LEDS_CLASS=y
-+
-+#
-+# LED drivers
-+#
-+CONFIG_LEDS_S3C24XX=m
-+CONFIG_LEDS_GPIO=y
-+CONFIG_LEDS_NEO1973_VIBRATOR=y
-+CONFIG_LEDS_NEO1973_GTA02=y
-+
-+#
-+# LED Triggers
-+#
-+CONFIG_LEDS_TRIGGERS=y
-+CONFIG_LEDS_TRIGGER_TIMER=y
-+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+CONFIG_RTC_DEBUG=y
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+# CONFIG_RTC_DRV_R9701 is not set
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+CONFIG_RTC_DRV_S3C=m
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+# CONFIG_EXT3_FS_XATTR is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+# CONFIG_JBD_DEBUG is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_GFS2_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+CONFIG_AUTOFS4_FS=m
-+CONFIG_FUSE_FS=m
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+CONFIG_ISO9660_FS=m
-+CONFIG_JOLIET=y
-+# CONFIG_ZISOFS 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_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+CONFIG_CONFIGFS_FS=m
-+
-+#
-+# 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_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+CONFIG_JFFS2_SUMMARY=y
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+CONFIG_ROMFS_FS=y
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+# CONFIG_NETWORK_FILESYSTEMS is not set
-+
-+#
-+# Partition Types
-+#
-+# CONFIG_PARTITION_ADVANCED is not set
-+CONFIG_MSDOS_PARTITION=y
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=y
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+CONFIG_NLS_CODEPAGE_850=m
-+# 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=m
-+CONFIG_NLS_CODEPAGE_950=m
-+# 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=y
-+# 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=m
-+# CONFIG_DLM is not set
-+
-+#
-+# Kernel hacking
-+#
-+CONFIG_PRINTK_TIME=y
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+CONFIG_DEBUG_SHIRQ=y
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+CONFIG_TIMER_STATS=y
-+# CONFIG_DEBUG_SLAB is not set
-+CONFIG_DEBUG_PREEMPT=y
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+CONFIG_DEBUG_SPINLOCK=y
-+CONFIG_DEBUG_MUTEXES=y
-+CONFIG_DEBUG_LOCK_ALLOC=y
-+# CONFIG_PROVE_LOCKING is not set
-+CONFIG_LOCKDEP=y
-+CONFIG_LOCK_STAT=y
-+CONFIG_DEBUG_LOCKDEP=y
-+CONFIG_DEBUG_SPINLOCK_SLEEP=y
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+CONFIG_STACKTRACE=y
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_LIST is not set
-+CONFIG_DEBUG_SG=y
-+CONFIG_FRAME_POINTER=y
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_USER is not set
-+CONFIG_DEBUG_ERRORS=y
-+# CONFIG_DEBUG_STACK_USAGE is not set
-+CONFIG_DEBUG_LL=y
-+# CONFIG_DEBUG_ICEDCC is not set
-+# CONFIG_DEBUG_S3C_PORT is not set
-+CONFIG_DEBUG_S3C_UART=2
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_AEAD=m
-+CONFIG_CRYPTO_BLKCIPHER=y
-+# CONFIG_CRYPTO_SEQIV is not set
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_HMAC=y
-+CONFIG_CRYPTO_XCBC=m
-+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_WP512=m
-+CONFIG_CRYPTO_TGR192=m
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_CBC=y
-+CONFIG_CRYPTO_PCBC=m
-+CONFIG_CRYPTO_LRW=m
-+# CONFIG_CRYPTO_XTS is not set
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_FCRYPT=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_CAST6=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_KHAZAD=m
-+CONFIG_CRYPTO_ANUBIS=m
-+# CONFIG_CRYPTO_SEED is not set
-+# CONFIG_CRYPTO_SALSA20 is not set
-+CONFIG_CRYPTO_DEFLATE=m
-+CONFIG_CRYPTO_MICHAEL_MIC=m
-+CONFIG_CRYPTO_CRC32C=m
-+CONFIG_CRYPTO_CAMELLIA=m
-+CONFIG_CRYPTO_TEST=m
-+CONFIG_CRYPTO_AUTHENC=m
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+CONFIG_CRC_CCITT=m
-+CONFIG_CRC16=m
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+CONFIG_LIBCRC32C=m
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_TEXTSEARCH=y
-+CONFIG_TEXTSEARCH_KMP=m
-+CONFIG_TEXTSEARCH_BM=m
-+CONFIG_TEXTSEARCH_FSM=m
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_DMA=y
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1122-tracking-2.6.25-input_dev-cdev-union-removed.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1122-tracking-2.6.25-input_dev-cdev-union-removed.patch.patch
deleted file mode 100755 (executable)
index d8729dc..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-From 903c853b0a4b1d56d61d5661171102f5f369c27d Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:06 +0100
-Subject: [PATCH] tracking-2.6.25-input_dev-cdev-union-removed.patch
-
-struct input_dev in include/linux/input.h used to have a union
-cdev which contained the associated device struct pointer.  This
-got simplified out in 2.6.25, so this patch removes cdev from
-our drivers that used it before.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50606.c        |    1 -
- drivers/i2c/chips/pcf50633.c        |    1 -
- drivers/input/keyboard/neo1973kbd.c |    1 -
- drivers/input/keyboard/qt2410kbd.c  |    1 -
- 4 files changed, 0 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
-index aa841e3..2466bf8 100644
---- a/drivers/i2c/chips/pcf50606.c
-+++ b/drivers/i2c/chips/pcf50606.c
-@@ -1708,7 +1708,6 @@ static int pcf50606_detect(struct i2c_adapter *adapter, int address, int kind)
-       data->input_dev->name = "FIC Neo1973 PMU events";
-       data->input_dev->phys = "I2C";
-       data->input_dev->id.bustype = BUS_I2C;
--      data->input_dev->cdev.dev = &new_client->dev;
-       data->input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_PWR);
-       set_bit(KEY_POWER, data->input_dev->keybit);
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 09d5cfd..cb4cad8 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1732,7 +1732,6 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-       data->input_dev->name = "GTA02 PMU events";
-       data->input_dev->phys = "FIXME";
-       data->input_dev->id.bustype = BUS_I2C;
--      data->input_dev->cdev.dev = &new_client->dev;
-       data->input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_PWR);
-       set_bit(KEY_POWER, data->input_dev->keybit);
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-index 8b9a420..6fc3ac1 100644
---- a/drivers/input/keyboard/neo1973kbd.c
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -199,7 +199,6 @@ static int neo1973kbd_probe(struct platform_device *pdev)
-       input_dev->id.vendor = 0x0001;
-       input_dev->id.product = 0x0001;
-       input_dev->id.version = 0x0100;
--      input_dev->cdev.dev = &pdev->dev;
-       input_dev->private = neo1973kbd;
-       input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_SW);
-diff --git a/drivers/input/keyboard/qt2410kbd.c b/drivers/input/keyboard/qt2410kbd.c
-index fa4bf32..cd8d7c6 100644
---- a/drivers/input/keyboard/qt2410kbd.c
-+++ b/drivers/input/keyboard/qt2410kbd.c
-@@ -124,7 +124,6 @@ static int gta01kbd_probe(struct platform_device *pdev)
-       input_dev->id.vendor = 0x0001;
-       input_dev->id.product = 0x0001;
-       input_dev->id.version = 0x0100;
--      input_dev->cdev.dev = &pdev->dev;
-       input_dev->private = gta01kbd;
-       input_dev->evbit[0] = BIT(EV_KEY);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1123-tracking-2.6.25-struct-bus-type-loses-devices-member.patch b/target/linux/s3c24xx/patches-2.6.26/1123-tracking-2.6.25-struct-bus-type-loses-devices-member.patch
deleted file mode 100755 (executable)
index 4510064..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-From e7e0525a9ddbb82b24216af5182353a345dca59f Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:06 +0100
-Subject: [PATCH] tracking-2.6.25-struct-bus-type-loses-devices-member.patch
-
-I don't know what device the symlink should be linked
-against on GTA01, somebody that does know needs to edit
-it in where it says "FIXME"... I think the supplied method
-can work OK otherwise.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50606.c |   19 +++++++++++++++----
- 1 files changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
-index 2466bf8..50f944f 100644
---- a/drivers/i2c/chips/pcf50606.c
-+++ b/drivers/i2c/chips/pcf50606.c
-@@ -1781,6 +1781,12 @@ static int pcf50606_detect(struct i2c_adapter *adapter, int address, int kind)
- #ifdef CONFIG_MACH_NEO1973_GTA01
-       if (machine_is_neo1973_gta01()) {
-+              /* FIXME: what is the device name we are symlinking to?
-+               * symlink won't get created until this is fixed.
-+               */
-+              struct device * busdev = bus_find_device_by_name(
-+                                                      &platform_bus_type,
-+                                                      NULL, "FIXME");
-               gta01_pm_gps_dev.dev.parent = &new_client->dev;
-               switch (system_rev) {
-               case GTA01Bv2_SYSTEM_REV:
-@@ -1792,11 +1798,16 @@ static int pcf50606_detect(struct i2c_adapter *adapter, int address, int kind)
-               }
-               platform_device_register(&gta01_pm_gps_dev);
-               /* a link for gllin compatibility */
--              err = sysfs_create_link(&platform_bus_type.devices.kobj,
--                  &gta01_pm_gps_dev.dev.kobj, "gta01-pm-gps.0");
--              if (err)
--                      printk(KERN_ERR
-+              /* 2.6.25 tracking: platform_bus_type.devices that was here
-+               * has gone away in mainline
-+               */
-+              if (busdev) {
-+                      err = sysfs_create_link(&busdev->kobj,
-+                      &gta01_pm_gps_dev.dev.kobj, "gta01-pm-gps.0");
-+                      if (err)
-+                              printk(KERN_ERR
-                           "sysfs_create_link (gta01-pm-gps.0): %d\n", err);
-+              }
-       }
- #endif
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1124-tracking-2.6.25-upstream-s3c2410_gpio_irq2pin.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1124-tracking-2.6.25-upstream-s3c2410_gpio_irq2pin.patch.patch
deleted file mode 100755 (executable)
index 5c89dfa..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6dc4a3ea9eb3e410e93b0c61c08bd648c8954556 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:06 +0100
-Subject: [PATCH] tracking-2.6.25-upstream-s3c2410_gpio_irq2pin.patch
-
-Holger got beaten to it on mainline, they provide a
-s3c2410_gpio_irq2pin() instead of the name he used.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- include/asm-arm/arch-s3c2410/gpio.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/include/asm-arm/arch-s3c2410/gpio.h b/include/asm-arm/arch-s3c2410/gpio.h
-index 1b96c4e..520c24b 100644
---- a/include/asm-arm/arch-s3c2410/gpio.h
-+++ b/include/asm-arm/arch-s3c2410/gpio.h
-@@ -61,7 +61,7 @@ static inline int gpio_direction_output(unsigned gpio, int value)
- #define gpio_to_irq(gpio)             s3c2400_gpio_getirq(gpio)
- #else
- #define gpio_to_irq(gpio)             s3c2410_gpio_getirq(gpio)
--#define irq_to_gpio(irq)              s3c2410_irq_to_gpio(irq)
-+#define irq_to_gpio(irq)              s3c2410_gpio_irq2pin(irq)
- #endif
- #endif
- #include <asm-generic/gpio.h>
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1125-tracking-2.6.25-deprecated-includefile-wm8753.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1125-tracking-2.6.25-deprecated-includefile-wm8753.patch.patch
deleted file mode 100755 (executable)
index 4db1ab5..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-From 264ee90f50361defdd00d5280d0b9b7b8d3f3995 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:06 +0100
-Subject: [PATCH] tracking-2.6.25-deprecated-includefile-wm8753.patch
-
-<linux/driver.h> is just empty and is deprecated now
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- sound/soc/s3c24xx/neo1973_gta02_wm8753.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
-index dbc9c18..65c9de0 100644
---- a/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
-+++ b/sound/soc/s3c24xx/neo1973_gta02_wm8753.c
-@@ -24,7 +24,6 @@
- #include <linux/interrupt.h>
- #include <linux/platform_device.h>
- #include <linux/i2c.h>
--#include <sound/driver.h>
- #include <sound/core.h>
- #include <sound/pcm.h>
- #include <sound/soc.h>
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1126-tracking-2.6.25-changed-s3c2410_dma_request-reurn.pa.patch b/target/linux/s3c24xx/patches-2.6.26/1126-tracking-2.6.25-changed-s3c2410_dma_request-reurn.pa.patch
deleted file mode 100755 (executable)
index dac5145..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From 6543660c429224f3cb8c9d16c786a521d0fc2969 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:06 +0100
-Subject: [PATCH] tracking-2.6.25-changed-s3c2410_dma_request-reurn.patch
-
-s3c2410_dma_request used to return 0 for OK and something else
-for error, now it returns -ve error code or +ve dma channel index + flag
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c |    3 ++-
- sound/soc/s3c24xx/s3c24xx-pcm.c        |    2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-index 8c3bbbc..af0066d 100644
---- a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-+++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-@@ -1192,7 +1192,8 @@ static int s3c24xx_hcd_hw_init(struct s3c24xx_hcd_context * context)
-       }
--      if (s3c2410_dma_request(context->dma_channel, &s3c24xx_hcd_dma_client, NULL)) {
-+      if (s3c2410_dma_request(context->dma_channel, &s3c24xx_hcd_dma_client,
-+                                                                  NULL) < 0) {
-               DBG_PRINT(SDDBG_ERROR, ("unable to get DMA channel.\n"));
-               status = -ENOENT;
-               goto out_free_dma;
-diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c
-index 7806ae6..40abef1 100644
---- a/sound/soc/s3c24xx/s3c24xx-pcm.c
-+++ b/sound/soc/s3c24xx/s3c24xx-pcm.c
-@@ -172,7 +172,7 @@ static int s3c24xx_pcm_hw_params(struct snd_pcm_substream *substream,
-                                         prtd->params->client, NULL);
-               if (ret < 0) {
--                      DBG(KERN_ERR "failed to get dma channel\n");
-+                      DBG(KERN_ERR "failed to get dma channel: %d\n", ret);
-                       return ret;
-               }
-       }
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1127-gta01-gps-power-state-resume-preserve.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1127-gta01-gps-power-state-resume-preserve.patch.patch
deleted file mode 100755 (executable)
index 7c2cf23..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6c1ea4a051c3dad94de37fe766388ac0a81eb22c Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Fri, 25 Jul 2008 23:06:06 +0100
-Subject: [PATCH] gta01-gps-power-state-resume-preserve.patch
-
-Created an attachment (id=593) / from BZ#79
-Updated patch to preserve the power state of the GPS on the GTA01
-
-Currently the GPS is powered up after a suspend/resume occurs.  This patch will
-only power the GPS back up if it was powered up when the GTA01 suspended.
-
-Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gps.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-index d020f8d..9c6adfa 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-@@ -514,8 +514,8 @@ static int gta01_pm_gps_resume(struct platform_device *pdev)
- {
- #ifdef CONFIG_MACH_NEO1973_GTA01
-       if (machine_is_neo1973_gta01()) {
--              /* FIXME */
--              gps_power_sequence_up();
-+              if (neo1973_gps.power_was_on)
-+                      gps_power_sequence_up();
-       }
- #endif /* CONFIG_MACH_NEO1973_GTA01 */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1128-gta01-fix-jbt-platform-missing-members.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1128-gta01-fix-jbt-platform-missing-members.patch.patch
deleted file mode 100755 (executable)
index 5887cf7..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-From a471ebdb87d610c8e0b85c01b7a2b95c13a869cc Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Fri, 25 Jul 2008 23:06:07 +0100
-Subject: [PATCH] gta01-fix-jbt-platform-missing-members.patch
-
-Created an attachment (id=594) / BZ#79
-Add missing platform_data that caused the GTA01 to crash on suspend/resume
-
-The interface to the jbt6k74 driver changed slightly; this patch adds the
-missing platform_data for the GTA01.  This prevents a crash while suspending.
-This patch also makes some minor changes to cleanup and clarify some debug
-messages.
-Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- arch/arm/mach-s3c2410/mach-gta01.c |   21 ++++++++++++++++-----
- 1 files changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index ff08449..a77ed3d 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -73,6 +73,7 @@
- #include <asm/plat-s3c24xx/pm.h>
- #include <asm/plat-s3c24xx/udc.h>
- #include <asm/plat-s3c24xx/neo1973.h>
-+#include <linux/jbt6k74.h>
- static struct map_desc gta01_iodesc[] __initdata = {
-       {
-@@ -389,7 +390,7 @@ static void gta01_mmc_set_power(unsigned char power_mode, unsigned short vdd)
-       int bit;
-       int mv = 1700; /* 1.7V for MMC_VDD_165_195 */
--      printk(KERN_DEBUG "mmc_set_power(power_mode=%u, vdd=%u\n",
-+      printk(KERN_DEBUG "mmc_set_power(power_mode=%u, vdd=%u)\n",
-              power_mode, vdd);
-       switch (system_rev) {
-@@ -499,10 +500,20 @@ static struct s3c2410_ts_mach_info gta01_ts_cfg = {
- /* SPI */
-+void gta01_jbt6k74_reset(int devidx, int level)
-+{
-+      /* empty place holder; gta01 does not yet use this */
-+      printk(KERN_DEBUG "gta01_jbt6k74_reset\n");
-+}
-+
-+const struct jbt6k74_platform_data gta01_jbt6k74_pdata = {
-+      .reset          = gta01_jbt6k74_reset,
-+};
-+
- static struct spi_board_info gta01_spi_board_info[] = {
-       {
-               .modalias       = "jbt6k74",
--              /* platform_data */
-+              .platform_data  = &gta01_jbt6k74_pdata,
-               /* controller_data */
-               /* irq */
-               .max_speed_hz   = 10 * 1000 * 1000,
-@@ -641,7 +652,7 @@ static void __init gta01_map_io(void)
- static irqreturn_t gta01_modem_irq(int irq, void *param)
- {
--      printk(KERN_DEBUG "modem wakeup interrupt\n");
-+      printk(KERN_DEBUG "GSM wakeup interrupt (IRQ %d)\n", irq);
-       return IRQ_HANDLED;
- }
-@@ -709,9 +720,9 @@ static void __init gta01_machine_init(void)
-       set_irq_type(GTA01_IRQ_MODEM, IRQT_RISING);
-       rc = request_irq(GTA01_IRQ_MODEM, gta01_modem_irq, IRQF_DISABLED,
-                        "modem", NULL);
--      if (!rc)
--              printk(KERN_ERR  "GTA01: can't request GSM modem wakeup IRQ\n");
-       enable_irq_wake(GTA01_IRQ_MODEM);
-+      printk(KERN_DEBUG  "Enabled GSM wakeup IRQ %d (rc=%d)\n",
-+             GTA01_IRQ_MODEM, rc);
- }
- MACHINE_START(NEO1973_GTA01, "GTA01")
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1129-gta01-fix-resume-redo-par.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1129-gta01-fix-resume-redo-par.patch.patch
deleted file mode 100755 (executable)
index 40462b5..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From 925a4851d2235f4b23ea01ef42152823f7524c9c Mon Sep 17 00:00:00 2001
-From: Reddog <reddog@mastersword.de>
-Date: Fri, 25 Jul 2008 23:06:07 +0100
-Subject: [PATCH] gta01-fix-resume-redo-par.patch
-
- --> (http://bugzilla.openmoko.org/cgi-bin/bugzilla/attachment.cgi?id=595&action=view)
-fix resume of fbdev  BZ#79
-
-I played a bit with the fbdev resume. With this patch the neo doesn't get this
-white screen on resume from console and from X.
-
-Signed-off-by: Reddog <reddog@mastersword.de>
----
- drivers/video/s3c2410fb.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
-index f059896..cd030d7 100644
---- a/drivers/video/s3c2410fb.c
-+++ b/drivers/video/s3c2410fb.c
-@@ -1017,6 +1017,8 @@ static int s3c2410fb_resume(struct platform_device *dev)
-       s3c2410fb_init_registers(fbinfo);
-+      s3c2410fb_set_par(fbinfo);
-+
-       return 0;
- }
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1130-From-cc08b5986dfd8d971ee46ce7045fb7863f99a92a-Mon-Se.patch b/target/linux/s3c24xx/patches-2.6.26/1130-From-cc08b5986dfd8d971ee46ce7045fb7863f99a92a-Mon-Se.patch
deleted file mode 100755 (executable)
index c37e6fc..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-From 348e7db53a04b7d98e0f63f372b86882a995d3c8 Mon Sep 17 00:00:00 2001
-From: Matt Hsu <matt_hsu@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:07 +0100
-Subject: [PATCH] From cc08b5986dfd8d971ee46ce7045fb7863f99a92a Mon Sep 17 00:00:00 2001
- Subject: [PATCH] - add suspend/resume function of s3c24xx_hcd driver
-
-Signed-off-by: Matt Hsu <matt_hsu@openmoko.org>
----
- drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c |   65 ++++++++++++++++++++++++++++++++
- drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h |   14 +++++++
- 2 files changed, 79 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-index af0066d..fdc69a0 100644
---- a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-+++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-@@ -1365,11 +1365,76 @@ static int s3c24xx_hcd_remove(struct platform_device * pdev) {
-       return 0;
- }
-+#ifdef CONFIG_PM 
-+
-+static int s3c24xx_hcd_suspend(struct platform_device * pdev)
-+{
-+      struct s3c24xx_hcd_context * context = &hcd_context;    
-+      unsigned long flags;
-+
-+      spin_lock_irqsave(&context->lock, flags);
-+
-+      context->suspend_regs.con       = readl(context->base + S3C2410_SDICON);
-+      context->suspend_regs.pre       = readl(context->base + S3C2410_SDIPRE);
-+      context->suspend_regs.cmdarg    = readl(context->base + S3C2410_SDICMDARG);
-+      context->suspend_regs.cmdcon    = readl(context->base + S3C2410_SDICMDCON);
-+      context->suspend_regs.cmdsta    = readl(context->base + S3C2410_SDICMDSTAT);
-+      context->suspend_regs.r0        = readl(context->base + S3C2410_SDIRSP0);
-+      context->suspend_regs.r1        = readl(context->base + S3C2410_SDIRSP1);
-+      context->suspend_regs.r2        = readl(context->base + S3C2410_SDIRSP2);
-+      context->suspend_regs.r3        = readl(context->base + S3C2410_SDIRSP3);
-+      context->suspend_regs.timer     = readl(context->base + S3C2410_SDITIMER);
-+      context->suspend_regs.bsize     = readl(context->base + S3C2410_SDIBSIZE);
-+      context->suspend_regs.datcon    = readl(context->base + S3C2410_SDIDCON);
-+      context->suspend_regs.datcnt    = readl(context->base + S3C2410_SDIDCNT);
-+      context->suspend_regs.datsta    = readl(context->base + S3C2410_SDIDSTA);
-+      context->suspend_regs.fsta      = readl(context->base + S3C2410_SDIFSTA);
-+      context->suspend_regs.imask   = readl(context->base + S3C2440_SDIIMSK);
-+      
-+      spin_unlock_irqrestore(&context->lock, flags);
-+      return 0;
-+}
-+
-+static int s3c24xx_hcd_resume(struct platform_device * pdev)
-+{     
-+      struct s3c24xx_hcd_context * context = &hcd_context;
-+      unsigned long flags;
-+
-+      spin_lock_irqsave(&context->lock, flags);
-+      
-+      writel(context->suspend_regs.con, context->base + S3C2410_SDICON);
-+      writel(context->suspend_regs.pre, context->base + S3C2410_SDIPRE);
-+      writel(context->suspend_regs.cmdarg, context->base + S3C2410_SDICMDARG);
-+      writel(context->suspend_regs.cmdcon, context->base + S3C2410_SDICMDCON);
-+      writel(context->suspend_regs.cmdsta, context->base + S3C2410_SDICMDSTAT);
-+      writel(context->suspend_regs.r0, context->base + S3C2410_SDIRSP0);
-+      writel(context->suspend_regs.r1, context->base + S3C2410_SDIRSP1);
-+      writel(context->suspend_regs.r2, context->base + S3C2410_SDIRSP2);
-+      writel(context->suspend_regs.r3, context->base + S3C2410_SDIRSP3);
-+      writel(context->suspend_regs.timer, context->base + S3C2410_SDITIMER);
-+      writel(context->suspend_regs.bsize, context->base + S3C2410_SDIBSIZE);
-+      writel(context->suspend_regs.datcon, context->base + S3C2410_SDIDCON);
-+      writel(context->suspend_regs.datcnt, context->base + S3C2410_SDIDCNT);
-+      writel(context->suspend_regs.datsta, context->base + S3C2410_SDIDSTA);
-+      writel(context->suspend_regs.fsta, context->base + S3C2410_SDIFSTA);
-+      writel(context->suspend_regs.imask, context->base + S3C2440_SDIIMSK);
-+
-+      spin_unlock_irqrestore(&context->lock, flags);
-+      return 0;
-+}
-+
-+#else
-+#define s3c24xx_hcd_suspend = NULL
-+#define s3c24xx_hcd_resume  = NULL
-+#endif
-+
- static struct platform_driver s3c24xx_hcd_sdio =
- {
-       .driver.name    = "s3c24xx-sdio",
-       .probe          = s3c24xx_hcd_probe,
-       .remove         = s3c24xx_hcd_remove,
-+      .suspend    = s3c24xx_hcd_suspend,
-+      .resume         = s3c24xx_hcd_resume,
- };
- #ifdef CONFIG_DEBUG_FS
-diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
-index eb262fc..47fdd33 100644
---- a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
-+++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
-@@ -57,6 +57,20 @@ struct s3c24xx_hcd_context {
-       struct work_struct        io_work;
-       struct work_struct        irq_work;
-+
-+#ifdef CONFIG_PM
-+      struct {
-+              UINT32          con;
-+              UINT32          pre;
-+              UINT32          cmdarg, cmdcon, cmdsta;
-+              UINT32          r0, r1, r2, r3;
-+              UINT32          timer;
-+              UINT32          bsize;
-+              UINT32          datcon, datcnt, datsta;
-+              UINT32          fsta;
-+              UINT32          imask;  
-+      } suspend_regs;
-+#endif
- };
- SDIO_STATUS s3c24xx_hcd_config(PSDHCD hcd, PSDCONFIG config);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1131-clean-sdio-hcd-suspend.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1131-clean-sdio-hcd-suspend.patch.patch
deleted file mode 100755 (executable)
index ef34d6f..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-From 83d4d74caed0073bfc16a61e8ad604f64801e6ba Mon Sep 17 00:00:00 2001
-From: Andy Green <agreen@localhost.localdomain>
-Date: Fri, 25 Jul 2008 23:06:07 +0100
-Subject: [PATCH] clean-sdio-hcd-suspend.patch
-
-fix trailing whitespace and function args for suspend.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-index fdc69a0..edb8523 100644
---- a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-+++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-@@ -1365,11 +1365,11 @@ static int s3c24xx_hcd_remove(struct platform_device * pdev) {
-       return 0;
- }
--#ifdef CONFIG_PM 
-+#ifdef CONFIG_PM
--static int s3c24xx_hcd_suspend(struct platform_device * pdev)
-+static int s3c24xx_hcd_suspend(struct platform_device * pdev, pm_message_t state)
- {
--      struct s3c24xx_hcd_context * context = &hcd_context;    
-+      struct s3c24xx_hcd_context * context = &hcd_context;
-       unsigned long flags;
-       spin_lock_irqsave(&context->lock, flags);
-@@ -1390,18 +1390,18 @@ static int s3c24xx_hcd_suspend(struct platform_device * pdev)
-       context->suspend_regs.datsta    = readl(context->base + S3C2410_SDIDSTA);
-       context->suspend_regs.fsta      = readl(context->base + S3C2410_SDIFSTA);
-       context->suspend_regs.imask   = readl(context->base + S3C2440_SDIIMSK);
--      
-+
-       spin_unlock_irqrestore(&context->lock, flags);
-       return 0;
- }
- static int s3c24xx_hcd_resume(struct platform_device * pdev)
--{     
-+{
-       struct s3c24xx_hcd_context * context = &hcd_context;
-       unsigned long flags;
-       spin_lock_irqsave(&context->lock, flags);
--      
-+
-       writel(context->suspend_regs.con, context->base + S3C2410_SDICON);
-       writel(context->suspend_regs.pre, context->base + S3C2410_SDIPRE);
-       writel(context->suspend_regs.cmdarg, context->base + S3C2410_SDICMDARG);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1132-config-update-2.6.21-rc1.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1132-config-update-2.6.21-rc1.patch.patch
deleted file mode 100755 (executable)
index dd8ca0f..0000000
+++ /dev/null
@@ -1,461 +0,0 @@
-From 9f8c5ed5aa643f2bf61a8831e574df03d3c6fc50 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:07 +0100
-Subject: [PATCH] config-update-2.6.21-rc1.patch
- Signed-off-by: Andy Green <andy@openmoko.com>
-
----
- defconfig-2.6.25 |  151 ++++++++++++++++++++++++++++++++++++------------------
- 1 files changed, 101 insertions(+), 50 deletions(-)
-
-diff --git a/defconfig-2.6.25 b/defconfig-2.6.25
-index ce1c1ca..0f663da 100644
---- a/defconfig-2.6.25
-+++ b/defconfig-2.6.25
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
--# Linux kernel version: 2.6.25-rc9
--# Sun Apr 13 08:49:27 2008
-+# Linux kernel version: 2.6.26-rc1
-+# Wed May  7 16:13:07 2008
- #
- CONFIG_ARM=y
- CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-@@ -66,6 +66,7 @@ CONFIG_SYSCTL=y
- # CONFIG_EMBEDDED is not set
- CONFIG_UID16=y
- CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_SYSCTL_SYSCALL_CHECK=y
- CONFIG_KALLSYMS=y
- CONFIG_KALLSYMS_ALL=y
- # CONFIG_KALLSYMS_EXTRA_PASS is not set
-@@ -92,12 +93,14 @@ CONFIG_HAVE_OPROFILE=y
- # CONFIG_KPROBES is not set
- CONFIG_HAVE_KPROBES=y
- CONFIG_HAVE_KRETPROBES=y
-+# CONFIG_HAVE_DMA_ATTRS is not set
- CONFIG_PROC_PAGE_MONITOR=y
- CONFIG_SLABINFO=y
- CONFIG_RT_MUTEXES=y
- # CONFIG_TINY_SHMEM is not set
- CONFIG_BASE_SMALL=0
- CONFIG_MODULES=y
-+# CONFIG_MODULE_FORCE_LOAD is not set
- CONFIG_MODULE_UNLOAD=y
- CONFIG_MODULE_FORCE_UNLOAD=y
- # CONFIG_MODVERSIONS is not set
-@@ -150,7 +153,7 @@ CONFIG_CLASSIC_RCU=y
- # CONFIG_ARCH_KS8695 is not set
- # CONFIG_ARCH_NS9XXX is not set
- # CONFIG_ARCH_MXC is not set
--# CONFIG_ARCH_ORION is not set
-+# CONFIG_ARCH_ORION5X is not set
- # CONFIG_ARCH_PNX4008 is not set
- # CONFIG_ARCH_PXA is not set
- # CONFIG_ARCH_RPC is not set
-@@ -203,6 +206,7 @@ CONFIG_S3C2410_PWM=y
- # CONFIG_ARCH_BAST is not set
- # CONFIG_MACH_OTOM is not set
- # CONFIG_MACH_AML_M5900 is not set
-+# CONFIG_MACH_TCT_HAMMER is not set
- # CONFIG_MACH_VR1000 is not set
- CONFIG_MACH_QT2410=y
- CONFIG_MACH_NEO1973_GTA01=y
-@@ -226,7 +230,6 @@ CONFIG_S3C2440_C_FIQ=y
- CONFIG_ARCH_S3C2440=y
- # CONFIG_MACH_NEXCODER_2440 is not set
- CONFIG_SMDK2440_CPU2440=y
--CONFIG_MACH_HXD8=y
- CONFIG_MACH_NEO1973_GTA02=y
- # CONFIG_NEO1973_GTA02_2440 is not set
- CONFIG_CPU_S3C2442=y
-@@ -248,6 +251,7 @@ CONFIG_CPU_32=y
- CONFIG_CPU_ARM920T=y
- CONFIG_CPU_32v4T=y
- CONFIG_CPU_ABRT_EV4T=y
-+CONFIG_CPU_PABRT_NOIFAR=y
- CONFIG_CPU_CACHE_V4WT=y
- CONFIG_CPU_CACHE_VIVT=y
- CONFIG_CPU_COPY_V4WB=y
-@@ -289,6 +293,7 @@ CONFIG_FLATMEM=y
- CONFIG_FLAT_NODE_MEM_MAP=y
- # CONFIG_SPARSEMEM_STATIC is not set
- # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_PAGEFLAGS_EXTENDED=y
- CONFIG_SPLIT_PTLOCK_CPUS=4096
- # CONFIG_RESOURCES_64BIT is not set
- CONFIG_ZONE_DMA_FLAG=1
-@@ -328,7 +333,6 @@ CONFIG_BINFMT_ELF=y
- # Power management options
- #
- CONFIG_PM=y
--CONFIG_PM_LEGACY=y
- CONFIG_PM_DEBUG=y
- CONFIG_PM_VERBOSE=y
- CONFIG_CAN_PM_TRACE=y
-@@ -406,8 +410,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=m
- CONFIG_INET6_XFRM_MODE_BEET=m
- # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
- CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_NDISC_NODETYPE=y
- CONFIG_IPV6_TUNNEL=m
- # CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_IPV6_MROUTE is not set
- # CONFIG_NETWORK_SECMARK is not set
- CONFIG_NETFILTER=y
- # CONFIG_NETFILTER_DEBUG is not set
-@@ -424,6 +430,7 @@ CONFIG_NF_CONNTRACK=m
- CONFIG_NF_CT_ACCT=y
- CONFIG_NF_CONNTRACK_MARK=y
- CONFIG_NF_CONNTRACK_EVENTS=y
-+# CONFIG_NF_CT_PROTO_DCCP is not set
- CONFIG_NF_CT_PROTO_GRE=m
- CONFIG_NF_CT_PROTO_SCTP=m
- # CONFIG_NF_CT_PROTO_UDPLITE is not set
-@@ -501,6 +508,7 @@ CONFIG_IP_NF_TARGET_REDIRECT=m
- CONFIG_IP_NF_TARGET_NETMAP=m
- CONFIG_NF_NAT_SNMP_BASIC=m
- CONFIG_NF_NAT_PROTO_GRE=m
-+CONFIG_NF_NAT_PROTO_SCTP=m
- CONFIG_NF_NAT_FTP=m
- CONFIG_NF_NAT_IRC=m
- CONFIG_NF_NAT_TFTP=m
-@@ -559,6 +567,7 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
- CONFIG_BRIDGE_EBT_SNAT=m
- CONFIG_BRIDGE_EBT_LOG=m
- CONFIG_BRIDGE_EBT_ULOG=m
-+# CONFIG_BRIDGE_EBT_NFLOG is not set
- # CONFIG_IP_DCCP is not set
- # CONFIG_IP_SCTP is not set
- # CONFIG_TIPC is not set
-@@ -675,6 +684,7 @@ CONFIG_MTD_PARTITIONS=y
- # CONFIG_MTD_REDBOOT_PARTS is not set
- CONFIG_MTD_CMDLINE_PARTS=y
- # CONFIG_MTD_AFS_PARTS is not set
-+# CONFIG_MTD_AR7_PARTS is not set
- #
- # User Modules And Translation Layers
-@@ -870,6 +880,7 @@ CONFIG_CS89x0=m
- #
- # CONFIG_WLAN_PRE80211 is not set
- # CONFIG_WLAN_80211 is not set
-+# CONFIG_IWLWIFI_LEDS is not set
- #
- # USB Network Adapters
-@@ -991,6 +1002,7 @@ CONFIG_VT_CONSOLE=y
- CONFIG_NR_TTY_DEVICES=4
- CONFIG_HW_CONSOLE=y
- CONFIG_VT_HW_CONSOLE_BINDING=y
-+CONFIG_DEVKMEM=y
- # CONFIG_SERIAL_NONSTANDARD is not set
- #
-@@ -1018,13 +1030,6 @@ CONFIG_I2C_BOARDINFO=y
- CONFIG_I2C_CHARDEV=y
- #
--# I2C Algorithms
--#
--# CONFIG_I2C_ALGOBIT is not set
--# CONFIG_I2C_ALGOPCF is not set
--# CONFIG_I2C_ALGOPCA is not set
--
--#
- # I2C Hardware Bus support
- #
- # CONFIG_I2C_GPIO is not set
-@@ -1035,6 +1040,7 @@ CONFIG_I2C_S3C2410=y
- # CONFIG_I2C_TAOS_EVM is not set
- # CONFIG_I2C_STUB is not set
- # CONFIG_I2C_TINY_USB is not set
-+# CONFIG_I2C_PCA_PLATFORM is not set
- #
- # Miscellaneous I2C Chip support
-@@ -1046,18 +1052,12 @@ CONFIG_SENSORS_PCF50633=y
- # CONFIG_SENSORS_PCF8574 is not set
- # CONFIG_PCF8575 is not set
- # CONFIG_SENSORS_PCF8591 is not set
--# CONFIG_TPS65010 is not set
- # CONFIG_SENSORS_MAX6875 is not set
- # CONFIG_SENSORS_TSL2550 is not set
--CONFIG_SENSORS_TSL256X=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
--
--#
--# SPI support
--#
- CONFIG_SPI=y
- # CONFIG_SPI_DEBUG is not set
- CONFIG_SPI_MASTER=y
-@@ -1159,6 +1159,7 @@ CONFIG_SSB_POSSIBLE=y
- #
- # CONFIG_MFD_SM501 is not set
- # CONFIG_MFD_ASIC3 is not set
-+# CONFIG_HTC_PASIC3 is not set
- CONFIG_MFD_GLAMO=y
- CONFIG_MFD_GLAMO_FB=y
- CONFIG_MFD_GLAMO_SPI_GPIO=y
-@@ -1168,8 +1169,16 @@ CONFIG_MFD_GLAMO_MCI=y
- #
- # Multimedia devices
- #
-+
-+#
-+# Multimedia core support
-+#
- # CONFIG_VIDEO_DEV is not set
- # CONFIG_DVB_CORE is not set
-+
-+#
-+# Multimedia drivers
-+#
- CONFIG_DAB=y
- # CONFIG_USB_DABUSB is not set
-@@ -1188,6 +1197,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
- # CONFIG_FB_SYS_FILLRECT is not set
- # CONFIG_FB_SYS_COPYAREA is not set
- # CONFIG_FB_SYS_IMAGEBLIT is not set
-+# CONFIG_FB_FOREIGN_ENDIAN is not set
- # CONFIG_FB_SYS_FOPS is not set
- CONFIG_FB_DEFERRED_IO=y
- # CONFIG_FB_SVGALIB is not set
-@@ -1295,15 +1305,16 @@ CONFIG_SND_SOC=y
- CONFIG_SND_S3C24XX_SOC=y
- CONFIG_SND_S3C24XX_SOC_I2S=y
- CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=y
-+# CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753_DEBUG is not set
- CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=y
- # CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
- #
--# SoC Audio support for SuperH
-+# ALSA SoC audio for Freescale SOCs
- #
- #
--# ALSA SoC audio for Freescale SOCs
-+# SoC Audio for the Texas Instruments OMAP
- #
- CONFIG_SND_SOC_WM8753=y
-@@ -1338,13 +1349,14 @@ CONFIG_USB_DEVICEFS=y
- CONFIG_USB_DEVICE_CLASS=y
- # CONFIG_USB_DYNAMIC_MINORS is not set
- CONFIG_USB_SUSPEND=y
--CONFIG_USB_PERSIST=y
- # CONFIG_USB_OTG is not set
- #
- # USB Host Controller Drivers
- #
-+# CONFIG_USB_C67X00_HCD is not set
- # CONFIG_USB_ISP116X_HCD is not set
-+# CONFIG_USB_ISP1760_HCD is not set
- CONFIG_USB_OHCI_HCD=y
- # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
- # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-@@ -1376,7 +1388,9 @@ CONFIG_USB_STORAGE_SDDR09=y
- CONFIG_USB_STORAGE_SDDR55=y
- CONFIG_USB_STORAGE_JUMPSHOT=y
- CONFIG_USB_STORAGE_ALAUDA=y
-+# CONFIG_USB_STORAGE_ONETOUCH is not set
- CONFIG_USB_STORAGE_KARMA=y
-+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
- CONFIG_USB_LIBUSUAL=y
- #
-@@ -1434,6 +1448,7 @@ CONFIG_USB_SERIAL_MOS7840=m
- CONFIG_USB_SERIAL_NAVMAN=m
- CONFIG_USB_SERIAL_PL2303=m
- # CONFIG_USB_SERIAL_OTI6858 is not set
-+# CONFIG_USB_SERIAL_SPCP8X5 is not set
- CONFIG_USB_SERIAL_HP4X=m
- CONFIG_USB_SERIAL_SAFE=m
- CONFIG_USB_SERIAL_SAFE_PADDED=y
-@@ -1478,6 +1493,7 @@ CONFIG_USB_GADGET_SELECTED=y
- # CONFIG_USB_GADGET_NET2280 is not set
- # CONFIG_USB_GADGET_PXA2XX is not set
- # CONFIG_USB_GADGET_M66592 is not set
-+# CONFIG_USB_GADGET_PXA27X is not set
- # CONFIG_USB_GADGET_GOKU is not set
- # CONFIG_USB_GADGET_LH7A40X is not set
- # CONFIG_USB_GADGET_OMAP is not set
-@@ -1536,6 +1552,7 @@ CONFIG_LEDS_NEO1973_GTA02=y
- CONFIG_LEDS_TRIGGERS=y
- CONFIG_LEDS_TRIGGER_TIMER=y
- # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
- CONFIG_RTC_LIB=y
- CONFIG_RTC_CLASS=y
- CONFIG_RTC_HCTOSYS=y
-@@ -1589,6 +1606,7 @@ CONFIG_RTC_INTF_DEV=y
- # on-CPU RTC drivers
- #
- CONFIG_RTC_DRV_S3C=m
-+# CONFIG_UIO is not set
- #
- # File systems
-@@ -1605,7 +1623,6 @@ CONFIG_JBD=y
- # CONFIG_JFS_FS is not set
- # CONFIG_FS_POSIX_ACL is not set
- # CONFIG_XFS_FS is not set
--# CONFIG_GFS2_FS is not set
- # CONFIG_OCFS2_FS is not set
- CONFIG_DNOTIFY=y
- CONFIG_INOTIFY=y
-@@ -1728,6 +1745,7 @@ CONFIG_NLS_UTF8=m
- CONFIG_PRINTK_TIME=y
- CONFIG_ENABLE_WARN_DEPRECATED=y
- CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_FRAME_WARN=1024
- CONFIG_MAGIC_SYSRQ=y
- # CONFIG_UNUSED_SYMBOLS is not set
- CONFIG_DEBUG_FS=y
-@@ -1738,6 +1756,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
- CONFIG_SCHED_DEBUG=y
- # CONFIG_SCHEDSTATS is not set
- CONFIG_TIMER_STATS=y
-+# CONFIG_DEBUG_OBJECTS is not set
- # CONFIG_DEBUG_SLAB is not set
- CONFIG_DEBUG_PREEMPT=y
- # CONFIG_DEBUG_RT_MUTEXES is not set
-@@ -1756,6 +1775,7 @@ CONFIG_STACKTRACE=y
- CONFIG_DEBUG_BUGVERBOSE=y
- CONFIG_DEBUG_INFO=y
- # CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_WRITECOUNT is not set
- # CONFIG_DEBUG_LIST is not set
- CONFIG_DEBUG_SG=y
- CONFIG_FRAME_POINTER=y
-@@ -1779,53 +1799,82 @@ CONFIG_DEBUG_S3C_UART=2
- # CONFIG_SECURITY is not set
- # CONFIG_SECURITY_FILE_CAPABILITIES is not set
- CONFIG_CRYPTO=y
-+
-+#
-+# Crypto core or helper
-+#
- CONFIG_CRYPTO_ALGAPI=y
- CONFIG_CRYPTO_AEAD=m
- CONFIG_CRYPTO_BLKCIPHER=y
--# CONFIG_CRYPTO_SEQIV is not set
- CONFIG_CRYPTO_HASH=y
- CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_NULL=m
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_AUTHENC=m
-+CONFIG_CRYPTO_TEST=m
-+
-+#
-+# Authenticated Encryption with Associated Data
-+#
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_SEQIV is not set
-+
-+#
-+# Block modes
-+#
-+CONFIG_CRYPTO_CBC=y
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_CTS is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_LRW=m
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_XTS is not set
-+
-+#
-+# Hash modes
-+#
- CONFIG_CRYPTO_HMAC=y
- CONFIG_CRYPTO_XCBC=m
--CONFIG_CRYPTO_NULL=m
-+
-+#
-+# Digest
-+#
-+CONFIG_CRYPTO_CRC32C=m
- CONFIG_CRYPTO_MD4=m
- CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_MICHAEL_MIC=m
- CONFIG_CRYPTO_SHA1=m
- CONFIG_CRYPTO_SHA256=m
- CONFIG_CRYPTO_SHA512=m
--CONFIG_CRYPTO_WP512=m
- CONFIG_CRYPTO_TGR192=m
--CONFIG_CRYPTO_GF128MUL=m
--CONFIG_CRYPTO_ECB=m
--CONFIG_CRYPTO_CBC=y
--CONFIG_CRYPTO_PCBC=m
--CONFIG_CRYPTO_LRW=m
--# CONFIG_CRYPTO_XTS is not set
--# CONFIG_CRYPTO_CTR is not set
--# CONFIG_CRYPTO_GCM is not set
--# CONFIG_CRYPTO_CCM is not set
--# CONFIG_CRYPTO_CRYPTD is not set
--CONFIG_CRYPTO_DES=y
--CONFIG_CRYPTO_FCRYPT=m
--CONFIG_CRYPTO_BLOWFISH=m
--CONFIG_CRYPTO_TWOFISH=m
--CONFIG_CRYPTO_TWOFISH_COMMON=m
--CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_WP512=m
-+
-+#
-+# Ciphers
-+#
- CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_ANUBIS=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_CAMELLIA=m
- CONFIG_CRYPTO_CAST5=m
- CONFIG_CRYPTO_CAST6=m
--CONFIG_CRYPTO_TEA=m
--CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_FCRYPT=m
- CONFIG_CRYPTO_KHAZAD=m
--CONFIG_CRYPTO_ANUBIS=m
--# CONFIG_CRYPTO_SEED is not set
- # CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_SEED is not set
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+
-+#
-+# Compression
-+#
- CONFIG_CRYPTO_DEFLATE=m
--CONFIG_CRYPTO_MICHAEL_MIC=m
--CONFIG_CRYPTO_CRC32C=m
--CONFIG_CRYPTO_CAMELLIA=m
--CONFIG_CRYPTO_TEST=m
--CONFIG_CRYPTO_AUTHENC=m
- # CONFIG_CRYPTO_LZO is not set
- CONFIG_CRYPTO_HW=y
-@@ -1833,6 +1882,8 @@ CONFIG_CRYPTO_HW=y
- # Library routines
- #
- CONFIG_BITREVERSE=y
-+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
-+# CONFIG_GENERIC_FIND_NEXT_BIT is not set
- CONFIG_CRC_CCITT=m
- CONFIG_CRC16=m
- # CONFIG_CRC_ITU_T is not set
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1133-tracking-2.6.26-rc1-remove-input-dev-private-member.patch b/target/linux/s3c24xx/patches-2.6.26/1133-tracking-2.6.26-rc1-remove-input-dev-private-member.patch
deleted file mode 100755 (executable)
index 6e3e3b4..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-From 6ba11137f14825eb43984cda9773b9333de7c1e6 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:07 +0100
-Subject: [PATCH] tracking-2.6.26-rc1-remove-input-dev-private-member.patch
- Signed-off-by: Andy Green <andy@openmoko.com>
-
----
- drivers/input/keyboard/neo1973kbd.c    |    1 -
- drivers/input/keyboard/qt2410kbd.c     |    1 -
- drivers/input/misc/lis302dl.c          |    6 +++---
- drivers/input/touchscreen/s3c2410_ts.c |    1 -
- 4 files changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-index 6fc3ac1..d22f377 100644
---- a/drivers/input/keyboard/neo1973kbd.c
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -199,7 +199,6 @@ static int neo1973kbd_probe(struct platform_device *pdev)
-       input_dev->id.vendor = 0x0001;
-       input_dev->id.product = 0x0001;
-       input_dev->id.version = 0x0100;
--      input_dev->private = neo1973kbd;
-       input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_SW);
-       set_bit(SW_HEADPHONE_INSERT, input_dev->swbit);
-diff --git a/drivers/input/keyboard/qt2410kbd.c b/drivers/input/keyboard/qt2410kbd.c
-index cd8d7c6..95392cc 100644
---- a/drivers/input/keyboard/qt2410kbd.c
-+++ b/drivers/input/keyboard/qt2410kbd.c
-@@ -124,7 +124,6 @@ static int gta01kbd_probe(struct platform_device *pdev)
-       input_dev->id.vendor = 0x0001;
-       input_dev->id.product = 0x0001;
-       input_dev->id.version = 0x0100;
--      input_dev->private = gta01kbd;
-       input_dev->evbit[0] = BIT(EV_KEY);
- #if 0
-diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
-index 6067dba..1d19418 100644
---- a/drivers/input/misc/lis302dl.c
-+++ b/drivers/input/misc/lis302dl.c
-@@ -236,7 +236,7 @@ static struct attribute_group lis302dl_attr_group = {
- static int lis302dl_input_open(struct input_dev *inp)
- {
--      struct lis302dl_info *lis = inp->private;
-+      struct lis302dl_info *lis = input_get_drvdata(inp);
-       u_int8_t ctrl1 = LIS302DL_CTRL1_PD | LIS302DL_CTRL1_Xen |
-                        LIS302DL_CTRL1_Yen | LIS302DL_CTRL1_Zen;
-       unsigned long flags;
-@@ -255,7 +255,7 @@ static int lis302dl_input_open(struct input_dev *inp)
- static void lis302dl_input_close(struct input_dev *inp)
- {
--      struct lis302dl_info *lis = inp->private;
-+      struct lis302dl_info *lis = input_get_drvdata(inp);
-       u_int8_t ctrl1 = LIS302DL_CTRL1_Xen | LIS302DL_CTRL1_Yen |
-                        LIS302DL_CTRL1_Zen;
-       unsigned long flags;
-@@ -334,7 +334,7 @@ static int __devinit lis302dl_probe(struct spi_device *spi)
-       set_bit(BTN_Y, lis->input_dev->keybit);
-       set_bit(BTN_Z, lis->input_dev->keybit);
- */
--      lis->input_dev->private = lis;
-+      input_set_drvdata(lis->input_dev, lis);
-       lis->input_dev->name = pdata->name;
-        /* SPI Bus not defined as a valid bus for input subsystem*/
-       lis->input_dev->id.bustype = BUS_I2C; /* lie about it */
-diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
-index 68071c2..bc6ccc2 100644
---- a/drivers/input/touchscreen/s3c2410_ts.c
-+++ b/drivers/input/touchscreen/s3c2410_ts.c
-@@ -277,7 +277,6 @@ static int __init s3c2410ts_probe(struct platform_device *pdev)
-       input_set_abs_params(ts.dev, ABS_Y, 0, 0x3FF, 0, 0);
-       input_set_abs_params(ts.dev, ABS_PRESSURE, 0, 1, 0, 0);
--      ts.dev->private = &ts;
-       ts.dev->name = s3c2410ts_name;
-       ts.dev->id.bustype = BUS_RS232;
-       ts.dev->id.vendor = 0xDEAD;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1134-tracking-2.6.26-rc1-remove-dupe-s3c2410_nand_update_.patch b/target/linux/s3c24xx/patches-2.6.26/1134-tracking-2.6.26-rc1-remove-dupe-s3c2410_nand_update_.patch
deleted file mode 100755 (executable)
index f1d90f8..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-From 7fe5fff12cc8c38b174dd26c5344a3052f5e7357 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:07 +0100
-Subject: [PATCH] tracking-2.6.26-rc1-remove-dupe-s3c2410_nand_update_chip.patch
- Signed-off-by: Andy Green <andy@openmoko.com>
-
----
- drivers/mtd/nand/s3c2410.c |   28 ----------------------------
- 1 files changed, 0 insertions(+), 28 deletions(-)
-
-diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
-index 4f747b1..85bd4b8 100644
---- a/drivers/mtd/nand/s3c2410.c
-+++ b/drivers/mtd/nand/s3c2410.c
-@@ -726,34 +726,6 @@ static void s3c2410_nand_update_chip(struct s3c2410_nand_info *info,
-       }
- }
--/* s3c2410_nand_update_chip
-- *
-- * post-probe chip update, to change any items, such as the
-- * layout for large page nand
-- */
--
--static void s3c2410_nand_update_chip(struct s3c2410_nand_info *info,
--                                   struct s3c2410_nand_mtd *nmtd)
--{
--      struct nand_chip *chip = &nmtd->chip;
--
--      printk("%s: chip %p: %d\n", __func__, chip, chip->page_shift);
--
--      if (hardware_ecc) {
--              /* change the behaviour depending on wether we are using
--               * the large or small page nand device */
--
--              if (chip->page_shift > 10) {
--                      chip->ecc.size      = 256;
--                      chip->ecc.bytes     = 3;
--              } else {
--                      chip->ecc.size      = 512;
--                      chip->ecc.bytes     = 3;
--                      chip->ecc.layout    = &nand_hw_eccoob;
--              }
--      }
--}
--
- /* s3c2410_nand_probe
-  *
-  * called by device layer when it finds a device matching
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1135-tracking-2.6.26-rc1-sdio-pnp-changes.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1135-tracking-2.6.26-rc1-sdio-pnp-changes.patch.patch
deleted file mode 100755 (executable)
index c7ac432..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-From 5986281af77185adca248453ca06ce4bcca6bfb9 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:07 +0100
-Subject: [PATCH] tracking-2.6.26-rc1-sdio-pnp-changes.patch
- Signed-off-by: Andy Green <andy@openmoko.com>
-
----
- drivers/sdio/stack/busdriver/sdio_bus_os.c |   33 +++++++++++-----------------
- 1 files changed, 13 insertions(+), 20 deletions(-)
-
-diff --git a/drivers/sdio/stack/busdriver/sdio_bus_os.c b/drivers/sdio/stack/busdriver/sdio_bus_os.c
-index dbdb955..2650d93 100644
---- a/drivers/sdio/stack/busdriver/sdio_bus_os.c
-+++ b/drivers/sdio/stack/busdriver/sdio_bus_os.c
-@@ -60,6 +60,8 @@ void pnp_remove_card_device(struct pnp_dev *dev);
- #include <linux/sdio/sdio_busdriver.h>
- #include <linux/sdio/sdio_lib.h>
- #include "_busdriver.h"
-+/* new for 2.6.26-rc1 --- not sure this is a great way... */
-+#include "../../../pnp/base.h"
- #define DESCRIPTION "SDIO Bus Driver"
- #define AUTHOR "Atheros Communications, Inc."
-@@ -369,14 +371,14 @@ static spinlock_t InUseDevicesLock = SPIN_LOCK_UNLOCKED;
- static const struct pnp_device_id pnp_idtable[] = {
-     {"SD_XXXX",  0}
- };
--static int sdio_get_resources(struct pnp_dev * pDev, struct pnp_resource_table * res)
-+static int sdio_get_resources(struct pnp_dev * pDev)
- {
-     DBG_PRINT(SDDBG_TRACE,
-         ("SDIO BusDriver - sdio_get_resources: %s\n",
-         pDev->dev.bus_id));
-     return 0;
- }
--static int sdio_set_resources(struct pnp_dev * pDev, struct pnp_resource_table * res)
-+static int sdio_set_resources(struct pnp_dev * pDev)
- {
-     DBG_PRINT(SDDBG_TRACE,
-         ("SDIO BusDriver - sdio_set_resources: %s\n",
-@@ -494,7 +496,8 @@ static int UnregisterDriver(PSDFUNCTION pFunction)
- */
- SDIO_STATUS OS_InitializeDevice(PSDDEVICE pDevice, PSDFUNCTION pFunction)
- {
--    struct pnp_id *pFdname;
-+      char id_name[20];
-+
-     memset(&pDevice->Device, 0, sizeof(pDevice->Device));
-     pDevice->Device.dev.driver_data = (PVOID)pFunction;
- //??    pDevice->Device.data = (PVOID)pFunction;
-@@ -510,20 +513,12 @@ SDIO_STATUS OS_InitializeDevice(PSDDEVICE pDevice, PSDFUNCTION pFunction)
-     pDevice->Device.protocol = &sdio_protocol;
-     pDevice->Device.active = 1;
--    pnp_init_resource_table(&pDevice->Device.res);
--
--    pFdname = KernelAlloc(sizeof(struct pnp_id));
--
--    if (NULL == pFdname) {
--        return SDIO_STATUS_NO_RESOURCES;
--    }
-     /* set the id as slot number/function number */
--    snprintf(pFdname->id, sizeof(pFdname->id), "SD_%02X%02X",
-+    snprintf(id_name, sizeof(id_name) - 1, "SD_%02X%02X",
-              pDevice->pHcd->SlotNumber, (UINT)SDDEVICE_GET_SDIO_FUNCNO(pDevice));
--    pFdname->next = NULL;
-     DBG_PRINT(SDDBG_TRACE, ("SDIO BusDriver - OS_InitializeDevice adding id: %s\n",
--                             pFdname->id));
--    pnp_add_id(pFdname, &pDevice->Device);
-+                             id_name));
-+    pnp_add_id(&pDevice->Device, id_name);
-         /* deal with DMA settings */
-     if (pDevice->pHcd->pDmaDescription != NULL) {
-@@ -620,9 +615,9 @@ void OS_RemoveDevice(PSDDEVICE pDevice)
- SDIO_STATUS SDIO_BusAddOSDevice(PSDDMA_DESCRIPTION pDma, POS_PNPDRIVER pDriver, POS_PNPDEVICE pDevice)
- {
-     int err;
--    struct pnp_id *pFdname;
-     struct pnp_device_id *pFdid;
-     static int slotNumber = 0; /* we just use an increasing count for the slots number */
-+      char id_name[20];
-     if (pDma != NULL) {
-         pDevice->dev.dma_mask = &pDma->Mask;
-@@ -653,19 +648,17 @@ SDIO_STATUS SDIO_BusAddOSDevice(PSDDMA_DESCRIPTION pDma, POS_PNPDRIVER pDriver,
-     pDevice->capabilities = PNP_REMOVABLE | PNP_DISABLE;
-     pDevice->active = 1;
--    pFdname = KernelAlloc(sizeof(struct pnp_id));
-     /* set the id as slot number/function number */
--    snprintf(pFdname->id, sizeof(pFdname->id), "SD_%02X08",
-+    snprintf(id_name, sizeof(id_name) - 1, "SD_%02X08",
-              0); //??pDevice->pHcd->SlotNumber);//?????fix this, slotnumber isn't vaialble yet
--    pFdname->next = NULL;
--    pnp_add_id(pFdname, pDevice);
-+    pnp_add_id(pDevice, id_name);
-     /* get a unique device number */
-     spin_lock(&InUseDevicesLock);
-     pDevice->number = FirstClearBit(&InUseDevices);
-     SetBit(&InUseDevices, pDevice->number);
-     spin_unlock(&InUseDevicesLock);
--    pnp_init_resource_table(&pDevice->res);
-+
-     err = pnp_add_device(pDevice);
-     if (err < 0) {
-         DBG_PRINT(SDDBG_ERROR, ("SDIO BusDriver - SDIO_GetBusOSDevice failed pnp_device_add: %d\n",
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1136-fix-KEY_PHONE-up-down-inversion.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1136-fix-KEY_PHONE-up-down-inversion.patch.patch
deleted file mode 100755 (executable)
index aa28e29..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5d4a157601b55c84ffe8886411f0b84c8de3d385 Mon Sep 17 00:00:00 2001
-From: Sean McNeil <sean@mcneil.com>
-Date: Fri, 25 Jul 2008 23:06:08 +0100
-Subject: [PATCH] fix-KEY_PHONE-up-down-inversion.patch
-
-the KEY_PHONE is backwards. It returns up when pushed and down when
-released. The following change fixes it:
-
-Signed-off-by: Sean McNeil <sean@mcneil.com>
----
- drivers/input/keyboard/neo1973kbd.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-index d22f377..3076af3 100644
---- a/drivers/input/keyboard/neo1973kbd.c
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -40,7 +40,7 @@ static irqreturn_t neo1973kbd_aux_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
--      int key_pressed = !gpio_get_value(irq_to_gpio(irq));
-+      int key_pressed = !!gpio_get_value(irq_to_gpio(irq));
-       input_report_key(neo1973kbd_data->input, KEY_PHONE, key_pressed);
-       input_sync(neo1973kbd_data->input);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1137-s3c24xx-pwm-platform-driver.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1137-s3c24xx-pwm-platform-driver.patch.patch
deleted file mode 100755 (executable)
index e4cb87b..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-From 6563c08a68d30e3b53b6a3a2b1916b129f4afc68 Mon Sep 17 00:00:00 2001
-From: matt_hsu <matt_hsu@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:08 +0100
-Subject: [PATCH] s3c24xx-pwm-platform-driver.patch
-
-This patch is to register pwm as platform driver to keep the PWM-related
-config when system is in suspend/resume. This could fix the following
-issue after resume:
-
-- HDQ read timeout
-- LEDs blinked abnormally(if LEDs is driven by PWM)
-
-Signed-off-by: Matt Hsu <matt_hsu@openmoko.org>
----
- arch/arm/mach-s3c2410/pwm.c        |   63 ++++++++++++++++++++++++++++++++++++
- arch/arm/mach-s3c2440/mach-gta02.c |    6 +++
- 2 files changed, 69 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/pwm.c b/arch/arm/mach-s3c2410/pwm.c
-index 23738c1..86a4faa 100644
---- a/arch/arm/mach-s3c2410/pwm.c
-+++ b/arch/arm/mach-s3c2410/pwm.c
-@@ -20,10 +20,17 @@
- #include <linux/kernel.h>
- #include <linux/init.h>
- #include <linux/clk.h>
-+#include <linux/device.h>
- #include <asm/hardware.h>
- #include <asm/plat-s3c/regs-timer.h>
- #include <asm/arch/pwm.h>
-+#ifdef CONFIG_PM
-+      static unsigned long standby_reg_tcon;
-+      static unsigned long standby_reg_tcfg0;
-+      static unsigned long standby_reg_tcfg1;
-+#endif
-+
- int s3c2410_pwm_disable(struct s3c2410_pwm *pwm)
- {
-       unsigned long tcon;
-@@ -212,3 +219,59 @@ int s3c2410_pwm_dumpregs(void)
-       return 0;
- }
- EXPORT_SYMBOL_GPL(s3c2410_pwm_dumpregs);
-+
-+static int __init s3c24xx_pwm_probe(struct platform_device *pdev)
-+{
-+      dev_info(&pdev->dev, "s3c24xx_pwm is registered \n");
-+
-+      return 0;
-+}
-+
-+#ifdef CONFIG_PM
-+static int s3c24xx_pwm_suspend(struct platform_device *pdev, pm_message_t state)
-+{
-+      /* PWM config should be kept in suspending */
-+      standby_reg_tcon = __raw_readl(S3C2410_TCON);
-+      standby_reg_tcfg0 = __raw_readl(S3C2410_TCFG0);
-+      standby_reg_tcfg1 = __raw_readl(S3C2410_TCFG1);
-+
-+      return 0;
-+}
-+
-+static int s3c24xx_pwm_resume(struct platform_device *pdev)
-+{
-+      __raw_writel(standby_reg_tcon, S3C2410_TCON);
-+      __raw_writel(standby_reg_tcfg0, S3C2410_TCFG0);
-+      __raw_writel(standby_reg_tcfg1, S3C2410_TCFG1);
-+
-+      return 0;
-+}
-+#else
-+#define sc32440_pwm_suspend   NULL
-+#define sc32440_pwm_resume    NULL
-+#endif
-+
-+static struct platform_driver s3c24xx_pwm_driver = {
-+      .driver = {
-+              .name   = "s3c24xx_pwm",
-+              .owner  = THIS_MODULE,
-+      },
-+      .probe   = s3c24xx_pwm_probe,
-+      .suspend = s3c24xx_pwm_suspend,
-+      .resume  = s3c24xx_pwm_resume,
-+};
-+
-+static int __init s3c24xx_pwm_init(void)
-+{
-+      return platform_driver_register(&s3c24xx_pwm_driver);
-+}
-+
-+static void __exit s3c24xx_pwm_exit(void)
-+{
-+}
-+
-+MODULE_AUTHOR("Javi Roman <javiroman@kernel-labs.org>");
-+MODULE_LICENSE("GPL");
-+
-+module_init(s3c24xx_pwm_init);
-+module_exit(s3c24xx_pwm_exit);
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 27babc9..1954121 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -719,6 +719,11 @@ static struct platform_device gta02_sdio_dev = {
-         .num_resources  = ARRAY_SIZE(gta02_sdio_resources),
- };
-+struct platform_device s3c24xx_pwm_device = {
-+      .name           = "s3c24xx_pwm",
-+      .num_resources  = 0,
-+};
-+
- static struct platform_device *gta02_devices[] __initdata = {
-       &s3c_device_usb,
-       &s3c_device_wdt,
-@@ -731,6 +736,7 @@ static struct platform_device *gta02_devices[] __initdata = {
-       &gta02_nor_flash,
-       &sc32440_fiq_device,
-       &gta02_version_device,
-+      &s3c24xx_pwm_device,
- };
- static struct s3c2410_nand_set gta02_nand_sets[] = {
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1138-fix-suspend-backlight-timing-pm-debug.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1138-fix-suspend-backlight-timing-pm-debug.patch.patch
deleted file mode 100755 (executable)
index 3578669..0000000
+++ /dev/null
@@ -1,269 +0,0 @@
-From 36b19597a232bb198b3bab4003c0f0807c821274 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:08 +0100
-Subject: [PATCH] fix-suspend-backlight-timing-pm-debug.patch
-
-This patch improves the smoothness of suspend and resume action.
-
-Taking out CONFIG_PM_DEBUG allows much more rapid resume (the low level
-serial traffic appears to be synchronous)
-
-Added a platform callback in jbt driver and support in pcf50633 so we
-can defer bringing up the backlight until the LCM is able to process
-video again (which must happen after the glamo is up and producing
-video beacuse the LCM is hooked to glamo SPI)
-
-GTA01 should not be affected by all this as the callback will default
-to null and it is on pcf50606
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |    8 ++++++
- defconfig-2.6.24                   |    4 +-
- drivers/i2c/chips/pcf50633.c       |   50 ++++++++++++++++++++++++++---------
- drivers/video/display/jbt6k74.c    |   12 ++++++++-
- include/linux/jbt6k74.h            |    3 +-
- include/linux/pcf50633.h           |    6 ++++
- 6 files changed, 66 insertions(+), 17 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 1954121..e1984a9 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -532,6 +532,7 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-                       },
-               },
-       },
-+      .defer_resume_backlight = 1,
- };
- #if 0 /* currently unused */
-@@ -828,9 +829,16 @@ void gta02_jbt6k74_reset(int devidx, int level)
-       glamo_lcm_reset(level);
- }
-+/* finally bring up deferred backlight resume now LCM is resumed itself */
-+
-+void gta02_jbt6k74_resuming(int devidx)
-+{
-+      pcf50633_backlight_resume(pcf50633_global);
-+}
- const struct jbt6k74_platform_data jbt6k74_pdata = {
-       .reset          = gta02_jbt6k74_reset,
-+      .resuming       = gta02_jbt6k74_resuming,
- };
- static struct spi_board_info gta02_spi_board_info[] = {
-diff --git a/defconfig-2.6.24 b/defconfig-2.6.24
-index 4df10bf..34fa961 100644
---- a/defconfig-2.6.24
-+++ b/defconfig-2.6.24
-@@ -161,7 +161,7 @@ CONFIG_CPU_LLSERIAL_S3C2440=y
- #
- # Power management
- #
--CONFIG_S3C2410_PM_DEBUG=y
-+# CONFIG_S3C2410_PM_DEBUG is not set
- # CONFIG_S3C2410_PM_CHECK is not set
- CONFIG_S3C_LOWLEVEL_UART_PORT=2
-@@ -1754,7 +1754,7 @@ CONFIG_FORCED_INLINING=y
- # CONFIG_SAMPLES is not set
- # CONFIG_DEBUG_USER is not set
- CONFIG_DEBUG_ERRORS=y
--CONFIG_DEBUG_LL=y
-+# CONFIG_DEBUG_LL is not set
- # CONFIG_DEBUG_ICEDCC is not set
- # CONFIG_DEBUG_S3C_PORT is not set
- CONFIG_DEBUG_S3C_UART=2
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index cb4cad8..da58aa3 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1466,7 +1466,7 @@ static int pcf50633bl_set_intensity(struct backlight_device *bd)
-       struct pcf50633_data *pcf = bl_get_data(bd);
-       int intensity = bd->props.brightness;
-       int old_intensity = reg_read(pcf, PCF50633_REG_LEDOUT);
--      u_int8_t ledena;
-+      u_int8_t ledena = 2;
-       int ret;
-       if (bd->props.power != FB_BLANK_UNBLANK)
-@@ -1474,16 +1474,19 @@ static int pcf50633bl_set_intensity(struct backlight_device *bd)
-       if (bd->props.fb_blank != FB_BLANK_UNBLANK)
-               intensity = 0;
--      /* The PCF50633 seems to have some kind of oddity (bug?) when
--       * the intensity was 0, you need to completely switch it off
--       * and re-enable it, before it produces any output voltage again */
-+      /* The PCF50633 cannot handle LEDOUT = 0 (datasheet p60)
-+       * if seen, you have to re-enable the LED unit
-+       */
-       if (intensity != 0 && old_intensity == 0) {
-               ledena = reg_read(pcf, PCF50633_REG_LEDENA);
-               reg_write(pcf, PCF50633_REG_LEDENA, 0x00);
-       }
--      ret = reg_set_bit_mask(pcf, PCF50633_REG_LEDOUT, 0x3f,
-+      if (!intensity) /* illegal to set LEDOUT to 0 */
-+              ret = reg_set_bit_mask(pcf, PCF50633_REG_LEDOUT, 0x3f, 2);
-+      else
-+              ret = reg_set_bit_mask(pcf, PCF50633_REG_LEDOUT, 0x3f,
-                              intensity);
-       if (intensity != 0 && old_intensity == 0)
-@@ -1920,6 +1923,8 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       }
-       /* turn off the backlight */
-+      __reg_write(pcf, PCF50633_REG_LEDDIM, 0);
-+      __reg_write(pcf, PCF50633_REG_LEDOUT, 2);
-       __reg_write(pcf, PCF50633_REG_LEDENA, 0x00);
-       pcf->standby_regs.int1m = __reg_read(pcf, PCF50633_REG_INT1M);
-@@ -1938,17 +1943,30 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       return 0;
- }
-+/*
-+ * if backlight resume is selected to be deferred by platform, then it
-+ * can call this to finally reset backlight status (after LCM is resumed
-+ * for example
-+ */
-+
-+void pcf50633_backlight_resume(struct pcf50633_data *pcf)
-+{
-+      __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.ledout);
-+      __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.ledena);
-+      __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.leddim);
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_backlight_resume);
-+
-+
- static int pcf50633_resume(struct device *dev)
- {
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-       int i;
--      printk(KERN_INFO"a\n");
-       /* mutex_lock(&pcf->lock); */  /* resume in atomic context */
-       __reg_write(pcf, PCF50633_REG_LEDENA, 0x01);
--      printk(KERN_INFO"b\n");
-       /* Resume all saved registers that don't "survive" standby state */
-       __reg_write(pcf, PCF50633_REG_INT1M, pcf->standby_regs.int1m);
-@@ -1956,7 +1974,6 @@ static int pcf50633_resume(struct device *dev)
-       __reg_write(pcf, PCF50633_REG_INT3M, pcf->standby_regs.int3m);
-       __reg_write(pcf, PCF50633_REG_INT4M, pcf->standby_regs.int4m);
-       __reg_write(pcf, PCF50633_REG_INT5M, pcf->standby_regs.int5m);
--      printk(KERN_INFO"c\n");
-       __reg_write(pcf, PCF50633_REG_OOCTIM2, pcf->standby_regs.ooctim2);
-       __reg_write(pcf, PCF50633_REG_AUTOOUT, pcf->standby_regs.autoout);
-@@ -1967,17 +1984,24 @@ static int pcf50633_resume(struct device *dev)
-       __reg_write(pcf, PCF50633_REG_DOWN2ENA, pcf->standby_regs.down2ena);
-       __reg_write(pcf, PCF50633_REG_MEMLDOOUT, pcf->standby_regs.memldoout);
-       __reg_write(pcf, PCF50633_REG_MEMLDOENA, pcf->standby_regs.memldoena);
--      __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.ledout);
--      __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.ledena);
--      __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.leddim);
--      printk(KERN_INFO"d\n");
-+
-+      /* platform can choose to defer backlight bringup */
-+      if (!pcf->pdata->defer_resume_backlight) {
-+              __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.ledout);
-+              __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.ledena);
-+              __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.leddim);
-+      } else { /* force backlight down, platform will restore later */
-+              __reg_write(pcf, PCF50633_REG_LEDOUT, 2);
-+              __reg_write(pcf, PCF50633_REG_LEDENA, 0x20);
-+              __reg_write(pcf, PCF50633_REG_LEDDIM, 1);
-+      }
-+
-       /* FIXME: one big read? */
-       for (i = 0; i < 7; i++) {
-               u_int8_t reg_out = PCF50633_REG_LDO1OUT + 2*i;
-               __reg_write(pcf, reg_out, pcf->standby_regs.ldo[i].out);
-               __reg_write(pcf, reg_out+1, pcf->standby_regs.ldo[i].ena);
-       }
--      printk(KERN_INFO"e\n");
-       /* mutex_unlock(&pcf->lock); */ /* resume in atomic context */
-diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c
-index 7e11da7..178e2da 100644
---- a/drivers/video/display/jbt6k74.c
-+++ b/drivers/video/display/jbt6k74.c
-@@ -647,9 +647,14 @@ static int jbt_suspend(struct spi_device *spi, pm_message_t state)
- static void jbt_resume_work(struct work_struct *work)
- {
-       struct jbt_info *jbt = container_of(work, struct jbt_info, work);
-+      struct jbt6k74_platform_data *jbt6k74_pdata =
-+                                              jbt->spi_dev->dev.platform_data;
-       printk(KERN_INFO"jbt_resume_work waiting...\n");
--      msleep(2000);
-+      /* 100ms is not enough here 2008-05-08 andy@openmoko.com
-+       * if CONFIG_PM_DEBUG is enabled 2000ms is required
-+       */
-+      msleep(400);
-       printk(KERN_INFO"jbt_resume_work GO...\n");
-       jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);
-@@ -665,6 +670,11 @@ static void jbt_resume_work(struct work_struct *work)
-       }
-       jbt6k74_display_onoff(jbt, 1);
-+      /* this gives the platform a chance to bring up backlight now */
-+
-+      if (jbt6k74_pdata->resuming)
-+              (jbt6k74_pdata->resuming)(0);
-+
-       printk(KERN_INFO"jbt_resume_work done...\n");
- }
-diff --git a/include/linux/jbt6k74.h b/include/linux/jbt6k74.h
-index 3fbe178..0ac9124 100644
---- a/include/linux/jbt6k74.h
-+++ b/include/linux/jbt6k74.h
-@@ -2,7 +2,8 @@
- #define __JBT6K74_H__
- struct jbt6k74_platform_data {
--      void (* reset)(int devindex, int level);
-+      void (*reset)(int devindex, int level);
-+      void (*resuming)(int devindex); /* called when LCM is resumed */
- };
- #endif
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index b6a67ee..f427985 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -61,6 +61,9 @@ pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma);
- extern void
- pcf50633_charge_enable(struct pcf50633_data *pcf, int on);
-+extern void
-+pcf50633_backlight_resume(struct pcf50633_data *pcf);
-+
- #define PCF50633_FEAT_EXTON   0x00000001      /* not yet supported */
- #define PCF50633_FEAT_MBC     0x00000002
- #define PCF50633_FEAT_BBC     0x00000004      /* not yet supported */
-@@ -89,6 +92,9 @@ struct pcf50633_platform_data {
-               u_int8_t mbcc3; /* charger voltage / current */
-       } charger;
-       pmu_cb *cb;
-+
-+      /* post-resume backlight bringup */
-+      int defer_resume_backlight;
- };
- #endif /* _PCF50633_H */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1139-fix-wep-needs-keys-before-ap.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1139-fix-wep-needs-keys-before-ap.patch.patch
deleted file mode 100755 (executable)
index 80c0b80..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-From 0010ecb4113ddaa113f084cc4a8dce7c6d807bf4 Mon Sep 17 00:00:00 2001
-From: Sean McNeil <sean@mcneil.com>
-Date: Fri, 25 Jul 2008 23:06:08 +0100
-Subject: [PATCH] fix-wep-needs-keys-before-ap.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- .../function/wlan/ar6000/ar6000/wireless_ext.c     |   20 +++++++-------------
- 1 files changed, 7 insertions(+), 13 deletions(-)
-
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c b/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
-index db749e2..ede8e62 100644
---- a/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
-@@ -424,10 +424,6 @@ ar6000_ioctl_giwessid(struct net_device *dev,
-         return -EIO;
-     }
--    if (!ar->arSsidLen) {
--        return -EINVAL;
--    }
--
-     data->flags = 1;
-     data->length = ar->arSsidLen;
-     A_MEMCPY(essid, ar->arSsid, ar->arSsidLen);
-@@ -818,12 +814,6 @@ ar6000_ioctl_siwencode(struct net_device *dev,
-     AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
-     int index;
-     A_INT32 auth = ar->arDot11AuthMode;
--    /*
--     *  Static WEP Keys should be configured before setting the SSID
--     */
--    if (ar->arSsidLen) {
--        return -EIO;
--    }
-     if (ar->arWlanState == WLAN_DISABLED) {
-         return -EIO;
-@@ -894,6 +884,7 @@ ar6000_ioctl_siwencode(struct net_device *dev,
-      * profile has changed.  Erase ssid to signal change
-      */
-     A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
-+    ar->arSsidLen = 0;
-     return 0;
- }
-@@ -1096,8 +1087,10 @@ static int ar6000_ioctl_siwauth(struct net_device *dev,
-               return -EOPNOTSUPP;
-       }
--      if (reset)
--              memset(ar->arSsid, 0, sizeof(ar->arSsid));
-+      if (reset) {
-+              A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
-+              ar->arSsidLen = 0;
-+      }
-       return 0;
- }
-@@ -1335,7 +1328,8 @@ ar6000_ioctl_setparam(struct net_device *dev,
-         /*
-          * profile has changed.  Erase ssid to signal change
-          */
--        A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
-+      A_MEMZERO(ar->arSsid, sizeof(ar->arSsid));
-+      ar->arSsidLen = 0;
-     }
-     return ret;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1140-Fixup-hang-on-resume-caused-by-the-s3c2410-touch-scr.patch b/target/linux/s3c24xx/patches-2.6.26/1140-Fixup-hang-on-resume-caused-by-the-s3c2410-touch-scr.patch
deleted file mode 100755 (executable)
index 2d36575..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From 38c2df2c01a3307c9bce68c744ae6d2b1717b8ec Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:09 +0100
-Subject: [PATCH] Fixup hang on resume caused by the s3c2410 touch screen driver
-
-From dc6d335b467646d802a21ea6b925ee97e83e07be Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Thu, 15 May 2008 01:16:23 +0200
-Subject: [PATCH] Do not use msleep in the resume path of s3c2410_ts as it
-might lockup
-
-For some reason msleep might set the only task running into a suspended
-state and no timer will ever wake it up. Use mdelay to avoid this. I was not
-able to understand the reasoning of sleeping after enabling the clock. So we
-might just remove the msleep/mdelay at all and be fine.
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- drivers/input/touchscreen/s3c2410_ts.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
-index bc6ccc2..1251454 100644
---- a/drivers/input/touchscreen/s3c2410_ts.c
-+++ b/drivers/input/touchscreen/s3c2410_ts.c
-@@ -355,7 +355,7 @@ static int s3c2410ts_resume(struct platform_device *pdev)
-               ( struct s3c2410_ts_mach_info *)pdev->dev.platform_data;
-       clk_enable(adc_clock);
--      msleep(1);
-+      mdelay(1);
-       enable_irq(IRQ_ADC);
-       enable_irq(IRQ_TC);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1141-fix-motion-sensor-corruption.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1141-fix-motion-sensor-corruption.patch.patch
deleted file mode 100755 (executable)
index a9b7243..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-From 18a3bda7bf72a36c3e3164402cd0e4dfa2ff4687 Mon Sep 17 00:00:00 2001
-From: Andy Green <agreen@localhost.localdomain>
-Date: Fri, 25 Jul 2008 23:06:09 +0100
-Subject: [PATCH] fix-motion-sensor-corruption.patch
-
----
- arch/arm/mach-s3c2440/mach-gta02.c |   35 ++++++++++++++++++++++++++++++++---
- 1 files changed, 32 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index e1984a9..9e8fae7 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -905,31 +905,58 @@ static struct platform_device gta02_vibrator_dev = {
- /* #define DEBUG_SPEW_MS */
- #define MG_PER_SAMPLE 18
-+struct lis302dl_platform_data lis302_pdata[];
-+
- void gat02_lis302dl_bitbang_read(struct lis302dl_info *lis)
- {
-       struct lis302dl_platform_data *pdata = lis->pdata;
-       u8 shifter = 0xc0 | LIS302DL_REG_OUT_X; /* read, autoincrement */
-       int n, n1;
-+      unsigned long other_cs;
-       unsigned long flags;
- #ifdef DEBUG_SPEW_MS
-       s8 x, y, z;
- #endif
--      spin_lock_irqsave(&motion_irq_lock, flags);
-+      local_save_flags(flags);
-+
-+      /*
-+       * Huh.. "quirk"... CS on this device is not really "CS" like you can
-+       * expect.  Instead when 1 it selects I2C interface mode.  Because we
-+       * have 2 devices on one interface, the "disabled" device when we talk
-+       * to an "enabled" device sees the clocks as I2C clocks, creating
-+       * havoc.
-+       * I2C sees MOSI going LOW while CLK HIGH as a START action, we must
-+       * ensure this is never issued.
-+       */
-+
-+      if (&lis302_pdata[0] == pdata)
-+              other_cs = lis302_pdata[1].pin_chip_select;
-+      else
-+              other_cs = lis302_pdata[0].pin_chip_select;
-+
-+      s3c2410_gpio_setpin(other_cs, 1);
-+      s3c2410_gpio_setpin(pdata->pin_chip_select, 1);
-+      s3c2410_gpio_setpin(pdata->pin_clk, 1);
-       s3c2410_gpio_setpin(pdata->pin_chip_select, 0);
-       for (n = 0; n < 8; n++) { /* write the r/w, inc and address */
-               s3c2410_gpio_setpin(pdata->pin_clk, 0);
-               s3c2410_gpio_setpin(pdata->pin_mosi, (shifter >> 7) & 1);
-+              s3c2410_gpio_setpin(pdata->pin_clk, 0);
-+              s3c2410_gpio_setpin(pdata->pin_clk, 1);
-               s3c2410_gpio_setpin(pdata->pin_clk, 1);
-               shifter <<= 1;
-       }
-+
-       for (n = 0; n < 5; n++) { /* 5 consequetive registers */
-               for (n1 = 0; n1 < 8; n1++) { /* 8 bits each */
-                       s3c2410_gpio_setpin(pdata->pin_clk, 0);
--                      s3c2410_gpio_setpin(pdata->pin_clk, 1);
-+                      s3c2410_gpio_setpin(pdata->pin_clk, 0);
-                       shifter <<= 1;
-                       if (s3c2410_gpio_getpin(pdata->pin_miso))
-                               shifter |= 1;
-+                      s3c2410_gpio_setpin(pdata->pin_clk, 1);
-+                      s3c2410_gpio_setpin(pdata->pin_clk, 1);
-               }
-               switch (n) {
-               case 0:
-@@ -953,7 +980,9 @@ void gat02_lis302dl_bitbang_read(struct lis302dl_info *lis)
-               }
-       }
-       s3c2410_gpio_setpin(pdata->pin_chip_select, 1);
--      spin_unlock_irqrestore(&motion_irq_lock, flags);
-+      s3c2410_gpio_setpin(other_cs, 1);
-+      local_irq_restore(flags);
-+
-       input_sync(lis->input_dev);
- #ifdef DEBUG_SPEW_MS
-       printk("%s: %d %d %d\n", pdata->name, x, y, z);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1142-add-resume-reason-sysfs.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1142-add-resume-reason-sysfs.patch.patch
deleted file mode 100755 (executable)
index c72f095..0000000
+++ /dev/null
@@ -1,386 +0,0 @@
-From 95b8e195427ce0c6b495925813d7e10949af8ce3 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:10 +0100
-Subject: [PATCH] add-resume-reason-sysfs.patch
-
-If you have U-Boot with uboot-add-find-wake-reason.patch, this
-patch will get you a wake reason report from
-
-cat /sys/devices/platform/neo1973-resume.0/resume_reason
-
-it looks like this:
-
-  EINT00_ACCEL1
-  EINT01_GSM
-  EINT02_BLUETOOTH
-  EINT03_DEBUGBRD
-  EINT04_JACK
-  EINT05_WLAN
-  EINT06_AUXKEY
-  EINT07_HOLDKEY
-  EINT08_ACCEL2
-* EINT09_PMU
-    adpins
-    adprem
-    usbins
-    usbrem
-    rtcalarm
-    second
-    onkeyr
-    onkeyf
-    exton1r
-    exton1f
-    exton2r
-    exton2f
-    exton3r
-    exton3f
-  * batfull
-    chghalt
-    thlimon
-    thlimoff
-    usblimon
-    usblimoff
-    adcrdy
-    onkey1s
-    lowsys
-    lowbat
-    hightmp
-    autopwrfail
-    dwn1pwrfail
-    dwn2pwrfail
-    ledpwrfail
-    ledovp
-    ldo1pwrfail
-    ldo2pwrfail
-    ldo3pwrfail
-    ldo4pwrfail
-    ldo5pwrfail
-    ldo6pwrfail
-    hcidopwrfail
-    hcidoovl
-  EINT10_NULL
-  EINT11_NULL
-  EINT12_GLAMO
-  EINT13_NULL
-  EINT14_NULL
-  EINT15_NULL
-
-This shows a problem, false wake from suspend due to battery full
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c               |    5 +
- arch/arm/plat-s3c24xx/Makefile                   |    4 +-
- arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c |  134 ++++++++++++++++++++++
- drivers/i2c/chips/pcf50633.c                     |   80 +++++++++++++
- include/linux/pcf50633.h                         |    6 +
- 5 files changed, 227 insertions(+), 2 deletions(-)
- create mode 100644 arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 9e8fae7..90b62c1 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -378,6 +378,10 @@ struct platform_device gta02_version_device = {
-       .num_resources  = 0,
- };
-+struct platform_device gta02_resume_reason_device = {
-+      .name           = "neo1973-resume",
-+      .num_resources  = 0,
-+};
- static struct map_desc gta02_iodesc[] __initdata = {
-       {
-@@ -737,6 +741,7 @@ static struct platform_device *gta02_devices[] __initdata = {
-       &gta02_nor_flash,
-       &sc32440_fiq_device,
-       &gta02_version_device,
-+      &gta02_resume_reason_device,
-       &s3c24xx_pwm_device,
- };
-diff --git a/arch/arm/plat-s3c24xx/Makefile b/arch/arm/plat-s3c24xx/Makefile
-index c173f7b..f60dc5f 100644
---- a/arch/arm/plat-s3c24xx/Makefile
-+++ b/arch/arm/plat-s3c24xx/Makefile
-@@ -34,5 +34,5 @@ obj-$(CONFIG_MACH_NEO1973)   += neo1973_version.o \
-                                  neo1973_pm_gsm.o \
-                                  neo1973_pm_gps.o \
-                                  neo1973_pm_bt.o  \
--                                 neo1973_shadow.o
--
-+                                 neo1973_shadow.o \
-+                                 neo1973_pm_resume_reason.o
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c b/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c
-new file mode 100644
-index 0000000..cca42dc
---- /dev/null
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c
-@@ -0,0 +1,134 @@
-+/*
-+ * Resume reason sysfs for the FIC Neo1973 GSM Phone
-+ *
-+ * (C) 2008 by Openmoko Inc.
-+ * Author: Andy Green <andy@openmoko.com>
-+ * 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 resume_reason 2 as
-+ * published by the Free Software Foundation
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+#include <linux/io.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/mach-types.h>
-+
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+#include <asm/arch/gta02.h>
-+#include <linux/pcf50633.h>
-+
-+
-+static unsigned int *gstatus4_mapped;
-+static char *resume_reasons[] = {
-+      "EINT00_ACCEL1",
-+      "EINT01_GSM",
-+      "EINT02_BLUETOOTH",
-+      "EINT03_DEBUGBRD",
-+      "EINT04_JACK",
-+      "EINT05_WLAN",
-+      "EINT06_AUXKEY",
-+      "EINT07_HOLDKEY",
-+      "EINT08_ACCEL2",
-+      "EINT09_PMU",
-+      "EINT10_NULL",
-+      "EINT11_NULL",
-+      "EINT12_GLAMO",
-+      "EINT13_NULL",
-+      "EINT14_NULL",
-+      "EINT15_NULL",
-+      NULL
-+};
-+
-+static ssize_t resume_reason_read(struct device *dev,
-+                                struct device_attribute *attr,
-+                                char *buf)
-+{
-+      int bit = 0;
-+      char *end = buf;
-+
-+      for (bit = 0; resume_reasons[bit]; bit++) {
-+              if ((*gstatus4_mapped) & (1 << bit))
-+                      end += sprintf(end, "* %s\n", resume_reasons[bit]);
-+              else
-+                      end += sprintf(end, "  %s\n", resume_reasons[bit]);
-+
-+              if (bit == 9) /* PMU */
-+                      end += pcf50633_report_resumers(pcf50633_global, end);
-+      }
-+
-+      return end - buf;
-+}
-+
-+
-+static DEVICE_ATTR(resume_reason, 0644, resume_reason_read, NULL);
-+
-+static struct attribute *neo1973_resume_reason_sysfs_entries[] = {
-+      &dev_attr_resume_reason.attr,
-+      NULL
-+};
-+
-+static struct attribute_group neo1973_resume_reason_attr_group = {
-+      .name   = NULL,
-+      .attrs  = neo1973_resume_reason_sysfs_entries,
-+};
-+
-+static int __init neo1973_resume_reason_probe(struct platform_device *pdev)
-+{
-+      dev_info(&pdev->dev, "starting\n");
-+
-+      switch (machine_arch_type) {
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+      case MACH_TYPE_NEO1973_GTA01:
-+              return -EINVAL;
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+      default:
-+              gstatus4_mapped = ioremap(0x560000BC, 0x4);
-+              if (!gstatus4_mapped) {
-+                      dev_err(&pdev->dev, "failed to ioremap() memory region\n");
-+                      return -EINVAL;
-+              }
-+              break;
-+      }
-+
-+      return sysfs_create_group(&pdev->dev.kobj, &neo1973_resume_reason_attr_group);
-+}
-+
-+static int neo1973_resume_reason_remove(struct platform_device *pdev)
-+{
-+      sysfs_remove_group(&pdev->dev.kobj, &neo1973_resume_reason_attr_group);
-+      iounmap(gstatus4_mapped);
-+      return 0;
-+}
-+
-+static struct platform_driver neo1973_resume_reason_driver = {
-+      .probe          = neo1973_resume_reason_probe,
-+      .remove         = neo1973_resume_reason_remove,
-+      .driver         = {
-+              .name           = "neo1973-resume",
-+      },
-+};
-+
-+static int __devinit neo1973_resume_reason_init(void)
-+{
-+      return platform_driver_register(&neo1973_resume_reason_driver);
-+}
-+
-+static void neo1973_resume_reason_exit(void)
-+{
-+      platform_driver_unregister(&neo1973_resume_reason_driver);
-+}
-+
-+module_init(neo1973_resume_reason_init);
-+module_exit(neo1973_resume_reason_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
-+MODULE_DESCRIPTION("Neo1973 resume_reason");
-+#endif
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index da58aa3..d2ff2c1 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -120,6 +120,8 @@ struct pcf50633_data {
-       int allow_close;
-       int onkey_seconds;
-       int irq;
-+      int have_been_suspended;
-+      unsigned char pcfirq_resume[5];
-       int coldplug_done; /* cleared by probe, set by first work service */
-       int flag_bat_voltage_read; /* ipc to /sys batt voltage read func */
-@@ -597,6 +599,17 @@ static void pcf50633_work(struct work_struct *work)
-               return;
-       }
-+      /* hey did we just resume? */
-+
-+      if (pcf->have_been_suspended) {
-+              pcf->have_been_suspended = 0;
-+              /*
-+               * grab a copy of resume interrupt reasons
-+               * from pcf50633 POV
-+               */
-+              memcpy(pcf->pcfirq_resume, pcfirq, sizeof(pcf->pcfirq_resume));
-+      }
-+
-       if (!pcf->coldplug_done) {
-               DEBUGP("PMU Coldplug init\n");
-@@ -1856,6 +1869,71 @@ static int pcf50633_detach_client(struct i2c_client *client)
-       return 0;
- }
-+/* you're going to need >300 bytes in buf */
-+
-+int pcf50633_report_resumers(struct pcf50633_data *pcf, char *buf)
-+{
-+      static char *int_names[] = {
-+              "adpins",
-+              "adprem",
-+              "usbins",
-+              "usbrem",
-+              NULL,
-+              NULL,
-+              "rtcalarm",
-+              "second",
-+
-+              "onkeyr",
-+              "onkeyf",
-+              "exton1r",
-+              "exton1f",
-+              "exton2r",
-+              "exton2f",
-+              "exton3r",
-+              "exton3f",
-+
-+              "batfull",
-+              "chghalt",
-+              "thlimon",
-+              "thlimoff",
-+              "usblimon",
-+              "usblimoff",
-+              "adcrdy",
-+              "onkey1s",
-+
-+              "lowsys",
-+              "lowbat",
-+              "hightmp",
-+              "autopwrfail",
-+              "dwn1pwrfail",
-+              "dwn2pwrfail",
-+              "ledpwrfail",
-+              "ledovp",
-+
-+              "ldo1pwrfail",
-+              "ldo2pwrfail",
-+              "ldo3pwrfail",
-+              "ldo4pwrfail",
-+              "ldo5pwrfail",
-+              "ldo6pwrfail",
-+              "hcidopwrfail",
-+              "hcidoovl"
-+      };
-+      char *end = buf;
-+      int n;
-+
-+      for (n = 0; n < 40; n++)
-+              if (int_names[n]) {
-+                      if (pcf->pcfirq_resume[n >> 3] & (1 >> (n & 7)))
-+                              end += sprintf(end, "  * %s\n", int_names[n]);
-+                      else
-+                              end += sprintf(end, "    %s\n", int_names[n]);
-+              }
-+      
-+      return end - buf;
-+}
-+
-+
- #ifdef CONFIG_PM
- #define INT1M_RESUMERS        (PCF50633_INT1_ADPINS           | \
-                        PCF50633_INT1_ADPREM           | \
-@@ -1938,6 +2016,8 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       __reg_write(pcf, PCF50633_REG_INT4M, ~INT4M_RESUMERS & 0xff);
-       __reg_write(pcf, PCF50633_REG_INT5M, ~INT5M_RESUMERS & 0xff);
-+      pcf->have_been_suspended = 1;
-+
-       mutex_unlock(&pcf->lock);
-       return 0;
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index f427985..39d919d 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -64,6 +64,12 @@ pcf50633_charge_enable(struct pcf50633_data *pcf, int on);
- extern void
- pcf50633_backlight_resume(struct pcf50633_data *pcf);
-+extern u_int16_t
-+pcf50633_battvolt(struct pcf50633_data *pcf);
-+
-+extern int
-+pcf50633_report_resumers(struct pcf50633_data *pcf, char *buf);
-+
- #define PCF50633_FEAT_EXTON   0x00000001      /* not yet supported */
- #define PCF50633_FEAT_MBC     0x00000002
- #define PCF50633_FEAT_BBC     0x00000004      /* not yet supported */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1143-fix-reduce-wake-reasons-in-pcf50633.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1143-fix-reduce-wake-reasons-in-pcf50633.patch.patch
deleted file mode 100755 (executable)
index 73cdb83..0000000
+++ /dev/null
@@ -1,237 +0,0 @@
-From 84a38fd3678b3473c890f7e1b1d7b697afb142a7 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:10 +0100
-Subject: [PATCH] fix-reduce-wake-reasons-in-pcf50633.patch
-
-Currently we are willing to wake from sleep from
-pcf50633 interrupts we don't actually do anything about
-even when we wake (somewhat puzzled).
-
-Let's disable some of these wake sources.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   20 +++++++++++++
- drivers/i2c/chips/pcf50633.c       |   28 ++++--------------
- drivers/i2c/chips/pcf50633.h       |   53 ----------------------------------
- include/linux/pcf50633.h           |   56 ++++++++++++++++++++++++++++++++++++
- 4 files changed, 82 insertions(+), 75 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 90b62c1..601f7bc 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -462,6 +462,26 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-       .r_fix_batt     = 10000,
-       .r_fix_batt_par = 10000,
-       .r_sense_milli  = 220,
-+      .resumers = {
-+              [0] = /* PCF50633_INT1_ADPINS   | */
-+                /* PCF50633_INT1_ADPREM       | */
-+                PCF50633_INT1_USBINS          |
-+                PCF50633_INT1_USBREM          |
-+                PCF50633_INT1_ALARM,
-+              [1] = PCF50633_INT2_ONKEYF,
-+              [2] =  /* PCF50633_INT3_BATFULL | */
-+                /* PCF50633_INT3_CHGHALT      | */
-+                /* PCF50633_INT3_THLIMON      | */
-+                /* PCF50633_INT3_THLIMOFF     | */
-+                /* PCF50633_INT3_USBLIMON     | */
-+                /* PCF50633_INT3_USBLIMOFF    | */
-+                PCF50633_INT3_ONKEY1S ,
-+              [3] = 0                         /* |
-+                   PCF50633_INT4_LOWSYS       | */
-+                /* PCF50633_INT4_LOWBAT       | */
-+                /* PCF50633_INT4_HIGHTMP */,
-+              [4] = 0
-+      },
-       .rails  = {
-               [PCF50633_REGULATOR_AUTO] = {
-                       .name           = "io_3v3",
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index d2ff2c1..8ba81d2 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1935,23 +1935,7 @@ int pcf50633_report_resumers(struct pcf50633_data *pcf, char *buf)
- #ifdef CONFIG_PM
--#define INT1M_RESUMERS        (PCF50633_INT1_ADPINS           | \
--                       PCF50633_INT1_ADPREM           | \
--                       PCF50633_INT1_USBINS           | \
--                       PCF50633_INT1_USBREM           | \
--                       PCF50633_INT1_ALARM)
--#define INT2M_RESUMERS        (PCF50633_INT2_ONKEYF)
--#define INT3M_RESUMERS        (PCF50633_INT3_BATFULL          | \
--                       PCF50633_INT3_CHGHALT          | \
--                       PCF50633_INT3_THLIMON          | \
--                       PCF50633_INT3_THLIMOFF         | \
--                       PCF50633_INT3_USBLIMON         | \
--                       PCF50633_INT3_USBLIMOFF        | \
--                       PCF50633_INT3_ONKEY1S)
--#define INT4M_RESUMERS        (PCF50633_INT4_LOWSYS           | \
--                       PCF50633_INT4_LOWBAT           | \
--                       PCF50633_INT4_HIGHTMP)
--#define INT5M_RESUMERS        (0)
-+
- static int pcf50633_suspend(struct device *dev, pm_message_t state)
- {
-@@ -2010,11 +1994,11 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       pcf->standby_regs.int3m = __reg_read(pcf, PCF50633_REG_INT3M);
-       pcf->standby_regs.int4m = __reg_read(pcf, PCF50633_REG_INT4M);
-       pcf->standby_regs.int5m = __reg_read(pcf, PCF50633_REG_INT5M);
--      __reg_write(pcf, PCF50633_REG_INT1M, ~INT1M_RESUMERS & 0xff);
--      __reg_write(pcf, PCF50633_REG_INT2M, ~INT2M_RESUMERS & 0xff);
--      __reg_write(pcf, PCF50633_REG_INT3M, ~INT3M_RESUMERS & 0xff);
--      __reg_write(pcf, PCF50633_REG_INT4M, ~INT4M_RESUMERS & 0xff);
--      __reg_write(pcf, PCF50633_REG_INT5M, ~INT5M_RESUMERS & 0xff);
-+      __reg_write(pcf, PCF50633_REG_INT1M, ~pcf->pdata->resumers[0]);
-+      __reg_write(pcf, PCF50633_REG_INT2M, ~pcf->pdata->resumers[1]);
-+      __reg_write(pcf, PCF50633_REG_INT3M, ~pcf->pdata->resumers[2]);
-+      __reg_write(pcf, PCF50633_REG_INT4M, ~pcf->pdata->resumers[3]);
-+      __reg_write(pcf, PCF50633_REG_INT5M, ~pcf->pdata->resumers[4]);
-       pcf->have_been_suspended = 1;
-diff --git a/drivers/i2c/chips/pcf50633.h b/drivers/i2c/chips/pcf50633.h
-index 93dfd99..5d54131 100644
---- a/drivers/i2c/chips/pcf50633.h
-+++ b/drivers/i2c/chips/pcf50633.h
-@@ -125,59 +125,6 @@ enum pfc50633_regs {
-       __NUM_PCF50633_REGS
- };
--enum pcf50633_reg_int1 {
--      PCF50633_INT1_ADPINS    = 0x01, /* Adapter inserted */
--      PCF50633_INT1_ADPREM    = 0x02, /* Adapter removed */
--      PCF50633_INT1_USBINS    = 0x04, /* USB inserted */
--      PCF50633_INT1_USBREM    = 0x08, /* USB removed */
--      /* reserved */
--      PCF50633_INT1_ALARM     = 0x40, /* RTC alarm time is reached */
--      PCF50633_INT1_SECOND    = 0x80, /* RTC periodic second interrupt */
--};
--
--enum pcf50633_reg_int2 {
--      PCF50633_INT2_ONKEYR    = 0x01, /* ONKEY rising edge */
--      PCF50633_INT2_ONKEYF    = 0x02, /* ONKEY falling edge */
--      PCF50633_INT2_EXTON1R   = 0x04, /* EXTON1 rising edge */
--      PCF50633_INT2_EXTON1F   = 0x08, /* EXTON1 falling edge */
--      PCF50633_INT2_EXTON2R   = 0x10, /* EXTON2 rising edge */
--      PCF50633_INT2_EXTON2F   = 0x20, /* EXTON2 falling edge */
--      PCF50633_INT2_EXTON3R   = 0x40, /* EXTON3 rising edge */
--      PCF50633_INT2_EXTON3F   = 0x80, /* EXTON3 falling edge */
--};
--
--enum pcf50633_reg_int3 {
--      PCF50633_INT3_BATFULL   = 0x01, /* Battery full */
--      PCF50633_INT3_CHGHALT   = 0x02, /* Charger halt */
--      PCF50633_INT3_THLIMON   = 0x04,
--      PCF50633_INT3_THLIMOFF  = 0x08,
--      PCF50633_INT3_USBLIMON  = 0x10,
--      PCF50633_INT3_USBLIMOFF = 0x20,
--      PCF50633_INT3_ADCRDY    = 0x40, /* ADC conversion finished */
--      PCF50633_INT3_ONKEY1S   = 0x80, /* ONKEY pressed 1 second */
--};
--
--enum pcf50633_reg_int4 {
--      PCF50633_INT4_LOWSYS            = 0x01,
--      PCF50633_INT4_LOWBAT            = 0x02,
--      PCF50633_INT4_HIGHTMP           = 0x04,
--      PCF50633_INT4_AUTOPWRFAIL       = 0x08,
--      PCF50633_INT4_DWN1PWRFAIL       = 0x10,
--      PCF50633_INT4_DWN2PWRFAIL       = 0x20,
--      PCF50633_INT4_LEDPWRFAIL        = 0x40,
--      PCF50633_INT4_LEDOVP            = 0x80,
--};
--
--enum pcf50633_reg_int5 {
--      PCF50633_INT5_LDO1PWRFAIL       = 0x01,
--      PCF50633_INT5_LDO2PWRFAIL       = 0x02,
--      PCF50633_INT5_LDO3PWRFAIL       = 0x04,
--      PCF50633_INT5_LDO4PWRFAIL       = 0x08,
--      PCF50633_INT5_LDO5PWRFAIL       = 0x10,
--      PCF50633_INT5_LDO6PWRFAIL       = 0x20,
--      PCF50633_INT5_HCLDOPWRFAIL      = 0x40,
--      PCF50633_INT5_HCLDOOVL          = 0x80,
--};
- enum pcf50633_reg_oocshdwn {
-       PCF50633_OOCSHDWN_GOSTDBY       = 0x01,
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index 39d919d..c0fdbe8 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -20,6 +20,60 @@ enum pcf50633_regulator_id {
-       __NUM_PCF50633_REGULATORS
- };
-+enum pcf50633_reg_int1 {
-+      PCF50633_INT1_ADPINS    = 0x01, /* Adapter inserted */
-+      PCF50633_INT1_ADPREM    = 0x02, /* Adapter removed */
-+      PCF50633_INT1_USBINS    = 0x04, /* USB inserted */
-+      PCF50633_INT1_USBREM    = 0x08, /* USB removed */
-+      /* reserved */
-+      PCF50633_INT1_ALARM     = 0x40, /* RTC alarm time is reached */
-+      PCF50633_INT1_SECOND    = 0x80, /* RTC periodic second interrupt */
-+};
-+
-+enum pcf50633_reg_int2 {
-+      PCF50633_INT2_ONKEYR    = 0x01, /* ONKEY rising edge */
-+      PCF50633_INT2_ONKEYF    = 0x02, /* ONKEY falling edge */
-+      PCF50633_INT2_EXTON1R   = 0x04, /* EXTON1 rising edge */
-+      PCF50633_INT2_EXTON1F   = 0x08, /* EXTON1 falling edge */
-+      PCF50633_INT2_EXTON2R   = 0x10, /* EXTON2 rising edge */
-+      PCF50633_INT2_EXTON2F   = 0x20, /* EXTON2 falling edge */
-+      PCF50633_INT2_EXTON3R   = 0x40, /* EXTON3 rising edge */
-+      PCF50633_INT2_EXTON3F   = 0x80, /* EXTON3 falling edge */
-+};
-+
-+enum pcf50633_reg_int3 {
-+      PCF50633_INT3_BATFULL   = 0x01, /* Battery full */
-+      PCF50633_INT3_CHGHALT   = 0x02, /* Charger halt */
-+      PCF50633_INT3_THLIMON   = 0x04,
-+      PCF50633_INT3_THLIMOFF  = 0x08,
-+      PCF50633_INT3_USBLIMON  = 0x10,
-+      PCF50633_INT3_USBLIMOFF = 0x20,
-+      PCF50633_INT3_ADCRDY    = 0x40, /* ADC conversion finished */
-+      PCF50633_INT3_ONKEY1S   = 0x80, /* ONKEY pressed 1 second */
-+};
-+
-+enum pcf50633_reg_int4 {
-+      PCF50633_INT4_LOWSYS            = 0x01,
-+      PCF50633_INT4_LOWBAT            = 0x02,
-+      PCF50633_INT4_HIGHTMP           = 0x04,
-+      PCF50633_INT4_AUTOPWRFAIL       = 0x08,
-+      PCF50633_INT4_DWN1PWRFAIL       = 0x10,
-+      PCF50633_INT4_DWN2PWRFAIL       = 0x20,
-+      PCF50633_INT4_LEDPWRFAIL        = 0x40,
-+      PCF50633_INT4_LEDOVP            = 0x80,
-+};
-+
-+enum pcf50633_reg_int5 {
-+      PCF50633_INT5_LDO1PWRFAIL       = 0x01,
-+      PCF50633_INT5_LDO2PWRFAIL       = 0x02,
-+      PCF50633_INT5_LDO3PWRFAIL       = 0x04,
-+      PCF50633_INT5_LDO4PWRFAIL       = 0x08,
-+      PCF50633_INT5_LDO5PWRFAIL       = 0x10,
-+      PCF50633_INT5_LDO6PWRFAIL       = 0x20,
-+      PCF50633_INT5_HCLDOPWRFAIL      = 0x40,
-+      PCF50633_INT5_HCLDOOVL          = 0x80,
-+};
-+
- struct pcf50633_data;
- extern struct pcf50633_data *pcf50633_global;
-@@ -94,6 +148,8 @@ struct pcf50633_platform_data {
-       unsigned int r_fix_batt_par;
-       unsigned int r_sense_milli;
-+      unsigned char resumers[5];
-+
-       struct {
-               u_int8_t mbcc3; /* charger voltage / current */
-       } charger;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1144-add-gta01-resume-sysfs.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1144-add-gta01-resume-sysfs.patch.patch
deleted file mode 100755 (executable)
index c5fc43d..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-From e570a61a0baa6d85e3a576e296443f5c35f6842e Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:10 +0100
-Subject: [PATCH] add-gta01-resume-sysfs.patch
-
-Adds the somewhat simpler resume source support for GTA01
-since PMU is not a wake source
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c |   53 +++++++++++++--------
- 1 files changed, 33 insertions(+), 20 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c b/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c
-index cca42dc..145556b 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_resume_reason.c
-@@ -23,10 +23,28 @@
- #ifdef CONFIG_MACH_NEO1973_GTA02
- #include <asm/arch/gta02.h>
- #include <linux/pcf50633.h>
--
-+#endif
- static unsigned int *gstatus4_mapped;
--static char *resume_reasons[] = {
-+static char *resume_reasons[][17] = { { /* GTA01 */
-+      "EINT00_NULL",
-+      "EINT01_GSM",
-+      "EINT02_NULL",
-+      "EINT03_NULL",
-+      "EINT04_JACK",
-+      "EINT05_SDCARD",
-+      "EINT06_AUXKEY",
-+      "EINT07_HOLDKEY",
-+      "EINT08_NULL",
-+      "EINT09_NULL",
-+      "EINT10_NULL",
-+      "EINT11_NULL",
-+      "EINT12_NULL",
-+      "EINT13_NULL",
-+      "EINT14_NULL",
-+      "EINT15_NULL",
-+      NULL
-+}, { /* GTA02 */
-       "EINT00_ACCEL1",
-       "EINT01_GSM",
-       "EINT02_BLUETOOTH",
-@@ -44,7 +62,7 @@ static char *resume_reasons[] = {
-       "EINT14_NULL",
-       "EINT15_NULL",
-       NULL
--};
-+} };
- static ssize_t resume_reason_read(struct device *dev,
-                                 struct device_attribute *attr,
-@@ -52,15 +70,18 @@ static ssize_t resume_reason_read(struct device *dev,
- {
-       int bit = 0;
-       char *end = buf;
-+      int gta = !!machine_is_neo1973_gta02();
--      for (bit = 0; resume_reasons[bit]; bit++) {
-+      for (bit = 0; resume_reasons[gta][bit]; bit++) {
-               if ((*gstatus4_mapped) & (1 << bit))
--                      end += sprintf(end, "* %s\n", resume_reasons[bit]);
-+                      end += sprintf(end, "* %s\n", resume_reasons[gta][bit]);
-               else
--                      end += sprintf(end, "  %s\n", resume_reasons[bit]);
-+                      end += sprintf(end, "  %s\n", resume_reasons[gta][bit]);
--              if (bit == 9) /* PMU */
-+#ifdef CONFIG_MACH_NEO1973_GTA02
-+              if ((gta) && (bit == 9)) /* PMU */
-                       end += pcf50633_report_resumers(pcf50633_global, end);
-+#endif
-       }
-       return end - buf;
-@@ -83,21 +104,14 @@ static int __init neo1973_resume_reason_probe(struct platform_device *pdev)
- {
-       dev_info(&pdev->dev, "starting\n");
--      switch (machine_arch_type) {
--#ifdef CONFIG_MACH_NEO1973_GTA01
--      case MACH_TYPE_NEO1973_GTA01:
-+      gstatus4_mapped = ioremap(0x560000BC /* GSTATUS4 */, 0x4);
-+      if (!gstatus4_mapped) {
-+              dev_err(&pdev->dev, "failed to ioremap() memory region\n");
-               return -EINVAL;
--#endif /* CONFIG_MACH_NEO1973_GTA01 */
--      default:
--              gstatus4_mapped = ioremap(0x560000BC, 0x4);
--              if (!gstatus4_mapped) {
--                      dev_err(&pdev->dev, "failed to ioremap() memory region\n");
--                      return -EINVAL;
--              }
--              break;
-       }
--      return sysfs_create_group(&pdev->dev.kobj, &neo1973_resume_reason_attr_group);
-+      return sysfs_create_group(&pdev->dev.kobj,
-+                                          &neo1973_resume_reason_attr_group);
- }
- static int neo1973_resume_reason_remove(struct platform_device *pdev)
-@@ -131,4 +145,3 @@ module_exit(neo1973_resume_reason_exit);
- MODULE_LICENSE("GPL");
- MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
- MODULE_DESCRIPTION("Neo1973 resume_reason");
--#endif
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1145-introduce-samsung-camera-unit-driver.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1145-introduce-samsung-camera-unit-driver.patch.patch
deleted file mode 100755 (executable)
index 8db75f0..0000000
+++ /dev/null
@@ -1,5883 +0,0 @@
-From 573919b9c0d6752c42b2b130fde41d6b80a843b7 Mon Sep 17 00:00:00 2001
-From: SW.LEE <hitchcar@samsung.com>
-Date: Fri, 25 Jul 2008 23:06:10 +0100
-Subject: [PATCH] introduce-samsung-camera-unit-driver.patch
-
-This is the kernel side of an old (2004) samsung camera driver for 2440
-It doesn't compile on modern kernel yet, this patch introduces it into the
-kernel tree without gross mods, so it is broken code we can start to work on
----
- arch/arm/mach-s3c2440/Kconfig               |    4 +-
- arch/arm/mach-s3c2440/Makefile              |    8 +-
- arch/arm/mach-s3c2440/camera/Kconfig        |    7 +
- arch/arm/mach-s3c2440/camera/Makefile       |    9 +
- arch/arm/mach-s3c2440/camera/bits.h         |   48 ++
- arch/arm/mach-s3c2440/camera/cam_reg.h      |  220 ++++++
- arch/arm/mach-s3c2440/camera/camif.c        |  978 +++++++++++++++++++++++++++
- arch/arm/mach-s3c2440/camera/camif.h        |  304 +++++++++
- arch/arm/mach-s3c2440/camera/camif_fsm.c    |  427 ++++++++++++
- arch/arm/mach-s3c2440/camera/imgsensor.c    |  255 +++++++
- arch/arm/mach-s3c2440/camera/miscdevice.h   |   18 +
- arch/arm/mach-s3c2440/camera/qt-driver.c    |  169 +++++
- arch/arm/mach-s3c2440/camera/qt.h           |   18 +
- arch/arm/mach-s3c2440/camera/s5x532.h       |  143 ++++
- arch/arm/mach-s3c2440/camera/s5x532_rev36.h |  208 ++++++
- arch/arm/mach-s3c2440/camera/sensor.h       |   20 +
- arch/arm/mach-s3c2440/camera/sxga.h         |  504 ++++++++++++++
- arch/arm/mach-s3c2440/camera/userapp.h      |   44 ++
- arch/arm/mach-s3c2440/camera/v4l2_api.c     |  311 +++++++++
- arch/arm/mach-s3c2440/camera/video-driver.c |  591 ++++++++++++++++
- arch/arm/mach-s3c2440/camera/videodev.c     |  342 ++++++++++
- arch/arm/mach-s3c2440/camera/videodev.h     |  110 +++
- arch/arm/mach-s3c2440/camera/videodev2.h    |  938 +++++++++++++++++++++++++
- 23 files changed, 5668 insertions(+), 8 deletions(-)
- create mode 100644 arch/arm/mach-s3c2440/camera/Kconfig
- create mode 100644 arch/arm/mach-s3c2440/camera/Makefile
- create mode 100644 arch/arm/mach-s3c2440/camera/bits.h
- create mode 100644 arch/arm/mach-s3c2440/camera/cam_reg.h
- create mode 100644 arch/arm/mach-s3c2440/camera/camif.c
- create mode 100644 arch/arm/mach-s3c2440/camera/camif.h
- create mode 100644 arch/arm/mach-s3c2440/camera/camif_fsm.c
- create mode 100644 arch/arm/mach-s3c2440/camera/imgsensor.c
- create mode 100644 arch/arm/mach-s3c2440/camera/miscdevice.h
- create mode 100644 arch/arm/mach-s3c2440/camera/qt-driver.c
- create mode 100644 arch/arm/mach-s3c2440/camera/qt.h
- create mode 100644 arch/arm/mach-s3c2440/camera/s5x532.h
- create mode 100644 arch/arm/mach-s3c2440/camera/s5x532_rev36.h
- create mode 100644 arch/arm/mach-s3c2440/camera/sensor.h
- create mode 100644 arch/arm/mach-s3c2440/camera/sxga.h
- create mode 100644 arch/arm/mach-s3c2440/camera/userapp.h
- create mode 100644 arch/arm/mach-s3c2440/camera/v4l2_api.c
- create mode 100644 arch/arm/mach-s3c2440/camera/video-driver.c
- create mode 100644 arch/arm/mach-s3c2440/camera/videodev.c
- create mode 100644 arch/arm/mach-s3c2440/camera/videodev.h
- create mode 100644 arch/arm/mach-s3c2440/camera/videodev2.h
-
-diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
-index 3e9e9f1..e042965 100644
---- a/arch/arm/mach-s3c2440/Kconfig
-+++ b/arch/arm/mach-s3c2440/Kconfig
-@@ -30,6 +30,9 @@ config S3C2440_C_FIQ
-         Support for S3C2440 FIQ support in C -- see
-         ./arch/arm/macs3c2440/fiq_c_isr.c
-+source "arch/arm/mach-s3c2440/camera/Kconfig"
-+
-+
- menu "S3C2440 Machines"
- config MACH_ANUBIS
-@@ -93,4 +96,3 @@ config NEO1973_GTA02_2440
-          of the FIC/Openmoko Neo1973 GTA02 GSM Phone.
- endmenu
--
-diff --git a/arch/arm/mach-s3c2440/Makefile b/arch/arm/mach-s3c2440/Makefile
-index 4932232..e9c6334 100644
---- a/arch/arm/mach-s3c2440/Makefile
-+++ b/arch/arm/mach-s3c2440/Makefile
-@@ -1,10 +1,4 @@
--# arch/arm/mach-s3c2440/Makefile
--#
--# Copyright 2007 Simtec Electronics
--#
--# Licensed under GPLv2
--
--obj-y                         :=
-+obj-y                           += camera/
- obj-m                         :=
- obj-n                         :=
- obj-                          :=
-diff --git a/arch/arm/mach-s3c2440/camera/Kconfig b/arch/arm/mach-s3c2440/camera/Kconfig
-new file mode 100644
-index 0000000..36f127d
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/Kconfig
-@@ -0,0 +1,7 @@
-+
-+config S3C2440_CAMERA
-+      bool "S3C24xx Camera interface"
-+      depends on ARCH_S3C2410
-+      help
-+        Camera driver for S3C2440 camera unit
-+
-diff --git a/arch/arm/mach-s3c2440/camera/Makefile b/arch/arm/mach-s3c2440/camera/Makefile
-new file mode 100644
-index 0000000..a46d3be
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/Makefile
-@@ -0,0 +1,9 @@
-+obj-$(CONFIG_S3C2440_CAMERA) += \
-+      videodev.o \
-+      imgsensor.o \
-+      videodrv.o \
-+      video-driver.o \
-+      camif.o \
-+      camif_fsm.o \
-+      qt-driver.o
-+
-diff --git a/arch/arm/mach-s3c2440/camera/bits.h b/arch/arm/mach-s3c2440/camera/bits.h
-new file mode 100644
-index 0000000..8d83c2e
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/bits.h
-@@ -0,0 +1,48 @@
-+/*
-+ *  Copyright (C) Samsung Electroincs  2003
-+ *  Author: SW.LEE <hitchcar@samsung.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 __SW_BITS_H
-+#define __SW_BITS_H
-+
-+#define BIT0                            0x00000001
-+#define BIT1                            0x00000002
-+#define BIT2                            0x00000004
-+#define BIT3                            0x00000008
-+#define BIT4                            0x00000010
-+#define BIT5                            0x00000020
-+#define BIT6                            0x00000040
-+#define BIT7                            0x00000080
-+#define BIT8                            0x00000100
-+#define BIT9                            0x00000200
-+#define BIT10                           0x00000400
-+#define BIT11                           0x00000800
-+#define BIT12                           0x00001000
-+#define BIT13                           0x00002000
-+#define BIT14                           0x00004000
-+#define BIT15                           0x00008000
-+#define BIT16                           0x00010000
-+#define BIT17                           0x00020000
-+#define BIT18                           0x00040000
-+#define BIT19                           0x00080000
-+#define BIT20                           0x00100000
-+#define BIT21                           0x00200000
-+#define BIT22                           0x00400000
-+#define BIT23                           0x00800000
-+#define BIT24                           0x01000000
-+#define BIT25                           0x02000000
-+#define BIT26                           0x04000000
-+#define BIT27                           0x08000000
-+#define BIT28                           0x10000000
-+#define BIT29                           0x20000000
-+#define BIT30                           0x40000000
-+#define BIT31                           0x80000000
-+
-+#endif
-diff --git a/arch/arm/mach-s3c2440/camera/cam_reg.h b/arch/arm/mach-s3c2440/camera/cam_reg.h
-new file mode 100644
-index 0000000..7247a4e
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/cam_reg.h
-@@ -0,0 +1,220 @@
-+ /*----------------------------------------------------------
-+  *   (C) 2004 Samsung Electronics
-+  *   SW.LEE < hitchcar@samsung.com>
-+  * 
-+  ----------------------------------------------------------- */
-+
-+#ifndef __FIMC20_CAMERA_H__
-+#define __FIMC20_CAMERA_H__
-+
-+
-+#ifdef CONFIG_ARCH_S3C24A0
-+#define CAM_BASE_ADD             0x48000000
-+#else /* S3C2440A */
-+#define CAM_BASE_ADD             0x4F000000
-+#endif
-+
-+
-+/*
-+ * CAMERA IP
-+ * P-port is used as RGB Capturing device which including scale and crop 
-+ *  those who want to see(preview ) the image on display needs RGB image.
-+ *
-+ * C-port is used as YCbCr(4:2:0, 4:2:2) Capturing device which including the scale and crop
-+ *   the prefix of C-port have the meaning of "Codec" ex. mpeg4, h263.. which requries the
-+     YCBCB format not RGB 
-+ */ 
-+
-+#define CISRCFMT            __REG(CAM_BASE_ADD+0x00) // RW Input Source Format
-+#define CIWDOFST            __REG(CAM_BASE_ADD+0x04) // Window offset register
-+#define CIGCTRL             __REG(CAM_BASE_ADD+0x08) // Global control register
-+#define CICOYSA0            __REG(CAM_BASE_ADD+0x18) // Y 1 st frame start address 
-+#define CICOYSA1            __REG(CAM_BASE_ADD+0x1C) // Y 2 nd frame start address 
-+#define CICOYSA2            __REG(CAM_BASE_ADD+0x20) // Y 3 rd frame start address 
-+#define CICOYSA3            __REG(CAM_BASE_ADD+0x24) // Y 4 th frame start address 
-+#define CICOCBSA0           __REG(CAM_BASE_ADD+0x28) // Cb 1 st frame start address 
-+#define CICOCBSA1           __REG(CAM_BASE_ADD+0x2C) // Cb 2 nd frame start address 
-+#define CICOCBSA2           __REG(CAM_BASE_ADD+0x30) // Cb 3 rd frame start address 
-+#define CICOCBSA3           __REG(CAM_BASE_ADD+0x34) // Cb 4 th frame start address 
-+#define CICOCRSA0           __REG(CAM_BASE_ADD+0x38) // Cr 1 st frame start address 
-+#define CICOCRSA1           __REG(CAM_BASE_ADD+0x3C) // Cr 2 nd frame start address 
-+#define CICOCRSA2           __REG(CAM_BASE_ADD+0x40) // Cr 3 rd frame start address 
-+#define CICOCRSA3           __REG(CAM_BASE_ADD+0x44) // Cr 4 th frame start address 
-+#define CICOTRGFMT          __REG(CAM_BASE_ADD+0x48) // Target image format of codec
-+#define CICOCTRL            __REG(CAM_BASE_ADD+0x4C) // Codec DMA control related
-+#define CICOSCPRERATIO      __REG(CAM_BASE_ADD+0x50) // Codec pre-scaler ratio control
-+#define CICOSCPREDST        __REG(CAM_BASE_ADD+0x54) // Codec pre-scaler destination
-+#define CICOSCCTRL          __REG(CAM_BASE_ADD+0x58) // Codec main-scaler control
-+#define CICOTAREA           __REG(CAM_BASE_ADD+0x5C) // Codec pre-scaler destination
-+#define CICOSTATUS          __REG(CAM_BASE_ADD+0x64) // Codec path status
-+#define CIPRCLRSA0          __REG(CAM_BASE_ADD+0x6C) // RGB 1 st frame start address 
-+#define CIPRCLRSA1          __REG(CAM_BASE_ADD+0x70) // RGB 2 nd frame start address 
-+#define CIPRCLRSA2          __REG(CAM_BASE_ADD+0x74) // RGB 3 rd frame start address 
-+#define CIPRCLRSA3          __REG(CAM_BASE_ADD+0x78) // RGB 4 th frame start address 
-+#define CIPRTRGFMT          __REG(CAM_BASE_ADD+0x7C) // Target image format of preview
-+#define CIPRCTRL            __REG(CAM_BASE_ADD+0x80) // Preview DMA control related
-+#define CIPRSCPRERATIO      __REG(CAM_BASE_ADD+0x84) // Preview pre-scaler ratio control
-+#define CIPRSCPREDST        __REG(CAM_BASE_ADD+0x88) // Preview pre-scaler destination
-+#define CIPRSCCTRL          __REG(CAM_BASE_ADD+0x8C) // Preview main-scaler control
-+#define CIPRTAREA           __REG(CAM_BASE_ADD+0x90) // Preview pre-scaler destination
-+#define CIPRSTATUS          __REG(CAM_BASE_ADD+0x98) // Preview path status
-+#define CIIMGCPT            __REG(CAM_BASE_ADD+0xA0) // Image capture enable command
-+
-+#define CICOYSA(__x)        __REG(CAM_BASE_ADD+0x18 + (__x)*4 ) 
-+#define CICOCBSA(__x)       __REG(CAM_BASE_ADD+0x28 + (__x)*4 )
-+#define CICOCRSA(__x)       __REG(CAM_BASE_ADD+0x38 + (__x)*4 ) 
-+#define CIPRCLRSA(__x)      __REG(CAM_BASE_ADD+0x6C + (__x)*4 )
-+
-+/* CISRCFMT BitField */
-+#define SRCFMT_ITU601       BIT31
-+#define SRCFMT_ITU656       0
-+#define SRCFMT_UVOFFSET_128 BIT30
-+#define fCAM_SIZE_H         Fld(13, 16)
-+#define fCAM_SIZE_V         Fld(13, 0)
-+#define SOURCE_HSIZE(x)     FInsrt((x), fCAM_SIZE_H)
-+#define SOURCE_VSIZE(x)     FInsrt((x), fCAM_SIZE_V)
-+
-+
-+/* Window Option Register */
-+#define WINOFEN             BIT31
-+#define CO_FIFO_Y           BIT30
-+#define CO_FIFO_CB          BIT15
-+#define CO_FIFO_CR          BIT14
-+#define PR_FIFO_CB          BIT13
-+#define PR_FIFO_CR          BIT12
-+#define fWINHOR             Fld(11, 16)
-+#define fWINVER             Fld(11, 0)
-+#define WINHOROFST(x)       FInsrt((x), fWINHOR)
-+#define WINVEROFST(x)       FInsrt((x), fWINVER)
-+
-+/* Global Control Register */
-+#define GC_SWRST            BIT31
-+#define GC_CAMRST           BIT30
-+#define GC_INVPOLPCLK       BIT26
-+#define GC_INVPOLVSYNC      BIT25
-+#define GC_INVPOLHREF       BIT24
-+
-+/*--------------------------------------------------
-+                REGISTER BIT FIELD DEFINITION TO 
-+                          YCBCR and RGB 
-+----------------------------------------------------*/
-+/* Codec Target Format Register */
-+#define IN_YCBCR420         0
-+#define IN_YCBCR422         BIT31
-+#define OUT_YCBCR420        0
-+#define OUT_YCBCR422        BIT30
-+
-+#if 0
-+#define FLIP_NORMAL       0
-+#define FLIP_X              (BIT14)
-+#define FLIP_Y              (BIT15)
-+#define FLIP_MIRROR         (BIT14|BIT15)
-+#endif
-+
-+/**  BEGIN    ************************************/
-+/* Cotents: Common in both P and C port          */
-+#define fTARGET_HSIZE       Fld(13,16)
-+#define TARGET_HSIZE(x)     FInsrt((x), fTARGET_HSIZE)
-+#define fTARGET_VSIZE       Fld(13,0)
-+#define TARGET_VSIZE(x)     FInsrt((x), fTARGET_VSIZE)
-+#define FLIP_X_MIRROR       BIT14           
-+#define FLIP_Y_MIRROR       BIT15           
-+#define FLIP_180_MIRROR     (BIT14 | BIT15) 
-+/**  END     *************************************/
-+
-+/* Codec DMA Control Register */
-+#define fYBURST_M           Fld(5,19)
-+#define fYBURST_R           Fld(5,14)
-+#define fCBURST_M           Fld(5,9)
-+#define fCBURST_R           Fld(5,4)
-+#define YBURST_M(x)         FInsrt((x), fYBURST_M)
-+#define CBURST_M(x)         FInsrt((x), fCBURST_M)
-+#define YBURST_R(x)         FInsrt((x), fYBURST_R)
-+#define CBURST_R(x)         FInsrt((x), fCBURST_R)
-+#define LAST_IRQ_EN         BIT2              /* Common in both P and C port */
-+/*
-+ *  Check the done signal of capturing image for JPEG 
-+ *  !!! AutoClear Bit 
-+ */
-+
-+
-+/* (Codec, Preview ) Pre-Scaler Control Register 1 */
-+#define fSHIFT              Fld(4,28)
-+#define PRE_SHIFT(x)        FInsrt((x), fSHIFT)
-+#define fRATIO_H            Fld(7,16)
-+#define PRE_HRATIO(x)       FInsrt((x), fRATIO_H)
-+#define fRATIO_V            Fld(7,0)
-+#define PRE_VRATIO(x)       FInsrt((x), fRATIO_V)
-+
-+/* (Codec, Preview ) Pre-Scaler Control Register 2*/
-+#define fDST_WIDTH          Fld(12,16)
-+#define fDST_HEIGHT         Fld(12,0)
-+#define PRE_DST_WIDTH(x)    FInsrt((x), fDST_WIDTH)
-+#define PRE_DST_HEIGHT(x)   FInsrt((x), fDST_HEIGHT)
-+
-+
-+/* (Codec, Preview) Main-scaler control Register */
-+#define S_METHOD            BIT31  /* Sampling method only for P-port */
-+#define SCALERSTART         BIT15 
-+/* Codec scaler bypass for upper 2048x2048 
-+   where ImgCptEn_CoSC and ImgCptEn_PrSC should be 0 
-+*/
-+
-+#define SCALERBYPASS        BIT31  
-+#define RGB_FMT24           BIT30
-+#define RGB_FMT16           0
-+
-+/*
-+#define SCALE_UP_H          BIT29
-+#define SCALE_UP_V          BIT28
-+*/
-+
-+#define fMAIN_HRATIO        Fld(9, 16)
-+#define MAIN_HRATIO(x)      FInsrt((x), fMAIN_HRATIO)
-+
-+#define SCALER_START        BIT15
-+
-+#define fMAIN_VRATIO        Fld(9, 0)
-+#define MAIN_VRATIO(x)      FInsrt((x), fMAIN_VRATIO)
-+
-+/* (Codec, Preview ) DMA Target AREA Register */
-+#define fCICOTAREA          Fld(26,0)
-+#define TARGET_DMA_AREA(x)  FInsrt((x), fCICOTAREA)
-+
-+/* Preview DMA Control Register */
-+#define fRGBURST_M          Fld(5,19)
-+#define fRGBURST_R          Fld(5,14)
-+#define RGBURST_M(x)        FInsrt((x), fRGBURST_M)
-+#define RGBURST_R(x)        FInsrt((x), fRGBURST_R)
-+
-+
-+/* (Codec, Preview) Status Register */
-+#define CO_OVERFLOW_Y       BIT31
-+#define CO_OVERFLOW_CB      BIT30
-+#define CO_OVERFLOW_CR      BIT29
-+#define PR_OVERFLOW_CB      BIT31
-+#define PR_OVERFLOW_CR      BIT30
-+
-+#define VSYNC               BIT28
-+
-+#define fFRAME_CNT          Fld(2,26)
-+#define FRAME_CNT(x)        FExtr((x),fFRAME_CNT) 
-+           
-+#define WIN_OFF_EN          BIT25
-+#define fFLIP_MODE          Fld(2,23)
-+#define FLIP_MODE(x)        EExtr((x), fFLIP_MODE)
-+#define CAP_STATUS_CAMIF    BIT22
-+#define CAP_STATUS_CODEC    BIT21
-+#define CAP_STATUS_PREVIEW  BIT21
-+#define VSYNC_A             BIT20
-+#define VSYNC_B             BIT19
-+
-+/* Image Capture Enable Regiser */
-+#define       CAMIF_CAP_ON         BIT31
-+#define CAMIF_CAP_CODEC_ON   BIT30
-+#define CAMIF_CAP_PREVIEW_ON BIT29
-+
-+
-+
-+
-+#endif /* S3C2440_CAMER_H */
-diff --git a/arch/arm/mach-s3c2440/camera/camif.c b/arch/arm/mach-s3c2440/camera/camif.c
-new file mode 100644
-index 0000000..36d4ccc
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/camif.c
-@@ -0,0 +1,978 @@
-+/*
-+ *   Copyright (C) 2004 Samsung Electronics 
-+ *       SW.LEE <hitchcar@samsung.com>
-+ *   
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License 2. See the file COPYING in the main directory of this archive
-+ * for more details.
-+ */
-+
-+#include <linux/config.h>
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/sched.h>
-+#include <linux/irq.h>
-+#include <linux/tqueue.h>
-+#include <linux/locks.h>
-+#include <linux/completion.h>
-+#include <linux/delay.h>
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+#include <linux/miscdevice.h>
-+#include <linux/wait.h>
-+#include <linux/miscdevice.h>
-+#include <asm/io.h>
-+#include <asm/semaphore.h>
-+#include <asm/hardware.h>
-+#include <asm/uaccess.h>
-+
-+#ifdef CONFIG_ARCH_S3C24A0A
-+#include <asm/arch/S3C24A0.h>
-+#include <asm/arch/clocks.h>
-+#else
-+#include <asm/arch/S3C2440.h>
-+#include <asm/arch/clocks.h>
-+#endif
-+
-+#include "cam_reg.h"
-+//#define SW_DEBUG
-+#include "camif.h"
-+#include "videodev.h"
-+#include "miscdevice.h"
-+
-+
-+static int camif_dma_burst(camif_cfg_t *);
-+static int camif_scaler(camif_cfg_t *);
-+
-+static const char *camif_version =
-+        "$Id: camif.c,v 1.10 2004/06/04 04:24:14 swlee Exp $";
-+      
-+/* For SXGA Image */
-+#define RESERVE_MEM  15*1024*1024
-+#define YUV_MEM      10*1024*1024
-+#define RGB_MEM      (RESERVE_MEM - YUV_MEM)
-+
-+static int camif_malloc(camif_cfg_t *cfg)
-+{
-+      unsigned int t_size;
-+      unsigned int daon = cfg->target_x *cfg->target_y;
-+
-+      if(cfg->dma_type & CAMIF_CODEC) {
-+              if (cfg->fmt & CAMIF_OUT_YCBCR420) {
-+                      t_size = daon * 3 / 2 ;
-+              }
-+              else  { t_size = daon * 2; /* CAMIF_OUT_YCBCR422 */ }
-+              t_size = t_size *cfg->pp_num;
-+
-+#ifndef SAMSUNG_SXGA_CAM
-+              cfg->pp_virt_buf = consistent_alloc(GFP_KERNEL, t_size, &cfg->pp_phys_buf);
-+#else
-+              printk(KERN_INFO "Reserving High RAM Addresses \n");
-+              cfg->pp_phys_buf = PHYS_OFFSET + (MEM_SIZE - RESERVE_MEM);
-+              cfg->pp_virt_buf = ioremap_nocache(cfg->pp_phys_buf,YUV_MEM);
-+#endif
-+
-+              if ( !cfg->pp_virt_buf ) {
-+                      printk(KERN_ERR"CAMERA:Failed to request YCBCR MEM\n");
-+                      return -ENOMEM;
-+              }
-+              memset(cfg->pp_virt_buf, 0, t_size);
-+              cfg->pp_totalsize = t_size;
-+              return 0;
-+      }
-+      if ( cfg->dma_type & CAMIF_PREVIEW ) {
-+              if (cfg->fmt & CAMIF_RGB16) 
-+                      t_size = daon * 2; /*  4byte per two pixel*/
-+              else {
-+                      assert(cfg->fmt & CAMIF_RGB24);
-+                      t_size = daon * 4; /* 4byte per one pixel */
-+              }
-+              t_size = t_size * cfg->pp_num;
-+#ifndef SAMSUNG_SXGA_CAM
-+              cfg->pp_virt_buf = consistent_alloc(GFP_KERNEL, t_size, &cfg->pp_phys_buf);
-+#else
-+              printk(KERN_INFO "Reserving High RAM Addresses \n");
-+              cfg->pp_phys_buf = PHYS_OFFSET + (MEM_SIZE - RESERVE_MEM ) + YUV_MEM;
-+              cfg->pp_virt_buf = ioremap_nocache(cfg->pp_phys_buf,RGB_MEM);
-+#endif
-+              if ( !cfg->pp_virt_buf ) { 
-+                      printk(KERN_ERR"CAMERA:Failed to request RGB MEM\n");
-+                      return -ENOMEM;
-+              }
-+              memset(cfg->pp_virt_buf, 0, t_size);
-+              cfg->pp_totalsize = t_size;
-+              return 0;
-+      }
-+
-+      return 0;               /* Never come. */
-+}
-+
-+static int camif_demalloc(camif_cfg_t *cfg)
-+{
-+#ifndef SAMSUNG_SXGA_CAM
-+      if ( cfg->pp_virt_buf ) {
-+              consistent_free(cfg->pp_virt_buf,cfg->pp_totalsize,cfg->pp_phys_buf);
-+              cfg->pp_virt_buf = 0;
-+      }
-+#else
-+      iounmap(cfg->pp_virt_buf);
-+      cfg->pp_virt_buf = 0;
-+#endif
-+      return 0;
-+}
-+
-+/* 
-+ * advise a person to use this func in ISR 
-+ * index value indicates the next frame count to be used 
-+ */
-+int camif_g_frame_num(camif_cfg_t *cfg)
-+{
-+      int index = 0;
-+
-+      if (cfg->dma_type & CAMIF_CODEC ) {
-+              index = FRAME_CNT(CICOSTATUS);
-+              DPRINTK("CAMIF_CODEC frame %d \n", index);
-+      }
-+      else {
-+              assert(cfg->dma_type & CAMIF_PREVIEW );
-+              index = FRAME_CNT(CIPRSTATUS);
-+              DPRINTK("CAMIF_PREVIEW frame %d  0x%08X \n", index, CIPRSTATUS);
-+      }
-+      cfg->now_frame_num = (index + 2) % 4; /* When 4 PingPong */
-+      return index; /* meaningless */
-+}
-+
-+static int camif_pp_codec(camif_cfg_t *cfg)
-+{
-+      u32 i, c_size; /* Cb,Cr size */
-+      u32 one_p_size;
-+      u32 daon = cfg->target_x * cfg->target_y;
-+      if (cfg->fmt & CAMIF_OUT_YCBCR420) {
-+              c_size = daon /4;
-+      }
-+      else {
-+              assert(cfg->fmt & CAMIF_OUT_YCBCR422);
-+              c_size = daon /2;
-+      }
-+      switch ( cfg->pp_num ) {
-+              case 1 :
-+                      for ( i =0 ; i < 4; i=i+1) {
-+                              cfg->img_buf[i].virt_y = cfg->pp_virt_buf;
-+                              cfg->img_buf[i].phys_y = cfg->pp_phys_buf;
-+                              cfg->img_buf[i].virt_cb = cfg->pp_virt_buf + daon; 
-+                              cfg->img_buf[i].phys_cb = cfg->pp_phys_buf + daon;
-+                              cfg->img_buf[i].virt_cr = cfg->pp_virt_buf + daon + c_size;
-+                              cfg->img_buf[i].phys_cr = cfg->pp_phys_buf + daon + c_size;
-+                              CICOYSA(i)  =  cfg->img_buf[i].phys_y;
-+                              CICOCBSA(i) =  cfg->img_buf[i].phys_cb;
-+                              CICOCRSA(i) =  cfg->img_buf[i].phys_cr;
-+                      }
-+                      break;
-+              case 2:
-+#define  TRY   (( i%2 ) ? 1 :0)
-+                      one_p_size = daon + 2*c_size;
-+                      for (i = 0; i < 4  ; i++) {
-+                              cfg->img_buf[i].virt_y = cfg->pp_virt_buf + TRY * one_p_size;
-+                              cfg->img_buf[i].phys_y = cfg->pp_phys_buf + TRY * one_p_size;
-+                              cfg->img_buf[i].virt_cb = cfg->pp_virt_buf + daon + TRY * one_p_size;
-+                              cfg->img_buf[i].phys_cb = cfg->pp_phys_buf + daon + TRY * one_p_size;
-+                              cfg->img_buf[i].virt_cr = cfg->pp_virt_buf + daon + c_size + TRY * one_p_size;
-+                              cfg->img_buf[i].phys_cr = cfg->pp_phys_buf + daon + c_size + TRY * one_p_size;
-+                              CICOYSA(i)  = cfg->img_buf[i].phys_y;
-+                              CICOCBSA(i) = cfg->img_buf[i].phys_cb;
-+                              CICOCRSA(i) = cfg->img_buf[i].phys_cr;
-+                      }
-+                      break;
-+              case 4: 
-+                      one_p_size = daon + 2*c_size;
-+                      for (i = 0; i < 4 ; i++) {
-+                              cfg->img_buf[i].virt_y = cfg->pp_virt_buf + i * one_p_size;
-+                              cfg->img_buf[i].phys_y = cfg->pp_phys_buf + i * one_p_size;
-+                              cfg->img_buf[i].virt_cb = cfg->pp_virt_buf + daon + i * one_p_size;
-+                              cfg->img_buf[i].phys_cb = cfg->pp_phys_buf + daon + i * one_p_size;
-+                              cfg->img_buf[i].virt_cr = cfg->pp_virt_buf + daon + c_size + i * one_p_size;
-+                              cfg->img_buf[i].phys_cr = cfg->pp_phys_buf + daon + c_size + i * one_p_size;
-+                              CICOYSA(i)  =  cfg->img_buf[i].phys_y;
-+                              CICOCBSA(i) =  cfg->img_buf[i].phys_cb;
-+                              CICOCRSA(i) =  cfg->img_buf[i].phys_cr;
-+                      }
-+                      break;
-+              default:
-+                      printk("Invalid PingPong Number %d \n",cfg->pp_num);
-+                      panic("halt\n");
-+      }
-+      return 0;
-+}
-+
-+/* RGB Buffer Allocation */
-+static int camif_pp_preview(camif_cfg_t *cfg)
-+{
-+      int i;
-+      u32 daon = cfg->target_x * cfg->target_y;
-+
-+      if(cfg->fmt & CAMIF_RGB24)  
-+              daon = daon * 4 ;
-+      else {
-+              assert (cfg->fmt & CAMIF_RGB16);
-+              daon = daon *2;
-+      }  
-+      switch ( cfg->pp_num ) {
-+              case 1:
-+                      for ( i = 0; i < 4 ; i++ ) {
-+                              cfg->img_buf[i].virt_rgb = cfg->pp_virt_buf ;
-+                              cfg->img_buf[i].phys_rgb = cfg->pp_phys_buf ;
-+                              CIPRCLRSA(i) = cfg->img_buf[i].phys_rgb;
-+                      }
-+                      break;
-+              case 2:
-+                      for ( i = 0; i < 4 ; i++) {
-+                              cfg->img_buf[i].virt_rgb = cfg->pp_virt_buf + TRY * daon;
-+                              cfg->img_buf[i].phys_rgb = cfg->pp_phys_buf + TRY * daon;
-+                              CIPRCLRSA(i) = cfg->img_buf[i].phys_rgb;
-+                      }
-+                      break;
-+              case 4:
-+                      for ( i = 0; i < 4 ; i++) {
-+                              cfg->img_buf[i].virt_rgb = cfg->pp_virt_buf + i * daon;
-+                              cfg->img_buf[i].phys_rgb = cfg->pp_phys_buf + i * daon;
-+                              CIPRCLRSA(i) = cfg->img_buf[i].phys_rgb;
-+                      }
-+                      break;
-+              default:
-+                      printk("Invalid PingPong Number %d \n",cfg->pp_num);
-+                      panic("halt\n");
-+      }
-+      return 0;
-+}
-+
-+static int camif_pingpong(camif_cfg_t *cfg)
-+{
-+      if (cfg->dma_type & CAMIF_CODEC ) {
-+              camif_pp_codec(cfg);
-+      }
-+
-+      if ( cfg->dma_type & CAMIF_PREVIEW) {
-+              camif_pp_preview(cfg);
-+      }
-+      return 0;
-+}
-+
-+
-+/***********       Image Convert *******************************/
-+/*  Return Format 
-+ *  Supported by Hardware
-+ *  V4L2_PIX_FMT_YUV420,
-+ *  V4L2_PIX_FMT_YUV422P,
-+ *  V4L2_PIX_FMT_BGR32 (BGR4)
-+ * -----------------------------------
-+ *  V4L2_PIX_FMT_RGB565(X) 
-+ *  Currenly 2byte --> BGR656 Format
-+ *  S3C2440A,S3C24A0 supports vairants with reversed FMT_RGB565 
-+    i.e  blue toward the least, red towards the most significant bit 
-+    --  by SW.LEE
-+ */
-+
-+
-+/* 
-+ * After calling camif_g_frame_num,
-+ * this func must be called 
-+ */
-+u8 * camif_g_frame(camif_cfg_t *cfg)
-+{
-+      u8 * ret = NULL;
-+      int cnt = cfg->now_frame_num;
-+
-+      if(cfg->dma_type & CAMIF_PREVIEW) {
-+              ret = cfg->img_buf[cnt].virt_rgb;
-+      }
-+      if (cfg->dma_type & CAMIF_CODEC) {
-+              ret = cfg->img_buf[cnt].virt_y;
-+      }
-+      return ret;
-+}
-+
-+/* This function must be called in module initial time */
-+static int camif_source_fmt(camif_gc_t *gc) 
-+{
-+      u32 cmd = 0;
-+
-+      /* Configure CISRCFMT --Source Format */
-+      if (gc->itu_fmt & CAMIF_ITU601) {
-+              cmd = CAMIF_ITU601;
-+      }
-+      else {
-+              assert ( gc->itu_fmt & CAMIF_ITU656);
-+              cmd = CAMIF_ITU656;
-+      }
-+      cmd  |= SOURCE_HSIZE(gc->source_x)| SOURCE_VSIZE(gc->source_y);
-+      /* Order422 */
-+      cmd |=  gc->order422;
-+      CISRCFMT = cmd;
-+
-+      return 0 ;
-+}
-+
-+
-+/* 
-+ * Codec Input YCBCR422 will be Fixed 
-+ */
-+static int camif_target_fmt(camif_cfg_t *cfg)
-+{
-+      u32 cmd = 0;
-+
-+      if (cfg->dma_type & CAMIF_CODEC) {
-+              /* YCBCR setting */  
-+              cmd = TARGET_HSIZE(cfg->target_x)| TARGET_VSIZE(cfg->target_y);
-+              if ( cfg->fmt & CAMIF_OUT_YCBCR420 ) {
-+                      cmd |= OUT_YCBCR420|IN_YCBCR422;
-+              }
-+              else { 
-+                      assert(cfg->fmt & CAMIF_OUT_YCBCR422);
-+                      cmd |= OUT_YCBCR422|IN_YCBCR422;
-+              }
-+              CICOTRGFMT = cmd | cfg->flip;
-+      } 
-+      else {
-+              assert(cfg->dma_type & CAMIF_PREVIEW);
-+              CIPRTRGFMT = 
-+                      TARGET_HSIZE(cfg->target_x)|TARGET_VSIZE(cfg->target_y)|cfg->flip;
-+      }
-+      return 0;
-+}
-+
-+void camif_change_flip(camif_cfg_t *cfg)
-+{
-+      u32 cmd = 0;
-+
-+      if (cfg->dma_type & CAMIF_CODEC ) {
-+              /* YCBCR setting */  
-+              cmd  = CICOTRGFMT;
-+              cmd &= ~(BIT14|BIT15); /* Clear FLIP Mode */
-+              cmd |= cfg->flip; 
-+              CICOTRGFMT = cmd;
-+      } 
-+      else {
-+              cmd  = CIPRTRGFMT;
-+              cmd &= ~(BIT14|BIT15);
-+              cmd |= cfg->flip;
-+              CICOTRGFMT = cmd; 
-+      }
-+}
-+
-+
-+
-+/* Must:
-+ * Before calling this function,
-+ * you must use "camif_dynamic_open"
-+ * If you want to enable both CODEC and preview
-+ *  you must do it at the same time.
-+ */
-+int camif_capture_start(camif_cfg_t *cfg)
-+{
-+      u32 n_cmd = 0;          /* Next Command */
-+
-+      switch(cfg->exec) {
-+              case CAMIF_BOTH_DMA_ON:
-+                      camif_reset(CAMIF_RESET,0); /* Flush Camera Core Buffer */              
-+                      CIPRSCCTRL |= SCALERSTART;
-+                      CICOSCCTRL |= SCALERSTART;
-+                      n_cmd = CAMIF_CAP_PREVIEW_ON|CAMIF_CAP_CODEC_ON;
-+                      break;
-+              case CAMIF_DMA_ON:
-+                      camif_reset(CAMIF_RESET,0); /* Flush Camera Core Buffer */              
-+                      if (cfg->dma_type&CAMIF_CODEC) {
-+                              CICOSCCTRL |= SCALERSTART;
-+                              n_cmd = CAMIF_CAP_CODEC_ON;
-+                      }else {
-+                              CIPRSCCTRL |= SCALERSTART;
-+                              n_cmd = CAMIF_CAP_PREVIEW_ON;
-+                      }
-+
-+                      /* wait until Sync Time expires */
-+                      /* First settting, to wait VSYNC fall  */
-+                      /* By VESA spec,in 640x480 @60Hz 
-+                         MAX Delay Time is around 64us which "while" has.*/ 
-+                      while(VSYNC & CICOSTATUS);
-+                      break;
-+              default:
-+                      break;
-+      }
-+      CIIMGCPT = n_cmd|CAMIF_CAP_ON;
-+      return 0;
-+}
-+
-+
-+int camif_capture_stop(camif_cfg_t *cfg)
-+{
-+      u32 n_cmd = CIIMGCPT;   /* Next Command */
-+
-+      switch(cfg->exec) {
-+              case CAMIF_BOTH_DMA_OFF:
-+                      CIPRSCCTRL &= ~SCALERSTART;
-+                      CICOSCCTRL &= ~SCALERSTART;
-+                      n_cmd = 0;
-+                      break;
-+              case CAMIF_DMA_OFF_L_IRQ: /* fall thru */
-+              case CAMIF_DMA_OFF:
-+                      if (cfg->dma_type&CAMIF_CODEC) {
-+                              CICOSCCTRL &= ~SCALERSTART;
-+                              n_cmd &= ~CAMIF_CAP_CODEC_ON;
-+                              if (!(n_cmd & CAMIF_CAP_PREVIEW_ON))
-+                                      n_cmd = 0;
-+                      }else {
-+                              CIPRSCCTRL &= ~SCALERSTART;
-+                              n_cmd &= ~CAMIF_CAP_PREVIEW_ON;
-+                              if (!(n_cmd & CAMIF_CAP_CODEC_ON))
-+                                      n_cmd = 0;
-+                      }
-+                      break;
-+              default:
-+                      panic("Unexpected \n");
-+      }
-+      CIIMGCPT = n_cmd;
-+      if(cfg->exec == CAMIF_DMA_OFF_L_IRQ) { /* Last IRQ  */
-+              if (cfg->dma_type & CAMIF_CODEC) 
-+                      CICOCTRL |= LAST_IRQ_EN;
-+              else 
-+                      CIPRCTRL |= LAST_IRQ_EN;
-+      } 
-+#if 0
-+      else {                          /* to make internal state machine of CAMERA stop */
-+              camif_reset(CAMIF_RESET, 0);
-+      }
-+#endif
-+      return 0;
-+}
-+
-+
-+/* LastIRQEn is autoclear */
-+void camif_last_irq_en(camif_cfg_t *cfg)
-+{
-+      if(cfg->exec == CAMIF_BOTH_DMA_ON) {
-+              CIPRCTRL |= LAST_IRQ_EN;
-+              CICOCTRL |= LAST_IRQ_EN;
-+      }
-+      else {
-+              if (cfg->dma_type & CAMIF_CODEC) 
-+                      CICOCTRL |= LAST_IRQ_EN;
-+              else 
-+                      CIPRCTRL |= LAST_IRQ_EN;
-+      }
-+}
-+
-+static int  
-+camif_scaler_internal(u32 srcWidth, u32 dstWidth, u32 *ratio, u32 *shift)
-+{
-+      if(srcWidth>=64*dstWidth){
-+              printk(KERN_ERR"CAMERA:out of prescaler range: srcWidth /dstWidth = %d(< 64)\n",
-+                       srcWidth/dstWidth);
-+              return 1;
-+      }
-+      else if(srcWidth>=32*dstWidth){
-+              *ratio=32;
-+              *shift=5;
-+      }
-+      else if(srcWidth>=16*dstWidth){
-+              *ratio=16;
-+              *shift=4;
-+      }
-+      else if(srcWidth>=8*dstWidth){
-+              *ratio=8;
-+              *shift=3;
-+      }
-+      else if(srcWidth>=4*dstWidth){
-+              *ratio=4;
-+              *shift=2;
-+      }
-+      else if(srcWidth>=2*dstWidth){
-+              *ratio=2;
-+              *shift=1;
-+      }
-+      else {
-+              *ratio=1;
-+              *shift=0;
-+      }  
-+      return 0;
-+}
-+
-+
-+int camif_g_fifo_status(camif_cfg_t *cfg) 
-+{
-+      u32 reg;
-+
-+      if (cfg->dma_type & CAMIF_CODEC) {
-+              u32 flag = CO_OVERFLOW_Y|CO_OVERFLOW_CB|CO_OVERFLOW_CR;
-+              reg = CICOSTATUS;
-+              if (reg & flag) {
-+                      printk("CODEC: FIFO error(0x%08x) and corrected\n",reg);
-+                      /* FIFO Error Count ++  */
-+                      CIWDOFST |= CO_FIFO_Y|CO_FIFO_CB|CO_FIFO_CR;
-+                      CIWDOFST &= ~(CO_FIFO_Y|CO_FIFO_CB|CO_FIFO_CR);
-+                      return 1; /* Error */
-+              }
-+      }
-+      if (cfg->dma_type & CAMIF_PREVIEW) {
-+              u32 flag = PR_OVERFLOW_CB|PR_OVERFLOW_CR;
-+              reg = CIPRSTATUS;
-+              if (reg & flag) {
-+                      printk("PREVIEW:FIFO error(0x%08x) and corrected\n",reg);
-+                      CIWDOFST |= PR_FIFO_CB|PR_FIFO_CR;
-+                      CIWDOFST &= ~(CO_FIFO_Y|CO_FIFO_CB|CO_FIFO_CR);
-+                      /* FIFO Error Count ++  */
-+                      return 1; /* Error */
-+              }
-+      }
-+      return 0;               /* No Error */
-+}
-+
-+
-+/* Policy:
-+ * if codec or preview define the win offset,
-+ *    other must follow that value.
-+ */
-+int camif_win_offset(camif_gc_t *gc )
-+{
-+      u32 h = gc->win_hor_ofst;
-+      u32 v = gc->win_ver_ofst;
-+
-+      /*Clear Overflow */
-+      CIWDOFST = CO_FIFO_Y|CO_FIFO_CB|CO_FIFO_CR|PR_FIFO_CB|PR_FIFO_CB;
-+      CIWDOFST = 0;           /* ? Dummy */
-+      if (!h && !v)   {
-+              CIWDOFST = 0;
-+              return 0;
-+      }
-+      CIWDOFST = WINOFEN | WINHOROFST(h) | WINVEROFST(v);
-+      return 0;
-+}
-+
-+/*  
-+ * when you change the resolution in a specific camera,
-+ * sometimes, it is necessary to change the polarity 
-+ *                                       -- SW.LEE
-+ */
-+static void camif_polarity(camif_gc_t *gc)
-+{
-+      u32 cmd = CIGCTRL;
-+      
-+      cmd = cmd & ~(BIT26|BIT25|BIT24); /* clear polarity */
-+      if (gc->polarity_pclk)
-+              cmd |= GC_INVPOLPCLK;
-+      if (gc->polarity_vsync)
-+              cmd |= GC_INVPOLVSYNC;
-+      if (gc->polarity_href)
-+              cmd |= GC_INVPOLHREF;
-+      CIGCTRL |= cmd;
-+}
-+
-+
-+int camif_dynamic_open(camif_cfg_t *cfg)
-+{
-+      camif_win_offset(cfg->gc);
-+      camif_polarity(cfg->gc);
-+      
-+      if(camif_scaler(cfg)) {
-+              printk(KERN_ERR "CAMERA:Preview Scaler, Change WinHorOfset or Target Size\n");
-+              return 1;
-+      }
-+      camif_target_fmt(cfg);
-+      if (camif_dma_burst(cfg)) {
-+              printk(KERN_ERR "CAMERA:DMA Busrt Length Error \n");
-+              return 1;
-+      }
-+      if(camif_malloc(cfg) ) {
-+              printk(KERN_ERR "    Instead of using consistent_alloc()\n"
-+                              "    lease use dedicated memory allocation for DMA memory\n");
-+              return -1;
-+      }
-+      camif_pingpong(cfg);
-+      return 0;
-+}
-+
-+int camif_dynamic_close(camif_cfg_t *cfg)
-+{
-+      camif_demalloc(cfg);
-+      return 0;
-+}
-+
-+static int camif_target_area(camif_cfg_t *cfg) 
-+{
-+      u32 rect = cfg->target_x * cfg->target_y;
-+      if (cfg->dma_type & CAMIF_CODEC ) {
-+              CICOTAREA = rect;
-+      }
-+      if (cfg->dma_type & CAMIF_PREVIEW) {
-+              CIPRTAREA = rect;
-+      }
-+      return 0;
-+}
-+
-+static int inline camif_hw_reg(camif_cfg_t *cfg)
-+{
-+      u32 cmd = 0;
-+
-+      if (cfg->dma_type & CAMIF_CODEC) {
-+              CICOSCPRERATIO = PRE_SHIFT(cfg->sc.shfactor)
-+                      |PRE_HRATIO(cfg->sc.prehratio)|PRE_VRATIO(cfg->sc.prevratio);
-+              CICOSCPREDST = 
-+                      PRE_DST_WIDTH(cfg->sc.predst_x)|PRE_DST_HEIGHT(cfg->sc.predst_y);
-+
-+              /* Differ from Preview */
-+              if (cfg->sc.scalerbypass)
-+                      cmd |= SCALERBYPASS;
-+              if (cfg->sc.scaleup_h & cfg->sc.scaleup_v)
-+                      cmd |= BIT30|BIT29;
-+              CICOSCCTRL = cmd | MAIN_HRATIO(cfg->sc.mainhratio)
-+                      |MAIN_VRATIO(cfg->sc.mainvratio);
-+              return 0;
-+      }
-+      else if (cfg->dma_type & CAMIF_PREVIEW) {
-+              CIPRSCPRERATIO = PRE_SHIFT(cfg->sc.shfactor)
-+                      |PRE_HRATIO(cfg->sc.prehratio)|PRE_VRATIO(cfg->sc.prevratio);
-+              CIPRSCPREDST = 
-+                      PRE_DST_WIDTH(cfg->sc.predst_x)|PRE_DST_HEIGHT(cfg->sc.predst_y);
-+              /* Differ from Codec */
-+              if (cfg->fmt & CAMIF_RGB24) {
-+                      cmd |= RGB_FMT24;  
-+              }
-+              else {
-+                      /* RGB16 */;
-+              }               
-+              if (cfg->sc.scaleup_h & cfg->sc.scaleup_v)
-+                      cmd |= BIT29|BIT28;
-+              CIPRSCCTRL = cmd |MAIN_HRATIO(cfg->sc.mainhratio)|S_METHOD
-+                      |MAIN_VRATIO(cfg->sc.mainvratio);
-+      }else {
-+              panic("CAMERA:DMA_TYPE Wrong \n");
-+      }
-+
-+      return 0;
-+}
-+
-+
-+/* Configure Pre-scaler control  & main scaler control register */
-+static int camif_scaler(camif_cfg_t *cfg)
-+{
-+      int tx = cfg->target_x,ty=cfg->target_y;
-+      int sx, sy;
-+
-+      if (tx <= 0 || ty<= 0)  panic("CAMERA: Invalid target size \n");
-+
-+      sx = cfg->gc->source_x - 2*cfg->gc->win_hor_ofst;
-+      sy = cfg->gc->source_y - 2*cfg->gc->win_ver_ofst;       
-+      if (sx <= 0 || sy<= 0)  panic("CAMERA: Invalid source size \n");
-+      cfg->sc.modified_src_x = sx;
-+      cfg->sc.modified_src_y = sy;
-+
-+      /* Pre-scaler control register 1 */
-+      camif_scaler_internal(sx,tx,&cfg->sc.prehratio,&cfg->sc.hfactor);
-+      camif_scaler_internal(sy,ty,&cfg->sc.prevratio,&cfg->sc.vfactor);
-+
-+      if (cfg->dma_type & CAMIF_PREVIEW) {
-+              if ( (sx /cfg->sc.prehratio) <= 640 ) {}
-+              else {
-+                      printk(KERN_INFO "CAMERA: Internal Preview line buffer is 640 pixels\n");
-+                      return 1; /* Error */
-+              }
-+      }
-+
-+      cfg->sc.shfactor = 10-(cfg->sc.hfactor+cfg->sc.vfactor);
-+      /* Pre-scaler control register 2 */
-+      cfg->sc.predst_x = sx / cfg->sc.prehratio;
-+      cfg->sc.predst_y = sy / cfg->sc.prevratio;
-+
-+      /* Main-scaler control register */
-+      cfg->sc.mainhratio = (sx << 8)/(tx << cfg->sc.hfactor);
-+      cfg->sc.mainvratio = (sy << 8)/(ty << cfg->sc.vfactor);
-+      DPRINTK(" sx %d, sy %d tx %d ty %d  \n",sx,sy,tx,ty);
-+      DPRINTK(" hfactor %d  vfactor %d \n",cfg->sc.hfactor,cfg->sc.vfactor);
-+
-+      cfg->sc.scaleup_h  = (sx <= tx) ? 1: 0;
-+      cfg->sc.scaleup_v  = (sy <= ty) ? 1: 0;
-+      if ( cfg->sc.scaleup_h != cfg->sc.scaleup_v) 
-+              printk(KERN_ERR "scaleup_h must be same to scaleup_v \n");
-+      camif_hw_reg(cfg);
-+      camif_target_area(cfg);
-+      return 0;
-+}
-+
-+/******************************************************
-+ CalculateBurstSize - Calculate the busrt lengths
-+ Description:
-+ - dstHSize: the number of the byte of H Size.
-+********************************************************/
-+static void camif_g_bsize(u32 hsize, u32 *mburst, u32 *rburst)
-+{
-+      u32 tmp;
-+
-+      tmp = (hsize/4) % 16;
-+      switch(tmp) {
-+              case 0:
-+                      *mburst=16;
-+                      *rburst=16;
-+                      break;
-+              case 4:
-+                      *mburst=16;
-+                      *rburst=4;
-+                      break;
-+              case 8:
-+                      *mburst=16;
-+                      *rburst=8;
-+                      break;
-+              default:
-+                      tmp=(hsize/4)%8;
-+                      switch(tmp) {
-+                              case 0:
-+                                      *mburst=8;
-+                                      *rburst=8;
-+                                      break;
-+                              case 4:
-+                                      *mburst=8;
-+                                      *rburst=4;
-+                              default:
-+                                      *mburst=4;
-+                                      tmp=(hsize/4)%4;
-+                                      *rburst= (tmp) ? tmp: 4;
-+                                      break;
-+                      }
-+                      break;
-+      }
-+}
-+
-+/* SXGA 1028x1024*/
-+/* XGA 1024x768 */
-+/* SVGA 800x600 */
-+/* VGA 640x480 */
-+/* CIF 352x288 */
-+/* QVGA 320x240 */
-+/* QCIF 176x144 */
-+/* ret val 
-+        1 : DMA Size Error 
-+*/
-+#define BURST_ERR 1 
-+static int camif_dma_burst(camif_cfg_t *cfg)
-+{
-+      int width = cfg->target_x;
-+
-+      if (cfg->dma_type & CAMIF_CODEC ) {
-+              u32 yburst_m, yburst_r;
-+              u32 cburst_m, cburst_r;
-+              /* CODEC DMA WIDHT is multiple of 16 */
-+              if (width %16 != 0 )  return BURST_ERR;   /* DMA Burst Length Error */
-+              camif_g_bsize(width,&yburst_m,&yburst_r);
-+              camif_g_bsize(width/2,&cburst_m,&cburst_r);
-+              CICOCTRL =YBURST_M(yburst_m)|CBURST_M(cburst_m)
-+                      |YBURST_R(yburst_r)|CBURST_R(cburst_r);
-+      }
-+
-+      if (cfg->dma_type & CAMIF_PREVIEW) {
-+              u32 rgburst_m, rgburst_r;
-+              if(cfg->fmt == CAMIF_RGB24) {
-+                      if (width %2 != 0 )  return BURST_ERR;   /* DMA Burst Length Error */
-+                      camif_g_bsize(width*4,&rgburst_m,&rgburst_r);
-+              }
-+              else {          /* CAMIF_RGB16 */
-+                      if ((width/2) %2 != 0 )  return BURST_ERR; /* DMA Burst Length Error */
-+                      camif_g_bsize(width*2,&rgburst_m,&rgburst_r);  
-+              }
-+                      CIPRCTRL = RGBURST_M(rgburst_m) | RGBURST_R(rgburst_r);
-+      }
-+      return 0;
-+}
-+
-+static int camif_gpio_init(void)
-+{
-+#ifdef CONFIG_ARCH_S3C24A0A
-+      /* S3C24A0A has the dedicated signal pins for Camera */
-+#else
-+      set_gpio_ctrl(GPIO_CAMDATA0);
-+      set_gpio_ctrl(GPIO_CAMDATA1);
-+      set_gpio_ctrl(GPIO_CAMDATA2);
-+      set_gpio_ctrl(GPIO_CAMDATA3);
-+      set_gpio_ctrl(GPIO_CAMDATA4);
-+      set_gpio_ctrl(GPIO_CAMDATA5);
-+      set_gpio_ctrl(GPIO_CAMDATA6);
-+      set_gpio_ctrl(GPIO_CAMDATA7);
-+      set_gpio_ctrl(GPIO_CAMPCLKIN);
-+      set_gpio_ctrl(GPIO_CAMVSYNC);
-+      set_gpio_ctrl(GPIO_CAMHREF);
-+      set_gpio_ctrl(GPIO_CAMPCLKOUT);
-+      set_gpio_ctrl(GPIO_CAMRESET);
-+#endif
-+        return 0;
-+}
-+
-+
-+#define ROUND_ADD 0x100000
-+
-+#ifdef CONFIG_ARCH_S3C24A0A
-+int camif_clock_init(camif_gc_t *gc)
-+{
-+      unsigned int upll, camclk_div, camclk;
-+
-+      if (!gc) camclk = 24000000;
-+      else  {
-+              camclk = gc->camclk;
-+              if (camclk > 48000000)
-+                      printk(KERN_ERR "Wrong Camera Clock\n");
-+      }
-+
-+      CLKCON |= CLKCON_CAM_UPLL | CLKCON_CAM_HCLK;
-+      upll = get_bus_clk(GET_UPLL);
-+      printk(KERN_INFO "CAMERA:Default UPLL %08d and Assing 96Mhz to UPLL\n",upll);   
-+      UPLLCON = FInsrt(56, fPLL_MDIV) | FInsrt(2, fPLL_PDIV)| FInsrt(1, fPLL_SDIV);
-+      upll = get_bus_clk(GET_UPLL);
-+
-+      camclk_div = (upll+ROUND_ADD) / camclk - 1;
-+      CLKDIVN = (CLKDIVN & 0xFF) | CLKDIVN_CAM(camclk_div);
-+      printk(KERN_INFO"CAMERA:upll %d MACRO 0x%08X CLKDIVN 0x%08X \n",
-+                              upll, CLKDIVN_CAM(camclk_div),CLKDIVN);
-+      CIIMGCPT = 0;           /* Dummy ? */
-+      return 0;
-+}
-+#else
-+int camif_clock_init(camif_gc_t *gc)
-+{
-+      unsigned int upll, camclk_div, camclk;
-+      if (!gc) camclk = 24000000;
-+      else  {
-+              camclk = gc->camclk;
-+              if (camclk > 48000000)
-+                      printk(KERN_ERR "Wrong Camera Clock\n");
-+      }
-+
-+      CLKCON |= CLKCON_CAMIF;
-+      upll = elfin_get_bus_clk(GET_UPLL);
-+      printk(KERN_INFO "CAMERA:Default UPLL %08d and Assing 96Mhz to UPLL\n",upll);   
-+      {
-+              UPLLCON = FInsrt(60, fPLL_MDIV) | FInsrt(4, fPLL_PDIV)| FInsrt(1, fPLL_SDIV);
-+              CLKDIVN |= DIVN_UPLL;   /* For USB */
-+              upll = elfin_get_bus_clk(GET_UPLL);
-+      }
-+
-+      camclk_div = (upll+ROUND_ADD) /(camclk * 2) -1;
-+      CAMDIVN = CAMCLK_SET_DIV|(camclk_div&0xf);
-+      printk(KERN_INFO "CAMERA:upll %08d  cam_clk %08d CAMDIVN 0x%08x \n",upll,camclk, CAMDIVN);
-+      CIIMGCPT = 0;           /* Dummy ? */
-+      return 0;
-+}
-+#endif
-+
-+/* 
-+   Reset Camera IP in CPU
-+   Reset External Sensor 
-+ */
-+void camif_reset(int is, int delay)
-+{
-+      switch (is) {
-+              case CAMIF_RESET:
-+                      CIGCTRL |= GC_SWRST;
-+                      mdelay(1);
-+                      CIGCTRL &= ~GC_SWRST;
-+                      break;
-+              case CAMIF_EX_RESET_AH: /*Active High */
-+                      CIGCTRL &= ~GC_CAMRST; 
-+                      udelay(200);
-+                      CIGCTRL |= GC_CAMRST;
-+                      udelay(delay);
-+                      CIGCTRL &= ~GC_CAMRST;
-+                      break;
-+              case CAMIF_EX_RESET_AL: /*Active Low */
-+                      CIGCTRL |=  GC_CAMRST;
-+                      udelay(200);
-+                      CIGCTRL &= ~GC_CAMRST;
-+                      udelay(delay);
-+                      CIGCTRL |= GC_CAMRST;
-+                      break;
-+              default:
-+                      break;
-+      }
-+}
-+              
-+/* For Camera Operation,
-+ * we can give the high priority to REQ2 of ARBITER1 
-+ */
-+
-+/* Please move me into proper place 
-+ *  camif_gc_t is not because "rmmod imgsenor" will delete the instance of camif_gc_t  
-+ */
-+static u32 old_priority; 
-+
-+static void camif_bus_priority(int flag)
-+{
-+      if (flag) {
-+#ifdef CONFIG_ARCH_S3C24A0A
-+              old_priority = PRIORITY0;
-+              PRIORITY0 = PRIORITY_I_FIX;
-+              PRIORITY1 = PRIORITY_I_FIX;
-+
-+#else
-+              old_priority = PRIORITY;        
-+              PRIORITY &= ~(3<<7);
-+              PRIORITY |=  (1<<7); /* Arbiter 1, REQ2 first */
-+              PRIORITY &= ~(1<<1); /* Disable Priority Rotate */
-+#endif
-+      } 
-+      else {
-+#ifdef CONFIG_ARCH_S3C24A0A
-+              PRIORITY0 = old_priority;
-+              PRIORITY1 = old_priority;
-+#else
-+              PRIORITY = old_priority;
-+#endif
-+      }
-+}
-+
-+static void inline camif_clock_off(void)
-+{
-+      CIIMGCPT = 0;
-+#if defined (CONFIG_ARCH_S3C24A0A)
-+      CLKCON &= ~CLKCON_CAM_UPLL;
-+      CLKCON &= ~CLKCON_CAM_HCLK;
-+#else
-+      CLKCON &= ~CLKCON_CAMIF;
-+#endif
-+}
-+
-+
-+/* Init external image sensor 
-+ *  Before make some value into image senor,
-+ *  you must set up the pixel clock.
-+ */
-+void camif_setup_sensor(void)
-+{
-+      camif_reset(CAMIF_RESET, 0);
-+      camif_gpio_init();
-+      camif_clock_init(NULL);
-+/* Sometimes ,Before loading I2C module, we need the reset signal */
-+#ifdef CONFIG_ARCH_S3C24A0A
-+      camif_reset(CAMIF_EX_RESET_AL,1000);
-+#else
-+      camif_reset(CAMIF_EX_RESET_AH,1000);
-+#endif
-+}
-+
-+void camif_hw_close(camif_cfg_t *cfg)
-+{
-+      camif_bus_priority(0);
-+      camif_clock_off();
-+}
-+
-+void camif_hw_open(camif_gc_t *gc)
-+{
-+      camif_source_fmt(gc);
-+      camif_win_offset(gc);
-+      camif_bus_priority(1);
-+}
-+
-+
-+
-+/* 
-+ * Local variables:
-+ * tab-width: 8
-+ *  c-indent-level: 8
-+ *  c-basic-offset: 8
-+ *  c-set-style: "K&R"
-+ * End:
-+ */
-diff --git a/arch/arm/mach-s3c2440/camera/camif.h b/arch/arm/mach-s3c2440/camera/camif.h
-new file mode 100644
-index 0000000..8b4f9aa
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/camif.h
-@@ -0,0 +1,304 @@
-+/*
-+    FIMC2.0  Camera Header File
-+
-+    Copyright (C) 2003 Samsung Electronics (SW.LEE: hitchcar@samsung.com)
-+
-+      Author : SW.LEE <hitchcar@samsung.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 __FIMC20_CAMIF_H_
-+#define __FIMC20_CAMIF_H_
-+
-+#ifdef __KERNEL__
-+
-+#include "bits.h"
-+#include "videodev.h"
-+#include <asm/types.h>
-+#include <linux/i2c.h>
-+
-+#endif  /* __KERNEL__ */
-+
-+#ifndef O_NONCAP
-+#define O_NONCAP O_TRUNC
-+#endif
-+
-+/* Codec or Preview Status */
-+#define CAMIF_STARTED         BIT1
-+#define CAMIF_STOPPED         BIT2
-+#define CAMIF_INT_HAPPEN      BIT3
-+
-+/* Codec or Preview  : Interrupt FSM */
-+#define CAMIF_1nd_INT         BIT7
-+#define CAMIF_Xnd_INT         BIT8
-+#define CAMIF_Ynd_INT         BIT9 
-+#define CAMIF_Znd_INT         BIT10
-+#define CAMIF_NORMAL_INT      BIT11
-+#define CAMIF_DUMMY_INT       BIT12
-+#define CAMIF_PENDING_INT     0
-+
-+
-+/* CAMIF RESET Definition */
-+#define CAMIF_RESET           BIT0
-+#define CAMIF_EX_RESET_AL     BIT1    /* Active Low */
-+#define CAMIF_EX_RESET_AH     BIT2    /* Active High */
-+
-+
-+enum camif_itu_fmt {
-+      CAMIF_ITU601 = BIT31,
-+      CAMIF_ITU656 = 0
-+};
-+
-+/* It is possbie to use two device simultaneously */
-+enum camif_dma_type {
-+       CAMIF_PREVIEW = BIT0,
-+       CAMIF_CODEC   = BIT1,
-+};
-+
-+enum camif_order422 {
-+       CAMIF_YCBYCR = 0,
-+       CAMIF_YCRYCB = BIT14,
-+       CAMIF_CBYCRY = BIT15,
-+       CAMIF_CRYCBY = BIT14 | BIT15
-+};
-+
-+enum flip_mode {
-+        CAMIF_FLIP   = 0,
-+        CAMIF_FLIP_X = BIT14,
-+        CAMIF_FLIP_Y = BIT15,
-+        CAMIF_FLIP_MIRROR = BIT14 |BIT15,
-+};
-+
-+enum camif_codec_fmt {
-+      /* Codec part */
-+        CAMIF_IN_YCBCR420  = BIT0, /* Currently IN_YCBCR format fixed */
-+        CAMIF_IN_YCBCR422  = BIT1,
-+        CAMIF_OUT_YCBCR420 = BIT4,
-+        CAMIF_OUT_YCBCR422 = BIT5,
-+      /* Preview Part */
-+      CAMIF_RGB16        = BIT2,
-+      CAMIF_RGB24        = BIT3,
-+};
-+
-+enum camif_capturing {
-+        CAMIF_BOTH_DMA_ON  = BIT4,
-+      CAMIF_DMA_ON       = BIT3,
-+      CAMIF_BOTH_DMA_OFF = BIT1,
-+      CAMIF_DMA_OFF      = BIT0,
-+      /*------------------------*/
-+      CAMIF_DMA_OFF_L_IRQ= BIT5,
-+};
-+
-+typedef struct camif_performance
-+{
-+      int     frames;
-+      int     framesdropped;
-+      __u64   bytesin;
-+      __u64   bytesout;
-+      __u32   reserved[4];
-+} camif_perf_t;
-+
-+
-+typedef struct {
-+        dma_addr_t  phys_y;
-+        dma_addr_t  phys_cb;
-+        dma_addr_t  phys_cr;
-+        u8          *virt_y;  
-+        u8          *virt_cb;
-+        u8          *virt_cr;
-+        dma_addr_t  phys_rgb;
-+        u8          *virt_rgb;
-+}img_buf_t;
-+
-+
-+/* this structure convers the CIWDOFFST, prescaler, mainscaler */
-+typedef struct {
-+      u32 modified_src_x;     /* After windows applyed to source_x */
-+      u32 modified_src_y;
-+      u32 hfactor;
-+      u32 vfactor;
-+      u32 shfactor;           /* SHfactor = 10 - ( hfactor + vfactor ) */
-+      u32 prehratio;
-+      u32 prevratio;
-+      u32 predst_x;
-+      u32 predst_y;
-+      u32 scaleup_h;          
-+      u32 scaleup_v;
-+      u32 mainhratio;
-+      u32 mainvratio;
-+      u32 scalerbypass;       /* only codec */
-+} scaler_t;
-+
-+
-+enum v4l2_status {
-+        CAMIF_V4L2_INIT    = BIT0,
-+        CAMIF_v4L2_DIRTY   = BIT1,
-+};
-+
-+
-+/* Global Status Definition */
-+#define PWANT2START   BIT0
-+#define CWANT2START   BIT1
-+#define BOTH_STARTED  (PWANT2START|CWANT2START)
-+#define PNOTWORKING   BIT4
-+#define C_WORKING     BIT5
-+
-+typedef struct {
-+      struct semaphore         lock;
-+        enum camif_itu_fmt       itu_fmt;
-+        enum camif_order422      order422;
-+      u32                      win_hor_ofst;
-+      u32                      win_ver_ofst;
-+        u32                      camclk;  /* External Image Sensor Camera Clock */
-+        u32                      source_x;
-+        u32                      source_y;
-+      u32                      polarity_pclk;
-+      u32                      polarity_vsync;
-+      u32                      polarity_href;
-+      struct i2c_client        *sensor;
-+      u32                      user; /* MAX 2 (codec, preview) */
-+      u32                      old_priority; /* BUS PRIORITY register */
-+      u32                      status;
-+      u32                      init_sensor;/* initializing sensor */
-+      void                     *other;    /* Codec camif_cfg_t */
-+      u32                      reset_type;    /* External Sensor Reset  Type */
-+      u32                      reset_udelay;  
-+} camif_gc_t;                 /* gobal control register */
-+
-+
-+/* when  App want to change v4l2 parameter,
-+ * we instantly store it into v4l2_t v2 
-+ * and then reflect it to hardware
-+ */   
-+typedef struct v4l2 {
-+      struct v4l2_fmtdesc     *fmtdesc;
-+      struct v4l2_pix_format   fmt; /* current pixel format */
-+      struct v4l2_input        input;
-+        struct video_picture     picture;
-+      enum v4l2_status         status;
-+      int     used_fmt ;      /* used format index  */
-+} v4l2_t;
-+
-+
-+typedef struct camif_c_t {
-+        struct video_device      *v;
-+      /* V4L2 param only for v4l2 driver */
-+      v4l2_t                    v2;
-+      camif_gc_t               *gc; /* Common between Codec and Preview */
-+      /* logical parameter */
-+      wait_queue_head_t        waitq;
-+      u32                      status; /* Start/Stop */
-+      u32                      fsm; /* Start/Stop */
-+      u32                      open_count; /* duplicated */
-+      int                      irq;
-+      char                     shortname[16];
-+        u32                      target_x;
-+        u32                      target_y;
-+      scaler_t                 sc;
-+      enum flip_mode           flip;
-+        enum camif_dma_type      dma_type;
-+       /* 4 pingpong Frame memory */
-+        u8                       *pp_virt_buf;
-+        dma_addr_t               pp_phys_buf;
-+        u32                      pp_totalsize;
-+      u32                      pp_num; /* used pingpong memory number */
-+        img_buf_t                img_buf[4];
-+        enum camif_codec_fmt     fmt;
-+        enum camif_capturing     exec;
-+      camif_perf_t             perf;
-+      u32                      now_frame_num;
-+      u32                      auto_restart; /* Only For Preview */
-+} camif_cfg_t;
-+
-+#ifdef SW_DEBUG
-+#define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args)
-+#else
-+#define DPRINTK(fmt, args...)
-+#endif
-+
-+
-+#ifdef SW_DEBUG
-+#define assert(expr) \
-+        if(!(expr)) {                                   \
-+        printk( "Assertion failed! %s,%s,%s,line=%d\n", \
-+        #expr,__FILE__,__FUNCTION__,__LINE__);          \
-+        }
-+#else
-+#define assert(expr)
-+#endif
-+
-+
-+
-+extern int camif_capture_start(camif_cfg_t *);
-+extern int camif_capture_stop(camif_cfg_t *);
-+extern int camif_g_frame_num(camif_cfg_t *);
-+extern u8 * camif_g_frame(camif_cfg_t *);
-+extern int  camif_win_offset(camif_gc_t *);
-+extern void camif_hw_open(camif_gc_t *);
-+extern void camif_hw_close(camif_cfg_t *);
-+extern int camif_dynamic_open(camif_cfg_t *);
-+extern int camif_dynamic_close(camif_cfg_t *);
-+extern void camif_reset(int,int);
-+extern void camif_setup_sensor(void);
-+extern int camif_g_fifo_status(camif_cfg_t *);
-+extern void camif_last_irq_en(camif_cfg_t *);
-+extern void camif_change_flip(camif_cfg_t *);
-+
-+
-+/* Todo
-+ *  API Interface function to both Character and V4L2 Drivers
-+ */
-+extern int camif_do_write(struct file *,const char *, size_t, loff_t *);
-+extern int camif_do_ioctl(struct inode *, struct file *,unsigned int, void *);
-+
-+
-+/* 
-+ * API for Decoder (S5x532, OV7620..) 
-+ */
-+void camif_register_decoder(struct i2c_client *);
-+void camif_unregister_decoder(struct i2c_client*);
-+
-+
-+
-+/* API for FSM */
-+#define INSTANT_SKIP 0 
-+#define INSTANT_GO   1 
-+
-+extern ssize_t camif_p_1fsm_start(camif_cfg_t *);
-+extern ssize_t camif_p_2fsm_start(camif_cfg_t *);
-+extern ssize_t camif_4fsm_start(camif_cfg_t *);
-+extern ssize_t camif_p_stop(camif_cfg_t *);
-+extern int camif_enter_p_4fsm(camif_cfg_t *);
-+extern int camif_enter_c_4fsm(camif_cfg_t *);
-+extern int camif_enter_2fsm(camif_cfg_t *);
-+extern int camif_enter_1fsm(camif_cfg_t *);
-+extern int camif_check_preview(camif_cfg_t *);
-+extern int camif_callback_start(camif_cfg_t *);
-+extern int camif_clock_init(camif_gc_t *);
-+
-+/* 
-+ *  V4L2 Part
-+ */
-+#define VID_HARDWARE_SAMSUNG_FIMC20   236
-+
-+
-+
-+
-+
-+#endif
-+
-+
-+/* 
-+ * Local variables:
-+ * tab-width: 8
-+ *  c-indent-level: 8
-+ *  c-basic-offset: 8
-+ *  c-set-style: "K&R"
-+ * End:
-+ */
-diff --git a/arch/arm/mach-s3c2440/camera/camif_fsm.c b/arch/arm/mach-s3c2440/camera/camif_fsm.c
-new file mode 100644
-index 0000000..3e2b71a
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/camif_fsm.c
-@@ -0,0 +1,427 @@
-+/*  
-+    Copyright (C) 2004 Samsung Electronics 
-+                     SW.LEE <hitchcar@sec.samsung.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/version.h>
-+#include <linux/module.h>
-+#include <linux/delay.h>
-+#include <linux/errno.h>
-+#include <linux/fs.h>
-+#include <linux/kernel.h>
-+#include <linux/major.h>
-+#include <linux/slab.h>
-+#include <linux/poll.h>
-+#include <linux/signal.h>
-+#include <linux/ioport.h>
-+#include <linux/sched.h>
-+#include <linux/types.h>
-+#include <linux/interrupt.h>
-+#include <linux/kmod.h>
-+#include <linux/vmalloc.h>
-+#include <linux/init.h>
-+#include <linux/pagemap.h>
-+#include <asm/io.h>
-+#include <asm/irq.h>
-+#include <asm/semaphore.h>
-+#include <linux/miscdevice.h>
-+
-+//#define SW_DEBUG 
-+
-+#include "camif.h"
-+const char *fsm_version =
-+        "$Id: camif_fsm.c,v 1.3 2004/04/27 10:26:28 swlee Exp $";
-+
-+
-+/* 
-+ * FSM function is the place where Synchronization in not necessary
-+ * because IRS calls this functions.
-+ */
-+
-+ssize_t camif_p_1fsm_start(camif_cfg_t *cfg)
-+{
-+      //camif_reset(CAMIF_RESET,0);
-+      cfg->exec = CAMIF_DMA_ON;
-+      camif_capture_start(cfg);
-+      camif_last_irq_en(cfg);
-+      cfg->status = CAMIF_STARTED;
-+      cfg->fsm = CAMIF_1nd_INT;
-+      return 0;
-+}
-+
-+
-+ssize_t camif_p_2fsm_start(camif_cfg_t *cfg)
-+{
-+      camif_reset(CAMIF_RESET,0);/* FIFO Count goes to zero */
-+      cfg->exec = CAMIF_DMA_ON;
-+      camif_capture_start(cfg);
-+      cfg->status = CAMIF_STARTED;
-+      cfg->fsm = CAMIF_1nd_INT;
-+      return 0;
-+}
-+
-+
-+ssize_t camif_4fsm_start(camif_cfg_t *cfg)
-+{
-+      camif_reset(CAMIF_RESET,0); /* FIFO Count goes to zero */
-+      cfg->exec = CAMIF_DMA_ON;
-+      camif_capture_start(cfg);
-+      cfg->status = CAMIF_STARTED;
-+      cfg->fsm = CAMIF_1nd_INT;
-+      cfg->perf.frames = 0;
-+      return 0;
-+}
-+
-+
-+/* Policy:  
-+     cfg->perf.frames  set in camif_fsm.c
-+     cfg->status set in video-driver.c
-+ */
-+
-+/* 
-+ * Don't insert camif_reset(CAM_RESET, 0 ) into this func 
-+ */
-+ssize_t camif_p_stop(camif_cfg_t *cfg)
-+{
-+      cfg->exec = CAMIF_DMA_OFF;
-+//    cfg->status = CAMIF_STOPPED;
-+      camif_capture_stop(cfg);
-+      cfg->perf.frames = 0;   /* Dupplicated ? */
-+      return 0;
-+}
-+
-+/* When C working, P asks C to play togehter */
-+/* Only P must call this function */
-+void camif_start_c_with_p (camif_cfg_t *cfg, camif_cfg_t *other)
-+{
-+//    cfg->gc->other = get_camif(CODEC_MINOR);
-+      cfg->gc->other = other;
-+      camif_start_p_with_c(cfg);
-+}
-+
-+static void camif_start_p_with_c(camif_cfg_t *cfg)
-+{
-+      camif_cfg_t *other = (camif_cfg_t *)cfg->gc->other;
-+      /* Preview Stop */
-+      cfg->exec = CAMIF_DMA_OFF;
-+      camif_capture_stop(cfg);
-+      /* Start P and C */
-+      camif_reset(CAMIF_RESET, 0);
-+      cfg->exec =CAMIF_BOTH_DMA_ON;
-+      camif_capture_start(cfg);
-+      cfg->fsm = CAMIF_1nd_INT; /* For Preview */
-+      if(!other) panic("Unexpected Error \n");
-+      other->fsm = CAMIF_1nd_INT; /* For Preview */
-+}
-+
-+static void camif_auto_restart(camif_cfg_t *cfg)
-+{     
-+//    if (cfg->dma_type & CAMIF_CODEC) return;
-+      if (cfg->auto_restart)
-+              camif_start_p_with_c(cfg);
-+}
-+
-+
-+/* Supposed that PREVIEW already running 
-+ * request PREVIEW to start with Codec 
-+ */
-+static int camif_check_global(camif_cfg_t *cfg)
-+{
-+      int ret = 0;
-+       
-+        if (down_interruptible(&cfg->gc->lock)) 
-+                       return -ERESTARTSYS;
-+        if ( cfg->gc->status & CWANT2START ) {
-+              cfg->gc->status &= ~CWANT2START;
-+              cfg->auto_restart = 1;
-+              ret = 1;
-+      }
-+      else {
-+              ret = 0; /* There is no codec */
-+              cfg->auto_restart = 0; /* Duplicated ..Dummy */
-+      }
-+
-+      up(&cfg->gc->lock);
-+
-+        return ret;
-+}
-+
-+/*
-+ *    1nd INT : Start Interrupt
-+ *    Xnd INT : enable Last IRQ : pingpong get the valid data
-+ *    Ynd INT : Stop Codec or Preview : pingpong get the valid data
-+ *    Znd INT : Last IRQ : valid data 
-+ */
-+#define CHECK_FREQ 5
-+int camif_enter_p_4fsm(camif_cfg_t *cfg)
-+{
-+      int ret = 0;
-+
-+      cfg->perf.frames++;
-+      if (cfg->fsm == CAMIF_NORMAL_INT)
-+      if (cfg->perf.frames % CHECK_FREQ == 0) 
-+              ret = camif_check_global(cfg);
-+      if (ret > 0) cfg->fsm = CAMIF_Xnd_INT; /* Codec wait for Preview */
-+      
-+      switch (cfg->fsm) {
-+              case CAMIF_1nd_INT:           /* Start IRQ */
-+                      cfg->fsm = CAMIF_NORMAL_INT;
-+                      ret = INSTANT_SKIP;
-+                      DPRINTK(KERN_INFO "1nd INT \n");        
-+                      break;
-+              case CAMIF_NORMAL_INT:          
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      cfg->fsm = CAMIF_NORMAL_INT;
-+                      ret = INSTANT_GO;
-+                      DPRINTK(KERN_INFO "NORMAL INT \n");     
-+                      break;
-+              case CAMIF_Xnd_INT:             
-+                      camif_last_irq_en(cfg);/* IRQ for Enabling LAST IRQ */
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      cfg->fsm = CAMIF_Ynd_INT;
-+                      ret = INSTANT_GO;
-+                      DPRINTK(KERN_INFO "Xnd INT \n");        
-+                      break;  
-+              case CAMIF_Ynd_INT:        /* Capture Stop */
-+                      cfg->exec = CAMIF_DMA_OFF;
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      camif_capture_stop(cfg);
-+                      cfg->fsm = CAMIF_Znd_INT;
-+                      ret = INSTANT_GO;
-+                      DPRINTK(KERN_INFO "Ynd INT \n");        
-+                      break;
-+              case CAMIF_Znd_INT:             /*  LAST IRQ (Dummy IRQ */
-+                      cfg->fsm = CAMIF_DUMMY_INT;
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      ret = INSTANT_GO;
-+                      camif_auto_restart(cfg);  /* Automatically Restart Camera */
-+                      DPRINTK(KERN_INFO "Znd INT \n");
-+                      break;  
-+              case CAMIF_DUMMY_INT:
-+                      cfg->status = CAMIF_STOPPED; /* Dupplicate ? */
-+                      ret = INSTANT_SKIP;
-+//                    DPRINTK(KERN_INFO "Dummy INT \n"); 
-+                      break;
-+              default:
-+                      printk(KERN_INFO "Unexpect INT %d \n",cfg->fsm); 
-+                      ret = INSTANT_SKIP;
-+                      break;
-+      }
-+      return ret;
-+}
-+
-+
-+/* 
-+ * NO autorestart included in this function 
-+ */
-+int camif_enter_c_4fsm(camif_cfg_t *cfg)
-+{
-+      int ret;
-+      
-+      cfg->perf.frames++;
-+#if 0
-+      if (   (cfg->fsm==CAMIF_NORMAL_INT)
-+          && (cfg->perf.frames>cfg->restart_limit-1)
-+         ) 
-+              cfg->fsm = CAMIF_Xnd_INT;
-+#endif
-+      switch (cfg->fsm) {
-+              case CAMIF_1nd_INT:           /* Start IRQ */
-+                      cfg->fsm = CAMIF_NORMAL_INT;
-+//                    cfg->status = CAMIF_STARTED; /* need this to meet auto-restart */
-+                      ret = INSTANT_SKIP;
-+                      DPRINTK(KERN_INFO "1nd INT \n");
-+                      break;
-+              case CAMIF_NORMAL_INT:          
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      cfg->fsm = CAMIF_NORMAL_INT;
-+                      ret = INSTANT_GO;
-+                      DPRINTK(KERN_INFO "NORMALd INT \n");
-+                      break;
-+              case CAMIF_Xnd_INT:             
-+                      camif_last_irq_en(cfg);/* IRQ for Enabling LAST IRQ */
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      cfg->fsm = CAMIF_Ynd_INT;
-+                      ret = INSTANT_GO;
-+                      DPRINTK(KERN_INFO "Xnd INT \n");
-+                      break;  
-+              case CAMIF_Ynd_INT:        /* Capture Stop */
-+                      cfg->exec = CAMIF_DMA_OFF;
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      camif_capture_stop(cfg);
-+                      cfg->fsm = CAMIF_Znd_INT;
-+                      ret = INSTANT_GO;
-+                      DPRINTK(KERN_INFO "Ynd INT \n");
-+                      break;
-+              case CAMIF_Znd_INT:             /*  LAST IRQ (Dummy IRQ */
-+                      cfg->fsm = CAMIF_DUMMY_INT;
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      ret = INSTANT_GO;
-+                      DPRINTK(KERN_INFO "Znd INT \n");
-+                      break;  
-+              case CAMIF_DUMMY_INT:
-+                      cfg->status = CAMIF_STOPPED; /* Dupplicate ? */
-+                      ret = INSTANT_SKIP;
-+                      break;
-+              default:
-+                      printk(KERN_INFO "Unexpect INT %d \n",cfg->fsm); 
-+                      ret = INSTANT_SKIP;
-+                      break;
-+      }
-+      return ret;
-+}
-+
-+/* 4 Interrups State Machine is for two pingpong  
-+ *    1nd INT : Start Interrupt
-+ *    Xnd INT : enable Last IRQ : pingpong get the valid data
-+ *    Ynd INT : Stop Codec or Preview : pingpong get the valid data
-+ *    Znd INT : Last IRQ : valid data 
-+ *    
-+ * Note:
-+ *    Before calling this func, you must call camif_reset
-+ */
-+
-+int camif_enter_2fsm(camif_cfg_t *cfg) /* Codec FSM */
-+{
-+      int ret;
-+
-+      cfg->perf.frames++;
-+      switch (cfg->fsm) {
-+              case CAMIF_1nd_INT:           /* Start IRQ */
-+                      cfg->fsm = CAMIF_Xnd_INT;
-+                      ret = INSTANT_SKIP;
-+//                    printk(KERN_INFO "1nd INT \n"); 
-+                      break;
-+              case CAMIF_Xnd_INT:             
-+                      camif_last_irq_en(cfg);/* IRQ for Enabling LAST IRQ */
-+                      cfg->now_frame_num = 0;
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      cfg->fsm = CAMIF_Ynd_INT;
-+                      ret = INSTANT_GO;
-+//                    printk(KERN_INFO "2nd INT \n"); 
-+                      break;  
-+              case CAMIF_Ynd_INT:        /* Capture Stop */
-+                      cfg->exec = CAMIF_DMA_OFF;
-+                      cfg->now_frame_num = 1;
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      camif_capture_stop(cfg);
-+                      cfg->fsm = CAMIF_Znd_INT;
-+                      ret = INSTANT_GO;
-+//                    printk(KERN_INFO "Ynd INT \n"); 
-+                      break;
-+              case CAMIF_Znd_INT:             /*  LAST IRQ (Dummy IRQ */
-+                      cfg->now_frame_num = 0;
-+//                    cfg->fsm = CAMIF_DUMMY_INT;
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      ret = INSTANT_GO;
-+//                    printk(KERN_INFO "Znd INT \n");
-+                      break;  
-+              case CAMIF_DUMMY_INT:
-+                      cfg->status = CAMIF_STOPPED; /* Dupplicate ? */
-+                      ret = INSTANT_SKIP;
-+                      printk(KERN_INFO "Dummy INT \n"); 
-+                      break;
-+              default:  /* CAMIF_PENDING_INT */
-+                      printk(KERN_INFO "Unexpect INT \n"); 
-+                      ret = INSTANT_SKIP;
-+                      break;
-+      }
-+      return ret;
-+}
-+
-+
-+/* 2 Interrups State Machine is for one pingpong  
-+ *    1nd INT : Stop Codec or Preview : pingpong get the valid data
-+ *    2nd INT : Last IRQ : dummy data 
-+ */
-+int camif_enter_1fsm(camif_cfg_t *cfg) /* Codec FSM */
-+{
-+      int ret;
-+
-+      cfg->perf.frames++;
-+      switch (cfg->fsm) {
-+              case CAMIF_Ynd_INT:             /* IRQ for Enabling LAST IRQ */
-+                      cfg->exec = CAMIF_DMA_OFF;
-+                      camif_capture_stop(cfg);
-+                      cfg->fsm = CAMIF_Znd_INT;
-+                      ret = INSTANT_SKIP;
-+      //              printk(KERN_INFO "Ynd INT \n"); 
-+                      break;  
-+              case CAMIF_Znd_INT:             /*  LAST IRQ (Dummy IRQ */
-+                      cfg->fsm = CAMIF_DUMMY_INT;
-+                      cfg->status = CAMIF_INT_HAPPEN;
-+                      ret = INSTANT_GO;
-+      //              printk(KERN_INFO "Znd INT \n"); 
-+                      break;
-+              case CAMIF_DUMMY_INT:
-+                      cfg->status = CAMIF_STOPPED; /* Dupplicate ? */
-+                      ret = INSTANT_SKIP;
-+                      printk(KERN_INFO "Dummy INT \n"); 
-+                      break;
-+              default:
-+                      printk(KERN_INFO "Unexpect INT \n"); 
-+                      ret = INSTANT_SKIP;
-+                      break;
-+      }
-+      return ret;
-+}
-+
-+
-+/*
-+ *  GLOBAL STATUS CONTROL FUNCTION
-+ *
-+ */
-+
-+
-+/* Supposed that PREVIEW already running 
-+ * request PREVIEW to start with Codec 
-+ */
-+int camif_callback_start(camif_cfg_t *cfg)
-+{
-+        int  doit = 1;
-+        while (doit) {
-+                if (down_interruptible(&cfg->gc->lock)) {
-+                        return -ERESTARTSYS;
-+                }
-+                cfg->gc->status = CWANT2START;
-+                cfg->gc->other = cfg;
-+                up(&cfg->gc->lock);
-+                doit = 0;
-+        }
-+        return 0;
-+}
-+
-+/*
-+ * Return status of Preview Machine
-+  ret value :
-+      0: Preview is not working
-+      X: Codec must follow PREVIEW start
-+*/
-+int camif_check_preview(camif_cfg_t *cfg)
-+{
-+        int ret = 0;
-+
-+        if (down_interruptible(&cfg->gc->lock)) {
-+                        ret = -ERESTARTSYS;
-+                        return ret;
-+        }
-+        if (cfg->gc->user == 1) ret = 0;
-+     //   else if (cfg->gc->status & PNOTWORKING) ret = 0;
-+        else ret = 1;
-+        up(&cfg->gc->lock);
-+        return ret;
-+}
-+
-+
-+
-+
-+/*
-+ * Local variables:
-+ * c-basic-offset: 8
-+ * End:
-+ */
-diff --git a/arch/arm/mach-s3c2440/camera/imgsensor.c b/arch/arm/mach-s3c2440/camera/imgsensor.c
-new file mode 100644
-index 0000000..44b7bee
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/imgsensor.c
-@@ -0,0 +1,255 @@
-+/*
-+ *  Copyright (C) 2004 Samsung Electronics 
-+ *             SW.LEE <hitchcar@samsung.com>
-+ *
-+ *  Copyright (C) 2000 Russell King : pcf8583.c
-+ *
-+ * 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 FIMC20 Camera Decoder 
-+ */
-+
-+#include <linux/config.h>
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/i2c.h>
-+#include <linux/slab.h>
-+#include <linux/string.h>
-+#include <linux/init.h>
-+#include <linux/delay.h>
-+
-+
-+#ifdef CONFIG_ARCH_S3C24A0A
-+#else
-+#include <asm/arch/S3C2440.h>
-+#endif
-+
-+#define SW_DEBUG
-+#include "camif.h"
-+#include "sensor.h"
-+
-+#ifndef SAMSUNG_SXGA_CAM
-+#include "s5x532_rev36.h"
-+#else
-+#include "sxga.h"
-+#endif
-+
-+static const char *sensor_version =
-+        "$Id: imgsensor.c,v 1.11 2004/06/10 12:45:40 swlee Exp $";
-+
-+
-+static struct i2c_driver s5x532_driver;
-+static camif_gc_t data = {
-+      itu_fmt:      CAMIF_ITU601,
-+      order422:     CAMIF_YCBYCR,
-+      camclk:       24000000,
-+#ifndef SAMSUNG_SXGA_CAM
-+      source_x:     640,
-+      source_y:     480,
-+      win_hor_ofst: 112,
-+      win_ver_ofst: 20,
-+#else
-+      source_x:     1280,
-+      source_y:     1024,
-+      win_hor_ofst: 0,
-+      win_ver_ofst: 0,
-+#endif
-+      polarity_pclk:1,
-+      polarity_href:0,
-+#ifdef CONFIG_ARCH_S3C24A0A
-+      reset_type:CAMIF_EX_RESET_AL, /* Active Low */
-+#else
-+      reset_type:CAMIF_EX_RESET_AH, /* Ref board has inverted signal */
-+#endif
-+      reset_udelay:2000,
-+};
-+
-+#define CAM_ID 0x5a
-+
-+static unsigned short ignore[] = { I2C_CLIENT_END };
-+static unsigned short normal_addr[] = { (CAM_ID>>1), I2C_CLIENT_END };
-+static struct i2c_client_address_data addr_data = {
-+      normal_i2c:             normal_addr,
-+      normal_i2c_range:       ignore,
-+      probe:                  ignore,
-+      probe_range:            ignore,
-+      ignore:                 ignore,
-+      ignore_range:           ignore,
-+      force:                  ignore,
-+};
-+
-+s5x532_t s5x532_regs_mirror[S5X532_REGS];
-+
-+unsigned char 
-+s5x532_read(struct i2c_client *client,unsigned char subaddr)
-+{
-+      int ret;
-+      unsigned char buf[1];
-+      struct i2c_msg msg ={ client->addr, 0, 1, buf};
-+      buf[0] = subaddr;
-+
-+      ret = i2c_transfer(client->adapter,&msg, 1) == 1 ? 0 : -EIO;
-+      if (ret == -EIO) {
-+        printk(" I2C write Error \n");
-+        return -EIO;
-+      }
-+      
-+      msg.flags = I2C_M_RD;
-+      ret = i2c_transfer(client->adapter, &msg, 1) == 1 ? 0 : -EIO;
-+
-+      return buf[0];
-+}
-+
-+
-+static int
-+s5x532_write(struct i2c_client *client,
-+                unsigned char subaddr, unsigned char val)
-+{
-+       unsigned char buf[2];
-+       struct i2c_msg msg = { client->addr, 0, 2, buf};
-+
-+       buf[0]= subaddr;
-+       buf[1]= val;
-+
-+       return i2c_transfer(client->adapter, &msg, 1) == 1 ? 0 : -EIO;
-+}
-+
-+void inline s5x532_init(struct i2c_client *sam_client)
-+{
-+      int i;
-+
-+      printk(KERN_ERR "s5x532_init  \n");
-+      for (i = 0; i < S5X532_INIT_REGS; i++) {
-+              s5x532_write(sam_client,
-+                            s5x532_reg[i].subaddr, s5x532_reg[i].value );
-+      }
-+
-+#ifdef YOU_WANT_TO_CHECK_IMG_SENSOR 
-+      for (i = 0; i < S5X532_INIT_REGS;i++) {
-+              if ( s5x532_reg[i].subaddr == PAGE_ADDRESS ) { 
-+                      s5x532_write(sam_client,
-+                            s5x532_reg[i].subaddr, s5x532_reg[i].value);
-+
-+                      printk(KERN_ERR "Page: Subaddr %02x = 0x%02x\n", 
-+                             s5x532_reg[i].subaddr, s5x532_regs_mirror[i].value);
-+      
-+
-+              } else 
-+              {      
-+                      s5x532_regs_mirror[i].subaddr = s5x532_reg[i].subaddr; 
-+                      s5x532_regs_mirror[i].value = 
-+                      s5x532_read(sam_client,s5x532_reg[i].subaddr);
-+                      printk(KERN_ERR "Subaddr %02x = 0x%02x\n", 
-+                             s5x532_reg[i].subaddr, s5x532_regs_mirror[i].value);
-+              }
-+      }
-+#endif
-+       
-+}
-+
-+static int
-+s5x532_attach(struct i2c_adapter *adap, int addr, unsigned short flags,int kind)
-+{
-+      struct i2c_client *c;
-+
-+      c = kmalloc(sizeof(*c), GFP_KERNEL);
-+      if (!c) return -ENOMEM;
-+
-+      strcpy(c->name, "S5X532");
-+      c->id           = s5x532_driver.id;
-+      c->flags        = I2C_CLIENT_ALLOW_USE;
-+      c->addr         = addr;
-+      c->adapter      = adap;
-+      c->driver       = &s5x532_driver;
-+      c->data         = &data;
-+      data.sensor     = c; 
-+
-+      camif_register_decoder(c);
-+      return i2c_attach_client(c);
-+}
-+
-+static int s5x532_probe(struct i2c_adapter *adap)
-+{ 
-+      return i2c_probe(adap, &addr_data, s5x532_attach);
-+}
-+
-+static int s5x532_detach(struct i2c_client *client)
-+{
-+      i2c_detach_client(client);
-+      camif_unregister_decoder(client);
-+      return 0;
-+}
-+
-+static int
-+s5x532_command(struct i2c_client *client, unsigned int cmd, void *arg)
-+{
-+        switch (cmd) {
-+        case SENSOR_INIT:
-+                 s5x532_init(client);
-+               printk(KERN_INFO "CAMERA: S5X532 Sensor initialized\n");
-+               break;
-+      case USER_ADD:
-+              MOD_INC_USE_COUNT;
-+              break;
-+      case USER_EXIT:
-+              MOD_DEC_USE_COUNT;
-+              break;
-+/* Todo
-+      case SENSOR_BRIGHTNESS:
-+              change_sensor();
-+              break;
-+*/
-+      default:        
-+              panic("Unexpect Sensor Command \n");
-+              break;
-+        }
-+      return 0;
-+}
-+
-+static struct i2c_driver s5x532_driver = {
-+      name:           "S5X532",
-+      id:             I2C_ALGO_S3C,
-+      flags:          I2C_DF_NOTIFY,
-+      attach_adapter: s5x532_probe,
-+      detach_client:  s5x532_detach,
-+      command:        s5x532_command
-+};
-+
-+static void iic_gpio_port(void) 
-+{
-+#ifdef CONFIG_ARCH_S3C24A0A
-+#else
-+      GPECON &=  ~(0xf <<28);
-+      GPECON |=    0xa <<28;
-+#endif
-+}
-+
-+static __init int camif_sensor_init(void)
-+{
-+        iic_gpio_port();
-+      return i2c_add_driver(&s5x532_driver);
-+}
-+
-+
-+static __init void camif_sensor_exit(void)
-+{
-+      i2c_del_driver(&s5x532_driver);
-+}
-+
-+module_init(camif_sensor_init)
-+module_exit(camif_sensor_exit)
-+
-+MODULE_AUTHOR("SW.LEE <hitchcar@sec.samsung.com>");
-+MODULE_DESCRIPTION("I2C Client Driver For Fimc2.0 MISC Driver");
-+MODULE_LICENSE("GPL");
-+
-+
-+
-+/*
-+ * Local variables:
-+ * c-basic-offset: 8
-+ * End:
-+ */
-diff --git a/arch/arm/mach-s3c2440/camera/miscdevice.h b/arch/arm/mach-s3c2440/camera/miscdevice.h
-new file mode 100644
-index 0000000..2e1cfbc
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/miscdevice.h
-@@ -0,0 +1,18 @@
-+
-+ /*----------------------------------------------------------
-+  *   (C) 2004 Samsung Electronics
-+  *   SW.LEE < hitchcar@samsung.com>
-+  * 
-+  ----------------------------------------------------------- */
-+
-+#ifndef _LINUX_S3C_MISCDEVICE_H
-+#define _LINUX_S3C_MISCDEVICE_H
-+
-+#define CODEC_MINOR 212
-+#define PREVIEW_MINOR 213
-+
-+
-+
-+
-+
-+#endif
-diff --git a/arch/arm/mach-s3c2440/camera/qt-driver.c b/arch/arm/mach-s3c2440/camera/qt-driver.c
-new file mode 100644
-index 0000000..0c5dd40
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/qt-driver.c
-@@ -0,0 +1,169 @@
-+/*
-+ * SW.LEE <hitchcar@samsung.com>
-+ *   
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License 2. See the file COPYING in the main directory of this archive
-+ * for more details.
-+ */
-+
-+#include <linux/version.h>
-+#include <linux/module.h>
-+#include <linux/delay.h>
-+#include <linux/errno.h>
-+#include <linux/fs.h>
-+#include <linux/kernel.h>
-+#include <linux/major.h>
-+#include <linux/slab.h>
-+#include <linux/poll.h>
-+#include <linux/signal.h>
-+#include <linux/ioport.h>
-+#include <linux/sched.h>
-+#include <linux/types.h>
-+#include <linux/interrupt.h>
-+#include <linux/kmod.h>
-+#include <linux/vmalloc.h>
-+#include <linux/init.h>
-+#include <asm/io.h>
-+#include <asm/page.h>
-+#include <asm/irq.h>
-+#include <asm/semaphore.h>
-+#include <linux/miscdevice.h>
-+                                                                                                           
-+//#define SW_DEBUG
-+                                                                                                           
-+#include "camif.h"
-+#include "videodev.h"
-+#include "miscdevice.h"
-+#include "cam_reg.h"
-+#include "sensor.h"
-+#include "userapp.h"
-+                                                                                                           
-+
-+/************************* Sharp Zarus API **************************
-+* refering to Camera Driver API for SL-5000D/SL-5600 revision 1.00 
-+*                             April 11, 2002.
-+  SW.LEE <hitchcar@sec.samsung.com>
-+              I want to use Sharp Camera Application. 
-+*
-+*/
-+
-+#define READ_MODE_STATUS      0x1
-+#define READ_MODE_IMAGE               0x0
-+#define CAPTURE_SPEED
-+#define       H_FLIP  
-+#define V_FLIP
-+typedef enum sharp_readmode 
-+{
-+        IMAGE = 0, STATUS = 1,
-+        FASTER = 0, BETTER = 2,
-+        XNOFLIP = 0, XFLIP = 4,
-+        YNOFLIP = 0, YFLIP = 8,
-+        AUTOMATICFLIP = -1
-+} ReadMode_t;
-+
-+
-+static struct sharp_param_t {
-+      ReadMode_t readMode;
-+      char CameraStatus[4];
-+} sharp_param = { STATUS, {'s','m','c','A'}};
-+
-+
-+camif_param_t qt_parm = { 640,480,240,320,16,0};
-+      
-+static void setReadMode(const char *b,size_t count)
-+{
-+      int i =   *(b+2) - 48 ;
-+      if ( 4 == count ) {
-+              i = (*(b+3) - 48)  + i * 10;
-+      }
-+
-+      //      DPRINTK(" setReadMode %s conversion value %d \n",b , i); 
-+      if ( i & STATUS ) { 
-+      //      DPRINTK(" STATUS MODE \n");
-+              sharp_param.readMode = i;
-+      }
-+      else  {
-+      //      DPRINTK(" IMAGE MODE \n");
-+              sharp_param.readMode = i;
-+      }
-+}
-+
-+
-+
-+
-+extern ssize_t camif_p_read(struct file *, char *, size_t , loff_t *);
-+
-+ssize_t z_read(struct file *f, char *buf, size_t count, loff_t *pos)
-+{
-+      size_t end;
-+
-+      if (sharp_param.readMode & STATUS ) {
-+              buf[0] = sharp_param.CameraStatus[0];
-+              buf[1] = sharp_param.CameraStatus[1];
-+              buf[2] = sharp_param.CameraStatus[2];
-+              buf[3] = sharp_param.CameraStatus[3];
-+              end = 4;
-+              return end;
-+      } 
-+      else {  /* Image ReadMode */
-+              /*
-+              if (( sharp_param.readMode & (BETTER|X  FLIP|YFLIP)))
-+                      DPRINTK("  Not Supporting BETTER|XFLIP|YFLIP\n");
-+              */
-+              return camif_p_read(f,buf,count,pos);
-+      }
-+}
-+
-+static void z_config(camif_cfg_t *cfg,int x, int y)
-+{
-+      cfg->target_x = x;
-+      cfg->target_y = y;
-+      cfg->fmt = CAMIF_RGB16;
-+      if (camif_dynamic_open(cfg)) {
-+              panic(" Eror Happens \n");
-+      }
-+}
-+
-+
-+ssize_t z_write(struct file *f, const char *b, size_t c, loff_t *pos)
-+{
-+      int array[5];
-+      int zoom = 1;
-+      camif_cfg_t *cfg;
-+
-+      cfg = get_camif(MINOR(f->f_dentry->d_inode->i_rdev));
-+//    DPRINTK(" param %s count %d \n",b, c );
-+
-+      switch(*b) {
-+      case 'M':       
-+              setReadMode(b, c);
-+              break;
-+      case 'B':       /* Clear the latch flag of shutter button */
-+              DPRINTK("  clear latch flag of camera's shutter button\n");
-+              sharp_param.CameraStatus[0]='s';
-+              break;
-+      case 'Y':       /* I don't know how to set Shutter pressed */   
-+              DPRINTK("  set latch flag n");
-+              sharp_param.CameraStatus[0]='S';
-+              break;
-+      case 'S':       /* Camera Image Resolution */
-+      case 'R':       /* Donot support Rotation */
-+      DPRINTK(" param %s count %d \n",b, c );
-+              get_options((char *)(b+2), 5, array);
-+              if ( array[3] == 512 ) zoom = 2;
-+              z_config(cfg, array[1] * zoom , array[2] * zoom );
-+              camif_4fsm_start(cfg);
-+              break;
-+      case 'C':
-+      DPRINTK(" param %s count %d \n",b, c );
-+              DPRINTK("  Start the camera to capture \n");
-+              sharp_param.CameraStatus[2]='C';
-+              camif_4fsm_start(cfg);
-+              break;
-+      default:
-+              printk("Unexpected  param %s count %d \n",b, c );
-+      }
-+
-+      return c;
-+}
-+
-diff --git a/arch/arm/mach-s3c2440/camera/qt.h b/arch/arm/mach-s3c2440/camera/qt.h
-new file mode 100644
-index 0000000..e58368a
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/qt.h
-@@ -0,0 +1,18 @@
-+/*
-+ * SW.LEE <hitchcar@samsung.com>
-+ *   
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License 2. See the file COPYING in the main directory of this archive
-+ * for more details.
-+ */
-+
-+#ifndef __Z_API_H_
-+#define __Z_API_H_
-+
-+extern ssize_t z_read(struct file *f, char *buf, size_t count, loff_t *pos);
-+extern ssize_t z_write(struct file *f, const char *b, size_t c, loff_t *pos);
-+
-+
-+
-+#endif
-+
-diff --git a/arch/arm/mach-s3c2440/camera/s5x532.h b/arch/arm/mach-s3c2440/camera/s5x532.h
-new file mode 100644
-index 0000000..12725f4
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/s5x532.h
-@@ -0,0 +1,143 @@
-+/*
-+ * 2004 (C) Samsung Electronics 
-+ *  SW.LEE <hitchcar@sec.samsung.com>
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License 2. See the file COPYING in the main directory of this archive
-+ * for more details.
-+ */
-+
-+
-+#ifndef _SMDK2440_S5X532_H_
-+#define _SMDK2440_S5X532_H_
-+
-+
-+#define CHIP_DELAY 0xFF
-+
-+typedef struct samsung_t{
-+      unsigned char subaddr;
-+      unsigned char value;
-+      unsigned char page;     
-+} s5x532_t;
-+
-+s5x532_t s5x532_reg[] = {
-+      // page 5
-+      {0xec,0x05},
-+      {0x08,0x55,0x5},
-+      {0x0a,0x75,0x5},
-+      {0x0c,0x90,0x5},
-+      {0x0e,0x18,0x5},
-+      {0x12,0x09,0x5},
-+      {0x14,0x9d,0x5},
-+      {0x16,0x90,0x5},
-+      {0x1a,0x18,0x5},
-+      {0x1c,0x0c,0x5},
-+      {0x1e,0x09,0x5},
-+      {0x20,0x06,0x5},
-+      {0x22,0x20,0x5},
-+      {0x2a,0x00,0x5},
-+      {0x2d,0x04,0x5},
-+      {0x12,0x24,0x5},
-+      // page 3
-+      {0xec,0x03,0x3},
-+      {0x0c,0x09,0x3},
-+      {0x6c,0x09,0x3},
-+      {0x2b,0x10,0x3}, // momo clock inversion
-+      // page 2
-+      {0xec,0x02,0x2},
-+      {0x03,0x09,0x2},
-+      {0x05,0x08,0x2},
-+      {0x06,0x01,0x2},
-+      {0x07,0xf8,0x2},
-+      {0x15,0x25,0x2},
-+      {0x30,0x29,0x2},
-+      {0x36,0x12,0x2},
-+      {0x38,0x04,0x2},
-+      {0x1b,0x77,0x2}, // 24MHz : 0x77, 12MHz : 0x22
-+      {0x1c,0x77,0x2}, // 24MHz : 0x77, 12MHz : 0x22
-+      // page 1
-+      {0xec,0x01,0x1},
-+      {0x00,0x03,0x1}, // 
-+      {0x0a,0x08,0x1}, // 0x0-QQVGA, 0x06-CIF, 0x02-QCIF, 0x08-VGA, 0x04-QVGA, 0x0a-SXGA
-+      {0x0c,0x00,0x1}, // Pattern selectio. 0-CIS, 1-Color bar, 2-Ramp, 3-Blue screen
-+      {0x10,0x27,0x1},
-+      // 0x21-ITU-R656(CrYCbY), 0x25-ITU-R601(CrYCbY), 0x26-ITU-R601(YCbYCr)
-+      {0x50,0x21,0x1},                // Hblank
-+      {0x51,0x00,0x1},                // Hblank
-+      {0x52,0xA1,0x1},                // Hblank
-+      {0x53,0x02,0x1},                // Hblank
-+      {0x54,0x01,0x1},                // Vblank
-+      {0x55,0x00,0x1},                // Vblank
-+      {0x56,0xE1,0x1},                // Vblank               
-+      {0x57,0x01,0x1},                // Vblank
-+      {0x58,0x21,0x1},                // Hsync
-+      {0x59,0x00,0x1},                // Hsync
-+      {0x5a,0xA1,0x1},                // Hsync
-+      {0x5b,0x02,0x1},                // Hsync
-+      {0x5c,0x03,0x1},                // Vref
-+      {0x5d,0x00,0x1},                // Vref
-+      {0x5e,0x05,0x1},                // Vref
-+      {0x5f,0x00,0x1},                // Vref 
-+      {0x70,0x0E,0x1},
-+      {0x71,0xD6,0x1},
-+      {0x72,0x30,0x1},
-+      {0x73,0xDB,0x1},
-+      {0x74,0x0E,0x1},
-+      {0x75,0xD6,0x1},
-+      {0x76,0x18,0x1},
-+      {0x77,0xF5,0x1},
-+      {0x78,0x0E,0x1},
-+      {0x79,0xD6,0x1},
-+      {0x7a,0x28,0x1},
-+      {0x7b,0xE6,0x1},
-+      {0x50,0x00,0x1},
-+      {0x5c,0x00,0x1},
-+
-+      // page 0
-+      {0xec,0x00,0x0},
-+      {0x79,0x01,0x0},
-+      {0x58,0x90,0x0},
-+      {0x59,0xA0,0x0},
-+      {0x5a,0x50,0x0},
-+      {0x5b,0x70,0x0},
-+      {0x5c,0xD0,0x0},
-+      {0x5d,0xC0,0x0},
-+      {0x5e,0x28,0x0},
-+      {0x5f,0x08,0x0},
-+      {0x50,0x90,0x0},
-+      {0x51,0xA0,0x0},
-+      {0x52,0x50,0x0},
-+      {0x53,0x70,0x0},
-+      {0x54,0xD0,0x0},
-+      {0x55,0xC0,0x0},
-+      {0x56,0x28,0x0},
-+      {0x57,0x00,0x0},
-+      {0x48,0x90,0x0},
-+      {0x49,0xA0,0x0},
-+      {0x4a,0x50,0x0},
-+      {0x4b,0x70,0x0},
-+      {0x4c,0xD0,0x0},
-+      {0x4d,0xC0,0x0},
-+      {0x4e,0x28,0x0},
-+      {0x4f,0x08,0x0},
-+      {0x72,0x82,0x0}, // main clock = 24MHz:0xd2, 16M:0x82, 12M:0x54
-+      {0x75,0x05,0x0} // absolute vertical mirror.  junon
-+
-+};
-+
-+
-+#define S5X532_INIT_REGS (sizeof(s5x532_reg)/sizeof(s5x532_reg[0]))
-+#define S5X532_RISC_REGS 0xEB  
-+#define S5X532_ISP_REGS 0xFB /* S5C7323X */
-+#define S5X532_CIS_REGS 0x2F /* S5K437LA03 */
-+
-+
-+#define PAGE_ADDRESS      0xEC
-+
-+//#define S5X532_REGS (S5X532_RISC_REGS+S5X532_ISP_REGS+S5X532_CIS_REGS)
-+#define S5X532_REGS (0x1000)
-+
-+
-+
-+#endif
-+
-+
-diff --git a/arch/arm/mach-s3c2440/camera/s5x532_rev36.h b/arch/arm/mach-s3c2440/camera/s5x532_rev36.h
-new file mode 100644
-index 0000000..b662e9c
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/s5x532_rev36.h
-@@ -0,0 +1,208 @@
-+/*
-+ * 2004 (C) Samsung Electronics 
-+ *  SW.LEE <hitchcar@sec.samsung.com>
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License 2. See the file COPYING in the main directory of this archive
-+ * for more details.
-+ */
-+
-+
-+#ifndef _SMDK2440_S5X532_H_
-+#define _SMDK2440_S5X532_H_
-+
-+
-+#define CHIP_DELAY 0xFF
-+
-+typedef struct samsung_t{
-+      unsigned char subaddr;
-+      unsigned char value;
-+      unsigned char page;     
-+} s5x532_t;
-+
-+s5x532_t s5x532_reg[] = {
-+
-+      //=============== page0 ===============//
-+      {0xec,0x00,0x00},
-+      {0x02,0x00,0x00},
-+      {0x14,0x60,0x00},
-+      {0x15,0x60,0x00},
-+      {0x16,0x60,0x00},
-+      {0x1b,0x20,0x00},
-+      {0x1c,0x20,0x00},
-+      {0x1d,0x20,0x00},
-+      {0x1e,0x20,0x00},
-+      {0x72,0xdc,0x00},
-+      {0x73,0x11,0x00},
-+      {0x76,0x82,0x00},
-+      {0x77,0x90,0x00},
-+      {0x78,0x6c,0x00},
-+      {0x0a,0x02,0x00},
-+      {0x34,0x0d,0x00},
-+      {0x35,0x0a,0x00},
-+      {0x36,0x05,0x00},
-+      {0x37,0x05,0x00},
-+      {0x38,0x06,0x00},
-+      {0x39,0x08,0x00},
-+      {0x3A,0x0d,0x00},
-+      {0x3B,0x0d,0x00},
-+      {0x3C,0x18,0x00},
-+      {0x3D,0xE0,0x00},
-+      {0x3E,0x20,0x00},
-+      {0x66,0x02,0x00},
-+      {0x6c,0x40,0x00},
-+      {0x7c,0x01,0x00},
-+      {0x0D,0x24,0x00},
-+      {0x40,0x1B,0x00},
-+      {0x41,0x4F,0x00},
-+      {0x42,0x24,0x00},
-+      {0x43,0x3E,0x00},
-+      {0x44,0x32,0x00},
-+      {0x45,0x30,0x00},
-+      {0x48,0xa0,0x00},
-+      {0x49,0xd0,0x00},
-+      {0x4A,0x28,0x00},
-+      {0x4B,0x7d,0x00},
-+      {0x4C,0xd0,0x00},
-+      {0x4D,0xe0,0x00},
-+      {0x4E,0x1a,0x00},
-+      {0x4F,0xa0,0x00},
-+      {0x50,0xc0,0x00},
-+      {0x51,0xc0,0x00},
-+      {0x52,0x42,0x00},
-+      {0x53,0x7e,0x00},
-+      {0x54,0xc0,0x00},
-+      {0x55,0xf0,0x00},
-+      {0x56,0x1e,0x00},
-+      {0x57,0xe0,0x00},
-+      {0x58,0xc0,0x00},
-+      {0x59,0xa0,0x00},
-+      {0x5A,0x4a,0x00},
-+      {0x5B,0x7e,0x00},
-+      {0x5C,0xc0,0x00},
-+      {0x5D,0xf0,0x00},
-+      {0x5E,0x2a,0x00},
-+      {0x5F,0x10,0x00},
-+      {0x79,0x00,0x00},          
-+      {0x7a,0x00,0x00},
-+      {0xe0,0x0f,0x00},
-+      {0xe3,0x14,0x00}, 
-+      {0xe5,0x48,0x00},
-+      {0xe7,0x58,0x00},
-+
-+      //=============== page1 ===============//
-+      {0xec,0x01,0x01},
-+      {0x10,0x05,0x01},
-+      {0x20,0xde,0x01},
-+      {0x0b,0x06,0x01},
-+      {0x30,0x00,0x01},
-+      {0x31,0x00,0x01},
-+      {0x32,0x00,0x01},
-+      {0x24,0x28,0x01},
-+      {0x25,0x3F,0x01},
-+      {0x26,0x65,0x01},
-+      {0x27,0xA1,0x01},
-+      {0x28,0xFF,0x01},
-+      {0x29,0x96,0x01},
-+      {0x2A,0x85,0x01},
-+      {0x2B,0xFF,0x01},
-+      {0x2C,0x00,0x01},
-+      {0x2D,0x1B,0x01},
-+      {0xB0,0x28,0x01},
-+      {0xB1,0x3F,0x01},
-+      {0xB2,0x65,0x01},
-+      {0xB3,0xA1,0x01},
-+      {0xB4,0xFF,0x01},
-+      {0xB5,0x96,0x01},
-+      {0xB6,0x85,0x01},
-+      {0xB7,0xFF,0x01},
-+      {0xB8,0x00,0x01},
-+      {0xB9,0x1B,0x01},
-+      {0x15,0x15,0x01},
-+      {0x18,0x85,0x01},
-+      {0x1f,0x05,0x01},
-+      {0x87,0x40,0x01},
-+      {0x37,0x60,0x01},
-+      {0x38,0xd5,0x01},
-+      {0x48,0xa0,0x01},
-+      {0x61,0x54,0x01},
-+      {0x62,0x54,0x01},
-+      {0x63,0x14,0x01},
-+      {0x64,0x14,0x01},
-+      {0x6d,0x12,0x01},
-+      {0x78,0x09,0x01},
-+      {0x79,0xD7,0x01},
-+      {0x7A,0x14,0x01},
-+      {0x7B,0xEE,0x01},
-+                       
-+      //=============== page2 ===============//
-+      {0xec,0x02,0x02},
-+      {0x2c,0x76,0x02},
-+      {0x25,0x25,0x02},
-+      {0x27,0x27,0x02},
-+      {0x30,0x29,0x02},
-+      {0x36,0x08,0x02},
-+      {0x38,0x04,0x02},
-+
-+      //=============== page3 ===============//
-+      {0xec,0x03,0x03},
-+      {0x08,0x00,0x03},
-+      {0x09,0x33,0x03},
-+
-+      //=============== page4 ===============//
-+      {0xec,0x04,0x04},
-+      {0x00,0x21,0x04},
-+      {0x01,0x00,0x04},            
-+      {0x02,0x9d,0x04},            
-+      {0x03,0x02,0x04},            
-+      {0x04,0x04,0x04},         
-+      {0x05,0x00,0x04},            
-+      {0x06,0x1f,0x04},          
-+      {0x07,0x02,0x04},            
-+      {0x08,0x21,0x04},            
-+      {0x09,0x00,0x04},            
-+      {0x0a,0x9d,0x04},           
-+      {0x0b,0x02,0x04},            
-+      {0x0c,0x04,0x04},             
-+      {0x0d,0x00,0x04},            
-+      {0x0e,0x20,0x04},            
-+      {0x0f,0x02,0x04},            
-+      {0x1b,0x3c,0x04},            
-+      {0x1c,0x3c,0x04},            
-+
-+      //=============== page5 ===============//
-+      {0xec,0x05,0x05},                               
-+      {0x1f,0x00,0x05},                               
-+      {0x08,0x59,0x05},            
-+      {0x0a,0x71,0x05},            
-+      {0x1e,0x23,0x05},            
-+      {0x0e,0x3c,0x05},            
-+
-+      //=============== page7 ===============//
-+      {0xec,0x07,0x07},
-+      {0x11,0xfe,0x07},
-+
-+      // added by junon
-+      {0xec,0x01,0x07}, 
-+      {0x10,0x26,0x07},
-+      // 0x21-ITU-R656(CbYCrY), 0x25-ITU-R601(CbYCrY), 0x26-ITU-R601(YCrYCb)
-+
-+
-+};
-+
-+
-+#define S5X532_INIT_REGS (sizeof(s5x532_reg)/sizeof(s5x532_reg[0]))
-+#define S5X532_RISC_REGS 0xEB  
-+#define S5X532_ISP_REGS 0xFB /* S5C7323X */
-+#define S5X532_CIS_REGS 0x2F /* S5K437LA03 */
-+
-+
-+#define PAGE_ADDRESS      0xEC
-+
-+//#define S5X532_REGS (S5X532_RISC_REGS+S5X532_ISP_REGS+S5X532_CIS_REGS)
-+#define S5X532_REGS (0x1000)
-+
-+
-+
-+#endif
-+
-+
-diff --git a/arch/arm/mach-s3c2440/camera/sensor.h b/arch/arm/mach-s3c2440/camera/sensor.h
-new file mode 100644
-index 0000000..e28d01c
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/sensor.h
-@@ -0,0 +1,20 @@
-+/*
-+ *
-+ *  Copyright (C) 2004 Samsung Electronics
-+ *            SW.LEE <hitchcar@sec.samsung.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.
-+ */
-+
-+#ifndef __SENSOR_CMD_H_
-+#define __SENSOR_CMD_H_
-+
-+#include "bits.h"
-+
-+#define SENSOR_INIT   BIT0
-+#define USER_ADD        BIT1
-+#define USER_EXIT       BIT2
-+
-+#endif
-diff --git a/arch/arm/mach-s3c2440/camera/sxga.h b/arch/arm/mach-s3c2440/camera/sxga.h
-new file mode 100644
-index 0000000..b41305a
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/sxga.h
-@@ -0,0 +1,504 @@
-+/*
-+ * 2004 (C) Samsung Electronics 
-+ *  SW.LEE <hitchcar@sec.samsung.com>
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License 2. See the file COPYING in the main directory of this archive
-+ * for more details.
-+ */
-+
-+
-+#ifndef _SAMSUNG_SXGA_H_
-+#define _SAMSUNG_SXGA_H_
-+
-+
-+#define CHIP_DELAY 0xFF
-+
-+typedef struct samsung_t{
-+      unsigned char subaddr;
-+      unsigned char value;
-+      unsigned char page;     
-+} s5x532_t;
-+
-+s5x532_t s5x532_reg[] = {
-+      // page 0
-+      {0xec,0x00,0x0},
-+      {0x0c,0x38,0x0},
-+      {0x0d,0x24,0x0},
-+      {0x13,0x10,0x0},
-+      {0x14,0x10,0x0},
-+      {0x15,0x10,0x0},
-+      {0x16,0x10,0x0},
-+      {0x17,0x20,0x0},
-+      {0x18,0x30,0x0},
-+      {0x19,0x30,0x0},
-+      {0x1a,0x10,0x0},
-+      {0x1b,0x10,0x0},
-+      
-+      {0x2d,0x40,0x0},
-+      {0x3e,0x10,0x0},
-+      {0x34,0x0a,0x0},
-+      {0x39,0x04,0x0},
-+      {0x3a,0x02,0x0},
-+      {0x31,0x05,0x0},
-+
-+      {0x40,0x1d,0x0},
-+      {0x41,0x50,0x0},
-+      {0x42,0x24,0x0},
-+      {0x43,0x3f,0x0},
-+      {0x44,0x30,0x0},
-+      {0x45,0x31,0x0},
-+
-+      {0x48,0xa0,0x0},
-+      {0x49,0xc0,0x0},
-+      {0x4a,0x58,0x0},
-+      {0x4b,0x50,0x0},
-+      {0x4c,0xb0,0x0},
-+      {0x4d,0xc0,0x0},
-+      {0x4e,0x30,0x0},
-+      {0x4f,0x20,0x0},
-+
-+      {0x50,0xa0,0x0},
-+      {0x51,0xc0,0x0},
-+      {0x52,0x50,0x0},
-+      {0x53,0x60,0x0},
-+      {0x54,0xb0,0x0},
-+      {0x55,0xc0,0x0},
-+      {0x56,0x20,0x0},
-+      {0x57,0x08,0x0},
-+//    {0x72,0x50,0x0}, // Clock 16
-+      {0x72,0x78,0x0}, // Clock 24Mhz
-+//    {0x72,0xf0,0x0}, // Clock 48Mhz
-+      // page 1
-+      {0xec,0x01,0x1},
-+      {0x10,0x17,0x1}, // ITU-R601
-+                       /* 
-+                         [3:2] : out_sel 
-+                           00 : 656
-+                           01 : 601
-+                           10 : RGB
-+                           11 : CIS
-+                         [1] : YC_SEL  
-+                         [0] : CBCR_SEL
-+                       */
-+
-+      {0x0b,0x06,0x1}, // 6
-+      {0x20,0xa8,0x1}, //b0); // Highlight C Supp 040215 
-+      {0x22,0x26,0x1}, //2f); 040225
-+  
-+      {0x24,0x08,0x1}, //00); //1F); 040226
-+      {0x25,0x10,0x1}, //10); //34);
-+      {0x26,0x40,0x1}, //56);
-+      {0x27,0x80,0x1}, //8D);
-+      {0x28,0x2c,0x1}, //E7);
-+      {0x29,0xd6,0x1}, //7C);
-+      {0x2A,0x0c,0x1}, //70);
-+      {0x2B,0xFF,0x1}, //FF);
-+      {0x2C,0x00,0x1}, //00);
-+      {0x2D,0x5f,0x1}, //1B);
-+      //    
-+      {0xB0,0x08,0x1}, //00); //1F); 040226
-+      {0xB1,0x10,0x1}, //10); //34);50
-+      {0xB2,0x40,0x1}, //36); 
-+      {0xB3,0x80,0x1}, //6D);
-+      {0xB4,0x2c,0x1}, //b7);
-+      {0xB5,0xd6,0x1}, //7C);
-+      {0xB6,0x0c,0x1}, //70);
-+      {0xB7,0xFF,0x1}, //FF);
-+      {0xB8,0x00,0x1}, //00);
-+      {0xB9,0x5f,0x1}, //1B);
-+
-+
-+      {0xc2,0x01,0x1}, // shading On
-+      {0xc3,0x80,0x1},
-+      {0xc4,0x02,0x1},
-+      {0xc5,0x00,0x1},
-+      {0xc6,0x01,0x1},
-+      {0xc7,0x00,0x1},
-+      {0xc8,0x05,0x1},
-+      {0xc9,0x00,0x1},
-+      {0xca,0x04,0x1},
-+ 
-+      // shading 5
-+      {0xd0,0xb5,0x1},
-+      {0xd1,0x9c,0x1},
-+      {0xd2,0x8d,0x1},
-+      {0xd3,0x84,0x1},
-+      {0xd4,0x84,0x1},
-+      {0xd5,0x91,0x1},
-+      {0xd6,0xa0,0x1},
-+      {0xd7,0xb5,0x1},
-+
-+      {0xd8,0xc0,0x1},
-+      {0xd9,0xa6,0x1},
-+      {0xda,0x93,0x1},
-+      {0xdb,0x85,0x1},
-+      {0xdc,0x85,0x1},
-+      {0xdd,0x90,0x1},
-+      {0xde,0xa0,0x1},
-+      {0xdf,0xb8,0x1},
-+
-+      // Page 2
-+      {0xec,0x02,0x02},
-+
-+      {0x2d,0x02,0x02},
-+      {0x20,0x13,0x02},
-+      {0x21,0x13,0x2},
-+      {0x22,0x13,0x2},
-+      {0x23,0x13,0x2},
-+      {0x2e,0x85,0x2},
-+      {0x2f,0x34,0x2},
-+      {0x30,0x00,0x2},
-+      {0x28,0x94,0x2},
-+
-+                                                                                
-+      // page 3
-+      {0xec,0x03,0x03},
-+      {0x10,0x00,0x3},
-+      {0x20,0x00,0x3},
-+      {0x21,0x20,0x3},
-+      {0x22,0x00,0x3},
-+      {0x23,0x00,0x3},
-+      {0x40,0x20,0x3},
-+      {0x41,0x20,0x3},
-+      {0x42,0x20,0x3},
-+      {0x43,0x20,0x3},
-+      {0x60,0x00,0x3},
-+      {0x61,0x00,0x3},
-+      {0x62,0x00,0x3},
-+      {0x63,0x00,0x3},
-+      {0x64,0x04,0x3},
-+      {0x65,0x1C,0x3},
-+      {0x66,0x05,0x3},
-+      {0x67,0x1C,0x3},
-+      {0x68,0x00,0x3},
-+      {0x69,0x2D,0x3},
-+      {0x6a,0x00,0x3},
-+      {0x6b,0x72,0x3},
-+      {0x6c,0x00,0x3},
-+      {0x6d,0x00,0x3},
-+      {0x6e,0x16,0x3}, // 2.38
-+      {0x6f,0x16,0x3}, // 2.38
-+      {0x70,0x00,0x3},
-+      {0x71,0x00,0x3},
-+      {0x72,0x45,0x3},
-+      {0x73,0x00,0x3},
-+      {0x74,0x1C,0x3},
-+      {0x75,0x05,0x3},
-+                                                                                
-+      {0x80,0x00,0x3},  //for 0.02 _ 44
-+      {0x81,0x00,0x3},
-+      {0x82,0x00,0x3},
-+      {0x83,0x00,0x3},
-+      {0x84,0x04,0x3},
-+      {0x85,0x1c,0x3},
-+      {0x86,0x05,0x3},
-+      {0x87,0x1c,0x3},
-+      {0x88,0x00,0x3},
-+      {0x89,0x2d,0x3},
-+      {0x8a,0x00,0x3},
-+      {0x8b,0xcc,0x3},
-+      {0x8c,0x00,0x3},
-+      {0x8d,0x00,0x3},
-+      {0x8e,0x08,0x3},
-+      {0x8f,0x08,0x3},
-+      {0x90,0x01,0x3},
-+      {0x91,0x00,0x3},
-+      {0x92,0x91,0x3},
-+      {0x93,0x00,0x3},
-+      {0x94,0x88,0x3},
-+      {0x95,0x02,0x3},
-+
-+
-+      
-+      // page 4
-+      {0xec,0x04,0x04},
-+      {0x3f,0x09,0x04}, // VGA : old board :0x08 , new board ; 0X09
-+      {0x18,0x00,0x04},  // sxga
-+      {0x1c,0x41,0x04},
-+      {0x20,0x41,0x04}, // vga center 040215
-+      {0x22,0xc1,0x04},// a1);
-+      {0x23,0x02,0x04},
-+      {0x28,0x41,0x04},
-+      {0x2a,0xc1,0x04},// a1);
-+      {0x2b,0x02,0x04},
-+
-+      {0x3c,0x0b,0x04}, //f);  // vga 
-+      {0x58,0x11,0x04},
-+      {0x5c,0x14,0x04},
-+      {0x60,0x21,0x04},
-+      {0x61,0x00,0x04},
-+      {0x62,0xB1,0x04},
-+      {0x63,0x02,0x04},
-+      {0x64,0x01,0x04},
-+      {0x65,0x00,0x04},
-+      {0x66,0x01,0x04},
-+      {0x67,0x02,0x04},
-+      {0x68,0x21,0x04},
-+      {0x69,0x00,0x04},
-+      {0x6a,0xB1,0x04},
-+      {0x6b,0x02,0x04},
-+      {0x6c,0x01,0x04},
-+      {0x6d,0x00,0x04},
-+      {0x6e,0x01,0x04},
-+      {0x6f,0x02,0x04},
-+      {0x70,0x2D,0x04},
-+      {0x71,0x00,0x04},
-+      {0x72,0xd3,0x04}, // 14
-+      {0x73,0x05,0x04}, // 15
-+      {0x74,0x1C,0x04},
-+      {0x75,0x05,0x04},
-+      {0x76,0x1b,0x04}, // HendL
-+      {0x77,0x0b,0x04}, // HendH
-+      {0x78,0x01,0x04}, // 5.00
-+      {0x79,0x80,0x04}, // 5.2a
-+      {0x7a,0x33,0x04},
-+      {0x7b,0x00,0x04},
-+      {0x7c,0x38,0x04}, // 5.0e
-+      {0x7d,0x03,0x04},
-+      {0x7e,0x00,0x04},
-+      {0x7f,0x0A,0x04},
-+      
-+      {0x80,0x2e,0x04},
-+      {0x81,0x00,0x04},
-+      {0x82,0xae,0x04},
-+      {0x83,0x02,0x04},
-+      {0x84,0x00,0x04},
-+      {0x85,0x00,0x04},
-+      {0x86,0x01,0x04},
-+      {0x87,0x02,0x04},
-+      {0x88,0x2e,0x04},
-+      {0x89,0x00,0x04},
-+      {0x8a,0xae,0x04},
-+      {0x8b,0x02,0x04},
-+      {0x8c,0x1c,0x04},
-+      {0x8d,0x00,0x04},
-+      {0x8e,0x04,0x04},
-+      {0x8f,0x02,0x04},
-+      {0x90,0x2d,0x04},
-+      {0x91,0x00,0x04},
-+      {0x92,0xa5,0x04},
-+      {0x93,0x00,0x04},
-+      {0x94,0x88,0x04},
-+      {0x95,0x02,0x04},
-+      {0x96,0xb3,0x04},
-+      {0x97,0x06,0x04},
-+      {0x98,0x01,0x04},
-+      {0x99,0x00,0x04},
-+      {0x9a,0x33,0x04},
-+      {0x9b,0x30,0x04},
-+      {0x9c,0x50,0x04},
-+      {0x9d,0x30,0x04},
-+      {0x9e,0x01,0x04},
-+      {0x9f,0x08,0x04},
-+
-+      // page 5
-+      {0xec,0x05,0x05},
-+      {0x5a,0x22,0x05},
-+
-+      // page 6
-+      {0xec,0x06,0x06},
-+      {0x14,0x1e,0x06}, 
-+      {0x15,0xb4,0x04},
-+      {0x16,0x25,0x04},
-+      {0x17,0x74,0x04}, 
-+
-+      {0x10,0x48,0x04},
-+      {0x11,0xa0,0x04},
-+      {0x12,0x40,0x04},  // 040216  AE1 window ÁÙÀÓ
-+      {0x13,0x70,0x04},
-+
-+      {0x1a,0x29,0x04},  // 040217  AWB window ÁÙÀÓ
-+      {0x30,0x40,0x04},
-+      {0x31,0xa2,0x04},
-+      {0x32,0x50,0x04},
-+      {0x33,0xbc,0x04},
-+      {0x34,0x10,0x04},
-+      {0x35,0xd2,0x04},
-+      {0x36,0x18,0x04},
-+      {0x37,0xf5,0x04},
-+      {0x38,0x10,0x04},
-+      {0x39,0xd3,0x04},
-+      {0x3a,0x1a,0x04},
-+      {0x3b,0xf0,0x04},
-+
-+      // page 7
-+      {0xec,0x07,0x07},
-+      {0x08,0xff,0x7},
-+      {0x38,0x01,0x7}, //07); 040315
-+      {0x39,0x01,0x7}, //02); //4);  040223   040315
-+      {0x11,0xfe,0x7},  //fe);   // green -2  040303
-+      {0x2a,0x20,0x7},
-+      {0x2b,0x20,0x7},
-+      {0x2c,0x10,0x7},
-+      {0x2d,0x00,0x7},
-+      {0x2e,0xf0,0x7},
-+      {0x2f,0xd0,0x7},
-+      {0x3a,0xf0,0x7},
-+      {0x23,0x07,0x7},  //  for ESD   
-+
-+      // page 0
-+      {0xec,0x00,0x00},
-+      {0x8a,0x04,0x00},
-+
-+      // page 1
-+      {0xec,0x01,0x01},       
-+      {0xe5,0xb0,0x01},
-+      {0xe5,0xb0,0x01},
-+      {0xc2,0x01,0x01},
-+
-+      {0x61,0x7b,0x01},
-+      {0x62,0x7b,0x01},
-+      {0x63,0x1b,0x01},
-+      {0x64,0x1b,0x01},
-+
-+      // page 0
-+      {0xec,0x00,0x00},
-+      {0x7e,0x04,0x00},
-+
-+      // page 4
-+      {0xec,0x04,0x04},
-+      {0x04,0x02,0x04},
-+      {0x06,0x02,0x04},
-+
-+      // page 1
-+      {0xec,0x01,0x01},       
-+      {0x10,0x05,0x01},
-+      {0x54,0x02,0x01},
-+      {0x56,0x02,0x01},
-+
-+      // page 3
-+      {0xec,0x03,0x03},
-+      {0x0e,0x08,0x03},
-+      {0x0f,0x08,0x03},
-+
-+      // page 4
-+      {0xec,0x04,0x04},
-+      {0x00,0x30,0x04},
-+      {0x0a,0x30,0x04},
-+
-+      // page 5
-+      {0xec,0x05,0x05},
-+      {0x08,0x33,0x05},
-+
-+      // page 0
-+      {0xec,0x00,0x00},
-+      {0x02,0x00,0x00},
-+
-+      // page 4
-+//scale out
-+      {0xec,0x04,0x04},
-+      {0x02,0x20,0x04},
-+      {0x1c,0x4f,0x04},
-+
-+      // page 1
-+      {0xec,0x01,0x01},
-+      {0x52,0x20,0x01},
-+
-+      // page 5
-+      {0xec,0x05,0x05},
-+      {0x0e,0x4f,0x05},
-+
-+//ae speed
-+      // page 0
-+      {0xec,0x00,0x00},
-+      {0x92,0x80,0x00},
-+      {0x93,0x02,0x00},
-+      {0x94,0x04,0x00},
-+      {0x95,0x04,0x00},
-+      {0x96,0x04,0x00},
-+      {0x97,0x04,0x00},
-+      {0x9b,0x47,0x00},
-+
-+      {0xec,0x00,0x00},
-+      {0x40,0x17,0x00},
-+      {0x41,0x4c,0x00},
-+      {0x42,0x1d,0x00},
-+      {0x43,0x3e,0x00},
-+      {0x44,0x2a,0x00},
-+      {0x45,0x2d,0x00},
-+
-+      {0xec,0x01,0x01},
-+      {0x20,0xd0,0x01},   //high light color reference
-+
-+      {0xec,0x00,0x00},
-+      {0x7e,0x00,0x00},
-+      {0x73,0x11,0x00}, // 41
-+      {0x78,0x78,0x00},
-+
-+      {0xec,0x07,0x07},
-+      {0x1b,0x3e,0x07},
-+
-+      {0xec,0x00,0x00},
-+      {0x48,0xA0,0x00}, //s48C0
-+      {0x49,0xB0,0x00}, //s49B0
-+      {0x4a,0x30,0x00}, //s4a20
-+      {0x4b,0x70,0x00}, //s4b70
-+      {0x4c,0xD0,0x00}, //s4cA0
-+      {0x4d,0xB0,0x00}, //s4dB0
-+      {0x4e,0x30,0x00}, //s4e30
-+      {0x4f,0xF0,0x00}, //s4fF0
-+      {0x50,0xA0,0x00}, //s50D0
-+      {0x51,0xB0,0x00}, //s51B0
-+      {0x52,0x25,0x00}, //s5210
-+      {0x53,0x70,0x00}, //s5370
-+      {0x54,0xD0,0x00}, //s5490
-+      {0x55,0xD0,0x00}, //s55B0
-+      {0x56,0x3A,0x00}, //s5640
-+      {0x57,0xD0,0x00}, //s57D0
-+      {0x58,0xA0,0x00}, //s58D0
-+      {0x59,0xA0,0x00}, //s59B0
-+      {0x5a,0x32,0x00}, //s5a0A
-+      {0x5b,0x7A,0x00}, //s5b7A
-+      {0x5c,0xB0,0x00}, //s5c90
-+      {0x5d,0xC0,0x00}, //s5dC0
-+      {0x5e,0x3E,0x00}, //s5e4A
-+      {0x5f,0xfa,0x00}, //s5fD0
-+
-+      // gamma
-+      {0xec,0x01,0x01},
-+      {0x24,0x31,0x01},
-+      {0x25,0x4C,0x01},
-+      {0x26,0x75,0x01},
-+      {0x27,0xB5,0x01},
-+      {0x28,0x17,0x01},
-+      {0x29,0xAE,0x01},
-+      {0x2A,0x97,0x01},
-+      {0x2B,0xFF,0x01},
-+      {0x2C,0x00,0x01},
-+      {0x2D,0x5B,0x01},
-+
-+      {0xB0,0x31,0x01},
-+      {0xB1,0x4C,0x01},
-+      {0xB2,0x75,0x01},
-+      {0xB3,0xB5,0x01},
-+      {0xB4,0x17,0x01},
-+      {0xB5,0xAE,0x01},
-+      {0xB6,0x97,0x01},
-+      {0xB7,0xFF,0x01},
-+      {0xB8,0x00,0x01},
-+      {0xB9,0x5B,0x01},
-+
-+      {0xec,0x00,0x00},
-+      {0x77,0xb0,0x00},
-+      {0x39,0x06,0x00},
-+      {0x3a,0x08,0x00},
-+
-+};
-+
-+
-+#define S5X532_INIT_REGS (sizeof(s5x532_reg)/sizeof(s5x532_reg[0]))
-+#define S5X532_RISC_REGS 0xEB  
-+#define S5X532_ISP_REGS 0xFB /* S5C7323X */
-+#define S5X532_CIS_REGS 0x2F /* S5K437LA03 */
-+
-+
-+#define PAGE_ADDRESS      0xEC
-+
-+//#define S5X532_REGS (S5X532_RISC_REGS+S5X532_ISP_REGS+S5X532_CIS_REGS)
-+#define S5X532_REGS (0x1000)
-+
-+
-+
-+#endif
-+
-+
-diff --git a/arch/arm/mach-s3c2440/camera/userapp.h b/arch/arm/mach-s3c2440/camera/userapp.h
-new file mode 100644
-index 0000000..9203378
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/userapp.h
-@@ -0,0 +1,44 @@
-+/*
-+    Character Driver API Interface
-+
-+    Copyright (C) 2003 Samsung Electronics (SW.LEE: hitchcar@samsung.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 __FIMC20_CAMIF_USR_APP_H_
-+#define __FIMC20_CAMIF_USR_APP_H_
-+
-+
-+/* 
-+ * IOCTL Command for Character Driver
-+ */ 
-+
-+#define CMD_CAMERA_INIT   0x23
-+/*  Test Application Usage */
-+typedef struct {
-+        int src_x;
-+        int src_y;
-+        int dst_x;
-+        int dst_y;
-+        int bpp;
-+        int flip;
-+} camif_param_t;
-+
-+
-+
-+#endif
-+
-+
-+/* 
-+ * Local variables:
-+ * tab-width: 8
-+ *  c-indent-level: 8
-+ *  c-basic-offset: 8
-+ *  c-set-style: "K&R"
-+ * End:
-+ */
-diff --git a/arch/arm/mach-s3c2440/camera/v4l2_api.c b/arch/arm/mach-s3c2440/camera/v4l2_api.c
-new file mode 100644
-index 0000000..13aed36
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/v4l2_api.c
-@@ -0,0 +1,311 @@
-+/*
-+ * . 2004-01-03: SW.LEE <hitchcar@sec.samsung.com>
-+ *   
-+ * This file is subject to the terms and conditions of the GNU General Public
-+ * License 2. See the file COPYING in the main directory of this archive
-+ * for more details.
-+ */
-+
-+#include <linux/config.h>
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/init.h>
-+#include <linux/sched.h>
-+#include <linux/irq.h>
-+#include <linux/tqueue.h>
-+#include <linux/locks.h>
-+#include <linux/completion.h>
-+#include <linux/delay.h>
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+#include <linux/miscdevice.h>
-+#include <linux/wait.h>
-+
-+#include <asm/io.h>
-+#include <asm/semaphore.h>
-+#include <asm/hardware.h>
-+#include <asm/uaccess.h>
-+
-+#include <asm/arch/cpu_s3c2440.h>
-+#include <asm/arch/S3C2440.h>
-+
-+#include "camif.h"
-+#include "videodev.h"
-+
-+/* 
-+  Codec_formats/Preview_format[0] must be same to initial value of 
-+  preview_init_param/codec_init_param 
-+*/
-+
-+const struct v4l2_fmtdesc codec_formats[] = {
-+      {
-+              .index     = 0,
-+              .type      = V4L2_BUF_TYPE_VIDEO_CAPTURE,
-+//            .flags     = FORMAT_FLAGS_PLANAR,
-+              .description = "4:2:2, planar, Y-Cb-Cr",
-+              .pixelformat = V4L2_PIX_FMT_YUV422P,
-+
-+      },{
-+              .index    = 1,
-+              .type     = V4L2_BUF_TYPE_VIDEO_CAPTURE,
-+//            .flags    = FORMAT_FLAGS_PLANAR,
-+              .name     = "4:2:0, planar, Y-Cb-Cr",
-+              .fourcc   = V4L2_PIX_FMT_YUV420,
-+      }
-+};
-+
-+
-+/* Todo
-+   FIMC V4L2_PIX_FMT_RGB565 is not same to that of V4L2spec 
-+   and so we need image convert to FIMC V4l2_PIX_FMT_RGB565.
-+*/
-+const struct v4l2_fmtdesc preview_formats[] = {
-+      {
-+              .index    = 1,
-+              .type     = V4L2_BUF_TYPE_VIDEO_CAPTURE,
-+              .description = "16 bpp RGB, le",
-+              .fourcc   = V4L2_PIX_FMT_RGB565,
-+//            .flags    = FORMAT_FLAGS_PACKED,
-+      },
-+      {
-+              .index    = 0,
-+              .type     = V4L2_BUF_TYPE_VIDEO_CAPTURE,
-+//            .flags    = FORMAT_FLAGS_PACKED,
-+              .description = "32 bpp RGB, le",
-+              .fourcc   = V4L2_PIX_FMT_BGR32,
-+      }
-+}
-+
-+#define NUM_F       ARRARY_SIZE(preview_formats)
-+
-+
-+/* 
-+ * This function and v4l2 structure made for V4L2 API functions 
-+ *     App <--> v4l2 <--> logical param <--> hardware
-+ */
-+static int camif_get_v4l2(camif_cfg_t *cfg)
-+{
-+      return 0;
-+}
-+
-+
-+/*
-+** Gives the depth of a video4linux2 fourcc aka pixel format in bits.
-+*/
-+static int pixfmt2depth(int pixfmt,int *fmtptr)
-+{
-+      int fmt, depth;    
-+      
-+      switch (pixfmt) {
-+      case V4L2_PIX_FMT_RGB565:
-+      case V4L2_PIX_FMT_RGB565X:
-+              fmt = CAMIF_RGB_16;
-+              depth = 16;
-+              break;
-+      case V4L2_PIX_FMT_BGR24: /* Not tested */
-+      case V4L2_PIX_FMT_RGB24:
-+              fmt = CAMIF_RGB_24;
-+              depth = 24;
-+              break;
-+      case V4L2_PIX_FMT_BGR32:
-+      case V4L2_PIX_FMT_RGB32:
-+              fmt = CAMIF_RGB_24;
-+              depth 32;
-+              break;
-+      case V4L2_PIX_FMT_GREY: /* Not tested  */
-+              fmt = CAMIF_OUT_YCBCR420;
-+              depth = 8;
-+              break;
-+      case V4L2_PIX_FMT_YUYV:
-+      case V4L2_PIX_FMT_UYVY:
-+      case V4L2_PIX_FMT_YUV422P:
-+              fmt = CAMIF_OUT_YCBCR422;
-+              depth = 16;
-+              break;
-+      case V4L2_PIX_FMT_YUV420:
-+              fmt = CAMIF_OUT_YCBCR420;
-+              depth = 12;
-+              break;
-+      }
-+      if (fmtptr) *fmtptr = fmt;              
-+      return depth;
-+}
-+
-+
-+
-+static int camif_s_v4l2(camif_cfg_t *cfg)
-+{
-+      int num = cfg->v2.used_fmt;
-+
-+      if ( !(cfg->v2.status&CAMIF_V4L2_INIT)) {
-+              int depth;
-+              int fourcc = v2.fmtdesc[num].pixelformat;
-+
-+              /* To define v4l2_fmtsdesc */
-+              if (cfg->dma_type == CAMIF_CODEC)
-+                      cfg->v2->fmtdesc = codec_formats;
-+              else
-+                      cfg->v2->fmtdesc = preview_formats;
-+
-+              /* To define v4l2_format used currently */
-+              cfg->v2.fmt.width    = cfg->target_x;
-+              cfg->v2.fmt.height   = cfg->target_y;
-+              cfg->v2.fmt.field    = V4L2_FIELD_NONE;
-+              cfg->v2.fmt.pixelformat = fourcc;
-+              depth       = pixfmt2depth(fourcc,NULL);
-+              cfg->v2.fmt.bytesperline= cfg->v2.fmt.width*depth >> 3;
-+              cfg->v2.fmt.sizeimage = 
-+                       cfg->v2.fmt.height * cfg->v2.fmt.bytesperline;
-+
-+              /* To define v4l2_input */
-+              cfg->v2.input.index  = 0;
-+              if (cfg->dma_type == CAMIF_CODEC)
-+                      snprintf(cfg->v2.input.name, 31, "CAMIF CODEC");
-+              else
-+                      snprintf(cfg->v2.input.name, 31, "CAMIF PREVIEW");
-+              cfg->v2.input.type = V4L2_INPUT_TYPE_CAMERA;
-+                      
-+              /* Write the Status of v4l2 machine */
-+              cfg->v2.status |= CAMIF_V4L2_INIT;
-+       }
-+      return 0;
-+}
-+
-+
-+static int camif_g_fmt(camif_cfg_t *cfg, struct v4l2_format *f)
-+{
-+      int size = sizeof(struct v4l2_pix_format);
-+
-+      switch (f->type) {
-+      case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-+              memset(&f->fmt.pix,0,size);
-+              memcpy(&f->fmt.pix,&cfg->v2.fmt,size);
-+              return 0;
-+      default:
-+              return -EINVAL;
-+      }
-+}
-+
-+
-+/* Copy v4l2 parameter into other element of camif_cfg_t */
-+static int camif_s_try(camif_cfg_t *cfg, int f)
-+{
-+      int fmt;
-+      cfg->target_x = cfg->v2.fmt.width;
-+      cfg->target_y = cfg->v2.fmt.height;
-+      pixfmt2depth(cfg->v2.fmt.pixelformat,&fmt);
-+      cfg->fmt = fmt;
-+      camif_dynamic_conf(cfg);
-+}
-+
-+
-+static int camif_s_fmt(camif_cfg_t *cfg, struct v4l2_format *f)
-+{
-+      int retval;
-+      
-+      switch (f->type) {
-+      case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-+      {
-+              /* update our state informations */
-+//            down(&fh->cap.lock);
-+              cfg->v2.fmt          = f->pix;
-+              cfg->v2.status       |= CAMIF_v4L2_DIRTY;
-+              camif_dynamic_conf(cfg);
-+              cfg->v2.status      &= ~CAMIF_v4L2_DIRTY; /* dummy ? */
-+//            up(&fh->cap.lock);
-+              
-+              return 0;
-+      }
-+      default:
-+              return -EINVAL;
-+      }
-+
-+}
-+
-+/* Refer ioctl of  videodeX.c  and bttv-driver.c */
-+int camif_do_ioctl
-+(struct inode *inode, struct file *file,unsigned int cmd, void * arg)
-+{
-+      camif_cfg_t *cfg = file->private_data;
-+      int ret = 0;
-+
-+      switch (cmd) {
-+        case VIDIOC_QUERYCAP:
-+              {
-+                      struct v4l2_capability *cap = arg;
-+                                                                                                      
-+                      strcpy(cap->driver,"Fimc Camera");
-+                      strlcpy(cap->card,cfg->v->name,sizeof(cap->card));
-+                      sprintf(cap->bus_info,"FIMC 2.0 AHB Bus");
-+                      cap->version = 0;
-+                      cap->capabilities =
-+                              V4L2_CAP_VIDEO_CAPTURE |V4L2_CAP_READWRITE;
-+                      return 0;
-+              }
-+      case VIDIOC_G_FMT:
-+              {
-+                      struct v4l2_format *f = arg;
-+                      return camif_g_fmt(cfg,f);
-+              }
-+      case VIDIOC_S_FMT:
-+              {
-+                      struct v4l2_format *f = arg;
-+                      return camif_s_fmt(cfg,f);
-+              }
-+
-+      case VIDIOC_ENUM_FMT:
-+              {
-+                      struct v4l2_fmtdesc *f = arg;
-+                      enum v4l2_buf_type type = f->type;
-+                      int index = f->index;
-+
-+                      if (index >= NUM_F) 
-+                              return -EINVAL;
-+                      switch (f->type) {
-+                      case V4L2_BUF_TYPE_VIDEO_CAPTURE:
-+                              break;
-+                      case V4L2_BUF_TYPE_VIDEO_OVERLAY:
-+                      case V4L2_BUF_TYPE_VBI_CAPTURE:
-+                                      default:
-+                      return -EINVAL;
-+                      }
-+                      memset(f,0,sizeof(*f));
-+                      memcpy(f,cfg->v2.fmtdesc+index,sizeof(*f));
-+                      return 0;
-+              }
-+      case VIDIOC_G_INPUT:
-+              {
-+                      u32 *i = arg;
-+                      *i = cfg->v2.input;
-+                      return 0;
-+              }
-+      case VIDIOC_S_INPUT:
-+              {
-+                      int index = *((int *)arg);
-+                      if (index != 0) 
-+                              return -EINVAL;
-+                      cfg->v2.input.index = index;
-+                      return 0;
-+              }
-+              
-+      default:
-+              return -ENOIOCTLCMD; /* errno.h */
-+      } /* End of Switch  */
-+
-+
-+}
-+
-+
-+
-+
-+
-+
-+
-+/* 
-+ * Local variables:
-+ * tab-width: 8
-+ *  c-indent-level: 8
-+ *  c-basic-offset: 8
-+ *  c-set-style: "K&R"
-+ * End:
-+ */
-diff --git a/arch/arm/mach-s3c2440/camera/video-driver.c b/arch/arm/mach-s3c2440/camera/video-driver.c
-new file mode 100644
-index 0000000..fe9130c
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/video-driver.c
-@@ -0,0 +1,591 @@
-+/*  
-+    Copyright (C) 2004 Samsung Electronics 
-+                     SW.LEE <hitchcar@sec.samsung.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/version.h>
-+#include <linux/module.h>
-+#include <linux/delay.h>
-+#include <linux/errno.h>
-+#include <linux/fs.h>
-+#include <linux/kernel.h>
-+#include <linux/major.h>
-+#include <linux/slab.h>
-+#include <linux/poll.h>
-+#include <linux/signal.h>
-+#include <linux/ioport.h>
-+#include <linux/sched.h>
-+#include <linux/types.h>
-+#include <linux/interrupt.h>
-+#include <linux/kmod.h>
-+#include <linux/vmalloc.h>
-+#include <linux/init.h>
-+#include <asm/io.h>
-+#include <asm/page.h>
-+#include <asm/irq.h>
-+#include <asm/semaphore.h>
-+#include <linux/miscdevice.h>
-+
-+//#define SW_DEBUG 
-+
-+#include "camif.h"
-+#include "videodev.h"
-+#include "miscdevice.h"
-+#include "cam_reg.h"
-+#include "sensor.h"
-+#include "userapp.h"
-+
-+#ifdef Z_API
-+#include "qt.h"
-+#endif
-+
-+/* Codec and Preview */
-+#define CAMIF_NUM  2
-+static camif_cfg_t  fimc[CAMIF_NUM];
-+
-+static const char *driver_version = 
-+      "$Id: video-driver.c,v 1.9 2004/06/02 03:10:36 swlee Exp $";
-+extern const char *fimc_version;
-+extern const char *fsm_version;
-+
-+
-+camif_cfg_t * get_camif(int nr)
-+{
-+      camif_cfg_t *ret = NULL;
-+      switch(nr) {
-+      case CODEC_MINOR:
-+              ret = &fimc[0];
-+              break;
-+      case PREVIEW_MINOR:
-+              ret = &fimc[1];
-+              break;
-+      default:
-+              panic("Unknow Minor Number \n");
-+      }
-+      return ret;
-+}
-+
-+
-+static int camif_codec_start(camif_cfg_t *cfg)
-+{
-+      int  ret = 0;
-+      ret =camif_check_preview(cfg);
-+      switch(ret) {
-+      case 0:                 /* Play alone */
-+              DPRINTK("Start Alone \n");
-+              camif_4fsm_start(cfg);
-+              cfg->gc->status |= C_WORKING;
-+              break;
-+      case -ERESTARTSYS:       /* Busy , retry */
-+              //DPRINTK("Error \n");
-+              printk("Error \n");
-+              break; 
-+      case 1:
-+              DPRINTK("need callback \n");
-+              ret = camif_callback_start(cfg);
-+              if(ret < 0 ) {
-+                      printk(KERN_INFO "Busy RESTART \n");
-+                      return ret; /* Busy, retry */
-+              }
-+              break;
-+      }
-+      return ret;
-+}
-+
-+
-+ssize_t camif_write (struct file *f, const char *b, size_t c,loff_t *offset)
-+{
-+      camif_cfg_t *cfg;
-+
-+      c = 0;                  /* return value */
-+      DPRINTK("\n");
-+      cfg = get_camif(MINOR(f->f_dentry->d_inode->i_rdev));
-+      switch (*b) {
-+              case 'O':
-+                      if (cfg->dma_type & CAMIF_PREVIEW) {
-+                              if (cfg->gc->status & C_WORKING) {
-+                                      camif_start_c_with_p(cfg,get_camif(CODEC_MINOR));
-+                              }       
-+                              else  {
-+                                      camif_4fsm_start(cfg);
-+                              }
-+                      }
-+                      else{
-+                              c = camif_codec_start(cfg);
-+                              if(c < 0) c = 1; /* Error and neet to retry */
-+                      }
-+
-+                      break;
-+              case 'X':
-+                      camif_p_stop(cfg);
-+                      break;
-+              default:
-+                      panic("CAMERA:camif_write: Unexpected Param\n");
-+      }
-+      DPRINTK("end\n");
-+
-+      return c;
-+}
-+
-+
-+ssize_t camif_p_read(struct file *file, char *buf, size_t count, loff_t *pos)
-+{
-+      camif_cfg_t *cfg = NULL;
-+      size_t end;
-+
-+      cfg = get_camif(MINOR(file->f_dentry->d_inode->i_rdev));
-+      cfg->status = CAMIF_STARTED;
-+
-+      if (wait_event_interruptible(cfg->waitq,cfg->status == CAMIF_INT_HAPPEN))
-+              return -ERESTARTSYS;
-+
-+      cfg->status = CAMIF_STOPPED;
-+      end = min_t(size_t, cfg->pp_totalsize /cfg->pp_num, count);
-+      if (copy_to_user(buf, camif_g_frame(cfg), end))
-+              return -EFAULT;
-+
-+      return end;
-+}
-+
-+
-+static ssize_t 
-+camif_c_read(struct file *file, char *buf, size_t count, loff_t *pos)
-+{
-+      camif_cfg_t *cfg = NULL;
-+      size_t end;
-+
-+      /* cfg = file->private_data; */
-+      cfg = get_camif(MINOR(file->f_dentry->d_inode->i_rdev));
-+#if 0
-+      if(file->f_flags & O_NONBLOCK) {
-+              printk(KERN_ERR"Don't Support NON_BLOCK \n");
-+      }
-+#endif                
-+
-+      /* Change the below wait_event_interruptible func */
-+       if (wait_event_interruptible(cfg->waitq,cfg->status == CAMIF_INT_HAPPEN))
-+             return -ERESTARTSYS;
-+       cfg->status = CAMIF_STOPPED;
-+       end = min_t(size_t, cfg->pp_totalsize /cfg->pp_num, count);
-+       if (copy_to_user(buf, camif_g_frame(cfg), end))
-+             return -EFAULT;
-+       return end;
-+}
-+
-+
-+static void camif_c_irq(int irq, void *dev_id, struct pt_regs *regs)
-+{
-+        camif_cfg_t *cfg = (camif_cfg_t *)dev_id;
-+      DPRINTK("\n");
-+      camif_g_fifo_status(cfg);
-+      camif_g_frame_num(cfg);
-+      if(camif_enter_c_4fsm(cfg) == INSTANT_SKIP) return;
-+      wake_up_interruptible(&cfg->waitq);
-+}
-+
-+static void camif_p_irq(int irq, void *dev_id, struct pt_regs * regs)
-+{
-+        camif_cfg_t *cfg = (camif_cfg_t *)dev_id;
-+      DPRINTK("\n");
-+      camif_g_fifo_status(cfg);
-+      camif_g_frame_num(cfg);
-+      if(camif_enter_p_4fsm(cfg) == INSTANT_SKIP) return;
-+      wake_up_interruptible(&cfg->waitq);
-+#if 0
-+      if( (cfg->perf.frames % 5) == 0)
-+              DPRINTK("5\n");
-+#endif
-+}
-+
-+static void camif_release_irq(camif_cfg_t *cfg)
-+{
-+      disable_irq(cfg->irq);
-+      free_irq(cfg->irq, cfg);
-+}
-+
-+static int camif_irq_request(camif_cfg_t *cfg)
-+{
-+      int ret = 0;
-+
-+      if (cfg->dma_type & CAMIF_CODEC) {
-+              if ((ret = request_irq(cfg->irq, camif_c_irq, 
-+                             SA_INTERRUPT,cfg->shortname, cfg))) {
-+                      printk("request_irq(CAM_C) failed.\n");
-+              }
-+      }
-+      if (cfg->dma_type & CAMIF_PREVIEW) {
-+              if ((ret = request_irq(cfg->irq, camif_p_irq,
-+                             SA_INTERRUPT,cfg->shortname, cfg))) {
-+                      printk("request_irq(CAM_P) failed.\n");
-+              }
-+      }
-+      return 0;
-+}
-+
-+static void camif_init_sensor(camif_cfg_t *cfg)
-+{
-+      camif_gc_t *gc =  cfg->gc;
-+      if (!gc->sensor) 
-+              panic("CAMERA:I2C Client(Img Sensor)Not registered\n");
-+      if(!gc->init_sensor) {
-+              camif_reset(gc->reset_type, gc->reset_udelay);
-+              gc->sensor->driver->command(gc->sensor,SENSOR_INIT,NULL);
-+              gc->init_sensor = 1; /*sensor init done */
-+      }
-+      gc->sensor->driver->command(gc->sensor, USER_ADD, NULL);
-+}
-+
-+static int camif_open(struct inode *inode, struct file *file)
-+{
-+      int err;
-+      camif_cfg_t * cfg = get_camif(MINOR(inode->i_rdev));
-+
-+      if(cfg->dma_type & CAMIF_PREVIEW) {
-+              if(down_interruptible(&cfg->gc->lock))
-+                      return -ERESTARTSYS;
-+              if (cfg->dma_type & CAMIF_PREVIEW) {
-+                      cfg->gc->status &= ~PNOTWORKING;
-+              }
-+              up(&cfg->gc->lock);
-+      }
-+      err = video_exclusive_open(inode,file);
-+      cfg->gc->user++;
-+      cfg->status = CAMIF_STOPPED;
-+      if (err < 0)  return err;
-+      if (file->f_flags & O_NONCAP ) {
-+              printk("Don't Support Non-capturing open \n");
-+              return 0;
-+      }
-+      file->private_data = cfg;
-+      camif_irq_request(cfg);
-+      camif_init_sensor(cfg);
-+      return 0;
-+}
-+
-+#if 0
-+static void print_pregs(void)
-+{
-+      printk(" CISRCFMT 0x%08X  \n", CISRCFMT);
-+      printk(" CIWDOFST 0x%08X  \n", CIWDOFST);
-+      printk(" CIGCTRL  0x%08X  \n", CIGCTRL);
-+      printk(" CIPRTRGFMT 0x%08X  \n", CIPRTRGFMT);
-+      printk(" CIPRCTRL 0x%08X  \n", CIPRCTRL);
-+      printk(" CIPRSCPRERATIO 0x%08X  \n", CIPRSCPRERATIO);
-+      printk(" CIPRSCPREDST 0x%08X  \n", CIPRSCPREDST);
-+      printk(" CIPRSCCTRL 0x%08X  \n", CIPRSCCTRL);
-+      printk(" CIPRTAREA 0x%08X  \n", CIPRTAREA);
-+      printk(" CIPRSTATUS 0x%08X  \n", CIPRSTATUS);
-+      printk(" CIIMGCPT 0x%08X  \n", CIIMGCPT);
-+}
-+
-+static void print_cregs(void)
-+{
-+      printk(" CISRCFMT 0x%08X  \n", CISRCFMT);
-+      printk(" CIWDOFST 0x%08X  \n", CIWDOFST);
-+      printk(" CIGCTRL  0x%08X  \n", CIGCTRL);
-+      printk(" CICOCTRL 0x%8X   \n", CICOCTRL);
-+      printk(" CICOSCPRERATIO 0x%08X  \n", CICOSCPRERATIO);
-+      printk(" CICOSCPREDST 0x%08X  \n", CICOSCPREDST);
-+      printk(" CICOSCCTRL 0x%08X  \n", CICOSCCTRL);
-+      printk(" CICOTAREA 0x%08X  \n", CICOTAREA);
-+      printk(" CICOSTATUS 0x%8X \n", CICOSTATUS);
-+      printk(" CIIMGCPT 0x%08X  \n", CIIMGCPT);
-+}
-+#endif
-+
-+
-+static int camif_release(struct inode *inode, struct file *file)
-+{
-+      camif_cfg_t * cfg = get_camif(MINOR(inode->i_rdev));
-+
-+      //DPRINTK(" cfg->status 0x%0X cfg->gc->status 0x%0X \n", cfg->status,cfg->gc->status );
-+      if (cfg->dma_type & CAMIF_PREVIEW) {
-+              if(down_interruptible(&cfg->gc->lock))
-+                      return -ERESTARTSYS;
-+              cfg->gc->status &= ~PWANT2START;
-+              cfg->gc->status |= PNOTWORKING;
-+              up(&cfg->gc->lock);
-+      } 
-+      else {
-+              cfg->gc->status &= ~CWANT2START; /* No need semaphore */
-+      }
-+      camif_dynamic_close(cfg);
-+      camif_release_irq(cfg);
-+      video_exclusive_release(inode,file);
-+      camif_p_stop(cfg);
-+      cfg->gc->sensor->driver->command(cfg->gc->sensor, USER_EXIT, NULL);
-+      cfg->gc->user--;
-+      cfg->status = CAMIF_STOPPED;
-+      return 0;
-+}
-+
-+static void fimc_config(camif_cfg_t *cfg,u32 x, u32 y, int bpp)
-+{
-+      cfg->target_x = x;
-+      cfg->target_y = y;
-+
-+      switch (bpp) {
-+      case 16:
-+              cfg->fmt = CAMIF_RGB16;
-+              break;
-+      case 24:
-+              cfg->fmt = CAMIF_RGB24;
-+              break;
-+      case 420:
-+              cfg->fmt = CAMIF_IN_YCBCR422|CAMIF_OUT_YCBCR420; 
-+              break;
-+      case 422:
-+              cfg->fmt = CAMIF_IN_YCBCR422|CAMIF_OUT_YCBCR422; 
-+              break;
-+      default: 
-+              panic("Wrong BPP \n");
-+      }
-+}
-+
-+
-+static int 
-+camif_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
-+{
-+      int ret = 0;
-+      camif_cfg_t *cfg  = file->private_data;
-+      camif_param_t par;
-+
-+      switch (cmd) {
-+              case CMD_CAMERA_INIT:
-+                      if (copy_from_user(&par,(camif_param_t *)arg,
-+                                              sizeof(camif_param_t)))
-+                              return -EFAULT;
-+                      fimc_config(cfg,par.dst_x, par.dst_y, par.bpp);
-+                      if (camif_dynamic_open(cfg)) {
-+                              printk(" Eror Happens \n");
-+                              ret = -1;
-+                      }
-+
-+                      switch (par.flip) {
-+                      case 3 : 
-+                              cfg->flip = CAMIF_FLIP_MIRROR;
-+                              break;
-+                      case 1 : 
-+                              cfg->flip = CAMIF_FLIP_X;
-+                              break;
-+                      case 2 : 
-+                              cfg->flip = CAMIF_FLIP_Y;
-+                              break;
-+                      case 0 : 
-+                      default:
-+                              cfg->flip = CAMIF_FLIP;
-+                      }
-+                      break;
-+      /* Todo
-+              case CMD_SENSOR_BRIGHTNESS:
-+                      cfg->gc->sensor->driver->command(cfg->gc->sensor, SENSOR_BRIGHTNESS, NULL);
-+                      break;
-+      */
-+              default:
-+                      ret = -EINVAL;
-+                      break;
-+      }
-+
-+      return ret;
-+}
-+
-+
-+#if 0
-+static int camif_ioctl(struct inode *inode, struct file *file,
-+                    unsigned int cmd, unsigned long arg)
-+{
-+//    camif_cfg_t *cfg  = file->private_data;
-+
-+
-+      switch (cmd) {
-+/*    case Some_other_action */
-+      default:
-+              return video_usercopy(inode, file, cmd, arg, camif_do_ioctl);
-+      }
-+}
-+#endif
-+
-+static struct file_operations camif_c_fops =
-+{
-+      .owner    = THIS_MODULE,
-+      .open     = camif_open,
-+      .release  = camif_release,
-+      .ioctl    = camif_ioctl,
-+      .read     = camif_c_read,
-+      .write    = camif_write,
-+};
-+
-+static struct file_operations camif_p_fops =
-+{
-+      .owner    = THIS_MODULE,
-+      .open     = camif_open,
-+      .release  = camif_release,
-+      .ioctl    = camif_ioctl,
-+#ifdef Z_API
-+      .read     = z_read,
-+      .write    = z_write,
-+#else
-+      .read     = camif_p_read,
-+      .write    = camif_write,
-+#endif
-+};
-+
-+static struct video_device codec_template =
-+{
-+      .name     = "CODEC_IF",
-+      .type     = VID_TYPE_CAPTURE|VID_TYPE_CLIPPING|VID_TYPE_SCALES,
-+      .hardware = VID_HARDWARE_SAMSUNG_FIMC20,
-+      .fops     = &camif_c_fops,
-+//    .release  = camif_release
-+      .minor    = -1,
-+};
-+
-+static struct video_device preview_template =
-+{
-+      .name     = "PREVIEW_IF",
-+      .type     = VID_TYPE_CAPTURE|VID_TYPE_CLIPPING|VID_TYPE_SCALES,
-+      .hardware = VID_HARDWARE_SAMSUNG_FIMC20,
-+      .fops     = &camif_p_fops,
-+      .minor    = -1,
-+};
-+
-+static int preview_init(camif_cfg_t *cfg)
-+{
-+      char name[16]="CAM_PREVIEW";
-+
-+      memset(cfg, 0, sizeof(camif_cfg_t));
-+      cfg->target_x = 640;
-+      cfg->target_y = 480;
-+      cfg->pp_num   = 4;
-+      cfg->dma_type = CAMIF_PREVIEW;
-+      cfg->fmt      = CAMIF_RGB16;
-+      cfg->flip     = CAMIF_FLIP_Y;
-+      cfg->v        = &preview_template;
-+      init_MUTEX(&cfg->v->lock);
-+      cfg->irq       = IRQ_CAM_P;
-+      
-+      strcpy(cfg->shortname,name);
-+        init_waitqueue_head(&cfg->waitq);
-+      cfg->status = CAMIF_STOPPED;
-+      return cfg->status;
-+}
-+
-+static int codec_init(camif_cfg_t *cfg)
-+{
-+      char name[16]="CAM_CODEC";
-+
-+      memset(cfg, 0, sizeof(camif_cfg_t));
-+      cfg->target_x = 176;
-+      cfg->target_y = 144;
-+      cfg->pp_num   = 4; 
-+      cfg->dma_type = CAMIF_CODEC;
-+      cfg->fmt      = CAMIF_IN_YCBCR422|CAMIF_OUT_YCBCR420;
-+      cfg->flip     = CAMIF_FLIP_X;
-+      cfg->v         = &codec_template;
-+      init_MUTEX(&cfg->v->lock);
-+      cfg->irq       = IRQ_CAM_C;
-+      strcpy(cfg->shortname,name);
-+      init_waitqueue_head(&cfg->waitq);
-+      cfg->status = CAMIF_STOPPED;
-+      return cfg->status;
-+}
-+
-+static void camif_init(void)
-+{
-+      camif_setup_sensor();
-+}
-+
-+
-+
-+static void print_version(void)
-+{
-+      printk(KERN_INFO"FIMC built:"__DATE__ " "__TIME__"\n%s\n%s\n%s\n", 
-+                                      fimc_version, driver_version,fsm_version);
-+}
-+
-+
-+static int camif_m_in(void)
-+{
-+      int ret = 0;
-+      camif_cfg_t * cfg;
-+
-+      camif_init();           
-+      cfg = get_camif(CODEC_MINOR);
-+      codec_init(cfg);
-+
-+      if (video_register_device(cfg->v,0,CODEC_MINOR)!=0) {
-+                      DPRINTK("Couldn't register codec driver.\n");
-+                      return 0;
-+      }
-+      cfg = get_camif(PREVIEW_MINOR);
-+      preview_init(cfg);
-+      if (video_register_device(cfg->v,0,PREVIEW_MINOR)!=0) {
-+                      DPRINTK("Couldn't register preview driver.\n");
-+                      return 0;
-+      }
-+      
-+      print_version();
-+      return ret;
-+}
-+
-+static void unconfig_device(camif_cfg_t *cfg)
-+{
-+      video_unregister_device(cfg->v);
-+      camif_hw_close(cfg);
-+      //memset(cfg, 0, sizeof(camif_cfg_t));
-+}
-+
-+static void camif_m_out(void) /* module out */
-+{
-+      camif_cfg_t *cfg;
-+
-+      cfg = get_camif(CODEC_MINOR);
-+      unconfig_device(cfg);
-+      cfg = get_camif(PREVIEW_MINOR);
-+      unconfig_device(cfg);
-+      return;
-+}
-+
-+void camif_register_decoder(struct i2c_client *ptr)
-+{
-+      camif_cfg_t *cfg;
-+
-+      cfg =get_camif(CODEC_MINOR);
-+      cfg->gc = (camif_gc_t *)(ptr->data);
-+
-+      cfg =get_camif(PREVIEW_MINOR);
-+      cfg->gc = (camif_gc_t *)(ptr->data);
-+
-+      sema_init(&cfg->gc->lock,1); /* global lock for both Codec and Preview */
-+      cfg->gc->status |= PNOTWORKING; /* Default Value */
-+      camif_hw_open(cfg->gc);
-+}
-+
-+void camif_unregister_decoder(struct i2c_client *ptr)
-+{
-+      camif_gc_t *gc;
-+              
-+      gc = (camif_gc_t *)(ptr->data); 
-+      gc->init_sensor = 0; /* need to modify */
-+}
-+
-+module_init(camif_m_in);
-+module_exit(camif_m_out);
-+
-+EXPORT_SYMBOL(camif_register_decoder);
-+EXPORT_SYMBOL(camif_unregister_decoder);
-+
-+MODULE_AUTHOR("SW.LEE <hitchcar@sec.samsung.com>");
-+MODULE_DESCRIPTION("Video-Driver For Fimc2.0 MISC Drivers");
-+MODULE_LICENSE("GPL");
-+
-+
-+/*
-+ * Local variables:
-+ * c-basic-offset: 8
-+ * End:
-+ */
-diff --git a/arch/arm/mach-s3c2440/camera/videodev.c b/arch/arm/mach-s3c2440/camera/videodev.c
-new file mode 100644
-index 0000000..0b3498f
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/videodev.c
-@@ -0,0 +1,342 @@
-+/*
-+ * Video capture interface for Linux Character Device Driver.
-+ *              based on  
-+ *              Alan Cox, <alan@redhat.com> video4linux 
-+ *
-+ * Author:      SW.LEE <hitchcar@samsung.com>        
-+ *              2004 (C) Samsung Electronics 
-+ *              Modified for S3C2440/S3C24A0 Interface
-+ *
-+ * This file is released under the GPLv2
-+ */
-+
-+
-+#include <linux/module.h>
-+#include <linux/types.h>
-+#include <linux/kernel.h>
-+#include <linux/sched.h>
-+#include <linux/smp_lock.h>
-+#include <linux/mm.h>
-+#include <linux/string.h>
-+#include <linux/errno.h>
-+#include <linux/init.h>
-+#include <linux/kmod.h>
-+#include <linux/slab.h>
-+#include <linux/devfs_fs_kernel.h>
-+#include <linux/miscdevice.h>
-+#include <asm/uaccess.h>
-+#include <asm/system.h>
-+#include <asm/semaphore.h>
-+
-+
-+
-+#include "camif.h"
-+#include "videodev.h"
-+#include "miscdevice.h"
-+
-+
-+static DECLARE_MUTEX(videodev_lock);
-+
-+const char *fimc_version = "$Id: videodev.c,v 1.1.1.1 2004/04/27 03:52:50 swlee Exp $";
-+
-+#define VIDEO_NAME              "video4linux"
-+
-+
-+static inline unsigned iminor(struct inode *inode)
-+{
-+        return MINOR(inode->i_rdev);
-+}
-+
-+static inline unsigned imajor(struct inode *inode)
-+{
-+        return MAJOR(inode->i_rdev);
-+}
-+
-+
-+#define VIDEO_NUM_DEVICES     2 
-+static struct video_device *video_device[VIDEO_NUM_DEVICES];
-+
-+static inline struct video_device * get_vd(int nr)
-+{
-+      if ( nr == CODEC_MINOR)
-+              return video_device[0];
-+      else {
-+              assert ( nr & PREVIEW_MINOR);
-+              return video_device[1];
-+      }
-+}
-+
-+static inline void set_vd ( struct video_device * vd, int nr)
-+{
-+      if ( nr == CODEC_MINOR)
-+              video_device[0] = vd;
-+      else {
-+              assert ( nr & PREVIEW_MINOR);
-+              video_device[1] = vd;
-+      }
-+}
-+
-+static inline int video_release(struct inode *inode, struct file *f)
-+{
-+      int minor = MINOR(inode->i_rdev);
-+      struct video_device *vfd;
-+
-+      vfd = get_vd(minor);
-+#if 1 /* needed until all drivers are fixed */
-+      if (!vfd->release)
-+              return 0;
-+#endif
-+      vfd->release(vfd);
-+      return 0;
-+}
-+
-+struct video_device* video_devdata(struct file *file)
-+{
-+      return video_device[iminor(file->f_dentry->d_inode)];
-+}
-+
-+
-+/*
-+ *    Open a video device.
-+ */
-+static int video_open(struct inode *inode, struct file *file)
-+{
-+      int minor = MINOR(inode->i_rdev);
-+      int err = 0;
-+      struct video_device *vfl;
-+      struct file_operations *old_fops;
-+      
-+      down(&videodev_lock);
-+
-+      vfl = get_vd(minor);
-+
-+      old_fops = file->f_op;
-+      file->f_op = fops_get(vfl->fops);
-+      if(file->f_op->open)
-+              err = file->f_op->open(inode,file);
-+      if (err) {
-+              fops_put(file->f_op);
-+              file->f_op = fops_get(old_fops);
-+      }
-+      fops_put(old_fops);
-+      up(&videodev_lock);
-+      return err;
-+}
-+
-+/*
-+ * open/release helper functions -- handle exclusive opens
-+ */
-+extern int video_exclusive_open(struct inode *inode, struct file *file)
-+{
-+      struct  video_device *vfl = get_vd(MINOR(inode->i_rdev));
-+      int retval = 0;
-+
-+      down(&vfl->lock);
-+      if (vfl->users) {
-+              retval = -EBUSY;
-+      } else {
-+              vfl->users++;
-+      }
-+      up(&vfl->lock);
-+      return retval;
-+}
-+
-+extern int video_exclusive_release(struct inode *inode, struct file *file)
-+{
-+      struct  video_device *vfl = get_vd(MINOR(inode->i_rdev));
-+      vfl->users--;
-+      return 0;
-+}
-+
-+int
-+video_usercopy(struct inode *inode, struct file *file,
-+             unsigned int cmd, unsigned long arg,
-+             int (*func)(struct inode *inode, struct file *file,
-+                         unsigned int cmd, void *arg))
-+{
-+      char    sbuf[128];
-+      void    *mbuf = NULL;
-+      void    *parg = NULL;
-+      int     err  = -EINVAL;
-+
-+      //      cmd = video_fix_command(cmd);
-+
-+      /*  Copy arguments into temp kernel buffer  */
-+      switch (_IOC_DIR(cmd)) {
-+      case _IOC_NONE:
-+              parg = (void *)arg;
-+              break;
-+      case _IOC_READ:
-+      case _IOC_WRITE:
-+      case (_IOC_WRITE | _IOC_READ):
-+              if (_IOC_SIZE(cmd) <= sizeof(sbuf)) {
-+                      parg = sbuf;
-+              } else {
-+                      /* too big to allocate from stack */
-+                      mbuf = kmalloc(_IOC_SIZE(cmd),GFP_KERNEL);
-+                      if (NULL == mbuf)
-+                              return -ENOMEM;
-+                      parg = mbuf;
-+              }
-+              
-+              err = -EFAULT;
-+              if (_IOC_DIR(cmd) & _IOC_WRITE)
-+                      if (copy_from_user(parg, (void *)arg, _IOC_SIZE(cmd)))
-+                              goto out;
-+              break;
-+      }
-+
-+      /* call driver */
-+      err = func(inode, file, cmd, parg);
-+      if (err == -ENOIOCTLCMD)
-+              err = -EINVAL;
-+      if (err < 0)
-+              goto out;
-+
-+      /*  Copy results into user buffer  */
-+      switch (_IOC_DIR(cmd))
-+      {
-+      case _IOC_READ:
-+      case (_IOC_WRITE | _IOC_READ):
-+              if (copy_to_user((void *)arg, parg, _IOC_SIZE(cmd)))
-+                      err = -EFAULT;
-+              break;
-+      }
-+
-+out:
-+      if (mbuf)
-+              kfree(mbuf);
-+      return err;
-+}
-+
-+
-+static struct file_operations video_fops=
-+{
-+      .owner          = THIS_MODULE,
-+      .llseek         = no_llseek,
-+      .open           = video_open,
-+      .release        = video_release,
-+};
-+
-+static struct miscdevice codec_dev = {
-+      minor: CODEC_MINOR,
-+      name : "codec",
-+      fops : &video_fops
-+};
-+
-+static struct miscdevice preview_dev = {
-+      minor: PREVIEW_MINOR,
-+      name : "preview",
-+      fops : &video_fops
-+};
-+
-+
-+/**
-+ *    video_register_device - register video4linux devices
-+ *    @vfd:  video device structure we want to register
-+ *    @type: type of device to register
-+ *    @nr:   minor number 
-+ *    
-+ *    Zero is returned on success.
-+ *      type : ignored.
-+ *      nr : 
-+ *           0 Codec index
-+ *           1 Preview index
-+ */
-+int video_register_device(struct video_device *vfd, int type, int nr)
-+{
-+      int ret=0;
-+
-+      /* pick a minor number */
-+      down(&videodev_lock);
-+      set_vd (vfd, nr);
-+      vfd->minor=nr;
-+      up(&videodev_lock);
-+
-+      switch (vfd->minor) {
-+              case CODEC_MINOR:
-+                      ret = misc_register(&codec_dev);
-+                      if (ret) {
-+                              printk(KERN_ERR 
-+                                              "can't misc_register : codec on minor=%d\n", CODEC_MINOR);
-+                              panic(" Give me misc codec \n");
-+                      }
-+                      break;
-+              case PREVIEW_MINOR:
-+                      ret = misc_register(&preview_dev);
-+                      if (ret) {
-+                              printk(KERN_ERR 
-+                                              "can't misc_register (preview) on minor=%d\n", PREVIEW_MINOR);
-+                              panic(" Give me misc codec \n");
-+                      }
-+                      break;
-+      }
-+
-+#if 0 /* needed until all drivers are fixed */
-+      if (!vfd->release)
-+              printk(KERN_WARNING "videodev: \"%s\" has no release callback. "
-+                              "Please fix your driver for proper sysfs support, see "
-+                              "http://lwn.net/Articles/36850/\n", vfd->name);
-+#endif
-+      return 0;
-+}
-+
-+/**
-+ *    video_unregister_device - unregister a video4linux device
-+ *    @vfd: the device to unregister
-+ *
-+ *    This unregisters the passed device and deassigns the minor
-+ *    number. Future open calls will be met with errors.
-+ */
-+ 
-+void video_unregister_device(struct video_device *vfd)
-+{
-+      down(&videodev_lock);
-+
-+      if(get_vd(vfd->minor)!=vfd)
-+              panic("videodev: bad unregister");
-+
-+      if (vfd->minor== CODEC_MINOR)
-+              misc_deregister(&codec_dev);
-+      else
-+              misc_deregister(&preview_dev);
-+      set_vd (NULL, vfd->minor);
-+      up(&videodev_lock);
-+}
-+
-+
-+/*
-+ *    Initialise video for linux
-+ */
-+ 
-+static int __init videodev_init(void)
-+{
-+//    printk(KERN_INFO "FIMC2.0 Built:"__DATE__" "__TIME__"\n%s\n",fimc_version);
-+      return 0;
-+}
-+
-+static void __exit videodev_exit(void)
-+{
-+}
-+
-+module_init(videodev_init)
-+module_exit(videodev_exit)
-+
-+EXPORT_SYMBOL(video_register_device);
-+EXPORT_SYMBOL(fimc_version);
-+EXPORT_SYMBOL(video_unregister_device);
-+EXPORT_SYMBOL(video_usercopy);
-+EXPORT_SYMBOL(video_exclusive_open);
-+EXPORT_SYMBOL(video_exclusive_release);
-+
-+
-+MODULE_AUTHOR("SW.LEE <hitchcar@sec.samsung.com>");
-+MODULE_DESCRIPTION("VideoDev For FIMC2.0 MISC Drivers");
-+MODULE_LICENSE("GPL");
-+
-+
-+/*
-+ * Local variables:
-+ * c-basic-offset: 8
-+ * End:
-+ */
-diff --git a/arch/arm/mach-s3c2440/camera/videodev.h b/arch/arm/mach-s3c2440/camera/videodev.h
-new file mode 100644
-index 0000000..f12db43
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/videodev.h
-@@ -0,0 +1,110 @@
-+#ifndef __LINUX_S3C_VIDEODEV_H
-+#define __LINUX_S3C_VIDEODEV_H
-+
-+#include <linux/types.h>
-+#include <linux/version.h>
-+#include "videodev2.h"
-+
-+
-+struct video_device
-+{
-+      /* device info */
-+      //      struct device *dev;
-+      char name[32];
-+      int type;       /* v4l1 */
-+      int type2;      /* v4l2 */
-+      int hardware;
-+      int minor;
-+
-+      /* device ops + callbacks */
-+      struct file_operations *fops;
-+      void (*release)(struct video_device *vfd);
-+
-+
-+#if 1 /* to be removed in 2.7.x */
-+      /* obsolete -- fops->owner is used instead */
-+      struct module *owner;
-+      /* dev->driver_data will be used instead some day.
-+       * Use the video_{get|set}_drvdata() helper functions,
-+       * so the switch over will be transparent for you.
-+       * Or use {pci|usb}_{get|set}_drvdata() directly. */
-+      void *priv;
-+#endif
-+
-+      /* for videodev.c intenal usage -- please don't touch */
-+      int users;                     /* video_exclusive_{open|close} ... */
-+      struct semaphore lock;         /* ... helper function uses these   */
-+      char devfs_name[64];           /* devfs */
-+      //      struct class_device class_dev; /* sysfs */
-+};
-+
-+#define VIDEO_MAJOR   81
-+
-+#define VFL_TYPE_GRABBER      0
-+
-+
-+extern int video_register_device(struct video_device *, int type, int nr);
-+extern void video_unregister_device(struct video_device *);
-+extern struct video_device* video_devdata(struct file*);
-+
-+
-+
-+struct video_picture
-+{
-+        __u16   brightness;
-+        __u16   hue;
-+        __u16   colour;
-+        __u16   contrast;
-+        __u16   whiteness;      /* Black and white only */
-+        __u16   depth;          /* Capture depth */
-+        __u16   palette;        /* Palette in use */
-+#define VIDEO_PALETTE_GREY      1       /* Linear greyscale */
-+#define VIDEO_PALETTE_HI240     2       /* High 240 cube (BT848) */
-+#define VIDEO_PALETTE_RGB565    3       /* 565 16 bit RGB */
-+#define VIDEO_PALETTE_RGB24     4       /* 24bit RGB */
-+#define VIDEO_PALETTE_RGB32     5       /* 32bit RGB */
-+#define VIDEO_PALETTE_RGB555    6       /* 555 15bit RGB */
-+#define VIDEO_PALETTE_YUV422    7       /* YUV422 capture */
-+#define VIDEO_PALETTE_YUYV      8
-+#define VIDEO_PALETTE_UYVY      9       /* The great thing about standards is ... */
-+#define VIDEO_PALETTE_YUV420    10
-+#define VIDEO_PALETTE_YUV411    11      /* YUV411 capture */
-+#define VIDEO_PALETTE_RAW       12      /* RAW capture (BT848) */
-+#define VIDEO_PALETTE_YUV422P   13      /* YUV 4:2:2 Planar */
-+#define VIDEO_PALETTE_YUV411P   14      /* YUV 4:1:1 Planar */
-+#define VIDEO_PALETTE_YUV420P   15      /* YUV 4:2:0 Planar */
-+#define VIDEO_PALETTE_YUV410P   16      /* YUV 4:1:0 Planar */
-+#define VIDEO_PALETTE_PLANAR    13      /* start of planar entries */
-+#define VIDEO_PALETTE_COMPONENT 7       /* start of component entries */
-+};
-+
-+extern int video_exclusive_open(struct inode *inode, struct file *file);
-+extern int video_exclusive_release(struct inode *inode, struct file *file);
-+extern int video_usercopy(struct inode *inode, struct file *file,
-+                          unsigned int cmd, unsigned long arg,
-+                          int (*func)(struct inode *inode, struct file *file,
-+                                      unsigned int cmd, void *arg));
-+
-+
-+
-+                                                                                                          
-+#define VID_TYPE_CAPTURE        1       /* Can capture */
-+#define VID_TYPE_CLIPPING       32      /* Can clip */
-+#define VID_TYPE_FRAMERAM       64      /* Uses the frame buffer memory */
-+#define VID_TYPE_SCALES         128     /* Scalable */
-+#define VID_TYPE_SUBCAPTURE     512     /* Can capture subareas of the image */
-+
-+
-+
-+#define VID_HARDWARE_SAMSUNG_FIMC  255    
-+
-+
-+
-+#endif 
-+
-+
-+/*
-+ * Local variables:
-+ * c-basic-offset: 8
-+ * End:
-+ */
-diff --git a/arch/arm/mach-s3c2440/camera/videodev2.h b/arch/arm/mach-s3c2440/camera/videodev2.h
-new file mode 100644
-index 0000000..1bfc45a
---- /dev/null
-+++ b/arch/arm/mach-s3c2440/camera/videodev2.h
-@@ -0,0 +1,938 @@
-+#ifndef __LINUX_VIDEODEV2_H
-+#define __LINUX_VIDEODEV2_H
-+/*
-+ *    Video for Linux Two
-+ *
-+ *    Header file for v4l or V4L2 drivers and applications, for
-+ *    Linux kernels 2.2.x or 2.4.x.
-+ *
-+ *    See http://bytesex.org/v4l/ for API specs and other
-+ *    v4l2 documentation.
-+ *
-+ *    Author: Bill Dirks <bdirks@pacbell.net>
-+ *            Justin Schoeman
-+ *            et al.
-+ */
-+#ifdef __KERNEL__
-+#include <linux/time.h> /* need struct timeval */
-+#endif
-+
-+/*
-+ *    M I S C E L L A N E O U S
-+ */
-+
-+/*  Four-character-code (FOURCC) */
-+#define v4l2_fourcc(a,b,c,d)\
-+        (((__u32)(a)<<0)|((__u32)(b)<<8)|((__u32)(c)<<16)|((__u32)(d)<<24))
-+
-+/*
-+ *    E N U M S
-+ */
-+enum v4l2_field {
-+      V4L2_FIELD_ANY        = 0, /* driver can choose from none,
-+                                    top, bottom, interlaced
-+                                    depending on whatever it thinks
-+                                    is approximate ... */
-+      V4L2_FIELD_NONE       = 1, /* this device has no fields ... */
-+      V4L2_FIELD_TOP        = 2, /* top field only */
-+      V4L2_FIELD_BOTTOM     = 3, /* bottom field only */
-+      V4L2_FIELD_INTERLACED = 4, /* both fields interlaced */
-+      V4L2_FIELD_SEQ_TB     = 5, /* both fields sequential into one
-+                                    buffer, top-bottom order */
-+      V4L2_FIELD_SEQ_BT     = 6, /* same as above + bottom-top order */
-+      V4L2_FIELD_ALTERNATE  = 7, /* both fields alternating into
-+                                    separate buffers */
-+};
-+#define V4L2_FIELD_HAS_TOP(field)     \
-+      ((field) == V4L2_FIELD_TOP      ||\
-+       (field) == V4L2_FIELD_INTERLACED ||\
-+       (field) == V4L2_FIELD_SEQ_TB   ||\
-+       (field) == V4L2_FIELD_SEQ_BT)
-+#define V4L2_FIELD_HAS_BOTTOM(field)  \
-+      ((field) == V4L2_FIELD_BOTTOM   ||\
-+       (field) == V4L2_FIELD_INTERLACED ||\
-+       (field) == V4L2_FIELD_SEQ_TB   ||\
-+       (field) == V4L2_FIELD_SEQ_BT)
-+#define V4L2_FIELD_HAS_BOTH(field)    \
-+      ((field) == V4L2_FIELD_INTERLACED ||\
-+       (field) == V4L2_FIELD_SEQ_TB   ||\
-+       (field) == V4L2_FIELD_SEQ_BT)
-+
-+enum v4l2_buf_type {
-+      V4L2_BUF_TYPE_VIDEO_CAPTURE  = 1,
-+      V4L2_BUF_TYPE_VIDEO_OUTPUT   = 2,
-+      V4L2_BUF_TYPE_VIDEO_OVERLAY  = 3,
-+      V4L2_BUF_TYPE_VBI_CAPTURE    = 4,
-+      V4L2_BUF_TYPE_VBI_OUTPUT     = 5,
-+      V4L2_BUF_TYPE_PRIVATE        = 0x80,
-+};
-+
-+enum v4l2_ctrl_type {
-+      V4L2_CTRL_TYPE_INTEGER       = 1,
-+      V4L2_CTRL_TYPE_BOOLEAN       = 2,
-+      V4L2_CTRL_TYPE_MENU          = 3,
-+      V4L2_CTRL_TYPE_BUTTON        = 4,
-+};
-+
-+enum v4l2_tuner_type {
-+      V4L2_TUNER_RADIO             = 1,
-+      V4L2_TUNER_ANALOG_TV         = 2,
-+};
-+
-+enum v4l2_memory {
-+      V4L2_MEMORY_MMAP             = 1,
-+      V4L2_MEMORY_USERPTR          = 2,
-+      V4L2_MEMORY_OVERLAY          = 3,
-+};
-+
-+/* see also http://vektor.theorem.ca/graphics/ycbcr/ */
-+enum v4l2_colorspace {
-+      /* ITU-R 601 -- broadcast NTSC/PAL */
-+      V4L2_COLORSPACE_SMPTE170M     = 1,
-+
-+      /* 1125-Line (US) HDTV */
-+      V4L2_COLORSPACE_SMPTE240M     = 2,
-+
-+      /* HD and modern captures. */
-+      V4L2_COLORSPACE_REC709        = 3,
-+      
-+      /* broken BT878 extents (601, luma range 16-253 instead of 16-235) */
-+      V4L2_COLORSPACE_BT878         = 4,
-+      
-+      /* These should be useful.  Assume 601 extents. */
-+      V4L2_COLORSPACE_470_SYSTEM_M  = 5,
-+      V4L2_COLORSPACE_470_SYSTEM_BG = 6,
-+      
-+      /* I know there will be cameras that send this.  So, this is
-+       * unspecified chromaticities and full 0-255 on each of the
-+       * Y'CbCr components
-+       */
-+      V4L2_COLORSPACE_JPEG          = 7,
-+      
-+      /* For RGB colourspaces, this is probably a good start. */
-+      V4L2_COLORSPACE_SRGB          = 8,
-+};
-+
-+enum v4l2_priority {
-+      V4L2_PRIORITY_UNSET       = 0,  /* not initialized */
-+      V4L2_PRIORITY_BACKGROUND  = 1,
-+      V4L2_PRIORITY_INTERACTIVE = 2,
-+      V4L2_PRIORITY_RECORD      = 3,
-+      V4L2_PRIORITY_DEFAULT     = V4L2_PRIORITY_INTERACTIVE,
-+};
-+
-+struct v4l2_rect {
-+      __s32   left;
-+      __s32   top;
-+      __s32   width;
-+      __s32   height;
-+};
-+
-+struct v4l2_fract {
-+      __u32   numerator;
-+      __u32   denominator;
-+};
-+
-+/*
-+ *    D R I V E R   C A P A B I L I T I E S
-+ */
-+struct v4l2_capability
-+{
-+      __u8    driver[16];     /* i.e. "bttv" */
-+      __u8    card[32];       /* i.e. "Hauppauge WinTV" */
-+      __u8    bus_info[32];   /* "PCI:" + pci_name(pci_dev) */
-+      __u32   version;        /* should use KERNEL_VERSION() */
-+      __u32   capabilities;   /* Device capabilities */
-+      __u32   reserved[4];
-+};
-+
-+/* Values for 'capabilities' field */
-+#define V4L2_CAP_VIDEO_CAPTURE        0x00000001  /* Is a video capture device */
-+#define V4L2_CAP_VIDEO_OUTPUT 0x00000002  /* Is a video output device */
-+#define V4L2_CAP_VIDEO_OVERLAY        0x00000004  /* Can do video overlay */
-+#define V4L2_CAP_VBI_CAPTURE  0x00000010  /* Is a VBI capture device */
-+#define V4L2_CAP_VBI_OUTPUT   0x00000020  /* Is a VBI output device */
-+#define V4L2_CAP_RDS_CAPTURE  0x00000100  /* RDS data capture */
-+
-+#define V4L2_CAP_TUNER                0x00010000  /* has a tuner */
-+#define V4L2_CAP_AUDIO                0x00020000  /* has audio support */
-+#define V4L2_CAP_RADIO                0x00040000  /* is a radio device */
-+
-+#define V4L2_CAP_READWRITE      0x01000000  /* read/write systemcalls */
-+#define V4L2_CAP_ASYNCIO        0x02000000  /* async I/O */
-+#define V4L2_CAP_STREAMING      0x04000000  /* streaming I/O ioctls */
-+
-+/*
-+ *    V I D E O   I M A G E   F O R M A T
-+ */
-+
-+struct v4l2_pix_format
-+{
-+      __u32                   width;
-+      __u32                   height;
-+      __u32                   pixelformat;
-+      enum v4l2_field         field;
-+      __u32                   bytesperline;   /* for padding, zero if unused */
-+      __u32                   sizeimage;
-+        enum v4l2_colorspace  colorspace;
-+      __u32                   priv;           /* private data, depends on pixelformat */
-+};
-+
-+/*           Pixel format    FOURCC                  depth  Description   */
-+#define V4L2_PIX_FMT_RGB332  v4l2_fourcc('R','G','B','1') /*  8  RGB-3-3-2     */
-+#define V4L2_PIX_FMT_RGB555  v4l2_fourcc('R','G','B','O') /* 16  RGB-5-5-5     */
-+#define V4L2_PIX_FMT_RGB565  v4l2_fourcc('R','G','B','P') /* 16  RGB-5-6-5     */
-+#define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R','G','B','Q') /* 16  RGB-5-5-5 BE  */
-+#define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R','G','B','R') /* 16  RGB-5-6-5 BE  */
-+#define V4L2_PIX_FMT_BGR24   v4l2_fourcc('B','G','R','3') /* 24  BGR-8-8-8     */
-+#define V4L2_PIX_FMT_RGB24   v4l2_fourcc('R','G','B','3') /* 24  RGB-8-8-8     */
-+#define V4L2_PIX_FMT_BGR32   v4l2_fourcc('B','G','R','4') /* 32  BGR-8-8-8-8   */
-+#define V4L2_PIX_FMT_RGB32   v4l2_fourcc('R','G','B','4') /* 32  RGB-8-8-8-8   */
-+#define V4L2_PIX_FMT_GREY    v4l2_fourcc('G','R','E','Y') /*  8  Greyscale     */
-+#define V4L2_PIX_FMT_YVU410  v4l2_fourcc('Y','V','U','9') /*  9  YVU 4:1:0     */
-+#define V4L2_PIX_FMT_YVU420  v4l2_fourcc('Y','V','1','2') /* 12  YVU 4:2:0     */
-+#define V4L2_PIX_FMT_YUYV    v4l2_fourcc('Y','U','Y','V') /* 16  YUV 4:2:2     */
-+#define V4L2_PIX_FMT_UYVY    v4l2_fourcc('U','Y','V','Y') /* 16  YUV 4:2:2     */
-+#define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4','2','2','P') /* 16  YVU422 planar */
-+#define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4','1','1','P') /* 16  YVU411 planar */
-+#define V4L2_PIX_FMT_Y41P    v4l2_fourcc('Y','4','1','P') /* 12  YUV 4:1:1     */
-+
-+/* two planes -- one Y, one Cr + Cb interleaved  */
-+#define V4L2_PIX_FMT_NV12    v4l2_fourcc('N','V','1','2') /* 12  Y/CbCr 4:2:0  */
-+#define V4L2_PIX_FMT_NV21    v4l2_fourcc('N','V','2','1') /* 12  Y/CrCb 4:2:0  */
-+
-+/*  The following formats are not defined in the V4L2 specification */
-+#define V4L2_PIX_FMT_YUV410  v4l2_fourcc('Y','U','V','9') /*  9  YUV 4:1:0     */
-+#define V4L2_PIX_FMT_YUV420  v4l2_fourcc('Y','U','1','2') /* 12  YUV 4:2:0     */
-+#define V4L2_PIX_FMT_YYUV    v4l2_fourcc('Y','Y','U','V') /* 16  YUV 4:2:2     */
-+#define V4L2_PIX_FMT_HI240   v4l2_fourcc('H','I','2','4') /*  8  8-bit color   */
-+
-+/* compressed formats */
-+#define V4L2_PIX_FMT_MJPEG    v4l2_fourcc('M','J','P','G') /* Motion-JPEG   */
-+#define V4L2_PIX_FMT_JPEG     v4l2_fourcc('J','P','E','G') /* JFIF JPEG     */
-+#define V4L2_PIX_FMT_DV       v4l2_fourcc('d','v','s','d') /* 1394          */
-+#define V4L2_PIX_FMT_MPEG     v4l2_fourcc('M','P','E','G') /* MPEG          */
-+
-+/*  Vendor-specific formats   */
-+#define V4L2_PIX_FMT_WNVA     v4l2_fourcc('W','N','V','A') /* Winnov hw compress */
-+
-+/*
-+ *    F O R M A T   E N U M E R A T I O N
-+ */
-+struct v4l2_fmtdesc
-+{
-+      __u32               index;             /* Format number      */
-+      enum v4l2_buf_type  type;              /* buffer type        */
-+      __u32               flags;
-+      __u8                description[32];   /* Description string */
-+      __u32               pixelformat;       /* Format fourcc      */
-+      __u32               reserved[4];
-+};
-+
-+#define V4L2_FMT_FLAG_COMPRESSED 0x0001
-+
-+
-+/*
-+ *    T I M E C O D E
-+ */
-+struct v4l2_timecode
-+{
-+      __u32   type;
-+      __u32   flags;
-+      __u8    frames;
-+      __u8    seconds;
-+      __u8    minutes;
-+      __u8    hours;
-+      __u8    userbits[4];
-+};
-+
-+/*  Type  */
-+#define V4L2_TC_TYPE_24FPS            1
-+#define V4L2_TC_TYPE_25FPS            2
-+#define V4L2_TC_TYPE_30FPS            3
-+#define V4L2_TC_TYPE_50FPS            4
-+#define V4L2_TC_TYPE_60FPS            5
-+
-+/*  Flags  */
-+#define V4L2_TC_FLAG_DROPFRAME                0x0001 /* "drop-frame" mode */
-+#define V4L2_TC_FLAG_COLORFRAME               0x0002
-+#define V4L2_TC_USERBITS_field                0x000C
-+#define V4L2_TC_USERBITS_USERDEFINED  0x0000
-+#define V4L2_TC_USERBITS_8BITCHARS    0x0008
-+/* The above is based on SMPTE timecodes */
-+
-+
-+/*
-+ *    C O M P R E S S I O N   P A R A M E T E R S
-+ */
-+#if 0
-+/* ### generic compression settings don't work, there is too much
-+ * ### codec-specific stuff.  Maybe reuse that for MPEG codec settings
-+ * ### later ... */
-+struct v4l2_compression
-+{
-+      __u32   quality;
-+      __u32   keyframerate;
-+      __u32   pframerate;
-+      __u32   reserved[5];
-+
-+/*  what we'll need for MPEG, extracted from some postings on
-+    the v4l list (Gert Vervoort, PlasmaJohn).
-+
-+system stream:
-+  - type: elementary stream(ES), packatised elementary stream(s) (PES)
-+    program stream(PS), transport stream(TS)
-+  - system bitrate
-+  - PS packet size (DVD: 2048 bytes, VCD: 2324 bytes)
-+  - TS video PID
-+  - TS audio PID
-+  - TS PCR PID
-+  - TS system information tables (PAT, PMT, CAT, NIT and SIT)
-+  - (MPEG-1 systems stream vs. MPEG-2 program stream (TS not supported
-+    by MPEG-1 systems)
-+
-+audio:
-+  - type: MPEG (+Layer I,II,III), AC-3, LPCM
-+  - bitrate
-+  - sampling frequency (DVD: 48 Khz, VCD: 44.1 KHz, 32 kHz)
-+  - Trick Modes? (ff, rew)
-+  - Copyright
-+  - Inverse Telecine
-+
-+video:
-+  - picturesize (SIF, 1/2 D1, 2/3 D1, D1) and PAL/NTSC norm can be set
-+    through excisting V4L2 controls
-+  - noise reduction, parameters encoder specific?
-+  - MPEG video version: MPEG-1, MPEG-2
-+  - GOP (Group Of Pictures) definition:
-+    - N: number of frames per GOP
-+    - M: distance between reference (I,P) frames
-+    - open/closed GOP
-+  - quantiser matrix: inter Q matrix (64 bytes) and intra Q matrix (64 bytes)
-+  - quantiser scale: linear or logarithmic
-+  - scanning: alternate or zigzag
-+  - bitrate mode: CBR (constant bitrate) or VBR (variable bitrate).
-+  - target video bitrate for CBR
-+  - target video bitrate for VBR
-+  - maximum video bitrate for VBR - min. quantiser value for VBR
-+  - max. quantiser value for VBR
-+  - adaptive quantisation value
-+  - return the number of bytes per GOP or bitrate for bitrate monitoring
-+
-+*/
-+};
-+#endif
-+
-+struct v4l2_jpegcompression
-+{
-+      int quality;
-+
-+      int  APPn;              /* Number of APP segment to be written,
-+                               * must be 0..15 */
-+      int  APP_len;           /* Length of data in JPEG APPn segment */
-+      char APP_data[60];      /* Data in the JPEG APPn segment. */
-+      
-+      int  COM_len;           /* Length of data in JPEG COM segment */
-+      char COM_data[60];      /* Data in JPEG COM segment */
-+      
-+      __u32 jpeg_markers;     /* Which markers should go into the JPEG
-+                               * output. Unless you exactly know what
-+                               * you do, leave them untouched.
-+                               * Inluding less markers will make the
-+                               * resulting code smaller, but there will
-+                               * be fewer aplications which can read it.
-+                               * The presence of the APP and COM marker
-+                               * is influenced by APP_len and COM_len
-+                               * ONLY, not by this property! */
-+      
-+#define V4L2_JPEG_MARKER_DHT (1<<3)    /* Define Huffman Tables */
-+#define V4L2_JPEG_MARKER_DQT (1<<4)    /* Define Quantization Tables */
-+#define V4L2_JPEG_MARKER_DRI (1<<5)    /* Define Restart Interval */
-+#define V4L2_JPEG_MARKER_COM (1<<6)    /* Comment segment */
-+#define V4L2_JPEG_MARKER_APP (1<<7)    /* App segment, driver will
-+                                        * allways use APP0 */
-+};
-+
-+
-+/*
-+ *    M E M O R Y - M A P P I N G   B U F F E R S
-+ */
-+struct v4l2_requestbuffers
-+{
-+      __u32                   count;
-+      enum v4l2_buf_type      type;
-+      enum v4l2_memory        memory;
-+      __u32                   reserved[2];
-+};
-+
-+struct v4l2_buffer
-+{
-+      __u32                   index;
-+      enum v4l2_buf_type      type;
-+      __u32                   bytesused;
-+      __u32                   flags;
-+      enum v4l2_field         field;
-+      struct timeval          timestamp;
-+      struct v4l2_timecode    timecode;
-+      __u32                   sequence;
-+
-+      /* memory location */
-+      enum v4l2_memory        memory;
-+      union {
-+              __u32           offset;
-+              unsigned long   userptr;
-+      } m;
-+      __u32                   length;
-+
-+      __u32                   reserved[2];
-+};
-+
-+/*  Flags for 'flags' field */
-+#define V4L2_BUF_FLAG_MAPPED  0x0001  /* Buffer is mapped (flag) */
-+#define V4L2_BUF_FLAG_QUEUED  0x0002  /* Buffer is queued for processing */
-+#define V4L2_BUF_FLAG_DONE    0x0004  /* Buffer is ready */
-+#define V4L2_BUF_FLAG_KEYFRAME        0x0008  /* Image is a keyframe (I-frame) */
-+#define V4L2_BUF_FLAG_PFRAME  0x0010  /* Image is a P-frame */
-+#define V4L2_BUF_FLAG_BFRAME  0x0020  /* Image is a B-frame */
-+#define V4L2_BUF_FLAG_TIMECODE        0x0100  /* timecode field is valid */
-+
-+/*
-+ *    O V E R L A Y   P R E V I E W
-+ */
-+struct v4l2_framebuffer
-+{
-+      __u32                   capability;
-+      __u32                   flags;
-+/* FIXME: in theory we should pass something like PCI device + memory
-+ * region + offset instead of some physical address */
-+      void*                   base;
-+      struct v4l2_pix_format  fmt;
-+};
-+/*  Flags for the 'capability' field. Read only */
-+#define V4L2_FBUF_CAP_EXTERNOVERLAY   0x0001
-+#define V4L2_FBUF_CAP_CHROMAKEY               0x0002
-+#define V4L2_FBUF_CAP_LIST_CLIPPING     0x0004
-+#define V4L2_FBUF_CAP_BITMAP_CLIPPING 0x0008
-+/*  Flags for the 'flags' field. */
-+#define V4L2_FBUF_FLAG_PRIMARY                0x0001
-+#define V4L2_FBUF_FLAG_OVERLAY                0x0002
-+#define V4L2_FBUF_FLAG_CHROMAKEY      0x0004
-+
-+struct v4l2_clip
-+{
-+      struct v4l2_rect        c;
-+      struct v4l2_clip        *next;
-+};
-+
-+struct v4l2_window
-+{
-+      struct v4l2_rect        w;
-+      enum v4l2_field         field;
-+      __u32                   chromakey;
-+      struct v4l2_clip        *clips;
-+      __u32                   clipcount;
-+      void                    *bitmap;
-+};
-+
-+
-+/*
-+ *    C A P T U R E   P A R A M E T E R S
-+ */
-+struct v4l2_captureparm
-+{
-+      __u32              capability;    /*  Supported modes */
-+      __u32              capturemode;   /*  Current mode */
-+      struct v4l2_fract  timeperframe;  /*  Time per frame in .1us units */
-+      __u32              extendedmode;  /*  Driver-specific extensions */
-+      __u32              readbuffers;   /*  # of buffers for read */
-+      __u32              reserved[4];
-+};
-+/*  Flags for 'capability' and 'capturemode' fields */
-+#define V4L2_MODE_HIGHQUALITY 0x0001  /*  High quality imaging mode */
-+#define V4L2_CAP_TIMEPERFRAME 0x1000  /*  timeperframe field is supported */
-+
-+struct v4l2_outputparm
-+{
-+      __u32              capability;   /*  Supported modes */
-+      __u32              outputmode;   /*  Current mode */
-+      struct v4l2_fract  timeperframe; /*  Time per frame in seconds */
-+      __u32              extendedmode; /*  Driver-specific extensions */
-+      __u32              writebuffers; /*  # of buffers for write */
-+      __u32              reserved[4];
-+};
-+
-+/*
-+ *    I N P U T   I M A G E   C R O P P I N G
-+ */
-+
-+struct v4l2_cropcap {
-+      enum v4l2_buf_type      type;   
-+        struct v4l2_rect        bounds;
-+        struct v4l2_rect        defrect;
-+        struct v4l2_fract       pixelaspect;
-+};
-+
-+struct v4l2_crop {
-+      enum v4l2_buf_type      type;
-+      struct v4l2_rect        c;
-+};
-+
-+/*
-+ *      A N A L O G   V I D E O   S T A N D A R D
-+ */
-+
-+typedef __u64 v4l2_std_id;
-+
-+/* one bit for each */
-+#define V4L2_STD_PAL_B          ((v4l2_std_id)0x00000001)
-+#define V4L2_STD_PAL_B1         ((v4l2_std_id)0x00000002)
-+#define V4L2_STD_PAL_G          ((v4l2_std_id)0x00000004)
-+#define V4L2_STD_PAL_H          ((v4l2_std_id)0x00000008)
-+#define V4L2_STD_PAL_I          ((v4l2_std_id)0x00000010)
-+#define V4L2_STD_PAL_D          ((v4l2_std_id)0x00000020)
-+#define V4L2_STD_PAL_D1         ((v4l2_std_id)0x00000040)
-+#define V4L2_STD_PAL_K          ((v4l2_std_id)0x00000080)
-+
-+#define V4L2_STD_PAL_M          ((v4l2_std_id)0x00000100)
-+#define V4L2_STD_PAL_N          ((v4l2_std_id)0x00000200)
-+#define V4L2_STD_PAL_Nc         ((v4l2_std_id)0x00000400)
-+#define V4L2_STD_PAL_60         ((v4l2_std_id)0x00000800)
-+
-+#define V4L2_STD_NTSC_M         ((v4l2_std_id)0x00001000)
-+#define V4L2_STD_NTSC_M_JP      ((v4l2_std_id)0x00002000)
-+
-+#define V4L2_STD_SECAM_B        ((v4l2_std_id)0x00010000)
-+#define V4L2_STD_SECAM_D        ((v4l2_std_id)0x00020000)
-+#define V4L2_STD_SECAM_G        ((v4l2_std_id)0x00040000)
-+#define V4L2_STD_SECAM_H        ((v4l2_std_id)0x00080000)
-+#define V4L2_STD_SECAM_K        ((v4l2_std_id)0x00100000)
-+#define V4L2_STD_SECAM_K1       ((v4l2_std_id)0x00200000)
-+#define V4L2_STD_SECAM_L        ((v4l2_std_id)0x00400000)
-+
-+/* ATSC/HDTV */
-+#define V4L2_STD_ATSC_8_VSB     ((v4l2_std_id)0x01000000)
-+#define V4L2_STD_ATSC_16_VSB    ((v4l2_std_id)0x02000000)
-+
-+/* some common needed stuff */
-+#define V4L2_STD_PAL_BG               (V4L2_STD_PAL_B         |\
-+                               V4L2_STD_PAL_B1        |\
-+                               V4L2_STD_PAL_G)
-+#define V4L2_STD_PAL_DK               (V4L2_STD_PAL_D         |\
-+                               V4L2_STD_PAL_D1        |\
-+                               V4L2_STD_PAL_K)
-+#define V4L2_STD_PAL          (V4L2_STD_PAL_BG        |\
-+                               V4L2_STD_PAL_DK        |\
-+                               V4L2_STD_PAL_H         |\
-+                               V4L2_STD_PAL_I)
-+#define V4L2_STD_NTSC           (V4L2_STD_NTSC_M      |\
-+                               V4L2_STD_NTSC_M_JP)
-+#define V4L2_STD_SECAM                (V4L2_STD_SECAM_B       |\
-+                               V4L2_STD_SECAM_D       |\
-+                               V4L2_STD_SECAM_G       |\
-+                               V4L2_STD_SECAM_H       |\
-+                               V4L2_STD_SECAM_K       |\
-+                               V4L2_STD_SECAM_K1      |\
-+                               V4L2_STD_SECAM_L)
-+
-+#define V4L2_STD_525_60               (V4L2_STD_PAL_M         |\
-+                               V4L2_STD_PAL_60        |\
-+                               V4L2_STD_NTSC)
-+#define V4L2_STD_625_50               (V4L2_STD_PAL           |\
-+                               V4L2_STD_PAL_N         |\
-+                               V4L2_STD_PAL_Nc        |\
-+                               V4L2_STD_SECAM)
-+
-+#define V4L2_STD_UNKNOWN        0
-+#define V4L2_STD_ALL            (V4L2_STD_525_60      |\
-+                               V4L2_STD_625_50)
-+
-+struct v4l2_standard
-+{
-+      __u32                index;
-+      v4l2_std_id          id;
-+      __u8                 name[24];
-+      struct v4l2_fract    frameperiod; /* Frames, not fields */
-+      __u32                framelines;
-+      __u32                reserved[4];
-+};
-+
-+
-+/*
-+ *    V I D E O   I N P U T S
-+ */
-+struct v4l2_input
-+{
-+      __u32        index;             /*  Which input */
-+      __u8         name[32];          /*  Label */
-+      __u32        type;              /*  Type of input */
-+      __u32        audioset;          /*  Associated audios (bitfield) */
-+      __u32        tuner;             /*  Associated tuner */
-+      v4l2_std_id  std;
-+      __u32        status;
-+      __u32        reserved[4];
-+};
-+/*  Values for the 'type' field */
-+#define V4L2_INPUT_TYPE_TUNER         1
-+#define V4L2_INPUT_TYPE_CAMERA                2
-+
-+/* field 'status' - general */
-+#define V4L2_IN_ST_NO_POWER    0x00000001  /* Attached device is off */
-+#define V4L2_IN_ST_NO_SIGNAL   0x00000002
-+#define V4L2_IN_ST_NO_COLOR    0x00000004
-+
-+/* field 'status' - analog */
-+#define V4L2_IN_ST_NO_H_LOCK   0x00000100  /* No horizontal sync lock */
-+#define V4L2_IN_ST_COLOR_KILL  0x00000200  /* Color killer is active */
-+
-+/* field 'status' - digital */
-+#define V4L2_IN_ST_NO_SYNC     0x00010000  /* No synchronization lock */
-+#define V4L2_IN_ST_NO_EQU      0x00020000  /* No equalizer lock */
-+#define V4L2_IN_ST_NO_CARRIER  0x00040000  /* Carrier recovery failed */
-+
-+/* field 'status' - VCR and set-top box */
-+#define V4L2_IN_ST_MACROVISION 0x01000000  /* Macrovision detected */
-+#define V4L2_IN_ST_NO_ACCESS   0x02000000  /* Conditional access denied */
-+#define V4L2_IN_ST_VTR         0x04000000  /* VTR time constant */
-+
-+/*
-+ *    V I D E O   O U T P U T S
-+ */
-+struct v4l2_output
-+{
-+      __u32        index;             /*  Which output */
-+      __u8         name[32];          /*  Label */
-+      __u32        type;              /*  Type of output */
-+      __u32        audioset;          /*  Associated audios (bitfield) */
-+      __u32        modulator;         /*  Associated modulator */
-+      v4l2_std_id  std;
-+      __u32        reserved[4];
-+};
-+/*  Values for the 'type' field */
-+#define V4L2_OUTPUT_TYPE_MODULATOR            1
-+#define V4L2_OUTPUT_TYPE_ANALOG                       2
-+#define V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY     3
-+
-+/*
-+ *    C O N T R O L S
-+ */
-+struct v4l2_control
-+{
-+      __u32                id;
-+      __s32                value;
-+};
-+
-+/*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
-+struct v4l2_queryctrl
-+{
-+      __u32                id;
-+      enum v4l2_ctrl_type  type;
-+      __u8                 name[32];  /* Whatever */
-+      __s32                minimum;   /* Note signedness */
-+      __s32                maximum;
-+      __s32                step;
-+      __s32                default_value;
-+      __u32                flags;
-+      __u32                reserved[2];
-+};
-+
-+/*  Used in the VIDIOC_QUERYMENU ioctl for querying menu items */
-+struct v4l2_querymenu
-+{
-+      __u32           id;
-+      __u32           index;
-+      __u8            name[32];       /* Whatever */
-+      __u32           reserved;
-+};
-+
-+/*  Control flags  */
-+#define V4L2_CTRL_FLAG_DISABLED               0x0001
-+#define V4L2_CTRL_FLAG_GRABBED                0x0002
-+
-+/*  Control IDs defined by V4L2 */
-+#define V4L2_CID_BASE                 0x00980900
-+/*  IDs reserved for driver specific controls */
-+#define V4L2_CID_PRIVATE_BASE         0x08000000
-+
-+#define V4L2_CID_BRIGHTNESS           (V4L2_CID_BASE+0)
-+#define V4L2_CID_CONTRAST             (V4L2_CID_BASE+1)
-+#define V4L2_CID_SATURATION           (V4L2_CID_BASE+2)
-+#define V4L2_CID_HUE                  (V4L2_CID_BASE+3)
-+#define V4L2_CID_AUDIO_VOLUME         (V4L2_CID_BASE+5)
-+#define V4L2_CID_AUDIO_BALANCE                (V4L2_CID_BASE+6)
-+#define V4L2_CID_AUDIO_BASS           (V4L2_CID_BASE+7)
-+#define V4L2_CID_AUDIO_TREBLE         (V4L2_CID_BASE+8)
-+#define V4L2_CID_AUDIO_MUTE           (V4L2_CID_BASE+9)
-+#define V4L2_CID_AUDIO_LOUDNESS               (V4L2_CID_BASE+10)
-+#define V4L2_CID_BLACK_LEVEL          (V4L2_CID_BASE+11)
-+#define V4L2_CID_AUTO_WHITE_BALANCE   (V4L2_CID_BASE+12)
-+#define V4L2_CID_DO_WHITE_BALANCE     (V4L2_CID_BASE+13)
-+#define V4L2_CID_RED_BALANCE          (V4L2_CID_BASE+14)
-+#define V4L2_CID_BLUE_BALANCE         (V4L2_CID_BASE+15)
-+#define V4L2_CID_GAMMA                        (V4L2_CID_BASE+16)
-+#define V4L2_CID_WHITENESS            (V4L2_CID_GAMMA) /* ? Not sure */
-+#define V4L2_CID_EXPOSURE             (V4L2_CID_BASE+17)
-+#define V4L2_CID_AUTOGAIN             (V4L2_CID_BASE+18)
-+#define V4L2_CID_GAIN                 (V4L2_CID_BASE+19)
-+#define V4L2_CID_HFLIP                        (V4L2_CID_BASE+20)
-+#define V4L2_CID_VFLIP                        (V4L2_CID_BASE+21)
-+#define V4L2_CID_HCENTER              (V4L2_CID_BASE+22)
-+#define V4L2_CID_VCENTER              (V4L2_CID_BASE+23)
-+#define V4L2_CID_LASTP1                       (V4L2_CID_BASE+24) /* last CID + 1 */
-+
-+/*
-+ *    T U N I N G
-+ */
-+struct v4l2_tuner
-+{
-+      __u32                   index;
-+      __u8                    name[32];
-+      enum v4l2_tuner_type    type;
-+      __u32                   capability;
-+      __u32                   rangelow;
-+      __u32                   rangehigh;
-+      __u32                   rxsubchans;
-+      __u32                   audmode;
-+      __s32                   signal;
-+      __s32                   afc;
-+      __u32                   reserved[4];
-+};
-+
-+struct v4l2_modulator
-+{
-+      __u32                   index;
-+      __u8                    name[32];
-+      __u32                   capability;
-+      __u32                   rangelow;
-+      __u32                   rangehigh;
-+      __u32                   txsubchans;
-+      __u32                   reserved[4];
-+};
-+
-+/*  Flags for the 'capability' field */
-+#define V4L2_TUNER_CAP_LOW            0x0001
-+#define V4L2_TUNER_CAP_NORM           0x0002
-+#define V4L2_TUNER_CAP_STEREO         0x0010
-+#define V4L2_TUNER_CAP_LANG2          0x0020
-+#define V4L2_TUNER_CAP_SAP            0x0020
-+#define V4L2_TUNER_CAP_LANG1          0x0040
-+
-+/*  Flags for the 'rxsubchans' field */
-+#define V4L2_TUNER_SUB_MONO           0x0001
-+#define V4L2_TUNER_SUB_STEREO         0x0002
-+#define V4L2_TUNER_SUB_LANG2          0x0004
-+#define V4L2_TUNER_SUB_SAP            0x0004
-+#define V4L2_TUNER_SUB_LANG1          0x0008
-+
-+/*  Values for the 'audmode' field */
-+#define V4L2_TUNER_MODE_MONO          0x0000
-+#define V4L2_TUNER_MODE_STEREO                0x0001
-+#define V4L2_TUNER_MODE_LANG2         0x0002
-+#define V4L2_TUNER_MODE_SAP           0x0002
-+#define V4L2_TUNER_MODE_LANG1         0x0003
-+
-+struct v4l2_frequency
-+{
-+      __u32                 tuner;
-+      enum v4l2_tuner_type  type;
-+        __u32               frequency;
-+      __u32                 reserved[8];
-+};
-+
-+/*
-+ *    A U D I O
-+ */
-+struct v4l2_audio
-+{
-+      __u32   index;
-+      __u8    name[32];
-+      __u32   capability;
-+      __u32   mode;
-+      __u32   reserved[2];
-+};
-+/*  Flags for the 'capability' field */
-+#define V4L2_AUDCAP_STEREO            0x00001
-+#define V4L2_AUDCAP_AVL                       0x00002
-+
-+/*  Flags for the 'mode' field */
-+#define V4L2_AUDMODE_AVL              0x00001
-+
-+struct v4l2_audioout
-+{
-+      __u32   index;
-+      __u8    name[32];
-+      __u32   capability;
-+      __u32   mode;
-+      __u32   reserved[2];
-+};
-+
-+/*
-+ *    D A T A   S E R V I C E S   ( V B I )
-+ *
-+ *    Data services API by Michael Schimek
-+ */
-+
-+struct v4l2_vbi_format
-+{
-+      __u32   sampling_rate;          /* in 1 Hz */
-+      __u32   offset;
-+      __u32   samples_per_line;
-+      __u32   sample_format;          /* V4L2_PIX_FMT_* */
-+      __s32   start[2];
-+      __u32   count[2];
-+      __u32   flags;                  /* V4L2_VBI_* */
-+      __u32   reserved[2];            /* must be zero */
-+};
-+
-+/*  VBI flags  */
-+#define V4L2_VBI_UNSYNC               (1<< 0)
-+#define V4L2_VBI_INTERLACED   (1<< 1)
-+
-+
-+/*
-+ *    A G G R E G A T E   S T R U C T U R E S
-+ */
-+
-+/*    Stream data format
-+ */
-+struct v4l2_format
-+{
-+      enum v4l2_buf_type type;
-+      union
-+      {
-+              struct v4l2_pix_format  pix;  // V4L2_BUF_TYPE_VIDEO_CAPTURE
-+              struct v4l2_window      win;  // V4L2_BUF_TYPE_VIDEO_OVERLAY
-+              struct v4l2_vbi_format  vbi;  // V4L2_BUF_TYPE_VBI_CAPTURE
-+              __u8    raw_data[200];        // user-defined
-+      } fmt;
-+};
-+
-+
-+/*    Stream type-dependent parameters
-+ */
-+struct v4l2_streamparm
-+{
-+      enum v4l2_buf_type type;
-+      union
-+      {
-+              struct v4l2_captureparm capture;
-+              struct v4l2_outputparm  output;
-+              __u8    raw_data[200];  /* user-defined */
-+      } parm;
-+};
-+
-+
-+
-+/*
-+ *    I O C T L   C O D E S   F O R   V I D E O   D E V I C E S
-+ *
-+ */
-+#define VIDIOC_QUERYCAP               _IOR  ('V',  0, struct v4l2_capability)
-+#define VIDIOC_RESERVED               _IO   ('V',  1)
-+#define VIDIOC_ENUM_FMT         _IOWR ('V',  2, struct v4l2_fmtdesc)
-+#define VIDIOC_G_FMT          _IOWR ('V',  4, struct v4l2_format)
-+#define VIDIOC_S_FMT          _IOWR ('V',  5, struct v4l2_format)
-+#if 0
-+#define VIDIOC_G_COMP         _IOR  ('V',  6, struct v4l2_compression)
-+#define VIDIOC_S_COMP         _IOW  ('V',  7, struct v4l2_compression)
-+#endif
-+#define VIDIOC_REQBUFS                _IOWR ('V',  8, struct v4l2_requestbuffers)
-+#define VIDIOC_QUERYBUF               _IOWR ('V',  9, struct v4l2_buffer)
-+#define VIDIOC_G_FBUF         _IOR  ('V', 10, struct v4l2_framebuffer)
-+#define VIDIOC_S_FBUF         _IOW  ('V', 11, struct v4l2_framebuffer)
-+#define VIDIOC_OVERLAY                _IOW  ('V', 14, int)
-+#define VIDIOC_QBUF           _IOWR ('V', 15, struct v4l2_buffer)
-+#define VIDIOC_DQBUF          _IOWR ('V', 17, struct v4l2_buffer)
-+#define VIDIOC_STREAMON               _IOW  ('V', 18, int)
-+#define VIDIOC_STREAMOFF      _IOW  ('V', 19, int)
-+#define VIDIOC_G_PARM         _IOWR ('V', 21, struct v4l2_streamparm)
-+#define VIDIOC_S_PARM         _IOWR ('V', 22, struct v4l2_streamparm)
-+#define VIDIOC_G_STD          _IOR  ('V', 23, v4l2_std_id)
-+#define VIDIOC_S_STD          _IOW  ('V', 24, v4l2_std_id)
-+#define VIDIOC_ENUMSTD                _IOWR ('V', 25, struct v4l2_standard)
-+#define VIDIOC_ENUMINPUT      _IOWR ('V', 26, struct v4l2_input)
-+#define VIDIOC_G_CTRL         _IOWR ('V', 27, struct v4l2_control)
-+#define VIDIOC_S_CTRL         _IOWR ('V', 28, struct v4l2_control)
-+#define VIDIOC_G_TUNER                _IOWR ('V', 29, struct v4l2_tuner)
-+#define VIDIOC_S_TUNER                _IOW  ('V', 30, struct v4l2_tuner)
-+#define VIDIOC_G_AUDIO                _IOR  ('V', 33, struct v4l2_audio)
-+#define VIDIOC_S_AUDIO                _IOW  ('V', 34, struct v4l2_audio)
-+#define VIDIOC_QUERYCTRL      _IOWR ('V', 36, struct v4l2_queryctrl)
-+#define VIDIOC_QUERYMENU      _IOWR ('V', 37, struct v4l2_querymenu)
-+#define VIDIOC_G_INPUT                _IOR  ('V', 38, int)
-+#define VIDIOC_S_INPUT                _IOWR ('V', 39, int)
-+#define VIDIOC_G_OUTPUT               _IOR  ('V', 46, int)
-+#define VIDIOC_S_OUTPUT               _IOWR ('V', 47, int)
-+#define VIDIOC_ENUMOUTPUT     _IOWR ('V', 48, struct v4l2_output)
-+#define VIDIOC_G_AUDOUT               _IOR  ('V', 49, struct v4l2_audioout)
-+#define VIDIOC_S_AUDOUT               _IOW  ('V', 50, struct v4l2_audioout)
-+#define VIDIOC_G_MODULATOR    _IOWR ('V', 54, struct v4l2_modulator)
-+#define VIDIOC_S_MODULATOR    _IOW  ('V', 55, struct v4l2_modulator)
-+#define VIDIOC_G_FREQUENCY    _IOWR ('V', 56, struct v4l2_frequency)
-+#define VIDIOC_S_FREQUENCY    _IOW  ('V', 57, struct v4l2_frequency)
-+#define VIDIOC_CROPCAP                _IOR  ('V', 58, struct v4l2_cropcap)
-+#define VIDIOC_G_CROP         _IOWR ('V', 59, struct v4l2_crop)
-+#define VIDIOC_S_CROP         _IOW  ('V', 60, struct v4l2_crop)
-+#define VIDIOC_G_JPEGCOMP     _IOR  ('V', 61, struct v4l2_jpegcompression)
-+#define VIDIOC_S_JPEGCOMP     _IOW  ('V', 62, struct v4l2_jpegcompression)
-+#define VIDIOC_QUERYSTD       _IOR  ('V', 63, v4l2_std_id)
-+#define VIDIOC_TRY_FMT        _IOWR ('V', 64, struct v4l2_format)
-+#define VIDIOC_ENUMAUDIO      _IOWR ('V', 65, struct v4l2_audio)
-+#define VIDIOC_ENUMAUDOUT     _IOWR ('V', 66, struct v4l2_audioout)
-+#define VIDIOC_G_PRIORITY       _IOR  ('V', 67, enum v4l2_priority)
-+#define VIDIOC_S_PRIORITY       _IOW  ('V', 68, enum v4l2_priority)
-+
-+/* for compatibility, will go away some day */
-+#define VIDIOC_OVERLAY_OLD            _IOWR ('V', 14, int)
-+#define VIDIOC_S_PARM_OLD             _IOW  ('V', 22, struct v4l2_streamparm)
-+#define VIDIOC_S_CTRL_OLD             _IOW  ('V', 28, struct v4l2_control)
-+#define VIDIOC_G_AUDIO_OLD            _IOWR ('V', 33, struct v4l2_audio)
-+#define VIDIOC_G_AUDOUT_OLD           _IOWR ('V', 49, struct v4l2_audioout)
-+
-+#define BASE_VIDIOC_PRIVATE   192             /* 192-255 are private */
-+
-+
-+#ifdef __KERNEL__
-+/*
-+ *
-+ *    V 4 L 2   D R I V E R   H E L P E R   A P I
-+ *
-+ *    Some commonly needed functions for drivers (v4l2-common.o module)
-+ */
-+#include <linux/fs.h>
-+
-+/*  Video standard functions  */
-+extern unsigned int v4l2_video_std_fps(struct v4l2_standard *vs);
-+extern int v4l2_video_std_construct(struct v4l2_standard *vs,
-+                                  int id, char *name);
-+
-+/* prority handling */
-+struct v4l2_prio_state {
-+      atomic_t prios[4];
-+};
-+int v4l2_prio_init(struct v4l2_prio_state *global);
-+int v4l2_prio_change(struct v4l2_prio_state *global, enum v4l2_priority *local,
-+                   enum v4l2_priority new);
-+int v4l2_prio_open(struct v4l2_prio_state *global, enum v4l2_priority *local);
-+int v4l2_prio_close(struct v4l2_prio_state *global, enum v4l2_priority *local);
-+enum v4l2_priority v4l2_prio_max(struct v4l2_prio_state *global);
-+int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority *local);
-+
-+/* names for fancy debug output */
-+extern char *v4l2_field_names[];
-+extern char *v4l2_type_names[];
-+extern char *v4l2_ioctl_names[];
-+
-+/*  Compatibility layer interface  --  v4l1-compat module */
-+typedef int (*v4l2_kioctl)(struct inode *inode, struct file *file,
-+                         unsigned int cmd, void *arg);
-+int v4l_compat_translate_ioctl(struct inode *inode, struct file *file,
-+                             int cmd, void *arg, v4l2_kioctl driver_ioctl);
-+
-+#endif /* __KERNEL__ */
-+#endif /* __LINUX_VIDEODEV2_H */
-+
-+/*
-+ * Local variables:
-+ * c-basic-offset: 8
-+ * End:
-+ */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1146-uplevel-samsung-camera-unit.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1146-uplevel-samsung-camera-unit.patch.patch
deleted file mode 100755 (executable)
index 26f0035..0000000
+++ /dev/null
@@ -1,1690 +0,0 @@
-From 0bd2a8e00d4a1814d0a9d8206d52717e3f538b68 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@opennoko.com>
-Date: Fri, 25 Jul 2008 23:06:10 +0100
-Subject: [PATCH] uplevel-samsung-camera-unit.patch
-
-Update this old code to clk API, I2C changes, official GPIO API
-various struct changes, explicit readl() writel(), DMA API changes.
-Still not ready for actual use (eg, I2C) but a LOT closer.
-
-Compiles on 2.6.24 without errors or warnings now.
-
-Use CONFIG_S3C2440_CAMERA=y in .config
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/Kconfig               |    5 +-
- arch/arm/mach-s3c2440/Makefile              |    9 +-
- arch/arm/mach-s3c2440/camera/Makefile       |    1 -
- arch/arm/mach-s3c2440/camera/cam_reg.h      |   92 +++--
- arch/arm/mach-s3c2440/camera/camif.c        |  633 +++++++++++++++------------
- arch/arm/mach-s3c2440/camera/camif_fsm.c    |    5 +
- arch/arm/mach-s3c2440/camera/imgsensor.c    |   43 +-
- arch/arm/mach-s3c2440/camera/qt-driver.c    |    5 +-
- arch/arm/mach-s3c2440/camera/video-driver.c |   87 +++--
- arch/arm/mach-s3c2440/camera/videodev.c     |   24 +-
- arch/arm/mach-s3c2440/camera/videodev.h     |   16 +-
- 11 files changed, 516 insertions(+), 404 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/Kconfig b/arch/arm/mach-s3c2440/Kconfig
-index e042965..20dd2c5 100644
---- a/arch/arm/mach-s3c2440/Kconfig
-+++ b/arch/arm/mach-s3c2440/Kconfig
-@@ -30,9 +30,6 @@ config S3C2440_C_FIQ
-         Support for S3C2440 FIQ support in C -- see
-         ./arch/arm/macs3c2440/fiq_c_isr.c
--source "arch/arm/mach-s3c2440/camera/Kconfig"
--
--
- menu "S3C2440 Machines"
- config MACH_ANUBIS
-@@ -96,3 +93,5 @@ config NEO1973_GTA02_2440
-          of the FIC/Openmoko Neo1973 GTA02 GSM Phone.
- endmenu
-+
-+#source "arch/arm/mach-s3c2440/camera/Kconfig"
-diff --git a/arch/arm/mach-s3c2440/Makefile b/arch/arm/mach-s3c2440/Makefile
-index e9c6334..964e50b 100644
---- a/arch/arm/mach-s3c2440/Makefile
-+++ b/arch/arm/mach-s3c2440/Makefile
-@@ -1,4 +1,10 @@
--obj-y                           += camera/
-+# arch/arm/mach-s3c2440/Makefile
-+#
-+# Copyright 2007 Simtec Electronics
-+#
-+# Licensed under GPLv2
-+
-+obj-y                         :=
- obj-m                         :=
- obj-n                         :=
- obj-                          :=
-@@ -17,5 +23,6 @@ obj-$(CONFIG_MACH_RX3715)    += mach-rx3715.o
- obj-$(CONFIG_ARCH_S3C2440)    += mach-smdk2440.o
- obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
- obj-$(CONFIG_MACH_AT2440EVB) += mach-at2440evb.o
-+obj-$(CONFIG_MACH_HXD8)               += mach-hxd8.o
- obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
-diff --git a/arch/arm/mach-s3c2440/camera/Makefile b/arch/arm/mach-s3c2440/camera/Makefile
-index a46d3be..9cd6d79 100644
---- a/arch/arm/mach-s3c2440/camera/Makefile
-+++ b/arch/arm/mach-s3c2440/camera/Makefile
-@@ -1,7 +1,6 @@
- obj-$(CONFIG_S3C2440_CAMERA) += \
-       videodev.o \
-       imgsensor.o \
--      videodrv.o \
-       video-driver.o \
-       camif.o \
-       camif_fsm.o \
-diff --git a/arch/arm/mach-s3c2440/camera/cam_reg.h b/arch/arm/mach-s3c2440/camera/cam_reg.h
-index 7247a4e..93d59b8 100644
---- a/arch/arm/mach-s3c2440/camera/cam_reg.h
-+++ b/arch/arm/mach-s3c2440/camera/cam_reg.h
-@@ -7,6 +7,7 @@
- #ifndef __FIMC20_CAMERA_H__
- #define __FIMC20_CAMERA_H__
-+extern u32 * camregs;
- #ifdef CONFIG_ARCH_S3C24A0
- #define CAM_BASE_ADD             0x48000000
-@@ -14,10 +15,23 @@
- #define CAM_BASE_ADD             0x4F000000
- #endif
-+#if ! defined(FExtr)
-+#define UData(Data)     ((unsigned long) (Data))
-+#define FExtr(Data, Field) \
-+                        ((UData (Data) >> FShft (Field)) & FAlnMsk (Field))
-+#define FInsrt(Value, Field) \
-+                        (UData (Value) << FShft (Field))
-+#define FSize(Field)    ((Field) >> 16)
-+#define FShft(Field)    ((Field) & 0x0000FFFF)
-+#define FMsk(Field)     (((UData (1) << FSize (Field)) - 1) << FShft (Field))
-+#define FAlnMsk(Field)  ((UData (1) << FSize (Field)) - 1)
-+#define F1stBit(Field)  (UData (1) << FShft (Field))
-+#define Fld(Size, Shft) (((Size) << 16) + (Shft))
-+#endif
- /*
-  * CAMERA IP
-- * P-port is used as RGB Capturing device which including scale and crop 
-+ * P-port is used as RGB Capturing device which including scale and crop
-  *  those who want to see(preview ) the image on display needs RGB image.
-  *
-  * C-port is used as YCbCr(4:2:0, 4:2:2) Capturing device which including the scale and crop
-@@ -25,45 +39,45 @@
-      YCBCB format not RGB 
-  */ 
--#define CISRCFMT            __REG(CAM_BASE_ADD+0x00) // RW Input Source Format
--#define CIWDOFST            __REG(CAM_BASE_ADD+0x04) // Window offset register
--#define CIGCTRL             __REG(CAM_BASE_ADD+0x08) // Global control register
--#define CICOYSA0            __REG(CAM_BASE_ADD+0x18) // Y 1 st frame start address 
--#define CICOYSA1            __REG(CAM_BASE_ADD+0x1C) // Y 2 nd frame start address 
--#define CICOYSA2            __REG(CAM_BASE_ADD+0x20) // Y 3 rd frame start address 
--#define CICOYSA3            __REG(CAM_BASE_ADD+0x24) // Y 4 th frame start address 
--#define CICOCBSA0           __REG(CAM_BASE_ADD+0x28) // Cb 1 st frame start address 
--#define CICOCBSA1           __REG(CAM_BASE_ADD+0x2C) // Cb 2 nd frame start address 
--#define CICOCBSA2           __REG(CAM_BASE_ADD+0x30) // Cb 3 rd frame start address 
--#define CICOCBSA3           __REG(CAM_BASE_ADD+0x34) // Cb 4 th frame start address 
--#define CICOCRSA0           __REG(CAM_BASE_ADD+0x38) // Cr 1 st frame start address 
--#define CICOCRSA1           __REG(CAM_BASE_ADD+0x3C) // Cr 2 nd frame start address 
--#define CICOCRSA2           __REG(CAM_BASE_ADD+0x40) // Cr 3 rd frame start address 
--#define CICOCRSA3           __REG(CAM_BASE_ADD+0x44) // Cr 4 th frame start address 
--#define CICOTRGFMT          __REG(CAM_BASE_ADD+0x48) // Target image format of codec
--#define CICOCTRL            __REG(CAM_BASE_ADD+0x4C) // Codec DMA control related
--#define CICOSCPRERATIO      __REG(CAM_BASE_ADD+0x50) // Codec pre-scaler ratio control
--#define CICOSCPREDST        __REG(CAM_BASE_ADD+0x54) // Codec pre-scaler destination
--#define CICOSCCTRL          __REG(CAM_BASE_ADD+0x58) // Codec main-scaler control
--#define CICOTAREA           __REG(CAM_BASE_ADD+0x5C) // Codec pre-scaler destination
--#define CICOSTATUS          __REG(CAM_BASE_ADD+0x64) // Codec path status
--#define CIPRCLRSA0          __REG(CAM_BASE_ADD+0x6C) // RGB 1 st frame start address 
--#define CIPRCLRSA1          __REG(CAM_BASE_ADD+0x70) // RGB 2 nd frame start address 
--#define CIPRCLRSA2          __REG(CAM_BASE_ADD+0x74) // RGB 3 rd frame start address 
--#define CIPRCLRSA3          __REG(CAM_BASE_ADD+0x78) // RGB 4 th frame start address 
--#define CIPRTRGFMT          __REG(CAM_BASE_ADD+0x7C) // Target image format of preview
--#define CIPRCTRL            __REG(CAM_BASE_ADD+0x80) // Preview DMA control related
--#define CIPRSCPRERATIO      __REG(CAM_BASE_ADD+0x84) // Preview pre-scaler ratio control
--#define CIPRSCPREDST        __REG(CAM_BASE_ADD+0x88) // Preview pre-scaler destination
--#define CIPRSCCTRL          __REG(CAM_BASE_ADD+0x8C) // Preview main-scaler control
--#define CIPRTAREA           __REG(CAM_BASE_ADD+0x90) // Preview pre-scaler destination
--#define CIPRSTATUS          __REG(CAM_BASE_ADD+0x98) // Preview path status
--#define CIIMGCPT            __REG(CAM_BASE_ADD+0xA0) // Image capture enable command
--
--#define CICOYSA(__x)        __REG(CAM_BASE_ADD+0x18 + (__x)*4 ) 
--#define CICOCBSA(__x)       __REG(CAM_BASE_ADD+0x28 + (__x)*4 )
--#define CICOCRSA(__x)       __REG(CAM_BASE_ADD+0x38 + (__x)*4 ) 
--#define CIPRCLRSA(__x)      __REG(CAM_BASE_ADD+0x6C + (__x)*4 )
-+#define S3C2440_CAM_REG_CISRCFMT            (0x00) // RW Input Source Format
-+#define S3C2440_CAM_REG_CIWDOFST            (0x04) // Window offset register
-+#define S3C2440_CAM_REG_CIGCTRL             (0x08) // Global control register
-+#define S3C2440_CAM_REG_CICOYSA0            (0x18) // Y 1 st frame start ads
-+#define S3C2440_CAM_REG_CICOYSA1            (0x1C) // Y 2 nd frame start ads
-+#define S3C2440_CAM_REG_CICOYSA2            (0x20) // Y 3 rd frame start ads
-+#define S3C2440_CAM_REG_CICOYSA3            (0x24) // Y 4 th frame start ads
-+#define S3C2440_CAM_REG_CICOCBSA0           (0x28) // Cb 1 st frame start ads
-+#define S3C2440_CAM_REG_CICOCBSA1           (0x2C) // Cb 2 nd frame start ads
-+#define S3C2440_CAM_REG_CICOCBSA2           (0x30) // Cb 3 rd frame start ads
-+#define S3C2440_CAM_REG_CICOCBSA3           (0x34) // Cb 4 th frame start ads
-+#define S3C2440_CAM_REG_CICOCRSA0           (0x38) // Cr 1 st frame start ads
-+#define S3C2440_CAM_REG_CICOCRSA1           (0x3C) // Cr 2 nd frame start ads
-+#define S3C2440_CAM_REG_CICOCRSA2           (0x40) // Cr 3 rd frame start ads
-+#define S3C2440_CAM_REG_CICOCRSA3           (0x44) // Cr 4 th frame start ads
-+#define S3C2440_CAM_REG_CICOTRGFMT          (0x48) // Target img format of codec
-+#define S3C2440_CAM_REG_CICOCTRL            (0x4C) // Codec DMA control related
-+#define S3C2440_CAM_REG_CICOSCPRERATIO      (0x50) // Codec pre-scaler ratio
-+#define S3C2440_CAM_REG_CICOSCPREDST        (0x54) // Codec pre-scaler dest
-+#define S3C2440_CAM_REG_CICOSCCTRL          (0x58) // Codec main-scaler control
-+#define S3C2440_CAM_REG_CICOTAREA           (0x5C) // Codec pre-scaler dest
-+#define S3C2440_CAM_REG_CICOSTATUS          (0x64) // Codec path status
-+#define S3C2440_CAM_REG_CIPRCLRSA0          (0x6C) // RGB 1 st frame start ads
-+#define S3C2440_CAM_REG_CIPRCLRSA1          (0x70) // RGB 2 nd frame start ads
-+#define S3C2440_CAM_REG_CIPRCLRSA2          (0x74) // RGB 3 rd frame start ads
-+#define S3C2440_CAM_REG_CIPRCLRSA3          (0x78) // RGB 4 th frame start ads
-+#define S3C2440_CAM_REG_CIPRTRGFMT          (0x7C) // Target img fmt of preview
-+#define S3C2440_CAM_REG_CIPRCTRL            (0x80) // Preview DMA ctl related
-+#define S3C2440_CAM_REG_CIPRSCPRERATIO      (0x84) // Preview pre-scaler ratio
-+#define S3C2440_CAM_REG_CIPRSCPREDST        (0x88) // Preview pre-scaler dest
-+#define S3C2440_CAM_REG_CIPRSCCTRL          (0x8C) // Preview main-scaler ctl
-+#define S3C2440_CAM_REG_CIPRTAREA           (0x90) // Preview pre-scaler dest
-+#define S3C2440_CAM_REG_CIPRSTATUS          (0x98) // Preview path status
-+#define S3C2440_CAM_REG_CIIMGCPT            (0xA0) // Image capture enable cmd
-+
-+#define S3C2440_CAM_REG_CICOYSA(__x)        (0x18 + (__x)*4 )
-+#define S3C2440_CAM_REG_CICOCBSA(__x)       (0x28 + (__x)*4 )
-+#define S3C2440_CAM_REG_CICOCRSA(__x)       (0x38 + (__x)*4 )
-+#define S3C2440_CAM_REG_CIPRCLRSA(__x)      (0x6C + (__x)*4 )
- /* CISRCFMT BitField */
- #define SRCFMT_ITU601       BIT31
-diff --git a/arch/arm/mach-s3c2440/camera/camif.c b/arch/arm/mach-s3c2440/camera/camif.c
-index 36d4ccc..2e97e21 100644
---- a/arch/arm/mach-s3c2440/camera/camif.c
-+++ b/arch/arm/mach-s3c2440/camera/camif.c
-@@ -7,14 +7,11 @@
-  * for more details.
-  */
--#include <linux/config.h>
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/init.h>
- #include <linux/sched.h>
- #include <linux/irq.h>
--#include <linux/tqueue.h>
--#include <linux/locks.h>
- #include <linux/completion.h>
- #include <linux/delay.h>
- #include <linux/slab.h>
-@@ -26,28 +23,29 @@
- #include <asm/semaphore.h>
- #include <asm/hardware.h>
- #include <asm/uaccess.h>
-+#include <linux/device.h>
-+#include <linux/dma-mapping.h>
-+#include <linux/clk.h>
- #ifdef CONFIG_ARCH_S3C24A0A
- #include <asm/arch/S3C24A0.h>
- #include <asm/arch/clocks.h>
- #else
--#include <asm/arch/S3C2440.h>
--#include <asm/arch/clocks.h>
-+#include <asm/arch/regs-gpio.h>
-+#include <asm/arch/regs-gpioj.h>
-+#include <asm/arch/regs-irq.h>
- #endif
- #include "cam_reg.h"
- //#define SW_DEBUG
-+#define CONFIG_VIDEO_V4L1_COMPAT
-+#include <linux/videodev.h>
- #include "camif.h"
--#include "videodev.h"
- #include "miscdevice.h"
--
- static int camif_dma_burst(camif_cfg_t *);
- static int camif_scaler(camif_cfg_t *);
--static const char *camif_version =
--        "$Id: camif.c,v 1.10 2004/06/04 04:24:14 swlee Exp $";
--      
- /* For SXGA Image */
- #define RESERVE_MEM  15*1024*1024
- #define YUV_MEM      10*1024*1024
-@@ -66,11 +64,13 @@ static int camif_malloc(camif_cfg_t *cfg)
-               t_size = t_size *cfg->pp_num;
- #ifndef SAMSUNG_SXGA_CAM
--              cfg->pp_virt_buf = consistent_alloc(GFP_KERNEL, t_size, &cfg->pp_phys_buf);
-+              cfg->pp_virt_buf = dma_alloc_coherent(cfg->v->dev,
-+                                                    t_size, &cfg->pp_phys_buf,
-+                                                    GFP_KERNEL);
- #else
-               printk(KERN_INFO "Reserving High RAM Addresses \n");
-               cfg->pp_phys_buf = PHYS_OFFSET + (MEM_SIZE - RESERVE_MEM);
--              cfg->pp_virt_buf = ioremap_nocache(cfg->pp_phys_buf,YUV_MEM);
-+              cfg->pp_virt_buf = ioremap_nocache(cfg->pp_phys_buf, YUV_MEM);
- #endif
-               if ( !cfg->pp_virt_buf ) {
-@@ -90,7 +90,9 @@ static int camif_malloc(camif_cfg_t *cfg)
-               }
-               t_size = t_size * cfg->pp_num;
- #ifndef SAMSUNG_SXGA_CAM
--              cfg->pp_virt_buf = consistent_alloc(GFP_KERNEL, t_size, &cfg->pp_phys_buf);
-+              cfg->pp_virt_buf = dma_alloc_coherent(cfg->v->dev,
-+                                                    t_size, &cfg->pp_phys_buf,
-+                                                    GFP_KERNEL);
- #else
-               printk(KERN_INFO "Reserving High RAM Addresses \n");
-               cfg->pp_phys_buf = PHYS_OFFSET + (MEM_SIZE - RESERVE_MEM ) + YUV_MEM;
-@@ -112,7 +114,8 @@ static int camif_demalloc(camif_cfg_t *cfg)
- {
- #ifndef SAMSUNG_SXGA_CAM
-       if ( cfg->pp_virt_buf ) {
--              consistent_free(cfg->pp_virt_buf,cfg->pp_totalsize,cfg->pp_phys_buf);
-+              dma_free_coherent(cfg->v->dev, cfg->pp_totalsize,
-+                                cfg->pp_virt_buf, cfg->pp_phys_buf);
-               cfg->pp_virt_buf = 0;
-       }
- #else
-@@ -131,13 +134,14 @@ int camif_g_frame_num(camif_cfg_t *cfg)
-       int index = 0;
-       if (cfg->dma_type & CAMIF_CODEC ) {
--              index = FRAME_CNT(CICOSTATUS);
-+              index = FRAME_CNT(readl(camregs + S3C2440_CAM_REG_CICOSTATUS));
-               DPRINTK("CAMIF_CODEC frame %d \n", index);
-       }
-       else {
-               assert(cfg->dma_type & CAMIF_PREVIEW );
--              index = FRAME_CNT(CIPRSTATUS);
--              DPRINTK("CAMIF_PREVIEW frame %d  0x%08X \n", index, CIPRSTATUS);
-+              index = FRAME_CNT(readl(camregs + S3C2440_CAM_REG_CIPRSTATUS));
-+              DPRINTK("CAMIF_PREVIEW frame %d  0x%08X \n", index,
-+                      readl(camregs + S3C2440_CAM_REG_CIPRSTATUS));
-       }
-       cfg->now_frame_num = (index + 2) % 4; /* When 4 PingPong */
-       return index; /* meaningless */
-@@ -148,60 +152,59 @@ static int camif_pp_codec(camif_cfg_t *cfg)
-       u32 i, c_size; /* Cb,Cr size */
-       u32 one_p_size;
-       u32 daon = cfg->target_x * cfg->target_y;
--      if (cfg->fmt & CAMIF_OUT_YCBCR420) {
--              c_size = daon /4;
--      }
-+      if (cfg->fmt & CAMIF_OUT_YCBCR420)
-+              c_size = daon / 4;
-       else {
-               assert(cfg->fmt & CAMIF_OUT_YCBCR422);
--              c_size = daon /2;
-+              c_size = daon / 2;
-       }
-       switch ( cfg->pp_num ) {
--              case 1 :
--                      for ( i =0 ; i < 4; i=i+1) {
--                              cfg->img_buf[i].virt_y = cfg->pp_virt_buf;
--                              cfg->img_buf[i].phys_y = cfg->pp_phys_buf;
--                              cfg->img_buf[i].virt_cb = cfg->pp_virt_buf + daon; 
--                              cfg->img_buf[i].phys_cb = cfg->pp_phys_buf + daon;
--                              cfg->img_buf[i].virt_cr = cfg->pp_virt_buf + daon + c_size;
--                              cfg->img_buf[i].phys_cr = cfg->pp_phys_buf + daon + c_size;
--                              CICOYSA(i)  =  cfg->img_buf[i].phys_y;
--                              CICOCBSA(i) =  cfg->img_buf[i].phys_cb;
--                              CICOCRSA(i) =  cfg->img_buf[i].phys_cr;
--                      }
--                      break;
--              case 2:
-+      case 1 :
-+              for (i =0 ; i < 4; i++) {
-+                      cfg->img_buf[i].virt_y = cfg->pp_virt_buf;
-+                      cfg->img_buf[i].phys_y = cfg->pp_phys_buf;
-+                      cfg->img_buf[i].virt_cb = cfg->pp_virt_buf + daon;
-+                      cfg->img_buf[i].phys_cb = cfg->pp_phys_buf + daon;
-+                      cfg->img_buf[i].virt_cr = cfg->pp_virt_buf + daon + c_size;
-+                      cfg->img_buf[i].phys_cr = cfg->pp_phys_buf + daon + c_size;
-+                      writel(cfg->img_buf[i].phys_y, camregs + S3C2440_CAM_REG_CICOYSA(i));
-+                      writel(cfg->img_buf[i].phys_cb, camregs + S3C2440_CAM_REG_CICOCBSA(i));
-+                      writel(cfg->img_buf[i].phys_cr, camregs + S3C2440_CAM_REG_CICOCRSA(i));
-+              }
-+              break;
-+      case 2:
- #define  TRY   (( i%2 ) ? 1 :0)
--                      one_p_size = daon + 2*c_size;
--                      for (i = 0; i < 4  ; i++) {
--                              cfg->img_buf[i].virt_y = cfg->pp_virt_buf + TRY * one_p_size;
--                              cfg->img_buf[i].phys_y = cfg->pp_phys_buf + TRY * one_p_size;
--                              cfg->img_buf[i].virt_cb = cfg->pp_virt_buf + daon + TRY * one_p_size;
--                              cfg->img_buf[i].phys_cb = cfg->pp_phys_buf + daon + TRY * one_p_size;
--                              cfg->img_buf[i].virt_cr = cfg->pp_virt_buf + daon + c_size + TRY * one_p_size;
--                              cfg->img_buf[i].phys_cr = cfg->pp_phys_buf + daon + c_size + TRY * one_p_size;
--                              CICOYSA(i)  = cfg->img_buf[i].phys_y;
--                              CICOCBSA(i) = cfg->img_buf[i].phys_cb;
--                              CICOCRSA(i) = cfg->img_buf[i].phys_cr;
--                      }
--                      break;
--              case 4: 
--                      one_p_size = daon + 2*c_size;
--                      for (i = 0; i < 4 ; i++) {
--                              cfg->img_buf[i].virt_y = cfg->pp_virt_buf + i * one_p_size;
--                              cfg->img_buf[i].phys_y = cfg->pp_phys_buf + i * one_p_size;
--                              cfg->img_buf[i].virt_cb = cfg->pp_virt_buf + daon + i * one_p_size;
--                              cfg->img_buf[i].phys_cb = cfg->pp_phys_buf + daon + i * one_p_size;
--                              cfg->img_buf[i].virt_cr = cfg->pp_virt_buf + daon + c_size + i * one_p_size;
--                              cfg->img_buf[i].phys_cr = cfg->pp_phys_buf + daon + c_size + i * one_p_size;
--                              CICOYSA(i)  =  cfg->img_buf[i].phys_y;
--                              CICOCBSA(i) =  cfg->img_buf[i].phys_cb;
--                              CICOCRSA(i) =  cfg->img_buf[i].phys_cr;
--                      }
--                      break;
--              default:
--                      printk("Invalid PingPong Number %d \n",cfg->pp_num);
--                      panic("halt\n");
--      }
-+              one_p_size = daon + 2*c_size;
-+              for (i = 0; i < 4  ; i++) {
-+                      cfg->img_buf[i].virt_y = cfg->pp_virt_buf + TRY * one_p_size;
-+                      cfg->img_buf[i].phys_y = cfg->pp_phys_buf + TRY * one_p_size;
-+                      cfg->img_buf[i].virt_cb = cfg->pp_virt_buf + daon + TRY * one_p_size;
-+                      cfg->img_buf[i].phys_cb = cfg->pp_phys_buf + daon + TRY * one_p_size;
-+                      cfg->img_buf[i].virt_cr = cfg->pp_virt_buf + daon + c_size + TRY * one_p_size;
-+                      cfg->img_buf[i].phys_cr = cfg->pp_phys_buf + daon + c_size + TRY * one_p_size;
-+                      writel(cfg->img_buf[i].phys_y, camregs + S3C2440_CAM_REG_CICOYSA(i));
-+                      writel(cfg->img_buf[i].phys_cb, camregs + S3C2440_CAM_REG_CICOCBSA(i));
-+                      writel(cfg->img_buf[i].phys_cr, camregs + S3C2440_CAM_REG_CICOCRSA(i));
-+              }
-+              break;
-+      case 4:
-+              one_p_size = daon + 2*c_size;
-+              for (i = 0; i < 4 ; i++) {
-+                      cfg->img_buf[i].virt_y = cfg->pp_virt_buf + i * one_p_size;
-+                      cfg->img_buf[i].phys_y = cfg->pp_phys_buf + i * one_p_size;
-+                      cfg->img_buf[i].virt_cb = cfg->pp_virt_buf + daon + i * one_p_size;
-+                      cfg->img_buf[i].phys_cb = cfg->pp_phys_buf + daon + i * one_p_size;
-+                      cfg->img_buf[i].virt_cr = cfg->pp_virt_buf + daon + c_size + i * one_p_size;
-+                      cfg->img_buf[i].phys_cr = cfg->pp_phys_buf + daon + c_size + i * one_p_size;
-+                      writel(cfg->img_buf[i].phys_y, camregs + S3C2440_CAM_REG_CICOYSA(i));
-+                      writel(cfg->img_buf[i].phys_cb, camregs + S3C2440_CAM_REG_CICOCBSA(i));
-+                      writel(cfg->img_buf[i].phys_cr, camregs + S3C2440_CAM_REG_CICOCRSA(i));
-+              }
-+              break;
-+      default:
-+              printk("Invalid PingPong Number %d \n",cfg->pp_num);
-+              panic("halt\n");
-+}
-       return 0;
- }
-@@ -222,21 +225,21 @@ static int camif_pp_preview(camif_cfg_t *cfg)
-                       for ( i = 0; i < 4 ; i++ ) {
-                               cfg->img_buf[i].virt_rgb = cfg->pp_virt_buf ;
-                               cfg->img_buf[i].phys_rgb = cfg->pp_phys_buf ;
--                              CIPRCLRSA(i) = cfg->img_buf[i].phys_rgb;
-+                              writel(cfg->img_buf[i].phys_rgb, camregs + S3C2440_CAM_REG_CICOCRSA(i));
-                       }
-                       break;
-               case 2:
-                       for ( i = 0; i < 4 ; i++) {
-                               cfg->img_buf[i].virt_rgb = cfg->pp_virt_buf + TRY * daon;
-                               cfg->img_buf[i].phys_rgb = cfg->pp_phys_buf + TRY * daon;
--                              CIPRCLRSA(i) = cfg->img_buf[i].phys_rgb;
-+                              writel(cfg->img_buf[i].phys_rgb, camregs + S3C2440_CAM_REG_CICOCRSA(i));
-                       }
-                       break;
-               case 4:
-                       for ( i = 0; i < 4 ; i++) {
-                               cfg->img_buf[i].virt_rgb = cfg->pp_virt_buf + i * daon;
-                               cfg->img_buf[i].phys_rgb = cfg->pp_phys_buf + i * daon;
--                              CIPRCLRSA(i) = cfg->img_buf[i].phys_rgb;
-+                              writel(cfg->img_buf[i].phys_rgb, camregs + S3C2440_CAM_REG_CICOCRSA(i));
-                       }
-                       break;
-               default:
-@@ -308,7 +311,7 @@ static int camif_source_fmt(camif_gc_t *gc)
-       cmd  |= SOURCE_HSIZE(gc->source_x)| SOURCE_VSIZE(gc->source_y);
-       /* Order422 */
-       cmd |=  gc->order422;
--      CISRCFMT = cmd;
-+      writel(cmd, camregs + S3C2440_CAM_REG_CISRCFMT);
-       return 0 ;
- }
-@@ -331,33 +334,24 @@ static int camif_target_fmt(camif_cfg_t *cfg)
-                       assert(cfg->fmt & CAMIF_OUT_YCBCR422);
-                       cmd |= OUT_YCBCR422|IN_YCBCR422;
-               }
--              CICOTRGFMT = cmd | cfg->flip;
--      } 
--      else {
-+              writel(cmd | cfg->flip, camregs + S3C2440_CAM_REG_CICOTRGFMT);
-+
-+      } else {
-               assert(cfg->dma_type & CAMIF_PREVIEW);
--              CIPRTRGFMT = 
--                      TARGET_HSIZE(cfg->target_x)|TARGET_VSIZE(cfg->target_y)|cfg->flip;
-+              writel(TARGET_HSIZE(cfg->target_x)|TARGET_VSIZE(cfg->target_y)|cfg->flip,
-+                      camregs + S3C2440_CAM_REG_CIPRTRGFMT); 
-       }
-       return 0;
- }
- void camif_change_flip(camif_cfg_t *cfg)
- {
--      u32 cmd = 0;
-+      u32 cmd = readl(camregs + S3C2440_CAM_REG_CICOTRGFMT);
--      if (cfg->dma_type & CAMIF_CODEC ) {
--              /* YCBCR setting */  
--              cmd  = CICOTRGFMT;
--              cmd &= ~(BIT14|BIT15); /* Clear FLIP Mode */
--              cmd |= cfg->flip; 
--              CICOTRGFMT = cmd;
--      } 
--      else {
--              cmd  = CIPRTRGFMT;
--              cmd &= ~(BIT14|BIT15);
--              cmd |= cfg->flip;
--              CICOTRGFMT = cmd; 
--      }
-+      cmd &= ~(BIT14|BIT15);
-+      cmd |= cfg->flip;
-+
-+      writel(cmd, camregs + S3C2440_CAM_REG_CICOTRGFMT);
- }
-@@ -373,70 +367,81 @@ int camif_capture_start(camif_cfg_t *cfg)
-       u32 n_cmd = 0;          /* Next Command */
-       switch(cfg->exec) {
--              case CAMIF_BOTH_DMA_ON:
--                      camif_reset(CAMIF_RESET,0); /* Flush Camera Core Buffer */              
--                      CIPRSCCTRL |= SCALERSTART;
--                      CICOSCCTRL |= SCALERSTART;
--                      n_cmd = CAMIF_CAP_PREVIEW_ON|CAMIF_CAP_CODEC_ON;
--                      break;
--              case CAMIF_DMA_ON:
--                      camif_reset(CAMIF_RESET,0); /* Flush Camera Core Buffer */              
--                      if (cfg->dma_type&CAMIF_CODEC) {
--                              CICOSCCTRL |= SCALERSTART;
--                              n_cmd = CAMIF_CAP_CODEC_ON;
--                      }else {
--                              CIPRSCCTRL |= SCALERSTART;
--                              n_cmd = CAMIF_CAP_PREVIEW_ON;
--                      }
-+      case CAMIF_BOTH_DMA_ON:
-+              camif_reset(CAMIF_RESET, 0); /* Flush Camera Core Buffer */
-+              writel(readl(camregs + S3C2440_CAM_REG_CIPRSCCTRL) |
-+                           SCALERSTART, camregs + S3C2440_CAM_REG_CIPRSCCTRL);
-+              writel(readl(camregs + S3C2440_CAM_REG_CICOSCCTRL) |
-+                           SCALERSTART, camregs + S3C2440_CAM_REG_CICOSCCTRL);
-+              n_cmd = CAMIF_CAP_PREVIEW_ON | CAMIF_CAP_CODEC_ON;
-+              break;
-+      case CAMIF_DMA_ON:
-+              camif_reset(CAMIF_RESET, 0); /* Flush Camera Core Buffer */
-+              if (cfg->dma_type&CAMIF_CODEC) {
-+                      writel(readl(camregs + S3C2440_CAM_REG_CICOSCCTRL) |
-+                           SCALERSTART, camregs + S3C2440_CAM_REG_CICOSCCTRL);
-+                      n_cmd = CAMIF_CAP_CODEC_ON;
-+              } else {
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIPRSCCTRL) |
-+                           SCALERSTART, camregs + S3C2440_CAM_REG_CIPRSCCTRL);
-+                      n_cmd = CAMIF_CAP_PREVIEW_ON;
-+              }
--                      /* wait until Sync Time expires */
--                      /* First settting, to wait VSYNC fall  */
--                      /* By VESA spec,in 640x480 @60Hz 
--                         MAX Delay Time is around 64us which "while" has.*/ 
--                      while(VSYNC & CICOSTATUS);
--                      break;
--              default:
--                      break;
--      }
--      CIIMGCPT = n_cmd|CAMIF_CAP_ON;
-+              /* wait until Sync Time expires */
-+              /* First settting, to wait VSYNC fall  */
-+              /* By VESA spec,in 640x480 @60Hz
-+                      MAX Delay Time is around 64us which "while" has.*/
-+              while(VSYNC & readl(camregs + S3C2440_CAM_REG_CICOSTATUS));
-+              break;
-+      default:
-+              break;
-+}
-+      writel(n_cmd | CAMIF_CAP_ON, camregs + S3C2440_CAM_REG_CIIMGCPT); 
-       return 0;
- }
- int camif_capture_stop(camif_cfg_t *cfg)
- {
--      u32 n_cmd = CIIMGCPT;   /* Next Command */
-+      u32 n_cmd = readl(camregs + S3C2440_CAM_REG_CIIMGCPT);  /* Next Command */
-       switch(cfg->exec) {
--              case CAMIF_BOTH_DMA_OFF:
--                      CIPRSCCTRL &= ~SCALERSTART;
--                      CICOSCCTRL &= ~SCALERSTART;
--                      n_cmd = 0;
--                      break;
--              case CAMIF_DMA_OFF_L_IRQ: /* fall thru */
--              case CAMIF_DMA_OFF:
--                      if (cfg->dma_type&CAMIF_CODEC) {
--                              CICOSCCTRL &= ~SCALERSTART;
--                              n_cmd &= ~CAMIF_CAP_CODEC_ON;
--                              if (!(n_cmd & CAMIF_CAP_PREVIEW_ON))
--                                      n_cmd = 0;
--                      }else {
--                              CIPRSCCTRL &= ~SCALERSTART;
--                              n_cmd &= ~CAMIF_CAP_PREVIEW_ON;
--                              if (!(n_cmd & CAMIF_CAP_CODEC_ON))
--                                      n_cmd = 0;
--                      }
--                      break;
--              default:
--                      panic("Unexpected \n");
--      }
--      CIIMGCPT = n_cmd;
--      if(cfg->exec == CAMIF_DMA_OFF_L_IRQ) { /* Last IRQ  */
--              if (cfg->dma_type & CAMIF_CODEC) 
--                      CICOCTRL |= LAST_IRQ_EN;
--              else 
--                      CIPRCTRL |= LAST_IRQ_EN;
--      } 
-+      case CAMIF_BOTH_DMA_OFF:
-+              writel(readl(camregs + S3C2440_CAM_REG_CIPRSCCTRL) &
-+                      ~SCALERSTART, camregs + S3C2440_CAM_REG_CIPRSCCTRL);
-+              writel(readl(camregs + S3C2440_CAM_REG_CICOSCCTRL) &
-+                      ~SCALERSTART, camregs + S3C2440_CAM_REG_CICOSCCTRL);
-+              n_cmd = 0;
-+              break;
-+      case CAMIF_DMA_OFF_L_IRQ: /* fall thru */
-+      case CAMIF_DMA_OFF:
-+              if (cfg->dma_type&CAMIF_CODEC) {
-+                      writel(readl(camregs + S3C2440_CAM_REG_CICOSCCTRL) &
-+                          ~SCALERSTART, camregs + S3C2440_CAM_REG_CICOSCCTRL);
-+                      n_cmd &= ~CAMIF_CAP_CODEC_ON;
-+                      if (!(n_cmd & CAMIF_CAP_PREVIEW_ON))
-+                              n_cmd = 0;
-+              } else {
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIPRSCCTRL) &
-+                          ~SCALERSTART, camregs + S3C2440_CAM_REG_CIPRSCCTRL);
-+                      n_cmd &= ~CAMIF_CAP_PREVIEW_ON;
-+                      if (!(n_cmd & CAMIF_CAP_CODEC_ON))
-+                              n_cmd = 0;
-+              }
-+              break;
-+      default:
-+              panic("Unexpected \n");
-+      }
-+      writel(n_cmd, camregs + S3C2440_CAM_REG_CIIMGCPT);
-+
-+      if (cfg->exec == CAMIF_DMA_OFF_L_IRQ) { /* Last IRQ  */
-+              if (cfg->dma_type & CAMIF_CODEC)
-+                      writel(readl(camregs + S3C2440_CAM_REG_CICOCTRL) |
-+                           LAST_IRQ_EN, camregs + S3C2440_CAM_REG_CICOCTRL);
-+              else
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIPRCTRL) |
-+                           LAST_IRQ_EN, camregs + S3C2440_CAM_REG_CIPRCTRL);
-+      }
- #if 0
-       else {                          /* to make internal state machine of CAMERA stop */
-               camif_reset(CAMIF_RESET, 0);
-@@ -449,16 +454,13 @@ int camif_capture_stop(camif_cfg_t *cfg)
- /* LastIRQEn is autoclear */
- void camif_last_irq_en(camif_cfg_t *cfg)
- {
--      if(cfg->exec == CAMIF_BOTH_DMA_ON) {
--              CIPRCTRL |= LAST_IRQ_EN;
--              CICOCTRL |= LAST_IRQ_EN;
--      }
--      else {
--              if (cfg->dma_type & CAMIF_CODEC) 
--                      CICOCTRL |= LAST_IRQ_EN;
--              else 
--                      CIPRCTRL |= LAST_IRQ_EN;
--      }
-+      if ((cfg->exec == CAMIF_BOTH_DMA_ON) || (cfg->dma_type & CAMIF_CODEC))
-+              writel(readl(camregs + S3C2440_CAM_REG_CICOCTRL) |
-+                      LAST_IRQ_EN, camregs + S3C2440_CAM_REG_CICOCTRL);
-+
-+      if ((cfg->exec == CAMIF_BOTH_DMA_ON) || !(cfg->dma_type & CAMIF_CODEC))
-+              writel(readl(camregs + S3C2440_CAM_REG_CIPRCTRL) |
-+                      LAST_IRQ_EN, camregs + S3C2440_CAM_REG_CIPRCTRL);
- }
- static int  
-@@ -502,23 +504,33 @@ int camif_g_fifo_status(camif_cfg_t *cfg)
-       u32 reg;
-       if (cfg->dma_type & CAMIF_CODEC) {
--              u32 flag = CO_OVERFLOW_Y|CO_OVERFLOW_CB|CO_OVERFLOW_CR;
--              reg = CICOSTATUS;
-+              u32 flag = CO_OVERFLOW_Y | CO_OVERFLOW_CB | CO_OVERFLOW_CR;
-+              reg = readl(camregs + S3C2440_CAM_REG_CICOSTATUS);
-               if (reg & flag) {
-                       printk("CODEC: FIFO error(0x%08x) and corrected\n",reg);
-                       /* FIFO Error Count ++  */
--                      CIWDOFST |= CO_FIFO_Y|CO_FIFO_CB|CO_FIFO_CR;
--                      CIWDOFST &= ~(CO_FIFO_Y|CO_FIFO_CB|CO_FIFO_CR);
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIWDOFST) |
-+                              CO_FIFO_Y | CO_FIFO_CB | CO_FIFO_CR,
-+                              camregs + S3C2440_CAM_REG_CIWDOFST);
-+
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIWDOFST) &
-+                              ~(CO_FIFO_Y | CO_FIFO_CB | CO_FIFO_CR),
-+                              camregs + S3C2440_CAM_REG_CIWDOFST);
-                       return 1; /* Error */
-               }
-       }
-       if (cfg->dma_type & CAMIF_PREVIEW) {
--              u32 flag = PR_OVERFLOW_CB|PR_OVERFLOW_CR;
--              reg = CIPRSTATUS;
-+              u32 flag = PR_OVERFLOW_CB | PR_OVERFLOW_CR;
-+              reg = readl(camregs + S3C2440_CAM_REG_CIPRSTATUS);
-               if (reg & flag) {
-                       printk("PREVIEW:FIFO error(0x%08x) and corrected\n",reg);
--                      CIWDOFST |= PR_FIFO_CB|PR_FIFO_CR;
--                      CIWDOFST &= ~(CO_FIFO_Y|CO_FIFO_CB|CO_FIFO_CR);
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIWDOFST) |
-+                              CO_FIFO_CB | CO_FIFO_CR,
-+                              camregs + S3C2440_CAM_REG_CIWDOFST);
-+
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIWDOFST) &
-+                              ~(CO_FIFO_Y | CO_FIFO_CB | CO_FIFO_CR),
-+                              camregs + S3C2440_CAM_REG_CIWDOFST);
-                       /* FIFO Error Count ++  */
-                       return 1; /* Error */
-               }
-@@ -537,13 +549,16 @@ int camif_win_offset(camif_gc_t *gc )
-       u32 v = gc->win_ver_ofst;
-       /*Clear Overflow */
--      CIWDOFST = CO_FIFO_Y|CO_FIFO_CB|CO_FIFO_CR|PR_FIFO_CB|PR_FIFO_CB;
--      CIWDOFST = 0;           /* ? Dummy */
-+      writel(CO_FIFO_Y | CO_FIFO_CB | CO_FIFO_CR | PR_FIFO_CB | PR_FIFO_CB,
-+              camregs + S3C2440_CAM_REG_CIWDOFST);
-+      writel(0, camregs + S3C2440_CAM_REG_CIWDOFST);
-+
-       if (!h && !v)   {
--              CIWDOFST = 0;
-+              writel(0, camregs + S3C2440_CAM_REG_CIWDOFST);
-               return 0;
-       }
--      CIWDOFST = WINOFEN | WINHOROFST(h) | WINVEROFST(v);
-+
-+      writel(WINOFEN | WINHOROFST(h) | WINVEROFST(v), camregs + S3C2440_CAM_REG_CIWDOFST);
-       return 0;
- }
-@@ -554,7 +569,7 @@ int camif_win_offset(camif_gc_t *gc )
-  */
- static void camif_polarity(camif_gc_t *gc)
- {
--      u32 cmd = CIGCTRL;
-+      u32 cmd = readl(camregs + S3C2440_CAM_REG_CIGCTRL);;
-       
-       cmd = cmd & ~(BIT26|BIT25|BIT24); /* clear polarity */
-       if (gc->polarity_pclk)
-@@ -563,7 +578,8 @@ static void camif_polarity(camif_gc_t *gc)
-               cmd |= GC_INVPOLVSYNC;
-       if (gc->polarity_href)
-               cmd |= GC_INVPOLHREF;
--      CIGCTRL |= cmd;
-+      writel(readl(camregs + S3C2440_CAM_REG_CIGCTRL) |
-+             cmd, camregs + S3C2440_CAM_REG_CIGCTRL);
- }
-@@ -599,12 +615,13 @@ int camif_dynamic_close(camif_cfg_t *cfg)
- static int camif_target_area(camif_cfg_t *cfg) 
- {
-       u32 rect = cfg->target_x * cfg->target_y;
--      if (cfg->dma_type & CAMIF_CODEC ) {
--              CICOTAREA = rect;
--      }
--      if (cfg->dma_type & CAMIF_PREVIEW) {
--              CIPRTAREA = rect;
--      }
-+
-+      if (cfg->dma_type & CAMIF_CODEC)
-+              writel(rect, camregs + S3C2440_CAM_REG_CICOTAREA);
-+
-+      if (cfg->dma_type & CAMIF_PREVIEW)
-+              writel(rect, camregs + S3C2440_CAM_REG_CIPRTAREA);
-+
-       return 0;
- }
-@@ -613,40 +630,44 @@ static int inline camif_hw_reg(camif_cfg_t *cfg)
-       u32 cmd = 0;
-       if (cfg->dma_type & CAMIF_CODEC) {
--              CICOSCPRERATIO = PRE_SHIFT(cfg->sc.shfactor)
--                      |PRE_HRATIO(cfg->sc.prehratio)|PRE_VRATIO(cfg->sc.prevratio);
--              CICOSCPREDST = 
--                      PRE_DST_WIDTH(cfg->sc.predst_x)|PRE_DST_HEIGHT(cfg->sc.predst_y);
-+              writel(PRE_SHIFT(cfg->sc.shfactor) |
-+                     PRE_HRATIO(cfg->sc.prehratio) |
-+                     PRE_VRATIO(cfg->sc.prevratio),
-+                     camregs + S3C2440_CAM_REG_CICOSCPRERATIO);
-+              writel(PRE_DST_WIDTH(cfg->sc.predst_x) |
-+                     PRE_DST_HEIGHT(cfg->sc.predst_y),
-+                     camregs + S3C2440_CAM_REG_CICOSCPREDST);
-               /* Differ from Preview */
-               if (cfg->sc.scalerbypass)
-                       cmd |= SCALERBYPASS;
-               if (cfg->sc.scaleup_h & cfg->sc.scaleup_v)
-                       cmd |= BIT30|BIT29;
--              CICOSCCTRL = cmd | MAIN_HRATIO(cfg->sc.mainhratio)
--                      |MAIN_VRATIO(cfg->sc.mainvratio);
-+              writel(cmd | MAIN_HRATIO(cfg->sc.mainhratio) |
-+                     MAIN_VRATIO(cfg->sc.mainvratio),
-+                     camregs + S3C2440_CAM_REG_CICOSCCTRL);
-               return 0;
-       }
--      else if (cfg->dma_type & CAMIF_PREVIEW) {
--              CIPRSCPRERATIO = PRE_SHIFT(cfg->sc.shfactor)
--                      |PRE_HRATIO(cfg->sc.prehratio)|PRE_VRATIO(cfg->sc.prevratio);
--              CIPRSCPREDST = 
--                      PRE_DST_WIDTH(cfg->sc.predst_x)|PRE_DST_HEIGHT(cfg->sc.predst_y);
-+      if (cfg->dma_type & CAMIF_PREVIEW) {
-+              writel(PRE_SHIFT(cfg->sc.shfactor) |
-+                     PRE_HRATIO(cfg->sc.prehratio) |
-+                     PRE_VRATIO(cfg->sc.prevratio),
-+                     camregs + S3C2440_CAM_REG_CIPRSCPRERATIO);
-+              writel(PRE_DST_WIDTH(cfg->sc.predst_x) |
-+                     PRE_DST_HEIGHT(cfg->sc.predst_y),
-+                     camregs + S3C2440_CAM_REG_CIPRSCPREDST);
-               /* Differ from Codec */
--              if (cfg->fmt & CAMIF_RGB24) {
-+              if (cfg->fmt & CAMIF_RGB24)
-                       cmd |= RGB_FMT24;  
--              }
--              else {
--                      /* RGB16 */;
--              }               
-               if (cfg->sc.scaleup_h & cfg->sc.scaleup_v)
--                      cmd |= BIT29|BIT28;
--              CIPRSCCTRL = cmd |MAIN_HRATIO(cfg->sc.mainhratio)|S_METHOD
--                      |MAIN_VRATIO(cfg->sc.mainvratio);
--      }else {
--              panic("CAMERA:DMA_TYPE Wrong \n");
-+                      cmd |= BIT29 | BIT28;
-+              writel(cmd | MAIN_HRATIO(cfg->sc.mainhratio) | S_METHOD |
-+                     MAIN_VRATIO(cfg->sc.mainvratio),
-+                     camregs + S3C2440_CAM_REG_CIPRSCCTRL);
-+              return 0;
-       }
-+      panic("CAMERA:DMA_TYPE Wrong \n");
-       return 0;
- }
-@@ -654,46 +675,50 @@ static int inline camif_hw_reg(camif_cfg_t *cfg)
- /* Configure Pre-scaler control  & main scaler control register */
- static int camif_scaler(camif_cfg_t *cfg)
- {
--      int tx = cfg->target_x,ty=cfg->target_y;
-+      int tx = cfg->target_x, ty = cfg->target_y;
-       int sx, sy;
--      if (tx <= 0 || ty<= 0)  panic("CAMERA: Invalid target size \n");
-+      if (tx <= 0 || ty <= 0)
-+              panic("CAMERA: Invalid target size \n");
-+
-+      sx = cfg->gc->source_x - 2 * cfg->gc->win_hor_ofst;
-+      sy = cfg->gc->source_y - 2 * cfg->gc->win_ver_ofst;     
-+      if (sx <= 0 || sy <= 0)
-+              panic("CAMERA: Invalid source size \n");
--      sx = cfg->gc->source_x - 2*cfg->gc->win_hor_ofst;
--      sy = cfg->gc->source_y - 2*cfg->gc->win_ver_ofst;       
--      if (sx <= 0 || sy<= 0)  panic("CAMERA: Invalid source size \n");
-       cfg->sc.modified_src_x = sx;
-       cfg->sc.modified_src_y = sy;
-       /* Pre-scaler control register 1 */
--      camif_scaler_internal(sx,tx,&cfg->sc.prehratio,&cfg->sc.hfactor);
--      camif_scaler_internal(sy,ty,&cfg->sc.prevratio,&cfg->sc.vfactor);
-+      camif_scaler_internal(sx, tx, &cfg->sc.prehratio, &cfg->sc.hfactor);
-+      camif_scaler_internal(sy, ty, &cfg->sc.prevratio, &cfg->sc.vfactor);
--      if (cfg->dma_type & CAMIF_PREVIEW) {
--              if ( (sx /cfg->sc.prehratio) <= 640 ) {}
--              else {
--                      printk(KERN_INFO "CAMERA: Internal Preview line buffer is 640 pixels\n");
-+      if (cfg->dma_type & CAMIF_PREVIEW)
-+              if ((sx / cfg->sc.prehratio) > 640) {
-+                      printk(KERN_INFO "CAMERA: Internal Preview line "
-+                                       "buffer is 640 pixels\n");
-                       return 1; /* Error */
-               }
--      }
--      cfg->sc.shfactor = 10-(cfg->sc.hfactor+cfg->sc.vfactor);
-+      cfg->sc.shfactor = 10 - (cfg->sc.hfactor + cfg->sc.vfactor);
-       /* Pre-scaler control register 2 */
-       cfg->sc.predst_x = sx / cfg->sc.prehratio;
-       cfg->sc.predst_y = sy / cfg->sc.prevratio;
-       /* Main-scaler control register */
--      cfg->sc.mainhratio = (sx << 8)/(tx << cfg->sc.hfactor);
--      cfg->sc.mainvratio = (sy << 8)/(ty << cfg->sc.vfactor);
--      DPRINTK(" sx %d, sy %d tx %d ty %d  \n",sx,sy,tx,ty);
--      DPRINTK(" hfactor %d  vfactor %d \n",cfg->sc.hfactor,cfg->sc.vfactor);
-+      cfg->sc.mainhratio = (sx << 8) / (tx << cfg->sc.hfactor);
-+      cfg->sc.mainvratio = (sy << 8) / (ty << cfg->sc.vfactor);
-+      DPRINTK(" sx %d, sy %d tx %d ty %d  \n", sx, sy, tx, ty);
-+      DPRINTK(" hfactor %d  vfactor %d \n",cfg->sc.hfactor, cfg->sc.vfactor);
-       cfg->sc.scaleup_h  = (sx <= tx) ? 1: 0;
-       cfg->sc.scaleup_v  = (sy <= ty) ? 1: 0;
--      if ( cfg->sc.scaleup_h != cfg->sc.scaleup_v) 
-+      if (cfg->sc.scaleup_h != cfg->sc.scaleup_v)
-               printk(KERN_ERR "scaleup_h must be same to scaleup_v \n");
-+
-       camif_hw_reg(cfg);
-       camif_target_area(cfg);
-+
-       return 0;
- }
-@@ -706,38 +731,38 @@ static void camif_g_bsize(u32 hsize, u32 *mburst, u32 *rburst)
- {
-       u32 tmp;
--      tmp = (hsize/4) % 16;
-+      tmp = (hsize / 4) % 16;
-       switch(tmp) {
-+      case 0:
-+              *mburst=16;
-+              *rburst=16;
-+              break;
-+      case 4:
-+              *mburst=16;
-+              *rburst=4;
-+              break;
-+      case 8:
-+              *mburst=16;
-+              *rburst=8;
-+              break;
-+      default:
-+              tmp=(hsize / 4) % 8;
-+              switch(tmp) {
-               case 0:
--                      *mburst=16;
--                      *rburst=16;
-+                      *mburst = 8;
-+                      *rburst = 8;
-                       break;
-               case 4:
--                      *mburst=16;
--                      *rburst=4;
--                      break;
--              case 8:
--                      *mburst=16;
--                      *rburst=8;
--                      break;
-+                      *mburst = 8;
-+                      *rburst = 4;
-               default:
--                      tmp=(hsize/4)%8;
--                      switch(tmp) {
--                              case 0:
--                                      *mburst=8;
--                                      *rburst=8;
--                                      break;
--                              case 4:
--                                      *mburst=8;
--                                      *rburst=4;
--                              default:
--                                      *mburst=4;
--                                      tmp=(hsize/4)%4;
--                                      *rburst= (tmp) ? tmp: 4;
--                                      break;
--                      }
-+                      *mburst = 4;
-+                      tmp = (hsize / 4) % 4;
-+                      *rburst= (tmp) ? tmp: 4;
-                       break;
-       }
-+              break;
-+      }
- }
- /* SXGA 1028x1024*/
-@@ -759,24 +784,30 @@ static int camif_dma_burst(camif_cfg_t *cfg)
-               u32 yburst_m, yburst_r;
-               u32 cburst_m, cburst_r;
-               /* CODEC DMA WIDHT is multiple of 16 */
--              if (width %16 != 0 )  return BURST_ERR;   /* DMA Burst Length Error */
--              camif_g_bsize(width,&yburst_m,&yburst_r);
--              camif_g_bsize(width/2,&cburst_m,&cburst_r);
--              CICOCTRL =YBURST_M(yburst_m)|CBURST_M(cburst_m)
--                      |YBURST_R(yburst_r)|CBURST_R(cburst_r);
-+              if (width % 16)
-+                      return BURST_ERR;   /* DMA Burst Length Error */
-+              camif_g_bsize(width, &yburst_m, &yburst_r);
-+              camif_g_bsize(width / 2, &cburst_m, &cburst_r);
-+
-+              writel(YBURST_M(yburst_m) | CBURST_M(cburst_m) |
-+                     YBURST_R(yburst_r) | CBURST_R(cburst_r),
-+                     camregs + S3C2440_CAM_REG_CICOCTRL);
-       }
-       if (cfg->dma_type & CAMIF_PREVIEW) {
-               u32 rgburst_m, rgburst_r;
-               if(cfg->fmt == CAMIF_RGB24) {
--                      if (width %2 != 0 )  return BURST_ERR;   /* DMA Burst Length Error */
-+                      if (width % 2)
-+                              return BURST_ERR;   /* DMA Burst Length Error */
-                       camif_g_bsize(width*4,&rgburst_m,&rgburst_r);
--              }
--              else {          /* CAMIF_RGB16 */
--                      if ((width/2) %2 != 0 )  return BURST_ERR; /* DMA Burst Length Error */
-+              } else {                /* CAMIF_RGB16 */
-+                      if ((width / 2) %2)
-+                              return BURST_ERR; /* DMA Burst Length Error */
-                       camif_g_bsize(width*2,&rgburst_m,&rgburst_r);  
-               }
--                      CIPRCTRL = RGBURST_M(rgburst_m) | RGBURST_R(rgburst_r);
-+
-+              writel(RGBURST_M(rgburst_m) | RGBURST_R(rgburst_r),
-+                     camregs + S3C2440_CAM_REG_CIPRCTRL);
-       }
-       return 0;
- }
-@@ -786,19 +817,20 @@ static int camif_gpio_init(void)
- #ifdef CONFIG_ARCH_S3C24A0A
-       /* S3C24A0A has the dedicated signal pins for Camera */
- #else
--      set_gpio_ctrl(GPIO_CAMDATA0);
--      set_gpio_ctrl(GPIO_CAMDATA1);
--      set_gpio_ctrl(GPIO_CAMDATA2);
--      set_gpio_ctrl(GPIO_CAMDATA3);
--      set_gpio_ctrl(GPIO_CAMDATA4);
--      set_gpio_ctrl(GPIO_CAMDATA5);
--      set_gpio_ctrl(GPIO_CAMDATA6);
--      set_gpio_ctrl(GPIO_CAMDATA7);
--      set_gpio_ctrl(GPIO_CAMPCLKIN);
--      set_gpio_ctrl(GPIO_CAMVSYNC);
--      set_gpio_ctrl(GPIO_CAMHREF);
--      set_gpio_ctrl(GPIO_CAMPCLKOUT);
--      set_gpio_ctrl(GPIO_CAMRESET);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ0, S3C2440_GPJ0_CAMDATA0);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ1, S3C2440_GPJ1_CAMDATA1);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ2, S3C2440_GPJ2_CAMDATA2);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ3, S3C2440_GPJ3_CAMDATA3);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ4, S3C2440_GPJ4_CAMDATA4);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ5, S3C2440_GPJ5_CAMDATA5);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ6, S3C2440_GPJ6_CAMDATA6);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ7, S3C2440_GPJ7_CAMDATA7);
-+
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ8, S3C2440_GPJ8_CAMPCLK);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ9, S3C2440_GPJ9_CAMVSYNC);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ10, S3C2440_GPJ10_CAMHREF);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ11, S3C2440_GPJ11_CAMCLKOUT);
-+      s3c2410_gpio_cfgpin(S3C2440_GPJ12, S3C2440_GPJ12_CAMRESET);
- #endif
-         return 0;
- }
-@@ -827,21 +859,33 @@ int camif_clock_init(camif_gc_t *gc)
-       camclk_div = (upll+ROUND_ADD) / camclk - 1;
-       CLKDIVN = (CLKDIVN & 0xFF) | CLKDIVN_CAM(camclk_div);
-       printk(KERN_INFO"CAMERA:upll %d MACRO 0x%08X CLKDIVN 0x%08X \n",
--                              upll, CLKDIVN_CAM(camclk_div),CLKDIVN);
--      CIIMGCPT = 0;           /* Dummy ? */
-+                              upll, CLKDIVN_CAM(camclk_div), CLKDIVN);
-+      writel(0, camregs + S3C2440_CAM_REG_CIIMGCPT);  /* Dummy ? */
-+
-       return 0;
- }
- #else
- int camif_clock_init(camif_gc_t *gc)
- {
--      unsigned int upll, camclk_div, camclk;
--      if (!gc) camclk = 24000000;
--      else  {
-+      unsigned int camclk;
-+      struct clk *clk_camif = clk_get(NULL, "camif");
-+      struct clk *clk_camif_upll = clk_get(NULL, "camif-upll");
-+
-+      if (!gc)
-+              camclk = 24000000;
-+      else {
-               camclk = gc->camclk;
-               if (camclk > 48000000)
-                       printk(KERN_ERR "Wrong Camera Clock\n");
-       }
-+      clk_set_rate(clk_camif, camclk);
-+
-+      clk_enable(clk_camif);
-+      clk_enable(clk_camif_upll);
-+      
-+
-+#if 0
-       CLKCON |= CLKCON_CAMIF;
-       upll = elfin_get_bus_clk(GET_UPLL);
-       printk(KERN_INFO "CAMERA:Default UPLL %08d and Assing 96Mhz to UPLL\n",upll);   
-@@ -854,7 +898,9 @@ int camif_clock_init(camif_gc_t *gc)
-       camclk_div = (upll+ROUND_ADD) /(camclk * 2) -1;
-       CAMDIVN = CAMCLK_SET_DIV|(camclk_div&0xf);
-       printk(KERN_INFO "CAMERA:upll %08d  cam_clk %08d CAMDIVN 0x%08x \n",upll,camclk, CAMDIVN);
--      CIIMGCPT = 0;           /* Dummy ? */
-+#endif
-+      writel(0, camregs + S3C2440_CAM_REG_CIIMGCPT);  /* Dummy ? */
-+
-       return 0;
- }
- #endif
-@@ -867,23 +913,39 @@ void camif_reset(int is, int delay)
- {
-       switch (is) {
-               case CAMIF_RESET:
--                      CIGCTRL |= GC_SWRST;
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIGCTRL) |
-+                             GC_SWRST,
-+                             camregs + S3C2440_CAM_REG_CIGCTRL);
-                       mdelay(1);
--                      CIGCTRL &= ~GC_SWRST;
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIGCTRL) &
-+                             ~GC_SWRST,
-+                             camregs + S3C2440_CAM_REG_CIGCTRL);
-                       break;
-               case CAMIF_EX_RESET_AH: /*Active High */
--                      CIGCTRL &= ~GC_CAMRST; 
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIGCTRL) &
-+                             ~GC_CAMRST,
-+                             camregs + S3C2440_CAM_REG_CIGCTRL);
-                       udelay(200);
--                      CIGCTRL |= GC_CAMRST;
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIGCTRL) |
-+                             GC_CAMRST,
-+                             camregs + S3C2440_CAM_REG_CIGCTRL);
-                       udelay(delay);
--                      CIGCTRL &= ~GC_CAMRST;
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIGCTRL) &
-+                             ~GC_CAMRST,
-+                             camregs + S3C2440_CAM_REG_CIGCTRL);
-                       break;
-               case CAMIF_EX_RESET_AL: /*Active Low */
--                      CIGCTRL |=  GC_CAMRST;
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIGCTRL) |
-+                             GC_CAMRST,
-+                             camregs + S3C2440_CAM_REG_CIGCTRL);
-                       udelay(200);
--                      CIGCTRL &= ~GC_CAMRST;
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIGCTRL) &
-+                             ~GC_CAMRST,
-+                             camregs + S3C2440_CAM_REG_CIGCTRL);
-                       udelay(delay);
--                      CIGCTRL |= GC_CAMRST;
-+                      writel(readl(camregs + S3C2440_CAM_REG_CIGCTRL) |
-+                             GC_CAMRST,
-+                             camregs + S3C2440_CAM_REG_CIGCTRL);
-                       break;
-               default:
-                       break;
-@@ -908,10 +970,10 @@ static void camif_bus_priority(int flag)
-               PRIORITY1 = PRIORITY_I_FIX;
- #else
--              old_priority = PRIORITY;        
--              PRIORITY &= ~(3<<7);
--              PRIORITY |=  (1<<7); /* Arbiter 1, REQ2 first */
--              PRIORITY &= ~(1<<1); /* Disable Priority Rotate */
-+              old_priority = readl(S3C2410_PRIORITY);
-+              writel(readl(S3C2410_PRIORITY) & ~(3<<7), S3C2410_PRIORITY);
-+              writel(readl(S3C2410_PRIORITY) |  (1<<7), S3C2410_PRIORITY); /* Arbiter 1, REQ2 first */
-+              writel(readl(S3C2410_PRIORITY) & ~(1<<1), S3C2410_PRIORITY); /* Disable Priority Rotate */
- #endif
-       } 
-       else {
-@@ -919,19 +981,26 @@ static void camif_bus_priority(int flag)
-               PRIORITY0 = old_priority;
-               PRIORITY1 = old_priority;
- #else
--              PRIORITY = old_priority;
-+              writel(old_priority, S3C2410_PRIORITY);
- #endif
-       }
- }
- static void inline camif_clock_off(void)
- {
--      CIIMGCPT = 0;
- #if defined (CONFIG_ARCH_S3C24A0A)
-+      writel(0, camregs + S3C2440_CAM_REG_CIIMGCPT);
-+
-       CLKCON &= ~CLKCON_CAM_UPLL;
-       CLKCON &= ~CLKCON_CAM_HCLK;
- #else
--      CLKCON &= ~CLKCON_CAMIF;
-+      struct clk *clk_camif = clk_get(NULL, "camif");
-+      struct clk *clk_camif_upll = clk_get(NULL, "camif-upll");
-+
-+      writel(0, camregs + S3C2440_CAM_REG_CIIMGCPT);
-+
-+      clk_disable(clk_camif);
-+      clk_disable(clk_camif_upll);
- #endif
- }
-diff --git a/arch/arm/mach-s3c2440/camera/camif_fsm.c b/arch/arm/mach-s3c2440/camera/camif_fsm.c
-index 3e2b71a..b534aca 100644
---- a/arch/arm/mach-s3c2440/camera/camif_fsm.c
-+++ b/arch/arm/mach-s3c2440/camera/camif_fsm.c
-@@ -31,7 +31,12 @@
- #include <asm/semaphore.h>
- #include <linux/miscdevice.h>
-+#define CONFIG_VIDEO_V4L1_COMPAT
-+#include <linux/videodev.h>
-+#include "camif.h"
-+
- //#define SW_DEBUG 
-+static void camif_start_p_with_c(camif_cfg_t *cfg);
- #include "camif.h"
- const char *fsm_version =
-diff --git a/arch/arm/mach-s3c2440/camera/imgsensor.c b/arch/arm/mach-s3c2440/camera/imgsensor.c
-index 44b7bee..2099b69 100644
---- a/arch/arm/mach-s3c2440/camera/imgsensor.c
-+++ b/arch/arm/mach-s3c2440/camera/imgsensor.c
-@@ -11,7 +11,7 @@
-  *  Driver for FIMC20 Camera Decoder 
-  */
--#include <linux/config.h>
-+
- #include <linux/module.h>
- #include <linux/kernel.h>
- #include <linux/init.h>
-@@ -24,10 +24,12 @@
- #ifdef CONFIG_ARCH_S3C24A0A
- #else
--#include <asm/arch/S3C2440.h>
-+//#include <asm/arch/S3C2440.h>
- #endif
- #define SW_DEBUG
-+#define CONFIG_VIDEO_V4L1_COMPAT
-+#include <linux/videodev.h>
- #include "camif.h"
- #include "sensor.h"
-@@ -37,10 +39,6 @@
- #include "sxga.h"
- #endif
--static const char *sensor_version =
--        "$Id: imgsensor.c,v 1.11 2004/06/10 12:45:40 swlee Exp $";
--
--
- static struct i2c_driver s5x532_driver;
- static camif_gc_t data = {
-       itu_fmt:      CAMIF_ITU601,
-@@ -69,22 +67,18 @@ static camif_gc_t data = {
- #define CAM_ID 0x5a
--static unsigned short ignore[] = { I2C_CLIENT_END };
-+static unsigned short ignore = I2C_CLIENT_END;
- static unsigned short normal_addr[] = { (CAM_ID>>1), I2C_CLIENT_END };
- static struct i2c_client_address_data addr_data = {
-       normal_i2c:             normal_addr,
--      normal_i2c_range:       ignore,
--      probe:                  ignore,
--      probe_range:            ignore,
--      ignore:                 ignore,
--      ignore_range:           ignore,
--      force:                  ignore,
-+      probe:                  &ignore,
-+      ignore:                 &ignore,
- };
- s5x532_t s5x532_regs_mirror[S5X532_REGS];
- unsigned char 
--s5x532_read(struct i2c_client *client,unsigned char subaddr)
-+s5x532_read(struct i2c_client *client, unsigned char subaddr)
- {
-       int ret;
-       unsigned char buf[1];
-@@ -151,7 +145,7 @@ void inline s5x532_init(struct i2c_client *sam_client)
- }
- static int
--s5x532_attach(struct i2c_adapter *adap, int addr, unsigned short flags,int kind)
-+s5x532_attach(struct i2c_adapter *adap, int addr, int kind)
- {
-       struct i2c_client *c;
-@@ -159,13 +153,13 @@ s5x532_attach(struct i2c_adapter *adap, int addr, unsigned short flags,int kind)
-       if (!c) return -ENOMEM;
-       strcpy(c->name, "S5X532");
--      c->id           = s5x532_driver.id;
--      c->flags        = I2C_CLIENT_ALLOW_USE;
-+//    c->id           = s5x532_driver.id;
-+      c->flags        = 0 /* I2C_CLIENT_ALLOW_USE */;
-       c->addr         = addr;
-       c->adapter      = adap;
-       c->driver       = &s5x532_driver;
--      c->data         = &data;
--      data.sensor     = c; 
-+      data.sensor     = c;
-+      i2c_set_clientdata(c, &data);
-       camif_register_decoder(c);
-       return i2c_attach_client(c);
-@@ -192,10 +186,10 @@ s5x532_command(struct i2c_client *client, unsigned int cmd, void *arg)
-                printk(KERN_INFO "CAMERA: S5X532 Sensor initialized\n");
-                break;
-       case USER_ADD:
--              MOD_INC_USE_COUNT;
-+              /* MOD_INC_USE_COUNT; uh.. 2.6 deals with this, old-timer */
-               break;
-       case USER_EXIT:
--              MOD_DEC_USE_COUNT;
-+              /* MOD_DEC_USE_COUNT; */
-               break;
- /* Todo
-       case SENSOR_BRIGHTNESS:
-@@ -210,9 +204,8 @@ s5x532_command(struct i2c_client *client, unsigned int cmd, void *arg)
- }
- static struct i2c_driver s5x532_driver = {
--      name:           "S5X532",
--      id:             I2C_ALGO_S3C,
--      flags:          I2C_DF_NOTIFY,
-+      driver:         { name:         "S5X532" },
-+      id:             0, /* optional in i2c-id.h I2C_ALGO_S3C, */
-       attach_adapter: s5x532_probe,
-       detach_client:  s5x532_detach,
-       command:        s5x532_command
-@@ -220,11 +213,13 @@ static struct i2c_driver s5x532_driver = {
- static void iic_gpio_port(void) 
- {
-+/*    FIXME: no gpio config for i2c !!!
- #ifdef CONFIG_ARCH_S3C24A0A
- #else
-       GPECON &=  ~(0xf <<28);
-       GPECON |=    0xa <<28;
- #endif
-+*/
- }
- static __init int camif_sensor_init(void)
-diff --git a/arch/arm/mach-s3c2440/camera/qt-driver.c b/arch/arm/mach-s3c2440/camera/qt-driver.c
-index 0c5dd40..cbf8565 100644
---- a/arch/arm/mach-s3c2440/camera/qt-driver.c
-+++ b/arch/arm/mach-s3c2440/camera/qt-driver.c
-@@ -31,12 +31,15 @@
-                                                                                                            
- //#define SW_DEBUG
-                                                                                                            
-+#define CONFIG_VIDEO_V4L1_COMPAT
-+#include <linux/videodev.h>
- #include "camif.h"
--#include "videodev.h"
- #include "miscdevice.h"
- #include "cam_reg.h"
- #include "sensor.h"
- #include "userapp.h"
-+
-+extern camif_cfg_t * get_camif(int nr);
-                                                                                                            
- /************************* Sharp Zarus API **************************
-diff --git a/arch/arm/mach-s3c2440/camera/video-driver.c b/arch/arm/mach-s3c2440/camera/video-driver.c
-index fe9130c..9c77475 100644
---- a/arch/arm/mach-s3c2440/camera/video-driver.c
-+++ b/arch/arm/mach-s3c2440/camera/video-driver.c
-@@ -29,11 +29,12 @@
- #include <asm/irq.h>
- #include <asm/semaphore.h>
- #include <linux/miscdevice.h>
-+#include <asm/arch/irqs.h>
- //#define SW_DEBUG 
--
-+#define CONFIG_VIDEO_V4L1_COMPAT
-+#include <linux/videodev.h>
- #include "camif.h"
--#include "videodev.h"
- #include "miscdevice.h"
- #include "cam_reg.h"
- #include "sensor.h"
-@@ -46,12 +47,14 @@
- /* Codec and Preview */
- #define CAMIF_NUM  2
- static camif_cfg_t  fimc[CAMIF_NUM];
-+u32 *camregs;
- static const char *driver_version = 
-       "$Id: video-driver.c,v 1.9 2004/06/02 03:10:36 swlee Exp $";
- extern const char *fimc_version;
- extern const char *fsm_version;
-+extern void camif_start_c_with_p (camif_cfg_t *cfg, camif_cfg_t *other);
- camif_cfg_t * get_camif(int nr)
- {
-@@ -177,28 +180,34 @@ camif_c_read(struct file *file, char *buf, size_t count, loff_t *pos)
- }
--static void camif_c_irq(int irq, void *dev_id, struct pt_regs *regs)
-+static irqreturn_t camif_c_irq(int irq, void *dev_id)
- {
-         camif_cfg_t *cfg = (camif_cfg_t *)dev_id;
-+
-       DPRINTK("\n");
-       camif_g_fifo_status(cfg);
-       camif_g_frame_num(cfg);
--      if(camif_enter_c_4fsm(cfg) == INSTANT_SKIP) return;
--      wake_up_interruptible(&cfg->waitq);
-+      if(camif_enter_c_4fsm(cfg) != INSTANT_SKIP)
-+              wake_up_interruptible(&cfg->waitq);
-+
-+      return IRQ_HANDLED;
- }
--static void camif_p_irq(int irq, void *dev_id, struct pt_regs * regs)
-+static irqreturn_t camif_p_irq(int irq, void *dev_id)
- {
-         camif_cfg_t *cfg = (camif_cfg_t *)dev_id;
-+
-       DPRINTK("\n");
-       camif_g_fifo_status(cfg);
-       camif_g_frame_num(cfg);
--      if(camif_enter_p_4fsm(cfg) == INSTANT_SKIP) return;
--      wake_up_interruptible(&cfg->waitq);
-+      if(camif_enter_p_4fsm(cfg) != INSTANT_SKIP)
-+              wake_up_interruptible(&cfg->waitq);
- #if 0
-       if( (cfg->perf.frames % 5) == 0)
-               DPRINTK("5\n");
- #endif
-+
-+      return IRQ_HANDLED;
- }
- static void camif_release_irq(camif_cfg_t *cfg)
-@@ -213,13 +222,13 @@ static int camif_irq_request(camif_cfg_t *cfg)
-       if (cfg->dma_type & CAMIF_CODEC) {
-               if ((ret = request_irq(cfg->irq, camif_c_irq, 
--                             SA_INTERRUPT,cfg->shortname, cfg))) {
-+                             0, cfg->shortname, cfg))) {
-                       printk("request_irq(CAM_C) failed.\n");
-               }
-       }
-       if (cfg->dma_type & CAMIF_PREVIEW) {
-               if ((ret = request_irq(cfg->irq, camif_p_irq,
--                             SA_INTERRUPT,cfg->shortname, cfg))) {
-+                             0, cfg->shortname, cfg))) {
-                       printk("request_irq(CAM_P) failed.\n");
-               }
-       }
-@@ -438,7 +447,7 @@ static struct video_device codec_template =
- {
-       .name     = "CODEC_IF",
-       .type     = VID_TYPE_CAPTURE|VID_TYPE_CLIPPING|VID_TYPE_SCALES,
--      .hardware = VID_HARDWARE_SAMSUNG_FIMC20,
-+/*    .hardware = VID_HARDWARE_SAMSUNG_FIMC20, */
-       .fops     = &camif_c_fops,
- //    .release  = camif_release
-       .minor    = -1,
-@@ -448,7 +457,7 @@ static struct video_device preview_template =
- {
-       .name     = "PREVIEW_IF",
-       .type     = VID_TYPE_CAPTURE|VID_TYPE_CLIPPING|VID_TYPE_SCALES,
--      .hardware = VID_HARDWARE_SAMSUNG_FIMC20,
-+/*    .hardware = VID_HARDWARE_SAMSUNG_FIMC20, */
-       .fops     = &camif_p_fops,
-       .minor    = -1,
- };
-@@ -465,8 +474,8 @@ static int preview_init(camif_cfg_t *cfg)
-       cfg->fmt      = CAMIF_RGB16;
-       cfg->flip     = CAMIF_FLIP_Y;
-       cfg->v        = &preview_template;
--      init_MUTEX(&cfg->v->lock);
--      cfg->irq       = IRQ_CAM_P;
-+      mutex_init(&cfg->v->lock);
-+      cfg->irq       = IRQ_S3C2440_CAM_P;
-       
-       strcpy(cfg->shortname,name);
-         init_waitqueue_head(&cfg->waitq);
-@@ -486,8 +495,8 @@ static int codec_init(camif_cfg_t *cfg)
-       cfg->fmt      = CAMIF_IN_YCBCR422|CAMIF_OUT_YCBCR420;
-       cfg->flip     = CAMIF_FLIP_X;
-       cfg->v         = &codec_template;
--      init_MUTEX(&cfg->v->lock);
--      cfg->irq       = IRQ_CAM_C;
-+      mutex_init(&cfg->v->lock);
-+      cfg->irq       = IRQ_S3C2440_CAM_C;
-       strcpy(cfg->shortname,name);
-       init_waitqueue_head(&cfg->waitq);
-       cfg->status = CAMIF_STOPPED;
-@@ -510,25 +519,44 @@ static void print_version(void)
- static int camif_m_in(void)
- {
--      int ret = 0;
-+      int ret = -EINVAL;
-       camif_cfg_t * cfg;
-+      printk(KERN_INFO"Starting S3C2440 Camera Driver\n");
-+
-+      camregs = ioremap(CAM_BASE_ADD, 0x100);
-+      if (!camregs) {
-+              printk(KERN_ERR"Unable to map camera regs\n");
-+              ret = -ENOMEM;
-+              goto bail1;
-+      }
-+
-       camif_init();           
-       cfg = get_camif(CODEC_MINOR);
-       codec_init(cfg);
--      if (video_register_device(cfg->v,0,CODEC_MINOR)!=0) {
--                      DPRINTK("Couldn't register codec driver.\n");
--                      return 0;
-+      ret = video_register_device(cfg->v,0,CODEC_MINOR);
-+      if (ret) {
-+                      printk(KERN_ERR"Couldn't register codec driver.\n");
-+                      goto bail2;
-       }
-       cfg = get_camif(PREVIEW_MINOR);
-       preview_init(cfg);
--      if (video_register_device(cfg->v,0,PREVIEW_MINOR)!=0) {
--                      DPRINTK("Couldn't register preview driver.\n");
--                      return 0;
-+      ret = video_register_device(cfg->v,0,PREVIEW_MINOR);
-+      if (ret) {
-+                      printk(KERN_ERR"Couldn't register preview driver.\n");
-+                      goto bail3; /* hm seems it us unregistered the once */
-       }
-       
-       print_version();
-+      return 0;
-+
-+bail3:
-+      video_unregister_device(cfg->v);
-+bail2:
-+      iounmap(camregs);
-+      camregs = NULL;
-+bail1:
-       return ret;
- }
-@@ -536,7 +564,9 @@ static void unconfig_device(camif_cfg_t *cfg)
- {
-       video_unregister_device(cfg->v);
-       camif_hw_close(cfg);
-+      iounmap(camregs);
-       //memset(cfg, 0, sizeof(camif_cfg_t));
-+      camregs = NULL;
- }
- static void camif_m_out(void) /* module out */
-@@ -547,20 +577,22 @@ static void camif_m_out(void)    /* module out */
-       unconfig_device(cfg);
-       cfg = get_camif(PREVIEW_MINOR);
-       unconfig_device(cfg);
-+
-       return;
- }
- void camif_register_decoder(struct i2c_client *ptr)
- {
-       camif_cfg_t *cfg;
-+      void * data = i2c_get_clientdata(ptr);
-       cfg =get_camif(CODEC_MINOR);
--      cfg->gc = (camif_gc_t *)(ptr->data);
-+      cfg->gc = (camif_gc_t *)(data);
-       cfg =get_camif(PREVIEW_MINOR);
--      cfg->gc = (camif_gc_t *)(ptr->data);
-+      cfg->gc = (camif_gc_t *)(data);
--      sema_init(&cfg->gc->lock,1); /* global lock for both Codec and Preview */
-+      sema_init(&cfg->gc->lock, 1); /* global lock for both Codec and Preview */
-       cfg->gc->status |= PNOTWORKING; /* Default Value */
-       camif_hw_open(cfg->gc);
- }
-@@ -568,8 +600,9 @@ void camif_register_decoder(struct i2c_client *ptr)
- void camif_unregister_decoder(struct i2c_client *ptr)
- {
-       camif_gc_t *gc;
-+      void * data = i2c_get_clientdata(ptr);
-               
--      gc = (camif_gc_t *)(ptr->data); 
-+      gc = (camif_gc_t *)(data);
-       gc->init_sensor = 0; /* need to modify */
- }
-diff --git a/arch/arm/mach-s3c2440/camera/videodev.c b/arch/arm/mach-s3c2440/camera/videodev.c
-index 0b3498f..6f862e4 100644
---- a/arch/arm/mach-s3c2440/camera/videodev.c
-+++ b/arch/arm/mach-s3c2440/camera/videodev.c
-@@ -22,7 +22,7 @@
- #include <linux/init.h>
- #include <linux/kmod.h>
- #include <linux/slab.h>
--#include <linux/devfs_fs_kernel.h>
-+/* #include <linux/devfs_fs_kernel.h> */
- #include <linux/miscdevice.h>
- #include <asm/uaccess.h>
- #include <asm/system.h>
-@@ -30,8 +30,9 @@
-+#define CONFIG_VIDEO_V4L1_COMPAT
-+#include <linux/videodev.h>
- #include "camif.h"
--#include "videodev.h"
- #include "miscdevice.h"
-@@ -42,18 +43,7 @@ const char *fimc_version = "$Id: videodev.c,v 1.1.1.1 2004/04/27 03:52:50 swlee
- #define VIDEO_NAME              "video4linux"
--static inline unsigned iminor(struct inode *inode)
--{
--        return MINOR(inode->i_rdev);
--}
--
--static inline unsigned imajor(struct inode *inode)
--{
--        return MAJOR(inode->i_rdev);
--}
--
--
--#define VIDEO_NUM_DEVICES     2 
-+#define VIDEO_NUM_DEVICES     2
- static struct video_device *video_device[VIDEO_NUM_DEVICES];
- static inline struct video_device * get_vd(int nr)
-@@ -104,7 +94,7 @@ static int video_open(struct inode *inode, struct file *file)
-       int minor = MINOR(inode->i_rdev);
-       int err = 0;
-       struct video_device *vfl;
--      struct file_operations *old_fops;
-+      struct file_operations const *old_fops;
-       
-       down(&videodev_lock);
-@@ -131,13 +121,13 @@ extern int video_exclusive_open(struct inode *inode, struct file *file)
-       struct  video_device *vfl = get_vd(MINOR(inode->i_rdev));
-       int retval = 0;
--      down(&vfl->lock);
-+      mutex_lock(&vfl->lock);
-       if (vfl->users) {
-               retval = -EBUSY;
-       } else {
-               vfl->users++;
-       }
--      up(&vfl->lock);
-+      mutex_unlock(&vfl->lock);
-       return retval;
- }
-diff --git a/arch/arm/mach-s3c2440/camera/videodev.h b/arch/arm/mach-s3c2440/camera/videodev.h
-index f12db43..1c2e35a 100644
---- a/arch/arm/mach-s3c2440/camera/videodev.h
-+++ b/arch/arm/mach-s3c2440/camera/videodev.h
-@@ -1,11 +1,11 @@
--#ifndef __LINUX_S3C_VIDEODEV_H
--#define __LINUX_S3C_VIDEODEV_H
-+//#ifndef __LINUX_S3C_VIDEODEV_H
-+//#define __LINUX_S3C_VIDEODEV_H
- #include <linux/types.h>
- #include <linux/version.h>
--#include "videodev2.h"
--
-+#include <media/v4l2-dev.h>
-+#if 0
- struct video_device
- {
-       /* device info */
-@@ -96,12 +96,10 @@ extern int video_usercopy(struct inode *inode, struct file *file,
--#define VID_HARDWARE_SAMSUNG_FIMC  255    
--
--
--
--#endif 
-+#endif
-+//#endif 
-+#define VID_HARDWARE_SAMSUNG_FIMC  255
- /*
-  * Local variables:
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1147-fix-remove-unused-model-name-bq27000.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1147-fix-remove-unused-model-name-bq27000.patch.patch
deleted file mode 100755 (executable)
index 220bccc..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From c9b85043f76e48fc6f74b22522f438d5530763d4 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:10 +0100
-Subject: [PATCH] fix-remove-unused-model-name-bq27000.patch
-
-Model name isn't in the bq27000 register set, remove the
-claim that we can deliver it
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/power/bq27000_battery.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/power/bq27000_battery.c b/drivers/power/bq27000_battery.c
-index d19186a..aee8018 100644
---- a/drivers/power/bq27000_battery.c
-+++ b/drivers/power/bq27000_battery.c
-@@ -269,7 +269,6 @@ static enum power_supply_property bq27000_battery_props[] = {
-       POWER_SUPPLY_PROP_PRESENT,
-       POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW,
-       POWER_SUPPLY_PROP_TIME_TO_FULL_NOW,
--      POWER_SUPPLY_PROP_MODEL_NAME,
-       POWER_SUPPLY_PROP_CAPACITY
- };
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1148-Fix-possible-null-pointer-dereference-in-s3c24xx_i2c.patch b/target/linux/s3c24xx/patches-2.6.26/1148-Fix-possible-null-pointer-dereference-in-s3c24xx_i2c.patch
deleted file mode 100755 (executable)
index be17c74..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-From 2d2a18cc16e881f2b2d3584e5c8a3f2f949bf22f Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:10 +0100
-Subject: [PATCH] Fix possible null pointer dereference in s3c24xx_i2c_resume
-
-From 0b9bae6aed5268707b348e48a01411ba420844e1 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Tue, 27 May 2008 14:41:35 +0200
-Subject: [PATCH] [janitor] Fix possible null pointer dereference
-     Judging by the control flow of the resume method i2c->suspended++ could
-     lead to a null pointer dereference.
----
- drivers/i2c/busses/i2c-s3c2410.c |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
-index 02459d7..58970fe 100644
---- a/drivers/i2c/busses/i2c-s3c2410.c
-+++ b/drivers/i2c/busses/i2c-s3c2410.c
-@@ -918,10 +918,10 @@ static int s3c24xx_i2c_resume(struct platform_device *dev)
- {
-       struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);
--      if (i2c != NULL)
-+      if (i2c != NULL) {
-               s3c24xx_i2c_init(i2c);
--
--      i2c->suspended--;
-+              i2c->suspended--;
-+      }
-       return 0;
- }
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1149-Make-ar6k-not-print-soooo-much-to-my-console.patch b/target/linux/s3c24xx/patches-2.6.26/1149-Make-ar6k-not-print-soooo-much-to-my-console.patch
deleted file mode 100755 (executable)
index 8885133..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From a6f88505ba8f17b2161b3a4a091d25ced067bfab Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:10 +0100
-Subject: [PATCH] Make ar6k not print soooo much to my console
-
-From 4cb4c308fde9c1f3598046ff98191d14b62bc609 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Thu, 29 May 2008 00:09:32 +0200
-Subject: [PATCH] [ar6k] silent++, removing -DDEBUG from the Makefile does not
-work
----
- .../sdio/function/wlan/ar6000/ar6000/ar6000_drv.c  |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-index d35f31c..a854c7c 100644
---- a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-@@ -2422,7 +2422,7 @@ ar6000_targetStats_event(AR_SOFTC_T *ar,  WMI_TARGET_STATS *pTarget)
-     TARGET_STATS *pStats = &ar->arTargetStats;
-     A_UINT8 ac;
--    A_PRINTF("AR6000 updating target stats\n");
-+    /*A_PRINTF("AR6000 updating target stats\n");*/
-     pStats->tx_packets          += pTarget->txrxStats.tx_stats.tx_packets;
-     pStats->tx_bytes            += pTarget->txrxStats.tx_stats.tx_bytes;
-     pStats->tx_unicast_pkts     += pTarget->txrxStats.tx_stats.tx_unicast_pkts;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1150-Subject-PATCH-Build-fixes.patch b/target/linux/s3c24xx/patches-2.6.26/1150-Subject-PATCH-Build-fixes.patch
deleted file mode 100755 (executable)
index 60a7393..0000000
+++ /dev/null
@@ -1,127 +0,0 @@
-From b7a99580b54809762e4dbe1198dffdf87c93662a Mon Sep 17 00:00:00 2001
-From: Andrzej Zaborowski <balrog@zabor.org>
-Date: Fri, 25 Jul 2008 23:06:10 +0100
-Subject: [PATCH] Subject: [PATCH] Build fixes.
-
----
- arch/arm/mach-s3c2442/Kconfig           |    3 ++-
- arch/arm/plat-s3c24xx/Kconfig           |    2 +-
- arch/arm/plat-s3c24xx/time.c            |    4 ++--
- include/asm-arm/arch-s3c2410/regs-dsc.h |    2 +-
- include/asm-arm/kexec.h                 |    5 +++--
- include/linux/kexec.h                   |    3 ++-
- 6 files changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2442/Kconfig b/arch/arm/mach-s3c2442/Kconfig
-index 6cc68a1..f9aa91c 100644
---- a/arch/arm/mach-s3c2442/Kconfig
-+++ b/arch/arm/mach-s3c2442/Kconfig
-@@ -6,10 +6,11 @@
- config CPU_S3C2442
-       bool
--      depends on ARCH_S3C2440
-+      depends on CPU_S3C2440
-       select S3C2410_CLOCK
-       select S3C2410_GPIO
-       select S3C2410_PM if PM
-+      select S3C2440_DMA if S3C2410_DMA
-       select CPU_S3C244X
-       select CPU_LLSERIAL_S3C2440
-       help
-diff --git a/arch/arm/plat-s3c24xx/Kconfig b/arch/arm/plat-s3c24xx/Kconfig
-index 7ee4b82..9e1691f 100644
---- a/arch/arm/plat-s3c24xx/Kconfig
-+++ b/arch/arm/plat-s3c24xx/Kconfig
-@@ -16,7 +16,7 @@ if PLAT_S3C24XX
- config CPU_S3C244X
-       bool
--      depends on ARCH_S3C2410 && (CPU_S3C2440 || CPU_S3C2442)
-+      default y if CPU_S3C2440 || CPU_S3C2442
-       help
-         Support for S3C2440 and S3C2442 Samsung Mobile CPU based systems.
-diff --git a/arch/arm/plat-s3c24xx/time.c b/arch/arm/plat-s3c24xx/time.c
-index 59e5382..03b8643 100644
---- a/arch/arm/plat-s3c24xx/time.c
-+++ b/arch/arm/plat-s3c24xx/time.c
-@@ -200,12 +200,12 @@ static void s3c2410_timer_setup (void)
-               pclk = clk_get_rate(clk);
--              printk("pclk = %d\n", pclk);
-+              printk("pclk = %lu\n", pclk);
-               /* configure clock tick */
-               timer_usec_ticks = timer_mask_usec_ticks(6, pclk);
--              printk("timer_usec_ticks = %d\n", timer_usec_ticks);
-+              printk("timer_usec_ticks = %lu\n", timer_usec_ticks);
-               tcfg1 &= ~S3C2410_TCFG1_MUX4_MASK;
-               tcfg1 |= S3C2410_TCFG1_MUX4_DIV2;
-diff --git a/include/asm-arm/arch-s3c2410/regs-dsc.h b/include/asm-arm/arch-s3c2410/regs-dsc.h
-index 1235df7..f9d0c3d 100644
---- a/include/asm-arm/arch-s3c2410/regs-dsc.h
-+++ b/include/asm-arm/arch-s3c2410/regs-dsc.h
-@@ -178,7 +178,7 @@
- #define S3C2440_DSC1_CS0_4mA    (3<<0)
- #define S3C2440_DSC1_CS0_MASK   (3<<0)
--#endif /* CONFIG_CPU_S3C2440 */
-+#endif /* CONFIG_CPU_S3C244X */
- #endif        /* __ASM_ARCH_REGS_DSC_H */
-diff --git a/include/asm-arm/kexec.h b/include/asm-arm/kexec.h
-index 47fe34d..e656035 100644
---- a/include/asm-arm/kexec.h
-+++ b/include/asm-arm/kexec.h
-@@ -1,8 +1,6 @@
- #ifndef _ARM_KEXEC_H
- #define _ARM_KEXEC_H
--#ifdef CONFIG_KEXEC
--
- /* Maximum physical address we can use pages from */
- #define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)
- /* Maximum address we can reach in physical address mode */
-@@ -16,6 +14,8 @@
- #define KEXEC_BOOT_PARAMS_SIZE 1536
-+#ifdef CONFIG_KEXEC
-+
- #define KEXEC_ARM_ATAGS_OFFSET  0x1000
- #define KEXEC_ARM_ZIMAGE_OFFSET 0x8000
-@@ -31,3 +31,4 @@ static inline void crash_setup_regs(struct pt_regs *newregs,
- #endif /* CONFIG_KEXEC */
- #endif /* _ARM_KEXEC_H */
-+
-diff --git a/include/linux/kexec.h b/include/linux/kexec.h
-index 3265968..f1f9b9a 100644
---- a/include/linux/kexec.h
-+++ b/include/linux/kexec.h
-@@ -1,7 +1,6 @@
- #ifndef LINUX_KEXEC_H
- #define LINUX_KEXEC_H
--#ifdef CONFIG_KEXEC
- #include <linux/types.h>
- #include <linux/list.h>
- #include <linux/linkage.h>
-@@ -11,6 +10,8 @@
- #include <linux/elf.h>
- #include <asm/kexec.h>
-+#ifdef CONFIG_KEXEC
-+
- /* Verify architecture specific macros are defined */
- #ifndef KEXEC_SOURCE_MEMORY_LIMIT
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1151-Subject-PATCH-Hardware-glamo-fb-cursor-some-clea.patch b/target/linux/s3c24xx/patches-2.6.26/1151-Subject-PATCH-Hardware-glamo-fb-cursor-some-clea.patch
deleted file mode 100755 (executable)
index 2ba8c2b..0000000
+++ /dev/null
@@ -1,280 +0,0 @@
-From 824fc22a0aaacf942eb3b3dfa6aad32c7285669f Mon Sep 17 00:00:00 2001
-From: Andrzej Zaborowski <balrog@zabor.org>
-Date: Fri, 25 Jul 2008 23:06:11 +0100
-Subject: [PATCH] Subject: [PATCH] Hardware glamo-fb cursor, some clean-up.
-
----
- drivers/mfd/glamo/glamo-fb.c |  105 +++++++++++++++++++++--------------------
- include/linux/fb.h           |    1 +
- 2 files changed, 55 insertions(+), 51 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c
-index edc6d9c..30cdb38 100644
---- a/drivers/mfd/glamo/glamo-fb.c
-+++ b/drivers/mfd/glamo/glamo-fb.c
-@@ -117,6 +117,8 @@ static struct glamo_script glamo_regs[] = {
-          * 01 00 0 100 0 000 01 0 0 */
-       { GLAMO_REG_LCD_A_BASE1, 0x0000 }, /* display A base address 15:0 */
-       { GLAMO_REG_LCD_A_BASE2, 0x0000 }, /* display A base address 22:16 */
-+      { GLAMO_REG_LCD_CURSOR_BASE1, 0x0000 }, /* cursor base address 15:0 */
-+      { GLAMO_REG_LCD_CURSOR_BASE2, 0x000f }, /* cursor base address 22:16 */
- };
- static int glamofb_run_script(struct glamofb_handle *glamo,
-@@ -200,7 +202,6 @@ static int glamofb_check_var(struct fb_var_screeninfo *var,
-               printk(KERN_ERR
-                      "Smedia driver does not [yet?] support 24/32bpp\n");
-               return -EINVAL;
--              break;
-       }
-       return 0;
-@@ -497,22 +498,19 @@ static int glamofb_setcolreg(unsigned regno,
-       return 0;
- }
-+#ifdef CONFIG_MFD_GLAMO_HWACCEL
- static int glamofb_cursor(struct fb_info *info, struct fb_cursor *cursor)
- {
-       struct glamofb_handle *glamo = info->par;
--      u_int16_t reg;
-+      unsigned long flags;
-       if (cursor->image.depth > 2)
-               return -EINVAL;
--      reg = reg_read(glamo, GLAMO_REG_LCD_MODE1);
-+      spin_lock_irqsave(&glamo->lock_cmd, flags);
--      if (cursor->enable)
--              reg_write(glamo, GLAMO_REG_LCD_MODE1,
--                        reg | GLAMO_LCD_MODE1_CURSOR_EN);
--      else
--              reg_write(glamo, GLAMO_REG_LCD_MODE1,
--                        reg & ~GLAMO_LCD_MODE1_CURSOR_EN);
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_MODE1,
-+                      GLAMO_LCD_MODE1_CURSOR_EN, 0);
-       if (cursor->set & FB_CUR_SETPOS) {
-               reg_write(glamo, GLAMO_REG_LCD_CURSOR_X_POS,
-@@ -522,29 +520,36 @@ static int glamofb_cursor(struct fb_info *info, struct fb_cursor *cursor)
-       }
-       if (cursor->set & FB_CUR_SETCMAP) {
--              /* FIXME */
-+              uint16_t fg = cursor->image.fg_color;
-+              uint16_t bg = cursor->image.bg_color;
-+
-+              reg_write(glamo, GLAMO_REG_LCD_CURSOR_FG_COLOR, fg);
-+              reg_write(glamo, GLAMO_REG_LCD_CURSOR_BG_COLOR, bg);
-+              reg_write(glamo, GLAMO_REG_LCD_CURSOR_DST_COLOR, bg);
-       }
--      if (cursor->set & FB_CUR_SETSIZE ||
--          cursor->set & (FB_CUR_SETIMAGE | FB_CUR_SETSHAPE)) {
--              int x, y, op;
-+      if (cursor->set & FB_CUR_SETHOT)
-+              reg_write(glamo, GLAMO_REG_LCD_CURSOR_PRESET,
-+                              (cursor->hot.x << 8) | cursor->hot.y);
-+
-+      if ((cursor->set & FB_CUR_SETSIZE) ||
-+          (cursor->set & (FB_CUR_SETIMAGE | FB_CUR_SETSHAPE))) {
-+              int x, y, pitch;
-               const unsigned char *pcol = cursor->image.data;
-               const unsigned char *pmsk = cursor->mask;
-               void __iomem *dst = glamo->cursor_addr;
-               unsigned char dcol = 0;
-               unsigned char dmsk = 0;
-+              unsigned char byte = 0;
-+              pitch = (cursor->image.width + 3) >> 2;
-               reg_write(glamo, GLAMO_REG_LCD_CURSOR_X_SIZE,
-                         cursor->image.width);
-               reg_write(glamo, GLAMO_REG_LCD_CURSOR_PITCH,
--                        cursor->image.width * 2);
-+                        pitch);
-               reg_write(glamo, GLAMO_REG_LCD_CURSOR_Y_SIZE,
-                         cursor->image.height);
--              for (op = 0; op < (cursor->image.width *
--                                 cursor->image.height * 2)/8; op += 4)
--                      writel(0x0, dst + op);
--
-               for (y = 0; y < cursor->image.height; y++) {
-                       for (x = 0; x < cursor->image.width; x++) {
-                               if ((x % 8) == 0) {
-@@ -559,15 +564,29 @@ static int glamofb_cursor(struct fb_info *info, struct fb_cursor *cursor)
-                                       unsigned int op;
-                                       op = (dcol & 1) ? 1 : 3;
--                                      op <<= ((x % 4) * 2);
-+                                      byte |= op << ((x % 4) * 2);
-+                              }
--                                      op |= readb(dst + (x / 4));
--                                      writeb(op, dst + (x / 4));
-+                              if ((x % 4) == 0) {
-+                                      writeb(byte, dst + x / 4);
-+                                      byte = 0;
-                               }
-                       }
-+
-+                      dst += pitch;
-               }
-       }
-+
-+      if (cursor->enable)
-+              reg_set_bit_mask(glamo, GLAMO_REG_LCD_MODE1,
-+                              GLAMO_LCD_MODE1_CURSOR_EN,
-+                              GLAMO_LCD_MODE1_CURSOR_EN);
-+
-+      spin_unlock_irqrestore(&glamo->lock_cmd, flags);
-+
-+      return 0;
- }
-+#endif
- static inline int glamofb_cmdq_empty(struct glamofb_handle *gfb)
- {
-@@ -576,15 +595,14 @@ static inline int glamofb_cmdq_empty(struct glamofb_handle *gfb)
- }
- /* call holding gfb->lock_cmd  when locking, until you unlock */
--
- int glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
- {
-       int timeout = 200000;
--/*    dev_dbg(gfb->dev, "glamofb_cmd_mode(gfb=%p, on=%d)\n", gfb, on); */
-+      dev_dbg(gfb->dev, "glamofb_cmd_mode(gfb=%p, on=%d)\n", gfb, on);
-       if (on) {
--/*            dev_dbg(gfb->dev, "%s: waiting for cmdq empty: ",
--                      __FUNCTION__); */
-+              dev_dbg(gfb->dev, "%s: waiting for cmdq empty: ",
-+                      __FUNCTION__);
-               while ((!glamofb_cmdq_empty(gfb)) && (timeout--))
-                       yield();
-               if (timeout < 0) {
-@@ -593,7 +611,7 @@ int glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
-                                      "*************\n");
-                       return -EIO;
-               }
--/*            dev_dbg(gfb->dev, "empty!\n"); */
-+              dev_dbg(gfb->dev, "empty!\n");
-               /* display the entire frame then switch to command */
-               reg_write(gfb, GLAMO_REG_LCD_COMMAND1,
-@@ -601,7 +619,7 @@ int glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
-                         GLAMO_LCD_CMD_DATA_FIRE_VSYNC);
-               /* wait until LCD is idle */
--/*            dev_dbg(gfb->dev, "waiting for LCD idle: "); */
-+              dev_dbg(gfb->dev, "waiting for LCD idle: ");
-               timeout = 200000;
-               while ((!reg_read(gfb, GLAMO_REG_LCD_STATUS2) & (1 << 12)) &&
-                     (timeout--))
-@@ -612,7 +630,7 @@ int glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
-                                      "*************\n");
-                       return -EIO;
-               }
--/*            dev_dbg(gfb->dev, "idle!\n"); */
-+              dev_dbg(gfb->dev, "idle!\n");
-               mdelay(100);
-       } else {
-@@ -635,8 +653,7 @@ int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val)
- {
-       int timeout = 200000;
--/*    dev_dbg(gfb->dev, "%s: waiting for cmdq empty\n",
--              __FUNCTION__); */
-+      dev_dbg(gfb->dev, "%s: waiting for cmdq empty\n", __FUNCTION__);
-       while ((!glamofb_cmdq_empty(gfb)) && (timeout--))
-               yield();
-       if (timeout < 0) {
-@@ -645,7 +662,7 @@ int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val)
-                               "*************\n");
-               return 1;
-       }
--/*    dev_dbg(gfb->dev, "idle, writing 0x%04x\n", val); */
-+      dev_dbg(gfb->dev, "idle, writing 0x%04x\n", val);
-       reg_write(gfb, GLAMO_REG_LCD_COMMAND1, val);
-@@ -659,7 +676,9 @@ static struct fb_ops glamofb_ops = {
-       .fb_set_par     = glamofb_set_par,
-       .fb_blank       = glamofb_blank,
-       .fb_setcolreg   = glamofb_setcolreg,
--      //.fb_cursor    = glamofb_cursor,
-+#ifdef CONFIG_MFD_GLAMO_HWACCEL
-+      .fb_cursor      = glamofb_cursor,
-+#endif
-       .fb_fillrect    = cfb_fillrect,
-       .fb_copyarea    = cfb_copyarea,
-       .fb_imageblit   = cfb_imageblit,
-@@ -743,6 +762,7 @@ static int __init glamofb_probe(struct platform_device *pdev)
-               dev_err(&pdev->dev, "failed to ioremap() vram memory\n");
-               goto out_release_fb;
-       }
-+      glamofb->cursor_addr = fbinfo->screen_base + 0xf0000;
-       platform_set_drvdata(pdev, fbinfo);
-@@ -754,13 +774,13 @@ static int __init glamofb_probe(struct platform_device *pdev)
-       fbinfo->fix.xpanstep = 0;
-       fbinfo->fix.ypanstep = 0;
-       fbinfo->fix.ywrapstep = 0;
--      fbinfo->fix.accel = FB_ACCEL_NONE; /* FIXME */
-+      fbinfo->fix.accel = FB_ACCEL_GLAMO;
-       fbinfo->var.nonstd = 0;
-       fbinfo->var.activate = FB_ACTIVATE_NOW;
-       fbinfo->var.height = mach_info->height;
-       fbinfo->var.width = mach_info->width;
--      fbinfo->var.accel_flags = 0;
-+      fbinfo->var.accel_flags = 0;    /* FIXME */
-       fbinfo->var.vmode = FB_VMODE_NONINTERLACED;
-       fbinfo->fbops = &glamofb_ops;
-@@ -833,26 +853,9 @@ static int glamofb_remove(struct platform_device *pdev)
-       return 0;
- }
--#ifdef CONFIG_PM
--static int glamofb_suspend(struct platform_device *pdev, pm_message_t state)
--{
--      return 0;
--}
--
--static int glamofb_resume(struct platform_device *pdev)
--{
--      return 0;
--}
--#else
--#define glamofb_suspend NULL
--#define glamofb_resume  NULL
--#endif
--
- static struct platform_driver glamofb_driver = {
-       .probe          = glamofb_probe,
-       .remove         = glamofb_remove,
--      .suspend        = glamofb_suspend,
--      .resume         = glamofb_resume,
-       .driver         = {
-               .name   = "glamo-fb",
-               .owner  = THIS_MODULE,
-diff --git a/include/linux/fb.h b/include/linux/fb.h
-index 72295b0..1df1225 100644
---- a/include/linux/fb.h
-+++ b/include/linux/fb.h
-@@ -120,6 +120,7 @@ struct dentry;
- #define FB_ACCEL_XGI_VOLARI_V 47      /* XGI Volari V3XT, V5, V8      */
- #define FB_ACCEL_XGI_VOLARI_Z 48      /* XGI Volari Z7                */
- #define FB_ACCEL_OMAP1610     49      /* TI OMAP16xx                  */
-+#define FB_ACCEL_GLAMO                50      /* SMedia Glamo                 */
- #define FB_ACCEL_NEOMAGIC_NM2070 90   /* NeoMagic NM2070              */
- #define FB_ACCEL_NEOMAGIC_NM2090 91   /* NeoMagic NM2090              */
- #define FB_ACCEL_NEOMAGIC_NM2093 92   /* NeoMagic NM2093              */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1152-Subject-config-defconfig-2.6.26.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1152-Subject-config-defconfig-2.6.26.patch.patch
deleted file mode 100755 (executable)
index 9819e7d..0000000
+++ /dev/null
@@ -1,1898 +0,0 @@
-From 712d808cbee43fe3364eaed676d1d556e10366b0 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:11 +0100
-Subject: [PATCH] Subject: config-defconfig-2.6.26.patch
- X-Git-Url: http://git.openmoko.org/?p=kernel.git;a=commitdiff_plain;h=7f52bae9664cbf006fe026d4dbbd5988137bd1cc
-
-config-defconfig-2.6.26.patch
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- defconfig-2.6.26 | 1876 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 1876 insertions(+), 0 deletions(-)
- create mode 100644 defconfig-2.6.26
-
-diff --git a/defconfig-2.6.26 b/defconfig-2.6.26
-new file mode 100644
-index 0000000..582d7ab
---- /dev/null
-+++ b/defconfig-2.6.26
-@@ -0,0 +1,1876 @@
-+#
-+# Automatically generated make config: don't edit
-+# Linux kernel version: 2.6.26-rc5
-+# Thu Jun  5 11:26:39 2008
-+#
-+CONFIG_ARM=y
-+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-+CONFIG_GENERIC_GPIO=y
-+# CONFIG_GENERIC_TIME is not set
-+# CONFIG_GENERIC_CLOCKEVENTS is not set
-+CONFIG_MMU=y
-+CONFIG_NO_IOPORT=y
-+CONFIG_GENERIC_HARDIRQS=y
-+CONFIG_STACKTRACE_SUPPORT=y
-+CONFIG_LOCKDEP_SUPPORT=y
-+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-+CONFIG_HARDIRQS_SW_RESEND=y
-+CONFIG_GENERIC_IRQ_PROBE=y
-+CONFIG_RWSEM_GENERIC_SPINLOCK=y
-+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-+CONFIG_GENERIC_HWEIGHT=y
-+CONFIG_GENERIC_CALIBRATE_DELAY=y
-+CONFIG_ARCH_SUPPORTS_AOUT=y
-+CONFIG_ZONE_DMA=y
-+CONFIG_FIQ=y
-+CONFIG_VECTORS_BASE=0xffff0000
-+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-+
-+#
-+# General setup
-+#
-+CONFIG_EXPERIMENTAL=y
-+CONFIG_BROKEN_ON_SMP=y
-+CONFIG_LOCK_KERNEL=y
-+CONFIG_INIT_ENV_ARG_LIMIT=32
-+CONFIG_LOCALVERSION="-mokodev"
-+# CONFIG_LOCALVERSION_AUTO is not set
-+CONFIG_SWAP=y
-+CONFIG_SYSVIPC=y
-+CONFIG_SYSVIPC_SYSCTL=y
-+# CONFIG_POSIX_MQUEUE is not set
-+# CONFIG_BSD_PROCESS_ACCT is not set
-+# CONFIG_TASKSTATS is not set
-+# CONFIG_AUDIT is not set
-+# CONFIG_IKCONFIG is not set
-+CONFIG_LOG_BUF_SHIFT=17
-+# CONFIG_CGROUPS is not set
-+# CONFIG_GROUP_SCHED is not set
-+CONFIG_SYSFS_DEPRECATED=y
-+CONFIG_SYSFS_DEPRECATED_V2=y
-+# CONFIG_RELAY is not set
-+CONFIG_NAMESPACES=y
-+# CONFIG_UTS_NS is not set
-+# CONFIG_IPC_NS is not set
-+# CONFIG_USER_NS is not set
-+# CONFIG_PID_NS is not set
-+CONFIG_BLK_DEV_INITRD=y
-+CONFIG_INITRAMFS_SOURCE=""
-+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+CONFIG_SYSCTL=y
-+# CONFIG_EMBEDDED is not set
-+CONFIG_UID16=y
-+CONFIG_SYSCTL_SYSCALL=y
-+CONFIG_SYSCTL_SYSCALL_CHECK=y
-+CONFIG_KALLSYMS=y
-+CONFIG_KALLSYMS_ALL=y
-+# CONFIG_KALLSYMS_EXTRA_PASS is not set
-+CONFIG_HOTPLUG=y
-+CONFIG_PRINTK=y
-+CONFIG_BUG=y
-+CONFIG_ELF_CORE=y
-+CONFIG_COMPAT_BRK=y
-+CONFIG_BASE_FULL=y
-+CONFIG_FUTEX=y
-+CONFIG_ANON_INODES=y
-+CONFIG_EPOLL=y
-+CONFIG_SIGNALFD=y
-+CONFIG_TIMERFD=y
-+CONFIG_EVENTFD=y
-+CONFIG_SHMEM=y
-+CONFIG_VM_EVENT_COUNTERS=y
-+CONFIG_SLAB=y
-+# CONFIG_SLUB is not set
-+# CONFIG_SLOB is not set
-+# CONFIG_PROFILING is not set
-+CONFIG_MARKERS=y
-+CONFIG_HAVE_OPROFILE=y
-+# CONFIG_KPROBES is not set
-+CONFIG_HAVE_KPROBES=y
-+CONFIG_HAVE_KRETPROBES=y
-+# CONFIG_HAVE_DMA_ATTRS is not set
-+CONFIG_PROC_PAGE_MONITOR=y
-+CONFIG_SLABINFO=y
-+CONFIG_RT_MUTEXES=y
-+# CONFIG_TINY_SHMEM is not set
-+CONFIG_BASE_SMALL=0
-+CONFIG_MODULES=y
-+# CONFIG_MODULE_FORCE_LOAD is not set
-+CONFIG_MODULE_UNLOAD=y
-+CONFIG_MODULE_FORCE_UNLOAD=y
-+# CONFIG_MODVERSIONS is not set
-+# CONFIG_MODULE_SRCVERSION_ALL is not set
-+CONFIG_KMOD=y
-+CONFIG_BLOCK=y
-+# CONFIG_LBD is not set
-+# CONFIG_BLK_DEV_IO_TRACE is not set
-+# CONFIG_LSF is not set
-+# CONFIG_BLK_DEV_BSG is not set
-+
-+#
-+# IO Schedulers
-+#
-+CONFIG_IOSCHED_NOOP=y
-+CONFIG_IOSCHED_AS=m
-+CONFIG_IOSCHED_DEADLINE=y
-+CONFIG_IOSCHED_CFQ=m
-+# CONFIG_DEFAULT_AS is not set
-+CONFIG_DEFAULT_DEADLINE=y
-+# CONFIG_DEFAULT_CFQ is not set
-+# CONFIG_DEFAULT_NOOP is not set
-+CONFIG_DEFAULT_IOSCHED="deadline"
-+CONFIG_CLASSIC_RCU=y
-+
-+#
-+# System Type
-+#
-+# CONFIG_ARCH_AAEC2000 is not set
-+# CONFIG_ARCH_INTEGRATOR is not set
-+# CONFIG_ARCH_REALVIEW is not set
-+# CONFIG_ARCH_VERSATILE is not set
-+# CONFIG_ARCH_AT91 is not set
-+# CONFIG_ARCH_CLPS7500 is not set
-+# CONFIG_ARCH_CLPS711X is not set
-+# CONFIG_ARCH_CO285 is not set
-+# CONFIG_ARCH_EBSA110 is not set
-+# CONFIG_ARCH_EP93XX is not set
-+# CONFIG_ARCH_FOOTBRIDGE is not set
-+# CONFIG_ARCH_NETX is not set
-+# CONFIG_ARCH_H720X is not set
-+# CONFIG_ARCH_IMX is not set
-+# CONFIG_ARCH_IOP13XX is not set
-+# CONFIG_ARCH_IOP32X is not set
-+# CONFIG_ARCH_IOP33X is not set
-+# CONFIG_ARCH_IXP23XX is not set
-+# CONFIG_ARCH_IXP2000 is not set
-+# CONFIG_ARCH_IXP4XX is not set
-+# CONFIG_ARCH_L7200 is not set
-+# CONFIG_ARCH_KS8695 is not set
-+# CONFIG_ARCH_NS9XXX is not set
-+# CONFIG_ARCH_MXC is not set
-+# CONFIG_ARCH_ORION5X is not set
-+# CONFIG_ARCH_PNX4008 is not set
-+# CONFIG_ARCH_PXA is not set
-+# CONFIG_ARCH_RPC is not set
-+# CONFIG_ARCH_SA1100 is not set
-+CONFIG_ARCH_S3C2410=y
-+# CONFIG_ARCH_SHARK is not set
-+# CONFIG_ARCH_LH7A40X is not set
-+# CONFIG_ARCH_DAVINCI is not set
-+# CONFIG_ARCH_OMAP is not set
-+# CONFIG_ARCH_MSM7X00A is not set
-+CONFIG_PLAT_S3C24XX=y
-+CONFIG_CPU_S3C244X=y
-+CONFIG_S3C2410_DMA=y
-+# CONFIG_S3C2410_DMA_DEBUG is not set
-+CONFIG_MACH_SMDK=y
-+CONFIG_MACH_NEO1973=y
-+CONFIG_PLAT_S3C=y
-+CONFIG_CPU_LLSERIAL_S3C2410=y
-+CONFIG_CPU_LLSERIAL_S3C2440=y
-+
-+#
-+# Boot options
-+#
-+# CONFIG_S3C_BOOT_WATCHDOG is not set
-+# CONFIG_S3C_BOOT_ERROR_RESET is not set
-+
-+#
-+# Power management
-+#
-+# CONFIG_S3C2410_PM_DEBUG is not set
-+# CONFIG_S3C2410_PM_CHECK is not set
-+CONFIG_S3C_LOWLEVEL_UART_PORT=2
-+
-+#
-+# S3C2400 Machines
-+#
-+CONFIG_CPU_S3C2410=y
-+CONFIG_CPU_S3C2410_DMA=y
-+CONFIG_S3C2410_PM=y
-+CONFIG_S3C2410_GPIO=y
-+CONFIG_S3C2410_CLOCK=y
-+CONFIG_S3C2410_PWM=y
-+
-+#
-+# S3C2410 Machines
-+#
-+# CONFIG_ARCH_SMDK2410 is not set
-+# CONFIG_ARCH_H1940 is not set
-+# CONFIG_MACH_N30 is not set
-+# CONFIG_ARCH_BAST is not set
-+# CONFIG_MACH_OTOM is not set
-+# CONFIG_MACH_AML_M5900 is not set
-+# CONFIG_MACH_TCT_HAMMER is not set
-+# CONFIG_MACH_VR1000 is not set
-+CONFIG_MACH_QT2410=y
-+CONFIG_MACH_NEO1973_GTA01=y
-+
-+#
-+# S3C2412 Machines
-+#
-+# CONFIG_MACH_SMDK2413 is not set
-+# CONFIG_MACH_SMDK2412 is not set
-+# CONFIG_MACH_VSTMS is not set
-+CONFIG_CPU_S3C2440=y
-+CONFIG_S3C2440_DMA=y
-+CONFIG_S3C2440_C_FIQ=y
-+
-+#
-+# S3C2440 Machines
-+#
-+# CONFIG_MACH_ANUBIS is not set
-+# CONFIG_MACH_OSIRIS is not set
-+# CONFIG_MACH_RX3715 is not set
-+CONFIG_ARCH_S3C2440=y
-+# CONFIG_MACH_NEXCODER_2440 is not set
-+CONFIG_SMDK2440_CPU2440=y
-+CONFIG_MACH_NEO1973_GTA02=y
-+# CONFIG_NEO1973_GTA02_2440 is not set
-+CONFIG_CPU_S3C2442=y
-+
-+#
-+# S3C2442 Machines
-+#
-+CONFIG_SMDK2440_CPU2442=y
-+
-+#
-+# S3C2443 Machines
-+#
-+# CONFIG_MACH_SMDK2443 is not set
-+
-+#
-+# Processor Type
-+#
-+CONFIG_CPU_32=y
-+CONFIG_CPU_ARM920T=y
-+CONFIG_CPU_32v4T=y
-+CONFIG_CPU_ABRT_EV4T=y
-+CONFIG_CPU_PABRT_NOIFAR=y
-+CONFIG_CPU_CACHE_V4WT=y
-+CONFIG_CPU_CACHE_VIVT=y
-+CONFIG_CPU_COPY_V4WB=y
-+CONFIG_CPU_TLB_V4WBI=y
-+CONFIG_CPU_CP15=y
-+CONFIG_CPU_CP15_MMU=y
-+
-+#
-+# Processor Features
-+#
-+CONFIG_ARM_THUMB=y
-+# CONFIG_CPU_ICACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_DISABLE is not set
-+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-+# CONFIG_OUTER_CACHE is not set
-+
-+#
-+# Bus support
-+#
-+# CONFIG_PCI_SYSCALL is not set
-+# CONFIG_ARCH_SUPPORTS_MSI is not set
-+# CONFIG_PCCARD is not set
-+
-+#
-+# Kernel Features
-+#
-+# CONFIG_TICK_ONESHOT is not set
-+CONFIG_PREEMPT=y
-+CONFIG_NO_IDLE_HZ=y
-+CONFIG_HZ=200
-+CONFIG_AEABI=y
-+CONFIG_OABI_COMPAT=y
-+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
-+CONFIG_SELECT_MEMORY_MODEL=y
-+CONFIG_FLATMEM_MANUAL=y
-+# CONFIG_DISCONTIGMEM_MANUAL is not set
-+# CONFIG_SPARSEMEM_MANUAL is not set
-+CONFIG_FLATMEM=y
-+CONFIG_FLAT_NODE_MEM_MAP=y
-+# CONFIG_SPARSEMEM_STATIC is not set
-+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-+CONFIG_PAGEFLAGS_EXTENDED=y
-+CONFIG_SPLIT_PTLOCK_CPUS=4096
-+# CONFIG_RESOURCES_64BIT is not set
-+CONFIG_ZONE_DMA_FLAG=1
-+CONFIG_BOUNCE=y
-+CONFIG_VIRT_TO_BUS=y
-+CONFIG_ALIGNMENT_TRAP=y
-+
-+#
-+# Boot options
-+#
-+CONFIG_ZBOOT_ROM_TEXT=0x0
-+CONFIG_ZBOOT_ROM_BSS=0x0
-+CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
-+# CONFIG_XIP_KERNEL is not set
-+CONFIG_KEXEC=y
-+CONFIG_ATAGS_PROC=y
-+
-+#
-+# Floating point emulation
-+#
-+
-+#
-+# At least one emulation must be selected
-+#
-+CONFIG_FPE_NWFPE=y
-+# CONFIG_FPE_NWFPE_XP is not set
-+# CONFIG_FPE_FASTFPE is not set
-+
-+#
-+# Userspace binary formats
-+#
-+CONFIG_BINFMT_ELF=y
-+# CONFIG_BINFMT_AOUT is not set
-+# CONFIG_BINFMT_MISC is not set
-+
-+#
-+# Power management options
-+#
-+CONFIG_PM=y
-+CONFIG_PM_DEBUG=y
-+CONFIG_PM_VERBOSE=y
-+CONFIG_CAN_PM_TRACE=y
-+CONFIG_PM_SLEEP=y
-+CONFIG_SUSPEND=y
-+CONFIG_SUSPEND_FREEZER=y
-+CONFIG_APM_EMULATION=y
-+CONFIG_ARCH_SUSPEND_POSSIBLE=y
-+
-+#
-+# Networking
-+#
-+CONFIG_NET=y
-+
-+#
-+# Networking options
-+#
-+CONFIG_PACKET=y
-+CONFIG_PACKET_MMAP=y
-+CONFIG_UNIX=y
-+CONFIG_XFRM=y
-+# CONFIG_XFRM_USER is not set
-+# CONFIG_XFRM_SUB_POLICY is not set
-+CONFIG_XFRM_MIGRATE=y
-+# CONFIG_XFRM_STATISTICS is not set
-+CONFIG_NET_KEY=m
-+CONFIG_NET_KEY_MIGRATE=y
-+CONFIG_INET=y
-+CONFIG_IP_MULTICAST=y
-+CONFIG_IP_ADVANCED_ROUTER=y
-+CONFIG_ASK_IP_FIB_HASH=y
-+# CONFIG_IP_FIB_TRIE is not set
-+CONFIG_IP_FIB_HASH=y
-+CONFIG_IP_MULTIPLE_TABLES=y
-+# CONFIG_IP_ROUTE_MULTIPATH is not set
-+# CONFIG_IP_ROUTE_VERBOSE 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=m
-+CONFIG_NET_IPGRE=m
-+# CONFIG_NET_IPGRE_BROADCAST is not set
-+# CONFIG_IP_MROUTE is not set
-+# CONFIG_ARPD is not set
-+CONFIG_SYN_COOKIES=y
-+CONFIG_INET_AH=m
-+CONFIG_INET_ESP=m
-+CONFIG_INET_IPCOMP=m
-+CONFIG_INET_XFRM_TUNNEL=m
-+CONFIG_INET_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET_XFRM_MODE_TUNNEL=m
-+CONFIG_INET_XFRM_MODE_BEET=m
-+# CONFIG_INET_LRO is not set
-+CONFIG_INET_DIAG=y
-+CONFIG_INET_TCP_DIAG=y
-+# CONFIG_TCP_CONG_ADVANCED is not set
-+CONFIG_TCP_CONG_CUBIC=y
-+CONFIG_DEFAULT_TCP_CONG="cubic"
-+CONFIG_TCP_MD5SIG=y
-+# CONFIG_IP_VS is not set
-+CONFIG_IPV6=m
-+# CONFIG_IPV6_PRIVACY is not set
-+# CONFIG_IPV6_ROUTER_PREF is not set
-+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-+CONFIG_INET6_AH=m
-+CONFIG_INET6_ESP=m
-+CONFIG_INET6_IPCOMP=m
-+# CONFIG_IPV6_MIP6 is not set
-+CONFIG_INET6_XFRM_TUNNEL=m
-+CONFIG_INET6_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-+CONFIG_INET6_XFRM_MODE_TUNNEL=m
-+CONFIG_INET6_XFRM_MODE_BEET=m
-+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-+CONFIG_IPV6_SIT=m
-+CONFIG_IPV6_NDISC_NODETYPE=y
-+CONFIG_IPV6_TUNNEL=m
-+# CONFIG_IPV6_MULTIPLE_TABLES is not set
-+# CONFIG_IPV6_MROUTE is not set
-+# CONFIG_NETWORK_SECMARK is not set
-+CONFIG_NETFILTER=y
-+# CONFIG_NETFILTER_DEBUG is not set
-+CONFIG_NETFILTER_ADVANCED=y
-+CONFIG_BRIDGE_NETFILTER=y
-+
-+#
-+# Core Netfilter Configuration
-+#
-+CONFIG_NETFILTER_NETLINK=m
-+CONFIG_NETFILTER_NETLINK_QUEUE=m
-+CONFIG_NETFILTER_NETLINK_LOG=m
-+# CONFIG_NF_CONNTRACK is not set
-+CONFIG_NETFILTER_XTABLES=m
-+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-+CONFIG_NETFILTER_XT_TARGET_DSCP=m
-+CONFIG_NETFILTER_XT_TARGET_MARK=m
-+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
-+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
-+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
-+CONFIG_NETFILTER_XT_MATCH_DCCP=m
-+CONFIG_NETFILTER_XT_MATCH_DSCP=m
-+CONFIG_NETFILTER_XT_MATCH_ESP=m
-+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
-+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-+CONFIG_NETFILTER_XT_MATCH_MAC=m
-+CONFIG_NETFILTER_XT_MATCH_MARK=m
-+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
-+CONFIG_NETFILTER_XT_MATCH_POLICY=m
-+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
-+CONFIG_NETFILTER_XT_MATCH_REALM=m
-+CONFIG_NETFILTER_XT_MATCH_SCTP=m
-+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-+CONFIG_NETFILTER_XT_MATCH_STRING=m
-+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
-+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
-+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-+
-+#
-+# IP: Netfilter Configuration
-+#
-+# CONFIG_IP_NF_QUEUE is not set
-+CONFIG_IP_NF_IPTABLES=m
-+# CONFIG_IP_NF_MATCH_RECENT is not set
-+CONFIG_IP_NF_MATCH_ECN=m
-+CONFIG_IP_NF_MATCH_AH=m
-+CONFIG_IP_NF_MATCH_TTL=m
-+CONFIG_IP_NF_MATCH_ADDRTYPE=m
-+CONFIG_IP_NF_FILTER=m
-+CONFIG_IP_NF_TARGET_REJECT=m
-+CONFIG_IP_NF_TARGET_LOG=m
-+CONFIG_IP_NF_TARGET_ULOG=m
-+CONFIG_IP_NF_MANGLE=m
-+CONFIG_IP_NF_TARGET_ECN=m
-+CONFIG_IP_NF_TARGET_TTL=m
-+# CONFIG_IP_NF_RAW is not set
-+# CONFIG_IP_NF_ARPTABLES is not set
-+
-+#
-+# IPv6: Netfilter Configuration
-+#
-+# CONFIG_IP6_NF_QUEUE is not set
-+CONFIG_IP6_NF_IPTABLES=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_IPV6HEADER=m
-+CONFIG_IP6_NF_MATCH_AH=m
-+CONFIG_IP6_NF_MATCH_MH=m
-+CONFIG_IP6_NF_MATCH_EUI64=m
-+CONFIG_IP6_NF_FILTER=m
-+CONFIG_IP6_NF_TARGET_LOG=m
-+CONFIG_IP6_NF_TARGET_REJECT=m
-+CONFIG_IP6_NF_MANGLE=m
-+CONFIG_IP6_NF_TARGET_HL=m
-+# CONFIG_IP6_NF_RAW is not set
-+
-+#
-+# 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_BRIDGE_EBT_ULOG=m
-+# CONFIG_BRIDGE_EBT_NFLOG is not set
-+# CONFIG_IP_DCCP is not set
-+# CONFIG_IP_SCTP is not set
-+# CONFIG_TIPC is not set
-+# CONFIG_ATM is not set
-+CONFIG_BRIDGE=y
-+# CONFIG_VLAN_8021Q is not set
-+# CONFIG_DECNET is not set
-+CONFIG_LLC=y
-+# 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_ECONET is not set
-+# CONFIG_WAN_ROUTER is not set
-+CONFIG_NET_SCHED=y
-+
-+#
-+# Queueing/Scheduling
-+#
-+CONFIG_NET_SCH_CBQ=m
-+CONFIG_NET_SCH_HTB=m
-+CONFIG_NET_SCH_HFSC=m
-+CONFIG_NET_SCH_PRIO=m
-+# CONFIG_NET_SCH_RR is not set
-+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_NETEM=m
-+
-+#
-+# Classification
-+#
-+CONFIG_NET_CLS=y
-+CONFIG_NET_CLS_BASIC=m
-+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_CLS_U32_PERF=y
-+CONFIG_CLS_U32_MARK=y
-+CONFIG_NET_CLS_RSVP=m
-+CONFIG_NET_CLS_RSVP6=m
-+# CONFIG_NET_CLS_FLOW is not set
-+# CONFIG_NET_EMATCH is not set
-+# CONFIG_NET_CLS_ACT is not set
-+# CONFIG_NET_CLS_IND is not set
-+CONFIG_NET_SCH_FIFO=y
-+
-+#
-+# Network testing
-+#
-+# CONFIG_NET_PKTGEN is not set
-+# CONFIG_HAMRADIO is not set
-+# CONFIG_CAN is not set
-+# CONFIG_IRDA is not set
-+CONFIG_BT=y
-+CONFIG_BT_L2CAP=y
-+CONFIG_BT_SCO=y
-+CONFIG_BT_RFCOMM=y
-+CONFIG_BT_RFCOMM_TTY=y
-+CONFIG_BT_BNEP=y
-+CONFIG_BT_BNEP_MC_FILTER=y
-+CONFIG_BT_BNEP_PROTO_FILTER=y
-+CONFIG_BT_HIDP=y
-+
-+#
-+# Bluetooth device drivers
-+#
-+CONFIG_BT_HCIUSB=y
-+CONFIG_BT_HCIUSB_SCO=y
-+# CONFIG_BT_HCIBTSDIO is not set
-+# CONFIG_BT_HCIUART is not set
-+# CONFIG_BT_HCIBCM203X is not set
-+# CONFIG_BT_HCIBPA10X is not set
-+# CONFIG_BT_HCIBFUSB is not set
-+# CONFIG_BT_HCIVHCI is not set
-+# CONFIG_AF_RXRPC is not set
-+CONFIG_FIB_RULES=y
-+
-+#
-+# Wireless
-+#
-+# CONFIG_CFG80211 is not set
-+CONFIG_WIRELESS_EXT=y
-+# CONFIG_MAC80211 is not set
-+# CONFIG_IEEE80211 is not set
-+# CONFIG_RFKILL is not set
-+# CONFIG_NET_9P is not set
-+
-+#
-+# Device Drivers
-+#
-+
-+#
-+# Generic Driver Options
-+#
-+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-+CONFIG_STANDALONE=y
-+CONFIG_PREVENT_FIRMWARE_BUILD=y
-+CONFIG_FW_LOADER=m
-+# CONFIG_DEBUG_DRIVER is not set
-+# CONFIG_DEBUG_DEVRES is not set
-+# CONFIG_SYS_HYPERVISOR is not set
-+CONFIG_CONNECTOR=m
-+CONFIG_MTD=y
-+# CONFIG_MTD_DEBUG is not set
-+CONFIG_MTD_CONCAT=y
-+CONFIG_MTD_PARTITIONS=y
-+# CONFIG_MTD_REDBOOT_PARTS is not set
-+CONFIG_MTD_CMDLINE_PARTS=y
-+# CONFIG_MTD_AFS_PARTS is not set
-+# CONFIG_MTD_AR7_PARTS is not set
-+
-+#
-+# User Modules And Translation Layers
-+#
-+CONFIG_MTD_CHAR=y
-+CONFIG_MTD_BLKDEVS=y
-+CONFIG_MTD_BLOCK=y
-+# CONFIG_FTL is not set
-+# CONFIG_NFTL is not set
-+# CONFIG_INFTL is not set
-+# CONFIG_RFD_FTL is not set
-+# CONFIG_SSFDC is not set
-+# CONFIG_MTD_OOPS is not set
-+
-+#
-+# RAM/ROM/Flash chip drivers
-+#
-+CONFIG_MTD_CFI=y
-+# CONFIG_MTD_JEDECPROBE is not set
-+CONFIG_MTD_GEN_PROBE=y
-+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-+CONFIG_MTD_MAP_BANK_WIDTH_1=y
-+CONFIG_MTD_MAP_BANK_WIDTH_2=y
-+CONFIG_MTD_MAP_BANK_WIDTH_4=y
-+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-+CONFIG_MTD_CFI_I1=y
-+CONFIG_MTD_CFI_I2=y
-+# CONFIG_MTD_CFI_I4 is not set
-+# CONFIG_MTD_CFI_I8 is not set
-+CONFIG_MTD_CFI_INTELEXT=y
-+# CONFIG_MTD_CFI_AMDSTD is not set
-+# CONFIG_MTD_CFI_STAA is not set
-+CONFIG_MTD_CFI_UTIL=y
-+# CONFIG_MTD_RAM is not set
-+CONFIG_MTD_ROM=y
-+CONFIG_MTD_ABSENT=y
-+
-+#
-+# Mapping drivers for chip access
-+#
-+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-+CONFIG_MTD_PHYSMAP=y
-+CONFIG_MTD_PHYSMAP_START=0x0
-+CONFIG_MTD_PHYSMAP_LEN=0
-+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
-+# CONFIG_MTD_ARM_INTEGRATOR is not set
-+# CONFIG_MTD_PLATRAM is not set
-+
-+#
-+# Self-contained MTD device drivers
-+#
-+# CONFIG_MTD_DATAFLASH is not set
-+# CONFIG_MTD_M25P80 is not set
-+# CONFIG_MTD_SLRAM is not set
-+# CONFIG_MTD_PHRAM is not set
-+# CONFIG_MTD_MTDRAM is not set
-+# CONFIG_MTD_BLOCK2MTD is not set
-+
-+#
-+# Disk-On-Chip Device Drivers
-+#
-+# CONFIG_MTD_DOC2000 is not set
-+# CONFIG_MTD_DOC2001 is not set
-+# CONFIG_MTD_DOC2001PLUS is not set
-+CONFIG_MTD_NAND=y
-+CONFIG_MTD_NAND_VERIFY_WRITE=y
-+# CONFIG_MTD_NAND_ECC_SMC is not set
-+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-+CONFIG_MTD_NAND_IDS=y
-+CONFIG_MTD_NAND_S3C2410=y
-+CONFIG_MTD_NAND_S3C2410_DEBUG=y
-+CONFIG_MTD_NAND_S3C2410_HWECC=y
-+# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
-+# CONFIG_MTD_NAND_DISKONCHIP is not set
-+# CONFIG_MTD_NAND_NANDSIM is not set
-+# CONFIG_MTD_NAND_PLATFORM is not set
-+# CONFIG_MTD_ALAUDA is not set
-+# CONFIG_MTD_ONENAND is not set
-+
-+#
-+# UBI - Unsorted block images
-+#
-+# CONFIG_MTD_UBI is not set
-+# CONFIG_PARPORT is not set
-+CONFIG_PNP=y
-+CONFIG_PNP_DEBUG=y
-+
-+#
-+# Protocols
-+#
-+# CONFIG_PNPACPI is not set
-+CONFIG_BLK_DEV=y
-+# CONFIG_BLK_DEV_COW_COMMON is not set
-+CONFIG_BLK_DEV_LOOP=m
-+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-+# CONFIG_BLK_DEV_NBD is not set
-+CONFIG_BLK_DEV_UB=m
-+CONFIG_BLK_DEV_RAM=y
-+CONFIG_BLK_DEV_RAM_COUNT=16
-+CONFIG_BLK_DEV_RAM_SIZE=4096
-+# CONFIG_BLK_DEV_XIP is not set
-+# CONFIG_CDROM_PKTCDVD is not set
-+# CONFIG_ATA_OVER_ETH is not set
-+CONFIG_MISC_DEVICES=y
-+# CONFIG_EEPROM_93CX6 is not set
-+# CONFIG_ENCLOSURE_SERVICES is not set
-+CONFIG_HAVE_IDE=y
-+# CONFIG_IDE is not set
-+
-+#
-+# SCSI device support
-+#
-+# CONFIG_RAID_ATTRS is not set
-+CONFIG_SCSI=y
-+CONFIG_SCSI_DMA=y
-+# CONFIG_SCSI_TGT is not set
-+# CONFIG_SCSI_NETLINK is not set
-+CONFIG_SCSI_PROC_FS=y
-+
-+#
-+# SCSI support type (disk, tape, CD-ROM)
-+#
-+CONFIG_BLK_DEV_SD=y
-+# CONFIG_CHR_DEV_ST is not set
-+# 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
-+# CONFIG_CHR_DEV_SCH is not set
-+
-+#
-+# 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
-+CONFIG_SCSI_SCAN_ASYNC=y
-+CONFIG_SCSI_WAIT_SCAN=m
-+
-+#
-+# SCSI Transports
-+#
-+# CONFIG_SCSI_SPI_ATTRS is not set
-+# CONFIG_SCSI_FC_ATTRS is not set
-+# CONFIG_SCSI_ISCSI_ATTRS is not set
-+# CONFIG_SCSI_SAS_LIBSAS is not set
-+# CONFIG_SCSI_SRP_ATTRS is not set
-+CONFIG_SCSI_LOWLEVEL=y
-+# CONFIG_ISCSI_TCP is not set
-+# CONFIG_SCSI_DEBUG is not set
-+# CONFIG_ATA is not set
-+CONFIG_MD=y
-+# CONFIG_BLK_DEV_MD is not set
-+CONFIG_BLK_DEV_DM=m
-+# CONFIG_DM_DEBUG is not set
-+CONFIG_DM_CRYPT=m
-+CONFIG_DM_SNAPSHOT=m
-+# CONFIG_DM_MIRROR is not set
-+# CONFIG_DM_ZERO is not set
-+# CONFIG_DM_MULTIPATH is not set
-+# CONFIG_DM_DELAY is not set
-+# CONFIG_DM_UEVENT is not set
-+CONFIG_NETDEVICES=y
-+# CONFIG_NETDEVICES_MULTIQUEUE is not set
-+# CONFIG_DUMMY is not set
-+# CONFIG_BONDING is not set
-+# CONFIG_MACVLAN is not set
-+# CONFIG_EQUALIZER is not set
-+CONFIG_TUN=m
-+# CONFIG_VETH is not set
-+# CONFIG_NET_SB1000 is not set
-+# CONFIG_PHYLIB is not set
-+CONFIG_NET_ETHERNET=y
-+CONFIG_MII=y
-+# CONFIG_AX88796 is not set
-+# CONFIG_SMC91X is not set
-+# CONFIG_DM9000 is not set
-+# CONFIG_ENC28J60 is not set
-+# CONFIG_IBM_NEW_EMAC_ZMII is not set
-+# CONFIG_IBM_NEW_EMAC_RGMII is not set
-+# CONFIG_IBM_NEW_EMAC_TAH is not set
-+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-+CONFIG_NET_PCI=y
-+# CONFIG_B44 is not set
-+CONFIG_CS89x0=m
-+# CONFIG_NETDEV_1000 is not set
-+# CONFIG_NETDEV_10000 is not set
-+
-+#
-+# Wireless LAN
-+#
-+# CONFIG_WLAN_PRE80211 is not set
-+# CONFIG_WLAN_80211 is not set
-+# CONFIG_IWLWIFI_LEDS is not set
-+
-+#
-+# USB Network Adapters
-+#
-+CONFIG_USB_CATC=m
-+CONFIG_USB_KAWETH=m
-+CONFIG_USB_PEGASUS=m
-+CONFIG_USB_RTL8150=m
-+CONFIG_USB_USBNET=y
-+CONFIG_USB_NET_AX8817X=m
-+CONFIG_USB_NET_CDCETHER=m
-+CONFIG_USB_NET_DM9601=m
-+CONFIG_USB_NET_GL620A=m
-+CONFIG_USB_NET_NET1080=m
-+CONFIG_USB_NET_PLUSB=m
-+CONFIG_USB_NET_MCS7830=m
-+CONFIG_USB_NET_RNDIS_HOST=m
-+CONFIG_USB_NET_CDC_SUBSET=m
-+CONFIG_USB_ALI_M5632=y
-+CONFIG_USB_AN2720=y
-+CONFIG_USB_BELKIN=y
-+CONFIG_USB_ARMLINUX=y
-+CONFIG_USB_EPSON2888=y
-+CONFIG_USB_KC2190=y
-+CONFIG_USB_NET_ZAURUS=m
-+# CONFIG_WAN is not set
-+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=m
-+CONFIG_PPP_MPPE=m
-+# CONFIG_PPPOE is not set
-+# CONFIG_PPPOL2TP is not set
-+# CONFIG_SLIP is not set
-+CONFIG_SLHC=m
-+# CONFIG_NETCONSOLE is not set
-+# CONFIG_NETPOLL is not set
-+# CONFIG_NET_POLL_CONTROLLER is not set
-+# CONFIG_ISDN is not set
-+
-+#
-+# Input device support
-+#
-+CONFIG_INPUT=y
-+# CONFIG_INPUT_FF_MEMLESS is not set
-+# CONFIG_INPUT_POLLDEV is not set
-+
-+#
-+# Userland interfaces
-+#
-+CONFIG_INPUT_MOUSEDEV=y
-+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-+CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
-+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
-+# CONFIG_INPUT_JOYDEV is not set
-+CONFIG_INPUT_EVDEV=y
-+CONFIG_INPUT_EVBUG=m
-+
-+#
-+# Input Device Drivers
-+#
-+CONFIG_INPUT_KEYBOARD=y
-+# CONFIG_KEYBOARD_ATKBD is not set
-+# 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_KEYBOARD_STOWAWAY=m
-+CONFIG_KEYBOARD_GPIO=m
-+CONFIG_KEYBOARD_NEO1973=y
-+CONFIG_KEYBOARD_QT2410=y
-+CONFIG_INPUT_MOUSE=y
-+# CONFIG_MOUSE_PS2 is not set
-+# CONFIG_MOUSE_SERIAL is not set
-+# CONFIG_MOUSE_APPLETOUCH is not set
-+# CONFIG_MOUSE_VSXXXAA is not set
-+# CONFIG_MOUSE_GPIO is not set
-+# CONFIG_INPUT_JOYSTICK is not set
-+# CONFIG_INPUT_TABLET is not set
-+CONFIG_INPUT_TOUCHSCREEN=y
-+# CONFIG_TOUCHSCREEN_ADS7846 is not set
-+# CONFIG_TOUCHSCREEN_FUJITSU is not set
-+CONFIG_TOUCHSCREEN_S3C2410=y
-+# CONFIG_TOUCHSCREEN_S3C2410_DEBUG is not set
-+# CONFIG_TOUCHSCREEN_GUNZE is not set
-+# CONFIG_TOUCHSCREEN_ELO is not set
-+# CONFIG_TOUCHSCREEN_MTOUCH is not set
-+# CONFIG_TOUCHSCREEN_MK712 is not set
-+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-+# CONFIG_TOUCHSCREEN_UCB1400 is not set
-+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-+CONFIG_INPUT_MISC=y
-+# CONFIG_INPUT_ATI_REMOTE is not set
-+# CONFIG_INPUT_ATI_REMOTE2 is not set
-+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
-+# CONFIG_INPUT_POWERMATE is not set
-+# CONFIG_INPUT_YEALINK is not set
-+CONFIG_INPUT_UINPUT=m
-+CONFIG_INPUT_LIS302DL=y
-+
-+#
-+# Hardware I/O ports
-+#
-+CONFIG_SERIO=y
-+# CONFIG_SERIO_SERPORT is not set
-+# CONFIG_SERIO_RAW is not set
-+# CONFIG_GAMEPORT is not set
-+
-+#
-+# Character devices
-+#
-+CONFIG_VT=y
-+CONFIG_VT_CONSOLE=y
-+CONFIG_NR_TTY_DEVICES=4
-+CONFIG_HW_CONSOLE=y
-+CONFIG_VT_HW_CONSOLE_BINDING=y
-+# CONFIG_DEVKMEM is not set
-+# CONFIG_SERIAL_NONSTANDARD is not set
-+
-+#
-+# Serial drivers
-+#
-+# CONFIG_SERIAL_8250 is not set
-+
-+#
-+# Non-8250 serial port support
-+#
-+CONFIG_SERIAL_S3C2410=y
-+CONFIG_SERIAL_S3C2410_CONSOLE=y
-+CONFIG_SERIAL_CORE=y
-+CONFIG_SERIAL_CORE_CONSOLE=y
-+CONFIG_UNIX98_PTYS=y
-+# CONFIG_LEGACY_PTYS is not set
-+# CONFIG_IPMI_HANDLER is not set
-+# CONFIG_HW_RANDOM is not set
-+# CONFIG_NVRAM is not set
-+# CONFIG_R3964 is not set
-+# CONFIG_RAW_DRIVER is not set
-+# CONFIG_TCG_TPM is not set
-+CONFIG_I2C=y
-+CONFIG_I2C_BOARDINFO=y
-+CONFIG_I2C_CHARDEV=y
-+
-+#
-+# I2C Hardware Bus support
-+#
-+# CONFIG_I2C_GPIO is not set
-+# CONFIG_I2C_OCORES is not set
-+# CONFIG_I2C_PARPORT_LIGHT is not set
-+CONFIG_I2C_S3C2410=y
-+# CONFIG_I2C_SIMTEC is not set
-+# CONFIG_I2C_TAOS_EVM is not set
-+# CONFIG_I2C_STUB is not set
-+# CONFIG_I2C_TINY_USB is not set
-+# CONFIG_I2C_PCA_PLATFORM is not set
-+
-+#
-+# Miscellaneous I2C Chip support
-+#
-+# CONFIG_DS1682 is not set
-+# CONFIG_SENSORS_EEPROM is not set
-+CONFIG_SENSORS_PCF50606=y
-+CONFIG_SENSORS_PCF50633=y
-+# CONFIG_SENSORS_PCF8574 is not set
-+# CONFIG_PCF8575 is not set
-+# CONFIG_SENSORS_PCF8591 is not set
-+# CONFIG_SENSORS_MAX6875 is not set
-+# CONFIG_SENSORS_TSL2550 is not set
-+# 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
-+CONFIG_SPI=y
-+# CONFIG_SPI_DEBUG is not set
-+CONFIG_SPI_MASTER=y
-+
-+#
-+# SPI Master Controller Drivers
-+#
-+CONFIG_SPI_BITBANG=y
-+# CONFIG_SPI_S3C24XX is not set
-+CONFIG_SPI_S3C24XX_GPIO=y
-+
-+#
-+# SPI Protocol Masters
-+#
-+# CONFIG_SPI_AT25 is not set
-+# CONFIG_SPI_SPIDEV is not set
-+# CONFIG_SPI_TLE62X0 is not set
-+# CONFIG_W1 is not set
-+CONFIG_POWER_SUPPLY=y
-+CONFIG_POWER_SUPPLY_DEBUG=y
-+CONFIG_PDA_POWER=y
-+CONFIG_APM_POWER=y
-+# CONFIG_BATTERY_DS2760 is not set
-+CONFIG_BATTERY_BQ27000_HDQ=y
-+CONFIG_GTA02_HDQ=y
-+CONFIG_HWMON=y
-+# CONFIG_HWMON_VID is not set
-+# CONFIG_SENSORS_AD7418 is not set
-+# CONFIG_SENSORS_ADM1021 is not set
-+# CONFIG_SENSORS_ADM1025 is not set
-+# CONFIG_SENSORS_ADM1026 is not set
-+# CONFIG_SENSORS_ADM1029 is not set
-+# CONFIG_SENSORS_ADM1031 is not set
-+# CONFIG_SENSORS_ADM9240 is not set
-+# CONFIG_SENSORS_ADT7470 is not set
-+# CONFIG_SENSORS_ADT7473 is not set
-+# CONFIG_SENSORS_ATXP1 is not set
-+# CONFIG_SENSORS_DS1621 is not set
-+# CONFIG_SENSORS_F71805F is not set
-+# CONFIG_SENSORS_F71882FG is not set
-+# CONFIG_SENSORS_F75375S is not set
-+# CONFIG_SENSORS_GL518SM is not set
-+# CONFIG_SENSORS_GL520SM is not set
-+# CONFIG_SENSORS_IT87 is not set
-+# CONFIG_SENSORS_LM63 is not set
-+# CONFIG_SENSORS_LM70 is not set
-+# CONFIG_SENSORS_LM75 is not set
-+# CONFIG_SENSORS_LM77 is not set
-+# CONFIG_SENSORS_LM78 is not set
-+# CONFIG_SENSORS_LM80 is not set
-+# CONFIG_SENSORS_LM83 is not set
-+# CONFIG_SENSORS_LM85 is not set
-+# CONFIG_SENSORS_LM87 is not set
-+# CONFIG_SENSORS_LM90 is not set
-+# CONFIG_SENSORS_LM92 is not set
-+# CONFIG_SENSORS_LM93 is not set
-+# CONFIG_SENSORS_MAX1619 is not set
-+# CONFIG_SENSORS_MAX6650 is not set
-+# CONFIG_SENSORS_PC87360 is not set
-+# CONFIG_SENSORS_PC87427 is not set
-+# CONFIG_SENSORS_DME1737 is not set
-+# CONFIG_SENSORS_SMSC47M1 is not set
-+# CONFIG_SENSORS_SMSC47M192 is not set
-+# CONFIG_SENSORS_SMSC47B397 is not set
-+# CONFIG_SENSORS_ADS7828 is not set
-+# CONFIG_SENSORS_THMC50 is not set
-+# CONFIG_SENSORS_VT1211 is not set
-+# CONFIG_SENSORS_W83781D is not set
-+# CONFIG_SENSORS_W83791D is not set
-+# CONFIG_SENSORS_W83792D is not set
-+# CONFIG_SENSORS_W83793 is not set
-+# CONFIG_SENSORS_W83L785TS is not set
-+# CONFIG_SENSORS_W83L786NG is not set
-+# CONFIG_SENSORS_W83627HF is not set
-+# CONFIG_SENSORS_W83627EHF is not set
-+# CONFIG_HWMON_DEBUG_CHIP is not set
-+CONFIG_WATCHDOG=y
-+# CONFIG_WATCHDOG_NOWAYOUT is not set
-+
-+#
-+# Watchdog Device Drivers
-+#
-+# CONFIG_SOFT_WATCHDOG is not set
-+CONFIG_S3C2410_WATCHDOG=m
-+
-+#
-+# USB-based Watchdog Cards
-+#
-+# CONFIG_USBPCWATCHDOG is not set
-+
-+#
-+# Sonics Silicon Backplane
-+#
-+CONFIG_SSB_POSSIBLE=y
-+# CONFIG_SSB is not set
-+
-+#
-+# Multifunction device drivers
-+#
-+# CONFIG_MFD_SM501 is not set
-+# CONFIG_MFD_ASIC3 is not set
-+# CONFIG_HTC_PASIC3 is not set
-+CONFIG_MFD_GLAMO=y
-+CONFIG_MFD_GLAMO_FB=y
-+CONFIG_MFD_GLAMO_SPI_GPIO=y
-+CONFIG_MFD_GLAMO_SPI_FB=y
-+CONFIG_MFD_GLAMO_MCI=y
-+
-+#
-+# Multimedia devices
-+#
-+
-+#
-+# Multimedia core support
-+#
-+# CONFIG_VIDEO_DEV is not set
-+# CONFIG_DVB_CORE is not set
-+# CONFIG_VIDEO_MEDIA is not set
-+
-+#
-+# Multimedia drivers
-+#
-+CONFIG_DAB=y
-+# CONFIG_USB_DABUSB is not set
-+
-+#
-+# Graphics support
-+#
-+# CONFIG_VGASTATE is not set
-+CONFIG_VIDEO_OUTPUT_CONTROL=y
-+CONFIG_FB=y
-+# CONFIG_FIRMWARE_EDID is not set
-+# CONFIG_FB_DDC is not set
-+CONFIG_FB_CFB_FILLRECT=y
-+CONFIG_FB_CFB_COPYAREA=y
-+CONFIG_FB_CFB_IMAGEBLIT=y
-+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-+# CONFIG_FB_SYS_FILLRECT is not set
-+# CONFIG_FB_SYS_COPYAREA is not set
-+# CONFIG_FB_SYS_IMAGEBLIT is not set
-+# CONFIG_FB_FOREIGN_ENDIAN is not set
-+# CONFIG_FB_SYS_FOPS is not set
-+# CONFIG_FB_SVGALIB is not set
-+# CONFIG_FB_MACMODES is not set
-+# CONFIG_FB_BACKLIGHT is not set
-+# CONFIG_FB_MODE_HELPERS is not set
-+# CONFIG_FB_TILEBLITTING is not set
-+
-+#
-+# Frame buffer hardware drivers
-+#
-+# CONFIG_FB_UVESA is not set
-+# CONFIG_FB_S1D13XXX is not set
-+CONFIG_FB_S3C2410=y
-+# CONFIG_FB_S3C2410_DEBUG is not set
-+# CONFIG_FB_VIRTUAL is not set
-+CONFIG_BACKLIGHT_LCD_SUPPORT=y
-+CONFIG_LCD_CLASS_DEVICE=y
-+CONFIG_LCD_LTV350QV=y
-+CONFIG_BACKLIGHT_CLASS_DEVICE=y
-+# CONFIG_BACKLIGHT_CORGI is not set
-+CONFIG_BACKLIGHT_GTA01=y
-+
-+#
-+# Display device support
-+#
-+CONFIG_DISPLAY_SUPPORT=y
-+
-+#
-+# Display hardware drivers
-+#
-+CONFIG_DISPLAY_JBT6K74=y
-+
-+#
-+# Console display driver support
-+#
-+# CONFIG_VGA_CONSOLE is not set
-+CONFIG_DUMMY_CONSOLE=y
-+CONFIG_FRAMEBUFFER_CONSOLE=y
-+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-+CONFIG_FONTS=y
-+# CONFIG_FONT_8x8 is not set
-+# CONFIG_FONT_8x16 is not set
-+CONFIG_FONT_6x11=y
-+# CONFIG_FONT_7x14 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
-+# CONFIG_FONT_10x18 is not set
-+# CONFIG_LOGO is not set
-+
-+#
-+# Sound
-+#
-+CONFIG_SOUND=y
-+
-+#
-+# Advanced Linux Sound Architecture
-+#
-+CONFIG_SND=y
-+CONFIG_SND_TIMER=y
-+CONFIG_SND_PCM=y
-+CONFIG_SND_HWDEP=m
-+CONFIG_SND_RAWMIDI=m
-+# CONFIG_SND_SEQUENCER is not set
-+CONFIG_SND_OSSEMUL=y
-+CONFIG_SND_MIXER_OSS=y
-+CONFIG_SND_PCM_OSS=y
-+CONFIG_SND_PCM_OSS_PLUGINS=y
-+# CONFIG_SND_DYNAMIC_MINORS is not set
-+CONFIG_SND_SUPPORT_OLD_API=y
-+CONFIG_SND_VERBOSE_PROCFS=y
-+# CONFIG_SND_VERBOSE_PRINTK is not set
-+CONFIG_SND_DEBUG=y
-+CONFIG_SND_DEBUG_DETECT=y
-+CONFIG_SND_PCM_XRUN_DEBUG=y
-+
-+#
-+# 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
-+
-+#
-+# ALSA ARM devices
-+#
-+
-+#
-+# SPI devices
-+#
-+
-+#
-+# USB devices
-+#
-+CONFIG_SND_USB_AUDIO=m
-+# CONFIG_SND_USB_CAIAQ is not set
-+
-+#
-+# System on Chip audio support
-+#
-+CONFIG_SND_SOC=y
-+CONFIG_SND_S3C24XX_SOC=y
-+CONFIG_SND_S3C24XX_SOC_I2S=y
-+CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=y
-+# CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753_DEBUG is not set
-+CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=y
-+# CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
-+
-+#
-+# ALSA SoC audio for Freescale SOCs
-+#
-+
-+#
-+# SoC Audio for the Texas Instruments OMAP
-+#
-+CONFIG_SND_SOC_WM8753=y
-+
-+#
-+# Open Sound System
-+#
-+# CONFIG_SOUND_PRIME is not set
-+CONFIG_HID_SUPPORT=y
-+CONFIG_HID=y
-+# CONFIG_HID_DEBUG is not set
-+# CONFIG_HIDRAW is not set
-+
-+#
-+# USB Input Devices
-+#
-+CONFIG_USB_HID=y
-+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
-+# CONFIG_HID_FF is not set
-+# CONFIG_USB_HIDDEV is not set
-+CONFIG_USB_SUPPORT=y
-+CONFIG_USB_ARCH_HAS_HCD=y
-+CONFIG_USB_ARCH_HAS_OHCI=y
-+# CONFIG_USB_ARCH_HAS_EHCI is not set
-+CONFIG_USB=y
-+# CONFIG_USB_DEBUG is not set
-+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-+
-+#
-+# Miscellaneous USB options
-+#
-+CONFIG_USB_DEVICEFS=y
-+CONFIG_USB_DEVICE_CLASS=y
-+# CONFIG_USB_DYNAMIC_MINORS is not set
-+CONFIG_USB_SUSPEND=y
-+# CONFIG_USB_OTG is not set
-+
-+#
-+# USB Host Controller Drivers
-+#
-+# CONFIG_USB_C67X00_HCD is not set
-+# CONFIG_USB_ISP116X_HCD is not set
-+# CONFIG_USB_ISP1760_HCD is not set
-+CONFIG_USB_OHCI_HCD=y
-+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-+# CONFIG_USB_SL811_HCD is not set
-+# CONFIG_USB_R8A66597_HCD is not set
-+
-+#
-+# USB Device Class drivers
-+#
-+CONFIG_USB_ACM=y
-+CONFIG_USB_PRINTER=m
-+# CONFIG_USB_WDM is not set
-+
-+#
-+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-+#
-+
-+#
-+# may also be needed; see USB_STORAGE Help for more information
-+#
-+CONFIG_USB_STORAGE=y
-+# CONFIG_USB_STORAGE_DEBUG is not set
-+CONFIG_USB_STORAGE_DATAFAB=y
-+CONFIG_USB_STORAGE_FREECOM=y
-+# CONFIG_USB_STORAGE_ISD200 is not set
-+CONFIG_USB_STORAGE_DPCM=y
-+CONFIG_USB_STORAGE_USBAT=y
-+CONFIG_USB_STORAGE_SDDR09=y
-+CONFIG_USB_STORAGE_SDDR55=y
-+CONFIG_USB_STORAGE_JUMPSHOT=y
-+CONFIG_USB_STORAGE_ALAUDA=y
-+# CONFIG_USB_STORAGE_ONETOUCH is not set
-+CONFIG_USB_STORAGE_KARMA=y
-+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
-+CONFIG_USB_LIBUSUAL=y
-+
-+#
-+# USB Imaging devices
-+#
-+# CONFIG_USB_MDC800 is not set
-+# CONFIG_USB_MICROTEK is not set
-+CONFIG_USB_MON=y
-+
-+#
-+# USB port drivers
-+#
-+CONFIG_USB_SERIAL=y
-+CONFIG_USB_SERIAL_CONSOLE=y
-+CONFIG_USB_EZUSB=y
-+CONFIG_USB_SERIAL_GENERIC=y
-+CONFIG_USB_SERIAL_AIRCABLE=m
-+CONFIG_USB_SERIAL_AIRPRIME=m
-+CONFIG_USB_SERIAL_ARK3116=m
-+CONFIG_USB_SERIAL_BELKIN=m
-+# CONFIG_USB_SERIAL_CH341 is not set
-+CONFIG_USB_SERIAL_WHITEHEAT=m
-+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-+CONFIG_USB_SERIAL_CP2101=m
-+CONFIG_USB_SERIAL_CYPRESS_M8=m
-+CONFIG_USB_SERIAL_EMPEG=m
-+CONFIG_USB_SERIAL_FTDI_SIO=m
-+CONFIG_USB_SERIAL_FUNSOFT=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_GARMIN=m
-+CONFIG_USB_SERIAL_IPW=m
-+# CONFIG_USB_SERIAL_IUU is not set
-+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_MOS7720=m
-+CONFIG_USB_SERIAL_MOS7840=m
-+# CONFIG_USB_SERIAL_MOTOROLA is not set
-+CONFIG_USB_SERIAL_NAVMAN=m
-+CONFIG_USB_SERIAL_PL2303=m
-+# CONFIG_USB_SERIAL_OTI6858 is not set
-+# CONFIG_USB_SERIAL_SPCP8X5 is not set
-+CONFIG_USB_SERIAL_HP4X=m
-+CONFIG_USB_SERIAL_SAFE=m
-+CONFIG_USB_SERIAL_SAFE_PADDED=y
-+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-+CONFIG_USB_SERIAL_TI=m
-+CONFIG_USB_SERIAL_CYBERJACK=m
-+CONFIG_USB_SERIAL_XIRCOM=m
-+CONFIG_USB_SERIAL_OPTION=y
-+CONFIG_USB_SERIAL_OMNINET=m
-+# CONFIG_USB_SERIAL_DEBUG is not set
-+
-+#
-+# USB Miscellaneous drivers
-+#
-+# CONFIG_USB_EMI62 is not set
-+# CONFIG_USB_EMI26 is not set
-+# CONFIG_USB_ADUTUX is not set
-+# CONFIG_USB_AUERSWALD is not set
-+# CONFIG_USB_RIO500 is not set
-+# CONFIG_USB_LEGOTOWER is not set
-+# CONFIG_USB_LCD is not set
-+CONFIG_USB_BERRY_CHARGE=m
-+# CONFIG_USB_LED is not set
-+# CONFIG_USB_CYPRESS_CY7C63 is not set
-+# CONFIG_USB_CYTHERM is not set
-+# CONFIG_USB_PHIDGET is not set
-+# CONFIG_USB_IDMOUSE is not set
-+# CONFIG_USB_FTDI_ELAN is not set
-+# CONFIG_USB_APPLEDISPLAY is not set
-+# CONFIG_USB_LD is not set
-+CONFIG_USB_TRANCEVIBRATOR=m
-+CONFIG_USB_IOWARRIOR=m
-+# CONFIG_USB_TEST is not set
-+# CONFIG_USB_ISIGHTFW is not set
-+CONFIG_USB_GADGET=y
-+# CONFIG_USB_GADGET_DEBUG is not set
-+# CONFIG_USB_GADGET_DEBUG_FILES is not set
-+# CONFIG_USB_GADGET_DEBUG_FS is not set
-+CONFIG_USB_GADGET_SELECTED=y
-+# CONFIG_USB_GADGET_AMD5536UDC is not set
-+# CONFIG_USB_GADGET_ATMEL_USBA is not set
-+# CONFIG_USB_GADGET_FSL_USB2 is not set
-+# CONFIG_USB_GADGET_NET2280 is not set
-+# CONFIG_USB_GADGET_PXA2XX is not set
-+# CONFIG_USB_GADGET_M66592 is not set
-+# CONFIG_USB_GADGET_PXA27X is not set
-+# CONFIG_USB_GADGET_GOKU is not set
-+# CONFIG_USB_GADGET_LH7A40X is not set
-+# CONFIG_USB_GADGET_OMAP is not set
-+CONFIG_USB_GADGET_S3C2410=y
-+CONFIG_USB_S3C2410=y
-+# CONFIG_USB_S3C2410_DEBUG is not set
-+# CONFIG_USB_GADGET_AT91 is not set
-+# CONFIG_USB_GADGET_DUMMY_HCD is not set
-+# CONFIG_USB_GADGET_DUALSPEED is not set
-+# CONFIG_USB_ZERO is not set
-+CONFIG_USB_ETH=y
-+CONFIG_USB_ETH_RNDIS=y
-+# CONFIG_USB_GADGETFS is not set
-+# CONFIG_USB_FILE_STORAGE is not set
-+# CONFIG_USB_G_SERIAL is not set
-+# CONFIG_USB_MIDI_GADGET is not set
-+# CONFIG_USB_G_PRINTER is not set
-+
-+#
-+# SDIO support
-+#
-+CONFIG_SDIO=y
-+CONFIG_SDIO_S3C24XX=y
-+CONFIG_SDIO_S3C24XX_DMA=y
-+CONFIG_SDIO_AR6000_WLAN=y
-+CONFIG_MMC=y
-+# CONFIG_MMC_DEBUG is not set
-+CONFIG_MMC_UNSAFE_RESUME=y
-+
-+#
-+# MMC/SD Card Drivers
-+#
-+CONFIG_MMC_BLOCK=y
-+# CONFIG_MMC_BLOCK_BOUNCE is not set
-+# CONFIG_SDIO_UART is not set
-+# CONFIG_MMC_TEST is not set
-+
-+#
-+# MMC/SD Host Controller Drivers
-+#
-+# CONFIG_MMC_SPI is not set
-+# CONFIG_MMC_S3C is not set
-+CONFIG_NEW_LEDS=y
-+CONFIG_LEDS_CLASS=y
-+
-+#
-+# LED drivers
-+#
-+CONFIG_LEDS_S3C24XX=m
-+CONFIG_LEDS_GPIO=y
-+CONFIG_LEDS_NEO1973_VIBRATOR=y
-+CONFIG_LEDS_NEO1973_GTA02=y
-+
-+#
-+# LED Triggers
-+#
-+CONFIG_LEDS_TRIGGERS=y
-+CONFIG_LEDS_TRIGGER_TIMER=y
-+# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
-+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
-+CONFIG_RTC_LIB=y
-+CONFIG_RTC_CLASS=y
-+CONFIG_RTC_HCTOSYS=y
-+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-+CONFIG_RTC_DEBUG=y
-+
-+#
-+# RTC interfaces
-+#
-+CONFIG_RTC_INTF_SYSFS=y
-+CONFIG_RTC_INTF_PROC=y
-+CONFIG_RTC_INTF_DEV=y
-+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
-+# CONFIG_RTC_DRV_TEST is not set
-+
-+#
-+# I2C RTC drivers
-+#
-+# CONFIG_RTC_DRV_DS1307 is not set
-+# CONFIG_RTC_DRV_DS1374 is not set
-+# CONFIG_RTC_DRV_DS1672 is not set
-+# CONFIG_RTC_DRV_MAX6900 is not set
-+# CONFIG_RTC_DRV_RS5C372 is not set
-+# CONFIG_RTC_DRV_ISL1208 is not set
-+# CONFIG_RTC_DRV_X1205 is not set
-+# CONFIG_RTC_DRV_PCF8563 is not set
-+# CONFIG_RTC_DRV_PCF8583 is not set
-+# CONFIG_RTC_DRV_M41T80 is not set
-+# CONFIG_RTC_DRV_S35390A is not set
-+
-+#
-+# SPI RTC drivers
-+#
-+# CONFIG_RTC_DRV_MAX6902 is not set
-+# CONFIG_RTC_DRV_R9701 is not set
-+# CONFIG_RTC_DRV_RS5C348 is not set
-+
-+#
-+# Platform RTC drivers
-+#
-+# CONFIG_RTC_DRV_CMOS is not set
-+# CONFIG_RTC_DRV_DS1511 is not set
-+# CONFIG_RTC_DRV_DS1553 is not set
-+# CONFIG_RTC_DRV_DS1742 is not set
-+# CONFIG_RTC_DRV_STK17TA8 is not set
-+# CONFIG_RTC_DRV_M48T86 is not set
-+# CONFIG_RTC_DRV_M48T59 is not set
-+# CONFIG_RTC_DRV_V3020 is not set
-+
-+#
-+# on-CPU RTC drivers
-+#
-+CONFIG_RTC_DRV_S3C=m
-+CONFIG_UIO=y
-+# CONFIG_UIO_SMX is not set
-+
-+#
-+# File systems
-+#
-+CONFIG_EXT2_FS=y
-+# CONFIG_EXT2_FS_XATTR is not set
-+# CONFIG_EXT2_FS_XIP is not set
-+CONFIG_EXT3_FS=y
-+# CONFIG_EXT3_FS_XATTR is not set
-+# CONFIG_EXT4DEV_FS is not set
-+CONFIG_JBD=y
-+# CONFIG_JBD_DEBUG is not set
-+# CONFIG_REISERFS_FS is not set
-+# CONFIG_JFS_FS is not set
-+# CONFIG_FS_POSIX_ACL is not set
-+# CONFIG_XFS_FS is not set
-+# CONFIG_OCFS2_FS is not set
-+CONFIG_DNOTIFY=y
-+CONFIG_INOTIFY=y
-+CONFIG_INOTIFY_USER=y
-+# CONFIG_QUOTA is not set
-+# CONFIG_AUTOFS_FS is not set
-+# CONFIG_AUTOFS4_FS is not set
-+CONFIG_FUSE_FS=m
-+
-+#
-+# CD-ROM/DVD Filesystems
-+#
-+CONFIG_ISO9660_FS=m
-+CONFIG_JOLIET=y
-+# CONFIG_ZISOFS 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_FAT_DEFAULT_CODEPAGE=437
-+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-+# CONFIG_NTFS_FS is not set
-+
-+#
-+# Pseudo filesystems
-+#
-+CONFIG_PROC_FS=y
-+CONFIG_PROC_SYSCTL=y
-+CONFIG_SYSFS=y
-+CONFIG_TMPFS=y
-+# CONFIG_TMPFS_POSIX_ACL is not set
-+# CONFIG_HUGETLB_PAGE is not set
-+CONFIG_CONFIGFS_FS=m
-+
-+#
-+# 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_FS=y
-+CONFIG_JFFS2_FS_DEBUG=0
-+CONFIG_JFFS2_FS_WRITEBUFFER=y
-+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-+CONFIG_JFFS2_SUMMARY=y
-+# CONFIG_JFFS2_FS_XATTR is not set
-+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-+CONFIG_JFFS2_ZLIB=y
-+# CONFIG_JFFS2_LZO is not set
-+CONFIG_JFFS2_RTIME=y
-+# CONFIG_JFFS2_RUBIN is not set
-+CONFIG_CRAMFS=y
-+# CONFIG_VXFS_FS is not set
-+# CONFIG_MINIX_FS is not set
-+# CONFIG_HPFS_FS is not set
-+# CONFIG_QNX4FS_FS is not set
-+CONFIG_ROMFS_FS=y
-+# CONFIG_SYSV_FS is not set
-+# CONFIG_UFS_FS is not set
-+# CONFIG_NETWORK_FILESYSTEMS 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=y
-+# CONFIG_BSD_DISKLABEL is not set
-+# CONFIG_MINIX_SUBPARTITION is not set
-+# CONFIG_SOLARIS_X86_PARTITION is not set
-+# CONFIG_UNIXWARE_DISKLABEL 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_KARMA_PARTITION is not set
-+# CONFIG_EFI_PARTITION is not set
-+# CONFIG_SYSV68_PARTITION is not set
-+CONFIG_NLS=y
-+CONFIG_NLS_DEFAULT="iso8859-1"
-+CONFIG_NLS_CODEPAGE_437=y
-+# CONFIG_NLS_CODEPAGE_737 is not set
-+# CONFIG_NLS_CODEPAGE_775 is not set
-+CONFIG_NLS_CODEPAGE_850=m
-+# 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=m
-+CONFIG_NLS_CODEPAGE_950=m
-+# 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=y
-+# 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=m
-+# CONFIG_DLM is not set
-+
-+#
-+# Kernel hacking
-+#
-+CONFIG_PRINTK_TIME=y
-+CONFIG_ENABLE_WARN_DEPRECATED=y
-+CONFIG_ENABLE_MUST_CHECK=y
-+CONFIG_FRAME_WARN=1024
-+CONFIG_MAGIC_SYSRQ=y
-+# CONFIG_UNUSED_SYMBOLS is not set
-+CONFIG_DEBUG_FS=y
-+# CONFIG_HEADERS_CHECK is not set
-+CONFIG_DEBUG_KERNEL=y
-+CONFIG_DEBUG_SHIRQ=y
-+CONFIG_DETECT_SOFTLOCKUP=y
-+CONFIG_SCHED_DEBUG=y
-+# CONFIG_SCHEDSTATS is not set
-+CONFIG_TIMER_STATS=y
-+# CONFIG_DEBUG_OBJECTS is not set
-+# CONFIG_DEBUG_SLAB is not set
-+CONFIG_DEBUG_PREEMPT=y
-+# CONFIG_DEBUG_RT_MUTEXES is not set
-+# CONFIG_RT_MUTEX_TESTER is not set
-+CONFIG_DEBUG_SPINLOCK=y
-+CONFIG_DEBUG_MUTEXES=y
-+CONFIG_DEBUG_LOCK_ALLOC=y
-+# CONFIG_PROVE_LOCKING is not set
-+CONFIG_LOCKDEP=y
-+CONFIG_LOCK_STAT=y
-+CONFIG_DEBUG_LOCKDEP=y
-+CONFIG_DEBUG_SPINLOCK_SLEEP=y
-+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-+CONFIG_STACKTRACE=y
-+# CONFIG_DEBUG_KOBJECT is not set
-+CONFIG_DEBUG_BUGVERBOSE=y
-+CONFIG_DEBUG_INFO=y
-+# CONFIG_DEBUG_VM is not set
-+# CONFIG_DEBUG_WRITECOUNT is not set
-+# CONFIG_DEBUG_LIST is not set
-+CONFIG_DEBUG_SG=y
-+CONFIG_FRAME_POINTER=y
-+# CONFIG_BOOT_PRINTK_DELAY is not set
-+# CONFIG_RCU_TORTURE_TEST is not set
-+# CONFIG_BACKTRACE_SELF_TEST is not set
-+# CONFIG_FAULT_INJECTION is not set
-+# CONFIG_SAMPLES is not set
-+# CONFIG_DEBUG_USER is not set
-+CONFIG_DEBUG_ERRORS=y
-+CONFIG_DEBUG_STACK_USAGE=y
-+# CONFIG_DEBUG_LL is not set
-+CONFIG_DEBUG_S3C_UART=2
-+
-+#
-+# Security options
-+#
-+# CONFIG_KEYS is not set
-+# CONFIG_SECURITY is not set
-+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
-+CONFIG_CRYPTO=y
-+
-+#
-+# Crypto core or helper
-+#
-+CONFIG_CRYPTO_ALGAPI=y
-+CONFIG_CRYPTO_AEAD=m
-+CONFIG_CRYPTO_BLKCIPHER=y
-+CONFIG_CRYPTO_HASH=y
-+CONFIG_CRYPTO_MANAGER=y
-+CONFIG_CRYPTO_GF128MUL=m
-+CONFIG_CRYPTO_NULL=m
-+# CONFIG_CRYPTO_CRYPTD is not set
-+CONFIG_CRYPTO_AUTHENC=m
-+CONFIG_CRYPTO_TEST=m
-+
-+#
-+# Authenticated Encryption with Associated Data
-+#
-+# CONFIG_CRYPTO_CCM is not set
-+# CONFIG_CRYPTO_GCM is not set
-+# CONFIG_CRYPTO_SEQIV is not set
-+
-+#
-+# Block modes
-+#
-+CONFIG_CRYPTO_CBC=y
-+# CONFIG_CRYPTO_CTR is not set
-+# CONFIG_CRYPTO_CTS is not set
-+CONFIG_CRYPTO_ECB=m
-+CONFIG_CRYPTO_LRW=m
-+CONFIG_CRYPTO_PCBC=m
-+# CONFIG_CRYPTO_XTS is not set
-+
-+#
-+# Hash modes
-+#
-+CONFIG_CRYPTO_HMAC=y
-+CONFIG_CRYPTO_XCBC=m
-+
-+#
-+# Digest
-+#
-+CONFIG_CRYPTO_CRC32C=m
-+CONFIG_CRYPTO_MD4=m
-+CONFIG_CRYPTO_MD5=y
-+CONFIG_CRYPTO_MICHAEL_MIC=m
-+CONFIG_CRYPTO_SHA1=m
-+CONFIG_CRYPTO_SHA256=m
-+CONFIG_CRYPTO_SHA512=m
-+CONFIG_CRYPTO_TGR192=m
-+CONFIG_CRYPTO_WP512=m
-+
-+#
-+# Ciphers
-+#
-+CONFIG_CRYPTO_AES=m
-+CONFIG_CRYPTO_ANUBIS=m
-+CONFIG_CRYPTO_ARC4=m
-+CONFIG_CRYPTO_BLOWFISH=m
-+CONFIG_CRYPTO_CAMELLIA=m
-+CONFIG_CRYPTO_CAST5=m
-+CONFIG_CRYPTO_CAST6=m
-+CONFIG_CRYPTO_DES=y
-+CONFIG_CRYPTO_FCRYPT=m
-+CONFIG_CRYPTO_KHAZAD=m
-+# CONFIG_CRYPTO_SALSA20 is not set
-+# CONFIG_CRYPTO_SEED is not set
-+CONFIG_CRYPTO_SERPENT=m
-+CONFIG_CRYPTO_TEA=m
-+CONFIG_CRYPTO_TWOFISH=m
-+CONFIG_CRYPTO_TWOFISH_COMMON=m
-+
-+#
-+# Compression
-+#
-+CONFIG_CRYPTO_DEFLATE=m
-+# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_HW=y
-+
-+#
-+# Library routines
-+#
-+CONFIG_BITREVERSE=y
-+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
-+# CONFIG_GENERIC_FIND_NEXT_BIT is not set
-+CONFIG_CRC_CCITT=m
-+CONFIG_CRC16=m
-+# CONFIG_CRC_ITU_T is not set
-+CONFIG_CRC32=y
-+# CONFIG_CRC7 is not set
-+CONFIG_LIBCRC32C=m
-+CONFIG_ZLIB_INFLATE=y
-+CONFIG_ZLIB_DEFLATE=y
-+CONFIG_TEXTSEARCH=y
-+CONFIG_TEXTSEARCH_KMP=m
-+CONFIG_TEXTSEARCH_BM=m
-+CONFIG_TEXTSEARCH_FSM=m
-+CONFIG_PLIST=y
-+CONFIG_HAS_IOMEM=y
-+CONFIG_HAS_DMA=y
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1153-introduce-charging-led-behaviour.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1153-introduce-charging-led-behaviour.patch.patch
deleted file mode 100755 (executable)
index 6f510ed..0000000
+++ /dev/null
@@ -1,423 +0,0 @@
-From 86bec3382cd1694a3b5cd6d8796cfcbdbe5ca5ff Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:11 +0100
-Subject: [PATCH] introduce-charging-led-behaviour.patch
-
-Creates a new behaviour requested by Will that the red LED on GTA02
-is lit during battery charging.and goes out when the battery is full.
-
-This is done by leveraging the PMU interrupts, but in one scenario
-there is no interrupt that occurs, when the battery is replaced after
-being removed with the USB power in all the while.  So a sleepy work
-function is started under those circumstances to watch for battery
-reinsertion or USB cable pull.
-
-100mA limit was not being observed under some conditions so this was
-fixed and tested with a USB cable with D+/D- disconnected.  1A
-charger behaviour was also tested.
-
-Showing the charging action exposes some inconsistency in pcf50633
-charging action.  If your battery is nearly full, it will keep
-charging it at decreasing current even after it thinks it is at
-100% capacity for a long while.  But if you pull that same battery
-and re-insert it, the charger state machine in pcf50633 believe it is
-full and won't charge it.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |    8 ++
- drivers/i2c/chips/pcf50633.c       |  212 ++++++++++++++++++++++++++++++++++--
- include/linux/pcf506xx.h           |    2 +
- 3 files changed, 214 insertions(+), 8 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 601f7bc..d7882ea 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -437,6 +437,14 @@ static int pmu_callback(struct device *dev, unsigned int feature,
-               case PMU_EVT_USB_REMOVE:
-                       pcf50633_charge_enable(pcf50633_global, 0);
-                       break;
-+              case PMU_EVT_CHARGER_IDLE:
-+                      /* printk(KERN_ERR"PMU_EVT_CHARGER_IDLE\n"); */
-+                      neo1973_gpb_setpin(GTA02_GPIO_AUX_LED, 0);
-+                      break;
-+              case PMU_EVT_CHARGER_ACTIVE:
-+                      /* printk(KERN_ERR"PMU_EVT_CHARGER_ACTIVE\n"); */
-+                      neo1973_gpb_setpin(GTA02_GPIO_AUX_LED, 1);
-+                      break;
-               default:
-                       break;
-               }
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 8ba81d2..38cabd2 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -47,6 +47,7 @@
- #include <linux/platform_device.h>
- #include <linux/pcf50633.h>
- #include <linux/apm-emulation.h>
-+#include <linux/jiffies.h>
- #include <asm/mach-types.h>
- #include <asm/arch/gta02.h>
-@@ -121,8 +122,23 @@ struct pcf50633_data {
-       int onkey_seconds;
-       int irq;
-       int have_been_suspended;
-+      int usb_removal_count;
-       unsigned char pcfirq_resume[5];
-+      /* if he pulls battery while charging, we notice that and correctly
-+       * report that the charger is idle.  But there is no interrupt that
-+       * fires if he puts a battery back in and charging resumes.  So when
-+       * the battery is pulled, we run this work function looking for
-+       * either charger resumption or USB cable pull
-+       */
-+      struct mutex working_lock_nobat;
-+      struct work_struct work_nobat;
-+      int working_nobat;
-+      int usb_removal_count_nobat;
-+      int jiffies_last_bat_ins;
-+
-+      int last_curlim_set;
-+
-       int coldplug_done; /* cleared by probe, set by first work service */
-       int flag_bat_voltage_read; /* ipc to /sys batt voltage read func */
-@@ -259,6 +275,8 @@ static u_int16_t async_adc_complete(struct pcf50633_data *pcf)
-                       (__reg_read(pcf, PCF50633_REG_ADCS3) &
-                                                 PCF50633_ADCS3_ADCDAT1L_MASK);
-+      DEBUGPC("adc result = %d\n", ret);
-+
-       return ret;
- }
-@@ -512,8 +530,7 @@ static void configure_pmu_for_charger(struct pcf50633_data *pcf,
- {
-       switch (type) {
-       case CHARGER_TYPE_NONE:
--              __reg_write(pcf, PCF50633_REG_MBCC7,
--                                                  PCF50633_MBCC7_USB_SUSPEND);
-+              pcf50633_usb_curlim_set(pcf, 0);
-               break;
-       /*
-        * the PCF50633 has a feature that it will supply only excess current
-@@ -521,10 +538,19 @@ static void configure_pmu_for_charger(struct pcf50633_data *pcf,
-        * 500mA setting is "up to 500mA" according to that.
-        */
-       case CHARGER_TYPE_HOSTUSB:
--              __reg_write(pcf, PCF50633_REG_MBCC7, PCF50633_MBCC7_USB_500mA);
-+              /* USB subsystem should call pcf50633_usb_curlim_set to set
-+               * what was negotiated with the host when it is enumerated
-+               * successfully.  If we get called again after a good
-+               * negotiation, we keep what was negotiated.  (Removal of
-+               * USB plug destroys pcf->last_curlim_set to 0)
-+               */
-+              if (pcf->last_curlim_set > 100)
-+                      pcf50633_usb_curlim_set(pcf, pcf->last_curlim_set);
-+              else
-+                      pcf50633_usb_curlim_set(pcf, 100);
-               break;
-       case CHARGER_TYPE_1A:
--              __reg_write(pcf, PCF50633_REG_MBCC7, PCF50633_MBCC7_USB_1000mA);
-+              pcf50633_usb_curlim_set(pcf, 1000);
-               /*
-                * stop GPO / EN_HOSTUSB power driving out on the same
-                * USB power pins we have a 1A charger on right now!
-@@ -536,6 +562,12 @@ static void configure_pmu_for_charger(struct pcf50633_data *pcf,
-                                                PCF50633_REG_GPIO1CFG) & 0xf0);
-               break;
-       }
-+
-+      /* max out USB fast charge current -- actual current drawn is
-+       * additionally limited by USB limit so no worries
-+       */
-+      __reg_write(pcf, PCF50633_REG_MBCC5, 0xff);
-+
- }
- static void trigger_next_adc_job_if_any(struct pcf50633_data *pcf)
-@@ -562,6 +594,49 @@ static void add_request_to_adc_queue(struct pcf50633_data *pcf,
-               trigger_next_adc_job_if_any(pcf);
- }
-+/* we are run when we see a NOBAT situation, because there is no interrupt
-+ * source in pcf50633 that triggers on resuming charging.  It watches to see
-+ * if charging resumes, it reassesses the charging source if it does.  If the
-+ * USB power disappears, it is also a sign there must be a battery and it is
-+ * NOT being charged, so it exits since the next move must be USB insertion for
-+ * change of charger state
-+ */
-+
-+static void pcf50633_work_nobat(struct work_struct *work)
-+{
-+      struct pcf50633_data *pcf =
-+                      container_of(work, struct pcf50633_data, work_nobat);
-+
-+      mutex_lock(&pcf->working_lock_nobat);
-+      pcf->working_nobat = 1;
-+      mutex_unlock(&pcf->working_lock_nobat);
-+
-+      while (1) {
-+              msleep(1000);
-+
-+              /* there's a battery in there now? */
-+              if (reg_read(pcf, PCF50633_REG_MBCS3) & 0x40) {
-+
-+                      pcf->jiffies_last_bat_ins = jiffies;
-+
-+                      /* figure out our charging stance */
-+                      add_request_to_adc_queue(pcf, PCF50633_ADCC1_MUX_ADCIN1,
-+                                                   PCF50633_ADCC1_AVERAGE_16);
-+                      goto bail;
-+              }
-+
-+              /* he pulled USB cable since we were started?  exit then */
-+              if (pcf->usb_removal_count_nobat != pcf->usb_removal_count)
-+                      goto bail;
-+      }
-+
-+bail:
-+      mutex_lock(&pcf->working_lock_nobat);
-+      pcf->working_nobat = 0;
-+      mutex_unlock(&pcf->working_lock_nobat);
-+}
-+
-+
- static void pcf50633_work(struct work_struct *work)
- {
-       struct pcf50633_data *pcf =
-@@ -674,20 +749,29 @@ static void pcf50633_work(struct work_struct *work)
-               if (pcf->pdata->cb)
-                       pcf->pdata->cb(&pcf->client.dev,
-                                      PCF50633_FEAT_MBC, PMU_EVT_USB_INSERT);
-+              msleep(500); /* debounce, allow to see any ID resistor */
-               /* completion irq will figure out our charging stance */
-               add_request_to_adc_queue(pcf, PCF50633_ADCC1_MUX_ADCIN1,
-                                    PCF50633_ADCC1_AVERAGE_16);
-       }
-       if (pcfirq[0] & PCF50633_INT1_USBREM) {
-               DEBUGPC("USBREM ");
-+
-+              pcf->usb_removal_count++;
-+
-               /* only deal if we had understood it was in */
-               if (pcf->flags & PCF50633_F_USB_PRESENT) {
-                       input_report_key(pcf->input_dev, KEY_POWER2, 0);
-                       apm_queue_event(APM_POWER_STATUS_CHANGE);
-                       pcf->flags &= ~PCF50633_F_USB_PRESENT;
-+
-                       if (pcf->pdata->cb)
-                               pcf->pdata->cb(&pcf->client.dev,
-                                       PCF50633_FEAT_MBC, PMU_EVT_USB_REMOVE);
-+
-+                      /* destroy any memory of grant of power from host */
-+                      pcf->last_curlim_set = 0;
-+
-                       /* completion irq will figure out our charging stance */
-                       add_request_to_adc_queue(pcf, PCF50633_ADCC1_MUX_ADCIN1,
-                                       PCF50633_ADCC1_AVERAGE_16);
-@@ -759,6 +843,33 @@ static void pcf50633_work(struct work_struct *work)
-       if (pcfirq[2] & PCF50633_INT3_BATFULL) {
-               DEBUGPC("BATFULL ");
-+
-+              /* the problem is, we get a false BATFULL if we inserted battery
-+               * while USB powered.  Defeat BATFULL if we recently inserted
-+               * battery
-+               */
-+
-+              if ((jiffies - pcf->jiffies_last_bat_ins) < (HZ * 2)) {
-+
-+                      DEBUGPC("*** Ignoring BATFULL ***\n");
-+
-+                      ret = reg_read(pcf, PCF50633_REG_MBCC7) &
-+                                      PCF56033_MBCC7_USB_MASK;
-+
-+
-+                      reg_set_bit_mask(pcf, PCF50633_REG_MBCC7,
-+                                       PCF56033_MBCC7_USB_MASK,
-+                                       PCF50633_MBCC7_USB_SUSPEND);
-+
-+                      reg_set_bit_mask(pcf, PCF50633_REG_MBCC7,
-+                                       PCF56033_MBCC7_USB_MASK,
-+                                       ret);
-+              } else {
-+                      if (pcf->pdata->cb)
-+                              pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50633_FEAT_MBC, PMU_EVT_CHARGER_IDLE);
-+              }
-+
-               /* FIXME: signal this to userspace */
-       }
-       if (pcfirq[2] & PCF50633_INT3_CHGHALT) {
-@@ -796,8 +907,7 @@ static void pcf50633_work(struct work_struct *work)
-               switch (pcf->adc_queue_mux[tail]) {
-               case PCF50633_ADCC1_MUX_BATSNS_RES: /* battery voltage */
--                      pcf->flag_bat_voltage_read =
--                                                async_adc_complete(pcf);
-+                      pcf->flag_bat_voltage_read = async_adc_complete(pcf);
-                       break;
-               case PCF50633_ADCC1_MUX_ADCIN1: /* charger type */
-                       pcf->charger_adc_result_raw = async_adc_complete(pcf);
-@@ -829,8 +939,37 @@ static void pcf50633_work(struct work_struct *work)
-                   (PCF50633_MBCS1_USBPRES | PCF50633_MBCS1_USBOK)) {
-                       /*
-                        * hey no need to freak out, we have some kind of
--                       * valid charger power
-+                       * valid charger power to keep us going -- but note that
-+                       * we are not actually charging anything
-+                       */
-+                      if (pcf->pdata->cb)
-+                              pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50633_FEAT_MBC, PMU_EVT_CHARGER_IDLE);
-+
-+                      reg_set_bit_mask(pcf, PCF50633_REG_MBCC1,
-+                                      PCF50633_MBCC1_RESUME,
-+                                      PCF50633_MBCC1_RESUME);
-+      
-+                      /*
-+                       * Well, we are not charging anything right this second
-+                       * ... however in the next ~30s before we get the next
-+                       * NOBAT, he might insert a battery.  So we schedule a
-+                       * work function checking to see if
-+                       * we started charging something during that time.
-+                       * USB removal as well as charging terminates the work
-+                       * function so we can't get terminally confused
-                        */
-+                      mutex_lock(&pcf->working_lock_nobat);
-+                      if (!pcf->working_nobat) {
-+                              pcf->usb_removal_count_nobat =
-+                                                      pcf->usb_removal_count;
-+
-+                              if (!schedule_work(&pcf->work_nobat))
-+                                      DEBUGPC("failed to schedule nobat\n");
-+                      }
-+                      mutex_unlock(&pcf->working_lock_nobat);
-+
-+
-                       DEBUGPC("(NO)BAT ");
-               } else {
-                       /* Really low battery voltage, we have 8 seconds left */
-@@ -1063,10 +1202,13 @@ void pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma)
- {
-       u_int8_t bits;
-+      pcf->last_curlim_set = ma;
-+
-       dev_dbg(&pcf->client.dev, "setting usb current limit to %d ma", ma);
--      if (ma >= 1000)
-+      if (ma >= 1000) {
-               bits = PCF50633_MBCC7_USB_1000mA;
-+      }
-       else if (ma >= 500)
-               bits = PCF50633_MBCC7_USB_500mA;
-       else if (ma >= 100)
-@@ -1074,8 +1216,40 @@ void pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma)
-       else
-               bits = PCF50633_MBCC7_USB_SUSPEND;
-+      DEBUGPC("pcf50633_usb_curlim_set -> %dmA\n", ma);
-+
-+      if (!pcf->pdata->cb)
-+              goto set_it;
-+
-+      switch (bits) {
-+      case PCF50633_MBCC7_USB_100mA:
-+      case PCF50633_MBCC7_USB_SUSPEND:
-+               /* no charging is gonna be happening */
-+              pcf->pdata->cb(&pcf->client.dev,
-+                             PCF50633_FEAT_MBC, PMU_EVT_CHARGER_IDLE);
-+              break;
-+      default: /* right charging context that if there is power, we charge */
-+              if (pcf->flags & PCF50633_F_USB_PRESENT)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                             PCF50633_FEAT_MBC, PMU_EVT_CHARGER_ACTIVE);
-+              break;
-+      }
-+
-+set_it:
-       reg_set_bit_mask(pcf, PCF50633_REG_MBCC7, PCF56033_MBCC7_USB_MASK,
-                        bits);
-+
-+      /* clear batfull */
-+      reg_set_bit_mask(pcf, PCF50633_REG_MBCC1,
-+                              PCF50633_MBCC1_AUTORES,
-+                              0);
-+      reg_set_bit_mask(pcf, PCF50633_REG_MBCC1,
-+                              PCF50633_MBCC1_RESUME,
-+                              PCF50633_MBCC1_RESUME);
-+      reg_set_bit_mask(pcf, PCF50633_REG_MBCC1,
-+                              PCF50633_MBCC1_AUTORES,
-+                              PCF50633_MBCC1_AUTORES);
-+
- }
- EXPORT_SYMBOL_GPL(pcf50633_usb_curlim_set);
-@@ -1105,16 +1279,36 @@ static DEVICE_ATTR(usb_curlim, S_IRUGO | S_IWUSR, show_usblim, NULL);
- void pcf50633_charge_enable(struct pcf50633_data *pcf, int on)
- {
-       u_int8_t bits;
-+      u_int8_t usblim;
-       if (!(pcf->pdata->used_features & PCF50633_FEAT_MBC))
-               return;
-+      DEBUGPC("pcf50633_charge_enable %d\n", on);
-+
-       if (on) {
-               pcf->flags |= PCF50633_F_CHG_ENABLED;
-               bits = PCF50633_MBCC1_CHGENA;
-+              usblim = reg_read(pcf, PCF50633_REG_MBCC7) &
-+                                                      PCF56033_MBCC7_USB_MASK;
-+              switch (usblim) {
-+              case PCF50633_MBCC7_USB_1000mA:
-+              case PCF50633_MBCC7_USB_500mA:
-+                      if (pcf->flags & PCF50633_F_USB_PRESENT)
-+                              if (pcf->pdata->cb)
-+                                      pcf->pdata->cb(&pcf->client.dev,
-+                                                     PCF50633_FEAT_MBC,
-+                                                     PMU_EVT_CHARGER_ACTIVE);
-+                      break;
-+              default:
-+                      break;
-+              }
-       } else {
-               pcf->flags &= ~PCF50633_F_CHG_ENABLED;
-               bits = 0;
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50633_FEAT_MBC, PMU_EVT_CHARGER_IDLE);
-       }
-       reg_set_bit_mask(pcf, PCF50633_REG_MBCC1, PCF50633_MBCC1_CHGENA,
-                        bits);
-@@ -1703,7 +1897,9 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-       mutex_init(&data->lock);
-       mutex_init(&data->working_lock);
-+      mutex_init(&data->working_lock_nobat);
-       INIT_WORK(&data->work, pcf50633_work);
-+      INIT_WORK(&data->work_nobat, pcf50633_work_nobat);
-       data->irq = irq;
-       data->working = 0;
-       data->onkey_seconds = -1;
-diff --git a/include/linux/pcf506xx.h b/include/linux/pcf506xx.h
-index 33be73e..9069bd4 100644
---- a/include/linux/pcf506xx.h
-+++ b/include/linux/pcf506xx.h
-@@ -21,6 +21,8 @@ enum pmu_event {
-       PMU_EVT_USB_INSERT,
-       PMU_EVT_USB_REMOVE,
- #endif
-+      PMU_EVT_CHARGER_ACTIVE,
-+      PMU_EVT_CHARGER_IDLE,
-       __NUM_PMU_EVTS
- };
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1154-introduce-resume-dependency.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1154-introduce-resume-dependency.patch.patch
deleted file mode 100755 (executable)
index b5f4b40..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-From 8330651863c4b554961204475073b7af1cdf10bc Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:11 +0100
-Subject: [PATCH] introduce-resume-dependency.patch
-
-Defines a way for drivers to defer execution of resume callbacks
-until one or more other driver they are dependent on has itself
-resumed.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- include/linux/resume-dependency.h |   78 +++++++++++++++++++++++++++++++++++++
- 1 files changed, 78 insertions(+), 0 deletions(-)
- create mode 100644 include/linux/resume-dependency.h
-
-diff --git a/include/linux/resume-dependency.h b/include/linux/resume-dependency.h
-new file mode 100644
-index 0000000..b13aa3e
---- /dev/null
-+++ b/include/linux/resume-dependency.h
-@@ -0,0 +1,78 @@
-+#ifndef __RESUME_DEPENDENCY_H__
-+#define __RESUME_DEPENDENCY_H__
-+
-+/* Resume dependency framework
-+ *
-+ * (C) 2008 Openmoko, Inc.
-+ * Author: Andy Green <andy@openmoko.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; version 2.1.
-+ *
-+ * 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/list.h>
-+
-+struct resume_dependency {
-+      struct list_head list;
-+
-+      void (*callback)(void *); /* called with context as arg */
-+      void * context;
-+      int called_flag; /* set to 1 after called, use for multi dep */
-+};
-+
-+/* if you are a driver accept to have other drivers as dependencies, you need to
-+ * instantiate a struct resume_dependency above, then initialize it by invoking
-+ * init_resume_dependency_list() on it
-+ */
-+
-+#define init_resume_dependency_list(_head) \
-+      INIT_LIST_HEAD(&_head.list);
-+
-+
-+/* if your resume function depends on something else being resumed first, you
-+ * can register the dependency by calling this in your suspend function with
-+ * head being the list held by the thing you are dependent on, and dep being
-+ * your struct resume_dependency
-+ */
-+
-+#define register_resume_dependency(_head, _dep) { \
-+      _dep->called_flag = 0; \
-+      list_add(&_dep->list, &_head->list); \
-+}
-+
-+/* In the resume function that things can be dependent on, at the end you
-+ * invoke this macro.  This calls back the dependent resumes now it is safe to
-+ * use the resumed thing they were dependent on.
-+ */
-+
-+#define callback_all_resume_dependencies(_head) { \
-+      struct list_head *_pos, *_q; \
-+      struct resume_dependency *_dep; \
-+\
-+      list_for_each_safe(pos, _q, &_head.list) { \
-+              _dep = list_entry(_pos, struct resume_dependency, list); \
-+              _dep->called_flag = 1; \
-+              (_dep->callback)(dep->context); \
-+              list_del(_pos); \
-+      } \
-+}
-+
-+/* if your resume action is dependent on multiple drivers being resumed already,
-+ * register the same callback with each driver you are dependent on, and check
-+ * .called_flag for all of the struct resume_dependency.  When they are all 1
-+ * you know it is the last callback and you can resume, otherwise just return
-+ */
-+
-+#endif
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1155-introduce-pcf50633-resume-dependency-list.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1155-introduce-pcf50633-resume-dependency-list.patch.patch
deleted file mode 100755 (executable)
index a02b1a0..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-From 897069d6ec20d26b29e4f71264e2c68de8a93053 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:11 +0100
-Subject: [PATCH] introduce-pcf50633-resume-dependency-list.patch
-
-Adds resume dependency support to pcf50633
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |   26 ++++++++++++++++++++++++--
- include/linux/pcf50633.h     |    6 ++++++
- 2 files changed, 30 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 38cabd2..e477cd7 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -53,6 +53,7 @@
- #include <asm/arch/gta02.h>
- #include "pcf50633.h"
-+#include <linux/resume-dependency.h>
- #if 1
- #define DEBUGP(x, args ...) printk("%s: " x, __FUNCTION__, ## args)
-@@ -167,6 +168,9 @@ struct pcf50633_data {
-                       u_int8_t ena;
-               } ldo[__NUM_PCF50633_REGS];
-       } standby_regs;
-+
-+      struct resume_dependency resume_dependency;
-+
- #endif
- };
-@@ -1924,6 +1928,8 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-       pcf50633_global = data;
-+      init_resume_dependency_list(data->resume_dependency);
-+
-       populate_sysfs_group(data);
-       err = sysfs_create_group(&new_client->dev.kobj, &pcf_attr_group);
-@@ -2132,6 +2138,17 @@ int pcf50633_report_resumers(struct pcf50633_data *pcf, char *buf)
- #ifdef CONFIG_PM
-+/*
-+ * we need to export this because pcf50633_data is kept opaque
-+ */
-+
-+void pcf50633_register_resume_dependency(struct pcf50633_data *pcf,
-+                                      struct pcf50633_resume_dependency *dep)
-+{
-+      register_resume_dependency(pcf->resume_dependency, dep);
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_register_resume_dep);
-+
- static int pcf50633_suspend(struct device *dev, pm_message_t state)
- {
-@@ -2223,8 +2240,11 @@ static int pcf50633_resume(struct device *dev)
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-       int i;
-+      struct list_head *pos, *q;
-+      struct pcf50633_resume_dependency *dep;
-+
--      /* mutex_lock(&pcf->lock); */  /* resume in atomic context */
-+      mutex_lock(&pcf->lock);
-       __reg_write(pcf, PCF50633_REG_LEDENA, 0x01);
-@@ -2263,10 +2283,12 @@ static int pcf50633_resume(struct device *dev)
-               __reg_write(pcf, reg_out+1, pcf->standby_regs.ldo[i].ena);
-       }
--      /* mutex_unlock(&pcf->lock); */ /* resume in atomic context */
-+      mutex_unlock(&pcf->lock);
-       pcf50633_irq(pcf->irq, pcf);
-+      callback_all_resume_dependencies(pcf->resume_dependency);
-+
-       return 0;
- }
- #else
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index c0fdbe8..2bef616 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -2,6 +2,7 @@
- #define _LINUX_PCF50633_H
- #include <linux/pcf506xx.h>
-+#include <linux/resume-dependency.h>
- /* public in-kernel pcf50633 api */
-@@ -124,6 +125,11 @@ pcf50633_battvolt(struct pcf50633_data *pcf);
- extern int
- pcf50633_report_resumers(struct pcf50633_data *pcf, char *buf);
-+extern void
-+pcf50633_register_resume_dependency(struct pcf50633_data *pcf,
-+                                      struct pcf50633_resume_dependency *dep);
-+
-+
- #define PCF50633_FEAT_EXTON   0x00000001      /* not yet supported */
- #define PCF50633_FEAT_MBC     0x00000002
- #define PCF50633_FEAT_BBC     0x00000004      /* not yet supported */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1156-add-use-pcf50633-resume-callback-jbt6k74.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1156-add-use-pcf50633-resume-callback-jbt6k74.patch.patch
deleted file mode 100755 (executable)
index 99ec4e1..0000000
+++ /dev/null
@@ -1,438 +0,0 @@
-From b604d51087159af1a18546bf94e16ac6adf74746 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:11 +0100
-Subject: [PATCH] add-use-pcf50633-resume-callback-jbt6k74.patch
-
-Adds the resume callback stuff to glamo, then changes
-jbt6k74 to no longer use a sleeping workqueue, but to
-make its resume actions dependent on pcf50633 and
-glamo resume (for backlight and communication to LCM
-respectively)
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   39 ++++++++++++++++++++-
- drivers/i2c/chips/pcf50633.c       |   17 +++------
- drivers/mfd/glamo/glamo-core.c     |   16 ++++++++
- drivers/mfd/glamo/glamo-core.h     |    3 +-
- drivers/video/display/jbt6k74.c    |   67 +++++++++++++++++++-----------------
- include/linux/glamofb.h            |    3 ++
- include/linux/jbt6k74.h            |    4 ++
- include/linux/pcf50633.h           |    2 +-
- include/linux/resume-dependency.h  |   10 +++---
- 9 files changed, 108 insertions(+), 53 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index d7882ea..9ba1036 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -88,6 +88,12 @@
- /* arbitrates which sensor IRQ owns the shared SPI bus */
- static spinlock_t motion_irq_lock;
-+/* the dependency of jbt / LCM on pcf50633 resume */
-+struct resume_dependency resume_dep_jbt_pcf;
-+/* the dependency of jbt / LCM on glamo resume */
-+struct resume_dependency resume_dep_jbt_glamo;
-+
-+
- /* define FIQ IPC struct */
- /*
-  * contains stuff FIQ ISR modifies and normal kernel code can see and use
-@@ -857,21 +863,50 @@ static struct s3c2410_ts_mach_info gta02_ts_cfg = {
- /* SPI: LCM control interface attached to Glamo3362 */
--void gta02_jbt6k74_reset(int devidx, int level)
-+static void gta02_jbt6k74_reset(int devidx, int level)
- {
-       glamo_lcm_reset(level);
- }
- /* finally bring up deferred backlight resume now LCM is resumed itself */
--void gta02_jbt6k74_resuming(int devidx)
-+static void gta02_jbt6k74_resuming(int devidx)
- {
-       pcf50633_backlight_resume(pcf50633_global);
- }
-+static int gta02_jbt6k74_all_dependencies_resumed(int devidx)
-+{
-+      if (!resume_dep_jbt_pcf.called_flag)
-+              return 0;
-+
-+      if (!resume_dep_jbt_glamo.called_flag)
-+              return 0;
-+
-+      return 1;
-+}
-+
-+/* register jbt resume action to be dependent on pcf50633 and glamo resume */
-+
-+static void gta02_jbt6k74_suspending(int devindex, struct spi_device *spi)
-+{
-+      void jbt6k74_resume(void *spi); /* little white lies about types */
-+
-+      resume_dep_jbt_pcf.callback = jbt6k74_resume;
-+      resume_dep_jbt_pcf.context = (void *)spi;
-+      pcf50633_register_resume_dependency(pcf50633_global,
-+                                                         &resume_dep_jbt_pcf);
-+      resume_dep_jbt_glamo.callback = jbt6k74_resume;
-+      resume_dep_jbt_glamo.context = (void *)spi;
-+      glamo_register_resume_dependency(&resume_dep_jbt_glamo);
-+}
-+
-+
- const struct jbt6k74_platform_data jbt6k74_pdata = {
-       .reset          = gta02_jbt6k74_reset,
-       .resuming       = gta02_jbt6k74_resuming,
-+      .suspending     = gta02_jbt6k74_suspending,
-+      .all_dependencies_resumed = gta02_jbt6k74_all_dependencies_resumed,
- };
- static struct spi_board_info gta02_spi_board_info[] = {
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index e477cd7..e5ffeff 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1928,7 +1928,7 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-       pcf50633_global = data;
--      init_resume_dependency_list(data->resume_dependency);
-+      init_resume_dependency_list(&data->resume_dependency);
-       populate_sysfs_group(data);
-@@ -2143,11 +2143,11 @@ int pcf50633_report_resumers(struct pcf50633_data *pcf, char *buf)
-  */
- void pcf50633_register_resume_dependency(struct pcf50633_data *pcf,
--                                      struct pcf50633_resume_dependency *dep)
-+                                      struct resume_dependency *dep)
- {
--      register_resume_dependency(pcf->resume_dependency, dep);
-+      register_resume_dependency(&pcf->resume_dependency, dep);
- }
--EXPORT_SYMBOL_GPL(pcf50633_register_resume_dep);
-+EXPORT_SYMBOL_GPL(pcf50633_register_resume_dependency);
- static int pcf50633_suspend(struct device *dev, pm_message_t state)
-@@ -2240,9 +2240,6 @@ static int pcf50633_resume(struct device *dev)
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-       int i;
--      struct list_head *pos, *q;
--      struct pcf50633_resume_dependency *dep;
--
-       mutex_lock(&pcf->lock);
-@@ -2270,10 +2267,6 @@ static int pcf50633_resume(struct device *dev)
-               __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.ledout);
-               __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.ledena);
-               __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.leddim);
--      } else { /* force backlight down, platform will restore later */
--              __reg_write(pcf, PCF50633_REG_LEDOUT, 2);
--              __reg_write(pcf, PCF50633_REG_LEDENA, 0x20);
--              __reg_write(pcf, PCF50633_REG_LEDDIM, 1);
-       }
-       /* FIXME: one big read? */
-@@ -2287,7 +2280,7 @@ static int pcf50633_resume(struct device *dev)
-       pcf50633_irq(pcf->irq, pcf);
--      callback_all_resume_dependencies(pcf->resume_dependency);
-+      callback_all_resume_dependencies(&pcf->resume_dependency);
-       return 0;
- }
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index a6b977b..445ff24 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -1088,6 +1088,8 @@ static int __init glamo_probe(struct platform_device *pdev)
-               goto out_free;
-       }
-+      init_resume_dependency_list(&glamo->resume_dependency);
-+
-       /* register a number of sibling devices whoise IOMEM resources
-        * are siblings of pdev's IOMEM resource */
- #if 0
-@@ -1226,6 +1228,18 @@ static int glamo_remove(struct platform_device *pdev)
- }
- #ifdef CONFIG_PM
-+
-+/* have to export this because struct glamo_core is opaque */
-+
-+void glamo_register_resume_dependency(struct resume_dependency *
-+                                                            resume_dependency)
-+{
-+      register_resume_dependency(&glamo_handle->resume_dependency,
-+                                                           resume_dependency);
-+}
-+EXPORT_SYMBOL_GPL(glamo_register_resume_dependency);
-+
-+
- static int glamo_suspend(struct platform_device *pdev, pm_message_t state)
- {
-       glamo_power(glamo_handle, GLAMO_POWER_SUSPEND);
-@@ -1235,6 +1249,8 @@ static int glamo_suspend(struct platform_device *pdev, pm_message_t state)
- static int glamo_resume(struct platform_device *pdev)
- {
-       glamo_power(glamo_handle, GLAMO_POWER_ON);
-+      callback_all_resume_dependencies(&glamo_handle->resume_dependency);
-+
-       return 0;
- }
- #else
-diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h
-index cf89f03..1fee059 100644
---- a/drivers/mfd/glamo/glamo-core.h
-+++ b/drivers/mfd/glamo/glamo-core.h
-@@ -2,7 +2,7 @@
- #define __GLAMO_CORE_H
- #include <asm/system.h>
--
-+#include <linux/resume-dependency.h>
- /* for the time being, we put the on-screen framebuffer into the lowest
-  * VRAM space.  This should make the code easily compatible with the various
-@@ -29,6 +29,7 @@ struct glamo_core {
-       u_int16_t type;
-       u_int16_t revision;
-       spinlock_t lock;
-+      struct resume_dependency resume_dependency;
- };
- struct glamo_script {
-diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c
-index 178e2da..8e7bf36 100644
---- a/drivers/video/display/jbt6k74.c
-+++ b/drivers/video/display/jbt6k74.c
-@@ -27,11 +27,8 @@
- #include <linux/device.h>
- #include <linux/platform_device.h>
- #include <linux/delay.h>
--#include <linux/workqueue.h>
- #include <linux/jbt6k74.h>
--#include <linux/spi/spi.h>
--
- enum jbt_register {
-       JBT_REG_SLEEP_IN                = 0x10,
-       JBT_REG_SLEEP_OUT               = 0x11,
-@@ -116,14 +113,12 @@ struct jbt_info {
-       struct mutex lock;              /* protects tx_buf and reg_cache */
-       u16 tx_buf[8];
-       u16 reg_cache[0xEE];
--      struct work_struct work;
-+      int have_resumed;
- };
- #define JBT_COMMAND   0x000
- #define JBT_DATA      0x100
--static void jbt_resume_work(struct work_struct *work);
--
- static int jbt_reg_write_nodata(struct jbt_info *jbt, u8 reg)
- {
-@@ -576,8 +571,6 @@ static int __devinit jbt_probe(struct spi_device *spi)
-       if (!jbt)
-               return -ENOMEM;
--      INIT_WORK(&jbt->work, jbt_resume_work);
--
-       jbt->spi_dev = spi;
-       jbt->state = JBT_STATE_DEEP_STANDBY;
-       mutex_init(&jbt->lock);
-@@ -635,27 +628,48 @@ static int jbt_suspend(struct spi_device *spi, pm_message_t state)
-       struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-       struct jbt6k74_platform_data *jbt6k74_pdata = spi->dev.platform_data;
-+      /* platform needs to register resume dependencies here */
-+      if (jbt6k74_pdata->suspending)
-+              (jbt6k74_pdata->suspending)(0, spi);
-+
-       /* Save mode for resume */
-       jbt->last_state = jbt->state;
-       jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);
--      (jbt6k74_pdata->reset)(0, 0);
-+      jbt->have_resumed = 0;
-+
-+//    (jbt6k74_pdata->reset)(0, 0);
-       return 0;
- }
--static void jbt_resume_work(struct work_struct *work)
-+int jbt6k74_resume(struct spi_device *spi)
- {
--      struct jbt_info *jbt = container_of(work, struct jbt_info, work);
--      struct jbt6k74_platform_data *jbt6k74_pdata =
--                                              jbt->spi_dev->dev.platform_data;
-+      struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-+      struct jbt6k74_platform_data *jbt6k74_pdata = spi->dev.platform_data;
-+
-+      /* if we still wait on dependencies, exit because we will get called
-+       * again.  This guy will get called once by core resume action, and
-+       * should be set as resume_dependency callback for any dependencies
-+       * set by platform code.
-+       */
--      printk(KERN_INFO"jbt_resume_work waiting...\n");
--      /* 100ms is not enough here 2008-05-08 andy@openmoko.com
--       * if CONFIG_PM_DEBUG is enabled 2000ms is required
-+      if (jbt6k74_pdata->all_dependencies_resumed)
-+              if (!(jbt6k74_pdata->all_dependencies_resumed)(0))
-+                      return 0;
-+
-+      /* we can get called twice with all dependencies resumed if our core
-+       * resume callback is last of all.  Protect against going twice
-        */
--      msleep(400);
--      printk(KERN_INFO"jbt_resume_work GO...\n");
-+      if (jbt->have_resumed)
-+              return 0;
-+
-+      jbt->have_resumed = 1;
-+
-+      /* OK we are sure all devices we depend on for operation are up now */
-+
-+      /* even this needs glamo up on GTA02 :-/ */
-+      (jbt6k74_pdata->reset)(0, 1);
-       jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);
-       msleep(100);
-@@ -675,21 +689,10 @@ static void jbt_resume_work(struct work_struct *work)
-       if (jbt6k74_pdata->resuming)
-               (jbt6k74_pdata->resuming)(0);
--      printk(KERN_INFO"jbt_resume_work done...\n");
--}
--
--static int jbt_resume(struct spi_device *spi)
--{
--      struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
--      struct jbt6k74_platform_data *jbt6k74_pdata = spi->dev.platform_data;
--
--      (jbt6k74_pdata->reset)(0, 1);
--
--      if (!schedule_work(&jbt->work))
--              dev_err(&spi->dev, "Unable to schedule LCM wakeup work\n");
--
-       return 0;
- }
-+EXPORT_SYMBOL_GPL(jbt6k74_resume);
-+
- #else
- #define jbt_suspend   NULL
- #define jbt_resume    NULL
-@@ -704,7 +707,7 @@ static struct spi_driver jbt6k74_driver = {
-       .probe   = jbt_probe,
-       .remove  = __devexit_p(jbt_remove),
-       .suspend = jbt_suspend,
--      .resume  = jbt_resume,
-+      .resume  = jbt6k74_resume,
- };
- static int __init jbt_init(void)
-diff --git a/include/linux/glamofb.h b/include/linux/glamofb.h
-index 51bf593..bb4ed0a 100644
---- a/include/linux/glamofb.h
-+++ b/include/linux/glamofb.h
-@@ -2,6 +2,7 @@
- #define _LINUX_GLAMOFB_H
- #include <linux/spi/glamo.h>
-+#include <linux/resume-dependency.h>
- struct glamofb_val {
-       unsigned int defval;
-@@ -36,5 +37,7 @@ struct glamofb_platform_data {
- int glamofb_cmd_mode(struct glamofb_handle *gfb, int on);
- int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val);
- void glamo_lcm_reset(int level);
-+extern void
-+glamo_register_resume_dependency(struct resume_dependency * resume_dependency);
- #endif
-diff --git a/include/linux/jbt6k74.h b/include/linux/jbt6k74.h
-index 0ac9124..f0eaf39 100644
---- a/include/linux/jbt6k74.h
-+++ b/include/linux/jbt6k74.h
-@@ -1,9 +1,13 @@
- #ifndef __JBT6K74_H__
- #define __JBT6K74_H__
-+#include <linux/spi/spi.h>
-+
- struct jbt6k74_platform_data {
-       void (*reset)(int devindex, int level);
-       void (*resuming)(int devindex); /* called when LCM is resumed */
-+      void (*suspending)(int devindex, struct spi_device *spi);
-+      int (*all_dependencies_resumed)(int devindex);
- };
- #endif
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index 2bef616..8a75b28 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -127,7 +127,7 @@ pcf50633_report_resumers(struct pcf50633_data *pcf, char *buf);
- extern void
- pcf50633_register_resume_dependency(struct pcf50633_data *pcf,
--                                      struct pcf50633_resume_dependency *dep);
-+                                      struct resume_dependency *dep);
- #define PCF50633_FEAT_EXTON   0x00000001      /* not yet supported */
-diff --git a/include/linux/resume-dependency.h b/include/linux/resume-dependency.h
-index b13aa3e..e0c0f33 100644
---- a/include/linux/resume-dependency.h
-+++ b/include/linux/resume-dependency.h
-@@ -38,7 +38,7 @@ struct resume_dependency {
-  */
- #define init_resume_dependency_list(_head) \
--      INIT_LIST_HEAD(&_head.list);
-+      INIT_LIST_HEAD(&(_head)->list);
- /* if your resume function depends on something else being resumed first, you
-@@ -48,8 +48,8 @@ struct resume_dependency {
-  */
- #define register_resume_dependency(_head, _dep) { \
--      _dep->called_flag = 0; \
--      list_add(&_dep->list, &_head->list); \
-+      (_dep)->called_flag = 0; \
-+      list_add(&(_dep)->list, &(_head)->list); \
- }
- /* In the resume function that things can be dependent on, at the end you
-@@ -61,10 +61,10 @@ struct resume_dependency {
-       struct list_head *_pos, *_q; \
-       struct resume_dependency *_dep; \
- \
--      list_for_each_safe(pos, _q, &_head.list) { \
-+      list_for_each_safe(_pos, _q, &((_head)->list)) { \
-               _dep = list_entry(_pos, struct resume_dependency, list); \
-               _dep->called_flag = 1; \
--              (_dep->callback)(dep->context); \
-+              (_dep->callback)(_dep->context); \
-               list_del(_pos); \
-       } \
- }
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1157-The-following-is-a-minor-cleanup-of-backlight-resume.patch b/target/linux/s3c24xx/patches-2.6.26/1157-The-following-is-a-minor-cleanup-of-backlight-resume.patch
deleted file mode 100755 (executable)
index c167d2d..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-From eb0d4f1481de79a63f4a630bb874d3234a6ce13b Mon Sep 17 00:00:00 2001
-From: Sean McNeil <sean@mcneil.com>
-Date: Fri, 25 Jul 2008 23:06:11 +0100
-Subject: [PATCH] The following is a minor cleanup of backlight resume:
-
----
- drivers/i2c/chips/pcf50633.c |   12 ++++--------
- 1 files changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index e5ffeff..f6886d7 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -2228,8 +2228,9 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
- void pcf50633_backlight_resume(struct pcf50633_data *pcf)
- {
-+      /* we force the backlight on in fact */
-       __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.ledout);
--      __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.ledena);
-+      __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.ledena | 0x01);
-       __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.leddim);
- }
- EXPORT_SYMBOL_GPL(pcf50633_backlight_resume);
-@@ -2243,8 +2244,6 @@ static int pcf50633_resume(struct device *dev)
-       mutex_lock(&pcf->lock);
--      __reg_write(pcf, PCF50633_REG_LEDENA, 0x01);
--
-       /* Resume all saved registers that don't "survive" standby state */
-       __reg_write(pcf, PCF50633_REG_INT1M, pcf->standby_regs.int1m);
-       __reg_write(pcf, PCF50633_REG_INT2M, pcf->standby_regs.int2m);
-@@ -2263,11 +2262,8 @@ static int pcf50633_resume(struct device *dev)
-       __reg_write(pcf, PCF50633_REG_MEMLDOENA, pcf->standby_regs.memldoena);
-       /* platform can choose to defer backlight bringup */
--      if (!pcf->pdata->defer_resume_backlight) {
--              __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.ledout);
--              __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.ledena);
--              __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.leddim);
--      }
-+      if (!pcf->pdata->defer_resume_backlight)
-+              pcf50633_backlight_resume(pcf);
-       /* FIXME: one big read? */
-       for (i = 0; i < 7; i++) {
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1158-debug-codec-register-setting-sysfs.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1158-debug-codec-register-setting-sysfs.patch.patch
deleted file mode 100755 (executable)
index 3e4455a..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-From 048fc250b2e3b27c80e9442e5a34a82f698da9d6 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:11 +0100
-Subject: [PATCH] debug-codec-register-setting-sysfs.patch
- Allow direct setting of codec registers for super mega meddling power
- Signed-off-by: Andy Green <andy@openmoko.com>
-
----
- sound/soc/soc-core.c |   35 +++++++++++++++++++++++++++++++++++
- 1 files changed, 35 insertions(+), 0 deletions(-)
-
-diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
-index e148db9..67223fe 100644
---- a/sound/soc/soc-core.c
-+++ b/sound/soc/soc-core.c
-@@ -935,6 +935,38 @@ static ssize_t codec_reg_show(struct device *dev,
- }
- static DEVICE_ATTR(codec_reg, 0444, codec_reg_show, NULL);
-+
-+static ssize_t codec_reg_write(struct device *dev,
-+                             struct device_attribute *attr,
-+                             const char *buf, size_t count)
-+{
-+      u32 address;
-+      u32 data;
-+      char * end;
-+      size_t left = count;
-+      struct snd_soc_device *devdata = dev_get_drvdata(dev);
-+      struct snd_soc_codec *codec = devdata->codec;
-+
-+      address = simple_strtoul(buf, &end, 16);
-+      left -= (int)(end - buf);
-+      while ((*end == ' ') && (left)) {
-+              end++;
-+              left--;
-+      }
-+      if (!left)
-+              return count;
-+      data = simple_strtoul(end, &end, 16);
-+
-+      printk(KERN_INFO"user writes Codec reg 0x%02X with Data 0x%04X\n",
-+                                                              address, data);
-+
-+      codec->write(codec, address, data);
-+
-+      return count;
-+}
-+
-+static DEVICE_ATTR(codec_reg_write, 0644, NULL, codec_reg_write);
-+
- /**
-  * snd_soc_new_ac97_codec - initailise AC97 device
-  * @codec: audio codec
-@@ -1150,6 +1182,9 @@ int snd_soc_register_card(struct snd_soc_device *socdev)
-       mutex_unlock(&codec->mutex);
-+      err = device_create_file(socdev->dev, &dev_attr_codec_reg_write);
-+      if (err < 0)
-+              printk(KERN_WARNING "asoc: failed to add codec sysfs entries\n");
- out:
-       return ret;
- }
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1159-fix-pcf50633-suspend-resume-onehit-i2c-other-meddlin.patch b/target/linux/s3c24xx/patches-2.6.26/1159-fix-pcf50633-suspend-resume-onehit-i2c-other-meddlin.patch
deleted file mode 100755 (executable)
index e7fc674..0000000
+++ /dev/null
@@ -1,204 +0,0 @@
-From 286581f7a1cd2536b70cc0cfbc742ee45260252e Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:12 +0100
-Subject: [PATCH] fix-pcf50633-suspend-resume-onehit-i2c-other-meddling.patch
-
- - speed up suspend and resume by using one hit i2c bulk transactions
- - don't bother storing int mask set on suspend, the default one is
-   what we use anyway
- - put stack_trace() on pcf50633 low level access that fire if we
-   try to touch them before we resumed
- - cosmetic source cleanup
- - reduces resume time for pcf50633 from 450ms to 255ms
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   21 ++-------
- drivers/i2c/chips/pcf50633.c       |   83 +++++++++++++++++++----------------
- 2 files changed, 49 insertions(+), 55 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 9ba1036..22de181 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -477,24 +477,11 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-       .r_fix_batt_par = 10000,
-       .r_sense_milli  = 220,
-       .resumers = {
--              [0] = /* PCF50633_INT1_ADPINS   | */
--                /* PCF50633_INT1_ADPREM       | */
--                PCF50633_INT1_USBINS          |
--                PCF50633_INT1_USBREM          |
--                PCF50633_INT1_ALARM,
-+              [0] = PCF50633_INT1_USBINS |
-+                    PCF50633_INT1_USBREM |
-+                    PCF50633_INT1_ALARM,
-               [1] = PCF50633_INT2_ONKEYF,
--              [2] =  /* PCF50633_INT3_BATFULL | */
--                /* PCF50633_INT3_CHGHALT      | */
--                /* PCF50633_INT3_THLIMON      | */
--                /* PCF50633_INT3_THLIMOFF     | */
--                /* PCF50633_INT3_USBLIMON     | */
--                /* PCF50633_INT3_USBLIMOFF    | */
--                PCF50633_INT3_ONKEY1S ,
--              [3] = 0                         /* |
--                   PCF50633_INT4_LOWSYS       | */
--                /* PCF50633_INT4_LOWBAT       | */
--                /* PCF50633_INT4_HIGHTMP */,
--              [4] = 0
-+              [2] = PCF50633_INT3_ONKEY1S
-       },
-       .rails  = {
-               [PCF50633_REGULATOR_AUTO] = {
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index f6886d7..c148ea7 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -163,10 +163,7 @@ struct pcf50633_data {
-               u_int8_t down2out, down2ena;
-               u_int8_t memldoout, memldoena;
-               u_int8_t ledout, ledena, leddim;
--              struct {
--                      u_int8_t out;
--                      u_int8_t ena;
--              } ldo[__NUM_PCF50633_REGS];
-+              u_int8_t ldo[__NUM_PCF50633_REGS][2];
-       } standby_regs;
-       struct resume_dependency resume_dependency;
-@@ -187,6 +184,10 @@ static struct platform_device *pcf50633_pdev;
- static int __reg_write(struct pcf50633_data *pcf, u_int8_t reg, u_int8_t val)
- {
-+      if (pcf->have_been_suspended == 1) {
-+              dev_err(&pcf->client.dev, "__reg_write while suspended\n");
-+              dump_stack();
-+      }
-       return i2c_smbus_write_byte_data(&pcf->client, reg, val);
- }
-@@ -205,6 +206,10 @@ static int32_t __reg_read(struct pcf50633_data *pcf, u_int8_t reg)
- {
-       int32_t ret;
-+      if (pcf->have_been_suspended == 1) {
-+              dev_err(&pcf->client.dev, "__reg_read while suspended\n");
-+              dump_stack();
-+      }
-       ret = i2c_smbus_read_byte_data(&pcf->client, reg);
-       return ret;
-@@ -2155,6 +2160,13 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-       int i;
-+      int ret;
-+      u_int8_t tmp;
-+
-+      /* we suspend once (!) as late as possible in the suspend sequencing */
-+
-+      if ((state.event != PM_EVENT_SUSPEND) || (pcf->have_been_suspended))
-+              return 0;
-       /* The general idea is to power down all unused power supplies,
-        * and then mask all PCF50606 interrup sources but EXTONR, ONKEYF
-@@ -2176,25 +2188,25 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       pcf->standby_regs.ledout = __reg_read(pcf, PCF50633_REG_LEDOUT);
-       pcf->standby_regs.ledena = __reg_read(pcf, PCF50633_REG_LEDENA);
-       pcf->standby_regs.leddim = __reg_read(pcf, PCF50633_REG_LEDDIM);
--      /* FIXME: one big read? */
--      for (i = 0; i < 7; i++) {
--              u_int8_t reg_out = PCF50633_REG_LDO1OUT + 2*i;
--              pcf->standby_regs.ldo[i].out = __reg_read(pcf, reg_out);
--              pcf->standby_regs.ldo[i].ena = __reg_read(pcf, reg_out+1);
--      }
-+
-+      /* regulator voltages and enable states */
-+      ret = i2c_smbus_read_i2c_block_data(&pcf->client,
-+                                          PCF50633_REG_LDO1OUT, 14,
-+                                          &pcf->standby_regs.ldo[0][0]);
-+      if (ret != 14)
-+              dev_err(dev, "Failed to save LDO levels and enables :-(\n");
-       /* switch off power supplies that are not needed during suspend */
-       for (i = 0; i < __NUM_PCF50633_REGULATORS; i++) {
--              if (!(pcf->pdata->rails[i].flags & PMU_VRAIL_F_SUSPEND_ON)) {
--                      u_int8_t tmp;
--
--                      DEBUGP("disabling pcf50633 regulator %u\n", i);
--                      /* we cannot use pcf50633_onoff_set() because we're
--                       * already under the mutex */
--                      tmp = __reg_read(pcf, regulator_registers[i]+1);
--                      tmp &= 0xfe;
--                      __reg_write(pcf, regulator_registers[i]+1, tmp);
--              }
-+              if ((pcf->pdata->rails[i].flags & PMU_VRAIL_F_SUSPEND_ON))
-+                      continue;
-+
-+              dev_dbg(dev, "disabling regulator %u\n", i);
-+              /* we cannot use pcf50633_onoff_set() because we're
-+               * already under the mutex */
-+              tmp = __reg_read(pcf, regulator_registers[i]+1);
-+              tmp &= 0xfe;
-+              __reg_write(pcf, regulator_registers[i]+1, tmp);
-       }
-       /* turn off the backlight */
-@@ -2202,11 +2214,9 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       __reg_write(pcf, PCF50633_REG_LEDOUT, 2);
-       __reg_write(pcf, PCF50633_REG_LEDENA, 0x00);
--      pcf->standby_regs.int1m = __reg_read(pcf, PCF50633_REG_INT1M);
--      pcf->standby_regs.int2m = __reg_read(pcf, PCF50633_REG_INT2M);
--      pcf->standby_regs.int3m = __reg_read(pcf, PCF50633_REG_INT3M);
--      pcf->standby_regs.int4m = __reg_read(pcf, PCF50633_REG_INT4M);
--      pcf->standby_regs.int5m = __reg_read(pcf, PCF50633_REG_INT5M);
-+      /* set interrupt masks so only those sources we want to wake
-+       * us are able to
-+       */
-       __reg_write(pcf, PCF50633_REG_INT1M, ~pcf->pdata->resumers[0]);
-       __reg_write(pcf, PCF50633_REG_INT2M, ~pcf->pdata->resumers[1]);
-       __reg_write(pcf, PCF50633_REG_INT3M, ~pcf->pdata->resumers[2]);
-@@ -2240,16 +2250,13 @@ static int pcf50633_resume(struct device *dev)
- {
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
--      int i;
-+      int ret;
-       mutex_lock(&pcf->lock);
--      /* Resume all saved registers that don't "survive" standby state */
--      __reg_write(pcf, PCF50633_REG_INT1M, pcf->standby_regs.int1m);
--      __reg_write(pcf, PCF50633_REG_INT2M, pcf->standby_regs.int2m);
--      __reg_write(pcf, PCF50633_REG_INT3M, pcf->standby_regs.int3m);
--      __reg_write(pcf, PCF50633_REG_INT4M, pcf->standby_regs.int4m);
--      __reg_write(pcf, PCF50633_REG_INT5M, pcf->standby_regs.int5m);
-+      pcf->have_been_suspended = 2; /* resuming */
-+
-+      /* these guys get reset while pcf50633 is suspend state, refresh */
-       __reg_write(pcf, PCF50633_REG_OOCTIM2, pcf->standby_regs.ooctim2);
-       __reg_write(pcf, PCF50633_REG_AUTOOUT, pcf->standby_regs.autoout);
-@@ -2265,12 +2272,12 @@ static int pcf50633_resume(struct device *dev)
-       if (!pcf->pdata->defer_resume_backlight)
-               pcf50633_backlight_resume(pcf);
--      /* FIXME: one big read? */
--      for (i = 0; i < 7; i++) {
--              u_int8_t reg_out = PCF50633_REG_LDO1OUT + 2*i;
--              __reg_write(pcf, reg_out, pcf->standby_regs.ldo[i].out);
--              __reg_write(pcf, reg_out+1, pcf->standby_regs.ldo[i].ena);
--      }
-+      /* regulator voltages and enable states */
-+      ret = i2c_smbus_write_i2c_block_data(&pcf->client,
-+                                          PCF50633_REG_LDO1OUT, 14,
-+                                          &pcf->standby_regs.ldo[0][0]);
-+      if (ret)
-+              dev_err(dev, "Failed to restore LDOs :-( %d\n", ret);
-       mutex_unlock(&pcf->lock);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1160-fix-glamo-mci-relationship-with-pcf50633-suspend-res.patch b/target/linux/s3c24xx/patches-2.6.26/1160-fix-glamo-mci-relationship-with-pcf50633-suspend-res.patch
deleted file mode 100755 (executable)
index 9183193..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-From 7af35792e1165cb9258e192ddfcb03393eb76f86 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:12 +0100
-Subject: [PATCH] fix-glamo-mci-relationship-with-pcf50633-suspend-resume.patch
-
-After protecting pcf50633 read and write primitives against
-operation after suspend or before resume (by blowing a
-stack_trace()) I saw glamo-mci was trying to use pcf50633
-at these bad times on its own suspend and resume.  Since that
-part was already done via platform callback, I added an
-export in pcf50633 that tells you if it is ready or busy,
-and used it to defer (resume power on case) or ignore
-(suspend power off case, since pcf50633 already did it)
-the mci power call.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   17 ++++++++++-------
- drivers/i2c/chips/pcf50633.c       |   14 ++++++++++++++
- include/linux/pcf50633.h           |    5 +++++
- 3 files changed, 29 insertions(+), 7 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 22de181..5980ea9 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1277,13 +1277,12 @@ gta02_glamo_mmc_set_power(unsigned char power_mode, unsigned short vdd)
-       case GTA02v4_SYSTEM_REV:
-       case GTA02v5_SYSTEM_REV:
-       case GTA02v6_SYSTEM_REV:
--              /* depend on pcf50633 driver init */
--              if (!pcf50633_global)
--                      while (!pcf50633_global)
--                              msleep(10);
-               switch (power_mode) {
-               case MMC_POWER_ON:
-               case MMC_POWER_UP:
-+                      /* depend on pcf50633 driver init + not suspended */
-+                      while (pcf50633_ready(pcf50633_global))
-+                              msleep(1);
-                       /* select and set the voltage */
-                       if (vdd > 7) {
-                               mv += 300 + 100 * (vdd - 8);
-@@ -1292,15 +1291,19 @@ gta02_glamo_mmc_set_power(unsigned char power_mode, unsigned short vdd)
-                       }
-                       pcf50633_voltage_set(pcf50633_global,
-                                            PCF50633_REGULATOR_HCLDO, mv);
--                      msleep(10);
-                       pcf50633_onoff_set(pcf50633_global,
-                                          PCF50633_REGULATOR_HCLDO, 1);
--                      msleep(1);
-                       break;
-               case MMC_POWER_OFF:
-+                      /* power off happens during suspend, when pcf50633 can
-+                       * be already gone and not coming back... just forget
-+                       * the action then because pcf50633 suspend already
-+                       * dealt with it, otherwise we spin forever
-+                       */
-+                      if (pcf50633_ready(pcf50633_global))
-+                              return;
-                       pcf50633_onoff_set(pcf50633_global,
-                                          PCF50633_REGULATOR_HCLDO, 0);
--                      msleep(1);
-                       break;
-               }
-               break;
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index c148ea7..82ee2f0 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -2230,6 +2230,20 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       return 0;
- }
-+
-+int pcf50633_ready(struct pcf50633_data *pcf)
-+{
-+      if (!pcf)
-+              return -EBUSY;
-+
-+      if (pcf->have_been_suspended)
-+              return -EBUSY;
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_ready);
-+
-+
- /*
-  * if backlight resume is selected to be deferred by platform, then it
-  * can call this to finally reset backlight status (after LCM is resumed
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index 8a75b28..0522d92 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -129,6 +129,11 @@ extern void
- pcf50633_register_resume_dependency(struct pcf50633_data *pcf,
-                                       struct resume_dependency *dep);
-+/* 0 = initialized and resumed and ready to roll, !=0 = either not
-+ * initialized or not resumed yet
-+ */
-+extern int
-+pcf50633_ready(struct pcf50633_data *pcf);
- #define PCF50633_FEAT_EXTON   0x00000001      /* not yet supported */
- #define PCF50633_FEAT_MBC     0x00000002
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1161-fix-jbt6k74-force-reset-suspend.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1161-fix-jbt6k74-force-reset-suspend.patch.patch
deleted file mode 100755 (executable)
index fa0fe17..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7edcca73dd608afc4972db964b500dd684c12b09 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:12 +0100
-Subject: [PATCH] fix-jbt6k74-force-reset-suspend.patch
- Sean McNeil reports that without the reset for LCM in suspend, he
- gets a monochromatic mode on it somehow.
- Signed-off-by: Andy Green <andy@openmoko.com>
-
----
- drivers/video/display/jbt6k74.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c
-index 8e7bf36..7cc00ad 100644
---- a/drivers/video/display/jbt6k74.c
-+++ b/drivers/video/display/jbt6k74.c
-@@ -638,7 +638,7 @@ static int jbt_suspend(struct spi_device *spi, pm_message_t state)
-       jbt->have_resumed = 0;
--//    (jbt6k74_pdata->reset)(0, 0);
-+      (jbt6k74_pdata->reset)(0, 0);
-       return 0;
- }
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1162-fix-glamo-mci-power-setting-timeout-waiting-for-pcf5.patch b/target/linux/s3c24xx/patches-2.6.26/1162-fix-glamo-mci-power-setting-timeout-waiting-for-pcf5.patch
deleted file mode 100755 (executable)
index 0402bff..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From 98c8ab6ee24e43f1a9fdd941695917b426227b85 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:12 +0100
-Subject: [PATCH] fix-glamo-mci-power-setting-timeout-waiting-for-pcf50633.patch
-
-Glamo MCI power setting stuff spins on pcf50633
-but it won't hurt if it gives up after a second or
-two instead of stalling the resume silently.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   11 +++++++++--
- 1 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 5980ea9..69a952a 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1265,6 +1265,7 @@ static void
- gta02_glamo_mmc_set_power(unsigned char power_mode, unsigned short vdd)
- {
-       int mv = 1650;
-+      int timeout = 100;
-       printk(KERN_DEBUG "mmc_set_power(power_mode=%u, vdd=%u\n",
-              power_mode, vdd);
-@@ -1281,8 +1282,14 @@ gta02_glamo_mmc_set_power(unsigned char power_mode, unsigned short vdd)
-               case MMC_POWER_ON:
-               case MMC_POWER_UP:
-                       /* depend on pcf50633 driver init + not suspended */
--                      while (pcf50633_ready(pcf50633_global))
--                              msleep(1);
-+                      while (pcf50633_ready(pcf50633_global) && (timeout--))
-+                              msleep(5);
-+
-+                      if (!timeout) {
-+                              printk(KERN_ERR"gta02_glamo_mmc_set_power "
-+                                           "BAILING on timeout\n");
-+                              return;
-+                      }
-                       /* select and set the voltage */
-                       if (vdd > 7) {
-                               mv += 300 + 100 * (vdd - 8);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1163-fix-glamo-mci-resume-dependency-on-pcf50633.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1163-fix-glamo-mci-resume-dependency-on-pcf50633.patch.patch
deleted file mode 100755 (executable)
index 9d41e02..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-From 5ad924f2ed05ff695f523f62040a9c63b44084a0 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:12 +0100
-Subject: [PATCH] fix-glamo-mci-resume-dependency-on-pcf50633.patch
-
-Glamo MCI has a resume order dependncy on pcf50633, it has to be able to
-power the SD slot via it.
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   25 +++++++++++++++++++++++++
- drivers/mfd/glamo/glamo-core.c     |    8 ++++++++
- drivers/mfd/glamo/glamo-core.h     |    3 +++
- drivers/mfd/glamo/glamo-mci.c      |   11 ++++++++++-
- include/linux/glamofb.h            |    2 ++
- 5 files changed, 48 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 69a952a..64d275d 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -92,6 +92,8 @@ static spinlock_t motion_irq_lock;
- struct resume_dependency resume_dep_jbt_pcf;
- /* the dependency of jbt / LCM on glamo resume */
- struct resume_dependency resume_dep_jbt_glamo;
-+/* the dependency of Glamo MCI on pcf50633 resume (has to power SD slot) */
-+struct resume_dependency resume_dep_glamo_mci_pcf;
- /* define FIQ IPC struct */
-@@ -1317,6 +1319,26 @@ gta02_glamo_mmc_set_power(unsigned char power_mode, unsigned short vdd)
-       }
- }
-+
-+static int gta02_glamo_mci_all_dependencies_resumed(struct platform_device *dev)
-+{
-+      return resume_dep_glamo_mci_pcf.called_flag;
-+}
-+
-+/* register jbt resume action to be dependent on pcf50633 and glamo resume */
-+
-+static void gta02_glamo_mci_suspending(struct platform_device *dev)
-+{
-+      void glamo_mci_resume(void *dev); /* little white lies about types */
-+
-+      resume_dep_glamo_mci_pcf.callback = glamo_mci_resume;
-+      resume_dep_glamo_mci_pcf.context = (void *)dev;
-+      pcf50633_register_resume_dependency(pcf50633_global,
-+                                                   &resume_dep_glamo_mci_pcf);
-+}
-+
-+
-+
- /* Smedia Glamo 3362 */
- static struct glamofb_platform_data gta02_glamo_pdata = {
-@@ -1352,6 +1374,9 @@ static struct glamofb_platform_data gta02_glamo_pdata = {
-       /* glamo MMC function platform data */
-       .glamo_set_mci_power = gta02_glamo_mmc_set_power,
-       .glamo_irq_is_wired = glamo_irq_is_wired,
-+      .mci_suspending = gta02_glamo_mci_suspending,
-+      .mci_all_dependencies_resumed =
-+                                    gta02_glamo_mci_all_dependencies_resumed,
- };
- static struct resource gta02_glamo_resources[] = {
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index 445ff24..3edbfa8 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -270,6 +270,8 @@ struct glamo_mci_pdata glamo_mci_def_pdata = {
-       .glamo_set_mci_power    = NULL, /* filled in from MFD platform data */
-       .ocr_avail              = MMC_VDD_32_33,
-       .glamo_irq_is_wired     = NULL, /* filled in from MFD platform data */
-+      .mci_suspending = NULL, /* filled in from MFD platform data */
-+      .mci_all_dependencies_resumed = NULL, /* filled in from MFD platform data */
- };
- EXPORT_SYMBOL_GPL(glamo_mci_def_pdata);
-@@ -1112,6 +1114,10 @@ static int __init glamo_probe(struct platform_device *pdev)
-                                       glamo->pdata->glamo_set_mci_power;
-       glamo_mci_def_pdata.glamo_irq_is_wired =
-                                       glamo->pdata->glamo_irq_is_wired;
-+      glamo_mci_def_pdata.mci_suspending =
-+                                      glamo->pdata->mci_suspending;
-+      glamo_mci_def_pdata.mci_all_dependencies_resumed =
-+                              glamo->pdata->mci_all_dependencies_resumed;
-       glamo_2d_dev.dev.parent = &pdev->dev;
-       mangle_mem_resources(glamo_2d_dev.resource,
-@@ -1181,6 +1187,8 @@ static int __init glamo_probe(struct platform_device *pdev)
-                glamo_pll_rate(glamo, GLAMO_PLL1),
-                glamo_pll_rate(glamo, GLAMO_PLL2));
-+      glamo_lcm_reset(1);
-+
-       for (irq = IRQ_GLAMO(0); irq <= IRQ_GLAMO(8); irq++) {
-               set_irq_chip(irq, &glamo_irq_chip);
-               set_irq_handler(irq, handle_level_irq);
-diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h
-index 1fee059..b1531b3 100644
---- a/drivers/mfd/glamo/glamo-core.h
-+++ b/drivers/mfd/glamo/glamo-core.h
-@@ -71,6 +71,9 @@ struct glamo_mci_pdata {
-       void            (*glamo_set_mci_power)(unsigned char power_mode,
-                                    unsigned short vdd);
-       int             (*glamo_irq_is_wired)(void);
-+      void            (*mci_suspending)(struct platform_device *dev);
-+      int             (*mci_all_dependencies_resumed)(struct platform_device *dev);
-+
- };
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index 05bbfc4..37e3d3c 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -817,18 +817,27 @@ static int glamo_mci_suspend(struct platform_device *dev, pm_message_t state)
-       struct glamo_mci_host   *host = mmc_priv(mmc);
-       host->suspending++;
-+      if (host->pdata->mci_all_dependencies_resumed)
-+              (host->pdata->mci_suspending)(dev);
-+
-       return mmc_suspend_host(mmc, state);
- }
--static int glamo_mci_resume(struct platform_device *dev)
-+int glamo_mci_resume(struct platform_device *dev)
- {
-       struct mmc_host *mmc = platform_get_drvdata(dev);
-       struct glamo_mci_host   *host = mmc_priv(mmc);
-+      if (host->pdata->mci_all_dependencies_resumed)
-+              if (!(host->pdata->mci_all_dependencies_resumed)(dev))
-+                      return 0;
-+
-       host->suspending--;
-       return mmc_resume_host(mmc);
- }
-+EXPORT_SYMBOL_GPL(glamo_mci_resume);
-+
- #else /* CONFIG_PM */
- #define glamo_mci_suspend NULL
-diff --git a/include/linux/glamofb.h b/include/linux/glamofb.h
-index bb4ed0a..bb1a398 100644
---- a/include/linux/glamofb.h
-+++ b/include/linux/glamofb.h
-@@ -32,6 +32,8 @@ struct glamofb_platform_data {
-       void            (*glamo_set_mci_power)(unsigned char power_mode,
-                                    unsigned short vdd);
-       int             (*glamo_irq_is_wired)(void);
-+      void            (*mci_suspending)(struct platform_device *dev);
-+      int             (*mci_all_dependencies_resumed)(struct platform_device *dev);
- };
- int glamofb_cmd_mode(struct glamofb_handle *gfb, int on);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1164-fix-pcf50633-interrupt-work-enforce-wait-on-resume-c.patch b/target/linux/s3c24xx/patches-2.6.26/1164-fix-pcf50633-interrupt-work-enforce-wait-on-resume-c.patch
deleted file mode 100755 (executable)
index 6226c69..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-From 3cb0a576425bdd2cb9b8f48f9fe39c01dfc18bbf Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:12 +0100
-Subject: [PATCH] fix-pcf50633-interrupt-work-enforce-wait-on-resume-completion.patch
-
-Improve pcf50633 interrupt service scheduling to enforce only servicing
-when resume action is completed
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |   67 ++++++++++++++++++++++++++++++------------
- 1 files changed, 48 insertions(+), 19 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 82ee2f0..5c9d209 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -656,6 +656,26 @@ static void pcf50633_work(struct work_struct *work)
-       mutex_lock(&pcf->working_lock);
-       pcf->working = 1;
-+
-+      dev_info(&pcf->client.dev, "pcf50633_work called with suspended = %d\n",
-+                                 pcf->have_been_suspended);
-+
-+      /*
-+       * If we are inside suspend -> resume completion time we don't attempt
-+       * service until we have fully resumed.  Although we could talk to the
-+       * device as soon as I2C is up, the regs in the device which we might
-+       * choose to modify as part of the service action have not been
-+       * reloaded with their pre-suspend states yet.  Therefore we will
-+       * defer our service if we are called like that until our resume has
-+       * completed.
-+       */
-+
-+      if (pcf->have_been_suspended && (pcf->have_been_suspended < 2)) {
-+              dev_info(&pcf->client.dev, "rescheduling,  suspended = %d\n",
-+                                         pcf->have_been_suspended);
-+              goto reschedule;
-+      }
-+
-       /*
-        * datasheet says we have to read the five IRQ
-        * status regs in one transaction
-@@ -663,30 +683,25 @@ static void pcf50633_work(struct work_struct *work)
-       ret = i2c_smbus_read_i2c_block_data(&pcf->client, PCF50633_REG_INT1, 5,
-                                           pcfirq);
-       if (ret != 5) {
--              DEBUGP("Oh crap PMU IRQ register read failed -- "
--                     "retrying later %d\n", ret);
-+              dev_info(&pcf->client.dev,
-+                       "Oh crap PMU IRQ register read failed -- "
-+                       "retrying later %d\n", ret);
-               /*
--               * this situation can happen during resume, just defer
--               * handling the interrupt until enough I2C is up we can
--               * actually talk to the PMU.  We can't just ignore this
--               * because we are on a falling edge interrupt and our
--               * PMU interrupt source does not clear until we read these
--               * interrupt source registers.
-+               * it shouldn't fail, we no longer attempt to use I2C while
-+               * it can be suspended.  But we don't have much option but to
-+               * retry if if it ever did fail, because if we don't service
-+               * the interrupt to clear it, we will never see another PMU
-+               * interrupt edge.
-                */
--              if (!schedule_work(&pcf->work) && !pcf->working)
--                      dev_dbg(&pcf->client.dev, "work item may be lost\n");
--
--              /* we don't put the device here, hold it for next time */
--              mutex_unlock(&pcf->working_lock);
--              /* don't spew, delaying whatever else is happening */
--              msleep(1);
--              return;
-+              goto reschedule;
-       }
-       /* hey did we just resume? */
-       if (pcf->have_been_suspended) {
-+              /* resume is officially over now then */
-               pcf->have_been_suspended = 0;
-+
-               /*
-                * grab a copy of resume interrupt reasons
-                * from pcf50633 POV
-@@ -1044,6 +1059,19 @@ static void pcf50633_work(struct work_struct *work)
-       input_sync(pcf->input_dev);
-       put_device(&pcf->client.dev);
-       mutex_unlock(&pcf->working_lock);
-+
-+      return;
-+
-+reschedule:
-+      /* don't spew, delaying whatever else is happening */
-+      msleep(100);
-+
-+      dev_info(&pcf->client.dev, "rescheduling interrupt service\n");
-+      if (!schedule_work(&pcf->work))
-+              dev_err(&pcf->client.dev, "int service reschedule failed\n");
-+
-+      /* we don't put the device here, hold it for next time */
-+      mutex_unlock(&pcf->working_lock);
- }
- static irqreturn_t pcf50633_irq(int irq, void *_pcf)
-@@ -1051,10 +1079,11 @@ static irqreturn_t pcf50633_irq(int irq, void *_pcf)
-       struct pcf50633_data *pcf = _pcf;
-       DEBUGP("entering(irq=%u, pcf=%p): scheduling work\n", irq, _pcf);
-+      dev_info(&pcf->client.dev, "pcf50633_irq scheduling work\n");
-       get_device(&pcf->client.dev);
-       if (!schedule_work(&pcf->work) && !pcf->working)
--              dev_dbg(&pcf->client.dev, "work item may be lost\n");
-+              dev_err(&pcf->client.dev, "work item may be lost\n");
-       return IRQ_HANDLED;
- }
-@@ -2234,9 +2263,9 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
- int pcf50633_ready(struct pcf50633_data *pcf)
- {
-       if (!pcf)
--              return -EBUSY;
-+              return -EACCES;
--      if (pcf->have_been_suspended)
-+      if (pcf->have_been_suspended && (pcf->have_been_suspended < 3))
-               return -EBUSY;
-       return 0;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1165-fix-pcf50633-rtc-i2c-bulk-autoincrement-simplify.pat.patch b/target/linux/s3c24xx/patches-2.6.26/1165-fix-pcf50633-rtc-i2c-bulk-autoincrement-simplify.pat.patch
deleted file mode 100755 (executable)
index 064dee0..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
-From 03469473733ccb461781e091233bb337f70417f1 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:12 +0100
-Subject: [PATCH] fix-pcf50633-rtc-i2c-bulk-autoincrement-simplify.patch
-
-More pcf50633 major time saving by using i2c bulk autoincrement.  Code
-reduction too by using array for time elements.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |  134 ++++++++++++++++++++++++------------------
- 1 files changed, 77 insertions(+), 57 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 5c9d209..0406767 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1504,37 +1504,42 @@ static void pcf50633_get_power_status(struct apm_power_info *info)
- /***********************************************************************
-  * RTC
-  ***********************************************************************/
-+enum pcf50633_time_indexes {
-+      PCF50633_TI_SEC = 0,
-+      PCF50633_TI_MIN,
-+      PCF50633_TI_HOUR,
-+      PCF50633_TI_WKDAY,
-+      PCF50633_TI_DAY,
-+      PCF50633_TI_MONTH,
-+      PCF50633_TI_YEAR,
-+      PCF50633_TI_EXTENT /* always last */
-+};
-+
- struct pcf50633_time {
--      u_int8_t sec;
--      u_int8_t min;
--      u_int8_t hour;
--      u_int8_t wkday;
--      u_int8_t day;
--      u_int8_t month;
--      u_int8_t year;
-+      u_int8_t time[PCF50633_TI_EXTENT];
- };
- static void pcf2rtc_time(struct rtc_time *rtc, struct pcf50633_time *pcf)
- {
--      rtc->tm_sec = BCD2BIN(pcf->sec);
--      rtc->tm_min = BCD2BIN(pcf->min);
--      rtc->tm_hour = BCD2BIN(pcf->hour);
--      rtc->tm_wday = BCD2BIN(pcf->wkday);
--      rtc->tm_mday = BCD2BIN(pcf->day);
--      rtc->tm_mon = BCD2BIN(pcf->month);
--      rtc->tm_year = BCD2BIN(pcf->year) + 100;
-+      rtc->tm_sec = BCD2BIN(pcf->time[PCF50633_TI_SEC]);
-+      rtc->tm_min = BCD2BIN(pcf->time[PCF50633_TI_MIN]);
-+      rtc->tm_hour = BCD2BIN(pcf->time[PCF50633_TI_HOUR]);
-+      rtc->tm_wday = BCD2BIN(pcf->time[PCF50633_TI_WKDAY]);
-+      rtc->tm_mday = BCD2BIN(pcf->time[PCF50633_TI_DAY]);
-+      rtc->tm_mon = BCD2BIN(pcf->time[PCF50633_TI_MONTH]);
-+      rtc->tm_year = BCD2BIN(pcf->time[PCF50633_TI_YEAR]) + 100;
- }
- static void rtc2pcf_time(struct pcf50633_time *pcf, struct rtc_time *rtc)
- {
--      pcf->sec = BIN2BCD(rtc->tm_sec);
--      pcf->min = BIN2BCD(rtc->tm_min);
--      pcf->hour = BIN2BCD(rtc->tm_hour);
--      pcf->wkday = BIN2BCD(rtc->tm_wday);
--      pcf->day = BIN2BCD(rtc->tm_mday);
--      pcf->month = BIN2BCD(rtc->tm_mon);
--      pcf->year = BIN2BCD(rtc->tm_year - 100);
-+      pcf->time[PCF50633_TI_SEC] = BIN2BCD(rtc->tm_sec);
-+      pcf->time[PCF50633_TI_MIN] = BIN2BCD(rtc->tm_min);
-+      pcf->time[PCF50633_TI_HOUR] = BIN2BCD(rtc->tm_hour);
-+      pcf->time[PCF50633_TI_WKDAY] = BIN2BCD(rtc->tm_wday);
-+      pcf->time[PCF50633_TI_DAY] = BIN2BCD(rtc->tm_mday);
-+      pcf->time[PCF50633_TI_MONTH] = BIN2BCD(rtc->tm_mon);
-+      pcf->time[PCF50633_TI_YEAR] = BIN2BCD(rtc->tm_year - 100);
- }
- static int pcf50633_rtc_ioctl(struct device *dev, unsigned int cmd,
-@@ -1573,24 +1578,30 @@ static int pcf50633_rtc_read_time(struct device *dev, struct rtc_time *tm)
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-       struct pcf50633_time pcf_tm;
-+      int ret;
-       mutex_lock(&pcf->lock);
--      pcf_tm.sec = __reg_read(pcf, PCF50633_REG_RTCSC);
--      pcf_tm.min = __reg_read(pcf, PCF50633_REG_RTCMN);
--      pcf_tm.hour = __reg_read(pcf, PCF50633_REG_RTCHR);
--      pcf_tm.wkday = __reg_read(pcf, PCF50633_REG_RTCWD);
--      pcf_tm.day = __reg_read(pcf, PCF50633_REG_RTCDT);
--      pcf_tm.month = __reg_read(pcf, PCF50633_REG_RTCMT);
--      pcf_tm.year = __reg_read(pcf, PCF50633_REG_RTCYR);
-+
-+      ret = i2c_smbus_read_i2c_block_data(&pcf->client,
-+                                          PCF50633_REG_RTCSC,
-+                                          PCF50633_TI_EXTENT,
-+                                          &pcf_tm.time[0]);
-+      if (ret != PCF50633_TI_EXTENT)
-+              dev_err(dev, "Failed to read time :-(\n");
-+
-       mutex_unlock(&pcf->lock);
--      DEBUGP("PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
--              pcf_tm.day, pcf_tm.month, pcf_tm.year,
--              pcf_tm.hour, pcf_tm.min, pcf_tm.sec);
-+      dev_info(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
-+              pcf_tm.time[PCF50633_TI_DAY],
-+              pcf_tm.time[PCF50633_TI_MONTH],
-+              pcf_tm.time[PCF50633_TI_YEAR],
-+              pcf_tm.time[PCF50633_TI_HOUR],
-+              pcf_tm.time[PCF50633_TI_MIN],
-+              pcf_tm.time[PCF50633_TI_SEC]);
-       pcf2rtc_time(tm, &pcf_tm);
--      DEBUGP("RTC_TIME: %u.%u.%u %u:%u:%u\n",
-+      dev_info(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
-               tm->tm_mday, tm->tm_mon, tm->tm_year,
-               tm->tm_hour, tm->tm_min, tm->tm_sec);
-@@ -1602,24 +1613,30 @@ static int pcf50633_rtc_set_time(struct device *dev, struct rtc_time *tm)
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-       struct pcf50633_time pcf_tm;
-+      int ret;
--      DEBUGP("RTC_TIME: %u.%u.%u %u:%u:%u\n",
-+      dev_info(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
-               tm->tm_mday, tm->tm_mon, tm->tm_year,
-               tm->tm_hour, tm->tm_min, tm->tm_sec);
-       rtc2pcf_time(&pcf_tm, tm);
--      DEBUGP("PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
--              pcf_tm.day, pcf_tm.month, pcf_tm.year,
--              pcf_tm.hour, pcf_tm.min, pcf_tm.sec);
-+      dev_info(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
-+              pcf_tm.time[PCF50633_TI_DAY],
-+              pcf_tm.time[PCF50633_TI_MONTH],
-+              pcf_tm.time[PCF50633_TI_YEAR],
-+              pcf_tm.time[PCF50633_TI_HOUR],
-+              pcf_tm.time[PCF50633_TI_MIN],
-+              pcf_tm.time[PCF50633_TI_SEC]);
-       mutex_lock(&pcf->lock);
-       /* FIXME: disable second interrupt */
--      __reg_write(pcf, PCF50633_REG_RTCSC, pcf_tm.sec);
--      __reg_write(pcf, PCF50633_REG_RTCMN, pcf_tm.min);
--      __reg_write(pcf, PCF50633_REG_RTCHR, pcf_tm.hour);
--      __reg_write(pcf, PCF50633_REG_RTCWD, pcf_tm.wkday);
--      __reg_write(pcf, PCF50633_REG_RTCDT, pcf_tm.day);
--      __reg_write(pcf, PCF50633_REG_RTCMT, pcf_tm.month);
--      __reg_write(pcf, PCF50633_REG_RTCYR, pcf_tm.year);
-+
-+      ret = i2c_smbus_write_i2c_block_data(&pcf->client,
-+                                           PCF50633_REG_RTCSC,
-+                                           PCF50633_TI_EXTENT,
-+                                           &pcf_tm.time[0]);
-+      if (ret)
-+              dev_err(dev, "Failed to set time %d\n", ret);
-+
-       /* FIXME: re-enable second interrupt */
-       mutex_unlock(&pcf->lock);
-@@ -1631,17 +1648,20 @@ static int pcf50633_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-       struct pcf50633_time pcf_tm;
-+      int ret;
-       mutex_lock(&pcf->lock);
-+
-       alrm->enabled =
-            __reg_read(pcf, PCF50633_REG_INT1M) & PCF50633_INT1_ALARM ? 0 : 1;
--      pcf_tm.sec = __reg_read(pcf, PCF50633_REG_RTCSCA);
--      pcf_tm.min = __reg_read(pcf, PCF50633_REG_RTCMNA);
--      pcf_tm.hour = __reg_read(pcf, PCF50633_REG_RTCHRA);
--      pcf_tm.wkday = __reg_read(pcf, PCF50633_REG_RTCWDA);
--      pcf_tm.day = __reg_read(pcf, PCF50633_REG_RTCDTA);
--      pcf_tm.month = __reg_read(pcf, PCF50633_REG_RTCMTA);
--      pcf_tm.year = __reg_read(pcf, PCF50633_REG_RTCYRA);
-+
-+      ret = i2c_smbus_read_i2c_block_data(&pcf->client,
-+                                          PCF50633_REG_RTCSCA,
-+                                          PCF50633_TI_EXTENT,
-+                                          &pcf_tm.time[0]);
-+      if (ret != PCF50633_TI_EXTENT)
-+              dev_err(dev, "Failed to read Alarm time :-(\n");
-+
-       mutex_unlock(&pcf->lock);
-       pcf2rtc_time(&alrm->time, &pcf_tm);
-@@ -1655,6 +1675,7 @@ static int pcf50633_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-       struct pcf50633_time pcf_tm;
-       u_int8_t irqmask;
-+      int ret;
-       rtc2pcf_time(&pcf_tm, &alrm->time);
-@@ -1665,13 +1686,12 @@ static int pcf50633_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
-       irqmask |= PCF50633_INT1_ALARM;
-       __reg_write(pcf, PCF50633_REG_INT1M, irqmask);
--      __reg_write(pcf, PCF50633_REG_RTCSCA, pcf_tm.sec);
--      __reg_write(pcf, PCF50633_REG_RTCMNA, pcf_tm.min);
--      __reg_write(pcf, PCF50633_REG_RTCHRA, pcf_tm.hour);
--      __reg_write(pcf, PCF50633_REG_RTCWDA, pcf_tm.wkday);
--      __reg_write(pcf, PCF50633_REG_RTCDTA, pcf_tm.day);
--      __reg_write(pcf, PCF50633_REG_RTCMTA, pcf_tm.month);
--      __reg_write(pcf, PCF50633_REG_RTCYRA, pcf_tm.year);
-+      ret = i2c_smbus_write_i2c_block_data(&pcf->client,
-+                                           PCF50633_REG_RTCSCA,
-+                                           PCF50633_TI_EXTENT,
-+                                           &pcf_tm.time[0]);
-+      if (ret)
-+              dev_err(dev, "Failed to write alarm time :-( %d\n", ret);
-       if (alrm->enabled) {
-               /* (re-)enaable alarm interrupt */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1166-fix-pcf50633-use-i2c-bulk-autoincrement.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1166-fix-pcf50633-use-i2c-bulk-autoincrement.patch.patch
deleted file mode 100755 (executable)
index 9f31cfc..0000000
+++ /dev/null
@@ -1,230 +0,0 @@
-From cc770a67d483a63e98be55c15f08d97ed5599230 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:12 +0100
-Subject: [PATCH] fix-pcf50633-use-i2c-bulk-autoincrement.patch
-
-Simplify and speed up bulk sequential I2C actions in pcf50633
-the time savings are pretty considerable and so is the simplification
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |  125 +++++++++++++++++++++++++-----------------
- 1 files changed, 75 insertions(+), 50 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 0406767..645cbbb 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -156,14 +156,14 @@ struct pcf50633_data {
- #ifdef CONFIG_PM
-       struct {
--              u_int8_t int1m, int2m, int3m, int4m, int5m;
-               u_int8_t ooctim2;
--              u_int8_t autoout, autoena, automxc;
--              u_int8_t down1out, down1mxc;
--              u_int8_t down2out, down2ena;
--              u_int8_t memldoout, memldoena;
--              u_int8_t ledout, ledena, leddim;
--              u_int8_t ldo[__NUM_PCF50633_REGS][2];
-+              /* enables are always [1] below
-+               * I2C has limit of 32 sequential regs, so done in two lumps
-+               * because it covers 33 register extent otherwise
-+               */
-+              u_int8_t misc[PCF50633_REG_LEDDIM - PCF50633_REG_AUTOOUT + 1];
-+              /*  skip 1 reserved reg here */
-+              u_int8_t ldo[PCF50633_REG_HCLDOENA - PCF50633_REG_LDO1OUT + 1];
-       } standby_regs;
-       struct resume_dependency resume_dependency;
-@@ -1734,9 +1734,13 @@ static int pcf50633bl_set_intensity(struct backlight_device *bd)
-       u_int8_t ledena = 2;
-       int ret;
--      if (bd->props.power != FB_BLANK_UNBLANK)
--              intensity = 0;
--      if (bd->props.fb_blank != FB_BLANK_UNBLANK)
-+      dev_info(&pcf->client.dev, "pcf50633bl_set_intensity\n");
-+
-+      if (!(reg_read(pcf, PCF50633_REG_LEDENA) & 1))
-+              old_intensity = 0;
-+
-+      if ((bd->props.power != FB_BLANK_UNBLANK) ||
-+          (bd->props.fb_blank != FB_BLANK_UNBLANK))
-               intensity = 0;
-       /* The PCF50633 cannot handle LEDOUT = 0 (datasheet p60)
-@@ -2211,6 +2215,9 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       int i;
-       int ret;
-       u_int8_t tmp;
-+      u_int8_t res[5];
-+
-+      dev_err(dev, "pcf50633_suspend\n");
-       /* we suspend once (!) as late as possible in the suspend sequencing */
-@@ -2218,30 +2225,26 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-               return 0;
-       /* The general idea is to power down all unused power supplies,
--       * and then mask all PCF50606 interrup sources but EXTONR, ONKEYF
-+       * and then mask all PCF50633 interrupt sources but EXTONR, ONKEYF
-        * and ALARM */
-       mutex_lock(&pcf->lock);
-       /* Save all registers that don't "survive" standby state */
-       pcf->standby_regs.ooctim2 = __reg_read(pcf, PCF50633_REG_OOCTIM2);
--      pcf->standby_regs.autoout = __reg_read(pcf, PCF50633_REG_AUTOOUT);
--      pcf->standby_regs.autoena = __reg_read(pcf, PCF50633_REG_AUTOENA);
--      pcf->standby_regs.automxc = __reg_read(pcf, PCF50633_REG_AUTOMXC);
--      pcf->standby_regs.down1out = __reg_read(pcf, PCF50633_REG_DOWN1OUT);
--      pcf->standby_regs.down1mxc = __reg_read(pcf, PCF50633_REG_DOWN1MXC);
--      pcf->standby_regs.down2out = __reg_read(pcf, PCF50633_REG_DOWN2OUT);
--      pcf->standby_regs.down2ena = __reg_read(pcf, PCF50633_REG_DOWN2ENA);
--      pcf->standby_regs.memldoout = __reg_read(pcf, PCF50633_REG_MEMLDOOUT);
--      pcf->standby_regs.memldoena = __reg_read(pcf, PCF50633_REG_MEMLDOENA);
--      pcf->standby_regs.ledout = __reg_read(pcf, PCF50633_REG_LEDOUT);
--      pcf->standby_regs.ledena = __reg_read(pcf, PCF50633_REG_LEDENA);
--      pcf->standby_regs.leddim = __reg_read(pcf, PCF50633_REG_LEDDIM);
-+
-+      ret = i2c_smbus_read_i2c_block_data(&pcf->client,
-+                                          PCF50633_REG_AUTOOUT,
-+                                          sizeof(pcf->standby_regs.misc),
-+                                          &pcf->standby_regs.misc[0]);
-+      if (ret != 18)
-+              dev_err(dev, "Failed to save misc levels and enables :-(\n");
-       /* regulator voltages and enable states */
-       ret = i2c_smbus_read_i2c_block_data(&pcf->client,
--                                          PCF50633_REG_LDO1OUT, 14,
--                                          &pcf->standby_regs.ldo[0][0]);
-+                                          PCF50633_REG_LDO1OUT,
-+                                          sizeof(pcf->standby_regs.ldo),
-+                                          &pcf->standby_regs.ldo[0]);
-       if (ret != 14)
-               dev_err(dev, "Failed to save LDO levels and enables :-(\n");
-@@ -2251,11 +2254,16 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-                       continue;
-               dev_dbg(dev, "disabling regulator %u\n", i);
--              /* we cannot use pcf50633_onoff_set() because we're
--               * already under the mutex */
--              tmp = __reg_read(pcf, regulator_registers[i]+1);
--              tmp &= 0xfe;
--              __reg_write(pcf, regulator_registers[i]+1, tmp);
-+
-+              /* we can save ourselves the read part of a read-modify-write
-+               * here because we captured all these already
-+               */
-+              if (i < 4)
-+                      tmp = pcf->standby_regs.misc[i * 4 + 1];
-+              else
-+                      tmp = pcf->standby_regs.ldo[(i - 4) * 2 + 1];
-+
-+              __reg_write(pcf, regulator_registers[i] + 1, tmp & 0xfe);
-       }
-       /* turn off the backlight */
-@@ -2266,11 +2274,14 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       /* set interrupt masks so only those sources we want to wake
-        * us are able to
-        */
--      __reg_write(pcf, PCF50633_REG_INT1M, ~pcf->pdata->resumers[0]);
--      __reg_write(pcf, PCF50633_REG_INT2M, ~pcf->pdata->resumers[1]);
--      __reg_write(pcf, PCF50633_REG_INT3M, ~pcf->pdata->resumers[2]);
--      __reg_write(pcf, PCF50633_REG_INT4M, ~pcf->pdata->resumers[3]);
--      __reg_write(pcf, PCF50633_REG_INT5M, ~pcf->pdata->resumers[4]);
-+      for (i = 0; i < 5; i++)
-+              res[i] = ~pcf->pdata->resumers[i];
-+
-+      ret = i2c_smbus_write_i2c_block_data(&pcf->client,
-+                                           PCF50633_REG_INT1M,
-+                                           5, &res[0]);
-+      if (ret)
-+              dev_err(dev, "Failed to set wake masks :-( %d\n", ret);
-       pcf->have_been_suspended = 1;
-@@ -2302,9 +2313,12 @@ EXPORT_SYMBOL_GPL(pcf50633_ready);
- void pcf50633_backlight_resume(struct pcf50633_data *pcf)
- {
-       /* we force the backlight on in fact */
--      __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.ledout);
--      __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.ledena | 0x01);
--      __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.leddim);
-+      __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.misc[
-+                                 PCF50633_REG_LEDOUT - PCF50633_REG_AUTOOUT]);
-+      __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.misc[
-+                             PCF50633_REG_LEDENA - PCF50633_REG_AUTOOUT] | 1);
-+      __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.misc[
-+                                 PCF50633_REG_LEDDIM - PCF50633_REG_AUTOOUT]);
- }
- EXPORT_SYMBOL_GPL(pcf50633_backlight_resume);
-@@ -2314,7 +2328,10 @@ static int pcf50633_resume(struct device *dev)
-       struct i2c_client *client = to_i2c_client(dev);
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-       int ret;
-+      u8 res[5];
-+      dev_info(dev, "pcf50633_resume suspended on entry = %d\n",
-+                                                    pcf->have_been_suspended);
-       mutex_lock(&pcf->lock);
-       pcf->have_been_suspended = 2; /* resuming */
-@@ -2322,14 +2339,14 @@ static int pcf50633_resume(struct device *dev)
-       /* these guys get reset while pcf50633 is suspend state, refresh */
-       __reg_write(pcf, PCF50633_REG_OOCTIM2, pcf->standby_regs.ooctim2);
--      __reg_write(pcf, PCF50633_REG_AUTOOUT, pcf->standby_regs.autoout);
--      __reg_write(pcf, PCF50633_REG_AUTOMXC, pcf->standby_regs.automxc);
--      __reg_write(pcf, PCF50633_REG_DOWN1OUT, pcf->standby_regs.down1out);
--      __reg_write(pcf, PCF50633_REG_DOWN1MXC, pcf->standby_regs.down1mxc);
--      __reg_write(pcf, PCF50633_REG_DOWN2OUT, pcf->standby_regs.down2out);
--      __reg_write(pcf, PCF50633_REG_DOWN2ENA, pcf->standby_regs.down2ena);
--      __reg_write(pcf, PCF50633_REG_MEMLDOOUT, pcf->standby_regs.memldoout);
--      __reg_write(pcf, PCF50633_REG_MEMLDOENA, pcf->standby_regs.memldoena);
-+
-+      /* regulator voltages and enable states */
-+      ret = i2c_smbus_write_i2c_block_data(&pcf->client,
-+                                           PCF50633_REG_AUTOOUT,
-+                                           sizeof(pcf->standby_regs.misc) - 4,
-+                                           &pcf->standby_regs.misc[0]);
-+      if (ret)
-+              dev_err(dev, "Failed to restore misc :-( %d\n", ret);
-       /* platform can choose to defer backlight bringup */
-       if (!pcf->pdata->defer_resume_backlight)
-@@ -2337,14 +2354,22 @@ static int pcf50633_resume(struct device *dev)
-       /* regulator voltages and enable states */
-       ret = i2c_smbus_write_i2c_block_data(&pcf->client,
--                                          PCF50633_REG_LDO1OUT, 14,
--                                          &pcf->standby_regs.ldo[0][0]);
-+                                           PCF50633_REG_LDO1OUT,
-+                                           sizeof(pcf->standby_regs.ldo),
-+                                           &pcf->standby_regs.ldo[0]);
-       if (ret)
-               dev_err(dev, "Failed to restore LDOs :-( %d\n", ret);
--      mutex_unlock(&pcf->lock);
-+      memset(res, 0, sizeof(res));
-+      ret = i2c_smbus_write_i2c_block_data(&pcf->client,
-+                                           PCF50633_REG_INT1M,
-+                                           5, &res[0]);
-+      if (ret)
-+              dev_err(dev, "Failed to set int masks :-( %d\n", ret);
--      pcf50633_irq(pcf->irq, pcf);
-+      pcf->have_been_suspended = 3; /* resume completed */
-+
-+      mutex_unlock(&pcf->lock);
-       callback_all_resume_dependencies(&pcf->resume_dependency);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1167-fix-pcf50633-usb-curlim-workqueue-migration.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1167-fix-pcf50633-usb-curlim-workqueue-migration.patch.patch
deleted file mode 100755 (executable)
index 7b47f32..0000000
+++ /dev/null
@@ -1,217 +0,0 @@
-From 9bed4563ebd6ac99594f39ab004bf4411b904434 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:13 +0100
-Subject: [PATCH] fix-pcf50633-usb-curlim-workqueue-migration.patch
-
-pcf50633 needs to take responsibility for managing current limit
-changes asycnhrnously, ie, from USB stack enumeration.  It's a feature of
-pcf50633 not mach-gta02.c, and we can do better with taking care about
-keeping it from firing at a bad time in there too.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   23 +--------
- drivers/i2c/chips/pcf50633.c       |   96 ++++++++++++++++++++++++++++++++++++
- include/linux/pcf50633.h           |    5 ++
- 3 files changed, 103 insertions(+), 21 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 64d275d..accdbc5 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -813,29 +813,11 @@ static void gta02_udc_command(enum s3c2410_udc_cmd_e cmd)
-       }
- }
--/* use a work queue, since I2C API inherently schedules
-- * and we get called in hardirq context from UDC driver */
--
--struct vbus_draw {
--      struct work_struct work;
--      int ma;
--};
--static struct vbus_draw gta02_udc_vbus_drawer;
--
--static void __gta02_udc_vbus_draw(struct work_struct *work)
--{
--      if (!pcf50633_global) {
--              printk(KERN_ERR  "pcf50633 not initialized yet, can't change "
--                     "vbus_draw\n");
--              return;
--      }
--      pcf50633_usb_curlim_set(pcf50633_global, gta02_udc_vbus_drawer.ma);
--}
-+/* get PMU to set USB current limit accordingly */
- static void gta02_udc_vbus_draw(unsigned int ma)
- {
--      gta02_udc_vbus_drawer.ma = ma;
--      schedule_work(&gta02_udc_vbus_drawer.work);
-+      pcf50633_notify_usb_current_limit_change(pcf50633_global, ma);
- }
- static struct s3c2410_udc_mach_info gta02_udc_cfg = {
-@@ -1478,7 +1460,6 @@ static void __init gta02_machine_init(void)
-       s3c2410_gpio_setpin(S3C2410_GPD13, 1);
-       s3c2410_gpio_cfgpin(S3C2410_GPD13, S3C2410_GPIO_OUTPUT);
--      INIT_WORK(&gta02_udc_vbus_drawer.work, __gta02_udc_vbus_draw);
-       s3c24xx_udc_set_platdata(&gta02_udc_cfg);
-       set_s3c2410ts_info(&gta02_ts_cfg);
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 645cbbb..58f6ffc 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -125,6 +125,7 @@ struct pcf50633_data {
-       int have_been_suspended;
-       int usb_removal_count;
-       unsigned char pcfirq_resume[5];
-+      int probe_completed;
-       /* if he pulls battery while charging, we notice that and correctly
-        * report that the charger is idle.  But there is no interrupt that
-@@ -138,6 +139,12 @@ struct pcf50633_data {
-       int usb_removal_count_nobat;
-       int jiffies_last_bat_ins;
-+      /* current limit notification handler stuff */
-+      struct mutex working_lock_usb_curlimit;
-+      struct work_struct work_usb_curlimit;
-+      int pending_curlimit;
-+      int usb_removal_count_usb_curlimit;
-+
-       int last_curlim_set;
-       int coldplug_done; /* cleared by probe, set by first work service */
-@@ -603,6 +610,92 @@ static void add_request_to_adc_queue(struct pcf50633_data *pcf,
-               trigger_next_adc_job_if_any(pcf);
- }
-+/*
-+ * we get run to handle servicing the async notification from USB stack that
-+ * we got enumerated and allowed to draw a particular amount of current
-+ */
-+
-+static void pcf50633_work_usbcurlim(struct work_struct *work)
-+{
-+      struct pcf50633_data *pcf =
-+                  container_of(work, struct pcf50633_data, work_usb_curlimit);
-+
-+      mutex_lock(&pcf->working_lock_usb_curlimit);
-+
-+      dev_info(&pcf->client.dev, "pcf50633_work_usbcurlim\n");
-+
-+      if (!pcf->probe_completed)
-+              goto reschedule;
-+
-+      /* we got a notification from USB stack before we completed resume...
-+       * that can only make trouble, reschedule for a retry
-+       */
-+      if (pcf->have_been_suspended && (pcf->have_been_suspended < 3))
-+              goto reschedule;
-+
-+      /*
-+       * did he pull USB before we managed to set the limit?
-+       */
-+      if (pcf->usb_removal_count_usb_curlimit != pcf->usb_removal_count)
-+              goto bail;
-+
-+      /* OK let's set the requested limit and finish */
-+
-+      dev_info(&pcf->client.dev, "pcf50633_work_usbcurlim setting %dmA\n",
-+                                                       pcf->pending_curlimit);
-+      pcf50633_usb_curlim_set(pcf, pcf->pending_curlimit);
-+
-+bail:
-+      mutex_unlock(&pcf->working_lock_usb_curlimit);
-+      return;
-+
-+reschedule:
-+      dev_info(&pcf->client.dev, "pcf50633_work_usbcurlim rescheduling\n");
-+      if (!schedule_work(&pcf->work_usb_curlimit))
-+              dev_err(&pcf->client.dev, "work item may be lost\n");
-+
-+      mutex_unlock(&pcf->working_lock_usb_curlimit);
-+      /* don't spew, delaying whatever else is happening */
-+      msleep(1);
-+}
-+
-+
-+/* this is an export to allow machine to set USB current limit according to
-+ * notifications of USB stack about enumeration state.  We spawn a work
-+ * function to handle the actual setting, because suspend / resume and such
-+ * can be in a bad state since this gets called externally asychronous to
-+ * anything else going on in pcf50633.
-+ */
-+
-+int pcf50633_notify_usb_current_limit_change(struct pcf50633_data *pcf,
-+                                                              unsigned int ma)
-+{
-+      /* can happen if he calls with pcf50633_global before probe
-+       * have to bail with error since we can't even schedule the work
-+       */
-+      if (!pcf) {
-+              dev_err(&pcf->client.dev,
-+                      "pcf50633_notify_usb_current_limit_change "
-+                      "called with NULL pcf\n");
-+              return -EBUSY;
-+      }
-+
-+      dev_info(&pcf->client.dev,
-+               "pcf50633_notify_usb_current_limit_change %dmA\n", ma);
-+
-+      /* prepare to detect USB power removal before we complete */
-+      pcf->usb_removal_count_usb_curlimit = pcf->usb_removal_count;
-+
-+      pcf->pending_curlimit = ma;
-+
-+      if (!schedule_work(&pcf->work_usb_curlimit))
-+              dev_err(&pcf->client.dev, "work item may be lost\n");
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_notify_usb_current_limit_change);
-+
-+
- /* we are run when we see a NOBAT situation, because there is no interrupt
-  * source in pcf50633 that triggers on resuming charging.  It watches to see
-  * if charging resumes, it reassesses the charging source if it does.  If the
-@@ -1960,8 +2053,10 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-       mutex_init(&data->lock);
-       mutex_init(&data->working_lock);
-       mutex_init(&data->working_lock_nobat);
-+      mutex_init(&data->working_lock_usb_curlimit);
-       INIT_WORK(&data->work, pcf50633_work);
-       INIT_WORK(&data->work_nobat, pcf50633_work_nobat);
-+      INIT_WORK(&data->work_usb_curlimit, pcf50633_work_usbcurlim);
-       data->irq = irq;
-       data->working = 0;
-       data->onkey_seconds = -1;
-@@ -2060,6 +2155,7 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-       }
-       apm_get_power_status = pcf50633_get_power_status;
-+      data->probe_completed = 1;
- #ifdef CONFIG_MACH_NEO1973_GTA02
-       if (machine_is_neo1973_gta02()) {
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index 0522d92..fa1c7e8 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -129,6 +129,11 @@ extern void
- pcf50633_register_resume_dependency(struct pcf50633_data *pcf,
-                                       struct resume_dependency *dep);
-+extern int
-+pcf50633_notify_usb_current_limit_change(struct pcf50633_data *pcf,
-+                                                             unsigned int ma);
-+
-+
- /* 0 = initialized and resumed and ready to roll, !=0 = either not
-  * initialized or not resumed yet
-  */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1168-change-lcm-keep-power-faster-resume.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1168-change-lcm-keep-power-faster-resume.patch.patch
deleted file mode 100755 (executable)
index 17af5b4..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-From b022e94ed594ce88e0aeec92d0cd56cc9aa2758d Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:13 +0100
-Subject: [PATCH] change-lcm-keep-power-faster-resume.patch
-
-The LCM spins for 100ms during resume for not much reason.  Leave it powered
-(it is meant to pull uA when suspended) and get nice fast resume to video.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |    1 +
- drivers/video/display/jbt6k74.c    |   24 ++++--------------------
- 2 files changed, 5 insertions(+), 20 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index accdbc5..d5841d7 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -553,6 +553,7 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-               },
-               [PCF50633_REGULATOR_LDO6] = {
-                       .name           = "user1",
-+                      .flags = PMU_VRAIL_F_SUSPEND_ON,
-                       .voltage        = {
-                               .init   = 0,
-                               .max    = 3300,
-diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c
-index 7cc00ad..6fa1fe7 100644
---- a/drivers/video/display/jbt6k74.c
-+++ b/drivers/video/display/jbt6k74.c
-@@ -628,7 +628,7 @@ static int jbt_suspend(struct spi_device *spi, pm_message_t state)
-       struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-       struct jbt6k74_platform_data *jbt6k74_pdata = spi->dev.platform_data;
--      /* platform needs to register resume dependencies here */
-+      /* platform can register resume dependencies here, if any */
-       if (jbt6k74_pdata->suspending)
-               (jbt6k74_pdata->suspending)(0, spi);
-@@ -638,7 +638,7 @@ static int jbt_suspend(struct spi_device *spi, pm_message_t state)
-       jbt->have_resumed = 0;
--      (jbt6k74_pdata->reset)(0, 0);
-+/*    (jbt6k74_pdata->reset)(0, 0); */
-       return 0;
- }
-@@ -648,31 +648,17 @@ int jbt6k74_resume(struct spi_device *spi)
-       struct jbt_info *jbt = dev_get_drvdata(&spi->dev);
-       struct jbt6k74_platform_data *jbt6k74_pdata = spi->dev.platform_data;
--      /* if we still wait on dependencies, exit because we will get called
--       * again.  This guy will get called once by core resume action, and
--       * should be set as resume_dependency callback for any dependencies
--       * set by platform code.
--       */
--
-       if (jbt6k74_pdata->all_dependencies_resumed)
-               if (!(jbt6k74_pdata->all_dependencies_resumed)(0))
-                       return 0;
-       /* we can get called twice with all dependencies resumed if our core
--       * resume callback is last of all.  Protect against going twice
-+       * resume callback is last of all.  Protect against doing anything twice
-        */
-       if (jbt->have_resumed)
-               return 0;
--      jbt->have_resumed = 1;
--
--      /* OK we are sure all devices we depend on for operation are up now */
--
--      /* even this needs glamo up on GTA02 :-/ */
--      (jbt6k74_pdata->reset)(0, 1);
--
--      jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);
--      msleep(100);
-+      jbt->have_resumed |= 1;
-       switch (jbt->last_state) {
-       case JBT_STATE_QVGA_NORMAL:
-@@ -684,8 +670,6 @@ int jbt6k74_resume(struct spi_device *spi)
-       }
-       jbt6k74_display_onoff(jbt, 1);
--      /* this gives the platform a chance to bring up backlight now */
--
-       if (jbt6k74_pdata->resuming)
-               (jbt6k74_pdata->resuming)(0);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1169-fix-gta02-mach-remove-gta01-lcd-reset.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1169-fix-gta02-mach-remove-gta01-lcd-reset.patch.patch
deleted file mode 100755 (executable)
index 2f92730..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From e317b5260092f65cce62396748a468743bec6a55 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:13 +0100
-Subject: [PATCH] fix-gta02-mach-remove-gta01-lcd-reset.patch
- Signed-off-by: Andy Green <andy@openmoko.com>
-
----
- arch/arm/mach-s3c2440/mach-gta02.c |    4 ----
- 1 files changed, 0 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index d5841d7..654dc8f 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1518,10 +1518,6 @@ static void __init gta02_machine_init(void)
- #endif
-       s3c2410_pm_init();
--      /* Set LCD_RESET / XRES to high */
--      s3c2410_gpio_setpin(GTA01_GPIO_LCD_RESET, 1);
--      s3c2410_gpio_cfgpin(GTA01_GPIO_LCD_RESET, S3C2410_GPIO_OUTPUT);
--
-       /* Make sure the modem can wake us up */
-       set_irq_type(GTA02_IRQ_MODEM, IRQT_RISING);
-       rc = request_irq(GTA02_IRQ_MODEM, gta02_modem_irq, IRQF_DISABLED,
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1170-add-remote-install-sdcard-script.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1170-add-remote-install-sdcard-script.patch.patch
deleted file mode 100755 (executable)
index c2d2c07..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From a0b4cdbaad848411703dc059995ac7e8ea7e7417 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:14 +0100
-Subject: [PATCH] add-remote-install-sdcard-script.patch
-
-If you boot from SDCARD, this helper script for the build host
-mounts SD card part 1, copies the new uImage.bin, umounts it and
-then remounts SD card part 2 as ro, before doing a reboot all
-in one step.  Read the instructions inside the script for adding
-your public key to the GTAxx rootfs for really really simple and
-nice automatic update and reboot action.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- remote_install_sdcard |   20 ++++++++++++++++++++
- 1 files changed, 20 insertions(+), 0 deletions(-)
- create mode 100755 remote_install_sdcard
-
-diff --git a/remote_install_sdcard b/remote_install_sdcard
-new file mode 100755
-index 0000000..c84b6ae
---- /dev/null
-+++ b/remote_install_sdcard
-@@ -0,0 +1,20 @@
-+#!/bin/sh
-+
-+# automatic kernel updater and reboot - Andy Green <andy@openmoko.com>
-+
-+GTA_DEVICE_IP=192.168.0.202
-+GTA_MOUNTPOINT=/mnt
-+
-+# you should set up key-based auth on dropbear if you want
-+# to play this game.
-+#
-+# 1) mkdir /home/root/.ssh
-+# 2) chown root:root / /home /home/root
-+# 3) chmod 700 /home/root /home/root/.ssh
-+# 4) copy your id_*.pub into /home/root/.ssh/authorized_keys
-+# 5) chmod 600 /home/root/.ssh/*
-+
-+ssh root@$GTA_DEVICE_IP "mount /dev/mmcblk0p1 $GTA_MOUNTPOINT"
-+scp uImage.bin root@$GTA_DEVICE_IP:$GTA_MOUNTPOINT
-+ssh root@$GTA_DEVICE_IP "umount $GTA_MOUNTPOINT ; mount /dev/mmcblk0p2 / -oremount,ro ; reboot -if &"
-+
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1171-fix-pcf50633-require-resume-level-3-for-irq-work.pat.patch b/target/linux/s3c24xx/patches-2.6.26/1171-fix-pcf50633-require-resume-level-3-for-irq-work.pat.patch
deleted file mode 100755 (executable)
index b57418a..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0bdbf5f961ca615f48cb4ba19f7fd852593aa998 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:14 +0100
-Subject: [PATCH] fix-pcf50633-require-resume-level-3-for-irq-work.patch
- Signed-off-by: Andy Green <andy@openmoko.com>
-
----
- drivers/i2c/chips/pcf50633.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 58f6ffc..3bc9fa7 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -763,7 +763,7 @@ static void pcf50633_work(struct work_struct *work)
-        * completed.
-        */
--      if (pcf->have_been_suspended && (pcf->have_been_suspended < 2)) {
-+      if (pcf->have_been_suspended && (pcf->have_been_suspended < 3)) {
-               dev_info(&pcf->client.dev, "rescheduling,  suspended = %d\n",
-                                          pcf->have_been_suspended);
-               goto reschedule;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1172-fix-pcf50633-add-back-gratuitous-isr-work-call-in-re.patch b/target/linux/s3c24xx/patches-2.6.26/1172-fix-pcf50633-add-back-gratuitous-isr-work-call-in-re.patch
deleted file mode 100755 (executable)
index b149540..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From d94d0b993494af18025b0980810ddbd44964ad04 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:14 +0100
-Subject: [PATCH] fix-pcf50633-add-back-gratuitous-isr-work-call-in-resume.patch
-
-Sean McNeil reports that he doesn't get pcf50633 interrupts any
-more after resume.  This adds back the call to ISR work in
-the resume, removal of which is probably to do with it.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |   10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 3bc9fa7..4002c03 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -2467,6 +2467,16 @@ static int pcf50633_resume(struct device *dev)
-       mutex_unlock(&pcf->lock);
-+      /* gratuitous call to PCF work function, in the case that the PCF
-+       * interrupt edge was missed during resume, this forces the pending
-+       * register clear and lifts the interrupt back high again.  In the
-+       * case nothing is waiting for service, no harm done.
-+       */
-+
-+      get_device(&pcf->client.dev);
-+      if (!schedule_work(&pcf->work) && !pcf->working)
-+              dev_err(&pcf->client.dev, "resume work item may be lost\n");
-+
-       callback_all_resume_dependencies(&pcf->resume_dependency);
-       return 0;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1173-fix-pcf50633-kill-white-splash-of-death-on-suspend.p.patch b/target/linux/s3c24xx/patches-2.6.26/1173-fix-pcf50633-kill-white-splash-of-death-on-suspend.p.patch
deleted file mode 100755 (executable)
index c8de0da..0000000
+++ /dev/null
@@ -1,263 +0,0 @@
-From df0a2db3e96b39e9cd48acb069f2e60919be49f9 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:14 +0100
-Subject: [PATCH] fix-pcf50633-kill-white-splash-of-death-on-suspend.patch
-
-mach-gta02 meddles with the regulator platform struct after
-it is defined, leading to LCM power getting lost in suspend
-despite I set it to be left up.  Fixing this finally removes
-the incredibly stubborn white LCM on suspend "flash".
-
-This is also going to be implicated in Sean McNeil's
-experience of monochromatic LCM after resume, which was
-previously attacked by resetting and re-initing the LCM
-from scratch.
-
-In addition, I realized that we take down core_1v3 in
-pcf50633 suspend action, this is happening near the
-start of suspend, so we are in a meta-race to finish
-suspend in a controlled way before the caps on core_1v3
-run out (I only saw 23.3uF total).  If it's true, this
-is where the weirdo sensitivity to timing during
-suspend is coming from.
-
-Therefore in this patch we also remove sleeps and
-dev_info() etc (which have to flush on serial console)
-from the pc50633 isr workqueue if we are in pcf50633
-driver suspend state 1, ie, suspending... because we
-don't have time for it.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   43 ++++++++++++++++++++++++++----------
- drivers/i2c/chips/pcf50633.c       |   29 ++++++++++++-----------
- drivers/mfd/glamo/glamo-core.c     |    2 +
- drivers/video/display/jbt6k74.c    |    1 +
- 4 files changed, 49 insertions(+), 26 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 654dc8f..0bacafa 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -485,6 +485,9 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-               [1] = PCF50633_INT2_ONKEYF,
-               [2] = PCF50633_INT3_ONKEY1S
-       },
-+      /* warning: these get rewritten during machine init below
-+       * depending on pcb variant
-+       */
-       .rails  = {
-               [PCF50633_REGULATOR_AUTO] = {
-                       .name           = "io_3v3",
-@@ -496,6 +499,12 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-               },
-               [PCF50633_REGULATOR_DOWN1] = {
-                       .name           = "core_1v3",
-+                      /* Wow, when we are going into suspend, after pcf50633
-+                       * runs its suspend (which happens real early since it
-+                       * is an i2c device) we are running out of the 22uF cap
-+                       * on core_1v3 rail !!!!
-+                       */
-+                      .flags          = PMU_VRAIL_F_SUSPEND_ON,
-                       .voltage        = {
-                               .init   = 1300,
-                               .max    = 1600,
-@@ -503,6 +512,7 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-               },
-               [PCF50633_REGULATOR_DOWN2] = {
-                       .name           = "core_1v8",
-+                      .flags          = PMU_VRAIL_F_SUSPEND_ON,
-                       .voltage        = {
-                               .init   = 1800,
-                               .max    = 1800,
-@@ -516,8 +526,7 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-                       },
-               },
-               [PCF50633_REGULATOR_LDO1] = {
--                      .name           = "stby_1v3",
--                      .flags          = PMU_VRAIL_F_SUSPEND_ON,
-+                      .name           = "gsensor_3v3",
-                       .voltage        = {
-                               .init   = 1300,
-                               .max    = 1330,
-@@ -531,7 +540,7 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-                       },
-               },
-               [PCF50633_REGULATOR_LDO3] = {
--                      .name           = "lcm_3v",
-+                      .name           = "unused3",
-                       .voltage        = {
-                               .init   = 3000,
-                               .max    = 3000,
-@@ -545,20 +554,28 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-                       },
-               },
-               [PCF50633_REGULATOR_LDO5] = {
--                      .name           = "gl_1v5",
-+                      .name           = "rf3v",
-                       .voltage        = {
-                               .init   = 1500,
-                               .max    = 1500,
-                       },
-               },
-               [PCF50633_REGULATOR_LDO6] = {
--                      .name           = "user1",
-+                      .name           = "lcm_3v",
-                       .flags = PMU_VRAIL_F_SUSPEND_ON,
-                       .voltage        = {
-                               .init   = 0,
-                               .max    = 3300,
-                       },
-               },
-+              [PCF50633_REGULATOR_MEMLDO] = {
-+                      .name           = "memldo",
-+                      .flags = PMU_VRAIL_F_SUSPEND_ON,
-+                      .voltage        = {
-+                              .init   = 1800,
-+                              .max    = 1800,
-+                      },
-+              },
-       },
-       .defer_resume_backlight = 1,
- };
-@@ -611,13 +628,15 @@ static void mangle_pmu_pdata_by_system_rev(void)
-                                                               .max = 3000,
-                                                       }
-                                               });
--              gta02_pcf_pdata.rails[PCF50633_REGULATOR_LDO6] = ((struct pmu_voltage_rail) {
--                                                      .name = "lcm_3v",
--                                                      .voltage = {
--                                                              .init = 3000,
--                                                              .max = 3000,
--                                                      }
--                                              });
-+              gta02_pcf_pdata.rails[PCF50633_REGULATOR_LDO6] =
-+                                      ((struct pmu_voltage_rail) {
-+                                              .name = "lcm_3v",
-+                                              .flags = PMU_VRAIL_F_SUSPEND_ON,
-+                                              .voltage = {
-+                                                      .init = 3000,
-+                                                      .max = 3000,
-+                                              }
-+                                      });
-               break;
-       default:
-               break;
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 4002c03..37dfca6 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -750,9 +750,6 @@ static void pcf50633_work(struct work_struct *work)
-       mutex_lock(&pcf->working_lock);
-       pcf->working = 1;
--      dev_info(&pcf->client.dev, "pcf50633_work called with suspended = %d\n",
--                                 pcf->have_been_suspended);
--
-       /*
-        * If we are inside suspend -> resume completion time we don't attempt
-        * service until we have fully resumed.  Although we could talk to the
-@@ -763,11 +760,8 @@ static void pcf50633_work(struct work_struct *work)
-        * completed.
-        */
--      if (pcf->have_been_suspended && (pcf->have_been_suspended < 3)) {
--              dev_info(&pcf->client.dev, "rescheduling,  suspended = %d\n",
--                                         pcf->have_been_suspended);
-+      if (pcf->have_been_suspended && (pcf->have_been_suspended < 3))
-               goto reschedule;
--      }
-       /*
-        * datasheet says we have to read the five IRQ
-@@ -1157,9 +1151,13 @@ static void pcf50633_work(struct work_struct *work)
- reschedule:
-       /* don't spew, delaying whatever else is happening */
--      msleep(100);
--
--      dev_info(&pcf->client.dev, "rescheduling interrupt service\n");
-+      /* EXCEPTION: if we are in the middle of suspending, we don't have
-+       * time to hang around since we may be turned off core 1V3 already
-+       */
-+      if (pcf->have_been_suspended != 1) {
-+              msleep(50);
-+              dev_info(&pcf->client.dev, "rescheduling interrupt service\n");
-+      }
-       if (!schedule_work(&pcf->work))
-               dev_err(&pcf->client.dev, "int service reschedule failed\n");
-@@ -2333,7 +2331,7 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-                                           PCF50633_REG_AUTOOUT,
-                                           sizeof(pcf->standby_regs.misc),
-                                           &pcf->standby_regs.misc[0]);
--      if (ret != 18)
-+      if (ret != sizeof(pcf->standby_regs.misc))
-               dev_err(dev, "Failed to save misc levels and enables :-(\n");
-       /* regulator voltages and enable states */
-@@ -2341,7 +2339,7 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-                                           PCF50633_REG_LDO1OUT,
-                                           sizeof(pcf->standby_regs.ldo),
-                                           &pcf->standby_regs.ldo[0]);
--      if (ret != 14)
-+      if (ret != sizeof(pcf->standby_regs.ldo))
-               dev_err(dev, "Failed to save LDO levels and enables :-(\n");
-       /* switch off power supplies that are not needed during suspend */
-@@ -2349,8 +2347,6 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-               if ((pcf->pdata->rails[i].flags & PMU_VRAIL_F_SUSPEND_ON))
-                       continue;
--              dev_dbg(dev, "disabling regulator %u\n", i);
--
-               /* we can save ourselves the read part of a read-modify-write
-                * here because we captured all these already
-                */
-@@ -2359,6 +2355,11 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-               else
-                       tmp = pcf->standby_regs.ldo[(i - 4) * 2 + 1];
-+              dev_info(dev, "disabling reg %s by setting ENA %d to 0x%02X\n",
-+                            pcf->pdata->rails[i].name,
-+                            regulator_registers[i] + 1, tmp & 0xfe);
-+
-+              /* associated enable is always +1 from OUT reg */
-               __reg_write(pcf, regulator_registers[i] + 1, tmp & 0xfe);
-       }
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index 3edbfa8..d4b526d 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -848,6 +848,7 @@ static void glamo_power(struct glamo_core *glamo,
-                                ARRAY_SIZE(glamo_resume_script), 0);
-               break;
-+
-       case GLAMO_POWER_STANDBY:
-               /* enable memory self-refresh */
-               __reg_set_bit_mask(glamo, GLAMO_REG_MEM_DRAM1,
-@@ -859,6 +860,7 @@ static void glamo_power(struct glamo_core *glamo,
-               __reg_set_bit_mask(glamo, GLAMO_REG_PLL_GEN3, 0x2000, 0xffff);
-               __reg_set_bit_mask(glamo, GLAMO_REG_DFT_GEN5, 0x0001, 0xffff);
-               break;
-+
-       case GLAMO_POWER_SUSPEND:
-               __reg_set_bit_mask(glamo, GLAMO_REG_MEM_DRAM2,
-                                  GLAMO_MEM_DRAM2_DEEP_PWRDOWN, 0xffff);
-diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c
-index 6fa1fe7..b406298 100644
---- a/drivers/video/display/jbt6k74.c
-+++ b/drivers/video/display/jbt6k74.c
-@@ -634,6 +634,7 @@ static int jbt_suspend(struct spi_device *spi, pm_message_t state)
-       /* Save mode for resume */
-       jbt->last_state = jbt->state;
-+
-       jbt6k74_enter_state(jbt, JBT_STATE_DEEP_STANDBY);
-       jbt->have_resumed = 0;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1174-fix-allow-core-1v3-to-go-down.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1174-fix-allow-core-1v3-to-go-down.patch.patch
deleted file mode 100755 (executable)
index eef63fd..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4c4dfc7020f392880bc3ad0a67c79a58e6ac9614 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:14 +0100
-Subject: [PATCH] fix-allow-core-1v3-to-go-down.patch
-
-Whoops left it up in suspend
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 0bacafa..297b792 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -504,7 +504,6 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-                        * is an i2c device) we are running out of the 22uF cap
-                        * on core_1v3 rail !!!!
-                        */
--                      .flags          = PMU_VRAIL_F_SUSPEND_ON,
-                       .voltage        = {
-                               .init   = 1300,
-                               .max    = 1600,
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1175-debug-i2c-s3c2410-dump-stack-on-suspended-tranfer.pa.patch b/target/linux/s3c24xx/patches-2.6.26/1175-debug-i2c-s3c2410-dump-stack-on-suspended-tranfer.pa.patch
deleted file mode 100755 (executable)
index c0165a4..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0d8121a591c510073424c7ba3e096507de693b27 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:14 +0100
-Subject: [PATCH] debug-i2c-s3c2410-dump-stack-on-suspended-tranfer.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/busses/i2c-s3c2410.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
-index 58970fe..0cbfcb9 100644
---- a/drivers/i2c/busses/i2c-s3c2410.c
-+++ b/drivers/i2c/busses/i2c-s3c2410.c
-@@ -515,6 +515,7 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int
-               dev_err(i2c->dev,
-                   "Hey I am still asleep (suspended: %d), retry later\n",
-                   i2c->suspended);
-+              dump_stack();
-               ret = -EAGAIN;
-               goto out;
-       }
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1176-fix-pcf50633-suspend-state-as-enum.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1176-fix-pcf50633-suspend-state-as-enum.patch.patch
deleted file mode 100755 (executable)
index 243710a..0000000
+++ /dev/null
@@ -1,197 +0,0 @@
-From 591a5d7e8da059de812d315b865fd5c0fa89071e Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:15 +0100
-Subject: [PATCH] fix-pcf50633-suspend-state-as-enum.patch
-
-Use an enum to define pcf50633 suspend / resume state.
-Add PCF50633_SS_RESUMING_BUT_NOT_US_YET to be the state
-early in resume: add platform driver resume function just
-to set this state so we can differentiate between early
-resume and late suspend.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |   73 ++++++++++++++++++++++++++++++++++--------
- 1 files changed, 59 insertions(+), 14 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 37dfca6..87a3003 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -108,6 +108,16 @@ enum charger_type {
- #define MAX_ADC_FIFO_DEPTH 8
-+enum pcf50633_suspend_states {
-+      PCF50633_SS_RUNNING,
-+      PCF50633_SS_STARTING_SUSPEND,
-+      PCF50633_SS_COMPLETED_SUSPEND,
-+      PCF50633_SS_RESUMING_BUT_NOT_US_YET,
-+      PCF50633_SS_STARTING_RESUME,
-+      PCF50633_SS_COMPLETED_RESUME,
-+};
-+
-+
- struct pcf50633_data {
-       struct i2c_client client;
-       struct pcf50633_platform_data *pdata;
-@@ -122,9 +132,9 @@ struct pcf50633_data {
-       int allow_close;
-       int onkey_seconds;
-       int irq;
--      int have_been_suspended;
-+      enum pcf50633_suspend_states suspend_state;
-       int usb_removal_count;
--      unsigned char pcfirq_resume[5];
-+      u8 pcfirq_resume[5];
-       int probe_completed;
-       /* if he pulls battery while charging, we notice that and correctly
-@@ -191,7 +201,7 @@ static struct platform_device *pcf50633_pdev;
- static int __reg_write(struct pcf50633_data *pcf, u_int8_t reg, u_int8_t val)
- {
--      if (pcf->have_been_suspended == 1) {
-+      if (pcf->suspend_state == PCF50633_SS_COMPLETED_SUSPEND) {
-               dev_err(&pcf->client.dev, "__reg_write while suspended\n");
-               dump_stack();
-       }
-@@ -213,7 +223,7 @@ static int32_t __reg_read(struct pcf50633_data *pcf, u_int8_t reg)
- {
-       int32_t ret;
--      if (pcf->have_been_suspended == 1) {
-+      if (pcf->suspend_state == PCF50633_SS_COMPLETED_SUSPEND) {
-               dev_err(&pcf->client.dev, "__reg_read while suspended\n");
-               dump_stack();
-       }
-@@ -630,7 +640,8 @@ static void pcf50633_work_usbcurlim(struct work_struct *work)
-       /* we got a notification from USB stack before we completed resume...
-        * that can only make trouble, reschedule for a retry
-        */
--      if (pcf->have_been_suspended && (pcf->have_been_suspended < 3))
-+      if (pcf->suspend_state &&
-+                   (pcf->suspend_state < PCF50633_SS_COMPLETED_RESUME))
-               goto reschedule;
-       /*
-@@ -751,6 +762,21 @@ static void pcf50633_work(struct work_struct *work)
-       pcf->working = 1;
-       /*
-+       * if we are presently suspending, we are not in a position to deal
-+       * with pcf50633 interrupts at all.
-+       *
-+       * Because we didn't clear the int pending registers, there will be
-+       * no edge / interrupt waiting for us when we wake.  But it is OK
-+       * because at the end of our resume, we call this workqueue function
-+       * gratuitously, clearing the pending register and re-enabling
-+       * servicing this interrupt.
-+       */
-+
-+      if ((pcf->suspend_state == PCF50633_SS_STARTING_SUSPEND) ||
-+          (pcf->suspend_state == PCF50633_SS_COMPLETED_SUSPEND))
-+              goto bail;
-+
-+      /*
-        * If we are inside suspend -> resume completion time we don't attempt
-        * service until we have fully resumed.  Although we could talk to the
-        * device as soon as I2C is up, the regs in the device which we might
-@@ -1154,8 +1180,9 @@ reschedule:
-       /* EXCEPTION: if we are in the middle of suspending, we don't have
-        * time to hang around since we may be turned off core 1V3 already
-        */
--      if (pcf->have_been_suspended != 1) {
--              msleep(50);
-+      if ((pcf->suspend_state != PCF50633_SS_STARTING_SUSPEND) &&
-+          (pcf->suspend_state != PCF50633_SS_COMPLETED_SUSPEND)) {
-+              msleep(10);
-               dev_info(&pcf->client.dev, "rescheduling interrupt service\n");
-       }
-       if (!schedule_work(&pcf->work))
-@@ -2315,8 +2342,9 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       /* we suspend once (!) as late as possible in the suspend sequencing */
--      if ((state.event != PM_EVENT_SUSPEND) || (pcf->have_been_suspended))
--              return 0;
-+      if ((state.event != PM_EVENT_SUSPEND) ||
-+          (pcf->suspend_state != PCF50633_SS_RUNNING))
-+              return -EBUSY;
-       /* The general idea is to power down all unused power supplies,
-        * and then mask all PCF50633 interrupt sources but EXTONR, ONKEYF
-@@ -2380,7 +2408,7 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       if (ret)
-               dev_err(dev, "Failed to set wake masks :-( %d\n", ret);
--      pcf->have_been_suspended = 1;
-+      pcf->suspend_state = PCF50633_SS_COMPLETED_SUSPEND;
-       mutex_unlock(&pcf->lock);
-@@ -2393,7 +2421,8 @@ int pcf50633_ready(struct pcf50633_data *pcf)
-       if (!pcf)
-               return -EACCES;
--      if (pcf->have_been_suspended && (pcf->have_been_suspended < 3))
-+      if ((pcf->suspend_state != PCF50633_SS_RUNNING) &&
-+          (pcf->suspend_state < PCF50633_SS_COMPLETED_RESUME))
-               return -EBUSY;
-       return 0;
-@@ -2428,10 +2457,10 @@ static int pcf50633_resume(struct device *dev)
-       u8 res[5];
-       dev_info(dev, "pcf50633_resume suspended on entry = %d\n",
--                                                    pcf->have_been_suspended);
-+                                               (int)pcf->suspend_state);
-       mutex_lock(&pcf->lock);
--      pcf->have_been_suspended = 2; /* resuming */
-+      pcf->suspend_state = PCF50633_SS_STARTING_RESUME;
-       /* these guys get reset while pcf50633 is suspend state, refresh */
-@@ -2464,7 +2493,7 @@ static int pcf50633_resume(struct device *dev)
-       if (ret)
-               dev_err(dev, "Failed to set int masks :-( %d\n", ret);
--      pcf->have_been_suspended = 3; /* resume completed */
-+      pcf->suspend_state = PCF50633_SS_COMPLETED_RESUME;
-       mutex_unlock(&pcf->lock);
-@@ -2498,6 +2527,21 @@ static struct i2c_driver pcf50633_driver = {
-       .detach_client  = pcf50633_detach_client,
- };
-+/* we have this purely to capture an early indication that we are coming out
-+ * of suspend, before our device resume got called; async interrupt service is
-+ * interested in this
-+ */
-+
-+static int pcf50633_plat_resume(struct platform_device *pdev)
-+{
-+      /* i2c_get_clientdata(to_i2c_client(&pdev->dev)) returns NULL at this
-+       * early resume time so we have to use pcf50633_global
-+       */
-+      pcf50633_global->suspend_state = PCF50633_SS_RESUMING_BUT_NOT_US_YET;
-+
-+      return 0;
-+}
-+
- /* platform driver, since i2c devices don't have platform_data */
- static int __init pcf50633_plat_probe(struct platform_device *pdev)
- {
-@@ -2519,6 +2563,7 @@ static int pcf50633_plat_remove(struct platform_device *pdev)
- static struct platform_driver pcf50633_plat_driver = {
-       .probe  = pcf50633_plat_probe,
-       .remove = pcf50633_plat_remove,
-+      .resume_early = pcf50633_plat_resume,
-       .driver = {
-               .owner  = THIS_MODULE,
-               .name   = "pcf50633",
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1177-fix-pcf50633-disable-irq-from-suspend-until-resume.p.patch b/target/linux/s3c24xx/patches-2.6.26/1177-fix-pcf50633-disable-irq-from-suspend-until-resume.p.patch
deleted file mode 100755 (executable)
index daeb1bf..0000000
+++ /dev/null
@@ -1,234 +0,0 @@
-From e9c3ab43aecc2b4b0024bda7799987fd77a08fcb Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:15 +0100
-Subject: [PATCH] fix-pcf50633-disable-irq-from-suspend-until-resume.patch
-
-Disable pcf interrupt (not for wake, just as interrupt) in
-suspend, re-enable it again just before we force-call the
-workqueue function at end of pcf resume, which leads to
-pcf interrupt source registers getting cleared so it can
-signal an interrupt normally again.
-
-This change ends the uncontrolled appearance of pcf interrupts
-during resume time which previously caused the work to attempt
-to use the I2C stuff before i2c host device had itself resumed.
-Now the isr work is only queued, and the isr work function called,
-definitively after pcf resume completes.
-
-In suspend time, the work function may have been queued some
-time before and be pending, and it could still show up at a
-bad time.  Therefore if the work function sees that it is
-coming since the start of pcf50633 suspend function, it
-aborts without attempting to read the pcf interrupt regs,
-leaving them for resume to take care of.
-
-USB current limit and no battery work functions are also made
-aware of suspend state and act accordingly.
-
-Lastly I noticed that in early resume, i2c_get_clientdata(&pcf->client)
-returns NULL, presumably because i2c device is still suspended.  This
-could easily make trouble for async events like interrupt work,
-since pcf pointer is the client data.  Disabling appearance of the
-work until after pcf50633 resume will also avoid that.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |   89 +++++++++++++++++++++++++++++------------
- 1 files changed, 63 insertions(+), 26 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 87a3003..33c4ef4 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -632,6 +632,11 @@ static void pcf50633_work_usbcurlim(struct work_struct *work)
-       mutex_lock(&pcf->working_lock_usb_curlimit);
-+      /* just can't cope with it if we are suspending, don't reschedule */
-+      if ((pcf->suspend_state == PCF50633_SS_STARTING_SUSPEND) ||
-+          (pcf->suspend_state == PCF50633_SS_COMPLETED_SUSPEND))
-+              goto bail;
-+
-       dev_info(&pcf->client.dev, "pcf50633_work_usbcurlim\n");
-       if (!pcf->probe_completed)
-@@ -663,7 +668,8 @@ bail:
- reschedule:
-       dev_info(&pcf->client.dev, "pcf50633_work_usbcurlim rescheduling\n");
-       if (!schedule_work(&pcf->work_usb_curlimit))
--              dev_err(&pcf->client.dev, "work item may be lost\n");
-+              dev_err(&pcf->client.dev, "curlim reschedule work "
-+                                                          "already queued\n");
-       mutex_unlock(&pcf->working_lock_usb_curlimit);
-       /* don't spew, delaying whatever else is happening */
-@@ -700,7 +706,7 @@ int pcf50633_notify_usb_current_limit_change(struct pcf50633_data *pcf,
-       pcf->pending_curlimit = ma;
-       if (!schedule_work(&pcf->work_usb_curlimit))
--              dev_err(&pcf->client.dev, "work item may be lost\n");
-+              dev_err(&pcf->client.dev, "curlim work item already queued\n");
-       return 0;
- }
-@@ -727,6 +733,9 @@ static void pcf50633_work_nobat(struct work_struct *work)
-       while (1) {
-               msleep(1000);
-+              if (pcf->suspend_state != PCF50633_SS_RUNNING)
-+                      continue;
-+
-               /* there's a battery in there now? */
-               if (reg_read(pcf, PCF50633_REG_MBCS3) & 0x40) {
-@@ -761,6 +770,10 @@ static void pcf50633_work(struct work_struct *work)
-       mutex_lock(&pcf->working_lock);
-       pcf->working = 1;
-+      /* sanity */
-+      if (!&pcf->client.dev)
-+              goto bail;
-+
-       /*
-        * if we are presently suspending, we are not in a position to deal
-        * with pcf50633 interrupts at all.
-@@ -784,42 +797,55 @@ static void pcf50633_work(struct work_struct *work)
-        * reloaded with their pre-suspend states yet.  Therefore we will
-        * defer our service if we are called like that until our resume has
-        * completed.
-+       *
-+       * This shouldn't happen any more because we disable servicing this
-+       * interrupt in suspend and don't re-enable it until resume is
-+       * completed.
-        */
--      if (pcf->have_been_suspended && (pcf->have_been_suspended < 3))
-+      if (pcf->suspend_state &&
-+              (pcf->suspend_state != PCF50633_SS_COMPLETED_RESUME))
-+              goto reschedule;
-+
-+      /* this is the case early in resume! Sanity check! */
-+      if (i2c_get_clientdata(&pcf->client) == NULL)
-               goto reschedule;
-       /*
--       * datasheet says we have to read the five IRQ
--       * status regs in one transaction
--       */
--      ret = i2c_smbus_read_i2c_block_data(&pcf->client, PCF50633_REG_INT1, 5,
--                                          pcfirq);
--      if (ret != 5) {
-+      * datasheet says we have to read the five IRQ
-+      * status regs in one transaction
-+      */
-+      ret = i2c_smbus_read_i2c_block_data(&pcf->client,
-+                                              PCF50633_REG_INT1,
-+                                              sizeof(pcfirq),
-+                                              pcfirq);
-+      if (ret != sizeof(pcfirq)) {
-               dev_info(&pcf->client.dev,
-                        "Oh crap PMU IRQ register read failed -- "
-                        "retrying later %d\n", ret);
-               /*
--               * it shouldn't fail, we no longer attempt to use I2C while
--               * it can be suspended.  But we don't have much option but to
--               * retry if if it ever did fail, because if we don't service
--               * the interrupt to clear it, we will never see another PMU
--               * interrupt edge.
-+               * it shouldn't fail, we no longer attempt to use
-+               * I2C while it can be suspended.  But we don't have
-+               * much option but to retry if if it ever did fail,
-+               * because if we don't service the interrupt to clear
-+               * it, we will never see another PMU interrupt edge.
-                */
-               goto reschedule;
-       }
--      /* hey did we just resume? */
--
--      if (pcf->have_been_suspended) {
--              /* resume is officially over now then */
--              pcf->have_been_suspended = 0;
-+      /* hey did we just resume? (because we don't get here unless we are
-+       * running normally or the first call after resumption)
-+       */
-+      if (pcf->suspend_state != PCF50633_SS_RUNNING) {
-               /*
--               * grab a copy of resume interrupt reasons
--               * from pcf50633 POV
--               */
-+              * grab a copy of resume interrupt reasons
-+              * from pcf50633 POV
-+              */
-               memcpy(pcf->pcfirq_resume, pcfirq, sizeof(pcf->pcfirq_resume));
-+
-+              /* pcf50633 resume is really really over now then */
-+              pcf->suspend_state = PCF50633_SS_RUNNING;
-       }
-       if (!pcf->coldplug_done) {
-@@ -1168,6 +1194,7 @@ static void pcf50633_work(struct work_struct *work)
-       DEBUGPC("\n");
-+bail:
-       pcf->working = 0;
-       input_sync(pcf->input_dev);
-       put_device(&pcf->client.dev);
-@@ -1201,7 +1228,7 @@ static irqreturn_t pcf50633_irq(int irq, void *_pcf)
-       get_device(&pcf->client.dev);
-       if (!schedule_work(&pcf->work) && !pcf->working)
--              dev_err(&pcf->client.dev, "work item may be lost\n");
-+              dev_err(&pcf->client.dev, "pcf irq work already queued\n");
-       return IRQ_HANDLED;
- }
-@@ -2303,7 +2330,7 @@ int pcf50633_report_resumers(struct pcf50633_data *pcf, char *buf)
-       char *end = buf;
-       int n;
--      for (n = 0; n < 40; n++)
-+      for (n = 0; n < ARRAY_SIZE(int_names); n++)
-               if (int_names[n]) {
-                       if (pcf->pcfirq_resume[n >> 3] & (1 >> (n & 7)))
-                               end += sprintf(end, "  * %s\n", int_names[n]);
-@@ -2352,6 +2379,15 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-       mutex_lock(&pcf->lock);
-+      pcf->suspend_state = PCF50633_SS_STARTING_SUSPEND;
-+
-+      /* we are not going to service any further interrupts until we
-+       * resume.  If the IRQ workqueue is still pending in the background,
-+       * it will bail when it sees we set suspend state above
-+       */
-+
-+      disable_irq(pcf->irq);
-+
-       /* Save all registers that don't "survive" standby state */
-       pcf->standby_regs.ooctim2 = __reg_read(pcf, PCF50633_REG_OOCTIM2);
-@@ -2495,6 +2531,8 @@ static int pcf50633_resume(struct device *dev)
-       pcf->suspend_state = PCF50633_SS_COMPLETED_RESUME;
-+      enable_irq(pcf->irq);
-+
-       mutex_unlock(&pcf->lock);
-       /* gratuitous call to PCF work function, in the case that the PCF
-@@ -2504,8 +2542,7 @@ static int pcf50633_resume(struct device *dev)
-        */
-       get_device(&pcf->client.dev);
--      if (!schedule_work(&pcf->work) && !pcf->working)
--              dev_err(&pcf->client.dev, "resume work item may be lost\n");
-+      pcf50633_work(&pcf->work);
-       callback_all_resume_dependencies(&pcf->resume_dependency);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1178-debug-backtrace-not-choke-on-null-dev_blah.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1178-debug-backtrace-not-choke-on-null-dev_blah.patch.patch
deleted file mode 100755 (executable)
index 2645d5e..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From b0c1e8a5a319e506d173588258c134aec7421513 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:15 +0100
-Subject: [PATCH] debug-backtrace-not-choke-on-null-dev_blah.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/base/core.c |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/base/core.c b/drivers/base/core.c
-index ee0a51a..a1251c7 100644
---- a/drivers/base/core.c
-+++ b/drivers/base/core.c
-@@ -51,6 +51,11 @@ static inline int device_is_not_partition(struct device *dev)
-  */
- const char *dev_driver_string(struct device *dev)
- {
-+      if (!dev) {
-+              printk(KERN_ERR"Null dev to dev_driver_string\n");
-+              dump_stack();
-+              return "*NULL*";
-+      }
-       return dev->driver ? dev->driver->name :
-                       (dev->bus ? dev->bus->name :
-                       (dev->class ? dev->class->name : ""));
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1179-fix-pcf50633-really-defer-backlight-on-resume.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1179-fix-pcf50633-really-defer-backlight-on-resume.patch.patch
deleted file mode 100755 (executable)
index 6c17c69..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-From 568981c881e20fccdbfffb073c3868dcdc012446 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:15 +0100
-Subject: [PATCH] fix-pcf50633-really-defer-backlight-on-resume.patch
-
-Backlight wasn't off by default on resume, so it was never really
-deferred (until LCM is initialized).  This fixes that and so removes
-the brief white screen between pcf50633 resume and LCM init.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |   23 +++++++++++++++++------
- 1 files changed, 17 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 33c4ef4..bbc8ae6 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -2474,13 +2474,14 @@ EXPORT_SYMBOL_GPL(pcf50633_ready);
- void pcf50633_backlight_resume(struct pcf50633_data *pcf)
- {
-+      dev_info(&pcf->client.dev, "pcf50633_backlight_resume\n");
-+
-       /* we force the backlight on in fact */
--      __reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.misc[
-+      reg_write(pcf, PCF50633_REG_LEDDIM, 1);
-+      reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.misc[
-                                  PCF50633_REG_LEDOUT - PCF50633_REG_AUTOOUT]);
--      __reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.misc[
-+      reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.misc[
-                              PCF50633_REG_LEDENA - PCF50633_REG_AUTOOUT] | 1);
--      __reg_write(pcf, PCF50633_REG_LEDDIM, pcf->standby_regs.misc[
--                                 PCF50633_REG_LEDDIM - PCF50633_REG_AUTOOUT]);
- }
- EXPORT_SYMBOL_GPL(pcf50633_backlight_resume);
-@@ -2491,6 +2492,7 @@ static int pcf50633_resume(struct device *dev)
-       struct pcf50633_data *pcf = i2c_get_clientdata(client);
-       int ret;
-       u8 res[5];
-+      u8 misc[PCF50633_REG_LEDDIM - PCF50633_REG_AUTOOUT + 1];
-       dev_info(dev, "pcf50633_resume suspended on entry = %d\n",
-                                                (int)pcf->suspend_state);
-@@ -2502,11 +2504,20 @@ static int pcf50633_resume(struct device *dev)
-       __reg_write(pcf, PCF50633_REG_OOCTIM2, pcf->standby_regs.ooctim2);
-+      memcpy(misc, pcf->standby_regs.misc, sizeof(pcf->standby_regs.misc));
-+
-+      if (pcf->pdata->defer_resume_backlight) {
-+              misc[PCF50633_REG_LEDOUT - PCF50633_REG_AUTOOUT] = 1;
-+              misc[PCF50633_REG_LEDENA - PCF50633_REG_AUTOOUT] = 0x20;
-+              misc[PCF50633_REG_LEDCTL - PCF50633_REG_AUTOOUT] = 1;
-+              misc[PCF50633_REG_LEDDIM - PCF50633_REG_AUTOOUT] = 1;
-+      }
-+
-       /* regulator voltages and enable states */
-       ret = i2c_smbus_write_i2c_block_data(&pcf->client,
-                                            PCF50633_REG_AUTOOUT,
--                                           sizeof(pcf->standby_regs.misc) - 4,
--                                           &pcf->standby_regs.misc[0]);
-+                                           sizeof(misc),
-+                                           &misc[0]);
-       if (ret)
-               dev_err(dev, "Failed to restore misc :-( %d\n", ret);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1180-fix-glamo-suspend-resume-dram-and-engines.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1180-fix-glamo-suspend-resume-dram-and-engines.patch.patch
deleted file mode 100755 (executable)
index 7759c06..0000000
+++ /dev/null
@@ -1,431 +0,0 @@
-From 9ada9a3247ca02a0dddeae24a07a2744690aeb51 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:15 +0100
-Subject: [PATCH] fix-glamo-suspend-resume-dram-and-engines.patch
-
-Two issues... we never took care to take down engines in suspend
-and bring them back in resume.  This was part of the display
-corruption that could be seen briefly on resume.  The other issue
-that made the "noise" corruption was bad ordering of resume steps.
-
-This patch simplifies (removing needless re-init) resume actions
-and makes explicit the suspend and resume steps.  It also adds
-code to track which engines are up and push them down in suspend
-and bring them back in resume.
-
-The result is no more corruption of display buffer in suspend, it
-comes back completely clean.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-core.c |  269 +++++++++++++++++++---------------------
- drivers/mfd/glamo/glamo-core.h |    2 +
- drivers/mfd/glamo/glamo-regs.h |    6 +-
- 3 files changed, 137 insertions(+), 140 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index d4b526d..ee33901 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -54,6 +54,8 @@
- #define RESSIZE(ressource) (((ressource)->end - (ressource)->start)+1)
-+#define GLAMO_MEM_REFRESH_COUNT 0x100
-+
- static struct glamo_core *glamo_handle;
- static inline void __reg_write(struct glamo_core *glamo,
-@@ -381,9 +383,8 @@ out_unlock:
-  * 'engine' support
-  ***********************************************************************/
--int glamo_engine_enable(struct glamo_core *glamo, enum glamo_engine engine)
-+int __glamo_engine_enable(struct glamo_core *glamo, enum glamo_engine engine)
- {
--      spin_lock(&glamo->lock);
-       switch (engine) {
-       case GLAMO_ENGINE_LCD:
-               __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_LCD,
-@@ -432,27 +433,59 @@ int glamo_engine_enable(struct glamo_core *glamo, enum glamo_engine engine)
-       default:
-               break;
-       }
--      spin_unlock(&glamo->lock);
-+
-+      glamo->engine_enabled_bitfield |= 1 << engine;
-       return 0;
- }
--EXPORT_SYMBOL_GPL(glamo_engine_enable);
--int glamo_engine_disable(struct glamo_core *glamo, enum glamo_engine engine)
-+int glamo_engine_enable(struct glamo_core *glamo, enum glamo_engine engine)
- {
-+      int ret;
-+
-       spin_lock(&glamo->lock);
-+
-+      ret = __glamo_engine_enable(glamo, engine);
-+
-+      spin_unlock(&glamo->lock);
-+
-+      return ret;
-+}
-+EXPORT_SYMBOL_GPL(glamo_engine_enable);
-+
-+int __glamo_engine_disable(struct glamo_core *glamo, enum glamo_engine engine)
-+{
-       switch (engine) {
-+      case GLAMO_ENGINE_LCD:
-+              /* remove pixel clock to LCM */
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_LCD,
-+                          GLAMO_CLOCK_LCD_EN_DCLK, 0);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_LCD,
-+                          GLAMO_CLOCK_LCD_EN_DHCLK |
-+                          GLAMO_CLOCK_LCD_EN_DMCLK, 0);
-+              /* kill memory clock */
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_LCD,
-+                          GLAMO_CLOCK_LCD_EN_M5CLK, 0);
-+              /* stop dividing the clocks */
-+              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_GEN5_1,
-+                          GLAMO_CLOCK_GEN51_EN_DIV_DHCLK |
-+                          GLAMO_CLOCK_GEN51_EN_DIV_DMCLK |
-+                          GLAMO_CLOCK_GEN51_EN_DIV_DCLK, 0);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_HOSTBUS(2),
-+                          GLAMO_HOSTBUS2_MMIO_EN_LCD, 0);
-+              break;
-+
-       case GLAMO_ENGINE_MMC:
-               __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_MMC, 0,
-                                                  GLAMO_CLOCK_MMC_EN_M9CLK |
-                                                  GLAMO_CLOCK_MMC_EN_TCLK |
-                                                  GLAMO_CLOCK_MMC_DG_M9CLK |
-                                                  GLAMO_CLOCK_MMC_DG_TCLK);
--              __reg_set_bit_mask(glamo, GLAMO_REG_HOSTBUS(2), 0,
--                                                 GLAMO_HOSTBUS2_MMIO_EN_MMC);
-               /* disable the TCLK divider clk input */
-               __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_GEN5_1, 0,
-                                               GLAMO_CLOCK_GEN51_EN_DIV_TCLK);
-+              __reg_set_bit_mask(glamo, GLAMO_REG_HOSTBUS(2), 0,
-+                                                 GLAMO_HOSTBUS2_MMIO_EN_MMC);
-               /* good idea to hold the thing in reset when we power it off? */
- /*            writew(readw(glamo->base + GLAMO_REG_CLOCK_MMC) |
-                     GLAMO_CLOCK_MMC_RESET, glamo->base + GLAMO_REG_CLOCK_MMC);
-@@ -461,10 +494,23 @@ int glamo_engine_disable(struct glamo_core *glamo, enum glamo_engine engine)
-       default:
-               break;
-       }
--      spin_unlock(&glamo->lock);
-+
-+      glamo->engine_enabled_bitfield &= ~(1 << engine);
-       return 0;
- }
-+int glamo_engine_disable(struct glamo_core *glamo, enum glamo_engine engine)
-+{
-+      int ret;
-+
-+      spin_lock(&glamo->lock);
-+
-+      ret = __glamo_engine_disable(glamo, engine);
-+
-+      spin_unlock(&glamo->lock);
-+
-+      return ret;
-+}
- EXPORT_SYMBOL_GPL(glamo_engine_disable);
- struct glamo_script reset_regs[] = {
-@@ -618,7 +664,7 @@ int glamo_run_script(struct glamo_core *glamo, struct glamo_script *script,
-                       if (may_sleep)
-                               msleep(line->val);
-                       else
--                              mdelay(line->val);
-+                              mdelay(line->val * 4);
-                       break;
-               case 0xfffd:
-                       /* spin until PLLs lock */
-@@ -717,111 +763,17 @@ static struct glamo_script glamo_init_script[] = {
-       { GLAMO_REG_CLOCK_MEMORY,       0x000b },
- };
--static struct glamo_script glamo_resume_script[] = {
--      { GLAMO_REG_IRQ_ENABLE,         0x01ff },
--      { GLAMO_REG_CLOCK_GEN6,         0x2000 },
--      { GLAMO_REG_CLOCK_GEN7,         0x0001 }, /* 0101 */
--      { GLAMO_REG_CLOCK_GEN8,         0x0100 },
--      { GLAMO_REG_CLOCK_HOST,         0x000d },
--      { 0x200,        0x0ef0 },
--      { 0x202,        0x07ff },
--      { 0x212,        0x0000 },
--      { 0x214,        0x4000 },
--      { 0x216,        0xf00e },
--      { GLAMO_REG_MEM_TYPE,           0x0874 }, /* 8MB, 16 word pg wr+rd */
--      { GLAMO_REG_MEM_GEN,            0xafaf }, /* 63 grants min + max */
--
--      { GLAMO_REG_MEM_TIMING1,        0x0108 },
--      { GLAMO_REG_MEM_TIMING2,        0x0010 }, /* Taa = 3 MCLK */
--      { GLAMO_REG_MEM_TIMING3,        0x0000 },
--      { GLAMO_REG_MEM_TIMING4,        0x0000 }, /* CE1# delay fall/rise */
--      { GLAMO_REG_MEM_TIMING5,        0x0000 }, /* UB# LB# */
--      { GLAMO_REG_MEM_TIMING6,        0x0000 }, /* OE# */
--      { GLAMO_REG_MEM_TIMING7,        0x0000 }, /* WE# */
--      { GLAMO_REG_MEM_TIMING8,        0x1002 }, /* MCLK delay, was 0x1000 */
--      { GLAMO_REG_MEM_TIMING9,        0x6006 },
--      { GLAMO_REG_MEM_TIMING10,       0x00ff },
--      { GLAMO_REG_MEM_TIMING11,       0x0001 },
--      { GLAMO_REG_MEM_POWER1,         0x0020 },
--      { GLAMO_REG_MEM_POWER2,         0x0000 },
--      { GLAMO_REG_MEM_DRAM1,          0x0000 },
--              { 0xfffe, 1 },
--      { GLAMO_REG_MEM_DRAM1,          0xc100 },
--              { 0xfffe, 1 },
--      { GLAMO_REG_MEM_DRAM1,          0xe100 },
--      { GLAMO_REG_MEM_DRAM2,          0x01d6 },
--      { GLAMO_REG_CLOCK_MEMORY,       0x000b },
--};
--
--#if 0 /* MM370 */
--static const struct glamo_script regs_vram_2mb = {
--      { GLAMO_REG_CLOCK_MEMORY,       0x3aaa },
--              { 0xfffe, 50 },
--      { GLAMO_REG_CLOCK_MEMORY,       0x0aaa },
--              { 0xfffe, 3 },
--      { GLAMO_REG_MEM_POWER1,         0x0020 },
--      { 0x033a,                       0x0000 },
--      { 0x033c,                       0x0000 },
--      { 0x033e,                       0x0000 },
--      { 0x0340,                       0x0000 },
--      { 0x0342,                       0x0000 },
--      { 0x0344,                       0x0000 },
--      { 0x0346,                       0x0240 },
--      { GLAMO_REG_MEM_TIMING8,        0x1016 },
--      { GLAMO_REG_MEM_TIMING9,        0x6067 },
--      { GLAMO_REG_MEM_TIMING10,       0x00ff },
--      { GLAMO_REG_MEM_TIMING11,       0x0030 },
--      { GLAMO_REG_MEM_GEN,            0x3fff },
--      { GLAMO_REG_MEM_GEN,            0xafaf },
--      { GLAMO_REG_MEM_TIMING1,        0x0108 },
--      { GLAMO_REG_MEM_TIMING2,        0x0010 },
--      { GLAMO_REG_MEM_DRAM1,          0x0a00 },
--              { 0xfffe, 3 },
--      { GLAMO_REG_MEM_DRAM1,          0xe200 },
--              { 0xfffe, 1 },
--};
--
--static const struct glamo_script regs_vram_8mb = {
--      { GLAMO_REG_CLOCK_MEMORY,       0x3aaa },
--              { 0xfffe, 50 },
--      { GLAMO_REG_CLOCK_MEMORY,       0x0aaa },
--              { 0xfffe, 3 },
--      { GLAMO_REG_MEM_POWER1,         0x0020 },
--      { 0x033a,                       0x45cf },
--      { 0x033c,                       0x4240 },
--      { 0x033e,                       0x53e0 },
--      { 0x0340,                       0x1401 },
--      { 0x0342,                       0x0c44 },
--      { 0x0344,                       0x1d0b },
--      { 0x0346,                       0x25ac },
--      { 0x0348,                       0x1953 },
--              { 0xfffe, 1 },
--      { GLAMO_REG_MEM_TYPE,           0x087a },
--      { GLAMO_REG_MEM_DRAM2,          0x01d6 },
--      { GLAMO_REG_MEM_TIMING8,        0x1060 },
--      { GLAMO_REG_MEM_TIMING9,        0x6067 },
--      { GLAMO_REG_MEM_TIMING10,       0x00ff },
--      { GLAMO_REG_MEM_TIMING11,       0x0030 },
--      { GLAMO_REG_MEM_GEN,            0x3fff },
--      { GLAMO_REG_MEM_GEN,            0xafaf },
--      { GLAMO_REG_MEM_TIMING1,        0x3108 },
--      { GLAMO_REG_MEM_TIMING2,        0x0010 },
--      { GLAMO_REG_MEM_DRAM1,          0x0a00 },
--              { 0xfffe, 3 },
--      { GLAMO_REG_MEM_DRAM1,          0xe200 },
--              { 0xfffe, 1 },
--};
--#endif
- enum glamo_power {
-       GLAMO_POWER_ON,
--      GLAMO_POWER_STANDBY,
-       GLAMO_POWER_SUSPEND,
- };
- static void glamo_power(struct glamo_core *glamo,
-                       enum glamo_power new_state)
- {
-+      int n;
-+
-       spin_lock(&glamo->lock);
-       dev_dbg(&glamo->pdev->dev, "***** glamo_power -> %d\n", new_state);
-@@ -836,37 +788,76 @@ static void glamo_power(struct glamo_core *glamo,
-               while ((__reg_read(glamo, GLAMO_REG_PLL_GEN5) & 3) != 3)
-                       ;
--              /* enable memory clock and get it out of deep pwrdown */
--              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_MEMORY,
--                                 GLAMO_CLOCK_MEM_EN_MOCACLK, 0xffff);
--              __reg_set_bit_mask(glamo, GLAMO_REG_MEM_DRAM2,
--                                 GLAMO_MEM_DRAM2_DEEP_PWRDOWN, 0x0000);
--              __reg_set_bit_mask(glamo, GLAMO_REG_MEM_DRAM1,
--                                 GLAMO_MEM_DRAM1_SELF_REFRESH, 0x0000);
--
--              glamo_run_script(glamo, glamo_resume_script,
--                               ARRAY_SIZE(glamo_resume_script), 0);
--
--              break;
--
--      case GLAMO_POWER_STANDBY:
--              /* enable memory self-refresh */
--              __reg_set_bit_mask(glamo, GLAMO_REG_MEM_DRAM1,
--                                 GLAMO_MEM_DRAM1_SELF_REFRESH, 0xffff);
--              /* stop memory clock */
--              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_MEMORY,
--                                 GLAMO_CLOCK_MEM_EN_MOCACLK, 0x0000);
--              /* power down PLL2 and then PLL1 */
--              __reg_set_bit_mask(glamo, GLAMO_REG_PLL_GEN3, 0x2000, 0xffff);
--              __reg_set_bit_mask(glamo, GLAMO_REG_DFT_GEN5, 0x0001, 0xffff);
-+              /* Get memory out of deep powerdown */
-+
-+              __reg_write(glamo, GLAMO_REG_MEM_DRAM2,
-+                                      (7 << 6) | /* tRC */
-+                                      (1 << 4) | /* tRP */
-+                                      (1 << 2) | /* tRCD */
-+                                      2); /* CAS latency */
-+
-+              /* Stop self-refresh */
-+
-+              __reg_write(glamo, GLAMO_REG_MEM_DRAM1,
-+                                      GLAMO_MEM_DRAM1_EN_DRAM_REFRESH |
-+                                      GLAMO_MEM_DRAM1_EN_GATE_CKE |
-+                                      GLAMO_MEM_REFRESH_COUNT);
-+              __reg_write(glamo, GLAMO_REG_MEM_DRAM1,
-+                                      GLAMO_MEM_DRAM1_EN_MODEREG_SET |
-+                                      GLAMO_MEM_DRAM1_EN_DRAM_REFRESH |
-+                                      GLAMO_MEM_DRAM1_EN_GATE_CKE |
-+                                      GLAMO_MEM_REFRESH_COUNT);
-+
-+              /* re-enable clocks to memory */
-+
-+              __reg_write(glamo, GLAMO_REG_CLOCK_MEMORY,
-+                                      GLAMO_CLOCK_MEM_EN_MOCACLK |
-+                                      GLAMO_CLOCK_MEM_EN_M1CLK |
-+                                      GLAMO_CLOCK_MEM_DG_M1CLK);
-+
-+              /* restore each engine that was up before suspend */
-+              for (n = 0; n < __NUM_GLAMO_ENGINES; n++)
-+                      if (glamo->engine_enabled_bitfield_suspend & (1 << n))
-+                              __glamo_engine_enable(glamo, n);
-               break;
-       case GLAMO_POWER_SUSPEND:
--              __reg_set_bit_mask(glamo, GLAMO_REG_MEM_DRAM2,
--                                 GLAMO_MEM_DRAM2_DEEP_PWRDOWN, 0xffff);
--              /* stop memory clock */
--              __reg_set_bit_mask(glamo, GLAMO_REG_CLOCK_MEMORY,
--                                 GLAMO_CLOCK_MEM_EN_MOCACLK, 0x0000);
-+              /* stash a copy of which engines were running */
-+              glamo->engine_enabled_bitfield_suspend =
-+                                               glamo->engine_enabled_bitfield;
-+
-+              /* take down each engine before we kill mem and pll */
-+              for (n = 0; n < __NUM_GLAMO_ENGINES; n++)
-+                      if (glamo->engine_enabled_bitfield & (1 << n))
-+                              __glamo_engine_disable(glamo, n);
-+
-+              /* enable self-refresh */
-+
-+              __reg_write(glamo, GLAMO_REG_MEM_DRAM1,
-+                                      GLAMO_MEM_DRAM1_EN_DRAM_REFRESH |
-+                                      GLAMO_MEM_DRAM1_EN_GATE_CKE |
-+                                      GLAMO_MEM_DRAM1_SELF_REFRESH |
-+                                      GLAMO_MEM_REFRESH_COUNT);
-+              __reg_write(glamo, GLAMO_REG_MEM_DRAM1,
-+                                      GLAMO_MEM_DRAM1_EN_MODEREG_SET |
-+                                      GLAMO_MEM_DRAM1_EN_DRAM_REFRESH |
-+                                      GLAMO_MEM_DRAM1_EN_GATE_CKE |
-+                                      GLAMO_MEM_DRAM1_SELF_REFRESH |
-+                                      GLAMO_MEM_REFRESH_COUNT);
-+
-+              /* force RAM into deep powerdown */
-+
-+              __reg_write(glamo, GLAMO_REG_MEM_DRAM2,
-+                                      GLAMO_MEM_DRAM2_DEEP_PWRDOWN |
-+                                      (7 << 6) | /* tRC */
-+                                      (1 << 4) | /* tRP */
-+                                      (1 << 2) | /* tRCD */
-+                                      2); /* CAS latency */
-+
-+              /* kill clocks to memory */
-+
-+              __reg_write(glamo, GLAMO_REG_CLOCK_MEMORY, 0);
-+
-               /* power down PLL2 and then PLL1 */
-               __reg_set_bit_mask(glamo, GLAMO_REG_PLL_GEN3, 0x2000, 0xffff);
-               __reg_set_bit_mask(glamo, GLAMO_REG_DFT_GEN5, 0x0001, 0xffff);
-@@ -1016,15 +1007,15 @@ static ssize_t regs_read(struct device *dev, struct device_attribute *attr,
-               char * name;
-       };
-       struct reg_range reg_range[] = {
--/*            { 0x0000, 0x200, "General" },
--              { 0x0200, 0x100, "Host Bus" },
--              { 0x0300, 0x100, "Memory" },
--              { 0x0400, 0x100, "Sensor" },
-+              { 0x0000, 0x76, "General" },
-+/*            { 0x0200, 0x100, "Host Bus" },
-+*/            { 0x0300, 0x38, "Memory" },
-+/*            { 0x0400, 0x100, "Sensor" },
-               { 0x0500, 0x300, "ISP" },
-               { 0x0800, 0x400, "JPEG" },
-               { 0x0c00, 0x500, "MPEG" },
- */
--              { 0x1100, 0x400, "LCD" },
-+              { 0x1100, 0x88, "LCD" },
- /*
-               { 0x1500, 0x080, "MPU 0" },
-               { 0x1580, 0x080, "MPU 1" },
-@@ -1039,7 +1030,7 @@ static ssize_t regs_read(struct device *dev, struct device_attribute *attr,
-       for (r = 0; r < ARRAY_SIZE(reg_range); r++) {
-               n1 = 0;
--              end += sprintf(end, "\n%s\n\n", reg_range[r].name);
-+              end += sprintf(end, "\n%s\n", reg_range[r].name);
-               for (n = reg_range[r].start;
-                    n < reg_range[r].start + reg_range[r].count; n += 2) {
-                       if (((n1++) & 7) == 0)
-diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h
-index b1531b3..c89f810 100644
---- a/drivers/mfd/glamo/glamo-core.h
-+++ b/drivers/mfd/glamo/glamo-core.h
-@@ -30,6 +30,8 @@ struct glamo_core {
-       u_int16_t revision;
-       spinlock_t lock;
-       struct resume_dependency resume_dependency;
-+      u32 engine_enabled_bitfield;
-+      u32 engine_enabled_bitfield_suspend;
- };
- struct glamo_script {
-diff --git a/drivers/mfd/glamo/glamo-regs.h b/drivers/mfd/glamo/glamo-regs.h
-index 32411e3..2328b8a 100644
---- a/drivers/mfd/glamo/glamo-regs.h
-+++ b/drivers/mfd/glamo/glamo-regs.h
-@@ -142,8 +142,12 @@ enum glamo_register_mem {
- #define GLAMO_MEM_TYPE_MASK   0x03
- enum glamo_reg_mem_dram1 {
--      GLAMO_MEM_DRAM1_EN_SDRAM_CLK    = (1 << 11),
-+      /* b0 - b10 == refresh period, 1 -> 2048 clocks */
-+      GLAMO_MEM_DRAM1_EN_GATE_CLK     = (1 << 11),
-       GLAMO_MEM_DRAM1_SELF_REFRESH    = (1 << 12),
-+      GLAMO_MEM_DRAM1_EN_GATE_CKE     = (1 << 13),
-+      GLAMO_MEM_DRAM1_EN_DRAM_REFRESH = (1 << 14),
-+      GLAMO_MEM_DRAM1_EN_MODEREG_SET  = (1 << 15),
- };
- enum glamo_reg_mem_dram2 {
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1181-fix-pcf50633-platform-backlight-resume-ramp-setting.patch b/target/linux/s3c24xx/patches-2.6.26/1181-fix-pcf50633-platform-backlight-resume-ramp-setting.patch
deleted file mode 100755 (executable)
index 6ab4f9f..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-From 63d42755b5ac2fca5d31b5a470470ac68a87b8a8 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:15 +0100
-Subject: [PATCH] fix-pcf50633-platform-backlight-resume-ramp-setting.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |    1 +
- drivers/i2c/chips/pcf50633.c       |    6 ++++--
- include/linux/pcf50633.h           |    1 +
- 3 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 297b792..309e484 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -577,6 +577,7 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-               },
-       },
-       .defer_resume_backlight = 1,
-+      .resume_backlight_ramp_speed = 5
- };
- #if 0 /* currently unused */
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index bbc8ae6..6745993 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -2476,10 +2476,12 @@ void pcf50633_backlight_resume(struct pcf50633_data *pcf)
- {
-       dev_info(&pcf->client.dev, "pcf50633_backlight_resume\n");
--      /* we force the backlight on in fact */
--      reg_write(pcf, PCF50633_REG_LEDDIM, 1);
-+      /* platform defines resume ramp speed */
-+      reg_write(pcf, PCF50633_REG_LEDDIM,
-+                                     pcf->pdata->resume_backlight_ramp_speed);
-       reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.misc[
-                                  PCF50633_REG_LEDOUT - PCF50633_REG_AUTOOUT]);
-+      /* we force the backlight on in fact */
-       reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.misc[
-                              PCF50633_REG_LEDENA - PCF50633_REG_AUTOOUT] | 1);
- }
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index fa1c7e8..b94b72a 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -173,6 +173,7 @@ struct pcf50633_platform_data {
-       /* post-resume backlight bringup */
-       int defer_resume_backlight;
-+      u8 resume_backlight_ramp_speed;
- };
- #endif /* _PCF50633_H */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1182-fix-pcf50633-migrate-gta02-peripherals-out.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1182-fix-pcf50633-migrate-gta02-peripherals-out.patch.patch
deleted file mode 100755 (executable)
index 0184f8f..0000000
+++ /dev/null
@@ -1,220 +0,0 @@
-From d74710dd508eb1b60b410048a151e1d541d749d2 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:15 +0100
-Subject: [PATCH] fix-pcf50633-migrate-gta02-peripherals-out.patch
-
-pcf50633.c shouldn't know GTAxx at all.  Move to using a
-platform callback to allow definition of platform devices
-with pcf50633 as parent device (good for enforcing suspend /
-resume ordering).  Remove all code references to GTAxx from
-the sources (one string left for compatability).
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   30 ++++++++++++++++++-
- drivers/i2c/chips/pcf50633.c       |   57 ++++++++++++++++++-----------------
- include/linux/pcf50633.h           |    9 +++++-
- 3 files changed, 66 insertions(+), 30 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 309e484..fd746fd 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -464,6 +464,29 @@ static int pmu_callback(struct device *dev, unsigned int feature,
-       return 0;
- }
-+static struct platform_device gta01_pm_gps_dev = {
-+      .name           = "neo1973-pm-gps",
-+};
-+
-+static struct platform_device gta01_pm_bt_dev = {
-+      .name           = "neo1973-pm-bt",
-+};
-+
-+/* this is called when pc50633 is probed, unfortunately quite late in the
-+ * day since it is an I2C bus device.  Here we can belatedly define some
-+ * platform devices with the advantage that we can mark the pcf50633 as the
-+ * parent.  This makes them get suspended and resumed with their parent
-+ * the pcf50633 still around.
-+ */
-+
-+static void gta02_pcf50633_attach_child_devices(struct device *parent_device)
-+{
-+      gta01_pm_gps_dev.dev.parent = parent_device;
-+      gta01_pm_bt_dev.dev.parent = parent_device;
-+      platform_device_register(&gta01_pm_bt_dev);
-+      platform_device_register(&gta01_pm_gps_dev);
-+}
-+
- static struct pcf50633_platform_data gta02_pcf_pdata = {
-       .used_features  = PCF50633_FEAT_MBC |
-                         PCF50633_FEAT_BBC |
-@@ -478,6 +501,7 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-       .r_fix_batt     = 10000,
-       .r_fix_batt_par = 10000,
-       .r_sense_milli  = 220,
-+      .flag_use_apm_emulation = 0,
-       .resumers = {
-               [0] = PCF50633_INT1_USBINS |
-                     PCF50633_INT1_USBREM |
-@@ -577,7 +601,9 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-               },
-       },
-       .defer_resume_backlight = 1,
--      .resume_backlight_ramp_speed = 5
-+      .resume_backlight_ramp_speed = 5,
-+      .attach_child_devices = gta02_pcf50633_attach_child_devices
-+
- };
- #if 0 /* currently unused */
-@@ -772,6 +798,7 @@ struct platform_device s3c24xx_pwm_device = {
-       .num_resources  = 0,
- };
-+
- static struct platform_device *gta02_devices[] __initdata = {
-       &s3c_device_usb,
-       &s3c_device_wdt,
-@@ -786,6 +813,7 @@ static struct platform_device *gta02_devices[] __initdata = {
-       &gta02_version_device,
-       &gta02_resume_reason_device,
-       &s3c24xx_pwm_device,
-+
- };
- static struct s3c2410_nand_set gta02_nand_sets[] = {
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 6745993..850bf93 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -50,7 +50,6 @@
- #include <linux/jiffies.h>
- #include <asm/mach-types.h>
--#include <asm/arch/gta02.h>
- #include "pcf50633.h"
- #include <linux/resume-dependency.h>
-@@ -2004,18 +2003,6 @@ static DEVICE_ATTR(dump_regs, 0400, show_dump_regs, NULL);
-  * Driver initialization
-  ***********************************************************************/
--#ifdef CONFIG_MACH_NEO1973_GTA02
--/* We currently place those platform devices here to make sure the device
-- * suspend/resume order is correct */
--static struct platform_device gta01_pm_gps_dev = {
--      .name           = "neo1973-pm-gps",
--};
--
--static struct platform_device gta01_pm_bt_dev = {
--      .name           = "neo1973-pm-bt",
--};
--#endif
--
- /*
-  * CARE!  This table is modified at runtime!
-  */
-@@ -2209,14 +2196,15 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-       apm_get_power_status = pcf50633_get_power_status;
-       data->probe_completed = 1;
--#ifdef CONFIG_MACH_NEO1973_GTA02
--      if (machine_is_neo1973_gta02()) {
--              gta01_pm_gps_dev.dev.parent = &new_client->dev;
--              gta01_pm_bt_dev.dev.parent = &new_client->dev;
--              platform_device_register(&gta01_pm_bt_dev);
--              platform_device_register(&gta01_pm_gps_dev);
--      }
--#endif
-+      if (data->pdata->flag_use_apm_emulation)
-+              apm_get_power_status = pcf50633_get_power_status;
-+
-+      /* if platform was interested, give him a chance to register
-+       * platform devices that switch power with us as the parent
-+       * at registration time -- ensures suspend / resume ordering
-+       */
-+      if (data->pdata->attach_child_devices)
-+              (data->pdata->attach_child_devices)(&new_client->dev);
-       return 0;
- exit_rtc:
-@@ -2261,13 +2249,6 @@ static int pcf50633_detach_client(struct i2c_client *client)
-       if (pcf->pdata->used_features & PCF50633_FEAT_RTC)
-               rtc_device_unregister(pcf->rtc);
--#ifdef CONFIG_MACH_NEO1973_GTA02
--      if (machine_is_neo1973_gta02()) {
--              platform_device_unregister(&gta01_pm_bt_dev);
--              platform_device_unregister(&gta01_pm_gps_dev);
--      }
--#endif
--
-       sysfs_remove_group(&client->dev.kobj, &pcf_attr_group);
-       pm_power_off = NULL;
-@@ -2465,6 +2446,26 @@ int pcf50633_ready(struct pcf50633_data *pcf)
- }
- EXPORT_SYMBOL_GPL(pcf50633_ready);
-+int pcf50633_wait_for_ready(struct pcf50633_data *pcf, int timeout_ms,
-+                                                              char *name)
-+{
-+      /* so we always go once */
-+      timeout_ms += 5;
-+
-+      while ((timeout_ms >= 5) && (pcf50633_ready(pcf))) {
-+              timeout_ms -= 5; /* well, it isn't very accurate, but OK */
-+              msleep(5);
-+      }
-+
-+      if (timeout_ms < 5) {
-+              printk(KERN_ERR"pcf50633_wait_for_ready: "
-+                                      "%s BAILING on timeout\n", name);
-+              return -EBUSY;
-+      }
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL_GPL(pcf50633_wait_for_ready);
- /*
-  * if backlight resume is selected to be deferred by platform, then it
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index b94b72a..4653285 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -132,7 +132,9 @@ pcf50633_register_resume_dependency(struct pcf50633_data *pcf,
- extern int
- pcf50633_notify_usb_current_limit_change(struct pcf50633_data *pcf,
-                                                              unsigned int ma);
--
-+extern int
-+pcf50633_wait_for_ready(struct pcf50633_data *pcf, int timeout_ms,
-+                                                              char *name);
- /* 0 = initialized and resumed and ready to roll, !=0 = either not
-  * initialized or not resumed yet
-@@ -155,6 +157,10 @@ struct pcf50633_platform_data {
-       unsigned int onkey_seconds_sig_init;
-       unsigned int onkey_seconds_shutdown;
-+      /* callback to attach platform children (to enforce suspend / resume
-+       * ordering */
-+      void (*attach_child_devices)(struct device *parent_device);
-+
-       /* voltage regulator related */
-       struct pmu_voltage_rail rails[__NUM_PCF50633_REGULATORS];
-       unsigned int used_regulators;
-@@ -163,6 +169,7 @@ struct pcf50633_platform_data {
-       unsigned int r_fix_batt;
-       unsigned int r_fix_batt_par;
-       unsigned int r_sense_milli;
-+      int flag_use_apm_emulation;
-       unsigned char resumers[5];
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1183-fix-pcf50633-use-pcf-not-data-in-probe-for-context.p.patch b/target/linux/s3c24xx/patches-2.6.26/1183-fix-pcf50633-use-pcf-not-data-in-probe-for-context.p.patch
deleted file mode 100755 (executable)
index 360052a..0000000
+++ /dev/null
@@ -1,219 +0,0 @@
-From 22bdcec1c140689c6fce71ca04d7afcaa44d52f0 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:15 +0100
-Subject: [PATCH] fix-pcf50633-use-pcf-not-data-in-probe-for-context.patch
-
-Everywhere in the sources except the probe function the context
-pointer is called "pcf"... in there it's called "data" for some
-reason.  This stops confusion by changing it to be "pcf" in there
-as well.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |  117 +++++++++++++++++++++--------------------
- 1 files changed, 60 insertions(+), 57 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 850bf93..4cb333c 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -2063,7 +2063,7 @@ static void populate_sysfs_group(struct pcf50633_data *pcf)
- static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
- {
-       struct i2c_client *new_client;
--      struct pcf50633_data *data;
-+      struct pcf50633_data *pcf;
-       int err = 0;
-       int irq;
-@@ -2086,23 +2086,24 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-               return -EBUSY;
-       }
--      if (!(data = kzalloc(sizeof(*data), GFP_KERNEL)))
-+      pcf = kzalloc(sizeof(*pcf), GFP_KERNEL);
-+      if (!pcf)
-               return -ENOMEM;
--      mutex_init(&data->lock);
--      mutex_init(&data->working_lock);
--      mutex_init(&data->working_lock_nobat);
--      mutex_init(&data->working_lock_usb_curlimit);
--      INIT_WORK(&data->work, pcf50633_work);
--      INIT_WORK(&data->work_nobat, pcf50633_work_nobat);
--      INIT_WORK(&data->work_usb_curlimit, pcf50633_work_usbcurlim);
--      data->irq = irq;
--      data->working = 0;
--      data->onkey_seconds = -1;
--      data->pdata = pcf50633_pdev->dev.platform_data;
--
--      new_client = &data->client;
--      i2c_set_clientdata(new_client, data);
-+      mutex_init(&pcf->lock);
-+      mutex_init(&pcf->working_lock);
-+      mutex_init(&pcf->working_lock_nobat);
-+      mutex_init(&pcf->working_lock_usb_curlimit);
-+      INIT_WORK(&pcf->work, pcf50633_work);
-+      INIT_WORK(&pcf->work_nobat, pcf50633_work_nobat);
-+      INIT_WORK(&pcf->work_usb_curlimit, pcf50633_work_usbcurlim);
-+      pcf->irq = irq;
-+      pcf->working = 0;
-+      pcf->onkey_seconds = -1;
-+      pcf->pdata = pcf50633_pdev->dev.platform_data;
-+
-+      new_client = &pcf->client;
-+      i2c_set_clientdata(new_client, pcf);
-       new_client->addr = address;
-       new_client->adapter = adapter;
-       new_client->driver = &pcf50633_driver;
-@@ -2118,11 +2119,11 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-               goto exit_free;
-       }
--      pcf50633_global = data;
-+      pcf50633_global = pcf;
--      init_resume_dependency_list(&data->resume_dependency);
-+      init_resume_dependency_list(&pcf->resume_dependency);
--      populate_sysfs_group(data);
-+      populate_sysfs_group(pcf);
-       err = sysfs_create_group(&new_client->dev.kobj, &pcf_attr_group);
-       if (err) {
-@@ -2135,32 +2136,35 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-       /* register power off handler with core power management */
-       pm_power_off = &pcf50633_go_standby;
--      data->input_dev = input_allocate_device();
--      if (!data->input_dev)
-+      pcf->input_dev = input_allocate_device();
-+      if (!pcf->input_dev)
-               goto exit_sysfs;
--      data->input_dev->name = "GTA02 PMU events";
--      data->input_dev->phys = "FIXME";
--      data->input_dev->id.bustype = BUS_I2C;
-+      pcf->input_dev->name = "GTA02 PMU events";
-+      pcf->input_dev->phys = "FIXME";
-+      pcf->input_dev->id.bustype = BUS_I2C;
-+      pcf->input_dev->cdev.dev = &new_client->dev;
--      data->input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_PWR);
--      set_bit(KEY_POWER, data->input_dev->keybit);
--      set_bit(KEY_POWER2, data->input_dev->keybit);
--      set_bit(KEY_BATTERY, data->input_dev->keybit);
-+      pcf->input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_PWR);
-+      set_bit(KEY_POWER, pcf->input_dev->keybit);
-+      set_bit(KEY_POWER2, pcf->input_dev->keybit);
-+      set_bit(KEY_BATTERY, pcf->input_dev->keybit);
--      err = input_register_device(data->input_dev);
-+      err = input_register_device(pcf->input_dev);
-       if (err)
-               goto exit_sysfs;
-       /* configure interrupt mask */
--      reg_write(data, PCF50633_REG_INT1M, 0x00); /* we want SECOND to kick */
--      reg_write(data, PCF50633_REG_INT2M, 0x00);
--      reg_write(data, PCF50633_REG_INT3M, 0x00);
--      reg_write(data, PCF50633_REG_INT4M, 0x00);
--      reg_write(data, PCF50633_REG_INT5M, 0x00);
-+
-+      /* we want SECOND to kick for the coldplug initialisation */
-+      reg_write(pcf, PCF50633_REG_INT1M, 0x00);
-+      reg_write(pcf, PCF50633_REG_INT2M, 0x00);
-+      reg_write(pcf, PCF50633_REG_INT3M, 0x00);
-+      reg_write(pcf, PCF50633_REG_INT4M, 0x00);
-+      reg_write(pcf, PCF50633_REG_INT5M, 0x00);
-       err = request_irq(irq, pcf50633_irq, IRQF_TRIGGER_FALLING,
--                        "pcf50633", data);
-+                        "pcf50633", pcf);
-       if (err < 0)
-               goto exit_input;
-@@ -2168,59 +2172,58 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-               dev_err(&new_client->dev, "IRQ %u cannot be enabled as wake-up"
-                       "source in this hardware revision!", irq);
--      if (data->pdata->used_features & PCF50633_FEAT_RTC) {
--              data->rtc = rtc_device_register("pcf50633", &new_client->dev,
-+      if (pcf->pdata->used_features & PCF50633_FEAT_RTC) {
-+              pcf->rtc = rtc_device_register("pcf50633", &new_client->dev,
-                                               &pcf50633_rtc_ops, THIS_MODULE);
--              if (IS_ERR(data->rtc)) {
--                      err = PTR_ERR(data->rtc);
-+              if (IS_ERR(pcf->rtc)) {
-+                      err = PTR_ERR(pcf->rtc);
-                       goto exit_irq;
-               }
-       }
--      if (data->pdata->used_features & PCF50633_FEAT_PWM_BL) {
--              data->backlight = backlight_device_register("pcf50633-bl",
-+      if (pcf->pdata->used_features & PCF50633_FEAT_PWM_BL) {
-+              pcf->backlight = backlight_device_register("pcf50633-bl",
-                                                           &new_client->dev,
--                                                          data,
-+                                                          pcf,
-                                                           &pcf50633bl_ops);
--              if (!data->backlight)
-+              if (!pcf->backlight)
-                       goto exit_rtc;
-               /* FIXME: are we sure we want default == off? */
--              data->backlight->props.max_brightness = 0x3f;
--              data->backlight->props.power = FB_BLANK_UNBLANK;
--              data->backlight->props.fb_blank = FB_BLANK_UNBLANK;
--              data->backlight->props.brightness =
--                                      data->backlight->props.max_brightness;
--              backlight_update_status(data->backlight);
-+              pcf->backlight->props.max_brightness = 0x3f;
-+              pcf->backlight->props.power = FB_BLANK_UNBLANK;
-+              pcf->backlight->props.fb_blank = FB_BLANK_UNBLANK;
-+              pcf->backlight->props.brightness =
-+                                      pcf->backlight->props.max_brightness;
-+              backlight_update_status(pcf->backlight);
-       }
--      apm_get_power_status = pcf50633_get_power_status;
--      data->probe_completed = 1;
-+      pcf->probe_completed = 1;
--      if (data->pdata->flag_use_apm_emulation)
-+      if (pcf->pdata->flag_use_apm_emulation)
-               apm_get_power_status = pcf50633_get_power_status;
-       /* if platform was interested, give him a chance to register
-        * platform devices that switch power with us as the parent
-        * at registration time -- ensures suspend / resume ordering
-        */
--      if (data->pdata->attach_child_devices)
--              (data->pdata->attach_child_devices)(&new_client->dev);
-+      if (pcf->pdata->attach_child_devices)
-+              (pcf->pdata->attach_child_devices)(&new_client->dev);
-       return 0;
- exit_rtc:
--      if (data->pdata->used_features & PCF50633_FEAT_RTC)
-+      if (pcf->pdata->used_features & PCF50633_FEAT_RTC)
-               rtc_device_unregister(pcf50633_global->rtc);
- exit_irq:
-       free_irq(pcf50633_global->irq, pcf50633_global);
- exit_input:
--      input_unregister_device(data->input_dev);
-+      input_unregister_device(pcf->input_dev);
- exit_sysfs:
-       pm_power_off = NULL;
-       sysfs_remove_group(&new_client->dev.kobj, &pcf_attr_group);
- exit_detach:
-       i2c_detach_client(new_client);
- exit_free:
--      kfree(data);
-+      kfree(pcf);
-       pcf50633_global = NULL;
-       return err;
- }
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1184-workaround-s3c24xx-i2s-stop-live-stream-stall-on-res.patch b/target/linux/s3c24xx/patches-2.6.26/1184-workaround-s3c24xx-i2s-stop-live-stream-stall-on-res.patch
deleted file mode 100755 (executable)
index b9c892b..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-From f4dac01cd9cb5b7a33fb336fbf9065dbd7e38efe Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:15 +0100
-Subject: [PATCH] workaround-s3c24xx-i2s-stop-live-stream-stall-on-resume.patch
- Reported-by: Graeme Gregory <graeme@openmoko.org>
- Basically-solved-by: Graeme Gregory <graeme@openmoko.org>
-
-Graeme found a while back that on resume, IISCON register in
-s3c2442 does not show LRCK toggling in LRINDEX bit any more,
-causing s3c24xx_snd_lrsync() to timeout and return an error,
-aborting restart of any live stream that was playing at
-suspend.
-
-I confirmed it was true, meddled around for a bit looking
-for some magic to restart LRCK or at least the reporting of
-it, and in the end worked around it using the method noted
-by Graeme: just ignore LRCK sync if it timed out.  The worst
-that could happen would be L and R swap for the duration of
-stream that was suspended into but probably not even that.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- sound/soc/s3c24xx/s3c24xx-i2s.c |   15 +++++++++------
- 1 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c
-index 1ed6afd..fce667c 100644
---- a/sound/soc/s3c24xx/s3c24xx-i2s.c
-+++ b/sound/soc/s3c24xx/s3c24xx-i2s.c
-@@ -180,7 +180,7 @@ static void s3c24xx_snd_rxctrl(int on)
- static int s3c24xx_snd_lrsync(void)
- {
-       u32 iiscon;
--      unsigned long timeout = jiffies + msecs_to_jiffies(5);
-+      int timeout = 5; /* 500us, 125 should be enough at 8kHz */
-       DBG("Entered %s\n", __func__);
-@@ -286,11 +286,14 @@ static int s3c24xx_i2s_trigger(struct snd_pcm_substream *substream, int cmd)
-       case SNDRV_PCM_TRIGGER_START:
-       case SNDRV_PCM_TRIGGER_RESUME:
-       case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
--              if (!s3c24xx_snd_is_clkmaster()) {
--                      ret = s3c24xx_snd_lrsync();
--                      if (ret)
--                              goto exit_err;
--              }
-+              if (!s3c24xx_snd_is_clkmaster())
-+                      /* we ignore the return code, if it sync'd then fine,
-+                       * if it didn't sync, which happens after resume the
-+                       * first time when there was a live stream at suspend,
-+                       * just let it timeout, the stream picks up OK after
-+                       * that and LRCK is evidently working again.
-+                       */
-+                      s3c24xx_snd_lrsync();
-               if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
-                       s3c24xx_snd_rxctrl(1);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1185-Subject-PATCH-a6k-Everyone-calls-SET_NET_DEV-an.patch b/target/linux/s3c24xx/patches-2.6.26/1185-Subject-PATCH-a6k-Everyone-calls-SET_NET_DEV-an.patch
deleted file mode 100755 (executable)
index ea5fe51..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-From 30385f05a2e5358e62e3c736bd501c9bbdc1c681 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:16 +0100
-Subject: [PATCH] Subject: [PATCH] [a6k] Everyone calls SET_NET_DEV and hald needs that too,
- make it happy
-      Call SET_NET_DEV to set a parent device. All other net drivers
-      are doing this and hald needs a parent to add the network device.
-
----
- .../sdio/function/wlan/ar6000/ar6000/ar6000_drv.c  |    1 +
- drivers/sdio/function/wlan/ar6000/hif/hif.c        |    6 ++++++
- drivers/sdio/function/wlan/ar6000/include/hif.h    |    5 +++++
- 3 files changed, 12 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-index a854c7c..dacc00a 100644
---- a/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-+++ b/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
-@@ -830,6 +830,7 @@ ar6000_avail_ev(HTC_HANDLE HTCHandle)
-         sizeof(WMI_DATA_HDR) + HTC_HEADER_LEN;
-     /* This runs the init function */
-+    SET_NETDEV_DEV(dev, HIFGetOSDevice(ar->arHifDevice));
-     if (register_netdev(dev)) {
-         AR_DEBUG_PRINTF("ar6000_avail: register_netdev failed\n");
-         ar6000_destroy(dev, 0);
-diff --git a/drivers/sdio/function/wlan/ar6000/hif/hif.c b/drivers/sdio/function/wlan/ar6000/hif/hif.c
-index f5a0986..3d6d792 100644
---- a/drivers/sdio/function/wlan/ar6000/hif/hif.c
-+++ b/drivers/sdio/function/wlan/ar6000/hif/hif.c
-@@ -779,6 +779,12 @@ delHifDevice(SDDEVICE *handle)
-     hifDevice[0].handle = NULL;
- }
-+struct device*
-+HIFGetOSDevice(HIF_DEVICE *device)
-+{
-+    return &device->handle->Device.dev;
-+}
-+
- static void ResetAllCards(void)
- {
-     UINT8       data;
-diff --git a/drivers/sdio/function/wlan/ar6000/include/hif.h b/drivers/sdio/function/wlan/ar6000/include/hif.h
-index f32388c..846a69f 100644
---- a/drivers/sdio/function/wlan/ar6000/include/hif.h
-+++ b/drivers/sdio/function/wlan/ar6000/include/hif.h
-@@ -284,6 +284,11 @@ HIFConfigureDevice(HIF_DEVICE *device, HIF_DEVICE_CONFIG_OPCODE opcode,
-                    void *config, A_UINT32 configLen);
-+struct device;
-+struct device*
-+HIFGetOSDevice(HIF_DEVICE *device);
-+
-+
- #ifdef __cplusplus
- }
- #endif
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1186-Subject-PATCH-glamo-Don-t-disable-hwcursor-for-b.patch b/target/linux/s3c24xx/patches-2.6.26/1186-Subject-PATCH-glamo-Don-t-disable-hwcursor-for-b.patch
deleted file mode 100755 (executable)
index 3b78a6f..0000000
+++ /dev/null
@@ -1,191 +0,0 @@
-From a613c5fb94c06db20195b8be4593cf05895205cf Mon Sep 17 00:00:00 2001
-From: Andrzej Zaborowski <balrog@zabor.org>
-Date: Fri, 25 Jul 2008 23:06:16 +0100
-Subject: [PATCH] Subject: [PATCH] glamo: Don't disable hwcursor for blinking and use vsync-wait.
-
----
- drivers/mfd/glamo/glamo-fb.c |  109 +++++++++++++++++++++++++++++-------------
- 1 files changed, 76 insertions(+), 33 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c
-index 30cdb38..7e800f5 100644
---- a/drivers/mfd/glamo/glamo-fb.c
-+++ b/drivers/mfd/glamo/glamo-fb.c
-@@ -72,6 +72,7 @@ struct glamofb_handle {
-       char __iomem *base;
-       struct glamofb_platform_data *mach_info;
-       char __iomem *cursor_addr;
-+      int cursor_on;
-       u_int32_t pseudo_pal[16];
-       spinlock_t lock_cmd;
- };
-@@ -499,18 +500,53 @@ static int glamofb_setcolreg(unsigned regno,
- }
- #ifdef CONFIG_MFD_GLAMO_HWACCEL
-+static inline void glamofb_vsync_wait(struct glamofb_handle *glamo,
-+              int line, int size, int range)
-+{
-+      int count[2];
-+
-+      do {
-+              count[0] = reg_read(glamo, GLAMO_REG_LCD_STATUS2) & 0x3ff;
-+              count[1] = reg_read(glamo, GLAMO_REG_LCD_STATUS2) & 0x3ff;
-+      } while (count[0] != count[1] ||
-+                      (line < count[0] + range &&
-+                       size > count[0] - range) ||
-+                      count[0] < range * 2);
-+}
-+
-+/*
-+ * Enable/disable the hardware cursor mode altogether
-+ * (for blinking and such, use glamofb_cursor()).
-+ */
-+static void glamofb_cursor_onoff(struct glamofb_handle *glamo, int on)
-+{
-+      int y, size;
-+
-+      if (glamo->cursor_on) {
-+              y = reg_read(glamo, GLAMO_REG_LCD_CURSOR_Y_POS);
-+              size = reg_read(glamo, GLAMO_REG_LCD_CURSOR_Y_SIZE);
-+
-+              glamofb_vsync_wait(glamo, y, size, 30);
-+      }
-+
-+      reg_set_bit_mask(glamo, GLAMO_REG_LCD_MODE1,
-+                      GLAMO_LCD_MODE1_CURSOR_EN,
-+                      on ? GLAMO_LCD_MODE1_CURSOR_EN : 0);
-+      glamo->cursor_on = on;
-+
-+      /* Hide the cursor by default */
-+      reg_write(glamo, GLAMO_REG_LCD_CURSOR_X_SIZE, 0);
-+}
-+
- static int glamofb_cursor(struct fb_info *info, struct fb_cursor *cursor)
- {
-       struct glamofb_handle *glamo = info->par;
-       unsigned long flags;
--      if (cursor->image.depth > 2)
--              return -EINVAL;
--
-       spin_lock_irqsave(&glamo->lock_cmd, flags);
--      reg_set_bit_mask(glamo, GLAMO_REG_LCD_MODE1,
--                      GLAMO_LCD_MODE1_CURSOR_EN, 0);
-+      reg_write(glamo, GLAMO_REG_LCD_CURSOR_X_SIZE,
-+                      cursor->enable ? cursor->image.width : 0);
-       if (cursor->set & FB_CUR_SETPOS) {
-               reg_write(glamo, GLAMO_REG_LCD_CURSOR_X_POS,
-@@ -520,12 +556,12 @@ static int glamofb_cursor(struct fb_info *info, struct fb_cursor *cursor)
-       }
-       if (cursor->set & FB_CUR_SETCMAP) {
--              uint16_t fg = cursor->image.fg_color;
--              uint16_t bg = cursor->image.bg_color;
-+              uint16_t fg = glamo->pseudo_pal[cursor->image.fg_color];
-+              uint16_t bg = glamo->pseudo_pal[cursor->image.bg_color];
-               reg_write(glamo, GLAMO_REG_LCD_CURSOR_FG_COLOR, fg);
-               reg_write(glamo, GLAMO_REG_LCD_CURSOR_BG_COLOR, bg);
--              reg_write(glamo, GLAMO_REG_LCD_CURSOR_DST_COLOR, bg);
-+              reg_write(glamo, GLAMO_REG_LCD_CURSOR_DST_COLOR, fg);
-       }
-       if (cursor->set & FB_CUR_SETHOT)
-@@ -534,23 +570,27 @@ static int glamofb_cursor(struct fb_info *info, struct fb_cursor *cursor)
-       if ((cursor->set & FB_CUR_SETSIZE) ||
-           (cursor->set & (FB_CUR_SETIMAGE | FB_CUR_SETSHAPE))) {
--              int x, y, pitch;
--              const unsigned char *pcol = cursor->image.data;
--              const unsigned char *pmsk = cursor->mask;
--              void __iomem *dst = glamo->cursor_addr;
--              unsigned char dcol = 0;
--              unsigned char dmsk = 0;
--              unsigned char byte = 0;
--
--              pitch = (cursor->image.width + 3) >> 2;
--              reg_write(glamo, GLAMO_REG_LCD_CURSOR_X_SIZE,
--                        cursor->image.width);
-+              int x, y, pitch, op;
-+              const uint8_t *pcol = cursor->image.data;
-+              const uint8_t *pmsk = cursor->mask;
-+              uint8_t __iomem *dst = glamo->cursor_addr;
-+              uint8_t dcol = 0;
-+              uint8_t dmsk = 0;
-+              uint8_t byte = 0;
-+
-+              if (cursor->image.depth > 1) {
-+                      spin_unlock_irqrestore(&glamo->lock_cmd, flags);
-+                      return -EINVAL;
-+              }
-+
-+              pitch = ((cursor->image.width + 7) >> 2) & ~1;
-               reg_write(glamo, GLAMO_REG_LCD_CURSOR_PITCH,
--                        pitch);
-+                      pitch);
-               reg_write(glamo, GLAMO_REG_LCD_CURSOR_Y_SIZE,
--                        cursor->image.height);
-+                      cursor->image.height);
-               for (y = 0; y < cursor->image.height; y++) {
-+                      byte = 0;
-                       for (x = 0; x < cursor->image.width; x++) {
-                               if ((x % 8) == 0) {
-                                       dcol = *pcol++;
-@@ -560,28 +600,28 @@ static int glamofb_cursor(struct fb_info *info, struct fb_cursor *cursor)
-                                       dmsk >>= 1;
-                               }
--                              if (dmsk & 1) {
--                                      unsigned int op;
-+                              if (cursor->rop == ROP_COPY)
-+                                      op = (dmsk & 1) ?
-+                                              (dcol & 1) ? 1 : 3 : 0;
-+                              else
-+                                      op = ((dmsk & 1) << 1) |
-+                                              ((dcol & 1) << 0);
-+                              byte |= op << ((x & 3) << 1);
--                                      op = (dcol & 1) ? 1 : 3;
--                                      byte |= op << ((x % 4) * 2);
--                              }
--
--                              if ((x % 4) == 0) {
-+                              if (x % 4 == 3) {
-                                       writeb(byte, dst + x / 4);
-                                       byte = 0;
-                               }
-                       }
-+                      if (x % 4) {
-+                              writeb(byte, dst + x / 4);
-+                              byte = 0;
-+                      }
-                       dst += pitch;
-               }
-       }
--      if (cursor->enable)
--              reg_set_bit_mask(glamo, GLAMO_REG_LCD_MODE1,
--                              GLAMO_LCD_MODE1_CURSOR_EN,
--                              GLAMO_LCD_MODE1_CURSOR_EN);
--
-       spin_unlock_irqrestore(&glamo->lock_cmd, flags);
-       return 0;
-@@ -809,6 +849,9 @@ static int __init glamofb_probe(struct platform_device *pdev)
-       printk(KERN_ERR"spin_lock_init\n");
-       spin_lock_init(&glamofb->lock_cmd);
-       glamofb_init_regs(glamofb);
-+#ifdef CONFIG_MFD_GLAMO_HWACCEL
-+      glamofb_cursor_onoff(glamofb, 1);
-+#endif
-       rc = register_framebuffer(fbinfo);
-       if (rc < 0) {
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1187-introduce-panic-blink-led-not-using-userspace-omfg.p.patch b/target/linux/s3c24xx/patches-2.6.26/1187-introduce-panic-blink-led-not-using-userspace-omfg.p.patch
deleted file mode 100755 (executable)
index d11f837..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-From ff2e0f074f61fded30a44e13b849fe9010ab4148 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:16 +0100
-Subject: [PATCH] introduce-panic-blink-led-not-using-userspace-omfg.patch
-
-A panic is silent on GTA02, it would be good if we got a little hint
-if we are crashing (eg, in suspend / resume) from a panic instead of
-a deadlock, etc.  On a normal PC i8042 blinks the keyboard lights if
-we panic, this patch causes AUX to flash at 5Hz in event of a panic.
-
-Tested by giving kernel fake root= that didn't exist.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   24 ++++++++++++++++++++++++
- 1 files changed, 24 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index fd746fd..c32bb2a 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -328,6 +328,27 @@ FIQ_HANDLER_ENTRY(256, 512)
- FIQ_HANDLER_END()
-+/*
-+ * this gets called every 1ms when we paniced.
-+ */
-+
-+static long gta02_panic_blink(long count)
-+{
-+      long delay = 0;
-+      static long last_blink;
-+      static char led;
-+
-+      if (count - last_blink < 100) /* 200ms period, fast blink */
-+              return 0;
-+
-+      led ^= 1;
-+      s3c2410_gpio_cfgpin(GTA02_GPIO_AUX_LED, S3C2410_GPIO_OUTPUT);
-+      neo1973_gpb_setpin(GTA02_GPIO_AUX_LED, led);
-+
-+      last_blink = count;
-+      return delay;
-+}
-+
- /**
-  * returns PCB revision information in b9,b8 and b2,b1,b0
-@@ -1476,6 +1497,9 @@ static void __init gta02_machine_init(void)
- {
-       int rc;
-+      /* set the panic callback to make AUX blink fast */
-+      panic_blink = gta02_panic_blink;
-+
-       switch (system_rev) {
-       case GTA02v6_SYSTEM_REV:
-               /* we need push-pull interrupt from motion sensors */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1188-touchscreen-meddling.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1188-touchscreen-meddling.patch.patch
deleted file mode 100755 (executable)
index a5e2d84..0000000
+++ /dev/null
@@ -1,505 +0,0 @@
-From 76d6ab9228efca87d3e6db46e918c7bbf19f6540 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:16 +0100
-Subject: [PATCH] touchscreen-meddling.patch
-
-Touchscreen on GTA01-02 experiences noise on the channel that serves the
-"tall axis" of the LCM.  The sample quality of the other axis is good.
-The bad samples have a characteristic of one shot excursions that can
-reach +/- 20% or more of the sample average.
-
-Previously, we had a simple averaging scheme going in the touchscreen
-driver that summed up 32 x and ys and then divided it by 32.  This patch
-first tidies up the existing code for style, then adds a new "running
-average" concept with a FIFO.  The running average is separate from the
-summing average mentioned above, and is accurate for the last n samples
-sample-by-sample, where n is set by 1 << excursion_filter_len_bits in the
-machine / platform stuff.
-
-The heuristic the patch implements for the filtering is to accept all
-samples, but tag the *previous* sample with a flag if it differed from
-the running average by more than reject_threshold_vs_avg in either
-axis.  The next sample time, a beauty contest is held if the flag was
-set to decide if we think the previous sample was a one-shot excursion
-(detected by the new sample being closer to the average than to the
-flagged previous sample), or if we believe we are moving (detected by
-the new sample being closer to the flagged previous sample than the
-average.  In the case that we believe the previous sample was an
-excursion, we simply overwrite it with the new data and adjust the
-summing average to use the new data instead of the excursion data.
-
-I only tested this by eyeballing the output of ts_print_raw, but it
-seemed to be quite a bit better.  Gross movement appeared to be
-tracked fine too.  If folks want to try different heuristics on top
-of this patch, be my guest; either way feedback on what it looks like
-with a graphical app would be good.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c     |   10 +-
- drivers/input/touchscreen/s3c2410_ts.c |  256 ++++++++++++++++++++++++--------
- include/asm-arm/arch-s3c2410/ts.h      |    8 +-
- 3 files changed, 205 insertions(+), 69 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index c32bb2a..afe8039 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -897,10 +897,18 @@ static struct s3c2410_udc_mach_info gta02_udc_cfg = {
- static struct s3c2410_ts_mach_info gta02_ts_cfg = {
-       .delay = 10000,
--      .presc = 65,
-+      .presc = 50000000 / 1000000, /* 50 MHz PCLK / 1MHz */
-+      /* simple averaging, 2^n samples */
-       .oversampling_shift = 5,
-+       /* averaging filter length, 2^n */
-+      .excursion_filter_len_bits = 5,
-+      /* flagged for beauty contest on next sample if differs from
-+       * average more than this
-+       */
-+      .reject_threshold_vs_avg = 2,
- };
-+
- /* SPI: LCM control interface attached to Glamo3362 */
- static void gta02_jbt6k74_reset(int devidx, int level)
-diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
-index 1251454..b1ba73d 100644
---- a/drivers/input/touchscreen/s3c2410_ts.c
-+++ b/drivers/input/touchscreen/s3c2410_ts.c
-@@ -36,6 +36,9 @@
-  *
-  * 2007-05-23: Harald Welte <laforge@openmoko.org>
-  *    - Add proper support for S32440
-+ *
-+ * 2008-06-18: Andy Green <andy@openmoko.com>
-+ *      - Outlier removal
-  */
- #include <linux/errno.h>
-@@ -62,11 +65,16 @@
- #define TSC_SLEEP  (S3C2410_ADCTSC_PULL_UP_DISABLE | S3C2410_ADCTSC_XY_PST(0))
- #define WAIT4INT(x)  (((x)<<8) | \
--                   S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \
-+                   S3C2410_ADCTSC_YM_SEN | \
-+                   S3C2410_ADCTSC_YP_SEN | \
-+                   S3C2410_ADCTSC_XP_SEN | \
-                    S3C2410_ADCTSC_XY_PST(3))
--#define AUTOPST            (S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \
--                   S3C2410_ADCTSC_AUTO_PST | S3C2410_ADCTSC_XY_PST(0))
-+#define AUTOPST            (S3C2410_ADCTSC_YM_SEN | \
-+                    S3C2410_ADCTSC_YP_SEN | \
-+                    S3C2410_ADCTSC_XP_SEN | \
-+                    S3C2410_ADCTSC_AUTO_PST | \
-+                    S3C2410_ADCTSC_XY_PST(0))
- #define DEBUG_LVL    KERN_DEBUG
-@@ -85,17 +93,46 @@ static char *s3c2410ts_name = "s3c2410 TouchScreen";
-  * Per-touchscreen data.
-  */
-+struct s3c2410ts_sample {
-+      int x;
-+      int y;
-+};
-+
- struct s3c2410ts {
-       struct input_dev *dev;
-       long xp;
-       long yp;
-       int count;
-       int shift;
-+      int extent;  /* 1 << shift */
-+
-+      /* the raw sample fifo is a lightweight way to track a running average
-+       * of all taken samples.  "running average" here means that it gives
-+       * correct average for each sample, not only at the end of block of
-+       * samples
-+       */
-+      int excursion_filter_len;
-+      struct s3c2410ts_sample *raw_sample_fifo;
-+      int head_raw_fifo;
-+      int tail_raw_fifo;
-+      struct s3c2410ts_sample raw_running_avg;
-+      int reject_threshold_vs_avg;
-+      int flag_previous_exceeded_threshold;
- };
- static struct s3c2410ts ts;
- static void __iomem *base_addr;
-+static void clear_raw_fifo(void)
-+{
-+      ts.head_raw_fifo = 0;
-+      ts.tail_raw_fifo = 0;
-+      ts.raw_running_avg.x = 0;
-+      ts.raw_running_avg.y = 0;
-+      ts.flag_previous_exceeded_threshold = 0;
-+}
-+
-+
- static inline void s3c2410_ts_connect(void)
- {
-       s3c2410_gpio_cfgpin(S3C2410_GPG12, S3C2410_GPG12_XMON);
-@@ -110,47 +147,52 @@ static void touch_timer_fire(unsigned long data)
-       unsigned long data1;
-       int updown;
--      data0 = readl(base_addr+S3C2410_ADCDAT0);
--      data1 = readl(base_addr+S3C2410_ADCDAT1);
-+      data0 = readl(base_addr + S3C2410_ADCDAT0);
-+      data1 = readl(base_addr + S3C2410_ADCDAT1);
--      updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN));
-+      updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) &&
-+                                          (!(data1 & S3C2410_ADCDAT0_UPDOWN));
--      if (updown) {
--              if (ts.count != 0) {
--                      ts.xp >>= ts.shift;
--                      ts.yp >>= ts.shift;
-+      if (updown) {
-+              if (ts.count != 0) {
-+                      ts.xp >>= ts.shift;
-+                      ts.yp >>= ts.shift;
- #ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG
--                      {
--                              struct timeval tv;
--                              do_gettimeofday(&tv);
--                              printk(DEBUG_LVL "T: %06d, X: %03ld, Y: %03ld\n", (int)tv.tv_usec, ts.xp, ts.yp);
--                      }
-+                      {
-+                              struct timeval tv;
-+
-+                              do_gettimeofday(&tv);
-+                              printk(DEBUG_LVL "T:%06d, X:%03ld, Y:%03ld\n",
-+                                               (int)tv.tv_usec, ts.xp, ts.yp);
-+                      }
- #endif
--                      input_report_abs(ts.dev, ABS_X, ts.xp);
--                      input_report_abs(ts.dev, ABS_Y, ts.yp);
-+                      input_report_abs(ts.dev, ABS_X, ts.xp);
-+                      input_report_abs(ts.dev, ABS_Y, ts.yp);
--                      input_report_key(ts.dev, BTN_TOUCH, 1);
--                      input_report_abs(ts.dev, ABS_PRESSURE, 1);
--                      input_sync(ts.dev);
--              }
-+                      input_report_key(ts.dev, BTN_TOUCH, 1);
-+                      input_report_abs(ts.dev, ABS_PRESSURE, 1);
-+                      input_sync(ts.dev);
-+              }
--              ts.xp = 0;
--              ts.yp = 0;
--              ts.count = 0;
-+              ts.xp = 0;
-+              ts.yp = 0;
-+              ts.count = 0;
--              writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC);
--              writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON);
--      } else {
--              ts.count = 0;
-+              writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST,
-+                                                    base_addr+S3C2410_ADCTSC);
-+              writel(readl(base_addr+S3C2410_ADCCON) |
-+                       S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON);
-+      } else {
-+              ts.count = 0;
--              input_report_key(ts.dev, BTN_TOUCH, 0);
--              input_report_abs(ts.dev, ABS_PRESSURE, 0);
--              input_sync(ts.dev);
-+              input_report_key(ts.dev, BTN_TOUCH, 0);
-+              input_report_abs(ts.dev, ABS_PRESSURE, 0);
-+              input_sync(ts.dev);
--              writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC);
--      }
-+              writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC);
-+      }
- }
- static struct timer_list touch_timer =
-@@ -165,7 +207,8 @@ static irqreturn_t stylus_updown(int irq, void *dev_id)
-       data0 = readl(base_addr+S3C2410_ADCDAT0);
-       data1 = readl(base_addr+S3C2410_ADCDAT1);
--      updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN));
-+      updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) &&
-+                                          (!(data1 & S3C2410_ADCDAT0_UPDOWN));
-       /* TODO we should never get an interrupt with updown set while
-        * the timer is running, but maybe we ought to verify that the
-@@ -180,24 +223,94 @@ static irqreturn_t stylus_updown(int irq, void *dev_id)
- static irqreturn_t stylus_action(int irq, void *dev_id)
- {
--      unsigned long data0;
--      unsigned long data1;
--
--      data0 = readl(base_addr+S3C2410_ADCDAT0);
--      data1 = readl(base_addr+S3C2410_ADCDAT1);
-+      unsigned long x;
-+      unsigned long y;
-+      int length = (ts.head_raw_fifo - ts.tail_raw_fifo) & (ts.extent - 1);
-+      int scaled_avg_x = ts.raw_running_avg.x / length;
-+      int scaled_avg_y = ts.raw_running_avg.y / length;
-+
-+      x = readl(base_addr + S3C2410_ADCDAT0) & S3C2410_ADCDAT0_XPDATA_MASK;
-+      y = readl(base_addr + S3C2410_ADCDAT1) & S3C2410_ADCDAT1_YPDATA_MASK;
-+
-+      /* we appear to accept every sample into both the running average FIFO
-+       * and the summing average.  BUT, if the last sample crossed a
-+       * machine-set threshold, each time we do a beauty contest
-+       * on the new sample comparing if it is closer to the running
-+       * average and the previous sample.  If it is closer to the previous
-+       * suspicious sample, we assume the change is real and accept both
-+       * if the new sample has returned to being closer to the average than
-+       * the previous sample, we take the previous sample as an excursion
-+       * and overwrite it in both the running average and summing average.
-+       */
-+
-+      if (ts.flag_previous_exceeded_threshold)
-+              /* new one closer to "nonconformist" previous, or average?
-+               * Pythagoras?  Who?  Don't need it because large excursion
-+               * will be accounted for correctly this way
-+               */
-+              if ((abs(x - scaled_avg_x) + abs(y - scaled_avg_y)) <
-+                  (abs(x - ts.raw_sample_fifo[(ts.head_raw_fifo - 1) &
-+                                                        (ts.extent - 1)].x) +
-+                   abs(y - ts.raw_sample_fifo[(ts.head_raw_fifo - 1) &
-+                                                       (ts.extent - 1)].y))) {
-+                      /* it's closer to average, reject previous as a one-
-+                       * shot excursion, by overwriting it
-+                       */
-+                      ts.xp += x - ts.raw_sample_fifo[(ts.head_raw_fifo - 1) &
-+                                                           (ts.extent - 1)].x;
-+                      ts.yp += y - ts.raw_sample_fifo[(ts.head_raw_fifo - 1) &
-+                                                           (ts.extent - 1)].y;
-+                      ts.raw_sample_fifo[(ts.head_raw_fifo - 1) &
-+                                                       (ts.extent - 1)].x = x;
-+                      ts.raw_sample_fifo[(ts.head_raw_fifo - 1) &
-+                                                       (ts.extent - 1)].y = y;
-+                      /* no new sample: replaced previous, so we are done */
-+                      goto completed;
-+              }
-+              /* else it was closer to nonconformist previous: it's likely
-+               * a genuine consistent move then.
-+               * Keep previous and add new guy.
-+               */
-+
-+      if ((x >= scaled_avg_x - ts.reject_threshold_vs_avg) &&
-+          (x <= scaled_avg_x + ts.reject_threshold_vs_avg) &&
-+          (y >= scaled_avg_y - ts.reject_threshold_vs_avg) &&
-+          (y <= scaled_avg_y + ts.reject_threshold_vs_avg))
-+              ts.flag_previous_exceeded_threshold = 0;
-+      else
-+              ts.flag_previous_exceeded_threshold = 1;
--      ts.xp += data0 & S3C2410_ADCDAT0_XPDATA_MASK;
--      ts.yp += data1 & S3C2410_ADCDAT1_YPDATA_MASK;
-+      /* accepted */
-+      ts.xp += x;
-+      ts.yp += y;
-       ts.count++;
--        if (ts.count < (1<<ts.shift)) {
--              writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC);
--              writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON);
--      } else {
--              mod_timer(&touch_timer, jiffies+1);
-+      /* remove oldest sample from avg when we have full pipeline */
-+      if (((ts.head_raw_fifo + 1) & (ts.extent - 1)) == ts.tail_raw_fifo) {
-+              ts.raw_running_avg.x -= ts.raw_sample_fifo[ts.tail_raw_fifo].x;
-+              ts.raw_running_avg.y -= ts.raw_sample_fifo[ts.tail_raw_fifo].y;
-+              ts.tail_raw_fifo = (ts.tail_raw_fifo + 1) & (ts.extent - 1);
-+      }
-+      /* always add current sample to fifo and average */
-+      ts.raw_sample_fifo[ts.head_raw_fifo].x = x;
-+      ts.raw_sample_fifo[ts.head_raw_fifo].y = y;
-+      ts.raw_running_avg.x += x;
-+      ts.raw_running_avg.y += y;
-+      ts.head_raw_fifo = (ts.head_raw_fifo + 1) & (ts.extent - 1);
-+
-+completed:
-+      if (ts.count >= (1 << ts.shift)) {
-+              mod_timer(&touch_timer, jiffies + 1);
-               writel(WAIT4INT(1), base_addr+S3C2410_ADCTSC);
-+              goto bail;
-       }
-+      writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST,
-+                                                    base_addr+S3C2410_ADCTSC);
-+      writel(readl(base_addr+S3C2410_ADCCON) |
-+                       S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON);
-+
-+bail:
-       return IRQ_HANDLED;
- }
-@@ -213,11 +326,11 @@ static int __init s3c2410ts_probe(struct platform_device *pdev)
-       struct s3c2410_ts_mach_info *info;
-       struct input_dev *input_dev;
--      info = ( struct s3c2410_ts_mach_info *)pdev->dev.platform_data;
-+      info = (struct s3c2410_ts_mach_info *)pdev->dev.platform_data;
-       if (!info)
-       {
--              printk(KERN_ERR "Hm... too bad : no platform data for ts\n");
-+              dev_err(&pdev->dev, "Hm... too bad: no platform data for ts\n");
-               return -EINVAL;
-       }
-@@ -227,7 +340,7 @@ static int __init s3c2410ts_probe(struct platform_device *pdev)
-       adc_clock = clk_get(NULL, "adc");
-       if (!adc_clock) {
--              printk(KERN_ERR "failed to get adc clock source\n");
-+              dev_err(&pdev->dev, "failed to get adc clock source\n");
-               return -ENOENT;
-       }
-       clk_enable(adc_clock);
-@@ -238,7 +351,7 @@ static int __init s3c2410ts_probe(struct platform_device *pdev)
-       base_addr = ioremap(S3C2410_PA_ADC,0x20);
-       if (base_addr == NULL) {
--              printk(KERN_ERR "Failed to remap register block\n");
-+              dev_err(&pdev->dev, "Failed to remap register block\n");
-               return -ENOMEM;
-       }
-@@ -247,25 +360,26 @@ static int __init s3c2410ts_probe(struct platform_device *pdev)
-       if (!strcmp(pdev->name, "s3c2410-ts"))
-               s3c2410_ts_connect();
--      if ((info->presc&0xff) > 0)
--              writel(S3C2410_ADCCON_PRSCEN | S3C2410_ADCCON_PRSCVL(info->presc&0xFF),\
--                           base_addr+S3C2410_ADCCON);
-+      if ((info->presc & 0xff) > 0)
-+              writel(S3C2410_ADCCON_PRSCEN |
-+                     S3C2410_ADCCON_PRSCVL(info->presc&0xFF),
-+                                                  base_addr + S3C2410_ADCCON);
-       else
--              writel(0,base_addr+S3C2410_ADCCON);
-+              writel(0, base_addr+S3C2410_ADCCON);
-       /* Initialise registers */
--      if ((info->delay&0xffff) > 0)
--              writel(info->delay & 0xffff,  base_addr+S3C2410_ADCDLY);
-+      if ((info->delay & 0xffff) > 0)
-+              writel(info->delay & 0xffff,  base_addr + S3C2410_ADCDLY);
--      writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC);
-+      writel(WAIT4INT(0), base_addr + S3C2410_ADCTSC);
-       /* Initialise input stuff */
-       memset(&ts, 0, sizeof(struct s3c2410ts));
-       input_dev = input_allocate_device();
-       if (!input_dev) {
--              printk(KERN_ERR "Unable to allocate the input device !!\n");
-+              dev_err(&pdev->dev, "Unable to allocate the input device\n");
-               return -ENOMEM;
-       }
-@@ -284,23 +398,30 @@ static int __init s3c2410ts_probe(struct platform_device *pdev)
-       ts.dev->id.version = S3C2410TSVERSION;
-       ts.shift = info->oversampling_shift;
-+      ts.extent = 1 << info->oversampling_shift;
-+      ts.reject_threshold_vs_avg = info->reject_threshold_vs_avg;
-+      ts.excursion_filter_len = 1 << info->excursion_filter_len_bits;
-+
-+      ts.raw_sample_fifo = kmalloc(sizeof(struct s3c2410ts_sample) *
-+                                         ts.excursion_filter_len, GFP_KERNEL);
-+      clear_raw_fifo();
-       /* Get irqs */
-       if (request_irq(IRQ_ADC, stylus_action, IRQF_SAMPLE_RANDOM,
--              "s3c2410_action", ts.dev)) {
--              printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_ADC !\n");
-+                                                  "s3c2410_action", ts.dev)) {
-+              dev_err(&pdev->dev, "Could not allocate ts IRQ_ADC !\n");
-               iounmap(base_addr);
-               return -EIO;
-       }
-       if (request_irq(IRQ_TC, stylus_updown, IRQF_SAMPLE_RANDOM,
-                       "s3c2410_action", ts.dev)) {
--              printk(KERN_ERR "s3c2410_ts.c: Could not allocate ts IRQ_TC !\n");
-+              dev_err(&pdev->dev, "Could not allocate ts IRQ_TC !\n");
-               free_irq(IRQ_ADC, ts.dev);
-               iounmap(base_addr);
-               return -EIO;
-       }
--      printk(KERN_INFO "%s successfully loaded\n", s3c2410ts_name);
-+      dev_info(&pdev->dev, "successfully loaded\n");
-       /* All went ok, so register to the input system */
-       rc = input_register_device(ts.dev);
-@@ -328,6 +449,8 @@ static int s3c2410ts_remove(struct platform_device *pdev)
-               adc_clock = NULL;
-       }
-+      kfree(ts.raw_sample_fifo);
-+
-       input_unregister_device(ts.dev);
-       iounmap(base_addr);
-@@ -357,17 +480,20 @@ static int s3c2410ts_resume(struct platform_device *pdev)
-       clk_enable(adc_clock);
-       mdelay(1);
-+      clear_raw_fifo();
-+
-       enable_irq(IRQ_ADC);
-       enable_irq(IRQ_TC);
-       if ((info->presc&0xff) > 0)
--              writel(S3C2410_ADCCON_PRSCEN | S3C2410_ADCCON_PRSCVL(info->presc&0xFF),\
--                           base_addr+S3C2410_ADCCON);
-+              writel(S3C2410_ADCCON_PRSCEN |
-+                     S3C2410_ADCCON_PRSCVL(info->presc&0xFF),
-+                                                    base_addr+S3C2410_ADCCON);
-       else
-               writel(0,base_addr+S3C2410_ADCCON);
-       /* Initialise registers */
--      if ((info->delay&0xffff) > 0)
-+      if ((info->delay & 0xffff) > 0)
-               writel(info->delay & 0xffff,  base_addr+S3C2410_ADCDLY);
-       writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC);
-diff --git a/include/asm-arm/arch-s3c2410/ts.h b/include/asm-arm/arch-s3c2410/ts.h
-index 593632a..44c1e4b 100644
---- a/include/asm-arm/arch-s3c2410/ts.h
-+++ b/include/asm-arm/arch-s3c2410/ts.h
-@@ -17,9 +17,11 @@
- #define __ASM_ARM_TS_H
- struct s3c2410_ts_mach_info {
--       int             delay;
--       int             presc;
--       int             oversampling_shift;
-+      int             delay;
-+      int             presc;
-+      int             oversampling_shift;
-+      int             excursion_filter_len_bits;
-+      int             reject_threshold_vs_avg;
- };
- void set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1189-fix-touchscreen-meddling-divde.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1189-fix-touchscreen-meddling-divde.patch.patch
deleted file mode 100755 (executable)
index 4ff7910..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-From 9bdb2dbc9725d7f2ba23566303d5abe0504beb83 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:16 +0100
-Subject: [PATCH] fix-touchscreen-meddling-divde.patch
- Reported-by: Holger Freyther <zecke@openmoko.org>
-
-length can be zero... blowing a divide by zero exception...
-which somehow I don't get (?)  Anyway the code is wrong and
-this should fix it.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/input/touchscreen/s3c2410_ts.c |   12 +++++++++---
- 1 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
-index b1ba73d..5bc347f 100644
---- a/drivers/input/touchscreen/s3c2410_ts.c
-+++ b/drivers/input/touchscreen/s3c2410_ts.c
-@@ -226,12 +226,18 @@ static irqreturn_t stylus_action(int irq, void *dev_id)
-       unsigned long x;
-       unsigned long y;
-       int length = (ts.head_raw_fifo - ts.tail_raw_fifo) & (ts.extent - 1);
--      int scaled_avg_x = ts.raw_running_avg.x / length;
--      int scaled_avg_y = ts.raw_running_avg.y / length;
-+      int scaled_avg_x;
-+      int scaled_avg_y;
-       x = readl(base_addr + S3C2410_ADCDAT0) & S3C2410_ADCDAT0_XPDATA_MASK;
-       y = readl(base_addr + S3C2410_ADCDAT1) & S3C2410_ADCDAT1_YPDATA_MASK;
-+      if (!length)
-+              goto store_sample;
-+
-+      scaled_avg_x = ts.raw_running_avg.x / length;
-+      scaled_avg_y = ts.raw_running_avg.y / length;
-+
-       /* we appear to accept every sample into both the running average FIFO
-        * and the summing average.  BUT, if the last sample crossed a
-        * machine-set threshold, each time we do a beauty contest
-@@ -280,7 +286,7 @@ static irqreturn_t stylus_action(int irq, void *dev_id)
-       else
-               ts.flag_previous_exceeded_threshold = 1;
--      /* accepted */
-+store_sample:
-       ts.xp += x;
-       ts.yp += y;
-       ts.count++;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1190-fix-lis302dl-resume-and-init-reload-boot-coefficient.patch b/target/linux/s3c24xx/patches-2.6.26/1190-fix-lis302dl-resume-and-init-reload-boot-coefficient.patch
deleted file mode 100755 (executable)
index cec5985..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-From d0c3a8bdfe2722f00b5ec7812500fbf1f6229b9f Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:16 +0100
-Subject: [PATCH] fix-lis302dl-resume-and-init-reload-boot-coefficients.patch
- Reported-by: John Lee <john_lee@openmoko.com>
-
-We don't reset the devices either at init or resume, where init
-means use the BOOT bit to reload device calibration coefficients
-from internal EEPROM.  John Lee saw brain-damaged behaviour after
-resume and sometimes after boot (since it may not have lost power
-to force a BOOT itself that makes sense).
-
-This patch
-
- - adds a diagnostic dump feature down /sys
- - forces BOOT action on init and resume, and waits for
-   completion
- - makes sure XYZ capture is enabled on resume
- - adds some constants in the .h and removes some magic numbers
-   in the code by using them
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/input/misc/lis302dl.c |   78 +++++++++++++++++++++++++++++++++++++++--
- include/linux/lis302dl.h      |    9 +++++
- 2 files changed, 84 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
-index 1d19418..553a731 100644
---- a/drivers/input/misc/lis302dl.c
-+++ b/drivers/input/misc/lis302dl.c
-@@ -221,9 +221,37 @@ static ssize_t set_scale(struct device *dev, struct device_attribute *attr,
- static DEVICE_ATTR(full_scale, S_IRUGO | S_IWUSR, show_scale, set_scale);
-+static ssize_t lis302dl_dump(struct device *dev, struct device_attribute *attr,
-+                        char *buf)
-+{
-+      struct lis302dl_info *lis = dev_get_drvdata(dev);
-+      int n = 0;
-+      u8 reg[0x40];
-+      char *end = buf;
-+      unsigned long flags;
-+
-+      local_save_flags(flags);
-+
-+      for (n = 0; n < sizeof(reg); n++)
-+              reg[n] = reg_read(lis, n);
-+
-+      local_irq_restore(flags);
-+
-+      for (n = 0; n < sizeof(reg); n += 16) {
-+              hex_dump_to_buffer(reg + n, 16, 16, 1, end, 128, 0);
-+              end += strlen(end);
-+              *end++ = '\n';
-+              *end++ = '\0';
-+      }
-+
-+      return end - buf;
-+}
-+static DEVICE_ATTR(dump, S_IRUGO, lis302dl_dump, NULL);
-+
- static struct attribute *lis302dl_sysfs_entries[] = {
-       &dev_attr_sample_rate.attr,
-       &dev_attr_full_scale.attr,
-+      &dev_attr_dump.attr,
-       NULL
- };
-@@ -276,6 +304,24 @@ static void lis302dl_input_close(struct input_dev *inp)
-       local_irq_restore(flags);
- }
-+/* get the device to reload its coefficients from EEPROM and wait for it
-+ * to complete
-+ */
-+
-+static int __lis302dl_reset_device(struct lis302dl_info *lis)
-+{
-+      int timeout = 10;
-+
-+      reg_write(lis, LIS302DL_REG_CTRL2, LIS302DL_CTRL2_BOOT |
-+                                                          LIS302DL_CTRL2_FDS);
-+
-+      while ((reg_read(lis, LIS302DL_REG_CTRL2) & LIS302DL_CTRL2_BOOT) &&
-+                                                                  (timeout--))
-+              mdelay(1);
-+
-+      return !!(timeout < 0);
-+}
-+
- static int __devinit lis302dl_probe(struct spi_device *spi)
- {
-       int rc;
-@@ -347,12 +393,24 @@ static int __devinit lis302dl_probe(struct spi_device *spi)
-               goto bail_inp_dev;
-       }
--      reg_write(lis, LIS302DL_REG_CTRL1, 0x47);
--      reg_write(lis, LIS302DL_REG_CTRL3, 0xc0);
-+      if (__lis302dl_reset_device(lis))
-+              dev_err(&spi->dev, "device BOOT reload failed\n");
-+
-+      /* force us powered */
-+      reg_write(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD |
-+                                         LIS302DL_CTRL1_Xen |
-+                                         LIS302DL_CTRL1_Yen |
-+                                         LIS302DL_CTRL1_Zen);
-+      mdelay(1);
-+
-+      reg_write(lis, LIS302DL_REG_CTRL2, 0);
-+      reg_write(lis, LIS302DL_REG_CTRL3, LIS302DL_CTRL3_PP_OD |
-+                                                          LIS302DL_CTRL3_IHL);
-       reg_write(lis, LIS302DL_REG_FF_WU_THS_1, 0x14);
-       reg_write(lis, LIS302DL_REG_FF_WU_DURATION_1, 0x00);
-       reg_write(lis, LIS302DL_REG_FF_WU_CFG_1, 0x95);
-+      /* start off in powered down mode; we power up when someone opens us */
-       reg_write(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_Xen |
-                                          LIS302DL_CTRL1_Yen |
-                                          LIS302DL_CTRL1_Zen);
-@@ -494,8 +552,22 @@ static int lis302dl_resume(struct spi_device *spi)
-       /* get our IO to the device back in operational states */
-       (lis->pdata->lis302dl_suspend_io)(lis, 1);
-+      /* resume from powerdown first! */
-+      reg_write(lis, LIS302DL_REG_CTRL1, LIS302DL_CTRL1_PD |
-+                                         LIS302DL_CTRL1_Xen |
-+                                         LIS302DL_CTRL1_Yen |
-+                                         LIS302DL_CTRL1_Zen);
-+      mdelay(1);
-+
-+      if (__lis302dl_reset_device(lis))
-+              dev_err(&spi->dev, "device BOOT reload failed\n");
-+
-       /* restore registers after resume */
--      reg_write(lis, LIS302DL_REG_CTRL1, lis->regs[LIS302DL_REG_CTRL1]);
-+      reg_write(lis, LIS302DL_REG_CTRL1, lis->regs[LIS302DL_REG_CTRL1] |
-+                                              LIS302DL_CTRL1_PD |
-+                                              LIS302DL_CTRL1_Xen |
-+                                              LIS302DL_CTRL1_Yen |
-+                                              LIS302DL_CTRL1_Zen);
-       reg_write(lis, LIS302DL_REG_CTRL2, lis->regs[LIS302DL_REG_CTRL2]);
-       reg_write(lis, LIS302DL_REG_CTRL3, lis->regs[LIS302DL_REG_CTRL3]);
-       reg_write(lis, LIS302DL_REG_FF_WU_CFG_1,
-diff --git a/include/linux/lis302dl.h b/include/linux/lis302dl.h
-index 0d6b4c4..4d8ded9 100644
---- a/include/linux/lis302dl.h
-+++ b/include/linux/lis302dl.h
-@@ -66,6 +66,15 @@ enum lis302dl_reg_ctrl1 {
-       LIS302DL_CTRL1_DR               = 0x80,
- };
-+enum lis302dl_reg_ctrl2 {
-+      LIS302DL_CTRL2_HPC1             = 0x01,
-+      LIS302DL_CTRL2_HPC2             = 0x02,
-+      LIS302DL_CTRL2_HPFF1            = 0x04,
-+      LIS302DL_CTRL2_HPFF2            = 0x08,
-+      LIS302DL_CTRL2_FDS              = 0x10,
-+      LIS302DL_CTRL2_BOOT             = 0x40,
-+      LIS302DL_CTRL2_SIM              = 0x80,
-+};
- enum lis302dl_reg_ctrl3 {
-       LIS302DL_CTRL3_PP_OD            = 0x40,
-       LIS302DL_CTRL3_IHL              = 0x80,
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1191-fix-gsm-resume-problems.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1191-fix-gsm-resume-problems.patch.patch
deleted file mode 100755 (executable)
index ed2cd98..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-From 5bba01c998f5c88ab2337df915e135e0d950c7a9 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:16 +0100
-Subject: [PATCH] fix-gsm-resume-problems.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |   19 +++++++++++++++++++
- drivers/serial/s3c2410.c               |   19 ++++++++++++++++++-
- 2 files changed, 37 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index 149b866..6b6b2f4 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -18,6 +18,7 @@
- #include <linux/console.h>
- #include <linux/errno.h>
- #include <linux/interrupt.h>
-+#include <linux/resume-dependency.h>
- #include <asm/gpio.h>
- #include <asm/mach-types.h>
-@@ -33,9 +34,12 @@
- struct gta01pm_priv {
-       int gpio_ngsm_en;
-         int gpio_ndl_gsm;
-+
-       struct console *con;
- };
-+struct resume_dependency resume_dep_gsm_uart;
-+
- static struct gta01pm_priv gta01_gsm;
- static struct console *find_s3c24xx_console(void)
-@@ -179,6 +183,8 @@ static DEVICE_ATTR(reset, 0644, gsm_read, gsm_write);
- static DEVICE_ATTR(download, 0644, gsm_read, gsm_write);
- #ifdef CONFIG_PM
-+
-+static int gta01_gsm_resume(struct platform_device *pdev);
- static int gta01_gsm_suspend(struct platform_device *pdev, pm_message_t state)
- {
-       /* GPIO state is saved/restored by S3C2410 core GPIO driver, so we
-@@ -189,11 +195,22 @@ static int gta01_gsm_suspend(struct platform_device *pdev, pm_message_t state)
-       if (machine_is_neo1973_gta02())
-               s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, 1);
-+      /* register our resume dependency on the appropriate UART being up */
-+      resume_dep_gsm_uart.callback = gta01_gsm_resume;
-+      resume_dep_gsm_uart.context = (void *)pdev;
-+
-+      s3c24xx_serial_register_resume_dependency(&resume_dep_gsm_uart, 0);
-+
-       return 0;
- }
- static int gta01_gsm_resume(struct platform_device *pdev)
- {
-+      if (resume_dep_gsm_uart.called_flag != 1)
-+              return 0;
-+
-+      resume_dep_gsm_uart.called_flag++; /* only run once */
-+
-       /* GPIO state is saved/restored by S3C2410 core GPIO driver, so we
-        * don't need to do much here. */
-@@ -279,6 +296,8 @@ static int __init gta01_gsm_probe(struct platform_device *pdev)
-       if (machine_is_neo1973_gta02())
-               s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, 1);
-+      init_resume_dependency_list(&resume_dep_gsm_uart);
-+
-       return sysfs_create_group(&pdev->dev.kobj, &gta01_gsm_attr_group);
- }
-diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
-index bd87c79..32cceae 100644
---- a/drivers/serial/s3c2410.c
-+++ b/drivers/serial/s3c2410.c
-@@ -72,6 +72,7 @@
- #include <linux/serial.h>
- #include <linux/delay.h>
- #include <linux/clk.h>
-+#include <linux/resume-dependency.h>
- #include <asm/io.h>
- #include <asm/irq.h>
-@@ -112,6 +113,8 @@ struct s3c24xx_uart_port {
-       struct clk                      *clk;
-       struct clk                      *baudclk;
-       struct uart_port                port;
-+
-+      struct resume_dependency        resume_dependency;
- };
-@@ -1088,7 +1091,9 @@ static int s3c24xx_serial_probe(struct platform_device *dev,
-       ourport = &s3c24xx_serial_ports[probe_index];
-       probe_index++;
--      dbg("%s: initialising port %p...\n", __func__, ourport);
-+      init_resume_dependency_list(&ourport->resume_dependency);
-+
-+      dbg("%s: initialising port %p...\n", __FUNCTION__, ourport);
-       ret = s3c24xx_serial_init_port(ourport, info, dev);
-       if (ret < 0)
-@@ -1128,6 +1133,16 @@ static int s3c24xx_serial_suspend(struct platform_device *dev, pm_message_t stat
-       return 0;
- }
-+void s3c24xx_serial_register_resume_dependency(struct resume_dependency *
-+                                            resume_dependency, int uart_index)
-+{
-+      struct s3c24xx_uart_port *ourport = &s3c24xx_serial_ports[uart_index];
-+
-+      register_resume_dependency(&ourport->resume_dependency,
-+                                                           resume_dependency);
-+}
-+EXPORT_SYMBOL(s3c24xx_serial_register_resume_dependency);
-+
- static int s3c24xx_serial_resume(struct platform_device *dev)
- {
-       struct uart_port *port = s3c24xx_dev_to_port(&dev->dev);
-@@ -1141,6 +1156,8 @@ static int s3c24xx_serial_resume(struct platform_device *dev)
-               uart_resume_port(&s3c24xx_uart_drv, port);
-       }
-+      callback_all_resume_dependencies(&ourport->resume_dependency);
-+
-       return 0;
- }
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1192-introduce-resume-exception-capture.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1192-introduce-resume-exception-capture.patch.patch
deleted file mode 100755 (executable)
index 6f9b54d..0000000
+++ /dev/null
@@ -1,267 +0,0 @@
-From 081a639e9274072fbd34ee778188332ed972734e Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:16 +0100
-Subject: [PATCH] introduce-resume-exception-capture.patch
-
-This patch introduces a new resume debugging concept: if we
-get an OOPS inbetween starting suspend and finishing resume, it
-uses a new "emergency spew" device similar to BUT NOT REQUIRING
-CONFIG_DEBUG_LL to dump the syslog buffer and then the OOPS
-on the debug device defined by the existing CONFIG_DEBUG_S3C_UART
-index.  But neither CONFIG_DEBUG_LL nor the S3C low level configs
-are needed to use this feature.
-
-Another difference between this feature and CONFIG_DEBUG_LL is that
-it does not affect resume timing, ordering or UART traffic UNLESS
-there is an OOPS during resume.
-
-The patch adds three global exports, one to say if we are inside
-suspend / resume, and two callbacks for printk() to use to init
-and dump the emergency data.  The callbacks are set in s3c serial
-device init, but the whole structure is arch independent.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/serial/s3c2410.c |   77 +++++++++++++++++++++++++++++++++++++++++++++-
- include/linux/kernel.h   |    2 +
- include/linux/suspend.h  |    6 +++
- kernel/power/main.c      |    7 ++++
- kernel/printk.c          |   42 +++++++++++++++++++++++++
- 5 files changed, 133 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
-index 32cceae..f20f63b 100644
---- a/drivers/serial/s3c2410.c
-+++ b/drivers/serial/s3c2410.c
-@@ -81,6 +81,7 @@
- #include <asm/plat-s3c/regs-serial.h>
- #include <asm/arch/regs-gpio.h>
-+#include <asm/arch/regs-clock.h>
- /* structures */
-@@ -1170,7 +1171,13 @@ static int s3c24xx_serial_init(struct platform_driver *drv,
-                              struct s3c24xx_uart_info *info)
- {
-       dbg("s3c24xx_serial_init(%p,%p)\n", drv, info);
--      return platform_driver_register(drv);
-+        /* set up the emergency debug UART functions */
-+
-+        printk_emergency_debug_spew_init = s3c24xx_serial_force_debug_port_up;
-+        printk_emergency_debug_spew_send_string = s3c2410_printascii;
-+
-+        dbg("s3c24xx_serial_init(%p,%p)\n", drv, info);
-+        return platform_driver_register(drv);
- }
-@@ -1647,6 +1654,74 @@ static struct platform_driver s3c2412_serial_drv = {
-       },
- };
-+static void s3c24xx_serial_force_debug_port_up(void)
-+{
-+      struct s3c24xx_uart_port *ourport = &s3c24xx_serial_ports[
-+                                                       CONFIG_DEBUG_S3C_UART];
-+      struct s3c24xx_uart_clksrc *clksrc = NULL;
-+      struct clk *clk = NULL;
-+      unsigned long tmp;
-+
-+      s3c24xx_serial_getclk(&ourport->port, &clksrc, &clk, 115200);
-+
-+      tmp = __raw_readl(S3C2410_CLKCON);
-+
-+      /* re-start uart clocks */
-+      tmp |= S3C2410_CLKCON_UART0;
-+      tmp |= S3C2410_CLKCON_UART1;
-+      tmp |= S3C2410_CLKCON_UART2;
-+
-+      __raw_writel(tmp, S3C2410_CLKCON);
-+      udelay(10);
-+
-+      s3c24xx_serial_setsource(&ourport->port, clksrc);
-+
-+      if (ourport->baudclk != NULL && !IS_ERR(ourport->baudclk)) {
-+              clk_disable(ourport->baudclk);
-+              ourport->baudclk  = NULL;
-+      }
-+
-+      clk_enable(clk);
-+
-+      ourport->clksrc = clksrc;
-+      ourport->baudclk = clk;
-+}
-+
-+static void s3c2410_printascii(const char *sz)
-+{
-+      struct s3c24xx_uart_port *ourport = &s3c24xx_serial_ports[
-+                                                       CONFIG_DEBUG_S3C_UART];
-+      struct uart_port *port = &ourport->port;
-+
-+      /* 8 N 1 */
-+      wr_regl(port, S3C2410_ULCON, (rd_regl(port, S3C2410_ULCON)) | 3);
-+      /* polling mode */
-+      wr_regl(port, S3C2410_UCON, (rd_regl(port, S3C2410_UCON) & ~0xc0f) | 5);
-+      /* disable FIFO */
-+      wr_regl(port, S3C2410_UFCON, (rd_regl(port, S3C2410_UFCON) & ~0x01));
-+      /* fix baud rate */
-+      wr_regl(port, S3C2410_UBRDIV, 26);
-+
-+      while (*sz) {
-+              int timeout = 10000000;
-+
-+              /* spin on it being busy */
-+              while ((!(rd_regl(port, S3C2410_UTRSTAT) & 2)) && timeout--)
-+                      ;
-+
-+              /* transmit register */
-+              wr_regl(port, S3C2410_UTXH, *sz);
-+
-+              sz++;
-+      }
-+}
-+
-+
-+/* s3c24xx_serial_resetport
-+ *
-+ * wrapper to call the specific reset for this port (reset the fifos
-+ * and the settings)
-+*/
- static inline int s3c2412_serial_init(void)
- {
-diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index 2e70006..fcad89e 100644
---- a/include/linux/kernel.h
-+++ b/include/linux/kernel.h
-@@ -198,6 +198,8 @@ extern int __ratelimit(int ratelimit_jiffies, int ratelimit_burst);
- extern int __printk_ratelimit(int ratelimit_jiffies, int ratelimit_burst);
- extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
-                                  unsigned int interval_msec);
-+extern void (*printk_emergency_debug_spew_init)(void);
-+extern void (*printk_emergency_debug_spew_send_string)(const char *);
- #else
- static inline int vprintk(const char *s, va_list args)
-       __attribute__ ((format (printf, 1, 0)));
-diff --git a/include/linux/suspend.h b/include/linux/suspend.h
-index a697742..8164615 100644
---- a/include/linux/suspend.h
-+++ b/include/linux/suspend.h
-@@ -140,6 +140,12 @@ struct pbe {
-       struct pbe *next;
- };
-+/**
-+ * global indication we are somewhere between start of suspend and end of
-+ * resume, nonzero is true
-+ */
-+extern int global_inside_suspend;
-+
- /* mm/page_alloc.c */
- extern void mark_free_pages(struct zone *zone);
-diff --git a/kernel/power/main.c b/kernel/power/main.c
-index 6a6d5eb..1169648 100644
---- a/kernel/power/main.c
-+++ b/kernel/power/main.c
-@@ -130,6 +130,9 @@ static inline int suspend_test(int level) { return 0; }
- #endif /* CONFIG_PM_SLEEP */
-+int global_inside_suspend;
-+EXPORT_SYMBOL(global_inside_suspend);
-+
- #ifdef CONFIG_SUSPEND
- /* This is just an arbitrary number */
-@@ -258,6 +261,8 @@ int suspend_devices_and_enter(suspend_state_t state)
-       if (!suspend_ops)
-               return -ENOSYS;
-+      global_inside_suspend = 1;
-+
-       if (suspend_ops->begin) {
-               error = suspend_ops->begin(state);
-               if (error)
-@@ -297,6 +302,8 @@ int suspend_devices_and_enter(suspend_state_t state)
-  Close:
-       if (suspend_ops->end)
-               suspend_ops->end();
-+      global_inside_suspend = 0;
-+
-       return error;
- }
-diff --git a/kernel/printk.c b/kernel/printk.c
-index e2129e8..00df30e 100644
---- a/kernel/printk.c
-+++ b/kernel/printk.c
-@@ -32,8 +32,12 @@
- #include <linux/security.h>
- #include <linux/bootmem.h>
- #include <linux/syscalls.h>
-+#include <linux/jiffies.h>
-+#include <linux/suspend.h>
- #include <asm/uaccess.h>
-+#include <asm/plat-s3c24xx/neo1973.h>
-+#include <asm/arch/gta02.h>
- /*
-  * Architectures can override it:
-@@ -67,6 +71,12 @@ int console_printk[4] = {
- int oops_in_progress;
- EXPORT_SYMBOL(oops_in_progress);
-+void (*printk_emergency_debug_spew_init)(void) = NULL;
-+EXPORT_SYMBOL(printk_emergency_debug_spew_init);
-+
-+void (*printk_emergency_debug_spew_send_string)(const char *) = NULL;
-+EXPORT_SYMBOL(printk_emergency_debug_spew_send_string);
-+
- /*
-  * console_sem protects the console_drivers list, and also
-  * provides serialisation for access to the entire console
-@@ -718,6 +728,38 @@ asmlinkage int vprintk(const char *fmt, va_list args)
-       printed_len += vscnprintf(printk_buf + printed_len,
-                                 sizeof(printk_buf) - printed_len, fmt, args);
-+      /* if you're debugging resume, the normal methods can change resume
-+       * ordering behaviours because their debugging output is synchronous
-+       * (ie, CONFIG_DEBUG_LL).  If your problem is an OOPS, this code
-+       * will not affect the speed and duration and ordering of resume
-+       * actions, but will give you a chance to read the full undumped
-+       * syslog AND the OOPS data when it happens
-+       *
-+       * if you support it, your debug device init can override the exported
-+       * emergency_debug_spew_init and emergency_debug_spew_send_string to
-+       * usually force polling or bitbanging on your debug console device
-+       */
-+      if (oops_in_progress && global_inside_suspend &&
-+          printk_emergency_debug_spew_init &&
-+          printk_emergency_debug_spew_send_string) {
-+              unsigned long cur_index;
-+              char ch[2];
-+
-+              if (global_inside_suspend == 1) {
-+                      (printk_emergency_debug_spew_init)();
-+
-+                      ch[1] = '\0';
-+                      cur_index = con_start;
-+                      while (cur_index != log_end) {
-+                              ch[0] = LOG_BUF(cur_index);
-+                              (printk_emergency_debug_spew_send_string)(ch);
-+                              cur_index++;
-+                      }
-+                      global_inside_suspend++; /* only once */
-+              }
-+              (printk_emergency_debug_spew_send_string)(printk_buf);
-+      }
-+
-       /*
-        * Copy the output into log_buf.  If the caller didn't provide
-        * appropriate log level tags, we insert them here
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1193-tracking-defconfig-2.6.26-rc7.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1193-tracking-defconfig-2.6.26-rc7.patch.patch
deleted file mode 100755 (executable)
index d905db5..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-From 4bd00099b2d2582e77f74b750594efdcab54f28d Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:16 +0100
-Subject: [PATCH] tracking-defconfig-2.6.26-rc7.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- defconfig-2.6.26 |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/defconfig-2.6.26 b/defconfig-2.6.26
-index 582d7ab..d9a3549 100644
---- a/defconfig-2.6.26
-+++ b/defconfig-2.6.26
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
--# Linux kernel version: 2.6.26-rc5
--# Thu Jun  5 11:26:39 2008
-+# Linux kernel version: 2.6.26-rc7
-+# Sun Jun 22 08:25:07 2008
- #
- CONFIG_ARM=y
- CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-@@ -1542,6 +1542,7 @@ CONFIG_RTC_INTF_DEV=y
- # CONFIG_RTC_DRV_PCF8583 is not set
- # CONFIG_RTC_DRV_M41T80 is not set
- # CONFIG_RTC_DRV_S35390A is not set
-+# CONFIG_RTC_DRV_FM3130 is not set
- #
- # SPI RTC drivers
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1194-tracking-2.6.26-rc7-repeat-cdev-removal-pcf50633.pat.patch b/target/linux/s3c24xx/patches-2.6.26/1194-tracking-2.6.26-rc7-repeat-cdev-removal-pcf50633.pat.patch
deleted file mode 100755 (executable)
index be3c092..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-From eedd1e2e0b89f085bf36f70cd9ca79a55eb7fde3 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:17 +0100
-Subject: [PATCH] tracking-2.6.26-rc7-repeat-cdev-removal-pcf50633.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 4cb333c..62bd2d5 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -2143,7 +2143,6 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
-       pcf->input_dev->name = "GTA02 PMU events";
-       pcf->input_dev->phys = "FIXME";
-       pcf->input_dev->id.bustype = BUS_I2C;
--      pcf->input_dev->cdev.dev = &new_client->dev;
-       pcf->input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_PWR);
-       set_bit(KEY_POWER, pcf->input_dev->keybit);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1195-From-119f4e02ba81cffe4dbc88d8ff667048ad28d925-Mon-Se.patch b/target/linux/s3c24xx/patches-2.6.26/1195-From-119f4e02ba81cffe4dbc88d8ff667048ad28d925-Mon-Se.patch
deleted file mode 100755 (executable)
index 1e4adc7..0000000
+++ /dev/null
@@ -1,322 +0,0 @@
-From 1cc62cde7f9717e9349f4b117900bd17750e4bf2 Mon Sep 17 00:00:00 2001
-From: Andrzej Zaborowski <balrog@zabor.org>
-Date: Fri, 25 Jul 2008 23:06:17 +0100
-Subject: [PATCH] From 119f4e02ba81cffe4dbc88d8ff667048ad28d925 Mon Sep 17 00:00:00 2001
- Subject: [PATCH] Hacky CONFIG_NO_IDLE_HZ (dyn-tick) support for S3C24xx.
-
----
- arch/arm/plat-s3c24xx/time.c |  247 +++++++++++++++++++++++++++++++++++-------
- 1 files changed, 209 insertions(+), 38 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/time.c b/arch/arm/plat-s3c24xx/time.c
-index 03b8643..8b101e0 100644
---- a/arch/arm/plat-s3c24xx/time.c
-+++ b/arch/arm/plat-s3c24xx/time.c
-@@ -3,6 +3,8 @@
-  * Copyright (C) 2003-2005 Simtec Electronics
-  *    Ben Dooks, <ben@simtec.co.uk>
-  *
-+ * dyn_tick support by Andrzej Zaborowski based on omap_dyn_tick_timer.
-+ *
-  * 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
-@@ -44,6 +46,9 @@ static unsigned long timer_startval;
- static unsigned long timer_usec_ticks;
- static struct work_struct resume_work;
-+unsigned long pclk;
-+struct clk *clk;
-+
- #define TIMER_USEC_SHIFT 16
- /* we use the shifted arithmetic to work out the ratio of timer ticks
-@@ -178,11 +183,7 @@ static void s3c2410_timer_setup (void)
-               tcfg1 &= ~S3C2410_TCFG1_MUX4_MASK;
-               tcfg1 |= S3C2410_TCFG1_MUX4_TCLK1;
-       } else {
--              unsigned long pclk;
--              struct clk *clk;
--
--              /* for the h1940 (and others), we use the pclk from the core
--               * to generate the timer values. since values around 50 to
-+              /* since values around 50 to
-                * 70MHz are not values we can directly generate the timer
-                * value from, we need to pre-scale and divide before using it.
-                *
-@@ -190,20 +191,7 @@ static void s3c2410_timer_setup (void)
-                * (8.45 ticks per usec)
-                */
--              /* this is used as default if no other timer can be found */
--
--              clk = clk_get(NULL, "timers");
--              if (IS_ERR(clk))
--                      panic("failed to get clock for system timer");
--
--              clk_enable(clk);
--
--              pclk = clk_get_rate(clk);
--
--              printk("pclk = %lu\n", pclk);
--
-               /* configure clock tick */
--
-               timer_usec_ticks = timer_mask_usec_ticks(6, pclk);
-               printk("timer_usec_ticks = %lu\n", timer_usec_ticks);
-@@ -214,11 +202,6 @@ static void s3c2410_timer_setup (void)
-               tcfg0 |= ((6 - 1) / 2) << S3C2410_TCFG_PRESCALER1_SHIFT;
-               tcnt = (pclk / 6) / HZ;
--
--              /* start the timer running */
--              tcon |= S3C2410_TCON_T4START | S3C2410_TCON_T4RELOAD;
--              tcon &= ~S3C2410_TCON_T4MANUALUPD;
--              __raw_writel(tcon, S3C2410_TCON);
-       }
-       /* timers reload after counting zero, so reduce the count by 1 */
-@@ -260,27 +243,37 @@ static void s3c2410_timer_setup (void)
- }
-+struct sys_timer s3c24xx_timer;
- static void timer_resume_work(struct work_struct *work)
- {
--      s3c2410_timer_setup();
--}
--
--/* ooh a nasty situation arises if we try to call s3c2410_timer_setup() from
-- * the resume handler.  It is called in atomic context but the clock APIs
-- * try to lock a mutex which may sleep.  We are in a bit of an unusual
-- * situation because we don't have a tick source right now, but it should be
-- * okay to try to schedule a work item... hopefully
-- */
--
--static void s3c2410_timer_resume_atomic(void)
--{
--      int ret = schedule_work(&resume_work);
--      if (!ret)
--              printk(KERN_INFO"Failed to schedule_work tick ctr (%d)\n", ret);
-+      clk_enable(clk);
-+
-+#ifdef CONFIG_NO_IDLE_HZ
-+      if (s3c24xx_timer.dyn_tick->state & DYN_TICK_ENABLED)
-+              s3c24xx_timer.dyn_tick->enable();
-+      else
-+#endif
-+              s3c2410_timer_setup();
- }
- static void __init s3c2410_timer_init (void)
- {
-+      if (!use_tclk1_12()) {
-+              /* for the h1940 (and others), we use the pclk from the core
-+               * to generate the timer values.
-+               */
-+
-+              /* this is used as default if no other timer can be found */
-+              clk = clk_get(NULL, "timers");
-+              if (IS_ERR(clk))
-+                      panic("failed to get clock for system timer");
-+
-+              clk_enable(clk);
-+
-+              pclk = clk_get_rate(clk);
-+              printk("pclk = %lu\n", pclk);
-+      }
-+
-       INIT_WORK(&resume_work, timer_resume_work);
-       s3c2410_timer_setup();
-       setup_irq(IRQ_TIMER4, &s3c2410_timer_irq);
-@@ -302,8 +295,186 @@ static void s3c2410_timer_resume(void)
-                   "s3c2410_timer_resume_work already queued ???\n");
- }
-+#ifdef CONFIG_NO_IDLE_HZ
-+/*
-+ * We'll set a constant prescaler so we don't have to bother setting it
-+ * when reprogramming and so that we avoid costly divisions.
-+ *
-+ * (2 * HZ) << INPUT_FREQ_SHIFT is the desired frequency after prescaler.
-+ * At HZ == 200, HZ * 1024 should work for PCLKs of up to ~53.5 MHz.
-+ */
-+#define INPUT_FREQ_SHIFT      9
-+
-+static int ticks_last;
-+static int ticks_left;
-+static uint32_t tcnto_last;
-+
-+static inline int s3c24xx_timer_read(void)
-+{
-+      uint32_t tcnto = __raw_readl(S3C2410_TCNTO(4));
-+
-+      /*
-+       * WARNING: sometimes we get called before TCNTB has been
-+       * loaded into the counter and TCNTO then returns its previous
-+       * value and kill us, so don't do anything before counter is
-+       * reloaded.
-+       */
-+      if (unlikely(tcnto == tcnto_last))
-+              return ticks_last;
-+
-+      tcnto_last = -1;
-+      return tcnto <<
-+              ((__raw_readl(S3C2410_TCFG1) >> S3C2410_TCFG1_MUX4_SHIFT) & 3);
-+}
-+
-+static inline void s3c24xx_timer_program(int ticks)
-+{
-+      uint32_t tcon = __raw_readl(S3C2410_TCON) & ~(7 << 20);
-+      uint32_t tcfg1 = __raw_readl(S3C2410_TCFG1) & ~S3C2410_TCFG1_MUX4_MASK;
-+
-+      /* Just make sure the timer is stopped.  */
-+      __raw_writel(tcon, S3C2410_TCON);
-+
-+      /* TODO: add likely()ies / unlikely()ies */
-+      if (ticks >> 18) {
-+              ticks_last = min(ticks, 0xffff << 3);
-+              ticks_left = ticks - ticks_last;
-+              __raw_writel(tcfg1 | S3C2410_TCFG1_MUX4_DIV16, S3C2410_TCFG1);
-+              __raw_writel(ticks_last >> 3, S3C2410_TCNTB(4));
-+      } else if (ticks >> 17) {
-+              ticks_last = ticks;
-+              ticks_left = 0;
-+              __raw_writel(tcfg1 | S3C2410_TCFG1_MUX4_DIV8, S3C2410_TCFG1);
-+              __raw_writel(ticks_last >> 2, S3C2410_TCNTB(4));
-+      } else if (ticks >> 16) {
-+              ticks_last = ticks;
-+              ticks_left = 0;
-+              __raw_writel(tcfg1 | S3C2410_TCFG1_MUX4_DIV4, S3C2410_TCFG1);
-+              __raw_writel(ticks_last >> 1, S3C2410_TCNTB(4));
-+      } else {
-+              ticks_last = ticks;
-+              ticks_left = 0;
-+              __raw_writel(tcfg1 | S3C2410_TCFG1_MUX4_DIV2, S3C2410_TCFG1);
-+              __raw_writel(ticks_last >> 0, S3C2410_TCNTB(4));
-+      }
-+
-+      tcnto_last = __raw_readl(S3C2410_TCNTO(4));
-+      __raw_writel(tcon | S3C2410_TCON_T4MANUALUPD,
-+                      S3C2410_TCON);
-+      __raw_writel(tcon | S3C2410_TCON_T4START,
-+                      S3C2410_TCON);
-+}
-+
-+/*
-+ * If we have already waited all the time we were supposed to wait,
-+ * kick the timer, setting the longest allowed timeout value just
-+ * for time-keeping.
-+ */
-+static inline void s3c24xx_timer_program_idle(void)
-+{
-+      s3c24xx_timer_program(0xffff << 3);
-+}
-+
-+static inline void s3c24xx_timer_update(int restart)
-+{
-+      int ticks_cur = s3c24xx_timer_read();
-+      int jiffies_elapsed = (ticks_last - ticks_cur) >> INPUT_FREQ_SHIFT;
-+      int subjiffy = ticks_last - (jiffies_elapsed << INPUT_FREQ_SHIFT);
-+
-+      if (restart) {
-+              if (ticks_left >= (1 << INPUT_FREQ_SHIFT))
-+                      s3c24xx_timer_program(ticks_left);
-+              else
-+                      s3c24xx_timer_program_idle();
-+              ticks_last += subjiffy;
-+      } else
-+              ticks_last = subjiffy;
-+
-+      while (jiffies_elapsed --)
-+              timer_tick();
-+}
-+
-+/* Called when the timer expires.  */
-+static irqreturn_t s3c24xx_timer_handler(int irq, void *dev_id)
-+{
-+      tcnto_last = -1;
-+      s3c24xx_timer_update(1);
-+
-+      return IRQ_HANDLED;
-+}
-+
-+/* Called to update jiffies with time elapsed.  */
-+static irqreturn_t s3c24xx_timer_handler_dyn_tick(int irq, void *dev_id)
-+{
-+      s3c24xx_timer_update(0);
-+
-+      return IRQ_HANDLED;
-+}
-+
-+/*
-+ * Programs the next timer interrupt needed.  Called when dynamic tick is
-+ * enabled, and to reprogram the ticks to skip from pm_idle.  The CPU goes
-+ * to sleep directly after this.
-+ */
-+static void s3c24xx_timer_reprogram_dyn_tick(unsigned long next_jiffies)
-+{
-+      int subjiffy_left = ticks_last - s3c24xx_timer_read();
-+
-+      s3c24xx_timer_program(max((int) next_jiffies, 1) << INPUT_FREQ_SHIFT);
-+      ticks_last += subjiffy_left;
-+}
-+
-+static unsigned long s3c24xx_timer_offset_dyn_tick(void)
-+{
-+      /* TODO */
-+      return 0;
-+}
-+
-+static int s3c24xx_timer_enable_dyn_tick(void)
-+{
-+      /* Set our constant prescaler.  */
-+      uint32_t tcfg0 = __raw_readl(S3C2410_TCFG0);
-+      int prescaler =
-+              max(min(256, (int) pclk / (HZ << (INPUT_FREQ_SHIFT + 1))), 1);
-+
-+      tcfg0 &= ~S3C2410_TCFG_PRESCALER1_MASK;
-+      tcfg0 |= (prescaler - 1) << S3C2410_TCFG_PRESCALER1_SHIFT;
-+      __raw_writel(tcfg0, S3C2410_TCFG0);
-+
-+      /* Override handlers.  */
-+      s3c2410_timer_irq.handler = s3c24xx_timer_handler;
-+      s3c24xx_timer.offset = s3c24xx_timer_offset_dyn_tick;
-+
-+      printk(KERN_INFO "dyn_tick enabled on s3c24xx timer 4, "
-+                      "%li Hz pclk with prescaler %i\n", pclk, prescaler);
-+
-+      s3c24xx_timer_program_idle();
-+
-+      return 0;
-+}
-+
-+static int s3c24xx_timer_disable_dyn_tick(void)
-+{
-+      s3c2410_timer_irq.handler = s3c2410_timer_interrupt;
-+      s3c24xx_timer.offset = s3c2410_gettimeoffset;
-+      s3c2410_timer_setup();
-+
-+      return 0;
-+}
-+
-+static struct dyn_tick_timer s3c24xx_dyn_tick_timer = {
-+      .enable         = s3c24xx_timer_enable_dyn_tick,
-+      .disable        = s3c24xx_timer_disable_dyn_tick,
-+      .reprogram      = s3c24xx_timer_reprogram_dyn_tick,
-+      .handler        = s3c24xx_timer_handler_dyn_tick,
-+};
-+#endif        /* CONFIG_NO_IDLE_HZ */
-+
- struct sys_timer s3c24xx_timer = {
-       .init           = s3c2410_timer_init,
-       .offset         = s3c2410_gettimeoffset,
-       .resume         = s3c2410_timer_resume,
-+#ifdef CONFIG_NO_IDLE_HZ
-+      .dyn_tick       = &s3c24xx_dyn_tick_timer,
-+#endif
- };
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1196-From-ae3f72fc608fcd0a98a980a335ac4dc7ad95b221-Mon-Se.patch b/target/linux/s3c24xx/patches-2.6.26/1196-From-ae3f72fc608fcd0a98a980a335ac4dc7ad95b221-Mon-Se.patch
deleted file mode 100755 (executable)
index e71add5..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From 316903324da99ec34308d740b1d8851690504041 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:17 +0100
-Subject: [PATCH] From ae3f72fc608fcd0a98a980a335ac4dc7ad95b221 Mon Sep 17 00:00:00 2001
- Subject: [PATCH] [bq27000] Make the checkpatch.pl happy
-
----
- drivers/power/bq27000_battery.c |    7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/power/bq27000_battery.c b/drivers/power/bq27000_battery.c
-index aee8018..652a9fa 100644
---- a/drivers/power/bq27000_battery.c
-+++ b/drivers/power/bq27000_battery.c
-@@ -179,7 +179,9 @@ static int bq27000_battery_get_property(struct power_supply *psy,
-               v = hdq_read16(di, BQ27000_AI_L);
-               if (v < 0)
-                       return v;
--              if (v < 2) { /* no real activity on the battery */
-+
-+              /* no real activity on the battery */
-+              if (v < 2) {
-                       if (!hdq_read16(di, BQ27000_TTF_L))
-                               val->intval = POWER_SUPPLY_STATUS_FULL;
-                       else
-@@ -199,7 +201,8 @@ static int bq27000_battery_get_property(struct power_supply *psy,
-               v = hdq_read16(di, BQ27000_VOLT_L);
-               if (v < 0)
-                       return v;
--              val->intval = v * 1000; /* mV -> uV */
-+              /* mV -> uV */
-+              val->intval = v * 1000;
-               break;
-       case POWER_SUPPLY_PROP_CURRENT_NOW:
-               v = (di->hdq_read)(BQ27000_FLAGS);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1197-From-683ef8067815f6ba0ede73fa71973823726213a3-Mon-Se.patch b/target/linux/s3c24xx/patches-2.6.26/1197-From-683ef8067815f6ba0ede73fa71973823726213a3-Mon-Se.patch
deleted file mode 100755 (executable)
index 7a81268..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From 88d4ef52c0b77479032e0eb319e936c9306f1d19 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:17 +0100
-Subject: [PATCH] From 683ef8067815f6ba0ede73fa71973823726213a3 Mon Sep 17 00:00:00 2001
- Subject: [PATCH] [janitor] Make checkpatch happy on the header files
-
----
- include/linux/pcf50606.h |    2 +-
- include/linux/pcf50633.h |    2 +-
- include/linux/pcf506xx.h |    2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/linux/pcf50606.h b/include/linux/pcf50606.h
-index 167328f..b17d35b 100644
---- a/include/linux/pcf50606.h
-+++ b/include/linux/pcf50606.h
-@@ -85,7 +85,7 @@ struct pcf50606_platform_data {
-       struct {
-               u_int8_t mbcc3; /* charger voltage / current */
-       } charger;
--      pmu_cb *cb;
-+      pmu_cb cb;
- };
- #endif
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index 4653285..b4d65dc 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -176,7 +176,7 @@ struct pcf50633_platform_data {
-       struct {
-               u_int8_t mbcc3; /* charger voltage / current */
-       } charger;
--      pmu_cb *cb;
-+      pmu_cb cb;
-       /* post-resume backlight bringup */
-       int defer_resume_backlight;
-diff --git a/include/linux/pcf506xx.h b/include/linux/pcf506xx.h
-index 9069bd4..a1365e0 100644
---- a/include/linux/pcf506xx.h
-+++ b/include/linux/pcf506xx.h
-@@ -26,7 +26,7 @@ enum pmu_event {
-       __NUM_PMU_EVTS
- };
--typedef int pmu_cb(struct device *dev, unsigned int feature,
-+typedef int (*pmu_cb)(struct device *dev, unsigned int feature,
-                  enum pmu_event event);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1198-From-000450f1ad2c713d2345a872fdf44f5dd3702e1b-Mon-Se.patch b/target/linux/s3c24xx/patches-2.6.26/1198-From-000450f1ad2c713d2345a872fdf44f5dd3702e1b-Mon-Se.patch
deleted file mode 100755 (executable)
index 4f16506..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-From 27c725b62c2bb683ff13ade991838f6aef880547 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:17 +0100
-Subject: [PATCH] From 000450f1ad2c713d2345a872fdf44f5dd3702e1b Mon Sep 17 00:00:00 2001
- Subject: [PATCH] [janitor] make checkpatch.pl happy
-
----
- drivers/i2c/chips/pcf50606.c |   25 ++++++++++++++-----------
- 1 files changed, 14 insertions(+), 11 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
-index 50f944f..4218917 100644
---- a/drivers/i2c/chips/pcf50606.c
-+++ b/drivers/i2c/chips/pcf50606.c
-@@ -79,12 +79,12 @@ I2C_CLIENT_INSMOD_1(pcf50606);
- #define PCF50606_B_CHG_PROT   4       /* Charger Protection */
- #define PCF50606_B_CHG_READY  5       /* Charging completed */
--#define PCF50606_F_CHG_FAST   (1<<PCF50606_B_CHG_FAST)        /* Charger Fast allowed */
--#define PCF50606_F_CHG_PRESENT        (1<<PCF50606_B_CHG_PRESENT)     /* Charger present */
--#define PCF50606_F_CHG_FOK    (1<<PCF50606_B_CHG_FOK) /* Fast OK for battery */
--#define PCF50606_F_CHG_ERR    (1<<PCF50606_B_CHG_ERR) /* Charger Error */
--#define PCF50606_F_CHG_PROT   (1<<PCF50606_B_CHG_PROT)        /* Charger Protection */
--#define PCF50606_F_CHG_READY  (1<<PCF50606_B_CHG_READY)       /* Charging completed */
-+#define PCF50606_F_CHG_FAST   (1<<PCF50606_B_CHG_FAST)
-+#define PCF50606_F_CHG_PRESENT        (1<<PCF50606_B_CHG_PRESENT)
-+#define PCF50606_F_CHG_FOK    (1<<PCF50606_B_CHG_FOK)
-+#define PCF50606_F_CHG_ERR    (1<<PCF50606_B_CHG_ERR)
-+#define PCF50606_F_CHG_PROT   (1<<PCF50606_B_CHG_PROT)
-+#define PCF50606_F_CHG_READY  (1<<PCF50606_B_CHG_READY)
- #define PCF50606_F_CHG_MASK   0x000000fc
- #define PCF50606_F_PWR_PRESSED        0x00000100
-@@ -598,7 +598,8 @@ static void pcf50606_work(struct work_struct *work)
-                       pcf->flags |= PCF50606_F_CHG_PRESENT;
-                       if (pcf->pdata->cb)
-                               pcf->pdata->cb(&pcf->client.dev,
--                                      PCF50606_FEAT_MBC, PMU_EVT_INSERT);
-+                                              PCF50606_FEAT_MBC,
-+                                              PMU_EVT_INSERT);
-               }
-               pcf->coldplug_done = 1;
-@@ -988,7 +989,8 @@ EXPORT_SYMBOL_GPL(pcf50606_charge_fast);
- static inline u_int16_t adc_to_rntc(struct pcf50606_data *pcf, u_int16_t adc)
- {
--      u_int32_t r_ntc = (adc * (u_int32_t)pcf->pdata->r_fix_batt) / (1023 - adc);
-+      u_int32_t r_ntc = (adc * (u_int32_t)pcf->pdata->r_fix_batt)
-+              / (1023 - adc);
-       return r_ntc;
- }
-@@ -1290,8 +1292,9 @@ static int pcf50606_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
-       struct pcf50606_time pcf_tm;
-       mutex_lock(&pcf->lock);
--      alrm->enabled = 
--             __reg_read(pcf, PCF50606_REG_INT1M) & PCF50606_INT1_ALARM ? 0 : 1;
-+      alrm->enabled =
-+              __reg_read(pcf, PCF50606_REG_INT1M) & PCF50606_INT1_ALARM
-+              ? 0 : 1;
-       pcf_tm.sec = __reg_read(pcf, PCF50606_REG_RTCSCA);
-       pcf_tm.min = __reg_read(pcf, PCF50606_REG_RTCMNA);
-       pcf_tm.hour = __reg_read(pcf, PCF50606_REG_RTCHRA);
-@@ -1665,7 +1668,7 @@ static int pcf50606_detect(struct i2c_adapter *adapter, int address, int kind)
-               return -ENOMEM;
-       mutex_init(&data->lock);
--      mutex_init(&data->working_lock);
-+      mutex_init(&data->working_lock);
-       INIT_WORK(&data->work, pcf50606_work);
-       data->irq = irq;
-       data->working = 0;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1199-From-5718bde77ed1a75e0fd2cdf5e099e66121d10c0a-Mon-Se.patch b/target/linux/s3c24xx/patches-2.6.26/1199-From-5718bde77ed1a75e0fd2cdf5e099e66121d10c0a-Mon-Se.patch
deleted file mode 100755 (executable)
index 456c0b1..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-From 76e50bb39e4362b6c073cfea8bd323f6fe146119 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:17 +0100
-Subject: [PATCH] From 5718bde77ed1a75e0fd2cdf5e099e66121d10c0a Mon Sep 17 00:00:00 2001
- Subject: [PATCH] [battery] Make the bq27000 send an uevent when the charging state possible changed
-      Remove the todo entries from the pcf50633, make the mach-gta02
-      call the bq27000 driver from the pmu callback.
-
----
- arch/arm/mach-s3c2440/mach-gta02.c |   36 +++++++++++++++++++-----------------
- drivers/i2c/chips/pcf50633.c       |    4 ----
- drivers/power/bq27000_battery.c    |   11 +++++++++++
- include/linux/bq27000_battery.h    |    2 ++
- 4 files changed, 32 insertions(+), 21 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index afe8039..e66498b 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -450,6 +450,24 @@ static struct s3c2410_uartcfg gta02_uartcfgs[] = {
- };
-+/* BQ27000 Battery */
-+
-+struct bq27000_platform_data bq27000_pdata = {
-+      .name = "bat",
-+      .rsense_mohms = 20,
-+      .hdq_read = gta02hdq_read,
-+      .hdq_write = gta02hdq_write,
-+      .hdq_initialized = gta02hdq_initialized,
-+};
-+
-+struct platform_device bq27000_battery_device = {
-+      .name           = "bq27000-battery",
-+      .dev = {
-+              .platform_data = &bq27000_pdata,
-+      },
-+};
-+
-+
- /* PMU driver info */
- static int pmu_callback(struct device *dev, unsigned int feature,
-@@ -482,6 +500,7 @@ static int pmu_callback(struct device *dev, unsigned int feature,
-               break;
-       }
-+      bq27000_charging_state_change(&bq27000_battery_device);
-       return 0;
- }
-@@ -740,23 +759,6 @@ struct platform_device gta02_hdq_device = {
- };
- #endif
--/* BQ27000 Battery */
--
--struct bq27000_platform_data bq27000_pdata = {
--      .name = "bat",
--      .rsense_mohms = 20,
--      .hdq_read = gta02hdq_read,
--      .hdq_write = gta02hdq_write,
--      .hdq_initialized = gta02hdq_initialized,
--};
--
--struct platform_device bq27000_battery_device = {
--      .name           = "bq27000-battery",
--      .dev = {
--              .platform_data = &bq27000_pdata,
--      },
--};
--
- /* NOR Flash */
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 62bd2d5..4be6cd3 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -888,8 +888,6 @@ static void pcf50633_work(struct work_struct *work)
-               if (pcf->pdata->cb)
-                       pcf->pdata->cb(&pcf->client.dev,
-                                      PCF50633_FEAT_MBC, PMU_EVT_INSERT);
--              /* FIXME: signal this to userspace */
--              //kobject_uevent( ,KOBJ_ADD);
-       }
-       if (pcfirq[0] & PCF50633_INT1_ADPREM) {
-               /* Charger removed */
-@@ -900,8 +898,6 @@ static void pcf50633_work(struct work_struct *work)
-               if (pcf->pdata->cb)
-                       pcf->pdata->cb(&pcf->client.dev,
-                                      PCF50633_FEAT_MBC, PMU_EVT_REMOVE);
--              /* FIXME: signal this to userspace */
--              //kobject_uevent( ,KOBJ_ADD);
-       }
-       if (pcfirq[0] & PCF50633_INT1_USBINS) {
-               DEBUGPC("USBINS ");
-diff --git a/drivers/power/bq27000_battery.c b/drivers/power/bq27000_battery.c
-index 652a9fa..5598568 100644
---- a/drivers/power/bq27000_battery.c
-+++ b/drivers/power/bq27000_battery.c
-@@ -329,6 +329,17 @@ static int bq27000_battery_remove(struct platform_device *pdev)
-       return 0;
- }
-+void bq27000_charging_state_change(struct platform_device *pdev)
-+{
-+      struct bq27000_device_info *di = platform_get_drvdata(pdev);
-+
-+      if (!di)
-+          return;
-+
-+      power_supply_changed(&di->bat);
-+}
-+EXPORT_SYMBOL_GPL(bq27000_charging_state_change);
-+
- #ifdef CONFIG_PM
- static int bq27000_battery_suspend(struct platform_device *pdev,
-diff --git a/include/linux/bq27000_battery.h b/include/linux/bq27000_battery.h
-index 36b4f20..fed4287 100644
---- a/include/linux/bq27000_battery.h
-+++ b/include/linux/bq27000_battery.h
-@@ -1,6 +1,8 @@
- #ifndef __BQ27000_BATTERY_H__
- #define __BQ27000_BATTERY_H__
-+void bq27000_charging_state_change(struct platform_device *pdev);
-+
- struct bq27000_platform_data {
-       const char      *name;
-       int             rsense_mohms;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1200-From-c221bb27c8e22daa451e26353140777223d397d2-Mon-Se.patch b/target/linux/s3c24xx/patches-2.6.26/1200-From-c221bb27c8e22daa451e26353140777223d397d2-Mon-Se.patch
deleted file mode 100755 (executable)
index 3331ed8..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-From 1e8163901ed89e4849a1c9e304d140e043cc2b9f Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:17 +0100
-Subject: [PATCH] From c221bb27c8e22daa451e26353140777223d397d2 Mon Sep 17 00:00:00 2001
- Subject: [PATCH] [pcf50633] Report more events to userspace using the default callback
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- drivers/i2c/chips/pcf50633.c |   20 +++++++++++++++-----
- include/linux/pcf506xx.h     |    1 +
- 2 files changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 4be6cd3..ead4273 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1036,25 +1036,35 @@ static void pcf50633_work(struct work_struct *work)
-                * this is really "battery not pulling current" -- it can
-                * appear with no battery attached
-                */
--              /* FIXME: signal this to userspace */
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50633_FEAT_MBC, PMU_EVT_CHARGER_CHANGE);
-       }
-       if (pcfirq[2] & PCF50633_INT3_THLIMON) {
-               DEBUGPC("THLIMON ");
-               pcf->flags |= PCF50633_F_CHG_PROT;
--              /* FIXME: signal this to userspace */
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50633_FEAT_MBC, PMU_EVT_CHARGER_CHANGE);
-       }
-       if (pcfirq[2] & PCF50633_INT3_THLIMOFF) {
-               DEBUGPC("THLIMOFF ");
-               pcf->flags &= ~PCF50633_F_CHG_PROT;
--              /* FIXME: signal this to userspace */
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50633_FEAT_MBC, PMU_EVT_CHARGER_CHANGE);
-       }
-       if (pcfirq[2] & PCF50633_INT3_USBLIMON) {
-               DEBUGPC("USBLIMON ");
--              /* FIXME: signal this to userspace */
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50633_FEAT_MBC, PMU_EVT_CHARGER_CHANGE);
-       }
-       if (pcfirq[2] & PCF50633_INT3_USBLIMOFF) {
-               DEBUGPC("USBLIMOFF ");
--              /* FIXME: signal this to userspace */
-+              if (pcf->pdata->cb)
-+                      pcf->pdata->cb(&pcf->client.dev,
-+                                     PCF50633_FEAT_MBC, PMU_EVT_CHARGER_CHANGE);
-       }
-       if (pcfirq[2] & PCF50633_INT3_ADCRDY) {
-               /* ADC result ready */
-diff --git a/include/linux/pcf506xx.h b/include/linux/pcf506xx.h
-index a1365e0..459b160 100644
---- a/include/linux/pcf506xx.h
-+++ b/include/linux/pcf506xx.h
-@@ -23,6 +23,7 @@ enum pmu_event {
- #endif
-       PMU_EVT_CHARGER_ACTIVE,
-       PMU_EVT_CHARGER_IDLE,
-+      PMU_EVT_CHARGER_CHANGE,
-       __NUM_PMU_EVTS
- };
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1201-change-remove-kernel-charging-led-drive.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1201-change-remove-kernel-charging-led-drive.patch.patch
deleted file mode 100755 (executable)
index 02c18da..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From cc4fe7fb2f4e0ab21a33292830480d50c9d73cac Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:17 +0100
-Subject: [PATCH] change-remove-kernel-charging-led-drive.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |    5 -----
- 1 files changed, 0 insertions(+), 5 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index e66498b..686291b 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -485,12 +485,7 @@ static int pmu_callback(struct device *dev, unsigned int feature,
-                       pcf50633_charge_enable(pcf50633_global, 0);
-                       break;
-               case PMU_EVT_CHARGER_IDLE:
--                      /* printk(KERN_ERR"PMU_EVT_CHARGER_IDLE\n"); */
--                      neo1973_gpb_setpin(GTA02_GPIO_AUX_LED, 0);
--                      break;
-               case PMU_EVT_CHARGER_ACTIVE:
--                      /* printk(KERN_ERR"PMU_EVT_CHARGER_ACTIVE\n"); */
--                      neo1973_gpb_setpin(GTA02_GPIO_AUX_LED, 1);
-                       break;
-               default:
-                       break;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1202-add-ar6k-wake-interrupt.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1202-add-ar6k-wake-interrupt.patch.patch
deleted file mode 100755 (executable)
index 3dce682..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-From ce7b2df450b6dcd7c34cc47c1fe2b3b2d06d612f Mon Sep 17 00:00:00 2001
-From: Matt <matt_hsu@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:17 +0100
-Subject: [PATCH] add-ar6k-wake-interrupt.patch
-
-Signed-off-by: Matt Hsu <matt_hsu@openmoko.org>
-
-- add an interrupt for ar6k wifi module
----
- arch/arm/mach-s3c2440/mach-gta02.c |   15 +++++++++++++++
- 1 files changed, 15 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 686291b..7118332 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1498,6 +1498,12 @@ static irqreturn_t gta02_modem_irq(int irq, void *param)
-       return IRQ_HANDLED;
- }
-+static irqreturn_t ar6000_wow_irq(int irq, void *param)
-+{
-+      printk(KERN_DEBUG "ar6000_wow interrupt\n");
-+      return IRQ_HANDLED;
-+}
-+
- static void __init gta02_machine_init(void)
- {
-       int rc;
-@@ -1601,6 +1607,15 @@ static void __init gta02_machine_init(void)
-       if (rc < 0)
-               printk(KERN_ERR "GTA02: can't request GSM modem wakeup IRQ\n");
-       enable_irq_wake(GTA02_IRQ_MODEM);
-+
-+      /* Make sure the wifi module can wake us up*/
-+      set_irq_type(GTA02_IRQ_WLAN_GPIO1, IRQT_RISING);
-+      rc = request_irq(GTA02_IRQ_WLAN_GPIO1, ar6000_wow_irq, IRQF_DISABLED,
-+                      "ar6000", NULL);
-+
-+      if (rc < 0)
-+              printk(KERN_ERR "GTA02: can't request ar6k wakeup IRQ\n");
-+      enable_irq_wake(GTA02_IRQ_WLAN_GPIO1);
- }
- MACHINE_START(NEO1973_GTA02, "GTA02")
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1203-Remove-some-bits-of-nspy-GSM-flow-control-patches.patch b/target/linux/s3c24xx/patches-2.6.26/1203-Remove-some-bits-of-nspy-GSM-flow-control-patches.patch
deleted file mode 100755 (executable)
index 26aee6e..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-From 19df66d3caeac4fe2a91edfc5b36869c96d8e991 Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Fri, 25 Jul 2008 23:06:18 +0100
-Subject: [PATCH] Remove some bits of nspy + GSM flow control patches that leaked into stable
-
-Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index 6b6b2f4..dc27aea 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -31,6 +31,9 @@
- #include <asm/arch/regs-gpioj.h>
- #endif
-+extern void s3c24xx_serial_register_resume_dependency(struct resume_dependency *
-+                                           resume_dependency, int uart_index);
-+
- struct gta01pm_priv {
-       int gpio_ngsm_en;
-         int gpio_ndl_gsm;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1204-commit-5f42e24d361cd83178fe8da9d68efbf41a011483.patch b/target/linux/s3c24xx/patches-2.6.26/1204-commit-5f42e24d361cd83178fe8da9d68efbf41a011483.patch
deleted file mode 100755 (executable)
index c606abd..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From 295621a873dfef4a8ed956fb0ad4563db0b2e659 Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Fri, 25 Jul 2008 23:06:18 +0100
-Subject: [PATCH] commit 5f42e24d361cd83178fe8da9d68efbf41a011483
-
-    Add missing initialization for the touchscreen driver for the
-    gta01 platform.
-
-    Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- arch/arm/mach-s3c2410/mach-gta01.c |    9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index a77ed3d..e518de7 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -494,8 +494,15 @@ static struct s3c2410_udc_mach_info gta01_udc_cfg = {
- static struct s3c2410_ts_mach_info gta01_ts_cfg = {
-       .delay = 10000,
--      .presc = 65,
-+      .presc = 50000000 / 1000000, /* 50 MHz PCLK / 1MHz */
-+      /* simple averaging, 2^n samples */
-       .oversampling_shift = 5,
-+      /* averaging filter length, 2^n */
-+      .excursion_filter_len_bits = 5,
-+      /* flagged for beauty contest on next sample if differs from
-+       * average more than this
-+       */
-+      .reject_threshold_vs_avg = 2,
- };
- /* SPI */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1205-From-cede5c6c9b06ecbb0f7f2df7b7070092b87ddaf8-Mon-Se.patch b/target/linux/s3c24xx/patches-2.6.26/1205-From-cede5c6c9b06ecbb0f7f2df7b7070092b87ddaf8-Mon-Se.patch
deleted file mode 100755 (executable)
index 7697510..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-From 589ebad15051f452feb95719db6b219dc221af40 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:18 +0100
-Subject: [PATCH] From cede5c6c9b06ecbb0f7f2df7b7070092b87ddaf8 Mon Sep 17 00:00:00 2001
- Subject: [PATCH] [pcf50633] Avoid ooops on start with inserted usb cable
-     The pcf50633_global might not be initialized when we get the first
-     usb interrupt. We would oops inside the dev_err because we made up
-     a struct device.
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- arch/arm/mach-s3c2440/mach-gta02.c |    3 +++
- drivers/i2c/chips/pcf50633.c       |    4 +---
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 7118332..b3d3797 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -883,6 +883,9 @@ static void gta02_udc_command(enum s3c2410_udc_cmd_e cmd)
- static void gta02_udc_vbus_draw(unsigned int ma)
- {
-+        if (!pcf50633_global)
-+              return;
-+
-       pcf50633_notify_usb_current_limit_change(pcf50633_global, ma);
- }
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index ead4273..76bb886 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -690,9 +690,7 @@ int pcf50633_notify_usb_current_limit_change(struct pcf50633_data *pcf,
-        * have to bail with error since we can't even schedule the work
-        */
-       if (!pcf) {
--              dev_err(&pcf->client.dev,
--                      "pcf50633_notify_usb_current_limit_change "
--                      "called with NULL pcf\n");
-+              printk(KERN_ERR "pcf50633_notify_usb_current_limit called with NULL pcf\n");
-               return -EBUSY;
-       }
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1206-From-3a32be40f78404d5f1185f0b3d6b5632381cb33f-Mon-Se.patch b/target/linux/s3c24xx/patches-2.6.26/1206-From-3a32be40f78404d5f1185f0b3d6b5632381cb33f-Mon-Se.patch
deleted file mode 100755 (executable)
index dfb6078..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-From 8279b4e4862b148b10e7d4d2967ac92eaae0f129 Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Fri, 25 Jul 2008 23:06:18 +0100
-Subject: [PATCH] From 3a32be40f78404d5f1185f0b3d6b5632381cb33f Mon Sep 17 00:00:00 2001
- Subject: [PATCH] [neo1973 leds] Move from mutex to spinlock because we may not use mutexes
-     The led triggers may call set_brightness from atomic contexts. As
-     mutex_lock calls might_sleep and sleeping is not allowed in atomic contexts
-     we have to switch to spinlocks here.
-
-Signed-Off-By: Holger Freyther <zecke@openmoko.org>
----
- drivers/leds/leds-neo1973-gta02.c |   10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/leds/leds-neo1973-gta02.c b/drivers/leds/leds-neo1973-gta02.c
-index 952ad69..8fe817b 100644
---- a/drivers/leds/leds-neo1973-gta02.c
-+++ b/drivers/leds/leds-neo1973-gta02.c
-@@ -27,7 +27,7 @@
- struct gta02_led_priv
- {
--      struct mutex mutex;
-+      spinlock_t lock;
-       struct led_classdev cdev;
-       struct s3c2410_pwm pwm;
-       unsigned int gpio;
-@@ -53,6 +53,7 @@ static inline struct gta02_led_bundle *to_bundle(struct led_classdev *led_cdev)
- static void gta02led_set(struct led_classdev *led_cdev,
-               enum led_brightness value)
- {
-+      unsigned long flags;
-       struct gta02_led_priv *lp = to_priv(led_cdev);
-       /*
-@@ -60,7 +61,7 @@ static void gta02led_set(struct led_classdev *led_cdev,
-        * value == 128 -> 50% duty cycle (medium power)
-        * value == 0 -> 0% duty cycle (zero power)
-        */
--      mutex_lock(&lp->mutex);
-+      spin_lock_irqsave(&lp->lock, flags);
-       if (lp->has_pwm) {
-               s3c2410_pwm_duty_cycle(value, &lp->pwm);
-@@ -68,7 +69,7 @@ static void gta02led_set(struct led_classdev *led_cdev,
-               neo1973_gpb_setpin(lp->gpio, value ? 1 : 0);
-       }
--      mutex_unlock(&lp->mutex);
-+      spin_unlock_irqrestore(&lp->lock, flags);
- }
- #ifdef CONFIG_PM
-@@ -170,7 +171,7 @@ static int __init gta02led_probe(struct platform_device *pdev)
-                       break;
-               }
--              mutex_init(&lp->mutex);
-+              spin_lock_init(&lp->lock);
-               rc = led_classdev_register(&pdev->dev, &lp->cdev);
-       }
-@@ -192,7 +193,6 @@ static int gta02led_remove(struct platform_device *pdev)
-                       gta02led_set(&lp->cdev, 0);
-               led_classdev_unregister(&lp->cdev);
--              mutex_destroy(&lp->mutex);
-       }
-       platform_set_drvdata(pdev, NULL);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1207-fix-pcf50633-mask-second-on-resume.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1207-fix-pcf50633-mask-second-on-resume.patch.patch
deleted file mode 100755 (executable)
index 725521c..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From 76d0eccb31de3f0b7ba1124029cae40fca49fea2 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:19 +0100
-Subject: [PATCH] fix-pcf50633-mask-second-on-resume.patch
-
-We leave SECOND unmasked on resume, it's like the
-situation at probe() time, but there it makes us
-turn SECOND off after coldplug action.  So we need
-to act like after that has happened, not exactly
-like what we do at probe / init time.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 76bb886..352b54a 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -2543,6 +2543,8 @@ static int pcf50633_resume(struct device *dev)
-               dev_err(dev, "Failed to restore LDOs :-( %d\n", ret);
-       memset(res, 0, sizeof(res));
-+      /* not interested in second on resume */
-+      res[0] = PCF50633_INT1_SECOND;
-       ret = i2c_smbus_write_i2c_block_data(&pcf->client,
-                                            PCF50633_REG_INT1M,
-                                            5, &res[0]);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1208-fix-aux-key-level-by-gtaxx.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1208-fix-aux-key-level-by-gtaxx.patch.patch
deleted file mode 100755 (executable)
index 3bbb860..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-From 5702311defa9e54a2cdfb4d71a4a9e6a90ceb45e Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:19 +0100
-Subject: [PATCH] fix-aux-key-level-by-gtaxx.patch
- Reported-by: Mickey Lauer <mickey@openmoko.org>
-
-AUX level detection is inverted based on GTA01 or 02
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/input/keyboard/neo1973kbd.c |    5 ++++-
- 1 files changed, 4 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c
-index 3076af3..70d8bc0 100644
---- a/drivers/input/keyboard/neo1973kbd.c
-+++ b/drivers/input/keyboard/neo1973kbd.c
-@@ -39,8 +39,11 @@ struct neo1973kbd {
- static irqreturn_t neo1973kbd_aux_irq(int irq, void *dev_id)
- {
-       struct neo1973kbd *neo1973kbd_data = dev_id;
-+      int key_pressed = !gpio_get_value(irq_to_gpio(irq));
--      int key_pressed = !!gpio_get_value(irq_to_gpio(irq));
-+      /* GTA02 has inverted sense level compared to GTA01 */
-+      if (machine_is_neo1973_gta02())
-+              key_pressed = !key_pressed;
-       input_report_key(neo1973kbd_data->input, KEY_PHONE, key_pressed);
-       input_sync(neo1973kbd_data->input);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1209-add-pcf50633-allow-force-charger-type.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1209-add-pcf50633-allow-force-charger-type.patch.patch
deleted file mode 100755 (executable)
index 0abfd0a..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-From a671530397303f2a65c503e9670b5e32e867ffcf Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:19 +0100
-Subject: [PATCH] add-pcf50633-allow-force-charger-type.patch
-
-This patch adds a sysfs node:
-
-/sys/class/i2c-adapter/i2c-0/0-0073/force_usb_limit_dangerous
-
-it allows to force the charging limit regardless of the one chosen
-by pcf50633 kernel driver.  As such, if you write a charging limit
-here that is not suitable for the power source, and the power source
-is not current limited on its side, it could draw more current than
-your power source can handle, burn down you house, etc.
-
-If you're certain that your power supply can handle it, you can use
-this on your own responsibility to make the amount drawn by the
-PMU match what you believed your power supply could handle.
-
-Example usage, in case where you have a dumb 500mA USB charger that
-does not have the ID resistor:
-
-# cat /sys/class/i2c-adapter/i2c-0/0-0073/charger_type
-host/500mA usb mode 100mA   <=== dumb charger does not ennumerate us
-# echo 500 > /sys/class/i2c-adapter/i2c-0/0-0073/force_usb_limit_dangerous
-# cat /sys/class/i2c-adapter/i2c-0/0-0073/charger_type
-host/500mA usb mode 500mA
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |   15 +++++++++++++++
- 1 files changed, 15 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 352b54a..1074b94 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1946,6 +1946,20 @@ static ssize_t show_charger_type(struct device *dev,
- static DEVICE_ATTR(charger_type, 0444, show_charger_type, NULL);
-+static ssize_t force_usb_limit_dangerous(struct device *dev,
-+                 struct device_attribute *attr, const char *buf, size_t count)
-+{
-+      struct i2c_client *client = to_i2c_client(dev);
-+      struct pcf50633_data *pcf = i2c_get_clientdata(client);
-+      int ma = simple_strtoul(buf, NULL, 10);
-+
-+      pcf50633_usb_curlim_set(pcf, ma);
-+      return count;
-+}
-+
-+static DEVICE_ATTR(force_usb_limit_dangerous, 0600,
-+                                             NULL, force_usb_limit_dangerous);
-+
- /*
-  * Charger adc
-  */
-@@ -2023,6 +2037,7 @@ static struct attribute *pcf_sysfs_entries[] = {
-       &dev_attr_voltage_ldo6.attr,
-       &dev_attr_voltage_hcldo.attr,
-       &dev_attr_charger_type.attr,
-+      &dev_attr_force_usb_limit_dangerous.attr,
-       &dev_attr_charger_adc.attr,
-       &dev_attr_dump_regs.attr,
-       NULL, /* going to add things at this point! */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1210-fix-no-uart-leak-when-gps-off.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1210-fix-no-uart-leak-when-gps-off.patch.patch
deleted file mode 100755 (executable)
index 0fc8559..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-From 75c6d53772b66d6d4237745a5d3185f836e05b70 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:19 +0100
-Subject: [PATCH] fix-no-uart-leak-when-gps-off.patch
-
-During the suspend current reduction campaign on suspend I
-forced the GPS UART to be GPIO and to drive 0 into the GPS
-unit so we would not burn current there.  On resume it lets
-the pins act as UARTs again.  But really, we should do this
-all the time that the GPS unit is off, lest we leak it
-enough power to hold internal state and make trouble.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gps.c |   57 +++++++++++++------------------
- 1 files changed, 24 insertions(+), 33 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-index 9c6adfa..8cd583d 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-@@ -272,9 +272,23 @@ static void gps_pwron_set(int on)
- #ifdef CONFIG_MACH_NEO1973_GTA02
-       if (machine_is_neo1973_gta02()) {
--              if (on)
-+              if (on) {
-                       pcf50633_voltage_set(pcf50633_global,
-                               PCF50633_REGULATOR_LDO5, 3000);
-+                      /* return UART pins to being UART pins */
-+                      s3c2410_gpio_cfgpin(S3C2410_GPH4, S3C2410_GPH4_TXD1);
-+                      /* remove pulldown now it won't be floating any more */
-+                      s3c2410_gpio_pullup(S3C2410_GPH5, 0);
-+              } else {
-+                      /*
-+                       * take care not to power unpowered GPS from UART TX
-+                       * return them to GPIO and force low
-+                       */
-+                      s3c2410_gpio_cfgpin(S3C2410_GPH4, S3C2410_GPH4_OUTP);
-+                      s3c2410_gpio_setpin(S3C2410_GPH4, 0);
-+                      /* don't let RX from unpowered GPS float */
-+                      s3c2410_gpio_pullup(S3C2410_GPH5, 1);
-+              }
-               pcf50633_onoff_set(pcf50633_global,
-                       PCF50633_REGULATOR_LDO5, on);
-       }
-@@ -284,21 +298,14 @@ static void gps_pwron_set(int on)
- static int gps_pwron_get(void)
- {
- #ifdef CONFIG_MACH_NEO1973_GTA01
--      if (machine_is_neo1973_gta01()) {
--              if (s3c2410_gpio_getpin(GTA01_GPIO_GPS_PWRON))
--                      return 1;
--              else
--                      return 0;
--      }
-+      if (machine_is_neo1973_gta01())
-+              return !!s3c2410_gpio_getpin(GTA01_GPIO_GPS_PWRON);
- #endif /* CONFIG_MACH_NEO1973_GTA01 */
- #ifdef CONFIG_MACH_NEO1973_GTA02
--      if (machine_is_neo1973_gta02()) {
--              if (pcf50633_onoff_get(pcf50633_global, PCF50633_REGULATOR_LDO5))
--                      return 1;
--              else
--                      return 0;
--      }
-+      if (machine_is_neo1973_gta02())
-+              return !!pcf50633_onoff_get(pcf50633_global,
-+                                                     PCF50633_REGULATOR_LDO5);
- #endif /* CONFIG_MACH_NEO1973_GTA02 */
-       return -1;
- }
-@@ -496,15 +503,8 @@ static int gta01_pm_gps_suspend(struct platform_device *pdev,
- #endif /* CONFIG_MACH_NEO1973_GTA01 */
- #ifdef CONFIG_MACH_NEO1973_GTA02
--      if (machine_is_neo1973_gta02()) {
--              /* take care not to power unpowered GPS from GPIO */
--              s3c2410_gpio_cfgpin(S3C2410_GPH4, S3C2410_GPH4_OUTP);
--              s3c2410_gpio_setpin(S3C2410_GPH4, 0);
--              /* don't let RX from unpowered GPS float */
--              s3c2410_gpio_pullup(S3C2410_GPH5, 1);
--
-+      if (machine_is_neo1973_gta02())
-               gps_pwron_set(0);
--      }
- #endif /* CONFIG_MACH_NEO1973_GTA02 */
-       return 0;
-@@ -513,26 +513,17 @@ static int gta01_pm_gps_suspend(struct platform_device *pdev,
- static int gta01_pm_gps_resume(struct platform_device *pdev)
- {
- #ifdef CONFIG_MACH_NEO1973_GTA01
--      if (machine_is_neo1973_gta01()) {
-+      if (machine_is_neo1973_gta01())
-               if (neo1973_gps.power_was_on)
-                       gps_power_sequence_up();
--      }
- #endif /* CONFIG_MACH_NEO1973_GTA01 */
- #ifdef CONFIG_MACH_NEO1973_GTA02
--      if (machine_is_neo1973_gta02()) {
--              /*
--               * resume TXD1 function since we power GPS now... er..
--               * WTF?  FIXME We always power GPS on resume ??
--               */
--              s3c2410_gpio_cfgpin(S3C2410_GPH4, S3C2410_GPH4_TXD1);
--              /* remove pulldown now it won't be floating any more */
--              s3c2410_gpio_pullup(S3C2410_GPH5, 0);
--
-+      if (machine_is_neo1973_gta02())
-               if (neo1973_gps.power_was_on)
-                   gps_pwron_set(1);
- #endif /* CONFIG_MACH_NEO1973_GTA02 */
--      }
-+
-       return 0;
- }
- #else
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1211-change-backlight-level-not-forced-up-on-resume.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1211-change-backlight-level-not-forced-up-on-resume.patch.patch
deleted file mode 100755 (executable)
index 8bf9369..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-From d7b66b10fd485219e211b6de14fcb5e6a5266c6a Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:19 +0100
-Subject: [PATCH] change-backlight-level-not-forced-up-on-resume.patch
-
-We at least always enabled backlight on resume, this patch
-changes us to set backlight back to last requested backlight
-brightness level on resume.  Note it means that you can
-resume with screen blanked, but it should come back if that
-happened with touchscreen action as usual.
-
-/sys/class/backlight/pcf50633-bl/actual_brightness
-and
-/sys/class/backlight/pcf50633-bl/brightness
-
-seem to agree after resume when reportedly they didn't before.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |   28 +++++++++++++++++-----------
- 1 files changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 1074b94..fea2f38 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1874,16 +1874,12 @@ static int pcf50633bl_get_intensity(struct backlight_device *bd)
-       return intensity & 0x3f;
- }
--static int pcf50633bl_set_intensity(struct backlight_device *bd)
-+static int __pcf50633bl_set_intensity(struct pcf50633_data *pcf, int intensity)
- {
--      struct pcf50633_data *pcf = bl_get_data(bd);
--      int intensity = bd->props.brightness;
-       int old_intensity = reg_read(pcf, PCF50633_REG_LEDOUT);
-       u_int8_t ledena = 2;
-       int ret;
--      dev_info(&pcf->client.dev, "pcf50633bl_set_intensity\n");
--
-       if (!(reg_read(pcf, PCF50633_REG_LEDENA) & 1))
-               old_intensity = 0;
-@@ -1891,7 +1887,8 @@ static int pcf50633bl_set_intensity(struct backlight_device *bd)
-           (bd->props.fb_blank != FB_BLANK_UNBLANK))
-               intensity = 0;
--      /* The PCF50633 cannot handle LEDOUT = 0 (datasheet p60)
-+      /*
-+       * The PCF50633 cannot handle LEDOUT = 0 (datasheet p60)
-        * if seen, you have to re-enable the LED unit
-        */
-@@ -1912,6 +1909,18 @@ static int pcf50633bl_set_intensity(struct backlight_device *bd)
-       return ret;
- }
-+static int pcf50633bl_set_intensity(struct backlight_device *bd)
-+{
-+      struct pcf50633_data *pcf = bl_get_data(bd);
-+      int intensity = bd->props.brightness;
-+
-+      if ((bd->props.power != FB_BLANK_UNBLANK) ||
-+          (bd->props.fb_blank != FB_BLANK_UNBLANK))
-+              intensity = 0;
-+
-+      return __pcf50633bl_set_intensity(pcf, intensity);
-+}
-+
- static struct backlight_ops pcf50633bl_ops = {
-       .get_brightness = pcf50633bl_get_intensity,
-       .update_status  = pcf50633bl_set_intensity,
-@@ -2501,11 +2510,8 @@ void pcf50633_backlight_resume(struct pcf50633_data *pcf)
-       /* platform defines resume ramp speed */
-       reg_write(pcf, PCF50633_REG_LEDDIM,
-                                      pcf->pdata->resume_backlight_ramp_speed);
--      reg_write(pcf, PCF50633_REG_LEDOUT, pcf->standby_regs.misc[
--                                 PCF50633_REG_LEDOUT - PCF50633_REG_AUTOOUT]);
--      /* we force the backlight on in fact */
--      reg_write(pcf, PCF50633_REG_LEDENA, pcf->standby_regs.misc[
--                             PCF50633_REG_LEDENA - PCF50633_REG_AUTOOUT] | 1);
-+
-+      __pcf50633bl_set_intensity(pcf, pcf->backlight->props.brightness);
- }
- EXPORT_SYMBOL_GPL(pcf50633_backlight_resume);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1212-introduce-BANKCON-meddling-sysfs.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1212-introduce-BANKCON-meddling-sysfs.patch.patch
deleted file mode 100755 (executable)
index 207512e..0000000
+++ /dev/null
@@ -1,300 +0,0 @@
-From 3db422fde610960fdca8bd2a2b882015a62860ca Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:20 +0100
-Subject: [PATCH] introduce-BANKCON-meddling-sysfs.patch
-
-A few questions have been flying around about how optimal
-our waitstates are for various things including Glamo.
-
-This patch introduces new sysfs nodes
-
-/sys/devices/platform/neo1973-memconfig.0/BANKCON0
-...
-/sys/devices/platform/neo1973-memconfig.0/BANKCON7
-
-If you cat them you get translated info about bus speed on
-that chip select, eg,
-
-# cat /sys/devices/platform/neo1973-memconfig.0/BANKCON1
-BANKCON1 = 0x00000A40
- Type = ROM / SRAM
- PMC  = normal (1 data)
- Tacp = 2 clocks
- Tcah = 0 clocks
- Tcoh = 1 clock
- Tacc = 3 clocks
- Tcos = 1 clock
- Tacs = 0 clocks
-
-You can write them in hex too
-
-# echo 0x200 > /sys/devices/platform/neo1973-memconfig.0/BANKCON1
-
-The write format for BANKCON0 - 5 looks like this
-
- b1..b0   PMC  Page Mode Config
- b3..b2   Tacp Page Mode Access Cycle
- b5..b4   Tcah Address hold after CS deasserted
- b7..b6   Tcoh CS hold after OE deasserted
- b10..b8  Tacc Access Cycle Period
- b12..b11 Tcos CS setup before OE asserted
- b14..b13 Tacs Address setup before CS asserted
-
-BANKCON 6 and 7 have two extra bits
-
- b16..b15  MT  Memory type (00=ROM/SRAM, 11=DRAM)
-
-If it's ROM/SRAM, the rest of the bits are as described above.
-For DRAM
-
- b1..b0   SCAN Column address number
- b3..b2   RAS to CAS delay
-
-The patch is intended to let people experiement on their own.  But
-of course you will crash things for sure if the timing is wrong, and
-you can also trash SD Card data if you make Glamo unstable, so remove
-it or remount ro first.  Other horrible things are possible, but
-because the settings aren't sticky, you should always be able to
-recover by either normal reboot usually or at worst NOR boot and then
-dfu.  Most likely you will just crash your session and have to reboot
-if your settings are bad, but consider yourself warned bad things are
-possible. :-)
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c        |    6 +
- arch/arm/plat-s3c24xx/Makefile            |    3 +-
- arch/arm/plat-s3c24xx/neo1973_memconfig.c |  186 +++++++++++++++++++++++++++++
- 3 files changed, 194 insertions(+), 1 deletions(-)
- create mode 100644 arch/arm/plat-s3c24xx/neo1973_memconfig.c
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index b3d3797..f30abb6 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -412,6 +412,11 @@ struct platform_device gta02_resume_reason_device = {
-       .num_resources  = 0,
- };
-+struct platform_device gta02_memconfig_device = {
-+      .name           = "neo1973-memconfig",
-+      .num_resources  = 0,
-+};
-+
- static struct map_desc gta02_iodesc[] __initdata = {
-       {
-               .virtual        = 0xe0000000,
-@@ -829,6 +834,7 @@ static struct platform_device *gta02_devices[] __initdata = {
-       &gta02_nor_flash,
-       &sc32440_fiq_device,
-       &gta02_version_device,
-+      &gta02_memconfig_device,
-       &gta02_resume_reason_device,
-       &s3c24xx_pwm_device,
-diff --git a/arch/arm/plat-s3c24xx/Makefile b/arch/arm/plat-s3c24xx/Makefile
-index f60dc5f..baae831 100644
---- a/arch/arm/plat-s3c24xx/Makefile
-+++ b/arch/arm/plat-s3c24xx/Makefile
-@@ -35,4 +35,5 @@ obj-$(CONFIG_MACH_NEO1973)   += neo1973_version.o \
-                                  neo1973_pm_gps.o \
-                                  neo1973_pm_bt.o  \
-                                  neo1973_shadow.o \
--                                 neo1973_pm_resume_reason.o
-+                                 neo1973_pm_resume_reason.o \
-+                                 neo1973_memconfig.o
-diff --git a/arch/arm/plat-s3c24xx/neo1973_memconfig.c b/arch/arm/plat-s3c24xx/neo1973_memconfig.c
-new file mode 100644
-index 0000000..55d85fc
---- /dev/null
-+++ b/arch/arm/plat-s3c24xx/neo1973_memconfig.c
-@@ -0,0 +1,186 @@
-+/*
-+ * Memory access timing control sysfs for the s3c24xx based device
-+ *
-+ * (C) 2008 by Openmoko Inc.
-+ * Author: Andy Green <andy@openmoko.com>
-+ * 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 version 2 as
-+ * published by the Free Software Foundation
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/platform_device.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/mach-types.h>
-+#include <asm/arch/regs-mem.h>
-+
-+static ssize_t neo1973_memconfig_read(struct device *dev,
-+                                     struct device_attribute *attr, char *buf)
-+{
-+      int index = attr->attr.name[strlen(attr->attr.name) - 1] - '0';
-+      u32 reg = *((u32 *)(S3C2410_MEMREG(((index + 1) << 2))));
-+      static const char *meaning[][8] = {
-+              {
-+                      [0] = "normal (1 data)",
-+                      [1] = "4 data",
-+                      [2] = "8 data",
-+                      [3] = "16 data",
-+              }, {
-+                      [0] = "2 clocks",
-+                      [1] = "3 clocks",
-+                      [2] = "4 clocks",
-+                      [3] = "6 clocks",
-+              }, {
-+                      [0] = "0 clocks",
-+                      [1] = "1 clock",
-+                      [2] = "2 clocks",
-+                      [3] = "4 clocks",
-+              }, {
-+                      [0] = "1 clock",
-+                      [1] = "2 clocks",
-+                      [2] = "3 clocks",
-+                      [3] = "4 clocks",
-+                      [4] = "6 clocks",
-+                      [5] = "8 clocks",
-+                      [6] = "10 clocks",
-+                      [7] = "14 clocks",
-+              }, { /* after this, only for CS6 and CS7 */
-+                      [0] = "ROM / SRAM",
-+                      [1] = "(illegal)",
-+                      [2] = "(illegal)",
-+                      [3] = "Sync DRAM",
-+              }, {
-+                      [0] = "8 Column bits",
-+                      [1] = "9 Column bits",
-+                      [2] = "10 Column bits",
-+                      [3] = "(illegal)",
-+              }, {
-+                      [0] = "2 clocks",
-+                      [1] = "3 clocks",
-+                      [2] = "4 clocks",
-+                      [3] = "(illegal)",
-+              }
-+      };
-+
-+      if (index >= 6)
-+              if (((reg >> 15) & 3) == 3) /* DRAM */
-+                      return sprintf(buf, "BANKCON%d = 0x%08X\n DRAM:\n"
-+                                          "  Trcd = %s\n  SCAN = %s\n", index,
-+                                          reg, meaning[5][reg & 3],
-+                                          meaning[1][(reg >> 2) & 3]);
-+
-+      return sprintf(buf, "BANKCON%d = 0x%08X\n Type = %s\n PMC  = %s\n"
-+                          " Tacp = %s\n Tcah = %s\n Tcoh = %s\n Tacc = %s\n"
-+                          " Tcos = %s\n Tacs = %s\n",
-+                          index, reg, meaning[4][(reg >> 15) & 3],
-+                          meaning[0][reg & 3],
-+                          meaning[1][(reg >> 2) & 3],
-+                          meaning[2][(reg >> 4) & 3],
-+                          meaning[2][(reg >> 6) & 3],
-+                          meaning[3][(reg >> 8) & 7],
-+                          meaning[2][(reg >> 11) & 3],
-+                          meaning[2][(reg >> 13) & 3]);
-+}
-+
-+static ssize_t neo1973_memconfig_write(struct device *dev,
-+                 struct device_attribute *attr, const char *buf, size_t count)
-+{
-+      int index = attr->attr.name[strlen(attr->attr.name) - 1] - '0';
-+      unsigned long val = simple_strtoul(buf, NULL, 16);
-+
-+      dev_info(dev, "setting BANKCON%d <- 0x%08X\n", index, (u32)val);
-+
-+      *((u32 *)(S3C2410_MEMREG(((index + 1) << 2)))) = (u32)val;
-+
-+      return count;
-+}
-+
-+
-+static DEVICE_ATTR(BANKCON0, 0644, neo1973_memconfig_read,
-+                                                     neo1973_memconfig_write);
-+static DEVICE_ATTR(BANKCON1, 0644, neo1973_memconfig_read,
-+                                                     neo1973_memconfig_write);
-+static DEVICE_ATTR(BANKCON2, 0644, neo1973_memconfig_read,
-+                                                     neo1973_memconfig_write);
-+static DEVICE_ATTR(BANKCON3, 0644, neo1973_memconfig_read,
-+                                                     neo1973_memconfig_write);
-+static DEVICE_ATTR(BANKCON4, 0644, neo1973_memconfig_read,
-+                                                     neo1973_memconfig_write);
-+static DEVICE_ATTR(BANKCON5, 0644, neo1973_memconfig_read,
-+                                                     neo1973_memconfig_write);
-+static DEVICE_ATTR(BANKCON6, 0644, neo1973_memconfig_read,
-+                                                     neo1973_memconfig_write);
-+static DEVICE_ATTR(BANKCON7, 0644, neo1973_memconfig_read,
-+                                                     neo1973_memconfig_write);
-+
-+static struct attribute *neo1973_memconfig_sysfs_entries[] = {
-+      &dev_attr_BANKCON0.attr,
-+      &dev_attr_BANKCON1.attr,
-+      &dev_attr_BANKCON2.attr,
-+      &dev_attr_BANKCON3.attr,
-+      &dev_attr_BANKCON4.attr,
-+      &dev_attr_BANKCON5.attr,
-+      &dev_attr_BANKCON6.attr,
-+      &dev_attr_BANKCON7.attr,
-+      NULL
-+};
-+
-+static struct attribute_group neo1973_memconfig_attr_group = {
-+      .name   = NULL,
-+      .attrs  = neo1973_memconfig_sysfs_entries,
-+};
-+
-+static int __init neo1973_memconfig_probe(struct platform_device *pdev)
-+{
-+      dev_info(&pdev->dev, "starting\n");
-+
-+      switch (machine_arch_type) {
-+#ifdef CONFIG_MACH_NEO1973_GTA01
-+      case MACH_TYPE_NEO1973_GTA01:
-+              return -EINVAL;
-+#endif /* CONFIG_MACH_NEO1973_GTA01 */
-+      default:
-+              break;
-+      }
-+
-+      return sysfs_create_group(&pdev->dev.kobj,
-+                                               &neo1973_memconfig_attr_group);
-+}
-+
-+static int neo1973_memconfig_remove(struct platform_device *pdev)
-+{
-+      sysfs_remove_group(&pdev->dev.kobj, &neo1973_memconfig_attr_group);
-+      return 0;
-+}
-+
-+static struct platform_driver neo1973_memconfig_driver = {
-+      .probe          = neo1973_memconfig_probe,
-+      .remove         = neo1973_memconfig_remove,
-+      .driver         = {
-+              .name           = "neo1973-memconfig",
-+      },
-+};
-+
-+static int __devinit neo1973_memconfig_init(void)
-+{
-+      return platform_driver_register(&neo1973_memconfig_driver);
-+}
-+
-+static void neo1973_memconfig_exit(void)
-+{
-+      platform_driver_unregister(&neo1973_memconfig_driver);
-+}
-+
-+module_init(neo1973_memconfig_init);
-+module_exit(neo1973_memconfig_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Andy Green <andy@openmoko.com>");
-+MODULE_DESCRIPTION("neo1973 memconfig");
-+
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1213-sdio-use-interruptible-sleep-in-kthread-main-loops.patch b/target/linux/s3c24xx/patches-2.6.26/1213-sdio-use-interruptible-sleep-in-kthread-main-loops.patch
deleted file mode 100755 (executable)
index e68c058..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-From cba59b243d542f3de9c534d99b2f3f33e50b3ebb Mon Sep 17 00:00:00 2001
-From: Jason Uhlenkott <jasonuhl@jasonuhl.org>
-Date: Fri, 25 Jul 2008 23:06:20 +0100
-Subject: [PATCH] sdio: use interruptible sleep in kthread main loops
-
-My FreeRunner's load average was leveling off at 2.00 as a result of
-these two kernel threads:
-
-SDIO Helper   D c02b4500     0   255      2
-[<c02b4298>] (schedule+0x0/0x2d4) from [<c02b4040>] (__down+0x100/0x158)
-[<c02b3f40>] (__down+0x0/0x158) from [<c02b3e2c>] (__down_failed+0xc/0x20)
- r7:00000000 r6:c01fbd64 r5:c7cb7134 r4:c7d58000
-[<c01fa6fc>] (CardDetectHelperFunction+0x0/0x1ac) from [<c01fbd80>] (HelperLaunch+0x1c/0x28)
- r5:c7cb7134 r4:c7cb7134
-[<c01fbd64>] (HelperLaunch+0x0/0x28) from [<c005bbd0>] (kthread+0x60/0x94)
- r4:c7d58000
-[<c005bb70>] (kthread+0x0/0x94) from [<c0048f7c>] (do_exit+0x0/0x744)
- r6:00000000 r5:00000000 r4:00000000
-
-SDIO Helper   D c02b4500     0   259      2
-[<c02b4298>] (schedule+0x0/0x2d4) from [<c02b4040>] (__down+0x100/0x158)
-[<c02b3f40>] (__down+0x0/0x158) from [<c02b3e2c>] (__down_failed+0xc/0x20)
- r7:c0382bb4 r6:c0382b34 r5:c7d5a000 r4:00000001
-[<c01f9104>] (SDIOIrqHelperFunction+0x0/0x29c) from [<c01fbd80>] (HelperLaunch+0x1c/0x28)
- r8:00000000 r7:00000000 r6:c01fbd64 r5:c0382bb4 r4:c0382bb4
-[<c01fbd64>] (HelperLaunch+0x0/0x28) from [<c005bbd0>] (kthread+0x60/0x94)
- r4:c7d5a000
-[<c005bb70>] (kthread+0x0/0x94) from [<c0048f7c>] (do_exit+0x0/0x744)
- r6:00000000 r5:00000000 r4:00000000
-
-This fixes them to use interruptible sleep primitives while waiting in
-their main loops, as is conventional for kernel threads.  They can't
-actually be interrupted since kernel threads ignore all signals, but
-by sleeping this way they get classified as long term waiters, and
-don't get counted as running for purposes of load average calculation.
-
-This is intended as a minimal fix.  In the longer term, it'd probably
-make sense to replace the semaphores with completions or something,
-and to do away with some of these StudlyCapped wrapper functions.
-
-Signed-off-by: Jason Uhlenkott <jasonuhl@jasonuhl.org>
---
-
-This is untested, but what could possibly go wrong?  ;)
----
- include/linux/sdio/ctsystem_linux.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/include/linux/sdio/ctsystem_linux.h b/include/linux/sdio/ctsystem_linux.h
-index 0de89a6..c9e44f2 100644
---- a/include/linux/sdio/ctsystem_linux.h
-+++ b/include/linux/sdio/ctsystem_linux.h
-@@ -968,7 +968,7 @@ typedef struct _OSKERNEL_HELPER {
-         }
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
--#define SD_WAIT_FOR_WAKEUP(p)   SignalWait(&(p)->WakeSignal);
-+#define SD_WAIT_FOR_WAKEUP(p)   SignalWaitInterruptible(&(p)->WakeSignal);
- #define CT_LE16_TO_CPU_ENDIAN(x) __le16_to_cpu(x)
- #define CT_LE32_TO_CPU_ENDIAN(x) __le32_to_cpu(x)
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1214-fix-force-sdcard-clk-off-when-idle.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1214-fix-force-sdcard-clk-off-when-idle.patch.patch
deleted file mode 100755 (executable)
index 13dc940..0000000
+++ /dev/null
@@ -1,240 +0,0 @@
-From ee83ea40a3a1d1cb6447fdd345384d9cabf21c83 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:20 +0100
-Subject: [PATCH] fix-force-sdcard-clk-off-when-idle.patch
-
-Existing Glamo bit for stopping SD Card Clock when there is no
-transfer taking place does not work.  This patch adds stuff around
-the transfer code to force the SD clock up when something is going on
-and down when it is idle.  This'll save a little power and noise ;-)
-
-I tested it briefly and was able to SD Boot normally on Sandisk 512M.
-Wider testing is appreciated.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-mci.c |  126 +++++++++++++++++++++++++++++------------
- 1 files changed, 89 insertions(+), 37 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index 37e3d3c..b53827e 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -20,6 +20,7 @@
- #include <linux/pcf50633.h>
- #include <linux/delay.h>
- #include <linux/interrupt.h>
-+#include <linux/spinlock.h>
- #include <asm/dma.h>
- #include <asm/dma-mapping.h>
-@@ -32,6 +33,7 @@
- /* from glamo-core.c */
- extern struct glamo_mci_pdata glamo_mci_def_pdata;
-+static spinlock_t clock_lock;
- #define DRIVER_NAME "glamo-mci"
- #define RESSIZE(ressource) (((ressource)->end - (ressource)->start) + 1)
-@@ -164,6 +166,67 @@ static int do_pio_write(struct glamo_mci_host *host)
-       return err;
- }
-+static void __glamo_mci_fix_card_div(struct glamo_mci_host *host, int div)
-+{
-+      unsigned long flags;
-+
-+      spin_lock_irqsave(&clock_lock, flags);
-+
-+      if (div < 0) {
-+              /* stop clock - remove clock from divider input */
-+              writew(readw(glamo_mci_def_pdata.pglamo->base +
-+                   GLAMO_REG_CLOCK_GEN5_1) & (~GLAMO_CLOCK_GEN51_EN_DIV_TCLK),
-+                   glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN5_1);
-+      } else {
-+              /* set the nearest prescaler factor
-+              *
-+              * register shared with SCLK divisor -- no chance of race because
-+              * we don't use sensor interface
-+              */
-+              writew_dly((readw(glamo_mci_def_pdata.pglamo->base +
-+                              GLAMO_REG_CLOCK_GEN8) & 0xff00) | div,
-+                     glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN8);
-+              /* enable clock to divider input */
-+              writew_dly(readw(glamo_mci_def_pdata.pglamo->base +
-+                      GLAMO_REG_CLOCK_GEN5_1) | GLAMO_CLOCK_GEN51_EN_DIV_TCLK,
-+                   glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN5_1);
-+      }
-+
-+      spin_unlock_irqrestore(&clock_lock, flags);
-+}
-+
-+static int __glamo_mci_set_card_clock(struct glamo_mci_host *host, int freq,
-+                                                                int *division)
-+{
-+      int div = 0;
-+      int real_rate = 0;
-+
-+      if (freq) {
-+              /* Set clock */
-+              for (div = 0; div < 256; div++) {
-+                      real_rate = host->clk_rate / (div + 1);
-+                      if (real_rate <= freq)
-+                              break;
-+              }
-+              if (div > 255)
-+                      div = 255;
-+
-+              if (division)
-+                      *division = div;
-+
-+              __glamo_mci_fix_card_div(host, div);
-+
-+      } else {
-+              /* stop clock */
-+              if (division)
-+                      *division = 0xff;
-+
-+              __glamo_mci_fix_card_div(host, -1); /* clock off */
-+      }
-+
-+      return real_rate;
-+}
-+
- static void glamo_mci_irq(unsigned int irq, struct irq_desc *desc)
- {
-       struct glamo_mci_host *host = (struct glamo_mci_host *)
-@@ -212,6 +275,10 @@ static void glamo_mci_irq(unsigned int irq, struct irq_desc *desc)
-               glamo_mci_send_request(host->mmc);
-               host->cmd_is_stop = 0;
-       }
-+
-+      /* clock off */
-+      __glamo_mci_fix_card_div(host, -1);
-+
- done:
-       host->complete_what = COMPLETION_NONE;
-       host->mrq = NULL;
-@@ -441,8 +508,11 @@ static void glamo_mci_send_request(struct mmc_host *mmc)
-                cmd->opcode, cmd->arg, cmd->data, cmd->mrq->stop,
-                cmd->flags);
-+      /* resume requested clock rate */
-+      __glamo_mci_fix_card_div(host, host->clk_div);
-+
-       if (glamo_mci_send_command(host, cmd))
--              return;
-+              goto bail;
-       /*
-        * we must spin until response is ready or timed out
-        * -- we don't get interrupts unless there is a bulk rx
-@@ -464,7 +534,7 @@ static void glamo_mci_send_request(struct mmc_host *mmc)
-               cmd->error = -EILSEQ;
-       if (host->cmd_is_stop)
--              return;
-+              goto bail;
-       if (cmd->error) {
-               dev_err(&host->pdev->dev, "Error after cmd: 0x%x\n", status);
-@@ -516,10 +586,12 @@ static void glamo_mci_send_request(struct mmc_host *mmc)
-                       if (cmd->data->error)
-                               cmd->data->error = -ETIMEDOUT;
-                       dev_err(&host->pdev->dev, "Payload timeout\n");
--                      return;
-+                      goto bail;
-               }
--              /* yay we are an interrupt controller! -- call the ISR */
-+              /* yay we are an interrupt controller! -- call the ISR
-+               * it will stop clock to card
-+               */
-               glamo_mci_irq(IRQ_GLAMO(GLAMO_IRQIDX_MMC),
-                             irq_desc + IRQ_GLAMO(GLAMO_IRQIDX_MMC));
-       }
-@@ -529,6 +601,12 @@ done:
-       host->complete_what = COMPLETION_NONE;
-       host->mrq = NULL;
-       mmc_request_done(host->mmc, cmd->mrq);
-+      return;
-+
-+bail:
-+      /* stop the clock to card */
-+      __glamo_mci_fix_card_div(host, -1);
-+      return;
- }
- static void glamo_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)
-@@ -556,11 +634,12 @@ static void glamo_mci_reset(struct glamo_mci_host *host)
-                  glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_MMC);
- }
-+
- static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
- {
-       struct glamo_mci_host *host = mmc_priv(mmc);
--      int mci_psc = 0;
-       int n = 0;
-+      int div;
-       /* Set power */
-       switch(ios->power_mode) {
-@@ -590,43 +669,15 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-       }
-       host->power_mode_current = ios->power_mode;
--       /* Set clock */
--/*    if (ios->clock) { */
--      for (mci_psc = 0; mci_psc < 256; mci_psc++) {
--              host->real_rate = host->clk_rate / (mci_psc + 1);
--              if (host->real_rate <= ios->clock)
--                      break;
--      }
--      if (mci_psc > 255)
--              mci_psc = 255;
--      host->clk_div = mci_psc;
--      /* set the nearest prescaler factor
--      *
--      * register shared with SCLK divisor -- no chance of race because
--      * we don't use sensor interface
--      */
--      writew_dly((readw(glamo_mci_def_pdata.pglamo->base +
--                      GLAMO_REG_CLOCK_GEN8) & 0xff00) | host->clk_div,
--              glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN8);
--      /* enable clock to divider input */
--      writew_dly(readw(glamo_mci_def_pdata.pglamo->base +
--              GLAMO_REG_CLOCK_GEN5_1) | GLAMO_CLOCK_GEN51_EN_DIV_TCLK,
--              glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN5_1);
--#if 0
--      } else { /* stop clock */
--              host->real_rate = 0;
--              /* remove clock from divider input */
--              writew(readw(glamo_mci_def_pdata.pglamo->base +
--                   GLAMO_REG_CLOCK_GEN5_1) & (~GLAMO_CLOCK_GEN51_EN_DIV_TCLK),
--                   glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN5_1);
--      }
--#endif
-+      host->real_rate = __glamo_mci_set_card_clock(host, ios->clock, &div);
-+      host->clk_div = div;
-+
-       if ((ios->power_mode == MMC_POWER_ON) ||
-           (ios->power_mode == MMC_POWER_UP)) {
-               dev_info(&host->pdev->dev,
-                       "powered (vdd = %d) clk: %lukHz div=%d (req: %ukHz). "
-                       "Bus width=%d\n",ios->vdd,
--                      host->real_rate / 1000, mci_psc,
-+                      host->real_rate / 1000, host->real_rate,
-                       ios->clock / 1000, ios->bus_width);
-       } else
-               dev_info(&host->pdev->dev, "glamo_mci_set_ios: power down.\n");
-@@ -856,6 +907,7 @@ static struct platform_driver glamo_mci_driver =
- static int __init glamo_mci_init(void)
- {
-+      spin_lock_init(&clock_lock);
-       platform_driver_register(&glamo_mci_driver);
-       return 0;
- }
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1215-add-limit-sdcard-clk-cmdline.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1215-add-limit-sdcard-clk-cmdline.patch.patch
deleted file mode 100755 (executable)
index 8fc609d..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-From 96f9902ff40b2124fbe34eeac727c596e7701702 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:20 +0100
-Subject: [PATCH] add-limit-sdcard-clk-cmdline.patch
-
-This patch allows you to control the maximum clock rate that will
-be selected for SD Card access, from the kernel commandline using
-
- glamo_mci.sd_max_clk=10000000
-
-and also from
-
- echo 10000000 > /sys/module/glamo_mci/parameters/sd_max_clk
-
-although you have to suspend and resume to make the limit operational
-on the actual SD_CLK line.
-
-Clocks that are possible are divided down from ~50MHz, so 25000000,
-16666666, 12500000, 10000000, etc.  With Freerunner A5 revision that
-has 100R series resistors in SD Card signals, I didn't get reliable
-operation above 16MHz.  With A6 revision the series resistors went
-down to 75R, maybe it can work at 25MHz.
-
-Reducing the clock rate is something to try if you find that your
-SD Card is not communicating properly with the default speed.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-mci.c |   38 +++++++++++++++++++++++++++++---------
- 1 files changed, 29 insertions(+), 9 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index b53827e..67bb815 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -40,6 +40,24 @@ static spinlock_t clock_lock;
- static void glamo_mci_send_request(struct mmc_host *mmc);
-+/*
-+ * Max SD clock rate
-+ *
-+ * held at /(3 + 1) due to concerns of 100R recommended series resistor
-+ * allows 16MHz @ 4-bit --> 8MBytes/sec raw
-+ *
-+ * you can override this on kernel commandline using
-+ *
-+ *   glamo_mci.sd_max_clk=10000000
-+ *
-+ * for example
-+ */
-+
-+static int sd_max_clk = 50000000 / 3;
-+module_param(sd_max_clk, int, 0644);
-+
-+
-+
- unsigned char CRC7(u8 * pu8, int cnt)
- {
-       u8 crc = 0;
-@@ -676,9 +694,9 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-           (ios->power_mode == MMC_POWER_UP)) {
-               dev_info(&host->pdev->dev,
-                       "powered (vdd = %d) clk: %lukHz div=%d (req: %ukHz). "
--                      "Bus width=%d\n",ios->vdd,
--                      host->real_rate / 1000, host->real_rate,
--                      ios->clock / 1000, ios->bus_width);
-+                      "Bus width=%d\n",(int)ios->vdd,
-+                      host->real_rate / 1000, (int)host->clk_div,
-+                      ios->clock / 1000, (int)ios->bus_width);
-       } else
-               dev_info(&host->pdev->dev, "glamo_mci_set_ios: power down.\n");
-@@ -800,11 +818,7 @@ static int glamo_mci_probe(struct platform_device *pdev)
-                         MMC_CAP_MMC_HIGHSPEED |
-                         MMC_CAP_SD_HIGHSPEED;
-       mmc->f_min      = host->clk_rate / 256;
--      /*
--       * held at /4 due to concerns of 100R recommended series resistor
--       * allows 16MHz @ 4-bit --> 8MBytes/sec raw
--       */
--      mmc->f_max      = host->clk_rate / 3;
-+      mmc->f_max      = sd_max_clk;
-       mmc->max_blk_count      = (1 << 16) - 1; /* GLAMO_REG_MMC_RB_BLKCNT */
-       mmc->max_blk_size       = (1 << 12) - 1; /* GLAMO_REG_MMC_RB_BLKLEN */
-@@ -866,12 +880,18 @@ static int glamo_mci_suspend(struct platform_device *dev, pm_message_t state)
- {
-       struct mmc_host *mmc = platform_get_drvdata(dev);
-       struct glamo_mci_host   *host = mmc_priv(mmc);
-+      int ret;
-       host->suspending++;
-       if (host->pdata->mci_all_dependencies_resumed)
-               (host->pdata->mci_suspending)(dev);
--      return mmc_suspend_host(mmc, state);
-+      ret = mmc_suspend_host(mmc, state);
-+
-+      /* so that when we resume, we use any modified max rate */
-+      mmc->f_max = sd_max_clk;
-+
-+      return ret;
- }
- int glamo_mci_resume(struct platform_device *dev)
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1216-fix-scard-stop-on-resume.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1216-fix-scard-stop-on-resume.patch.patch
deleted file mode 100755 (executable)
index fd225c3..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-From 81b94de6dbb00676ddca78219eacf41b1928b33f Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:20 +0100
-Subject: [PATCH] fix-scard-stop-on-resume.patch
- Reported-by: Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>
-
-The reporter noticed SD Card clock is running again after resume.  After
-looking at the code I saw I missed two tricks, this will force it off
-after resume and will do better generally depending on what the last SD Card
-packet was.
-
-Since bulk read packet is normally last action (which set the clock off even
-without this) the old patch worked for normal cases.  But after resume, the last
-packet on the wire was not a bulk transfer and we didn't take care about the
-clock then.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-mci.c |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index 67bb815..93f4074 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -619,12 +619,9 @@ done:
-       host->complete_what = COMPLETION_NONE;
-       host->mrq = NULL;
-       mmc_request_done(host->mmc, cmd->mrq);
--      return;
--
- bail:
-       /* stop the clock to card */
-       __glamo_mci_fix_card_div(host, -1);
--      return;
- }
- static void glamo_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)
-@@ -690,6 +687,9 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-       host->real_rate = __glamo_mci_set_card_clock(host, ios->clock, &div);
-       host->clk_div = div;
-+      /* stop the clock to card, because we are idle until transfer */
-+      __glamo_mci_fix_card_div(host, -1);
-+
-       if ((ios->power_mode == MMC_POWER_ON) ||
-           (ios->power_mode == MMC_POWER_UP)) {
-               dev_info(&host->pdev->dev,
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1217-debug-move-dev-info-to-dbg.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1217-debug-move-dev-info-to-dbg.patch.patch
deleted file mode 100755 (executable)
index e1c3b0a..0000000
+++ /dev/null
@@ -1,170 +0,0 @@
-From 6901f097adc3fce4e34861a1634915fe56344c55 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:20 +0100
-Subject: [PATCH] debug-move-dev-info-to-dbg.patch
- Suggested-by: Sean McNeil <sean@mcneil.com>
-
-To see if some subtle race is involved, Sean has tried
-removing syslog traffic during resume and found he was
-not seeing the resume crash any more.  We're giving it
-a try to see if it changes the behaviour for anyone
-else.  It would mean we have a pretty fine race in there
-somewhere.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |    4 ++--
- drivers/i2c/chips/pcf50633.c           |   28 ++++++++++++++--------------
- 2 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index dc27aea..de83939 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -95,7 +95,7 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-       if (!strcmp(attr->attr.name, "power_on")) {
-               if (on) {
-                       if (gta01_gsm.con) {
--                              dev_info(dev, "powering up GSM, thus "
-+                              dev_dbg(dev, "powering up GSM, thus "
-                                        "disconnecting serial console\n");
-                               console_stop(gta01_gsm.con);
-@@ -140,7 +140,7 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-                       if (gta01_gsm.con) {
-                               console_start(gta01_gsm.con);
--                              dev_info(dev, "powered down GSM, thus enabling "
-+                              dev_dbg(dev, "powered down GSM, thus enabling "
-                                        "serial console\n");
-                       }
-               }
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index fea2f38..4c73a9d 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -580,7 +580,7 @@ static void configure_pmu_for_charger(struct pcf50633_data *pcf,
-                * stop GPO / EN_HOSTUSB power driving out on the same
-                * USB power pins we have a 1A charger on right now!
-                */
--              dev_info(&pcf->client.dev, "Charger -> CHARGER_TYPE_1A\n");
-+              dev_dbg(&pcf->client.dev, "Charger -> CHARGER_TYPE_1A\n");
-               __reg_write(pcf, PCF50633_GPO - PCF50633_GPIO1 +
-                                PCF50633_REG_GPIO1CFG,
-                                __reg_read(pcf, PCF50633_GPO - PCF50633_GPIO1 +
-@@ -636,7 +636,7 @@ static void pcf50633_work_usbcurlim(struct work_struct *work)
-           (pcf->suspend_state == PCF50633_SS_COMPLETED_SUSPEND))
-               goto bail;
--      dev_info(&pcf->client.dev, "pcf50633_work_usbcurlim\n");
-+      dev_dbg(&pcf->client.dev, "pcf50633_work_usbcurlim\n");
-       if (!pcf->probe_completed)
-               goto reschedule;
-@@ -656,7 +656,7 @@ static void pcf50633_work_usbcurlim(struct work_struct *work)
-       /* OK let's set the requested limit and finish */
--      dev_info(&pcf->client.dev, "pcf50633_work_usbcurlim setting %dmA\n",
-+      dev_dbg(&pcf->client.dev, "pcf50633_work_usbcurlim setting %dmA\n",
-                                                        pcf->pending_curlimit);
-       pcf50633_usb_curlim_set(pcf, pcf->pending_curlimit);
-@@ -665,7 +665,7 @@ bail:
-       return;
- reschedule:
--      dev_info(&pcf->client.dev, "pcf50633_work_usbcurlim rescheduling\n");
-+      dev_dbg(&pcf->client.dev, "pcf50633_work_usbcurlim rescheduling\n");
-       if (!schedule_work(&pcf->work_usb_curlimit))
-               dev_err(&pcf->client.dev, "curlim reschedule work "
-                                                           "already queued\n");
-@@ -694,7 +694,7 @@ int pcf50633_notify_usb_current_limit_change(struct pcf50633_data *pcf,
-               return -EBUSY;
-       }
--      dev_info(&pcf->client.dev,
-+      dev_dbg(&pcf->client.dev,
-                "pcf50633_notify_usb_current_limit_change %dmA\n", ma);
-       /* prepare to detect USB power removal before we complete */
-@@ -1213,7 +1213,7 @@ reschedule:
-       if ((pcf->suspend_state != PCF50633_SS_STARTING_SUSPEND) &&
-           (pcf->suspend_state != PCF50633_SS_COMPLETED_SUSPEND)) {
-               msleep(10);
--              dev_info(&pcf->client.dev, "rescheduling interrupt service\n");
-+              dev_dbg(&pcf->client.dev, "rescheduling interrupt service\n");
-       }
-       if (!schedule_work(&pcf->work))
-               dev_err(&pcf->client.dev, "int service reschedule failed\n");
-@@ -1227,7 +1227,7 @@ static irqreturn_t pcf50633_irq(int irq, void *_pcf)
-       struct pcf50633_data *pcf = _pcf;
-       DEBUGP("entering(irq=%u, pcf=%p): scheduling work\n", irq, _pcf);
--      dev_info(&pcf->client.dev, "pcf50633_irq scheduling work\n");
-+      dev_dbg(&pcf->client.dev, "pcf50633_irq scheduling work\n");
-       get_device(&pcf->client.dev);
-       if (!schedule_work(&pcf->work) && !pcf->working)
-@@ -1739,7 +1739,7 @@ static int pcf50633_rtc_read_time(struct device *dev, struct rtc_time *tm)
-       mutex_unlock(&pcf->lock);
--      dev_info(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
-+      dev_dbg(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
-               pcf_tm.time[PCF50633_TI_DAY],
-               pcf_tm.time[PCF50633_TI_MONTH],
-               pcf_tm.time[PCF50633_TI_YEAR],
-@@ -1749,7 +1749,7 @@ static int pcf50633_rtc_read_time(struct device *dev, struct rtc_time *tm)
-       pcf2rtc_time(tm, &pcf_tm);
--      dev_info(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
-+      dev_dbg(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
-               tm->tm_mday, tm->tm_mon, tm->tm_year,
-               tm->tm_hour, tm->tm_min, tm->tm_sec);
-@@ -1763,11 +1763,11 @@ static int pcf50633_rtc_set_time(struct device *dev, struct rtc_time *tm)
-       struct pcf50633_time pcf_tm;
-       int ret;
--      dev_info(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
-+      dev_dbg(dev, "RTC_TIME: %u.%u.%u %u:%u:%u\n",
-               tm->tm_mday, tm->tm_mon, tm->tm_year,
-               tm->tm_hour, tm->tm_min, tm->tm_sec);
-       rtc2pcf_time(&pcf_tm, tm);
--      dev_info(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
-+      dev_dbg(dev, "PCF_TIME: %02x.%02x.%02x %02x:%02x:%02x\n",
-               pcf_tm.time[PCF50633_TI_DAY],
-               pcf_tm.time[PCF50633_TI_MONTH],
-               pcf_tm.time[PCF50633_TI_YEAR],
-@@ -2430,7 +2430,7 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
-               else
-                       tmp = pcf->standby_regs.ldo[(i - 4) * 2 + 1];
--              dev_info(dev, "disabling reg %s by setting ENA %d to 0x%02X\n",
-+              dev_dbg(dev, "disabling reg %s by setting ENA %d to 0x%02X\n",
-                             pcf->pdata->rails[i].name,
-                             regulator_registers[i] + 1, tmp & 0xfe);
-@@ -2505,7 +2505,7 @@ EXPORT_SYMBOL_GPL(pcf50633_wait_for_ready);
- void pcf50633_backlight_resume(struct pcf50633_data *pcf)
- {
--      dev_info(&pcf->client.dev, "pcf50633_backlight_resume\n");
-+      dev_dbg(&pcf->client.dev, "pcf50633_backlight_resume\n");
-       /* platform defines resume ramp speed */
-       reg_write(pcf, PCF50633_REG_LEDDIM,
-@@ -2524,7 +2524,7 @@ static int pcf50633_resume(struct device *dev)
-       u8 res[5];
-       u8 misc[PCF50633_REG_LEDDIM - PCF50633_REG_AUTOOUT + 1];
--      dev_info(dev, "pcf50633_resume suspended on entry = %d\n",
-+      dev_dbg(dev, "pcf50633_resume suspended on entry = %d\n",
-                                                (int)pcf->suspend_state);
-       mutex_lock(&pcf->lock);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1218-debug-add-glamo-drive-strength-module-param.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1218-debug-add-glamo-drive-strength-module-param.patch.patch
deleted file mode 100755 (executable)
index dd0fcff..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-From e1bc0be9f95559ae154d24b353e404c781798da1 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:20 +0100
-Subject: [PATCH] debug-add-glamo-drive-strength-module-param.patch
- Suggested-by: Werner Almesberger <werner@openmoko.org>
-
-This patch allows users to control two additional settings
-in Glamo MCI driver from kernel commandline or module
-parameters.
-
-
-First is Glamo drive strength on SD IOs including CLK.
-This ranges from 0 (weakest) to 3 (strongest).
-
-echo 0 > /sys/module/glamo_mci/parameters/sd_drive
-
-(Changes to this take effect on next SD Card transaction)
-
-or, from kernel commandline
-
-glamo_mci.sd_drive=0
-
-On tests here with 0 strength, communication to SD card
-(shipped 512MB Sandisk) seemed fine, and a dd of 10MB
-urandom had the same md5 when written to cache as after
-a reboot.  I set the default to 2.
-
-
-Second is whether we allow SD_CLK when the SD interface
-is idle.
-
-# stop the clock when we are idle (default)
-echo 0 > /sys/module/glamo_mci/parameters/sd_idleclk
-
-# run the SD clock all the time
-echo 1 > /sys/module/glamo_mci/parameters/sd_idleclk
-
-(changes take effect on next SD Card transaction)
-
-From kernel commandline, eg:
-
-glamo_mci.sd_idleclk=1
-
-Normally you don't want to run the SD Clock all the time.
-
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-mci.c |   59 +++++++++++++++++++++++++++++++---------
- 1 files changed, 45 insertions(+), 14 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index 93f4074..4615033 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -56,6 +56,32 @@ static void glamo_mci_send_request(struct mmc_host *mmc);
- static int sd_max_clk = 50000000 / 3;
- module_param(sd_max_clk, int, 0644);
-+/*
-+ * SD Signal drive strength
-+ *
-+ * you can override this on kernel commandline using
-+ *
-+ *   glamo_mci.sd_drive=0
-+ *
-+ * for example
-+ */
-+
-+static int sd_drive = 2;
-+module_param(sd_drive, int, 0644);
-+
-+/*
-+ * SD allow SD clock to run while idle
-+ *
-+ * you can override this on kernel commandline using
-+ *
-+ *   glamo_mci.sd_idleclk=0
-+ *
-+ * for example
-+ */
-+
-+static int sd_idleclk = 0; /* disallow idle clock by default */
-+module_param(sd_idleclk, int, 0644);
-+
- unsigned char CRC7(u8 * pu8, int cnt)
-@@ -239,7 +265,9 @@ static int __glamo_mci_set_card_clock(struct glamo_mci_host *host, int freq,
-               if (division)
-                       *division = 0xff;
--              __glamo_mci_fix_card_div(host, -1); /* clock off */
-+              if (!sd_idleclk)
-+                      /* clock off */
-+                      __glamo_mci_fix_card_div(host, -1);
-       }
-       return real_rate;
-@@ -294,8 +322,9 @@ static void glamo_mci_irq(unsigned int irq, struct irq_desc *desc)
-               host->cmd_is_stop = 0;
-       }
--      /* clock off */
--      __glamo_mci_fix_card_div(host, -1);
-+      if (!sd_idleclk)
-+              /* clock off */
-+              __glamo_mci_fix_card_div(host, -1);
- done:
-       host->complete_what = COMPLETION_NONE;
-@@ -428,12 +457,10 @@ static int glamo_mci_send_command(struct glamo_mci_host *host,
-       } else
-               writew(0xfff, host->base + GLAMO_REG_MMC_TIMEOUT);
--      /* Generate interrupt on txfer; drive strength max */
--      writew_dly((readw_dly(host->base + GLAMO_REG_MMC_BASIC) & 0xfe) |
-+      /* Generate interrupt on txfer */
-+      writew_dly((readw_dly(host->base + GLAMO_REG_MMC_BASIC) & 0x3e) |
-                  0x0800 | GLAMO_BASIC_MMC_NO_CLK_RD_WAIT |
--                 GLAMO_BASIC_MMC_EN_COMPL_INT |
--                 GLAMO_BASIC_MMC_EN_DR_STR0 |
--                 GLAMO_BASIC_MMC_EN_DR_STR1,
-+                 GLAMO_BASIC_MMC_EN_COMPL_INT | (sd_drive << 6),
-                  host->base + GLAMO_REG_MMC_BASIC);
-       /* send the command out on the wire */
-@@ -620,8 +647,9 @@ done:
-       host->mrq = NULL;
-       mmc_request_done(host->mmc, cmd->mrq);
- bail:
--      /* stop the clock to card */
--      __glamo_mci_fix_card_div(host, -1);
-+      if (!sd_idleclk)
-+              /* stop the clock to card */
-+              __glamo_mci_fix_card_div(host, -1);
- }
- static void glamo_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)
-@@ -687,8 +715,9 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-       host->real_rate = __glamo_mci_set_card_clock(host, ios->clock, &div);
-       host->clk_div = div;
--      /* stop the clock to card, because we are idle until transfer */
--      __glamo_mci_fix_card_div(host, -1);
-+      if (!sd_idleclk)
-+              /* stop the clock to card, because we are idle until transfer */
-+              __glamo_mci_fix_card_div(host, -1);
-       if ((ios->power_mode == MMC_POWER_ON) ||
-           (ios->power_mode == MMC_POWER_UP)) {
-@@ -705,8 +734,10 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-       if (host->bus_width == MMC_BUS_WIDTH_4)
-               n = GLAMO_BASIC_MMC_EN_4BIT_DATA;
-       writew_dly((readw_dly(host->base + GLAMO_REG_MMC_BASIC) &
--                                        (~GLAMO_BASIC_MMC_EN_4BIT_DATA)) | n,
--                                            host->base + GLAMO_REG_MMC_BASIC);
-+                                        (~(GLAMO_BASIC_MMC_EN_4BIT_DATA |
-+                                           GLAMO_BASIC_MMC_EN_DR_STR0 |
-+                                           GLAMO_BASIC_MMC_EN_DR_STR1))) | n |
-+                             sd_drive << 6, host->base + GLAMO_REG_MMC_BASIC);
- }
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1219-fix-bq27000-charger-state-tracking.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1219-fix-bq27000-charger-state-tracking.patch.patch
deleted file mode 100755 (executable)
index 37458c2..0000000
+++ /dev/null
@@ -1,283 +0,0 @@
-From 40023f1501f3cd5ec55739b3142e9e45a67bb735 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:20 +0100
-Subject: [PATCH] fix-bq27000-charger-state-tracking.patch
-
-Charger trigger stuff goes and asks for POWER_SUPPLY_PROP_STATUS
-to figure out what the charger state is.  But until now, we only
-reported there what we found out from HDQ, and the HDQ registers
-are not updated very often in the coulomb counter, it can be 4
-or more second lag before it tells us about what it experiences.
-
-When we react to USB insertion and only after 500ms debounce tell
-power_supply stuff that something changed, it most times will
-see old pre-USB-insertion state from bq27000 over HDQ at that time
-and will report it ain't charging, buggering up the LED trigger
-tracking.
-
-This patch maintains distance between bq27000 and pcf50633 by
-having platform callbacks in bq27000 that it can use to ask about
-definitive charger "online" presence and "activity", whether the
-charger says it is charging.  If these callbacks are implemented
-(and we implement them in this patch up in mach_gta02.c) then
-this information is used in preference to what is found from
-HDQ.
-
-Result is if you set the LED trigger like this:
-
-echo bat-charging > /sys/devices/platform/gta02-led.0/leds/gta02-aux:red/trigger
-
-then it lights up properly on USB insertion now, goes away on
-removal properly, as as far as I saw, when charging stops too.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   32 ++++++++++++++---
- drivers/power/bq27000_battery.c    |   66 ++++++++++++++++++++++++-----------
- include/linux/bq27000_battery.h    |    2 +
- 3 files changed, 73 insertions(+), 27 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index f30abb6..1fcd3fd 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -96,6 +96,9 @@ struct resume_dependency resume_dep_jbt_glamo;
- struct resume_dependency resume_dep_glamo_mci_pcf;
-+static int gta02_charger_online_status;
-+static int gta02_charger_active_status;
-+
- /* define FIQ IPC struct */
- /*
-  * contains stuff FIQ ISR modifies and normal kernel code can see and use
-@@ -457,12 +460,25 @@ static struct s3c2410_uartcfg gta02_uartcfgs[] = {
- /* BQ27000 Battery */
-+static int gta02_get_charger_online_status(void)
-+{
-+      return gta02_charger_online_status;
-+}
-+
-+static int gta02_get_charger_active_status(void)
-+{
-+      return gta02_charger_active_status;
-+}
-+
-+
- struct bq27000_platform_data bq27000_pdata = {
-       .name = "bat",
-       .rsense_mohms = 20,
-       .hdq_read = gta02hdq_read,
-       .hdq_write = gta02hdq_write,
-       .hdq_initialized = gta02hdq_initialized,
-+      .get_charger_online_status = gta02_get_charger_online_status,
-+      .get_charger_active_status = gta02_get_charger_active_status
- };
- struct platform_device bq27000_battery_device = {
-@@ -481,16 +497,20 @@ static int pmu_callback(struct device *dev, unsigned int feature,
-       switch (feature) {
-       case PCF50633_FEAT_MBC:
-               switch (event) {
--              case PMU_EVT_INSERT:
-+              case PMU_EVT_CHARGER_IDLE:
-+                      gta02_charger_active_status = 0;
-+                      break;
-+              case PMU_EVT_CHARGER_ACTIVE:
-+                      gta02_charger_active_status = 1;
-+                      break;
-               case PMU_EVT_USB_INSERT:
--                      pcf50633_charge_enable(pcf50633_global, 1);
-+                      gta02_charger_online_status = 1;
-                       break;
--              case PMU_EVT_REMOVE:
-               case PMU_EVT_USB_REMOVE:
--                      pcf50633_charge_enable(pcf50633_global, 0);
-+                      gta02_charger_online_status = 0;
-                       break;
--              case PMU_EVT_CHARGER_IDLE:
--              case PMU_EVT_CHARGER_ACTIVE:
-+              case PMU_EVT_INSERT: /* adapter is unsused */
-+              case PMU_EVT_REMOVE: /* adapter is unused */
-                       break;
-               default:
-                       break;
-diff --git a/drivers/power/bq27000_battery.c b/drivers/power/bq27000_battery.c
-index 5598568..7020608 100644
---- a/drivers/power/bq27000_battery.c
-+++ b/drivers/power/bq27000_battery.c
-@@ -113,12 +113,7 @@ enum bq27000_status_flags {
- struct bq27000_device_info {
-       struct device *dev;
-       struct power_supply bat;
--
--      int rsense_mohms;               /* from platform */
--
--      int (*hdq_initialized)(void); /* from platform */
--      int (*hdq_read)(int); /* from platform */
--      int (*hdq_write)(int, u8); /* from platform */
-+      struct bq27000_platform_data *pdata;
- };
- /*
-@@ -136,16 +131,16 @@ static int hdq_read16(struct bq27000_device_info *di, int address)
-       while (retries--) {
--              high = (di->hdq_read)(address + 1); /* high part */
-+              high = (di->pdata->hdq_read)(address + 1); /* high part */
-               if (high < 0)
-                       return high;
--              acc = (di->hdq_read)(address);
-+              acc = (di->pdata->hdq_read)(address);
-               if (acc < 0)
-                       return acc;
-               /* confirm high didn't change between reading it and low */
--              if (high == (di->hdq_read)(address + 1))
-+              if (high == (di->pdata->hdq_read)(address + 1))
-                       return (high << 8) | acc;
-       }
-@@ -170,12 +165,36 @@ static int bq27000_battery_get_property(struct power_supply *psy,
-       int v, n;
-       struct bq27000_device_info *di = to_bq27000_device_info(psy);
--      if (!(di->hdq_initialized)())
-+      if (!(di->pdata->hdq_initialized)())
-               return -EINVAL;
-       switch (psp) {
-       case POWER_SUPPLY_PROP_STATUS:
-               val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
-+
-+              if (!di->pdata->get_charger_online_status)
-+                      goto use_bat;
-+              if ((di->pdata->get_charger_online_status)()) {
-+                      /*
-+                       * charger is definitively present
-+                       * we report our state in terms of what it says it
-+                       * is doing
-+                       */
-+                      if (!di->pdata->get_charger_active_status)
-+                              goto use_bat;
-+                      if ((di->pdata->get_charger_active_status)())
-+                              val->intval = POWER_SUPPLY_STATUS_CHARGING;
-+                      else
-+                              val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
-+                      break;
-+              }
-+use_bat:
-+              /*
-+               * either the charger is not connected, or the
-+               * platform doesn't give info about charger, use battery state
-+               * but... battery state can be out of date by 4 seconds or
-+               * so... use the platform callbacks if possible.
-+               */
-               v = hdq_read16(di, BQ27000_AI_L);
-               if (v < 0)
-                       return v;
-@@ -189,7 +208,7 @@ static int bq27000_battery_get_property(struct power_supply *psy,
-                       break;
-               }
-               /* power is actually going in or out... */
--              v = (di->hdq_read)(BQ27000_FLAGS);
-+              v = (di->pdata->hdq_read)(BQ27000_FLAGS);
-               if (v < 0)
-                       return v;
-               if (v & BQ27000_STATUS_CHGS)
-@@ -205,7 +224,7 @@ static int bq27000_battery_get_property(struct power_supply *psy,
-               val->intval = v * 1000;
-               break;
-       case POWER_SUPPLY_PROP_CURRENT_NOW:
--              v = (di->hdq_read)(BQ27000_FLAGS);
-+              v = (di->pdata->hdq_read)(BQ27000_FLAGS);
-               if (v < 0)
-                       return v;
-               if (v & BQ27000_STATUS_CHGS)
-@@ -215,13 +234,13 @@ static int bq27000_battery_get_property(struct power_supply *psy,
-               v = hdq_read16(di, BQ27000_AI_L);
-               if (v < 0)
-                       return v;
--              val->intval = (v * n) / di->rsense_mohms;
-+              val->intval = (v * n) / di->pdata->rsense_mohms;
-               break;
-       case POWER_SUPPLY_PROP_CHARGE_FULL:
-               v = hdq_read16(di, BQ27000_LMD_L);
-               if (v < 0)
-                       return v;
--              val->intval = (v * 3570) / di->rsense_mohms;
-+              val->intval = (v * 3570) / di->pdata->rsense_mohms;
-               break;
-       case POWER_SUPPLY_PROP_TEMP:
-               v = hdq_read16(di, BQ27000_TEMP_L);
-@@ -235,12 +254,12 @@ static int bq27000_battery_get_property(struct power_supply *psy,
-               val->intval = POWER_SUPPLY_TECHNOLOGY_LION;
-               break;
-       case POWER_SUPPLY_PROP_CAPACITY:
--              val->intval = (di->hdq_read)(BQ27000_RSOC);
-+              val->intval = (di->pdata->hdq_read)(BQ27000_RSOC);
-               if (val->intval < 0)
-                       return val->intval;
-               break;
-       case POWER_SUPPLY_PROP_PRESENT:
--              v = (di->hdq_read)(BQ27000_RSOC);
-+              v = (di->pdata->hdq_read)(BQ27000_RSOC);
-               val->intval = !(v < 0);
-               break;
-       case POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW:
-@@ -255,6 +274,12 @@ static int bq27000_battery_get_property(struct power_supply *psy,
-                       return v;
-               val->intval = 60 * v;
-               break;
-+      case POWER_SUPPLY_PROP_ONLINE:
-+              if (di->pdata->get_charger_online_status)
-+                      val->intval = (di->pdata->get_charger_online_status)();
-+              else
-+                      return -EINVAL;
-+              break;
-       default:
-               return -EINVAL;
-       }
-@@ -272,7 +297,8 @@ static enum power_supply_property bq27000_battery_props[] = {
-       POWER_SUPPLY_PROP_PRESENT,
-       POWER_SUPPLY_PROP_TIME_TO_EMPTY_NOW,
-       POWER_SUPPLY_PROP_TIME_TO_FULL_NOW,
--      POWER_SUPPLY_PROP_CAPACITY
-+      POWER_SUPPLY_PROP_CAPACITY,
-+      POWER_SUPPLY_PROP_ONLINE
- };
- static int bq27000_battery_probe(struct platform_device *pdev)
-@@ -301,10 +327,8 @@ static int bq27000_battery_probe(struct platform_device *pdev)
-       di->bat.get_property   = bq27000_battery_get_property;
-       di->bat.external_power_changed =
-                                 bq27000_battery_external_power_changed;
--      di->hdq_read = pdata->hdq_read;
--      di->hdq_write = pdata->hdq_write;
--      di->rsense_mohms = pdata->rsense_mohms;
--      di->hdq_initialized = pdata->hdq_initialized;
-+      di->bat.use_for_apm = 1;
-+      di->pdata = pdata;
-       retval = power_supply_register(&pdev->dev, &di->bat);
-       if (retval) {
-diff --git a/include/linux/bq27000_battery.h b/include/linux/bq27000_battery.h
-index fed4287..a617466 100644
---- a/include/linux/bq27000_battery.h
-+++ b/include/linux/bq27000_battery.h
-@@ -9,6 +9,8 @@ struct bq27000_platform_data {
-       int (*hdq_read)(int);
-       int (*hdq_write)(int, u8);
-       int (*hdq_initialized)(void);
-+      int (*get_charger_online_status)(void);
-+      int (*get_charger_active_status)(void);
- };
- #endif
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1220-fix-glamo-mci-set-default-drive-level-0.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1220-fix-glamo-mci-set-default-drive-level-0.patch.patch
deleted file mode 100755 (executable)
index d1013b9..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-From 8d308488028a326be1180b20b83b6384cd7eaf42 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:20 +0100
-Subject: [PATCH] fix-glamo-mci-set-default-drive-level-0.patch
-
-Tests on access to SD Card with Glamo drive level "0" show
-that it reduces SD_CLK energy at 1.5GHz by 24dBm compared to
-drive level 3.  This puts it only 6dB above the background
-noise floor compared to 30dB and should make a solution for
-GPS trouble with SD Card in.
-
-SD card communication seems unaffected so far on the Sandisk
-512MB card we ship.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-mci.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index 4615033..0374446 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -66,7 +66,7 @@ module_param(sd_max_clk, int, 0644);
-  * for example
-  */
--static int sd_drive = 2;
-+static int sd_drive;
- module_param(sd_drive, int, 0644);
- /*
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1221-fix-pcf50633-remove-charger-curlim-and-enable-apis-f.patch b/target/linux/s3c24xx/patches-2.6.26/1221-fix-pcf50633-remove-charger-curlim-and-enable-apis-f.patch
deleted file mode 100755 (executable)
index 0738515..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-From 7492337c1344eb0d51a4f60f687d1aebc3670468 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:21 +0100
-Subject: [PATCH] fix-pcf50633-remove-charger-curlim-and-enable-apis-from-export.patch
-
-Setting the current limit directly and enabling the charger
-isn't anyone's business except pcf50633 driver itself, so these
-two functions should not be exported and become static.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |   10 ++++++----
- include/linux/pcf50633.h     |    6 ------
- 2 files changed, 6 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 4c73a9d..a5efb4e 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -194,6 +194,10 @@ EXPORT_SYMBOL_GPL(pcf50633_global);
- static struct platform_device *pcf50633_pdev;
-+static void pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma);
-+static void pcf50633_charge_enable(struct pcf50633_data *pcf, int on);
-+
-+
- /***********************************************************************
-  * Low-Level routines
-  ***********************************************************************/
-@@ -1384,7 +1388,7 @@ static DEVICE_ATTR(voltage_hcldo, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
-  ***********************************************************************/
- /* Set maximum USB current limit */
--void pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma)
-+static void pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma)
- {
-       u_int8_t bits;
-@@ -1437,7 +1441,6 @@ set_it:
-                               PCF50633_MBCC1_AUTORES);
- }
--EXPORT_SYMBOL_GPL(pcf50633_usb_curlim_set);
- static ssize_t show_usblim(struct device *dev, struct device_attribute *attr,
-                          char *buf)
-@@ -1462,7 +1465,7 @@ static ssize_t show_usblim(struct device *dev, struct device_attribute *attr,
- static DEVICE_ATTR(usb_curlim, S_IRUGO | S_IWUSR, show_usblim, NULL);
- /* Enable/disable charging */
--void pcf50633_charge_enable(struct pcf50633_data *pcf, int on)
-+static void pcf50633_charge_enable(struct pcf50633_data *pcf, int on)
- {
-       u_int8_t bits;
-       u_int8_t usblim;
-@@ -1499,7 +1502,6 @@ void pcf50633_charge_enable(struct pcf50633_data *pcf, int on)
-       reg_set_bit_mask(pcf, PCF50633_REG_MBCC1, PCF50633_MBCC1_CHGENA,
-                        bits);
- }
--EXPORT_SYMBOL_GPL(pcf50633_charge_enable);
- #if 0
- #define ONE                   1000000
-diff --git a/include/linux/pcf50633.h b/include/linux/pcf50633.h
-index b4d65dc..c11a637 100644
---- a/include/linux/pcf50633.h
-+++ b/include/linux/pcf50633.h
-@@ -111,12 +111,6 @@ pcf50633_onoff_set(struct pcf50633_data *pcf,
-                  enum pcf50633_regulator_id reg, int on);
- extern void
--pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma);
--
--extern void
--pcf50633_charge_enable(struct pcf50633_data *pcf, int on);
--
--extern void
- pcf50633_backlight_resume(struct pcf50633_data *pcf);
- extern u_int16_t
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1222-fix-pcf50633-only-do-platform-callback-once-per-even.patch b/target/linux/s3c24xx/patches-2.6.26/1222-fix-pcf50633-only-do-platform-callback-once-per-even.patch
deleted file mode 100755 (executable)
index c2b249b..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-From 91536c74c12a312e9d2e045daf4f7345ba6f2362 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:21 +0100
-Subject: [PATCH] fix-pcf50633-only-do-platform-callback-once-per-event.patch
- Reported-by: Holger Freyther <zecke@openmoko.org>
-
-We harmlessly repeated PMU platform callbacks about charging state twice.
-Clean it up and leave it to pcf50633_charge_enable() to report once.
-
-Also tidies the sequencing so we set current limit before we enable
-charger now.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |   27 ++++++++++++++-------------
- 1 files changed, 14 insertions(+), 13 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index a5efb4e..01ffa1d 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1391,6 +1391,7 @@ static DEVICE_ATTR(voltage_hcldo, S_IRUGO | S_IWUSR, show_vreg, set_vreg);
- static void pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma)
- {
-       u_int8_t bits;
-+      int active = 0;
-       pcf->last_curlim_set = ma;
-@@ -1406,17 +1407,16 @@ static void pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma)
-       else
-               bits = PCF50633_MBCC7_USB_SUSPEND;
--      DEBUGPC("pcf50633_usb_curlim_set -> %dmA\n", ma);
--
--      if (!pcf->pdata->cb)
--              goto set_it;
-+      /* set the nearest charging limit */
-+      reg_set_bit_mask(pcf, PCF50633_REG_MBCC7, PCF56033_MBCC7_USB_MASK,
-+                       bits);
-+      /* with this charging limit, is charging actually meaningful? */
-       switch (bits) {
--      case PCF50633_MBCC7_USB_100mA:
--      case PCF50633_MBCC7_USB_SUSPEND:
--               /* no charging is gonna be happening */
--              pcf->pdata->cb(&pcf->client.dev,
--                             PCF50633_FEAT_MBC, PMU_EVT_CHARGER_IDLE);
-+      case PCF50633_MBCC7_USB_500mA:
-+      case PCF50633_MBCC7_USB_1000mA:
-+              /* yes with this charging limit, we can do real charging */
-+              active = 1;
-               break;
-       default: /* right charging context that if there is power, we charge */
-               if (pcf->flags & PCF50633_F_USB_PRESENT)
-@@ -1424,10 +1424,11 @@ static void pcf50633_usb_curlim_set(struct pcf50633_data *pcf, int ma)
-                              PCF50633_FEAT_MBC, PMU_EVT_CHARGER_ACTIVE);
-               break;
-       }
--
--set_it:
--      reg_set_bit_mask(pcf, PCF50633_REG_MBCC7, PCF56033_MBCC7_USB_MASK,
--                       bits);
-+      /*
-+       * enable or disable charging according to current limit -- this will
-+       * also throw a platform notification callback about it
-+       */
-+      pcf50633_charge_enable(pcf50633_global, active);
-       /* clear batfull */
-       reg_set_bit_mask(pcf, PCF50633_REG_MBCC1,
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1223-fix-glamo-mci-possible-timeout-overflow.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1223-fix-glamo-mci-possible-timeout-overflow.patch.patch
deleted file mode 100755 (executable)
index 2bdfca4..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-From 1d40ccabc74877cc47fa91490b772e9611215b39 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:21 +0100
-Subject: [PATCH] fix-glamo-mci-possible-timeout-overflow.patch
-
-The MMC stack hands us a timeout calibrated in SD_CLK clocks, but the
-Glamo can only deal with up to 65520 clocks of timeout.  If the stack
-handed us a request bigger than this, it would just wrap and the
-timeout we actually used would be way too short.
-
-With this patch if that happens, we use the longest timeout we can,
-65520 clocks and give it our best shot.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-mci.c |   19 ++++++++++---------
- 1 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index 0374446..505be5f 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -338,6 +338,7 @@ static int glamo_mci_send_command(struct glamo_mci_host *host,
- {
-       u8 u8a[6];
-       u16 fire = 0;
-+      u16 timeout = 0xfff; /* max glamo MMC timeout, in units of 16 clocks */
-       /* if we can't do it, reject as busy */
-       if (!readw_dly(host->base + GLAMO_REG_MMC_RB_STAT1) &
-@@ -447,15 +448,15 @@ static int glamo_mci_send_command(struct glamo_mci_host *host,
-               fire |= GLAMO_FIRE_MMC_CC_BASIC; /* "basic command" */
-               break;
-       }
--      /* enforce timeout */
--      if (cmd->data) {
--              if (cmd->data->timeout_clks)
--                      writew_dly(cmd->data->timeout_clks >> 4, /* / 16 clks */
--                                      host->base + GLAMO_REG_MMC_TIMEOUT);
--              else
--                      writew_dly(0xfff, host->base + GLAMO_REG_MMC_TIMEOUT);
--      } else
--              writew(0xfff, host->base + GLAMO_REG_MMC_TIMEOUT);
-+      /* enforce timeout, clipping at default 65520 clocks if larger */
-+      if (cmd->data)
-+              /* so long as there is one... */
-+              if (cmd->data->timeout_clks &&
-+                  /* ... and it is not longer than we can handle */
-+                  (cmd->data->timeout_clks <= 0xffff))
-+                      timeout = cmd->data->timeout_clks >> 4; /* / 16 clks */
-+
-+      writew(timeout, host->base + GLAMO_REG_MMC_TIMEOUT);
-       /* Generate interrupt on txfer */
-       writew_dly((readw_dly(host->base + GLAMO_REG_MMC_BASIC) & 0x3e) |
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1224-fix-glamo-mci-ensure-more-than-74-clocks-after-power.patch b/target/linux/s3c24xx/patches-2.6.26/1224-fix-glamo-mci-ensure-more-than-74-clocks-after-power.patch
deleted file mode 100755 (executable)
index 30a8230..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-From 2e9349e8be6002955cb0ab6a6ed536f5f8041cba Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:21 +0100
-Subject: [PATCH] fix-glamo-mci-ensure-more-than-74-clocks-after-power.patch
-
-We are meant to run SD_CLK a little while after power-on for the SD
-Card, but with the no idle clock changes we didn't take care about it.
-
-This makes us sleep a little bit before disabling clock if we just
-powered up the SD Card.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-mci.c |    8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index 505be5f..0d82955 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -684,6 +684,7 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-       struct glamo_mci_host *host = mmc_priv(mmc);
-       int n = 0;
-       int div;
-+      int powering = 0;
-       /* Set power */
-       switch(ios->power_mode) {
-@@ -699,6 +700,7 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-               glamo_engine_enable(glamo_mci_def_pdata.pglamo,
-                                                       GLAMO_ENGINE_MMC);
-               glamo_mci_reset(host);
-+              powering = 1;
-               break;
-       case MMC_POWER_OFF:
-@@ -716,6 +718,12 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-       host->real_rate = __glamo_mci_set_card_clock(host, ios->clock, &div);
-       host->clk_div = div;
-+      /* after power-up, we are meant to give it >= 74 clocks so it can
-+       * initialize itself.  Doubt any modern cards need it but anyway...
-+       */
-+      if (powering)
-+              msleep(1);
-+
-       if (!sd_idleclk)
-               /* stop the clock to card, because we are idle until transfer */
-               __glamo_mci_fix_card_div(host, -1);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1225-fix-pcf50633-bd-undef.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1225-fix-pcf50633-bd-undef.patch.patch
deleted file mode 100755 (executable)
index fbf0806..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7a0be373ddcdb6cdf139eda96309d0292ba7f2da Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:06:21 +0100
-Subject: [PATCH] fix-pcf50633-bd-undef.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/i2c/chips/pcf50633.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
-index 01ffa1d..e33833b 100644
---- a/drivers/i2c/chips/pcf50633.c
-+++ b/drivers/i2c/chips/pcf50633.c
-@@ -1886,8 +1886,8 @@ static int __pcf50633bl_set_intensity(struct pcf50633_data *pcf, int intensity)
-       if (!(reg_read(pcf, PCF50633_REG_LEDENA) & 1))
-               old_intensity = 0;
--      if ((bd->props.power != FB_BLANK_UNBLANK) ||
--          (bd->props.fb_blank != FB_BLANK_UNBLANK))
-+      if ((pcf->backlight->props.power != FB_BLANK_UNBLANK) ||
-+          (pcf->backlight->props.fb_blank != FB_BLANK_UNBLANK))
-               intensity = 0;
-       /*
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1226-fix-wm8753-DBG.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1226-fix-wm8753-DBG.patch.patch
deleted file mode 100755 (executable)
index e69de29..0000000
diff --git a/target/linux/s3c24xx/patches-2.6.26/1227-fix-s3c2410-serial-fwd-ref.patch.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1227-fix-s3c2410-serial-fwd-ref.patch.patch.patch
deleted file mode 100755 (executable)
index ffc521b..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-From 0535fda1958587000a4abe711a50d221e0f82379 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Fri, 25 Jul 2008 23:16:57 +0100
-Subject: [PATCH] fix-s3c2410-serial-fwd-ref.patch.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/serial/s3c2410.c |  129 +++++++++++++++++++++++----------------------
- 1 files changed, 66 insertions(+), 63 deletions(-)
-
-diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
-index f20f63b..b4833bd 100644
---- a/drivers/serial/s3c2410.c
-+++ b/drivers/serial/s3c2410.c
-@@ -1167,6 +1167,10 @@ static int s3c24xx_serial_resume(struct platform_device *dev)
- #define s3c24xx_serial_resume  NULL
- #endif
-+static void s3c24xx_serial_force_debug_port_up(void);
-+static void s3c2410_printascii(const char *sz);
-+
-+
- static int s3c24xx_serial_init(struct platform_driver *drv,
-                              struct s3c24xx_uart_info *info)
- {
-@@ -1521,6 +1525,68 @@ static struct platform_driver s3c2440_serial_drv = {
- };
-+static void s3c24xx_serial_force_debug_port_up(void)
-+{
-+      struct s3c24xx_uart_port *ourport = &s3c24xx_serial_ports[
-+                                                       CONFIG_DEBUG_S3C_UART];
-+      struct s3c24xx_uart_clksrc *clksrc = NULL;
-+      struct clk *clk = NULL;
-+      unsigned long tmp;
-+
-+      s3c24xx_serial_getclk(&ourport->port, &clksrc, &clk, 115200);
-+
-+      tmp = __raw_readl(S3C2410_CLKCON);
-+
-+      /* re-start uart clocks */
-+      tmp |= S3C2410_CLKCON_UART0;
-+      tmp |= S3C2410_CLKCON_UART1;
-+      tmp |= S3C2410_CLKCON_UART2;
-+
-+      __raw_writel(tmp, S3C2410_CLKCON);
-+      udelay(10);
-+
-+      s3c24xx_serial_setsource(&ourport->port, clksrc);
-+
-+      if (ourport->baudclk != NULL && !IS_ERR(ourport->baudclk)) {
-+              clk_disable(ourport->baudclk);
-+              ourport->baudclk  = NULL;
-+      }
-+
-+      clk_enable(clk);
-+
-+      ourport->clksrc = clksrc;
-+      ourport->baudclk = clk;
-+}
-+
-+static void s3c2410_printascii(const char *sz)
-+{
-+      struct s3c24xx_uart_port *ourport = &s3c24xx_serial_ports[
-+                                                       CONFIG_DEBUG_S3C_UART];
-+      struct uart_port *port = &ourport->port;
-+
-+      /* 8 N 1 */
-+      wr_regl(port, S3C2410_ULCON, (rd_regl(port, S3C2410_ULCON)) | 3);
-+      /* polling mode */
-+      wr_regl(port, S3C2410_UCON, (rd_regl(port, S3C2410_UCON) & ~0xc0f) | 5);
-+      /* disable FIFO */
-+      wr_regl(port, S3C2410_UFCON, (rd_regl(port, S3C2410_UFCON) & ~0x01));
-+      /* fix baud rate */
-+      wr_regl(port, S3C2410_UBRDIV, 26);
-+
-+      while (*sz) {
-+              int timeout = 10000000;
-+
-+              /* spin on it being busy */
-+              while ((!(rd_regl(port, S3C2410_UTRSTAT) & 2)) && timeout--)
-+                      ;
-+
-+              /* transmit register */
-+              wr_regl(port, S3C2410_UTXH, *sz);
-+
-+              sz++;
-+      }
-+}
-+
- static inline int s3c2440_serial_init(void)
- {
-       return s3c24xx_serial_init(&s3c2440_serial_drv, &s3c2440_uart_inf);
-@@ -1654,69 +1720,6 @@ static struct platform_driver s3c2412_serial_drv = {
-       },
- };
--static void s3c24xx_serial_force_debug_port_up(void)
--{
--      struct s3c24xx_uart_port *ourport = &s3c24xx_serial_ports[
--                                                       CONFIG_DEBUG_S3C_UART];
--      struct s3c24xx_uart_clksrc *clksrc = NULL;
--      struct clk *clk = NULL;
--      unsigned long tmp;
--
--      s3c24xx_serial_getclk(&ourport->port, &clksrc, &clk, 115200);
--
--      tmp = __raw_readl(S3C2410_CLKCON);
--
--      /* re-start uart clocks */
--      tmp |= S3C2410_CLKCON_UART0;
--      tmp |= S3C2410_CLKCON_UART1;
--      tmp |= S3C2410_CLKCON_UART2;
--
--      __raw_writel(tmp, S3C2410_CLKCON);
--      udelay(10);
--
--      s3c24xx_serial_setsource(&ourport->port, clksrc);
--
--      if (ourport->baudclk != NULL && !IS_ERR(ourport->baudclk)) {
--              clk_disable(ourport->baudclk);
--              ourport->baudclk  = NULL;
--      }
--
--      clk_enable(clk);
--
--      ourport->clksrc = clksrc;
--      ourport->baudclk = clk;
--}
--
--static void s3c2410_printascii(const char *sz)
--{
--      struct s3c24xx_uart_port *ourport = &s3c24xx_serial_ports[
--                                                       CONFIG_DEBUG_S3C_UART];
--      struct uart_port *port = &ourport->port;
--
--      /* 8 N 1 */
--      wr_regl(port, S3C2410_ULCON, (rd_regl(port, S3C2410_ULCON)) | 3);
--      /* polling mode */
--      wr_regl(port, S3C2410_UCON, (rd_regl(port, S3C2410_UCON) & ~0xc0f) | 5);
--      /* disable FIFO */
--      wr_regl(port, S3C2410_UFCON, (rd_regl(port, S3C2410_UFCON) & ~0x01));
--      /* fix baud rate */
--      wr_regl(port, S3C2410_UBRDIV, 26);
--
--      while (*sz) {
--              int timeout = 10000000;
--
--              /* spin on it being busy */
--              while ((!(rd_regl(port, S3C2410_UTRSTAT) & 2)) && timeout--)
--                      ;
--
--              /* transmit register */
--              wr_regl(port, S3C2410_UTXH, *sz);
--
--              sz++;
--      }
--}
--
--
- /* s3c24xx_serial_resetport
-  *
-  * wrapper to call the specific reset for this port (reset the fifos
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1228-fix-allow-full-sd-voltage-range-selection.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1228-fix-allow-full-sd-voltage-range-selection.patch.patch
deleted file mode 100755 (executable)
index c10da6a..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-From 0dd4b9a534db9bef8f2901c00ee58b00e14a49df Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 30 Jul 2008 14:36:42 +0100
-Subject: [PATCH] fix-allow-full-sd-voltage-range-selection.patch
-
-Until now we just drove the SD Card at 3.3V all the time.  But in
-fact we can do better, and use a voltage negotiated with the
-SD Card itself.
-
-With the shipping 512MB Sandisk SD Card, 2.7V is negotiated which
-gives 1.7dBm reduction in power on all the SD Card lines and should
-further reduce GPS perturbation during SD Card usage.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |   10 ++++------
- drivers/mfd/glamo/glamo-core.c     |   13 ++++++++++++-
- 2 files changed, 16 insertions(+), 7 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 1fcd3fd..382837d 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -604,7 +604,7 @@ static struct pcf50633_platform_data gta02_pcf_pdata = {
-               [PCF50633_REGULATOR_HCLDO] = {
-                       .name           = "sd_3v3",
-                       .voltage        = {
--                              .init   = 3300,
-+                              .init   = 2000,
-                               .max    = 3300,
-                       },
-               },
-@@ -1378,11 +1378,9 @@ gta02_glamo_mmc_set_power(unsigned char power_mode, unsigned short vdd)
-                               return;
-                       }
-                       /* select and set the voltage */
--                      if (vdd > 7) {
--                              mv += 300 + 100 * (vdd - 8);
--                              if (mv > 3500)
--                                      mv = 3500;
--                      }
-+                      if (vdd > 7)
-+                              mv += 350 + 100 * (vdd - 8);
-+                      printk(KERN_INFO "SD power -> %dmV\n", mv);
-                       pcf50633_voltage_set(pcf50633_global,
-                                            PCF50633_REGULATOR_HCLDO, mv);
-                       pcf50633_onoff_set(pcf50633_global,
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index ee33901..cb9b056 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -270,7 +270,18 @@ static struct platform_device glamo_mmc_dev = {
- struct glamo_mci_pdata glamo_mci_def_pdata = {
-       .gpio_detect            = 0,
-       .glamo_set_mci_power    = NULL, /* filled in from MFD platform data */
--      .ocr_avail              = MMC_VDD_32_33,
-+      .ocr_avail      = MMC_VDD_20_21 |
-+                        MMC_VDD_21_22 |
-+                        MMC_VDD_22_23 |
-+                        MMC_VDD_23_24 |
-+                        MMC_VDD_24_25 |
-+                        MMC_VDD_25_26 |
-+                        MMC_VDD_26_27 |
-+                        MMC_VDD_27_28 |
-+                        MMC_VDD_28_29 |
-+                        MMC_VDD_29_30 |
-+                        MMC_VDD_30_31 |
-+                        MMC_VDD_32_33,
-       .glamo_irq_is_wired     = NULL, /* filled in from MFD platform data */
-       .mci_suspending = NULL, /* filled in from MFD platform data */
-       .mci_all_dependencies_resumed = NULL, /* filled in from MFD platform data */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1229-fix-glamo-mci-dont-filter-voltage-change.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1229-fix-glamo-mci-dont-filter-voltage-change.patch.patch
deleted file mode 100755 (executable)
index ab8095a..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8ccb7946041773bb000a0c65cf30bd2392a5815f Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 30 Jul 2008 14:36:50 +0100
-Subject: [PATCH] fix-glamo-mci-dont-filter-voltage-change.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-mci.c |   11 +++++------
- 1 files changed, 5 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index 0d82955..7a2b060 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -690,17 +690,16 @@ static void glamo_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
-       switch(ios->power_mode) {
-       case MMC_POWER_ON:
-       case MMC_POWER_UP:
--              if (host->power_mode_current != MMC_POWER_OFF)
--                      break;
-               if (host->vdd_current != ios->vdd) {
-                       host->pdata->glamo_set_mci_power(ios->power_mode,
-                                                        ios->vdd);
-                       host->vdd_current = ios->vdd;
-               }
--              glamo_engine_enable(glamo_mci_def_pdata.pglamo,
--                                                      GLAMO_ENGINE_MMC);
--              glamo_mci_reset(host);
--              powering = 1;
-+              if (host->power_mode_current == MMC_POWER_OFF) {
-+                      glamo_engine_enable(glamo_mci_def_pdata.pglamo,
-+                                                            GLAMO_ENGINE_MMC);
-+                      powering = 1;
-+              }
-               break;
-       case MMC_POWER_OFF:
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1230-add-glamo-mci-slower-clocking-dynamic-switching.patc.patch b/target/linux/s3c24xx/patches-2.6.26/1230-add-glamo-mci-slower-clocking-dynamic-switching.patc.patch
deleted file mode 100755 (executable)
index 74442df..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-From 911b448d4b528c403f973f9e5aa34be94bffaf1e Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 30 Jul 2008 14:37:01 +0100
-Subject: [PATCH] add-glamo-mci-slower-clocking-dynamic-switching.patch
-
-This patch gives glamo-mci a concept of a platform-defined
-dynamic clock slowing callback.  It means that platform code
-can associate some completely external state to decide if
-we run the SD clock at normal rate or a rate divided by a
-module parameter "sd_slow_ratio", which you can set on
-kernel commandline like this:
-
-glamo_mci.sd_slow_ratio=8
-
-you can also change it at runtime by
-
-echo 8 > /sys/module/glamo_mci/parameters/sd_slow_ratio
-
-If no platform callback is defined, then no slow mode
-is used.  If it is defined, then the default division
-action is / 8, eg, 16MHz normal -> 2MHz slow mode.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-core.c |    2 ++
- drivers/mfd/glamo/glamo-core.h |    2 ++
- drivers/mfd/glamo/glamo-mci.c  |   30 ++++++++++++++++++++++++++++--
- include/linux/glamofb.h        |    2 ++
- 4 files changed, 34 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index cb9b056..0e7a650 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -1116,6 +1116,8 @@ static int __init glamo_probe(struct platform_device *pdev)
-       /* bring MCI specific stuff over from our MFD platform data */
-       glamo_mci_def_pdata.glamo_set_mci_power =
-                                       glamo->pdata->glamo_set_mci_power;
-+      glamo_mci_def_pdata.glamo_mci_use_slow =
-+                                      glamo->pdata->glamo_mci_use_slow;
-       glamo_mci_def_pdata.glamo_irq_is_wired =
-                                       glamo->pdata->glamo_irq_is_wired;
-       glamo_mci_def_pdata.mci_suspending =
-diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h
-index c89f810..dd6f67c 100644
---- a/drivers/mfd/glamo/glamo-core.h
-+++ b/drivers/mfd/glamo/glamo-core.h
-@@ -72,6 +72,8 @@ struct glamo_mci_pdata {
-       unsigned long   ocr_avail;
-       void            (*glamo_set_mci_power)(unsigned char power_mode,
-                                    unsigned short vdd);
-+      /* glamo-mci asking if it should use the slow clock to card */
-+      int             (*glamo_mci_use_slow)(void);
-       int             (*glamo_irq_is_wired)(void);
-       void            (*mci_suspending)(struct platform_device *dev);
-       int             (*mci_all_dependencies_resumed)(struct platform_device *dev);
-diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
-index 7a2b060..d34632a 100644
---- a/drivers/mfd/glamo/glamo-mci.c
-+++ b/drivers/mfd/glamo/glamo-mci.c
-@@ -57,6 +57,23 @@ static int sd_max_clk = 50000000 / 3;
- module_param(sd_max_clk, int, 0644);
- /*
-+ * Slow SD clock rate
-+ *
-+ * you can override this on kernel commandline using
-+ *
-+ *   glamo_mci.sd_slow_ratio=8
-+ *
-+ * for example
-+ *
-+ * platform callback is used to decide effective clock rate, if not
-+ * defined then max is used, if defined and returns nonzero, rate is
-+ * divided by this factor
-+ */
-+
-+static int sd_slow_ratio = 8;
-+module_param(sd_slow_ratio, int, 0644);
-+
-+/*
-  * SD Signal drive strength
-  *
-  * you can override this on kernel commandline using
-@@ -554,8 +571,17 @@ static void glamo_mci_send_request(struct mmc_host *mmc)
-                cmd->opcode, cmd->arg, cmd->data, cmd->mrq->stop,
-                cmd->flags);
--      /* resume requested clock rate */
--      __glamo_mci_fix_card_div(host, host->clk_div);
-+      /* resume requested clock rate
-+       * scale it down by sd_slow_ratio if platform requests it
-+       */
-+      if (host->pdata->glamo_mci_use_slow)
-+              if ((host->pdata->glamo_mci_use_slow)())
-+                      __glamo_mci_fix_card_div(host, host->clk_div *
-+                                                               sd_slow_ratio);
-+              else
-+                      __glamo_mci_fix_card_div(host, host->clk_div);
-+      else
-+              __glamo_mci_fix_card_div(host, host->clk_div);
-       if (glamo_mci_send_command(host, cmd))
-               goto bail;
-diff --git a/include/linux/glamofb.h b/include/linux/glamofb.h
-index bb1a398..ca63355 100644
---- a/include/linux/glamofb.h
-+++ b/include/linux/glamofb.h
-@@ -31,6 +31,8 @@ struct glamofb_platform_data {
-       /* glamo mmc platform specific info */
-       void            (*glamo_set_mci_power)(unsigned char power_mode,
-                                    unsigned short vdd);
-+      /* glamo-mci asking if it should use the slow clock to card */
-+      int             (*glamo_mci_use_slow)(void);
-       int             (*glamo_irq_is_wired)(void);
-       void            (*mci_suspending)(struct platform_device *dev);
-       int             (*mci_all_dependencies_resumed)(struct platform_device *dev);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1231-use-gta02-glamo-mci-sd-dynamic-clock.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1231-use-gta02-glamo-mci-sd-dynamic-clock.patch.patch
deleted file mode 100755 (executable)
index 98d670f..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-From cba90f4bb9fc765be789e7d9e0f836ad4670c87f Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 30 Jul 2008 14:37:17 +0100
-Subject: [PATCH] use-gta02-glamo-mci-sd-dynamic-clock.patch
-
-This patch uses the new glamo-mci slow clock ratio
-patch in order to dynamically reduce SD Card clock
-rate when the GPS unit is powered on GTA02.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c     |   12 ++++++++++++
- arch/arm/plat-s3c24xx/neo1973_pm_gps.c |   12 +++++++++---
- 2 files changed, 21 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 382837d..8e43c4a 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -85,6 +85,8 @@
- #include <linux/gta02_hdq.h>
- #include <linux/bq27000_battery.h>
-+#include "../plat-s3c24xx/neo1973_pm_gps.h"
-+
- /* arbitrates which sensor IRQ owns the shared SPI bus */
- static spinlock_t motion_irq_lock;
-@@ -1424,6 +1426,15 @@ static void gta02_glamo_mci_suspending(struct platform_device *dev)
- /* Smedia Glamo 3362 */
-+/*
-+ * we crank down SD Card clock dynamically when GPS is powered
-+ */
-+
-+static int gta02_glamo_mci_use_slow(void)
-+{
-+      return neo1973_pm_gps_is_on();
-+}
-+
- static struct glamofb_platform_data gta02_glamo_pdata = {
-       .width          = 43,
-       .height         = 58,
-@@ -1456,6 +1467,7 @@ static struct glamofb_platform_data gta02_glamo_pdata = {
-       /* glamo MMC function platform data */
-       .glamo_set_mci_power = gta02_glamo_mmc_set_power,
-+      .glamo_mci_use_slow = gta02_glamo_mci_use_slow,
-       .glamo_irq_is_wired = glamo_irq_is_wired,
-       .mci_suspending = gta02_glamo_mci_suspending,
-       .mci_all_dependencies_resumed =
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-index 8cd583d..a21b763 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
-@@ -39,6 +39,12 @@ struct neo1973_pm_gps_data {
- static struct neo1973_pm_gps_data neo1973_gps;
-+int neo1973_pm_gps_is_on(void)
-+{
-+      return neo1973_gps.power_was_on;
-+}
-+EXPORT_SYMBOL_GPL(neo1973_pm_gps_is_on);
-+
- /* This is the 2.8V supply for the RTC crystal, the mail clock crystal and
-  * the input to VDD_RF */
- static void gps_power_2v8_set(int on)
-@@ -265,6 +271,9 @@ static int gps_power_1v5_get(void)
- /* This is the POWERON pin */
- static void gps_pwron_set(int on)
- {
-+
-+      neo1973_gps.power_was_on = !!on;
-+
- #ifdef CONFIG_MACH_NEO1973_GTA01
-       if (machine_is_neo1973_gta01())
-               neo1973_gpb_setpin(GTA01_GPIO_GPS_PWRON, on);
-@@ -492,9 +501,6 @@ static DEVICE_ATTR(power_sequence, 0644, power_sequence_read,
- static int gta01_pm_gps_suspend(struct platform_device *pdev,
-                               pm_message_t state)
- {
--
--      neo1973_gps.power_was_on = gps_pwron_get();
--
- #ifdef CONFIG_MACH_NEO1973_GTA01
-       if (machine_is_neo1973_gta01()) {
-               /* FIXME */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1232-0003-a6k-sdio-Use-pnp_alloc_dev-to-properly-initiali.patch b/target/linux/s3c24xx/patches-2.6.26/1232-0003-a6k-sdio-Use-pnp_alloc_dev-to-properly-initiali.patch
deleted file mode 100755 (executable)
index 8b61dac..0000000
+++ /dev/null
@@ -1,264 +0,0 @@
-From 0e70d711fe8c81a98b77b35b56728e29a669a08b Mon Sep 17 00:00:00 2001
-From: Holger Freyther <zecke@openmoko.org>
-Date: Mon, 4 Aug 2008 08:34:39 +0100
-Subject: [PATCH] 0003-a6k-sdio-Use-pnp_alloc_dev-to-properly-initialize.patch
- Signed-Off-By: Holger Freyther <zecke@openmoko.org>
-
----
- drivers/sdio/function/wlan/ar6000/hif/hif.c |    2 +-
- drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c      |    6 +-
- drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h      |    4 +-
- drivers/sdio/stack/busdriver/sdio_bus_os.c  |   78 ++++++++++++++-------------
- include/linux/sdio/sdio_busdriver.h         |    2 +-
- include/linux/sdio/sdio_hcd_defs.h          |    2 +-
- 6 files changed, 48 insertions(+), 46 deletions(-)
-
-diff --git a/drivers/sdio/function/wlan/ar6000/hif/hif.c b/drivers/sdio/function/wlan/ar6000/hif/hif.c
-index 3d6d792..5171157 100644
---- a/drivers/sdio/function/wlan/ar6000/hif/hif.c
-+++ b/drivers/sdio/function/wlan/ar6000/hif/hif.c
-@@ -782,7 +782,7 @@ delHifDevice(SDDEVICE *handle)
- struct device*
- HIFGetOSDevice(HIF_DEVICE *device)
- {
--    return &device->handle->Device.dev;
-+    return &device->handle->Device->dev;
- }
- static void ResetAllCards(void)
-diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-index edb8523..09d81ee 100644
---- a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-+++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-@@ -1296,7 +1296,6 @@ struct s3c24xx_hcd_context hcd_context = {
-       .hcd.pContext = &hcd_context,
-       .hcd.pRequest = s3c24xx_hcd_request,
-       .hcd.pConfigure = s3c24xx_hcd_config,
--      .device.pnp_device.name = "sdio_s3c24xx_hcd",
-       .device.pnp_driver.name = "sdio_s3c24xx_hcd",
-       .device.pnp_driver.probe  = s3c24xx_hcd_pnp_probe,
-       .device.pnp_driver.remove = s3c24xx_hcd_pnp_remove,
-@@ -1348,7 +1347,7 @@ static int s3c24xx_hcd_probe(struct platform_device * pdev)
-       status = SDIO_BusAddOSDevice(&hcd_context.device.dma,
-                                    &hcd_context.device.pnp_driver,
--                                   &hcd_context.device.pnp_device);
-+                                   &hcd_context.device.pnp_device, "sdio_s3c24xx_hcd");
-  out:
-@@ -1360,7 +1359,8 @@ static int s3c24xx_hcd_probe(struct platform_device * pdev)
-  */
- static int s3c24xx_hcd_remove(struct platform_device * pdev) {
-       printk("S3C2440 SDIO host controller unloaded\n");
--      SDIO_BusRemoveOSDevice(&hcd_context.device.pnp_driver, &hcd_context.device.pnp_device);
-+      SDIO_BusRemoveOSDevice(&hcd_context.device.pnp_driver, hcd_context.device.pnp_device);
-+      kfree(hcd_context.device.pnp_device);
-       return 0;
- }
-diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
-index 47fdd33..f8b0912 100644
---- a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
-+++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
-@@ -8,8 +8,8 @@
- #define S3C24XX_HCD_DATA_WRITE      5
- struct s3c24xx_hcd_device {
--      OS_PNPDEVICE   pnp_device;     /* the OS device for this HCD */
--      OS_PNPDRIVER   pnp_driver;     /* the OS driver for this HCD */
-+      OS_PNPDEVICE *pnp_device;     /* the OS device for this HCD */
-+      OS_PNPDRIVER  pnp_driver;     /* the OS driver for this HCD */
-       SDDMA_DESCRIPTION dma;
-       struct clk * clock;
-       unsigned long max_clock_rate;
-diff --git a/drivers/sdio/stack/busdriver/sdio_bus_os.c b/drivers/sdio/stack/busdriver/sdio_bus_os.c
-index 2650d93..c6f68e6 100644
---- a/drivers/sdio/stack/busdriver/sdio_bus_os.c
-+++ b/drivers/sdio/stack/busdriver/sdio_bus_os.c
-@@ -415,8 +415,8 @@ struct pnp_protocol sdio_protocol = {
- */
- static int driver_probe(struct pnp_dev* pOSDevice, const struct pnp_device_id *pId)
- {
--    PSDDEVICE pDevice = SDDEVICE_FROM_OSDEVICE(pOSDevice);
--    PSDFUNCTION pFunction = pDevice->Device.dev.driver_data;
-+    PSDDEVICE pDevice = SDDEVICE_FROM_OSDEVICE(&pOSDevice);
-+    PSDFUNCTION pFunction = pDevice->Device->dev.driver_data;
-     if (pFunction == NULL) {
-         return -1;
-@@ -496,34 +496,32 @@ static int UnregisterDriver(PSDFUNCTION pFunction)
- */
- SDIO_STATUS OS_InitializeDevice(PSDDEVICE pDevice, PSDFUNCTION pFunction)
- {
--      char id_name[20];
-+    char id_name[20];
--    memset(&pDevice->Device, 0, sizeof(pDevice->Device));
--    pDevice->Device.dev.driver_data = (PVOID)pFunction;
-+    /* set the id as slot number/function number */
-+    snprintf(id_name, sizeof(id_name) - 1, "SD_%02X%02X",
-+             pDevice->pHcd->SlotNumber, (UINT)SDDEVICE_GET_SDIO_FUNCNO(pDevice));
-+
-+    pDevice->Device = pnp_alloc_dev(&sdio_protocol, pDevice->pHcd->SlotNumber + 1, id_name);
-+    pDevice->Device->dev.driver_data = (PVOID)pFunction;
- //??    pDevice->Device.data = (PVOID)pFunction;
- //??    pDevice->Device.dev.driver = &pFunction->Driver.driver;
- //??    pDevice->Device.driver = &pFunction->Driver;
- //??    pDevice->Device.dev.release = release;
-     /* get a unique device number, must be done with locks held */
-     spin_lock(&InUseDevicesLock);
--    pDevice->Device.number = FirstClearBit(&InUseDevices);
--    SetBit(&InUseDevices, pDevice->Device.number);
-+    pDevice->Device->number = FirstClearBit(&InUseDevices);
-+    SetBit(&InUseDevices, pDevice->Device->number);
-     spin_unlock(&InUseDevicesLock);
--    pDevice->Device.capabilities = PNP_REMOVABLE | PNP_DISABLE;
--    pDevice->Device.protocol = &sdio_protocol;
--    pDevice->Device.active = 1;
-+    pDevice->Device->capabilities = PNP_REMOVABLE | PNP_DISABLE;
-+    pDevice->Device->active = 1;
--    /* set the id as slot number/function number */
--    snprintf(id_name, sizeof(id_name) - 1, "SD_%02X%02X",
--             pDevice->pHcd->SlotNumber, (UINT)SDDEVICE_GET_SDIO_FUNCNO(pDevice));
-     DBG_PRINT(SDDBG_TRACE, ("SDIO BusDriver - OS_InitializeDevice adding id: %s\n",
-                              id_name));
--    pnp_add_id(&pDevice->Device, id_name);
--
--        /* deal with DMA settings */
-+    /* deal with DMA settings */
-     if (pDevice->pHcd->pDmaDescription != NULL) {
--        pDevice->Device.dev.dma_mask = &pDevice->pHcd->pDmaDescription->Mask;
--        pDevice->Device.dev.coherent_dma_mask = pDevice->pHcd->pDmaDescription->Mask;
-+        pDevice->Device->dev.dma_mask = &pDevice->pHcd->pDmaDescription->Mask;
-+        pDevice->Device->dev.coherent_dma_mask = pDevice->pHcd->pDmaDescription->Mask;
-     }
-     return SDIO_STATUS_SUCCESS;
-@@ -537,13 +535,13 @@ SDIO_STATUS OS_AddDevice(PSDDEVICE pDevice, PSDFUNCTION pFunction)
-     int error;
-     DBG_PRINT(SDDBG_TRACE, ("SDIO BusDriver - OS_AddDevice adding function: %s\n",
-                                pFunction->pName));
--    error = pnp_add_device(&pDevice->Device);
-+    error = pnp_add_device(pDevice->Device);
-     if (error < 0) {
-         DBG_PRINT(SDDBG_ERROR, ("SDIO BusDriver - OS_AddDevice failed pnp_add_device: %d\n",
-                                error));
-     }
-         /* replace the buggy pnp's release */
--    pDevice->Device.dev.release = release;
-+    pDevice->Device->dev.release = release;
-     return OSErrorToSDIOError(error);
- }
-@@ -554,15 +552,17 @@ SDIO_STATUS OS_AddDevice(PSDDEVICE pDevice, PSDFUNCTION pFunction)
- void OS_RemoveDevice(PSDDEVICE pDevice)
- {
-     DBG_PRINT(SDDBG_TRACE, ("SDIO BusDriver - OS_RemoveDevice \n"));
--    pnp_remove_card_device(&pDevice->Device);
-+    pnp_remove_card_device(pDevice->Device);
-     spin_lock(&InUseDevicesLock);
--    ClearBit(&InUseDevices, pDevice->Device.number);
-+    ClearBit(&InUseDevices, pDevice->Device->number);
-     spin_unlock(&InUseDevicesLock);
--    if (pDevice->Device.id != NULL) {
--        KernelFree(pDevice->Device.id);
--        pDevice->Device.id = NULL;
-+    if (pDevice->Device->id != NULL) {
-+        KernelFree(pDevice->Device->id);
-+        pDevice->Device->id = NULL;
-     }
-+
-+    KernelFree(pDevice->Device);
- }
- /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-@@ -612,20 +612,13 @@ void OS_RemoveDevice(PSDDEVICE pDevice)
-   @see also: SDIO_BusRemoveOSDevice
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
--SDIO_STATUS SDIO_BusAddOSDevice(PSDDMA_DESCRIPTION pDma, POS_PNPDRIVER pDriver, POS_PNPDEVICE pDevice)
-+SDIO_STATUS SDIO_BusAddOSDevice(PSDDMA_DESCRIPTION pDma, POS_PNPDRIVER pDriver, POS_PNPDEVICE *outDevice, const char* name)
- {
-     int err;
-     struct pnp_device_id *pFdid;
-     static int slotNumber = 0; /* we just use an increasing count for the slots number */
--      char id_name[20];
-+    struct pnp_dev* pDevice;
--    if (pDma != NULL) {
--        pDevice->dev.dma_mask = &pDma->Mask;
--        pDevice->dev.coherent_dma_mask = pDma->Mask;
--    }
--    DBG_PRINT(SDDBG_ERROR,
--            ("SDIO BusDriver - SDIO_GetBusOSDevice, registering driver: %s DMAmask: 0x%x\n",
--            pDriver->name, (UINT)*pDevice->dev.dma_mask));
-     pFdid = KernelAlloc(sizeof(struct pnp_device_id)*2);
-     /* set the id as slot number/function number */
-     snprintf(pFdid[0].id, sizeof(pFdid[0].id), "SD_%02X08",
-@@ -644,14 +637,22 @@ SDIO_STATUS SDIO_BusAddOSDevice(PSDDMA_DESCRIPTION pDma, POS_PNPDRIVER pDriver,
-         return OSErrorToSDIOError(err);
-     }
-+    pDevice = pnp_alloc_dev(&sdio_protocol, slotNumber - 1, pFdid[0].id);
-+    if (!pDevice)
-+        return -EINVAL;
-+
-+    if (pDma != NULL) {
-+        pDevice->dev.dma_mask = &pDma->Mask;
-+        pDevice->dev.coherent_dma_mask = pDma->Mask;
-+    }
-+    DBG_PRINT(SDDBG_ERROR,
-+            ("SDIO BusDriver - SDIO_GetBusOSDevice, registering driver: %s DMAmask: 0x%x\n",
-+            pDriver->name, (UINT)*pDevice->dev.dma_mask));
-+
-     pDevice->protocol = &sdio_protocol;
-     pDevice->capabilities = PNP_REMOVABLE | PNP_DISABLE;
-     pDevice->active = 1;
--    /* set the id as slot number/function number */
--    snprintf(id_name, sizeof(id_name) - 1, "SD_%02X08",
--             0); //??pDevice->pHcd->SlotNumber);//?????fix this, slotnumber isn't vaialble yet
--    pnp_add_id(pDevice, id_name);
-     /* get a unique device number */
-     spin_lock(&InUseDevicesLock);
-@@ -667,6 +668,7 @@ SDIO_STATUS SDIO_BusAddOSDevice(PSDDMA_DESCRIPTION pDma, POS_PNPDRIVER pDriver,
-     }
-     /* replace the buggy pnp's release */
-     pDevice->dev.release = release;
-+    *outDevice = pDevice;
-     return OSErrorToSDIOError(err);
- }
-diff --git a/include/linux/sdio/sdio_busdriver.h b/include/linux/sdio/sdio_busdriver.h
-index b431d3d..35e3ebb 100644
---- a/include/linux/sdio/sdio_busdriver.h
-+++ b/include/linux/sdio/sdio_busdriver.h
-@@ -477,7 +477,7 @@ typedef struct _SDDEVICE {
-     struct _SDHCD  *pHcd;           /* host controller this device is on (internal use) */
-     SDDEVICE_INFO   DeviceInfo;     /* device info */
-     SD_PNP_INFO pId[1];             /* id of this device  */
--    OS_PNPDEVICE Device;            /* device registration with base system */
-+    OS_PNPDEVICE *Device;           /* device registration with base system */
-     SD_SLOT_CURRENT  SlotCurrentAlloc; /* allocated slot current for this device/function (internal use) */
-     SD_DEVICE_FLAGS Flags;          /* internal use flags */
-     CT_VERSION_CODE Version;        /* version code of the bus driver */
-diff --git a/include/linux/sdio/sdio_hcd_defs.h b/include/linux/sdio/sdio_hcd_defs.h
-index 1782469..e6115a2 100644
---- a/include/linux/sdio/sdio_hcd_defs.h
-+++ b/include/linux/sdio/sdio_hcd_defs.h
-@@ -213,7 +213,7 @@ SDIO_STATUS SDIO_RegisterHostController(PSDHCD pHcd);
- SDIO_STATUS SDIO_UnregisterHostController(PSDHCD pHcd);
- SDIO_STATUS SDIO_HandleHcdEvent(PSDHCD pHcd, HCD_EVENT Event);
- SDIO_STATUS SDIO_CheckResponse(PSDHCD pHcd, PSDREQUEST pReq, SDHCD_RESPONSE_CHECK_MODE CheckMode);
--SDIO_STATUS SDIO_BusAddOSDevice(PSDDMA_DESCRIPTION pDma, POS_PNPDRIVER pDriver, POS_PNPDEVICE pDevice);
-+SDIO_STATUS SDIO_BusAddOSDevice(PSDDMA_DESCRIPTION pDma, POS_PNPDRIVER pDriver, POS_PNPDEVICE *pDevice, const char* name);
- void SDIO_BusRemoveOSDevice(POS_PNPDRIVER pDriver, POS_PNPDEVICE pDevice);
- #endif /* __SDIO_BUSDRIVER_H___ */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1233-device-model-Allow-the-creation-of-symlinks-on-sys.patch b/target/linux/s3c24xx/patches-2.6.26/1233-device-model-Allow-the-creation-of-symlinks-on-sys.patch
deleted file mode 100755 (executable)
index 0d1172f..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-From 2dc4f2819aec1cdd3012cb28396a625d2efb00fd Mon Sep 17 00:00:00 2001
-From: Cesar Eduardo Barros <cesarb@cesarb.net>
-Date: Mon, 4 Aug 2008 08:34:50 +0100
-Subject: [PATCH] device model: Allow the creation of symlinks on /sys/bus/*/devices
-
-Allows the direct creation of symlinks on /sys/bus/*/devices. This is needed
-for a compat symlink from gta01-pm-gps.0 to neo1973-pm-gps.0 on the Openmoko
-Neo1973 GTA01.
-
-Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net>
----
- drivers/base/bus.c     |   23 +++++++++++++++++++++++
- include/linux/device.h |    5 +++++
- 2 files changed, 28 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/base/bus.c b/drivers/base/bus.c
-index ef522ae..96d495d 100644
---- a/drivers/base/bus.c
-+++ b/drivers/base/bus.c
-@@ -141,6 +141,29 @@ void bus_remove_file(struct bus_type *bus, struct bus_attribute *attr)
- }
- EXPORT_SYMBOL_GPL(bus_remove_file);
-+int bus_create_device_link(struct bus_type *bus, struct kobject *target,
-+                         const char *name)
-+{
-+      int error;
-+      if (bus_get(bus)) {
-+              error = sysfs_create_link(&bus->p->devices_kset->kobj, target,
-+                                        name);
-+              bus_put(bus);
-+      } else
-+              error = -EINVAL;
-+      return error;
-+}
-+EXPORT_SYMBOL_GPL(bus_create_device_link);
-+
-+void bus_remove_device_link(struct bus_type *bus, const char *name)
-+{
-+      if (bus_get(bus)) {
-+              sysfs_remove_link(&bus->p->devices_kset->kobj, name);
-+              bus_put(bus);
-+      }
-+}
-+EXPORT_SYMBOL_GPL(bus_remove_device_link);
-+
- static struct kobj_type bus_ktype = {
-       .sysfs_ops      = &bus_sysfs_ops,
- };
-diff --git a/include/linux/device.h b/include/linux/device.h
-index 6a2d04c..d29b005 100644
---- a/include/linux/device.h
-+++ b/include/linux/device.h
-@@ -51,6 +51,11 @@ extern int __must_check bus_create_file(struct bus_type *,
-                                       struct bus_attribute *);
- extern void bus_remove_file(struct bus_type *, struct bus_attribute *);
-+extern int __must_check bus_create_device_link(struct bus_type *bus,
-+                                             struct kobject *target,
-+                                             const char *name);
-+extern void bus_remove_device_link(struct bus_type *bus, const char *name);
-+
- struct bus_type {
-       const char              *name;
-       struct bus_attribute    *bus_attrs;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1234-pcf50606-fix-gllin-compat-link.patch b/target/linux/s3c24xx/patches-2.6.26/1234-pcf50606-fix-gllin-compat-link.patch
deleted file mode 100755 (executable)
index d6bd960..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-From 38581b29a95f542e5696f436fea874a881f75825 Mon Sep 17 00:00:00 2001
-From: Cesar Eduardo Barros <cesarb@cesarb.net>
-Date: Mon, 4 Aug 2008 08:34:50 +0100
-Subject: [PATCH] pcf50606: fix gllin compat link
-
-Uses bus_create_device_link to correctly create the gllin compat link.
-
-Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net>
----
- drivers/i2c/chips/pcf50606.c |   17 +++--------------
- 1 files changed, 3 insertions(+), 14 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
-index 4218917..c97cad3 100644
---- a/drivers/i2c/chips/pcf50606.c
-+++ b/drivers/i2c/chips/pcf50606.c
-@@ -1784,12 +1784,6 @@ static int pcf50606_detect(struct i2c_adapter *adapter, int address, int kind)
- #ifdef CONFIG_MACH_NEO1973_GTA01
-       if (machine_is_neo1973_gta01()) {
--              /* FIXME: what is the device name we are symlinking to?
--               * symlink won't get created until this is fixed.
--               */
--              struct device * busdev = bus_find_device_by_name(
--                                                      &platform_bus_type,
--                                                      NULL, "FIXME");
-               gta01_pm_gps_dev.dev.parent = &new_client->dev;
-               switch (system_rev) {
-               case GTA01Bv2_SYSTEM_REV:
-@@ -1801,16 +1795,11 @@ static int pcf50606_detect(struct i2c_adapter *adapter, int address, int kind)
-               }
-               platform_device_register(&gta01_pm_gps_dev);
-               /* a link for gllin compatibility */
--              /* 2.6.25 tracking: platform_bus_type.devices that was here
--               * has gone away in mainline
--               */
--              if (busdev) {
--                      err = sysfs_create_link(&busdev->kobj,
-+              err = bus_create_device_link(&platform_bus_type,
-                       &gta01_pm_gps_dev.dev.kobj, "gta01-pm-gps.0");
--                      if (err)
--                              printk(KERN_ERR
-+              if (err)
-+                      printk(KERN_ERR
-                           "sysfs_create_link (gta01-pm-gps.0): %d\n", err);
--              }
-       }
- #endif
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1235-fix-add-missing-include.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1235-fix-add-missing-include.patch.patch
deleted file mode 100755 (executable)
index c3a9084..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-From 38b1e30a72ac94c695f8bce79ec179dc9b179778 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Mon, 4 Aug 2008 08:34:50 +0100
-Subject: [PATCH] fix-add-missing-include.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gps.h |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
- create mode 100644 arch/arm/plat-s3c24xx/neo1973_pm_gps.h
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.h b/arch/arm/plat-s3c24xx/neo1973_pm_gps.h
-new file mode 100644
-index 0000000..42d385a
---- /dev/null
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.h
-@@ -0,0 +1 @@
-+extern int neo1973_pm_gps_is_on(void);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1236-config-kill-mtd-debug.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1236-config-kill-mtd-debug.patch.patch
deleted file mode 100755 (executable)
index ef6da95..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-From 63700223f3d6197216505ac69f86dd4e3c92b807 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Mon, 4 Aug 2008 08:34:50 +0100
-Subject: [PATCH] config-kill-mtd-debug.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- defconfig-2.6.26 |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/defconfig-2.6.26 b/defconfig-2.6.26
-index d9a3549..511a762 100644
---- a/defconfig-2.6.26
-+++ b/defconfig-2.6.26
-@@ -710,7 +710,7 @@ CONFIG_MTD_NAND_VERIFY_WRITE=y
- # CONFIG_MTD_NAND_MUSEUM_IDS is not set
- CONFIG_MTD_NAND_IDS=y
- CONFIG_MTD_NAND_S3C2410=y
--CONFIG_MTD_NAND_S3C2410_DEBUG=y
-+# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
- CONFIG_MTD_NAND_S3C2410_HWECC=y
- # CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
- # CONFIG_MTD_NAND_DISKONCHIP is not set
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1237-fix-glamo-turbo-host-interface.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1237-fix-glamo-turbo-host-interface.patch.patch
deleted file mode 100755 (executable)
index efc3f7e..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-From 27d53aa3a33766bb3882f1adcf73c0b3402a5572 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Mon, 4 Aug 2008 08:34:51 +0100
-Subject: [PATCH] fix-glamo-turbo-host-interface.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |    4 ++++
- drivers/mfd/glamo/glamo-core.c     |   12 ++++++------
- 2 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index 8e43c4a..be2d901 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -66,6 +66,7 @@
- #include <asm/arch/spi.h>
- #include <asm/arch/spi-gpio.h>
- #include <asm/arch/usb-control.h>
-+#include <asm/arch/regs-mem.h>
- #include <asm/arch/gta02.h>
-@@ -1562,6 +1563,9 @@ static void __init gta02_machine_init(void)
-       spin_lock_init(&motion_irq_lock);
-+      /* Glamo chip select optimization */
-+/*     *((u32 *)(S3C2410_MEMREG(((1 + 1) << 2)))) = 0x1280; */
-+
-       s3c_device_usb.dev.platform_data = &gta02_usb_info;
-       s3c_device_nand.dev.platform_data = &gta02_nand_info;
-       s3c_device_sdi.dev.platform_data = &gta02_mmc_cfg;
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index 0e7a650..92dbd65 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -740,18 +740,18 @@ static struct glamo_script glamo_init_script[] = {
-       { GLAMO_REG_CLOCK_GEN7,         0x0101 },
-       { GLAMO_REG_CLOCK_GEN8,         0x0100 },
-       { GLAMO_REG_CLOCK_HOST,         0x000d },
--      { 0x200,        0x0ef0 },
-+      /*
-+       * b7..b4 = 0 = no wait states on read or write
-+       * b0 = 1 select PLL2 for Host interface, b1 = enable it
-+       */
-+      { 0x200,        0x0e03 },
-       { 0x202,        0x07ff },
-       { 0x212,        0x0000 },
-       { 0x214,        0x4000 },
-       { 0x216,        0xf00e },
-       { GLAMO_REG_MEM_TYPE,           0x0874 }, /* 8MB, 16 word pg wr+rd */
-       { GLAMO_REG_MEM_GEN,            0xafaf }, /* 63 grants min + max */
--      /*
--       * the register below originally 0x0108 makes unreliable Glamo MMC
--       * write operations.  Cranked to 0x05ad to add a wait state, the
--       * unreliability is not seen after 4GB of write / read testing
--       */
-+
-       { GLAMO_REG_MEM_TIMING1,        0x0108 },
-       { GLAMO_REG_MEM_TIMING2,        0x0010 }, /* Taa = 3 MCLK */
-       { GLAMO_REG_MEM_TIMING3,        0x0000 },
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1238-fix-glamo-crank-memory-to-90MHz.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1238-fix-glamo-crank-memory-to-90MHz.patch.patch
deleted file mode 100755 (executable)
index 591b1f4..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 7dc7b3e40f68a10702aaffcc6ca929908fc38656 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Mon, 4 Aug 2008 08:34:51 +0100
-Subject: [PATCH] fix-glamo-crank-memory-to-90MHz.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/mfd/glamo/glamo-core.c |    9 ++++++---
- 1 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index 92dbd65..7bc38ff 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -729,8 +729,8 @@ static struct glamo_script glamo_init_script[] = {
-       { GLAMO_REG_CLOCK_MPEG,         0x0000 },
- #endif
-       { GLAMO_REG_PLL_GEN1,           0x05db },       /* 48MHz */
--      { GLAMO_REG_PLL_GEN3,           0x09c3 },       /* 80MHz */
--              { 0xfffd, 0 },
-+      { GLAMO_REG_PLL_GEN3,           0x0aba },       /* 90MHz */
-+      { 0xfffd, 0 },
-       /*
-        * b9 of this register MUST be zero to get any interrupts on INT#
-        * the other set bits enable all the engine interrupt sources
-@@ -749,7 +749,10 @@ static struct glamo_script glamo_init_script[] = {
-       { 0x212,        0x0000 },
-       { 0x214,        0x4000 },
-       { 0x216,        0xf00e },
--      { GLAMO_REG_MEM_TYPE,           0x0874 }, /* 8MB, 16 word pg wr+rd */
-+
-+      /* S-Media recommended "set tiling mode to 512 mode for memory access
-+       * more efficiency when 640x480" */
-+      { GLAMO_REG_MEM_TYPE,           0x0c74 }, /* 8MB, 16 word pg wr+rd */
-       { GLAMO_REG_MEM_GEN,            0xafaf }, /* 63 grants min + max */
-       { GLAMO_REG_MEM_TIMING1,        0x0108 },
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1239-fix-hdq-probe.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1239-fix-hdq-probe.patch.patch
deleted file mode 100755 (executable)
index fbf7418..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-From 5be7f629cff94bd67ba7d95c800763a9026708f2 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Wed, 6 Aug 2008 12:16:38 +0100
-Subject: [PATCH] fix-hdq-probe.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2440/mach-gta02.c |    9 ++++-----
- drivers/power/gta02_hdq.c          |   22 ++++++++++++++++------
- 2 files changed, 20 insertions(+), 11 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index be2d901..aeedd42 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -38,6 +38,7 @@
- #include <linux/spi/glamo.h>
- #include <linux/spi/spi_bitbang.h>
- #include <linux/mmc/host.h>
-+#include <linux/version.h>
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/nand.h>
-@@ -111,8 +112,7 @@ static int gta02_charger_active_status;
-  */
- struct fiq_ipc fiq_ipc;
- EXPORT_SYMBOL(fiq_ipc);
--
--#define DIVISOR_FROM_US(x) ((x) << 1)
-+#define DIVISOR_FROM_US(x) ((x) << 3)
- #define FIQ_DIVISOR_VIBRATOR DIVISOR_FROM_US(100)
-@@ -184,9 +184,9 @@ FIQ_HANDLER_ENTRY(256, 512)
-               if (hdq_shifter & 1)
-                       hdq_ctr = 50 / HDQ_SAMPLE_PERIOD_US;
-               else
--                      hdq_ctr = 120 / HDQ_SAMPLE_PERIOD_US;
-+                      hdq_ctr = 140 / HDQ_SAMPLE_PERIOD_US;
-               /* carefully precompute the other phase length */
--              hdq_ctr2 = (210 - (hdq_ctr * HDQ_SAMPLE_PERIOD_US)) /
-+              hdq_ctr2 = (220 - (hdq_ctr * HDQ_SAMPLE_PERIOD_US)) /
-                               HDQ_SAMPLE_PERIOD_US;
-               hdq_state = HDQB_ADS_LOW;
-               hdq_shifter >>= 1;
-@@ -782,7 +782,6 @@ struct platform_device gta02_hdq_device = {
- };
- #endif
--
- /* NOR Flash */
- #define GTA02_FLASH_BASE      0x18000000 /* GCS3 */
-diff --git a/drivers/power/gta02_hdq.c b/drivers/power/gta02_hdq.c
-index 5a79fd6..6c228b4 100644
---- a/drivers/power/gta02_hdq.c
-+++ b/drivers/power/gta02_hdq.c
-@@ -40,7 +40,7 @@ int gta02hdq_read(int address)
-       mutex_lock(&fiq_ipc.hdq_lock);
-       fiq_ipc.hdq_ads = address | HDQ_READ;
--      fiq_ipc.hdq_request_ctr++;
-+      fiq_ipc.hdq_request_ctr = fiq_ipc.hdq_transaction_ctr + 1;
-       fiq_kick();
-       /*
-        * FIQ takes care of it while we block our calling process
-@@ -53,9 +53,13 @@ int gta02hdq_read(int address)
-               if (fiq_ipc.hdq_request_ctr != fiq_ipc.hdq_transaction_ctr)
-                       continue;
--              if (fiq_ipc.hdq_error)
-+              if (fiq_ipc.hdq_error) {
-+                      printk(KERN_ERR "hdq timeout %d, %d / %d\n",
-+                                   fiq_ipc.hdq_error, fiq_ipc.hdq_request_ctr,
-+                                                 fiq_ipc.hdq_transaction_ctr);
-                       goto done; /* didn't see a response in good time */
--
-+              }
-+              
-               ret = fiq_ipc.hdq_rx_data;
-               goto done;
-       }
-@@ -193,12 +197,18 @@ static int __init gta02hdq_probe(struct platform_device *pdev)
- {
-       struct resource *r = platform_get_resource(pdev, 0, 0);
--      if (!machine_is_neo1973_gta02())
-+      printk(KERN_ERR "gta02hdq driver starting\n");
-+
-+      if (!machine_is_neo1973_gta02()) {
-+              printk(KERN_ERR "gta02hdq_probe only for GTA02\n");
-               return -EIO;
-+      }
--      if (!r)
-+      if (!r) {
-+              printk(KERN_ERR "gta02hdq_probe missing resource for GPIO\n");
-               return -EINVAL;
--
-+      }
-+      
-       platform_set_drvdata(pdev, NULL);
-       mutex_init(&fiq_ipc.hdq_lock);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1240-gta0x-add-minimal-GSM-flowcontrol.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1240-gta0x-add-minimal-GSM-flowcontrol.patch.patch
deleted file mode 100755 (executable)
index e3e3c57..0000000
+++ /dev/null
@@ -1,154 +0,0 @@
-From 5a0021aed270b0d98a902d9c8eb19b395dc186ae Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Sun, 10 Aug 2008 09:12:55 +0100
-Subject: [PATCH] gta0x-add-minimal-GSM-flowcontrol.patch
-
-    Add the basic GSM flowcontrol code.
-
-Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- arch/arm/mach-s3c2410/mach-gta01.c     |    3 ++
- arch/arm/mach-s3c2440/mach-gta02.c     |    3 ++
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |   36 ++++++++++++++++++++++++++++++++
- 3 files changed, 42 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index e518de7..f3f87cf 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -657,9 +657,12 @@ static void __init gta01_map_io(void)
-       s3c24xx_init_uarts(gta01_uartcfgs, ARRAY_SIZE(gta01_uartcfgs));
- }
-+extern int gta_gsm_interrupts;
-+
- static irqreturn_t gta01_modem_irq(int irq, void *param)
- {
-       printk(KERN_DEBUG "GSM wakeup interrupt (IRQ %d)\n", irq);
-+      gta_gsm_interrupts++;
-       return IRQ_HANDLED;
- }
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index aeedd42..b37d1c4 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -1531,9 +1531,12 @@ static void __init gta02_map_io(void)
-       s3c24xx_init_uarts(gta02_uartcfgs, ARRAY_SIZE(gta02_uartcfgs));
- }
-+extern int gta_gsm_interrupts;
-+
- static irqreturn_t gta02_modem_irq(int irq, void *param)
- {
-       printk(KERN_DEBUG "modem wakeup interrupt\n");
-+      gta_gsm_interrupts++;
-       return IRQ_HANDLED;
- }
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index de83939..901f8fb 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -34,6 +34,9 @@
- extern void s3c24xx_serial_register_resume_dependency(struct resume_dependency *
-                                            resume_dependency, int uart_index);
-+int gta_gsm_interrupts;
-+EXPORT_SYMBOL(gta_gsm_interrupts);
-+
- struct gta01pm_priv {
-       int gpio_ngsm_en;
-         int gpio_ndl_gsm;
-@@ -80,6 +83,9 @@ static ssize_t gsm_read(struct device *dev, struct device_attribute *attr,
-                       if (!s3c2410_gpio_getpin(GTA02_GPIO_nDL_GSM))
-                               goto out_1;
-               }
-+      } else if (!strcmp(attr->attr.name, "flowcontrolled")) {
-+              if (s3c2410_gpio_getcfg(S3C2410_GPH1) == S3C2410_GPIO_OUTPUT)
-+                      goto out_1;
-       }
-       return strlcpy(buf, "0\n", 3);
-@@ -176,6 +182,13 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-                       gta01_gsm.gpio_ndl_gsm = !on;
-                       s3c2410_gpio_setpin(GTA02_GPIO_nDL_GSM, !on);
-               }
-+      } else if (!strcmp(attr->attr.name, "flowcontrolled")) {
-+              if (on) {
-+                      gta_gsm_interrupts = 0;
-+                      s3c2410_gpio_setpin(S3C2410_GPH1, 1);
-+                      s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPH1_OUTP);
-+              } else
-+                      s3c2410_gpio_cfgpin(S3C2410_GPH1, S3C2410_GPH1_nRTS0);
-       }
-       return count;
-@@ -184,6 +197,7 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
- static DEVICE_ATTR(power_on, 0644, gsm_read, gsm_write);
- static DEVICE_ATTR(reset, 0644, gsm_read, gsm_write);
- static DEVICE_ATTR(download, 0644, gsm_read, gsm_write);
-+static DEVICE_ATTR(flowcontrolled, 0644, gsm_read, gsm_write);
- #ifdef CONFIG_PM
-@@ -193,6 +207,11 @@ static int gta01_gsm_suspend(struct platform_device *pdev, pm_message_t state)
-       /* GPIO state is saved/restored by S3C2410 core GPIO driver, so we
-        * don't need to do much here. */
-+      /* If flowcontrol asserted, abort if GSM already interrupted */
-+      if (s3c2410_gpio_getcfg(S3C2410_GPH1) == S3C2410_GPIO_OUTPUT) {
-+              if (gta_gsm_interrupts)
-+                      goto busy;
-+      }
-       /* disable DL GSM to prevent jack_insert becoming 'floating' */
-       if (machine_is_neo1973_gta02())
-@@ -205,6 +224,20 @@ static int gta01_gsm_suspend(struct platform_device *pdev, pm_message_t state)
-       s3c24xx_serial_register_resume_dependency(&resume_dep_gsm_uart, 0);
-       return 0;
-+
-+busy:
-+      return -EBUSY;
-+}
-+
-+static int
-+gta01_gsm_suspend_late(struct platform_device *pdev, pm_message_t state)
-+{
-+      /* Last chance: abort if GSM already interrupted */
-+      if (s3c2410_gpio_getcfg(S3C2410_GPH1) == S3C2410_GPIO_OUTPUT) {
-+              if (gta_gsm_interrupts)
-+                      return -EBUSY;
-+      }
-+      return 0;
- }
- static int gta01_gsm_resume(struct platform_device *pdev)
-@@ -229,6 +262,7 @@ static int gta01_gsm_resume(struct platform_device *pdev)
- }
- #else
- #define gta01_gsm_suspend     NULL
-+#define gta01_gsm_suspend_late        NULL
- #define gta01_gsm_resume      NULL
- #endif
-@@ -236,6 +270,7 @@ static struct attribute *gta01_gsm_sysfs_entries[] = {
-       &dev_attr_power_on.attr,
-       &dev_attr_reset.attr,
-       &dev_attr_download.attr,
-+      &dev_attr_flowcontrolled.attr,
-       NULL
- };
-@@ -315,6 +350,7 @@ static struct platform_driver gta01_gsm_driver = {
-       .probe          = gta01_gsm_probe,
-       .remove         = gta01_gsm_remove,
-       .suspend        = gta01_gsm_suspend,
-+      .suspend_late   = gta01_gsm_suspend_late,
-       .resume         = gta01_gsm_resume,
-       .driver         = {
-               .name           = "neo1973-pm-gsm",
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1241-commit-830ea3d0c27c0c750b7bf1b56c002ee7943f3edc.patch b/target/linux/s3c24xx/patches-2.6.26/1241-commit-830ea3d0c27c0c750b7bf1b56c002ee7943f3edc.patch
deleted file mode 100755 (executable)
index 433bed3..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-From b3159c23dcae773c116495431cca90aa923af918 Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Sun, 10 Aug 2008 09:13:09 +0100
-Subject: [PATCH] commit 830ea3d0c27c0c750b7bf1b56c002ee7943f3edc
-
-    gta0x-log-serial-rx-error.patch
-
-    This patch causes a KERN_DEBUG message to be printed each time an
-    error status is read from a UART.  This is intended to facilitate
-    the reporting of more useful problem and bug reports from users
-    in the field.
-
-    Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- drivers/serial/s3c2410.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
-index b4833bd..d0b55b1 100644
---- a/drivers/serial/s3c2410.c
-+++ b/drivers/serial/s3c2410.c
-@@ -357,7 +357,7 @@ s3c24xx_serial_rx_chars(int irq, void *dev_id)
-               port->icount.rx++;
-               if (unlikely(uerstat & S3C2410_UERSTAT_ANY)) {
--                      dbg("rxerr: port ch=0x%02x, rxs=0x%08x\n",
-+                      printk(KERN_DEBUG "rxerr: port ch=0x%02x, rxs=0x%08x\n",
-                           ch, uerstat);
-                       /* check for break */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1242-silence-serial-console-gta01.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1242-silence-serial-console-gta01.patch.patch
deleted file mode 100755 (executable)
index 41a74c9..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-From 85ef1fb82db8188fd5a615e557bf5407113d163f Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Sun, 10 Aug 2008 09:13:20 +0100
-Subject: [PATCH] silence-serial-console-gta01.patch
-
-    This patch ensures that no console data will go the UART while
-    the GSM mux is switched to the GSM.  This is necessary despite
-    the code that disables the console due to the fact that the
-    console resumes before the neo1973_pm_gsm driver, and consoles
-    always resume in the "on" state.
-
-Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |    3 +++
- drivers/serial/s3c2410.c               |   10 ++++++++++
- 2 files changed, 13 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index 901f8fb..8d5e41c 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -31,6 +31,7 @@
- #include <asm/arch/regs-gpioj.h>
- #endif
-+extern void s3c24xx_serial_console_set_silence(int silence);
- extern void s3c24xx_serial_register_resume_dependency(struct resume_dependency *
-                                            resume_dependency, int uart_index);
-@@ -105,6 +106,7 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-                                        "disconnecting serial console\n");
-                               console_stop(gta01_gsm.con);
-+                              s3c24xx_serial_console_set_silence(1);
-                       }
-                       if (gta01_gsm.gpio_ngsm_en)
-@@ -144,6 +146,7 @@ static ssize_t gsm_write(struct device *dev, struct device_attribute *attr,
-                               s3c2410_gpio_setpin(gta01_gsm.gpio_ngsm_en, 1);
-                       if (gta01_gsm.con) {
-+                              s3c24xx_serial_console_set_silence(0);
-                               console_start(gta01_gsm.con);
-                               dev_dbg(dev, "powered down GSM, thus enabling "
-diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
-index d0b55b1..8de1564 100644
---- a/drivers/serial/s3c2410.c
-+++ b/drivers/serial/s3c2410.c
-@@ -1791,6 +1791,13 @@ module_exit(s3c24xx_serial_modexit);
- #ifdef CONFIG_SERIAL_S3C2410_CONSOLE
- static struct uart_port *cons_uart;
-+static int cons_silenced;
-+
-+void s3c24xx_serial_console_set_silence(int silenced)
-+{
-+      cons_silenced = silenced;
-+}
-+EXPORT_SYMBOL(s3c24xx_serial_console_set_silence);
- static int
- s3c24xx_serial_console_txrdy(struct uart_port *port, unsigned int ufcon)
-@@ -1817,6 +1824,9 @@ s3c24xx_serial_console_putchar(struct uart_port *port, int ch)
-       unsigned int ufcon = rd_regl(cons_uart, S3C2410_UFCON);
-       unsigned int umcon = rd_regl(cons_uart, S3C2410_UMCON);
-+      if (cons_silenced)
-+              return;
-+
-       /* If auto HW flow control enabled, temporarily turn it off */
-       if (umcon & S3C2410_UMCOM_AFC)
-               wr_regl(port, S3C2410_UMCON, (umcon & !S3C2410_UMCOM_AFC));
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1243-gta01-pcf50606-disable-irq-from-suspend-until-resume.patch b/target/linux/s3c24xx/patches-2.6.26/1243-gta01-pcf50606-disable-irq-from-suspend-until-resume.patch
deleted file mode 100755 (executable)
index 8f5550f..0000000
+++ /dev/null
@@ -1,287 +0,0 @@
-From b4976aa135000ce1d4804bf9fbfa92280cd357e7 Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Sun, 10 Aug 2008 09:13:31 +0100
-Subject: [PATCH] gta01-pcf50606-disable-irq-from-suspend-until-resume.patch
-
-    This patch is the pcf50606 equivalent of the pcf50633 patch that
-    disables interrupts from the chip until after resume is complete.
-    In order to ensure no data is lost, the work function is called
-    post-resume to process any pending interrupts.
-
-    Most of the code was quite literally re-used from Andy Green's
-    original patch.
-
-Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- drivers/i2c/chips/pcf50606.c |  148 ++++++++++++++++++++++++++++++++++++++++--
- 1 files changed, 142 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/i2c/chips/pcf50606.c b/drivers/i2c/chips/pcf50606.c
-index c97cad3..19a9829 100644
---- a/drivers/i2c/chips/pcf50606.c
-+++ b/drivers/i2c/chips/pcf50606.c
-@@ -38,6 +38,7 @@
- #include <linux/interrupt.h>
- #include <linux/irq.h>
- #include <linux/workqueue.h>
-+#include <linux/delay.h>
- #include <linux/rtc.h>
- #include <linux/bcd.h>
- #include <linux/watchdog.h>
-@@ -95,6 +96,15 @@ enum close_state {
-       CLOSE_STATE_ALLOW = 0x2342,
- };
-+enum pcf50606_suspend_states {
-+      PCF50606_SS_RUNNING,
-+      PCF50606_SS_STARTING_SUSPEND,
-+      PCF50606_SS_COMPLETED_SUSPEND,
-+      PCF50606_SS_RESUMING_BUT_NOT_US_YET,
-+      PCF50606_SS_STARTING_RESUME,
-+      PCF50606_SS_COMPLETED_RESUME,
-+};
-+
- struct pcf50606_data {
-       struct i2c_client client;
-       struct pcf50606_platform_data *pdata;
-@@ -110,6 +120,7 @@ struct pcf50606_data {
-       int onkey_seconds;
-       int irq;
-       int coldplug_done;
-+      enum pcf50606_suspend_states suspend_state;
- #ifdef CONFIG_PM
-       struct {
-               u_int8_t dcdc1, dcdc2;
-@@ -160,6 +171,10 @@ static const u_int16_t ntc_table_10k_3370B[] = {
- static inline int __reg_write(struct pcf50606_data *pcf, u_int8_t reg,
-                             u_int8_t val)
- {
-+      if (pcf->suspend_state == PCF50606_SS_COMPLETED_SUSPEND) {
-+              dev_err(&pcf->client.dev, "__reg_write while suspended.\n");
-+              dump_stack();
-+      }
-       return i2c_smbus_write_byte_data(&pcf->client, reg, val);
- }
-@@ -178,6 +193,10 @@ static inline int32_t __reg_read(struct pcf50606_data *pcf, u_int8_t reg)
- {
-       int32_t ret;
-+      if (pcf->suspend_state == PCF50606_SS_COMPLETED_SUSPEND) {
-+              dev_err(&pcf->client.dev, "__reg_read while suspended.\n");
-+              dump_stack();
-+      }
-       ret = i2c_smbus_read_byte_data(&pcf->client, reg);
-       return ret;
-@@ -569,6 +588,48 @@ static void pcf50606_work(struct work_struct *work)
-       mutex_lock(&pcf->working_lock);
-       pcf->working = 1;
-+
-+      /* sanity */
-+      if (!&pcf->client.dev)
-+              goto bail;
-+
-+      /*
-+       * if we are presently suspending, we are not in a position to deal
-+       * with pcf50606 interrupts at all.
-+       *
-+       * Because we didn't clear the int pending registers, there will be
-+       * no edge / interrupt waiting for us when we wake.  But it is OK
-+       * because at the end of our resume, we call this workqueue function
-+       * gratuitously, clearing the pending register and re-enabling
-+       * servicing this interrupt.
-+       */
-+
-+      if ((pcf->suspend_state == PCF50606_SS_STARTING_SUSPEND) ||
-+          (pcf->suspend_state == PCF50606_SS_COMPLETED_SUSPEND))
-+              goto bail;
-+
-+      /*
-+       * If we are inside suspend -> resume completion time we don't attempt
-+       * service until we have fully resumed.  Although we could talk to the
-+       * device as soon as I2C is up, the regs in the device which we might
-+       * choose to modify as part of the service action have not been
-+       * reloaded with their pre-suspend states yet.  Therefore we will
-+       * defer our service if we are called like that until our resume has
-+       * completed.
-+       *
-+       * This shouldn't happen any more because we disable servicing this
-+       * interrupt in suspend and don't re-enable it until resume is
-+       * completed.
-+       */
-+
-+      if (pcf->suspend_state &&
-+              (pcf->suspend_state != PCF50606_SS_COMPLETED_RESUME))
-+              goto reschedule;
-+
-+      /* this is the case early in resume! Sanity check! */
-+      if (i2c_get_clientdata(&pcf->client) == NULL)
-+              goto reschedule;
-+
-       /*
-        * p35 pcf50606 datasheet rev 2.2:
-        * ''The system controller shall read all interrupt registers in
-@@ -576,10 +637,27 @@ static void pcf50606_work(struct work_struct *work)
-        * because if you don't INT# gets stuck asserted forever after a
-        * while
-        */
--      ret = i2c_smbus_read_i2c_block_data(&pcf->client, PCF50606_REG_INT1, 3,
--                                          pcfirq);
--      if (ret != 3)
-+      ret = i2c_smbus_read_i2c_block_data(&pcf->client, PCF50606_REG_INT1,
-+                                          sizeof(pcfirq), pcfirq);
-+      if (ret != sizeof(pcfirq)) {
-               DEBUGPC("Oh crap PMU IRQ register read failed %d\n", ret);
-+              /*
-+               * it shouldn't fail, we no longer attempt to use
-+               * I2C while it can be suspended.  But we don't have
-+               * much option but to retry if if it ever did fail,
-+               * because if we don't service the interrupt to clear
-+               * it, we will never see another PMU interrupt edge.
-+               */
-+              goto reschedule;
-+      }
-+
-+      /* hey did we just resume? (because we don't get here unless we are
-+       * running normally or the first call after resumption)
-+       *
-+       * pcf50606 resume is really really over now then.
-+       */
-+      if (pcf->suspend_state != PCF50606_SS_RUNNING)
-+              pcf->suspend_state = PCF50606_SS_RUNNING;
-       if (!pcf->coldplug_done) {
-               DEBUGPC("PMU Coldplug init\n");
-@@ -814,10 +892,26 @@ static void pcf50606_work(struct work_struct *work)
-       DEBUGPC("\n");
-+bail:
-       pcf->working = 0;
-       input_sync(pcf->input_dev);
-       put_device(&pcf->client.dev);
-       mutex_unlock(&pcf->working_lock);
-+
-+      return;
-+
-+reschedule:
-+
-+      if ((pcf->suspend_state != PCF50606_SS_STARTING_SUSPEND) &&
-+          (pcf->suspend_state != PCF50606_SS_COMPLETED_SUSPEND)) {
-+              msleep(10);
-+              dev_info(&pcf->client.dev, "rescheduling interrupt service\n");
-+      }
-+      if (!schedule_work(&pcf->work))
-+              dev_err(&pcf->client.dev, "int service reschedule failed\n");
-+
-+      /* we don't put the device here, hold it for next time */
-+      mutex_unlock(&pcf->working_lock);
- }
- static irqreturn_t pcf50606_irq(int irq, void *_pcf)
-@@ -828,7 +922,7 @@ static irqreturn_t pcf50606_irq(int irq, void *_pcf)
-               irq, _pcf);
-       get_device(&pcf->client.dev);
-       if (!schedule_work(&pcf->work) && !pcf->working)
--              dev_dbg(&pcf->client.dev, "work item may be lost\n");
-+              dev_err(&pcf->client.dev, "pcf irq work already queued.\n");
-       return IRQ_HANDLED;
- }
-@@ -1881,12 +1975,27 @@ static int pcf50606_suspend(struct device *dev, pm_message_t state)
-       struct pcf50606_data *pcf = i2c_get_clientdata(client);
-       int i;
-+      /* we suspend once (!) as late as possible in the suspend sequencing */
-+
-+      if ((state.event != PM_EVENT_SUSPEND) ||
-+          (pcf->suspend_state != PCF50606_SS_RUNNING))
-+              return -EBUSY;
-+
-       /* The general idea is to power down all unused power supplies,
-        * and then mask all PCF50606 interrup sources but EXTONR, ONKEYF
-        * and ALARM */
-       mutex_lock(&pcf->lock);
-+      pcf->suspend_state = PCF50606_SS_STARTING_SUSPEND;
-+
-+      /* we are not going to service any further interrupts until we
-+       * resume.  If the IRQ workqueue is still pending in the background,
-+       * it will bail when it sees we set suspend state above.
-+       */
-+
-+      disable_irq(pcf->irq);
-+
-       /* Save all registers that don't "survive" standby state */
-       pcf->standby_regs.dcdc1 = __reg_read(pcf, PCF50606_REG_DCDC1);
-       pcf->standby_regs.dcdc2 = __reg_read(pcf, PCF50606_REG_DCDC2);
-@@ -1927,6 +2036,8 @@ static int pcf50606_suspend(struct device *dev, pm_message_t state)
-       __reg_write(pcf, PCF50606_REG_INT2M, ~INT2M_RESUMERS & 0xff);
-       __reg_write(pcf, PCF50606_REG_INT3M, ~INT3M_RESUMERS & 0xff);
-+      pcf->suspend_state = PCF50606_SS_COMPLETED_SUSPEND;
-+
-       mutex_unlock(&pcf->lock);
-       return 0;
-@@ -1939,6 +2050,8 @@ static int pcf50606_resume(struct device *dev)
-       mutex_lock(&pcf->lock);
-+      pcf->suspend_state = PCF50606_SS_STARTING_RESUME;
-+
-       /* Resume all saved registers that don't "survive" standby state */
-       __reg_write(pcf, PCF50606_REG_INT1M, pcf->standby_regs.int1m);
-       __reg_write(pcf, PCF50606_REG_INT2M, pcf->standby_regs.int2m);
-@@ -1957,10 +2070,17 @@ static int pcf50606_resume(struct device *dev)
-       __reg_write(pcf, PCF50606_REG_ADCC2, pcf->standby_regs.adcc2);
-       __reg_write(pcf, PCF50606_REG_PWMC1, pcf->standby_regs.pwmc1);
-+      pcf->suspend_state = PCF50606_SS_COMPLETED_RESUME;
-+
-+      enable_irq(pcf->irq);
-+
-       mutex_unlock(&pcf->lock);
--      /* Hack to fix the gta01 power button problem on resume */
--      pcf50606_irq(0, pcf);
-+      /* Call PCF work function; this fixes an issue on the gta01 where
-+       * the power button "goes away" if it is used to wake the device.
-+       */
-+      get_device(&pcf->client.dev);
-+      pcf50606_work(&pcf->work);
-       return 0;
- }
-@@ -1998,9 +2118,25 @@ static int pcf50606_plat_remove(struct platform_device *pdev)
-       return 0;
- }
-+/* We have this purely to capture an early indication that we are coming out
-+ * of suspend, before our device resume got called; async interrupt service is
-+ * interested in this.
-+ */
-+
-+static int pcf50606_plat_resume(struct platform_device *pdev)
-+{
-+      /* i2c_get_clientdata(to_i2c_client(&pdev->dev)) returns NULL at this
-+       * early resume time so we have to use pcf50606_global
-+       */
-+      pcf50606_global->suspend_state = PCF50606_SS_RESUMING_BUT_NOT_US_YET;
-+
-+      return 0;
-+}
-+
- static struct platform_driver pcf50606_plat_driver = {
-       .probe  = pcf50606_plat_probe,
-       .remove = pcf50606_plat_remove,
-+      .resume_early = pcf50606_plat_resume,
-       .driver = {
-               .owner  = THIS_MODULE,
-               .name   = "pcf50606",
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1244-fix-suspend-backlight-timing-gta01.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1244-fix-suspend-backlight-timing-gta01.patch.patch
deleted file mode 100755 (executable)
index 1349820..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-From 26a1d7115299dcb17a9e9effc780ceba58afa91b Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Sun, 10 Aug 2008 09:13:46 +0100
-Subject: [PATCH] fix-suspend-backlight-timing-gta01.patch
-
-    This patch adds the gta01 backlight callback that defers the
-    restoring of the backlight until after the jbt driver has
-    resumed.  This doesn't eliminate the flashing of the LCD on
-    the gta01, but it reduces it considerably.
-
-Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- arch/arm/mach-s3c2410/mach-gta01.c   |    9 ++++++++-
- drivers/video/backlight/gta01_bl.c   |   15 ++++++++++++++-
- include/asm-arm/arch-s3c2410/gta01.h |    4 ++++
- 3 files changed, 26 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index f3f87cf..9e42df0 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -507,14 +507,20 @@ static struct s3c2410_ts_mach_info gta01_ts_cfg = {
- /* SPI */
--void gta01_jbt6k74_reset(int devidx, int level)
-+static void gta01_jbt6k74_reset(int devidx, int level)
- {
-       /* empty place holder; gta01 does not yet use this */
-       printk(KERN_DEBUG "gta01_jbt6k74_reset\n");
- }
-+static void gta01_jbt6k74_resuming(int devidx)
-+{
-+      gta01bl_deferred_resume();
-+}
-+
- const struct jbt6k74_platform_data gta01_jbt6k74_pdata = {
-       .reset          = gta01_jbt6k74_reset,
-+      .resuming       = gta01_jbt6k74_resuming,
- };
- static struct spi_board_info gta01_spi_board_info[] = {
-@@ -584,6 +590,7 @@ static struct gta01bl_machinfo backlight_machinfo = {
-       .default_intensity      = 1,
-       .max_intensity          = 1,
-       .limit_mask             = 1,
-+      .defer_resume_backlight = 1,
- };
- static struct resource gta01_bl_resources[] = {
-diff --git a/drivers/video/backlight/gta01_bl.c b/drivers/video/backlight/gta01_bl.c
-index 301ec9c..34c19c8 100644
---- a/drivers/video/backlight/gta01_bl.c
-+++ b/drivers/video/backlight/gta01_bl.c
-@@ -57,6 +57,8 @@ struct gta01bl_data {
- static struct gta01bl_data gta01bl;
-+static int gta01bl_defer_resume_backlight;
-+
- #define GTA01BL_SUSPENDED     0x01
- #define GTA01BL_BATTLOW       0x02
-@@ -132,10 +134,12 @@ static int gta01bl_suspend(struct platform_device *dev, pm_message_t state)
- {
-       gta01bl_flags |= GTA01BL_SUSPENDED;
-       gta01bl_send_intensity(gta01_backlight_device);
-+      neo1973_gpb_setpin(GTA01_GPIO_BACKLIGHT, 0);
-+      s3c2410_gpio_cfgpin(GTA01_GPIO_BACKLIGHT, S3C2410_GPIO_OUTPUT);
-       return 0;
- }
--static int gta01bl_resume(struct platform_device *dev)
-+void gta01bl_deferred_resume(void)
- {
-       mutex_lock(&gta01bl.mutex);
-       gta01bl_init_hw();
-@@ -143,6 +147,13 @@ static int gta01bl_resume(struct platform_device *dev)
-       gta01bl_flags &= ~GTA01BL_SUSPENDED;
-       gta01bl_send_intensity(gta01_backlight_device);
-+}
-+EXPORT_SYMBOL_GPL(gta01bl_deferred_resume);
-+
-+static int gta01bl_resume(struct platform_device *dev)
-+{
-+      if (! gta01bl_defer_resume_backlight)
-+              gta01bl_deferred_resume();
-       return 0;
- }
- #else
-@@ -199,6 +210,8 @@ static int __init gta01bl_probe(struct platform_device *pdev)
-       if (!machinfo->limit_mask)
-               machinfo->limit_mask = -1;
-+      gta01bl_defer_resume_backlight = machinfo->defer_resume_backlight;
-+
-       gta01_backlight_device = backlight_device_register("gta01-bl",
-                                                          &pdev->dev, NULL,
-                                                          &gta01bl_ops);
-diff --git a/include/asm-arm/arch-s3c2410/gta01.h b/include/asm-arm/arch-s3c2410/gta01.h
-index 1cc2099..989aa55 100644
---- a/include/asm-arm/arch-s3c2410/gta01.h
-+++ b/include/asm-arm/arch-s3c2410/gta01.h
-@@ -12,10 +12,14 @@
- #define GTA01Bv4_SYSTEM_REV   0x00000240
- /* Backlight */
-+
-+extern void gta01bl_deferred_resume(void);
-+
- struct gta01bl_machinfo {
-       unsigned int default_intensity;
-       unsigned int max_intensity;
-       unsigned int limit_mask;
-+      unsigned int defer_resume_backlight;
- };
- /* Definitions common to all revisions */
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1245-gta01-uart-fifo-trigger-sooner.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1245-gta01-uart-fifo-trigger-sooner.patch.patch
deleted file mode 100755 (executable)
index 04a3c95..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From e669553bac329b9033b201c46e4a8c29e8165d79 Mon Sep 17 00:00:00 2001
-From: Mike Westerhof <mwester@dls.net>
-Date: Sun, 10 Aug 2008 09:14:01 +0100
-Subject: [PATCH] gta01-uart-fifo-trigger-sooner.patch
-
-    Set the UART FIFO to trigger earlier on the GTA01 device to minimize
-    UART overruns from the GSM.
-
-    Signed-off-by: Mike Westerhof <mwester@dls.net>
----
- arch/arm/mach-s3c2410/mach-gta01.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index 9e42df0..4927cd4 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -87,6 +87,8 @@ static struct map_desc gta01_iodesc[] __initdata = {
- #define UCON S3C2410_UCON_DEFAULT
- #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
- #define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
-+/* UFCON for the gta01 sets the FIFO trigger level at 4, not 8 */
-+#define UFCON_GTA01_PORT0 S3C2410_UFCON_FIFOMODE
- static struct s3c2410_uartcfg gta01_uartcfgs[] = {
-       [0] = {
-@@ -94,7 +96,7 @@ static struct s3c2410_uartcfg gta01_uartcfgs[] = {
-               .flags       = 0,
-               .ucon        = UCON,
-               .ulcon       = ULCON,
--              .ufcon       = UFCON,
-+              .ufcon       = UFCON_GTA01_PORT0,
-       },
-       [1] = {
-               .hwport      = 1,
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1246-checkpatch-fixes.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1246-checkpatch-fixes.patch.patch
deleted file mode 100755 (executable)
index 62c0d14..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-From edb431ebc8be9f2ab47c2ea5e585a6ba8ac3a16e Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 10 Aug 2008 09:14:15 +0100
-Subject: [PATCH] checkpatch-fixes.patch
-
-This cleans out some random externs in C files that checkpatch does not like
-and introduces a couple of .h files to contain them.  Plus some other minor
-checkpatch style complaints.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- arch/arm/mach-s3c2410/mach-gta01.c     |    4 ++--
- arch/arm/mach-s3c2440/mach-gta02.c     |    4 ++--
- arch/arm/plat-s3c24xx/neo1973_pm_gsm.c |    6 +-----
- drivers/video/backlight/gta01_bl.c     |    2 +-
- 4 files changed, 6 insertions(+), 10 deletions(-)
-
-diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c
-index 4927cd4..a364b76 100644
---- a/arch/arm/mach-s3c2410/mach-gta01.c
-+++ b/arch/arm/mach-s3c2410/mach-gta01.c
-@@ -73,6 +73,8 @@
- #include <asm/plat-s3c24xx/pm.h>
- #include <asm/plat-s3c24xx/udc.h>
- #include <asm/plat-s3c24xx/neo1973.h>
-+#include <asm/arch-s3c2410/neo1973-pm-gsm.h>
-+
- #include <linux/jbt6k74.h>
- static struct map_desc gta01_iodesc[] __initdata = {
-@@ -666,8 +668,6 @@ static void __init gta01_map_io(void)
-       s3c24xx_init_uarts(gta01_uartcfgs, ARRAY_SIZE(gta01_uartcfgs));
- }
--extern int gta_gsm_interrupts;
--
- static irqreturn_t gta01_modem_irq(int irq, void *param)
- {
-       printk(KERN_DEBUG "GSM wakeup interrupt (IRQ %d)\n", irq);
-diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
-index b37d1c4..1658fa0 100644
---- a/arch/arm/mach-s3c2440/mach-gta02.c
-+++ b/arch/arm/mach-s3c2440/mach-gta02.c
-@@ -78,6 +78,8 @@
- #include <asm/plat-s3c24xx/pm.h>
- #include <asm/plat-s3c24xx/udc.h>
- #include <asm/plat-s3c24xx/neo1973.h>
-+#include <asm/arch-s3c2410/neo1973-pm-gsm.h>
-+
- #include <linux/jbt6k74.h>
- #include <linux/glamofb.h>
-@@ -1531,8 +1533,6 @@ static void __init gta02_map_io(void)
-       s3c24xx_init_uarts(gta02_uartcfgs, ARRAY_SIZE(gta02_uartcfgs));
- }
--extern int gta_gsm_interrupts;
--
- static irqreturn_t gta02_modem_irq(int irq, void *param)
- {
-       printk(KERN_DEBUG "modem wakeup interrupt\n");
-diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-index 8d5e41c..9873568 100644
---- a/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gsm.c
-@@ -18,12 +18,12 @@
- #include <linux/console.h>
- #include <linux/errno.h>
- #include <linux/interrupt.h>
--#include <linux/resume-dependency.h>
- #include <asm/gpio.h>
- #include <asm/mach-types.h>
- #include <asm/arch/gta01.h>
- #include <asm/plat-s3c24xx/neo1973.h>
-+#include <asm/arch/s3c24xx-serial.h>
- #ifdef CONFIG_MACH_NEO1973_GTA02
- #include <asm/arch/gta02.h>
-@@ -31,10 +31,6 @@
- #include <asm/arch/regs-gpioj.h>
- #endif
--extern void s3c24xx_serial_console_set_silence(int silence);
--extern void s3c24xx_serial_register_resume_dependency(struct resume_dependency *
--                                           resume_dependency, int uart_index);
--
- int gta_gsm_interrupts;
- EXPORT_SYMBOL(gta_gsm_interrupts);
-diff --git a/drivers/video/backlight/gta01_bl.c b/drivers/video/backlight/gta01_bl.c
-index 34c19c8..a7170df 100644
---- a/drivers/video/backlight/gta01_bl.c
-+++ b/drivers/video/backlight/gta01_bl.c
-@@ -152,7 +152,7 @@ EXPORT_SYMBOL_GPL(gta01bl_deferred_resume);
- static int gta01bl_resume(struct platform_device *dev)
- {
--      if (! gta01bl_defer_resume_backlight)
-+      if (!gta01bl_defer_resume_backlight)
-               gta01bl_deferred_resume();
-       return 0;
- }
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1247-add-includes-from-checkpatch-fixes.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1247-add-includes-from-checkpatch-fixes.patch.patch
deleted file mode 100755 (executable)
index 403738f..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-From d6fe5ca244bd8a5cf0119f4f815c3c4eabd7e2a2 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 10 Aug 2008 09:14:27 +0100
-Subject: [PATCH] add-includes-from-checkpatch-fixes.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- include/asm-arm/arch-s3c2410/neo1973-pm-gsm.h |    1 +
- include/asm-arm/arch-s3c2410/s3c24xx-serial.h |    5 +++++
- 2 files changed, 6 insertions(+), 0 deletions(-)
- create mode 100644 include/asm-arm/arch-s3c2410/neo1973-pm-gsm.h
- create mode 100644 include/asm-arm/arch-s3c2410/s3c24xx-serial.h
-
-diff --git a/include/asm-arm/arch-s3c2410/neo1973-pm-gsm.h b/include/asm-arm/arch-s3c2410/neo1973-pm-gsm.h
-new file mode 100644
-index 0000000..07c0728
---- /dev/null
-+++ b/include/asm-arm/arch-s3c2410/neo1973-pm-gsm.h
-@@ -0,0 +1 @@
-+extern int gta_gsm_interrupts;
-diff --git a/include/asm-arm/arch-s3c2410/s3c24xx-serial.h b/include/asm-arm/arch-s3c2410/s3c24xx-serial.h
-new file mode 100644
-index 0000000..4a95d7d
---- /dev/null
-+++ b/include/asm-arm/arch-s3c2410/s3c24xx-serial.h
-@@ -0,0 +1,5 @@
-+#include <linux/resume-dependency.h>
-+
-+extern void s3c24xx_serial_console_set_silence(int silence);
-+extern void s3c24xx_serial_register_resume_dependency(struct resume_dependency *
-+                                           resume_dependency, int uart_index);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1248-fix-pcf50633-usbrem-charging-led.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1248-fix-pcf50633-usbrem-charging-led.patch.patch
deleted file mode 100755 (executable)
index dcbf699..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From 8d2916df234dc4762dd019db2ace105a6e744894 Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 10 Aug 2008 09:15:59 +0100
-Subject: [PATCH] fix-pcf50633-usbrem-charging-led.patch
-
-If the charger was removed, we fell through back to old
-hdq-driven code with normally wrong but slightly random
-results for charging LED behaviour in that circumstance
-
-This patch makes us use the tracked charger status
-callbacks alone if they are defined in the platform
-data.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/power/bq27000_battery.c |   12 ++++++++----
- 1 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/power/bq27000_battery.c b/drivers/power/bq27000_battery.c
-index 7020608..4c7e862 100644
---- a/drivers/power/bq27000_battery.c
-+++ b/drivers/power/bq27000_battery.c
-@@ -182,12 +182,16 @@ static int bq27000_battery_get_property(struct power_supply *psy,
-                        */
-                       if (!di->pdata->get_charger_active_status)
-                               goto use_bat;
--                      if ((di->pdata->get_charger_active_status)())
-+
-+                      if ((di->pdata->get_charger_active_status)()) {
-                               val->intval = POWER_SUPPLY_STATUS_CHARGING;
--                      else
--                              val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
--                      break;
-+                              break;
-+                      }
-               }
-+
-+              val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
-+              break;
-+
- use_bat:
-               /*
-                * either the charger is not connected, or the
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1249-fix-no-discharging.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1249-fix-no-discharging.patch.patch
deleted file mode 100755 (executable)
index a4356fd..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-From 8d2acef7c5d7179db19b3c8a0ae9ae4c152faaff Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 10 Aug 2008 09:16:04 +0100
-Subject: [PATCH] fix-no-discharging.patch
-
-We failed to report status of "discharging", instead reporting
-"not charging" even if we knew that the charger was not present.
-
-This patch corrects it and reports "discharging" when charger
-is absent.
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- drivers/power/bq27000_battery.c |   10 +++++++++-
- 1 files changed, 9 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/power/bq27000_battery.c b/drivers/power/bq27000_battery.c
-index 4c7e862..cd4968e 100644
---- a/drivers/power/bq27000_battery.c
-+++ b/drivers/power/bq27000_battery.c
-@@ -187,9 +187,17 @@ static int bq27000_battery_get_property(struct power_supply *psy,
-                               val->intval = POWER_SUPPLY_STATUS_CHARGING;
-                               break;
-                       }
-+                      val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
-+                      break;
-               }
--              val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
-+              /*
-+               * platform provided definite indication of charger presence,
-+               * and it is telling us it isn't there... but we are on so we
-+               * must be running from battery --->
-+               */
-+
-+              val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
-               break;
- use_bat:
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1250-One-of-the-error-paths-on-s3cmci_probe-was-doing-t.patch b/target/linux/s3c24xx/patches-2.6.26/1250-One-of-the-error-paths-on-s3cmci_probe-was-doing-t.patch
deleted file mode 100755 (executable)
index be120cd..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-From 0053182d351d3a3fd6c094b223021eab6531f59c Mon Sep 17 00:00:00 2001
-From: Andy Green <agreen@pads.home.warmcat.com>
-Date: Sun, 10 Aug 2008 09:27:05 +0100
-Subject: [PATCH] One of the error paths on s3cmci_probe() was doing the wrong thing, by
- jumping to the wrong label. The correct label was missing, together
- with the function call it should do in the sequence; I created it by
- copying the correct line from s3cmci_remove().
-
-Also renamed some of the labels, which varied from not following the
-pattern to being somewhat misleading.
-
-Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net>
----
- drivers/mmc/host/s3cmci.c |   13 ++++++++-----
- 1 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
-index edba055..9ef4d5b 100644
---- a/drivers/mmc/host/s3cmci.c
-+++ b/drivers/mmc/host/s3cmci.c
-@@ -1252,13 +1252,13 @@ static int s3cmci_probe(struct platform_device *pdev, int is2440)
-               dev_err(&pdev->dev, "failed to find clock source.\n");
-               ret = PTR_ERR(host->clk);
-               host->clk = NULL;
--              goto probe_free_host;
-+              goto probe_free_dma;
-       }
-       ret = clk_enable(host->clk);
-       if (ret) {
-               dev_err(&pdev->dev, "failed to enable clock source.\n");
--              goto clk_free;
-+              goto probe_free_clk;
-       }
-       host->clk_rate = clk_get_rate(host->clk);
-@@ -1284,7 +1284,7 @@ static int s3cmci_probe(struct platform_device *pdev, int is2440)
-       ret = mmc_add_host(mmc);
-       if (ret) {
-               dev_err(&pdev->dev, "failed to add mmc host.\n");
--              goto free_dmabuf;
-+              goto probe_disable_clk;
-       }
-       platform_set_drvdata(pdev, mmc);
-@@ -1292,14 +1292,17 @@ static int s3cmci_probe(struct platform_device *pdev, int is2440)
-       dev_info(&pdev->dev, "initialisation done.\n");
-       return 0;
-- free_dmabuf:
-+ probe_disable_clk:
-       clk_disable(host->clk);
-- clk_free:
-+ probe_free_clk:
-       clk_put(host->clk);
-  probe_free_irq_cd:
-       free_irq(host->irq_cd, host);
-+ 
-+ probe_free_dma:
-+      s3c2410_dma_free(host->dma, &s3cmci_dma_client);
-  probe_free_irq:
-       free_irq(host->irq, host);
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1251-My-GTA01-2.6.26-kernel-was-crashing-within-mmc_power.patch b/target/linux/s3c24xx/patches-2.6.26/1251-My-GTA01-2.6.26-kernel-was-crashing-within-mmc_power.patch
deleted file mode 100755 (executable)
index e312075..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-From 0733a2e1b598dec898fef5066b737764170aaf62 Mon Sep 17 00:00:00 2001
-From: Andy Green <agreen@pads.home.warmcat.com>
-Date: Sun, 10 Aug 2008 09:27:16 +0100
-Subject: [PATCH] My GTA01 2.6.26 kernel was crashing within mmc_power_up(), at the first
- call to mmc_set_ios(host), due to host->ops being NULL. mmc_power_up()
- was being called by mmc_rescan().
-
-The only possible call path I can imagine for that is s3cmci_irq_cd
-getting called before host->ops is set, thus calling mmc_detect_change()
-which will schedule host->detect which is mmc_rescan.
-
-This patch avoids the problem by moving the enable of the gpio_detect
-interrupt to just before calling mmc_add_host(), where everything else
-is already set up.
-
-Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net>
----
- drivers/mmc/host/s3cmci.c |   34 +++++++++++++++++-----------------
- 1 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
-index 9ef4d5b..107847a 100644
---- a/drivers/mmc/host/s3cmci.c
-+++ b/drivers/mmc/host/s3cmci.c
-@@ -1226,17 +1226,6 @@ static int s3cmci_probe(struct platform_device *pdev, int is2440)
-       disable_irq(host->irq);
--      s3c2410_gpio_cfgpin(host->pdata->gpio_detect, S3C2410_GPIO_IRQ);
--      set_irq_type(host->irq_cd, IRQT_BOTHEDGE);
--
--      if (request_irq(host->irq_cd, s3cmci_irq_cd, 0, DRIVER_NAME, host)) {
--              dev_err(&pdev->dev,
--                      "failed to request card detect interrupt.\n");
--
--              ret = -ENOENT;
--              goto probe_free_irq;
--      }
--
-       if (host->pdata->gpio_wprotect)
-               s3c2410_gpio_cfgpin(host->pdata->gpio_wprotect,
-                                   S3C2410_GPIO_INPUT);
-@@ -1244,7 +1233,7 @@ static int s3cmci_probe(struct platform_device *pdev, int is2440)
-       if (s3c2410_dma_request(host->dma, &s3cmci_dma_client, NULL)) {
-               dev_err(&pdev->dev, "unable to get DMA channel.\n");
-               ret = -EBUSY;
--              goto probe_free_irq_cd;
-+              goto probe_free_irq;
-       }
-       host->clk = clk_get(&pdev->dev, "sdi");
-@@ -1281,10 +1270,21 @@ static int s3cmci_probe(struct platform_device *pdev, int is2440)
-           "irq_cd:%u dma:%u.\n", (host->is2440?"2440":""),
-           host->base, host->irq, host->irq_cd, host->dma);
-+      s3c2410_gpio_cfgpin(host->pdata->gpio_detect, S3C2410_GPIO_IRQ);
-+      set_irq_type(host->irq_cd, IRQT_BOTHEDGE);
-+
-+      if (request_irq(host->irq_cd, s3cmci_irq_cd, 0, DRIVER_NAME, host)) {
-+              dev_err(&pdev->dev,
-+                      "failed to request card detect interrupt.\n");
-+
-+              ret = -ENOENT;
-+              goto probe_disable_clk;
-+      }
-+
-       ret = mmc_add_host(mmc);
-       if (ret) {
-               dev_err(&pdev->dev, "failed to add mmc host.\n");
--              goto probe_disable_clk;
-+              goto probe_free_irq_cd;
-       }
-       platform_set_drvdata(pdev, mmc);
-@@ -1292,15 +1292,15 @@ static int s3cmci_probe(struct platform_device *pdev, int is2440)
-       dev_info(&pdev->dev, "initialisation done.\n");
-       return 0;
-+ probe_free_irq_cd:
-+      free_irq(host->irq_cd, host);
-+
-  probe_disable_clk:
-       clk_disable(host->clk);
-  probe_free_clk:
-       clk_put(host->clk);
-- probe_free_irq_cd:
--      free_irq(host->irq_cd, host);
-- 
-  probe_free_dma:
-       s3c2410_dma_free(host->dma, &s3cmci_dma_client);
-@@ -1325,10 +1325,10 @@ static int s3cmci_remove(struct platform_device *pdev)
-       struct s3cmci_host      *host = mmc_priv(mmc);
-       mmc_remove_host(mmc);
-+      free_irq(host->irq_cd, host);
-       clk_disable(host->clk);
-       clk_put(host->clk);
-       s3c2410_dma_free(host->dma, &s3cmci_dma_client);
--      free_irq(host->irq_cd, host);
-       free_irq(host->irq, host);
-       iounmap(host->base);
-       release_mem_region(host->mem->start, RESSIZE(host->mem));
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1252-The-driver-should-be-checking-for-a-negative-error-c.patch b/target/linux/s3c24xx/patches-2.6.26/1252-The-driver-should-be-checking-for-a-negative-error-c.patch
deleted file mode 100755 (executable)
index ca57daf..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-From 31ab776ee952e5ef6e0a21be276686b84187fcaa Mon Sep 17 00:00:00 2001
-From: Ben Dooks <ben-linux@fluff.org>
-Date: Sun, 10 Aug 2008 09:29:14 +0100
-Subject: [PATCH] The driver should be checking for a negative error code from
- s3c2410_dma_request(), not non-zero. Newer kernels now return
- the DMA channel number that was allocated by the request.
-
-Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
-(cherry picked from commit 3886ff5f63f33c801ed3af265ac0df20d3a8dcf5)
----
- drivers/mmc/host/s3cmci.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
-index 107847a..ffba0f9 100644
---- a/drivers/mmc/host/s3cmci.c
-+++ b/drivers/mmc/host/s3cmci.c
-@@ -1230,7 +1230,7 @@ static int s3cmci_probe(struct platform_device *pdev, int is2440)
-               s3c2410_gpio_cfgpin(host->pdata->gpio_wprotect,
-                                   S3C2410_GPIO_INPUT);
--      if (s3c2410_dma_request(host->dma, &s3cmci_dma_client, NULL)) {
-+      if (s3c2410_dma_request(host->dma, &s3cmci_dma_client, NULL) < 0) {
-               dev_err(&pdev->dev, "unable to get DMA channel.\n");
-               ret = -EBUSY;
-               goto probe_free_irq;
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1253-mmc_detect_change-takes-jiffies-not-msecs.-Conver.patch b/target/linux/s3c24xx/patches-2.6.26/1253-mmc_detect_change-takes-jiffies-not-msecs.-Conver.patch
deleted file mode 100755 (executable)
index 4984ce1..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From d2208c89291153080ea94f28883da64356e7c799 Mon Sep 17 00:00:00 2001
-From: Ben Dooks <ben-linux@fluff.org>
-Date: Sun, 10 Aug 2008 09:29:30 +0100
-Subject: [PATCH] mmc_detect_change() takes jiffies, not msecs. Convert the
- previous value of msecs into jiffies before calling.
-
-Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
-(cherry picked from commit 2de5f79d4dfcb1be16f0b873bc77d6ec74b0426d)
----
- drivers/mmc/host/s3cmci.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
-index ffba0f9..283b90c 100644
---- a/drivers/mmc/host/s3cmci.c
-+++ b/drivers/mmc/host/s3cmci.c
-@@ -598,7 +598,7 @@ static irqreturn_t s3cmci_irq_cd(int irq, void *dev_id)
-       dbg(host, dbg_irq, "card detect\n");
--      mmc_detect_change(host->mmc, 500);
-+      mmc_detect_change(host->mmc, msecs_to_jiffies(500));
-       return IRQ_HANDLED;
- }
--- 
-1.5.6.3
-
diff --git a/target/linux/s3c24xx/patches-2.6.26/1254-config-2.6.26-add-s3c-mmc.patch.patch b/target/linux/s3c24xx/patches-2.6.26/1254-config-2.6.26-add-s3c-mmc.patch.patch
deleted file mode 100755 (executable)
index d534fee..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-From 557b4763b753b1620e922864555a4abf851372ba Mon Sep 17 00:00:00 2001
-From: Andy Green <andy@openmoko.com>
-Date: Sun, 10 Aug 2008 09:32:55 +0100
-Subject: [PATCH] config-2.6.26-add-s3c-mmc.patch
-
-Signed-off-by: Andy Green <andy@openmoko.com>
----
- defconfig-2.6.26 |    8 +++-----
- 1 files changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/defconfig-2.6.26 b/defconfig-2.6.26
-index 511a762..c9fa9d3 100644
---- a/defconfig-2.6.26
-+++ b/defconfig-2.6.26
-@@ -1,7 +1,7 @@
- #
- # Automatically generated make config: don't edit
--# Linux kernel version: 2.6.26-rc7
--# Sun Jun 22 08:25:07 2008
-+# Linux kernel version: 2.6.26
-+# Sun Aug 10 09:17:09 2008
- #
- CONFIG_ARM=y
- CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-@@ -545,7 +545,6 @@ CONFIG_NET_SCH_CBQ=m
- CONFIG_NET_SCH_HTB=m
- CONFIG_NET_SCH_HFSC=m
- CONFIG_NET_SCH_PRIO=m
--# CONFIG_NET_SCH_RR is not set
- CONFIG_NET_SCH_RED=m
- CONFIG_NET_SCH_SFQ=m
- CONFIG_NET_SCH_TEQL=m
-@@ -1260,7 +1259,6 @@ CONFIG_SND_SOC=y
- CONFIG_SND_S3C24XX_SOC=y
- CONFIG_SND_S3C24XX_SOC_I2S=y
- CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=y
--# CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753_DEBUG is not set
- CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=y
- # CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
-@@ -1494,7 +1492,7 @@ CONFIG_MMC_BLOCK=y
- # MMC/SD Host Controller Drivers
- #
- # CONFIG_MMC_SPI is not set
--# CONFIG_MMC_S3C is not set
-+CONFIG_MMC_S3C=y
- CONFIG_NEW_LEDS=y
- CONFIG_LEDS_CLASS=y
--- 
-1.5.6.3
-
diff --git a/target/linux/x86/config-2.6.27 b/target/linux/x86/config-2.6.27
deleted file mode 100644 (file)
index 5983c4c..0000000
+++ /dev/null
@@ -1,422 +0,0 @@
-# CONFIG_3C515 is not set
-CONFIG_4KSTACKS=y
-# CONFIG_60XX_WDT is not set
-# CONFIG_64BIT is not set
-# CONFIG_8139TOO is not set
-# CONFIG_AC3200 is not set
-# CONFIG_ACQUIRE_WDT is not set
-# CONFIG_ADVANTECH_WDT is not set
-# CONFIG_AGP is not set
-# CONFIG_ALIM1535_WDT is not set
-# CONFIG_APRICOT is not set
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_DEFAULT_IDLE=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SUPPORTS_AOUT=y
-CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-# CONFIG_AT1700 is not set
-# CONFIG_AUDIT_ARCH is not set
-CONFIG_BASE_SMALL=0
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_MISC=y
-CONFIG_BITREVERSE=y
-# CONFIG_BLK_DEV_4DRIVES is not set
-# CONFIG_BLK_DEV_ALI14XX is not set
-# CONFIG_BLK_DEV_DTC2278 is not set
-CONFIG_BLK_DEV_GENERIC=y
-# CONFIG_BLK_DEV_HT6560B is not set
-CONFIG_BLK_DEV_IDE=y
-CONFIG_BLK_DEV_IDEDISK=y
-CONFIG_BLK_DEV_IDEDMA=y
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_BLK_DEV_QD65XX is not set
-CONFIG_BLK_DEV_SC1200=y
-# CONFIG_BLK_DEV_UMC8672 is not set
-CONFIG_BLK_DEV_VIA82CXXX=y
-# CONFIG_BLK_DEV_XD is not set
-CONFIG_BOUNCE=y
-CONFIG_CLASSIC_RCU=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_COMPAT_VDSO=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-# CONFIG_CPU5_WDT is not set
-CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_DEBUG is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
-# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
-CONFIG_CPU_FREQ_STAT=y
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_TABLE=y
-# CONFIG_CPU_IDLE is not set
-# CONFIG_CRYPTO_AES_586 is not set
-# CONFIG_CRYPTO_SALSA20_586 is not set
-# CONFIG_CRYPTO_TWOFISH_586 is not set
-# CONFIG_CS5535_GPIO is not set
-# CONFIG_CS89x0 is not set
-# CONFIG_DCDBAS is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_DEFAULT_IO_DELAY_TYPE=0
-# CONFIG_DELL_RBU is not set
-# CONFIG_DEPCA is not set
-CONFIG_DEVPORT=y
-CONFIG_DMI=y
-# CONFIG_DMIID is not set
-CONFIG_DNOTIFY=y
-CONFIG_DOUBLEFAULT=y
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EDAC is not set
-# CONFIG_EDD is not set
-# CONFIG_EISA is not set
-# CONFIG_EL1 is not set
-# CONFIG_EL16 is not set
-# CONFIG_EL2 is not set
-# CONFIG_EL3 is not set
-CONFIG_ELF_CORE=y
-# CONFIG_ELPLUS is not set
-# CONFIG_EMBEDDED is not set
-# CONFIG_EUROTECH_WDT is not set
-CONFIG_EXT2_FS=y
-CONFIG_FAST_CMPXCHG_LOCAL=y
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-# CONFIG_GENERIC_CPU is not set
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-# CONFIG_GENERIC_GPIO is not set
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_ISA_DMA=y
-# CONFIG_GENERIC_LOCKBREAK is not set
-# CONFIG_GENERIC_TIME_VSYSCALL is not set
-# CONFIG_HANGCHECK_TIMER is not set
-CONFIG_HAS_DMA=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_HAVE_ARCH_TRACEHOOK is not set
-# CONFIG_HAVE_CLK is not set
-# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
-# CONFIG_HAVE_DMA_ATTRS is not set
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_HAVE_FTRACE=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_HAVE_IDE=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_HID=y
-CONFIG_HID_SUPPORT=y
-# CONFIG_HIGHMEM4G is not set
-# CONFIG_HIGHMEM64G is not set
-# CONFIG_HIGH_RES_TIMERS is not set
-# CONFIG_HPET_TIMER is not set
-# CONFIG_HP_WATCHDOG is not set
-CONFIG_HT_IRQ=y
-# CONFIG_HUGETLBFS is not set
-CONFIG_HW_CONSOLE=y
-CONFIG_HW_RANDOM=y
-# CONFIG_HW_RANDOM_AMD is not set
-CONFIG_HW_RANDOM_GEODE=y
-# CONFIG_HW_RANDOM_INTEL is not set
-CONFIG_HW_RANDOM_VIA=y
-# CONFIG_I2C is not set
-# CONFIG_I6300ESB_WDT is not set
-# CONFIG_I8K is not set
-# CONFIG_IB700_WDT is not set
-# CONFIG_IBMASR is not set
-# CONFIG_IBM_ASM is not set
-CONFIG_IDE=y
-CONFIG_IDEPCI_PCIBUS_ORDER=y
-CONFIG_IDE_GENERIC=y
-# CONFIG_IDE_PROC_FS is not set
-CONFIG_IDE_TIMINGS=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_INPUT=y
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_INPUT_MOUSE=y
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-# CONFIG_IOMMU_HELPER is not set
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_NONE is not set
-CONFIG_IO_DELAY_TYPE_0X80=0
-CONFIG_IO_DELAY_TYPE_0XED=1
-CONFIG_IO_DELAY_TYPE_NONE=3
-CONFIG_IO_DELAY_TYPE_UDELAY=2
-# CONFIG_IO_DELAY_UDELAY is not set
-CONFIG_ISA=y
-CONFIG_ISAPNP=y
-CONFIG_ISA_DMA_API=y
-# CONFIG_ISCSI_IBFT_FIND is not set
-# CONFIG_IT8712F_WDT is not set
-# CONFIG_ITCO_WDT is not set
-CONFIG_KALLSYMS=y
-CONFIG_KEXEC=y
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_KMOD=y
-CONFIG_KTIME_SCALAR=y
-# CONFIG_LANCE is not set
-# CONFIG_LEDS_ALIX is not set
-# CONFIG_LEDS_CLEVO_MAIL is not set
-CONFIG_M386=y
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586MMX is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M686 is not set
-# CONFIG_MACHZ_WDT is not set
-# CONFIG_MACINTOSH_DRIVERS is not set
-CONFIG_MATH_EMULATION=y
-# CONFIG_MCA is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MDA_CONSOLE is not set
-# CONFIG_MEFFICEON is not set
-# CONFIG_MEMTEST is not set
-# CONFIG_MFD_CORE is not set
-# CONFIG_MFD_TMIO is not set
-# CONFIG_MGEODEGX1 is not set
-# CONFIG_MGEODE_LX is not set
-CONFIG_MICROCODE=y
-CONFIG_MICROCODE_OLD_INTERFACE=y
-# CONFIG_MIXCOMWD is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MOUSE_BCM5974 is not set
-CONFIG_MOUSE_PS2=y
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPSC is not set
-CONFIG_MTD=y
-# CONFIG_MTD_ABSENT is not set
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_BLOCK2MTD=y
-# CONFIG_MTD_CFI is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CHAR=y
-# CONFIG_MTD_CMDLINE_PARTS is not set
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_ONENAND is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_TS5500 is not set
-CONFIG_MTRR=y
-# CONFIG_MTRR_SANITIZER is not set
-# CONFIG_MVIAC3_2 is not set
-# CONFIG_MVIAC7 is not set
-# CONFIG_MWINCHIP2 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MWINCHIPC6 is not set
-CONFIG_NAMESPACES=y
-# CONFIG_NATSEMI is not set
-CONFIG_NET_VENDOR_3COM=y
-# CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_NET_VENDOR_SMC is not set
-CONFIG_NOHIGHMEM=y
-# CONFIG_NSC_GPIO is not set
-CONFIG_NVRAM=y
-# CONFIG_OLPC is not set
-# CONFIG_OPTIMIZE_INLINING is not set
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_PAGE_OFFSET=0xC0000000
-# CONFIG_PARAVIRT_GUEST is not set
-# CONFIG_PC8736x_GPIO is not set
-# CONFIG_PC87413_WDT is not set
-CONFIG_PCI=y
-# CONFIG_PCIEPORTBUS is not set
-CONFIG_PCI_BIOS=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_PCI_GOANY=y
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GODIRECT is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GOOLPC is not set
-CONFIG_PCSPKR_PLATFORM=y
-# CONFIG_PCWATCHDOG is not set
-CONFIG_PHYSICAL_ALIGN=0x100000
-CONFIG_PHYSICAL_START=0x100000
-CONFIG_PNP=y
-# CONFIG_PNPACPI is not set
-# CONFIG_PNPBIOS is not set
-# CONFIG_PNP_DEBUG is not set
-CONFIG_PROC_PAGE_MONITOR=y
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_R6040 is not set
-# CONFIG_RELOCATABLE is not set
-CONFIG_RTC=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-# CONFIG_SBC7240_WDT is not set
-# CONFIG_SBC8360_WDT is not set
-# CONFIG_SBC_EPX_C3_WATCHDOG is not set
-# CONFIG_SC1200_WDT is not set
-# CONFIG_SC520_WDT is not set
-# CONFIG_SCHED_HRTICK is not set
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-# CONFIG_SCSI_DMA is not set
-CONFIG_SCx200=y
-CONFIG_SCx200HR_TIMER=y
-# CONFIG_SCx200_GPIO is not set
-# CONFIG_SCx200_WDT is not set
-# CONFIG_SERIAL_8250_EXTENDED is not set
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIO=y
-# CONFIG_SERIO_CT82C710 is not set
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_LIBPS2=y
-# CONFIG_SERIO_PCIPS2 is not set
-# CONFIG_SERIO_RAW is not set
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SMP is not set
-# CONFIG_SMSC37B787_WDT is not set
-# CONFIG_SOFT_WATCHDOG is not set
-# CONFIG_SONYPI is not set
-CONFIG_SPARSEMEM_STATIC=y
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
-CONFIG_SSB_POSSIBLE=y
-CONFIG_STRICT_DEVMEM=y
-# CONFIG_SYSPROF_TRACER is not set
-CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_TELCLOCK is not set
-# CONFIG_TICK_ONESHOT is not set
-# CONFIG_TOSHIBA is not set
-# CONFIG_TYPHOON is not set
-CONFIG_UID16=y
-CONFIG_USB_SUPPORT=y
-# CONFIG_USER_NS is not set
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-# CONFIG_VGASTATE is not set
-CONFIG_VGA_CONSOLE=y
-# CONFIG_VIA_RHINE is not set
-# CONFIG_VIDEO_SELECT is not set
-CONFIG_VM86=y
-CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_VORTEX is not set
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-# CONFIG_WAFER_WDT is not set
-# CONFIG_WDT is not set
-CONFIG_X86=y
-CONFIG_X86_32=y
-# CONFIG_X86_64 is not set
-CONFIG_X86_BIOS_REBOOT=y
-# CONFIG_X86_CMPXCHG is not set
-CONFIG_X86_CPU=y
-# CONFIG_X86_CPUFREQ_NFORCE2 is not set
-# CONFIG_X86_CPUID is not set
-# CONFIG_X86_ELAN is not set
-# CONFIG_X86_E_POWERSAVER is not set
-CONFIG_X86_F00F_BUG=y
-CONFIG_X86_FIND_SMP_CONFIG=y
-CONFIG_X86_GENERIC=y
-# CONFIG_X86_GENERICARCH is not set
-# CONFIG_X86_GX_SUSPMOD is not set
-CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_L1_CACHE_SHIFT=7
-CONFIG_X86_LOCAL_APIC=y
-# CONFIG_X86_LONGRUN is not set
-CONFIG_X86_MCE=y
-# CONFIG_X86_MCE_NONFATAL is not set
-# CONFIG_X86_MCE_P4THERMAL is not set
-CONFIG_X86_MINIMUM_CPU_FAMILY=3
-CONFIG_X86_MPPARSE=y
-# CONFIG_X86_MSR is not set
-# CONFIG_X86_P4_CLOCKMOD is not set
-# CONFIG_X86_PAE is not set
-CONFIG_X86_PAT=y
-CONFIG_X86_PC=y
-# CONFIG_X86_POWERNOW_K6 is not set
-# CONFIG_X86_POWERNOW_K7 is not set
-# CONFIG_X86_POWERNOW_K8 is not set
-CONFIG_X86_PPRO_FENCE=y
-# CONFIG_X86_RDC321X is not set
-# CONFIG_X86_REBOOTFIXUPS is not set
-CONFIG_X86_RESERVE_LOW_64K=y
-# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-# CONFIG_X86_SPEEDSTEP_ICH is not set
-# CONFIG_X86_SPEEDSTEP_LIB is not set
-# CONFIG_X86_SPEEDSTEP_SMI is not set
-CONFIG_X86_UP_APIC=y
-CONFIG_X86_UP_IOAPIC=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-# CONFIG_X86_VOYAGER is not set
-# CONFIG_X86_VSMP is not set
-# CONFIG_ZONE_DMA32 is not set